2013 files changed, 0 insertions, 737465 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 6df7b90c42..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-install-sh
-intl
-libtool
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h
-stamp-h.in
-stamp.h
-xlibtool
-xltmain.sh
-evolution.desktop
-evolution.spec
-xml-i18n-*
-
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 96d5be9d92..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,74 +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>
-
-Artwork
-	Tuomas Kuosmanen <tigert@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>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <battery841@mypad.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Bertrand Guiheneuf <bertrand@ximian.com>
-	Matt Loper <matt@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-	Jeff Stedfast <fejj@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>
-	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>
-	GNOME PL Team <gnomepl@pandora.info.bielsko.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	Héctor García Alvarez <hector@scouts-es.org>
-	Jesús Bravo Álvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	Matthias Warkus <mawa@iname.com>
-	Spiros Papadimitriou <spapadim+@cs.cmu.edu>
-	Sung-Hyun Nam <namsh@kldp.org>
-	Szabolcs BAN <shooby@gnome.hu>
-	Tiago Antão <tiagoantao@bigfoot.com>
-	Valek Filippov <frob@df.ru>
-	Vincent Renardias <vincent@redhat.com>
-	Yuri Syrota <rasta@renome.rovno.ua>
-
-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 d9f7cba007..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,6129 +0,0 @@
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  Héctor García Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/HACKING b/HACKING
deleted file mode 100644
index e69de29bb2..0000000000
--- a/HACKING
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17ac46..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 602e3bf73b..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Email: ettore@ximian.com
-Email: danw@ximian.com
-Email: chris@ximian.com
-Email: federico@ximian.com
-Email: iain@ximian.com
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 065e218ad5..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-changelogs =			\
-	ChangeLog
-
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-applicationdir = $(datadir)/gnome/apps/Applications
-application_in_files = evolution.desktop.in
-application_DATA = $(application_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-EXTRA_DIST =			\
-	AUTHORS			\
-	$(changelogs)		\
-	COPYING-DOCS		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	$(appicon_DATA)		\
-	$(application_in_files)	\
-	xml-i18n-merge.in	\
-	xml-i18n-update.in	\
-	xml-i18n-extract.in
-
-SUBDIRS =			\
-        intl                    \
-        macros                  \
-        data                    \
-        e-util                  \
-        widgets                 \
-        shell                   \
-	executive-summary	\
-        libibex                 \
-        camel                   \
-        filter                  \
-        composer                \
-        mail                    \
-        libical                 \
-        libversit               \
-        addressbook             \
-        calendar                \
-        wombat                  \
-        art                     \
-	ui			\
-        default_user            \
-	views			\
-        tools                   \
-        po
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 0b92bc991a..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,900 +0,0 @@
-Version 0.9
------------
-
-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)
-
-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).
-
-
-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 a8c9aa3c34..0000000000
--- a/README
+++ /dev/null
@@ -1,198 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Ximian, Inc.
-
-See http://www.ximian.com/apps/evolution.php3 for more information.
-
-Note that Evolution is still beta. This means it may delete all of
-your mail if you give it the chance.
-
-If you are using Evolution, you should subscribe to the Evolution
-mailing list. If you are interested in hacking on it, you should
-subscribe to the Evolution Hackers mailing list. Send mail to
-"evolution-request@ximian.com" or
-"evolution-hackers-request@ximian.com" with the word "subscribe" in
-the body of the message. If you are planning to work on any part of
-Evolution, please send mail to the mailing list first, to avoid
-duplicated effort (and to make sure that you aren't basing your work
-on interfaces that are expected to change).
-
-There are mailing list archives available at
-http://lists.ximian.com/archives/public/evolution/     and
-http://lists.ximian.com/archives/public/evolution-hackers/
-
-There is also an #evolution IRC channel on irc.gnome.org.
-
-
-IF IT DOESN'T WORK
-------------------
-
-Did you read the "How to build" section below? :-)
-
-If you have built Evolution and it doesn't work, or you can't get it
-or one of its dependencies to compile, try running the
-"verify-evolution-install.sh" script in the tools/ subdirectory. It
-may be able to figure out what went wrong.
-
-
-HOW TO BUILD EVOLUTION
-----------------------
-
-	*** READ THIS BEFORE YOU START BUILDING ANYTHING! ***
-
-Evolution depends on a large number of unreleased and rapidly-changing
-libraries. Some of these libraries in turn depend on other unreleased
-and rapidly-changing libraries.
-
-Building Evolution is HARD, and it's going to stay hard until all of
-the libraries it depends on stabilize, and there's nothing we can do
-to make it any easier until then.
-
-
-General Principles
-------------------
-
-First you have to decide whether you want to install Evolution (and
-its dependencies) into the same prefix as the rest of your GNOME
-install, or into a new prefix. Installing everything into the same
-prefix as the rest of your GNOME install will make it much easier to
-build and run programs, and easier to switch between using packages
-and building it yourself, but it may also make it harder to uninstall
-later.
-
-If you want to install into the same prefix as the rest of GNOME,
-type:
-
-	gnome-config --prefix
-	gnome-config --sysconfdir
-
-and remember the answers, and pass them to "configure" or "autogen.sh"
-when building the other packages you need. Eg:
-
-	./configure --prefix=/usr --sysconfdir=/etc
-
-
-If you build in another prefix instead, you will need to set the
-GNOME_PATH environment variable (and ACLOCAL_FLAGS as well if building
-from CVS) to include the prefix you install into. Eg:
-
-        export GNOME_PATH=/usr/local
-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
-
-(Assuming your shell is bash, and you installed into /usr/local.) You
-need to set GNOME_PATH both during compiling AND when you run
-evolution. Remember also that if you're installing into an odd prefix
-such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH and ${prefix}/lib in your LD_LIBRARY_PATH.
-
-
-Dependencies
-------------
-
-All of these libraries are available in GNOME CVS, under the given
-names. Most (but not all) of them are also available as tarballs on
-ftp.gnome.org. The (*)ed packages are available in Ximian GNOME
-(http://www.ximian.com/desktop/) Other packages may be available from
-the Ximian GNOME evolution preview mirror.
-
-If installing from packages, remember that you need both the runtime
-and -devel packages for each library.
-
- - xml-i18n-tools - 0.7 or later (*)
-
- - gnome-xml - 1.8.10 or later in the 1.0 series, but not from the 2.0
-   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_X".)
-   (*)
-
- - gnome-print - 0.20 or later (*)
-
- - gdk-pixbuf - 0.8.0 or later (*)
-
- - ORBit - 0.5.6 or later (*) (If you get this from GNOME CVS, use the
-   tag "orbit-stable-0-5".)
-
- - oaf - 0.6.2 or later (If you get this from GNOME CVS, use the tag
-   "oaf-stable-0-6")
-
-   *** If you are using oaf from CVS, you should use the flag
-   *** "--disable-more-warnings" when configure, or it may fail to
-   *** build.
-
- - gnome-vfs - 0.4.2 or later
-
-   *** If you are using gnome-vfs from CVS, you should use the flag
-   *** "--disable-more-warnings" when configuring, or it may fail to
-   *** build.
-
- - bonobo - 0.33 or later
-
-   *** Note that bonobo must be installed with the same --prefix as
-   *** either gnome-libs or evolution for the Makefiles to work
-   *** properly.
-
- - libunicode - 0.4 or later, available from
-   http://www.pango.org/download.shtml
-
- - gconf - 0.6 or later
-
- - gal (GNOME Application Library) - 0.4.99.8 or later
-
- - gtkhtml - 0.8.2 or later
-
- - libglade (*)
-
-If you want support for PalmPilot syncing (currently experimental so
-please back up your pilot) you will also need to do the following:
-
-1) pilot-link
-cvs -d :pserver:anonymous@cvs.gnu-designs.com:/cvs/openpalm login
-The password is just <ENTER>.
-cvs -d :pserver:anonymous@cvs.gnu-designs.com:/cvs/openpalm co pilot-link
-./configure --prefix=<pilot-link-prefix> --with-perl=no --with-java=no
---with-tcl=no --with-python=no
-make
-make install
-
-2) gnome-pilot
-cvs -z3 co gnome-pilot
-./configure --prefix=<gnome-pilot-prefix> --with-pisock=<pilot-link-prefix>
-make
-make install
-
-3) evolution
-in your evo source dir do ./autogen.sh --prefix=<evo-prefix> 
---with-pisock=<pilot-link-prefix> --enable-pilot-conduits=yes
-make
-make install
-
-
-
-The layout of the source tree is:
-
-addressbook:	the Address Book UI
-art:		graphics used by evolution
-calendar:	the Calendar UI
-camel:		libcamel, a messaging library used by the mailer.
-		Camel is inspired by Sun's JavaMail
-		(http://java.sun.com/products/javamail/) and the
-		IMAPv4 spec (RFC 2060).
-composer:	the message composer UI
-data:		the .desktop file for Evolution
-default_user:	initial Evolution config files for new users
-devel-docs:	entirely inadequate documentation
-doc:		more adequate documentation
-e-util:		utility code used by various parts of Evolution
-filter:		libfilter, a mail filtering library
-libibex:	an indexing library used by the mailer
-libical:	a library for the iCalendar format (RFC 2445-2446)
-libversit:	a library for the vCard (RFC 2425-2426) and vCalendar
-		(http://www.imc.org/pdi/vcal-10.txt) formats
-mail:		the mail display UI
-shell:		the Evolution shell (the main program that launches
-		the other components)
-tests:		some test programs
-tools:		utilities, notably "killev", a script to kill of all
-		of the Evolution components
-widgets:	widgets used by Evolution, including the shortcut bar
-wombat:		Has source code that will load in the addressbook
-		and calendar backend, and will form the server
-		process we'll be using
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 4ba785d582..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE
-#undef VERSION
-#undef ENABLE_THREADS
-#undef SENDMAIL_PATH
-#undef SYSTEM_MAIL_DIR
-#undef HAVE_LDAP
-#undef HAVE_TIMEZONE
-#undef HAVE_TM_GMTOFF
-#undef USING_OAF
-#undef HAVE_KRB4
-#undef HAVE_KRB5
-#undef MOVEMAIL_PATH
-#undef USING_GNOME_PRINT_0_20
-#undef USE_DOT
-#undef USE_FCNTL
-#undef USE_FLOCK
-#undef NEED_KRB_SENDAUTH_PROTO
-#undef HAVE_ISBLANK
-#undef ENABLE_NNTP
-
-/* Sub-version identification string.  */
-#undef SUB_VERSION
-
-/* Define this if you want to build against the development gtk */
-#undef HAVE_DEVGTK
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_ARGS
diff --git a/addressbook/.cvsignore b/addressbook/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
deleted file mode 100644
index 15dccabefa..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,4228 +0,0 @@
-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 cc89ee5aeb..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	backend printing contact-editor gui $(CONDUIT_SUBDIR)
-
diff --git a/addressbook/backend/.cvsignore b/addressbook/backend/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/Makefile.am b/addressbook/backend/Makefile.am
deleted file mode 100644
index b2807b2480..0000000000
--- a/addressbook/backend/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = idl ebook pas
diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore
deleted file mode 100644
index 9d1d6f19ae..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-test-card
-test-client
-test-client-list
-load-pine-addressbook
-load-gnomecard-addressbook
-evolution-gnomecard-importer
-Evolution-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
deleted file mode 100644
index 69dfa90871..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-gnomecard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import GnomeCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="GnomeCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports GnomeCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
deleted file mode 100644
index 46f2a1fa4e..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-gnomecard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory to import GnomeCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="GnomeCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       value="Imports GnomeCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
deleted file mode 100644
index fbba0c98d0..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS = evolution-gnomecard-importer 		\
-	load-pine-addressbook load-gnomecard-addressbook
-
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c				\
-        Evolution-Composer.h              \
-        Evolution-Composer-common.c       \
-        Evolution-Composer-skels.c        \
-        Evolution-Composer-stubs.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl		\
-	$(srcdir)/../../../composer/Evolution-Composer.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        \
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/ename		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/ename		\
-	-I$(top_builddir)/shell/importer		\
-	-I$(top_srcdir)/shell/importer			\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libebook.la
-
-libebook_la_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	e-book-listener.c				\
-	e-book-view-listener.c				\
-	e-book-view.c					\
-	e-book.c					\
-	e-card-cursor.c					\
-	e-card-simple.c					\
-	e-card.c					\
-	e-destination.c
-
-libebookincludedir = $(includedir)/evolution/ebook
-
-libebookinclude_HEADERS =				\
-	e-book-listener.h				\
-	e-book-types.h					\
-	e-book-view-listener.h				\
-	e-book-view.h					\
-	e-book.h					\
-	e-card-cursor.h					\
-	e-card-pairs.h					\
-	e-card-simple.h					\
-	e-card-types.h					\
-	e-card.h					\
-	e-destination.h
-
-
-#
-# make a static library for use by addressbook's conduit's shared library
-#
-noinst_LTLIBRARIES = libebook-static.la
-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
-libebook_static_la_LDFLAGS = --all-static
-
-
-test_client_SOURCES =					\
-	test-client.c
-
-test_client_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
-
-test_client_list_SOURCES =				\
-	test-client-list.c
-
-test_client_list_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_gnomecard_importer_SOURCES =			\
-	evolution-gnomecard-importer.c
-evolution_gnomecard_importer_LDADD =			\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/shell/importer/libevolution-importer.la
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-# add this back when you add the file to the archive ;)
-#	GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-
-
-
diff --git a/addressbook/backend/ebook/TODO b/addressbook/backend/ebook/TODO
deleted file mode 100644
index a69703cd92..0000000000
--- a/addressbook/backend/ebook/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Make sure open_book_progress does not use the EBook op queue; make
-  sure it works.
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
deleted file mode 100644
index 8ef9072bf6..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,682 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-listener.h"
-
-static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_listener_parent_class;
-POA_GNOME_Evolution_Addressbook_BookListener__vepv  e_book_listener_vepv;
-
-struct _EBookListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = op;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_response (EBookListener  *listener,
-				     EBookStatus     status,
-				     GNOME_Evolution_Addressbook_Book  book)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = OpenBookResponse;
-	resp->status = status;
-	resp->book   = book;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_progress (EBookListener *listener,
-				     const char    *msg,
-				     short          percent)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op      = OpenProgressEvent;
-	resp->msg     = g_strdup (msg);
-	resp->percent = percent;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-
-static void
-e_book_listener_queue_create_card_response (EBookListener *listener,
-					    EBookStatus    status,
-					    const char    *id)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = CreateCardResponse;
-	resp->status = status;
-	resp->id     = g_strdup (id);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_cursor_response (EBookListener        *listener,
-					   EBookStatus           status,
-					   GNOME_Evolution_Addressbook_CardCursor  cursor)
-{
-	EBookListenerResponse *resp;
-	
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetCursorResponse;
-	resp->status = status;
-	resp->cursor = cursor;
-	
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_view_response (EBookListener        *listener,
-					 EBookStatus           status,
-					 GNOME_Evolution_Addressbook_BookView    book_view)
-{
-	EBookListenerResponse *resp;
-	
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetBookViewResponse;
-	resp->status    = status;
-	resp->book_view = book_view;
-	
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_changes_response (EBookListener        *listener,
-					    EBookStatus           status,
-					    GNOME_Evolution_Addressbook_BookView book_view)
-{
-	EBookListenerResponse *resp;
-	
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetChangesResponse;
-	resp->status    = status;
-	resp->book_view = book_view;
-	
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_link_status (EBookListener *listener,
-				   gboolean       connected)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = LinkStatusEvent;
-	resp->connected = connected;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_authentication_response (EBookListener *listener,
-					       EBookStatus    status)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = AuthenticationResponse;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_supported_fields_response (EBookListener *listener,
-						     EBookStatus status,
-						     const GNOME_Evolution_Addressbook_stringlist *fields)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetSupportedFieldsResponse;
-	resp->status = status;
-	resp->fields = fields;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       const GNOME_Evolution_Addressbook_CardId id,
-				       CORBA_Environment                       *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_create_card_response (
-		listener,
-		e_book_listener_convert_status (status),
-		id);
-}
-
-static void
-impl_BookListener_respond_remove_card (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, RemoveCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_modify_card (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, ModifyCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				      const GNOME_Evolution_Addressbook_CardCursor cursor,
-				      CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_CardCursor  cursor_copy;
-
-	cursor_copy = CORBA_Object_duplicate (cursor, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating CardCursor!\n");
-		return;
-	}
-
-	e_book_listener_queue_get_cursor_response (
-		listener,
-		e_book_listener_convert_status (status),
-		cursor_copy);
-}
-
-static void
-impl_BookListener_respond_get_view (PortableServer_Servant servant,
-				    const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				    const GNOME_Evolution_Addressbook_BookView book_view,
-				    CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = CORBA_Object_duplicate (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_view_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_get_changes (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       const GNOME_Evolution_Addressbook_BookView book_view,
-				       CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = CORBA_Object_duplicate (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_changes_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_open_book (PortableServer_Servant servant,
-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				     const GNOME_Evolution_Addressbook_Book book,
-				     CORBA_Environment *ev)
-{
-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_Book  book_copy;
-
-	book_copy = CORBA_Object_duplicate (book, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating Book!\n");
-		return;
-	}
-
-	e_book_listener_queue_open_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_copy);
-}
-
-static void
-impl_BookListener_report_open_book_progress (PortableServer_Servant servant,
-					     const CORBA_char *status_message,
-					     const CORBA_short percent,
-					     CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_open_progress (
-		listener, status_message, percent);
-}
-
-static void
-impl_BookListener_respond_authentication_result (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_authentication_response (
-				       listener, status);
-}
-
-static void
-impl_BookListener_response_get_supported_fields (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 const GNOME_Evolution_Addressbook_stringlist *fields,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_get_supported_fields_response (
-				     listener, status, fields);
-}
-
-static void
-impl_BookListener_report_connection_status (PortableServer_Servant servant,
-					    const CORBA_boolean connected,
-					    CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_link_status (
-		listener, connected);
-}
-
-/**
- * e_book_listener_check_pending:
- * @listener: the #EBookListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookListener.
- */
-int
-e_book_listener_check_pending (EBookListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_listener_pop_response:
- * @listener: the #EBookListener for which a request is to be popped
- *
- * Returns: an #EBookListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookListener.
- */
-EBookListenerResponse *
-e_book_listener_pop_response (EBookListener *listener)
-{
-	EBookListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookStatus
-e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_CallStatus status)
-{
-	switch (status) {
-	case GNOME_Evolution_Addressbook_BookListener_Success:
-		return E_BOOK_STATUS_SUCCESS;
-	case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:
-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:
-		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case GNOME_Evolution_Addressbook_BookListener_CardNotFound:
-		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:
-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case GNOME_Evolution_Addressbook_BookListener_OtherError:
-		return E_BOOK_STATUS_OTHER_ERROR;
-	default:
-		g_warning ("e_book_listener_convert_status: Unknown status "
-			   "from card server: %d\n", (int) status);
-		return E_BOOK_STATUS_UNKNOWN;
-
-	}
-}
-
-static EBookListener *
-e_book_listener_construct (EBookListener *listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_listener_new:
- * @book: the #EBook for which the listener is to be bound
- *
- * Creates and returns a new #EBookListener for the book.
- *
- * Returns: a new #EBookListener
- */
-EBookListener *
-e_book_listener_new ()
-{
-	EBookListener *listener;
-	EBookListener *retval;
-
-	listener = gtk_type_new (E_BOOK_LISTENER_TYPE);
-
-	retval = e_book_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_listener_new: Error constructing "
-			   "EBookListener!\n");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_listener_init (EBookListener *listener)
-{
-	listener->priv = g_new0 (EBookListenerPrivate, 1);
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener     *listener = E_BOOK_LISTENER (object);
-	GList             *l;
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		g_free (resp->msg);
-		g_free (resp->id);
-
-		if (resp->book != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->book, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying book "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		if (resp->cursor != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->cursor, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying cursor "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		if (resp->book_view != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->book_view, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying book_view "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookListener__epv *
-e_book_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
-
-	epv->notifyOpenBookProgress = impl_BookListener_report_open_book_progress;
-	epv->notifyBookOpened       = impl_BookListener_respond_open_book;
-
-	epv->notifyCardCreated  = impl_BookListener_respond_create_card;
-	epv->notifyCardRemoved  = impl_BookListener_respond_remove_card;
-	epv->notifyCardModified = impl_BookListener_respond_modify_card;
-
-	epv->notifyAuthenticationResult = impl_BookListener_respond_authentication_result;
-	epv->notifySupportedFields = impl_BookListener_response_get_supported_fields;
-
-	epv->notifyCursorRequested  = impl_BookListener_respond_get_cursor;
-	epv->notifyViewRequested    = impl_BookListener_respond_get_view;
-	epv->notifyChangesRequested = impl_BookListener_respond_get_changes;
-
-	epv->notifyConnectionStatus = impl_BookListener_report_connection_status;
-
-	return epv;
-}
-
-static void
-e_book_listener_corba_class_init (void)
-{
-	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_listener_vepv.GNOME_Evolution_Addressbook_BookListener_epv = e_book_listener_get_epv ();
-}
-
-static void
-e_book_listener_class_init (EBookListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_listener_destroy;
-
-	e_book_listener_corba_class_init ();
-}
-
-/**
- * e_book_listener_get_type:
- */
-GtkType
-e_book_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookListener",
-			sizeof (EBookListener),
-			sizeof (EBookListenerClass),
-			(GtkClassInitFunc)  e_book_listener_class_init,
-			(GtkObjectInitFunc) e_book_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
deleted file mode 100644
index d999d21a65..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_LISTENER_H__
-#define __E_BOOK_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <ebook/addressbook.h>
-#include <ebook/e-book-types.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookListener EBookListener;
-typedef struct _EBookListenerClass EBookListenerClass;
-typedef struct _EBookListenerPrivate EBookListenerPrivate;
-
-struct _EBookListener {
-	BonoboObject           parent;
-	EBookListenerPrivate *priv;
-};
-
-struct _EBookListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async responses */
-	OpenBookResponse,
-	CreateCardResponse,
-	RemoveCardResponse,
-	ModifyCardResponse,
-	GetCursorResponse,
-	GetBookViewResponse,
-	GetChangesResponse,
-	AuthenticationResponse,
-	GetSupportedFieldsResponse,
-
-	/* Async events */
-	LinkStatusEvent,
-	OpenProgressEvent,
-} EBookListenerOperation;
-
-typedef struct {
-	EBookListenerOperation  op;
-
-	/* For most Response notifications */
-	EBookStatus             status;
-
-	/* For OpenBookResponse */
-	GNOME_Evolution_Addressbook_Book          book;
-
-	/* For GetCursorResponse */
-	GNOME_Evolution_Addressbook_CardCursor    cursor;
-
-	/* For GetBookViewReponse */
-	GNOME_Evolution_Addressbook_BookView      book_view;
-
-	/* For GetSupportedFields */
-	const GNOME_Evolution_Addressbook_stringlist   *fields;
-
-	/* For OpenProgressEvent */
-	char                   *msg;
-	short                   percent;
-
-	/* For LinkStatusEvent */
-	gboolean                connected;
-
-	/* For Card[Added|Removed|Modified]Event */
-	char                   *id;
-} EBookListenerResponse;
-
-EBookListener         *e_book_listener_new            (void);
-int                    e_book_listener_check_pending  (EBookListener *listener);
-EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);
-GtkType                e_book_listener_get_type       (void);
-
-POA_GNOME_Evolution_Addressbook_BookListener__epv *e_book_listener_get_epv (void);
-
-#define E_BOOK_LISTENER_TYPE        (e_book_listener_get_type ())
-#define E_BOOK_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))
-#define E_BOOK_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_LISTENER_TYPE, EBookListenerClass))
-#define E_IS_BOOK_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_LISTENER_TYPE))
-#define E_IS_BOOK_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h
deleted file mode 100644
index a3e8bbc032..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_TYPES_H__
-#define __E_BOOK_TYPES_H__
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	E_BOOK_STATUS_SUCCESS,
-	E_BOOK_STATUS_UNKNOWN,
-	E_BOOK_STATUS_REPOSITORY_OFFLINE,
-	E_BOOK_STATUS_PERMISSION_DENIED,
-	E_BOOK_STATUS_CARD_NOT_FOUND,
-	E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED,
-	E_BOOK_STATUS_OTHER_ERROR
-} EBookStatus;
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
deleted file mode 100644
index 4ad674ccd8..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookViewListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-#include "e-card.h"
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_view_listener_parent_class;
-POA_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vepv;
-
-struct _EBookViewListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	bonobo_object_ref (BONOBO_OBJECT (listener));
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return FALSE;
-	}
-	bonobo_object_unref (BONOBO_OBJECT (listener));
-
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_view_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_id_event (EBookViewListener          *listener,
-				     EBookViewListenerOperation  op,
-				     const char             *id)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = g_strdup (id);
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,
-					   EBookViewListenerOperation  op,
-					   const GNOME_Evolution_Addressbook_VCardList  *cards)
-{
-	EBookViewListenerResponse *resp;
-	int i;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-	
-	for ( i = 0; i < cards->_length; i++ ) {
-		resp->cards = g_list_append(resp->cards, e_card_new(cards->_buffer[i]));
-	}
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Status Message */
-static void
-e_book_view_listener_queue_message_event (EBookViewListener          *listener,
-					  EBookViewListenerOperation  op,
-					  const char                 *message)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = g_strdup(message);
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookViewListener_notify_card_added (PortableServer_Servant servant,
-					 const GNOME_Evolution_Addressbook_VCardList *cards,
-					 CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardAddedEvent, cards);
-}
-
-static void
-impl_BookViewListener_notify_card_removed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_CardId id,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_id_event (
-		listener, CardRemovedEvent, (const char *) id);
-}
-
-static void
-impl_BookViewListener_notify_card_changed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_VCardList *cards,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardModifiedEvent, cards);
-}
-
-static void
-impl_BookViewListener_notify_sequence_complete (PortableServer_Servant servant,
-						CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_empty_event (listener, SequenceCompleteEvent);
-}
-
-static void
-impl_BookViewListener_notify_status_message (PortableServer_Servant  servant,
-					     const char             *message,
-					     CORBA_Environment      *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_message_event (listener, StatusMessageEvent, message);
-}
-
-/**
- * e_book_view_listener_check_pending:
- * @listener: the #EBookViewListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookViewListener.
- */
-int
-e_book_view_listener_check_pending (EBookViewListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_view_listener_pop_response:
- * @listener: the #EBookViewListener for which a request is to be popped
- *
- * Returns: an #EBookViewListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookViewListener.
- */
-EBookViewListenerResponse *
-e_book_view_listener_pop_response (EBookViewListener *listener)
-{
-	EBookViewListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookViewListener *
-e_book_view_listener_construct (EBookViewListener *listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookViewListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_view_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookViewListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_view_listener_new:
- * @book: the #EBookView for which the listener is to be bound
- *
- * Creates and returns a new #EBookViewListener for the book.
- *
- * Returns: a new #EBookViewListener
- */
-EBookViewListener *
-e_book_view_listener_new ()
-{
-	EBookViewListener *listener;
-	EBookViewListener *retval;
-
-	listener = gtk_type_new (E_BOOK_VIEW_LISTENER_TYPE);
-
-	retval = e_book_view_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_view_listener_new: Error constructing "
-			   "EBookViewListener!\n");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_view_listener_init (EBookViewListener *listener)
-{
-	listener->priv                 = g_new0 (EBookViewListenerPrivate, 1);
-	listener->priv->response_queue = NULL;
-	listener->priv->idle_id        = 0;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
-	GList             *l;
-
-	if (listener->priv->idle_id)
-		g_source_remove(listener->priv->idle_id);
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookViewListenerResponse *resp = l->data;
-
-		g_free(resp->id);
-
-		g_list_foreach(resp->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free(resp->cards);
-
-		g_free (resp->message);
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *
-e_book_view_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);
-
-	epv->notifyCardChanged      = impl_BookViewListener_notify_card_changed;
-	epv->notifyCardRemoved      = impl_BookViewListener_notify_card_removed;
-	epv->notifyCardAdded        = impl_BookViewListener_notify_card_added;
-	epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;
-	epv->notifyStatusMessage    = impl_BookViewListener_notify_status_message;
-
-	return epv;
-}
-
-static void
-e_book_view_listener_corba_class_init (void)
-{
-	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_view_listener_vepv.GNOME_Evolution_Addressbook_BookViewListener_epv = e_book_view_listener_get_epv ();
-}
-
-static void
-e_book_view_listener_class_init (EBookViewListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_view_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_view_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_view_listener_destroy;
-
-	e_book_view_listener_corba_class_init ();
-}
-
-/**
- * e_book_view_listener_get_type:
- */
-GtkType
-e_book_view_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookViewListener",
-			sizeof (EBookViewListener),
-			sizeof (EBookViewListenerClass),
-			(GtkClassInitFunc)  e_book_view_listener_class_init,
-			(GtkObjectInitFunc) e_book_view_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
deleted file mode 100644
index addf91e702..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookViewListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_LISTENER_H__
-#define __E_BOOK_VIEW_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <addressbook/backend/ebook/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookViewListener EBookViewListener;
-typedef struct _EBookViewListenerClass EBookViewListenerClass;
-typedef struct _EBookViewListenerPrivate EBookViewListenerPrivate;
-
-struct _EBookViewListener {
-	BonoboObject           parent;
-	EBookViewListenerPrivate *priv;
-};
-
-struct _EBookViewListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async events */
-	CardAddedEvent,
-	CardRemovedEvent,
-	CardModifiedEvent,
-	SequenceCompleteEvent,
-	StatusMessageEvent,
-} EBookViewListenerOperation;
-
-typedef struct {
-	EBookViewListenerOperation  op;
-
-	/* For CardRemovedEvent */
-	char                   *id;
-
-	/* For Card[Added|Modified]Event */
-	GList                  *cards; /* Of type ECard. */
-
-	/* For StatusMessageEvent */
-	char                   *message;
-	
-} EBookViewListenerResponse;
-
-EBookViewListener         *e_book_view_listener_new            (void);
-int                        e_book_view_listener_check_pending  (EBookViewListener *listener);
-EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);
-GtkType                    e_book_view_listener_get_type       (void);
-
-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);
-
-#define E_BOOK_VIEW_LISTENER_TYPE        (e_book_view_listener_get_type ())
-#define E_BOOK_VIEW_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))
-#define E_BOOK_VIEW_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListenerClass))
-#define E_IS_BOOK_VIEW_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_LISTENER_TYPE))
-#define E_IS_BOOK_VIEW_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
deleted file mode 100644
index 8faebe140f..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-
-GtkObjectClass *e_book_view_parent_class;
-
-struct _EBookViewPrivate {
-	GNOME_Evolution_Addressbook_BookView     corba_book_view;
-	
-	EBookViewListener     *listener;
-
-	int                    responses_queued_id;
-};
-
-enum {
-	CARD_CHANGED,
-	CARD_REMOVED,
-	CARD_ADDED,
-	SEQUENCE_COMPLETE,
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_signals [LAST_SIGNAL];
-
-static void
-e_book_view_do_added_event (EBookView                 *book_view,
-			    EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_ADDED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_modified_event (EBookView                 *book_view,
-			       EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_CHANGED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_removed_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_REMOVED],
-			 resp->id);
-
-	g_free(resp->id);
-}
-
-static void
-e_book_view_do_complete_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [SEQUENCE_COMPLETE]);
-}
-
-static void
-e_book_view_do_status_message_event (EBookView                 *book_view,
-				     EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [STATUS_MESSAGE],
-			 resp->message);
-	g_free(resp->message);
-}
-
-
-/*
- * Reading notices out of the EBookViewListener's queue.
- */
-static void
-e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_view)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = e_book_view_listener_pop_response (listener);
-
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CardAddedEvent:
-		e_book_view_do_added_event (book_view, resp);
-		break;
-	case CardModifiedEvent:
-		e_book_view_do_modified_event (book_view, resp);
-		break;
-	case CardRemovedEvent:
-		e_book_view_do_removed_event (book_view, resp);
-		break;
-	case SequenceCompleteEvent:
-		e_book_view_do_complete_event (book_view, resp);
-		break;
-	case StatusMessageEvent:
-		e_book_view_do_status_message_event (book_view, resp);
-		break;
-	default:
-		g_error ("EBookView: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-static gboolean
-e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
-{
-	CORBA_Environment  ev;
-	g_return_val_if_fail (book_view != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK_VIEW (book_view), FALSE);
-
-	/*
-	 * Copy in the corba_book_view.
-	 */
-	CORBA_exception_init (&ev);
-
-	book_view->priv->corba_book_view = CORBA_Object_duplicate(corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception duplicating corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	GNOME_Evolution_Addressbook_BookView_ref(book_view->priv->corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception reffing corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	        CORBA_Object_release (book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_view_construct: Exception releasing corba_book_view.\n");
-		}
-		CORBA_exception_free (&ev);
-		book_view->priv->corba_book_view = NULL;
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book_view->priv->listener = listener;
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-	book_view->priv->responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view->priv->listener), "responses_queued",
-								   e_book_view_check_listener_queue, book_view);
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
-{
-	EBookView *book_view;
-
-	book_view = gtk_type_new (E_BOOK_VIEW_TYPE);
-
-	if (! e_book_view_construct (book_view, corba_book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-		return NULL;
-	}
-
-	return book_view;
-}
-
-static void
-e_book_view_init (EBookView *book_view)
-{
-	book_view->priv                      = g_new0 (EBookViewPrivate, 1);
-	book_view->priv->corba_book_view     = CORBA_OBJECT_NIL;
-	book_view->priv->listener            = NULL;
-	book_view->priv->responses_queued_id = 0;
-}
-
-static void
-e_book_view_destroy (GtkObject *object)
-{
-	EBookView             *book_view = E_BOOK_VIEW (object);
-	CORBA_Environment  ev;
-
-	if (book_view->priv->corba_book_view) {
-		CORBA_exception_init (&ev);
-
-		GNOME_Evolution_Addressbook_BookView_unref(book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while unreffing BookView\n");
-			
-			CORBA_exception_free (&ev);
-			CORBA_exception_init (&ev);
-		}
-
-		CORBA_Object_release (book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while releasing BookView\n");
-		}
-
-		CORBA_exception_free (&ev);
-	}
-
-	if (book_view->priv->listener) {
-		if (book_view->priv->responses_queued_id)
-			gtk_signal_disconnect(GTK_OBJECT(book_view->priv->listener),
-					      book_view->priv->responses_queued_id);
-		bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
-	}
-
-	g_free (book_view->priv);
-
-	if (GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy)
-		GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy (object);
-}
-
-static void
-e_book_view_class_init (EBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_view_signals [CARD_CHANGED] =
-		gtk_signal_new ("card_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [CARD_ADDED] =
-		gtk_signal_new ("card_added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_added),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	e_book_view_signals [CARD_REMOVED] =
-		gtk_signal_new ("card_removed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_removed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [SEQUENCE_COMPLETE] =
-		gtk_signal_new ("sequence_complete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, sequence_complete),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_book_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, status_message),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, e_book_view_signals,
-				      LAST_SIGNAL);
-
-	klass->card_changed = NULL;
-	klass->card_added = NULL;
-	klass->card_removed = NULL;
-	klass->sequence_complete = NULL;
-	klass->status_message = NULL;
-
-	object_class->destroy = e_book_view_destroy;
-}
-
-/**
- * e_book_view_get_type:
- */
-GtkType
-e_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookView",
-			sizeof (EBookView),
-			sizeof (EBookViewClass),
-			(GtkClassInitFunc)  e_book_view_class_init,
-			(GtkObjectInitFunc) e_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
deleted file mode 100644
index 35126d4fce..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_H__
-#define __E_BOOK_VIEW_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book-view-listener.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookView        EBookView;
-typedef struct _EBookViewClass   EBookViewClass;
-typedef struct _EBookViewPrivate EBookViewPrivate;
-
-struct _EBookView {
-	GtkObject     parent;
-	EBookViewPrivate *priv;
-};
-
-struct _EBookViewClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* card_changed)      (EBookView *book_view, const GList *cards);
-	void (* card_removed)      (EBookView *book_view, const char *id);
-	void (* card_added)        (EBookView *book_view, const GList *cards);
-	void (* sequence_complete) (EBookView *book_view);
-	void (* status_message)    (EBookView *book_view, const char *message);
-};
-
-/* Creating a new addressbook. */
-EBookView         *e_book_view_new                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
-
-GtkType            e_book_view_get_type               (void);
-void               e_book_view_get_book_view_listener (EBookView *book_view);
-
-#define E_BOOK_VIEW_TYPE        (e_book_view_get_type ())
-#define E_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_TYPE, EBookView))
-#define E_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_TYPE, EBookViewClass))
-#define E_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_TYPE))
-#define E_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
deleted file mode 100644
index 1471d67f4c..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-listener.h"
-#include "e-book.h"
-
-GtkObjectClass *e_book_parent_class;
-
-#define CARDSERVER_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-typedef enum {
-	URINotLoaded,
-	URILoading,
-	URILoaded
-} EBookLoadState;
-
-struct _EBookPrivate {
-	GNOME_Evolution_Addressbook_BookFactory  book_factory;
-	EBookListener	      *listener;
-
-	GNOME_Evolution_Addressbook_Book         corba_book;
-
-	EBookLoadState         load_state;
-
-	/*
-	 * The operation queue.  New operations are appended to the
-	 * end of the queue.  When responses come back from the PAS,
-	 * the op structures are popped off the front of the queue.
-	 */
-	GList                 *pending_ops;
-};
-
-enum {
-	OPEN_PROGRESS,
-	LINK_STATUS,
-	LAST_SIGNAL
-};
-
-static guint e_book_signals [LAST_SIGNAL];
-
-typedef struct {
-	gpointer  cb;
-	gpointer  closure;
-	EBookViewListener *listener;
-} EBookOp;
-
-/*
- * Local response queue management.
- */
-static void
-e_book_queue_op (EBook    *book,
-		 gpointer  cb,
-		 gpointer  closure,
-		 EBookViewListener *listener)
-{
-	EBookOp *op;
-
-	op           = g_new0 (EBookOp, 1);
-	op->cb       = cb;
-	op->closure  = closure;
-	op->listener = listener;
-
-	book->priv->pending_ops =
-		g_list_append (book->priv->pending_ops, op);
-}
-
-static EBookOp *
-e_book_pop_op (EBook *book)
-{
-	GList   *popped;
-	EBookOp *op;
-
-	if (book->priv->pending_ops == NULL)
-		return NULL;
-
-	op = book->priv->pending_ops->data;
-
-	popped = book->priv->pending_ops;
-	book->priv->pending_ops =
-		g_list_remove_link (book->priv->pending_ops,
-				    book->priv->pending_ops);
-
-	g_list_free_1 (popped);
-
-	return op;
-}
-
-static void
-e_book_do_response_create_card (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_create_card: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookIdCallback) op->cb) (book, resp->status, resp->id, op->closure);
-	g_free (resp->id);
-	g_free (op);
-}
-
-static void
-e_book_do_response_generic (EBook                 *book,
-			    EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_generic: Cannot find operation "
-			   "in local op queue!\n");
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_cursor (EBook                 *book,
-			       EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	ECardCursor *cursor;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	cursor = e_card_cursor_new(resp->cursor);
-
-	if (op->cb)
-		((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
-
-	/*
-	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception unref'ing "
-			   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception releasing "
-			   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(cursor));
-	
-	g_free (op);
-}
-
-
-
-static void
-e_book_do_response_get_view (EBook                 *book,
-			     EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_view: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new(resp->book_view, op->listener);
-	
-	if (op->cb)
-		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-
-	/*
-	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception unref'ing "
-			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception releasing "
-			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(book_view));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_changes (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_changes: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new (resp->book_view, op->listener);
-	
-	if (op->cb)
-		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-
-	/*
-	 * Release the remote GNOME_Evolution_Addressbook_BookView in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_changes: Exception unref'ing "
-			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_changes: Exception releasing "
-			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(book_view));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_open (EBook                 *book,
-			 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	if (resp->status == E_BOOK_STATUS_SUCCESS) {
-		book->priv->corba_book  = resp->book;
-		book->priv->load_state  = URILoaded;
-	}
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_open: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-	g_free (op);
-}
-
-static void
-e_book_do_progress_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],
-			 resp->msg, resp->percent);
-
-	g_free (resp->msg);
-}
-
-static void
-e_book_do_link_event (EBook                 *book,
-		      EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],
-			 resp->connected);
-}
-
-static void
-e_book_do_response_get_supported_fields (EBook                 *book,
-					 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-	EList *list;
-	int i;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_supported_fields: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	list = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	for (i = 0; i < resp->fields->_length; i ++) {
-		e_list_append (list, g_strdup (resp->fields->_buffer[i]));
-	}
-
-	if (op->cb)
-		((EBookFieldsCallback) op->cb) (book, resp->status, list, op->closure);
-	g_free (op);
-}
-
-/*
- * Reading notices out of the EBookListener's queue.
- */
-static void
-e_book_check_listener_queue (EBookListener *listener, EBook *book)
-{
-	EBookListenerResponse *resp;
-
-	resp = e_book_listener_pop_response (listener);
-
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CreateCardResponse:
-		e_book_do_response_create_card (book, resp);
-		break;
-	case RemoveCardResponse:
-	case ModifyCardResponse:
-	case AuthenticationResponse:
-		e_book_do_response_generic (book, resp);
-		break;
-	case GetCursorResponse:
-		e_book_do_response_get_cursor (book, resp);
-		break;
-	case GetBookViewResponse:
-		e_book_do_response_get_view(book, resp);
-		break;
-	case GetChangesResponse:
-		e_book_do_response_get_changes(book, resp);
-		break;
-	case OpenBookResponse:
-		e_book_do_response_open (book, resp);
-		break;
-	case GetSupportedFieldsResponse:
-		e_book_do_response_get_supported_fields (book, resp);
-		break;
-
-	case OpenProgressEvent:
-		e_book_do_progress_event (book, resp);
-		break;
-	case LinkStatusEvent:
-		e_book_do_link_event (book, resp);
-		break;
-	default:
-		g_error ("EBook: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-/**
- * e_book_load_uri:
- */
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (uri != NULL,           FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	if (book->priv->load_state != URINotLoaded) {
-		g_warning ("e_book_load_uri: Attempted to load a URI "
-			   "on a book which already has a URI loaded!\n");
-		return FALSE;
-	}
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book->priv->listener = e_book_listener_new ();
-	if (book->priv->listener == NULL) {
-		g_warning ("e_book_load_uri: Could not create EBookListener!\n");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book->priv->listener), "responses_queued",
-			    e_book_check_listener_queue, book);
-
-	/*
-	 * Load the addressbook into the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookFactory_openBook (
-		book->priv->book_factory, uri,
-		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	book->priv->load_state = URILoading;
-
-	e_book_queue_op (book, open_response, closure, NULL);
-
-	/* Now we play the waiting game. */
-
-	return TRUE;
-}
-
-/**
- * e_book_unload_uri:
- */
-void
-e_book_unload_uri (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	/*
-	 * FIXME: Make sure this works if the URI is still being
-	 * loaded.
-	 */
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return;
-	}
-
-	/*
-	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception unref'ing "
-			   "remote GNOME_Evolution_Addressbook_Book interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception releasing "
-			   "remote book interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (book->priv->listener));
-
-	book->priv->listener   = NULL;
-	book->priv->load_state = URINotLoaded;
-}
-
-char *
-e_book_get_static_capabilities (EBook *book)
-{
-	CORBA_Environment ev;
-	char *temp;
-	char *ret_val;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return g_strdup("");
-	}
-
-	temp = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_static_capabilities: Exception "
-			   "during get_static_capabilities!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	ret_val = g_strdup(temp);
-	CORBA_free(temp);
-
-	CORBA_exception_free (&ev);
-
-	return ret_val;
-}
-
-gboolean
-e_book_get_supported_fields (EBook              *book,
-			     EBookFieldsCallback cb,
-			     gpointer            closure)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return FALSE;
-	}
-
-	GNOME_Evolution_Addressbook_Book_getSupportedFields(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_supported_fields: Exception "
-			   "during get_supported_fields!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-static gboolean
-e_book_construct (EBook *book)
-{
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	/*
-	 * Connect to the Personal Addressbook Server.
-	 */
-
-	book->priv->book_factory = (GNOME_Evolution_Addressbook_BookFactory)
-		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
-	if (book->priv->book_factory == CORBA_OBJECT_NIL) {
-		g_warning ("e_book_construct: Could not obtain a handle "
-			   "to the Personal Addressbook Server!\n");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * e_book_new:
- */
-EBook *
-e_book_new (void)
-{
-	EBook *book;
-
-	book = gtk_type_new (E_BOOK_TYPE);
-
-	if (! e_book_construct (book)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		return NULL;
-	}
-
-	return book;
-}
-
-/* User authentication. */
-
-void
-e_book_authenticate_user (EBook         *book,
-			  const char    *user,
-			  const char    *passwd,
-			  EBookCallback cb,
-			  gpointer      closure)
-{
-	CORBA_Environment  ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_authenticate_user: No URI loaded!\n");
-		return;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_authenticateUser (book->priv->corba_book,
-							   user,
-							   passwd,
-							   &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_authenticate_user: Exception authenticating user with the PAS!\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-}
-
-/* Fetching cards */
-
-/**
- * e_book_get_card:
- */
-ECard *
-e_book_get_card (EBook       *book,
-		 const char  *id)
-{
-	char  *vcard;
-	ECard *card;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return NULL;
-	}
-
-	vcard = e_book_get_vcard (book, id);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_get_card: Got bogus VCard from PAS!\n");
-		return NULL;
-	}
-
-	card = e_card_new (vcard);
-	g_free(vcard);
-	
-	e_card_set_id(card, id);
-
-	return card;
-}
-
-/**
- * e_book_get_vcard:
- */
-char *
-e_book_get_vcard (EBook       *book,
-		  const char  *id)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *vcard;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_vcard: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	vcard = GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book,
-					  (GNOME_Evolution_Addressbook_CardId) id,
-					  &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_vcard: Exception getting VCard from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (vcard == NULL || strlen (vcard) == 0) {
-		g_warning ("e_book_get_vcard: Got NULL VCard from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (vcard);
-	CORBA_free (vcard);
-
-	return retval;
-}
-
-/* Deleting cards. */
-
-/**
- * e_book_remove_card:
- */
-gboolean
-e_book_remove_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	const char *id;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	id = e_card_get_id (card);
-	g_assert (id != NULL);
-
-	return e_book_remove_card_by_id (book, id, cb, closure);
-}
-
-/**
- * e_book_remove_card_by_id:
- */
-gboolean
-e_book_remove_card_by_id (EBook         *book,
-			  const char    *id,
-			  EBookCallback  cb,
-			  gpointer       closure)
-
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (id != NULL,       FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_removeCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_remove_card_by_id: CORBA exception "
-			   "talking to PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Adding cards. */
-
-/**
- * e_book_add_card:
- */
-gboolean
-e_book_add_card (EBook           *book,
-		 ECard           *card,
-		 EBookIdCallback  cb,
-		 gpointer         closure)
-
-{
-	char     *vcard;
-	gboolean  retval;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_add_card: Cannot convert card to VCard string!\n");
-		return FALSE;
-	}
-
-	retval = e_book_add_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	return retval;
-}
-
-/**
- * e_book_add_vcard:
- */
-gboolean
-e_book_add_vcard (EBook           *book,
-		  const char      *vcard,
-		  EBookIdCallback  cb,
-		  gpointer         closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_addCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Modifying cards. */
-
-/**
- * e_book_commit_card:
- */
-gboolean
-e_book_commit_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	char     *vcard;
-	gboolean  retval;
-	
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_commit_card: Error "
-			   "getting VCard for card!\n");
-		return FALSE;
-	}
-
-	retval = e_book_commit_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	return retval;
-}
-
-/**
- * e_book_commit_vcard:
- */
-gboolean
-e_book_commit_vcard (EBook         *book,
-		     const char    *vcard,
-		     EBookCallback  cb,
-		     gpointer       closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_modifyCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_commit_vcard: Exception "
-			   "modifying card in PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-/**
- * e_book_check_connection:
- */
-gboolean
-e_book_check_connection (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_checkConnection (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_check_connection: Exception "
-			   "querying the PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-gboolean e_book_get_cursor       (EBook               *book,
-				  gchar               *query,
-				  EBookCursorCallback  cb,
-				  gpointer             closure)
-{
-	CORBA_Environment ev;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return FALSE;
-	}
-	
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_Addressbook_Book_getCursor (book->priv->corba_book, query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_all_cards: Exception "
-			   "querying list of cards!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-gboolean e_book_get_book_view       (EBook                 *book,
-				     gchar                 *query,
-				     EBookBookViewCallback  cb,
-				     gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_book_view: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_Addressbook_Book_getBookView (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_book_view: Exception "
-			   "getting book_view!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, listener);
-
-	return TRUE;
-}
-
-gboolean e_book_get_changes         (EBook                 *book,
-				     gchar                 *changeid,
-				     EBookBookViewCallback  cb,
-				     gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_changes: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_Addressbook_Book_getChanges (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_changes: Exception "
-			   "getting changes!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, listener);
-
-	return TRUE;
-}
-
-/**
- * e_book_get_name:
- */
-char *
-e_book_get_name (EBook *book)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *name;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_name: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	name = GNOME_Evolution_Addressbook_Book_getName (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_name: Exception getting name from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (name == NULL) {
-		g_warning ("e_book_get_name: Got NULL name from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (name);
-	CORBA_free (name);
-
-	return retval;
-}
-
-static void
-e_book_init (EBook *book)
-{
-	book->priv             = g_new0 (EBookPrivate, 1);
-	book->priv->load_state = URINotLoaded;
-}
-
-static void
-e_book_destroy (GtkObject *object)
-{
-	EBook             *book = E_BOOK (object);
-	CORBA_Environment  ev;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	CORBA_Object_release (book->priv->book_factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBook: Exception while releasing BookFactory\n");
-
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (e_book_parent_class)->destroy (object);
-}
-
-static void
-e_book_class_init (EBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_signals [LINK_STATUS] =
-		gtk_signal_new ("link_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookClass, link_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, e_book_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = e_book_destroy;
-}
-
-/**
- * e_book_get_type:
- */
-GtkType
-e_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBook",
-			sizeof (EBook),
-			sizeof (EBookClass),
-			(GtkClassInitFunc)  e_book_class_init,
-			(GtkObjectInitFunc) e_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
deleted file mode 100644
index 6a68e010e4..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_H__
-#define __E_BOOK_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-cursor.h>
-#include <addressbook/backend/ebook/e-book-view.h>
-#include <addressbook/backend/ebook/e-book-types.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBook        EBook;
-typedef struct _EBookClass   EBookClass;
-typedef struct _EBookPrivate EBookPrivate;
-
-struct _EBook {
-	GtkObject     parent;
-	EBookPrivate *priv;
-};
-
-struct _EBookClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* open_progress) (EBook *book, const char *msg, short percent);
-	void (* link_status)   (EBook *book, gboolean connected);
-};
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);
-typedef void (*EBookOpenProgressCallback)     (EBook          *book,
-					       const char     *status_message,
-					       short           percent,
-					       gpointer        closure);
-typedef void (*EBookIdCallback) (EBook *book, EBookStatus status, const char *id, gpointer closure);
-typedef void (*EBookCursorCallback) (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure);
-typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
-typedef void (*EBookFieldsCallback) (EBook *book, EBookStatus status, EList *fields, gpointer closure);
-
-
-/* Creating a new addressbook. */
-EBook    *e_book_new                      (void);
-gboolean  e_book_load_uri                 (EBook                 *book,
-					   const char            *uri,
-					   EBookCallback          open_response,
-					   gpointer               closure);
-void      e_book_unload_uri               (EBook                 *book);
-char     *e_book_get_static_capabilities  (EBook                 *book);
-
-gboolean  e_book_get_supported_fields     (EBook                 *book,
-					   EBookFieldsCallback   cb,
-					   gpointer              closure);
-
-/* User authentication. */
-void      e_book_authenticate_user        (EBook                 *book,
-					   const char            *user,
-					   const char            *passwd,
-					   EBookCallback         cb,
-					   gpointer              closure);
-
-/* Fetching cards. */
-ECard    *e_book_get_card                 (EBook                 *book,
-					   const char            *id);
-char     *e_book_get_vcard                (EBook                 *book,
-					   const char            *id);
-
-/* Deleting cards. */
-gboolean  e_book_remove_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_remove_card_by_id        (EBook                 *book,
-					   const char            *id,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Adding cards. */
-gboolean  e_book_add_card                 (EBook                 *book,
-					   ECard                 *card,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-gboolean  e_book_add_vcard                (EBook                 *book,
-					   const char            *vcard,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-
-/* Modifying cards. */
-gboolean  e_book_commit_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_commit_vcard             (EBook                 *book,
-					   const char            *vcard,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Checking to see if we're connected to the card repository. */
-gboolean  e_book_check_connection         (EBook                 *book);
-gboolean  e_book_get_cursor               (EBook                 *book,
-					   char                  *query,
-					   EBookCursorCallback    cb,
-					   gpointer               closure);
-
-gboolean  e_book_get_book_view            (EBook                 *book,
-					   char                  *query,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-gboolean  e_book_get_changes              (EBook                 *book,
-					   char                  *changeid,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-/* Getting the name of the repository. */
-char     *e_book_get_name                 (EBook                 *book);
-
-GtkType   e_book_get_type                 (void);
-
-#define E_BOOK_TYPE        (e_book_get_type ())
-#define E_BOOK(o)          (GTK_CHECK_CAST ((o), E_BOOK_TYPE, EBook))
-#define E_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_TYPE, EBookClass))
-#define E_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), E_BOOK_TYPE))
-#define E_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_H__ */
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
deleted file mode 100644
index faf402d1e7..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include "addressbook.h"
-#include "e-card-cursor.h"
-
-struct _ECardCursorPrivate {
-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
-};
-
-/*
- * A pointer to our parent object class
- */
-static GtkObjectClass *parent_class;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-e_card_cursor_destroy (GtkObject *object)
-{
-	ECardCursor *cursor = E_CARD_CURSOR (object);
-	CORBA_Environment      ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_CardCursor_unref( cursor->priv->corba_cursor, &ev );
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception unreffing "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	CORBA_Object_release (cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception releasing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/**
- * e_card_cursor_get_length:
- * @cursor: the #ECardCursor whose length is being queried
- *
- * Returns: the number of items the cursor references, or -1 there's
- * an error.
- */
-long
-e_card_cursor_get_length (ECardCursor *cursor)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      ev;
-		long ret_val;
-
-		CORBA_exception_init (&ev);
-
-		ret_val = GNOME_Evolution_Addressbook_CardCursor_count (cursor->priv->corba_cursor, &ev);
-		
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_length: Exception during "
-				  "get_length corba call.\n");
-			ret_val = -1;
-		}
-
-		CORBA_exception_free (&ev);
-
-		return ret_val;
-	}
-	else
-		return -1;
-}
-
-/**
- * e_card_cursor_get_nth:
- * @cursor: an #ECardCursor object
- * @n: the index of the item requested
- *
- * Gets an #ECard based on an index.
- *
- * Returns: a new #ECard on success, or %NULL on failure.
- */
-ECard *
-e_card_cursor_get_nth (ECardCursor *cursor,
-		       const long   n)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      en;
-		CORBA_char *vcard;
-		ECard *card;
-
-		CORBA_exception_init (&en);
-
-		vcard = GNOME_Evolution_Addressbook_CardCursor_getNth(cursor->priv->corba_cursor, n, &en);
-		
-		if (en._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_nth: Exception during "
-				  "get_nth corba call.\n");
-		}
-		
-		CORBA_exception_free (&en);
-
-		card = e_card_new (vcard);
-
-		CORBA_free(vcard);
-
-		return card;
-	}
-	else
-		return e_card_new("");
-}
-
-static void
-e_card_cursor_class_init (ECardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = e_card_cursor_destroy;
-}
-
-static void
-e_card_cursor_init (ECardCursor *cursor)
-{
-	cursor->priv = g_new(ECardCursorPrivate, 1);
-	cursor->priv->corba_cursor = CORBA_OBJECT_NIL;
-}
-
-GtkType
-e_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardCursor",
-			sizeof (ECardCursor),
-			sizeof (ECardCursorClass),
-			(GtkClassInitFunc) e_card_cursor_class_init,
-			(GtkObjectInitFunc) e_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-/**
- * e_card_cursor_construct:
- * @cursor: an #ECardCursor object
- * @corba_cursor: an #GNOME_Evolution_Addressbook_CardCursor
- *
- * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor
- * @cursor object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_construct (ECardCursor          *cursor,
-			 GNOME_Evolution_Addressbook_CardCursor  corba_cursor)
-{
-	CORBA_Environment      ev;
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (E_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	CORBA_exception_init (&ev);
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->corba_cursor = CORBA_Object_duplicate(corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception duplicating "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	GNOME_Evolution_Addressbook_CardCursor_ref(cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception reffing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/**
- * e_card_cursor_new:
- * @cursor: the #GNOME_Evolution_Addressbook_CardCursor to be wrapped
- *
- * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor
- * object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor)
-{
-	ECardCursor *cursor;
-
-	cursor = gtk_type_new (e_card_cursor_get_type ());
-	
-	return e_card_cursor_construct (cursor,
-					corba_cursor);
-}
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
deleted file mode 100644
index 1b5f0d0e0c..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtk.h>
-#include <addressbook/backend/ebook/addressbook.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _ECardCursor        ECardCursor;
-typedef struct _ECardCursorPrivate ECardCursorPrivate;
-typedef struct _ECardCursorClass   ECardCursorClass;
-
-struct _ECardCursor {
-	GtkObject           parent;
-	ECardCursorPrivate *priv;
-};
-
-struct _ECardCursorClass {
-	GtkObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new       (GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
-
-GtkType      e_card_cursor_get_type    (void);
-
-/* Fetching cards. */
-long         e_card_cursor_get_length  (ECardCursor          *cursor);
-ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,
-					const long            nth);
-#define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())
-#define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))
-#define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))
-#define E_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE))
-#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_CURSOR_H__ */
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
deleted file mode 100644
index 0f379d3477..0000000000
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GnomeCard - a graphical contact manager.
- *
- * pairs.h: This file is part of GnomeCard.
- * 
- * Copyright (C) 1999 The Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __E_CARD_PAIRS_H__
-#define __E_CARD_PAIRS_H__
-
-#include <libversit/vcc.h>
-#include <ebook/e-card.h>
-
-
-#if 0
-struct pair
-{
-	char *str;
-	ECardPropertyType i ;
-};
-
-struct pair prop_lookup[] = {
-		{        VCFullNameProp, PROP_FNAME },
-		{            VCNameProp, PROP_NAME },
-		{           VCPhotoProp, PROP_PHOTO },
-		{       VCBirthDateProp, PROP_BDAY },
-		{             VCAdrProp, PROP_DELADDR },
-		{   VCDeliveryLabelProp, PROP_DELLABEL },
-		{       VCTelephoneProp, PROP_PHONE },
-		{    VCEmailAddressProp, PROP_EMAIL },
-		{          VCMailerProp, PROP_MAILER },
-		{        VCTimeZoneProp, PROP_TIMEZN },
-		{             VCGeoProp, PROP_GEOPOS },
-		{           VCTitleProp, PROP_TITLE },
-		{    VCBusinessRoleProp, PROP_ROLE },
-		{            VCLogoProp, PROP_LOGO },
-		{           VCAgentProp, PROP_AGENT },
-		{             VCOrgProp, PROP_ORG },
-		{      VCCategoriesProp, PROP_CATEGORIES },
-		{         VCCommentProp, PROP_COMMENT },
-		{     VCLastRevisedProp, PROP_REV },
-		{   VCPronunciationProp, PROP_SOUND },
-		{             VCURLProp, PROP_URL },
-		{    VCUniqueStringProp, PROP_UID },
-		{         VCVersionProp, PROP_VERSION },
-		{       VCPublicKeyProp, PROP_KEY },
-		{           VCValueProp, PROP_VALUE },
-		{        VCEncodingProp, PROP_ENCODING },
-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },
-		{            VC8bitProp, PROP_8BIT },
-		{          VCBase64Prop, PROP_BASE64 },
-		{        VCLanguageProp, PROP_LANG },
-		{         VCCharSetProp, PROP_CHARSET },
-		{ NULL, PROP_NONE} };
-
-struct pair photo_pairs[] = {
-		{ VCGIFProp, PHOTO_GIF },
-		{ VCCGMProp, PHOTO_CGM },
-		{ VCWMFProp, PHOTO_WMF },
-		{ VCBMPProp, PHOTO_BMP },
-		{ VCMETProp, PHOTO_MET },
-		{ VCPMBProp, PHOTO_PMB },
-		{ VCDIBProp, PHOTO_DIB },
-		{ VCPICTProp, PHOTO_PICT },
-		{ VCTIFFProp, PHOTO_TIFF },
-		{ VCPDFProp, PHOTO_PDF },
-		{ VCPSProp, PHOTO_PS },
-		{ VCJPEGProp, PHOTO_JPEG },
-		{ VCMPEGProp, PHOTO_MPEG },
-		{ VCMPEG2Prop, PHOTO_MPEG2 },
-		{ VCAVIProp, PHOTO_AVI },
-		{ VCQuickTimeProp, PHOTO_QTIME },
-		{ NULL, 0 } };
-
-struct pair email_pairs[] = {
-		{ VCAOLProp, EMAIL_AOL },
-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
-		{ VCATTMailProp, EMAIL_ATT },
-		{ VCCISProp, EMAIL_CIS },
-		{ VCEWorldProp, EMAIL_EWORLD },
-		{ VCInternetProp, EMAIL_INET },
-		{ VCIBMMailProp, EMAIL_IBM },
-		{ VCMCIMailProp, EMAIL_MCI },
-		{ VCPowerShareProp, EMAIL_POWERSHARE },
-		{ VCProdigyProp, EMAIL_PRODIGY },
-		{ VCTLXProp, EMAIL_TLX },
-		{ VCX400Prop, EMAIL_X400 },
-		{ NULL, 0 } };
-
-struct pair sound_pairs[] = {
-		{ VCAIFFProp, SOUND_AIFF },
-		{ VCPCMProp, SOUND_PCM },
-		{ VCWAVEProp, SOUND_WAVE },
-		{ NULL, 0 } };
-
-struct pair key_pairs[] = {
-		{ VCX509Prop, KEY_X509 },
-		{ VCPGPProp, KEY_PGP },
-		{ NULL, 0 } };
-	  
-
-#endif
-#endif /* ! __E_CARD_PAIRS_H__ */
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
deleted file mode 100644
index ff65ff82b0..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-#if 0
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_ID
-#endif
-};
-
-
-typedef enum _ECardSimpleInternalType ECardSimpleInternalType;
-typedef struct _ECardSimpleFieldData ECardSimpleFieldData;
-
-enum _ECardSimpleInternalType {
-	E_CARD_SIMPLE_INTERNAL_TYPE_STRING,
-	E_CARD_SIMPLE_INTERNAL_TYPE_DATE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS,
-	E_CARD_SIMPLE_INTERNAL_TYPE_PHONE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL,
-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,
-};
-
-struct _ECardSimpleFieldData {
-	ECardSimpleField         field;
-	char                    *ecard_field;
-	char                    *name;
-	char                    *short_name;
-	int                      list_type_index;
-	ECardSimpleInternalType  type;
-};
-
-/* This order must match the order in the .h. */
-
-static ECardSimpleFieldData field_data[] =
-{
-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",     "File As",       "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",   "Name",          "Name",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name", "Family Name",   "Family Name",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "",            "Email",         "Email",    E_CARD_SIMPLE_EMAIL_ID_EMAIL,   	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "",            "Primary",       "Prim",     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "",            "Business",      "Bus",      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "",            "Home",          "Home",     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",         "Organization",  "Org",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "",            "Business",      "Bus",      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "",            "Home",          "Home",     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "",            "Mobile",        "Mobile",   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "",            "Car",           "Car",      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "",            "Business Fax",  "Bus Fax",  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "",            "Home Fax",      "Home Fax", E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "",            "Business 2",    "Bus 2",    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "",            "Home 2",        "Home 2",   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "",            "ISDN",          "ISDN",     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "",            "Other",         "Other",    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "",            "Pager",         "Pager",    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "",            "Other",         "Other",    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "",            "Email 2",       "Email 2",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "",            "Email 3",       "Email 3",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",         "Web Site",      "Url",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",    "Department",    "Dep",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",      "Office",        "Off",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",       "Title",         "Title",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",        "Profession",    "Prof",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",     "Manager",       "Man",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",   "Assistant",     "Ass",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",    "Nickname",      "Nick",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",      "Spouse",        "Spouse",   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",        "Note",          "Note",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",       "Free-busy URL", "FBUrl",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary", "Anniversary",   "Anniv",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",  "Birth Date",    "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",      "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",   "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-};
-
-static void e_card_simple_init (ECardSimple *simple);
-static void e_card_simple_class_init (ECardSimpleClass *klass);
-
-static void e_card_simple_destroy (GtkObject *object);
-static void e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void fill_in_info(ECardSimple *simple);
-
-ECardPhoneFlags phone_correspondences[] = {
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */
-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */
-	E_CARD_PHONE_CELL | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Business",
-	"Business 2",
-	"Business Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mobile",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pager",
-	"Primary",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_short_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Bus",
-	"Bus 2",
-	"Bus Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mob",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pag",
-	"Prim",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-ECardAddressFlags addr_correspondences[] = {
-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */
-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */
-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */
-};
-
-char *address_names[] = {
-	"Business",
-	"Home",
-	"Other",
-};
-
-/**
- * e_card_simple_get_type:
- * @void: 
- * 
- * Registers the &ECardSimple class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECardSimple class.
- **/
-GtkType
-e_card_simple_get_type (void)
-{
-	static GtkType simple_type = 0;
-
-	if (!simple_type) {
-		GtkTypeInfo simple_info = {
-			"ECardSimple",
-			sizeof (ECardSimple),
-			sizeof (ECardSimpleClass),
-			(GtkClassInitFunc) e_card_simple_class_init,
-			(GtkObjectInitFunc) e_card_simple_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		simple_type = gtk_type_unique (gtk_object_get_type (), &simple_info);
-	}
-
-	return simple_type;
-}
-
-/**
- * e_card_simple_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ECardSimple that wraps the @VCard.
- */
-ECardSimple *
-e_card_simple_new (ECard *card)
-{
-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));
-	gtk_object_set(GTK_OBJECT(simple),
-		       "card", card,
-		       NULL);
-	return simple;
-}
-
-ECardSimple *e_card_simple_duplicate(ECardSimple *simple)
-{
-	char *vcard = e_card_simple_get_vcard(simple);
-	ECard *card = e_card_new(vcard);
-	ECardSimple *new_simple = e_card_simple_new(card);
-	g_free (vcard);
-	return new_simple;
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- *
- * Returns: a string representing the id of the simple, which is unique
- * within its book.
- */
-char *
-e_card_simple_get_id (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_id(simple->card);
-	else
-		return "";
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- * @id: a id in string format
- *
- * Sets the identifier of a simple, which should be unique within its
- * book.
- */
-void
-e_card_simple_set_id (ECardSimple *simple, const char *id)
-{
-	if ( simple->card )
-		e_card_set_id(simple->card, id);
-}
-
-/**
- * e_card_simple_get_vcard:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char
-*e_card_simple_get_vcard (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard(simple->card);
-	else
-		return g_strdup("");
-}
-
-static void
-e_card_simple_class_init (ECardSimpleClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ECardSimple::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_card_simple_destroy;
-	object_class->get_arg = e_card_simple_get_arg;
-	object_class->set_arg = e_card_simple_set_arg;
-}
-
-/*
- * ECardSimple lifecycle management and vcard loading/saving.
- */
-
-static void
-e_card_simple_destroy (GtkObject *object)
-{
-	ECardSimple *simple;
-	int i;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	if (simple->card)
-		gtk_object_unref(GTK_OBJECT(simple->card));
-	g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-	g_list_free(simple->temp_fields);
-	simple->temp_fields = NULL;
-
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		g_free(simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		g_free(simple->address[i]);
-}
-
-
-/* Set_arg handler for the simple */
-static void
-e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (simple->card)
-			gtk_object_unref(GTK_OBJECT(simple->card));
-		g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-		g_list_free(simple->temp_fields);
-		simple->temp_fields = NULL;
-		if (GTK_VALUE_OBJECT(*arg))
-			simple->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-		else
-			simple->card = NULL;
-		if(simple->card)
-			gtk_object_ref(GTK_OBJECT(simple->card));
-		fill_in_info(simple);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the simple */
-static void
-e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(simple);
-		if (simple->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(simple->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_simple_init:
- */
-static void
-e_card_simple_init (ECardSimple *simple)
-{
-	int i;
-	simple->card = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		simple->phone[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		simple->email[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		simple->address[i] = NULL;
-	simple->temp_fields = NULL;
-}
-
-static void
-fill_in_info(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const char *email;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		int i;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-			e_card_phone_free(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_copy(phone);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-			g_free(simple->email[i]);
-			simple->email[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if ((simple->email[i] == NULL)) {
-					simple->email[i] = g_strdup(email);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_address_label_free(simple->address[i]);
-			simple->address[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((address->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->address[i] == NULL)) {
-					simple->address[i] = e_card_address_label_copy(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_free(simple->delivery[i]);
-			simple->delivery[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->delivery[i] == NULL)) {
-					simple->delivery[i] = e_card_delivery_address_copy(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-}
-
-void
-e_card_simple_sync_card(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		const char *email;
-		int i;
-		int iterator_next = 1;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			phone = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_phone_free(simple->phone[i]);
-						simple->phone[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-			if (simple->phone[i]) {
-				simple->phone[i]->flags = phone_correspondences[i];
-				e_list_append(phone_list, simple->phone[i]);
-				e_card_phone_free(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			email = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if (simple->email[i]) {
-					if (*simple->email[i]) {
-						e_iterator_set(iterator, simple->email[i]);
-					} else {
-						e_iterator_delete(iterator);
-						iterator_next = 0;
-					}
-					g_free(simple->email[i]);
-					simple->email[i] = NULL;
-					break;
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-			if (simple->email[i]) {
-				e_list_append(email_list, simple->email[i]);
-				g_free(simple->email[i]);
-				simple->email[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			address = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags = addr_correspondences[i];
-						if (simple->address[i]->data && *simple->address[i]->data) {
-							e_iterator_set(iterator, simple->address[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_address_label_free(simple->address[i]);
-						simple->address[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->address[i]) {
-				simple->address[i]->flags = addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_free(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			delivery = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags = addr_correspondences[i];
-						if (!e_card_delivery_address_is_empty(simple->delivery[i])) {
-							e_iterator_set(iterator, simple->delivery[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_delivery_address_free(simple->delivery[i]);
-						simple->delivery[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->delivery[i]) {
-				simple->delivery[i]->flags = addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_free(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-	}
-}
-
-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,
-						 ECardSimplePhoneId    id)
-{
-	return simple->phone[id];
-}
-
-const char           *e_card_simple_get_email   (ECardSimple          *simple,
-						 ECardSimpleEmailId    id)
-{
-	return simple->email[id];
-}
-
-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,
-						 ECardSimpleAddressId  id)
-{
-	return simple->address[id];
-}
-
-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,
-								ECardSimpleAddressId  id)
-{
-	return simple->delivery[id];
-}
-
-void            e_card_simple_set_phone   (ECardSimple          *simple,
-					   ECardSimplePhoneId    id,
-					   const ECardPhone           *phone)
-{
-	if (simple->phone[id])
-		e_card_phone_free(simple->phone[id]);
-	simple->phone[id] = e_card_phone_copy(phone);
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	if (simple->email[id])
-		g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-}
-
-void            e_card_simple_set_address (ECardSimple          *simple,
-					   ECardSimpleAddressId  id,
-					   const ECardAddrLabel       *address)
-{
-	if (simple->address[id])
-		e_card_address_label_free(simple->address[id]);
-	simple->address[id] = e_card_address_label_copy(address);
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_copy(delivery);
-}
-
-const char *e_card_simple_get_const    (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	char *ret_val = e_card_simple_get(simple, field);
-	if (ret_val)
-		simple->temp_fields = g_list_prepend(simple->temp_fields, ret_val);
-	return ret_val;
-}
-
-char     *e_card_simple_get            (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	const ECardAddrLabel *addr;
-	const ECardPhone *phone;
-	const char *string;
-	ECardDate *date;
-	ECardName *name;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &string,
-			       NULL);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &date,
-			       NULL);
-		return NULL; /* FIXME!!!! */
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		addr = e_card_simple_get_address(simple,
-						 field_data[field].list_type_index);
-		if (addr)
-			return g_strdup(addr->data);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-		phone = e_card_simple_get_phone(simple,
-						field_data[field].list_type_index);
-		if (phone)
-			return g_strdup(phone->number);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-		string = e_card_simple_get_email(simple,
-						 field_data[field].list_type_index);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       "full_name", &string,
-				       NULL);
-			if (string && *string)
-				return g_strdup(string);
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       "org", &string,
-				       NULL);
-			if (string && *string)
-				return g_strdup(string);
-			string = e_card_simple_get_email(simple,
-							 E_CARD_SIMPLE_EMAIL_ID_EMAIL); 
-			return g_strdup(string);
-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
-			gtk_object_get (GTK_OBJECT(simple->card),
-					"name", &name,
-					NULL);
-			return g_strdup (name->family);
-		default:
-			return NULL;
-		}
-	default:
-		return NULL;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (ECardSimple *simple)
-{
-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	char *trystring;
-	char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!full_name)
-		full_name = g_strdup("");
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-
-		name = e_card_name_from_string(full_name);
-		
-		if (!name) {
-			goto end;
-		}
-
-		style = -1;
-		
-		for (i = 0; i < 5; i++) {
-			trystring = name_to_style(name, company, i);
-			if (!strcmp(trystring, filestring)) {
-				g_free(trystring);
-				style = i;
-				goto end;
-			}
-			g_free(trystring);
-		}
-	}		
- end:
-		
-	g_free(filestring);
-	g_free(full_name);
-	g_free(company);
-	if (name)
-		e_card_name_free(name);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-		
-		if (!full_name)
-			full_name = g_strdup("");
-		if (!company)
-			company = g_strdup("");
-		name = e_card_name_from_string(full_name);
-		if (name) {
-			string = name_to_style(name, company, style);
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);
-			g_free(string);
-		}
-		g_free(full_name);
-		g_free(company);
-		e_card_name_free(name);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	switch (field) {
-	case E_CARD_SIMPLE_FIELD_FULL_NAME:
-	case E_CARD_SIMPLE_FIELD_ORG:
-		style = file_as_get_style(simple);
-		gtk_object_set(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, data,
-			       NULL);
-		file_as_set_style(simple, style);
-		break;
-	default:
-		switch(type) {
-		case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-			gtk_object_set(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, data,
-				       NULL);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-			break; /* FIXME!!!! */
-		case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-			address = e_card_address_label_new();
-			address->data = (char *) data;
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			address->data = NULL;
-			e_card_address_label_free(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = (char *) data;
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			phone->number = NULL;
-			e_card_phone_free(phone);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-			e_card_simple_set_email(simple,
-						field_data[field].list_type_index,
-						data);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-			break;
-		}
-		break;
-	}
-}
-					     
-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,
-					  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	default:
-		return E_CARD_SIMPLE_TYPE_STRING;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		return E_CARD_SIMPLE_TYPE_DATE;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		return E_CARD_SIMPLE_TYPE_STRING;
-	}
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].name;
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].short_name;
-}
-
-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
-						       ECardSimpleArbitraryCallback *callback,
-						       gpointer                      closure)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (callback)
-				(*callback) (arbitrary, closure);
-		}
-	}
-}
-
-const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,
-						       const char           *key)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key))
-				return arbitrary;
-		}
-	}
-	return NULL;
-}
-
-/* Any of these except key can be NULL */	      
-void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,
-						       const char           *key,
-						       const char           *type,
-						       const char           *value)
-{
-	if (simple->card) {
-	ECardArbitrary *new_arb;
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key)) {
-				new_arb = e_card_arbitrary_new();
-				new_arb->key = g_strdup(key);
-				new_arb->type = g_strdup(type);
-				new_arb->value = g_strdup(value);
-				e_iterator_set(iterator, new_arb);
-				e_card_arbitrary_free(new_arb);
-				return;
-			}
-		}
-		new_arb = e_card_arbitrary_new();
-		new_arb->key = g_strdup(key);
-		new_arb->type = g_strdup(type);
-		new_arb->value = g_strdup(value);
-		e_list_append(list, new_arb);
-		e_card_arbitrary_free(new_arb);
-	}
-}
-
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
deleted file mode 100644
index e23f5fe90c..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_SIMPLE_H__
-#define __E_CARD_SIMPLE_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())
-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))
-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))
-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))
-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))
-
-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;
-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;
-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;
-typedef enum _ECardSimpleType ECardSimpleType;
-typedef enum _ECardSimpleField ECardSimpleField;
-
-enum _ECardSimplePhoneId {
-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,
-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,
-	E_CARD_SIMPLE_PHONE_ID_CAR,
-	E_CARD_SIMPLE_PHONE_ID_COMPANY,
-	E_CARD_SIMPLE_PHONE_ID_HOME,
-	E_CARD_SIMPLE_PHONE_ID_HOME_2,
-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,
-	E_CARD_SIMPLE_PHONE_ID_ISDN,
-	E_CARD_SIMPLE_PHONE_ID_MOBILE,
-	E_CARD_SIMPLE_PHONE_ID_OTHER,
-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,
-	E_CARD_SIMPLE_PHONE_ID_PAGER,
-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,
-	E_CARD_SIMPLE_PHONE_ID_RADIO,
-	E_CARD_SIMPLE_PHONE_ID_TELEX,
-	E_CARD_SIMPLE_PHONE_ID_TTYTTD,
-	E_CARD_SIMPLE_PHONE_ID_LAST
-};
-
-/* We need HOME and WORK email addresses here. */
-enum _ECardSimpleEmailId {
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,
-	E_CARD_SIMPLE_EMAIL_ID_LAST
-};
-
-/* Should this include (BILLING/SHIPPING)? */
-enum _ECardSimpleAddressId {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	E_CARD_SIMPLE_ADDRESS_ID_LAST
-};
-
-enum _ECardSimpleType {
-	E_CARD_SIMPLE_TYPE_STRING,
-	E_CARD_SIMPLE_TYPE_DATE,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME,
-        E_CARD_SIMPLE_FIELD_ORG,
-        E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,
-        E_CARD_SIMPLE_FIELD_ADDRESS_HOME,
-        E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-        E_CARD_SIMPLE_FIELD_PHONE_CAR,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-        E_CARD_SIMPLE_FIELD_PHONE_ISDN,
-        E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-        E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-        E_CARD_SIMPLE_FIELD_EMAIL_2,
-        E_CARD_SIMPLE_FIELD_EMAIL_3,
-        E_CARD_SIMPLE_FIELD_URL,
-        E_CARD_SIMPLE_FIELD_ORG_UNIT,
-        E_CARD_SIMPLE_FIELD_OFFICE,
-        E_CARD_SIMPLE_FIELD_TITLE,
-        E_CARD_SIMPLE_FIELD_ROLE,
-        E_CARD_SIMPLE_FIELD_MANAGER,
-        E_CARD_SIMPLE_FIELD_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_NICKNAME,
-        E_CARD_SIMPLE_FIELD_SPOUSE,
-        E_CARD_SIMPLE_FIELD_NOTE,
-        E_CARD_SIMPLE_FIELD_FBURL,
-        E_CARD_SIMPLE_FIELD_ANNIVERSARY,
-        E_CARD_SIMPLE_FIELD_BIRTH_DATE,
-	E_CARD_SIMPLE_FIELD_MAILER,
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG,
-        E_CARD_SIMPLE_FIELD_LAST
-};
-
-typedef struct _ECardSimple ECardSimple;
-typedef struct _ECardSimpleClass ECardSimpleClass;
-
-struct _ECardSimple {
-	GtkObject object;
-	ECard *card;
-
-	GList *temp_fields;
-
-	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];
-	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];
-	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-	ECardDeliveryAddress *delivery[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-};
-
-struct _ECardSimpleClass {
-	GtkObjectClass parent_class;
-};
-
-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                   (ECard                        *card);
-char                       *e_card_simple_get_id                (ECardSimple                  *simple);
-void                        e_card_simple_set_id                (ECardSimple                  *simple,
-								 const gchar                  *character);
-char                       *e_card_simple_get_vcard             (ECardSimple                  *simple);
-ECardSimple                *e_card_simple_duplicate             (ECardSimple                  *simple);
-char                       *e_card_simple_get                   (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_const             (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-void                        e_card_simple_set                   (ECardSimple                  *simple,
-								 ECardSimpleField              field,
-								 const char                   *data);
-ECardSimpleType             e_card_simple_type                  (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_name              (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_short_name        (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-
-
-/* Use these only if building lists of specific types.  It should be
- * easier to use the above if you consider a phone field to be the
- * same as any other field.
- */
-const ECardPhone           *e_card_simple_get_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id,
-								 const ECardPhone             *phone);
-void                        e_card_simple_set_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id,
-								 const char                   *email);
-void                        e_card_simple_set_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,
-								 ECardSimpleArbitraryCallback *callback,
-								 gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key);
-/* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key,
-								 const char                   *type,
-								 const char                   *value);
-void                        e_card_simple_sync_card             (ECardSimple                  *simple);
-
-/* Standard Gtk function */			      
-GtkType                     e_card_simple_get_type              (void);
-
-#endif /* ! __E_CARD_SIMPLE_H__ */
-
-
diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h
deleted file mode 100644
index a2563d4bf6..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_TYPES_H__
-#define __E_CARD_TYPES_H__
-
-/* IDENTIFICATION PROPERTIES */
-
-typedef struct {
-	char            *prefix;        /* Mr. */
-	char            *given;         /* John */
-	char            *additional;    /* Quinlan */
-	char            *family;        /* Public */
-	char            *suffix;        /* Esq. */
-} ECardName;
-
-typedef struct {
-	int year;
-	int month;
-	int day;
-} ECardDate;
-
-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_PHONE_PREF  = 1 << 0,
-	E_CARD_PHONE_WORK  = 1 << 1,
-	E_CARD_PHONE_HOME  = 1 << 2,
-	E_CARD_PHONE_VOICE = 1 << 3,
-	E_CARD_PHONE_FAX   = 1 << 4,
-	E_CARD_PHONE_MSG   = 1 << 5,
-	E_CARD_PHONE_CELL  = 1 << 6,
-	E_CARD_PHONE_PAGER = 1 << 7,
-	E_CARD_PHONE_BBS   = 1 << 8,
-	E_CARD_PHONE_MODEM = 1 << 9,
-	E_CARD_PHONE_CAR   = 1 << 10,
-	E_CARD_PHONE_ISDN  = 1 << 11,
-	E_CARD_PHONE_VIDEO = 1 << 12 
-} ECardPhoneFlags;
-
-typedef struct {
-	ECardPhoneFlags  flags;
-	char            *number;
-} ECardPhone;
-
-/* DELIVERY ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_ADDR_HOME   = 1 << 0, 
-	E_CARD_ADDR_WORK   = 1 << 1,
-	E_CARD_ADDR_POSTAL = 1 << 2, 
-	E_CARD_ADDR_PARCEL = 1 << 3, 
-	E_CARD_ADDR_DOM    = 1 << 4,
-	E_CARD_ADDR_INTL   = 1 << 5 
-} ECardAddressFlags;
-
-typedef struct {
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-/* PILOT SYNC STATUS */
-
-enum {
-	E_CARD_PILOT_STATUS_NONE,
-	E_CARD_PILOT_STATUS_MOD,
-	E_CARD_PILOT_STATUS_DEL
-};
-
-#endif /* __E_CARD_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
deleted file mode 100644
index 12877d3646..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,3517 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card.h"
-#include "e-card-pairs.h"
-#include <e-util/ename/e-name-western.h>
-#include <e-util/ename/e-address-western.h>
-
-#include <gal/util/e-util.h>
-
-#include <bonobo/bonobo-object-client.h>
-
-#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
-#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
-#define has(obj,prop) (vo = isAPropertyOf ((obj), (prop)))
-
-#define XEV_PILOT_ID "X-EVOLUTION-PILOTID"
-#define XEV_PILOT_STATUS "X-EVOLUTION-PILOTSTATUS"
-#define XEV_WANTS_HTML "X-MOZILLA-HTML"
-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_MAILER,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_CATEGORIES,
-	ARG_CATEGORY_LIST,
-	ARG_WANTS_HTML,
-	ARG_WANTS_HTML_SET,
-	ARG_PILOTID,
-	ARG_PILOTSTATUS,
-	ARG_ARBITRARY,
-	ARG_ID,
-};
-
-#if 0
-static VObject *card_convert_to_vobject (ECard *crd);
-#endif
-static void parse(ECard *card, VObject *vobj);
-static void e_card_init (ECard *card);
-static void e_card_class_init (ECardClass *klass);
-
-static void e_card_destroy (GtkObject *object);
-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void assign_string(VObject *vobj, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name);
-static ECardDate e_card_date_from_string (char *str);
-
-static void parse_bday(ECard *card, VObject *object);
-static void parse_full_name(ECard *card, VObject *object);
-static void parse_file_as(ECard *card, VObject *object);
-static void parse_name(ECard *card, VObject *object);
-static void parse_email(ECard *card, VObject *object);
-static void parse_phone(ECard *card, VObject *object);
-static void parse_address(ECard *card, VObject *object);
-static void parse_address_label(ECard *card, VObject *object);
-static void parse_url(ECard *card, VObject *object);
-static void parse_org(ECard *card, VObject *object);
-static void parse_office(ECard *card, VObject *object);
-static void parse_title(ECard *card, VObject *object);
-static void parse_role(ECard *card, VObject *object);
-static void parse_manager(ECard *card, VObject *object);
-static void parse_assistant(ECard *card, VObject *object);
-static void parse_nickname(ECard *card, VObject *object);
-static void parse_spouse(ECard *card, VObject *object);
-static void parse_anniversary(ECard *card, VObject *object);
-static void parse_mailer(ECard *card, VObject *object);
-static void parse_fburl(ECard *card, VObject *object);
-static void parse_note(ECard *card, VObject *object);
-static void parse_categories(ECard *card, VObject *object);
-static void parse_wants_html(ECard *card, VObject *object);
-static void parse_pilot_id(ECard *card, VObject *object);
-static void parse_pilot_status(ECard *card, VObject *object);
-static void parse_arbitrary(ECard *card, VObject *object);
-static void parse_id(ECard *card, VObject *object);
-
-static ECardPhoneFlags get_phone_flags (VObject *vobj);
-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);
-static ECardAddressFlags get_address_flags (VObject *vobj);
-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);
-
-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object);
-
-struct {
-	char *key;
-	ParsePropertyFunc function;
-} attribute_jump_array[] = 
-{
-	{ VCFullNameProp,            parse_full_name },
-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },
-	{ VCNameProp,                parse_name },
-	{ VCBirthDateProp,           parse_bday },
-	{ VCEmailAddressProp,        parse_email },
-	{ VCTelephoneProp,           parse_phone },
-	{ VCAdrProp,                 parse_address },
-	{ VCDeliveryLabelProp,       parse_address_label },
-	{ VCURLProp,                 parse_url },
-	{ VCOrgProp,                 parse_org },
-	{ "X-EVOLUTION-OFFICE",      parse_office },
-	{ VCTitleProp,               parse_title },
-	{ VCBusinessRoleProp,        parse_role },
-	{ "X-EVOLUTION-MANAGER",     parse_manager },
-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },
-	{ "NICKNAME",                parse_nickname },
-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },
-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   
-	{ VCMailerProp,              parse_mailer },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ "CATEGORIES",              parse_categories },
-	{ XEV_WANTS_HTML,            parse_wants_html },
-	{ XEV_PILOT_ID,              parse_pilot_id },
-	{ XEV_PILOT_STATUS,          parse_pilot_status },
-	{ XEV_ARBITRARY,             parse_arbitrary },
-	{ VCUniqueStringProp,        parse_id }
-};
-
-/**
- * e_card_get_type:
- * @void: 
- * 
- * Registers the &ECard class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECard class.
- **/
-GtkType
-e_card_get_type (void)
-{
-	static GtkType card_type = 0;
-
-	if (!card_type) {
-		GtkTypeInfo card_info = {
-			"ECard",
-			sizeof (ECard),
-			sizeof (ECardClass),
-			(GtkClassInitFunc) e_card_class_init,
-			(GtkObjectInitFunc) e_card_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		card_type = gtk_type_unique (gtk_object_get_type (), &card_info);
-	}
-
-	return card_type;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));
-	while(vobj) {
-		VObject *next;
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	return card;
-}
-
-ECard *e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard(card);
-	ECard *new_card = e_card_new(vcard);
-	g_free (vcard);
-	return new_card;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- *
- * Returns: a string representing the id of the card, which is unique
- * within its book.
- */
-char *
-e_card_get_id (ECard *card)
-{
-	return card->id;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- * @id: a id in string format
- *
- * Sets the identifier of a card, which should be unique within its
- * book.
- */
-void
-e_card_set_id (ECard *card, const char *id)
-{
-	if ( card->id )
-		g_free(card->id);
-	card->id = g_strdup(id);
-}
-
-/**
- * e_card_get_vcard:
- * @card: an #ECard
- *
- * Returns: a string in vCard format, which is wrapped by the @card.
- */
-char
-*e_card_get_vcard (ECard *card)
-{
-	VObject *vobj; /*, *vprop; */
-	char *temp, *ret_val;
-	
-	vobj = newVObject (VCCardProp);
-
-	if ( card->file_as && *card->file_as )
-		addPropValue(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if ( card->fname )
-		addPropValue(vobj, VCFullNameProp, card->fname);
-
-	if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) {
-		VObject *nameprop;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			addPropValue(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given )
-			addPropValue(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			addPropValue(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			addPropValue(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			addPropValue(nameprop, VCNameSuffixesProp, card->name->suffix);
-	}
-
-
-	if ( card->address ) {
-		EIterator *iterator = e_list_get_iterator(card->address);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *addressprop;
-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if ( address->po )
-				addPropValue(addressprop, VCPostalBoxProp, address->po);
-			if ( address->ext )
-				addPropValue(addressprop, VCExtAddressProp, address->ext);
-			if ( address->street )
-				addPropValue(addressprop, VCStreetAddressProp, address->street);
-			if ( address->city )
-				addPropValue(addressprop, VCCityProp, address->city);
-			if ( address->region )
-				addPropValue(addressprop, VCRegionProp, address->region);
-			if ( address->code )
-				addPropValue(addressprop, VCPostalCodeProp, address->code);
-			if ( address->country )
-				addPropValue(addressprop, VCCountryNameProp, address->country);
-			addProp(addressprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->address_label ) {
-		EIterator *iterator = e_list_get_iterator(card->address_label);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *labelprop;
-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);
-			if (address_label->data)
-				labelprop = addPropValue(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-			addProp(labelprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->phone ) { 
-		EIterator *iterator = e_list_get_iterator(card->phone);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *phoneprop;
-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);
-			phoneprop = addPropValue(vobj, VCTelephoneProp, phone->number);
-			
-			set_phone_flags (phoneprop, phone->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->email ) { 
-		EIterator *iterator = e_list_get_iterator(card->email);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *emailprop;
-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		ECardDate date;
-		char *value;
-		date = *card->bday;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		addPropValue(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			addPropValue(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			addPropValue(orgprop, VCOrgUnitProp, card->org_unit);
-	}
-	
-	if (card->office)
-		addPropValue(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		addPropValue(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		addPropValue(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		addPropValue(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		addPropValue(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		addPropValue(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		addPropValue(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		ECardDate date;
-		char *value;
-		date = *card->anniversary;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		addPropValue(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->fburl)
-		addPropValue(vobj, "FBURL", card->fburl);
-	
-	if (card->note) {
-		VObject *noteprop;
-
-		noteprop = addPropValue(vobj, VCNoteProp, card->note);
-		addProp(noteprop, VCQuotedPrintableProp);
-	}
-
-	if (card->categories) {
-		EIterator *iterator;
-		int length = 0;
-		char *string;
-		char *stringptr;
-		for (iterator = e_list_get_iterator(card->categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			length += strlen(e_iterator_get(iterator)) + 1;
-		}
-		string = g_new(char, length + 1);
-		stringptr = string;
-		*stringptr = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			strcpy(stringptr, e_iterator_get(iterator));
-			stringptr += strlen(stringptr);
-			*stringptr = ',';
-			stringptr++;
-			*stringptr = 0;
-		}
-		if (stringptr > string) {
-			stringptr --;
-			*stringptr = 0;
-		}
-		addPropValue (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		addPropValue (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->pilot_id) {
-		gchar *pilotid_str;
-		pilotid_str = g_strdup_printf ("%d", card->pilot_id);
-		addPropValue (vobj, XEV_PILOT_ID, pilotid_str);
-		g_free (pilotid_str);
-	}
-
-	if (card->pilot_status) {
-		gchar *pilotstatus_str;
-		pilotstatus_str = g_strdup_printf ("%d", card->pilot_status);
-		addPropValue (vobj, XEV_PILOT_STATUS, pilotstatus_str);
-		g_free (pilotstatus_str);
-	}
-
-	if (card->arbitrary) {
-		EIterator *iterator;
-		for (iterator = e_list_get_iterator(card->arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			VObject *arb_object;
-			if (arbitrary->value) {
-				arb_object = addPropValue (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				addPropValue (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	if (card->id)
-		addPropValue (vobj, VCUniqueStringProp, card->id);
-#if 0
-	
-	
-	if (crd->photo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCPhotoProp, 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (vprop, crd->photo.type);
-		add_CardProperty (vprop, &crd->photo.prop);
-	}
-
-	if (crd->xtension.l) {
-		GList *node;
-		
-		for (node = crd->xtension.l; node; node = node->next) {
-			CardXProperty *xp = (CardXProperty *) node->data;
-			addPropValue (vobj, xp->name, xp->data);
-			add_CardProperty (vobj, &xp->prop);
-		}
-	}
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		vprop = addPropValue (vobj, VCTimeZoneProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->timezn.prop);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		vprop = addPropValue (vobj, VCGeoLocationProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->geopos.prop);
-	}
-	
-	if (crd->logo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCLogoProp, 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (vprop, crd->logo.type);
-		add_CardProperty (vprop, &crd->logo.prop);
-	}
-	
-	if (crd->agent)
-	  addVObjectProp (vobj, card_convert_to_vobject (crd->agent));
-	
-	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,
-					    crd->sound.data, crd->sound.size);
-		else
-		  vprop = addPropValue (vobj, VCPronunciationProp, 
-				       crd->sound.data);
-		
-		add_SoundType (vprop, crd->sound.type);
-		add_CardProperty (vprop, &crd->sound.prop);
-	}
-	
-	if (crd->key.prop.used) {
-		vprop = addPropValue (vobj, VCPublicKeyProp, crd->key.data);
-		add_KeyType (vprop, crd->key.type);
-		add_CardProperty (vprop, &crd->key.prop);
-	}
-#endif
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-static void
-parse_file_as(ECard *card, VObject *vobj)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj)
-{
-	if ( card->name ) {
-		e_card_name_free(card->name);
-	}
-	card->name = g_new(ECardName, 1);
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-static void
-parse_bday(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->bday )
-			g_free(card->bday);
-		card->bday = g_new(ECardDate, 1);
-		*(card->bday) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_phone(ECard *card, VObject *vobj)
-{
-	ECardPhone *next_phone = g_new(ECardPhone, 1);
-	EList *list;
-
-	assign_string(vobj, &(next_phone->number));
-	next_phone->flags = get_phone_flags(vobj);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "phone", &list,
-		       NULL);
-	e_list_append(list, next_phone);
-	e_card_phone_free (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj)
-{
-	ECardDeliveryAddress *next_addr = g_new(ECardDeliveryAddress, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_free (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj)
-{
-	ECardAddrLabel *next_addr = g_new(ECardAddrLabel, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_free (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp);
-	if (temp) {
-		if (card->org)
-			g_free(card->org);
-		card->org = temp;
-	}
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp);
-	if (temp) {
-		if (card->org_unit)
-			g_free(card->org_unit);
-		card->org_unit = temp;
-	}
-}
-
-static void
-parse_office(ECard *card, VObject *vobj)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, &(card->spouse));
-}
-
-static void
-parse_anniversary(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (card->anniversary)
-			g_free(card->anniversary);
-		card->anniversary = g_new(ECardDate, 1);
-		*(card->anniversary) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_mailer(ECard *card, VObject *vobj)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, &(card->mailer));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj)
-{
-	g_free(card->fburl);
-	assign_string(vobj, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj)
-{
-	g_free(card->note);
-	assign_string(vobj, &(card->note));
-}
-
-static void
-add_list_unique(ECard *card, EList *list, char *string)
-{
-	char *temp = e_strdup_strip(string);
-	EIterator *iterator;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		if (!strcmp(e_iterator_get(iterator), temp)) {
-			break;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		e_list_append(list, temp);
-	}
-	g_free(temp);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-do_parse_categories(ECard *card, char *str)
-{
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	EList *list;
-	gtk_object_get(GTK_OBJECT(card),
-		       "category_list", &list,
-		       NULL);
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(card, list, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(card, list, copy);
-	g_free(copy);
-}
-
-static void
-parse_categories(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-static void
-parse_wants_html(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->wants_html = TRUE;
-			card->wants_html_set = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->wants_html = FALSE;
-			card->wants_html_set = TRUE;
-		}
-		free(str);
-	}
-}
-
-static void
-parse_pilot_id(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_id = atoi(str);
-		free(str);
-	}
-}
-
-static void
-parse_pilot_status(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_status = atoi(str);
-		free(str);
-	}
-}
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-} ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-};
-
-static void
-parse_arbitrary(ECard *card, VObject *vobj)
-{
-	ECardArbitrary *arbitrary = e_card_arbitrary_new();
-	VObjectIterator iterator;
-	EList *list;
-	for ( initPropIterator (&iterator, vobj); moreIteration(&iterator); ) {
-		VObject *temp = nextVObject(&iterator);
-		const char *name = vObjectName(temp);
-		if (name && !strcmp(name, "TYPE")) {
-			g_free(arbitrary->type);
-			assign_string(temp, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_free(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj)
-{
-	if ( card->id )
-		g_free(card->id);
-	assign_string(vobj, &(card->id));
-}
-
-static void
-parse_attribute(ECard *card, VObject *vobj)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj);
-}
-
-static void
-parse(ECard *card, VObject *vobj)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator));
-	}
-	if (!card->fname) {
-		card->fname = g_strdup("");
-	}
-	if (!card->name) {
-		card->name = e_card_name_from_string(card->fname);
-	}
-	if (!card->file_as) {
-		ECardName *name = card->name;
-		char *strings[3], **stringptr;
-		char *string;
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		card->file_as = string;
-	}
-}
-
-static void
-e_card_class_init (ECardClass *klass)
-{
-	int i;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	klass->attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for ( i = 0; i < sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {
-		g_hash_table_insert(klass->attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);
-	}
-
-	gtk_object_add_arg_type ("ECard::file_as",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);
-	gtk_object_add_arg_type ("ECard::full_name",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  
-	gtk_object_add_arg_type ("ECard::name",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("ECard::address",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("ECard::address_label",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);
-	gtk_object_add_arg_type ("ECard::phone",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);
-	gtk_object_add_arg_type ("ECard::email",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);
-	gtk_object_add_arg_type ("ECard::birth_date",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);
-	gtk_object_add_arg_type ("ECard::url",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  
-	gtk_object_add_arg_type ("ECard::org",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);
-	gtk_object_add_arg_type ("ECard::org_unit",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);
-	gtk_object_add_arg_type ("ECard::office",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);
-	gtk_object_add_arg_type ("ECard::title",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  
-	gtk_object_add_arg_type ("ECard::role",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);
-	gtk_object_add_arg_type ("ECard::manager",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);
-	gtk_object_add_arg_type ("ECard::assistant",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);
-	gtk_object_add_arg_type ("ECard::nickname",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);
-	gtk_object_add_arg_type ("ECard::spouse",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);
-	gtk_object_add_arg_type ("ECard::anniversary",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);
-	gtk_object_add_arg_type ("ECard::mailer",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);
-	gtk_object_add_arg_type ("ECard::fburl",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
-	gtk_object_add_arg_type ("ECard::note",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
-	gtk_object_add_arg_type ("ECard::categories",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CATEGORIES);
-	gtk_object_add_arg_type ("ECard::category_list",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CATEGORY_LIST);
-	gtk_object_add_arg_type ("ECard::wants_html",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::wants_html_set",
-				 GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::pilot_id",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTID);
-	gtk_object_add_arg_type ("ECard::pilot_status",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTSTATUS);
-	gtk_object_add_arg_type ("ECard::arbitrary",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_ARBITRARY);
-	gtk_object_add_arg_type ("ECard::id",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ID);
-
-
-	object_class->destroy = e_card_destroy;
-	object_class->get_arg = e_card_get_arg;
-	object_class->set_arg = e_card_set_arg;
-}
-
-ECardPhone *
-e_card_phone_new (void)
-{
-	ECardPhone *newphone = g_new(ECardPhone, 1);
-
-	newphone->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_free (ECardPhone *phone)
-{
-	if ( phone ) {
-		g_free(phone->number);
-
-		g_free(phone);
-	}
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = g_new(ECardPhone, 1);
-		phone_copy->number = g_strdup(phone->number);
-		phone_copy->flags  = phone->flags;
-		return phone_copy;
-	} else
-		return NULL;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_new (void)
-{
-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);
-
-	newaddr->po      = NULL;
-	newaddr->ext     = NULL;
-	newaddr->street  = NULL;
-	newaddr->city    = NULL;
-	newaddr->region  = NULL;
-	newaddr->code    = NULL;
-	newaddr->country = NULL;
-	newaddr->flags   = 0;
-
-	return newaddr;
-}
-
-void
-e_card_delivery_address_free (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		g_free(addr->po);
-		g_free(addr->ext);
-		g_free(addr->street);
-		g_free(addr->city);
-		g_free(addr->region);
-		g_free(addr->code);
-		g_free(addr->country);
-
-		g_free(addr);
-	}
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = g_new(ECardDeliveryAddress, 1);
-		addr_copy->po      = g_strdup(addr->po     );
-		addr_copy->ext     = g_strdup(addr->ext    );
-		addr_copy->street  = g_strdup(addr->street );
-		addr_copy->city    = g_strdup(addr->city   );
-		addr_copy->region  = g_strdup(addr->region );
-		addr_copy->code    = g_strdup(addr->code   );
-		addr_copy->country = g_strdup(addr->country);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-gboolean
-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)
-{
-	return (((addr->po      == NULL) || (*addr->po      == 0)) &&
-		((addr->ext     == NULL) || (*addr->ext     == 0)) &&
-		((addr->street  == NULL) || (*addr->street  == 0)) &&
-		((addr->city    == NULL) || (*addr->city    == 0)) &&
-		((addr->region  == NULL) || (*addr->region  == 0)) &&
-		((addr->code    == NULL) || (*addr->code    == 0)) &&
-		((addr->country == NULL) || (*addr->country == 0)));
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_from_label(const ECardAddrLabel *label)
-{
-	ECardDeliveryAddress *addr = g_new(ECardDeliveryAddress, 1);
-	EAddressWestern *western = e_address_western_parse (label->data);
-	
-	addr->po      = g_strdup (western->po_box     );
-	addr->ext     = g_strdup (western->extended   );
-	addr->street  = g_strdup (western->street     );
-	addr->city    = g_strdup (western->locality   );
-	addr->region  = g_strdup (western->region     );
-	addr->code    = g_strdup (western->postal_code);
-	addr->country = g_strdup (western->country    );
-	addr->flags   = label->flags;
-	
-	e_address_western_free(western);
-	
-	return addr;
-}
-
-char *
-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)
-{
-	char *strings[5], **stringptr = strings;
-	char *line1, *line22, *line2;
-	char *final;
-	if (addr->po && *addr->po)
-		*(stringptr++) = addr->po;
-	if (addr->street && *addr->street)
-		*(stringptr++) = addr->street;
-	*stringptr = NULL;
-	line1 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->region && *addr->region)
-		*(stringptr++) = addr->region;
-	if (addr->code && *addr->code)
-		*(stringptr++) = addr->code;
-	*stringptr = NULL;
-	line22 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->city && *addr->city)
-		*(stringptr++) = addr->city;
-	if (line22 && *line22)
-		*(stringptr++) = line22;
-	*stringptr = NULL;
-	line2 = g_strjoinv(", ", strings);
-	stringptr = strings;
-	if (line1 && *line1)
-		*(stringptr++) = line1;
-	if (addr->ext && *addr->ext)
-		*(stringptr++) = addr->ext;
-	if (line2 && *line2)
-		*(stringptr++) = line2;
-	if (addr->country && *addr->country)
-		*(stringptr++) = addr->country;
-	*stringptr = NULL;
-	final = g_strjoinv("\n", strings);
-	g_free(line1);
-	g_free(line22);
-	g_free(line2);
-	return final;
-}
-
-ECardAddrLabel *
-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)
-{
-	ECardAddrLabel *label;
-	label = e_card_address_label_new();
-	label->flags = addr->flags;
-	label->data = e_card_delivery_address_to_string(addr);
-
-	return label;
-}
-
-ECardAddrLabel *
-e_card_address_label_new (void)
-{
-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);
-
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_free (ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		g_free(addr->data);
-
-		g_free(addr);
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = g_new(ECardAddrLabel, 1);
-		addr_copy->data    = g_strdup(addr->data);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-ECardName *e_card_name_new(void)
-{
-	ECardName *newname = g_new(ECardName, 1);
-
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_free(ECardName *name)
-{
-	if (name) {
-		if ( name->prefix )
-			g_free(name->prefix);
-		if ( name->given )
-			g_free(name->given);
-		if ( name->additional )
-			g_free(name->additional);
-		if ( name->family )
-			g_free(name->family);
-		if ( name->suffix )
-			g_free(name->suffix);
-		g_free ( name );
-	}
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = g_new(ECardName, 1);
-		
-		newname->prefix = g_strdup(name->prefix);
-		newname->given = g_strdup(name->given);
-		newname->additional = g_strdup(name->additional);
-		newname->family = g_strdup(name->family);
-		newname->suffix = g_strdup(name->suffix);
-
-		return newname;
-	} else
-		return NULL;
-}
-
-char *
-e_card_name_to_string(const ECardName *name)
-{
-	char *strings[6], **stringptr = strings;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (name->prefix && *name->prefix)
-		*(stringptr++) = name->prefix;
-	if (name->given && *name->given)
-		*(stringptr++) = name->given;
-	if (name->additional && *name->additional)
-		*(stringptr++) = name->additional;
-	if (name->family && *name->family)
-		*(stringptr++) = name->family;
-	if (name->suffix && *name->suffix)
-		*(stringptr++) = name->suffix;
-	*stringptr = NULL;
-	return g_strjoinv(" ", strings);
-}
-
-ECardName *
-e_card_name_from_string(const char *full_name)
-{
-	ECardName *name = g_new(ECardName, 1);
-	ENameWestern *western = e_name_western_parse (full_name);
-	
-	name->prefix     = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
-	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffix     = g_strdup (western->suffix);
-	
-	e_name_western_free(western);
-	
-	return name;
-}
-
-ECardArbitrary *
-e_card_arbitrary_new(void)
-{
-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = g_new(ECardArbitrary, 1);
-		arb_copy->key = g_strdup(arbitrary->key);
-		arb_copy->type = g_strdup(arbitrary->type);
-		arb_copy->value = g_strdup(arbitrary->value);
-		return arb_copy;
-	} else
-		return NULL;
-}
-
-void
-e_card_arbitrary_free(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		g_free(arbitrary->key);
-		g_free(arbitrary->type);
-		g_free(arbitrary->value);
-	}
-	g_free(arbitrary);
-}
-
-/*
- * ECard lifecycle management and vCard loading/saving.
- */
-
-static void
-e_card_destroy (GtkObject *object)
-{
-	ECard *card = E_CARD(object);
-	g_free(card->id);
-	g_free(card->file_as);
-	g_free(card->fname);
-	if ( card->name )
-		e_card_name_free(card->name);
-	g_free(card->bday);
-
-	g_free(card->url);
-	g_free(card->org);
-	g_free(card->org_unit);
-	g_free(card->office);
-	g_free(card->title);
-	g_free(card->role);
-	g_free(card->manager);
-	g_free(card->assistant);
-	g_free(card->nickname);
-	g_free(card->spouse);
-	g_free(card->anniversary);
-	g_free(card->fburl);
-	g_free(card->note);
-		
-	if (card->categories)
-		gtk_object_unref(GTK_OBJECT(card->categories));
-	if (card->email)
-		gtk_object_unref(GTK_OBJECT(card->email));
-	if (card->phone)
-		gtk_object_unref(GTK_OBJECT(card->phone));
-	if (card->address)
-		gtk_object_unref(GTK_OBJECT(card->address));
-	if (card->address_label)
-		gtk_object_unref(GTK_OBJECT(card->address_label));
-}
-
-
-/* Set_arg handler for the card */
-static void
-e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-	
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		g_free(card->file_as);
-		card->file_as = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FULL_NAME:
-		g_free(card->fname);
-		card->fname = g_strdup(GTK_VALUE_STRING(*arg));
-		if (card->name)
-			e_card_name_free (card->name);
-		card->name = e_card_name_from_string (card->fname);
-		break;
-	case ARG_NAME:
-		if ( card->name )
-			e_card_name_free(card->name);
-		card->name = e_card_name_copy(GTK_VALUE_POINTER(*arg));
-		break;
-	case ARG_CATEGORIES:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = NULL;
-		if (GTK_VALUE_STRING(*arg))
-			do_parse_categories(card, GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_CATEGORY_LIST:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->categories)
-			gtk_object_ref(GTK_OBJECT(card->categories));
-		break;
-	case ARG_BIRTH_DATE:
-		g_free(card->bday);
-		card->bday = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_URL:
-		g_free(card->url);
-		card->url = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG:
-		g_free(card->org);
-		card->org = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG_UNIT:
-		g_free(card->org_unit);
-		card->org_unit = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_OFFICE:
-		g_free(card->office);
-		card->office = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_TITLE:
-		g_free(card->title);
-		card->title = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ROLE:
-		g_free(card->role);
-		card->role = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_MANAGER:
-		g_free(card->manager);
-		card->manager = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ASSISTANT:
-		g_free(card->assistant);
-		card->assistant = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NICKNAME:
-		g_free(card->nickname);
-		card->nickname = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_SPOUSE:
-		g_free(card->spouse);
-		card->spouse = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ANNIVERSARY:
-		g_free(card->anniversary);
-		card->anniversary = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_MAILER:
-		g_free(card->mailer);
-		card->mailer = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FBURL:
-		g_free(card->fburl);
-		card->fburl = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NOTE:
-		g_free (card->note);
-		card->note = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_WANTS_HTML:
-		card->wants_html = GTK_VALUE_BOOL(*arg);
-		card->wants_html_set = TRUE;
-		break;
-	case ARG_PILOTID:
-		card->pilot_id = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_PILOTSTATUS:
-		card->pilot_status = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_ARBITRARY:
-		if (card->arbitrary)
-			gtk_object_unref(GTK_OBJECT(card->arbitrary));
-		card->arbitrary = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->arbitrary)
-			gtk_object_ref(GTK_OBJECT(card->arbitrary));
-		break;
-	case ARG_ID:
-		g_free(card->id);
-		card->id = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the card */
-static void
-e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		GTK_VALUE_STRING (*arg) = card->file_as;
-		break;
-	case ARG_FULL_NAME:
-		GTK_VALUE_STRING (*arg) = card->fname;
-		break;
-	case ARG_NAME:
-		GTK_VALUE_POINTER(*arg) = card->name;
-		break;
-	case ARG_ADDRESS:
-		if (!card->address)
-			card->address = e_list_new((EListCopyFunc) e_card_delivery_address_copy, 
-							(EListFreeFunc) e_card_delivery_address_free,
-							NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address);
-		break;
-	case ARG_ADDRESS_LABEL:
-		if (!card->address_label)
-			card->address_label = e_list_new((EListCopyFunc) e_card_address_label_copy, 
-							      (EListFreeFunc) e_card_address_label_free,
-							      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address_label);
-		break;
-	case ARG_PHONE:
-		if (!card->phone)
-			card->phone = e_list_new((EListCopyFunc) e_card_phone_copy, 
-						 (EListFreeFunc) e_card_phone_free,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone);
-		break;
-	case ARG_EMAIL:
-		if (!card->email)
-			card->email = e_list_new((EListCopyFunc) g_strdup, 
-						 (EListFreeFunc) g_free,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email);
-		break;
-	case ARG_CATEGORIES:
-		{
-			int i;
-			char ** strs;
-			int length;
-			EIterator *iterator;
-			if (!card->categories)
-				card->categories = e_list_new((EListCopyFunc) g_strdup, 
-								   (EListFreeFunc) g_free,
-								   NULL);
-			length = e_list_length(card->categories);
-			strs = g_new(char *, length + 1);
-			for (iterator = e_list_get_iterator(card->categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {
-				strs[i] = (char *)e_iterator_get(iterator);
-			}
-			strs[i] = 0;
-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);
-			g_free(strs);
-		}
-		break;
-	case ARG_CATEGORY_LIST:
-		if (!card->categories)
-			card->categories = e_list_new((EListCopyFunc) g_strdup, 
-							   (EListFreeFunc) g_free,
-							   NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->categories);
-		break;
-	case ARG_BIRTH_DATE:
-		GTK_VALUE_POINTER(*arg) = card->bday;
-		break;
-	case ARG_URL:
-		GTK_VALUE_STRING(*arg) = card->url;
-		break;
-	case ARG_ORG:
-		GTK_VALUE_STRING(*arg) = card->org;
-		break;
-	case ARG_ORG_UNIT:
-		GTK_VALUE_STRING(*arg) = card->org_unit;
-		break;
-	case ARG_OFFICE:
-		GTK_VALUE_STRING(*arg) = card->office;
-		break;
-	case ARG_TITLE:
-		GTK_VALUE_STRING(*arg) = card->title;
-		break;
-	case ARG_ROLE:
-		GTK_VALUE_STRING(*arg) = card->role;
-		break;
-	case ARG_MANAGER:
-		GTK_VALUE_STRING(*arg) = card->manager;
-		break;
-	case ARG_ASSISTANT:
-		GTK_VALUE_STRING(*arg) = card->assistant;
-		break;
-	case ARG_NICKNAME:
-		GTK_VALUE_STRING(*arg) = card->nickname;
-		break;
-	case ARG_SPOUSE:
-		GTK_VALUE_STRING(*arg) = card->spouse;
-		break;
-	case ARG_ANNIVERSARY:
-		GTK_VALUE_POINTER(*arg) = card->anniversary;
-		break;
-	case ARG_MAILER:
-		GTK_VALUE_STRING(*arg) = card->mailer;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_WANTS_HTML:
-		GTK_VALUE_BOOL(*arg) = card->wants_html;
-		break;
-	case ARG_WANTS_HTML_SET:
-		GTK_VALUE_BOOL(*arg) = card->wants_html_set;
-		break;
-	case ARG_PILOTID:
-		GTK_VALUE_INT(*arg) = card->pilot_id;
-		break;
-	case ARG_PILOTSTATUS:
-		GTK_VALUE_INT(*arg) = card->pilot_status;
-		break;
-	case ARG_ARBITRARY:
-		if (!card->arbitrary)
-			card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_copy,
-							  (EListFreeFunc) e_card_arbitrary_free,
-							  NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_init:
- */
-static void
-e_card_init (ECard *card)
-{
-	card->id = g_strdup("");
-	
-	card->file_as = NULL;
-	card->fname = NULL;
-	card->name = NULL;
-	card->bday = NULL;
-	card->email = NULL;
-	card->phone = NULL;
-	card->address = NULL;
-	card->address_label = NULL;
-	card->url = NULL;
-	card->org = NULL;
-	card->org_unit = NULL;
-	card->office = NULL;
-	card->title = NULL;
-	card->role = NULL;
-	card->manager = NULL;
-	card->assistant = NULL;
-	card->nickname = NULL;
-	card->spouse = NULL;
-	card->anniversary = NULL;
-	card->mailer = NULL;
-	card->fburl = NULL;
-	card->note = NULL;
-	card->categories = NULL;
-	card->wants_html = FALSE;
-	card->wants_html_set = FALSE;
-	card->pilot_id = 0;
-	card->pilot_status = 0;
-	card->arbitrary = NULL;
-#if 0
-
-	c = g_new0 (ECard, 1);
-	
-	c->fname      = 
-	c->mailer     = 
-	c->role       = 
-	c->comment    = 
-	c->categories = 
-	c->uid        = e_card_prop_str_empty ();
-	
-	c->photo.type = PHOTO_JPEG;
-	c->logo.type  = PHOTO_JPEG;
-	c->rev.utc    = -1;
-	c->sound.type = SOUND_PHONETIC;
-	c->key.type   = KEY_PGP;
-
-	c->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-	c->comment.prop.encod    = ENC_QUOTED_PRINTABLE;
-	
-	c->name.prop   = c->photo.prop = c->bday.prop     = c->timezn.prop   = 
-	c->geopos.prop = c->logo.prop  = c->org.prop      = c->rev.prop      =
-	c->sound.prop  = c->key.prop   = c->deladdr.prop  = c->dellabel.prop =
-	c->phone.prop  = c->email.prop = c->xtension.prop = c->prop = e_card_prop_empty ();
-	
-	c->prop.type            = PROP_CARD;
-	c->fname.prop.type      = PROP_FNAME;
-	c->name.prop.type       = PROP_NAME;
-	c->photo.prop.type      = PROP_PHOTO;
-	c->bday.prop.type       = PROP_BDAY;
-	
-	c->deladdr.prop.type    = PROP_DELADDR_LIST;
-	c->dellabel.prop.type   = PROP_DELLABEL_LIST;
-	c->phone.prop.type      = PROP_PHONE_LIST;
-	c->email.prop.type      = PROP_EMAIL_LIST;
-	c->xtension.prop.type   = PROP_XTENSION_LIST;
-	c->mailer.prop.type     = PROP_MAILER;
-	c->timezn.prop.type     = PROP_TIMEZN;
-	c->geopos.prop.type     = PROP_GEOPOS;
-	c->role.prop.type       = PROP_ROLE;
-	c->logo.prop.type       = PROP_LOGO;
-	c->org.prop.type        = PROP_ORG;
-	c->categories.prop.type = PROP_CATEGORIES;
-	c->comment.prop.type    = PROP_COMMENT;
-	c->rev.prop.type        = PROP_REV;
-	c->sound.prop.type      = PROP_SOUND;
-	c->uid.prop.type 	= PROP_UID;
-	c->key.prop.type 	= PROP_KEY;
-	
-	return c;
-#endif
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-static void
-assign_string(VObject *vobj, char **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		*string = g_strdup (vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = (vObjectValueType (vobj) ? fakeCString (vObjectUStringZValue (vobj)) : calloc(1, 1));
-		*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-}
-
-#if 0
-static void
-e_card_str_free (CardStrProperty *sp)
-{
-	g_free (sp->str);
-
-	e_card_prop_free (sp->prop);
-}
-
-static void
-e_card_photo_free (CardPhoto *photo)
-{
-	g_free (photo->data);
-
-	e_card_prop_free (photo->prop);
-}
-
-/**
- * e_card_free:
- */
-void
-e_card_free (ECard *card)
-{
-	GList *l;
-
-	g_return_if_fail (card != NULL);
-
-	e_card_name_free (& card->name);
-	e_card_str_free  (& card->fname);
-
-	e_card_photo_free (card->photo);
-
-	e_card_logo_free (card->logo);
-	e_card_org_free (card->org);
-	e_card_key_free (card->key);
-	e_card_sound_free (card->sound);
-
-	e_card_prop_str_free (& card->mailer);
-	e_card_prop_str_free (& card->role);
-	e_card_prop_str_free (& card->categories);
-	e_card_prop_str_free (& card->comment);
-	e_card_prop_str_free (& card->uid);
-
-	/* address is a little more complicated */
-	card_prop_free (card->deladdr.prop);
-	while ((l = card->deladdr.l)) {
-
-		e_card_deladdr_free ((CardDelAddr *) l->data);
-
-		card->deladdr.l = g_list_remove_link (card->deladdr.l, l);
-		g_list_free (l);
-	}
-	
-	g_free (card);
-}
-
-typedef struct
-{
-	char c;
-	int id;
-	
-	GList *sons;
-} tree;
-
-extern CardProperty 
-e_card_prop_empty (void)
-{
-	CardProperty prop;
-	
-	prop.used = FALSE;
-	
-	prop.type = PROP_NONE;
-	prop.encod = ENC_7BIT;
-	prop.value = VAL_INLINE;
-	prop.charset = NULL;
-	prop.lang = NULL;
-	prop.grp = NULL;
-	prop.xtension = NULL;
-	
-	prop.user_data = NULL;
-	
-	return prop;
-}
-
-static CardStrProperty 
-e_card_prop_str_empty (void)
-{
-	CardStrProperty strprop;
-	
-	strprop.prop = card_prop_empty ();
-	strprop.str = NULL;
-	
-	return strprop;
-}
-
-/* Intended to check asserts. */
-extern int card_check_prop (ECardProperty prop)
-{
-	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
-	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
-	    ((prop.encod >= ENC_NONE) && (prop.encod <= ENC_LAST)) &&
-	    ((prop.value >= VAL_NONE) && (prop.value <= VAL_LAST)))
-	  return TRUE;
-	    
-	return FALSE;
-}
-
-extern void
-card_prop_free (CardProperty prop)
-{
-	GList *l;
-	
-	g_free (prop.charset);
-	g_free (prop.lang);
-	
-	for (l = prop.xtension; l; l = l->next) {
-		CardXAttribute *xa = (CardXAttribute *) l->data;
-		g_free (xa->name);
-		g_free (xa->data);
-	}
-	
-	g_list_free (l);
-	
-	prop.used = FALSE;
-}
-	
-e_card_deladdr_free (ECardDelAddr *c)
-{
-	card_prop_free (c->prop);
-
-	g_free (p->pobox);
-	g_free (p->ext);
-	g_free (p->street);
-	g_free (p->city);
-	g_free (p->region);
-	g_free (p->code);
-	g_free (p->country);
-}
-
-void 
-card_free (Card *crd)
-{
-}
-
-static tree *
-new_tree (char c, int id)
-{
-	tree *t;
-	
-	t = malloc (sizeof (tree));
-	t->c = c;
-	t->id = id;
-	t->sons = NULL;
-	
-	return t;
-}
-
-static void 
-add_branch (tree *t, char *str, int id)
-{
-	tree *tmp;
-	char *end;
-	
-	end = str + strlen (str) + 1;
-
-	while (str != end) {
-		tmp = new_tree (*str, id);
-		t->sons = g_list_append (t->sons, (gpointer) tmp);
-		t = tmp;
-		
-		str ++;
-	}
-}
-
-static tree *
-add_to_tree (tree *t, struct pair p)
-{
-	GList *node;
-	char *c, *end;
-	tree *tmp;
-	
-	  c = p.str;
-	end = c + strlen (c) + 1;
-	tmp = t;
-	
-	while (c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-		
-		if (node) {
-			tmp = (tree *) node->data;
-			tmp->id = 0;
-			c++;
-		}
-		else {
-			add_branch (tmp, c, p.id);
-			break;
-		}
-	}
-	
-	return t;
-}
-		
-static tree *
-create_search_tree (void)
-{
-	tree *t;
-	int i;
-
-	t = new_tree (0, 0);
-	for (i = 0; prop_lookup[i].str; i++)
-	  t = add_to_tree (t, prop_lookup[i]);
-	
-	return t;
-}
-		
-static int 
-card_lookup_name (const char *c)
-{
-	static tree *search_tree = NULL;
-	GList *node;
-	tree *tmp;
-	const char *end;
-	
-	if (!search_tree)
-	  search_tree = create_search_tree ();
-	
-	tmp = search_tree;
-	end = c + strlen (c) + 1;
-	
-	while (tmp->id == 0 && c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-	
-		if (node) {
-			tmp = (tree *) node->data;
-			c++;
-		}
-		else
-		  return 0;
-	}
-	
-	return tmp->id;
-}
-
-static enum PhotoType 
-get_photo_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (has (o, photo_pairs[i].str))
-	    return photo_pairs[i].id;
-
-	g_warning ("? < No PhotoType for Photo property. Falling back to JPEG.");
-	return PHOTO_JPEG;
-}
-
-static CardProperty 
-get_CardProperty (VObject *o)
-{
-	VObjectIterator i;
-	CardProperty prop;
-
-	prop = card_prop_empty ();
-	prop.used = TRUE;
-	
-	initPropIterator (&i, o);
-	while (moreIteration (&i)) {
-		VObject *vo = nextVObject (&i);
-		const char *n = vObjectName (vo);
-		int propid;
-	
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-			
-		 case PROP_VALUE:
-		
-			if (has (vo, VCContentIDProp))
-			  prop.value = VAL_CID;
-			break;
-			
-		 case PROP_ENCODING:
-			if (has (vo, VCQuotedPrintableProp))
-			  prop.encod = ENC_QUOTED_PRINTABLE;
-			else if (has (vo, VC8bitProp))
-			  prop.encod = ENC_8BIT;
-			else if (has (vo, VCBase64Prop))
-			  prop.encod = ENC_BASE64;
-			break;
-			
-		 case PROP_QUOTED_PRINTABLE:
-			prop.encod = ENC_QUOTED_PRINTABLE;
-			break;
-			
-		 case PROP_8BIT:
-			prop.encod = ENC_8BIT;
-			break;
-			
-		 case PROP_BASE64:
-			prop.encod = ENC_BASE64;
-			break;
-	
-		 case PROP_LANG:
-			if (vObjectValueType (vo)) {
-				prop.lang = 
-				  g_strdup (vObjectStringZValue (vo));
-			} else
-			  g_warning ("? < No value for LANG attribute.");
-			break;
-			
-		 case PROP_CHARSET:
-			if (vObjectValueType (vo)) {
-				prop.charset = 
-				  g_strdup (vObjectStringZValue (vo));
-				g_warning (prop.charset); 
-			} else
-			  g_warning ("? < No value for CHARSET attribute.");
-			break;
-		 default:
-				{
-					CardXAttribute *c;
-
-					c = malloc (sizeof (CardXAttribute));
-					c->name = g_strdup (n);
-					
-					if (vObjectValueType (vo))
-					  c->data = 
-					  g_strdup (vObjectStringZValue (vo));
-					else
-					  c->data = NULL;
-					
-					prop.xtension = 
-					  g_list_append (prop.xtension, c);
-				}
-		}
-	}
-
-	return prop;
-}
-
-static gboolean
-e_card_prop_has (VObject    *o,
-		 const char *id)
-{
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	if (isAPropertyOf (o, id) == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-static const char *
-e_card_prop_get_str (VObject    *o,
-		     const char *id)
-{
-	VObject *strobj;
-
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	strobj = isAPropertyOf (o, id);
-
-	if (strobj == NULL)
-		return g_strdup ("");
-
-	if (vObjectValueType (strobj) != NULL) {
-		char *str;
-		char *g_str;
-
-		str = fakeCString (vObjectStringZValue (strobj));
-		g_str = g_strdup (str);
-		free (str);
-
-		return g_str;
-	}
-
-	return g_strdup ("");
-}
-
-static ECardName *
-e_card_get_name (VObject *o)
-{
-	CardName *name;
-	VObject *vo;
-	char *the_str;
-
-	name = g_new0 (ECardName, 1);
-
-	name->family     = e_card_prop_get_substr (o, VCFamilyNameProp);
-	name->given      = e_card_prop_get_substr (o, VCGivenNameProp);
-	name->additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);
-	name->prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);
-	name->suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);
-
-	return name;
-}
-
-static CardDelLabel *
-get_CardDelLabel (VObject *o)
-{
-	CardDelLabel *dellabel;
-	char *the_str;
-	
-	dellabel = malloc (sizeof (CardDelLabel));
-	
-	dellabel->type = get_addr_type (o);
-	dellabel->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	return dellabel;
-}
-
-static CardPhone *
-get_CardPhone (VObject *o)
-{
-	CardPhone *ret;
-	char *the_str;
-	
-	ret = malloc (sizeof (CardPhone));
-	ret->type = get_phone_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-
-	return ret;
-}
-
-static CardEMail *
-get_CardEMail (VObject *o)
-{
-	CardEMail *ret;
-	char *the_str; 
-	
-	ret = malloc (sizeof (CardEMail)); 
-	ret->type = get_email_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	
-	return ret;
-}
-	
-static CardTimeZone 
-strtoCardTimeZone (char *str)
-{
-	char s[3];
-	CardTimeZone tz;
-	
-	if (*str == '-') {
-		tz.sign = -1;
-		str++;
-	} else
-	  tz.sign = 1;
-	
-	tz.hours = 0;
-	tz.mins = 0;
-	
-	s[2] = 0;
-	if (strlen (str) > 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.hours = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	str += 2;
-	if (*str == ':')
-	  str++;
-	
-	if (strlen (str) >= 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.mins = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	if (strlen (str) > 3)
-		g_warning ("? < TimeZone value is too long.");
-
-	return tz;
-}
-
-static CardGeoPos 
-strtoCardGeoPos (char *str)
-{
-	CardGeoPos gp;
-	char *s;
-	
-	gp.lon = 0;
-	gp.lat = 0;
-	  
-	s = strchr (str, ',');
-	
-	if (! s) {
-		g_warning ("? < Bad format for GeoPos property.");
-		return gp;
-	}
-	
-	*s = 0;
-	s++;
-	
-	gp.lon = atof (str);
-	gp.lat = atof (s);
-	
-	return gp;
-}
-	
-static CardOrg *
-e_card_vobject_to_org (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardOrg *org;
-
-	org = g_new0 (CardOrg, 1);
-
-	if (has (o, VCOrgNameProp)) {
-		org.name = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnitProp)) {
-		org.unit1 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit2Prop)) {
-		org.unit2 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit3Prop)) {
-		org.unit3 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit4Prop)) {
-		org.unit4 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	
-	return org;
-}
-
-static CardXProperty *
-get_XProp (VObject *o)
-{
-	char *the_str;
-	CardXProperty *ret;
-	
-	ret = malloc (sizeof (CardXProperty)); 
-	ret->name = g_strdup (vObjectName (o));
-	ret->data = g_strdup (str_val (o));
-	free (the_str);
-	
-	return ret;
-}
-
-static CardRev 
-strtoCardRev (char *str)
-{
-	char s[3], *t, *ss;
-	int len, i;
-	CardRev rev;
-	
-	rev.utc = 0;
-	len = strlen (str);
-	
-	if (str[len] == 'Z') {              /* Is it UTC? */
-		rev.utc = 1;
-		str[len] = 0;
-	}
-	  
-	s[2] = 0;
-	t = strchr (str, 'T');
-	if (t) {                            /* Take the Time */
-		*t = 0;
-		t++;
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_hour = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')             /* Ignore ':' separator */
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_min = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_sec = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-
-		if (strlen (str) > 3)
-		  g_warning ("? < Rev value is too long.");
-		
-	} else {
-		g_warning ("? < No time value for Rev property.");
-	}
-
-	/* Now the date (the part before the T) */
-	
-	if (strchr (str, '-')) {                        /* extended iso 8601 */
-		for (ss = strtok (str, "-"), i = 0; ss;
-		     ss = strtok (NULL, "-"), i++)
-		  switch (i) {
-		   case 0:
-			  rev.tm.tm_year = atoi (ss);
-			  break;
-		   case 1:
-			  rev.tm.tm_mon = atoi (ss);
-			  break;
-		   case 2:
-			  rev.tm.tm_mday = atoi (ss);
-			  break;
-		   default:
-			  g_warning ("? < Too many values for Rev property.");
-		  }
-		
-		if (i < 2)
-		  g_warning ("? < Too few values for Rev property.");
-	} else {
-		if (strlen (str) >= 8) {             /* short representation */
-			rev.tm.tm_mday = atoi (str + 6);
-			str[6] = 0;
-			rev.tm.tm_mon = atoi (str + 4);
-			str[4] = 0;
-			rev.tm.tm_year = atoi (str);
-		} else
-		  g_warning ("? < Bad format for Rev property.");
-	}
-	
-	return rev;
-}
-		
-static enum KeyType 
-get_key_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (has (o, key_pairs[i].str))
-	    return key_pairs[i].id;
-
-	g_warning ("? < No KeyType for Key property. Falling back to PGP.");
-	return KEY_PGP;
-}
-
-static CardPhoto 
-get_CardPhoto (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardPhoto photo;
-
-	photo.type = get_photo_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		photo.size = vObjectIntegerValue (vo);
-		photo.data = malloc (photo.size);
-		memcpy (photo.data, vObjectAnyValue (o), photo.size);
-	} else {
-		photo.size = strlen (str_val (o)) + 1;
-		photo.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return photo;
-}
-
-static enum SoundType 
-get_sound_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (has (o, sound_pairs[i].str))
-	    return sound_pairs[i].id;
-
-	return SOUND_PHONETIC;
-}
-	
-static CardSound 
-get_CardSound (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardSound sound;
-
-	sound.type = get_sound_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		sound.size = vObjectIntegerValue (vo);
-		sound.data = malloc (sound.size);
-		memcpy (sound.data, vObjectAnyValue (o), sound.size);
-	} else {
-		sound.size = strlen (str_val (o));
-		sound.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return sound;
-}
-
-/* Loads our card contents from a VObject */
-static ECard *
-e_card_construct_from_vobject (ECard   *card,
-			       VObject *vcrd)
-{
-	VObjectIterator i;
-	Card *crd;
-	char *the_str;
-
-	initPropIterator (&i, vcrd);
-	crd = card_new ();
-
-	while (moreIteration (&i)) {
-		VObject *o = nextVObject (&i);
-		const char *n = vObjectName (o);
-		int propid;
-		CardProperty *prop = NULL;
-
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-		case PROP_FNAME:
-			prop = &crd->fname.prop;
-			crd->fname.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_NAME:
-			prop = &crd->name.prop;
-			crd->name = e_card_get_name (o);
-			break;
-		 case PROP_PHOTO:
-			prop = &crd->photo.prop;
-			crd->photo = get_CardPhoto (o);
-			break;
-		 case PROP_BDAY:
-			prop = &crd->bday.prop;
-			crd->bday = strtoCardBDay (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_DELADDR:
-				{
-					CardDelAddr *c;
-					c = get_CardDelAddr (o);
-					prop = &c->prop;
-					crd->deladdr.l = g_list_append (crd->deladdr.l, c);
-				}
-			break;
-		 case PROP_DELLABEL:
-				{
-					CardDelLabel *c;
-					c = get_CardDelLabel (o);
-					prop = &c->prop;
-					crd->dellabel.l = g_list_append (crd->dellabel.l, c);
-				}
-			break;
-		 case PROP_PHONE:
-				{
-					CardPhone *c;
-					
-					c = get_CardPhone (o);
-					prop = &c->prop;
-					crd->phone.l = g_list_append (crd->phone.l, c);
-				}
-			break;
-		 case PROP_EMAIL:
-				{
-					CardEMail *c;
-					
-					c = get_CardEMail (o);
-					prop = &c->prop;
-					crd->email.l = g_list_append (crd->email.l, c);
-				}
-			break;
-		 case PROP_MAILER:
-			prop = &crd->mailer.prop;
-			crd->mailer.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_TIMEZN:
-			prop = &crd->timezn.prop;
-			crd->timezn = strtoCardTimeZone (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_GEOPOS:
-			prop = &crd->geopos.prop;
-			crd->geopos = strtoCardGeoPos (str_val (o));
-			break;
-		 case PROP_ROLE:
-			prop = &crd->role.prop;
-			crd->role.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_LOGO:
-			prop = &crd->logo.prop;
-			crd->logo = get_CardPhoto (o);
-			break;
-		 case PROP_AGENT:
-			crd->agent = card_create_from_vobject (o);
-			break;
-		 case PROP_ORG:
-			prop = &crd->org.prop;
-			crd->org = get_CardOrg (o);
-			break;
-		 case PROP_CATEGORIES:
-			prop = &crd->categories.prop;
-			crd->categories.str = g_strdup (str_val (o));
-			crd->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_COMMENT:
-			prop = &crd->comment.prop;
-			crd->comment.str = g_strdup (str_val (o));
-			crd->comment.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_REV:
-			prop = &crd->rev.prop;
-			crd->rev = strtoCardRev (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_SOUND:
-			prop = &crd->sound.prop;
-			crd->sound = get_CardSound (o);
-			break;
-		 case PROP_VERSION:
-				{
-					char *str;
-					str = str_val (o);
-					if (strcmp (str, "2.1"))
-					  g_warning ("? < Version doesn't match.");
-					free (the_str);
-				}
-			break;
-		 case PROP_KEY:
-			prop = &crd->key.prop;
-			crd->key.type = get_key_type (o);
-			crd->key.data = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 default:
-				{
-					CardXProperty *c;
-				
-					c = get_XProp (o);
-					prop = &c->prop;
-					crd->xtension.l = g_list_append (crd->xtension.l, c);
-				}
-			break;
-		}
-		
-		if (prop) {
-			*prop = get_CardProperty (o);
-			prop->type = propid;
-		}
-	}
-	
-	return crd;
-}
-		
-/* Loads a card from a file */
-GList *
-card_load (GList *crdlist, char *fname)
-{
-	VObject *vobj, *tmp;
-	
-	vobj = Parse_MIME_FromFileName (fname);
-	if (!vobj) {
-		g_warning ("Could not load the cardfile");
-		return NULL;
-	}
-
-	while (vobj) {
-		const char *n = vObjectName (vobj);
-		
-		if (strcmp (n, VCCardProp) == 0) {
-			crdlist = g_list_append (crdlist, (gpointer)
-					    card_create_from_vobject (vobj));
-		}
-		tmp = vobj;
-		vobj = nextVObjectInList (vobj);
-		cleanVObject (tmp);
-	}
-
-	cleanVObject (vobj);
-	cleanStrTbl ();
-	return crdlist;
-}
-
-static VObject *
-add_strProp (VObject *o, const char *id, char *val)
-{
-	VObject *vo = NULL;
-	
-	if (val)
-	  vo = addPropValue (o, id, val);
-
-	return vo;
-}
-
-static VObject *
-add_CardProperty (VObject *o, CardProperty *prop)
-{
-	GList *node;
-	
-	switch (prop->encod) {
-	 case ENC_BASE64:
-		addProp (o, VCBase64Prop);
-		break;
-	 case ENC_QUOTED_PRINTABLE:
-		addProp (o, VCQuotedPrintableProp);
-		break;
-	 case ENC_8BIT:
-		addProp (o, VC8bitProp);
-		break;
-	 case ENC_7BIT:
-		/* Do nothing: 7BIT is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid encoding type.");
-	}
-	
-	switch (prop->value) {
-	 case VAL_CID:
-		addProp (o, VCContentIDProp);
-		break;
-	 case VAL_INLINE:
-		/* Do nothing: INLINE is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid value type.");
-	}
-	
-	for (node = prop->xtension; node; node = node->next) {
-		CardXAttribute *xa = (CardXAttribute *) node->data;
-		if (xa->data)
-		  addPropValue (o, xa->name, xa->data);
-		else
-		  addProp (o, xa->name);
-	}
-
-	add_strProp (o, VCCharSetProp, prop->charset);
-	add_strProp (o, VCLanguageProp, prop->lang);
-	
-	return o;
-}
-
-static VObject *
-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)
-{
-	VObject *vprop;
-	
-	if (strprop->prop.used) {
-		vprop = add_strProp (vobj, id, strprop->str);
-		add_CardProperty (vprop, &strprop->prop);
-	}
-	
-	return vobj;
-}
-
-static VObject *
-add_PhotoType (VObject *o, enum PhotoType photo_type)
-{
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (photo_type == photo_pairs[i].id) {
-		  addProp (o, photo_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No PhotoType for Photo property. Falling back to JPEG.");
-	addProp (o, VCJPEGProp);
-	
-	return o;
-}
-
-static VObject *
-add_AddrType (VObject *o, int addr_type)
-{
-	int i;
-	
-	for (i = 0; addr_pairs[i].str; i++)
-	  if (addr_type & addr_pairs[i].id)
-	    addProp (o, addr_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strAddrType (GString *string, int addr_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (addr_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; addr_pairs[i].str; i++)
-		  if (addr_type & addr_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (addr_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_PhoneType (VObject *o, int phone_type)
-{
-	int i;
-	
-	for (i = 0; phone_pairs[i].str; i++)
-	  if (phone_type & phone_pairs[i].id)
-	    addProp (o, phone_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strPhoneType (GString *string, int phone_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (phone_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; phone_pairs[i].str; i++)
-		  if (phone_type & phone_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (phone_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_EMailType (VObject *o, enum EMailType email_type)
-{
-	int i;
-	
-	for (i = 0; email_pairs[i].str; i++)
-	  if (email_type == email_pairs[i].id) {
-		  addProp (o, email_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No EMailType for EMail property. Falling back to INET.");
-	addProp (o, VCInternetProp);
-	
-	return o;
-}
-
-static void
-add_strEMailType (GString *string, int email_type)
-{
-	int i;
-	char *str;
-	
-	if (email_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; email_pairs[i].str; i++)
-		  if (email_type == email_pairs[i].id) {
-			  str = my_cap (email_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_KeyType (VObject *o, enum KeyType key_type)
-{
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (key_type == key_pairs[i].id) {
-		  addProp (o, key_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No KeyType for Key property. Falling back to PGP.");
-	addProp (o, VCPGPProp);
-	
-	return o;
-}
-
-static void
-add_strKeyType (GString *string, int key_type)
-{
-	int i;
-	char *str;
-	
-	if (key_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; key_pairs[i].str; i++)
-		  if (key_type == key_pairs[i].id) {
-			  str = my_cap (key_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_SoundType (VObject *o, enum SoundType sound_type)
-{
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (sound_type == sound_pairs[i].id) {
-		  addProp (o, sound_pairs[i].str);
-		  return o;
-	  }
-
-	return o;
-}
-
-char *card_timezn_str (CardTimeZone timezn)
-{
-	char *str;
-	
-	str = malloc (7);
-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",
-		 timezn.hours, timezn.mins);
-	return str;
-}
-
-char *card_geopos_str (CardGeoPos geopos)
-{
-	char *str;
-	
-	str = malloc (15);
-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);
-	return str;
-}
-
-static void add_CardStrProperty_to_string (GString *string, char *prop_name,
-					   CardStrProperty *strprop)
-{
-	if (strprop->prop.used) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, strprop->str);
-	}
-}
-
-static void add_strProp_to_string (GString *string, char *prop_name, char *val)
-{
-	if (val) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, val);
-	}
-}
-
-static void addProp_to_string (GString *string, char *prop_name)
-{
-	if (prop_name)
-	  g_string_append (string, prop_name);
-}
-
-char *
-card_to_string (Card *crd)
-{
-	GString *string;
-	char *ret;
-	
-	string = g_string_new ("");
-	
-	add_CardStrProperty_to_string (string, _("Card: "), &crd->fname);
-	if (crd->name.prop.used) {
-		addProp_to_string (string, N_("\nName: "));
-		add_strProp_to_string (string, N_("\n  Prefix:     "), crd->name.prefix);
-		add_strProp_to_string (string, N_("\n  Given:      "), crd->name.given);
-		add_strProp_to_string (string, N_("\n  Additional: "), crd->name.additional);
-		add_strProp_to_string (string, N_("\n  Family:     "), crd->name.family);
-		add_strProp_to_string (string, N_("\n  Suffix:     "), crd->name.suffix);
-		g_string_append_c (string, '\n');
-	}
-	
-/*	if (crd->photo.prop.used) {
-		addPropSizedValue (string, _ ("\nPhoto: "), 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (string, crd->photo.type);
-	}*/
-	
-	if (crd->bday.prop.used) {
-		char *date_str;
-		
-		date_str = card_bday_str (crd->bday);
-		add_strProp_to_string (string, N_("\nBirth Date: "), date_str);
-		free (date_str);
-	}
-	
-	if (crd->deladdr.l) {
-		GList *node;
-		
-		for (node = crd->deladdr.l; node; node = node->next) {
-			CardDelAddr *deladdr = (CardDelAddr *) node->data;
-			
-			if (deladdr->prop.used) {
-				addProp_to_string (string, N_("\nAddress:"));
-				add_strAddrType (string, deladdr->type);
-				add_strProp_to_string (string, N_("\n  Postal Box:  "), deladdr->po);
-				add_strProp_to_string (string, N_("\n  Ext:         "), deladdr->ext);
-				add_strProp_to_string (string, N_("\n  Street:      "), deladdr->street);
-				add_strProp_to_string (string, N_("\n  City:        "), deladdr->city);
-				add_strProp_to_string (string, N_("\n  Region:      "), deladdr->region);
-				add_strProp_to_string (string, N_("\n  Postal Code: "), deladdr->code);
-				add_strProp_to_string (string, N_("\n  Country:     "), deladdr->country);
-			}
-		}
-		
-		g_string_append_c (string, '\n');
-	}
-	
-	if (crd->dellabel.l) {
-		GList *node;
-		
-		for (node = crd->dellabel.l; node; node = node->next) {
-			CardDelLabel *dellabel = (CardDelLabel *) node->data;
-			
-			add_strProp_to_string (string, N_("\nDelivery Label: "),
-					    dellabel->data);
-			add_strAddrType (string, dellabel->type);
-		}
-	}
-	
-	if (crd->phone.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->phone.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nTelephones:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nTelephone:"));
-		}
-		
-		for (node = crd->phone.l; node; node = node->next) {
-			CardPhone *phone = (CardPhone *) node->data;
-
-			if (phone->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, phone->data);
-				add_strPhoneType (string, phone->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->phone.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	if (crd->email.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->email.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nE-mail:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nE-mail:"));
-		}
-		
-		
-		for (node = crd->email.l; node; node = node->next) {
-			CardEMail *email = (CardEMail *) node->data;
-			
-			if (email->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, email->data);
-				add_strEMailType (string, email->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->email.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	add_CardStrProperty_to_string (string, N_("\nMailer: "), &crd->mailer);
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		add_strProp_to_string (string, N_("\nTime Zone: "), str);
-		free (str);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		add_strProp_to_string (string, N_("\nGeo Location: "), str);
-		free (str);
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nBusiness Role: "), &crd->role);
-	
-/*	if (crd->logo.prop.used) {
-		addPropSizedValue (string, _ ("\nLogo: "), 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (string, crd->logo.type);
-	}*/
-	
-/*	if (crd->agent)
-	  addstringectProp (string, card_convert_to_stringect (crd->agent));*/
-	
-	if (crd->org.prop.used) {
-		addProp_to_string (string, N_("\nOrg: "));
-		add_strProp_to_string (string, N_("\n  Name:  "), crd->org.name);
-		add_strProp_to_string (string, N_("\n  Unit:  "), crd->org.unit1);
-		add_strProp_to_string (string, N_("\n  Unit2: "), crd->org.unit2);
-		add_strProp_to_string (string, N_("\n  Unit3: "), crd->org.unit3);
-		add_strProp_to_string (string, N_("\n  Unit4: "), crd->org.unit4);
-		g_string_append_c (string, '\n');
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nCategories: "), &crd->categories);
-        add_CardStrProperty_to_string (string, N_("\nComment: "), &crd->comment);
-	
-/*	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  addPropSizedValue (string, _ ("\nPronunciation: "),
-					    crd->sound.data, crd->sound.size);
-		else
-		  add_strProp_to_string (string, _ ("\nPronunciation: "), 
-				       crd->sound.data);
-		
-		add_SoundType (string, crd->sound.type);
-	}*/
-	
-        add_CardStrProperty_to_string (string, N_("\nUnique String: "), &crd->uid);
-	
-	if (crd->key.prop.used) {
-		add_strProp_to_string (string, N_("\nPublic Key: "), crd->key.data);
-		add_strKeyType (string, crd->key.type);
-	}
-	
-	ret = g_strdup (string->str);
-	g_string_free (string, TRUE);
-	
-	return ret;
-}
-#endif
-
-static ECardDate
-e_card_date_from_string (char *str)
-{
-	ECardDate date;
-	int length;
-
-	date.year = 0;
-	date.month = 0;
-	date.day = 0;
-
-	length = strlen(str);
-	
-	if (length == 10 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[5] * 10 + str[6] - '0' * 11;
-		date.day = str[8] * 10 + str[9] - '0' * 11;
-	} else if ( length == 8 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[4] * 10 + str[5] - '0' * 11;
-		date.day = str[6] * 10 + str[7] - '0' * 11;
-	}
-	
-	return date;
-}
-
-char *
-e_v_object_get_child_value(VObject *vobj, char *name)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, &ret_val);
-			return ret_val;
-		}
-	}
-	ret_val = g_new(char, 1);
-	*ret_val = 0;
-	return ret_val;
-}
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {
-			ret |= phone_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (flags & phone_pairs[i].flag) {
-				addProp (vobj, phone_pairs[i].id);
-		}
-	}
-}
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {
-			ret |= addr_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_address_flags (VObject *vobj, ECardAddressFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-void
-e_card_send (ECard *card, ECardDisposition disposition)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	
-	/* First, I obtain an object reference that represents the Composer. */
-	bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0);
-
-	g_return_if_fail (bonobo_server != NULL);
-
-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));
-
-	CORBA_exception_init (&ev);
-
-	if (disposition == E_CARD_DISPOSITION_AS_TO) {
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		char *name;
-		EList *email;
-		EIterator *iterator;
-		GNOME_Evolution_Composer_Recipient *recipient;
-		/* Now I have to make a CORBA sequence that represents a recipient list with
-		   one item, for the card. */
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = 1;
-		to_list->_length = 1; 
-		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1);
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "full_name", &name,
-			       "email", &email,
-			       NULL);
-
-		recipient = &(to_list->_buffer[0]);
-
-		iterator = e_list_get_iterator(email);
-		if (e_iterator_is_valid(iterator)) {
-			recipient->address = CORBA_string_dup(e_iterator_get(iterator));
-		} else {
-			recipient->address = CORBA_string_dup("");
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		recipient->name = CORBA_string_dup(name);
-
-		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 = 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;
-		}
-
-		if (CORBA_sequence_get_release (to_list) != FALSE)
-			CORBA_free (to_list->_buffer);
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	if (disposition == E_CARD_DISPOSITION_AS_ATTACHMENT) {
-		CORBA_char *content_type, *filename, *description, *attach_data;
-		CORBA_boolean show_inline;
-		char *tempstr;
-		char *name;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "full_name", &name,
-			       NULL);
-
-		content_type = CORBA_string_dup ("text/x-vcard");
-		filename = CORBA_string_dup ("");
-
-		tempstr = g_strdup_printf ("VCard for %s", name);
-		description = CORBA_string_dup (tempstr);
-		g_free (tempstr);
-
-		show_inline = FALSE;
-
-		tempstr = e_card_get_vcard(card);
-		attach_data = CORBA_string_dup (tempstr);
-		g_free(tempstr);
-
-		GNOME_Evolution_Composer_attachData (composer_server, 
-						     content_type, filename, description,
-						     show_inline, attach_data,
-						     &ev);
-	
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-	
-		CORBA_free (content_type);
-		CORBA_free (filename);
-		CORBA_free (description);
-		CORBA_free (attach_data);
-	}
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index 81473a28ed..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_H__
-#define __E_CARD_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD            (e_card_get_type ())
-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))
-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
-
-typedef struct _ECard ECard;
-typedef struct _ECardClass ECardClass;
-
-struct _ECard {
-	GtkObject object;
-	char *id;
-
-	char            *file_as;       /* The File As field.               */
-	char            *fname;         /* The full name.                   */
-	ECardName       *name;          /* The structured name.             */
-	EList       *address;  	/* Delivery addresses (ECardDeliveryAddress *) */
-	EList       *address_label; /* Delivery address labels
-					 * (ECardAddrLabel *)               */
-
-	EList       *phone;         /* Phone numbers (ECardPhone *)     */
-	EList       *email;         /* Email addresses (char *)         */
-	char            *url;	        /* The person's web page.           */
-
-	ECardDate       *bday;	        /* The person's birthday.           */
-
-	char            *note;
-
-
-	char            *org;           /* The person's organization.       */
-	char            *org_unit;      /* The person's organization unit.  */
-	char            *office;        /* The person's office.             */
-	char            *role;          /* The person's role w/in his org   */
-	char            *title;	        /* The person's title w/in his org  */
-
-	char            *manager;
-	char            *assistant;
-
-	char            *nickname;      /* The person's nickname            */
-	
-	char            *spouse;        /* The person's spouse.             */
-	ECardDate       *anniversary;   /* The person's anniversary.        */
-
-	char            *mailer;        /* Mailer                           */
-
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	EList       *categories;    /* Categories.                      */
-
-	EList       *arbitrary;     /* Arbitrary fields.                */
-
-	guint32         wants_html : 1; /* Wants html mail. */
-	guint32         wants_html_set : 1; /* Wants html mail. */
-
-	guint32         pilot_id;       /* id of the corresponding pilot */
-	guint32         pilot_status;   /* status information */
-#if 0
-	ECardPhoto      *logo;          /* This person's org's logo.        */
-
-	ECardPhoto      *photo;    	/* A photo of the person.           */
-	
-	ECard           *agent;         /* A person who sereves as this
-					   guy's agent/secretary/etc.       */
-	
-
-	char            *categories;    /* A list of the categories to which
-					   this card belongs.               */
-	
-	ECardSound      *sound;
-	
-	ECardKey        *key;	        /* The person's public key.         */
-	ECardTimeZone   *timezn;        /* The person's time zone.          */
-	ECardGeoPos     *geopos;        /* The person's long/lat.           */
-
-	ECardRev        *rev;	        /* The time this card was last
-					   modified.                        */
-
-	EList        xtension;
-#endif
-};
-
-struct _ECardClass {
-	GtkObjectClass parent_class;
-	GHashTable    *attribute_jump_table;
-};
-
-
-/* Simple functions */
-ECard                *e_card_new                          (char                       *vcard);
-char                 *e_card_get_id                       (ECard                      *card);
-void                  e_card_set_id                       (ECard                      *card,
-							   const char                 *character);
-char                 *e_card_get_vcard                    (ECard                      *card);
-ECard                *e_card_duplicate                    (ECard                      *card);
-
-/* ECardPhone manipulation */
-ECardPhone           *e_card_phone_new                    (void);
-ECardPhone           *e_card_phone_copy                   (const ECardPhone           *phone);
-void                  e_card_phone_free                   (ECardPhone                 *phone);
-
-/* ECardDeliveryAddress manipulation */
-ECardDeliveryAddress *e_card_delivery_address_new         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy        (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_free        (ECardDeliveryAddress       *addr);
-gboolean              e_card_delivery_address_is_empty    (const ECardDeliveryAddress *addr);
-char                 *e_card_delivery_address_to_string   (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_from_label  (const ECardAddrLabel       *label);
-ECardAddrLabel       *e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr);
-
-/* ECardAddrLabel manipulation */
-ECardAddrLabel       *e_card_address_label_new            (void);
-ECardAddrLabel       *e_card_address_label_copy           (const ECardAddrLabel       *addr);
-void                  e_card_address_label_free           (ECardAddrLabel             *addr);
-
-/* ECardName manipulation */
-ECardName            *e_card_name_new                     (void);
-ECardName            *e_card_name_copy                    (const ECardName            *name);
-void                  e_card_name_free                    (ECardName                  *name);
-char                 *e_card_name_to_string               (const ECardName            *name);
-ECardName            *e_card_name_from_string             (const char                 *full_name);
-
-/* ECardArbitrary manipulation */
-ECardArbitrary       *e_card_arbitrary_new                (void);
-ECardArbitrary       *e_card_arbitrary_copy               (const ECardArbitrary       *arbitrary);
-void                  e_card_arbitrary_free               (ECardArbitrary             *arbitrary);
-
-/* Specialized functionality */
-GList                *e_card_load_cards_from_file         (const char                 *filename);
-
-enum _ECardDisposition {
-	E_CARD_DISPOSITION_AS_ATTACHMENT,
-	E_CARD_DISPOSITION_AS_TO,
-};
-typedef enum _ECardDisposition ECardDisposition;
-void                  e_card_send                         (ECard                      *card,
-							   ECardDisposition            disposition);
-
-/* Standard Gtk function */
-GtkType               e_card_get_type                     (void);
-
-#endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
deleted file mode 100644
index 92aed64715..0000000000
--- a/addressbook/backend/ebook/e-destination.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-destination.h"
-
-struct _EDestinationPrivate {
-	ECard *card;
-	gint card_email_num;
-
-	gchar *string;
-	gchar *string_email;
-	gchar *string_email_verbose;
-};
-
-static void e_destination_clear_card    (EDestination *);
-static void e_destination_clear_strings (EDestination *);
-
-static GtkObjectClass *parent_class;
-
-static void
-e_destination_destroy (GtkObject *obj)
-{
-	EDestination *dest = E_DESTINATION (obj);
-
-	e_destination_clear_card (dest);
-	e_destination_clear_strings (dest);
-
-	g_free (dest->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (obj);
-}
-
-static void
-e_destination_class_init (EDestinationClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (GTK_TYPE_OBJECT));
-
-	object_class->destroy = e_destination_destroy;
-}
-
-static void
-e_destination_init (EDestination *dest)
-{
-	dest->priv = g_new0 (struct _EDestinationPrivate, 1);
-}
-
-GtkType
-e_destination_get_type (void)
-{
-	static GtkType dest_type = 0;
-
-	if (!dest_type) {
-		GtkTypeInfo dest_info = {
-			"EDestination",
-			sizeof (EDestination),
-			sizeof (EDestinationClass),
-			(GtkClassInitFunc) e_destination_class_init,
-			(GtkObjectInitFunc) e_destination_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		dest_type = gtk_type_unique (gtk_object_get_type (), &dest_info);
-	}
-
-	return dest_type;
-}
-
-EDestination *
-e_destination_new (void)
-{
-	return E_DESTINATION (gtk_type_new (E_TYPE_DESTINATION));
-}
-
-EDestination *
-e_destination_copy (EDestination *dest)
-{
-	EDestination *new_dest;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	new_dest = e_destination_new ();
-
-	new_dest->priv->card = dest->priv->card;
-	if (new_dest->priv->card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->card));
-
-        new_dest->priv->card_email_num = dest->priv->card_email_num;
-
-	new_dest->priv->string = g_strdup (dest->priv->string);
-	new_dest->priv->string_email = g_strdup (dest->priv->string_email);
-	new_dest->priv->string_email_verbose = g_strdup (dest->priv->string_email_verbose);
-
-	return new_dest;
-}
-
-static void
-e_destination_clear_card (EDestination *dest)
-{
-	if (dest->priv->card)
-		gtk_object_unref (GTK_OBJECT (dest->priv->card));
-	dest->priv->card = NULL;
-
-	dest->priv->card_email_num = -1;
-}
-
-static void
-e_destination_clear_strings (EDestination *dest)
-{
-	g_free (dest->priv->string);
-	g_free (dest->priv->string_email);
-	g_free (dest->priv->string_email_verbose);
-
-	dest->priv->string = NULL;
-	dest->priv->string_email = NULL;
-	dest->priv->string_email_verbose = NULL;
-}
-
-void
-e_destination_set_card (EDestination *dest, ECard *card, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	if (dest->priv->card != card) {
-		if (dest->priv->card)
-			gtk_object_unref (GTK_OBJECT (dest->priv->card));
-		dest->priv->card = card;
-		gtk_object_ref (GTK_OBJECT (card));
-	}
-
-	dest->priv->card_email_num = email_num;
-
-	e_destination_clear_strings (dest);
-}
-
-void
-e_destination_set_string (EDestination *dest, const gchar *string)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (string != NULL);
-
-	g_free (dest->priv->string);
-	dest->priv->string = g_strdup (string);
-}
-
-ECard *
-e_destination_get_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	return dest->priv->card;
-}
-
-const gchar *
-e_destination_get_string (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-		
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->string == NULL) {
-
-		if (priv->card) {
-
-			priv->string = e_card_name_to_string (priv->card->name);
-
-		}
-	}
-	
-	return priv->string;
-}
-
-gint
-e_destination_get_strlen (const EDestination *dest)
-{
-	const gchar *str;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), 0);
-
-	str = e_destination_get_string (dest);
-	return str ? strlen (str) : 0;
-}
-
-const gchar *
-e_destination_get_email (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-
-	if (priv->string_email == NULL) {
-
-		if (priv->card) { /* Pull the address out of the card. */
-
-			EIterator *iter = e_list_get_iterator (priv->card->email);
-			gint n = priv->card_email_num;
-
-			if (n >= 0) {
-				while (n > 0) {
-					e_iterator_next (iter);
-					--n;
-				}
-
-				if (e_iterator_is_valid (iter)) {
-					gconstpointer ptr = e_iterator_get (iter);
-					priv->string_email = g_strdup ((gchar *) ptr);
-				}
-			}
-
-		} else if (priv->string) { /* Use the string as an e-mail address */
-			return priv->string;
-		} 
-
-		/* else we just return NULL */
-	}
-
-	return priv->string_email;
-}
-
-const gchar *
-e_destination_get_email_verbose (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-
-	if (priv->string_email_verbose == NULL) {
-		
-		const gchar *email = e_destination_get_email (dest);
-
-		if (priv->card) {
-			
-			priv->string_email_verbose = g_strdup_printf ("%s <%s>",
-								      e_card_name_to_string (priv->card->name),
-								      email);
-		} else {
-
-			return email;
-		}
-
-	}
-
-	return priv->string_email_verbose;
-}
-
-
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
deleted file mode 100644
index 509a351f1d..0000000000
--- a/addressbook/backend/ebook/e-destination.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of 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_DESTINATION_H__
-#define __E_DESTINATION_H__
-
-#include <gtk/gtk.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-#define E_TYPE_DESTINATION        (e_destination_get_type ())
-#define E_DESTINATION(o)          (GTK_CHECK_CAST ((o), E_TYPE_DESTINATION, EDestination))
-#define E_DESTINATION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_TYPE_DESTINATION, EDestinationClass))
-#define E_IS_DESTINATION(o)       (GTK_CHECK_TYPE ((o), E_TYPE_DESTINATION))
-#define E_IS_DESTINATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TYPE_DESTINATION))
-
-typedef struct _EDestination EDestination;
-typedef struct _EDestinationClass EDestinationClass;
-
-struct _EDestinationPrivate;
-
-struct _EDestination {
-	GtkObject object;
-
-	struct _EDestinationPrivate *priv;
-};
-
-struct _EDestinationClass {
-	GtkObjectClass parent_class;
-};
-
-GtkType e_destination_get_type (void);
-
-EDestination *e_destination_new (void);
-EDestination *e_destination_copy (EDestination *);
-
-void e_destination_set_card   (EDestination *, ECard *card, gint email_num);
-void e_destination_set_string (EDestination *, const gchar *string);
-
-ECard       *e_destination_get_card   (const EDestination *);
-const gchar *e_destination_get_string (const EDestination *);
-gint         e_destination_get_strlen (const EDestination *); /* a convenience function... */
-
-const gchar *e_destination_get_email         (const EDestination *);
-const gchar *e_destination_get_email_verbose (const EDestination *);
-
-
-
-#endif /* __E_DESTINATION_H__ */
-
diff --git a/addressbook/backend/ebook/evolution-gnomecard-importer.c b/addressbook/backend/ebook/evolution-gnomecard-importer.c
deleted file mode 100644
index aac268e09d..0000000000
--- a/addressbook/backend/ebook/evolution-gnomecard-importer.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-#include <stdio.h>
-
-#include <e-book.h>
-
-#include <evolution-importer.h>
-#include <GNOME_Evolution_Importer.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-typedef struct {
-	char *filename;
-	GList *cardlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} GnomeCardImporter;
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GnomeCardImporter *gci = (GnomeCardImporter *) closure;
-
-	gci->cardlist = e_card_load_cards_from_file(gci->filename);
-	gci->ready = TRUE;
-}
-
-static void
-ebook_create (GnomeCardImporter *gci)
-{
-	gchar *path, *uri;
-	
-	gci->book = e_book_new ();
-
-	if (!gci->book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	GnomeCardImporter *gci = (GnomeCardImporter *) closure;
-	ECard *card;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->cardlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-
-	card = gci->iterator->data;
-	e_book_add_card (gci->book, card, add_card_cb, card);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[3] = {
-	".vcf", ".gcrd", NULL
-};
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     GnomeCardImporter *gci)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
-{
-	GnomeCardImporter *gci;
-
-	gci = (GnomeCardImporter *) closure;
-	gci->filename = g_strdup (filename);
-	gci->cardlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	ebook_create (gci);
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	GnomeCardImporter *gci;
-
-	gci = g_new (GnomeCardImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, gci);
-	
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);
-	
-	return BONOBO_OBJECT (importer);
-}
-
-static void
-importer_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-	}
-}
-
-int
-main (int argc,
-      char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init_with_popt_table ("Evolution-GnomeCard-Importer",
-				    "0.0", argc, argv, oaf_popt_options, 0,
-				    NULL);
-	orb = oaf_init (argc, argv);
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo.");
-	}
-
-	importer_init ();
-	bonobo_main ();
-
-	return 0;
-}
-
-
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
deleted file mode 100644
index 3295854b0a..0000000000
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = e_card_load_cards_from_file("gnomecard.vcf");
-	GList *iterator;
-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {
-		ECard *card = iterator->data;
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_list_free(list);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
deleted file mode 100644
index 30fda41be4..0000000000
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-#include <ctype.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-parse_line (EBook *book, char *line)
-{
-	char **strings;
-	ECardName *name;
-	ECard *card;
-	EList *list;
-
-	card = e_card_new("");
-	strings = g_strsplit(line, "\t", 3);
-	if (strings[0] && strings[1] && strings[2]) {
-		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
-		e_list_append(list, strings[2]);
-		g_strfreev(strings);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	FILE *fp = fopen (".addressbook", "r");
-	char line[2 * 1024];
-	int which = 0;
-	char *lastline = NULL;
-
-	if (!fp) {
-		g_warning ("Can't find .addressbook");
-		return;
-	}
-
-	while(fgets(line + which * 1024, 1024, fp)) {
-		int length;
-		char *thisline = line + which * 1024;
-		length = strlen(thisline);
-		if (thisline[length - 1] == '\n')
-			line[--length] = 0;
-		if (lastline && *thisline && isspace(*thisline)) {
-			char *temp;
-			while(*thisline && isspace(*thisline))
-				thisline ++;
-			temp = lastline;
-			lastline = g_strdup_printf("%s%s", lastline, thisline);
-			g_free(temp);
-			continue;
-		}
-		if (lastline) {
-			parse_line (book, lastline);
-			g_free(lastline);
-		}
-		lastline = g_strdup(thisline);
-	}
-
-	if (lastline) {
-		parse_line (book, lastline);
-		g_free(lastline);
-	}
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-#if 0
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
deleted file mode 100644
index a727dae7a3..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,194 +0,0 @@
-#include <gnome.h>
-#include "e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-
-int
-main (int argc, char **argv)
-{
-	char  *cardstr;
-	ECard *card;
-
-	/* Fields */
-	char *fname;
-	char *org;
-	char *org_unit;
-        char *title;
-	char *role;
-	char *nickname;
-	char *fburl;
-	ECardName *name;
-	EList *address;
-	EList *phone;
-	EList *email;
-	EIterator *iterator;
-	ECardDate *bday;
-
-	gnome_init ("TestCard", "0.0", argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-#if 0
-	{
-	  int i;
-	  for ( i = 0; i < 100000; i++ ) {
-	    card = e_card_new (cardstr);
-	  
-	    gtk_object_unref (GTK_OBJECT (card));
-	  }
-	}
-#endif
-	card = e_card_new (cardstr);
-	gtk_object_get(GTK_OBJECT(card),
-		       "full_name",  &fname,
-		       "name",       &name,
-		       "address",    &address,
-		       "phone",      &phone,
-		       "email",      &email,
-		       "org",        &org,
-		       "org_unit",   &org_unit,
-		       "title",      &title,
-		       "role",       &role,
-		       "nickname",   &nickname,
-		       "fburl",      &fburl,
-		       "birth_date", &bday,
-		       NULL);
-	if ( fname ) {
-	  printf("Name : %s\n", fname);
-	  g_free(fname);
-	}
-	if ( name ) {
-	  printf("Full Name:\n");
-	  if ( name->prefix )
-	    printf("  prefix     : %s\n", name->prefix);
-	  if ( name->given )
-	    printf("  given      : %s\n", name->given);
-	  if ( name->additional )
-	    printf("  additional : %s\n", name->additional);
-	  if ( name->family )
-	    printf("  family     : %s\n", name->family);
-	  if ( name->suffix )
-	    printf("  suffix     : %s\n", name->suffix);
-	}
-	if ( org ) {
-	  printf("Company : %s\n", org);
-        }
-	if ( org_unit ) {
-	  printf("Department : %s\n", org_unit);
-        }
-	if ( title ) {
-	  printf("Title : %s\n", title);
-        }
-	if ( role ) {
-	  printf("Profession : %s\n", role);
-        }
-	if ( nickname ) {
-	  printf("Nickname : %s\n", nickname);
-        }
-	if ( fburl ) {
-	  printf("Free Busy URL : %s\n", fburl);
-        }
-	if ( bday ) {
-	  printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
-	}
-	if ( email ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( phone ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);
-	    printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( address ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-	    printf("Address ; %d:\n", del_address->flags);
-	    if ( del_address->po )
-	      printf("  Po      : %s\n", del_address->po);
-	    if ( del_address->ext )
-	      printf("  Ext     : %s\n", del_address->ext);
-	    if ( del_address->street )
-	      printf("  Street  : %s\n", del_address->street);
-	    if ( del_address->city )
-	      printf("  City    : %s\n", del_address->city);
-	    if ( del_address->region )
-	      printf("  Region  : %s\n", del_address->region);
-	    if ( del_address->code )
-	      printf("  Code    : %s\n", del_address->code);
-	    if ( del_address->country )
-	      printf("  Country : %s\n", del_address->country);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	printf("%s", e_card_get_vcard(card));
-	gtk_object_unref (GTK_OBJECT (card));
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
deleted file mode 100644
index 69422ba20e..0000000000
--- a/addressbook/backend/ebook/test-client-list.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	gnome_init ("blah", "0.0", argc, argv);
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-	
-	printf ("Length: %d\n", (int) length);
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("[%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("Book opened.\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
deleted file mode 100644
index 25a3cb6dc9..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-
-#include <e-book.h>
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static CORBA_Environment ev;
-static char *cardstr;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-
-	/* we just added a card, so the length should be >1 */
-	printf ("\n%s: %s(): Number of cards is %ld\n",
-		__FILE__, __FUNCTION__, length);
-	if (length < 1)
-		printf ("*** Why isn't this above zero?? ***\n\n");
-	
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	char *vcard;
-	ECard *card;
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	card = e_book_get_card (book, id);
-	g_timer_stop (timer);
-
-	vcard = e_card_get_vcard(card);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-	printf ("Card added: [%s]\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	printf ("Getting cards..\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-	printf ("Done getting all cards.\n");	
-}
-
-static void
-get_fields_cb (EBook *book, EBookStatus status, EList *fields, gpointer closure)
-{
-	if (fields) {
-		EIterator *iter = e_list_get_iterator (fields);
-
-		printf ("Supported fields:\n");
-
-		for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {
-			printf (" %s\n", (char*)e_iterator_get (iter));
-		}
-
-		gtk_object_unref(GTK_OBJECT(fields));
-	}
-	else {
-		printf ("No supported fields?\n");
-	}
-
-	e_book_add_vcard(book, cardstr, add_card_cb, NULL);
-}
-
-
-static void
-auth_user_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("user authenticated\n");
-	e_book_get_supported_fields (book, get_fields_cb, closure);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	e_book_authenticate_user (book, "username", "password", auth_user_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/idl/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/idl/Makefile.am b/addressbook/backend/idl/Makefile.am
deleted file mode 100644
index db61d2c30c..0000000000
--- a/addressbook/backend/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA =			\
-	addressbook.idl
-
-EXTRA_DIST = $(idl_DATA)
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
deleted file mode 100644
index 6d8da64163..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-	typedef string CardId;
-	typedef string VCard;
-	typedef sequence<VCard> VCardList;
-	typedef sequence<string> stringlist;
-
-	interface CardCursor : Bonobo::Unknown {
-		long   count  ();
-		string getNth (in long n);
-	};
-
-	/* 
-	 * A book view is a live view of a book.  It's either a view
-	 * of all the cards in the book or a view of a query.  When
-	 * created, it will get a series of signal_card_added calls
-	 * for all objects in the initial set.  After that, it will
-	 * get added, removed, or changed signals whenever the book
-	 * changes (if it affects the set of viewed cards.)
-	 */
-	interface BookViewListener : Bonobo::Unknown {
-		void notifyCardAdded        (in VCardList cards);
-		void notifyCardRemoved      (in CardId id);
-		void notifyCardChanged      (in VCardList cards);
-		void notifySequenceComplete ();
-		void notifyStatusMessage    (in string message);
-	};
-	
-	interface BookView : Bonobo::Unknown {
-	};
-
-	interface Book : Bonobo::Unknown {
-		/*
-		 * Fetching cards in the addresbook.
-		 */
-		VCard getVCard (in CardId id);
-
-		/*
-		 * Permissions.  the first form is general write
-		 * permission (whether or not the user can add or
-		 * remove or modify any entry in the addressbook.)
-		 *
-		 * if can_write returns TRUE, can_write_card can still
-		 * return FALSE if the user doesn't have permission to
-		 * modify/remove that specific card.
-		 */
-		boolean isWriteable     ();
-		boolean isCardWriteable (in CardId Id);
-
-		void authenticateUser (in string user, in string passwd);
-
-		/*
-		 * Adding and deleting cards in the book.
-		 */
-		void addCard    (in VCard vcard);
-		void removeCard (in CardId Id);
-	        
-		/*
-		 * Modifying cards in the addressbook.
-		 */
-		void modifyCard (in VCard vcard);
-		
-		/*
-		 * This function returns a cursor to the book
-		 * listener.  This is for people who want a snapshot
-		 * of the addressbook.  The syntax for the query
-		 * string is not yet defined.
-		 */
-		void getCursor (in string query);
-		
-		/*
-		 * These two functions return a book view to the book
-		 * listener.  This is for people who want a live view
-		 * of the addressbook.
-		 */
-		void getBookView (in BookViewListener listener, in string query);
-
-		void getChanges  (in BookViewListener listener, in string change_id);
-
-		void checkConnection ();
-
-		void getSupportedFields ();
-
-		string getStaticCapabilities ();
-
-		string getName ();
-	};
-
-	interface BookListener : Bonobo::Unknown {
-
-		enum CallStatus {
-			Success,
-			RepositoryOffline,
-			PermissionDenied,
-			CardNotFound,
-			ProtocolNotSupported,
-			AuthenticationFailed,
-			AuthenticationRequired,
-			UnsupportedField,
-			OtherError
-		};
-
-		void notifyCardCreated  (in CallStatus status, in CardId Id);
-
-		void notifyCardRemoved  (in CallStatus status);
-
-		void notifyCardModified (in CallStatus status);
-		
-		void notifyOpenBookProgress (in string status_message, in short percent);
-
-		void notifyBookOpened       (in CallStatus status, in Book book);
-
-		void notifyCursorRequested  (in CallStatus status, in CardCursor cursor);
-
-		void notifyViewRequested    (in CallStatus status, in BookView view);
-
-		void notifyChangesRequested (in CallStatus status, in BookView view);
-
-		void notifyAuthenticationResult (in CallStatus status);
-
-		void notifySupportedFields (in CallStatus status, in stringlist fields);
-
-		/**
-		 * notifyConnectionStatus:
-		 *
-		 * Used to report changes in the connection to the
-		 * contact repository.  This is often a response to a
-		 * call to check_connection() on the Book, but wombat
-		 * is free to report the connection status without
-		 * being asked.
-		 */
-		void notifyConnectionStatus (in boolean connected);
-	};
-
-	interface BookFactory : Bonobo::Unknown {
-		exception ProtocolNotSupported {};
-
-		void openBook (in string uri, in BookListener listener)
-			raises (ProtocolNotSupported);
-	};
-};
-};
-};
-
diff --git a/addressbook/backend/pas/.cvsignore b/addressbook/backend/pas/.cvsignore
deleted file mode 100644
index 071cef99ae..0000000000
--- a/addressbook/backend/pas/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-*.lo
-*.la
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
deleted file mode 100644
index 4bd2888c10..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"wombat-pas\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)
-else
-LDAP_BACKEND = 
-endif
-
-noinst_LIBRARIES = libpas.a
-
-libpas_a_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	pas-book-factory.c				\
-	pas-book-factory.h				\
-	pas-book-view.c					\
-	pas-book-view.h					\
-	pas-book.c					\
-	pas-book.h					\
-	pas-backend-file.c				\
-	pas-backend-file.h				\
-	$(LDAP_BACKEND)					\
-	pas-backend.c					\
-	pas-backend.h					\
-	pas-card-cursor.c				\
-	pas-card-cursor.h
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
diff --git a/addressbook/backend/pas/TODO b/addressbook/backend/pas/TODO
deleted file mode 100644
index 0c77c1b200..0000000000
--- a/addressbook/backend/pas/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Implement pas_book_factory_activate
-* Authentication
\ No newline at end of file
diff --git a/addressbook/backend/pas/evolveperson.schema b/addressbook/backend/pas/evolveperson.schema
deleted file mode 100644
index b23e97cd15..0000000000
--- a/addressbook/backend/pas/evolveperson.schema
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Depends upon
-#   Definition of an X.500 Attribute Type and an Object Class to Hold
-#   Uniform Resource Identifiers (URIs) [RFC2079]
-#	(core.schema)
-#   
-#   A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256]
-#	(core.schema)
-#
-#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
-#
-#   The Internet Organizational Person Schema (inetorgperson)
-   
-# primaryPhone
-attributetype ( 666.666.666.1
-	NAME 'primaryPhone'
-	DESC 'preferred phone number used to contact a person'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-# carPhone
-attributetype ( 666.666.666.2
-	NAME 'carPhone'
-	DESC 'car phone telephone number of the person'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-attributetype ( 666.666.666.3
-	NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
-
-attributetype ( 666.666.666.4
-	NAME 'otherPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 666.666.666.5
-	NAME 'businessRole'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 666.666.666.6
-	NAME 'managerName'
-	SUP name )
-
-attributetype ( 666.666.666.7
-	NAME 'assistantName'
-	SUP name )
-
-# spouseName
-# single valued (/me smirks)
-attributetype ( 666.666.666.8
-	NAME 'spouseName'
-	SUP name
-	SINGLE-VALUE )
-
-attributetype ( 666.666.666.9
-	NAME 'otherPostalAddress'
-	EQUALITY caseIgnoreListMatch
-	SUBSTR caseIgnoreListSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-attributetype ( 666.666.666.10
-	NAME ( 'mailer' 'mua' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} )
-
-attributetype ( 666.666.666.11
-	NAME ( 'birthDate' 'dob' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 666.666.666.12
-	NAME 'anniversary'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 666.666.666.13
-	NAME 'note'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-
-# inetOrgPerson
-# The inetOrgPerson represents people who are associated with an
-# organization in some way.  It is a structural class and is derived
-# from the organizationalPerson which is defined in X.521 [X521].
-objectclass	( 666.666.666.14
-    NAME 'evolvePerson'
-	DESC 'Objectclass geared to Evolution Usage'
-    SUP inetOrgPerson
-    STRUCTURAL
-	MAY (
-	        primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ 
-		otherPhone $ businessRole $ managerName $ assistantName $
-		otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $
-		note )
-	)  
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index 970dbac105..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1556 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <gnome.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#ifdef HAVE_DB_185_H
-#include <db_185.h>
-#else
-#ifdef HAVE_DB1_DB_H
-#include <db1/db.h>
-#else
-#include <db.h>
-#endif
-#endif
-
-#include "pas-backend-file.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-#include <ebook/e-card-simple.h>
-#include <e-util/e-sexp.h>
-#include <e-util/e-dbhash.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.1"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	DB       *file_db;
-	EList    *book_views;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	ESExp                       *search_sexp;
-	PASBackendFileSearchContext *search_context;
-	gchar                       *change_id;
-	PASBackendFileChangeContext *change_context;
-};
-
-struct _PASBackendFileSearchContext {
-	ECardSimple *card;
-};
-
-struct _PasBackendFileChangeContext {
-	DB *db;
-
-	GList *add_cards;
-	GList *add_ids;
-	GList *mod_cards;
-	GList *mod_ids;
-	GList *del_ids;
-};
-
-static PASBackendFileBookView *
-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)
-{
-	PASBackendFileBookView *new_book_view;
-	new_book_view = g_new (PASBackendFileBookView, 1);
-	new_book_view->book_view = book_view->book_view;
-
-	new_book_view->search = g_strdup(book_view->search);
-	new_book_view->search_sexp = book_view->search_sexp;
-	if (new_book_view->search_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->search_sexp));
-	if (book_view->search_context) {		
-		new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
-		new_book_view->search_context->card = book_view->search_context->card;
-	} else
-		new_book_view->search_context = NULL;
-	
-	new_book_view->change_id = g_strdup(book_view->change_id);
-	if (book_view->change_context) {
-		new_book_view->change_context = g_new(PASBackendFileChangeContext, 1);
-		new_book_view->change_context->db = book_view->change_context->db;
-		new_book_view->change_context->add_cards = book_view->change_context->add_cards;
-		new_book_view->change_context->add_ids = book_view->change_context->add_ids;
-		new_book_view->change_context->mod_cards = book_view->change_context->mod_cards;
-		new_book_view->change_context->mod_ids = book_view->change_context->mod_ids;
-		new_book_view->change_context->del_ids = book_view->change_context->del_ids;
-	} else
-		new_book_view->change_context = NULL;
-	
-	return new_book_view;
-}
-
-static void
-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)
-{
-	g_free(book_view->search);
-	if (book_view->search_sexp)
-		e_sexp_unref (book_view->search_sexp);
-	g_free(book_view->search_context);
-
-	g_free(book_view->change_id);
-	if (book_view->change_context) {
-		g_list_foreach (book_view->change_context->add_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->add_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->del_ids, (GFunc)g_free, NULL);
-		g_list_free (book_view->change_context->add_cards);
-		g_list_free (book_view->change_context->add_ids);
-		g_list_free (book_view->change_context->mod_cards);
-		g_list_free (book_view->change_context->mod_ids);
-		g_list_free (book_view->change_context->del_ids);
-	}
-	g_free(book_view->change_context);
-
-	g_free(book_view);
-}
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-	GList *nth_item = g_list_nth(cursor_data->elements, n);
-
-	return g_strdup((char*)nth_item->data);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	g_list_foreach(cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendFile    *bf;
-	EIterator         *iterator;
-
-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));
-	for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			e_iterator_delete(iterator);
-			break;
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("view_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-string_to_dbt(const char *str, DBT *dbt)
-{
-	dbt->data = (void*)str;
-	dbt->size = strlen (str) + 1;
-}
-
-static char *
-pas_backend_file_create_unique_id (char *vcard)
-{
-	/* use a 32 counter and the 32 bit timestamp to make an id.
-	   it's doubtful 2^32 id's will be created in a second, so we
-	   should be okay. */
-	static guint c = 0;
-	return g_strdup_printf ("pas-id-%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-compare_email (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-		const char *email = e_card_simple_get_email (card, i);
-
-		if (email && compare(email, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_phone (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-		const ECardPhone *phone = e_card_simple_get_phone (card, i);
-
-		if (phone && compare(phone->number, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_address (ECardSimple *card, const char *str,
-		 char *(*compare)(const char*, const char*))
-{
-	g_warning("address searching not implemented\n");
-	return FALSE;
-}
-
-static struct prop_info {
-	ECardSimpleField field_id;
-	const char *query_prop;
-	const char *ecard_prop;
-#define PROP_TYPE_NORMAL   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_TYPE_LISTITEM 0x03
-	int prop_type;
-	gboolean (*list_compare)(ECardSimple *ecard, const char *str,
-				 char *(*compare)(const char*, const char*));
-
-} prop_info_table[] = {
-#define NORMAL_PROP(f,q,e) {f, q, e, PROP_TYPE_NORMAL, NULL}
-#define LIST_PROP(q,e,c) {0, q, e, PROP_TYPE_LIST, c}
-
-	/* query prop,  ecard prop,   type,              list compare function */
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "file_as" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "full_name" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),
-	LIST_PROP ( "email", "email", compare_email ),
-	LIST_PROP ( "phone", "phone", compare_phone ),
-	LIST_PROP ( "address", "address", compare_address ),
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(PASBackendFileSearchContext *ctx, struct _ESExp *f,
-	      int argc, struct _ESExpResult **argv,
-	      char *(*compare)(const char*, const char*))
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname;
-		struct prop_info *info = NULL;
-		int i;
-		gboolean any_field;
-
-		propname = argv[0]->value.string;
-
-		any_field = !strcmp(propname, "x-evolution-any-field");
-		for (i = 0; i < num_prop_infos; i ++) {
-			if (any_field
-			    || !strcmp (prop_info_table[i].query_prop, propname)) {
-				info = &prop_info_table[i];
-				
-				if (info->prop_type == PROP_TYPE_NORMAL) {
-					char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_simple_get (ctx->card, info->field_id);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-				}
-				else if (info->prop_type == PROP_TYPE_LIST) {
-				/* the special searches that match any of the list elements */
-					truth = info->list_compare (ctx->card, argv[1]->value.string, compare);
-				}
-
-				/* if we're looking at all fields and find a match,
-				   or if we're just looking at this one field,
-				   break. */
-				if ((any_field && truth)
-				    || !any_field)
-					break;
-			}
-		}
-		
-	}
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);
-}
-
-static char *
-is_helper (const char *s1, const char *s2)
-{
-	if (!strcmp(s1, s2))
-		return (char*)s1;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, is_helper);
-}
-
-static char *
-endswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (strlen(p) == strlen(s2)))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, endswith_helper);
-}
-
-static char *
-beginswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, beginswith_helper);
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	ESExpResult *r;
-	gboolean retval;
-	ECard *card;
-
-	card = e_card_new (vcard_string);
-	view->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!view->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(view->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-
-	gtk_object_unref(GTK_OBJECT(view->search_context->card));
-
-	e_sexp_result_free(view->search_sexp, r);
-
-	return retval;
-}
-
-static void
-pas_backend_file_search (PASBackendFile  	      *bf,
-			 PASBook         	      *book,
-			 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *cards = NULL;
-	DB      *db = bf->priv->file_db;
-	DBT     id_dbt, vcard_dbt;
-	int i;
-	int esexp_error;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-
-	if (!bf->priv->loaded)
-		return;
-
-	if (view->search_sexp)
-		e_sexp_unref(view->search_sexp);
-	view->search_sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(view->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, view->search_context);
-		} else {
-			e_sexp_add_function(view->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, view->search_context);
-		}
-	}
-
-	e_sexp_input_text(view->search_sexp, view->search, strlen(view->search));
-	esexp_error = e_sexp_parse(view->search_sexp);
-
-	if (esexp_error == -1) {
-		pas_book_view_notify_complete (view->book_view);
-		return;
-	}
-
-	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-			char *vcard_string = vcard_dbt.data;
-
-			/* check if the vcard matches the search sexp */
-			if (vcard_matches_search (view, vcard_string)) {
-				cards = g_list_append (cards, g_strdup (vcard_string));
-			}
-		}
-		
-		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-	}
-
-	if (db_error == -1) {
-		g_warning ("pas_backend_file_search: error building list\n");
-	}
-
-	pas_book_view_notify_add (view->book_view, cards);
-	pas_book_view_notify_complete (view->book_view);
-
-	/*
-	** It's fine to do this now since the data has been handed off.
-	*/
-	g_list_foreach (cards, (GFunc)g_free, NULL);
-	g_list_free (cards);
-}
-
-static void
-pas_backend_file_changes_foreach_key (const char *key, gpointer user_data)
-{
-	PASBackendFileChangeContext *ctx = user_data;
-	DB      *db = ctx->db;
-	DBT     id_dbt, vcard_dbt;
-	int     db_error = 0;
-	
-	string_to_dbt (key, &id_dbt);
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	
-	if (db_error == 1) {
-		char *id = id_dbt.data;
-		
-		ctx->del_ids = g_list_append (ctx->del_ids, strdup(id));
-	}
-}
-
-static void
-pas_backend_file_changes (PASBackendFile  	      *bf,
-			  PASBook         	      *book,
-			  const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	DBT     id_dbt, vcard_dbt;
-	char    *filename;
-	EDbHash *ehash;
-	GList *i, *v;
-	DB      *db = bf->priv->file_db;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-	PASBackendFileChangeContext *ctx = cnstview->change_context;
-
-	if (!bf->priv->loaded)
-		return;
-
-	/* Find the changed ids - FIX ME, path should not be hard coded */
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/%s.db", g_get_home_dir (), view->change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	
-	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-			char *id = id_dbt.data;
-			char *vcard_string = vcard_dbt.data;
-
-			/* check what type of change has occurred, if any */
-			switch (e_dbhash_compare (ehash, id, vcard_string)) {
-			case E_DBHASH_STATUS_SAME:
-				break;
-			case E_DBHASH_STATUS_NOT_FOUND:
-				ctx->add_cards = g_list_append (ctx->add_cards, strdup(vcard_string));
-				ctx->add_ids = g_list_append (ctx->add_ids, strdup(id));
-				break;
-			case E_DBHASH_STATUS_DIFFERENT:
-				ctx->mod_cards = g_list_append (ctx->mod_cards, strdup(vcard_string));
-				ctx->mod_ids = g_list_append (ctx->mod_ids, strdup(id));
-				break;
-			}
-		}
-		
-		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-	}
-
-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)pas_backend_file_changes_foreach_key, view->change_context);
-
-	/* Update the hash */
-	for (i = ctx->add_ids, v = ctx->add_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-		e_dbhash_add (ehash, id, vcard);
-	}	
-	for (i = ctx->mod_ids, v = ctx->mod_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-		e_dbhash_add (ehash, id, vcard);
-	}	
-	for (i = ctx->del_ids; i != NULL; i = i->next){
-		char *id = i->data;
-		e_dbhash_remove (ehash, id);
-	}	
-
-  	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-
-	/* Send the changes */
-	if (db_error == -1) {
-		g_warning ("pas_backend_file_changes: error building list\n");
-	} else {
-  		if (ctx->add_cards != NULL)
-  			pas_book_view_notify_add (view->book_view, ctx->add_cards);
-		
-		if (ctx->mod_cards != NULL)
-			pas_book_view_notify_change (view->book_view, ctx->mod_cards);
-
-		for (v = ctx->del_ids; v != NULL; v = v->next){
-			char *id = v->data;
-			pas_book_view_notify_remove (view->book_view, id);
-		}
-		
-		pas_book_view_notify_complete (view->book_view);
-	}
-}
-
-static char *
-do_create(PASBackend *backend,
-	  char       *vcard_req,
-	  char      **vcard_ptr)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	char           *id;
-	ECard          *card;
-	char           *vcard;
-	char           *ret_val;
-
-	id = pas_backend_file_create_unique_id (vcard_req);
-
-	string_to_dbt (id, &id_dbt);
-	
-	card = e_card_new(vcard_req);
-	e_card_set_id(card, id);
-	vcard = e_card_get_vcard(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-		ret_val = id;
-
-	}
-	else {
-		ret_val = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	card = NULL;
-
-	if (vcard_ptr && ret_val)
-		*vcard_ptr = vcard;
-	else
-		g_free (vcard);
-
-	return ret_val;
-}
-
-static void
-pas_backend_file_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	char *id;
-	char *vcard;
-	EIterator *iterator;
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	id = do_create(backend, req->vcard, &vcard);
-	if (id) {
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			if (vcard_matches_search (view, vcard)) {
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			GNOME_Evolution_Addressbook_BookListener_Success,
-			id);
-		g_free(vcard);
-		g_free(id);
-	}
-	else {
-		/* XXX need a different call status for this case, i
-                   think */
-		pas_book_respond_create (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound,
-				 "");
-	}
-
-	g_free(req->vcard);
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	char          *vcard_string;
-
-	string_to_dbt (req->id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	
-	db_error = db->del (db, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
-
-
-	vcard_string = vcard_dbt.data;
-	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	
-	g_free (req->id);
-}
-
-static void
-pas_backend_file_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	ECard         *card;
-	char          *id;
-	char          *old_vcard_string;
-
-	/* create a new ecard from the request data */
-	card = e_card_new(req->vcard);
-	id = e_card_get_id(card);
-
-	string_to_dbt (id, &id_dbt);	
-
-	/* get the old ecard - the one that's presently in the db */
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	old_vcard_string = g_strdup(vcard_dbt.data);
-
-	string_to_dbt (req->vcard, &vcard_dbt);	
-
-	db_error = db->put (db, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			CORBA_Environment ev;
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			gboolean old_match, new_match;
-
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			old_match = vcard_matches_search (view, old_vcard_string);
-			new_match = vcard_matches_search (view, req->vcard);
-			if (old_match && new_match)
-				pas_book_view_notify_change_1 (view->book_view, req->vcard);
-			else if (new_match)
-				pas_book_view_notify_add_1 (view->book_view, req->vcard);
-			else /* if (old_match) */
-				pas_book_view_notify_remove (view->book_view, id);
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-	else {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-	}
-
-	g_free(old_vcard_string);
-
-	gtk_object_unref(GTK_OBJECT(card));
-	g_free (req->vcard);
-}
-
-static void
-pas_backend_file_build_all_cards_list(PASBackend *backend,
-				      PASBackendFileCursorPrivate *cursor_data)
-{
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  int            db_error;
-	  DBT  id_dbt, vcard_dbt;
-  
-	  cursor_data->elements = NULL;
-	  
-	  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	  while (db_error == 0) {
-
-		  /* don't include the version in the list of cards */
-		  if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		      || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-
-			  cursor_data->elements = g_list_append(cursor_data->elements,
-								g_strdup(vcard_dbt.data));
-
-		  }
-
-		  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-
-	  }
-
-	  if (db_error == -1) {
-		  g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	  }
-	  else {
-		  cursor_data->num_elements = g_list_length (cursor_data->elements);
-	  }
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	/*
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBT            id_dbt, vcard_dbt;
-	*/
-	CORBA_Environment ev;
-	int            db_error = 0;
-	PASBackendFileCursorPrivate *cursor_data;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (
-		book,
-		(db_error == 0 
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound),
-		cursor);
-}
-
-static void
-pas_backend_file_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBackendFileBookView view;
-	PASBackendFileSearchContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_book_view (book,
-		   (book_view != NULL
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.search_sexp = NULL;
-	view.search_context = &ctx;
-	view.change_context = NULL;
-	ctx.card = NULL;
-
-	e_list_append(bf->priv->book_views, &view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_search (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-}
-
-static void
-pas_backend_file_process_get_changes (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBackendFileBookView view;
-	PASBackendFileChangeContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_changes (book,
-		   (book_view != NULL
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.change_id = req->change_id;
-	view.change_context = &ctx;
-	ctx.db = bf->priv->file_db;
-	ctx.add_cards = NULL;
-	ctx.add_ids = NULL;
-	ctx.mod_cards = NULL;
-	ctx.mod_ids = NULL;
-	ctx.del_ids = NULL;
-	view.search = NULL;
-	view.search_sexp = NULL;
-	view.search_context = NULL;
-
-	e_list_append(bf->priv->book_views, &view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_changes (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-}
-
-static void
-pas_backend_file_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	pas_book_report_connection (book, bf->priv->file_db != NULL);
-}
-
-static char *
-pas_backend_file_extract_path_from_uri (const char *uri)
-{
-	g_assert (strncasecmp (uri, "file:", 5) == 0);
-
-	return g_strdup (uri + 5);
-}
-
-static void
-pas_backend_file_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *req)
-{
-	pas_book_respond_authenticate_user (book,
-					    GNOME_Evolution_Addressbook_BookListener_Success);
-}
-
-static void
-pas_backend_file_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASRequest *req)
-{
-	EList *fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	printf ("in pas_backend_file_get_supported_fields\n");
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       fields);
-}
-
-static gboolean
-can_write (PASBackend *backend)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char *path = pas_backend_file_extract_path_from_uri (bf->priv->uri);
-	gboolean retval;
-
-	retval = (access (path, W_OK) != -1);
-
-	g_free (path);
-
-	return retval;
-}
-
-static gboolean
-pas_backend_file_can_write (PASBook *book)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static gboolean
-pas_backend_file_can_write_card (PASBook *book,
-				 const char *id)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static void
-pas_backend_file_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_file_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		pas_backend_file_process_get_changes (backend, book, req);
-		break;
-
-	case AuthenticateUser:
-		pas_backend_file_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_file_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendFile *backend;
-
-	backend = PAS_BACKEND_FILE (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_file_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendFile *bf;
-	DBT            id_dbt, vcard_dbt;
-	DB             *db;
-	int            db_error;
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		return g_strdup (vcard_dbt.data);
-	}
-	else if (db_error == 1) {
-		/* key was not in file */
-		return g_strdup (""); /* XXX */
-	}
-	else /* if (db_error < 0)*/ {
-		/* error */
-		return g_strdup (""); /* XXX */
-	}
-}
-
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	if (!strcmp (old_version, "0.0")) {
-		/* 0.0 is the same as 0.1, we just need to add the version */
-		DB  *db = bf->priv->file_db;
-		DBT version_name_dbt, version_dbt;
-		int db_error;
-
-		string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-		string_to_dbt (PAS_BACKEND_FILE_VERSION, &version_dbt);
-
-		db_error = db->put (db, &version_name_dbt, &version_dbt, 0);
-		if (db_error == 0)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	else {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-}
-
-static gboolean
-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
-{
-	DB   *db = bf->priv->file_db;
-	DBT  version_name_dbt, version_dbt;
-	int  db_error;
-	char *version;
-	gboolean ret_val = TRUE;
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-
-	db_error = db->get (db, &version_name_dbt, &version_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		version = g_strdup (version_dbt.data);
-	}
-	else {
-		/* key was not in file */
-		version = g_strdup ("0.0");
-	}
-
-	if (strcmp (version, PAS_BACKEND_FILE_VERSION))
-		ret_val = pas_backend_file_upgrade_db (bf, version);
-
-	g_free (version);
-
-	return ret_val;
-}
-
-#define INITIAL_VCARD "BEGIN:VCARD\n\
-X-EVOLUTION-FILE-AS:Ximian, Inc.\n\
-LABEL;WORK;QUOTED-PRINTABLE:101 Rogers St. Ste. 214=0ACambridge, MA 02142=0AUSA\n\
-TEL;WORK;VOICE:(617) 679-1984\n\
-TEL;WORK;FAX:(617) 679-1949\n\
-EMAIL;INTERNET:hello@ximian.com\n\
-URL:http://www.ximian.com/\n\
-ORG:Ximian, Inc.;\n\
-NOTE:Welcome to the Ximian Addressbook.\n\
-END:VCARD"
-
-static gboolean
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-
-	g_assert (bf->priv->loaded == FALSE);
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	bf->priv->file_db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);
-	if (bf->priv->file_db == NULL) {
-		bf->priv->file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
-
-		if (bf->priv->file_db) {
-			char *create_initial_file;
-			char *dir;
-
-			dir = g_dirname(filename);
-			create_initial_file = g_concat_dir_and_file(dir, "create-initial");
-
-			if (g_file_exists(create_initial_file)) {
-				char *id;
-				id = do_create(backend, INITIAL_VCARD, NULL);
-				g_free (id);
-			}
-
-			g_free(create_initial_file);
-			g_free(dir);
-		}
-	}
-
-	g_free (filename);
-
-	if (bf->priv->file_db != NULL) {
-		if (pas_backend_file_maybe_upgrade_db (bf))
-			bf->priv->loaded = TRUE;
-		/* XXX what if we fail to upgrade it? */
-		
-		g_free(bf->priv->uri);
-		bf->priv->uri = g_strdup (uri);
-	} else
-		return FALSE;
-
-	return TRUE;
-}
-
-/* Get_uri handler for the addressbook file backend */
-static const char *
-pas_backend_file_get_uri (PASBackend *backend)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	g_return_val_if_fail (bf->priv->loaded, NULL);
-	g_assert (bf->priv->uri != NULL);
-
-	return bf->priv->uri;
-}
-
-static gboolean
-pas_backend_file_add_client (PASBackend             *backend,
-			     GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBackendFile *bf;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_file_get_vcard,
-		pas_backend_file_can_write,
-		pas_backend_file_can_write_card);
-
-	if (!book) {
-		if (!bf->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-			    pas_backend_file_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_file_process_client_requests, NULL);
-
-	bf->priv->clients = g_list_prepend (
-		bf->priv->clients, book);
-
-	if (bf->priv->loaded) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-
-	return TRUE;
-}
-
-static void
-pas_backend_file_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendFile *bf;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_FILE (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bf->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bf->priv->clients = g_list_remove_link (bf->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bf->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_file_get_static_capabilities (PASBackend             *backend)
-{
-	return g_strdup("local");
-}
-
-static gboolean
-pas_backend_file_construct (PASBackendFile *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_file_new:
- */
-PASBackend *
-pas_backend_file_new (void)
-{
-	PASBackendFile *backend;
-
-	backend = gtk_type_new (pas_backend_file_get_type ());
-
-	if (! pas_backend_file_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-pas_backend_file_destroy (GtkObject *object)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (object);
-
-	gtk_object_unref(GTK_OBJECT(bf->priv->book_views));
-	g_free (bf->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_file_class_init (PASBackendFileClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_file_load_uri;
-	parent_class->get_uri                 = pas_backend_file_get_uri;
-	parent_class->add_client              = pas_backend_file_add_client;
-	parent_class->remove_client           = pas_backend_file_remove_client;
-	parent_class->get_static_capabilities = pas_backend_file_get_static_capabilities;
-
-	object_class->destroy = pas_backend_file_destroy;
-}
-
-static void
-pas_backend_file_init (PASBackendFile *backend)
-{
-	PASBackendFilePrivate *priv;
-
-	priv             = g_new0 (PASBackendFilePrivate, 1);
-	priv->loaded     = FALSE;
-	priv->clients    = NULL;
-	priv->book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL);
-	priv->uri        = NULL;
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_file_get_type:
- */
-GtkType
-pas_backend_file_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendFile",
-			sizeof (PASBackendFile),
-			sizeof (PASBackendFileClass),
-			(GtkClassInitFunc)  pas_backend_file_class_init,
-			(GtkObjectInitFunc) pas_backend_file_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h
deleted file mode 100644
index 4da9a29cc5..0000000000
--- a/addressbook/backend/pas/pas-backend-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_FILE_H__
-#define __PAS_BACKEND_FILE_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendFilePrivate PASBackendFilePrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendFilePrivate *priv;
-} PASBackendFile;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendFileClass;
-
-PASBackend *pas_backend_file_new      (void);
-GtkType     pas_backend_file_get_type (void);
-
-#define PAS_BACKEND_FILE_TYPE        (pas_backend_file_get_type ())
-#define PAS_BACKEND_FILE(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_FILE_TYPE, PASBackendFile))
-#define PAS_BACKEND_FILE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendFileClass))
-#define PAS_IS_BACKEND_FILE(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_FILE_TYPE))
-#define PAS_IS_BACKEND_FILE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_FILE_TYPE))
-
-#endif /* ! __PAS_BACKEND_FILE_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
deleted file mode 100644
index 1132c6fb14..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,2343 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Chris Toshok (toshok@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#define DEBUG
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <fcntl.h>
-#include <time.h>
-#include <lber.h>
-
-#ifdef DEBUG
-#define LDAP_DEBUG
-#define LDAP_DEBUG_ADD
-#endif
-#include <ldap.h>
-#ifdef DEBUG
-#undef LDAP_DEBUG
-#endif
-
-#if LDAP_VENDOR_VERSION > 20000
-#define OPENLDAP2
-#else
-#define OPENLDAP1
-#endif
-
-#ifdef OPENLDAP1
-#define LDAP_NAME_ERROR(x) NAME_ERROR(x)
-#endif
-
-#ifdef OPENLDAP2
-#include "ldap_schema.h"
-#endif
-
-#include "pas-backend-ldap.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#define LDAP_MAX_SEARCH_RESPONSES 100
-
-#define INETORGPERSON "inetOrgPerson"
-#define EVOLVEPERSON  "evolvePerson"
-
-
-static gchar *query_prop_to_ldap(gchar *query_prop);
-
-static PASBackendClass *pas_backend_ldap_parent_class;
-typedef struct _PASBackendLDAPCursorPrivate PASBackendLDAPCursorPrivate;
-typedef struct _PASBackendLDAPBookView PASBackendLDAPBookView;
-typedef struct LDAPOp LDAPOp;
-
-struct _PASBackendLDAPPrivate {
-	char     *uri;
-	gboolean connected;
-	GList    *clients;
-	gchar    *ldap_host;
-	gchar    *ldap_rootdn;
-	int      ldap_port;
-	int      ldap_scope;
-	GList    *book_views;
-
-	LDAP     *ldap;
-
-	/* whether or not there's support for the objectclass we need
-           to store all our additional fields */
-	gboolean evolvePersonSupported;
-	gboolean evolvePersonChecked;
-
-	/* whether or not there's a request in process on our LDAP* */
-	LDAPOp *current_op;
-	GList *pending_ops;
-	int op_idle;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	int                   search_idle;
-	int                   search_msgid;
-	LDAPOp                *search_op;
-};
-
-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);
-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-};
-
-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_process_current (PASBackend *backend);
-static void     ldap_op_process (LDAPOp *op);
-static void     ldap_op_restart (LDAPOp *op);
-static gboolean ldap_op_process_on_idle (PASBackend *backend);
-static void     ldap_op_finished (LDAPOp *op);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e);
-
-static void email_populate (ECardSimple *card, char **values);
-struct berval** email_ber (ECardSimple *card);
-gboolean email_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void homephone_populate (ECardSimple *card, char **values);
-struct berval** homephone_ber (ECardSimple *card);
-gboolean homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void business_populate (ECardSimple *card, char **values);
-struct berval** business_ber (ECardSimple *card);
-gboolean business_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-struct prop_info {
-	ECardSimpleField field_id;
-	char *query_prop;
-	char *ldap_attr;
-#define PROP_TYPE_STRING   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_DN            0x04
-#define PROP_EVOLVE        0x08
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_LIST props */
-
-	/* used when reading from the ldap server populates ECard with the values in **values. */
-	void (*populate_ecard_func)(ECardSimple *card, char **values);
-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */
-	struct berval** (*ber_func)(ECardSimple *card);
-	/* used to compare list attributes */
-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);
-
-} prop_info[] = {
-
-#define LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST, ctor, ber, cmp}
-#define E_LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST | PROP_EVOLVE, ctor, ber, cmp}
-#define STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING}
-#define E_STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING | PROP_EVOLVE}
-
-
-	/* name fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME,   "full_name", "cn" ),
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),
-
-	/* email addresses */
-	LIST_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate, email_ber, email_compare),
-
-	/* phone numbers */
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "phone", "primaryPhone"),
-	LIST_PROP     (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone", "telephoneNumber", business_populate, business_ber, business_compare),
-	LIST_PROP     (E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone", "homePhone", homephone_populate, homephone_ber, homephone_compare),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile", "mobile"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car", "carPhone"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax", "facsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax", "homeFacsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone", "otherPhone"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn", "internationalISDNNumber"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager", "pager"),
-
-	/* org information */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG,       "org",       "o"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG_UNIT,  "org_unit",  "ou"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_OFFICE,    "office",    "roomNumber"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_TITLE,     "title",     "title"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ROLE,      "role",      "businessRole"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MANAGER,   "manager",   "managerName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistantName"), 
-
-	/* addresses */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, "business_address", "postalAddress"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_HOME,     "home_address",     "homePostalAddress"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,    "other_address",    "otherPostalAddress"),
-
-	/* misc fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_URL,           "uri", "labeledURI"),
-	/* map nickname to displayName */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_NICKNAME,    "nickname",  "displayName"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_SPOUSE,      "spouse", "spouseName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_NOTE,        "note", "note"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ANNIVERSARY, "anniversary", "anniversary"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE,  "birth_date", "birthDate"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER,      "mailer", "mailer"), 
-
-/*  	E_CARD_SIMPLE_FIELD_FILE_AS, */
-/*      E_CARD_SIMPLE_FIELD_FBURL, */
-/*  	E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */
-
-
-#undef E_STRING_PROP
-#undef STRING_PROP
-#undef E_LIST_PROP
-#undef LIST_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendLDAP    *bl;
-	GList             *list;
-
-	bl = PAS_BACKEND_LDAP(pas_book_get_backend(book));
-	for (list = bl->priv->book_views; list; list = g_list_next(list)) {
-		PASBackendLDAPBookView *view = list->data;
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			if (view->search_idle != 0) {
-				/* we have a search running on the
-				   ldap connection.  remove the idle
-				   handler and anbandon the msg id */
-				g_source_remove(view->search_idle);
-				pas_book_view_notify_status_message (view->book_view, "Abandoning pending search");
-				if (view->search_msgid != -1)
-					ldap_abandon (bl->priv->ldap, view->search_msgid);
-
-				/* if the search op is the current op,
-				   finish it. else, remove it from the
-				   list and nuke it ourselves. */
-				if (view->search_op == bl->priv->current_op)
-					ldap_op_finished (view->search_op);
-				else {
-					bl->priv->pending_ops = g_list_remove (bl->priv->pending_ops,
-									       view->search_op);
-					view->search_op->dtor (view->search_op->backend,
-							       view->search_op);
-				}
-			}
-			g_free (view->search);
-			g_free (view);
-			bl->priv->book_views = g_list_remove_link(bl->priv->book_views, list);
-			g_list_free_1(list);
-			break;
-		}
-	}
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("view_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-check_for_evolve_person (PASBackendLDAP *bl)
-{
-#ifdef OPENLDAP2
-	char *attrs[2];
-	LDAPMessage *resp;
-	LDAP *ldap = bl->priv->ldap;
-#endif
-
-	bl->priv->evolvePersonChecked = TRUE;
-
-#ifdef OPENLDAP2
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	if (ldap_search_ext_s (ldap, "cn=Subschema", LDAP_SCOPE_BASE,
-			       "(objectClass=subschema)", attrs, 0,
-			       NULL, NULL, NULL, 0, &resp) == LDAP_SUCCESS) {
-		char **values;
-
-		values = ldap_get_values (ldap, resp, "objectClasses");
-
-		if (values) {
-			int i;
-			for (i = 0; values[i]; i ++) {
-				int j;
-				int code;
-				const char *err;
-				LDAPObjectClass *oc = ldap_str2objectclass (values[i], &code, &err, 0);
-				if (!oc)
-					continue;
-
-				for (j = 0; oc->oc_names[j]; j++)
-					if (!g_strcasecmp (oc->oc_names[j], EVOLVEPERSON)) {
-						g_print ("support found on ldap server for objectclass evolvePerson\n");
-						bl->priv->evolvePersonSupported = TRUE;
-						ldap_objectclass_free (oc);
-						goto done;
-					}
-
-				ldap_objectclass_free (oc);
-			}
-		done:
-		}
-	}
-#endif
-}
-
-static void
-pas_backend_ldap_connect (PASBackendLDAP *bl)
-{
-	PASBackendLDAPPrivate *blpriv = bl->priv;
-
-	/* close connection first if it's open first */
-	if (blpriv->ldap)
-		ldap_unbind (blpriv->ldap);
-
-	blpriv->ldap = ldap_open (blpriv->ldap_host, blpriv->ldap_port);
-#ifdef DEBUG
-#ifdef OPENLDAP2
-	{
-		int debug_level = ~0;
-		ldap_set_option (blpriv->ldap, LDAP_OPT_DEBUG_LEVEL, &debug_level);
-	}
-#endif
-#endif
-
-	if (NULL != blpriv->ldap) {
-		ldap_simple_bind_s(blpriv->ldap,
-				   NULL /*binddn*/, NULL /*passwd*/);
-		blpriv->connected = TRUE;
-	}
-	else {
-		g_warning ("pas_backend_ldap_connect failed for "
-			   "'ldap://%s:%d/%s'\n",
-			   blpriv->ldap_host,
-			   blpriv->ldap_port,
-			   blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
-		blpriv->connected = FALSE;
-	}
-
-	/* check to see if evolvePerson is supported, if we can (me
-           might not be able to if we can't authenticate.  if we
-           can't, try again in auth_user.) */
-	check_for_evolve_person (bl);
-}
-
-static void
-ldap_op_init (LDAPOp *op, PASBackend *backend,
-	      PASBook *book, PASBookView *view,
-	      LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->handler = handler;
-	op->dtor = dtor;
-}
-
-static void
-ldap_op_process_current (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPOp *op = bl->priv->current_op;
-
-	if (!bl->priv->connected) {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Connecting to LDAP server");
-		pas_backend_ldap_connect(bl);
-	}
-
-	if (bl->priv->connected) {
-		if (op->handler (backend, op))
-			ldap_op_finished (op);
-	}
-	else {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Unable to connect to LDAP server");
-
-		ldap_op_finished (op);
-	}
-}
-
-static void
-ldap_op_process (LDAPOp *op)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-
-	if (bl->priv->current_op) {
-		/* operation in progress.  queue this op for later and return. */
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Waiting for connection to ldap server...");
-		bl->priv->pending_ops = g_list_append (bl->priv->pending_ops, op);
-	}
-	else {
-		/* nothing going on, do this op now */
-		bl->priv->current_op = op;
-		ldap_op_process_current (op->backend);
-	}
-}
-
-static gboolean
-ldap_op_process_on_idle (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	bl->priv->op_idle = 0;
-
-	ldap_op_process_current (backend);
-
-	return FALSE;
-}
-
-static void
-ldap_op_restart (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-}
-
-static void
-ldap_op_finished (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	op->dtor (backend, op);
-
-	if (bl->priv->pending_ops) {
-		bl->priv->current_op = bl->priv->pending_ops->data;
-		bl->priv->pending_ops = g_list_remove_link (bl->priv->pending_ops, bl->priv->pending_ops);
-
-		bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-	}
-	else {
-		bl->priv->current_op = NULL;
-	}
-}
-
-static int
-ldap_error_to_response (int ldap_error)
-{
-	if (ldap_error == LDAP_SUCCESS)
-		return GNOME_Evolution_Addressbook_BookListener_Success;
-	else if (LDAP_NAME_ERROR (ldap_error))
-		return GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;
-	else if (ldap_error == LDAP_SERVER_DOWN)
-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
-	else
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-}
-
-
-static char *
-create_dn_from_ecard (ECardSimple *card, const char *root_dn)
-{
-	char *cn, *cn_part = NULL;
-	char *dn;
-	gboolean need_comma = FALSE;
-
-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (cn) {
-		cn_part = g_strdup_printf ("cn=%s%s", cn, need_comma ? "," : "");
-	}
-	else {
-		cn_part = g_strdup ("");
-	}
-
-	dn = g_strdup_printf ("%s%s%s", cn_part,
-			      (root_dn && strlen(root_dn)) ? "," : "",
-			      (root_dn && strlen(root_dn)) ? root_dn: "");
-
-	g_free (cn_part);
-
-	g_print ("generated dn: %s\n", dn);
-
-	return dn;
-}
-
-static void
-free_mods (GPtrArray *mods)
-{
-	int i = 0;
-	LDAPMod *mod;
-
-	while ((mod = g_ptr_array_index (mods, i++))) {
-		int j;
-		g_free (mod->mod_type);
-
-		if (mod->mod_op & LDAP_MOD_BVALUES) {
-			for (j = 0; mod->mod_bvalues[j]; j++) {
-				g_free (mod->mod_bvalues[j]->bv_val);
-				g_free (mod->mod_bvalues[j]);
-			}
-		}
-		else {
-			for (j = 0; mod->mod_values[j]; j++)
-				g_free (mod->mod_values[j]);
-		}
-		g_free (mod);
-	}
-
-	g_ptr_array_free (mods, TRUE /* XXX ? */);
-}
-
-static GPtrArray*
-build_mods_from_ecards (PASBackendLDAP *bl, ECardSimple *current, ECardSimple *new, gboolean *new_dn_needed)
-{
-	gboolean adding = (current == NULL);
-	GPtrArray *result = g_ptr_array_new();
-	int i;
-
-	if (new_dn_needed)
-		*new_dn_needed = FALSE;
-
-	/* we walk down the list of properties we can deal with (that
-	 big table at the top of the file) */
-
-	for (i = 0; i < num_prop_infos; i ++) {
-		gboolean include;
-		gboolean new_prop_present = FALSE;
-		gboolean current_prop_present = FALSE;
-		struct berval** new_prop_bers = NULL;
-		char *new_prop = NULL;
-		char *current_prop = NULL;
-
-		/* XXX if it's an evolvePerson prop and the ldap
-                   server doesn't support that objectclass, skip it. */
-		if (prop_info[i].prop_type & PROP_EVOLVE && !bl->priv->evolvePersonSupported)
-			continue;
-
-		/* get the value for the new card, and compare it to
-                   the value in the current card to see if we should
-                   update it -- if adding is TRUE, short circuit the
-                   check. */
-		if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-			new_prop = e_card_simple_get (new, prop_info[i].field_id);
-			new_prop_present = (new_prop != NULL);
-		}
-		else {
-			new_prop_bers = prop_info[i].ber_func (new);
-			new_prop_present = (new_prop_bers != NULL);
-		}
-
-		/* need to set INCLUDE to true if the field needs to
-                   show up in the ldap modify request */
-		if (adding) {
-			/* if we're creating a new card, include it if the
-                           field is there at all */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING)
-				include = (new_prop_present && *new_prop); /* empty strings cause problems */
-			else
-				include = new_prop_present;
-		}
-		else {
-			/* if we're modifying an existing card,
-                           include it if the current field value is
-                           different than the new one, if it didn't
-                           exist previously, or if it's been
-                           removed. */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-				current_prop = e_card_simple_get (current, prop_info[i].field_id);
-				current_prop_present = (current_prop != NULL);
-
-				if (new_prop && current_prop)
-					include = *new_prop && strcmp (new_prop, current_prop);
-				else
-					include = (!!new_prop != !!current_prop);
-			}
-			else {
-				int j;
-				struct berval **current_prop_bers = prop_info[i].ber_func (current);
-
-				current_prop_present = (current_prop_bers != NULL);
-
-				/* free up the current_prop_bers */
-				if (current_prop_bers) {
-					for (j = 0; current_prop_bers[j]; j++) {
-						g_free (current_prop_bers[j]->bv_val);
-						g_free (current_prop_bers[j]);
-					}
-					g_free (current_prop_bers);
-				}
-
-				include = !prop_info[i].compare_func (new, current);
-			}
-		}
-
-		if (include) {
-			LDAPMod *mod = g_new (LDAPMod, 1);
-
-			/* the included attribute has changed - we
-                           need to update the dn if it's one of the
-                           attributes we compute the dn from. */
-			if (new_dn_needed)
-				*new_dn_needed |= prop_info[i].prop_type & PROP_DN;
-
-			if (adding) {
-				mod->mod_op = LDAP_MOD_ADD;
-			}
-			else {
-				if (!new_prop_present)
-					mod->mod_op = LDAP_MOD_DELETE;
-				else if (!current_prop_present)
-					mod->mod_op = LDAP_MOD_ADD;
-				else
-					mod->mod_op = LDAP_MOD_REPLACE;
-			}
-			
-			mod->mod_type = g_strdup (prop_info[i].ldap_attr);
-
-			if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-				mod->mod_values = g_new (char*, 2);
-				mod->mod_values[0] = new_prop;
-				mod->mod_values[1] = NULL;
-			}
-			else { /* PROP_TYPE_LIST */
-				mod->mod_op |= LDAP_MOD_BVALUES;
-				mod->mod_bvalues = new_prop_bers;
-			}
-
-			g_ptr_array_add (result, mod);
-		}
-		
-	}
-
-	/* NULL terminate the list of modifications */
-	g_ptr_array_add (result, NULL);
-
-	return result;
-}
-
-static void
-add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array)
-{
-	LDAPMod *objectclass_mod;
-
-	objectclass_mod = g_new (LDAPMod, 1);
-	objectclass_mod->mod_op = LDAP_MOD_ADD;
-	objectclass_mod->mod_type = g_strdup ("objectClass");
-	objectclass_mod->mod_values = g_new (char*, bl->priv->evolvePersonSupported ? 3 : 2);
-	objectclass_mod->mod_values[0] = g_strdup (INETORGPERSON);
-	if (bl->priv->evolvePersonSupported) {
-		objectclass_mod->mod_values[1] = g_strdup (EVOLVEPERSON);
-		objectclass_mod->mod_values[2] = NULL;
-	}
-	else {
-		objectclass_mod->mod_values[1] = NULL;
-	}
-	g_ptr_array_add (mod_array, objectclass_mod);
-}
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPCreateOp;
-
-static gboolean
-create_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	ECardSimple *new_card;
-	char *dn;
-	int response;
-	int            ldap_error;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	printf ("vcard = %s\n", create_op->vcard);
-
-	new_ecard = e_card_new (create_op->vcard);
-	new_card = e_card_simple_new (new_ecard);
-
-	dn = create_dn_from_ecard (new_card, bl->priv->ldap_rootdn);
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (bl, NULL, new_card, NULL);
-
-#if 0
-	if (!mod_array) {
-		/* there's an illegal field in there.  report
-                   UnsupportedAttribute back */
-		g_free (dn);
-
-		gtk_object_unref (GTK_OBJECT(new_card));
-
-		pas_book_respond_create (create_op->op.book,
-					 GNOME_Evolution_Addressbook_BookListener_UnsupportedField,
-					 dn);
-
-		return TRUE;
-	}
-#endif
-
-	/* remove the NULL at the end */
-	g_ptr_array_remove (mod_array, NULL);
-
-	/* add our objectclass(es) */
-	add_objectclass_mod (bl, mod_array);
-
-	/* then put the NULL back */
-	g_ptr_array_add (mod_array, NULL);
-
-#ifdef LDAP_DEBUG_ADD
-	{
-		int i;
-		printf ("Sending the following to the server as ADD\n");
-
-		for (i = 0; g_ptr_array_index(mod_array, i); i ++) {
-			LDAPMod *mod = g_ptr_array_index(mod_array, i);
-			if (mod->mod_op & LDAP_MOD_DELETE)
-				printf ("del ");
-			else if (mod->mod_op & LDAP_MOD_REPLACE)
-				printf ("rep ");
-			else
-				printf ("add ");
-			if (mod->mod_op & LDAP_MOD_BVALUES)
-				printf ("ber ");
-			else
-				printf ("    ");
-
-			printf (" %s:\n", mod->mod_type);
-
-			if (mod->mod_op & LDAP_MOD_BVALUES) {
-				int j;
-				for (j = 0; mod->mod_bvalues[j] && mod->mod_bvalues[j]->bv_val; j++)
-					printf ("\t\t'%s'\n", mod->mod_bvalues[j]->bv_val);
-			}
-			else {
-				int j;
-
-				for (j = 0; mod->mod_values[j]; j++)
-					printf ("\t\t'%s'\n", mod->mod_values[j]);
-			}
-		}
-	}
-#endif
-
-	ldap_mods = (LDAPMod**)mod_array->pdata;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "Adding card to LDAP server");
-
-	/* actually perform the ldap add */
-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "");
-
-	if (ldap_error != LDAP_SUCCESS)
-		ldap_perror (ldap, "ldap_add_s");
-
-	/* and clean up */
-	free_mods (mod_array);
-	g_free (dn);
-
-	gtk_object_unref (GTK_OBJECT(new_card));
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (create_op->op.book,
-				 response,
-				 dn);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-create_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	g_free (create_op->vcard);
-	g_free (create_op);
-}
-
-static void
-pas_backend_ldap_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)create_op, backend, book,
-		      book_view,
-		      create_card_handler, create_card_dtor);
-
-	create_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)create_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static gboolean
-remove_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int response;
-	int ldap_error;
-
-	ldap_error = ldap_delete_s (bl->priv->ldap, remove_op->id);
-	if (ldap_error != LDAP_SUCCESS)
-		ldap_perror (bl->priv->ldap, "ldap_delete_s");
-
-	response = ldap_error_to_response (ldap_error);
-
-	pas_book_respond_remove (remove_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-remove_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-
-	g_free (remove_op->id);
-	g_free (remove_op);
-}
-
-static void
-pas_backend_ldap_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)remove_op, backend, book,
-		      book_view,
-		      remove_card_handler, remove_card_dtor);
-
-	remove_op->id = req->id;
-
-	ldap_op_process ((LDAPOp*)remove_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPModifyOp;
-
-static ECardSimple *
-search_for_dn (PASBackendLDAP *bl, const char *dn)
-{
-#if 0
-	char **attrs;
-#endif
-	char *query;
-	LDAP *ldap = bl->priv->ldap;
-	LDAPMessage    *res, *e;
-	ECardSimple *result = NULL;
-
-#if 0
-	/* this is broken because if we (say) modify the cn and can't
-           modify the dn (because it overlaps), we lose the ability to
-           search by that component of the dn. */
-	attrs = ldap_explode_dn (dn, 0);
-	query = g_strdup_printf ("(%s)", attrs[0]);
-	printf ("searching for %s\n", query);
-#else
-	query = g_strdup ("(objectclass=*)");
-#endif
-
-	if (ldap_search_s (ldap,
-			   bl->priv->ldap_rootdn,
-			   bl->priv->ldap_scope,
-			   query,
-			   NULL, 0, &res) != -1) {
-		e = ldap_first_entry (ldap, res);
-		while (NULL != e) {
-			if (!strcmp (ldap_get_dn (ldap, e), dn)) {
-				printf ("found it\n");
-				result = build_card_from_entry (ldap, e);
-				break;
-			}
-			e = ldap_next_entry (ldap, e);
-		}
-
-		ldap_msgfree(res);
-	}
-
-	g_free (query);
-	return result;
-}
-
-static gboolean
-modify_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	char *id;
-	int response;
-	int            ldap_error = LDAP_SUCCESS;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-	ECardSimple *current_card;
-
-	new_ecard = e_card_new (modify_op->vcard);
-	id = e_card_get_id(new_ecard);
-
-	ldap = bl->priv->ldap;
-
-	current_card = search_for_dn (bl, id);
-
-	if (current_card) {
-		ECardSimple *new_card = e_card_simple_new (new_ecard);
-		gboolean need_new_dn;
-
-		/* build our mods */
-		mod_array = build_mods_from_ecards (bl, current_card, new_card, &need_new_dn);
-		if (mod_array->len > 0) {
-			ldap_mods = (LDAPMod**)mod_array->pdata;
-
-			/* actually perform the ldap modify */
-#ifdef OPENLDAP2
-			ldap_error = ldap_modify_ext_s (ldap, id, ldap_mods, NULL, NULL);
-#else
-			ldap_error = ldap_modify (ldap, id, ldap_mods);
-#endif
-			if (ldap_error != LDAP_SUCCESS)
-				ldap_perror (ldap, "ldap_modify_s");
-		}
-		else {
-			g_print ("modify list empty.  no modification sent\n");
-		}
-
-		/* and clean up */
-		free_mods (mod_array);
-		gtk_object_unref (GTK_OBJECT(new_card));
-		gtk_object_unref (GTK_OBJECT(current_card));
-	}
-	else {
-		g_print ("didn't find original card\n");
-	}
-
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_modify (modify_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-modify_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	g_free (modify_op->vcard);
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-	}
-
-	ldap_op_init ((LDAPOp*)modify_op, backend, book,
-		      book_view,
-		      modify_card_handler, modify_card_dtor);
-
-	modify_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)modify_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBook *book;
-} LDAPGetCursorOp;
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	g_return_val_if_fail (n < cursor_data->num_elements, NULL);
-
-	return (char*)g_list_nth (cursor_data->elements, n);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	/* free the ldap specific cursor information */
-	g_list_foreach (cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-pas_backend_ldap_build_all_cards_list(PASBackend *backend,
-				      PASBackendLDAPCursorPrivate *cursor_data)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-
-	if ((ldap_error = ldap_search_s (ldap,
-					 bl->priv->ldap_rootdn,
-					 bl->priv->ldap_scope,
-					 "(objectclass=*)",
-					 NULL, 0, &res)) == -1) {
-		g_warning ("ldap error '%s' in "
-			   "pas_backend_ldap_build_all_cards_list\n",
-			   ldap_err2string(ldap_error));
-	}
-
-	cursor_data->elements = NULL;
-
-	cursor_data->num_elements = ldap_count_entries (ldap, res);
-
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-
-		/* for now just make a list of the dn's */
-#if 0
-		for ( a = ldap_first_attribute( ldap, e, &ber ); a != NULL;
-		      a = ldap_next_attribute( ldap, e, ber ) ) {
-		}
-#else
-		cursor_data->elements = g_list_prepend(cursor_data->elements,
-						       g_strdup(ldap_get_dn(ldap, e)));
-#endif
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	ldap_msgfree(res);
-}
-
-
-static gboolean
-get_cursor_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	CORBA_Environment ev;
-	int            ldap_error = 0;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data;
-	PASBook *book = cursor_op->book;
-
-	cursor_data = g_new(PASBackendLDAPCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_ldap_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (book,
-				     ldap_error_to_response (ldap_error),
-				     cursor);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-get_cursor_dtor (PASBackend *backend, LDAPOp *op)
-{
-	g_free (op);
-}
-
-static void
-pas_backend_ldap_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	LDAPGetCursorOp *op = g_new (LDAPGetCursorOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, backend, book, NULL, get_cursor_handler, get_cursor_dtor);
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-
-/* List property functions */
-static void
-email_populate(ECardSimple *card, char **values)
-{
-	int i;
-
-	for (i = 0; values[i] && i < 3; i ++) {
-		e_card_simple_set_email (card, i, values[i]);
-	}
-}
-
-struct berval**
-email_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *emails[3];
-	int i, j, num;
-
-	num = 0;
-	for (i = 0; i < 3; i ++) {
-		emails[i] = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		if (emails[i])
-			num++;
-	}
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 3; i ++) {
-		if (emails[i]) {
-			result[j]->bv_val = g_strdup (emails[i]);
-			result[j++]->bv_len = strlen (emails[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-gboolean
-email_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	const char *email1, *email2;
-	int i;
-
-	for (i = 0; i < 3; i ++) {
-		gboolean equal;
-		email1 = e_card_simple_get_email (ecard1, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		email2 = e_card_simple_get_email (ecard2, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-
-		if (email1 && email2)
-			equal = !strcmp (email1, email2);
-		else
-			equal = (!!email1 == !!email2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-homephone_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2, values[1]);
-}
-
-struct berval**
-homephone_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *homephones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((homephones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME)))
-		num++;
-	if ((homephones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 2; i ++) {
-		if (homephones[i]) {
-			result[j]->bv_val = g_strdup (homephones[i]);
-			result[j++]->bv_len = strlen (homephones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-gboolean
-homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_HOME, E_CARD_SIMPLE_FIELD_PHONE_HOME_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-business_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2, values[1]);
-}
-
-struct berval**
-business_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *business_phones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((business_phones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS)))
-		num++;
-	if ((business_phones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 2; i ++) {
-		if (business_phones[i]) {
-			result[j]->bv_val = g_strdup (business_phones[i]);
-			result[j++]->bv_len = strlen (business_phones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-gboolean
-business_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		(*list)->data = g_strdup_printf("(!%s)", term);
-		g_free (term);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (!strcmp (propname, "x-evolution-any-field")) {
-			int i;
-			int query_length;
-			char *big_query;
-			char *header, *footer;
-			char *match_str;
-
-			header = g_malloc0((num_prop_infos - 1) * 2 + 1);
-			footer = g_malloc0(num_prop_infos + 1);
-			for (i = 0; i < num_prop_infos - 1; i ++) {
-				strcat (header, "(|");
-				strcat (footer, ")");
-			}
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = strlen (header);
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, header);
-			for (i = 0; i < num_prop_infos; i ++) {
-				strcat (big_query, "(");
-				strcat (big_query, prop_info[i].ldap_attr);
-				strcat (big_query, match_str);
-			}
-			strcat (big_query, footer);
-
-			*list = g_list_prepend(*list, big_query);
-
-			g_free (match_str);
-			g_free (header);
-			g_free (footer);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				*list = g_list_prepend(*list,
-						       g_strdup_printf("(%s=*%s%s)",
-								       ldap_attr,
-								       str,
-								       one_star ? "" : "*"));
-		}
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s)",
-							       ldap_attr, str));
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s*)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=*%s)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and", func_and, 0 },
-	{ "or", func_or, 0 },
-	{ "not", func_not, 0 },
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gchar *
-pas_backend_ldap_build_query (gchar *query)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-
-	sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function(sexp, 0, symbols[i].name,
-					    symbols[i].func, &list);
-		}
-	}
-
-	e_sexp_input_text(sexp, query, strlen(query));
-	e_sexp_parse(sexp);
-
-	r = e_sexp_eval(sexp);
-
-	e_sexp_result_free(sexp, r);
-	e_sexp_unref (sexp);
-
-	if (list->next) {
-		g_warning ("conversion to ldap query string failed");
-		retval = NULL;
-		g_list_foreach (list, (GFunc)g_free, NULL);
-	}
-	else {
-		retval = list->data;
-	}
-
-	g_list_free (list);
-	return retval;
-}
-
-static gchar *
-query_prop_to_ldap(gchar *query_prop)
-{
-	int i;
-
-	for (i = 0; i < num_prop_infos; i ++)
-		if (!strcmp (query_prop, prop_info[i].query_prop))
-			return prop_info[i].ldap_attr;
-
-	return NULL;
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *ldap_query;
-	PASBackendLDAP *bl;
-	PASBackendLDAPBookView *view;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn = ldap_get_dn(ldap, e);
-	char *attr;
-	BerElement *ber = NULL;
-
-	g_print ("build_card_from_entry, dn = %s\n", dn);
-	e_card_simple_set_id (card, dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-
-		for (i = 0; i < num_prop_infos; i ++)
-			if (!strcmp (attr, prop_info[i].ldap_attr))
-				info = &prop_info[i];
-
-		if (info) {
-			char **values;
-			values = ldap_get_values (ldap, e, attr);
-
-			if (values) {
-				if (info->prop_type & PROP_TYPE_STRING) {
-				/* if it's a normal property just set the string */
-					e_card_simple_set (card, info->field_id, values[0]);
-
-				}
-				else if (info->prop_type & PROP_TYPE_LIST) {
-				/* if it's a list call the ecard-populate function,
-				   which calls gtk_object_set to set the property */
-					info->populate_ecard_func(card,
-								  values);
-				}
-
-				ldap_value_free (values);
-			}
-		}
-	}
-
-#ifndef OPENLDAP2
-	/* if ldap->ld_errno == LDAP_DECODING_ERROR there was an
-	   error decoding an attribute, and we shouldn't free ber,
-	   since the ldap library already did it. */
-	if (ldap->ld_errno != LDAP_DECODING_ERROR && ber)
-		ber_free (ber, 0);
-#endif
-
-	e_card_simple_sync_card (card);
-
-	return card;
-}
-
-static gboolean
-poll_ldap (LDAPSearchOp *op)
-{
-	PASBackendLDAPBookView *view = op->view;
-	PASBackendLDAP *bl = op->bl;
-	LDAP           *ldap = bl->priv->ldap;
-	int            rc;
-	LDAPMessage    *res, *e;
-	GList   *cards = NULL;
-	static int received = 0;
-
-	pas_book_view_notify_status_message (view->book_view, "Polling for LDAP search result");
-
-	rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
-	
-	if (rc == -1 && received == 0) {
-		pas_book_view_notify_status_message (view->book_view, "Restarting search");
-		/* connection went down and we never got any. */
-		bl->priv->connected = FALSE;
-
-		/* this will reopen the connection */
-		ldap_op_restart ((LDAPOp*)op);
-		return FALSE;
-	}
-
-	if (rc != LDAP_RES_SEARCH_ENTRY) {
-		view->search_idle = 0;
-		pas_book_view_notify_complete (view->book_view);
-		ldap_op_finished ((LDAPOp*)op);
-		received = 0;
-		pas_book_view_notify_status_message (view->book_view, "Search complete");
-		return FALSE;
-	}
-
-	received = 1;
-		
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-		ECardSimple *card = build_card_from_entry (ldap, e);
-
-		cards = g_list_append (cards, e_card_simple_get_vcard (card));
-
-		gtk_object_unref (GTK_OBJECT(card));
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	if (cards) {
-		pas_book_view_notify_add (view->book_view, cards);
-			
-		g_list_foreach (cards, (GFunc)g_free, NULL);
-		g_list_free (cards);
-		cards = NULL;
-	}
-
-	ldap_msgfree(res);
-
-	return TRUE;
-}
-
-static gboolean
-ldap_search_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "Searching...");
-
-	/* it might not be NULL if we've been restarted */
-	if (search_op->ldap_query == NULL)
-		search_op->ldap_query = pas_backend_ldap_build_query(search_op->view->search);
-
-	if (search_op->ldap_query != NULL) {
-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-		PASBackendLDAPBookView *view = search_op->view;
-		LDAP *ldap = bl->priv->ldap;
-		int ldap_err;
-
-#ifdef OPENLDAP2
-		ldap_err = ldap_search_ext (ldap, bl->priv->ldap_rootdn,
-					    bl->priv->ldap_scope,
-					    search_op->ldap_query,
-					    NULL, 0,
-					    NULL, /* XXX */
-					    NULL, /* XXX */
-					    NULL,
-					    LDAP_MAX_SEARCH_RESPONSES, &view->search_msgid);
-
-		if (ldap_err != LDAP_SUCCESS) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-#else
-		ldap->ld_sizelimit = LDAP_MAX_SEARCH_RESPONSES;
-		ldap->ld_deref = LDAP_DEREF_ALWAYS;
-		view->search_msgid = ldap_search (ldap, bl->priv->ldap_rootdn,
-						  bl->priv->ldap_scope,
-						  search_op->ldap_query,
-						  NULL, 0);
-		ldap_err = ldap->ld_errno;
-#endif
-
-		if (view->search_msgid == -1) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-		else {
-			view->search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);
-		}
-
-		/* we're async */
-		return FALSE;
-	}
-	else {
-		/* error doing the conversion to an ldap query, let's
-                   end this now by acting like we're synchronous. */
-		g_warning ("LDAP problem converting search query %s\n", search_op->view->search);
-		return TRUE;
-	}
-}
-
-static void
-ldap_search_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	g_free (search_op->ldap_query);
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view, ldap_search_handler, ldap_search_dtor);
-
-	op->ldap_query = NULL;
-	op->view = view;
-	op->bl = bl;
-
-	/* keep track of the search op so we can delete it from the
-           list if the view is destroyed */
-	view->search_op = (LDAPOp*)op;
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_book_view (book,
-		(book_view != NULL
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		book_view);
-
-	view = g_new0(PASBackendLDAPBookView, 1);
-	view->book_view = book_view;
-	view->search = g_strdup(req->search);
-	view->blpriv = bl->priv;
-
-	bl->priv->book_views = g_list_prepend(bl->priv->book_views, view);
-
-	pas_backend_ldap_search (bl, book, view);
-
-}
-
-static void
-pas_backend_ldap_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_report_connection (book, bl->priv->connected);
-}
-
-static void
-pas_backend_ldap_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int ldap_error = ldap_simple_bind_s(bl->priv->ldap,
-					    req->user,
-					    req->passwd);
-
-	pas_book_respond_authenticate_user (book,
-				    ldap_error_to_response (ldap_error));
-
-	if (!bl->priv->evolvePersonChecked)
-		check_for_evolve_person (bl);
-}
-
-static void
-pas_backend_ldap_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASRequest *req)
-
-{
-	EList *fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	printf ("in pas_backend_ldap_get_supported_fields\n");
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       fields);
-}
-
-static gboolean
-pas_backend_ldap_can_write (PASBook *book)
-{
-	return TRUE; /* XXX */
-}
-
-static gboolean
-pas_backend_ldap_can_write_card (PASBook *book,
-				 const char *id)
-{
-	return TRUE; /* XXX */
-}
-
-static void
-pas_backend_ldap_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_ldap_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_ldap_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_ldap_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_ldap_process_check_connection (backend, book, req);
-		break;
-
-	case GetCursor:
-		pas_backend_ldap_process_get_cursor (backend, book, req);
-		break;
-
-	case GetBookView:
-		pas_backend_ldap_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		/* FIXME: Code this. */
-		break;
-
-	case AuthenticateUser:
-		pas_backend_ldap_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_ldap_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendLDAP *backend;
-
-	backend = PAS_BACKEND_LDAP (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_ldap_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendLDAP *bl;
-	int            ldap_error = LDAP_SUCCESS; /* XXX */
-
-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));
-
-	/* XXX use ldap_search */
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* success */
-		return g_strdup ("");
-	}
-	else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-
-	g_assert (bl->priv->connected == FALSE);
-
-	ldap_error = ldap_url_parse ((char*)uri, &lud);
-	if (ldap_error == LDAP_SUCCESS) {
-		g_free(bl->priv->uri);
-		bl->priv->uri = g_strdup (uri);
-		bl->priv->ldap_host = g_strdup(lud->lud_host);
-		bl->priv->ldap_port = lud->lud_port;
-		/* if a port wasn't specified, default to LDAP_PORT */
-		if (bl->priv->ldap_port == 0)
-			bl->priv->ldap_port = LDAP_PORT;
-		bl->priv->ldap_rootdn = g_strdup(lud->lud_dn);
-		bl->priv->ldap_scope = lud->lud_scope;
-
-		ldap_free_urldesc(lud);
-
-		pas_backend_ldap_connect (bl);
-		if (bl->priv->ldap == NULL)
-			return FALSE;
-		else
-			return TRUE;
-	} else
-		return FALSE;
-}
-
-/* Get_uri handler for the addressbook LDAP backend */
-static const char *
-pas_backend_ldap_get_uri (PASBackend *backend)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (backend);
-	return bl->priv->uri;
-}
-
-static gboolean
-pas_backend_ldap_add_client (PASBackend             *backend,
-			     GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBackendLDAP *bl;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_ldap_get_vcard,
-		pas_backend_ldap_can_write,
-		pas_backend_ldap_can_write_card);
-
-	if (!book) {
-		if (!bl->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
-
-	bl->priv->clients = g_list_prepend (
-		bl->priv->clients, book);
-
-	if (bl->priv->connected) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-
-	return TRUE;
-}
-
-static void
-pas_backend_ldap_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendLDAP *bl;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_LDAP (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bl->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bl->priv->clients = g_list_remove_link (bl->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bl->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_ldap_get_static_capabilites (PASBackend *backend)
-{
-	return g_strdup("net");
-}
-
-static gboolean
-pas_backend_ldap_construct (PASBackendLDAP *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_ldap_new:
- */
-PASBackend *
-pas_backend_ldap_new (void)
-{
-	PASBackendLDAP *backend;
-
-	backend = gtk_type_new (pas_backend_ldap_get_type ());
-
-	if (! pas_backend_ldap_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-call_dtor (LDAPOp *op, gpointer data)
-{
-	op->dtor (op->backend, op);
-}
-
-static void
-pas_backend_ldap_destroy (GtkObject *object)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (object);
-
-	g_list_foreach (bl->priv->pending_ops, (GFunc)call_dtor, NULL);
-	g_list_free (bl->priv->pending_ops);
-
-	g_free (bl->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_ldap_load_uri;
-	parent_class->get_uri                 = pas_backend_ldap_get_uri;
-	parent_class->add_client              = pas_backend_ldap_add_client;
-	parent_class->remove_client           = pas_backend_ldap_remove_client;
-	parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilites;
-
-	object_class->destroy = pas_backend_ldap_destroy;
-}
-
-static void
-pas_backend_ldap_init (PASBackendLDAP *backend)
-{
-	PASBackendLDAPPrivate *priv;
-
-	priv            = g_new0 (PASBackendLDAPPrivate, 1);
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_ldap_get_type:
- */
-GtkType
-pas_backend_ldap_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendLDAP",
-			sizeof (PASBackendLDAP),
-			sizeof (PASBackendLDAPClass),
-			(GtkClassInitFunc)  pas_backend_ldap_class_init,
-			(GtkObjectInitFunc) pas_backend_ldap_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h
deleted file mode 100644
index a59cdf3857..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_LDAP_H__
-#define __PAS_BACKEND_LDAP_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendLDAPPrivate *priv;
-} PASBackendLDAP;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendLDAPClass;
-
-PASBackend *pas_backend_ldap_new      (void);
-GtkType     pas_backend_ldap_get_type (void);
-
-#define PAS_BACKEND_LDAP_TYPE        (pas_backend_ldap_get_type ())
-#define PAS_BACKEND_LDAP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_LDAP_TYPE, PASBackendLDAP))
-#define PAS_BACKEND_LDAP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendLDAPClass))
-#define PAS_IS_BACKEND_LDAP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_LDAP_TYPE))
-#define PAS_IS_BACKEND_LDAP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_LDAP_TYPE))
-
-#endif /* ! __PAS_BACKEND_LDAP_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
deleted file mode 100644
index 22b7184813..0000000000
--- a/addressbook/backend/pas/pas-backend.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "pas-backend.h"
-
-#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)->klass)
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static guint pas_backend_signals[LAST_SIGNAL];
-
-
-gboolean
-pas_backend_construct (PASBackend *backend)
-{
-	return TRUE;
-}
-
-gboolean
-pas_backend_load_uri (PASBackend             *backend,
-		      const char             *uri)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uri != NULL, FALSE);
-
-	g_assert (CLASS (backend)->load_uri != NULL);
-
-	return (* CLASS (backend)->load_uri) (backend, uri);
-}
-
-/**
- * pas_backend_get_uri:
- * @backend: An addressbook backend.
- * 
- * Queries the URI that an addressbook backend is serving.
- * 
- * Return value: URI for the backend.
- **/
-const char *
-pas_backend_get_uri (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * pas_backend_add_client:
- * @backend: An addressbook backend.
- * @listener: Listener for notification to the client.
- *
- * Adds a client to an addressbook backend.
- *
- * Return value: TRUE on success, FALSE on failure to add the client.
- */
-gboolean
-pas_backend_add_client (PASBackend             *backend,
-			GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (listener != CORBA_OBJECT_NIL, FALSE);
-
-	g_assert (CLASS (backend)->add_client != NULL);
-
-	return CLASS (backend)->add_client (backend, listener);
-}
-
-void
-pas_backend_remove_client (PASBackend *backend,
-			   PASBook    *book)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-	g_return_if_fail (book    != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-	
-	g_assert (CLASS (backend)->remove_client != NULL);
-
-	CLASS (backend)->remove_client (backend, book);
-}
-
-char *
-pas_backend_get_static_capabilities (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-	
-	g_assert (CLASS (backend)->get_static_capabilities != NULL);
-
-	return CLASS (backend)->get_static_capabilities (backend);
-}
-
-/**
- * pas_backend_last_client_gone:
- * @backend: An addressbook backend.
- * 
- * Emits the "last_client_gone" signal for the specified backend.  Should
- * only be called from backend implementations if the backend really does
- * not have any more clients.
- **/
-void
-pas_backend_last_client_gone (PASBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), pas_backend_signals[LAST_CLIENT_GONE]);	
-}
-
-static void
-pas_backend_init (PASBackend *backend)
-{
-}
-
-static void
-pas_backend_class_init (PASBackendClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	pas_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_backend_signals, LAST_SIGNAL);
-
-	klass->add_client = NULL;
-	klass->remove_client = NULL;
-	klass->get_static_capabilities = NULL;
-}
-
-/**
- * pas_backend_get_type:
- */
-GtkType
-pas_backend_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackend",
-			sizeof (PASBackend),
-			sizeof (PASBackendClass),
-			(GtkClassInitFunc)  pas_backend_class_init,
-			(GtkObjectInitFunc) pas_backend_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
deleted file mode 100644
index be08d48950..0000000000
--- a/addressbook/backend/pas/pas-backend.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * An abstract class which defines the API to a given backend.
- * There will be one PASBackend object for every URI which is loaded.
- *
- * Two people will call into the PASBackend API:
- *
- * 1. The PASBookFactory, when it has been asked to load a book.
- *    It will create a new PASBackend if one is not already running
- *    for the requested URI.  It will call pas_backend_add_client to
- *    add a new client to an existing PASBackend server.
- *
- * 2. A PASBook, when a client has requested an operation on the
- *    GNOME_Evolution_Addressbook_Book interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_H__
-#define __PAS_BACKEND_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBackend        PASBackend;
-typedef struct _PASBackendPrivate PASBackendPrivate;
-
-#include <pas/pas-book.h>
-
-struct _PASBackend {
-	GtkObject parent_object;
-	PASBackendPrivate *priv;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Virtual methods */
-	gboolean (*load_uri) (PASBackend *backend, const char *uri);
-	const char *(* get_uri) (PASBackend *backend);
-	gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_BookListener listener);
-	void (*remove_client) (PASBackend *backend, PASBook *book);
-        char *(*get_static_capabilities) (PASBackend *backend);
-
-	/* Notification signals */
-	void (* last_client_gone) (PASBackend *backend);
-} PASBackendClass;
-
-typedef PASBackend * (*PASBackendFactoryFn) (void);
-
-gboolean    pas_backend_construct                (PASBackend             *backend);
-gboolean    pas_backend_load_uri                 (PASBackend             *backend,
-						  const char             *uri);
-const char *pas_backend_get_uri                  (PASBackend             *backend);
-
-gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  GNOME_Evolution_Addressbook_BookListener  listener);
-void        pas_backend_remove_client            (PASBackend             *backend,
-						  PASBook                *book);
-char       *pas_backend_get_static_capabilities  (PASBackend             *backend);
-
-void        pas_backend_last_client_gone         (PASBackend             *backend);
-
-GtkType     pas_backend_get_type                 (void);
-
-#define PAS_BACKEND_TYPE        (pas_backend_get_type ())
-#define PAS_BACKEND(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_TYPE, PASBackend))
-#define PAS_BACKEND_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendClass))
-#define PAS_IS_BACKEND(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_TYPE))
-#define PAS_IS_BACKEND_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_TYPE))
-
-#endif /* ! __PAS_BACKEND_H__ */
-
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
deleted file mode 100644
index 54fbd2de84..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "pas-book-factory.h"
-
-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_GNOME_Evolution_Addressbook_BookFactory__vepv   pas_book_factory_vepv;
-
-typedef struct {
-	char                              *uri;
-	GNOME_Evolution_Addressbook_BookListener             listener;
-} PASBookFactoryQueuedRequest;
-
-struct _PASBookFactoryPrivate {
-	gint        idle_id;
-	GHashTable *backends;
-	GHashTable *active_server_map;
-	GList      *queued_requests;
-
-	/* Whether the factory has been registered with OAF yet */
-	guint       registered : 1;
-};
-
-/* Signal IDs */
-enum {
-	LAST_BOOK_GONE,
-	LAST_SIGNAL
-};
-
-static guint factory_signals[LAST_SIGNAL];
-
-static char *
-pas_book_factory_canonicalize_uri (const char *uri)
-{
-	/* FIXME: What do I do here? */
-
-	return g_strdup (uri);
-}
-
-static char *
-pas_book_factory_extract_proto_from_uri (const char *uri)
-{
-	char *proto;
-	char *p;
-
-	p = strchr (uri, ':');
-
-	if (p == NULL)
-		return NULL;
-
-	proto = g_malloc0 (p - uri + 1);
-
-	strncpy (proto, uri, p - uri);
-
-	return proto;
-}
-
-/**
- * pas_book_factory_register_backend:
- * @factory:
- * @proto:
- * @backend:
- */
-void
-pas_book_factory_register_backend (PASBookFactory      *factory,
-				   const char          *proto,
-				   PASBackendFactoryFn  backend)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-	g_return_if_fail (proto != NULL);
-	g_return_if_fail (backend != NULL);
-
-	if (g_hash_table_lookup (factory->priv->backends, proto) != NULL) {
-		g_warning ("pas_book_factory_register_backend: "
-			   "Proto \"%s\" already registered!\n", proto);
-	}
-
-	g_hash_table_insert (factory->priv->backends,
-			     g_strdup (proto), backend);
-}
-
-/**
- * pas_book_factory_get_n_backends:
- * @factory: An addressbook factory.
- * 
- * Queries the number of running addressbook backends in an addressbook factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-pas_book_factory_get_n_backends (PASBookFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), -1);
-
-	return g_hash_table_size (factory->priv->active_server_map);
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (PASBackend *backend, gpointer data)
-{
-	PASBookFactory *factory;
-	const char *uri;
-	gpointer orig_key;
-	gboolean result;
-	char *orig_uri;
-
-	factory = PAS_BOOK_FACTORY (data);
-
-	/* Remove the backend from the active server map */
-
-	uri = pas_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (factory->priv->active_server_map, uri,
-					       &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (factory->priv->active_server_map, orig_uri);
-	g_free (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (factory->priv->active_server_map) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), factory_signals[LAST_BOOK_GONE]);
-}
-
-static PASBackendFactoryFn
-pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
-					 const char     *uri)
-{
-	PASBackendFactoryFn  backend_fn;
-	char                *proto;
-	char                *canonical_uri;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-	g_assert (uri != NULL);
-
-	canonical_uri = pas_book_factory_canonicalize_uri (uri);
-	if (canonical_uri == NULL)
-		return NULL;
-
-	proto = pas_book_factory_extract_proto_from_uri (canonical_uri);
-	if (proto == NULL) {
-		g_free (canonical_uri);
-		return NULL;
-	}
-
-	backend_fn = g_hash_table_lookup (factory->priv->backends, proto);
-
-	g_free (proto); 
-	g_free (canonical_uri);
-
-	return backend_fn;
-}
-
-static PASBackend *
-pas_book_factory_launch_backend (PASBookFactory              *factory,
-				 GNOME_Evolution_Addressbook_BookListener       listener,
-				 const char                  *uri)
-{
-	PASBackendFactoryFn  backend_factory;
-	PASBackend          *backend;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (
-		factory, uri);
-
-	if (!backend_factory) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = (* backend_factory) ();
-	if (!backend) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_OtherError,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	g_hash_table_insert (factory->priv->active_server_map,
-			     g_strdup (uri),
-			     backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    backend_last_client_gone_cb,
-			    factory);
-
-	return backend;
-}
-
-static void
-pas_book_factory_process_request (PASBookFactory              *factory,
-				  PASBookFactoryQueuedRequest *request)
-{
-	PASBackend *backend;
-	char *uri;
-	GNOME_Evolution_Addressbook_BookListener listener;
-	CORBA_Environment ev;
-
-	uri = request->uri;
-	listener = request->listener;
-	g_free (request);
-
-	/* Look up the backend and create one if needed */
-
-	backend = g_hash_table_lookup (factory->priv->active_server_map, uri);
-
-	if (!backend) {
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		if (!pas_backend_add_client (backend, listener))
-			goto out;
-
-		pas_backend_load_uri (backend, uri);
-
-		goto out;
-	}
-
-	pas_backend_add_client (backend, listener);
-
- out:
-	g_free (uri);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_factory_process_request(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_factory_process_queue (PASBookFactory *factory)
-{
-	/* Process pending Book-creation requests. */
-	if (factory->priv->queued_requests != NULL) {
-		PASBookFactoryQueuedRequest  *request;
-		GList *l;
-
-		l = factory->priv->queued_requests;
-		request = l->data;
-
-		pas_book_factory_process_request (factory, request);
-
-		factory->priv->queued_requests = g_list_remove_link (
-			factory->priv->queued_requests, l);
-		g_list_free_1 (l);
-	}
-
-	if (factory->priv->queued_requests == NULL) {
-
-		factory->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_factory_queue_request (PASBookFactory               *factory,
-				const char                   *uri,
-				const GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBookFactoryQueuedRequest *request;
-	GNOME_Evolution_Addressbook_BookListener       listener_copy;
-	CORBA_Environment            ev;
-
-	CORBA_exception_init (&ev);
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("PASBookFactory: Could not duplicate BookListener!\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	request           = g_new0 (PASBookFactoryQueuedRequest, 1);
-	request->listener = listener_copy;
-	request->uri      = g_strdup (uri);
-
-	factory->priv->queued_requests =
-		g_list_prepend (factory->priv->queued_requests, request);
-
-	if (! factory->priv->idle_id) {
-		factory->priv->idle_id =
-			g_idle_add ((GSourceFunc) pas_book_factory_process_queue, factory);
-	}
-}
-
-
-static void
-impl_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant        servant,
-				      const CORBA_char             *uri,
-				      const GNOME_Evolution_Addressbook_BookListener  listener,
-				      CORBA_Environment            *ev)
-{
-	PASBookFactory      *factory =
-		PAS_BOOK_FACTORY (bonobo_object_from_servant (servant));
-	PASBackendFactoryFn  backend_factory;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
-
-	if (backend_factory == NULL) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			ev);
-
-		return;
-	}
-
-	pas_book_factory_queue_request (factory, uri, listener);
-}
-
-static gboolean
-pas_book_factory_construct (PASBookFactory *factory)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory  *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_factory_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookFactory__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (factory), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), obj);
-
-	return TRUE;
-}
-
-/**
- * pas_book_factory_new:
- */
-PASBookFactory *
-pas_book_factory_new (void)
-{
-	PASBookFactory *factory;
-
-	factory = gtk_type_new (pas_book_factory_get_type ());
-
-	if (! pas_book_factory_construct (factory)) {
-		g_warning ("pas_book_factory_new: Could not construct PASBookFactory!\n");
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		return NULL;
-	}
-
-	return factory;
-}
-
-/**
- * pas_book_factory_activate:
- */
-gboolean
-pas_book_factory_activate (PASBookFactory *factory)
-{
-	PASBookFactoryPrivate *priv;
-	CORBA_Object obj;
-	OAF_RegistrationResult result;
-
-	g_return_val_if_fail (factory != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), FALSE);
-
-	priv = factory->priv;
-
-	g_return_val_if_fail (!priv->registered, FALSE);
-
-	puts ("about to register addressbook");
-
-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
-	result = oaf_active_server_register (PAS_BOOK_FACTORY_OAF_ID, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		return FALSE;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		return FALSE;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		return FALSE;
-	}
-}
-
-static void
-pas_book_factory_init (PASBookFactory *factory)
-{
-	factory->priv = g_new0 (PASBookFactoryPrivate, 1);
-
-	factory->priv->active_server_map = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->backends          = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->queued_requests   = NULL;
-	factory->priv->registered        = FALSE;
-}
-
-static void
-free_active_server_map_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	PASBackend *backend;
-
-	uri = key;
-	g_free (uri);
-
-	backend = PAS_BACKEND (value);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-static void
-remove_backends_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-
-	uri = key;
-	g_free (uri);
-}
-
-static void
-pas_book_factory_destroy (GtkObject *object)
-{
-	PASBookFactory *factory = PAS_BOOK_FACTORY (object);
-	GList          *l;
-
-	for (l = factory->priv->queued_requests; l != NULL; l = l->next) {
-		PASBookFactoryQueuedRequest *request = l->data;
-		CORBA_Environment ev;
-
-		g_free (request->uri);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (request->listener, &ev);
-		CORBA_exception_free (&ev);
-
-		g_free (request);
-	}
-	g_list_free (factory->priv->queued_requests);
-	factory->priv->queued_requests = NULL;
-
-	g_hash_table_foreach (factory->priv->active_server_map,
-			      free_active_server_map_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->active_server_map);
-	factory->priv->active_server_map = NULL;
-
-	g_hash_table_foreach (factory->priv->backends,
-			      remove_backends_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->backends);
-	factory->priv->backends = NULL;
-
-	if (factory->priv->registered) {
-		CORBA_Object obj;
-
-		obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-		oaf_active_server_unregister (PAS_BOOK_FACTORY_OAF_ID, obj);
-		factory->priv->registered = FALSE;
-	}
-	
-	g_free (factory->priv);
-
-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
-}
-
-static POA_GNOME_Evolution_Addressbook_BookFactory__epv *
-pas_book_factory_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);
-
-	epv->openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;
-
-	return epv;
-	
-}
-
-static void
-pas_book_factory_corba_class_init (void)
-{
-	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();
-	pas_book_factory_vepv.GNOME_Evolution_Addressbook_BookFactory_epv = pas_book_factory_get_epv ();
-}
-
-static void
-pas_book_factory_class_init (PASBookFactoryClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_factory_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	factory_signals[LAST_BOOK_GONE] =
-		gtk_signal_new ("last_book_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookFactoryClass, last_book_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_factory_destroy;
-
-	pas_book_factory_corba_class_init ();
-}
-
-/**
- * pas_book_factory_get_type:
- */
-GtkType
-pas_book_factory_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookFactory",
-			sizeof (PASBookFactory),
-			sizeof (PASBookFactoryClass),
-			(GtkClassInitFunc)  pas_book_factory_class_init,
-			(GtkObjectInitFunc) pas_book_factory_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
deleted file mode 100644
index 7f8754ce2f..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-
-#include <pas/pas-backend.h>
-
-#ifndef __PAS_BOOK_FACTORY_H__
-#define __PAS_BOOK_FACTORY_H__
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;
-
-typedef struct {
-	BonoboObject            parent_object;
-	PASBookFactoryPrivate *priv;
-} PASBookFactory;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* last_book_gone) (PASBookFactory *factory);
-} PASBookFactoryClass;
-
-PASBookFactory *pas_book_factory_new              (void);
-
-void            pas_book_factory_register_backend (PASBookFactory               *factory,
-						   const char                   *proto,
-						   PASBackendFactoryFn           backend_factory);
-
-int             pas_book_factory_get_n_backends   (PASBookFactory               *factory);
-
-gboolean        pas_book_factory_activate         (PASBookFactory               *factory);
-
-GtkType         pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_BOOK_FACTORY_H__ */
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
deleted file mode 100644
index 12e46533a4..0000000000
--- a/addressbook/backend/pas/pas-book-view.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book-view.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include "pas-book-view.h"
-
-static BonoboObjectClass *pas_book_view_parent_class;
-POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;
-
-struct _PASBookViewPrivate {
-	GNOME_Evolution_Addressbook_BookViewListener  listener;
-};
-
-/**
- * pas_book_view_notify_change:
- */
-void
-pas_book_view_notify_change (PASBookView                *book_view,
-			     const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *) cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_change: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_change_1 (PASBookView *book_view,
-			       const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_change(book_view, list);
-	g_list_free(list);
-}
-
-/**
- * pas_book_view_notify_remove:
- */
-void
-pas_book_view_notify_remove (PASBookView                *book_view,
-			     const char                 *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (
-		book_view->priv->listener, (GNOME_Evolution_Addressbook_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_view_notify_add:
- */
-void
-pas_book_view_notify_add (PASBookView                *book_view,
-			  const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *)cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_add: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_add_1 (PASBookView *book_view,
-			    const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_add(book_view, list);
-	g_list_free(list);
-}
-
-void
-pas_book_view_notify_complete (PASBookView *book_view)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (
-		book_view->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_view_notify_status_message (PASBookView *book_view,
-				     const char  *message)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (
-		book_view->priv->listener, message, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_view_construct (PASBookView                *book_view,
-			 GNOME_Evolution_Addressbook_BookViewListener  listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookView *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book_view      != NULL);
-	g_assert (PAS_IS_BOOK_VIEW (book_view));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_view_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	GNOME_Evolution_Addressbook_BookViewListener_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to ref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book_view), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book_view), obj);
-
-	book_view->priv->listener  = listener;
-
-	return TRUE;
-}
-
-/**
- * pas_book_view_new:
- */
-PASBookView *
-pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener  listener)
-{
-	PASBookView *book_view;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-
-	book_view = gtk_type_new (pas_book_view_get_type ());
-
-	if (! pas_book_view_construct (book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-
-		return NULL;
-	}
-
-	return book_view;
-}
-
-static void
-pas_book_view_destroy (GtkObject *object)
-{
-	PASBookView *book_view = PAS_BOOK_VIEW (object);
-	CORBA_Environment   ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_unref (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to unref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
-	CORBA_Object_release (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to release listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (book_view->priv);
-
-	GTK_OBJECT_CLASS (pas_book_view_parent_class)->destroy (object);	
-}
-
-static POA_GNOME_Evolution_Addressbook_BookView__epv *
-pas_book_view_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookView__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookView__epv, 1);
-
-	return epv;
-	
-}
-
-static void
-pas_book_view_corba_class_init (void)
-{
-	pas_book_view_vepv.Bonobo_Unknown_epv     = bonobo_object_get_epv ();
-	pas_book_view_vepv.GNOME_Evolution_Addressbook_BookView_epv = pas_book_view_get_epv ();
-}
-
-static void
-pas_book_view_class_init (PASBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_view_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_book_view_destroy;
-
-	pas_book_view_corba_class_init ();
-}
-
-static void
-pas_book_view_init (PASBookView *book_view)
-{
-	book_view->priv           = g_new0 (PASBookViewPrivate, 1);
-	book_view->priv->listener = CORBA_OBJECT_NIL;
-}
-
-/**
- * pas_book_view_get_type:
- */
-GtkType
-pas_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookView",
-			sizeof (PASBookView),
-			sizeof (PASBookViewClass),
-			(GtkClassInitFunc)  pas_book_view_class_init,
-			(GtkObjectInitFunc) pas_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
deleted file mode 100644
index fb9e892dfd..0000000000
--- a/addressbook/backend/pas/pas-book-view.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BOOK_VIEW_H__
-#define __PAS_BOOK_VIEW_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBookView        PASBookView;
-typedef struct _PASBookViewClass   PASBookViewClass;
-typedef struct _PASBookViewPrivate PASBookViewPrivate;
-
-struct _PASBookView {
-	BonoboObject     parent_object;
-	PASBookViewPrivate *priv;
-};
-
-struct _PASBookViewClass {
-	BonoboObjectClass parent_class;
-};
-PASBookView *pas_book_view_new                    (GNOME_Evolution_Addressbook_BookViewListener  listener);
-
-void         pas_book_view_notify_change          (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_change_1        (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_remove          (PASBookView                *book_view,
-						   const char                 *id);
-void         pas_book_view_notify_add             (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_add_1           (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_complete        (PASBookView                *book_view);
-void         pas_book_view_notify_status_message  (PASBookView                *book_view,
-						   const char                 *message);
-
-GtkType      pas_book_view_get_type               (void);
-
-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())
-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))
-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))
-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))
-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))
-
-#endif /* ! __PAS_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
deleted file mode 100644
index 6add0987fc..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-util/e-list.h"
-#include "pas-book.h"
-
-static BonoboObjectClass *pas_book_parent_class;
-POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;
-
-enum {
-	REQUESTS_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint pas_book_signals [LAST_SIGNAL];
-
-struct _PASBookPrivate {
-	PASBackend             *backend;
-	GNOME_Evolution_Addressbook_BookListener  listener;
-	PASBookGetVCardFn       get_vcard;
-	PASBookCanWriteFn       can_write;
-	PASBookCanWriteCardFn   can_write_card;
-
-	GList                  *request_queue;
-	gint                    idle_id;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->request_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (book),
-				 pas_book_signals [REQUESTS_QUEUED]);
-	}
-
-	if (book->priv->request_queue == NULL) {
-		book->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_queue_request (PASBook *book, PASRequest *req)
-{
-	book->priv->request_queue =
-		g_list_append (book->priv->request_queue, req);
-
-	if (book->priv->idle_id == 0) {
-		book->priv->idle_id = g_idle_add ((GSourceFunc) pas_book_check_queue, book);
-	}
-}
-
-static void
-pas_book_queue_create_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CreateCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_remove_card (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = RemoveCard;
-	req->id = g_strdup (id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_modify_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = ModifyCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_cursor (PASBook *book, const char *search)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = GetCursor;
-	req->search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_authenticate_user (PASBook *book,
-				  const char *user, const char *passwd)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = AuthenticateUser;
-	req->user   = g_strdup(user);
-	req->passwd = g_strdup(passwd);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_supported_fields (PASBook *book)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = GetSupportedFields;
-
-	pas_book_queue_request (book, req);
-}
-
-
-static void
-pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetBookView;
-	req->search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = CORBA_Object_duplicate(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_book_view: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetChanges;
-	req->change_id= g_strdup(change_id);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = CORBA_Object_duplicate(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_changes: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_check_connection (PASBook *book)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CheckConnection;
-
-	pas_book_queue_request (book, req);
-}
-
-static CORBA_char *
-impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,
-						const GNOME_Evolution_Addressbook_CardId id,
-						CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char       *vcard;
-	CORBA_char *retval;
-
-	vcard = (book->priv->get_vcard) (book, (const char *) id);
-	retval = CORBA_string_dup (vcard);
-	g_free (vcard);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Addressbook_Book_isWriteable (PortableServer_Servant servant,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write) (book);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Addressbook_Book_isCardWriteable (PortableServer_Servant servant,
-						       const GNOME_Evolution_Addressbook_CardId id,
-						       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write_card) (book, (const char *) id);
-
-	return retval;
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_authenticateUser (PortableServer_Servant servant,
-							const char* user,
-							const char* passwd,
-							CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_authenticate_user (book, user, passwd);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_create_card (book, (const char *) vcard);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_CardId id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_remove_card (book, (const char *) id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_modify_card (book, (const char *) vcard);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant,
-				const CORBA_char *search,
-				CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_cursor (book, search);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,
-				   const GNOME_Evolution_Addressbook_BookViewListener listener,
-				   const CORBA_char *search,
-				   CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_book_view (book, listener, search);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_BookViewListener listener,
-				 const CORBA_char *change_id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_changes (book, listener, change_id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,
-				      CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_check_connection (book);
-}
-
-static char *
-impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant,
-					     CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char *temp;
-	char *ret_val;
-
-	temp = pas_backend_get_static_capabilities (book->priv->backend);
-	ret_val = CORBA_string_dup(temp);
-	g_free(temp);
-	return ret_val;
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getSupportedFields (PortableServer_Servant servant,
-							  CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_supported_fields (book);
-}
-
-/**
- * pas_book_get_backend:
- */
-PASBackend *
-pas_book_get_backend (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	return book->priv->backend;
-}
-
-/**
- * pas_book_get_listener:
- */
-GNOME_Evolution_Addressbook_BookListener
-pas_book_get_listener (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       CORBA_OBJECT_NIL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), CORBA_OBJECT_NIL);
-
-	return book->priv->listener;
-}
-
-/**
- * pas_book_check_pending
- */
-gint
-pas_book_check_pending (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       -1);
-	g_return_val_if_fail (PAS_IS_BOOK (book), -1);
-
-	return g_list_length (book->priv->request_queue);
-}
-
-/**
- * pas_book_pop_request:
- */
-PASRequest *
-pas_book_pop_request (PASBook *book)
-{
-	GList      *popped;
-	PASRequest *req;
-
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	if (book->priv->request_queue == NULL)
-		return NULL;
-
-	req = book->priv->request_queue->data;
-
-	popped = book->priv->request_queue;
-	book->priv->request_queue =
-		g_list_remove_link (book->priv->request_queue, popped);
-
-	g_list_free_1 (popped);
-
-	return req;
-}
-
-/**
- * pas_book_respond_open:
- */
-void
-pas_book_respond_open (PASBook                           *book,
-		       GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (status == GNOME_Evolution_Addressbook_BookListener_Success) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			book->priv->listener, status,
-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
-			&ev);
-	} else {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			book->priv->listener, status,
-			CORBA_OBJECT_NIL, &ev);
-	}
-	
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_open: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_create:
- */
-void
-pas_book_respond_create (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			 const char                        *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (
-		book->priv->listener, status, (char *)id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_create: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_remove:
- */
-void
-pas_book_respond_remove (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_remove: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_modify:
- */
-void
-pas_book_respond_modify (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardModified (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_modify: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_authenticate_user:
- */
-void
-pas_book_respond_authenticate_user (PASBook                           *book,
-				    GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyAuthenticationResult (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_authenticate_user: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_respond_get_supported_fields (PASBook *book,
-				       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       EList   *fields)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_stringlist stringlist;
-	int num_fields;
-	EIterator *iter;
-	int i;
-
-	CORBA_exception_init (&ev);
-
-	num_fields = e_list_length (fields);
-
-	stringlist._buffer = CORBA_sequence_CORBA_string_allocbuf (num_fields);
-	stringlist._maximum = num_fields;
-	stringlist._length = num_fields;
-
-	iter = e_list_get_iterator (fields);
-
-	for (i = 0; e_iterator_is_valid (iter); e_iterator_next (iter), i ++) {
-		stringlist._buffer[i] = CORBA_string_dup (e_iterator_get(iter));
-	}
-
-	gtk_object_unref (GTK_OBJECT (fields));
-
-	GNOME_Evolution_Addressbook_BookListener_notifySupportedFields (
-			book->priv->listener, status,
-			&stringlist,
-			&ev);
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(stringlist._buffer);
-}
-
-/**
- * pas_book_respond_get_cursor:
- */
-void
-pas_book_respond_get_cursor (PASBook                           *book,
-			     GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			     PASCardCursor                     *cursor)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_cursor: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_book_view:
- */
-void
-pas_book_respond_get_book_view (PASBook                           *book,
-				GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_book_view: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_changes:
- */
-void
-pas_book_respond_get_changes (PASBook                           *book,
-			      GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			      PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_changes: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_report_connection:
- */
-void
-pas_book_report_connection (PASBook  *book,
-			    gboolean  connected)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (
-		book->priv->listener, (CORBA_boolean) connected, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_report_connection: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_construct (PASBook                *book,
-		    PASBackend             *backend,
-		    GNOME_Evolution_Addressbook_BookListener  listener,
-		    PASBookGetVCardFn       get_vcard,
-		    PASBookCanWriteFn       can_write,
-		    PASBookCanWriteCardFn   can_write_card)
-{
-	POA_GNOME_Evolution_Addressbook_Book *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book      != NULL);
-	g_assert (PAS_IS_BOOK (book));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-	g_assert (get_vcard != NULL);
-	g_assert (can_write != NULL);
-	g_assert (can_write_card != NULL);
-
-	servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book), obj);
-
-	CORBA_exception_init (&ev);
-	book->priv->listener = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not duplicate the listener");
-
-	CORBA_exception_free (&ev);
-
-	book->priv->listener  = listener;
-	book->priv->get_vcard = get_vcard;
-	book->priv->can_write = can_write;
-	book->priv->can_write_card = can_write_card;
-	book->priv->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      GNOME_Evolution_Addressbook_BookListener  listener,
-	      PASBookGetVCardFn       get_vcard,
-	      PASBookCanWriteFn       can_write,
-	      PASBookCanWriteCardFn   can_write_card)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (get_vcard != NULL,             NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener,
-				  get_vcard, can_write, can_write_card)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-static void
-pas_book_destroy (GtkObject *object)
-{
-	PASBook *book = PAS_BOOK (object);
-	GList   *l;
-	CORBA_Environment ev;
-
-	for (l = book->priv->request_queue; l != NULL; l = l->next) {
-		PASRequest *req = l->data;
-
-		g_free (req->id);
-		g_free (req->vcard);
-		g_free (req);
-	}
-	g_list_free (book->priv->request_queue);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (book->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_GNOME_Evolution_Addressbook_Book__epv *
-pas_book_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_Book__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);
-
-	epv->getVCard              = impl_GNOME_Evolution_Addressbook_Book_getVCard;
-	epv->isWriteable           = impl_GNOME_Evolution_Addressbook_Book_isWriteable;
-	epv->isCardWriteable       = impl_GNOME_Evolution_Addressbook_Book_isCardWriteable;
-	epv->authenticateUser      = impl_GNOME_Evolution_Addressbook_Book_authenticateUser;
-	epv->addCard               = impl_GNOME_Evolution_Addressbook_Book_addCard;
-	epv->removeCard            = impl_GNOME_Evolution_Addressbook_Book_removeCard;
-	epv->modifyCard            = impl_GNOME_Evolution_Addressbook_Book_modifyCard;
-	epv->checkConnection       = impl_GNOME_Evolution_Addressbook_Book_checkConnection;
-	epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;
-	epv->getSupportedFields    = impl_GNOME_Evolution_Addressbook_Book_getSupportedFields;
-	epv->getCursor             = impl_GNOME_Evolution_Addressbook_Book_getCursor;
-	epv->getBookView           = impl_GNOME_Evolution_Addressbook_Book_getBookView;
-	epv->getChanges            = impl_GNOME_Evolution_Addressbook_Book_getChanges;
-
-	return epv;
-	
-}
-
-static void
-pas_book_corba_class_init (void)
-{
-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv ();
-}
-
-static void
-pas_book_class_init (PASBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	pas_book_signals [REQUESTS_QUEUED] =
-		gtk_signal_new ("requests_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookClass, requests_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_book_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_destroy;
-
-	pas_book_corba_class_init ();
-}
-
-static void
-pas_book_init (PASBook *book)
-{
-	book->priv                = g_new0 (PASBookPrivate, 1);
-	book->priv->idle_id       = 0;
-	book->priv->request_queue = NULL;
-}
-
-/**
- * pas_book_get_type:
- */
-GtkType
-pas_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBook",
-			sizeof (PASBook),
-			sizeof (PASBookClass),
-			(GtkClassInitFunc)  pas_book_class_init,
-			(GtkObjectInitFunc) pas_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
deleted file mode 100644
index 1d401d33a4..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BOOK_H__
-#define __PAS_BOOK_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-#include <pas/pas-book-view.h>
-#include "e-util/e-list.h"
-
-typedef struct _PASBook        PASBook;
-typedef struct _PASBookPrivate PASBookPrivate;
-
-#include <pas/pas-backend.h>
-#include <pas/pas-card-cursor.h>
-
-typedef enum {
-	CreateCard,
-	RemoveCard,
-	ModifyCard,
-	GetCursor,
-	GetBookView,
-	GetChanges,
-	CheckConnection,
-	AuthenticateUser,
-	GetSupportedFields
-} PASOperation;
-
-typedef struct {
-	PASOperation               op;
-	char                      *id;
-	char                      *vcard;
-	char                      *search;
-	char                      *change_id;
-	char                      *user;
-        char                      *passwd;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-	GNOME_Evolution_Addressbook_stringlist fields;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef char *   (*PASBookGetVCardFn)     (PASBook *book, const char *id);
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 GNOME_Evolution_Addressbook_BookListener             listener,
-							 PASBookGetVCardFn                  get_vcard,
-							 PASBookCanWriteFn                  can_write,
-							 PASBookCanWriteCardFn              can_write_card);
-PASBackend             *pas_book_get_backend            (PASBook                           *book);
-GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);
-int                     pas_book_check_pending          (PASBook                           *book);
-PASRequest             *pas_book_pop_request            (PASBook                           *book);
-void                    pas_book_respond_open           (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_create         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 const char                        *id);
-void                    pas_book_respond_remove         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_modify         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_authenticate_user (PASBook                           *book,
-							    GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_get_supported_fields (PASBook *book,
-							       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							       EList   *fields);
-
-void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASCardCursor                     *cursor);
-void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_respond_get_changes    (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_report_connection      (PASBook                           *book,
-							 gboolean                           connected);
-
-gboolean                pas_book_can_write              (PASBook                           *book);
-gboolean                pas_book_can_write_card         (PASBook                           *book,
-							 const char                        *id);
-GtkType                 pas_book_get_type               (void);
-
-#define PAS_BOOK_TYPE        (pas_book_get_type ())
-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))
-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))
-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))
-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))
-
-#endif /* ! __PAS_BOOK_H__ */
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
deleted file mode 100644
index a7f56275fc..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "addressbook.h"
-#include "pas-card-cursor.h"
-
-struct _PASCardCursorPrivate {
-	long     (*get_length) (PASCardCursor *cursor, gpointer data);
-	char *   (*get_nth)    (PASCardCursor *cursor, long n, gpointer data);
-	gpointer   data;
-};
-
-/*
- * A pointer to our parent object class
- */
-static BonoboObjectClass *parent_class;
-
-/*
- * The VEPV for the CardCursor object
- */
-static POA_GNOME_Evolution_Addressbook_CardCursor__vepv cursor_vepv;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-pas_card_cursor_destroy (GtkObject *object)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (object);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static CORBA_long
-impl_pas_card_cursor_get_length (PortableServer_Servant  servant,
-			       CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_length )
-		return cursor->priv->get_length( cursor, cursor->priv->data );
-	else
-		return 0;
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static char *
-impl_pas_card_cursor_get_nth (PortableServer_Servant  servant,
-			    const CORBA_long        n,
-			    CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_nth ) {
-		char *vcard = cursor->priv->get_nth( cursor, n, cursor->priv->data );
-		char *retval = CORBA_string_dup (vcard);
-		g_free (vcard);
-		return retval;
-	} else
-		return CORBA_string_dup ("");
-}
-
-/*
- * If you want users to derive classes from your implementation
- * you need to support this method.
- */
-POA_GNOME_Evolution_Addressbook_CardCursor__epv *
-pas_card_cursor_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);
-
-	/*
-	 * This is the method invoked by CORBA
-	 */
-	epv->count  = impl_pas_card_cursor_get_length;
-	epv->getNth = impl_pas_card_cursor_get_nth;
-
-	return epv;
-}
-
-static void
-init_pas_card_cursor_corba_class (void)
-{
-	cursor_vepv.Bonobo_Unknown_epv       = bonobo_object_get_epv ();
-	cursor_vepv.GNOME_Evolution_Addressbook_CardCursor_epv = pas_card_cursor_get_epv ();
-}
-
-static void
-pas_card_cursor_class_init (PASCardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_card_cursor_destroy;
-
-	init_pas_card_cursor_corba_class ();
-}
-
-static void
-pas_card_cursor_init (PASCardCursor *cursor)
-{
-	cursor->priv = g_new(PASCardCursorPrivate, 1);
-	cursor->priv->get_length = NULL;
-	cursor->priv->get_nth = NULL;
-	cursor->priv->data = NULL;
-}
-
-GtkType
-pas_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"PASCardCursor",
-			sizeof (PASCardCursor),
-			sizeof (PASCardCursorClass),
-			(GtkClassInitFunc) pas_card_cursor_class_init,
-			(GtkObjectInitFunc) pas_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-PASCardCursor *
-pas_card_cursor_construct (PASCardCursor           *cursor,
-			   GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
-			   PASCardCursorLengthFunc  get_length,
-			   PASCardCursorNthFunc     get_nth,
-			   gpointer data)
-{
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	/*
-	 * Call parent constructor
-	 */
-	if (!bonobo_object_construct (BONOBO_OBJECT (cursor), (CORBA_Object) corba_cursor))
-		return NULL;
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->get_length = get_length;
-	cursor->priv->get_nth = get_nth;
-	cursor->priv->data = data;
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/*
- * This routine creates the ORBit CORBA server and initializes the
- * CORBA side of things
- */
-static GNOME_Evolution_Addressbook_CardCursor
-create_cursor (BonoboObject *cursor)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cursor_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Addressbook_CardCursor__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Activates the CORBA object.
-	 */
-	return (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);
-}
-
-PASCardCursor *
-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
-		     PASCardCursorNthFunc     get_nth,
-		     gpointer data)
-{
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
-
-	cursor = gtk_type_new (pas_card_cursor_get_type ());
-	corba_cursor = create_cursor (BONOBO_OBJECT (cursor));
-
-	if (corba_cursor == CORBA_OBJECT_NIL){
-		gtk_object_unref (GTK_OBJECT (cursor));
-		return NULL;
-	}
-	
-	return pas_card_cursor_construct (cursor,
-					  corba_cursor,
-					  get_length,
-					  get_nth,
-					  data);
-}
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
deleted file mode 100644
index d7d19ecebd..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_CARD_CURSOR_H__
-#define __PAS_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <pas/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASCardCursor        PASCardCursor;
-typedef struct _PASCardCursorPrivate PASCardCursorPrivate;
-typedef struct _PASCardCursorClass   PASCardCursorClass;
-
-typedef long (*PASCardCursorLengthFunc) (PASCardCursor *cursor, gpointer data);
-typedef char * (*PASCardCursorNthFunc) (PASCardCursor *cursor, long n, gpointer data);
-
-struct _PASCardCursor {
-	BonoboObject     parent;
-	PASCardCursorPrivate *priv;
-};
-
-struct _PASCardCursorClass {
-	BonoboObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,
-				          PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,
-					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
-					  PASCardCursorLengthFunc  get_length,
-					  PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-
-GtkType        pas_card_cursor_get_type  (void);
-POA_GNOME_Evolution_Addressbook_CardCursor__epv *
-               pas_card_cursor_get_epv   (void);
-
-/* Fetching cards. */
-#define PAS_CARD_CURSOR_TYPE        (pas_card_cursor_get_type ())
-#define PAS_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), PAS_CARD_CURSOR_TYPE, PASCardCursor))
-#define PAS_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_CARD_CURSOR_TYPE, PASCardCursorClass))
-#define PAS_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), PAS_CARD_CURSOR_TYPE))
-#define PAS_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_CARD_CURSOR_H__ */
diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore
deleted file mode 100644
index 87b35d3be5..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libeaddress_conduit.la
-e-address-conduit-control-applet
-e-address-conduit-control-applet.desktop
-e-address.conduit
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index bf6577661c..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_INCLUDEDIR)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# Address Capplet
-bin_PROGRAMS = e-address-conduit-control-applet
-
-e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c
-
-e_address_conduit_control_applet_LDADD = 	\
-		$(CAPPLET_LIBS)  		\
-		$(GNOME_LIBDIR) 		\
-		$(GNOME_PILOT_LIBS) 		\
-		$(PISOCK_LIBS) 			\
-		$(GNOME_CAPPLET_LIBS) 		\
-		$(BONOBO_GNOME_LIBS) 		\
-		$(GNOME_XML_LIB) 		\
-	        $(GNOMEUI_LIBS) 		\
-                $(INTLLIBS)
-
-
-# Address Conduit
-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c \
-	address-conduit.h \
-	address-conduit-config.h
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/libeutil-static.la			\
-	$(top_builddir)/e-util/ename/libename-static.la			\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(GNOME_PILOT_LIBS) 						\
-	$(PISOCK_LIBS) 							\
-	$(BONOBO_GNOME_LIBS)						\
-	$(EXTRA_GNOME_LIBS)						\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-address.conduit: e-address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
-	&& mv e-address.conduit.tmp e-address.conduit
-
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_in_files = e-address-conduit-control-applet.desktop.in 
-ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-address.conduit
-
-EXTRA_DIST = \
-	e-address.conduit.in \
-        $(ccenterConduits_in_files)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
deleted file mode 100644
index d0981af6bf..0000000000
--- a/addressbook/conduit/address-conduit-config.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_CONFIG_H__
-#define __ADDR_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-struct _EAddrConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef ADDR_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EAddrConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef ADDR_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef ADDR_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef ADDR_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __ADDR_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/addressbook/conduit/address-conduit-control-applet.c b/addressbook/conduit/address-conduit-control-applet.c
deleted file mode 100644
index 3cbdbf8976..0000000000
--- a/addressbook/conduit/address-conduit-control-applet.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook -  Address Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_SAVE 1
-#define ADDR_CONFIG_DUPE 1
-#define ADDR_CONFIG_DESTROY 1
-#include <address-conduit-config.h>
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_SAVE
-#undef ADDR_CONFIG_DUPE
-#undef ADDR_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-EAddrConduitCfg *origState = NULL;
-EAddrConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, EAddrConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, EAddrConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, EAddrConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, EAddrConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	addrconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution Addressbook Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution addressbook conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, EAddrConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution Address conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	addrconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = addrconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	addrconduit_destroy_configuration (&origState);
-	addrconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 907456d985..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1137 +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 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <ebook/e-book.h>
-#include <ebook/e-card-types.h>
-#include <ebook/e-card-cursor.h>
-#include <ebook/e-card.h>
-#include <ebook/e-card-simple.h>
-#include <e-pilot-util.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_DESTROY 1
-#include <address-conduit-config.h>
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_DESTROY
-
-#include <address-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.1"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "eaddrconduit"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-typedef struct {
-	EBookStatus status;
-	char *id;
-} CardObjectChangeStatus;
-
-typedef enum {
-	CARD_ADDED,
-	CARD_MODIFIED,
-	CARD_DELETED
-} CardObjectChangeType;
-
-typedef struct 
-{
-	ECard *card;
-	CardObjectChangeType type;
-} CardObjectChange;
-
-/* 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] : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_addr_context_new (EAddrConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (EAddrConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	addrconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->cfg != NULL)
-		addrconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Addressbok Server routines */
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	CardObjectChangeStatus *cons = closure;
-
-	cons->status = status;
-	cons->id = g_strdup (id);
-	
-	gtk_main_quit();
-}
-
-static void
-status_cb (EBook *ebook, EBookStatus status, gpointer closure)
-{
-	(*(EBookStatus*)closure) = status;
-	gtk_main_quit();
-}
-
-static void
-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		long length;
-		int i;
-
-		ctxt->address_load_success = TRUE;
-
-		length = e_card_cursor_get_length (cursor);
-		ctxt->cards = NULL;
-		for (i = 0; i < length; i ++) {
-			ECard *card = e_card_cursor_get_nth (cursor, i);
-			
-			gtk_object_ref (GTK_OBJECT (card));
-			ctxt->cards = g_list_append (ctxt->cards, card);
-		}
-
-		gtk_main_quit(); /* end the sub event loop */
-	}
-	else {
-		WARN (_("Cursor could not be loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);
-	} else {
-		WARN (_("EBook not loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static int
-start_addressbook_server (EAddrConduitContext *ctxt)
-{
-	gchar *uri, *path;
-
-	g_return_val_if_fail(ctxt!=NULL,-2);
-
-	ctxt->ebook = e_book_new ();
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	e_book_load_uri (ctxt->ebook, uri, book_open_cb, ctxt);
-
-	/* run a sub event loop to turn ebook's async loading into a
-           synchronous call */
-	gtk_main ();
-
-	g_free (uri);
-
-	if (ctxt->address_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EAddrConduitContext *ctxt) 
-{
-	char *filename = NULL;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static GList *
-next_changed_item (EAddrConduitContext *ctxt, GList *changes) 
-{
-	CardObjectChange *coc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		coc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, e_card_get_id (coc->card)))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static char *
-get_entry_text (struct Address address, int field)
-{
-	if (address.entry[field])
-		return e_pilot_utf8_from_pchar (address.entry[field]);
-	
-	return g_strdup ("");
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	CardObjectChange *coc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	coc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (coc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (coc->type) {
-	case CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	
-	g_assert (local->addr != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char,0xffff);
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)
-{
-	ECardSimple *simple;
-	const ECardDeliveryAddress *delivery;
-	int phone = entryPhone1;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (ecard != NULL);
-
-	local->ecard = ecard;
-	gtk_object_ref (GTK_OBJECT (ecard));
-	simple = e_card_simple_new (ecard);
-	
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, ecard->id);
-
-	compute_status (ctxt, local, ecard->id);
-
-	local->addr = g_new0 (struct Address, 1);
-
-	if (ecard->name) {
-		if (ecard->name->given)
-			local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (ecard->name->given);
-		if (ecard->name->family)
-			local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (ecard->name->family);
-		if (ecard->org)
-			local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (ecard->org);
-		if (ecard->title)
-			local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (ecard->title);
-	}
-
-	delivery = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-	if (delivery) {
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (delivery->street);
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (delivery->city);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (delivery->region);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (delivery->code);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (delivery->country);
-	}
-	
-	for (i = 0; i <= 7; i++) {
-		const char *phone_str = NULL;
-		char *phonelabel = ctxt->ai.phoneLabels[i];
-		
-		if (!strcmp (phonelabel, "E-mail"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_EMAIL);
-		else if (!strcmp (phonelabel, "Home"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_HOME);
-		else if (!strcmp (phonelabel, "Work"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS);
-		else if (!strcmp (phonelabel, "Fax"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX);
-		else if (!strcmp (phonelabel, "Other"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER);
-		else if (!strcmp (phonelabel, "Main"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY);
-		else if (!strcmp (phonelabel, "Pager"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER);
-		else if (!strcmp (phonelabel, "Mobile"))
-			phone_str = e_card_simple_get_const (simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE);
-		
-		if (phone_str) {
-			local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-			local->addr->phoneLabel[phone - entryPhone1] = i;
-			phone++;
-		}
-		
-	}
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	ECard *ecard = NULL;
-
-	g_assert (local != NULL);
-
-	ecard = e_book_get_card (ctxt->ebook, uid);
-
-	if (ecard != NULL) {
-		local_record_from_ecard (local, ecard, ctxt);
-	} else {
-		ecard = e_card_new ("");
-		e_card_set_id (ecard, uid);
-		local_record_from_ecard (local, ecard, ctxt);
-	}
-}
-
-static ECard *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 ECard *in_card)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	ECardDeliveryAddress delivery;
-	char *string;
-	char *stringparts[3];
-	int i;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	if (in_card == NULL)
-		ecard = e_card_new("");
-	else
-		ecard = e_card_duplicate (in_card);
-	simple = e_card_simple_new (ecard);
-
-	/* Name and company */
-	i = 0;
-	if (address.entry[entryFirstname] && *address.entry[entryFirstname])
-		stringparts[i++] = address.entry[entryFirstname];
-	if (address.entry[entryLastname] && *address.entry[entryLastname])
-		stringparts[i++] = address.entry[entryLastname];
-	stringparts[i] = NULL;
-
-	string = g_strjoinv(" ", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FULL_NAME, e_pilot_utf8_from_pchar (string));
-	g_free(string);
-
-	if (address.entry[entryTitle]) {
-		char *txt = get_entry_text (address, entryTitle);
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, txt);
-		g_free (txt);
-	}
-
-	if (address.entry[entryCompany]) {
-		char *txt = get_entry_text (address, entryCompany);
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, txt);
-		g_free (txt);
-	}
-
-	/* Address */
-	memset (&delivery, 0, sizeof (ECardDeliveryAddress));
-	delivery.flags = E_CARD_ADDR_HOME;
-	if (address.entry[entryAddress])
-		delivery.street = get_entry_text (address, entryAddress);
-	if (address.entry[entryCity])
-		delivery.city = get_entry_text (address, entryCity);
-	if (address.entry[entryState])
-		delivery.region = get_entry_text (address, entryState);
-	if (address.entry[entryCountry])
-		delivery.country = get_entry_text (address, entryCountry);
-	if (address.entry[entryZip])
-		delivery.code = get_entry_text (address, entryZip);
-
-	string = e_card_delivery_address_to_string (&delivery);
-	e_card_simple_set (simple,  E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, string);
-	g_free (string);
-
-	free (delivery.street);
-	free (delivery.city);
-	free (delivery.region);
-	free (delivery.country);
-	free (delivery.code);
-
-	/* Phone numbers */
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		char *phonelabel = ctxt->ai.phoneLabels[address.phoneLabel[i - entryPhone1]];
-		char *phonenum = get_entry_text (address, i);
-
-		if (!strcmp (phonelabel, "E-mail"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_EMAIL, phonenum);
-		else if (!strcmp (phonelabel, "Home"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_HOME, phonenum);
-		else if (!strcmp (phonelabel, "Work"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, phonenum);
-		else if (!strcmp (phonelabel, "Fax"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, phonenum);
-		else if (!strcmp (phonelabel, "Other"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER, phonenum);
-		else if (!strcmp (phonelabel, "Main"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, phonenum);
-		else if (!strcmp (phonelabel, "Pager"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, phonenum);
-		else if (!strcmp (phonelabel, "Mobile"))
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, phonenum);
-
-		g_print ("    ['%s' : '%s']\n", phonelabel, phonenum);
-		
-		g_free (phonenum);
-	}
-
-	e_card_simple_sync_card (simple);
-	gtk_object_unref(GTK_OBJECT(simple));
-
-	free_Address(&address);
-
-	return ecard;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	int count, map_count;
-
-  	count = g_list_length (ctxt->cards);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-static void
-card_added (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		CardObjectChange *coc = g_new0 (CardObjectChange, 1);
-		
-		coc->card = E_CARD (l->data);
-		coc->type = CARD_ADDED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
-	}
-}
-
-static void
-card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		CardObjectChange *coc = g_new0 (CardObjectChange, 1);
-		
-		coc->card = E_CARD (l->data);
-		coc->type = CARD_MODIFIED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
-	}
-}
-
-
-static void
-card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)
-{
-	CardObjectChange *coc = g_new0 (CardObjectChange, 1);
-	
-	coc->card = e_card_new ("");
-	e_card_set_id (coc->card, id);
-	coc->type = CARD_DELETED;
-
-	ctxt->changed = g_list_prepend (ctxt->changed, coc);
-	if (!e_pilot_map_uid_is_archived (ctxt->map, id))
-		g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
-}
-
-static void
-sequence_complete (EBookView *book_view, EAddrConduitContext *ctxt)
-{
-	gtk_signal_disconnect_by_data (GTK_OBJECT (book_view), ctxt);
-	gtk_object_unref (GTK_OBJECT (book_view));
-  	gtk_main_quit ();
-}
-
-static void
-view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer data)
-{
-	EAddrConduitContext *ctxt = data;
-	
-	gtk_object_ref (GTK_OBJECT (book_view));
-	
-  	gtk_signal_connect (GTK_OBJECT (book_view), "card_added", 
-			    (GtkSignalFunc) card_added, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_changed", 
-			    (GtkSignalFunc) card_changed, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_removed", 
-			    (GtkSignalFunc) card_removed, ctxt);
-  	gtk_signal_connect (GTK_OBJECT (book_view), "sequence_complete", 
-			    (GtkSignalFunc) sequence_complete, ctxt);
-
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-/*    	GList *l; */
-	int len;
-	unsigned char *buf;
-	char *filename;
-	char *change_id;
-/*  	gint num_records; */
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION);
-	g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->ebook = NULL;
-	
-	if (start_addressbook_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-
-	/* Force the view loading to be synchronous */
-	gtk_main ();
-	g_free (change_id);
-	
-	/* Set the count information */
-/*  	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); */
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's 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);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */	
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-	g_free (change_id);
-	gtk_main ();
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	e_pilot_map_insert (ctxt->map, ID, local->ecard->id, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	LOG ("set_status_cleared: clearing status\n");
-	
-	g_hash_table_remove (ctxt->changed_hash, e_card_get_id (local->ecard));
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EAddrLocalRecord **local,
-	  EAddrConduitContext *ctxt)
-{
-  	static GList *cards, *iterator;
-  	static int count;
-
-  	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		cards = ctxt->cards;
-		count = 0;
-		
-		if (cards != NULL) {
-			LOG ("iterating over %d records", g_list_length (cards));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-  			local_record_from_ecard (*local, cards->data, ctxt);
-
-			iterator = cards;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-  			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EAddrLocalRecord **local,
-		   EAddrConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CardObjectChange *coc = iterator->data;
-			
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-			 
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CardObjectChange *coc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-		} else {
-			LOG ("for_each_modified ending");
-
-    			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-  	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	ECard *ecard;
-	CardObjectChangeStatus cons;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	ecard = ecard_from_remote_record (ctxt, remote, NULL);
-	
-	/* add the ecard to the server */
-	e_book_add_card (ctxt->ebook, ecard, add_card_cb, &cons);
-
-	gtk_main(); /* enter sub mainloop */
-	
-	if (cons.status != E_BOOK_STATUS_SUCCESS) {
-		WARN ("add_record: failed to add card to ebook\n");
-		return -1;
-	}
-
-	e_card_set_id (ecard, cons.id);
-	e_pilot_map_insert (ctxt->map, remote->ID, ecard->id, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	ECard *new_ecard;
-	EBookStatus commit_status;
-	CardObjectChange *coc;
-	CardObjectChangeStatus cons;
-	char *old_id;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	old_id = g_strdup (e_card_get_id (local->ecard));
-	coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-	
-	new_ecard = ecard_from_remote_record (ctxt, remote, local->ecard);
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	local->ecard = new_ecard;
-
-	if (coc && coc->type == CARD_DELETED)
-		e_book_add_card (ctxt->ebook, local->ecard, add_card_cb, &cons);
-	else
-		e_book_commit_card (ctxt->ebook, local->ecard, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (coc && coc->type == CARD_DELETED) {
-		gboolean arch = e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (local->ecard));
-		
-		e_card_set_id (local->ecard, cons.id);
-		e_pilot_map_insert (ctxt->map, remote->ID, cons.id, arch);
-
-		coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (coc) {
-			g_hash_table_remove (ctxt->changed_hash, e_card_get_id (coc->card));
-			coc->card = local->ecard;
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
-			
-		}
-		
-		commit_status = cons.status;
-	}
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS)
-		WARN ("replace_record: failed to update card in ebook\n");
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	EBookStatus commit_status;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->ecard != NULL, -1);
-
-	LOG ("delete_record: delete %s\n", print_local (local));
-
-	e_pilot_map_remove_by_uid (ctxt->map, local->ecard->id);
-	e_book_remove_card_by_id (ctxt->ebook, local->ecard->id, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS && commit_status != E_BOOK_STATUS_CARD_NOT_FOUND)
-		WARN ("delete_record: failed to delete card in ebook\n");
-	
-	return retval;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		gboolean archive,
-		EAddrConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("archive_record: %s\n", archive ? "yes" : "no");
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, local->ecard->id, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-  	char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EAddrLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG ("in address's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_addr_conduit");
-
-	e_addr_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
deleted file mode 100644
index 8b901a5da7..0000000000
--- a/addressbook/conduit/address-conduit.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_H__
-#define __ADDR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-address.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	ECard *ecard;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EAddrConduitContext EAddrConduitContext;
-struct _EAddrConduitContext {
-	EAddrConduitCfg *cfg;
-
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	EPilotMap *map;
-};
-
-#endif __ADDR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop.in b/addressbook/conduit/e-address-conduit-control-applet.desktop.in
deleted file mode 100644
index 10633de800..0000000000
--- a/addressbook/conduit/e-address-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Address conduit 
-_Comment=Configure the address conduit
-Exec=e-address-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 1aa78a180e..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
-<name value="EAddress"/>
-<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/contact-editor/.cvsignore b/addressbook/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
deleted file mode 100644
index d5ed7feeaa..0000000000
--- a/addressbook/contact-editor/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-save-as.c			\
-	e-contact-save-as.h
-
-noinst_PROGRAMS =		\
-	contact-editor-test
-
-contact_editor_test_SOURCES = 	\
-	test-editor.c
-
-contact_editor_test_LDADD =					\
-	libecontacteditor.a					\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(GNOMEGNORBA_LIBS)					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-	$(top_builddir)/e-util/libeutil.la			\
-	$(GNOME_PRINT_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)
diff --git a/addressbook/contact-editor/arrow.png b/addressbook/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/contact-editor/briefcase.png b/addressbook/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
deleted file mode 100644
index ddcc058ab2..0000000000
--- a/addressbook/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2453 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Contact-editor</name>
-  <program_name>contact-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>2</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button31</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Phone Types</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <label>New phone type</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment9</name>
-	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>Contact Editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-general</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>14</rows>
-	<columns>8</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>text-address</name>
-	  <width>1</width>
-	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <has_default>True</has_default>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <value_in_list>False</value_in_list>
-	  <ok_if_empty>True</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></items>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>True</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Home</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone2</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Business _Fax</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone3</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Mobile</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone4</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Primary Email</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-email1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0</xalign>
-	  <yalign>0</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Job title:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-jobtitle</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>cellphone.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>envelope.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>house.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-company</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Office:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-office</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Nickname:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-nickname</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Manager's Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-manager</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 7df9cb8cb4..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-GtkType
-e_contact_editor_address_get_type (void)
-{
-	static GtkType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type)
-		{
-			static const GtkTypeInfo contact_editor_address_info =
-			{
-				"EContactEditorAddress",
-				sizeof (EContactEditorAddress),
-				sizeof (EContactEditorAddressClass),
-				(GtkClassInitFunc) e_contact_editor_address_class_init,
-				(GtkObjectInitFunc) e_contact_editor_address_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info);
-		}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_ADDRESS);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable) {
-		e_utf8_gtk_editable_set_text(editable, string);
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (address) {
-		fill_in_field(editor, "entry-street" , address->street );
-		fill_in_field(editor, "entry-po"     , address->po     );
-		fill_in_field(editor, "entry-ext"    , address->ext    );
-		fill_in_field(editor, "entry-city"   , address->city   );
-		fill_in_field(editor, "entry-region" , address->region );
-		fill_in_field(editor, "entry-code"   , address->code   );
-		fill_in_field(editor, "entry-country", address->country);
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (!address) {
-		address = e_card_delivery_address_new();
-		editor->address = address;
-	}
-	address->street  = extract_field(editor, "entry-street" );
-	address->po      = extract_field(editor, "entry-po"     );
-	address->ext     = extract_field(editor, "entry-ext"    );
-	address->city    = extract_field(editor, "entry-city"   );
-	address->region  = extract_field(editor, "entry-region" );
-	address->code    = extract_field(editor, "entry-code"   );
-	address->country = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/contact-editor/e-contact-editor-address.h b/addressbook/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index a74e1bd967..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
-GtkType    e_contact_editor_address_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index b91a040d46..0000000000
--- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-contact-editor-confirm-delete</name>
-  <program_name>e-contact-editor-confirm-delete</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeMessageBox</class>
-  <name>confirm-dialog</name>
-  <message_box_type>GNOME_MESSAGE_BOX_QUESTION</message_box_type>
-  <message>Are you sure you want
-to delete this contact?</message>
-  <title>Delete Contact?</title>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 05e8d45702..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-GtkType
-e_contact_editor_fullname_get_type (void)
-{
-	static GtkType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type)
-		{
-			static const GtkTypeInfo contact_editor_fullname_info =
-			{
-				"EContactEditorFullname",
-				sizeof (EContactEditorFullname),
-				sizeof (EContactEditorFullnameClass),
-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,
-				(GtkObjectInitFunc) e_contact_editor_fullname_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_fullname_info);
-		}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_NAME);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			e_utf8_gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefix);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffix);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (!name) {
-		name = e_card_name_new();
-		editor->name = name;
-	}
-
-	name->prefix     = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffix     = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index bde6733976..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardName *name;
-	GladeXML *gui;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);
-GtkType    e_contact_editor_fullname_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
deleted file mode 100644
index e65e9b9efb..0000000000
--- a/addressbook/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1803 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-categories.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *card);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_destroy (GtkObject *object);
-
-#if 0
-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);
-#endif
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_fields(EContactEditor *editor);
-static void set_address_field(EContactEditor *editor, int result);
-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-GtkType
-e_contact_editor_get_type (void)
-{
-  static GtkType contact_editor_type = 0;
-
-  if (!contact_editor_type)
-    {
-      static const GtkTypeInfo contact_editor_info =
-      {
-        "EContactEditor",
-        sizeof (EContactEditor),
-        sizeof (EContactEditorClass),
-        (GtkClassInitFunc) e_contact_editor_class_init,
-        (GtkObjectInitFunc) e_contact_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_editor_info);
-    }
-
-  return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_editor_set_arg;
-  object_class->get_arg = e_contact_editor_get_arg;
-  object_class->destroy = e_contact_editor_destroy;
-}
-
-static void
-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	GtkWidget *pixmap;
-	gchar *image_temp;
-	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
-		gtk_container_add(GTK_CONTAINER(button),
-				  pixmap);
-		g_free(image_temp);
-		gtk_widget_show(pixmap);
-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
-	}
-}
-
-static void
-_replace_buttons(EContactEditor *editor)
-{
-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);
-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	gtk_object_get(GTK_OBJECT(widget),
-		       "active", &wants_html,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(editor->card),
-		       "wants_html", wants_html,
-		       NULL);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	string = e_utf8_gtk_entry_get_text(entry);
-
-	e_card_simple_set_email(editor->simple, editor->email_choice, string);
-
-	g_free (string);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const ECardName *name, char *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name) {
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (EContactEditor *editor)
-{
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	char *filestring;
-	char *trystring;
-	ECardName *name = editor->name;
-	int i;
-	int style;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	filestring = e_utf8_gtk_entry_get_text(file_as);
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style(name, editor->company, i);
-		if (!strcmp(trystring, filestring)) {
-			g_free(trystring);
-			g_free(filestring);
-			return i;
-		}
-		g_free(trystring);
-	}
-	g_free (filestring);
-	return -1;
-}
-
-static void
-file_as_set_style(EContactEditor *editor, int style)
-{
-	char *string;
-	int i;
-	GList *strings = NULL;
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	GtkWidget *widget;
-		
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return;
-
-	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
-		strings = g_list_append(strings, string);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense(editor->name, editor->company, i)) {
-			char *u;
-			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO(widget)) {
-		GtkCombo *combo = GTK_COMBO(widget);
-		gtk_combo_set_popdown_strings(combo, strings);
-		g_list_foreach(strings, (GFunc) g_free, NULL);
-		g_list_free(strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	char *string;
-
-	style = file_as_get_style(editor);
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	file_as_set_style(editor, style);
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-
-	style = file_as_get_style(editor);
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	file_as_set_style(editor, style);
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   phone_entry_changed, editor);
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-	widget = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   email_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   address_text_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   name_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   company_entry_changed, editor);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-
-		style = file_as_get_style(editor);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
-			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		file_as_set_style(editor, style);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "address", &new_address,
-			       NULL);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	else if (editor->card)
-		gtk_object_get(GTK_OBJECT(editor->card),
-			       "categories", &categories,
-			       NULL);
-	dialog = GNOME_DIALOG(e_categories_new(categories));
-	gtk_object_set(GTK_OBJECT(dialog),
-		       "header", _("This contact belongs to these categories:"),
-		       NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-	if (result == 0) {
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "categories", &categories,
-			       NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			gtk_object_set(GTK_OBJECT(editor->card),
-				       "categories", categories,
-				       NULL);
-		g_free(categories);
-	}
-	gtk_object_destroy(GTK_OBJECT(dialog));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_TO);
-}
-
-gboolean
-e_contact_editor_confirm_delete(GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GladeXML *gui;
-	int result;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);
-
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));
-
-	gnome_dialog_set_parent(dialog, parent);
-	
-	result = gnome_dialog_run_and_close(dialog);
-
-	gtk_object_unref(GTK_OBJECT(gui));
-
-	return !result;
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-	ECard *card = ce->card;
-	ECardSimple *simple = ce->simple;
-
-	gtk_object_ref(GTK_OBJECT(card));
-	gtk_object_ref(GTK_OBJECT(simple));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 card);
-		
-		file_close_cb(widget, data);
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor->app),
-				  (GtkCallback) add_field_callback,
-				  e_contact_editor);
-
-	_replace_buttons(e_contact_editor);
-	set_entry_changed_signals(e_contact_editor);
-
-	wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail");
-	if (wants_html && GTK_IS_TOGGLE_BUTTON(wants_html))
-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",
-				   wants_html_changed, e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_name_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_addr_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   categories_clicked, e_contact_editor);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (e_contact_editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (e_contact_editor->app);
-		e_contact_editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->email_list) {
-		g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->email_list);
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-	}
-	if (e_contact_editor->email_popup) {
-		gtk_widget_unref(e_contact_editor->email_popup);
-	}
-	
-	if (e_contact_editor->phone_list) {
-		g_list_foreach(e_contact_editor->phone_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->phone_list);
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-	}
-	if (e_contact_editor->phone_popup) {
-		gtk_widget_unref(e_contact_editor->phone_popup);
-	}
-	
-	if (e_contact_editor->address_list) {
-		g_list_foreach(e_contact_editor->address_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->address_list);
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-	}
-	if (e_contact_editor->address_popup) {
-		gtk_widget_unref(e_contact_editor->address_popup);
-	}
-	
-	if (e_contact_editor->simple)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->simple));
-
-	if (e_contact_editor->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	return ce;
-}
-
-static void
-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		gtk_object_set(GTK_OBJECT(editor->simple),
-			       "card", editor->card,
-			       NULL);
-		fill_in_info(editor);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(e_contact_editor->simple);
-		extract_info(e_contact_editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->card);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->is_new_card ? TRUE : FALSE;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.width;
-	*y += button->allocation.height;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &request);
-
-	mh = request.height;
-	mw = request.width;
-
-	*x -= mw;
-	if (*x < 0)
-		*x = 0;
-	
-	if (*y < 0)
-		*y = 0;
-	
-	if ((*x + mw) > gdk_screen_width ())
-		*x = gdk_screen_width () - mw;
-	
-	if ((*y + mh) > gdk_screen_height ())
-		*y = gdk_screen_height () - mh;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)
-{
-	gint menu_item;
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);
-	if ( menu_item != -1 ) {
-#if 0
-		if (menu_item == g_list_length (*list)) {
-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);
-		} else {
-#endif
-			GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-			if (label_widget && GTK_IS_LABEL(label_widget)) {
-				gtk_object_set(GTK_OBJECT(label_widget),
-					       "label", g_list_nth_data(*list, menu_item),
-					       NULL);
-			}
-#if 0
-		}
-#endif
-	}
-	return menu_item;
-}
-
-static void
-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)
-{
-	GnomeUIInfo *info;
-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };
-	GnomeUIInfo end = GNOMEUIINFO_END;
-	int length;
-	int i;
-
-	info = *infop;
-
-	if ( info )
-		g_free(info);
-	length = g_list_length( list );
-	info = g_new(GnomeUIInfo, length + 2);
-	for (i = 0; i < length; i++) {
-		info[i] = singleton;
-		info[i].label = _(list->data);
-		list = list->next;
-	}
-	info[i] = end;
-
-	*infop = info;
-}
-
-#if 0
-static void
-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
-{
-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
-					       "e_contact_editor_label");
-
-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
-						      "e_contact_editor_dialog_entry");
-	
-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_list");
-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_info");
-	switch (button) {
-	case 0:
-		if (label && GTK_IS_LABEL(label)) {
-			gtk_object_set(GTK_OBJECT(label),
-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),
-				       NULL);
-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));
-			g_free(*info);
-			*info = NULL;
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static GtkWidget *
-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)
-{
-	GtkWidget *dialog_entry = gtk_entry_new();
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, entry_id);
-	GtkWidget *label = glade_xml_get_widget(editor->gui, label_id);
-	
-	GtkWidget *dialog = gnome_dialog_new(title,
-					     NULL);
-	
-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox),
-			  gtk_widget_new (gtk_frame_get_type(),
-					  "border_width", 4,
-					  "label", title,
-					  "child", gtk_widget_new(gtk_alignment_get_type(),
-								  "child", dialog_entry,
-								  "xalign", .5,
-								  "yalign", .5,
-								  "xscale", 1.0,
-								  "yscale", 1.0,
-								  "border_width", 9,
-								  NULL),
-					  NULL));
-
-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),
-					       "Add",
-					       GNOME_STOCK_PIXMAP_ADD);
-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);
-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
-	
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   _dialog_clicked, editor);
-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",
-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));
-	
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_entry", entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_label", label);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_dialog_entry", dialog_entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_list", list);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_info", info);
-
-	gtk_widget_show_all(dialog);
-	return dialog;
-}
-#endif
-
-static void
-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int which;
-	int i;
-	gchar *label;
-	gchar *entry;
-	int result;
-	if ( widget == glade_xml_get_widget(editor->gui, "button-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone4") ) {
-		which = 4;
-	} else
-		return;
-	
-	label = g_strdup_printf("label-phone%d", which);
-	entry = g_strdup_printf("entry-phone%d", which);
-
-	if (editor->phone_list == NULL) {
-		static char *info[] = {
-			N_("Assistant"),
-			N_("Business"),
-			N_("Business 2"),
-			N_("Business Fax"),
-			N_("Callback"),
-			N_("Car"),
-			N_("Company"),
-			N_("Home"),
-			N_("Home 2"),
-			N_("Home Fax"),
-			N_("ISDN"),
-			N_("Mobile"),
-			N_("Other"),
-			N_("Other Fax"),
-			N_("Pager"),
-			N_("Primary"),
-			N_("Radio"),
-			N_("Telex"),
-			N_("TTY/TDD")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			gtk_widget_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-		const ECardPhone *phone = e_card_simple_get_phone(editor->simple, i);
-		gboolean checked;
-		checked = phone && phone->number && *phone->number;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
-	
-	if (result != -1) {
-		editor->phone_choice[which - 1] = result;
-		set_fields(editor);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->email_list == NULL) {
-		static char *info[] = {
-			N_("Primary Email"),
-			N_("Email 2"),
-			N_("Email 3")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->email_list = g_list_append(editor->email_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			gtk_widget_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-		const char *string = e_card_simple_get_email(editor->simple, i);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
-	
-	if (result != -1) {
-		editor->email_choice = result;
-		set_fields(editor);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->address_list == NULL) {
-		static char *info[] = {
-			N_("Business"),
-			N_("Home"),
-			N_("Other")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->address_list = g_list_append(editor->address_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->address_info == NULL) {
-		e_contact_editor_build_ui_info(editor->address_list, &editor->address_info);
-
-		if ( editor->address_popup )
-			gtk_widget_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-		gboolean checked;
-		checked = address && address->data && *address->data;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		ECardName *name;
-		const ECardDate *anniversary;
-		const ECardDate *bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-		gboolean wants_html, wants_html_set;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as",       &file_as,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       key, string,
-				       NULL);
-		else
-			gtk_object_set(GTK_OBJECT(card),
-				       key, NULL,
-				       NULL);
-
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_single_field(EContactEditor *editor, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	ECardSimple *simple = editor->simple;
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    string);
-		else
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    NULL);
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				gtk_object_set(GTK_OBJECT(card),
-					       "file_as", string,
-					       NULL);
-
-			if (string) g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			extract_single_field(editor, list->data);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_raise (EContactEditor *editor)
-{
-	gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
deleted file mode 100644
index a2067b1a88..0000000000
--- a/addressbook/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-	GnomeUIInfo *email_info;
-	GnomeUIInfo *phone_info;
-	GnomeUIInfo *address_info;
-	GtkWidget *email_popup;
-	GtkWidget *phone_popup;
-	GtkWidget *address_popup;
-	GList *email_list;
-	GList *phone_list;
-	GList *address_list;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-EContactEditor *e_contact_editor_new             (ECard          *card,
-						  gboolean        is_new_card);
-GtkType         e_contact_editor_get_type        (void);
-void            e_contact_editor_raise           (EContactEditor *editor);
-
-
-gboolean        e_contact_editor_confirm_delete  (GtkWindow      *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 5a88c31ffa..0000000000
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(card);
-	
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
diff --git a/addressbook/contact-editor/e-contact-save-as.h b/addressbook/contact-editor/e-contact-save-as.h
deleted file mode 100644
index d1c84dc596..0000000000
--- a/addressbook/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-save-as.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void
-e_contact_save_as(gchar *title, ECard *card);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/email.png b/addressbook/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade
deleted file mode 100644
index 46d1a180b6..0000000000
--- a/addressbook/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,475 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fulladdr</name>
-  <program_name>fulladdr</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade
deleted file mode 100644
index 17be70647c..0000000000
--- a/addressbook/contact-editor/fullname.glade
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fullname</name>
-  <program_name>fullname</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkfullname</name>
-  <visible>False</visible>
-  <title>Check Full Name</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkfullname</name>
-      <border_width>8</border_width>
-      <rows>5</rows>
-      <columns>3</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>21</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-title</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Mr.
-Mrs.
-Ms.
-Miss
-Dr.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-title</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-suffix</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Sr.
-Jr.
-I
-II
-III
-Esq.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-suffix</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-first</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-middle</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-last</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_First:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-first</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>_Title:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-title</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>_Middle:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-middle</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_Last:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-last</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_Suffix:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-suffix</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/head.png b/addressbook/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netfreebusy.png b/addressbook/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netmeeting.png b/addressbook/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/contact-editor/phone.png b/addressbook/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/contact-editor/snailmail.png b/addressbook/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	gtk_object_unref (GTK_OBJECT (ce));
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/contact-editor/web.png b/addressbook/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/contact-editor/web.png
+++ /dev/null
diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
deleted file mode 100644
index cd8fe38705..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index 8bcb766191..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
-GNOME_Evolution_Addressbook.oaf
\ No newline at end of file
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
deleted file mode 100644
index 2a523c9dc1..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               _value="Control that displays an Evolution addressbook minicard."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
deleted file mode 100644
index 01474ce90a..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               value="Control that displays an Evolution addressbook minicard."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index eaefdbab96..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-config.c		\
-	addressbook-config.h		\
-	addressbook-factory.c		\
-	addressbook-storage.c		\
-	addressbook-storage.h		\
-	addressbook.c			\
-	addressbook.h			\
-	e-cardlist-model.c		\
-	e-cardlist-model.h
-
-evolution_addressbook_LDADD =						\
-	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.a				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/menus/libmenus.la
-
-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-
-@XML_I18N_MERGE_OAF_RULE@
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = addressbook-config.glade
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	addressbook-config.glade\
-	$(oaf_in_files)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-addressbook.pure
-
-evolution-addressbook.pure: evolution-addressbook
-	@rm -f evolution-addressbook.pure
-	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
-
-endif
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
deleted file mode 100644
index 129a2f2d97..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include "addressbook-storage.h"
-#include "addressbook-component.h"
-#include "addressbook.h"
-
-
-
-#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"
-
-EvolutionShellClient *global_shell_client;
-
-EvolutionShellClient *
-addressbook_component_get_shell_client  (void)
-{
-	return global_shell_client;
-}
-
-static BonoboGenericFactory *factory = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "contacts") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellComponentListener_Result result;
-
-	if (g_strcasecmp (type, "contacts") != 0)
-		result = GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
-	else 
-		result = GNOME_Evolution_ShellComponentListener_OK;
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &ev);
-	CORBA_exception_free(&ev);
-}
-
-static int owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	owner_count ++;
-
-	if (global_shell_client == NULL)
-		global_shell_client = shell_client;
-
-	addressbook_storage_setup (shell_component, evolution_homedir);
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		GNOME_Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, create_folder, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-addressbook_component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("Cannot initialize the Evolution addressbook factory.");
-}
-
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index ea0d8b9a46..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H
-#define _ADDRESSBOOK_COMPONENT_H
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-void                  addressbook_component_factory_init      (void);
-EvolutionShellClient *addressbook_component_get_shell_client  (void);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H */
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
deleted file mode 100644
index 43f34a4389..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,960 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include "e-util/e-html-utils.h"
-#include "addressbook-config.h"
-#include "addressbook-storage.h"
-
-/* #define INCLUDE_FILE_SOURCE */
-
-typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
-typedef struct _AddressbookSourcePageItem  AddressbookSourcePageItem;
-typedef struct _LDAPAuthPageItem LDAPAuthPageItem;
-
-struct _AddressbookSourceDialog {
-	GtkWidget *html;
-	GtkWidget *dialog;
-	GtkWidget *vbox;
-	GtkWidget *name;
-	GtkWidget *description;
-	GtkWidget *source_option;
-	GtkWidget *notebook;
-
-	GList *source_pages;
-	AddressbookSourcePageItem *source_page;
-
-	gint id; /* button we closed the dialog with */
-
-	AddressbookSource *source; /* our result if the Ok button was clicked */
-};
-
-struct _AddressbookSourcePageItem {
-	gint pnum;
-
-	AddressbookSourceType source_type;
-
-	AddressbookSourceDialog *dialog;
-
-	GtkWidget *item;
-	GtkWidget *vbox;
-
-	/* file: addressbook's */
-	GtkWidget *path;
-	GtkWidget *creat;
-
-	/* ldap: addressbook's */
-	GtkWidget *host;
-	GtkWidget *port;
-	GtkWidget *rootdn;
-	GtkWidget *scope_optionmenu;
-	GtkWidget *auth_optionmenu;
-	GtkWidget *auth_notebook;
-
-	GList *auths;
-	LDAPAuthPageItem *auth;
-};
-
-struct _LDAPAuthPageItem {
-	gint pnum;
-
-	AddressbookLDAPAuthType auth_type;
-
-	AddressbookSourceDialog *dialog;
-	AddressbookSourcePageItem *page;
-
-	GtkWidget *item;
-	GtkWidget *vbox;
-
-	/* simple (password) auth */
-	GtkWidget *binddn;
-	GtkWidget *remember_passwd;
-};
-
-static void
-html_size_req (GtkWidget *widget, GtkRequisition *requisition)
-{
-	 requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-	
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white :
-						       &style->bg[0]);
-	}
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else
-		gtk_widget_show_all (scrolled);
-	
-	return html;
-}
-
-static void
-put_html (GtkHTML *html, char *text)
-{
-	GtkHTMLStream *handle;
-	
-	text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (text);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-
-#ifdef INCLUDE_FILE_SOURCE
-static const char *
-addressbook_config_source_label (AddressbookSourceType type)
-{
-	switch (type) {
-	case ADDRESSBOOK_SOURCE_LDAP:
-		return _("LDAP Server");
-	case ADDRESSBOOK_SOURCE_FILE:
-		return _("File");
-	default:
-		g_assert(0);
-		return _("Unknown addressbook type");
-	}
-}
-#endif
-
-static const char *
-addressbook_config_auth_label (AddressbookLDAPAuthType type)
-{
-	switch (type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return _("None (anonymous mode)");
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		return _("Password");
-	case ADDRESSBOOK_LDAP_AUTH_SASL:
-		return _("SASL");
-	default:
-		g_assert(0);
-		return _("Unknown auth type");
-	}
-}
-
-static const char *
-addressbook_config_scope_label (AddressbookLDAPScopeType scope)
-{
-	switch (scope) {
-	case ADDRESSBOOK_LDAP_SCOPE_BASE:
-		return _("Base");
-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:
-		return _("One");
-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
-		return _("Subtree");
-	default:
-		g_assert (0);
-		return _("Unknown scope type");
-	}
-}
-
-static void
-addressbook_source_edit_changed (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	char *data;
-	gboolean complete = TRUE;
-	AddressbookSourcePageItem *source_page = dialog->source_page;
-
-	if (source_page == NULL)
-		complete = FALSE;
-
-	if (complete) {
-		data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (dialog->name), 0, -1);
-		if (!data || !*data)
-			complete = FALSE;
-		g_free (data);
-	}
-
-	if (complete) {
-		if (source_page->source_type == ADDRESSBOOK_SOURCE_FILE) {
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->path), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				g_free (data);
-			}
-		}
-		else {
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->host), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				g_free (data);
-			}
-
-			if (complete) {
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->port), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				/* XXX more validation on port here */
-				g_free (data);
-			}
-
-			if (complete) {
-				LDAPAuthPageItem *auth_page = source_page->auth;
-
-				if (auth_page->auth_type == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-					data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (auth_page->binddn), 0, -1);
-					if (!data || !*data)
-						complete = FALSE;
-					g_free (data);
-				}
-				else if (auth_page->auth_type == ADDRESSBOOK_LDAP_AUTH_SASL) {
-				}
-				data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (source_page->port), 0, -1);
-				if (!data || !*data)
-					complete = FALSE;
-				/* XXX more validation on port here */
-				g_free (data);
-			}
-		}
-	}
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, complete);
-}
-
-static void
-source_type_menuitem_activate (GtkWidget *item, gpointer data)
-{
-	AddressbookSourcePageItem *sitem = data;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK(sitem->dialog->notebook), sitem->pnum);
-	sitem->dialog->source_page = sitem;
-
-	addressbook_source_edit_changed (item, sitem->dialog);	
-}
-
-typedef struct {
-	AddressbookSourceDialog *dialog;
-	char *help_text;
-} FocusHelpClosure;
-
-static void
-free_focus_help_closure (gpointer data)
-{
-	FocusHelpClosure *closure = data;
-	g_free(closure->help_text);
-	g_free(closure);
-}
-
-static gint
-focus_help (GtkWidget *widget, GdkEventFocus *event, FocusHelpClosure *closure)
-{
-	put_html (GTK_HTML(closure->dialog->html), closure->help_text);
-	return FALSE;
-}
-
-static GtkWidget *
-table_add_elem (AddressbookSourceDialog *dialog, GtkWidget *table, 
-		int row,
-		const char *label_text,
-		const char *help_text)
-{
-	GtkWidget *label, *entry;
-	FocusHelpClosure *focus_closure;
-
-	label = gtk_label_new (label_text);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 
-			  row, row + 1, GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, row, row + 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	gtk_signal_connect (GTK_OBJECT (entry), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-
-	focus_closure = g_new0 (FocusHelpClosure, 1);
-	focus_closure->dialog = dialog;
-	focus_closure->help_text = g_strdup(help_text);
-
-	gtk_signal_connect_full (GTK_OBJECT (entry),
-				 "focus_in_event" /* XXX */,
-				 (GtkSignalFunc) focus_help, NULL,
-				 focus_closure,
-				 (GtkDestroyNotify) free_focus_help_closure,
-				 FALSE, FALSE);
-	return entry;
-}
-
-static void
-ldap_auth_type_menuitem_activate (GtkWidget *item, gpointer data)
-{
-	LDAPAuthPageItem *auth_item = data;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK(auth_item->page->auth_notebook), auth_item->pnum);
-
-	auth_item->page->auth = auth_item;
-
-	addressbook_source_edit_changed (item, auth_item->dialog);	
-}
-
-static LDAPAuthPageItem *
-addressbook_ldap_auth_item_new (AddressbookSourceDialog *dialog,
-				AddressbookSourcePageItem *page,
-				AddressbookLDAPAuthType type)
-{
-	LDAPAuthPageItem *item = g_new0 (LDAPAuthPageItem, 1);
-	GtkWidget *table = NULL;
-	int row = 0;
-
-	item->pnum = type;
-	item->auth_type = type;
-	item->dialog = dialog;
-	item->page = page;
-	item->vbox = gtk_vbox_new (FALSE, 0);
-
-	switch (type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		table = gtk_table_new (2, 2, FALSE);
-		item->binddn = table_add_elem (dialog, table, row++,
-					       _("Bind DN:"),
-					       _("FIXME Bind DN Help text here"));
-
-		item->remember_passwd = gtk_check_button_new_with_label (_("Remember this password"));
-
-		gtk_table_attach (GTK_TABLE (table), item->remember_passwd, 1, 2,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, TRUE, 0);
-		break;
-	case ADDRESSBOOK_LDAP_AUTH_SASL:
-		break;
-	default:
-		g_assert (0);
-		return item;
-	}
-
-	if (table) {
-		gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-		gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-		gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	}
-
-	gtk_widget_show_all (item->vbox);
-
-	return item;
-}
-
-static AddressbookSourcePageItem *
-addressbook_source_item_new (AddressbookSourceDialog *dialog, AddressbookSourceType type)
-{
-	AddressbookSourcePageItem *item = g_new0 (AddressbookSourcePageItem, 1);
-	GtkWidget *table = NULL;
-	int row = 0;
-
-	item->pnum = type;
-	item->source_type = type;
-	item->dialog = dialog;
-
-	item->vbox = gtk_vbox_new (FALSE, 0);
-
-	switch (type) {
-	case ADDRESSBOOK_SOURCE_LDAP: {
-		GtkWidget *label;
-		GtkWidget *menu;
-		int i;
-		LDAPAuthPageItem *first_item = NULL;
-		int position;
-
-		table = gtk_table_new (5, 2, FALSE);
-
-		item->host = table_add_elem (dialog, table, row++,
-					     _("Host:"),
-					     _("FIXME Host help text here."));
-		item->port = table_add_elem (dialog, table, row++,
-					     _("Port:"),
-					     _("FIXME Port help text here."));
-		gtk_editable_insert_text (GTK_EDITABLE (item->port), "389", 3, &position);
-
-		item->rootdn = table_add_elem (dialog, table, row++,
-					       _("Root DN:"),
-					       _("FIXME Root DN help text here."));
-
-		item->scope_optionmenu = gtk_option_menu_new ();
-		menu = gtk_menu_new ();
-
-		for (i = 0; i < ADDRESSBOOK_LDAP_SCOPE_LAST; i ++) {
-			GtkWidget *scope_item = gtk_menu_item_new_with_label (addressbook_config_scope_label (i));
-
-			gtk_signal_connect (GTK_OBJECT (scope_item), "activate",
-					    GTK_SIGNAL_FUNC (addressbook_source_edit_changed),
-					    dialog);
-
-			gtk_menu_append (GTK_MENU (menu), scope_item);
-			gtk_widget_show (scope_item);
-		}
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (item->scope_optionmenu), menu);
-		//		ldap_auth_type_menuitem_activate (first_item->item, first_item);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(item->scope_optionmenu), 0);
-
-		label = gtk_label_new (_("Search Scope:"));
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-		gtk_table_attach (GTK_TABLE (table), 
-				  item->scope_optionmenu, 
-				  1, 2, row, row + 1, 
-				  GTK_EXPAND | GTK_FILL, 0,
-				  0, 0);
-
-		row++;
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, FALSE, 0);
-
-		item->auth_optionmenu = gtk_option_menu_new ();
-		menu = gtk_menu_new ();
-
-		item->auth_notebook = gtk_notebook_new();
-		gtk_notebook_set_show_tabs (GTK_NOTEBOOK (item->auth_notebook), FALSE);
-
-		for (i = 0; i < ADDRESSBOOK_LDAP_AUTH_LAST; i++) {
-			LDAPAuthPageItem *auth_item;
-
-#ifndef LDAP_SASL
-			/* skip the sasl stuff if we're not configured for it. */
-			if (i == ADDRESSBOOK_LDAP_AUTH_SASL)
-				continue;
-#endif
-			auth_item = addressbook_ldap_auth_item_new (dialog, item, i);
-
-			item->auths = g_list_append (item->auths, auth_item);
-
-			if (!first_item)
-				first_item = auth_item;
-
-			auth_item->item = gtk_menu_item_new_with_label (addressbook_config_auth_label (i));
-
-			gtk_notebook_append_page (GTK_NOTEBOOK (item->auth_notebook),
-						  auth_item->vbox, NULL);
-
-			gtk_signal_connect (GTK_OBJECT (auth_item->item), "activate",
-					    GTK_SIGNAL_FUNC (ldap_auth_type_menuitem_activate),
-					    auth_item);
-
-			gtk_menu_append (GTK_MENU (menu), auth_item->item);
-			gtk_widget_show (auth_item->item);
-		}
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (item->auth_optionmenu), menu);
-		ldap_auth_type_menuitem_activate (first_item->item, first_item);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(item->auth_optionmenu), 0);
-
-		label = gtk_label_new (_("Authentication:"));
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-		gtk_table_attach (GTK_TABLE (table), 
-				  item->auth_optionmenu, 
-				  1, 2, row, row + 1, 
-				  GTK_EXPAND | GTK_FILL, 0,
-				  0, 0);
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), item->auth_notebook,
-				    TRUE, TRUE, 0);
-		break;
-	}
-	case ADDRESSBOOK_SOURCE_FILE: {
-		table = gtk_table_new (2, 2, FALSE);
-		item->path = table_add_elem (dialog, table, row++,
-					     _("Path:"),
-					     _("FIXME Path Help text here"));
-
-		gtk_box_pack_start (GTK_BOX (item->vbox), table,
-				    TRUE, TRUE, 0);
-
-		item->creat = gtk_check_button_new_with_label (_("Create path if it doesn't exist."));
-		gtk_table_attach (GTK_TABLE (table), item->creat, 1, 2,
-				  row, row + 1, GTK_FILL, 0, 0, 0);
-		break;
-	}
-	default:
-		g_assert(0);
-		return item;
-	}
-
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-
-	gtk_widget_show_all (item->vbox);
-
-	return item;
-}
-
-static void
-addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source)
-{
-	AddressbookSourcePageItem *source_page;
-
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), source->name);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->description), source->description);
-
-	/* choose the correct server page */
-	source_page = g_list_nth_data (dialog->source_pages, source->type);
-	source_type_menuitem_activate (source_page->item, source_page);
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->source_option), source->type);
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP) {
-		LDAPAuthPageItem *auth_page;
-
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->host), source->ldap.host);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->port), source->ldap.port);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->rootdn), source->ldap.rootdn);
-
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->scope_optionmenu), source->ldap.scope);
-
-		auth_page = g_list_nth_data (source_page->auths, source->ldap.auth);
-		ldap_auth_type_menuitem_activate (auth_page->item, auth_page);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->auth_optionmenu), auth_page->auth_type);
-
-		if (auth_page->auth_type == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			e_utf8_gtk_entry_set_text (GTK_ENTRY (auth_page->binddn), source->ldap.binddn);
-		}
-	}
-	else {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (source_page->path), source->file.path);
-	}
-}
-
-static AddressbookSource *
-addressbook_source_dialog_get_source (AddressbookSourceDialog *dialog)
-{
-	AddressbookSource *source = g_new0 (AddressbookSource, 1);
-	AddressbookSourcePageItem *source_page;
-
-	source_page = dialog->source_page;
-
-	source->name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->name));
-	source->description = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->description));
-	source->type = source_page->source_type;
-
-	if (source->type == ADDRESSBOOK_SOURCE_FILE) {
-		source->file.path = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->path));
-	}
-	else {
-		LDAPAuthPageItem *auth_page;
-
-		source->ldap.host   = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->host));
-		source->ldap.port   = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->port));
-		source->ldap.rootdn = e_utf8_gtk_entry_get_text (GTK_ENTRY (source_page->rootdn));
-
-		auth_page = source_page->auth;
-
-		source->ldap.auth = auth_page->auth_type;
-		if (source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			source->ldap.binddn = e_utf8_gtk_entry_get_text (GTK_ENTRY (auth_page->binddn));
-			source->ldap.remember_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (auth_page->remember_passwd));
-		}
-
-		ldap_auth_type_menuitem_activate (auth_page->item, auth_page);
-		gtk_option_menu_set_history (GTK_OPTION_MENU(source_page->auth_optionmenu), auth_page->auth_type);
-	}
-
-	addressbook_storage_init_source_uri (source);
-
-	return source;
-}
-
-static void
-addressbook_source_dialog_ok_clicked (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-	dialog->source = addressbook_source_dialog_get_source (dialog);
-}
-
-static void
-addressbook_source_dialog_destroy (AddressbookSourceDialog *dialog)
-{
-	GList *s;
-
-	for (s = dialog->source_pages; s; s = s->next) {
-		AddressbookSourcePageItem *source_item = s->data;
-
-		g_list_foreach (source_item->auths, (GFunc)g_free, NULL);
-		g_list_free (source_item->auths);
-		g_free (source_item);
-	}
-
-	g_list_free (dialog->source_pages);
-
-	if (dialog->source)
-		addressbook_source_free (dialog->source);
-	g_free (dialog);
-}
-
-static AddressbookSourceDialog*
-addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
-{
-	GtkWidget *table;
-	AddressbookSourceDialog *dialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *vbox, *dialog_vbox;
-#ifdef INCLUDE_FILE_SOURCE
-	GtkWidget *menu;
-	AddressbookSourcePageItem *first_item = NULL;
-#endif
-	GtkWidget *area;
-	int i;
-	int row = 0;
-
-	if (source)
-		dialog->dialog = gnome_dialog_new (_("Edit Addressbook"), NULL);
-	else
-		dialog->dialog = gnome_dialog_new (_("Add Addressbook"), NULL);
-
-	gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
-	gtk_window_set_policy (GTK_WINDOW (dialog->dialog), 
-			       FALSE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 300, 350);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog->dialog),
-				 GTK_WINDOW (parent));
-
-	dialog->vbox = gtk_vbox_new (FALSE, 5);
-	dialog_vbox = GNOME_DIALOG (dialog->dialog)->vbox;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-
-	dialog->html = html_new (FALSE);
-	put_html (GTK_HTML (dialog->html),
-		  _("Select the kind of addressbook you have, and enter "
-		    "the relevant information about it."));
-
-	table = gtk_table_new (2, 2, FALSE);
-
-	dialog->name = table_add_elem (dialog, table, row++,
-				       _("Name:"),
-				       _("FIXME Name help text here"));
-	dialog->description = table_add_elem (dialog, table, row++,
-					      _("Description:"),
-					      _("FIXME Description help text here"));
-
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-
-	dialog->notebook = gtk_notebook_new();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (dialog->notebook), FALSE);
-
-#ifdef INCLUDE_FILE_SOURCE
-	dialog->source_option = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-#endif
-
-	for (i =
-#ifndef INCLUDE_FILE_SOURCE
-		     ADDRESSBOOK_SOURCE_LDAP;
-#else
-		     ADDRESSBOOK_SOURCE_FILE;
-#endif
-	     i < ADDRESSBOOK_SOURCE_LAST;
-	     i ++) {
-		AddressbookSourcePageItem *item;
-
-		item = addressbook_source_item_new (dialog, i);
-
-		dialog->source_pages = g_list_append (dialog->source_pages, item);
-
-#ifdef INCLUDE_FILE_SOURCE
-		item->item = gtk_menu_item_new_with_label (addressbook_config_source_label (i));
-		
-		if (!first_item)
-			first_item = item;
-#endif
-
-		gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook),
-					  item->vbox, NULL);
-
-		gtk_signal_connect (GTK_OBJECT (item->item), "activate",
-				    GTK_SIGNAL_FUNC (source_type_menuitem_activate),
-				    item);
-
-#ifdef INCLUDE_FILE_SOURCE
-		gtk_menu_append (GTK_MENU (menu), item->item);
-#endif
-		gtk_widget_show (item->item);
-	}
-
-#ifdef INCLUDE_FILE_SOURCE
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (dialog->source_option), menu);
-	source_type_menuitem_activate (first_item->item, first_item);
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->source_option), 0);
-#endif
-
-	gtk_box_pack_start (GTK_BOX (vbox), dialog->html->parent, 
-			    FALSE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (vbox), table,
-			    FALSE, FALSE, 0);
-
-#ifdef INCLUDE_FILE_SOURCE
-	gtk_box_pack_start (GTK_BOX (vbox), dialog->source_option,
-			    FALSE, FALSE, 0);
-#endif
-
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, FALSE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), dialog->notebook, 
-			    TRUE, TRUE, 0);
-
-	/* hook our ui into the gnome-dialog */
-	gtk_box_pack_start (GTK_BOX (dialog_vbox), dialog->vbox, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (dialog->vbox);
-
-	/* Buttons */
-	area = GNOME_DIALOG (dialog->dialog)->action_area;
-	gtk_widget_show (area);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (area), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (area), 8);
-
-	gnome_dialog_append_button (GNOME_DIALOG (dialog->dialog), 
-				    GNOME_STOCK_BUTTON_OK);
-	gnome_dialog_append_button (GNOME_DIALOG (dialog->dialog), 
-				    GNOME_STOCK_BUTTON_CANCEL);	
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog->dialog), 0);
-
-	/* fill in source info if there is some */
-	if (source)
-		addressbook_source_dialog_set_source (dialog, source);
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, FALSE);
-	
-	gnome_dialog_button_connect( GNOME_DIALOG (dialog->dialog), 0,
-				     GTK_SIGNAL_FUNC (addressbook_source_dialog_ok_clicked),
-				     dialog);
-
-	return dialog;
-}
-
-static AddressbookSourceDialog *
-addressbook_config_source (AddressbookSource *source, GtkWidget *parent)
-{
-	AddressbookSourceDialog* dialog = addressbook_source_dialog (source, parent);
-
-	dialog->id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog->dialog));
-
-	return dialog;
-}
-
-
-
-typedef struct {
-	GladeXML *gui;
-	GNOME_Evolution_Shell shell;
-	GtkWidget *dialog;
-	GtkWidget *clistSources;
-	GtkWidget *addSource;
-	GtkWidget *editSource;
-	GtkWidget *deleteSource;
-	gint      source_row;
-} AddressbookDialog;
-
-static void
-update_sensitivity (AddressbookDialog *dialog)
-{
-	gboolean sensitive = dialog->source_row != -1;
-
-	gtk_widget_set_sensitive (dialog->editSource, sensitive);
-	gtk_widget_set_sensitive (dialog->deleteSource, sensitive);
-}
-
-static void
-add_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSourceDialog *sdialog;
-
-	sdialog = addressbook_config_source (NULL, dialog->dialog);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		AddressbookSource *source = addressbook_source_copy(sdialog->source);
-		gint row;
-		gchar *text[2];
-
-		text[0] = source->name;
-		text[1] = source->uri;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(dialog->clistSources), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(dialog->clistSources), row, source, (GtkDestroyNotify) addressbook_source_free);
-		gnome_property_box_changed (GNOME_PROPERTY_BOX (dialog->dialog));
-		update_sensitivity (dialog);
-	}
-
-	addressbook_source_dialog_destroy (sdialog);
-}
-
-static void
-edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSource *source;
-	AddressbookSourceDialog *sdialog;
-
-	source = gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row);
-
-	sdialog = addressbook_config_source (source, dialog->dialog);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		source = addressbook_source_copy(sdialog->source);
-
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 0, source->name);
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 1, source->uri);
-		gtk_clist_set_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row, source);
-		gnome_property_box_changed (GNOME_PROPERTY_BOX (dialog->dialog));
-		update_sensitivity (dialog);
-	}
-
-	addressbook_source_dialog_destroy (sdialog);
-}
-
-static void
-delete_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	gtk_clist_remove (GTK_CLIST (dialog->clistSources), dialog->source_row);
-	dialog->source_row = -1;
-	gnome_property_box_changed (GNOME_PROPERTY_BOX(dialog->dialog));
-	update_sensitivity (dialog);
-}
-
-static void
-sources_select_row (GtkWidget *widget, gint row, gint column,
-		    GdkEventButton *event, AddressbookDialog *dialog)
-{
-	dialog->source_row = row;
-
-	update_sensitivity (dialog);
-}
-
-static void
-addressbook_dialog_apply (GnomePropertyBox *property_box, gint page_num, AddressbookDialog *dialog)
-{
-	int i;
-
-	if (page_num != -1)
-		return;
-
-	addressbook_storage_clear_sources();
-
-	for (i = 0; i < GTK_CLIST(dialog->clistSources)->rows; i ++) {
-		AddressbookSource *source = (AddressbookSource*)gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), i);
-		addressbook_storage_add_source (addressbook_source_copy (source));
-	}
-}
-
-static void
-addressbook_dialog_close (GnomePropertyBox *property_box, AddressbookDialog *dialog)
-{
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-	g_free (dialog);
-}
-
-void
-addressbook_config (GNOME_Evolution_Shell shell)
-{
-	AddressbookDialog *dialog;
-	GladeXML *gui;
-	GtkWidget *clist;
-	GList *l;
-
-	dialog = g_new0 (AddressbookDialog, 1);
-
-	dialog->source_row = -1;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/addressbook-config.glade", NULL);
-	dialog->gui = gui;
-	dialog->shell = shell;
-
-	dialog->dialog = glade_xml_get_widget (gui, "dialog");
-
-	clist = glade_xml_get_widget (gui, "clistSources");
-	dialog->clistSources = clist;
-	
-	gtk_clist_column_titles_passive (GTK_CLIST (clist));
-	gtk_clist_set_column_width (GTK_CLIST (clist), 0, 80);
-
-	dialog->addSource = glade_xml_get_widget (gui, "addSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->addSource), "clicked",
-			    GTK_SIGNAL_FUNC (add_source_clicked),
-			    dialog);
-
-	dialog->editSource = glade_xml_get_widget (gui, "editSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->editSource), "clicked",
-			    GTK_SIGNAL_FUNC (edit_source_clicked),
-			    dialog);
-
-	dialog->deleteSource = glade_xml_get_widget (gui, "deleteSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->deleteSource), "clicked",
-			    GTK_SIGNAL_FUNC (delete_source_clicked),
-			    dialog);
-
-	update_sensitivity (dialog);
-
-	l = addressbook_storage_get_sources ();
-	for (; l != NULL; l = l->next) {
-		AddressbookSource *source;
-		gint row;
-		gchar *text[2];
-
-		source = addressbook_source_copy ((AddressbookSource*)l->data);
-
-		text[0] = source->name;
-		text[1] = source->uri;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(clist), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(clist), row, source, (GtkDestroyNotify) addressbook_source_free);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (clist), "select_row",
-			    GTK_SIGNAL_FUNC (sources_select_row),
-			    dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->dialog), "apply",
-			    addressbook_dialog_apply, dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog->dialog), "destroy",
-			    addressbook_dialog_close, dialog);
-
-	gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 300, 350);
-
-	gtk_widget_show (dialog->dialog);
-}
diff --git a/addressbook/gui/component/addressbook-config.glade b/addressbook/gui/component/addressbook-config.glade
deleted file mode 100644
index 9194a27c5d..0000000000
--- a/addressbook/gui/component/addressbook-config.glade
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>dialog</name>
-  <width>460</width>
-  <height>360</height>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomePropertyBox:notebook</child_name>
-    <name>notebook1</name>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clistSources</name>
-	  <can_focus>True</can_focus>
-	  <columns>2</columns>
-	  <column_widths>80,80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label10</name>
-	    <label>Name</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label11</name>
-	    <label>URI</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVButtonBox</class>
-	<name>vbuttonbox2</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>10</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>addSource</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Add</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>editSource</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Edit</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>deleteSource</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Delete</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label8</name>
-      <label>Addressbook Sources</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index 51fe555f00..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __ADDRESSBOOK_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "addressbook-storage.h"
-
-void addressbook_config (GNOME_Evolution_Shell shell);
-
-#endif /* __ADDRESSBOOK_CONFIG_H__ */
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index ebfd0d9cfd..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Helix Code, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <unicode.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/widgets/e-minicard-control.h"
-#include "select-names/e-select-names-factory.h"
-
-
-static void
-init_corba (int *argc, char **argv)
-{
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    *argc, argv, oaf_popt_options, 0, NULL);
-
-	oaf_init (*argc, argv);
-}
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-	
-	init_corba (&argc, argv);
-
-	
-	init_bonobo (argc, argv);
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_cursors_init();
-
-	unicode_init();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
deleted file mode 100644
index 531e2acd7b..0000000000
--- a/addressbook/gui/component/addressbook-storage.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-/* The ldap server file goes like this:
-
-   <?xml version="1.0"?>
-   <addressbooks>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <description>This is my company address book.</description>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-	   <authmethod>simple</authmethod>
-	   <binddn>cn=Chris Toshok,dc=helixcode,dc=com</binddn>
-	   <rememberpass/>
-     </contactserver>
-     <contactfile>
-           <name>On Disk Contacts</name>
-	   <description>This is one of my private contact dbs.</description>
-           <path>/home/toshok/contacts/work-contacts.db</path>
-     </contactfile>
-   </addressbooks>
-
-   FIXME: Do we want to use a namespace for this?
-   FIXME: Do we want to have an internationalized description?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "addressbook-storage.h"
-
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"
-
-static gboolean load_source_data (EvolutionStorage *storage, const char *file_path);
-static gboolean save_source_data (const char *file_path);
-
-GList *sources;
-EvolutionStorage *storage;
-static char *storage_path;
-
-void
-addressbook_storage_setup (EvolutionShellComponent *shell_component,
-			   const char *evolution_homedir)
-{
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell corba_shell;
-
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	if (shell_client == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		return;
-	}
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-	storage = evolution_storage_new (_("Other Contacts"), NULL, NULL);
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		return;
-	}
-
-	sources = NULL;
-
-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);
-
-	if (storage_path)
-		g_free (storage_path);
-	storage_path = g_strdup_printf ("%s/" ADDRESSBOOK_SOURCES_XML, evolution_homedir);
-	load_source_data (storage, storage_path);
-}
-
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		return "simple";
-	case ADDRESSBOOK_LDAP_AUTH_SASL:
-		return "sasl";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE;
-	else if (!strcmp (auth, "sasl"))
-		return ADDRESSBOOK_LDAP_AUTH_SASL;
-	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 AddressbookLDAPScopeType
-ldap_parse_scope (const char *scope)
-{
-	if (!scope)
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE; /* XXX good default? */
-
-	if (!strcmp (scope, "base"))
-		return ADDRESSBOOK_LDAP_SCOPE_BASE;
-	else if (!strcmp (scope, "one"))
-		return ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-	else
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE;
-}
-
-void
-addressbook_storage_init_source_uri (AddressbookSource *source)
-{
-	if (source->uri)
-		g_free (source->uri);
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP)
-		source->uri = g_strdup_printf  ("ldap://%s:%s/%s??%s",
-						source->ldap.host, source->ldap.port,
-						source->ldap.rootdn, ldap_unparse_scope(source->ldap.scope));
-	else
-		source->uri = g_strdup_printf ("file://%s",
-					       source->file.path);
-}
-
-static gboolean
-load_source_data (EvolutionStorage *storage,
-		  const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* check to see if a ldapserver.xml.new file is
-                   there.  if it is, rename it and run with it */
-		char *new_path = g_strdup_printf ("%s.new", file_path);
-		struct stat sb;
-
-		if (stat (new_path, &sb) == 0) {
-			int rv;
-
-			rv = rename (new_path, file_path);
-			g_free (new_path);
-
-			if (0 > rv) {
-				g_error ("Failed to rename %s: %s\n",
-					 ADDRESSBOOK_SOURCES_XML,
-					 strerror(errno));
-				return FALSE;
-			}
-			else {
-				goto tryagain;
-			}
-		}
-
-		g_free (new_path);
-		return TRUE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *path;
-		AddressbookSource *source;
-
-		source = g_new0 (AddressbookSource, 1);
-
-		if (!strcmp (child->name, "contactserver")) {
-			source->type        = ADDRESSBOOK_SOURCE_LDAP;
-			source->ldap.port   = get_string_value (child, "port");
-			source->ldap.host   = get_string_value (child, "host");
-			source->ldap.rootdn = get_string_value (child, "rootdn");
-			source->ldap.scope  = ldap_parse_scope (get_string_value (child, "scope"));
-			source->ldap.auth   = ldap_parse_auth (get_string_value (child, "authmethod"));
-			source->ldap.binddn = get_string_value (child, "binddn");
-		}
-		else if (!strcmp (child->name, "contactfile")) {
-			source->type        = ADDRESSBOOK_SOURCE_FILE;
-			source->file.path = get_string_value (child, "path");
-		}
-		else {
-			g_warning ("unknown node '%s' in %s", child->name, file_path);
-			g_free (source);
-			continue;
-		}
-
-		addressbook_storage_init_source_uri (source);
-
-		source->name = get_string_value (child, "name");
-		source->description = get_string_value (child, "description");
-
-		path = g_strdup_printf ("/%s", source->name);
-		evolution_storage_new_folder (storage, path, source->name,
-					      "contacts", source->uri,
-					      source->description, FALSE);
-
-		sources = g_list_append (sources, source);
-
-		g_free (path);
-	}
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-static void
-ldap_source_foreach(AddressbookSource *source, xmlNode *root)
-{
-	xmlNode *source_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactserver");
-
-	xmlAddChild (root, source_root);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) source->name);
-	xmlNewChild (source_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) source->description);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "port",
-		     (xmlChar *) source->ldap.port);
-	xmlNewChild (source_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) source->ldap.host);
-	xmlNewChild (source_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) source->ldap.rootdn);
-	xmlNewChild (source_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) ldap_unparse_scope(source->ldap.scope));
-	xmlNewChild (source_root, NULL, (xmlChar *) "authmethod",
-		     (xmlChar *) ldap_unparse_auth(source->ldap.auth));
-	if (source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-		xmlNewChild (source_root, NULL, (xmlChar *) "binddn",
-			     (xmlChar *) source->ldap.binddn);
-		if (source->ldap.remember_passwd)
-			xmlNewChild (source_root, NULL, (xmlChar *) "rememberpass",
-				     NULL);
-	}
-}
-
-static void
-file_source_foreach (AddressbookSource *source, xmlNode *root)
-{
-	xmlNode *source_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactfile");
-
-	xmlAddChild (root, source_root);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) source->name);
-	xmlNewChild (source_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) source->description);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "path",
-		     (xmlChar *) source->file.path);
-}
-
-static void
-source_foreach(gpointer value, gpointer user_data)
-{
-	AddressbookSource *source = value;
-	xmlNode *root = user_data;
-
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP)
-		ldap_source_foreach(source, root);
-	else
-		file_source_foreach(source, root);
-}
-
-static gboolean
-save_source_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	int fd, rv;
-	xmlChar *buf;
-	int buf_size;
-	char *new_path = g_strdup_printf ("%s.new", file_path);
-
-	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "addressbooks", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_list_foreach (sources, source_foreach, root);
-
-	fd = open (new_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	fchmod (fd, 0600);
-
-	xmlDocDumpMemory (doc, &buf, &buf_size);
-
-	if (buf == NULL) {
-		g_error ("Failed to write %s: xmlBufferCreate() == NULL", ADDRESSBOOK_SOURCES_XML);
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new %s: %s\n", ADDRESSBOOK_SOURCES_XML, strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename %s: %s\n", ADDRESSBOOK_SOURCES_XML, strerror(errno));
-			unlink (new_path);
-			return FALSE;
-		}
-		return TRUE;
-	}
-}
-
-void
-addressbook_storage_add_source (AddressbookSource *source)
-{
-	char *path;
-
-	sources = g_list_append (sources, source);
-
-	/* and then to the ui */
-	path = g_strdup_printf ("/%s", source->name);
-	evolution_storage_new_folder (storage, path, source->name, "contacts",
-				      source->uri, source->description, FALSE);
-
-	g_free (path);
-
-	save_source_data (storage_path);
-}
-
-void
-addressbook_storage_remove_source (const char *name)
-{
-	char *path;
-	AddressbookSource *source = NULL;
-	GList *l;
-
-	/* remove it from our hashtable */
-	for (l = sources; l; l = l->next) {
-		AddressbookSource *s = l->data;
-		if (!strcmp (s->name, name)) {
-			source = s;
-			break;
-		}
-	}
-
-	if (!source)
-		return;
-
-	sources = g_list_remove_link (sources, l);
-	g_list_free_1 (l);
-
-	addressbook_source_free (source);
-
-	/* and then from the ui */
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	save_source_data (storage_path);
-}
-
-GList *
-addressbook_storage_get_sources ()
-{
-	return sources;
-}
-
-AddressbookSource *
-addressbook_storage_get_source_by_uri (const char *uri)
-{
-	GList *l;
-
-	for (l = sources; l ; l = l->next) {
-		AddressbookSource *source = l->data;
-		if (!strcmp (uri, source->uri))
-			return source;
-	}
-
-	return NULL;
-}
-
-void
-addressbook_source_free (AddressbookSource *source)
-{
-	g_free (source->name);
-	g_free (source->description);
-	g_free (source->uri);
-	if (source->type == ADDRESSBOOK_SOURCE_LDAP) {
-		g_free (source->ldap.host);
-		g_free (source->ldap.port);
-		g_free (source->ldap.rootdn);
-		g_free (source->ldap.binddn);
-	} else {
-		g_free (source->file.path);
-	}
-
-	g_free (source);
-}
-
-static void
-addressbook_source_foreach (AddressbookSource *source, gpointer data)
-{
-	char *path = g_strdup_printf ("/%s", source->name);
-
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	addressbook_source_free (source);
-}
-
-void
-addressbook_storage_clear_sources ()
-{
-	g_list_foreach (sources, (GFunc)addressbook_source_foreach, NULL);
-	g_list_free (sources);
-	sources = NULL;
-}
-
-AddressbookSource *
-addressbook_source_copy (const AddressbookSource *source)
-{
-	AddressbookSource *copy;
-
-	copy = g_new0 (AddressbookSource, 1);
-	copy->name = g_strdup (source->name);
-	copy->description = g_strdup (source->description);
-	copy->type = source->type;
-	copy->uri = g_strdup (source->uri);
-
-	if (copy->type == ADDRESSBOOK_SOURCE_LDAP) {
-		copy->ldap.host = g_strdup (source->ldap.host);
-		copy->ldap.port = g_strdup (source->ldap.port);
-		copy->ldap.rootdn = g_strdup (source->ldap.rootdn);
-		copy->ldap.scope = source->ldap.scope;
-		copy->ldap.auth = source->ldap.auth;
-		copy->ldap.binddn = source->ldap.binddn;
-		copy->ldap.remember_passwd = source->ldap.remember_passwd;
-	}
-	else {
-		copy->file.path = g_strdup (source->file.path);
-	}
-	return copy;
-}
diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
deleted file mode 100644
index 518977598e..0000000000
--- a/addressbook/gui/component/addressbook-storage.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __ADDRESSBOOK_STORAGE_H__
-#define __ADDRESSBOOK_STORAGE_H__
-
-#include "evolution-shell-component.h"
-
-typedef enum {
-	ADDRESSBOOK_SOURCE_FILE,
-	ADDRESSBOOK_SOURCE_LDAP,
-	ADDRESSBOOK_SOURCE_LAST
-} AddressbookSourceType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE,
-	ADDRESSBOOK_LDAP_AUTH_SASL, /* XXX currently unsupported */
-	ADDRESSBOOK_LDAP_AUTH_LAST
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef struct {
-	AddressbookSourceType type;
-	char *name;
-	char *description;
-	struct {
-		char *path;
-	} file;
-	struct {
-		char *host;
-		char *port;
-		char *rootdn;
-		AddressbookLDAPScopeType scope;
-		AddressbookLDAPAuthType auth;
-		char *binddn;                   /* used in AUTH_SIMPLE */
-		gboolean remember_passwd;
-	} ldap;
-	char *uri; /* filled in from the above */
-} AddressbookSource;
-
-void addressbook_storage_setup (EvolutionShellComponent *shell_component,
-				const char *evolution_homedir);
-
-GList             *addressbook_storage_get_sources (void);
-AddressbookSource *addressbook_storage_get_source_by_uri (const char *uri);
-void               addressbook_storage_clear_sources (void);
-AddressbookSource *addressbook_source_copy (const AddressbookSource *source);
-void               addressbook_source_free (AddressbookSource *source);
-void               addressbook_storage_init_source_uri (AddressbookSource *source);
-
-void               addressbook_storage_add_source (AddressbookSource *source);
-void               addressbook_storage_remove_source (const char *name);
-
-#endif /* __ADDRESSBOOK_STORAGE_H__ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 1cea4c21f2..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,777 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * addressbook.c: 
- *
- * Author:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "addressbook.h"
-
-#include <ebook/e-book.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include <widgets/misc/e-search-bar.h>
-
-#include <select-names/e-select-names.h>
-#include <select-names/e-select-names-manager.h>
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook-config.h"
-
-#include <addressbook/printing/e-contact-print.h>
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	EAddressbookView *view;
-	ESearchBar *search;
-	GtkWidget *vbox;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-	char *passwd;
-} AddressbookView;
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	ECard *card;
-	EBook *book;
-	EContactEditor *ce;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	card = e_card_new("");
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-
-	ce = e_contact_editor_new (card, TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-			    GTK_SIGNAL_FUNC (add_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-			    GTK_SIGNAL_FUNC (commit_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-			    GTK_SIGNAL_FUNC (delete_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_object_sink(GTK_OBJECT(card));
-}
-
-static void
-config_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	addressbook_config (NULL /* XXX */);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-	g_assert (E_IS_BOOK (book));
-
-	gtk_widget_show(e_addressbook_search_dialog_new(book));
-}
-
-#if 0
-static void
-find_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	gint result;
-	GtkWidget* search_entry = gtk_entry_new();
-	gchar* search_text;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	GtkWidget* dlg = gnome_dialog_new ("Search Contacts", "Find",
-					   GNOME_STOCK_BUTTON_CANCEL, NULL);
-
-	gtk_object_get (view->view,
-			"query", &search_text,
-			NULL);
-	e_utf8_gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);
-	g_free (search_text);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
-			    search_entry, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (dlg);
-
-	gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-	/* If the user clicks "okay"...*/
-	if (result == 0) {
-		search_text = e_utf8_gtk_entry_get_text(GTK_ENTRY(search_entry));
-		gtk_object_set (view->view, 
-				"query", query, 
-				NULL);
-		g_free (search_text);
-	}
-}
-#endif
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_print(view->view);
-}
-
-static void
-show_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_show_all(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_stop(view->view);
-}
-
-static void
-update_view_type (AddressbookView *view)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (view->control);
-	EAddressbookViewType view_type;
-
-	if (!uic || bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", _("As _Minicards"), NULL);
-
-		break;
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", _("As _Table"), NULL);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}	
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-
-	update_view_type (view);
-}
-
-static void
-toggle_view_as_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = user_data;
-	EAddressbookViewType view_type;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	if (view_type == E_ADDRESSBOOK_VIEW_TABLE)
-		change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-	else
-		change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);
-}
-
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("AddressbookConfig", config_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),
-/*	BONOBO_UI_UNSAFE_VERB ("ContactFind", find_contact_cb),*/
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactViewAll", show_all_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *uic,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-	set_pixmap (uic, "/menu/File/Print/Print", "16_print.xpm"); /* FIXME it doesn't seem to work */
-	set_pixmap (uic, "/menu/Settings/AddressbookConfig", "16_configure_addressbook.xpm");
-
-	set_pixmap (uic, "/Toolbar/View All", "24_all_contacts.xpm");
-	set_pixmap (uic, "/Toolbar/Find", "24_find_contact.xpm"); 
-}
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	Bonobo_UIContainer remote_ui_container;
-
-	remote_ui_container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_ui_container);
-	bonobo_object_release_unref (remote_ui_container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, view);
-	
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook.xml",
-			       "evolution-addressbook");
-
-	e_addressbook_view_setup_menus (view->view, uic);
-
-	update_view_type (view);
-
-	update_pixmaps (uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-	
-	if (activate)
-		control_activate (control, uic, view);
-	else
-		bonobo_ui_component_unset_container (uic);
-}
-
-static void
-addressbook_view_free(AddressbookView *view)
-{
-	if (view->properties)
-		bonobo_object_unref(BONOBO_OBJECT(view->properties));
-	g_free(view->passwd);
-	g_free(view->uri);
-	g_free(view);
-}
-
-static void
-book_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookView *view = closure;
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-	}
-	else {
-		/* pop up a nice dialog, or redo the authentication
-                   bit some number of times. */
-	}
-}
-
-static void
-passwd_cb (gchar *string, gpointer data)
-{
-	AddressbookView *view = (AddressbookView*)data;
-
-	view->passwd = g_strdup (string);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		AddressbookView *view = closure;
-		AddressbookSource *source;
-
-		/* check if the addressbook needs authentication */
-
-		source = addressbook_storage_get_source_by_uri (view->uri);
-		if (source &&
-		    source->type == ADDRESSBOOK_SOURCE_LDAP &&
-		    source->ldap.auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			int button;
-			char *msg = g_strdup_printf (_("Enter password for %s"), source->ldap.binddn);
-			/* give a password prompt for the binddn */
-			GtkWidget *dialog = gnome_request_dialog (TRUE, msg, NULL,
-								  0, passwd_cb, view, NULL); 
-			
-			button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-			if (button == 0 && *(view->passwd)) {
-				e_book_authenticate_user (book, source->ldap.binddn, view->passwd,
-							  book_auth_cb, closure);
-				memset (view->passwd, 0, strlen (view->passwd)); /* clear out the passwd */
-				g_free (view->passwd);
-				view->passwd = NULL;
-				return;
-			}
-		}
-
-
-		/* if they either didn't configure the source to use
-                   authentication, or they canceled the dialog,
-                   proceed without authenticating */
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-
-	} else {
-		GtkWidget *warning_dialog, *label, *href;
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-        
-        	label = gtk_label_new (
-        		_("We were unable to open this addressbook.  This either\n"
-			  "means you have entered an incorrect URI, or have tried\n"
-			  "to access an LDAP server and don't have LDAP support\n"
-			  "compiled in.  If you've entered a URI, check the URI for\n"
-			  "correctness and reenter.  If not, you probably have\n"
-			  "attempted to access an LDAP server.  If you wish to be\n"
-			  "able to use LDAP, you'll need to download and install\n"
-			  "OpenLDAP and recompile and install Evolution.\n"));
-		gtk_misc_set_alignment(GTK_MISC(label),
-				       0, .5);
-		gtk_label_set_justify(GTK_LABEL(label),
-				      GTK_JUSTIFY_LEFT);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-				    label, TRUE, TRUE, 0);
-        	gtk_widget_show (label);
-
-		href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-				    href, FALSE, FALSE, 0);
-        	gtk_widget_show (href);
-
-		gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-		
-		gtk_object_destroy (GTK_OBJECT (warning_dialog));
-	}
-}
-
-static void destroy_callback(GtkWidget *widget, gpointer data)
-{
-	AddressbookView *view = data;
-	addressbook_view_free(view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		if (view && view->uri)
-			BONOBO_ARG_SET_STRING (arg, view->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	char *uri_data;
-	EBook *book;
-	
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		if (view->uri) {
-			/* we've already had a uri set on this view, so unload it */
-			e_book_unload_uri (book);
-			g_free (view->uri);
-		} else {
-			book = e_book_new ();
-		}
-
-		view->uri = g_strdup(BONOBO_ARG_GET_STRING (arg));
-		
-		if (!strncmp (view->uri, "file:", 5)) {
-
-			if (strlen (view->uri + 7) > 3
-			    && !strcmp (view->uri + strlen(view->uri) - 3, ".db")) {
-				/* it's a .db file */
-				uri_data = g_strdup (view->uri);
-			}
-			else {
-				char *file_name;
-				/* we assume it's a dir and glom addressbook.db onto the end. */
-				file_name = g_concat_dir_and_file(view->uri + 7, "addressbook.db");
-				uri_data = g_strdup_printf("file://%s", file_name);
-				g_free(file_name);
-			}
-
-		}
-		else {
-			uri_data = g_strdup (view->uri);
-		}
-
-		if (! e_book_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
-
-		g_free(uri_data);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-enum {
-	ESB_SHOW_ALL,
-	ESB_ADVANCED,
-};
-
-static ESearchBarItem addressbook_search_menu_items[] = {
-	{ N_("Show All"), ESB_SHOW_ALL },
-	{ NULL, 0 },
-	{ N_("Advanced..."), ESB_ADVANCED},
-	{ NULL, -1 }
-};
-
-static void
-addressbook_menu_activated (ESearchBar *esb, int id, AddressbookView *view)
-{
-	EBook *book;
-	switch (id) {
-	case ESB_SHOW_ALL:
-		e_addressbook_view_show_all(view->view);
-		break;
-	case ESB_ADVANCED:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		g_assert (E_IS_BOOK (book));
-
-		gtk_widget_show(e_addressbook_search_dialog_new(book));
-		break;
-	}
-}
-
-enum {
-	ESB_ANY,
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Any field contains"), ESB_ANY },
-	{ N_("Name contains"), ESB_FULL_NAME },
-	{ N_("Email contains"), ESB_EMAIL },
-	{ NULL, -1 }
-};
-
-static void
-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
-{
-	char *search_word, *search_query;
-	int search_type;
-
-	gtk_object_get(GTK_OBJECT(esb),
-		       "text", &search_word,
-		       "option_choice", &search_type,
-		       NULL);
-
-	if (search_word && strlen (search_word)) {
-		switch (search_type) {
-		case ESB_ANY:
-			search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")",
-							search_word);
-			break;
-		case ESB_FULL_NAME:
-			search_query = g_strdup_printf ("(contains \"full_name\" \"%s\")",
-							search_word);
-			break;
-		case ESB_EMAIL:
-			search_query = g_strdup_printf ("(contains \"email\" \"%s\")",
-							search_word);
-			break;
-		default:
-			search_query = g_strdup ("(contains \"full_name\" \"\")");
-			break;
-		}
-	} else
-		search_query = g_strdup ("(contains \"full_name\" \"\")");
-
-	gtk_object_set (GTK_OBJECT(view->view),
-			"query", search_query,
-			NULL);
-
-	g_free (search_query);
-	g_free (search_word);
-}
-
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	shell_view_interface = gtk_object_get_data (GTK_OBJECT (control),
-						    "shell_view_interface");
-
-	if (shell_view_interface)
-		return shell_view_interface;
-
-	control_frame = bonobo_control_get_control_frame (control);
-
-	if (control_frame == NULL)
-		return CORBA_OBJECT_NIL;
-
-	CORBA_exception_init (&ev);
-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							       "IDL:GNOME/Evolution/ShellView:1.0",
-							       &ev);
-	CORBA_exception_free (&ev);
-
-	if (shell_view_interface != CORBA_OBJECT_NIL)
-		gtk_object_set_data (GTK_OBJECT (control),
-				     "shell_view_interface",
-				     shell_view_interface);
-	else
-		g_warning ("Control frame doesn't have Evolution/ShellView.");
-
-	return shell_view_interface;
-}
-
-static void
-set_status_message (EAddressbookView *eav, const char *message, AddressbookView *view)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellView shell_view_interface;
-
-	CORBA_exception_init (&ev);
-
-	shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
-
-	if (message == NULL || message[0] == 0) {
-		printf ("clearing message\n");
-		GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
-	}
-	else {
-		printf ("setting message %s\n", message);
-		GNOME_Evolution_ShellView_setMessage (shell_view_interface,
-						      message, 0 /* XXX */, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 1);
-
-	view->vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	gtk_container_set_border_width(GTK_CONTAINER(view->vbox), GNOME_PAD_SMALL);
-
-	gtk_signal_connect( GTK_OBJECT( view->vbox ), "destroy",
-			    GTK_SIGNAL_FUNC( destroy_callback ),
-			    ( gpointer ) view );
-
-	/* Create the control. */
-	view->control = bonobo_control_new(view->vbox);
-
-	view->search = E_SEARCH_BAR(e_search_bar_new(addressbook_search_menu_items,
-						     addressbook_search_option_items));
-	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
-			    FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (view->search), "query_changed",
-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);
-	gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
-
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-	gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view),
-			   TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show( view->vbox );
-	gtk_widget_show( GTK_WIDGET(view->view) );
-	gtk_widget_show( GTK_WIDGET(view->search) );
-
-	view->properties = bonobo_property_bag_new (get_prop, set_prop, view);
-
-	bonobo_property_bag_add (
-		view->properties, PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,
-		BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);
-
-	bonobo_control_set_properties (view->control,
-					 view->properties);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "status_message",
-			    GTK_SIGNAL_FUNC(set_status_message),
-			    view);
-	
-	view->uri = NULL;
-
-	gtk_signal_connect (GTK_OBJECT (view->control), "activate",
-			    control_activate_cb, view);
-
-	return view->control;
-}
-
-static BonoboObject *
-addressbook_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	return BONOBO_OBJECT (addressbook_factory_new_control ());
-}
-
-void
-addressbook_factory_init (void)
-{
-	static BonoboGenericFactory *addressbook_control_factory = NULL;
-
-	if (addressbook_control_factory != NULL)
-		return;
-
-	addressbook_control_factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Addressbook_ControlFactory",
-		addressbook_factory, NULL);
-
-	if (addressbook_control_factory == NULL) {
-		g_error ("I could not register a Addressbook factory.");
-	}
-}
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
deleted file mode 100644
index 66c5a7e4e6..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *addressbook_factory_new_control  (void);
-void           addressbook_factory_init         (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
deleted file mode 100644
index 23b61d58be..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "e-cardlist-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-
-static void
-e_cardlist_model_destroy(GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	int i;
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_cardlist_model_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_cardlist_model_row_count (ETableModel *etc)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	return e_cardlist_model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_cardlist_model_value_at (ETableModel *etc, int col, int row)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return NULL;
-	value = e_card_simple_get_const(e_cardlist_model->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	ECard *card;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return;
-	e_card_simple_set(e_cardlist_model->data[row],
-			  col + 1,
-			  val);
-	gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]),
-		       "card", &card,
-		       NULL);
-
-	e_table_model_cell_changed(etc, col, row);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_cardlist_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_cardlist_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_cardlist_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_cardlist_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-void
-e_cardlist_model_add(ECardlistModel *model,
-		     ECard **cards,
-		     int count)
-{
-	int i;
-	model->data = g_realloc(model->data, model->data_count + count * sizeof(ECard *));
-	for (i = 0; i < count; i++) {
-		gboolean found = FALSE;
-		gchar *id = e_card_get_id(cards[i]);
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-				found = TRUE;
-			}
-		}
-		if (!found) {
-			gtk_object_ref(GTK_OBJECT(cards[i]));
-			model->data[model->data_count++] = e_card_simple_new (cards[i]);
-			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-		}
-	}
-}
-
-void
-e_cardlist_model_remove(ECardlistModel *model,
-			const char *id)
-{
-	int i;
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-e_cardlist_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-	
-	object_class->destroy = e_cardlist_model_destroy;
-
-	model_class->column_count = e_cardlist_model_col_count;
-	model_class->row_count = e_cardlist_model_row_count;
-	model_class->value_at = e_cardlist_model_value_at;
-	model_class->set_value_at = e_cardlist_model_set_value_at;
-	model_class->is_cell_editable = e_cardlist_model_is_cell_editable;
-	model_class->duplicate_value = e_cardlist_model_duplicate_value;
-	model_class->free_value = e_cardlist_model_free_value;
-	model_class->initialize_value = e_cardlist_model_initialize_value;
-	model_class->value_is_empty = e_cardlist_model_value_is_empty;
-	model_class->value_to_string = e_cardlist_model_value_to_string;
-}
-
-static void
-e_cardlist_model_init (GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	model->data = NULL;
-	model->data_count = 0;
-}
-
-ECard *
-e_cardlist_model_get(ECardlistModel *model,
-		     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-GtkType
-e_cardlist_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardlistModel",
-			sizeof (ECardlistModel),
-			sizeof (ECardlistModelClass),
-			(GtkClassInitFunc) e_cardlist_model_class_init,
-			(GtkObjectInitFunc) e_cardlist_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_cardlist_model_new (void)
-{
-	ECardlistModel *et;
-
-	et = gtk_type_new (e_cardlist_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
deleted file mode 100644
index 0b9a7a2265..0000000000
--- a/addressbook/gui/component/e-cardlist-model.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CARDLIST_MODEL_H_
-#define _E_CARDLIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-card-simple.h>
-
-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())
-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))
-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))
-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))
-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	ECardSimple **data;
-	int data_count;
-} ECardlistModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} ECardlistModelClass;
-
-
-GtkType e_cardlist_model_get_type (void);
-ETableModel *e_cardlist_model_new (void);
-
-/* Returns object with an extra ref count. */
-ECard *e_cardlist_model_get  (ECardlistModel  *model,
-			      int              row);
-void e_cardlist_model_add    (ECardlistModel  *model,
-			      ECard          **card,
-			      int              count);
-void e_cardlist_model_remove (ECardlistModel  *model,
-			      const char      *id);
-
-#endif /* _E_CARDLIST_MODEL_H_ */
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index cd669499fa..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames.h
-GNOME_Evolution_Addressbook_SelectNames.oaf
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
deleted file mode 100644
index c38d714cf4..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-
-	interface SelectNames : Bonobo::Unknown {
-		struct Section {
-			string id;
-			string title;
-		};
-
-		typedef sequence<Section> SectionList;
-
-		exception DuplicateID {};
-		exception SectionNotFound {};
-
-		void addSection (in string id, in string title)
-			raises (DuplicateID);
-
-		Bonobo::Control getEntryBySection (in string section_id)
-			raises (SectionNotFound);
-
-		void activateDialog (in string section_id);
-	};
-
-};
-};
-};
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
deleted file mode 100644
index 7f26e2aaed..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
deleted file mode 100644
index e3719967b0..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
deleted file mode 100644
index 7e9a2e00e3..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-# CORBA stuff
-
-IDLS = \
-	Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED = \
-	Evolution-Addressbook-SelectNames.h		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c
-
-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		$(srcdir)/Evolution-Addressbook-SelectNames.idl
-
-oafdir = $(datadir)/oaf
-
-oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-lib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 		\
-	$(IDL_GENERATED)		\
-	e-select-names-bonobo.c		\
-	e-select-names-bonobo.h		\
-	e-select-names-completion.c	\
-	e-select-names-completion.h	\
-	e-select-names-factory.c	\
-	e-select-names-factory.h	\
-	e-select-names-manager.c	\
-	e-select-names-manager.h	\
-	e-select-names-model.c		\
-	e-select-names-model.h		\
-	e-select-names-table-model.c	\
-	e-select-names-table-model.h	\
-	e-select-names-text-model.c	\
-	e-select-names-text-model.h	\
-	e-select-names.c		\
-	e-select-names.h
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = select-names.glade
-
-
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_in_files)		\
-	$(oaf_DATA)		\
-	$(IDLS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
deleted file mode 100644
index 1d34c4198f..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include <gal/util/e-util.h>
-#include "e-select-names-manager.h"
-
-#include "e-select-names-bonobo.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT,
-	ENTRY_PROPERTY_ID_ENTRY_CHANGED
-};
-typedef enum _EntryPropertyID EntryPropertyID;
-
-
-/* PropertyBag implementation for the entry widgets.  */
-
-static void
-entry_get_property_fn (BonoboPropertyBag *bag,
-		       BonoboArg *arg,
-		       unsigned int arg_id,
-		       CORBA_Environment *ev,
-		       void *user_data)
-{
-	GtkWidget *w;
-	const char *text;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ESelectNamesModel *model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "bonobo_select_names_model"));
-			text = e_select_names_model_get_address_text (model);
-			BONOBO_ARG_SET_STRING (arg, text);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       CORBA_Environment *ev,
-		       gpointer user_data)
-{
-	GtkWidget *widget;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		gtk_object_set_data (GTK_OBJECT (widget), "entry_property_id_changed", GUINT_TO_POINTER (1));
-		break;
-	default:
-		break;
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-
-static POA_GNOME_Evolution_Addressbook_SelectNames *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SelectNames_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_SelectNames_add_section (PortableServer_Servant servant,
-			      const CORBA_char *id,
-			      const CORBA_char *title,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_add_section (priv->manager, id, title);
-}
-
-static void
-entry_changed (GtkWidget *widget, BonoboControl *control)
-{
-	gboolean changed = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (widget), "entry_property_id_changed"));
-
-	if (!changed)
-		bonobo_control_set_property (control, "entry_changed", TRUE, NULL);
-}
-
-static Bonobo_Control
-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
-					const CORBA_char *section_id,
-					CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-	GtkWidget *entry_widget;
-	BonoboControl *control;
-	BonoboPropertyBag *property_bag;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	entry_widget = e_select_names_manager_create_entry (priv->manager, section_id);
-	gtk_widget_show (entry_widget);
-	
-	gtk_object_set_data (GTK_OBJECT (entry_widget),
-			     "bonobo_select_names_model",
-			     e_select_names_manager_get_source (priv->manager, section_id));
-
-	if (entry_widget == NULL) {
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Addressbook_SelectNames_SectionNotFound,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	control = bonobo_control_new (entry_widget);
-
-	property_bag = bonobo_property_bag_new (entry_get_property_fn, entry_set_property_fn, entry_widget);
-	bonobo_property_bag_add (property_bag, "text", ENTRY_PROPERTY_ID_TEXT,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_property_bag_add (property_bag, "entry_changed", ENTRY_PROPERTY_ID_ENTRY_CHANGED,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, property_bag);
-
-	gtk_signal_connect (GTK_OBJECT (entry_widget), "changed",
-			    GTK_SIGNAL_FUNC (entry_changed), control);
-
-	return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev);
-}
-
-static void
-impl_SelectNames_activate_dialog (PortableServer_Servant servant,
-				  const CORBA_char *section_id,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (object);
-	priv = select_names->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->manager));
-
-	g_free (priv);
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->addSection        = impl_SelectNames_add_section;
-	epv->getEntryBySection = impl_SelectNames_get_entry_for_section;
-	epv->activateDialog    = impl_SelectNames_activate_dialog;
-
-	vepv = &SelectNames_vepv;
-	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Addressbook_SelectNames_epv = epv;
-}
-
-static void
-class_init (ESelectNamesBonoboClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = impl_destroy;
-
-	corba_class_init ();
-}
-
-static void
-init (ESelectNamesBonobo *select_names)
-{
-	ESelectNamesBonoboPrivate *priv;
-
-	priv = g_new (ESelectNamesBonoboPrivate, 1);
-
-	priv->manager = e_select_names_manager_new ();
-
-	select_names->priv = priv;
-}
-
-
-void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 GNOME_Evolution_Addressbook_SelectNames corba_object)
-{
-	g_return_if_fail (select_names != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
-
-	bonobo_object_construct (BONOBO_OBJECT (select_names), corba_object);
-}
-
-ESelectNamesBonobo *
-e_select_names_bonobo_new (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	GNOME_Evolution_Addressbook_SelectNames corba_object;
-	ESelectNamesBonobo *select_names;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	select_names = gtk_type_new (e_select_names_bonobo_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (select_names), servant);
-	e_select_names_bonobo_construct (select_names, corba_object);
-
-	return select_names;
-}
-
-
-E_MAKE_TYPE (e_select_names_bonobo, "ESelectNamesBonobo", ESelectNamesBonobo, class_init, init, PARENT_TYPE)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
deleted file mode 100644
index 87fbfa0fab..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-
-
-typedef struct _ESelectNamesBonobo        ESelectNamesBonobo;
-typedef struct _ESelectNamesBonoboPrivate ESelectNamesBonoboPrivate;
-typedef struct _ESelectNamesBonoboClass   ESelectNamesBonoboClass;
-
-struct _ESelectNamesBonobo {
-	BonoboObject parent;
-
-	ESelectNamesBonoboPrivate *priv;
-};
-
-struct _ESelectNamesBonoboClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType             e_select_names_bonobo_get_type   (void);
-void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,
-						      GNOME_Evolution_Addressbook_SelectNames corba_object);
-ESelectNamesBonobo *e_select_names_bonobo_new        (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_SELECT_NAMES_BONOBO_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
deleted file mode 100644
index e388851ded..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,841 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-destination.h>
-#include "e-select-names-completion.h"
-
-struct _ESelectNamesCompletionPrivate {
-
-	ESelectNamesModel *model;
-
-	EBook *book;
-	gboolean book_ready;
-	gboolean cancelled;
-
-	EBookView *book_view;
-	guint card_added_id;
-	guint seq_complete_id;
-
-	gchar *query_text;
-	gchar *pending_query_text;
-
-	gboolean primary_only;
-};
-
-static void e_select_names_completion_class_init (ESelectNamesCompletionClass *);
-static void e_select_names_completion_init (ESelectNamesCompletion *);
-static void e_select_names_completion_destroy (GtkObject *object);
-
-static void e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data);
-static void e_select_names_completion_card_added_cb    (EBookView *, const GList *cards, gpointer user_data);
-static void e_select_names_completion_seq_complete_cb  (EBookView *, gpointer user_data);
-
-static void e_select_names_completion_do_query (ESelectNamesCompletion *);
-
-static void e_select_names_completion_begin  (ECompletion *, const gchar *txt, gint pos, gint limit);
-static void e_select_names_completion_end    (ECompletion *);
-static void e_select_names_completion_cancel (ECompletion *);
-
-static GtkObjectClass *parent_class;
-
-static FILE *out;
-
-/*
- *
- * Query builders
- *
- */
-
-typedef gchar *(*BookQuerySExp) (ESelectNamesCompletion *);
-typedef gchar *(*BookQueryMatchTester) (ESelectNamesCompletion *, EDestination *, double *score);
-
-/*
- * Nickname query
- */
-
-static gchar *
-sexp_nickname (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp->priv->query_text);
-
-}
-
-static gchar *
-match_nickname (ESelectNamesCompletion *comp, EDestination *dest, double *score)
-{
-	gint len = strlen (comp->priv->query_text);
-	ECard *card = e_destination_get_card (dest);
-
-	if (card->nickname
-	    && !g_strncasecmp (comp->priv->query_text, card->nickname, len)) {
-		
-		*score = len * 10; /* nickname gives 10 points per matching character */
-		
-		return g_strdup_printf ("(%s) %s %s", card->nickname, card->name->given, card->name->family);
-		
-	}
-
-	return NULL;
-}
-
-/*
- * E-Mail Query
- */
-
-static gchar *
-sexp_email (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"email\" \"%s\")", comp->priv->query_text);
-}
-
-static gchar *
-match_email (ESelectNamesCompletion *comp, EDestination *dest, double *score)
-{
-	gint len = strlen (comp->priv->query_text);
-	ECard *card = e_destination_get_card (dest);
-	const gchar *email = e_destination_get_email (dest);
-	
-	if (email && !g_strncasecmp (comp->priv->query_text, email, len)) {
-		*score = len * 2; /* 2 points for each matching character */
-		return g_strdup_printf ("<%s> %s %s", email, card->name->given, card->name->family);
-	}
-
-	return NULL;
-}
-
-/*
- * Name Query
- */
-
-static gchar *
-sexp_name (ESelectNamesCompletion *comp)
-{
-	if (comp && comp->priv->query_text && *comp->priv->query_text) {
-		gchar *cpy = g_strdup (comp->priv->query_text);
-		gchar **strv;
-		gchar *query;
-		gint i, count=0;
-
-		strv = g_strsplit (cpy, " ", 0);
-		for (i=0; strv[i]; ++i) {
-			++count;
-			g_strstrip (strv[i]);
-			strv[i] = g_strdup_printf ("(contains \"full_name\" \"%s\")", strv[i]);
-		}
-
-		if (count == 1) {
-			query = strv[0];
-			strv[0] = NULL;
-		} else {
-			gchar *joined = g_strjoinv (" ", strv);
-			query = g_strdup_printf ("(and %s)", joined);
-			g_free (joined);
-		}
-
-		for (i=0; strv[i]; ++i)
-			g_free (strv[i]);
-		g_free (cpy);
-		g_free (strv);
-
-		return query;
-	}
-
-	return NULL;
-}
-
-enum {
-	MATCHED_NOTHING = 0,
-	MATCHED_GIVEN_NAME  = 1<<0,
-	MATCHED_ADDITIONAL_NAME = 1<<1,
-	MATCHED_FAMILY_NAME   = 1<<2
-};
-
-static gchar *
-match_name (ESelectNamesCompletion *comp, EDestination *dest, double *score)
-{
-	ECard *card;
-	gchar *cpy, **strv;
-	gint len, i, match_len = 0;
-	gint match = 0, first_match = 0;
-
-	card = e_destination_get_card (dest);
-	
-	if (card->name == NULL)
-		return NULL;
-
-	cpy = g_strdup (comp->priv->query_text);
-	strv = g_strsplit (cpy, " ", 0);
-	
-	for (i=0; strv[i] && !(match & MATCHED_NOTHING); ++i) {
-		gint this_match = 0;
-
-		g_strstrip (strv[i]);
-		len = strlen (strv[i]);
-
-		if (card->name->given
-		    && !(match & MATCHED_GIVEN_NAME)
-		    && !g_strncasecmp (card->name->given, strv[i], len)) {
-
-			this_match = MATCHED_GIVEN_NAME;
-
-		}
-		else if (card->name->additional
-			   && !(match & MATCHED_ADDITIONAL_NAME)
-			   && !g_strncasecmp (card->name->additional, strv[i], len)) {
-
-			this_match = MATCHED_ADDITIONAL_NAME;
-
-		} else if (card->name->family
-			   && !(match & MATCHED_FAMILY_NAME)
-			   && !g_strncasecmp (card->name->family, strv[i], len)) {
-			
-			this_match = MATCHED_FAMILY_NAME;
-		}
-
-
-		if (this_match != MATCHED_NOTHING) {
-			match_len += len;
-			match |= this_match;
-			if (first_match == 0)
-				first_match = this_match;
-		} else {
-			match = first_match = 0;
-			break;
-		}
-
-	}
-	
-	*score = match_len * 3; /* three points per match character */
-
-	if (card->nickname) {
-		/* We massively boost the score if the nickname exists and is the same as one of the "real" names.  This keeps the
-		   nickname from matching ahead of the real name for this card. */
-		len = strlen (card->nickname);
-		if ((card->name->given && !g_strncasecmp (card->name->given, card->nickname, MIN (strlen (card->name->given), len)))
-		    || (card->name->family && !g_strncasecmp (card->name->family, card->nickname, MIN (strlen (card->name->family), len)))
-		    || (card->name->additional && !g_strncasecmp (card->name->additional, card->nickname, MIN (strlen (card->name->additional), len))))
-			*score *= 100;
-	}
-
-	if (first_match == MATCHED_GIVEN_NAME)
-		return g_strdup_printf ("%s %s", card->name->given, card->name->family);
-	else if (first_match == MATCHED_ADDITIONAL_NAME)
-		return g_strdup_printf ("%s, %s %s", card->name->family, card->name->given, card->name->additional);
-	else if (first_match == MATCHED_FAMILY_NAME)
-		return g_strdup_printf ("%s, %s", card->name->family, card->name->given);
-	
-	return NULL;
-}
-
-/*
- * Initials Query
- */
-
-static gchar *
-sexp_initials (ESelectNamesCompletion *comp)
-{
-	return NULL;
-}
-
-static gchar *
-match_initials (ESelectNamesCompletion *comp, EDestination *dest, double *score)
-{
-	return NULL;
-}
-
-
-typedef struct _BookQuery BookQuery;
-struct _BookQuery {
-	gboolean primary;
-	BookQuerySExp builder;
-	BookQueryMatchTester tester;
-};
-
-static BookQuery book_queries[] = {
-	{ TRUE,  sexp_nickname, match_nickname},
-	{ TRUE,  sexp_email,    match_email },
-	{ TRUE,  sexp_name,     match_name },
-	{ FALSE, sexp_initials, match_initials }
-};
-static gint book_query_count = sizeof (book_queries) / sizeof (BookQuery);
-
-/*
- * Build up a big compound sexp corresponding to all of our queries.
- */
-static gchar *
-book_query_sexp (ESelectNamesCompletion *comp)
-{
-	gint i, j, count = 0;
-	gchar **queryv, *query;
-
-	g_return_val_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-
-	if (comp->priv->primary_only) {
-		for (i=0; i<book_query_count; ++i)
-			if (book_queries[i].primary)
-				++count;
-	} else {
-		count = book_query_count;
-	}
-
-	queryv = g_new0 (gchar *, count+1);
-	for (i=0, j=0; i<count; ++i) {
-		queryv[j] = book_queries[i].builder (comp);
-		if (queryv[j])
-			++j;
-	}
-
-	if (j == 0) {
-		query = NULL;
-	} else if (j == 1) {
-		query = queryv[0];
-		queryv[0] = NULL;
-	} else {
-		gchar *tmp = g_strjoinv (" ", queryv);
-		query = g_strdup_printf ("(or %s)", tmp);
-		g_free (tmp);
-	}
-
-	for (i=0; i<count; ++i)
-		g_free (queryv[i]);
-	g_free (queryv);
-
-	return query;
-}
-
-/*
- * Sweep across all of our query rules and find the best score/match
- * string that applies to a given destination.
- */
-static gchar *
-book_query_score (ESelectNamesCompletion *comp, EDestination *dest, double *score)
-{
-	double best_score = -1;
-	gchar *best_string = NULL;
-	gint i;
-
-	g_return_val_if_fail (score, NULL);
-	*score = -1;
-
-	g_return_val_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	for (i=0; i<book_query_count; ++i) {
-		double this_score = -1;
-		gchar *this_string = NULL;
-
-		if (book_queries[i].primary || !comp->priv->primary_only) {
-			if (book_queries[i].tester && e_destination_get_card (dest))
-				this_string = book_queries[i].tester (comp, dest, &this_score);
-			if (this_string) {
-				if (this_score > best_score) {
-					g_free (best_string);
-					best_string = this_string;
-					best_score = this_score;
-				} else {
-					g_free (this_string);
-				}
-			}
-		}
-	}
-
-	/* If this destination corresponds to a card w/ multiple addresses, and if the
-	   address isn't already in the string, append it. */
-	if (best_string) {
-		ECard *card = e_destination_get_card (dest);
-		if (e_list_length (card->email) > 1) {
-			const gchar *email = e_destination_get_email (dest);
-			if (email && strstr (best_string, email) == NULL) {
-				gchar *tmp = g_strdup_printf ("%s <%s>", best_string, email);
-				g_free (best_string);
-				best_string = tmp;
-			}
-		}
-	}
-
-	*score = best_score;
-	return best_string;
-}
-
-#if 0
-static gchar *
-initials_query_match_cb (QueryInfo *qi, ECard *card, double *score)
-{
-	gint len;
-	gchar f='\0', m='\0', l='\0'; /* initials */
-	gchar cf, cm, cl;
-
-	len = strlen (qi->comp->priv->query_text);
-	
-	if (len == 2) {
-		
-		f = qi->comp->priv->query_text[0];
-		m = '\0';
-		l = qi->comp->priv->query_text[1];
-
-	} else if (len == 3) {
-
-		f = qi->comp->priv->query_text[0];
-		m = qi->comp->priv->query_text[1];
-		l = qi->comp->priv->query_text[2];
-
-	} else {
-		return NULL;
-	}
-
-	cf = card->name->given ? *card->name->given : '\0';
-	cm = card->name->additional ? *card->name->additional : '\0';
-	cl = card->name->family ? *card->name->family : '\0';
-
-	if (f && isupper ((gint) f))
-		f = tolower ((gint) f);
-	if (m && isupper ((gint) m))
-		m = tolower ((gint) m);
-	if (l && isupper ((gint) l))
-		l = tolower ((gint) l);
-
-	if (cf && isupper ((gint) cf))
-		cf = tolower ((gint) cf);
-	if (cm && isupper ((gint) cm))
-		cm = tolower ((gint) cm);
-	if (cl && isupper ((gint) cl))
-		cl = tolower ((gint) cl);
-
-	if ((f == '\0' || (f == cf)) && (m == '\0' || (m == cm)) && (l == '\0' || (l == cl))) {
-		if (score)
-			*score = 3;
-		if (m)
-			return g_strdup_printf ("%s %s %s", card->name->given, card->name->additional, card->name->family);
-		else
-			return g_strdup_printf ("%s %s", card->name->given, card->name->family);
-	}
-
-	return NULL;
-}
-
-static gboolean
-start_initials_query (ESelectNamesCompletion *comp)
-{
-	gint len;
-	gchar *query;
-
-	if (comp && comp->priv->query_text && *(comp->priv->query_text)) {
-		
-		len = strlen (comp->priv->query_text);
-		if (len < 2 || len > 3)
-			return FALSE;
-
-		query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%c\")", *(comp->priv->query_text));
-		query_info_start (comp, comp->priv->query_text, query, initials_query_match_cb);
-		g_free (query);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-#endif
-
-
-/*
- *
- * ESelectNamesCompletion code
- *
- */
-
-
-GtkType
-e_select_names_completion_get_type (void)
-{
-	static GtkType select_names_complete_type = 0;
-  
-	if (!select_names_complete_type) {
-		GtkTypeInfo select_names_complete_info = {
-			"ESelectNamesCompletion",
-			sizeof (ESelectNamesCompletion),
-			sizeof (ESelectNamesCompletionClass),
-			(GtkClassInitFunc) e_select_names_completion_class_init,
-			(GtkObjectInitFunc) e_select_names_completion_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		select_names_complete_type = gtk_type_unique (e_completion_get_type (), &select_names_complete_info);
-	}
-
-	return select_names_complete_type;
-}
-
-static void
-e_select_names_completion_class_init (ESelectNamesCompletionClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-	ECompletionClass *completion_class = E_COMPLETION_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (e_completion_get_type ()));
-
-	object_class->destroy = e_select_names_completion_destroy;
-
-	completion_class->begin_completion = e_select_names_completion_begin;
-	completion_class->end_completion = e_select_names_completion_end;
-	completion_class->cancel_completion = e_select_names_completion_cancel;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_COMPLETION")) {
-		out = fopen ("/tmp/evo-debug-select-names-completion", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-e_select_names_completion_init (ESelectNamesCompletion *comp)
-{
-	comp->priv = g_new0 (struct _ESelectNamesCompletionPrivate, 1);
-}
-
-static void
-e_select_names_completion_destroy (GtkObject *object)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);
-
-	gtk_object_unref (GTK_OBJECT (comp->priv->model));
-	gtk_object_unref (GTK_OBJECT (comp->priv->book));
-
-	if (GTK_OBJECT (comp->priv->book_view)) {
-		gtk_signal_disconnect (GTK_OBJECT (comp->priv->book_view), comp->priv->card_added_id);
-		gtk_signal_disconnect (GTK_OBJECT (comp->priv->book_view), comp->priv->seq_complete_id);
-		gtk_object_unref (GTK_OBJECT (comp->priv->book_view));
-	}
-
-	g_free (comp->priv->query_text);
-	g_free (comp->priv->pending_query_text);
-
-	g_free (comp->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (object);
-}
-
-/*
- *
- *  EBook/EBookView Callbacks
- *
- */
-
-static void
-e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (user_data);
-
-	comp->priv->book_view = view;
-	gtk_object_ref (GTK_OBJECT (view));
-
-
-	comp->priv->card_added_id   = gtk_signal_connect (GTK_OBJECT (view),
-							  "card_added",
-							  GTK_SIGNAL_FUNC (e_select_names_completion_card_added_cb),
-							  comp);
-	comp->priv->seq_complete_id = gtk_signal_connect (GTK_OBJECT (view),
-							  "sequence_complete",
-							  GTK_SIGNAL_FUNC (e_select_names_completion_seq_complete_cb),
-							  comp);
-}
-
-static void
-e_select_names_completion_card_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (user_data);
-	
-	if (comp->priv->cancelled)
-		return;
-
-	while (cards) {
-		ECard *card = E_CARD (cards->data);
-
-		if (card->email) {
-			gint i;
-			for (i=0; i<e_list_length (card->email); ++i) {
-				EDestination *dest = e_destination_new ();
-				gchar *match_text;
-				double score = -1;
-				
-				e_destination_set_card (dest, card, i);
-				
-				match_text = book_query_score (comp, dest, &score);
-				if (match_text && score > 0) {
-					
-					e_completion_found_match_full (E_COMPLETION (comp), match_text, score, dest,
-								       (GtkDestroyNotify) gtk_object_unref);
-				} else {
-					gtk_object_unref (GTK_OBJECT (dest));
-				}
-				g_free (match_text);
-			}
-		}
-			
-		cards = g_list_next (cards);
-	}
-}
-
-static void
-e_select_names_completion_seq_complete_cb (EBookView *book_view, gpointer user_data)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (user_data);
-
-	gtk_signal_disconnect (GTK_OBJECT (comp->priv->book_view), comp->priv->card_added_id);
-	gtk_signal_disconnect (GTK_OBJECT (comp->priv->book_view), comp->priv->seq_complete_id);
-	gtk_object_unref (GTK_OBJECT (comp->priv->book_view));
-
-	comp->priv->book_view = NULL;
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	if (out)
-		fprintf (out, "ending search ");
-	if (out && !e_completion_searching (E_COMPLETION (comp)))
-		fprintf (out, "while not searching!");
-	if (out)
-		fprintf (out, "\n");
-	e_completion_end_search (E_COMPLETION (comp)); /* That's all folks! */
-
-	/* Need to launch a new completion if another one is pending. */
-	e_select_names_completion_do_query (comp);
-}
-
-/*
- *
- *  Completion Callbacks
- *
- */
-
-static void
-e_select_names_completion_do_query (ESelectNamesCompletion *comp)
-{
-	gchar *sexp;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	/* Wait until we are ready... */
-	if (! comp->priv->book_ready) 
-		return;
-
-	if (comp->priv->query_text) 
-		return;
-
-	if (comp->priv->pending_query_text == NULL) 
-		return;
-
-
-	comp->priv->query_text = comp->priv->pending_query_text;
-	comp->priv->pending_query_text = NULL;
-
-	sexp = book_query_sexp (comp);
-
-	if (sexp == NULL || *sexp == '\0') {
-		g_free (sexp);
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = NULL;
-		return;
-	}
-
-	comp->priv->cancelled = FALSE;
-
-	if (out)
-		fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text);
-
-	if (! e_book_get_book_view (comp->priv->book, sexp, e_select_names_completion_got_book_view_cb, comp)) {
-		g_warning ( "exception getting book view");
-		return;
-	}
-	g_free (sexp);
-	
-}
-
-typedef struct _SearchOverride SearchOverride;
-struct _SearchOverride {
-	const gchar *trigger;
-	const gchar *text[4];
-};
-static SearchOverride override[] = { 
-	{ "easter egg", { "This is the sample", "Easter Egg text for", "Evolution.", NULL } },
-	{ NULL, { NULL } } };
-
-static gboolean
-search_override_check (SearchOverride *over, const gchar *text)
-{
-	if (over == NULL || text == NULL)
-		return FALSE;
-
-	return !g_strcasecmp (over->trigger, text);
-}
-
-static void
-e_select_names_completion_begin (ECompletion *comp, const gchar *text, gint pos, gint limit)
-{
-	ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp);
-	const gchar *str;
-	gint index, j;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (text != NULL);
-	
-	if (out) {
-		fprintf (out, "\n\n**** requesting completion\n");
-		fprintf (out, "text=\"%s\" pos=%d limit=%d\n", text, pos, limit);
-	}
-
-	e_select_names_model_text_pos (selcomp->priv->model, pos, &index, NULL, NULL);
-	str = index >= 0 ? e_select_names_model_get_string (selcomp->priv->model, index) : NULL;
-
-	if (out)
-		fprintf (out, "index=%d str=\"%s\"\n", index, str);
-
-	if (str == NULL || *str == '\0') {
-		if (out)
-			fprintf (out, "aborting empty query\n");
-		e_completion_end_search (comp);
-		return;
-	}
-
-	for (j=0; override[j].trigger; ++j) {
-		if (search_override_check (&(override[j]), str)) {
-			gint k;
-
-			for (k=0; override[j].text[k]; ++k)
-				e_completion_found_match (comp, override[j].text[k]);
-			
-			if (out)
-				fprintf (out, "aborting on override \"%s\"\n", override[j].trigger);
-			e_completion_end_search (comp);
-			return;
-		}
-	}
-		    
-	
-	g_free (selcomp->priv->pending_query_text);
-	selcomp->priv->pending_query_text = g_strdup (str);
-
-	e_select_names_completion_do_query (selcomp);
-}
-
-static void
-e_select_names_completion_end (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "completion ended\n");
-}
-
-static void
-e_select_names_completion_cancel (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	E_SELECT_NAMES_COMPLETION (comp)->priv->cancelled = TRUE;
-	
-	if (out)
-		fprintf (out, "completion cancelled\n");
-}
-
-static void
-e_select_names_completion_book_ready (EBook *book, EBookStatus status, ESelectNamesCompletion *comp)
-{
-	comp->priv->book_ready = TRUE;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	/* If query_text is non-NULL, someone tried to start a query before the book was ready.
-	   Now that it is, get started. */
-	if (comp->priv->query_text != NULL)
-		e_select_names_completion_do_query (comp);
-
-	gtk_object_unref (GTK_OBJECT (comp)); /* post-async unref */
-}
-
-
-/*
- *
- *  Our Pseudo-Constructor
- *
- */
-
-ECompletion *
-e_select_names_completion_new (EBook *book, ESelectNamesModel *model)
-{
-	ESelectNamesCompletion *comp;
-
-	g_return_val_if_fail (book == NULL || E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (model, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	comp = (ESelectNamesCompletion *) gtk_type_new (e_select_names_completion_get_type ());
-
-	if (book == NULL) {
-		gchar *filename, *uri;
-
-		comp->priv->book = e_book_new ();
-		gtk_object_ref (GTK_OBJECT (comp->priv->book));
-		gtk_object_sink (GTK_OBJECT (comp->priv->book));
-
-		filename = gnome_util_prepend_user_home ("evolution/local/Contacts/addressbook.db");
-		uri = g_strdup_printf ("file://%s", filename);
-		
-		comp->priv->book_ready = FALSE;
-		gtk_object_ref (GTK_OBJECT (comp)); /* ref ourself before our async call */
-		e_book_load_uri (comp->priv->book, uri, (EBookCallback) e_select_names_completion_book_ready, comp);
-		
-		g_free (filename);
-		g_free (uri);
-	} else {
-		
-		comp->priv->book = book;
-		gtk_object_ref (GTK_OBJECT (comp->priv->book));
-		comp->priv->book_ready = TRUE;
-	}
-		
-	comp->priv->model = model;
-	gtk_object_ref (GTK_OBJECT (model));
-
-	return E_COMPLETION (comp);
-}
-
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
deleted file mode 100644
index 1f3de5ea3d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of 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_SELECT_NAMES_COMPLETION_H
-#define E_SELECT_NAMES_COMPLETION_H
-
-#include <gal/e-text/e-completion.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-model.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_SELECT_NAMES_COMPLETION_TYPE        (e_select_names_completion_get_type ())
-#define E_SELECT_NAMES_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletion))
-#define E_SELECT_NAMES_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletionClass))
-#define E_IS_SELECT_NAMES_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_SELECT_NAMES_COMPLETION_TYPE))
-#define E_IS_SELECT_NAMES_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECT_NAMES_COMPLETION_TYPE))
-
-typedef struct _ESelectNamesCompletion ESelectNamesCompletion;
-typedef struct _ESelectNamesCompletionClass ESelectNamesCompletionClass;
-struct _ESelectNamesCompletionPrivate;
-
-struct _ESelectNamesCompletion {
-	ECompletion parent;
-
-	struct _ESelectNamesCompletionPrivate *priv;
-};
-
-struct _ESelectNamesCompletionClass {
-	ECompletionClass parent_class;
-
-};
-
-GtkType e_select_names_completion_get_type (void);
-
-ECompletion *e_select_names_completion_new (EBook *, ESelectNamesModel *);
-
-END_GNOME_DECLS
-
-#endif /* E_SELECT_NAMES_COMPLETION_H */
-
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
deleted file mode 100644
index 1b97172f9e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "e-select-names-bonobo.h"
-
-#include "e-select-names-factory.h"
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	return BONOBO_OBJECT (e_select_names_bonobo_new ());
-}
-
-
-gboolean
-e_select_names_factory_init (void)
-{
-	if (factory != NULL)
-		return TRUE;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		return FALSE;
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h
deleted file mode 100644
index f65d5aaa9e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index e1c8d80276..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names.h"
-#include "e-select-names-completion.h"
-#include <gal/e-text/e-entry.h>
-#include <addressbook/backend/ebook/e-destination.h>
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_destroy (GtkObject *object);
-static void e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-/**
- * e_select_names_manager_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesManager class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesManager class.
- **/
-GtkType
-e_select_names_manager_get_type (void)
-{
-	static GtkType manager_type = 0;
-
-	if (!manager_type) {
-		GtkTypeInfo manager_info = {
-			"ESelectNamesManager",
-			sizeof (ESelectNamesManager),
-			sizeof (ESelectNamesManagerClass),
-			(GtkClassInitFunc) e_select_names_manager_class_init,
-			(GtkObjectInitFunc) e_select_names_manager_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		manager_type = gtk_type_unique (gtk_object_get_type (), &manager_info);
-	}
-
-	return manager_type;
-}
-
-/**
- * e_select_names_manager_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesManager that wraps the @VCard.
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));
-	return manager;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesManager::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_select_names_manager_destroy;
-	object_class->get_arg = e_select_names_manager_get_arg;
-	object_class->set_arg = e_select_names_manager_set_arg;
-}
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	gtk_object_unref(GTK_OBJECT(manager->sections));
-	gtk_object_unref(GTK_OBJECT(manager->entries));
-}
-
-
-/* Set_arg handler for the manager */
-static void
-e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the manager */
-static void
-e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void *
-section_copy(const void *sec, void *data)
-{
-	const ESelectNamesManagerSection *section = sec;
-	ESelectNamesManagerSection *newsec;
-	
-	newsec = g_new(ESelectNamesManagerSection, 1);
-	newsec->id = g_strdup(section->id);
-	newsec->title = g_strdup(section->title);
-	newsec->model = section->model;
-	if (newsec->model)
-		gtk_object_ref(GTK_OBJECT(newsec->model));
-	return newsec;
-}
-
-static void
-section_free(void *sec, void *data)
-{
-	ESelectNamesManagerSection *section = sec;
-	g_free(section->id);
-	g_free(section->title);
-	if (section->model)
-		gtk_object_unref(GTK_OBJECT(section->model));
-	g_free(section);
-}
-
-static void *
-entry_copy(const void *ent, void *data)
-{
-	const ESelectNamesManagerEntry *entry = ent;
-	ESelectNamesManagerEntry *newent;
-	
-	newent = g_new(ESelectNamesManagerEntry, 1);
-	newent->id = g_strdup(entry->id);
-	newent->entry = entry->entry;
-	if (newent->entry)
-		gtk_object_ref(GTK_OBJECT(newent->entry));
-	return newent;
-}
-
-static void
-entry_free(void *ent, void *data)
-{
-	ESelectNamesManagerEntry *entry = ent;
-	g_free(entry->id);
-	if (entry->entry)
-		gtk_object_unref(GTK_OBJECT(entry->entry));
-	g_free(entry);
-}
-
-/**
- * e_select_names_manager_init:
- */
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = e_list_new(section_copy, section_free, manager);
-	manager->entries  = e_list_new(entry_copy, entry_free, manager);
-}
-
-void
-e_select_names_manager_add_section (ESelectNamesManager *manager,
-				    const char *id,
-				    const char *title)
-{
-	ESelectNamesManagerSection *section;
-	
-	section = g_new(ESelectNamesManagerSection, 1);
-	section->id = g_strdup(id);
-	section->title = g_strdup(title);
-	section->model = e_select_names_model_new();
-	e_list_append(manager->sections, section);
-	section_free(section, manager);
-}
-
-ESelectNamesModel *
-e_select_names_manager_get_source (ESelectNamesManager *manager, const char *id)
-{
-	EIterator *iterator;
-
-	g_return_val_if_fail (manager && E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id, NULL);
-
-	iterator = e_list_get_iterator (manager->sections);
-	for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get (iterator);
-		if (!strcmp (section->id, id)) {
-			return section->model;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-entry_destroyed(EEntry *entry, ESelectNamesManager *manager)
-{
-	if(!GTK_OBJECT_DESTROYED(manager)) {
-		EIterator *iterator = e_list_get_iterator(manager->entries);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerEntry *this_entry = e_iterator_get(iterator);
-			if(entry == this_entry->entry) {
-				e_iterator_delete(iterator);
-				break;
-			}
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(manager));
-}
-
-static void
-completion_handler (EEntry *entry, const gchar *text, gpointer user_data)
-{
-	ESelectNamesModel *snm;
-	EDestination *dest;
-	gint i, pos, start_pos, len;
-
-	if (user_data == NULL)
-		return;
-
-	snm = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (entry), "select_names_model"));
-	dest = E_DESTINATION (user_data);
-
-	/* Sometimes I really long for garbage collection.  Reference
-           counting makes you feel 31337, but sometimes it is just a
-           bitch. */
-	gtk_object_ref (GTK_OBJECT (dest));
-
-	pos = e_entry_get_position (entry);
-	e_select_names_model_text_pos (snm, pos, &i, NULL, NULL);
-	e_select_names_model_replace (snm, i, dest);
-	e_select_names_model_name_pos (snm, i, &start_pos, &len);
-	e_entry_set_position (entry, start_pos+len);
-}
-
-GtkWidget *
-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)
-{
-	ETextModel *model;
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-			EEntry *eentry;
-			ECompletion *comp;
-
-			eentry = E_ENTRY (e_entry_new ());
-			gtk_object_set_data (GTK_OBJECT (eentry), "select_names_model", section->model);
-			
-			entry = g_new (ESelectNamesManagerEntry, 1);
-			entry->entry = eentry;
-			entry->id = (char *)id;
-
-			model = e_select_names_text_model_new (section->model);
-			e_list_append (manager->entries, entry);
-			g_free(entry);
-
-			comp = e_select_names_completion_new (NULL, section->model); /* NULL == use local addressbook */
-			e_entry_enable_completion_full (eentry, comp, 50, completion_handler);
-
-			gtk_object_set(GTK_OBJECT(eentry),
-				       "model", model,
-				       "editable", TRUE,
-				       "use_ellipsis", TRUE,
-				       "allow_newlines", FALSE,
-				       NULL);
-			gtk_signal_connect(GTK_OBJECT(eentry), "destroy",
-					   GTK_SIGNAL_FUNC(entry_destroyed), manager);
-			gtk_object_ref(GTK_OBJECT(manager));
-			return GTK_WIDGET(eentry);
-		}
-	}
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	switch(button) {
-	case 0: {
-		EList *list = manager->sections;
-		EIterator *iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerSection *section = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, section->id);
-			if (section->model)
-				gtk_object_unref(GTK_OBJECT(section->model));
-			section->model = source;
-			/* Don't ref because get_source returns a conceptual ref_count of 1. */
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		list = manager->entries;
-		iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerEntry *entry = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, entry->id);
-			if (source) {
-				ETextModel *model = e_select_names_text_model_new(source);
-				if (model) {
-					gtk_object_set(GTK_OBJECT(entry->entry),
-						       "model", model,
-						       NULL);
-					gtk_object_unref(GTK_OBJECT(source));
-				}
-				gtk_object_unref(GTK_OBJECT(model));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		break;
-	}
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-void
-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					const char *id)
-{
-	EIterator *iterator;
-	
-	if (manager->names) {
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		e_select_names_set_default(manager->names, id);
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-	} else {
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		iterator = e_list_get_iterator(manager->sections);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section->model);
-			e_select_names_add_section(manager->names, section->id, section->title, newmodel);
-			gtk_object_unref(GTK_OBJECT(newmodel));
-		}
-		e_select_names_set_default(manager->names, id);
-		gtk_signal_connect(GTK_OBJECT(manager->names), "clicked",
-				   GTK_SIGNAL_FUNC(e_select_names_clicked), manager);
-		gtk_signal_connect(GTK_OBJECT(manager->names), "destroy",
-				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), 
-				   &manager->names);
-		gtk_widget_show(GTK_WIDGET(manager->names));
-	}
-}
-
-#if 0
-/* Of type ECard */
-EList *
-e_select_names_manager_get_cards (ESelectNamesManager *manager,
-				  const char *id)
-{
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			return e_select_names_model_get_cards(section->model);
-		}
-	}
-	return NULL;
-}
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
deleted file mode 100644
index 7b68528669..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MANAGER_H__
-#define __E_SELECT_NAMES_MANAGER_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include "e-select-names.h"
-
-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())
-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))
-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))
-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))
-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))
-
-typedef struct _ESelectNamesManager ESelectNamesManager;
-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;
-
-struct _ESelectNamesManager {
-	GtkObject object;
-	
-	EList *sections;
-	EList *entries;
-
-	ESelectNames *names;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-};
-
-ESelectNamesManager *e_select_names_manager_new               (void);
-void                 e_select_names_manager_add_section       (ESelectNamesManager *manager,
-							       const char *id,
-							       const char *title);
-ESelectNamesModel   *e_select_names_manager_get_source        (ESelectNamesManager *manager,
-							       const char *id);
-GtkWidget           *e_select_names_manager_create_entry      (ESelectNamesManager *manager,
-							       const char *id);
-void                 e_select_names_manager_activate_dialog   (ESelectNamesManager *manager,
-							       const char *id);
-
-#if 0
-/* Of type ECard */
-EList               *e_select_names_manager_get_cards         (ESelectNamesManager *manager,
-							       const char *id);
-#endif
-
-/* Standard Gtk function */			      
-GtkType              e_select_names_manager_get_type          (void);
-
-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
deleted file mode 100644
index e663768c21..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbidge   <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkmarshal.h>
-
-#include "e-select-names-model.h"
-#include <gal/util/e-util.h>
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define SEPARATOR ", "
-#define SEPLEN    2
-
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	E_SELECT_NAMES_MODEL_RESIZED,
-	E_SELECT_NAMES_MODEL_LAST_SIGNAL
-};
-
-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-enum {
-	NAME_DATA_BLANK,
-	NAME_DATA_CARD,
-	NAME_DATA_STRING
-};
-
-enum {
-	NAME_FORMAT_GIVEN_FIRST,
-	NAME_FORMAT_FAMILY_FIRST
-};
-
-struct _ESelectNamesModelPrivate {
-	gchar *id;
-	gchar *title;
-
-	GList *data;  /* of EDestination */
-	gchar *text;
-	gchar *addr_text;
-};
-
-
-static void e_select_names_model_init (ESelectNamesModel *model);
-static void e_select_names_model_class_init (ESelectNamesModelClass *klass);
-
-static void e_select_names_model_destroy (GtkObject *object);
-static void e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-GtkType
-e_select_names_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesModel",
-			sizeof (ESelectNamesModel),
-			sizeof (ESelectNamesModelClass),
-			(GtkClassInitFunc) e_select_names_model_class_init,
-			(GtkObjectInitFunc) e_select_names_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (gtk_object_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_INT) (GtkObject *object, gint arg1, gint arg2, gint arg3, gpointer user_data);
-static void
-local_gtk_marshal_NONE__INT_INT_INT (GtkObject    *object, 
-				     GtkSignalFunc func, 
-				     gpointer      func_data, 
-				     GtkArg       *args)
-{
-	GtkSignal_NONE__INT_INT_INT rfunc;
-	rfunc = (GtkSignal_NONE__INT_INT_INT) func;
-	(* rfunc) (object,
-		   GTK_VALUE_INT(args[0]),
-		   GTK_VALUE_INT(args[1]),
-		   GTK_VALUE_INT(args[2]),
-		   func_data);
-}
-
-
-static void
-e_select_names_model_class_init (ESelectNamesModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED] =
-		gtk_signal_new ("resized",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, resized),
-				local_gtk_marshal_NONE__INT_INT_INT,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_select_names_model_signals, E_SELECT_NAMES_MODEL_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ESelectNamesModel::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	klass->changed = NULL;
-
-	object_class->destroy = e_select_names_model_destroy;
-	object_class->get_arg = e_select_names_model_get_arg;
-	object_class->set_arg = e_select_names_model_set_arg;
-}
-
-/**
- * e_select_names_model_init:
- */
-static void
-e_select_names_model_init (ESelectNamesModel *model)
-{
-	model->priv = g_new0 (struct _ESelectNamesModelPrivate, 1);
-}
-
-static void
-e_select_names_model_destroy (GtkObject *object)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL (object);
-	
-	g_free (model->priv->title);
-	g_free (model->priv->id);
-
-	g_list_foreach (model->priv->data, (GFunc) gtk_object_unref, NULL);
-	g_list_free (model->priv->data);
-
-	g_free (model->priv->text);
-	g_free (model->priv->addr_text);
-
-	g_free (model->priv);
-
-}
-
-
-/* Set_arg handler for the model */
-static void
-e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-	
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model;
-	model = E_SELECT_NAMES_MODEL (gtk_type_new (e_select_names_model_get_type ()));
-	return model;
-}
-
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	GList *iter;
-
-	model->priv->id = g_strdup (old->priv->id);
-	model->priv->title = g_strdup (old->priv->title);
-	
-	for (iter = old->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dup = e_destination_copy (E_DESTINATION (iter->data));
-		model->priv->data = g_list_append (model->priv->data, dup);
-	}
-
-	return model;
-}
-
-const gchar *
-e_select_names_model_get_textification (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->text == NULL) {
-
-		if (model->priv->data == NULL) {
-			
-			model->priv->text = g_strdup ("");
-
-		} else {
-			gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-			gint i = 0;
-			GList *iter = model->priv->data;
-			
-			while (iter) {
-				EDestination *dest = E_DESTINATION (iter->data);
-				strv[i] = (gchar *) e_destination_get_string (dest);
-				if (strv[i] == NULL)
-					strv[i] = "";
-				++i;
-				iter = g_list_next (iter);
-			}
-
-			model->priv->text = g_strjoinv (SEPARATOR, strv);
-			
-			g_free (strv);
-		}
-	}
-
-	return model->priv->text;
-}
-
-const gchar *
-e_select_names_model_get_address_text (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->addr_text == NULL) {
-
-		if (model->priv->data == NULL) {
-
-			model->priv->addr_text = g_strdup ("");
-
-		} else {
-			gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-			gint i = 0;
-			GList *iter = model->priv->data;
-
-			while (iter) {
-				EDestination *dest = E_DESTINATION (iter->data);
-				strv[i] = (gchar *) e_destination_get_email_verbose (dest);
-				if (strv[i])
-					++i;
-				iter = g_list_next (iter);
-			}
-
-			model->priv->addr_text = g_strjoinv (SEPARATOR, strv);
-
-			g_free (strv);
-		}
-	}
-
-	return model->priv->addr_text;
-}
-
-gint
-e_select_names_model_count (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return g_list_length (model->priv->data);
-}
-
-const EDestination *
-e_select_names_model_get_destination (ESelectNamesModel *model, gint index)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	return E_DESTINATION (g_list_nth_data (model->priv->data, index));
-}
-
-ECard *
-e_select_names_model_get_card (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	return dest ? e_destination_get_card (dest) : NULL;
-
-}
-
-const gchar *
-e_select_names_model_get_string (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	
-	return dest ? e_destination_get_string (dest) : "";
-}
-
-static void
-e_select_names_model_changed (ESelectNamesModel *model)
-{
-	g_free (model->priv->text);
-	model->priv->text = NULL;
-	
-	g_free (model->priv->addr_text);
-	model->priv->addr_text = NULL;
-
-	gtk_signal_emit(GTK_OBJECT(model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-}
-
-void
-e_select_names_model_insert (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index <= g_list_length (model->priv->data));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	model->priv->data = g_list_insert (model->priv->data, dest, index);
-	
-	gtk_object_ref (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	GList *node;
-	gint old_strlen=0, new_strlen=0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->data == NULL || (0 <= index && index < g_list_length (model->priv->data)));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	new_strlen = e_destination_get_strlen (dest);
-
-	if (model->priv->data == NULL) {
-		model->priv->data = g_list_append (model->priv->data, dest);
-	} else {
-		
-		node = g_list_nth (model->priv->data, index);
-
-		if (node->data != dest) {
-			old_strlen = e_destination_get_strlen (E_DESTINATION (node->data));
-
-			gtk_object_unref (GTK_OBJECT (node->data));
-
-			node->data = dest;
-			gtk_object_ref (GTK_OBJECT (dest));
-			gtk_object_sink (GTK_OBJECT (dest));
-		}
-	}
-
-	e_select_names_model_changed (model);
-
-	gtk_signal_emit (GTK_OBJECT (model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED],
-			 index, old_strlen, new_strlen);
-}
-
-void
-e_select_names_model_delete (ESelectNamesModel *model, gint index)
-{
-	GList *node;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-	
-	node = g_list_nth (model->priv->data, index);
-	gtk_object_unref (GTK_OBJECT (node->data));
-
-	model->priv->data = g_list_remove_link (model->priv->data, node);
-	g_list_free_1 (node);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_delete_all (ESelectNamesModel *model)
-{
-	g_return_if_fail (model != NULL);
-
-	g_list_foreach (model->priv->data, (GFunc) gtk_object_unref, NULL);
-	g_list_free (model->priv->data);
-	model->priv->data = NULL;
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length)
-{
-	gint rp = 0, i, len = 0;
-	GList *iter;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	i = 0;
-	iter = model->priv->data;
-	while (iter && i <= index) {
-		rp += len + (i > 0 ? SEPLEN : 0);
-		len = e_destination_get_strlen (E_DESTINATION (iter->data));
-		++i;
-		iter = g_list_next (iter);
-	}
-	
-	if (i <= index) {
-		rp = -1;
-		len = 0;
-	}
-	
-	if (pos)
-		*pos = rp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_text_pos (ESelectNamesModel *model, gint pos, gint *index, gint *start_pos, gint *length)
-{
-	GList *iter;
-	gint len = 0, i = 0, sp = 0, adj = 0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	iter = model->priv->data;
-
-	while (iter != NULL) {
-		len = e_destination_get_strlen (E_DESTINATION (iter->data));
-
-		if (sp <= pos && pos <= sp + len + adj)
-			break;
-
-		sp += len + adj + 1;
-		adj = 1;
-		++i;
-
-		iter = g_list_next (iter);
-	}
-
-	if (i != 0)
-		++sp; /* skip past "magic space" */
-
-	if (iter == NULL) {
-		i = -1;
-		sp = -1;
-		len = 0;
-	}
-
-	if (index)
-		*index = i;
-	if (start_pos)
-		*start_pos = sp;
-	if (length)
-		*length = len;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
deleted file mode 100644
index 4b3413f983..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MODEL_H__
-#define __E_SELECT_NAMES_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-destination.h>
-
-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
-#define E_SELECT_NAMES_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))
-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))
-#define E_IS_SELECT_NAMES_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))
-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))
-
-typedef struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-struct _ESelectNamesModelPrivate;
-
-struct _ESelectNamesModel {
-	GtkObject object;
-	
-	struct _ESelectNamesModelPrivate *priv;
-};
-
-struct _ESelectNamesModelClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-	void (*resized) (ESelectNamesModel *model, gint index, gint old_len, gint new_len);
-};
-
-GtkType e_select_names_model_get_type  (void);
-
-ESelectNamesModel *e_select_names_model_new       (void);
-ESelectNamesModel *e_select_names_model_duplicate (ESelectNamesModel *old);
-
-const gchar  *e_select_names_model_get_textification (ESelectNamesModel *model);
-const gchar  *e_select_names_model_get_address_text  (ESelectNamesModel *model);
-
-gint                e_select_names_model_count           (ESelectNamesModel *model);
-const EDestination *e_select_names_model_get_destination (ESelectNamesModel *model, gint index);
-ECard              *e_select_names_model_get_card        (ESelectNamesModel *model, gint index);
-const gchar        *e_select_names_model_get_string      (ESelectNamesModel *model, gint index);
-
-void          e_select_names_model_insert     (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_replace    (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_delete     (ESelectNamesModel *model, gint index);
-void          e_select_names_model_delete_all (ESelectNamesModel *model);
-
-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length);
-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint pos, gint *index, gint *start_pos, gint *length);
-
-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
deleted file mode 100644
index 7b0e27195b..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <gal/util/e-util.h>
-#include "e-select-names-table-model.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_table_model_init       (ESelectNamesTableModel *model);
-static void e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass);
-
-static void e_select_names_table_model_destroy    (GtkObject *object);
-static void e_select_names_table_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_table_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,
-						      ESelectNamesTableModel *model);
-
-
-static void
-e_select_names_table_model_add_source (ESelectNamesTableModel *model,
-				       ESelectNamesModel     *source)
-{
-	model->source = source;
-	if (model->source)
-		gtk_object_ref(GTK_OBJECT(model->source));
-	model->source_changed_id = gtk_signal_connect(GTK_OBJECT(model->source), "changed",
-						      GTK_SIGNAL_FUNC(e_select_names_table_model_model_changed),
-						      model);
-}
-
-static void
-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)
-{
-	if (model->source_changed_id)
-		gtk_signal_disconnect(GTK_OBJECT(model->source), model->source_changed_id);
-	if (model->source)
-		gtk_object_unref(GTK_OBJECT(model->source));
-	model->source = NULL;
-	model->source_changed_id = 0;
-}
-
-/**
- * e_select_names_table_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTableModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTableModel class.
- **/
-GtkType
-e_select_names_table_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTableModel",
-			sizeof (ESelectNamesTableModel),
-			sizeof (ESelectNamesTableModelClass),
-			(GtkClassInitFunc) e_select_names_table_model_class_init,
-			(GtkObjectInitFunc) e_select_names_table_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (e_table_model_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/**
- * e_select_names_table_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesTableModel that wraps the @VCard.
- */
-ETableModel *
-e_select_names_table_model_new (ESelectNamesModel *source)
-{
-	ETableModel *model = E_TABLE_MODEL(gtk_type_new(e_select_names_table_model_get_type()));
-	gtk_object_set(GTK_OBJECT(model),
-		       "source", source,
-		       NULL);
-	return model;
-}
-
-static void
-fill_in_info (ESelectNamesTableModel *model)
-{
-	if (model->source) {
-		int count = e_select_names_model_count (model->source);
-		gint i;
-
-		model->count = count;
-		model->data = g_new(ESelectNamesTableModelData, count);
-
-		for (i = 0; i < count; ++i) {
-			const EDestination *dest = e_select_names_model_get_destination (model->source, i);
-			ECard *card = dest ? e_destination_get_card (dest) : NULL;
-
-			if (card) {
-				ECardSimple *simple = e_card_simple_new(card);
-				model->data[i].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-				if ((model->data[i].name == 0) || *model->data[i].name == 0) {
-					model->data[i].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-				}
-				if (model->data[i].name == 0)
-					model->data[i].name = g_strdup("");
-				model->data[i].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-				if (model->data[i].email == 0)
-					model->data[i].email = g_strdup("");
-				gtk_object_unref(GTK_OBJECT(simple));
-			} else {
-				model->data[i].name =  g_strdup (e_destination_get_string (dest));
-				model->data[i].email = g_strdup (model->data[i].name);
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	int i;
-	for (i = 0; i < model->count; i++) {
-		g_free(model->data[i].name);
-		g_free(model->data[i].email);
-	}
-	g_free(model->data);
-	model->data = NULL;
-	model->count = -1;
-}
-
-/*
- * ESelectNamesTableModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_table_model_destroy (GtkObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_select_names_table_model_row_count (ETableModel *etc)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->count == -1) {
-		if (e_select_names_table_model->source) {
-			fill_in_info(e_select_names_table_model);
-		} else {
-			return 0;
-		}
-	}
-	return e_select_names_table_model->count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->data == NULL) {
-		fill_in_info(e_select_names_table_model);
-	}
-	switch (col) {
-	case 0:
-		if (e_select_names_table_model->data[row].name == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].name;
-		break;
-	case 1:
-		if (e_select_names_table_model->data[row].email == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].email;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_table_model_init:
- */
-static void
-e_select_names_table_model_init (ESelectNamesTableModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-
-	model->count = -1;
-	model->data = NULL;
-}
-
-static void
-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_table_model_destroy;
-	object_class->get_arg = e_select_names_table_model_get_arg;
-	object_class->set_arg = e_select_names_table_model_set_arg;
-
-	table_model_class->column_count = e_select_names_table_model_col_count;
-	table_model_class->row_count = e_select_names_table_model_row_count;
-	table_model_class->value_at = e_select_names_table_model_value_at;
-	table_model_class->set_value_at = e_select_names_table_model_set_value_at;
-	table_model_class->is_cell_editable = e_select_names_table_model_is_cell_editable;
-	table_model_class->duplicate_value = e_select_names_table_model_duplicate_value;
-	table_model_class->free_value = e_select_names_table_model_free_value;
-	table_model_class->initialize_value = e_select_names_table_model_initialize_value;
-	table_model_class->value_is_empty = e_select_names_table_model_value_is_empty;
-	table_model_class->value_to_string = e_select_names_table_model_value_to_string;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
deleted file mode 100644
index 7a051d337c..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__
-#define __E_SELECT_NAMES_TABLE_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-table/e-table-model.h>
-
-#define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())
-#define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))
-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-
-typedef struct {
-	char *name;
-	char *email;
-} ESelectNamesTableModelData;
-
-typedef struct _ESelectNamesTableModel ESelectNamesTableModel;
-typedef struct _ESelectNamesTableModelClass ESelectNamesTableModelClass;
-
-struct _ESelectNamesTableModel {
-	ETableModel parent;
-
-	ESelectNamesModel *source;
-	int source_changed_id;
-
-	int count;
-	ESelectNamesTableModelData *data; /* This is used as an array. */
-};
-
-struct _ESelectNamesTableModelClass {
-	ETableModelClass parent_class;
-};
-
-ETableModel *e_select_names_table_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_table_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TABLE_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
deleted file mode 100644
index 62e1676d20..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,698 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <gtk/gtk.h>
-
-#include <gal/e-text/e-text-model-repos.h>
-#include <addressbook/contact-editor/e-contact-editor.h>
-#include "e-select-names-text-model.h"
-
-static FILE *out = NULL; /* stream for debugging spew */
-
-#define SEPLEN 2
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);
-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);
-static void e_select_names_text_model_destroy    (GtkObject *object);
-static void e_select_names_text_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_text_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_select_names_text_model_set_source (ESelectNamesTextModel *model, ESelectNamesModel *source);
-
-static const gchar *e_select_names_text_model_get_text      (ETextModel *model);
-static void         e_select_names_text_model_set_text      (ETextModel *model, const gchar *text);
-static void         e_select_names_text_model_insert        (ETextModel *model, gint position, const gchar *text);
-static void         e_select_names_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);
-static void         e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static gint         e_select_names_text_model_obj_count   (ETextModel *model);
-static const gchar *e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len);
-static void         e_select_names_text_model_activate_obj (ETextModel *model, gint n);
-
-
-ETextModelClass *parent_class;
-#define PARENT_TYPE e_text_model_get_type()
-
-/**
- * e_select_names_text_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTextModel class.
- **/
-GtkType
-e_select_names_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTextModel",
-			sizeof (ESelectNamesTextModel),
-			sizeof (ESelectNamesTextModelClass),
-			(GtkClassInitFunc) e_select_names_text_model_class_init,
-			(GtkObjectInitFunc) e_select_names_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (PARENT_TYPE, &model_info);
-	}
-
-	return model_type;
-}
-
-static void
-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *text_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	text_model_class = E_TEXT_MODEL_CLASS(klass);
-
-	parent_class = gtk_type_class(PARENT_TYPE);
-
-	gtk_object_add_arg_type ("ESelectNamesTextModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_text_model_destroy;
-	object_class->get_arg = e_select_names_text_model_get_arg;
-	object_class->set_arg = e_select_names_text_model_set_arg;
-
-	text_model_class->get_text      = e_select_names_text_model_get_text;
-	text_model_class->set_text      = e_select_names_text_model_set_text;
-	text_model_class->insert        = e_select_names_text_model_insert;
-	text_model_class->insert_length = e_select_names_text_model_insert_length;
-	text_model_class->delete        = e_select_names_text_model_delete;
-
-	text_model_class->obj_count     = e_select_names_text_model_obj_count;
-	text_model_class->get_nth_obj   = e_select_names_text_model_get_nth_obj;
-	text_model_class->object_activated = e_select_names_text_model_activate_obj;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_TEXT_MODEL")) {
-		out = fopen ("/tmp/evo-debug-select-names-text-model", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-dump_model (ESelectNamesTextModel *text_model)
-{
-	ESelectNamesModel *model = text_model->source;
-	gint i;
-
-	if (out == NULL)
-		return;
-
-	fprintf (out, "\n*** Model State: count=%d\n", e_select_names_model_count (model));
-
-	for (i=0; i<e_select_names_model_count (model); ++i)
-		fprintf (out, "[%d] \"%s\" %s\n", i,
-			 e_select_names_model_get_string (model, i),
-			 e_select_names_model_get_card (model, i) ? "<card>" : "");
-	fprintf (out, "\n");
-}
-
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-}
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-	
-	e_select_names_text_model_set_source (model, NULL);
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-static void
-e_select_names_text_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_text_model_set_source(model, E_SELECT_NAMES_MODEL (GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-static void
-e_select_names_text_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-resize_cb (ESelectNamesModel *source, gint index, gint old_len, gint new_len, ETextModel *model)
-{
-	EReposDeleteShift repos_del;
-	EReposInsertShift repos_ins;
-	gint pos;
-
-	e_select_names_model_name_pos (source, index, &pos, NULL);
-
-	if (new_len < old_len) {
-
-		repos_del.model = model;
-		repos_del.pos = pos;
-		repos_del.len = old_len - new_len;
-		e_text_model_reposition (model, e_repos_delete_shift, &repos_del);
-
-	} else if (old_len < new_len) {
-
-		repos_ins.model = model;
-		repos_ins.pos = pos;
-		repos_ins.len = new_len - old_len;
-		e_text_model_reposition (model, e_repos_insert_shift, &repos_ins);
-
-	}
-}
-
-
-static void
-e_select_names_text_model_set_source (ESelectNamesTextModel *model,
-				      ESelectNamesModel     *source)
-{
-	if (source == model->source)
-		return;
-	
-	if (model->source) {
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_resize_id);
-		gtk_object_unref (GTK_OBJECT (model->source));
-	}
-
-	model->source = source;
-
-	if (model->source) {
-		gtk_object_ref (GTK_OBJECT (model->source));
-		model->source_changed_id = gtk_signal_connect_object (GTK_OBJECT(model->source),
-								      "changed",
-								      GTK_SIGNAL_FUNC (e_text_model_changed),
-								      GTK_OBJECT (model));
-		model->source_resize_id = gtk_signal_connect (GTK_OBJECT(model->source),
-							      "resized",
-							      GTK_SIGNAL_FUNC (resize_cb),
-							      model);
-	}
-}
-
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = E_TEXT_MODEL (gtk_type_new (e_select_names_text_model_get_type()));
-	e_select_names_text_model_set_source (E_SELECT_NAMES_TEXT_MODEL (model), source);
-	return model;
-}
-
-static const gchar *
-e_select_names_text_model_get_text (ETextModel *model)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	return snm ? e_select_names_model_get_textification (snm->source) : "";
-}
-
-static void
-e_select_names_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	e_select_names_model_delete_all (snm->source);
-	e_select_names_text_model_insert (model, 0, text);
-}
-
-static void
-e_select_names_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{
-	e_select_names_text_model_insert_length (model, position, text, strlen (text));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gchar *text, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));
-
-	if (out) {
-		gchar *tmp = g_strndup (text, length);
-		fprintf (out, ">> insert  \"%s\" (len=%d) at %d\n", tmp, length, pos);
-		g_free (tmp);
-	}
-
-	pos = CLAMP (pos, 0, strlen (e_select_names_model_get_textification (source)));
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-
-	/* We handle this one character at a time. */
-
-	for (i = 0; i < length && text[i]; ++i) {
-		gint index, start_pos, text_len;
-
-		if (out) 
-			fprintf (out, "processing [%c]\n", text[i]);
-
-		e_select_names_model_text_pos (source, pos, &index, &start_pos, &text_len);
-
-		if (out) 
-			fprintf (out, "index=%d start_pos=%d text_len=%d\n", index, start_pos, text_len);
-
-
-		if (text[i] == ',') {
-
-			/* This is the case of hitting , first thing in an empty entry */
-			if (index == -1) {
-				EReposAbsolute repos;
-
-				e_select_names_model_insert (source, 0, e_destination_new ());
-				e_select_names_model_insert (source, 0, e_destination_new ());
-
-				repos.model = model;
-				repos.pos = -1; /* At end */
-				e_text_model_reposition (model, e_repos_absolute, &repos);
-				
-
-			} else if (pos <= start_pos || pos == start_pos + text_len) {
-				EReposInsertShift repos;
-				gint ins_point = index;
-
-				if (text_len != 0 && pos == start_pos + text_len)
-					++ins_point;
-				
-				/* Block adjacent blank cards. */
-				if (! ((ins_point < e_select_names_model_count (source) &&
-					(e_select_names_model_get_string (source, ins_point) == NULL)) 
-				       || (ins_point > 0 && (e_select_names_model_get_string (source, ins_point-1) == NULL)))) {
-
-					e_select_names_model_insert (source, ins_point, e_destination_new ());
-
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = SEPLEN;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				}
-
-			} else {
-				EReposInsertShift repos;
-				gint offset = MAX (pos - start_pos, 0);
-				const gchar *str = e_select_names_model_get_string (source, index);
-				gchar *str1 = g_strndup (str, offset);
-				gchar *str2 = g_strdup (str+offset);
-				EDestination *d1 = e_destination_new (), *d2 = e_destination_new ();
-
-				e_destination_set_string (d1, str1);
-				e_destination_set_string (d2, str2);
-
-				e_select_names_model_replace (source, index, d1);
-				e_select_names_model_insert (source, index+1, d2);
-
-				g_free (str1);
-				g_free (str2);
-
-				repos.model = model;
-				repos.pos = pos;
-				repos.len = SEPLEN;
-				e_text_model_reposition (model, e_repos_insert_shift, &repos);
-			}
-
-		} else {
-			EReposInsertShift repos;
-			gint offset = MAX (pos - start_pos, 0);
-			const gchar *str;
-			gchar *new_str = NULL;
-			gint this_length = 1;
-			gboolean whitespace = isspace ((gint) text[i]);
-
-			str = index >= 0 ? e_select_names_model_get_string (source, index) : NULL;
-			if (str) {
-				if (pos <= start_pos) {
-					if (whitespace) {
-						/* swallow leading whitespace */
-						this_length = 0;
-					} else {
-						/* Adjust for our "magic white space" */
-						new_str = g_strdup_printf("%c%s%s", text[i], pos < start_pos ? " " : "", str);
-						if (pos < start_pos)
-							++this_length;
-					}
-				} else {
-					new_str = g_strdup_printf ("%.*s%c%s", offset, str, text[i], str + offset);
-				}
-			} else {
-				if (whitespace) {
-					/* swallow leading whitespace */
-					this_length = 0;
-				} else {
-					new_str = g_strdup_printf ("%c", text[i]);
-				}
-			}
-
-			if (new_str) {
-
-				EDestination *dest = e_destination_new ();
-				e_destination_set_string (dest, new_str);
-
-				e_select_names_model_replace (source, index, dest);
-
-				if (this_length > 0) {
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = this_length;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				}
-
-				g_free (new_str);
-			}
-					 
-		}
-	}
-
-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));
-
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-}
-
-
-static void
-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint index, start_pos, text_len, offset;
-		
-	if (out) {
-		const gchar *str = e_select_names_model_get_textification (source);
-		gint i, len;
-
-		fprintf (out, ">> delete %d at pos %d\n", length, pos);
-
-		len = strlen (str);
-		for (i=0; i<pos && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "[");
-		for (i=pos; i<pos+length && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "]");
-		for (i=pos+length; i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "\n");
-	}
-
-	if (length < 0)
-		return;
-
-	e_select_names_model_text_pos (source, pos, &index, &start_pos, &text_len);
-
-	if (out) 
-		fprintf (out, "index=%d, start_pos=%d, text_len=%d\n", index, start_pos, text_len);
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-
-	/* First, we handle a few tricky cases. */
-
-	if (pos < start_pos) {
-		EReposAbsolute repos;
-
-		repos.model = model;
-		repos.pos = pos;
-		e_text_model_reposition (model, e_repos_absolute, &repos);
-
-		length -= start_pos - pos;
-
-		if (length > 0)
-			e_select_names_text_model_delete (model, start_pos, length);
-		goto finished;
-	}
-
-	if (pos == start_pos + text_len) {
-		/* We are positioned right at the end of an entry, possibly right in front of a comma. */
-
-		if (index+1 < e_select_names_model_count (source)) {
-			EReposDeleteShift repos;
-			EDestination *new_dest;
-			const gchar *str1 = e_select_names_model_get_string (source, index);
-			const gchar *str2 = e_select_names_model_get_string (source, index+1);
-			gchar *new_str;
-
-			while (str1 && *str1 && isspace ((gint) *str1))
-				++str1;
-			while (str2 && *str2 && isspace ((gint) *str2))
-				++str2;
-			
-			if (str1 && str2)
-				new_str = g_strdup_printf ("%s %s", str1, str2);
-			else if (str1)
-				new_str = g_strdup (str1);
-			else if (str2)
-				new_str = g_strdup (str2);
-			else
-				new_str = g_strdup ("");
-
-			if (out)
-				fprintf (out, "joining \"%s\" and \"%s\" to \"%s\"\n", str1, str2, new_str);
-
-			e_select_names_model_delete (source, index+1);
-
-			new_dest = e_destination_new ();
-			e_destination_set_string (new_dest, new_str);
-			e_select_names_model_replace (source, index, new_dest);
-			g_free (new_str);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = SEPLEN - 1;
-
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			if (length > 1)
-				e_select_names_text_model_delete (model, pos, length-1);
-		} else {
-			/* If we are at the end of the last entry (which we must be if we end up in this block),
-			   we can just do nothing.  So this else-block is here just to give us a place to
-			   put this comment. */
-		}
-
-		goto finished;
-	}
-	
-	if (pos + length > start_pos + text_len) {
-		/* Uh oh... our changes straddle two objects. */
-
-		if (pos == start_pos) { /* Delete the whole thing */
-			EReposDeleteShift repos;
-		
-			e_select_names_model_delete (source, index);
-
-			if (out) 
-				fprintf (out, "deleted all of %d\n", index);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_len + SEPLEN;
-		
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			length -= text_len + SEPLEN;
-			if (length > 0)
-				e_select_names_text_model_delete (model, pos, length);
-
-		} else {
-			/* Delete right up to the end, and then call e_select_names_text_model_delete again
-			   to finish the job. */
-			gint len1, len2;
-			
-			len1 = text_len - (pos - start_pos);
-			len2 = length - len1;
-
-			if (out) 
-				fprintf (out, "two-stage delete: %d, %d\n", len1, len2);
-
-
-			e_select_names_text_model_delete (model, pos, len1);
-			e_select_names_text_model_delete (model, pos, len2);
-		}
-
-		goto finished;
-	}
-
-	/* Our changes are confined to just one entry. */
-	if (length > 0) {
-		const gchar *str;
-		gchar *new_str;
-		
-		offset = pos - start_pos;
-		
-		str = e_select_names_model_get_string (source, index);
-		new_str = str ? g_strdup_printf ("%.*s%s", offset, str, str + offset + length) : NULL;
-		
-		if (new_str) {
-			EReposDeleteShift repos;
-			EDestination *dest;
-
-			dest = e_destination_new ();
-			e_destination_set_string (dest, new_str);
-			e_select_names_model_replace (source, index, dest);
-			
-			if (out)
-				fprintf (out, "new_str: \"%s\"\n", new_str);
-
-			g_free (new_str);
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = length;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-			
-		} else {
-			EReposDeleteShift repos;
-			
-			e_select_names_model_delete (source, index);
-			
-			if (out)
-				fprintf (out, "deleted %d\n", index);
-
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = SEPLEN;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-		}
-	}
-
- finished:
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));
-}
-
-static gint
-e_select_names_text_model_obj_count (ETextModel *model)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i, count;
-
-	count = i = e_select_names_model_count (source);
-	while (i > 0) {
-		const EDestination *dest;
-		--i;
-		dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest) == NULL)
-			--count;
-	}
-
-	return count;
-}
-
-static gint
-nth_obj_index (ESelectNamesModel *source, gint n)
-{
-	gint i, N;
-
-	i = 0;
-	N = e_select_names_model_count (source);
-	
-	do {
-		const EDestination *dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest))
-			--n;
-		++i;
-	} while (n >= 0 && i < N);
-
-	if (i <= N)
-		--i;
-	else
-		i = -1;
-
-	return i;
-}
-
-static const gchar *
-e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	const gchar *txt;
-	gint i, pos;
-
-	i = nth_obj_index (source, n);
-	if (i < 0)
-		return NULL;
-	
-	e_select_names_model_name_pos (source, i, &pos,  len);
-	if (pos < 0)
-		return NULL;
-	
-	txt = e_select_names_model_get_textification (source);
-	return txt + pos;
-}
-
-static void
-e_select_names_text_model_activate_obj (ETextModel *model, gint n)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	EContactEditor *contact_editor;
-	ECard *card;
-	gint i;
-
-	i = nth_obj_index (source, n);
-	g_return_if_fail (i >= 0);
-
-	card = e_select_names_model_get_card (source, i);
-	g_return_if_fail (card);
-	
-	contact_editor = e_contact_editor_new ((ECard *) card, FALSE);
-	e_contact_editor_raise (contact_editor);
-}
-
-
-
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h
deleted file mode 100644
index 6458bac59c..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-text/e-text-model.h>
-
-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))
-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-
-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;
-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;
-
-struct _ESelectNamesTextModel {
-	ETextModel parent;
-
-	ESelectNamesModel *source;
-	gint source_changed_id;
-	gint source_resize_id;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_text_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
deleted file mode 100644
index 8b35349786..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-select-names.h"
-#include <gal/e-table/e-table-simple.h>
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/component/e-cardlist-model.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-table-model.h"
-#include <shell/evolution-shell-client.h>
-#include <addressbook/gui/component/addressbook-component.h>
-#include <gal/widgets/e-font.h>
-
-static void e_select_names_init		(ESelectNames		 *card);
-static void e_select_names_class_init	(ESelectNamesClass	 *klass);
-static void e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char              *title;
-	ETableModel       *model;
-	ESelectNamesModel *source;
-	ESelectNames      *names;
-	GtkWidget         *label;
-} ESelectNamesChild;
-
-GtkType
-e_select_names_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"ESelectNames",
-			sizeof (ESelectNames),
-			sizeof (ESelectNamesClass),
-			(GtkClassInitFunc) e_select_names_class_init,
-			(GtkObjectInitFunc) e_select_names_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_class_init (ESelectNamesClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = e_select_names_set_arg;
-	object_class->get_arg = e_select_names_get_arg;
-	object_class->destroy = e_select_names_destroy;
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"35\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-        	<grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);
-
-static void
-set_book(EBook *book, EBookStatus status, ETableModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-}
-
-static void
-addressbook_model_set_uri(ETableModel *model, char *uri)
-{
-	EBook *book;
-	book = e_book_new();
-	gtk_object_ref(GTK_OBJECT(model));
-	gtk_object_ref(GTK_OBJECT(book));
-	e_book_load_uri(book, uri, (EBookCallback) set_book, model);
-}
-
-static void
-real_add_address_cb (int model_row,
-		     gpointer closure)
-{
-	ESelectNamesChild *child = closure;
-	ESelectNames *names = child->names;
-	ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(names->model), model_row);
-	EDestination *dest = e_destination_new ();
-
-	e_destination_set_card (dest, card, 0);
-
-	e_select_names_model_insert (child->source,
-				     e_select_names_model_count (child->source),
-				     dest);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-real_add_address(ESelectNames *names, ESelectNamesChild *child)
-{
-	e_table_selected_row_foreach(e_table_scrolled_get_table(names->table),
-				     real_add_address_cb, child);
-}
-
-static void
-add_address(ETable *table, int row, int col, GdkEvent *event, ESelectNames *names)
-{
-	ESelectNamesChild *child;
-
-	child = g_hash_table_lookup(names->children, names->def);
-	if (child) {
-		real_add_address(names, child);
-	}
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *model;
-	GtkWidget *table;
-	char *filename;
-	char *uri;
-
-	model = e_addressbook_model_new();
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-
-
-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf("file://%s", filename);
-
-	addressbook_model_set_uri(model, uri);
-
-	g_free(uri);
-	g_free(filename);
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-	return table;
-}
-
-static void
-set_current_selection(ETableScrolled *table, int row, ESelectNames *names)
-{
-	names->currently_selected = row;
-}
-
-typedef struct {
-	char *description;
-	char *display_name;
-	char *physical_uri;
-
-} ESelectNamesFolder;
-
-static void
-e_select_names_folder_free(ESelectNamesFolder *e_folder)
-{
-	g_free(e_folder->description );
-	g_free(e_folder->display_name);
-	g_free(e_folder->physical_uri);
-	g_free(e_folder);
-}
-
-static void
-e_select_names_option_activated(GtkWidget *widget, ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder = gtk_object_get_data (GTK_OBJECT (widget), "EsnChoiceFolder");
-
-	addressbook_model_set_uri(e_select_names->model, e_folder->physical_uri);
-}
-
-typedef struct {
-	ESelectNames *names;
-	GtkWidget *menu;
-} NamesAndMenu;
-
-static void
-add_menu_item		(gpointer	key,
-			 gpointer	value,
-			 gpointer	user_data)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	ESelectNamesFolder *e_folder;
-	NamesAndMenu *nnm;
-	ESelectNames *e_select_names;
-
-	nnm = user_data;
-	e_folder = value;
-	menu = nnm->menu;
-	e_select_names = nnm->names;
-
-	item = gtk_menu_item_new_with_label (e_folder->display_name);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_object_set_data (GTK_OBJECT (item), "EsnChoiceFolder", e_folder);
-
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (e_select_names_option_activated),
-			    e_select_names);
-}
-
-static void
-update_option_menu(ESelectNames *e_select_names)
-{
-	GtkWidget *menu;
-	GtkWidget *option;
-
-	option = glade_xml_get_widget (e_select_names->gui,
-				       "optionmenu-folder");
-	if (option) {
-		NamesAndMenu nnm;
-		menu = gtk_menu_new ();
-
-		nnm.names = e_select_names;
-		nnm.menu = menu;
-
-		g_hash_table_foreach	(e_select_names->folders,
-					 add_menu_item,
-					 &nnm);
-
-		gtk_widget_show_all (menu);
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (option), 
-					  menu);
-		gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
-		gtk_widget_set_sensitive (option, TRUE);
-	}
-}
-
-static void
-new_folder      (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 const GNOME_Evolution_Folder *folder,
-		 ESelectNames *e_select_names)
-{
-	if (!strcmp(folder->type, "contacts")) {
-		ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);
-		e_folder->description  = g_strdup(folder->description );
-		e_folder->display_name = g_strdup(folder->display_name);
-		e_folder->physical_uri = g_strdup(folder->physical_uri);
-		g_hash_table_insert(e_select_names->folders,
-				    g_strdup(path), e_folder);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-update_folder   (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 const char *display_name,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder = g_hash_table_lookup(e_select_names->folders, path);
-	if (e_folder) {
-		g_free(e_folder->display_name);
-		e_folder->display_name = g_strdup(e_folder->display_name);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-removed_folder  (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder;
-	char *orig_path;
-
-	if (g_hash_table_lookup_extended(e_select_names->folders, path, (void **) &orig_path, (void **) &e_folder)) {
-		g_hash_table_remove(e_select_names->folders, path);
-		e_select_names_folder_free(e_folder);
-		g_free(orig_path);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-e_select_names_hookup_shell_listener (ESelectNames *e_select_names)
-{
-	GNOME_Evolution_Storage storage;
-	GNOME_Evolution_StorageListener listener;
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-
-	storage = (GNOME_Evolution_Storage) (evolution_shell_client_get_local_storage(addressbook_component_get_shell_client()));
-	e_select_names->listener = evolution_storage_listener_new();
-
-	listener = evolution_storage_listener_corba_objref(e_select_names->listener);
-
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "new_folder",
-			   GTK_SIGNAL_FUNC(new_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "update_folder",
-			   GTK_SIGNAL_FUNC(update_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(e_select_names->listener), "removed_folder",
-			   GTK_SIGNAL_FUNC(removed_folder), e_select_names);
-
-	GNOME_Evolution_Storage_addListener(storage, listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_select_names_init: Exception adding listener to "
-			   "remote GNOME_Evolution_Storage interface.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	bonobo_object_release_unref(storage, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_select_names_init: Exception unref'ing "
-			   "remote GNOME_Evolution_Storage interface.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);
-	e_select_names->gui = gui;
-
-	e_select_names->children = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->child_count = 0;
-	e_select_names->def = NULL;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_select_names)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_select_names),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-	
-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);
-
-	e_select_names->table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));
-	e_select_names->model = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "model");
-
-	e_select_names->currently_selected = -1;
-
-	e_select_names->folders = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_select_names_hookup_shell_listener (e_select_names);
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(e_select_names->table)), "cursor_activated",
-			   GTK_SIGNAL_FUNC(set_current_selection), e_select_names);
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(e_select_names->table)), "double_click",
-			   GTK_SIGNAL_FUNC(add_address), e_select_names);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->model));
-	gtk_object_unref(GTK_OBJECT(child->source));
-	g_free(key);
-}
-
-static void
-e_select_names_destroy (GtkObject *object) {
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-	
-	gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->listener), e_select_names);
-	gtk_object_unref(GTK_OBJECT(e_select_names->listener));
-
-	gtk_object_unref(GTK_OBJECT(e_select_names->gui));
-	g_hash_table_foreach(e_select_names->children, (GHFunc) e_select_names_child_free, e_select_names);
-	g_hash_table_destroy(e_select_names->children);
-
-	g_free(e_select_names->def);
-}
-
-GtkWidget*
-e_select_names_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_select_names_get_type ()));
-	return widget;
-}
-
-static void
-e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *editor;
-
-	editor = E_SELECT_NAMES (o);
-	
-	switch (arg_id){
-	default:
-		return;
-	}
-}
-
-static void
-e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *e_select_names;
-
-	e_select_names = E_SELECT_NAMES (object);
-
-	switch (arg_id) {
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-button_clicked(GtkWidget *button, ESelectNamesChild *child)
-{
-	real_add_address(child->names, child);
-}
-
-static void
-remove_address(ETable *table, int row, int col, GdkEvent *event, ESelectNamesChild *child)
-{
-	e_select_names_model_delete (child->source, row);
-}
-
-void
-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *alignment;
-	GtkWidget *label;
-	GtkTable *table;
-	char *label_text;
-
-	ETableModel *model;
-	GtkWidget *etable;
-
-	if (g_hash_table_lookup(e_select_names->children, id)) {
-		return;
-	}
-
-	table = GTK_TABLE(glade_xml_get_widget (e_select_names->gui, "table-recipients"));
-
-	child = g_new(ESelectNamesChild, 1);
-
-	child->names = e_select_names;
-	child->title = g_strdup(_(name));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-
-	button = gtk_button_new ();
-
-	label_text = g_strconcat (child->title, " ->", NULL);
-	label = gtk_label_new (label_text);
-	g_free (label_text);
-	gtk_container_add (GTK_CONTAINER (button), label);
-	child->label = label;
-
-	gtk_container_add(GTK_CONTAINER(alignment), button);
-	gtk_widget_show_all(alignment);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_clicked), child);
-	gtk_table_attach(table, alignment,
-			 0, 1,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-	
-	model = e_select_names_table_model_new(source);
-	etable = e_table_scrolled_new (model, NULL, SPEC2, NULL);
-	
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "double_click",
-			   GTK_SIGNAL_FUNC(remove_address), child);
-
-	child->model = model;
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->model));
-	gtk_object_ref(GTK_OBJECT(child->source));
-	
-	gtk_widget_show(etable);
-	
-	gtk_table_attach(table, etable,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-}
-
-static void *
-card_copy(const void *value, void *closure)
-{
-	gtk_object_ref(GTK_OBJECT(value));
-	return (void *)value;
-}
-
-static void
-card_free(void *value, void *closure)
-{
-	gtk_object_unref(GTK_OBJECT(value));
-}
-
-EList *
-e_select_names_get_section(ESelectNames *e_select_names, char *id)
-{
-	ESelectNamesChild *child;
-	int i;
-	int rows;
-	EList *list;
-	
-	child = g_hash_table_lookup(e_select_names->children, id);
-	if (!child)
-		return NULL;
-	rows = e_table_model_row_count(child->model);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i);
-		e_list_append(list, card);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-	return list;
-}
-
-ESelectNamesModel *
-e_select_names_get_source(ESelectNames *e_select_names,
-			  char *id)
-{
-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names->children, id);
-	if (child) {
-		if (child->source)
-			gtk_object_ref(GTK_OBJECT(child->source));
-		return child->source;
-	} else
-		return NULL;
-}
-
-void
-e_select_names_set_default (ESelectNames *e_select_names,
-			    const char *id)
-{
-	ESelectNamesChild *child;
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child)
-			gtk_widget_restore_default_style(child->label);
-	}
-
-	g_free(e_select_names->def);
-	e_select_names->def = g_strdup(id);
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child) {
-			EFont *efont;
-			GdkFont *gdkfont;
-			GtkStyle *style, *oldstyle;
-
-			oldstyle = gtk_widget_get_style(child->label);
-			style = gtk_style_copy(oldstyle);
-
-			efont = e_font_from_gdk_font(style->font);
-			gdkfont = e_font_to_gdk_font(efont, E_FONT_BOLD);
-			e_font_unref(efont);
-
-			gdk_font_ref(gdkfont);
-			gdk_font_unref(style->font);
-			style->font = gdkfont;
-
-			gtk_widget_set_style(child->label, style);
-
-			gtk_style_unref(oldstyle);
-		}
-	}
-}
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
deleted file mode 100644
index 9d47558117..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SELECT_NAMES_H__
-#define __E_SELECT_NAMES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <e-util/e-list.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include "e-select-names-model.h"
-
-#include <shell/evolution-storage-listener.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ESelectNames - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_SELECT_NAMES_TYPE			(e_select_names_get_type ())
-#define E_SELECT_NAMES(obj)			(GTK_CHECK_CAST ((obj), E_SELECT_NAMES_TYPE, ESelectNames))
-#define E_SELECT_NAMES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SELECT_NAMES_TYPE, ESelectNamesClass))
-#define E_IS_SELECT_NAMES(obj)		(GTK_CHECK_TYPE ((obj), E_SELECT_NAMES_TYPE))
-#define E_IS_SELECT_NAMES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SELECT_NAMES_TYPE))
-
-typedef struct _ESelectNames       ESelectNames;
-typedef struct _ESelectNamesClass  ESelectNamesClass;
-
-struct _ESelectNames
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *model;
-	int currently_selected;
-	EvolutionStorageListener *listener;
-	GHashTable *folders;
-	char *def;
-};
-
-struct _ESelectNamesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_select_names_new          (void);
-GtkType    e_select_names_get_type     (void);
-
-void       e_select_names_add_section  (ESelectNames *e_select_names,
-				       	char         *name,
-				       	char         *id,
-				       	ESelectNamesModel *source);
-ESelectNamesModel *e_select_names_get_source   (ESelectNames *e_select_names,
-						char *id);
-void e_select_names_set_default (ESelectNames *e_select_names,
-				 const char *id);
-/* Returns a ref counted list of addresses. */
-EList     *e_select_names_get_section  (ESelectNames *e_select_names,
-				       	char         *id);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_SELECT_NAMES_H__ */
diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade
deleted file mode 100644
index b60972d094..0000000000
--- a/addressbook/gui/component/select-names/recipient.glade
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Recipient</name>
-  <program_name>recipient</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkHBox</class>
-    <name>hbox-top</name>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkAlignment</class>
-      <name>alignment1</name>
-      <xalign>1.08033e-07</xalign>
-      <yalign>0</yalign>
-      <xscale>1</xscale>
-      <yscale>0</yscale>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>text-button</name>
-	<can_focus>True</can_focus>
-	<label>-&gt;</label>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade
deleted file mode 100644
index 4eb3599f85..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Select-names</name>
-  <program_name>select-names</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-top</name>
-  <visible>False</visible>
-  <title>Select Names</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>4</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <label>Find...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<label>Select name from:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>table-source</name>
-	<creation_function>e_addressbook_create_ebook_table</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-recipients</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel2</name>
-	  <label>Message Recipients</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkOptionMenu</class>
-	<name>optionmenu1</name>
-	<can_focus>True</can_focus>
-	<items></items>
-	<initial_choice>0</initial_choice>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/gui/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
deleted file mode 100644
index d5ed7feeaa..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-save-as.c			\
-	e-contact-save-as.h
-
-noinst_PROGRAMS =		\
-	contact-editor-test
-
-contact_editor_test_SOURCES = 	\
-	test-editor.c
-
-contact_editor_test_LDADD =					\
-	libecontacteditor.a					\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(GNOMEGNORBA_LIBS)					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-	$(top_builddir)/e-util/libeutil.la			\
-	$(GNOME_PRINT_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)
diff --git a/addressbook/gui/contact-editor/arrow.png b/addressbook/gui/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/gui/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/briefcase.png b/addressbook/gui/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/gui/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index ddcc058ab2..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2453 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Contact-editor</name>
-  <program_name>contact-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>2</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button31</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Phone Types</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <label>New phone type</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment9</name>
-	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>Contact Editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-general</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>14</rows>
-	<columns>8</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>text-address</name>
-	  <width>1</width>
-	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <has_default>True</has_default>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <value_in_list>False</value_in_list>
-	  <ok_if_empty>True</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></items>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>True</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Home</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone2</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Business _Fax</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone3</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Mobile</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone4</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Primary Email</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-email1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0</xalign>
-	  <yalign>0</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Job title:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-jobtitle</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>cellphone.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>envelope.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>house.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-company</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Office:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-office</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Nickname:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-nickname</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Manager's Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-manager</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 7df9cb8cb4..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-GtkType
-e_contact_editor_address_get_type (void)
-{
-	static GtkType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type)
-		{
-			static const GtkTypeInfo contact_editor_address_info =
-			{
-				"EContactEditorAddress",
-				sizeof (EContactEditorAddress),
-				sizeof (EContactEditorAddressClass),
-				(GtkClassInitFunc) e_contact_editor_address_class_init,
-				(GtkObjectInitFunc) e_contact_editor_address_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info);
-		}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_ADDRESS);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable) {
-		e_utf8_gtk_editable_set_text(editable, string);
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (address) {
-		fill_in_field(editor, "entry-street" , address->street );
-		fill_in_field(editor, "entry-po"     , address->po     );
-		fill_in_field(editor, "entry-ext"    , address->ext    );
-		fill_in_field(editor, "entry-city"   , address->city   );
-		fill_in_field(editor, "entry-region" , address->region );
-		fill_in_field(editor, "entry-code"   , address->code   );
-		fill_in_field(editor, "entry-country", address->country);
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (!address) {
-		address = e_card_delivery_address_new();
-		editor->address = address;
-	}
-	address->street  = extract_field(editor, "entry-street" );
-	address->po      = extract_field(editor, "entry-po"     );
-	address->ext     = extract_field(editor, "entry-ext"    );
-	address->city    = extract_field(editor, "entry-city"   );
-	address->region  = extract_field(editor, "entry-region" );
-	address->code    = extract_field(editor, "entry-code"   );
-	address->country = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index a74e1bd967..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
-GtkType    e_contact_editor_address_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index b91a040d46..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-contact-editor-confirm-delete</name>
-  <program_name>e-contact-editor-confirm-delete</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeMessageBox</class>
-  <name>confirm-dialog</name>
-  <message_box_type>GNOME_MESSAGE_BOX_QUESTION</message_box_type>
-  <message>Are you sure you want
-to delete this contact?</message>
-  <title>Delete Contact?</title>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 05e8d45702..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-GtkType
-e_contact_editor_fullname_get_type (void)
-{
-	static GtkType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type)
-		{
-			static const GtkTypeInfo contact_editor_fullname_info =
-			{
-				"EContactEditorFullname",
-				sizeof (EContactEditorFullname),
-				sizeof (EContactEditorFullnameClass),
-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,
-				(GtkObjectInitFunc) e_contact_editor_fullname_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_fullname_info);
-		}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_NAME);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			e_utf8_gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefix);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffix);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (!name) {
-		name = e_card_name_new();
-		editor->name = name;
-	}
-
-	name->prefix     = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffix     = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index bde6733976..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardName *name;
-	GladeXML *gui;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);
-GtkType    e_contact_editor_fullname_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
deleted file mode 100644
index e65e9b9efb..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1803 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-categories.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *card);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_destroy (GtkObject *object);
-
-#if 0
-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);
-#endif
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_fields(EContactEditor *editor);
-static void set_address_field(EContactEditor *editor, int result);
-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-GtkType
-e_contact_editor_get_type (void)
-{
-  static GtkType contact_editor_type = 0;
-
-  if (!contact_editor_type)
-    {
-      static const GtkTypeInfo contact_editor_info =
-      {
-        "EContactEditor",
-        sizeof (EContactEditor),
-        sizeof (EContactEditorClass),
-        (GtkClassInitFunc) e_contact_editor_class_init,
-        (GtkObjectInitFunc) e_contact_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_editor_info);
-    }
-
-  return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_editor_set_arg;
-  object_class->get_arg = e_contact_editor_get_arg;
-  object_class->destroy = e_contact_editor_destroy;
-}
-
-static void
-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	GtkWidget *pixmap;
-	gchar *image_temp;
-	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
-		gtk_container_add(GTK_CONTAINER(button),
-				  pixmap);
-		g_free(image_temp);
-		gtk_widget_show(pixmap);
-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
-	}
-}
-
-static void
-_replace_buttons(EContactEditor *editor)
-{
-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);
-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	gtk_object_get(GTK_OBJECT(widget),
-		       "active", &wants_html,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(editor->card),
-		       "wants_html", wants_html,
-		       NULL);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	string = e_utf8_gtk_entry_get_text(entry);
-
-	e_card_simple_set_email(editor->simple, editor->email_choice, string);
-
-	g_free (string);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const ECardName *name, char *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name) {
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (EContactEditor *editor)
-{
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	char *filestring;
-	char *trystring;
-	ECardName *name = editor->name;
-	int i;
-	int style;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	filestring = e_utf8_gtk_entry_get_text(file_as);
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style(name, editor->company, i);
-		if (!strcmp(trystring, filestring)) {
-			g_free(trystring);
-			g_free(filestring);
-			return i;
-		}
-		g_free(trystring);
-	}
-	g_free (filestring);
-	return -1;
-}
-
-static void
-file_as_set_style(EContactEditor *editor, int style)
-{
-	char *string;
-	int i;
-	GList *strings = NULL;
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	GtkWidget *widget;
-		
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return;
-
-	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
-		strings = g_list_append(strings, string);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense(editor->name, editor->company, i)) {
-			char *u;
-			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO(widget)) {
-		GtkCombo *combo = GTK_COMBO(widget);
-		gtk_combo_set_popdown_strings(combo, strings);
-		g_list_foreach(strings, (GFunc) g_free, NULL);
-		g_list_free(strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	char *string;
-
-	style = file_as_get_style(editor);
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	file_as_set_style(editor, style);
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-
-	style = file_as_get_style(editor);
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	file_as_set_style(editor, style);
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   phone_entry_changed, editor);
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-	widget = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   email_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   address_text_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   name_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   company_entry_changed, editor);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-
-		style = file_as_get_style(editor);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
-			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		file_as_set_style(editor, style);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "address", &new_address,
-			       NULL);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	else if (editor->card)
-		gtk_object_get(GTK_OBJECT(editor->card),
-			       "categories", &categories,
-			       NULL);
-	dialog = GNOME_DIALOG(e_categories_new(categories));
-	gtk_object_set(GTK_OBJECT(dialog),
-		       "header", _("This contact belongs to these categories:"),
-		       NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-	if (result == 0) {
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "categories", &categories,
-			       NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			gtk_object_set(GTK_OBJECT(editor->card),
-				       "categories", categories,
-				       NULL);
-		g_free(categories);
-	}
-	gtk_object_destroy(GTK_OBJECT(dialog));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_TO);
-}
-
-gboolean
-e_contact_editor_confirm_delete(GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GladeXML *gui;
-	int result;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);
-
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));
-
-	gnome_dialog_set_parent(dialog, parent);
-	
-	result = gnome_dialog_run_and_close(dialog);
-
-	gtk_object_unref(GTK_OBJECT(gui));
-
-	return !result;
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-	ECard *card = ce->card;
-	ECardSimple *simple = ce->simple;
-
-	gtk_object_ref(GTK_OBJECT(card));
-	gtk_object_ref(GTK_OBJECT(simple));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 card);
-		
-		file_close_cb(widget, data);
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor->app),
-				  (GtkCallback) add_field_callback,
-				  e_contact_editor);
-
-	_replace_buttons(e_contact_editor);
-	set_entry_changed_signals(e_contact_editor);
-
-	wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail");
-	if (wants_html && GTK_IS_TOGGLE_BUTTON(wants_html))
-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",
-				   wants_html_changed, e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_name_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_addr_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   categories_clicked, e_contact_editor);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (e_contact_editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (e_contact_editor->app);
-		e_contact_editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->email_list) {
-		g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->email_list);
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-	}
-	if (e_contact_editor->email_popup) {
-		gtk_widget_unref(e_contact_editor->email_popup);
-	}
-	
-	if (e_contact_editor->phone_list) {
-		g_list_foreach(e_contact_editor->phone_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->phone_list);
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-	}
-	if (e_contact_editor->phone_popup) {
-		gtk_widget_unref(e_contact_editor->phone_popup);
-	}
-	
-	if (e_contact_editor->address_list) {
-		g_list_foreach(e_contact_editor->address_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->address_list);
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-	}
-	if (e_contact_editor->address_popup) {
-		gtk_widget_unref(e_contact_editor->address_popup);
-	}
-	
-	if (e_contact_editor->simple)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->simple));
-
-	if (e_contact_editor->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	return ce;
-}
-
-static void
-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		gtk_object_set(GTK_OBJECT(editor->simple),
-			       "card", editor->card,
-			       NULL);
-		fill_in_info(editor);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(e_contact_editor->simple);
-		extract_info(e_contact_editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->card);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->is_new_card ? TRUE : FALSE;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.width;
-	*y += button->allocation.height;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &request);
-
-	mh = request.height;
-	mw = request.width;
-
-	*x -= mw;
-	if (*x < 0)
-		*x = 0;
-	
-	if (*y < 0)
-		*y = 0;
-	
-	if ((*x + mw) > gdk_screen_width ())
-		*x = gdk_screen_width () - mw;
-	
-	if ((*y + mh) > gdk_screen_height ())
-		*y = gdk_screen_height () - mh;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)
-{
-	gint menu_item;
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);
-	if ( menu_item != -1 ) {
-#if 0
-		if (menu_item == g_list_length (*list)) {
-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);
-		} else {
-#endif
-			GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-			if (label_widget && GTK_IS_LABEL(label_widget)) {
-				gtk_object_set(GTK_OBJECT(label_widget),
-					       "label", g_list_nth_data(*list, menu_item),
-					       NULL);
-			}
-#if 0
-		}
-#endif
-	}
-	return menu_item;
-}
-
-static void
-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)
-{
-	GnomeUIInfo *info;
-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };
-	GnomeUIInfo end = GNOMEUIINFO_END;
-	int length;
-	int i;
-
-	info = *infop;
-
-	if ( info )
-		g_free(info);
-	length = g_list_length( list );
-	info = g_new(GnomeUIInfo, length + 2);
-	for (i = 0; i < length; i++) {
-		info[i] = singleton;
-		info[i].label = _(list->data);
-		list = list->next;
-	}
-	info[i] = end;
-
-	*infop = info;
-}
-
-#if 0
-static void
-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
-{
-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
-					       "e_contact_editor_label");
-
-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
-						      "e_contact_editor_dialog_entry");
-	
-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_list");
-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_info");
-	switch (button) {
-	case 0:
-		if (label && GTK_IS_LABEL(label)) {
-			gtk_object_set(GTK_OBJECT(label),
-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),
-				       NULL);
-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));
-			g_free(*info);
-			*info = NULL;
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static GtkWidget *
-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)
-{
-	GtkWidget *dialog_entry = gtk_entry_new();
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, entry_id);
-	GtkWidget *label = glade_xml_get_widget(editor->gui, label_id);
-	
-	GtkWidget *dialog = gnome_dialog_new(title,
-					     NULL);
-	
-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox),
-			  gtk_widget_new (gtk_frame_get_type(),
-					  "border_width", 4,
-					  "label", title,
-					  "child", gtk_widget_new(gtk_alignment_get_type(),
-								  "child", dialog_entry,
-								  "xalign", .5,
-								  "yalign", .5,
-								  "xscale", 1.0,
-								  "yscale", 1.0,
-								  "border_width", 9,
-								  NULL),
-					  NULL));
-
-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),
-					       "Add",
-					       GNOME_STOCK_PIXMAP_ADD);
-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);
-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
-	
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   _dialog_clicked, editor);
-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",
-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));
-	
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_entry", entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_label", label);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_dialog_entry", dialog_entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_list", list);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_info", info);
-
-	gtk_widget_show_all(dialog);
-	return dialog;
-}
-#endif
-
-static void
-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int which;
-	int i;
-	gchar *label;
-	gchar *entry;
-	int result;
-	if ( widget == glade_xml_get_widget(editor->gui, "button-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone4") ) {
-		which = 4;
-	} else
-		return;
-	
-	label = g_strdup_printf("label-phone%d", which);
-	entry = g_strdup_printf("entry-phone%d", which);
-
-	if (editor->phone_list == NULL) {
-		static char *info[] = {
-			N_("Assistant"),
-			N_("Business"),
-			N_("Business 2"),
-			N_("Business Fax"),
-			N_("Callback"),
-			N_("Car"),
-			N_("Company"),
-			N_("Home"),
-			N_("Home 2"),
-			N_("Home Fax"),
-			N_("ISDN"),
-			N_("Mobile"),
-			N_("Other"),
-			N_("Other Fax"),
-			N_("Pager"),
-			N_("Primary"),
-			N_("Radio"),
-			N_("Telex"),
-			N_("TTY/TDD")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			gtk_widget_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-		const ECardPhone *phone = e_card_simple_get_phone(editor->simple, i);
-		gboolean checked;
-		checked = phone && phone->number && *phone->number;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
-	
-	if (result != -1) {
-		editor->phone_choice[which - 1] = result;
-		set_fields(editor);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->email_list == NULL) {
-		static char *info[] = {
-			N_("Primary Email"),
-			N_("Email 2"),
-			N_("Email 3")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->email_list = g_list_append(editor->email_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			gtk_widget_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-		const char *string = e_card_simple_get_email(editor->simple, i);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
-	
-	if (result != -1) {
-		editor->email_choice = result;
-		set_fields(editor);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->address_list == NULL) {
-		static char *info[] = {
-			N_("Business"),
-			N_("Home"),
-			N_("Other")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->address_list = g_list_append(editor->address_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->address_info == NULL) {
-		e_contact_editor_build_ui_info(editor->address_list, &editor->address_info);
-
-		if ( editor->address_popup )
-			gtk_widget_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-		gboolean checked;
-		checked = address && address->data && *address->data;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		ECardName *name;
-		const ECardDate *anniversary;
-		const ECardDate *bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-		gboolean wants_html, wants_html_set;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as",       &file_as,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       key, string,
-				       NULL);
-		else
-			gtk_object_set(GTK_OBJECT(card),
-				       key, NULL,
-				       NULL);
-
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_single_field(EContactEditor *editor, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	ECardSimple *simple = editor->simple;
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    string);
-		else
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    NULL);
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				gtk_object_set(GTK_OBJECT(card),
-					       "file_as", string,
-					       NULL);
-
-			if (string) g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			extract_single_field(editor, list->data);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_raise (EContactEditor *editor)
-{
-	gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
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 a2067b1a88..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-	GnomeUIInfo *email_info;
-	GnomeUIInfo *phone_info;
-	GnomeUIInfo *address_info;
-	GtkWidget *email_popup;
-	GtkWidget *phone_popup;
-	GtkWidget *address_popup;
-	GList *email_list;
-	GList *phone_list;
-	GList *address_list;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-EContactEditor *e_contact_editor_new             (ECard          *card,
-						  gboolean        is_new_card);
-GtkType         e_contact_editor_get_type        (void);
-void            e_contact_editor_raise           (EContactEditor *editor);
-
-
-gboolean        e_contact_editor_confirm_delete  (GtkWindow      *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 5a88c31ffa..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(card);
-	
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h
deleted file mode 100644
index d1c84dc596..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-save-as.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void
-e_contact_save_as(gchar *title, ECard *card);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/email.png b/addressbook/gui/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/gui/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index 46d1a180b6..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,475 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fulladdr</name>
-  <program_name>fulladdr</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index 17be70647c..0000000000
--- a/addressbook/gui/contact-editor/fullname.glade
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fullname</name>
-  <program_name>fullname</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkfullname</name>
-  <visible>False</visible>
-  <title>Check Full Name</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkfullname</name>
-      <border_width>8</border_width>
-      <rows>5</rows>
-      <columns>3</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>21</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-title</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Mr.
-Mrs.
-Ms.
-Miss
-Dr.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-title</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-suffix</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Sr.
-Jr.
-I
-II
-III
-Esq.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-suffix</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-first</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-middle</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-last</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_First:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-first</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>_Title:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-title</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>_Middle:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-middle</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_Last:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-last</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_Suffix:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-suffix</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/head.png b/addressbook/gui/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/gui/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netfreebusy.png b/addressbook/gui/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/gui/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netmeeting.png b/addressbook/gui/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/gui/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/phone.png b/addressbook/gui/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/gui/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/snailmail.png b/addressbook/gui/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/gui/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	gtk_object_unref (GTK_OBJECT (ce));
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/gui/contact-editor/web.png b/addressbook/gui/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/gui/contact-editor/web.png
+++ /dev/null
diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/addressbook/gui/search/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
deleted file mode 100644
index d932aaac77..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-ruledir = $(datadir)/evolution
-rule_DATA = addresstypes.xml
-
-EXTRA_DIST = addresstypes.xml
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeaddressbooksearch.a
-
-libeaddressbooksearch_a_SOURCES =		\
-	e-addressbook-search-dialog.c		\
-	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml
deleted file mode 100644
index bf64e841b0..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="name">
-  <title>Name</title>
-   <input type="optionlist" name="name-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "full_name" ${name})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "full_name" ${name}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "full_name" ${name})))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "full_name" ${name}))</code>
-    </option>
-    <option value="begin">
-        <title>begins with</title>
-	<code>(beginswith "full_name" ${name})</code>
-    </option>
-    <option value="end">
-        <title>ends in</title>
-	<code>(endswith "full_name" ${name})</code>
-    </option>
-   </input>
-   <input type="string" name="name"/>
- </part>
- <part name="email">
-  <title>Email</title>
-   <input type="optionlist" name="email-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "email" ${email})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "email" ${email}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "email" ${email})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "email" ${email}))</code>
-    </option>
-   </input>
-   <input type="address" name="email"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-</partset>
-</filterdescription>
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
deleted file mode 100644
index f334b5e652..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-minicard-view-widget.h"
-#include <gal/widgets/e-scroll-frame.h>
-
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_destroy       (GtkObject *object);
-
-static ECanvasClass *parent_class = NULL;
-
-#define PARENT_TYPE (gnome_dialog_get_type())
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-};
-
-GtkType
-e_addressbook_search_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-	{
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookSearchDialog",
-			sizeof (EAddressbookSearchDialog),
-			sizeof (EAddressbookSearchDialogClass),
-			(GtkClassInitFunc) e_addressbook_search_dialog_class_init,
-			(GtkObjectInitFunc) e_addressbook_search_dialog_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-
-	object_class->set_arg       = e_addressbook_search_dialog_set_arg;
-	object_class->get_arg       = e_addressbook_search_dialog_get_arg;
-	object_class->destroy       = e_addressbook_search_dialog_destroy;
-}
-
-static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
-{
-	FilterPart *part;
-
-	view->context = rule_context_new();
-	/* FIXME: hide this in a class */
-	rule_context_add_part_set(view->context, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-	view->rule = filter_rule_new();
-	part = rule_context_next_part(view->context, NULL);
-	if (part == NULL) {
-		g_warning("Problem loading search for addressbook no parts to load");
-		return gtk_entry_new();
-	} else {
-		filter_rule_add_part(view->rule, filter_part_clone(part));
-		return filter_rule_get_widget(view->rule, view->context);
-	}
-}
-
-static char *
-get_query (EAddressbookSearchDialog *view)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	filter_rule_build_code(view->rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-button_press (GtkWidget *widget, int button, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	if (button == 0) {
-		query = get_query(dialog);
-		gtk_object_set(GTK_OBJECT(dialog->view),
-			       "query", query,
-			       NULL);
-		g_free(query);
-	}
-	else
-		gnome_dialog_close(GNOME_DIALOG (dialog));
-}
-
-static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
-{
-	GnomeDialog *dialog = GNOME_DIALOG (view);
-
-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
-
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, FALSE, FALSE, 0);
-	gtk_widget_show(view->search);
-
-	gnome_dialog_append_buttons(dialog,
-				    _("Search"),
-				    GNOME_STOCK_BUTTON_CLOSE, NULL);
-	
-	gnome_dialog_set_default(dialog, 0);
-
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   GTK_SIGNAL_FUNC(button_press), view);
-
-	view->view = e_minicard_view_widget_new();
-	gtk_widget_show(view->view);
-
-	view->scrolled_window = e_scroll_frame_new(NULL, NULL);
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(view->scrolled_window),
-				  GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
-	
-	gtk_widget_show(view->scrolled_window);
-	
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EBook *book)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	gtk_object_set(GTK_OBJECT(view->view),
-		       "book", book,
-		       NULL);
-	return GTK_WIDGET(view);
-}
-
-static void
-e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set(GTK_OBJECT(emvw->view),
-			       "book", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		gtk_object_get(GTK_OBJECT(emvw->view),
-			       "book", &(GTK_VALUE_OBJECT (*arg)),
-			       NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_destroy (GtkObject *object)
-{
-	EAddressbookSearchDialog *view;
-
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	gtk_object_unref((GtkObject *)view->context);
-	gtk_object_unref((GtkObject *)view->rule);
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
deleted file mode 100644
index dc54275a77..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-
-#include <gnome.h>
-#include <ebook/e-book.h>
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())
-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))
-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;
-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;
-
-struct _EAddressbookSearchDialog
-{
-	GnomeDialog parent;
-
-	GtkWidget *search;
-	GtkWidget *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *scrolled_window;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EBook *book);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index 472fd2593f..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index 00f851da72..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,128 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-minicard\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/e-reflow		\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/misc			\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeminicard.a
-
-libeminicard_a_SOURCES =			\
-	e-addressbook-model.c			\
-	e-addressbook-model.h			\
-	e-addressbook-view.c			\
-	e-addressbook-view.h			\
-	e-minicard-control.c			\
-	e-minicard-control.h			\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-minicard-view-widget.c		\
-	e-minicard-view-widget.h		\
-	e-minicard-view.c			\
-	e-minicard-view.h			\
-	e-minicard-widget.c			\
-	e-minicard-widget.h			\
-	e-minicard.c				\
-	e-minicard.h				\
-	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h		\
-	gal-view-minicard.c			\
-	gal-view-minicard.h
-
-noinst_PROGRAMS =				\
-	minicard-widget-test			\
-	minicard-label-test			\
-	minicard-test				\
-	reflow-test
-#	minicard-view-test
-
-minicard_label_test_SOURCES = 	\
-	test-minicard-label.c
-
-minicard_label_test_LDADD =				\
-	$(EXTRA_GNOME_LIBS)				\
-	libeminicard.a					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la
-
-minicard_test_SOURCES = 	\
-	test-minicard.c
-
-minicard_test_LDADD =							\
-	libeminicard.a							\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)
-
-reflow_test_SOURCES = 	\
-	test-reflow.c
-
-reflow_test_LDADD =							\
-	libeminicard.a							\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)
-
-#minicard_view_test_SOURCES = 	\
-#	test-minicard-view.c
-
-#minicard_view_test_LDADD =						\
-#	$(EXTRA_GNOME_LIBS)						\
-#	$(BONOBO_GNOME_LIBS)						\
-#	libeminicard.a							\
-#	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/libversit/libversit.la				\
-#	$(top_builddir)/addressbook/ename/libename.la			\
-#	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-#	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	$(top_builddir)/e-util/libeutil.la
-
-minicard_widget_test_SOURCES = 	\
-	e-minicard-widget-test.c
-
-minicard_widget_test_LDADD =						\
-	libeminicard.a							\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = alphabet.glade 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)
diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade
deleted file mode 100644
index dc6ee33966..0000000000
--- a/addressbook/gui/widgets/alphabet.glade
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>alphabet</name>
-  <program_name>alphabet</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window2</name>
-  <visible>False</visible>
-  <title>window2</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkScrolledWindow</class>
-    <name>scrolledwindow-top</name>
-    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-    <widget>
-      <class>GtkViewport</class>
-      <name>viewport1</name>
-      <border_width>4</border_width>
-      <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<width>27</width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-1</name>
-	  <label>123</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-a</name>
-	  <label>a</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-b</name>
-	  <label>b</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-c</name>
-	  <label>c</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-d</name>
-	  <label>d</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-e</name>
-	  <label>e</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-f</name>
-	  <label>f</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-g</name>
-	  <label>g</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-h</name>
-	  <label>h</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-i</name>
-	  <label>i</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-j</name>
-	  <label>j</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-k</name>
-	  <label>k</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-l</name>
-	  <label>l</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-m</name>
-	  <label>m</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-n</name>
-	  <label>n</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-o</name>
-	  <label>o</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-p</name>
-	  <label>p</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-q</name>
-	  <label>q</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-r</name>
-	  <label>r</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-s</name>
-	  <label>s</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-t</name>
-	  <label>t</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-u</name>
-	  <label>u</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-v</name>
-	  <label>v</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-w</name>
-	  <can_focus>True</can_focus>
-	  <label>w</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-x</name>
-	  <label>x</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-y</name>
-	  <label>y</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-z</name>
-	  <label>z</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index c40c21f3bb..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
-
-/*
- * EAddressbookModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_model_signals [LAST_SIGNAL] = {0, };
-
-static void
-remove_book_view(EAddressbookModel *model)
-{
-	if (model->book_view && model->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->create_card_id);
-	if (model->book_view && model->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->remove_card_id);
-	if (model->book_view && model->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->modify_card_id);
-	if (model->book_view && model->status_message_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->status_message_id);
-
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->status_message_id = 0;
-
-	if (model->book_view)
-		gtk_object_unref(GTK_OBJECT(model->book_view));
-
-	model->book_view = NULL;
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	int i;
-
-	if (model->get_view_idle)
-		g_source_remove(model->get_view_idle);
-
-	remove_book_view(model);
-
-	if (model->book)
-		gtk_object_unref(GTK_OBJECT(model->book));
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	return addressbook->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1 || row >= addressbook->data_count )
-		return NULL;
-
-	value = e_card_simple_get_const(addressbook->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	ECard *card;
-	if (addressbook->editable) {
-		if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= addressbook->data_count )
-			return;
-		e_card_simple_set(addressbook->data[row],
-				  col + 1,
-				  val);
-		gtk_object_get(GTK_OBJECT(addressbook->data[row]),
-			       "card", &card,
-			       NULL);
-		e_book_commit_card(addressbook->book, card, NULL, NULL);
-		
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-addressbook_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return E_ADDRESSBOOK_MODEL(etc)->editable;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	ECard *card;
-	ECardSimple *simple;
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etm);
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST - 1; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple,
-				  col + 1,
-				  val);
-	}
-	e_card_simple_sync_card(simple);
-	e_book_add_card(addressbook->book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(simple));
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-addressbook_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-addressbook_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-addressbook_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-create_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	model->data = g_realloc(model->data, (model->data_count + g_list_length((GList *)cards)) * sizeof(ECard *));
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( ; cards; cards = cards->next) {
-		model->data[model->data_count++] = e_card_simple_new (E_CARD(cards->data));
-		e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-	}
-}
-
-static void
-remove_card(EBookView *book_view,
-	    const char *id,
-	    EAddressbookModel *model)
-{
-	int i;
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-modify_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	for ( ; cards; cards = cards->next) {
-		int i;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_simple_get_id(model->data[i]), e_card_get_id(E_CARD(cards->data))) ) {
-				gtk_object_unref(GTK_OBJECT(model->data[i]));
-				model->data[i] = e_card_simple_new(E_CARD(cards->data));
-				gtk_object_ref(GTK_OBJECT(model->data[i]));
-				e_table_model_row_changed(E_TABLE_MODEL(model), i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EAddressbookModel *model)
-{
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-e_addressbook_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = addressbook_destroy;
-	object_class->set_arg   = e_addressbook_model_set_arg;
-	object_class->get_arg   = e_addressbook_model_get_arg;
-
-	gtk_object_add_arg_type ("EAddressbookModel::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookModel::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookModel::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	e_addressbook_model_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_model_signals, LAST_SIGNAL);
-	
-	model_class->column_count = addressbook_col_count;
-	model_class->row_count = addressbook_row_count;
-	model_class->value_at = addressbook_value_at;
-	model_class->set_value_at = addressbook_set_value_at;
-	model_class->is_cell_editable = addressbook_is_cell_editable;
-	model_class->append_row = addressbook_append_row;
-	model_class->duplicate_value = addressbook_duplicate_value;
-	model_class->free_value = addressbook_free_value;
-	model_class->initialize_value = addressbook_initialize_value;
-	model_class->value_is_empty = addressbook_value_is_empty;
-	model_class->value_to_string = addressbook_value_to_string;
-}
-
-static void
-e_addressbook_model_init (GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	model->book = NULL;
-	model->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	model->book_view = NULL;
-	model->get_view_idle = 0;
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->status_message_id = 0;
-	model->data = NULL;
-	model->data_count = 0;
-	model->editable = TRUE;
-	model->first_get_view = TRUE;
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EAddressbookModel *model = closure;
-	int i;
-	remove_book_view(model);
-	model->book_view = book_view;
-	if (model->book_view)
-		gtk_object_ref(GTK_OBJECT(model->book_view));
-	model->create_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  model);
-	model->remove_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  model);
-	model->modify_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  model);
-	model->status_message_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						      "status_message",
-						      GTK_SIGNAL_FUNC(status_message),
-						      model);
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	g_free(model->data);
-	model->data = NULL;
-	model->data_count = 0;
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-static gboolean
-get_view (EAddressbookModel *model)
-{
-	if (model->book && model->query) {
-		if (model->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities (model->book);
-			if (capabilities && strstr (capabilities, "local")) {
-				e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-			}
-			model->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-	}
-
-	model->get_view_idle = 0;
-	return FALSE;
-}
-
-ECard *
-e_addressbook_model_get_card(EAddressbookModel *model,
-			     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-static void
-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *model;
-
-	model = E_ADDRESSBOOK_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (model->book)
-			gtk_object_unref(GTK_OBJECT(model->book));
-		model->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		if (model->book) {
-			gtk_object_ref(GTK_OBJECT(model->book));
-			if (model->get_view_idle == 0)
-				model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-		}
-		break;
-	case ARG_QUERY:
-		if (model->query)
-			g_free(model->query);
-		model->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (model->get_view_idle == 0)
-			model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-		break;
-	case ARG_EDITABLE:
-		model->editable = GTK_VALUE_BOOL (*arg);
-		break;
-	}
-}
-
-static void
-e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *e_addressbook_model;
-
-	e_addressbook_model = E_ADDRESSBOOK_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_addressbook_model->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_addressbook_model->query);
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_addressbook_model->editable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GtkType
-e_addressbook_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookModel",
-			sizeof (EAddressbookModel),
-			sizeof (EAddressbookModelClass),
-			(GtkClassInitFunc) e_addressbook_model_class_init,
-			(GtkObjectInitFunc) e_addressbook_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_addressbook_model_new (void)
-{
-	EAddressbookModel *et;
-
-	et = gtk_type_new (e_addressbook_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
-
-void   e_addressbook_model_stop    (EAddressbookModel *model)
-{
-	remove_book_view(model);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 79a606b314..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_MODEL_H_
-#define _E_ADDRESSBOOK_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define E_ADDRESSBOOK_MODEL_TYPE        (e_addressbook_model_get_type ())
-#define E_ADDRESSBOOK_MODEL(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModel))
-#define E_ADDRESSBOOK_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_MODEL_TYPE))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_MODEL_TYPE))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EAddressbookModel EAddressbookModel;
-typedef struct _EAddressbookModelClass EAddressbookModelClass;
-
-struct _EAddressbookModel {
-	ETableModel parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECardSimple **data;
-	int data_count;
-
-	int create_card_id, remove_card_id, modify_card_id, status_message_id;
-
-	guint editable : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EAddressbookModelClass {
-	ETableModelClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EAddressbookModel *model, const gchar *message);
-};
-
-
-GtkType e_addressbook_model_get_type (void);
-ETableModel *e_addressbook_model_new (void);
-
-/* Returns object with ref count of 1. */
-ECard *e_addressbook_model_get_card(EAddressbookModel *model,
-				    int                row);
-void   e_addressbook_model_stop    (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 24070181f3..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-addressbook-view.h"
-
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "widgets/menus/gal-view-menus.h"
-
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-#include "e-addressbook-model.h"
-
-#include "e-minicard-view-widget.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "e-card-simple.h"
-#include "e-card.h"
-#include "e-book.h"
-
-#include "glade/glade-xml.h"
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-
-static void e_addressbook_view_init		(EAddressbookView		 *card);
-static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);
-static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_destroy (GtkObject *object);
-static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);
-
-static GtkTableClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_TYPE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_view_signals [LAST_SIGNAL] = {0, };
-
-GtkType
-e_addressbook_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookView",
-			sizeof (EAddressbookView),
-			sizeof (EAddressbookViewClass),
-			(GtkClassInitFunc) e_addressbook_view_class_init,
-			(GtkObjectInitFunc) e_addressbook_view_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_view_class_init (EAddressbookViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	object_class->set_arg = e_addressbook_view_set_arg;
-	object_class->get_arg = e_addressbook_view_get_arg;
-	object_class->destroy = e_addressbook_view_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_TYPE);
-
-	e_addressbook_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_view_signals, LAST_SIGNAL);
-}
-
-static void
-e_addressbook_view_init (EAddressbookView *eav)
-{
-	eav->view_type = E_ADDRESSBOOK_VIEW_NONE;
-
-	eav->book = NULL;
-	eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-
-	eav->object = NULL;
-	eav->widget = NULL;
-}
-
-static void
-e_addressbook_view_destroy (GtkObject *object)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	if (eav->book)
-		gtk_object_unref(GTK_OBJECT(eav->book));
-	g_free(eav->query);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_addressbook_view_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ()));
-	return widget;
-}
-
-static void
-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (eav->book) {
-			gtk_object_unref(GTK_OBJECT(eav->book));
-		}
-		if (GTK_VALUE_OBJECT(*arg)) {
-			eav->book = E_BOOK(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(eav->book));
-		}
-		else
-			eav->book = NULL;
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "book", eav->book,
-				       NULL);
-		break;
-	case ARG_QUERY:
-		g_free(eav->query);
-		eav->query = g_strdup(GTK_VALUE_STRING(*arg));
-		if (!eav->query)
-			eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "query", eav->query,
-				       NULL);
-		break;
-	case ARG_TYPE:
-		change_view_type(eav, GTK_VALUE_ENUM(*arg));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		if (eav->book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav->book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = eav->query;
-		break;
-	case ARG_TYPE:
-		GTK_VALUE_ENUM (*arg) = eav->view_type;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-
-typedef struct {
-	EAddressbookView *view;
-	char letter;
-} LetterClosure;
-
-static void
-jump_to_letter(GtkWidget *button, LetterClosure *closure)
-{
-	if (closure->view->widget && E_IS_MINICARD_VIEW_WIDGET(closure->view->widget))
-		e_minicard_view_widget_jump_to_letter(E_MINICARD_VIEW_WIDGET(closure->view->widget), closure->letter);
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	g_free(closure);
-}
-
-static void
-connect_button (EAddressbookView *view, GladeXML *gui, char letter)
-{
-	char *name;
-	GtkWidget *button;
-	LetterClosure *closure;
-	name = g_strdup_printf("button-%c", letter);
-	button = glade_xml_get_widget(gui, name);
-	g_free(name);
-	if (!button)
-		return;
-	closure = g_new(LetterClosure, 1);
-	closure->view = view;
-	closure->letter = letter;
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(jump_to_letter), closure);
-	gtk_signal_connect(GTK_OBJECT(button), "destroy",
-			   GTK_SIGNAL_FUNC(free_closure), closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget;
-	char letter;
-	GladeXML *gui = glade_xml_new (EVOLUTION_GLADEDIR "/alphabet.glade", NULL);
-
-	widget = glade_xml_get_widget(gui, "scrolledwindow-top");
-	if (!widget) {
-		return NULL;
-	}
-	
-	connect_button(view, gui, '1');
-	for (letter = 'a'; letter <= 'z'; letter ++) {
-		connect_button(view, gui, letter);
-	}
-	
-	gtk_object_unref(GTK_OBJECT(gui));
-	return widget;
-}
-
-static void
-create_minicard_view (EAddressbookView *view)
-{
-	GtkWidget *scrollframe;
-	GtkWidget *alphabet;
-	GtkWidget *minicard_view;
-	GtkWidget *minicard_hbox;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	minicard_hbox = gtk_hbox_new(FALSE, 0);
-
-	minicard_view = e_minicard_view_widget_new();
-
-	view->object = GTK_OBJECT(minicard_view);
-	view->widget = minicard_hbox;
-
-	scrollframe = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);
-
-
-	gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);
-
-	alphabet = create_alphabet(view);
-	if (alphabet) {
-		gtk_object_ref(GTK_OBJECT(alphabet));
-		gtk_widget_unparent(alphabet);
-		gtk_box_pack_start(GTK_BOX(minicard_hbox), alphabet, FALSE, FALSE, 0);
-		gtk_object_unref(GTK_OBJECT(alphabet));
-	}
-
-	gtk_table_attach(GTK_TABLE(view), minicard_hbox,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show_all( GTK_WIDGET(minicard_hbox) );
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-}
-
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		ECard *card = e_addressbook_model_get_card(model, row);
-		EBook *book;
-		EContactEditor *ce;
-		
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &book,
-			       NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		ce = e_contact_editor_new (card, FALSE);
-
-		gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-				    GTK_SIGNAL_FUNC (add_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-				    GTK_SIGNAL_FUNC (commit_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-				    GTK_SIGNAL_FUNC (delete_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-typedef struct {
-	EBook *book;
-	ECard *card;
-	EAddressbookView *view;
-	GtkWidget *widget;
-	gpointer closure;
-} CardAndBook;
-
-static void
-card_and_book_free (CardAndBook *card_and_book)
-{
-	gtk_object_unref(GTK_OBJECT(card_and_book->card));
-	gtk_object_unref(GTK_OBJECT(card_and_book->book));
-	gtk_object_unref(GTK_OBJECT(card_and_book->view));
-}
-
-static void
-get_card_list_1(gint model_row,
-	      gpointer closure)
-{
-	CardAndBook *card_and_book;
-	GList **list;
-	EAddressbookView *view;
-	ECard *card;
-
-	card_and_book = closure;
-	list = card_and_book->closure;
-	view = card_and_book->view;
-
-	card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(view->object), model_row);
-	*list = g_list_prepend(*list, card);
-}
-
-static GList *
-get_card_list (CardAndBook *card_and_book)
-{
-	GList *list = NULL;
-	ETable *table;
-
-	table = E_TABLE(card_and_book->widget);
-	card_and_book->closure = &list;
-	e_table_selected_row_foreach(table,
-				     get_card_list_1,
-				     card_and_book);
-	return list;
-}
-
-static void
-save_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_contact_save_as(_("Save as VCard"), card_and_book->card);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_to (GtkWidget *widget, CardAndBook *card_and_book)
-
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_TO);
-	card_and_book_free(card_and_book);
-}
-
-static void
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) {
-		GList *list = get_card_list(card_and_book);
-		GList *iterator;
-		for (iterator = list; iterator; iterator = iterator->next) {
-			ECard *card = iterator->data;
-			/* Add the card in the contact editor to our ebook */
-			e_book_remove_card (card_and_book->book,
-					    card,
-					    NULL,
-					    NULL);
-		}
-		e_free_object_list(list);
-	}
-	card_and_book_free(card_and_book);
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		CardAndBook *card_and_book;
-
-		EPopupMenu menu[] = {
-			{"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, 
-			{"Send contact to other", NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			{"Send message to contact", NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			{"Print", NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-			{"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-			{"Delete", NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
-			{NULL, NULL, NULL, NULL, 0}
-		};
-
-		card_and_book = g_new(CardAndBook, 1);
-		card_and_book->card = e_addressbook_model_get_card(model, row);
-		card_and_book->widget = GTK_WIDGET(table);
-		card_and_book->view = view;
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &(card_and_book->book),
-			       NULL);
-
-		gtk_object_ref(GTK_OBJECT(card_and_book->book));
-		gtk_object_ref(GTK_OBJECT(card_and_book->view));
-
-		e_popup_menu_run (menu, event, 0, 0, card_and_book);
-		return TRUE;
-	} else
-		return FALSE;
-}
-
-static void
-status_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [STATUS_MESSAGE],
-			 status);
-}
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("* Click here to add a contact *"),
-	N_("Name"),
-	N_("Email"),
-	N_("Primary"),
-	N_("Business"),
-	N_("Home"),
-	N_("Organization"),
-	N_("Mobile"),
-	N_("Car"),
-	N_("Business Fax"),
-	N_("Home Fax"),
-	N_("Business 2"),
-	N_("Home 2"),
-	N_("ISDN"),
-	N_("Other"),
-	N_("Pager"),
-	N_("Email 2"),
-	N_("Email 3"),
-	N_("Web Site"),
-	N_("Department"),
-	N_("Office"),
-	N_("Title"),
-	N_("Profession"),
-	N_("Manager"),
-	N_("Assistant"),
-	N_("Nickname"),
-	N_("Spouse"),
-	N_("Note"),
-	N_("Free-busy URL"),
-	N_("Click here to add a contact")
-};
-#endif
-
-#define SPEC "<?xml version=\"1.0\"?>      \
-<ETableSpecification click-to-add=\"true\" draw-grid=\"true\" _click-to-add-message=\"* Click here to add a contact *\">   \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"2\" _title=\"Email\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Primary\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Organization\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Mobile\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Car\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Business Fax\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Home Fax\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Business 2\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Home 2\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"ISDN\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Pager\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"Email 2\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Email 3\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Web Site\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Department\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Office\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"Title\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"Profession\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Manager\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Assistant\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Nickname\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Spouse\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Note\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Free-busy URL\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"3\"/>                 \
-    <column source=\"4\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *model;
-	ECardSimple *simple;
-	GtkWidget *table;
-	
-	simple = e_card_simple_new(NULL);
-
-	model = e_addressbook_model_new();
-
-	/* Here we create the table.  We give it the three pieces of
-	   the table we've created, the header, the model, and the
-	   initial layout.  It does the rest.  */
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	view->object = GTK_OBJECT(model);
-	view->widget = table;
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "double_click",
-			   GTK_SIGNAL_FUNC(table_double_click), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "right_click",
-			   GTK_SIGNAL_FUNC(table_right_click), view);
-
-	gtk_table_attach(GTK_TABLE(view), table,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show( GTK_WIDGET(table) );
-
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-
-static void
-change_view_type (EAddressbookView *view, EAddressbookViewType view_type)
-{
-	if (view_type == view->view_type)
-		return;
-
-	if (view->widget) {
-		gtk_widget_destroy (view->widget);
-		view->widget = NULL;
-	}
-	view->object = NULL;
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		create_minicard_view (view);
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		create_table_view (view);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}
-
-	view->view_type = view_type;
-
-	gtk_signal_connect (view->object,
-			    "status_message",
-			    GTK_SIGNAL_FUNC (status_message),
-			    view);
-
-	gtk_object_set(view->object,
-		       "query", view->query,
-		       "book", view->book,
-		       NULL);
-}
-
-static void
-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)
-{
-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	gtk_object_unref(GTK_OBJECT(printable));
-	gtk_object_unref(GTK_OBJECT(table));
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       5 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		gnome_print_master_print(master);
-		gtk_object_unref(GTK_OBJECT(master));
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		gtk_object_unref(GTK_OBJECT(master));
-		break;
-	case GNOME_PRINT_CANCEL:
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	EAddressbookView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_TABLE);
-		e_table_set_state_object(e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)), GAL_VIEW_ETABLE(view)->state);
-	} else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);
-	}
-}
-
-void
-e_addressbook_view_setup_menus (EAddressbookView *view,
-				BonoboUIComponent *uic)
-{
-	GalViewCollection *collection;
-	GalViewMenus *views;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	collection = gal_view_collection_new();
-
-	galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
-	gal_view_collection_set_storage_directories(collection,
-						    EVOLUTION_DATADIR "/evolution/views/addressbook/",
-						    galview);
-	g_free(galview);
-
-	spec = e_table_specification_new();
-	e_table_specification_load_from_string(spec, SPEC);
-
-	factory = gal_view_factory_etable_new(spec);
-	gal_view_collection_add_factory(collection, factory);
-	gtk_object_sink(GTK_OBJECT(factory));
-
-	factory = gal_view_factory_minicard_new();
-	gal_view_collection_add_factory(collection, factory);
-	gtk_object_sink(GTK_OBJECT(factory));
-
-	gal_view_collection_load(collection);
-
-	views = gal_view_menus_new(collection);
-	gal_view_menus_apply(views, uic, NULL); /* This function probably needs to sink the views object. */
-	gtk_signal_connect(GTK_OBJECT(collection), "display_view",
-			   display_view, view);
-	/*	gtk_object_sink(GTK_OBJECT(views)); */
-
-	gtk_object_sink(GTK_OBJECT(collection));
-}
-
-void
-e_addressbook_view_print(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		gtk_object_get (view->object,
-				"query", &query,
-				"book", &book,
-				NULL);
-		print = e_contact_print_dialog_new(book, query);
-		g_free(query);
-		gtk_widget_show_all(print);
-	} else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
-		GtkWidget *dialog;
-		EPrintable *printable;
-		ETable *etable;
-
-		dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-		gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-						       NULL, NULL, NULL);
-
-		gtk_object_get(GTK_OBJECT(view->widget), "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-
-		gtk_object_ref(GTK_OBJECT(view->widget));
-
-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view->widget);
-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);
-		
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);
-		gtk_widget_show(dialog);
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was deleted\n", __FILE__, __FUNCTION__);
-}
-
-void
-e_addressbook_view_delete_selection(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
-		e_minicard_view_widget_remove_selection (E_MINICARD_VIEW_WIDGET(view->object), card_deleted_cb, NULL);
-}
-
-void
-e_addressbook_view_show_all(EAddressbookView *view)
-{
-	gtk_object_set(GTK_OBJECT(view),
-		       "query", NULL,
-		       NULL);
-}
-
-void
-e_addressbook_view_stop(EAddressbookView *view)
-{
-	switch(view->view_type) {
- 	case E_ADDRESSBOOK_VIEW_MINICARD:
-		e_minicard_view_widget_stop(E_MINICARD_VIEW_WIDGET (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		e_addressbook_model_stop(E_ADDRESSBOOK_MODEL (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_NONE:
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index ca6cedf0b8..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_VIEW_H__
-#define __E_ADDRESSBOOK_VIEW_H__
-
-#include <gnome.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EAddressbookView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())
-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))
-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-
-typedef enum {
-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
-	E_ADDRESSBOOK_VIEW_TABLE,
-	E_ADDRESSBOOK_VIEW_MINICARD
-} EAddressbookViewType;
-
-
-typedef struct _EAddressbookView       EAddressbookView;
-typedef struct _EAddressbookViewClass  EAddressbookViewClass;
-
-struct _EAddressbookView
-{
-	GtkTable parent;
-	
-	/* item specific fields */
-	EAddressbookViewType view_type;
-
-	EBook *book;
-	char  *query;
-
-	GtkObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *vbox;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EAddressbookView *view, const gchar *message);
-};
-
-GtkWidget *e_addressbook_view_new               (void);
-GtkType    e_addressbook_view_get_type          (void);
-
-void       e_addressbook_view_setup_menus       (EAddressbookView  *view,
-						 BonoboUIComponent *uic);
-
-void       e_addressbook_view_print             (EAddressbookView  *view);
-void       e_addressbook_view_delete_selection  (EAddressbookView  *view);
-void       e_addressbook_view_show_all          (EAddressbookView  *view);
-void       e_addressbook_view_stop              (EAddressbookView  *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c
deleted file mode 100644
index 0efc7d69ab..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-minicard-control.c
- *
- * Authors:
- *    Chris Lahey <clahey@helixcode.com>
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "addressbook/backend/ebook/e-book.h"
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#if 0
-enum {
-	PROP_RUNNING
-} MyArgs;
-
-#define RUNNING_KEY  "Clock::Running"
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GtkObject *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		gboolean b = GPOINTER_TO_UINT (gtk_object_get_data (clock, RUNNING_KEY));
-		BONOBO_ARG_SET_BOOLEAN (arg, b);
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GtkClock *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		guint i;
-
-		i = BONOBO_ARG_GET_BOOLEAN (arg);
-
-		if (i)
-			gtk_clock_start (clock);
-		else
-			gtk_clock_stop (clock);
-
-		gtk_object_set_data (GTK_OBJECT (clock), RUNNING_KEY,
-				     GUINT_TO_POINTER (i));
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-#endif
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	ECard *card;
-	char *vcard;
-	GtkWidget *minicard = data;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	card = e_card_new(vcard);
-	g_free(vcard);
-	gtk_object_set(GTK_OBJECT(minicard),
-		       "card", card,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	char                *vcard;
-	ECard               *card;
-	EMinicardWidget     *minicard = data;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	gtk_object_get (GTK_OBJECT (minicard),
-			"card", &card,
-			NULL);
-	vcard = e_card_get_vcard(card);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-  GtkWidget *minicard = data;
-  ECard *card;
-  char *vcard;
-  gint length;
-  
-  gtk_object_get (GTK_OBJECT (minicard),
-		  "card", &card, NULL);
-  vcard = e_card_get_vcard(card);
-  length = strlen (vcard);
-  g_free (vcard);
-
-  return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = closure;
-	e_book_add_card(book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-save_in_addressbook(GtkWidget *button, EMinicardWidget *minicard)
-{
-	EBook *book;
-	gchar *path, *uri;
-	ECard *card;
-
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	gtk_object_get(GTK_OBJECT(minicard),
-		       "card", &card,
-		       NULL);
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (! e_book_load_uri (book, uri, book_open_cb, card)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	GtkWidget	   *minicard;
-	GtkWidget          *button;
-	GtkWidget          *vbox;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(save_in_addressbook), minicard);
-	gtk_widget_show (button);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard);
-
-#if 0
-	/* Create the properties. */
-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);
-	bonobo_control_set_properties (control, pb);
-
-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,
-				 BONOBO_ARG_BOOLEAN, NULL,
-				 "Whether or not the clock is running", 0);
-#endif
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_minicard_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory",
-			e_minicard_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a EMinicard control factory.");
-}
diff --git a/addressbook/gui/widgets/e-minicard-control.h b/addressbook/gui/widgets/e-minicard-control.h
deleted file mode 100644
index 4a0da88435..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __E_MINICARD_CONTROL_H__
-#define __E_MINICARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_minicard_control_factory_init (void);
-
-#endif /* __E_MINICARD_CONTROL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
deleted file mode 100644
index 6795702454..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard-label.h"
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-static void e_minicard_label_init		(EMinicardLabel		 *card);
-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
-static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_label_realize (GnomeCanvasItem *item);
-static void e_minicard_label_unrealize (GnomeCanvasItem *item);
-static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags);
-
-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_FIELD,
-	ARG_FIELDNAME,
-	ARG_TEXT_MODEL,
-	ARG_MAX_FIELD_NAME_WIDTH,
-};
-
-GtkType
-e_minicard_label_get_type (void)
-{
-  static GtkType minicard_label_type = 0;
-
-  if (!minicard_label_type)
-    {
-      static const GtkTypeInfo minicard_label_info =
-      {
-        "EMinicardLabel",
-        sizeof (EMinicardLabel),
-        sizeof (EMinicardLabelClass),
-        (GtkClassInitFunc) e_minicard_label_class_init,
-        (GtkObjectInitFunc) e_minicard_label_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_label_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_label_info);
-    }
-
-  return minicard_label_type;
-}
-
-static void
-e_minicard_label_class_init (EMinicardLabelClass *klass)
-{
-  GtkObjectClass *object_class;
-  GnomeCanvasItemClass *item_class;
-
-  object_class = (GtkObjectClass*) klass;
-  item_class = (GnomeCanvasItemClass *) klass;
-
-  parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-  gtk_object_add_arg_type ("EMinicardLabel::width", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READWRITE, ARG_WIDTH); 
-  gtk_object_add_arg_type ("EMinicardLabel::height", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READABLE, ARG_HEIGHT);
-  gtk_object_add_arg_type ("EMinicardLabel::has_focus", GTK_TYPE_BOOL, 
-			   GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-  gtk_object_add_arg_type ("EMinicardLabel::field", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELD);
-  gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELDNAME);
-  gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,
-			   GTK_ARG_READWRITE, ARG_TEXT_MODEL);
-  gtk_object_add_arg_type ("EMinicardLabel::max_field_name_length", GTK_TYPE_DOUBLE,
-			   GTK_ARG_READWRITE, ARG_MAX_FIELD_NAME_WIDTH);
- 
-  object_class->set_arg = e_minicard_label_set_arg;
-  object_class->get_arg = e_minicard_label_get_arg;
-  /*  object_class->destroy = e_minicard_label_destroy; */
-  
-  /* GnomeCanvasItem method overrides */
-  item_class->realize     = e_minicard_label_realize;
-  item_class->unrealize   = e_minicard_label_unrealize;
-  item_class->event       = e_minicard_label_event;
-}
-
-static void
-e_minicard_label_init (EMinicardLabel *minicard_label)
-{
-  minicard_label->width = 10;
-  minicard_label->height = 10;
-  minicard_label->rect = NULL;
-  minicard_label->fieldname = NULL;
-  minicard_label->field = NULL;
-
-  minicard_label->max_field_name_length = -1;
-
-  e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
-}
-
-static void
-e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardLabel *e_minicard_label;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard_label = E_MINICARD_LABEL (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
-		e_minicard_label_resize_children(e_minicard_label);
-		e_canvas_item_request_reflow (item);
-		break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard_label->field && (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))
-			e_canvas_item_grab_focus(e_minicard_label->field);
-		break;
-	case ARG_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", GTK_VALUE_OBJECT (*arg), NULL);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		e_minicard_label->max_field_name_length = GTK_VALUE_DOUBLE (*arg);
-		break;
-	}
-}
-
-static void
-e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardLabel *e_minicard_label;
-	char *temp;
-	ETextModel *tempmodel;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
-		break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_FIELD:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_FIELDNAME:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_TEXT_MODEL:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "model", &tempmodel, NULL );
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->max_field_name_length;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_label_realize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
-	  (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
-	e_canvas_item_request_reflow(item);
-	
-	if (!item->canvas->aa)
-	  {
-	  }
-}
-
-void
-e_minicard_label_construct (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasGroup *group;
-	GdkFont *font;
-
-	font = ((GtkWidget *) item->canvas)->style->font;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	e_minicard_label->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard_label->width - 1,
-				 "y2", (double) e_minicard_label->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-	e_minicard_label->fieldname =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 "draw_background", FALSE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
-
-	e_minicard_label->field =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 "editable", TRUE,
-				 "draw_background", FALSE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_label_unrealize (GnomeCanvasItem *item)
-{
-  EMinicardLabel *e_minicard_label;
-
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-  EMinicardLabel *e_minicard_label;
- 
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  switch( event->type )
-    {
-    case GDK_FOCUS_CHANGE:
-      {
-	GdkEventFocus *focus_event = (GdkEventFocus *) event;
-	if ( focus_event->in )
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", "grey50", 
-				   "fill_color", "grey90",
-				   NULL );
-	    e_minicard_label->has_focus = TRUE;
-	  }
-	else
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", NULL, 
-				   "fill_color", NULL,
-				   NULL );
-	    e_minicard_label->has_focus = FALSE;
-	  }
-      }
-      break;
-    case GDK_BUTTON_PRESS:
-    case GDK_BUTTON_RELEASE: 
-    case GDK_MOTION_NOTIFY:
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY: {
-	    gboolean return_val;
-#if 0
-	    GnomeCanvasItem *field;
-	    ArtPoint p;
-	    double inv[6], affine[6];
-	    
-	    field = e_minicard_label->field;
-	    art_affine_identity (affine);
-	    
-	    if (field->xform != NULL) {
-		    if (field->object.flags & GNOME_CANVAS_ITEM_AFFINE_FULL) {
-			    art_affine_multiply (affine, affine, field->xform);
-		    } else {
-			    affine[4] += field->xform[0];
-			    affine[5] += field->xform[1];
-		    }
-	    }
-	    
-	    art_affine_invert (inv, affine);
-	    switch(event->type) {
-	    case GDK_MOTION_NOTIFY:
-		    p.x = event->motion.x;
-		    p.y = event->motion.y;
-		    art_affine_point (&p, &p, inv);
-		    event->motion.x = p.x;
-		    event->motion.y = p.y;
-		    break;
-	    case GDK_BUTTON_PRESS:
-	    case GDK_BUTTON_RELEASE:
-		    p.x = event->button.x;
-		    p.y = event->button.y;
-		    art_affine_point (&p, &p, inv);
-		    event->button.x = p.x;
-		    event->button.y = p.y;
-		    break;
-	    case GDK_ENTER_NOTIFY:
-	    case GDK_LEAVE_NOTIFY:
-		    p.x = event->crossing.x;
-		    p.y = event->crossing.y;
-		    art_affine_point (&p, &p, inv);
-		    event->crossing.x = p.x;
-		    event->crossing.y = p.y;
-		    break;
-	    default:
-		    break;
-	    }
-#endif	    
-	    gtk_signal_emit_by_name(GTK_OBJECT(e_minicard_label->field), "event", event, &return_val);
-	    return return_val;
-	    break;
-    }
-    default:
-	    break;
-    }
-  
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-    return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-  else
-    return 0;
-}
-
-static void
-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
-{
-	double left_width;
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_width", (double) ( left_width ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) ( e_minicard_label->width - 8 - left_width ),
-			       NULL );
-}
-
-static void
-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
-{
-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
-	
-	gint old_height;
-	gdouble text_height;
-	gdouble left_width;
-
-	old_height = e_minicard_label->height;
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname), 
-		       "text_height", &text_height,
-		       NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->field), 
-		       "text_height", &text_height,
-		       NULL);
-
-	if (e_minicard_label->height < text_height)
-		e_minicard_label->height = text_height;
-	e_minicard_label->height += 3;
-
-	gnome_canvas_item_set( e_minicard_label->rect,
-			       "x2", (double) e_minicard_label->width - 1,
-			       "y2", (double) e_minicard_label->height - 1,
-			       NULL );
-
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	e_canvas_item_move_absolute(e_minicard_label->field, left_width + 6, 1);
-
-	if (old_height != e_minicard_label->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-GnomeCanvasItem *
-e_minicard_label_new(GnomeCanvasGroup *parent)
-{
-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
-	e_minicard_label_construct(item);
-	return item;
-}
-
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
deleted file mode 100644
index 08eb51ee53..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardLabel - A label doing focus with non-marching ants.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the label
- * height       double          R               height of the label
- * field        string          RW              text in the field label
- * fieldname    string          RW              text in the fieldname label
- */
-
-#define E_MINICARD_LABEL_TYPE			(e_minicard_label_get_type ())
-#define E_MINICARD_LABEL(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_LABEL_TYPE, EMinicardLabel))
-#define E_MINICARD_LABEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_LABEL_TYPE, EMiniCardLabelClass))
-#define E_IS_MINICARD_LABEL(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-#define E_IS_MINICARD_LABEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-
-
-typedef struct _EMinicardLabel       EMinicardLabel;
-typedef struct _EMinicardLabelClass  EMinicardLabelClass;
-
-struct _EMinicardLabel
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	double width;
-	double height;
-	double max_field_name_length;
-	GnomeCanvasItem *fieldname;
-	GnomeCanvasItem *field;
-	GnomeCanvasItem *rect;
-
-	gboolean has_focus;
-};
-
-struct _EMinicardLabelClass
-{
-	GnomeCanvasGroupClass parent_class;
-};
-
-
-GtkType    e_minicard_label_get_type (void);
-GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
-void e_minicard_label_construct (GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
deleted file mode 100644
index fbbcd6cf00..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view-widget.h"
-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_destroy       (GtkObject *object);
-static void e_minicard_view_widget_reflow        (ECanvas *canvas);
-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-enum {
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_view_widget_signals [LAST_SIGNAL] = {0, };
-
-
-GtkType
-e_minicard_view_widget_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "EMinicardViewWidget",
-        sizeof (EMinicardViewWidget),
-        sizeof (EMinicardViewWidgetClass),
-        (GtkClassInitFunc) e_minicard_view_widget_class_init,
-        (GtkObjectInitFunc) e_minicard_view_widget_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (e_canvas_get_type (), &info);
-    }
-
-  return type;
-}
-
-static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	gtk_object_add_arg_type ("EMinicardViewWidget::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardViewWidget::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-
-	e_minicard_view_widget_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_minicard_view_widget_signals, LAST_SIGNAL);
-
-	object_class->set_arg       = e_minicard_view_widget_set_arg;
-	object_class->get_arg       = e_minicard_view_widget_get_arg;
-	object_class->destroy       = e_minicard_view_widget_destroy;
-
-	widget_class->realize       = e_minicard_view_widget_realize;
-	widget_class->size_allocate = e_minicard_view_widget_size_allocate;
-
-	canvas_class->reflow        = e_minicard_view_widget_reflow;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-	view->rect = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (void)
-{
-	return GTK_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));
-}
-
-static void
-e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (emvw->book)
-			gtk_object_unref(GTK_OBJECT(emvw->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			emvw->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			if (emvw->book)
-				gtk_object_ref(GTK_OBJECT(emvw->book));
-		} else
-			emvw->book = NULL;
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "book", emvw->book,
-				       NULL);
-		break;
-	case ARG_QUERY:
-		emvw->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "query", emvw->query,
-				       NULL);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emvw->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(emvw->query);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_destroy (GtkObject *object)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);
-
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	g_free(view->query);
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-status_message (EMinicardView *mini_view,
-		char* status,
-		EMinicardViewWidget *view)
-{
-	gtk_signal_emit (GTK_OBJECT (view),
-			 e_minicard_view_widget_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	view->rect = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color", "white",
-		NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		NULL );
-
-	gtk_signal_connect(GTK_OBJECT(view->emv),
-			   "status_message",
-			   GTK_SIGNAL_FUNC(status_message),
-			   view);
-
-	gtk_object_set(GTK_OBJECT(view->emv),
-		       "book", view->book,
-		       "query", view->query,
-		       NULL);
-
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS(parent_class)->realize (widget);
-}
-
-static void
-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-	
-	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-		gnome_canvas_item_set( view->emv,
-				       "height", (double) allocation->height,
-				       NULL );
-		gnome_canvas_item_set( view->emv,
-				       "minimum_width", (double) allocation->width,
-				       NULL );
-		gtk_object_get(GTK_OBJECT(view->emv),
-			       "width", &width,
-			       NULL);
-		width = MAX(width, allocation->width);
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1);
-		gnome_canvas_item_set( view->rect,
-				       "x2", (double) width,
-				       "y2", (double) allocation->height,
-				       NULL );
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	gtk_object_get(GTK_OBJECT(view->emv),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-	gnome_canvas_item_set( view->rect,
-			       "x2", (double) width,
-			       "y2", (double) GTK_WIDGET(canvas)->allocation.height,
-			       NULL );	
-}
-
-void
-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,
-					EBookCallback  cb,
-					gpointer       closure)
-{
-	if (view->emv)
-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view->emv), cb, closure);
-}
-
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter)
-{
-	if (view->emv)
-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view->emv), letter);
-}
-
-void
-e_minicard_view_widget_stop(EMinicardViewWidget *view)
-{
-	e_minicard_view_stop(E_MINICARD_VIEW(view->emv));
-}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
deleted file mode 100644
index 0deb920ffa..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gnome.h>
-#include "e-minicard-view.h"
-#include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_MINICARD_VIEW_WIDGET_TYPE			(e_minicard_view_widget_get_type ())
-#define E_MINICARD_VIEW_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget))
-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-
-
-typedef struct _EMinicardViewWidget       EMinicardViewWidget;
-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
-
-struct _EMinicardViewWidget
-{
-	ECanvas parent;
-
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *emv;
-
-	EBook *book;
-	char *query;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EMinicardView *mini_view, const gchar *message);
-};
-
-GtkType    e_minicard_view_widget_get_type (void);
-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,
-						    EBookCallback  cb,
-						    gpointer       closure);
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter);
-void       e_minicard_view_widget_stop             (EMinicardViewWidget *view);						    
-
-GtkWidget *e_minicard_view_widget_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
deleted file mode 100644
index 3e3b1ceaf0..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view.h"
-#include "e-minicard.h"
-#include "e-contact-editor.h"
-static void e_minicard_view_init		(EMinicardView		 *reflow);
-static void e_minicard_view_class_init	(EMinicardViewClass	 *klass);
-static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_destroy (GtkObject *object);
-static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event);
-static void canvas_destroy (GtkObject *object, EMinicardView *view);
-static void disconnect_signals (EMinicardView *view);
-static void e_minicard_view_update_selection (EMinicardView *view);
-
-static EReflowSortedClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-enum {
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_view_signals [LAST_SIGNAL] = {0, };
-
-GtkType
-e_minicard_view_get_type (void)
-{
-  static GtkType reflow_type = 0;
-
-  if (!reflow_type)
-    {
-      static const GtkTypeInfo reflow_info =
-      {
-        "EMinicardView",
-        sizeof (EMinicardView),
-        sizeof (EMinicardViewClass),
-        (GtkClassInitFunc) e_minicard_view_class_init,
-        (GtkObjectInitFunc) e_minicard_view_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      reflow_type = gtk_type_unique (e_reflow_sorted_get_type (), &reflow_info);
-    }
-
-  return reflow_type;
-}
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-	
-	parent_class = gtk_type_class (e_reflow_sorted_get_type ());
-	
-	gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-
-	e_minicard_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_minicard_view_signals, LAST_SIGNAL);
-	
-	object_class->set_arg   = e_minicard_view_set_arg;
-	object_class->get_arg   = e_minicard_view_get_arg;
-	object_class->destroy   = e_minicard_view_destroy;
-
-	item_class->event       = e_minicard_view_event;
-	
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-selection_changed (ESelectionModel *selection, EMinicardView *view)
-{
-	e_minicard_view_update_selection (view);
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->book = NULL;
-	view->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	view->book_view = NULL;
-	view->get_view_idle = 0;
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-	view->status_message_id = 0;
-	view->canvas_destroy_id = 0;
-	view->first_get_view = TRUE;
-
-	view->selection = e_selection_model_simple_new();
-
-	gtk_signal_connect(GTK_OBJECT(view->selection), "selection_changed",
-			   GTK_SIGNAL_FUNC(selection_changed), view);
-	
-	gtk_object_set(GTK_OBJECT(view),
-		       "empty_message", _("\n\nThere are no items to show in this view\n\n"
-					  "Double-click here to create a new Contact."),
-		       NULL);
-
-	E_REFLOW_SORTED(view)->compare_func = (GCompareFunc) e_minicard_compare;
-	E_REFLOW_SORTED(view)->string_func  = (EReflowStringFunc) e_minicard_get_card_id;
-}
-
-static gint
-card_selected (EMinicard *card, GdkEvent *event, EMinicardView *view)
-{
-	int i = 0;
-	GList *item;
-	for (item = E_REFLOW(view)->items; item->data != card; item = item->next, i++)
-		/* Empty for loop */;
-	switch(event->type) {
-	case GDK_BUTTON_PRESS:
-		e_selection_model_do_something(E_SELECTION_MODEL(view->selection), i, 0, event->button.state);
-		return TRUE;
-		break;
-	default:
-		e_selection_model_do_something(E_SELECTION_MODEL(view->selection), i, 0, 0);
-		return FALSE;
-		break;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		int position;
-		GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view),
-							      e_minicard_get_type(),
-							      "card", cards->data,
-							      NULL);
-		gtk_signal_connect(GTK_OBJECT(item), "selected",
-				   GTK_SIGNAL_FUNC(card_selected), view);
-
-		e_reflow_add_item(E_REFLOW(view), item, &position);
-
-		e_selection_model_simple_insert_row(view->selection, position);
-	}
-}
-
-static void
-modify_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		ECard *card = cards->data;
-		gchar *id = e_card_get_id(card);
-		GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id, NULL);
-		if (item && !GTK_OBJECT_DESTROYED(item)) {
-			int old_pos;
-			int new_pos;
-
-			gnome_canvas_item_set(item,
-					      "card", card,
-					      NULL);
-
-			e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), id, &old_pos, &new_pos);
-
-			e_selection_model_simple_move_row(view->selection, old_pos, new_pos);
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EMinicardView *view)
-{
-	gtk_signal_emit (GTK_OBJECT (view),
-			 e_minicard_view_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-remove_card(EBookView *book_view, const char *id, EMinicardView *view)
-{
-	int position;
-	e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id, &position);
-	e_selection_model_simple_delete_row(view->selection, position);
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EMinicardView *view = closure;
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-
-	if (!view->canvas_destroy_id)
-		view->canvas_destroy_id = 
-			gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)->canvas),
-					   "destroy", GTK_SIGNAL_FUNC(canvas_destroy),
-					   view);
-
-	view->book_view = book_view;
-	if (view->book_view)
-		gtk_object_ref(GTK_OBJECT(view->book_view));
-	
-
-	view->create_card_id =
-		gtk_signal_connect(GTK_OBJECT(view->book_view),
-				   "card_added",
-				   GTK_SIGNAL_FUNC(create_card),
-				   view);
-	view->remove_card_id =
-		gtk_signal_connect(GTK_OBJECT(view->book_view),
-				   "card_removed",
-				   GTK_SIGNAL_FUNC(remove_card),
-				   view);
-	view->modify_card_id =
-		gtk_signal_connect(GTK_OBJECT(view->book_view),
-				   "card_changed",
-				   GTK_SIGNAL_FUNC(modify_card),
-				   view);
-	view->status_message_id =
-		gtk_signal_connect(GTK_OBJECT(view->book_view),
-				   "status_message",
-				   GTK_SIGNAL_FUNC(status_message),
-				   view);
-
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_unref, NULL);
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_destroy, NULL);
-	g_list_free(E_REFLOW(view)->items);
-	E_REFLOW(view)->items = NULL;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view));
-}
-
-static gboolean
-get_view(EMinicardView *view)
-{
-	if (view->book && view->query) {
-		if (view->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities(view->book);
-			if (strstr(capabilities, "local")) {
-				e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-			}
-			view->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-	}
-
-	view->get_view_idle = 0;
-	return FALSE;
-}
-
-static void
-e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardView *view;
-
-	item = GNOME_CANVAS_ITEM (o);
-	view = E_MINICARD_VIEW (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (view->book)
-			gtk_object_unref(GTK_OBJECT(view->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			view->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			gtk_object_ref(GTK_OBJECT(view->book));
-			if (view->get_view_idle == 0)
-				view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		}
-		else
-			view->book = NULL;
-		break;
-	case ARG_QUERY:
-		g_free(view->query);
-		view->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (view->get_view_idle == 0)
-			view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardView *e_minicard_view;
-
-	e_minicard_view = E_MINICARD_VIEW (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard_view->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_minicard_view->query);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_destroy (GtkObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->get_view_idle)
-		g_source_remove(view->get_view_idle);
-	if (view->canvas_destroy_id)
-		gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)->canvas),
-				      view->canvas_destroy_id);
-	disconnect_signals(view);
-	g_free(view->query);
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static gboolean
-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
- 
-	view = E_MINICARD_VIEW (item);
-
-	switch( event->type ) {
-	case GDK_2BUTTON_PRESS:
-		if (((GdkEventButton *)event)->button == 1)
-		{
-			ECard *card;
-			EContactEditor *ce;
-			EBook *book;
-
-			card = e_card_new("");
-
-			gtk_object_get(GTK_OBJECT(view), "book", &book, NULL);
-			g_assert (E_IS_BOOK (book));
-
-			ce = e_contact_editor_new (card, TRUE);
-
-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-					    GTK_SIGNAL_FUNC (add_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-					    GTK_SIGNAL_FUNC (commit_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-					    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-			gtk_object_sink(GTK_OBJECT(card));
-		}
-		return TRUE;
-	default:
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-		else
-			return FALSE;
-		break;
-	}
-}
-
-static void
-disconnect_signals(EMinicardView *view)
-{
-	if (view->book_view && view->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->create_card_id);
-	if (view->book_view && view->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->remove_card_id);
-	if (view->book_view && view->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->modify_card_id);
-	if (view->book_view && view->status_message_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->status_message_id);
-
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-	view->status_message_id = 0;
-}
-
-static void
-canvas_destroy(GtkObject *object, EMinicardView *view)
-{
-	disconnect_signals(view);
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	if (view->book) {
-		EReflow *reflow = E_REFLOW(view);
-		GList *list;
-		for (list = reflow->items; list; list = g_list_next(list)) {
-			GnomeCanvasItem *item = list->data;
-			gboolean has_focus;
-			gtk_object_get(GTK_OBJECT(item),
-				       "has_focus", &has_focus,
-				       NULL);
-			if (has_focus) {
-				ECard *card;
-				gtk_object_get(GTK_OBJECT(item),
-					       "card", &card,
-					       NULL);
-				e_book_remove_card(view->book, card, cb, closure);
-				return;
-			}
-		}
-	}
-}
-
-static int
-compare_to_letter(EMinicard *card, char *letter)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (*letter == '1')
-		return 1;
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return strncasecmp(file_as, letter, 1);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-
-void
-e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter)
-{
-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),
-			     (GCompareFunc) compare_to_letter,
-			     &letter);
-}
-
-void
-e_minicard_view_stop             (EMinicardView *view)
-{
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-	view->book_view = NULL;
-}
-
-static void
-e_minicard_view_update_selection (EMinicardView *view)
-{
-	int i;
-	GList *item;
-
-	for (i = 0, item = E_REFLOW(view)->items; item; item = item->next, i++) {
-		if (E_IS_MINICARD(item->data))
-			gtk_object_set(GTK_OBJECT(item->data),
-				       "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(view->selection), i),
-				       NULL);
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 2cfe74e993..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include <gnome.h>
-#include <gal/widgets/e-reflow-sorted.h>
-#include <gal/widgets/e-selection-model-simple.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardView - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * book         EBook           RW              book to query
- * query        string          RW              query string
- *
- * From EReflowSorted:   (you should really know what you're doing if you set these.)
- * compare_func  GCompareFunc   RW              compare function
- * string_func   EReflowStringFunc RW           string function
- *
- * From EReflow:
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
- */
-
-#define E_MINICARD_VIEW_TYPE			(e_minicard_view_get_type ())
-#define E_MINICARD_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView))
-#define E_MINICARD_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-
-
-typedef struct _EMinicardView       EMinicardView;
-typedef struct _EMinicardViewClass  EMinicardViewClass;
-
-struct _EMinicardView
-{
-	EReflowSorted parent;
-	
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	ESelectionModelSimple *selection;
-
-	int get_view_idle;
-
-	int canvas_destroy_id;
-
-	int create_card_id, remove_card_id, modify_card_id, status_message_id;
-
-	guint first_get_view : 1;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowSortedClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EMinicardView *mini_view, const gchar *message);
-};
-
-GtkType    e_minicard_view_get_type (void);
-void       e_minicard_view_remove_selection (EMinicardView *view,
-					     EBookCallback  cb,
-					     gpointer       closure);
-void       e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter);
-void       e_minicard_view_stop             (EMinicardView *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c
deleted file mode 100644
index f6489f2a6a..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard-widget.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Widget Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *minicard;
-  ECard *card;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Widget Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Widget Test", NULL);
-
-  minicard = e_minicard_widget_new();
-  card = e_card_new(TEST_VCARD);
-  gtk_object_set(GTK_OBJECT(minicard),
-		 "card", card,
-		 NULL);
-
-  gnome_app_set_contents( GNOME_APP( app ), minicard );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c
deleted file mode 100644
index 3f765425e4..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard-widget.h"
-#include "e-minicard.h"
-
-static void e_minicard_widget_init		(EMinicardWidget		 *card);
-static void e_minicard_widget_class_init	(EMinicardWidgetClass	 *klass);
-static void e_minicard_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_destroy (GtkObject *object);
-static void e_minicard_widget_size_request	 (GtkWidget	    *widget, GtkRequisition    *requisition);
-static void e_minicard_widget_size_allocate	 (GtkWidget	    *widget, GtkAllocation     *allocation);
-static void e_minicard_widget_reflow             (ECanvas           *canvas);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-GtkType
-e_minicard_widget_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-		{
-			static const GtkTypeInfo info =
-			{
-				"EMinicardWidget",
-				sizeof (EMinicardWidget),
-				sizeof (EMinicardWidgetClass),
-				(GtkClassInitFunc) e_minicard_widget_class_init,
-				(GtkObjectInitFunc) e_minicard_widget_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			type = gtk_type_unique (e_canvas_get_type (), &info);
-		}
-
-	return type;
-}
-
-static void
-e_minicard_widget_class_init (EMinicardWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass   *ecanvas_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-	ecanvas_class = E_CANVAS_CLASS(klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	object_class->set_arg = e_minicard_widget_set_arg;
-	object_class->get_arg = e_minicard_widget_get_arg;
-	object_class->destroy = e_minicard_widget_destroy;
-
-	widget_class->size_request  = e_minicard_widget_size_request;
-	widget_class->size_allocate = e_minicard_widget_size_allocate;
-
-	ecanvas_class->reflow = e_minicard_widget_reflow;
-
-	gtk_object_add_arg_type ("EMinicardWidget::card", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_CARD);
-}
-
-static void
-e_minicard_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	if (height <= 0)
-		height = 1;
-	widget->requisition.height = height;
-	widget->requisition.width  = 200;
-	requisition->height = height;
-	requisition->width  = 200;
-}
-
-static void
-e_minicard_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gnome_canvas_item_set( emw->item,
-			       "width", (double) allocation->width,
-			       NULL );
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	height = MAX(height, allocation->height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS( emw ), 0, 0, allocation->width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
-			       NULL );
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
-}
-
-static void e_minicard_widget_reflow(ECanvas *canvas)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(canvas);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-
-	height = MAX(height, GTK_WIDGET(emw)->allocation.height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(emw), 0, 0, GTK_WIDGET(emw)->allocation.width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) GTK_WIDGET(emw)->allocation.width,
-			       "y2", (double) height,
-			       NULL );	
-	
-	gtk_widget_queue_resize(GTK_WIDGET(canvas));
-}
-
-static void
-e_minicard_widget_init (EMinicardWidget *emw)
-{
-	emw->rect = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
-					   "fill_color", "white",
-					   NULL );
-
-	emw->item = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					  e_minicard_get_type(),
-					  "width", (double) 100,
-					  NULL );
-
-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( emw ),
-					 0, 0,
-					 100, 100 );
-	
-	emw->card = NULL;
-}
-
-static void
-e_minicard_widget_destroy (GtkObject *object)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	if (emw->card)
-		gtk_object_unref(GTK_OBJECT(emw->card));
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_minicard_widget_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ()));
-	return widget;
-}
-
-static void
-e_minicard_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	switch (arg_id){
-	case ARG_CARD:
-		if (emw->card)
-			gtk_object_unref(GTK_OBJECT(emw->card));
-		if (GTK_VALUE_OBJECT(*arg)) {
-		  emw->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(emw->card));
-		}
-		else
-			emw->card = NULL;
-		if (emw->item)
-			gtk_object_set(GTK_OBJECT(emw->item),
-				       "card", emw->card,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (emw->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emw->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
deleted file mode 100644
index 95b56cf3de..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_WIDGET_H__
-#define __E_MINICARD_WIDGET_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include <gal/widgets/e-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardWidget - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_MINICARD_WIDGET_TYPE			(e_minicard_widget_get_type ())
-#define E_MINICARD_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget))
-#define E_MINICARD_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass))
-#define E_IS_MINICARD_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-#define E_IS_MINICARD_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-
-
-typedef struct _EMinicardWidget       EMinicardWidget;
-typedef struct _EMinicardWidgetClass  EMinicardWidgetClass;
-
-struct _EMinicardWidget
-{
-	ECanvas parent;
-	
-	/* item specific fields */
-	GnomeCanvasItem *item;
-
-	GnomeCanvasItem *rect;
-	ECard *card;
-};
-
-struct _EMinicardWidgetClass
-{
-	ECanvasClass parent_class;
-};
-
-
-GtkWidget *e_minicard_widget_new(void);
-GtkType    e_minicard_widget_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
deleted file mode 100644
index 6208f1f23f..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,958 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include <gal/e-text/e-text.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-minicard-view.h"
-
-static void e_minicard_init		(EMinicard		 *card);
-static void e_minicard_class_init	(EMinicardClass	 *klass);
-static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_destroy (GtkObject *object);
-static void e_minicard_finalize (GtkObject *object);
-static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_realize (GnomeCanvasItem *item);
-static void e_minicard_unrealize (GnomeCanvasItem *item);
-static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
-
-static void e_minicard_resize_children( EMinicard *e_minicard );
-static void remodel( EMinicard *e_minicard );
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-typedef struct _EMinicardField EMinicardField;
-
-struct _EMinicardField {
-	ECardSimpleField field;
-	GnomeCanvasItem *label;
-};
-
-#define E_MINICARD_FIELD(field) ((EMinicardField *)(field))
-
-static void
-e_minicard_field_destroy(EMinicardField *field)
-{
-	gtk_object_destroy(GTK_OBJECT(field->label));
-	g_free(field);
-}
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_SELECTED,
-	ARG_CARD
-};
-
-enum {
-	SELECTED,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_signals [LAST_SIGNAL] = {0, };
-
-GtkType
-e_minicard_get_type (void)
-{
-  static GtkType minicard_type = 0;
-
-  if (!minicard_type)
-    {
-      static const GtkTypeInfo minicard_info =
-      {
-        "EMinicard",
-        sizeof (EMinicard),
-        sizeof (EMinicardClass),
-        (GtkClassInitFunc) e_minicard_class_init,
-        (GtkObjectInitFunc) e_minicard_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_info);
-    }
-
-  return minicard_type;
-}
-
-static void
-e_minicard_class_init (EMinicardClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("EMinicard::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("EMinicard::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EMinicard::has_focus", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-	gtk_object_add_arg_type ("EMinicard::selected", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_SELECTED);
-	gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_CARD);
-
-	e_minicard_signals [SELECTED] =
-		gtk_signal_new ("selected",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardClass, selected),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_minicard_signals, LAST_SIGNAL);
- 
-	object_class->set_arg  = e_minicard_set_arg;
-	object_class->get_arg  = e_minicard_get_arg;
-	object_class->destroy  = e_minicard_destroy;
-	object_class->finalize = e_minicard_finalize;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->realize    = e_minicard_realize;
-	item_class->unrealize  = e_minicard_unrealize;
-	item_class->event      = e_minicard_event;
-
-	klass->selected        = NULL;
-}
-
-static void
-e_minicard_init (EMinicard *minicard)
-{
-	/*   minicard->card = NULL;*/
-	minicard->rect = NULL;
-	minicard->fields = NULL;
-	minicard->width = 10;
-	minicard->height = 10;
-	minicard->has_focus = FALSE;
-	minicard->selected = FALSE;
-  
-	minicard->card = NULL;
-	minicard->simple = e_card_simple_new(NULL);
-
-	minicard->editor = NULL;
-
-	minicard->changed = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-set_selected (EMinicard *minicard, gboolean selected)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas);
-	if (selected) {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-				       NULL);
-	} else {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color", NULL, 
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				       NULL);
-	}
-	minicard->selected = selected;
-}
-
-
-static void
-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard = E_MINICARD (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
-			e_minicard->width = GTK_VALUE_DOUBLE (*arg);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_START ||
-			     GTK_VALUE_ENUM(*arg) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			} else if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			}
-		}
-		else
-			e_canvas_item_grab_focus(item);
-		break;
-	case ARG_SELECTED:
-		if (e_minicard->selected != GTK_VALUE_BOOL(*arg))
-			set_selected (e_minicard, GTK_VALUE_BOOL(*arg));
-		break;
-	case ARG_CARD:
-		if (e_minicard->card)
-			gtk_object_unref (GTK_OBJECT(e_minicard->card));
-		e_minicard->card = E_CARD(GTK_VALUE_OBJECT (*arg));
-		if (e_minicard->card)
-			gtk_object_ref (GTK_OBJECT(e_minicard->card));
-		gtk_object_set(GTK_OBJECT(e_minicard->simple),
-			       "card", e_minicard->card,
-			       NULL);
-		remodel(e_minicard);
-		e_canvas_item_request_reflow(item);
-		e_minicard->changed = FALSE;
-		break;
-	}
-}
-
-static void
-e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->width;
-	  break;
-	case ARG_HEIGHT:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->height;
-	  break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_SELECTED:
-		GTK_VALUE_BOOL (*arg) = e_minicard->selected;
-		break;
-	case ARG_CARD:
-		e_card_simple_sync_card(e_minicard->simple);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->card);
-		break;
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
-
-static void
-e_minicard_destroy (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	g_list_foreach(e_minicard->fields, (GFunc) e_minicard_field_destroy, NULL);
-	g_list_free(e_minicard->fields);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-static void
-e_minicard_finalize (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	if (e_minicard->card)
-		gtk_object_unref (GTK_OBJECT(e_minicard->card));
-	if (e_minicard->simple)
-		gtk_object_unref (GTK_OBJECT(e_minicard->simple));
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-e_minicard_realize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-	GnomeCanvasGroup *group;
-	GtkWidget *canvas;
-
-	e_minicard = E_MINICARD (item);
-	group = GNOME_CANVAS_GROUP( item );
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_minicard->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard->width - 1,
-				 "y2", (double) e_minicard->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-
-	e_minicard->header_rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 2,
-				 "y1", (double) 2,
-				 "x2", (double) e_minicard->width - 3,
-				 "y2", (double) e_minicard->height - 3,
-				 "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				 NULL );
-
-	e_minicard->header_text =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "width", (double) ( e_minicard->width - 12 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-#if 0
-				 "font", "fixed-bold-10",
-#endif
-				 "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				 "text", "",
-				 "draw_background", FALSE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	remodel(e_minicard);
-	e_canvas_item_request_reflow(item);
-
-	if (!item->canvas->aa) {
-	}
-}
-
-static void
-e_minicard_unrealize (GnomeCanvasItem *item)
-{
-  EMinicard *e_minicard;
-
-  e_minicard = E_MINICARD (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-typedef struct {
-	EMinicard *minicard;
-	GnomeCanvasItem *parent;
-	GtkWidget *canvas;
-} MinicardAndParent;
-
-static void
-e_minicard_and_parent_free (MinicardAndParent *mnp)
-{
-	gtk_object_unref(GTK_OBJECT(mnp->minicard));
-	gtk_object_unref(GTK_OBJECT(mnp->parent));
-	gtk_object_unref(GTK_OBJECT(mnp->canvas));
-	g_free(mnp);
-}
-
-static void
-save_as (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		e_card_simple_sync_card(minicard->simple);
-		e_contact_save_as(_("Save as VCard"), minicard->card);
-	}
-	e_minicard_and_parent_free (mnp);
-}
-
-static void
-send_as (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		e_card_simple_sync_card(minicard->simple);
-		e_card_send(minicard->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	}
-	e_minicard_and_parent_free (mnp);
-}
-
-static void
-send_to (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		e_card_simple_sync_card(minicard->simple);
-		e_card_send(minicard->card, E_CARD_DISPOSITION_AS_TO);
-	}
-	e_minicard_and_parent_free (mnp);
-}
-
-static void
-delete (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		EBook *book;
-		ECard *card = minicard->card;
-		ECardSimple *simple = minicard->simple;
-
-		gtk_object_get(GTK_OBJECT(mnp->parent),
-			       "book", &book,
-			       NULL);
-
-		gtk_object_ref(GTK_OBJECT(card));
-		gtk_object_ref(GTK_OBJECT(simple));
-	
-		if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(mnp->canvas)))) {
-			e_card_simple_sync_card(simple);
-		
-		
-			/* Add the card in the contact editor to our ebook */
-			e_book_remove_card (book,
-					    card,
-					    card_changed_cb,
-					    NULL);
-		}
-
-		gtk_object_unref(GTK_OBJECT(card));
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-
-	e_minicard_and_parent_free (mnp);
-}
-
-static void
-print (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		e_card_simple_sync_card(minicard->simple);
-		gtk_widget_show(e_contact_print_card_dialog_new(minicard->card));
-	}
-	e_minicard_and_parent_free (mnp);
-}
-
-static void
-print_envelope (GtkWidget *widget, MinicardAndParent *mnp)
-{
-	EMinicard *minicard = mnp->minicard;
-
-	if (!GTK_OBJECT_DESTROYED(minicard)) {
-		e_card_simple_sync_card(minicard->simple);
-		gtk_widget_show(e_contact_print_envelope_dialog_new(minicard->card));
-	}
-	e_minicard_and_parent_free (mnp);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	EMinicard *minicard = data;
-	gtk_object_unref (GTK_OBJECT (ce));
-	minicard->editor = NULL;
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-	
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			if (focus_event->in) {
-				if (!e_minicard->selected) {
-					e_minicard_selected(e_minicard, event);
-				}
-			} else {
-				EBook *book = NULL;
-
-				if (e_minicard->changed) {
-				
-					e_card_simple_sync_card(e_minicard->simple);
-
-					if (E_IS_MINICARD_VIEW(GNOME_CANVAS_ITEM(e_minicard)->parent)) {
-					
-						gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(e_minicard)->parent),
-							       "book", &book,
-							       NULL);
-					
-					}
-				
-					if (book) {
-					
-						/* Add the card in the contact editor to our ebook */
-						e_book_commit_card (book,
-								    e_minicard->card,
-								    card_changed_cb,
-								    NULL);
-					} else {
-						remodel(e_minicard);
-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));
-					}
-					e_minicard->changed = FALSE;
-				}
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			e_canvas_item_grab_focus(item);
-			return ret_val;
-		} else if (event->button.button == 3) {
-			MinicardAndParent *mnp = g_new(MinicardAndParent, 1);
-			EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, 
-					      {"Send contact to other", NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0}, 
-					      {"Send message to contact", NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-					      {"Print", NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-					      {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-					      {"Delete", NULL, GTK_SIGNAL_FUNC(delete), NULL, 1},
-					      {NULL, NULL, NULL, 0}};
-			mnp->minicard = e_minicard;
-			mnp->parent = item->parent;
-			mnp->canvas = GTK_WIDGET(item->canvas);
-			gtk_object_ref(GTK_OBJECT(mnp->minicard));
-			gtk_object_ref(GTK_OBJECT(mnp->parent));
-			gtk_object_ref(GTK_OBJECT(mnp->canvas));
-			e_popup_menu_run (menu, event, 0, E_IS_MINICARD_VIEW(mnp->parent) ? 0 : 1, mnp);
-		}
-		break;
-
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			if (e_minicard->editor) {
-				e_contact_editor_raise(e_minicard->editor);
-			} else {
-				EBook *book = NULL;
-				if (E_IS_MINICARD_VIEW(item->parent)) {
-					gtk_object_get(GTK_OBJECT(item->parent),
-						       "book", &book,
-						       NULL);
-				}
-				e_minicard->editor = e_contact_editor_new (e_minicard->card, FALSE);
-
-				if (book != NULL) {
-					gtk_signal_connect (GTK_OBJECT (e_minicard->editor), "add_card",
-							    GTK_SIGNAL_FUNC (add_card_cb), book);
-					gtk_signal_connect (GTK_OBJECT (e_minicard->editor), "commit_card",
-							    GTK_SIGNAL_FUNC (commit_card_cb), book);
-					gtk_signal_connect (GTK_OBJECT (e_minicard->editor), "delete_card",
-							    GTK_SIGNAL_FUNC (delete_card_cb), book);
-				}
-
-				gtk_signal_connect (GTK_OBJECT (e_minicard->editor), "editor_closed",
-						    GTK_SIGNAL_FUNC (editor_closed_cb), e_minicard);
-			}
-			return TRUE;
-		}
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab || 
-		    event->key.keyval == GDK_KP_Tab || 
-		    event->key.keyval == GDK_ISO_Left_Tab) {
-			GList *list;
-			for (list = e_minicard->fields; list; list = list->next) {
-				EMinicardField *field = E_MINICARD_FIELD(list->data);
-				GnomeCanvasItem *item = field->label;
-				EFocus has_focus;
-				gtk_object_get(GTK_OBJECT(item),
-					       "has_focus", &has_focus,
-					       NULL);
-				if (has_focus != E_FOCUS_NONE) {
-					if (event->key.state & GDK_SHIFT_MASK)
-						list = list->prev;
-					else
-						list = list->next;
-					if (list) {
-						EMinicardField *field = E_MINICARD_FIELD(list->data);
-						GnomeCanvasItem *item = field->label;
-						gnome_canvas_item_set(item,
-								      "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,
-								      NULL);
-						return 1;
-					} else {
-						return 0;
-					}
-				}
-			}
-		}
-	default:
-		break;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_minicard_resize_children( EMinicard *e_minicard )
-{
-	GList *list;
-	
-	if (e_minicard->header_text) {
-		gnome_canvas_item_set( e_minicard->header_text,
-				       "width", (double) e_minicard->width - 12,
-				       NULL );
-	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
-				       "width", (double) e_minicard->width - 4.0,
-				       NULL );
-	}
-}
-
-static void
-field_changed (EText *text, EMinicard *e_minicard)
-{
-	ECardSimpleType type;
-	char *string;
-
-	type = GPOINTER_TO_INT
-		(gtk_object_get_data(GTK_OBJECT(text),
-				     "EMinicard:field"));
-	gtk_object_get(GTK_OBJECT(text),
-		       "text", &string,
-		       NULL);
-	e_card_simple_set(e_minicard->simple,
-			  type,
-			  string);
-	g_free(string);
-	e_minicard->changed = TRUE;
-}
-
-static void
-add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	ECardSimpleType type;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	type = e_card_simple_type(e_minicard->simple, field);
-	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-	string = e_card_simple_get(e_minicard->simple, field);
-
-	new_item = e_minicard_label_new(group);
-	gnome_canvas_item_set( new_item,
-			       "width", e_minicard->width - 4.0,
-			       "fieldname", name,
-			       "field", string,
-			       "max_field_name_length", left_width,
-			       NULL );
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
-	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			    "EMinicard:field",
-			    GINT_TO_POINTER(field));
-
-	minicard_field = g_new(EMinicardField, 1);
-	minicard_field->field = field;
-	minicard_field->label = new_item;
-
-	e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
-	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
-	g_free(name);
-	g_free(string);
-}
-
-static gdouble
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	ECardSimpleField field;
-	gdouble width = -1;
-	GdkFont *font;
-
-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		gdouble this_width;
-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-		this_width = gdk_text_width(font, name, strlen(name));
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	return width;
-}
-
-static void
-remodel( EMinicard *e_minicard )
-{
-	int count = 0;
-	if (e_minicard->simple) {
-		ECardSimpleField field;
-		GList *list;
-		char *file_as;
-		gdouble left_width = -1;
-
-		if (e_minicard->header_text) {
-			file_as = e_card_simple_get(e_minicard->simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-			gnome_canvas_item_set( e_minicard->header_text,
-					       "text", file_as ? file_as : "",
-					       NULL );
-			g_free(file_as);
-		}
-		
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (list)
-				minicard_field = list->data;
-			if (minicard_field && minicard_field->field == field) {
-				GList *this_list = list;
-				char *string;
-				
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
-					gtk_object_set(GTK_OBJECT(minicard_field->label),
-						       "field", string,
-						       NULL);
-					count ++;
-				} else {
-					e_minicard_field_destroy(minicard_field);
-				}
-				list = g_list_remove_link(list, this_list);
-				g_list_free_1(this_list);
-				g_free(string);
-			} else {
-				char *string;
-				if (left_width == -1) {
-					left_width = get_left_width(e_minicard);
-				}
-
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					add_field(e_minicard, field, left_width);
-					count++;
-				}
-				g_free(string);
-			}
-		}
-		
-		g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(list);
-	}
-}
-
-static void
-e_minicard_reflow( GnomeCanvasItem *item, int flags )
-{
-	EMinicard *e_minicard = E_MINICARD(item);
-	if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		GList *list;
-		gdouble text_height;
-		gint old_height;
-		
-		old_height = e_minicard->height;
-
-		gtk_object_get( GTK_OBJECT( e_minicard->header_text ),
-				"text_height", &text_height,
-				NULL );
-		
-		e_minicard->height = text_height + 10.0;
-		
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "y2", text_height + 9.0,
-				       NULL );
-		
-		for(list = e_minicard->fields; list; list = g_list_next(list)) {
-			EMinicardField *field = E_MINICARD_FIELD(list->data);
-			GnomeCanvasItem *item = field->label;
-			gtk_object_get (GTK_OBJECT(item),
-					"height", &text_height,
-					NULL);
-			e_canvas_item_move_absolute(item, 2, e_minicard->height);
-			e_minicard->height += text_height;
-		}
-		e_minicard->height += 2;
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "y2", (double) e_minicard->height - 1,
-				       NULL );
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "x2", (double) e_minicard->width - 1.0,
-				       "y2", (double) e_minicard->height - 1.0,
-				       NULL );
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "x2", (double) e_minicard->width - 3.0,
-				       NULL );
-
-		if (old_height != e_minicard->height)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-char *
-e_minicard_get_card_id (EMinicard *minicard)
-{
-	g_return_val_if_fail(minicard != NULL, NULL);
-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);
-
-	if (minicard->card) {
-		return e_card_get_id(minicard->card);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	g_return_val_if_fail(minicard1 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);
-	g_return_val_if_fail(minicard2 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);
-
-	if (minicard1->card && minicard2->card) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(minicard1->card),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(minicard2->card),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-	} else {
-		return 0;
-	}
-}
-
-int
-e_minicard_selected (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	gtk_signal_emit(GTK_OBJECT(minicard),
-			e_minicard_signals[SELECTED],
-			event, &ret_val);
-	return ret_val;
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index dbc914502c..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <gnome.h>
-#include "addressbook/contact-editor/e-contact-editor.h"
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicard - A small card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the card
- * height       double          R               height of the card
- * card		ECard*		RW		Pointer to the ECard
- */
-
-#define E_MINICARD_TYPE			(e_minicard_get_type ())
-#define E_MINICARD(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard))
-#define E_MINICARD_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE))
-
-
-typedef struct _EMinicard       EMinicard;
-typedef struct _EMinicardClass  EMinicardClass;
-typedef enum _EMinicardFocusType EMinicardFocusType;
-
-enum _EMinicardFocusType {
-	E_MINICARD_FOCUS_TYPE_START,
-	E_MINICARD_FOCUS_TYPE_END
-};
-
-struct _EMinicard
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-	
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *header_rect;
-	GnomeCanvasItem *header_text;
-
-	EContactEditor *editor;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-
-	guint selected : 1;
-	
-	guint has_focus : 1;
-	
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	gint (* selected) (EMinicard *minicard, GdkEvent *event);
-};
-
-
-GtkType    e_minicard_get_type    (void);
-char      *e_minicard_get_card_id (EMinicard *minicard);
-int        e_minicard_compare     (EMinicard *minicard1, EMinicard *minicard2);
-
-int        e_minicard_selected    (EMinicard *minicard, GdkEvent *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
deleted file mode 100644
index 1d10b71f78..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gal_view_factory_get_type ()
-
-static GalViewFactoryClass *gal_view_factory_minicard_parent_class;
-
-static const char *
-gal_view_factory_minicard_get_title       (GalViewFactory *factory)
-{
-	return _("Card View");
-}
-
-static GalView *
-gal_view_factory_minicard_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_minicard_new(name);
-}
-
-static const char *
-gal_view_factory_minicard_get_type_code (GalViewFactory *factory)
-{
-	return "minicard";
-}
-
-static void
-gal_view_factory_minicard_destroy         (GtkObject *object)
-{
-#if 0
-	GalViewFactoryMinicard *factory = GAL_VIEW_FACTORY_MINICARD(object);
-#endif
-}
-
-static void
-gal_view_factory_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_minicard_parent_class    = gtk_type_class (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_minicard_get_title;
-	view_factory_class->new_view            = gal_view_factory_minicard_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_minicard_get_type_code;
-
-	object_class->destroy                   = gal_view_factory_minicard_destroy;
-}
-
-static void
-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
-{
-}
-
-/**
- * gal_view_minicard_new
- *
- * A new GalViewFactory for creating Minicard views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_new        (void)
-{
-	return gal_view_factory_minicard_construct (gtk_type_new (gal_view_factory_minicard_get_type ()));
-}
-
-/**
- * gal_view_minicard_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
-
-GtkType
-gal_view_factory_minicard_get_type  (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactoryMinicard",
-			sizeof (GalViewFactoryMinicard),
-			sizeof (GalViewFactoryMinicardClass),
-			(GtkClassInitFunc) gal_view_factory_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_factory_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
deleted file mode 100644
index 3816fdba46..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_MINICARD_H_
-#define _GAL_VIEW_FACTORY_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_VIEW_FACTORY_MINICARD_TYPE        (gal_view_factory_minicard_get_type ())
-#define GAL_VIEW_FACTORY_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicard))
-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicardClass))
-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_MINICARD_TYPE))
-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_MINICARD_TYPE))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryMinicard;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryMinicardClass;
-
-/* Standard functions */
-GtkType         gal_view_factory_minicard_get_type   (void);
-GalViewFactory *gal_view_factory_minicard_new        (void);
-GalViewFactory *gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory);
-
-#endif /* _GAL_VIEW_FACTORY_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
deleted file mode 100644
index 4cfa71f470..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.c: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-minicard.h"
-
-#define PARENT_TYPE gal_view_get_type ()
-
-static GalViewClass *gal_view_minicard_parent_class;
-
-static void
-gal_view_minicard_edit            (GalView *view)
-{
-	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */
-}
-
-static void  
-gal_view_minicard_load  (GalView *view,
-			 const char *filename)
-{
-}
-
-static void
-gal_view_minicard_save    (GalView *view,
-			 const char *filename)
-{
-}
-
-static const char *
-gal_view_minicard_get_title       (GalView *view)
-{
-	return GAL_VIEW_MINICARD(view)->title;
-}
-
-static void
-gal_view_minicard_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_MINICARD(view)->title);
-	GAL_VIEW_MINICARD(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_minicard_get_type_code (GalView *view)
-{
-	return "minicard";
-}
-
-static GalView *
-gal_view_minicard_clone       (GalView *view)
-{
-	GalViewMinicard *gve, *new;
-
-	gve = GAL_VIEW_MINICARD(view);
-
-	new        = gtk_type_new (gal_view_minicard_get_type ());
-	new->title = g_strdup (gve->title);
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_destroy         (GtkObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-	g_free(view->title);
-}
-
-static void
-gal_view_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_minicard_parent_class  = gtk_type_class (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_minicard_edit         ;
-	gal_view_class->load          = gal_view_minicard_load         ;
-	gal_view_class->save          = gal_view_minicard_save         ;
-	gal_view_class->get_title     = gal_view_minicard_get_title    ;
-	gal_view_class->set_title     = gal_view_minicard_set_title    ;
-	gal_view_class->get_type_code = gal_view_minicard_get_type_code;
-	gal_view_class->clone         = gal_view_minicard_clone        ;
-
-	object_class->destroy         = gal_view_minicard_destroy      ;
-}
-
-static void
-gal_view_minicard_init      (GalViewMinicard *gve)
-{
-	gve->title = NULL;
-}
-
-/**
- * gal_view_minicard_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewMinicard.  This is primarily for use by
- * GalViewFactoryMinicard.
- *
- * Returns: The new GalViewMinicard.
- */
-GalView *
-gal_view_minicard_new (const gchar *title)
-{
-	return gal_view_minicard_construct (gtk_type_new (gal_view_minicard_get_type ()), title);
-}
-
-/**
- * gal_view_minicard_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewMinicard.
- */
-GalView *
-gal_view_minicard_construct  (GalViewMinicard *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GtkType
-gal_view_minicard_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewMinicard",
-			sizeof (GalViewMinicard),
-			sizeof (GalViewMinicardClass),
-			(GtkClassInitFunc) gal_view_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index fef98141f3..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.h: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_MINICARD_H_
-#define _GAL_VIEW_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-
-#define GAL_VIEW_MINICARD_TYPE        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE))
-
-typedef struct {
-	GalView base;
-
-	char                *title;
-} GalViewMinicard;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GtkType  gal_view_minicard_get_type   (void);
-GalView *gal_view_minicard_new        (const gchar         *title);
-GalView *gal_view_minicard_construct  (GalViewMinicard       *view,
-				       const gchar         *title);
-
-#endif /* _GAL_VIEW_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
deleted file mode 100644
index 0566a85760..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard-label.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard-label.h"
-#include <gal/widgets/e-canvas.h>
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *label;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( label,
-			 "width", (double) allocation->width,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Label Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard label canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void button_press_callback( GtkWidget *widget, gpointer data )
-{
-  gnome_canvas_item_grab_focus( label );
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Label Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Label Test", NULL);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));
-  gnome_canvas_item_set( label,
-			 "width", (double) 100,
-			 "height", (double) 100,
-			 "fieldname", "Full Name:",
-			 "field", "Christopher James Lahey",
-			 NULL );
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "button_press_event",
-		      GTK_SIGNAL_FUNC( button_press_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
deleted file mode 100644
index c03d11d07e..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <e-util/e-canvas.h>
-#include "e-minicard-view.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-
-	gnome_CORBA_init_with_popt_table (
-		"Reflow Test", VERSION,
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-
-	orb = gnome_CORBA_ORB ();
-
-	if (bonobo_init (orb, NULL, NULL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-}
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width, allocation->height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width, last_alloc.height );
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS)
-		gnome_canvas_item_set(reflow,
-				      "book", book,
-				      NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollbar;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  CORBA_exception_init (&ev);
-  init_bonobo (argc, argv);
-
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_minicard_view_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gtk_box_pack_start(GTK_BOX(vbox), canvas, TRUE, TRUE, 0);
-
-  scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)));
-
-  gtk_box_pack_start(GTK_BOX(vbox), scrollbar, FALSE, FALSE, 0);
-
-  gnome_app_set_contents( GNOME_APP( app ), vbox );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-  bonobo_main ();
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c
deleted file mode 100644
index e16ca675b3..0000000000
--- a/addressbook/gui/widgets/test-minicard.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *card;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( card,
-			 "width", (double) allocation->width,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Test", NULL);
-
-  canvas = gnome_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  for ( i = 0; i < 1; i++ )
-    {
-      card = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				    e_minicard_get_type(),
-				    "width", (double) 100,
-				    NULL );
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
deleted file mode 100644
index 1a2cc9f017..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include "e-minicard.h"
-#include <gal/widgets/e-scroll-frame.h>
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation->height - 1);
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollframe;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Reflow Test", VERSION, argc, argv);
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_reflow_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-  for ( i = 0; i < 200; i++ )
-    {
-      GnomeCanvasItem *item;
-      ECard *card = e_card_new (TEST_VCARD);
-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),
-				    e_minicard_get_type(),
-				    "card", card,
-				    NULL);
-      e_reflow_add_item(E_REFLOW(reflow), item, NULL);
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),
-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));
-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-			     GTK_POLICY_AUTOMATIC,
-			     GTK_POLICY_NEVER);
-  
-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);
-
-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore
deleted file mode 100644
index 96194f7fd7..0000000000
--- a/addressbook/printing/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-print-test
-contact-print-style-editor-test
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
deleted file mode 100644
index fc3b174d98..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-ecpsdir    = $(datadir)/evolution/ecps
-
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	$(GNOME_PRINT_CFLAGS)			\
-        $(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontactprint.a
-
-libecontactprint_a_SOURCES = 			\
-	e-contact-print-envelope.c		\
-	e-contact-print-envelope.h		\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h			\
-	e-contact-print.c			\
-	e-contact-print.h
-
-noinst_PROGRAMS =	\
-	contact-print-test	\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS) 
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS)
-
-EXTRA_DIST = \
-	$(glade_DATA)	\
-	$(ecps_DATA)
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index d6fbfdc5db..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include "e-contact-print-envelope.h"
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 9.5)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_string_n (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	gnome_print_setfont(pc, font);
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static gint
-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return)
-{
-	ECardSimple *card = e_card_simple_new(ecard);
-	char *address;
-	EcpeLine *linelist;
-	double x;
-	double y;
-	GnomeFont *font;
-	
-
-	gnome_print_rotate(pc, 90);
-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);
-
-	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);
-	linelist = ecpe_break(address);
-	if (as_return)
-		font = gnome_font_new("Helvetica", 9);
-	else
-		font = gnome_font_new("Helvetica", 12);
-	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
-	if (as_return) {
-		x = 36;
-		y = ENVELOPE_HEIGHT - 36;
-	} else {
-		x = ENVELOPE_WIDTH / 2;
-		y = (ENVELOPE_HEIGHT - y) / 2;
-	}
-	ecpe_linelist_print(pc, font, address, linelist, x, y);
-	gtk_object_unref(GTK_OBJECT(font));
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	ECard *card = NULL;
-	GtkWidget *preview;
-
-	card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card, FALSE);
-		
-		gnome_print_master_print(master);
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card, FALSE);
-		
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		break;
-	case GNOME_PRINT_CANCEL:
-		gtk_object_unref(GTK_OBJECT(card));
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_envelope_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print envelope", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
deleted file mode 100644
index 45aa051401..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  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);
-
-#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 5eb5cadacf..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-contact-print-style-editor.h"
-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);
-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);
-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy        (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD
-};
-
-GtkType
-e_contact_print_style_editor_get_type (void)
-{
-  static GtkType contact_print_style_editor_type = 0;
-
-  if (!contact_print_style_editor_type)
-    {
-      static const GtkTypeInfo contact_print_style_editor_info =
-      {
-        "EContactPrintStyleEditor",
-        sizeof (EContactPrintStyleEditor),
-        sizeof (EContactPrintStyleEditorClass),
-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,
-        (GtkObjectInitFunc) e_contact_print_style_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
-    }
-
-  return contact_print_style_editor_type;
-}
-
-static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkVBoxClass *vbox_class;
-
-  object_class = (GtkObjectClass*) klass;
-  vbox_class = (GtkVBoxClass *) klass;
-
-  parent_class = gtk_type_class (gtk_vbox_get_type ());
-  
-  object_class->set_arg = e_contact_print_style_editor_set_arg;
-  object_class->get_arg = e_contact_print_style_editor_get_arg;
-  object_class->destroy = e_contact_print_style_editor_destroy;
-}
-
-#if 0
-static void
-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
-{
-	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
-			 left, right, top, bottom,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-}
-#endif
-
-static void
-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
-{
-	GladeXML *gui;
-
-	/*   e_contact_print_style_editor->card = NULL;*/
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL);
-	e_contact_print_style_editor->gui = gui;
-	gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),
-			    GTK_WIDGET(e_contact_print_style_editor));
-}
-
-void
-e_contact_print_style_editor_destroy (GtkObject *object)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);
-	gtk_object_unref(GTK_OBJECT(e_contact_print_style_editor->gui));
-}
-
-GtkWidget*
-e_contact_print_style_editor_new (char *filename)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));
-	return widget;
-}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-	
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
-	switch (arg_id) {
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
deleted file mode 100644
index cf0f17f889..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactPrintStyleEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
- */
-
-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-
-
-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;
-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;
-
-struct _EContactPrintStyleEditor
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-};
-
-struct _EContactPrintStyleEditorClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType    e_contact_print_style_editor_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
deleted file mode 100644
index e99cfe6d39..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <gnome.h>
-#include <libgnomeprint/gnome-font.h>
-
-typedef struct _EContactPrintStyle EContactPrintStyle;
-typedef enum _EContactPrintType EContactPrintType;
-
-enum _EContactPrintType {
-	E_CONTACT_PRINT_TYPE_CARDS,
-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,
-	E_CONTACT_PRINT_TYPE_PHONE_LIST
-};
-
-struct _EContactPrintStyle
-{
-	gchar *title;
-	EContactPrintType type;
-	gboolean sections_start_new_page;
-	guint num_columns;
-	guint blank_forms;
-	gboolean letter_tabs;
-	gboolean letter_headings;
-	GnomeFont *headings_font;
-	GnomeFont *body_font;
-	gboolean print_using_grey;
-	gint paper_type;
-	gdouble paper_width;
-	gdouble paper_height;
-	gint paper_source;
-	gdouble top_margin;
-	gdouble left_margin;
-	gdouble bottom_margin;
-	gdouble right_margin;
-	gint page_size;
-	gdouble page_width;
-	gdouble page_height;
-	gboolean orientation_portrait;
-	GnomeFont *header_font;
-	gchar *left_header;
-	gchar *center_header;
-	gchar *right_header;
-	GnomeFont *footer_font;
-	gchar *left_footer;
-	gchar *center_footer;
-	gchar *right_footer;
-	gboolean reverse_on_even_pages;
-};
-
-#endif /* E_CONTACT_PRINT_TYPES_H */
-
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
deleted file mode 100644
index 337f0f2007..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include "e-contact-print.h"
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-multipage.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <ctype.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintMaster *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	gchar *query;
-
-	GList *cards;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_string(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_string(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_string_n(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_string_n(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_string(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_string(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_string(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_string(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	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_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_string(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_string(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_string(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)
-{
-	GList *cards = ctxt->cards;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		ECardSimple *simple = e_card_simple_new(card);
-		guchar *file_as;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if ( file_as && (!ctxt->character || *ctxt->character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!ctxt->character)
-				ctxt->character = g_strdup(" ");
-			*ctxt->character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_card(simple, ctxt);
-		ctxt->first_contact = FALSE;
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(ctxt->character);
-	if (book_view)
-		gtk_object_unref(GTK_OBJECT(book_view));
-	if (ctxt->type == GNOME_PRINT_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_master_print(ctxt->master);
-	}
-	gtk_object_unref(GTK_OBJECT(ctxt->pc));
-	gtk_object_unref(GTK_OBJECT(ctxt->master));
-	if (ctxt->book)
-		gtk_object_unref(GTK_OBJECT(ctxt->book));
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free(ctxt->cards);
-	gtk_object_unref(GTK_OBJECT(ctxt->style->headings_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->body_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->header_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->footer_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_heading_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_tab_font));
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-card_compare (ECard *card1, ECard *card2) {
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(card1),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card2),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)
-{
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		gtk_object_ref(GTK_OBJECT(card));
-		ctxt->cards = g_list_insert_sorted(ctxt->cards, card, (GCompareFunc) card_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	gtk_object_ref(GTK_OBJECT(book_view));
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "card_added",
-			   GTK_SIGNAL_FUNC(create_card),
-			   ctxt);
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "sequence_complete",
-			   GTK_SIGNAL_FUNC(complete_sequence),
-			   ctxt);
-}
-
-static void
-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-#if 0
-static double
-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	double height = 0;
-	int field;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			if ( 1 ) /* field is a phone field. */ {
-				gchar *field = string;
-				height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-				height += .2 * gnome_font_get_size (ctxt->style->body_font);
-			}
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	double xoff, dotwidth;
-	int dotcount;
-	char *dots;
-	int i;
-	char *file_as;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x, ctxt->y, -1, e_card_get_string_fileas(card));
-	
-	xoff = column_width - 9 * gnome_font_get_size (ctxt->style->body_font);
-	dotwidth = xoff - 
-		gnome_font_get_width_string(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_string(ctxt->style->body_font, " ");
-	dotcount = dotwidth / gnome_font_get_width(ctxt->style->body_font, '.');
-	dots = g_new(gchar, dotcount + 1);
-	for (i = 0; i < dotcount; i++)
-		dots[i] = '.';
-	dots[dotcount] = 0;
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff - dotcount * gnome_font_get_width(ctxt->style->body_font, '.'), ctxt->y, -1, dots);
-	g_free(dots);
-		
-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {
-		if ( 1 ) /* field is a phone field. */ {
-			gchar *field = e_card_get_string(card, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, 
-					 ctxt->x + column_width - gnome_font_get_width_string(ctxt->style->body_font, 
-											      field),
-					 ctxt->y,
-					 -1,
-					 field);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-	}
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	ECard *card = NULL;
-	int i;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-	/*
-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {
-	*/
-	for (i=0; i < 30; i++) {
-		guchar *file_as = e_card_get_string_fileas(card);
-		if ( file_as && (!character || *character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!character)
-				character = g_strdup(" ");
-			*character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!first_contact) && (ctxt->y - e_contact_get_card_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_phone_list(card, ctxt, shown_fields);
-		first_contact = FALSE;
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(character);
-}
-#endif
-
-static void
-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	switch ( ctxt->style->type ) {
-	case E_CONTACT_PRINT_TYPE_CARDS:
-		e_contact_do_print_cards( book, query, ctxt);
-		break;
-#if 0
-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:
-		e_contact_do_print_phone_list( book, query, ctxt );
-		break;
-#endif
-	default:
-		break;
-	}
-}
-
-static void lowify( char *data )
-{
-	for ( ; *data; data++ )
-		*data = tolower((unsigned char) *data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_new_from_full_name( data );
-		if ( font ) {
-			gtk_object_unref( GTK_OBJECT(*variable) );
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-	style->headings_font = gnome_font_new("Helvetica-Bold", 8);
-	style->body_font = gnome_font_new("Helvetica", 6);
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-	style->header_font = gnome_font_new("Helvetica", 6);
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-	style->footer_font = gnome_font_new("Helvetica", 6);
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->childs; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");
-	EBook *book = NULL;
-	char *query = NULL;
-	ECard *card = NULL;
-	gdouble font_size;
-	if (uses_book) {
-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");
-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");
-	} else {
-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-	}
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->cards = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			complete_sequence(NULL, ctxt);
-		}
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->cards = NULL;
-			gtk_object_ref(GTK_OBJECT(book));
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			gtk_object_ref(GTK_OBJECT(card));
-			complete_sequence(NULL, ctxt);
-		}
-		break;
-	case GNOME_PRINT_CANCEL:
-		if (uses_book)
-			gtk_object_unref(GTK_OBJECT(book));
-		else
-			gtk_object_unref(GTK_OBJECT(card));
-		g_free(query);
-		gnome_dialog_close(dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	gtk_object_ref(GTK_OBJECT(book));
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);
-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);
-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_card_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print card", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
deleted file mode 100644
index ff7aa91377..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2007 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Printing</name>
-  <program_name>printing</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>print-edit-style</name>
-  <visible>False</visible>
-  <title>Page Setup:</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox-contact-print-style-editor</name>
-      <homogeneous>False</homogeneous>
-      <spacing>5</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>16</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label>Style name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>label-style-name</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkNotebook</class>
-	<name>notebook1</name>
-	<can_focus>True</can_focus>
-	<show_tabs>True</show_tabs>
-	<show_border>True</show_border>
-	<tab_pos>GTK_POS_TOP</tab_pos>
-	<scrollable>False</scrollable>
-	<tab_hborder>2</tab_hborder>
-	<tab_vborder>2</tab_vborder>
-	<popup_enable>False</popup_enable>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>5</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame5</name>
-	      <label>Preview:</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>7</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame6</name>
-	      <label>Options</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkAlignment</class>
-		<name>alignment4</name>
-		<xalign>0</xalign>
-		<yalign>0</yalign>
-		<xscale>0</xscale>
-		<yscale>0</yscale>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table1</name>
-		  <border_width>8</border_width>
-		  <rows>6</rows>
-		  <columns>5</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>0</row_spacing>
-		  <column_spacing>0</column_spacing>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label5</name>
-		    <label>Include:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label4</name>
-		    <label>Sections:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment2</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton1</name>
-		      <can_focus>True</can_focus>
-		      <label>Immediately follow each other</label>
-		      <active>True</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton1</name>
-		    <can_focus>True</can_focus>
-		    <label>Letter tabs on side</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton2</name>
-		    <can_focus>True</can_focus>
-		    <label>Headings for each letter</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>5</top_attach>
-		      <bottom_attach>6</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment3</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton2</name>
-		      <can_focus>True</can_focus>
-		      <label>Start on a new page</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label6</name>
-		    <label>Number of columns:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label7</name>
-		    <label>Blank forms at end:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment6</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton2</name>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>2</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment5</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton1</name>
-		      <width>45</width>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>1</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox3</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>8</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame7</name>
-		<label>Fonts</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table2</name>
-		  <border_width>8</border_width>
-		  <rows>2</rows>
-		  <columns>2</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>13</row_spacing>
-		  <column_spacing>8</column_spacing>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment7</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button6</name>
-		      <can_focus>True</can_focus>
-		      <label>Font...</label>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment8</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button5</name>
-		      <width>90</width>
-		      <can_focus>True</can_focus>
-		      <label>Font...</label>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox4</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label10</name>
-		      <label>Headings</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry3</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>10 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox5</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label9</name>
-		      <label>Body</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry2</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>8 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame8</name>
-		<label>Shading</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>checkbutton3</name>
-		  <can_focus>True</can_focus>
-		  <label>Print using gray shading</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label1</name>
-	  <label>Format</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>True</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame9</name>
-	      <label>Paper</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox16</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox17</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label21</name>
-		    <label>Type:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow1</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist1</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label26</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox18</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label24</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox5</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label27</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry9</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label28</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry10</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox19</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label25</name>
-		    <label>Paper source:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCombo</class>
-		    <name>combo1</name>
-		    <value_in_list>False</value_in_list>
-		    <ok_if_empty>True</ok_if_empty>
-		    <case_sensitive>False</case_sensitive>
-		    <use_arrows>True</use_arrows>
-		    <use_arrows_always>False</use_arrows_always>
-		    <items></items>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <child_name>GtkCombo:entry</child_name>
-		      <name>combo-entry1</name>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame10</name>
-	      <label>Margins</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table4</name>
-		<border_width>15</border_width>
-		<rows>2</rows>
-		<columns>4</columns>
-		<homogeneous>True</homogeneous>
-		<row_spacing>6</row_spacing>
-		<column_spacing>9</column_spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label29</name>
-		  <label>Top:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label30</name>
-		  <label>Bottom:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label31</name>
-		  <label>Left:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry11</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry12</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry13</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry14</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label32</name>
-		  <label>Right:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame11</name>
-	      <label>Page</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox8</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox20</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label33</name>
-		    <label>Size:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow2</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist2</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label35</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox21</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label34</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox6</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label36</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry15</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label37</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry16</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame12</name>
-	      <label>Orientation</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox4</name>
-		<homogeneous>False</homogeneous>
-		<spacing>10</spacing>
-
-		<widget>
-		  <class>Placeholder</class>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox9</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>5</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment9</name>
-		    <xalign>0</xalign>
-		    <yalign>1</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton3</name>
-		      <can_focus>True</can_focus>
-		      <label>Portrait</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment10</name>
-		    <xalign>0</xalign>
-		    <yalign>0</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton4</name>
-		      <can_focus>True</can_focus>
-		      <label>Landscape</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label2</name>
-	  <label>Paper</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox10</name>
-	  <border_width>8</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table5</name>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>True</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment15</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button11</name>
-		<can_focus>True</can_focus>
-		<label>Font...</label>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text10</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text11</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text12</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text13</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text14</name>
-	      <height>5</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text15</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment16</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox14</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label14</name>
-		  <label>Header</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry7</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment17</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox15</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label15</name>
-		  <label>Footer:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry8</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment14</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button10</name>
-		<can_focus>True</can_focus>
-		<label>Font...</label>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkToolbar</class>
-	      <name>toolbar1</name>
-	      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-	      <type>GTK_TOOLBAR_ICONS</type>
-	      <space_size>5</space_size>
-	      <space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <tooltips>True</tooltips>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton4</name>
-	    <can_focus>True</can_focus>
-	    <label>Reverse on even pages</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label3</name>
-	  <label>Header/Footer</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index fb17271f6b..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index 72cca146dd..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 53ca294d36..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 5844851bfb..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index d4dccc0b87..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-contact-print-style-editor.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *editor;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-	static int count = 2;
-	count --;
-	if ( count <= 0 )
-		exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact print style editor widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Style Editor Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-
-  app = gnome_app_new("Contact Print Style Editor Test", NULL);
-
-  editor = e_contact_print_style_editor_new("");
-  
-  gnome_app_set_contents( GNOME_APP( app ), editor );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
deleted file mode 100644
index 1b73fda3da..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-print.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *print;
-
-static gint test_close(GnomeDialog *dialog, gpointer data)
-{
-	exit(0);
-	return 1;
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact print code" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GList *shown_fields = NULL;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-  
-  shown_fields = g_list_append(shown_fields, "First field");
-  shown_fields = g_list_append(shown_fields, "Second field");
-  shown_fields = g_list_append(shown_fields, "Third field");
-  shown_fields = g_list_append(shown_fields, "Fourth field");
-
-  print = e_contact_print_dialog_new(NULL, NULL);
-  gtk_widget_show_all(print);
-  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/art/.cvsignore b/art/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/art/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
\ No newline at end of file
diff --git a/art/16_configure_addressbook.xpm b/art/16_configure_addressbook.xpm
deleted file mode 100644
index 4e037fe7b5..0000000000
--- a/art/16_configure_addressbook.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * 16_configure_addressbook_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #EAEAEA",
-"%	c #BDBDBD",
-"&	c #CFCFCF",
-"*	c #898989",
-"=	c #A8A8A8",
-"-	c #A3A3A3",
-";	c #F8F8F8",
-">	c #C9B49B",
-",	c #8E7151",
-"'	c #876E51",
-")	c #BAB1A5",
-"!	c #9D9D9D",
-"~	c #EAE8E3",
-"{	c #F3F3F3",
-"]	c #A88D6E",
-"^	c #DFD0BF",
-"/	c #5E432B",
-"(	c #7E6C5B",
-"_	c #A6A6A6",
-":	c #EEEEEE",
-"<	c #EEDFCC",
-"[	c #F4EEE6",
-"}	c #765E45",
-"|	c #736251",
-"1	c #C1C1C1",
-"2	c #B4B4B4",
-"3	c #FAFAFA",
-"4	c #7590AE",
-"5	c #C1665A",
-"6	c #445B71",
-"7	c #AEADAB",
-"8	c #E8E8E8",
-"9	c #4B6983",
-"0	c #9DB8D2",
-"a	c #486481",
-"b	c #314E6C",
-"c	c #BDBCB8",
-"d	c #5F7C96",
-"e	c #5D7A95",
-"f	c #4D6B87",
-"g	c #3B556D",
-"h	c #999794",
-"i	c #ADABA8",
-"j	c #5D5D5D",
-"k	c #9B9B9B",
-"l	c #DEDEDE",
-"m	c #C3C0BA",
-"n	c #DAD8D3",
-"o	c #B1AFAB",
-"p	c #CBC9C5",
-"q	c #A5A3A0",
-"r	c #96948F",
-"s	c #918E85",
-"       ..  ..   ",
-"      .+.  .@.  ",
-"      .+....@.  ",
-"      .+@@@@#.  ",
-" .......$@@#... ",
-".%+++++&.+#.*=-.",
-".+;>,')+.+@.!&~.",
-".+{]^/(+.+#._:~.",
-".+{<[}|1.+@.2&~.",
-".+34567.8@##.2~.",
-".+90ab.&@@@@#.c.",
-".+defg.+....@.h.",
-".+++++.+.!2.@.i.",
-".++j+j+..kl..!m.",
-".-~~~~~noc~pqrs.",
-" .............. "};
diff --git a/art/16_configure_folder.xpm b/art/16_configure_folder.xpm
deleted file mode 100644
index 4d016ca91a..0000000000
--- a/art/16_configure_folder.xpm
+++ /dev/null
@@ -1,85 +0,0 @@
-/* XPM */
-static char * 16_configure_folder_xpm[] = {
-"16 16 66 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #E4E5DF",
-"%	c #D5D6CB",
-"&	c #D6D7CA",
-"*	c #F5F6F0",
-"=	c #ADB198",
-"-	c #C2C6A9",
-";	c #C0C3A7",
-">	c #B4B89D",
-",	c #EAECDB",
-"'	c #F6F6F4",
-")	c #EAECDA",
-"!	c #AAAB9E",
-"~	c #E5E8D4",
-"{	c #E4E7D2",
-"]	c #C7C9B6",
-"^	c #F7F7F7",
-"/	c #DADEBF",
-"(	c #DADEBE",
-"_	c #D8DCBC",
-":	c #D6DBB9",
-"<	c #797D66",
-"[	c #CDD2AD",
-"}	c #CBD1AA",
-"|	c #95997C",
-"1	c #F3F3EA",
-"2	c #70745E",
-"3	c #A3A889",
-"4	c #F3F4EA",
-"5	c #D5D9B7",
-"6	c #7F8369",
-"7	c #ABB08E",
-"8	c #929778",
-"9	c #F1F3E9",
-"0	c #D3D7B4",
-"a	c #7C7F65",
-"b	c #8F9474",
-"c	c #F0F1E7",
-"d	c #D1D6B2",
-"e	c #CFD4AF",
-"f	c #7A7D61",
-"g	c #8D9270",
-"h	c #EFF1E5",
-"i	c #86896D",
-"j	c #909273",
-"k	c #707459",
-"l	c #EBECDE",
-"m	c #CACFA8",
-"n	c #C8CDA5",
-"o	c #B8BD97",
-"p	c #848769",
-"q	c #BFC598",
-"r	c #60634C",
-"s	c #989E79",
-"t	c #C9CCB9",
-"u	c #919576",
-"v	c #848869",
-"w	c #686B52",
-"x	c #838768",
-"y	c #595C46",
-"z	c #797D60",
-"A	c #666951",
-"      ..  ..    ",
-"     .+.  .@.   ",
-"     .+....@.   ",
-"   ...+@@@@#.   ",
-"  .$%&.+@@#.    ",
-" .*=-;>.+#..... ",
-" .,',,).+@.!~{].",
-" .^/(_:.+#.<[}|.",
-" .1/(_:.+@.23}|.",
-" .4_:5.+@##.678.",
-" .950.+@@@@#.ab.",
-" .cde.+....@.fg.",
-" .h[}.+.ij.@.kg.",
-" .lmno..pq..rsg.",
-" .t8ubvwwgxyzgA.",
-"  ............. "};
diff --git a/art/16_configure_mail.xpm b/art/16_configure_mail.xpm
deleted file mode 100644
index b6416735ef..0000000000
--- a/art/16_configure_mail.xpm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* XPM */
-static char * 16_configure_mail_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #010101",
-"%	c #2F2F2F",
-"&	c #A7A4A0",
-"*	c #FCFCFC",
-"=	c #F5F5F5",
-"-	c #5D5B57",
-";	c #EBEBEB",
-">	c #1B1B1B",
-",	c #FBFBF8",
-"'	c #716E6B",
-")	c #ECECEC",
-"!	c #BEBEBE",
-"~	c #EDEDED",
-"{	c #DFDFDF",
-"]	c #FBFAF7",
-"^	c #A5A29D",
-"/	c #E9E9E8",
-"(	c #797873",
-"_	c #8E8C8A",
-":	c #C6C3BD",
-"<	c #C9C5C0",
-"[	c #7D7A77",
-"}	c #F7F5F1",
-"|	c #FAF9F6",
-"1	c #F8F6F2",
-"2	c #DAD8D6",
-"3	c #656360",
-"4	c #E2DFD8",
-"5	c #090808",
-"6	c #D7D4CE",
-"7	c #D8D5CF",
-"8	c #D6D3CD",
-"9	c #D9D6D0",
-"0	c #D3D1CD",
-"a	c #BEBCB6",
-"b	c #E0DCD5",
-"c	c #222221",
-"         ..  .. ",
-"        .+.  .@.",
-"        .+....@.",
-"        .+@@@@#.",
-"         .+@@#. ",
-"          .+#.  ",
-"  $%$$$$$$.+@.  ",
-" $&******=.+#.  ",
-" $+-+++++;>+@.  ",
-" $+,'+++).!@##. ",
-" $+,,'+~.{@@@@#.",
-" $+,]^'/.+....@.",
-" $+](,,_.+.:<.@.",
-" $+[,}|12..34.. ",
-" $56777890abc$  ",
-"  $$$$$$$$$$$   "};
diff --git a/art/16_copy_message.xpm b/art/16_copy_message.xpm
deleted file mode 100644
index a4f56cfd6e..0000000000
--- a/art/16_copy_message.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * 16_copy_message_xpm[] = {
-"16 16 39 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #F7F6F4",
-"{	c #B0ADA7",
-"]	c #83817E",
-"^	c #E1DFDA",
-"/	c #928F8B",
-"(	c #FBFBFA",
-"_	c #F7F5F2",
-":	c #F5F3F0",
-"<	c #B5B2AC",
-"[	c #A09C97",
-"}	c #F0EFEB",
-"|	c #E4E2DD",
-"1	c #AEABA6",
-"2	c #92908B",
-"3	c #E8E6E1",
-"4	c #F7F6F2",
-"5	c #F5F4F0",
-"6	c #6B6A68",
-"7	c #E2DFD9",
-"8	c #E2E0DB",
-"9	c #E3E1DC",
-"0	c #E6E4DF",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".#%&*#*=*-;>.   ",
-".#*,=*=*')'!.   ",
-".#**.+......... ",
-".#*.@#########$.",
-".#~.#%&*#*=*-;>.",
-".#{.#*,=*=*')'!.",
-".]^.#**/(*_)*:!.",
-" ...#*~<)#)[-}|.",
-"   .#~1**)__23|.",
-"   .#{*:45_:>63.",
-"   .]^777^8890$.",
-"    ........... ",
-"                "};
diff --git a/art/16_edit.xpm b/art/16_edit.xpm
deleted file mode 100644
index 28b8f090c4..0000000000
--- a/art/16_edit.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * 16_edit_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #BAA88F",
-"$	c #836B4E",
-"%	c #FEFEFE",
-"&	c #FCFCFC",
-"*	c #FBFBFB",
-"=	c #E5E5E5",
-"-	c #C5A985",
-";	c #DC9E55",
-">	c #9E6233",
-",	c #FFFFFF",
-"'	c #F2F2F2",
-")	c #D9D9D9",
-"!	c #E4E4E4",
-"~	c #C3A783",
-"{	c #DD9D53",
-"]	c #A76631",
-"^	c #EEEEEE",
-"/	c #D4D4D4",
-"(	c #FAFAFA",
-"_	c #7B7B7B",
-":	c #C5AA88",
-"<	c #A86631",
-"[	c #DCDCDC",
-"}	c #F0F0F0",
-"|	c #5E5E5E",
-"1	c #C3A47A",
-"2	c #DD9D52",
-"3	c #A66430",
-"4	c #D5D5D5",
-"5	c #6A6A6A",
-"6	c #C2A174",
-"7	c #DC9B4E",
-"8	c #A96630",
-"9	c #6E6E6E",
-"0	c #D8D8D8",
-"a	c #D6D6D6",
-"b	c #9F9F9F",
-"c	c #BEA686",
-"d	c #DD9D51",
-"e	c #AA682F",
-"f	c #F5F5F5",
-"g	c #DDDDDD",
-"h	c #F9F9F9",
-"i	c #7A7A7A",
-"j	c #BCAC9B",
-"k	c #A86E3F",
-"l	c #797979",
-"m	c #F4F4F4",
-"n	c #F3F3F3",
-"o	c #DFDFDF",
-"p	c #7C7C7C",
-"q	c #4F4F4F",
-"r	c #6C6C6C",
-"s	c #EAEAEA",
-"t	c #F8F8F8",
-"u	c #F6F6F6",
-"v	c #F7F7F7",
-"w	c #EBEBEB",
-"x	c #ECECEC",
-"y	c #E0E0E0",
-"z	c #E8E8E8",
-"       ..    .. ",
-"     ..+@.  .#$.",
-"   ..%+&*=..-;>.",
-" ..,%+')*!.~{]. ",
-".,%%^/)*(_:{<.  ",
-".%%)[**}|123.   ",
-" .+'*}456789.   ",
-" .&*0abcde.fg.  ",
-"  .((hijklfmno. ",
-"  .(hpq.rfmnsg. ",
-"   .tilufm^oo.  ",
-"   .vuufwoo..   ",
-"    .uxyo..     ",
-"    .zg..       ",
-"     ..         ",
-"                "};
diff --git a/art/16_encrypt.xpm b/art/16_encrypt.xpm
deleted file mode 100644
index 636345ad9d..0000000000
--- a/art/16_encrypt.xpm
+++ /dev/null
@@ -1,80 +0,0 @@
-/* XPM */
-static char * 16_encrypt_xpm[] = {
-"16 16 61 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #808080",
-"#	c #FEFEFE",
-"$	c #8F8F8F",
-"%	c #313131",
-"&	c #CDB86D",
-"*	c #EED680",
-"=	c #FFFFFF",
-"-	c #F2F2F2",
-";	c #343434",
-">	c #EEEEEE",
-",	c #D4D4D4",
-"'	c #D9D9D9",
-")	c #3D3D3D",
-"!	c #8D8D8D",
-"~	c #DCDCDC",
-"{	c #FBFBFB",
-"]	c #B2B2B2",
-"^	c #3A3A3A",
-"/	c #A9A9A9",
-"(	c #F0F0F0",
-"_	c #444444",
-":	c #E4E9F1",
-"<	c #B3C5D7",
-"[	c #AABDCE",
-"}	c #A2B4C5",
-"|	c #99ABBD",
-"1	c #8FA3B4",
-"2	c #3C5469",
-"3	c #FCFCFC",
-"4	c #D8D8D8",
-"5	c #D6D6D6",
-"6	c #6A6A6A",
-"7	c #BDCEE0",
-"8	c #8FAAC4",
-"9	c #819DB7",
-"0	c #7490AA",
-"a	c #66839D",
-"b	c #587690",
-"c	c #314456",
-"d	c #FAFAFA",
-"e	c #F9F9F9",
-"f	c #676767",
-"g	c #DFDFDF",
-"h	c #5F5F5F",
-"i	c #F8F8F8",
-"j	c #F7F7F7",
-"k	c #696969",
-"l	c #92A1B0",
-"m	c #5E7081",
-"n	c #556879",
-"o	c #4C5F70",
-"p	c #435668",
-"q	c #394E5F",
-"r	c #23313E",
-"s	c #F6F6F6",
-"t	c #7E7E7E",
-"u	c #E8E8E8",
-"v	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@...   ",
-"    ..#+$%&*&.  ",
-"  ..=#+-;&@. &. ",
-" .=##>,')*!. *. ",
-" .##'~{]^&!/.&..",
-"  .+-{(_:<[}|12.",
-"  .3{4567890abc.",
-"   .ddef7890abc.",
-"   .degh7890abc.",
-"    .ijklmnopqr.",
-"    .jsghkkt....",
-"     .sssg..    ",
-"     .uv..      ",
-"      ..        "};
diff --git a/art/16_evo-address-conduit.png b/art/16_evo-address-conduit.png
deleted file mode 100644
index 18a2e5809e..0000000000
--- a/art/16_evo-address-conduit.png
+++ /dev/null
diff --git a/art/16_evo-calendar-conduit.png b/art/16_evo-calendar-conduit.png
deleted file mode 100644
index dd8e8ab85e..0000000000
--- a/art/16_evo-calendar-conduit.png
+++ /dev/null
diff --git a/art/16_evo-todo-conduit.png b/art/16_evo-todo-conduit.png
deleted file mode 100644
index d36d2c61fd..0000000000
--- a/art/16_evo-todo-conduit.png
+++ /dev/null
diff --git a/art/16_forward.xpm b/art/16_forward.xpm
deleted file mode 100644
index 7d2d1457df..0000000000
--- a/art/16_forward.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char * 16_forward_xpm[] = {
-"16 16 32 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #000000",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #797873",
-"]	c #BBC2CC",
-"^	c #576E87",
-"/	c #EFEFEF",
-"(	c #CCCCCC",
-"_	c #7D7A77",
-":	c #F7F5F1",
-"<	c #FAF9F6",
-"[	c #314E6C",
-"}	c #090808",
-"|	c #D7D4CE",
-"1	c #D8D5CF",
-"2	c #181818",
-"3	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%%%%%>,'.  ",
-" .%--;%)))))))))",
-" .%-!~;)%%%%%%%)",
-" .%!{--)%]^///()",
-" .%_-:<)%^[[/[()",
-" .}|111)%/[[[[()",
-"  .....)%//[[[()",
-"       )%/[[[[()",
-"       )%((((((2",
-"       ))3))))))"};
diff --git a/art/16_move_message.xpm b/art/16_move_message.xpm
deleted file mode 100644
index 846febbe49..0000000000
--- a/art/16_move_message.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_move_message_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #000000",
-"{	c #928F8B",
-"]	c #FBFBFA",
-"^	c #F7F5F2",
-"/	c #F5F3F0",
-"(	c #F7F6F4",
-"_	c #B5B2AC",
-":	c #A09C97",
-"<	c #F0EFEB",
-"[	c #E4E2DD",
-"}	c #AEABA6",
-"|	c #92908B",
-"1	c #E8E6E1",
-"2	c #B0ADA7",
-"3	c #F7F6F2",
-"4	c #F5F4F0",
-"5	c #6B6A68",
-"6	c #83817E",
-"7	c #E1DFDA",
-"8	c #E2DFD9",
-"9	c #E2E0DB",
-"0	c #E3E1DC",
-"a	c #E6E4DF",
-"                ",
-" . . . . . .    ",
-".           .   ",
-"                ",
-".           .   ",
-"    .+......... ",
-".  .@#########$.",
-"   .#%&*#*=*-;>.",
-".  .#*,=*=*')'!.",
-" ~ .#**{]*^)*/!.",
-"   .#*(_)#):-<[.",
-"   .#(}**)^^|1[.",
-"   .#2*/34^/>51.",
-"   .678887990a$.",
-"    ........... ",
-"                "};
diff --git a/art/16_print.xpm b/art/16_print.xpm
deleted file mode 100644
index 2ca7aa1e8f..0000000000
--- a/art/16_print.xpm
+++ /dev/null
@@ -1,54 +0,0 @@
-/* XPM */
-static char * 16_print_xpm[] = {
-"16 16 35 1",
-" 	c None",
-".	c #000000",
-"+	c #DCDCDC",
-"@	c #F8F8F8",
-"#	c #F1F1F1",
-"$	c #E8E8E8",
-"%	c #E4E4E4",
-"&	c #FFFFFF",
-"*	c #E5E5E5",
-"=	c #D7D7D7",
-"-	c #D2D2D2",
-";	c #E3E3E3",
-">	c #979797",
-",	c #F2F2F2",
-"'	c #FCFCFC",
-")	c #EBEBEB",
-"!	c #939393",
-"~	c #B8B8B8",
-"{	c #DADADA",
-"]	c #F0F0F0",
-"^	c #D1D1D1",
-"/	c #A7A7A7",
-"(	c #CACACA",
-"_	c #B9B9B9",
-":	c #8A8A8A",
-"<	c #C0C0C0",
-"[	c #E36548",
-"}	c #DBDBDB",
-"|	c #5B5B5B",
-"1	c #B3B3B3",
-"2	c #EED684",
-"3	c #EED683",
-"4	c #707070",
-"5	c #A4A4A4",
-"6	c #585858",
-"        .       ",
-"       .+..     ",
-"      .@#$%..   ",
-"     .&&&&#*=.. ",
-"    .-@&&&&&#;. ",
-"  ..+>*,'&&&).  ",
-"..++..!~{$]&..  ",
-".^^+++..!/.(++..",
-".^^^];++._^+:::.",
-".^<&[]]}++::::|.",
-".^^1&23:^:::|4|.",
-"..^^<5::^:|4|:|.",
-"  ..^^^^^:|:|:..",
-"    ..^^^:6:..  ",
-"      ..^:..    ",
-"        ..      "};
diff --git a/art/16_reply.xpm b/art/16_reply.xpm
deleted file mode 100644
index 059d3ebc12..0000000000
--- a/art/16_reply.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * 16_reply_xpm[] = {
-"16 16 27 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #000000",
-",	c #FBFAF7",
-"'	c #A5A29D",
-")	c #990000",
-"!	c #EFEFEF",
-"~	c #CCCCCC",
-"{	c #797873",
-"]	c #7D7A77",
-"^	c #F7F5F1",
-"/	c #090808",
-"(	c #D7D4CE",
-"_	c #D8D5CF",
-":	c #7F0000",
-"<	c #181818",
-"[	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%>>>>>>>>> ",
-" .%--;>%%%%%%%> ",
-" .%-,'>%))))!~> ",
-" .%,{->%)))!!~> ",
-" .%]-^>%))))!~> ",
-" ./(__>%)!)):~> ",
-"  ....>%!!!::~> ",
-"      >%~~~~~~< ",
-"      >>[>>>>>> ",
-"                "};
diff --git a/art/16_reply_to_all.xpm b/art/16_reply_to_all.xpm
deleted file mode 100644
index 0c0a00e020..0000000000
--- a/art/16_reply_to_all.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * 16_reply_to_all_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #F7F5F1",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #000000",
-"]	c #797873",
-"^	c #7D7A77",
-"/	c #FAF9F6",
-"(	c #F8F6F2",
-"_	c #990000",
-":	c #EFEFEF",
-"<	c #CCCCCC",
-"[	c #090808",
-"}	c #D7D4CE",
-"|	c #D8D5CF",
-"1	c #D6D3CD",
-"2	c #7F0000",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".%&%%%%%%%*=..  ",
-".%-;%%%%%>,'.$. ",
-".%--;%%%;-)'.=. ",
-".%-!~;-{{{{{{{{{",
-".%!]--;{%%%%%%%{",
-".%^-)/({%____:<{",
-".[}|||1{%___::<{",
-" ......{%____:<{",
-"  .[}||{%_:__2<{",
-"   ....{%:::22<{",
-"       {%<<<<<<3",
-"       {{4{{{{{{"};
diff --git a/art/16_save.xpm b/art/16_save.xpm
deleted file mode 100644
index 7b1812943e..0000000000
--- a/art/16_save.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * 16_save_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #B8CADB",
-"@	c #C5D4E3",
-"#	c #687B8D",
-"$	c #D8D8D8",
-"%	c #CFDBE6",
-"&	c #9DB8D2",
-"*	c #728699",
-"=	c #BCCEDF",
-"-	c #FFFFFF",
-";	c #D2DEEA",
-">	c #C0D1E2",
-",	c #CFDBE7",
-"'	c #798EA3",
-")	c #D0DDE9",
-"!	c #B7CBDE",
-"~	c #B6CADD",
-"{	c #B7CADD",
-"]	c #BACCDF",
-"^	c #9FB9D3",
-"/	c #7E94A9",
-"(	c #A4BDD5",
-"_	c #BABABA",
-":	c #556474",
-"<	c #2A303A",
-"                ",
-"                ",
-"  ............  ",
-" .+@#$$$$$$%&*. ",
-" .=&#------;&*. ",
-" .>&#$$$$$$,&*. ",
-" .>&'------)&*. ",
-" .>&&!~~{{]^&*. ",
-" .>&&&&&&&&&&*. ",
-" .>&&//////&&*. ",
-" .>(/$$_$-$/&*. ",
-" .>&/$_$-/$/&*. ",
-" .>&/$_-$/$/&*. ",
-" .=&/_$-$$$/**. ",
-"  .:........<.  ",
-"                "};
diff --git a/art/24_all_contacts.xpm b/art/24_all_contacts.xpm
deleted file mode 100644
index 1f2e90123d..0000000000
--- a/art/24_all_contacts.xpm
+++ /dev/null
@@ -1,136 +0,0 @@
-/* XPM */
-static char * 24_all_contacts_xpm[] = {
-"24 24 109 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #E2E2E2",
-"@ 	c #FFFFFF",
-"# 	c #7C7C7C",
-"$ 	c #99A097",
-"% 	c #4D4D4D",
-"& 	c #535250",
-"* 	c #A6A6A6",
-"= 	c #798874",
-"- 	c #444F42",
-"; 	c #5B6158",
-"> 	c #909090",
-", 	c #6B6B6B",
-"' 	c #B5BCB3",
-") 	c #596555",
-"! 	c #869880",
-"~ 	c #DDDDDD",
-"{ 	c #C5C5C5",
-"] 	c #6E6E6E",
-"^ 	c #DCE1DA",
-"/ 	c #495246",
-"( 	c #575757",
-"_ 	c #929292",
-": 	c #CDCDCD",
-"< 	c #F8F8F9",
-"[ 	c #ABABAB",
-"} 	c #656565",
-"| 	c #BDBDBD",
-"1 	c #9C9FA2",
-"2 	c #1E1E1F",
-"3 	c #BEBEBE",
-"4 	c #F8F8F8",
-"5 	c #C9B49B",
-"6 	c #8E7151",
-"7 	c #876E51",
-"8 	c #BAB1A5",
-"9 	c #C4CCD4",
-"0 	c #5F6D7C",
-"a 	c #4B5E6D",
-"b 	c #34383A",
-"c 	c #F3F3F3",
-"d 	c #A88D6E",
-"e 	c #DFD0BF",
-"f 	c #5E432B",
-"g 	c #7E6C5B",
-"h 	c #9EA8B3",
-"i 	c #C0C8CF",
-"j 	c #9EA2A7",
-"k 	c #6E6F6E",
-"l 	c #80766E",
-"m 	c #665B52",
-"n 	c #969696",
-"o 	c #C3C3C3",
-"p 	c #EEDFCC",
-"q 	c #F4EEE6",
-"r 	c #765E45",
-"s 	c #F9F9FA",
-"t 	c #C9CFD6",
-"u 	c #A3AEBA",
-"v 	c #E9EEF2",
-"w 	c #91B7BA",
-"x 	c #625547",
-"y 	c #625347",
-"z 	c #D0CCC9",
-"A 	c #CFCFCF",
-"B 	c #FAFAFA",
-"C 	c #7590AE",
-"D 	c #C1665A",
-"E 	c #445B71",
-"F 	c #FDFCFC",
-"G 	c #EEF0F1",
-"H 	c #DCD8D5",
-"I 	c #BCB2A7",
-"J 	c #776E67",
-"K 	c #877D75",
-"L 	c #C8C8C8",
-"M 	c #4B6983",
-"N 	c #9DB8D2",
-"O 	c #486481",
-"P 	c #314E6C",
-"Q 	c #667A8D",
-"R 	c #FDFDFD",
-"S 	c #736A63",
-"T 	c #756C65",
-"U 	c #D6D3D1",
-"V 	c #BABABA",
-"W 	c #5F7C96",
-"X 	c #5D7A95",
-"Y 	c #4D6B87",
-"Z 	c #3B556D",
-"` 	c #344A60",
-" .	c #999999",
-"..	c #7F7F7F",
-"+.	c #F6F6F6",
-"@.	c #5D5D5D",
-"#.	c #787878",
-"$.	c #9B9B9B",
-"%.	c #C7C7C7",
-"&.	c #A3A3A3",
-"*.	c #EAE8E3",
-"=.	c #E0DDD6",
-"-.	c #918E85",
-";.	c #D5D5D5",
-">.	c #B5B5B5",
-",.	c #E1E1E1",
-"'.	c #989898",
-").	c #C1C1C1",
-"!.	c #DADADA",
-"                      . . . .                   ",
-"                  . . + @ . . . .               ",
-"              . . + @ # . + @ @ + . .           ",
-"          . . + @ $ % & . @ @ * @ @ + . .       ",
-"        . + @ @ = - ; . + @ @ > , @ @ @ + . .   ",
-"        . + @ @ ' ) ! . @ @ ~ # @ { ] @ @ @ + . ",
-"          . @ @ ^ / . + @ @ > @ @ ] @ @ ( @ + . ",
-"          . + @ @ ^ . @ @ ~ , @ _ ] @ * : @ .   ",
-"    . . . . . . . . + < @ [ ~ @ # @ @ } @ + .   ",
-"  . | @ @ @ @ @ @ . @ 1 2 @ @ * 3 @ > @ @ .     ",
-"  . @ 4 5 6 7 8 . + 9 0 a b @ @ @ > ~ @ + . .   ",
-"  . @ c d e f g . @ h i j k l m @ n o @ . @ + . ",
-"  . @ c p q r . + s t u v w x y z @ @ A . + + . ",
-"  . @ B C D E . + @ F G H I J K @ > @ . L @ .   ",
-"  . @ M N O P Q . . + R @ S T U V @ + . @ + .   ",
-"  . @ W X Y Z ` @  .. . + @ @ @ ..+.. @ @ .     ",
-"  . @ @ @ @ @ @ @ @ @ @ . . + @ @ + . @ + .     ",
-"  . @ @ @.@ @.@ #.@ $.@ %.@ . . . . @ @ .       ",
-"  . &.*.*.*.*.*.*.*.*.*.*.*.=.-.. ;.@ A .       ",
-"    . . . . . . . . . . . . . . >.,.@ .         ",
-"                . . '.V V V V ).!.@ L .         ",
-"                    . . + @ @ @ @ @ .           ",
-"                        . . + @ @ L .           ",
-"                            . . . .             "};
diff --git a/art/24_find_contact.xpm b/art/24_find_contact.xpm
deleted file mode 100644
index 37d957b13b..0000000000
--- a/art/24_find_contact.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char * 24_find_contact_xpm[] = {
-"24 24 100 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #BDBDBD",
-"@ 	c #FFFFFF",
-"# 	c #A3A3A3",
-"$ 	c #F8F8F8",
-"% 	c #C9B49B",
-"& 	c #8E7151",
-"* 	c #876E51",
-"= 	c #BAB1A5",
-"- 	c #FDFDFD",
-"; 	c #FBFBFB",
-"> 	c #EAE8E3",
-", 	c #F3F3F3",
-"' 	c #A88D6E",
-") 	c #DFD0BF",
-"! 	c #5E432B",
-"~ 	c #7E6C5B",
-"{ 	c #313131",
-"] 	c #575757",
-"^ 	c #FCFCFC",
-"/ 	c #555555",
-"( 	c #EEDFCC",
-"_ 	c #F4EEE6",
-": 	c #765E45",
-"< 	c #736251",
-"[ 	c #FAFAFA",
-"} 	c #7590AE",
-"| 	c #C1665A",
-"1 	c #445B71",
-"2 	c #D7D6D3",
-"3 	c #ADADAD",
-"4 	c #9B9B9B",
-"5 	c #4B6983",
-"6 	c #9DB8D2",
-"7 	c #486481",
-"8 	c #314E6C",
-"9 	c #667A8D",
-"0 	c #E0E0E0",
-"a 	c #BCBCBC",
-"b 	c #C5C5C5",
-"c 	c #5F7C96",
-"d 	c #5D7A95",
-"e 	c #4D6B87",
-"f 	c #3B556D",
-"g 	c #344A60",
-"h 	c #47473F",
-"i 	c #0A0A09",
-"j 	c #4B4B43",
-"k 	c #999999",
-"l 	c #34342E",
-"m 	c #9D9D8D",
-"n 	c #CFCFB9",
-"o 	c #C4C4AF",
-"p 	c #8D8D7F",
-"q 	c #353530",
-"r 	c #A2A2A2",
-"s 	c #D2D2D2",
-"t 	c #5D5D5D",
-"u 	c #46463F",
-"v 	c #9C9C8C",
-"w 	c #E2E2D0",
-"x 	c #EDEDE7",
-"y 	c #C0C0AC",
-"z 	c #B2B29F",
-"A 	c #828274",
-"B 	c #4C4C44",
-"C 	c #B9B9B9",
-"D 	c #D1CFC8",
-"E 	c #090908",
-"F 	c #D5D5BF",
-"G 	c #FBFBFA",
-"H 	c #C3C3AE",
-"I 	c #B5B5A2",
-"J 	c #A6A695",
-"K 	c #959586",
-"L 	c #080807",
-"M 	c #72706D",
-"N 	c #918E85",
-"O 	c #090909",
-"P 	c #CACAB5",
-"Q 	c #DDDDD0",
-"R 	c #B7B7A4",
-"S 	c #AAAA98",
-"T 	c #9B9B8B",
-"U 	c #8C8C7D",
-"V 	c #474740",
-"W 	c #929283",
-"X 	c #BABAA7",
-"Y 	c #ADAD9B",
-"Z 	c #9F9F8E",
-"` 	c #909081",
-" .	c #727266",
-"..	c #4C4C45",
-"+.	c #34342F",
-"@.	c #878779",
-"#.	c #A0A090",
-"$.	c #737367",
-"%.	c #010101",
-"&.	c #414141",
-"                                                ",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . .             ",
-"      . + @ @ @ @ @ @ @ @ @ @ @ @ # .           ",
-"      . @ $ % & * = @ - @ ; @ @ @ > .           ",
-"      . @ , ' ) ! ~ @ { ] ^ / - @ > .           ",
-"      . @ , ( _ : < @ @ @ @ @ @ @ > .           ",
-"      . @ [ } | 1 2 @ 3 @ 4 3 @ @ > .           ",
-"      . @ 5 6 7 8 9 0 3 a b 0 @ @ > .           ",
-"      . @ c d e f g h i i j k b @ > .           ",
-"      . @ @ @ @ @ l m n o p q r s > .           ",
-"      . @ @ t @ u v w x y z A B C D .           ",
-"      . # > > > E F G H I J K L M N .           ",
-"        . . . . O P Q R S T U i . .             ",
-"                V W X Y Z `  ...                ",
-"                  +.@.#.W $.%.%.                ",
-"                    j i i &.  %.%.              ",
-"                              %.%.%.            ",
-"                                %.%.%.          ",
-"                                  %.%.%.        ",
-"                                    %.%.        ",
-"                                                ",
-"                                                "};
diff --git a/art/48_evo-address-conduit.png b/art/48_evo-address-conduit.png
deleted file mode 100644
index 342a061088..0000000000
--- a/art/48_evo-address-conduit.png
+++ /dev/null
diff --git a/art/48_evo-calendar-conduit.png b/art/48_evo-calendar-conduit.png
deleted file mode 100644
index bb0a49791e..0000000000
--- a/art/48_evo-calendar-conduit.png
+++ /dev/null
diff --git a/art/48_evo-todo-conduit.png b/art/48_evo-todo-conduit.png
deleted file mode 100644
index dd4899e984..0000000000
--- a/art/48_evo-todo-conduit.png
+++ /dev/null
diff --git a/art/Makefile.am b/art/Makefile.am
deleted file mode 100644
index cb5161dbb7..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-
-images_DATA = \
-	16_configure_addressbook.xpm	\
-	16_configure_addressbook.xpm	\
-	16_configure_folder.xpm		\
-	16_configure_mail.xpm		\
-	16_copy_message.xpm		\
-	16_edit.xpm			\
-	16_encrypt.xpm			\
-	16_forward.xpm			\
-	16_move_message.xpm		\
-	16_print.xpm			\
-	16_print.xpm			\
-	16_reply.xpm			\
-	16_reply_to_all.xpm		\
-	16_save.xpm			\
-	24_all_contacts.xpm		\
-	24_find_contact.xpm		\
-	briefcase.png       		\
-	butterfly.png			\
-	cellphone.png       		\
-	envelope.png        		\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.png 	\
-	evolution-contacts.png 		\
-	evolution-inbox-mini.png 	\
-	evolution-inbox.png 		\
-	evolution-notes-mini.png 	\
-	evolution-notes.png 		\
-	evolution-tasks-mini.png 	\
-	evolution-tasks.png 		\
-	evolution-today.png 		\
-	executive-summary-bg.png	\
-	executive-summary-curve.png	\
-	globe.png           		\
-	house.png           		\
-	malehead.png			\
-	new_contact.xpm			\
-	service-close.png		\
-	service-configure.png		\
-	service-down.png		\
-	service-down-disabled.png	\
-	service-left.png		\
-	service-left-disabled.png	\
-	service-right.png		\
-	service-right-disabled.png	\
-	service-up.png			\
-	service-up-disabled.png		\
-	splash.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	dayview.xpm			\
-	fetch-mail.png			\
-	forward.png			\
-	monthview.xpm  			\
-	move-message.png		\
-	new_appointment.png		\
-	reply-to-all.png		\
-	reply.png			\
-	weekview.xpm  			\
-	workweekview.xpm		\
-	yearview.xpm	
-
-
-EXTRA_DIST = \
-	add-service.png	\
-	attachment.xpm \
-	compose-message.png \
-	copy-message.png \
-	empty.xpm \
-	fetch-mail.png \
-	forward.png \
-	mail-new.xpm \
-	mail-read.xpm \
-	mail-replied.xpm \
-	mark.xpm \
-	meeting.xpm \
-	move-message.png \
-	priority-high.xpm \
-	priority-low.xpm \
-	reply.png \
-	reply-to-all.png \
-	tree-expanded.xpm \
-	tree-unexpanded.xpm \
-	score-lowest.xpm \
-	score-lower.xpm \
-	score-low.xpm \
-	score-normal.xpm \
-	score-high.xpm \
-	score-higher.xpm \
-	score-highest.xpm \
-	$(images_DATA)
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index 024b203fe0..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index 62ddebe678..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 1bcc0386d2..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"     ...        ",
-"    .   . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    .  .  .     ",
-"    .     .     ",
-"     .   .      ",
-"      ...       ",
-"                "};
diff --git a/art/briefcase.png b/art/briefcase.png
deleted file mode 100644
index 424ad09632..0000000000
--- a/art/briefcase.png
+++ /dev/null
diff --git a/art/butterfly.png b/art/butterfly.png
deleted file mode 100644
index 00089774e0..0000000000
--- a/art/butterfly.png
+++ /dev/null
diff --git a/art/cellphone.png b/art/cellphone.png
deleted file mode 100644
index c8d70ae663..0000000000
--- a/art/cellphone.png
+++ /dev/null
diff --git a/art/compose-message.png b/art/compose-message.png
deleted file mode 100644
index 2b0b97c791..0000000000
--- a/art/compose-message.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index 907ec1a85d..0000000000
--- a/art/copy-message.png
+++ /dev/null
diff --git a/art/dayview.xpm b/art/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/art/dayview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * dayview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #D8D8D4",
-"@	c #919191",
-"#	c #666666",
-"$	c #FFFFFF",
-"%	c #F2F1ED",
-"....................... ",
-".++++++++++++++++++++@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".@####################. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".+@@#@@@@@@@@@@@@@@@@#. ",
-"....................... ",
-"                        "};
diff --git a/art/delete_message.xpm b/art/delete_message.xpm
deleted file mode 100644
index 8df5b6faed..0000000000
--- a/art/delete_message.xpm
+++ /dev/null
@@ -1,79 +0,0 @@
-/* XPM */
-static char * delete_message_xpm[] = {
-"16 16 60 1",
-" 	c None",
-".	c #000000",
-"+	c #252525",
-"@	c #A8BA9E",
-"#	c #B4C1AB",
-"$	c #909F86",
-"%	c #484E43",
-"&	c #A0AD94",
-"*	c #9EAB91",
-"=	c #94A08D",
-"-	c #BFCCB7",
-";	c #A7B69B",
-">	c #BEC9B5",
-",	c #353931",
-"'	c #242622",
-")	c #9BAA8F",
-"!	c #9AA78E",
-"~	c #7C8672",
-"{	c #7C9674",
-"]	c #B0C0AB",
-"^	c #CED6C8",
-"/	c #DAE1D6",
-"(	c #98A58C",
-"_	c #5B6B57",
-":	c #637354",
-"<	c #748C6B",
-"[	c #94AA8D",
-"}	c #8FA58A",
-"|	c #6F8668",
-"1	c #667961",
-"2	c #5D6E58",
-"3	c #4D5A4B",
-"4	c #485245",
-"5	c #738B6E",
-"6	c #687B63",
-"7	c #576452",
-"8	c #495345",
-"9	c #4F5B4B",
-"0	c #3F453D",
-"a	c #586953",
-"b	c #C3CEBF",
-"c	c #556550",
-"d	c #879B83",
-"e	c #424D40",
-"f	c #84967F",
-"g	c #414A3D",
-"h	c #84957F",
-"i	c #84957E",
-"j	c #809A78",
-"k	c #AEBDA9",
-"l	c #879B81",
-"m	c #83957E",
-"n	c #4A5846",
-"o	c #677A61",
-"p	c #7D9775",
-"q	c #7A9472",
-"r	c #728A6B",
-"s	c #5E7058",
-"t	c #6D8267",
-"u	c #697D64",
-"                ",
-"                ",
-"     ......     ",
-"   +.@#$%&*..   ",
-"  .=-;>,'*)!~.  ",
-"  .{]^/*)!({_.  ",
-"  .:<[}{|1234.  ",
-"   .+567890+.   ",
-"   .a++++++6.   ",
-"   .abcdefg6.   ",
-"   .abcdehg6.   ",
-"   .abcdeig6.   ",
-"   .jkclemno.   ",
-"    .pqrstu.    ",
-"     ......     ",
-"                "};
diff --git a/art/empty.xpm b/art/empty.xpm
deleted file mode 100644
index aca06618b1..0000000000
--- a/art/empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/envelope.png b/art/envelope.png
deleted file mode 100644
index 77acd63100..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index 84c12aeabb..0000000000
--- a/art/evolution-calendar-mini.png
+++ /dev/null
diff --git a/art/evolution-calendar.png b/art/evolution-calendar.png
deleted file mode 100644
index 76afca6b6f..0000000000
--- a/art/evolution-calendar.png
+++ /dev/null
diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png
deleted file mode 100644
index 5ddb92c1ce..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution-contacts.png b/art/evolution-contacts.png
deleted file mode 100644
index 0d2cfb7e5f..0000000000
--- a/art/evolution-contacts.png
+++ /dev/null
diff --git a/art/evolution-inbox-mini.png b/art/evolution-inbox-mini.png
deleted file mode 100644
index dbc20fcef1..0000000000
--- a/art/evolution-inbox-mini.png
+++ /dev/null
diff --git a/art/evolution-inbox.png b/art/evolution-inbox.png
deleted file mode 100644
index 3b0f90b292..0000000000
--- a/art/evolution-inbox.png
+++ /dev/null
diff --git a/art/evolution-notes-mini.png b/art/evolution-notes-mini.png
deleted file mode 100644
index f5b5d776d0..0000000000
--- a/art/evolution-notes-mini.png
+++ /dev/null
diff --git a/art/evolution-notes.png b/art/evolution-notes.png
deleted file mode 100644
index f82006b894..0000000000
--- a/art/evolution-notes.png
+++ /dev/null
diff --git a/art/evolution-tasks-mini.png b/art/evolution-tasks-mini.png
deleted file mode 100644
index d23b5a0be7..0000000000
--- a/art/evolution-tasks-mini.png
+++ /dev/null
diff --git a/art/evolution-tasks.png b/art/evolution-tasks.png
deleted file mode 100644
index 0878645f9f..0000000000
--- a/art/evolution-tasks.png
+++ /dev/null
diff --git a/art/evolution-today.png b/art/evolution-today.png
deleted file mode 100644
index 010bcb8cc7..0000000000
--- a/art/evolution-today.png
+++ /dev/null
diff --git a/art/executive-summary-bg.png b/art/executive-summary-bg.png
deleted file mode 100644
index fdcde6613d..0000000000
--- a/art/executive-summary-bg.png
+++ /dev/null
diff --git a/art/executive-summary-curve.png b/art/executive-summary-curve.png
deleted file mode 100644
index 3ba42dd02b..0000000000
--- a/art/executive-summary-curve.png
+++ /dev/null
diff --git a/art/fetch-mail.png b/art/fetch-mail.png
deleted file mode 100644
index 30cda0564d..0000000000
--- a/art/fetch-mail.png
+++ /dev/null
diff --git a/art/filters.xpm b/art/filters.xpm
deleted file mode 100644
index f4a015e85c..0000000000
--- a/art/filters.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char * filters_xpm[] = {
-"16 16 52 1",
-" 	c None",
-".	c #000000",
-"+	c #D1BB70",
-"@	c #DEC777",
-"#	c #EBD37E",
-"$	c #D7C173",
-"%	c #E2CB79",
-"&	c #EAD27D",
-"*	c #DFC877",
-"=	c #DBC575",
-"-	c #E3CC7A",
-";	c #E9D17D",
-">	c #E0CA78",
-",	c #CEB96E",
-"'	c #D4BF72",
-")	c #C4B169",
-"!	c #ECD47E",
-"~	c #D6C173",
-"{	c #C7B36B",
-"]	c #E1CB79",
-"^	c #E5CE7B",
-"/	c #E4CD7A",
-"(	c #C4B069",
-"_	c #EDD57F",
-":	c #BDAA65",
-"<	c #E9E9E9",
-"[	c #F8F8F8",
-"}	c #FEFEFE",
-"|	c #CAB66C",
-"1	c #B6A361",
-"2	c #E2B3A7",
-"3	c #EEBEB3",
-"4	c #FFFFFF",
-"5	c #FDFDFD",
-"6	c #F6F6F6",
-"7	c #E2C9C2",
-"8	c #F3F3F3",
-"9	c #F3C3B8",
-"0	c #F1C1B6",
-"a	c #F5F5F5",
-"b	c #BCA965",
-"c	c #E5E5E5",
-"d	c #F1F1F1",
-"e	c #F2CDC5",
-"f	c #F4F4F4",
-"g	c #EBEBEB",
-"h	c #DDDDDD",
-"i	c #FBFBFB",
-"j	c #EDEDED",
-"k	c #E2E2E2",
-"l	c #EFEFEF",
-"m	c #E6E6E6",
-"                ",
-"                ",
-"           ...  ",
-"          .+@#. ",
-"         .$%#&*.",
-"        .=-&;>,.",
-"       .=-&&%').",
-"      .@-&!-~{. ",
-"     .]^#!/'(.  ",
-"    .%^#_%+:.   ",
-"   .<[}_-|1.    ",
-"  .23456,1.     ",
-" .7890a<b.      ",
-" cd5efgh.       ",
-"   i8jk.        ",
-"    lm.         "};
diff --git a/art/forget_passwords.xpm b/art/forget_passwords.xpm
deleted file mode 100644
index a121300716..0000000000
--- a/art/forget_passwords.xpm
+++ /dev/null
@@ -1,125 +0,0 @@
-/* XPM */
-static char * forget_passwords_xpm[] = {
-"16 16 106 2",
-"  	c None",
-". 	c #010101",
-"+ 	c #C0B09D",
-"@ 	c #FEC6BC",
-"# 	c #FFCDB4",
-"$ 	c #C2A887",
-"% 	c #DCB9A8",
-"& 	c #AF843A",
-"* 	c #755C5C",
-"= 	c #655E37",
-"- 	c #DBBCAE",
-"; 	c #FFC4B8",
-"> 	c #FFCDBC",
-", 	c #DDBCA3",
-"' 	c #DBBEB5",
-") 	c #B9933A",
-"! 	c #D3AF84",
-"~ 	c #BE933A",
-"{ 	c #CDA86F",
-"] 	c #A3753F",
-"^ 	c #554F2E",
-"/ 	c #FFC5A3",
-"( 	c #FFFFE3",
-"_ 	c #D4B584",
-": 	c #DCBEB5",
-"< 	c #CDAE95",
-"[ 	c #E6BAA8",
-"} 	c #BDA897",
-"| 	c #CCA871",
-"1 	c #B9841D",
-"2 	c #CCAF95",
-"3 	c #A8753F",
-"4 	c #C4B29C",
-"5 	c #E3B89E",
-"6 	c #E6BEA8",
-"7 	c #C89E58",
-"8 	c #DCB5A0",
-"9 	c #B5841D",
-"0 	c #E6B593",
-"a 	c #BA9E58",
-"b 	c #B4841D",
-"c 	c #C79E58",
-"d 	c #3B250B",
-"e 	c #FFE5BE",
-"f 	c #F2C7B2",
-"g 	c #F3BE9E",
-"h 	c #C7B5A9",
-"i 	c #F3C8B9",
-"j 	c #C29E58",
-"k 	c #E6C2AE",
-"l 	c #BBAAB1",
-"m 	c #C7A887",
-"n 	c #BE9E58",
-"o 	c #6D572C",
-"p 	c #CDB6AC",
-"q 	c #E6BE9E",
-"r 	c #C7AE95",
-"s 	c #E6C3B5",
-"t 	c #DCB593",
-"u 	c #B9A073",
-"v 	c #CAA49D",
-"w 	c #AE841D",
-"x 	c #A6781B",
-"y 	c #BA8E51",
-"z 	c #B1813F",
-"A 	c #C6A871",
-"B 	c #DCBEAF",
-"C 	c #E6BEB5",
-"D 	c #D4B0AE",
-"E 	c #BDA058",
-"F 	c #AC761B",
-"G 	c #A77D3F",
-"H 	c #A06422",
-"I 	c #B59358",
-"J 	c #BDA187",
-"K 	c #D3B5A0",
-"L 	c #BD933A",
-"M 	c #B09960",
-"N 	c #BD9D60",
-"O 	c #AC8131",
-"P 	c #935511",
-"Q 	c #753F20",
-"R 	c #753D1D",
-"S 	c #D4AE84",
-"T 	c #B09264",
-"U 	c #BDA475",
-"V 	c #B48431",
-"W 	c #B08431",
-"X 	c #A86813",
-"Y 	c #975C16",
-"Z 	c #A06413",
-"` 	c #5C3D1D",
-" .	c #A46A36",
-"..	c #903801",
-"+.	c #953D1D",
-"@.	c #751801",
-"#.	c #681601",
-"$.	c #844116",
-"%.	c #1D0101",
-"&.	c #A0581D",
-"*.	c #933A01",
-"=.	c #A67531",
-"-.	c #87581D",
-";.	c #A86F1D",
-">.	c #A1713A",
-",.	c #B09358",
-"                                ",
-"          . . . . . .           ",
-"      . . + @ # $ % & * .       ",
-"    = - ; > , ' ) ! ~ { ] .     ",
-"  ^ / ( _ : < [ } | 1 2 ) 3 .   ",
-". 4 5 6 7 : 8 9 0 a 2 b c ~ d   ",
-". e f g h i j k l m $ < n 1 o . ",
-". p q r s t b u v 2 c w c x y . ",
-"  . z A B 1 ) C D $ E j F G H . ",
-"    . I ~ J K L M 2 ~ N O P Q . ",
-"      . . R S T U V W X Y Z .   ",
-"            `  ...+.@.#.$..     ",
-"              . %.&.*.=.        ",
-"                . -.;.>.        ",
-"                  . ` ,..       ",
-"                    . . .       "};
diff --git a/art/forward.png b/art/forward.png
deleted file mode 100644
index 45ac85807b..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/globe.png b/art/globe.png
deleted file mode 100644
index 84bebd7e9a..0000000000
--- a/art/globe.png
+++ /dev/null
diff --git a/art/hide_deleted_messages.xpm b/art/hide_deleted_messages.xpm
deleted file mode 100644
index 189d8d350e..0000000000
--- a/art/hide_deleted_messages.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * hide_deleted_messages_xpm[] = {
-"16 16 20 1",
-" 	c None",
-".	c #828282",
-"+	c #A0A0A0",
-"@	c #AAAAAA",
-"#	c #898989",
-"$	c #9A9A9A",
-"%	c #8F8F8F",
-"&	c #A9A9A9",
-"*	c #A5A5A5",
-"=	c #959595",
-"-	c #A8A8A8",
-";	c #AEAEAE",
-">	c #B1B1B1",
-",	c #B3B3B3",
-"'	c #9B9B9B",
-")	c #DF421E",
-"!	c #000000",
-"~	c #B7B7B7",
-"{	c #ADADAD",
-"]	c #AFAFAF",
-"                ",
-"                ",
-"                ",
-" .. .+.@#$..    ",
-" .. ..%&$*=$    ",
-" .. .@.-;$#>    ",
-"                ",
-" .%.; .%, '.  ) ",
-"!!!!!!!!!!!!! ))",
-" .~$. ... ..  ) ",
-"                ",
-" .+ .+.'% .+    ",
-" .{ .#%.] '&    ",
-" .' .$;.% ..    ",
-"                ",
-"                "};
diff --git a/art/hide_read_messages.xpm b/art/hide_read_messages.xpm
deleted file mode 100644
index 8df1313651..0000000000
--- a/art/hide_read_messages.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * hide_read_messages_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #DF421E",
-"@	c #828282",
-"                ",
-"                ",
-"                ",
-"  .. .......    ",
-"              + ",
-"  @ @@@ @@ @  ++",
-"              + ",
-"  ... .. ...    ",
-"                ",
-"  ... . ....    ",
-"              + ",
-"  @@ @@@ @@@  ++",
-"              + ",
-"  . ... ....    ",
-"                ",
-"                "};
diff --git a/art/hide_selected_messages.xpm b/art/hide_selected_messages.xpm
deleted file mode 100644
index cb1989b84c..0000000000
--- a/art/hide_selected_messages.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_selected_messages_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #4B6983",
-"+	c #DF421E",
-"@	c #FFFFFF",
-"#	c #798FA2",
-"$	c #BEC8D0",
-"%	c #F1F3F5",
-"&	c #CDD5DC",
-"*	c #A9B6C2",
-"=	c #000000",
-"-	c #647E94",
-";	c #A2B1BE",
-">	c #E4E8EC",
-",	c #D8DEE4",
-"                ",
-"                ",
-"                ",
-" ............ + ",
-" .@#$%%#@&*%. ++",
-" ............ + ",
-"                ",
-"  === == ===    ",
-"                ",
-"  === = ====    ",
-"                ",
-" ............ + ",
-" .@%-@&@;>,%. ++",
-" ............ + ",
-"                ",
-"                "};
diff --git a/art/house.png b/art/house.png
deleted file mode 100644
index df43ec6181..0000000000
--- a/art/house.png
+++ /dev/null
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index 767ec6366f..0000000000
--- a/art/mail-new.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * mail_new_xpm[] = {
-"16 16 48 1",
-" 	c None",
-".	c #000000",
-"+	c #202020",
-"@	c #817968",
-"#	c #F5F5F5",
-"$	c #4D493C",
-"%	c #736C5C",
-"&	c #F5EEEE",
-"*	c #FFEDC7",
-"=	c #FAF3EC",
-"-	c #FCE6B5",
-";	c #60594D",
-">	c #D3C29E",
-",	c #746D5D",
-"'	c #F5F1F1",
-")	c #FDEECD",
-"!	c #F8F4ED",
-"~	c #FAE3B3",
-"{	c #645F4F",
-"]	c #C9BA98",
-"^	c #71685A",
-"/	c #FCF5EA",
-"(	c #FFE8B7",
-"_	c #F5DEB2",
-":	c #FFEABD",
-"<	c #90856F",
-"[	c #7C7361",
-"}	c #E4D1A9",
-"|	c #C9B996",
-"1	c #FFEBC2",
-"2	c #887F6B",
-"3	c #726B59",
-"4	c #D1BF9C",
-"5	c #8B816C",
-"6	c #FFE9BA",
-"7	c #F9E2B2",
-"8	c #FFE8B8",
-"9	c #F6DFB3",
-"0	c #D4C19D",
-"a	c #534D42",
-"b	c #CFBF9C",
-"c	c #645F51",
-"d	c #C2B293",
-"e	c #C4B393",
-"f	c #C4B495",
-"g	c #C5B596",
-"h	c #CCBC99",
-"i	c #4C483D",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,')!*~{~].  ",
-" .#**^/*({*_].  ",
-" .#*:<{#{[-}|.  ",
-" .#12**{((34|.  ",
-" .#5*_67890ab.  ",
-" .cdeeedffghi.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-read.xpm b/art/mail-read.xpm
deleted file mode 100644
index b4e3160ab4..0000000000
--- a/art/mail-read.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * mail_read_xpm[] = {
-"16 16 51 1",
-" 	c None",
-".	c #010101",
-"+	c #D9D6D0",
-"@	c #C3C0B9",
-"#	c #EFEDE8",
-"$	c #F7F7F6",
-"%	c #FAFAFA",
-"&	c #B6B4AE",
-"*	c #737373",
-"=	c #C2BFB8",
-"-	c #F5F4F2",
-";	c #FAFAF9",
-">	c #FFFFFF",
-",	c #D2CFC9",
-"'	c #707070",
-")	c #5D5B57",
-"!	c #868580",
-"~	c #E5E2DB",
-"{	c #FBFBF8",
-"]	c #716E6B",
-"^	c #62605C",
-"/	c #F8F7F2",
-"(	c #DDDAD4",
-"_	c #929191",
-":	c #969390",
-"<	c #92908A",
-"[	c #A1A0A0",
-"}	c #F7F5F1",
-"|	c #FBFAF7",
-"1	c #A5A29D",
-"2	c #908D87",
-"3	c #F9F7F3",
-"4	c #F0EEE8",
-"5	c #DDD9D2",
-"6	c #797873",
-"7	c #F9F8F4",
-"8	c #74726E",
-"9	c #E3E0D9",
-"0	c #7D7A77",
-"a	c #FAF9F6",
-"b	c #F8F6F2",
-"c	c #FAF8F5",
-"d	c #F7F5F2",
-"e	c #E2DFD8",
-"f	c #090808",
-"g	c #D7D4CE",
-"h	c #D8D5CF",
-"i	c #D6D3CD",
-"j	c #DAD7D1",
-"k	c #E0DCD5",
-"l	c #222221",
-"     .....      ",
-"    .+++++.     ",
-"   .++++++@.    ",
-"  .+++++#$%&.   ",
-" .*==-;>>>>,'.  ",
-" .>)>>>>>>>!~.  ",
-" .>{]>>>>>^/(.  ",
-" .>{{_::<[{}(.  ",
-" .>{|1{{{2345.  ",
-" .>|6{{{77895.  ",
-" .>0{}abcd~8e.  ",
-" .fghhhi++jkl.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm
deleted file mode 100644
index 06f4a7420a..0000000000
--- a/art/mail-replied.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * mail_replied_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #000000",
-")	c #928F8B",
-"!	c #FFFFFF",
-"~	c #F7F6F4",
-"{	c #B5B2AC",
-"]	c #003366",
-"^	c #EFEFEF",
-"/	c #CCCCCC",
-"(	c #AEABA6",
-"_	c #B0ADA7",
-":	c #F5F3F0",
-"<	c #83817E",
-"[	c #E1DFDA",
-"}	c #E2DFD9",
-"|	c #002C59",
-"1	c #002850",
-"2	c #00254A",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,=''''''''' ",
-" .#**)'!!!!!!!' ",
-" .#*~{'!]]]]^/' ",
-" .#~(*'!]]]^^/' ",
-" .#_*:'!]]]]^/' ",
-" .<[}}'!]^]]|/' ",
-"  ....'!^^^12/' ",
-"      '!//////3 ",
-"      ''4'''''' ",
-"                "};
diff --git a/art/malehead.png b/art/malehead.png
deleted file mode 100644
index ada9545c85..0000000000
--- a/art/malehead.png
+++ /dev/null
diff --git a/art/mark.xpm b/art/mark.xpm
deleted file mode 100644
index 710cd0e872..0000000000
--- a/art/mark.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mark_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #36592A",
-"                ",
-"                ",
-"                ",
-"                ",
-"           .    ",
-"          ..    ",
-"         ..     ",
-"    .   ..      ",
-"    .. ...      ",
-"     ....       ",
-"     ...        ",
-"      ..        ",
-"      .         ",
-"                ",
-"                ",
-"                "};
diff --git a/art/marlboro_filters.xpm b/art/marlboro_filters.xpm
deleted file mode 100644
index 1af8d2d8a3..0000000000
--- a/art/marlboro_filters.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * marlboro_filters_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #7E7E7E",
-"@	c #B9B9B9",
-"#	c #CACACA",
-"$	c #DF421E",
-"%	c #A0A0A0",
-"&	c #C8C8C8",
-"*	c #E2E2E2",
-"=	c #F2B8AB",
-"-	c #8B2912",
-";	c #6F6F6F",
-">	c #C9C9C9",
-",	c #FFFFFF",
-"'	c #9E9E9E",
-")	c #FDE6A1",
-"!	c #999999",
-"~	c #B03417",
-"{	c #EDD57F",
-"]	c #CBB76C",
-"^	c #C5B268",
-"/	c #FBE9E5",
-"(	c #D09486",
-"_	c #B1B1B1",
-":	c #8A8A8A",
-"<	c #CF9F94",
-"    ........... ",
-"    .+@#######$.",
-"   .++%&*****=$-",
-"   .;+>,,,,,,$$.",
-"   ............ ",
-"  .')+)+)+)+.   ",
-" .!)+)+)+)+~.   ",
-" .${]{]{]$~~.   ",
-" .${^{]{]$~~.   ",
-" .$$$$$$$$~~.   ",
-" .$$$/$$$$~~.   ",
-" .$$/,/$$$~~.   ",
-" .$/&,,/$$~(.   ",
-" ./&_&:&/$<+.   ",
-" .,*****,,+.    ",
-" ..........     "};
diff --git a/art/meeting.xpm b/art/meeting.xpm
deleted file mode 100644
index bf182fbd8f..0000000000
--- a/art/meeting.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-static char * meeting_xpm[] = {
-"16 16 45 1",
-" 	c None",
-".	c #000000",
-"+	c #161616",
-"@	c #A7A7A7",
-"#	c #8A8A8A",
-"$	c #757575",
-"%	c #686868",
-"&	c #555555",
-"*	c #434343",
-"=	c #2F2F2F",
-"-	c #2B2B2B",
-";	c #FFFFFF",
-">	c #CACACA",
-",	c #C0C0C0",
-"'	c #B6B6B6",
-")	c #D8D5CD",
-"!	c #CFCFCF",
-"~	c #AEADA5",
-"{	c #7F7D78",
-"]	c #85847F",
-"^	c #92908A",
-"/	c #E0DFD7",
-"(	c #A09E98",
-"_	c #E6E5E0",
-":	c #E5E3DF",
-"<	c #A5A49D",
-"[	c #9D9B95",
-"}	c #D5D5D5",
-"|	c #B4B1AB",
-"1	c #83817C",
-"2	c #D44D41",
-"3	c #A7453E",
-"4	c #919089",
-"5	c #E2E1DB",
-"6	c #9C9A94",
-"7	c #DEDBD5",
-"8	c #D9D6CE",
-"9	c #E79E3C",
-"0	c #934238",
-"a	c #B4B1AA",
-"b	c #807F79",
-"c	c #82817C",
-"d	c #7E7D78",
-"e	c #ACA9A3",
-"f	c #A3A09A",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............  ",
-" +@#$%&&***=-.  ",
-" .;;>;;,;;';).  ",
-" .!~{~~]~~{~^.  ",
-" .;/(_:<))[)~.  ",
-" .}|1||2333|4.  ",
-" .;56783990)~.  ",
-" .}|1||3000|4.  ",
-" .)ab~~c~~def.  ",
-" .............  ",
-"                ",
-"                "};
diff --git a/art/monthview.xpm b/art/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/art/monthview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * monthview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #666666",
-"#	c #919191",
-"$	c #F2F1ED",
-"%	c #D8D8D4",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".%###################@. ",
-"....................... ",
-"                        "};
diff --git a/art/move-message.png b/art/move-message.png
deleted file mode 100644
index 143cea1a93..0000000000
--- a/art/move-message.png
+++ /dev/null
diff --git a/art/new_appointment.png b/art/new_appointment.png
deleted file mode 100644
index 25d646a2ab..0000000000
--- a/art/new_appointment.png
+++ /dev/null
diff --git a/art/new_contact.xpm b/art/new_contact.xpm
deleted file mode 100644
index 08742387dd..0000000000
--- a/art/new_contact.xpm
+++ /dev/null
@@ -1,137 +0,0 @@
-/* XPM */
-static char * 24_new_contact_xpm[] = {
-"24 24 110 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #030303",
-"@ 	c #0F0F0F",
-"# 	c #1B1B1B",
-"$ 	c #272727",
-"% 	c #333333",
-"& 	c #404040",
-"* 	c #4C4C4C",
-"= 	c #585858",
-"- 	c #646464",
-"; 	c #707070",
-"> 	c #7C7C7C",
-", 	c #888888",
-"' 	c #949494",
-") 	c #BDBDBD",
-"! 	c #FFFFFF",
-"~ 	c #DBDBDB",
-"{ 	c #A9A9A9",
-"] 	c #F8F8F8",
-"^ 	c #CFBDA7",
-"/ 	c #A18A6F",
-"( 	c #A18E77",
-"_ 	c #CCC6BD",
-": 	c #FDFDFD",
-"< 	c #FCFCFC",
-"[ 	c #F7F6F5",
-"} 	c #B1B1B1",
-"| 	c #050505",
-"1 	c #F4F4F4",
-"2 	c #B59F85",
-"3 	c #E5D9CC",
-"4 	c #877261",
-"5 	c #A4988C",
-"6 	c #828282",
-"7 	c #A1A1A1",
-"8 	c #FEFEFE",
-"9 	c #F8F7F6",
-"0 	c #BABABA",
-"a 	c #0E0E0E",
-"b 	c #F1E5D6",
-"c 	c #F6F2EC",
-"d 	c #9D8C7A",
-"e 	c #A2968B",
-"f 	c #F8F8F6",
-"g 	c #C2C2C2",
-"h 	c #161616",
-"i 	c #FAFAFA",
-"j 	c #94A9C0",
-"k 	c #D29087",
-"l 	c #808F9E",
-"m 	c #E5E5E3",
-"n 	c #D3D3D3",
-"o 	c #DEDEDE",
-"p 	c #CBCBCB",
-"q 	c #1F1F1F",
-"r 	c #71899D",
-"s 	c #B6CADD",
-"t 	c #8094A8",
-"u 	c #7A8DA0",
-"v 	c #A3AFBB",
-"w 	c #EED886",
-"x 	c #D4D4D4",
-"y 	c #879CB0",
-"z 	c #8DA1B4",
-"A 	c #8A9EB0",
-"B 	c #8797A6",
-"C 	c #8D99A5",
-"D 	c #CFCFCF",
-"E 	c #D5D5D5",
-"F 	c #EEDC96",
-"G 	c #ECECEC",
-"H 	c #F2E2A6",
-"I 	c #DCDCDC",
-"J 	c #EFDA8D",
-"K 	c #303030",
-"L 	c #F9F1D5",
-"M 	c #E5E5E5",
-"N 	c #393939",
-"O 	c #989898",
-"P 	c #A7A7A7",
-"Q 	c #F0F0F0",
-"R 	c #F8F1D4",
-"S 	c #EEEEEE",
-"T 	c #414141",
-"U 	c #BEBEBE",
-"V 	c #F1F0EC",
-"W 	c #F2F1EE",
-"X 	c #F3F2EF",
-"Y 	c #F4F3F0",
-"Z 	c #F5F4F2",
-"` 	c #F6F5F3",
-" .	c #F7F6F4",
-"..	c #F9F8F7",
-"+.	c #FAF9F8",
-"@.	c #FBFAFA",
-"#.	c #565656",
-"$.	c #626262",
-"%.	c #6E6E6E",
-"&.	c #7A7A7A",
-"*.	c #868686",
-"=.	c #929292",
-"-.	c #9E9E9E",
-";.	c #AAAAAA",
-">.	c #EED98A",
-",.	c #F5E8B9",
-"'.	c #EED682",
-").	c #F0DC94",
-"!.	c #EFDB90",
-"~.	c #F0DE99",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"          . + @ # $ % & * = - ; > , '           ",
-"        . ) ! ! ! ! ! ! ! ! ! ! ! ! ~ {         ",
-"        . ! ] ^ / ( _ ! : ! < ! ! ! [ }         ",
-"        | ! 1 2 3 4 5 ! 6 7 : } 8 ! 9 0         ",
-"        a ! 1 b c d e ! ! ! ! ! ! ! f g         ",
-"        h ! i j k l m ! n ! n o ! ! ! p         ",
-"        q ! r s t u v ! ! ! ! ! ! ! w x         ",
-"        $ ! y z A B C ! D E F G ! ! H I     J   ",
-"        K ! ! ! ! ! ! ! ! ! ! ! ! ! L M         ",
-"        N ! ! O ! P ! g ! ~ ! Q R ! ! S L       ",
-"        T U V W X Y Z `  .9 ..+.@.! ! !         ",
-"          #.$.%.&.*.=.-.;.>.,.L ! ! ! ! ! L H '.",
-"                                  ! ! !         ",
-"                                L   !   L       ",
-"                                    L           ",
-"                            ).      ,.      !.  ",
-"                                    ~.          ",
-"                                                ",
-"                                                ",
-"                                                "};
diff --git a/art/pin.png b/art/pin.png
deleted file mode 100644
index fff34d7d96..0000000000
--- a/art/pin.png
+++ /dev/null
diff --git a/art/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 884c8b8236..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"X	c #A7453E",
-"                ",
-"                ",
-"        .       ",
-"       .X.      ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XX.      ",
-"      .XX.      ",
-"      .X.       ",
-"      ..        ",
-"     .XX.       ",
-"     .XX.       ",
-"      ..        ",
-"                ",
-"                "};
diff --git a/art/priority-low.xpm b/art/priority-low.xpm
deleted file mode 100644
index ad53e9e0cc..0000000000
--- a/art/priority-low.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_low_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #21405A",
-"                ",
-"                ",
-"                ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"     ......     ",
-"      ....      ",
-"      ....      ",
-"       ..       ",
-"       ..       ",
-"                ",
-"                ",
-"                "};
diff --git a/art/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index 6f42de1de0..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index cc8be8511f..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/score-high.xpm b/art/score-high.xpm
deleted file mode 100644
index bb7bd47562..0000000000
--- a/art/score-high.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_high_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-higher.xpm b/art/score-higher.xpm
deleted file mode 100644
index 696e74bed5..0000000000
--- a/art/score-higher.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_higher_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-highest.xpm b/art/score-highest.xpm
deleted file mode 100644
index d8dab65079..0000000000
--- a/art/score-highest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_highest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-low.xpm b/art/score-low.xpm
deleted file mode 100644
index e071741adc..0000000000
--- a/art/score-low.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_low_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lower.xpm b/art/score-lower.xpm
deleted file mode 100644
index 74da90d670..0000000000
--- a/art/score-lower.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lower_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm
deleted file mode 100644
index 9beee1849f..0000000000
--- a/art/score-lowest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lowest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-normal.xpm b/art/score-normal.xpm
deleted file mode 100644
index 82b618cb8d..0000000000
--- a/art/score-normal.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * score_normal_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #17D1EA",
-"@	c #FFFFFF",
-"#	c #EF9815",
-"                ",
-"                ",
-"    ...         ",
-"   .+.+.        ",
-"   .@#@.        ",
-"   .@@@.        ",
-"   ..@..        ",
-"  ..@@@..       ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-"  .@@@@@.       ",
-"   ##@##        ",
-"   ## ##        ",
-"                "};
diff --git a/art/send.png b/art/send.png
deleted file mode 100644
index fb95df6016..0000000000
--- a/art/send.png
+++ /dev/null
diff --git a/art/service-close.png b/art/service-close.png
deleted file mode 100644
index d8e7cea744..0000000000
--- a/art/service-close.png
+++ /dev/null
diff --git a/art/service-configure.png b/art/service-configure.png
deleted file mode 100644
index 8c56dc4c7a..0000000000
--- a/art/service-configure.png
+++ /dev/null
diff --git a/art/service-down-disabled.png b/art/service-down-disabled.png
deleted file mode 100644
index f6742ff105..0000000000
--- a/art/service-down-disabled.png
+++ /dev/null
diff --git a/art/service-down.png b/art/service-down.png
deleted file mode 100644
index 49f532f527..0000000000
--- a/art/service-down.png
+++ /dev/null
diff --git a/art/service-left-disabled.png b/art/service-left-disabled.png
deleted file mode 100644
index fc4256346b..0000000000
--- a/art/service-left-disabled.png
+++ /dev/null
diff --git a/art/service-left.png b/art/service-left.png
deleted file mode 100644
index 38fe293e39..0000000000
--- a/art/service-left.png
+++ /dev/null
diff --git a/art/service-right-disabled.png b/art/service-right-disabled.png
deleted file mode 100644
index 848c2a499c..0000000000
--- a/art/service-right-disabled.png
+++ /dev/null
diff --git a/art/service-right.png b/art/service-right.png
deleted file mode 100644
index 7fdabac13d..0000000000
--- a/art/service-right.png
+++ /dev/null
diff --git a/art/service-up-disabled.png b/art/service-up-disabled.png
deleted file mode 100644
index 6258caa5d9..0000000000
--- a/art/service-up-disabled.png
+++ /dev/null
diff --git a/art/service-up.png b/art/service-up.png
deleted file mode 100644
index a24b336c6d..0000000000
--- a/art/service-up.png
+++ /dev/null
diff --git a/art/show_all_messages.xpm b/art/show_all_messages.xpm
deleted file mode 100644
index f38a42aebf..0000000000
--- a/art/show_all_messages.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * show_all_messages_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #9DB8D2",
-"@	c #FFFFFF",
-"#	c #89A1B9",
-"$	c #859DB4",
-"%	c #CACACA",
-"&	c #8199AF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .         . ",
-"   . .       . .",
-"  .         .  .",
-" ...........    ",
-" .+@+. .+@+.    ",
-" .#+$. .%+&.    ",
-"  ...   ...     ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index fa76359778..0000000000
--- a/art/splash.png
+++ /dev/null
diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm
deleted file mode 100644
index fc748953eb..0000000000
--- a/art/tree-expanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+.....+.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm
deleted file mode 100644
index 0dfb12a0a5..0000000000
--- a/art/tree-unexpanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+.....+.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/undelete_message.xpm b/art/undelete_message.xpm
deleted file mode 100644
index e5698be5af..0000000000
--- a/art/undelete_message.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * undelete_message_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #314E6C",
-"+	c #9DB8D2",
-"@	c #4B6983",
-"#	c #000000",
-"$	c #586A52",
-"%	c #64795D",
-"&	c #6E8567",
-"*	c #A4B29F",
-"=	c #ABB5A8",
-"-	c #96A790",
-";	c #3B4039",
-">	c #C2C9BF",
-",	c #6C8265",
-"'	c #6D8466",
-")	c #799271",
-"!	c #FFFFFF",
-"~	c #C0CBBC",
-"{	c #A3B19C",
-"]	c #83957D",
-"^	c #E7E9E5",
-"/	c #BFCABE",
-"(	c #718869",
-"_	c #9DAB99",
-":	c #333C30",
-"<	c #626A5F",
-"[	c #959B90",
-"}	c #D5D6D5",
-"|	c #C7CBC5",
-"1	c #B4BCB3",
-"2	c #7A8676",
-"3	c #758271",
-"4	c #455241",
-"5	c #3A4436",
-"6	c #879B81",
-"7	c #9FA89C",
-"8	c #556550",
-"9	c #879B83",
-"0	c #424D40",
-"a	c #84967F",
-"b	c #414A3D",
-"c	c #465443",
-"d	c #B0BAAD",
-"e	c #84957F",
-"f	c #687B63",
-"g	c #5A6257",
-"h	c #C3CEBF",
-"i	c #84957E",
-"j	c #AEBDA9",
-"k	c #83957E",
-"l	c #4A5846",
-"m	c #465341",
-"n	c #7A9472",
-"o	c #728A6B",
-"p	c #5E7058",
-"q	c #6D8267",
-"r	c #4D5C49",
-"s	c #7B8678",
-"       .        ",
-"      +@.       ",
-"     +@@@.      ",
-"                ",
-"     ######     ",
-"    #$%&*=-#    ",
-"   ;>,')!~{]#   ",
-"   ;^/(!!!_:#   ",
-"   <[}|12345#   ",
-"   <67890abc#   ",
-"   <6d890ebf#   ",
-"   g6h890ibf#   ",
-"   <6j860klm#   ",
-"    <jnopqr#    ",
-"     s#####     ",
-"                "};
diff --git a/art/weekview.xpm b/art/weekview.xpm
deleted file mode 100644
index 869b9e722a..0000000000
--- a/art/weekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * weekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #F2F1ED",
-"$	c #919191",
-"%	c #666666",
-"....................... ",
-".++++++++++@++++++++++. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$$$$$$$$$$$. ",
-".+#########$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".@$$$$$$$$$%$$$$$$$$$%. ",
-"....................... ",
-"                        "};
diff --git a/art/workweekview.xpm b/art/workweekview.xpm
deleted file mode 100644
index 35cceedbdc..0000000000
--- a/art/workweekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * workweekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #B5B4AF",
-"$	c #666666",
-"%	c #F2F1ED",
-"....................... ",
-".++++@+++@+++@+++@++++. ",
-".+###$###$###$###$###$. ",
-".+###$###$###$###$###$. ",
-".@$$$$$$$$$$$$$$$$$$$$. ",
-".++++#+++#+++#+++#+++#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".@###$###$###$###$####. ",
-"....................... ",
-"                        "};
diff --git a/art/yearview.xpm b/art/yearview.xpm
deleted file mode 100644
index 0d4fa4135b..0000000000
--- a/art/yearview.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * yearview_xpm[] = {
-"24 24 17 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F2F1ED",
-"#	c #AAA9A6",
-"$	c #D7D6D2",
-"%	c #92918E",
-"&	c #B7B6B3",
-"*	c #CBCAC6",
-"=	c #919191",
-"-	c #888785",
-";	c #B6B6B2",
-">	c #888884",
-",	c #C1C1BD",
-"'	c #A7A6A3",
-")	c #D8D8D4",
-"!	c #666666",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@#$%&*@@@@@@@=. ",
-".+@@@@@@@-;>,'@@@@@@@=. ",
-".+====================. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".)===================!. ",
-"....................... ",
-"                        "};
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index eec4b5f56d..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="evolution"
-
-
-. $srcdir/macros/autogen.sh
diff --git a/calendar/.cvsignore b/calendar/.cvsignore
deleted file mode 100644
index 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 0049fa248e..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,5 +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>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index fb99a66a08..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,9548 +0,0 @@
-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 e17d581184..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
diff --git a/calendar/TODO b/calendar/TODO
deleted file mode 100644
index 4a5dd6c6ff..0000000000
--- a/calendar/TODO
+++ /dev/null
@@ -1,88 +0,0 @@
-Cal-util:
-
-- calobj.h depends on libversit/vcc.h, because it uses a VObject for
-  ical_object_create_from_vobject().  This should be an internal
-  function in the PCS and nothing else (we do not install libversit,
-  so our public libraries should not depend on it).
-
-- Or maybe we *should* install libversit, since the addressbook code
-  uses it as well.
-
-- timeutil has a lot of crap and some namespace pollution.  Clean it
-  up.
-
-PCS:
-
-- When loading a calendar, substitute duplicated UIDs by new ones, and
-  possibly print out a warning message.
-
------ Old Gnomecal TODO starts here -----
-
-Pilot:
-
-* Better support for untimed events (we have none now).
-
-* Hash objects based on their UIDs.
-
-* Add placeholders for deleted events, so that we can kill those
-  when syncing to the pilot.
-
-BUGS:
-
-- Recurrence end date is wrong.  An event that repeats daily will not
-  be included in the ending date of the recurrence (off-by-one
-  error?).
-
-- X-fields (extensions) are stripped from a vCal file when it is
-  saved.  They should be preserved.
-
-Features:
-
-- Add a calendar-week so that people know which week of the year it is
-
-Year view:
-
-- See why it is so fucking slow when opening its notebook page for the
-  first time.
-
-Month view:
-
-- Popup menu like in the year view.
-
-- Double click on a day takes you to the day view.
-
-- DnD of appointments to move them around.
-
-Week view:
-
-- Nice display as in the Palm Pilot.
-
-Day view:
-
-- Rewrite in terms of the canvas and make it pretty.
-
-Preferences:
-
-- BUG: 12/24 hours stuff is not consistent - I remember that on editing
-  new appointment you get the time-selectors always on 12-hr format
-
-Event editor dialog:
-
-- Make it figure out whether the alarm is in
-  minutes/hours/days/etc. (via a cascade of conditions) and set the
-  widgets appropriately.
-
-Gnome date selection widget:
-
-- Make the displayed date be localized properly -- use strftime().
-
-General:
-
-- Write online help.  Nice help.  Lots of help.
-
-- If you leave the calendar running overnight, the "current day"
-  marker in the GnomeMonthItems does not get updated.
-
-- Add categories support.  Color-coded categories.
-
-- Untimed events
diff --git a/calendar/cal-client/.cvsignore b/calendar/cal-client/.cvsignore
deleted file mode 100644
index 1537e6e01d..0000000000
--- a/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-Makefile.in
-.deps
-.libs
-.pure
-Makefile
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-calendar-common.lo
-evolution-calendar-skels.lo
-evolution-calendar-stubs.lo
-*.lo
-*.la
-client-test
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
deleted file mode 100644
index f241bf6ce1..0000000000
--- a/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# libcal-client
-#
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"cal-client\"			\
-	-I$(top_srcdir)/calendar			\
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libcal-client.la
-
-libcal_clientincludedir = $(includedir)/evolution/cal-client
-
-libcal_client_la_SOURCES =	\
-	$(CORBA_GENERATED)	\
-	cal-client-types.c	\
-	cal-client.c		\
-	cal-listener.c		\
-	cal-listener.h
-
-libcal_clientinclude_HEADERS =	\
-	cal-client-types.h 	\
-	cal-client.h
-
-
-#
-# make a static library for use by calendar conduit's shared library
-#
-noinst_LTLIBRARIES = libcal-client-static.la
-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
-libcal_client_static_la_LDFLAGS = --all-static
-
-
-#
-# client-test program
-#
-
-noinst_PROGRAMS = client-test
-
-client_test_SOURCES =	\
-	client-test.c
-
-client_test_INCLUDES =			\
-	$(INCLUDES)			\
-	-DG_LOG_DOMAIN=\"client-test\"
-
-client_test_LDADD =						\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	-lunicode						\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.la		\
-	libcal-client.la
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/cal-client/cal-client-types.c b/calendar/cal-client/cal-client-types.c
deleted file mode 100644
index 23aa14475f..0000000000
--- a/calendar/cal-client/cal-client-types.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-client-types.h"
-
-
-
-/**
- * cal_client_change_list_free:
- * @list: List of #CalClientChange structures.
- * 
- * Frees a list of #CalClientChange structures.
- **/
-void
-cal_client_change_list_free (GList *list)
-{
-	CalClientChange *c;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		c = l->data;
-
-		g_assert (c != NULL);
-		g_assert (c->comp != NULL);
-
-		gtk_object_unref (GTK_OBJECT (c->comp));
-		g_free (c);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-client/cal-client-types.h b/calendar/cal-client/cal-client-types.h
deleted file mode 100644
index c356f2378e..0000000000
--- a/calendar/cal-client/cal-client-types.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_CLIENT_TYPES_H
-#define CAL_CLIENT_TYPES_H
-
-#include <libgnome/gnome-defs.h>
-#include <cal-util/cal-component.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-typedef enum {
-	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
-	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
-	CAL_CLIENT_CHANGE_DELETED = 1 << 2
-} CalClientChangeType;
-
-typedef struct 
-{
-	CalComponent *comp;
-	CalClientChangeType type;
-} CalClientChange;
-
-void cal_client_change_list_free (GList *list);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
deleted file mode 100644
index 43a881f50f..0000000000
--- a/calendar/cal-client/cal-client.c
+++ /dev/null
@@ -1,1507 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-
-#include "cal-client-types.h"
-#include "cal-client.h"
-#include "cal-listener.h"
-
-
-
-/* Private part of the CalClient structure */
-struct _CalClientPrivate {
-	/* Load state to avoid multiple loads */
-	CalClientLoadState load_state;
-
-	/* URI of the calendar that is being loaded or is already loaded, or
-	 * NULL if we are not loaded.
-	 */
-	char *uri;
-
-	/* The calendar factory we are contacting */
-	GNOME_Evolution_Calendar_CalFactory factory;
-
-	/* Our calendar listener */
-	CalListener *listener;
-
-	/* The calendar client interface object we are contacting */
-	GNOME_Evolution_Calendar_Cal cal;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_OPENED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_client_class_init (CalClientClass *class);
-static void cal_client_init (CalClient *client);
-static void cal_client_destroy (GtkObject *object);
-
-static guint cal_client_signals[LAST_SIGNAL];
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_client_get_type:
- * @void:
- *
- * Registers the #CalClient class if necessary, and returns the type ID assigned
- * to it.
- *
- * Return value: The type ID of the #CalClient class.
- **/
-GtkType
-cal_client_get_type (void)
-{
-	static GtkType cal_client_type = 0;
-
-	if (!cal_client_type) {
-		static const GtkTypeInfo cal_client_info = {
-			"CalClient",
-			sizeof (CalClient),
-			sizeof (CalClientClass),
-			(GtkClassInitFunc) cal_client_class_init,
-			(GtkObjectInitFunc) cal_client_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_client_info);
-	}
-
-	return cal_client_type;
-}
-
-/* Class initialization function for the calendar client */
-static void
-cal_client_class_init (CalClientClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	cal_client_signals[CAL_OPENED] =
-		gtk_signal_new ("cal_opened",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, cal_opened),
-				gtk_marshal_NONE__ENUM,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_ENUM);
-	cal_client_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_updated),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	cal_client_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_removed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_client_destroy;
-}
-
-/* Object initialization function for the calendar client */
-static void
-cal_client_init (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = g_new0 (CalClientPrivate, 1);
-	client->priv = priv;
-
-	priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-	priv->uri = NULL;
-	priv->factory = CORBA_OBJECT_NIL;
-}
-
-/* Gets rid of the factory that a client knows about */
-static void
-destroy_factory (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_factory(): could not see if the factory was nil");
-		priv->factory = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_factory(): could not release the factory");
-
-	CORBA_exception_free (&ev);
-	priv->factory = CORBA_OBJECT_NIL;
-}
-
-/* Gets rid of the listener that a client knows about */
-static void
-destroy_listener (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = client->priv;
-
-	if (!priv->listener)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-}
-
-/* Gets rid of the calendar client interface object that a client knows about */
-static void
-destroy_cal (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_cal(): could not see if the "
-			   "calendar client interface object was nil");
-		priv->cal = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_unref (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not unref the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not release the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-	priv->cal = CORBA_OBJECT_NIL;
-
-}
-
-/* Destroy handler for the calendar client */
-static void
-cal_client_destroy (GtkObject *object)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (object));
-
-	client = CAL_CLIENT (object);
-	priv = client->priv;
-
-	destroy_factory (client);
-	destroy_listener (client);
-	destroy_cal (client);
-
-	priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-
-	if (priv->uri) {
-		g_free (priv->uri);
-		priv->uri = NULL;
-	}
-
-	g_free (priv);
-	client->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Signal handlers for the listener's signals */
-
-/* Handle the cal_opened notification from the listener */
-static void
-cal_opened_cb (CalListener *listener,
-	       GNOME_Evolution_Calendar_Listener_OpenStatus status,
-	       GNOME_Evolution_Calendar_Cal cal,
-	       gpointer data)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_Cal cal_copy;
-	CalClientOpenStatus client_status;
-
-	client = CAL_CLIENT (data);
-	priv = client->priv;
-
-	g_assert (priv->load_state == CAL_CLIENT_LOAD_LOADING);
-	g_assert (priv->uri != NULL);
-
-	client_status = CAL_CLIENT_OPEN_ERROR;
-
-	switch (status) {
-	case GNOME_Evolution_Calendar_Listener_SUCCESS:
-		CORBA_exception_init (&ev);
-		cal_copy = CORBA_Object_duplicate (cal, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_message ("cal_opened_cb(): could not duplicate the "
-				   "calendar client interface");
-			CORBA_exception_free (&ev);
-			goto error;
-		}
-		CORBA_exception_free (&ev);
-
-		priv->cal = cal_copy;
-		priv->load_state = CAL_CLIENT_LOAD_LOADED;
-
-		client_status = CAL_CLIENT_OPEN_SUCCESS;
-		goto out;
-
-	case GNOME_Evolution_Calendar_Listener_ERROR:
-		client_status = CAL_CLIENT_OPEN_ERROR;
-		goto error;
-
-	case GNOME_Evolution_Calendar_Listener_NOT_FOUND:
-		client_status = CAL_CLIENT_OPEN_NOT_FOUND;
-		goto error;
-
-	case GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
-		client_status = CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED;
-		goto error;
-
-	default:
-		g_assert_not_reached ();
-	}
-
- error:
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-
-	/* We free the priv->uri and set the priv->load_state until after the
-	 * "cal_opened" signal has been emitted so that handlers will be able to
-	 * access this information.
-	 */
-
- out:
-
-	/* We are *not* inside a signal handler (this is just a simple callback
-	 * called from the listener), so there is not a temporary reference to
-	 * the client object.  We ref() so that we can safely emit our own
-	 * signal and clean up.
-	 */
-
-	gtk_object_ref (GTK_OBJECT (client));
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_OPENED],
-			 client_status);
-
-	if (client_status != CAL_CLIENT_OPEN_SUCCESS) {
-		priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-		g_free (priv->uri);
-		priv->uri = NULL;
-	}
-
-	g_assert (priv->load_state != CAL_CLIENT_LOAD_LOADING);
-
-	gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Handle the obj_updated signal from the listener */
-static void
-obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_UPDATED], uid);
-}
-
-/* Handle the obj_removed signal from the listener */
-static void
-obj_removed_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_REMOVED], uid);
-}
-
-
-
-/**
- * cal_client_construct:
- * @client: A calendar client.
- *
- * Constructs a calendar client object by contacting the calendar factory of the
- * calendar server.
- *
- * Return value: The same object as the @client argument, or NULL if the
- * calendar factory could not be contacted.
- **/
-CalClient *
-cal_client_construct (CalClient *client)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_CalFactory factory, factory_copy;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id (
-		"OAFIID:GNOME_Evolution_Wombat_CalendarFactory",
-		0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): Could not activate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-	factory_copy = CORBA_Object_duplicate (factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not duplicate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	priv->factory = factory_copy;
-	return client;
-}
-
-/**
- * cal_client_new:
- *
- * Creates a new calendar client.  It should be initialized by calling
- * cal_client_open_calendar().
- *
- * Return value: A newly-created calendar client, or NULL if the client could
- * not be constructed because it could not contact the calendar server.
- **/
-CalClient *
-cal_client_new (void)
-{
-	CalClient *client;
-
-	client = gtk_type_new (CAL_CLIENT_TYPE);
-
-	if (!cal_client_construct (client)) {
-		g_message ("cal_client_new(): could not construct the calendar client");
-		gtk_object_unref (GTK_OBJECT (client));
-		return NULL;
-	}
-
-	return client;
-}
-
-/**
- * cal_client_open_calendar:
- * @client: A calendar client.
- * @str_uri: URI of calendar to open.
- * @only_if_exists: FALSE if the calendar should be opened even if there
- * was no storage for it, i.e. to create a new calendar or load an existing
- * one if it already exists.  TRUE if it should only try to load calendars
- * that already exist.
- *
- * Makes a calendar client initiate a request to open a calendar.  The calendar
- * client will emit the "cal_opened" signal when the response from the server is
- * received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the open request.
- **/
-gboolean
-cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists)
-{
-	CalClientPrivate *priv;
-	GNOME_Evolution_Calendar_Listener corba_listener;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_NOT_LOADED, FALSE);
-	g_assert (priv->uri == NULL);
-
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv->listener = cal_listener_new (cal_opened_cb,
-					   obj_updated_cb,
-					   obj_removed_cb,
-					   client);
-	if (!priv->listener) {
-		g_message ("cal_client_open_calendar(): could not create the listener");
-		return FALSE;
-	}
-
-	corba_listener = (GNOME_Evolution_Calendar_Listener) bonobo_object_corba_objref (
-		BONOBO_OBJECT (priv->listener));
-	
-	CORBA_exception_init (&ev);
-
-	priv->load_state = CAL_CLIENT_LOAD_LOADING;
-	priv->uri = g_strdup (str_uri);
-
-	GNOME_Evolution_Calendar_CalFactory_open (priv->factory, str_uri, only_if_exists,
-						  corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-
-		g_message ("cal_client_open_calendar(): open request failed");
-		bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-		priv->listener = NULL;
-		priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
-		g_free (priv->uri);
-		priv->uri = NULL;
-
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/**
- * cal_client_get_load_state:
- * @client: A calendar client.
- * 
- * Queries the state of loading of a calendar client.
- * 
- * Return value: A #CalClientLoadState value indicating whether the client has
- * not been loaded with cal_client_open_calendar() yet, whether it is being
- * loaded, or whether it is already loaded.
- **/
-CalClientLoadState
-cal_client_get_load_state (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	return priv->load_state;
-}
-
-/**
- * cal_client_get_uri:
- * @client: A calendar client.
- * 
- * Queries the URI that is open in a calendar client.
- * 
- * Return value: The URI of the calendar that is already loaded or is being
- * loaded, or NULL if the client has not started a load request yet.
- **/
-const char *
-cal_client_get_uri (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	return priv->uri;
-}
-
-/* Converts our representation of a calendar component type into its CORBA representation */
-static GNOME_Evolution_Calendar_CalObjType
-corba_obj_type (CalObjType type)
-{
-	return (((type & CALOBJ_TYPE_EVENT) ? GNOME_Evolution_Calendar_TYPE_EVENT : 0)
-		| ((type & CALOBJ_TYPE_TODO) ? GNOME_Evolution_Calendar_TYPE_TODO : 0)
-		| ((type & CALOBJ_TYPE_JOURNAL) ? GNOME_Evolution_Calendar_TYPE_JOURNAL : 0));
-}
-
-/**
- * cal_client_get_n_objects:
- * @client: A calendar client.
- * @type: Type of objects that will be counted.
- * 
- * Counts the number of calendar components of the specified @type.  This can be
- * used to count how many events, to-dos, or journals there are, for example.
- * 
- * Return value: Number of components.
- **/
-int
-cal_client_get_n_objects (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int n;
-	int t;
-
-	g_return_val_if_fail (client != NULL, -1);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, -1);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-	n = GNOME_Evolution_Calendar_Cal_countObjects (priv->cal, t, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_n_objects(): could not get the number of objects");
-		CORBA_exception_free (&ev);
-		return -1;
-	}
-
-	CORBA_exception_free (&ev);
-	return n;
-}
-
-/**
- * cal_client_get_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @comp: Return value for the calendar component object.
- *
- * Queries a calendar for a calendar component object based on its unique
- * identifier.
- *
- * Return value: Result code based on the status of the operation.
- **/
-CalClientGetStatus
-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObj comp_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, CAL_CLIENT_GET_NOT_FOUND);
-
-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	retval = CAL_CLIENT_GET_NOT_FOUND;
-	*comp = NULL;
-
-	CORBA_exception_init (&ev);
-	comp_str = GNOME_Evolution_Calendar_Cal_getObject (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_object(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (comp_str);
-	CORBA_free (comp_str);
-
-	if (!icalcomp) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	*comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (*comp));
-		*comp = NULL;
-
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	retval = CAL_CLIENT_GET_SUCCESS;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/* Builds an UID list out of a CORBA UID sequence */
-static GList *
-build_uid_list (GNOME_Evolution_Calendar_CalObjUIDSeq *seq)
-{
-	GList *uids;
-	int i;
-
-	uids = NULL;
-
-	for (i = 0; i < seq->_length; i++)
-		uids = g_list_prepend (uids, g_strdup (seq->_buffer[i]));
-
-	return uids;
-}
-
-/**
- * cal_client_get_uids:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- *
- * Queries a calendar for a list of unique identifiers corresponding to calendar
- * objects whose type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.  This should be
- * freed using the cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_get_uids (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-	GList *uids;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-
-	seq = GNOME_Evolution_Calendar_Cal_getUIds (priv->cal, t, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_uids(): could not get the list of UIDs");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Builds a GList of CalClientChange structures from the CORBA sequence */
-static GList *
-build_change_list (GNOME_Evolution_Calendar_CalObjChangeSeq *seq)
-{
-	GList *list = NULL;
-	icalcomponent *icalcomp;
-	int i;
-
-	/* Create the list in reverse order */
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalObjChange *corba_coc;
-		CalClientChange *ccc;
-
-		corba_coc = &seq->_buffer[i];
-		ccc = g_new (CalClientChange, 1);
-
-		icalcomp = icalparser_parse_string (corba_coc->calobj);
-		if (!icalcomp)
-			continue;
-
-		ccc->comp = cal_component_new ();
-		if (!cal_component_set_icalcomponent (ccc->comp, icalcomp)) {
-			icalcomponent_free (icalcomp);
-			gtk_object_unref (GTK_OBJECT (ccc->comp));
-			continue;
-		}
-		ccc->type = corba_coc->type;
-
-		list = g_list_prepend (list, ccc);
-	}
-
-	list = g_list_reverse (list);
-
-	return list;
-}
-
-GList *
-cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
-	int t;
-	GList *changes;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	t = corba_obj_type (type);
-	CORBA_exception_init (&ev);
-
-	seq = GNOME_Evolution_Calendar_Cal_getChanges (priv->cal, t, change_id, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_changes(): could not get the list of changes");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	changes = build_change_list (seq);
-	CORBA_free (seq);
-
-	return changes;
-}
-
-/* FIXME: Not used? */
-#if 0
-/* Builds a GList of CalObjInstance structures from the CORBA sequence */
-static GList *
-build_object_instance_list (GNOME_Evolution_Calendar_CalObjInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalObjInstance *corba_icoi;
-		CalObjInstance *icoi;
-
-		corba_icoi = &seq->_buffer[i];
-		icoi = g_new (CalObjInstance, 1);
-
-		icoi->uid = g_strdup (corba_icoi->uid);
-		icoi->start = corba_icoi->start;
-		icoi->end = corba_icoi->end;
-
-		list = g_list_prepend (list, icoi);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-#endif
-
-/**
- * cal_client_get_objects_in_range:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the objects that occur or recur in the specified range
- * of time.
- *
- * Return value: A list of UID strings.  This should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-	int t;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	t = corba_obj_type (type);
-
-	seq = GNOME_Evolution_Calendar_Cal_getObjectsInRange (priv->cal, t, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_objects_in_range(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Callback used when an object is updated and we must update the copy we have */
-static void
-generate_instances_obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *comp_uid;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		/* OK, so we don't care about new objects that may indeed be in
-		 * the requested time range.  We only care about the ones that
-		 * were returned by the first query to
-		 * cal_client_get_objects_in_range().
-		 */
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	status = cal_client_get_object (client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* The hash key comes from the component's internal data */
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* No longer in the server, too bad */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting "
-			   "object `%s'; ignoring...", uid);
-		break;
-		
-	}
-}
-
-/* Callback used when an object is removed and we must delete the copy we have */
-static void
-generate_instances_obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Adds a component to the list; called from g_hash_table_foreach() */
-static void
-add_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-	GList **list;
-
-	comp = CAL_COMPONENT (value);
-	list = data;
-
-	*list = g_list_prepend (*list, comp);
-}
-
-/* Gets a list of components that recur within the specified range of time.  It
- * ensures that the resulting list of CalComponent objects contains only objects
- * that are actually in the server at the time the initial
- * cal_client_get_objects_in_range() query ends.
- */
-static GList *
-get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	GList *uids;
-	GHashTable *uid_comp_hash;
-	GList *objects;
-	guint obj_updated_id;
-	guint obj_removed_id;
-	GList *l;
-
-	uids = cal_client_get_objects_in_range (client, type, start, end);
-
-	uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* While we are getting the actual object data, keep track of changes */
-
-	obj_updated_id = gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_updated_cb),
-					     uid_comp_hash);
-
-	obj_removed_id = gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_removed_cb),
-					     uid_comp_hash);
-
-	/* Get the objects */
-
-	for (l = uids; l; l = l->next) {
-		CalComponent *comp;
-		CalClientGetStatus status;
-		char *uid;
-		const char *comp_uid;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			/* The hash key comes from the component's internal data
-			 * instead of the duped UID from the list of UIDS.
-			 */
-			cal_component_get_uid (comp, &comp_uid);
-			g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Object disappeared from the server, so don't log it */
-			break;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("get_objects_atomically(): Syntax error when getting "
-				   "object `%s'; ignoring...", uid);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	/* Now our state is consistent with the server, so disconnect from the
-	 * notification signals and generate the final list of components.
-	 */
-
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_updated_id);
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_removed_id);
-
-	objects = NULL;
-	g_hash_table_foreach (uid_comp_hash, add_component, &objects);
-	g_hash_table_destroy (uid_comp_hash);
-
-	return objects;
-}
-
-struct comp_instance {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-};
-
-/* Called from cal_recur_generate_instances(); adds an instance to the list */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GList **list;
-	struct comp_instance *ci;
-
-	list = data;
-
-	ci = g_new (struct comp_instance, 1);
-
-	ci->comp = comp;
-	gtk_object_ref (GTK_OBJECT (ci->comp));
-	
-	ci->start = start;
-	ci->end = end;
-
-	*list = g_list_prepend (*list, ci);
-
-	return TRUE;
-}
-
-/* Used from g_list_sort(); compares two struct comp_instance structures */
-static gint
-compare_comp_instance (gconstpointer a, gconstpointer b)
-{
-	const struct comp_instance *cia, *cib;
-	time_t diff;
-
-	cia = a;
-	cib = b;
-
-	diff = cia->start - cib->start;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/**
- * cal_client_generate_instances:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * @cb: Callback for each generated instance.
- * @cb_data: Closure data for the callback.
- * 
- * Does a combination of cal_client_get_objects_in_range() and
- * cal_recur_generate_instances().  It fetches the list of objects in an atomic
- * way so that the generated instances are actually in the server at the time
- * the initial cal_client_get_objects_in_range() query ends.
- *
- * The callback function should do a gtk_object_ref() of the calendar component
- * it gets passed if it intends to keep it around.
- **/
-void
-cal_client_generate_instances (CalClient *client, CalObjType type,
-			       time_t start, time_t end,
-			       CalRecurInstanceFn cb, gpointer cb_data)
-{
-	CalClientPrivate *priv;
-	GList *objects;
-	GList *instances;
-	GList *l;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = client->priv;
-	g_return_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED);
-
-	g_return_if_fail (start != -1 && end != -1);
-	g_return_if_fail (start <= end);
-	g_return_if_fail (cb != NULL);
-
-	/* Generate objects */
-
-	objects = get_objects_atomically (client, type, start, end);
-	instances = NULL;
-
-	for (l = objects; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = l->data;
-		cal_recur_generate_instances (comp, start, end, add_instance, &instances);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	g_list_free (objects);
-
-	/* Generate instances and spew them out */
-
-	instances = g_list_sort (instances, compare_comp_instance);
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-		gboolean result;
-		
-		ci = l->data;
-		
-		result = (* cb) (ci->comp, ci->start, ci->end, cb_data);
-
-		if (!result)
-			break;
-	}
-
-	/* Clean up */
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-
-		ci = l->data;
-		gtk_object_unref (GTK_OBJECT (ci->comp));
-		g_free (ci);
-	}
-
-	g_list_free (instances);
-}
-
-/* Builds a list of CalAlarmInstance structures */
-static GSList *
-build_alarm_instance_list (CalComponent *comp, GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq)
-{
-	GSList *alarms;
-	int i;
-
-	alarms = NULL;
-
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-		CalComponentAlarm *alarm;
-		const char *auid;
-		CalAlarmInstance *instance;
-
-		corba_instance = seq->_buffer + i;
-
-		/* Since we want the in-commponent auid, we look for the alarm
-		 * in the component and fetch its "real" auid.
-		 */
-
-		alarm = cal_component_get_alarm (comp, corba_instance->auid);
-		if (!alarm)
-			continue;
-
-		auid = cal_component_alarm_get_uid (alarm);
-		cal_component_alarm_free (alarm);
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = corba_instance->trigger;
-		instance->occur = corba_instance->occur;
-
-		alarms = g_slist_prepend (alarms, instance);
-	}
-
-	return g_slist_reverse (alarms);
-}
-
-/* Builds a list of CalComponentAlarms structures */
-static GSList *
-build_component_alarms_list (GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq)
-{
-	GSList *comp_alarms;
-	int i;
-
-	comp_alarms = NULL;
-
-	for (i = 0; i < seq->_length; i++) {
-		GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-		CalComponent *comp;
-		CalComponentAlarms *alarms;
-		icalcomponent *icalcomp;
-
-		corba_alarms = seq->_buffer + i;
-
-		icalcomp = icalparser_parse_string (corba_alarms->calobj);
-		if (!icalcomp)
-			continue;
-
-		comp = cal_component_new ();
-		if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-			icalcomponent_free (icalcomp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		alarms = g_new (CalComponentAlarms, 1);
-		alarms->comp = comp;
-		alarms->alarms = build_alarm_instance_list (comp, &corba_alarms->alarms);
-
-		comp_alarms = g_slist_prepend (comp_alarms, alarms);
-	}
-
-	return comp_alarms;
-}
-
-/**
- * cal_client_get_alarms_in_range:
- * @client: A calendar client.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the alarms that trigger in the specified range of
- * time.
- *
- * Return value: A list of #CalComponentAlarms structures.  This should be freed
- * using the cal_client_free_alarms() function, or by freeing each element
- * separately with cal_component_alarms_free() and then freeing the list with
- * g_slist_free().
- **/
-GSList *
-cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-	GSList *alarms;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	seq = GNOME_Evolution_Calendar_Cal_getAlarmsInRange (priv->cal, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	alarms = build_component_alarms_list (seq);
-	CORBA_free (seq);
-
-	return alarms;
-}
-
-/**
- * cal_client_free_alarms:
- * @comp_alarms: A list of #CalComponentAlarms structures.
- * 
- * Frees a list of #CalComponentAlarms structures as returned by
- * cal_client_get_alarms_in_range().
- **/
-void
-cal_client_free_alarms (GSList *comp_alarms)
-{
-	GSList *l;
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		g_assert (alarms != NULL);
-
-		cal_component_alarms_free (alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/**
- * cal_client_get_alarms_for_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the component's alarm instances.  Will return NULL
- * if no instances occur within the specified time range.  This should be freed
- * using the cal_component_alarms_free() function.
- *
- * Queries a calendar for the alarms of a particular object that trigger in the
- * specified range of time.
- *
- * Return value: TRUE on success, FALSE if the object was not found.
- **/
-gboolean
-cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-				  time_t start, time_t end,
-				  CalComponentAlarms **alarms)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-	gboolean retval;
-	icalcomponent *icalcomp;
-	CalComponent *comp;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	*alarms = NULL;
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-
-	corba_alarms = GNOME_Evolution_Calendar_Cal_getAlarmsForObject (priv->cal, (char *) uid,
-									start, end, &ev);
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (corba_alarms->calobj);
-	if (!icalcomp)
-		goto out;
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (comp));
-		goto out;
-	}
-
-	retval = TRUE;
-
-	*alarms = g_new (CalComponentAlarms, 1);
-	(*alarms)->comp = comp;
-	(*alarms)->alarms = build_alarm_instance_list (comp, &corba_alarms->alarms);
-	CORBA_free (corba_alarms);
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * cal_client_update_object:
- * @client: A calendar client.
- * @comp: A calendar component object.
- *
- * Asks a calendar to update a component.  Any existing component with the
- * specified component's UID will be replaced.  The client program should not
- * assume that the object is actually in the server's storage until it has
- * received the "obj_updated" notification signal.
- *
- * Return value: TRUE on success, FALSE on specifying an invalid component.
- **/
-gboolean
-cal_client_update_object (CalClient *client, CalComponent *comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-	char *obj_string;
-	const char *uid;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	retval = FALSE;
-
-	cal_component_commit_sequence (comp);
-	obj_string = cal_component_get_as_string (comp);
-
-	cal_component_get_uid (comp, &uid);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_updateObject (priv->cal, (char *) uid, obj_string, &ev);
-	g_free (obj_string);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_InvalidObject) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_update_object(): could not update the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/**
- * cal_client_remove_object:
- * @client: A calendar client.
- * @uid: Unique identifier of the calendar component to remove.
- * 
- * Asks a calendar to remove a component.  If the server is able to remove the
- * component, all clients will be notified and they will emit the "obj_removed"
- * signal.
- * 
- * Return value: TRUE on success, FALSE on specifying a UID for a component that
- * is not in the server.  Returning FALSE is normal; the object may have
- * disappeared from the server before the client has had a chance to receive the
- * corresponding notification.
- **/
-gboolean
-cal_client_remove_object (CalClient *client, const char *uid)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_remove_object(): could not remove the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
deleted file mode 100644
index 9e17b22b2b..0000000000
--- a/calendar/cal-client/cal-client.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_CLIENT_H
-#define CAL_CLIENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/cal-util.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-
-typedef struct _CalClient CalClient;
-typedef struct _CalClientClass CalClientClass;
-
-typedef struct _CalClientPrivate CalClientPrivate;
-
-/* Open status for the cal_opened signal */
-typedef enum {
-	CAL_CLIENT_OPEN_SUCCESS,
-	CAL_CLIENT_OPEN_ERROR,
-	CAL_CLIENT_OPEN_NOT_FOUND,
-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED
-} CalClientOpenStatus;
-
-/* Get status for the cal_client_get_object() function */
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-
-/* Whether the client is not loaded, is being loaded, or is already loaded */
-typedef enum {
-	CAL_CLIENT_LOAD_NOT_LOADED,
-	CAL_CLIENT_LOAD_LOADING,
-	CAL_CLIENT_LOAD_LOADED
-} CalClientLoadState;
-
-
-struct _CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-
-struct _CalClientClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_opened) (CalClient *client, CalClientOpenStatus status);
-
-	void (* obj_updated) (CalClient *client, const char *uid);
-	void (* obj_removed) (CalClient *client, const char *uid);
-};
-
-GtkType cal_client_get_type (void);
-
-CalClient *cal_client_construct (CalClient *client);
-
-CalClient *cal_client_new (void);
-
-gboolean cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists);
-
-CalClientLoadState cal_client_get_load_state (CalClient *client);
-
-const char *cal_client_get_uri (CalClient *client);
-
-int cal_client_get_n_objects (CalClient *client, CalObjType type);
-
-CalClientGetStatus cal_client_get_object (CalClient *client,
-					  const char *uid,
-					  CalComponent **comp);
-
-GList *cal_client_get_uids (CalClient *client, CalObjType type);
-GList *cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id);
-
-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,
-					time_t start, time_t end);
-
-void cal_client_generate_instances (CalClient *client, CalObjType type,
-				    time_t start, time_t end,
-				    CalRecurInstanceFn cb, gpointer cb_data);
-
-GSList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);
-
-void cal_client_free_alarms (GSList *comp_alarms);
-
-gboolean cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-					   time_t start, time_t end,
-					   CalComponentAlarms **alarms);
-
-gboolean cal_client_update_object (CalClient *client, CalComponent *comp);
-
-gboolean cal_client_remove_object (CalClient *client, const char *uid);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
deleted file mode 100644
index b5c3bdbd6b..0000000000
--- a/calendar/cal-client/cal-listener.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-listener.h"
-
-
-
-/* Private part of the CalListener structure */
-struct _CalListenerPrivate {
-	/* The calendar this listener refers to */
-	GNOME_Evolution_Calendar_Cal cal;
-
-	/* Notification functions and their closure data */
-	CalListenerCalOpenedFn cal_opened_fn;
-	CalListenerObjUpdatedFn obj_updated_fn;
-	CalListenerObjRemovedFn obj_removed_fn;
-	gpointer fn_data;
-};
-
-
-
-static void cal_listener_class_init (CalListenerClass *class);
-static void cal_listener_init (CalListener *listener);
-static void cal_listener_destroy (GtkObject *object);
-
-static POA_GNOME_Evolution_Calendar_Listener__vepv cal_listener_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_listener_get_type:
- * @void:
- *
- * Registers the #CalListener class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalListener class.
- **/
-GtkType
-cal_listener_get_type (void)
-{
-	static GtkType cal_listener_type = 0;
-
-	if (!cal_listener_type) {
-		static const GtkTypeInfo cal_listener_info = {
-			"CalListener",
-			sizeof (CalListener),
-			sizeof (CalListenerClass),
-			(GtkClassInitFunc) cal_listener_class_init,
-			(GtkObjectInitFunc) cal_listener_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info);
-	}
-
-	return cal_listener_type;
-}
-
-/* CORBA class initialization function for the calendar listener */
-static void
-init_cal_listener_corba_class (void)
-{
-	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_listener_vepv.GNOME_Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
-}
-
-/* Class initialization function for the calendar listener */
-static void
-cal_listener_class_init (CalListenerClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = cal_listener_destroy;
-
-	init_cal_listener_corba_class ();
-}
-
-/* Object initialization function for the calendar listener */
-static void
-cal_listener_init (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	priv = g_new0 (CalListenerPrivate, 1);
-	listener->priv = priv;
-
-	priv->cal = CORBA_OBJECT_NIL;
-	priv->cal_opened_fn = NULL;
-	priv->obj_updated_fn = NULL;
-	priv->obj_removed_fn = NULL;
-}
-
-/* Destroy handler for the calendar listener */
-static void
-cal_listener_destroy (GtkObject *object)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment ev;
-	gboolean result;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (object));
-
-	listener = CAL_LISTENER (object);
-	priv = listener->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_listener_destroy(): could not see if the calendar was NIL");
-	else if (!result) {
-		CORBA_exception_free (&ev);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->cal, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("cal_listener_destroy(): could not release the calendar");
-
-		priv->cal = CORBA_OBJECT_NIL;
-	}
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-	listener->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Listener::notifyCalOpened method */
-static void
-Listener_notifyCalOpened (PortableServer_Servant servant,
-			  GNOME_Evolution_Calendar_Listener_OpenStatus status,
-			  GNOME_Evolution_Calendar_Cal cal,
-			  CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment aev;
-	GNOME_Evolution_Calendar_Cal cal_copy;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (priv->cal != CORBA_OBJECT_NIL) {
-		g_message ("Listener_notifyCalOpened(): calendar was already open!");
-		return;
-	}
-
-	CORBA_exception_init (&aev);
-	cal_copy = CORBA_Object_duplicate (cal, &aev);
-
-	if (aev._major != CORBA_NO_EXCEPTION) {
-		g_message ("Listener_notifyCalOpened(): could not duplicate the calendar");
-		CORBA_exception_free (&aev);
-		return;
-	}
-	CORBA_exception_free (&aev);
-
-	priv->cal = cal_copy;
-
-	g_assert (priv->cal_opened_fn != NULL);
-	(* priv->cal_opened_fn) (listener, status, cal, priv->fn_data);
-}
-
-/* Listener::notifyObjUpdated method */
-static void
-Listener_notifyObjUpdated (PortableServer_Servant servant,
-			   GNOME_Evolution_Calendar_CalObjUID uid,
-			   CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	g_assert (priv->obj_updated_fn != NULL);
-	(* priv->obj_updated_fn) (listener, uid, priv->fn_data);
-}
-
-/* Listener::notifyObjRemoved method */
-static void
-Listener_notifyObjRemoved (PortableServer_Servant servant,
-			   GNOME_Evolution_Calendar_CalObjUID uid,
-			   CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	g_assert (priv->obj_removed_fn != NULL);
-	(* priv->obj_removed_fn) (listener, uid, priv->fn_data);
-}
-
-/**
- * cal_listener_get_epv:
- * @void:
- *
- * Creates an EPV for the Listener CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_GNOME_Evolution_Calendar_Listener__epv *
-cal_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Calendar_Listener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Calendar_Listener__epv, 1);
-	epv->notifyCalOpened  = Listener_notifyCalOpened;
-	epv->notifyObjUpdated = Listener_notifyObjUpdated;
-	epv->notifyObjRemoved = Listener_notifyObjRemoved;
-	return epv;
-}
-
-
-
-/**
- * cal_listener_construct:
- * @listener: A calendar listener.
- * @corba_listener: CORBA object for the calendar listener.
- * @cal_opened_fn: Function that will be called to notify that a calendar was
- * opened.
- * @obj_updated_fn: Function that will be called to notify that an object in the
- * calendar was updated.
- * @obj_removed_fn: Function that will be called to notify that an object in the
- * calendar was removed.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Constructs a calendar listener by binding the corresponding CORBA object to
- * it.
- *
- * Return value: the same object as the @listener argument.
- **/
-CalListener *
-cal_listener_construct (CalListener *listener,
-			GNOME_Evolution_Calendar_Listener corba_listener,
-			CalListenerCalOpenedFn cal_opened_fn,
-			CalListenerObjUpdatedFn obj_updated_fn,
-			CalListenerObjRemovedFn obj_removed_fn,
-			gpointer fn_data)
-{
-	CalListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);
-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-
-	priv = listener->priv;
-
-	priv->cal_opened_fn = cal_opened_fn;
-	priv->obj_updated_fn = obj_updated_fn;
-	priv->obj_removed_fn = obj_removed_fn;
-	priv->fn_data = fn_data;
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener);
-	return listener;
-}
-
-/**
- * cal_listener_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar listener @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-GNOME_Evolution_Calendar_Listener
-cal_listener_corba_object_create (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Calendar_Listener *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_listener_new:
- * @cal_opened_fn: Function that will be called to notify that a calendar was
- * opened.
- * @obj_updated_fn: Function that will be called to notify that an object in the
- * calendar was updated.
- * @obj_removed_fn: Function that will be called to notify that an object in the
- * calendar was removed.
- * @fn_data: Closure data pointer that will be passed to the notification
- * functions.
- *
- * Creates a new #CalListener object.
- *
- * Return value: A newly-created #CalListener, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-CalListener *
-cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-		  CalListenerObjUpdatedFn obj_updated_fn,
-		  CalListenerObjRemovedFn obj_removed_fn,
-		  gpointer fn_data)
-{
-	CalListener *listener;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_Listener corba_listener;
-	gboolean result;
-
-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);
-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);
-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);
-
-	listener = gtk_type_new (CAL_LISTENER_TYPE);
-
-	corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (corba_listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION || result) {
-		g_message ("cal_listener_new(): could not create the CORBA listener");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_listener_construct (listener,
-				       corba_listener,
-				       cal_opened_fn,
-				       obj_updated_fn,
-				       obj_removed_fn,
-				       fn_data);
-}
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
deleted file mode 100644
index 612d1d889f..0000000000
--- a/calendar/cal-client/cal-listener.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_LISTENER_H
-#define CAL_LISTENER_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_LISTENER_TYPE            (cal_listener_get_type ())
-#define CAL_LISTENER(obj)            (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener))
-#define CAL_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE,	\
-				      CalListenerClass))
-#define IS_CAL_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE))
-#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE))
-
-typedef struct _CalListener CalListener;
-typedef struct _CalListenerClass CalListenerClass;
-
-typedef struct _CalListenerPrivate CalListenerPrivate;
-
-struct _CalListener {
-	BonoboObject object;
-
-	/* Private data */
-	CalListenerPrivate *priv;
-};
-
-struct _CalListenerClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_opened) (CalListener *listener,
-			     GNOME_Evolution_Calendar_Listener_OpenStatus status,
-			     GNOME_Evolution_Calendar_Cal cal);
-	void (* obj_updated) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
-	void (* obj_removed) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
-};
-
-/* Notification functions */
-typedef void (* CalListenerCalOpenedFn) (CalListener *listener,
-					 GNOME_Evolution_Calendar_Listener_OpenStatus status,
-					 GNOME_Evolution_Calendar_Cal cal,
-					 gpointer data);
-
-typedef void (* CalListenerObjUpdatedFn) (CalListener *listener,
-					  const GNOME_Evolution_Calendar_CalObjUID uid,
-					  gpointer data);
-typedef void (* CalListenerObjRemovedFn) (CalListener *listener,
-					  const GNOME_Evolution_Calendar_CalObjUID uid,
-					  gpointer data);
-
-
-GtkType cal_listener_get_type (void);
-
-CalListener *cal_listener_construct (CalListener *listener,
-				     GNOME_Evolution_Calendar_Listener corba_listener,
-				     CalListenerCalOpenedFn cal_opened_fn,
-				     CalListenerObjUpdatedFn obj_updated_fn,
-				     CalListenerObjRemovedFn obj_removed_fn,
-				     gpointer fn_data);
-
-GNOME_Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
-
-CalListener *cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,
-			       CalListenerObjUpdatedFn obj_updated_fn,
-			       CalListenerObjRemovedFn obj_removed_fn,
-			       gpointer fn_data);
-
-POA_GNOME_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
deleted file mode 100644
index 7ff8aab8fc..0000000000
--- a/calendar/cal-client/client-test.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Evolution calendar client - test program
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-static CalClient *client1;
-static CalClient *client2;
-
-/* Prints a message with a client identifier */
-static void
-cl_printf (CalClient *client, const char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	printf ("Client %s: ",
-		client == client1 ? "1" :
-		client == client2 ? "2" :
-		"UNKNOWN");
-	vprintf (format, args);
-	va_end (args);
-}
-
-/* Dumps some interesting data from a component */
-static void
-dump_component (CalComponent *comp)
-{
-	const char *uid;
-	CalComponentText summary;
-
-	cal_component_get_uid (comp, &uid);
-
-	printf ("UID %s\n", uid);
-
-	cal_component_get_summary (comp, &summary);
-	if (summary.value)
-		printf ("\tSummary: `%s', altrep `%s'\n",
-			summary.value,
-			summary.altrep ? summary.altrep : "NONE");
-	else
-		printf ("\tNo summary\n");
-}
-
-/* Lists the UIDs of objects in a calendar, called as an idle handler */
-static gboolean
-list_uids (gpointer data)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-
-	client = CAL_CLIENT (data);
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY);
-
-	cl_printf (client, "UIDs: ");
-
-	if (!uids)
-		printf ("none\n");
-	else {
-		for (l = uids; l; l = l->next) {
-			char *uid;
-
-			uid = l->data;
-			printf ("`%s' ", uid);
-		}
-
-		printf ("\n");
-
-		for (l = uids; l; l = l->next) {
-			char *uid;
-			CalComponent *comp;
-			CalClientGetStatus status;
-
-			uid = l->data;
-			status = cal_client_get_object (client, uid, &comp);
-
-			if (status == CAL_CLIENT_GET_SUCCESS) {
-				printf ("------------------------------\n");
-				dump_component (comp);
-				printf ("------------------------------\n");
-				gtk_object_unref (GTK_OBJECT (comp));
-			} else {
-				printf ("FAILED: %d\n", status);
-			}
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (client));
-
-	return FALSE;
-}
-
-/* Callback used when a calendar is opened */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	cl_printf (client, "Load/create %s\n",
-		   ((status == CAL_CLIENT_OPEN_SUCCESS) ? "success" :
-		    (status == CAL_CLIENT_OPEN_ERROR) ? "error" :
-		    (status == CAL_CLIENT_OPEN_NOT_FOUND) ? "not found" :
-		    (status == CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED) ? "method not supported" :
-		    "unknown status value"));
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS)
-		g_idle_add (list_uids, client);
-	else
-		gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Callback used when an object is updated */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	cl_printf (client, "Object updated: %s\n", uid);
-}
-
-/* Callback used when a client is destroyed */
-static void
-client_destroy_cb (GtkObject *object, gpointer data)
-{
-	if (CAL_CLIENT (object) == client1)
-		client1 = NULL;
-	else if (CAL_CLIENT (object) == client2)
-		client2 = NULL;
-	else
-		g_assert_not_reached ();
-
-	if (!client1 && !client2)
-		gtk_main_quit ();
-}
-
-/* Creates a calendar client and tries to load the specified URI into it */
-static void
-create_client (CalClient **client, const char *uri, gboolean only_if_exists)
-{
-	gboolean result;
-
-	*client = cal_client_new ();
-	if (!*client) {
-		g_message ("create_client(): could not create the client");
-		exit (1);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (*client), "destroy",
-			    client_destroy_cb,
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (*client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb),
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT (*client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb),
-			    NULL);
-
-	printf ("Calendar loading `%s'...\n", uri);
-
-	result = cal_client_open_calendar (*client, uri, only_if_exists);
-
-	if (!result) {
-		g_message ("create_client(): failure when issuing calendar open request `%s'",
-			   uri);
-		exit (1);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	textdomain (PACKAGE);
-
-	gnome_init ("tl-test", VERSION, argc, argv);
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): could not initialize Bonobo");
-		exit (1);
-	}
-
-	create_client (&client1, "/cvs/evolution/calendar/cal-client/test.ics", FALSE);
-	create_client (&client2, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);
-
-	bonobo_main ();
-	return 0;
-}
diff --git a/calendar/cal-client/test.ics b/calendar/cal-client/test.ics
deleted file mode 100644
index 128251ee11..0000000000
--- a/calendar/cal-client/test.ics
+++ /dev/null
@@ -1,318 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-
-BEGIN:VEVENT
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore
deleted file mode 100644
index 9f93120f8a..0000000000
--- a/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.libs
-Makefile.in
-Makefile
-.deps
-*.lo
-*.la
-test-recur
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
deleted file mode 100644
index 80c8da2662..0000000000
--- a/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-noinst_PROGRAMS = test-recur
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"cal-util\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/calendar			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-        $(GNOME_INCLUDEDIR)
-
-#
-# cal util library
-#
-
-lib_LTLIBRARIES = libcal-util.la
-
-libcal_util_la_SOURCES = 	\
-	cal-component.c		\
-	cal-recur.c		\
-	cal-util.c		\
-	timeutil.c
-
-libcal_utilincludedir = $(includedir)/evolution/cal-util
-
-libcal_utilinclude_HEADERS =	\
-	cal-component.h		\
-	cal-recur.h		\
-	cal-util.h		\
-	timeutil.h
-
-#
-# static library for use in conduits' shared libraries
-#
-noinst_LTLIBRARIES = libcal-util-static.la
-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
-libcal_util_static_la_LDFLAGS = --all-static
-
-test_recur_SOURCES = 	\
-	 test-recur.c
-
-test_recur_LDADD = 	\
-	 libcal-util.la	\
-	 $(top_builddir)/libversit/libversit.la		\
-	 $(top_builddir)/libical/src/libical/libical.la	\
-	 $(EXTRA_GNOME_LIBS)
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
deleted file mode 100644
index b0269ba262..0000000000
--- a/calendar/cal-util/cal-component.c
+++ /dev/null
@@ -1,4071 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "cal-component.h"
-#include "timeutil.h"
-
-
-
-/* Extension property for alarm components so that we can reference them by UID */
-#define EVOLUTION_ALARM_UID_PROPERTY "X-EVOLUTION-ALARM-UID"
-
-/* Private part of the CalComponent structure */
-struct _CalComponentPrivate {
-	/* The icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *uid;
-
-	icalproperty *status;
-
-	icalproperty *categories;
-
-	icalproperty *classification;
-
-	struct text {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	};
-
-	GSList *comment_list; /* list of struct text */
-
-	icalproperty *completed;
-	icalproperty *created;
-
-	GSList *description_list; /* list of struct text */
-
-	struct datetime {
-		icalproperty *prop;
-		icalparameter *tzid_param;
-	};
-
-	struct datetime dtstart;
-	struct datetime dtend;
-
-	icalproperty *dtstamp;
-
-	struct datetime due;
-
-	GSList *exdate_list; /* list of struct datetime */
-	GSList *exrule_list; /* list of icalproperty objects */
-
-	icalproperty *geo;
-	icalproperty *last_modified;
-	icalproperty *percent;
-	icalproperty *priority;
-
-	struct period {
-		icalproperty *prop;
-		icalparameter *value_param;
-	};
-
-	GSList *rdate_list; /* list of struct period */
-
-	GSList *rrule_list; /* list of icalproperty objects */
-
-	icalproperty *sequence;
-
-	struct {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	} summary;
-
-	icalproperty *transparency;
-	icalproperty *url;
-
-	/* Subcomponents */
-
-	GHashTable *alarm_uid_hash;
-
-	/* Whether we should increment the sequence number when piping the
-	 * object over the wire.
-	 */
-	guint need_sequence_inc : 1;
-};
-
-/* Private structure for alarms */
-struct _CalComponentAlarm {
-	/* Our parent component */
-	CalComponent *parent;
-
-	/* Alarm icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Our extension UID property */
-	icalproperty *uid;
-
-	/* Properties */
-
-	icalproperty *action;
-	icalproperty *trigger;
-};
-
-
-
-static void cal_component_class_init (CalComponentClass *class);
-static void cal_component_init (CalComponent *comp);
-static void cal_component_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_component_get_type:
- *
- * Registers the #CalComponent class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalComponent class.
- **/
-GtkType
-cal_component_get_type (void)
-{
-	static GtkType cal_component_type = 0;
-
-	if (!cal_component_type) {
-		static const GtkTypeInfo cal_component_info = {
-			"CalComponent",
-			sizeof (CalComponent),
-			sizeof (CalComponentClass),
-			(GtkClassInitFunc) cal_component_class_init,
-			(GtkObjectInitFunc) cal_component_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_component_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_component_info);
-	}
-
-	return cal_component_type;
-}
-
-/* Class initialization function for the calendar component object */
-static void
-cal_component_class_init (CalComponentClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_component_destroy;
-}
-
-/* Object initialization function for the calendar component object */
-static void
-cal_component_init (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = g_new0 (CalComponentPrivate, 1);
-	comp->priv = priv;
-
-	priv->alarm_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-/* Does a simple g_free() of the elements of a GSList and then frees the list
- * itself.  Returns NULL.
- */
-static GSList *
-free_slist (GSList *slist)
-{
-	GSList *l;
-
-	for (l = slist; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (slist);
-	return NULL;
-}
-
-/* Used from g_hash_table_foreach_remove() to free the alarm UIDs hash table.
- * We do not need to do anything to individual elements since we were storing
- * the UID pointers inside the icalproperties themselves.
- */
-static gboolean
-free_alarm_cb (gpointer key, gpointer value, gpointer data)
-{
-	return TRUE;
-}
-
-/* Frees the internal icalcomponent only if it does not have a parent.  If it
- * does, it means we don't own it and we shouldn't free it.
- */
-static void
-free_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!priv->icalcomp)
-		return;
-
-	/* Free the icalcomponent */
-
-	if (icalcomponent_get_parent (priv->icalcomp) == NULL)
-		icalcomponent_free (priv->icalcomp);
-
-	priv->icalcomp = NULL;
-
-	/* Free the mappings */
-
-	priv->uid = NULL;
-
-	priv->status = NULL;
-
-	priv->categories = NULL;
-
-	priv->classification = NULL;
-	priv->comment_list = NULL;
-	priv->completed = NULL;
-	priv->created = NULL;
-
-	priv->description_list = free_slist (priv->description_list);
-
-	priv->dtend.prop = NULL;
-	priv->dtend.tzid_param = NULL;
-
-	priv->dtstamp = NULL;
-
-	priv->dtstart.prop = NULL;
-	priv->dtstart.tzid_param = NULL;
-
-	priv->due.prop = NULL;
-	priv->due.tzid_param = NULL;
-
-	priv->exdate_list = free_slist (priv->exdate_list);
-
-	g_slist_free (priv->exrule_list);
-	priv->exrule_list = NULL;
-
-	priv->geo = NULL;
-	priv->last_modified = NULL;
-	priv->percent = NULL;
-	priv->priority = NULL;
-
-	priv->rdate_list = free_slist (priv->rdate_list);
-
-	g_slist_free (priv->rrule_list);
-	priv->rrule_list = NULL;
-
-	priv->sequence = NULL;
-
-	priv->summary.prop = NULL;
-	priv->summary.altrep_param = NULL;
-
-	priv->transparency = NULL;
-	priv->url = NULL;
-
-	/* Free the subcomponents */
-
-	g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL);
-
-	/* Clean up */
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/* Destroy handler for the calendar component object */
-static void
-cal_component_destroy (GtkObject *object)
-{
-	CalComponent *comp;
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (object));
-
-	comp = CAL_COMPONENT (object);
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-	g_hash_table_destroy (priv->alarm_uid_hash);
-	priv->alarm_uid_hash = NULL;
-
-	g_free (priv);
-	comp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/**
- * cal_component_gen_uid:
- *
- * Generates a unique identifier suitable for calendar components.
- *
- * Return value: A unique identifier string.  Every time this function is called
- * a different string is returned.
- **/
-char *
-cal_component_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname) {
-		static char buffer [512];
-
-		if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = buffer;
-		else
-			hostname = "localhost";
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-/**
- * cal_component_new:
- *
- * Creates a new empty calendar component object.  You should set it from an
- * #icalcomponent structure by using cal_component_set_icalcomponent() or with a
- * new empty component type by using cal_component_set_new_vtype().
- *
- * Return value: A newly-created calendar component object.
- **/
-CalComponent *
-cal_component_new (void)
-{
-	return CAL_COMPONENT (gtk_type_new (CAL_COMPONENT_TYPE));
-}
-
-/**
- * cal_component_clone:
- * @comp: A calendar component object.
- *
- * Creates a new calendar component object by copying the information from
- * another one.
- *
- * Return value: A newly-created calendar component with the same values as the
- * original one.
- **/
-CalComponent *
-cal_component_clone (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	CalComponent *new_comp;
-	icalcomponent *new_icalcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	new_comp = cal_component_new ();
-
-	if (priv->icalcomp) {
-		new_icalcomp = icalcomponent_new_clone (priv->icalcomp);
-		cal_component_set_icalcomponent (new_comp, new_icalcomp);
-	}
-
-	return new_comp;
-}
-
-/* Scans a date/time and timezone pair property */
-static void
-scan_datetime (CalComponent *comp, struct datetime *datetime, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	datetime->prop = prop;
-	datetime->tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-}
-
-/* Scans an exception date property */
-static void
-scan_exdate (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	struct datetime *dt;
-
-	priv = comp->priv;
-
-	dt = g_new (struct datetime, 1);
-	dt->prop = prop;
-	dt->tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-
-	priv->exdate_list = g_slist_append (priv->exdate_list, dt);
-}
-
-/* Scans an icalperiodtype property */
-static void
-scan_period (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	struct period *period;
-
-	period = g_new (struct period, 1);
-	period->prop = prop;
-	period->value_param = icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER);
-
-	*list = g_slist_append (*list, period);
-}
-
-/* Scans an icalrecurtype property */
-static void
-scan_recur (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	*list = g_slist_append (*list, prop);
-}
-
-/* Scans the summary property */
-static void
-scan_summary (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	priv->summary.prop = prop;
-	priv->summary.altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-}
-
-/* Scans a text (i.e. text + altrep) property */
-static void
-scan_text (CalComponent *comp, GSList **text_list, icalproperty *prop)
-{
-	struct text *text;
-
-	text = g_new (struct text, 1);
-	text->prop = prop;
-	text->altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-
-	*text_list = g_slist_append (*text_list, text);
-}
-
-/* Scans an icalproperty and adds its mapping to the component */
-static void
-scan_property (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	icalproperty_kind kind;
-
-	priv = comp->priv;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_STATUS_PROPERTY:
-		priv->status = prop;
-		break;
-
-	case ICAL_CATEGORIES_PROPERTY:
-		priv->categories = prop;
-		break;
-
-	case ICAL_CLASS_PROPERTY:
-		priv->classification = prop;
-		break;
-
-	case ICAL_COMMENT_PROPERTY:
-		scan_text (comp, &priv->comment_list, prop);
-		break;
-
-	case ICAL_COMPLETED_PROPERTY:
-		priv->completed = prop;
-		break;
-
-	case ICAL_CREATED_PROPERTY:
-		priv->created = prop;
-		break;
-
-	case ICAL_DESCRIPTION_PROPERTY:
-		scan_text (comp, &priv->description_list, prop);
-		break;
-
-	case ICAL_DTEND_PROPERTY:
-		scan_datetime (comp, &priv->dtend, prop);
-		break;
-
-	case ICAL_DTSTAMP_PROPERTY:
-		priv->dtstamp = prop;
-		break;
-
-	case ICAL_DTSTART_PROPERTY:
-		scan_datetime (comp, &priv->dtstart, prop);
-		break;
-
-	case ICAL_DUE_PROPERTY:
-		scan_datetime (comp, &priv->due, prop);
-		break;
-
-	case ICAL_EXDATE_PROPERTY:
-		scan_exdate (comp, prop);
-		break;
-
-	case ICAL_EXRULE_PROPERTY:
-		scan_recur (comp, &priv->exrule_list, prop);
-		break;
-
-	case ICAL_GEO_PROPERTY:
-		priv->geo = prop;
-		break;
-
-	case ICAL_LASTMODIFIED_PROPERTY:
-		priv->last_modified = prop;
-		break;
-
-	case ICAL_PERCENTCOMPLETE_PROPERTY:
-		priv->percent = prop;
-		break;
-
-	case ICAL_PRIORITY_PROPERTY:
-		priv->priority = prop;
-		break;
-
-	case ICAL_RDATE_PROPERTY:
-		scan_period (comp, &priv->rdate_list, prop);
-		break;
-
-	case ICAL_RRULE_PROPERTY:
-		scan_recur (comp, &priv->rrule_list, prop);
-		break;
-
-	case ICAL_SEQUENCE_PROPERTY:
-		priv->sequence = prop;
-		break;
-
-	case ICAL_SUMMARY_PROPERTY:
-		scan_summary (comp, prop);
-		break;
-
-	case ICAL_TRANSP_PROPERTY:
-		priv->transparency = prop;
-		break;
-
-	case ICAL_UID_PROPERTY:
-		priv->uid = prop;
-		break;
-
-	case ICAL_URL_PROPERTY:
-		priv->url = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Gets our alarm UID string from a property that is known to contain it */
-static const char *
-alarm_uid_from_prop (icalproperty *prop)
-{
-	const char *xstr;
-
-	g_assert (icalproperty_isa (prop) == ICAL_X_PROPERTY);
-
-	xstr = icalproperty_get_x (prop);
-	g_assert (xstr != NULL);
-
-	return xstr;
-}
-
-/* Sets our alarm UID extension property on an alarm component.  Returns a
- * pointer to the UID string inside the property itself.
- */
-static const char *
-set_alarm_uid (icalcomponent *alarm, const char *auid)
-{
-	icalproperty *prop;
-	const char *inprop_auid;
-
-	/* Create the new property */
-
-	prop = icalproperty_new_x ((char *) auid);
-	icalproperty_set_x_name (prop, EVOLUTION_ALARM_UID_PROPERTY);
-
-	icalcomponent_add_property (alarm, prop);
-
-	inprop_auid = alarm_uid_from_prop (prop);
-	return inprop_auid;
-}
-
-/* Removes any alarm UID extension properties from an alarm subcomponent */
-static void
-remove_alarm_uid (icalcomponent *alarm)
-{
-	icalproperty *prop;
-	GSList *list, *l;
-
-	list = NULL;
-
-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {
-		const char *xname;
-
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)
-			list = g_slist_prepend (list, prop);
-	}
-
-	for (l = list; l; l = l->next) {
-		prop = l->data;
-		icalcomponent_remove_property (alarm, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (list);
-}
-
-/* Adds an alarm subcomponent to the calendar component's mapping table.  The
- * actual UID with which it gets added may not be the same as the specified one;
- * this function will change it if the table already had an alarm subcomponent
- * with the specified UID.  Returns the actual UID used.
- */
-static const char *
-add_alarm (CalComponent *comp, icalcomponent *alarm, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *old_alarm;
-
-	priv = comp->priv;
-
-	/* First we see if we already have an alarm with the requested UID.  In
-	 * that case, we need to change the new UID to something else.  This
-	 * should never happen, but who knows.
-	 */
-
-	old_alarm = g_hash_table_lookup (priv->alarm_uid_hash, auid);
-	if (old_alarm != NULL) {
-		char *new_auid;
-
-		g_message ("add_alarm(): Got alarm with duplicated UID `%s', changing it...", auid);
-
-		remove_alarm_uid (alarm);
-
-		new_auid = cal_component_gen_uid ();
-		auid = set_alarm_uid (alarm, new_auid);
-		g_free (new_auid);
-	}
-
-	g_hash_table_insert (priv->alarm_uid_hash, (char *) auid, alarm);
-	return auid;
-}
-
-static void
-remove_alarm (CalComponent *comp, const char *auid) 
-{
-	CalComponentPrivate *priv;
-	
-	priv = comp->priv;
-	
-	g_hash_table_remove (priv->alarm_uid_hash, auid);
-}
-
-
-/* Scans an alarm subcomponent, adds an UID extension property to it (so that we
- * can reference alarms by unique IDs), and adds its mapping to the component.  */
-static void
-scan_alarm (CalComponent *comp, icalcomponent *alarm)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-	const char *auid;
-	char *new_auid;
-
-	priv = comp->priv;
-
-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {
-		const char *xname;
-
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {
-			auid = alarm_uid_from_prop (prop);
-			add_alarm (comp, alarm, auid);
-			return;
-		}
-	}
-
-	/* The component has no alarm UID property, so we create one. */
-
-	new_auid = cal_component_gen_uid ();
-	auid = set_alarm_uid (alarm, new_auid);
-	g_free (new_auid);
-
-	add_alarm (comp, alarm, auid);
-}
-
-/* Scans an icalcomponent for its properties so that we can provide
- * random-access to them.  It also builds a hash table of the component's alarm
- * subcomponents.
- */
-static void
-scan_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-	icalcompiter iter;
-
-	priv = comp->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	/* Scan properties */
-
-	for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (priv->icalcomp, ICAL_ANY_PROPERTY))
-		scan_property (comp, prop);
-
-	/* Scan subcomponents */
-
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *subcomp;
-
-		subcomp = icalcompiter_deref (&iter);
-		scan_alarm (comp, subcomp);
-	}
-}
-
-/* Ensures that the mandatory calendar component properties (uid, dtstamp) do
- * exist.  If they don't exist, it creates them automatically.
- */
-static void
-ensure_mandatory_properties (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-	g_assert (priv->icalcomp != NULL);
-
-	if (!priv->uid) {
-		char *uid;
-
-		uid = cal_component_gen_uid ();
-		priv->uid = icalproperty_new_uid (uid);
-		g_free (uid);
-
-		icalcomponent_add_property (priv->icalcomp, priv->uid);
-	}
-
-	if (!priv->dtstamp) {
-		time_t tim;
-		struct icaltimetype t;
-
-		tim = time (NULL);
-		t = icaltime_from_timet (tim, FALSE);
-
-		priv->dtstamp = icalproperty_new_dtstamp (t);
-		icalcomponent_add_property (priv->icalcomp, priv->dtstamp);
-	}
-}
-
-/**
- * cal_component_set_new_vtype:
- * @comp: A calendar component object.
- * @type: Type of calendar component to create.
- *
- * Clears any existing component data from a calendar component object and
- * creates a new #icalcomponent of the specified type for it.  The only property
- * that will be set in the new component will be its unique identifier.
- **/
-void
-cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-
-	if (type == CAL_COMPONENT_NO_TYPE)
-		return;
-
-	/* Figure out the kind and create the icalcomponent */
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		kind = ICAL_VEVENT_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		kind = ICAL_VTODO_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		kind = ICAL_VJOURNAL_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_FREEBUSY:
-		kind = ICAL_VFREEBUSY_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TIMEZONE:
-		kind = ICAL_VTIMEZONE_COMPONENT;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		kind = ICAL_NO_COMPONENT;
-	}
-
-	icalcomp = icalcomponent_new (kind);
-	if (!icalcomp) {
-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");
-		return;
-	}
-
-	/* Scan the component to build our mapping table */
-
-	priv->icalcomp = icalcomp;
-	scan_icalcomponent (comp);
-
-	/* Add missing stuff */
-
-	ensure_mandatory_properties (comp);
-}
-
-/**
- * cal_component_set_icalcomponent:
- * @comp: A calendar component object.
- * @icalcomp: An #icalcomponent.
- *
- * Sets the contents of a calendar component object from an #icalcomponent
- * structure.  If the @comp already had an #icalcomponent set into it, it will
- * will be freed automatically if the #icalcomponent does not have a parent
- * component itself.
- *
- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.
- *
- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component
- * type.
- **/
-gboolean
-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-
-	if (priv->icalcomp == icalcomp)
-		return TRUE;
-
-	free_icalcomponent (comp);
-
-	if (!icalcomp) {
-		priv->icalcomp = NULL;
-		return TRUE;
-	}
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT
-	      || kind == ICAL_VFREEBUSY_COMPONENT
-	      || kind == ICAL_VTIMEZONE_COMPONENT))
-		return FALSE;
-
-	priv->icalcomp = icalcomp;
-
-	scan_icalcomponent (comp);
-	ensure_mandatory_properties (comp);
-
-	return TRUE;
-}
-
-/**
- * cal_component_get_icalcomponent:
- * @comp: A calendar component object.
- *
- * Queries the #icalcomponent structure that a calendar component object is
- * wrapping.
- *
- * Return value: An #icalcomponent structure, or NULL if the @comp has no
- * #icalcomponent set to it.
- **/
-icalcomponent *
-cal_component_get_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	return priv->icalcomp;
-}
-
-/**
- * cal_component_get_vtype:
- * @comp: A calendar component object.
- *
- * Queries the type of a calendar component object.
- *
- * Return value: The type of the component, as defined by RFC 2445.
- **/
-CalComponentVType
-cal_component_get_vtype (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, CAL_COMPONENT_NO_TYPE);
-
-	kind = icalcomponent_isa (priv->icalcomp);
-	switch (kind) {
-	case ICAL_VEVENT_COMPONENT:
-		return CAL_COMPONENT_EVENT;
-
-	case ICAL_VTODO_COMPONENT:
-		return CAL_COMPONENT_TODO;
-
-	case ICAL_VJOURNAL_COMPONENT:
-		return CAL_COMPONENT_JOURNAL;
-
-	case ICAL_VFREEBUSY_COMPONENT:
-		return CAL_COMPONENT_FREEBUSY;
-
-	case ICAL_VTIMEZONE_COMPONENT:
-		return CAL_COMPONENT_TIMEZONE;
-
-	default:
-		/* We should have been loaded with a supported type! */
-		g_assert_not_reached ();
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/**
- * cal_component_get_as_string:
- * @comp: A calendar component.
- *
- * Gets the iCalendar string representation of a calendar component.  You should
- * call cal_component_commit_sequence() before this function to ensure that the
- * component's sequence number is consistent with the state of the object.
- *
- * Return value: String representation of the calendar component according to
- * RFC 2445.
- **/
-char *
-cal_component_get_as_string (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	char *str, *buf;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	/* Ensure that the user has committed the new SEQUENCE */
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	/* We dup the string; libical owns that memory */
-
-	str = icalcomponent_as_ical_string (priv->icalcomp);
-
-	if (str)
-		buf = g_strdup (str);
-	else
-		buf = NULL;
-
-	return buf;
-}
-
-/**
- * cal_component_commit_sequence:
- * @comp:
- *
- * Increments the sequence number property in a calendar component object if it
- * needs it.  This needs to be done when any of a number of properties listed in
- * RFC 2445 change values, such as the start and end dates of a component.
- *
- * This function must be called before calling cal_component_get_as_string() to
- * ensure that the component is fully consistent.
- **/
-void
-cal_component_commit_sequence (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->need_sequence_inc)
-		return;
-
-	if (priv->sequence) {
-		int seq;
-
-		seq = icalproperty_get_sequence (priv->sequence);
-		icalproperty_set_sequence (priv->sequence, seq + 1);
-	} else {
-		/* The component had no SEQUENCE property, so assume that the
-		 * default would have been zero.  Since it needed incrementing
-		 * anyways, we use a value of 1 here.
-		 */
-		priv->sequence = icalproperty_new_sequence (1);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/**
- * cal_component_get_uid:
- * @comp: A calendar component object.
- * @uid: Return value for the UID string.
- *
- * Queries the unique identifier of a calendar component object.
- **/
-void
-cal_component_get_uid (CalComponent *comp, const char **uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	*uid = icalproperty_get_uid (priv->uid);
-}
-
-/**
- * cal_component_set_uid:
- * @comp: A calendar component object.
- * @uid: Unique identifier.
- *
- * Sets the unique identifier string of a calendar component object.
- **/
-void
-cal_component_set_uid (CalComponent *comp, const char *uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	icalproperty_set_uid (priv->uid, (char *) uid);
-}
-
-/**
- * cal_component_get_categories:
- * @comp: A calendar component object. 
- * @categories: 
- * 
- * 
- **/
-void 
-cal_component_get_categories (CalComponent *comp, const char **categories)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (categories != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->categories)
-		*categories = icalproperty_get_categories (priv->categories);
-	else
-		*categories = NULL;
-}
-
-/**
- * cal_component_set_categories:
- * @comp: A calendar component object.
- * @categories: 
- * 
- * 
- **/
-void 
-cal_component_set_categories (CalComponent *comp, const char *categories)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!categories || !(*categories)) {
-		if (priv->categories) {
-			icalcomponent_remove_property (priv->icalcomp, priv->categories);
-			icalproperty_free (priv->categories);
-			priv->url = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->categories)
-		icalproperty_set_categories (priv->categories, (char *) categories);
-	else {
-		priv->categories = icalproperty_new_categories ((char *) categories);
-		icalcomponent_add_property (priv->icalcomp, priv->categories);
-	}
-}
-
-
-/**
- * cal_component_get_categories_list:
- * @comp: A calendar component object.
- * @categ_list: Return value for the list of strings, where each string is a
- * category.  This should be freed using cal_component_free_categories_list().
- *
- * Queries the list of categories of a calendar component object.  Each element
- * in the returned categ_list is a string with the corresponding category.
- **/
-void
-cal_component_get_categories_list (CalComponent *comp, GSList **categ_list)
-{
-	CalComponentPrivate *priv;
-	const char *categories;
-	const char *p;
-	const char *cat_start;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (categ_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->categories) {
-		*categ_list = NULL;
-		return;
-	}
-
-	categories = icalproperty_get_categories (priv->categories);
-	g_assert (categories != NULL);
-
-	cat_start = categories;
-	*categ_list = NULL;
-
-	for (p = categories; *p; p++)
-		if (*p == ',') {
-			str = g_strndup (cat_start, p - cat_start);
-			*categ_list = g_slist_prepend (*categ_list, str);
-
-			cat_start = p + 1;
-		}
-
-	str = g_strndup (cat_start, p - cat_start);
-	*categ_list = g_slist_prepend (*categ_list, str);
-
-	*categ_list = g_slist_reverse (*categ_list);
-}
-
-/* Creates a comma-delimited string of categories */
-static char *
-stringify_categories (GSList *categ_list)
-{
-	GString *s;
-	GSList *l;
-	char *str;
-
-	s = g_string_new (NULL);
-
-	for (l = categ_list; l; l = l->next) {
-		g_string_append (s, l->data);
-
-		if (l->next != NULL)
-			g_string_append (s, ",");
-	}
-
-	str = s->str;
-	g_string_free (s, FALSE);
-
-	return str;
-}
-
-/**
- * cal_component_set_categories_list:
- * @comp: A calendar component object.
- * @categ_list: List of strings, one for each category.
- *
- * Sets the list of categories of a calendar component object.
- **/
-void
-cal_component_set_categories_list (CalComponent *comp, GSList *categ_list)
-{
-	CalComponentPrivate *priv;
-	char *categories_str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!categ_list) {
-		if (priv->categories) {
-			icalcomponent_remove_property (priv->icalcomp, priv->categories);
-			icalproperty_free (priv->categories);
-		}
-		
-		return;
-	}
-
-	/* Create a single string of categories */
-	categories_str = stringify_categories (categ_list);
-
-	/* Set the categories */
-	priv->categories = icalproperty_new_categories (categories_str);
-	g_free (categories_str);
-
-	icalcomponent_add_property (priv->icalcomp, priv->categories);
-}
-
-/**
- * cal_component_get_classification:
- * @comp: A calendar component object.
- * @classif: Return value for the classification.
- *
- * Queries the classification of a calendar component object.  If the
- * classification property is not set on this component, this function returns
- * #CAL_COMPONENT_CLASS_NONE.
- **/
-void
-cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif)
-{
-	CalComponentPrivate *priv;
-	const char *class;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->classification) {
-		*classif = CAL_COMPONENT_CLASS_NONE;
-		return;
-	}
-
-	class = icalproperty_get_class (priv->classification);
-
-	if (strcasecmp (class, "PUBLIC") == 0)
-		*classif = CAL_COMPONENT_CLASS_PUBLIC;
-	else if (strcasecmp (class, "PRIVATE") == 0)
-		*classif = CAL_COMPONENT_CLASS_PRIVATE;
-	else if (strcasecmp (class, "CONFIDENTIAL") == 0)
-		*classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;
-	else
-		*classif = CAL_COMPONENT_CLASS_UNKNOWN;
-}
-
-/**
- * cal_component_set_classification:
- * @comp: A calendar component object.
- * @classif: Classification to use.
- *
- * Sets the classification property of a calendar component object.  To unset
- * the property, specify CAL_COMPONENT_CLASS_NONE for @classif.
- **/
-void
-cal_component_set_classification (CalComponent *comp, CalComponentClassification classif)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != CAL_COMPONENT_CLASS_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (classif == CAL_COMPONENT_CLASS_NONE) {
-		if (priv->classification) {
-			icalcomponent_remove_property (priv->icalcomp, priv->classification);
-			icalproperty_free (priv->classification);
-			priv->classification = NULL;
-		}
-
-		return;
-	}
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		str = "PUBLIC";
-		break;
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		str = "PRIVATE";
-		break;
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		str = "CONFIDENTIAL";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->classification)
-		icalproperty_set_class (priv->classification, str);
-	else {
-		priv->classification = icalproperty_new_class (str);
-		icalcomponent_add_property (priv->icalcomp, priv->classification);
-	}
-}
-
-/* Gets a text list value */
-static void
-get_text_list (GSList *text_list,
-	       const char *(* get_prop_func) (icalproperty *prop),
-	       GSList **tl)
-{
-	GSList *l;
-
-	*tl = NULL;
-
-	if (!text_list)
-		return;
-
-	for (l = text_list; l; l = l->next) {
-		struct text *text;
-		CalComponentText *t;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		t = g_new (CalComponentText, 1);
-		t->value = (* get_prop_func) (text->prop);
-
-		if (text->altrep_param)
-			t->altrep = icalparameter_get_altrep (text->altrep_param);
-		else
-			t->altrep = NULL;
-
-		*tl = g_slist_prepend (*tl, t);
-	}
-
-	*tl = g_slist_reverse (*tl);
-}
-
-/* Sets a text list value */
-static void
-set_text_list (CalComponent *comp,
-	       icalproperty *(* new_prop_func) (const char *value),
-	       GSList **text_list,
-	       GSList *tl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old texts */
-
-	for (l = *text_list; l; l = l->next) {
-		struct text *text;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, text->prop);
-		icalproperty_free (text->prop);
-		g_free (text);
-	}
-
-	g_slist_free (*text_list);
-	*text_list = NULL;
-
-	/* Add in new texts */
-
-	for (l = tl; l; l = l->next) {
-		CalComponentText *t;
-		struct text *text;
-
-		t = l->data;
-		g_return_if_fail (t->value != NULL);
-
-		text = g_new (struct text, 1);
-
-		text->prop = (* new_prop_func) ((char *) t->value);
-		icalcomponent_add_property (priv->icalcomp, text->prop);
-
-		if (t->altrep) {
-			text->altrep_param = icalparameter_new_altrep ((char *) t->altrep);
-			icalproperty_add_parameter (text->prop, text->altrep_param);
-		} else
-			text->altrep_param = NULL;
-
-		*text_list = g_slist_prepend (*text_list, text);
-	}
-
-	*text_list = g_slist_reverse (*text_list);
-}
-
-/**
- * cal_component_get_comment_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the comment properties and their parameters, as
- * a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText is returned.
- **/
-void
-cal_component_get_comment_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->comment_list, icalproperty_get_comment, text_list);
-}
-
-/**
- * cal_component_set_comment_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentText structures.
- *
- * Sets the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText structures is used.
- **/
-void
-cal_component_set_comment_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_comment, &priv->comment_list, text_list);
-}
-
-/* Gets a struct icaltimetype value */
-static void
-get_icaltimetype (icalproperty *prop,
-		  struct icaltimetype (* get_prop_func) (icalproperty *prop),
-		  struct icaltimetype **t)
-{
-	if (!prop) {
-		*t = NULL;
-		return;
-	}
-
-	*t = g_new (struct icaltimetype, 1);
-	**t = (* get_prop_func) (prop);
-}
-
-/* Sets a struct icaltimetype value */
-static void
-set_icaltimetype (CalComponent *comp, icalproperty **prop,
-		  icalproperty *(* prop_new_func) (struct icaltimetype v),
-		  void (* prop_set_func) (icalproperty *prop, struct icaltimetype v),
-		  struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!t) {
-		if (*prop) {
-			icalcomponent_remove_property (priv->icalcomp, *prop);
-			icalproperty_free (*prop);
-			*prop = NULL;
-		}
-
-		return;
-	}
-
-	if (*prop)
-		(* prop_set_func) (*prop, *t);
-	else {
-		*prop = (* prop_new_func) (*t);
-		icalcomponent_add_property (priv->icalcomp, *prop);
-	}
-}
-
-/**
- * cal_component_get_completed:
- * @comp: A calendar component object.
- * @t: Return value for the completion date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date at which a calendar compoment object was completed.
- **/
-void
-cal_component_get_completed (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->completed, icalproperty_get_completed, t);
-}
-
-/**
- * cal_component_set_completed:
- * @comp: A calendar component object.
- * @t: Value for the completion date.
- *
- * Sets the date at which a calendar component object was completed.
- **/
-void
-cal_component_set_completed (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->completed,
-			  icalproperty_new_completed,
-			  icalproperty_set_completed,
-			  t);
-}
-
-
-/**
- * cal_component_get_created:
- * @comp: A calendar component object.
- * @t: Return value for the creation date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date in which a calendar component object was created in the
- * calendar store.
- **/
-void
-cal_component_get_created (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->created, icalproperty_get_created, t);
-}
-
-/**
- * cal_component_set_created:
- * @comp: A calendar component object.
- * @t: Value for the creation date.
- *
- * Sets the date in which a calendar component object is created in the calendar
- * store.  This should only be used inside a calendar store application, i.e.
- * not by calendar user agents.
- **/
-void
-cal_component_set_created (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->created,
-			  icalproperty_new_created,
-			  icalproperty_set_created,
-			  t);
-}
-
-/**
- * cal_component_get_description_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the description properties and their parameters,
- * as a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the description of a calendar component object.  Journal components
- * may have more than one description, and as such this function returns a list
- * of #CalComponentText structures.  All other types of components can have at
- * most one description.
- **/
-void
-cal_component_get_description_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->description_list, icalproperty_get_description, text_list);
-}
-
-/**
- * cal_component_set_description_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentSummary structures.
- *
- * Sets the description of a calendar component object.  Journal components may
- * have more than one description, and as such this function takes in a list of
- * #CalComponentDescription structures.  All other types of components can have
- * at most one description.
- **/
-void
-cal_component_set_description_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_description, &priv->description_list, text_list);
-}
-
-/* Gets a date/time and timezone pair */
-static void
-get_datetime (struct datetime *datetime,
-	      struct icaltimetype (* get_prop_func) (icalproperty *prop),
-	      CalComponentDateTime *dt)
-{
-	if (datetime->prop) {
-		dt->value = g_new (struct icaltimetype, 1);
-		*dt->value = (* get_prop_func) (datetime->prop);
-	} else
-		dt->value = NULL;
-
-	if (datetime->tzid_param)
-		dt->tzid = icalparameter_get_tzid (datetime->tzid_param);
-	else
-		dt->tzid = NULL;
-}
-
-/* Sets a date/time and timezone pair */
-static void
-set_datetime (CalComponent *comp, struct datetime *datetime,
-	      icalproperty *(* prop_new_func) (struct icaltimetype v),
-	      void (* prop_set_func) (icalproperty * prop, struct icaltimetype v),
-	      CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!dt) {
-		if (datetime->prop) {
-			icalcomponent_remove_property (priv->icalcomp, datetime->prop);
-			icalproperty_free (datetime->prop);
-
-			datetime->prop = NULL;
-			datetime->tzid_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (dt->value != NULL);
-
-	if (datetime->prop)
-		(* prop_set_func) (datetime->prop, *dt->value);
-	else {
-		datetime->prop = (* prop_new_func) (*dt->value);
-		icalcomponent_add_property (priv->icalcomp, datetime->prop);
-	}
-
-	if (dt->tzid) {
-		g_assert (datetime->prop != NULL);
-
-		if (datetime->tzid_param)
-			icalparameter_set_tzid (datetime->tzid_param, (char *) dt->tzid);
-		else {
-			datetime->tzid_param = icalparameter_new_tzid ((char *) dt->tzid);
-			icalproperty_add_parameter (datetime->prop, datetime->tzid_param);
-		}
-	} else if (datetime->tzid_param) {
-		icalproperty_remove_parameter (datetime->prop, ICAL_TZID_PARAMETER);
-		icalparameter_free (datetime->tzid_param);
-		datetime->tzid_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_dtend:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time end.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time end of a calendar component object.
- **/
-void
-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtend, icalproperty_get_dtend, dt);
-}
-
-/**
- * cal_component_set_dtend:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the date/time end property of a calendar component object.
- **/
-void
-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtend,
-		      icalproperty_new_dtend,
-		      icalproperty_set_dtend,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_dtstamp:
- * @comp: A calendar component object.
- * @t: Return value for the date/timestamp.
- *
- * Queries the date/timestamp property of a calendar component object, which is
- * the last time at which the object was modified by a calendar user agent.
- **/
-void
-cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	*t = icalproperty_get_dtstamp (priv->dtstamp);
-}
-
-/**
- * cal_component_set_dtstamp:
- * @comp: A calendar component object.
- * @t: Date/timestamp value.
- *
- * Sets the date/timestamp of a calendar component object.  This should be
- * called whenever a calendar user agent makes a change to a component's
- * properties.
- **/
-void
-cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	icalproperty_set_dtstamp (priv->dtstamp, *t);
-}
-
-/**
- * cal_component_get_dtstart:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time start.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time start of a calendar component object.
- **/
-void
-cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtstart, icalproperty_get_dtstart, dt);
-}
-
-/**
- * cal_component_set_dtstart:
- * @comp: A calendar component object.
- * @dt: Start date/time.
- *
- * Sets the date/time start property of a calendar component object.
- **/
-void
-cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtstart,
-		      icalproperty_new_dtstart,
-		      icalproperty_set_dtstart,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_due:
- * @comp: A calendar component object.
- * @dt: Return value for the due date/time.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the due date/time of a calendar component object.
- **/
-void
-cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->due, icalproperty_get_due, dt);
-}
-
-/**
- * cal_component_set_due:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the due date/time property of a calendar component object.
- **/
-void
-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->due,
-		      icalproperty_new_due,
-		      icalproperty_set_due,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */
-static void
-get_period_list (GSList *period_list,
-		 struct icaldatetimeperiodtype (* get_prop_func) (icalproperty *prop),
-		 GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	if (!period_list)
-		return;
-
-	for (l = period_list; l; l = l->next) {
-		struct period *period;
-		CalComponentPeriod *p;
-		struct icaldatetimeperiodtype ip;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		p = g_new (CalComponentPeriod, 1);
-
-		/* Get value parameter */
-
-		if (period->value_param) {
-			icalparameter_value value_type;
-
-			value_type = icalparameter_get_value (period->value_param);
-
-			if (value_type == ICAL_VALUE_DATE || value_type == ICAL_VALUE_DATETIME)
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			else if (value_type == ICAL_VALUE_DURATION)
-				p->type = CAL_COMPONENT_PERIOD_DURATION;
-			else {
-				g_message ("get_period_list(): Unknown value for period %d; "
-					   "using DATETIME", value_type);
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			}
-		} else
-			p->type = CAL_COMPONENT_PERIOD_DATETIME;
-
-		/* Get start and end/duration */
-
-		ip = (* get_prop_func) (period->prop);
-
-		p->start = ip.period.start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME)
-			p->u.end = ip.period.end;
-		else if (p->type == CAL_COMPONENT_PERIOD_DURATION)
-			p->u.duration = ip.period.duration;
-		else
-			g_assert_not_reached ();
-
-		/* Put in list */
-
-		*list = g_slist_prepend (*list, p);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a period list value */
-static void
-set_period_list (CalComponent *comp,
-		 icalproperty *(* new_prop_func) (struct icaldatetimeperiodtype period),
-		 GSList **period_list,
-		 GSList *pl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old periods */
-
-	for (l = *period_list; l; l = l->next) {
-		struct period *period;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, period->prop);
-		icalproperty_free (period->prop);
-		g_free (period);
-	}
-
-	g_slist_free (*period_list);
-	*period_list = NULL;
-
-	/* Add in new periods */
-
-	for (l = pl; l; l = l->next) {
-		CalComponentPeriod *p;
-		struct period *period;
-		struct icaldatetimeperiodtype ip;
-		icalparameter_value value_type;
-
-		g_assert (l->data != NULL);
-		p = l->data;
-
-		/* Create libical value */
-
-		ip.period.start = p->start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-			value_type = ICAL_VALUE_DATETIME;
-			ip.period.end = p->u.end;
-		} else if (p->type == CAL_COMPONENT_PERIOD_DURATION) {
-			value_type = ICAL_VALUE_DURATION;
-			ip.period.duration = p->u.duration;
-		} else {
-			g_assert_not_reached ();
-			return;
-		}
-
-		/* Create property */
-
-		period = g_new (struct period, 1);
-
-		period->prop = (* new_prop_func) (ip);
-		period->value_param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (period->prop, period->value_param);
-
-		/* Add to list */
-
-		*period_list = g_slist_prepend (*period_list, period);
-	}
-
-	*period_list = g_slist_reverse (*period_list);
-}
-
-/**
- * cal_component_get_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: Return value for the list of exception dates, as a list of
- * #CalComponentDateTime structures.  This should be freed using the
- * cal_component_free_exdate_list() function.
- *
- * Queries the list of exception date properties in a calendar component object.
- **/
-void
-cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (exdate_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*exdate_list = NULL;
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		struct datetime *dt;
-		CalComponentDateTime *cdt;
-
-		dt = l->data;
-
-		cdt = g_new (CalComponentDateTime, 1);
-		cdt->value = g_new (struct icaltimetype, 1);
-
-		*cdt->value = icalproperty_get_exdate (dt->prop);
-
-		if (dt->tzid_param)
-			cdt->tzid = icalparameter_get_tzid (dt->tzid_param);
-		else
-			cdt->tzid = NULL;
-
-		*exdate_list = g_slist_prepend (*exdate_list, cdt);
-	}
-
-	*exdate_list = g_slist_reverse (*exdate_list);
-}
-
-/**
- * cal_component_set_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: List of #CalComponentDateTime structures.
- *
- * Sets the list of exception dates in a calendar component object.
- **/
-void
-cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* Remove old exception dates */
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		struct datetime *dt;
-
-		dt = l->data;
-
-		icalcomponent_remove_property (priv->icalcomp, dt->prop);
-		icalproperty_free (dt->prop);
-		g_free (dt);
-	}
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	/* Add in new exception dates */
-
-	for (l = exdate_list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-		struct datetime *dt;
-
-		g_assert (l->data != NULL);
-		cdt = l->data;
-
-		g_assert (cdt->value != NULL);
-
-		dt = g_new (struct datetime, 1);
-		dt->prop = icalproperty_new_exdate (*cdt->value);
-
-		if (cdt->tzid) {
-			dt->tzid_param = icalparameter_new_tzid ((char *) cdt->tzid);
-			icalproperty_add_parameter (dt->prop, dt->tzid_param);
-		} else
-			dt->tzid_param = NULL;
-
-		icalcomponent_add_property (priv->icalcomp, dt->prop);
-		priv->exdate_list = g_slist_prepend (priv->exdate_list, dt);
-	}
-
-	priv->exdate_list = g_slist_reverse (priv->exdate_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exdates:
- * @comp: A calendar component object.
- *
- * Queries whether a calendar component object has any exception dates defined
- * for it.
- *
- * Return value: TRUE if the component has exception dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exdate_list != NULL);
-}
-
-/* Gets a list of recurrence rules */
-static void
-get_recur_list (GSList *recur_list,
-		struct icalrecurrencetype (* get_prop_func) (icalproperty *prop),
-		GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	for (l = recur_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *r;
-
-		prop = l->data;
-
-		r = g_new (struct icalrecurrencetype, 1);
-		*r = (* get_prop_func) (prop);
-
-		*list = g_slist_prepend (*list, r);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a list of recurrence rules */
-static void
-set_recur_list (CalComponent *comp,
-		icalproperty *(* new_prop_func) (struct icalrecurrencetype recur),
-		GSList **recur_list,
-		GSList *rl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old recurrences */
-
-	for (l = *recur_list; l; l = l->next) {
-		icalproperty *prop;
-
-		prop = l->data;
-		icalcomponent_remove_property (priv->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (*recur_list);
-	*recur_list = NULL;
-
-	/* Add in new recurrences */
-
-	for (l = rl; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *recur;
-
-		g_assert (l->data != NULL);
-		recur = l->data;
-
-		prop = (* new_prop_func) (*recur);
-		icalcomponent_add_property (priv->icalcomp, prop);
-
-		*recur_list = g_slist_prepend (*recur_list, prop);
-	}
-
-	*recur_list = g_slist_reverse (*recur_list);
-}
-
-/**
- * cal_component_get_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of exception rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- *
- * Queries the list of exception rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->exrule_list, icalproperty_get_exrule, recur_list);
-}
-
-/**
- * cal_component_get_exrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of exception rule properties.
- *
- * Queries the list of exception rule properties of a calendar component object.
- **/
-void
-cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->exrule_list;
-}
-
-/**
- * cal_component_set_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- *
- * Sets the list of exception rules in a calendar component object.
- **/
-void
-cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_exrule, &priv->exrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exrules:
- * @comp: A calendar component object.
- *
- * Queries whether a calendar component object has any exception rules defined
- * for it.
- *
- * Return value: TRUE if the component has exception rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exrule_list != NULL);
-}
-
-/**
- * cal_component_has_exceptions:
- * @comp: A calendar component object
- *
- * Queries whether a calendar component object has any exception dates
- * or exception rules.
- *
- * Return value: TRUE if the component has exceptions, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exceptions (CalComponent *comp)
-{
-	return cal_component_has_exdates (comp) || cal_component_has_exrules (comp);
-}
-
-/**
- * cal_component_get_geo:
- * @comp: A calendar component object.
- * @geo: Return value for the geographic position property.  This should be
- * freed using the cal_component_free_geo() function.
- *
- * Sets the geographic position property of a calendar component object.
- **/
-void
-cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (geo != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->geo) {
-		*geo = g_new (struct icalgeotype, 1);
-		**geo = icalproperty_get_geo (priv->geo);
-	} else
-		*geo = NULL;
-}
-
-/**
- * cal_component_set_geo:
- * @comp: A calendar component object.
- * @geo: Value for the geographic position property.
- *
- * Sets the geographic position property on a calendar component object.
- **/
-void
-cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!geo) {
-		if (priv->geo) {
-			icalcomponent_remove_property (priv->icalcomp, priv->geo);
-			icalproperty_free (priv->geo);
-			priv->geo = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->geo)
-		icalproperty_set_geo (priv->geo, *geo);
-	else {
-		priv->geo = icalproperty_new_geo (*geo);
-		icalcomponent_add_property (priv->icalcomp, priv->geo);
-	}
-}
-
-/**
- * cal_component_get_last_modified:
- * @comp: A calendar component object.
- * @t: Return value for the last modified time value.
- *
- * Queries the time at which a calendar component object was last modified in
- * the calendar store.
- **/
-void
-cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->last_modified, icalproperty_get_lastmodified, t);
-}
-
-/**
- * cal_component_set_last_modified:
- * @comp: A calendar component object.
- * @t: Value for the last time modified.
- *
- * Sets the time at which a calendar component object was last stored in the
- * calendar store.  This should not be called by plain calendar user agents.
- **/
-void
-cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->last_modified,
-			  icalproperty_new_lastmodified,
-			  icalproperty_set_lastmodified,
-			  t);
-}
-
-/**
- * cal_component_get_percent:
- * @comp: A calendar component object.
- * @percent: Return value for the percent-complete property.  This should be
- * freed using the cal_component_free_percent() function.
- *
- * Queries the percent-complete property of a calendar component object.
- **/
-void
-cal_component_get_percent (CalComponent *comp, int **percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (percent != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->percent) {
-		*percent = g_new (int, 1);
-		**percent = icalproperty_get_percentcomplete (priv->percent);
-	} else
-		*percent = NULL;
-}
-
-/**
- * cal_component_set_percent:
- * @comp: A calendar component object.
- * @percent: Value for the percent-complete property.
- *
- * Sets the percent-complete property of a calendar component object.
- **/
-void
-cal_component_set_percent (CalComponent *comp, int *percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!percent) {
-		if (priv->percent) {
-			icalcomponent_remove_property (priv->icalcomp, priv->percent);
-			icalproperty_free (priv->percent);
-			priv->percent = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*percent >= 0 && *percent <= 100);
-
-	if (priv->percent)
-		icalproperty_set_percentcomplete (priv->percent, *percent);
-	else {
-		priv->percent = icalproperty_new_percentcomplete (*percent);
-		icalcomponent_add_property (priv->icalcomp, priv->percent);
-	}
-}
-
-/**
- * cal_component_get_priority:
- * @comp: A calendar component object.
- * @priority: Return value for the priority property.  This should be freed using
- * the cal_component_free_priority() function.
- *
- * Queries the priority property of a calendar component object.
- **/
-void
-cal_component_get_priority (CalComponent *comp, int **priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (priority != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->priority) {
-		*priority = g_new (int, 1);
-		**priority = icalproperty_get_priority (priv->priority);
-	} else
-		*priority = NULL;
-}
-
-/**
- * cal_component_set_priority:
- * @comp: A calendar component object.
- * @priority: Value for the priority property.
- *
- * Sets the priority property of a calendar component object.
- **/
-void
-cal_component_set_priority (CalComponent *comp, int *priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priority) {
-		if (priv->priority) {
-			icalcomponent_remove_property (priv->icalcomp, priv->priority);
-			icalproperty_free (priv->priority);
-			priv->priority = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*priority >= 0 && *priority <= 9);
-
-	if (priv->priority)
-		icalproperty_set_priority (priv->priority, *priority);
-	else {
-		priv->priority = icalproperty_new_priority (*priority);
-		icalcomponent_add_property (priv->icalcomp, priv->priority);
-	}
-}
-
-/**
- * cal_component_get_rdate_list:
- * @comp: A calendar component object.
- * @period_list: Return value for the list of recurrence dates, as a list of
- * #CalComponentPeriod structures.  This should be freed using the
- * cal_component_free_period_list() function.
- *
- * Queries the list of recurrence date properties in a calendar component
- * object.
- **/
-void
-cal_component_get_rdate_list (CalComponent *comp, GSList **period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (period_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_period_list (priv->rdate_list, icalproperty_get_rdate, period_list);
-}
-
-/**
- * cal_component_set_rdate_list:
- * @comp: A calendar component object.
- * @period_list: List of #CalComponentPeriod structures.
- *
- * Sets the list of recurrence dates in a calendar component object.
- **/
-void
-cal_component_set_rdate_list (CalComponent *comp, GSList *period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_period_list (comp, icalproperty_new_rdate, &priv->rdate_list, period_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rdates:
- * @comp: A calendar component object.
- *
- * Queries whether a calendar component object has any recurrence dates defined
- * for it.
- *
- * Return value: TRUE if the component has recurrence dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rdate_list != NULL);
-}
-
-/**
- * cal_component_get_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of recurrence rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- *
- * Queries the list of recurrence rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->rrule_list, icalproperty_get_rrule, recur_list);
-}
-
-/**
- * cal_component_get_rrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of recurrence rule properties.
- *
- * Queries a list of recurrence rule properties of a calendar component object.
- **/
-void
-cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->rrule_list;
-}
-
-/**
- * cal_component_set_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- *
- * Sets the list of recurrence rules in a calendar component object.
- **/
-void
-cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_rrule, &priv->rrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rrules:
- * @comp: A calendar component object.
- *
- * Queries whether a calendar component object has any recurrence rules defined
- * for it.
- *
- * Return value: TRUE if the component has recurrence rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rrule_list != NULL);
-}
-
-/**
- * cal_component_has_recurrences:
- * @comp: A calendar component object
- *
- * Queries whether a calendar component object has any recurrence dates or
- * recurrence rules.
- *
- * Return value: TRUE if the component has recurrences, FALSE otherwise.
- **/
-gboolean
-cal_component_has_recurrences (CalComponent *comp)
-{
-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);
-}
-
-/**
- * cal_component_get_sequence:
- * @comp: A calendar component object.
- * @sequence: Return value for the sequence number.  This should be freed using
- * cal_component_free_sequence().
- *
- * Queries the sequence number of a calendar component object.
- **/
-void
-cal_component_get_sequence (CalComponent *comp, int **sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (sequence != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->sequence) {
-		*sequence = NULL;
-		return;
-	}
-
-	*sequence = g_new (int, 1);
-	**sequence = icalproperty_get_sequence (priv->sequence);
-}
-
-/**
- * cal_component_set_sequence:
- * @comp: A calendar component object.
- * @sequence: Sequence number value.
- *
- * Sets the sequence number of a calendar component object.  Normally this
- * function should not be called, since the sequence number is incremented
- * automatically at the proper times.
- **/
-void
-cal_component_set_sequence (CalComponent *comp, int *sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = FALSE;
-
-	if (!sequence) {
-		if (priv->sequence) {
-			icalcomponent_remove_property (priv->icalcomp, priv->sequence);
-			icalproperty_free (priv->sequence);
-			priv->sequence = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->sequence)
-		icalproperty_set_sequence (priv->sequence, *sequence);
-	else {
-		priv->sequence = icalproperty_new_sequence (*sequence);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-}
-
-/**
- * cal_component_get_status:
- * @comp: A calendar component object.
- * @status: Return value for the status value.  It is set to #ICAL_STATUS_NONE
- * if the component has no status property.
- *
- * Queries the status property of a calendar component object.
- **/
-void
-cal_component_get_status (CalComponent *comp, icalproperty_status *status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (status != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->status) {
-		*status = ICAL_STATUS_NONE;
-		return;
-	}
-
-	*status = icalproperty_get_status (priv->status);
-}
-
-/**
- * cal_component_set_status:
- * @comp: A calendar component object.
- * @status: Status value.  You should use #ICAL_STATUS_NONE if you want to unset
- * this property.
- *
- * Sets the status property of a calendar component object.
- **/
-void
-cal_component_set_status (CalComponent *comp, icalproperty_status status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = TRUE;
-
-	if (status == ICAL_STATUS_NONE) {
-		if (priv->status) {
-			icalcomponent_remove_property (priv->icalcomp, priv->status);
-			icalproperty_free (priv->status);
-			priv->status = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->status) {
-		icalproperty_set_status (priv->status, status);
-	} else {
-		priv->status = icalproperty_new_status (status);
-		icalcomponent_add_property (priv->icalcomp, priv->status);
-	}
-}
-
-/**
- * cal_component_get_summary:
- * @comp: A calendar component object.
- * @summary: Return value for the summary property and its parameters.
- *
- * Queries the summary of a calendar component object.
- **/
-void
-cal_component_get_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (summary != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->summary.prop)
-		summary->value = icalproperty_get_summary (priv->summary.prop);
-	else
-		summary->value = NULL;
-
-	if (priv->summary.altrep_param)
-		summary->altrep = icalparameter_get_altrep (priv->summary.altrep_param);
-	else
-		summary->altrep = NULL;
-}
-
-/**
- * cal_component_set_summary:
- * @comp: A calendar component object.
- * @summary: Summary property and its parameters.
- *
- * Sets the summary of a calendar component object.
- **/
-void
-cal_component_set_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!summary) {
-		if (priv->summary.prop) {
-			icalcomponent_remove_property (priv->icalcomp, priv->summary.prop);
-			icalproperty_free (priv->summary.prop);
-
-			priv->summary.prop = NULL;
-			priv->summary.altrep_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (summary->value != NULL);
-
-	if (priv->summary.prop)
-		icalproperty_set_summary (priv->summary.prop, (char *) summary->value);
-	else {
-		priv->summary.prop = icalproperty_new_summary ((char *) summary->value);
-		icalcomponent_add_property (priv->icalcomp, priv->summary.prop);
-	}
-
-	if (summary->altrep) {
-		g_assert (priv->summary.prop != NULL);
-
-		if (priv->summary.altrep_param)
-			icalparameter_set_altrep (priv->summary.altrep_param,
-						  (char *) summary->altrep);
-		else {
-			priv->summary.altrep_param = icalparameter_new_altrep (
-				(char *) summary->altrep);
-			icalproperty_add_parameter (priv->summary.prop,
-						    priv->summary.altrep_param);
-		}
-	} else if (priv->summary.altrep_param) {
-		icalproperty_remove_parameter (priv->summary.prop, ICAL_ALTREP_PARAMETER);
-		icalparameter_free (priv->summary.altrep_param);
-		priv->summary.altrep_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_transparency:
- * @comp: A calendar component object.
- * @transp: Return value for the time transparency.
- *
- * Queries the time transparency of a calendar component object.
- **/
-void
-cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp)
-{
-	CalComponentPrivate *priv;
-	const char *val;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->transparency) {
-		*transp = CAL_COMPONENT_TRANSP_NONE;
-		return;
-	}
-
-	val = icalproperty_get_transp (priv->transparency);
-
-	if (strcasecmp (val, "TRANSPARENT"))
-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else if (strcasecmp (val, "OPAQUE"))
-		*transp = CAL_COMPONENT_TRANSP_OPAQUE;
-	else
-		*transp = CAL_COMPONENT_TRANSP_UNKNOWN;
-}
-
-/**
- * cal_component_set_transparency:
- * @comp: A calendar component object.
- * @transp: Time transparency value.
- *
- * Sets the time transparency of a calendar component object.
- **/
-void
-cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != CAL_COMPONENT_TRANSP_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-
-	if (transp == CAL_COMPONENT_TRANSP_NONE) {
-		if (priv->transparency) {
-			icalcomponent_remove_property (priv->icalcomp, priv->transparency);
-			icalproperty_free (priv->transparency);
-			priv->transparency = NULL;
-		}
-
-		return;
-	}
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		str = "TRANSPARENT";
-		break;
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		str = "OPAQUE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->transparency)
-		icalproperty_set_transp (priv->transparency, str);
-	else {
-		priv->transparency = icalproperty_new_transp (str);
-		icalcomponent_add_property (priv->icalcomp, priv->transparency);
-	}
-}
-
-/**
- * cal_component_get_url:
- * @comp: A calendar component object.
- * @url: Return value for the URL.
- *
- * Queries the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_get_url (CalComponent *comp, const char **url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (url != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->url)
-		*url = icalproperty_get_url (priv->url);
-	else
-		*url = NULL;
-}
-
-/**
- * cal_component_set_url:
- * @comp: A calendar component object.
- * @url: URL value.
- *
- * Sets the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_set_url (CalComponent *comp, const char *url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!url || !(*url)) {
-		if (priv->url) {
-			icalcomponent_remove_property (priv->icalcomp, priv->url);
-			icalproperty_free (priv->url);
-			priv->url = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->url)
-		icalproperty_set_url (priv->url, (char *) url);
-	else {
-		priv->url = icalproperty_new_url ((char *) url);
-		icalcomponent_add_property (priv->icalcomp, priv->url);
-	}
-}
-
-
-
-/**
- * cal_component_free_categories_list:
- * @categ_list: List of category strings.
- *
- * Frees a list of category strings.
- **/
-void
-cal_component_free_categories_list (GSList *categ_list)
-{
-	GSList *l;
-
-	for (l = categ_list; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (categ_list);
-}
-
-/**
- * cal_component_free_datetime:
- * @dt: A date/time structure.
- *
- * Frees a date/time structure.
- **/
-void
-cal_component_free_datetime (CalComponentDateTime *dt)
-{
-	g_return_if_fail (dt != NULL);
-
-	if (dt->value)
-		g_free (dt->value);
-}
-
-/**
- * cal_component_free_exdate_list:
- * @exdate_list: List of #CalComponentDateTime structures.
- *
- * Frees a list of #CalComponentDateTime structures as returned by the
- * cal_component_get_exdate_list() function.
- **/
-void
-cal_component_free_exdate_list (GSList *exdate_list)
-{
-	GSList *l;
-
-	for (l = exdate_list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-
-		g_assert (l->data != NULL);
-		cdt = l->data;
-
-		g_assert (cdt->value != NULL);
-		g_free (cdt->value);
-
-		g_free (cdt);
-	}
-
-	g_slist_free (exdate_list);
-}
-
-/**
- * cal_component_free_geo:
- * @geo: An #icalgeotype structure.
- *
- * Frees a struct #icalgeotype structure as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_geo (struct icalgeotype *geo)
-{
-	g_return_if_fail (geo != NULL);
-
-	g_free (geo);
-}
-
-/**
- * cal_component_free_icaltimetype:
- * @t: An #icaltimetype structure.
- *
- * Frees a struct #icaltimetype value as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_icaltimetype (struct icaltimetype *t)
-{
-	g_return_if_fail (t != NULL);
-
-	g_free (t);
-}
-
-/**
- * cal_component_free_percent:
- * @percent: Percent value.
- *
- * Frees a percent value as returned by the cal_component_get_percent()
- * function.
- **/
-void
-cal_component_free_percent (int *percent)
-{
-	g_return_if_fail (percent != NULL);
-
-	g_free (percent);
-}
-
-/**
- * cal_component_free_priority:
- * @priority: Priority value.
- *
- * Frees a priority value as returned by the cal_component_get_priority()
- * function.
- **/
-void
-cal_component_free_priority (int *priority)
-{
-	g_return_if_fail (priority != NULL);
-
-	g_free (priority);
-}
-
-/**
- * cal_component_free_period_list:
- * @period_list: List of #CalComponentPeriod structures.
- *
- * Frees a list of #CalComponentPeriod structures.
- **/
-void
-cal_component_free_period_list (GSList *period_list)
-{
-	GSList *l;
-
-	for (l = period_list; l; l = l->next) {
-		CalComponentPeriod *period;
-
-		g_assert (l->data != NULL);
-
-		period = l->data;
-		g_free (period);
-	}
-
-	g_slist_free (period_list);
-}
-
-/**
- * cal_component_free_recur_list:
- * @recur_list: List of struct #icalrecurrencetype structures.
- *
- * Frees a list of struct #icalrecurrencetype structures.
- **/
-void
-cal_component_free_recur_list (GSList *recur_list)
-{
-	GSList *l;
-
-	for (l = recur_list; l; l = l->next) {
-		struct icalrecurrencetype *r;
-
-		g_assert (l->data != NULL);
-		r = l->data;
-
-		g_free (r);
-	}
-
-	g_slist_free (recur_list);
-}
-
-/**
- * cal_component_free_sequence:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_sequence (int *sequence)
-{
-	g_return_if_fail (sequence != NULL);
-
-	g_free (sequence);
-}
-
-/**
- * cal_component_free_text_list:
- * @text_list: List of #CalComponentText structures.
- *
- * Frees a list of #CalComponentText structures.  This function should only be
- * used to free lists of text values as returned by the other getter functions
- * of #CalComponent.
- **/
-void
-cal_component_free_text_list (GSList *text_list)
-{
-	GSList *l;
-
-	for (l = text_list; l; l = l->next) {
-		CalComponentText *text;
-
-		g_assert (l->data != NULL);
-
-		text = l->data;
-		g_return_if_fail (text != NULL);
-		g_free (text);
-	}
-
-	g_slist_free (text_list);
-}
-
-
-
-/**
- * cal_component_has_alarms:
- * @comp: A calendar component object.
- *
- * Checks whether the component has any alarms.
- *
- * Return value: TRUE if the component has any alarms.
- **/
-gboolean
-cal_component_has_alarms (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return g_hash_table_size (priv->alarm_uid_hash) != 0;
-}
-
-void 
-cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm)
-{
-	CalComponentPrivate *priv;
-	
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (alarm != NULL);
-	
-	priv = comp->priv;
-	
-	alarm->parent = comp;
-	add_alarm (comp, alarm->icalcomp, icalproperty_get_x (alarm->uid));
-	icalcomponent_add_component (priv->icalcomp, alarm->icalcomp);
-}
-
-void 
-cal_component_remove_alarm (CalComponent *comp, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcompiter iter;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (auid != NULL);
-
-	priv = comp->priv;
-
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalproperty *prop;
-		icalcomponent *subcomp;
-
-		subcomp = icalcompiter_deref (&iter);
-		for (prop = icalcomponent_get_first_property (subcomp, ICAL_X_PROPERTY);
-		     prop;
-		     prop = icalcomponent_get_next_property (subcomp, ICAL_X_PROPERTY)) {
-			const char *xname;
-			const char *alarm_uid;
-			
-			xname = icalproperty_get_x_name (prop);
-			g_assert (xname != NULL);
-
-			if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {
-				alarm_uid = alarm_uid_from_prop (prop);
-				if (strcmp (alarm_uid, auid) == 0) {
-					remove_alarm (comp, auid);
-					icalcomponent_remove_component (priv->icalcomp, subcomp);
-					icalcomponent_free (subcomp);
-					break;
-				}
-				
-				return;
-			}
-		}
-	}
-}
-
-
-/* Scans an icalproperty from a calendar component and adds its mapping to our
- * own alarm structure.
- */
-static void
-scan_alarm_property (CalComponentAlarm *alarm, icalproperty *prop)
-{
-	icalproperty_kind kind;
-	const char *xname;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_ACTION_PROPERTY:
-		alarm->action = prop;
-		break;
-
-	case ICAL_TRIGGER_PROPERTY:
-		alarm->trigger = prop;
-		break;
-
-	case ICAL_X_PROPERTY:
-		xname = icalproperty_get_x_name (prop);
-		g_assert (xname != NULL);
-
-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)
-			alarm->uid = prop;
-
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Creates a CalComponentAlarm from a libical alarm subcomponent */
-static CalComponentAlarm *
-make_alarm (CalComponent *comp, icalcomponent *subcomp)
-{
-	CalComponentAlarm *alarm;
-	icalproperty *prop;
-
-	alarm = g_new (CalComponentAlarm, 1);
-
-	alarm->parent = comp;
-	alarm->icalcomp = subcomp;
-	alarm->uid = NULL;
-
-	for (prop = icalcomponent_get_first_property (subcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (subcomp, ICAL_ANY_PROPERTY))
-		scan_alarm_property (alarm, prop);
-
-	g_assert (alarm->uid != NULL);
-
-	return alarm;
-}
-
-/* Used from g_hash_table_foreach(); adds an alarm UID to a list */
-static void
-add_alarm_uid (gpointer key, gpointer value, gpointer data)
-{
-	const char *auid;
-	GList **l;
-
-	auid = key;
-	l = data;
-
-	*l = g_list_prepend (*l, g_strdup (auid));
-}
-
-/**
- * cal_component_get_alarm_uids:
- * @comp: A calendar component.
- * 
- * Builds a list of the unique identifiers of the alarm subcomponents inside a
- * calendar component.
- * 
- * Return value: List of unique identifiers for alarms.  This should be freed
- * using cal_obj_uid_list_free().
- **/
-GList *
-cal_component_get_alarm_uids (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	GList *l;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	l = NULL;
-	g_hash_table_foreach (priv->alarm_uid_hash, add_alarm_uid, &l);
-
-	return l;
-}
-
-/**
- * cal_component_get_alarm:
- * @comp: A calendar component.
- * @auid: Unique identifier for the sought alarm subcomponent.
- * 
- * Queries a particular alarm subcomponent of a calendar component.
- * 
- * Return value: The alarm subcomponent that corresponds to the specified @auid,
- * or #NULL if no alarm exists with that UID.  This should be freed using
- * cal_component_alarm_free().
- **/
-CalComponentAlarm *
-cal_component_get_alarm (CalComponent *comp, const char *auid)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *alarm;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (auid != NULL, NULL);
-
-	alarm = g_hash_table_lookup (priv->alarm_uid_hash, auid);
-
-	if (alarm)
-		return make_alarm (comp, alarm);
-	else
-		return NULL;
-}
-
-void 
-cal_component_free_alarm_uids (GList *alarm_uids)
-{
-	g_list_foreach (alarm_uids, (GFunc)g_free, NULL);
-}
-
-/**
- * cal_component_alarms_free:
- * @alarms: Component alarms structure.
- * 
- * Frees a #CalComponentAlarms structure.
- **/
-void
-cal_component_alarms_free (CalComponentAlarms *alarms)
-{
-	GSList *l;
-
-	g_return_if_fail (alarms != NULL);
-
-	g_assert (alarms->comp != NULL);
-	gtk_object_unref (GTK_OBJECT (alarms->comp));
-
-	for (l = alarms->alarms; l; l = l->next) {
-		CalAlarmInstance *instance;
-
-		instance = l->data;
-		g_assert (instance != NULL);
-		g_free (instance);
-	}
-
-	g_slist_free (alarms->alarms);
-	g_free (alarms);
-}
-
-/**
- * cal_component_alarm_new:
-  * 
- * 
- * 
- * Return value: a new alarm component
- **/
-CalComponentAlarm *
-cal_component_alarm_new (void)
-{
-	CalComponentAlarm *alarm = g_new0 (CalComponentAlarm, 1);
-	char *new_auid ;
-
-	alarm->icalcomp = icalcomponent_new (ICAL_VALARM_COMPONENT);
-
-	new_auid = cal_component_gen_uid ();
-	alarm->uid = icalproperty_new_x (new_auid);
-	icalproperty_set_x_name (alarm->uid, EVOLUTION_ALARM_UID_PROPERTY);
-	icalcomponent_add_property (alarm->icalcomp, alarm->uid);
-	g_free (new_auid);
-	
-	return alarm;
-}
-
-/**
- * cal_component_alarm_get_uid:
- * @alarm: An alarm subcomponent.
- * 
- * Queries the unique identifier of an alarm subcomponent.
- * 
- * Return value: UID of the alarm.
- **/
-const char *
-cal_component_alarm_get_uid (CalComponentAlarm *alarm)
-{
-	g_return_val_if_fail (alarm != NULL, NULL);
-
-	return alarm_uid_from_prop (alarm->uid);
-}
-
-/**
- * cal_component_alarm_get_action:
- * @alarm: An alarm.
- * @action: Return value for the alarm's action type.
- *
- * Queries the action type of an alarm.
- **/
-void
-cal_component_alarm_get_action (CalComponentAlarm *alarm, CalAlarmAction *action)
-{
-	const char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->action) {
-		*action = CAL_ALARM_NONE;
-		return;
-	}
-
-	str = icalproperty_get_action (alarm->action);
-
-	if (strcasecmp (str, "AUDIO") == 0)
-		*action = CAL_ALARM_AUDIO;
-	else if (strcasecmp (str, "DISPLAY") == 0)
-		*action = CAL_ALARM_DISPLAY;
-	else if (strcasecmp (str, "EMAIL") == 0)
-		*action = CAL_ALARM_EMAIL;
-	else if (strcasecmp (str, "PROCEDURE") == 0)
-		*action = CAL_ALARM_PROCEDURE;
-	else
-		*action = CAL_ALARM_UNKNOWN;
-}
-
-/**
- * cal_component_alarm_set_action:
- * @alarm: An alarm.
- * @action: Action type.
- *
- * Sets the action type for an alarm.
- **/
-void
-cal_component_alarm_set_action (CalComponentAlarm *alarm, CalAlarmAction action)
-{
-	char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != CAL_ALARM_NONE);
-	g_return_if_fail (action != CAL_ALARM_UNKNOWN);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	switch (action) {
-	case CAL_ALARM_AUDIO:
-		str = "AUDIO";
-		break;
-
-	case CAL_ALARM_DISPLAY:
-		str = "DISPLAY";
-		break;
-
-	case CAL_ALARM_EMAIL:
-		str = "EMAIL";
-		break;
-
-	case CAL_ALARM_PROCEDURE:
-		str = "PROCEDURE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (alarm->action)
-		icalproperty_set_action (alarm->action, str);
-	else {
-		alarm->action = icalproperty_new_action (str);
-		icalcomponent_add_property (alarm->icalcomp, alarm->action);
-	}
-}
-
-/**
- * cal_component_alarm_get_trigger:
- * @alarm: An alarm.
- * @trigger: Return value for the trigger time.
- *
- * Queries the trigger time for an alarm.
- **/
-void
-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger)
-{
-	icalparameter *param;
-	struct icaltriggertype t;
-	gboolean relative;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->trigger) {
-		trigger->type = CAL_ALARM_TRIGGER_NONE;
-		return;
-	}
-
-	/* Get trigger type */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-	if (param) {
-		icalparameter_value value;
-
-		value = icalparameter_get_value (param);
-
-		switch (value) {
-		case ICAL_VALUE_DURATION:
-			relative = TRUE;
-			break;
-
-		case ICAL_VALUE_DATETIME:
-			relative = FALSE;
-			break;
-
-		default:
-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "
-				   "value %d; using RELATIVE", value);
-
-			relative = TRUE;
-			break;
-		}
-	} else
-		relative = TRUE;
-
-	/* Get trigger value and the RELATED parameter */
-
-	t = icalproperty_get_trigger (alarm->trigger);
-
-	if (relative) {
-		trigger->u.rel_duration = t.duration;
-
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-		if (param) {
-			icalparameter_related rel;
-
-			rel = icalparameter_get_related (param);
-
-			switch (rel) {
-			case ICAL_RELATED_START:
-				trigger->type = CAL_ALARM_TRIGGER_RELATIVE_START;
-				break;
-
-			case ICAL_RELATED_END:
-				trigger->type = CAL_ALARM_TRIGGER_RELATIVE_END;
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		} else
-			trigger->type = CAL_ALARM_TRIGGER_RELATIVE_START;
-	} else {
-		trigger->u.abs_time = t.time;
-		trigger->type = CAL_ALARM_TRIGGER_ABSOLUTE;
-	}
-}
-
-/**
- * cal_component_alarm_set_trigger:
- * @alarm: An alarm.
- * @trigger: Trigger time structure.
- *
- * Sets the trigger time of an alarm.
- **/
-void
-cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger trigger)
-{
-	struct icaltriggertype t;
-	icalparameter *param;
-	icalparameter_value value_type;
-	icalparameter_related related;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger.type != CAL_ALARM_TRIGGER_NONE);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	/* Delete old trigger */
-
-	if (alarm->trigger) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->trigger);
-		icalproperty_free (alarm->trigger);
-		alarm->trigger = NULL;
-	}
-
-	/* Set the value */
-
-	related = ICAL_RELATED_START; /* Keep GCC happy */
-
-	t.time = icaltime_null_time ();
-	t.duration = icaldurationtype_null_duration ();
-	switch (trigger.type) {
-	case CAL_ALARM_TRIGGER_RELATIVE_START:
-		t.duration = trigger.u.rel_duration;
-		t.time.is_date = -1;
-		value_type = ICAL_DURATION_VALUE;
-		related = ICAL_RELATED_START;
-		break;
-
-	case CAL_ALARM_TRIGGER_RELATIVE_END:
-		t.duration = trigger.u.rel_duration;
-		t.time.is_date = -1;
-		value_type = ICAL_DURATION_VALUE;
-		related = ICAL_RELATED_END;
-		break;
-
-	case CAL_ALARM_TRIGGER_ABSOLUTE:
-		t.time = trigger.u.abs_time;
-		value_type = ICAL_DATETIME_VALUE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	alarm->trigger = icalproperty_new_trigger (t);
-	icalcomponent_add_property (alarm->icalcomp, alarm->trigger);
-
-	/* Value parameters */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-	if (param)
-		icalparameter_set_value (param, value_type);
-	else {
-		param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (alarm->trigger, param);
-	}
-
-	/* Related parameter */
-
-	if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE) {
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-
-		if (param)
-			icalparameter_set_related (param, related);
-		else {
-			param = icalparameter_new_related (related);
-			icalproperty_add_parameter (alarm->trigger, param);
-		}
-	}
-}
-
-/**
- * cal_component_alarm_free:
- * @alarm: A calendar alarm.
- *
- * Frees an alarm structure.
- **/
-void
-cal_component_alarm_free (CalComponentAlarm *alarm)
-{
-	g_return_if_fail (alarm != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (icalcomponent_get_parent (alarm->icalcomp) != NULL)
-		icalcomponent_free (alarm->icalcomp);
-
-	alarm->icalcomp = NULL;
-
-	alarm->parent = NULL;
-	alarm->action = NULL;
-
-	g_free (alarm);
-}
-
-
-/* Returns TRUE if both strings match, i.e. they are both NULL or the
-   strings are equal. */
-static gboolean
-cal_component_strings_match	(const gchar	*string1,
-				 const gchar	*string2)
-{
-	if (string1 == NULL || string2 == NULL)
-		return (string1 == string2) ? TRUE : FALSE;
-
-	if (!strcmp (string1, string2))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-/**
- * cal_component_event_dates_match:
- * @comp1: A calendar component object.
- * @comp2: A calendar component object.
- *
- * Checks if the DTSTART and DTEND properties of the 2 components match.
- * Note that the events may have different recurrence properties which are not
- * taken into account here.
- *
- * Returns: TRUE if the DTSTART and DTEND properties of the 2 components match.
- **/
-gboolean
-cal_component_event_dates_match	(CalComponent *comp1,
-				 CalComponent *comp2)
-{
-	CalComponentDateTime comp1_dtstart, comp1_dtend;
-	CalComponentDateTime comp2_dtstart, comp2_dtend;
-
-	cal_component_get_dtstart (comp1, &comp1_dtstart);
-	cal_component_get_dtend   (comp1, &comp1_dtend);
-	cal_component_get_dtstart (comp2, &comp2_dtstart);
-	cal_component_get_dtend   (comp2, &comp2_dtend);
-
-	/* If either value is NULL they must both be NULL to match. */
-	if (comp1_dtstart.value == NULL || comp2_dtstart.value == NULL) {
-		if (comp1_dtstart.value != comp2_dtstart.value)
-			return FALSE;
-	} else {
-		if (icaltime_compare (*comp1_dtstart.value,
-				      *comp2_dtstart.value))
-			return FALSE;
-	}
-
-	if (comp1_dtend.value == NULL || comp2_dtend.value == NULL) {
-		if (comp1_dtend.value != comp2_dtend.value)
-			return FALSE;
-	} else {
-		if (icaltime_compare (*comp1_dtend.value,
-				      *comp2_dtend.value))
-			return FALSE;
-	}
-
-	/* Now check the timezones. */
-	if (!cal_component_strings_match (comp1_dtstart.tzid,
-					  comp2_dtstart.tzid))
-		return FALSE;
-
-	if (!cal_component_strings_match (comp1_dtend.tzid,
-					  comp2_dtend.tzid))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
deleted file mode 100644
index b912c04e9e..0000000000
--- a/calendar/cal-util/cal-component.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMPONENT_H
-#define CAL_COMPONENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <ical.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-
-/* Types of calendar components to be stored by a CalComponent, as per RFC 2445.
- * We don't put the alarm component type here since we store alarms as separate
- * structures inside the other "real" components.
- */
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-
-/* Field identifiers for a calendar component; these are used by the data model
- * for ETable.
- */
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-
-/* Structures and enumerations to return properties and their parameters */
-
-/* CLASSIFICATION property */
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-
-/* Properties that have time and timezone information */
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-
-/* Way in which a period of time is specified */
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-
-/* Period of time, can have explicit start/end times or start/duration instead */
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-
-/* Text properties */
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-
-/* Time transparency */
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-
-/* Main calendar component object */
-
-typedef struct _CalComponent CalComponent;
-typedef struct _CalComponentClass CalComponentClass;
-
-typedef struct _CalComponentPrivate CalComponentPrivate;
-
-struct _CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-
-struct _CalComponentClass {
-	GtkObjectClass parent_class;
-};
-
-/* Calendar component */
-
-GtkType cal_component_get_type (void);
-
-char *cal_component_gen_uid (void);
-
-CalComponent *cal_component_new (void);
-
-CalComponent *cal_component_clone (CalComponent *comp);
-
-void cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type);
-
-gboolean cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp);
-icalcomponent *cal_component_get_icalcomponent (CalComponent *comp);
-
-CalComponentVType cal_component_get_vtype (CalComponent *comp);
-
-char *cal_component_get_as_string (CalComponent *comp);
-
-void cal_component_commit_sequence (CalComponent *comp);
-
-void cal_component_get_uid (CalComponent *comp, const char **uid);
-void cal_component_set_uid (CalComponent *comp, const char *uid);
-
-void cal_component_get_categories (CalComponent *comp, const char **categories);
-void cal_component_set_categories (CalComponent *comp, const char *categories);
-void cal_component_get_categories_list (CalComponent *comp, GSList **categ_list);
-void cal_component_set_categories_list (CalComponent *comp, GSList *categ_list);
-
-void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif);
-void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif);
-
-void cal_component_get_comment_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_comment_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_completed (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_completed (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_created (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_created (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_description_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_description_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t);
-void cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list);
-void cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list);
-gboolean cal_component_has_exdates (CalComponent *comp);
-
-void cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_exrules (CalComponent *comp);
-
-gboolean cal_component_has_exceptions (CalComponent *comp);
-
-void cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo);
-void cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo);
-
-void cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_percent (CalComponent *comp, int **percent);
-void cal_component_set_percent (CalComponent *comp, int *percent);
-
-void cal_component_get_priority (CalComponent *comp, int **priority);
-void cal_component_set_priority (CalComponent *comp, int *priority);
-
-void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);
-void cal_component_set_rdate_list (CalComponent *comp, GSList *period_list);
-gboolean cal_component_has_rdates (CalComponent *comp);
-
-void cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_rrules (CalComponent *comp);
-
-gboolean cal_component_has_recurrences (CalComponent *comp);
-
-void cal_component_get_sequence (CalComponent *comp, int **sequence);
-void cal_component_set_sequence (CalComponent *comp, int *sequence);
-
-void cal_component_get_status (CalComponent *comp, icalproperty_status *status);
-void cal_component_set_status (CalComponent *comp, icalproperty_status status);
-
-void cal_component_get_summary (CalComponent *comp, CalComponentText *summary);
-void cal_component_set_summary (CalComponent *comp, CalComponentText *summary);
-
-void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp);
-void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp);
-
-void cal_component_get_url (CalComponent *comp, const char **url);
-void cal_component_set_url (CalComponent *comp, const char *url);
-
-gboolean cal_component_event_dates_match (CalComponent *comp1, CalComponent *comp2);
-
-/* Functions to free returned values */
-
-void cal_component_free_categories_list (GSList *categ_list);
-void cal_component_free_datetime (CalComponentDateTime *dt);
-void cal_component_free_exdate_list (GSList *exdate_list);
-void cal_component_free_geo (struct icalgeotype *geo);
-void cal_component_free_icaltimetype (struct icaltimetype *t);
-void cal_component_free_percent (int *percent);
-void cal_component_free_priority (int *priority);
-void cal_component_free_period_list (GSList *period_list);
-void cal_component_free_recur_list (GSList *recur_list);
-void cal_component_free_sequence (int *sequence);
-void cal_component_free_text_list (GSList *text_list);
-
-/* Alarms */
-
-/* Opaque structure used to represent alarm subcomponents */
-typedef struct _CalComponentAlarm CalComponentAlarm;
-
-/* An alarm occurrence, i.e. a trigger instance */
-typedef struct {
-	/* UID of the alarm that triggered */
-	const char *auid;
-
-	/* Trigger time, i.e. "5 minutes before the appointment" */
-	time_t trigger;
-
-	/* Actual event occurrence to which this trigger corresponds */
-	time_t occur;
-} CalAlarmInstance;
-
-/* Alarm trigger instances for a particular component */
-typedef struct {
-	/* The actual component */
-	CalComponent *comp;
-
-	/* List of CalAlarmInstance structures */
-	GSList *alarms;
-} CalComponentAlarms;
-
-/* Alarm types */
-typedef enum {
-	CAL_ALARM_NONE,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_EMAIL,
-	CAL_ALARM_PROCEDURE,
-	CAL_ALARM_UNKNOWN
-} CalAlarmAction;
-
-/* Whether a trigger is relative to the start or end of an event occurrence, or
- * whether it is specified to occur at an absolute time.
- */
-typedef enum {
-	CAL_ALARM_TRIGGER_NONE,
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	CAL_ALARM_TRIGGER_ABSOLUTE
-} CalAlarmTriggerType;
-
-typedef struct {
-	CalAlarmTriggerType type;
-
-	union {
-		struct icaldurationtype rel_duration;
-		struct icaltimetype abs_time;
-	} u;
-} CalAlarmTrigger;
-
-gboolean cal_component_has_alarms (CalComponent *comp);
-void cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm);
-void cal_component_remove_alarm (CalComponent *comp, const char *auid);
-
-GList *cal_component_get_alarm_uids (CalComponent *comp);
-CalComponentAlarm *cal_component_get_alarm (CalComponent *comp, const char *auid);
-void cal_component_free_alarm_uids (GList *alarm_uids);
-
-void cal_component_alarms_free (CalComponentAlarms *alarms);
-
-/* CalComponentAlarms */
-CalComponentAlarm *cal_component_alarm_new (void);
-
-const char *cal_component_alarm_get_uid (CalComponentAlarm *alarm);
-
-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalAlarmAction *action);
-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalAlarmAction action);
-
-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger);
-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger trigger);
-
-void cal_component_alarm_free (CalComponentAlarm *alarm);
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
deleted file mode 100644
index 0b4f114484..0000000000
--- a/calendar/cal-util/cal-recur.c
+++ /dev/null
@@ -1,3758 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/timeutil.h>
-
-
-/*
- * Introduction to The Recurrence Generation Functions:
- *
- * Note: This is pretty complicated. See the iCalendar spec (RFC 2445) for
- *       the specification of the recurrence rules and lots of examples
- *	 (sections 4.3.10 & 4.8.5). We also want to support the older
- *	 vCalendar spec, though this should be easy since it is basically a
- *	 subset of iCalendar.
- *
- * o An iCalendar event can have any number of recurrence rules specifying
- *   occurrences of the event, as well as dates & times of specific
- *   occurrences. It can also have any number of recurrence rules and
- *   specific dates & times specifying exceptions to the occurrences.
- *   So we first merge all the occurrences generated, eliminating any
- *   duplicates, then we generate all the exceptions and remove these to
- *   form the final set of occurrences.
- *
- * o There are 7 frequencies of occurrences: YEARLY, MONTHLY, WEEKLY, DAILY,
- *   HOURLY, MINUTELY & SECONDLY. The 'interval' property specifies the
- *   multiples of the frequency which we step by. We generate a 'set' of
- *   occurrences for each period defined by the frequency & interval.
- *   So for a YEARLY frequency with an interval of 3, we generate a set of
- *   occurrences for every 3rd year. We use complete years here -  any
- *   generated occurrences that occur before the event's start (or after its
- *   end) are just discarded.
- *
- * o There are 8 frequency modifiers: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY,
- *   BYDAY, BYHOUR, BYMINUTE & BYSECOND. These can either add extra occurrences
- *   or filter out occurrences. For example 'FREQ=YEARLY;BYMONTH=1,2' produces
- *   2 occurrences for each year rather than the default 1. And
- *   'FREQ=DAILY;BYMONTH=1' filters out all occurrences except those in Jan.
- *   If the modifier works on periods which are less than the recurrence
- *   frequency, then extra occurrences are added, otherwise occurrences are
- *   filtered. So we have 2 functions for each modifier - one to expand events
- *   and the other to filter. We use a table of functions for each frequency
- *   which points to the appropriate function to use for each modifier.
- *
- * o Any number of frequency modifiers can be used in a recurrence rule.
- *   (Though the iCalendar spec says that BYWEEKNO can only be used in a YEARLY
- *   rule, and some modifiers aren't appropriate for some frequencies - e.g.
- *   BYMONTHDAY is not really useful in a WEEKLY frequency, and BYYEARDAY is
- *   not useful in a MONTHLY or WEEKLY frequency).
- *   The frequency modifiers are applied in the order given above. The first 5
- *   modifier rules (BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY & BYDAY) all
- *   produce the days on which the occurrences take place, and so we have to
- *   compute some of these in parallel rather than sequentially, or we may end
- *   up with too many days.
- *
- * o Note that some expansion functions may produce days which are invalid,
- *   e.g. 31st September, 30th Feb. These invalid days are removed before the
- *   BYHOUR, BYMINUTE & BYSECOND modifier functions are applied.
- *
- * o After the set of occurrences for the frequency interval are generated,
- *   the BYSETPOS property is used to select which of the occurrences are
- *   finally output. If BYSETPOS is not specified then all the occurrences are
- *   output.
- */
-
-/* Define this for some debugging output. */
-#if 0
-#define CAL_OBJ_DEBUG	1
-#endif
-
-/* We will use icalrecurrencetype instead of this eventually. */
-typedef struct {
-	icalrecurrencetype_frequency freq;
-
-	int            interval;
-
-	/* Specifies the end of the recurrence. No occurrences are generated
-	   after this date. If it is 0, the event recurs forever. */
-	time_t         enddate;
-
-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
-	gint	       week_start_day;
-
-
-	/* NOTE: I've used GList's here, but it doesn't matter if we use
-	   other data structures like arrays. The code should be easy to
-	   change. So long as it is easy to see if the modifier is set. */
-
-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */
-	GList	      *bymonth;
-
-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */
-	GList	      *byweekno;
-
-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */
-	GList	      *byyearday;
-
-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */
-	GList	      *bymonthday;
-
-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
-	   The second of each pair is the week number [+-]0-53. */
-	GList	      *byday;
-
-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
-	GList	      *byhour;
-
-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */
-	GList	      *byminute;
-
-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */
-	GList	      *bysecond;
-
-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */
-	GList	      *bysetpos;
-} CalRecurrence;
-
-/* This is what we use to pass to all the filter functions. */
-typedef struct _RecurData RecurData;
-struct _RecurData {
-	CalRecurrence *recur;
-
-	/* This is used for the WEEKLY frequency. It is the offset from the
-	   week_start_day. */
-	gint weekday_offset;
-
-	/* This is used for fast lookup in BYMONTH filtering. */
-	guint8 months[12];
-
-	/* This is used for fast lookup in BYYEARDAY filtering. */
-	guint8 yeardays[367], neg_yeardays[367]; /* Days are 1 - 366. */
-
-	/* This is used for fast lookup in BYMONTHDAY filtering. */
-	guint8 monthdays[32], neg_monthdays[32]; /* Days are 1 to 31. */
-
-	/* This is used for fast lookup in BYDAY filtering. */
-	guint8 weekdays[7];
-
-	/* This is used for fast lookup in BYHOUR filtering. */
-	guint8 hours[24];
-
-	/* This is used for fast lookup in BYMINUTE filtering. */
-	guint8 minutes[60];
-
-	/* This is used for fast lookup in BYSECOND filtering. */
-	guint8 seconds[62];
-};
-
-/* This is what we use to represent a date & time. */
-typedef struct _CalObjTime CalObjTime;
-struct _CalObjTime {
-	guint16 year;
-	guint8 month;		/* 0 - 11 */
-	guint8 day;		/* 1 - 31 */
-	guint8 hour;		/* 0 - 23 */
-	guint8 minute;		/* 0 - 59 */
-	guint8 second;		/* 0 - 59 (maybe up to 61 for leap seconds) */
-	guint8 is_rdate;	/* TRUE if this is an RDATE, which may have an
-				   end or duration set. */
-};
-
-/* This is what we use to represent specific recurrence dates.
-   Note that we assume it starts with a CalObjTime when sorting. */
-typedef struct _CalObjRecurrenceDate CalObjRecurrenceDate;
-struct _CalObjRecurrenceDate {
-	CalObjTime start;
-	CalComponentPeriod *period;
-};
-
-/* The paramter we use to store the enddate in RRULE and EXRULE properties. */
-#define EVOLUTION_END_DATE_PARAMETER	"X-EVOLUTION-ENDDATE"
-
-typedef gboolean (*CalObjFindStartFn) (CalObjTime *event_start,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_start,
-				       CalObjTime *interval_end,
-				       CalObjTime *cotime);
-typedef gboolean (*CalObjFindNextFn)  (CalObjTime *cotime,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_end);
-typedef GArray*	 (*CalObjFilterFn)    (RecurData  *recur_data,
-				       GArray     *occs);
-
-typedef struct _CalRecurVTable CalRecurVTable;
-struct _CalRecurVTable {
-	CalObjFindStartFn find_start_position;
-	CalObjFindNextFn find_next_position;
-
-	CalObjFilterFn bymonth_filter;
-	CalObjFilterFn byweekno_filter;
-	CalObjFilterFn byyearday_filter;
-	CalObjFilterFn bymonthday_filter;
-	CalObjFilterFn byday_filter;
-	CalObjFilterFn byhour_filter;
-	CalObjFilterFn byminute_filter;
-	CalObjFilterFn bysecond_filter;
-};
-
-
-/* This is used to specify which parts of the CalObjTime to compare in
-   cal_obj_time_compare(). */
-typedef enum {
-	CALOBJ_YEAR,
-	CALOBJ_MONTH,
-	CALOBJ_DAY,
-	CALOBJ_HOUR,
-	CALOBJ_MINUTE,
-	CALOBJ_SECOND
-} CalObjTimeComparison;
-
-static void cal_recur_generate_instances_of_rule (CalComponent	*comp,
-						  icalproperty	*prop,
-						  time_t	 start,
-						  time_t	 end,
-						  CalRecurInstanceFn cb,
-						  gpointer       cb_data);
-
-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,
-						    gboolean exception);
-static gint cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);
-static void	cal_recur_free			(CalRecurrence	*r);
-
-
-static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,
-						 GArray		*rdate_periods);
-static void	cal_object_compute_duration	(CalObjTime	*start,
-						 CalObjTime	*end,
-						 gint		*days,
-						 gint		*seconds);
-
-static gboolean generate_instances_for_chunk	(CalComponent		*comp,
-						 time_t			 comp_dtstart,
-						 GSList			*rrules,
-						 GSList			*rdates,
-						 GSList			*exrules,
-						 GSList			*exdates,
-						 gboolean		 single_rule,
-						 CalObjTime		*event_start,
-						 time_t			 interval_start,
-						 CalObjTime		*chunk_start,
-						 CalObjTime		*chunk_end,
-						 gint			 duration_days,
-						 gint			 duration_seconds,
-						 CalRecurInstanceFn	 cb,
-						 gpointer		 cb_data);
-
-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,
-						 CalRecurrence	  *recur,
-						 CalObjTime	  *interval_start,
-						 CalObjTime	  *interval_end,
-						 gboolean	  *finished);
-
-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_monthly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-
-
-static CalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);
-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,
-						 CalRecurrence	*recur,
-						 CalObjTime	*event_start);
-static void	cal_obj_sort_occurrences	(GArray		*occs);
-static gint	cal_obj_time_compare_func	(const void	*arg1,
-						 const void	*arg2);
-static void	cal_obj_remove_duplicates_and_invalid_dates (GArray	*occs);
-static void	cal_obj_remove_exceptions	(GArray		*occs,
-						 GArray		*ex_occs);
-static GArray*	cal_obj_bysetpos_filter		(CalRecurrence	*recur,
-						 GArray		*occs);
-
-
-static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_yearly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_monthly_find_start_position (CalObjTime *event_start,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_start,
-						     CalObjTime *interval_end,
-						     CalObjTime *cotime);
-static gboolean cal_obj_monthly_find_next_position  (CalObjTime *cotime,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_end);
-
-static gboolean cal_obj_weekly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_weekly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_daily_find_start_position  (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_daily_find_next_position   (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_hourly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_hourly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_minutely_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_minutely_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static gboolean cal_obj_secondly_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_secondly_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static GArray* cal_obj_bymonth_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonth_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byweekno_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-#if 0
-/* This isn't used at present. */
-static GArray* cal_obj_byweekno_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-#endif
-static GArray* cal_obj_byyearday_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byyearday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_expand	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_filter	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-
-static void cal_obj_time_add_months		(CalObjTime *cotime,
-						 gint	     months);
-static void cal_obj_time_add_days		(CalObjTime *cotime,
-						 gint	     days);
-static void cal_obj_time_add_hours		(CalObjTime *cotime,
-						 gint	     hours);
-static void cal_obj_time_add_minutes		(CalObjTime *cotime,
-						 gint	     minutes);
-static void cal_obj_time_add_seconds		(CalObjTime *cotime,
-						 gint	     seconds);
-static gint cal_obj_time_compare		(CalObjTime *cotime1,
-						 CalObjTime *cotime2,
-						 CalObjTimeComparison type);
-static gint cal_obj_time_weekday		(CalObjTime *cotime);
-static gint cal_obj_time_weekday_offset		(CalObjTime *cotime,
-						 CalRecurrence *recur);
-static gint cal_obj_time_day_of_year		(CalObjTime *cotime);
-static void cal_obj_time_find_first_week	(CalObjTime *cotime,
-						 RecurData  *recur_data);
-static void cal_object_time_from_time		(CalObjTime *cotime,
-						 time_t      t);
-#if 0
-static gint cal_obj_date_only_compare_func (const void *arg1,
-					    const void *arg2);
-#endif
-
-
-
-static gboolean cal_recur_ensure_end_dates	(CalComponent	*comp,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,
-						 icalproperty	*prop,
-						 gboolean	 exception,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-							 time_t		 instance_start,
-							 time_t		 instance_end,
-							 gpointer	 data);
-static time_t cal_recur_get_rule_end_date	(icalproperty	*prop);
-static void cal_recur_set_rule_end_date		(icalproperty	*prop,
-						 time_t		 end_date);
-
-
-#ifdef CAL_OBJ_DEBUG
-static char* cal_obj_time_to_string		(CalObjTime	*cotime);
-#endif
-
-
-CalRecurVTable cal_obj_yearly_vtable = {
-	cal_obj_yearly_find_start_position,
-	cal_obj_yearly_find_next_position,
-
-	cal_obj_bymonth_expand,
-	cal_obj_byweekno_expand,
-	cal_obj_byyearday_expand,
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_yearly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_monthly_vtable = {
-	cal_obj_monthly_find_start_position,
-	cal_obj_monthly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a MONTHLY frequency. */
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_monthly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_weekly_vtable = {
-	cal_obj_weekly_find_start_position,
-	cal_obj_weekly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a WEEKLY frequency. */
-	NULL, /* BYMONTHDAY is not useful in a WEEKLY frequency. */
-	cal_obj_byday_expand_weekly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_daily_vtable = {
-	cal_obj_daily_find_start_position,
-	cal_obj_daily_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_hourly_vtable = {
-	cal_obj_hourly_find_start_position,
-	cal_obj_hourly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_minutely_vtable = {
-	cal_obj_minutely_find_start_position,
-	cal_obj_minutely_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_secondly_vtable = {
-	cal_obj_secondly_find_start_position,
-	cal_obj_secondly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_filter
-};
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void
-cal_recur_generate_instances (CalComponent		*comp,
-			      time_t			 start,
-			      time_t			 end,
-			      CalRecurInstanceFn	 cb,
-			      gpointer                   cb_data)
-{
-#if 0
-	g_print ("In cal_recur_generate_instances comp: %p\n", comp);
-	g_print ("  start: %li - %s", start, ctime (&start));
-	g_print ("  end  : %li - %s", end, ctime (&end));
-#endif
-	cal_recur_generate_instances_of_rule (comp, NULL, start, end,
-					      cb, cb_data);
-}
-
-
-/*
- * Calls the given callback function for each occurrence of the given
- * recurrence rule between the given start and end times. If the rule is NULL
- * it uses all the rules from the component.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * The use of the specific rule is for determining the end of a rule when
- * COUNT is set. The callback will count instances and store the enddate
- * when COUNT is reached.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-static void
-cal_recur_generate_instances_of_rule (CalComponent	 *comp,
-				      icalproperty	 *prop,
-				      time_t		  start,
-				      time_t		  end,
-				      CalRecurInstanceFn  cb,
-				      gpointer            cb_data)
-{
-	CalComponentDateTime dtstart, dtend;
-	time_t dtstart_time, dtend_time;
-	GSList *rrules = NULL, *rdates = NULL, elem;
-	GSList *exrules = NULL, *exdates = NULL;
-	CalObjTime interval_start, interval_end, event_start, event_end;
-	CalObjTime chunk_start, chunk_end;
-	gint days, seconds, year;
-	gboolean single_rule;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (cb != NULL);
-	g_return_if_fail (start >= -1);
-	g_return_if_fail (end >= -1);
-
-	/* Get dtstart, dtend, recurrences, and exceptions */
-
-	cal_component_get_dtstart (comp, &dtstart);
-	cal_component_get_dtend (comp, &dtend);
-
-	if (!dtstart.value) {
-		g_message ("cal_recur_generate_instances_of_rule(): bogus "
-			   "component, does not have DTSTART.  Skipping...");
-		goto out;
-	}
-
-	dtstart_time = icaltime_as_timet (*dtstart.value);
-	if (start == -1)
-		start = dtstart_time;
-
-	/* FIXME: DURATION could be used instead, couldn't it? - Damon */
-	if (dtend.value)
-		dtend_time = icaltime_as_timet (*dtend.value);
-	else
-		dtend_time = time_day_end (dtstart_time);
-
-	/* If there is no recurrence, just call the callback if the event
-	   intersects the given interval. */
-	if (!(cal_component_has_recurrences (comp)
-	      || cal_component_has_exceptions (comp))) {
-		if ((end == -1 || dtstart_time < end) && dtend_time > start) {
-			(* cb) (comp, dtstart_time, dtend_time, cb_data);
-		}
-
-		goto out;
-	}
-
-	/* If a specific recurrence rule is being used, set up a simple list,
-	   else get the recurrence rules from the component. */
-	if (prop) {
-		single_rule = TRUE;
-
-		elem.data = prop;
-		elem.next = NULL;
-		rrules = &elem;
-	} else {
-		single_rule = FALSE;
-
-		/* Make sure all the enddates for the rules are set. */
-		cal_recur_ensure_end_dates (comp, FALSE);
-
-		cal_component_get_rrule_property_list (comp, &rrules);
-		cal_component_get_rdate_list (comp, &rdates);
-		cal_component_get_exrule_property_list (comp, &exrules);
-		cal_component_get_exdate_list (comp, &exdates);
-	}
-
-	/* Convert the interval start & end to CalObjTime. Note that if end
-	   is -1 interval_end won't be set, so don't use it!
-	   Also note that we use end - 1 since we want the interval to be
-	   inclusive as it makes the code simpler. */
-	cal_object_time_from_time (&interval_start, start);
-	if (end != -1)
-		cal_object_time_from_time (&interval_end, end - 1);
-
-	cal_object_time_from_time (&event_start, dtstart_time);
-	cal_object_time_from_time (&event_end, dtend_time);
-	
-	/* Calculate the duration of the event, which we use for all
-	   occurrences. We can't just subtract start from end since that may
-	   be affected by daylight-saving time. So we want a value of days
-	   + seconds. */
-	cal_object_compute_duration (&event_start, &event_end,
-				     &days, &seconds);
-
-	/* Take off the duration from interval_start, so we get occurrences
-	   that start just before the start time but overlap it. But only do
-	   that if the interval is after the event's start time. */
-	if (start > dtstart_time) {
-		cal_obj_time_add_days (&interval_start, -days);
-		cal_obj_time_add_seconds (&interval_start, -seconds);
-	}
-
-	/* Expand the recurrence for each year between start & end, or until
-	   the callback returns 0 if end is 0. We do a year at a time to
-	   give the callback function a chance to break out of the loop, and
-	   so we don't get into problems with infinite recurrences. Since we
-	   have to work on complete sets of occurrences, if there is a yearly
-	   frequency it wouldn't make sense to break it into smaller chunks,
-	   since we would then be calculating the same sets several times.
-	   Though this does mean that we sometimes do a lot more work than
-	   is necessary, e.g. if COUNT is set to something quite low. */
-	for (year = interval_start.year;
-	     end == -1 || year <= interval_end.year;
-	     year++) {
-		chunk_start = interval_start;
-		chunk_start.year = year;
-		if (end != -1)
-			chunk_end = interval_end;
-		chunk_end.year = year;
-
-		if (year != interval_start.year) {
-			chunk_start.month  = 0;
-			chunk_start.day    = 1;
-			chunk_start.hour   = 0;
-			chunk_start.minute = 0;
-			chunk_start.second = 0;
-		}
-		if (end == -1 || year != interval_end.year) {
-			chunk_end.month  = 11;
-			chunk_end.day    = 31;
-			chunk_end.hour   = 23;
-			chunk_end.minute = 59;
-			chunk_end.second = 61;
-			chunk_end.is_rdate = FALSE;
-		}
-
-		if (!generate_instances_for_chunk (comp, dtstart_time,
-						   rrules, rdates,
-						   exrules, exdates,
-						   single_rule,
-						   &event_start,
-						   start,
-						   &chunk_start, &chunk_end,
-						   days, seconds,
-						   cb, cb_data))
-			break;
-	}
-
-	if (!prop) {
-		cal_component_free_period_list (rdates);
-		cal_component_free_exdate_list (exdates);
-	}
-
- out:
-	cal_component_free_datetime (&dtstart);
-	cal_component_free_datetime (&dtend);
-}
-
-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a
- * struct icalrecurrencetype.
- */
-static GList *
-array_to_list (short *array, int max_elements)
-{
-	GList *l;
-	int i;
-
-	l = NULL;
-
-	for (i = 0; i < max_elements && array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)
-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));
-	return g_list_reverse (l);
-}
-
-/**
- * cal_recur_from_icalproperty:
- * @ir: An RRULE or EXRULE #icalproperty.
- * 
- * Converts an #icalproperty to a #CalRecurrence.  This should be
- * freed using the cal_recur_free() function.
- * 
- * Return value: #CalRecurrence structure.
- **/
-static CalRecurrence *
-cal_recur_from_icalproperty (icalproperty *prop, gboolean exception)
-{
-	struct icalrecurrencetype ir;
-	CalRecurrence *r;
-	gint max_elements, i;
-
-	g_return_val_if_fail (prop != NULL, NULL);
-
-	r = g_new (CalRecurrence, 1);
-
-	if (exception)
-		ir = icalproperty_get_exrule (prop);
-	else
-		ir = icalproperty_get_rrule (prop);
-
-	r->freq = ir.freq;
-	r->interval = ir.interval;
-
-	if (ir.count != 0) {
-		r->enddate = cal_recur_get_rule_end_date (prop);
-	} else {
-		/* FIXME: icaltime_as_timet() seems to return -1 if UNTIL isn't
-		   set, but a simpler test would be better. */
-		r->enddate = icaltime_as_timet (ir.until);
-		if (r->enddate == -1)
-			r->enddate = 0;
-		else if (ir.until.is_date)
-			/* FIXME: Decide what to do here. */
-			r->enddate = time_add_day (r->enddate, 1) - 1;
-	}
-
-	r->week_start_day = cal_recur_ical_weekday_to_weekday (ir.week_start);
-
-	r->bymonth = array_to_list (ir.by_month,
-				    sizeof (ir.by_month) / sizeof (ir.by_month[0]));
-
-	r->byweekno = array_to_list (ir.by_week_no,
-				     sizeof (ir.by_week_no) / sizeof (ir.by_week_no[0]));
-
-	r->byyearday = array_to_list (ir.by_year_day,
-				      sizeof (ir.by_year_day) / sizeof (ir.by_year_day[0]));
-
-	r->bymonthday = array_to_list (ir.by_month_day,
-				       sizeof (ir.by_month_day) / sizeof (ir.by_month_day[0]));
-
-	/* FIXME: libical only supports 8 values, out of possible 107 * 7. */
-	r->byday = NULL;
-	max_elements = sizeof (ir.by_day) / sizeof (ir.by_day[0]);
-	for (i = 0; i < max_elements && ir.by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-		enum icalrecurrencetype_weekday day;
-		gint weeknum, weekday;
-
-		day = icalrecurrencetype_day_day_of_week (ir.by_day[i]);
-		weeknum = icalrecurrencetype_day_position (ir.by_day[i]);
-
-		weekday = cal_recur_ical_weekday_to_weekday (day);
-
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weeknum));
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weekday));
-	}
-
-	r->byhour = array_to_list (ir.by_hour,
-				   sizeof (ir.by_hour) / sizeof (ir.by_hour[0]));
-
-	r->byminute = array_to_list (ir.by_minute,
-				     sizeof (ir.by_minute) / sizeof (ir.by_minute[0]));
-
-	r->bysecond = array_to_list (ir.by_second,
-				     sizeof (ir.by_second) / sizeof (ir.by_second[0]));
-
-	r->bysetpos = array_to_list (ir.by_set_pos,
-				     sizeof (ir.by_set_pos) / sizeof (ir.by_set_pos[0]));
-
-	return r;
-}
-
-
-static gint
-cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)
-{
-	gint weekday;
-
-	switch (day) {
-	case ICAL_NO_WEEKDAY:		/* Monday is the default in RFC2445. */
-	case ICAL_MONDAY_WEEKDAY:
-		weekday = 0;
-		break;
-	case ICAL_TUESDAY_WEEKDAY:
-		weekday = 1;
-		break;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		weekday = 2;
-		break;
-	case ICAL_THURSDAY_WEEKDAY:
-		weekday = 3;
-		break;
-	case ICAL_FRIDAY_WEEKDAY:
-		weekday = 4;
-		break;
-	case ICAL_SATURDAY_WEEKDAY:
-		weekday = 5;
-		break;
-	case ICAL_SUNDAY_WEEKDAY:
-		weekday = 6;
-		break;
-	default:
-		g_warning ("cal_recur_ical_weekday_to_weekday(): Unknown week day %d",
-			   day);
-		weekday = 0;
-	}
-
-	return weekday;
-}
-
-
-/**
- * cal_recur_free:
- * @r: A #CalRecurrence structure.
- * 
- * Frees a #CalRecurrence structure.
- **/
-static void
-cal_recur_free (CalRecurrence *r)
-{
-	g_return_if_fail (r != NULL);
-
-	g_list_free (r->bymonth);
-	g_list_free (r->byweekno);
-	g_list_free (r->byyearday);
-	g_list_free (r->bymonthday);
-	g_list_free (r->byday);
-	g_list_free (r->byhour);
-	g_list_free (r->byminute);
-	g_list_free (r->bysecond);
-	g_list_free (r->bysetpos);
-
-	g_free (r);
-}
-
-/* Generates one year's worth of recurrence instances.  Returns TRUE if all the
- * callback invocations returned TRUE, or FALSE when any one of them returns
- * FALSE, i.e. meaning that the instance generation should be stopped.
- *
- * This should only output instances whose start time is between chunk_start
- * and chunk_end (inclusive), or we may generate duplicates when we do the next
- * chunk. (This applies mainly to weekly recurrences, since weeks can span 2
- * years.)
- *
- * It should also only output instances that are on or after the event's
- * DTSTART property and that intersect the required interval, between
- * interval_start and interval_end.
- */
-static gboolean
-generate_instances_for_chunk (CalComponent	*comp,
-			      time_t             comp_dtstart,
-			      GSList		*rrules,
-			      GSList		*rdates,
-			      GSList		*exrules,
-			      GSList		*exdates,
-			      gboolean		 single_rule,
-			      CalObjTime	*event_start,
-			      time_t		 interval_start,
-			      CalObjTime	*chunk_start,
-			      CalObjTime	*chunk_end,
-			      gint		 duration_days,
-			      gint		 duration_seconds,
-			      CalRecurInstanceFn cb,
-			      gpointer           cb_data)
-{
-	GArray *occs, *ex_occs, *tmp_occs, *rdate_periods;
-	CalObjTime cotime, *occ;
-	GSList *elem;
-	gint i;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	gboolean cb_status = TRUE, rule_finished, finished = TRUE;
-
-#if 0
-	g_print ("In generate_instances_for_chunk rrules: %p\n"
-		 "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",
-		 rrules,
-		 chunk_start->day, chunk_start->month + 1,
-		 chunk_start->year, chunk_start->hour,
-		 chunk_start->minute, chunk_start->second,
-		 chunk_end->day, chunk_end->month + 1,
-		 chunk_end->year, chunk_end->hour,
-		 chunk_end->minute, chunk_end->second);
-#endif
-
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	rdate_periods = g_array_new (FALSE, FALSE,
-				     sizeof (CalObjRecurrenceDate));
-
-	/* The original DTSTART property is included in the occurrence set,
-	   but not if we are just generating occurrences for a single rule. */
-	if (!single_rule) {
-		/* We add it if it is in this chunk. If it is after this chunk
-		   we set finished to FALSE, since we know we aren't finished
-		   yet. */
-		if (cal_obj_time_compare_func (event_start, chunk_end) >= 0)
-			finished = FALSE;
-		else if (cal_obj_time_compare_func (event_start, chunk_start) >= 0)
-			g_array_append_vals (occs, event_start, 1);
-	}
-	
-	/* Expand each of the recurrence rules. */
-	for (elem = rrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		/* If any of the rules return FALSE for finished, we know we
-		   have to carry on so we set finished to FALSE. */
-		if (!rule_finished)
-			finished = FALSE;
-
-		g_array_append_vals (occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific occurrence dates, flag them as RDATEs, and store
-	   a pointer to the period in the rdate_periods array. */
-	for (elem = rdates; elem; elem = elem->next) {
-		CalComponentPeriod *p;
-		CalObjRecurrenceDate rdate;
-		time_t t;
-
-		p = elem->data;
-		t = icaltime_as_timet (p->start);
-		cal_object_time_from_time (&cotime, t);
-
-		/* If the rdate is after the current chunk we set finished
-		   to FALSE, and we skip it. */
-		if (cal_obj_time_compare_func (&cotime, chunk_end) >= 0) {
-			finished = FALSE;
-			continue;
-		}
-
-		/* Check if the end date or duration is set. If it is we need
-		   to store it so we can get it later. (libical seems to set
-		   second to -1 to denote an unset time. See icalvalue.c) */
-		if (p->type != CAL_COMPONENT_PERIOD_DATETIME
-		    || p->u.end.second != -1) {
-			cotime.is_rdate = TRUE;
-
-			rdate.start = cotime;
-			rdate.period = p;
-			g_array_append_val (rdate_periods, rdate);
-		}
-
-		g_array_append_val (occs, cotime);
-	}
-
-	/* Expand each of the exception rules. */
-	for (elem = exrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		g_array_append_vals (ex_occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific exception dates. */
-	for (elem = exdates; elem; elem = elem->next) {
-		CalComponentDateTime *cdt;
-		time_t t;
-
-		/* FIXME we should only be dealing with dates, not times too.
-
-		   No, I think it is supposed to be dates & times - Damon.
-		   I'm not sure what the semantics of just a date would be,
-		   since the event could recur several times each day. */
-		cdt = elem->data;
-		t = icaltime_as_timet (*cdt->value);
-		cal_object_time_from_time (&cotime, t);
-
-		g_array_append_val (ex_occs, cotime);
-	}
-
-
-	/* Sort all the arrays. */
-	cal_obj_sort_occurrences (occs);
-	cal_obj_sort_occurrences (ex_occs);
-
-	qsort (rdate_periods->data, rdate_periods->len,
-	       sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);
-
-	/* Create the final array, by removing the exceptions from the
-	   occurrences, and removing any duplicates. */
-	cal_obj_remove_exceptions (occs, ex_occs);
-
-	/* Call the callback for each occurrence. If it returns 0 we break
-	   out of the loop. */
-	for (i = 0; i < occs->len; i++) {
-		/* Convert each CalObjTime into a start & end time_t, and
-		   check it is within the bounds of the event & interval. */
-		occ = &g_array_index (occs, CalObjTime, i);
-#if 0
-		g_print ("Checking occurrence: %s\n",
-			 cal_obj_time_to_string (occ));
-#endif
-		start_tm.tm_year  = occ->year - 1900;
-		start_tm.tm_mon   = occ->month;
-		start_tm.tm_mday  = occ->day;
-		start_tm.tm_hour  = occ->hour;
-		start_tm.tm_min   = occ->minute;
-		start_tm.tm_sec   = occ->second;
-		start_tm.tm_isdst = -1;
-		start_time = mktime (&start_tm);
-
-		if (start_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		/* Check to ensure that the start time is at or after the
-		   event's DTSTART time, and that it is inside the chunk that
-		   we are currently working on. (Note that the chunk_end time
-		   is never after the interval end time, so this also tests
-		   that we don't go past the end of the required interval). */
-		if (start_time < comp_dtstart
-		    || cal_obj_time_compare_func (occ, chunk_start) < 0
-		    || cal_obj_time_compare_func (occ, chunk_end) > 0) {
-#if 0
-			g_print ("  start time invalid\n");
-#endif
-			continue;
-		}
-
-		if (occ->is_rdate) {
-			if (!cal_object_get_rdate_end (occ, rdate_periods)) {
-				cal_obj_time_add_days (occ, duration_days);
-				cal_obj_time_add_seconds (occ,
-							  duration_seconds);
-			}
-		} else {
-			cal_obj_time_add_days (occ, duration_days);
-			cal_obj_time_add_seconds (occ, duration_seconds);
-		}
-
-		end_tm.tm_year  = occ->year - 1900;
-		end_tm.tm_mon   = occ->month;
-		end_tm.tm_mday  = occ->day;
-		end_tm.tm_hour  = occ->hour;
-		end_tm.tm_min   = occ->minute;
-		end_tm.tm_sec   = occ->second;
-		end_tm.tm_isdst = -1;
-		end_time = mktime (&end_tm);
-
-		if (end_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		/* Check that the end time is after the interval start, so we
-		   know that it intersects the required interval. */
-		if (end_time <= interval_start) {
-#if 0
-			g_print ("  end time invalid\n");
-#endif
-			continue;
-		}
-
-		cb_status = (*cb) (comp, start_time, end_time, cb_data);
-		if (!cb_status)
-			break;
-	}
-
-	g_array_free (occs, TRUE);
-	g_array_free (ex_occs, TRUE);
-	g_array_free (rdate_periods, TRUE);
-
-	/* We return TRUE (i.e. carry on) only if the callback has always
-	   returned TRUE and we know that we have more occurrences to generate
-	   (i.e. finished is FALSE). */
-	return cb_status && !finished;
-}
-
-
-/* This looks up the occurrence time in the sorted rdate_periods array, and
-   tries to compute the end time of the occurrence. If no end time or duration
-   is set it returns FALSE and the default duration will be used. */
-static gboolean
-cal_object_get_rdate_end	(CalObjTime	*occ,
-				 GArray		*rdate_periods)
-{
-	CalObjRecurrenceDate *rdate = NULL;
-	CalComponentPeriod *p;
-	gint lower, upper, middle, cmp = 0;
-	time_t t;
-
-	lower = 0;
-	upper = rdate_periods->len;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		rdate = &g_array_index (rdate_periods, CalObjRecurrenceDate,
-					middle);
-
-		cmp = cal_obj_time_compare_func (occ, &rdate->start);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* This should never happen. */
-	if (cmp == 0) {
-		g_warning ("Recurrence date not found");
-		return FALSE;
-	}
-
-	p = rdate->period;
-	if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-		t = icaltime_as_timet (p->u.end);
-		cal_object_time_from_time (occ, t);
-	} else {
-		cal_obj_time_add_days (occ, p->u.duration.weeks * 7
-				       + p->u.duration.days);
-		cal_obj_time_add_hours (occ, p->u.duration.hours);
-		cal_obj_time_add_minutes (occ, p->u.duration.minutes);
-		cal_obj_time_add_seconds (occ, p->u.duration.seconds);
-	}
-
-	return TRUE;
-}
-
-
-static void
-cal_object_compute_duration (CalObjTime *start,
-			     CalObjTime *end,
-			     gint	*days,
-			     gint	*seconds)
-{
-	GDate start_date, end_date;
-	gint start_seconds, end_seconds;
-
-	g_date_clear (&start_date, 1);
-	g_date_clear (&end_date, 1);
-	g_date_set_dmy (&start_date, start->day, start->month + 1,
-			start->year);
-	g_date_set_dmy (&end_date, end->day, end->month + 1,
-			end->year);
-
-	*days = g_date_julian (&end_date) - g_date_julian (&start_date);
-	start_seconds = start->hour * 3600 + start->minute * 60
-		+ start->second;
-	end_seconds = end->hour * 3600 + end->minute * 60 + end->second;
-
-	*seconds = end_seconds - start_seconds;
-	if (*seconds < 0) {
-		*days = *days - 1;
-		*seconds += 24 * 60 * 60;
-	}
-}
-
-
-/* Returns an unsorted GArray of CalObjTime's resulting from expanding the
-   given recurrence rule within the given interval. Note that it doesn't
-   clip the generated occurrences to the interval, i.e. if the interval
-   starts part way through the year this function still returns all the
-   occurrences for the year. Clipping is done later.
-   The finished flag is set to FALSE if there are more occurrences to generate
-   after the given interval.*/
-static GArray*
-cal_obj_expand_recurrence		(CalObjTime	  *event_start,
-					 CalRecurrence	  *recur,
-					 CalObjTime	  *interval_start,
-					 CalObjTime	  *interval_end,
-					 gboolean	  *finished)
-{
-	CalRecurVTable *vtable;
-	CalObjTime *event_end = NULL, event_end_cotime;
-	RecurData recur_data;
-	CalObjTime occ, *cotime;
-	GArray *all_occs, *occs;
-	gint len;
-
-	/* This is the resulting array of CalObjTime elements. */
-	all_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	*finished = TRUE;
-
-	vtable = cal_obj_get_vtable (recur->freq);
-	if (!vtable)
-		return all_occs;
-
-	/* Calculate some useful data such as some fast lookup tables. */
-	cal_obj_initialize_recur_data (&recur_data, recur, event_start);
-
-	/* Compute the event_end, if the recur's enddate is set. */
-	if (recur->enddate > 0) {
-		cal_object_time_from_time (&event_end_cotime,
-					   recur->enddate);
-		event_end = &event_end_cotime;
-
-		/* If the enddate is before the requested interval return. */
-		if (cal_obj_time_compare_func (event_end, interval_start) < 0)
-			return all_occs;
-	}
-
-	/* Set finished to FALSE if we know there will be more occurrences to
-	   do after this interval. */
-	if (!interval_end || !event_end
-	    || cal_obj_time_compare_func (event_end, interval_end) > 0)
-		*finished = FALSE;
-
-	/* Get the first period based on the frequency and the interval that
-	   intersects the interval between start and end. */
-	if ((*vtable->find_start_position) (event_start, event_end,
-					    &recur_data,
-					    interval_start, interval_end,
-					    &occ))
-		return all_occs;
-
-	/* Loop until the event ends or we go past the end of the required
-	   interval. */
-	for (;;) {
-		/* Generate the set of occurrences for this period. */
-		switch (recur->freq) {
-		case ICAL_YEARLY_RECURRENCE:
-			occs = cal_obj_generate_set_yearly (&recur_data,
-							    vtable, &occ);
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			occs = cal_obj_generate_set_monthly (&recur_data,
-							     vtable, &occ);
-			break;
-		default:
-			occs = cal_obj_generate_set_default (&recur_data,
-							     vtable, &occ);
-			break;
-		}
-
-		/* Sort the occurrences and remove duplicates. */
-		cal_obj_sort_occurrences (occs);
-		cal_obj_remove_duplicates_and_invalid_dates (occs);
-
-		/* Apply the BYSETPOS property. */
-		occs = cal_obj_bysetpos_filter (recur, occs);
-
-		/* Remove any occs after event_end. */
-		len = occs->len - 1;
-		if (event_end) {
-			while (len >= 0) {
-				cotime = &g_array_index (occs, CalObjTime,
-							 len);
-				if (cal_obj_time_compare_func (cotime,
-							       event_end) <= 0)
-					break;
-				len--;
-			}
-		}
-
-		/* Add the occurrences onto the main array. */
-		if (len >= 0)
-			g_array_append_vals (all_occs, occs->data, len + 1);
-
- 		g_array_free (occs, TRUE);
-
-		/* Skip to the next period, or exit the loop if finished. */
-		if ((*vtable->find_next_position) (&occ, event_end,
-						   &recur_data, interval_end))
-			break;
-	}
-
-	return all_occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_yearly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	CalRecurrence *recur = recur_data->recur;
-	GArray *occs_arrays[4], *occs, *occs2;
-	gint num_occs_arrays = 0, i;
-
-	/* This is a bit complicated, since the iCalendar spec says that
-	   several BYxxx modifiers can be used simultaneously. So we have to
-	   be quite careful when determining the days of the occurrences.
-	   The BYHOUR, BYMINUTE & BYSECOND modifiers are no problem at all.
-
-	   The modifiers we have to worry about are: BYMONTH, BYWEEKNO,
-	   BYYEARDAY, BYMONTHDAY & BYDAY. We can't do these sequentially
-	   since each filter will mess up the results of the previous one.
-	   But they aren't all completely independant, e.g. BYMONTHDAY and
-	   BYDAY are related to BYMONTH, and BYDAY is related to BYWEEKNO.
-
-	   BYDAY & BYMONTHDAY can also be applied independently, which makes
-	   it worse. So we assume that if BYMONTH or BYWEEKNO is used, then
-	   the BYDAY modifier applies to those, else it is applied
-	   independantly.
-
-	   We expand the occurrences in parallel into the occs_arrays[] array,
-	   and then merge them all into one GArray before expanding BYHOUR,
-	   BYMINUTE & BYSECOND. */
-
-	if (recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-		/* If BYMONTHDAY & BYDAY are both set we need to expand them
-		   in parallel and add the results. */
-		if (recur->bymonthday && recur->byday) {
-			/* Copy the occs array. */
-			occs2 = g_array_new (FALSE, FALSE,
-					     sizeof (CalObjTime));
-			g_array_append_vals (occs2, occs->data, occs->len);
-
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs2 = cal_obj_byday_expand_monthly (recur_data,
-							      occs2);
-
-			/* Add the 2 resulting arrays together. */
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		} else {
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs = cal_obj_byday_expand_monthly (recur_data, occs);
-		}
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-		/* Note that we explicitly call the weekly version of the
-		   BYDAY expansion filter. */
-		occs = cal_obj_byday_expand_weekly (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byyearday) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYMONTHDAY is set, and BYMONTH is not set, we need to
-	   expand BYMONTHDAY independantly. */
-	if (recur->bymonthday && !recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYDAY is set, and BYMONTH and BYWEEKNO are not set, we need to
-	   expand BYDAY independantly. */
-	if (recur->byday && !recur->bymonth && !recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* Add all the arrays together. If no filters were used we just
-	   create an array with one element. */
-	if (num_occs_arrays > 0) {
-		occs = occs_arrays[0];
-		for (i = 1; i < num_occs_arrays; i++) {
-			occs2 = occs_arrays[i];
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		}
-	} else {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-	}
-
-	/* Now expand BYHOUR, BYMINUTE & BYSECOND. */
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_monthly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs, *occs2;
-
-	/* We start with just the one time in each set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-	/* We need to combine the output of BYMONTHDAY & BYDAY, by doing them
-	   in parallel rather than sequentially. If we did them sequentially
-	   then we would lose the occurrences generated by BYMONTHDAY, and
-	   instead have repetitions of the occurrences from BYDAY. */
-	if (recur_data->recur->bymonthday && recur_data->recur->byday) {
-		occs2 = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs2, occs->data, occs->len);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs2 = (*vtable->byday_filter) (recur_data, occs2);
-
-		g_array_append_vals (occs, occs2->data, occs2->len);
-		g_array_free (occs2, TRUE);
-	} else {
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs = (*vtable->byday_filter) (recur_data, occs);
-	}
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_default	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs;
-
-#if 0
-	g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",
-		 occ->day, occ->month + 1, occ->year, occ->hour, occ->minute,
-		 occ->second);
-#endif
-
-	/* We start with just the one time in the set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-	if (vtable->byweekno_filter)
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-	if (vtable->byyearday_filter)
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-	if (vtable->bymonthday_filter)
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-	occs = (*vtable->byday_filter) (recur_data, occs);
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-
-/* Returns the function table corresponding to the recurrence frequency. */
-static CalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)
-{
-	CalRecurVTable* vtable;
-
-	switch (recur_type) {
-	case ICAL_YEARLY_RECURRENCE:
-		vtable = &cal_obj_yearly_vtable;
-		break;
-	case ICAL_MONTHLY_RECURRENCE:
-		vtable = &cal_obj_monthly_vtable;
-		break;
-	case ICAL_WEEKLY_RECURRENCE:
-		vtable = &cal_obj_weekly_vtable;
-		break;
-	case ICAL_DAILY_RECURRENCE:
-		vtable = &cal_obj_daily_vtable;
-		break;
-	case ICAL_HOURLY_RECURRENCE:
-		vtable = &cal_obj_hourly_vtable;
-		break;
-	case ICAL_MINUTELY_RECURRENCE:
-		vtable = &cal_obj_minutely_vtable;
-		break;
-	case ICAL_SECONDLY_RECURRENCE:
-		vtable = &cal_obj_secondly_vtable;
-		break;
-	default:
-		g_warning ("Unknown recurrence frequenct");
-		vtable = NULL;
-	}
-
-	return vtable;
-}
-
-
-/* This creates a number of fast lookup tables used when filtering with the
-   modifier properties BYMONTH, BYYEARDAY etc. */
-static void
-cal_obj_initialize_recur_data (RecurData  *recur_data,
-			       CalRecurrence *recur,
-			       CalObjTime *event_start)
-{
-	GList *elem;
-	gint month, yearday, monthday, weekday, week_num, hour, minute, second;
-
-	/* Clear the entire RecurData. */
-	memset (recur_data, 0, sizeof (RecurData));
-
-	recur_data->recur = recur;
-
-	/* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO
-	   modifier. */
-	recur_data->weekday_offset = cal_obj_time_weekday_offset (event_start,
-								  recur);
-
-	/* Create an array of months from bymonths for fast lookup. */
-	elem = recur->bymonth;
-	while (elem) {
-		month = GPOINTER_TO_INT (elem->data);
-		recur_data->months[month] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of yeardays from byyearday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the year. */
-	elem = recur->byyearday;
-	while (elem) {
-		yearday = GPOINTER_TO_INT (elem->data);
-		if (yearday >= 0)
-			recur_data->yeardays[yearday] = 1;
-		else
-			recur_data->neg_yeardays[-yearday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of monthdays from bymonthday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the month. */
-	elem = recur->bymonthday;
-	while (elem) {
-		monthday = GPOINTER_TO_INT (elem->data);
-		if (monthday >= 0)
-			recur_data->monthdays[monthday] = 1;
-		else
-			recur_data->neg_monthdays[-monthday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of weekdays from byday for fast lookup. */
-	elem = recur->byday;
-	while (elem) {
-		weekday = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-		/* The week number is not used when filtering. */
-		week_num = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-
-		recur_data->weekdays[weekday] = 1;
-	}
-
-	/* Create an array of hours from byhour for fast lookup. */
-	elem = recur->byhour;
-	while (elem) {
-		hour = GPOINTER_TO_INT (elem->data);
-		recur_data->hours[hour] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of minutes from byminutes for fast lookup. */
-	elem = recur->byminute;
-	while (elem) {
-		minute = GPOINTER_TO_INT (elem->data);
-		recur_data->minutes[minute] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of seconds from byseconds for fast lookup. */
-	elem = recur->bysecond;
-	while (elem) {
-		second = GPOINTER_TO_INT (elem->data);
-		recur_data->seconds[second] = 1;
-		elem = elem->next;
-	}
-}
-
-
-static void
-cal_obj_sort_occurrences (GArray *occs)
-{
-	qsort (occs->data, occs->len, sizeof (CalObjTime),
-	       cal_obj_time_compare_func);
-}
-
-
-static void
-cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
-{
-	static const int days_in_month[12] = {
-		31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-	};
-
-	CalObjTime *occ, *prev_occ = NULL;
-	gint len, i, j = 0, year, month, days;
-	gboolean keep_occ;
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		if (prev_occ && cal_obj_time_compare_func (occ,
-							   prev_occ) == 0)
-			keep_occ = FALSE;
-
-		year = occ->year;
-		month = occ->month;
-		days = days_in_month[occ->month];
-		/* If it is february and a leap year, add a day. */
-		if (month == 1 && (year % 4 == 0
-				   && (year % 100 != 0
-				       || year % 400 == 0)))
-			days++;
-		if (occ->day > days)
-			keep_occ = FALSE;
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-/* Removes the exceptions from the ex_occs array from the occurrences in the
-   occs array, and removes any duplicates. Both arrays are sorted. */
-static void
-cal_obj_remove_exceptions (GArray *occs,
-			   GArray *ex_occs)
-{
-	CalObjTime *occ, *prev_occ = NULL, *ex_occ = NULL, *last_occ_kept;
-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;
-	gboolean keep_occ, current_time_is_exception = FALSE;
-
-	if (occs->len == 0)
-		return;
-
-	ex_index = 0;
-	occs_len = occs->len;
-	ex_occs_len = ex_occs->len;
-
-	if (ex_occs_len > 0)
-		ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-
-	for (i = 0; i < occs_len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		/* If the occurrence is a duplicate of the previous one, skip
-		   it. */
-		if (prev_occ
-		    && cal_obj_time_compare_func (occ, prev_occ) == 0) {
-			keep_occ = FALSE;
-
-			/* If this occurrence is an RDATE, and the previous
-			   occurrence in the array was kept, set the RDATE flag
-			   of the last one, so we still use the end date
-			   or duration. */
-			if (occ->is_rdate && !current_time_is_exception) {
-				last_occ_kept = &g_array_index (occs,
-								CalObjTime,
-								j - 1);
-				last_occ_kept->is_rdate = TRUE;
-			}
-		} else {
-			/* We've found a new occurrence time. Reset the flag
-			   to indicate that it hasn't been found in the
-			   exceptions array (yet). */
-			current_time_is_exception = FALSE;
-
-			if (ex_occ) {
-				/* Step through the exceptions until we come
-				   to one that matches or follows this
-				   occurrence. */
-				while (ex_occ) {
-					cmp = cal_obj_time_compare_func (ex_occ, occ);
-					/* I'm pretty sure this is wrong. */
-					/*cmp = cal_obj_date_only_compare_func (ex_occ, occ);*/
-					if (cmp > 0)
-						break;
-
-					/* Move to the next exception, or set
-					   ex_occ to NULL when we reach the
-					   end of array. */
-					ex_index++;
-					if (ex_index < ex_occs_len)
-						ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-					else
-						ex_occ = NULL;
-
-					/* If the exception did match this
-					   occurrence we remove it, and set the
-					   flag to indicate that the current
-					   time is an exception. */
-					if (cmp == 0) {
-						current_time_is_exception = TRUE;
-						keep_occ = FALSE;
-						break;
-					}
-				}
-			}
-		}
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-
-static GArray*
-cal_obj_bysetpos_filter (CalRecurrence *recur,
-			 GArray	    *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, pos;
-
-	/* If BYSETPOS has not been specified, or the array is empty, just
-	   return the array. */
-	elem = recur->bysetpos;
-	if (!elem || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	/* Iterate over the indices given in bysetpos, adding the corresponding
-	   element from occs to new_occs. */
-	len = occs->len;
-	while (elem) {
-		pos = GPOINTER_TO_INT (elem->data);
-
-		/* Negative values count back from the end of the array. */
-		if (pos < 0)
-			pos += len;
-
-		if (pos >= 0 && pos < len) {
-			occ = &g_array_index (occs, CalObjTime, pos);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-		elem = elem->next;
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-/* Finds the first year from the event_start, counting in multiples of the
-   recurrence interval, that intersects the given interval. It returns TRUE
-   if there is no intersection. */
-static gboolean
-cal_obj_yearly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cotime->year < interval_start->year) {
-		gint years = interval_start->year - cotime->year
-			+ recur_data->recur->interval - 1;
-		years -= years % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-		cotime->year += years;
-	}
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_yearly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-	cotime->year += recur_data->recur->interval;
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_monthly_find_start_position (CalObjTime *event_start,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_start,
-				     CalObjTime *interval_end,
-				     CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cal_obj_time_compare (cotime, interval_start, CALOBJ_MONTH) < 0) {
-		gint months = (interval_start->year - cotime->year) * 12
-			+ interval_start->month - cotime->month
-			+ recur_data->recur->interval - 1;
-		months -= months % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-		cal_obj_time_add_months (cotime, months);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_monthly_find_next_position (CalObjTime *cotime,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-	cal_obj_time_add_months (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_weekly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian;
-	gint interval_start_weekday_offset;
-	CalObjTime week_start;
-
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	/* Calculate the start of the weeks corresponding to the event start
-	   and interval start. */
-	event_start_julian = g_date_julian (&event_start_date);
-	event_start_julian -= recur_data->weekday_offset;
-
-	interval_start_julian = g_date_julian (&interval_start_date);
-	interval_start_weekday_offset = cal_obj_time_weekday_offset (interval_start, recur_data->recur);
-	interval_start_julian -= interval_start_weekday_offset;
-
-	/* We want to find the first full week using the recurrence interval
-	   that intersects the given interval dates. */
-	if (event_start_julian < interval_start_julian) {
-		gint weeks = (interval_start_julian - event_start_julian) / 7;
-		weeks += recur_data->recur->interval - 1;
-		weeks -= weeks % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, weeks * 7);
-	}
-
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday_offset);
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_weekly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	CalObjTime week_start;
-
-	cal_obj_time_add_days (cotime, recur_data->recur->interval * 7);
-
-	/* Return TRUE if the start of this week is after the event finishes
-	   or is after the end of the required interval. */
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday_offset);
-
-#ifdef CAL_OBJ_DEBUG
-	g_print ("Next  day: %s\n", cal_obj_time_to_string (cotime));
-	g_print ("Week Start: %s\n", cal_obj_time_to_string (&week_start));
-#endif
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0) {
-#ifdef CAL_OBJ_DEBUG
-		g_print ("Interval end reached: %s\n",
-			 cal_obj_time_to_string (interval_end));
-#endif
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_start_position  (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, days;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	event_start_julian = g_date_julian (&event_start_date);
-	interval_start_julian = g_date_julian (&interval_start_date);
-
-	if (event_start_julian < interval_start_julian) {
-		days = interval_start_julian - event_start_julian
-			+ recur_data->recur->interval - 1;
-		days -= days % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, days);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_next_position  (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_days (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, hours;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_HOUR) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_HOUR) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		hours = (interval_start_julian - event_start_julian) * 24;
-		hours += interval_start->hour - event_start->hour;
-		hours += recur_data->recur->interval - 1;
-		hours -= hours % recur_data->recur->interval;
-		cal_obj_time_add_hours (cotime, hours);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_hours (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, minutes;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_MINUTE) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_MINUTE) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		minutes = (interval_start_julian - event_start_julian)
-			* 24 * 60;
-		minutes += (interval_start->hour - event_start->hour) * 24;
-		minutes += interval_start->minute - event_start->minute;
-		minutes += recur_data->recur->interval - 1;
-		minutes -= minutes % recur_data->recur->interval;
-		cal_obj_time_add_minutes (cotime, minutes);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_minutes (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, seconds;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_SECOND) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_SECOND) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_SECOND) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		seconds = (interval_start_julian - event_start_julian)
-			* 24 * 60 * 60;
-		seconds += (interval_start->hour - event_start->hour)
-			* 24 * 60;
-		seconds += (interval_start->minute - event_start->minute) * 60;
-		seconds += interval_start->second - event_start->second;
-		seconds += recur_data->recur->interval - 1;
-		seconds -= seconds % recur_data->recur->interval;
-		cal_obj_time_add_seconds (cotime, seconds);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_seconds (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-
-
-/* If the BYMONTH rule is specified it expands each occurrence in occs, by
-   using each of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bymonth;
-		while (elem) {
-			/* NOTE: The day may now be invalid, e.g. 31st Feb. */
-			occ->month = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMONTH rule is specified it filters out all occurrences in occs
-   which do not match one of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->months[occ->month])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byweekno_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, weekno;
-
-	/* If BYWEEKNO has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byweekno || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to week 1 (note that
-		   week 1 is the first week starting from the specified week
-		   start day that has 4 days in the new year). */
-		year_start_cotime = *occ;
-		cal_obj_time_find_first_week (&year_start_cotime,
-					      recur_data);
-
-		/* Find the day that would correspond to week 1 of the next
-		   year, which we use for -ve week numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		cal_obj_time_find_first_week (&year_end_cotime,
-					      recur_data);
-
-		/* Now iterate over the week numbers in byweekno, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byweekno;
-		while (elem) {
-			weekno = GPOINTER_TO_INT (elem->data);
-			if (weekno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime,
-						       (weekno - 1) * 7);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, weekno * 7);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-#if 0
-/* This isn't used at present. */
-static GArray*
-cal_obj_byweekno_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-
-	return occs;
-}
-#endif
-
-
-static GArray*
-cal_obj_byyearday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		year_start_cotime = *occ;
-		year_start_cotime.month = 0;
-		year_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   year, which we use for -ve day numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		year_end_cotime.month = 0;
-		year_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in byyearday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byyearday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byyearday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint yearday, len, i, days_in_year;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		yearday = cal_obj_time_day_of_year (occ);
-		if (recur_data->yeardays[yearday]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_year = g_date_is_leap_year (occ->year)
-				? 366 : 365;
-			if (recur_data->neg_yeardays[days_in_year + 1
-						    - yearday])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_bymonthday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, month_start_cotime, month_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		month_start_cotime = *occ;
-		month_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   month, which we use for -ve day numbers. */
-		month_end_cotime = *occ;
-		month_end_cotime.month++;
-		month_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in bymonthday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->bymonthday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = month_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = month_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the month. */
-			if (cotime.month == occ->month)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_bymonthday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, days_in_month;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->monthdays[occ->day]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_month = time_days_in_month (occ->year,
-							    occ->month);
-			if (recur_data->neg_monthdays[days_in_month + 1
-						     - occ->day])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			if (week_num == 0) {
-				/* Expand to every Mon/Tue/etc. in the year. */
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				/* Add the nth Mon/Tue/etc. in the year. */
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				/* Add the -nth Mon/Tue/etc. in the year. */
-				occ->month = 11;
-				occ->day = 31;
-				last_weekday = cal_obj_time_weekday (occ);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year, as we may have gone past the end. */
-			occ->year = year;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-	guint8 month;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			month = occ->month;
-			if (week_num == 0) {
-				/* Expand to every Mon/Tue/etc. in the month.*/
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year
-				       && occ->month == month) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				/* Add the nth Mon/Tue/etc. in the month. */
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				/* Add the -nth Mon/Tue/etc. in the month. */
-				occ->day = time_days_in_month (occ->year,
-							       occ->month);
-				last_weekday = cal_obj_time_weekday (occ);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year & month, as we may have gone past
-			   the end. */
-			occ->year = year;
-			occ->month = month;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint weekday_offset, new_weekday_offset;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			/* FIXME: Currently we just ignore this, but maybe we
-			   should skip all elements where week_num != 0.
-			   The spec isn't clear about this. */
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			weekday_offset = cal_obj_time_weekday_offset (occ, recur_data->recur);
-			new_weekday_offset = (weekday + 7 - recur_data->recur->week_start_day) % 7;
-			cal_obj_time_add_days (occ, new_weekday_offset - weekday_offset);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, weekday;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		weekday = cal_obj_time_weekday (occ);
-
-		/* See if the weekday on its own is set. */
-		if (recur_data->weekdays[weekday])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYHOUR rule is specified it expands each occurrence in occs, by
-   using each of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byhour;
-		while (elem) {
-			occ->hour = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYHOUR rule is specified it filters out all occurrences in occs
-   which do not match one of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->hours[occ->hour])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYMINUTE rule is specified it expands each occurrence in occs, by
-   using each of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byminute;
-		while (elem) {
-			occ->minute = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMINUTE rule is specified it filters out all occurrences in occs
-   which do not match one of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->minutes[occ->minute])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYSECOND rule is specified it expands each occurrence in occs, by
-   using each of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bysecond;
-		while (elem) {
-			occ->second = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYSECOND rule is specified it filters out all occurrences in occs
-   which do not match one of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->seconds[occ->second])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-
-/* Adds a positive or negative number of months to the given CalObjTime,
-   updating the year appropriately so we end up with a valid month.
-   Note that the day may be invalid, e.g. 30th Feb. */
-static void
-cal_obj_time_add_months		(CalObjTime *cotime,
-				 gint	     months)
-{
-	guint month, years;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	month = cotime->month + months;
-	cotime->month = month % 12;
-	if (month > 0) {
-		cotime->year += month / 12;
-	} else {
-		years = month / 12;
-		if (cotime->month != 0) {
-			cotime->month += 12;
-			years -= 1;
-		}
-		cotime->year += years;
-	}
-}
-
-
-/* Adds a positive or negative number of days to the given CalObjTime,
-   updating the month and year appropriately so we end up with a valid day. */
-static void
-cal_obj_time_add_days		(CalObjTime *cotime,
-				 gint	     days)
-{
-	gint day, days_in_month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	day = cotime->day;
-	day += days;
-
-	if (days >= 0) {
-		for (;;) {
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-			if (day <= days_in_month)
-				break;
-
-			cotime->month++;
-			if (cotime->month >= 12) {
-				cotime->year++;
-				cotime->month = 0;
-			}
-
-			day -= days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	} else {
-		while (day <= 0) {
-			if (cotime->month == 0) {
-				cotime->year--;
-				cotime->month = 11;
-			} else {
-				cotime->month--;
-			}
-
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-			day += days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	}
-}
-
-
-/* Adds a positive or negative number of hours to the given CalObjTime,
-   updating the day, month & year appropriately so we end up with a valid
-   time. */
-static void
-cal_obj_time_add_hours		(CalObjTime *cotime,
-				 gint	     hours)
-{
-	gint hour, days;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	hour = cotime->hour + hours;
-	cotime->hour = hour % 24;
-	if (hour >= 0) {
-		if (hour >= 24)
-			cal_obj_time_add_days (cotime, hour / 24);
-	} else {
-		days = hour / 24;
-		if (cotime->hour != 0) {
-			cotime->hour += 24;
-			days -= 1;
-		}
-		cal_obj_time_add_days (cotime, days);
-	}
-}
-
-
-/* Adds a positive or negative number of minutes to the given CalObjTime,
-   updating the rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_minutes	(CalObjTime *cotime,
-				 gint	     minutes)
-{
-	gint minute, hours;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	minute = cotime->minute + minutes;
-	cotime->minute = minute % 60;
-	if (minute >= 0) {
-		if (minute >= 60)
-			cal_obj_time_add_hours (cotime, minute / 60);
-	} else {
-		hours = minute / 60;
-		if (cotime->minute != 0) {
-			cotime->minute += 60;
-			hours -= 1;
-		}
-		cal_obj_time_add_hours (cotime, hours);
-	}
-}
-
-
-/* Adds a positive or negative number of seconds to the given CalObjTime,
-   updating the rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_seconds	(CalObjTime *cotime,
-				 gint	     seconds)
-{
-	gint second, minutes;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	second = cotime->second + seconds;
-	cotime->second = second % 60;
-	if (second >= 0) {
-		if (second >= 60)
-			cal_obj_time_add_minutes (cotime, second / 60);
-	} else {
-		minutes = second / 60;
-		if (cotime->second != 0) {
-			cotime->second += 60;
-			minutes -= 1;
-		}
-		cal_obj_time_add_minutes (cotime, minutes);
-	}
-}
-
-
-/* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if
-   they are the same, or 1 if cotime1 is after cotime2. The comparison type
-   specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY
-   is used we only want to know if the days are different. */
-static gint
-cal_obj_time_compare		(CalObjTime *cotime1,
-				 CalObjTime *cotime2,
-				 CalObjTimeComparison type)
-{
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (type == CALOBJ_YEAR)
-		return 0;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (type == CALOBJ_MONTH)
-		return 0;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	if (type == CALOBJ_DAY)
-		return 0;
-
-	if (cotime1->hour < cotime2->hour)
-		return -1;
-	if (cotime1->hour > cotime2->hour)
-		return 1;
-
-	if (type == CALOBJ_HOUR)
-		return 0;
-
-	if (cotime1->minute < cotime2->minute)
-		return -1;
-	if (cotime1->minute > cotime2->minute)
-		return 1;
-
-	if (type == CALOBJ_MINUTE)
-		return 0;
-
-	if (cotime1->second < cotime2->second)
-		return -1;
-	if (cotime1->second > cotime2->second)
-		return 1;
-
-	return 0;
-}
-
-
-/* This is the same as the above function, but without the comparison type.
-   It is used for qsort(). */
-static gint
-cal_obj_time_compare_func (const void *arg1,
-			   const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-	gint retval;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		retval = -1;
-	else if (cotime1->year > cotime2->year)
-		retval = 1;
-
-	else if (cotime1->month < cotime2->month)
-		retval = -1;
-	else if (cotime1->month > cotime2->month)
-		retval = 1;
-
-	else if (cotime1->day < cotime2->day)
-		retval = -1;
-	else if (cotime1->day > cotime2->day)
-		retval = 1;
-
-	else if (cotime1->hour < cotime2->hour)
-		retval = -1;
-	else if (cotime1->hour > cotime2->hour)
-		retval = 1;
-
-	else if (cotime1->minute < cotime2->minute)
-		retval = -1;
-	else if (cotime1->minute > cotime2->minute)
-		retval = 1;
-
-	else if (cotime1->second < cotime2->second)
-		retval = -1;
-	else if (cotime1->second > cotime2->second)
-		retval = 1;
-
-	else
-		retval = 0;
-
-#if 0
-	g_print ("%s - ", cal_obj_time_to_string (cotime1));
-	g_print ("%s : %i\n", cal_obj_time_to_string (cotime2), retval);
-#endif
-
-	return retval;
-}
-
-#if 0
-static gint
-cal_obj_date_only_compare_func (const void *arg1,
-				const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	return 0;
-}
-#endif
-
-/* Returns the weekday of the given CalObjTime, from 0 (Mon) - 6 (Sun). */
-static gint
-cal_obj_time_weekday		(CalObjTime *cotime)
-{
-	GDate date;
-	gint weekday;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	return weekday;
-}
-
-
-/* Returns the weekday of the given CalObjTime, from 0 - 6. The week start
-   day is Monday by default, but can be set in the recurrence rule. */
-static gint
-cal_obj_time_weekday_offset	(CalObjTime *cotime,
-				 CalRecurrence *recur)
-{
-	GDate date;
-	gint weekday, offset;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	/* This calculates the offset of our day from the start of the week.
-	   We just add on a week (to avoid any possible negative values) and
-	   then subtract the specified week start day, then convert it into a
-	   value from 0-6. */
-	offset = (weekday + 7 - recur->week_start_day) % 7;
-
-	return offset;
-}
-
-
-/* Returns the day of the year of the given CalObjTime, from 1 - 366. */
-static gint
-cal_obj_time_day_of_year		(CalObjTime *cotime)
-{
-	GDate date;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	return g_date_day_of_year (&date);
-}
-
-
-/* Finds the first week in the given CalObjTime's year, using the same weekday
-   as the event start day (i.e. from the RecurData).
-   The first week of the year is the first week starting from the specified
-   week start day that has 4 days in the new year. It may be in the previous
-   year. */
-static void
-cal_obj_time_find_first_week	(CalObjTime *cotime,
-				 RecurData  *recur_data)
-{
-	GDate date;
-	gint weekday, week_start_day, first_full_week_start_offset, offset;
-
-	/* Find out the weekday of the 1st of the year, 0 (Mon) - 6 (Sun). */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 1, 1, cotime->year);
-	weekday = g_date_weekday (&date) - 1;
-
-	/* Calculate the first day of the year that starts a new week, i.e. the
-	   first week_start_day after weekday, using 0 = 1st Jan.
-	   e.g. if the 1st Jan is a Tuesday (1) and week_start_day is a
-	   Monday (0), the result will be (0 + 7 - 1) % 7 = 6 (7th Jan). */
-	week_start_day = recur_data->recur->week_start_day;
-	first_full_week_start_offset = (week_start_day + 7 - weekday) % 7;
-
-	/* Now see if we have to move backwards 1 week, i.e. if the week
-	   starts on or after Jan 5th (since the previous week has 4 days in
-	   this year and so will be the first week of the year). */
-	if (first_full_week_start_offset >= 4)
-		first_full_week_start_offset -= 7;
-
-	/* Now add the days to get to the event's weekday. */
-	offset = first_full_week_start_offset + recur_data->weekday_offset;
-
-	/* Now move the cotime to the appropriate day. */
-	cotime->month = 0;
-	cotime->day = 1;
-	cal_obj_time_add_days (cotime, offset);
-}
-
-
-static void
-cal_object_time_from_time (CalObjTime *cotime,
-			   time_t      t)
-{
-	struct tm *tmp_tm;
-	time_t tmp_time_t;
-
-	tmp_time_t = t;
-	tmp_tm = localtime (&tmp_time_t);
-
-	cotime->year     = tmp_tm->tm_year + 1900;
-	cotime->month    = tmp_tm->tm_mon;
-	cotime->day      = tmp_tm->tm_mday;
-	cotime->hour     = tmp_tm->tm_hour;
-	cotime->minute   = tmp_tm->tm_min;
-	cotime->second   = tmp_tm->tm_sec;
-	cotime->is_rdate = FALSE;
-}
-
-
-/* Debugging function to convert a CalObjTime to a string. It uses a static
-   buffer so beware. */
-#ifdef CAL_OBJ_DEBUG
-static char*
-cal_obj_time_to_string		(CalObjTime	*cotime)
-{
-	static char buffer[20];
-	char *weekdays[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
-			     "   " };
-	gint weekday;
-
-	weekday = cal_obj_time_weekday (cotime);
-
-	sprintf (buffer, "%s %02i/%02i/%04i %02i:%02i:%02i",
-		 weekdays[weekday],
-		 cotime->day, cotime->month + 1, cotime->year,
-		 cotime->hour, cotime->minute, cotime->second);
-	return buffer;
-}
-#endif
-
-
-/* This recalculates the end dates for recurrence & exception rules which use
-   the COUNT property. If refresh is TRUE it will recalculate all enddates
-   for rules which use COUNT. If refresh is FALSE, it will only calculate
-   the enddate if it hasn't already been set. It returns TRUE if the component
-   was changed, i.e. if the component should be saved at some point.
-   We store the enddate in the "X-EVOLUTION-ENDDATE" parameter of the RRULE
-   or EXRULE. */
-static gboolean
-cal_recur_ensure_end_dates (CalComponent	*comp,
-			    gboolean		 refresh)
-{
-	GSList *rrules, *exrules, *elem;
-	gboolean changed = FALSE;
-
-	/* Do the RRULEs. */
-	cal_component_get_rrule_property_list (comp, &rrules);
-	for (elem = rrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   FALSE, refresh);
-	}
-
-	/* Do the EXRULEs. */
-	cal_component_get_exrule_property_list (comp, &exrules);
-	for (elem = exrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   TRUE, refresh);
-	}
-
-	return changed;
-}
-
-
-typedef struct _CalRecurEnsureEndDateData CalRecurEnsureEndDateData;
-struct _CalRecurEnsureEndDateData {
-	gint count;
-	gint instances;
-	time_t end_date;
-};
-
-
-static gboolean
-cal_recur_ensure_rule_end_date (CalComponent			*comp,
-				icalproperty			*prop,
-				gboolean			 exception,
-				gboolean			 refresh)
-{
-	struct icalrecurrencetype rule;
-	CalRecurEnsureEndDateData cb_data;
-
-	if (exception)
-		rule = icalproperty_get_exrule (prop);
-	else
-		rule = icalproperty_get_rrule (prop);
-
-	/* If the rule doesn't use COUNT just return. */
-	if (rule.count == 0)
-		return FALSE;
-
-	/* If refresh is FALSE, we check if the enddate is already set, and
-	   if it is we just return. */
-	if (!refresh) {
-		if (cal_recur_get_rule_end_date (prop) != -1)
-			return FALSE;
-	}
-
-	/* Calculate the end date. */
-	cb_data.count = rule.count;
-	cb_data.instances = 0;
-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-					      cal_recur_ensure_rule_end_date_cb,
-					      &cb_data);
-
-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the
-	   rule. */
-	cal_recur_set_rule_end_date (prop, cb_data.end_date);
-		
-	return TRUE;
-}
-
-
-static gboolean
-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data)
-{
-	CalRecurEnsureEndDateData *cb_data;
-
-	cb_data = (CalRecurEnsureEndDateData*) data;
-
-	cb_data->instances++;
-
-	if (cb_data->instances == cb_data->count) {
-		cb_data->end_date = instance_start;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static time_t
-cal_recur_get_rule_end_date	(icalproperty	*prop)
-{
-	icalparameter *param;
-	const char *xname, *xvalue;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			xvalue = icalparameter_get_x (param);
-			value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,
-							   xvalue);
-			if (value) {
-				icaltime = icalvalue_get_datetime (value);
-				icalvalue_free (value);
-
-				return icaltime_as_timet (icaltime);
-			}
-		}
-
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_X_PARAMETER);
-	}
-
-	return -1;
-}
-
-
-static void
-cal_recur_set_rule_end_date	(icalproperty	*prop,
-				 time_t		 end_date)
-{
-	icalparameter *param;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-	const char *end_date_string, *xname;
-
-	icaltime = icaltime_from_timet (end_date, FALSE);
-	value = icalvalue_new_datetime (icaltime);
-	end_date_string = icalvalue_as_ical_string (value);
-	icalvalue_free (value);
-
-	/* If we already have an X-EVOLUTION-ENDDATE parameter, set the value
-	   to the new date-time. */
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			icalparameter_set_x (param, end_date_string);
-			return;
-		}
-		param = icalproperty_get_next_parameter (prop, ICAL_X_PARAMETER);
-	}
-
-	/* Create a new X-EVOLUTION-ENDDATE and add it to the property. */
-	param = icalparameter_new_x (end_date_string);
-	icalparameter_set_xname (param, EVOLUTION_END_DATE_PARAMETER);
-	icalproperty_add_parameter (prop, param);
-}
-
diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h
deleted file mode 100644
index de5a139f78..0000000000
--- a/calendar/cal-util/cal-recur.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_RECUR_H
-#define CAL_RECUR_H
-
-#include <libgnome/gnome-defs.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-BEGIN_GNOME_DECLS
-
-typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instance_end,
-					 gpointer      data);
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void	cal_recur_generate_instances	(CalComponent		*comp,
-					 time_t			 start,
-					 time_t			 end,
-					 CalRecurInstanceFn	 cb,
-					 gpointer                cb_data);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
deleted file mode 100644
index 67da788b0f..0000000000
--- a/calendar/cal-util/cal-util.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-util.h"
-
-
-
-/**
- * cal_obj_instance_list_free:
- * @list: List of #CalObjInstance structures.
- * 
- * Frees a list of #CalObjInstance structures.
- **/
-void
-cal_obj_instance_list_free (GList *list)
-{
-	CalObjInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_uid_list_free:
- * @list: List of strings with unique identifiers.
- *
- * Frees a list of unique identifiers for calendar objects.
- **/
-void
-cal_obj_uid_list_free (GList *list)
-{
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		char *uid;
-
-		uid = l->data;
-
-		g_assert (uid != NULL);
-		g_free (uid);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
deleted file mode 100644
index a0a111258d..0000000000
--- a/calendar/cal-util/cal-util.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_UTIL_H
-#define CAL_UTIL_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-/* Instance of a calendar object.  This can be an actual occurrence, a
- * recurrence, or an alarm trigger of a `real' calendar object.
- */
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-
-void cal_obj_instance_list_free (GList *list);
-
-/* Used for multiple UID queries */
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-
-void cal_obj_uid_list_free (GList *list);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
deleted file mode 100644
index bcb1b9bb88..0000000000
--- a/calendar/cal-util/calobj.c
+++ /dev/null
@@ -1,2008 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Calendar objects implementations.
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Federico Mena (quartic@gimp.org)
- */
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <time.h>
-#include "calobj.h"
-#include "timeutil.h"
-#include "libversit/vcc.h"
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-
-/* VCalendar product ID */
-#define PRODID "-//Helix Code//NONSGML Evolution Calendar//EN"
-
-static gint compare_exdates (gconstpointer a, gconstpointer b);
-static void ical_object_normalize_summary (iCalObject *ico);
-static void list_free (GList *list);
-
-
-
-char *
-ical_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname){
-		char buffer [128];
-
-		if ((gethostname (buffer, sizeof (buffer)-1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = g_strdup (buffer);
-		else
-			hostname = g_strdup ("localhost");
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-iCalObject *
-ical_object_new (void)
-{
-	iCalObject *ico;
-
-	ico = g_new0 (iCalObject, 1);
-
-	ico->seq = -1;
-	ico->dtstamp = time (NULL);
-	ico->uid = ical_gen_uid ();
-
-	ico->pilot_id = 0;
-	ico->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	ico->ref_count = 1;
-
-	return ico;
-}
-
-iCalObject *
-ical_new (char *comment, char *organizer, char *summary)
-{
-	iCalObject *ico;
-
-	ico = ical_object_new ();
-
-	ico->comment   = g_strdup (comment);
-	ico->organizer = g_new0 (iCalPerson, 1);
-	ico->organizer->addr = g_strdup (organizer);
-	ico->summary   = g_strdup (summary);
-	ico->class     = g_strdup ("PUBLIC");
-	ico->status    = g_strdup ("NEEDS ACTION");
-
-	ico->dalarm.type = ALARM_DISPLAY;
-	ico->palarm.type = ALARM_PROGRAM;
-	ico->malarm.type = ALARM_MAIL;
-	ico->aalarm.type = ALARM_AUDIO;
-
-	ical_object_normalize_summary (ico);
-
-	return ico;
-}
-
-
-void
-ical_object_ref (iCalObject *ico)
-{
-	ico->ref_count++;
-}
-
-
-#define free_if_defined(x) if (x){ g_free (x); x = 0; }
-#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }
-static void
-ical_object_destroy (iCalObject *ico)
-{
-	/* Regular strings */
-	free_if_defined  (ico->comment);
-	free_if_defined  (ico->organizer);
-	free_if_defined  (ico->summary);
-	free_if_defined  (ico->uid);
-	free_if_defined  (ico->status);
-	free_if_defined  (ico->class);
-	free_if_defined  (ico->url);
-	free_if_defined  (ico->recur);
-
-	/* Lists */
-	lfree_if_defined (ico->exdate);
-	lfree_if_defined (ico->categories);
-	lfree_if_defined (ico->resources);
-	lfree_if_defined (ico->related);
-	lfree_if_defined (ico->attach);
-
-	/* Alarms */
-	g_free (ico->dalarm.data);
-	g_free (ico->palarm.data);
-	g_free (ico->malarm.data);
-	g_free (ico->aalarm.data);
-
-	g_free (ico);
-}
-
-void
-ical_object_unref (iCalObject *ico)
-{
-	ico->ref_count--;
-	if (ico->ref_count == 0)
-		ical_object_destroy (ico);
-}
-
-
-static void
-my_free (gpointer data, gpointer user_dat_ignored)
-{
-	g_free (data);
-}
-
-static void
-list_free (GList *list)
-{
-	g_list_foreach (list, my_free, 0);
-	g_list_free (list);
-}
-
-/* This resets any recurrence rules of the iCalObject. */
-void
-ical_object_reset_recurrence (iCalObject *ico)
-{
-	free_if_defined  (ico->recur);
-	lfree_if_defined (ico->exdate);
-}
-
-static GList *
-set_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";"); s; s = strtok (NULL, ";"))
-		list = g_list_prepend (list, g_strdup (s));
-
-	return list;
-}
-
-static GList *
-set_date_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";,"); s; s = strtok (NULL, ";,")){
-		time_t *t = g_new (time_t, 1);
-
-		while (*s && isspace (*s))
-			s++;
-		*t = time_from_isodate (s);
-		list = g_list_prepend (list, t);
-	}
-	return list;
-}
-
-void
-ical_object_add_exdate (iCalObject *o, time_t t)
-{
-	time_t *pt = g_new (time_t, 1);
-
-	*pt = t;
-	o->exdate = g_list_prepend (o->exdate, pt);
-}
-
-static void
-ignore_space(char **str)
-{
-	while (**str && isspace (**str))
-		(*str)++;
-}
-
-static void
-skip_numbers (char **str)
-{
-	while (**str){
-		ignore_space (str);
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str))
-			(*str)++;
-	}
-}
-
-static void
-weekdaylist (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday |= 1 << i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-
-	if (o->recur->weekday == 0){
-		struct tm tm = *localtime (&o->dtstart);
-
-		o->recur->weekday = 1 << tm.tm_wday;
-	}
-}
-
-static void
-weekdaynum (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday = i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-}
-
-static void
-ocurrencelist (iCalObject *o, char **str)
-{
-	char *p;
-
-	ignore_space (str);
-	p = *str;
-	if (!isdigit (*p))
-		return;
-
-	if (!(*p >= '1' && *p <= '5'))
-		return;
-
-	if (!(*(p+1) == '+' || *(p+1) == '-'))
-		return;
-
-	o->recur->u.month_pos = (*p-'0') * (*(p+1) == '+' ? 1 : -1);
-	*str += 2;
-}
-
-#if 0
-
-static void
-daynumber (iCalObject *o, char **str)
-{
-	int val = 0;
-	char *p = *str;
-
-	ignore_space (str);
-	if (strcmp (p, "LD")){
-		o->recur->u.month_day = DAY_LASTDAY;
-		*str += 2;
-		return;
-	}
-
-	if (!(isdigit (*p)))
-		return;
-
-	while (**str && isdigit (**str)){
-		val = val * 10 + (**str - '0');
-		(*str)++;
-	}
-
-	if (**str == '+')
-		(*str)++;
-
-	if (**str == '-')
-		val *= -1;
-	o->recur->u.month_day = val;
-}
-
-#endif
-
-static void
-daynumberlist (iCalObject *o, char **str)
-{
-	int first = 0;
-	int val = 0;
-
-	ignore_space (str);
-
-	while (**str){
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str)){
-			val = 10 * val + (**str - '0');
-			(*str)++;
-		}
-		if (!first){
-			/*
-			 * Some broken applications set this to zero
-			 */
-			if (val == 0){
-				struct tm day = *localtime (&o->dtstart);
-
-				val = day.tm_mday;
-			}
-			o->recur->u.month_day = val;
-			first = 1;
-			val = 0;
-		}
-	}
-}
-
-static void
-load_recur_weekly (iCalObject *o, char **str)
-{
-	weekdaylist (o, str);
-}
-
-static void
-load_recur_monthly_pos (iCalObject *o, char **str)
-{
-	ocurrencelist (o, str);
-	weekdaynum (o, str);
-}
-
-static void
-load_recur_monthly_day (iCalObject *o, char **str)
-{
-	daynumberlist (o, str);
-}
-
-static void
-load_recur_yearly_month (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple months and we do expect
-	 * the dtstart to agree with the value on this field
-	 */
-	skip_numbers (str);
-}
-
-static void
-load_recur_yearly_day (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple days and we do expect
-	 * the dtstart to agree with the value on this field
-	 *
-	 * FIXME: we should support every-n-years
-	 */
-	skip_numbers (str);
-}
-
-static void
-duration (iCalObject *o, char **str)
-{
-	unsigned int duration = 0;
-
-	ignore_space (str);
-	if (**str != '#')
-		return;
-	(*str)++;
-	while (**str && isdigit (**str)){
-		duration = duration * 10 + (**str - '0');
-		(*str)++;
-	}
-	o->recur->duration = duration;
-}
-
-static void
-enddate (iCalObject *o, char **str)
-{
-	ignore_space (str);
-	if (isdigit (**str)){
-		o->recur->_enddate = time_from_isodate (*str);
-		*str += 16;
-	}
-}
-
-static int
-load_recurrence (iCalObject *o, char *str)
-{
-	enum RecurType type;
-	int  interval = 0;
-
-	type = -1;
-	switch (*str++){
-	case 'D':
-		type = RECUR_DAILY;
-		break;
-
-	case 'W':
-		type = RECUR_WEEKLY;
-		break;
-
-	case 'M':
-		if (*str == 'P')
-			type = RECUR_MONTHLY_BY_POS;
-	        else if (*str == 'D')
-			type = RECUR_MONTHLY_BY_DAY;
-		str++;
-		break;
-
-	case 'Y':
-		if (*str == 'M')
-			type = RECUR_YEARLY_BY_MONTH;
-		else if (*str == 'D')
-			type = RECUR_YEARLY_BY_DAY;
-		str++;
-		break;
-	}
-	if (type == -1)
-		return 0;
-
-	o->recur = g_new0 (Recurrence, 1);
-	o->recur->type = type;
-	ignore_space (&str);
-
-	/* Get the interval */
-	for (;*str && isdigit (*str);str++)
-		interval = interval * 10 + (*str-'0');
-
-	if (interval == 0)
-		interval = 1;
-
-	o->recur->interval = interval;
-
-	/* this is the default per the spec */
-	o->recur->duration = 2;
-
-	ignore_space (&str);
-
-	switch (type){
-	case RECUR_DAILY:
-		break;
-	case RECUR_WEEKLY:
-		load_recur_weekly (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_POS:
-		load_recur_monthly_pos (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		load_recur_monthly_day (o, &str);
-		break;
-	case RECUR_YEARLY_BY_MONTH:
-		load_recur_yearly_month (o, &str);
-		break;
-	case RECUR_YEARLY_BY_DAY:
-		load_recur_yearly_day (o, &str);
-		break;
-	default:
-		g_warning ("Unimplemented recurrence type %d", (int) type);
-		break;
-	}
-	duration (o, &str);
-	enddate (o, &str);
-
-	/* Compute the enddate */
-	if (o->recur->_enddate == 0){
-		if (o->recur->duration != 0){
-			ical_object_compute_end (o);
-		} else
-			o->recur->enddate = 0;
-	} else {
-		o->recur->enddate = o->recur->_enddate;
-	}
-	return 1;
-}
-
-#define is_a_prop_of(obj,prop) isAPropertyOf (obj,prop)
-#define str_val(obj) the_str = fakeCString (vObjectUStringZValue (obj))
-#define has(obj,prop) (vo = isAPropertyOf (obj, prop))
-
-/*
- * FIXME: This is loosing precission.  Enhanec the thresholds
- */
-#define HOURS(n) (n*(60*60))
-
-static void
-setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *vo)
-{
-	time_t alarm_time = time_from_isodate (iso_time);
-	time_t base = ico->dtstart;
-	int d = difftime (base, alarm_time);
-	VObject *a;
-	char *the_str;
-
-	alarm->enabled = 1;
-	if (d > HOURS (2)){
-		if (d > HOURS (48)){
-			alarm->count = d / HOURS (24);
-			alarm->units = ALARM_DAYS;
-		} else {
-			alarm->count = d / (60*60);
-			alarm->units = ALARM_HOURS;
-		}
-	} else {
-		alarm->count = d / 60;
-		alarm->units = ALARM_MINUTES;
-	}
-
-	if ((a = is_a_prop_of (vo, VCSnoozeTimeProp))){
-		alarm->snooze_secs = isodiff_to_secs (str_val (a));
-		free (the_str);
-	}
-
-	if ((a = is_a_prop_of (vo, VCRepeatCountProp))){
-		alarm->snooze_repeat = atoi (str_val (a));
-		free (the_str);
-	}
-}
-
-/*
- * Duplicates an iCalObject.  Implementation is a grand hack.
- * If you need the new ICalObject to have a new uid, free the current one,
- * and call ical_gen_uid() to generate a new one.
- */
-iCalObject *
-ical_object_duplicate (iCalObject *o)
-{
-	VObject *vo;
-	iCalObject *new;
-
-	vo = ical_object_to_vobject (o);
-	switch (o->type){
-	case ICAL_EVENT:
-		new = ical_object_create_from_vobject (vo, VCEventProp);
-		break;
-	case ICAL_TODO:
-		new = ical_object_create_from_vobject (vo, VCTodoProp);
-		break;
-	default:
-		new = NULL;
-	}
-
-	cleanVObject (vo);
-	return new;
-}
-
-/* FIXME: we need to load the recurrence properties */
-iCalObject *
-ical_object_create_from_vobject (VObject *o, const char *object_name)
-{
-	time_t  now = time (NULL);
-	iCalObject *ical;
-	VObject *vo, *a;
-	VObjectIterator i;
-	char *the_str;
-
-	ical = g_new0 (iCalObject, 1);
-
-	if (strcmp (object_name, VCEventProp) == 0)
-		ical->type = ICAL_EVENT;
-	else if (strcmp (object_name, VCTodoProp) == 0)
-		ical->type = ICAL_TODO;
-	else {
-		g_free (ical);
-		return 0;
-	}
-
-	ical->ref_count = 1;
-
-	/* uid */
-	if (has (o, VCUniqueStringProp)){
-		ical->uid = g_strdup (str_val (vo));
-		free (the_str);
-	} else {
-		ical->uid = ical_gen_uid ();
-	}
-
-	/* seq */
-	if (has (o, VCSequenceProp)){
-		ical->seq = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->seq = 0;
-
-	/* dtstart */
-	if (has (o, VCDTstartProp)){
-		ical->dtstart = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->dtstart = 0;
-
-	/* dtend */
-	ical->dtend = 0;	/* default value */
-	if (ical->type == ICAL_EVENT){
-		if (has (o, VCDTendProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	} else if (ical->type == ICAL_TODO){
-		if (has (o, VCDueProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	}
-
-	/* dcreated */
-	if (has (o, VCDCreatedProp)){
-		ical->created = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* completed */
-	if (has (o, VCCompletedProp)){
-		ical->completed = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* last_mod */
-	if (has (o, VCLastModifiedProp)){
-		ical->last_mod = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->last_mod = now;
-
-	/* exdate */
-	if (has (o, VCExpDateProp)){
-		ical->exdate = set_date_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* description/comment */
-	if (has (o, VCDescriptionProp)){
-		ical->comment = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* summary */
-	if (has (o, VCSummaryProp)){
-		ical->summary = g_strdup (str_val (vo));
-		free (the_str);
-
-		/* Convert any CR/LF/CRLF sequences in the summary field to
-		   spaces so we just have a one-line field. */
-		ical_object_normalize_summary (ical);
-	} else 
-		ical->summary = g_strdup ("");
-
-	/* status */
-	if (has (o, VCStatusProp)){
-		ical->status = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->status = g_strdup ("NEEDS ACTION");
-
-	if (has (o, VCClassProp)){
-		ical->class = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->class = g_strdup ("PUBLIC");
-
-	/* categories */
-	if (has (o, VCCategoriesProp)){
-		ical->categories = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* resources */
-	if (has (o, VCResourcesProp)){
-		ical->resources = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* priority */
-	if (has (o, VCPriorityProp)){
-		ical->priority = atoi (str_val (vo));
-		free (the_str);
-	}
-
-	/* tranparency */
-	if (has (o, VCTranspProp)){
-		ical->transp = atoi (str_val (vo)) ? ICAL_TRANSPARENT : ICAL_OPAQUE;
-		free (the_str);
-	}
-
-	/* Organizer */
-	if (has (o, VCOrgNameProp)){
-		ical->organizer = g_new0 (iCalPerson, 1);
-		ical->organizer->addr = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* related */
-	if (has (o, VCRelatedToProp)){
-		char *str;
-		char *s;
-		iCalRelation *rel;
-		str = str_val (vo);
-		for (s = strtok (str, ";"); s; s = strtok (NULL, ";")) {
-			rel = g_new0 (iCalRelation, 1);
-			rel->uid = g_strdup (s);
-			rel->reltype = g_strdup ("PARENT");
-			ical->related = g_list_prepend (ical->related, rel);
-		}
-		free (the_str);
-	}
-
-	/* attach */
-	initPropIterator (&i, o);
-	while (moreIteration (&i)){
-		vo = nextVObject (&i);
-		if (strcmp (vObjectName (vo), VCAttachProp) == 0){
-			ical->attach = g_list_prepend (ical->attach, g_strdup (str_val (vo)));
-			free (the_str);
-		}
-	}
-
-	/* url */
-	if (has (o, VCURLProp)){
-		/* There seems to be a problem with the URL property. For some
-		   reason an empty property gets saved, vObjectUStringZValue
-		   returns NULL and fakeCString crashes. So we check for NULL.
-		*/
-		const wchar_t *zval;
-
-		zval = vObjectUStringZValue (o);
-		if (zval) {
-			the_str = fakeCString (zval);
-			ical->url = g_strdup (the_str);
-			free (the_str);
-		}
-	}
-
-	/* dalarm */
-	ical->dalarm.type = ALARM_DISPLAY;
-	ical->dalarm.enabled = 0;
-	if (has (o, VCDAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->dalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* aalarm */
-	ical->aalarm.type = ALARM_AUDIO;
-	ical->aalarm.enabled = 0;
-	if (has (o, VCAAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->aalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* palarm */
-	ical->palarm.type = ALARM_PROGRAM;
-	ical->palarm.enabled = 0;
-	if (has (o, VCPAlarmProp)){
-		ical->palarm.type = ALARM_PROGRAM;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->palarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCProcedureNameProp))){
-				ical->palarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->palarm.data = g_strdup ("");
-		}
-	}
-
-	/* malarm */
-	ical->malarm.type = ALARM_MAIL;
-	ical->malarm.enabled = 0;
-	if (has (o, VCMAlarmProp)){
-		ical->malarm.type = ALARM_MAIL;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->malarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCEmailAddressProp))){
-				ical->malarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->malarm.data = g_strdup ("");
-		}
-	}
-
-	/* rrule */
-	if (has (o, VCRRuleProp)){
-		if (!load_recurrence (ical, str_val (vo))) {
-			ical_object_unref (ical);
-			return NULL;
-		}
-		free (the_str);
-	}
-
-	/*
-	 * Pilot
-	 */
-	if (has (o, XPilotIdProp)){
-		ical->pilot_id = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_id = 0;
-
-	if (has (o, XPilotStatusProp)){
-		ical->pilot_status = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	return ical;
-}
-
-static char *
-to_str (int num)
-{
-	static char buf [40];
-
-	sprintf (buf, "%d", num);
-	return buf;
-}
-
-/*
- * stores a GList in the property.
- */
-static void
-store_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (l->data) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (l->data);
-
-		strcpy (p, l->data);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_rel_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-	
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (((iCalRelation*)(l->data))->uid) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (((iCalRelation*)(l->data))->uid);
-		
-		strcpy (p, ((iCalRelation*)(l->data))->uid);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_date_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int   size, len;
-	char  *s, *p;
-
-	size = g_list_length (values);
-	s = p = g_malloc ((size * 17 + 1) * sizeof (char));
-
-	for (l = values; l; l = l->next){
-		strcpy (s, isodate_from_time_t (*(time_t *)l->data));
-		len = strlen (s);
-		s [len] = ',';
-		s += len + 1;
-	}
-	s--;
-	*s = 0;
-	addPropValue (o, prop, p);
-	g_free (p);
-}
-
-static char *recur_type_name [] = { "D", "W", "MP", "MD", "YM", "YD" };
-static char *recur_day_list  [] = { "SU", "MO", "TU","WE", "TH", "FR", "SA" };
-static char *alarm_names [] = { VCMAlarmProp, VCPAlarmProp, VCDAlarmProp, VCAAlarmProp };
-
-static VObject *
-save_alarm (VObject *o, CalendarAlarm *alarm, iCalObject *ical)
-{
-	VObject *alarm_object;
-	struct tm tm;
-	time_t alarm_time;
-
-	if (!alarm->enabled)
-		return NULL;
-	tm = *localtime (&ical->dtstart);
-	switch (alarm->units){
-	case ALARM_MINUTES:
-		tm.tm_min -= alarm->count;
-		break;
-
-	case ALARM_HOURS:
-		tm.tm_hour -= alarm->count;
-		break;
-
-	case ALARM_DAYS:
-		tm.tm_mday -= alarm->count;
-		break;
-	}
-
-	alarm_time = mktime (&tm);
-	alarm_object = addProp (o, alarm_names [alarm->type]);
-	addPropValue (alarm_object, VCRunTimeProp, isodate_from_time_t (alarm_time));
-
-	if (alarm->snooze_secs)
-		addPropValue (alarm_object, VCSnoozeTimeProp, isodiff_from_secs (alarm->snooze_secs));
-	else
-		addPropValue (alarm_object, VCSnoozeTimeProp, "");
-
-	if (alarm->snooze_repeat){
-		char buf [20];
-
-		sprintf (buf, "%d", alarm->snooze_repeat);
-		addPropValue (alarm_object, VCRepeatCountProp, buf);
-	} else
-		addPropValue (alarm_object, VCRepeatCountProp, "");
-	return alarm_object;
-}
-
-VObject *
-ical_object_to_vobject (iCalObject *ical)
-{
-	VObject *o, *alarm, *s;
-	GList *l;
-
-	if (ical->type == ICAL_EVENT)
-		o = newVObject (VCEventProp);
-	else
-		o = newVObject (VCTodoProp);
-
-	/* uid */
-	if (ical->uid)
-		addPropValue (o, VCUniqueStringProp, ical->uid);
-
-	/* seq */
-	addPropValue (o, VCSequenceProp, to_str (ical->seq));
-
-	/* dtstart */
-	addPropValue (o, VCDTstartProp, isodate_from_time_t (ical->dtstart));
-
-	/* dtend */
-	if (ical->type == ICAL_EVENT){
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->dtend));
-	} else if (ical->type == ICAL_TODO){
-		addPropValue (o, VCDueProp, isodate_from_time_t (ical->dtend));
-	}
-
-	/* dcreated */
-	addPropValue (o, VCDCreatedProp, isodate_from_time_t (ical->created));
-
-	/* completed */
-	if (ical->completed)
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->completed));
-
-	/* last_mod */
-	addPropValue (o, VCLastModifiedProp, isodate_from_time_t (ical->last_mod));
-
-	/* exdate */
-	if (ical->exdate)
-		store_date_list (o, VCExpDateProp, ical->exdate);
-
-	/* description/comment */
-	if (ical->comment && strlen (ical->comment)){
-		s = addPropValue (o, VCDescriptionProp, ical->comment);
-		if (strchr (ical->comment, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-
-	/* summary */
-	if (ical->summary && strlen (ical->summary)) {
-		s = addPropValue (o, VCSummaryProp, ical->summary);
-		if (strchr (ical->summary, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-		
-	/* status */
-	addPropValue (o, VCStatusProp, ical->status);
-
-	/* class */
-	addPropValue (o, VCClassProp, ical->class);
-
-	/* categories */
-	if (ical->categories)
-		store_list (o, VCCategoriesProp, ical->categories);
-
-	/* resources */
-	if (ical->resources)
-		store_list (o, VCCategoriesProp, ical->resources);
-
-	/* priority */
-	addPropValue (o, VCPriorityProp, to_str (ical->priority));
-
-	/* transparency */
-	addPropValue (o, VCTranspProp, to_str (ical->transp));
-
-	/* Owner/organizer */
-	if (ical->organizer && ical->organizer->addr)
-		addPropValue (o, VCOrgNameProp, ical->organizer->addr);
-
-	/* related */
-	if (ical->related)
-		store_rel_list (o, VCRelatedToProp, ical->related);
-
-	/* attach */
-	for (l = ical->attach; l; l = l->next)
-		addPropValue (o, VCAttachProp, l->data);
-
-	/* url */
-	if (ical->url)
-		addPropValue (o, VCURLProp, ical->url);
-
-	if (ical->recur){
-		char result [256];
-		char buffer [80];
-		int i;
-
-		sprintf (result, "%s%d ", recur_type_name [ical->recur->type], ical->recur->interval);
-		switch (ical->recur->type){
-		case RECUR_DAILY:
-			break;
-
-		case RECUR_WEEKLY:
-			for (i = 0; i < 7; i++){
-				if (ical->recur->weekday & (1 << i)){
-					sprintf (buffer, "%s ", recur_day_list [i]);
-					strcat (result, buffer);
-				}
-			}
-			break;
-
-		case RECUR_MONTHLY_BY_POS: {
-			int nega = ical->recur->u.month_pos < 0;
-
-			sprintf (buffer, "%d%s ", nega ? -ical->recur->u.month_pos : ical->recur->u.month_pos,
-				 nega ? "-" : "+");
-			strcat (result, buffer);
-			/* the gui is set up for a single day, not a set here in this case */
-			sprintf (buffer, "%s ", recur_day_list [ical->recur->weekday]);
-			strcat (result, buffer);
-		}
-		break;
-
-		case RECUR_MONTHLY_BY_DAY:
-			sprintf (buffer, "%d ", ical->recur->u.month_pos);
-			strcat (result, buffer);
-			break;
-
-		case RECUR_YEARLY_BY_MONTH:
-			break;
-
-		case RECUR_YEARLY_BY_DAY:
-			break;
-		}
-		if (ical->recur->_enddate == 0)
-			sprintf (buffer, "#%d ",ical->recur->duration);
-		else
-			sprintf (buffer, "%s ", isodate_from_time_t (ical->recur->_enddate));
-		strcat (result, buffer);
-		addPropValue (o, VCRRuleProp, result);
-	}
-
-	save_alarm (o, &ical->aalarm, ical);
-	save_alarm (o, &ical->dalarm, ical);
-
-	if ((alarm = save_alarm (o, &ical->palarm, ical)))
-		addPropValue (alarm, VCProcedureNameProp, ical->palarm.data);
-	if ((alarm = save_alarm (o, &ical->malarm, ical)))
-		addPropValue (alarm, VCEmailAddressProp, ical->malarm.data);
-
-	/* Pilot */
-	{
-		char buffer [20];
-
-		sprintf (buffer, "%d", ical->pilot_id);
-		addPropValue (o, XPilotIdProp, buffer);
-		sprintf (buffer, "%d", ical->pilot_status);
-		addPropValue (o, XPilotStatusProp, buffer);
-	}
-
-	return o;
-}
-
-void
-ical_foreach (GList *events, calendarfn fn, void *closure)
-{
-	for (; events; events = events->next){
-		iCalObject *ical = events->data;
-
-		(*fn) (ical, ical->dtstart, ical->dtend, closure);
-	}
-}
-
-static int
-is_date_in_list (GList *list, struct tm *date)
-{
-	struct tm tm;
-
-	for (; list; list = list->next){
-		time_t *timep = list->data;
-
-		tm = *localtime (timep);
-		if (date->tm_mday == tm.tm_mday &&
-		    date->tm_mon  == tm.tm_mon &&
-		    date->tm_year == tm.tm_year){
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Generates an event instance based on the reference time */
-static gboolean
-generate (iCalObject *ico, time_t reference, calendarfn cb, void *closure)
-{
-	time_t offset;
-	struct tm tm_start, ref;
-	time_t start, end;
-
-	offset = ico->dtend - ico->dtstart;
-
-	tm_start = *localtime (&ico->dtstart);
-	ref      = *localtime (&reference);
-
-	tm_start.tm_mday = ref.tm_mday;
-	tm_start.tm_mon  = ref.tm_mon;
-	tm_start.tm_year = ref.tm_year;
-
-	start = mktime (&tm_start);
-	if (start == -1) {
-		g_message ("generate(): Produced invalid start date!");
-		return FALSE;
-	}
-
-	end = start + offset;
-
-#if 0
-	/* FIXME: I think this is not needed, since we are offsetting by full day values,
-	 * and the times should remain the same --- if you have a daily appointment
-	 * at 18:00, it is always at 18:00 even during daylight savings.
-	 *
-	 * However, what should happen on the exact change-of-savings day with
-	 * appointments in the early morning hours?
-	 */
-
-	if (ref.tm_isdst > tm_start.tm_isdst) {
-		tm_start.tm_hour--;
-		tm_end.tm_hour--;
-	} else if (ref.tm_isdst < tm_start.tm_isdst) {
-		tm_start.tm_hour++;
-		tm_end.tm_hour++;
-	}
-#endif
-
-	if (ico->exdate && is_date_in_list (ico->exdate, &tm_start))
-		return TRUE;
-
-	return (*cb) (ico, start, end, closure);
-}
-
-int
-ical_object_get_first_weekday (int weekday_mask)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		if (weekday_mask & (1 << i))
-			return i;
-
-	return -1;
-}
-
-#define time_in_range(t, a, b) ((t >= a) && (b ? (t < b) : 1))
-#define recur_in_range(t, r) (r->enddate ? (t < r->enddate) : 1)
-
-/*
- * Generate every possible event.  Invokes the callback routine for
- * every occurrence of the event in the [START, END] time interval.
- *
- * If END is zero, the event is generated forever.
- * The callback routine is expected to return 0 when no further event
- * generation is requested.
- */
-void
-ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure)
-{
-	time_t current;
-	int first_week_day;
-
-	/* If there is no recurrence, just check ranges */
-
-	if (!ico->recur) {
-		if ((end && (ico->dtstart < end) && (ico->dtend > start))
-		    || ((end == 0) && (ico->dtend > start))) {
-			/* The new calendar views expect the times to not be
-			   clipped, so they can show that it continues past
-			   the end of the viewable area. */
-#if 0
-			time_t ev_s, ev_e;
-
-			/* Clip range */
-
-			ev_s = MAX (ico->dtstart, start);
-			ev_e = MIN (ico->dtend, end);
-
-			(* cb) (ico, ev_s, ev_e, closure);
-#else
-			(* cb) (ico, ico->dtstart, ico->dtend, closure);
-#endif
-		}
-		return;
-	}
-
-	/* The event has a recurrence rule -- check that we will generate at least one instance */
-
-	if (end != 0) {
-		if (ico->dtstart > end)
-			return;
-
-		if (!IS_INFINITE (ico->recur) && (ico->recur->enddate < start))
-			return;
-	}
-
-	/* Generate the instances */
-
-	current = ico->dtstart;
-
-	switch (ico->recur->type) {
-	case RECUR_DAILY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_day (current, ico->recur->interval);
-
-			if (current == -1) {
-				g_warning ("RECUR_DAILY: time_add_day() returned invalid time");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_WEEKLY:
-		do {
-			struct tm tm;
-
-			tm = *localtime (&current);
-
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur)) {
-				/* Weekdays to recur on are specified as a bitmask */
-			  if (ico->recur->weekday & (1 << tm.tm_wday)) {
-					if (!generate (ico, current, cb, closure))
-						return;
-			  }
-			}
-
-			/* Advance by day for scanning the week or by interval at week end */
-
-			if (tm.tm_wday == 6)
-				current = time_add_day (current, (ico->recur->interval - 1) * 7 + 1);
-			else
-				current = time_add_day (current, 1);
-
-			if (current == -1) {
-				g_warning ("RECUR_WEEKLY: time_add_day() returned invalid time\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_POS:
-		/* FIXME: We only deal with positives now */
-		if (ico->recur->u.month_pos < 0) {
-			g_warning ("RECUR_MONTHLY_BY_POS does not support negative positions yet");
-			return;
-		}
-
-		if (ico->recur->u.month_pos == 0)
-			return;
-
-		first_week_day = /* ical_object_get_first_weekday (ico->recur->weekday);  */
-			ico->recur->weekday; /* the i/f only lets you choose a single day of the week! */
-
-		/* This should not happen, but take it into account */
-		if (first_week_day == -1) {
-			g_warning ("ical_object_get_first_weekday() returned -1");
-			return;
-		}
-
-		do {
-			struct tm tm;
-			time_t t;
-			int    week_day_start;
-
-			tm = *localtime (&current);
-			tm.tm_mday = 1;
-			t = mktime (&tm);
-			tm = *localtime (&t);
-			week_day_start = tm.tm_wday;
-
-			tm.tm_mday = (7 * (ico->recur->u.month_pos - ((week_day_start <= first_week_day ) ? 1 : 0))
-				      - (week_day_start - first_week_day) + 1);
-			if( tm.tm_mday > 31 )
-			{
-				tm.tm_mday = 1;
-				tm.tm_mon += ico->recur->interval;
-				current = mktime (&tm);
-				continue;
-			}
-
-			switch( tm.tm_mon )
-			{
-			case 3:
-			case 5:
-			case 8:
-			case 10:
-				if( tm.tm_mday > 30 )
-				{
-					tm.tm_mday = 1;
-					tm.tm_mon += ico->recur->interval;
-					current = mktime (&tm);
-					continue;
-				}
-				break;
-			case 1:
-				if( ((tm.tm_year+1900)%4) == 0
-					&& ((tm.tm_year+1900)%400) != 100
-					&& ((tm.tm_year+1900)%400) != 200
-					&& ((tm.tm_year+1900)%400) != 300 )
-				{
-
-					if( tm.tm_mday > 29 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				else
-				{
-					if( tm.tm_mday > 28 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				break;
-			}
-
-			t = mktime (&tm);
-
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			current = mktime (&tm);
-
-			tm.tm_mday = 1;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_DAY:
-		do {
-			struct tm tm;
-			time_t t;
-			int    p;
-
-			tm = *localtime (&current);
-
-			p = tm.tm_mday;
-			tm.tm_mday = ico->recur->u.month_day;
-			t = mktime (&tm);
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			tm.tm_mday = p;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_YEARLY_BY_MONTH:
-	case RECUR_YEARLY_BY_DAY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_year (current, ico->recur->interval);
-		} while (current < end || (end == 0));
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static int
-duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
-{
-	int *count = closure;
-	struct tm tm;
-
-	tm = *localtime (&start);
-
-	(*count)++;
-	if (ico->recur->duration == *count) {
-		ico->recur->enddate = time_day_end (end);
-		return 0;
-	}
-	return 1;
-}
-
-/* Computes ico->recur->enddate from ico->recur->duration */
-void
-ical_object_compute_end (iCalObject *ico)
-{
-	int count = 0;
-
-	g_return_if_fail (ico->recur != NULL);
-
-	ico->recur->_enddate = 0;
-	ico->recur->enddate = 0;
-	ical_object_generate_events (ico, ico->dtstart, 0, duration_callback, &count);
-}
-
-int
-alarm_compute_offset (CalendarAlarm *a)
-{
-	if (!a->enabled)
-		return -1;
-	switch (a->units){
-	case ALARM_MINUTES:
-		a->offset = a->count * 60;
-		break;
-	case ALARM_HOURS:
-		a->offset = a->count * 3600;
-		break;
-	case ALARM_DAYS:
-		a->offset = a->count * 24 * 3600;
-	}
-	return a->offset;
-}
-
-
-/**
- * ical_object_find_in_string:
- * @uid: Unique identifier of the sought object.
- * @vcalobj: String representation of a complete calendar object.
- * @ico: The resulting #iCalObject is stored here.
- *
- * Parses a complete vCalendar object string and tries to find the calendar
- * object that matches the specified @uid.  If found, it stores the resulting
- * #iCalObject in the @ico parameter.
- *
- * Return value: A result code depending on whether the parse and search were
- * successful.
- **/
-CalObjFindStatus
-ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico)
-{
-#if 0
-	icalcomponent* comp = NULL;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_NOT_FOUND);
-
-	comp = icalparser_parse_string (vcalobj);
-
-	if (!comp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #1\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	if (!subcomp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #2\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			if (strcasecmp (ical->uid, uid) == 0) {
-				(*ico) = ical;
-				(*ico)->ref_count = 1;
-				printf ("CAL_OBJ_FIND_SUCCESS\n");
-
-	printf ("ical_object_find_in_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (*ico);
-	printf ("-----------------------------------------------------\n");
-
-
-				return CAL_OBJ_FIND_SUCCESS;
-			}
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	printf ("CAL_OBJ_FIND_NOT_FOUND\n");
-	return CAL_OBJ_FIND_NOT_FOUND;
-
-#else /* 1 */
-	VObject *vcal;
-	VObjectIterator i;
-	CalObjFindStatus status;
-
-	g_return_val_if_fail (uid != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (ico != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-
-	*ico = NULL;
-	status = CAL_OBJ_FIND_NOT_FOUND;
-
-	vcal = Parse_MIME (vcalobj, strlen (vcalobj));
-
-	if (!vcal)
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-
-	initPropIterator (&i, vcal);
-
-	while (moreIteration (&i)) {
-		VObject *vobj;
-		VObject *uid_prop;
-		char *the_str;
-
-		vobj = nextVObject (&i);
-
-		uid_prop = isAPropertyOf (vobj, VCUniqueStringProp);
-		if (!uid_prop)
-			continue;
-
-		/* str_val() sets the_str to the string representation of the
-		 * property.
-		 */
-		str_val (uid_prop);
-
-		if (strcmp (the_str, uid) == 0) {
-			const char *object_name;
-
-			object_name = vObjectName (vobj);
-			*ico = ical_object_create_from_vobject (vobj, object_name);
-
-			if (*ico)
-				status = CAL_OBJ_FIND_SUCCESS;
-		}
-
-		free (the_str);
-
-		if (status == CAL_OBJ_FIND_SUCCESS)
-			break;
-	}
-
-	cleanVObject (vcal);
-	cleanStrTbl ();
-
-	return status;
-#endif /* 1 */
-}
-
-
-#if 1
-/* Creates a VObject with the base information of a calendar */
-static VObject *
-get_calendar_base_vobject (void)
-{
-	VObject *vobj;
-	time_t now;
-	struct tm tm;
-
-	/* We call localtime for the side effect of setting tzname */
-
-	now = time (NULL);
-	tm = *localtime (&now);
-
-	vobj = newVObject (VCCalProp);
-
-	addPropValue (vobj, VCProdIdProp, PRODID);
-
-#if defined (HAVE_TM_ZONE)
-	addPropValue (vobj, VCTimeZoneProp, tm.tm_zone);
-#elif defined (HAVE_TZNAME)
-	addPropValue (vobj, VCTimeZoneProp, tzname[0]);
-#endif
-
-	/* Per the vCalendar spec, this must be "1.0" */
-	addPropValue (vobj, VCVersionProp, "1.0");
-
-	return vobj;
-}
-#endif /* 0 */
-
-/**
- * ical_object_to_string:
- * @ico: A calendar object.
- * 
- * Converts a vCalendar object to its string representation.  It is wrapped
- * inside a complete VCALENDAR object because other auxiliary information such
- * as timezones may appear there.
- * 
- * Return value: String representation of the object.
- **/
-char *
-ical_object_to_string (iCalObject *ico)
-{
-#if 0
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-	icalcomponent *comp;
-
-	printf ("ical_object_to_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (ico);
-	printf ("-----------------------------------------------------\n");
-
-	comp = icalcomponent_create_from_ical_object (ico);
-	icalcomponent_add_component (top, comp);
-	out_cal_string = icalcomponent_as_ical_string (top);
-	return g_strdup (out_cal_string);
-
-#else /* 1 */
-	VObject *vcalobj, *vobj;
-	char *buf, *gbuf;
-
-	vcalobj = get_calendar_base_vobject ();
-	vobj = ical_object_to_vobject (ico);
-	addVObjectProp (vcalobj, vobj);
-
-	buf = writeMemVObject (NULL, NULL, vcalobj);
-
-	cleanVObject (vcalobj);
-	cleanStrTbl ();
-
-	/* We have to g_strdup() it because libversit uses malloc()/realloc(),
-	 * and we want clients to be able to use g_free().  Sigh.
-	 */
-	gbuf = g_strdup (buf);
-	free (buf);
-
-	return gbuf;
-#endif /* 1 */
-}
-
-
-/**
- * ical_object_compare_dates:
- * @ico1: A calendar event.
- * @ico2: A calendar event to compare with @ico1.
- * 
- * Returns TRUE if the dates of both objects match, including any recurrence
- * rules. Both calendar objects must have a type of ICAL_EVENT.
- * 
- * Return value: TRUE if both calendar objects have the same dates.
- **/
-gboolean
-ical_object_compare_dates (iCalObject *ico1,
-			   iCalObject *ico2)
-{
-	Recurrence *recur1, *recur2;
-	gint num_exdates;
-	GList *elem1, *elem2;
-	time_t *time1, *time2;
-
-	g_return_val_if_fail (ico1 != NULL, FALSE);
-	g_return_val_if_fail (ico2 != NULL, FALSE);
-	g_return_val_if_fail (ico1->type == ICAL_EVENT, FALSE);
-	g_return_val_if_fail (ico2->type == ICAL_EVENT, FALSE);
-
-	/* First check the base dates. */
-	if (ico1->dtstart != ico2->dtstart
-	    || ico1->dtend != ico2->dtend)
-		return FALSE;
-
-	recur1 = ico1->recur;
-	recur2 = ico2->recur;
-
-	/* If the event doesn't recur, we already know it matches. */
-	if (!recur1 && !recur2)
-		return TRUE;
-
-	/* Check that both recur. */
-	if (!(recur1 && recur2))
-		return FALSE;
-
-	/* Now we need to see if the recurrence rules are the same. */
-	if (recur1->type != recur2->type
-	    || recur1->interval != recur2->interval
-	    || recur1->enddate != recur2->enddate
-	    || recur1->weekday != recur2->weekday
-	    || recur1->duration != recur2->duration
-	    || recur1->_enddate != recur2->_enddate
-	    || recur1->__count != recur2->__count)
-		return FALSE;
-
-	switch (recur1->type) {
-	case RECUR_MONTHLY_BY_POS:
-		if (recur1->u.month_pos != recur2->u.month_pos)
-			return FALSE;
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		if (recur1->u.month_day != recur2->u.month_day)
-			return FALSE;
-		break;
-	default:
-		break;
-	}
-
-	/* Now check if the excluded dates match. */
-	num_exdates = g_list_length (ico1->exdate);
-	if (g_list_length (ico2->exdate) != num_exdates)
-		return FALSE;
-	if (num_exdates == 0)
-		return TRUE;
-
-	ico1->exdate = g_list_sort (ico1->exdate, compare_exdates);
-	ico2->exdate = g_list_sort (ico2->exdate, compare_exdates);
-
-	elem1 = ico1->exdate;
-	elem2 = ico2->exdate;
-	while (elem1) {
-		time1 = (time_t*) elem1->data;
-		time2 = (time_t*) elem2->data;
-
-		if (*time1 != *time2)
-			return FALSE;
-
-		elem1 = elem1->next;
-		elem2 = elem2->next;
-	}
-
-	return TRUE;
-}
-
-
-static gint
-compare_exdates (gconstpointer a, gconstpointer b)
-{
-	const time_t *ca = a, *cb = b;
-	time_t diff = *ca - *cb;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-
-/* Converts any CR/LF sequences in the summary field to spaces so we just
-   have a one-line field. The iCalObjects summary field is changed. */
-static void
-ical_object_normalize_summary (iCalObject *ico)
-{
-	gchar *src, *dest, ch;
-	gboolean just_output_space = FALSE;
-
-	src = dest = ico->summary;
-	while ((ch = *src++)) {
-		if (ch == '\n' || ch == '\r') {
-			/* We only output 1 space for each sequence of CR & LF
-			   characters. */
-			if (!just_output_space) {
-				*dest++ = ' ';
-				just_output_space = TRUE;
-			}
-		} else {
-			*dest++ = ch;
-			just_output_space = FALSE;
-		}
-	}
-	*dest = '\0';
-}
-
-
-void dump_icalobject (iCalObject *ico)
-{
-	if (!ico) {
-		printf ("<<NULL>>\n");
-		return;
-	}
-
-	printf ("type ");
-	switch (ico->type) {
-	case ICAL_EVENT: printf ("event"); break;
-	case ICAL_TODO: printf ("todo"); break;
-	case ICAL_JOURNAL: printf ("journal"); break;
-	case ICAL_FBREQUEST: printf ("fbrequest"); break;
-	case ICAL_FBREPLY: printf ("fbreply"); break;
-	case ICAL_BUSYTIME: printf ("busytime"); break;
-	case ICAL_TIMEZONE: printf ("timezone"); break;
-	}
-	printf ("\n");
-
-	printf ("attach-length %d\n", g_list_length (ico->attach));
-
-	printf ("attendee-length %d\n", g_list_length (ico->attendee));
-
-	printf ("catagories-length %d\n", g_list_length (ico->categories));
-
-	printf ("class '%s'\n", ico->class ? ico->class : "NULL");
-
-	printf ("comment '%s'\n", ico->comment ? ico->comment : "NULL");
-
-	printf ("completed %ld=%s",
-		ico->completed, ctime (&ico->completed));
-
-	printf ("created %ld=%s", ico->created, ctime (&ico->created));
-
-	printf ("contact-length %d\n", g_list_length (ico->contact));
-
-	printf ("desc '%s'\n", ico->desc ? ico->desc : "NULL");
-
-	printf ("dtstamp %ld=%s", ico->dtstamp, ctime (&ico->dtstamp));
-
-	printf ("dtstart %ld=%s", ico->dtstart, ctime (&ico->dtstart));
-
-	printf ("dtend %ld=%s", ico->dtend, ctime (&ico->dtend));
-
-	printf ("date_only %d\n", ico->date_only);
-
-	printf ("exdate-length %d\n", g_list_length (ico->exdate));
-
-	printf ("exrule-length %d\n", g_list_length (ico->exrule));
-
-	printf ("iCalGeo %d %f %f\n",
-		ico->geo.valid, ico->geo.latitude, ico->geo.longitude);
-
-	printf ("last_mod %ld=%s", ico->last_mod, ctime (&ico->last_mod));
-
-	printf ("location '%s'\n", ico->location ? ico->location : "NULL");
-
-	printf ("organizer %p\n", ico->organizer);
-
-	printf ("percent %d\n", ico->percent);
-
-	printf ("priority %d\n", ico->priority);
-
-	printf ("rstatus '%s'\n", ico->rstatus ? ico->rstatus : "NULL");
-
-	printf ("related-length %d\n", g_list_length (ico->related));
-
-	printf ("resources-length %d\n", g_list_length (ico->resources));
-
-	printf ("rdate-length %d\n", g_list_length (ico->rdate));
-
-	printf ("rrule-length %d\n", g_list_length (ico->rrule));
-
-	printf ("seq %d\n", ico->seq);
-
-	printf ("status '%s'\n", ico->status ? ico->status : "NULL");
-
-	printf ("summary '%s'\n", ico->summary ? ico->summary : "NULL");
-
-	printf ("transp ");
-	switch (ico->transp) {
-	case ICAL_OPAQUE: printf ("opaque"); break;
-	case ICAL_TRANSPARENT: printf ("transparent"); break;
-	}
-	printf ("\n");
-
-	printf ("uid '%s'\n", ico->uid ? ico->uid : "NULL");
-
-	printf ("url '%s'\n", ico->url ? ico->url : "NULL");
-
-	printf ("recurid %ld=%s", ico->recurid, ctime (&ico->recurid));
-
-	printf ("dalarm %d\n", ico->dalarm.enabled);
-
-	printf ("aalarm %d\n", ico->aalarm.enabled);
-
-	printf ("palarm %d\n", ico->palarm.enabled);
-
-	printf ("malarm %d\n", ico->malarm.enabled);
-
-	printf ("alarms-length %d\n", g_list_length (ico->alarms));
-
-	printf ("recur %p\n", ico->recur);
-
-	printf ("new %d\n", ico->new);
-
-	printf ("user_data %p\n", ico->user_data);
-
-	printf ("ref_count %d\n", ico->ref_count);
-}
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
deleted file mode 100644
index 3caef945e2..0000000000
--- a/calendar/cal-util/calobj.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Internal representation of a Calendar object.  This is modeled after the
- * iCalendar/vCalendar specificiation
- *
- * Authors: Miguel de Icaza (miguel@gnu.org)
- *          Federico Mena (quartic@gimp.org).
- */
-#ifndef CALOBJ_H
-#define CALOBJ_H
-
-#include <libgnome/libgnome.h>
-#include "libversit/vcc.h"
-
-BEGIN_GNOME_DECLS
-
-/* Alarm types */
-enum AlarmType {
-	ALARM_MAIL,
-	ALARM_PROGRAM,
-	ALARM_DISPLAY,
-	ALARM_AUDIO
-};
-
-/* Whether the alarm should trigger N mins/hours/days before its due time */
-enum AlarmUnit {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS
-};
-
-/* Field identifiers for the iCalObject structure. These are also used to
-   identify columns in ECalendarTable, so be careful when reordering them. */
-typedef enum {
-	ICAL_OBJECT_FIELD_COMMENT,
-	ICAL_OBJECT_FIELD_COMPLETED,
-	ICAL_OBJECT_FIELD_CREATED,
-	ICAL_OBJECT_FIELD_DESCRIPTION,
-	ICAL_OBJECT_FIELD_DTSTAMP,
-	ICAL_OBJECT_FIELD_DTSTART,
-	ICAL_OBJECT_FIELD_DTEND,
-	ICAL_OBJECT_FIELD_GEO,
-	ICAL_OBJECT_FIELD_LAST_MOD,
-	ICAL_OBJECT_FIELD_LOCATION,
-	ICAL_OBJECT_FIELD_ORGANIZER,
-	ICAL_OBJECT_FIELD_PERCENT,
-	ICAL_OBJECT_FIELD_PRIORITY,
-	ICAL_OBJECT_FIELD_SUMMARY,
-	ICAL_OBJECT_FIELD_URL,
-	ICAL_OBJECT_FIELD_HAS_ALARMS, /* not a real field */
-	ICAL_OBJECT_FIELD_ICON,	      /* not a real field */
-	ICAL_OBJECT_FIELD_COMPLETE,   /* not a real field */
-	ICAL_OBJECT_FIELD_RECURRING,  /* not a real field */
-	ICAL_OBJECT_FIELD_OVERDUE,    /* not a real field */
-	ICAL_OBJECT_FIELD_COLOR,      /* not a real field */
-	ICAL_OBJECT_FIELD_NUM_FIELDS
-} iCalObjectField;
-
-typedef struct {
-	enum AlarmType type;
-	int            enabled;
-	int            count;
-	enum AlarmUnit units;
-	char           *data;	/* not used for iCalendar alarms */
-
-	/* the following pointers are used for iCalendar alarms */
-
-	char           *attach;	           /* AUDIO, EMAIL, PROC */
-	char           *desc;	           /* DISPLAY, EMAIL, PROC */
-	char           *summary;           /* EMAIL */
-	char           *attendee;          /* EMAIL */
-
-	/* Does not get saved, internally used */
-	time_t         offset;
-	time_t         trigger;
-
-	int            snooze_secs;
-	int	       snooze_repeat;
-	
-	/* Widgets */
-	void           *w_count;      /* A GtkEntry */
-	void           *w_enabled;    /* A GtkChecButton */
-	void           *w_timesel;    /* A GtkMenu */
-	void           *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
-	void           *w_label;
-} CalendarAlarm;
-
-/* Calendar object type */
-typedef enum {
-	ICAL_EVENT,
-	ICAL_TODO,
-	ICAL_JOURNAL,
-	ICAL_FBREQUEST,
-	ICAL_FBREPLY,
-	ICAL_BUSYTIME,
-	ICAL_TIMEZONE
-} iCalType;
-
-/* For keys that might contain binary or text/binary */
-typedef struct {
-	char *data;
-	int  len;
-} iCalValue;
-
-typedef enum {
-	ICAL_PILOT_SYNC_NONE = 0,
-	ICAL_PILOT_SYNC_MOD  = 1,
-	ICAL_PILOT_SYNC_DEL  = 3
-} iCalPilotState;
-
-typedef struct {
-	int     valid;		/* true if the Geography was specified */
-	double  latitude;
-	double  longitude;
-} iCalGeo;
-
-typedef enum {
-	ICAL_OPAQUE,
-	ICAL_TRANSPARENT
-} iCalTransp;
-
-typedef struct {
-	char   *uid;
-	char   *reltype;
-} iCalRelation;
-
-typedef char NotYet;
-
-enum RecurType {
-	RECUR_DAILY,
-	RECUR_WEEKLY,
-	RECUR_MONTHLY_BY_POS,
-	RECUR_MONTHLY_BY_DAY,
-	RECUR_YEARLY_BY_MONTH,
-	RECUR_YEARLY_BY_DAY,
-};
-
-#define DAY_LASTDAY 10000
-
-typedef struct {
-	enum RecurType type;
-
-	int            interval;
-
-	/* Used for recur computation */
-	time_t         enddate;	/* If the value is zero, it is an infinite event
-				 * otherwise, it is either the _enddate value (if
-				 * this is what got specified)  or it is our computed
-				 * ending date (computed from the duration item).
-				 */
-
-	int            weekday;
-
-	union {
-		int    month_pos;
-		int    month_day;
-	} u;
-
-	int            duration;
-	time_t         _enddate; /* As found on the vCalendar file */
-	int            __count;
-} Recurrence;
-
-/* 
-   NOTE: iCalPerson is used for various property values which specify
-   people (e.g. ATTENDEE, ORGANIZER, etc.  Not all fields are valid
-   under RFC 2445 for all property values, but iCalPerson can store
-   them anyway.  Enforcing the RFC is a job for the parser.
-*/
-
-typedef struct {
-	char          *addr;
-	char          *name;
-	char          *role;
-	char          *partstat;
-	gboolean      rsvp;
-	char          *cutype;	/* calendar user type */
-	GList         *member;	/* group memberships */
-	GList         *deleg_to;
-	GList         *deleg_from;
-	char          *sent_by;
-	char          *directory;
-	GList         *altrep;	/* list of char* URI's */
-} iCalPerson;
-
-#define IS_INFINITE(r) (r->duration == 0)
-
-/* Flags to indicate what has changed in an object */
-typedef enum {
-	CHANGE_NEW     = 1 << 0,	/* new object */
-	CHANGE_SUMMARY = 1 << 1,	/* summary */
-	CHANGE_DATES   = 1 << 2,	/* dtstart / dtend */
-	CHANGE_ALL     = CHANGE_SUMMARY | CHANGE_DATES
-} CalObjectChange;
-
-/*
- * This describes an iCalendar object, note that we never store durations, instead we
- * always compute the end time computed from the start + duration.
- */
-typedef struct {
-	iCalType      type;
-
-	GList         *attach;		/* type: one or more URIs or binary data */
-        GList         *attendee; 	/* type: CAL-ADDRESS (list of iCalPerson) */
-	GList         *categories; 	/* type: one or more TEXT */
-	char          *class;
-
-	char          *comment;		/* we collapse one or more TEXTs into one */
-	time_t        completed;
-	time_t        created;
-	GList         *contact;		/* type: one or more TEXT */
-	char          *desc;
-	time_t        dtstamp;
-	time_t        dtstart;
-	time_t        dtend;            /* also duedate for todo's */
-        gboolean      date_only;        /* set if the start/end times were
-   specified using dates, not times (internal use, not stored to disk) */
-	GList         *exdate;		/* type: one or more time_t's */
-	GList         *exrule;		/* type: one or more RECUR */
-	iCalGeo       geo;
-	time_t        last_mod;
-	char          *location;
-	iCalPerson    *organizer;
-	int           percent;
-	int           priority;
-	char          *rstatus;	        /* request status for freebusy */
-	GList         *related;		/* type: one or more TEXT */
-	GList         *resources;	/* type: one or more TEXT */
-	GList         *rdate;		/* type: one or more recurrence date */
-	GList         *rrule;		/* type: one or more recurrence rules */
-	int           seq;
-	char          *status;
-	char          *summary;
-	iCalTransp    transp;
-	char          *uid;
-	char          *url;
-	time_t        recurid;
-
-	CalendarAlarm dalarm;
-	CalendarAlarm aalarm;
-	CalendarAlarm palarm;
-	CalendarAlarm malarm;
-
-	GList         *alarms;
-
-	Recurrence    *recur;
-	
-	int new;
-	void *user_data;		/* Generic data pointer */
-
-	/* Pilot */
-	iCalPilotState pilot_status;    /* Status information */
-	guint32            pilot_id;        /* Pilot ID */
-
-	guint	       ref_count;
-} iCalObject;
-
-/* The callback for the recurrence generator */
-typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *);
-
-iCalObject *ical_new                        (char *comment, char *organizer, char *summary);
-iCalObject *ical_object_new                 (void);
-
-void        ical_object_ref                 (iCalObject *ico);
-void        ical_object_unref               (iCalObject *ico);
-
-iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);
-VObject    *ical_object_to_vobject          (iCalObject *ical);
-iCalObject *ical_object_duplicate           (iCalObject *o);
-void        ical_foreach                    (GList *events, calendarfn fn, void *closure);
-void        ical_object_generate_events     (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure);
-void        ical_object_add_exdate          (iCalObject *o, time_t t);
-
-/* Computes the enddate field of the recurrence based on the duration */
-void        ical_object_compute_end         (iCalObject *ico);
-
-typedef enum {
-	CAL_OBJ_FIND_SUCCESS,
-	CAL_OBJ_FIND_SYNTAX_ERROR,
-	CAL_OBJ_FIND_NOT_FOUND
-} CalObjFindStatus;
-
-CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);
-
-char       *ical_object_to_string (iCalObject *ico);
-
-
-/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple
- * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.
- */
-int	    ical_object_get_first_weekday (int weekday_mask);
-
-/* Returns the number of seconds configured to trigger the alarm in advance to an event */
-int         alarm_compute_offset (CalendarAlarm *a);
-
-
-/* Returns TRUE if the dates of both objects match, including any recurrence
-   rules. */
-gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
-
-/* Generates a new uid for a calendar object. Should be g_free'd eventually. */
-char	   *ical_gen_uid (void);
-
-/* This resets any recurrence rules of the iCalObject. */
-void	    ical_object_reset_recurrence (iCalObject *ico);
-
-
-void dump_icalobject (iCalObject *ico);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
deleted file mode 100644
index a049ea955b..0000000000
--- a/calendar/cal-util/test-recur.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * This tests the recurrence rule expansion functions.
- *
- * NOTE: currently it starts from the event start date and continues
- * until all recurrence rules/dates end or we reach MAX_OCCURRENCES
- * occurrences. So it does not test generating occurrences for a specific
- * interval. A nice addition might be to do this automatically and compare
- * the results from the complete set to ensure they match.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include <cal-util/cal-recur.h>
-
-
-/* Since events can recur infinitely, we set a limit to the number of
-   occurrences we output. */
-#define MAX_OCCURRENCES	1000
-
-static void usage			(void);
-static icalcomponent* scan_ics_file	(char		*filename);
-static char* get_line			(char		*s,
-					 size_t		 size,
-					 void		*data);
-static void generate_occurrences	(icalcomponent	*comp);
-static gboolean occurrence_cb		(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data);
-
-
-int
-main			(int		 argc,
-			 char		*argv[])
-{
-	gchar *filename;
-	icalcomponent *icalcomp;
-
-	gtk_init (&argc, &argv);
-
-	if (argc != 2)
-		usage ();
-
-	filename = argv[1];
-
-	icalcomp = scan_ics_file (filename);
-	if (icalcomp)
-		generate_occurrences	(icalcomp);
-
-	return 0;
-}
-
-
-static void
-usage			(void)
-{
-	g_print ("Usage: test-recur <filename>\n");
-	exit (1);
-}
-
-
-static icalcomponent*
-scan_ics_file		(char		*filename)
-{
-	FILE *fp;
-	icalcomponent *icalcomp;
-	icalparser *parser;
-
-	g_print ("Opening file: %s\n", filename);
-	fp = fopen (filename, "r");
-
-	if (!fp) {
-		g_print ("Can't open file: %s\n", filename);
-		return NULL;
-	}
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fp);
-
-	icalcomp = icalparser_parse (parser, get_line);
-	icalparser_free (parser);
-
-	return icalcomp;
-}
-
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line		(char		*s,
-			 size_t		 size,
-			 void		*data)
-{
-	return fgets (s, size, (FILE*) data);
-}
-
-
-static void
-generate_occurrences	(icalcomponent	*icalcomp)
-{
-	icalcompiter iter;
-
-	for (iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *tmp_icalcomp;
-		CalComponent *comp;
-		icalcomponent_kind kind;
-		gint occurrences;
-
-		tmp_icalcomp = icalcompiter_deref (&iter);
-		kind = icalcomponent_isa (tmp_icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, tmp_icalcomp))
-			continue;
-
-		g_print ("#############################################################################\n");
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-		g_print ("Instances:\n");
-
-		occurrences = 0;
-		/* I use specific times when I am trying to pin down a bug seen
-		   in one of the calendar views. */
-#if 0
-		cal_recur_generate_instances (comp, 982022400, 982108800,
-					      occurrence_cb, &occurrences);
-#else
-		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, &occurrences);
-#endif
-
-		/* Print the component again so we can see the
-		   X-EVOLUTION-ENDDATE parameter (only set if COUNT is used).
-		*/
-		g_print ("#############################################################################\n");
-#if 0
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-#endif
-	}
-}
-
-
-static gboolean
-occurrence_cb		(CalComponent	*comp,
-			 time_t		 instance_start,
-			 time_t		 instance_end,
-			 gpointer	 data)
-{
-	char start[32], finish[32];
-	gint *occurrences;
-
-	occurrences = (gint*) data;
-
-	strcpy (start, ctime (&instance_start));
-	start[24] = '\0';
-	strcpy (finish, ctime (&instance_end));
-	finish[24] = '\0';
-
-	g_print ("%s - %s\n", start, finish);
-
-	(*occurrences)++;
-	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;
-}
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
deleted file mode 100644
index b48a02b5fa..0000000000
--- a/calendar/cal-util/timeutil.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- */
-
-#include <string.h>
-#include <glib.h>
-#include "timeutil.h"
-
-
-
-void
-print_time_t (time_t t)
-{
-	struct tm *tm = localtime (&t);
-	
-	printf ("%d/%02d/%02d %02d:%02d:%02d",
-		1900 + tm->tm_year, tm->tm_mon+1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-char *
-isodate_from_time_t (time_t t)
-{
-	struct tm *tm;
-	static char isotime [40];
-
-	tm = localtime (&t);
-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%S", tm);
-	return isotime;
-}
-
-time_t
-time_add_minutes (time_t time, int minutes)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-
-	tm->tm_min += minutes;
-	if ((new_time = mktime (tm)) == -1) {
-		g_message ("time_add_minutes(): mktime() could not handle "
-			   "adding %d minutes with\n", minutes);
-		print_time_t (time);
-		printf ("\n");
-		return time;
-	}
-	return new_time;
-}
-
-/* Adds a day onto the time, using local time.
-   Note that if clocks go forward due to daylight savings time, there are
-   some non-existent local times, so the hour may be changed to make it a
-   valid time. This also means that it may not be wise to keep calling
-   time_add_day() to step through a certain period - if the hour gets changed
-   to make it valid time, any further calls to time_add_day() will also return
-   this hour, which may not be what you want. */
-time_t
-time_add_day (time_t time, int days)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-#if 0
-	int dst_flag = tm->tm_isdst;
-#endif
-
-	tm->tm_mday += days;
-	tm->tm_isdst = -1;
-
-	if ((new_time = mktime (tm)) == -1) {
-		g_message ("time_add_day(): mktime() could not handling adding %d days with\n",
-			   days);
-		print_time_t (time);
-		printf ("\n");
-		return time;
-	}
-
-#if 0
-	/* I don't know what this is for. See also time_day_begin() and
-	   time_day_end(). - Damon. */
-	if (dst_flag > tm->tm_isdst) {
-		tm->tm_hour++;
-		new_time += 3600;
-	} else if (dst_flag < tm->tm_isdst) {
-		tm->tm_hour--;
-		new_time -= 3600;
-	}
-#endif
-
-	return new_time;
-}
-
-time_t
-time_add_week (time_t time, int weeks)
-{
-	return time_add_day (time, weeks * 7);
-}
-
-time_t
-time_add_month (time_t time, int months)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	int mday;
-
-	mday = tm->tm_mday;
-	
-	tm->tm_mon += months;
-	tm->tm_isdst = -1;
-	if ((new_time = mktime (tm)) == -1) {
-		g_message ("time_add_month(): mktime() could not handling adding %d months with\n",
-			   months);
-		print_time_t (time);
-		printf ("\n");
-		return time;
-	}
-	tm = localtime (&new_time);
-	if (tm->tm_mday < mday) {
-		tm->tm_mon--;
-		tm->tm_mday = time_days_in_month (tm->tm_year+1900, tm->tm_mon);
-		return new_time = mktime (tm);
-	}
-	else
-		return new_time;
-}
-
-time_t
-time_add_year (time_t time, int years)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	
-	tm->tm_year += years;
-	if ((new_time = mktime (tm)) == -1) {
-		g_message ("time_add_year(): mktime() could not handling adding %d years with\n",
-			   years);
-		print_time_t (time);
-		printf ("\n");
-		return time;
-	}
-	return new_time;
-}
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-int
-time_days_in_month (int year, int month)
-{
-	g_return_val_if_fail (year >= 1900, 0);
-	g_return_val_if_fail ((month >= 0) && (month < 12), 0);
-
-	return days_in_month [is_leap_year (year)][month];
-}
-
-time_t
-time_from_day (int year, int month, int day)
-{
-	struct tm tm;
-
-	memset (&tm, 0, sizeof (tm));
-	tm.tm_year = year - 1900;
-	tm.tm_mon = month;
-	tm.tm_mday = day;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_year++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_mon++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_begin (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday -= tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_end (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday += 7 - tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the start of the day, according to the local time. */
-time_t
-time_day_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the end of the day, according to the local time. */
-time_t
-time_day_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_mday++;
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
deleted file mode 100644
index 730c7dc089..0000000000
--- a/calendar/cal-util/timeutil.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- */
-
-#ifndef TIMEUTIL_H
-#define TIMEUTIL_H
-
-
-#include <time.h>
-#include <ical.h>
-
-
-char   *isodate_from_time_t     (time_t t);
-
-time_t time_add_minutes (time_t time, int minutes);
-time_t time_add_day (time_t time, int days);
-time_t time_add_week (time_t time, int weeks);
-time_t time_add_month (time_t time, int months);
-time_t time_add_year (time_t time, int years);
-
-
-/* Returns the number of days in the specified month.  Years are full years (starting from year 1).
- * Months are in [0, 11].
- */
-int time_days_in_month (int year, int month);
-
-/* Converts the specified date to a time_t at the start of the specified day.  Years are full years
- * (starting from year 1).  Months are in [0, 11].  Days are 1-based.
- */
-time_t time_from_day (int year, int month, int day);
-
-/* For the functions below, time ranges are considered to contain the start time, but not the end
- * time.
- */
-
-/* These two functions take a time value and return the beginning or end of the corresponding year,
- * respectively.
- */
-time_t time_year_begin (time_t t);
-time_t time_year_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding month,
- * respectively.
- */
-time_t time_month_begin (time_t t);
-time_t time_month_end (time_t t);
-
-/* These functions take a time value and return the beginning or end of the corresponding week,
- * respectively.  This takes into account the global week_starts_on_monday flag.
- */
-time_t time_week_begin (time_t t);
-time_t time_week_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding day,
- * respectively.
- */
-time_t time_day_begin (time_t t);
-time_t time_day_end (time_t t);
-
-void print_time_t (time_t t);
-
-
-#endif
diff --git a/calendar/conduits/.cvsignore b/calendar/conduits/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/conduits/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am
deleted file mode 100644
index 906ea61971..0000000000
--- a/calendar/conduits/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = calendar todo
diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore
deleted file mode 100644
index e8ba6ad844..0000000000
--- a/calendar/conduits/calendar/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-e-calendar.conduit
-*.lo
-.libs
-libecalendar_conduit.la
-e-calendar-conduit-control-applet
-e-calendar-conduit-control-applet.desktop
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
deleted file mode 100644
index 9349cd518b..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_INCLUDEDIR)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# Calendar Capplet
-bin_PROGRAMS = e-calendar-conduit-control-applet
-
-e_calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
-
-e_calendar_conduit_control_applet_LDADD = 	\
-		$(CAPPLET_LIBS)  		\
-		$(GNOME_LIBDIR) 		\
-		$(GNOME_PILOT_LIBS) 		\
-		$(PISOCK_LIBS) 			\
-		$(GNOME_CAPPLET_LIBS) 		\
-		$(BONOBO_GNOME_LIBS) 		\
-		$(GNOME_XML_LIB) 		\
-	        $(GNOMEUI_LIBS) 		\
-                $(INTLLIBS)
-
-# Calendar Conduit
-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c		\
-	calendar-conduit.h		\
-	calendar-conduit-config.h
-
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
-libecalendar_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_GNOME_LIBS)						\
-	$(PISOCK_LIBS) 							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-calendar.conduit: e-calendar.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
-	&& mv e-calendar.conduit.tmp e-calendar.conduit
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_in_files = e-calendar-conduit-control-applet.desktop.in 
-ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
-
-EXTRA_DIST = \
-	e-calendar.conduit.in \
-        $(ccenterConduits_in_files)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h
deleted file mode 100644
index d0ba28dbb1..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAL_CONDUIT_CONFIG_H__
-#define __CAL_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _ECalConduitCfg ECalConduitCfg;
-struct _ECalConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef CAL_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (ECalConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef CAL_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef CAL_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef CAL_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-calconduit_destroy_configuration (ECalConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __CAL_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c
deleted file mode 100644
index ecd8d84e65..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-control-applet.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_SAVE 1
-#define CAL_CONFIG_DUPE 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_SAVE
-#undef CAL_CONFIG_DUPE
-#undef CAL_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-ECalConduitCfg *origState = NULL;
-ECalConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, ECalConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, ECalConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	calconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution Calendar Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution calendar conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, ECalConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution Calendar conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	calconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = calconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	calconduit_destroy_configuration (&origState);
-	calconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index 155813d65e..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1198 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <cal-client/cal-client-types.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-util.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_DESTROY
-
-#include <calendar-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.5"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "ecalconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* Debug 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 : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static ECalConduitContext *
-e_calendar_context_new (guint32 pilot_id) 
-{
-	ECalConduitContext *ctxt = g_new0 (ECalConduitContext, 1);
-
-	calconduit_load_configuration (&ctxt->cfg, pilot_id);
-
-	return ctxt;
-}
-
-static void
-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext *ctxt)
-{
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		calconduit_destroy_configuration (&ctxt->cfg);
-
-	if (ctxt->client != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->client));
-
-	if (ctxt->calendar_file)
-		g_free (ctxt->calendar_file);
-
-	if (ctxt->uids)
-		cal_obj_uid_list_free (ctxt->uids);
-
-	if (ctxt->changed_hash)
-		g_hash_table_foreach (ctxt->changed_hash, e_calendar_context_foreach_change, NULL);
-
-	if (ctxt->changed)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->map)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	ECalConduitContext *ctxt;
-
-	ctxt = data;
-
-	LOG ("  entering start_calendar_server_cb\n");
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		ctxt->calendar_open_success = TRUE;
-		LOG ("    success\n");
-	} else
-		LOG ("    open of calendar failed\n");
-
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_open_calendar\n");
-	if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_open_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-calendar-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static icalrecurrencetype_weekday
-get_ical_day (int day) 
-{
-	switch (day) {
-	case 0:
-		return ICAL_SUNDAY_WEEKDAY;
-	case 1:
-		return ICAL_MONDAY_WEEKDAY;
-	case 2:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 3:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 4:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 5:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 6:
-		return ICAL_SATURDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static int
-get_pilot_day (icalrecurrencetype_weekday wd) 
-{
-	switch (wd) {
-	case ICAL_SUNDAY_WEEKDAY:
-		return 0;
-	case ICAL_MONDAY_WEEKDAY:
-		return 1;
-	case ICAL_TUESDAY_WEEKDAY:
-		return 2;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		return 3;
-	case ICAL_THURSDAY_WEEKDAY:
-		return 4;
-	case ICAL_FRIDAY_WEEKDAY:
-		return 5;
-	case ICAL_SATURDAY_WEEKDAY:
-		return 6;
-	default:
-		return -1;
-	}
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-
-static GList *
-next_changed_item (ECalConduitContext *ctxt, GList *changes) 
-{
-	CalClientChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		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)
-{
-	CalClientChange *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 CAL_CLIENT_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case CAL_CLIENT_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-		
-	case CAL_CLIENT_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char, 0xffff);
-	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime dt;
-	time_t dt_time;
-	CalComponentClassification classif;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-	
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment, 1);
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = e_pilot_utf8_to_pchar (summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->appt->note = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	cal_component_get_dtstart (comp, &dt);	
-	if (dt.value) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->begin = *localtime (&dt_time);
-	}
-
-	cal_component_get_dtend (comp, &dt);	
-	if (dt.value && time_add_day (dt_time, 1) != icaltime_as_timet (*dt.value)) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->end = *localtime (&dt_time);
-		local->appt->event = 0;
-	} else {
-		local->appt->event = 1;
-	}
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-	
-	if (cal_component_has_rrules (comp)) {
-		GSList *list;
-		struct icalrecurrencetype *recur;
-		
-		cal_component_get_rrule_list (comp, &list);
-		recur = list->data;
-		
-		switch (recur->freq) {
-		case ICAL_DAILY_RECURRENCE:
-			local->appt->repeatType = repeatDaily;
-			break;
-		case ICAL_WEEKLY_RECURRENCE:
-			local->appt->repeatType = repeatWeekly;
-			for (i = 0; i <= 7 && recur->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-				icalrecurrencetype_weekday wd;
-
-				wd = icalrecurrencetype_day_day_of_week (recur->by_day[i]);
-				local->appt->repeatDays[get_pilot_day (wd)] = 1;
-			}
-			
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			if (recur->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
-				local->appt->repeatType = repeatMonthlyByDate;
-				break;
-			}
-			
-			/* FIX ME Not going to work with -ve by_day */
-			local->appt->repeatType = repeatMonthlyByDay;
-			switch (icalrecurrencetype_day_position (recur->by_day[0])) {
-			case 1:
-				local->appt->repeatDay = dom1stSun;
-				break;
-			case 2:
-				local->appt->repeatDay = dom2ndSun;
-				break;
-			case 3:
-				local->appt->repeatDay = dom3rdSun;
-				break;
-			case 4:
-				local->appt->repeatDay = dom4thSun;
-				break;
-			case 5:
-				local->appt->repeatDay = domLastSun;
-				break;
-			}
-			local->appt->repeatDay += get_pilot_day (icalrecurrencetype_day_day_of_week (recur->by_day[0]));
-			break;
-		case ICAL_YEARLY_RECURRENCE:
-			local->appt->repeatType = repeatYearly;
-			break;
-		default:
-			break;
-		}
-
-		if (local->appt->repeatType != repeatNone) {
-			local->appt->repeatFrequency = recur->interval;
-		}
-		
-		if (icaltime_is_null_time (recur->until)) {
-			local->appt->repeatForever = 1;
-		} else {
-			local->appt->repeatForever = 0;
-			dt_time = icaltime_as_timet (recur->until);
-			local->appt->repeatEnd = *localtime (&dt_time);
-		}
-		
-		cal_component_free_recur_list (list);
-	}
-
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;  
-}
-
-static void 
-local_record_from_uid (ECalLocalRecord *local,
-		       const char *uid,
-		       ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE), it;
-	struct icalrecurrencetype recur;
-	int pos, i;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	GList *alist, *l;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
-	cal_component_set_summary (comp, &summary);
-	free (txt);
-
-	/* The iCal description field */
-	if (!appt.note) {
-		cal_component_set_comment_list (comp, NULL);
-	} else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (appt.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (!is_empty_time (appt.begin)) {
-		it = icaltime_from_timet (mktime (&appt.begin), FALSE);
-		dt.value = &it;
-		cal_component_set_dtstart (comp, &dt);
-	}
-
-	if (appt.event) {
-		time_t t = mktime (&appt.begin);
-		
-		t = time_day_end (t);
-		it = icaltime_from_timet (t, FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	} else if (!is_empty_time (appt.end)) {
-		it = icaltime_from_timet (mktime (&appt.end), FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	}
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-
-	switch (appt.repeatType) {
-	case repeatNone:
-		recur.freq = ICAL_NO_RECURRENCE;
-		break;
-
-	case repeatDaily:
-		recur.freq = ICAL_DAILY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-
-	case repeatWeekly:
-		recur.freq = ICAL_WEEKLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-
-		pos = 0;
-		for (i = 0; i < 7; i++) {
-			if (appt.repeatDays[i])
-				recur.by_day[pos++] = get_ical_day (i);
-		}
-		
-		break;
-
-	case repeatMonthlyByDay:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_day[0] = nth_weekday (appt.repeatDay / 5, get_ical_day (appt.repeatDay % 5 - 1));
-		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;
-		
-		/* recurrence start of week */
-		recur.week_start = get_ical_day (appt.repeatWeekstart);
-
-		if (!appt.repeatForever) {
-			time_t t = mktime (&appt.repeatEnd);
-			t = time_add_day (t, 1);
-			recur.until = icaltime_from_timet (t, FALSE);
-		}
-
-		list = g_slist_append (list, &recur);
-		cal_component_set_rrule_list (comp, list);
-		g_slist_free (list);
-	} else {
-		cal_component_set_rrule_list (comp, NULL);		
-	}
-
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     ECalConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	g_message ("Calendar Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mapping */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_EVENT);
-
-	/* Find the added, modified and deleted items */
-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id);
-	ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		const char *uid;
-		
-		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 CAL_CLIENT_CHANGE_ADDED:
-				add_records++;
-				break;
-			case CAL_CLIENT_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case CAL_CLIENT_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	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);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	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);
-	changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id);
-	cal_client_change_list_free (changed);
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	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 ("set_status_cleared: clearing status\n");
-	
-	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 *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CalClientChange *ccc = iterator->data;
-			
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} else {
-			LOG ("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 ("compare: local=%s remote=%s...\n",
-		print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       ECalLocalRecord *local,
-	       ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	cal_client_remove_object (ctxt->client, uid);
-	
-        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 ("archive_record: %s\n", archive ? "yes" : "no");
-
-	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 ("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);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (ECalLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    ECalLocalRecord *local,
-	    ECalConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG ("in calendar's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_calendar_conduit");
-
-	ctxt = e_calendar_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	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/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
deleted file mode 100644
index 03308e77d9..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CALENDAR_CONDUIT_H__
-#define __CALENDAR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution Calendar conduit. */
-typedef struct _ECalLocalRecord ECalLocalRecord;
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct Appointment *appt;
-};
-
-/* This is the context for all the Evolution Calendar conduit methods. */
-typedef struct _ECalConduitContext ECalConduitContext;
-struct _ECalConduitContext {
-	ECalConduitCfg *cfg;
-
-	struct AppointmentAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_open_success;
-
-	time_t since;
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __CALENDAR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
deleted file mode 100644
index 322e63c802..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Calendar conduit
-_Comment=Configure the GnomeCal conduit
-Exec=e-calendar-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 6143978e8b..0000000000
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
-<name value="ECalendar"/>
-<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 3ee063c770..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo-conduit-control-applet.desktop
-e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index ea7b628b15..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_INCLUDEDIR)			\
-	$(GNOME_PILOT_CFLAGS)
-
-# ToDo Capplet
-bin_PROGRAMS = e-todo-conduit-control-applet
-
-e_todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
-
-e_todo_conduit_control_applet_LDADD = 		\
-		$(CAPPLET_LIBS)  		\
-		$(GNOME_LIBDIR) 		\
-		$(GNOME_PILOT_LIBS) 		\
-		$(PISOCK_LIBS) 			\
-		$(GNOME_CAPPLET_LIBS) 		\
-		$(BONOBO_GNOME_LIBS) 		\
-		$(GNOME_XML_LIB) 		\
-	        $(GNOMEUI_LIBS) 		\
-                $(INTLLIBS)
-
-# ToDo Conduit
-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = 	\
-	todo-conduit.c 		\
-	todo-conduit.h		\
-	todo-conduit-config.h 
-
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
-libetodo_conduit_la_LIBADD = 						\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_GNOME_LIBS)						\
-	$(PISOCK_LIBS) 							\
-	$(UNICODE_LIBS)							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-todo.conduit: e-todo.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
-	&& mv e-todo.conduit.tmp e-todo.conduit
-
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_in_files = e-todo-conduit-control-applet.desktop.in 
-ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
-
-EXTRA_DIST = \
-	e-todo.conduit.in \
-        $(ccenterConduits_in_files)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
deleted file mode 100644
index 216c07afd5..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Evolution ToDo conduit 
-_Comment=Configure the todo conduit
-Exec=e-todo-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 40e6fd620c..0000000000
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
-<name value="EToDo"/>
-<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h
deleted file mode 100644
index fe7b1dbafa..0000000000
--- a/calendar/conduits/todo/todo-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_CONFIG_H__
-#define __TODO_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-struct _EToDoConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef TODO_CONFIG_LOAD
-/* Load the configuration data */
-static void 
-todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EToDoConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef TODO_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef TODO_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef TODO_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __TODO_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c
deleted file mode 100644
index 7140522b55..0000000000
--- a/calendar/conduits/todo/todo-conduit-control-applet.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_SAVE 1
-#define TODO_CONFIG_DUPE 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_SAVE
-#undef TODO_CONFIG_DUPE
-#undef TODO_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-EToDoConduitCfg *origState = NULL;
-EToDoConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, EToDoConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, EToDoConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	todoconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution ToDo Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution todo conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, EToDoConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution ToDo conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	todoconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = todoconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	todoconduit_destroy_configuration (&origState);
-	todoconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index f812532616..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1012 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <cal-client/cal-client-types.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-util.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_DESTROY
-
-#include <todo-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.4"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "etodoconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* Debug 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 : "");
-
-	return buff;
-}
-
-/* Context Routines */
-static EToDoConduitContext *
-e_todo_context_new (guint32 pilot_id) 
-{
-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);
-
-	todoconduit_load_configuration (&ctxt->cfg, pilot_id);
-
-	return ctxt;
-}
-
-static void
-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext *ctxt)
-{
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		todoconduit_destroy_configuration (&ctxt->cfg);
-
-	if (ctxt->client != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->client));
-
-	if (ctxt->calendar_file)
-		g_free (ctxt->calendar_file);
-
-	if (ctxt->uids)
-		cal_obj_uid_list_free (ctxt->uids);
-
-	if (ctxt->changed_hash)
-		g_hash_table_foreach (ctxt->changed_hash, e_todo_context_foreach_change, NULL);
-
-	if (ctxt->changed)
-		cal_client_change_list_free (ctxt->changed);
-	
-	if (ctxt->map)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (CalClient *cal_client,
-			  CalClientOpenStatus status,
-			  gpointer data)
-{
-	EToDoConduitContext *ctxt;
-
-	ctxt = data;
-
-	LOG ("  entering start_calendar_server_cb\n");
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		ctxt->calendar_open_success = TRUE;
-		LOG ("    success\n");
-	} else
-		LOG ("    open of calendar failed\n");
-
-	gtk_main_quit (); /* end the sub event loop */
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Tasks/tasks.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_open_calendar\n");
-	if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE))
-		return -1;
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_open_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Tasks/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static gboolean
-is_empty_time (struct tm time) 
-{
-	if (time.tm_sec || time.tm_min || time.tm_hour 
-	    || time.tm_mday || time.tm_mon || time.tm_year) 
-		return FALSE;
-	
-	return TRUE;
-}
-
-static GList *
-next_changed_item (EToDoConduitContext *ctxt, GList *changes) 
-{
-	CalClientChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		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)
-{
-	CalClientChange *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 CAL_CLIENT_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case CAL_CLIENT_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case CAL_CLIENT_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = 0;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = g_new0 (char, 0xffff);
-	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	struct icaltimetype *completed;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime due;
-	time_t due_time;
-	CalComponentClassification classif;
-
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = e_pilot_utf8_to_pchar (summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->todo->note = e_pilot_utf8_to_pchar (description->value);
-		else
-			local->todo->note = NULL;
-	} else {
-		local->todo->note = NULL;
-	}
-
-	cal_component_get_due (comp, &due);	
-	if (due.value) {
-		due_time = icaltime_as_timet (*due.value);
-		
-		local->todo->due = *localtime (&due_time);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-
-	cal_component_get_completed (comp, &completed);
-	if (completed) {
-		local->todo->complete = 1;
-		cal_component_free_icaltimetype (completed);
-	}	
-
-	cal_component_get_priority (comp, &priority);
-	if (priority) {
-		local->todo->priority = *priority;
-		cal_component_free_priority (priority);
-	}
-	
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EToDoLocalRecord *local,
-		       const char *uid,
-		       EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct ToDo todo;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE);
-	CalComponentText summary = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	struct icaltimetype due;
-	char *txt;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
-	cal_component_set_summary (comp, &summary);
-	free (txt);
-	
-	/* The iCal description field */
-	if (!todo.note) {
-		cal_component_set_comment_list (comp, NULL);
-	} else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = txt = e_pilot_utf8_from_pchar (todo.note);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-		free (txt);
-	} 
-
-	if (todo.complete) {
-		int percent = 100;
-		cal_component_set_completed (comp, &now);
-		cal_component_set_percent (comp, &percent);
-	}
-
-	if (!is_empty_time (todo.due)) {
-		due = icaltime_from_timet (mktime (&todo.due), FALSE);
-		dt.value = &due;
-		cal_component_set_due (comp, &dt);
-	}
-	
-	cal_component_set_priority (comp, &todo.priority);
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     EToDoConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id map */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id);
-	ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalClientChange *ccc = l->data;
-		const char *uid;
-		
-		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 CAL_CLIENT_CHANGE_ADDED:
-				add_records++;
-				break;
-			case CAL_CLIENT_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case CAL_CLIENT_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	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);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	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);
-	changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id);
-	cal_client_change_list_free (changed);
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	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 ("set_status_cleared: clearing status\n");
-	
-	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 *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EToDoLocalRecord **local,
-		   EToDoConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalClientChange *ccc = iterator->data;
-		
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CalClientChange *ccc = iterator->data;
-			
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_comp (*local, ccc->comp, ctxt);
-		} else {
-			LOG ("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 ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	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);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	cal_client_remove_object (ctxt->client, uid);
-	
-        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 ("archive_record: %s\n", archive ? "yes" : "no");
-
-	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 ("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);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EToDoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EToDoLocalRecord *local,
-	    EToDoConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG ("in todo's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_todo_conduit");
-
-	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);
-
-	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/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
deleted file mode 100644
index 46f89fc1a0..0000000000
--- a/calendar/conduits/todo/todo-conduit.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_H__
-#define __TODO_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-todo.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure */
-	struct ToDo *todo;
-};
-
-/* This is the context for all the Evolution ToDo  conduit methods. */
-typedef struct _EToDoConduitContext EToDoConduitContext;
-struct _EToDoConduitContext {
-	EToDoConduitCfg *cfg;
-
-	struct ToDoAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_open_success;
-
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __TODO_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index f7f6b10b34..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-.pure
-evolution-calendar
-evolution-calendar.pure
-getdate.c
-*.lo
-Evolution-Composer-common.c
-Evolution-Composer-skels.c
-Evolution-Composer-stubs.c
-Evolution-Composer.h
-GNOME_Evolution_Calendar_Control.oaf
-GNOME_Evolution_Calendar.oaf
-GNOME_Evolution_Calendar_gnomecal.oaf
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
deleted file mode 100644
index 557a8dcdd4..0000000000
--- a/calendar/gui/Evolution-Composer.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * This file was generated by orbit-idl - DO NOT EDIT!
- */
-
-#include <glib.h>
-#define ORBIT_IDL_SERIAL 9
-#include <orb/orbit.h>
-
-#ifndef Evolution_Composer_H
-#define Evolution_Composer_H 1
-#ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
-
-/** typedefs **/
-#include <bonobo/Bonobo.h>
-# 13 "/usr/share/idl/Bonobo.idl"
-#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
-#define ORBIT_DECL_GNOME_Evolution_Composer 1
-#define _GNOME_Evolution_Composer_defined 1
-#define GNOME_Evolution_Composer__free CORBA_Object__free
-   typedef CORBA_Object GNOME_Evolution_Composer;
-   extern CORBA_unsigned_long GNOME_Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_struct;
-#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct)
-#endif
-#endif
-#if !defined(_GNOME_Evolution_Composer_Recipient_defined)
-#define _GNOME_Evolution_Composer_Recipient_defined 1
-   typedef struct
-   {
-      CORBA_char *name;
-      CORBA_char *address;
-   }
-   GNOME_Evolution_Composer_Recipient;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern GNOME_Evolution_Composer_Recipient
-      *GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							    gpointer dat,
-							    CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   typedef struct
-   {
-      CORBA_unsigned_long _maximum,
-       _length;
-      GNOME_Evolution_Composer_Recipient *_buffer;
-      CORBA_boolean _release;
-   }
-   CORBA_sequence_GNOME_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer
-      CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							      gpointer dat,
-							      CORBA_boolean free_strings);	/* ORBit internal use */
-   GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf
-      (CORBA_unsigned_long len);
-#endif
-#if !defined(_GNOME_Evolution_Composer_RecipientList_defined)
-#define _GNOME_Evolution_Composer_RecipientList_defined 1
-   typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      GNOME_Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_RecipientList_struct;
-#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct)
-#endif
-   extern GNOME_Evolution_Composer_RecipientList
-      *GNOME_Evolution_Composer_RecipientList__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_RecipientList__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0"
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer
-								*
-								_ORBIT_recv_buffer,
-								CORBA_Environment
-								* ev);
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
-							      _ORBIT_send_buffer,
-							      CORBA_Environment
-							      * ev);
-#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined)
-#define _GNOME_Evolution_Composer_CouldNotParse_defined 1
-   typedef struct
-   {
-      int dummy;
-   }
-   GNOME_Evolution_Composer_CouldNotParse;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_CouldNotParse_struct;
-#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct)
-#endif
-#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL
-   extern gpointer GNOME_Evolution_Composer_CouldNotParse__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-
-/** POA structures **/
-   typedef struct
-   {
-      void *_private;
-      void (*setHeaders) (PortableServer_Servant _servant,
-			  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);
-      void (*setBodyText) (PortableServer_Servant _servant,
-			   const CORBA_char * body, CORBA_Environment * ev);
-      void (*attachMIME) (PortableServer_Servant _servant,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*attachData) (PortableServer_Servant _servant,
-			  const CORBA_char * content_type,
-			  const CORBA_char * filename,
-			  const CORBA_char * description,
-			  const CORBA_boolean show_inline,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
-   }
-   POA_GNOME_Evolution_Composer__epv;
-   typedef struct
-   {
-      PortableServer_ServantBase__epv *_base_epv;
-      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
-      POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv;
-   }
-   POA_GNOME_Evolution_Composer__vepv;
-   typedef struct
-   {
-      void *_private;
-      POA_GNOME_Evolution_Composer__vepv *vepv;
-   }
-   POA_GNOME_Evolution_Composer;
-   extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-   extern void POA_GNOME_Evolution_Composer__fini(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-
-/** prototypes **/
-#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref
-#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref
-#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
-   void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj,
-					    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);
-   void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj,
-					     const CORBA_char * body,
-					     CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachData(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * content_type,
-					    const CORBA_char * filename,
-					    const CORBA_char * description,
-					    const CORBA_boolean show_inline,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_show(GNOME_Evolution_Composer _obj,
-				      CORBA_Environment * ev);
-
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setHeaders
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setHeaders) (PortableServer_Servant _servant,
-				 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));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setBodyText
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setBodyText) (PortableServer_Servant _servant,
-				  const CORBA_char * body,
-				  CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachMIME
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachMIME) (PortableServer_Servant _servant,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachData
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachData) (PortableServer_Servant _servant,
-				 const CORBA_char * content_type,
-				 const CORBA_char * filename,
-				 const CORBA_char * description,
-				 const CORBA_boolean show_inline,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void _ORBIT_skel_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer
-						  * _ORBIT_servant,
-						  GIOPRecvBuffer *
-						  _ORBIT_recv_buffer,
-						  CORBA_Environment * ev,
-						  void (*_impl_show)
-						  (PortableServer_Servant
-						   _servant,
-						   CORBA_Environment * ev));
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif
-#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index 0f74743a38..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,114 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_Component"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index bf3a7f200e..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,174 +0,0 @@
-## CORBA stuff
-
-IDLS =                          \
-        $(srcdir)/../../composer/Evolution-Composer.idl
-
-IDL_GENERATED =                 \
-        Evolution-Composer.h              \
-        Evolution-Composer-common.c       \
-        Evolution-Composer-skels.c        \
-        Evolution-Composer-stubs.c
-
-$(IDL_GENERATED): $(IDLS) 
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                $(srcdir)/../../composer/Evolution-Composer.idl
-
-SUBDIRS = alarm-notify dialogs
-
-help_base = $(datadir)/gnome/help/cal
-
-bin_PROGRAMS = evolution-calendar
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/executive-summary		\
-	-I$(includedir)					\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 					\
-	event-editor-dialog.glade		\
-	e-meeting-dialog.glade			\
-	e-itip-control.glade			\
-	goto-dialog.glade
-
-evolution_calendar_SOURCES =			\
-	$(IDL_GENERATED)			\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-model.c			\
-	calendar-model.h			\
-	calendar-summary.c			\
-	calendar-summary.h			\
-	comp-util.c				\
-	comp-util.h				\
-	control-factory.c			\
-	control-factory.h			\
-	component-factory.c			\
-	component-factory.h			\
-	e-calendar-table.h			\
-	e-calendar-table.c			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	e-meeting-edit.h			\
-	e-meeting-edit.c			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	e-tasks.c				\
-	e-tasks.h				\
-	event-editor.c				\
-	event-editor.h				\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	goto.c					\
-	goto.h					\
-	itip-utils.c				\
-	itip-utils.h				\
-	main.c					\
-	popup-menu.c				\
-	popup-menu.h				\
-	print.c					\
-	print.h					\
-	tag-calendar.c				\
-	tag-calendar.h				\
-	tasks-control-factory.c			\
-	tasks-control-factory.h			\
-	tasks-control.c				\
-	tasks-control.h				\
-	tasks-migrate.c				\
-	tasks-migrate.h				\
-	weekday-picker.c			\
-	weekday-picker.h			\
-	widget-util.c				\
-	widget-util.h
-
-evolution_calendar_LDADD =								\
-	alarm-notify/libalarm.a								\
-	$(top_builddir)/shell/libeshell.a						\
-	$(top_builddir)/calendar/cal-client/libcal-client.la				\
-	$(top_builddir)/calendar/cal-util/libcal-util.la				\
-	$(top_builddir)/e-util/libeutil.la						\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(top_builddir)/libversit/libversit.la						\
-	$(top_builddir)/libical/src/libical/libical.la					\
-	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
-	$(top_builddir)/widgets/menus/libmenus.la					\
-	dialogs/libcal-dialogs.a							\
-	$(BONOBO_HTML_GNOME_LIBS)							\
-	$(BONOBO_VFS_GNOME_LIBS)							\
-	$(EXTRA_GNOME_LIBS)								\
-	$(INTLLIBS)
-
-#evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar.oaf.in
-
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST =	 			\
-	$(glade_DATA)			\
-	bell.xpm			\
-	check-filled.xpm		\
-	dayview.xpm			\
-	jump.xpm			\
-	monthview.xpm			\
-	recur.xpm			\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	task.xpm			\
-	weekview.xpm			\
-	workweekview.xpm		\
-	yearview.xpm			\
-	$(oaf_in_files) $(oaf_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
-	$(mkinstalldirs) $(Conduitsdir)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-calendar.pure
-
-evolution-calendar.pure: evolution-calendar
-	@rm -f evolution-calendar.pure
-	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
-
-endif
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify.c b/calendar/gui/alarm-notify.c
deleted file mode 100644
index d824b2a189..0000000000
--- a/calendar/gui/alarm-notify.c
+++ /dev/null
@@ -1,963 +0,0 @@
-/* Evolution calendar - Alarm notification engine
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <cal-util/timeutil.h>
-#include "alarm.h"
-#include "alarm-notify.h"
-
-
-
-/* Whether the notification system has been initialized */
-static gboolean alarm_notify_inited;
-
-/* Clients we are monitoring for alarms */
-static GHashTable *client_alarms_hash = NULL;
-
-/* Structure that stores a client we are monitoring */
-typedef struct {
-	/* Monitored client */
-	CalClient *client;
-
-	/* Number of times this client has been registered */
-	int refcount;
-
-	/* Hash table of component UID -> CompQueuedAlarms.  If an element is
-	 * present here, then it means its cqa->queued_alarms contains at least
-	 * one queued alarm.  When all the alarms for a component have been
-	 * dequeued, the CompQueuedAlarms structure is removed from the hash
-	 * table.  Thus a CQA exists <=> it has queued alarms.
-	 */
-	GHashTable *uid_alarms_hash;
-} ClientAlarms;
-
-/* Pair of a CalComponentAlarms and the mapping from queued alarm IDs to the
- * actual alarm instance structures.
- */
-typedef struct {
-	/* The parent client alarms structure */
-	ClientAlarms *parent_client;
-
-	/* The actual component and its alarm instances */
-	CalComponentAlarms *alarms;
-
-	/* List of QueuedAlarm structures */
-	GSList *queued_alarms;
-} 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 CompAlarms->alarms list */
-	CalAlarmInstance *instance;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-
-
-static void load_alarms (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;
-
-	g_assert (midnight_refresh_id == NULL);
-
-	midnight = time_day_end (time (NULL));
-
-	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
-	if (!midnight_refresh_id) {
-		g_message ("alarm_notify_init(): 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 (ca);
-}
-
-/* Loads the alarms for the new day every midnight */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	/* Re-load the alarms for all clients */
-
-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
-
-	/* Re-schedule the midnight update */
-
-	midnight_refresh_id = NULL;
-	queue_midnight_refresh ();
-}
-
-/* Looks up a client in the client alarms hash table */
-static ClientAlarms *
-lookup_client (CalClient *client)
-{
-	return g_hash_table_lookup (client_alarms_hash, client);
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-
-	cqa = data;
-
-	/* FIXME */
-
-	g_message ("alarm_trigger_cb(): Triggered!");
-}
-
-/* Callback used when an alarm must be destroyed */
-static void
-alarm_destroy_cb (gpointer alarm_id, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-	QueuedAlarm *qa;
-	const char *uid;
-
-	cqa = data;
-
-	qa = NULL; /* Keep GCC happy */
-
-	/* Find the alarm in the queued alarms */
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Remove it and free it */
-
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
-
-	g_free (qa);
-
-	/* If this was the last queued alarm for this component, remove the
-	 * component itself.
-	 */
-
-	if (cqa->queued_alarms != NULL)
-		return;
-
-	cal_component_get_uid (cqa->alarms->comp, &uid);
-	g_hash_table_remove (cqa->parent_client->uid_alarms_hash, uid);
-	cqa->parent_client = NULL;
-
-	cal_component_alarms_free (cqa->alarms);
-	cqa->alarms = NULL;
-
-	g_free (cqa);
-}
-
-/* Adds the alarms in a CalComponentAlarms 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, CalComponentAlarms *alarms)
-{
-	const char *uid;
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	/* No alarms? */
-	if (alarms->alarms == NULL) {
-		cal_component_alarms_free (alarms);
-		return;
-	}
-
-	cqa = g_new (CompQueuedAlarms, 1);
-	cqa->parent_client = ca;
-	cqa->alarms = alarms;
-
-	cqa->queued_alarms = NULL;
-
-	for (l = alarms->alarms; l; l = l->next) {
-		CalAlarmInstance *instance;
-		gpointer alarm_id;
-		QueuedAlarm *qa;
-
-		instance = l->data;
-
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, alarm_destroy_cb);
-		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;
-
-		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-	}
-
-	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);
-
-		cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-
-		g_free (cqa);
-		return;
-	}
-
-	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	g_hash_table_insert (ca->uid_alarms_hash, (char *) uid, cqa);
-}
-
-/* Loads today's remaining alarms for a client */
-static void
-load_alarms (ClientAlarms *ca)
-{
-	time_t now, day_end;
-	GSList *comp_alarms;
-	GSList *l;
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	comp_alarms = cal_client_get_alarms_in_range (ca->client, now, day_end);
-
-	/* All of the last day's alarms should have already triggered and should
-	 * have been removed, so we should have no pending components.
-	 */
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		add_component_alarms (ca, alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/* Called when a calendar client finished loading; we load its alarms */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	if (status != CAL_CLIENT_LOAD_SUCCESS)
-		return;
-
-	load_alarms (ca);
-}
-
-/* Looks up a component's queued alarm structure in a client alarms structure */
-static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
-{
-	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
-}
-
-/* Removes a component an its alarms */
-static void
-remove_comp (ClientAlarms *ca, const char *uid)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	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);
-
-	for (l = cqa->queued_alarms; l;) {
-		QueuedAlarm *qa;
-
-		qa = l->data;
-
-		/* Get the next element here because the list element will go
-		 * away.  Also, we do not free the qa here because it will be
-		 * freed by the destroy notification function.
-		 */
-		l = l->next;
-
-		alarm_remove (qa->alarm_id);
-	}
-
-	/* The list should be empty now, and thus the queued component alarms
-	 * structure should have been freed and removed from the hash table.
-	 */
-	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);
-}
-
-/* Called when a calendar component changes; we must reload its corresponding
- * alarms.
- */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-	time_t now, day_end;
-	CalComponentAlarms *alarms;
-	gboolean found;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	found = cal_client_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
-
-	if (!found)
-		return;
-
-	add_component_alarms (ca, alarms);
-}
-
-/* Called when a calendar component is removed; we must delete its corresponding
- * alarms.
- */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-}
-
-
-
-/**
- * alarm_notify_init:
- *
- * Initializes the alarm notification system.  This should be called near the
- * beginning of the program, after calling alarm_init().
- **/
-void
-alarm_notify_init (void)
-{
-	g_return_if_fail (alarm_notify_inited == FALSE);
-
-	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-	queue_midnight_refresh ();
-
-	alarm_notify_inited = TRUE;
-}
-
-/**
- * alarm_notify_done:
- *
- * Shuts down the alarm notification system.  This should be called near the end
- * of the program.  All the monitored calendar clients should already have been
- * unregistered with alarm_notify_remove_client().
- **/
-void
-alarm_notify_done (void)
-{
-	g_return_if_fail (alarm_notify_inited);
-
-	/* All clients must be unregistered by now */
-	g_return_if_fail (g_hash_table_size (client_alarms_hash) == 0);
-
-	g_hash_table_destroy (client_alarms_hash);
-	client_alarms_hash = NULL;
-
-	g_assert (midnight_refresh_id != NULL);
-	alarm_remove (midnight_refresh_id);
-	midnight_refresh_id = NULL;
-
-	alarm_notify_inited = FALSE;
-}
-
-/**
- * alarm_notify_add_client:
- * @client: A calendar client.
- *
- * Adds a calendar client to the alarm notification system.  Alarm trigger
- * notifications will be presented at the appropriate times.  The client should
- * be removed with alarm_notify_remove_client() when receiving notifications
- * from it is no longer desired.
- *
- * A client can be added any number of times to the alarm notification 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
- * notification system when it is no longer wanted.
- **/
-void
-alarm_notify_add_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_notify_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	if (ca) {
-		ca->refcount++;
-		return;
-	}
-
-	ca = g_new (ClientAlarms, 1);
-
-	ca->client = client;
-	gtk_object_ref (GTK_OBJECT (ca->client));
-
-	ca->refcount = 1;
-	g_hash_table_insert (client_alarms_hash, client, ca);
-
-	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (!cal_client_is_loaded (client))
-		gtk_signal_connect (GTK_OBJECT (client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), ca);
-
-	gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), ca);
-	gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), ca);
-
-	if (cal_client_is_loaded (client))
-		load_alarms (ca);
-}
-
-/* Called from g_hash_table_foreach(); adds a component UID to a list */
-static void
-add_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	GSList **uids;
-	const char *uid;
-
-	uids = data;
-	uid = key;
-
-	*uids = g_slist_prepend (*uids, (char *) uid);
-}
-
-/* Removes all the alarms queued for a particular calendar client */
-static void
-remove_client_alarms (ClientAlarms *ca)
-{
-	GSList *uids;
-	GSList *l;
-
-	/* First we build a list of UIDs so that we can remove them one by one */
-
-	uids = NULL;
-	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		remove_comp (ca, uid);
-	}
-
-	g_slist_free (uids);
-
-	/* The hash table should be empty now */
-
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-}
-
-/**
- * alarm_notify_remove_client:
- * @client: A calendar client.
- *
- * Removes a calendar client from the alarm notification system.
- **/
-void
-alarm_notify_remove_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_notify_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	g_return_if_fail (ca != NULL);
-
-	g_assert (ca->refcount > 0);
-	ca->refcount--;
-
-	if (ca->refcount > 0)
-		return;
-
-	remove_client_alarms (ca);
-
-	/* Clean up */
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (ca->client), ca);
-
-	gtk_object_unref (GTK_OBJECT (ca->client));
-	ca->client = NULL;
-
-	g_hash_table_destroy (ca->uid_alarms_hash);
-	ca->uid_alarms_hash = NULL;
-
-	g_free (ca);
-
-	g_hash_table_remove (client_alarms_hash, client);
-}
-
-
-
-#if 0
-
-/* Sends a mail notification of an alarm trigger */
-static void
-mail_notification (char *mail_address, char *text, time_t app_time)
-{
-	pid_t pid;
-	int   p [2];
-	char *command;
-
-	pipe (p);
-	pid = fork ();
-	if (pid == 0){
-		int dev_null;
-
-		dev_null = open ("/dev/null", O_RDWR);
-		dup2 (p [0], 0);
-		dup2 (dev_null, 1);
-		dup2 (dev_null, 2);
-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",
-		       mail_address, NULL);
-		_exit (127);
-	}
-	command = g_strconcat ("To: ", mail_address, "\n",
-			       "Subject: ", _("Reminder of your appointment at "),
-			       ctime (&app_time), "\n\n", text, "\n", NULL);
-	write (p [1], command, strlen (command));
- 	close (p [1]);
-	close (p [0]);
-	g_free (command);
-}
-
-static int
-max_open_files (void)
-{
-        static int files;
-
-        if (files)
-                return files;
-
-        files = sysconf (_SC_OPEN_MAX);
-        if (files != -1)
-                return files;
-#ifdef OPEN_MAX
-        return files = OPEN_MAX;
-#else
-        return files = 256;
-#endif
-}
-
-/* Executes a program as a notification of an alarm trigger */
-static void
-program_notification (char *command, int close_standard)
-{
-	struct sigaction ignore, save_intr, save_quit;
-	int status = 0, i;
-	pid_t pid;
-
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-
-	sigaction (SIGINT, &ignore, &save_intr);
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	if ((pid = fork ()) < 0){
-		fprintf (stderr, "\n\nfork () = -1\n");
-		return;
-	}
-	if (pid == 0){
-		pid = fork ();
-		if (pid == 0){
-			const int top = max_open_files ();
-			sigaction (SIGINT,  &save_intr, NULL);
-			sigaction (SIGQUIT, &save_quit, NULL);
-
-			for (i = (close_standard ? 0 : 3); i < top; i++)
-				close (i);
-
-			/* FIXME: As an excercise to the reader, copy the
-			 * code from mc to setup shell properly instead of
-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.
-			 */
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-
-			_exit (127);
-		} else {
-			_exit (127);
-		}
-	}
-	wait (&status);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-}
-
-/* Queues a snooze alarm */
-static void
-snooze (GnomeCalendar *gcal, CalComponent *comp, time_t occur, int snooze_mins, gboolean audio)
-{
-	time_t now, trigger;
-	struct tm tm;
-	CalAlarmInstance ai;
-
-	now = time (NULL);
-	tm = *localtime (&now);
-	tm.tm_min += snooze_mins;
-
-	trigger = mktime (&tm);
-	if (trigger == -1) {
-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");
-		return;
-	}
-
-#if 0
-	cal_component_get_uid (comp, &ai.uid);
-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;
-#endif
-	ai.trigger = trigger;
-	ai.occur = occur;
-
-	setup_alarm (gcal, &ai);
-}
-
-struct alarm_notify_closure {
-	GnomeCalendar *gcal;
-	CalComponent *comp;
-	time_t occur;
-};
-
-/* Callback used for the result of the alarm notification dialog */
-static void
-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct alarm_notify_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_CLOSE:
-		break;
-
-	case ALARM_NOTIFY_SNOOZE:
-		snooze (c->gcal, c->comp, c->occur, snooze_mins, FALSE);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		gnome_calendar_edit_object (c->gcal, c->comp);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-}
-
-/* Present a display notification of an alarm trigger */
-static void
-display_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	gboolean result;
-	struct alarm_notify_closure *c;
-
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	c = g_new (struct alarm_notify_closure, 1);
-	c->gcal = gcal;
-	c->comp = comp;
-	c->occur = occur;
-
-	result = alarm_notify_dialog (trigger, occur, comp, display_notification_cb, c);
-	if (!result) {
-		g_message ("display_notification(): could not display the alarm notification dialog");
-		g_free (c);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
-
-/* Present an audible notification of an alarm trigger */
-static void
-audio_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	g_message ("AUDIO NOTIFICATION!");
-	/* FIXME */
-}
-
-/* Callback function used when an alarm is triggered */
-static void
-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	struct trigger_alarm_closure *c;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *uid;
-	ObjectAlarms *oa;
-   	GList *l;
-
-	c = data;
-	priv = c->gcal->priv;
-
-	/* Fetch the object */
-
-	status = cal_client_get_object (priv->client, c->uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Go on */
-		break;
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-	case CAL_CLIENT_GET_NOT_FOUND:
-		g_message ("trigger_alarm_cb(): syntax error in fetched object");
-		return;
-	}
-
-	g_assert (comp != NULL);
-
-	/* Present notification */
-
-	switch (c->type) {
-	case CAL_COMPONENT_ALARM_EMAIL:
-#if 0
-		g_assert (ico->malarm.enabled);
-		mail_notification (ico->malarm.data, ico->summary, c->occur);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-#if 0
-		g_assert (ico->palarm.enabled);
-		program_notification (ico->palarm.data, FALSE);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-#if 0
-		g_assert (ico->dalarm.enabled);
-#endif
-		display_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	case CAL_COMPONENT_ALARM_AUDIO:
-#if 0
-		g_assert (ico->aalarm.enabled);
-#endif
-		audio_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Remove the alarm from the hash table */
-	cal_component_get_uid (comp, &uid);
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	g_assert (oa != NULL);
-
-	l = g_list_find (oa->alarm_ids, alarm_id);
-	g_assert (l != NULL);
-
-	oa->alarm_ids = g_list_remove_link (oa->alarm_ids, l);
-	g_list_free_1 (l);
-
-	if (!oa->alarm_ids) {
-		g_hash_table_remove (priv->alarms, uid);
-		g_free (oa->uid);
-		g_free (oa);
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-#endif
-
-#if 0
-
-static void
-stop_beeping (GtkObject* object, gpointer data)
-{
-	guint timer_tag, beep_tag;
-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));
-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));
-
-	if (beep_tag > 0) {
-		gtk_timeout_remove (beep_tag);
-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));
-	}
-	if (timer_tag > 0) {
-		gtk_timeout_remove (timer_tag);
-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));
-	}
-}
-
-static gint
-start_beeping (gpointer data)
-{
-	gdk_beep ();
-
-	return TRUE;
-}
-
-static gint
-timeout_beep (gpointer data)
-{
-	stop_beeping (data, NULL);
-	return FALSE;
-}
-
-void
-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)
-{
-	iCalObject *ico = data;
-	guint beep_tag, timer_tag;
-	int ret;
-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);
-	time_t now, diff;
-
-	if (&ico->aalarm == which){
-		time_t app = ico->aalarm.trigger + ico->aalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-
-		/* Idea: we need Snooze option :-) */
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);
-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);
-		if (enable_aalarm_timeout)
-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000,
-						     timeout_beep, w);
-		else
-			timer_tag = 0;
-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",
-				     GINT_TO_POINTER (timer_tag));
-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",
-				     GINT_TO_POINTER (beep_tag));
-		gtk_widget_ref (w);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			break;
-		}
-
-		gtk_widget_unref (w);
-		return;
-	}
-
-        if (&ico->palarm == which){
-		execute (ico->palarm.data, 0);
-		return;
-	}
-
-	if (&ico->malarm == which){
-		time_t app = ico->malarm.trigger + ico->malarm.offset;
-
-		mail_notify (ico->malarm.data, ico->summary, app);
-		return;
-	}
-
-	if (&ico->dalarm == which){
-		time_t app = ico->dalarm.trigger + ico->dalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		if (beep_on_display)
-			gdk_beep ();
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO,
-					   _("Ok"), snooze_button, NULL);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			break;
-		}
-
-		return;
-	}
-}
-
-#endif
diff --git a/calendar/gui/alarm-notify.h b/calendar/gui/alarm-notify.h
deleted file mode 100644
index f386a56ae4..0000000000
--- a/calendar/gui/alarm-notify.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Evolution calendar - Alarm notification engine
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_H
-#define ALARM_NOTIFY_H
-
-#include <cal-client/cal-client.h>
-
-
-void alarm_notify_init (void);
-void alarm_notify_done (void);
-
-void alarm_notify_add_client (CalClient *client);
-void alarm_notify_remove_client (CalClient *client);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/.cvsignore b/calendar/gui/alarm-notify/.cvsignore
deleted file mode 100644
index 1f2b546c7c..0000000000
--- a/calendar/gui/alarm-notify/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-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.oaf
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
deleted file mode 100644
index 86f5c71493..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
-            type="exe"
-            location="evolution-alarm-notify">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the alarm notification service"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
-
-	<oaf_attribute name="description" type="string"
-                       _value="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 b542566d17..0000000000
--- a/calendar/gui/alarm-notify/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
-bin_PROGRAMS = evolution-alarm-notify evolution-alarm-client
-
-noinst_LIBRARIES = libalarm.a
-
-libalarm_a_SOURCES =	\
-	alarm.c		\
-	alarm.h
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/widgets				\
-	-I$(includedir)					\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-gladedir   = $(datadir)/evolution/glade
-
-evolution_alarm_notify_SOURCES =	\
-	alarm-notify.c			\
-	alarm-notify.h			\
-	alarm-queue.c			\
-	alarm-queue.h			\
-	notify-main.c
-
-evolution_alarm_notify_LDADD =					\
-	libalarm.a						\
-	$(top_builddir)/calendar/cal-client/libcal-client.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libical/src/libical/libical.la		\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(INTLLIBS)
-
-evolution_alarm_client_SOURCES =	\
-	client-main.c			\
-	$(CORBA_GENERATED)
-
-evolution_alarm_client_LDADD =		\
-	 $(BONOBO_VFS_GNOME_LIBS)	\
-	 $(EXTRA_GNOME_LIBS)		\
-	 $(INTLLIBS)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar_AlarmNotify.oaf.in
-
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST =		\
-	$(oaf_DATA)	\
-	$(oaf_in_files)
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(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 fbd8c1f097..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
deleted file mode 100644
index f2c938c495..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
deleted file mode 100644
index fa70a1d236..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2000 Helix Code, 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 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 <libgnomevfs/gnome-vfs.h>
-#include <cal-client/cal-client.h>
-#include "alarm-notify.h"
-#include "alarm-queue.h"
-
-
-
-/* A loaded client */
-typedef struct {
-	/* The actual client */
-	CalClient *client;
-
-	/* The URI of the client in gnome-vfs's format.  This *is* the key that
-	 * is stored in the uri_client_hash hash table below.
-	 */
-	GnomeVFSURI *uri;
-
-	/* Number of times clients have requested this URI to be added to the
-	 * alarm notification system.
-	 */
-	int refcount;
-} LoadedClient;
-
-/* Private part of the AlarmNotify structure */
-struct _AlarmNotifyPrivate {
-	/* Mapping from GnomeVFSURIs to LoadedClient structures */
-	GHashTable *uri_client_hash;
-};
-
-
-
-static void alarm_notify_class_init (AlarmNotifyClass *class);
-static void alarm_notify_init (AlarmNotify *an);
-static void alarm_notify_destroy (GtkObject *object);
-
-static POA_GNOME_Evolution_Calendar_AlarmNotify__vepv alarm_notify_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * alarm_notify_get_type:
- * 
- * Registers the #AlarmNotify class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #AlarmNotify class.
- **/
-GtkType
-alarm_notify_get_type (void)
-{
-	static GtkType alarm_notify_type = 0;
-
-	if (!alarm_notify_type) {
-		static const GtkTypeInfo alarm_notify_info = {
-			"AlarmNotify",
-			sizeof (AlarmNotify),
-			sizeof (AlarmNotifyClass),
-			(GtkClassInitFunc) alarm_notify_class_init,
-			(GtkObjectInitFunc) alarm_notify_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		alarm_notify_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &alarm_notify_info);
-	}
-
-	return alarm_notify_type;
-}
-
-/* CORBA class initialization function for the alarm notify service */
-static void
-init_alarm_notify_corba_class (void)
-{
-	alarm_notify_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	alarm_notify_vepv.GNOME_Evolution_Calendar_AlarmNotify_epv = alarm_notify_get_epv ();
-}
-
-/* Class initialization function for the alarm notify service */
-static void
-alarm_notify_class_init (AlarmNotifyClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
-
-	object_class->destroy = alarm_notify_destroy;
-
-	init_alarm_notify_corba_class ();
-}
-
-/* Object initialization function for the alarm notify system */
-static void
-alarm_notify_init (AlarmNotify *an)
-{
-	AlarmNotifyPrivate *priv;
-
-	priv = g_new0 (AlarmNotifyPrivate, 1);
-	an->priv = priv;
-
-	priv->uri_client_hash = g_hash_table_new (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-}
-
-/* Callback used from g_hash-table_forach(), used to destroy a loade client */
-static void
-destroy_loaded_client_cb (gpointer key, gpointer value, gpointer data)
-{
-	LoadedClient *lc;
-
-	lc = value;
-
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	gnome_vfs_uri_unref (lc->uri);
-	g_free (lc);
-}
-
-/* Destroy handler for the alarm notify system */
-static void
-alarm_notify_destroy (GtkObject *object)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_ALARM_NOTIFY (object));
-
-	an = ALARM_NOTIFY (object);
-	priv = an->priv;
-
-	g_hash_table_foreach (priv->uri_client_hash, destroy_loaded_client_cb, NULL);
-
-	g_hash_table_destroy (priv->uri_client_hash);
-	priv->uri_client_hash = NULL;
-
-	g_free (priv);
-	an->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* AlarmNotify::addCalendar method */
-static void
-AlarmNotify_addCalendar (PortableServer_Servant servant,
-			 const CORBA_char *str_uri,
-			 CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	GnomeVFSURI *uri;
-	CalClient *client;
-	LoadedClient *lc;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	uri = gnome_vfs_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	lc = g_hash_table_lookup (priv->uri_client_hash, uri);
-
-	if (lc) {
-		gnome_vfs_uri_unref (uri);
-		g_assert (lc->refcount > 0);
-		lc->refcount++;
-		return;
-	}
-
-	client = cal_client_new ();
-
-	if (client) {
-		if (cal_client_open_calendar (client, str_uri, FALSE)) {
-			lc = g_new (LoadedClient, 1);
-			lc->client = client;
-			lc->uri = uri;
-			lc->refcount = 1;
-			g_hash_table_insert (priv->uri_client_hash, uri, lc);
-
-			alarm_queue_add_client (client);
-		} else {
-			gtk_object_unref (GTK_OBJECT (client));
-			client = NULL;
-		}
-	}
-
-	if (!client) {
-		gnome_vfs_uri_unref (uri);
-
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError,
-				     NULL);
-		return;
-	}
-}
-
-/* AlarmNotify::removeCalendar method */
-static void
-AlarmNotify_removeCalendar (PortableServer_Servant servant,
-			    const CORBA_char *str_uri,
-			    CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-	LoadedClient *lc;
-	GnomeVFSURI *uri;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	uri = gnome_vfs_uri_new (str_uri);
-	if (!uri) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,
-				     NULL);
-		return;
-	}
-
-	lc = g_hash_table_lookup (priv->uri_client_hash, uri);
-	gnome_vfs_uri_unref (uri);
-
-	if (!lc) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound,
-				     NULL);
-		return;
-	}
-
-	g_assert (lc->refcount > 0);
-
-	lc->refcount--;
-	if (lc->refcount > 0)
-		return;
-
-	g_hash_table_remove (priv->uri_client_hash, lc->uri);
-
-	gtk_object_unref (GTK_OBJECT (lc->client));
-	gnome_vfs_uri_unref (lc->uri);
-	g_free (lc);
-}
-
-static void
-AlarmNotify_die (PortableServer_Servant servant,
-		 CORBA_Environment *ev)
-{
-	AlarmNotify *an;
-	AlarmNotifyPrivate *priv;
-
-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
-	priv = an->priv;
-
-	/* FIXME */
-}
-
-/**
- * alarm_notify_get_epv:
- * 
- * Creates an EPV for the AlarmNotify CORBA class.
- * 
- * Return value: A newly-allocated EPV.
- **/
-POA_GNOME_Evolution_Calendar_AlarmNotify__epv *
-alarm_notify_get_epv (void)
-{
-	POA_GNOME_Evolution_Calendar_AlarmNotify__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Calendar_AlarmNotify__epv, 1);
-	epv->addCalendar = AlarmNotify_addCalendar;
-	epv->removeCalendar = AlarmNotify_removeCalendar;
-	epv->die = AlarmNotify_die;
-	return epv;
-}
-
-
-
-/**
- * alarm_notify_construct:
- * @an: An alarm notification service object.
- * @corba_an: CORBA object for the alarm notification service.
- * 
- * Constructs an alarm notification service object by binding the corresponding
- * CORBA object to it.
- * 
- * Return value: the same object as the @an argument.
- **/
-AlarmNotify *
-alarm_notify_construct (AlarmNotify *an,
-			GNOME_Evolution_Calendar_AlarmNotify corba_an)
-{
-	g_return_val_if_fail (an != NULL, NULL);
-	g_return_val_if_fail (IS_ALARM_NOTIFY (an), NULL);
-
-	/* FIXME: add_interface the property bag here */
-
-	bonobo_object_construct (BONOBO_OBJECT (an), corba_an);
-	return an;
-}
-
-/**
- * alarm_notify_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- * 
- * Creates and activates the CORBA object that is wrapped by the specified alarm
- * notification service @object.
- * 
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-GNOME_Evolution_Calendar_AlarmNotify
-alarm_notify_corba_object_create (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Calendar_AlarmNotify *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_ALARM_NOTIFY (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Calendar_AlarmNotify *) g_new (BonoboObjectServant, 1);
-	servant->vepv = &alarm_notify_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Calendar_AlarmNotify__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Calendar_AlarmNotify) bonobo_object_activate_servant (
-		object, servant);
-}
-
-/**
- * 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;
-	GNOME_Evolution_Calendar_AlarmNotify corba_an;
-	CORBA_Environment ev;
-	gboolean result;
-
-	an = gtk_type_new (TYPE_ALARM_NOTIFY);
-
-	corba_an = alarm_notify_corba_object_create (BONOBO_OBJECT (an));
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (corba_an, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION || result) {
-		g_message ("alarm_notify_new(): could not create the CORBA alarm notify service");
-		bonobo_object_unref (BONOBO_OBJECT (an));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return alarm_notify_construct (an, corba_an);
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 41718d0572..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
deleted file mode 100644
index e7a907485d..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Evolution calendar - Alarm notification service object
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_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)            (GTK_CHECK_CAST ((obj), TYPE_ALARM_NOTIFY, AlarmNotify))
-#define ALARM_NOTIFY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_NOTIFY,		\
-				      AlarmNotifyClass))
-#define IS_ALARM_NOTIFY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_ALARM_NOTIFY))
-#define IS_ALARM_NOTIFY_CLASS(klass) (GTK_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;
-};
-
-GtkType alarm_notify_get_type (void);
-
-AlarmNotify *alarm_notify_construct (AlarmNotify *an,
-				     GNOME_Evolution_Calendar_AlarmNotify corba_an);
-
-GNOME_Evolution_Calendar_AlarmNotify alarm_notify_corba_object_create (BonoboObject *object);
-POA_GNOME_Evolution_Calendar_AlarmNotify__epv *alarm_notify_get_epv (void);
-
-AlarmNotify *alarm_notify_new (void);
-
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
deleted file mode 100644
index 1e235c116d..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ /dev/null
@@ -1,964 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <cal-util/timeutil.h>
-#include "alarm.h"
-#include "alarm-queue.h"
-
-
-
-/* Whether the queueing system has been initialized */
-static gboolean alarm_queue_inited;
-
-/* Clients we are monitoring for alarms */
-static GHashTable *client_alarms_hash = NULL;
-
-/* Structure that stores a client we are monitoring */
-typedef struct {
-	/* Monitored client */
-	CalClient *client;
-
-	/* Number of times this client has been registered */
-	int refcount;
-
-	/* Hash table of component UID -> CompQueuedAlarms.  If an element is
-	 * present here, then it means its cqa->queued_alarms contains at least
-	 * one queued alarm.  When all the alarms for a component have been
-	 * dequeued, the CompQueuedAlarms structure is removed from the hash
-	 * table.  Thus a CQA exists <=> it has queued alarms.
-	 */
-	GHashTable *uid_alarms_hash;
-} ClientAlarms;
-
-/* Pair of a CalComponentAlarms and the mapping from queued alarm IDs to the
- * actual alarm instance structures.
- */
-typedef struct {
-	/* The parent client alarms structure */
-	ClientAlarms *parent_client;
-
-	/* The actual component and its alarm instances */
-	CalComponentAlarms *alarms;
-
-	/* List of QueuedAlarm structures */
-	GSList *queued_alarms;
-} 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 CompAlarms->alarms list */
-	CalAlarmInstance *instance;
-} QueuedAlarm;
-
-/* Alarm ID for the midnight refresh function */
-static gpointer midnight_refresh_id = NULL;
-
-
-
-static void load_alarms (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;
-
-	g_assert (midnight_refresh_id == NULL);
-
-	midnight = time_day_end (time (NULL));
-
-	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 (ca);
-}
-
-/* Loads the alarms for the new day every midnight */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	/* Re-load the alarms for all clients */
-
-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);
-
-	/* Re-schedule the midnight update */
-
-	midnight_refresh_id = NULL;
-	queue_midnight_refresh ();
-}
-
-/* Looks up a client in the client alarms hash table */
-static ClientAlarms *
-lookup_client (CalClient *client)
-{
-	return g_hash_table_lookup (client_alarms_hash, client);
-}
-
-/* Callback used when an alarm triggers */
-static void
-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-
-	cqa = data;
-
-	/* FIXME */
-
-	g_message ("alarm_trigger_cb(): Triggered!");
-}
-
-/* Callback used when an alarm must be destroyed */
-static void
-alarm_destroy_cb (gpointer alarm_id, gpointer data)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-	QueuedAlarm *qa;
-	const char *uid;
-
-	cqa = data;
-
-	qa = NULL; /* Keep GCC happy */
-
-	/* Find the alarm in the queued alarms */
-
-	for (l = cqa->queued_alarms; l; l = l->next) {
-		qa = l->data;
-		if (qa->alarm_id == alarm_id)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Remove it and free it */
-
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
-
-	g_free (qa);
-
-	/* If this was the last queued alarm for this component, remove the
-	 * component itself.
-	 */
-
-	if (cqa->queued_alarms != NULL)
-		return;
-
-	cal_component_get_uid (cqa->alarms->comp, &uid);
-	g_hash_table_remove (cqa->parent_client->uid_alarms_hash, uid);
-	cqa->parent_client = NULL;
-
-	cal_component_alarms_free (cqa->alarms);
-	cqa->alarms = NULL;
-
-	g_free (cqa);
-}
-
-/* Adds the alarms in a CalComponentAlarms 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, CalComponentAlarms *alarms)
-{
-	const char *uid;
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	/* No alarms? */
-	if (alarms->alarms == NULL) {
-		cal_component_alarms_free (alarms);
-		return;
-	}
-
-	cqa = g_new (CompQueuedAlarms, 1);
-	cqa->parent_client = ca;
-	cqa->alarms = alarms;
-
-	cqa->queued_alarms = NULL;
-
-	for (l = alarms->alarms; l; l = l->next) {
-		CalAlarmInstance *instance;
-		gpointer alarm_id;
-		QueuedAlarm *qa;
-
-		instance = l->data;
-
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, alarm_destroy_cb);
-		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;
-
-		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-	}
-
-	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);
-
-		cal_component_alarms_free (cqa->alarms);
-		cqa->alarms = NULL;
-
-		g_free (cqa);
-		return;
-	}
-
-	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
-	g_hash_table_insert (ca->uid_alarms_hash, (char *) uid, cqa);
-}
-
-/* Loads today's remaining alarms for a client */
-static void
-load_alarms (ClientAlarms *ca)
-{
-	time_t now, day_end;
-	GSList *comp_alarms;
-	GSList *l;
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	comp_alarms = cal_client_get_alarms_in_range (ca->client, now, day_end);
-
-	/* All of the last day's alarms should have already triggered and should
-	 * have been removed, so we should have no pending components.
-	 */
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-
-	for (l = comp_alarms; l; l = l->next) {
-		CalComponentAlarms *alarms;
-
-		alarms = l->data;
-		add_component_alarms (ca, alarms);
-	}
-
-	g_slist_free (comp_alarms);
-}
-
-/* Called when a calendar client finished loading; we load its alarms */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	load_alarms (ca);
-}
-
-/* Looks up a component's queued alarm structure in a client alarms structure */
-static CompQueuedAlarms *
-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)
-{
-	return g_hash_table_lookup (ca->uid_alarms_hash, uid);
-}
-
-/* Removes a component an its alarms */
-static void
-remove_comp (ClientAlarms *ca, const char *uid)
-{
-	CompQueuedAlarms *cqa;
-	GSList *l;
-
-	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);
-
-	for (l = cqa->queued_alarms; l;) {
-		QueuedAlarm *qa;
-
-		qa = l->data;
-
-		/* Get the next element here because the list element will go
-		 * away.  Also, we do not free the qa here because it will be
-		 * freed by the destroy notification function.
-		 */
-		l = l->next;
-
-		alarm_remove (qa->alarm_id);
-	}
-
-	/* The list should be empty now, and thus the queued component alarms
-	 * structure should have been freed and removed from the hash table.
-	 */
-	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);
-}
-
-/* Called when a calendar component changes; we must reload its corresponding
- * alarms.
- */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-	time_t now, day_end;
-	CalComponentAlarms *alarms;
-	gboolean found;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-
-	now = time (NULL);
-	day_end = time_day_end (now);
-
-	found = cal_client_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
-
-	if (!found)
-		return;
-
-	add_component_alarms (ca, alarms);
-}
-
-/* Called when a calendar component is removed; we must delete its corresponding
- * alarms.
- */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	ClientAlarms *ca;
-
-	ca = data;
-
-	remove_comp (ca, uid);
-}
-
-
-
-/**
- * alarm_queue_init:
- *
- * Initializes the alarm queueing system.  This should be called near the
- * beginning of the program, after calling alarm_init().
- **/
-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 ();
-
-	alarm_queue_inited = TRUE;
-}
-
-/**
- * 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_destroy (client_alarms_hash);
-	client_alarms_hash = NULL;
-
-	g_assert (midnight_refresh_id != NULL);
-	alarm_remove (midnight_refresh_id);
-	midnight_refresh_id = NULL;
-
-	alarm_queue_inited = FALSE;
-}
-
-/**
- * alarm_queue_add_client:
- * @client: A calendar client.
- *
- * Adds a calendar client to the alarm queueing system.  Alarm trigger
- * notifications will be presented at the appropriate times.  The client should
- * be removed with alarm_queue_remove_client() when receiving notifications
- * from it is no longer desired.
- *
- * A client can be added any number of times to the alarm queueing system,
- * but any single alarm trigger will only be presented once for a particular
- * client.  The client must still be removed the same number of times from the
- * queueing system when it is no longer wanted.
- **/
-void
-alarm_queue_add_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	if (ca) {
-		ca->refcount++;
-		return;
-	}
-
-	ca = g_new (ClientAlarms, 1);
-
-	ca->client = client;
-	gtk_object_ref (GTK_OBJECT (ca->client));
-
-	ca->refcount = 1;
-	g_hash_table_insert (client_alarms_hash, client, ca);
-
-	ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)
-		gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-				    GTK_SIGNAL_FUNC (cal_opened_cb), ca);
-
-	gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), ca);
-	gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), ca);
-
-	if (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED)
-		load_alarms (ca);
-}
-
-/* Called from g_hash_table_foreach(); adds a component UID to a list */
-static void
-add_uid_cb (gpointer key, gpointer value, gpointer data)
-{
-	GSList **uids;
-	const char *uid;
-
-	uids = data;
-	uid = key;
-
-	*uids = g_slist_prepend (*uids, (char *) uid);
-}
-
-/* Removes all the alarms queued for a particular calendar client */
-static void
-remove_client_alarms (ClientAlarms *ca)
-{
-	GSList *uids;
-	GSList *l;
-
-	/* First we build a list of UIDs so that we can remove them one by one */
-
-	uids = NULL;
-	g_hash_table_foreach (ca->uid_alarms_hash, add_uid_cb, &uids);
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-
-		uid = l->data;
-
-		remove_comp (ca, uid);
-	}
-
-	g_slist_free (uids);
-
-	/* The hash table should be empty now */
-
-	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
-}
-
-/**
- * alarm_queue_remove_client:
- * @client: A calendar client.
- *
- * Removes a calendar client from the alarm queueing system.
- **/
-void
-alarm_queue_remove_client (CalClient *client)
-{
-	ClientAlarms *ca;
-
-	g_return_if_fail (alarm_queue_inited);
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	ca = lookup_client (client);
-	g_return_if_fail (ca != NULL);
-
-	g_assert (ca->refcount > 0);
-	ca->refcount--;
-
-	if (ca->refcount > 0)
-		return;
-
-	remove_client_alarms (ca);
-
-	/* Clean up */
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (ca->client), ca);
-
-	gtk_object_unref (GTK_OBJECT (ca->client));
-	ca->client = NULL;
-
-	g_hash_table_destroy (ca->uid_alarms_hash);
-	ca->uid_alarms_hash = NULL;
-
-	g_free (ca);
-
-	g_hash_table_remove (client_alarms_hash, client);
-}
-
-
-
-#if 0
-
-/* Sends a mail notification of an alarm trigger */
-static void
-mail_notification (char *mail_address, char *text, time_t app_time)
-{
-	pid_t pid;
-	int   p [2];
-	char *command;
-
-	pipe (p);
-	pid = fork ();
-	if (pid == 0){
-		int dev_null;
-
-		dev_null = open ("/dev/null", O_RDWR);
-		dup2 (p [0], 0);
-		dup2 (dev_null, 1);
-		dup2 (dev_null, 2);
-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",
-		       mail_address, NULL);
-		_exit (127);
-	}
-	command = g_strconcat ("To: ", mail_address, "\n",
-			       "Subject: ", _("Reminder of your appointment at "),
-			       ctime (&app_time), "\n\n", text, "\n", NULL);
-	write (p [1], command, strlen (command));
- 	close (p [1]);
-	close (p [0]);
-	g_free (command);
-}
-
-static int
-max_open_files (void)
-{
-        static int files;
-
-        if (files)
-                return files;
-
-        files = sysconf (_SC_OPEN_MAX);
-        if (files != -1)
-                return files;
-#ifdef OPEN_MAX
-        return files = OPEN_MAX;
-#else
-        return files = 256;
-#endif
-}
-
-/* Executes a program as a notification of an alarm trigger */
-static void
-program_notification (char *command, int close_standard)
-{
-	struct sigaction ignore, save_intr, save_quit;
-	int status = 0, i;
-	pid_t pid;
-
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-
-	sigaction (SIGINT, &ignore, &save_intr);
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	if ((pid = fork ()) < 0){
-		fprintf (stderr, "\n\nfork () = -1\n");
-		return;
-	}
-	if (pid == 0){
-		pid = fork ();
-		if (pid == 0){
-			const int top = max_open_files ();
-			sigaction (SIGINT,  &save_intr, NULL);
-			sigaction (SIGQUIT, &save_quit, NULL);
-
-			for (i = (close_standard ? 0 : 3); i < top; i++)
-				close (i);
-
-			/* FIXME: As an excercise to the reader, copy the
-			 * code from mc to setup shell properly instead of
-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.
-			 */
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-
-			_exit (127);
-		} else {
-			_exit (127);
-		}
-	}
-	wait (&status);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-}
-
-/* Queues a snooze alarm */
-static void
-snooze (GnomeCalendar *gcal, CalComponent *comp, time_t occur, int snooze_mins, gboolean audio)
-{
-	time_t now, trigger;
-	struct tm tm;
-	CalAlarmInstance ai;
-
-	now = time (NULL);
-	tm = *localtime (&now);
-	tm.tm_min += snooze_mins;
-
-	trigger = mktime (&tm);
-	if (trigger == -1) {
-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");
-		return;
-	}
-
-#if 0
-	cal_component_get_uid (comp, &ai.uid);
-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;
-#endif
-	ai.trigger = trigger;
-	ai.occur = occur;
-
-	setup_alarm (gcal, &ai);
-}
-
-struct alarm_notify_closure {
-	GnomeCalendar *gcal;
-	CalComponent *comp;
-	time_t occur;
-};
-
-/* Callback used for the result of the alarm notification dialog */
-static void
-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct alarm_notify_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_CLOSE:
-		break;
-
-	case ALARM_NOTIFY_SNOOZE:
-		snooze (c->gcal, c->comp, c->occur, snooze_mins, FALSE);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		gnome_calendar_edit_object (c->gcal, c->comp);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-}
-
-/* Present a display notification of an alarm trigger */
-static void
-display_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	gboolean result;
-	struct alarm_notify_closure *c;
-
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	c = g_new (struct alarm_notify_closure, 1);
-	c->gcal = gcal;
-	c->comp = comp;
-	c->occur = occur;
-
-	result = alarm_notify_dialog (trigger, occur, comp, display_notification_cb, c);
-	if (!result) {
-		g_message ("display_notification(): could not display the alarm notification dialog");
-		g_free (c);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
-
-/* Present an audible notification of an alarm trigger */
-static void
-audio_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	g_message ("AUDIO NOTIFICATION!");
-	/* FIXME */
-}
-
-/* Callback function used when an alarm is triggered */
-static void
-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	struct trigger_alarm_closure *c;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *uid;
-	ObjectAlarms *oa;
-   	GList *l;
-
-	c = data;
-	priv = c->gcal->priv;
-
-	/* Fetch the object */
-
-	status = cal_client_get_object (priv->client, c->uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Go on */
-		break;
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-	case CAL_CLIENT_GET_NOT_FOUND:
-		g_message ("trigger_alarm_cb(): syntax error in fetched object");
-		return;
-	}
-
-	g_assert (comp != NULL);
-
-	/* Present notification */
-
-	switch (c->type) {
-	case CAL_COMPONENT_ALARM_EMAIL:
-#if 0
-		g_assert (ico->malarm.enabled);
-		mail_notification (ico->malarm.data, ico->summary, c->occur);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-#if 0
-		g_assert (ico->palarm.enabled);
-		program_notification (ico->palarm.data, FALSE);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-#if 0
-		g_assert (ico->dalarm.enabled);
-#endif
-		display_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	case CAL_COMPONENT_ALARM_AUDIO:
-#if 0
-		g_assert (ico->aalarm.enabled);
-#endif
-		audio_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Remove the alarm from the hash table */
-	cal_component_get_uid (comp, &uid);
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	g_assert (oa != NULL);
-
-	l = g_list_find (oa->alarm_ids, alarm_id);
-	g_assert (l != NULL);
-
-	oa->alarm_ids = g_list_remove_link (oa->alarm_ids, l);
-	g_list_free_1 (l);
-
-	if (!oa->alarm_ids) {
-		g_hash_table_remove (priv->alarms, uid);
-		g_free (oa->uid);
-		g_free (oa);
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-#endif
-
-#if 0
-
-static void
-stop_beeping (GtkObject* object, gpointer data)
-{
-	guint timer_tag, beep_tag;
-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));
-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));
-
-	if (beep_tag > 0) {
-		gtk_timeout_remove (beep_tag);
-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));
-	}
-	if (timer_tag > 0) {
-		gtk_timeout_remove (timer_tag);
-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));
-	}
-}
-
-static gint
-start_beeping (gpointer data)
-{
-	gdk_beep ();
-
-	return TRUE;
-}
-
-static gint
-timeout_beep (gpointer data)
-{
-	stop_beeping (data, NULL);
-	return FALSE;
-}
-
-void
-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)
-{
-	iCalObject *ico = data;
-	guint beep_tag, timer_tag;
-	int ret;
-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);
-	time_t now, diff;
-
-	if (&ico->aalarm == which){
-		time_t app = ico->aalarm.trigger + ico->aalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-
-		/* Idea: we need Snooze option :-) */
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);
-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);
-		if (enable_aalarm_timeout)
-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000,
-						     timeout_beep, w);
-		else
-			timer_tag = 0;
-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",
-				     GINT_TO_POINTER (timer_tag));
-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",
-				     GINT_TO_POINTER (beep_tag));
-		gtk_widget_ref (w);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			break;
-		}
-
-		gtk_widget_unref (w);
-		return;
-	}
-
-        if (&ico->palarm == which){
-		execute (ico->palarm.data, 0);
-		return;
-	}
-
-	if (&ico->malarm == which){
-		time_t app = ico->malarm.trigger + ico->malarm.offset;
-
-		mail_notify (ico->malarm.data, ico->summary, app);
-		return;
-	}
-
-	if (&ico->dalarm == which){
-		time_t app = ico->dalarm.trigger + ico->dalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		if (beep_on_display)
-			gdk_beep ();
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO,
-					   _("Ok"), snooze_button, NULL);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			break;
-		}
-
-		return;
-	}
-}
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
deleted file mode 100644
index 1f8871fb96..0000000000
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_QUEUE_H
-#define ALARM_QUEUE_H
-
-#include <cal-client/cal-client.h>
-
-
-void alarm_queue_init (void);
-void alarm_queue_done (void);
-
-void alarm_queue_add_client (CalClient *client);
-void alarm_queue_remove_client (CalClient *client);
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index d32d8f1af9..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <gdk/gdk.h>
-#include "alarm.h"
-
-
-
-/* Whether the timer system has been initialized */
-static gboolean alarm_inited;
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Clears the itimer we have pending */
-static gboolean
-clear_itimer (void)
-{
-	return setup_itimer (0);
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else
-		if (!clear_itimer ())
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar, ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	g_return_val_if_fail (alarm_inited, NULL);
-	g_return_val_if_fail (trigger != -1, NULL);
-	g_return_val_if_fail (alarm_fn != NULL, NULL);
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	g_return_if_fail (alarm_inited);
-	g_return_if_fail (alarm != NULL);
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar, ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- *
- * Initializes the alarm timer mechanism.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	g_return_if_fail (alarm_inited == FALSE);
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-
-	alarm_inited = TRUE;
-}
-
-/**
- * alarm_done:
- * 
- * Terminates the alarm timer mechanism.  This should be called at the end of
- * the program.
- **/
-void
-alarm_done (void)
-{
-	GList *l;
-
-	g_return_if_fail (alarm_inited);
-
-	if (!clear_itimer ())
-		g_message ("alarm_done(): Could not clear the timer!  "
-			   "Weird things may happen.");
-
-	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;
-
-	if (close (alarm_pipes[0]) != 0)
-		g_message ("alarm_done(): Could not close the input pipe for notification");
-
-	alarm_pipes[0] = -1;
-
-	if (close (alarm_pipes[1]) != 0)
-		g_message ("alarm_done(): Could not close the output pipe for notification");
-
-	alarm_pipes[1] = -1;
-
-	alarm_inited = FALSE;
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index fc81908ef2..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-#include <glib.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);
-
-void alarm_init (void);
-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/client-main.c b/calendar/gui/alarm-notify/client-main.c
deleted file mode 100644
index db777926a3..0000000000
--- a/calendar/gui/alarm-notify/client-main.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Evolution calendar - Command-line client for the alarm notification service
- *
- * 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 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 <liboaf/liboaf.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include "evolution-calendar.h"
-
-
-
-/* Requests that a calendar be added to the alarm notification service */
-static void
-add_calendar (GNOME_Evolution_Calendar_AlarmNotify an, const char *uri)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_AlarmNotify_addCalendar (an, uri, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION) {
-		char *ex_id;
-
-		ex_id = CORBA_exception_id (&ev);
-		if (strcmp (ex_id, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI) == 0) {
-			g_message ("add_calendar(): Invalid URI reported from the "
-				   "alarm notification service");
-			goto out;
-		} else if (strcmp (ex_id,
-				   ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError)
-			   == 0) {
-			g_message ("add_calendar(): The alarm notification service could "
-				   "not contact the backend");
-			goto out;
-		}
-	}
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("add_calendar(): Could not issue the addCalendar request");
-
- out:
-	CORBA_exception_free (&ev);
-}
-
-/* Loads the calendars that the user has configured to be loaded */
-static void
-load_calendars (void)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_AlarmNotify an;
-	char *base_uri;
-	char *uri;
-
-	CORBA_exception_init (&ev);
-	an = oaf_activate_from_id ("OAFID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("load_calendars(): Could not activate the alarm notification service");
-		CORBA_exception_free (&ev);
-		exit (EXIT_FAILURE);
-	}
-	CORBA_exception_free (&ev);
-
-	/* FIXME: this should be obtained from the configuration in the Wombat */
-
-	base_uri = g_concat_dir_and_file (g_get_home_dir (), "evolution");
-
-	uri = g_concat_dir_and_file (base_uri, "local/Calendar/calendar.ics");
-	add_calendar (an, uri);
-	g_free (uri);
-
-	uri = g_concat_dir_and_file (base_uri, "local/Tasks/tasks.ics");
-	add_calendar (an, uri);
-	g_free (uri);
-
-	g_free (base_uri);
-
-	CORBA_exception_init (&ev);
-	Bonobo_Unknown_unref (an, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_calendars(): Could not unref the alarm notification service");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (an, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_calendars(): Could not release the alarm notification service");
-
-	CORBA_exception_free (&ev);
-}
-
-/* FIXME: handle the --die option */
-
-int
-main (int argc, char **argv)
-{
-	GnomeClient *client;
-	int flags;
-	gboolean launch_service;
-
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	if (gnome_init_with_popt_table ("evolution-alarm-client", VERSION,
-					argc, argv, oaf_popt_options, 0, NULL) != 0) {
-		g_message ("main(): Could not initialize GNOME");
-		exit (EXIT_FAILURE);
-	}
-
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): Could not initialize Bonobo");
-		exit (EXIT_FAILURE);
-	}
-
-	/* Ask the session manager to restart us */
-
-	client = gnome_master_client ();
-	flags = gnome_client_get_flags (client);
-
-	if (flags & GNOME_CLIENT_IS_CONNECTED) {
-		char *client_id;
-
-		client_id = gnome_client_get_id (client);
-		g_assert (client_id != NULL);
-
-		launch_service = gnome_startup_acquire_token ("EVOLUTION_ALARM_NOTIFY",
-							      client_id);
-
-		if (launch_service) {
-			char *args[3];
-
-			args[0] = argv[0];
-			args[2] = NULL;
-
-			gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY);
-			gnome_client_set_restart_command (client, 2, args);
-
-			args[0] = argv[0];
-			args[1] = "--die";
-			args[2] = NULL;
-
-			gnome_client_set_shutdown_command (client, 2, args);
-		} else
-			gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
-
-		gnome_client_flush (client);
-	} else
-		launch_service = TRUE;
-
-	if (!launch_service)
-		return EXIT_SUCCESS;
-
-	load_calendars ();
-
-	return EXIT_SUCCESS;
-}
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
deleted file mode 100644
index 6ea5a902f5..0000000000
--- a/calendar/gui/alarm-notify/notify-main.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 2000 Helix Code, 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 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 <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include "alarm-notify.h"
-
-
-
-static BonoboGenericFactory *factory;
-
-static AlarmNotify *alarm_notify_service;
-
-
-/* Factory function for the alarm notify service; just creates and references a
- * singleton service object.
- */
-static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, void *data)
-{
-	if (!alarm_notify_service) {
-		alarm_notify_service = alarm_notify_new ();
-		if (!alarm_notify_service)
-			return NULL;
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (alarm_notify_service));
-	return BONOBO_OBJECT (alarm_notify_service);
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	if (gnome_init_with_popt_table ("evolution-alarm-notify", VERSION, argc, argv,
-					oaf_popt_options, 0, NULL) != 0)
-		g_error (_("Could not initialize GNOME"));
-
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	factory = bonobo_generic_factory_new ("OAFID:GNOME_Evolution_Calendar_AlarmNotify_Factory",
-					      alarm_notify_factory_fn, NULL);
-	if (!factory)
-		g_error (_("Could not create the alarm notify service factory"));
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (factory));
-	factory = NULL;
-
-	return 0;
-}
diff --git a/calendar/gui/bell.xpm b/calendar/gui/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/calendar/gui/bell.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * bell_xpm[] = {
-"16 16 64 1",
-" 	c None",
-".	c #000000",
-"+	c #E3BB43",
-"@	c #E6C049",
-"#	c #EED275",
-"$	c #F4E193",
-"%	c #F4DF8C",
-"&	c #EAC95C",
-"*	c #EFD57A",
-"=	c #FAEFBB",
-"-	c #FDF6D3",
-";	c #FDF5C6",
-">	c #F4E18F",
-",	c #E4BD43",
-"'	c #F6E295",
-")	c #FEF9D8",
-"!	c #FFFFFF",
-"~	c #FFFADA",
-"{	c #FCEEAA",
-"]	c #EBCA5A",
-"^	c #E9C550",
-"/	c #FAEA9C",
-"(	c #FEF7CB",
-"_	c #FFF8CC",
-":	c #FDF1A8",
-"<	c #EED060",
-"[	c #D39D12",
-"}	c #F2D55D",
-"|	c #FCEC91",
-"1	c #FFF4AE",
-"2	c #FFF5B6",
-"3	c #FEEF97",
-"4	c #F3D65E",
-"5	c #D5A216",
-"6	c #FAE05C",
-"7	c #FFED7C",
-"8	c #FFEF8C",
-"9	c #FFF092",
-"0	c #FDEB7A",
-"a	c #F4D750",
-"b	c #D8A717",
-"c	c #EAC01D",
-"d	c #F6D83E",
-"e	c #FAE255",
-"f	c #FAE362",
-"g	c #F9E161",
-"h	c #F6DE5B",
-"i	c #F1D145",
-"j	c #E6BE28",
-"k	c #D09B09",
-"l	c #B67E00",
-"m	c #CE9100",
-"n	c #D69F04",
-"o	c #E0B011",
-"p	c #E6BA1D",
-"q	c #E3B721",
-"r	c #E0B21E",
-"s	c #DCAB16",
-"t	c #D7A20D",
-"u	c #CC9303",
-"v	c #BE8400",
-"w	c #AC7500",
-"x	c #A06B00",
-"y	c #FFDD00",
-"                ",
-"       ..       ",
-"      .+@.      ",
-"     .#$%&.     ",
-"    .*=-;>,.    ",
-"    .')!~{].    ",
-"   .^/(~_:<[.   ",
-"   .}|121345.   ",
-"   .678980ab.   ",
-"  .cdefghijkl.  ",
-" .mnopqrstuvwx. ",
-" .............. ",
-"      .8y.      ",
-"       ..       ",
-"                ",
-"                "};
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index 29557e2d68..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,462 +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 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "gnome-cal.h"
-#include "goto.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-
-
-/* A list of all of the calendars started */
-static GList *all_calendars = NULL;
-
-/* We have one global preferences dialog. */
-static CalPrefsDialog *preferences_dialog = NULL;
-
-/* Callback for the new appointment command */
-static void
-new_appointment_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	gnome_calendar_new_appointment (gcal);
-}
-
-/* Prints the calendar at its current view and time range */
-static void
-print (GnomeCalendar *gcal, gboolean preview)
-{
-	time_t start;
-	const char *view;
-	PrintView print_view;
-
-	gnome_calendar_get_current_time_range (gcal, &start, NULL);
-	view = gnome_calendar_get_current_view_name (gcal);
-
-	if (strcmp (view, "dayview") == 0)
-		print_view = PRINT_VIEW_DAY;
-	else if (strcmp (view, "workweekview") == 0 || strcmp (view, "weekview") == 0)
-		print_view = PRINT_VIEW_WEEK;
-	else if (strcmp (view, "monthview") == 0)
-		print_view = PRINT_VIEW_MONTH;
-	else {
-		g_assert_not_reached ();
-		print_view = PRINT_VIEW_DAY;
-	}
-
-	print_calendar (gcal, preview, start, print_view);
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, FALSE);
-}
-
-
-/* This iterates over each calendar telling them to update their config
-   settings. */
-void
-update_all_config_settings (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_update_config_settings (GNOME_CALENDAR (l->data), FALSE);
-}
-
-
-/* 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);
-}
-
-static void
-today_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (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, "dayview", FALSE, TRUE);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, "workweekview", FALSE, TRUE);
-}
-
-static void
-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, "weekview", FALSE, TRUE);
-}
-
-static void
-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	gnome_calendar_set_view (gcal, "monthview", FALSE, TRUE);
-}
-
-
-static void
-new_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	new_calendar ();
-}
-
-static void
-open_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GtkWidget *error_dialog;
-	int ret;
-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {
-		error_dialog = gnome_message_box_new (
-			_("File not found"),
-			GNOME_MESSAGE_BOX_ERROR,
-			GNOME_STOCK_BUTTON_OK,
-			NULL);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog), GTK_WINDOW (fs));
-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));
-	} else {
-		/* FIXME: find out who owns this calendar and use that name */
-#ifndef NO_WARNINGS
-#warning "FIXME: find out who owns this calendar and use that name"
-#endif
-		/*
-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs));
-		*/
-		gtk_widget_destroy (GTK_WIDGET (fs));
-	}
-}
-
-static void
-open_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open calendar")));
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) open_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) gtk_widget_destroy,
-				   GTK_OBJECT (fs));
-
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me */
-}
-
-static void
-save_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GnomeCalendar *gcal;
-	gchar *fname;
-
-	gcal = GNOME_CALENDAR (gtk_object_get_user_data (GTK_OBJECT (fs)));
-	gtk_window_set_wmclass (GTK_WINDOW (gcal), "gnomecal", "gnomecal");
-
-	fname = g_strdup (gtk_file_selection_get_filename (fs));
-	g_free(fname);
-	gtk_main_quit ();
-}
-
-static gint
-close_save (GtkWidget *w)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-save_as_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-	GtkFileSelection *fs;
-
-	gcal = GNOME_CALENDAR (data);
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar")));
-	gtk_object_set_user_data (GTK_OBJECT (fs), gcal);
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) save_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) close_save,
-				   GTK_OBJECT (fs));
-	gtk_signal_connect_object (GTK_OBJECT (fs), "delete_event",
-				   GTK_SIGNAL_FUNC (close_save),
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me even more */
-	gtk_main ();
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-properties_cmd (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	if (!preferences_dialog)
-		preferences_dialog = cal_prefs_dialog_new ();
-	else
-		cal_prefs_dialog_show (preferences_dialog);
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("CalendarNew", new_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarOpen", open_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarSaveAs", save_as_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("EditNewAppointment", new_appointment_cb),
-	BONOBO_UI_VERB ("CalendarPreferences", properties_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_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *uic,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	if (pixbuf == NULL) {
-		g_warning ("Cannot load image -- %s", path);
-		g_free (path);
-		return;
-	}
-
-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-	set_pixmap (uic, "/Toolbar/New",	  "buttons/new_appointment.png");
-
-	set_pixmap (uic, "/Toolbar/DayView",	  "buttons/dayview.xpm");
-	set_pixmap (uic, "/Toolbar/WorkWeekView", "buttons/workweekview.xpm");
-	set_pixmap (uic, "/Toolbar/WeekView",	  "buttons/weekview.xpm");
-	set_pixmap (uic, "/Toolbar/MonthView",	  "buttons/monthview.xpm");
-}
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *cal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-#if 0
-	/* FIXME: Need to update this to use new Bonobo ui stuff somehow.
-	   Also need radio buttons really. */
-
-	/* Note that these indices should correspond with the button indices
-	   in the gnome_toolbar_view_buttons UIINFO struct. */
-	gnome_calendar_set_view_buttons (cal,
-					 gnome_toolbar_view_buttons[0].widget,
-					 gnome_toolbar_view_buttons[1].widget,
-					 gnome_toolbar_view_buttons[2].widget,
-					 gnome_toolbar_view_buttons[3].widget);
-
-	/* This makes the appropriate radio button in the toolbar active. */
-	gnome_calendar_update_view_buttons (cal);
-#endif
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, cal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-calendar.xml",
-			       "evolution-calendar");
-
-	update_pixmaps (uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-void
-calendar_control_deactivate (BonoboControl *control)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-GnomeCalendar *
-new_calendar (void)
-{
-	GtkWidget *gcal;
-
-	gcal = gnome_calendar_new ();
-	if (!gcal) {
-		gnome_warning_dialog (_("Could not create the calendar view.  Please check your "
-					"ORBit and OAF setup."));
-		return NULL;
-	}
-
-	all_calendars = g_list_prepend (all_calendars, gcal);
-
-	return GNOME_CALENDAR (gcal);
-}
-
-
-void
-calendar_set_uri (GnomeCalendar *gcal, char *calendar_file)
-{
-	g_return_if_fail (gcal);
-	g_return_if_fail (calendar_file);
-
-	gnome_calendar_open (gcal, calendar_file);
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index 364051e3a3..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Helix Code, 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 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_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include <bonobo/bonobo-control.h>
-#include "gnome-cal.h"
-
-/* This tells all the calendars to reload the config settings. */
-void update_all_config_settings (void);
-
-GnomeCalendar *new_calendar (void);
-
-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file);
-
-void calendar_control_activate (BonoboControl *control,
-				GnomeCalendar *cal);
-void calendar_control_deactivate (BonoboControl *control);
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index 5226c2480d..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "calendar-summary.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ "tasks", "evolution-tasks.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		control = control_factory_new_control ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else if (!g_strcasecmp (type, "tasks")) {
-		control = tasks_control_new ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else {
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-	}
-
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-	/* FIXME: I don't think we have to do anything to create a calendar
-	   or tasks folder - the '.ics' files are created automatically when
-	   needed. But I'm not sure - Damon. */
-	if (!strcmp(type, "calendar") || !strcmp(type, "tasks")) {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_OK, &ev);
-	} else {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &ev);
-	}
-	CORBA_exception_free(&ev);
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	static gboolean migrated = FALSE;
-
-	owner_count ++;
-	evolution_dir = g_strdup (evolution_homedir);
-
-	calendar_config_init ();
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 create_view,
-							 create_folder,
-							 NULL, /* remove_folder_fn */
-							 NULL, /* copy_folder_fn */
-							 NULL, /* populate_folder_context_menu_fn */
-							 NULL  /* closure */);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	summary_factory = calendar_summary_factory_init ();
-
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-}
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index d2d570e340..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
deleted file mode 100644
index 08579182fe..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.c - functions to load/save/get/set user settings.
- */
-
-#include <config.h>
-#include "component-factory.h"
-#include "calendar-config.h"
-
-
-typedef struct
-{
-	CalWeekdays	working_days;
-	gboolean	use_24_hour_format;
-	gint		week_start_day;
-	gint		day_start_hour;
-	gint		day_start_minute;
-	gint		day_end_hour;
-	gint		day_end_minute;
-	gint		time_divisions;
-	gboolean	dnav_show_week_no;
-	gint		view;
-	gfloat		hpane_pos;
-	gfloat		vpane_pos;
-	gfloat		month_hpane_pos;
-	gfloat		month_vpane_pos;
-	gboolean	compress_weekend;
-	gboolean	show_event_end;
-} CalendarConfig;
-
-
-static CalendarConfig *config = NULL;
-
-static void config_read			(void);
-
-
-void
-calendar_config_init			(void)
-{
-	if (config)
-		return;
-	
-	config = g_new0 (CalendarConfig, 1);
-
-	config_read ();
-}
-
-
-static void
-config_read				(void)
-{
-	gchar *prefix;
-	gboolean is_default;
-
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->working_days = gnome_config_get_int_with_default ("WorkingDays", &is_default);
-	if (is_default) {
-		config->working_days = CAL_MONDAY | CAL_TUESDAY
-			| CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY;
-	}
-	config->use_24_hour_format = gnome_config_get_bool ("Use24HourFormat=0");
-	config->week_start_day = gnome_config_get_int ("WeekStartDay=1");
-	config->day_start_hour = gnome_config_get_int ("DayStartHour=9");
-	config->day_start_minute = gnome_config_get_int ("DayStartMinute=0");
-	config->day_end_hour = gnome_config_get_int ("DayEndHour=17");
-	config->day_end_minute = gnome_config_get_int ("DayEndMinute=0");
-	config->time_divisions = gnome_config_get_int ("TimeDivisions=30");
-	config->view = gnome_config_get_int ("View=0");
-	config->hpane_pos = gnome_config_get_float ("HPanePosition=1");
-	config->vpane_pos = gnome_config_get_float ("VPanePosition=1");
-	config->month_hpane_pos = gnome_config_get_float ("MonthHPanePosition=0");
-	config->month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=1");
-	config->compress_weekend = gnome_config_get_bool ("CompressWeekend=1");
-	config->show_event_end = gnome_config_get_bool ("ShowEventEndTime=1");
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->dnav_show_week_no = gnome_config_get_bool ("ShowWeekNumbers=0");
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write			(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("WorkingDays", config->working_days);
-	gnome_config_set_bool ("Use24HourFormat", config->use_24_hour_format);
-	gnome_config_set_int ("WeekStartDay", config->week_start_day);
-	gnome_config_set_int ("DayStartHour", config->day_start_hour);
-	gnome_config_set_int ("DayStartMinute", config->day_start_minute);
-	gnome_config_set_int ("DayEndHour", config->day_end_hour);
-	gnome_config_set_int ("DayEndMinute", config->day_end_minute);
-	gnome_config_set_bool ("CompressWeekend", config->compress_weekend);
-	gnome_config_set_bool ("ShowEventEndTime", config->show_event_end);
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_bool ("ShowWeekNumbers", config->dnav_show_week_no);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write_on_exit		(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("View", config->view);
-	gnome_config_set_int ("TimeDivisions", config->time_divisions);
-	gnome_config_set_float ("HPanePosition", config->hpane_pos);
-	gnome_config_set_float ("VPanePosition", config->vpane_pos);
-	gnome_config_set_float ("MonthHPanePosition", config->month_hpane_pos);
-	gnome_config_set_float ("MonthVPanePosition", config->month_vpane_pos);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-/*
- * Calendar Settings.
- */
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean
-calendar_config_get_24_hour_format	(void)
-{
-	return config->use_24_hour_format;
-}
-
-
-void
-calendar_config_set_24_hour_format	(gboolean     use_24_hour)
-{
-	config->use_24_hour_format = use_24_hour;
-}
-
-
-/* The start day of the week (0 = Sun to 6 = Mon). */
-gint
-calendar_config_get_week_start_day	(void)
-{
-	return config->week_start_day;
-}
-
-
-void
-calendar_config_set_week_start_day	(gint	      week_start_day)
-{
-	config->week_start_day = week_start_day;
-}
-
-
-/* The start and end times of the work-day. */
-gint
-calendar_config_get_day_start_hour	(void)
-{
-	return config->day_start_hour;
-}
-
-
-void
-calendar_config_set_day_start_hour	(gint	      day_start_hour)
-{
-	config->day_start_hour = day_start_hour;
-}
-
-
-gint
-calendar_config_get_day_start_minute	(void)
-{
-	return config->day_start_minute;
-}
-
-
-void
-calendar_config_set_day_start_minute	(gint	      day_start_min)
-{
-	config->day_start_minute = day_start_min;
-}
-
-
-gint
-calendar_config_get_day_end_hour	(void)
-{
-	return config->day_end_hour;
-}
-
-
-void
-calendar_config_set_day_end_hour	(gint	      day_end_hour)
-{
-	config->day_end_hour = day_end_hour;
-}
-
-
-gint
-calendar_config_get_day_end_minute	(void)
-{
-	return config->day_end_minute;
-}
-
-
-void
-calendar_config_set_day_end_minute	(gint	      day_end_min)
-{
-	config->day_end_minute = day_end_min;
-}
-
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint
-calendar_config_get_time_divisions	(void)
-{
-	return config->time_divisions;
-}
-
-
-void
-calendar_config_set_time_divisions	(gint	      divisions)
-{
-	config->time_divisions = divisions;
-}
-
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean
-calendar_config_get_dnav_show_week_no	(void)
-{
-	return config->dnav_show_week_no;
-}
-
-
-void
-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
-{
-	config->dnav_show_week_no = show_week_no;
-}
-
-
-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */
-gint
-calendar_config_get_default_view	(void)
-{
-	return config->view;
-}
-
-
-void
-calendar_config_set_default_view	(gint	      view)
-{
-	config->view = view;
-}
-
-
-/* The positions of the panes in the normal and month views. */
-gfloat
-calendar_config_get_hpane_pos		(void)
-{
-	return config->hpane_pos;
-}
-
-
-void
-calendar_config_set_hpane_pos		(gfloat	      hpane_pos)
-{
-	config->hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_vpane_pos		(void)
-{
-	return config->vpane_pos;
-}
-
-
-void
-calendar_config_set_vpane_pos		(gfloat	      vpane_pos)
-{
-	config->vpane_pos = vpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_hpane_pos	(void)
-{
-	return config->month_hpane_pos;
-}
-
-
-void
-calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos)
-{
-	config->month_hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_vpane_pos	(void)
-{
-	return config->month_vpane_pos;
-}
-
-
-void
-calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos)
-{
-	config->month_vpane_pos = vpane_pos;
-}
-
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean
-calendar_config_get_compress_weekend	(void)
-{
-	return config->compress_weekend;
-}
-
-
-void
-calendar_config_set_compress_weekend	(gboolean     compress)
-{
-	config->compress_weekend = compress;
-}
-
-
-/* Whether we show event end times. */
-gboolean
-calendar_config_get_show_event_end	(void)
-{
-	return config->show_event_end;
-}
-
-
-void
-calendar_config_set_show_event_end	(gboolean     show_end)
-{
-	config->show_event_end = show_end;
-}
-
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays
-calendar_config_get_working_days	(void)
-{
-	return config->working_days;
-}
-
-
-void
-calendar_config_set_working_days	(CalWeekdays  days)
-{
-	config->working_days = days;
-}
-
-
-/* This sets all the common config settings for an ECalendar widget.
-   These are the week start day, and whether we show week numbers. */
-void
-calendar_config_configure_e_calendar	(ECalendar	*cal)
-{
-	gboolean dnav_show_week_no;
-	gint week_start_day;
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "show_week_numbers", dnav_show_week_no,
-			       "week_start_day", week_start_day,
-			       NULL);
-}
-
-
-/* This sets all the common config settings for an EDateEdit widget.
-   These are the week start day, whether we show week numbers, whether we
-   use 24 hour format, and the hours of the working day to use in the time
-   popup. */
-void
-calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
-{
-	gboolean dnav_show_week_no, use_24_hour;
-	gint week_start_day, start_hour, end_hour;
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */
-	week_start_day = (week_start_day + 6) % 7;
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-
-	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 = end_hour + 1 % 24;
-
-	e_date_edit_set_week_start_day (dedit, week_start_day);
-	e_date_edit_set_show_week_numbers (dedit, dnav_show_week_no);
-	e_date_edit_set_use_24_hour_format (dedit, use_24_hour);
-	e_date_edit_set_time_popup_range (dedit, start_hour, end_hour);
-}
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index 8b11570f12..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.h - functions to load/save/get/set user settings.
- */
-
-#ifndef _CALENDAR_CONFIG_H_
-#define _CALENDAR_CONFIG_H_
-
-#include <widgets/misc/e-calendar.h>
-#include <widgets/misc/e-dateedit.h>
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	CAL_SUNDAY	= 1 << 0,
-	CAL_MONDAY	= 1 << 1,
-	CAL_TUESDAY	= 1 << 2,
-	CAL_WEDNESDAY	= 1 << 3,
-	CAL_THURSDAY	= 1 << 4,
-	CAL_FRIDAY	= 1 << 5,
-	CAL_SATURDAY	= 1 << 6
-} CalWeekdays;
-
-
-
-void	  calendar_config_init			(void);
-void	  calendar_config_write			(void);
-void	  calendar_config_write_on_exit		(void);
-
-
-/*
- * Calendar Settings.
- */
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays calendar_config_get_working_days	(void);
-void	  calendar_config_set_working_days	(CalWeekdays  days);
-
-/* The start day of the week (0 = Sun to 6 = Sat). */
-gint	  calendar_config_get_week_start_day	(void);
-void	  calendar_config_set_week_start_day	(gint	      week_start_day);
-
-/* The start and end times of the work-day. */
-gint	  calendar_config_get_day_start_hour	(void);
-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);
-
-gint	  calendar_config_get_day_start_minute	(void);
-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-
-gint	  calendar_config_get_day_end_hour	(void);
-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-
-gint	  calendar_config_get_day_end_minute	(void);
-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean  calendar_config_get_24_hour_format	(void);
-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint	  calendar_config_get_time_divisions	(void);
-void	  calendar_config_set_time_divisions	(gint	      divisions);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean  calendar_config_get_compress_weekend	(void);
-void	  calendar_config_set_compress_weekend	(gboolean     compress);
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean  calendar_config_get_dnav_show_week_no	(void);
-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
-
-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */
-gint	  calendar_config_get_default_view	(void);
-void	  calendar_config_set_default_view	(gint	      view);
-
-/* The positions of the panes in the normal and month views. */
-gfloat    calendar_config_get_hpane_pos		(void);
-void	  calendar_config_set_hpane_pos		(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gfloat	      vpane_pos);
-
-gfloat    calendar_config_get_month_hpane_pos	(void);
-void	  calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos);
-
-
-/* Convenience functions to configure common properties of ECalendar and
-   EDateEdit widgets. */
-void	  calendar_config_configure_e_calendar	(ECalendar   *cal);
-void	  calendar_config_configure_e_date_edit	(EDateEdit   *dedit);
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
deleted file mode 100644
index 3e8f3359ab..0000000000
--- a/calendar/gui/calendar-model.c
+++ /dev/null
@@ -1,2204 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#include <config.h>
-
-#include <math.h>
-#include <sys/types.h>
-
-/* We need this for strptime. */
-#define _XOPEN_SOURCE 500
-#define __USE_XOPEN
-#include <time.h>
-#include <sys/time.h>
-#undef _XOPEN_SOURCE
-#undef __USE_XOPEN
-
-#include <ctype.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "calendar-model.h"
-#include "calendar-commands.h"
-
-
-
-
-/* Private part of the ECalendarModel structure */
-struct _CalendarModelPrivate {
-	/* Calendar client we are using */
-	CalClient *client;
-
-	/* Types of objects we are dealing with */
-	CalObjType type;
-
-	/* Array of pointers to calendar objects */
-	GArray *objects;
-
-	/* UID -> array index hash */
-	GHashTable *uid_index_hash;
-
-	/* Type of components to create when using click-to-add in the table */
-	CalComponentVType new_comp_vtype;
-
-	/* Whether we display dates in 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* HACK: so that ETable can do its stupid append_row() thing */
-	guint appending_row : 1;
-
-	/* The default category to use when creating new tasks, e.g. when the
-	   filter is set to a certain category we use that category when
-	   creating a new task. */
-	gchar *default_category;
-
-	/* A balanced tree of the categories used by all the tasks/events. */
-	GTree *categories;
-};
-
-enum {
-	CATEGORIES_CHANGED,
-	LAST_SIGNAL
-};
-
-static gint calendar_model_signals [LAST_SIGNAL] = { 0 };
-
-
-
-static void calendar_model_class_init (CalendarModelClass *class);
-static void calendar_model_init (CalendarModel *model);
-static void calendar_model_destroy (GtkObject *object);
-
-static int calendar_model_column_count (ETableModel *etm);
-static int calendar_model_row_count (ETableModel *etm);
-static void *calendar_model_value_at (ETableModel *etm, int col, int row);
-static void calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean calendar_model_is_cell_editable (ETableModel *etm, int col, int row);
-static void calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row);
-static void *calendar_model_duplicate_value (ETableModel *etm, int col, const void *value);
-static void calendar_model_free_value (ETableModel *etm, int col, void *value);
-static void *calendar_model_initialize_value (ETableModel *etm, int col);
-static gboolean calendar_model_value_is_empty (ETableModel *etm, int col, const void *value);
-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);
-static void load_objects (CalendarModel *model);
-static int remove_object (CalendarModel *model, const char *uid);
-static void ensure_task_complete (CalComponent *comp,
-				  time_t completed_date);
-static void ensure_task_not_complete (CalComponent *comp);
-static void calendar_model_collect_all_categories (CalendarModel *model);
-static gboolean calendar_model_collect_categories	(CalendarModel	*model,
-							 CalComponent	*comp);
-
-static ETableModelClass *parent_class;
-
-
-
-/**
- * calendar_model_get_type:
- * @void:
- *
- * Registers the #CalendarModel class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalendarModel class.
- **/
-GtkType
-calendar_model_get_type (void)
-{
-	static GtkType calendar_model_type = 0;
-
-	if (!calendar_model_type) {
-		static GtkTypeInfo calendar_model_info = {
-			"CalendarModel",
-			sizeof (CalendarModel),
-			sizeof (CalendarModelClass),
-			(GtkClassInitFunc) calendar_model_class_init,
-			(GtkObjectInitFunc) calendar_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		calendar_model_type = gtk_type_unique (E_TABLE_MODEL_TYPE, &calendar_model_info);
-	}
-
-	return calendar_model_type;
-}
-
-/* Class initialization function for the calendar table model */
-static void
-calendar_model_class_init (CalendarModelClass *class)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *etm_class;
-
-	object_class = (GtkObjectClass *) class;
-	etm_class = (ETableModelClass *) class;
-
-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);
-
-	calendar_model_signals [CATEGORIES_CHANGED] =
-		gtk_signal_new ("categories-changed",
-				GTK_RUN_LAST, object_class->type,
-				GTK_SIGNAL_OFFSET (CalendarModelClass,
-						   categories_changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-	
-	gtk_object_class_add_signals (object_class, calendar_model_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = calendar_model_destroy;
-
-	etm_class->column_count = calendar_model_column_count;
-	etm_class->row_count = calendar_model_row_count;
-	etm_class->value_at = calendar_model_value_at;
-	etm_class->set_value_at = calendar_model_set_value_at;
-	etm_class->is_cell_editable = calendar_model_is_cell_editable;
-	etm_class->append_row = calendar_model_append_row;
-	etm_class->duplicate_value = calendar_model_duplicate_value;
-	etm_class->free_value = calendar_model_free_value;
-	etm_class->initialize_value = calendar_model_initialize_value;
-	etm_class->value_is_empty = calendar_model_value_is_empty;
-	etm_class->value_to_string = calendar_model_value_to_string;
-
-	class->categories_changed = NULL;
-}
-
-/* Object initialization function for the calendar table model */
-static void
-calendar_model_init (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	priv = g_new0 (CalendarModelPrivate, 1);
-	model->priv = priv;
-
-	priv->objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));
-	priv->uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->new_comp_vtype = CAL_COMPONENT_EVENT;
-	priv->use_24_hour_format = TRUE;
-
-	priv->categories = g_tree_new ((GCompareFunc)strcmp);
-}
-
-/* Called from g_hash_table_foreach_remove(), frees a stored UID->index
- * mapping.
- */
-static gboolean
-free_uid_index (gpointer key, gpointer value, gpointer data)
-{
-	int *idx;
-
-	idx = value;
-	g_free (idx);
-
-	return TRUE;
-}
-
-/* Frees the objects stored in the calendar model */
-static void
-free_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	int i;
-
-	priv = model->priv;
-
-	g_hash_table_foreach_remove (priv->uid_index_hash, free_uid_index, NULL);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		CalComponent *comp;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	g_array_set_size (priv->objects, 0);
-}
-
-/* Destroy handler for the calendar table model */
-static void
-calendar_model_destroy (GtkObject *object)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (object));
-
-	model = CALENDAR_MODEL (object);
-	priv = model->priv;
-
-	/* Free the calendar client interface object */
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	/* Free the uid->index hash data and the array of UIDs */
-
-	free_objects (model);
-
-	g_hash_table_destroy (priv->uid_index_hash);
-	priv->uid_index_hash = NULL;
-
-	g_array_free (priv->objects, TRUE);
-	priv->objects = NULL;
-
-	g_free (priv->default_category);
-
-	/* We only need to free the first argument, the key, so g_free will do.
-	 */
-	g_tree_traverse (priv->categories, (GTraverseFunc) g_free,
-			 G_PRE_ORDER, NULL);
-	g_tree_destroy (priv->categories);
-
-	/* Free the private structure */
-
-	g_free (priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* ETableModel methods */
-
-/* column_count handler for the calendar table model */
-static int
-calendar_model_column_count (ETableModel *etm)
-{
-	return CAL_COMPONENT_FIELD_NUM_FIELDS;
-}
-
-/* row_count handler for the calendar table model */
-static int
-calendar_model_row_count (ETableModel *etm)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	return priv->objects->len;
-}
-
-/* Creates a nice string representation of a time value */
-static char*
-get_time_t (CalendarModel *model, time_t *t, gboolean skip_midnight)
-{
-	static char buffer[64];
-	struct tm *tmp_tm;
-	char *format;
-
-	if (*t <= 0) {
-		buffer[0] = '\0';
-	} else {
-		tmp_tm = localtime (t);
-
-		if (skip_midnight && tmp_tm->tm_hour == 0
-		    && tmp_tm->tm_min == 0 && tmp_tm->tm_sec == 0)
-			/* strftime format of a weekday and a date. */
-			format = _("%a %m/%d/%Y");
-		else if (model->priv->use_24_hour_format)
-			/* strftime format of a weekday, a date and a time,
-			   in 24-hour format. */
-			format = _("%a %m/%d/%Y %H:%M:%S");
-		else
-			/* strftime format of a weekday, a date and a time,
-			   in 12-hour format. */
-			format = _("%a %m/%d/%Y %I:%M:%S %p");
-			
-		strftime (buffer, sizeof (buffer), format, tmp_tm);
-	}
-
-	return buffer;
-}
-
-/* Builds a string based on the list of CATEGORIES properties of a calendar
- * component.
- */
-static char *
-get_categories (CalComponent *comp)
-{
-	const char *categories;
-
-	cal_component_get_categories (comp, &categories);
-
-	return categories ? (char*) categories : "";
-}
-
-/* Returns a string based on the CLASSIFICATION property of a calendar component */
-static char *
-get_classification (CalComponent *comp)
-{
-	CalComponentClassification classif;
-
-	cal_component_get_classification (comp, &classif);
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_NONE:
-		return "";
-
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		return _("Public");
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		return _("Private");
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-
-	case CAL_COMPONENT_CLASS_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return "";
-	}
-}
-
-/* Builds a string for the COMPLETED property of a calendar component */
-static char *
-get_completed	(CalendarModel *model,
-		 CalComponent  *comp)
-{
-	struct icaltimetype *completed;
-	time_t t;
-
-	cal_component_get_completed (comp, &completed);
-
-	if (!completed)
-		t = 0;
-	else {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	}
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for and frees a date/time value */
-static char *
-get_and_free_datetime (CalendarModel *model, CalComponentDateTime dt)
-{
-	time_t t;
-
-	if (!dt.value)
-		t = 0;
-	else
-		t = icaltime_as_timet (*dt.value);
-
-	cal_component_free_datetime (&dt);
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for the DTEND property of a calendar component */
-static char *
-get_dtend (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtend (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DTSTART property of a calendar component */
-static char *
-get_dtstart (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtstart (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DUE property of a calendar component */
-static char *
-get_due (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_due (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the GEO property of a calendar component */
-static char*
-get_geo (CalComponent *comp)
-{
-	struct icalgeotype *geo;
-	static gchar buf[32];
-
-	cal_component_get_geo (comp, &geo);
-
-	if (!geo)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",
-			    fabs (geo->lat),
-			    geo->lat >= 0.0 ? _("N") : _("S"),
-			    fabs (geo->lon),
-			    geo->lon >= 0.0 ? _("E") : _("W"));
-		cal_component_free_geo (geo);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PERCENT property of a calendar component */
-static char *
-get_percent (CalComponent *comp)
-{
-	int *percent;
-	static char buf[32];
-
-	cal_component_get_percent (comp, &percent);
-
-	if (!percent)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d%%", *percent);
-		cal_component_free_percent (percent);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PRIORITY property of a calendar component */
-static char *
-get_priority (CalComponent *comp)
-{
-	int *priority;
-	static char buf[32];
-
-	cal_component_get_priority (comp, &priority);
-
-	if (!priority)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d", *priority);
-		cal_component_free_priority (priority);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the SUMMARY property of a calendar component */
-static char *
-get_summary (CalComponent *comp)
-{
-	CalComponentText summary;
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		return (char *) summary.value;
-	else
-		return "";
-}
-
-/* Builds a string for the TRANSPARENCY property of a calendar component */
-static char *
-get_transparency (CalComponent *comp)
-{
-	CalComponentTransparency transp;
-
-	cal_component_get_transparency (comp, &transp);
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_NONE:
-		return "";
-
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		return _("Transparent");
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		return _("Opaque");
-
-	case CAL_COMPONENT_TRANSP_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the URL property of a calendar component */
-static char *
-get_url (CalComponent *comp)
-{
-	const char *url;
-
-	cal_component_get_url (comp, &url);
-
-	if (url)
-		return (char *) url;
-	else
-		return "";
-}
-
-/* Returns whether the completion date has been set on a component */
-static gboolean
-get_is_complete (CalComponent *comp)
-{
-	struct icaltimetype *t;
-	gboolean retval;
-
-	cal_component_get_completed (comp, &t);
-	retval = (t != NULL);
-
-	if (retval)
-		cal_component_free_icaltimetype (t);
-
-	return retval;
-}
-
-/* Returns whether a calendar component is overdue.
- *
- * FIXME: This will only get called when the component is scrolled into the
- * ETable.  There should be some sort of dynamic update thingy for if a component
- * becomes overdue while it is being viewed.
- */
-static gboolean
-get_is_overdue (CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	gboolean retval;
-
-	cal_component_get_due (comp, &dt);
-
-	/* First, do we have a due date? */
-
-	if (!dt.value)
-		retval = FALSE;
-	else {
-		time_t t;
-
-		/* Second, is it already completed? */
-
-		if (get_is_complete (comp)) {
-			retval = FALSE;
-			goto out;
-		}
-
-		/* Third, are we overdue as of right now? */
-
-		t = icaltime_as_timet (*dt.value);
-
-		if (t < time (NULL))
-			retval = TRUE;
-		else
-			retval = FALSE;
-	}
-
- out:
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* value_at handler for the calendar table model */
-static void *
-calendar_model_value_at (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return get_categories (comp);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return get_classification (comp);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		return get_completed (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		return get_dtend (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		return get_dtstart (model, comp);
-
-	case CAL_COMPONENT_FIELD_DUE:
-		return get_due (model, comp);
-
-	case CAL_COMPONENT_FIELD_GEO:
-		return get_geo (comp);
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return get_percent (comp);
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		return get_priority (comp);
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return get_summary (comp);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return get_transparency (comp);
-
-	case CAL_COMPONENT_FIELD_URL:
-		return get_url (comp);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-		return GINT_TO_POINTER (cal_component_has_alarms (comp));
-
-	case CAL_COMPONENT_FIELD_ICON:
-		/* FIXME: Also support 'Assigned to me' & 'Assigned to someone
-		   else'. */
-		if (cal_component_has_recurrences (comp))
-			return GINT_TO_POINTER (1);
-		else {
-			icalcomponent *ical_comp;
-
-			ical_comp = cal_component_get_icalcomponent (comp);
-			if (icalcomponent_get_first_property (ical_comp,
-							      ICAL_ATTENDEE_PROPERTY) != NULL)
-			{
-				return GINT_TO_POINTER (2); /* Task-assigned */
-			}
-			else {
-				return GINT_TO_POINTER (0);
-			}
-		}
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return GINT_TO_POINTER (get_is_complete (comp));
-
-	case CAL_COMPONENT_FIELD_RECURRING:
-		return GINT_TO_POINTER (cal_component_has_recurrences (comp));
-
-	case CAL_COMPONENT_FIELD_OVERDUE:
-		return GINT_TO_POINTER (get_is_overdue (comp));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		if (get_is_overdue (comp))
-			return "red";
-		else
-			return NULL;
-
-	default:
-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* Returns whether a string is NULL, empty, or full of whitespace */
-static gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace (*p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but
-   the model doesn't know anything about the windows. */
-static void
-show_date_warning (CalendarModel *model)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-
-	if (model->priv->use_24_hour_format)
-		/* strftime format of a weekday, a date and a time, 24-hour. */
-		format = _("%a %m/%d/%Y %H:%M:%S");
-	else
-		/* strftime format of a weekday, a date and a time, 12-hour. */
-		format = _("%a %m/%d/%Y %I:%M:%S %p");
-
-	strftime (buffer, sizeof (buffer), format, tmp_tm);
-
-	g_snprintf (message, 256,
-		    _("The date must be entered in the format: \n\n%s"),
-		    buffer);
-
-	dialog = gnome_message_box_new (message,
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Builds a list of categories from a comma-delimited string */
-static GSList *
-categories_from_string (const char *value)
-{
-	GSList *list;
-	const char *categ_start;
-	const char *categ_end;
-	const char *p;
-
-	if (!value)
-		return NULL;
-
-	list = NULL;
-
-	categ_start = categ_end = NULL;
-
-	for (p = value; *p; p++) {
-		if (categ_start) {
-			if (*p == ',') {
-				char *c;
-
-				c = g_strndup (categ_start, categ_end - categ_start + 1);
-				list = g_slist_prepend (list, c);
-
-				categ_start = categ_end = NULL;
-			} else if (!isspace (*p))
-				categ_end = p;
-		} else if (!isspace (*p) && *p != ',')
-			categ_start = categ_end = p;
-	}
-
-	if (categ_start) {
-		char *c;
-
-		c = g_strndup (categ_start, categ_end - categ_start + 1);
-		list = g_slist_prepend (list, c);
-	}
-
-	return g_slist_reverse (list);
-}
-
-/* Sets the list of categories from a comma-delimited string */
-static void
-set_categories (CalComponent *comp, const char *value)
-{
-	GSList *list;
-	GSList *l;
-
-	list = categories_from_string (value);
-
-	cal_component_set_categories_list (comp, list);
-
-	for (l = list; l; l = l->next) {
-		char *s;
-
-		s = l->data;
-		g_free (s);
-	}
-
-	g_slist_free (list);
-}
-
-/* Parses a time value entered by the user; returns -1 if it could not be
- * parsed.  Returns 0 for an empty time.
- */
-static time_t
-parse_time (const char *value)
-{
-	struct tm discard_tm, date_tm, time_tm;
-	struct tm *today_tm;
-	time_t t;
-	const char *pos, *parse_end;
-	char *format[4];
-	gboolean parsed_date = FALSE, parsed_time = FALSE;
-	gint i;
-
-	if (string_is_empty (value))
-		return 0;
-
-	pos = value;
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	/* strptime format for a date. */
-	parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-	if (parse_end) {
-		pos = parse_end;
-		parsed_date = TRUE;
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated, again. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-
-	/* strptime format for a time of day, in 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[0] = _("%I:%M:%S %p%n");
-
-	/* strptime format for a time of day, in 24-hour format. */
-	format[1] = _("%H:%M:%S%n");
-
-	/* strptime format for time of day, without seconds, 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[2] = _("%I:%M %p%n");
-
-	/* strptime format for time of day, without seconds 24-hour format. */
-	format[3] = _("%H:%M%n");
-
-	for (i = 0; i < sizeof (format) / sizeof (format[0]); i++) {
-		memset (&time_tm, 0, sizeof (time_tm));
-		parse_end = strptime (pos, format[i], &time_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_time = TRUE;
-			break;
-		}
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* If we haven't already parsed a date, try again. */
-	if (!parsed_date) {
-		memset (&date_tm, 0, sizeof (date_tm));
-		/* strptime format for a date. */
-		parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_date = TRUE;
-		}
-	}
-
-	/* If we don't have a date or a time it must be invalid. */
-	if (!parsed_date && !parsed_time)
-		return -1;
-
-
-	if (parsed_date) {
-		/* If a 2-digit year was used we use the current century. */
-		if (date_tm.tm_year < 0) {
-			t = time (NULL);
-			today_tm = localtime (&t);
-
-			/* This should convert it into a value from 0 to 99. */
-			date_tm.tm_year += 1900;
-
-			/* Now add on the century. */
-			date_tm.tm_year += today_tm->tm_year
-				- (today_tm->tm_year % 100);
-		}
-	} else {
-		/* If we didn't get a date we use the current day. */
-		t = time (NULL);
-		today_tm = localtime (&t);
-		date_tm.tm_mday = today_tm->tm_mday;
-		date_tm.tm_mon  = today_tm->tm_mon;
-		date_tm.tm_year = today_tm->tm_year;
-	}
-
-	if (parsed_time) {
-		date_tm.tm_hour = time_tm.tm_hour;
-		date_tm.tm_min = time_tm.tm_min;
-		date_tm.tm_sec = time_tm.tm_sec;
-	} else {
-		date_tm.tm_hour = 0;
-		date_tm.tm_min = 0;
-		date_tm.tm_sec = 0;
-	}
-
-
-	date_tm.tm_isdst = -1;
-	return mktime (&date_tm);
-}
-
-/* Called to set the "Date Completed" field. We also need to update the
-   Status and Percent fields to make sure they match. */
-static void
-set_completed (CalendarModel *model, CalComponent *comp, const char *value)
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-	} else if (t == 0) {
-		ensure_task_not_complete (comp);
-	} else {
-		ensure_task_complete (comp, t);
-	}
-}
-
-/* Sets a CalComponentDateTime value */
-static void
-set_datetime (CalendarModel *model, CalComponent *comp, const char *value,
-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt))
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-		return;
-	} else if (t == 0) {
-		(* set_func) (comp, NULL);
-		return;
-	} else {
-		CalComponentDateTime dt;
-		struct icaltimetype itt;
-
-		itt = icaltime_from_timet (t, FALSE);
-		dt.value = &itt;
-		dt.tzid = NULL;
-
-		(* set_func) (comp, &dt);
-	}
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_geo_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The geographical position must be entered "
-					  "in the format: \n\n45.436845,125.862501"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the geographical position value of a component */
-static void
-set_geo (CalComponent *comp, const char *value)
-{
-	double latitude, longitude;
-	int matched;
-	struct icalgeotype geo;
-
-	if (string_is_empty (value)) {
-		cal_component_set_geo (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%lg , %lg", &latitude, &longitude);
-
-	if (matched != 2) {
-		show_geo_warning ();
-		return;
-	}
-
-	geo.lat = latitude;
-	geo.lon = longitude;
-	cal_component_set_geo (comp, &geo);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_percent_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The percent value must be between 0 and 100, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the percent value of a calendar component */
-static void
-set_percent (CalComponent *comp, const char *value)
-{
-	int matched, percent;
-
-	if (string_is_empty (value)) {
-		cal_component_set_percent (comp, NULL);
-		ensure_task_not_complete (comp);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &percent);
-
-	if (matched != 1 || percent < 0 || percent > 100) {
-		show_percent_warning ();
-		return;
-	}
-
-	cal_component_set_percent (comp, &percent);
-
-	if (percent == 100)
-		ensure_task_complete (comp, -1);
-	else
-		ensure_task_not_complete (comp);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.  */
-static void
-show_priority_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The priority must be between 1 and 9, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the priority of a calendar component */
-static void
-set_priority (CalComponent *comp, const char *value)
-{
-	int matched, priority;
-
-	if (string_is_empty (value)) {
-		cal_component_set_priority (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &priority);
-
-	if (matched != 1 || priority < 1 || priority > 9) {
-		show_priority_warning ();
-		return;
-	}
-
-	cal_component_set_priority (comp, &priority);
-}
-
-/* Sets the summary of a calendar component */
-static void
-set_summary (CalComponent *comp, const char *value)
-{
-	CalComponentText text;
-
-	if (string_is_empty (value)) {
-		cal_component_set_summary (comp, NULL);
-		return;
-	}
-
-	text.value = value;
-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */
-
-	cal_component_set_summary (comp, &text);
-}
-
-/* Sets the URI of a calendar component */
-static void
-set_url (CalComponent *comp, const char *value)
-{
-	if (string_is_empty (value)) {
-		cal_component_set_url (comp, NULL);
-		return;
-	}
-
-	cal_component_set_url (comp, value);
-}
-
-/* Called to set the checkbutton field which indicates whether a task is
-   complete. */
-static void
-set_complete (CalComponent *comp, const void *value)
-{
-	gint state = GPOINTER_TO_INT (value);
-
-	if (state) {
-		ensure_task_complete (comp, -1);
-	} else {
-		ensure_task_not_complete (comp);
-	}
-}
-
-/* set_value_at handler for the calendar table model */
-static void
-calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		set_categories (comp, value);
-		if (calendar_model_collect_categories (model, comp)) {
-			gtk_signal_emit (GTK_OBJECT (model),
-					 calendar_model_signals [CATEGORIES_CHANGED]);
-		}
-		break;
-
-	/* FIXME: CLASSIFICATION requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		set_completed (model, comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		/* FIXME: Need to reset dtstart if dtend happens before it */
-		set_datetime (model, comp, value, cal_component_set_dtend);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		/* FIXME: Need to reset dtend if dtstart happens after it */
-		set_datetime (model, comp, value, cal_component_set_dtstart);
-		break;
-
-	case CAL_COMPONENT_FIELD_DUE:
-		set_datetime (model, comp, value, cal_component_set_due);
-		break;
-
-	case CAL_COMPONENT_FIELD_GEO:
-		set_geo (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		set_percent (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		set_priority (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		set_summary (comp, value);
-		break;
-
-	/* FIXME: TRANSPARENCY requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_URL:
-		set_url (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		set_complete (comp, value);
-		break;
-
-	default:
-		g_message ("calendar_model_set_value_at(): Requested invalid column %d", col);
-		break;
-	}
-
-	/* FIXME: this is an ugly HACK.  ETable needs a better API for the
-	 * "click here to add an element" thingy.
-	 */
-	if (priv->appending_row)
-		return;
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_set_value_at(): Could not update the object!");
-}
-
-/* is_cell_editable handler for the calendar table model */
-static gboolean
-calendar_model_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, FALSE);
-
-	/* FIXME: We can't check this as 'click-to-add' passes row 0. */
-	/*g_return_val_if_fail (row >= 0 && row < priv->objects->len, FALSE);*/
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return TRUE;
-
-	default:
-		return FALSE;
-	}
-}
-
-/* append_row handler for the calendar model */
-static void
-calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	int *new_idx, col;
-	const char *uid;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	/* This is a HACK */
-	priv->appending_row = TRUE;
-
-	/* FIXME: This should support other types of components, but for now it
-	 * is only used for the task list.
-	 */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, priv->new_comp_vtype);
-
-	cal_component_get_uid (comp, &uid);
-
-	g_array_append_val (priv->objects, comp);
-	new_idx = g_new (int, 1);
-	*new_idx = priv->objects->len - 1;
-	g_hash_table_insert (priv->uid_index_hash, (char *) uid, new_idx);
-
-	/* Notify the views about the new row. I think we have to do that here,
-	   or the views may become confused when they start getting
-	   "row_changed" or "cell_changed" signals for this new row. */
-	e_table_model_row_inserted (etm, *new_idx);
-
-	for (col = 0; col < CAL_COMPONENT_FIELD_NUM_FIELDS; col++) {
-		const void *val;
-
-		if (!e_table_model_is_cell_editable (etm, col, *new_idx))
-			continue;
-
-		val = e_table_model_value_at(source, col, row);
-		e_table_model_set_value_at (etm, col, *new_idx, val);
-	}
-
-	/* This is the end of the HACK */
-	priv->appending_row = FALSE;
-
-	if (!cal_client_update_object (priv->client, comp)) {
-		/* FIXME: Show error dialog. */
-		g_message ("calendar_model_append_row(): Could not add new object!");
-		remove_object (model, uid);
-		e_table_model_row_deleted (etm, *new_idx);
-	}
-}
-
-/* Duplicates a string value */
-static char *
-dup_string (const char *value)
-{
-	return g_strdup (value);
-}
-
-/* duplicate_value handler for the calendar table model */
-static void *
-calendar_model_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	/* They are almost all dup_string()s for now, but we'll have real fields
-	 * later.
-	 */
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) value;
-
-	default:
-		g_message ("calendar_model_duplicate_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* free_value handler for the calendar table model */
-static void
-calendar_model_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return;
-
-	case CAL_COMPONENT_FIELD_URL:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return;
-
-	default:
-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);
-		return;
-	}
-}
-
-/* Initializes a string value */
-static char *
-init_string (void)
-{
-	return g_strdup ("");
-}
-
-/* initialize_value handler for the calendar table model */
-static void *
-calendar_model_initialize_value (ETableModel *etm, int col)
-{
-	CalendarModel *model;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	model = CALENDAR_MODEL (etm);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return g_strdup (model->priv->default_category ? model->priv->default_category : "");
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return NULL;
-
-	default:
-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* value_is_empty handler for the calendar model. This should return TRUE
-   unless a significant value has been set. The 'click-to-add' feature
-   checks all fields to see if any are not empty and if so it adds a new
-   row, so we only want to return FALSE if we have a useful object. */
-static gboolean
-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return TRUE;
-
-	default:
-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);
-		return TRUE;
-	}
-}
-
-static char * 
-calendar_model_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return e_utf8_from_locale_string (value);
-
-	case CAL_COMPONENT_FIELD_ICON:
-		if ((int)value == 0)
-			return e_utf8_from_locale_string (_("Normal"));
-		else if ((int)value == 1)
-			return e_utf8_from_locale_string (_("Recurring"));
-		else
-			return e_utf8_from_locale_string (_("Assigned"));
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-		return e_utf8_from_locale_string (value ? _("Yes") : _("No"));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		return NULL;
-
-	default:
-		g_message ("calendar_model_value_as_string(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-
-
-/**
- * calendar_model_new:
- *
- * Creates a new calendar model.  It must be told about the calendar client
- * interface object it will monitor with calendar_model_set_cal_client().
- *
- * Return value: A newly-created calendar model.
- **/
-CalendarModel *
-calendar_model_new (void)
-{
-	return CALENDAR_MODEL (gtk_type_new (TYPE_CALENDAR_MODEL));
-}
-
-
-/* Callback used when a calendar is opened into the server */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	CalendarModel *model;
-
-	model = CALENDAR_MODEL (data);
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		load_objects (model);
-		calendar_model_collect_all_categories (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-/* Removes an object from the model and updates all the indices that follow.
- * Returns the index of the object that was removed, or -1 if no object with
- * such UID was found.
- */
-static int
-remove_object (CalendarModel *model, const char *uid)
-{
-	CalendarModelPrivate *priv;
-	int *idx;
-	CalComponent *orig_comp;
-	int i;
-	int n;
-
-	priv = model->priv;
-
-	/* Find the index of the object to be removed */
-
-	idx = g_hash_table_lookup (priv->uid_index_hash, uid);
-	if (!idx)
-		return -1;
-
-	orig_comp = g_array_index (priv->objects, CalComponent *, *idx);
-	g_assert (orig_comp != NULL);
-
-	/* Decrease the indices of all the objects that follow in the array */
-
-	for (i = *idx + 1; i < priv->objects->len; i++) {
-		CalComponent *comp;
-		int *comp_idx;
-		const char *comp_uid;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-
-		cal_component_get_uid (comp, &comp_uid);
-
-		comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-		g_assert (comp_idx != NULL);
-
-		(*comp_idx)--;
-		g_assert (*comp_idx >= 0);
-	}
-
-	/* Remove this object from the array and hash */
-
-	g_hash_table_remove (priv->uid_index_hash, uid);
-	g_array_remove_index (priv->objects, *idx);
-
-	gtk_object_unref (GTK_OBJECT (orig_comp));
-
-	n = *idx;
-	g_free (idx);
-
-	return n;
-}
-
-/* Returns whether a component's type matches the types we support */
-static gboolean
-matches_type (CalObjType type, CalComponentVType vtype)
-{
-	return ((vtype == CAL_COMPONENT_EVENT && (type & CALOBJ_TYPE_EVENT))
-		|| (vtype == CAL_COMPONENT_TODO && (type & CALOBJ_TYPE_TODO))
-		|| (vtype == CAL_COMPONENT_JOURNAL && (type & CALOBJ_TYPE_JOURNAL)));
-}
-
-/* Callback used when an object is updated in the server */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	int orig_idx;
-	CalComponent *new_comp;
-	CalComponentVType new_comp_vtype;
-	const char *new_comp_uid;
-	int *new_idx;
-	CalClientGetStatus status;
-
-	model = CALENDAR_MODEL (data);
-	priv = model->priv;
-
-	orig_idx = remove_object (model, uid);
-
-	status = cal_client_get_object (priv->client, uid, &new_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Check if we are interested in this type of object */
-
-		new_comp_vtype = cal_component_get_vtype (new_comp);
-		if (!matches_type (priv->type, new_comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (new_comp));
-			break;
-		}
-
-		/* Insert the object into the model */
-
-		cal_component_get_uid (new_comp, &new_comp_uid);
-
-		if (orig_idx == -1) {
-			/* The object not in the model originally, so we just append it */
-
-			g_array_append_val (priv->objects, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = priv->objects->len - 1;
-
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-			e_table_model_row_inserted (E_TABLE_MODEL (model), *new_idx);
-		} else {
-			int i;
-
-			/* Insert the new version of the object in its old position */
-
-			g_array_insert_val (priv->objects, orig_idx, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = orig_idx;
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-
-			/* Increase the indices of all subsequent objects */
-
-			for (i = orig_idx + 1; i < priv->objects->len; i++) {
-				CalComponent *comp;
-				int *comp_idx;
-				const char *comp_uid;
-
-				comp = g_array_index (priv->objects, CalComponent *, i);
-				g_assert (comp != NULL);
-
-				cal_component_get_uid (comp, &comp_uid);
-
-				comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-				g_assert (comp_idx != NULL);
-
-				(*comp_idx)++;
-			}
-
-			e_table_model_row_changed (E_TABLE_MODEL (model), *new_idx);
-		}
-
-		/* See if we need to add any categories. Note that old
-		   categories won't be removed, but I don't think that matters
-		   too much here. */
-		if (calendar_model_collect_categories (model, new_comp)) {
-			gtk_signal_emit (GTK_OBJECT (model),
-					 calendar_model_signals [CATEGORIES_CHANGED]);
-		}
-
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* Nothing; the object may have been removed from the server.  We just
-		 * notify that the old object was deleted.
-		 */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-
-		/* Same notification as above */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when an object is removed in the server */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	int idx;
-
-	model = CALENDAR_MODEL (data);
-
-	idx = remove_object (model, uid);
-
-	if (idx != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);
-}
-
-/* Loads the required objects from the calendar client */
-static void
-load_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	GList *uids;
-	GList *l;
-
-	priv = model->priv;
-
-	g_assert (cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_LOADED);
-
-	uids = cal_client_get_uids (priv->client, priv->type);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		const char *comp_uid;
-		CalClientGetStatus status;
-		CalComponentVType comp_vtype;
-		int *idx;
-
-		uid = l->data;
-		status = cal_client_get_object (priv->client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing; the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("load_objects(): Syntax error when getting object `%s'", uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		/* Check if we are interested in this type of object */
-
-		comp_vtype = cal_component_get_vtype (comp);
-		if (!matches_type (priv->type, comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		/* Insert the object into the model */
-
-		idx = g_new (int, 1);
-
-		g_array_append_val (priv->objects, comp);
-		*idx = priv->objects->len - 1;
-
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (priv->uid_index_hash, (char *) comp_uid, idx);
-	}
-
-	cal_obj_uid_list_free (uids);
-}
-
-/**
- * calendar_model_get_cal_client:
- * @model: A calendar model.
- * 
- * Queries the calendar client interface object that a calendar model is using.
- * 
- * Return value: A calendar client interface object.
- **/
-CalClient *
-calendar_model_get_cal_client (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	return priv->client;
-}
-
-
-/**
- * calendar_model_set_cal_client:
- * @model: A calendar model.
- * @client: A calendar client interface object.
- * @type: Type of objects to present.
- *
- * Sets the calendar client interface object that a calendar model will monitor.
- * It also sets the types of objects this model will present to an #ETable.
- **/
-void
-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = model->priv;
-
-	if (priv->client == client && priv->type == type)
-		return;
-
-	e_table_model_pre_change (E_TABLE_MODEL(model));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	free_objects (model);
-
-	priv->client = client;
-	priv->type = type;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), model);
-
-		if (cal_client_get_load_state (priv->client) != CAL_CLIENT_LOAD_LOADED)
-			gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), model);
-		else
-			load_objects (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-/**
- * calendar_model_set_new_comp_vtype:
- * @model: A calendar model.
- * @vtype: Type of calendar components to create.
- * 
- * Sets the type of calendar components that will be created by a calendar table
- * model when the click-to-add functionality of the table is used.
- **/
-void
-calendar_model_set_new_comp_vtype (CalendarModel *model, CalComponentVType vtype)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-	g_return_if_fail (vtype != CAL_COMPONENT_NO_TYPE);
-
-	priv = model->priv;
-	priv->new_comp_vtype = vtype;
-}
-
-/**
- * calendar_model_get_new_comp_vtype:
- * @model: A calendar model.
- * 
- * Queries the type of calendar components that are created by a calendar table
- * model when using the click-to-add functionality in a table.
- * 
- * Return value: Type of components that are created.
- **/
-CalComponentVType
-calendar_model_get_new_comp_vtype (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), CAL_COMPONENT_NO_TYPE);
-
-	priv = model->priv;
-	return priv->new_comp_vtype;
-}
-
-
-void
-calendar_model_mark_task_complete (CalendarModel *model,
-				   gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	ensure_task_complete (comp, -1);
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_mark_task_complete(): Could not update the object!");
-}
-
-
-/**
- * calendar_model_get_component:
- * @model: A calendar model.
- * @row: Row number of sought calendar component.
- * 
- * Queries a calendar component from a calendar model based on its row number.
- * 
- * Return value: The sought calendar component.
- **/
-CalComponent *
-calendar_model_get_component (CalendarModel *model,
-			       gint	      row)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	return g_array_index (priv->objects, CalComponent *, row);
-}
-
-
-/* This makes sure a task is marked as complete.
-   It makes sure the "Date Completed" property is set. If the completed_date
-   is not -1, then that is used, otherwise if the "Date Completed" property
-   is not already set it is set to the current time.
-   It makes sure the percent is set to 100, and that the status is "Completed".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_complete (CalComponent *comp,
-		      time_t completed_date)
-{
-	struct icaltimetype *old_completed = NULL;
-	struct icaltimetype new_completed;
-	int *old_percent, new_percent;
-	icalproperty_status status;
-	gboolean set_completed = TRUE;
-
-	/* Date Completed. */
-	if (completed_date == -1) {
-		cal_component_get_completed (comp, &old_completed);
-
-		if (old_completed) {
-			cal_component_free_icaltimetype (old_completed);
-			set_completed = FALSE;
-		} else {
-			completed_date = time (NULL);
-		}
-	}
-
-	if (set_completed) {
-		new_completed = icaltime_from_timet (completed_date, FALSE);
-		cal_component_set_completed (comp, &new_completed);
-	}
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (!old_percent || *old_percent != 100) {
-		new_percent = 100;
-		cal_component_set_percent (comp, &new_percent);
-	}
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &status);
-	if (status != ICAL_STATUS_COMPLETED) {
-		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
-	}
-}
-
-
-/* This makes sure a task is marked as incomplete. It clears the
-   "Date Completed" property. If the percent is set to 100 it removes it,
-   and if the status is "Completed" it sets it to "Needs Action".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_not_complete (CalComponent *comp)
-{
-	icalproperty_status old_status;
-	int *old_percent;
-
-	/* Date Completed. */
-	cal_component_set_completed (comp, NULL);
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (old_percent && *old_percent == 100)
-		cal_component_set_percent (comp, NULL);
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &old_status);
-	if (old_status == ICAL_STATUS_COMPLETED)
-		cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
-}
-
-
-/* Whether we use 24 hour format to display the times. */
-gboolean
-calendar_model_get_use_24_hour_format (CalendarModel *model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), TRUE);
-
-	return model->priv->use_24_hour_format;
-}
-
-
-void
-calendar_model_set_use_24_hour_format (CalendarModel *model,
-				       gboolean	      use_24_hour_format)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (model->priv->use_24_hour_format != use_24_hour_format) {
-		model->priv->use_24_hour_format = use_24_hour_format;
-		/* Get the views to redraw themselves. */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
-
-void
-calendar_model_set_default_category	(CalendarModel	*model,
-					 gchar		*default_category)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	g_free (model->priv->default_category);
-	model->priv->default_category = g_strdup (default_category);
-}
-
-
-static void
-calendar_model_collect_all_categories	(CalendarModel	*model)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	int i;
-
-	priv = model->priv;
-
-	/* Destroy the current tree and start from scratch. */
-	g_tree_traverse (priv->categories, (GTraverseFunc) g_free,
-			 G_PRE_ORDER, NULL);
-	g_tree_destroy (priv->categories);
-
-	priv->categories = g_tree_new ((GCompareFunc)strcmp);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		calendar_model_collect_categories (model, comp);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 calendar_model_signals [CATEGORIES_CHANGED]);
-}
-
-
-static gboolean
-calendar_model_collect_categories	(CalendarModel	*model,
-					 CalComponent	*comp)
-{
-	CalendarModelPrivate *priv;
-	GSList *categories_list, *elem;
-	gboolean changed = FALSE;
-
-	priv = model->priv;
-
-	cal_component_get_categories_list (comp, &categories_list);
-
-	for (elem = categories_list; elem; elem = elem->next) {
-		if (!g_tree_lookup (priv->categories, elem->data)) {
-			/* We store a '1' as the data, just so we can use
-			   g_tree_lookup() on it. Note that we don't free
-			   the string since it is now part of the tree. */
-			g_tree_insert (priv->categories, elem->data,
-				       GINT_TO_POINTER (1));
-			changed = TRUE;
-		} else {
-			g_free (elem->data);
-		}
-	}
-
-	g_slist_free (categories_list);
-
-	return changed;
-}
-
-
-GTree*
-calendar_model_get_categories		(CalendarModel	*model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	return model->priv->categories;
-}
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
deleted file mode 100644
index 5ff2f41c38..0000000000
--- a/calendar/gui/calendar-model.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_MODEL_H
-#define CALENDAR_MODEL_H
-
-#include <libgnome/gnome-defs.h>
-#include <gal/e-table/e-table-model.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CALENDAR_MODEL            (calendar_model_get_type ())
-#define CALENDAR_MODEL(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_MODEL, CalendarModel))
-#define CALENDAR_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_MODEL,	\
-					CalendarModelClass))
-#define IS_CALENDAR_MODEL(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_MODEL))
-#define IS_CALENDAR_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_MODEL))
-
-typedef struct _CalendarModel CalendarModel;
-typedef struct _CalendarModelClass CalendarModelClass;
-
-typedef struct _CalendarModelPrivate CalendarModelPrivate;
-
-struct _CalendarModel {
-	ETableModel model;
-
-	/* Private data */
-	CalendarModelPrivate *priv;
-};
-
-struct _CalendarModelClass {
-	ETableModelClass parent_class;
-
-	void (* categories_changed) (CalendarModel *model);
-};
-
-GtkType		calendar_model_get_type		  (void);
-
-CalendarModel*	calendar_model_new		  (void);
-
-CalClient*	calendar_model_get_cal_client	  (CalendarModel   *model);
-void		calendar_model_set_cal_client	  (CalendarModel   *model,
-						   CalClient	   *client,
-						   CalObjType	    type);
-
-void		calendar_model_set_new_comp_vtype  (CalendarModel     *model,
-						    CalComponentVType  vtype);
-CalComponentVType calendar_model_get_new_comp_vtype (CalendarModel    *model);
-
-void		calendar_model_mark_task_complete (CalendarModel   *model,
-						   gint		    row);
-
-CalComponent*	calendar_model_get_component	  (CalendarModel   *model,
-						   gint		    row);
-
-/* Whether we use 24 hour format to display the times. */
-gboolean	calendar_model_get_use_24_hour_format (CalendarModel *model);
-void		calendar_model_set_use_24_hour_format (CalendarModel *model,
-						       gboolean	      use_24_hour_format);
-
-GTree*		calendar_model_get_categories	  (CalendarModel   *model);
-
-void		calendar_model_set_default_category (CalendarModel	*model,
-						     gchar		*default_category);
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
deleted file mode 100644
index 163d56f524..0000000000
--- a/calendar/gui/calendar-summary.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <liboaf/liboaf.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <cal-util/cal-component.h>
-#include <cal-util/timeutil.h>
-#include "alarm-notify/alarm.h"
-#include "calendar-model.h"
-#include "calendar-summary.h"
-
-typedef struct {
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryHtmlView *view;
-	BonoboPropertyControl *property_control;
-	CalClient *client;
-
-	GtkWidget *show_appointments;
-	GtkWidget *show_tasks;
-
-	gboolean appointments;
-	gboolean tasks;
-
-	char *title;
-	char *icon;
-	
-	guint32 idle;
-
-	gpointer alarm;
-} CalSummary;
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-extern gchar *evolution_dir;
-
-static int running_views = 0;
-static BonoboGenericFactory *factory;
-#define CALENDAR_SUMMARY_ID "OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory"
-
-/* list_sort_merge, and list_sort are copied from GNOME-VFS.
-   Author: Sven Oliver <sven.over@ob.kamp.net>
-   Modified by Ettore Perazzoli <ettore@comm2000.it> to let the compare
-   functions get an additional gpointer parameter.  
-
-   Included here as using gnome-vfs for 1 20 line function 
-   seems a bit of overkill.
-*/
-
-typedef gint (* CalSummaryListCompareFunc) (gconstpointer a, 
-					    gconstpointer b,
-					    gpointer data);
-static GList *
-cal_list_sort_merge (GList *l1,
-		     GList *l2,
-		     CalSummaryListCompareFunc compare_func,
-		     gpointer data)
-{
-	GList list, *l, *lprev;
-
-	l = &list;
-	lprev = NULL;
-
-	while (l1 && l2) {
-		if (compare_func (l1->data, l2->data, data) < 0) {
-			l->next = l1;
-			l = l->next;
-			l->prev = lprev;
-			lprev = l;
-			l1 = l1->next;
-		} else {
-			l->next = l2;
-			l = l->next;
-			l->prev = lprev;
-			lprev = l;
-			l2 = l2->next;
-		}
-	}
-
-	l->next = l1 ? l1 : l2;
-	l->next->prev = l;
-
-	return list.next;
-}
-
-static GList *
-cal_list_sort (GList *list,
-	       CalSummaryListCompareFunc compare_func,
-	       gpointer data)
-{
-	GList *l1, *l2;
-
-	if (!list)
-		return NULL;
-	if (!list->next)
-		return list;
-
-	l1 = list;
-	l2 = list->next;
-
-	while ((l2 = l2->next) != NULL) {
-		if ((l2 = l2->next) == NULL)
-			break;
-		l1 = l1->next;
-	}
-
-	l2 = l1->next;
-	l1->next = NULL;
-	
-	return cal_list_sort_merge (cal_list_sort (list, compare_func, data),
-				    cal_list_sort (l2, compare_func, data),
-				    compare_func, data);
-}
-	
-static int
-sort_uids (gconstpointer a,
-	   gconstpointer b,
-	   gpointer user_data)
-{
-	CalComponent *comp_a, *comp_b;
-	CalSummary *summary = user_data;
-	CalClientGetStatus status;
-	CalComponentDateTime start_a, start_b;
-
-	/* a after b then return > 0 */
-
-	status = cal_client_get_object (summary->client, a, &comp_a);
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		return -1;
-
-	status = cal_client_get_object (summary->client, b, &comp_b);
-	if (status != CAL_CLIENT_GET_SUCCESS)
-		return 1;
-
-	cal_component_get_dtstart (comp_a, &start_a);
-	cal_component_get_dtstart (comp_b, &start_b);
-
-	return icaltime_compare (*start_a.value, *start_b.value);
-}
-
-static gboolean
-generate_html_summary (gpointer data)
-{
-	CalSummary *summary;	
-	time_t t, day_begin, day_end;
-	struct tm *timeptr;
-	GList *uids, *l;
-	char *ret_html, *tmp, *datestr;
-
-	summary = data;
-	
-	t = time (NULL);
-	day_begin = time_day_begin (t);
-	day_end = time_day_end (t);
-
-	datestr = g_new (char, 256);
-	timeptr = localtime (&t);
-	strftime (datestr, 255, _("%A, %e %B %Y"), timeptr);
-	ret_html = g_strdup_printf ("<b>%s</b>", datestr);
-	g_free (datestr);
-
-	if (summary->appointments) {
-		tmp = ret_html;
-		ret_html = g_strdup_printf ("%s<p align=\"center\">Appointments</p><hr><ul>",
-					    tmp);
-		g_free (tmp);
-		
-		uids = cal_client_get_objects_in_range (summary->client, 
-							CALOBJ_TYPE_EVENT, day_begin,
-							day_end);
-		uids = cal_list_sort (uids, sort_uids, summary);
-
-		for (l = uids; l; l = l->next){
-			CalComponent *comp;
-			CalComponentText text;
-			CalClientGetStatus status;
-			CalComponentDateTime start, end;
-			struct icaltimetype *end_time;
-			time_t start_t, end_t;
-			struct tm *start_tm, *end_tm;
-			char *start_str, *end_str;
-			char *uid;
-			char *tmp2;
-			
-			uid = l->data;
-			status = cal_client_get_object (summary->client, uid, &comp);
-			if (status != CAL_CLIENT_GET_SUCCESS)
-				continue;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_get_dtstart (comp, &start);
-			cal_component_get_dtend (comp, &end);
-			
-			g_print ("text.value: %s\n", text.value);
-			end_time = end.value;
-			
-			start_t = icaltime_as_timet (*start.value);
-			
-			start_str = g_new (char, 20);
-			start_tm = localtime (&start_t);
-			strftime (start_str, 19, _("%I:%M%p"), start_tm);
-			
-			if (end_time) {
-				end_str = g_new (char, 20);
-				end_t = icaltime_as_timet (*end_time);
-				end_tm = localtime (&end_t);
-				strftime (end_str, 19, _("%I:%M%p"), end_tm);
-			} else {
-				end_str = g_strdup ("...");
-			}
-			
-			tmp2 = g_strdup_printf ("<li>%s:%s -> %s</li>", text.value, start_str, end_str);
-			g_free (start_str);
-			g_free (end_str);
-			
-			tmp = ret_html;
-			ret_html = g_strconcat (ret_html, tmp2, NULL);
-			g_free (tmp);
-			g_free (tmp2);
-		}
-		
-		cal_obj_uid_list_free (uids);
-	
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, "</ul>", NULL);
-		g_free (tmp);
-	}
-
-	if (summary->tasks) {
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, 
-					"<p align=\"center\">Tasks</p><hr><ul>",
-					NULL);
-		g_free (tmp);
-		
-		/* Generate a list of tasks */
-		uids = cal_client_get_uids (summary->client, CALOBJ_TYPE_TODO);
-		for (l = uids; l; l = l->next){
-			CalComponent *comp;
-			CalComponentText text;
-			CalClientGetStatus status;
-			struct icaltimetype *completed;
-			char *uid;
-			char *tmp2;
-			
-			uid = l->data;
-			status = cal_client_get_object (summary->client, uid, &comp);
-			if (status != CAL_CLIENT_GET_SUCCESS)
-				continue;
-			
-			cal_component_get_summary (comp, &text);
-			cal_component_get_completed (comp, &completed);
-			
-			if (completed == NULL) {
-				tmp2 = g_strdup_printf ("<li>%s</li>", text.value);
-			} else {
-				tmp2 = g_strdup_printf ("<li><strike>%s</strike></li>",
-							text.value);
-				cal_component_free_icaltimetype (completed);
-			}
-			
-			tmp = ret_html;
-			ret_html = g_strconcat (ret_html, tmp2, NULL);
-			g_free (tmp);
-			g_free (tmp2);
-		}
-		
-		cal_obj_uid_list_free (uids);
-		
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, "</ul>", NULL);
-		g_free (tmp);
-	}
-
-	executive_summary_html_view_set_html (summary->view, ret_html);
-	g_free (ret_html);
-	
-	summary->idle = 0;
-	return FALSE;
-}
-
-static void
-get_property (BonoboPropertyBag *bag,
-	      BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer data)
-{
-	CalSummary *summary = (CalSummary *) data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		g_warning ("Get property: %s", summary->title);
-		BONOBO_ARG_SET_STRING (arg, summary->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, summary->icon);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-set_property (BonoboPropertyBag *bag,
-	      const BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	CalSummary *summary = (CalSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		if (summary->title)
-			g_free (summary->title);
-
-		summary->title = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		bonobo_property_bag_notify_listeners (bag, "window_title",
-						      arg, NULL);
-		break;
-
-	case PROPERTY_ICON:
-		if (summary->icon)
-			g_free (summary->icon);
-
-		summary->icon = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		bonobo_property_bag_notify_listeners (bag, "window_icon",
-						      arg, NULL);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-component_destroyed (GtkObject *object,
-		     gpointer data)
-{
-	CalSummary *summary = (CalSummary *) data;
-
-	g_free (summary->title);
-	g_free (summary->icon);
-	gtk_object_destroy (GTK_OBJECT (summary->client));
-
-	g_free (summary);
-
-	running_views--;
-
-	if (running_views <= 0) {
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-	}
-}
-
-static void
-obj_updated_cb (CalClient *client,
-		const char *uid,
-		CalSummary *summary)
-{
-	/* FIXME: Maybe cache the uid's in the summary and only call this if
-	   uid is in this cache??? */
-
-	if (summary->idle != 0) 
-		return;
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static void
-obj_removed_cb (CalClient *client,
-		const char *uid,
-		CalSummary *summary)
-{
-	/* See FIXME: above */
-	if (summary->idle != 0)
-		return;
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static void
-cal_opened_cb (CalClient *client,
-	       CalClientOpenStatus status,
-	       CalSummary *summary)
-{
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (summary->idle != 0)
-			return;
-
-		summary->idle = g_idle_add (generate_html_summary, summary);
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		executive_summary_html_view_set_html (summary->view,
-						      _("<b>Error loading calendar</b>"));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* We did not use only_if_exists when opening the calendar, so
-		 * this should not happen.
-		 */
-		g_assert_not_reached ();
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		executive_summary_html_view_set_html (summary->view,
-						      _("<b>Error loading calendar:<br>Method not supported"));
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-alarm_fn (gpointer alarm_id,
-	  time_t trigger,
-	  gpointer data)
-{
-	CalSummary *summary;
-	time_t t, day_end;
-
-	summary = data;
-
-	t = time (NULL);
-	day_end = time_day_end (t);
-	summary->alarm = alarm_add (day_end, alarm_fn, summary, NULL);
-
-	/* Now redraw the summary */
-	generate_html_summary (summary);
-}
-
-/* PersistStream callbacks */
-static void
-load_from_stream (BonoboPersistStream *ps,
-		  Bonobo_Stream stream,
-		  Bonobo_Persist_ContentType type,
-		  gpointer data,
-		  CORBA_Environment *ev)
-{
-	CalSummary *summary = (CalSummary *) data;
-	char *str;
-	xmlChar *xml_str;
-	xmlDocPtr doc;
-	xmlNodePtr root, children;
-
-	if (*type && g_strcasecmp (type, "application/x-evolution-calendar-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, 
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	bonobo_stream_client_read_string (stream, &str, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION || str == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	doc = xmlParseDoc ((xmlChar *) str);
-
-	if (doc == NULL) {
-		g_warning ("Bad data: %s!", str);
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		g_free (str);
-		return;
-	}
-
-	g_free (str);
-	root = doc->root;
-	children = root->childs;
-	while (children) {
-		if (strcasecmp (children->name, "showappointments") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			if (strcmp (xml_str, "TRUE") == 0)
-				summary->appointments = TRUE;
-			else 
-				summary->appointments = FALSE;
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		if (strcasecmp (children->name, "showtasks") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			if (strcmp (xml_str, "TRUE") == 0)
-				summary->tasks = TRUE;
-			else
-				summary->tasks = FALSE;
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		g_print ("Unknown name: %s\n", children->name);
-		children = children->next;
-	}
-	xmlFreeDoc (doc);
-
-	summary->idle = g_idle_add (generate_html_summary, summary);
-}
-
-static char *
-summary_to_string (CalSummary *summary)
-{
-	xmlChar *out_str;
-	int out_len = 0;
-	xmlDocPtr doc;
-	xmlNsPtr ns;
-
-	doc = xmlNewDoc ("1.0");
-	ns = xmlNewGlobalNs (doc, "http://www.helixcode.com", "calendar-summary");
-	doc->root = xmlNewDocNode (doc, ns, "calendar-summary", NULL);
-
-	xmlNewChild (doc->root, ns, "showappointments", 
-		     summary->appointments ? "TRUE" : "FALSE");
-	xmlNewChild (doc->root, ns, "showtasks", summary->tasks ? "TRUE" : "FALSE");
-	
-	xmlDocDumpMemory (doc, &out_str, &out_len);
-	return out_str;
-}
-
-static void
-save_to_stream (BonoboPersistStream *ps,
-		const Bonobo_Stream stream,
-		Bonobo_Persist_ContentType type,
-		gpointer data,
-		CORBA_Environment *ev)
-{
-	CalSummary *summary = (CalSummary *) data;
-	char *str;
-
-	if (*type && g_strcasecmp (type, "application/x-evolution-calendar-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	str = summary_to_string (summary);
-	if (str)
-		bonobo_stream_client_printf (stream, TRUE, ev, str);
-	xmlFree (str);
-
-	return;
-}
-
-static Bonobo_Persist_ContentTypeList *
-content_types (BonoboPersistStream *ps,
-	       void *closure,
-	       CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (1, "application/x-evolution-calendar-summary");
-}
-
-static void
-property_dialog_changed (GtkWidget *widget,
-			 CalSummary *summary)
-{
-	bonobo_property_control_changed (summary->property_control, NULL);
-}
-
-static BonoboControl *
-property_dialog (BonoboPropertyControl *property_control,
-		 int page_num,
-		 void *user_data)
-{
-	BonoboControl *control;
-	CalSummary *summary = (CalSummary *) user_data;
-	GtkWidget *container, *vbox;
-
-	container = gtk_frame_new (_("Display"));
-	gtk_container_set_border_width (GTK_CONTAINER (container), 2);
-	vbox = gtk_vbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (container), vbox);
-	
-	summary->show_appointments = gtk_check_button_new_with_label (_("Show appointments"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->show_appointments), 
-				      summary->appointments);
-	gtk_signal_connect (GTK_OBJECT (summary->show_appointments), "toggled",
-			    GTK_SIGNAL_FUNC (property_dialog_changed), summary);
-	gtk_box_pack_start (GTK_BOX (vbox), summary->show_appointments, 
-			    TRUE, TRUE, 0);
-	
-	summary->show_tasks = gtk_check_button_new_with_label (_("Show tasks"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->show_tasks),
-				      summary->tasks);
-	gtk_signal_connect (GTK_OBJECT (summary->show_tasks), "toggled",
-			    GTK_SIGNAL_FUNC (property_dialog_changed), summary);
-	gtk_box_pack_start (GTK_BOX (vbox), summary->show_tasks, TRUE, TRUE, 0);
-	gtk_widget_show_all (container);
-
-	control = bonobo_control_new (container);
-	return control;
-}
-
-static void
-property_action (GtkObject *property_control,
-		 int page_num,
-		 Bonobo_PropertyControl_Action action,
-		 CalSummary *summary)
-{
-	switch (action) {
-	case Bonobo_PropertyControl_APPLY:
-		summary->appointments = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary->show_appointments));
-		summary->tasks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary->show_tasks));
-		summary->idle = g_idle_add (generate_html_summary, summary);
-		break;
-
-	case Bonobo_PropertyControl_HELP:
-		g_print ("HELP\n");
-		break;
-
-	default:
-		break;
-	}
-}
-
-BonoboObject *
-create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-		     void *closure)
-{
-	BonoboObject *component, *view;
-	BonoboPersistStream *stream;
-	BonoboPropertyBag *bag;
-	BonoboPropertyControl *property_control;
-	BonoboEventSource *event_source;
-	CalSummary *summary;
-	char *file;
-	time_t t, day_end;
-
-	file = g_concat_dir_and_file (evolution_dir, "local/Calendar/calendar.ics");
-
-	/* Create the component object */
-	component = executive_summary_component_new ();
-
-	summary = g_new (CalSummary, 1);
-	summary->component = EXECUTIVE_SUMMARY_COMPONENT (component);
-	summary->icon = g_strdup ("evolution-calendar.png");
-	summary->title = g_strdup ("Things to do");
-	summary->client = cal_client_new ();
-	summary->idle = 0;
-	summary->appointments = TRUE;
-	summary->tasks = TRUE;
-
-	t = time (NULL);
-	day_end = time_day_end (t);
-	summary->alarm = alarm_add (day_end, alarm_fn, summary, NULL);
-
-	/* Load calendar */
-	cal_client_open_calendar (summary->client, file, FALSE);
-	g_free (file);
-
-	gtk_signal_connect (GTK_OBJECT (summary->client), "cal-opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (summary->client), "obj-updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (summary->client), "obj-removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), summary);
-		
-	gtk_signal_connect (GTK_OBJECT (component), "destroy",
-			    GTK_SIGNAL_FUNC (component_destroyed), summary);
-
-	event_source = bonobo_event_source_new ();
-
-	/* HTML view */
-	view = executive_summary_html_view_new_full (event_source);
-	summary->view = EXECUTIVE_SUMMARY_HTML_VIEW (view);
-
-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (view),
-					      _("Loading Calendar"));
-	bonobo_object_add_interface (component, view);
-
-	/* BonoboPropertyBag */
-	bag = bonobo_property_bag_new_full (get_property, set_property, 
-					    event_source, summary);
-	bonobo_property_bag_add (bag, "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING, NULL, 
-				 "The title of this component's window", 0);
-	bonobo_property_bag_add (bag, "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING, NULL, 
-				 "The icon for this component's window", 0);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (bag));
-
-	property_control = bonobo_property_control_new_full (property_dialog, 
-							     1, event_source,
-							     summary);
-	summary->property_control = property_control;
-	gtk_signal_connect (GTK_OBJECT (property_control), "action",
-			    GTK_SIGNAL_FUNC (property_action), summary);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (property_control));
-			    
-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,
-					    NULL, content_types, summary);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (stream));
-
-	running_views++;
-
-	return component;
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *generic_factory,
-	    void *closure)
-{
-	BonoboObject *_factory;
-
-	_factory = executive_summary_component_factory_new (create_summary_view,
-							    NULL);
-	return _factory;
-}
-
-BonoboGenericFactory *
-calendar_summary_factory_init (void)
-{
-	if (factory != NULL)
-		return factory;
-
-	factory = bonobo_generic_factory_new (CALENDAR_SUMMARY_ID, factory_fn,
-					      NULL);
-
-	if (factory == NULL) {
-		g_warning ("Cannot initialise calendar summary factory");
-		return NULL;
-	}
-
-	return factory;
-}
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
deleted file mode 100644
index cfb92c0697..0000000000
--- a/calendar/gui/calendar-summary.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_SUMMARY_H
-#define CALENDAR_SUMMARY_H
-
-#include <evolution-services/executive-summary-component.h>
-
-BonoboGenericFactory *calendar_summary_factory_init (void);
-
-BonoboObject *create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-				   void *closure);
-
-#endif
diff --git a/calendar/gui/check-filled.xpm b/calendar/gui/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/calendar/gui/check-filled.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_filled_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .        . .  ",
-"  .       .. .  ",
-"  .      ... .  ",
-"  . .   ...  .  ",
-"  . .. ...   .  ",
-"  . .....    .  ",
-"  .  ...     .  ",
-"  .   .      .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
deleted file mode 100644
index f1898e914e..0000000000
--- a/calendar/gui/comp-util.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Evolution calendar - Utilities for manipulating CalComponent objects
- *
- * Copyright (C) 2000 Helix Code, 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 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 "comp-util.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 (CalComponent *comp, struct icaltimetype itt)
-{
-	GSList *list;
-	CalComponentDateTime *cdt;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	cal_component_get_exdate_list (comp, &list);
-
-	cdt = g_new (CalComponentDateTime, 1);
-	cdt->value = g_new (struct icaltimetype, 1);
-	*cdt->value = itt;
-	cdt->tzid = NULL;
-
-	list = g_slist_append (list, cdt);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
deleted file mode 100644
index 9c70172aee..0000000000
--- a/calendar/gui/comp-util.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Utilities for manipulating CalComponent objects
- *
- * Copyright (C) 2000 Helix Code, 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 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 COMP_UTIL_H
-#define COMP_UTIL_H
-
-#include <cal-util/cal-component.h>
-
-void cal_comp_util_add_exdate (CalComponent *comp, struct icaltimetype itt);
-
-#endif
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
deleted file mode 100644
index 5226c2480d..0000000000
--- a/calendar/gui/component-factory.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#include "component-factory.h"
-#include "tasks-control-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#include "calendar-summary.h"
-#include "tasks-control.h"
-#include "tasks-migrate.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ "tasks", "evolution-tasks.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!g_strcasecmp (type, "calendar")) {
-		control = control_factory_new_control ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else if (!g_strcasecmp (type, "tasks")) {
-		control = tasks_control_new ();
-		if (!control)
-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	} else {
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-	}
-
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-	/* FIXME: I don't think we have to do anything to create a calendar
-	   or tasks folder - the '.ics' files are created automatically when
-	   needed. But I'm not sure - Damon. */
-	if (!strcmp(type, "calendar") || !strcmp(type, "tasks")) {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_OK, &ev);
-	} else {
-		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &ev);
-	}
-	CORBA_exception_free(&ev);
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	static gboolean migrated = FALSE;
-
-	owner_count ++;
-	evolution_dir = g_strdup (evolution_homedir);
-
-	calendar_config_init ();
-
-	if (!migrated) {
-		tasks_migrate ();
-		migrated = TRUE;
-	}
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 create_view,
-							 create_folder,
-							 NULL, /* remove_folder_fn */
-							 NULL, /* copy_folder_fn */
-							 NULL, /* populate_folder_context_menu_fn */
-							 NULL  /* closure */);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	summary_factory = calendar_summary_factory_init ();
-
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-}
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
deleted file mode 100644
index d2d570e340..0000000000
--- a/calendar/gui/component-factory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index 678870da91..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <cal-util/timeutil.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#include "control-factory.h"
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#define CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		filename = g_strdup_printf ("%s/calendar.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-}
-
-/* Callback factory function for calendar controls */
-static BonoboObject *
-control_factory_fn (BonoboGenericFactory *Factory, void *data)
-{
-	BonoboControl *control;
-
-	control = control_factory_new_control ();
-
-	if (control)
-		return BONOBO_OBJECT (control);
-	else
-		return NULL;
-}
-
-
-void
-control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = new_calendar ();
-	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;
-	}
-
-	calendar_properties_init (gcal, control);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index 7170404cda..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-void           control_factory_init         (void);
-BonoboControl *control_factory_new_control  (void);
-
-#endif /* _CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
deleted file mode 100644
index e995588475..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index dd9a2b2540..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-gladedir = $(datadir)/evolution/glade
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(includedir)					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-noinst_LIBRARIES = libcal-dialogs.a
-
-libcal_dialogs_a_SOURCES =	\
-	alarm-notify-dialog.c	\
-	alarm-notify-dialog.h	\
-	cal-prefs-dialog.c	\
-	cal-prefs-dialog.h	\
-	delete-comp.c		\
-	delete-comp.h		\
-	save-comp.c		\
-	save-comp.h		\
-	task-editor.c		\
-	task-editor.h
-
-glade_DATA =			\
-	alarm-notify.glade	\
-	cal-prefs-dialog.glade	\
-	task-editor-dialog.glade
-
-EXTRA_DIST =			\
-	$(glade_DATA)
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c
deleted file mode 100644
index fbd8c1f097..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.h b/calendar/gui/dialogs/alarm-notify-dialog.h
deleted file mode 100644
index f2c938c495..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade
deleted file mode 100644
index 41718d0572..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
deleted file mode 100644
index 11577ffc05..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "../calendar-commands.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-
-	GtkWidget *working_days[7];
-	GtkWidget *week_start_day;
-	GtkWidget *start_of_day;
-	GtkWidget *end_of_day;
-	GtkWidget *use_12_hour;
-	GtkWidget *use_24_hour;
-	GtkWidget *time_divisions;
-	GtkWidget *show_end_times;
-	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-} CalPrefsDialogPrivate;
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-static void cal_prefs_dialog_class_init		(CalPrefsDialogClass *class);
-static void cal_prefs_dialog_init		(CalPrefsDialog	     *prefs);
-static gboolean get_widgets			(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_destroy		(GtkObject	     *object);
-static void cal_prefs_dialog_init_widgets	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_button_clicked	(GtkWidget	     *dialog,
-						 gint		      button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget	     *button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_show_config	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_update_config	(CalPrefsDialog	     *prefs);
-
-GtkWidget*  cal_prefs_dialog_create_time_edit	(void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE (cal_prefs_dialog, "CalPrefsDialog", CalPrefsDialog,
-	     cal_prefs_dialog_class_init, cal_prefs_dialog_init,
-	     GTK_TYPE_OBJECT)
-
-
-static void
-cal_prefs_dialog_class_init (CalPrefsDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_prefs_dialog_destroy;
-}
-
-
-static void
-cal_prefs_dialog_init (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = g_new0 (CalPrefsDialogPrivate, 1);
-	prefs->priv = priv;
-
-}
-
-
-/**
- * cal_prefs_dialog_new:
- * @Returns: a new #CalPrefsDialog.
- *
- * Creates a new #CalPrefsDialog.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_new (void)
-{
-	CalPrefsDialog *prefs;
-
-	prefs = CAL_PREFS_DIALOG (gtk_type_new (cal_prefs_dialog_get_type ()));
-	return cal_prefs_dialog_construct (prefs);
-}
-
-
-/**
- * cal_prefs_dialog_construct:
- * @prefs: A #CalPrefsDialog.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @prefs, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_construct (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_val_if_fail (IS_CAL_PREFS_DIALOG (prefs), NULL);
-
-	priv = prefs->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (prefs)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	cal_prefs_dialog_init_widgets (prefs);
-
-	cal_prefs_dialog_show_config (prefs);
-
-	gtk_widget_show (priv->dialog);
-
-	return prefs;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (prefs));
-	return NULL;
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->dialog = GW ("cal-prefs-dialog");
-
-	/* The indices must match the mktime() values. */
-	priv->working_days[0] = GW ("sun_button");
-	priv->working_days[1] = GW ("mon_button");
-	priv->working_days[2] = GW ("tue_button");
-	priv->working_days[3] = GW ("wed_button");
-	priv->working_days[4] = GW ("thu_button");
-	priv->working_days[5] = GW ("fri_button");
-	priv->working_days[6] = GW ("sat_button");
-
-	priv->week_start_day = GW ("first_day_of_week");
-	priv->start_of_day = GW ("start_of_day");
-	priv->end_of_day = GW ("end_of_day");
-	priv->use_12_hour = GW ("use_12_hour");
-	priv->use_24_hour = GW ("use_24_hour");
-	priv->time_divisions = GW ("time_divisions");
-	priv->show_end_times = GW ("show_end_times");
-	priv->compress_weekend = GW ("compress_weekend");
-	priv->dnav_show_week_no = GW ("dnav_show_week_no");
-
-#undef GW
-
-	return (priv->dialog
-		&& priv->working_days[0]
-		&& priv->working_days[1]
-		&& priv->working_days[2]
-		&& priv->working_days[3]
-		&& priv->working_days[4]
-		&& priv->working_days[5]
-		&& priv->working_days[6]
-		&& priv->week_start_day
-		&& priv->start_of_day
-		&& priv->end_of_day
-		&& priv->use_12_hour
-		&& priv->use_24_hour
-		&& priv->time_divisions
-		&& priv->show_end_times
-		&& priv->compress_weekend
-		&& priv->dnav_show_week_no);
-}
-
-
-static void
-cal_prefs_dialog_destroy (GtkObject *object)
-{
-	CalPrefsDialog *prefs;
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (object));
-
-	prefs = CAL_PREFS_DIALOG (object);
-	priv = prefs->priv;
-
-
-	g_free (priv);
-	prefs->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-void
-cal_prefs_dialog_show		(CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* If the dialog is already show just raise it, otherwise refresh the
-	   config settings and show it. */
-	if (GTK_WIDGET_MAPPED (priv->dialog)) {
-		gdk_window_raise (priv->dialog->window);
-	} else {
-		cal_prefs_dialog_show_config (prefs);
-		gtk_widget_show (priv->dialog);
-	}
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-cal_prefs_dialog_init_widgets	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->dialog), "clicked",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_button_clicked),
-			    prefs);
-
-	gtk_signal_connect (GTK_OBJECT (priv->use_24_hour), "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),
-			    prefs);
-}
-
-
-static void
-cal_prefs_dialog_button_clicked	(GtkWidget	*dialog,
-				 gint		 button,
-				 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* OK & Apply buttons update the config settings. */
-	if (button == 0 || button == 1)
-		cal_prefs_dialog_update_config	(prefs);
-
-	/* OK & Close buttons close the dialog. */
-	if (button == 0 || button == 2)
-		gtk_widget_hide (priv->dialog);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled	(GtkWidget	*button,
-					 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	gboolean use_24_hour;
-
-	priv = prefs->priv;
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->start_of_day),
-					    use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->end_of_day),
-					    use_24_hour);
-}
-
-
-/* Shows the current config settings in the dialog. */
-static void
-cal_prefs_dialog_show_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->working_days[day]), (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (priv->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_24_hour), TRUE);
-	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_12_hour), TRUE);
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (priv->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_end_times),
-				      calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->compress_weekend), calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no), calendar_config_get_dnav_show_week_no ());
-}
-
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-cal_prefs_dialog_update_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->working_days[day])))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	calendar_config_set_working_days (working_days);
-
-	/* Week Start Day. */
-	week_start_day = e_dialog_option_menu_get (priv->week_start_day,
-						   week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     &hour, &minute);
-	calendar_config_set_day_start_hour (hour);
-	calendar_config_set_day_start_minute (minute);
-
-	/* End of Day. */
-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     &hour, &minute);
-	calendar_config_set_day_end_hour (hour);
-	calendar_config_set_day_end_minute (minute);
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour)));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (priv->time_divisions,
-						   time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->show_end_times)));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->compress_weekend)));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no)));
-
-	calendar_config_write ();
-	update_all_config_settings ();
-}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
deleted file mode 100644
index f6eccb163d..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,1241 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>preferences</name>
-  <program_name>preferences</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>cal-prefs-dialog</name>
-  <title>Calendar Preferences</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook1</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox8</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame9</name>
-	  <label>Work week</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox8</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>mon_button</name>
-		<can_focus>True</can_focus>
-		<label>Mon</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tue_button</name>
-		<can_focus>True</can_focus>
-		<label>Tue</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>wed_button</name>
-		<can_focus>True</can_focus>
-		<label>Wed</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>thu_button</name>
-		<can_focus>True</can_focus>
-		<label>Thu</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>fri_button</name>
-		<can_focus>True</can_focus>
-		<label>Fri</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sat_button</name>
-		<can_focus>True</can_focus>
-		<label>Sat</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sun_button</name>
-		<can_focus>True</can_focus>
-		<label>Sun</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label16</name>
-		<label>First day of week:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>first_day_of_week</name>
-		<can_focus>True</can_focus>
-		<items>Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-Sunday
-</items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label17</name>
-		<label>Start of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>start_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:12 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label18</name>
-		<label>End of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>end_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame10</name>
-	  <label>Display options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table4</name>
-	    <border_width>4</border_width>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label19</name>
-	      <label>Time divisions:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>Time format:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>show_end_times</name>
-	      <can_focus>True</can_focus>
-	      <label>Show appointment end times</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>compress_weekend</name>
-	      <can_focus>True</can_focus>
-	      <label>Compress weekends</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox10</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>12 hour (am/pm)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_24_hour</name>
-		<can_focus>True</can_focus>
-		<label>24 hour</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment4</name>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>time_divisions</name>
-		<can_focus>True</can_focus>
-		<items>60 minutes
-30 minutes
-15 minutes
-10 minutes
-05 minutes
-</items>
-		<initial_choice>0</initial_choice>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame11</name>
-	  <label>Date navigator options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>dnav_show_week_no</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Show week numbers</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label7</name>
-	<label>Calendar</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame3</name>
-	    <label>Show</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox4</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton1</name>
-		<can_focus>True</can_focus>
-		<label>Due Date</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton2</name>
-		<can_focus>True</can_focus>
-		<label>Time Until Due</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton3</name>
-		<can_focus>True</can_focus>
-		<label>Priority</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame4</name>
-	    <label>Highlight</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox5</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton4</name>
-		<can_focus>True</can_focus>
-		<label>Overdue Items</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton5</name>
-		<can_focus>True</can_focus>
-		<label>Items Due Today</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton6</name>
-		<can_focus>True</can_focus>
-		<label>Items Not Yet Due</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame5</name>
-	  <label>Colors</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table3</name>
-	    <border_width>4</border_width>
-	    <rows>3</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker1</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker2</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker3</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label8</name>
-		<label>Items Not Yet Due:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment2</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label9</name>
-		<label>Items Due Today:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>True</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment3</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label10</name>
-		<label>Overdue Items:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>TaskPad</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox6</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame6</name>
-	  <border_width>4</border_width>
-	  <label>Defaults</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>checkbutton7</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Remind me of all appointments</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinbutton1</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>minutes before they occur.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>3</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame7</name>
-	  <border_width>4</border_width>
-	  <label>Visual Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton8</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Beep when alarm windows appear.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame8</name>
-	  <border_width>4</border_width>
-	  <label>Audio Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox6</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton9</name>
-		<can_focus>True</can_focus>
-		<label>Alarms timeout after</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton2</name>
-		<can_focus>True</can_focus>
-		<climb_rate>1</climb_rate>
-		<digits>0</digits>
-		<numeric>False</numeric>
-		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		<snap>False</snap>
-		<wrap>False</wrap>
-		<value>5</value>
-		<lower>0</lower>
-		<upper>100</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label13</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton10</name>
-		<can_focus>True</can_focus>
-		<label>Enable snoozing for</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton3</name>
-		<can_focus>True</can_focus>
-		<climb_rate>1</climb_rate>
-		<digits>0</digits>
-		<numeric>False</numeric>
-		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		<snap>False</snap>
-		<wrap>False</wrap>
-		<value>600</value>
-		<lower>0</lower>
-		<upper>1000</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label14</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<label>Reminders</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index 9d744f806d..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.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 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _CAL_PREFS_DIALOG_H_
-#define _CAL_PREFS_DIALOG_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define CAL_PREFS_DIALOG(obj)          GTK_CHECK_CAST (obj, cal_prefs_dialog_get_type (), CalPrefsDialog)
-#define CAL_PREFS_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, cal_prefs_dialog_get_type (), CalPrefsDialogClass)
-#define IS_CAL_PREFS_DIALOG(obj)       GTK_CHECK_TYPE (obj, cal_prefs_dialog_get_type ())
-
-
-typedef struct _CalPrefsDialog       CalPrefsDialog;
-typedef struct _CalPrefsDialogClass  CalPrefsDialogClass;
-
-struct _CalPrefsDialog
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _CalPrefsDialogClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType		cal_prefs_dialog_get_type	(void);
-CalPrefsDialog* cal_prefs_dialog_construct	(CalPrefsDialog *prefs);
-CalPrefsDialog* cal_prefs_dialog_new		(void);
-
-void		cal_prefs_dialog_show		(CalPrefsDialog *prefs);
-
-END_GNOME_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
deleted file mode 100644
index bd70f6b261..0000000000
--- a/calendar/gui/dialogs/delete-comp.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Helix Code, 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 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
-#include "delete-comp.h"
-
-
-
-/**
- * delete_component_dialog:
- * @comp: A calendar component.
- * @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 particular
- * calendar component.
- * 
- * Return value: TRUE if the user clicked Yes, FALSE otherwise.
- **/
-gboolean
-delete_component_dialog (CalComponent *comp, GtkWidget *widget)
-{
-	CalComponentText summary;
-	CalComponentVType vtype;
-	char *str, *tmp;
-	GtkWidget *dialog;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	vtype = cal_component_get_vtype (comp);
-	cal_component_get_summary (comp, &summary);
-
-	switch (vtype) {
-	case CAL_COMPONENT_EVENT:
-		if (summary.value)
-			str = g_strdup_printf (_("Are you sure you want to delete the appointment "
-						 "`%s'?"), summary.value);
-		else
-			str = g_strdup (_("Are you sure you want to delete this "
-					  "untitled appointment?"));
-		break;
-
-	case CAL_COMPONENT_TODO:
-		if (summary.value)
-			str = g_strdup_printf (_("Are you sure you want to delete the task "
-						 "`%s'?"), summary.value);
-		else
-			str = g_strdup (_("Are you sure you want to delete this "
-					  "untitled task?"));
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		if (summary.value)
-			str = g_strdup_printf (_("Are you sure you want to delete the journal entry "
-						 "`%s'?"), summary.value);
-		else
-			str = g_strdup (_("Are you sure want to delete this "
-					  "untitled journal entry?"));
-		break;
-
-	default:
-		g_message ("delete_component_dialog(): Cannot handle object of type %d", vtype);
-		return FALSE;
-	}
-
-	tmp = e_utf8_to_gtk_string (widget, str);
-	g_free (str);
-
-	if (tmp) {
-		dialog = gnome_question_dialog_modal (tmp, NULL, NULL);
-		g_free (tmp);
-
-		if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
-			return TRUE;
-		else
-			return FALSE;
-	} else {
-		g_message ("delete_component_dialog(): Could not convert the string from UTF8");
-		return FALSE;
-	}
-}
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
deleted file mode 100644
index d7243e75c4..0000000000
--- a/calendar/gui/dialogs/delete-comp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Helix Code, 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 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 DELETE_COMP_H
-#define DELETE_COMP_H
-
-#include <gtk/gtkwidget.h>
-#include <cal-util/cal-component.h>
-
-gboolean delete_component_dialog (CalComponent *comp, GtkWidget *widget);
-
-#endif
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
deleted file mode 100644
index c36e98cb5a..0000000000
--- a/calendar/gui/dialogs/save-comp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Helix Code, 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 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 <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include "save-comp.h"
-
-
-
-/**
- * save_component_dialog:
- * @parent: Window to use as the transient dialog's parent.
- * 
- * Pops up a dialog box asking the user whether he wants to save changes for
- * a calendar component.
- * 
- * Return value: TRUE if changes shold be saved, FALSE otherwise.
- **/
-gint
-save_component_dialog (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("Do you want to save changes?"),
-					GNOME_MESSAGE_BOX_QUESTION,
-					GNOME_STOCK_BUTTON_YES,
-					GNOME_STOCK_BUTTON_NO,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);
-
-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
deleted file mode 100644
index 2fb8e2c2a8..0000000000
--- a/calendar/gui/dialogs/save-comp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 2000 Helix Code, 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 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 SAVE_COMP_H
-#define SAVE_COMP_H
-
-gint save_component_dialog (GtkWindow *parent);
-
-#endif
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
deleted file mode 100644
index ae7ea9681a..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ /dev/null
@@ -1,695 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomeDock:contents</child_name>
-    <name>notebook1</name>
-    <border_width>2</border_width>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table3</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label3</name>
-	  <label>Su_mmary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>summary</default_focus_target>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>summary</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame2</name>
-	<label>Date &amp; Time</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>description</name>
-	  <height>80</height>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame23</name>
-	<label>Progress</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-Undefined
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label9</name>
-	    <label>% Comp_lete:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>percent-complete</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>percent-complete</name>
-	    <width>60</width>
-	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>0</digits>
-	    <numeric>False</numeric>
-	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>100</upper>
-	    <step>10</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame24</name>
-	<label>Classification</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox6</name>
-	  <border_width>2</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-public</name>
-	    <can_focus>True</can_focus>
-	    <label>Pu_blic</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-private</name>
-	    <can_focus>True</can_focus>
-	    <label>Pri_vate</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-confidential</name>
-	    <can_focus>True</can_focus>
-	    <label>_Confidential</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>contacts-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label16</name>
-	    <label>_Contacts...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>contacts</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>categories-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label17</name>
-	    <label>Ca_tegories...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>categories</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label1</name>
-      <label>Task</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table4</name>
-      <border_width>4</border_width>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>2</row_spacing>
-      <column_spacing>4</column_spacing>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label12</name>
-	<label>Date Completed:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label14</name>
-	<label>URL:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>url</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>completed-date</name>
-	<creation_function>task_editor_create_date_edit</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label2</name>
-      <label>Details</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
deleted file mode 100644
index 64e73e30f5..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,1280 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * TaskEditor - a GtkObject which handles a libglade-loaded dialog to edit
- * tasks.
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-categories.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <cal-util/timeutil.h>
-#include "delete-comp.h"
-#include "save-comp.h"
-#include "task-editor.h"
-#include "../calendar-config.h"
-#include "../widget-util.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Client to use */
-	CalClient *client;
-
-	/* Calendar component we are editing; this is an internal copy and is
-	 * not one of the read-only objects from the parent calendar.
-	 */
-	CalComponent *comp;
-
-
-	/* This is TRUE while we are setting the widget values. We just return
-	   from any signal handlers. */
-	gboolean ignore_callbacks;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *summary;
-
-	GtkWidget *due_date;
-	GtkWidget *start_date;
-
-	GtkWidget *percent_complete;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-
-	GtkWidget *description;
-
-	GtkWidget *classification_public;
-	GtkWidget *classification_private;
-	GtkWidget *classification_confidential;
-
-	GtkWidget *contacts;
-	GtkWidget *categories_btn;
-	GtkWidget *categories;
-
-	GtkWidget *completed_date;
-	GtkWidget *url;
-
-	/* Call task_editor_set_changed() to set this to TRUE when any field
-	   in the dialog is changed. When the user closes the dialog we will
-	   prompt to save changes. */
-	gboolean changed;
-} TaskEditorPrivate;
-
-
-/* Note that these two arrays must match. */
-static const int status_map[] = {
-	ICAL_STATUS_NEEDSACTION,
-	ICAL_STATUS_INPROCESS,
-	ICAL_STATUS_COMPLETED,
-	ICAL_STATUS_CANCELLED,
-	-1
-};
-
-typedef enum {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-} TaskEditorPriority;
-
-static const int priority_map[] = {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-	-1
-};
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-static void task_editor_class_init (TaskEditorClass *class);
-static void task_editor_init (TaskEditor *tedit);
-static void tedit_apply_event_cb (GtkWidget *widget, gint page_num, gpointer data);
-static gint tedit_close_event_cb (GtkWidget *widget, gpointer data);
-static gint tedit_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-static void close_dialog (TaskEditor *tedit);
-static gboolean get_widgets (TaskEditor *tedit);
-static void init_widgets (TaskEditor *tedit);
-static void task_editor_destroy (GtkObject *object);
-static char * make_title_from_comp (CalComponent *comp);
-static void set_title_from_comp (TaskEditor *tedit, CalComponent *comp);
-static void clear_widgets (TaskEditor *tedit);
-static void fill_widgets (TaskEditor *tedit);
-
-static void save_todo_object (TaskEditor *tedit);
-static void dialog_to_comp_object (TaskEditor *tedit);
-
-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
-static void raise_and_focus (GtkWidget *widget);
-
-static TaskEditorPriority priority_value_to_index (int priority_value);
-static int priority_index_to_value (TaskEditorPriority priority);
-
-static void completed_changed		(EDateEdit	*dedit,
-					 TaskEditor	*tedit);
-static void status_changed		(GtkMenu	*menu,
-					 TaskEditor	*tedit);
-static void percent_complete_changed	(GtkAdjustment	*adj,
-					 TaskEditor	*tedit);
-static void field_changed		(GtkWidget	*widget,
-					 TaskEditor	*tedit);
-static void task_editor_set_changed	(TaskEditor	*tedit,
-					 gboolean	 changed);
-static gboolean prompt_to_save_changes	(TaskEditor	*tedit);
-static CalComponentClassification classification_get (GtkWidget *widget);
-static void categories_clicked          (GtkWidget      *button,
-					 TaskEditor     *editor);
-
-/* The function libglade calls to create the EDateEdit widgets in the GUI. */
-GtkWidget * task_editor_create_date_edit (void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE(task_editor, "TaskEditor", TaskEditor,
-	    task_editor_class_init, task_editor_init, GTK_TYPE_OBJECT)
-
-
-static void
-task_editor_class_init (TaskEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = task_editor_destroy;
-}
-
-
-static void
-task_editor_init (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = g_new0 (TaskEditorPrivate, 1);
-	tedit->priv = priv;
-
-	priv->ignore_callbacks = FALSE;
-
-	task_editor_set_changed (tedit, FALSE);
-}
-
-
-/**
- * task_editor_new:
- * @Returns: a new #TaskEditor.
- *
- * Creates a new #TaskEditor.
- **/
-TaskEditor *
-task_editor_new (void)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (gtk_type_new (task_editor_get_type ()));
-	return task_editor_construct (tedit);
-}
-
-/**
- * task_editor_construct:
- * @tedit: A #TaskEditor.
- *
- * Constructs a task editor by loading its Glade XML file.
- *
- * Return value: The same object as @tedit, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-TaskEditor *
-task_editor_construct (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_val_if_fail (tedit != NULL, NULL);
-	g_return_val_if_fail (IS_TASK_EDITOR (tedit), NULL);
-
-	priv = tedit->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("task_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (tedit)) {
-		g_message ("task_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (tedit);
-
-	/* Hook to destruction of the dialog */
-	gtk_signal_connect (GTK_OBJECT (priv->app), "apply",
-			    GTK_SIGNAL_FUNC (tedit_apply_event_cb), tedit); 
-	gtk_signal_connect (GTK_OBJECT (priv->app), "close",
-			    GTK_SIGNAL_FUNC (tedit_close_event_cb), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (tedit_delete_event_cb), tedit);
-
-	/* Add focus to the summary entry */
-	gtk_widget_grab_focus (GTK_WIDGET (priv->summary));
-
-
-	return tedit;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (tedit));
-	return NULL;
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-task_editor_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = date_edit_new (TRUE, TRUE);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-
-	return dedit;
-}
-
-/* Callback used when the dialog box is destroyed */
-static void
-tedit_apply_event_cb (GtkWidget *widget, gint page_num, gpointer data)
-{
-	TaskEditor *tedit;
-
-	g_return_if_fail (IS_TASK_EDITOR (data));
-
-	tedit = TASK_EDITOR (data);
-
-	if (page_num != -1)
-		return;
-	
-	save_todo_object (tedit);
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-tedit_close_event_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	g_return_val_if_fail (IS_TASK_EDITOR (data), TRUE);
-
-	tedit = TASK_EDITOR (data);
-
-	if (prompt_to_save_changes (tedit))
-		close_dialog (tedit);
-
-	return TRUE;
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-tedit_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	TaskEditor *tedit;
-
-	g_return_val_if_fail (IS_TASK_EDITOR (data), TRUE);
-
-	tedit = TASK_EDITOR (data);
-
-	if (prompt_to_save_changes (tedit))
-		close_dialog (tedit);
-
-	return TRUE;
-}
-
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (tedit));
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("task-editor-dialog");
-
-	priv->summary = GW ("summary");
-
-	priv->due_date = GW ("due-date");
-	priv->start_date = GW ("start-date");
-
-	priv->percent_complete = GW ("percent-complete");
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-
-	priv->description = GW ("description");
-
-	priv->classification_public = GW ("classification-public");
-	priv->classification_private = GW ("classification-private");
-	priv->classification_confidential = GW ("classification-confidential");
-
-	priv->contacts = GW ("contacts");
-	priv->categories_btn = GW ("categories-button");
-	priv->categories = GW ("categories");
-
-	priv->completed_date = GW ("completed-date");
-	priv->url = GW ("url");
-
-#undef GW
-
-	return (priv->app
-		&& priv->summary
-		&& priv->due_date
-		&& priv->start_date
-		&& priv->percent_complete
-		&& priv->status
-		&& priv->priority
-		&& priv->classification_public
-		&& priv->classification_private
-		&& priv->classification_confidential
-		&& priv->description
-		&& priv->contacts
-		&& priv->categories_btn
-		&& priv->categories
-		&& priv->completed_date	
-		&& priv->url);
-}
-
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	/* Connect signals. The Status, Percent Complete & Date Completed
-	   properties are closely related so whenever one changes we may need
-	   to update the other 2. */
-	gtk_signal_connect (GTK_OBJECT (priv->completed_date), "changed",
-			    GTK_SIGNAL_FUNC (completed_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->status)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (status_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    GTK_SIGNAL_FUNC (percent_complete_changed), tedit);
-
-	/* Classification */
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_public),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_private),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_confidential),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-
-	/* Connect the default signal handler to use to make sure the "changed"
-	   field gets set whenever a field is changed. */
-	gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->due_date), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->start_date), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->priority)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->contacts), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->categories), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->url), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), tedit);
-
-	/* Button clicks */
-	gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked",
-			    GTK_SIGNAL_FUNC (categories_clicked), tedit);
-}
-
-static void
-task_editor_destroy (GtkObject *object)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (object));
-
-	tedit = TASK_EDITOR (object);
-	priv = tedit->priv;
-
-	if (priv->app) {
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tedit->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-void
-task_editor_set_cal_client (TaskEditor *tedit,
-			    CalClient *client)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED);
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), tedit);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), tedit);
-	}
-}
-
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the task from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-
-/**
- * task_editor_set_todo_object:
- * @tedit: A #TaskEditor.
- * @comp: A todo object.
- *
- * Sets the todo object that a task editor dialog will manipulate.
- **/
-void
-task_editor_set_todo_object	(TaskEditor	*tedit,
-				 CalComponent	*comp)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp)
-		priv->comp = cal_component_clone (comp);
-
-	set_title_from_comp (tedit, priv->comp);
-	fill_widgets (tedit);
-}
-
-void
-task_editor_focus (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-	gtk_widget_show_now (priv->app);
-	raise_and_focus (priv->app);
-}
-
-/* Creates an appropriate title for the task editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-
-	if (!comp)
-		return g_strdup (_("Edit Task"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-/* Sets the event editor's window title from a calendar component */
-static void
-set_title_from_comp (TaskEditor *tedit, CalComponent *comp)
-{
-	TaskEditorPrivate *priv;
-	char *title, *tmp;
-
-	priv = tedit->priv;
-
-	title = make_title_from_comp (comp);
-	tmp = e_utf8_to_gtk_string (priv->app, title);
-	g_free (title);
-
-	if (tmp) {
-		gtk_window_set_title (GTK_WINDOW (priv->app), tmp);
-		g_free (tmp);
-	} else {
-		g_message ("set_title_from_comp(): Could not convert the title from UTF8");
-		gtk_window_set_title (GTK_WINDOW (priv->app), "");
-	}
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-
-}
-
-/* Fills in the widgets with the proper values */
-static void
-fill_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentDateTime d;
-	CalComponentClassification cl;
-	struct icaltimetype *completed;
-	GSList *l;
-	time_t t;
-	int *priority_value, *percent;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	const char *url;
-	const char *categories;
-
-	priv = tedit->priv;
-
-	task_editor_set_changed (tedit, FALSE);
-
-	clear_widgets (tedit);
-
-	if (!priv->comp)
-		return;
-
-	/* We want to ignore any signals emitted while changing fields. */
-	priv->ignore_callbacks = TRUE;
-
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	} else {
-		e_dialog_editable_set (priv->description, NULL);
-	}
-	cal_component_free_text_list (l);
-
-	/* Due Date. */
-	cal_component_get_due (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), t);
-
-	/* Start Date. */
-	cal_component_get_dtstart (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), t);
-
-	/* Completed Date. */
-	cal_component_get_completed (priv->comp, &completed);
-	if (completed) {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), t);
-
-	/* Percent Complete. */
-	cal_component_get_percent (priv->comp, &percent);
-	if (percent) {
-		e_dialog_spin_set (priv->percent_complete, *percent);
-		cal_component_free_percent (percent);
-	} else {
-		/* FIXME: Could check if task is completed and set 100%. */
-		e_dialog_spin_set (priv->percent_complete, 0);
-	}
-
-	/* Status. */
-	cal_component_get_status (priv->comp, &status);
-	if (status == ICAL_STATUS_NONE) {
-		/* Try to user the percent value. */
-		if (percent) {
-			if (*percent == 0)
-				status = ICAL_STATUS_NEEDSACTION;
-			else if (*percent == 100)
-				status = ICAL_STATUS_COMPLETED;
-			else
-				status = ICAL_STATUS_INPROCESS;
-		} else
-			status = ICAL_STATUS_NEEDSACTION;
-	}
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	/* Priority. */
-	cal_component_get_priority (priv->comp, &priority_value);
-	if (priority_value) {
-		priority = priority_value_to_index (*priority_value);
-		cal_component_free_priority (priority_value);
-	} else {
-		priority = PRIORITY_UNDEFINED;
-	}
-	e_dialog_option_menu_set (priv->priority, priority, priority_map);
-
-
-	/* Classification. */
-	cal_component_get_classification (priv->comp, &cl);
-
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-	default:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-
-	/* Categories */
-	cal_component_get_categories (priv->comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	/* URL. */
-	cal_component_get_url (priv->comp, &url);
-	e_dialog_editable_set (priv->url, url);
-
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-save_todo_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	g_return_if_fail (priv->client != NULL);
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (tedit);
-	set_title_from_comp (tedit, priv->comp);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_todo_object(): Could not update the object!");
-	else
-		task_editor_set_changed (tedit, FALSE);
-}
-
-
-/* Get the values of the widgets in the event editor and put them in the iCalObject */
-static void
-dialog_to_comp_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	time_t t;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	char *url, *cat;
-	char *str;
-
-	priv = tedit->priv;
-	comp = priv->comp;
-
-	/* Summary. */
-
-	str = e_dialog_editable_get (priv->summary);
-	if (!str || strlen (str) == 0)
-		cal_component_set_summary (comp, NULL);
-	else {
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	str = e_dialog_editable_get (priv->description);
-	if (!str || strlen (str) == 0)
-		cal_component_set_description_list (comp, NULL);
-	else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-	}
-
-	if (!str)
-		g_free (str);
-
-	/* Dates */
-
-	date.value = g_new (struct icaltimetype, 1);
-	date.tzid = NULL;
-
-	/* Due Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE);
-		cal_component_set_due (comp, &date);
-	} else {
-		cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		cal_component_set_dtstart (comp, NULL);
-	}
-
-	/* Completed Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE);
-		cal_component_set_completed (comp, date.value);
-	} else {
-		cal_component_set_completed (comp, NULL);
-	}
-
-	g_free (date.value);
-
-	/* Percent Complete. */
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	cal_component_set_percent (comp, &percent);
-
-	/* Status. */
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	cal_component_set_status (comp, status);
-
-	/* Priority. */
-	priority = e_dialog_option_menu_get (priv->priority, priority_map);
-	priority_value = priority_index_to_value (priority);
-	cal_component_set_priority (comp, &priority_value);
-
-	/* Classification. */
-	cal_component_set_classification (comp, classification_get (priv->classification_public));
-
-	/* Categories */
-	cat = e_dialog_editable_get (priv->categories);
-	cal_component_set_categories (comp, cat);
-
-	if (cat)
-		g_free (cat);
-
-	/* URL. */
-	url = e_dialog_editable_get (priv->url);
-	cal_component_set_url (comp, url);
-
-	if (url)
-		g_free (url);
-
-	cal_component_commit_sequence (comp);
-}
-
-static TaskEditorPriority
-priority_value_to_index (int priority_value)
-{
-	TaskEditorPriority retval;
-
-	if (priority_value == 0)
-		retval = PRIORITY_UNDEFINED;
-	else if (priority_value <= 4)
-		retval = PRIORITY_HIGH;
-	else if (priority_value == 5)
-		retval = PRIORITY_NORMAL;
-	else
-		retval = PRIORITY_LOW;
-
-	return retval;
-}
-
-
-static int
-priority_index_to_value (TaskEditorPriority priority)
-{
-	int retval;
-
-	switch (priority) {
-	case PRIORITY_UNDEFINED:
-		retval = 0;
-		break;
-	case PRIORITY_HIGH:
-		retval = 3;
-		break;
-	case PRIORITY_NORMAL:
-		retval = 5;
-		break;
-	case PRIORITY_LOW:
-		retval = 7;
-		break;
-	default:
-		retval = -1;
-		g_assert_not_reached ();
-		break;
-	}
-
-	return retval;
-}
-
-
-static void
-completed_changed	(EDateEdit	*dedit,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	time_t t;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	task_editor_set_changed (tedit, TRUE);
-
-	priv->ignore_callbacks = TRUE;
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	if (t == -1) {
-		/* If the 'Completed Date' is set to 'None', we set the
-		   status to 'Not Started' and the percent-complete to 0.
-		   The task may actually be partially-complete, but we leave
-		   it to the user to set those fields. */
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_NEEDSACTION,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 0);
-	} else {
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_COMPLETED,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 100);
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-status_changed		(GtkMenu	*menu,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	icalproperty_status status;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	task_editor_set_changed (tedit, TRUE);
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	priv->ignore_callbacks = TRUE;
-	if (status == ICAL_STATUS_NEEDSACTION) {
-		e_dialog_spin_set (priv->percent_complete, 0);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-				      time (NULL));
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-percent_complete_changed	(GtkAdjustment	*adj,
-				 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	time_t date_completed;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	task_editor_set_changed (tedit, TRUE);
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	priv->ignore_callbacks = TRUE;
-
-	if (percent == 100) {
-		date_completed = time (NULL);
-		status = ICAL_STATUS_COMPLETED;
-	} else {
-		/* FIXME: Set to 'None'. */
-		date_completed = time (NULL);
-
-		if (percent == 0)
-			status = ICAL_STATUS_NEEDSACTION;
-		else
-			status = ICAL_STATUS_INPROCESS;
-	}
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-			      date_completed);
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	priv->ignore_callbacks = FALSE;
-}
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-
-/* This is called when all fields except those handled above (status, percent
-   complete & completed date) are changed. It just sets the "changed" flag. */
-static void
-field_changed			(GtkWidget	*widget,
-				 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	task_editor_set_changed (tedit, TRUE);
-}
-
-
-static void
-task_editor_set_changed		(TaskEditor	*tedit,
-				 gboolean	 changed)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-#if 0
-	g_print ("In task_editor_set_changed: %s\n",
-		 changed ? "TRUE" : "FALSE");
-#endif
-
-	priv->changed = changed;
-
-	if (priv->app)
-		gnome_property_box_set_state (GNOME_PROPERTY_BOX (priv->app), changed);
-}
-
-
-/* This checks if the "changed" field is set, and if so it prompts to save
-   the changes using a "Save/Discard/Cancel" modal dialog. It then saves the
-   changes if requested. It returns TRUE if the dialog should now be closed. */
-static gboolean
-prompt_to_save_changes		(TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	switch (save_component_dialog (GTK_WINDOW (priv->app))) {
-	case 0: /* Save */
-		/* FIXME: If an error occurs here, we should popup a dialog
-		   and then return FALSE. */
-		save_todo_object (tedit);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-		break;
-	}
-
-}
-
-static void
-categories_clicked(GtkWidget *button, TaskEditor *tedit)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry;
-
-	entry = ((TaskEditorPrivate *)tedit->priv)->categories;
-	categories = e_utf8_gtk_entry_get_text (GTK_ENTRY (entry));
-
-	dialog = GNOME_DIALOG (e_categories_new (categories));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-
-	if (result == 0) {
-		gtk_object_get (GTK_OBJECT (dialog),
-				"categories", &categories,
-				NULL);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), categories);
-		g_free (categories);
-	}
-	gtk_object_destroy (GTK_OBJECT (dialog));
-}
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index 7327803a72..0000000000
--- a/calendar/gui/dialogs/task-editor.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 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _TASK_EDITOR_H_
-#define _TASK_EDITOR_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <bonobo.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define TASK_EDITOR(obj)          GTK_CHECK_CAST (obj, task_editor_get_type (), TaskEditor)
-#define TASK_EDITOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, task_editor_get_type (), TaskEditorClass)
-#define IS_TASK_EDITOR(obj)       GTK_CHECK_TYPE (obj, task_editor_get_type ())
-
-
-typedef struct _TaskEditor       TaskEditor;
-typedef struct _TaskEditorClass  TaskEditorClass;
-
-struct _TaskEditor
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _TaskEditorClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType     task_editor_get_type        (void);
-TaskEditor* task_editor_construct       (TaskEditor   *tedit);
-TaskEditor* task_editor_new             (void);
-void        task_editor_set_cal_client  (TaskEditor   *tedit,
-					 CalClient    *client);
-void        task_editor_set_todo_object (TaskEditor   *tedit,
-					 CalComponent *comp);
-void        task_editor_focus           (TaskEditor   *tedit);
-
-
-
-END_GNOME_DECLS
-
-#endif /* _TASK_EDITOR_H_ */
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
deleted file mode 100644
index ae7ea9681a..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,695 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomeDock:contents</child_name>
-    <name>notebook1</name>
-    <border_width>2</border_width>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table3</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label3</name>
-	  <label>Su_mmary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>summary</default_focus_target>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>summary</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame2</name>
-	<label>Date &amp; Time</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>description</name>
-	  <height>80</height>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame23</name>
-	<label>Progress</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-Undefined
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label9</name>
-	    <label>% Comp_lete:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>percent-complete</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>percent-complete</name>
-	    <width>60</width>
-	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>0</digits>
-	    <numeric>False</numeric>
-	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>100</upper>
-	    <step>10</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame24</name>
-	<label>Classification</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox6</name>
-	  <border_width>2</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-public</name>
-	    <can_focus>True</can_focus>
-	    <label>Pu_blic</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-private</name>
-	    <can_focus>True</can_focus>
-	    <label>Pri_vate</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-confidential</name>
-	    <can_focus>True</can_focus>
-	    <label>_Confidential</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>contacts-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label16</name>
-	    <label>_Contacts...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>contacts</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>categories-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label17</name>
-	    <label>Ca_tegories...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>categories</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label1</name>
-      <label>Task</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table4</name>
-      <border_width>4</border_width>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>2</row_spacing>
-      <column_spacing>4</column_spacing>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label12</name>
-	<label>Date Completed:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label14</name>
-	<label>URL:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>url</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>completed-date</name>
-	<creation_function>task_editor_create_date_edit</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label2</name>
-      <label>Details</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index ba3d1dedb3..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendarTable - displays the CalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include "e-calendar-table.h"
-#include "calendar-model.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/task-editor.h"
-
-/* Pixmaps. */
-#include "task.xpm"
-#include "task-recurring.xpm"
-#include "task-assigned.xpm"
-#include "task-assigned-to.xpm"
-
-#include "check-filled.xpm"
-
-
-static void e_calendar_table_class_init		(ECalendarTableClass *class);
-static void e_calendar_table_init		(ECalendarTable	*cal_table);
-static void e_calendar_table_destroy		(GtkObject	*object);
-
-static void e_calendar_table_on_double_click	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEvent	*event,
-						 ECalendarTable *cal_table);
-static gint e_calendar_table_on_right_click	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEventButton *event,
-						 ECalendarTable *cal_table);
-static void e_calendar_table_on_open_task	(GtkWidget	*menuitem,
-						 gpointer	 data);
-static void e_calendar_table_on_mark_task_complete (GtkWidget	*menuitem,
-						    gpointer	 data);
-static void e_calendar_table_on_delete_task	(GtkWidget	*menuitem,
-						 gpointer	 data);
-static gint e_calendar_table_on_key_press	(ETable		*table,
-						 gint		 row,
-						 gint		 col,
-						 GdkEventKey	*event,
-						 ECalendarTable *cal_table);
-
-static void e_calendar_table_open_task		(ECalendarTable *cal_table,
-						 gint		 row);
-
-static void e_calendar_table_apply_filter	(ECalendarTable	*cal_table);
-static void e_calendar_table_on_model_changed	(ETableModel	*model,
-						 ECalendarTable	*cal_table);
-static void e_calendar_table_on_row_inserted	(ETableModel	*model,
-						 gint		 row,
-						 ECalendarTable	*cal_table);
-static void e_calendar_table_on_row_deleted	(ETableModel	*model,
-						 gint		 row,
-						 ECalendarTable	*cal_table);
-
-
-/* The icons to represent the task. */
-#define E_CALENDAR_MODEL_NUM_ICONS	4
-static char** icon_xpm_data[E_CALENDAR_MODEL_NUM_ICONS] = {
-	task_xpm, task_recurring_xpm, task_assigned_xpm, task_assigned_to_xpm
-};
-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_calendar_table_get_type (void)
-{
-	static GtkType e_calendar_table_type = 0;
-
-	if (!e_calendar_table_type){
-		GtkTypeInfo e_calendar_table_info = {
-			"ECalendarTable",
-			sizeof (ECalendarTable),
-			sizeof (ECalendarTableClass),
-			(GtkClassInitFunc) e_calendar_table_class_init,
-			(GtkObjectInitFunc) e_calendar_table_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_calendar_table_type = gtk_type_unique (GTK_TYPE_TABLE,
-							 &e_calendar_table_info);
-	}
-
-	return e_calendar_table_type;
-}
-
-
-static void
-e_calendar_table_class_init (ECalendarTableClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_calendar_table_destroy;
-
-#if 0
-	widget_class->realize		= e_calendar_table_realize;
-	widget_class->unrealize		= e_calendar_table_unrealize;
-	widget_class->style_set		= e_calendar_table_style_set;
- 	widget_class->size_allocate	= e_calendar_table_size_allocate;
-	widget_class->focus_in_event	= e_calendar_table_focus_in;
-	widget_class->focus_out_event	= e_calendar_table_focus_out;
-	widget_class->key_press_event	= e_calendar_table_key_press;
-#endif
-}
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("Categories"),
-	N_("Classification"),
-	N_("Completion Date"),
-	N_("End Date"),
-	N_("Start Date"),
-	N_("Due Date"),
-	N_("Geographical Position"),
-	N_("Precent complete"),
-	N_("Priority"),
-	N_("Summary"),
-	N_("Transparency"),
-	N_("URL"),
-	N_("Alarms"),
-	N_("Click here to add a task")
-};
-#endif
-
-#define E_CALENDAR_TABLE_SPEC						\
-	"<ETableSpecification click-to-add=\"true\" "			\
-	" _click-to-add-message=\"Click here to add a task\" "		\
-	" draw-grid=\"true\">"						\
-        "  <ETableColumn model_col= \"0\" _title=\"Categories\" "	\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"1\" _title=\"Classification\" "	\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"2\" _title=\"Completion Date\" "	\
-	"   expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"3\" _title=\"End Date\" "		\
-	"   expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"4\" _title=\"Start Date\" "	\
-	"   expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"5\" _title=\"Due Date\" "		\
-	"   expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"6\" _title=\"Geographical Position\" " \
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"7\" _title=\"% Complete\" "	\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"8\" _title=\"Priority\" "		\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col= \"9\" _title=\"Summary\" "		\
-	"   expansion=\"3.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"  compare=\"string\"/>"			\
-        "  <ETableColumn model_col=\"10\" _title=\"Transparency\" "	\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col=\"11\" _title=\"URL\" "		\
-	"   expansion=\"2.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col=\"12\" _title=\"Alarms\" "		\
-	"   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" "	\
-	"   cell=\"calstring\"   compare=\"string\"/>"			\
-        "  <ETableColumn model_col=\"13\" pixbuf=\"icon\" _title=\"Type\" "\
-	"   expansion=\"1.0\" minimum_width=\"16\" resizable=\"false\" "\
-	"   cell=\"icon\"     compare=\"integer\"/>"			\
-        "  <ETableColumn model_col=\"14\" pixbuf=\"complete\" _title=\"Compelete\" " \
-	"   expansion=\"1.0\" minimum_width=\"16\" resizable=\"false\" "\
-	"   cell=\"checkbox\" compare=\"integer\"/>"			\
-	"  <ETableState>"						\
-	"    <column source=\"13\"/>"					\
-	"    <column source=\"14\"/>"					\
-	"    <column source= \"9\"/>"					\
-	"    <grouping></grouping>"					\
-	"  </ETableState>"						\
-	"</ETableSpecification>"
-
-static void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETable *e_table;
-	ECell *cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_TABLE_COLOR_LAST];
-	gint nfailed;
-
-	/* Allocate the colors we need. */
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal_table));
-
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].red   = 65535;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].green = 0;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, cal_table->colors,
-					     E_CALENDAR_TABLE_COLOR_LAST,
-					     FALSE, TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-	/* Create the model */
-
-	cal_table->model = calendar_model_new ();
-	cal_table->subset_model = e_table_subset_variable_new (E_TABLE_MODEL (cal_table->model));
-
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_changed",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_model_changed),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_row_inserted",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_row_inserted),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (cal_table->model), "model_row_deleted",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_row_deleted),
-			    cal_table);
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,
-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,
-			"color_column", CAL_COMPONENT_FIELD_COLOR,
-			NULL);
-	e_table_extras_add_cell (extras, "calstring", cell);
-
-	/* Create pixmaps */
-
-	if (!icon_pixbufs[0])
-		for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) {
-			icon_pixbufs[i] = gdk_pixbuf_new_from_xpm_data (
-				(const char **) icon_xpm_data[i]);
-		}
-
-	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);
-	e_table_extras_add_cell(extras, "icon", cell);
-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
-
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) check_filled_xpm);
-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
-
-	/* Create the table */
-
-	table = e_table_scrolled_new (cal_table->subset_model, extras,
-				      E_CALENDAR_TABLE_SPEC, NULL);
-	gtk_object_unref (GTK_OBJECT (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));
-	gtk_signal_connect (GTK_OBJECT (e_table), "double_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "right_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (e_table), "key_press",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),
-			    cal_table);
-}
-
-
-/**
- * e_calendar_table_new:
- * @Returns: a new #ECalendarTable.
- *
- * Creates a new #ECalendarTable.
- **/
-GtkWidget *
-e_calendar_table_new (void)
-{
-	GtkWidget *cal_table;
-
-	cal_table = GTK_WIDGET (gtk_type_new (e_calendar_table_get_type ()));
-
-	return cal_table;
-}
-
-
-/**
- * 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.
- **/
-CalendarModel *
-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);
-
-	gtk_object_unref (GTK_OBJECT (cal_table->model));
-	cal_table->model = NULL;
-
-	gtk_object_unref (GTK_OBJECT (cal_table->subset_model));
-	cal_table->subset_model = NULL;
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-void
-e_calendar_table_set_cal_client (ECalendarTable *cal_table,
-				 CalClient	*client)
-{
-	calendar_model_set_cal_client (cal_table->model, client,
-				       CALOBJ_TYPE_TODO);
-}
-
-
-static void
-e_calendar_table_on_double_click (ETable *table,
-				  gint row, 
-				  gint col,
-				  GdkEvent *event,
-				  ECalendarTable *cal_table)
-{
-	g_print ("In e_calendar_table_on_double_click\n");
-
-	e_calendar_table_open_task (cal_table, row);
-}
-
-
-static GnomeUIInfo e_calendar_table_popup_uiinfo[] = {
-	{ GNOME_APP_UI_ITEM, N_("Mark Complete"),
-	  N_("Mark the task complete"), e_calendar_table_on_mark_task_complete,
-	  NULL, NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, N_("Edit this task..."),
-	  N_("Edit the task"), e_calendar_table_on_open_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Delete this task"),
-	  N_("Delete the task"), e_calendar_table_on_delete_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_END
-};
-
-
-typedef struct _ECalendarMenuData ECalendarMenuData;
-struct _ECalendarMenuData {
-	ECalendarTable *cal_table;
-	gint row;
-};
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEventButton *event,
-				 ECalendarTable *cal_table)
-{
-	ECalendarMenuData menu_data;
-	GtkWidget *popup_menu;
-
-	menu_data.cal_table = cal_table;
-	menu_data.row = row;
-
-	popup_menu = gnome_popup_menu_new (e_calendar_table_popup_uiinfo);
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event,
-					 &menu_data);
-
-	gtk_widget_destroy (popup_menu);
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_table_on_open_task (GtkWidget *menuitem,
-			       gpointer	  data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	e_calendar_table_open_task (menu_data->cal_table,
-				    menu_data->row);
-}
-
-
-static void
-e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,
-					gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	calendar_model_mark_task_complete (menu_data->cal_table->model,
-					   menu_data->row);
-}
-
-
-/* Deletes a component from the table */
-static void
-delete_component (CalendarModel *model, int row, GtkWidget *widget)
-{
-	CalComponent *comp;
-
-	comp = calendar_model_get_component (model, row);
-
-	if (delete_component_dialog (comp, widget)) {
-		CalClient *client;
-		const char *uid;
-
-		client = calendar_model_get_cal_client (model);
-		cal_component_get_uid (comp, &uid);
-
-		/* We don't check the return value; FALSE can mean the object
-		 * was not in the server anyways.
-		 */
-		cal_client_remove_object (client, uid);
-	}
-}
-
-static void
-e_calendar_table_on_delete_task (GtkWidget *menuitem,
-				 gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	delete_component (menu_data->cal_table->model, menu_data->row, menuitem);
-}
-
-
-
-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_component (cal_table->model, row, GTK_WIDGET (table));
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_calendar_table_open_task (ECalendarTable *cal_table,
-			    gint row)
-{
-	TaskEditor *tedit;
-	CalComponent *comp;
-
-	tedit = task_editor_new ();
-	task_editor_set_cal_client (tedit, calendar_model_get_cal_client (cal_table->model));
-
-	comp = calendar_model_get_component (cal_table->model, row);
-	task_editor_set_todo_object (tedit, comp);
-
-	task_editor_focus (tedit);
-}
-
-
-/* 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);
-}
-
-
-void
-e_calendar_table_set_filter_func	(ECalendarTable *cal_table,
-					 ECalendarTableFilterFunc filter_func,
-					 gpointer	 filter_data,
-					 GDestroyNotify  filter_data_destroy)
-{
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (cal_table->filter_func == filter_func
-	    && cal_table->filter_data == filter_data
-	    && cal_table->filter_data_destroy == filter_data_destroy)
-		return;
-
-	if (cal_table->filter_data_destroy)
-		(*cal_table->filter_data_destroy) (cal_table->filter_data);
-
-	cal_table->filter_func = filter_func;
-	cal_table->filter_data = filter_data;
-	cal_table->filter_data_destroy = filter_data_destroy;
-
-	e_calendar_table_apply_filter (cal_table);
-}
-
-
-static void
-e_calendar_table_apply_filter		(ECalendarTable	*cal_table)
-{
-	ETableSubsetVariable *etssv;
-	CalComponent *comp;
-	gint rows, row;
-
-	etssv = E_TABLE_SUBSET_VARIABLE (cal_table->subset_model);
-
-	/* Make sure that any edits get saved first. */
-	e_table_model_pre_change (cal_table->subset_model);
-
-	/* FIXME: A hack to remove all the existing rows quickly. */
-	E_TABLE_SUBSET (cal_table->subset_model)->n_map = 0;
-
-	if (cal_table->filter_func == NULL) {
-		e_table_subset_variable_add_all (etssv);
-	} else {
-		rows = e_table_model_row_count (E_TABLE_MODEL (cal_table->model));
-		for (row = 0; row < rows; row++) {
-			comp = calendar_model_get_component (cal_table->model,
-							     row);
-
-			if ((*cal_table->filter_func) (cal_table, comp,
-						       cal_table->filter_data))
-				e_table_subset_variable_add (etssv, row);
-		}
-	}
-
-	e_table_model_changed (cal_table->subset_model);
-}
-
-
-gboolean
-e_calendar_table_filter_by_category  (ECalendarTable	*cal_table,
-				      CalComponent	*comp,
-				      gpointer		 filter_data)
-{
-	GSList *categories_list, *elem;
-	gboolean retval = FALSE;
-
-	cal_component_get_categories_list (comp, &categories_list);
-
-	for (elem = categories_list; elem; elem = elem->next) {
-		if (retval == FALSE
-		    && !strcmp ((char*) elem->data, (char*) filter_data))
-			retval = TRUE;
-		g_free (elem->data);
-	}
-
-	g_slist_free (categories_list);
-
-	return retval;
-}
-
-
-static void
-e_calendar_table_on_model_changed	(ETableModel	*model,
-					 ECalendarTable	*cal_table)
-{
-	e_calendar_table_apply_filter (cal_table);
-}
-
-
-static void
-e_calendar_table_on_row_inserted	(ETableModel	*model,
-					 gint		 row,
-					 ECalendarTable	*cal_table)
-{
-	ETableSubsetVariable *etssv;
-	CalComponent *comp;
-	gboolean add_row = FALSE;
-
-	etssv = E_TABLE_SUBSET_VARIABLE (cal_table->subset_model);
-
-	if (cal_table->filter_func == NULL) {
-		add_row = TRUE;
-	} else {
-		comp = calendar_model_get_component (cal_table->model, row);
-
-		if ((*cal_table->filter_func) (cal_table, comp,
-					       cal_table->filter_data))
-			add_row = TRUE;
-	}
-
-	if (add_row) {
-		e_table_subset_variable_increment (etssv, row, 1);
-		e_table_subset_variable_add (etssv, row);
-	}
-}
-
-
-static void
-e_calendar_table_on_row_deleted		(ETableModel	*model,
-					 gint		 row,
-					 ECalendarTable	*cal_table)
-{
-	/* We just reapply the filter since we aren't too bothered about
-	   being efficient. It doesn't happen often. */
-	e_calendar_table_apply_filter (cal_table);
-}
-
-const gchar *
-e_calendar_table_get_spec (void)
-{
-	return E_CALENDAR_TABLE_SPEC;
-}
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index 89a57552b3..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Helix Code, Inc.
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_TABLE_H_
-#define _E_CALENDAR_TABLE_H_
-
-#include <gtk/gtktable.h>
-#include "calendar-model.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendarTable - displays the iCalendar objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_TABLE_COLOR_OVERDUE,
-	
-	E_CALENDAR_TABLE_COLOR_LAST
-} ECalendarTableColors;
-
-
-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())
-
-
-typedef struct _ECalendarTable       ECalendarTable;
-typedef struct _ECalendarTableClass  ECalendarTableClass;
-
-
-typedef gboolean (*ECalendarTableFilterFunc)	(ECalendarTable *cal_table,
-						 CalComponent   *comp,
-						 gpointer	 data);
-
-struct _ECalendarTable
-{
-	GtkTable table;
-
-	/* This is the underlying model which contains all the tasks/events. */
-	CalendarModel *model;
-
-	/* This is the model that we use when filtering the tasks/events. */
-	ETableModel *subset_model;
-	
-	GtkWidget *etable;
-	
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];
-
-	/* Data for filtering the Tasks. */
-	ECalendarTableFilterFunc filter_func;
-	gpointer filter_data;
-	GDestroyNotify filter_data_destroy;
-};
-
-struct _ECalendarTableClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_calendar_table_get_type		(void);
-GtkWidget* e_calendar_table_new			(void);
-
-CalendarModel *e_calendar_table_get_model	(ECalendarTable *cal_table);
-
-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,
-						 CalClient	*client);
-
-/* 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_filter_func	(ECalendarTable *cal_table,
-						 ECalendarTableFilterFunc filter_func,
-						 gpointer	 filter_data,
-						 GDestroyNotify  filter_data_destroy);
-gboolean   e_calendar_table_filter_by_category  (ECalendarTable *cal_table,
-						 CalComponent	*comp,
-						 gpointer	 filter_data);
-
-const gchar *e_calendar_table_get_spec (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
deleted file mode 100644
index 3cab1f1a05..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#include <config.h>
-#include "e-day-view-main-item.h"
-
-static void e_day_view_main_item_class_init (EDayViewMainItemClass *class);
-static void e_day_view_main_item_init (EDayViewMainItem *dvtitem);
-
-static void e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg,
-					  guint arg_id);
-static void e_day_view_main_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_main_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_main_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_main_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-
-static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-							    GdkDrawable *drawable,
-							    int x,
-							    int y,
-							    int width,
-							    int height);
-static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-						       GdkDrawable *drawable,
-						       int x, int y,
-						       int width, int height,
-						       gint day);
-static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-						  GdkDrawable *drawable,
-						  int x, int y,
-						  int width, int height,
-						  gint day);
-static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-						 GdkDrawable *drawable,
-						 int x, int y,
-						 int width, int height,
-						 gint day, gint event_num);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_main_item_get_type (void)
-{
-	static GtkType e_day_view_main_item_type = 0;
-
-	if (!e_day_view_main_item_type) {
-		GtkTypeInfo e_day_view_main_item_info = {
-			"EDayViewMainItem",
-			sizeof (EDayViewMainItem),
-			sizeof (EDayViewMainItemClass),
-			(GtkClassInitFunc) e_day_view_main_item_class_init,
-			(GtkObjectInitFunc) e_day_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_main_item_info);
-	}
-
-	return e_day_view_main_item_type;
-}
-
-
-static void
-e_day_view_main_item_class_init (EDayViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewMainItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_main_item_update;
-	item_class->draw        = e_day_view_main_item_draw;
-	item_class->point       = e_day_view_main_item_point;
-	item_class->event       = e_day_view_main_item_event;
-}
-
-
-static void
-e_day_view_main_item_init (EDayViewMainItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewMainItem *dvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_main_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
-			   int x, int y, int width, int height)
-{
-	EDayViewMainItem *dvmitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	GdkFont *font;
-	gint row, row_y, grid_x1, grid_x2;
-	gint day, grid_y1, grid_y2;
-	gint work_day_start_row, work_day_end_row;
-	gint work_day_start_y, work_day_end_y;
-	gint day_x, day_w, work_day;
-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (canvas_item);
-	day_view = dvmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-
-	/* Paint the background colors. */
-	gc = day_view->main_gc;
-	work_day_start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-	work_day_start_y = work_day_start_row * day_view->row_height - y;
-	work_day_end_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_end_hour, day_view->work_day_end_minute);
-	work_day_end_y = work_day_end_row * day_view->row_height - y;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		work_day = day_view->working_days & (1 << day_start->tm_wday);
-
-		day_x = day_view->day_offsets[day] - x;
-		day_w = day_view->day_widths[day];
-
-		if (work_day) {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0 - y,
-					    day_w, work_day_start_y - (0 - y));
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_start_y,
-					    day_w, work_day_end_y - work_day_start_y);
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_end_y,
-					    day_w, height - work_day_end_y);
-		} else {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0,
-					    day_w, height);
-		}
-	}
-
-	/* Paint the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1
-	    && !day_view->selection_in_top_canvas) {
-		for (day = day_view->selection_start_day;
-		     day <= day_view->selection_end_day;
-		     day++) {
-			if (day == day_view->selection_start_day
-			    && day_view->selection_start_row != -1)
-				start_row = day_view->selection_start_row;
-			else
-				start_row = 0;
-			if (day == day_view->selection_end_day
-			    && day_view->selection_end_row != -1)
-				end_row = day_view->selection_end_row;
-			else
-				end_row = day_view->rows - 1;
-
-			rect_x = day_view->day_offsets[day] - x;
-			rect_width = day_view->day_widths[day];
-			rect_y = start_row * day_view->row_height - y;
-			rect_height = (end_row - start_row + 1) * day_view->row_height;
-
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    rect_x, rect_y,
-					    rect_width, rect_height);
-		}
-	}
-
-	/* Drawing the horizontal grid lines. */
-	grid_x1 = day_view->day_offsets[0] - x;
-	grid_x2 = day_view->day_offsets[day_view->days_shown] - x;
-
-	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;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	grid_x = day_view->day_offsets[day] + 1 - x;
-
-	/* Draw the busy times corresponding to the events in the day. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* We can skip the events in the first column since they will
-		   draw over this anyway. */
-		if (event->num_columns > 0 && event->start_row_or_col == 0)
-			continue;
-
-		bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
-		bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
-		bar_y -= y;
-
-		/* Skip it if it isn't visible. */
-		if (bar_y >= height || bar_y + bar_h <= 0)
-			continue;
-
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    grid_x, bar_y,
-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_h);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-						GdkDrawable *drawable,
-						int x, int y,
-						int width, int height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x;
-	GdkGC *gc;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			continue;
-
-		for (day = start_day; day <= end_day; day++) {
-			grid_x = day_view->day_offsets[day] + 1 - x;
-
-			/* Skip if it isn't visible. */
-			if (grid_x >= width
-			    || grid_x + E_DAY_VIEW_BAR_WIDTH <= 0)
-				continue;
-
-			if (event->start <= day_view->day_starts[day]) {
-				bar_y1 = 0;
-			} else {
-				bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (event->end >= day_view->day_starts[day + 1]) {
-				bar_y2 = height;
-			} else {
-				bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (bar_y1 < height && bar_y2 > 0 && bar_y2 > bar_y1) {
-				gdk_draw_rectangle (drawable, gc, TRUE,
-						    grid_x, bar_y1,
-						    E_DAY_VIEW_BAR_WIDTH - 2,
-						    bar_y2 - bar_y1);
-			}
-		}
-
-
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-				      GdkDrawable *drawable,
-				      int x, int y, int width, int height,
-				      gint day)
-{
-	EDayView *day_view;
-	gint event_num;
-
-	day_view = dvmitem->day_view;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_main_item_draw_day_event (dvmitem, drawable,
-						     x, y, width, height,
-						     day, event_num);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-				     GdkDrawable *drawable,
-				     int x, int y, int width, int height,
-				     gint day, gint event_num)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
-	GtkStyle *style;
-	GdkGC *gc;
-	CalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
-	gint max_icon_w, max_icon_h;
-	gboolean draw_reminder_icon, draw_recurrence_icon;
-
-	day_view = dvmitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == day
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	style = GTK_WIDGET (day_view)->style;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	/* Get the position of the event. If it is not shown skip it.*/
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h))
-		return;
-
-	item_x -= x;
-	item_y -= y;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Fill in the white background. Note that for events in the first
-	   column of the day, we might not want to paint over the vertical bar,
-	   since that is used for multiple events. But then you can't see
-	   where the event in the first column finishes. */
-#if 0
-	if (event->start_row_or_col == 0)
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + E_DAY_VIEW_BAR_WIDTH, item_y + 1,
-				    MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1, 0),
-				    item_h - 2);
-	else
-#endif
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + 1, item_y + 1,
-				    MAX (item_w - 2, 0), item_h - 2);
-
-	/* Draw the right edge of the vertical bar. */
-	gdk_draw_line (drawable, style->black_gc,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + 1,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + item_h - 2);
-
-	/* Draw the vertical colored bar showing when the appointment
-	   begins & ends. */
-	bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-	bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-
-	/* When an item is being resized, we fill the bar up to the new row. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			bar_y1 = item_y + 1;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			bar_y2 = item_y + item_h - 1;
-	}
-
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    item_x + 1, bar_y1,
-			    E_DAY_VIEW_BAR_WIDTH - 2, bar_y2 - bar_y1);
-
-	/* Draw the box around the entire event. Do this after drawing
-	   the colored bar so we don't have to worry about being 1
-	   pixel out. */
-	gdk_draw_rectangle (drawable, style->black_gc, FALSE,
-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);
-
-#if 0
-	/* Draw the horizontal bars above and beneath the event if it
-	   is currently being edited. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num) {
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x,
-				    item_y - E_DAY_VIEW_BAR_HEIGHT,
-				    item_w,
-				    E_DAY_VIEW_BAR_HEIGHT);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x, item_y + item_h,
-				    item_w, E_DAY_VIEW_BAR_HEIGHT);
-	}
-#endif
-
-	/* Draw the reminder & recurrence icons, if needed. */
-	num_icons = 0;
-	draw_reminder_icon = FALSE;
-	draw_recurrence_icon = FALSE;
-	icon_x = item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_y = item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		+ E_DAY_VIEW_ICON_Y_PAD;
-	comp = event->comp;
-
-	if (cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	if (num_icons != 0) {
-		if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD)
-		    * num_icons) {
-			icon_x_inc = 0;
-			icon_y_inc = E_DAY_VIEW_ICON_HEIGHT
-				+ E_DAY_VIEW_ICON_Y_PAD;
-		} else {
-			icon_x_inc = E_DAY_VIEW_ICON_WIDTH
-				+ E_DAY_VIEW_ICON_X_PAD;
-			icon_y_inc = 0;
-		}
-
-		if (draw_reminder_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->reminder_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-		if (draw_recurrence_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->recurrence_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-		}
-		gdk_gc_set_clip_mask (gc, NULL);
-	}
-}
-
-
-/* This is supposed to return the nearest item to the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewMainItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_MAIN_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
deleted file mode 100644
index cb9e2589d8..0000000000
--- a/calendar/gui/e-day-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, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_MAIN_ITEM_H_
-#define _E_DAY_VIEW_MAIN_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#define E_DAY_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_main_item_get_type (), EDayViewMainItem))
-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_main_item_get_type ()))
-#define E_IS_DAY_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewMainItemClass;
-
-
-GtkType  e_day_view_main_item_get_type      (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
deleted file mode 100644
index 854d3cb34f..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,657 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#include <config.h>
-#include <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_class_init (EDayViewTimeItemClass *class);
-static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_set_arg (GtkObject *o,
-					  GtkArg *arg,
-					  guint arg_id);
-
-static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_time_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_time_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_time_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-static void e_day_view_time_item_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);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_time_item_get_type (void)
-{
-	static GtkType e_day_view_time_item_type = 0;
-
-	if (!e_day_view_time_item_type) {
-		GtkTypeInfo e_day_view_time_item_info = {
-			"EDayViewTimeItem",
-			sizeof (EDayViewTimeItem),
-			sizeof (EDayViewTimeItemClass),
-			(GtkClassInitFunc) e_day_view_time_item_class_init,
-			(GtkObjectInitFunc) e_day_view_time_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_time_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_time_item_info);
-	}
-
-	return e_day_view_time_item_type;
-}
-
-
-static void
-e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTimeItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_time_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_time_item_update;
-	item_class->draw        = e_day_view_time_item_draw;
-	item_class->point       = e_day_view_time_item_point;
-	item_class->event       = e_day_view_time_item_event;
-}
-
-
-static void
-e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
-{
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTimeItem *dvtmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_time_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/* Returns the minimum width needed for the column, by adding up all the
-   maximum widths of the strings. The string widths are all calculated in
-   the style_set handlers of EDayView and EDayViewTimeCanvas. */
-gint
-e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkFont *small_font, *large_font;
-	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;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, 0);
-
-	style = GTK_WIDGET (day_view)->style;
-	g_return_val_if_fail (style != NULL, 0);
-	small_font = style->font;
-	g_return_val_if_fail (small_font != NULL, 0);
-	large_font = day_view->large_font;
-	g_return_val_if_fail (large_font != NULL, 0);
-
-	for (digit = '0'; digit <= '9'; digit++) {
-		large_digit_width = gdk_char_width (large_font, digit);
-		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;
-	GdkFont *small_font, *large_font;
-	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;
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	small_font = style->font;
-	large_font = day_view->large_font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	/* 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 = large_font->ascent + E_DVTMI_LARGE_HOUR_Y_PAD;
-
-	/* The offset of the small time/minute string from top of row. */
-	small_font_y_offset = small_font->ascent + 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,
-			   large_hour_y_offset + large_font->descent);
-
-	/* 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 (day_view->use_24_hour_format) {
-				g_snprintf (buffer, sizeof (buffer), "%i:%02i",
-					    display_hour, minute);
-			} else {
-				g_snprintf (buffer, sizeof (buffer), "%i %s",
-					    display_hour, suffix);
-			}
-			minute_width = gdk_string_width (small_font, buffer);
-			gdk_draw_string (drawable, small_font, fg_gc,
-					 minute_x2 - minute_width,
-					 row_y + small_font_y_offset,
-					 buffer);
-		} 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);
-				hour_width = gdk_string_width (large_font,
-							       buffer);
-				gdk_draw_string (drawable, large_font, fg_gc,
-						 large_hour_x2 - hour_width,
-						 row_y + large_hour_y_offset,
-						 buffer);
-			} 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
-				    && !day_view->use_24_hour_format) {
-					strcpy (buffer, suffix);
-				} else {
-					g_snprintf (buffer, sizeof (buffer),
-						    "%02i", minute);
-				}
-				minute_width = gdk_string_width (small_font,
-								 buffer);
-				gdk_draw_string (drawable, small_font, fg_gc,
-						 minute_x2 - minute_width,
-						 row_y + small_font_y_offset,
-						 buffer);
-			}
-		}
-
-		e_day_view_time_item_increment_time (&hour, &minute,
-						     day_view->mins_per_row);
-	}
-}
-
-
-/* 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_hide (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);
-
-		gtk_object_set_data (GTK_OBJECT (item), "divisions",
-				     GINT_TO_POINTER (divisions[i]));
-
-		gtk_signal_connect (GTK_OBJECT (item), "toggled",
-				    e_day_view_time_item_on_set_divisions,
-				    dvtmitem);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-			event->button.button, event->button.time);
-}
-
-
-static void
-e_day_view_time_item_on_set_divisions (GtkWidget *item,
-				       EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-	gint divisions;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (!GTK_CHECK_MENU_ITEM (item)->active)
-		return;
-
-	divisions = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item),
-							  "divisions"));
-	e_day_view_set_mins_per_row (day_view, divisions);
-	calendar_config_set_time_divisions (divisions);
-}
-
-
-static void
-e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem,
-							    event->button.y);
-
-	if (row == -1)
-		return;
-
-	if (!GTK_WIDGET_HAS_FOCUS (day_view))
-		gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)->bin_window, FALSE,
-			      GDK_POINTER_MOTION_MASK
-			      | GDK_BUTTON_RELEASE_MASK,
-			      FALSE, NULL, event->button.time) == 0) {
-		e_day_view_start_selection (day_view, -1, row);
-		dvtmitem->dragging_selection = TRUE;
-	}
-}
-
-
-static void
-e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-					GdkEvent *event)
-{
-	EDayView *day_view;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (dvtmitem->dragging_selection) {
-		gdk_pointer_ungrab (event->button.time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	}
-
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-				       GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gdouble window_y;
-	gint y, row;
-
-	if (!dvtmitem->dragging_selection)
-		return;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	y = event->motion.y;
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem, y);
-
-	if (row != -1) {
-		gnome_canvas_world_to_window (canvas, 0, event->motion.y,
-					      NULL, &window_y);
-		e_day_view_update_selection (day_view, -1, row);
-		e_day_view_check_auto_scroll (day_view, -1, (gint) window_y);
-	}
-}
-
-
-/* Returns the row corresponding to the y position, or -1. */
-static gint
-e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-					      gint y)
-{
-	EDayView *day_view;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, -1);
-
-	if (y < 0)
-		return -1;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return -1;
-
-	return row;
-}
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
deleted file mode 100644
index 972f01e1b5..0000000000
--- a/calendar/gui/e-day-view-time-item.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TIME_ITEM_H_
-#define _E_DAY_VIEW_TIME_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#define E_DAY_VIEW_TIME_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_time_item_get_type (), EDayViewTimeItem))
-#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_time_item_get_type ()))
-#define E_IS_DAY_VIEW_TIME_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_time_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-
-	/* The width of the time column. */
-	gint column_width;
-
-	/* TRUE if we are currently dragging the selection times. */
-	gboolean dragging_selection;
-} EDayViewTimeItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTimeItemClass;
-
-
-GtkType  e_day_view_time_item_get_type      (void);
-
-
-gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
deleted file mode 100644
index 8995832399..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#include <config.h>
-#include "e-day-view-top-item.h"
-
-static void e_day_view_top_item_class_init	(EDayViewTopItemClass *class);
-static void e_day_view_top_item_init		(EDayViewTopItem *dvtitem);
-
-static void e_day_view_top_item_set_arg		(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_day_view_top_item_update		(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_day_view_top_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_long_event	(EDayViewTopItem *dvtitem,
-						 gint		  event_num,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,
-						 GdkDrawable	 *drawable,
-						 gint		  x,
-						 gint		  y,
-						 gint		  w,
-						 gint		  h);
-static double e_day_view_top_item_point		(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_top_item_get_type (void)
-{
-	static GtkType e_day_view_top_item_type = 0;
-
-	if (!e_day_view_top_item_type) {
-		GtkTypeInfo e_day_view_top_item_info = {
-			"EDayViewTopItem",
-			sizeof (EDayViewTopItem),
-			sizeof (EDayViewTopItemClass),
-			(GtkClassInitFunc) e_day_view_top_item_class_init,
-			(GtkObjectInitFunc) e_day_view_top_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_top_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_top_item_info);
-	}
-
-	return e_day_view_top_item_type;
-}
-
-
-static void
-e_day_view_top_item_class_init (EDayViewTopItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTopItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_top_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_top_item_update;
-	item_class->draw        = e_day_view_top_item_draw;
-	item_class->point       = e_day_view_top_item_point;
-	item_class->event       = e_day_view_top_item_event;
-}
-
-
-static void
-e_day_view_top_item_init (EDayViewTopItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTopItem *dvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtitem = E_DAY_VIEW_TOP_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_top_item_update (GnomeCanvasItem *item,
-			    double	    *affine,
-			    ArtSVP	    *clip_path,
-			    int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
-			  GdkDrawable	  *drawable,
-			  int		   x,
-			  int		   y,
-			  int		   width,
-			  int		   height)
-{
-	EDayViewTopItem *dvtitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	gchar buffer[128], *format;
-	GdkRectangle clip_rect;
-	GdkFont *font;
-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
-	gint item_height, event_num;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_top_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvtitem = E_DAY_VIEW_TOP_ITEM (canvas_item);
-	day_view = dvtitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	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 + 1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 2 - y,
-		       left_edge + 1 - x, item_height - 1 - y);
-	gdk_draw_line (drawable, dark_gc,
-		       left_edge + 2 - 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++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
-			/* strftime format %A = full weekday name, %d = day of month,
-			   %B = full month name. Don't use any other specifiers. */
-			format = _("%A %d %B");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_ABBREVIATED)
-			/* strftime format %a = abbreviated weekday name, %d = day of month,
-			   %b = abbreviated month name. Don't use any other specifiers. */
-			format = _("%a %d %b");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)
-			/* strftime format %d = day of month, %b = abbreviated month name.
-			   Don't use any other specifiers. */
-			format = _("%d %b");
-		else
-			format = "%d";
-
-		strftime (buffer, sizeof (buffer), format, day_start);
-			
-		clip_rect.x = day_view->day_offsets[day] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = day_view->day_widths[day];
-		clip_rect.height = item_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		date_width = gdk_string_width (font, buffer);
-		date_x = day_view->day_offsets[day] + (day_view->day_widths[day] - date_width) / 2;
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (day != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       day_view->day_offsets[day] - x,
-				       4 - y,
-				       day_view->day_offsets[day] - x,
-				       item_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       day_view->day_offsets[day] - 1 - x,
-				       4 - y,
-				       day_view->day_offsets[day] - 1 - x,
-				       item_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (day != 0) {
-			gdk_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;
-	GdkFont *font;
-	gint start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gint text_x, icon_x, icon_y, icon_x_inc;
-	CalComponent *comp;
-	gchar buffer[16];
-	gint hour, 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;
-
-	day_view = dvtitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h))
-		return;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	gc = day_view->main_gc;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	comp = event->comp;
-
-	/* Draw the lines across the top & bottom of the entire event. */
-	gdk_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. */
-	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_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			draw_start_triangle = FALSE;
-
-		if  (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			draw_end_triangle = FALSE;
-	}
-
-	/* If the event starts before the first day shown, draw a triangle,
-	   else just draw a vertical line down the left. */
-	if (draw_start_triangle
-	    && event->start < day_view->day_starts[start_day]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x - x, item_y - y,
-						   -E_DAY_VIEW_BAR_WIDTH,
-						   item_h);
-	} else {
-		gdk_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);
-	} 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 (day_view->use_24_hour_format) {
-			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;
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 time_x,
-				 item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT
-				 + E_DAY_VIEW_LONG_EVENT_Y_PAD
-				 + font->ascent - y,
-				 buffer);
-
-		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 (day_view->use_24_hour_format) {
-				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;
-
-			gdk_draw_string (drawable, font, fg_gc,
-					 time_x,
-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD
-					 + font->ascent + 1 - y,
-					 buffer);
-
-			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 - 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 && cal_component_has_recurrences (comp)) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-
-	if (icon_x <= max_icon_x && cal_component_has_alarms (comp)) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-	gdk_gc_set_clip_mask (gc, NULL);
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
-				   GdkDrawable	   *drawable,
-				   gint		    x,
-				   gint		    y,
-				   gint		    w,
-				   gint		    h)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	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) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_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;
-}
-
-
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 53db4eda79..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, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TOP_ITEM_H_
-#define _E_DAY_VIEW_TOP_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#define E_DAY_VIEW_TOP_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_top_item_get_type (), EDayViewTopItem))
-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_top_item_get_type ()))
-#define E_IS_DAY_VIEW_TOP_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_top_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewTopItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTopItemClass;
-
-
-GtkType  e_day_view_top_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
deleted file mode 100644
index bbf0732122..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,6582 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <time.h>
-#include <gdk/gdkx.h>
-#include <cal-util/timeutil.h>
-#include "dialogs/delete-comp.h"
-#include "comp-util.h"
-#include "e-day-view.h"
-#include "e-day-view-time-item.h"
-#include "e-day-view-top-item.h"
-#include "e-day-view-main-item.h"
-#include "calendar-commands.h"
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include "e-meeting-edit.h"
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-/* The minimum amount of space wanted on each side of the date string. */
-#define E_DAY_VIEW_DATE_X_PAD	4
-
-#define E_DAY_VIEW_LARGE_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-240-*-*-p-*-iso8859-*"
-#define E_DAY_VIEW_LARGE_FONT_FALLBACK	\
-	"-adobe-helvetica-bold-r-normal-*-*-240-*-*-p-*-iso8859-*"
-
-/* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
-#define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
-
-/* The time between each auto-scroll, in milliseconds. */
-#define E_DAY_VIEW_AUTO_SCROLL_TIMEOUT	50
-
-/* The number of timeouts we skip before we start scrolling. */
-#define E_DAY_VIEW_AUTO_SCROLL_DELAY	5
-
-/* The number of pixels the mouse has to be moved with the button down before
-   we start a drag. */
-#define E_DAY_VIEW_DRAG_START_OFFSET	4
-
-/* 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
-
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_CALENDAR_EVENT
-};
-static GtkTargetEntry target_table[] = {
-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-static void e_day_view_class_init (EDayViewClass *class);
-static void e_day_view_init (EDayView *day_view);
-static void e_day_view_destroy (GtkObject *object);
-static void e_day_view_realize (GtkWidget *widget);
-static void e_day_view_unrealize (GtkWidget *widget);
-static void e_day_view_style_set (GtkWidget *widget,
-				  GtkStyle  *previous_style);
-static void e_day_view_size_allocate (GtkWidget *widget,
-				      GtkAllocation *allocation);
-static gboolean e_day_view_update_scroll_regions (EDayView *day_view);
-static gint e_day_view_focus_in (GtkWidget *widget,
-				 GdkEventFocus *event);
-static gint e_day_view_focus_out (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_day_view_key_press (GtkWidget *widget,
-				  GdkEventKey *event);
-static void e_day_view_cursor_key_up_shifted (EDayView *day_view,
-					      GdkEventKey *event);
-static void e_day_view_cursor_key_down_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_left_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_right_shifted (EDayView *day_view,
-						 GdkEventKey *event);
-static void e_day_view_cursor_key_up (EDayView *day_view,
-				      GdkEventKey *event);
-static void e_day_view_cursor_key_down (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_left (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_right (EDayView *day_view,
-					 GdkEventKey *event);
-static void e_day_view_ensure_rows_visible (EDayView *day_view,
-					    gint start_row,
-					    gint end_row);
-static 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_time_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-
-static void e_day_view_update_calendar_selection_time (EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,
-						  GdkEventMotion *event,
-						  EDayView *day_view);
-static gboolean e_day_view_convert_event_coords (EDayView *day_view,
-						 GdkEvent *event,
-						 GdkWindow *window,
-						 gint *x_return,
-						 gint *y_return);
-static void e_day_view_update_long_event_resize (EDayView *day_view,
-						 gint day);
-static void e_day_view_update_resize (EDayView *day_view,
-				      gint row);
-static void e_day_view_finish_long_event_resize (EDayView *day_view);
-static void e_day_view_finish_resize (EDayView *day_view);
-static void e_day_view_abort_resize (EDayView *day_view,
-				     guint32 time);
-
-
-static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,
-						       gint		 event_num,
-						       GdkEventButton	*event,
-						       EDayViewPosition  pos,
-						       gint		 event_x,
-						       gint		 event_y);
-static gboolean e_day_view_on_event_button_press (EDayView	 *day_view,
-						  gint		  day,
-						  gint		  event_num,
-						  GdkEventButton *event,
-						  EDayViewPosition pos,
-						  gint		  event_x,
-						  gint		  event_y);
-static void e_day_view_on_long_event_click (EDayView *day_view,
-					    gint event_num,
-					    GdkEventButton  *bevent,
-					    EDayViewPosition pos,
-					    gint	     event_x,
-					    gint	     event_y);
-static void e_day_view_on_event_click (EDayView *day_view,
-				       gint day,
-				       gint event_num,
-				       GdkEventButton  *event,
-				       EDayViewPosition pos,
-				       gint		event_x,
-				       gint		event_y);
-static void e_day_view_on_event_double_click (EDayView *day_view,
-					      gint day,
-					      gint event_num);
-static void e_day_view_on_event_right_click (EDayView *day_view,
-					     GdkEventButton *bevent,
-					     gint day,
-					     gint event_num);
-
-static void e_day_view_recalc_day_starts (EDayView *day_view,
-					  time_t start_time);
-static void e_day_view_recalc_num_rows	(EDayView	*day_view);
-static void e_day_view_recalc_cell_sizes	(EDayView	*day_view);
-
-static EDayViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-								   gint x,
-								   gint y,
-								   gint *day_return,
-								   gint *event_num_return);
-static EDayViewPosition e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-								    gint x,
-								    gint y,
-								    gint *day_return,
-								    gint *row_return,
-								    gint *event_num_return);
-static gboolean e_day_view_find_event_from_item (EDayView *day_view,
-						 GnomeCanvasItem *item,
-						 gint *day_return,
-						 gint *event_num_return);
-static gboolean e_day_view_find_event_from_uid (EDayView *day_view,
-						const gchar *uid,
-						gint *day_return,
-						gint *event_num_return);
-
-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,
-						   gint day,
-						   gint event_num,
-						   gpointer data);
-
-static void e_day_view_foreach_event		(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_queue_reload_events (EDayView *day_view);
-static gboolean e_day_view_reload_events_idle_cb	(gpointer data);
-static void e_day_view_reload_events (EDayView *day_view);
-static void e_day_view_free_events (EDayView *day_view);
-static void e_day_view_free_event_array (EDayView *day_view,
-					 GArray *array);
-static int e_day_view_add_event (CalComponent *comp,
-				 time_t	  start,
-				 time_t	  end,
-				 gpointer data);
-static void e_day_view_update_event_label (EDayView *day_view,
-					   gint day,
-					   gint event_num);
-static void e_day_view_update_long_event_label (EDayView *day_view,
-						gint event_num);
-
-static void e_day_view_layout_long_events (EDayView *day_view);
-static void e_day_view_layout_long_event (EDayView	   *day_view,
-					  EDayViewEvent *event,
-					  guint8	   *grid);
-static void e_day_view_reshape_long_events (EDayView *day_view);
-static void e_day_view_reshape_long_event (EDayView *day_view,
-					   gint event_num);
-static void e_day_view_layout_day_events (EDayView *day_view,
-					  gint	day);
-static void e_day_view_layout_day_event (EDayView   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid,
-					 guint16   *group_starts);
-static void e_day_view_expand_day_event (EDayView	   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid);
-static void e_day_view_recalc_cols_per_row (EDayView *day_view,
-					    gint      day,
-					    guint16  *group_starts);
-static void e_day_view_reshape_day_events (EDayView *day_view,
-					   gint day);
-static void e_day_view_reshape_day_event (EDayView *day_view,
-					  gint	day,
-					  gint	event_num);
-static void e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view);
-static void e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view);
-static void e_day_view_reshape_resize_rect_item (EDayView *day_view);
-
-static void e_day_view_ensure_events_sorted (EDayView *day_view);
-static gint e_day_view_event_sort_func (const void *arg1,
-					const void *arg2);
-
-static void e_day_view_start_editing_event (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gchar *initial_text);
-static void e_day_view_stop_editing_event (EDayView *day_view);
-static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
-					       GdkEvent *event,
-					       EDayView *day_view);
-static void e_day_view_on_editing_started (EDayView *day_view,
-					   GnomeCanvasItem *item);
-static void e_day_view_on_editing_stopped (EDayView *day_view,
-					   GnomeCanvasItem *item);
-
-static time_t e_day_view_convert_grid_position_to_time (EDayView *day_view,
-							gint col,
-							gint row);
-static gboolean e_day_view_convert_time_to_grid_position (EDayView *day_view,
-							  time_t time,
-							  gint *col,
-							  gint *row);
-
-static void e_day_view_start_auto_scroll (EDayView *day_view,
-					  gboolean scroll_up);
-static gboolean e_day_view_auto_scroll_handler (gpointer data);
-
-static void e_day_view_on_new_appointment (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_edit_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_day_view_on_delete_occurrence (GtkWidget *widget,
-					     gpointer data);
-static void e_day_view_on_delete_appointment (GtkWidget *widget,
-					      gpointer data);
-static void e_day_view_on_schedule_meet (GtkWidget *widget,
-					 gpointer data);
-static void e_day_view_on_unrecur_appointment (GtkWidget *widget,
-					       gpointer data);
-static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
-
-static gint e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  gint            x,
-						  gint            y,
-						  guint           time,
-						  EDayView	  *day_view);
-static void e_day_view_update_top_canvas_drag (EDayView *day_view,
-					       gint day);
-static void e_day_view_reshape_top_canvas_drag_item (EDayView *day_view);
-static gint e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-						   GdkDragContext *context,
-						   gint            x,
-						   gint            y,
-						   guint           time,
-						   EDayView	  *day_view);
-static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view);
-static void e_day_view_update_main_canvas_drag (EDayView *day_view,
-						gint row,
-						gint day);
-static void e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-						 GdkDragContext *context,
-						 guint           time,
-						 EDayView	     *day_view);
-static void e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  guint           time,
-						  EDayView	 *day_view);
-static void e_day_view_on_drag_begin (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      EDayView	   *day_view);
-static void e_day_view_on_drag_end (GtkWidget      *widget,
-				    GdkDragContext *context,
-				    EDayView       *day_view);
-static void e_day_view_on_drag_data_get (GtkWidget          *widget,
-					 GdkDragContext     *context,
-					 GtkSelectionData   *selection_data,
-					 guint               info,
-					 guint               time,
-					 EDayView		*day_view);
-static void e_day_view_on_top_canvas_drag_data_received (GtkWidget	*widget,
-							 GdkDragContext *context,
-							 gint            x,
-							 gint            y,
-							 GtkSelectionData *data,
-							 guint           info,
-							 guint           time,
-							 EDayView	*day_view);
-static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget,
-							  GdkDragContext *context,
-							  gint            x,
-							  gint            y,
-							  GtkSelectionData *data,
-							  guint           info,
-							  guint           time,
-							  EDayView	 *day_view);
-
-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 gboolean e_day_view_set_event_font_cb	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gpointer	 data);
-
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_day_view_get_type (void)
-{
-	static GtkType e_day_view_type = 0;
-
-	if (!e_day_view_type){
-		GtkTypeInfo e_day_view_info = {
-			"EDayView",
-			sizeof (EDayView),
-			sizeof (EDayViewClass),
-			(GtkClassInitFunc) e_day_view_class_init,
-			(GtkObjectInitFunc) e_day_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_day_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						   &e_day_view_info);
-	}
-
-	return e_day_view_type;
-}
-
-
-static void
-e_day_view_class_init (EDayViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_day_view_destroy;
-
-	widget_class->realize		= e_day_view_realize;
-	widget_class->unrealize		= e_day_view_unrealize;
-	widget_class->style_set		= e_day_view_style_set;
- 	widget_class->size_allocate	= e_day_view_size_allocate;
-	widget_class->focus_in_event	= e_day_view_focus_in;
-	widget_class->focus_out_event	= e_day_view_focus_out;
-	widget_class->key_press_event	= e_day_view_key_press;
-}
-
-
-static void
-e_day_view_init (EDayView *day_view)
-{
-	gint day;
-	GnomeCanvasGroup *canvas_group;
-
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
-
-	day_view->calendar = NULL;
-	day_view->client = NULL;
-
-	day_view->long_events = g_array_new (FALSE, FALSE,
-					     sizeof (EDayViewEvent));
-	day_view->long_events_sorted = TRUE;
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-	day_view->reload_events_idle_id = 0;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		day_view->events[day] = g_array_new (FALSE, FALSE,
-						     sizeof (EDayViewEvent));
-		day_view->events_sorted[day] = TRUE;
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	/* These indicate that the times haven't been set. */
-	day_view->lower = 0;
-	day_view->upper = 0;
-
-	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_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-	day_view->selection_is_being_dragged = FALSE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = FALSE;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	day_view->pressed_event_day = -1;
-
-	day_view->drag_event_day = -1;
-	day_view->drag_last_day = -1;
-
-	day_view->auto_scroll_timeout_id = 0;
-
-	/* Create the large font. */
-	day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT);
-	if (!day_view->large_font)
-		day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT_FALLBACK);
-	if (!day_view->large_font)
-		g_warning ("Couldn't load font");
-
-	/* 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);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root);
-
-	day_view->top_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_top_item_get_type (),
-				       "EDayViewTopItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->drag_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-
-	day_view->drag_long_event_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "max_lines", 1,
-				       "editable", TRUE,
-				       "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);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas), "realize",
-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),
-			    day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root);
-
-	day_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_main_item_get_type (),
-				       "EDayViewMainItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-
-	day_view->resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	day_view->main_canvas_top_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-
-	day_view->main_canvas_bottom_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-
-	day_view->drag_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-
-	day_view->drag_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-
-	day_view->drag_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "editable", TRUE,
-				       "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);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->time_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),
-				  day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
-
-	day_view->time_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_time_item_get_type (),
-				       "EDayViewTimeItem::day_view", day_view,
-				       NULL);
-
-
-	/*
-	 * Scrollbar.
-	 */
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	day_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	day_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	day_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	day_view->resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);
-	day_view->last_cursor_set_in_top_canvas = NULL;
-	day_view->last_cursor_set_in_main_canvas = NULL;
-
-	/* Set up the drop sites. */
-	gtk_drag_dest_set (day_view->top_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_day_view_on_canvas_realized (GtkWidget *widget,
-			       EDayView *day_view)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/**
- * e_day_view_new:
- * @Returns: a new #EDayView.
- *
- * Creates a new #EDayView.
- **/
-GtkWidget *
-e_day_view_new (void)
-{
-	GtkWidget *day_view;
-
-	day_view = GTK_WIDGET (gtk_type_new (e_day_view_get_type ()));
-
-	return day_view;
-}
-
-
-static void
-e_day_view_destroy (GtkObject *object)
-{
-	EDayView *day_view;
-	gint day;
-
-	day_view = E_DAY_VIEW (object);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	if (day_view->reload_events_idle_id != 0) {
-		g_source_remove (day_view->reload_events_idle_id);
-		day_view->reload_events_idle_id = 0;
-	}
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-		day_view->client = NULL;
-	}
-
-	if (day_view->large_font)
-		gdk_font_unref (day_view->large_font);
-
-	gdk_cursor_destroy (day_view->normal_cursor);
-	gdk_cursor_destroy (day_view->move_cursor);
-	gdk_cursor_destroy (day_view->resize_width_cursor);
-	gdk_cursor_destroy (day_view->resize_height_cursor);
-
-	e_day_view_free_events (day_view);
-	g_array_free (day_view->long_events, TRUE);
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		g_array_free (day_view->events[day], TRUE);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_day_view_realize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gboolean success[E_DAY_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	day_view = E_DAY_VIEW (widget);
-	day_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 244 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 214 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED].red   = 0 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED].green = 0 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED].blue  = 156 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].red   = 148 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].green = 149 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_GRID].blue  = 148 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].red   = 148 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].green = 149 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].blue  = 148 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].red   = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].green = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].blue  = 0;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red   = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].red   = 213 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].green = 213 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].blue  = 213 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, day_view->colors,
-					     E_DAY_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	day_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->reminder_mask, NULL, bell_xpm);
-	day_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->recurrence_mask, NULL, recur_xpm);
-
-
-
-	/* Set the canvas item colors. */
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-}
-
-
-static void
-e_day_view_unrealize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gint i;
-
-	day_view = E_DAY_VIEW (widget);
-
-	gdk_gc_unref (day_view->main_gc);
-	day_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_DAY_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &day_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (day_view->reminder_icon);
-	day_view->reminder_icon = NULL;
-	gdk_pixmap_unref (day_view->recurrence_icon);
-	day_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_day_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EDayView *day_view;
-	GdkFont *font;
-	gint top_rows, top_canvas_height;
-	gint hour, max_large_hour_width;
-	gint minute, max_minute_width, i;
-	gint month, day, width;
-	gint longest_month_width, longest_abbreviated_month_width;
-	gint longest_weekday_width, longest_abbreviated_weekday_width;
-	struct tm date_tm;
-	gchar buffer[128];
-	gint times_width;
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	day_view = E_DAY_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	day_view->row_height = font->ascent + font->descent + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;
-	day_view->row_height = MAX (day_view->row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);
-	GTK_LAYOUT (day_view->main_canvas)->vadjustment->step_increment = day_view->row_height;
-
-	day_view->top_row_height = font->ascent + font->descent + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	day_view->top_row_height = MAX (day_view->top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	top_rows = MAX (1, day_view->rows_in_top_display);
-	top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-	gtk_widget_set_usize (day_view->top_canvas, -1, top_canvas_height);
-
-	/* Find the longest full & abbreviated month names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mday = 1;
-	date_tm.tm_isdst = -1;
-
-	longest_month_width = 0;
-	longest_abbreviated_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		date_tm.tm_mon = month;
-
-		strftime (buffer, sizeof (buffer), "%B", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_month_width) {
-			longest_month_width = width;
-			day_view->longest_month_name = month;
-		}
-
-		strftime (buffer, sizeof (buffer), "%b", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_month_width) {
-			longest_abbreviated_month_width = width;
-			day_view->longest_abbreviated_month_name = month;
-		}
-	}
-
-	/* Find the longest full & abbreviated weekday names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mon = 0;
-	date_tm.tm_isdst = -1;
-
-	longest_weekday_width = 0;
-	longest_abbreviated_weekday_width = 0;
-	for (day = 0; day < 7; day++) {
-		date_tm.tm_mday = 2 + day;
-		date_tm.tm_wday = day;
-
-		strftime (buffer, sizeof (buffer), "%A", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday_width = width;
-			day_view->longest_weekday_name = day;
-		}
-
-		strftime (buffer, sizeof (buffer), "%a", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_weekday_width) {
-			longest_abbreviated_weekday_width = width;
-			day_view->longest_abbreviated_weekday_name = day;
-		}
-	}
-
-
-	/* Calculate the widths of all the time strings necessary. */
-	day_view->max_small_hour_width = 0;
-	max_large_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		g_snprintf (buffer, sizeof (buffer), "%02i", hour);
-		day_view->small_hour_widths[hour] = gdk_string_width (font, buffer);
-		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);
-		minute_width = gdk_string_width (font, buffer);
-		max_minute_width = MAX (max_minute_width, minute_width);
-	}
-	day_view->max_minute_width = max_minute_width;
-	day_view->colon_width = gdk_string_width (font, ":");
-	day_view->digit_width = gdk_string_width (font, "0");
-
-	day_view->am_string_width = gdk_string_width (font,
-						      day_view->am_string);
-	day_view->pm_string_width = gdk_string_width (font,
-						      day_view->pm_string);
-
-	/* 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);
-
-	/* Set the font of all the EText items. */
-	e_day_view_foreach_event (day_view, e_day_view_set_event_font_cb,
-				  font);
-
-	/* Set the fonts for the text items used when dragging. */
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-}
-
-
-static gboolean
-e_day_view_set_event_font_cb		(EDayView	*day_view,
-					 gint		 day,
-					 gint		 event_num,
-					 gpointer	 data)
-{
-	EDayViewEvent *event;
-	GdkFont *font = data;
-
-	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->canvas_item)
-		gnome_canvas_item_set (event->canvas_item,
-				       "font_gdk", font,
-				       NULL);
-
-	return TRUE;
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EDayView *day_view;
-	gint day, scroll_y;
-	gboolean need_reshape;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-#if 0
-	g_print ("In e_day_view_size_allocate\n");
-#endif
-	day_view = E_DAY_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_day_view_recalc_cell_sizes (day_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->top_canvas->allocation.width - 1;
-	new_y2 = day_view->top_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-						0, 0, new_x2, new_y2);
-
-	need_reshape = e_day_view_update_scroll_regions (day_view);
-
-	/* Scroll to the start of the working day, if this is the initial
-	   allocation. */
-	if (day_view->scroll_to_work_day) {
-		scroll_y = e_day_view_convert_time_to_position (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					0, scroll_y);
-		day_view->scroll_to_work_day = FALSE;
-	}
-
-	/* Flag that we need to reshape the events. Note that changes in height
-	   don't matter, since the rows are always the same height. */
-	if (need_reshape) {
-		day_view->long_events_need_reshape = TRUE;
-		for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-			day_view->need_reshape[day] = TRUE;
-
-		e_day_view_check_layout (day_view);
-	}
-}
-
-
-static void
-e_day_view_recalc_cell_sizes	(EDayView	*day_view)
-{
-	/* An array of dates, one for each month in the year 2000. They must
-	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
-				      23, 20, 17, 22, 19, 24 };
-	gfloat width, offset;
-	gint day, max_width;
-	struct tm date_tm;
-	GdkFont *font;
-	char buffer[128];
-
-	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
-	font = GTK_WIDGET (day_view)->style->font;
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths. */
-	width = day_view->main_canvas->allocation.width;
-	width /= day_view->days_shown;
-	offset = 0;
-	for (day = 0; day <= day_view->days_shown; day++) {
-		day_view->day_offsets[day] = floor (offset + 0.5);
-		offset += width;
-	}
-
-	/* Calculate the days widths based on the offsets. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_view->day_widths[day] = day_view->day_offsets[day + 1] - day_view->day_offsets[day];
-	}
-
-	/* Determine which date format to use, based on the column widths.
-	   We want to check the widths using the longest full or abbreviated
-	   month name and the longest full or abbreviated weekday name, as
-	   appropriate. */
-	max_width = day_view->day_widths[0];
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-
-	/* Try "Thursday 21 January". */
-	date_tm.tm_mon = day_view->longest_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_weekday_name;
-	date_tm.tm_wday = day_view->longest_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %A = full weekday name, %d = day of month,
-	   %B = full month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%A %d %B"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_FULL;
-		return;
-	}
-
-	/* Try "Thu 21 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_wday = day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %a = abbreviated weekday name, %d = day of month,
-	   %b = abbreviated month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%a %d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_ABBREVIATED;
-		return;
-	}
-
-	/* Try "23 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = 23;
-	date_tm.tm_wday = 0;
-	date_tm.tm_isdst = -1;
-	/* strftime format %d = day of month, %b = abbreviated month name.
-	   Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width)
-		day_view->date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;
-	else
-		day_view->date_format = E_DAY_VIEW_DATE_SHORT;
-}
-
-
-static gint
-e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-void
-e_day_view_set_calendar		(EDayView	*day_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->calendar = calendar;
-}
-
-
-/* Callback used when the calendar client finishes opening */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	gint day, event_num;
-
-	g_return_if_fail (E_IS_DAY_VIEW (data));
-
-	day_view = E_DAY_VIEW (data);
-
-	/* Sanity check. */
-	g_return_if_fail (client == day_view->client);
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (day_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-		if (!cal_component_has_recurrences (comp)
-		    && !cal_component_has_recurrences (event->comp)
-		    && cal_component_event_dates_match (comp, event->comp)) {
-#if 0
-			g_print ("updated object's dates unchanged\n");
-#endif
-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, comp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			gtk_widget_queue_draw (day_view->top_canvas);
-			gtk_widget_queue_draw (day_view->main_canvas);
-			return;
-		}
-
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-#if 0
-		g_print ("dates changed - removing occurrences\n");
-#endif
-		e_day_view_foreach_event_with_uid (day_view, uid,
-						   e_day_view_remove_event_cb,
-						   NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	cal_recur_generate_instances (comp, day_view->lower,
-				      day_view->upper,
-				      e_day_view_add_event,
-				      day_view);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_day_view_check_layout (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	e_day_view_foreach_event_with_uid (day_view, uid,
-					   e_day_view_remove_event_cb, NULL);
-
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/**
- * e_day_view_set_cal_client:
- * @day_view: A day view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a day view will monitor.
- **/
-void
-e_day_view_set_cal_client	(EDayView	*day_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (day_view != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (client == day_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-	}
-
-	day_view->client = client;
-
-	if (day_view->client) {
-		if (cal_client_get_load_state (day_view->client) != CAL_CLIENT_LOAD_LOADED)
-			gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), day_view);
-
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), day_view);
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), day_view);
-	}
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-
-static gboolean
-e_day_view_update_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-	CalComponent *comp;
-
-	comp = data;
-#if 0
-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_long_event_label (day_view, event_num);
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-	return TRUE;
-}
-
-
-/* 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);
-
-			cal_component_get_uid (event->comp, &u);
-			if (uid && !strcmp (uid, u)) {
-				if (!(*callback) (day_view, day, event_num,
-						  data))
-					return;
-			}
-		}
-	}
-
-	for (event_num = day_view->long_events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT,
-					  event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_day_view_remove_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-
-#if 0
-	g_print ("In e_day_view_remove_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		day_view->editing_event_day = -1;
-
-	if (event->canvas_item)
-		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		g_array_remove_index (day_view->long_events, event_num);
-		day_view->long_events_need_layout = TRUE;
-	} else {
-		g_array_remove_index (day_view->events[day], event_num);
-		day_view->need_layout[day] = TRUE;
-	}
-	return TRUE;
-}
-
-
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text, *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;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		editing_event = TRUE;
-
-	if (!editing_event
-	    && (event->start_minute % day_view->mins_per_row != 0
-		|| (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 (day_view->use_24_hour_format) {
-			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;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", summary.value ? summary.value : "",
-			       NULL);
-}
-
-
-/* Finds the day and index of the event with the given canvas item.
-   If is is a long event, -1 is returned as the day.
-   Returns TRUE if the event was found. */
-static gboolean
-e_day_view_find_event_from_item (EDayView *day_view,
-				 GnomeCanvasItem *item,
-				 gint *day_return,
-				 gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-			if (event->canvas_item == item) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		if (event->canvas_item == item) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the day and index of the event with the given uid.
-   If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EDayViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_day_view_find_event_from_uid (EDayView *day_view,
-				const gchar *uid,
-				gint *day_return,
-				gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			cal_component_get_uid (event->comp, &u);
-			if (u && !strcmp (uid, u)) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void
-e_day_view_set_selected_time_range	(EDayView	*day_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	time_t lower;
-	gint start_row, start_col, end_row, end_col;
-	gboolean need_redraw = FALSE, start_in_grid, end_in_grid;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	/* Calculate the first day that should be shown, based on start_time
-	   and the days_shown setting. If we are showing 1 day it is just the
-	   start of the day given by start_time, otherwise it is the previous
-	   work-week start day. */
-	if (!day_view->work_week_view) {
-		lower = time_day_begin (start_time);
-	} 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);
-		e_day_view_queue_reload_events (day_view);
-	}
-
-	/* Set the selection. */
-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								  start_time,
-								  &start_col,
-								  &start_row);
-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								end_time - 60,
-								&end_col,
-								&end_row);
-
-	/* If either of the times isn't in the grid, or the selection covers
-	   an entire day, we set the selection to 1 row from the start of the
-	   working day, in the day corresponding to the start time. */
-	if (!start_in_grid || !end_in_grid
-	    || (start_row == 0 && end_row == day_view->rows - 1)) {
-		end_col = start_col;
-
-		start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		start_row = CLAMP (start_row, 0, day_view->rows - 1);
-		end_row = start_row;
-	}
-
-	if (start_row != day_view->selection_start_row
-	    || start_col != day_view->selection_start_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = start_row;
-		day_view->selection_start_day = start_col;
-	}
-
-	if (end_row != day_view->selection_end_row
-	    || end_col != day_view->selection_end_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_end_row = end_row;
-		day_view->selection_end_day = end_col;
-	}
-
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* 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, offset;
-
-	g_date_clear (&date, 1);
-	g_date_set_time (&date, start_time);
-
-	/* 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. */
-	offset = (weekday + 7 - day) % 7;
-
-	g_date_subtract_days (&date, offset);
-
-	return time_from_day (g_date_year (&date),
-			      g_date_month (&date) - 1,
-			      g_date_day (&date));
-}
-
-
-/* Returns the selected time range. */
-void
-e_day_view_get_selected_time_range	(EDayView	*day_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_col, start_row, end_col, end_row;
-	time_t start, end;
-
-	start_col = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_col = day_view->selection_end_day;
-	end_row = day_view->selection_end_row;
-
-	if (start_col == -1) {
-		start_col = 0;
-		start_row = 0;
-		end_col = 0;
-		end_row = 0;
-	}
-
-	/* Check if the selection is only in the top canvas, in which case
-	   we can simply use the day_starts array. */
-	if (day_view->selection_in_top_canvas) {
-		start = day_view->day_starts[start_col];
-		end = day_view->day_starts[end_col + 1];
-	} else {
-		/* Convert the start col + row into a time. */
-		start = e_day_view_convert_grid_position_to_time (day_view, start_col, start_row);
-		end = e_day_view_convert_grid_position_to_time (day_view, end_col, end_row + 1);
-	}
-
-	if (start_time)
-		*start_time = start;
-
-	if (end_time)
-		*end_time = end;
-}
-
-
-static void
-e_day_view_recalc_day_starts (EDayView *day_view,
-			      time_t start_time)
-{
-	gint day;
-
-	day_view->day_starts[0] = start_time;
-	for (day = 1; day <= day_view->days_shown; day++) {
-		day_view->day_starts[day] = time_add_day (day_view->day_starts[day - 1], 1);
-	}
-
-	day_view->lower = start_time;
-	day_view->upper = day_view->day_starts[day_view->days_shown];
-}
-
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean
-e_day_view_get_work_week_view	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->work_week_view;
-}
-
-
-void
-e_day_view_set_work_week_view	(EDayView	*day_view,
-				 gboolean	 work_week_view)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->work_week_view == work_week_view)
-		return;
-
-	day_view->work_week_view = work_week_view;
-
-	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_queue_reload_events (day_view);
-}
-
-
-gint
-e_day_view_get_mins_per_row	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->mins_per_row;
-}
-
-
-void
-e_day_view_set_mins_per_row	(EDayView	*day_view,
-				 gint		 mins_per_row)
-{
-	gint day;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (mins_per_row != 5 && mins_per_row != 10 && mins_per_row != 15
-	    && mins_per_row != 30 && mins_per_row != 60) {
-		g_warning ("Invalid minutes per row setting");
-		return;
-	}
-
-	if (day_view->mins_per_row == mins_per_row)
-		return;
-
-	day_view->mins_per_row = mins_per_row;
-	e_day_view_recalc_num_rows (day_view);
-
-	/* If we aren't visible, we'll sort it out later. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		day_view->need_layout[day] = TRUE;
-
-	/* We 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 use 12-hour of 24-hour format. */
-gboolean
-e_day_view_get_24_hour_format	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->use_24_hour_format;
-}
-
-
-void
-e_day_view_set_24_hour_format	(EDayView	*day_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->use_24_hour_format == use_24_hour)
-		return;
-
-	day_view->use_24_hour_format = use_24_hour;
-
-	/* We need to update all the text in the events since they may contain
-	   the time in the old format. */
-	e_day_view_foreach_event (day_view, e_day_view_set_show_times_cb,
-				  NULL);
-
-	/* FIXME: We need to re-layout the top canvas since the time
-	   format affects the sizes. */
-	gtk_widget_queue_draw (day_view->time_canvas);
-	gtk_widget_queue_draw (day_view->top_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_queue_reload_events (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, scroll_x, scroll_y, day, event_num;
-	EDayViewPosition pos;
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 event_x, event_y,
-							 &day, &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_long_event_button_press (day_view,
-							      event_num,
-							      event, pos,
-							      event_x,
-							      event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, -1);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_convert_event_coords (EDayView *day_view,
-				 GdkEvent *event,
-				 GdkWindow *window,
-				 gint *x_return,
-				 gint *y_return)
-{
-	gint event_x, event_y, win_x, win_y;
-	GdkWindow *event_window;;
-
-	/* Get the event window, x & y from the appropriate event struct. */
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		event_x = event->button.x;
-		event_y = event->button.y;
-		event_window = event->button.window;
-		break;
-	case GDK_MOTION_NOTIFY:
-		event_x = event->motion.x;
-		event_y = event->motion.y;
-		event_window = event->motion.window;
-		break;
-	default:
-		/* Shouldn't get here. */
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
-		gdk_window_get_position (event_window, &win_x, &win_y);
-		event_x += win_x;
-		event_y += win_y;
-		event_window = gdk_window_get_parent (event_window);
-	}
-
-	*x_return = event_x;
-	*y_return = event_y;
-
-	if (event_window != window)
-		g_warning ("Couldn't find event window\n");
-
-	return (event_window == window) ? TRUE : FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-					GdkEventButton *event,
-					EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, row, day, event_num;
-	EDayViewPosition pos;
-
-	/* Handle scroll wheel events */
-	if (event->button == 4) {
-		/* The wheel has been moved up, so scroll the canvas down. */
-		e_day_view_scroll (day_view, E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	}
-	if (event->button == 5) {
-		/* The wheel has been moved down, so scroll the canvas up. */
-		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
-		return TRUE;
-	}
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	/* Find out where the mouse is. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  event_x, event_y,
-							  &day, &row,
-							  &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_event_button_press (day_view, day,
-							 event_num, event, pos,
-							 event_x, event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, row);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_on_time_canvas_button_press (GtkWidget      *widget,
-					GdkEventButton *event,
-					EDayView       *day_view)
-{
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_long_event_button_press (EDayView		*day_view,
-				       gint		 event_num,
-				       GdkEventButton	*event,
-				       EDayViewPosition  pos,
-				       gint		 event_x,
-				       gint		 event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_long_event_click (day_view, event_num,
-							event, pos,
-							event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, -1,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 E_DAY_VIEW_LONG_EVENT,
-						 event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_event_button_press (EDayView	  *day_view,
-				  gint		   day,
-				  gint		   event_num,
-				  GdkEventButton  *event,
-				  EDayViewPosition pos,
-				  gint		   event_x,
-				  gint		   event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_event_click (day_view, day, event_num,
-						   event, pos,
-						   event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, day,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 day, event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_long_event_click (EDayView *day_view,
-				gint event_num,
-				GdkEventButton  *bevent,
-				EDayViewPosition pos,
-				gint	     event_x,
-				gint	     event_y)
-{
-	EDayViewEvent *event;
-	gint start_day, end_day, day;
-	gint item_x, item_y, item_w, item_h;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_LEFT_EDGE
-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_long_event_rect_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-
-
-static void
-e_day_view_on_event_click (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   GdkEventButton  *bevent,
-			   EDayViewPosition pos,
-			   gint		  event_x,
-			   gint		  event_y)
-{
-	EDayViewEvent *event;
-	gint tmp_day, row, start_row;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_TOP_EDGE
-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = day;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = event->start_minute / day_view->mins_per_row;
-			day_view->resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-			day_view->resize_bars_event_day = day;
-			day_view->resize_bars_event_num = event_num;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_rect_item (day_view);
-
-			e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_rect_item);
-			gnome_canvas_item_raise_to_top (day_view->resize_bar_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-
-	} else {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = day;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_main_canvas (day_view,
-							    event_x, event_y,
-							    &tmp_day, &row,
-							    NULL);
-		start_row = event->start_minute / day_view->mins_per_row;
-		day_view->drag_event_offset = row - start_row;
-	}
-}
-
-
-static void
-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
-{
-	gint day, event_num, start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_long_event_position (day_view, event_num,
-						    &start_day, &end_day,
-						    &item_x, &item_y,
-						    &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_long_event_rect_item);
-}
-
-
-static void
-e_day_view_reshape_resize_rect_item (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_event_position (day_view, day, event_num,
-					       &item_x, &item_y,
-					       &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "x1", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_rect_item);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_bar_item);
-}
-
-
-static void
-e_day_view_on_event_double_click (EDayView *day_view,
-				  gint day,
-				  gint event_num)
-{
-#if 0
-	g_print ("In e_day_view_on_event_double_click\n");
-#endif
-
-}
-
-
-static void
-e_day_view_on_event_right_click (EDayView *day_view,
-				 GdkEventButton *bevent,
-				 gint day,
-				 gint event_num)
-{
-	EDayViewEvent *event;
-	int have_selection, not_being_edited, items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item main_items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Schedule meeting"), (GtkSignalFunc) e_day_view_on_schedule_meet, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE},
-
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE},
-		
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Schedule meeting"), (GtkSignalFunc) e_day_view_on_schedule_meet, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE},
-
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE},
-
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE },
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
-		&& day_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		items = 1;
-		context_menu = &main_items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			items = 8;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[4].sensitive = not_being_edited;
-			context_menu[5].sensitive = not_being_edited;
-			context_menu[7].sensitive = have_selection;
-		} else {
-			items = 6;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < items; i++)
-		context_menu[i].data = day_view;
-
-	day_view->popup_event_day = day;
-	day_view->popup_event_num = event_num;
-	popup_menu (context_menu, items, bevent);
-}
-
-
-static void
-e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-
-	day_view = E_DAY_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE);
-	cal_component_set_dtstart (comp, &date);
-
-	*date.value = icaltime_from_timet (dtend, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	if (day_view->calendar)
-		gnome_calendar_edit_object (day_view->calendar, comp);
-	else
-		g_warning ("Calendar not set");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	if (day_view->calendar)
-		gnome_calendar_edit_object (day_view->calendar, event->comp);
-	else
-		g_warning ("Calendar not set");
-}
-
-
-static void
-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE));
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	if (day_view->editing_event_day >= 0)
-		e_day_view_stop_editing_event (day_view);
-
-	if (delete_component_dialog (event->comp, widget)) {
-		const char *uid;
-
-		cal_component_get_uid (event->comp, &uid);
-
-		/* We don't check the return value; FALSE can mean the object
-		 * was not in the server anyways.
-		 */
-		cal_client_remove_object (day_view->client, uid);
-	}
-}
-
-
-static void
-e_day_view_on_schedule_meet (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	EMeetingEditor *editor;
-	
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	editor = e_meeting_editor_new (event->comp, day_view->client);
-
-	e_meeting_edit (editor);
-	e_meeting_editor_free (editor);
-}
-
-static void
-e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add an exception to get rid of the
-	   instance. */
-
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE));
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (event->start, FALSE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, FALSE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	 * present the updates happen synchronously so our event may disappear.
-	 */
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (day_view->client, new_comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static EDayViewEvent*
-e_day_view_get_popup_menu_event (EDayView *day_view)
-{
-	if (day_view->popup_event_num == -1)
-		return NULL;
-
-	if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
-		return &g_array_index (day_view->long_events,
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-	else
-		return &g_array_index (day_view->events[day_view->popup_event_day],
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-					 GdkEventButton *event,
-					 EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_long_event_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_update_calendar_selection_time (EDayView *day_view)
-{
-	time_t start, end;
-
-	e_day_view_get_selected_time_range (day_view, &start, &end);
-
-#if 0
-	g_print ("Start: %s", ctime (&start));
-	g_print ("End  : %s", ctime (&end));
-#endif
-
-	if (day_view->calendar)
-		gnome_calendar_set_selected_time_range (day_view->calendar,
-							start, end);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_motion (GtkWidget *widget,
-				 GdkEventMotion *mevent,
-				 EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_top_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 canvas_x, canvas_y,
-							 &day, &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		e_day_view_update_selection (day_view, day, -1);
-		return TRUE;
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_long_event_resize (day_view, day);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day == E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->pressed_event_num);
-
-		if (!(cal_component_has_recurrences (event->comp))
-		    && (abs (canvas_x - day_view->drag_event_x)
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y)
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-			case E_DAY_VIEW_POS_RIGHT_EDGE:
-				cursor = day_view->resize_width_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_top_canvas != cursor) {
-			day_view->last_cursor_set_in_top_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_motion (GtkWidget *widget,
-				  GdkEventMotion *mevent,
-				  EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint row, day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row,
-							  &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_selection (day_view, day, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_resize (day_view, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day != -1
-		   && day_view->pressed_event_day != E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->events[day_view->pressed_event_day], EDayViewEvent, day_view->pressed_event_num);
-
-		if (!cal_component_has_recurrences (event->comp)
-		    && (abs (canvas_x - day_view->drag_event_x)
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y)
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-				cursor = day_view->move_cursor;
-				break;
-			case E_DAY_VIEW_POS_TOP_EDGE:
-			case E_DAY_VIEW_POS_BOTTOM_EDGE:
-				cursor = day_view->resize_height_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_main_canvas != cursor) {
-			day_view->last_cursor_set_in_main_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selection to a single cell. If day is -1 then the current
-   start day is reused. If row is -1 then the selection is in the top canvas.
-*/
-void
-e_day_view_start_selection (EDayView *day_view,
-			    gint day,
-			    gint row)
-{
-	if (day == -1) {
-		day = day_view->selection_start_day;
-		if (day == -1)
-			day = 0;
-	}
-
-	day_view->selection_start_day = day;
-	day_view->selection_end_day = day;
-
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	day_view->selection_is_being_dragged = TRUE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Updates the selection during a drag. If day is -1 the selection day is
-   unchanged. */
-void
-e_day_view_update_selection (EDayView *day_view,
-			     gint day,
-			     gint row)
-{
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", day, row);
-#endif
-
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	if (day == -1)
-		day = (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			? day_view->selection_start_day
-			: day_view->selection_end_day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START) {
-		if (row != day_view->selection_start_row
-		    || day != day_view->selection_start_day) {
-			need_redraw = TRUE;
-			day_view->selection_start_row = row;
-			day_view->selection_start_day = day;
-		}
-	} else {
-		if (row != day_view->selection_end_row
-		    || day != day_view->selection_end_day) {
-			need_redraw = TRUE;
-			day_view->selection_end_row = row;
-			day_view->selection_end_day = day;
-		}
-	}
-
-	e_day_view_normalize_selection (day_view);
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_normalize_selection (EDayView *day_view)
-{
-	gint tmp_row, tmp_day;
-
-	/* Switch the drag position if necessary. */
-	if (day_view->selection_start_day > day_view->selection_end_day
-	    || (day_view->selection_start_day == day_view->selection_end_day
-		&& day_view->selection_start_row > day_view->selection_end_row)) {
-		tmp_row = day_view->selection_start_row;
-		tmp_day = day_view->selection_start_day;
-		day_view->selection_start_day = day_view->selection_end_day;
-		day_view->selection_start_row = day_view->selection_end_row;
-		day_view->selection_end_day = tmp_day;
-		day_view->selection_end_row = tmp_row;
-		if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-		else
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_START;
-	}
-}
-
-
-void
-e_day_view_finish_selection (EDayView *day_view)
-{
-	day_view->selection_is_being_dragged = FALSE;
-	e_day_view_update_calendar_selection_time (day_view);
-}
-
-
-static void
-e_day_view_update_long_event_resize (EDayView *day_view,
-				     gint day)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Day:%i\n", day);
-#endif
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		day = MIN (day, day_view->resize_end_row);
-		if (day != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = day;
-
-		}
-	} else {
-		day = MAX (day, day_view->resize_start_row);
-		if (day != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = day;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		e_day_view_reshape_resize_long_event_rect_item (day_view);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	}
-}
-
-
-static void
-e_day_view_update_resize (EDayView *day_view,
-			  gint row)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Row:%i\n", row);
-#endif
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		row = MIN (row, day_view->resize_end_row);
-		if (row != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = row;
-
-		}
-	} else {
-		row = MAX (row, day_view->resize_start_row);
-		if (row != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = row;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_resize_rect_item (day_view);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_long_event_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* We use a temporary copy of the comp since we don't want to
-	   change the original comp here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		dt = day_view->day_starts[day_view->resize_start_row];
-		*date.value = icaltime_from_timet (dt, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet (dt, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* We use a temporary shallow copy of the ico since we don't want to
-	   change the original ico here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
-		*date.value = icaltime_from_timet (dt, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
-		*date.value = icaltime_from_timet (dt, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	/* Hide the horizontal bars. */
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_abort_resize (EDayView *day_view,
-			 guint32 time)
-{
-	gint day, event_num;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE)
-		return;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-	gdk_pointer_ungrab (time);
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-
-		day_view->last_cursor_set_in_top_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->top_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-	} else {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-
-		day_view->last_cursor_set_in_main_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->main_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		gnome_canvas_item_hide (day_view->resize_bar_item);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_day_view_queue_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (day_view->reload_events_idle_id == 0) {
-		/* We'll use a high idle priority here, so the events are
-		   reloaded before the canvas is updated. */
-		day_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_HIGH_IDLE,
-			 e_day_view_reload_events_idle_cb, day_view, NULL);
-	}
-}
-
-
-static gboolean
-e_day_view_reload_events_idle_cb	(gpointer data)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	day_view = E_DAY_VIEW (data);
-
-	day_view->reload_events_idle_id = 0;
-
-	e_day_view_reload_events (day_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_day_view_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (!(day_view->client
-	      && cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	/* If both lower & upper are 0, then the time range hasn't been set,
-	   so we don't try to load any events. */
-	if (day_view->lower != 0 || day_view->upper != 0) {
-#if 0
-		g_print ("EDayView (%s) generating instances\n",
-			 day_view->work_week_view ? "Work Week" : "1 Day View");
-#endif
-		cal_client_generate_instances (day_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       day_view->lower,
-					       day_view->upper,
-					       e_day_view_add_event,
-					       day_view);
-	}
-
-	/* We need to do this to make sure the top canvas is resized. */
-	day_view->long_events_need_layout = TRUE;
-
-	e_day_view_check_layout (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_free_events (EDayView *day_view)
-{
-	gint day;
-
-	/* Reset all our indices. */
-	day_view->editing_event_day = -1;
-	day_view->popup_event_day = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_event_day = -1;
-	day_view->pressed_event_day = -1;
-	day_view->drag_event_day = -1;
-
-	e_day_view_free_event_array (day_view, day_view->long_events);
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		e_day_view_free_event_array (day_view, day_view->events[day]);
-}
-
-
-static void
-e_day_view_free_event_array (EDayView *day_view,
-			     GArray *array)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < array->len; event_num++) {
-		event = &g_array_index (array, EDayViewEvent, event_num);
-		if (event->canvas_item)
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (array, 0);
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_day_view_add_event (CalComponent *comp,
-		      time_t	  start,
-		      time_t	  end,
-		      gpointer	  data)
-
-{
-	EDayView *day_view;
-	EDayViewEvent event;
-	gint day, offset;
-	struct tm start_tm, end_tm;
-
-	day_view = E_DAY_VIEW (data);
-
-#if 0
-	g_print ("Day view lower: %s", ctime (&day_view->lower));
-	g_print ("Day view upper: %s", ctime (&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 < day_view->upper, TRUE);
-	g_return_val_if_fail (end > day_view->lower, TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-	event.start = start;
-	event.end = end;
-	event.canvas_item = NULL;
-
-	/* Calculate the start & end minute, relative to the top of the
-	   display. */
-	offset = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min - offset;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min - offset;
-
-	event.start_row_or_col = -1;
-	event.num_columns = -1;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start >= day_view->day_starts[day]
-		    && end <= day_view->day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == day_view->day_starts[day + 1]) {
-
-				/* If the event last the entire day, then we
-				   skip it here so it gets added to the top
-				   canvas. */
-				if (start == day_view->day_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (day_view->events[day], event);
-			day_view->events_sorted[day] = FALSE;
-			day_view->need_layout[day] = TRUE;
-			return TRUE;
-		}
-	}
-
-	/* The event wasn't within one day so it must be a long event,
-	   i.e. shown in the top canvas. */
-	g_array_append_val (day_view->long_events, event);
-	day_view->long_events_sorted = FALSE;
-	day_view->long_events_need_layout = TRUE;
-	return TRUE;
-}
-
-
-/* This lays out the short (less than 1 day) events in the columns.
-   Any long events are simply skipped. */
-void
-e_day_view_check_layout (EDayView *day_view)
-{
-	gint day;
-
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_day_view_ensure_events_sorted (day_view);
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (day_view->need_layout[day])
-			e_day_view_layout_day_events (day_view, day);
-
-		if (day_view->need_layout[day]
-		    || day_view->need_reshape[day]) {
-			e_day_view_reshape_day_events (day_view, day);
-
-			if (day_view->resize_bars_event_day == day)
-				e_day_view_reshape_main_canvas_resize_bars (day_view);
-		}
-
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	if (day_view->long_events_need_layout)
-		e_day_view_layout_long_events (day_view);
-
-	if (day_view->long_events_need_layout
-	    || day_view->long_events_need_reshape)
-		e_day_view_reshape_long_events (day_view);
-
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-}
-
-
-static void
-e_day_view_layout_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num, old_rows_in_top_display, top_canvas_height, top_rows;
-	guint8 *grid;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8,
-		       day_view->long_events->len * E_DAY_VIEW_MAX_DAYS);
-
-	/* Reset the number of rows in the top display to 0. It will be
-	   updated as events are layed out below. */
-	old_rows_in_top_display = day_view->rows_in_top_display;
-	day_view->rows_in_top_display = 0;
-
-	/* Iterate over the events, finding which days they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		e_day_view_layout_long_event (day_view, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	if (day_view->rows_in_top_display != old_rows_in_top_display) {
-		top_rows = MAX (1, day_view->rows_in_top_display);
-		top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-		gtk_widget_set_usize (day_view->top_canvas, -1,
-				      top_canvas_height);
-	}
-}
-
-
-static void
-e_day_view_layout_long_event (EDayView	   *day_view,
-			      EDayViewEvent *event,
-			      guint8	   *grid)
-{
-	gint start_day, end_day, free_row, day, row;
-
-	event->num_columns = 0;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      &start_day, &end_day))
-		return;
-
-	/* Try each row until we find a free one. */
-	row = 0;
-	do {
-		free_row = row;
-		for (day = start_day; day <= end_day; day++) {
-			if (grid[row * E_DAY_VIEW_MAX_DAYS + day]) {
-				free_row = -1;
-				break;
-			}
-		}
-		row++;
-	} while (free_row == -1);
-
-	event->start_row_or_col = free_row;
-	event->num_columns = 1;
-
-	/* Mark the cells as full. */
-	for (day = start_day; day <= end_day; day++) {
-		grid[free_row * E_DAY_VIEW_MAX_DAYS + day] = 1;
-	}
-
-	/* Update the number of rows in the top canvas if necessary. */
-	day_view->rows_in_top_display = MAX (day_view->rows_in_top_display,
-					     free_row + 1);
-}
-
-
-static void
-e_day_view_reshape_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->num_columns == 0) {
-			if (event->canvas_item) {
-				gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-				event->canvas_item = NULL;
-			}
-		} else {
-			e_day_view_reshape_long_event (day_view, event_num);
-		}
-	}
-}
-
-
-static void
-e_day_view_reshape_long_event (EDayView *day_view,
-			       gint	 event_num)
-{
-	EDayViewEvent *event;
-	GdkFont *font;
-	gint start_day, end_day, item_x, item_y, item_w, item_h;
-	gint text_x, text_w, num_icons, icons_width, width, time_width;
-	CalComponent *comp;
-	gint min_text_x, max_text_w, text_width, line_len;
-	gchar *text, *end_of_line;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-		return;
-	}
-
-	/* Take off the border and padding. */
-	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;
-	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;
-	item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD;
-	item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2;
-
-	/* We don't show the icons while resizing, since we'd have to
-	   draw them on top of the resize rect. Nor when editing. */
-	num_icons = 0;
-	comp = event->comp;
-	font = GTK_WIDGET (day_view)->style->font;
-
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num)
-		show_icons = FALSE;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	if (show_icons) {
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-	}
-
-	if (!event->canvas_item) {
-		event->canvas_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (day_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-					       "max_lines", 1,
-					       "editable", TRUE,
-					       "use_ellipsis", TRUE,
-					       "draw_background", FALSE,
-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (event->canvas_item), "event",
-				    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-				    day_view);
-		e_day_view_update_long_event_label (day_view, event_num);
-	}
-
-	/* Calculate its position. We first calculate the ideal position which
-	   is centered with the icons. We then make sure we haven't gone off
-	   the left edge of the available space. Finally we make sure we don't
-	   go off the right edge. */
-	icons_width = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD)
-		* num_icons;
-	time_width = 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. */
-		gtk_object_get (GTK_OBJECT (event->canvas_item),
-				"text", &text,
-				NULL);
-		text_width = 0;
-		if (text) {
-			end_of_line = strchr (text, '\n');
-			if (end_of_line)
-				line_len = end_of_line - text;
-			else
-				line_len = strlen (text);
-			text_width = gdk_text_width (font, text, line_len);
-			g_free (text);
-		}
-
-		width = text_width + icons_width;
-		text_x = item_x + (item_w - width) / 2;
-
-		min_text_x = item_x;
-		if (event->start > day_view->day_starts[start_day])
-			min_text_x += time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_x = MAX (text_x, min_text_x);
-
-		max_text_w = item_x + item_w - text_x;
-		if (event->end < day_view->day_starts[end_day + 1])
-			max_text_w -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_w = MIN (width, max_text_w);
-
-		/* Now take out the space for the icons. */
-		text_x += icons_width;
-		text_w -= icons_width;
-	}
-
-	text_w = MAX (text_w, 0);
-	gnome_canvas_item_set (event->canvas_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) item_h,
-			       NULL);
-	e_canvas_item_move_absolute(event->canvas_item,
-				    text_x, item_y);
-}
-
-
-/* Find the start and end days for the event. */
-gboolean
-e_day_view_find_long_event_days (EDayView	*day_view,
-				 EDayViewEvent	*event,
-				 gint		*start_day_return,
-				 gint		*end_day_return)
-{
-	gint day, start_day, end_day;
-
-	start_day = -1;
-	end_day = -1;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start_day == -1
-		    && event->start < day_view->day_starts[day + 1])
-			start_day = day;
-		if (event->end > day_view->day_starts[day])
-			end_day = day;
-	}
-
-	/* Sanity check. */
-	if (start_day < 0 || start_day >= day_view->days_shown
-	    || end_day < 0 || end_day >= day_view->days_shown
-	    || end_day < start_day) {
-		g_warning ("Invalid date range for event");
-		return FALSE;
-	}
-
-	*start_day_return = start_day;
-	*end_day_return = end_day;
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_layout_day_events (EDayView *day_view,
-			      gint	day)
-{
-	EDayViewEvent *event;
-	gint row, event_num;
-	guint8 *grid;
-
-	/* This is a temporary array which keeps track of rows which are
-	   connected. When an appointment spans multiple rows then the number
-	   of columns in each of these rows must be the same (i.e. the maximum
-	   of all of them). Each element in the array corresponds to one row
-	   and contains the index of the first row in the group of connected
-	   rows. */
-	guint16 group_starts[12 * 24];
-
-	/* Reset the cols_per_row array, and initialize the connected rows so
-	   that all rows are not connected - each row is the start of a new
-	   group. */
-	for (row = 0; row < day_view->rows; row++) {
-		day_view->cols_per_row[day][row] = 0;
-		group_starts[row] = row;
-	}
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied. */
-	grid = g_new0 (guint8, day_view->rows * E_DAY_VIEW_MAX_COLUMNS);
-
-
-	/* Iterate over the events, finding which rows they cover, and putting
-	   them in the first free column available. Increment the number of
-	   events in each of the rows it covers, and make sure they are all
-	   in one group. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		e_day_view_layout_day_event (day_view, day, event,
-					     grid, group_starts);
-	}
-
-	/* Recalculate the number of columns needed in each row. */
-	e_day_view_recalc_cols_per_row (day_view, day, group_starts);
-
-	/* Iterate over the events again, trying to expand events horizontally
-	   if there is enough space. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		e_day_view_expand_day_event (day_view, day, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-/* Finds the first free position to place the event in.
-   Increments the number of events in each of the rows it covers, and makes
-   sure they are all in one group. */
-static void
-e_day_view_layout_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid,
-			     guint16	   *group_starts)
-{
-	gint start_row, end_row, free_col, col, row, group_start;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	event->num_columns = 0;
-
-	/* If the event can't currently be seen, just return. */
-	if (start_row >= day_view->rows || end_row < 0)
-		return;
-
-	/* Make sure we don't go outside the visible times. */
-	start_row = CLAMP (start_row, 0, day_view->rows - 1);
-	end_row = CLAMP (end_row, 0, day_view->rows - 1);
-
-	/* Try each column until we find a free one. */
-	for (col = 0; col < E_DAY_VIEW_MAX_COLUMNS; col++) {
-		free_col = col;
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				free_col = -1;
-				break;
-			}
-		}
-
-		if (free_col != -1)
-			break;
-	}
-
-	/* If we can't find space for the event, just return. */
-	if (free_col == -1)
-		return;
-
-	/* The event is assigned 1 col initially, but may be expanded later. */
-	event->start_row_or_col = free_col;
-	event->num_columns = 1;
-
-	/* Determine the start index of the group. */
-	group_start = group_starts[start_row];
-
-	/* Increment number of events in each of the rows the event covers.
-	   We use the cols_per_row array for this. It will be sorted out after
-	   all the events have been layed out. Also make sure all the rows that
-	   the event covers are in one group. */
-	for (row = start_row; row <= end_row; row++) {
-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;
-		day_view->cols_per_row[day][row]++;
-		group_starts[row] = group_start;
-	}
-
-	/* If any following rows should be in the same group, add them. */
-	for (row = end_row + 1; row < day_view->rows; row++) {
-		if (group_starts[row] > end_row)
-			break;
-		group_starts[row] = group_start;
-	}
-}
-
-
-/* For each group of rows, find the max number of events in all the
-   rows, and set the number of cols in each of the rows to that. */
-static void
-e_day_view_recalc_cols_per_row (EDayView *day_view,
-				gint	  day,
-				guint16  *group_starts)
-{
-	gint start_row = 0, row, next_start_row, max_events;
-
-	while (start_row < day_view->rows) {
-
-		max_events = 0;
-		for (row = start_row; row < day_view->rows && group_starts[row] == start_row; row++)
-			max_events = MAX (max_events, day_view->cols_per_row[day][row]);
-
-		next_start_row = row;
-
-		for (row = start_row; row < next_start_row; row++)
-			day_view->cols_per_row[day][row] = max_events;
-
-		start_row = next_start_row;
-	}
-}
-
-
-/* Expands the event horizontally to fill any free space. */
-static void
-e_day_view_expand_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid)
-{
-	gint start_row, end_row, col, row;
-	gboolean clashed;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	/* Try each column until we find a free one. */
-	clashed = FALSE;
-	for (col = event->start_row_or_col + 1; col < day_view->cols_per_row[day][start_row]; col++) {
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				clashed = TRUE;
-				break;
-			}
-		}
-
-		if (clashed)
-			break;
-
-		event->num_columns++;
-	}
-}
-
-
-/* This creates or updates the sizes of the canvas items for one day of the
-   main canvas. */
-static void
-e_day_view_reshape_day_events (EDayView *day_view,
-			       gint	 day)
-{
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-}
-
-
-static void
-e_day_view_reshape_day_event (EDayView *day_view,
-			      gint	day,
-			      gint	event_num)
-{
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h;
-	gint num_icons, icons_offset;
-	CalComponent *comp;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	comp = event->comp;
-
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-	} else {
-		/* Skip the border and padding. */
-		item_x += E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD;
-		item_w -= E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD * 2;
-		item_y += E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD;
-		item_h -= (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2;
-
-		/* We don't show the icons while resizing, since we'd have to
-		   draw them on top of the resize rect. */
-		num_icons = 0;
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-		    || day_view->resize_event_day != day
-		    || day_view->resize_event_num != event_num) {
-			if (cal_component_has_alarms (comp))
-				num_icons++;
-			if (cal_component_has_recurrences (comp))
-				num_icons++;
-		}
-
-		if (num_icons > 0) {
-			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)
-				icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;
-			else
-				icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;
-			item_x += icons_offset;
-			item_w -= icons_offset;
-		}
-
-		if (!event->canvas_item) {
-			event->canvas_item =
-				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
-						       e_text_get_type (),
-						       "font_gdk", GTK_WIDGET (day_view)->style->font,
-						       "anchor", GTK_ANCHOR_NW,
-						       "line_wrap", TRUE,
-						       "editable", TRUE,
-						       "clip", TRUE,
-						       "use_ellipsis", TRUE,
-						       "draw_background", FALSE,
-						       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-						       NULL);
-			gtk_signal_connect (GTK_OBJECT (event->canvas_item),
-					    "event",
-					    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-					    day_view);
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-		}
-
-		item_w = MAX (item_w, 0);
-		gnome_canvas_item_set (event->canvas_item,
-				       "clip_width", (gdouble) item_w,
-				       "clip_height", (gdouble) item_h,
-				       NULL);
-		e_canvas_item_move_absolute(event->canvas_item,
-					    item_x, item_y);
-	}
-}
-
-
-/* This creates or resizes the horizontal bars used to resize events in the
-   main canvas. */
-static void
-e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x, y, w, h;
-
-	day = day_view->resize_bars_event_day;
-	event_num = day_view->resize_bars_event_num;
-
-	/* If we're not editing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day != -1 && day == day_view->drag_event_day
-	    && event_num == day_view->drag_event_num) {
-		gtk_object_get (GTK_OBJECT (day_view->drag_rect_item),
-				"x1", &x,
-				"y1", &y,
-				"x2", &w,
-				"y2", &h,
-				NULL);
-		w -= x;
-		x++;
-		h -= y;
-	} else if (day != -1
-		   && e_day_view_get_event_position (day_view, day, event_num,
-						     &item_x, &item_y,
-						     &item_w, &item_h)) {
-		x = item_x + E_DAY_VIEW_BAR_WIDTH;
-		y = item_y;
-		w = item_w - E_DAY_VIEW_BAR_WIDTH;
-		h = item_h;
-	} else {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-		return;
-	}
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y - E_DAY_VIEW_BAR_HEIGHT,
-			       "x2", x + w - 1,
-			       "y2", y - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_top_resize_bar_item);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y + h,
-			       "x2", x + w - 1,
-			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
-}
-
-
-static void
-e_day_view_ensure_events_sorted (EDayView *day_view)
-{
-	gint day;
-
-	/* Sort the long events. */
-	if (!day_view->long_events_sorted) {
-		qsort (day_view->long_events->data,
-		       day_view->long_events->len,
-		       sizeof (EDayViewEvent),
-		       e_day_view_event_sort_func);
-		day_view->long_events_sorted = TRUE;
-	}
-
-	/* Sort the events for each day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (!day_view->events_sorted[day]) {
-			qsort (day_view->events[day]->data,
-			       day_view->events[day]->len,
-			       sizeof (EDayViewEvent),
-			       e_day_view_event_sort_func);
-			day_view->events_sorted[day] = TRUE;
-		}
-	}
-}
-
-
-static gint
-e_day_view_event_sort_func (const void *arg1,
-			    const void *arg2)
-{
-	EDayViewEvent *event1, *event2;
-
-	event1 = (EDayViewEvent*) arg1;
-	event2 = (EDayViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static gint
-e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	gint day, event_num;
-	gchar *initial_text;
-	guint keyval;
-	gboolean stop_emission;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-	keyval = event->keyval;
-
-	/* The Escape key aborts a resize operation. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (keyval == GDK_Escape) {
-			e_day_view_abort_resize (day_view, event->time);
-		}
-		return FALSE;
-	}
-
-	/* Handle the cursor keys for moving & extending the selection. */
-	stop_emission = TRUE;
-	if (event->state & GDK_SHIFT_MASK) {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up_shifted (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down_shifted (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left_shifted (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right_shifted (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	} else {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right (day_view, event);
-			break;
-		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;
-		}
-	}
-	if (stop_emission)
-		return TRUE;
-
-	if (day_view->selection_start_day == -1)
-		return FALSE;
-
-	/* Check if there is room for a new event to be typed in. If there
-	   isn't we don't want to add an event as we will then add a new
-	   event for every key press. */
-	if (!e_day_view_check_if_new_event_fits (day_view)) {
-		return FALSE;
-	}
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((keyval < 0x20)
-		   || (keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range */
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	*dt.value = icaltime_from_timet (dtstart, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	*dt.value = icaltime_from_timet (dtend, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_day_view_add_event (comp, dtstart, dtend, day_view);
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		e_day_view_start_editing_event (day_view, day, event_num,
-						initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row == 0)
-		return;
-
-	*row = *row - 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row >= day_view->rows - 1)
-		return;
-
-	*row = *row + 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day == 0)
-		return;
-
-	*day = *day - 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day >= day_view->days_shown - 1)
-		return;
-
-	*day = *day + 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		return;
-	} else if (day_view->selection_start_row == 0) {
-		day_view->selection_in_top_canvas = TRUE;
-		day_view->selection_start_row = -1;
-	} else {
-		day_view->selection_start_row--;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = 0;
-	} else if (day_view->selection_start_row >= day_view->rows - 1) {
-		return;
-	} else {
-		day_view->selection_start_row++;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == 0) {
-		if (day_view->calendar)
-			gnome_calendar_previous (day_view->calendar);
-	} else {
-		day_view->selection_start_day--;
-		day_view->selection_end_day--;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_end_day == day_view->days_shown - 1) {
-		if (day_view->calendar)
-			gnome_calendar_next (day_view->calendar);
-	} else {
-		day_view->selection_start_day++;
-		day_view->selection_end_day++;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* 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;
-}
-
-
-static void
-e_day_view_ensure_rows_visible (EDayView *day_view,
-				gint start_row,
-				gint end_row)
-{
-	GtkAdjustment *adj;
-	gfloat value, min_value, max_value;
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	value = adj->value;
-
-	min_value = (end_row + 1) * day_view->row_height - adj->page_size;
-	if (value < min_value)
-		value = min_value;
-
-	max_value = start_row * day_view->row_height;
-	if (value > max_value)
-		value = max_value;
-
-	if (value != adj->value) {
-		adj->value = value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_day_view_start_editing_event (EDayView *day_view,
-				gint	  day,
-				gint	  event_num,
-				gchar    *initial_text)
-{
-	EDayViewEvent *event;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-#if 0
-	g_print ("In e_day_view_start_editing_event\n");
-#endif
-
-	/* If we are already editing the event, just return. */
-	if (day == day_view->editing_event_day
-	    && event_num == day_view->editing_event_num)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!event->canvas_item)
-		return;
-
-	/* We must grab the focus before setting the initial text, since
-	   grabbing the focus will result in a call to
-	   e_day_view_on_editing_started(), which will reset the text to get
-	   rid of the start and end times. */
-	e_canvas_item_grab_focus (event->canvas_item);
-
-	if (initial_text) {
-		gnome_canvas_item_set (event->canvas_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops the current edit. If accept is TRUE the event summary is update,
-   else the edit is cancelled. */
-static void
-e_day_view_stop_editing_event (EDayView *day_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (day_view->editing_event_day == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_day_view_on_text_item_event (GnomeCanvasItem *item,
-			       GdkEvent *event,
-			       EDayView *day_view)
-{
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing)
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in)
-			e_day_view_on_editing_started (day_view, item);
-		else
-			e_day_view_on_editing_stopped (day_view, item);
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_editing_started (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-
-	if (!e_day_view_find_event_from_item (day_view, item,
-					      &day, &event_num))
-		return;
-
-#if 0
-	g_print ("In e_day_view_on_editing_started Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* FIXME: This is a temporary workaround for a bug which seems to stop
-	   us getting focus_out signals. It is not a complete fix since if we
-	   don't get focus_out signals we don't save the appointment text so
-	   this may be lost. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	day_view->editing_event_day = day;
-	day_view->editing_event_num = event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		day_view->resize_bars_event_day = day;
-		day_view->resize_bars_event_num = event_num;
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-	}
-}
-
-
-static void
-e_day_view_on_editing_stopped (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-	gboolean editing_long_event = FALSE;
-	EDayViewEvent *event;
-	gchar *text = NULL;
-	CalComponentText summary;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-#if 0
-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* If no item is being edited, just return. */
-	if (day == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		editing_long_event = TRUE;
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* Hide the horizontal bars. */
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-
-	/* Reset the edit fields. */
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		return;
-	}
-
-	if (text) {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		g_free (text);
-	} else
-		cal_component_set_summary (event->comp, NULL);
-
-	if (!cal_client_update_object (day_view->client, event->comp))
-		g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-/* FIXME: It is possible that we may produce an invalid time due to daylight
-   saving times (i.e. when clocks go forward there is a range of time which
-   is not valid). I don't know the best way to handle daylight saving time. */
-static time_t
-e_day_view_convert_grid_position_to_time (EDayView *day_view,
-					  gint col,
-					  gint row)
-{
-	struct tm *tmp_tm;
-	time_t val;
-	gint minutes;
-
-	/* Calulate the number of minutes since the start of the day. */
-	minutes = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown
-		+ row * day_view->mins_per_row;
-
-	/* A special case for midnight, where we can use the start of the
-	   next day. */
-	if (minutes == 60 * 24)
-		return day_view->day_starts[col + 1];
-
-	/* We convert the start of the day to a struct tm, then set the
-	   hour and minute, then convert it back to a time_t. */
-	tmp_tm = localtime (&day_view->day_starts[col]);
-
-	tmp_tm->tm_hour = minutes / 60;
-	tmp_tm->tm_min = minutes % 60;
-	tmp_tm->tm_isdst = -1;
-
-	val = mktime (tmp_tm);
-	return val;
-}
-
-
-static gboolean
-e_day_view_convert_time_to_grid_position (EDayView *day_view,
-					  time_t time,
-					  gint *col,
-					  gint *row)
-{
-	struct tm *tmp_tm;
-	gint day, minutes;
-
-	*col = *row = 0;
-
-	if (time < day_view->lower || time >= day_view->upper)
-		return FALSE;
-
-	/* We can find the column easily using the day_starts array. */
-	for (day = 1; day <= day_view->days_shown; day++) {
-		if (time < day_view->day_starts[day]) {
-			*col = day - 1;
-			break;
-		}
-	}
-
-	/* To find the row we need to convert the time to a struct tm,
-	   calculate the offset in minutes from the top of the display and
-	   divide it by the mins per row setting. */
-	tmp_tm = localtime (&time);
-	minutes = tmp_tm->tm_hour * 60 + tmp_tm->tm_min;
-	minutes -= day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-
-	*row = minutes / day_view->mins_per_row;
-
-	if (*row < 0 || *row >= day_view->rows)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* This starts or stops auto-scrolling when dragging a selection or resizing
-   an event. */
-void
-e_day_view_check_auto_scroll (EDayView *day_view,
-			      gint event_x,
-			      gint event_y)
-{
-	day_view->last_mouse_x = event_x;
-	day_view->last_mouse_y = event_y;
-
-	if (event_y < E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, TRUE);
-	else if (event_y >= day_view->main_canvas->allocation.height
-		 - E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, FALSE);
-	else
-		e_day_view_stop_auto_scroll (day_view);
-}
-
-
-static void
-e_day_view_start_auto_scroll (EDayView *day_view,
-			      gboolean scroll_up)
-{
-	if (day_view->auto_scroll_timeout_id == 0) {
-		day_view->auto_scroll_timeout_id = g_timeout_add (E_DAY_VIEW_AUTO_SCROLL_TIMEOUT, e_day_view_auto_scroll_handler, day_view);
-		day_view->auto_scroll_delay = E_DAY_VIEW_AUTO_SCROLL_DELAY;
-	}
-	day_view->auto_scroll_up = scroll_up;
-}
-
-
-void
-e_day_view_stop_auto_scroll (EDayView *day_view)
-{
-	if (day_view->auto_scroll_timeout_id != 0) {
-		gtk_timeout_remove (day_view->auto_scroll_timeout_id);
-		day_view->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_day_view_auto_scroll_handler (gpointer data)
-{
-	EDayView *day_view;
-	EDayViewPosition pos;
-	gint scroll_x, scroll_y, new_scroll_y, canvas_x, canvas_y, row, day;
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	day_view = E_DAY_VIEW (data);
-
-	GDK_THREADS_ENTER ();
-
-	if (day_view->auto_scroll_delay > 0) {
-		day_view->auto_scroll_delay--;
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	if (day_view->auto_scroll_up)
-		new_scroll_y = MAX (scroll_y - adj->step_increment, 0);
-	else
-		new_scroll_y = MIN (scroll_y + adj->step_increment,
-				    adj->upper - adj->page_size);
-
-	if (new_scroll_y != scroll_y) {
-		/* NOTE: This reduces flicker, but only works if we don't use
-		   canvas items which have X windows. */
-		gtk_layout_freeze (GTK_LAYOUT (day_view->main_canvas));
-
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					scroll_x, new_scroll_y);
-
-		gtk_layout_thaw (GTK_LAYOUT (day_view->main_canvas));
-	}
-
-	canvas_x = day_view->last_mouse_x + scroll_x;
-	canvas_y = day_view->last_mouse_y + new_scroll_y;
-
-	/* The last_mouse_x position is set to -1 when we are selecting using
-	   the time column. In this case we set canvas_x to 0 and we ignore
-	   the resulting day. */
-	if (day_view->last_mouse_x == -1)
-		canvas_x = 0;
-
-	/* Update the selection/resize/drag if necessary. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row, NULL);
-
-	if (day_view->last_mouse_x == -1)
-		day = -1;
-
-	if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-		if (day_view->selection_is_being_dragged) {
-			e_day_view_update_selection (day_view, day, row);
-		} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-			e_day_view_update_resize (day_view, row);
-		} else if (day_view->drag_item->object.flags
-			   & GNOME_CANVAS_ITEM_VISIBLE) {
-			e_day_view_update_main_canvas_drag (day_view, row,
-							    day);
-		}
-	}
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_event_position (EDayView *day_view,
-			       gint day,
-			       gint event_num,
-			       gint *item_x,
-			       gint *item_y,
-			       gint *item_w,
-			       gint *item_h)
-{
-	EDayViewEvent *event;
-	gint start_row, end_row, cols_in_row, start_col, num_columns;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	cols_in_row = day_view->cols_per_row[day][start_row];
-	start_col = event->start_row_or_col;
-	num_columns = event->num_columns;
-
-	if (cols_in_row == 0)
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			start_row = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			end_row = day_view->resize_end_row;
-	}
-
-
-	*item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = start_row * day_view->row_height;
-#if 0
-	*item_h = (end_row - start_row + 1) * day_view->row_height;
-#else
-	/* This makes the event end on the grid line of the next row,
-	   which maybe looks nicer if you have 2 events on consecutive rows. */
-	*item_h = (end_row - start_row + 1) * day_view->row_height + 1;
-#endif
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_long_event_position	(EDayView	*day_view,
-					 gint		 event_num,
-					 gint		*start_day,
-					 gint		*end_day,
-					 gint		*item_x,
-					 gint		*item_y,
-					 gint		*item_w,
-					 gint		*item_h)
-{
-	EDayViewEvent *event;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      start_day, end_day))
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			*start_day = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			*end_day = day_view->resize_end_row;
-	}
-
-	*item_x = day_view->day_offsets[*start_day] + E_DAY_VIEW_BAR_WIDTH;
-	*item_w = day_view->day_offsets[*end_day + 1] - *item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = (event->start_row_or_col + 1) * day_view->top_row_height;
-	*item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	return TRUE;
-}
-
-
-/* Converts a position within the entire top canvas to a day & event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-					   gint x,
-					   gint y,
-					   gint *day_return,
-					   gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, row, col;
-	gint event_num, start_day, end_day, item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->top_row_height - 1;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->start_row_or_col != row)
-			continue;
-
-		if (!e_day_view_get_long_event_position (day_view, event_num,
-							 &start_day, &end_day,
-							 &item_x, &item_y,
-							 &item_w, &item_h))
-			continue;
-
-		if (x < item_x)
-			continue;
-
-		if (x >= item_x + item_w)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    + E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item_x + item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    - E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_RIGHT_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-/* Converts a position within the entire main canvas to a day, row, event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-					    gint x,
-					    gint y,
-					    gint *day_return,
-					    gint *row_return,
-					    gint *event_num_return)
-{
-	gint day, row, col, event_num;
-	gint item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	*row_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	/* Check the position is inside the canvas, and determine the day
-	   and row. */
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-	*row_return = row;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	/* Check the selected item first, since the horizontal resizing bars
-	   may be above other events. */
-	if (day_view->resize_bars_event_day == day) {
-		if (e_day_view_get_event_position (day_view, day,
-						   day_view->resize_bars_event_num,
-						   &item_x, &item_y,
-						   &item_w, &item_h)) {
-			if (x >= item_x && x < item_x + item_w) {
-				*event_num_return = day_view->resize_bars_event_num;
-				if (y >= item_y - E_DAY_VIEW_BAR_HEIGHT
-				    && y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT)
-					return E_DAY_VIEW_POS_TOP_EDGE;
-				if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-				    && y < item_y + item_h + E_DAY_VIEW_BAR_HEIGHT)
-					return E_DAY_VIEW_POS_BOTTOM_EDGE;
-			}
-		}
-	}
-
-	/* Try to find the event at the found position. */
-	*event_num_return = -1;
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		if (!e_day_view_get_event_position (day_view, day, event_num,
-						    &item_x, &item_y,
-						    &item_w, &item_h))
-			continue;
-
-		if (x < item_x || x >= item_x + item_w
-		    || y < item_y || y >= item_y + item_h)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_BAR_WIDTH)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    + E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_TOP_EDGE;
-
-		if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    - E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_BOTTOM_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-static gint
-e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      gint            x,
-				      gint            y,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_top_canvas_drag_item (day_view);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_top_canvas (day_view, x, y,
-							 &day, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT)
-		day -= day_view->drag_event_offset;
-	day = MAX (day, 0);
-
-	e_day_view_update_top_canvas_drag (day_view, day);
-}
-
-
-static void
-e_day_view_update_top_canvas_drag (EDayView *day_view,
-				   gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint row, num_days, start_day, end_day;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	row = day_view->rows_in_top_display + 1;
-	num_days = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-		row = event->start_row_or_col + 1;
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		num_days = end_day - start_day + 1;
-
-		/* Make sure we don't go off the screen. */
-		day = MIN (day, day_view->days_shown - num_days);
-
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-	}
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && (day_view->drag_long_event_item->object.flags
-		& GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-
-
-	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
-	item_w = day_view->day_offsets[day + num_days] - item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->top_row_height;
-	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_long_event_item,
-				     item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD);
-
-	if (!(day_view->drag_long_event_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_rect_item);
-		gnome_canvas_item_show (day_view->drag_long_event_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_long_event_item->object.flags
-	      & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		cal_component_get_summary (event->comp, &summary);
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_long_event_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_item);
-		gnome_canvas_item_show (day_view->drag_long_event_item);
-
-		g_free (text);
-	}
-}
-
-
-static gint
-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-				       GdkDragContext *context,
-				       gint            x,
-				       gint            y,
-				       guint           time,
-				       EDayView	      *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_main_canvas_drag_item (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	e_day_view_check_auto_scroll (day_view, x, y);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day, row;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,
-							  &day, &row, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day != -1
-	    && day_view->drag_event_day != E_DAY_VIEW_LONG_EVENT)
-		row -= day_view->drag_event_offset;
-	row = MAX (row, 0);
-
-	e_day_view_update_main_canvas_drag (day_view, row, day);
-}
-
-
-static void
-e_day_view_update_main_canvas_drag (EDayView *day_view,
-				    gint row,
-				    gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && day_view->drag_last_row == row
-	    && (day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-	day_view->drag_last_row = row;
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	cols_in_row = 1;
-	start_row = 0;
-	start_col = 0;
-	num_columns = 1;
-	num_rows = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-		start_row = event->start_minute / day_view->mins_per_row;
-		end_row = (event->end_minute - 1) / day_view->mins_per_row;
-		num_rows = end_row - start_row + 1;
-	}
-
-	if (day_view->drag_event_day == day && start_row == row) {
-		cols_in_row = day_view->cols_per_row[day][row];
-		start_col = event->start_row_or_col;
-		num_columns = event->num_columns;
-	}
-
-	item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->row_height;
-	item_h = num_rows * day_view->row_height;
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_item,
-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);
-
-	if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_bar_item);
-		gnome_canvas_item_show (day_view->drag_bar_item);
-	}
-
-	if (!(day_view->drag_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_rect_item);
-		gnome_canvas_item_show (day_view->drag_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_item);
-		gnome_canvas_item_show (day_view->drag_item);
-
-		g_free (text);
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-				     GdkDragContext *context,
-				     guint           time,
-				     EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-	/* Hide the resize bars if they are being used in the drag. */
-	if (day_view->drag_event_day == day_view->resize_bars_event_day
-	    && day_view->drag_event_num == day_view->resize_bars_event_num) {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-}
-
-
-static void
-e_day_view_on_drag_begin (GtkWidget      *widget,
-			  GdkDragContext *context,
-			  EDayView	 *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	/* Hide the text item, since it will be shown in the special drag
-	   items. */
-	gnome_canvas_item_hide (event->canvas_item);
-}
-
-
-static void
-e_day_view_on_drag_end (GtkWidget      *widget,
-			GdkDragContext *context,
-			EDayView       *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* If the calendar has already been updated in drag_data_received()
-	   we just return. */
-	if (day == -1 || event_num == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-
-	/* Show the text item again. */
-	gnome_canvas_item_show (event->canvas_item);
-
-	day_view->drag_event_day = -1;
-	day_view->drag_event_num = -1;
-}
-
-
-static void
-e_day_view_on_drag_data_get (GtkWidget          *widget,
-			     GdkDragContext     *context,
-			     GtkSelectionData   *selection_data,
-			     guint               info,
-			     guint               time,
-			     EDayView		*day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *event_uid;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-
-	cal_component_get_uid (event->comp, &event_uid);
-
-	g_return_if_fail (event_uid != NULL);
-
-	if (info == TARGET_CALENDAR_EVENT) {
-		gtk_selection_data_set (selection_data,	selection_data->target,
-					8, event_uid, strlen (event_uid));
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
-					      GdkDragContext     *context,
-					      gint                x,
-					      gint                y,
-					      GtkSelectionData   *data,
-					      guint               info,
-					      guint               time,
-					      EDayView	         *day_view)
-{
-	EDayViewEvent *event=NULL;
-	EDayViewPosition pos;
-	gint day, start_day, end_day, num_days;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_days = 1;
-			start_offset = 0;
-			end_offset = -1;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (day_view,
-								 event,
-								 &start_day,
-								 &end_day);
-				num_days = end_day - start_day + 1;
-				/* Make sure we don't go off the screen. */
-				day = MIN (day, day_view->days_shown - num_days);
-
-				start_offset = event->start_minute;
-				end_offset = event->end_minute;
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow of the comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			if (end_offset == -1 || end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "
-					   "not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
-					       GdkDragContext     *context,
-					       gint                x,
-					       gint                y,
-					       GtkSelectionData   *data,
-					       guint               info,
-					       guint               time,
-					       EDayView		  *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	x += scroll_x;
-	y += scroll_y;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_rows = 1;
-			start_offset = 0;
-			end_offset = 0;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-				row -= day_view->drag_event_offset;
-
-				/* Calculate time offset from start row. */
-				start_row = event->start_minute / day_view->mins_per_row;
-				end_row = (event->end_minute - 1) / day_view->mins_per_row;
-				num_rows = end_row - start_row + 1;
-
-				start_offset = event->start_minute % day_view->mins_per_row;
-				end_offset = event->end_minute % day_view->mins_per_row;
-				if (end_offset != 0)
-					end_offset = day_view->mins_per_row - end_offset;
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow copy of comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_main_canvas_drag_data_received(): "
-					   "Could not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-/* 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 (day_view->use_24_hour_format) {
-		*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 (!day_view->use_24_hour_format)
-		time_width += MAX (day_view->am_string_width,
-				   day_view->pm_string_width);
-
-	return time_width;
-}
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index 2379a76b87..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,621 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_H_
-#define _E_DAY_VIEW_H_
-
-#include <time.h>
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-/* The maximum number of days shown. We use the week view for anything more
-   than about 9 days. */
-#define E_DAY_VIEW_MAX_DAYS		10
-
-/* This is used as a special code to signify a long event instead of the day
-   of a normal event. */
-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
-
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
-
-/* The width of the gap between appointments. This should be at least
-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
-   the triangle to represent continuing events. */
-#define E_DAY_VIEW_GAP_WIDTH		7
-
-/* The width of the bars down the left of each column and appointment.
-   This includes the borders on each side of it. */
-#define E_DAY_VIEW_BAR_WIDTH		7
-
-/* The height of the horizontal bar above & beneath the selected event.
-   This includes the borders on the top and bottom. */
-#define E_DAY_VIEW_BAR_HEIGHT		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_DAY_VIEW_ICON_WIDTH		16
-#define E_DAY_VIEW_ICON_HEIGHT		16
-#define E_DAY_VIEW_ICON_X_PAD		0
-#define E_DAY_VIEW_ICON_Y_PAD		0
-
-/* The size of the border around the event. */
-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_DAY_VIEW_EVENT_X_PAD		2
-#define E_DAY_VIEW_EVENT_Y_PAD		1
-
-/* The padding on each side of the event text for events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2
-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2
-
-/* The size of the border around the long events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1
-
-/* The space between the time and the icon/text in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2
-
-/* The gap between rows in the top canvas. */
-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	E_DAY_VIEW_SUNDAY	= 1 << 0,
-	E_DAY_VIEW_MONDAY	= 1 << 1,
-	E_DAY_VIEW_TUESDAY	= 1 << 2,
-	E_DAY_VIEW_WEDNESDAY	= 1 << 3,
-	E_DAY_VIEW_THURSDAY	= 1 << 4,
-	E_DAY_VIEW_FRIDAY	= 1 << 5,
-	E_DAY_VIEW_SATURDAY	= 1 << 6
-} EDayViewDays;
-
-
-/* These are used to specify the type of an appointment. They match those
-   used in EMeetingTimeSelector. */
-typedef enum
-{
-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,
-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,
-	E_DAY_VIEW_BUSY_BUSY		= 2,
-
-	E_DAY_VIEW_BUSY_LAST		= 3
-} EDayViewBusyType;
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Thursday 12 September'. The abbreviated format is
-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
-   is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
-typedef enum
-{
-	E_DAY_VIEW_DATE_FULL,
-	E_DAY_VIEW_DATE_ABBREVIATED,
-	E_DAY_VIEW_DATE_NO_WEEKDAY,
-	E_DAY_VIEW_DATE_SHORT
-} EDayViewDateFormat;
-
-/* These index our colors array. */
-typedef enum
-{
-	E_DAY_VIEW_COLOR_BG_WORKING,
-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,
-	E_DAY_VIEW_COLOR_BG_SELECTED,
-	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;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_DAY_VIEW_POS_OUTSIDE,
-	E_DAY_VIEW_POS_NONE,
-	E_DAY_VIEW_POS_EVENT,
-	E_DAY_VIEW_POS_LEFT_EDGE,
-	E_DAY_VIEW_POS_RIGHT_EDGE,
-	E_DAY_VIEW_POS_TOP_EDGE,
-	E_DAY_VIEW_POS_BOTTOM_EDGE
-} EDayViewPosition;
-
-typedef struct _EDayViewEvent EDayViewEvent;
-struct _EDayViewEvent {
-	CalComponent *comp;
-
-	/* These are the times of this specific occurrence of the event. */
-	time_t start;
-	time_t end;
-
-	/* 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;
-
-	/* These are minute offsets from the first time shown in the view.
-	   They range from 0 to 24 * 60. Currently the main canvas always
-	   starts at 12am  and the code to handle starting at other times
-	   isn't finished. */
-	guint16 start_minute;
-	guint16 end_minute;
-
-	/* This is the EText item containing the event summary. */
-	GnomeCanvasItem *canvas_item;
-};
-
-
-#define E_DAY_VIEW(obj)          GTK_CHECK_CAST (obj, e_day_view_get_type (), EDayView)
-#define E_DAY_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
-#define E_IS_DAY_VIEW(obj)       GTK_CHECK_TYPE (obj, e_day_view_get_type ())
-
-
-typedef struct _EDayView       EDayView;
-typedef struct _EDayViewClass  EDayViewClass;
-
-struct _EDayView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates and long appointments are shown. */
-	GtkWidget *top_canvas;
-	GnomeCanvasItem *top_canvas_item;
-
-	/* The main canvas where the rest of the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	/* The canvas displaying the times of the day. */
-	GtkWidget *time_canvas;
-	GnomeCanvasItem *time_canvas_item;
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The start and end of the 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 our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* The number of minutes per row. 5, 10, 15, 30 or 60. */
-	gint mins_per_row;
-
-	/* The number of rows needed, depending on the times shown and the
-	   minutes per row. */
-	gint rows;
-
-	/* The height of each row. */
-	gint row_height;
-
-	/* The number of rows in the top display. */
-	gint rows_in_top_display;
-
-	/* The height of each row in the top canvas. */
-	gint top_row_height;
-
-	/* The first and last times shown in the display. The last time isn't
-	   included in the range. Default is 0:00-24:00 */
-	gint first_hour_shown;
-	gint first_minute_shown;
-	gint last_hour_shown;
-	gint last_minute_shown;
-
-	/* Bitwise combination of working days. Defaults to Mon-Fri. */
-	EDayViewDays working_days;
-
-	/* The start and end of the work day, rounded to the nearest row. */
-	gint work_day_start_hour;
-	gint work_day_start_minute;
-	gint work_day_end_hour;
-	gint work_day_end_minute;
-
-	/* Whether we use 12-hour of 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* 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. */
-	GdkFont *large_font;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_DAY_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-	GdkCursor *resize_height_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set_in_top_canvas;
-	GdkCursor *last_cursor_set_in_main_canvas;
-
-	/*
-	 * Editing, Selection & Dragging data
-	 */
-
-	/* The horizontal bars to resize events in the main canvas. */
-	GnomeCanvasItem *main_canvas_top_resize_bar_item;
-	GnomeCanvasItem *main_canvas_bottom_resize_bar_item;
-
-	/* The event currently being edited. The day is -1 if no event is
-	 being edited, or E_DAY_VIEW_LONG_EVENT if a long event is edited. */
-	gint editing_event_day;
-	gint editing_event_num;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *resize_long_event_rect_item;
-	GnomeCanvasItem *resize_rect_item;
-	GnomeCanvasItem *resize_bar_item;
-
-	/* The event for which a popup menu is being displayed, as above. */
-	gint popup_event_day;
-	gint popup_event_num;
-
-	/* The currently selected region. If selection_start_day is -1 there is
-	   no current selection. If start_row or end_row is -1 then the
-	   selection is in the top canvas. */
-	gint selection_start_day;
-	gint selection_end_day;
-	gint selection_start_row;
-	gint selection_end_row;
-
-	/* This is TRUE if the selection is currently being dragged using the
-	   mouse. */
-	gboolean selection_is_being_dragged;
-
-	/* This specifies which end of the selection is being dragged. */
-	EDayViewDragPosition selection_drag_pos;
-
-	/* This is TRUE if the selection is in the top canvas only (i.e. if the
-	   last motion event was in the top canvas). */
-	gboolean selection_in_top_canvas;
-
-	/* The last mouse position, relative to the main canvas window.
-	   Used when auto-scrolling to update the selection. */
-	gint last_mouse_x;
-	gint last_mouse_y;
-
-	/* Auto-scroll info for when selecting an area or dragging an item. */
-	gint auto_scroll_timeout_id;
-	gint auto_scroll_delay;
-	gboolean auto_scroll_up;
-
-	/* These are used for the resize bars. */
-	gint resize_bars_event_day;
-	gint resize_bars_event_num;
-
-	/* These are used when resizing events. */
-	gint resize_event_day;
-	gint resize_event_num;
-	EDayViewPosition resize_drag_pos;
-	gint resize_start_row;
-	gint resize_end_row;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_day;
-	gint pressed_event_num;
-
-	/* These are used when dragging events. If drag_event_day is not -1 we
-	   know that we are dragging one of the EDayView events around. */
-	gint drag_event_day;
-	gint drag_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* The offset of the mouse from the top of the event, in rows.
-	   In the top canvas this is the offset from the left, in days. */
-	gint drag_event_offset;
-
-	/* The last day & row dragged to, so we know when we need to update
-	   the dragged event's position. */
-	gint drag_last_day;
-	gint drag_last_row;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *drag_long_event_rect_item;
-	GnomeCanvasItem *drag_long_event_item;
-	GnomeCanvasItem *drag_rect_item;
-	GnomeCanvasItem *drag_bar_item;
-	GnomeCanvasItem *drag_item;
-
-	/* "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
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_day_view_get_type			(void);
-GtkWidget* e_day_view_new			(void);
-
-void       e_day_view_set_calendar		(EDayView	*day_view,
-						 GnomeCalendar	*calendar);
-
-void       e_day_view_set_cal_client		(EDayView	*day_view,
-						 CalClient	*client);
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void       e_day_view_set_selected_time_range	(EDayView	*day_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-/* Returns the selected time range. */
-void       e_day_view_get_selected_time_range	(EDayView	*day_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-
-/* This is called when one event has been added or updated. */
-void       e_day_view_update_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* This removes all the events associated with the given uid. Note that for
-   recurring events there may be more than one. If any events are found and
-   removed we need to layout the events again. */
-void	   e_day_view_remove_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);
-void	   e_day_view_set_work_week_view	(EDayView	*day_view,
-						 gboolean	 work_week_view);
-
-/* The number of days shown in the EDayView, from 1 to 7. This is normally
-   either 1 or 5 (for the Work-Week view). */
-gint	   e_day_view_get_days_shown		(EDayView	*day_view);
-void	   e_day_view_set_days_shown		(EDayView	*day_view,
-						 gint		 days_shown);
-
-/* This specifies how many minutes are represented by one row in the display.
-   It can be 60, 30, 15, 10 or 5. The default is 30. */
-gint	   e_day_view_get_mins_per_row		(EDayView	*day_view);
-void	   e_day_view_set_mins_per_row		(EDayView	*day_view,
-						 gint		 mins_per_row);
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays e_day_view_get_working_days	(EDayView	*day_view);
-void	   e_day_view_set_working_days		(EDayView	*day_view,
-						 EDayViewDays	 days);
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void	   e_day_view_get_working_day		(EDayView	*day_view,
-						 gint		*start_hour,
-						 gint		*start_minute,
-						 gint		*end_hour,
-						 gint		*end_minute);
-void	   e_day_view_set_working_day		(EDayView	*day_view,
-						 gint		 start_hour,
-						 gint		 start_minute,
-						 gint		 end_hour,
-						 gint		 end_minute);
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean   e_day_view_get_24_hour_format	(EDayView	*day_view);
-void	   e_day_view_set_24_hour_format	(EDayView	*day_view,
-						 gboolean	 use_24_hour);
-
-/* 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);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void	   e_day_view_check_layout		(EDayView	*day_view);
-gint	   e_day_view_convert_time_to_row	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gint	   e_day_view_convert_time_to_position	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gboolean   e_day_view_get_event_position	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_get_long_event_position	(EDayView	*day_view,
-						 gint		 event_num,
-						 gint		*start_day,
-						 gint		*end_day,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_find_long_event_days	(EDayView	*day_view,
-						 EDayViewEvent	*event,
-						 gint		*start_day,
-						 gint		*end_day);
-
-void	   e_day_view_start_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_update_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_finish_selection		(EDayView	*day_view);
-
-void	   e_day_view_check_auto_scroll		(EDayView	*day_view,
-						 gint		 event_x,
-						 gint		 event_y);
-void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);
-
-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);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_H_ */
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
deleted file mode 100644
index 65905b7efb..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,1073 +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 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <glade/glade.h>
-#include <ical.h>
-#include <Evolution-Composer.h>
-
-#include "e-itip-control.h"
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-#include "itip-utils.h"
-
-#define MAIL_COMPOSER_OAF_IID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-#define DEFAULT_WIDTH 400
-#define DEFAULT_HEIGHT 300
-
-extern gchar *evolution_dir;
-
-typedef struct _EItipControlPrivate EItipControlPrivate;
-
-struct _EItipControlPrivate {
-	GladeXML *xml, *xml2;
-	GtkWidget *main_frame;
-	GtkWidget *organizer_entry, *dtstart_label, *dtend_label;
-	GtkWidget *summary_entry, *description_box, *message_text;
-	GtkWidget *button_box;
-	GtkWidget *address_entry;
-	GtkWidget *add_button;
-	GtkWidget *loading_window;
-	GtkWidget *loading_progress;
-
-	icalcomponent *main_comp, *comp;
-	CalComponent *cal_comp;
-	char *vcalendar;
-	gchar *from_address, *my_address, *organizer;
-	icalparameter_partstat new_partstat;
-};
-
-enum E_ITIP_BONOBO_ARGS {
-	FROM_ADDRESS_ARG_ID,
-	MY_ADDRESS_ARG_ID
-};
-
-
-/********
- * find_attendee() searches through the attendee properties of `comp'
- * and returns the one the value of which is the same as `address' if such
- * a property exists. Otherwise, it will return NULL.
- ********/
-static icalproperty *
-find_attendee (icalcomponent *comp, char *address)
-{
-	icalproperty *prop;
-	const char *attendee, *text;
-	icalvalue *value;
-	
-	for (prop = icalcomponent_get_first_property (comp, ICAL_ATTENDEE_PROPERTY);
-	     prop != NULL;
-	     prop = icalcomponent_get_next_property (comp, ICAL_ATTENDEE_PROPERTY))
-	{
-		value = icalproperty_get_value (prop);
-		if (!value)
-			continue;
-
-		attendee = icalvalue_get_string (value);
-
-		/* Here I strip off the "MAILTO:" if it is present. */
-		text = strchr (attendee, ':');
-		if (text != NULL)
-			text++;
-		else
-			text = attendee;
-
-		if (strcmp (text, address) == 0) {
-			/* We have found the correct property. */
-			break;
-		}
-	}
-			
-	return prop;
-}
-
-static void
-itip_control_destroy_cb (GtkObject *object,
-		    gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-	gtk_object_unref (GTK_OBJECT (priv->xml2));
-
-	if (priv->main_comp != NULL) {
-		if (priv->comp != NULL)
-			icalcomponent_remove_component (priv->main_comp, priv->comp);
-	
-		icalcomponent_free (priv->main_comp);
-	}
-
-
-	if (priv->cal_comp != NULL) {
-		gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-	}
-
-	if (priv->from_address != NULL)
-		g_free (priv->from_address);
-	
-	if (priv->organizer != NULL)
-		g_free (priv->organizer);
-
-	if (priv->vcalendar != NULL)
-		g_free (priv->vcalendar);
-
-	g_free (priv);
-}
-	
-
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	gtk_widget_hide (priv->loading_progress);
-
-	if (status == CAL_CLIENT_OPEN_SUCCESS) {
-		if (cal_client_update_object (client, priv->cal_comp) == FALSE) {
-			GtkWidget *dialog;
-	
-			dialog = gnome_warning_dialog(_("I couldn't update your calendar file!\n"));
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		} else {
-			/* We have success. */
-			GtkWidget *dialog;
-	
-			dialog = gnome_ok_dialog(_("Component successfully updated."));
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-	} else {
-		GtkWidget *dialog;
-
-		dialog = gnome_ok_dialog(_("There was an error loading the calendar file."));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-
-	gtk_object_unref (GTK_OBJECT (client));
-	return;
-}
-
-static void
-update_calendar (EItipControlPrivate *priv)
-{
-	gchar cal_uri[255];
-	CalClient *client;
-
-	snprintf (cal_uri, 250, "%s/local/Calendar/calendar.ics", evolution_dir);
-	
-	client = cal_client_new ();
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",
-	    	   	    GTK_SIGNAL_FUNC (cal_opened_cb), priv);
-	
-	if (cal_client_open_calendar (client, cal_uri, FALSE) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't open your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (client));
-	
-		return;
-	}
-
-	gtk_progress_bar_update (GTK_PROGRESS_BAR (priv->loading_progress), 0.5);
-	gtk_widget_show (priv->loading_progress);
-
-	return;
-}
-
-static void
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	update_calendar (priv);
-
-	return;
-}
-
-static void
-change_my_status (icalparameter_partstat status, EItipControlPrivate *priv)
-{
-	icalproperty *prop;
-
-	prop = find_attendee (priv->comp, priv->my_address);
-	if (prop) {
-		icalparameter *param;
-
-		icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-		param = icalparameter_new_partstat (status);
-		icalproperty_add_parameter (prop, param);
-	}
-}
-
-static void
-send_itip_reply (EItipControlPrivate *priv)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	CORBA_char *subject;
-	CalComponentText caltext;
-	CORBA_char *content_type, *filename, *description, *attach_data;
-	CORBA_boolean show_inline;
-	CORBA_char tempstr[200];
-	
-	CORBA_exception_init (&ev);
-
-	/* First, I obtain an object reference that represents the Composer. */
-	bonobo_server = bonobo_object_activate (MAIL_COMPOSER_OAF_IID, 0);
-
-	g_return_if_fail (bonobo_server != NULL);
-
-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));
-
-	/* Now I have to make a CORBA sequence that represents a recipient list with
-	   one item, for the organizer. */
-	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to_list->_maximum = 1;
-	to_list->_length = 1; 
-	to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1);
-
-	recipient = &(to_list->_buffer[0]);
-	recipient->name = CORBA_string_alloc (0);  /* FIXME: we may want an actual name here. */
-	recipient->name[0] = '\0';
-	recipient->address = CORBA_string_alloc (strlen (priv->organizer));
-	strcpy (recipient->address, priv->organizer);
-
-	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;
-
-	cal_component_get_summary (priv->cal_comp, &caltext);
-	subject = CORBA_string_alloc (strlen (caltext.value));
-	strcpy (subject, caltext.value);
-	
-	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;
-	}
-
-	sprintf (tempstr, "text/calendar;METHOD=REPLY");
-	content_type = CORBA_string_alloc (strlen (tempstr));
-	strcpy (content_type, tempstr);
-	filename = CORBA_string_alloc (0);
-	filename[0] = '\0';
-	sprintf (tempstr, "Calendar attachment");
-	description = CORBA_string_alloc (strlen (tempstr));
-	strcpy (description, tempstr);
-	show_inline = FALSE;
-
-	/* I need to create an encapsulating iCalendar component, and stuff our reply event
-	   into it. */
-	{
-		icalcomponent *comp;
-		icalproperty *prop;
-		icalvalue *value;
-		gchar *ical_string;
-
-		comp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-		
-		prop = icalproperty_new (ICAL_PRODID_PROPERTY);
-		value = icalvalue_new_text ("-//HelixCode/Evolution//EN");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_VERSION_PROPERTY);
-		value = icalvalue_new_text ("2.0");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_METHOD_PROPERTY);
-		value = icalvalue_new_text ("REPLY");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		icalcomponent_remove_component (priv->main_comp, priv->comp);
-		icalcomponent_add_component (comp, priv->comp);
-
-		ical_string = icalcomponent_as_ical_string (comp);
-		attach_data = CORBA_string_alloc (strlen (ical_string));
-		strcpy (attach_data, ical_string);
-
-		icalcomponent_remove_component (comp, priv->comp);
-		icalcomponent_add_component (priv->main_comp, priv->comp);
-		icalcomponent_free (comp);
-
-	}
-	
-	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;
-	}
-
-	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);
-
-	/* Here is where we free our graciously-allocated memory. */
-	if (CORBA_sequence_get_release (to_list) != FALSE)
-		CORBA_free (to_list->_buffer);
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-
-	CORBA_free (subject);
-	CORBA_free (content_type);
-	CORBA_free (filename);
-	CORBA_free (description);
-	CORBA_free (attach_data);
-
-}
-
-static void
-accept_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	change_my_status (ICAL_PARTSTAT_ACCEPTED, priv);
-	send_itip_reply (priv);
-	update_calendar (priv);
-	
-	return;
-}
-
-static void
-tentative_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	change_my_status (ICAL_PARTSTAT_TENTATIVE, priv);
-	send_itip_reply (priv);
-	update_calendar (priv);
-	
-	return;
-}
-
-static void
-decline_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	change_my_status (ICAL_PARTSTAT_DECLINED, priv);
-	send_itip_reply (priv);
-	
-	return;
-}
-
-
-/********
- * load_calendar_store() opens and loads the calendar referred to by cal_uri
- * and sets cal_client as a client for that store. If cal_uri is NULL,
- * we load the default calendar URI.  If all goes well, it returns TRUE;
- * otherwise, it returns FALSE.
- ********/
-static gboolean
-load_calendar_store (char *cal_uri, CalClient **cal_client)
-{
-	char uri_buf[255];
-	char *uri;
-	
-	if (cal_uri == NULL) {
-		snprintf (uri_buf, 250, "%s/local/Calendar/calendar.ics", evolution_dir);
-		uri = uri_buf;
-	}
-	else {
-		uri = cal_uri;
-	}
-
-	*cal_client = cal_client_new ();
-	if (cal_client_open_calendar (*cal_client, uri, FALSE) == FALSE) {
-		return FALSE;
-	}
-
-	/* FIXME!!!!!!  This is fucking ugly. */
-
-	while (!cal_client_get_load_state (*cal_client) != CAL_CLIENT_LOAD_LOADED) {
-		gtk_main_iteration_do (FALSE);  /* Do a non-blocking iteration. */
-		usleep (200000L);   /* Pause for 1/5th of a second before checking again.*/
-	}
-
-	return TRUE;
-}
-
-
-static void
-update_reply_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-	CalClient *cal_client;
-	CalComponent *cal_comp;
-	icalcomponent *comp;
-	icalproperty *prop;
-	icalparameter *param;
-	const char *uid;
-
-	if (load_calendar_store (NULL, &cal_client) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't load your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-	
-		return;
-	}
-	
-
-	cal_component_get_uid (priv->cal_comp, &uid);
-	if (cal_client_get_object (cal_client, uid, &cal_comp) != CAL_CLIENT_GET_SUCCESS) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't read your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-	
-		return;
-	}
-
-	comp = cal_component_get_icalcomponent (cal_comp);
-
-	prop = find_attendee (comp, priv->from_address);
-	if (!prop) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("This is a reply from someone who was uninvited!"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-		gtk_object_unref (GTK_OBJECT (cal_comp));
-	
-		return;
-	}
-	
-	icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-	param = icalparameter_new_partstat (priv->new_partstat);
-	icalproperty_add_parameter (prop, param);
-
-	/* Now we need to update the object in the calendar store. */
-	if (!cal_client_update_object (cal_client, cal_comp)) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't update your calendar store."));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-		gtk_object_unref (GTK_OBJECT (cal_comp));
-	
-		return;
-	}
-	else {
-		/* We have success. */
-		GtkWidget *dialog;
-
-		dialog = gnome_ok_dialog(_("Component successfully updated."));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-
-	
-	gtk_object_unref (GTK_OBJECT (cal_client));
-	gtk_object_unref (GTK_OBJECT (cal_comp));
-}
-
-static void
-cancel_meeting_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-	CalClient *cal_client;
-	const char *uid;
-
-	if (load_calendar_store (NULL, &cal_client) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't load your calendar file!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-	
-		return;
-	}
-
-	cal_component_get_uid (priv->cal_comp, &uid);
-	if (cal_client_remove_object (cal_client, uid) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I couldn't delete the calendar component!\n"));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (cal_client));
-	
-		return;
-	}
-	else {
-		/* We have success! */
-		GtkWidget *dialog;
-
-		dialog = gnome_ok_dialog(_("Component successfully deleted."));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-		
-}
-
-
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	gchar *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-	  data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gint pos, length, length2;
-	icalcompiter iter;
-	icalcomponent_kind comp_kind;
-	char message[256];
-	
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((priv->vcalendar = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	/* Do something with the data, here. */
-
-	priv->main_comp = icalparser_parse_string (priv->vcalendar);
-	if (priv->main_comp == NULL) {
-		g_printerr ("e-itip-control.c: the iCalendar data was invalid!\n");
-		return;
-	}
-
-	iter = icalcomponent_begin_component (priv->main_comp, ICAL_ANY_COMPONENT);
-	priv->comp = icalcompiter_deref (&iter);
-
-#if 0
-	{   
-		FILE *fp;
-
-		fp = fopen ("evo.debug", "w");
-
-		fputs ("The raw vCalendar data:\n\n", fp);
-		fputs (priv->vcalendar, fp);
-
-		fputs ("The main component:\n\n", fp);
-		fputs (icalcomponent_as_ical_string (priv->main_comp), fp);
-
-		fputs ("The child component:\n\n", fp);
-		fputs (icalcomponent_as_ical_string (priv->comp), fp);
-
-		fclose (fp);
-	}
-#endif
-
-	if (priv->comp == NULL) {
-		g_printerr ("e-itip-control.c: I could not extract a proper component from\n"
-			    "     the vCalendar data.\n");
-		icalcomponent_free (priv->main_comp);
-		return;
-	}
-
-	comp_kind = icalcomponent_isa (priv->comp);
-
-	switch (comp_kind) {
-	case ICAL_VEVENT_COMPONENT:
-	case ICAL_VTODO_COMPONENT:
-	case ICAL_VJOURNAL_COMPONENT:
-		priv->cal_comp = cal_component_new ();
-		if (cal_component_set_icalcomponent (priv->cal_comp, priv->comp) == FALSE) {
-			g_printerr ("e-itip-control.c: I couldn't create a CalComponent from the iTip data.\n");
-			gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-		}
-		break;
-	case ICAL_VFREEBUSY_COMPONENT:
-		/* Take care of busy time information. */
-		return;
-		break;
-	default:
-		/* We don't know what this is, so bail. */
-		{
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog(_("I don't recognize this type of calendar component."));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-
-		g_free (priv->vcalendar);
-		priv->vcalendar = NULL;
-
-		return;
-		}
-		break;
-	} /* End switch. */
-
-
-	/* Okay, good then; now I will pick apart the component to get
-	 all the things I'll show in my control. */
-	{
-		icalproperty *prop;
-		const char *description, *summary;
-		const char *new_text;
-		const char *organizer;
-		struct icaltimetype dtstart, dtend;
-		time_t tstart, tend;
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_ORGANIZER_PROPERTY);
-		if (prop) {
-			organizer = icalproperty_get_organizer (prop);
-		
-			/* Here I strip off the "MAILTO:" if it is present. */
-			new_text = strchr (organizer, ':');
-			if (new_text != NULL)
-				new_text++;
-			else
-				new_text = organizer;
-
-			priv->organizer = g_strdup (new_text);
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), new_text);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_SUMMARY_PROPERTY);
-		if (prop) {
-			summary = icalproperty_get_summary (prop);
-			gtk_entry_set_text (GTK_ENTRY (priv->summary_entry), summary);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DESCRIPTION_PROPERTY);
-		if (prop) {
-			description = icalproperty_get_summary (prop);
-	
-			pos = 0;
-			length = strlen (description);
-			length2 = strlen (gtk_editable_get_chars 
-						(GTK_EDITABLE (priv->description_box), 0, -1));
-		
-			if (length2 > 0)
-				gtk_editable_delete_text (GTK_EDITABLE (priv->description_box), 0, length2);
-		
-			gtk_editable_insert_text (GTK_EDITABLE (priv->description_box),
-						  description,
-						  length,
-						  &pos);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTSTART_PROPERTY);
-		dtstart = icalproperty_get_dtstart (prop);
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTEND_PROPERTY);
-		dtend = icalproperty_get_dtend (prop);
-
-		tstart = icaltime_as_timet (dtstart);
-		tend = icaltime_as_timet (dtend);
-
-		gtk_label_set_text (GTK_LABEL (priv->dtstart_label), ctime (&tstart));
-		gtk_label_set_text (GTK_LABEL (priv->dtend_label), ctime (&tend));
-
-		/* Clear out any old-assed text that's been lying around in my message box. */
-		gtk_editable_delete_text (GTK_EDITABLE (priv->message_text), 0, -1);
-
-		prop = icalcomponent_get_first_property (priv->main_comp, ICAL_METHOD_PROPERTY);
-		switch (icalproperty_get_method (prop)) {
-		case ICAL_METHOD_PUBLISH:
-			{
-			GtkWidget *button;
-
-			snprintf (message, 250, "%s has published calendar information, "
-				 	  "which you can add to your own calendar. "
-				 	  "No reply is necessary.", 
-				 priv->from_address);
-			
-			button =  gtk_button_new_with_label (_("Add to Calendar"));
-			gtk_box_pack_start (GTK_BOX (priv->button_box), button, FALSE, FALSE, 3);
-			gtk_widget_show (button);
-
-			gtk_signal_connect (GTK_OBJECT (button), "clicked",
-					    GTK_SIGNAL_FUNC (add_button_clicked_cb), priv);
-			
-			break;
-			}
-		case ICAL_METHOD_REQUEST:
-			{
-			/* I'll check if I have to rsvp. */
-			icalproperty *prop;
-			icalparameter *param;
-			int rsvp = FALSE;
-
-			prop = find_attendee (priv->comp, priv->my_address);
-			if (prop) {
-				param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	
-				if (param) {
-					if (icalparameter_get_rsvp (param))
-						rsvp = TRUE;
-				}
-			}
-
-			snprintf (message, 250, "This is a meeting organized by %s, "
-					  "who indicated that you %s RSVP.",
-				 (priv->organizer ? priv->organizer : "an unknown person"), 
-				 (rsvp ? "should" : "don't have to") );
-
-			if (rsvp) {
-				GtkWidget *accept_button, *decline_button, *tentative_button;
-
-				accept_button = gtk_button_new_with_label (_("Accept"));
-				decline_button = gtk_button_new_with_label (_("Decline"));
-				tentative_button = gtk_button_new_with_label (_("Tentative"));
-
-				gtk_box_pack_start (GTK_BOX (priv->button_box), accept_button, FALSE, FALSE, 3);
-				gtk_box_pack_start (GTK_BOX (priv->button_box), decline_button, FALSE, FALSE, 3);
-				gtk_box_pack_start (GTK_BOX (priv->button_box), tentative_button, FALSE, FALSE, 3);
-
-				gtk_signal_connect (GTK_OBJECT (accept_button), "clicked",
-						    GTK_SIGNAL_FUNC (accept_button_clicked_cb), priv);
-				gtk_signal_connect (GTK_OBJECT (tentative_button), "clicked",
-						    GTK_SIGNAL_FUNC (tentative_button_clicked_cb), priv);
-				gtk_signal_connect (GTK_OBJECT (decline_button), "clicked",
-						    GTK_SIGNAL_FUNC (decline_button_clicked_cb), priv);
-
-				gtk_widget_show (accept_button);
-				gtk_widget_show (decline_button);
-				gtk_widget_show (tentative_button);
-			}
-
-			}
-			break;
-		case ICAL_METHOD_REPLY:
-			{
-			icalproperty *prop;
-			icalparameter *param;
-			gboolean success = FALSE;
-
-			prop = find_attendee (priv->comp, priv->from_address);
-			if (prop) {
-				param = get_icalparam_by_type (prop, ICAL_PARTSTAT_PARAMETER);
-				if (param) {
-					success = TRUE;
-
-					priv->new_partstat = icalparameter_get_partstat (param);
-				}
-			}
-
-			if (!success) {
-				snprintf (message, 250, "%s sent a reply to a meeting request, but "
-						  "the reply is not properly formed.",
-					 priv->from_address);
-			}
-			else {
-				GtkWidget *button;
-		
-				button =  gtk_button_new_with_label (_("Update Calendar"));
-				gtk_box_pack_start (GTK_BOX (priv->button_box), button, FALSE, FALSE, 3);
-				gtk_widget_show (button);
-	
-				gtk_signal_connect (GTK_OBJECT (button), "clicked",
-						    GTK_SIGNAL_FUNC (update_reply_cb), priv);
-				
-				snprintf (message, 250, "%s responded to your request, replying with: %s",
-					 priv->from_address, partstat_values[priv->new_partstat]);
-			}
-
-			}
-			break;
-		case ICAL_METHOD_CANCEL:
-			{
-			if (strcmp (priv->organizer, priv->from_address) != 0) {
-				snprintf (message, 250, "%s sent a cancellation request, but is not "
-					  		"the organizer of the meeting.",
-					  priv->from_address);
-			}
-			else {
-				GtkWidget *button;
-
-				button =  gtk_button_new_with_label (_("Cancel Meeting"));
-				gtk_box_pack_start (GTK_BOX (priv->button_box), button, FALSE, FALSE, 3);
-				gtk_widget_show (button);
-
-				gtk_signal_connect (GTK_OBJECT (button), "clicked",
-						    GTK_SIGNAL_FUNC (cancel_meeting_cb), priv);
-
-				snprintf (message, 250, "%s sent a cancellation request. You can"
-							" delete this event from your calendar, if you wish.",
-					  priv->organizer);
-			}
-
-			}
-			break;
-		default:
-			snprintf (message, 250, "I haven't the slightest notion what this calendar "
-					  "object represents. Sorry.");
-		}
-
-		{
-		int pos = 0;
-
-		gtk_editable_insert_text (GTK_EDITABLE (priv->message_text), message,
-					  strlen (message), &pos);
-		}
-	}
-
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	/* Put something into vcalendar here. */
-	length = strlen (priv->vcalendar);
-
-	bonobo_stream_client_write (stream, priv->vcalendar, length, ev);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-  
-  	if (priv->vcalendar)
-		return strlen (priv->vcalendar);
-	else
-		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)
-{
-	EItipControlPrivate *priv = user_data;
-
-	if (arg_id == FROM_ADDRESS_ARG_ID) {
-		BONOBO_ARG_SET_STRING (arg, priv->from_address);
-	}
-	else if (arg_id == MY_ADDRESS_ARG_ID) {
-		BONOBO_ARG_SET_STRING (arg, priv->my_address);
-	}
-}
-
-static void
-set_prop ( BonoboPropertyBag *bag, 
-	   const BonoboArg *arg,
-	   guint arg_id, 
-	   CORBA_Environment *ev,
-	   gpointer user_data)
-{
-	EItipControlPrivate *priv = user_data;
-
-	if (arg_id == FROM_ADDRESS_ARG_ID) {
-		if (priv->from_address)
-			g_free (priv->from_address);
-	
-		
-		priv->from_address = g_strdup (BONOBO_ARG_GET_STRING (arg));
-
-		/* Let's set the widget here, though I'm not sure if
-		   it will work. */
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), priv->from_address);
-		
-	}
-	else if (arg_id == MY_ADDRESS_ARG_ID) {
-		if (priv->my_address)
-			g_free (priv->my_address);
-		
-		priv->my_address = g_strdup (BONOBO_ARG_GET_STRING (arg));
-	}
-}
-
-
-static BonoboObject *
-e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl      *control;
-	BonoboPropertyBag *prop_bag;
-	BonoboPersistStream *stream;
-	EItipControlPrivate *priv;
-
-	priv = g_new0 (EItipControlPrivate, 1);
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" "e-itip-control.glade", "main_frame");
-
-	/* Create the control. */
-	priv->main_frame = glade_xml_get_widget (priv->xml, "main_frame");
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-	priv->dtstart_label = glade_xml_get_widget (priv->xml, "dtstart_label");
-	priv->dtend_label = glade_xml_get_widget (priv->xml, "dtend_label");
-	priv->summary_entry = glade_xml_get_widget (priv->xml, "summary_entry");
-	priv->description_box = glade_xml_get_widget (priv->xml, "description_box");
-	/* priv->add_button = glade_xml_get_widget (priv->xml, "add_button"); */
-	priv->button_box = glade_xml_get_widget (priv->xml, "button_box");
-	priv->address_entry = glade_xml_get_widget (priv->xml, "address_entry");
-	priv->message_text = glade_xml_get_widget (priv->xml, "message_text");
-
-	gtk_text_set_word_wrap (GTK_TEXT (priv->message_text), TRUE);
-	
-	priv->xml2 = glade_xml_new (EVOLUTION_GLADEDIR "/" "e-itip-control.glade", "loading_window");
-	priv->loading_progress = glade_xml_get_widget (priv->xml2, "loading_progress");
-	priv->loading_window = glade_xml_get_widget (priv->xml2, "loading_window");
-
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy",
-			    GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv);
-
-	gtk_widget_show (priv->main_frame);
-
-	control = bonobo_control_new (priv->main_frame);
-
-	/* create a property bag */
-	prop_bag = bonobo_property_bag_new ( get_prop, set_prop, priv );
-	bonobo_control_set_properties (control, prop_bag);
-
-	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, "my_address", MY_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,
-				 "my_address", 0 );
-
-	bonobo_control_set_automerge (control, TRUE);	
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    priv);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",
-		e_itip_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
deleted file mode 100644
index eb950139a1..0000000000
--- a/calendar/gui/e-itip-control.glade
+++ /dev/null
@@ -1,510 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-itip-control</name>
-  <program_name>e-itip-control</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>main_frame</name>
-    <border_width>4</border_width>
-    <label>Calendar Message</label>
-    <label_xalign>0.11</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-      <widget>
-	<class>GtkViewport</class>
-	<name>viewport1</name>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>5</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>9</column_spacing>
-	    <child>
-	      <padding>6</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>organizer_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>summary_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkScrolledWindow</class>
-	      <name>scrolledwindow2</name>
-	      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkText</class>
-		<name>description_box</name>
-		<can_focus>True</can_focus>
-		<editable>False</editable>
-		<text></text>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>Date:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Organizer:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label8</name>
-	      <label>Summary:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>Description:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>0</xalign>
-	      <yalign>0</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox1</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtstart_label</name>
-		  <label>date-start</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label3</name>
-		  <label>--to--</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>19</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtend_label</name>
-		  <label>date-end</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Sender</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>4</top_attach>
-		<bottom_attach>5</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>address_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>4</top_attach>
-		<bottom_attach>5</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow3</name>
-	    <border_width>3</border_width>
-	    <width>365</width>
-	    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>message_text</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>button_box</name>
-	    <border_width>3</border_width>
-	    <height>30</height>
-	    <homogeneous>False</homogeneous>
-	    <spacing>8</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>loading_window</name>
-  <visible>False</visible>
-  <title>Loading Calendar</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>frame1</name>
-    <border_width>4</border_width>
-    <label></label>
-    <label_xalign>0</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_OUT</shadow_type>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <border_width>7</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>1</spacing>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>9</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label>Loading calendar...</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkProgressBar</class>
-	  <name>loading_progress</name>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <bar_style>GTK_PROGRESS_CONTINUOUS</bar_style>
-	  <orientation>GTK_PROGRESS_LEFT_TO_RIGHT</orientation>
-	  <activity_mode>False</activity_mode>
-	  <show_text>False</show_text>
-	  <format>%P %%</format>
-	  <text_xalign>0.5</text_xalign>
-	  <text_yalign>0.5</text_yalign>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
deleted file mode 100644
index 6c2df626ce..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Evolution calendar - Control for displaying iTIP mail messages
- *
- * Copyright (C) 2000 Helix Code, 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 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_ITIP_CONTROL_H__
-#define __E_ITIP_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_itip_control_factory_init (void);
-
-#endif /* __E_ITIP_CONTROL_H__ */
diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade
deleted file mode 100644
index 5b9a057f46..0000000000
--- a/calendar/gui/e-meeting-dialog.glade
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-meeting-dialog</name>
-  <program_name>e-meeting-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>meeting_window</name>
-  <width>486</width>
-  <height>330</height>
-  <visible>False</visible>
-  <title>Meeting Invitations</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkToolbar</class>
-      <name>toolbar1</name>
-      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-      <type>GTK_TOOLBAR_BOTH</type>
-      <space_size>5</space_size>
-      <space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <tooltips>True</tooltips>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>publish_button</name>
-	<label>Publish
-Event</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_MAIL_SND</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator1</name>
-	<width>13</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>request_button</name>
-	<label>Request
-Meeting</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_REFRESH</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator3</name>
-	<width>13</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>cancel_button</name>
-	<label>Cancel
-Meeting</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator2</name>
-	<width>12</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>schedule_button</name>
-	<label>Schedule
-Time</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_MULTIPLE</stock_pixmap>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>4</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Organizer: </label>
-	<justify>GTK_JUSTIFY_RIGHT</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>3</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>1</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>organizer_entry</name>
-	<width>252</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Attendees: </label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>4</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox3</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>0</spacing>
-	<child_min_width>83</child_min_width>
-	<child_min_height>29</child_min_height>
-	<child_ipad_x>8</child_ipad_x>
-	<child_ipad_y>1</child_ipad_y>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>add_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Add</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>delete_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Delete</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Edit</label>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCList</class>
-	<name>attendee_list</name>
-	<can_focus>True</can_focus>
-	<columns>4</columns>
-	<column_widths>145,141,60,80</column_widths>
-	<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	<show_titles>True</show_titles>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label8</name>
-	  <label>Attendee</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label5</name>
-	  <label>Role</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label6</name>
-	  <label>RSVP</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label7</name>
-	  <label>Status</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_dialog</name>
-  <width>344</width>
-  <height>152</height>
-  <visible>False</visible>
-  <title>Attendee</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_MOUSE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Attendee address</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>6</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>address_entry</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label9</name>
-	<label>Role</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>5</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>role_combo</name>
-	<width>160</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>Chair
-Required Participant
-Optional Participant
-Non-Participant
-Other
-
-
-</items>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>role_entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text>Required Participant</text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>rsvp_check</name>
-	<can_focus>True</can_focus>
-	<label>RSVP</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
deleted file mode 100644
index 934c284ae7..0000000000
--- a/calendar/gui/e-meeting-edit.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Jesse Pavel <jpavel@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 Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <glade/glade.h>
-#include <ical.h>
-#include <widgets/meeting-time-sel/e-meeting-time-sel.h>
-#include <Evolution-Composer.h>
-#include <string.h>
-#include "e-meeting-edit.h"
-#include "itip-utils.h"
-
-#define E_MEETING_GLADE_XML "e-meeting-dialog.glade"
-
-
-typedef struct _EMeetingEditorPrivate EMeetingEditorPrivate;
-
-struct _EMeetingEditorPrivate {
-	/* These are the widgets to be used in the GUI. */
-	GladeXML *xml;
-	GtkWidget *meeting_window;
-	GtkWidget *attendee_list;
-	GtkWidget *address_entry;
-	GtkWidget *edit_dialog;
-	GtkWidget *organizer_entry;
-	GtkWidget *role_entry;
-	GtkWidget *rsvp_check;
-	GtkWidget *publish_button, *request_button, *cancel_button,
-		  *schedule_button;
-	
-	gint changed_signal_id;
-
-	/* Various pieces of information. */
-	gint selected_row;
-	CalComponent *comp;
-	CalClient *client;
-	icalcomponent *icalcomp, *vevent;
-
-	gint numentries;  /* How many attendees are there? */
-	gboolean dirty;  /* Has anything changed? */
-}; 
-
-#define NUM_COLUMNS 4  /* The number of columns in our attendee list. */
-
-enum column_names {ADDRESS_COL, ROLE_COL, RSVP_COL, STATUS_COL};
-
-
-static void
-save_organizer (EMeetingEditorPrivate *priv)
-{
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *text;
-
-	/* Save the organizer into the iCAL object. */
-
-	text = gtk_entry_get_text (GTK_ENTRY (priv->organizer_entry));
-	if (strlen (text) > 0) {
-		gchar buffer[200];
-		g_snprintf (buffer, 190, "MAILTO:%s", text);
-	
-		prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-		if (prop == NULL) {
-			/* We need to add an ORGANIZER property. */
-			prop = icalproperty_new (ICAL_ORGANIZER_PROPERTY);
-			icalcomponent_add_property (priv->vevent, prop);
-		}
-		value = icalvalue_new_text (buffer);
-		icalproperty_set_value (prop, value);
-	}
-}
-	
-	
-
-static gboolean
-window_delete_cb (GtkWidget *widget,
-		  GdkEvent *event,
-		  gpointer data)
-{	
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	save_organizer (priv);
-
-	if (priv->dirty == TRUE) {
-		/* FIXME: notify the event editor that our data has changed. 
-			For now, I'll just display a dialog box. */
-		{
-			if (!cal_client_update_object (priv->client, priv->comp)) {
-				GtkWidget *dialog;
-			
-				dialog = gnome_warning_dialog_parented ("I couldn't automatically save this meeting,\n"
-									"so try to save this event manually.",
-									GTK_WINDOW (priv->meeting_window));
-				gnome_dialog_run (GNOME_DIALOG(dialog));
-			}
-		}
-	}
-
-	gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), "");
-
-	return (FALSE);
-}
-
-static void 
-window_destroy_cb (GtkWidget *widget,
-		   gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_main_quit ();
-	return;
-}
-
-/* put_property_in_list() synchronizes the display of row `rownum'
-   in our attendee list to the values of `prop'. If rownum < 0,
-   then put_property_in_list() will append a new row. 
-   If the property doesn't contain certain parameters that we deem
-   necessary, it will add them. */
-static void
-put_property_in_list (icalproperty *prop, gint rownum, gpointer data)
-{
-	gchar *row_text[NUM_COLUMNS];
-	gchar *text, *new_text;
-	icalparameter *param;
-	icalvalue *value;
-	gint enumval;
-	gint cntr;
-
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		row_text[ADDRESS_COL] = g_strdup (new_text);
-		g_free (text);
-	}
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		icalproperty_add_parameter (prop, param);
-	}
-		
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	row_text[ROLE_COL] = role_values [enumval];
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_rsvp (TRUE);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	if (icalparameter_get_rsvp (param))
-		row_text[RSVP_COL] = "Y";
-	else
-		row_text[RSVP_COL] = "N";
-
-	param = get_icalparam_by_type (prop, ICAL_PARTSTAT_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	enumval = icalparameter_get_partstat (param);
-	if (enumval < 0 || enumval > 7) {
-		enumval = 7;
-	}
-
-	row_text[STATUS_COL] = partstat_values [enumval];
-
-	if (rownum < 0) {
-		gtk_clist_append (GTK_CLIST (priv->attendee_list), row_text);
-		gtk_clist_set_row_data (GTK_CLIST (priv->attendee_list), priv->numentries, prop);
-		priv->numentries++;
-	}
-	else {
-		for (cntr = 0; cntr < NUM_COLUMNS; cntr++) {
-			gtk_clist_set_text (GTK_CLIST (priv->attendee_list), 
-					    rownum,
-					    cntr,
-					    row_text[cntr]);
-		}
-	}
-
-	g_free (row_text[ADDRESS_COL]);
-}
-
-	
-
-/********
- * edit_attendee() performs the GUI manipulation and interaction for
- * editing `prop' and returns TRUE if the user indicated that he wants
- * to save the new property information.
- * 
- * Note that it is necessary that the property have parameters of the types
- * RSVP, PARTSTAT, and ROLE already when passed into this function. 
- ********/
-static gboolean
-edit_attendee (icalproperty *prop, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	gint button_num;
-	gchar *new_text, *text;
-	icalparameter *param;
-	icalvalue *value;
-	gchar buffer[200];
-	gint cntr;
-	gint enumval;
-	gboolean retval;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	g_return_val_if_fail (prop != NULL, FALSE);
-
-	if (priv->edit_dialog == NULL || priv->address_entry == NULL) {
-		priv->edit_dialog = glade_xml_get_widget (priv->xml, "edit_dialog");
-		priv->address_entry = glade_xml_get_widget (priv->xml, "address_entry");
-
-		gnome_dialog_set_close (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_editable_enters (GNOME_DIALOG (priv->edit_dialog), 
-					      GTK_EDITABLE (priv->address_entry));
-		gnome_dialog_close_hides (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_set_default (GNOME_DIALOG (priv->edit_dialog), 0);
-	}
-
-	g_return_val_if_fail (priv->edit_dialog != NULL, FALSE);
-	g_return_val_if_fail (priv->address_entry != NULL, FALSE);
-
-	gtk_widget_realize (priv->edit_dialog);
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), new_text);
-		g_free (text);
-	}
-	else {
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), "");
-	}
-				
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	text = role_values [enumval];
-	gtk_entry_set_text (GTK_ENTRY (priv->role_entry), text);
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rsvp_check),
-					icalparameter_get_rsvp (param));
-
-	gtk_widget_show (priv->edit_dialog);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (priv->edit_dialog));
-
-	if (button_num == 0) {
-		/* The user pressed the OK button. */
-		new_text = gtk_entry_get_text (GTK_ENTRY (priv->address_entry));
-
-		g_snprintf (buffer, 190, "MAILTO:%s", new_text);
-		value = icalvalue_new_text (buffer);
-		icalproperty_set_value (prop, value);
-
-		/* Take care of the ROLE. */
-		icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-
-		param = NULL;
-		text = gtk_entry_get_text (GTK_ENTRY(priv->role_entry));
-
-		for (cntr = 0; cntr < 5; cntr++) {
-			if (strncmp (text, role_values[cntr], 3) == 0) {
-				param = icalparameter_new_role (cntr);
-				break;
-			}
-		}
-
-		if (param == NULL) {
-			g_print ("e-meeting-edit.c: edit_attendee() the ROLE param was null.\n");
-			/* Use this as a default case, if none of the others match. */
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		}
-
-		icalproperty_add_parameter (prop, param);
-
-		/* Now the RSVP. */
-		icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-
-		param = icalparameter_new_rsvp 
-				(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->rsvp_check)));
-		icalproperty_add_parameter (prop, param);
-
-		retval = TRUE;
-	}
-	else  /* The user didn't say OK. */
-		retval = FALSE;
-	
-	return retval;
-}
-
-static void
-schedule_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendeeType type;
-	GtkWidget *dialog;
-	gchar *attendee;
-	gint cntr, row;
-	icalproperty *prop;
-	icalparameter *param;
-	gint button_num;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	
-	gtk_widget_push_visual (gdk_imlib_get_visual ());
-	gtk_widget_push_colormap (gdk_imlib_get_colormap ());
-	
-	dialog = gnome_dialog_new ("Schedule Meeting", "Set Time", "Cancel", NULL);
-
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
-
-	mts = (EMeetingTimeSelector *)e_meeting_time_selector_new ();
-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (dialog)->vbox), GTK_WIDGET (mts));
-	gtk_window_add_accel_group (GTK_WINDOW (dialog),
-				    E_MEETING_TIME_SELECTOR (mts)->accel_group);
-	gtk_widget_show (GTK_WIDGET (mts));
-	
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	
-
-	/* Let's stick all the attendees that we have in our clist, into the
-	   meeting time widget. */
-	for (cntr = 0; cntr < priv->numentries; cntr++ ) {
-		gtk_clist_get_text (GTK_CLIST (priv->attendee_list), cntr, 
-				    ADDRESS_COL, &attendee);
-		row = e_meeting_time_selector_attendee_add (mts, attendee, NULL);
-
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list), cntr);
-		param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-
-		switch (icalparameter_get_role (param)) {
-			case ICAL_ROLE_CHAIR:
-			case ICAL_ROLE_REQPARTICIPANT:
-			  type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-			  break;
-			default:
-			  type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;
-		}
-
-		e_meeting_time_selector_attendee_set_type (mts, row, type);
-	}
-
-	/* I don't want the meeting widget to be destroyed before I can
-	   extract information from it; so now the dialog window will just
-	   be hidden when the user clicks a button or closes it. */
-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
-
-	gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (dialog));
-
-	if (button_num == 0) {
-		/* The user clicked "Set Time". */
-                gint start_year, start_month, start_day, start_hour, start_minute, 
-		     end_year, end_month, end_day, end_hour, end_minute;
-		CalComponentDateTime cal_dtstart, cal_dtend;
-
-
-		e_meeting_time_selector_get_meeting_time (mts,
-							       &start_year,
-							       &start_month,
-							       &start_day,
-							       &start_hour,
-							       &start_minute,
-							       &end_year,
-							       &end_month,
-							       &end_day,
-							       &end_hour,
-							       &end_minute);
-		
-		cal_component_get_dtstart (priv->comp, &cal_dtstart);
-		cal_component_get_dtend (priv->comp, &cal_dtend);
-
-		cal_dtstart.value->second = 0;
-		cal_dtstart.value->minute = start_minute;
-		cal_dtstart.value->hour = start_hour;
-		cal_dtstart.value->day = start_day;
-		cal_dtstart.value->month = start_month;
-		cal_dtstart.value->year = start_year;
-
-		cal_dtend.value->second = 0;
-		cal_dtend.value->minute = end_minute;
-		cal_dtend.value->hour = end_hour;
-		cal_dtend.value->day = end_day;
-		cal_dtend.value->month = end_month;
-		cal_dtend.value->year = end_year;
-
-		cal_component_set_dtstart (priv->comp, &cal_dtstart);
-		cal_component_set_dtend (priv->comp, &cal_dtend);
-
-		cal_component_free_datetime (&cal_dtstart);
-		cal_component_free_datetime (&cal_dtend);
-
-		priv->dirty = TRUE;
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-
-	return;
-}
-
-#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-static gchar *itip_methods[] = {
-	"REQUEST",
-	"PUBLISH",
-	"CANCEL"
-};
-
-enum itip_method_enum {
-	METHOD_REQUEST,
-	METHOD_PUBLISH,
-	METHOD_CANCEL
-};
-
-typedef enum itip_method_enum itip_method_enum;
-
-static void
-send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	gchar *cell_text;
-	CORBA_char *subject;
-	gint cntr;
-	gint len;
-	CalComponentText caltext;
-	CORBA_char *content_type, *filename, *description, *attach_data;
-	CORBA_boolean show_inline;
-	CORBA_char tempstr[200];
-
-	
-	CORBA_exception_init (&ev);
-
-	/* First, I obtain an object reference that represents the Composer. */
-	bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0);
-
-	g_return_if_fail (bonobo_server != NULL);
-
-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));
-
-	/* All right, now I have to convert my list of recipients into one of those
-	   CORBA sequences. */
-	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to_list->_maximum = priv->numentries;
-	to_list->_length = priv->numentries; 
-	to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (priv->numentries);
-
-	for (cntr = 0; cntr < priv->numentries; cntr++) {
-		gtk_clist_get_text (GTK_CLIST (priv->attendee_list),
-				    cntr, ADDRESS_COL,
-				    &cell_text);
-		len = strlen (cell_text);
-
-		recipient = &(to_list->_buffer[cntr]);
-		recipient->name = CORBA_string_alloc (0);  /* FIXME: we may want an actual name here. */
-		recipient->name[0] = '\0';
-		recipient->address = CORBA_string_alloc (len);
-		strcpy (recipient->address, cell_text);
-	}
-
-	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;
-
-	cal_component_get_summary (priv->comp, &caltext);
-	subject = CORBA_string_alloc (strlen (caltext.value));
-	strcpy (subject, caltext.value);
-
-	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;
-	}
-
-	sprintf (tempstr, "text/calendar;METHOD=%s", itip_methods[method]);
-	content_type = CORBA_string_alloc (strlen (tempstr));
-	strcpy (content_type, tempstr);
-	filename = CORBA_string_alloc (0);
-	filename[0] = '\0';
-	sprintf (tempstr, "Calendar attachment");
-	description = CORBA_string_alloc (strlen (tempstr));
-	strcpy (description, tempstr);
-	show_inline = FALSE;
-
-	/* I need to create an encapsulating iCalendar component, and stuff our vEvent
-	   into it. */
-	{
-		icalcomponent *comp;
-		icalproperty *prop;
-		icalvalue *value;
-		gchar *ical_string;
-
-		save_organizer (priv);
-		
-		comp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-		
-		prop = icalproperty_new (ICAL_PRODID_PROPERTY);
-		value = icalvalue_new_text ("-//HelixCode/Evolution//EN");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_VERSION_PROPERTY);
-		value = icalvalue_new_text ("2.0");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_METHOD_PROPERTY);
-		value = icalvalue_new_text (itip_methods[method]);
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		icalcomponent_add_component (comp, priv->vevent);
-
-		ical_string = icalcomponent_as_ical_string (comp);
-		attach_data = CORBA_string_alloc (strlen (ical_string));
-		strcpy (attach_data, ical_string);
-
-		icalcomponent_remove_component (comp, priv->vevent);
-		icalcomponent_free (comp);
-	}
-
-	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;
-	}
-	
-	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);
-
-	/* Let's free shit up. */
-
-	/* Beware--depending on whether CORBA_free is recursive, which I
-	   think is is, we might have memory leaks, in which case the code
-	   below is necessary. */
-#if 0
-	for (cntr = 0; cntr < priv->numentries; cntr++) {
-		recipient = &(to_list->_buffer[cntr]);
-		CORBA_free (recipient->name);
-		CORBA_free (recipient->address);
-		recipient->name = recipient->address = NULL;
-	}
-#endif
-
-	if (CORBA_sequence_get_release (to_list) != FALSE)
-		CORBA_free (to_list->_buffer);
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-
-	CORBA_free (subject);
-	CORBA_free (content_type);
-	CORBA_free (filename);
-	CORBA_free (description);
-	CORBA_free (attach_data);
-
-	/* bonobo_object_unref (BONOBO_OBJECT (bonobo_server));   */
-}
-
-/********
- * This routine is called when the publish button is clicked. Duh. 
- * Actually, I'm just testing my commenting macros.
- ********/
-static void
-publish_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	send_calendar_info (METHOD_PUBLISH, priv);
-
-}
-
-static void
-request_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	send_calendar_info (METHOD_REQUEST, priv);
-
-}
-
-static void
-cancel_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	send_calendar_info (METHOD_CANCEL, priv);
-}
-
-
-
-static void 
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	icalproperty *prop;
-	icalparameter *param;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	prop = icalproperty_new (ICAL_ATTENDEE_PROPERTY);
-	param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_rsvp (TRUE); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-	icalproperty_add_parameter (prop, param);
-
-	if (edit_attendee (prop, data) == TRUE) {
-		/* Let's add this property to our component and to the CList. */
-		icalcomponent_add_property (priv->vevent, prop);
-
-		/* The -1 indicates that we should add a new row. */
-		put_property_in_list (prop, -1, data);
-
-		priv->dirty = TRUE;
-	}
-	else {
-		icalproperty_free (prop);
-	}
-}	
-
-static void 
-delete_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to delete.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-	else {
-		/* Delete the associated property from the iCAL object. */
-		icalproperty *prop;
-
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-		icalcomponent_remove_property (priv->vevent, prop);
-		icalproperty_free (prop);
-
-		gtk_clist_remove (GTK_CLIST (priv->attendee_list), priv->selected_row);
-		priv->selected_row = -1;
-		priv->numentries--;
-		priv->dirty = TRUE;
-	}
-}
-
-static void 
-edit_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to edit.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		return;
-	}
-	else {
-		icalproperty *prop, *new_prop;
-		icalparameter *param;
-		icalvalue *value;
-		
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-
-		g_assert (prop != NULL);
-
-		new_prop = icalproperty_new_clone (prop);
-
-		if (edit_attendee (new_prop, data)) {
-			/* The user hit Okay. */
-			/*We need to synchronize the old property with the newly edited one.*/
-			value = icalvalue_new_clone (icalproperty_get_value (new_prop));
-			icalproperty_set_value (prop, value);
-
-			icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-			icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-			icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_ROLE_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_RSVP_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_PARTSTAT_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			
-			put_property_in_list (prop, priv->selected_row, data);
-			priv->dirty = TRUE;
-
-		}
-		icalproperty_free (new_prop);
-	}
-}
-
-
-
-static void 
-list_row_select_cb  (GtkWidget *widget,
-                     gint row,
-                     gint column,
-                     GdkEventButton *event,
-                     gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	priv->selected_row = row;
-}
-
-static void
-organizer_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_signal_disconnect (GTK_OBJECT (priv->organizer_entry), priv->changed_signal_id);
-
-	priv->dirty = TRUE;
-}
-
-
-/* ------------------------------------------------------------ */
-/* --------------------- Exported Functions ------------------- */
-/* ------------------------------------------------------------ */
-
-EMeetingEditor * 
-e_meeting_editor_new (CalComponent *comp, CalClient *client)
-{
-	EMeetingEditor *object;
-	EMeetingEditorPrivate *priv;
-
-	object = (EMeetingEditor *)g_new(EMeetingEditor, 1);
-	
-	priv = (EMeetingEditorPrivate *) g_new0(EMeetingEditorPrivate, 1);
-	priv->selected_row = -1;
-	priv->comp = comp;
-	priv->client = client;
-	priv->icalcomp = cal_component_get_icalcomponent (comp);
-	
-	object->priv = priv;
-
-	return object;	
-}
-
-void
-e_meeting_editor_free (EMeetingEditor *editor)
-{
-	if (editor == NULL)
-		return;
-		
-	if (editor->priv != NULL)
-		g_free (editor->priv);
-	
-	g_free (editor);
-}
-	
-
-
-void 
-e_meeting_edit (EMeetingEditor *editor)
-{
-	EMeetingEditorPrivate *priv;
-	GtkWidget *add_button, *delete_button, *edit_button;
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *text;
-
-
-	g_return_if_fail (editor != NULL);
-
-	priv = (EMeetingEditorPrivate *)editor->priv;
-
-	g_return_if_fail (priv != NULL);
-
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" E_MEETING_GLADE_XML, NULL);
-	
-	priv->meeting_window =  glade_xml_get_widget (priv->xml, "meeting_window");
-	priv->attendee_list = glade_xml_get_widget (priv->xml, "attendee_list");
-	priv->role_entry = glade_xml_get_widget (priv->xml, "role_entry");
-	priv->rsvp_check = glade_xml_get_widget (priv->xml, "rsvp_check");
-	priv->schedule_button = glade_xml_get_widget (priv->xml, "schedule_button");
-	priv->publish_button = glade_xml_get_widget (priv->xml, "publish_button");
-	priv->request_button = glade_xml_get_widget (priv->xml, "request_button");
-	priv->cancel_button = glade_xml_get_widget (priv->xml, "cancel_button");
-
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), STATUS_COL, GTK_JUSTIFY_CENTER);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "delete_event",
-                            GTK_SIGNAL_FUNC (window_delete_cb), editor);
-
-	gtk_signal_connect_after (GTK_OBJECT (priv->meeting_window), "delete_event",
-				  GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "destroy_event",
-                            GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->attendee_list), "select_row",
-			    GTK_SIGNAL_FUNC (list_row_select_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->schedule_button), "clicked",
-			    GTK_SIGNAL_FUNC (schedule_button_clicked_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->publish_button), "clicked",
-			    GTK_SIGNAL_FUNC (publish_button_clicked_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->request_button), "clicked",
-			    GTK_SIGNAL_FUNC (request_button_clicked_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->cancel_button), "clicked",
-			    GTK_SIGNAL_FUNC (cancel_button_clicked_cb), editor);
-
-	add_button = glade_xml_get_widget (priv->xml, "add_button");
-	delete_button = glade_xml_get_widget (priv->xml, "delete_button");
-	edit_button = glade_xml_get_widget (priv->xml, "edit_button");
-
-	gtk_signal_connect (GTK_OBJECT (add_button), "clicked",
-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (delete_button), "clicked",
-			    GTK_SIGNAL_FUNC (delete_button_clicked_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (edit_button), "clicked",
-			    GTK_SIGNAL_FUNC (edit_button_clicked_cb), editor);
-
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-
-	if (icalcomponent_isa (priv->icalcomp) != ICAL_VEVENT_COMPONENT) {
-		icalcompiter iter;
-
-		iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VEVENT_COMPONENT);
-		priv->vevent = icalcompiter_deref (&iter);
-	} else
-		priv->vevent = priv->icalcomp;
-
-	g_assert (priv->vevent != NULL);
-
-	/* Let's extract the organizer, if there is one. */
-        prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-
-	if (prop != NULL) {
-		gchar *buffer;
-
-	        value = icalproperty_get_value (prop);
-		buffer = g_strdup (icalvalue_as_ical_string (value));
-	        if (buffer != NULL) {
-			/* Strip off the MAILTO:, if it is present. */
-	        	text = strchr (buffer, ':');
-			if (text == NULL)
-				text = buffer;
-			else
-				text++;
-				
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), text);
-			g_free (buffer);
-		}
-		
-	}
-
-	priv->changed_signal_id = gtk_signal_connect (GTK_OBJECT (priv->organizer_entry), "changed",
-						      GTK_SIGNAL_FUNC (organizer_changed_cb), editor);
-
-
-	/* Let's go through the iCAL object, and create a list entry
-	   for each ATTENDEE property. */
-        for (prop = icalcomponent_get_first_property (priv->vevent, ICAL_ATTENDEE_PROPERTY);
-             prop != NULL;
-             prop = icalcomponent_get_next_property (priv->vevent, ICAL_ATTENDEE_PROPERTY))
-	{
-		put_property_in_list (prop, -1, editor);
-	}
-	
-
-	gtk_widget_show (priv->meeting_window);
-
-	gtk_main ();
-
-	if (priv->meeting_window != NULL)
-		gtk_widget_destroy (priv->meeting_window);
-
-	if (priv->edit_dialog != NULL)
-		gtk_widget_destroy (priv->edit_dialog);
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-}
diff --git a/calendar/gui/e-meeting-edit.h b/calendar/gui/e-meeting-edit.h
deleted file mode 100644
index e29453ecba..0000000000
--- a/calendar/gui/e-meeting-edit.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Jesse Pavel <jpavel@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 Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_MEETING_EDIT_H__
-#define __E_MEETING_EDIT_H__
-
-#include <config.h>
-#include <glade/glade.h>
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-
-typedef struct _EMeetingEditor EMeetingEditor;
-
-struct _EMeetingEditor {
-	gpointer priv;
-};
-
-
-EMeetingEditor * e_meeting_editor_new (CalComponent *comp, CalClient *client);
-
-void e_meeting_edit (EMeetingEditor *editor);
-void e_meeting_editor_free (EMeetingEditor *editor);
-
-
-#endif /*  __E_MEETING_EDIT_H__  */
-
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
deleted file mode 100644
index 92917d6d55..0000000000
--- a/calendar/gui/e-tasks.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.c
- *
- * Copyright (C) 2001  Helix Code, Inc.
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/menus/gal-view-collection.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include "widgets/menus/gal-view-menus.h"
-#include "dialogs/task-editor.h"
-#include "e-calendar-table.h"
-#include "component-factory.h"
-
-#include "e-tasks.h"
-
-
-/* Private part of the GnomeCalendar structure */
-struct _ETasksPrivate {
-	/* The calendar client object we monitor */
-	CalClient   *client;
-
-	/* The ECalendarTable showing the tasks. */
-	GtkWidget   *tasks_view;
-
-	/* The option menu showing the categories, and the popup menu. */
-	GtkWidget *categories_option_menu;
-	GtkWidget *categories_menu;
-};
-
-
-static void e_tasks_class_init (ETasksClass *class);
-static void e_tasks_init (ETasks *tasks);
-static void setup_widgets (ETasks *tasks);
-static void e_tasks_destroy (GtkObject *object);
-
-static void cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data);
-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
-
-static char* e_tasks_get_config_filename (ETasks *tasks);
-
-static void e_tasks_on_filter_selected	(GtkMenuShell	*menu_shell,
-					 ETasks		*tasks);
-static void e_tasks_on_categories_changed	(CalendarModel	*model,
-						 ETasks		*tasks);
-static void e_tasks_rebuild_categories_menu	(ETasks		*tasks);
-static gint e_tasks_add_menu_item		(gpointer key,
-						 gpointer value,
-						 gpointer data);
-
-
-static GtkTableClass *parent_class;
-
-
-E_MAKE_TYPE (e_tasks, "ETasks", ETasks,
-	     e_tasks_class_init, e_tasks_init,
-	     GTK_TYPE_TABLE)
-
-
-/* Class initialization function for the gnome calendar */
-static void
-e_tasks_class_init (ETasksClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_TABLE);
-
-	object_class->destroy = e_tasks_destroy;
-}
-
-
-/* Object initialization function for the gnome calendar */
-static void
-e_tasks_init (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-
-	priv = g_new0 (ETasksPrivate, 1);
-	tasks->priv = priv;
-
-	setup_widgets (tasks);
-}
-
-
-#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
-setup_widgets (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ETable *etable;
-	GtkWidget *hbox, *menuitem, *categories_label;
-	CalendarModel *model;
-
-	priv = tasks->priv;
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox);
-	gtk_table_attach (GTK_TABLE (tasks), hbox, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	priv->categories_option_menu = gtk_option_menu_new ();
-	gtk_widget_show (priv->categories_option_menu);
-	gtk_box_pack_end (GTK_BOX (hbox), priv->categories_option_menu,
-			  FALSE, FALSE, 0);
-
-	priv->categories_menu = gtk_menu_new ();
-
-	menuitem = gtk_menu_item_new_with_label (_("All"));
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (priv->categories_menu), menuitem);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->categories_option_menu), priv->categories_menu);
-
-	categories_label = gtk_label_new (_("Category:"));
-	gtk_widget_show (categories_label);
-	gtk_box_pack_end (GTK_BOX (hbox), categories_label, FALSE, FALSE, 4);
-
-
-	priv->tasks_view = e_calendar_table_new ();
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);
-	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_table_attach (GTK_TABLE (tasks), priv->tasks_view, 0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (priv->tasks_view);
-
-	gtk_signal_connect (GTK_OBJECT (E_CALENDAR_TABLE (priv->tasks_view)->model),
-			    "categories-changed",
-			    GTK_SIGNAL_FUNC (e_tasks_on_categories_changed), tasks);
-}
-
-
-GtkWidget *
-e_tasks_construct (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;
-
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), tasks);
-
-#if 0
-	alarm_notify_add_client (priv->client);
-#endif
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->tasks_view),
-					 priv->client);
-
-	return GTK_WIDGET (tasks);
-}
-
-
-GtkWidget *
-e_tasks_new (void)
-{
-	ETasks *tasks;
-
-	tasks = gtk_type_new (e_tasks_get_type ());
-
-	if (!e_tasks_construct (tasks)) {
-		g_message ("e_tasks_new(): Could not construct the tasks GUI");
-		gtk_object_unref (GTK_OBJECT (tasks));
-		return NULL;
-	}
-
-	return GTK_WIDGET (tasks);
-}
-
-
-static void
-e_tasks_destroy (GtkObject *object)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	char *config_filename;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TASKS (object));
-
-	tasks = E_TASKS (object);
-	priv = tasks->priv;
-
-	/* Save the ETable layout. */
-	config_filename = e_tasks_get_config_filename (tasks);
-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv->tasks_view),
-				     config_filename);
-	g_free (config_filename);
-
-	if (priv->client) {
-#if 0
-		alarm_notify_remove_client (priv->client);
-#endif
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	g_free (priv);
-	tasks->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-gboolean
-e_tasks_open			(ETasks		*tasks,
-				 char		*file)
-{
-	ETasksPrivate *priv;
-	char *config_filename;
-
-	g_return_val_if_fail (tasks != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
-	g_return_val_if_fail (file != NULL, FALSE);
-
-	priv = tasks->priv;
-
-	if (!cal_client_open_calendar (priv->client, file, FALSE)) {
-		g_message ("e_tasks_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	config_filename = e_tasks_get_config_filename (tasks);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->tasks_view),
-				     config_filename);
-	g_free (config_filename);
-
-	return TRUE;
-}
-
-
-/* Displays an error to indicate that loading a calendar failed */
-static void
-load_error				(ETasks		*tasks,
-					 const char	*uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not load the tasks in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that the specified URI method is not supported */
-static void
-method_error				(ETasks		*tasks,
-					 const char	*uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to load `%s' is not supported"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));
-	g_free (msg);
-}
-
-/* Callback from the calendar client when a calendar is opened */
-static void
-cal_opened_cb				(CalClient	*client,
-					 CalClientOpenStatus status,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		/* Everything is OK */
-		return;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		load_error (tasks, cal_client_get_uri (client));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* bullshit; we did not specify only_if_exists */
-		g_assert_not_reached ();
-		return;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (tasks, cal_client_get_uri (client));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb				(CalClient	*client,
-					 const char	*uid,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	/* FIXME: Do we need to do anything? */
-}
-
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb				(CalClient	*client,
-					 const char	*uid,
-					 gpointer	 data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-
-	/* FIXME: Do we need to do anything? */
-}
-
-
-static char*
-e_tasks_get_config_filename		(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	char *url, *filename;
-
-	priv = tasks->priv;
-
-	url = g_strdup (cal_client_get_uri (priv->client));
-
-	/* This turns all funny characters into '_', in the string itself. */
-	e_filename_make_safe (url);
-	
-	filename = g_strdup_printf ("%s/config/et-header-%s", evolution_dir,
-				    url);
-	g_free (url);
-	
-	return filename;
-}
-
-
-/**
- * e_tasks_get_cal_client:
- * @tasks: An #ETasks.
- *
- * Queries the calendar client interface object that a tasks view is using.
- *
- * Return value: A calendar client interface object.
- **/
-CalClient *
-e_tasks_get_cal_client			(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-
-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);
-
-	priv = tasks->priv;
-
-	return priv->client;
-}
-
-
-void
-e_tasks_new_task			(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	TaskEditor *tedit;
-	CalComponent *comp;
-
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	tedit = task_editor_new ();
-	task_editor_set_cal_client (tedit, priv->client);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	task_editor_set_todo_object (tedit, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	task_editor_focus (tedit);
-}
-
-
-static void
-e_tasks_on_filter_selected		(GtkMenuShell	*menu_shell,
-					 ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-	CalendarModel *model;
-	GtkWidget *label;
-	char *category;
-
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	label = GTK_BIN (priv->categories_option_menu)->child;
-	gtk_label_get (GTK_LABEL (label), &category);
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-	model = cal_table->model;
-
-	if (!strcmp (category, _("All"))) {
-		calendar_model_set_default_category (model, NULL);
-		e_calendar_table_set_filter_func (cal_table, NULL, NULL,
-						  NULL);
-	} else {
-		calendar_model_set_default_category (model, category);
-		e_calendar_table_set_filter_func (cal_table,
-						  e_calendar_table_filter_by_category,
-						  g_strdup (category), g_free);
-	}
-}
-
-
-static void
-e_tasks_on_categories_changed	(CalendarModel	*model,
-				 ETasks		*tasks)
-{
-	e_tasks_rebuild_categories_menu (tasks);
-}
-
-
-static void
-e_tasks_rebuild_categories_menu	(ETasks		*tasks)
-{
-	ETasksPrivate *priv;
-	CalendarModel *model;
-	GTree *categories;
-	GtkWidget *menuitem;
-
-	priv = tasks->priv;
-
-	priv->categories_menu = gtk_menu_new ();
-
-	menuitem = gtk_menu_item_new_with_label (_("All"));
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (priv->categories_menu), menuitem);
-
-	model = E_CALENDAR_TABLE (priv->tasks_view)->model;
-	categories = calendar_model_get_categories (model);
-	g_return_if_fail (categories != NULL);
-
-	g_tree_traverse (categories, e_tasks_add_menu_item, G_IN_ORDER,
-			 priv->categories_menu);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (priv->categories_option_menu), priv->categories_menu);
-
-	gtk_signal_connect (GTK_OBJECT (priv->categories_menu), "deactivate",
-			    GTK_SIGNAL_FUNC (e_tasks_on_filter_selected),
-			    tasks);
-}
-
-
-static gint
-e_tasks_add_menu_item		(gpointer key,
-				 gpointer value,
-				 gpointer data)
-{
-	GtkWidget *menuitem;
-
-	menuitem = gtk_menu_item_new_with_label ((char*) key);
-	gtk_widget_show (menuitem);
-	gtk_menu_append (GTK_MENU (data), menuitem);
-
-	return FALSE;
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	ETasks *tasks = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		e_table_set_state_object (e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (tasks->priv->tasks_view)->etable)), GAL_VIEW_ETABLE (view)->state);
-	}
-}
-
-void
-e_tasks_setup_menus (ETasks            *tasks,
-		     BonoboUIComponent *uic)
-{
-	GalViewCollection *collection;
-	GalViewMenus *views;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-
-	collection = gal_view_collection_new();
-	/* FIXME: Memory leak. */
-	gal_view_collection_set_storage_directories (collection,
-						     EVOLUTION_DATADIR "/evolution/views/tasks/",
-						     gnome_util_prepend_user_home ("/evolution/views/tasks/"));
-
-	spec = e_table_specification_new ();
-	e_table_specification_load_from_string (spec, e_calendar_table_get_spec());
-
-	factory = gal_view_factory_etable_new (spec);
-	gal_view_collection_add_factory (collection, factory);
-	gtk_object_sink (GTK_OBJECT (factory));
-
-	gal_view_collection_load (collection);
-
-	views = gal_view_menus_new (collection);
-	gal_view_menus_apply (views, uic, NULL); /* This function probably needs to sink the views object. */
-	gtk_signal_connect (GTK_OBJECT (collection), "display_view",
-			    display_view, tasks);
-	/*	gtk_object_sink(GTK_OBJECT(views)); */
-
-	gtk_object_sink (GTK_OBJECT (collection));
-}
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
deleted file mode 100644
index 94dc8607f6..0000000000
--- a/calendar/gui/e-tasks.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.h
- *
- * Copyright (C) 2001  Helix Code, Inc.
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
- */
-
-#ifndef _E_TASKS_H_
-#define _E_TASKS_H_
-
-#include <cal-client/cal-client.h>
-#include <bonobo.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;
-};
-
-
-GtkType    e_tasks_get_type        (void);
-GtkWidget *e_tasks_construct       (ETasks            *tasks);
-
-GtkWidget *e_tasks_new             (void);
-
-gboolean   e_tasks_open            (ETasks            *tasks,
-				    char              *file);
-
-CalClient *e_tasks_get_cal_client  (ETasks            *tasks);
-
-void       e_tasks_new_task        (ETasks            *tasks);
-
-void       e_tasks_setup_menus     (ETasks            *tasks,
-				    BonoboUIComponent *uic);
-
-
-#endif /* _E_TASKS_H_ */
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
deleted file mode 100644
index 8adfdd96ff..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#include <config.h>
-#include <gal/e-text/e-text.h>
-#include "e-week-view-event-item.h"
-
-static void e_week_view_event_item_class_init	(EWeekViewEventItemClass *class);
-static void e_week_view_event_item_init		(EWeekViewEventItem *wveitem);
-
-static void e_week_view_event_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_event_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_event_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_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 EWeekViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-							      gdouble x,
-							      gdouble y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_EVENT_NUM,
-	ARG_SPAN_NUM
-};
-
-
-GtkType
-e_week_view_event_item_get_type (void)
-{
-	static GtkType e_week_view_event_item_type = 0;
-
-	if (!e_week_view_event_item_type) {
-		GtkTypeInfo e_week_view_event_item_info = {
-			"EWeekViewEventItem",
-			sizeof (EWeekViewEventItem),
-			sizeof (EWeekViewEventItemClass),
-			(GtkClassInitFunc) e_week_view_event_item_class_init,
-			(GtkObjectInitFunc) e_week_view_event_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_event_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_event_item_info);
-	}
-
-	return e_week_view_event_item_type;
-}
-
-
-static void
-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewEventItem::event_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_EVENT_NUM);
-	gtk_object_add_arg_type ("EWeekViewEventItem::span_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_SPAN_NUM);
-
-	object_class->set_arg = e_week_view_event_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_event_item_update;
-	item_class->draw        = e_week_view_event_item_draw;
-	item_class->point       = e_week_view_event_item_point;
-	item_class->event       = e_week_view_event_item_event;
-}
-
-
-static void
-e_week_view_event_item_init (EWeekViewEventItem *wveitem)
-{
-	wveitem->event_num = -1;
-	wveitem->span_num = -1;
-}
-
-
-static void
-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewEventItem *wveitem;
-	gboolean needs_update = FALSE;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_EVENT_NUM:
-		wveitem->event_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	case ARG_SPAN_NUM:
-		wveitem->span_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	}
-
-	if (needs_update)
-		gnome_canvas_item_request_update (item);
-}
-
-
-static void
-e_week_view_event_item_update (GnomeCanvasItem *item,
-			       double	       *affine,
-			       ArtSVP	       *clip_path,
-			       int	        flags)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	gint span_x, span_y, span_w;
-
-#if 0
-	g_print ("In e_week_view_event_item_update\n");
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	if (wveitem->event_num != -1 && wveitem->span_num != -1) {
-		if (e_week_view_get_span_position (week_view,
-						   wveitem->event_num,
-						   wveitem->span_num,
-						   &span_x, &span_y,
-						   &span_w)) {
-#if 0
-			g_print ("  Event:%i Span:%i %i,%i W:%i\n",
-				 wveitem->event_num, wveitem->span_num,
-				 span_x, span_y, span_w);
-#endif
-			item->x1 = span_x;
-			item->y1 = span_y;
-			item->x2 = span_x + span_w - 1;
-			item->y2 = span_y + week_view->row_height - 1;
-		}
-	}
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
-			     GdkDrawable      *drawable,
-			     int	       x,
-			     int	       y,
-			     int	       width,
-			     int	       height)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GtkStyle *style;
-	GdkGC *fg_gc, *gc;
-	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;
-
-#if 0
-	g_print ("In e_week_view_event_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (canvas_item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (canvas_item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (wveitem->event_num == -1 || wveitem->span_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-	style = GTK_WIDGET (week_view)->style;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	gc = week_view->main_gc;
-
-	x1 = canvas_item->x1 - x;
-	y1 = canvas_item->y1 - y;
-	x2 = canvas_item->x2 - x;
-	y2 = canvas_item->y2 - y;
-
-	if (x1 == x2 || y1 == y2)
-		return;
-
-	icon_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;
-	end_hour = event->end_minute / 60;
-	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;
-
-		/* 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;
-		}
-
-		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 - 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;
-	GdkFont *font, *small_font;
-	gint hour_to_display, suffix_width;
-	gint time_y_normal_font, time_y_small_font;
-	gchar buffer[128], *suffix;
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	small_font = week_view->small_font;
-	gc = week_view->main_gc;
-
-
-	time_y_normal_font = time_y_small_font = time_y + font->ascent;
-	if (small_font)
-		time_y_small_font = time_y + small_font->ascent;
-
-	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) {
-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i",
-			    hour_to_display, minute);
-
-		/* Draw the hour. */
-		if (hour_to_display < 10)
-			gdk_draw_text (drawable, font, gc,
-				       time_x + week_view->digit_width,
-				       time_y_normal_font, buffer + 1, 1);
-		else
-			gdk_draw_text (drawable, font, gc,
-				       time_x, time_y_normal_font, buffer, 2);
-
-		time_x += week_view->digit_width * 2;
-
-		/* Draw the start minute, in the small font. */
-		gdk_draw_text (drawable, week_view->small_font, gc,
-			       time_x, time_y_small_font, buffer + 3, 2);
-
-		time_x += week_view->small_digit_width * 2;
-
-		/* Draw the 'am'/'pm' suffix, if 12-hour format. */
-		if (!week_view->use_24_hour_format) {
-			gdk_draw_string (drawable, font, gc,
-					 time_x, time_y_normal_font, suffix);
-		}
-	} 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)
-			gdk_draw_string (drawable, font, gc,
-					 time_x + week_view->digit_width,
-					 time_y_normal_font, buffer + 1);
-		else
-			gdk_draw_string (drawable, font, gc,
-					 time_x, time_y_normal_font,
-					 buffer);
-
-	}
-}
-
-
-static void
-e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
-				   GdkDrawable        *drawable,
-				   gint		       icon_x,
-				   gint		       icon_y,
-				   gint		       x2,
-				   gboolean	       right_align)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	CalComponent *comp;
-	GdkGC *gc;
-	gint num_icons = 0, icon_x_inc;
-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-	comp = event->comp;
-
-	gc = week_view->main_gc;
-
-	if (cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	icon_x_inc = E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD;
-
-	if (right_align)
-		icon_x -= icon_x_inc * num_icons;
-
-	if (draw_reminder_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	if (draw_recurrence_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	gdk_gc_set_clip_mask (gc, NULL);
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-				      GdkDrawable	 *drawable,
-				      gint		  x,
-				      gint		  y,
-				      gint		  w,
-				      gint		  h)
-{
-	EWeekView *week_view;
-	GdkGC *gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	gc = week_view->main_gc;
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_draw_line (drawable, gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
-			      int cx, int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EWeekViewEventItem *wveitem;
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_week_view_event_item_button_press (wveitem, event);
-	case GDK_BUTTON_RELEASE:
-		return e_week_view_event_item_button_release (wveitem, event);
-	case GDK_MOTION_NOTIFY:
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-				     GdkEvent		*bevent)
-{
-	EWeekView *week_view;
-	EWeekViewPosition pos;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_press\n");
-#endif
-
-	pos = e_week_view_event_item_get_position (wveitem, bevent->button.x,
-						   bevent->button.y);
-	if (pos == E_WEEK_VIEW_POS_NONE)
-		return FALSE;
-
-	week_view->pressed_event_num = wveitem->event_num;
-	week_view->pressed_span_num = wveitem->span_num;
-
-	if (bevent->button.button == 1) {
-		/* Ignore clicks on the event while editing. */
-		if (E_TEXT (span->text_item)->editing)
-			return FALSE;
-
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		week_view->drag_event_x = bevent->button.x;
-		week_view->drag_event_y = bevent->button.y;
-
-		/* FIXME: Remember the day offset from the start of the event.
-		 */
-	} else if (bevent->button.button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view,
-					     (GdkEventButton*) bevent,
-					     wveitem->event_num);
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-					      "button_press_event");
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-				       GdkEvent		  *event)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_release\n");
-#endif
-
-	if (week_view->pressed_event_num != -1
-	    && week_view->pressed_event_num == wveitem->event_num
-	    && week_view->pressed_span_num == wveitem->span_num) {
-		e_week_view_start_editing_event (week_view,
-						 wveitem->event_num,
-						 wveitem->span_num,
-						 NULL);
-		week_view->pressed_event_num = -1;
-		return TRUE;
-	}
-
-	week_view->pressed_event_num = -1;
-
-	return FALSE;
-}
-
-
-static EWeekViewPosition
-e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-				     gdouble x,
-				     gdouble y)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), E_WEEK_VIEW_POS_NONE);
-
-#if 0
-	g_print ("In e_week_view_event_item_get_position item: %g,%g %g,%g point: %g,%g\n", item->x1, item->y1, item->x2, item->y2, x, y);
-#endif
-
-	if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-	    || x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD)
-		return E_WEEK_VIEW_POS_NONE;
-
-	/* Support left/right edge for long events only. */
-	if (!e_week_view_is_one_day_event (week_view, wveitem->event_num)) {
-		if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-		    + E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    + E_WEEK_VIEW_EVENT_EDGE_X_PAD)
-			return E_WEEK_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_WEEK_VIEW_POS_RIGHT_EDGE;
-	}
-
-	return E_WEEK_VIEW_POS_EVENT;
-}
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
deleted file mode 100644
index ff2b9b2c9f..0000000000
--- a/calendar/gui/e-week-view-event-item.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_EVENT_ITEM_H_
-#define _E_WEEK_VIEW_EVENT_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#define E_WEEK_VIEW_EVENT_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_event_item_get_type (), EWeekViewEventItem))
-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_event_item_get_type ()))
-#define E_IS_WEEK_VIEW_EVENT_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_event_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The event index in the EWeekView events array. */
-	gint event_num;
-
-	/* The span index within the event. */
-	gint span_num;
-} EWeekViewEventItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewEventItemClass;
-
-
-GtkType  e_week_view_event_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
deleted file mode 100644
index e1959489b1..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#include <config.h>
-#include "e-week-view-main-item.h"
-
-static void e_week_view_main_item_class_init	(EWeekViewMainItemClass *class);
-static void e_week_view_main_item_init		(EWeekViewMainItem *wvmitem);
-
-static void e_week_view_main_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_main_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_main_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,
-						 gint		   day,
-						 GDate		  *date,
-						 GdkDrawable       *drawable,
-						 gint		   x,
-						 gint		   y,
-						 gint		   width,
-						 gint		   height);
-static double e_week_view_main_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_main_item_get_type (void)
-{
-	static GtkType e_week_view_main_item_type = 0;
-
-	if (!e_week_view_main_item_type) {
-		GtkTypeInfo e_week_view_main_item_info = {
-			"EWeekViewMainItem",
-			sizeof (EWeekViewMainItem),
-			sizeof (EWeekViewMainItemClass),
-			(GtkClassInitFunc) e_week_view_main_item_class_init,
-			(GtkObjectInitFunc) e_week_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_main_item_info);
-	}
-
-	return e_week_view_main_item_type;
-}
-
-
-static void
-e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewMainItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_main_item_update;
-	item_class->draw        = e_week_view_main_item_draw;
-	item_class->point       = e_week_view_main_item_point;
-}
-
-
-static void
-e_week_view_main_item_init (EWeekViewMainItem *wvmitem)
-{
-	wvmitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewMainItem *wvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvmitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_main_item_update (GnomeCanvasItem *item,
-			      double	      *affine,
-			      ArtSVP	      *clip_path,
-			      int	       flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,
-			    GdkDrawable      *drawable,
-			    int		      x,
-			    int		      y,
-			    int		      width,
-			    int		      height)
-{
-	EWeekViewMainItem *wvmitem;
-	EWeekView *week_view;
-	GDate date;
-	gint num_days, day, day_x, day_y, day_w, day_h;
-
-#if 0
-	g_print ("In e_week_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (canvas_item);
-	week_view = wvmitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	/* Step through each of the days. */
-	date = week_view->first_day_shown;
-
-	/* If no date has been set, we just use Dec 1999/January 2000. */
-	if (!g_date_valid (&date))
-		g_date_set_dmy (&date, 27, 12, 1999);
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		e_week_view_get_day_position (week_view, day,
-					      &day_x, &day_y,
-					      &day_w, &day_h);
-		/* Skip any days which are outside the area. */
-		if (day_x < x + width && day_x + day_w >= x
-		    && day_y < y + height && day_y + day_h >= y) {
-			e_week_view_main_item_draw_day (wvmitem, day, &date,
-							drawable,
-							day_x - x, day_y - y,
-							day_w, day_h);
-		}
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-static void
-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
-				gint		   day,
-				GDate		  *date,
-				GdkDrawable       *drawable,
-				gint		   x,
-				gint		   y,
-				gint		   width,
-				gint		   height)
-{
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *gc;
-	GdkFont *font;
-	gint right_edge, bottom_edge, date_width, date_x, line_y;
-	gboolean show_day_name, show_month_name, selected;
-	gchar buffer[128], *format_string;
-	gint month, day_of_month, max_width;
-	GdkColor *bg_color;
-
-#if 0
-	g_print ("Drawing Day:%i at %i,%i\n", day, x, y);
-#endif
-	week_view = wvmitem->week_view;
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	gc = week_view->main_gc;
-
-	g_return_if_fail (gc != NULL);
-
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
-	line_y = y + E_WEEK_VIEW_DATE_T_PAD + font->ascent
-		+ font->descent	+ E_WEEK_VIEW_DATE_LINE_T_PAD;
-
-	/* Draw the background of the day. In the month view odd months are
-	   one color and even months another, so you can easily see when each
-	   month starts (defaults are white for odd - January, March, ... and
-	   light gray for even). In the week view the background is always the
-	   same color, the color used for the odd months in the month view. */
-	if (week_view->multi_week_view && (month % 2 == 0))
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];
-	else
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];
-
-	gdk_gc_set_foreground (gc, bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
-
-	/* Draw the lines on the right and bottom of the cell. The canvas is
-	   sized so that the lines on the right & bottom edges will be off the
-	   edge of the canvas, so we don't have to worry about them. */
-	right_edge = x + width - 1;
-	bottom_edge = y + height - 1;
-
-	gdk_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 (!GTK_WIDGET_HAS_FOCUS (week_view)
-	    || week_view->selection_start_day == -1
-	    || week_view->selection_start_day > day
-	    || week_view->selection_end_day < day)
-		selected = FALSE;
-	if (selected) {
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
-		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
-					    + font->ascent + font->descent);
-		} 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");
-	}
-
-	g_date_strftime (buffer, sizeof (buffer),
-			 format_string ? format_string : "%d", date);
-	date_width = gdk_string_width (font, buffer);
-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;
-	date_x = MAX (date_x, x + 1);
-
-	if (selected)
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED]);
-	else
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_DATES]);
-	gdk_draw_string (drawable, font, gc,
-			 date_x, y + E_WEEK_VIEW_DATE_T_PAD + font->ascent,
-			 buffer);
-
-	/* Draw the line under the date. */
-	if (!week_view->multi_week_view) {
-		gdk_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);
-	}
-}
-
-
-
-
-/* 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 71ebe423dc..0000000000
--- a/calendar/gui/e-week-view-main-item.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_MAIN_ITEM_H_
-#define _E_WEEK_VIEW_MAIN_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#define E_WEEK_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_main_item_get_type (), EWeekViewMainItem))
-#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_main_item_get_type ()))
-#define E_IS_WEEK_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewMainItemClass;
-
-
-GtkType  e_week_view_main_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
deleted file mode 100644
index 5a2b9c164a..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#include <config.h>
-#include "e-week-view-titles-item.h"
-
-static void e_week_view_titles_item_class_init	(EWeekViewTitlesItemClass *class);
-static void e_week_view_titles_item_init	(EWeekViewTitlesItem *wvtitem);
-
-static void e_week_view_titles_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_titles_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static double e_week_view_titles_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_titles_item_get_type (void)
-{
-	static GtkType e_week_view_titles_item_type = 0;
-
-	if (!e_week_view_titles_item_type) {
-		GtkTypeInfo e_week_view_titles_item_info = {
-			"EWeekViewTitlesItem",
-			sizeof (EWeekViewTitlesItem),
-			sizeof (EWeekViewTitlesItemClass),
-			(GtkClassInitFunc) e_week_view_titles_item_class_init,
-			(GtkObjectInitFunc) e_week_view_titles_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_titles_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_titles_item_info);
-	}
-
-	return e_week_view_titles_item_type;
-}
-
-
-static void
-e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_titles_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_titles_item_update;
-	item_class->draw        = e_week_view_titles_item_draw;
-	item_class->point       = e_week_view_titles_item_point;
-}
-
-
-static void
-e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
-{
-	wvtitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewTitlesItem *wvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvtitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_titles_item_update (GnomeCanvasItem *item,
-				double	    *affine,
-				ArtSVP	    *clip_path,
-				int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
-			      GdkDrawable      *drawable,
-			      int		x,
-			      int		y,
-			      int		width,
-			      int		height)
-{
-	EWeekViewTitlesItem *wvtitem;
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	GdkFont *font;
-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
-	gchar buffer[128], *date_format;
-	GDate date;
-	GdkRectangle clip_rect;
-	gboolean long_format;
-	gint weekday;
-
-#if 0
-	g_print ("In e_week_view_titles_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (canvas_item);
-	week_view = wvtitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 2 - y,
-		       1 - x, canvas_height - 1 - y);
-
-	gdk_draw_rectangle (drawable, dark_gc, FALSE,
-			    0 - x, 0 - y,
-			    canvas_width - 1, canvas_height);
-
-	/* Determine the format to use. */
-	col_width = canvas_width / week_view->columns;
-	if (col_width > week_view->max_day_width + 2) {
-	  date_format = "%A";
-	  long_format = TRUE;
-	} else {
-	  date_format = "%a";
-	  long_format = FALSE;
-	}
-
-	/* Shift right one pixel to account for the shadow around the main
-	   canvas. */
-	x--;
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	g_date_clear (&date, 1);
-	/* 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]);
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (col != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       week_view->col_offsets[col] - x,
-				       4 - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       week_view->col_offsets[col] - 1 - x,
-				       4 - y,
-				       week_view->col_offsets[col] - 1 - x,
-				       canvas_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (col != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y);
-		}
-
-		if (weekday == 5 && week_view->compress_weekend)
-			weekday += 2;
-		else
-			weekday++;
-
-		weekday = weekday % 7;
-
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
-			       int cx, int cy,
-			       GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
deleted file mode 100644
index fc4d45107d..0000000000
--- a/calendar/gui/e-week-view-titles-item.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_TITLES_ITEM_H_
-#define _E_WEEK_VIEW_TITLES_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#define E_WEEK_VIEW_TITLES_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_titles_item_get_type (), EWeekViewTitlesItem))
-#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_titles_item_get_type ()))
-#define E_IS_WEEK_VIEW_TITLES_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_titles_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewTitlesItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewTitlesItemClass;
-
-
-GtkType  e_week_view_titles_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
deleted file mode 100644
index 74c0df4f9c..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,3547 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "dialogs/delete-comp.h"
-#include "calendar-commands.h"
-#include "comp-util.h"
-#include "e-week-view.h"
-#include "e-week-view-event-item.h"
-#include "e-week-view-main-item.h"
-#include "e-week-view-titles-item.h"
-#include <cal-util/timeutil.h>
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include "e-meeting-edit.h"
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-#include "jump.xpm"
-
-#define E_WEEK_VIEW_SMALL_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
-#define E_WEEK_VIEW_SMALL_FONT_FALLBACK	\
-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"
-
-/* We use a 7-bit field to store row numbers in EWeekViewEventSpan, so the
-   maximum number or rows we can allow is 127. It is very unlikely to be
-   reached anyway. */
-#define E_WEEK_VIEW_MAX_ROWS_PER_CELL	127
-
-#define E_WEEK_VIEW_JUMP_BUTTON_WIDTH	16
-#define E_WEEK_VIEW_JUMP_BUTTON_HEIGHT	8
-
-#define E_WEEK_VIEW_JUMP_BUTTON_X_PAD	3
-#define E_WEEK_VIEW_JUMP_BUTTON_Y_PAD	3
-
-static void e_week_view_class_init (EWeekViewClass *class);
-static void e_week_view_init (EWeekView *week_view);
-static void e_week_view_destroy (GtkObject *object);
-static void e_week_view_realize (GtkWidget *widget);
-static void e_week_view_unrealize (GtkWidget *widget);
-static void e_week_view_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style);
-static void e_week_view_size_allocate (GtkWidget *widget,
-				       GtkAllocation *allocation);
-static void e_week_view_recalc_cell_sizes (EWeekView *week_view);
-static gint e_week_view_focus_in (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_week_view_focus_out (GtkWidget *widget,
-				   GdkEventFocus *event);
-static gint e_week_view_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event);
-static void e_week_view_draw (GtkWidget    *widget,
-			      GdkRectangle *area);
-static void e_week_view_draw_shadow (EWeekView *week_view);
-
-static gboolean e_week_view_on_button_press (GtkWidget *widget,
-					     GdkEventButton *event,
-					     EWeekView *week_view);
-static gboolean e_week_view_on_button_release (GtkWidget *widget,
-					       GdkEventButton *event,
-					       EWeekView *week_view);
-static gboolean e_week_view_on_motion (GtkWidget *widget,
-				       GdkEventMotion *event,
-				       EWeekView *week_view);
-static gint e_week_view_convert_position_to_day (EWeekView *week_view,
-						 gint x,
-						 gint y);
-static void e_week_view_update_selection (EWeekView *week_view,
-					  gint day);
-
-static void e_week_view_queue_reload_events (EWeekView *week_view);
-static gboolean e_week_view_reload_events_idle_cb	(gpointer data);
-static void e_week_view_reload_events (EWeekView *week_view);
-static void e_week_view_free_events (EWeekView *week_view);
-static gboolean e_week_view_add_event (CalComponent *comp,
-				       time_t	  start,
-				       time_t	  end,
-				       gpointer	  data);
-static void e_week_view_check_layout (EWeekView *week_view);
-static void e_week_view_layout_events (EWeekView *week_view);
-static void e_week_view_layout_event (EWeekView	   *week_view,
-				      EWeekViewEvent   *event,
-				      guint8	   *grid,
-				      GArray	   *spans);
-static void e_week_view_ensure_events_sorted (EWeekView *week_view);
-static gint e_week_view_event_sort_func (const void *arg1,
-					 const void *arg2);
-static void e_week_view_reshape_events (EWeekView *week_view);
-static void e_week_view_reshape_event_span (EWeekView *week_view,
-					    gint event_num,
-					    gint span_num);
-static gint e_week_view_find_day (EWeekView *week_view,
-				  time_t time_to_find,
-				  gboolean include_midnight_in_prev_day);
-static gint e_week_view_find_span_end (EWeekView *week_view,
-				       gint day);
-static void e_week_view_recalc_day_starts (EWeekView *week_view,
-					   time_t lower);
-static void e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-					       EWeekView *week_view);
-static void e_week_view_on_editing_started (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static void e_week_view_on_editing_stopped (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static gboolean e_week_view_find_event_from_item (EWeekView	  *week_view,
-						  GnomeCanvasItem *item,
-						  gint		  *event_num,
-						  gint		  *span_num);
-static gboolean e_week_view_find_event_from_uid (EWeekView	  *week_view,
-						 const gchar	  *uid,
-						 gint		  *event_num_return);
-typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,
-						    gint event_num,
-						    gpointer data);
-
-static void e_week_view_foreach_event_with_uid (EWeekView *week_view,
-						const gchar *uid,
-						EWeekViewForeachEventCallback callback,
-						gpointer data);
-static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
-						GdkEvent *event,
-						EWeekView *week_view);
-static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-						  GdkEvent *event,
-						  EWeekView *week_view);
-static gint e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);
-static void e_week_view_on_new_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_week_view_on_edit_appointment (GtkWidget *widget,
-					     gpointer data);
-static void e_week_view_on_delete_occurrence (GtkWidget *widget,
-					      gpointer data);
-static void e_week_view_on_delete_appointment (GtkWidget *widget,
-					       gpointer data);
-static void e_week_view_on_schedule_meet (GtkWidget *widget, 
-					  gpointer data);
-static void e_week_view_on_unrecur_appointment (GtkWidget *widget,
-						gpointer data);
-
-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 GtkTableClass *parent_class;
-
-
-GtkType
-e_week_view_get_type (void)
-{
-	static GtkType e_week_view_type = 0;
-
-	if (!e_week_view_type){
-		GtkTypeInfo e_week_view_info = {
-			"EWeekView",
-			sizeof (EWeekView),
-			sizeof (EWeekViewClass),
-			(GtkClassInitFunc) e_week_view_class_init,
-			(GtkObjectInitFunc) e_week_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_week_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						    &e_week_view_info);
-	}
-
-	return e_week_view_type;
-}
-
-
-static void
-e_week_view_class_init (EWeekViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_week_view_destroy;
-
-	widget_class->realize		= e_week_view_realize;
-	widget_class->unrealize		= e_week_view_unrealize;
-	widget_class->style_set		= e_week_view_style_set;
- 	widget_class->size_allocate	= e_week_view_size_allocate;
-	widget_class->focus_in_event	= e_week_view_focus_in;
-	widget_class->focus_out_event	= e_week_view_focus_out;
-	widget_class->key_press_event	= e_week_view_key_press;
-	widget_class->expose_event	= e_week_view_expose_event;
-	widget_class->draw		= e_week_view_draw;
-}
-
-
-static void
-e_week_view_init (EWeekView *week_view)
-{
-	GnomeCanvasGroup *canvas_group;
-	GtkObject *adjustment;
-	GdkPixbuf *pixbuf;
-	gint i;
-
-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);
-
-	week_view->calendar = NULL;
-	week_view->client = NULL;
-
-	week_view->events = g_array_new (FALSE, FALSE,
-					 sizeof (EWeekViewEvent));
-	week_view->events_sorted = TRUE;
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-	week_view->reload_events_idle_id = 0;
-
-	week_view->spans = NULL;
-
-	week_view->multi_week_view = FALSE;
-	week_view->weeks_shown = 6;
-	week_view->rows = 6;
-	week_view->columns = 2;
-	week_view->compress_weekend = TRUE;
-	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->main_gc = NULL;
-
-	/* Create the small font. */
-	week_view->use_small_font = TRUE;
-	week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT);
-	if (!week_view->small_font)
-		week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT_FALLBACK);
-	if (!week_view->small_font)
-		g_warning ("Couldn't load font");
-
-	/* 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);
-
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_press),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_release),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_motion),
-				  week_view);
-
-	/* Create the buttons to jump to each days. */
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
-
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		week_view->jump_buttons[i] = gnome_canvas_item_new
-			(canvas_group,
-			 gnome_canvas_pixbuf_get_type (),
-			 "GnomeCanvasPixbuf::pixbuf", pixbuf,
-			 NULL);
-
-		gtk_signal_connect (GTK_OBJECT (week_view->jump_buttons[i]),
-				    "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_jump_button_event),
-				    week_view);
-	}
-	gdk_pixbuf_unref (pixbuf);
-
-	/*
-	 * Scrollbar.
-	 */
-	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
-	gtk_signal_connect (adjustment, "value_changed",
-			    GTK_SIGNAL_FUNC (e_week_view_on_adjustment_changed),
-			    week_view);
-
-	week_view->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));
-	gtk_table_attach (GTK_TABLE (week_view), week_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (week_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	week_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	week_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	week_view->last_cursor_set = NULL;
-}
-
-
-/**
- * e_week_view_new:
- * @Returns: a new #EWeekView.
- *
- * Creates a new #EWeekView.
- **/
-GtkWidget *
-e_week_view_new (void)
-{
-	GtkWidget *week_view;
-
-	week_view = GTK_WIDGET (gtk_type_new (e_week_view_get_type ()));
-
-	return week_view;
-}
-
-
-static void
-e_week_view_destroy (GtkObject *object)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (object);
-
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id != 0) {
-		g_source_remove (week_view->reload_events_idle_id);
-		week_view->reload_events_idle_id = 0;
-	}
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-		week_view->client = NULL;
-	}
-
-	if (week_view->small_font)
-		gdk_font_unref (week_view->small_font);
-
-	gdk_cursor_destroy (week_view->normal_cursor);
-	gdk_cursor_destroy (week_view->move_cursor);
-	gdk_cursor_destroy (week_view->resize_width_cursor);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_week_view_realize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gboolean success[E_WEEK_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	week_view = E_WEEK_VIEW (widget);
-	week_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xeded;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].blue  = 65535;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red   = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 0xd6d6;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].blue  = 0;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_GRID].blue  = 0 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_SELECTED].blue  = 156 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].red   = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].green = 0 * 257;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES].blue  = 0 * 257;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].blue  = 65535;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, week_view->colors,
-					     E_WEEK_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	week_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->reminder_mask, NULL, bell_xpm);
-	week_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->recurrence_mask, NULL, recur_xpm);
-}
-
-
-static void
-e_week_view_unrealize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gint i;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	gdk_gc_unref (week_view->main_gc);
-	week_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_WEEK_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &week_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (week_view->reminder_icon);
-	week_view->reminder_icon = NULL;
-	gdk_pixmap_unref (week_view->recurrence_icon);
-	week_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_week_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EWeekView *week_view;
-	EWeekViewEventSpan *span;
-	GdkFont *font;
-	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];
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	week_view = E_WEEK_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	week_view->row_height = font->ascent + font->descent + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2 + E_WEEK_VIEW_EVENT_TEXT_Y_PAD * 2;
-	week_view->row_height = MAX (week_view->row_height, E_WEEK_VIEW_ICON_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2);
-
-	/* Set the height of the top canvas. */
-	gtk_widget_set_usize (week_view->titles_canvas, -1,
-			      font->ascent + font->descent + 5);
-
-	/* Save the sizes of various strings in the font, so we can quickly
-	   decide which date formats to use. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
-
-	max_day_width = 0;
-	max_abbr_day_width = 0;
-	for (day = 0; day < 7; day++) {
-		g_date_strftime (buffer, 128, "%A", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->day_widths[day] = day_width;
-		max_day_width = MAX (max_day_width, day_width);
-
-		g_date_strftime (buffer, 128, "%a", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->abbr_day_widths[day] = day_width;
-		max_abbr_day_width = MAX (max_abbr_day_width, day_width);
-
-		g_date_add_days (&date, 1);
-	}
-
-	max_month_width = 0;
-	max_abbr_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		g_date_set_month (&date, month + 1);
-
-		g_date_strftime (buffer, 128, "%B", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->month_widths[month] = month_width;
-		max_month_width = MAX (max_month_width, month_width);
-
-		g_date_strftime (buffer, 128, "%b", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->abbr_month_widths[month] = month_width;
-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);
-	}
-
-	week_view->space_width = gdk_string_width (font, " ");
-	week_view->colon_width = gdk_string_width (font, ":");
-	week_view->slash_width = gdk_string_width (font, "/");
-	week_view->digit_width = gdk_string_width (font, "5");
-	if (week_view->small_font)
-		week_view->small_digit_width = gdk_string_width (week_view->small_font, "5");
-	week_view->max_day_width = max_day_width;
-	week_view->max_abbr_day_width = max_abbr_day_width;
-	week_view->max_month_width = max_month_width;
-	week_view->max_abbr_month_width = max_abbr_month_width;
-
-	week_view->am_string_width = gdk_string_width (font,
-						       week_view->am_string);
-	week_view->pm_string_width = gdk_string_width (font,
-						       week_view->pm_string);
-
-	/* Set the font of all the EText 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->text_item)
-				gnome_canvas_item_set (span->text_item,
-						       "font_gdk", font,
-						       NULL);
-		}
-	}
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EWeekView *week_view;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->titles_canvas->allocation.width - 1;
-	new_y2 = week_view->titles_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-						0, 0, new_x2, new_y2);
-
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->main_canvas->allocation.width - 1;
-	new_y2 = week_view->main_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Flag that we need to reshape the events. */
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-static void
-e_week_view_recalc_cell_sizes (EWeekView *week_view)
-{
-	gfloat canvas_width, canvas_height, offset;
-	gint row, col;
-	GtkWidget *widget;
-	GdkFont *font;
-	gint width, height, time_width;
-
-	if (week_view->multi_week_view) {
-		week_view->rows = week_view->weeks_shown * 2;
-		week_view->columns = week_view->compress_weekend ? 6 : 7;
-	} else {
-		week_view->rows = 6;
-		week_view->columns = 2;
-	}
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths.
-	   We also add one to the width so that the right border of the last
-	   column is off the edge of the displayed area. */
-	canvas_width = week_view->main_canvas->allocation.width + 1;
-	canvas_width /= week_view->columns;
-	offset = 0;
-	for (col = 0; col <= week_view->columns; col++) {
-		week_view->col_offsets[col] = floor (offset + 0.5);
-		offset += canvas_width;
-	}
-
-	/* Calculate the cell widths based on the offsets. */
-	for (col = 0; col < week_view->columns; col++) {
-		week_view->col_widths[col] = week_view->col_offsets[col + 1]
-			- week_view->col_offsets[col];
-	}
-
-	/* Now do the same for the row heights. */
-	canvas_height = week_view->main_canvas->allocation.height + 1;
-	canvas_height /= week_view->rows;
-	offset = 0;
-	for (row = 0; row <= week_view->rows; row++) {
-		week_view->row_offsets[row] = floor (offset + 0.5);
-		offset += canvas_height;
-	}
-
-	/* Calculate the cell heights based on the offsets. */
-	for (row = 0; row < week_view->rows; row++) {
-		week_view->row_heights[row] = week_view->row_offsets[row + 1]
-			- week_view->row_offsets[row];
-	}
-
-
-	/* If the font hasn't been set yet just return. */
-	widget = GTK_WIDGET (week_view);
-	if (!widget->style || ! widget->style->font)
-		return;
-
-	font = widget->style->font;
-
-	/* Calculate the number of rows of events in each cell, for the large
-	   cells and the compressed weekend cells. */
-	if (week_view->multi_week_view) {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_B_PAD;
-	} else {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1
-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;
-	}
-
-	height = week_view->row_heights[0];
-	week_view->rows_per_cell = (height * 2 - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_cell = MIN (week_view->rows_per_cell,
-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	week_view->rows_per_compressed_cell =
-		(height - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_compressed_cell = MIN (week_view->rows_per_compressed_cell,
-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	/* Determine which time format to use, based on the width of the cells.
-	   We only allow the time to take up about half of the width. */
-	width = week_view->col_widths[0];
-
-	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) {
-		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;
-	}
-}
-
-
-static gint
-e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_week_view_expose_event (GtkWidget *widget,
-			  GdkEventExpose *event)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_draw (GtkWidget    *widget,
-		  GdkRectangle *area)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-static void
-e_week_view_draw_shadow (EWeekView *week_view)
-{
-	gint x1, y1, x2, y2;
-	GtkStyle *style;
-	GdkGC *light_gc, *dark_gc;
-	GdkWindow *window;
-
-	/* Draw the shadow around the graphical displays. */
-	x1 = week_view->main_canvas->allocation.x - 1;
-	y1 = week_view->main_canvas->allocation.y - 1;
-	x2 = x1 + week_view->main_canvas->allocation.width + 2;
-	y2 = y1 + week_view->main_canvas->allocation.height + 2;
-
-	style = GTK_WIDGET (week_view)->style;
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-
-	window = GTK_WIDGET (week_view)->window;
-	gdk_draw_line (window, dark_gc, x1, y1, x1, y2);
-	gdk_draw_line (window, dark_gc, x1, y1, x2, y1);
-	gdk_draw_line (window, light_gc, x2, y1, x2, y2);
-	gdk_draw_line (window, light_gc, x1, y2, x2, y2);
-}
-
-
-void
-e_week_view_set_calendar	(EWeekView	*week_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	week_view->calendar = calendar;
-}
-
-
-/* Callback used when the calendar client finishes opening */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (status != CAL_CLIENT_OPEN_SUCCESS)
-		return;
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	gint event_num, num_days;
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* Sanity check. */
-	g_return_if_fail (client == week_view->client);
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (week_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		if (!cal_component_has_recurrences (comp)
-		    && !cal_component_has_recurrences (event->comp)
-		    && cal_component_event_dates_match (comp, event->comp)) {
-#if 0
-			g_print ("updated object's dates unchanged\n");
-#endif
-			e_week_view_foreach_event_with_uid (week_view, uid, e_week_view_update_event_cb, comp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			gtk_widget_queue_draw (week_view->main_canvas);
-			return;
-		}
-
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-#if 0
-		g_print ("dates changed - removing occurrences\n");
-#endif
-		e_week_view_foreach_event_with_uid (week_view, uid,
-						    e_week_view_remove_event_cb,
-						    NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	cal_recur_generate_instances (comp,
-				      week_view->day_starts[0],
-				      week_view->day_starts[num_days],
-				      e_week_view_add_event,
-				      week_view);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	e_week_view_foreach_event_with_uid (week_view, uid,
-					    e_week_view_remove_event_cb, NULL);
-
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/**
- * e_week_view_set_cal_client:
- * @week_view: A week view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a week view will monitor.
- **/
-void
-e_week_view_set_cal_client	(EWeekView	*week_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (week_view != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (client == week_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-	}
-
-	week_view->client = client;
-
-	if (week_view->client) {
-		if (cal_client_get_load_state (week_view->client) != CAL_CLIENT_LOAD_LOADED)
-			gtk_signal_connect (GTK_OBJECT (week_view->client), "cal_opened",
-					    GTK_SIGNAL_FUNC (cal_opened_cb), week_view);
-
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), week_view);
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), week_view);
-	}
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-
-/* This sets the selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void
-e_week_view_set_selected_time_range	(EWeekView	*week_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date, base_date, end_date;
-	gint day_offset, weekday, week_start_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	g_date_clear (&date, 1);
-	g_date_set_time (&date, start_time);
-
-	if (week_view->multi_week_view) {
-		/* Find the number of days since the start of the month. */
-		day_offset = g_date_day (&date) - 1;
-
-		/* Find the 1st week which starts at or before the start of
-		   the month. */
-		base_date = date;
-		g_date_set_day (&base_date, 1);
-
-		/* Calculate the weekday of the 1st of the month, 0 = Mon. */
-		weekday = g_date_weekday (&base_date) - 1;
-
-		/* Convert it to an offset from the start of the display. */
-		week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
-
-		/* Add it to the day offset so we go back to the 1st week at
-		   or before the start of the month. */
-		day_offset += week_start_offset;
-	} else {
-		/* 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)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		start_time = time_add_day (start_time, -day_offset);
-		start_time = time_day_begin (start_time);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&base_date);
-	if (end_time == start_time
-	    || end_time <= time_add_day (start_time, 1))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		g_date_clear (&end_date, 1);
-		g_date_set_time (&end_date, end_time - 60);
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&base_date);
-	}
-
-	/* Make sure the selection is valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	num_days--;
-	week_view->selection_start_day = CLAMP (week_view->selection_start_day,
-						0, num_days);
-	week_view->selection_end_day = CLAMP (week_view->selection_end_day,
-					      week_view->selection_start_day,
-					      num_days);
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Returns the selected time range. */
-void
-e_week_view_get_selected_time_range	(EWeekView	*week_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_day, end_day;
-
-	start_day = week_view->selection_start_day;
-	end_day = week_view->selection_end_day;
-
-	if (start_day == -1) {
-		start_day = 0;
-		end_day = 0;
-	}
-
-	if (start_time)
-		*start_time = week_view->day_starts[start_day];
-
-	if (end_time)
-		*end_time = week_view->day_starts[end_day + 1];
-}
-
-
-/* Note that the returned date may be invalid if no date has been set yet. */
-void
-e_week_view_get_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	*date = week_view->first_day_shown;
-}
-
-
-/* This sets the first day shown in the view. It will be rounded down to the
-   nearest week. */
-void
-e_week_view_set_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	GDate base_date;
-	gint weekday, day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;
-	struct tm start_tm;
-	time_t start_time;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	/* Calculate the old selection range. */
-	if (week_view->selection_start_day != -1) {
-		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_start_day;
-		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_end_day;
-	}
-
-	/* 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;
-		g_date_to_struct_tm (&base_date, &start_tm);
-		start_time = mktime (&start_tm);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Try to keep the previous selection, but if it is no longer shown
-	   just select the first day. */
-	if (week_view->selection_start_day != -1) {
-		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
-		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
-
-		/* Make sure the selection is valid. */
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-		num_days--;
-		week_view->selection_start_day =
-			CLAMP (week_view->selection_start_day, 0, num_days);
-		week_view->selection_end_day =
-			CLAMP (week_view->selection_end_day,
-			       week_view->selection_start_day,
-			       num_days);
-	}
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Recalculates the time_t corresponding to the start of each day. */
-static void
-e_week_view_recalc_day_starts (EWeekView *week_view,
-			       time_t lower)
-{
-	gint num_days, day;
-	time_t tmp_time;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	tmp_time = lower;
-	week_view->day_starts[0] = tmp_time;
-	for (day = 1; day <= num_days; day++) {
-		tmp_time = time_add_day (tmp_time, 1);
-		week_view->day_starts[day] = tmp_time;
-	}
-}
-
-
-gboolean
-e_week_view_get_multi_week_view	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->multi_week_view;
-}
-
-
-void
-e_week_view_set_multi_week_view	(EWeekView	*week_view,
-				 gboolean	 multi_week_view)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->multi_week_view == multi_week_view)
-		return;
-
-	week_view->multi_week_view = multi_week_view;
-
-	if (multi_week_view) {
-		gtk_widget_show (week_view->titles_canvas);
-		page_increment = 4;
-		page_size = 5;
-	} else {
-		gtk_widget_hide (week_view->titles_canvas);
-		page_increment = page_size = 1;
-	}
-
-	adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	adjustment->page_increment = page_increment;
-	adjustment->page_size = page_size;
-	gtk_adjustment_changed (adjustment);
-
-	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);
-}
-
-
-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);
-
-		/* Make sure the events are reloaded. */
-		e_week_view_queue_reload_events (week_view);
-	}
-}
-
-
-gboolean
-e_week_view_get_compress_weekend	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->compress_weekend;
-}
-
-
-void
-e_week_view_set_compress_weekend	(EWeekView	*week_view,
-					 gboolean	 compress)
-{
-	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);
-	}
-}
-
-
-/* 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);
-}
-
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean
-e_week_view_get_24_hour_format	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->use_24_hour_format;
-}
-
-
-void
-e_week_view_set_24_hour_format	(EWeekView	*week_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->use_24_hour_format == use_24_hour)
-		return;
-
-	week_view->use_24_hour_format = use_24_hour;
-
-	/* We need to re-layout the events since the time format affects the
-	   sizes. */
-	e_week_view_recalc_cell_sizes (week_view);
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-	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;
-	gchar *text;
-	CalComponent *comp;
-
-	comp = data;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			CalComponentText t;
-
-			cal_component_get_summary (event->comp, &t);
-			text = (char*) t.value;
-			gnome_canvas_item_set (span->text_item,
-					       "text", text ? text : "",
-					       NULL);
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	return TRUE;
-}
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_week_view_foreach_event_with_uid (EWeekView *week_view,
-				    const gchar *uid,
-				    EWeekViewForeachEventCallback callback,
-				    gpointer data)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-
-	for (event_num = week_view->events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (week_view, event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_week_view_remove_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (week_view->editing_event_num == event_num)
-		week_view->editing_event_num = -1;
-
-	/* We leave the span elements in the array, but set the canvas item
-	   pointers to NULL. */
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-			span->text_item = NULL;
-		}
-		if (span->background_item) {
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-			span->background_item = NULL;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	g_array_remove_index (week_view->events, event_num);
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-void
-e_week_view_get_day_position	(EWeekView	*week_view,
-				 gint		 day,
-				 gint		*day_x,
-				 gint		*day_y,
-				 gint		*day_w,
-				 gint		*day_h)
-{
-	gint week, day_of_week, row, col, weekend_col, box, weekend_box;
-
-	*day_x = *day_y = *day_w = *day_h = 0;
-	g_return_if_fail (day >= 0);
-
-	if (week_view->multi_week_view) {
-		g_return_if_fail (day < week_view->weeks_shown * 7);
-
-		week = day / 7;
-		col = day % 7;
-		day_of_week = (week_view->display_start_day + day) % 7;
-		if (week_view->compress_weekend && day_of_week >= 5) {
-			/* In the compressed view Saturday is above Sunday and
-			   both have just one row as opposed to 2 for all the
-			   other days. */
-			if (day_of_week == 5) {
-				*day_y = week_view->row_offsets[week * 2];
-				*day_h = week_view->row_heights[week * 2];
-			} else {
-				*day_y = week_view->row_offsets[week * 2 + 1];
-				*day_h = week_view->row_heights[week * 2 + 1];
-				col--;
-			}
-			/* Both Saturday and Sunday are in the same column. */
-			*day_x = week_view->col_offsets[col];
-			*day_w = week_view->col_widths[col];
-		} else {
-			/* If the weekend is compressed and the day is after
-			   the weekend we have to move back a column. */
-			if (week_view->compress_weekend) {
-				/* Calculate where the weekend column is.
-				   Note that 5 is Saturday. */
-				weekend_col = (5 + 7 - week_view->display_start_day) % 7;
-				if (col > weekend_col)
-					col--;
-			}
-
-			*day_y = week_view->row_offsets[week * 2];
-			*day_h = week_view->row_heights[week * 2]
-				+ week_view->row_heights[week * 2 + 1];
-			*day_x = week_view->col_offsets[col];
-			*day_w = week_view->col_widths[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 = (week_view->display_start_day + day) % 7;
-		weekend_box = (5 + 7 - week_view->display_start_day) % 7;
-		if (box > weekend_box)
-			box--;
-
-		if (box < 3) {
-			*day_x = week_view->col_offsets[0];
-			*day_w = week_view->col_widths[0];
-		} else {
-			*day_x = week_view->col_offsets[1];
-			*day_w = week_view->col_widths[1];
-		}
-
-		row = (box % 3) * 2;
-		if (day_of_week < 5) {
-			*day_y = week_view->row_offsets[row];
-			*day_h = week_view->row_heights[row]
-				+ week_view->row_heights[row + 1];
-		} else if (day_of_week == 5) {
-			/* Saturday. */
-			*day_y = week_view->row_offsets[row];
-			*day_h = week_view->row_heights[row];
-
-		} else {
-			/* Sunday. */
-			*day_y = week_view->row_offsets[row + 1];
-			*day_h = week_view->row_heights[row + 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 end_day_of_week, num_days;
-	gint start_x, start_y, start_w, start_h;
-	gint end_x, end_y, end_w, end_h;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-	g_return_val_if_fail (event_num < week_view->events->len, FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	g_return_val_if_fail (span_num < event->num_spans, FALSE);
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	if (span->row >= week_view->rows_per_cell)
-		return FALSE;
-
-	end_day_of_week = (week_view->display_start_day + span->start_day + span->num_days - 1) % 7;
-	num_days = span->num_days;
-	/* Check if the row will not be visible in compressed cells. */
-	if (span->row >= week_view->rows_per_compressed_cell) {
-		if (week_view->multi_week_view) {
-			if (week_view->compress_weekend) {
-				/* If it ends on a Saturday and is 1 day long
-				   we skip it, else we shorten it. If it ends
-				   on a Sunday it must be 1 day long and we
-				   skip it. */
-				if (end_day_of_week == 5) {	   /* Sat */
-					if (num_days == 1) {
-						return FALSE;
-					} else {
-						num_days--;
-					}
-				} else if (end_day_of_week == 6) { /* Sun */
-					return FALSE;
-				}
-			}
-		} else {
-			/* All spans are 1 day long in the week view, so we
-			   just skip it. */
-			if (end_day_of_week > 4)
-				return FALSE;
-		}
-	}
-
-	e_week_view_get_day_position (week_view, span->start_day,
-				      &start_x, &start_y, &start_w, &start_h);
-	*span_y = start_y + week_view->events_y_offset
-		+ span->row * (week_view->row_height
-			       + E_WEEK_VIEW_EVENT_Y_SPACING);
-	if (num_days == 1) {
-		*span_x = start_x;
-		*span_w = start_w - 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");
-#endif
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment:
-					  adj->page_increment);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	/* Convert the mouse position to a week & day. */
-	x = event->x;
-	y = event->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			week_view->selection_start_day = day;
-			week_view->selection_end_day = day;
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-
-			/* FIXME: Optimise? */
-			gtk_widget_queue_draw (week_view->main_canvas);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view, event, -1);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_button_release (GtkWidget *widget,
-			       GdkEventButton *event,
-			       EWeekView *week_view)
-{
-	time_t start, end;
-
-#if 0
-	g_print ("In e_week_view_on_button_release\n");
-#endif
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-		gdk_pointer_ungrab (event->time);
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-
-		if (week_view->calendar)
-			gnome_calendar_set_selected_time_range (week_view->calendar, start, end);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_motion (GtkWidget *widget,
-		       GdkEventMotion *mevent,
-		       EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_motion\n");
-#endif
-
-	/* Convert the mouse position to a week & day. */
-	x = mevent->x;
-	y = mevent->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		e_week_view_update_selection (week_view, day);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/* Converts a position in the canvas window to a day offset from the first
-   day displayed. Returns -1 if the position is outside the grid. */
-static gint
-e_week_view_convert_position_to_day (EWeekView *week_view,
-				     gint x,
-				     gint y)
-{
-	gint col, row, grid_x = -1, grid_y = -1, week, day;
-	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);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_week_view_queue_reload_events (EWeekView *week_view)
-{
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id == 0) {
-		/* We'll use a low priority here, so the user can scroll
-		   the view quickly. */
-		week_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_LOW,
-			 e_week_view_reload_events_idle_cb, week_view, NULL);
-	}
-}
-
-
-static gboolean
-e_week_view_reload_events_idle_cb	(gpointer data)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	week_view = E_WEEK_VIEW (data);
-
-	week_view->reload_events_idle_id = 0;
-
-	e_week_view_reload_events (week_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_week_view_reload_events (EWeekView *week_view)
-{
-	gint num_days;
-
-	e_week_view_free_events (week_view);
-
-	if (!(week_view->client
-	      && cal_client_get_load_state (week_view->client) == CAL_CLIENT_LOAD_LOADED))
-		return;
-
-	/* Only load events if the date range has been set. */
-	if (g_date_valid (&week_view->first_day_shown)) {
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-
-#if 0
-		g_print ("EWeekView (%s) generating instances\n",
-			 week_view->multi_week_view ? "Month View" : "Week View");
-#endif
-		cal_client_generate_instances (week_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       week_view->day_starts[0],
-					       week_view->day_starts[num_days],
-					       e_week_view_add_event,
-					       week_view);
-	}
-
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-static void
-e_week_view_free_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_days, day;
-
-	/* Reset all our indices. */
-	week_view->pressed_event_num = -1;
-	week_view->pressed_span_num = -1;
-	week_view->editing_event_num = -1;
-	week_view->editing_span_num = -1;
-	week_view->popup_event_num = -1;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (week_view->events, 0);
-
-	/* Destroy all the old canvas items. */
-	if (week_view->spans) {
-		for (span_num = 0; span_num < week_view->spans->len;
-		     span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan, span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (week_view->spans, TRUE);
-		week_view->spans = NULL;
-	}
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_week_view_add_event (CalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gpointer	  data)
-
-{
-	EWeekView *week_view;
-	EWeekViewEvent event;
-	gint num_days;
-	struct tm start_tm, end_tm;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* Check that the event times are valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 week_view->day_starts[0], week_view->day_starts[num_days],
-		 start, end);
-#endif
-
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < week_view->day_starts[num_days], TRUE);
-	g_return_val_if_fail (end > week_view->day_starts[0], TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (event.comp));
-	event.start = start;
-	event.end = end;
-	event.spans_index = 0;
-	event.num_spans = 0;
-
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	g_array_append_val (week_view->events, event);
-	week_view->events_sorted = FALSE;
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-/* This lays out the events, or reshapes them, as necessary. */
-static void
-e_week_view_check_layout (EWeekView *week_view)
-{
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (week_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_week_view_ensure_events_sorted (week_view);
-
-	if (week_view->events_need_layout)
-		e_week_view_layout_events (week_view);
-
-	if (week_view->events_need_layout || week_view->events_need_reshape)
-		e_week_view_reshape_events (week_view);
-
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-}
-
-
-static void
-e_week_view_layout_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days, day, event_num, span_num;
-	guint8 *grid;
-	GArray *spans, *old_spans;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8, E_WEEK_VIEW_MAX_ROWS_PER_CELL * 7
-		       * E_WEEK_VIEW_MAX_WEEKS);
-
-	/* We create a new array of spans, which will replace the old one. */
-	spans = g_array_new (FALSE, FALSE, sizeof (EWeekViewEventSpan));
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-
-	/* Iterate over the events, finding which weeks they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		e_week_view_layout_event (week_view, event, grid, spans);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Replace the spans array. */
-	old_spans = week_view->spans;
-	week_view->spans = spans;
-
-	/* Destroy the old spans array, destroying any unused canvas items. */
-	if (old_spans) {
-		for (span_num = 0; span_num < old_spans->len; span_num++) {
-			span = &g_array_index (old_spans, EWeekViewEventSpan,
-					       span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (old_spans, TRUE);
-	}
-}
-
-
-static void
-e_week_view_layout_event (EWeekView	   *week_view,
-			  EWeekViewEvent   *event,
-			  guint8	   *grid,
-			  GArray	   *spans)
-{
-	gint start_day, end_day, span_start_day, span_end_day, rows_per_cell;
-	gint free_row, row, day, span_num, spans_index, num_spans, max_day;
-	EWeekViewEventSpan span, *old_span;
-
-	start_day = e_week_view_find_day (week_view, event->start, FALSE);
-	end_day = e_week_view_find_day (week_view, event->end, TRUE);
-	max_day = week_view->multi_week_view ? week_view->weeks_shown * 7 - 1
-		: 7 - 1;
-	start_day = CLAMP (start_day, 0, max_day);
-	end_day = CLAMP (end_day, 0, max_day);
-
-#if 0
-	g_print ("In e_week_view_layout_event Start:%i End: %i\n",
-		 start_day, end_day);
-#endif
-
-	/* Iterate through each of the spans of the event, where each span
-	   is a sequence of 1 or more days displayed next to each other. */
-	span_start_day = start_day;
-	rows_per_cell = E_WEEK_VIEW_MAX_ROWS_PER_CELL;
-	span_num = 0;
-	spans_index = spans->len;
-	num_spans = 0;
-	while (span_start_day <= end_day) {
-		span_end_day = e_week_view_find_span_end (week_view,
-							  span_start_day);
-		span_end_day = MIN (span_end_day, end_day);
-#if 0
-		g_print ("  Span start:%i end:%i\n", span_start_day,
-			 span_end_day);
-#endif
-		/* Try each row until we find a free one or we fall off the
-		   bottom of the available rows. */
-		row = 0;
-		free_row = -1;
-		while (free_row == -1 && row < rows_per_cell) {
-			free_row = row;
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				if (grid[day * rows_per_cell + row]) {
-					free_row = -1;
-					break;
-				}
-			}
-			row++;
-		};
-
-		if (free_row != -1) {
-			/* Mark the cells as full. */
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				grid[day * rows_per_cell + free_row] = 1;
-				week_view->rows_per_day[day] = MAX (week_view->rows_per_day[day], free_row + 1);
-			}
-#if 0
-			g_print ("  Span start:%i end:%i row:%i\n",
-				 span_start_day, span_end_day, free_row);
-#endif
-			/* Add the span to the array, and try to reuse any
-			   canvas items from the old spans. */
-			span.start_day = span_start_day;
-			span.num_days = span_end_day - span_start_day + 1;
-			span.row = free_row;
-			span.background_item = NULL;
-			span.text_item = NULL;
-			if (event->num_spans > span_num) {
-				old_span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
-				span.background_item = old_span->background_item;
-				span.text_item = old_span->text_item;
-				old_span->background_item = NULL;
-				old_span->text_item = NULL;
-			}
-
-			g_array_append_val (spans, span);
-			num_spans++;
-		}
-
-		span_start_day = span_end_day + 1;
-		span_num++;
-	}
-
-	/* Set the event's spans. */
-	event->spans_index = spans_index;
-	event->num_spans = num_spans;
-}
-
-
-static void
-e_week_view_ensure_events_sorted (EWeekView *week_view)
-{
-	if (!week_view->events_sorted) {
-		qsort (week_view->events->data,
-		       week_view->events->len,
-		       sizeof (EWeekViewEvent),
-		       e_week_view_event_sort_func);
-		week_view->events_sorted = TRUE;
-	}
-}
-
-
-static gint
-e_week_view_event_sort_func (const void *arg1,
-			     const void *arg2)
-{
-	EWeekViewEvent *event1, *event2;
-
-	event1 = (EWeekViewEvent*) arg1;
-	event2 = (EWeekViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static void
-e_week_view_reshape_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-	gint num_days, day, day_x, day_y, day_w, day_h, max_rows;
-	gboolean is_weekend;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	/* Reshape the jump buttons and show/hide them as appropriate. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-
-		is_weekend = ((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;
-	GdkFont *font;
-	gint span_x, span_y, span_w, num_icons, icons_width, time_width;
-	gint min_text_x, max_text_w, width;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-	gboolean one_day_event;
-	CalComponent *comp;
-	gdouble text_x, text_y, text_w, text_h;
-	gchar *text, *end_of_line;
-	gint line_len, text_width;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-	comp = event->comp;
-	font = GTK_WIDGET (week_view)->style->font;
-
-	one_day_event = e_week_view_is_one_day_event (week_view, event_num);
-
-	/* If the span will not be visible destroy the canvas items and
-	   return. */
-	if (!e_week_view_get_span_position (week_view, event_num, span_num,
-					    &span_x, &span_y, &span_w)) {
-		if (span->background_item)
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-		if (span->text_item)
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-		span->background_item = NULL;
-		span->text_item = NULL;
-		return;
-	}
-
-	/* If 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) {
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-	}
-
-	/* Create the background canvas item if necessary. */
-	if (!span->background_item) {
-		span->background_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_week_view_event_item_get_type (),
-					       NULL);
-	}
-
-	gnome_canvas_item_set (span->background_item,
-			       "event_num", event_num,
-			       "span_num", span_num,
-			       NULL);
-
-	/* Create the text item if necessary. */
-	if (!span->text_item) {
-		CalComponentText text;
-
-		cal_component_get_summary (comp, &text);
-		span->text_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (week_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-#if 0
-					       "max_lines", 1,
-#endif
-					       "editable", TRUE,
-					       "text", text.value ? text.value : "",
-					       "use_ellipsis", TRUE,
-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (span->text_item), "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_text_item_event),
-				    week_view);
-	}
-
-	/* Calculate the position of the text item.
-	   For events < 1 day it starts after the times & icons and ends at the
-	   right edge of the span.
-	   For events >= 1 day we need to determine whether times are shown at
-	   the start and end of the span, then try to center the text item with
-	   the icons in the middle, but making sure we don't go over the times.
-	*/
-
-
-	/* Calculate the space necessary to display a time, e.g. "13:00". */
-	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 = font->ascent + font->descent;
-
-	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. */
-			gtk_object_get (GTK_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);
-				text_width = gdk_text_width (font, text,
-							     line_len);
-				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);
-}
-
-
-/* Finds the day containing the given time.
-   If include_midnight_in_prev_day is TRUE then if the time exactly
-   matches the start of a day the previous day is returned. This is useful
-   when calculating the end day of an event. */
-static gint
-e_week_view_find_day (EWeekView *week_view,
-		      time_t time_to_find,
-		      gboolean include_midnight_in_prev_day)
-{
-	gint num_days, day;
-	time_t *day_starts;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	day_starts = week_view->day_starts;
-
-	if (time_to_find < day_starts[0])
-		return -1;
-	if (time_to_find > day_starts[num_days])
-		return num_days;
-
-	for (day = 1; day <= num_days; day++) {
-		if (time_to_find <= day_starts[day]) {
-			if (time_to_find == day_starts[day]
-			    && !include_midnight_in_prev_day)
-				return day;
-			return day - 1;
-		}
-	}
-
-	g_assert_not_reached ();
-	return num_days;
-}
-
-
-/* This returns the last 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 (EWeekView *week_view,
-			   gint day)
-{
-	gint week, col, sat_col, end_col;
-
-	if (week_view->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 (week_view->compress_weekend) {
-			sat_col = (5 + 7 - week_view->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;
-	}
-}
-
-
-static void
-e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-				   EWeekView *week_view)
-{
-	GDate date;
-	gint week_offset;
-	struct tm tm;
-	time_t lower, start, end;
-	guint32 old_first_day_julian, new_first_day_julian;
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Determine the first date shown. */
-	date = week_view->base_date;
-	week_offset = floor (adjustment->value + 0.5);
-	g_date_add_days (&date, week_offset * 7);
-
-	/* Convert the old & new first days shown to julian values. */
-	old_first_day_julian = g_date_julian (&week_view->first_day_shown);
-	new_first_day_julian = g_date_julian (&date);
-
-	/* If we are already showing the date, just return. */
-	if (old_first_day_julian == new_first_day_julian)
-		return;
-
-	/* Set the new first day shown. */
-	week_view->first_day_shown = date;
-
-	/* Convert it to a time_t. */
-	g_date_to_struct_tm (&date, &tm);
-	lower = mktime (&tm);
-	lower = time_day_begin (lower);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	e_week_view_queue_reload_events (week_view);
-
-	/* Update the selection, if needed. */
-	if (week_view->selection_start_day != -1) {
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-		if (week_view->calendar)
-			gnome_calendar_set_selected_time_range (week_view->calendar, start, end);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-void
-e_week_view_start_editing_event (EWeekView *week_view,
-				 gint	    event_num,
-				 gint	    span_num,
-				 gchar     *initial_text)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-	/* If we are already editing the event, just return. */
-	if (event_num == week_view->editing_event_num
-	    && span_num == week_view->editing_span_num)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!span->text_item)
-		return;
-
-	if (initial_text) {
-		gnome_canvas_item_set (span->text_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* FIXME: This implicitly stops any edit of another item, causing it
-	   to be sent to the server and resulting in a call to obj_updated_cb()
-	   which may reload all the events and so our span and text item may
-	   actually be destroyed. So we often get a SEGV. */
-	e_canvas_item_grab_focus (span->text_item);
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops any current edit. */
-void
-e_week_view_stop_editing_event (EWeekView *week_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (week_view->editing_event_num == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *event,
-				EWeekView *week_view)
-{
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (event->button.button == 3) {
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-			e_week_view_show_popup_menu (week_view,
-						     (GdkEventButton*) event,
-						     event_num);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-
-		week_view->pressed_event_num = event_num;
-		week_view->pressed_span_num = span_num;
-
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-
-			if (event) {
-				week_view->drag_event_x = event->button.x;
-				week_view->drag_event_y = event->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event, 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 (event->focus_change.in) {
-			e_week_view_on_editing_started (week_view, item);
-		} else {
-			e_week_view_on_editing_stopped (week_view, item);
-		}
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_on_editing_started (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-
-	if (!e_week_view_find_event_from_item (week_view, item,
-					       &event_num, &span_num))
-		return;
-
-#if 0
-	g_print ("In e_week_view_on_editing_started event_num:%i span_num:%i\n", event_num, span_num);
-#endif
-
-	week_view->editing_event_num = event_num;
-	week_view->editing_span_num = span_num;
-
-	/* We need to reshape long events so the whole width is used while
-	   editing. */
-	if (!e_week_view_is_one_day_event (week_view, event_num)) {
-		e_week_view_reshape_event_span (week_view, event_num,
-						span_num);
-	}
-}
-
-
-static void
-e_week_view_on_editing_stopped (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gchar *text = NULL;
-	CalComponentText summary;
-	const char *uid;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* Reset the edit fields. */
-	week_view->editing_event_num = -1;
-
-	/* Check that the event is still valid. */
-	cal_component_get_uid (event->comp, &uid);
-	if (!uid)
-		return;
-
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		return;
-	}
-
-	summary.value = text;
-	cal_component_set_summary (event->comp, &summary);
-	g_free (text);
-
-	if (!cal_client_update_object (week_view->client, event->comp))
-		g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-static gboolean
-e_week_view_find_event_from_item (EWeekView	  *week_view,
-				  GnomeCanvasItem *item,
-				  gint		  *event_num_return,
-				  gint		  *span_num_return)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan,
-					       event->spans_index + span_num);
-			if (span->text_item == item) {
-				*event_num_return = event_num;
-				*span_num_return = span_num;
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the index of the event with the given uid.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EWeekViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_week_view_find_event_from_uid (EWeekView	  *week_view,
-				 const gchar	  *uid,
-				 gint		  *event_num_return)
-{
-	EWeekViewEvent *event;
-	gint event_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-gboolean
-e_week_view_is_one_day_event	(EWeekView	*week_view,
-				 gint		 event_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	if (event->num_spans != 1)
-		return FALSE;
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index);
-
-	if (event->start == week_view->day_starts[span->start_day]
-	    && event->end == week_view->day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= week_view->day_starts[span->start_day]
-	    && event->end <= week_view->day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	gint event_num;
-	gchar *initial_text;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dtstart, dtend;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	/* The Escape key aborts a resize operation. */
-#if 0
-	if (week_view->resize_drag_pos != E_WEEK_VIEW_POS_NONE) {
-		if (event->keyval == GDK_Escape) {
-			e_week_view_abort_resize (week_view, event->time);
-		}
-		return FALSE;
-	}
-#endif
-
-	if (week_view->selection_start_day == -1)
-		return FALSE;
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (event->keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((event->keyval < 0x20)
-		   || (event->keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range. */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	dtstart = week_view->day_starts[week_view->selection_start_day];
-	dtend = week_view->day_starts[week_view->selection_end_day + 1];
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE);
-	cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet (dtend, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	/* We add the event locally and start editing it. We don't send the
-	   new event to the server until the edit is finished.
-	   FIXME: If we get an obj-updated or obj-removed signal while editing
-	   the event, and we have to do a re-layout, we may lose this new
-	   event. */
-	e_week_view_add_event (comp, dtstart, dtend, week_view);
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-		e_week_view_start_editing_event (week_view, event_num, 0,
-						 initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-void
-e_week_view_show_popup_menu (EWeekView	     *week_view,
-			     GdkEventButton  *bevent,
-			     gint	      event_num)
-{
-	EWeekViewEvent *event;
-	int have_selection, not_being_edited, num_items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Schedule meeting"), (GtkSignalFunc) e_week_view_on_schedule_meet, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE},
-
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE },
-
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Schedule meeting"), (GtkSignalFunc) e_week_view_on_schedule_meet, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE },
-
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_week_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-
-		{ NULL, NULL, NULL, TRUE },
-
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (week_view)
-		&& week_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		num_items = 1;
-		context_menu = &items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			num_items = 7;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[4].sensitive = not_being_edited;
-			context_menu[6].sensitive = have_selection;
-		} else {
-			num_items = 4;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < num_items; i++)
-		context_menu[i].data = week_view;
-
-	week_view->popup_event_num = event_num;
-	popup_menu (context_menu, num_items, bevent);
-}
-
-
-static void
-e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	week_view = E_WEEK_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	dt = week_view->day_starts[week_view->selection_start_day];
-	*date.value = icaltime_from_timet (dt, TRUE);
-	cal_component_set_dtstart (comp, &date);
-
-	dt = week_view->day_starts[week_view->selection_end_day + 1];
-	*date.value = icaltime_from_timet (dt, TRUE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	if (week_view->calendar)
-		gnome_calendar_edit_object (week_view->calendar, comp);
-	else
-		g_warning ("Calendar not set");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	if (week_view->calendar)
-		gnome_calendar_edit_object (week_view->calendar, event->comp);
-	else
-		g_warning ("Calendar not set");
-}
-
-
-static void
-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE));
-
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	if (delete_component_dialog (event->comp, widget)) {
-		const char *uid;
-
-		cal_component_get_uid (event->comp, &uid);
-
-		/* We don't check the return value; FALSE can mean the object
-		 * was not in the server anyways.
-		 */
-		cal_client_remove_object (week_view->client, uid);
-	}
-}
-
-static void
-e_week_view_on_schedule_meet (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EMeetingEditor *editor;
-	
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	editor = e_meeting_editor_new (event->comp, week_view->client);
-
-	e_meeting_edit (editor);
-	e_meeting_editor_free (editor);
-}
-
-static void
-e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE));
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (event->start, TRUE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, TRUE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	   present the updates happen synchronously so our event may disappear.
-	*/
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (week_view->client, new_comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static gboolean
-e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-				  GdkEvent *event,
-				  EWeekView *week_view)
-{
-	gint day;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-			if (item == week_view->jump_buttons[day]) {
-				if (week_view->calendar)
-					gnome_calendar_dayjump
-						(week_view->calendar,
-						 week_view->day_starts[day]);
-				else
-					g_warning ("Calendar not set");
-				return TRUE;
-			}
-		}
-
-	}
-
-	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 (week_view->use_24_hour_format) {
-		*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)
-		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 (!week_view->use_24_hour_format)
-		time_width += MAX (week_view->am_string_width,
-				   week_view->pm_string_width);
-
-	return time_width;
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index 47362d0ee6..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Helix Code, Inc.
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_H_
-#define _E_WEEK_VIEW_H_
-
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-/* The maximum number of weeks we show. 5 is usually enough for 1 month,
-   but we allow 6 for longer selections. */
-#define E_WEEK_VIEW_MAX_WEEKS		6
-
-/* The size of the reminder & recurrence icons, and padding around them.
-   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		0
-#define E_WEEK_VIEW_ICON_Y_PAD		0
-#define E_WEEK_VIEW_ICON_R_PAD		2
-
-/* 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	2
-
-/* 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
-
-/* 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_DATES,
-	E_WEEK_VIEW_COLOR_DATES_SELECTED,
-	
-	E_WEEK_VIEW_COLOR_LAST
-} EWeekViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_WEEK_VIEW_DRAG_NONE,
-	E_WEEK_VIEW_DRAG_START,
-	E_WEEK_VIEW_DRAG_END
-} EWeekViewDragPosition;
-
-/* These specify which times are shown for the 1-day events. We use the small
-   font for the minutes if it can be loaded and the option is on. */
-typedef enum
-{
-	E_WEEK_VIEW_TIME_NONE,
-	E_WEEK_VIEW_TIME_START,
-	E_WEEK_VIEW_TIME_BOTH,
-	E_WEEK_VIEW_TIME_START_SMALL_MIN,
-	E_WEEK_VIEW_TIME_BOTH_SMALL_MIN
-} EWeekViewTimeFormat;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_WEEK_VIEW_POS_OUTSIDE,
-	E_WEEK_VIEW_POS_NONE,
-	E_WEEK_VIEW_POS_EVENT,
-	E_WEEK_VIEW_POS_LEFT_EDGE,
-	E_WEEK_VIEW_POS_RIGHT_EDGE
-} EWeekViewPosition;
-
-
-typedef struct _EWeekViewEventSpan EWeekViewEventSpan;
-struct _EWeekViewEventSpan {
-	guint start_day : 6;
-	guint num_days : 3;
-	guint row : 7;
-	GnomeCanvasItem *background_item;
-	GnomeCanvasItem *text_item;
-};
-
-typedef struct _EWeekViewEvent EWeekViewEvent;
-struct _EWeekViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint16 start_minute;	/* Minutes from the start of the day. */
-	guint16 end_minute;
-	gint spans_index;
-	guint num_spans;
-};
-
-
-#define E_WEEK_VIEW(obj)          GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)
-#define E_WEEK_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
-#define E_IS_WEEK_VIEW(obj)       GTK_CHECK_TYPE (obj, e_week_view_get_type ())
-
-
-typedef struct _EWeekView       EWeekView;
-typedef struct _EWeekViewClass  EWeekViewClass;
-
-struct _EWeekView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates are shown. */
-	GtkWidget *titles_canvas;
-	GnomeCanvasItem *titles_canvas_item;
-
-	/* The main canvas where the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	GnomeCanvasItem *jump_buttons[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The array of EWeekViewEvent elements. */
-	GArray *events;
-	gboolean events_sorted;
-	gboolean events_need_layout;
-	gboolean events_need_reshape;
-
-	/* The id of our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* An array of EWeekViewEventSpan elements. Each event has its own
-	   space within this array, and uses the spans_index and num_spans
-	   fields of the EWeekViewEvent struct to access it. */
-	GArray *spans;
-
-	/* The start of each day displayed. */
-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];
-
-	/* The base date, where the adjustment value is 0. */
-	GDate base_date;
-
-	/* The first day shown in the view. */
-	GDate first_day_shown;
-
-	/* If we are displaying multiple weeks in rows. If this is FALSE only
-	   one week is shown, with a different layout. */
-	gboolean multi_week_view;
-
-	/* How many weeks we are showing. This is only relevant if
-	   display_month is TRUE. */
-	gint weeks_shown;
-
-	/* If Sat & Sun are compressed. Only applicable in month view, since
-	   they are always compressed into 1 cell in the week view. */
-	gboolean compress_weekend;
-
-	/* 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;
-
-	/* Whether we use 12-hour of 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* 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. */
-	GdkFont *small_font;
-
-	/* The widths of various pieces of text, used to determine which of
-	   several date formats to display, set in e_week_view_style_set(). */
-	gint space_width;		/* One space character ' '. */
-	gint colon_width;		/* Size of ':' in the font. */
-	gint slash_width;		/* Size of '/' in the font. */
-	gint digit_width;		/* Size of a '0' digit. */
-	gint small_digit_width;		/* Size of a small_font '0' digit. */
-	gint day_widths[7];		/* Monday first. */
-	gint max_day_width;
-	gint abbr_day_widths[7];
-	gint max_abbr_day_width;
-	gint month_widths[12];
-	gint max_month_width;
-	gint abbr_month_widths[12];
-	gint max_abbr_month_width;
-
-	/* The size of the main grid of days and of the cells. A row
-	   corresponds to a compressed day, so normal days usually take
-	   up 2 rows. Note that the offsets arrays have one more element
-	   than the widths/heights arrays since they also contain the
-	   right/bottom edge. */
-	gint rows;
-	gint columns;
-	gint col_widths[7];
-	gint col_offsets[8];
-	gint row_heights[E_WEEK_VIEW_MAX_WEEKS * 2];
-	gint row_offsets[E_WEEK_VIEW_MAX_WEEKS * 2 + 1];
-
-	/* This specifies which times we are showing for the events, depending
-	   on how much room is available. */
-	EWeekViewTimeFormat time_format;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_WEEK_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-
-	/* The currently selected region, in days from the first day shown.
-	   If selection_start_day is -1 there is no current selection. */
-	gint selection_start_day;
-	gint selection_end_day;
-
-	/* This specifies which end of the selection is being dragged, or is
-	   E_WEEK_VIEW_DRAG_NONE if the selection isn't being dragged. */
-	EWeekViewDragPosition selection_drag_pos;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_num;
-	gint pressed_span_num;
-
-	/* The event span currently being edited. The num is -1 if no event is
-	   being edited. */
-	gint editing_event_num;
-	gint editing_span_num;
-
-	/* The event that the context menu is for. */
-	gint popup_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* "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
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_week_view_get_type			(void);
-GtkWidget* e_week_view_new			(void);
-
-void       e_week_view_set_calendar		(EWeekView	*week_view,
-						 GnomeCalendar	*calendar);
-
-/* The first day shown. Note that it will be rounded down to the start of a
-   week when set. The returned value will be invalid if no date has been set
-   yet. */
-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-
-void       e_week_view_set_cal_client		(EWeekView	*week_view,
-						 CalClient	*client);
-
-/* The selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-
-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */
-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);
-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,
-						 gboolean	 multi_week_view);
-
-/* The number of weeks shown in the multi-week view. */
-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);
-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,
-						 gint		 weeks_shown);
-
-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
-   view. In the Week view they are always compressed. */
-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);
-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,
-						 gboolean	 compress);
-
-/* 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);
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean   e_week_view_get_24_hour_format	(EWeekView	*week_view);
-void	   e_week_view_set_24_hour_format	(EWeekView	*week_view,
-						 gboolean	 use_24_hour);
-
-
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void       e_week_view_get_day_position		(EWeekView	*week_view,
-						 gint		 day,
-						 gint		*day_x,
-						 gint		*day_y,
-						 gint		*day_w,
-						 gint		*day_h);
-gboolean   e_week_view_get_span_position	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gint		*span_x,
-						 gint		*span_y,
-						 gint		*span_w);
-gboolean   e_week_view_is_one_day_event		(EWeekView	*week_view,
-						 gint		 event_num);
-void	   e_week_view_start_editing_event	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gchar		*initial_text);
-void	   e_week_view_stop_editing_event	(EWeekView	*week_view);
-
-void	   e_week_view_show_popup_menu		(EWeekView	*week_view,
-						 GdkEventButton *event,
-						 gint		 event_num);
-
-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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_H_ */
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
deleted file mode 100644
index 615bd3eed3..0000000000
--- a/calendar/gui/event-editor-dialog.glade
+++ /dev/null
@@ -1,1408 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>event-editor-dialog</name>
-  <program_name>event-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>.</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>event-editor-dialog</name>
-  <visible>False</visible>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomeDock:contents</child_name>
-    <name>notebook1</name>
-    <border_width>2</border_width>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox51</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>6</spacing>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table11</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label56</name>
-	  <label>Su_mmary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>general-summary</default_focus_target>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>general-summary</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame31</name>
-	<label>Date &amp; Time</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table12</name>
-	  <border_width>4</border_width>
-	  <rows>2</rows>
-	  <columns>3</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label57</name>
-	    <label>_Start time:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label58</name>
-	    <label>_End time:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>all-day-event</name>
-	    <can_focus>True</can_focus>
-	    <label>A_ll day event</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>2</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>start-time</name>
-	    <creation_function>make_date_edit</creation_function>
-	    <string1></string1>
-	    <string2></string2>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Tue, 16 May 2000 19:11:05 GMT</last_modification_time>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>True</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>end-time</name>
-	    <creation_function>make_date_edit</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Tue, 16 May 2000 19:11:10 GMT</last_modification_time>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>True</yfill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow12</name>
-	<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>description</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame32</name>
-	<label>Classification</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox52</name>
-	  <border_width>2</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-public</name>
-	    <can_focus>True</can_focus>
-	    <label>Pu_blic</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-private</name>
-	    <can_focus>True</can_focus>
-	    <label>Pri_vate</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>classification-confidential</name>
-	    <can_focus>True</can_focus>
-	    <label>_Confidential</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>classification_radio_group</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox53</name>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>contacts-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label59</name>
-	    <label>_Contacts...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>contacts</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>categories-button</name>
-	  <can_focus>True</can_focus>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label60</name>
-	    <label>Ca_tegories...</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>categories</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label61</name>
-      <label>Appointment</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox52</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame33</name>
-	<label>Appointment Basics</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table13</name>
-	  <border_width>4</border_width>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>2</row_spacing>
-	  <column_spacing>2</column_spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label62</name>
-	    <label>Su_mmary:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>reminder-summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label63</name>
-	    <label>_Starting date:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>reminder-summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>True</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>reminder-starting-data</name>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>reminder-starting-date</name>
-	      <creation_function>make_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Fri, 22 Sep 2000 20:51:38 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame34</name>
-	<label>Reminders</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox53</name>
-	  <border_width>4</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox54</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>reminder-action</name>
-	      <can_focus>True</can_focus>
-	      <items>Show a dialog
-Play a sound
-Send an email
-Run a program
-</items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>reminder-interval-value</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>True</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>reminder-value-units</name>
-	      <can_focus>True</can_focus>
-	      <items>minute(s)
-hour(s)
-day(s)
-</items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>reminder-relative</name>
-	      <can_focus>True</can_focus>
-	      <items>before
-after
-</items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>reminder-time</name>
-	      <can_focus>True</can_focus>
-	      <items>start of appointment
-end of appointment
-</items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button9</name>
-	      <can_focus>True</can_focus>
-	      <label>Settings...</label>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox55</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkScrolledWindow</class>
-	      <name>scrolledwindow13</name>
-	      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCList</class>
-		<name>reminder-list</name>
-		<can_focus>True</can_focus>
-		<columns>1</columns>
-		<column_widths>80</column_widths>
-		<selection_mode>GTK_SELECTION_BROWSE</selection_mode>
-		<show_titles>False</show_titles>
-		<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <child_name>CList:title</child_name>
-		  <name>label64</name>
-		  <label>label55</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVButtonBox</class>
-	      <name>vbuttonbox2</name>
-	      <layout_style>GTK_BUTTONBOX_START</layout_style>
-	      <spacing>10</spacing>
-	      <child_min_width>85</child_min_width>
-	      <child_min_height>27</child_min_height>
-	      <child_ipad_x>7</child_ipad_x>
-	      <child_ipad_y>0</child_ipad_y>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>reminder-add</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>Add</label>
-	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>reminder-delete</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>Delete</label>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label65</name>
-      <label>Reminder</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox54</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame35</name>
-	<label>Appointment Basics</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table14</name>
-	  <border_width>4</border_width>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>2</row_spacing>
-	  <column_spacing>2</column_spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label66</name>
-	    <label>Su_mmary:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>recurrence-summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label67</name>
-	    <label>_Starting date:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>recurrence-summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>True</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment40</name>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>recurrence-starting-date</name>
-	      <creation_function>make_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Fri, 22 Sep 2000 20:51:38 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox55</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame36</name>
-	  <label>Recurrence Rule</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox56</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox56</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-none</name>
-		<can_focus>True</can_focus>
-		<label>No recurrence</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence-radio</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-simple</name>
-		<can_focus>True</can_focus>
-		<label>Simple recurrence</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence-radio</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-custom</name>
-		<can_focus>True</can_focus>
-		<label>Custom recurrence</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence-radio</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox57</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>recurrence-params</name>
-		<homogeneous>False</homogeneous>
-		<spacing>2</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label68</name>
-		  <label>Every</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-interval-value</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>True</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>1</value>
-		  <lower>1</lower>
-		  <upper>10000</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-interval-unit</name>
-		  <can_focus>True</can_focus>
-		  <items>day(s)
-week(s)
-month(s)
-year(s)
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkAlignment</class>
-		  <name>recurrence-special</name>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xscale>0</xscale>
-		  <yscale>0</yscale>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-ending-menu</name>
-		  <can_focus>True</can_focus>
-		  <items>for
-until
-forever
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkAlignment</class>
-		  <name>recurrence-ending-special</name>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xscale>0</xscale>
-		  <yscale>0</yscale>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkAlignment</class>
-		<name>recurrence-custom-warning-bin</name>
-		<xalign>0</xalign>
-		<yalign>0.5</yalign>
-		<xscale>1</xscale>
-		<yscale>1</yscale>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>Placeholder</class>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox59</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame37</name>
-	    <label>Exceptions</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox60</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox57</name>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkButton</class>
-		  <name>recurrence-exception-add</name>
-		  <can_focus>True</can_focus>
-		  <label>Add</label>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkButton</class>
-		  <name>recurrence-exception-modify</name>
-		  <can_focus>True</can_focus>
-		  <label>Modify</label>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkButton</class>
-		  <name>recurrence-exception-delete</name>
-		  <can_focus>True</can_focus>
-		  <label>Delete</label>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox58</name>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>Custom</class>
-		  <name>recurrence-exception-date</name>
-		  <creation_function>make_date_edit</creation_function>
-		  <int1>0</int1>
-		  <int2>0</int2>
-		  <last_modification_time>Tue, 16 May 2000 01:42:29 GMT</last_modification_time>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkScrolledWindow</class>
-		  <name>scrolledwindow14</name>
-		  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-		  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-		  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkCList</class>
-		    <name>recurrence-exception-list</name>
-		    <can_focus>True</can_focus>
-		    <columns>1</columns>
-		    <column_widths>80</column_widths>
-		    <selection_mode>GTK_SELECTION_BROWSE</selection_mode>
-		    <show_titles>False</show_titles>
-		    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <child_name>CList:title</child_name>
-		      <name>label69</name>
-		      <label>label21</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox59</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label70</name>
-	      <label>Preview</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>recurrence-preview-bin</name>
-	      <xalign>0</xalign>
-	      <yalign>0</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label71</name>
-      <label>Recurrence</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
deleted file mode 100644
index 55b3b9865a..0000000000
--- a/calendar/gui/event-editor.c
+++ /dev/null
@@ -1,3358 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-categories.h>
-#include <cal-util/timeutil.h>
-#include "dialogs/delete-comp.h"
-#include "dialogs/save-comp.h"
-#include "calendar-config.h"
-#include "event-editor.h"
-#include "e-meeting-edit.h"
-#include "calendar-config.h"
-#include "tag-calendar.h"
-#include "weekday-picker.h"
-#include "widget-util.h"
-
-
-enum {BEFORE, AFTER};
-enum {MINUTES, HOURS, DAYS};
-
-/* Reminder maps */
-static const int reminder_action_map[] = {
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_EMAIL,
-	CAL_ALARM_PROCEDURE,
-	-1
-};
-
-static const int reminder_value_map[] = {
-	MINUTES,
-	HOURS,
-	DAYS,
-	-1
-};
-
-static const int reminder_relative_map[] = {
-	BEFORE,
-	AFTER,
-	-1
-};
-
-static const int reminder_time_map[] = {
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	-1
-};
-
-/* Recurrence maps */
-static const int recur_freq_map[] = {
-	ICAL_DAILY_RECURRENCE,
-	ICAL_WEEKLY_RECURRENCE,
-	ICAL_MONTHLY_RECURRENCE,
-	ICAL_YEARLY_RECURRENCE,
-	-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
-};
-
-/* Row data for the reminders */
-typedef enum {NEW_ALARM, EXISTING_ALARM} ReminderStatus;
-
-typedef struct {
-	ReminderStatus status;
-	CalComponentAlarm *alarm;
-} ReminderData;
-
-struct _EventEditorPrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* Client to use */
-	CalClient *client;
-
-	/* Calendar object/uid we are editing; this is an internal copy */
-	CalComponent *comp;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *general_summary;
-
-	GtkWidget *start_time;
-	GtkWidget *end_time;
-	GtkWidget *all_day_event;
-
-	GtkWidget *description;
-
-	GtkWidget *classification_public;
-	GtkWidget *classification_private;
-	GtkWidget *classification_confidential;
-
-	GtkWidget *categories;
-	GtkWidget *categories_btn;
-
-	GtkWidget *reminder_summary;
-	GtkWidget *reminder_starting_date;
-
-	GtkWidget *reminder_list;
-	GtkWidget *reminder_add;
-	GtkWidget *reminder_delete;
-
-	GtkWidget *reminder_action;
-	GtkWidget *reminder_interval_value;
-	GtkWidget *reminder_value_units;
-	GtkWidget *reminder_relative;
-	GtkWidget *reminder_time;
-	
-	GtkWidget *recurrence_summary;
-	GtkWidget *recurrence_starting_date;
-
-	GtkWidget *recurrence_none;
-	GtkWidget *recurrence_simple;
-	GtkWidget *recurrence_custom;
-
-	GtkWidget *recurrence_params;
-	GtkWidget *recurrence_interval_value;
-	GtkWidget *recurrence_interval_unit;
-	GtkWidget *recurrence_special;
-	GtkWidget *recurrence_ending_menu;
-	GtkWidget *recurrence_ending_special;
-	GtkWidget *recurrence_custom_warning_bin;
-
-	/* For weekly recurrences, created by hand */
-	GtkWidget *recurrence_weekday_picker;
-	guint8 recurrence_weekday_day_mask;
-	guint8 recurrence_weekday_blocked_day_mask;
-
-	/* For monthly recurrences, created by hand */
-	GtkWidget *recurrence_month_index_spin;
-	int recurrence_month_index;
-
-	GtkWidget *recurrence_month_day_menu;
-	enum month_day_options recurrence_month_day;
-
-	/* For ending date, created by hand */
-	GtkWidget *recurrence_ending_date_edit;
-	time_t recurrence_ending_date;
-
-	/* For ending count of occurrences, created by hand */
-	GtkWidget *recurrence_ending_count_spin;
-	int recurrence_ending_count;
-
-	/* More widgets from the Glade file */
-
-	GtkWidget *recurrence_exception_date;
-	GtkWidget *recurrence_exception_list;
-	GtkWidget *recurrence_exception_add;
-	GtkWidget *recurrence_exception_modify;
-	GtkWidget *recurrence_exception_delete;
-
-	GtkWidget *recurrence_preview_bin;
-
-	/* For the recurrence preview, the actual widget */
-	GtkWidget *recurrence_preview_calendar;
-
-	/* Call event_editor_set_changed() to set this to TRUE when any field
-	   in the dialog is changed. When the user closes the dialog we will
-	   prompt to save changes. */
-	gboolean changed;
-};
-
-
-
-static void event_editor_class_init (EventEditorClass *class);
-static void event_editor_init (EventEditor *ee);
-static void event_editor_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-static void append_reminder (EventEditor *ee, CalComponentAlarm *alarm, ReminderStatus status);
-static void append_exception (EventEditor *ee, time_t t);
-static void check_all_day (EventEditor *ee);
-static void set_all_day (GtkWidget *toggle, EventEditor *ee);
-static void date_changed_cb (EDateEdit *dedit, gpointer data);
-static void preview_recur (EventEditor *ee);
-static void recur_to_comp_object (EventEditor *ee, CalComponent *comp);
-static void reminder_to_comp_object (EventEditor *ee, CalComponent *comp);
-static void reminder_add_cb (GtkWidget *widget, EventEditor *ee);
-static void reminder_delete_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_select_row_cb (GtkCList *clist, gint row, gint col, GdkEvent *event,
-						gpointer data);
-static void field_changed		(GtkWidget	*widget,
-					 EventEditor	*ee);
-static void event_editor_set_changed	(EventEditor	*ee,
-					 gboolean	 changed);
-static gboolean prompt_to_save_changes	(EventEditor	*ee);
-static void categories_clicked (GtkWidget *button, EventEditor *ee);
-
-
-
-/**
- * event_editor_get_type:
- *
- * Registers the #EventEditor class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #EventEditor class.
- **/
-GtkType
-event_editor_get_type (void)
-{
-	static GtkType event_editor_type = 0;
-
-	if (!event_editor_type) {
-		static const GtkTypeInfo event_editor_info = {
-			"EventEditor",
-			sizeof (EventEditor),
-			sizeof (EventEditorClass),
-			(GtkClassInitFunc) event_editor_class_init,
-			(GtkObjectInitFunc) event_editor_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		event_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &event_editor_info);
-	}
-
-	return event_editor_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-event_editor_class_init (EventEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = event_editor_destroy;
-}
-
-/* Object initialization function for the event editor */
-static void
-event_editor_init (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = g_new0 (EventEditorPrivate, 1);
-	ee->priv = priv;
-
-	event_editor_set_changed (ee, FALSE);
-}
-
-/* Frees the rows and the row data in the recurrence exceptions GtkCList */
-static void
-free_exception_clist_data (GtkCList *clist)
-{
-	int i;
-
-	for (i = 0; i < clist->rows; i++) {
-		gpointer data;
-
-		data = gtk_clist_get_row_data (clist, i);
-		g_free (data);
-		gtk_clist_set_row_data (clist, i, NULL);
-	}
-
-	gtk_clist_clear (clist);
-}
-
-/* Destroy handler for the event editor */
-static void
-event_editor_destroy (GtkObject *object)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (object));
-
-	ee = EVENT_EDITOR (object);
-	priv = ee->priv;
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exception_list));
-
-	if (priv->app) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->app), ee);
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	ee->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-/* Sets the event editor's window title from a calendar component */
-static void
-set_title_from_comp (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	char *title, *tmp;
-
-	priv = ee->priv;
-
-	title = make_title_from_comp (comp);
-	tmp = e_utf8_to_gtk_string (priv->app, title);
-	g_free (title);
-
-	if (tmp) {
-		gtk_window_set_title (GTK_WINDOW (priv->app), tmp);
-		g_free (tmp);
-	} else {
-		g_message ("set_title_from_comp(): Could not convert the title from UTF8");
-		gtk_window_set_title (GTK_WINDOW (priv->app), "");
-	}
-}
-
-/* Callback used when the recurrence weekday picker changes */
-static void
-recur_weekday_picker_changed_cb (WeekdayPicker *wp, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Creates the special contents for weekly recurrences */
-static void
-make_recur_weekly_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	WeekdayPicker *wp;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_special)->child == NULL);
-	g_assert (priv->recurrence_weekday_picker == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_special), hbox);
-
-	label = gtk_label_new (_("on"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	wp = WEEKDAY_PICKER (weekday_picker_new ());
-
-	priv->recurrence_weekday_picker = GTK_WIDGET (wp);
-	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 0);
-
-	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->recurrence_weekday_day_mask);
-	weekday_picker_set_blocked_days (wp, priv->recurrence_weekday_blocked_day_mask);
-
-	gtk_signal_connect (GTK_OBJECT (wp), "changed",
-			    GTK_SIGNAL_FUNC (recur_weekday_picker_changed_cb), ee);
-}
-
-/* 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_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-	}
-
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-	return omenu;
-}
-
-/* For monthly recurrences, changes the valid range of the recurrence day index
- * spin button; e.g. month days are 1-31 while the valid range for a Sunday is
- * the 1st through 5th of the month.
- */
-static void
-adjust_day_index_spin (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkAdjustment *adj;
-	enum month_day_options month_day;
-
-	priv = ee->priv;
-
-	g_assert (priv->recurrence_month_day_menu != NULL);
-	g_assert (GTK_IS_OPTION_MENU (priv->recurrence_month_day_menu));
-	g_assert (priv->recurrence_month_index_spin != NULL);
-	g_assert (GTK_IS_SPIN_BUTTON (priv->recurrence_month_index_spin));
-
-	month_day = e_dialog_option_menu_get (priv->recurrence_month_day_menu, month_day_options_map);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->recurrence_month_index_spin));
-
-	switch (month_day) {
-	case MONTH_DAY_NTH:
-		adj->upper = 31;
-		gtk_adjustment_changed (adj);
-		break;
-
-	case MONTH_DAY_MON:
-	case MONTH_DAY_TUE:
-	case MONTH_DAY_WED:
-	case MONTH_DAY_THU:
-	case MONTH_DAY_FRI:
-	case MONTH_DAY_SAT:
-	case MONTH_DAY_SUN:
-		adj->upper = 5;
-		gtk_adjustment_changed (adj);
-
-		if (adj->value > 5) {
-			adj->value = 5;
-			gtk_adjustment_value_changed (adj);
-		}
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* 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)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	adjust_day_index_spin (ee);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Callback used when the month index value changes. */
-static void
-recur_month_index_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Creates the special contents for monthly recurrences */
-static void
-make_recur_monthly_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_special)->child == NULL);
-	g_assert (priv->recurrence_month_index_spin == NULL);
-	g_assert (priv->recurrence_month_day_menu == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_special), hbox);
-
-	label = gtk_label_new (_("on the"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));
-	priv->recurrence_month_index_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_month_index_spin, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("th"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	priv->recurrence_month_day_menu = make_recur_month_menu ();
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_month_day_menu, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the options */
-
-	e_dialog_spin_set (priv->recurrence_month_index_spin, priv->recurrence_month_index);
-	e_dialog_option_menu_set (priv->recurrence_month_day_menu,
-				  priv->recurrence_month_day,
-				  month_day_options_map);
-	adjust_day_index_spin (ee);
-
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    GTK_SIGNAL_FUNC (recur_month_index_value_changed_cb), ee);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_month_day_menu));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (month_day_menu_selection_done_cb), ee);
-}
-
-/* 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 (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	icalrecurrencetype_frequency frequency;
-
-	priv = ee->priv;
-
-	if (GTK_BIN (priv->recurrence_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->recurrence_special)->child);
-
-		priv->recurrence_weekday_picker = NULL;
-		priv->recurrence_month_index_spin = NULL;
-		priv->recurrence_month_day_menu = NULL;
-	}
-
-	frequency = e_dialog_option_menu_get (priv->recurrence_interval_unit, recur_freq_map);
-
-	switch (frequency) {
-	case ICAL_DAILY_RECURRENCE:
-		gtk_widget_hide (priv->recurrence_special);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:
-		make_recur_weekly_special (ee);
-		gtk_widget_show (priv->recurrence_special);
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-		make_recur_monthly_special (ee);
-		gtk_widget_show (priv->recurrence_special);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		gtk_widget_hide (priv->recurrence_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when the ending-until date editor changes */
-static void
-recur_ending_until_changed_cb (EDateEdit *de, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Creates the special contents for "ending until" (end date) recurrences */
-static void
-make_recur_ending_until_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	EDateEdit *de;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_ending_special)->child == NULL);
-	g_assert (priv->recurrence_ending_date_edit == NULL);
-
-	/* Create the widget */
-
-	priv->recurrence_ending_date_edit = date_edit_new (TRUE, FALSE);
-	de = E_DATE_EDIT (priv->recurrence_ending_date_edit);
-
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_ending_special), GTK_WIDGET (de));
-	gtk_widget_show_all (GTK_WIDGET (de));
-
-	/* Set the value */
-
-	e_date_edit_set_time (de, priv->recurrence_ending_date);
-
-	gtk_signal_connect (GTK_OBJECT (de), "changed",
-			    GTK_SIGNAL_FUNC (recur_ending_until_changed_cb), ee);
-}
-
-/* Callback used when the ending-count value changes */
-static void
-recur_ending_count_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Creates the special contents for the occurrence count case */
-static void
-make_recur_ending_count_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_ending_special)->child == NULL);
-	g_assert (priv->recurrence_ending_count_spin == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_ending_special), hbox);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
-	priv->recurrence_ending_count_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_ending_count_spin, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("occurrences"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the values */
-
-	e_dialog_spin_set (priv->recurrence_ending_count_spin,
-			   priv->recurrence_ending_count);
-
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    GTK_SIGNAL_FUNC (recur_ending_count_value_changed_cb), ee);
-}
-
-enum ending_type {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER
-};
-
-static const int ending_types_map[] = {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER,
-	-1
-};
-
-/* 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_recurrence_ending_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	enum ending_type ending_type;
-
-	priv = ee->priv;
-
-	if (GTK_BIN (priv->recurrence_ending_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->recurrence_ending_special)->child);
-
-		priv->recurrence_ending_date_edit = NULL;
-		priv->recurrence_ending_count_spin = NULL;
-	}
-
-	ending_type = e_dialog_option_menu_get (priv->recurrence_ending_menu, ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		make_recur_ending_count_special (ee);
-		gtk_widget_show (priv->recurrence_ending_special);
-		break;
-
-	case ENDING_UNTIL:
-		make_recur_ending_until_special (ee);
-		gtk_widget_show (priv->recurrence_ending_special);
-		break;
-
-	case ENDING_FOREVER:
-		gtk_widget_hide (priv->recurrence_ending_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-enum recur_type {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM
-};
-
-static const int recur_type_map[] = {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM,
-	-1
-};
-
-/* Sensitizes the recurrence widgets based on the state of the recurrence type
- * radio group.
- */
-static void
-sensitize_recur_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	enum recur_type type;
-	GtkWidget *label;
-
-	priv = ee->priv;
-
-	type = e_dialog_radio_get (priv->recurrence_none, recur_type_map);
-
-	if (GTK_BIN (priv->recurrence_custom_warning_bin)->child)
-		gtk_widget_destroy (GTK_BIN (priv->recurrence_custom_warning_bin)->child);
-
-	switch (type) {
-	case RECUR_NONE:
-		gtk_widget_set_sensitive (priv->recurrence_params, FALSE);
-		gtk_widget_show (priv->recurrence_params);
-		gtk_widget_hide (priv->recurrence_custom_warning_bin);
-		break;
-
-	case RECUR_SIMPLE:
-		gtk_widget_set_sensitive (priv->recurrence_params, TRUE);
-		gtk_widget_show (priv->recurrence_params);
-		gtk_widget_hide (priv->recurrence_custom_warning_bin);
-		break;
-
-	case RECUR_CUSTOM:
-		gtk_widget_set_sensitive (priv->recurrence_params, FALSE);
-		gtk_widget_hide (priv->recurrence_params);
-
-		label = gtk_label_new (_("This appointment contains recurrences that Evolution "
-					 "cannot edit."));
-		gtk_container_add (GTK_CONTAINER (priv->recurrence_custom_warning_bin), label);
-		gtk_widget_show_all (priv->recurrence_custom_warning_bin);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when one of the recurrence type radio buttons is toggled.  We
- * enable or the recurrence parameters.
- */
-static void
-recurrence_type_toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-
-	event_editor_set_changed (ee, TRUE);
-
-	if (toggle->active) {
-		sensitize_recur_widgets (ee);
-		preview_recur (ee);
-	}
-}
-
-/* Callback used when the recurrence interval value spin button changes. */
-static void
-recur_interval_value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	preview_recur (ee);
-}
-
-/* Callback used when the recurrence interval option menu changes.  We need to
- * change the contents of the recurrence special widget.
- */
-static void
-recur_interval_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	make_recurrence_special (ee);
-	preview_recur (ee);
-}
-
-/* Callback used when the recurrence ending option menu changes.  We need to
- * change the contents of the ending special widget.
- */
-static void
-recur_ending_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	event_editor_set_changed (ee, TRUE);
-	make_recurrence_ending_special (ee);
-	preview_recur (ee);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("event-editor-dialog");
-
-	priv->general_summary = GW ("general-summary");
-
-	priv->start_time = GW ("start-time");
-	priv->end_time = GW ("end-time");
-	priv->all_day_event = GW ("all-day-event");
-
-	priv->description = GW ("description");
-
-	priv->classification_public = GW ("classification-public");
-	priv->classification_private = GW ("classification-private");
-	priv->classification_confidential = GW ("classification-confidential");
-
-	priv->categories = GW ("categories");
-	priv->categories_btn = GW ("categories-button");
-
-	priv->reminder_summary = GW ("reminder-summary");
-	priv->reminder_starting_date = GW ("reminder-starting-date");
-
-	priv->reminder_list = GW ("reminder-list");
-	priv->reminder_add = GW ("reminder-add");
-	priv->reminder_delete = GW ("reminder-delete");
-
-	priv->reminder_action = GW ("reminder-action");
-	priv->reminder_interval_value = GW ("reminder-interval-value");
-	priv->reminder_value_units = GW ("reminder-value-units");
-	priv->reminder_relative = GW ("reminder-relative");
-	priv->reminder_time = GW ("reminder-time");
-
-	priv->recurrence_summary = GW ("recurrence-summary");
-	priv->recurrence_starting_date = GW ("recurrence-starting-date");
-
-	priv->recurrence_none = GW ("recurrence-none");
-	priv->recurrence_simple = GW ("recurrence-simple");
-	priv->recurrence_custom = GW ("recurrence-custom");
-	priv->recurrence_params = GW ("recurrence-params");
-
-	priv->recurrence_interval_value = GW ("recurrence-interval-value");
-	priv->recurrence_interval_unit = GW ("recurrence-interval-unit");
-	priv->recurrence_special = GW ("recurrence-special");
-	priv->recurrence_ending_menu = GW ("recurrence-ending-menu");
-	priv->recurrence_ending_special = GW ("recurrence-ending-special");
-	priv->recurrence_custom_warning_bin = GW ("recurrence-custom-warning-bin");
-
-	priv->recurrence_exception_date = GW ("recurrence-exception-date");
-	priv->recurrence_exception_list = GW ("recurrence-exception-list");
-	priv->recurrence_exception_add = GW ("recurrence-exception-add");
-	priv->recurrence_exception_modify = GW ("recurrence-exception-modify");
-	priv->recurrence_exception_delete = GW ("recurrence-exception-delete");
-
-	priv->recurrence_preview_bin = GW ("recurrence-preview-bin");
-
-#undef GW
-
-	return (priv->app
-		&& priv->general_summary
-		&& priv->start_time
-		&& priv->end_time
-		&& priv->all_day_event
-		&& priv->description
-		&& priv->classification_public
-		&& priv->classification_private
-		&& priv->classification_confidential
-		&& priv->reminder_summary
-		&& priv->reminder_starting_date
-		&& priv->reminder_list
-		&& priv->reminder_add
-		&& priv->reminder_delete
-		&& priv->reminder_action
-		&& priv->reminder_interval_value
-		&& priv->reminder_value_units
-		&& priv->reminder_relative
-		&& priv->reminder_time
-		&& priv->recurrence_summary
-		&& priv->recurrence_starting_date
-		&& priv->recurrence_none
-		&& priv->recurrence_simple
-		&& priv->recurrence_custom
-		&& priv->recurrence_params
-		&& priv->recurrence_interval_value
-		&& priv->recurrence_interval_unit
-		&& priv->recurrence_special
-		&& priv->recurrence_ending_menu
-		&& priv->recurrence_ending_special
-		&& priv->recurrence_custom_warning_bin
-		&& priv->recurrence_exception_date
-		&& priv->recurrence_exception_list
-		&& priv->recurrence_exception_add
-		&& priv->recurrence_exception_modify
-		&& priv->recurrence_exception_delete
-		&& priv->recurrence_preview_bin);
-}
-
-/* Syncs the contents of two entry widgets, while blocking signals from each
- * other.
- */
-static void
-sync_entries (EventEditor *ee, GtkEditable *source, GtkEditable *dest)
-{
-	char *str;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), ee);
-
-	str = gtk_editable_get_chars (source, 0, -1);
-	gtk_entry_set_text (GTK_ENTRY (dest), str);
-	g_free (str);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), ee);
-}
-
-/* Syncs the contents of two date editor widgets, while blocking signals on the
- * specified data.
- */
-static void
-sync_date_edits (EventEditor *ee, EDateEdit *source, EDateEdit *dest)
-{
-	time_t t;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), ee);
-
-	t = e_date_edit_get_time (source);
-	e_date_edit_set_time (dest, t);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), ee);
-}
-
-/* Callback used when one of the general or recurrence summary entries change;
- * we sync the other entry to it.
- */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	
-	ee = EVENT_EDITOR (data);
-	priv = ee->priv;
-	
-	if (editable != GTK_EDITABLE (priv->general_summary))
-		sync_entries (ee, editable, GTK_EDITABLE (priv->general_summary));
-	if (editable != GTK_EDITABLE (priv->reminder_summary)) 
-		sync_entries (ee, editable, GTK_EDITABLE (priv->reminder_summary));
-	if (editable != GTK_EDITABLE (priv->recurrence_summary))
-		sync_entries (ee, editable, GTK_EDITABLE (priv->recurrence_summary));
-}
-
-/* Callback used when one of the general or recurrence starting date widgets
- * change; we sync the other date editor to it.
- */
-static void
-start_date_changed_cb (EDateEdit *de, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	
-	ee = EVENT_EDITOR (data);
-	priv = ee->priv;
-	
-	if (de != E_DATE_EDIT (priv->start_time))
-		sync_date_edits (ee,de, E_DATE_EDIT (priv->start_time));
-	if (de != E_DATE_EDIT (priv->reminder_starting_date)) 
-		sync_date_edits (ee, de, E_DATE_EDIT (priv->reminder_starting_date));
-	if (de != E_DATE_EDIT (priv->recurrence_starting_date))
-		sync_date_edits (ee, de, E_DATE_EDIT (priv->recurrence_starting_date));
-}
-
-/* Callback used when the displayed date range in the recurrence preview
- * calendar changes.
- */
-static void
-recur_preview_date_range_changed_cb (ECalendarItem *item, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	preview_recur (ee);
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *menu;
-	GtkAdjustment *adj;
-	ECalendar *ecal;
-
-	priv = ee->priv;
-
-	/* Summary in the main, reminder and recurrence pages */
-	gtk_signal_connect (GTK_OBJECT (priv->general_summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->reminder_summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), ee);
-
-	/* Categories button */
-	gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked",
-			    GTK_SIGNAL_FUNC (categories_clicked), ee);
-
-	/* Start dates in the main and recurrence pages */
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (start_date_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->reminder_starting_date), "changed",
-			    GTK_SIGNAL_FUNC (start_date_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_starting_date), "changed",
-			    GTK_SIGNAL_FUNC (start_date_changed_cb), ee);
-
-	/* Start and end times */
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), ee);
-
-	gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled",
-			    GTK_SIGNAL_FUNC (set_all_day), ee);
-
-	/* Reminder buttons */
-
-	gtk_signal_connect (GTK_OBJECT (priv->reminder_add), "clicked",
-			    GTK_SIGNAL_FUNC (reminder_add_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->reminder_delete), "clicked",
-			    GTK_SIGNAL_FUNC (reminder_delete_cb), ee);
-
-	/* Recurrence preview */
-
-	priv->recurrence_preview_calendar = e_calendar_new ();
-	ecal = E_CALENDAR (priv->recurrence_preview_calendar);
-	gtk_signal_connect (GTK_OBJECT (ecal->calitem), "date_range_changed",
-			    GTK_SIGNAL_FUNC (recur_preview_date_range_changed_cb), ee);
-	calendar_config_configure_e_calendar (ecal);
-	e_calendar_item_set_max_days_sel (ecal->calitem, 0);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_preview_bin),
-			   priv->recurrence_preview_calendar);
-	gtk_widget_show (priv->recurrence_preview_calendar);
-
-	/* Recurrence types */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_none), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_simple), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_custom), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-
-	/* Recurrence interval */
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->recurrence_interval_value));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    GTK_SIGNAL_FUNC (recur_interval_value_changed_cb), ee);
-
-	/* Recurrence units */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (recur_interval_selection_done_cb), ee);
-
-	/* Recurrence ending */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_ending_menu));
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (recur_ending_selection_done_cb), ee);
-
-	/* Exception buttons */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_add), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_add_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_modify), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_modify_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_delete), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_delete_cb), ee);
-
-	/* Selections in the exceptions list */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_list), "select_row",
-			    GTK_SIGNAL_FUNC (recurrence_exception_select_row_cb), ee);
-
-	/*
-	 * Connect the default signal handler to use to make sure the "changed"
-	 * field gets set whenever a field is changed.
-	 */
-
-	/* Appointment Page */
-	gtk_signal_connect (GTK_OBJECT (priv->general_summary), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->description), "changed",
-			    GTK_SIGNAL_FUNC (field_changed), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_public),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_private),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->classification_confidential),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (field_changed), ee);
-}
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-static const int month_pos_map[] = { 0, 1, 2, 3, 4, -1 };
-static const int weekday_map[] = { 0, 1, 2, 3, 4, 5, 6, -1 };
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t now;
-	GtkAdjustment *adj;
-	GtkWidget *menu;
-
-	priv = ee->priv;
-
-	now = time (NULL);
-
-	/* Summary, description */
-
-	e_dialog_editable_set (priv->general_summary, NULL); /* will also change recur summary */
-	e_dialog_editable_set (priv->description, NULL);
-
-	/* Start and end times */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), now); /* will set recur start too */
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), now);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Classification */
-
-	e_dialog_radio_set (priv->classification_public,
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Recurrences */
-
-	priv->recurrence_weekday_day_mask = 0;
-
-	priv->recurrence_month_index = 1;
-	priv->recurrence_month_day = MONTH_DAY_NTH;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-	e_dialog_radio_set (priv->recurrence_none, RECUR_NONE, recur_type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->recurrence_interval_value));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), ee);
-	e_dialog_spin_set (priv->recurrence_interval_value, 1);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), ee);
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-	e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_DAILY_RECURRENCE,
-				  recur_freq_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-
-	priv->recurrence_ending_date = time (NULL);
-	priv->recurrence_ending_count = 1;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_ending_menu));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-	e_dialog_option_menu_set (priv->recurrence_ending_menu, ENDING_FOREVER,
-				  ending_types_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-
-	/* Exceptions list */
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exception_list));
-}
-
-/* Fills the recurrence ending date widgets with the values from the calendar
- * component.
- */
-static void
-fill_ending_date (EventEditor *ee, struct icalrecurrencetype *r)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *menu;
-
-	priv = ee->priv;
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_ending_menu));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-
-	if (r->count == 0) {
-		if (r->until.year == 0) {
-			/* Forever */
-
-			e_dialog_option_menu_set (priv->recurrence_ending_menu,
-						  ENDING_FOREVER,
-						  ending_types_map);
-		} else {
-			/* Ending date */
-
-			priv->recurrence_ending_date = icaltime_as_timet (r->until);
-			e_dialog_option_menu_set (priv->recurrence_ending_menu,
-						  ENDING_UNTIL,
-						  ending_types_map);
-		}
-	} else {
-		/* Count of occurrences */
-
-		priv->recurrence_ending_count = r->count;
-		e_dialog_option_menu_set (priv->recurrence_ending_menu,
-					  ENDING_FOR,
-					  ending_types_map);
-	}
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-
-	make_recurrence_ending_special (ee);
-}
-
-/* Counts the number of 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;
-}
-
-/* Re-tags the recurrence preview calendar based on the current information of
- * the event editor.
- */
-static void
-preview_recur (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponent *comp;
-	CalComponentDateTime cdt;
-	GSList *l;
-
-	priv = ee->priv;
-	g_assert (priv->comp != NULL);
-
-	/* Create a scratch component with the start/end and
-	 * recurrence/excepttion information from the one we are editing.
-	 */
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	cal_component_get_dtstart (priv->comp, &cdt);
-	cal_component_set_dtstart (comp, &cdt);
-	cal_component_free_datetime (&cdt);
-
-	cal_component_get_dtend (priv->comp, &cdt);
-	cal_component_set_dtend (comp, &cdt);
-	cal_component_free_datetime (&cdt);
-
-	cal_component_get_exdate_list (priv->comp, &l);
-	cal_component_set_exdate_list (comp, l);
-	cal_component_free_exdate_list (l);
-
-	cal_component_get_exrule_list (priv->comp, &l);
-	cal_component_set_exrule_list (comp, l);
-	cal_component_free_recur_list (l);
-
-	cal_component_get_rdate_list (priv->comp, &l);
-	cal_component_set_rdate_list (comp, l);
-	cal_component_free_period_list (l);
-
-	cal_component_get_rrule_list (priv->comp, &l);
-	cal_component_set_rrule_list (comp, l);
-	cal_component_free_recur_list (l);
-
-	recur_to_comp_object (ee, comp);
-
-	tag_calendar_by_comp (E_CALENDAR (priv->recurrence_preview_calendar), comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Fills in the exception widgets with the data from the calendar component */
-static void
-fill_exception_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GSList *list, *l;
-	gboolean added;
-
-	priv = ee->priv;
-	g_assert (priv->comp != NULL);
-
-	/* Exceptions list */
-
-	cal_component_get_exdate_list (priv->comp, &list);
-
-	added = FALSE;
-
-	for (l = list; l; l = l->next) {
-		CalComponentDateTime *cdt;
-		time_t ext;
-
-		added = TRUE;
-
-		cdt = l->data;
-		ext = icaltime_as_timet (*cdt->value);
-		append_exception (ee, ext);
-	}
-
-	cal_component_free_exdate_list (list);
-
-	if (added)
-		gtk_clist_select_row (GTK_CLIST (priv->recurrence_exception_list), 0, 0);
-}
-
-/* Computes a weekday mask for the start day of a calendar component, for use in
- * a WeekdayPicker widget.
- */
-static guint8
-get_start_weekday_mask (CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	guint8 retval;
-
-	cal_component_get_dtstart (comp, &dt);
-
-	if (dt.value) {
-		time_t t;
-		struct tm tm;
-
-		t = icaltime_as_timet (*dt.value);
-		tm = *localtime (&t);
-
-		retval = 0x1 << tm.tm_wday;
-	} else
-		retval = 0;
-
-	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_recur_special_defaults (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	guint8 mask;
-
-	priv = ee->priv;
-
-	mask = get_start_weekday_mask (priv->comp);
-
-	priv->recurrence_weekday_day_mask = mask;
-	priv->recurrence_weekday_blocked_day_mask = mask;
-}
-
-static char *
-get_alarm_duration_string (struct icaldurationtype *duration)
-{
-	GString *string = g_string_new (NULL);
-	char *ret;
-	
-	if (duration->days > 1)
-		g_string_sprintf (string, _(" %d days"), duration->days);
-	else if (duration->days == 1)
-		g_string_append (string, _(" 1 day"));
-	
-	if (duration->weeks > 1)
-		g_string_sprintf (string, _(" %d weeks"), duration->weeks);
-	else if (duration->weeks == 1)
-		g_string_append (string, _(" 1 week"));
-
-	if (duration->hours > 1)
-		g_string_sprintf (string, _(" %d hours"), duration->hours);
-	else if (duration->hours == 1)
-		g_string_append (string, _(" 1 hour"));
-
-	if (duration->minutes > 1)
-		g_string_sprintf (string, _(" %d minutes"), duration->minutes);
-	else if (duration->minutes == 1)
-		g_string_append (string, _(" 1 minute"));
-
-	if (duration->seconds > 1)
-		g_string_sprintf (string, _(" %d seconds"), duration->seconds);
-	else if (duration->seconds == 1)
-		g_string_append (string, _(" 1 second"));
-
-	ret = string->str;
-	g_string_free (string, FALSE);
-	
-	return ret;
-}
-
-static char *
-get_alarm_string (CalComponentAlarm *alarm) 
-{
-	CalAlarmAction action;
-	CalAlarmTrigger trigger;
-	char string[256];
-	char *dur;
-	
-	string [0] = '\0';
-
-	cal_component_alarm_get_action (alarm, &action);
-	cal_component_alarm_get_trigger (alarm, &trigger);
-
-	switch (action) {	
-	case CAL_ALARM_AUDIO:
-		strcat (string, _("Play a sound"));
-		break;
-	case CAL_ALARM_DISPLAY:
-		strcat (string, _("Show a dialog"));
-		break;
-	case CAL_ALARM_EMAIL:
-		strcat (string, _("Send an email"));
-		break;
-	case CAL_ALARM_PROCEDURE:
-		strcat (string, _("Run a program"));
-		break;
-	case CAL_ALARM_NONE:
-	case CAL_ALARM_UNKNOWN:
-		strcat (string, _("Unknown"));
-		break;
-	}
-
-	switch (trigger.type) {	
-	case CAL_ALARM_TRIGGER_RELATIVE_START:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-		strcat (string, dur);
-		g_free (dur);
-		
-		if (trigger.u.rel_duration.is_neg)
-			strcat (string, _(" before start of appointment"));
-		else
-			strcat (string, _(" after start of appointment"));
-		break;
-	case CAL_ALARM_TRIGGER_RELATIVE_END:
-		dur = get_alarm_duration_string (&trigger.u.rel_duration);
-		strcat (string, dur);
-		g_free (dur);
-		
-		if (trigger.u.rel_duration.is_neg)
-			strcat (string, _(" before end of appointment"));
-		else
-			strcat (string, _(" after end of appointment"));
-		break;
-	case CAL_ALARM_TRIGGER_NONE:
-	case CAL_ALARM_TRIGGER_ABSOLUTE:
-		strcat (string, _("Unknown"));
-		break;
-	}
-	
-	return g_strdup (string);
-}
-
-static void
-fill_reminder_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GList *alarms, *l;
-	GtkCList *clist;
-	
-	int row = 0;
-	
-	priv = ee->priv;
-	g_assert (priv->comp != NULL);
-
-	if (!cal_component_has_alarms (priv->comp))
-		return;
-	
-	alarms = cal_component_get_alarm_uids (priv->comp);
-
-	clist = GTK_CLIST (priv->reminder_list);
-	for (l = alarms; l != NULL; l = l->next, row++) {
-		CalComponentAlarm *ca = cal_component_get_alarm (priv->comp, l->data);
-
-		/* Add it to the clist */
-		append_reminder (ee, ca, EXISTING_ALARM);
-	}
-	cal_component_free_alarm_uids (alarms);
-}
-
-/* Fills in the recurrence widgets with the values from the calendar component.
- * 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 void
-fill_recurrence_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	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;
-
-	priv = ee->priv;
-	g_assert (priv->comp != NULL);
-
-	fill_exception_widgets (ee);
-
-	/* Set up defaults for the special widgets */
-
-	set_recur_special_defaults (ee);
-
-	/* No recurrences? */
-
-	if (!cal_component_has_rdates (priv->comp)
-	    && !cal_component_has_rrules (priv->comp)
-	    && !cal_component_has_exrules (priv->comp)) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-		e_dialog_radio_set (priv->recurrence_none, RECUR_NONE, recur_type_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-
-		gtk_widget_set_sensitive (priv->recurrence_custom, FALSE);
-
-		sensitize_recur_widgets (ee);
-		preview_recur (ee);
-		return;
-	}
-
-	/* See if it is a custom set we don't support */
-
-	cal_component_get_rrule_list (priv->comp, &rrule_list);
-	len = g_slist_length (rrule_list);
-	if (len > 1
-	    || cal_component_has_rdates (priv->comp)
-	    || cal_component_has_exrules (priv->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->recurrence_interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_DAILY_RECURRENCE,
-					  recur_freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-		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->recurrence_weekday_day_mask = day_mask;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_WEEKLY_RECURRENCE,
-					  recur_freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE:
-		if (n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		if (n_by_month_day == 1) {
-			int nth;
-
-			nth = r->by_month_day[0];
-			if (nth < 1)
-				goto custom;
-
-			priv->recurrence_month_index = nth;
-			priv->recurrence_month_day = MONTH_DAY_NTH;
-		} else if (n_by_day == 1) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-			enum month_day_options month_day;
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-
-			if (pos < 1)
-				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;
-			}
-
-			priv->recurrence_month_index = pos;
-			priv->recurrence_month_day = month_day;
-		} else
-			goto custom;
-
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_MONTHLY_RECURRENCE,
-					  recur_freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-		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->recurrence_interval_unit));
-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), ee);
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_YEARLY_RECURRENCE,
-					  recur_freq_map);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), ee);
-		break;
-
-	default:
-		goto custom;
-	}
-
-	/* If we got here it means it is a simple recurrence */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-	e_dialog_radio_set (priv->recurrence_simple, RECUR_SIMPLE, recur_type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-
-	gtk_widget_set_sensitive (priv->recurrence_custom, FALSE);
-
-	sensitize_recur_widgets (ee);
-	make_recurrence_special (ee);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->recurrence_interval_value));
-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), ee);
-	e_dialog_spin_set (priv->recurrence_interval_value, r->interval);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), ee);
-
-	fill_ending_date (ee, r);
-
-	goto out;
-
- custom:
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-	e_dialog_radio_set (priv->recurrence_custom, RECUR_CUSTOM, recur_type_map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_none), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_simple), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->recurrence_custom), ee);
-
-	gtk_widget_set_sensitive (priv->recurrence_custom, TRUE);
-	sensitize_recur_widgets (ee);
-
- out:
-
-	cal_component_free_recur_list (rrule_list);
-	preview_recur (ee);
-}
-
-/* Fills in the widgets with the value from the calendar component */
-static void
-fill_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentClassification cl;
-	CalComponentDateTime d;
-	GSList *l;
-	time_t dtstart, dtend;
-	const char *categories;
-
-	priv = ee->priv;
-
-	clear_widgets (ee);
-
-	if (!priv->comp)
-		return;
-
-	/* Summary, description(s) */
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->general_summary, text.value); /* will also set recur summary */
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	}
-	cal_component_free_text_list (l);
-
-	/* Start and end times */
-
-	/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb
-	   then the event includes all of the 2nd Feb. We would normally show
-	   3rd Feb as the end date, since it really ends at midnight on 3rd,
-	   so we have to subtract a day so we only show the 2nd. */
-	cal_component_get_dtstart (priv->comp, &d);
-	dtstart = icaltime_as_timet (*d.value);
-	cal_component_free_datetime (&d);
-
-	cal_component_get_dtend (priv->comp, &d);
-	dtend = icaltime_as_timet (*d.value);
-	cal_component_free_datetime (&d);
-
-	if (time_day_begin (dtstart) == dtstart
-	    && time_day_begin (dtend) == dtend) {
-		dtend = time_add_day (dtend, -1);
-	}
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), dtstart);
-	e_date_edit_set_time (E_DATE_EDIT (priv->reminder_starting_date), dtstart);
-	e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_starting_date), dtstart);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), dtend);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Classification */
-
-	cal_component_get_classification (priv->comp, &cl);
-
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-	default:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-
-	/* Categories */
-	cal_component_get_categories (priv->comp, &categories);
-	e_dialog_editable_set (priv->categories, categories);
-
-	/* Reminders */
-	fill_reminder_widgets (ee);
-	
-	/* Recurrences */
-	fill_recurrence_widgets (ee);
-	
-	/* Do this last, since the callbacks will set it to TRUE. */
-	event_editor_set_changed (ee, FALSE);
-}
-
-
-/**
- * event_editor_update_widgets:
- * @ee: An event editor.
- *
- * Causes an event editor dialog to re-read the values of its calendar component
- * object.  This function should be used if the #CalComponent is changed by
- * external means while it is open in the editor.
- **/
-void
-event_editor_update_widgets (EventEditor *ee)
-{
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	fill_widgets (ee);
-}
-
-
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day.
- */
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (int) weekday;
-}
-
-static void
-reminder_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	GtkCList *reminder_list;
-	ReminderData *rdata;
-	int i;
-	
-	priv = ee->priv;
-	
-	reminder_list = GTK_CLIST (priv->reminder_list);
-	for (i = 0; i < reminder_list->rows; i++) {
-		rdata = gtk_clist_get_row_data (reminder_list, i);
-		if (rdata->status == NEW_ALARM)
-			cal_component_add_alarm (priv->comp, rdata->alarm);
-		g_free (rdata);
-	}
-}
-
-/* Gets the simple recurrence data from the recurrence widgets and stores it in
- * the calendar component object.
- */
-static void
-simple_recur_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	struct icalrecurrencetype r;
-	GSList l;
-	enum ending_type ending_type;
-
-	priv = ee->priv;
-
-	icalrecurrencetype_clear (&r);
-
-	/* Frequency, interval, week start */
-
-	r.freq = e_dialog_option_menu_get (priv->recurrence_interval_unit, recur_freq_map);
-	r.interval = e_dialog_spin_get_int (priv->recurrence_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->recurrence_special)->child != NULL);
-		g_assert (priv->recurrence_weekday_picker != NULL);
-		g_assert (IS_WEEKDAY_PICKER (priv->recurrence_weekday_picker));
-
-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv->recurrence_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: {
-		int day_index;
-		enum month_day_options month_day;
-
-		g_assert (GTK_BIN (priv->recurrence_special)->child != NULL);
-		g_assert (priv->recurrence_month_index_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->recurrence_month_index_spin));
-		g_assert (priv->recurrence_month_day_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->recurrence_month_day_menu));
-
-		day_index = e_dialog_spin_get_int (priv->recurrence_month_index_spin);
-		month_day = e_dialog_option_menu_get (priv->recurrence_month_day_menu,
-						      month_day_options_map);
-
-		switch (month_day) {
-		case MONTH_DAY_NTH:
-			r.by_month_day[0] = day_index;
-			break;
-
-		case MONTH_DAY_MON:
-			r.by_day[0] = nth_weekday (day_index, ICAL_MONDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_TUE:
-			r.by_day[0] = nth_weekday (day_index, ICAL_TUESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_WED:
-			r.by_day[0] = nth_weekday (day_index, ICAL_WEDNESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_THU:
-			r.by_day[0] = nth_weekday (day_index, ICAL_THURSDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_FRI:
-			r.by_day[0] = nth_weekday (day_index, ICAL_FRIDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SAT:
-			r.by_day[0] = nth_weekday (day_index, ICAL_SATURDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SUN:
-			r.by_day[0] = nth_weekday (day_index, ICAL_SUNDAY_WEEKDAY);
-			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->recurrence_ending_menu, ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		g_assert (priv->recurrence_ending_count_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->recurrence_ending_count_spin));
-
-		r.count = e_dialog_spin_get_int (priv->recurrence_ending_count_spin);
-		break;
-
-	case ENDING_UNTIL:
-		g_assert (priv->recurrence_ending_date_edit != NULL);
-		g_assert (E_IS_DATE_EDIT (priv->recurrence_ending_date_edit));
-
-		r.until = icaltime_from_timet (
-			e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_ending_date_edit)),
-			TRUE);
-		break;
-
-	case ENDING_FOREVER:
-		/* Nothing to be done */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Set the recurrence */
-
-	l.data = &r;
-	l.next = NULL;
-
-	cal_component_set_rrule_list (comp, &l);
-}
-
-/* Gets the data from the recurrence widgets and stores it in the calendar
- * component object.
- */
-static void
-recur_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	enum recur_type recur_type;
-	GtkCList *exception_list;
-	GSList *list;
-	int i;
-
-	priv = ee->priv;
-
-	recur_type = e_dialog_radio_get (priv->recurrence_none, recur_type_map);
-
-	switch (recur_type) {
-	case RECUR_NONE:
-		cal_component_set_rdate_list (comp, NULL);
-		cal_component_set_rrule_list (comp, NULL);
-		cal_component_set_exrule_list (comp, NULL);
-		break;
-
-	case RECUR_SIMPLE:
-		cal_component_set_rdate_list (comp, NULL);
-		cal_component_set_exrule_list (comp, NULL);
-		simple_recur_to_comp_object (ee, comp);
-		break;
-
-	case RECUR_CUSTOM:
-		/* We just keep whatever the component has currently */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Set exceptions */
-
-	list = NULL;
-	exception_list = GTK_CLIST (priv->recurrence_exception_list);
-	for (i = 0; i < exception_list->rows; i++) {
-		CalComponentDateTime *cdt;
-		time_t *tim;
-
-		cdt = g_new (CalComponentDateTime, 1);
-		cdt->value = g_new (struct icaltimetype, 1);
-		cdt->tzid = NULL;
-
-		tim = gtk_clist_get_row_data (exception_list, i);
-		g_assert (tim != NULL);
-		*cdt->value = icaltime_from_timet (*tim, FALSE);
-
-		list = g_slist_prepend (list, cdt);
-	}
-
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-}
-
-/* Gets the data from the widgets and stores it in the calendar component object */
-static void
-dialog_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	CalComponentDateTime date;
-	time_t t;
-	gboolean all_day_event;
-	char *cat, *str;
-
-	priv = ee->priv;
-
-	/* Summary */
-
-	str = e_dialog_editable_get (priv->general_summary);
-	if (!str || strlen (str) == 0)
-		cal_component_set_summary (comp, NULL);
-	else {
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		cal_component_set_summary (comp, &text);
-	}
-
-	if (str)
-		g_free (str);
-
-	/* Description */
-
-	str = e_dialog_editable_get (priv->description);
-	if (!str || strlen (str) == 0)
-		cal_component_set_description_list (comp, NULL);
-	else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-	}
-
-	if (!str)
-		g_free (str);
-
-	/* Dates */
-
-	date.value = g_new (struct icaltimetype, 1);
-	date.tzid = NULL;
-
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		/* FIXME: What do we do here? */
-	}
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	if (t != -1) {
-		if (all_day_event)
-			t = time_day_end (t);
-
-		*date.value = icaltime_from_timet (t, FALSE);
-		cal_component_set_dtend (comp, &date);
-	} else {
-		/* FIXME: What do we do here? */
-	}
-	g_free (date.value);
-
-	/* Categories */
-	cat = e_dialog_editable_get (priv->categories);
-	cal_component_set_categories (comp, cat);
-
-	if (cat)
-		g_free (cat);
-
-	cal_component_set_classification (comp, classification_get (priv->classification_public));
-
-	/* Reminder information */
-	reminder_to_comp_object (ee, comp);
-	
-	/* Recurrence information */
-	recur_to_comp_object (ee, comp);
-
-	cal_component_commit_sequence (comp);
-}
-
-/* Fills the calendar component object from the data in the widgets and commits
- * the component to the storage.
- */
-static void
-save_event_object (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (ee, priv->comp);
-	set_title_from_comp (ee, priv->comp);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_event_object(): Could not update the object!");
-	else
-		event_editor_set_changed (ee, FALSE);
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (ee));
-}
-
-
-
-/* Callback used when the dialog box is "applied" */
-static void
-ee_apply_event_cb (GtkWidget *widget, gint page_num, gpointer data)
-{
-	EventEditor *ee;
-
-	g_return_if_fail (IS_EVENT_EDITOR (data));
-
-	ee = EVENT_EDITOR (data);
-
-	if (page_num != -1)
-		return;
-	
-	save_event_object (ee);
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-ee_close_event_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	g_return_val_if_fail (IS_EVENT_EDITOR (data), TRUE);
-
-	ee = EVENT_EDITOR (data);
-
-	if (prompt_to_save_changes (ee))
-		close_dialog (ee);
-	
-	return TRUE;
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-ee_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EventEditor *ee;
-
-	g_return_val_if_fail (IS_EVENT_EDITOR (data), TRUE);
-
-	ee = EVENT_EDITOR (data);
-
-	if (prompt_to_save_changes (ee))
-		close_dialog (ee);
-
-	return TRUE;
-}
-
-/**
- * event_editor_construct:
- * @ee: An event editor.
- *
- * Constructs an event editor by loading its Glade data.
- *
- * Return value: The same object as @ee, or NULL if the widgets could not be
- * created.  In the latter case, the event editor will automatically be
- * destroyed.
- **/
-EventEditor *
-event_editor_construct (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_val_if_fail (ee != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);
-
-	priv = ee->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("event_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (ee)) {
-		g_message ("event_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (ee);
-
-	/* Hook to destruction of the dialog */
-	gtk_signal_connect (GTK_OBJECT (priv->app), "apply",
-			    GTK_SIGNAL_FUNC (ee_apply_event_cb), ee); 
-	gtk_signal_connect (GTK_OBJECT (priv->app), "close",
-			    GTK_SIGNAL_FUNC (ee_close_event_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (ee_delete_event_cb), ee);
-
-	/* Add focus to the summary entry */
-	gtk_widget_grab_focus (GTK_WIDGET (priv->general_summary));
-
-	return ee;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (ee));
-	return NULL;
-}
-
-/**
- * event_editor_new:
- *
- * Creates a new event editor dialog.
- *
- * Return value: A newly-created event editor dialog, or NULL if the event
- * editor could not be created.
- **/
-EventEditor *
-event_editor_new (void)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));
-	return event_editor_construct (EVENT_EDITOR (ee));
-}
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-/**
- * event_editor_set_cal_client:
- * @ee: An event editor.
- * @client: Calendar client.
- *
- * Sets the calendar client than an event editor will use for updating its
- * calendar components.
- **/
-void
-event_editor_set_cal_client (EventEditor *ee, CalClient *client)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED);
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), ee);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), ee);
-	}
-}
-
-/**
- * event_editor_get_cal_client:
- * @ee: An event editor.
- *
- * Queries the calendar client that an event editor is using to update its
- * calendar components.
- *
- * Return value: A calendar client object.
- **/
-CalClient *
-event_editor_get_cal_client (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_val_if_fail (ee != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);
-
-	priv = ee->priv;
-	return priv->client;
-}
-
-/**
- * event_editor_set_event_object:
- * @ee: An event editor.
- * @comp: A calendar object.
- *
- * Sets the calendar object that an event editor dialog will manipulate.
- **/
-void
-event_editor_set_event_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp) {
-		priv->comp = cal_component_clone (comp);
-	}
-
-	set_title_from_comp (ee, priv->comp);
-	fill_widgets (ee);
-}
-
-/**
- * event_editor_focus:
- * @ee: An event editor.
- *
- * Makes sure an event editor is shown, on top of other windows, and focused.
- **/
-void
-event_editor_focus (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	gtk_widget_show_now (priv->app);
-	raise_and_focus (priv->app);
-}
-
-/* Checks if the event's time starts and ends at midnight, and sets the
- * "all day event" box accordingly.
- */
-static void
-check_all_day (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t ev_start, ev_end;
-	gboolean all_day = FALSE;
-
-	priv = ee->priv;
-
-	/* Currently we just return if the date is not set or not valid.
-	   I'm not entirely sure this is the corrent thing to do. */
-	ev_start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	g_return_if_fail (ev_start != -1);
-
-	ev_end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	g_return_if_fail (ev_end != -1);
-
-	/* all day event checkbox */
-	if (time_day_begin (ev_start) == ev_start
-	    && time_day_begin (ev_end) == ev_end)
-		all_day = TRUE;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event), ee);
-
-	e_dialog_toggle_set (priv->all_day_event, all_day);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event), ee);
-
-	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);
-}
-
-/*
- * 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
-set_all_day (GtkWidget *toggle, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	struct tm start_tm, end_tm;
-	time_t start_t, end_t;
-	gboolean all_day;
-
-	priv = ee->priv;
-
-	event_editor_set_changed (ee, TRUE);
-
-	/* 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 do not round it down
-	   to the previous day, since if we do that and the user repeatedly
-	   turns the all_day toggle on and off, the event keeps shrinking.
-	   (We'd also need to make sure we didn't adjust the time when the
-	   radio button is initially set.)
-
-	   When the all_day_toggle is turned off, we set the event start to the
-	   start of the working day, and if the event end is on or before the
-	   day of the event start we set it to one hour after the event start.
-	*/
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	/*
-	 * Start time.
-	 */
-	start_t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	g_return_if_fail (start_t != -1);
-
-	start_tm = *localtime (&start_t);
-
-	if (all_day) {
-		/* Round down to the start of the day. */
-		start_tm.tm_hour = 0;
-		start_tm.tm_min  = 0;
-		start_tm.tm_sec  = 0;
-	} else {
-		/* Set to the start of the working day. */
-		start_tm.tm_hour = calendar_config_get_day_start_hour ();
-		start_tm.tm_min  = calendar_config_get_day_start_minute ();
-		start_tm.tm_sec  = 0;
-	}
-
-	/*
-	 * End time.
-	 */
-	end_t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	g_return_if_fail (end_t != -1);
-
-	end_tm = *localtime (&end_t);
-
-	if (all_day) {
-		/* Round down to the start of the day. */
-		end_tm.tm_hour = 0;
-		end_tm.tm_min  = 0;
-		end_tm.tm_sec  = 0;
-	} else {
-		/* If the event end is now on or before the event start day,
-		   make it end one hour after the start. mktime() will fix any
-		   overflows. */
-		if (end_tm.tm_year < start_tm.tm_year
-		    || (end_tm.tm_year == start_tm.tm_year
-			&& end_tm.tm_mon < start_tm.tm_mon)
-		    || (end_tm.tm_year == start_tm.tm_year
-			&& end_tm.tm_mon == start_tm.tm_mon
-			&& end_tm.tm_mday <= start_tm.tm_mday)) {
-			end_tm.tm_year = start_tm.tm_year;
-			end_tm.tm_mon = start_tm.tm_mon;
-			end_tm.tm_mday = start_tm.tm_mday;
-			end_tm.tm_hour = start_tm.tm_hour + 1;
-		}
-	}
-
-	/* Block date_changed_cb, or dates_changed() will be called after the
-	   start time is set (but before the end time is set) and will call
-	   check_all_day() and mess us up. */
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	/* will set recur start too */
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&start_tm));
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), mktime (&end_tm));
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	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);
-
-	preview_recur (ee);
-}
-
-/* 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 (EDateEdit *dedit, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	time_t start, end;
-	struct tm tm_start, tm_end;
-
-	ee = EVENT_EDITOR (data);
-	priv = ee->priv;
-
-	event_editor_set_changed (ee, TRUE);
-
-	/* Ensure that start < end */
-
-	start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	g_return_if_fail (start != -1);
-	end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	g_return_if_fail (end != -1);
-
-	if (start >= end) {
-		tm_start = *localtime (&start);
-		tm_end = *localtime (&end);
-
-		if (start == end && tm_start.tm_hour == 0
-		    && tm_start.tm_min == 0 && tm_start.tm_sec == 0) {
-			/* If the start and end times are the same, but both
-			   are on day boundaries, then that is OK since it
-			   means we have an all-day event lasting 1 day.
-			   So we do nothing here. */
-
-		} else if (GTK_WIDGET (dedit) == priv->start_time) {
-			/* Modify the end time */
-
-			tm_end.tm_year = tm_start.tm_year;
-			tm_end.tm_mon  = tm_start.tm_mon;
-			tm_end.tm_mday = tm_start.tm_mday;
-			tm_end.tm_hour = tm_start.tm_hour + 1;
-			tm_end.tm_min  = tm_start.tm_min;
-			tm_end.tm_sec  = tm_start.tm_sec;
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->end_time), mktime (&tm_end));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-		} else if (GTK_WIDGET (dedit) == priv->end_time) {
-			/* Modify the start time */
-
-			tm_start.tm_year = tm_end.tm_year;
-			tm_start.tm_mon  = tm_end.tm_mon;
-			tm_start.tm_mday = tm_end.tm_mday;
-			tm_start.tm_hour = tm_end.tm_hour - 1;
-			tm_start.tm_min  = tm_end.tm_min;
-			tm_start.tm_sec  = tm_end.tm_sec;
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&tm_start));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-		} else
-			g_assert_not_reached ();
-	}
-
-	/* Set the "all day event" button as appropriate */
-
-	check_all_day (ee);
-
-	/* Retag the recurrence preview calendar */
-
-	preview_recur (ee);
-}
-
-/* Appends an alarm to the list */
-static void
-append_reminder (EventEditor *ee, CalComponentAlarm *alarm, ReminderStatus status)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	ReminderData *rdata;
-	char *c[1];
-	int i;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->reminder_list);
-
-	c[0] = get_alarm_string (alarm);
-	i = e_utf8_gtk_clist_append (clist, c);
-
-	rdata = g_new (ReminderData, 1);
-	rdata->status = status;
-	rdata->alarm = alarm;
-	gtk_clist_set_row_data (clist, i, rdata);
-	gtk_clist_select_row (clist, i, 0);
-	g_free (c[0]);
-	
-	gtk_widget_set_sensitive (priv->reminder_delete, TRUE);
-}
-
-/* Callback for the "add reminder" button */
-static void
-reminder_add_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponentAlarm *alarm;
-	CalAlarmTrigger trigger;
-
-	priv = ee->priv;
-
-	event_editor_set_changed (ee, TRUE);
-
-	alarm = cal_component_alarm_new ();
-
-	memset (&trigger, 0, sizeof (CalAlarmTrigger));
-	trigger.type = e_dialog_option_menu_get (priv->reminder_time, reminder_time_map);
-	if (e_dialog_option_menu_get (priv->reminder_relative, reminder_relative_map) == BEFORE)
-		trigger.u.rel_duration.is_neg = 1;
-	else
-		trigger.u.rel_duration.is_neg = 0;
-	
-	switch (e_dialog_option_menu_get (priv->reminder_relative, reminder_relative_map)) {
-	case MINUTES:
-		trigger.u.rel_duration.minutes =  e_dialog_spin_get_int (priv->reminder_interval_value);
-		break;
-	case HOURS:
-		trigger.u.rel_duration.hours =  e_dialog_spin_get_int (priv->reminder_interval_value);
-		break;
-	case DAYS:
-		trigger.u.rel_duration.days =  e_dialog_spin_get_int (priv->reminder_interval_value);
-		break;
-	}
-	cal_component_alarm_set_trigger (alarm, trigger);
-
-	cal_component_alarm_set_action (alarm, e_dialog_option_menu_get (priv->reminder_action, reminder_action_map));
-
-	append_reminder (ee, alarm, NEW_ALARM);
-}
-
-/* Callback for the "delete reminder" button */
-static void
-reminder_delete_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	ReminderData *rdata;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->reminder_list);
-	if (!clist->selection)
-		return;
-
-	event_editor_set_changed (ee, TRUE);
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	rdata = gtk_clist_get_row_data (clist, sel);
-	
-	if (rdata->status == EXISTING_ALARM) {
-		const char *uid;
-		
-		uid = cal_component_alarm_get_uid (rdata->alarm);
-		cal_component_remove_alarm (priv->comp, uid);
-	}
-	cal_component_alarm_free (rdata->alarm);
-	g_free (rdata);
-
-	gtk_clist_remove (clist, sel);
-	if (sel >= clist->rows)
-		sel--;
-
-	if (clist->rows > 0)
-		gtk_clist_select_row (clist, sel, 0);
-	else
-		gtk_widget_set_sensitive (priv->reminder_delete, FALSE);
-}
-
-
-/* Builds a static string out of an exception date */
-static char *
-get_exception_string (time_t t)
-{
-	static char buf[256];
-
-	strftime (buf, sizeof (buf), _("%a %b %d %Y"), localtime (&t));
-	return buf;
-}
-
-/* Appends an exception date to the list */
-static void
-append_exception (EventEditor *ee, time_t t)
-{
-	EventEditorPrivate *priv;
-	time_t *tt;
-	char *c[1];
-	int i;
-	GtkCList *clist;
-
-	priv = ee->priv;
-
-	tt = g_new (time_t, 1);
-	*tt = t;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (clist), ee);
-
-	c[0] = get_exception_string (t);
-	i = e_utf8_gtk_clist_append (clist, c);
-
-	gtk_clist_set_row_data (clist, i, tt);
-
-	gtk_clist_select_row (clist, i, 0);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (clist), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_exception_date), t);
-
-	gtk_widget_set_sensitive (priv->recurrence_exception_modify, TRUE);
-	gtk_widget_set_sensitive (priv->recurrence_exception_delete, TRUE);
-}
-
-
-/* Callback for the "add exception" button */
-static void
-recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t t;
-
-	priv = ee->priv;
-
-	event_editor_set_changed (ee, TRUE);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exception_date));
-	append_exception (ee, t);
-	preview_recur (ee);
-}
-
-/* Callback for the "modify exception" button */
-static void
-recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	time_t *t;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-	if (!clist->selection)
-		return;
-
-	event_editor_set_changed (ee, TRUE);
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	t = gtk_clist_get_row_data (clist, sel);
-	*t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exception_date));
-
-	e_utf8_gtk_clist_set_text (clist, sel, 0, get_exception_string (*t));
-
-	preview_recur (ee);
-}
-
-/* Callback for the "delete exception" button */
-static void
-recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	int sel;
-	time_t *t;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-	if (!clist->selection)
-		return;
-
-	event_editor_set_changed (ee, TRUE);
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	t = gtk_clist_get_row_data (clist, sel);
-	g_assert (t != NULL);
-	g_free (t);
-
-	gtk_clist_remove (clist, sel);
-	if (sel >= clist->rows)
-		sel--;
-
-	if (clist->rows > 0)
-		gtk_clist_select_row (clist, sel, 0);
-	else {
-		gtk_widget_set_sensitive (priv->recurrence_exception_modify, FALSE);
-		gtk_widget_set_sensitive (priv->recurrence_exception_delete, FALSE);
-	}
-
-	preview_recur (ee);
-}
-
-/* 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
-recurrence_exception_select_row_cb (GtkCList *clist, gint row, gint col, GdkEvent *event,
-				    gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	time_t *t;
-
-	ee = EVENT_EDITOR (data);
-	priv = ee->priv;
-
-	t = gtk_clist_get_row_data (clist, row);
-	g_assert (t != NULL);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_exception_date), *t);
-}
-
-GtkWidget *
-make_date_edit (void)
-{
-	return date_edit_new (TRUE, TRUE);
-}
-
-
-GtkWidget *
-make_spin_button (int val, int low, int high)
-{
-	GtkAdjustment *adj;
-	GtkWidget *spin;
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (val, low, high, 1, 10, 10));
-	spin = gtk_spin_button_new (adj, 0.5, 0);
-	gtk_widget_set_usize (spin, 60, 0);
-
-	return spin;
-}
-
-
-/* This is called when most fields are changed (except those which already
-   have signal handlers). It just sets the "changed" flag. */
-static void
-field_changed			(GtkWidget	*widget,
-				 EventEditor	*ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	event_editor_set_changed (ee, TRUE);
-}
-
-
-static void
-event_editor_set_changed	(EventEditor	*ee,
-				 gboolean	 changed)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-#if 0
-	g_print ("In event_editor_set_changed: %s\n",
-		 changed ? "TRUE" : "FALSE");
-#endif
-
-	priv->changed = changed;
-
-	if (priv->app)
-		gnome_property_box_set_state (GNOME_PROPERTY_BOX (priv->app), changed);
-}
-
-
-/* This checks if the "changed" field is set, and if so it prompts to save
-   the changes using a "Save/Discard/Cancel" modal dialog. It then saves the
-   changes if requested. It returns TRUE if the dialog should now be closed. */
-static gboolean
-prompt_to_save_changes		(EventEditor	*ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	if (!priv->changed)
-		return TRUE;
-
-	switch (save_component_dialog (GTK_WINDOW (priv->app))) {
-	case 0: /* Save */
-		/* FIXME: If an error occurs here, we should popup a dialog
-		   and then return FALSE. */
-		save_event_object (ee);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-		break;
-	}
-}
-
-static void
-categories_clicked (GtkWidget *button, EventEditor *ee)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry;
-
-	entry = ee->priv->categories;
-	categories = e_utf8_gtk_entry_get_text (GTK_ENTRY (entry));
-
-	dialog = GNOME_DIALOG (e_categories_new (categories));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-
-	if (result == 0) {
-		gtk_object_get (GTK_OBJECT (dialog),
-				"categories", &categories,
-				NULL);
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), categories);
-		g_free (categories);
-	}
-	gtk_object_destroy (GTK_OBJECT (dialog));
-}
diff --git a/calendar/gui/event-editor.h b/calendar/gui/event-editor.h
deleted file mode 100644
index 60be54c784..0000000000
--- a/calendar/gui/event-editor.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EVENT_EDITOR_DIALOG_H__
-#define __EVENT_EDITOR_DIALOG_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "gnome-cal.h"
-
-
-
-#define TYPE_EVENT_EDITOR            (event_editor_get_type ())
-#define EVENT_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor))
-#define EVENT_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR,	\
-				      EventEditorClass))
-#define IS_EVENT_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_EDITOR))
-#define IS_EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR))
-
-typedef struct _EventEditor EventEditor;
-typedef struct _EventEditorClass EventEditorClass;
-typedef struct _EventEditorPrivate EventEditorPrivate;
-
-struct _EventEditor {
-	GtkObject object;
-
-	/* Private data */
-	EventEditorPrivate *priv;
-};
-
-struct _EventEditorClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType event_editor_get_type (void);
-EventEditor *event_editor_construct (EventEditor *ee);
-
-EventEditor *event_editor_new (void);
-
-void event_editor_set_cal_client (EventEditor *ee, CalClient *client);
-CalClient *event_editor_get_cal_client (EventEditor *ee);
-
-void event_editor_set_event_object (EventEditor *ee, CalComponent *comp);
-
-void event_editor_focus (EventEditor *ee);
-
-void event_editor_update_widgets (EventEditor *ee);
-
-
-GtkWidget *make_date_edit (void);
-GtkWidget *make_spin_button (int val, int low, int high);
-
-
-
-#endif /* __EVENT_EDITOR_DIALOG_H__ */
diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c
deleted file mode 100644
index 7ebe2b5f8e..0000000000
--- a/calendar/gui/evolution-calendar-control.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#ifdef USING_OAF
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-#else
-#define CONTROL_FACTORY_ID   "control-factory:calendar"
-#endif
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-#ifdef USING_OAF
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-#else
-	gnome_CORBA_init_with_popt_table (
-		"evolution-calendar", "0.0",
-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-#endif
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.vcf",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal)
-{
-	gcal->properties = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (gcal->properties,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_property_bag (gcal->control, gcal->properties);
-}
-
-
-
-static BonoboObject *
-calendar_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl *control;
-
-	/* Create the control. */
-	GnomeCalendar *cal = new_calendar (full_name, NULL, NULL, 0);
-
-	gtk_widget_show (GTK_WIDGET (cal));
-
-	control = bonobo_control_new (GTK_WIDGET (cal));
-	cal->control = control;
-
-	calendar_properties_init (cal);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, cal);
-
-	return BONOBO_OBJECT (control);
-}
-
-
-static void
-calendar_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-
-	CORBA_exception_init (&ev);
-
-	calendar_control_factory_init ();
-	component_factory_init ();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
deleted file mode 100644
index 3937d31781..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,1531 +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 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <gal/e-paned/e-hpaned.h>
-#include <gal/e-paned/e-vpaned.h>
-#include <cal-util/timeutil.h>
-#include "dialogs/alarm-notify-dialog.h"
-#include "e-calendar-table.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "event-editor.h"
-#include "gnome-cal.h"
-#include "component-factory.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "tag-calendar.h"
-
-
-
-/* These must match the page numbers in the GtkNotebook. */
-typedef enum {
-	VIEW_NOT_SET = -1,
-	VIEW_DAY = 0,
-	VIEW_WORK_WEEK,
-	VIEW_WEEK,
-	VIEW_MONTH
-} ViewType;
-
-/* Private part of the GnomeCalendar structure */
-struct _GnomeCalendarPrivate {
-	/*
-	 * The Calendar Folder.
-	 */
-
-	/* The calendar client object we monitor */
-	CalClient *client;
-
-	/*
-	 * The TaskPad Folder.
-	 */
-
-	/* The calendar client object we monitor */
-	CalClient   *task_pad_client;
-
-	/*
-	 * Fields for the calendar view
-	 */
-
-	/* Mapping of component UIDs to event editors */
-	GHashTable  *object_editor_hash;
-
-	/* This is the last selection explicitly selected by the user. We try
-	   to keep it the same when we switch views, but we may have to alter
-	   it depending on the view (e.g. the week views only select days, so
-	   any times are lost. */
-	time_t      selection_start_time;
-	time_t      selection_end_time;
-
-	/* Widgets */
-
-	GtkWidget   *hpane;
-	GtkWidget   *notebook;
-	GtkWidget   *vpane;
-	ECalendar   *date_navigator;
-	GtkWidget   *todo;
-
-	GtkWidget   *day_view;
-	GtkWidget   *work_week_view;
-	GtkWidget   *week_view;
-	GtkWidget   *month_view;
-
-	/* These are the toolbar radio buttons for switching views. */
-	GtkWidget   *day_button;
-	GtkWidget   *work_week_button;
-	GtkWidget   *week_button;
-	GtkWidget   *month_button;
-
-	/* This is the view currently shown. We use it to keep track of the
-	   positions of the panes. range_selected is TRUE if a range of dates
-	   was selected in the date navigator to show the view. */
-	ViewType current_view_type;
-	gboolean range_selected;
-
-	/* These are the saved positions of the panes. They are multiples of
-	   calendar month widths & heights in the date navigator, so that they
-	   will work OK after theme changes. */
-	gfloat	     hpane_pos;
-	gfloat	     vpane_pos;
-	gfloat	     hpane_pos_month_view;
-	gfloat	     vpane_pos_month_view;
-
-	/* The signal handler id for our GtkCalendar "day_selected" handler. */
-	guint	     day_selected_id;
-
-	/* Whether we are being destroyed and should not mess with the object
-	 * editor hash table.
-	 */
-	guint in_destroy : 1;
-};
-
-
-
-static void gnome_calendar_class_init (GnomeCalendarClass *class);
-static void gnome_calendar_init (GnomeCalendar *gcal);
-static void gnome_calendar_destroy (GtkObject *object);
-
-static void gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 range_selected,
-						 gboolean	 focus);
-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);
-static void gnome_calendar_update_view_times (GnomeCalendar *gcal);
-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);
-
-static void gnome_calendar_on_date_navigator_style_set (GtkWidget *widget,
-							GtkStyle  *previous_style,
-							gpointer data);
-static void gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal);
-static void gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-							    GtkAllocation *allocation,
-							    gpointer data);
-static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-								 GnomeCalendar *gcal);
-static void gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-								GnomeCalendar    *gcal);
-static gboolean gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-						 GDate		*start_date,
-						 gint		*days_shown);
-
-
-static GtkVBoxClass *parent_class;
-
-
-
-
-GtkType
-gnome_calendar_get_type (void)
-{
-	static GtkType gnome_calendar_type = 0;
-
-	if (!gnome_calendar_type) {
-		static const GtkTypeInfo gnome_calendar_info = {
-			"GnomeCalendar",
-			sizeof (GnomeCalendar),
-			sizeof (GnomeCalendarClass),
-			(GtkClassInitFunc) gnome_calendar_class_init,
-			(GtkObjectInitFunc) gnome_calendar_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		gnome_calendar_type = gtk_type_unique (GTK_TYPE_VBOX, &gnome_calendar_info);
-	}
-
-	return gnome_calendar_type;
-}
-
-/* Class initialization function for the gnome calendar */
-static void
-gnome_calendar_class_init (GnomeCalendarClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_VBOX);
-
-	object_class->destroy = gnome_calendar_destroy;
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-	gchar *filename;
-	CalendarModel *model;
-
-	priv = gcal->priv;
-
-	/* The main HPaned, with the notebook of calendar views on the left
-	   and the ECalendar and ToDo list on the right. */
-	priv->hpane = e_hpaned_new ();
-	gtk_widget_show (priv->hpane);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 0);
-
-	/* The Notebook containing the 4 calendar views. */
-	priv->notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_widget_show (priv->notebook);
-	e_paned_pack1 (E_PANED (priv->hpane), priv->notebook, TRUE, TRUE);
-
-	/* The VPaned widget, to contain the GtkCalendar & ToDo list. */
-	priv->vpane = e_vpaned_new ();
-	gtk_widget_show (priv->vpane);
-	e_paned_pack2 (E_PANED (priv->hpane), priv->vpane, FALSE, TRUE);
-
-	/* The ECalendar. */
-	w = e_calendar_new ();
-	priv->date_navigator = E_CALENDAR (w);
-	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_paned_pack1 (E_PANED (priv->vpane), w, FALSE, TRUE);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator),
-			    "style_set",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),
-			    gcal);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_navigator),
-				  "size_allocate",
-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,
-				  gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,
-			    gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),
-			    gcal);
-
-	/* The ToDo list. */
-	priv->todo = e_calendar_table_new ();
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);
-	e_paned_pack2 (E_PANED (priv->vpane), priv->todo, TRUE, TRUE);
-	gtk_widget_show (priv->todo);
-
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
-	/* The Day View. */
-	priv->day_view = e_day_view_new ();
-	e_day_view_set_calendar (E_DAY_VIEW (priv->day_view), gcal);
-	gtk_widget_show (priv->day_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->day_view, gtk_label_new (""));
-
-	/* The Work Week View. */
-	priv->work_week_view = e_day_view_new ();
-	e_day_view_set_work_week_view (E_DAY_VIEW (priv->work_week_view),
-				       TRUE);
-	e_day_view_set_days_shown (E_DAY_VIEW (priv->work_week_view), 5);
-	e_day_view_set_calendar (E_DAY_VIEW (priv->work_week_view), gcal);
-	gtk_widget_show (priv->work_week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->work_week_view, gtk_label_new (""));
-
-	/* The Week View. */
-	priv->week_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->week_view), gcal);
-	gtk_widget_show (priv->week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->week_view, gtk_label_new (""));
-
-	/* The Month View. */
-	priv->month_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->month_view), gcal);
-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE);
-	gtk_widget_show (priv->month_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->month_view, gtk_label_new (""));
-
-	gnome_calendar_update_config_settings (gcal, TRUE);
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-gnome_calendar_init (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = g_new0 (GnomeCalendarPrivate, 1);
-	gcal->priv = priv;
-
-	priv->object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->current_view_type = VIEW_NOT_SET;
-	priv->range_selected = FALSE;
-
-	setup_widgets (gcal);
-
-	priv->selection_start_time = time_day_begin (time (NULL));
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-}
-
-/* Used from g_hash_table_foreach(); frees an UID string */
-static void
-destroy_editor_cb (gpointer key, gpointer value, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (value);
-	gtk_object_unref (GTK_OBJECT (ee));
-}
-
-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;
-
-	/* Save the TaskPad layout. */
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
-	if (priv->client) {
-#if 0
-		alarm_notify_remove_client (priv->client);
-#endif
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->task_pad_client) {
-#if 0
-		alarm_notify_remove_client (priv->task_pad_client);
-#endif
-		gtk_object_unref (GTK_OBJECT (priv->task_pad_client));
-		priv->task_pad_client = NULL;
-	}
-
-	priv->in_destroy = TRUE;
-	g_hash_table_foreach (priv->object_editor_hash, destroy_editor_cb, NULL);
-	g_hash_table_destroy (priv->object_editor_hash);
-	priv->object_editor_hash = NULL;
-
-	g_free (priv);
-	gcal->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static GtkWidget *
-get_current_page (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	return GTK_NOTEBOOK (priv->notebook)->cur_page->child;
-}
-
-char *
-gnome_calendar_get_current_view_name (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		return "dayview";
-	else if (page == priv->work_week_view)
-		return "workweekview";
-	else if (page == priv->week_view)
-		return "weekview";
-	else if (page == priv->month_view)
-		return "monthview";
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-void
-gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (new_time != -1);
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (new_time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-static void
-gnome_calendar_update_view_times (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		e_day_view_set_selected_time_range (E_DAY_VIEW (page),
-						    priv->selection_start_time,
-						    priv->selection_end_time);
-	} else if (page == priv->week_view || page == priv->month_view) {
-		e_week_view_set_selected_time_range (E_WEEK_VIEW (page),
-						     priv->selection_start_time,
-						     priv->selection_end_time);
-	} else {
-		g_warning ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *cp;
-	time_t start_time, end_time;
-
-	priv = gcal->priv;
-
-	cp = get_current_page (gcal);
-
-	start_time = priv->selection_start_time;
-	end_time = priv->selection_end_time;
-
-	if (cp == priv->day_view) {
-		start_time = time_add_day (start_time, direction);
-		end_time = time_add_day (end_time, direction);
-	} else if (cp == priv->work_week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->month_view) {
-		start_time = time_add_month (start_time, direction);
-		end_time = time_add_month (end_time, direction);
-	} else {
-		g_warning ("Weee!  Where did the penguin go?");
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-void
-gnome_calendar_next (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, 1);
-}
-
-void
-gnome_calendar_previous (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, -1);
-}
-
-void
-gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-	if (priv->day_button)
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->day_button), TRUE);
-	else
-		gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);
-}
-
-void
-gnome_calendar_goto_today (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_goto (gcal, time (NULL));
-
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-/* This sets which view is currently shown. It also updates the selection time
-   of the view so it shows the appropriate days. */
-void
-gnome_calendar_set_view		(GnomeCalendar	*gcal,
-				 char		*page_name,
-				 gboolean	 range_selected,
-				 gboolean	 focus)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (page_name != NULL);
-
-	gnome_calendar_set_view_internal (gcal, page_name, range_selected, focus);
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-/* This sets the view without changing the selection or updating the date
-   navigator. If a range of dates isn't selected it will also reset the number
-   of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks
-   for the month view). */
-static void
-gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-					 char		*page_name,
-					 gboolean	 range_selected,
-					 gboolean	 focus)
-{
-	GnomeCalendarPrivate *priv;
-	int view;
-	gboolean round_selection;
-	GtkWidget *focus_widget;
-
-	priv = gcal->priv;
-
-	round_selection = FALSE;
-
-	if (!strcmp (page_name, "dayview")) {
-		view = VIEW_DAY;
-		focus_widget = priv->day_view;
-
-		if (!range_selected)
-			e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1);
-	} else if (!strcmp (page_name, "workweekview")) {
-		view = VIEW_WORK_WEEK;
-		focus_widget = priv->work_week_view;
-	} else if (!strcmp (page_name, "weekview")) {
-		view = VIEW_WEEK;
-		focus_widget = priv->week_view;
-		round_selection = TRUE;
-	} else if (!strcmp (page_name, "monthview")) {
-		view = VIEW_MONTH;
-		focus_widget = priv->month_view;
-
-		if (!range_selected)
-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 5);
-		round_selection = TRUE;
-	} else {
-		g_warning ("Unknown calendar view: %s", page_name);
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->current_view_type = view;
-	priv->range_selected = range_selected;
-
-	calendar_config_set_default_view (view);
-
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), view);
-
-	if (focus)
-		gtk_widget_grab_focus (focus_widget);
-
-	gnome_calendar_set_pane_positions (gcal);
-
-	/* For the week & month views we want the selection in the date
-	   navigator to be rounded to the nearest week when the arrow buttons
-	   are pressed to move to the previous/next month. */
-	gtk_object_set (GTK_OBJECT (priv->date_navigator->calitem),
-			"round_selection_when_moving", round_selection,
-			NULL);
-}
-
-
-static void
-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint top_border, bottom_border, left_border, right_border;
-	gint col_width, row_height;
-	gfloat right_pane_width, top_pane_height;
-
-	priv = gcal->priv;
-
-	/* Get the size of the calendar month width & height. */
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	if (priv->current_view_type == VIEW_MONTH && !priv->range_selected) {
-		right_pane_width = priv->hpane_pos_month_view;
-		top_pane_height = priv->vpane_pos_month_view;
-	} else {
-		right_pane_width = priv->hpane_pos;
-		top_pane_height = priv->vpane_pos;
-	}
-
-	/* We add the borders before multiplying due to the way we are using
-	   the EPaned quantum feature. */
-	if (right_pane_width < 0.001)
-		right_pane_width = 0.0;
-	else
-		right_pane_width = (right_pane_width * (col_width + left_border + right_border)
-				    + 0.5);
-	if (top_pane_height < 0.001)
-		top_pane_height = 0.0;
-	else
-		top_pane_height = (top_pane_height * (row_height + top_border + bottom_border)
-				   + 0.5);
-
-	e_paned_set_position (E_PANED (priv->hpane), -1);
-	e_paned_set_position (E_PANED (priv->vpane), -1);
-
-	/* We add one to each dimension since we can't use 0. */
-
-	gtk_widget_set_usize (priv->vpane, right_pane_width + 1, -2);
-	gtk_widget_set_usize (GTK_WIDGET (priv->date_navigator), -2, top_pane_height + 1);
-}
-
-/* Loads the initial data into the calendar; this should be called right after
- * the cal_opened signal from the client is invoked.
- */
-static void
-initial_load (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-/* Displays an error to indicate that opening a calendar failed */
-static void
-open_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not open the folder in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that the specified URI method is not supported */
-static void
-method_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to open `%s' is not supported"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Callback from the calendar client when a calendar is loaded */
-static void
-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (client == priv->client)
-			initial_load (gcal);
-
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (gcal, cal_client_get_uri (client));
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* bullshit; we did not specify only_if_exists */
-		g_assert_not_reached ();
-		return;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (gcal, cal_client_get_uri (client));
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-}
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-GtkWidget *
-gnome_calendar_construct (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint view;
-	gchar *page;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	/*
-	 * Calendar Folder Client.
-	 */
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), gcal);
-
-#if 0
-	alarm_notify_add_client (priv->client);
-#endif
-
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->day_view),
-				   priv->client);
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->work_week_view),
-				   priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->week_view),
-				    priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->month_view),
-				    priv->client);
-
-	/*
-	 * TaskPad Folder Client.
-	 */
-	priv->task_pad_client = cal_client_new ();
-	if (!priv->task_pad_client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->task_pad_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (cal_opened_cb), gcal);
-
-#if 0
-	alarm_notify_add_client (priv->task_pad_client);
-#endif
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->todo),
-					 priv->task_pad_client);
-
-
-	/* Get the default view to show. */
-	view = calendar_config_get_default_view ();
-	switch (view) {
-	case 1:
-		page = "workweekview";
-		break;
-	case 2:
-		page = "weekview";
-		break;
-	case 3:
-		page = "monthview";
-		break;
-	default:
-		page = "dayview";
-		break;
-	}
-
-	gnome_calendar_set_view (gcal, page, FALSE, FALSE);
-
-	return GTK_WIDGET (gcal);
-}
-
-GtkWidget *
-gnome_calendar_new (void)
-{
-	GnomeCalendar *gcal;
-
-	gcal = gtk_type_new (gnome_calendar_get_type ());
-
-	if (!gnome_calendar_construct (gcal)) {
-		g_message ("gnome_calendar_new(): Could not construct the calendar GUI");
-		gtk_object_unref (GTK_OBJECT (gcal));
-		return NULL;
-	}
-
-	return GTK_WIDGET (gcal);
-}
-
-/**
- * gnome_calendar_get_cal_client:
- * @gcal: A calendar view.
- *
- * Queries the calendar client interface object that a calendar view is using.
- *
- * Return value: A calendar client interface object.
- **/
-CalClient *
-gnome_calendar_get_cal_client (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	return priv->client;
-}
-
-gboolean
-gnome_calendar_open (GnomeCalendar *gcal, char *str_uri)
-{
-	GnomeCalendarPrivate *priv;
-	char *tasks_uri;
-	gboolean success;
-
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv = gcal->priv;
-
-	g_return_val_if_fail (
-		cal_client_get_load_state (priv->client) == CAL_CLIENT_LOAD_NOT_LOADED,
-		FALSE);
-
-	g_return_val_if_fail (
-		cal_client_get_load_state (priv->task_pad_client) == CAL_CLIENT_LOAD_NOT_LOADED,
-		FALSE);
-
-	if (!cal_client_open_calendar (priv->client, str_uri, FALSE)) {
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	/* Open the appropriate Tasks folder to show in the TaskPad.
-	   Currently we just show the folder named "Tasks", but it will be
-	   a per-calendar option in future. */
-
-	tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-	success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
-	g_free (tasks_uri);
-
-	if (!success) {
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Tells the calendar to reload all config settings.
-   If initializing is TRUE it sets the pane positions as well. (We don't
-   want to reset the pane positions after the user clicks 'Apply' in the
-   preferences dialog.) */
-void
-gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-				       gboolean	      initializing)
-{
-	GnomeCalendarPrivate *priv;
-	CalWeekdays working_days;
-	gint week_start_day, time_divisions;
-	gint start_hour, start_minute, end_hour, end_minute;
-	gboolean use_24_hour, show_event_end, compress_weekend;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	working_days = calendar_config_get_working_days ();
-	/* CalWeekdays and EDayViewDays use the same bit-masks, so we can
-	   use the same value. */
-	e_day_view_set_working_days (E_DAY_VIEW (priv->day_view),
-				     (EDayViewDays) working_days);
-	e_day_view_set_working_days (E_DAY_VIEW (priv->work_week_view),
-				     (EDayViewDays) working_days);
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-
-	/* 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 (E_DAY_VIEW (priv->day_view),
-					week_start_day);
-	e_day_view_set_week_start_day (E_DAY_VIEW (priv->work_week_view),
-					week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->week_view),
-					week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->month_view),
-					week_start_day);
-
-	start_hour = calendar_config_get_day_start_hour ();
-	start_minute = calendar_config_get_day_start_minute ();
-	end_hour = calendar_config_get_day_end_hour ();
-	end_minute = calendar_config_get_day_end_minute ();
-	e_day_view_set_working_day (E_DAY_VIEW (priv->day_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-	e_day_view_set_working_day (E_DAY_VIEW (priv->work_week_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->day_view),
-				       use_24_hour);
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->work_week_view),
-				       use_24_hour);
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->week_view),
-					use_24_hour);
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->month_view),
-					use_24_hour);
-
-	time_divisions = calendar_config_get_time_divisions ();
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->day_view),
-				     time_divisions);
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->work_week_view),
-				     time_divisions);
-
-	show_event_end = calendar_config_get_show_event_end ();
-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv->day_view),
-					     show_event_end);
-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv->work_week_view),
-					     show_event_end);
-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv->week_view),
-					      show_event_end);
-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv->month_view),
-					      show_event_end);
-
-	compress_weekend = calendar_config_get_compress_weekend ();
-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv->month_view),
-					  compress_weekend);
-
-	calendar_config_configure_e_calendar (E_CALENDAR (priv->date_navigator));
-
-	if (initializing) {
-		priv->hpane_pos = calendar_config_get_hpane_pos ();
-		priv->vpane_pos = calendar_config_get_vpane_pos ();
-		priv->hpane_pos_month_view = calendar_config_get_month_hpane_pos ();
-		priv->vpane_pos_month_view = calendar_config_get_month_vpane_pos ();
-	} else {
-		gnome_calendar_update_paned_quanta (gcal);
-	}
-
-	/* The range of days shown may have changed, so we update the date
-	   navigator if needed. */
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-void
-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-					time_t	       start_time,
-					time_t	       end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-/**
- * gnome_calendar_get_selected_time_range:
- * @gcal: A calendar view.
- * @start_time: Return value for the start of the time selection.
- * @end_time: Return value for the end of the time selection.
- *
- * Queries the time selection range on the calendar view.
- **/
-void
-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-					time_t	 *start_time,
-					time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	if (start_time)
-		*start_time = priv->selection_start_time;
-
-	if (end_time)
-		*end_time = priv->selection_end_time;
-}
-
-
-/* Callback used when an event editor dialog is closed */
-struct editor_closure
-{
-	GnomeCalendar *gcal;
-	char *uid;
-};
-
-static void
-editor_closed_cb (GtkWidget *widget, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	struct editor_closure *ec;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	ec = (struct editor_closure *) data;
-	gcal = ec->gcal;
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, ec->uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	if (!priv->in_destroy)
-		g_hash_table_remove (priv->object_editor_hash, orig_uid);
-
-	g_free (orig_uid);
-
-	g_free (ec);
-}
-
-void
-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp)
-{
-	GnomeCalendarPrivate *priv;
-	EventEditor *ee;
-	struct editor_closure *ec;
-	const char *uid;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (comp != NULL);
-
-	priv = gcal->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	ee = g_hash_table_lookup (priv->object_editor_hash, uid);
-	if (!ee) {
-		ec = g_new0 (struct editor_closure, 1);
-
-		ee = event_editor_new ();
-		if (!ee) {
-			g_message ("gnome_calendar_edit_object(): Could not create the event editor");
-			return;
-		}
-
-		ec->gcal = gcal;
-		ec->uid = g_strdup (uid);
-
-		g_hash_table_insert (priv->object_editor_hash, ec->uid, ee);
-
-		gtk_signal_connect (GTK_OBJECT (ee), "destroy",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    ec);
-
-		event_editor_set_cal_client (EVENT_EDITOR (ee), priv->client);
-		event_editor_set_event_object (EVENT_EDITOR (ee), comp);
-	}
-
-	event_editor_focus (ee);
-}
-
-/**
- * gnome_calendar_new_appointment:
- * @gcal: An Evolution calendar.
- *
- * Opens an event editor dialog for a new appointment.  The appointment's start
- * and end times are set to the currently selected time range in the calendar
- * views.
- **/
-void
-gnome_calendar_new_appointment (GnomeCalendar *gcal)
-{
-	CalComponent *comp;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	itt = icaltime_from_timet (dtstart, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet (dtend, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (gcal, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-}
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void
-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view)
-		e_day_view_get_selected_time_range (E_DAY_VIEW (page), start_time, end_time);
-	else if (page == priv->week_view || page == priv->month_view)
-		e_week_view_get_selected_time_range (E_WEEK_VIEW (page), start_time, end_time);
-	else {
-		g_message ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-
-
-/* This updates the month shown and the days selected in the calendar, if
-   necessary. */
-static void
-gnome_calendar_update_date_navigator (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date;
-	gint days_shown;
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (priv->date_navigator))
-		return;
-
-	if (gnome_calendar_get_days_shown (gcal, &start_date, &days_shown)) {
-		end_date = start_date;
-		g_date_add_days (&end_date, days_shown - 1);
-
-		e_calendar_item_set_selection (priv->date_navigator->calitem,
-					       &start_date, &end_date);
-	}
-}
-
-
-static gboolean
-gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-				 GDate		*start_date,
-				 gint		*days_shown)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		g_date_clear (start_date, 1);
-		g_date_set_time (start_date, E_DAY_VIEW (page)->lower);
-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (page));
-		return TRUE;
-	} else if (page == priv->week_view || page == priv->month_view) {
-		*start_date = E_WEEK_VIEW (page)->first_day_shown;
-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (page)))
-			*days_shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (page)) * 7;
-		else
-			*days_shown = 7;
-
-		return TRUE;
-	} else {
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-
-static void
-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-						    GnomeCalendar    *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date, new_start_date, new_end_date;
-	gint days_shown, new_days_shown;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gboolean starts_on_week_start_day;
-	struct tm tm;
-
-	priv = gcal->priv;
-
-	starts_on_week_start_day = FALSE;
-
-	if (!gnome_calendar_get_days_shown (gcal, &start_date, &days_shown))
-		return;
-
-	end_date = start_date;
-	g_date_add_days (&end_date, days_shown - 1);
-
-	e_calendar_item_get_selection (calitem, &new_start_date, &new_end_date);
-
-	/* If the selection hasn't changed just return. */
-	if (!g_date_compare (&start_date, &new_start_date)
-	    && !g_date_compare (&end_date, &new_end_date))
-		return;
-
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
-
-	/* 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 == calendar_config_get_week_start_day ())
-		starts_on_week_start_day = TRUE;
-
-	/* Switch views as appropriate, and change the number of days or weeks
-	   shown. */
-	if (new_days_shown > 9) {
-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view),
-					     (new_days_shown + 6) / 7);
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->month_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "monthview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else if (new_days_shown == 7 && starts_on_week_start_day) {
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->week_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "weekview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else {
-		start_year = g_date_year (&new_start_date);
-		start_month = g_date_month (&new_start_date) - 1;
-		start_day = g_date_day (&new_start_date);
-		end_year = g_date_year (&new_end_date);
-		end_month = g_date_month (&new_end_date) - 1;
-		end_day = g_date_day (&new_end_date);
-
-		tm.tm_year = start_year - 1900;
-		tm.tm_mon  = start_month;
-		tm.tm_mday = start_day;
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_start_time = mktime (&tm);
-
-		tm.tm_year = end_year - 1900;
-		tm.tm_mon  = end_month;
-		tm.tm_mday = end_day + 1; /* mktime() will normalize this. */
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_end_time = mktime (&tm);
-
-		e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), new_days_shown);
-		gnome_calendar_set_view (gcal, "dayview", TRUE, FALSE);
-	}
-
-	gnome_calendar_update_view_buttons (gcal);
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-						     GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	tag_calendar_by_client (priv->date_navigator, priv->client);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_style_set (GtkWidget     *widget,
-					    GtkStyle      *previous_style,
-					    gpointer       data)
-{
-	gnome_calendar_update_paned_quanta (GNOME_CALENDAR (data));
-}
-
-
-static void
-gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-
-	priv = gcal->priv;
-
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	/* The EPaned quantum feature works better if we add on the calendar
-	   borders to the quantum size. Otherwise if you shrink the date
-	   navigator you get left with the border widths/heights which looks
-	   bad. EPaned should be more flexible really. */
-	col_width += left_border + right_border;
-	row_height += top_border + bottom_border;
-
-	/* We don't have to use the EPaned quantum feature. We could just let
-	   the calendar expand to fill the allocated space, showing as many
-	   months as will fit. But for that to work nicely the EPaned should
-	   resize the widgets as the bar is dragged. Otherwise the user has
-	   to mess around to get the number of months that they want. */
-#if 1
-	gtk_object_set (GTK_OBJECT (priv->hpane),
-			"quantum", (guint) col_width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (priv->vpane),
-			"quantum", (guint) row_height,
-			NULL);
-#endif
-
-	gnome_calendar_set_pane_positions (gcal);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-						GtkAllocation *allocation,
-						gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gint width, height, row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-	gfloat hpane_pos, vpane_pos;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	if (priv->current_view_type != VIEW_NOT_SET) {
-		e_calendar_get_border_size (priv->date_navigator,
-					    &top_border, &bottom_border,
-					    &left_border, &right_border);
-		gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-				"row_height", &row_height,
-				"column_width", &col_width,
-				NULL);
-
-		/* We subtract one from each dimension since we added 1 in
-		   gnome_calendar_set_view_internal(). */
-		width = allocation->width - 1;
-		height = allocation->height - 1;
-
-		/* We add the border sizes to work around the EPaned
-		   quantized feature. */
-		col_width += left_border + right_border;
-		row_height += top_border + bottom_border;
-
-		hpane_pos = (gfloat) width / col_width;
-		vpane_pos = (gfloat) height / row_height;
-
-		if (priv->current_view_type == VIEW_MONTH
-		    && !priv->range_selected) {
-			priv->hpane_pos_month_view = hpane_pos;
-			priv->vpane_pos_month_view = vpane_pos;
-			calendar_config_set_month_hpane_pos (hpane_pos);
-			calendar_config_set_month_vpane_pos (vpane_pos);
-		} else {
-			priv->hpane_pos = hpane_pos;
-			priv->vpane_pos = vpane_pos;
-			calendar_config_set_hpane_pos (hpane_pos);
-			calendar_config_set_vpane_pos (vpane_pos);
-		}
-	}
-}
-
-void
-gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-				 GtkWidget	*day_button,
-				 GtkWidget	*work_week_button,
-				 GtkWidget	*week_button,
-				 GtkWidget	*month_button)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (day_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (day_button));
-	g_return_if_fail (work_week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (work_week_button));
-	g_return_if_fail (week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (week_button));
-	g_return_if_fail (month_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (month_button));
-
-	priv = gcal->priv;
-
-	priv->day_button = day_button;
-	priv->work_week_button = work_week_button;
-	priv->week_button = week_button;
-	priv->month_button = month_button;
-}
-
-/* This makes the appropriate radio button in the toolbar active.  It blocks the
- * signals so that we can do a clean setup without affecting the views.
- */
-void
-gnome_calendar_update_view_buttons (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page, *button;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		button = priv->day_button;
-	else if (page == priv->work_week_view)
-		button = priv->work_week_button;
-	else if (page == priv->week_view)
-		button = priv->week_button;
-	else if (page == priv->month_view)
-		button = priv->month_button;
-	else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (button) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (button), gcal);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (button), gcal);
-	}
-}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index 5b4f2623b6..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2000 Helix Code, 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 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 GNOME_CALENDAR_APP_H
-#define GNOME_CALENDAR_APP_H
-
-#include <time.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo.h>
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\
-					GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
-
-typedef struct _GnomeCalendar GnomeCalendar;
-typedef struct _GnomeCalendarClass GnomeCalendarClass;
-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;
-
-struct _GnomeCalendar {
-	GtkVBox vbox;
-
-	/* Private data */
-	GnomeCalendarPrivate *priv;
-};
-
-struct _GnomeCalendarClass {
-	GtkVBoxClass parent_class;
-};
-
-
-typedef enum {
-	CALENDAR_OPEN,
-	CALENDAR_OPEN_OR_CREATE
-} GnomeCalendarOpenMode;
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);
-
-gboolean   gnome_calendar_open                  (GnomeCalendar *gcal, char *str_uri);
-/*
-int	   gnome_calendar_create		(GnomeCalendar *gcal,
-						 char *file);
-*/
-void       gnome_calendar_next             	(GnomeCalendar *gcal);
-void       gnome_calendar_previous         	(GnomeCalendar *gcal);
-void       gnome_calendar_goto             	(GnomeCalendar *gcal,
-						 time_t new_time);
-void       gnome_calendar_dayjump          	(GnomeCalendar *gcal,
-						 time_t time);
-/* Jumps to the current day */
-void       gnome_calendar_goto_today            (GnomeCalendar *gcal);
-char      *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
-void	   gnome_calendar_set_view		(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 reset_range_shown,
-						 gboolean	 focus);
-
-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-						   time_t	  start_time,
-						   time_t	  end_time);
-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-						   time_t	 *start_time,
-						   time_t	 *end_time);
-
-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,
-						 CalComponent  *comp);
-
-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Tells the calendar to reload all config settings. initializing should be
-   TRUE when we are setting the config settings for the first time. */
-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-						  gboolean	 initializing);
-
-void	   gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-						 GtkWidget	*day_button,
-						 GtkWidget	*work_week_button,
-						 GtkWidget	*week_button,
-						 GtkWidget	*month_button);
-
-/* This makes the appropriate radio button in the toolbar active.
-   It sets the ignore_view_button_clicks flag so the "clicked" signal handlers
-   just return without doing anything. */
-void	   gnome_calendar_update_view_buttons	(GnomeCalendar	*gcal);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-cal.html b/calendar/gui/gnome-cal.html
deleted file mode 100644
index 5a7d0a537f..0000000000
--- a/calendar/gui/gnome-cal.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Some simple instructions on how to use the help browser -->
-<BODY>
-<!-- <TITLE>GNOME Calendar Documentation</TITLE> -->
-<H2> GNOME Calendar Documentation </H2>
-<p>
-The GNOME calendar program is the calendaring program of the GNOME
-system.  It uses the vCalendar standard for transfering calendar
-information (and is also the on-disk format used). 
-
-<p>
-
-<a name="cmdline">
-<h2>Command line options</h2>
-
-Several options are available on the command line, they are:
-<ul>
-	<li><tt>--events</tt> Displays the events for the date
-	specified (or today, if no date is specified).
-
-	<li><tt>--from DATE</tt> Define the beginning of the range for
-	the event display, or the startup day on the calenday views.
-	By default, the event will span the whole day specified in
-	DATE. 
-
-	<li><tt>--to DATE</tt> Define the range end for the event
-	display.  If this is not specified, it will default to the end
-	of the day specified by the <tt>--from</tt> option.
-
-	<li><tt>--file FILE</tt> Set the calendar to the FILE
-	specified on the command line. 
-
-	<li><tt>--todo</tt> Dumps the to-do values to standard output. 
-</ul>
-
-<p>
-
-DATE is interpreted as being in the local time- zone, unless a
-specific timezone is specified.  Examples of valid date specifications
-include: "1 month ago",  "2 hours ago",  "400000 seconds ago",  "last
-year", "last Monday",  "yesterday",  "a fortnight ago",  "3/31/92
-10:00:07 PST",  "January 23, 1987 10:05pm", "22:00 GMT".
-
-</BODY>
-
diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png
deleted file mode 100644
index e867ba90b2..0000000000
--- a/calendar/gui/gnome-calendar-conduit.png
+++ /dev/null
diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade
deleted file mode 100644
index 289ad7ab69..0000000000
--- a/calendar/gui/goto-dialog.glade
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>preferences</name>
-  <program_name>preferences</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>goto-dialog</name>
-  <visible>False</visible>
-  <title>Go To Date</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Go To Today</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_JUMP_TO</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button5</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox12</name>
-	<homogeneous>True</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>month</name>
-	  <can_focus>True</can_focus>
-	  <items>January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>year</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>True</numeric>
-	  <update_policy>GTK_UPDATE_IF_VALID</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>1969</value>
-	  <lower>1969</lower>
-	  <upper>2038</upper>
-	  <step>1</step>
-	  <page>5</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
deleted file mode 100644
index 9d5b9a43b0..0000000000
--- a/calendar/gui/goto.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Go to date dialog for Evolution
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- */
-
-#include <config.h>
-#include <glade/glade.h>
-#include "calendar-commands.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;
-	CalClient *client;
-	
-	client = gnome_calendar_get_cal_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 tm tm;
-	time_t et;
-	
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-	g_date_to_struct_tm (&start_date, &tm);
-	et = mktime (&tm);
-	
-	gnome_calendar_goto (dlg->gcal, et);
-
-	gnome_dialog_close (GNOME_DIALOG (dlg->dialog));
-}
-
-/* Creates the ecalendar */
-static void
-create_ecal (GoToDialog *dlg)
-{
-	ECalendarItem *calitem;
-	
-	dlg->ecal = E_CALENDAR (e_calendar_new ());
-	calitem = dlg->ecal->calitem;
-	
-	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);
-	
-	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)
-		gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-				    GTK_SIGNAL_FUNC (month_changed), dlg);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dlg->year));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    (GtkSignalFunc) year_changed, dlg);
-
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (ecal_date_range_changed),
-			    dlg);
-	gtk_signal_connect (GTK_OBJECT (dlg->ecal->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) ecal_event,
-			    dlg);
-}
-
-/* Creates a "goto date" dialog and runs it */
-void
-goto_dialog (GnomeCalendar *gcal)
-{
-	GtkWidget *menu;
-	time_t start_time;
-	struct tm tm;
-	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);
-	if (!dlg->xml) {
-		g_message ("goto_dialog(): Could not load the Glade XML file!");
-		return;
-	}
-
-	if (!get_widgets (dlg)) {
-		g_message ("goto_dialog(): Could not find all widgets in the XML file!");
-		return;
-	}
-	dlg->gcal = gcal;
-
-	gnome_calendar_get_selected_time_range (dlg->gcal, &start_time, NULL);
-	tm = *localtime (&start_time);
-	dlg->year_val = tm.tm_year + 1900;
-	dlg->month_val = tm.tm_mon;
-	dlg->day_val = tm.tm_mday;
-
-	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);
-
-	gnome_dialog_set_parent (GNOME_DIALOG (dlg->dialog),
-				 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-
-	b = gnome_dialog_run_and_close (GNOME_DIALOG (dlg->dialog));
-	if (b == 0)
-		goto_today (dlg);
-
-	gtk_object_unref (GTK_OBJECT (dlg->xml));
-	g_free (dlg);
-	dlg = NULL;
-}
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
deleted file mode 100644
index b40c222fc4..0000000000
--- a/calendar/gui/goto.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Evolution calendar - Go To Date dialog
- *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 2000 Helix Code, 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 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 GOTO_DIALOG_H
-#define GOTO_DIALOG_H
-
-#include "gnome-cal.h"
-
-void goto_dialog (GnomeCalendar *gcal);
-
-#endif
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
deleted file mode 100644
index f090f051d6..0000000000
--- a/calendar/gui/itip-utils.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * itip-utils.c
- *
- * Authors:
- *    Jesse Pavel <jpavel@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include "itip-utils.h"
-
-gchar *partstat_values[] = {
-	"Needs action",
-	"Accepted",
-	"Declined",
-	"Tentative",
-	"Delegated",
-	"Completed",
-	"In Progress",
-	"Unknown"
-};
-
-gchar *role_values[] = {
-	"Chair",
-	"Required Participant",
-	"Optional Participant",
-	"Non-Participant",
-	"Other"
-};
-
-
-
-/* Note that I have to iterate and check myself because
-   ical_property_get_xxx_parameter doesn't take into account the
-   kind of parameter for which you wish to search! */
-icalparameter *
-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
-{
-	icalparameter *param;
-
-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
-	     param != NULL && icalparameter_isa (param) != kind;
-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
-
-	return param;
-}
-
-
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
deleted file mode 100644
index a2f825be8b..0000000000
--- a/calendar/gui/itip-utils.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef ITIP_UTILS_HEADER
-#define ITIP_UTILS_HEADER
-
-#include <config.h>
-#include <ical.h>
-#include <string.h>
-#include <glib.h>
-
-extern gchar *partstat_values[];
-extern gchar *role_values[];
-
-icalparameter * get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind);
-
-#endif
diff --git a/calendar/gui/jump.xpm b/calendar/gui/jump.xpm
deleted file mode 100644
index d974142d9a..0000000000
--- a/calendar/gui/jump.xpm
+++ /dev/null
@@ -1,14 +0,0 @@
-/* XPM */
-static char * jump_xpm[] = {
-"16 8 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"................",
-".++++++++++++++.",
-".++++++++++++++.",
-".++..++..++..++.",
-".++..++..++..++.",
-".++++++++++++++.",
-".++++++++++++++.",
-"................"};
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index 2060934fa2..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <gal/widgets/e-cursors.h>
-
-#include "alarm-notify/alarm.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "component-factory.h"
-#include "control-factory.h"
-#include "e-itip-control.h"
-#include "tasks-control-factory.h"
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (gnome_init_with_popt_table ("evolution-calendar", VERSION, argc, argv,
-					oaf_popt_options, 0, NULL) != 0)
-		g_error (_("Could not initialize GNOME"));
-
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain(PACKAGE);
-
-	init_bonobo (argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-#if 0
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-#endif
-
-	control_factory_init ();
-	component_factory_init ();
-	e_itip_control_factory_init ();
-	tasks_control_factory_init ();
-
-	bonobo_main ();
-
-	alarm_done ();
-	calendar_config_write_on_exit ();
-
-	return 0;
-}
diff --git a/calendar/gui/popup-menu.c b/calendar/gui/popup-menu.c
deleted file mode 100644
index 550fede0f3..0000000000
--- a/calendar/gui/popup-menu.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#include <config.h>
-#include <gtk/gtkmenuitem.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "popup-menu.h"
-
-
-void
-popup_menu (struct menu_item *items, int nitems, GdkEventButton *event)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));
-
-	for (i = 0; i < nitems; i++) {
-		if (items[i].text) {
-			item = gtk_menu_item_new_with_label (_(items[i].text));
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    items[i].callback,
-					    items[i].data);
-			gtk_widget_set_sensitive (item, items[i].sensitive);
-		} else
-			item = gtk_menu_item_new ();
-
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
-}
diff --git a/calendar/gui/popup-menu.h b/calendar/gui/popup-menu.h
deleted file mode 100644
index a4590dbb98..0000000000
--- a/calendar/gui/popup-menu.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#ifndef POPUP_MENU_H
-#define POPUP_MENU_H
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtksignal.h>
-
-
-struct menu_item {
-	char *text;
-	GtkSignalFunc callback;
-	gpointer data;
-	int sensitive;
-};
-
-void popup_menu (struct menu_item *items, int nitems, GdkEventButton *event);
-
-
-#endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index 9d5b5f891d..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,1322 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <math.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-copies.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-preview.h>
-#include <libgnomeprint/gnome-printer-dialog.h>
-#include <e-util/e-dialog-widgets.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "gnome-cal.h"
-#include "print.h"
-
-
-
-/* copied from gnome-month-item.c  this should be shared?? */
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the
- * Gregorian reformation.
- */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#define REFORMATION_DAY 639787		/* First day of the reformation, counted from 1 Jan 1 */
-#define MISSING_DAYS 11			/* They corrected out 11 days */
-#define THURSDAY 4			/* First day of reformation */
-#define SATURDAY 6			/* Offset value; 1 Jan 1 was a Saturday */
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-/* FIXME: This needs to be able to render using all the options from the new
- * calendar configuration stuff.
- */
-#define WEEK_STARTS_ON_MONDAY FALSE
-
-struct pdinfo
-{
-	GList *slots;
-};
-
-struct psinfo
-{
-	GList *events;
-};
-
-struct ptinfo
-{
-	GList *todos;
-};
-
-struct einfo
-{
-	char *text;
-	time_t start;
-	time_t end;
-	int count;
-};
-
-
-/* Returns the number of leap years since year 1 up to (but not including) the specified year */
-static int
-leap_years_up_to (int year)
-{
-	return (year / 4					/* trivial leapness */
-		- ((year > 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */
-		+ ((year > 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */
-}
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-/* Returns the 1-based day number within the year of the specified date */
-static int
-day_in_year (int day, int month, int year)
-{
-	int is_leap, i;
-
-	is_leap = is_leap_year (year);
-
-	for (i = 0; i < month; i++)
-		day += days_in_month [is_leap][i];
-
-	return day;
-}
-
-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days
- * that were removed on the Gregorian reformation, it returns Thursday.
- */
-static int
-day_in_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + leap_years_up_to (year - 1) + day_in_year (day, month, year);
-
-	if (n < REFORMATION_DAY)
-		return (n - 1 + SATURDAY) % 7;
-
-	if (n >= (REFORMATION_DAY + MISSING_DAYS))
-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;
-
-	return THURSDAY;
-}
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int start_on_monday, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = days_in_month[is_leap_year (year)][month];
-	d_week = day_in_week (1, month, year);
-
-	if (start_on_monday)
-		d_week = (d_week + 6) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-
-enum align_box {
-	ALIGN_LEFT=1,
-	ALIGN_RIGHT,
-	ALIGN_CENTRE,
-	ALIGN_BORDER= 1<<8
-};
-
-/* width = width of border, -'ve is no border
-   fillcolour = shade of fill, -'ve is no fill */
-static void
-print_border(GnomePrintContext *pc, double l, double r, double t, double b, double width, double fillcolour)
-{
-	int i;
-	gnome_print_gsave (pc);
-	if (fillcolour<0.0)
-		i=1;
-	else
-		i=0;
-	for (;i<2;i++) {
-		gnome_print_moveto(pc, l, t);
-		gnome_print_lineto(pc, l, b);
-		gnome_print_lineto(pc, r, b);
-		gnome_print_lineto(pc, r, t);
-		gnome_print_lineto(pc, l, t);
-		if (i==0) {
-			gnome_print_setrgbcolor(pc, fillcolour, fillcolour, fillcolour);
-			gnome_print_fill(pc);
-			if (width<0.0)
-				i=2;
-		} else {
-			gnome_print_setrgbcolor(pc, 0, 0, 0);
-			gnome_print_setlinewidth(pc, width);
-			gnome_print_stroke(pc);
-		}
-	}
-	gnome_print_grestore (pc);
-}
-
-/* outputs 1 line of aligned text in a box */
-static void
-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	double w, x;
-	gnome_print_gsave (pc);
-	w = gnome_font_get_width_string(font, text);
-	switch (align&3) {
-	default:
-	case ALIGN_LEFT:
-		x = l;
-		break;
-	case ALIGN_RIGHT:
-		x = l+(r-l)-w-2;
-		break;
-	case ALIGN_CENTRE:
-		x = l+((r-l)-w)/2;
-		break;
-	}
-	gnome_print_moveto(pc, x, t - gnome_font_get_size (font));
-	gnome_print_setfont(pc, font);
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	gnome_print_show(pc, text);
-	gnome_print_grestore (pc);
-}
-
-/* gets/frees the font for you, as a bold font */
-static void
-print_text_size(GnomePrintContext *pc, double size, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-	print_text(pc, font, text, align, l, r, t, b);
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-static void
-titled_box(GnomePrintContext *pc, const char *text, GnomeFont *font, enum align_box align, double *l, double *r, double *t, double *b, double linewidth)
-{
-	if (align&ALIGN_BORDER) {
-		gnome_print_gsave(pc);
-		print_border(pc, *l, *r, *t, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, linewidth, 0.9);
-		print_border(pc, *l, *r, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, *b, linewidth, -1.0);
-		gnome_print_grestore(pc);
-		*l+=2;
-		*r-=2;
-		*b+=2;
-	}
-	print_text(pc, font, text, align, *l, *r, *t, *b);
-	*t-=gnome_font_get_size(font)*1.4;
-}
-
-enum datefmt {
-	DATE_MONTH	= 1 << 0,
-	DATE_DAY	= 1 << 1,
-	DATE_DAYNAME	= 1 << 2,
-	DATE_YEAR	= 1 << 3
-};
-
-static char *days[] = {
-	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
-	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
-	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
-	N_("16th"), N_("17th"), N_("18th"), N_("19th"), N_("20th"),
-	N_("21st"), N_("22nd"), N_("23rd"), N_("24th"), N_("25th"),
-	N_("26th"), N_("27th"), N_("28th"), N_("29th"),	N_("30th"),
-	N_("31st")
-};
-
-/*
-  format the date 'nicely' and consistently for various headers
-*/
-static char *
-format_date(time_t time, int flags, char *buffer, int bufflen)
-{
-	char fmt[64];
-	struct tm tm;
-
-	tm = *localtime(&time);
-	fmt[0] = 0;
-	if (flags & DATE_DAYNAME) {
-		strcat(fmt, "%A");
-	}
-	if (flags & DATE_DAY) {
-		if (flags & DATE_DAYNAME)
-			strcat(fmt, " ");
-		strcat(fmt, gettext(days[tm.tm_mday-1]));
-	}
-	if (flags & DATE_MONTH) {
-		if (flags & (DATE_DAY|DATE_DAYNAME))
-			strcat(fmt, " ");
-		strcat(fmt, "%B");
-		if ((flags & (DATE_DAY|DATE_YEAR)) == (DATE_DAY|DATE_YEAR))
-			strcat(fmt, ",");
-	}
-	if (flags & DATE_YEAR) {
-		if (flags & (DATE_DAY|DATE_DAYNAME|DATE_MONTH))
-			strcat(fmt, " ");
-		strcat(fmt, "%Y");
-	}
-	strftime(buffer, bufflen, fmt, &tm);
-	return buffer;
-}
-
-
-/*
-  print out the month small, embolden any days with events.
-*/
-static void
-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal,
-		   time_t month, double left, double right, double top, double bottom,
-		   int titleflags, time_t greystart, time_t greyend, int bordertitle)
-{
-	CalClient *client;
-	GnomeFont *font, *font_bold, *font_normal;
-	time_t now, next;
-	int x, y;
-	int days[42];
-	int day;
-	char buf[100];
-	struct tm tm;
-	double xpad, ypad, size;
-	char *daynames[] = { _("Su"), _("Mo"), _("Tu"), _("We"), _("Th"), _("Fr"), _("Sa") };
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	xpad = (right-left)/7;
-	ypad = (top-bottom)/8.3;
-	if (xpad>ypad)
-		size=ypad;
-	else
-		size=xpad;
-
-	size = (xpad+ypad)/3.0;
-
-        tm = *localtime (&month);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, WEEK_STARTS_ON_MONDAY, days, 0, 0);
-
-	/* build day-busy bits */
-	now = time_month_begin(month);
-
-	/* get title */
-	format_date(month, titleflags, buf, 100);
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 1, size*1.2); /* title font */
-	if (bordertitle)
-		print_border(pc,
-			     left, left+7*xpad, top, top-gnome_font_get_size(font)*1.3,
-			     1.0, 0.9);
-	print_text(pc, font, buf, ALIGN_CENTRE,
-		   left, left+7*xpad, top, top - gnome_font_get_size (font));
-	gtk_object_unref (GTK_OBJECT (font));
-
-	font_normal = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-	font_bold = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	for (x=0;x<7;x++) {
-		print_text(pc, font_bold, daynames[(WEEK_STARTS_ON_MONDAY?x+1:x)%7], ALIGN_CENTRE,
-			   left+x*xpad, left+(x+1)*xpad, bottom+7*ypad, bottom+7*ypad-gnome_font_get_size(font_bold));
-	}
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				GList *uids;
-
-				sprintf(buf, "%d", day);
-
-				/* this is a slow messy way to do this ... but easy ... */
-				uids = cal_client_get_objects_in_range (client,
-									CALOBJ_TYPE_EVENT,
-									now, time_day_end (now));
-				font = uids ? font_bold : font_normal;
-				cal_obj_uid_list_free (uids);
-
-				next = time_add_day(now, 1);
-				if ((now>=greystart && now<greyend)
-				    || (greystart>=now && greystart<next)) {
-					print_border(pc,
-						     left+x*xpad+xpad*0.1,
-						     left+(x+1)*xpad+xpad*0.1,
-						     bottom+(5-y)*ypad+gnome_font_get_size(font)-ypad*0.15,
-						     bottom+(5-y)*ypad-ypad*0.15,
-						     -1.0, 0.75);
-				}
-				print_text(pc, font, buf, ALIGN_RIGHT,
-					   left+x*xpad, left+(x+1)*xpad, bottom+(5-y)*ypad+gnome_font_get_size(font), bottom+(5-y)*ypad);
-				now = next;
-			}
-		}
-	}
-	gtk_object_unref (GTK_OBJECT (font_normal));
-	gtk_object_unref (GTK_OBJECT (font_bold));
-}
-
-
-
-/* wraps text into the print context, not taking up more than its allowed space */
-static double
-bound_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
-	   double left, double right, double top, double bottom, double indent)
-{
-	double maxwidth = right-left;
-	double width;
-	const char *p;
-	char *wordstart;
-	int c;
-	char *outbuffer, *o, *outbuffendmarker;
-	int outbufflen;
-	int dump=0;
-	int first=1;
-
-	g_return_val_if_fail(text!=NULL, top);
-
-	if (top<bottom) {
-		/* too much to fit in appointment printout */
-		return top;
-	}
-
-	outbufflen = 1024;
-	outbuffer = g_malloc(outbufflen);
-	outbuffendmarker = outbuffer+outbufflen-2;
-
-	top -= gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	width=0;
-	p = text;
-	wordstart = outbuffer;
-	o = outbuffer;
-	while ((c=*p)) {
-		if (c=='\n') {
-			wordstart=o;
-			dump=1;
-		} else {
-			/* grow output buffer if required */
-			if (o>=outbuffendmarker) {
-				char *newbuf;
-				outbufflen*=2;
-				newbuf = g_realloc(outbuffer, outbufflen);
-				o = newbuf+(o-outbuffer);
-				wordstart = newbuf+(o-outbuffer);
-				outbuffer = newbuf;
-				outbuffendmarker = outbuffer+outbufflen-2;
-			}
-			*o++=c;
-			if (c==' ')
-				wordstart = o;
-			width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));
-			if (width>maxwidth)
-				dump=1;
-			else
-				dump=0;
-		}
-		if (dump) {
-			if (wordstart==outbuffer)
-				wordstart=o;
-			c=*wordstart;
-			*wordstart=0;
-			gnome_print_moveto(pc, left, top);
-			gnome_print_show(pc, outbuffer);
-			*wordstart=c;
-			memcpy(outbuffer, wordstart, o-wordstart);
-			width = gnome_font_get_width_string_n(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
-	return top;
-}
-
-/*
- * Print Day Details
- */
-static gboolean
-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	GList *l, *col = NULL;
-	struct pdinfo *pdi = (struct pdinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	for (l = pdi->slots; l; l = l->next) {
-		struct einfo *testei;
-
-		col = (GList *)l->data;
-		testei = (struct einfo *)col->data;
-
-		if (ei->start >= testei->end) {
-			col = g_list_prepend (col, ei);
-			l->data = col;
-			return TRUE;
-		}
-
-		testei->count++;
-		ei->count++;
-	}
-
-	col = NULL;
-	col = g_list_prepend (col, ei);
-	pdi->slots = g_list_append (pdi->slots, col);
-
-	return TRUE;
-}
-
-static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	struct pdinfo pdi;
-	time_t start, end;
-	GList *l;
-	int num_slots, i;
-	GnomeFont *font_hour, *font_minute, *font_summary;
-	double yinc, y, yend, x, xend;
-	double width=40, slot_width;
-	char buf[20];
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	yinc = (top-bottom)/24;
-
-	/* fill static detail */
-	font_hour = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/2);
-	font_minute = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/3);
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, yinc/3);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-	/* internal lines */
-	gnome_print_setlinewidth(pc, 0.0);
-	gnome_print_moveto(pc, left+width, bottom);
-	gnome_print_lineto(pc, left+width, top);
-	gnome_print_stroke (pc);
-
-	for (i=0;i<24;i++) {
-		y = top - yinc*(i+1);
-		print_border(pc, left+1, left+width-1, y, y+yinc-1, -1.0, 0.9);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-		/* the hour label/minute */
-		sprintf(buf, "%d", i);
-		print_text(pc, font_hour, buf, ALIGN_RIGHT, left, left+width/2, y+yinc, y);
-		switch(i) {
-		case 12: sprintf(buf, _("pm")); break;
-		case 0: sprintf(buf, _("am")); break;
-		default: sprintf(buf, "00"); break;
-		}
-		print_text(pc, font_minute, buf, ALIGN_LEFT, left+width/2, left+width/2, y+yinc, y);
-
-		/* internal lines */
-		gnome_print_moveto(pc, left+width, y);
-		gnome_print_lineto(pc, right, y);
-		gnome_print_stroke (pc);
-		gnome_print_moveto(pc, left+width/2, y+yinc/2);
-		gnome_print_lineto(pc, right, y+yinc/2);
-		gnome_print_stroke (pc);
-
-	}
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	pdi.slots = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_details_cb, &pdi);
-
-	num_slots = g_list_length (pdi.slots);
-	slot_width = (right-left-width)/num_slots;
-
-	for (i = num_slots, l = pdi.slots; l; i--, l = l->next) {
-		GList *e = (GList *)l->data;
-
-		for (; e; e = e->next) {
-			struct einfo *ei = (struct einfo *)e->data;
-
-			y = top - (top - bottom) * (ei->start - start) / (end - start) - 1;
-			yend = top - (top - bottom) * (ei->end - start) / (end - start) + 1;
-			x = left + width + slot_width * (num_slots - i);
-
-			if (num_slots > 0)
-				x++;
-
-			if (i == 0)
-				xend = x + (num_slots - ei->count) * slot_width - 2;
-			else
-				xend = x + slot_width - 2;
-
-			print_border (pc, x, xend, y, yend, 0.0, 0.9);
-
-			bound_text (pc, font_summary, ei->text, x, xend, y, yend, 0);
-
-			g_free (ei);
-		}
-		g_list_free (e);
-	}
-	g_list_free (pdi.slots);
-
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
-
-	gtk_object_unref (GTK_OBJECT (font_hour));
-	gtk_object_unref (GTK_OBJECT (font_minute));
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-/*
- * Print Day Summary
- */
-#if 0
-#define TIME_FMT "%X"
-#else
-#define TIME_FMT "%l:%M%p"
-#endif
-
-static gboolean
-print_day_summary_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	struct psinfo *psi = (struct psinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	psi->events = g_list_append (psi->events, ei);
-
-	return TRUE;
-}
-
-static void
-print_day_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom,
-		   double size, int totime, int titleformat)
-{
-	CalClient *client;
-	struct psinfo psi;
-	time_t start, end;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend, inc, incsmall;
-	char buf[100];
-	double margin;
-	struct tm tm;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	/* fill static detail */
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-
-	gnome_print_setfont (pc, font_summary);
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	tm = *localtime(&start);
-
-	format_date(start, titleformat, buf, 100);
-	titled_box (pc, buf, font_summary, ALIGN_RIGHT | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 0.0);
-
-	psi.events = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_summary_cb, &psi);
-	inc = size*0.3;
-	incsmall = size*0.2;
-
-	y = top-inc;
-	yend = bottom-incsmall;
-
-	/* do a good rough approximation of the 'widest' time */
-	tm.tm_year = 2000;
-	tm.tm_mon = 12;
-	tm.tm_mday = 22;
-	tm.tm_sec = 22;
-	tm.tm_min = 22;
-	tm.tm_hour = 23;
-	strftime(buf, 100, TIME_FMT, &tm);
-	margin = gnome_font_get_width_string(font_summary, buf);
-
-	for (l = psi.events; l; l = l->next) {
-		struct einfo *ei = (struct einfo *)l->data;
-
-		x = left + incsmall;
-		xend = right - inc;
-
-		if (y - gnome_font_get_size (font_summary) < bottom)
-			break;
-
-		tm = *localtime (&ei->start);
-		strftime (buf, 100, TIME_FMT, &tm);
-		gnome_print_moveto (pc, x + (margin
-					     - gnome_font_get_width_string (font_summary, buf)),
-				    y - gnome_font_get_size (font_summary));
-		gnome_print_show (pc, buf);
-
-		if (totime) {
-			tm = *localtime (&ei->end);
-			strftime (buf, 100, TIME_FMT, &tm);
-			gnome_print_moveto (pc,
-					    (x + margin + inc
-					     + (margin
-						- gnome_font_get_width_string (font_summary, buf))),
-					    y - gnome_font_get_size (font_summary));
-			gnome_print_show (pc, buf);
-
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin * 2 + inc * 2, xend,
-					y, yend, 0);
-		} else {
-			/* we also indent back after each time is printed */
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin + inc, xend,
-					y, yend, -margin + inc);
-		}
-
-		y += gnome_font_get_size (font_summary) - inc;
-
-		g_free (ei);
-	}
-	g_list_free (psi.events);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom)
-{
-	double y, l, r, t, b;
-	time_t now;
-	int i;
-
-	l = left;
-	r = (right-left)/2+left;
-	t = top;
-	y = (top-bottom)/3;
-	b = top-y;
-	now = time_week_begin(whence); /* returns sunday, we need monday */
-	now = time_add_day(now, 1);
-	for (i = 0; i < 7; i++) {
-		print_day_summary (pc, gcal, now, l, r, t, b,
-				   10, TRUE, DATE_DAY | DATE_DAYNAME | DATE_MONTH);
-		now = time_add_day (now, 1);
-		switch (i) {
-		case 5:
-			y /= 2.0;
-			b += y;
-		case 0:
-		case 1:
-		case 3:
-		case 4:
-			t -= y;
-			b -= y;
-			break;
-		case 2:
-			l = r;
-			r = right;
-			t = top;
-			b = t-y;
-			break;
-		case 6:
-			break;
-		}
-	}
-}
-
-static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom, int morerows)
-{
-	double y, x, l, r, t, b;
-	time_t now;
-	int xx, yy, rows, cols;
-
-	l = left;
-	t = top;
-	if (morerows) {
-		rows=4;
-		cols=3;
-	} else {
-		rows=3;
-		cols=4;
-	}
-	y = (top-bottom)/rows;
-	x = (right-left)/cols;
-	r = l+x;
-	b = top-y;
-	now = time_year_begin(whence);
-	for (yy = 0; yy < rows; yy++) {
-		t = top - y * yy;
-		b = t - y;
-		for (xx = 0; xx < cols; xx++) {
-			l = left + x * xx;
-			r = l + x;
-			print_month_small (pc, gcal, now,
-					   l + 8, r - 8, t - 8, b + 8, DATE_MONTH, 0, 0, TRUE);
-			now = time_add_month (now, 1);
-		}
-	}
-}
-
-static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		     double left, double right, double top, double bottom)
-{
-	time_t now, today;
-	int days[42];
-	int day;
-	struct tm tm;
-	int x, y;
-	char buf[100];
-	GnomeFont *font_days;
-
-	now = time_month_begin(whence);
-        tm = *localtime (&now);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, WEEK_STARTS_ON_MONDAY, days, 0, 0);
-
-	/* a little margin */
-	top -= 4;
-
-	/* do day names ... */
-	font_days = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 10);
-	gnome_print_setfont(pc, font_days);
-	for (x=0;x<7;x++) {
-		today = time_add_day(now, days[6+x]);
-		format_date(today, DATE_DAYNAME, buf, 100);
-		print_text(pc, font_days, buf, ALIGN_CENTRE,
-			   (right-left)*x/7+left, (right-left)*(x+1)/7+left,
-			   top, top-gnome_font_get_size(font_days));
-	}
-	top -= gnome_font_get_size(font_days)*1.5;
-	gtk_object_unref (GTK_OBJECT (font_days));
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				print_day_summary (pc, gcal, now,
-						   (right-left)*x/7+left,
-						   (right-left)*(x+1)/7+left,
-						   top - (top-bottom)*y/6,
-						   top - (top-bottom)*(y+1)/6, 6, FALSE,
-						   day==1?(DATE_DAY|DATE_MONTH):DATE_DAY);
-				now = time_add_day(now, 1);
-			}
-		}
-	}
-}
-
-static void
-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t start, time_t end,
-		    double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, 10);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, _("Tasks"), font_summary,
-		    ALIGN_CENTRE | ALIGN_BORDER, &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_TODO);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-		CalComponentText summary;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing: the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("print_todo_details(): Syntax error while getting object `%s'",
-				   uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		cal_component_get_summary (comp, &summary);
-
-		if (!summary.value)
-			continue;
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		y = bound_text (pc, font_summary, summary.value, x + 2, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary);
-		gnome_print_moveto (pc, x, y - 3);
-		gnome_print_lineto (pc, xend, y - 3);
-		gnome_print_stroke (pc);
-		y -= 3;
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-#if 0
-
-static GnomePrintContext *
-print_context (int preview, char *paper)
-{
-	GtkWidget *toplevel, *canvas, *sw;
-	GnomePrinter *printer;
-	GnomePrintContext *pc;
-
-	if (preview) {
-		gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-		gtk_widget_push_visual (gdk_rgb_get_visual ());
-
-		toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_widget_set_usize (toplevel, 700, 700);
-		sw = gtk_scrolled_window_new (NULL, NULL);
-		canvas = gnome_canvas_new_aa ();
-		gtk_container_add (GTK_CONTAINER (toplevel), sw);
-		gtk_container_add (GTK_CONTAINER (sw), canvas);
-
-		gnome_canvas_set_pixels_per_unit((GnomeCanvas *)canvas, 1);
-
-		pc = gnome_print_preview_new ((GnomeCanvas *)canvas, paper);
-
-		gtk_widget_show_all (toplevel);
-
-		gtk_widget_pop_visual ();
-		gtk_widget_pop_colormap ();
-	} else {
-		printer = gnome_printer_dialog_new_modal ();
-
-		if (!printer)
-			return NULL;
-
-		pc = gnome_print_context_new_with_paper_size (printer, paper);
-	}
-
-	return pc;
-}
-
-#endif
-
-/* Value for the PrintView enum */
-static const int print_view_map[] = {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR,
-	-1
-};
-
-/* Creates the range selector widget for printing a calendar */
-static GtkWidget *
-range_selector_new (GtkWidget *dialog, time_t at, int *view)
-{
-	GtkWidget *box;
-	GtkWidget *radio;
-	GSList *group;
-	char text[1024];
-	char str1[512];
-	char str2[512];
-	struct tm tm;
-	time_t week_begin, week_end;
-	struct tm week_begin_tm, week_end_tm;
-
-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-
-	tm = *localtime (&at);
-
-	/* Day */
-
-	strftime (text, sizeof (text), _("Current day (%a %b %d %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (NULL, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Week */
-
-	week_begin = time_week_begin (at);
-	week_end = time_add_day (time_week_end (at), -1);
-
-	week_begin_tm = *localtime (&week_begin);
-	week_end_tm = *localtime (&week_end);
-
-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {
-		strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-		strftime (str2, sizeof (str2), _("%a %d %Y"), &week_end_tm);
-	} else {
-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {
-			strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		} else {
-			strftime (str1, sizeof (str1), _("%a %b %d %Y"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		}
-	}
-
-	g_snprintf (text, sizeof (text), _("Current week (%s - %s)"), str1, str2);
-
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Month */
-
-	strftime (text, sizeof (text), _("Current month (%b %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Year */
-
-	strftime (text, sizeof (text), _("Current year (%Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Select default */
-
-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);
-
-	gtk_widget_show_all (box);
-	return box;
-}
-
-void
-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view)
-{
-	GnomePrinter *printer;
-	GnomePrintMaster *gpm;
-	GnomePrintContext *pc;
-	int copies, collate;
-	const GnomePaper *paper_info;
-	double l, r, t, b, todo, header;
-	char buf[100];
-	time_t when;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	printer = NULL;
-	copies = 1;
-	collate = FALSE;
-
-	if (!preview) {
-		GtkWidget *gpd;
-		GtkWidget *range;
-		int view;
-
-		gpd = gnome_print_dialog_new (_("Print Calendar"),
-					      GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-
-		view = (int) default_view;
-		range = range_selector_new (gpd, at, &view);
-		gnome_print_dialog_construct_range_custom (GNOME_PRINT_DIALOG (gpd), range);
-
-		gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);
-
-		/* Run dialog */
-
-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {
-		case GNOME_PRINT_PRINT:
-			break;
-
-		case GNOME_PRINT_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gnome_dialog_close (GNOME_DIALOG (gpd));
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-		default_view = (PrintView) view;
-
-		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd), &copies, &collate);
-		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));
-
-		gnome_dialog_close (GNOME_DIALOG (gpd));
-	}
-
-	/* FIXME: allow configuration of paper size */
-
-	gpm = gnome_print_master_new ();
-
-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());
-	gnome_print_master_set_paper (gpm, paper_info);
-
-	if (printer)
-		gnome_print_master_set_printer (gpm, printer);
-
-	gnome_print_master_set_copies (gpm, copies, collate);
-
-	pc = gnome_print_master_get_context (gpm);
-
-	l = gnome_paper_lmargin (paper_info);
-	r = gnome_paper_pswidth (paper_info) - gnome_paper_rmargin (paper_info);
-	t = gnome_paper_psheight (paper_info) - gnome_paper_tmargin (paper_info);
-	b = gnome_paper_bmargin (paper_info);
-
-	/* depending on the view, do a different output */
-	switch (default_view) {
-	case PRINT_VIEW_DAY: {
-		int i, days = 1;
-
-		for (i = 0; i < days; i++) {
-			todo = ((r - l) / 5) * 4 + l;
-			header = t - 70;
-			print_todo_details (pc, gcal, 0, INT_MAX, todo, r, header, b);
-			print_day_details (pc, gcal, at, l, todo - 2.0, header, b);
-
-			print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-			print_month_small (pc, gcal, at, r - 190, r - 104, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, at, at, FALSE);
-			print_month_small (pc, gcal, time_add_month (at, 1), r - 90, r - 4, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-			format_date (at, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-			print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, todo, t - 3, header);
-
-			format_date (at, DATE_DAYNAME, buf, 100);
-			print_text_size (pc, 18, buf, ALIGN_LEFT, l + 3, todo, t - 27 - 4, header);
-			gnome_print_showpage (pc);
-			at = time_add_day (at, 1);
-		}
-		break;
-	}
-
-	case PRINT_VIEW_WEEK:
-		header = t - 70;
-		print_week_summary (pc, gcal, at, l, r, header, b);
-
-		/* more solid total outline */
-		print_border (pc, l, r, header, b, 1.0, -1.0);
-
-		/* header border */
-		print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-		when = time_week_begin (at);
-		when = time_add_day (when, 1);
-
-		print_month_small (pc, gcal, at, r - 90, r - 4, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1), r - 190, r - 104, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 4, header);
-
-		when = time_add_day (when, 6);
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 24 - 3, header);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_MONTH:
-		header = t - 70;
-		gnome_print_rotate (pc, 90);
-		gnome_print_translate (pc, 0, -gnome_paper_pswidth (paper_info));
-		/*print_month_summary(pc, cal, at, l, r, header, b);*/
-		print_month_summary (pc, gcal, at, b, t, r - 70, l);
-
-		print_border (pc, b, t, r, r - 72.0, 1.0, 0.9);
-
-		print_month_small (pc, gcal, time_add_month (at, 1),
-				   t - (t - b) / 7 + 2, t - 8, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1),
-				   b + 8, b + (t - b) / 7 - 2, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-		/* centered title */
-		format_date (at, DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_CENTRE, b + 3, t, r - 3, l);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_YEAR:
-#if 0
-		/* landscape */
-		gnome_print_rotate(pc, 90);
-		gnome_print_translate(pc, 0, -gnome_paper_pswidth(paper_info));
-		print_year_summary(pc, gcal, at, b, t, r-50, l, FALSE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, b+3, t, r-3, l);
-#else
-		/* portrait */
-		print_year_summary(pc, gcal, at, l, r, t-50, b, TRUE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, l+3, r, t-3, b);
-#endif
-		gnome_print_showpage(pc);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gnome_print_master_close (gpm);
-
-	if (preview) {
-		GnomePrintMasterPreview *gpmp;
-
-		gpmp = gnome_print_master_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (GTK_WIDGET (gpmp));
-	} else
-		gnome_print_master_print (gpm);
-
-	gtk_object_unref (GTK_OBJECT (gpm));
-}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
deleted file mode 100644
index e88c4a8e01..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef PRINT_H
-#define PRINT_H
-
-#include "gnome-cal.h"
-
-
-
-typedef enum {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR
-} PrintView;
-
-void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);
-
-
-
-#endif
diff --git a/calendar/gui/recur.xpm b/calendar/gui/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/calendar/gui/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
deleted file mode 100644
index 12cc264f1c..0000000000
--- a/calendar/gui/tag-calendar.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Damon Chaplin <damon@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <cal-util/timeutil.h>
-#include "tag-calendar.h"
-
-
-
-struct calendar_tag_closure {
-	ECalendarItem *calitem;
-	time_t start_time;
-	time_t end_time;
-};
-
-/* 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)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct tm start_tm = { 0 }, end_tm = { 0 };
-
-	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_tm.tm_year = start_year - 1900;
-	start_tm.tm_mon = start_month;
-	start_tm.tm_mday = start_day;
-	start_tm.tm_hour = 0;
-	start_tm.tm_min = 0;
-	start_tm.tm_sec = 0;
-	start_tm.tm_isdst = -1;
-
-	end_tm.tm_year = end_year - 1900;
-	end_tm.tm_mon = end_month;
-	end_tm.tm_mday = end_day + 1;
-	end_tm.tm_hour = 0;
-	end_tm.tm_min = 0;
-	end_tm.tm_sec = 0;
-	end_tm.tm_isdst = -1;
-
-	c->calitem = ecal->calitem;
-	c->start_time = mktime (&start_tm);
-	c->end_time = mktime (&end_tm);
-
-	return TRUE;
-}
-
-/* Marks the specified range in an ECalendar; called from cal_client_generate_instances() */
-static gboolean
-tag_calendar_cb (CalComponent *comp,
-		 time_t istart,
-		 time_t iend,
-		 gpointer data)
-{
-	struct calendar_tag_closure *c = data;
-	time_t t;
-
-	t = time_day_begin (istart);
-
-	do {
-		struct tm tm;
-
-		tm = *localtime (&t);
-
-		e_calendar_item_mark_day (c->calitem, tm.tm_year + 1900,
-					  tm.tm_mon, tm.tm_mday,
-					  E_CALENDAR_ITEM_MARK_BOLD);
-
-		t = time_day_end (t);
-	} while (t < iend);
-
-	return TRUE;
-}
-
-/**
- * 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, CalClient *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 (IS_CAL_CLIENT (client));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)
-		return;
-
-	if (!prepare_tag (ecal, &c))
-		return;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT,
-				       c.start_time, c.end_time,
-				       tag_calendar_cb, &c);
-}
-
-/**
- * tag_calendar_by_comp:
- * @ecal: Calendar widget to tag.
- * @comp: A calendar component object.
- * 
- * Tags an #ECalendar widget with any occurrences of a specific calendar
- * component that occur within the calendar's current time range.
- **/
-void
-tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp)
-{
-	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 (IS_CAL_COMPONENT (comp));
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	if (!prepare_tag (ecal, &c))
-		return;
-
-#if 0
-	g_print ("DateNavigator generating instances\n");
-#endif
-	cal_recur_generate_instances (comp, c.start_time, c.end_time, tag_calendar_cb, &c);
-}
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
deleted file mode 100644
index 970035b03c..0000000000
--- a/calendar/gui/tag-calendar.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Evolution calendar - Utilities for tagging ECalendar widgets
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Damon Chaplin <damon@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef TAG_CALENDAR_H
-#define TAG_CALENDAR_H
-
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-void tag_calendar_by_client (ECalendar *ecal, CalClient *client);
-void tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp);
-
-#endif
diff --git a/calendar/gui/task-assigned-to.xpm b/calendar/gui/task-assigned-to.xpm
deleted file mode 100644
index d60eeafa2d..0000000000
--- a/calendar/gui/task-assigned-to.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_to_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #ABCCAB",
-"*	c #768E76",
-"=	c #5E705E",
-"-	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#######..$.  ",
-" .+%%%%%%%.&..  ",
-" .+##......&&.  ",
-" .+%%.&&&&&&&&. ",
-" .+##.&*&*&*&*&.",
-" .+%%.========. ",
-" .+##......==.  ",
-" .+%%%%%%%.=..  ",
-" .-$$$$$$$..$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-assigned.xpm b/calendar/gui/task-assigned.xpm
deleted file mode 100644
index 9b245c0c49..0000000000
--- a/calendar/gui/task-assigned.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #FFCC66",
-"*	c #CC9933",
-"=	c #996600",
-"-	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+##..#####$.  ",
-" .+%%.&.%%%%$.  ",
-"......&&.###$.  ",
-".&&&&&&&&.%%$.  ",
-".&*&*&*&*&.#$.  ",
-".========.%%$.  ",
-"......==.###$.  ",
-" .+%%.=.%%%%$.  ",
-" .-$$..$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-recurring.xpm b/calendar/gui/task-recurring.xpm
deleted file mode 100644
index 634cd87a84..0000000000
--- a/calendar/gui/task-recurring.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * task_recurring_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #BFBFC3",
-"*	c #A2A2B0",
-"=	c #454572",
-"-	c #9898A9",
-";	c #85859C",
-">	c #333366",
-",	c #4F4F79",
-"'	c #B3B3C3",
-")	c #A3A3B7",
-"!	c #9696AD",
-"~	c #464672",
-"{	c #7F7F99",
-"]	c #C9C9CA",
-"^	c #3D3D6D",
-"/	c #3B3B6B",
-"(	c #A4A4B8",
-"_	c #B5B5C4",
-":	c #D1D1D8",
-"<	c #9191A4",
-"[	c #B5B5BD",
-"}	c #9F9FAE",
-"|	c #4A4A76",
-"1	c #40406F",
-"2	c #E9E9E9",
-"3	c #8F8FA9",
-"4	c #9D9DAC",
-"5	c #9090A4",
-"6	c #55557F",
-"7	c #ADADBE",
-"8	c #484875",
-"9	c #B9B9C7",
-"0	c #DCDCE0",
-"a	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+&*=-#;>>,$.  ",
-" .+'>)%%!>>'$.  ",
-" .+~{]##;^/~$.  ",
-" .+>(%%%_:(>$.  ",
-" .+><[}###<>$.  ",
-" .+|^1!%%23|$.  ",
-" .+4>>;##5>4$.  ",
-" .+6>>!%7890$.  ",
-" .a$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task.xpm b/calendar/gui/task.xpm
deleted file mode 100644
index 4a53c3e9ab..0000000000
--- a/calendar/gui/task.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * task_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #EEEEEE",
-"   . . . . .    ",
-"  ...........   ",
-" .+.+.+.+.+.@.  ",
-" .+.#.#.#.#.$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .&$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
deleted file mode 100644
index 635bd72bc0..0000000000
--- a/calendar/gui/tasks-control-factory.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ettore Perazzoli
- *	    Damon Chaplin <damon@helixcode.com>
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-
-#include <liboaf/liboaf.h>
-
-#include "tasks-control-factory.h"
-#include "tasks-control.h"
-
-
-#define TASKS_CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static BonoboObject *tasks_control_factory_fn	(BonoboGenericFactory	*Factory,
-						 void			*data);
-
-
-/* Registers the factory with Bonobo. Should be called on startup. */
-void
-tasks_control_factory_init		(void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (TASKS_CONTROL_FACTORY_ID,
-					      tasks_control_factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Tasks control factory.");
-}
-
-
-/* Callback factory function to create a tasks control. */
-static BonoboObject *
-tasks_control_factory_fn		(BonoboGenericFactory	*Factory,
-					 void			*data)
-{
-	BonoboControl *control;
-
-	control = tasks_control_new ();
-
-	if (control)
-		return BONOBO_OBJECT (control);
-	else
-		return NULL;
-}
-
-
diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h
deleted file mode 100644
index 217ebc68fc..0000000000
--- a/calendar/gui/tasks-control-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@helixcode.com>
- *	    Damon Chaplin <damon@helixcode.com>
- */
-
-#ifndef _TASKS_CONTROL_FACTORY_H_
-#define _TASKS_CONTROL_FACTORY_H_
-
-void           tasks_control_factory_init         (void);
-BonoboControl *tasks_control_factory_new_control  (void);
-
-#endif /* _TASKS_CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
deleted file mode 100644
index 08b49ff306..0000000000
--- a/calendar/gui/tasks-control.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Damon Chaplin <damon@helixcode.com>
- *	    Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include "e-tasks.h"
-#include "tasks-control.h"
-
-
-#define TASKS_CONTROL_PROPERTY_URI		"folder_uri"
-#define TASKS_CONTROL_PROPERTY_URI_IDX		1
-
-
-static void tasks_control_properties_init	(BonoboControl		*control,
-						 ETasks			*tasks);
-static void tasks_control_get_property		(BonoboPropertyBag	*bag,
-						 BonoboArg		*arg,
-						 guint			 arg_id,
-						 CORBA_Environment      *ev,
-						 gpointer		 user_data);
-static void tasks_control_set_property		(BonoboPropertyBag	*bag,
-						 const BonoboArg	*arg,
-						 guint			 arg_id,
-						 CORBA_Environment      *ev,
-						 gpointer		 user_data);
-static void tasks_control_activate_cb		(BonoboControl		*control,
-						 gboolean		 activate,
-						 gpointer		 user_data);
-static void tasks_control_activate		(BonoboControl		*control,
-						 ETasks			*tasks);
-static void tasks_control_deactivate		(BonoboControl		*control);
-
-static void tasks_control_new_task_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) {
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-
-	tasks_control_properties_init (control, E_TASKS (tasks));
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (tasks_control_activate_cb),
-			    tasks);
-
-	return control;
-}
-
-
-/* Creates the property bag for our new control. */
-static void
-tasks_control_properties_init		(BonoboControl		*control,
-					 ETasks			*tasks)
-					 
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (tasks_control_get_property,
-					tasks_control_set_property, tasks);
-
-	bonobo_property_bag_add (pbag,
-				 TASKS_CONTROL_PROPERTY_URI,
-				 TASKS_CONTROL_PROPERTY_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI of the tasks folder to display"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-}
-
-
-/* Gets a property of our control. FIXME: Finish. */
-static void
-tasks_control_get_property		(BonoboPropertyBag	*bag,
-					 BonoboArg		*arg,
-					 guint			 arg_id,
-					 CORBA_Environment      *ev,
-					 gpointer		 user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-tasks_control_set_property		(BonoboPropertyBag	*bag,
-					 const BonoboArg	*arg,
-					 guint			 arg_id,
-					 CORBA_Environment      *ev,
-					 gpointer		 user_data)
-{
-	ETasks *tasks = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case TASKS_CONTROL_PROPERTY_URI_IDX:
-		filename = g_strdup_printf ("%s/tasks.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		e_tasks_open (tasks, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-tasks_control_activate_cb		(BonoboControl		*control,
-					 gboolean		 activate,
-					 gpointer		 user_data)
-{
-	if (activate)
-		tasks_control_activate (control, user_data);
-	else
-		tasks_control_deactivate (control);
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd),
-
-	BONOBO_UI_VERB_END
-};
-
-static void
-tasks_control_activate			(BonoboControl		*control,
-					 ETasks			*tasks)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, tasks);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-tasks.xml",
-			       "evolution-tasks");
-
-	e_tasks_setup_menus(tasks, uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-
-static void
-tasks_control_deactivate		(BonoboControl		*control)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-
-static void
-tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
-					 gpointer		 data,
-					 const char		*path)
-{
-	ETasks *tasks = data;
-
-	e_tasks_new_task (tasks);
-}
-
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
deleted file mode 100644
index d2f0f4e2fb..0000000000
--- a/calendar/gui/tasks-control.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Federico Mena Quintero <federico@helixcode.com>
- *	    Damon Chaplin <damon@helixcode.com>
- */
-
-#ifndef _TASKS_CONTROL_H_
-#define _TASKS_CONTROL_H_
-
-
-BonoboControl *tasks_control_new		(void);
-
-
-#endif /* _TASKS_CONTROL_H_ */
diff --git a/calendar/gui/tasks-migrate.c b/calendar/gui/tasks-migrate.c
deleted file mode 100644
index a658479cac..0000000000
--- a/calendar/gui/tasks-migrate.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder
- *
- * 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 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/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <cal-client/cal-client.h>
-#include "component-factory.h"
-#include "tasks-migrate.h"
-
-
-
-/* Client for the calendar folder */
-static CalClient *calendar_client = NULL;
-
-/* Client for the tasks folder */
-static CalClient *tasks_client = NULL;
-
-/* Whether we have done the migration yet */
-static gboolean migrated = FALSE;
-
-
-
-/* Performs the actual migration process */
-static void
-migrate (void)
-{
-	GList *uids;
-	GList *l;
-	gboolean success;
-	gboolean at_least_one;
-
-	g_assert (calendar_client != NULL);
-	g_assert (tasks_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-	g_assert (cal_client_get_load_state (tasks_client) == CAL_CLIENT_LOAD_LOADED);
-
-	uids = cal_client_get_uids (calendar_client, CALOBJ_TYPE_TODO);
-
-	success = TRUE;
-	at_least_one = FALSE;
-
-	for (l = uids; l; l = l->next) {
-		const char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-
-		at_least_one = TRUE;
-
-		uid = l->data;
-		status = cal_client_get_object (calendar_client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			if (cal_client_update_object (tasks_client, comp))
-				cal_client_remove_object (calendar_client, uid);
-			else
-				success = FALSE;
-
-			gtk_object_unref (GTK_OBJECT (comp));
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* This is OK; the object may have disappeared from the server */
-			break;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			success = FALSE;
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	if (!at_least_one)
-		return;
-
-	if (success)
-		gnome_ok_dialog (_("Evolution has taken the tasks that were in your calendar folder "
-				   "and automatically migrated them to the new tasks folder."));
-	else
-		gnome_ok_dialog (_("Evolution has tried to take the tasks that were in your "
-				   "calendar folder and migrate them to the new tasks folder.\n"
-				   "Some of the tasks could not be migrated, so "
-				   "this process may be attempted again in the future."));
-}
-
-/* Displays an error to indicate that a calendar could not be opened */
-static void
-open_error (const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not open `%s'; no items from the calendar folder "
-				 "will be migrated to the tasks folder."),
-				 uri);
-	gnome_error_dialog (msg);
-	g_free (msg);
-}
-
-/* Displays an error to indicate that a URI method is not supported */
-static void
-method_error (const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to load `%s' is not supported; "
-				 "no items from the calendar folder will be migrated "
-				 "to the tasks folder."),
-			       uri);
-	gnome_error_dialog (msg);
-	g_free (msg);
-}
-
-/* Callback used when the tasks client is finished loading */
-static void
-tasks_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	g_assert (calendar_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		migrate ();
-		break;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* This can't happen because we did not specify only_if_exists when
-		 * issuing the open request.
-		 */
-		g_assert_not_reached ();
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (calendar_client));
-	calendar_client = NULL;
-
-	gtk_object_unref (GTK_OBJECT (tasks_client));
-	tasks_client = NULL;
-}
-
-/* Initiates the loading process for the tasks client */
-static gboolean
-load_tasks_client (void)
-{
-	char *uri;
-	gboolean success;
-
-	g_assert (calendar_client != NULL);
-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);
-
-	tasks_client = cal_client_new ();
-	if (!tasks_client)
-		goto error;
-
-	gtk_signal_connect (GTK_OBJECT (tasks_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (tasks_opened_cb),
-			    NULL);
-
-	uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
-	success = cal_client_open_calendar (tasks_client, uri, FALSE);
-	g_free (uri);
-
-	if (success)
-		return TRUE;
-
- error:
-	g_message ("load_tasks_client(): could not issue open request for the tasks client");
-
-	if (tasks_client) {
-		gtk_object_unref (GTK_OBJECT (tasks_client));
-		tasks_client = NULL;
-	}
-
-	return FALSE;
-}
-
-/* Callback used when the calendar client finishes loading */
-static void
-calendar_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)
-{
-	switch (status) {
-	case CAL_CLIENT_OPEN_SUCCESS:
-		if (!load_tasks_client ()) {
-			migrated = FALSE;
-			break;
-		}
-
-		return;
-
-	case CAL_CLIENT_OPEN_ERROR:
-		open_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	case CAL_CLIENT_OPEN_NOT_FOUND:
-		/* This is OK; the calendar folder did not exist in the first
-		 * place so there is nothing to migrate.
-		 */
-		break;
-
-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:
-		method_error (cal_client_get_uri (client));
-		migrated = FALSE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (calendar_client));
-	calendar_client = NULL;
-}
-
-/* Initiates the loading process for the calendar client */
-static gboolean
-load_calendar_client (void)
-{
-	char *uri;
-	gboolean success;
-
-	/* First we load the calendar client; the tasks client will be loaded
-	 * later only if the former one succeeds.
-	 */
-
-	calendar_client = cal_client_new ();
-	if (!calendar_client)
-		goto error;
-
-	gtk_signal_connect (GTK_OBJECT (calendar_client), "cal_opened",
-			    GTK_SIGNAL_FUNC (calendar_opened_cb),
-			    NULL);
-
-	uri = g_strdup_printf ("%s/local/Calendar/calendar.ics", evolution_dir);
-	success = cal_client_open_calendar (calendar_client, uri, TRUE);
-	g_free (uri);
-
-	if (success)
-		return TRUE;
-
- error:
-	g_message ("load_calendar_client(): could not issue open request for the calendar client");
-
-	if (calendar_client) {
-		gtk_object_unref (GTK_OBJECT (calendar_client));
-		calendar_client = NULL;
-	}
-
-	return FALSE;
-}
-
-/**
- * tasks_migrate:
- *
- * Initiates the asynchronous process that migrates the tasks from the default
- * user calendar folder to the default tasks folder.  This is because Evolution
- * used to store tasks in the same folder as the calendar by default, but they
- * are separate folders now.
- **/
-void
-tasks_migrate (void)
-{
-	g_assert (!migrated);
-	migrated = TRUE;
-
-	if (!load_calendar_client ())
-		migrated = FALSE;
-}
diff --git a/calendar/gui/tasks-migrate.h b/calendar/gui/tasks-migrate.h
deleted file mode 100644
index 01f124222b..0000000000
--- a/calendar/gui/tasks-migrate.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder
- *
- * 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 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 TASKS_MIGRATE_H
-#define TASKS_MIGRATE_H
-
-
-void tasks_migrate (void);
-
-
-#endif
diff --git a/calendar/gui/test.vcf b/calendar/gui/test.vcf
deleted file mode 100644
index bfe93b3c14..0000000000
--- a/calendar/gui/test.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/test2.vcf b/calendar/gui/test2.vcf
deleted file mode 100644
index 6446507989..0000000000
--- a/calendar/gui/test2.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 8469308861
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308862
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308863
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893834
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893835
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 8469308866
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893837
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893838
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/topic.dat b/calendar/gui/topic.dat
deleted file mode 100644
index edc7813b26..0000000000
--- a/calendar/gui/topic.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-cal.html		Manual
-gnome-cal.html#cmdline  Command line options 
\ No newline at end of file
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index 3d19ac8b37..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-canvas-text.h>
-#include <libgnome/gnome-i18n.h>
-#include "weekday-picker.h"
-
-
-
-#define PADDING 2
-
-/* Private part of the WeekdayPicker structure */
-struct _WeekdayPickerPrivate {
-	/* Selected days; see weekday_picker_set_days() */
-	guint8 day_mask;
-
-	/* 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;
-
-	/* 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_finalize (GtkObject *object);
-
-static void weekday_picker_realize (GtkWidget *widget);
-static void weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style);
-
-static GnomeCanvasClass *parent_class;
-
-static guint wp_signals[LAST_SIGNAL];
-
-
-
-/**
- * weekday_picker_get_type:
- * 
- * Registers the #WeekdayPicker class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #WeekdayPicker class.
- **/
-GtkType
-weekday_picker_get_type (void)
-{
-	static GtkType weekday_picker_type = 0;
-
-	if (!weekday_picker_type) {
-		static const GtkTypeInfo weekday_picker_info = {
-			"WeekdayPicker",
-			sizeof (WeekdayPicker),
-			sizeof (WeekdayPickerClass),
-			(GtkClassInitFunc) weekday_picker_class_init,
-			(GtkObjectInitFunc) weekday_picker_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		weekday_picker_type = gtk_type_unique (GNOME_TYPE_CANVAS, &weekday_picker_info);
-	}
-
-	return weekday_picker_type;
-}
-
-/* Class initialization function for the weekday picker */
-static void
-weekday_picker_class_init (WeekdayPickerClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (GNOME_TYPE_CANVAS);
-
-	wp_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, wp_signals, LAST_SIGNAL);
-
-	object_class->finalize = weekday_picker_finalize;
-
-	widget_class->realize = weekday_picker_realize;
-	widget_class->size_request = weekday_picker_size_request;
-	widget_class->size_allocate = weekday_picker_size_allocate;
-	widget_class->style_set = weekday_picker_style_set;
-
-	class->changed = NULL;
-}
-
-/* Event handler for the day items */
-static gint
-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int i;
-	guint8 day_mask;
-
-	wp = WEEKDAY_PICKER (data);
-	priv = wp->priv;
-
-	if (!(event->type == GDK_BUTTON_PRESS && event->button.button == 1))
-		return FALSE;
-
-	/* Find which box was clicked */
-
-	for (i = 0; i < 7; i++)
-		if (priv->boxes[i] == item || priv->labels[i] == item)
-			break;
-
-	g_assert (i != 7);
-
-	/* Turn on that day */
-
-	i += priv->week_start_day;
-	if (i >= 7)
-		i -= 7;
-
-	if (priv->blocked_day_mask & (0x1 << i))
-		return TRUE;
-
-	if (priv->day_mask & (0x1 << i))
-		day_mask = priv->day_mask & ~(0x1 << i);
-	else
-		day_mask = priv->day_mask | (0x1 << i);
-
-	weekday_picker_set_days (wp, day_mask);
-
-	return TRUE;
-}
-
-
-/* Creates the canvas items for the weekday picker.  The items are empty until
- * they are configured elsewhere.
- */
-static void
-create_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GnomeCanvasGroup *parent;
-	int i;
-
-	priv = wp->priv;
-
-	parent = gnome_canvas_root (GNOME_CANVAS (wp));
-
-	for (i = 0; i < 7; i++) {
-		priv->boxes[i] = gnome_canvas_item_new (parent,
-							GNOME_TYPE_CANVAS_RECT,
-							NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->boxes[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-
-		priv->labels[i] = gnome_canvas_item_new (parent,
-							 GNOME_TYPE_CANVAS_TEXT,
-							 NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->labels[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-	}
-}
-
-/* Object initialization function for the weekday picker */
-static void
-weekday_picker_init (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	GTK_WIDGET_UNSET_FLAGS (wp, GTK_CAN_FOCUS);
-
-	priv = g_new0 (WeekdayPickerPrivate, 1);
-
-	wp->priv = priv;
-
-	create_items (wp);
-}
-
-/* Finalize handler for the weekday picker */
-static void
-weekday_picker_finalize (GtkObject *object)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (object));
-
-	wp = WEEKDAY_PICKER (object);
-	priv = wp->priv;
-
-	g_free (priv);
-	wp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-colorize_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GdkColor *outline;
-	GdkColor *fill, *sel_fill;
-	GdkColor *text_fill, *sel_text_fill;
-	int i;
-
-	priv = wp->priv;
-
-	outline = &GTK_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
-
-	fill = &GTK_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
-	text_fill = &GTK_WIDGET (wp)->style->fg[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;
-
-		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;
-		}
-
-		gnome_canvas_item_set (priv->boxes[i],
-				       "fill_color_gdk", f,
-				       "outline_color_gdk", outline,
-				       NULL);
-
-		gnome_canvas_item_set (priv->labels[i],
-				       "fill_color_gdk", t,
-				       NULL);
-	}
-}
-
-/* Configures the items in the weekday picker by setting their attributes. */
-static void
-configure_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	int width, height;
-	int box_width;
-	const char *str;
-	int i;
-
-	priv = wp->priv;
-
-	width = GTK_WIDGET (wp)->allocation.width;
-	height = GTK_WIDGET (wp)->allocation.height;
-
-	box_width = (width - 1) / 7;
-	str = _("SMTWTFS");
-
-	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 = g_strndup (str + day, 1);
-		gnome_canvas_item_set (priv->labels[i],
-				       "text", c,
-				       "font_gdk", GTK_WIDGET (wp)->style->font,
-				       "x", (double) (i * box_width) + box_width / 2.0,
-				       "y", (double) (1 + PADDING),
-				       "anchor", GTK_ANCHOR_N,
-				       NULL);
-		g_free (c);
-	}
-
-	colorize_items (wp);
-}
-
-/* Realize handler for the weekday picker */
-static void
-weekday_picker_realize (GtkWidget *widget)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	configure_items (wp);
-}
-
-/* Size_request handler for the weekday picker */
-static void
-weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	requisition->width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
-	requisition->height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2);
-}
-
-/* Size_allocate handler for the weekday picker */
-static void
-weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (wp),
-					0, 0, allocation->width, allocation->height);
-
-	configure_items (wp);
-}
-
-/* Style_set handler for the weekday picker */
-static void
-weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int max_width;
-	const char *str;
-	int i, len;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	priv->font_ascent = widget->style->font->ascent;
-	priv->font_descent = widget->style->font->descent;
-
-	max_width = 0;
-
-	str = _("SMTWTFS");
-	len = strlen (str);
-
-	for (i = 0; i < len; i++) {
-		int w;
-
-		w = gdk_char_measure (widget->style->font, str[i]);
-		if (w > max_width)
-			max_width = w;
-	}
-
-	priv->max_letter_width = max_width;
-
-	configure_items (wp);
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style);
-}
-
-
-
-/**
- * weekday_picker_new:
- * @void: 
- * 
- * Creates a new weekday picker widget.
- * 
- * Return value: A newly-created weekday picker.
- **/
-GtkWidget *
-weekday_picker_new (void)
-{
-	return gtk_type_new (TYPE_WEEKDAY_PICKER);
-}
-
-/**
- * weekday_picker_set_days:
- * @wp: A weekday picker.
- * @day_mask: Bitmask with the days to be selected.
- * 
- * Sets the days that are selected in a weekday picker.  In the @day_mask,
- * Sunday is bit 0, Monday is bit 1, etc.
- **/
-void
-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-
-	priv->day_mask = day_mask;
-	colorize_items (wp);
-
-	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;
-}
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
deleted file mode 100644
index 00c51b7a62..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef WEEKDAY_PICKER_H
-#define WEEKDAY_PICKER_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())
-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\
-					WeekdayPickerClass))
-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))
-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
-
-typedef struct _WeekdayPicker WeekdayPicker;
-typedef struct _WeekdayPickerClass WeekdayPickerClass;
-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;
-
-struct _WeekdayPicker {
-	GnomeCanvas canvas;
-
-	/* Private data */
-	WeekdayPickerPrivate *priv;
-};
-
-struct _WeekdayPickerClass {
-	GnomeCanvasClass parent_class;
-
-	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);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/widget-util.c b/calendar/gui/widget-util.c
deleted file mode 100644
index d6034ce8b0..0000000000
--- a/calendar/gui/widget-util.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <widgets/misc/e-dateedit.h>
-#include "calendar-config.h"
-#include "widget-util.h"
-
-
-
-/**
- * date_edit_new:
- * @show_date: Whether to show a date picker in the widget.
- * @show_time: Whether to show a time picker in the widget.
- * 
- * Creates a new #EDateEdit widget, configured using the calendar's preferences.
- * 
- * Return value: A newly-created #EDateEdit widget.
- **/
-GtkWidget *
-date_edit_new (gboolean show_date, gboolean show_time)
-{
-	EDateEdit *dedit;
-
-	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);
-
-	calendar_config_configure_e_date_edit (dedit);
-
-	return GTK_WIDGET (dedit);
-}
diff --git a/calendar/gui/widget-util.h b/calendar/gui/widget-util.h
deleted file mode 100644
index 930e0f9b6e..0000000000
--- a/calendar/gui/widget-util.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Evolution calendar - Widget utilities
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef WIDGET_UTIL_H
-#define WIDGET_UTIL_H
-
-#include <gtk/gtkwidget.h>
-
-
-GtkWidget *date_edit_new (gboolean show_date, gboolean show_time);
-
-
-#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 ec6b4e45f0..0000000000
--- a/calendar/idl/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA = 			\
-	evolution-calendar.idl
-
-EXTRA_DIST =		\
-	$(idl_DATA)
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
deleted file mode 100644
index f8f727c196..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Evolution calendar interface
- *
- * Copyright (C) 2000 Eskil Heyn Olsen
- * Copyright (C) 2000 Helix Code, 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>
-
-module GNOME {
-module Evolution {
-
-module Calendar {
-	/* A calendar component (event/todo/journal/etc), represented as an
-	 * iCalendar string.
-	 */
-	typedef string CalObj;
-
-	/* A unique identifier for a calendar component */
-	typedef string CalObjUID;
-
-	/* Sequence of unique identifiers */
-	typedef sequence<CalObjUID> CalObjUIDSeq;
-
-	/* A unique identifier for an alarm subcomponent */
-	typedef string CalAlarmUID;
-
-	/* Flags for getting UID sequences */
-	typedef long CalObjType;
-	const CalObjType TYPE_EVENT   = 1 << 0;
-	const CalObjType TYPE_TODO    = 1 << 1;
-	const CalObjType TYPE_JOURNAL = 1 << 2;
-	const CalObjType TYPE_ANY     = 0x07;
-
-	/* Types of object changes made */
-	typedef long CalObjChangeType;
-	const CalObjChangeType ADDED = 1 << 0;
-	const CalObjChangeType MODIFIED = 1 << 1;
-	const CalObjChangeType DELETED = 1 << 2;
-	
-	/* Types of alarms */
-	enum AlarmType {
-		MAIL,
-		PROGRAM,
-		DISPLAY,
-		AUDIO
-	};
-
-	/* Used to store a time_t */
-	typedef unsigned long Time_t;
-
-	/* An instance of a calendar component that actually occurs.  These are
-	 * "virtual" objects in that they are used to represent instances of
-	 * recurring events and alarms.  "Real" objects just contain the
-	 * information required to figure out the times at which they recur or
-	 * trigger.  
-	 */
-	struct CalObjInstance {
-		CalObjUID uid;
-		Time_t start;
-		Time_t end;
-	};
-
-	/* Used to transfer a list of component occurrences */
-	typedef sequence<CalObjInstance> CalObjInstanceSeq;
-
-	/* An object change */
-	struct CalObjChange {
-		CalObj calobj;
-		CalObjChangeType type;
-	};
-
-	/* Used to transfer a list of changed components */
-	typedef sequence<CalObjChange> CalObjChangeSeq;
-
-	/* An alarm trigger instance */
-	struct CalAlarmInstance {
-		CalAlarmUID auid;
-		Time_t trigger;
-		Time_t occur;
-	};
-
-	/* Used to represent a list of alarm triggers for a single component */
-	typedef sequence<CalAlarmInstance> CalAlarmInstanceSeq;
-
-	/* Alarms for a component */
-	struct CalComponentAlarms {
-		CalObj calobj;
-		CalAlarmInstanceSeq alarms;
-	};
-
-	/* Used to represent a list of components plus their triggers */
-	typedef sequence<CalComponentAlarms> CalComponentAlarmsSeq;
-
-	interface Listener;
-
-	/* Calendar client interface */
-	interface Cal : Bonobo::Unknown {
-		exception NotFound {};
-		exception InvalidRange {};
-		exception InvalidObject {};
-
-		/* A calendar is identified by its URI */
-		readonly attribute string uri;
-
-		/* Gets the number of components of the specified types */
-		long countObjects (in CalObjType type);
-
-		/* Gets a component based on its URI */
-		CalObj getObject (in CalObjUID uid)
-			raises (NotFound);
-
-		/* Gets a list of UIDs based on component type */
-		CalObjUIDSeq getUIds (in CalObjType type);
-
-		/* Gets a list of components that changed based on object type */
-		CalObjChangeSeq getChanges (in CalObjType type, in string change_id);
-
-		/* Gets a list of components that occur or recur in the specified time range */
-		CalObjUIDSeq getObjectsInRange (in CalObjType type, 
-						in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets a list of the components that have alarms that trigger
-		 * in the specified range of time, and the trigger/occurrence
-		 * structures themselves.  
-		 */
-		CalComponentAlarmsSeq getAlarmsInRange (in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets the alarms for the specified component that trigger in
-		 * the specified time range.  
-		 */
-		CalComponentAlarms getAlarmsForObject (in CalObjUID uid,
-						       in Time_t start, in Time_t end)
-			raises (NotFound, InvalidRange);
-
-
-		/* Updates a component by adding it if it does not exist or by
-		 * changing an existing one.  
-		 */
-		void updateObject (in CalObjUID uid, in CalObj calobj)
-			raises (InvalidObject);
-
-		/* Removes a component */
-		void removeObject (in CalObjUID uid)
-			raises (NotFound);
-	};
-
-	/* Listener for changes in a calendar */
-	interface Listener : Bonobo::Unknown {
-		/* Return status when opening a calendar */
-		enum OpenStatus {
-			SUCCESS,		/* All OK */
-			ERROR,			/* Generic error */
-			NOT_FOUND,		/* Requested opening in only_if_exists mode
-						 * when the URI did not exist.
-						 */
-			METHOD_NOT_SUPPORTED	/* A method handler is not registered */
-		};
-
-		/* Called from a CalFactory when a calendar is initially opened.
-		 * The listener must remember the cal object.  
-		 */
-		void notifyCalOpened (in OpenStatus status, in Cal cal);
-
-		/* Called from a Calendar when a component is added or changed */
-		void notifyObjUpdated (in CalObjUID uid);
-
-		/* Called from a Calendar when a component is removed */
-		void notifyObjRemoved (in CalObjUID uid);
-	};
-
-	/* A calendar factory, can load and create calendars */
-	interface CalFactory : Bonobo::Unknown {
-		exception NilListener {};
-
-		/* Open a calendar from an URI */
-		void open (in string uri, in boolean only_if_exists, in Listener listener)
-			raises (NilListener);
-	};
-
-	/* Interface to the alarm notification service */
-	interface AlarmNotify : Bonobo::Unknown {
-		exception InvalidURI {};
-		exception BackendContactError {};
-		exception NotFound {};
-
-		/* Adds a calendar to the alarm notification system */
-		void addCalendar (in string uri)
-			raises (InvalidURI, BackendContactError);
-
-		/* Removes a calendar from the alarm notification system */
-		void removeCalendar (in string uri)
-			raises (InvalidURI, NotFound);
-
-		/* Makes the alarm notification daemon unconditionally exit */
-		void die ();
-	};
-};
-
-};
-};
-
-#endif
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
deleted file mode 100644
index ac51a554db..0000000000
--- a/calendar/pcs/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-.pure
-*.la
-*.lo
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
deleted file mode 100644
index 984dcde86a..0000000000
--- a/calendar/pcs/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"wombat-pcs\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-noinst_LIBRARIES = libpcs.a
-
-libpcs_a_SOURCES =		\
-	$(CORBA_GENERATED)	\
-	cal.c			\
-	cal.h			\
-	cal-backend.c		\
-	cal-backend.h		\
-	cal-backend-file.c	\
-	cal-backend-file.h	\
-	cal-common.h		\
-	cal-factory.c		\
-	cal-factory.h		\
-	job.c			\
-	job.h
-
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/pcs/cal-backend-db.c b/calendar/pcs/cal-backend-db.c
deleted file mode 100644
index fca87bd9ab..0000000000
--- a/calendar/pcs/cal-backend-db.c
+++ /dev/null
@@ -1,1488 +0,0 @@
-/* Evolution calendar - iCalendar DB backend
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@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 Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-util/cal-recur.h"
-#include "cal-backend-db.h"
-#include <db.h>
-#if DB_VERSION_MAJOR < 3
-#  error "You need libdb3 to compile the DB backend"
-#endif
-
-#define ENVIRONMENT_DIRECTORY "%s/evolution/local/Calendar/db.environment"
-
-/* structure to identify an open cursor */
-typedef struct {
-	gint ref;
-	DBC* dbc;
-	DB*  parent_db;
-	
-	/* data in the cursor */
-	GList *keys;
-	GList *data;
-} CalBackendDBCursor;
-
-/* private part of the CalBackendDB structure */
-struct _CalBackendDBPrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* Berkeley DB's library handles */
-	DB_ENV *environment;
-	DB *objects_db;
-	DB *history_db;
-
-	/* list of open cursors */
-	GList *cursors;
-
-	/* list of clients using this backend */
-	GList *clients;
-};
-
-static void cal_backend_db_class_init (CalBackendDBClass *klass);
-static void cal_backend_db_init (CalBackendDB *cbdb);
-static void cal_backend_db_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_db_get_uri (CalBackend *backend);
-static void cal_backend_db_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendOpenStatus cal_backend_db_open (CalBackend *backend,
-                                                 GnomeVFSURI *uri,
-                                                 gboolean only_if_exists);
-
-static int cal_backend_db_get_n_objects (CalBackend *backend, CalObjType type);
-static char *cal_backend_db_get_object (CalBackend *backend, const char *uid);
-static CalObjType cal_backend_db_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList* cal_backend_db_get_uids (CalBackend *backend, CalObjType type);
-static GList* cal_backend_db_get_objects_in_range (CalBackend *backend,
-                                                   CalObjType type,
-                                                   time_t start,
-                                                   time_t end);
-static GNOME_Evolution_Calendar_CalObjChangeSeq *cal_backend_db_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_db_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end);
-
-static GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_db_get_alarms_for_object (
-	CalBackend *backend, const char *uid, time_t start, time_t end, gboolean *object_found);
-
-static gboolean cal_backend_db_update_object (CalBackend *backend,
-                                              const char *uid,
-                                              const char *calobj);
-static gboolean cal_backend_db_remove_object (CalBackend *backend, const char *uid);
-
-static void close_cursor (CalBackendDB *cbdb, CalBackendDBCursor *cursor);
-static CalBackendDBCursor *open_cursor (CalBackendDB *cbdb, DB *db);
-static CalBackendDBCursor *find_cursor_by_db (CalBackendDB *cbdb, DB *db);
-static DBT *find_record_by_id (CalBackendDBCursor *cursor, const gchar *id);
-
-static DB_TXN *begin_transaction (CalBackendDB *cbdb);
-static void commit_transaction (DB_TXN *tid);
-static void rollback_transaction (DB_TXN *tid);
-
-static CalBackendClass *parent_class;
-
-/**
- * cal_backend_db_get_type:
- * @void:
- *
- * Registers the #CalBackendDB class if necessary and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalBackendDB class.
- */
-GtkType
-cal_backend_db_get_type (void)
-{
-	static GtkType cal_backend_db_type = 0;
-
-	if (!cal_backend_db_type) {
-		static const GtkTypeInfo cal_backend_db_info = {
-			"CalBackendDB",
-			sizeof (CalBackendDB),
-			sizeof (CalBackendDBClass),
-			(GtkClassInitFunc) cal_backend_db_class_init,
-			(GtkObjectInitFunc) cal_backend_db_init,
-			NULL,
-			NULL,
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_db_type = gtk_type_unique(CAL_BACKEND_TYPE, &cal_backend_db_info);
-	}
-
-	return cal_backend_db_type;
-}
-
-/* class initialization function for the DB backend */
-static void
-cal_backend_db_class_init (CalBackendDBClass *klass)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) klass;
-	backend_class = (CalBackendClass *) klass;
-
-	parent_class = gtk_type_class(CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_db_destroy;
-
-	backend_class->get_uri = cal_backend_db_get_uri;
-	backend_class->add_cal = cal_backend_db_add_cal;
-	backend_class->open = cal_backend_db_open;
-	backend_class->get_n_objects = cal_backend_db_get_n_objects;
-	backend_class->get_object = cal_backend_db_get_object;
-	backend_class->get_type_by_uid = cal_backend_db_get_type_by_uid;
-	backend_class->get_uids = cal_backend_db_get_uids;
-	backend_class->get_objects_in_range = cal_backend_db_get_objects_in_range;
-	backend_class->get_changes = cal_backend_db_get_changes;
-	backend_class->get_alarms_in_range = cal_backend_db_get_alarms_in_range;
-	backend_class->get_alarms_for_object = cal_backend_db_get_alarms_for_object;
-	backend_class->update_object = cal_backend_db_update_object;
-	backend_class->remove_object = cal_backend_db_remove_object;
-}
-
-/* object initialization function for the DB backend */
-static void
-cal_backend_db_init (CalBackendDB *cbdb)
-{
-	CalBackendDBPrivate *priv;
-
-	priv = g_new0(CalBackendDBPrivate, 1);
-	cbdb->priv = priv;
-}
-
-/* Destroy handler for the DB backend */
-static void
-cal_backend_db_destroy (GtkObject *object)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBPrivate *priv;
-	GList *node;
-
-	g_return_if_fail(object != NULL);
-	g_return_if_fail(IS_CAL_BACKEND_DB(object));
-
-	cbdb = CAL_BACKEND_DB(object);
-	priv = cbdb->priv;
-
-	g_assert(cbdb->priv->clients == NULL);
-
-	/* clean up */
-	if (priv->uri) {
-		gnome_vfs_uri_unref(priv->uri);
-		priv->uri = NULL;
-	}
-
-	/* close open cursors */
-	while ((node = g_list_first(cbdb->priv->cursors))) {
-		close_cursor(cbdb, (CalBackendDBCursor *) node->data);
-	}
-
-	/* close open databases */
-	if (cbdb->priv->objects_db)
-		cbdb->priv->objects_db->close(cbdb->priv->objects_db, 0);
-	if (cbdb->priv->history_db)
-		cbdb->priv->history_db->close(cbdb->priv->history_db, 0);
-
-	/* close DB environment */
-	if (cbdb->priv->environment)
-		cbdb->priv->environment->close(cbdb->priv->environment, 0);
-	
-	g_free((gpointer) priv);
-	cbdb->priv = NULL;
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		(*GTK_OBJECT_CLASS(parent_class)->destroy)(object);
-}
-
-/*
- * Private functions
- */
-
-/* close an open cursor and frees all associated memory */
-static void
-close_cursor (CalBackendDB *cbdb, CalBackendDBCursor *cursor)
-{
-	GList *node;
-	DBT *dbt;
-
-	g_return_if_fail(cursor != NULL);
-
-	cursor->ref--;
-	if (cursor->ref > 0)
-		return;
-
-	/* free all keys and data */
-	while ((node = g_list_first(cursor->keys))) {
-		dbt = (DBT *) node->data;
-		cursor->keys = g_list_remove(cursor->keys, (gpointer) dbt);
-		g_free((gpointer) dbt);
-	}
-	while ((node = g_list_first(cursor->data))) {
-		dbt = (DBT *) node->data;
-		cursor->data = g_list_remove(cursor->data, (gpointer) dbt);
-		g_free((gpointer) dbt);
-	}
-
-	/* finally, close the cursor */
-	cursor->dbc->c_close(cursor->dbc);
-
-	cbdb->priv->cursors = g_list_remove(cbdb->priv->cursors, (gpointer) cursor);
-	g_free((gpointer) cursor);
-}
-
-/* open a cursor for the given database */
-static CalBackendDBCursor *
-open_cursor (CalBackendDB *cbdb, DB *db)
-{
-	CalBackendDBCursor *cursor;
-	gint ret;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(db != NULL, NULL);
-
-	/* search for the cursor in our list of cursors */
-	cursor = find_cursor_by_db(cbdb, db);
-	if (cursor) {
-		cursor->ref++;
-		return cursor;
-	}
-
-	/* create the cursor */
-	cursor = g_new0(CalBackendDBCursor, 1);
-	cursor->parent_db = db;
-	cursor->ref = 1;
-
-	ret = db->cursor(db, NULL, &cursor->dbc, 0);
-	if (ret == 0) {
-		DBT key;
-		DBT data;
-
-		/* read data */
-		memset(&key, 0, sizeof(key));
-		memset(&data, 0, sizeof(data));
-		
-		while ((ret = cursor->dbc->c_get(cursor->dbc, &key, &data, DB_NEXT)) == 0) {
-			cursor->keys = g_list_append(cursor->keys, g_memdup(&key, sizeof(key)));
-			cursor->data = g_list_append(cursor->data, g_memdup(&data, sizeof(data)));
-			
-			memset(&key, 0, sizeof(key));
-			memset(&data, 0, sizeof(data));
-		}
-		if (ret == DB_NOTFOUND) {
-			cbdb->priv->cursors = g_list_prepend(cbdb->priv->cursors, (gpointer) cursor);
-			return cursor;
-		}
-
-		/* close cursor on error */
-		close_cursor(cbdb, cursor);
-	}
-
-	return NULL;
-}
-
-/* search for a cursor in the given backend */
-static CalBackendDBCursor *
-find_cursor_by_db (CalBackendDB *cbdb, DB *db)
-{
-	GList *node;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(db != NULL, NULL);
-
-	for (node = g_list_first(cbdb->priv->cursors); node != NULL; node = g_list_next(node)) {
-		CalBackendDBCursor* cursor = (CalBackendDBCursor *) node->data;
-
-		if (cursor && cursor->parent_db == db)
-			return cursor;
-	}
-
-	return NULL; /* not found */
-}
-
-/* finds a record in a cursor by its ID */
-static DBT *
-find_record_by_id (CalBackendDBCursor *cursor, const gchar *id)
-{
-	GList *node;
-
-	g_return_val_if_fail(cursor != NULL, NULL);
-	g_return_val_if_fail(id != NULL, NULL);
-
-	
-	for (node = g_list_first(cursor->keys); node != NULL; node = g_list_next(node)) {
-		DBT *key;
-		
-		key = (DBT *) node->data;
-		if (key && !strcmp(key->data, id)) {
-			GList *tmp;
-			
-			tmp = g_list_nth(cursor->data, g_list_position(cursor->keys, node));
-			if (tmp)
-				return (DBT *) tmp->data;
-			return NULL; /* no data associated with this key */
-		}
-	}
-
-	return NULL; /* not found */
-}
-
-/* start a new transaction */
-static DB_TXN *
-begin_transaction (CalBackendDB *cbdb)
-{
-	DB_TXN *tid;
-	gint ret;
-	
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	
-	if ((ret = txn_begin(cbdb->priv->environment, NULL, &tid, 0)) != 0) {
-		/* TODO: error logging */
-		return NULL;
-	}
-	
-	return tid;
-}
-
-/* finish successfully a transaction */
-static void
-commit_transaction (DB_TXN *tid)
-{
-	gint ret;
-	
-	g_return_if_fail(tid != NULL);
-	
-	if ((ret = txn_commit(tid, 0)) != 0) {
-		/* TODO: error logging? */
-	}
-}
-
-/* abort a transaction */
-static void
-rollback_transaction (DB_TXN *tid)
-{
-	gint ret;
-	
-	g_return_if_fail(tid != NULL);
-	
-	if ((ret = txn_abort(tid)) != 0) {
-		/* TODO: error logging? */
-	}
-}
-
-/*
- * Calendar backend methods
- */
-
-/* get_uri handler for the DB backend */
-static GnomeVFSURI *
-cal_backend_db_get_uri (CalBackend *backend)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	return cbdb->priv->uri;
-}
-
-/* callback used when a Cal is destroyed */
-static void
-destroy_cal_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *tmp_cal;
-	CalBackendDB *cbdb;
-	GList *node;
-
-	cal = CAL(object);
-	cbdb = CAL_BACKEND_DB(data);
-	
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-
-	/* find the Cal in the list of clients */
-	for (node = cbdb->priv->clients; node != NULL; node = g_list_next(node)) {
-		tmp_cal = CAL(node->data);
-		if (tmp_cal == cal)
-			break;
-	}
-
-	if (node) {
-		/* disconnect this Cal */
-		cbdb->priv->clients = g_list_remove_link(cbdb->priv->clients, node);
-		g_list_free_1(node);
-
-		/* when all clients go away, notify the parent factory about it so that
-		 * it may decide to kill the backend or not.
-		 */
-		if (!cbdb->priv->clients)
-			cal_backend_last_client_gone(CAL_BACKEND(cbdb));
-	}
-}
-
-/* add_cal_handler for the DB backend */
-static void
-cal_backend_db_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-	g_return_if_fail(IS_CAL(cal));
-
-	/* we do not keep a reference to the Cal since the calendar user agent
-	 * owns it
-	 */
-	gtk_signal_connect(GTK_OBJECT(cal),
-	                   "destroy",
-	                   GTK_SIGNAL_FUNC(destroy_cal_cb),
-	                   backend);
-
-	cbdb->priv->clients = g_list_prepend(cbdb->priv->clients, (gpointer) cal);
-}
-
-/* database file initialization */
-static gboolean
-open_database_file (CalBackendDB *cbdb, const gchar *str_uri, gboolean only_if_exists)
-{
-	gint ret;
-	struct stat sb;
-	gchar *dir;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->history_db != NULL, FALSE);
-	g_return_val_if_fail(str_uri != NULL, FALSE);
-
-	/* initialize DB environment (for transactions) */
-	dir = g_strdup_printf(ENVIRONMENT_DIRECTORY, g_get_home_dir());
-	if (stat(dir, &sb) != 0) {
-
-		/* if the directory exists, we're done, since DB will fail if it's the
-		 * wrong one. If it does not exist, create the environment */
-		if (mkdir(dir, S_IRWXU) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-		
-		/* create the environment handle */
-		if ((ret = db_env_create(&cbdb->priv->environment, 0)) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-		
-		cbdb->priv->environment->set_errpfx(cbdb->priv->environment, "cal-backend-db");
-		
-		/* open the transactional environment */
-		if ((ret = cbdb->priv->environment->open(cbdb->priv->environment,
-		                                         ENVIRONMENT_DIRECTORY,
-		                                         DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG |
-		                                         DB_INIT_MPOOL | DB_INIT_TXN |
-		                                         DB_RECOVER | DB_THREAD,
-		                                         S_IRUSR | S_IWUSR)) != 0) {
-			g_free((gpointer) dir);
-			return FALSE;
-		}
-	}
-	
-	g_free((gpointer) dir);
-	
-	/* open/create objects database into given file */
-	if ((ret = db_create(&cbdb->priv->objects_db, cbdb->priv->environment, 0)) != 0
-	    || (ret = db_create(&cbdb->priv->history_db, cbdb->priv->environment, 0)) != 0) {
-		return FALSE;
-	}
-
-	if (only_if_exists) {
-		ret = cbdb->priv->objects_db->open(cbdb->priv->objects_db,
-		                                   str_uri,
-		                                   "calendar_objects",
-		                                   DB_HASH,
-		                                   DB_THREAD,
-		                                   0644);
-	}
-	else {
-		ret = cbdb->priv->objects_db->open(cbdb->priv->objects_db,
-		                                   str_uri,
-		                                   "calendar_objects",
-		                                   DB_HASH,
-		                                   DB_CREATE | DB_THREAD,
-		                                   0644);
-	}
-	if (ret == 0) {
-		/* now, open the history database */
-		ret = cbdb->priv->history_db->open(cbdb->priv->history_db,
-		                                   str_uri,
-		                                   "calendar_history",
-		                                   DB_BTREE,
-		                                   DB_CREATE | DB_THREAD,
-		                                   0644);
-		if (ret == 0) return TRUE;
-
-		/* close objects database on error */
-		cbdb->priv->objects_db->close(cbdb->priv->objects_db, 0);
-	}
-
-	return FALSE;
-}
-
-/* open handler for the DB backend */
-static CalBackendOpenStatus
-cal_backend_db_open (CalBackend *backend, GnomeVFSURI *uri, gboolean only_if_exists)
-{
-	CalBackendDB *cbdb;
-	gchar *str_uri;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(cbdb->priv != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(uri != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail(cbdb->priv->objects_db == NULL, CAL_BACKEND_OPEN_ERROR);
-
-	/* open the given URI */
-	if (!gnome_vfs_uri_is_local(uri))
-		return CAL_BACKEND_OPEN_ERROR;
-	str_uri = gnome_vfs_uri_to_string(uri,
-					  (GNOME_VFS_URI_HIDE_USER_NAME
-					   | GNOME_VFS_URI_HIDE_PASSWORD
-					   | GNOME_VFS_URI_HIDE_HOST_NAME
-					   | GNOME_VFS_URI_HIDE_HOST_PORT
-					   | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));
-
-	/* open database file */
-	if (!open_database_file(cbdb, (const gchar *) str_uri, only_if_exists)) {
-		g_free((gpointer) str_uri);
-		return CAL_BACKEND_OPEN_ERROR;
-	}
-
-	gnome_vfs_uri_ref(uri);
-	cbdb->priv->uri = uri;
-	g_free((gpointer) str_uri);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-/* get_n_objects handler for the DB backend */
-static int
-cal_backend_db_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	int total_count = 0;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), -1);
-	g_return_val_if_fail(cbdb->priv != NULL, -1);
-
-	/* open the cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GList *node;
-
-		/* we traverse all data, to check for each object's type */
-		for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-			icalcomponent *icalcomp;
-			DBT *data = (DBT *) node->data;
-
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				switch (icalcomponent_isa(icalcomp)) {
-					case ICAL_VEVENT_COMPONENT :
-						if (type & CALOBJ_TYPE_EVENT)
-							total_count++;
-						break;
-					case ICAL_VTODO_COMPONENT :
-						if (type & CALOBJ_TYPE_TODO)
-							total_count++;
-						break;
-					case ICAL_VJOURNAL_COMPONENT :
-						if (type & CALOBJ_TYPE_JOURNAL)
-							total_count++;
-						break;
-					default :
-						break;
-				}
-				icalcomponent_free(icalcomp);
-			}
-		}
-		close_cursor(cbdb, cursor);
-	}
-
-	return total_count;
-}
-
-/* get_object handler for the DB backend */
-static char *
-cal_backend_db_get_object (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	gint ret;
-	DBT key;
-	DBT data;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, NULL);
-	g_return_val_if_fail(uid != NULL, NULL);
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-	
-	/* read record from database */
-	if ((ret = cbdb->priv->objects_db->get(cbdb->priv->objects_db,
-	                                       NULL,
-	                                       &key,
-	                                       &data,
-	                                       0)) == 0) {
-		gchar *str = g_strdup((gchar *) data.data);
-		return str;
-	}
-	
-	return NULL;
-}
-
-/* get_type_by_uid handler for the DB backend */
-static CalObjType
-cal_backend_db_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	DBT key;
-	DBT data;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(cbdb->priv != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail(uid != NULL, CAL_COMPONENT_NO_TYPE);
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-	
-	/* read record from database */
-	if ((ret = cbdb->priv->objects_db->get(cbdb->priv->objects_db,
-	                                       NULL,
-	                                       &key,
-	                                       &data,
-	                                       0)) == 0) {
-		icalcomponent *icalcomp = icalparser_parse_string((char *) data.data);
-		if (icalcomp) {
-			CalObjType type;
-			
-			switch (icalcomponent_isa(icalcomp)) {
-				case ICAL_VEVENT_COMPONENT :
-					type = CALOBJ_TYPE_EVENT;
-					break;
-				case ICAL_VTODO_COMPONENT :
-					type = CALOBJ_TYPE_TODO;
-					break;
-				case ICAL_VJOURNAL_COMPONENT :
-					type = CALOBJ_TYPE_JOURNAL;
-					break;
-				default :
-					type = CAL_COMPONENT_NO_TYPE;
-			}
-			
-			icalcomponent_free(icalcomp);
-			return type;
-		}
-	}
-
-	return CAL_COMPONENT_NO_TYPE;
-}
-
-static GList *
-add_uid_if_match (GList *list, CalBackendDBCursor *cursor, GList *data_node, CalObjType type)
-{
-	DBT *data;
-
-	g_return_val_if_fail(cursor != NULL, list);
-	g_return_val_if_fail(data_node != NULL, list);
-	
-	data = (DBT *) data_node->data;
-	if (data) {
-		icalcomponent *icalcomp;
-		gchar *uid = NULL;
-
-		icalcomp = icalparser_parse_string(data->data);
-		if (!icalcomp) return list;
-
-		switch (icalcomponent_isa(icalcomp)) {
-			case ICAL_VEVENT_COMPONENT :
-				if (type & CALOBJ_TYPE_EVENT)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			case ICAL_VTODO_COMPONENT :
-				if (type & CALOBJ_TYPE_TODO)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			case ICAL_VJOURNAL_COMPONENT :
-				if (type & CALOBJ_TYPE_JOURNAL)
-					uid = (gchar *) icalcomponent_get_uid(icalcomp);
-				break;
-			default :
-				uid = NULL;
-		}
-
-		if (uid)
-			list = g_list_prepend(list, g_strdup(uid));
-		icalcomponent_free(icalcomp);
-	}
-
-	return list;
-}
-
-/* get_uids handler for the DB backend */
-static GList *
-cal_backend_db_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendDB *cbdb;
-	GList *list = NULL;
-	CalBackendDBCursor *cursor;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GList *node;
-
-		/* we traverse all data, to check for each object's type */
-		for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-			list = add_uid_if_match(list, cursor, node, type);
-		}
-		close_cursor(cbdb, cursor);
-	}
-
-	return list;
-}
-
-/* callback used from cal_recur_generate_instances(): adds the component's UID to
- * our hash table
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	cal_component_get_uid(comp, &uid);
-
-	old_uid = g_hash_table_lookup(uid_hash, uid);
-	if (old_uid)
-		return FALSE;
-
-	g_hash_table_insert(uid_hash, (char *) uid, NULL);
-	return FALSE;
-}
-
-/* creates the list of UIDs in the given range */
-static void
-get_instances_in_range (GHashTable *uid_hash,
-                        CalBackendDBCursor *cursor,
-                        CalObjType type,
-                        time_t start,
-                        time_t end)
-{
-	GList *node;
-
-	g_return_if_fail(uid_hash != NULL);
-	g_return_if_fail(cursor != NULL);
-
-	for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-		DBT *data;
-		icalcomponent *icalcomp;
-
-		data = (DBT *) node->data;
-		if (data) {
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				CalComponent *comp = cal_component_new();
-				cal_component_set_icalcomponent(comp, icalcomp);
-
-				switch (icalcomponent_isa(icalcomp)) {
-					case ICAL_VEVENT_COMPONENT :
-						if (type & CALOBJ_TYPE_EVENT)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-							                             uid_hash);
-						break;
-					case ICAL_VTODO_COMPONENT :
-						if (type & CALOBJ_TYPE_TODO)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-						 	                            uid_hash);
-						break;
-					case ICAL_VJOURNAL_COMPONENT :
-						if (type & CALOBJ_TYPE_JOURNAL)
-							cal_recur_generate_instances(comp,
-							                             start,
-							                             end,
-							                             add_instance,
-						 	                            uid_hash);
-						break;
-					default :
-						break;
-				}
-
-				gtk_object_unref(GTK_OBJECT(comp));
-				icalcomponent_free(icalcomp);
-			}
-		}
-	}
-}
-
-/* callback used from g_hash_table_foreach: adds a UID from the hash table to our list */
-static void
-add_uid_to_list (gpointer key, gpointer value, gpointer data)
-{
-	GList **list;
-	const char *uid;
-
-	list = (GList **) data;
-
-	uid = (const char *) key;
-	*list = g_list_prepend(*list, (gpointer) g_strdup(uid));
-}
-
-/* get_objects_in_range handler for the DB backend */
-static GList *
-cal_backend_db_get_objects_in_range (CalBackend *backend,
-                                     CalObjType type,
-                                     time_t start,
-                                     time_t end)
-{
-	CalBackendDB *cbdb;
-	GList *list = NULL;
-	CalBackendDBCursor *cursor;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		GHashTable *uid_hash;
-
-		/* build the hash table */
-		uid_hash = g_hash_table_new(g_str_hash, g_str_equal);
-		get_instances_in_range(uid_hash, cursor, type, start, end);
-
-		/* build the list to be returned from the hash table */
-		g_hash_table_foreach(uid_hash, add_uid_to_list, &list);
-		g_hash_table_destroy(uid_hash);
-		
-		close_cursor(cbdb, cursor);
-	}
-	
-	return list;
-}
-
-/* get_changes handler for the DB backend */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_db_get_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	CalBackendDB *cbdb;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-
-	return NULL;
-}
-
-/* computes the range of time in which recurrences should be generated for a
- * component in order to compute alarm trigger times.
- */
-static void
-compute_alarm_range (CalComponent *comp,
-                     GList *alarm_uids,
-                     time_t start,
-                     time_t end,
-                     time_t *alarm_start,
-                     time_t *alarm_end)
-{
-	GList *l;
-
-	*alarm_start = start;
-	*alarm_end = end;
-
-	for (l = alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		switch (trigger.type) {
-			case CAL_ALARM_TRIGGER_NONE:
-			case CAL_ALARM_TRIGGER_ABSOLUTE:
-				continue;
-			case CAL_ALARM_TRIGGER_RELATIVE_START:
-			case CAL_ALARM_TRIGGER_RELATIVE_END:
-				dur = &trigger.u.rel_duration;
-				dur_time = icaldurationtype_as_int (*dur);
-				
-				if (dur->is_neg)
-					*alarm_end = MAX (*alarm_end, end + dur_time);
-				else
-					*alarm_start = MIN (*alarm_start, start - dur_time);
-					
-				break;
-			default:
-				g_assert_not_reached ();
-		}
-	}
-
-	g_assert (*alarm_start <= *alarm_end);
-}
-
-/* closure data to generate alarm occurrences */
-struct alarm_occurrence_data {
-	/* these are the info we have */
-	GList *alarm_uids;
-	time_t start;
-	time_t end;
-
-	/* this is what we compute */
-	GSList *triggers;
-	int n_triggers;
-};
-
-/* callback used from cal_recur_generate_instances(); generates triggers for all
- * of a component's RELATIVE alarms.
- */
-static gboolean
-add_alarm_occurrences_cb (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	struct alarm_occurrence_data *aod;
-	GList *l;
-
-	aod = data;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		time_t occur_time, trigger_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_RELATIVE_START
-		    && trigger.type != CAL_ALARM_TRIGGER_RELATIVE_END)
-			continue;
-
-		dur = &trigger.u.rel_duration;
-		dur_time = icaldurationtype_as_int (*dur);
-
-		if (trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START)
-			occur_time = start;
-		else
-			occur_time = end;
-
-		if (dur->is_neg)
-			trigger_time = occur_time - dur_time;
-		else
-			trigger_time = occur_time + dur_time;
-
-		if (trigger_time < aod->start || trigger_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = trigger_time;
-		instance->occur = occur_time;
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-
-	return TRUE;
-}
-
-/* generates the absolute triggers for a component */
-static void
-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod)
-{
-	GList *l;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		time_t abs_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)
-			continue;
-
-		abs_time = icaltime_as_timet (trigger.u.abs_time);
-
-		if (abs_time < aod->start || abs_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = abs_time;
-		instance->occur = abs_time; /* No particular occurrence, so just use the same time */
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-}
-
-/* compares two alarm instances; called from g_slist_sort() */
-static gint
-compare_alarm_instance (gconstpointer a, gconstpointer b)
-{
-	const CalAlarmInstance *aia, *aib;
-
-	aia = a;
-	aib = b;
-
-	if (aia->trigger < aib->trigger)
-		return -1;
-	else if (aia->trigger > aib->trigger)
-		return 1;
-	else
-		return 0;
-}
-
-/* generates alarm instances for a calendar component.  Returns the instances
- * structure, or NULL if no alarm instances occurred in the specified time
- * range.
- */
-static CalComponentAlarms *
-generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
-{
-	CalComponentAlarms *alarms = NULL;
-	GList *alarm_uids;
-	time_t alarm_start, alarm_end;
-	struct alarm_occurrence_data aod;
-
-	g_return_val_if_fail(IS_CAL_COMPONENT(comp), NULL);
-
-	if (!cal_component_has_alarms(comp))
-		return NULL;
-	
-	alarm_uids = cal_component_get_alarm_uids(comp);
-	compute_alarm_range(comp, alarm_uids, start, end, &alarm_start, &alarm_end);
-
-	aod.alarm_uids = alarm_uids;
-	aod.start = start;
-	aod.end = end;
-	aod.triggers = NULL;
-	aod.n_triggers = 0;
-	cal_recur_generate_instances(comp, alarm_start, alarm_end, add_alarm_occurrences_cb, &aod);
-
-	/* we add the ABSOLUTE triggers separately */
-	generate_absolute_triggers(comp, &aod);
-
-	if (aod.n_triggers == 0)
-		return NULL;
-
-	/* create the component alarm instances structure */
-	alarms = g_new (CalComponentAlarms, 1);
-	alarms->comp = comp;
-	gtk_object_ref (GTK_OBJECT (alarms->comp));
-	alarms->alarms = g_slist_sort (aod.triggers, compare_alarm_instance);
-
-	return alarms;
-}
-
-/* retrieve list of alarms */
-static GSList *
-get_list_of_alarms (CalBackendDBCursor *cursor, time_t start, time_t end)
-{
-	GSList *list = NULL;
-	GList *node;
-
-	g_return_val_if_fail(cursor != NULL, NULL);
-	
-	for (node = g_list_first(cursor->data); node != NULL; node = g_list_next(node)) {
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		DBT *data;
-		
-		data = (DBT *) node->data;
-		if (data) {
-			icalcomp = icalparser_parse_string((char *) data->data);
-			if (icalcomp) {
-				/* per RFC 2445, only VEVENTs and VTODOs can have alarms */
-				kind = icalcomponent_isa(icalcomp);
-				if (kind == ICAL_VEVENT_COMPONENT || kind == ICAL_VTODO_COMPONENT) {
-					CalComponent *comp;
-					CalComponentAlarms *alarms;
-					
-					/* create the CalComponent to compute the alarms */
-					comp = cal_component_new();
-					cal_component_set_icalcomponent(comp, icalcomp);
-					
-					alarms = generate_alarms_for_comp(comp, start, end);
-					if (alarms)
-						list = g_slist_prepend(list, (gpointer) alarms);
-
-					gtk_object_unref(GTK_OBJECT(comp));
-				}
-				
-				icalcomponent_free(icalcomp);
-			}
-		}
-	}
-
-	return list;
-}
-
-/* fills a CORBA sequence of alarm instances */
-static void
-fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms)
-{
-	int n_alarms;
-	GSList *l;
-	int i;
-
-	n_alarms = g_slist_length(alarms);
-
-	CORBA_sequence_set_release(seq, TRUE);
-	seq->_length = n_alarms;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf(n_alarms);
-
-	for (l = alarms, i = 0; l != NULL; l = l->next, i++) {
-		CalAlarmInstance *instance;
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-
-		instance = (CalAlarmInstance *) l->data;
-		corba_instance = seq->_buffer + i;
-
-		corba_instance->auid = CORBA_string_dup(instance->auid);
-		corba_instance->trigger = (long) instance->trigger;
-		corba_instance->occur = (long) instance->occur;
-	}
-}
-
-/* get_alarms_in_range handler for the DB backend */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_db_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	gint number_of_alarms;
-	GSList *alarm_list;
-	GSList *node;
-	gint i;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq = NULL;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* open cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		alarm_list = get_list_of_alarms(cursor, start, end);
-		number_of_alarms = g_slist_length(alarm_list);
-		
-		/* create the CORBA sequence */
-		seq = GNOME_Evolution_Calendar_CalComponentAlarmsSeq__alloc();
-		CORBA_sequence_set_release(seq, TRUE);
-		seq->_length = number_of_alarms;
-		seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalComponentAlarms_allocbuf(
-			number_of_alarms);
-		
-		/* populate CORBA sequence */
-		for (node = alarm_list, i = 0; node != NULL; node = node->next, i++) {
-			CalComponentAlarms *alarms;
-			gchar *comp_str;
-			
-			alarms = (CalComponentAlarms *) node->data;
-			
-			comp_str = cal_component_get_as_string (alarms->comp);
-			seq->_buffer[i].calobj = CORBA_string_dup(comp_str);
-			g_free((gpointer) comp_str);
-
-			fill_alarm_instances_seq(&seq->_buffer[i].alarms, alarms->alarms);
-			
-			cal_component_alarms_free(alarms);
-		}
-		
-		g_slist_free(alarm_list);
-		close_cursor(cbdb, cursor);
-	}
-
-	return seq;
-}
-
-/* get_alarms_for_object handler for the DB backend */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_db_get_alarms_for_object (CalBackend *backend,
-                                      const char *uid,
-                                      time_t start,
-                                      time_t end,
-                                      gboolean *object_found)
-{
-	CalBackendDB *cbdb;
-	CalBackendDBCursor *cursor;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms = NULL;
-	DBT *data;
-	gchar *comp_str;
-	CalComponentAlarms *alarms;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), NULL);
-	g_return_val_if_fail(cbdb->priv != NULL, NULL);
-	g_return_val_if_fail(uid != NULL, NULL);
-	g_return_val_if_fail(start != -1 && end != -1, NULL);
-	g_return_val_if_fail(start <= end, NULL);
-	g_return_val_if_fail(object_found != NULL, NULL);
-
-	*object_found = FALSE;
-
-	/* open the cursor */
-	cursor = open_cursor(cbdb, cbdb->priv->objects_db);
-	if (cursor) {
-		data = find_record_by_id(cursor, uid);
-		if (data) {
-			icalcomponent *icalcomp;
-			CalComponent *comp;
-			
-			*object_found = TRUE;
-
-			comp_str = (gchar *) data->data;
-			
-			icalcomp = icalparser_parse_string(comp_str);
-			if (!icalcomp) {
-				close_cursor(cbdb, cursor);
-				return NULL;
-			}
-			
-			comp = cal_component_new();
-			cal_component_set_icalcomponent(comp, icalcomp);
-						
-			/* create the CORBA alarms */
-			corba_alarms = GNOME_Evolution_Calendar_CalComponentAlarms__alloc();
-			corba_alarms->calobj = CORBA_string_dup (comp_str);
-			
-			/* populate the CORBA sequence */
-			alarms = generate_alarms_for_comp(comp, start, end);
-			if (alarms) {
-				fill_alarm_instances_seq(&corba_alarms->alarms, alarms->alarms);
-				cal_component_alarms_free(alarms);
-			}
-			else
-				fill_alarm_instances_seq(&corba_alarms->alarms, NULL);
-
-			gtk_object_unref(GTK_OBJECT(comp));
-			icalcomponent_free(icalcomp);
-		}
-		
-		close_cursor(cbdb, cursor);
-	}
-
-	return corba_alarms;
-}
-
-/* do notifications to Cal clients */
-static void
-do_notify (CalBackendDB *cbdb, void (*notify_fn)(Cal *, gchar *), const gchar *uid)
-{
-	GList *node;
-
-	g_return_if_fail(IS_CAL_BACKEND_DB(cbdb));
-	g_return_if_fail(cbdb->priv != NULL);
-	g_return_if_fail(notify_fn != NULL);
-	g_return_if_fail(uid != NULL);
-	
-	/* FIXME: do notification asynchronously */
-	for (node = g_list_first(cbdb->priv->clients); node != NULL; node = g_list_next(node)) {
-		Cal *cal;
-		
-		cal = CAL(node->data);
-		(*notify_fn)(cal, (gpointer) uid);
-	}
-}
-
-/* adds a record to the history database */
-static gboolean
-add_history (CalBackendDB *cbdb, DB_TXN *tid, const gchar *uid, const gchar *calobj)
-{
-	DBT key;
-	DBT new_data;
-	gint ret;
-
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	g_return_val_if_fail(calobj != NULL, FALSE);
-
-	/* fill in DBT structures */
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-
-	memset(&new_data, 0, sizeof(new_data));
-	new_data.data = (void *) calobj;
-	new_data.size = strlen(calobj); // + 1
-
-	/* add the new record to the database */
-	if ((ret = cbdb->priv->history_db->put(cbdb->priv->objects_db,
-	                                       tid,
-	                                       &key,
-	                                       &new_data,
-	                                       0)) != 0) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* update_object handler for the DB backend */
-static gboolean
-cal_backend_db_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalBackendDB *cbdb;
-	DB_TXN *tid;
-	DBT key;
-	DBT new_data;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(cbdb->priv->objects_db != NULL, FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	g_return_val_if_fail(calobj != NULL, FALSE);
-
-	/* start transaction */
-	tid = begin_transaction(cbdb);
-	if (!tid)
-		return FALSE;
-	
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-		
-	memset(&new_data, 0, sizeof(new_data));
-	new_data.data = (void *) calobj;
-	new_data.size = strlen(calobj); // + 1
-		
-	if ((ret = cbdb->priv->objects_db->put(cbdb->priv->objects_db,
-	                                       tid,
-	                                       &key,
-	                                       &new_data,
-	                                       0)) != 0) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-			
-	if (!add_history(cbdb, tid, uid, calobj)) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-	commit_transaction(tid);
-	
-	do_notify(cbdb, cal_notify_update, uid);
-	return TRUE;
-}
-
-/* remove_object handler for the DB backend */
-static gboolean
-cal_backend_db_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendDB *cbdb;
-	DB_TXN *tid;
-	DBT key;
-	gint ret;
-
-	cbdb = CAL_BACKEND_DB(backend);
-	g_return_val_if_fail(IS_CAL_BACKEND_DB(cbdb), FALSE);
-	g_return_val_if_fail(cbdb->priv != NULL, FALSE);
-	g_return_val_if_fail(uid != NULL, FALSE);
-	
-	memset(&key, 0, sizeof(key));
-	key.data = (void *) uid;
-	key.size = strlen(uid); // + 1
-
-	/* start transaction */
-	tid = begin_transaction(cbdb);
-	if (!tid)
-		return FALSE;
-
-	/* remove record from database */
-	if ((ret = cbdb->priv->objects_db->del(cbdb->priv->objects_db, tid, &key, 0)) != 0) {
-		rollback_transaction(tid);
-		return FALSE;
-	}
-			
-	/* TODO: update history database */
-	commit_transaction(tid);
-	
-	do_notify(cbdb, cal_notify_remove, uid);
-			
-	return TRUE;
-}
diff --git a/calendar/pcs/cal-backend-db.h b/calendar/pcs/cal-backend-db.h
deleted file mode 100644
index c73dbb5a83..0000000000
--- a/calendar/pcs/cal-backend-db.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Evolution calendar - iCalendar DB backend
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Rodrigo Moya <rodrigo@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 Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_DB_H
-#define CAL_BACKEND_DB_H
-
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-#define CAL_BACKEND_DB_TYPE            (cal_backend_db_get_type ())
-#define CAL_BACKEND_DB(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_DB_TYPE,		\
-					  CalBackendDB))
-#define CAL_BACKEND_DB_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_DB_TYPE,	\
-					  CalBackendDBClass))
-#define IS_CAL_BACKEND_DB(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_DB_TYPE))
-#define IS_CAL_BACKEND_DB_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_DB_TYPE))
-
-typedef struct _CalBackendDB CalBackendDB;
-typedef struct _CalBackendDBClass CalBackendDBClass;
-
-typedef struct _CalBackendDBPrivate CalBackendDBPrivate;
-
-struct _CalBackendDB {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendDBPrivate *priv;
-};
-
-struct _CalBackendDBClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_db_get_type (void);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
deleted file mode 100644
index b3b3196324..0000000000
--- a/calendar/pcs/cal-backend-file.c
+++ /dev/null
@@ -1,1594 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-util/e-dbhash.h"
-#include "cal-util/cal-recur.h"
-#include "cal-backend-file.h"
-
-
-
-/* Private part of the CalBackendFile structure */
-struct _CalBackendFilePrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* List of Cal objects with their listeners */
-	GList *clients;
-
-	/* Toplevel VCALENDAR component */
-	icalcomponent *icalcomp;
-
-	/* All the CalComponent objects in the calendar, hashed by UID.  The
-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not
-	 * copied, so don't free it when you remove an object from the hash
-	 * table.
-	 */
-	GHashTable *comp_uid_hash;
-
-	/* All event, to-do, and journal components in the calendar; they are
-	 * here just for easy access (i.e. so that you don't have to iterate
-	 * over the comp_uid_hash).  If you need *all* the components in the
-	 * calendar, iterate over the hash instead.
-	 */
-	GList *events;
-	GList *todos;
-	GList *journals;
-
-	/* Idle handler for saving the calendar when it is dirty */
-	guint idle_id;
-};
-
-
-
-static void cal_backend_file_class_init (CalBackendFileClass *class);
-static void cal_backend_file_init (CalBackendFile *cbfile);
-static void cal_backend_file_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_file_get_uri (CalBackend *backend);
-static void cal_backend_file_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendOpenStatus cal_backend_file_open (CalBackend *backend, GnomeVFSURI *uri,
-						   gboolean only_if_exists);
-
-static int cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type);
-static char *cal_backend_file_get_object (CalBackend *backend, const char *uid);
-static CalObjType cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);
-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-						     time_t start, time_t end);
-static GNOME_Evolution_Calendar_CalObjChangeSeq *cal_backend_file_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_file_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end);
-
-static GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_file_get_alarms_for_object (
-	CalBackend *backend, const char *uid,
-	time_t start, time_t end, gboolean *object_found);
-
-static gboolean cal_backend_file_update_object (CalBackend *backend, const char *uid,
-					       const char *calobj);
-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);
-
-static CalBackendClass *parent_class;
-
-
-
-/**
- * cal_backend_file_get_type:
- * @void: 
- * 
- * Registers the #CalBackendFile class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalBackendFile class.
- **/
-GtkType
-cal_backend_file_get_type (void)
-{
-	static GtkType cal_backend_file_type = 0;
-
-	if (!cal_backend_file_type) {
-		static const GtkTypeInfo cal_backend_file_info = {
-			"CalBackendFile",
-			sizeof (CalBackendFile),
-			sizeof (CalBackendFileClass),
-			(GtkClassInitFunc) cal_backend_file_class_init,
-			(GtkObjectInitFunc) cal_backend_file_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &cal_backend_file_info);
-	}
-
-	return cal_backend_file_type;
-}
-
-/* Class initialization function for the file backend */
-static void
-cal_backend_file_class_init (CalBackendFileClass *class)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) class;
-	backend_class = (CalBackendClass *) class;
-
-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_file_destroy;
-
-	backend_class->get_uri = cal_backend_file_get_uri;
-	backend_class->add_cal = cal_backend_file_add_cal;
-	backend_class->open = cal_backend_file_open;
-	backend_class->get_n_objects = cal_backend_file_get_n_objects;
-	backend_class->get_object = cal_backend_file_get_object;
-	backend_class->get_type_by_uid = cal_backend_file_get_type_by_uid;
-	backend_class->get_uids = cal_backend_file_get_uids;
-	backend_class->get_objects_in_range = cal_backend_file_get_objects_in_range;
-	backend_class->get_changes = cal_backend_file_get_changes;
-	backend_class->get_alarms_in_range = cal_backend_file_get_alarms_in_range;
-	backend_class->get_alarms_for_object = cal_backend_file_get_alarms_for_object;
-	backend_class->update_object = cal_backend_file_update_object;
-	backend_class->remove_object = cal_backend_file_remove_object;
-}
-
-/* Object initialization function for the file backend */
-static void
-cal_backend_file_init (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = g_new0 (CalBackendFilePrivate, 1);
-	cbfile->priv = priv;
-}
-
-/* g_hash_table_foreach() callback to destroy a CalComponent */
-static void
-free_cal_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-
-	comp = CAL_COMPONENT (value);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Saves the calendar data */
-static void
-save (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GnomeVFSFileSize out;
-	gchar *tmp;
-	char *buf;
-	
-	priv = cbfile->priv;
-	g_assert (priv->uri != NULL);
-	g_assert (priv->icalcomp != NULL);
-
-	/* Make a backup copy of the file if it exists */
-	tmp = gnome_vfs_uri_to_string (priv->uri, GNOME_VFS_URI_HIDE_NONE);
-	if (tmp) {
-		GnomeVFSURI *backup_uri;
-		gchar *backup_uristr;
-		
-		backup_uristr = g_strconcat (tmp, "~", NULL);
-		backup_uri = gnome_vfs_uri_new (backup_uristr);
-		
-		result = gnome_vfs_move_uri (priv->uri, backup_uri, TRUE);
-		gnome_vfs_uri_unref (backup_uri);
-		
-		g_free (tmp);
-		g_free (backup_uristr);
-	}
-	
-	/* Now write the new file out */
-	result = gnome_vfs_create_uri (&handle, priv->uri, 
-				       GNOME_VFS_OPEN_WRITE,
-				       FALSE, 0666);
-	
-	if (result != GNOME_VFS_OK)
-		goto error;
-	
-	buf = icalcomponent_as_ical_string (priv->icalcomp);
-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
-
-	if (result != GNOME_VFS_OK)
-		goto error;
-
-	gnome_vfs_close (handle);
-
-	return;
-	
- error:
-	g_warning ("Error writing calendar file.");
-	return;
-}
-
-/* Destroy handler for the file backend */
-static void
-cal_backend_file_destroy (GtkObject *object)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));
-
-	cbfile = CAL_BACKEND_FILE (object);
-	priv = cbfile->priv;
-
-	g_assert (priv->clients == NULL);
-
-	/* Save if necessary */
-
-	if (priv->idle_id != 0) {
-		save (cbfile);
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
-
-	/* Clean up */
-
-	if (priv->uri) {
-		gnome_vfs_uri_unref (priv->uri);
-		priv->uri = NULL;
-	}
-
-	if (priv->comp_uid_hash) {
-		g_hash_table_foreach (priv->comp_uid_hash, 
-				      free_cal_component, NULL);
-		g_hash_table_destroy (priv->comp_uid_hash);
-		priv->comp_uid_hash = NULL;
-	}
-
-	g_list_free (priv->events);
-	g_list_free (priv->todos);
-	g_list_free (priv->journals);
-
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = NULL;
-
-	if (priv->icalcomp) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-
-	g_free (priv);
-	cbfile->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Looks up a component by its UID on the backend's component hash table */
-static CalComponent *
-lookup_component (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	priv = cbfile->priv;
-
-	comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-
-	return comp;
-}
-
-
-
-/* Calendar backend methods */
-
-/* Get_uri handler for the file backend */
-static GnomeVFSURI *
-cal_backend_file_get_uri (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->uri != NULL);
-
-	return priv->uri;
-}
-
-/* Callback used when a Cal is destroyed */
-static void
-cal_destroy_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *lcal;
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	cal = CAL (object);
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	/* Find the cal in the list of clients */
-
-	for (l = priv->clients; l; l = l->next) {
-		lcal = CAL (l->data);
-
-		if (lcal == cal)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	priv->clients = g_list_remove_link (priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!priv->clients)
-		cal_backend_last_client_gone (CAL_BACKEND (cbfile));
-}
-
-/* Add_cal handler for the file backend */
-static void
-cal_backend_file_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp != NULL);
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	/* We do not keep a reference to the Cal since the calendar user agent
-	 * owns it.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (cal), "destroy",
-			    GTK_SIGNAL_FUNC (cal_destroy_cb),
-			    backend);
-
-	priv->clients = g_list_prepend (priv->clients, cal);
-}
-
-/* Idle handler; we save the calendar since it is dirty */
-static gboolean
-save_idle (gpointer data)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	save (cbfile);
-
-	priv->idle_id = 0;
-	return FALSE;
-}
-
-/* Marks the file backend as dirty and queues a save operation */
-static void
-mark_dirty (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	if (priv->idle_id != 0)
-		return;
-
-	priv->idle_id = g_idle_add (save_idle, cbfile);
-}
-
-/* Checks if the specified component has a duplicated UID and if so changes it */
-static void
-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *old_comp;
-	const char *uid;
-	char *new_uid;
-
-	priv = cbfile->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	old_comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-	if (!old_comp)
-		return; /* Everything is fine */
-
-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);
-
-	new_uid = cal_component_gen_uid ();
-	cal_component_set_uid (comp, new_uid);
-	g_free (new_uid);
-
-	/* FIXME: I think we need to reset the SEQUENCE property and reset the
-	 * CREATED/DTSTAMP/LAST-MODIFIED.
-	 */
-
-	mark_dirty (cbfile);
-}
-
-/* Tries to add an icalcomponent to the file backend.  We only store the objects
- * of the types we support; all others just remain in the toplevel component so
- * that we don't lose them.
- */
-static void
-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)
-{
-	CalBackendFilePrivate *priv;
-	GList **list;
-	const char *uid;
-	
-	priv = cbfile->priv;
-
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* Ensure that the UID is unique; some broken implementations spit
-	 * components with duplicated UIDs.
-	 */
-	check_dup_uid (cbfile, comp);
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_insert (priv->comp_uid_hash, (char *)uid, comp);
-
-	*list = g_list_prepend (*list, comp);
-
-	/* Put the object in the toplevel component if required */
-
-	if (add_to_toplevel) {
-		icalcomponent *icalcomp;
-
-		icalcomp = cal_component_get_icalcomponent (comp);
-		g_assert (icalcomp != NULL);
-
-		icalcomponent_add_component (priv->icalcomp, icalcomp);
-	}
-}
-
-/* Removes a component from the backend's hash and lists.  Does not perform
- * notification on the clients.  Also removes the component from the toplevel
- * icalcomponent.
- */
-static void
-remove_component (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	const char *uid;
-	GList **list, *l;
-
-	priv = cbfile->priv;
-
-	/* Remove the icalcomp from the toplevel */
-
-	icalcomp = cal_component_get_icalcomponent (comp);
-	g_assert (icalcomp != NULL);
-
-	icalcomponent_remove_component (priv->icalcomp, icalcomp);
-
-	/* Remove it from our mapping */
-
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_remove (priv->comp_uid_hash, uid);
-	
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-                /* Make the compiler shut up. */
-	        list = NULL;
-		g_assert_not_reached ();
-	}
-
-	l = g_list_find (*list, comp);
-	g_assert (l != NULL);
-
-	*list = g_list_remove_link (*list, l);
-	g_list_free_1 (l);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Scans the toplevel VCALENDAR component and stores the objects it finds */
-static void
-scan_vcalendar (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	icalcompiter iter;
-
-	priv = cbfile->priv;
-	g_assert (priv->icalcomp != NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_ANY_COMPONENT);
-	     icalcompiter_deref (&iter) != NULL;
-	     icalcompiter_next (&iter)) {
-		icalcomponent *icalcomp;
-		icalcomponent_kind kind;
-		CalComponent *comp;
-
-		icalcomp = icalcompiter_deref (&iter);
-		
-		kind = icalcomponent_isa (icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, icalcomp))
-			continue;
-
-		add_component (cbfile, comp, FALSE);
-	}
-}
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line_fn (char *s, size_t size, void *data)
-{
-	FILE *file;
-
-	file = data;
-	return fgets (s, size, file);
-}
-
-/* Parses an open iCalendar file and returns a toplevel component with the contents */
-static icalcomponent *
-parse_file (FILE *file)
-{
-	icalparser *parser;
-	icalcomponent *icalcomp;
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, file);
-
-	icalcomp = icalparser_parse (parser, get_line_fn);
-	icalparser_free (parser);
-
-	return icalcomp;
-}
-
-/* Parses an open iCalendar file and loads it into the backend */
-static CalBackendOpenStatus
-open_cal (CalBackendFile *cbfile, GnomeVFSURI *uri, FILE *file)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-
-	priv = cbfile->priv;
-
-	icalcomp = parse_file (file);
-
-	if (fclose (file) != 0) {
-		if (icalcomp)
-			icalcomponent_free (icalcomp);
-
-		return CAL_BACKEND_OPEN_ERROR;
-	}
-
-	if (!icalcomp)
-		return CAL_BACKEND_OPEN_ERROR;
-		
-	/* FIXME: should we try to demangle XROOT components and
-	 * individual components as well?
-	 */
-
-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT)
-		return CAL_BACKEND_OPEN_ERROR;
-
-	priv->icalcomp = icalcomp;
-
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	scan_vcalendar (cbfile);
-
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-static CalBackendOpenStatus
-create_cal (CalBackendFile *cbfile, GnomeVFSURI *uri)
-{
-	CalBackendFilePrivate *priv;
-	icalproperty *prop;
-
-	priv = cbfile->priv;
-
-	/* Create the new calendar information */
-
-	priv->icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-
-	/* RFC 2445, section 4.7.1 */
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.3 */
-	prop = icalproperty_new_prodid ("-//Ximian//NONSGML Evolution Calendar//EN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.4.  This is the iCalendar spec version, *NOT*
-	 * the product version!  Do not change this!
-	 */
-	prop = icalproperty_new_version ("2.0");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* Create our internal data */
-
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	mark_dirty (cbfile);
-
-	return CAL_BACKEND_OPEN_SUCCESS;
-}
-
-/* Open handler for the file backend */
-static CalBackendOpenStatus
-cal_backend_file_open (CalBackend *backend, GnomeVFSURI *uri, gboolean only_if_exists)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	char *str_uri;
-	FILE *file;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp == NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (priv->uri == NULL);
-	g_assert (priv->comp_uid_hash == NULL);
-
-	if (!gnome_vfs_uri_is_local (uri))
-		return CAL_BACKEND_OPEN_ERROR;
-
-	str_uri = gnome_vfs_uri_to_string (uri,
-					   (GNOME_VFS_URI_HIDE_USER_NAME
-					    | GNOME_VFS_URI_HIDE_PASSWORD
-					    | GNOME_VFS_URI_HIDE_HOST_NAME
-					    | GNOME_VFS_URI_HIDE_HOST_PORT
-					    | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));
-
-	/* Load! */
-	file = fopen (str_uri, "r");
-	g_free (str_uri);
-
-	if (file)
-		return open_cal (cbfile, uri, file);
-	else {
-		if (only_if_exists)
-			return CAL_BACKEND_OPEN_NOT_FOUND;
-
-		return create_cal (cbfile, uri);
-	}
-}
-
-/* Get_n_objects handler for the file backend */
-static int
-cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	int n;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, -1);
-
-	n = 0;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		n += g_list_length (priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		n += g_list_length (priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		n += g_list_length (priv->journals);
-
-	return n;
-}
-
-/* Get_object handler for the file backend */
-static char *
-cal_backend_file_get_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	comp = lookup_component (cbfile, uid);
-
-	if (!comp)
-		return NULL;
-
-	return cal_component_get_as_string (comp);
-}
-
-static CalObjType
-cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	CalComponentVType type;
-	
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return CAL_COMPONENT_NO_TYPE;
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return CALOBJ_TYPE_EVENT;
-	case CAL_COMPONENT_TODO:
-		return CALOBJ_TYPE_TODO;
-	case CAL_COMPONENT_JOURNAL:
-		return CALOBJ_TYPE_JOURNAL;
-	default:
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/* Builds a list of UIDs from a list of CalComponent objects */
-static void
-build_uids_list (GList **list, GList *components)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		const char *uid;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_component_get_uid (comp, &uid);
-		*list = g_list_prepend (*list, g_strdup (uid));
-	}
-}
-
-/* Get_uids handler for the file backend */
-static GList *
-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *list;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	list = NULL;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		build_uids_list (&list, priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		build_uids_list (&list, priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		build_uids_list (&list, priv->journals);
-
-	return list;
-}
-
-/* Callback used from cal_recur_generate_instances(); adds the component's UID
- * to our hash table.
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	/* We only care that the component's UID is listed in the hash table;
-	 * that's why we only allow generation of one instance (i.e. return
-	 * FALSE every time).
-	 */
-
-	cal_component_get_uid (comp, &uid);
-
-	old_uid = g_hash_table_lookup (uid_hash, uid);
-	if (old_uid)
-		return FALSE;
-
-	g_hash_table_insert (uid_hash, (char *) uid, NULL);
-	return FALSE;
-}
-
-/* Populates a hash table with the UIDs of the components that occur or recur
- * within a specific time range.
- */
-static void
-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash);
-	}
-}
-
-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */
-static void
-add_uid_to_list (gpointer key, gpointer value, gpointer data)
-{
-	GList **list;
-	const char *uid;
-	char *uid_copy;
-
-	list = data;
-
-	uid = key;
-	uid_copy = g_strdup (uid);
-
-	*list = g_list_prepend (*list, uid_copy);
-}
-
-/* Get_objects_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-				       time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *event_list;
-	GHashTable *uid_hash;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (type & CALOBJ_TYPE_EVENT)
-		get_instances_in_range (uid_hash, priv->events, start, end);
-
-	if (type & CALOBJ_TYPE_TODO)
-		get_instances_in_range (uid_hash, priv->todos, start, end);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		get_instances_in_range (uid_hash, priv->journals, start, end);
-
-	event_list = NULL;
-	g_hash_table_foreach (uid_hash, add_uid_to_list, &event_list);
-	g_hash_table_destroy (uid_hash);
-
-	return event_list;
-}
-
-
-typedef struct 
-{
-	CalBackend *backend;
-	GList *changes;
-	GList *change_ids;
-} CalBackendFileComputeChangesData;
-
-static void
-cal_backend_file_compute_changes_foreach_key (const char *key, gpointer data)
-{
-	CalBackendFileComputeChangesData *be_data = data;
-	char *calobj = cal_backend_get_object (be_data->backend, key);
-	
-	if (calobj == NULL) {
-		CalComponent *comp;
-		GNOME_Evolution_Calendar_CalObjChange *coc;
-
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, key);
-
-		coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-		coc->calobj =  CORBA_string_dup (cal_component_get_as_string (comp));
-		coc->type = GNOME_Evolution_Calendar_DELETED;
-		be_data->changes = g_list_prepend (be_data->changes, coc);
-		be_data->change_ids = g_list_prepend (be_data->change_ids, (gpointer) key);
- 	}
-}
-
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_file_compute_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	char    *filename;
-	EDbHash *ehash;
-	CalBackendFileComputeChangesData be_data;
-	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
-	GList *uids, *changes = NULL, *change_ids = NULL;
-	GList *i, *j;
-	int n;
-	
-	/* Find the changed ids - FIX ME, path should not be hard coded */
-	if (type == GNOME_Evolution_Calendar_TYPE_TODO)
-		filename = g_strdup_printf ("%s/evolution/local/Tasks/%s.db", g_get_home_dir (), change_id);
-	else 
-		filename = g_strdup_printf ("%s/evolution/local/Calendar/%s.db", g_get_home_dir (), change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	
-	uids = cal_backend_get_uids (backend, type);
-	
-	/* Calculate adds and modifies */
-	for (i = uids; i != NULL; i = i->next) {
-		GNOME_Evolution_Calendar_CalObjChange *coc;
-		char *uid = i->data;
-		char *calobj = cal_backend_get_object (backend, uid);
-
-		g_assert (calobj != NULL);
-
-		/* check what type of change has occurred, if any */
-		switch (e_dbhash_compare (ehash, uid, calobj)) {
-		case E_DBHASH_STATUS_SAME:
-			break;
-		case E_DBHASH_STATUS_NOT_FOUND:
-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-			coc->calobj =  CORBA_string_dup (calobj);
-			coc->type = GNOME_Evolution_Calendar_ADDED;
-			changes = g_list_prepend (changes, coc);
-			change_ids = g_list_prepend (change_ids, uid);
-			break;
-		case E_DBHASH_STATUS_DIFFERENT:
-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();
-			coc->calobj =  CORBA_string_dup (calobj);
-			coc->type = GNOME_Evolution_Calendar_ADDED;
-			changes = g_list_append (changes, coc);
-			change_ids = g_list_prepend (change_ids, uid);
-			break;
-		}
-	}
-
-	/* Calculate deletions */
-	be_data.backend = backend;
-	be_data.changes = changes;
-	be_data.change_ids = change_ids;
-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)cal_backend_file_compute_changes_foreach_key, &be_data);
-	changes = be_data.changes;
-	change_ids = be_data.change_ids;
-	
-	/* Build the sequence and update the hash */
-	n = g_list_length (changes);
-
-	seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc ();
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n);
-	CORBA_sequence_set_release (seq, TRUE);
-
-	for (i = changes, j = change_ids, n = 0; i != NULL; i = i->next, j = j->next, n++) {
-		GNOME_Evolution_Calendar_CalObjChange *coc = i->data;
-		GNOME_Evolution_Calendar_CalObjChange *seq_coc;
-		char *uid = j->data;
-
-		/* sequence building */
-		seq_coc = &seq->_buffer[n];
-		seq_coc->calobj = CORBA_string_dup (coc->calobj);
-		seq_coc->type = coc->type;
-
-		/* hash updating */
-		if (coc->type == GNOME_Evolution_Calendar_ADDED 
-		    || coc->type == GNOME_Evolution_Calendar_MODIFIED) {
-			e_dbhash_add (ehash, uid, coc->calobj);
-		} else {
-			e_dbhash_remove (ehash, uid);
-		}		
-
-		CORBA_free (coc);
-	}	
-  	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-
-	cal_obj_uid_list_free (uids);
-	g_list_free (change_ids);
-	g_list_free (changes);
-	
-	return seq;
-}
-
-/* Get_changes handler for the file backend */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_file_get_changes (CalBackend *backend, CalObjType type, const char *change_id)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	return cal_backend_file_compute_changes (backend, type, change_id);
-}
-
-/* Computes the range of time in which recurrences should be generated for a
- * component in order to compute alarm trigger times.
- */
-static void
-compute_alarm_range (CalComponent *comp, GList *alarm_uids, time_t start, time_t end,
-		     time_t *alarm_start, time_t *alarm_end)
-{
-	GList *l;
-
-	*alarm_start = start;
-	*alarm_end = end;
-
-	for (l = alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		switch (trigger.type) {
-		case CAL_ALARM_TRIGGER_NONE:
-		case CAL_ALARM_TRIGGER_ABSOLUTE:
-			continue;
-
-		case CAL_ALARM_TRIGGER_RELATIVE_START:
-		case CAL_ALARM_TRIGGER_RELATIVE_END:
-			dur = &trigger.u.rel_duration;
-  			dur_time = icaldurationtype_as_int (*dur);
-
-			if (dur->is_neg)
-				*alarm_end = MAX (*alarm_end, end + dur_time);
-			else
-				*alarm_start = MIN (*alarm_start, start - dur_time);
-
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	g_assert (*alarm_start <= *alarm_end);
-}
-
-/* Closure data to generate alarm occurrences */
-struct alarm_occurrence_data {
-	/* These are the info we have */
-	GList *alarm_uids;
-	time_t start;
-	time_t end;
-
-	/* This is what we compute */
-	GSList *triggers;
-	int n_triggers;
-};
-
-/* Callback used from cal_recur_generate_instances(); generates triggers for all
- * of a component's RELATIVE alarms.
- */
-static gboolean
-add_alarm_occurrences_cb (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	struct alarm_occurrence_data *aod;
-	GList *l;
-
-	aod = data;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		struct icaldurationtype *dur;
-		time_t dur_time;
-		time_t occur_time, trigger_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_RELATIVE_START
-		    && trigger.type != CAL_ALARM_TRIGGER_RELATIVE_END)
-			continue;
-
-		dur = &trigger.u.rel_duration;
-  		dur_time = icaldurationtype_as_int (*dur);
-
-		if (trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START)
-			occur_time = start;
-		else
-			occur_time = end;
-
-		if (dur->is_neg)
-			trigger_time = occur_time - dur_time;
-		else
-			trigger_time = occur_time + dur_time;
-
-		if (trigger_time < aod->start || trigger_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = trigger_time;
-		instance->occur = occur_time;
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-
-	return TRUE;
-}
-
-/* Generates the absolute triggers for a component */
-static void
-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod)
-{
-	GList *l;
-
-	for (l = aod->alarm_uids; l; l = l->next) {
-		const char *auid;
-		CalComponentAlarm *alarm;
-		CalAlarmTrigger trigger;
-		time_t abs_time;
-		CalAlarmInstance *instance;
-
-		auid = l->data;
-		alarm = cal_component_get_alarm (comp, auid);
-		g_assert (alarm != NULL);
-
-		cal_component_alarm_get_trigger (alarm, &trigger);
-		cal_component_alarm_free (alarm);
-
-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)
-			continue;
-
-		abs_time = icaltime_as_timet (trigger.u.abs_time);
-
-		if (abs_time < aod->start || abs_time >= aod->end)
-			continue;
-
-		instance = g_new (CalAlarmInstance, 1);
-		instance->auid = auid;
-		instance->trigger = abs_time;
-		instance->occur = abs_time; /* No particular occurrence, so just use the same time */
-
-		aod->triggers = g_slist_prepend (aod->triggers, instance);
-		aod->n_triggers++;
-	}
-}
-
-/* Compares two alarm instances; called from g_slist_sort() */
-static gint
-compare_alarm_instance (gconstpointer a, gconstpointer b)
-{
-	const CalAlarmInstance *aia, *aib;
-
-	aia = a;
-	aib = b;
-
-	if (aia->trigger < aib->trigger)
-		return -1;
-	else if (aia->trigger > aib->trigger)
-		return 1;
-	else
-		return 0;
-}
-
-/* Generates alarm instances for a calendar component.  Returns the instances
- * structure, or NULL if no alarm instances occurred in the specified time
- * range.
- */
-static CalComponentAlarms *
-generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
-{
-	GList *alarm_uids;
-	time_t alarm_start, alarm_end;
-	struct alarm_occurrence_data aod;
-	CalComponentAlarms *alarms;
-
-	if (!cal_component_has_alarms (comp))
-		return NULL;
-
-	alarm_uids = cal_component_get_alarm_uids (comp);
-	compute_alarm_range (comp, alarm_uids, start, end, &alarm_start, &alarm_end);
-
-	aod.alarm_uids = alarm_uids;
-	aod.start = start;
-	aod.end = end;
-	aod.triggers = NULL;
-	aod.n_triggers = 0;
-	cal_recur_generate_instances (comp, alarm_start, alarm_end, add_alarm_occurrences_cb, &aod);
-
-	/* We add the ABSOLUTE triggers separately */
-	generate_absolute_triggers (comp, &aod);
-
-	if (aod.n_triggers == 0)
-		return NULL;
-
-	/* Create the component alarm instances structure */
-
-	alarms = g_new (CalComponentAlarms, 1);
-	alarms->comp = comp;
-	gtk_object_ref (GTK_OBJECT (alarms->comp));
-	alarms->alarms = g_slist_sort (aod.triggers, compare_alarm_instance);
-
-	return alarms;
-}
-
-/* Iterates through all the components in the comps list and generates alarm
- * instances for them; putting them in the comp_alarms list.  Returns the number
- * of elements it added to that list.
- */
-static int
-generate_alarms_for_list (GList *comps, time_t start, time_t end, GSList **comp_alarms)
-{
-	GList *l;
-	int n;
-
-	n = 0;
-
-	for (l = comps; l; l = l->next) {
-		CalComponent *comp;
-		CalComponentAlarms *alarms;
-
-		comp = CAL_COMPONENT (l->data);
-		alarms = generate_alarms_for_comp (comp, start, end);
-
-		if (alarms) {
-			*comp_alarms = g_slist_prepend (*comp_alarms, alarms);
-			n++;
-		}
-	}
-
-	return n;
-}
-
-/* Fills a CORBA sequence of alarm instances */
-static void
-fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms)
-{
-	int n_alarms;
-	GSList *l;
-	int i;
-
-	n_alarms = g_slist_length (alarms);
-
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n_alarms;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n_alarms);
-
-	for (l = alarms, i = 0; l; l = l->next, i++) {
-		CalAlarmInstance *instance;
-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;
-
-		instance = l->data;
-		corba_instance = seq->_buffer + i;
-
-		corba_instance->auid = CORBA_string_dup (instance->auid);
-		corba_instance->trigger = (long) instance->trigger;
-		corba_instance->occur = (long) instance->occur;
-	}
-}
-
-/* Get_alarms_in_range handler for the file backend */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	int n_comp_alarms;
-	GSList *comp_alarms;
-	GSList *l;
-	int i;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* Per RFC 2445, only VEVENTs and VTODOs can have alarms */
-
-	n_comp_alarms = 0;
-	comp_alarms = NULL;
-
-	n_comp_alarms += generate_alarms_for_list (priv->events, start, end, &comp_alarms);
-	n_comp_alarms += generate_alarms_for_list (priv->todos, start, end, &comp_alarms);
-
-	seq = GNOME_Evolution_Calendar_CalComponentAlarmsSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n_comp_alarms;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalComponentAlarms_allocbuf (
-		n_comp_alarms);
-
-	for (l = comp_alarms, i = 0; l; l = l->next, i++) {
-		CalComponentAlarms *alarms;
-		char *comp_str;
-
-		alarms = l->data;
-
-		comp_str = cal_component_get_as_string (alarms->comp);
-		seq->_buffer[i].calobj = CORBA_string_dup (comp_str);
-		g_free (comp_str);
-
-		fill_alarm_instances_seq (&seq->_buffer[i].alarms, alarms->alarms);
-
-		cal_component_alarms_free (alarms);
-	}
-
-	g_slist_free (comp_alarms);
-
-	return seq;
-}
-
-/* Get_alarms_for_object handler for the file backend */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-					time_t start, time_t end, gboolean *object_found)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	char *comp_str;
-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;
-	CalComponentAlarms *alarms;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (uid != NULL, NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-	g_return_val_if_fail (object_found != NULL, NULL);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp) {
-		*object_found = FALSE;
-		return NULL;
-	}
-
-	*object_found = TRUE;
-
-	comp_str = cal_component_get_as_string (comp);
-	corba_alarms = GNOME_Evolution_Calendar_CalComponentAlarms__alloc ();
-
-	corba_alarms->calobj = CORBA_string_dup (comp_str);
-	g_free (comp_str);
-
-	alarms = generate_alarms_for_comp (comp, start, end);
-	if (alarms) {
-		fill_alarm_instances_seq (&corba_alarms->alarms, alarms->alarms);
-		cal_component_alarms_free (alarms);
-	} else
-		fill_alarm_instances_seq (&corba_alarms->alarms, NULL);
-
-	return corba_alarms;
-}
-
-/* Notifies a backend's clients that an object was updated */
-static void
-notify_update (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_update (cal, uid);
-	}
-}
-
-/* Notifies a backend's clients that an object was removed */
-static void
-notify_remove (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_remove (cal, uid);
-	}
-}
-
-/* Update_object handler for the file backend */
-static gboolean
-cal_backend_file_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-	CalComponent *old_comp;
-	CalComponent *comp;
-	const char *comp_uid;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	/* Pull the component from the string and ensure that it is sane */
-
-	icalcomp = icalparser_parse_string ((char *) calobj);
-
-	if (!icalcomp)
-		return FALSE;
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT)) {
-		/* We don't support this type of component */
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	/* Check the UID for sanity's sake */
-
-	cal_component_get_uid (comp, &comp_uid);
-
-	if (strcmp (uid, comp_uid) != 0) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return FALSE;
-	}
-
-	/* Update the component */
-
-	old_comp = lookup_component (cbfile, uid);
-
-	if (old_comp)
-		remove_component (cbfile, old_comp);
-
-	add_component (cbfile, comp, TRUE);
-
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_update (cbfile, comp_uid);
-
-	return TRUE;
-}
-
-/* Remove_object handler for the file backend */
-static gboolean
-cal_backend_file_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return FALSE;
-
-	remove_component (cbfile, comp);
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_remove (cbfile, uid);
-
-	return TRUE;
-}
-
diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h
deleted file mode 100644
index a85c6d20fd..0000000000
--- a/calendar/pcs/cal-backend-file.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_FILE_H
-#define CAL_BACKEND_FILE_H
-
-#include <libgnome/gnome-defs.h>
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())
-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\
-					  CalBackendFile))
-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\
-					  CalBackendFileClass))
-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))
-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))
-
-typedef struct _CalBackendFile CalBackendFile;
-typedef struct _CalBackendFileClass CalBackendFileClass;
-
-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;
-
-struct _CalBackendFile {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendFilePrivate *priv;
-};
-
-struct _CalBackendFileClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_file_get_type (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
deleted file mode 100644
index a8c6aa9776..0000000000
--- a/calendar/pcs/cal-backend.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/parserInternals.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "cal-backend.h"
-#include "libversit/vcc.h"
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_backend_class_init (CalBackendClass *class);
-
-static guint cal_backend_signals[LAST_SIGNAL];
-
-#define CLASS(backend) (CAL_BACKEND_CLASS (GTK_OBJECT (backend)->klass))
-
-
-
-/**
- * cal_backend_get_type:
- * @void:
- *
- * Registers the #CalBackend class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalBackend class.
- **/
-GtkType
-cal_backend_get_type (void)
-{
-	static GtkType cal_backend_type = 0;
-
-	if (!cal_backend_type) {
-		static const GtkTypeInfo cal_backend_info = {
-			"CalBackend",
-			sizeof (CalBackend),
-			sizeof (CalBackendClass),
-			(GtkClassInitFunc) cal_backend_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_type =
-			gtk_type_unique (GTK_TYPE_OBJECT, &cal_backend_info);
-	}
-
-	return cal_backend_type;
-}
-
-/* Class initialization function for the calendar backend */
-static void
-cal_backend_class_init (CalBackendClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	cal_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);
-}
-
-
-
-/**
- * cal_backend_get_uri:
- * @backend: A calendar backend.
- *
- * Queries the URI of a calendar backend, which must already have an open
- * calendar.
- *
- * Return value: The URI where the calendar is stored.
- **/
-GnomeVFSURI *
-cal_backend_get_uri (CalBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * cal_backend_add_cal:
- * @backend: A calendar backend.
- * @cal: A calendar client interface object.
- *
- * Adds a calendar client interface object to a calendar @backend.
- * The calendar backend must already have an open calendar.
- **/
-void
-cal_backend_add_cal (CalBackend *backend, Cal *cal)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_assert (CLASS (backend)->add_cal != NULL);
-	(* CLASS (backend)->add_cal) (backend, cal);
-}
-
-/**
- * cal_backend_open:
- * @backend: A calendar backend.
- * @uri: URI that contains the calendar data.
- * @only_if_exists: Whether the calendar should be opened only if it already
- * exists.  If FALSE, a new calendar will be created when the specified @uri
- * does not exist.
- *
- * Opens a calendar backend with data from a calendar stored at the specified
- * URI.
- *
- * Return value: An operation status code.
- **/
-CalBackendOpenStatus
-cal_backend_open (CalBackend *backend, GnomeVFSURI *uri, gboolean only_if_exists)
-{
-	CalBackendOpenStatus result;
-
-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_OPEN_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_OPEN_ERROR);
-
-	g_assert (CLASS (backend)->open != NULL);
-	result =  (* CLASS (backend)->open) (backend, uri, only_if_exists);
-
-	return result;
-}
-
-/**
- * cal_backend_get_n_objects:
- * @backend: A calendar backend.
- * @type: Types of objects that will be included in the count.
- * 
- * Queries the number of calendar objects of a particular type.
- * 
- * Return value: Number of objects of the specified @type.
- **/
-int
-cal_backend_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, -1);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), -1);
-
-	g_assert (CLASS (backend)->get_n_objects != NULL);
-	return (* CLASS (backend)->get_n_objects) (backend, type);
-}
-
-/**
- * cal_backend_get_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- *
- * Queries a calendar backend for a calendar object based on its unique
- * identifier.
- *
- * Return value: The string representation of a complete calendar wrapping the
- * the sought object, or NULL if no object had the specified UID.  A complete
- * calendar is returned because you also need the timezone data.
- **/
-char *
-cal_backend_get_object (CalBackend *backend, const char *uid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_object != NULL);
-	return (* CLASS (backend)->get_object) (backend, uid);
-}
-
-/**
- * cal_backend_get_uids:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- *
- * Builds a list of unique identifiers corresponding to calendar objects whose
- * type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.  The list should be
- * freed using the cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_uids (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uids != NULL);
-	return (* CLASS (backend)->get_uids) (backend, type);
-}
-
-
-/**
- * cal_backend_get_objects_in_range:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Builds a list of unique identifiers corresponding to calendar objects of the
- * specified type that occur or recur within the specified time range.
- * 
- * Return value: A list of UID strings.  The list should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-				  time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_objects_in_range != NULL);
-	return (* CLASS (backend)->get_objects_in_range) (backend, type, start, end);
-}
-
-/**
- * cal_backend_get_changes:
- * @backend: A calendar backend
- * @type: Bitmask with types of objects to return.
- * @change_id: A unique uid for the callers change list
- * 
- * Builds a sequence of objects and the type of change that occurred on them since
- * the last time the give change_id was seen
- * 
- * Return value: A list of the objects that changed and the type of change
- **/
-GNOME_Evolution_Calendar_CalObjChangeSeq *
-cal_backend_get_changes (CalBackend *backend, CalObjType type, const char *change_id) 
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (change_id != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_changes != NULL);
-	return (* CLASS (backend)->get_changes) (backend, type, change_id);
-}
-
-/**
- * cal_backend_get_alarms_in_range:
- * @backend: A calendar backend.
- * @start: Start time for query.
- * @end: End time for query.
- * @valid_range: Return value that says whether the range is valid or not.
- * 
- * Builds a sorted list of the alarms that trigger in the specified time range.
- * 
- * Return value: A sequence of component alarm instances structures, or NULL
- * if @valid_range returns FALSE.
- **/
-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end, gboolean *valid_range)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (valid_range != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_in_range != NULL);
-
-	if (!(start != -1 && end != -1 && start <= end)) {
-		*valid_range = FALSE;
-		return NULL;
-	} else {
-		*valid_range = TRUE;
-		return (* CLASS (backend)->get_alarms_in_range) (backend, start, end);
-	}
-}
-
-/**
- * cal_backend_get_alarms_for_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- * @start: Start time for query.
- * @end: End time for query.
- * @result: Return value for the result code for the operation.
- * 
- * Builds a sorted list of the alarms of the specified event that trigger in a
- * particular time range.
- * 
- * Return value: A structure of the component's alarm instances, or NULL if @result
- * returns something other than #CAL_BACKEND_GET_ALARMS_SUCCESS.
- **/
-GNOME_Evolution_Calendar_CalComponentAlarms *
-cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-				   time_t start, time_t end,
-				   CalBackendGetAlarmsForObjectResult *result)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-	g_return_val_if_fail (result != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_for_object != NULL);
-
-	if (!(start != -1 && end != -1 && start <= end)) {
-		*result = CAL_BACKEND_GET_ALARMS_INVALID_RANGE;
-		return NULL;
-	} else {
-		gboolean object_found;
-		GNOME_Evolution_Calendar_CalComponentAlarms *alarms;
-
-		alarms = (* CLASS (backend)->get_alarms_for_object) (backend, uid, start, end,
-								     &object_found);
-
-		if (object_found)
-			*result = CAL_BACKEND_GET_ALARMS_SUCCESS;
-		else
-			*result = CAL_BACKEND_GET_ALARMS_NOT_FOUND;
-
-		return alarms;
-	}
-}
-
-/**
- * cal_backend_update_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to update.
- * @calobj: String representation of the new calendar object.
- * 
- * Updates an object in a calendar backend.  It will replace any existing
- * object that has the same UID as the specified one.  The backend will in
- * turn notify all of its clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an invalid object or one
- * with an unsupported type.
- **/
-gboolean
-cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	g_assert (CLASS (backend)->update_object != NULL);
-	return (* CLASS (backend)->update_object) (backend, uid, calobj);
-}
-
-/**
- * cal_backend_remove_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to remove.
- * 
- * Removes an object in a calendar backend.  The backend will notify all of its
- * clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an UID for an object
- * that does not exist in the backend.
- **/
-gboolean
-cal_backend_remove_object (CalBackend *backend, const char *uid)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	g_assert (CLASS (backend)->remove_object != NULL);
-	return (* CLASS (backend)->remove_object) (backend, uid);
-}
-
-/**
- * cal_backend_last_client_gone:
- * @backend: A calendar backend.
- * 
- * Emits the "last_client_gone" signal of a calendar backend.  This function is
- * to be used only by backend implementations.
- **/
-void
-cal_backend_last_client_gone (CalBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[LAST_CLIENT_GONE]);
-}
-
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
deleted file mode 100644
index 3784601ddf..0000000000
--- a/calendar/pcs/cal-backend.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_H
-#define CAL_BACKEND_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <cal-util/cal-util.h>
-#include <cal-util/cal-component.h>
-#include "evolution-calendar.h"
-#include "cal-common.h"
-#include "cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_TYPE            (cal_backend_get_type ())
-#define CAL_BACKEND(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_TYPE, CalBackend))
-#define CAL_BACKEND_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_TYPE,		\
-				     CalBackendClass))
-#define IS_CAL_BACKEND(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_TYPE))
-#define IS_CAL_BACKEND_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_TYPE))
-
-/* Load status values */
-typedef enum {
-	CAL_BACKEND_OPEN_SUCCESS,	/* Loading OK */
-	CAL_BACKEND_OPEN_ERROR,		/* We need better error reporting in libversit */
-	CAL_BACKEND_OPEN_NOT_FOUND
-} CalBackendOpenStatus;
-
-/* Result codes for ::get_alarms_in_range() */
-typedef enum {
-	CAL_BACKEND_GET_ALARMS_SUCCESS,
-	CAL_BACKEND_GET_ALARMS_NOT_FOUND,
-	CAL_BACKEND_GET_ALARMS_INVALID_RANGE
-} CalBackendGetAlarmsForObjectResult;
-
-struct _CalBackend {
-	GtkObject object;
-};
-
-struct _CalBackendClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_client_gone) (CalBackend *backend);
-
-	/* Virtual methods */
-	GnomeVFSURI *(* get_uri) (CalBackend *backend);
-	void (* add_cal) (CalBackend *backend, Cal *cal);
-
-	CalBackendOpenStatus (* open) (CalBackend *backend, GnomeVFSURI *uri,
-				       gboolean only_if_exists);
-
-	/* General object acquirement and information related virtual methods */
-	int (* get_n_objects) (CalBackend *backend, CalObjType type);
-	char *(* get_object) (CalBackend *backend, const char *uid);
-	CalObjType(* get_type_by_uid) (CalBackend *backend, const char *uid);
-	GList *(* get_uids) (CalBackend *backend, CalObjType type);
-
-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-
-	/* Change related virtual methods */
-	GNOME_Evolution_Calendar_CalObjChangeSeq * (* get_changes) (
-		CalBackend *backend, CalObjType type, const char *change_id);
-
-	/* Alarm related virtual methods */
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *(* get_alarms_in_range) (
-		CalBackend *backend, time_t start, time_t end);
-	GNOME_Evolution_Calendar_CalComponentAlarms *(* get_alarms_for_object) (
-		CalBackend *backend, const char *uid,
-		time_t start, time_t end, gboolean *object_found);
-
-	/* Object manipulation virtual methods */
-	gboolean (* update_object) (CalBackend *backend, const char *uid, const char *calobj);
-	gboolean (* remove_object) (CalBackend *backend, const char *uid);
-};
-
-GtkType cal_backend_get_type (void);
-
-GnomeVFSURI *cal_backend_get_uri (CalBackend *backend);
-
-void cal_backend_add_cal (CalBackend *backend, Cal *cal);
-
-CalBackendOpenStatus cal_backend_open (CalBackend *backend, GnomeVFSURI *uri,
-				       gboolean only_if_exists);
-
-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);
-
-char *cal_backend_get_object (CalBackend *backend, const char *uid);
-
-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);
-
-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-
-GNOME_Evolution_Calendar_CalObjChangeSeq * cal_backend_get_changes (
-	CalBackend *backend, CalObjType type, const char *change_id);
-
-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_get_alarms_in_range (
-	CalBackend *backend, time_t start, time_t end, gboolean *valid_range);
-
-GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_get_alarms_for_object (
-	CalBackend *backend, const char *uid,
-	time_t start, time_t end,
-	CalBackendGetAlarmsForObjectResult *result);
-
-
-gboolean cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj);
-
-gboolean cal_backend_remove_object (CalBackend *backend, const char *uid);
-
-void cal_backend_last_client_gone (CalBackend *backend);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h
deleted file mode 100644
index 3454742ce8..0000000000
--- a/calendar/pcs/cal-common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Evolution calendar server - common declarations
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMMON_H
-#define CAL_COMMON_H
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-typedef struct _CalBackend CalBackend;
-typedef struct _CalBackendClass CalBackendClass;
-
-typedef struct _Cal Cal;
-typedef struct _CalClass CalClass;
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
deleted file mode 100644
index d0bbd278d1..0000000000
--- a/calendar/pcs/cal-factory.c
+++ /dev/null
@@ -1,799 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-#include "cal.h"
-#include "cal-backend.h"
-#include "cal-factory.h"
-#include "job.h"
-
-
-
-/* OAF ID for registration */
-#define CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-
-/* Private part of the CalFactory structure */
-struct _CalFactoryPrivate {
-	/* Hash table from URI method strings to GtkType * for backend class types */
-	GHashTable *methods;
-
-	/* Hash table from GnomeVFSURI structures to CalBackend objects */
-	GHashTable *backends;
-
-	/* Whether we have been registered with OAF yet */
-	guint registered : 1;
-};
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CALENDAR_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_factory_class_init (CalFactoryClass *class);
-static void cal_factory_init (CalFactory *factory);
-static void cal_factory_destroy (GtkObject *object);
-
-static POA_GNOME_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;
-
-static BonoboObjectClass *parent_class;
-
-static guint cal_factory_signals[LAST_SIGNAL];
-
-
-
-/**
- * cal_factory_get_type:
- * @void:
- *
- * Registers the #CalFactory class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalFactory class.
- **/
-GtkType
-cal_factory_get_type (void)
-{
-	static GtkType cal_factory_type = 0;
-
-	if (!cal_factory_type) {
-		static const GtkTypeInfo cal_factory_info = {
-			"CalFactory",
-			sizeof (CalFactory),
-			sizeof (CalFactoryClass),
-			(GtkClassInitFunc) cal_factory_class_init,
-			(GtkObjectInitFunc) cal_factory_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_factory_type = gtk_type_unique (bonobo_object_get_type (), &cal_factory_info);
-	}
-
-	return cal_factory_type;
-}
-
-/* CORBA class initialization function for the calendar factory */
-static void
-init_cal_factory_corba_class (void)
-{
-	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_factory_vepv.GNOME_Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();
-}
-
-/* Class initialization function for the calendar factory */
-static void
-cal_factory_class_init (CalFactoryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	cal_factory_signals[LAST_CALENDAR_GONE] =
-		gtk_signal_new ("last_calendar_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalFactoryClass, last_calendar_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_factory_destroy;
-
-	init_cal_factory_corba_class ();
-}
-
-/* Object initialization function for the calendar factory */
-static void
-cal_factory_init (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	priv = g_new0 (CalFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->methods = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->backends = g_hash_table_new (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-	priv->registered = FALSE;
-}
-
-/* Frees a method/GtkType * pair from the methods hash table */
-static void
-free_method (gpointer key, gpointer value, gpointer data)
-{
-	char *method;
-	GtkType *type;
-
-	method = key;
-	type = value;
-
-	g_free (method);
-	g_free (type);
-}
-
-/* Frees a uri/backend pair from the backends hash table */
-static void
-free_backend (gpointer key, gpointer value, gpointer data)
-{
-	GnomeVFSURI *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	gnome_vfs_uri_unref (uri);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_factory_destroy (GtkObject *object)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (object));
-
-	factory = CAL_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->methods, free_method, NULL);
-	g_hash_table_destroy (priv->methods);
-	priv->methods = NULL;
-
-	/* Should we assert that there are no more backends? */
-
-	g_hash_table_foreach (priv->backends, free_backend, NULL);
-	g_hash_table_destroy (priv->backends);
-	priv->backends = NULL;
-
-	if (priv->registered) {
-		CORBA_Object obj;
-
-		obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-		oaf_active_server_unregister (CAL_FACTORY_OAF_ID, obj);
-		priv->registered = FALSE;
-	}
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Opening calendars */
-
-/* Looks up a calendar backend in a factory's hash table of uri->cal */
-static CalBackend *
-lookup_backend (CalFactory *factory, GnomeVFSURI *uri)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = g_hash_table_lookup (priv->backends, uri);
-	return backend;
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (CalBackend *backend, gpointer data)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	GnomeVFSURI *uri;
-	gpointer orig_key;
-	gboolean result;
-	GnomeVFSURI *orig_uri;
-
-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");
-
-	factory = CAL_FACTORY (data);
-	priv = factory->priv;
-
-	/* Remove the backend from the hash table */
-
-	uri = cal_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (priv->backends, uri, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (priv->backends, orig_uri);
-	gnome_vfs_uri_unref (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (priv->backends) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), cal_factory_signals[LAST_CALENDAR_GONE]);
-}
-
-/* Adds a backend to the calendar factory's hash table */
-static void
-add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend)
-{
-	CalFactoryPrivate *priv;
-
-	priv = factory->priv;
-
-	gnome_vfs_uri_ref (uri);
-	g_hash_table_insert (priv->backends, uri, backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    GTK_SIGNAL_FUNC (backend_last_client_gone_cb),
-			    factory);
-}
-
-/* Tries to launch a backend for the method of the specified URI.  If there is
- * no such method registered in the factory, it sends the listener the
- * MethodNotSupported error code.
- */
-static CalBackend *
-launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	char *method;
-	GtkType *type;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	/* FIXME: add an accessor function to gnome-vfs */
-	method = uri->method_string;
-
-	type = g_hash_table_lookup (priv->methods, method);
-
-	if (!type) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("launch_backend_for_uri(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = gtk_type_new (*type);
-	if (!backend)
-		g_message ("launch_backend_for_uri(): could not launch the backend");
-
-	return backend;
-}
-
-/* Opens a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-open_backend (CalFactory *factory, GnomeVFSURI *uri, gboolean only_if_exists,
-	      GNOME_Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-	CalBackendOpenStatus status;
-	CORBA_Environment ev;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uri, listener);
-	if (!backend)
-		return NULL;
-
-	status = cal_backend_open (backend, uri, only_if_exists);
-
-	switch (status) {
-	case CAL_BACKEND_OPEN_SUCCESS:
-		add_backend (factory, uri, backend);
-		return backend;
-
-	case CAL_BACKEND_OPEN_ERROR:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_ERROR,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	case CAL_BACKEND_OPEN_NOT_FOUND:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_NOT_FOUND,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Adds a listener to a calendar backend by creating a calendar client interface
- * object.
- */
-static void
-add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)
-{
-	Cal *cal;
-	CORBA_Environment ev;
-
-	cal = cal_new (backend, listener);
-	if (!cal) {
-		g_message ("add_calendar_client(): could not create the calendar client interface");
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_ERROR,
-			CORBA_OBJECT_NIL,
-			&ev);
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("add_calendar_client(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	cal_backend_add_cal (backend, cal);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-		listener,
-		GNOME_Evolution_Calendar_Listener_SUCCESS,
-		bonobo_object_corba_objref (BONOBO_OBJECT (cal)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("add_calendar_client(): could not notify the listener");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Job data */
-typedef struct {
-	CalFactory *factory;
-	char *uri;
-	gboolean only_if_exists;
-	GNOME_Evolution_Calendar_Listener listener;
-} OpenJobData;
-
-/* Job handler for the open calendar command */
-static void
-open_fn (gpointer data)
-{
-	OpenJobData *jd;
-	CalFactory *factory;
-	GnomeVFSURI *uri;
-	gboolean only_if_exists;
-	GNOME_Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	only_if_exists = jd->only_if_exists;
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (
-			listener,
-			GNOME_Evolution_Calendar_Listener_ERROR,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("open_fn(): Could not notify the listener!");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Look up the backend and create it if needed */
-
-	backend = lookup_backend (factory, uri);
-
-	if (!backend)
-		backend = open_backend (factory, uri, only_if_exists, listener);
-
-	gnome_vfs_uri_unref (uri);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("open_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* CalFactory::open method */
-static void
-CalFactory_open (PortableServer_Servant servant,
-		 const CORBA_char *uri,
-		 CORBA_boolean only_if_exists,
-		 GNOME_Evolution_Calendar_Listener listener,
-		 CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	CORBA_Environment ev2;
-	gboolean result;
-	OpenJobData *jd;
-	GNOME_Evolution_Calendar_Listener listener_copy;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	CORBA_exception_init (&ev2);
-	result = CORBA_Object_is_nil (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION || result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-
-		CORBA_exception_free (&ev2);
-		return;
-	}
-	CORBA_exception_free (&ev2);
-
-	CORBA_exception_init (&ev2);
-	listener_copy = CORBA_Object_duplicate (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION) {
-		g_message ("CalFactory_open(): could not duplicate the listener");
-		CORBA_exception_free (&ev2);
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-		return;
-	}
-
-	CORBA_exception_free (&ev2);
-
-	jd = g_new (OpenJobData, 1);
-	jd->factory = factory;
-	jd->uri = g_strdup (uri);
-	jd->only_if_exists = only_if_exists;
-	jd->listener = listener_copy;
-
-	job_add (open_fn, jd);
-}
-
-/**
- * cal_factory_get_epv:
- * @void:
- *
- * Creates an EPV for the CalFactory CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_GNOME_Evolution_Calendar_CalFactory__epv *
-cal_factory_get_epv (void)
-{
-	POA_GNOME_Evolution_Calendar_CalFactory__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Calendar_CalFactory__epv, 1);
-	epv->open = CalFactory_open;
-
-	return epv;
-}
-
-
-
-/**
- * cal_factory_construct:
- * @factory: A calendar factory.
- * @corba_factory: CORBA object for the calendar factory.
- *
- * Constructs a calendar factory by binding the corresponding CORBA object to
- * it.
- *
- * Return value: The same object as the @factory argument.
- **/
-CalFactory *
-cal_factory_construct (CalFactory *factory, GNOME_Evolution_Calendar_CalFactory corba_factory)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_factory);
-	return factory;
-}
-
-/**
- * cal_factory_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar factory @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-GNOME_Evolution_Calendar_CalFactory
-cal_factory_corba_object_create (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Calendar_CalFactory *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_factory_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_factory_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_factory_new:
- * @void:
- *
- * Creates a new #CalFactory object.
- *
- * Return value: A newly-created #CalFactory, or NULL if its corresponding CORBA
- * object could not be created.
- **/
-CalFactory *
-cal_factory_new (void)
-{
-	CalFactory *factory;
-	CORBA_Environment ev;
-	GNOME_Evolution_Calendar_CalFactory corba_factory;
-	gboolean retval;
-
-	factory = gtk_type_new (CAL_FACTORY_TYPE);
-
-	corba_factory = cal_factory_corba_object_create (BONOBO_OBJECT (factory));
-
-	CORBA_exception_init (&ev);
-	retval = CORBA_Object_is_nil (corba_factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION || retval) {
-		g_message ("cal_factory_new(): could not create the CORBA factory");
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_factory_construct (factory, corba_factory);
-}
-
-/* Returns the lowercase version of a string */
-static char *
-str_tolower (const char *s)
-{
-	char *str;
-	unsigned char *p;
-
-	str = g_strdup (s);
-	for (p = str; *p; p++)
-		if (isalpha (*p))
-			*p = tolower (*p);
-
-	return str;
-}
-
-/**
- * cal_factory_oaf_register:
- * @factory: A calendar factory.
- * 
- * Registers a calendar factory with the OAF object activation daemon.  This
- * function must be called before any clients can activate the factory.
- * 
- * Return value: TRUE on success, FALSE otherwise.
- **/
-gboolean
-cal_factory_oaf_register (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-	OAF_RegistrationResult result;
-	CORBA_Object obj;
-
-	g_return_val_if_fail (factory != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), FALSE);
-
-	priv = factory->priv;
-
-	g_return_val_if_fail (!priv->registered, FALSE);
-
-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-	result = oaf_active_server_register (CAL_FACTORY_OAF_ID, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		return TRUE;
-
-	case OAF_REG_NOT_LISTED:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "not listed");
-		break;
-
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "already active");
-		break;
-
-	case OAF_REG_ERROR:
-	default:
-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "
-			   "generic error");
-		break;
-	}
-
-	return FALSE;
-}
-
-/**
- * cal_factory_register_method:
- * @factory: A calendar factory.
- * @method: Method for the URI, i.e. "http", "file", etc.
- * @backend_type: Class type of the backend to create for this @method.
- * 
- * Registers the type of a #CalBackend subclass that will be used to handle URIs
- * with a particular method.  When the factory is asked to open a particular
- * URI, it will look in its list of registered methods and create a backend of
- * the appropriate type.
- **/
-void
-cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type)
-{
-	CalFactoryPrivate *priv;
-	GtkType *type;
-	char *method_str;
-
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (factory));
-	g_return_if_fail (method != NULL);
-	g_return_if_fail (backend_type != 0);
-	g_return_if_fail (gtk_type_is_a (backend_type, CAL_BACKEND_TYPE));
-
-	priv = factory->priv;
-
-	method_str = str_tolower (method);
-
-	type = g_hash_table_lookup (priv->methods, method_str);
-	if (type) {
-		g_message ("cal_factory_register_method(): Method `%s' already registered!",
-			   method_str);
-		g_free (method_str);
-		return;
-	}
-
-	type = g_new (GtkType, 1);
-	*type = backend_type;
-
-	g_hash_table_insert (priv->methods, method_str, type);
-}
-
-/**
- * cal_factory_get_n_backends:
- * @factory: A calendar factory.
- * 
- * Queries the number of running calendar backends in a calendar factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-cal_factory_get_n_backends (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), -1);
-
-	priv = factory->priv;
-	return g_hash_table_size (priv->backends);
-}
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
deleted file mode 100644
index ac28a5935b..0000000000
--- a/calendar/pcs/cal-factory.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_FACTORY_H
-#define CAL_FACTORY_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-
-#include "calendar/pcs/evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_FACTORY_TYPE            (cal_factory_get_type ())
-#define CAL_FACTORY(obj)            (GTK_CHECK_CAST ((obj), CAL_FACTORY_TYPE, CalFactory))
-#define CAL_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_FACTORY_TYPE,		\
-				     CalFactoryClass))
-#define IS_CAL_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), CAL_FACTORY_TYPE))
-#define IS_CAL_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_FACTORY_TYPE))
-
-typedef struct _CalFactory CalFactory;
-typedef struct _CalFactoryClass CalFactoryClass;
-
-typedef struct _CalFactoryPrivate CalFactoryPrivate;
-
-struct _CalFactory {
-	BonoboObject object;
-
-	/* Private data */
-	CalFactoryPrivate *priv;
-};
-
-struct _CalFactoryClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_calendar_gone) (CalFactory *factory);
-};
-
-GtkType cal_factory_get_type (void);
-
-CalFactory *cal_factory_construct (CalFactory *factory,
-				   GNOME_Evolution_Calendar_CalFactory corba_factory);
-GNOME_Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
-
-CalFactory *cal_factory_new (void);
-
-gboolean cal_factory_oaf_register (CalFactory *factory);
-
-void cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type);
-
-int cal_factory_get_n_backends (CalFactory *factory);
-
-POA_GNOME_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
deleted file mode 100644
index 69eccd7f55..0000000000
--- a/calendar/pcs/cal.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "cal.h"
-#include "cal-backend.h"
-
-
-
-/* Private part of the Cal structure */
-struct _CalPrivate {
-	/* Our backend */
-	CalBackend *backend;
-
-	/* Listener on the client we notify */
-	GNOME_Evolution_Calendar_Listener listener;
-};
-
-
-
-static void cal_class_init (CalClass *class);
-static void cal_init (Cal *cal);
-static void cal_destroy (GtkObject *object);
-
-static POA_GNOME_Evolution_Calendar_Cal__vepv cal_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_get_type:
- * @void:
- *
- * Registers the #Cal class if necessary, and returns the type ID associated to
- * it.
- *
- * Return value: The type ID of the #Cal class.
- **/
-GtkType
-cal_get_type (void)
-{
-	static GtkType cal_type = 0;
-
-	if (!cal_type) {
-		static const GtkTypeInfo cal_info = {
-			"Cal",
-			sizeof (Cal),
-			sizeof (CalClass),
-			(GtkClassInitFunc) cal_class_init,
-			(GtkObjectInitFunc) cal_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &cal_info);
-	}
-
-	return cal_type;
-}
-
-/* CORBA class initialzation function for the calendar */
-static void
-init_cal_corba_class (void)
-{
-	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_vepv.GNOME_Evolution_Calendar_Cal_epv = cal_get_epv ();
-}
-
-/* Class initialization function for the calendar */
-static void
-cal_class_init (CalClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
-
-	object_class->destroy = cal_destroy;
-
-	init_cal_corba_class ();
-}
-
-/* Object initialization function for the calendar */
-static void
-cal_init (Cal *cal)
-{
-	CalPrivate *priv;
-
-	priv = g_new0 (CalPrivate, 1);
-	cal->priv = priv;
-
-	priv->listener = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_destroy (GtkObject *object)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL (object));
-
-	cal = CAL (object);
-	priv = cal->priv;
-
-	priv->backend = NULL;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_destroy(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Cal::get_uri method */
-static CORBA_char *
-Cal_get_uri (PortableServer_Servant servant,
-	     CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GnomeVFSURI *uri;
-	char *str_uri;
-	CORBA_char *str_uri_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	uri = cal_backend_get_uri (priv->backend);
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	str_uri_copy = CORBA_string_dup (str_uri);
-	g_free (str_uri);
-
-	return str_uri_copy;
-}
-
-/* Converts a calendar object type from its CORBA representation to our own
- * representation.
- */
-static CalObjType
-uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type)
-{
-	return (((type & GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
-		| ((type & GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
-		| ((type & GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
-}
-
-/* Cal::get_n_objects method */
-static CORBA_long
-Cal_get_n_objects (PortableServer_Servant servant,
-		   GNOME_Evolution_Calendar_CalObjType type,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	int n;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	n = cal_backend_get_n_objects (priv->backend, t);
-	return n;
-}
-
-/* Cal::get_object method */
-static GNOME_Evolution_Calendar_CalObj
-Cal_get_object (PortableServer_Servant servant,
-		const GNOME_Evolution_Calendar_CalObjUID uid,
-		CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	char *calobj;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	calobj = cal_backend_get_object (priv->backend, uid);
-
-	if (calobj) {
-		CORBA_char *calobj_copy;
-
-		calobj_copy = CORBA_string_dup (calobj);
-		g_free (calobj);
-		return calobj_copy;
-	} else {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-	}
-}
-
-static GNOME_Evolution_Calendar_CalObjUIDSeq *
-build_uid_seq (GList *uids)
-{
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *l;
-	int n, i;
-
-	n = g_list_length (uids);
-
-	seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = uids; l; i++, l = l->next) {
-		char *uid;
-
-		uid = l->data;
-		seq->_buffer[i] = CORBA_string_dup (uid);
-	}
-
-	return seq;
-}
-
-/* Cal::get_uids method */
-static GNOME_Evolution_Calendar_CalObjUIDSeq *
-Cal_get_uids (PortableServer_Servant servant,
-	      GNOME_Evolution_Calendar_CalObjType type,
-	      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *uids;
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-
-	uids = cal_backend_get_uids (priv->backend, t);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-/* Cal::get_changes method */
-static GNOME_Evolution_Calendar_CalObjChangeSeq *
-Cal_get_changes (PortableServer_Servant servant,
-		 GNOME_Evolution_Calendar_CalObjType type,
-		 const CORBA_char *change_id,
-		 CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	
-	return cal_backend_get_changes (priv->backend, t, change_id);
-}
-
-/* Cal::get_objects_in_range method */
-static GNOME_Evolution_Calendar_CalObjUIDSeq *
-Cal_get_objects_in_range (PortableServer_Servant servant,
-			  GNOME_Evolution_Calendar_CalObjType type,
-			  GNOME_Evolution_Calendar_Time_t start,
-			  GNOME_Evolution_Calendar_Time_t end,
-			  CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	time_t t_start, t_end;
-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	uids = cal_backend_get_objects_in_range (priv->backend, t, t_start, t_end);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-/* Cal::get_alarms_in_range method */
-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *
-Cal_get_alarms_in_range (PortableServer_Servant servant,
-			 GNOME_Evolution_Calendar_Time_t start,
-			 GNOME_Evolution_Calendar_Time_t end,
-			 CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	gboolean valid_range;
-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	seq = cal_backend_get_alarms_in_range (priv->backend, t_start, t_end, &valid_range);
-	if (!valid_range) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	return seq;
-}
-
-/* Cal::get_alarms_for_object method */
-static GNOME_Evolution_Calendar_CalComponentAlarms *
-Cal_get_alarms_for_object (PortableServer_Servant servant,
-			   const GNOME_Evolution_Calendar_CalObjUID uid,
-			   GNOME_Evolution_Calendar_Time_t start,
-			   GNOME_Evolution_Calendar_Time_t end,
-			   CORBA_Environment * ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	GNOME_Evolution_Calendar_CalComponentAlarms *alarms;
-	CalBackendGetAlarmsForObjectResult result;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	alarms = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &result);
-
-	switch (result) {
-	case CAL_BACKEND_GET_ALARMS_SUCCESS:
-		return alarms;
-
-	case CAL_BACKEND_GET_ALARMS_NOT_FOUND:
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-
-	case CAL_BACKEND_GET_ALARMS_INVALID_RANGE:
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Cal::update_object method */
-static void
-Cal_update_object (PortableServer_Servant servant,
-		   const GNOME_Evolution_Calendar_CalObjUID uid,
-		   const GNOME_Evolution_Calendar_CalObj calobj,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_update_object (priv->backend, uid, calobj))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_InvalidObject,
-				     NULL);
-}
-
-/* Cal::remove_object method */
-static void
-Cal_remove_object (PortableServer_Servant servant,
-		   const GNOME_Evolution_Calendar_CalObjUID uid,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_remove_object (priv->backend, uid))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-}
-
-/**
- * cal_get_epv:
- * @void:
- *
- * Creates an EPV for the Cal CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_GNOME_Evolution_Calendar_Cal__epv *
-cal_get_epv (void)
-{
-	POA_GNOME_Evolution_Calendar_Cal__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Calendar_Cal__epv, 1);
-	epv->_get_uri     = Cal_get_uri;
-	epv->countObjects = Cal_get_n_objects;
-	epv->getObject    = Cal_get_object;
-	epv->getUIds      = Cal_get_uids;
-	epv->getChanges   = Cal_get_changes;
-	epv->getObjectsInRange  = Cal_get_objects_in_range;
-	epv->getAlarmsInRange   = Cal_get_alarms_in_range;
-	epv->getAlarmsForObject = Cal_get_alarms_for_object;
-	epv->updateObject = Cal_update_object;
-	epv->removeObject = Cal_remove_object;
-
-	return epv;
-}
-
-
-
-/**
- * cal_construct:
- * @cal: A calendar client interface.
- * @corba_cal: CORBA object for the calendar.
- * @backend: Calendar backend that this @cal presents an interface to.
- * @listener: Calendar listener for notification.
- *
- * Constructs a calendar client interface object by binding the corresponding
- * CORBA object to it.  The calendar interface is bound to the specified
- * @backend, and will notify the @listener about changes to the calendar.
- *
- * Return value: The same object as the @cal argument.
- **/
-Cal *
-cal_construct (Cal *cal,
-	       GNOME_Evolution_Calendar_Cal corba_cal,
-	       CalBackend *backend,
-	       GNOME_Evolution_Calendar_Listener listener)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (cal != NULL, NULL);
-	g_return_val_if_fail (IS_CAL (cal), NULL);
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	priv = cal->priv;
-
-	CORBA_exception_init (&ev);
-	priv->listener = CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_construct: could not duplicate the listener");
-		priv->listener = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	priv->backend = backend;
-
-	bonobo_object_construct (BONOBO_OBJECT (cal), corba_cal);
-	return cal;
-}
-
-/**
- * cal_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar client interface @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-GNOME_Evolution_Calendar_Cal
-cal_corba_object_create (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Calendar_Cal *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_new:
- * @backend: A calendar backend.
- * @listener: A calendar listener.
- *
- * Creates a new calendar client interface object and binds it to the specified
- * @backend and @listener objects.
- *
- * Return value: A newly-created #Cal calendar client interface object, or NULL
- * if its corresponding CORBA object could not be created.
- **/
-Cal *
-cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)
-{
-	Cal *cal, *retval;
-	GNOME_Evolution_Calendar_Cal corba_cal;
-	CORBA_Environment ev;
-	gboolean ret;
-
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	cal = CAL (gtk_type_new (CAL_TYPE));
-	corba_cal = cal_corba_object_create (BONOBO_OBJECT (cal));
-
-	CORBA_exception_init (&ev);
-	ret = CORBA_Object_is_nil ((CORBA_Object) corba_cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || ret) {
-		g_message ("cal_new(): could not create the CORBA object");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	retval = cal_construct (cal, corba_cal, backend, listener);
-	if (!retval) {
-		g_message ("cal_new(): could not construct the calendar client interface");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		return NULL;
-	}
-
-	return retval;
-}
-
-/**
- * cal_notify_update:
- * @cal: A calendar client interface.
- * @uid: UID of object that was updated.
- * 
- * Notifies a listener attached to a calendar client interface object about an
- * update to a calendar object.
- **/
-void
-cal_notify_update (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_update(): could not notify the listener "
-			   "about an updated object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_notify_remove:
- * @cal: A calendar client interface.
- * @uid: UID of object that was removed.
- * 
- * Notifies a listener attached to a calendar client interface object about a
- * calendar object that was removed.
- **/
-void
-cal_notify_remove (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_remove(): could not notify the listener "
-			   "about a removed object");
-
-	CORBA_exception_free (&ev);
-}
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
deleted file mode 100644
index 844640cd8d..0000000000
--- a/calendar/pcs/cal.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_H
-#define CAL_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_TYPE            (cal_get_type ())
-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))
-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
-
-typedef struct _CalPrivate CalPrivate;
-
-struct _Cal {
-	BonoboObject object;
-
-	/* Private data */
-	CalPrivate *priv;
-};
-
-struct _CalClass {
-	BonoboObjectClass parent_class;
-};
-
-GtkType cal_get_type (void);
-
-Cal *cal_construct (Cal *cal,
-		    GNOME_Evolution_Calendar_Cal corba_cal,
-		    CalBackend *backend,
-		    GNOME_Evolution_Calendar_Listener listener);
-GNOME_Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
-
-Cal *cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener);
-
-void cal_notify_update (Cal *cal, const char *uid);
-void cal_notify_remove (Cal *cal, const char *uid);
-
-POA_GNOME_Evolution_Calendar_Cal__epv *cal_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/job.c b/calendar/pcs/job.c
deleted file mode 100644
index f8223f0bab..0000000000
--- a/calendar/pcs/job.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "job.h"
-
-
-
-/* The job list */
-
-typedef struct {
-	JobFunc func;
-	gpointer data;
-} Job;
-
-static GSList *jobs_head;
-static GSList *jobs_tail;
-
-static guint jobs_idle_id;
-
-
-
-/* Runs a job and dequeues it */
-static gboolean
-run_job (gpointer data)
-{
-	Job *job;
-	GSList *l;
-
-	g_assert (jobs_head != NULL);
-
-	job = jobs_head->data;
-	(* job->func) (job->data);
-	g_free (job);
-
-	l = jobs_head;
-	jobs_head = g_slist_remove_link (jobs_head, jobs_head);
-	g_slist_free_1 (l);
-
-	if (!jobs_head) {
-		jobs_tail = NULL;
-		jobs_idle_id = 0;
-		return FALSE;
-	} else
-		return TRUE;
-}
-
-/**
- * job_add:
- * @func: Function to run the job.
- * @data: Data to pass to @function.
- * 
- * Adds a job to the queue.  The job will automatically be run asynchronously.
- **/
-void
-job_add (JobFunc func, gpointer data)
-{
-	Job *job;
-
-	g_return_if_fail (func != NULL);
-
-	job = g_new (Job, 1);
-	job->func = func;
-	job->data = data;
-
-	if (!jobs_head) {
-		g_assert (jobs_tail == NULL);
-		g_assert (jobs_idle_id == 0);
-
-		jobs_head = g_slist_append (NULL, job);
-		jobs_tail = jobs_head;
-
-		jobs_idle_id = g_idle_add (run_job, NULL);
-	} else {
-		g_assert (jobs_tail != NULL);
-		g_assert (jobs_idle_id != 0);
-
-		jobs_tail = g_slist_append (jobs_tail, job)->next;
-	}
-}
diff --git a/calendar/pcs/job.h b/calendar/pcs/job.h
deleted file mode 100644
index f9a0d86923..0000000000
--- a/calendar/pcs/job.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef JOB_H
-#define JOB_H
-
-#include <glib.h>
-
-
-
-typedef void (* JobFunc) (gpointer data);
-
-void job_add (JobFunc func, gpointer data);
-
-
-
-#endif
diff --git a/camel/.cvsignore b/camel/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/CODING.STYLE b/camel/CODING.STYLE
deleted file mode 100644
index 58e9c68bbe..0000000000
--- a/camel/CODING.STYLE
+++ /dev/null
@@ -1,19 +0,0 @@
-Note to hackers
----------------
-
-When hacking on camel (and on the gnome mailer in general), 
-be sure to follow the same coding style as the initial authors.
-Please read the file HACKING in gnumeric and follow the
-general guidelines explained in it.
-
-Please take a look at camel source files and try to exactly
-imitate the coding style. We are perfectly aware that this
-is not the best and unique style, but it is absolutely
-mandatory that Camel is homogeneous.  If you find the current
-coding style to have some weaknesses, please contact the
-authors to discuss this matter.
-
-Thanks.
-
-	Bertrand.
-
diff --git a/camel/ChangeLog b/camel/ChangeLog
deleted file mode 100644
index f212e25d46..0000000000
--- a/camel/ChangeLog
+++ /dev/null
@@ -1,10577 +0,0 @@
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* camel-sasl.c (camel_sasl_challenge): Take a GByteArray as input
-	as well. Comment that you can pass %NULL for @token to get the
-	initial auth data for mechanisms that are client-initiated.
-	(camel_sasl_challenge_base64): Convenience function for protocols
-	that use base64-encoded SASL.
-	(camel_sasl_authenticated): Implement this... (it was prototyped
-	already)
-	(camel_sasl_new): Function to take a service name, a mechanism
-	name, and a CamelService, and return a CamelSasl for it.
-	(camel_sasl_authtype, camel_sasl_authtype_list): Functions to
-	return CamelServiceAuthType information about SASL mechanisms, to
-	allow providers to deal with them generically.
-
-	* camel-sasl-anonymous.c, camel-sasl-plain.c: Update/simplify for
-	CamelSasl changes. Both of these are single-round
-	(client-initiated) mechanisms, so they don't need to keep state.
-	(camel_sasl_plain_new): Removed; use camel_sasl_new instead.
-	(Can't get rid of camel_sasl_anonymous_new though...)
-
-	* camel-sasl-cram-md5.c: Update/simplify for CamelSasl changes.
-	(camel_sasl_cram_md5_new): Removed; use camel_sasl_new instead.
-	(cram_md5_challenge): Use md5_get_digest where possible, and
-	various other minor simplifications. CRAM-MD5 only has a single
-	round, so there's no need to keep track of state. This code is now
-	tested (against Cyrus IMAPd) and known to work.
-
-	* camel-sasl-kerberos4.h: Update/simplify for CamelSasl changes.
-	Make only a single #ifdef HAVE_KRB4. Remove stuff from priv that
-	isn't needed between rounds.
-	(camel_sasl_kerberos4_new): Removed; use camel_sasl_new instead
-	(krb4_challenge): Fix up the logic I broke in my previous "at
-	least make it compile" fixes, update to match other changes, and
-	remove IMAP-isms that shouldn't be in the generic code. This still
-	isn't tested, because we're stuck behind a NAT right now...
-
-	* providers/imap/camel-imap-store.c: Add an "authtypes" hash table
-	to CamelImapStore recording the supported authtypes.
-	(connect_to_server): Record supported authtypes in the authtypes
-	hash rather than the capabilities bitmask, since now the IMAP code
-	is no longer responsible for keeping track of which authtypes we
-	support.
-	(query_auth_types): Use camel_sasl_authtype_list to get the
-	SASL-supported authtypes.
-	(try_auth): New function to try a SASL auth mechanism. Sort of
-	formerly imap_try_kerberos_v4_auth.
-	(imap_connect): Get rid of the krb4-specific bits and genericize
-	them for any SASL authtype.
-
-	* providers/imap/Makefile.am: Remove camel-imap-auth.[ch] (moved
-	into camel-imap-store.c since it's now constant size) and the
-	KRB4_CFLAGS and KRB4_LDFLAGS references.
-
-2001-03-01  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-sasl-anonymous.c (anon_challenge): Don't base64 encode the
-	data, leave that up to the provider to do if it needs to. Also
-	save on some memory allocations and stuff.
-
-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here. Also get
-	rid of the need for the temp buf as we can just write it to the
-	GByteArray.
-
-2001-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (rfc2047_encode_word, rfc2047_decode_word):
-	Reconstify variables to match iconv.
-
-	* camel-search-private.c (camel_ustrstrcase): Change some
-	assertions back into valid returns.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (libcamel_la_LIBADD, INCLUDES): camel depends on
-	krb4 now (where available), for camel-sasl-kerberos4.c
-
-	* camel-sasl-kerberos4.[ch]: Make this at least compile. Dunno if
-	it works yet.
-
-2001-03-01  Peter Williams  <peterw@ximian.com>
-
-	* camel-url.c (camel_url_new): Assert url_string != NULL.
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-sasl-anonymous.[c,h] to the build.
-
-	* camel-sasl-anonymous.[c,h]: new SASL class for ANONYMOUS
-
-	* camel-sasl-plain.c (plain_challenge): Oops, have a state for
-	setting sasl->authenticated = TRUE;
-
-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here.
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_decode_date): A fix for broken
-	mailers that send 2-digit years (ie "Wed, 28 Feb 01
-	04:59:41"). Fixes bug #1633.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Check
-	to make sure message isn't NULL.
-
-2001-02-28  Dan Winship  <danw@ximian.com>
-
-	* camel-remote-store.c (remote_recv_line): If we get back 0 bytes
-	from camel_stream_buffer_gets, that means the socket got
-	disconnected, so set an exception. (Noticed because of a message
-	that crashes our IMAP server when you try to look at it. :)
-
-2001-02-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added camel-sasl*.[c,h] to the build.
-
-	* camel-sasl.[c,h]: new "abstract" SASL class
-
-	* camel-sasl-kerberos4.[c,h]: new SASL class for KERBEROS_V4
-
-	* camel-sasl-cram-md5.[c,h]: new SASL class for CRAM-MD5
-
-	* camel-sasl-plain.[c,h]: new SASL class for PLAIN
-
-	* providers/imap/camel-imap-auth.c: Removed the base64 functions.
-
-	* camel-mime-utils.c (base64_encode_simple): Moved here from
-	camel-imap-auth.c
-	(base64_decode_simple): Same.
-
-2001-02-26  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Group messages
-	into sets with the same flags and use the IMAP message set
-	notation rather than doing a separate STORE FLAGS for each one.
-	This cuts the network traffic down to just a handful of commands
-	per sync rather than one per changed message. Removed the progress
-	notification stuff since it's no longer meaningful and should
-	hopefully be unnecessary.
-	(imap_copy_message_to): move the former sync_message function
-	into here, since it's no longer shared with imap_sync.
-
-2001-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c: Made thread-safe and moved to above the test
-	code.
-
-	* camel-mime-message.c (camel_mime_message_init): Set the
-	message_id to NULL.
-	(camel_mime_message_finalize): Free the message_id.
-	(camel_mime_message_set_message_id): New function to set the
-	Message-Id.
-	(camel_mime_message_get_message_id): New function to get the
-	Message-Id.
-	(process_header): Decode the message-id.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (construct): init the vTrash folder here instead
-	of in store_init.
-	(camel_store_class_init): init service_class->construct.
-	(camel_store_finalize): We only need to unref the vtrash folder.
-	(init_trash): don't create a vstore since we don't need it.
-
-2001-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-store.c (camel_store_class_init): init get_trash and
-	init_trash.
-	(camel_store_init): call the virtual init_trash function.
-	(camel_store_finalize): unref the vtrash folder/store if present.
-	(camel_store_get_folder): Add the new folder to the vtrash
-	vfolder.
-	(init_trash): default implementation of init_trash.
-	(get_trash): default implementation of get_trash.
-
-	* camel-vee-store.c (vee_init_trash): No-op.
-	(vee_get_trash): return NULL
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-summary.c (camel_message_info_new_from_header):
-	Doh, cut and paste problem, use mlist not cc.
-
-	* camel-folder.c (move_message_to): 
-	(copy_message_to): If the source folder doesn't support a
-	summary, dont try and get the message info from it.
-
-	* camel-filter-search.c (check_header): Implement a pseudo-header
-	"x-camel-mlist" which just looks up in the message info for a
-	match.
-
-	* camel-folder-search.c (check_header): Add pseudo-header
-	"x-camel-mlist" which can be used to match on mailing list.
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Add some
-	internal progress reporting.
-	(imap_rescan): Do some progress reporting.
-
-	* camel-mime-part.c (init_header_name_table): Add the message-id
-	to the formatted table, so we dont try and wrap it, and break it.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder.h: Remove the 'FIXME: remove because this isn't
-	required...' comment for copy_message_to since we now need and
-	cherish its existance in the filter-driver code ;-)
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Now
-	takes a UID and CamelFolder arguments (which can be NULL) to allow
-	for possible optimizations when copying messages between folders
-	on the same store.
-	(camel_filter_driver_filter_mbox): Updated (passes NULL for both
-	since this case can't be optimized anyway).
-	(camel_filter_driver_filter_folder): Updated to pass in the uid
-	and folder of the message.
-
-2001-02-22  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-summary.h (CAMEL_IMAP_SERVER_FLAGS):
-	#define this as the set of all IMAP system flags
-
-	* providers/imap/camel-imap-folder.c (sync_message): after syncing
-	flags, set server_flags to (flags & CAMEL_IMAP_SERVER_FLAGS)
-	rather than just "flags", since any other flags won't have been
-	synced. Prevents the CAMEL_MESSAGE_ATTACHMENTS flag from getting
-	lost.
-
-2001-02-22  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/*: Removed all files.
-	
-	* camel-private.h: Move camel-vee-private.h stuff into here.
-
-	* camel-session.c: Move the vee_provider here, and initialise it
-	always as part of a session.  The vfolder provider is always
-	available.
-
-	* providers/Makefile.am: Remove "vee" from the build list, now
-	built as part of the main library.
-
-	* Makefile.am (libcamelinclude_HEADERS): 
-	(libcamel_la_SOURCES): Added camel-vee-store.[ch],
-	camel-vee-folder.[ch].
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build): Removed,
-	not used.
-	(camel_vee_folder_new): Removed call to build_folder.
-	(vee_get_message): Dont try and free the mi if we didn't get it.
-
-	* camel-folder.c (camel_folder_change_info_new): Added a hash
-	table of what we have in the lists, plus moved private things into
-	private pointer.
-	(camel_folder_change_info_add_source): Fixed up private accesses.
-	(camel_folder_change_info_add_uid): Changed to use a hashtable to
-	see if we already have the uid, etc.
-	(camel_folder_change_info_remove_uid): Similar.
-	(change_info_remove): Likewise.
-	(camel_folder_change_info_clear): Fixes for privatisations.
-	(camel_folder_change_info_free): "
-
-2001-02-21  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (fetch_medium): Fixes for
-	IMAP4-pre-rev1 from Torsten Schulz.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (mail_list_magic): Take the ^Header: part out
-	of the expression, since we look that up ourselves.
-	(header_raw_check_mailing_list): When getting the match, get match
-	1, not match 0, we dont want the full string match.
-
-	* camel-folder-summary.c (CAMEL_FOLDER_SUMMARY_VERSION): Bumped
-	for summary change.
-	(message_info_new): Extract the mlist info from the headers.
-	(message_info_load): Load mlist from summary.
-	(message_info_save): Save mlist to summary.
-	(message_info_free): Save the mlist entry.
-	(camel_message_info_new_from_header): Extract mailing list header.
-	(camel_message_info_dup_to): Copy the mlist entry.
-	(camel_message_info_free): Free mlist.
-	(message_info_dump): Dump the mlist.
-
-	* camel-folder-summary.h: Add an mlist (mailing list) string to
-	the summary.
-
-2001-02-19  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Added
-	flags argument.
-	(message_changed): Add support for the auto-update flag, in which
-	case we auto-match the content as it changes.
-	(camel_vee_folder_init): Remoive "DYNAMIC" optionality
-	(camel_vee_folder_finalise): "
-	(vee_expunge): As we expunge folders, re-sync their content by
-	rerunning the query.
-
-	* providers/vee/camel-vee-store.c (vee_get_folder): Pass flags to
-	folder new.
-
-2001-02-18  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/Makefile.am (noinst_HEADERS): Added
-	camel-vee-private.h.
-
-	* providers/vee/camel-vee-private.h: New file to add locking stuff
-	for vee folders.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Add
-	locking around unmatched setup.
-	(camel_vee_folder_init): Setup lock.
-	(camel_vee_folder_finalise): Free locks.
-	(folder_changed): Add locking.
-	(unmatched_finalise): "
-	(message_changed): "
-	(vee_folder_build): "
-
-2001-02-17  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_add): Check uid
-	doesn't exist before adding it.
-
-2001-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Create
-	a new virtual virtual folder UNMATCHED, to store all messages that
-	dont match other vfolders.
-	(unmatched_folder_changed): When a vfolder issues a changed event,
-	use its info to update the unmatched folder info.
-	(unmatched_finalise): When a vfolder is finalised, remove any uids
-	it has as if we had a removed event for it.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_finalise): Thaw the
-	defaultfolder.
-	(camel_filter_driver_set_default_folder): Thaw the defaultfolder
-	we're about to replace, and freeze the new defaultfolder.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Emit
-	the folder_created signal here.
-
-	* providers/local/camel-local-folder.c
-	(camel_local_folder_construct): Emit the folder_created signal.
-
-	* providers/local/camel-local-store.c (delete_folder): On error,
-	free the 'name' string so we don't leak. Also emit the
-	folder_deleted signal.
-
-	* providers/imap/camel-imap-store.c (subscribe_folder): Emit the
-	folder_created signal.
-	(unsubscribe_folder): Emit the folder_deleted signal.
-
-	* camel-store.c (camel_store_class_init): Added folder_created and
-	folder_deleted signal defs.
-
-2001-02-15  Dan Winship  <danw@ximian.com>
-
-	* camel-folder-thread.c (container_parent_child): Deal with
-	out-of-order References headers so they don't cause messages to
-	disappear in threaded view.
-
-	* providers/imap/camel-imap-folder.c (fetch_medium): IMAP4
-	(pre-rev1) doesn't allow BODY.PEEK[], so use RFC822.PEEK instead
-	in that case.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* camel-mime-filter-charset.c (complete, filter),
-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):
-	Changed this code to match the glibc iconv signature.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c (camel_store_create_folder): New method to create
-	a folder when you don't know its full name.
-
-	* providers/imap/camel-imap-store.c (create_folder): Implement.
-	(create_folder): Oops, and fix bug involving namespaces
-	
-2001-02-12  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-part.c (init_header_name_table): Add address headers
-	to list that we dont fold when writing.  The are properly
-	formatted as we build them.
-	(write_to_stream): DOH, lookup the header name in the formatted
-	hash table, not the value, that would never have worked.
-
-	* camel-internet-address.c
-	(camel_internet_address_encode_address): Changed to take a
-	parameter saying how much we've printed so far.  We now fold the
-	header as we format it.  We dont fold addresses, even if they are
-	too long, we simply put them on another line by themselves: this
-	should make the result more parsable by mailers that can't handle
-	split up addresses (which are legal).
-	(internet_encode): Fix for changes to above.
-
-2001-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/local/camel-local-provider.c: mbox, mh, and maildir
-	camel-url's need absolute paths.
-
-	* camel-provider.h (CAMEL_URL_PATH_IS_ABSOLUTE): New flaggy flag.
-
-2001-02-08  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c: Rewrite a bunch. Replace the existing folder
-	cache stuff with much simpler code that still handles all the
-	existing cases. Now the folder hash table is always created by the
-	base class, using hash and compare functions provided by the class
-	implementation. (If they are set to NULL, CamelStore won't cache
-	folders.) lookup_folder, cache_folder, and uncache_folder are no
-	longer class methods, and get_name is gone completely.
-
-	(camel_store_get_inbox): Renamed from
-	camel_store_get_default_folder, since that wasn't being used, and
-	this is what we actually need.
-	(camel_store_get_root_folder): Removed, since it's not needed for
-	anything given get_folder_info.
-
-	* camel-remote-store.c:
-	* providers/local/camel-local-store.c:
-	* providers/local/camel-mbox-store.c:
-	* providers/local/camel-mh-store.c:
-	* providers/local/camel-maildir-store.c:
-	* providers/nntp/camel-nntp-store.c:
-	* providers/pop3/camel-pop3-store.c:
-	* providers/vee/camel-vee-store.c: Minor updates for CamelStore
-	changes
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):
-	Update for CamelStore changes.
-	(hash_folder_name, compare_folder_name): treat INBOX
-	case-insensitively, otherwise use g_str_hash and g_str_equal.
-
-	* camel-service.c (camel_service_construct): Remove
-	camel_service_new and create camel_service_construct (as a class
-	method) in its place.
-
-	* camel-session.c (camel_session_get_service): Use
-	camel_object_new and camel_service_construct to replace
-	camel_service_new.
-
-	* providers/local/camel-local-store.c (construct): Append a '/' to
-	the URL path if it doesn't end with one
-
-2001-01-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-tcp-stream-ssl.c: Oops, include the camel-tcp-stream-ssl
-	header instead of the raw one.
-
-2001-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* camel-operation.c (camel_operation_start): Changed to push the
-	operation into a status stack.
-	(camel_operation_progress): Changed to only accept % complete.
-	(camel_operation_reset): Free status stack as well.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_get_message): Get the
-	octect count from the return line, and pass it to
-	get_additional_data().
-	(pop3_refresh_info): Added status stuff.
-
-	* providers/pop3/camel-pop3-store.c
-	(camel_pop3_command_get_additional_data): Added a total bytes
-	expected argument for progress reporting & fixed callers.
-	(camel_pop3_command_get_additional_data): Added progress
-	reporting.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
-	(mbox_summary_sync_quick):
-	(summary_rebuild): Added progress reporting stuff.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-search-private.c (CAMEL_SEARCH_COMPARE): Macro for making
-	comparisons easy.
-	(camel_ustrcasecmp): Use CAMEL_SEARCH_COMPARE and check for
-	end-of-string before the utf-8 error check.
-	(camel_ustrncasecmp): Same.
-	(camel_search_header_match): Strip leading spaces before doing
-	anything else. Also use vlen and mlen so as to not need to do 500
-	strlen()'s.
-	(camel_ustrcasecmp): Don't get_utf8() for the 2 strings in the
-	comparison part of the loop because of short-circuit expression
-	evaluation. (blame JPR if this is the wrong term!)
-	(camel_ustrncasecmp): Same.
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-search-private.c (utf8_get): Rewrote using unicode_get_utf8().
-	(camel_ustrcasecmp): Use unicode_char_t
-	(camel_ustrncasecmp): Same.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* camel-mime-filter-charset.c (complete, filter),
-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):
-	Made these pass char ** as the second parameter to iconv.
-
-2001-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* camel-session.c: Removed all the camel_cancel stuff.
-
-	* camel-stream-fs.c (stream_read): Change to use camel_operation.	
-	(stream_write): "
-
-	* camel-remote-store.c (socket_connect): Change to use
-	camel_operation rather than camel_cancel stuff.
-	Removed gal include, WTF is that doing there anyway?
-
-	* Makefile.am (libcamel_la_SOURCES): 
-	(libcamelinclude_HEADERS): Added camel-operation.[ch], stuff to
-	handle notification and cancellation.
-
-	* camel-search-private.c: Removed unwanted header.  It was never
-	put in for a reason.  Stop fixing irrelevant warnings.
-	
-	(camel_ustrstrcase): Our own strstrcase impl for utf8 strings.
-	(camel_ustrcasecmp): Ditto for strcasecmp.
-	(camel_ustrncasecmp): And strncasecmp.
-	(utf8_get): Simpler interface to utf8 string processing.
-	(camel_search_header_match): Use the new things.
-
-2001-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (get_summary): Removed some old variables/a small
-	memleak.
-	(free_summary): Removed old variables.
-
-	* camel-mime-utils.c (header_raw_check_mailing_list): New utility
-	function to get the mailing list (if any) that a set of headers
-	came from.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-stream-fs.c: Added a missing #include.
-
-	* camel-search-private.c: Added a missing #include.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-remote-store.c (remote_query_auth_types): Oops. Change
-	this too.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): Updated.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types):
-	Updated.
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Updated.
-
-	* providers/imap/camel-imap-store.c (query_auth_types): Updated.
-
-	* camel-service.c (camel_service_query_auth_types): Now takes a
-	boolean value to specify whether or not to connect when
-	constructing a supported authtype list.
-
-2001-02-05  Not Zed  <NotZed@Ximian.com>
-
-	* camel-stream-filter.c (do_write): Revert jeff's earlier change,
-	the change below is the more-correct fix.  All his was doing was
-	ignoring the return code & looping actually :)
-
-	* camel-stream-fs.c (stream_write): Since we are non-blocking on
-	the outgoing fd, keep looping if writing out large blocks, so we
-	can keep checking for cancel, etc.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): When
-	we drop a fake node, dont skip checking the next in the list.
-	(camel_folder_thread_messages_new): Add an assertion check just to
-	make sure we dont get any pseudo nodes, and spit a warning if we
-	do.
-
-2001-02-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-filter.c (do_write): Make do_write loop until the
-	entire buffer is written.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* camel-stream-fs.c: Add missing header for cancel check stuff.
-
-	* camel-session.c (camel_cancel_cancel): Fix a wrong cast.
-
-	* camel-mime-part.c (init_header_name_table): Setup a new table
-	header_formatted_table, that lists headers that we dont want to
-	fold (they've already been folded).
-	(write_to_stream): Check for already formatted headers, and dont
-	try and fold them.  This is a fix for bug #1097.
-
-2001-02-01  Not Zed  <NotZed@Ximian.com>
-
-	* camel-mime-utils.c (header_fold): If we are folding, drop the
-	space at the end of the line.
-
-2001-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* camel-remote-store.c (timeout_cb): Remvoe the stream locking
-	here.  I think this was leading to a deadlock when a keepalive is
-	being sent, in imap.
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* providers/imap/camel-imap-command.c
-	(imap_command_strdup_vprintf): Include the terminating NUL in the
-	calculated string length.  This hit memcheck.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* tests/folder/test3.c: Changed the subject search to handle case
-	sensitive when it is mixed case.
-
-	* Makefile.am (libcamel_la_SOURCES): Added camel-ssearch-private.c
-	(noinst_HEADERS): Added camel-search-private.h
-
-	* camel-folder-search.c (check_header): New function to do the
-	work of the various header checks.
-	(search_header_matches): 
-	(search_header_starts_with): 
-	(search_header_ends_with): 
-	(search_header_contains): Use check_header to do the work.
-	(build_match_regex): Removed.
-
-	* camel-search-private.c (header_soundex):  New
-	function to match words to phrases using soundex algorithm.
-
-	* camel-filter-search.c (soundexcmp): Removed.
-	(check_match): Moved to search-private.h
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* camel-search-private.c (camel_search_build_match_regex): Added
-	extra flags, so the same function can be used for
-	start/end/whole/partial matches.
-	(camel_search_header_match): Convenience function to check a
-	single header against all sorts of different matches.
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): Fix for
-	e_sexp api changes.
-
-	* camel-folder-search.c: Fix for e_sexp api changes.
-	(search_header_contains): Free args/quit on unknown header.
-	(search_header_matches): "
-	(search_header_starts_with): "
-	(search_header_ends_with): "
-	(match_message): Add an exception argument.
-	(search_body_contains): Free args/quit on fatal error.
-	(message_body_contains): Removed (moved to
-	camel-search-private.c), fixed callers.
-
-	* camel-filter-search.c: Fix for e_sexp api changes.
-	(build_match_regex, message_body_contains): Moved into
-	camel-filter-private.c  Fixed callers.
-	(check_header): moved guts to camel-search-private, and
-	changed to use regex's for everything.  Just calls that with the
-	right args.
-	(check_header): GEts the header, decodes it, and checks for
-	failure, and whatnot.
-	(check_match): Removed.
-	(header_soundex): Changed significantly.  Now it soundexes each
-	word in the header separately, and compares it to the first
-	argument.
-
-	* tests/folder/test9.c (main): Fix for api changes.
-	(main): Added tests to see that invalid match and action
-	rules are properly detected.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Remove
-	the 'finished message' bit.
-	(camel_filter_driver_filter_message): Remove an accidentally
-	checked in debug.
-	(camel_filter_driver_filter_message): Fix for e-sexp api changes.
-
-2001-01-23  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-wrapper.c: Add a lock around the
-	delayed loading, so two threads won't try to do it at the same
-	time.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Set the
-	CamelFolder::name to just the base part of the vfolder name (the
-	non-query part)
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-search.c (camel_filter_search_match): Perform error
-	checking on parsing/execution.
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Perform error handling on search expression.
-	(CamelFolderSearchPrivate): Add a camelexception for error
-	returns.
-	(camel_folder_search_execute_expression): Setup exception pointer.
-	(search_match_all): Quit on error.
-
-	* providers/imap/camel-imap-summary.c (message_info_load): Removed
-	some debug 'warnings', as they should now be displayed at the
-	toplevel loader, and just made the code match similar code
-	elsewhere.
-
-	* providers/local/camel-mbox-summary.c (message_info_load): Error
-	handling.
-	(message_info_save): more error handling.
-
-	* camel-folder-summary.c (message_info_load): Add error handling
-	and sanity checking.
-	(camel_folder_summary_load): Add error checks.
-	(perform_content_info_load): Error + sanity checks.
-	(content_info_load): error + sanity checks.
-
-	* camel-filter-driver.c (close_folder): avoid /0 by updating after
-	we've done the sync.
-	(close_folders): Setup the first progress report to start it off.
-	(camel_filter_driver_filter_message): Fix a fixme, check errors in
-	e_sexp parsing, etc.
-
-2001-01-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Initialize the value of the variable exists here.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* .cvsignore */*/.cvsignore: Added profiling temp
-	files.
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): When
-	removing phantom nodes, check for the end node too.
-
-	* camel-filter-driver.[ch]: Changed status vars to be
-	CAMEL_FILTER_STATUS_ etc.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-mime-utils.c (header_param_list_format_append): Make the
-	output a little prettier. Okay, so I'm anal...
-
-2001-01-21  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-driver.h: Added an exception to
-	CamelFilterGetFolderFunc.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message):
-	Remove source parameter, as it is determined elsewhere now.
-	(camel_filter_driver_filter_folder): Same here.
-	(camel_filter_driver_filter_mbox): And here.
-	(do_move): If we cannot open a folder, quit, rather than ignoring
-	it.
-	(do_copy): Here too.
-	(open_folder): Pass an exception into get_folder callback.
-	(camel_filter_driver_filter_folder): Report that we're syncing,
-	when we are.
-	(camel_filter_driver_filter_mbox): And here too.
-	(close_folder): And here.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-filter-driver.c (camel_filter_driver_filter_message): Set
-	the deleted bit *before* copying to the default folder, this way
-	if they are importing mail and have a rule to delete it, it
-	doesn't get copied to the default folder un-deleted.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-store.c
-	(get_subscribed_folders_by_hand): If LISTing a subscribed folder
-	doesn't return a LIST response, just ignore that folder. Yay
-	RFC2060.
-	(subscribe_folder): add a missing UNLOCK
-
-2001-01-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* providers/smtp/camel-smtp-provider.c: Mark strings for translation.
-	
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-driver.c (report_status): Add a percentage complete
-	indicator to the status thing.
-	(camel_filter_driver_filter_mbox): Add percentage complete to
-	reporting.	
-	(camel_filter_driver_filter_folder): Same.
-
-2001-01-18  Dan Winship  <danw@ximian.com>
-
-	* camel-store.c (camel_folder_info_build): More tweaking... skip
-	separator characters after the namespace character. (Gets rid of
-	the shell folder registration warning some people have had with
-	IMAP)
-
-	* providers/imap/camel-imap-store.c (imap_connect): I'm sure there
-	was some clever reason I was storing the flags of the folder in
-	the hash table rather than just "1", but I don't remember what it
-	was now. Anyway, since we only ever test NULL/non-NULL, store 1,
-	since flags is sometimes 0.
-
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Oops.
-	Somewhere in one of the reorgs, the code to add new messages to
-	the CamelFolderChangeInfo structure got removed. Fix that.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/imap/camel-imap-summary.c (message_info_load): Add
-	some g_warnings() to help debug later if I ever get the segfaults
-	I was getting earlier. Can't seem to reproduce them after my
-	previous "fix".
-
-	* camel-folder-summary.c (camel_folder_summary_load): Undid my
-	change here, NotZed said it was wrong and that if it gets a NULL
-	mi then it should abort and not continue.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_load): Make sure
-	that the message-info is non-null before we go accessing inner
-	parts of it and/or adding it to the summary array. I may not have
-	handled the error correctly, but it does seem to work
-	correctly. If NotZed could double-check this it'd be great.
-
-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):
-	New smtp error-code to string mapping function.
-	(smtp_connect): Use the new error->string function for reporting
-	useful errors.
-	(smtp_helo): Same. Also use a case-insensitive strstr for 8BITMIEM
-	as it seems Exchange sends back lowercase for that one single SMTP
-	extension. Everything else is uppercase. I'm seeing a lack of love
-	for that extension by Microsoft dudes...
-	(smtp_mail): Use get_smtp_error_string.
-	(smtp_rcpt): Same.
-	(smtp_data): Same.
-	(smtp_quit): Same.
-	(smtp_rset): Same.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-folder-summary.c (camel_folder_summary_array): Add an int
-	i so this code will compile. Should I be worried about how well
-	this code will work? ;-)
-
-2001-01-17  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder.c (free_summary): Call
-	camel_folder_summary_array_free() to do the work.
-	(get_summary): Use camel_folder_summary_array() to get the array
-	atomically.  These fixes allow folder/test8 to work again, and fix
-	a sort of race where the summary size can change while we were
-	making a copy of it.
-
-	* camel-folder-summary.c (camel_folder_summary_array): Get the
-	summary array atomically, so it can't contain empty records.
-	(camel_folder_summary_array_free): And free it.
-
-	* tests/lib/camel-test.c (die): If we are verbose & in threads,
-	then goto sleep so we can debug.
-
-	* tests/folder/test8.c (worker): Add a missing pull() for
-	comnparing content.
-
-	* camel-filter-search.c: Fix the symbol table, so match-all is an
-	immediate function, as it should be.
-
-	* tests/folder/test9.c (main): New test, tests some filtering
-	things.
-
-	* tests/message/test3.c (main): Dont use a boundary string with
-	spaces in it.  Folding can corrupt it.  Maybe the folding isn't
-	working entirely right, but anyway.
-
-	* camel-session.c: Debug out the debug.
-
-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Plug
-	a messageinfo leak.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	Delayed loading of IMAP message parts.
-
-	* camel-types.h: typedef CamelMessageInfo and
-	CamelMessageContentInfo here
-
-	* camel-folder-summary.h: Add a "size" field to
-	CamelMessageContentInfo.
-
-	* camel-folder-summary.c (camel_folder_summary_content_info_new,
-	camel_folder_summary_content_info_free): Renamed and made
-	non-static for providers that construct their own content info.
-	(content_info_load, content_info_save): load/save size
-
-	* camel-data-wrapper.c (camel_data_wrapper_is_offline): New
-	function to return if a data wrapper's contents are "offline". (So
-	that, for example, we don't make thumbnails of images that haven't
-	been loaded off the IMAP server yet.) Defaults to FALSE.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Fix a bug in re-selecting a folder when messages have been
-	expunged from it by another client in the meantime.
-	(imap_get_message): Rewrite. If the message is larger than a
-	certain size, just create a skeleton message containing
-	CamelImapWrappers that will read parts as needed. This way, large
-	attachments only need to be downloaded if the user looks at them,
-	and multipart/alternative alternatives that aren't used will never
-	be downloaded at all.
-	(imap_update_summary): Rewrite this a bunch too to make the
-	parsing more robust.
-
-	* providers/imap/camel-imap-summary.c
-	(CAMEL_IMAP_SUMMARY_VERSION): bump.
-	(camel_imap_summary_new): Set build_content to TRUE.
-	(content_info_load, content_info_save): Only save/load the content
-	for messages that have it. (The content info gets created as a
-	side effect of imap_get_message.)
-
-	* providers/imap/camel-imap-utils.c (imap_parse_body): New routine
-	(and helpers) to parse an IMAP 'body' FETCH response and fill in a
-	CamelMessageContentInfo from it.
-
-	* providers/imap/Makefile.am (libcamelimap_la_SOURCES,
-	libcamelimap_la_HEADERS): add camel-imap-wrapper.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_getsockopt, stream_setsockopt):
-	* camel-stream-fs.c (stream_read, stream_write): 
-	* camel-remote-store.c (socket_connect): fcntl(fd, F_GETFL)
-	returns the flags as the return value, not via a passed in
-	pointer. And F_SETFL looks for an int, not a long, and you have to
-	pass it what it's expecting because it's a va_arg parameter. (Yes,
-	the man page lies on Linux. But check the UNIX98 spec or the glibc
-	source.) Also, fix another bug in socket_connect: if we manage to
-	connect right away, unset O_NONBLOCK so it doesn't mess us up
-	later.
-
-	Fixes a bunch of problems with non-blocking I/O being done in the
-	allegedly-blocking case and then returning EWOULDBLOCK.
-
-2001-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* providers/Makefile.am (NNTP_DIR): set to nntp if ENABLE_NNTP
-	(SUBDIRS): use $(NNTP_DIR)
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_rcpt): Don't check
-	errno as it's not being set. Fixes bug #1150.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	Ugh, this design is ugly like my butt.
-
-	* camel-session.c (camel_session_query_cert_authenticator): New
-	function which will be useful when we integrate SSL.
-
-	* camel-tcp-stream-ssl.c (ssl_auth_cert): Callback to authenticate
-	a certificate.
-	(ssl_bad_cert): Callback that gets the reason the certificate is
-	bad and then calls camel's cert-authenticator callback to notify
-	the user and to allow the user to override the check.
-	(stream_connect): Set the URL we expect to connect with and setup
-	the auth_cert and bad_cert callbacks.
-	(camel_tcp_stream_ssl_new): Now takes a CamelSession and a
-	expected_host argument that it will use for certificate
-	authentication.
-	(camel_tcp_stream_ssl_finalize): Unref the session and free the
-	expected_host.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* camel-filter-search.c (header_exists): Changed to support
-	multiple args (or'd together).
-	(header_contains): Cleaned up to match the search code.  Why did
-	fejj change it? I'll never know.
-	(header_matches): 
-	(header_starts_with): 
-	(header_ends_with): Big cleanup of fejj's "i'm the cut & paste
-	king" code.  Also properly handle or'ing of additional args to
-	match what the folder-search code should do.
-	(check_match): New function which does the annoying matching
-	stuff (for header matches).
-	(check_header): Similarly, handles or'ing of the matches together.
-	(header_contains):
-	(header_matches): 
-	(header_starts_with): 
-	(header_ends_with): Call check_header to do the actual work.
-	(header_soundex): And here too.
-	(match_all): Yeah like match-all isn't passed expression results,
-	its passed expression terms.  Fix this so match-all works like it
-	should, by executing the contained expression.
-	(message_body_contains): Copied directly from
-	camel-folder-search.c, a more robust/faster/simpler body search
-	code.
-	(mime_part_matches): Removed entirely.
-	(handle_multipart): Removed entirely.
-	(build_match_regex): Copied from camel-folder-search.  Builds a
-	set of simple strings into a regex pattern that matches any of
-	them (for faster & simpler matching).  Expanded to accept regex
-	patterns itself, so it can merge them together.
-	(body_contains): Use build match/match message to match using a
-	built regex.
-	(body_regex): Likewise, this time we tell it we're building a
-	regex though.
-	(header_full_regex): Use build_match_regex to take the drudgery
-	out of it, and expand it to handle multiple regex's at once.
-	(get_full_header): slightly cleaner (well i dunno, the sprintf
-	stuff just got to me).
-	(header_regex): Cleaned up to use build_match_Regex too, and to
-	properly check types.
-	(filter_message_search): Just allocate 'fms' on the stack.
-
-	* camel-filter-driver.c (camel_filter_driver_finalise): 
-	(camel_filter_driver_init): 
-	(camel_filter_driver_class_init): 
-	(camel_filter_driver_get_type): Changed from gtk object to camel
-	object.
-	(camel_filter_driver_add_rule): New function to add a rule to be
-	processed in sexp form.
-	(camel_filter_driver_init): Init the rules list.
-	(camel_filter_driver_finalise): Clear the rules/rules list.
-	(camel_filter_driver_filter_message): Scan rules list directly
-	rather than creating on the fly.
-
-	* Makefile.am (libcamelinclude_HEADERS): Added camel-filter-driver.h
-	(libcamel_la_SOURCES): Added camel-filter-driver.c, code taken
-	from filter-driver, which can drive, uh, filters based on sexp's.
-	(libcamelinclude_HEADERS): 
-	(libcamel_la_SOURCES): Added camel-filter-search.[ch]
-
-	* camel-folder-summary.c (camel_folder_summary_decode_string):
-	Chganged len back to be unsigned.  And do a simple range check on
-	the string value to try and detect corrupted summary files.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Handle
-	cancelled stream reads with an appropriate exception.
-
-	* providers/imap/camel-imap-private.h: Fix the include-once
-	macro.  Doh, confliced with camel-private.h.
-
-	* providers/imap/camel-imap-store.c (imap_store_refresh_folders):
-	A copy of camel_remote_store_refresh_folders.  We avoid locking
-	each folder when we call it though.  This should be removed when i
-	can work out how to remove the folder lock from this function
-	easily.
-
-	* camel-stream-fs.c (stream_write): Fix n' argument of select.
-	(stream_read): Likewise.
-
-	* camel-remote-store.c (socket_connect): Bump the connect timeout
-	upto 4 minutes.
-	(socket_connect): Oops, fix the 'n' argument of select.
-
-	* camel-session.c (camel_cancel_cancel): If we are given no
-	cancellation node, then do it for all active ones.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-fs.c (stream_close): If the close() is successful,
-	set the fd to -1.
-
-	* camel-tcp-stream-raw.c: Removed the disconnect() method.
-	(stream_close): If the close() is successful, set the sockfd to
-	-1.
-
-	* camel-tcp-stream-ssl.c: Removed the disconnect() method.
-	(stream_close): If the close() is successful, set the sockfd to
-	NULL.
-
-	* camel-tcp-stream.c (camel_tcp_stream_disconnect): Removed,
-	easier to just use the close() method as it did the same thing
-	anyway.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-raw.c (stream_getsockopt): Updated to be able
-	to get the CAMEL_SOCKOPT_NONBLOCKING socket opt.
-	(stream_setsockopt): Updated to be able to set the
-	CAMEL_SOCKOPT_NONBLOCKING socket opt.
-
-2001-01-15  Peter Williams  <peterw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock
-	around the imap_rescan, which needs it.
-
-2001-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* camel-remote-store.c (socket_connect): A cancellable connection
-	routine.
-	(remote_send_string): Return cancelled exception if we were.
-	(remote_send_stream): "
-	(remote_recv_line): "
-
-	* camel-stream-fs.c (stream_read): First cut at cancellation
-	stuff.  Its looking a bit ugly.
-
-2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_connect): Uses an SSL socket now
-	although there's still a few things missing (like certificate
-	handling and such).
-
-	* camel.c (camel_ssl_init): A replacement function for
-	camel_init() that also initializes SSL.
-
-2001-01-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream-ssl.c (stream_getsockopt): Implemented.
-	(stream_setsockopt): Implemented.
-
-	* camel-tcp-stream-raw.c (stream_getsockopt): Implemented.
-	(stream_setsockopt): Implemented.
-
-	* camel-tcp-stream.c (camel_tcp_stream_getsockopt): New method.
-	(camel_tcp_stream_setsockopt): Another new method. I think you get
-	the idea of what these are for so I won't explain them.
-
-2001-01-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-tcp-stream-ssl.[c,h]: New CamelTcpStream class that
-	implements nspr sockets and eventually will use nss for
-	SSL/TLS. Currently doesn't do any SSL/TLS but it should still
-	work. It's functionally equivalent to CamelTcpStreamRaw at the
-	moment only it uses nspr i/o.
-
-	* camel-tcp-stream-raw.[c,h]: New CamelTcpStream class that
-	implements native sockets. Should be usable but may have some bugs
-	yet.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-tcp-stream.[c,h]: New abstract class for TCP streams. The
-	next step is to write child classes (CamelTcpStreamBSD and
-	CamelTcpStreamSSL). The BSD stream will use normal BSD sockets
-	while SSL will use Mozilla's NSPR and NSS libraries to do Secure
-	Socket Layers which wille ventually replace CamelStreamSSL which I
-	just commit'd. Oh well.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* camel-stream-ssl.[c,h]: New stream for handling SSL/TLS
-	connections.
-
-2001-01-12  Not Zed  <NotZed@Ximian.com>
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new):
-	Perform a final pass, removing any pseudo nodes we added earlier.
-	Quick patch to test the idea.
-	(camel_folder_thread_messages_new): Added casts to rmeove some
-	warnings for the analites out there.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	Fix a bug in previous commit: don't check for deleted messages if
-	there are no known messages in the folder (because it would end up
-	sending "FETCH 0 ...").
-	(imap_copy_message_to): Fix this up: sync flags to the server
-	before copying so that they end up correct in the remote folder.
-	And poke the destination folder after doing the copy so it notices
-	the new message right away.
-	(imap_move_message_to): Call imap_copy_message_to for most of the
-	work rather than duplicating the code (since it's much more
-	complicated now).
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):
-	New function to check for added/deleted messages when re-selecting
-	a folder.
-	(imap_refresh_info, imap_rescan, imap_update_summary): Various
-	locking tweaks that turn out to be irrelevant since command_lock
-	is recursive, but whatever.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): When
-	selecting a new folder, call camel_imap_folder_selected on it.
-
-	* camel-folder.c (camel_folder_copy_message_to): Fix a locking
-	problem. (One branch of an if statement was returning with the
-	lock still locked.) Also remove the deprecation comments, to match
-	move_message_to.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/local/camel-local-provider.c: Changed the descriptions
-	for mh, mbox, and maildir to be more "user-friendly".
-
-2001-01-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-types.h: New header to prevent
-	recursive #include problems
-
-	* providers/imap/*.h: Replace some #includes with #include
-	"camel-imap-types.h", remove typedefs that were moved to
-	camel-imap-types.h
-
-	* providers/imap/*.c: Add #includes to make up for #includes
-	removed from .h files
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
-	camel-imap-types.h
-
-2001-01-10  Dan Winship  <danw@helixcode.com>
-
-	* camel-store.c (camel_store_sync): New class function, parallel
-	to camel_folder_sync. (The default implementation just calls
-	camel_folder_sync on each cached folder.)
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Call
-	camel_store_sync before doing anything else so that the IMAP
-	server and Camel are working from the same data. Don't ask the
-	server for the unread message count of the current folder, since
-	UW will return often-incorrect cached data, and we can calculate
-	it without talking to the server anyway.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	Mostly IMAP changes. Use the NAMESPACE extension (where
-	available). Deal with servers that don't return LIST flags in
-	response to LSUB (like UW) to get rid of the "not a selectable
-	folder" error messages in the UI. Take advantage of the \Marked
-	and \Unmarked flags to try to speed up the folder scan by not
-	doing STATUS on unmarked folders. Some further tweaks on the shape
-	of the resulting folder tree in various situations...
-
-	* camel-store.h: Remove the (read) message_count, since nothing
-	uses it, and we can speed up IMAP a bit this way.
-
-	* camel-store.c (camel_folder_info_build): Redo this a bit to make
-	it more useful for IMAP since that's the only thing that uses it.
-
-	* camel-remote-store.c (camel_remote_store_connected): Public
-	function to check if the store is connected, and try to connect it
-	if it's not.
-	(remote_send_string, remote_send_stream, remote_recv_line): Use
-	that.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize):
-	fix up for changes.
-	(camel_imap_store_init): Initialize subscribed_folders to NULL
-	rather than an empty hash table.
-	(imap_connect): Get the list of subscribed folders here. If the
-	server doesn't claim that any of them are either Marked or
-	Unmarked, then assume that it doesn't do that for LSUB and
-	remember that for later. If the server supports the NAMESPACE
-	extension and the user didn't specify a namespace, use the
-	server-provided one.
-	(imap_disconnect): Free the list of subscribed folders, and the
-	namespace.
-	(get_folder): check camel_remote_store_connected
-	(get_folder_info): check camel_remote_store_connected. Add a bunch
-	of new cleverness. If we learned that the server doesn't do LSUB
-	usefully, do a bunch of LISTs by hand. Then, if we're getting
-	unread counts, only do it for folders that weren't listed as
-	Unmarked. Also, deal with namespaces that end with the separator
-	character, and update for changes to camel_folder_info_build.
-	(folder_subscribed): Add a g_return_val_if_fail.
-	(subscribe_folder, unsubscribe_folder): check
-	camel_remote_store_connected.
-
-	* providers/nntp/camel-nntp-store.c (build_folder_info,
-	build_folder_info_from_grouplist, nntp_store_get_folder_info):
-	Don't fill in message_count since it doesn't exist any more.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	Kill off a long-hated Camel kludge: "empty" URLs and
-	query_auth_types_generic.
-
-	* camel-url.c: Remove "empty" from CamelURL.
-	(camel_url_new): No longer set it.
-	(camel_url_to_string): Treat "" as equivalent to NULL for
-	authmech. (Unrelated change, but it simplifies some stuff with the
-	new config dialog.)
-
-	* camel-service.c (camel_service_new): Remove url->empty check: if
-	the URL isn't valid, we don't create the service.
-	(camel_service_query_auth_types): No longer need to switch between
-	generic and connected variants.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): 
-	* providers/pop3/camel-pop3-store.c (query_auth_types): 
-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types): 
-	* providers/imap/camel-imap-store.c (query_auth_types): 
-	* camel-remote-store.c (remote_query_auth_types): Remove generic
-	version, rename connected version.
-
-2001-01-06  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Dont
-	try and unref a messageinfo that wasn't there, and use the right
-	free function too.  Modified patch from Iain.
-	(vee_move_message_to): New method, call the real folders'
-	move_message_to method.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* tests/lib/Makefile.am: fix includes for compilation
-
-	* tests/message/Makefile.am: Build test3 again
-
-	* tests/message/test2.c: Kill warnings with header includes
-
-	* tests/message/test3.c: ditto
-
-	* tests/lib/streams.c: ditto
-
-	* tests/lib/camel-test.c: ditto
-
-	* tests/lib/messages.c: ditto
-
-	* tests/lib/folders.c: ditto
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_rescan): Fix two
-	problems in figuring out server-expunged messages.
-
-2001-01-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (thaw): If we have a lot of messages changed,
-	promote it to a folder changed event.
-
-2000-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-search.c (search_header_matches): Implemented.
-	(search_header_exists): Implemented.
-	(search_header_starts_with): Implemented.
-	(search_header_ends_with): Implemented.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new):
-	Initialize the exists variable so that we don't do random things
-	if the imap server misbehaves.
-
-2000-12-29  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (camel_folder_move_message_to): REmove warning,
-	this isn't really deprecated, sigh.
-
-	* camel-mime-utils.c (header_fold): Comment out some debug.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/maildir/, providers/mbox/, providers/mh/: Removed
-	these directories since they're unused.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	IMAP randomness.
-
-	* providers/imap/camel-imap-stream.[ch]: Remove. To be replaced.
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Remove
-	camel-imap-stream.h
-
-	* providers/imap/camel-imap-utils.c (imap_parse_flag_list): Take a
-	char ** instead of char *, to return the position at the end of
-	parsing like the string parsing functions.
-	(imap_parse_string_generic): New function to parse a string,
-	nstring, or astring.
-	(imap_parse_nstring, imap_parse_astring): Now macros
-	(imap_parse_string): Added
-
-	* providers/imap/camel-imap-folder.h: Remove the "exists" field
-	from CamelImapFolder.
-
-	* providers/imap/camel-imap-folder.c: Remove unused include of
-	camel-imap-stream.h.
-	(camel_imap_folder_init): Remove no-longer-relevant summary
-	initialization.
-	(camel_imap_folder_new): Update for imap_parse_flag_list change,
-	exists removal, and imap_rescan.
-	(imap_rescan): New function that does most of the work of the old
-	imap_refresh_info, but taking "exists" as an argument instead of
-	getting it from the folder. Also calls camel_imap_folder_changed
-	to do the summary updating and signalling, rather than duplicating
-	that code.
-	(imap_refresh_info): Just call imap_rescan (using the size of the
-	folder summary as "exists").
-	(imap_update_summary): Update for imap_parse_flag_list change
-	(camel_imap_folder_changed): Update for "exists" change.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_content_type_simple): New function to
-	return just foo/bar with no parameters.
-
-	* camel-data-wrapper.c (get_mime_type): Use
-	header_content_type_simple rather than header_content_type_format.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* gmime-content-field.[ch]: Remove this. It was only a thin
-	wrapper around struct _header_content_type anyway, and didn't
-	match the naming scheme of anything else.
-
-	* Makefile.am: Remove gmime-content-field.[ch]
-
-	* camel.h: Remove gmime-content-field.h
-
-	* camel-types.h: Add CamelContentType as a typedef for struct
-	_header_content_type (especially for use outside of camel).
-
-	* camel-multipart.c: 
-	* camel-mime-part.c: 
-	* camel-mime-message.c: 
-	* camel-folder-summary.c:
-	* camel-folder-search.c: 
-	* camel-data-wrapper.[ch]: Use CamelContentType and
-	header_content_type_* functions rather than the GMime stuff. 
-
-	* camel-mime-part-utils.c: 
-	* camel-medium.c: Remove unused gmime-content-field.h include.
-
-2000-12-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Fix the
-	APOP check to not crash on servers that don't return any
-	information on the +OK greeting line.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-search.c (imap_body_contains): Lock
-	the command channel while searching.
-	(imap_body_contains): If performing a whole uid search, then add
-	references to our own summary items, dont look it up in the
-	folder.  This way they can't vanish unexpectedly.
-
-	* providers/imap/camel-imap-folder.h (CamelImapFolder): Added a
-	private field.
-	(CamelImapFolder): Removed summary again from here.
-
-	* providers/imap/camel-imap-private.h: Added lock for imap
-	searches.
-
-	* Merge from camel-mt-branch.
-	
-	* providers/imap/camel-imap-folder.c (imap_update_summary): Merge
-	fix, use the folder->summary.
-	(imap_get_message_flags, imap_set_message_flags,
-	imap_get_message_user_flag, imap_set_message_user_flag): Removed
-	again.
-	(camel_imap_folder_init): Setup private data/lock.
-	(imap_finalize): Free private data/search lock.
-	(imap_search_free): Lock the search_lock.
-	(imap_search_by_expression): Lock the search lock when using the
-	search object.  Also copy/ref hte summary, rather than getting it
-	directly.
-	(imap_refresh_info): Free any info lookups.  Use folder->summary
-	not imap_folder->summary.  And lock around commands.
-	(camel_imap_folder_changed): Use folder->summary again.
-	(camel_imap_folder_changed): Make sure we unref the summary lookup.
-
-2000-12-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): When
-	getting the top-level folder list, include INBOX even if it's not
-	subscribed. Don't show subscribed folders outside of the given
-	namespace. Do a better job of pruning the namespace from the
-	returned folder tree.
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-search.c: New CamelFolderSearch
-	subclass that just reimplements body_contains (using the IMAP
-	SEARCH command). All other kinds of searching are done against the
-	local summary.
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Use a CamelImapSearch to do searching.
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp, etc): No
-	longer needed.
-
-	* camel-folder-search.h: Add missing CAMEL_FOLDER_SEARCH_TYPE
-	#define
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_gets): Update the
-	doc comment: since it always NUL-terminates the buffer, it reads
-	at most @max-1 bytes, not @max.
-
-	* camel-remote-store.c (remote_recv_line): Fix the "did
-	camel_stream_buffer_gets fill the whole buffer" check. Fixes a bug
-	when reading lines longer than 1024 characters (eg, IMAP SEARCH
-	responses in very large folders).
-
-2000-12-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Oops.
-	Don't do "FETCH 1:0" when the folder is empty.
-	(imap_protocol_get_summary_specifier): Request RFC822.SIZE too.
-	(imap_update_summary): Parse RFC822.SIZE and add it to the
-	summary.
-
-2000-12-18  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Add "guint32 server_flags"
-	to CamelImapMessageInfo to keep track of the last known message
-	flag state on the server.
-	(message_info_save, message_info_load): Save/load the
-	server_flags.
-
-	* providers/imap/camel-imap-folder.c: Make this use
-	CamelFolderChangeInfo and emit folder_changed notifications as it
-	gets them rather than only on refresh_info.
-	(imap_refresh_info): Notice flags that get cleared on the server
-	as well as flags that get set.
-	(imap_update_summary): Remove a comment that never actually
-	applied to the committed code.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Change
-	the semantics of fmt: Now %S (capital S) means an IMAP "string",
-	(which can be sent as either a quoted string or a literal). If
-	the server supports LITERAL+, these will be sent as extended
-	literals (which don't require any special escaping). Otherwise
-	they'll be sent as quoted strings (and it now properly deals with
-	" or \ in the string).
-	(imap_command_strdup_vprintf): Utility routine that does the real
-	work for the functionality mentioned above.
-
-	* providers/imap/camel-imap-utils.c (imap_quote_string): Turns a
-	string into a proper IMAP "quoted string".
-
-	* providers/imap/camel-imap-store.c: 
-	* providers/imap/camel-imap-folder.c: Use %S instead of "%s" where
-	appropriate.
-
-2000-12-22  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (GLOBAL_INFO_UNLOCK): Doh, cut and paste
-	victim again, call unlock instead of lock!
-	(summary_assign_uid): Unlock around trying to get a new uid, if we
-	have a clash.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/folder/Makefile.am (TESTS): reenabled the tests here.
-
-	* providers/nntp/camel-nntp-newsrc.c (CamelNNTPNewsrc): Add a
-	lock.  Made completely mt-safe.  Sigh, this is all so i can
-	support snooping of the set_flags stuff inside camel-nntp-folder,
-	since i've removed the global folder lock from all of the other
-	folder summary operations.
-	(camel_nntp_newsrc_read_for_server): Setup lock.
-	(camel_nntp_newsrc_get_highest_article_read): Lock internal access.
-	(camel_nntp_newsrc_get_num_articles_read): 
-	(camel_nntp_newsrc_mark_article_read): 
-	(camel_nntp_newsrc_mark_range_read): 
-	(camel_nntp_newsrc_article_is_read): 
-	(camel_nntp_newsrc_group_is_subscribed): 
-	(camel_nntp_newsrc_unsubscribe_group): 
-	(camel_nntp_newsrc_subscribe_group): 
-	(camel_nntp_newsrc_get_subscribed_group_names): 
-	(camel_nntp_newsrc_get_all_group_names): "
-	(camel_nntp_newsrc_write_to_file): Lock internal accesses.
-	(camel_nntp_newsrc_write): Lock around diry stuff.
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Lock around our internal poking of the summary hashtable/array.
-	(maildir_summary_sync): And the same here too.
-
-	* camel-folder-summary.c: Moved the summaryprivate data into
-	camel-private.h.  Only needed for the locks really.
-	(camel_folder_summary_init): Setup locks.
-	(camel_folder_summary_set_filename): Lock.
-	(camel_folder_summary_index): lock
-	(camel_folder_summary_uid): Lock
-	(camel_folder_summary_next_uid): "
-	(camel_folder_summary_set_uid): "
-	(camel_folder_summary_load): Lock around whole load.  Hrm,
-	probably not required.
-	(camel_folder_summary_save): Lock around whole save, this is
-	reqwuired, unless we ref/copy the whole list first, and i couldn't
-	be bothreed.
-	(camel_folder_summary_add): lock
-	(summary_assign_uid): Lock around internal accesses.
-	(camel_folder_summary_info_new_from_parser): Lock around filtr stuff.
-	(camel_folder_summary_info_ref): Add locking.  Could probably use
-	its own lock?
-	(camel_folder_summary_touch): Add locking, likewise.
-	(camel_folder_summary_clear): Lock.  If the preiovus two are
-	changed, then so this will need mroe locking.
-	(camel_folder_summary_info_free): Lock around refcounting.
-	(camel_folder_summary_remove): Locking.
-	(camel_folder_summary_remove_uid): Lock ref, unlock, unref.  Also
-	fixed a bug that would have made this never work, freeing the key,
-	which isn't allocated.
-	(camel_folder_summary_remove_index): lock, ref, unlock unref also.
-	(camel_message_info_ref): Lock using a separate global lock, since
-	we have no context here.
-	(camel_message_info_free): Here too.
-	(content_info_alloc): Use an alocation lock here.  avoids races
-	with setting up content_info_chunks, etc.
-	(camel_folder_summary_info_new): And here too.
-	(camel_folder_summary_load): Changed to use a differnet lock for
-	loading/saving.
-	(camel_folder_summary_init): Doh, i do need a reflock afterall,
-	set one up.
-	(camel_folder_summary_finalize): Free it.
-	(camel_folder_summary_index): Add a reflock.
-	(camel_folder_summary_uid): And here too.
-	(camel_folder_summary_info_free): Use reflock instead of
-	summary_lock.
-	(camel_folder_summary_info_ref): Likewise.
-	(camel_folder_summary_remove_uid): Add reflocking.
-	(camel_folder_summary_remove_index): And here too.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Setup a
-	summary object.
-	(vee_folder_build): Build each item into the real summary object.
-	(vee_folder_add, vee_folder_add_uid, vee_folder_add_change): New
-	functions to add a single record to the vfolder summary.
-	(vee_folder_build_folder): Use a real summary.
-	(vee_get_uids): Removed, use default impl.
-	(vee_free_message_info): "
-	(vee_get_message_info): "
-	(vee_get_summary): "
-	(vee_get_unread_message_count): "
-	(vee_get_message_count): "
-	(vee_sync): Make vee-folder-sync sync all subordinate folders.
-	Well i dont think this is right, but enough peopl ehave aksed for
-	it.
-	(vee_expunge): Same for expunge.
-	(vee_set_message_flags): Call parent class, then mirror flags to
-	subfolder.
-	(vee_get_message_user_flag): Removed, we just use the default
-	impl, and our flags should always match.
-	(vee_set_message_user_flag): Snoop the set and set on subfolder.
-	(vee_get_message_flags): Removed, jsut use parent impl, assume our
-	copy matches the real ones.
-	(get_real_message): Removed.  We sort ofneed to keep the
-	summaryitem refed while we use it, so this doesn't make as much
-	sense as it did once.
-	(camel_vee_folder_finalise): Unhook listening events as we unref
-	folders.
-	(camel_vee_folder_new): Set the summary messageinfo data size
-	properly.
-	(vfolder_remove_match): Fixed for summary change.
-	(folder_changed): ditto.  Also stopped changed items from being
-	re-searched and possibly removed.  Might have to resort to the old
-	whole-search idea again.
-	(message_changed): Similarly.  Might be easier just not to bother
-	with a whole search.
-
-	* providers/vee/camel-vee-folder.h: Removes summary
-	hashtable/array, and use a real summary object.  Sigh, more work.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_sync): Move
-	summary to folder object.
-	(nntp_folder_get_message_count): Removed, use default impl.
-	(nntp_folder_set_message_flags): Call parent impl to do the work,
-	but snoop for newsrc.
-	(nntp_folder_get_uids): Removed, use default impl.
-	(nntp_folder_get_summary): "
-	(nntp_folder_get_message_info): "
-	(nntp_folder_free_message_info): "
-	(camel_nntp_folder_new): moved summary to folder class
-	
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init):
-	Move summary to folder object.
-	(camel_imap_folder_new): "
-	(imap_finalize): No longer unref the summary (or infact, do
-	anything else either).
-	(imap_refresh_info): move summary to folder object.
-	(imap_sync): "
-	(imap_get_message_count): Removed, use default impl.
-	(imap_get_unread_message_count): "
-	(imap_get_uids): "
-	(imap_get_summary): "
-	(imap_free_summary): "
-	(imap_get_message_info): "
-	(imap_free_message_info): "
-	(imap_get_message_flags): "
-	(imap_set_message_flags): "
-	(imap_get_message_user_flag): ", this changes functionality, but
-	only by providing non-permanent flags.
-	(imap_set_message_user_flag): "
-	(imap_update_summary): move summary to folder object, and use
-	camel_folder_summary_info_new_from_header, instead of calling the
-	virtual function directly.
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	move summary to folder object, again.
-	(maildir_get_message): "
-
-	* providers/local/camel-mh-folder.c (mh_append_message): move
-	summary to folder object.
-	(mh_get_message): "
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): Move
-	summary to folder object
-	(mbox_get_message): "
-	(mbox_set_message_user_flag): We need our own copy of this, sigh,
-	so we can track if the xev needs a rewrite (probably, its only a
-	guide anyway).
-	(mbox_set_message_user_tag): Same same with this one.
-	(camel_mbox_folder_class_init): Link in these new virtual functions.
-
-	* providers/local/camel-local-folder.h (CamelLocalFolder): removed
-	summary.
-
-	* providers/local/camel-local-folder.c (local_get_message_count): 
-	(local_get_unread_message_count): 
-	(local_get_uids): 
-	(local_get_summary): 
-	(local_free_summary): 
-	(local_get_message_info): 
-	(local_free_message_info): 
-	(local_get_message_flags): 
-	(local_set_message_flags): 
-	(local_get_message_user_flag): 
-	(local_set_message_user_flag): 
-	(local_get_message_user_tag): 
-	(local_set_message_user_tag): Removed, all now use default
-	implementation.
-	(camel_local_folder_class_init): Removed overrides.
-	(local_init): Clear folder->summary.
-	(local_finalize): move summary to folder.
-	(camel_local_folder_construct): "
-	(local_sync): "
-
-	* camel-folder.c (free_summary): Provide a real impl.
-	(get_summary): "
-	(free_uids): "
-	(get_uids): "
-	(free_message_info): "
-	(get_message_info): "
-	(set_message_user_tag): "
-	(get_message_user_tag): "
-	(set_message_user_flag): "
-	(get_message_user_flag): "  Sigh, the last so far.
-	(get_message_flags): Sigh, 1 more afterall.
-	(get_unread_message_count): And and this.
-	(get_message_count): and this!
-	(set_message_flags): Sigh, and this.
-	(camel_folder_finalize): Unref the summary if we have it.
-	(camel_folder_free_uids): Remove locking.
-	(camel_folder_get_message_flags): Remove locks, since the summary
-	is now mt-safe.
-	(camel_folder_set_message_flags): "
-	(camel_folder_get_message_user_flag): "
-	(camel_folder_set_message_user_flag): "
-	(camel_folder_get_message_user_tag): "
-	(camel_folder_set_message_user_tag): "
-	(camel_folder_get_message_info): "
-	(camel_folder_free_message_info): "
-	(camel_folder_get_uids): "
-	(camel_folder_free_summary): "
-	(camel_folder_get_unread_message_count): "
-	(get_unread_message_count): Check we got info, no big deal, but
-	the summary might change while we're counting, and upset the count
-	slightly.
-	(camel_folder_get_message_count): Remove locks.
-
-	* camel-folder.h (struct _CamelFolder): Added CamelFolderSummary
-	to the base folder object.  Sigh, this is going to be a lot of
-	work ...
-
-	* camel-service.c (camel_service_init, finalise): changed
-	connect_lock to be recursive e_mutex.
-
-	* camel-remote-store.c (camel_remote_store_init, finalise): Changed
-	stream_lock to recursive e_mutex.
-
-	* camel-private.h (RemoteStorePrivate, ServicePrivate): Use
-	recursive mutexes for connect_lock & stream_lock.  Ick.  Because
-	of the imap code.
-
-	* providers/imap/camel-imap-private.h: Change the command_lock to
-	be an EMutex.
-
-	* providers/imap/camel-imap-store.c (connect_to_server): Removed
-	the command_lock stuff.  If we are just connected again, it should
-	be safe to assume we have exclusive access at this point without
-	it (and yes, removes a deadlock).
-	(imap_create): Remove a lock that wasn't even supposed to be
-	there.
-	(camel_imap_store_finalize, init): g_mutex->e_mutex(E_MUTEX_REC).
-	Use a recursive mutex since the imap code is multiply recursivly
-	calling some functions (sigh, it would be nice to fix this).
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (folder_changed): Change the locks to inside the
-	if.  Stops a deadloc,k and we dont need a lock to read a value.
-	(message_changed): Likewise.
-
-	* camel.c (camel_init): Blah, comment out g_thread_init, leave it
-	to the caller, since it can only ever be done once.
-
-	* camel-folder-thread.c (camel_folder_thread_messages_new): Ref
-	and save the folder in the thread return.  Also get the summary
-	once, and access that for the messageinfo's.  Added bonus that now
-	threads should come out in a similar order.  We need to do this so
-	that the messageinfo's dont get unref'd under us, and using the
-	summary directly simplifies memory management.
-	(camel_folder_thread_messages_destroy): Free the summary/unref the
-	folder.
-
-	* camel-folder-thread.h: Add a folder to CamelFolderThread struct.
-
-2000-12-19  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Unref
-	using e_sexp_unref, since it is no longer an object.
-
-	* tests/lib/camel-test.c: Added a global lock, and made it
-	thread-aware.
-
-	* camel-exception.c: Add a global lock.  Not sure its really
-	needed here, but it doesn't really hurt.
-	(camel_exception_clear): Lock around access.
-	(camel_exception_set): Same.
-	(camel_exception_setv): "
-	(camel_exception_xfer): "
-
-	* providers/local/Makefile.am (noinst_HEADERS): Added, for
-	camel-local-private.h
-
-	* camel-folder.c (camel_folder_search_by_expression): Removed
-	locking here, now upto the implementing class to lock.
-	(camel_folder_search_free): Removed the folder lock here too, for
-	consistency really, and the locking probably wasn't needed.
-
-	* providers/local/camel-local-folder.c (local_get_summary):
-	Changed to copy/ref the summary items.
-	(local_free_summary): Unref the summary items/free the array.
-	(local_get_unread_message_count): Free info lookups.
-	(local_search_by_expression): Perform more fine-grained locking,
-	and dont lock the whole folder while searching, just the search
-	object.  Dum de dum, it *would* be possible to not even have to
-	lock the search, by using our own copy of the search object each
-	time.  Could be investigated.
-	(local_init): Init priaate data/lock.
-	(local_finalize): Free private data/lock.
-	(local_search_free): Also lock around the search object, because
-	it accesses global data inside.
-
-	* README.mt: Some info about the mt code development.
-
-	* camel-folder-search.c (match_message): Put in a warning, this
-	plain deadlocks so far, but i'm going to bed now.
-	(camel_folder_search_finalize): Use e_sexp_unref() since its no
-	longer an object.
-
-	* camel-session.c (camel_session_init): Init private data/lock.
-	(camel_session_finalise): Free private data/lock.
-	(camel_session_register_provider): Lock hash insert.
-	(service_cache_remove): Lock.
-	(camel_session_list_providers): "
-	(camel_session_get_service): Lock the whole function.
-
-	* camel-session.h (struct _CamelSession): Added private data.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Setup
-	private data.
-	(camel_imap_store_finalize): Free private data.
-	(connect_to_server): Lock around command calls.  I dont think its
-	needed, but it shouldn't hurt either.
-	(imap_connect): Lock around command calls.  Again, I don think it
-	is needed, but wont hurt.
-	(imap_disconnect): ditto for this one.
-	(imap_create): Lock around command.
-	(get_folder): "
-	(get_folder_info): "
-	(subscribe_folder): "
-	(unsubscribe_folder): "
-	(imap_keepalive): "
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock
-	around calling a command.
-	(imap_refresh_info): Likewise.
-	(imap_sync): "
-	(imap_append_message): "
-	(imap_copy_message_to): "
-	(imap_move_message_to): "
-	(imap_get_message): "
-	(imap_update_summary): "
-	(imap_search_by_expression): ", also minor logic cleanup.
-	(imap_get_summary): Copy/ref the summary items.
-	(imap_free_summary): And free it now too.
-
-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):
-	Lock the command stream for the command session.
-
-	* providers/imap/camel-imap-private.h: Private (locking info)
-	stuff for imap provider.
-	(CAMEL_IMAP_STORE_UNLOCK): Fix to call unlock, rather than lock!
-
-	* camel-service.c (camel_service_query_auth_types): Lock also for
-	the connection here, incase the service needs to connect.
-
-	* camel-remote-store.c (camel_remote_store_init): Init private
-	data/lock.
-	(camel_remote_store_finalise): Readded, free private data/lock.
-	(remote_send_stream): Changed to return the number of bytes
-	written, like a good little stream function should.
-	(camel_remote_store_send_string): Lock for stream access.
-	(camel_remote_store_send_stream): Same here.
-	(camel_remote_store_recv_line): And here.
-	(camel_remote_store_refresh_folders): Lock the store for cache
-	access.
-	(timeout_cb): Lock for stream access.
-
-2000-12-18  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-service.c (camel_service_init): Init private data.
-	(camel_service_finalise): Free private data.
-	(camel_service_connect): Lock around connection access.
-	(camel_service_disconnect): "
-
-	* camel-service.h (struct _CamelService): Added private field.
-
-	* camel-store.c (camel_store_init): Init private data/lock.
-	(camel_store_finalize): Free private data/lock.
-	(camel_store_get_folder): Lock internal calls.
-	(camel_store_delete_folder): "
-	(camel_store_rename_folder): "
-	(camel_store_get_root_folder): "
-	(camel_store_get_default_folder): "
-	(camel_store_get_folder_info): "
-	(camel_store_folder_subscribed): "
-	(camel_store_subscribe_folder): "
-	(camel_store_unsubscribe_folder): "
-	(lookup_folder): Lock accesses to the folder cache.
-	(cache_folder): "
-	(uncache_folder): And here too.
-
-	* camel-store.h (struct _CamelStore): Added a private field.
-
-	* Makefile.am (noinst_HEADERS): Add camel-private.h.  There is a
-	comment in that header as to why it ins't installed.
-
-	* camel-private.h: New header for private data, that subclasses
-	can get to.
-
-	* tests/lib/camel-test.c (camel_test_init): If we do have threads
-	enabled already, dont call g_thread_init().
-	
-	* tests/lib/folders.c (test_folder_counts): Add free of info.
-	(test_folder_message): And here too.
-
-	* providers/local/camel-maildir-summary.c (remove_summary): Free
-	info.
-	(maildir_summary_check): Free info lookups.
-
-	* providers/local/camel-mh-summary.c (message_info_new): Removed,
-	didn't add value.
-	(remove_summary): free info after being used.
-	(mh_summary_check): Free info lookups.
-	(mh_summary_sync): and here too.
-
-	* providers/local/camel-mbox-summary.c (summary_update): Free info
-	lookups.
-	(mbox_summary_sync_full): Likewise.
-	(mbox_summary_sync_quick): And here.
-	(mbox_summary_sync):  ... and here.
-
-	* providers/local/camel-maildir-folder.c (maildir_get_message):
-	Free messageinfo lookups.
-
-	* providers/local/camel-mh-folder.c (mh_get_message): Free
-	messageinfo lookups.
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Free
-	messageinfo lookups.
-
-	* providers/local/camel-local-summary.c
-	(message_info_new_from_message): Removed, since it wasn't doing
-	anything useful.
-	(message_info_new_from_parser): Same.  And some other dead code.
-
-	* providers/local/camel-local-folder.c (local_get_message_info):
-	deconstify.
-	(local_free_message_info):new func to free info.
-	(local_get_uids): 
-	(local_get_message_flags): 
-	(local_set_message_flags): 
-	(local_get_message_user_flag): 
-	(local_set_message_user_flag): 
-	(local_get_message_user_tag): 
-	(local_set_message_user_tag): Free all info lookups.
-	(local_expunge): Dont call camel_folder_* functions, to avoid a deadlock.
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_get_message_info): deconstify.
-	(nntp_folder_free_message_info): Free summary item.
-	(nntp_folder_get_message_flags): Free summary lookup.
-	(nntp_folder_set_message_flags): and here.
-	(nntp_folder_get_uids): And here.
-
-	* providers/imap/camel-imap-auth.c: Make base64_*_simple optional
-	with the HAVE_KRB4 flag.
-
-	* providers/imap/camel-imap-folder.c (imap_free_message_info):
-	Added a free of the message info.
-	(imap_refresh_info): 
-	(imap_sync): 
-	(imap_refresh_info): 
-	(imap_get_unread_message_count): 
-	(imap_get_uids): 
-	(imap_get_message_flags): 
-	(imap_set_message_flags): Free any summary lookups.
-	(imap_get_message_flags): Get the message info directly from the
-	summary, not via the folder interface.
-	(imap_move_message_to): Dont call folder functions directly
-	(delete_message), as it will deadlock since we already have the
-	lock.
-
-	* providers/vee/camel-vee-folder.c (vee_free_message_info): Free/unref
-	the messageinfo.
-	(vee_get_message_info): First ref the internal copy, then return it.
-	(folder_changed): Free all got message info's.
-	(message_changed): And here.
-	(get_real_message): And here.
-	(vee_folder_build): and here.
-	(vee_folder_build_folder): ... and here.
-
-	* camel-folder-summary.c (camel_folder_summary_info_new):
-	Initialise the messageinfo refcount to 1.
-	(camel_folder_summary_info_free): Down the refcount till we need
-	to free.
-	(camel_folder_summary_info_ref): New function to up the refcount.
-	(camel_message_info_dup_to): Sewt the refcount of the dest to 1.
-	(camel_message_info_new): Set refcount to 1.
-	(camel_message_info_new_from_header): Dont allocate the mi
-	ourselves.
-	(camel_message_info_free): Handle refcounting.
-	(camel_message_info_ref): New function.
-	(camel_folder_summary_index): Ref the messageinfo before returning
-	it.
-	(camel_folder_summary_uid): Likewise.
-	(camel_folder_summary_save): Access the messageinfo array
-	directly, rather than through accessors (saves ref/unref).
-	(camel_folder_summary_clear): Likewise.
-	(camel_folder_summary_remove_index): Likewise.
-	(main): Free lookups.
-
-	* camel-folder-summary.h (CamelMessageInfo): Added a refcount
-	value.
-
-	* camel-folder.c (camel_folder_free_message_info): New function to
-	'free' a message info.
-	(camel_folder_get_message_info): Deconstify return.
-	(camel_folder_lock): New (internal) function to thread-lock the
-	folder.
-	(camel_folder_unlock): Likewise for unlocking.
-	(freeze): 
-	(thaw): Lock around access to folder->frozen/changed_frozen.
-	(folder_changed): Likewise.
-	(message_changed): Likewise.
-	(camel_folder_init): Init private data, locks and moved frozen
-	info.
-	(camel_folder_finalize): Free new private data, locks and moved
-	frozen info.
-	(copy_message_to): Free the messageinfo after we've used it.
-	(move_message_to): And here too.
-	(camel_folder_sync): Lock around virtual method invocation.  Just
-	locking around any virtual method that is known to need it.  This
-	is the first cut at locking.
-	(camel_folder_refresh_info): "
-	(camel_folder_expunge): "
-	(camel_folder_get_message_count): "
-	(camel_folder_get_unread_message_count): "
-	(camel_folder_append_message): "
-	(camel_folder_set_message_flags): "
-	(camel_folder_get_message_flags): "
-	(camel_folder_get_message_user_flag): "
-	(camel_folder_set_message_user_flag): "
-	(camel_folder_get_message_user_tag): "
-	(camel_folder_set_message_user_tag): "
-	(camel_folder_get_message): "
-	(camel_folder_get_uids): "
-	(camel_folder_free_uids): "
-	(camel_folder_get_summary): "
-	(camel_folder_search_by_expression): "
-	(camel_folder_free_summary): "
-	(camel_folder_search_free): "
-	(camel_folder_move_message_to): "
-	(camel_folder_copy_message_to): "
-	(copy_message_to): Dont call any of our own folder functions
-	directly, otherwise we will deadlock.
-	(move_message_to): Likewise.
-
-	* camel-folder.h (CamelFolder): Added free_message_info() function
-	& deconstify get_message_info()'s return.
-	(CamelFolder): Add a private field (for	locks).
-	(struct _CamelFolder): Moved changed_changed/frozen into private
-	data, since it really is private and now needs locked access.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (header_fold): When checking to see if we
-	need to fold the header, when we come accross a \n, make sure to
-	start at p + 1 the next time through the loop or else we get into
-	an infinite loop.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* Namespace cleanup: change a bunch of IS_CAMEL_* macros to
-	CAMEL_IS_*
-
-2000-12-13  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c: add #include <sys/types.h> for
-	freebsd.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-summary.c, camel-folder-summary.h: Added #ifndef
-	NO_WARNINGS around a #warning.  Added (void) to the prototype and
-	declaration of camel_message_info_new.
-
-	* camel-mime-message.h: Added an include for
-	camel-mime-filter-bestenc.h.  Added a prototype for
-	camel_mime_message_set_best_encoding.  Reformatted prototypes to
-	line up.
-
-	* camel-mime-parser.c: Added #if d(!)0 around the states string
-	lookup table since it's only used in debugging output.
-
-	* camel-seekable-substream.c (stream_flush): Added a cast.
-
-	* providers/imap/camel-imap-auth.c: Added #include <netinet/in.h>.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Made uid
-	and flags const to fix warnings here.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Made p
-	const to fix warnings here.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* tests/lib/Makefile.am: Add missing .h file. (From campd.)
-
-2000-12-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Remove use of
-	linewrap filter.  Headers are now wrapped.  encode_8bit already
-	enforces a 998 octet line limit.
-	(smtp_data): Also fixed a memleak, we always have to unref our own
-	copy of the filters.  We also dont need to remove them manually,
-	so dont bother.  The type's an int too ...
-
-	* camel-internet-address.c (internet_unformat): When scanning past
-	quotes, remove them also.
-	(camel_internet_address_format_address): If the name contains "'s,
-	or ','s then strip and quotes and wrap the whole lot in one set of
-	quotes.
-	
-	* Makefile.am (noinst_HEADERS): We dont want to install
-	camel-charset-map-private.h, ever.  There are probably other
-	similar files ..?
-
-	* camel-mime-part.c (write_to_stream): Fold header lines
-	appropriately as we're writing them out.
-
-	* camel-mime-utils.c (header_fold): Add a new argument, headerlen,
-	tells it how long the associated header token is.
-	(header_fold): Also,k check to see if we need to fold first, using
-	a better algorithm, and also accept already-folded lines, and
-	re-process accordingly.
-	(rfc2047_decode_word): Add a little buffer space to iconv output
-	for shifting overheads?
-	(rfc2047_decode_word): finish the iconv with a null call, to flush
-	shift state, etc.
-	(rfc2047_encode_word): Attempt to break up long words into
-	appropriately sized, independent, chunks.  See rfc2047, section 2.
-	(header_decode_mailbox): Dont add in extra spaces into the output
-	if we are decoding adjacent encoded words.  We can only guess this
-	case, as some broken mailers put encoded words inside quoted
-	words.
-	(header_encode_phrase): Dont merge words if they are going to end
-	up too long.  Also change back ot only merge consecutive words of
-	the same type.  e.g. 'foo. blah fum.' -> "foo." blah "fum."  or
-	'iam an. idiot' -> iam "an." idiot
-
-	* camel-medium.c (camel_medium_set_header): Hrm, we actually want
-	to call set_header, not add_header here, probably explains some
-	duplicate X-Evolution headers i was trying to track down.  Also
-	changed the api to handle a NULL value == remove the header.
-
-	* providers/local/camel-maildir-summary.c
-	(maildir_summary_decode_x_evolution): Always return error, we dont
-	use x-evolution for maildir.
-	(maildir_summary_encode_x_evolution): Always return a NULL string,
-	likewise.
-	(maildir_summary_add): Hook in here, since the _new function
-	doesn't have access to any flags from the caller.  If we have
-	flags, then update the filename again.  Not ideal, but should
-	work.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* tests/message/Makefile.am: Remove test3 from build until the files
-	show up
-	
-2000-12-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_date): Change the
-	sign of the default date offset when none is supplied.
-	(camel_mime_message_set_date): Also do dst if its dst (forward 1
-	hour).  Fixes #928 + some.
-
-2000-12-06  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/lib/camel-test.h (check): Change line no format so that
-	emacs can detect it.
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): We want
-	to bitwise-or the server and cached flags here so that we keep the
-	flags that we have set locally and set any additional flags that a
-	parallel connection may have set.
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the data
-	wrapper fails to be written to the stream, unref it and the
-	filters before returning.
-
-2000-12-05  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): use
-	BODY.PEEK[] rather than RFC822, so the message doesn't get marked
-	as \Seen.
-	(imap_refresh_info): Fix a really really really dumb bug.
-
-2000-12-05  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): Fix
-	the check for "flags aren't actually changing".
-
-	* providers/local/camel-local-folder.c (local_set_message_flags,
-	local_set_message_user_flag, local_set_message_user_tag): Don't
-	emit message_changed unless the flags actually changed.
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): Don't emit message_changed unless
-	the flags actually changed. Fix the check for marked as seen.
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-seekable-substream.c (stream_flush): stream_flush does
-	make sense for a substream afterall (if you have a stream_write).
-	(stream_write): Implement this.
-	(stream_seek): Change the STREAM_END behaviour to be more sane.
-	if bounded go from the end of the bound, if unbounded, go from the
-	end of the parent stream.
-
-	* camel-stream-mem.c (stream_read): Dont return error if reading
-	past the end of data, just return 0.
-
-	* camel-stream-fs.c (camel_stream_fs_init): Initialise the stream
-	to be unbound.
-	(stream_seek): Fix the logic when seeking from the end of an
-	unbounded stream.
-	(camel_stream_fs_new_with_fd): If the fd is invalid (-1), then
-	return NULL immediately.
-	(stream_seek): Range check a SEEK_END so it fits within
-	bound_start.
-
-2000-12-01  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/lib/folders.c (test_folder_basic): New test to perform
-	basic store operations on folders (taken from folders/test1).
-	(test_folder_message_ops): Tkane the guts out of folders/test2.
-
-2000-12-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): i18n-ize
-	exception strings.
-	(get_name): And here.
-	(_send_to): Here too.
-	(smtp_helo): And here and there...
-	(smtp_mail): And around the square...
-	(smtp_rcpt): Saying catch me if you can...
-	(smtp_data): And here three.
-	(smtp_rset): And here.
-	(smtp_quit): And finally here.
-
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-search.h: Added system_flag to CamelFolderSearchClass
-
-	* camel-folder-summary.c (camel_system_flag_get): Convenience
-	function to return whether or not a flag is set using a string as
-	the flag name.
-	(camel_system_flag): Return the integer value of the flag string.
-
-	* camel-folder-search.c (search_system_flag): New ESExp callback
-	for allowing vfoldering on CamelMessageInfo flags.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_disconnect): Don't
-	g_return_if_fail if the service is already disconnected. Just
-	return.
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate):
-	Return FALSE (don't try again) if we get CAMEL_POP3_FAIL.
-	(pop3_connect): If we don't succeed, disconnect.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(parse_list_response_as_folder_info): Fix a possible bug where
-	'name' could be uninitialized.
-
-	* camel-folder-summary.c (camel_message_info_new): New convenience
-	function, doesn't do much but it sure makes code cleaner to read.
-	(camel_message_info_new_from_header): This one makes my life heaven.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c (camel_imap_summary_new):
-	Handle the case where the summary failed to load - clear the
-	summary and then set the dirty bit so that it is sure to save
-	later. Is this the right fix?
-
-2000-11-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-exception.c (camel_exception_setv): Remove unused
-	variable.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-mbox-folder.c (mbox_get_message): Remove
-	assertion that content is there, when it no longer can be.
-
-	* camel-folder-summary.h: Removed pos/bodypos/endpos from
-	camelmeessagecontentinfo.
-	(CamelMessageFlags): Added an attachments flag.
-
-	* providers/local/camel-local-summary.h: Added load virtual
-	function.
-
-	* tests/lib/folders.c (test_message_info): Accessors.
-	(test_folder_message): "
-
-	* camel-folder-thread.c (get_root_subject): Fix accessors.
-	(dump_tree_rec): "
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Accessors for messageinfo.
-	(search_match_all): "
-	(search_header_contains): "
-	(search_header_contains): "
-	(search_body_contains): "
-	(camel_folder_search_execute_expression): Use mepool_strdup.
-
-	* providers/local/camel-mbox-summary.c (summary_update): Accessors
-	for messageinfo.
-	(mbox_summary_sync_full): "
-
-	* providers/local/camel-mh-summary.c (remove_summary): Accessors
-	for messageinfo.
-	(mh_summary_check): "
-	(mh_summary_sync_message): "
-	(mh_summary_sync): "
-
-	* providers/local/camel-mh-folder.c (mh_append_message): Use
-	accessor for uid.
-
-	* providers/local/camel-local-summary.c
-	(local_summary_decode_x_evolution): Use accessor to uid.
-	(local_summary_encode_x_evolution): Likewise.
-	(message_info_new): And here.
-	(camel_local_summary_load): Call virtual load function.
-	(local_summary_load): Default load function, load summary.
-	(camel_local_summary_load): Check file exists before trying to
-	load.
-	(camel_local_summary_construct): Turn off building content info!
-	(CAMEL_LOCAL_SUMMARY_VERSION): Bump, since we dont build content
-	info anymore.
-	(camel_local_summary_load): After a successful load/check, do a
-	save too so we dont have to go through it again randomly.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Use
-	accessors for messageinfo.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_uids): Use
-	accessors for uid.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Use
-	accessor for uid.
-	(imap_sync): Likewise.
-	(imap_get_uids): Likewise.
-	(imap_update_summary): And here.
-
-	* providers/vee/camel-vee-folder.c (vfolder_remove_match): Use
-	accessor for uid.
-	(vfolder_add_match): Handle estrv stuff.
-	(vfolder_change_match): Accessor for uid.
-	(get_real_message): "
-	(vee_get_uids): "
-	(vee_folder_build): " + estrv.
-	(vee_folder_build_folder): "
-
-	* providers/local/camel-maildir-folder.c (maildir_append_message):
-	Use acccessors for uid's.
-	(maildir_get_message): Here too.
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_init): Setup the string count for us.
-	(message_info_new): Access the string array directly.
-	(message_info_free): No need to free string if using array.
-	(camel_maildir_summary_info_to_name): Use accessor to get to uid.
-	(remove_summary): And here.
-	(maildir_summary_check): Likewise.
-	(maildir_summary_sync): And here.
-	(maildir_summary_load): Load up a cache of uid->filename mappings
-	before loading the actual summary file.  This saves us having to
-	waste the diskspace storing the filenames in the summary itself,
-	and also helps us sync the summary better on load.
-	(message_info_load): If we have the load_map setup, and the uid
-	exists, then set the filename cache from it, and update the flags
-	from the name, incase our summary mismatches it.
-
-	* camel-folder-summary.c (camel_folder_summary_init): Setup string
-	count for compressed info record.  An optional compile mode which
-	stores all strings for a given messageinfo into a packed array,
-	which should save 36-50 bytes/record.
-	(camel_folder_summary_info_new): Init the string array.
-	(message_info_new): Set the string array items, as required.
-	(message_info_load): And here too.
-	(message_info_save): Use accessors to get to strings.
-	(message_info_free): Free strings as one.
-	(camel_message_info_dup_to): Handle packed array case.
-	(camel_folder_summary_add): Use accessors.  And pack the strv
-	before storing it.
-	(summary_assign_uid): New function to assign a unique uid to a
-	message, if it doesn't have one.
-	(camel_folder_summary_add): Call assign_uid instead of doing it
-	ourselves.
-	(camel_folder_summary_info_new_from_parser): "
-	(camel_folder_summary_info_new_from_message): "
-	(camel_folder_summary_encode_string): constify.
-	(camel_folder_summary_encode_token): "
-	(summary_build_content_info_message): Fix accessors to messageinfo.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped, for removal of
-	contentinfo->pos data.
-	(camel_folder_summary_info_new_from_parser): Calculate the size
-	based on the parser position, not the removed contentinfo stuff.
-	(camel_folder_summary_info_new_from_message): Remove size stuff.
-	(camel_folder_summary_offset_content): Removed, no longer means anything.
-	(content_info_new): 
-	(content_info_load): 
-	(content_info_save): 
-	(summary_build_content_info): Remove stuff for contentinfo->pos*.
-	(summary_build_content_info): Take a msginfo argument, set
-	attachments flag if we find any attachments.
-	(summary_build_content_info_message): set attachments flag if we
-	find any attachments.
-	(camel_folder_summary_info_new_from_parser): Always scan the
-	content info, even if we dont save it.
-	(camel_folder_summary_info_new_from_message): And here too.
-	(summary_build_content_info): Only create the contentinfo stuff if
-	we have it turned on, otherwise just parse and discard.
-	(summary_build_content_info_message): Likewise.
-
-2000-11-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-store.c (camel_store_get_folder): Updated the gtk-doc
-	comment.
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c: 
-	* camel-mime-filter-charset.c: Use iconv instead of unicode_iconv.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix
-	some off-by-one-ness.
-
-	* camel-stream-buffer.c (stream_read): Fix another bug found in
-	previously-unused code here.
-
-2000-11-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* tests/lib/Makefile.am (INCLUDES): `$(top_srcdir)' for builddir
-	!= srcdir compilation.
-
-2000-11-29  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/message/test2.c (main): Add a missed unref.
-
-	* camel-stream-mem.c (camel_stream_mem_set_buffer): We must set
-	ourselves as the owner of the byte-array.
-	Weird, someone has modified this file (its been reindented), but i
-	can't see any changelogs ...
-
-	* tests/lib/messages.c (content_finalise): Fix memleak in tester,
-	free byte array when our content object is deleted.
-
-	* camel-folder-search.c (camel_folder_search_finalize): Yeah
-	great, so the sexp is a gtk object, not a camel object.  Isn't
-	that going to be fun to fix?
-
-	* camel-session.c (camel_session_finalise): Free the storage path.
-
-	* providers/local/camel-local-store.c (camel_local_store_init): If
-	store->folders is setup, free it first, then overwrite.  Hmm,
-	this seems a bit crappy to me.
-
-	* camel-store.c (camel_store_init): Dont setup store->folders if
-	its already setup.
-
-	* camel-exception.c (camel_exception_setv): Removed a memleak.  no
-	need to strdup after a strdup_printf!!!
-
-	* camel-address.c (camel_address_finalize): Free the address
-	ptrarray, once finished.
-
-	* providers/local/camel-local-folder.c (local_finalize): Make sure
-	we dont leave the folder locked on close.
-	(local_finalize): Free summary/search.
-
-	* providers/local/camel-mh-summary.c (mh_summary_next_uid_string):
-	Small memleak, always free name after using it.
-
-	* camel-mime-part.c (set_content_object): Free txt after setting
-	the header.
-
-	* providers/local/camel-maildir-summary.c (maildir_summary_check):
-	Fix a memleak, close the dir after scanning new.
-	(message_info_free): Added so we can free the filename cached in
-	the messageinfo.
-	(camel_maildir_summary_finalise): Free the hostname.
-
-	* tests/folder/test[12].c (main): Clear out camel-test before
-	starting.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):
-	Because encode_x_evolution folds the line (sigh, because
-	encode_param does, unlike every other function in
-	camel-mime-utils), unfold the encoded result before comparing.
-	(mbox_summary_sync_quick): Another small memleak, free xevnew once
-	finished with it.
-
-	* camel-mime-utils.c (header_decode_quoted_string): Removed a
-	redundant check for c=0.
-	(header_unfold): New function to un-fold headers.
-
-	* providers/local/camel-local-summary.c
-	(local_summary_encode_x_evolution): some problems with encoding
-	tags, using the wrong output strings.
-	(local_summary_encode_x_evolution): We dont need to append a ;
-	either, param_list_format_append() will do it for us.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* camel-lock.c: No longer hard code the enabled lock types
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-remote-store.c (remote_recv_line): Don't set exception to
-	g_strerror (errno) when nread == 0, because it won't have been
-	set.
-
-	* providers/pop3/camel-pop3-folder.c (pop3_finalize): Don't try to
-	free things if they haven't been set yet.
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Clear the
-	exception if EHLO fails before trying HELO in the cases where the
-	SMTP provider doesn't announce its ESMTPness.
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_init): Set the info size's properly, oops!
-
-	* tests/lib/folders.[ch]: Folder testing helpers.
-
-	* tests/folder/test2.c: Test basic message ops on folders.
-
-	* tests/folder/test1.c (main): Test basic folder ops on (local)
-	stores.
-
-	* providers/local/camel-local-provider.c
-	(camel_provider_module_init): Removed some debug.
-
-	* providers/local/camel-maildir-folder.c
-	(camel_maildir_folder_class_init): fix parent class.
-
-	* providers/local/camel-mh-folder.c (camel_mh_folder_class_init):
-	Fix parent class (damn cut & paste).
-
-	* providers/local/camel-maildir-store.c (get_folder): Call parent
-	impl.
-	(camel_maildir_store_class_init): Fix parent class setup.
-	(delete_folder): Check the folder exists before trying to delete
-	it.
-	(delete_folder): Try and make the delete operation atomic/rollback
-	failures.  e.g. if one directory isn't empty, then create the
-	other empty ones back.  Also clear the tmp directory fully first.
-
-	* providers/local/camel-mbox-store.c (get_folder): Call parent
-	impl.
-	(camel_mbox_store_class_init): parent class is camel_local_store,
-	not camel_folder, oops.
-	(delete_folder): Return an error if it doesn't exist, rather than
-	covering it up.
-
-	* providers/local/camel-mh-store.c (get_folder): Call parent impl.
-	(camel_mh_store_class_init): fix parent class setup.
-	(delete_folder): Error if it doesn't exist now.
-
-	* camel-folder.c (camel_folder_move_message_to):
-	(camel_folder_copy_message_to): Added warnings as these functions
-	are going to be removed later.
-
-	* camel-store.c (camel_store_get_root_folder): Fix for an early
-	api change.  We want CAMEL_STORE_FOLDER_CREATE, not TRUE, since
-	its a flag.
-	(camel_store_get_default_folder): And here too.
-
-	* providers/local/camel-local-store.c (xrename): Handle renaming
-	folders differently to renaming files.
-	(get_default_folder_name): local stores dont have a default
-	folder, so make it so.  Or at least, it doesn't seem to make sense
-	to have one.
-	(get_root_folder_name): Same for root.
-	(get_folder): Added parent implementation, that makes sure the
-	service path exists, if we are creating a new folder (but doesn't
-	create the folder).
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-store.c (xrename): Fixed races.  Use
-	link/unlink, rather than rename, to properly detect overwriting
-	another file.  And allow some files to be missing.
-
-2000-11-28  Radek Doulik  <rodo@helixcode.com>
-
-	* providers/local/camel-local-summary.c
-	(local_summary_decode_x_evolution): add scan = scan->next; to
-	avoid infinite loop
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Make
-	this gratuitously more complicated. No wait, I mean, fix bugs. Now
-	fully handles NULs in the data stream (which "can't happen" but
-	do) and also handles responses containing multiple literals. Also
-	does less copying than the original code.
-
-	* camel-stream-buffer.c (stream_read): Fix a bug that could make
-	it lose sync and/or overrun buffers.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* providers/local/.cvsignore: shush
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed mh, mbox, added local, to the default.
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* tests/data/getaddr.pl: little util to scan mailboxes for any and
-	every address they contain.
-
-	* tests/message/test2.c (main): Added a bunch of stuff to test
-	decoding/reencoding/etc of internationalised addresses.
-
-	* tests/message/lib/address-data.h: Copy of some unicode/other
-	testing data.  **Beware** of editing this file in emacs, it'll
-	probably try and convert all the characters to something
-	unusable.
-
-	* tests/lib/camel-test.c (camel_test_break): Add a debugger hook
-	point.
-
-	* camel-mime-utils.c (quoted_encode): Check for space and convert
-	to _ separately.
-	(header_decode_mailbox): Fixed the 'check comments for realname'
-	code, problem was the domain getting code was skipping all
-	whitespace/comments before we could get a look-in.  This is
-	approximate but fairly robust.
-	(header_decode_text): Dont use the c-type isspace func here, we
-	want a specific whitespace only.
-	(header_decode_text): If we have decoded words next to each other,
-	do not insert whitespaces between them, which is what rfc2047 requires.
-	(header_decode_text): Make c unsigned too.
-
-	* tests/README: Added at least some explanation of all this stuff.
-
-	* tests/lib/camel-test.h (check_msg): Added a non-gcc version of
-	the fail command, we dont get the expression that failed, but no
-	matter.  Should be (more) portable now.
-	(check, check_msg): Put the file/lineno in the default message.
-
-	* Makefile.am (SUBDIRS): Add tests.
-
-	* camel-mime-filter-basic.c (filter): Well, I'll add the extra
-	bytes here too, lathough not strictly needed, might save a
-	re-malloc when we get to complete().
-
-	* camel-mime-filter-charset.c (filter): Make sure we have room if
-	we only convert very short data.
-	(complete): and here too.
-
-	* tests/Makefile.am: Initial test harness & tests.  Requires gcc
-	for this.
-
-	* camel-internet-address.c (d): Turn off debug.
-
-	* camel-charset-map.c (camel_charset_step): Oops, & masks for set
-	intersection, not | them.  Dunno how this got even close to
-	working.
-
-2000-11-23  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (filter): For base64 encoding, the
-	output size for 0, 1, or 2 bytes of input can exceed input*2, so
-	make sure we account for that as well.
-	(complete): And here.
-	(complete): Similarly for qp encoding, if we have a trailing
-	space, we need some extra bytes (not needed for 'filter()', as any
-	such bytes are stored in state/save).
-
-	* camel-mime-utils.c (quoted_decode_step): Removed fixme not required.
-	(quoted_encode_close): Dont append a trailing afterall.  Otherwise
-	a pass through the encode/decode will grow the message each time.
-
-2000-11-22  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): check for return
-	values
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-lock.c: 
-	* camel-movemail.c: add #ifdef HAVE_ALLOCA_H
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):
-	Shite, -1 on error, >=0 on success.  So i've just been truncating
-	all the messages I touched, good one zed.
-	(mh_summary_sync_message): Sigh, and write to the right damn fd as
-	well.
-	(mh_summary_sync_message): Argh, and we need to compare the length
-	of the old xev -1 to the new xev, to check if we can optimise it.
-
-	* camel-folder.c (camel_folder_change_info_new): Init the pool.
-	(camel_folder_change_info_add_source): Allocate string in the
-	pool.
-	(camel_folder_change_info_add_source_list): 
-	(camel_folder_change_info_add_update): No longer free the key, as
-	it cannot be yet.
-	(change_info_add_uid): Add a new arg, copy, telling it whether to
-	copy the uid argument or not, and copy using mempool_strdup.
-	(change_info_cat): Tell add_uid to copy the string.
-	(camel_folder_change_info_add_update): Call add_uid directly.
-	(change_info_remove): Call add_uid directly, with no copy, and
-	dont free the key.
-	(change_info_free_update): No longer required since we dont malloc
-	the keys.
-	(camel_folder_change_info_add_uid): Fix for add_uid change.
-	(camel_folder_change_info_remove_uid): 
-	(camel_folder_change_info_change_uid): 
-	(change_info_clear): No longer needed, just set the size to 0 on
-	the array directly.
-	(camel_folder_change_info_clear): Empty the arrays directly, and
-	flush the mempool too, and also clear uid_source, incase anyone
-	was silly enough to call us in the wrong order.
-	(camel_folder_change_info_free): Dont bother clearing the array's
-	contents, just free the pool and throw away all the indexes.
-
-	* camel-folder.h: Added a mempool to CamelFolderChangeInfo to
-	store the uid's we get.
-
-	* camel-folder-search.c (search_match_all): If we are only
-	matching a single info, just use that/do the search.
-	(camel_folder_search_match_expression): New function.  Matches a
-	single message info against an expression.
-	(camel_folder_search_init): Init a hash table used to map the
-	returned gptrarrays' to mempools.
-	(camel_folder_search_execute_expression): Store all of the string
-	data in a mempool, slightly faster, less wasted space (usually),.
-	(camel_folder_search_free_result): Check for the mempool that
-	stores the data for the list, and free that if we have it,
-	otherwise assume we need to use g_free() (which should only happen
-	if the list is empty at the moment).
-	: commented out the debugging prints.  Got sick of 'executing
-	header search' crap.
-
-	* providers/vee/camel-vee-folder.c (camel_vee_folder_init): Init
-	changes.
-	(camel_vee_folder_finalise): Free changes.
-	(vfolder_add_match): Simple helper to add a new matching info
-	record.
-	(camel_vee_folder_add_folder): Only trigger a changed event if we
-	have changes.
-	(vfolder_change_match): New function, changes our local vfolder
-	info to match the source.
-	(vfolder_add_match): Add a new info to the vfolder list.
-	(vfolder_remove_match): Remove a no-longer matching info from the
-	vfolder summary.
-	(message_changed): check if the message still matches, and
-	remove/etc as required.
-	(camel_vee_folder_finalise, init): init/free search object.
-	(vee_folder_build_folder): Build the changes to the folder into
-	the changes data, as we go.
-	(folder_changed): If the folder gave us an explicit list of
-	changes, then process each one separately (unless there's a lot
-	added/changed).
-
-	* providers/vee/camel-vee-folder.h: Added a changes field to the
-	folder.
-
-	* Makefile.am (libcamel_la_SOURCES): Added
-	camel-folder-thread.[ch].
-
-	* camel-folder-thread.c: message-threading algorithm, taken from
-	evolutions' mail component, as it is generally more useful than
-	just for evolution itself.  Changed to use e-memchunks as well to
-	speed it up a little and use less mem.
-
-2000-11-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-remote-store.c (remote_recv_line): Fixed to return the
-	correct bytecount in all cases which is the real fix to
-	imap_parse_nstring.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Again,
-	don't use strlen for the post-data, use 'n'.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): Undo my
-	previous temp-fix.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Fixes for
-	the summary messageid changes.  Hash the messageid and store it.
-	(get_XOVER_headers): Use camel_folder_summary_info_new() to create
-	the summary item before adding it.
-
-	* camel-folder-summary.h (CamelMessageInfo): Changed the
-	messgae-id to be an 8 byte md5 hash, and the references list to be
-	an array of these.
-
-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):
-	New function, sync out the message info stuff.  Only updates the
-	X-Ev header if it can get away with it, otherwise writes out a
-	whole new message.
-	(mh_summary_sync): Added more functionality.  All summary info is
-	now written to the X-Ev header, etc, and new messages re-written
-	if required during the sync process.
-
-	* providers/local/camel-local-folder.c
-	(local_set_message_user_flag): Set the XEVCHANGE flag.
-	(local_set_message_user_tag): And here too.
-
-	* providers/local/camel-local-summary.h: New flag
-	CAMEL_MESSAGE_FOLDER_XEVCHANGE to indicate the XEV header has
-	probably changed size and needs to be rewritten in whole.
-
-	* camel-folder-summary.c (next_uid_string): Want this static, not
-	const.
-	(message_info_new): Store the references and message-id values as
-	64 bit, binary hashes.
-	(message_info_load): fix for message-id/references changes.
-	(message_info_save): Likewise.
-	(camel_message_info_dup_to): And here.
-	(camel_message_info_free): And here too.  No longer free
-	message_id, and simple free for references array.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.
-	(camel_folder_summary_init): Init memchunk allocators to empty.
-	(camel_folder_summary_finalize): Free memchunk allocators if
-	there.
-	(message_info_new): Use the chunk allocator to allocate message
-	info's.	
-	(camel_folder_summary_info_new): New helper to allocate the
-	message info, and setup the memchunk if required.
-	(content_info_alloc): Likewise for content info's.
-	(message_info_load): Use summary_info_new_empty.
-	(content_info_new): Use content_info_alloc.
-	(content_info_load): "
-	(content_info_free): Free the content info as a memchunk.
-	(message_info_free): Free everything directly and the base as a
-	memchunk, rather than calling camel_message_info_free(), which
-	assumes a malloc'd array.
-
-	* providers/local/camel-local-summary.c: Include ctype.h, kill a
-	warning.
-	(local_summary_decode_x_evolution): If we get a NULL message info,
-	then dont try and set anything, just check for validity.
-	(camel_local_summary_write_headers): New function to write a set
-	of headers to an fd.
-	(camel_local_summary_check): Added some statistic generation
-	stuff for memory profiling.
-
-	* providers/local/camel-mbox-summary.c (header_write): Changed to
-	use stdoi functions to write out the header to a buffered stream,
-	instead of using writev, which is apparently slow (and writing
-	each line separately is slow anyway).
-	(mbox_summary_sync_full): New implementation.  Does things
-	differently, doesn't use or require the content info stuff.
-	(summary_rebuild): Dont return an error if we start scanning at
-	the end of file.
-	(mbox_summary_sync_full): If we are not writing out new headers,
-	make sure we copy the From line as we go, and update frompos
-	appropriately.
-	(mbox_summary_sync_full): Always copy the From line from the
-	existing one, rather than trying to make one up ourselves.
-	(mbox_summary_sync): If we can get by with a quick-sync, then try
-	it, if that fails, then try a full sync anyway.
-	(mbox_summary_sync_quick): Quick sync.  Only update system flags,
-	etc.
-	(mbox_summary_sync_full): Use the proper local summary encode_xev
-	function.
-	(header_evolution_decode): Removed, no longer needed.
-	(header_evolution_encode): Same.
-	(copy_block): No longer needed, removed.
-	(header_write): Removed, replaced with
-	camel_local_summary_write_headers.
-	(mbox_summary_sync_full): Fixed for header_write change.
-
-	* camel-mime-parser.c (folder_scan_step): Implement the new
-	optional parser state HSCAN_PRE_FROM, that returns the (currently
-	unfiltered) input data.
-	(folder_scan_drop_step): Do the right thing for the PRE_FROM
-	state.
-	(camel_mime_parser_scan_from): Update the doco.
-	(camel_mime_parser_scan_pre_from): Ok, make this behaviour
-	optional, it simplifies a lot of loops that dont otherwise need to
-	know about it.
-	(folder_scan_step): Made the PRE_FROM state optional.
-	(struct _header_scan_state): Made the bool vars 1 bit.
-	(folder_pull_part): Free the from_line buffer if it is there.
-	(folder_scan_skip_line): Added a new arg, can save the skpped data
-	to a byte_array, as we go.
-	(folder_scan_step): Fixed calls to skip_line approrpiately.  Now
-	we save the from line as we parse it.
-	(camel_mime_parser_read): New function to read from the mime
-	parser buffer directly.  Useful if you use the parser to read the
-	first/some headers, then need to scan the rest of the data,
-	without needing to use a seek(), or allocate your own buffers.
-
-	* camel-mime-parser.h (struct _header_state): Added a new parser state,
-	pre-from which returns any data found before a from line during
-	parsing (all other data can be retrieved by the caller except
-	this).
-
-2000-11-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): When
-	extracting a literal string, capture up until the end of the last
-	line - this we we don't lose any data if the byte count is off.
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Use
-	the byte-read count to decrement the number of bytes left to read
-	rather than using strlen. Not only does this protect against a DoS
-	(embedded NUL chars in the literal string would make strlen
-	inaccurate) but it also improves performace a little.
-
-	* camel-remote-store.c (remote_recv_line): *Sigh* Return the
-	number of bytes read on success rather than 0. Also don't use
-	camel_stream_buffer_read_line since we can't get an accurate octet
-	count.
-
-2000-11-17  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-summary.c (local_summary_add): Clear
-	the NOXEV/FLAGGED bits, since we do have an xev header.  um m,
-	maybe this is right, this assumes a write is following.  Maybe
-	this should be done in folder::append() instead ...
-
-	* camel-stream-buffer.c (camel_stream_buffer_gets): We should
-	always terminate the string.  No need to check outptr is in range,
-	its already been checked.
-
-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): When
-	we update the summary, do it from mbox_summary->folder_size, not
-	the content info endpos (which isn't any good anymore anyway).
-
-	* providers/local/camel-mbox-folder.c (mbox_append_message): Set
-	the frompos from the current folder size, since summary_add wont
-	have initialised it to anything useful.
-
-2000-11-16  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/local/camel-local-summary.c
-	(local_summary_encode_x_evolution): Check the uid string is all
-	digits before trying to write a 'standard' x-ev header.
-
-	* providers/local/camel-maildir-summary.c
-	(camel_maildir_summary_info_to_name): Convert an info into a
-	maildir name:info filename.
-	(camel_maildir_summary_name_to_info): Convert a name:info filename
-	into an info, and tell us if it didn't match it.
-	(message_info_new): When creating a new filename, gets its info
-	from the flags field.  Likewise if creating from an existing file,
-	extract the flags.
-	(maildir_summary_sync): Remove a small memleak.  Also, if our
-	flags and that requires a filename change, perform that here.
-	(message_info_new): Get the received date from the filename.
-	Also, dont overwirte the uid if we have one.
-	(maildir_summary_check): Sort the summary in received order before
-	completion.
-	(maildir_summary_next_uid_string): Test the name for collusions
-	before we give it out.  Retry, and if that fails, well, I guess we
-	collide :(
-
-	* providers/local/camel-mbox-folder.c (mbox_lock): Implement mbox
-	locking.
-	(mbox_unlock): And unlocking.
-	(mbox_append_message): Lock the folder for write before doing
-	anything.
-	(mbox_get_message): Lock the folder for read before doing
-	anything.
-
-	* providers/local/camel-local-folder.c (camel_local_folder_lock):
-	Implement something here.  We handle the recursive ability but
-	pass the locking to the folder itself.
-	(camel_local_folder_unlock): Likewise for unlocking.
-	(local_lock): Default - do nothing, return success.
-	(local_unlock): Same.
-	(local_sync): Changed slightly for locking api changes, and also,
-	only lock around the sync process itself.
-
-	* camel-lock.c: New file - utility functions for locking using
-	different strategies and/or for locking folders safely.
-
-	* Makefile.am (libcamel_la_SOURCES): Adde camel-lock.[ch]
-
-2000-11-15  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c: mime_guess_type_from_file_name moved back to
-	composer as it introduced unwanted VFS dependency
-	removed  #include <libgnomevfs/gnome-vfs.h>
-
-2000-11-15  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed local again, not quite ready.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (message_info_new_from_message): Use
-	message_info_new to create the summary from headers, instead of
-	getting directly from the message.
-	(format_recipients): No longer required.
-
-	* providers/Makefile.am (SUBDIRS): Added local.
-
-2000-11-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_push_part): Make sure 'atleast' is
-	at least 1, always.  This is possibly a temporary fix for a
-	bad failure mode on bad multipart messages.
-	(folder_scan_content): Go until inend, not inend+1.  Changed the
-	continuation and retry logic to be simpler and more robust.  If we
-	can't find a marker within
-	the atleast we need, just set it to 1, and try again, rather than
-	just going to the next smaller limit (boundary check checks the
-	length anyway).
-	(header_append): streamline the empty line case.  And strip
-	trailing \r's if there are any (\n's already stripped).
-	(folder_scan_header): Reordered and cleaned up a lot.  Check for
-	continuation only once, and compress lwsp then.	Assume the header
-	buffer already has end of line's stripped, and simplify some things:
-		Only check for end of headers once and easier.
-		Dont check to remove end of line character
-	Dont bother testing inptr-start if we get a boundary match - it is
-	always zero.
-	(folder_scan_header): Removed the unused part variable, and a few
-	pointless assignments.
-	(folder_scan_header): Change the end limit to be 1 higher, to make
-	sure we get all content.
-	(folder_scan_content): And here too.
-	(folder_scan_header): Killed a warning.
-	(folder_push_part): Removed a bad comment.  Actually
-	boundarylenfinal can be zero for a new message not in a
-	multipart.  So we fix that here.
-
-2000-11-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_decode_param_list): Renamed from
-	header_param_list_decode.
-	(header_param_list_decode): New external function to decode a
-	parameter list.
-	(header_param_list_format_append): Made public.
-	(header_param_list_format): Another new public helper function for
-	formatting just a param list.
-
-	* camel-folder-summary.c (next_uid_string): Default implementation
-	is the same as before.
-	(camel_folder_summary_class_init): And set it up.
-
-	* camel-folder-summary.h: Make next_uid_string a virtual function.
-
-	* camel-folder.c (camel_folder_change_info_changed): New function
-	to return true if the changeset contains any changes.
-
-2000-11-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-stream.c (camel_stream_printf): Don't cast an int to a
-	ssize_t.
-
-2000-11-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): put a space before a single-digit
-	day of the month since it seems some mailers are fantastically
-	picky about this. (bugs.gnome.org #27232)
-
-2000-11-10  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): fix ids ending with '.'
-
-2000-11-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):
-	Fix error handling. (Only send a "*" to bail out of authentication
-	if the server hasn't already bailed on us.)
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (mime_guess_type_from_file_name): new
-	function, moved from composer
-
-2000-11-08  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (find_best_encoding): Keep track of the
-	caller bestenc flags that make sense.
-	
-	* camel-mime-filter-bestenc.c (filter): Added code to detect when
-	we have "^From " lines in the sequence of text.
-	(camel_mime_filter_bestenc_get_best_encoding): Added a new flag
-	CAMEL_BESTENC_NO_FROM: if set, it will not allow any lines
-	matching "^From " to appear in the output - currently forcing
-	base64 encoding to achieve this.
-
-	* camel-mime-parser.c (folder_scan_step): Call
-	camel_mime-filter_complete() once we're done, rather than
-	filter_filter().
-	(folder_scan_content): Some fixes for state changing; so that when
-	we do find another boundary it is properly flagged.  Since we
-	strip the last \n off all data, we must take that into account
-	too.  Sigh.  Fixes a rather nasty set of bugs where multipart
-	messages could start including following messages as parts, etc.
-	(struct _header_scan_stack): Added new parameter,
-	boundarylenfinal, which holds the length of the final boundary, if
-	it is different (e.g. for From lines, whihc aren't)
-	(folder_scan_step): Setup teh boundarylenfinal value when creating
-	a new boundary.
-	(folder_scan_content): Hmm, if we hit the end-of-buffer sentinal,
-	reset the scanner back to leave 'atleast' chars in the buffer
-	still, dump that content, and retry again.  Stops us losing a
-	check for a boundary on some data we haven't really looked at yet!
-	(folder_scan_content): Use boundarylenfinal to calculate
-	'atleast'.
-	(folder_scan_header): And here too.
-	(folder_boundary_check): Use the atleast value directly, dont
-	truncate it.  Use the boundarylen/boundarylenfinal values directly
-	too.
-	(struct _header_scan_stack): Add an atleast parameter to cache the
-	atleast info.
-	(folder_push_part): Determine/set 'atleast', every time we add a
-	new part.
-	(folder_scan_header): Get the cached atleast info from the current
-	part.
-	(folder_scan_content): And here too.
-	(folder_scan_header): Fix a problem where a part starting with
-	" text" would be interpreted as a followon header wrongly.
-
-	* camel-mime-filter-charset.c (complete): Add some assertions to
-	find a bug.
-
-2000-11-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-service.c (get_name): Strdup the "???" string you return,
-	so that the expected semantics for `::get_name()' is respected.
-
-2000-11-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-filter.c (d): Kill debugging, as it causes lots of
-	evolution-mail spewage.
-
-2000-11-07  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-bestenc.c (complete): Implement a complete()
-	function, now we need one.
-	(filter): Upgraded to match rfrc2045 properly.  Checks also for
-	length of line and valid CRLF sequences.
-	(camel_mime_filter_bestenc_get_best_encoding): Do the work of
-	working out what is the best encoding given what we found about
-	the stream.
-
-	* camel-mime-part.c (camel_mime_part_encoding_to_string): Use a
-	lookup table to get the encoding naem, and add the binary type.
-	(camel_mime_part_encoding_from_string): Likewise for the reverse.
-
-	* camel-mime-part.h: Added the binary encoding type, see rfc2045.
-
-	* camel-mime-utils.c (header_param_list_format_append): Dont put a
-	space before ;'s in parameter lists, makes them more
-	readable/consistent.
-
-	* camel-mime-message.c (multipart_has_8bit_parts): Cleaned up the
-	old stuff, well removed it.
-	(camel_mime_message_set_best_encoding): Added another argument
-	that lets you select what you want to set the best of.  i.e. for
-	smtp transport we only need 7 bit, and dont need to optimise the
-	charset (although of course, we should always).
-	(find_best_encoding): Implement this feature, if we are not
-	getting the best charset, use the one we have.
-	(best_encoding): Set the charset on the part appropriately.  Sigh,
-	the interfaces for this are nonexistant.
-	(find_best_encoding): Tell the bestenc filter that lf should be
-	treated as crlf for the purposes of determining encodings.
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-charset-map.c (camel_charset_init): Init function for an
-	iterative charset determinator.
-	(camel_charset_step): Iterate another buffer.
-	(camel_charset_mask): Removed, since it couldn't have worked.
-	(camel_charset_best): Use the iterative interface to do the work.
-	(camel_charset_best_name): Get the best name for a charset so far.
-
-	* camel-mime-filter-bestenc.c: New class, a stream
-	filter that can be used to memory-efficiently determine the best
-	encoding and/or charset to use for a given stream of bytes.
-
-	* Makefile.am (libcamelinclude_HEADERS): Added stream-null*.
-	(libcamel_la_SOURCES): Added bestenc*
-
-	* camel-stream-null.c: New class, a null-stream, that always
-	succeeds, and never has any contents.
-
-	* camel-stream.c: Minor pointless changes.  Was going to do
-	something else but changed my mind.  Added trivial default
-	implementations for all callbacks.
-
-	* camel-mime-message.h: Cleaned up some old cruft.
-
-	* camel-folder-summary.c (camel_folder_summary_format_address):
-	address_list_format() no longer encodes, so we dont need to decode
-	it.
-
-	* camel-address.c (camel_address_unformat): New function, attempts
-	to reverse the formatting process on display addresses.
-	(camel_address_length): New function to get the number of
-	addresses, without having to peek the structure.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Fix a typo.
-	(camel_mime_message_finalize): Only unref from/reply_to if we have
-	it.
-	(camel_mime_message_set_recipients): New function - set the
-	recipients as a CamelInternetAddress.  This function effectively
-	deprecates the older recipient setting functions.
-	(camel_mime_message_add_recipient): What the hell, i'll bite the
-	bullet.  Terminate this function.  The old api was ambiguious and
-	inefficient and didn't work right anyway.
-	(camel_mime_message_remove_recipient_address): And this one.
-	(camel_mime_message_remove_recipient_name): And this one too.
-	(camel_mime_message_set_recipients): If we set an empty header,
-	then remove it from the header list.  Allow a null receipient
-	object to clear a header.
-	(camel_mime_message_set_from): Likewise, if setting an empty from
-	address.
-	(camel_mime_message_encode_8bit_parts): Eeek!!
-	camel_stream_mem_new_with_byte_array owns the byte_array we give
-	it, so make sure we dont free any of it!
-	(camel_mime_message_encode_8bit_parts):  Infact, i'll just rewrite
-	the whole lot, its a bit of a mess.  Should really rename it and
-	make it a little more useful too, lets see ...
-	(best_encoding): This has a string interface?  Oh boy.
-	(camel_mime_message_foreach_part): New experimental function to
-	iterate over all message parts.  Might not remain.
-	(camel_mime_message_has_8bit_parts): New implementation using
-	foreach_part.  Fixed a couple of problems.
-	(find_best_encoding): New function, that finds the best encoding
-	for a given part (will probably be moved to camel-mime-part), and
-	also the best charset to use if it is a text part.  Since one
-	affects the other it is a two pass process, but uses streams and
-	not memory to achieve this.
-	(camel_mime_message_set_best_encoding): Uses the function above to
-	configure an entire message for the best encoding possible given
-	transport constraints.
-	(camel_mime_message_encode_8bit_parts): Reimplemented to use the
-	function above to perform the work.
-
-	* camel-internet-address.c
-	(camel_internet_address_format_address): Dont put <> around a lone
-	address with no real name.
-	(camel_internet_address_encode_address): Similarly.
-	(internet_decode): Actually return the count of decoded addresses.
-	(internet_unformat): Implement the unformatting routine.
-
-2000-11-05  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Changed to get
-	the internetaddress directly, rather than having to parse it
-	itself.
-
-	* camel-address.c (camel_address_format): Added a new function
-	which will format address, suitable for display.
-	(camel_address_cat): Concatentate 1 camel address onto another.
-	It is upto the caller to ensure the addresses are of compatible
-	types.
-	(camel_address_new_clone): New function to create a new address by
-	copying an existing one of the same type.
-	(camel_address_copy): New helper function to copy an address.
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed cached
-	copy of date string.
-	(struct _CamelMimeMessage): Added date_received info.
-
-	* camel-mime-message.c (camel_mime_message_get_date_string):
-	Removed.  Nothing uses it anyway, and it is redundant.
-	(camel_mime_message_finalize): No more date_str.
-	(camel_mime_message_init): No more date_str, initialise
-	date_received*
-	(write_to_stream): Change the check for a date header.
-	(process_header): No longer track the date_str.
-	(camel_mime_message_get_received_date): Removed.  totally invalid
-	anyway.
-	(camel_mime_message_get_sent_date): Removed.  Redundant.  The only
-	'date' is the sent date, the received date is just made up.
-	(camel_mime_message_get_date): Args changed to be more consistent
-	with utility functions.
-	(camel_mime_message_get_date): Dont set the date when we're asked
-	for it (if its not set by the time its written, it'll be set
-	then).
-	(camel_mime_message_get_date_received): Actually do 'the right
-	thing' here, if we have a received header, use that to determine
-	the received date.  And return the data in the same format as
-	get_date.
-	(camel_mime_message_set_from): Changed the api to better match
-	what we should be doing.  Pass a camelinternetaddress, etc.
-	(camel_mime_message_set_reply_to): Cahnged similarly to take an
-	internetaddress.
-	(camel_mime_message_get_reply_to): Likewise.
-	(camel_mime_message_finalize): Unref the from/reply_to objects.
-	(format_address): Removed, no longer needed.
-	(process_header): Changed to store the from/reply_to as
-	internetaddress's.
-	(write_to_stream): Set the from header directly to empty, if we
-	dont have one.  Maybe we should just abort, and/or create one
-	based on the current user.
-
-	* camel-mime-utils.c (header_address_list_format): Renamed to
-	header_address_list_encode, which is what it is actually doing.
-	(header_address_list_format_append): Similarly.
-	(encoding_map[]): Removed, no longer used.
-	(header_address_list_encode_append): Take another arg, do we
-	encode the address (for internet), or not (for display - utf8
-	only).
-	(header_address_list_format): Re-added this function, but now it
-	generates a display version only.  Surprise surprise, that is all
-	anythign needs to generate anyway.  Sigh.
-
-	* camel-internet-address.c (camel_internet_address_get): Return
-	false if we get an invalid index only.
-	(camel_internet_address_encode_address): Helper function to encode
-	a single address for mailing.
-	(internet_encode): Use the above function to format it.
-	(camel_internet_address_format_address): Format a single address
-	for display.
-	(internet_format): Implement the display version.
-	(camel_internet_address_class_init): Init the internet_format
-	virtual function.
-	(internet_cat): Implement virtual function to concatenate
-	addresses.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_info_new_from_header): new function, only
-	build the summary info, dont add it.
-	(camel_folder_summary_info_new_from_parser): Likewise, for new
-	info from parser.
-	(camel_folder_summary_add_from_parser): Cahnged to call function
-	above to build info.
-	(camel_folder_summary_add_from_header): Changed to call function
-	above, to build info.
-	(camel_folder_summary_info_free): New function to free the summary
-	message info.
-	(camel_folder_summary_clear): Changed to clal above to free info.
-	(camel_folder_summary_remove): Likewise.
-	(camel_folder_summary_add): Cleaned up the clashing uid
-	re-assignment logic a little bit.
-	(camel_folder_summary_decode_uint32): Fixed a typo, 01 != -1.
-	(camel_folder_summary_decode_time_t): Return -1 on error.
-	(camel_folder_summary_encode_off_t): New function to encode an
-	off_t type.
-	(camel_folder_summary_decode_off_t): And likewise for the reverse.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped the summary version, since
-	we're now encoding time/off_t's right.
-	(summary_header_save): Use time_t encoder to save the timestamp.
-	(summary_header_load): Likewise for decoding the timestamp.
-	(content_info_load): Decode off_t types directly, now we can.
-	(content_info_save): And likewise for encoding.
-	(camel_folder_summary_add_from_message): New function, create a
-	summary item from an existing message and add it.
-	(camel_folder_summary_info_new_from_message): New function, create
-	a summary item from an existing message.
-	(summary_build_content_info_message): New function to do the dirty
-	work of building the conent info/indexing, from a message source.
-	(format_recipients): Format an internetaddress suitable for the
-	summary.
-	(message_info_new_from_message): Build a new summary item from a
-	mime message.
-	(content_info_new_from_message): Build a new conent info from a
-	mime part.
-	(camel_folder_summary_class_init): Init the new class functions.
-	(message_info_new_from_message): Fixed for message api change.
-
-	Added documentation to the functions.
-	
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): new function,
-	generates simple message/content id
-
-2000-11-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Set the
-	preface/postface from the parser into the multipart object.
-
-	* camel-multipart.c (camel_multipart_set_postface): Function to
-	set the postface text on a multipart.
-	(camel_multipart_set_preface): Similarly for preface text.
-
-	* camel-mime-parser.c (folder_scan_content): If we scan until a
-	boundary, then we do not include the \n that starts the boundary
-	line in the content.
-	(struct _header_scan_stack): Added a ByteArray to store the
-	multipart pre/post-text as we're scanning.
-	(folder_pull_part): Free pre/posttext if they are allocated.
-	(folder_scan_step): Build into the pre/posttext arrays as we
-	encounter data.
-	(camel_mime_parser_preface): REturn the multipart preface text, if
-	there is any scanned.
-	(camel_mime_parser_postface): Likewise for postface text.
-	(byte_array_to_string): helper function for above.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Change
-	the from line to be "\nFrom ..." always, so no need to
-	check/append a \n to messages.
-	(mbox_append_message): Open the output stream with append mode
-	[assuming this is more efficient than seeking to the end]
-	And dont prepend \n  on the From line if its the first in the
-	mbox.
-	(mbox_append_message): Pass the offset of the real start of the
-	"From " line when we perform the update (which may != 'seek')
-
-	* camel-mime-filter-charset.c (complete): Removed the terminating
-	NUL 'fix'.
-
-	* camel-stream-filter.c (do_read): Added some debug.
-	(do_flush): And here.
-	(do_write): And here too.
-	(do_write): ARGH!!! ARGH!  Ok, so the filter stream was writing a
-	different number of bytes than the requester was asking it to
-	write (because of filtering, of course!).  So instead of returning
-	the true number of written bytes, we'll return what they asked us
-	to write - unless there is an error in which case we return -1.
-
-	* camel-mime-utils.c (base64_encode_close): Sigh, forgot to make
-	it unsigned.  I think this is actually a gcc bug as (48 >> 2)
-	somehow ended up negative, when it obviously should not, even if
-	the data load was signed.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c: Undo my incorrect fix - I misunderstood danw -
-	sorry!
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_expunge):
-	Unbreak this.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): If show_pass, then base64 the
-	password before writing it to the output string.
-	(camel_url_new): Assume password has been base64 encoded and
-	decode accordingly.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Add an "url_flags" field to CamelProvider.
-	Move the CAMEL_SERVICE_URL_* defines here and remove the SERVICE_
-	part of the name.
-
-	* camel-service.h: Remove CAMEL_SERVICE_URL_* flags and
-	service->url_flags field.
-
-	* camel-service.c (check_url, get_path): Get URL flags from
-	service->provider, update for changed flag names.
-
-	* providers/*/camel-*-provider.c: Add URL flags to provider
-	structures.
-
-	* providers/*/camel-*-{store,transport}.c, camel-remote-store.c:
-	Remove service->url_flags initialization.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Quote
-	foldernames when sending to the IMAP server because the folder
-	name might contain spaces.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-	* Merged in camel-incremental-branch.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Remove old
-	subbed folders from hash table after freeing them.
-
-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Deal
-	correctly with namespace == ""
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* camel-charset-map.c, camel-charset-map-private.h: synced all charsets
-	with ones found in libunicode. Just include more "iso/*.h" and rebuild
-	...private.h with this.
-	
-2000-10-31  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (service_disconnect): Add a new argument, clean,
-	that says whether or not to try to disconnect cleanly.
-
-	* camel-remote-store.c (remote_send_string, remote_send_stream,
-	remote_recv_line): disconnect uncleanly on failure to prevent
-	infinite loops when providers would normally send commands from
-	disconnect(). Remove some unneeded CamelException goo.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_disconnect): 
-	* providers/pop3/camel-pop3-store.c (pop3_disconnect): 
-	* providers/nntp/camel-nntp-store.c (nntp_store_disconnect):
-	* providers/imap/camel-imap-store.c (imap_disconnect): Don't send
-	QUIT/LOGOUT if !clean.
-
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c: New file with code for IMAP
-	authentication mechanisms. (Currently just krb4, and without
-	integrity/privacy protection).
-
-	* providers/imap/Makefile.am: Add camel-imap-auth.[ch] and krb4
-	CFLAGS/LDFLAGS
-
-	* providers/imap/camel-imap-store.c (connect_to_server): Split out
-	from imap_connect. Just does the basic connect and CAPABILITY
-	check. Redo the CAPABILITY code more robustly.
-	(query_auth_types_connected): Do this right rather than punting to
-	query_auth_types_generic. Check for KERBEROS_V4 if compiled with
-	krb4 support.
-	(query_auth_types_generic): Mention KERBEROS_V4 if compiled with
-	krb4 support.
-	(imap_connect): Use connect_to_server().
-
-	* camel-mime-utils.c (base64_encode_step, base64_encode_close):
-	Take an additional argument, "break_lines", saying whether or not
-	to add '\n's to the output.
-
-	* camel-multipart.c (set_boundary): 
-	* camel-mime-filter-basic.c (filter, complete): Update for base64
-	api change.
-
-2000-10-30  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Correct
-	parameters to g_hash_table_lookup_extended.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	Improved IMAP namespace handling: leave the namespace in the
-	folder names rather than constantly prepending it and stripping it
-	off. Also some subscription fixes.
-
-	* camel-store.c (camel_folder_info_build): Fix for the case where
-	@top isn't in @folders.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Add
-	a "short_name" argument rather than figuring it out ourselves.
-	(imap_get_full_name): Implementation of CamelFolder::get_full_name
-	that strips off namespace so the user doesn't have to see it.
-	(imap_append_message, imap_copy_message_to, imap_move_message_to):
-	Use folder->full_name rather than calling
-	camel_imap_store_get_folder_path.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Update this: make @flags a bitmask and @sep a char rather than a
-	string. Make all of the out arguments optional. Handle literals in
-	the server response.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Do a better
-	job of getting the correct dir_sep for the namespace we're using.
-	Construct a base_url here that will be used by get_folder_info.
-	(camel_imap_store_folder_path): Removed
-	(imap_folder_exists): Add an argument to return the short name of
-	the folder (parsed out of the LIST response). Update for
-	imap_parse_list_response change.
-	(get_folder): Update for the various other changes.
-	(get_folder_info): Update for the various other changes. Be more
-	consistent about the returned layout: put everything underneath
-	the "namespace" directory, including INBOX, even if it doesn't
-	belong there. Don't destroy the list of subscribed folders until
-	we've actually gotten the new list.
-	(folder_subscribed, subscribe_folder, unsubscribe_folder): Use
-	folder_name directly rather than camel_imap_store_folder_Path.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Update
-	for folder name changes.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Remove md5-utils.h include since it's not part of Camel
-	any more.
-
-	* camel-charset-map.c: Kill some warnings.
-
-	* providers/nntp/camel-nntp-grouplist.c
-	(camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save):
-	Clean up warnings about time_t casts.
-
-	* providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h
-	include.
-
-	* providers/pop3/camel-pop3-store.c: Undefine the "_" macro
-	defined by krb4's des.h when compiling with krb support.
-	Fix md5-utils.h include.
-
-2000-10-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_param_list_format_append): Only quote
-	Content-type parameters when the quoting is mandatory, and deal
-	with embedded quotes/backslashes when quoting.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* providers/pop3/Makefile.am: Tidy up build
-
-	* providers/smtp/Makefile.am: ditto	
-	
-	* Makefile.am:  Move md5-utils.[hc] to e-util because the 
-	addressbook is going to use md5 hashes for pilot syncing.
-	Maybe the calendar conduits as well because this is a good idea
-	Chris had.
-
-2000-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* camel-exceptions-list.def: Add newline to kill warnings.
-	
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Fix folder
-	listing code infinite loop.
-
-	* camel-store.h: Add a "parent" field to CamelFolderInfo.
-
-	* camel-store.c (camel_folder_info_build): Deal with "parent"
-	(camel_store_folder_subscribed, camel_store_subscribe_folder,
-	camel_store_unsubscribe_folder): Add g_return_if_fails checking
-	that the folder supports subscriptions.
-
-	* providers/imap/camel-imap-store.c (folder_subscribed,
-	subscribe_folder, unsubscribe_folder): Remove "+ 1"s since the
-	mail subscribe UI won't prepend / to the folder names now.
-	(get_folder_info): Clear the "parent" field of the folderinfos
-	when removing an empty top level.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_folder_subscribed,
-	nntp_store_subscribe_folder, nntp_store_unsubscribe_folder):
-	Remove "+ 1"s since the mail subscribe UI won't prepend / to the
-	folder names now.
-
-2000-10-24  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/imap/camel-imap-store.h: add subscribed_folders.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):
-	fill in vtable entries for subscription functions.
-	(camel_imap_store_finalize): new function, so we can free up our
-	subscribed_folders hashtable.
-	(camel_imap_store_init): set CAMEL_STORE_SUBSCRIPTIONS in the
-	CamelStore flags, and create our subscribed_folders hashtable.
-	(camel_imap_store_get_type): camel_imap_store_finalize is our
-	finalize function.
-	(get_folder_info): if we're looking at subscribed_only, clear out
-	the subscribed_folders hashtable, use LSUB instead of LIST, and
-	insert folder paths (prepended by their namespace if there is one)
-	into subscribed_folders.  INBOX subscription support needs work,
-	since we always show it, regardless of it's subscribed state.
-	(folder_subscribed): new function.  just look up the folder_path
-	in the hashtable.
-	(subscribe_folder): new function.  use the imap SUBSCRIBE command,
-	and if successful add it to the hashtable.
-	(unsubscribe_folder): new function.  use the imap UNSUBSCRIBE
-	command, and if successful remove it from the hashtable.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Fill in the
-	message_count and unread_message_count flags (if !fast).
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-object.h: #include gnome-i18n.h (and gnome-defs.h since
-	the former depends on it.)
-
-	* *: Add lots of _() and N_().
-
-2000-10-23  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add
-	camel-nntp-types.h.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix a
-	"how could this have been working before" memory overrun bug
-	found by Vlad.
-
-	* camel-op-queue.[ch], camel-thread-proxy.[ch]: These should have
-	gone away a long time ago.
-
-2000-10-20  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): re-enable the nntp provider.
-
-2000-10-20  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (build_folder_info): add
-	function to build a tree from the nntp group names (using '.' as a
-	heirarchy separator.)  #ifdefed INFO_AS_TREE only.
-	(build_folder_info_from_grouplist): if INFO_AS_TREE is selected,
-	call build_folder_info instead of appending a new CamelFolderInfo
-	to our list.
-	(ensure_news_dir_exists): use e_mkdir_hier instead of failing if a
-	parent directory (~/evolution/news generally) isn't there.
-
-2000-10-19  Chris Toshok  <toshok@helixcode.com>
-
-	* camel-folder-search.c: #include <sys/types.h> before <regex.h>
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Fix a bug with "INBOX" (or anything else with NIL hierarchy
-	separator) as the namespace.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Emit
-	message_changed and folder_changed as appropriate.
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_refresh_info): Update comment here
-	so refresh_info isn't just for reconnects any more. Make the
-	default implementation a no-op rather than an error.
-
-	* providers/nntp/camel-nntp-folder.c: Move refresh_info impl into
-	camel_nntp_folder_new, since it would have leaked memory and not
-	done anything useful if it was called later.
-
-	* providers/mbox/camel-mbox-folder.c: Remove no-longer-necessary
-	refresh_info impl.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Update imap_folder->exists, but don't actually load the new
-	messages. This is a temporary workaround to deal with the IMAP
-	provider stealing the message list focus at annoying times.
-	(imap_copy_message_to, imap_move_message_to): Emit a
-	folder_changed by hand, for now.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
-	`camel-imap-stream.h'.
-
-	* Makefile.am (libcamelinclude_HEADERS): Add `camel-charset-map.h'
-	and `camel-charset-map-private.h'.
-
-2000-10-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_description): The correct
-	fix this time - the description should be encoded here and not in
-	the camel-medium layer.
-
-2000-10-30  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (camel_folder_change_info_add_update): Fixed the
-	changeset logic, which was completely wrong.
-
-2000-10-27  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (quoted_encode_step): Removed is_blank() stuff.
-	(header_decode_init): When we set the 'space' bit, dont clear all
-	the others.
-	(quoted_encode): Put back the safemask.  Yes we totally need it,
-	see rfc 2047 section 5, parts (1) and (3).
-	(CHARS_PSPECIAL): Remove '=' and '_' from the list of allowed
-	characters (this is an allowed list, not a not-allowed list, like
-	the ESPECIAL).
-	(camel_mime_special_table): Updated for fixes to definitions.
-	(CHARS_ESPECIAL): Added '_' to list of characters that should be
-	encoded.
-
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
-	Use the new camel_folder_change_info_* stuff to build the update
-	diff, rather than doing it ourselves.
-
-	* camel-folder.c (camel_folder_change_info_add_source): Add a
-	'source' list, used to create change lists.
-	(camel_folder_change_info_add_source_list): Add a list of uid's,
-	convenience function.
-	(camel_folder_change_info_add_update): Add a uid to the list of
-	uid's in the new updated list.
-	(camel_folder_change_info_add_update_list): Add a bunch of uid's
-	at once for the same purpose.
-	(camel_folder_change_info_build_diff): Take the source list, the
-	update list, and find the differences, building on the added or
-	removed list as appropriate.
-
-2000-10-20  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (removed_uids): REnamed from
-	add_uid.
-	(camel_mbox_summary_update): Oops, fix the reversed logic for
-	determining the uid changesets.
-
-	* camel-folder.c (message_changed): Oops, we want to change the
-	uid, not add it.
-
-2000-10-19  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Added a
-	change list argument, and add expunged uid's to it.
-
-	* providers/mh/camel-mh-folder.c (mh_init): Setup the change list.
-	(mh_finalize): And free it.
-	(mh_sync): Track changes, and send a folder_changed signal as
-	appropriate.
-	(mh_expunge): Likewise.
-	(mh_append_message): Add the new uid to the change list and
-	trigger a folder_changed event.
-
-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):
-	Setup a mbox list of changes structure.
-	(mbox_finalize): And free it.
-	(mbox_expunge): Include the change list with the folder_changed
-	event, and clear it off.
-	(mbox_sync): And the same for when we are just syncing the folder.
-	(mbox_append_message): And do the same here, after we've updated
-	the folder.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): Use gmtime_r to get the time
-	thread-safely.
-	(camel_mbox_summary_sync): Added a changeinfo argument.  Add any
-	removed or changed messages to the changelists as appropriate.
-	(camel_mbox_summary_update): Added a changeinfo argument.
-	Genereate a list of added/removed uid's based on the difference
-	before and after rebuilding the summary.
-
-	* camel-folder.c (camel_folder_change_info_new):
-	(camel_folder_change_info_add_uid): 
-	(change_info_add_uid): 
-	(camel_folder_change_info_remove_uid): 
-	(camel_folder_change_info_change_uid): 
-	(change_info_clear): 
-	(camel_folder_change_info_clear): 
-	(camel_folder_change_info_free):
-	(change_info_cat): 
-	(camel_folder_change_info_cat):  Bunch of utility functions for
-	working with change info lists.
-	(camel_folder_init): Init the change info list.
-	(camel_folder_finalize): And free it.
-	(thaw): Changed to pass through a list of changes, or to get the
-	changed message uids from the camelfolderchangeinfo struct, and
-	reset it.
-	(folder_changed): Add the changed lists to the frozen change list
-	if we are frozen.
-	(message_changed): Add the message to the changed list if we are
-	in the frozen state.
-
-	* camel-folder.h (CamelFolderChangeInfo): New structure to hold
-	information for the folder_changed event.
-
-2000-10-18  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-filter-charset.c (complete): Put a zero at the start
-	of the outbuf.
-
-2000-10-18  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (add_header): No, we must not encode the
-	headers here.  These interfaces ARE raw interfaces as they are
-	defined in camel_medium.  Also removed a bogus/meaningless FIXME.
-	(set_header): Likewise here, we must not.
-	(process_header): Removed another bogus comment.
-
-	* camel-object.c (shared_is_of_type): Comment out the spitting of
-	a big warning when we're trying to determine types from code.
-
-	* providers/mbox/camel-mbox-summary.c
-	(message_info_new_from_parser): Only call ibex funcitons if we
-	have an index.
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_add): Only
-	call ibex functions if we have an index.
-	(remove_summary): Likewise.
-	(camel_mh_summary_check): Likewise.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder):
-	get_folder -> flags argument.
-
-	* providers/vee/camel-vee-store.c (vee_get_folder): create->flags.
-
-	* providers/pop3/camel-pop3-store.c (get_folder): Changed create
-	-> flags.
-
-	* providers/imap/camel-imap-store.c (get_folder): Added flags
-	argument.
-
-	* providers/mh/camel-mh-folder.c (camel_mh_folder_new): Added
-	flags argument, and fixed code appropriately.
-
-	* providers/mh/camel-mh-store.c (get_folder): Added flags argument.
-
-	* camel-folder-search.c (message_body_contains): Perform a regex
-	match on the contents of messages.  This wont quite work yet as
-	message contents are encoded when written to a stream.
-	(build_match_regex): Converts a number of strings into a regex
-	matching pattern, escaping special chars.
-	(match_message): match a single message from a folder, by uid.
-	Slow.
-	(search_body_contains): Changed to support matching where no index
-	is supplied.  Matches are performed by retrieving message
-	contents, etc.
-	() WTF?  camel should not be including any widget headers.
-	
-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):
-	Added flags argument.
-	(mbox_refresh_info): Changed into a NOP, the refresh info code
-	moved into the new function.
-	(camel_mbox_folder_new): If we have an index requested, build one,
-	otherwise, remove an old one, or just dont do anything.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Changed create
-	to flags, changed code to suit.
-
-	* camel-store.c (camel_store_get_folder): Changed create to flags.
-	(get_folder_internal): And here.
-	(get_folder): And here too.
-
-	* camel-store.h (camel_store_get_folder): Change the create
-	argument to be a flags argument.
-
-2000-10-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Remove
-	cached info at the end of the summary when the folder shrinks
-	between sessions. Also remove an untrue comment.
-	(camel_imap_folder_new): Move the summary creation to after the
-	folder selection again, since it depends on the uidvalidity
-	having been set.
-
-	* providers/imap/camel-imap-store.c (get_folder): Fix up
-	summary_file to not include the namespace twice.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (set_header): Encode the header value.
-	(add_header): Same.
-
-2000-10-17  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter.c: Added some malloc check debugging stuff.
-
-	* camel-mime-parser.c
-	(struct _header_scan_state): Removed top_part, top_start, and
-	pending.  I can't even remember why they were there, and they're
-	not used anymore.
-
-	* camel-mime-filter-basic.c (filter): Forgot to up the space here
-	too.
-
-2000-10-14  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (complete): Ok, so we hit a fixme, 3x
-	just wasn't enough for some sequences.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(imap_read_response): Don't imap_next_word(respbuf + 2), instead
-	use imap_next_word(respbuf) or else we'll skip over the second
-	token.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(camel_imap_response_extract): Don't free 'resp' as it doesn't
-	point to the beginning of the allocated data, instead free
-	response->untagged->pdata[i]. Also, if '*resp' is equal to a space
-	character, then set resp = imap_next_word (resp) rather than
-	expecting resp++ to work (there's a list broken IMAP daemons that
-	like to put extra spaces between tokens).
-	(imap_read_response): Don't expect 'respbuf+2' to be where the
-	untagged number response to start (see above fix for an
-	explanation).
-
-2000-10-16  Chris Toshok  <toshok@helixcode.com>
-
-	* camel-service.c (get_path): when using the construct (flags &
-	CAMEL_SERVICE_URL_NEED_*) make sure to do ((flags &
-	CAMEL_SERVICE_URL_NEED_*) == CAMEL_SERVICE_URL_NEED_*)
-	(check_url): same.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Only send
-	the LOGOUT command if the store is connected.
-	(imap_connect): Set the 'connected' state to TRUE when we
-	successfully connect.
-	(get_folder_info): if (!topfi), 'topfi' was allocated but then
-	'fi' was set. I think Dan meant to set topfi since fi is an
-	uninitialized value at this point.
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Check
-	for the untagged BYE response and set the 'connected' state to
-	FALSE if we receive the BYE response. Return NULL if we get a BYE
-	response.
-
-2000-10-16  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Deal with
-	the possibility of not getting a LIST response back for the top
-	level.
-
-2000-10-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Simple subclass of
-	CamelFolderSummary that also keeps a UIDVALIDITY value (and
-	doesn't, for the moment, build content info).
-
-	* providers/imap/camel-imap-folder.c:
-	(various): Use a CamelImapSummary to store/fetch summary info.
-	(camel_imap_folder_new): Take a path to a file to use for the
-	summary. Set the folder's permanent_flags correctly according to
-	the server response. Read in the summary (checking the
-	UIDVALIDITY) and update it if it's out of date.
-	(imap_refresh_info): Just fetch UIDs and flags. If the UIDs all
-	match, update the flags as needed and be done with it. Otherwise,
-	delete messages that have been expunged from the server and fetch
-	full summary info for any new messages.
-	(imap_sync): Save the summary to disk.
-	(imap_update_summary): Renamed from imap_get_summary_internal. Can
-	now be told to get summary for only a subset of messages. Use
-	camel-mime-utils functions rather than rolling our own header
-	parsing.
-	(imap_get_message_info_internal): Merged into imap_update_summary.
-	(imap_set_message_flags): Don't marked the message FOLDER_FLAGGED
-	if we're not actually changing the value of any of the flags.
-	(camel_imap_folder_changed): Deal with EXISTS rather than RECENT.
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Call
-	camel_session_get_storage_path and save the value.
-	(get_folder): Create a local directory to store summary
-	information and pass a summary file name to camel_imap_folder_new.
-	Don't call camel_folder_refresh_info from here any more since
-	camel_imap_folder_new does it again.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Add a
-	special case to this to make it possible to get the repsonses from
-	a SELECT and still have store->current_folder be updated
-	correctly.
-	(imap_read_response): parse EXISTS rather than RECENT
-
-	* camel-session.c (camel_session_get_storage_path): Use
-	e_mkdir_hier.
-
-	* camel-folder-summary.c (camel_folder_summary_remove_index): New
-	function.
-
-	* camel-mime-utils.c (header_raw_append_parse): fix this.
-	(camel-mime-parser.c doesn't use this code because of the MEMPOOL
-	optimization, so nothing was ever actually calling it before.)
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.h (struct _CamelMimePart): Removed
-	temp_message_buffer, and content_input_stream fields which seem to
-	have come from nowhere, and are unused.
-
-	* camel-mime-utils.c: Added a note about touching this file.
-	Nobody is to touch it without asking me first.  That goes for you
-	too Jeff.
-	(header_decode_text): In what way is this broken?
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Fix camel_summary_* function rename
-	(imap_get_message_info_internal): Likewise.
-
-	* camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.
-
-	* camel-folder-summary.c (camel_summary_format_address): Uh, why
-	do we encode and then decode here ... sigh.  This is not the way
-	to fix this.
-	(camel_folder_summary_format_address): Renamed to a proper name,
-	this was only supposed to be a private function.
-	(camel_folder_summary_format_string): Likewise.  Oh i see why it
-	was made public, code reuse by cut & paste.  Joy.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.
-	(nntp_store_subscribe_folder): same.
-	(nntp_store_folder_subscribed): same.
-
-2000-10-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): Quote
-	the mailbox name as it may contain spaces.
-	(imap_copy_message_to): Same.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): fill in message_count and
-	unread_message_count properly.
-
-	* providers/nntp/camel-nntp-newsrc.h: reformat.
-
-	* providers/nntp/camel-nntp-grouplist.c
-	(camel_nntp_get_grouplist_from_file): remove spew.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_get_num_articles_read): new function.
-	(camel_nntp_newsrc_group_get_highest_article_read): robustification.
-
-2000-10-10  Joe Shaw  <joe@helixcode.com>
-
-	* providers/imap/camel-imap-store.c 
-	(parse_list_response_as_folder_info): Check before dereferencing the
-	sep pointer.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* camel-*.c: teach camel about "its" vs. "it's"
-
-2000-10-09  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (finalize): write out the
-	newsrc.
-	(nntp_store_get_name): if @brief, just return host.
-
-	* providers/nntp/camel-nntp-newsrc.c: robustification and bug
-	fixes.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_summary_format_address): Decode
-	the resulting string.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-grouplist.c: new file.
-
-	* providers/nntp/camel-nntp-grouplist.h: new file.
-
-	* providers/nntp/camel-nntp-types.h: new file.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode): Fix so that we don't encode
-	every single char in the word. Also, do we need a safemask? I
-	don't see why we would.
-	(header_encode_string): Don't strip off the last char!!
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add
-	camel-nntp-grouplist.h
-	(libcamelnntp_la_SOURCES): add camel-nntp-grouplist.c
-
-	* providers/nntp/camel-nntp-provider.c: add our own hash functions
-	for nntp urls.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_is_subscribed): new function.
-	(camel_nntp_newsrc_subscribe_group): new function.
-	(camel_nntp_newsrc_unsubscribe_group): new function.
-
-	* providers/nntp/camel-nntp-newsrc.h: add prototypes for
-	_group_is_subscribed, _subscribe_group, and _unsubscribe_group.
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): new function.
-	(nntp_store_get_folder_info): add subscribed_only_parameter.  if
-	it's FALSE, load the grouplist and call
-	build_folder_info_from_grouplist.
-	(nntp_store_folder_subscribed): implement.
-	(nntp_store_subscribe_folder): implement.
-	(nntp_store_unsubscribe_folder): implement.
-	(camel_nntp_store_init): add CAMEL_STORE_SUBSCRIPTIONS to the
-	store's flags.
-
-	* providers/mh/camel-mh-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/mbox/camel-mbox-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* camel-store.c (camel_store_supports_subscriptions): new function.
-	(camel_store_folder_subscribed): new function.
-	(camel_store_subscribe_folder): new function.
-	(camel_store_unsubscribe_folder): new function.
-
-	* camel-store.h: add prototypes and virtual functions for the
-	subscribe implementation.  also, add a subscribed_only argument to
-	camel_store_get_folder_info.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): Encode
-	the name part of the address and don't quote the name.
-	(header_decode_text): Rewrote from scratch, the old code was badly
-	broken.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use the
-	camel_address_encode function again.
-	(camel_mime_message_set_from): Same.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode_step): Modified to not encode
-	space chars in the middle of a line.
-	(isblank): New macro if we're not on a system with the GNU isblank
-	extension.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Reversed my
-	changes, don't header_encode_phrase - it generates broken headers.
-	(camel_mime_message_set_reply_to): Same.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):
-	revert to old method (only use XOVER if OVER is supported.)
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_overview_fmt): handle the case where the
-	OVER extension isn't listed but LIST OVERVIEW.FMT works (again,
-	INN 2.2).  enable the OVER extension in this case.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): return a
-	gboolean so we can tell if this command worked.  we can't key off
-	the OVER extension being present because at least one server (INN
-	2.2) doesn't report the OVER extension but implements the XOVER
-	command.  This could of course just be because I'm a loser for
-	thinking they were related in the first place.
-	(camel_nntp_get_headers): always try XOVER first, and if it fails
-	revert to the slow method.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a case where
-	a variable was free'd and then possibly used in an error message.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-provider.c
-	(camel_provider_module_init): news: -> nntp:.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):
-	use "nntp:" instead of "news:" since "news:" urls aren't supposed
-	to have host/user/port info in them.  also, if there's a user
-	defined in the url, put it in the urls for our folders.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate):
-	borrow some code from the imap provider to query the user for
-	their password, and pass the user/passwd to nntp.  be extra
-	paranoid and zero out the password before freeing it.
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_init): add
-	ALLOW_USER/ALLOW_PASSWORD/ALLOW_AUTH to the url flags.
-	(nntp_store_query_auth_types_generic): return our list of
-	auth_types.
-	(nntp_store_query_auth_types_connected): broken, return same as in
-	query_auth_types_generic.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): IMAP4
-	(pre-rev1) doesn't support the 'LIST "" ""' idiom, so don't use
-	it. Just assume the dir_sep is '/'. Shrug.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use
-	header_encode_phrase instead.
-	(camel_mime_message_set_from): Same.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_content_type_is): Handle the case
-	where ct != NULL, but type and subtype are, and also match that
-	against text/plain.
-
-	* camel-folder-summary.c: Bump summary file version.
-	(message_info_save): Save the size from the messageinfo.
-	(message_info_load): Load the size from the summary file.
-	(message_info_load): Fixed up the time_t saving/loading.  There
-	was a reason the warning was left there ... obviously nobody could
-	read the comment "/* warnings, leave them here */", why do i even
-	bother.
-	(camel_folder_summary_decode_time_t): Decode a time_t value from
-	the summary file.
-	(camel_folder_summary_encode_time_t): Encode a time_t value to the
-	summary file.
-
-2000-10-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Quote
-	the mailbox name when sending a SELECT request otherwise mailboxes
-	with spaces in their names will cause problems.
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): encode
-	before setting.
-	(camel_mime_message_set_from): Same.
-
-2000-10-03  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c: New file containing
-	camel_imap_command and friends. Major camel_imap_command rewrite
-	to remove duplicated code, make the parsing of literals be
-	more safe/correct, deal with RECENT/EXPUNGE responses more
-	consistently, and make it possible to implement the AUTHENTICATE
-	command.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): New
-	function, to parse an IMAP "nstring".
-
-	* providers/imap/camel-imap-store.c: Move command stuff to
-	camel-imap-command.c. Update for camel_imap_command changes.
-
-	* providers/imap/camel-imap-folder.c: Update for
-	camel_imap_command changes.
-	(imap_append_message): CRLF filter the message before sending it.
-
-	* providers/imap/Makefile.am: Add camel-imap-command.[ch], remove
-	camel-imap-stream.[ch] for now.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_has_8bit_parts): New
-	convenience function to determine if there are any 8bit mime parts
-	in a mime message.
-	(camel_mime_message_encode_8bit_parts): New convenience function
-	to recursively reencode all 8bit mime parts to either
-	quoted-printable or base64 depending on which would be the best
-	encoding for that part.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the mime
-	message contains 8bit parts and the server doesn't support 8bit
-	transfers, reencode those parts before proceding with the send.
-	(smtp_mail): If the mime message contains 8bit parts and the
-	server supports the 8BITMIME extension to SMTP, notify the server
-	that we'll be sending it 8bit mime parts.
-	(_send_to): Find out if the message contains 8bit parts.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Use the
-	CamelInternetAddress parser.
-	(smtp_get_email_addr_from_text): deprecated.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Remove default_ports.
-
-	* camel-remote-store.c (remote_connect): Get default_port from
-	CamelRemoteStore rather than CamelProvider.
-
-	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize
-	CamelRemoteStore::default_port
-
-	* providers/*/camel-*-provider.c: Remove default_ports.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove
-	camel_folder_{get,free}_subfolder_info, as we want to be able to
-	scan the whole subfolder tree without having to open any folders,
-	so this needs to be in CamelStore. Remove can_hold_folders and
-	can_hold_messages flags; things that don't hold messages are no
-	longer considered CamelFolders.
-
-	* camel-folder-summary.[ch]: Remove CamelFolderInfo stuff.
-
-	* camel-store.[ch]: Add camel_store_{get,free}_folder_info, as
-	well as camel_store_free_folder_info_full and ..._nop for default
-	implementations, and camel_folder_info_free and
-	camel_folder_info_build as convenience functions. Turn
-	CamelFolderInfo into a tree structure and also add an "url"
-	member.
-
-	* providers/*/camel-*-folder.c: Remove subfolder_info and can_hold
-	stuff.
-	* providers/*/camel-*-store.c: Add folder_info stuff.
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Free the
-	summary elements with camel_message_info_free, not
-	camel_folder_info_free. Oops.
-
-	* providers/imap/camel-imap-utils.c: const poison
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Fixed some memory leaks.
-	(camel_smtp_transport_init): Initialize supports_8bit to FALSE.
-	(smtp_helo): If server supports 8bit, set supports_8bit to TRUE.
-
-	* camel-transport.h (struct _CamelTransport): Added variable
-	gboolean supports_8bit (we'll need this eventually? - see bugzilla
-	bug #53)
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): Ugh, no wonder people were
-	getting illegal seek warnings *sigh*. I guess I can only blame
-	myself for this one though :-(
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Don't send the
-	recipient data through smtp_get_email_addr_from_text - this is a
-	complete waste. In fact, we don't want to have to use that
-	function ever.
-
-	* camel-internet-address.c, camel-address.c: Added some gtk-doc
-	comments.
-	
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-mime-utils.c (header_encode_string): Make sure to add the
-	space char after an encoded word when the encoding is iso-8859-1.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): When
-	getting a literal string response, don't include the \r\n after
-	the closing } (as in: "... {798}\r\n...")
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Same.
-
-2000-09-28  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_fold): New function to fold headers.
-
-2000-09-27  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): If we had an empty
-	header, then it must be end of the headers too.
-	(folder_scan_init): No we dont need to init the outbuf with a nul
-	terminator.
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): New
-	function to reset the uid to a higher value.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	"something failed (yo!)" what sort of crap is this?  Fixed all the
-	indenting again, what wanker keeps running stuff through indent?
-	(message_info_new): Check the uid we loaded off the disk, if it
-	existed already, assign a new one.  If it didn't then make sure
-	the nextuid is higher.
-
-	* camel-charset-map.c: New file, used to build a large unicode
-	decoding mapping table, and use it to determine what is the
-	lowest charset a given word can be encoded with.  Uses tables from
-	libunicode's source.
-
-	* camel-internet-address.c (internet_encode): Use
-	header_phrase_encode to properly encode the fullname, as required.
-	refixed indenting.  Who keeps doing that?
-	(camel_internet_address_find_address): Changed fatal return/warnings
-	into assertions.
-
-	* camel-mime-utils.c (header_raw_append_parse): Check : explicitly
-	(removed from is_fieldname() macro).
-	(camel_mime_special_table): Changed to short, so we can represent
-	more bit types.
-	(quoted_encode): Take a mask of the safe chars for this encoding.
-	(header_address_decode): Removed a #warning that makes no sense
-	anymore.
-	(header_decode_date): Fixed the 'broken date' parser code, if it
-	ever decoded it it just threw away the result.
-	(header_encode_string): Use better charset matching for encoding
-	strings as well.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Save
-	the index if we do a sync.
-	(camel_mh_summary_check): Save the index here too.  Probably.
-
-2000-09-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Return untagged data in a GPtrArray rather than a string, since it
-	saves processing time and is much easier to deal with for several
-	commands. Update for camel_imap_folder_changed change.
-	(camel_imap_fetch_command): Update for camel_imap_folder_changed
-	change.
-	(imap_connect, imap_folder_exists): Update for
-	camel_imap_command_extended change.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal,
-	imap_get_subfolder_info_internal, imap_search_by_expression):
-	Update for camel_imap_command_extended change.
-
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	camel_imap_fetch_command here now to get around the
-	camel_imap_command_extended change.
-
-	(camel_imap_folder_changed): turn expunged into a GArray of ints
-	rather than a GPtrArray of strings representing ints.
-
-2000-09-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Quote the folder name as it may
-	contain spaces.
-	(imap_get_subfolder_info_internal): Same.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): Do
-	proper unquoting for folder names.
-	(func_get_current_date): Implemented.
-
-	* providers/imap/camel-imap-store.c
-	(imap_folder_exists): Quote the folder name as it may have spaces.
-	(imap_create): Same.
-	(check_current_folder): Same.
-
-2000-09-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): The root folder's name is "",
-	not the namespace.
-	(camel_imap_folder_new): constify folder_name.
-
-	* providers/imap/camel-imap-store.c (get_folder): Create the
-	folder with folder_name, not folder_path.
-	(camel_imap_command_preliminary): Don't free cmdid here.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_create_flag_list): New
-	function to convert Camel flags to an IMAP flag_list.
-	(imap_parse_flag_list): Contrariwise.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_*): Make
-	the @ret arg actually optional, as (mostly) documented.
-	(various): Don't pass "&result" to camel_imap_command_* if we're
-	just going to immediately free it. Don't record status if we're
-	not going to look at it.
-
-	* providers/imap/camel-imap-folder.c: Likewise.
-	(imap_summary_free): Use camel_folder_info_free.
-	(imap_sync): Use imap_create_flag_list. Clear
-	CAMEL_MESSAGE_FOLDER_FLAGGED after syncing so we don't keep
-	re-syncing.
-	(imap_append_message): Use imap_create_flag_list. Don't leak the
-	memstream if the append fails.
-	(imap_move_message_to): Use camel_folder_delete_message rather
-	than doing it by hand.
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	imap_parse_flag_list and header_raw_clear.
-	(camel_imap_folder_changed): Use camel_message_info_free.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_name): INBOX is
-	case-insensitive.
-	(get_root_folder_name): Make the root folder "" rather than "/".
-	(get_folder): Update for root folder name change.
-	(camel_imap_store_get_toplevel_dir): Removed. (Unused, unneeded.)
-	(camel_imap_store_folder_path): New function to turn a Camel
-	folder name into the corresponding namespaced IMAP path.
-	(imap_folder_exists): Make this take a store and a path rather
-	than a folder.
-	(imap_create): Likewise
-	(get_folder): Update for camel_imap_store_folder_path and other
-	changes.
-	(check_current_folder): Likewise.
-
-	* providers/imap/camel-imap-folder.c: Change a bunch of CamelStore
-	variables to CamelImapStore (and add a few more) to prevent excess
-	gratuitous casting. Use camel_imap_store_folder_path where
-	appropriate.
-	(camel_imap_folder_new): Update for root folder name change.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the
-	linewrap filter to achieve full RFC0821 compliance.
-
-	* camel-mime-filter-linewrap.[c,h]: New mime-filter to word-wrap.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): When encoding the
-	internet address, quote the name as the name may have commas or
-	any other token which may later confuse our address parser.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): Fix the case where INBOX
-	isn't returned in the folder listing.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: (init): Removed
-	(camel_folder_init, camel_folder_construct): New object init
-	function and public object constructor to replace the old init
-	method in a more Gtk-like fashion.
-
-	(get_parent_folder, camel_folder_get_parent_folder): Removed. No
-	CamelFolder subclass was ever setting the parent_folder member, no
-	code has ever needed to look at it, and fixing it would actually
-	be pretty hard.
-
-	(get_subfolder_info, camel_folder_get_subfolder_info): Renamed
-	from ..._names. Deals in CamelFolderInfo now.
-	(free_subfolder_info, camel_folder_free_subfolder_info): Likewise.
-
-	(get_subfolder, camel_folder_get_subfolder): Removed.
-	CamelFolderInfo contains the subfolder's full name, so this is
-	unnecessary now, and removing it lets us get rid of the
-	CamelFolder separator member, which is needed for the default
-	implementation of this function, but not otherwise needed for most
-	providers.
-
-	Also, lots of code style fixes.
-
-	* providers/*: Update CamelFolder subclasses for changes, although
-	none of them fill in the message counts in the CamelFolderInfo
-	yet.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-search.h,
-	camel-remote-store.c, providers/imap/camel-imap-folder.c,
-	providers/imap/camel-imap-store.c: Fixed the #include lines to
-	deal properly with gal.
-
-2000-09-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.h: update CamelFolderInfo
-	* camel-folder-summary.c (camel_folder_info_free): New function to
-	free the contents of a CamelFolderInfo
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* camel.c (camel_init): Set camel_verbose_debug to TRUE if
-	CAMEL_VERBOSE_DEBUG is set in the environment.
-
-	* camel-remote-store.c (remote_send_line, remote_recv_line): only
-	log if camel_verbose_debug is TRUE.
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Don't use
-	dir_sep as top-level directory, use "/".
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of
-	unused variable.
-
-2000-09-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Don't look at
-	the response of the command. camel_imap_command_extended()
-	processes EXPUNGE responses itself, so if we do it here too we
-	remove twice as many summary items as we should.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Rewrote
-	to take a third argument (gboolean *selectable) so that we can
-	find out if the folder is selectable or not as we look to see if
-	it exists. Also, don't use EXAMINE because that will not work on
-	non-selectable folders, so use LIST instead.
-	(get_folder): Check to see if the folder exists even vefore
-	calling imap_create as this will save time. If the folder does
-	exist, find out if it's selectable. Moved the call to refresh_info
-	here.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Check for a
-	NULL summary.
-	(camel_imap_folder_new): Don't call refresh_info here - call it in
-	get_folder() because we don't know if this folder even exists on
-	the server yet! And even if it does, we don't know if it can hold
-	messages or not yet.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is
-	> 0 before calling camel_mime_filter_filter otherwise we will get
-	a segfault if the filter calls iconv().
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c,
-	providers/nntp/camel-nntp-auth.h: Fixed a warning.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_get_storage_path): Make this not
-	leak.
-	
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_new): Make this take a path to a
-	directory that Camel can use for its own nefarious purposes.
-	(camel_session_get_storage_path): New function to return a path
-	that a service can use for its own nefarious sub-purposes.
-
-	* camel-service.c (camel_service_get_path): New method (and
-	useful default implementation) to get a (relative) pathname
-	corresponding to the service.
-
-2000-09-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Make KPOP
-	work again.
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_get_received_date):
-	Implemented (someone added these to camel-mime-message.h but never
-	implemented them!!) - though it may not be right.
-	(camel_mime_message_get_sent_date): Same.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_get_filename): If a MIME part
-	has no Content-Disposition, but does have a "name" on the
-	Content-Type, return that as the filename.
-	(process_header): strstrip the Content-Description
-
-2000-09-05  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): care about
-	response code.
-	(get_HEAD_headers): same.
-	(camel_nntp_get_headers): same.
-
-	* providers/nntp/camel-nntp-store.h: get rid of
-	CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): take CamelException arg and
-	pass along to camel_nntp_command.
-	(camel_nntp_store_get_overview_fmt): same.
-	(nntp_store_connect): convert to using constants in
-	camel-nntp-resp-codes.h
-	(nntp_store_get_folder): make use of camel_nntp_folder_new.
-	(camel_nntp_command_send_recv): new function to deal with auth
-	challenge.
-	(camel_nntp_command): split out most of this function into
-	camel_nntp_command_send_recv.  also, return the actual response
-	code instead of CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-resp-codes.h: new file.
-
-	* providers/nntp/camel-nntp-folder.h: prototype for
-	camel_nntp_folder_new.
-
-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): new
-	convenience function.
-	(nntp_folder_get_message): care more about the actual response
-	code.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-auth.c.
-	(libcamelnntpinclude_HEADERS): add camel-nntp-auth.h.
-
-	* providers/nntp/camel-nntp-auth.h: new file.
-
-	* providers/nntp/camel-nntp-auth.c: new file.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Don't free the
-	result on error; the exception will have the relevant info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Check for
-	exceptions here.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Check the exception
-	on the refresh_folders call.
-
-	* providers/imap/camel-imap-store.h: Clean up some now-unused fields.
-
-	* camel.c (camel_init): Call unicode_init again, now that libunicode
-	will not initialize itself twice.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-search (search_header_contains): Use e_utf8_strstrcase
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed some unused
-	functions.
-
-2000-09-01  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): Initialize
-	the statically-allocated CamelException so that it doesn't contain
-	junk data that camel_exception_set() may try to free.
-	(camel_nntp_store_get_extensions): Same.
-	(camel_nntp_store_get_overview_fmt): Same.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Typo
-	fix (if (*ret) -> if (ret)).
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the
-	port # back to what was specified ASAP, so that the hash of
-	the URL doesn't change (which causes a failure in
-	service_cache_remove that leads to a segfault).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Clear the 
-	exception after a failed LOGIN so that it doesn't pass through
-	to the upper level and make mail think that the login failed.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): As above.
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_get_type):
-	Implement POP3 with the CamelRemoteStore now.
-	(connect_to_server): Hack this a bit to get KPOP to work. Obey
-	the new connection semantics of the remote store (implicitly).
-	(query_auth_types_connected): Clear exceptions after attempts
-	to connect; the code at the bottom will catch hard errors.
-	Use camel_service_connect.
-	(camel_pop3_command): Take a CamelException; now, when an error
-	occurs, ret is set to NULL and the exception passes back the
-	appropriate information.
-	(pop3_get_response): Same as above.
-	(pop3_try_authenticate): Give camel_pop3_command its exception
-	and handle it properly.
-	(pop3_connect): Call the parent classfuncs. Don't disconnect
-	on error (done for us).
-
-	* providers/pop3/camel-pop3-folder.c: Obey the camel_pop3_command
-	semantics.
-
-	* camel-remote-store.c (remote_query_auth_types_connected): Don't
-	warn; just return NULL.
-	(remote_query_auth_types_generic): Same.
-	(remote_send_string): Filter out passwords in debugging output.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Also
-	set the ALLOW_AUTH flag.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Same.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_class_init):
-	remove get_folder_name.
-	(nntp_store_get_folder_name): remove.
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-mime-part.c (write_to-stream): Use filter only if we have one
-	
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):
-	use camel_remote_store_recv_line to build message.  also, free our
-	buffer so we don't leak like mad.
-
-	* providers/nntp/camel-nntp-store.c:
-	(camel_nntp_store_get_additional_data) remove.
-	(camel_nntp_store_get_extensions): use
-	camel_remote_store_recv_line.
-	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on
-	_get_additional_data anymore since it's easier to parse without.
-	(camel_nntp_command): use camel_remote_store_send_string and
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the
-	parent class now.  remove istream/ostream since CamelRemoteStore
-	takes care of that for us.  also remove the prototype for
-	camel_nntp_store_get_additional_data.
-
-	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):
-	make sure to clear dirty bit.
-	(camel_nntp_newsrc_read_for_server): don't worry about continually
-	trying to open the file - if it fails we just return an
-	unpopulated .newsrc file.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_read_for_server): make this a bit more robust.
-	try to create an empty .newsrc file for the server if we can't
-	open it for reading.  also, don't allocate everything until we've
-	opened the file.
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): make use
-	of our overview field indices.
-	(camel_nntp_get_headers): only call get_OVER_headers if the
-	extension is present.  warn if it's not - since get_HEAD_headers
-	needs work before it works.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): new function - query the server
-	for it's extensions.
-	(camel_nntp_store_get_overview_fmt): new function - query the
-	server for the overview format and build our table of the indices
-	we care about.  support the "full" suffix on fields.
-	(nntp_store_connect): call camel_nntp_store_get_extensions and
-	camel_nntp_store_get_overview_fmt.
-
-	* providers/nntp/camel-nntp-store.h: add codes for extensions
-	found on news.mozilla.org.  only one that we care about is OVER.
-	also, add CamelNNTPOverField and an enum of the overview fields
-	that we care about.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp):
-	Reimplemented. It should now work correctly for most possible
-	VFolder rules.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Don't save any exceptions caused by camel_imap_folder_changed
-	(camel_imap_fetch_command): Same.
-	
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Using a new way of calculating the first recent message that seems
-	more accurate. Also added code to make sure we don't accidently
-	add a duplicate summary.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Use the proper type
-	checking function to check for text types.
-	(write_to_stream): If we have a charset on a text type that
-	isn't us-ascii or utf-8, then we need to reencode it, so add a
-	filter to do that too.
-	(write_to_stream): Fix some warnings/use the right constructor,
-	oops.
-	(write_to_stream): Rearrange the logic so it always does charset
-	conversion, and not just if we have a qp/base64 block.
-
-	* camel-mime-utils.c (append_latin1): New function - even though
-	its broken, we'll assume mailers send latin1 headers instead of
-	us-ascii.  We just have to encode high chars into utf-8.
-	(header_decode_text): Call append_latin1 for appending unencoded
-	text segments.
-	(append_latin1): Do an additional mask for account for c's
-	undefined behaviour for sign extension whilst shifting right.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_fetch_command):
-	Rewrote to ignore strings that look like server responses until it
-	is sure that it has finished reading the literal string response.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c (remote_send_string): Don't wrap printed
-	strings in quotes, makes things messy
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message): Updated
-	to use the camel_imap_fetch_command
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to use
-	camel_imap_fetch_command
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	No longer handles FETCH requests so no longer needs to be
-	concerned with checking to make sure that server responses are
-	valid (they have to be).
-	(camel_imap_fetch_command): New convenience function that handles
-	all FETCH requests
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* camel-remote-store.c (remote_connect): Unify with remote_post_connect.
-	(remote_disconnect): Unify with remote_pre_disconnect.
-	(camel_remote_store_class_init): Don't use the post_connect and
-	pre_disconnect classfuncs anymore ; they weren't especially useful.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Use this again
-	instead of implementing post_connect.
-	(imap_disconnect): Analogous to above.
-
-	* camel-session.c (camel_session_get_service_connected): New function.
-	Like camel_session_get_service() but also connects to the service
-	if needed. camel_session_get_{store,transport} (defined in the header)
-	used this now, preventing annoying when-to-connect problems.
-
-	* camel-service.c (camel_service_new): Revert to the old behavior
-	of not connecting until told to do so. Otherwise doing auth
-	testing correctly is really hard.
-	(camel_service_connect): Fix behavior here (set the connected
-	flag).
-	(camel_service_disconnect): Unset the connected flag.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: General cleanup / moving
-	stuff around to make things easier to follow.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c: Prevent exceptions from being overwritten
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Beautified
-	(imap_get_subfolder_names_internal): Removed old code as the
-	replacement code has now been tested and proven to work
-
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed old code that will
-	never be needed again
-
-	* providers/imap/camel-imap-store.c: Removed old code for
-	try_connect - will never need this code
-	(slurp_response): Update to make sure we aren't falsely detecting
-	EXPUNGE flags
-
-2000-08-29  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_connect): Uncomment this.
-	(camel_service_disconnect): Same.
-
-	* camel-remote-store.[ch]: New files. Abstract remote storages
-	(IMAP, POP3, NNTP) and hides the lower-level networky stuff.
-	
-	* camel-service.c (camel_service_new): Take an extra argument, the
-	provider that created us, cause it's useful.
-	(camel_service_finalize): Unref our new provider member.
-
-	* camel-session.c (camel_session_get_service): Pass the proper number of
-	arguments to camel_service_new().
-
-	* camel-imap-store.c: Massive update: 1) use the CamelRemoteService to
-	make our life Very Easy (TM). 2) Change the semantics of all 
-	camel_imap_command* functions to take exceptions, centralize tons of
-	duplicate code, and use the handy RemoteStore utility functions
-
-	* camel-imap-folder.c: Use the new semantics of camel_imap_command*
-
-	* camel-imap-stream.c: Same.
-	
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Updated to check for EXPUNGE notifications
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Updated to account for messages which have been expunged (now
-	takes a new arg, a GPtrArray of message id's that have been
-	expunged)
-	(imap_expunge): Updated (we may want to just use the code in
-	folder_changed now instead of doing our own summary
-	expunging...but that can be fixed later)
-	(imap_append_message): Updated.
-	(imap_copy_message_to): Updated.
-	(imap_move_message_to): Updated.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_refresh_info): New member function,
-	refresh_info, used for rereading folder state after its state has
-	somehow become unknown. Tries to preserve last-known status of
-	messages.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_refresh_info): Implement
-	::refresh_info (split up ::init)
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Call ::refresh_info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Call
-	::refresh_info once initialized.
-	(imap_refresh_info): New member function; reads the summary from
-	the server (used to be in camel_imap_folder_new; split out).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Set
-	CamelService::connected a little early so that 
-	camel_imap_command won't try to connect while already
-	connnecting.
-	(camel_imap_command*): Try to connect if not connected already.
-	
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Same as above.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Same
-	as above.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set 
-	CamelService::connected a little early so that
-	camel_pop3_command won't try to connect while already
-	connecting
-	(connect_to_server): Same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_refresh_info): Same
-	as above.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed the
-	hack around quoted string responses - should now handle them
-	according to the specifications in the RFC
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to
-	match the code currently used in camel-imap-folder.c
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Never ever free `tmpname' as it comes from `alloca()'!
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_text): Use `g_free()', not
-	`free()', to free `decword'.
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* camel.c (camel_init): Don't call unicode_init; code in e-util
-	will do it, and if unicode_init is called twice, you get an
-	infinite loop when looking up nonexistant encodings (patch
-	has been submitted to libunicode's maintainer).
-	
-	* camel-provider.h: Add a new field, default_ports, which
-	helps the configuration code guess about how to make CamelURL's
-	from providers.
-	
-	* providers/*/camel-*-provider.c: Specify default ports.
-
-2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If the url path is "/" and
-	the folder path is "/", just LIST "" "*" (this should fix some
-	cyrus imapd problems). Also, INBOX is case insensitive so use
-	g_strcasecmp
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-summary.c (summary_build_content_info):
-	Use UTF-8 as default
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):
-	Use UTF-8 as default
-	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8
-	
-2000-08-17  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): Close index
-	on exit.
-
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): put
-	commas between addresses.
-
-2000-08-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_protocol_get_summary_specifier): use BODY.PEEK, not BODY, so
-	we don't set the message \Seen.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c: Fixed a small warning.
-
-2000-08-22  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Connect automatically if the
-	URL is not empty.
-	(finalize): Disconnect automatically if connected.
-	(camel_service_query_auth_types): Split	into two functions; one to
-	be called if we're connected to an actual server (_connected), one
-	to be called if we're just gauging the general authtypes supported
-	(_generic).
-	(is_connected): Remove.
-
-	* camel-store.c (camel_store_get_folder): Don't connect explicitly to
-	the service.
-
-	* providers/nntp/camel-nntp-store.c (query_auth_types_generic): Split
-	the query_auth_types function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-	
-	* providers/pop3/camel-pop3-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/imap/camel-imap-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types_generic): Split
-	the query_auth_types (dummy, in this case) function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-	
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_subfolder_names):
-	Make sure newsrc is not null
-	(nntp_folder_get_subfolder_names): ditto
-
-	* providers/nntp/camel-nntp-newsrc.c 
-	(camel_nntp_newsrc_get_subscribed_group_names): Programming check
-	for newsrc == NULL
-	(camel_nntp_newsrc_get_all_group_names): ditto
-	(camel_nntp_newsrc_write_to_file): ditto
-	(camel_nntp_newsrc_write): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): 
-	Make sure respbuffer is not null before manipulating it.
-	If it is null, return CAMEL_NNTP_FAIL and a decent error
-	message.
-	
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): If the name is "" we
-	weren't outputting anything; output the address at least.
-
-2000-08-16  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): Fix a leak when
-	name = "". It's a single-byte leak, but it's the little things
-	that count.
-
-	* camel-object.c (camel_type_lock_up): Don't leave the type
-	system locked when a bad unlock happens.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a leak.
-
-2000-08-15  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_copy_message_to): Typo fix.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder-search.c (search_get_sent_date): New search function;
-	returns the time_t when the message was sent.
-	(search_get_receive_date): Same for when it was received.
-	(search_get_current_date): Gets the current time for use with the
-	above two. Is this in the right place?
-
-	* camel-folder-search.h: Add the new functions above to the class.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): Add
-	camel-nntp-utils.h
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): do a strcasecmp rather than
-	just a strcmp when checking if a folder is "INBOX", since it is
-	a case-insensitive name.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Don't assume the FETCH results will come back in the order they
-	were requested.
-	(imap_get_subfolder_names_internal): Add "INBOX" to the list as
-	g_malloc'ed memory, not a static string.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Now takes a char * parameter
-	rather than a stream
-	(camel_imap_command_continuation_with_stream): Same function as
-	above but takes a stream parameter instead
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	camel_imap_command_continuation_with_stream
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): New
-	function to do one round of attempted authentication.
-	(pop3_connect): Move a bunch of code out into
-	pop3_try_authenticate and fix some bugs in the edge cases.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): No longer
-	calls try_connect() to get authtypes
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Changed param order a bit and
-	fixed some logic
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	the new multi-transactional convenience functions
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_preliminary): New convenience function for
-	multi-transactional commands (opening request)
-	(camel_imap_command_continuation): New convenience function for
-	multi-transactional commands (followup data)
-
-2000-08-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mh/camel-mh-folder.c: Fixed a warning.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(camel_nntp_folder_class_init): remove get_name and get_full_name
-	assignments, since the camel-folder.c implementation does what we
-	need.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use g_get_home_dir, since
-	evolution_dir isn't available in the providers.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (thaw): Fix a bug where the message_changed
-	signal wasn't being emitted.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):
-	Implement.
-	(mh_get_message_user_tag): Implement.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_user_tag):
-	(mbox_set_message_user_tag): Implement.
-
-	* camel-folder.c (move_message_to): Yay so lets fix an already
-	fixed fix, again.
-	(copy_message_to): and here too ... update for api change to append().
-	And removed another warning.
-	(camel_folder_set_message_user_tag): Routine to set message tags.
-	(camel_folder_get_message_user_tag): And accessor.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-summary.c, camel-medium.c,
-	camel-mime-filter-charset.c, camel-mime-filter.c,
-	camel-mime-filter.h, camel-mime-message.c, camel-mime-parser.c,
-	camel-mime-part-utils.c, camel-mime-part.c, camel-mime-utils.c,
-	camel-movemail.c, camel-multipart.c, camel-object.c,
-	camel-stream-mem.c, providers/mbox/camel-mbox-folder.c,
-	providers/mbox/camel-mbox-summary.c,
-	providers/mh/camel-mh-folder.c,
-	providers/smtp/camel-smtp-transport.c: Fixed some warnings.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Free
-	the search properly.
-	(vee_folder_build): And here too.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	If we go over the max number of messages, don't keep requesting
-	new message summaries, just break.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): A better way to
-	compress leading whitespace.  The code is probably invalid anyway,
-	I dont think it will work across buffer boundaries.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): And
-	write out proper format From lines here too.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): New function to build a more
-	compatible mbox "From " line.
-	(camel_mbox_summary_sync): Write From lines in the proper format.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-store.c (get_folder): Remove warnin g.
-
-	* providers/mbox/camel-mbox-store.c (xrename): Kill some warnings
-	with constification.
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Fixed
-	for append api change.  Eek this routine seriously wastes memory.
-
-	* providers/mh/camel-mh-folder.c (mh_search_free): Impelemnt.
-	(mh_append_message): Fix for api change, and include user flags
-	and tags in new message.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Fix
-	for search api change.
-
-	* camel-folder.c (camel_folder_search_free): New function for
-	freeing search results.
-	(search_free): Changed my mind, implement a default that actually
-	does something.  Free as to the old interface.
-	(camel_folder_append_message): Changed to accept a
-	camelmessageinfo rather than flags, which just doesn't have enough
-	info in it.
-	(copy_message_to): Change for append_message api change.
-	(move_message_to): Likewise.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_free):
-	Implement.
-	(mbox_append_message): Fix for api change, and also copy user
-	flags/tags across to new summary.
-
-	* camel-folder-search.c (search_user_tag): A search expression
-	that returns the current use flag by name.
-	(camel_folder_search_free_result): New function to free the result
-	of a search.
-
-	* camel-folder-summary.c: Bump summary version.
-	(message_info_new): 
-	(message_info_load): 
-	(message_info_save): 
-	(camel_message_info_dup_to): 
-	(camel_message_info_free): Added support for arbitrary tag/value
-	pairs (CamelTag's).
-	(camel_tag_get): 
-	(camel_tag_set):
-	(camel_tag_list_size):
-	(camel_tag_list_free): Operations for working with CamelTags.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.c (camel_store_get_folder): Connect beforehand, if
-	necessary.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Default
-	the dir_sep to "/" so that certain functions can safely assume that
-	dir_sep is valid (at least, nonnull).
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): Get rid of an unused variable.
-
-	* providers/nntp/Makefile.am (INCLUDES): Fix includes so that we
-	don't use installed headers anymore.  [I copied this over from the
-	IMAP provider, that does not seem to have this problem.]
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Reorder search result in summary order if we searched with a
-	summary.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-uid-cache.c: New code to keep an on-disk cache of what
-	UIDs have been seen in a folder.
-
-	* camel-provider.h: Add new flags CAMEL_PROVIDER_IS_SOURCE (mail
-	can arrive in it by non-Camel means) and CAMEL_PROVIDER_IS_STORAGE
-	(you can work with mail directly without needing to copy it local).
-
-	* providers/*/camel-*-provider.c: Add flags as needed: imap and
-	mbox are SOURCE and STORAGE. mh and nntp are just STORAGE, pop3 is
-	just SOURCE.
-
-	* camel-mime-message.c (process_header): Add another subject
-	g_strstrip that fejj's earlier commit missed.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* camel-provider.h: Remove some GTK stuff that I missed.
-
-	* providers/imap/camel-imap-store.c (imap_noop): Turn this
-	back on with the new timeout interface in CamelSession.
-
-	* camel-session.[ch] (camel_session_register_timeout): New
-	interface for Camel to register timeouts. Basically the
-	GTK timeout interface is copied. We do this because Camel isn't
-	allowed to use GTK anymore.
-	
-2000-08-07  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Only retry
-	another uid if we had a name clash, otherwise fail.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If we are trying to get a
-	subfolder listing of the root folder, always make sure INBOX is
-	there...
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): 
-	Check for NIL as a directory separator.
-
-2000-08-07  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am: Reorder the INCLUDES to pull
-	in the camel headers from the local source tree before
-	the ones in $(includedir). This was causing compile problems
-	because the installed, Gtk-based camel-object.h was included
-	before the uninstall Camel-based one.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Strip
-	all \n's from the expression
-
-	* string-utils.c (strip): New convenience function to strip
-	occurences of a single char from a string
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Do a
-	g_strstrip on the subject so we can stop getting those annoying
-	leading spaces
-
-2000-08-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep): Fix this to not require
-	NULL-termination of the array.
-
-2000-08-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): If we fail to
-	get a dir_sep, then supply the default of "/".
-	(get_folder): Undo changes by Peter
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Prevent a coredump
-	when get_folder()ing from a store with dir_sep = NULL.
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.h: Include camel-object.h. Ettore said this wasn't
-	compiling.
-
-2000-08-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-url.c (camel_url_set_protocol): 
-	(camel_url_set_host): 
-	(camel_url_set_path): 
-	(camel_url_set_port): Url editing functions.
-
-2000-08-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_set_message_flags): 
-	(pop3_sync): Indexes into the flags array are message_number minus
-	1, not just message_number.
-
-	* providers/pop3/camel-pop3-store.c: add a debugging macro for
-	doing protocol tracing.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only
-	call imap_get_summary_internal if the folder can hold messages
-
-	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): 
-	Initialize the service_cache for the news/nntp providers
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am (INCLUDES): Add -I$(top_srcdir) to
-	pull in libibex/ibex.h
-
-2000-08-02  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Expunge
-	from the end, so the index isn't messed up when you remove a
-	message.
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Fix a bug
-	where it would never open an output file/uid.
-
-	* providers/mbox/camel-mbox-store.c (rename_folder):
-	Implementation for mbox as well.
-
-	* camel-store.c (camel_store_rename_folder): New method to rename folders.
-	(rename_folder): Default implementation.
-
-	* providers/mh/camel-mh-store.c (delete_folder): Implement this.
-	(rename_folder): Implement a rename operation.
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* providers/MH: Kill this. It doesn't have any code to do anything
-	the new mh provider doesn't do better.
-
-	* providers/Makefile.am: Remove reference to MH subdir, and
-	promote nntp to fully-supported status, since it does compile and
-	all.
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Trim
-	trailing space from the subject. I've now seen replies from two
-	different people that tricked the threading code by (a) not having
-	References/In-Reply-To, and (b) adding an extra space to the end
-	of the subject line so the subject-based threading fails too. Who
-	writes these broken mailers anyway?
-
-2000-08-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): When forced
-	to use the IP, place it in square brackets.
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New and
-	improved sexp parser. An honest try at using e-sexp is wrapped in
-	a #ifdef at the bottom of the file but is currently not used
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	We want to do a UID SEARCH so we get UIDs back instead of sequence
-	numbers
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh: New mh provider implementation.
-
-	* providers/Makefile.am (SUBDIRS): Added mh provider.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info_internal): 
-	Some IMAP servers don't wrap the UID in ()'s so don't depend on that
-	(imap_get_summary_internal): Same
-
-	* providers/imap/camel-imap-utils.c (free_sexp_node): Oops, forgot to
-	free node->function - not good.
-
-2000-07-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Add
-	a NULL to the matches pointer array so that g_strfreev knows where
-	the end is.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New
-	convenience function to translate a Camel sexp into the equivalent
-	IMAP sexp.
-
-	* providers/imap/camel-imap-store.c: More places now use
-	imap_next_word
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Implemented initial version (this may or may not work quite right)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Make sure
-	the third word/token (whatever) is "EXPUNGE" and not something
-	else like "EXISTS" or "RECENT". When removing the message from
-	the summary also make sure to free that data to avoid leakage.
-	Also make sure to subtract 1 from the 'id' since IMAP starts
-	at 1 and our summary starts at 0 :-)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c (camel_imap_status): Cleaned
-	up a bit, now uses imap_next_word()
-	(camel_imap_command_extended): Now uses imap_next_word(). When
-	checking for RECENT, allow the first digit of the recent-count
-	be between 0 and 9 inclusive instead of exclusive.
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Optimized.
-	No longer will it need to reload the summary as it now instead
-	removes the appropriate message summaries from the cache.
-	(camel_imap_folder_changed): If recent == 0 then return. If 
-	recent < 0 then just emit the folder_changed signal, don't reload
-	summaries.
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Get message count when STATUS
-	is not available.
-	(imap_init): folder->has_search_capability is required for IMAP so
-	should always be set to TRUE (is currently being set to FALSE as
-	I've not yet implemented SEARCH support).
-	(camel_imap_folder_changed): Seem to have fixed my optimization
-	hack
-
-2000-07-28  Jon K Hellan  <hellan@acm.org>
-
-	* providers/imap/camel-imap-store.h (CamelImapServerLevel): New
-	enum.
-	(CamelImapStore): Added server_level and has_status_capability
-	members.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Detect
-	IMAP4REV1, IMAP4 and STATUS in capability response.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Use STATUS only if server
-	supports it. TODO: Get message count when STATUS not supported.
-	(imap_get_message, imap_get_summary_internal,
-	imap_get_message_info_internal): Handle IMAP4 as well.
-	(imap_protocol_get_summary_specifier): New function: Make a data
-	item specifier for the header lines we need, appropriate to the
-	server level.
-
-2000-07-27  Peter Williams <peterw@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_lwsp): More
-	checks for end of string.
-
-	* providers/imap/camel-imap-store.c:
-	(imap_command_extended): Free the elements of our
-	array (huge mem leak)
-
-	* providers/imap/camel-imap-folder.c:
-	(summary_get_internal): Same as above.
-	
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Fixed my routine to only fetch new headers, my IDs were off by 1
-	on the high end, so when it would fetch the last newly arrived
-	message it would fail and end up fetching all of the summaries
-	because of the corruption.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): If the path doesn't begin
-	with a / and there is a host, prepend a / to the path.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/Makefile.am: Added camel-imap-utils.[c,h]
-	
-	* providers/imap/camel-imap-utils.[c,h]: Utilities for parsing
-	server responses for use in both camel-imap-store.c and
-	camel-imap-folder.c
-	
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Free all the pointers in the headers array.
-	(imap_get_subfolder_names_internal): Updated to use
-	imap_parse_list_response
-	(imap_parse_subfolder_list): Removed in favor of
-	imap_parse_list_response
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Free all the pointers in the data array.
-	(imap_connect): Updated to use imap_parse_list_response and fixed
-	a leak
-	(folder_is_selectable): Updated.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Now
-	uses a hash table for looking up message info rather than a linear
-	search :)
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* providers/*/Makefile.am: Don't specify SUBDIRS =
-	[nothing]. Messes up distcheck.
-	
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-mime-parser.c (folder_scan_init): Initialize
-	outbuf to be "" -- it's not guaranteed to be zeroed.
-	
-	* camel-mime-utils.c (header_references_decode): Return
-	if the header is NULL -> or "" <-. Don't do our stupid
-	mailer trick if we point to \0.
-	(header_decode_quoted_string): Don't rip past end of 
-	string!
-	
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c (movemail_external): routine to call an
-	external movemail program.
-	(camel_movemail): Nuke return value, use movemail_external when
-	available and useful, and don't delete "dest" on errors, since
-	it might have started non-empty.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): Should now always prepend a '/'
-	before the path if it doesn't already exist.
-
-	* providers/imap/camel-imap-folder.c: Fixed a few compiler warnings
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Fixed the
-	real problem that Peter was running into.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.c (write_to_stream): Don't add a Mime-Version
-	header to a message that already has one.
-
-	* camel-internet-address.c (internet_encode): Don't put <>s around
-	addresses with no name part.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Set 
-	imap_folder->summary to NULL after calling imap_summary_free,
-	so we don't get stuck with a junk summary pointer. Should
-	we free it at all?
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Optimized to try and get the new message headers without reloading
-	the entire summary from scratch.
-	(imap_get_summary_internal): Will now sync() before attempting to
-	reload the summary so that flags are set in the reloaded summary
-	as well.
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Updated to give
-	special attention to the root folder.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): Updated to handle the root
-	folder
-	(imap_get_message_count_internal): return 0 if folder can't hold
-	messages
-	(camel_imap_folder_new): Change so that root folder gets special
-	attention and always gets can_hold_messages set to FALSE
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods that
-	work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_uids,
-	get_summary, get_subfolder_names. Turn camel_folder_delete_message
-	into a macro. (Mostly a pull-up from the camel-async branch.)
-
-	* providers/{imap,mbox,nntp,pop3,vee}: Update for CamelFolder
-	changes
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Updated
-	to port easily to the new Camel API
-	(imap_init): Don't SELECT INBOX, we don't need to do that
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	Initialize the summary and subfolder listing.
-	(imap_summary_free): Now takes a GPtrArray arg rather than a 
-	CamelImapFolder as it increases it's usefullness for free()'ing
-	temporary summaries.
-	(imap_get_message_count_internal): A new convenience function for
-	getting the actual message count on a server to be used by 
-	imap_get_summary_internal)
-	(imap_get_message_count): Since the Camel API is on the move again, 
-	the future version of this function will not be able to make a
-	call to the store, it must only access previously fetched data (thus 
-	the creation of the _internal function)
-	(imap_get_subfolder_names_internal): Again, because the future version
-	of imap_get_subfolder_names will not take an exception, we must rename
-	this function which will be called by camel_imap_folder_new()
-	(imap_get_subfolder_names): We now return the previously collected
-	subfolder listing that the _internal function fetched previously
-	(imap_get_summary_internal): Again, same idea as the previous _internal
-	functions...
-	(imap_get_summary): Again... now returns a previously aquired summary
-
-	* providers/imap/camel-imap-store.c (imap_noop): This will hopefully
-	prevent the imap store from disconnecting.
-	(imap_connect): Modified to add a gtk timeout event that will call
-	imap_noop() every 10 minutes (we may want to change this time value)
-	(imap_disconnect): Modified to remove the NOOP timeout event from the
-	store.
-	(camel_imap_command_extended): Commented out the code that would try
-	and detect if the store was disconnected and then reconnect if it was
-	needed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which
-	was not used, and not implemented by any provider.
-
-	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid
-	non-implementation.
-
-	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,
-	camel-marshal-utils.[ch]: Bye bye bye.
-
-	* Makefile.am: remove reference to camel-arg-collector.c
-
-2000-07-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Made it a
-	little more forgiving. Also set current_folder to NULL as there is
-	no selected folder after a disconnect.
-	(stream_is_alive): Detects whether or not a socket is "alive"
-	(camel_imap_command_extended): Use stream_is_alive() to aid in the
-	detection of a disconnected state.
-
-2000-07-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Clear
-	CamelExceptions when appropriate (eg when folder is marked as
-	\NoSelect). Still needs some cleanup and perhaps Dan will have a
-	better way of doing this as this seems like a messy way of
-	handling this.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Took out
-	some debug statements as they are no longer needed.
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_subfolder_names):
-	Updated to not strip out subfolders that are marked as \NoSelect
-	because this will be correctly handled in store->get_folder from
-	now on.
-
-	* providers/imap/camel-imap-store.c (folder_is_selectable): New
-	convenience function for use in get_folder().
-	(parse_list_response): Now takes a char **flags argument which is
-	needed by folder_is_selectable().
-	(imap_connect): Updated to reflect changes to
-	parse_list_response().
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated with
-	some of the same fixes I've made to camel-imap-folder.c like
-	recalculating message part lengths.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Rewrote the code to check for "* %d RECENT". Still needs to be
-	modified, but should no longer cause an infinite loop by detecting
-	mis-detecting RECENT messages.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary):
-	(imap_get_message_info): Oops. Fix UID parser to allow 0 and 9 to
-	be in the range of valid UID chars.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_object_unref): Add a new global mutex
-	'refcount' held when refcounting operations occur.
-
-2000-07-19  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): Correct the recursiveness;
-	the locklevel is stored as a private, so each thread has its own
-	idea of the locklevel. Thus one thread can relock, but a different
-	one will think that it's a level 0 and try to lock the type_system
-	mutex.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: General cleanup working
-	towards getting Actions->Expunge working correctly.
-
-	* providers/imap/camel-imap-store.c
-	(cammel_imap_command_extended): Added code to look for "* %d
-	RECENT" and to emit the folder_changed signal if there are any
-	recent messages. Note: this is a hack and needs to be rewritten
-	badly.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): If the
-	folder's message count is not the same as the number of summaries,
-	free the old summary and create a new summary.
-
-2000-07-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(camel_imap_folder_class_init): Added in
-	imap_[g,s]et_message_user_flag() methods
-	(imap_get_message_info): Rewrote to use the more efficient way of
-	downloading summary information and also added a UID comparison so
-	that if the UID requested doesn't match the UID received, it
-	returns NULL.  FIXME: When the mailer gets NULL when it requested
-	message info, it seems that it displays a row for that message and
-	when you try and select the blank row, it segfaults.
-
-	* providers/imap/camel-imap-store.c (get_folder): Oops, this
-	should not be checking against "/", it should be checking against
-	dir_sep.
-
-	* providers/imap/camel-imap-folder.c (imap_parse_subfolder_line):
-	Updated to trim out the leading namespace.
-	(imap_get_subfolder_names): Let the subfolder parser trim the
-	namespace off the folder name.
-
-2000-07-17  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): New function; the
-	Camel type_system lock is now fakey-recursive, being controlled
-	by a semaphore that goes up and down and is protected by another
-	lock. Theoretically all we need is the lock on the semaphore,
-	but this we catch exceptions "better" (by deadlocking).
-	(camel_type_lock_down): Corresponding to above.
-	(all functions): s,G_LOCK,camel_type_lock_up, etc.
-
-2000-07-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Send a
-	"LOGOUT" command.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Hacks to
-	get IMAP code to work with CommunigatePro and MS Exchange (and any
-	other servers that send back a UID at the end of each FETCH inside
-	of the main body of the message part).
-	(imap_sync): Un-#if 0 the code that sets the flags on the IMAP
-	server for messages that have changed. Oops, don't mask with
-	DELETED to find out if the message has been answered ;-)
-	(imap_expunge): sync before expunging.
-
-2000-07-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed.
-	(imap_connect): Moved service_class->connect() to the point right
-	after a connection is established with the server rather than
-	waiting until the end of the function.
-	(camel_imap_command): Updated the documentation comment
-	(camel_imap_command_extended): Before sending a command, first
-	check to make sure we are connected; if we aren't, then reconnect.
-	Don't strncmp() command with "SELECT" as it's redundant.
-
-	* providers/imap/camel-imap-folder.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed. Also s/camel_imap_command/camel_imap_command_extended as
-	I will probably be doing away with camel_imap_command() or at least
-	only using it for LOGIN and similar commands where the server won't
-	notify us of any recent messages.
-
-2000-07-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	One last fix to get rid of hard-coded "/" directory separators
-
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c : Implement 'events', which are suspiciously
-	like signals except without all the marshalling baggage, and
-	with quasi-thread-safety.
-	(camel_object_class_declare_event): New func.
-	(camel_object_hook_event): Ditto.
-	(camel_object_trigger_event): Ditto.
-	(obj_class_init): Declare the "finalize" event.
-	(obj_class_finalize): Free the hashtable of events->preps
-	(obj_finalize): Free the hashtable of events->hooklists
-	(camel_object_unref): Trigger the finalize event (ourselves,
-	to prevent massively unpleasant looping things.)
-	
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-object.c (make_global_classfuncs): Change to return
-	a CamelObjectClass. Change parents to a GSList and free it
-	when done.
-	(camel_object_new): Don't allocate a classfuncs for every object;
-	merely give it a reference to the global_classfuncs. Convert
-	parents to a GSList and free it when done.
-	(camel_object_unref): Don't free the classfuncs. Free the parents
-	list, which is changed to a GSList.
-
-2000-07-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* string-utils.c (string_unquote): New convenience function
-	to unquote a string if it's encapsulated by "'s
-	
-	* providers/imap/camel-imap-folder.c:
-	* providers/imap/camel-imap-store.c: Made the necessary changes
-	to stop using hard coded directory separators.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	If the summary is for a smaller mbox, and rebuilding from the
-	last-known end position fails, try rebuilding from the beginning.
-	Deals with the case where the user edits the mbox and makes it
-	bigger, without adding new messages.
-
-2000-07-13  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c: Rewritten to not be based on GtkObject,
-	but a tiny threadsafe ripoff thereof. Objects still cannot
-	be shared across threads, but ref/unref/destroy/new/etc
-	will work. Signals are not implemented because doing it
-	robustly would be a major pain in the butt, but class
-	functions are. There's a small demonstration that it doesn't
-	crash in ./temp-test.c: build it with ./make-test.sh.
-	* camel-stream.c, camel-seekable-stream.c, camel-stream-mem.c:
-	moved over to CamelObject. Proof of concept: two levels of
-	subclass and class functions, all working without coredumps.
-	To port to CamelObject:
-	- s,GTK_,CAMEL_,g in the cast checks
-	- s,gtk_type_new,camel_object_new,g
-	- s,GtkType,CamelType,g
-	- Change get_type function over to camel_type_declare
-	- instead of hooking to finalize function, it goes into the
-	  type declaration.
-	- remove signals.
-	- instead of GTK_OBJECT(so)->klass, CAMEL_OBJECT_GET_CLASS(so)
-	- s,gtk_type_class,camel_type_get_global_classfuncs,g
-	- don't chain finalize handlers; it will be done for you
-	
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: If a SELECT fails, set
-	imap_store->current_folder to NULL so a SELECT is forced before
-	any message/folder operations are requested. Also, because some
-	users don't use a namespace, make sure that if the url->path is 
-	"/" we don't use it when creating the folder_path.
-	(camel_imap_command[_extended]): Since we allow the passing of
-	a NULL folder which we can use to bypass a forced SELECT, no need
-	to check for the individual commands that don't require a folder
-	to be selected.
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: Updated to use CAMEL_IMAP_OK, 
-	CAMEL_IMAP_NO, CAMEL_IMAP_BAD, and CAMEL_IMAP_FAIL rather than the 
-	ones copied from the POP3 provider. 
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Oops.
-	If the number of messages in the folder is 0, don't fetch
-	summaries 1 thru 0, just return an empty summary.
-	(imap_copy_message_to): Fixed to use message UID and also send
-	the source folder as an arg to camel_imap_command rather than NULL.
-	(imap_move_message_to): Same.
-	(imap_init): If SELECT is successful, we need to set the current
-	folder to the one selected, this was causing problems with move/copy
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags
-	parallel to the _NEED_* flags, and make the _NEED_* flags imply
-	the _ALLOW_* ones.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): imap
-	urls ALLOW_PATH
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): New
-	and improved approach to fetching an entire folder summary
-	that should be much much faster than the old way as it gets
-	the entire folder summary in 1 shot rather than requesting
-	message by message. As with the last update, this version
-	also only fetches the minimum number of header fields.
-	(imap_get_summary): Oops, forgot to free the temp 
-	GPtrArray *headers
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Don't
-	fetch the entire RFC822 header, just fetch the fields we want.
-	(imap_get_message_info): Same.
-
-2000-07-13  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (camel_mime_filter_basic_new_type):
-	Reset filter on setup.
-	(reset): When resetting qp encoding, set the state to -1, instead
-	of 0.
-
-	* camel-mime-utils.c (quoted_encode_step): Actually count the
-	characters output sofar (it never counted any).  Bunch of other
-	fixes.
-	(quoted_encode_close): Also flush out final character, if there's
-	one.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Chris forgot to add #include <e-util/e-util.h> to the source files
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Fixed Peter's 
-	fix, we don't want to send a string to a %d.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, providers/imap/camel-imap-store.c:
-	Changed from strstrcase to e_strstrcase.
-
-	* string-utils.c, string-utils.h: Removed strstrcase (in favor of
-	e_strstrcase in e-util/e-util.c.)
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): get the article num out of our
-	uid and mark it read in the newsrc.
-	(nntp_folder_get_message): get the message id out of the uid to
-	fetch the article.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): the uid
-	is now <article-num>,<messageid>
-	(get_HEAD_headers): same.
-
-	* camel-mime-parser.c (folder_scan_step): go to HSCAN_MESSAGE
-	state when ct->subtype is "news" as well as "rfc822".  this makes
-	attachments of type "message/news" display properly.
-
-2000-07-12  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep,
-	camel_folder_free_shallow, camel_folder_free_nop): Useful default
-	implementations for free_{uids,subfolder_names,summary}.
-	(free_subfolder_names, free_uids): Make these g_warning-ing
-	default implementations.
-
-	* providers/*/camel-*-folder.c: Use the new functions where
-	appropriate, remove duplicated code.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): Check for
-	NULL parameters when setting the exception so as to not crash on
-	Solaris (can't handle a %s passed NULL).
-	(imap_connect): Same.
-	
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message): Use
-	mbox_set_message_flags () instead of setting the flags by hand. This
-	fixes the problem of the "message_changed" signal not being emitted
-	at the correct time.
-
-	* providers/imap/camel-imap-folder.c: "folder_changed" signals should
-	pass a third argument (which is ignored).
-
-	* camel-folder.c: Undo gtk signal emits done in set_flags and 
-	expunge.
-	(move_message_to): 
-	(copy_message_to): Create info as a const CamelMessageInfo
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am: don't add test-newsrc to the build
-	since it needs libcamel (which isn't built at the time test-newsrc
-	needs linking.)
-
-	* providers/nntp/camel-nntp-utils.c (get_HEAD_headers): fill in
-	MessageInfo->message_id.
-	(get_XOVER_headers): same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init): move
-	summary loading here.
-	(nntp_folder_sync): summary/newsrc changes should be stored here.
-	put a comment to that effect.
-	(nntp_folder_set_message_flags): don't save the newsrc here.
-	(nntp_folder_get_uids): use g_ptr_array_index instead of the
-	cast/addition.
-	(nntp_folder_get_summary): no need to check if we should generate
-	the summary here.  already done.
-	(nntp_folder_get_message_info): implement.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use evolution_dir instead of
-	computing it ourselves.
-	(nntp_store_disconnect): call camel_nntp_newsrc_write.
-	(ensure_news_dir_exists): new function to create the news/<news
-	server> subdir.
-	(camel_nntp_store_class_init): hook up connect/disconnect and
-	finalize.
-	(nntp_store_connect): if ensure_news_dir_exists fails throw an
-	exception.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_set_message_flags): Emit a message_changed
-	signal once the flags are set on the message.
-	(camel_folder_set_user_flag): Ditto.
-	(camel_folder_expunge): Emit a folder_changed if no exception.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-stream.c: Use size_t and ssize_t for read/write methods
-	
-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): 
-	Updated to emit the message_changed signal.
-	(imap_delete_message): Updated to use imap_set_message_flags ().
-	(imap_move_message_to): Updated to use imap_set_message_flags ()
-	and to emit the folder_changed signal on the destination folder.
-	(imap_copy_message_to): Updated to emit the folder_changed signal 
-	on the destination folder.
-	(imap_append_message): Updated to emit the folder_changed signal 
-	on the destination folder.
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_append_message): Now takes a
-	flags argument to specify the flags to be set on the message
-	since we might not necessarily want the flags to be wiped clean.
-	(move_message_to):
-	(copy_message_to): Updated to send a flags argument to 
-	append_message (); currently sends the original message's flags.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	* providers/imap/camel-imap-folder.c (imap_append_message): 
-	Updated.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods
-	that work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_message_uid,
-	get_uids, get_summary, get_subfolder_names. Turn
-	camel_folder_delete_message into a macro.
-
-	* providers/{mbox,pop3,vee}: Update for CamelFolder changes
-
-	* providers/Makefile.am: Disable imap and nntp for now
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression): 
-	This shouldn't return NULL, it should return g_ptr_array_new ()
-	so the mailer gets what it expects.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_decode_string): 
-	Oops, an unsigned integer can never be < 0
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Initialize a variable to make this not crash again. And fix a bug
-	so it actually does something.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c: Cleaned up a bunch of compile warnings
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee: kill more debugging messages
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_unread_message_count): 
-	* providers/vee/camel-vee-folder.c (vee_get_unread_message_count): 
-	* providers/imap/camel-imap-folder.c (imap_get_unread_message_count):
-	Implemented.
-
-	* camel-folder.c (camel_folder_get_unread_message_count): New
-	convenience function to allow the mailer to query the number
-	of unread messages in a folder (for displaying message stats
-	in a folder tree?).
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_dup): New function to copy
-	a header_references structure.
-
-	* camel-folder-summary.c (camel_message_info_dup_to): New function
-	to (deep) copy the data from one CamelMessageInfo into another.
-	(camel_message_info_free): And free the data.
-
-	* providers/vee/camel-vee-folder.c (vee_sync): Implement. (empty).
-	(vee_search_by_expression): belatedly update for
-	camel_folder_search change.
-	(vee_folder_build): belatedly update for camel_folder_search
-	change. Use camel_message_info_dup_to and camel_message_info_free
-	(in particular, so that we get message_id and references info so
-	vfolders can be threaded).
-	(vee_folder_build_folder): Ditto.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-store.c: Update to reflect past changes
-	in the Camel API. Use gtk macro casts wherever possible and use glib's
-	memory functions instead of standard c's (since they are not 
-	compatable)
-
-	* providers/smtp/camel-smtp-transport.c: 
-	* providers/imap/camel-imap-store.c: Wrap debug print statements
-	in a macro
-
-	* providers/imap/camel-imap-stream.c (stream_read): Make sure
-	that we get up to and including the last \n of the mime part.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Make sure
-	that we get up to and including the last \n of the mime part.
-	Wrap debug print statements in a macro.
-
-	* providers/imap/camel-imap-stream.c (stream_read): Only cache
-	the important data (aka the mime part requested and no extra
-	server response stuff)
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Work around
-	In-Reply-To's with unquoted punctuation. So many broken mailers.
-
-	* camel-folder.c (camel_folder_search_by_expression): Make this
-	return a GPtrArray rather than a GList.
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	* providers/nntp/camel-nntp-folder.c (nntp_search_by_expression):
-	Update to return a GPtrArray rather than a GList.
-
-2000-07-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (esmtp_get_authtypes): 
-	Fixed the parser to actually work
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Make this deal
-	with the full RFC822 References/In-Reply-To format rather than
-	just the more-nicely-behaved RFC1036 version. (Needed to parse
-	In-Reply-To headers with extra junk in them.)
-
-2000-07-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Parse for
-	more header information to allow message threading in IMAP.
-	(imap_get_message_info): Same.
-
-	* camel-folder-summary.c: Renamed summary_format_* to
-	camel_summary_format_* and moved them into public scope.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Oops. Don't
-	pass port # as a string in the error code (if it fails to connect).
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Changed
-	over to camel_imap_command_extended as that was the source of the
-	problems - apparently appending replies with more than just 1 line.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-search.c (search_header_contains): make header
-	matching case-insensitive
-
-	* camel-folder-summary.c:
-	* camel-session.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-summary.c: Remove some non-error case
-	debugging-type messages.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that
-	we get rid of a ton of debugging messages.
-
-2000-07-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.h: Added prototype for uudecode_step
-
-	* camel-mime-utils.c (uudecode_step): Cleaned up some junk that
-	should have been cleaned up when debugging printf's were taken out.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Update the X-Evolution: header even if the in-memory UID and the
-	saved UID are not the same.  Otherwise mboxes with clashing UIDs
-	can never be fixed.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_add_from_parser): Add the message to the
-	summary before doing any ibex stuff.  In fact, this might also
-	have the side effect of reassigning the UID so it needs to be done
-	before we start using the UID.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Add
-	debugging message to keep track of the UIDs we add.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c: Add "Cc" to summary and bump summary
-	version number.
-
-	* camel-folder-search.c (search_header_contains): make "Cc" a
-	searchable header.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_next_uid_string):
-	New.
-	(camel_folder_summary_add): Use
-	`camel_folder_summary_next_uid_string()' instead of recomputing
-	the UID manually here.
-	(camel_folder_summary_add_from_parser): Likewise.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): Removed.
-
-2000-07-03  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Parse In-Reply-To
-	with header_references_decode, not header_msgid_decode.
-
-	* camel-mime-message.c (camel_mime_message_class_init): message
-	headers are case-insensitive.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fix a
-	bug in error-setting code.
-	(pop3_connect): Don't re-prompt for password in the KPOP case.
-	(pop3_get_response): New function, split out from
-	camel_pop3_command.
-	(connect_to_server): Use pop3_get_response to parse the greeting
-	message, and error out appropriately if it's -ERR.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_freeze, camel_folder_thaw): New
-	functions to freeze and thaw a folder (to prevent message/folder
-	changed signals in the middle of a long series of operations).
-	(camel_folder_class_init): Change signals to GTK_RUN_FIRST.
-	(message_changed, folder_changed): Add default implementations
-	that stop the emission and record info for later if the folder is
-	frozen.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_sync): leftover fixes
-	from the close->sync change: don't destroy the ibex, summary, and
-	search when syncing.
-	(append_message): emit "folder_changed" on a successful append.
-
-2000-07-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (uudecode_step): A rather complex uudecoder
-	written in the spirit of Zucchi-ness, is it up to par? Only the 
-	Z-man can tell us :-)
-
-2000-07-01  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_get_name): New method, to return
-	an end-user-friendly name corresponding to a service. (eg, "POP
-	service for danw on trna.helixcode.com").
-
-	* providers/imap/camel-imap-store.c,
-	providers/mbox/camel-mbox-store.c,
-	providers/nntp/camel-nntp-store.c,
-	providers/pop3/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail-transport.c,
-	providers/smtp/camel-smtp-transport.c: Implement.
-
-	* providers/imap/Makefile.am: remove unneeded
-	libcamelimap_la_LDADD.
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): fix the
-	CAPA-parsing code to not get into an infinite loop.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed
-	the bug that would sometimes leave part of the server response
-	tacked on to the end of the message.
-
-	* camel-folder.c: Renamed _by_uid methods. Since we no longer
-	have get-by-number methods, no need to have the _by_uid 
-	extensions. 
-	(get_message_by_uid): Renamed to get_message
-	(delete_message_by_uid): Renamed to delete_message
-	(summary_get_by_uid): Renamed to get_message_info
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/pop3/camel-pop3-folder.c:
-	* providers/imap/camel-imap-folder.c:
-	* providers/vee/camel-vee-folder.c: Updated to reflect
-	camel-folder changes.
-
-2000-06-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_copy_message_to): New function, to
-	copy a message from one folder to another. The default
-	implementation just uses append_message, but providers can 
-	implement more efficient versions for use when both folders are on 
-	the same store.
-
-	* broken-date-parser.[c,h]: Utilities for parsing broken
-	date strings.
-	
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): 
-	(imap_copy_message_to): Implemented.
-
-	* camel-mime-utils.c (header_decode_date): Wrote some code to try
-	and un-mangle broken date formats and then parse that new string 
-	instead.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_move_message_to): New function, to
-	move a message from one folder to another. The default
-	implementation just uses append_message and delete_message, but
-	providers can implement more efficient versions for use when both
-	folders are on the same store.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Should now
-	print a meaningful error message when it doesn't succeed
-
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Changed to
-	keep prompting user for a valid password until it either
-	authenticates or until Canceled by the user.
-	(camel_imap_command_extended): Improved speed (replaced the
-	g_strjoinv call with a faster implementation)
-
-	* providers/pop3/camel-pop3-store.c 
-	(camel_pop3_command_get_additional_data): Fixed.
-	(pop3_connect): Changed to keep prompting the user for a
-	password until it either works or until Canceled by the user.
-
-	* providers/mbox/camel-mbox-summary.c: General cleanup
-	(camel_mbox_summary_sync): Fixed a memory leak and added
-	CamelException handling.
-
-	* providers/mbox/camel-mbox-store.c (delete_folder): Fixed a 
-	memory leak
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	Default 'off_t seek' to -1 so as to make sure it's initialized
-	before it's used in the case of a bad stat() call.
-	(mbox_sync): Updated
-	(mbox_expunge): Updated
-
-2000-06-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Move the 
-	CAPABILITY command here so we don't have to keep checking
-	each time we open a folder.
-	(camel_imap_command_extended): If we are doing an EXAMINE,
-	don't bother doing a SELECT first.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Update so
-	folder->has_search_capability depends on the parent IMAP store
-	(since this is really dependant on the IMAP implementation and
-	not the folder)
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Don't close the filter
-	stream when done with it (this causes the source stream to close);
-	Instead, just flush it when done.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* camel-folder-search.c (search_header_contains): Make header
-	search 'to' match 'to', and not 'from', small typo, fixes #317.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Added debugging
-	information.
-
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: 
-	* providers/imap/camel-imap-folder.c: Improved folder parsing.
-	Not specifying a namespace should no longer list the entire
-	filesystem.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/.cvsignore: ignore test-newsrc
-
-	* providers/nntp/camel-nntp-store.c,
-	providers/nntp/camel-nntp-store.h,
-	providers/nntp/camel-nntp-folder.c,
-	providers/nntp/camel-nntp-folder.h,
-	providers/nntp/camel-nntp-utils.c: Bring the nntp provider up to a
-	state where it builds and is usable with the current camel.  there
-	are still warts (semi-broken .newsrc file handling, and a lack of
-	a subscribe ui -- in fact no way to add a new server, really), but
-	it'll display news messages.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-newsrc.c
-	(libcamelnntpinclude_HEADERS): add camel-nntp-newsrc.h
-	also, add test-newsrc stuff.
-	
-	* providers/nntp/test-newsrc.c: new file that tests the newsrc
-	stuff by parsing and regurgitating a .newsrc file for a particular
-	server.
-
-	* providers/nntp/camel-nntp-newsrc.c,
-	providers/nntp/camel-nntp-newsrc.h: new files, initial support for .newsrc files.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_count): 
-	Oops. Now appends the namespace to the folder before querying
-	for the number of messages.
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): New
-	convenience function for use by imap_create().
-	(get_folder): If folder is specified as "/", we really want
-	"INBOX".
-
-	* providers/sendmail/camel-sendmail-provider.c:
-	* providers/vee/camel-vee-provider.c:
-	* providers/smtp/camel-smtp-provider.c:
-	* providers/mbox/camel-mbox-provider.c:
-	* providers/pop3/camel-pop3-provider.c:
-	* providers/imap/camel-imap-provider.c: Updated
-	
-	* camel-session.c: Moved service_cache hash table into the
-	providers.
-	(service_cache_remove): Updated.
-	(camel_session_get_service): Updated.
-
-	* camel-url.c (camel_url_hash): Took out the hashing of
-	url->passwd. We don't want this anymore.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Took out
-	references to 'namespace'
-	(camel_imap_folder_init): Same
-
-	* providers/imap/camel-imap-folder.h: No more namespace. We are
-	instead going to use url->path as the namespace.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_create): Modified to
-	use the "namespace" (url->path) if it exists.
-
-	* providers/imap/camel-imap-folder.c (imap_delete_message_by_uid):
-	Now just sets the deleted flag on the summary rather than speaking 
-	directly to the IMAP server. This is both faster and cleaner.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Fix dumb
-	bug.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	We are getting mail in IMAP now!! whoo-hoo!. Stripped out the 
-	filtering so messages may have some dot-stuffing, but the 
-	filtering can always be added back in later when we know it 
-	works and isn't the problem.
-
-2000-06-21  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Use the basename
-	of the mailbox so we don't get pathnames like ~/evolution/inbox///movemail.ibex
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Set date_received
-	based on the first (most recent) "Received" header.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): flush the filter stream
-	before unreffing it, so it will camel_mime_filter_complete.
-
-	* camel-stream-filter.c (camel_stream_filter_class_init): Fix a
-	braino so camel_stream_flush works here.
-
-	* camel-stream-mem.c (stream_seek): Fix a bug that resulted in
-	large attachments being silently dropped.
-
-	* providers/pop3/camel-pop3-store.c
-	(camel_pop3_command_get_additional_data): Don't use g_strjoinv
-	here, since it is O(n^2) on the length of the output string, and
-	we can do O(n).
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): add a CRLF decoder
-	after the QP/B64 decoder if it's text.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Only
-	fetch the summary if the folder summary doesn't already exist.
-	When the summary *does* exist, start fetching from 1, not 0.
-	(imap_free_summary): Don't do anything here.
-	(imap_finalize): Free the summary here instead of in
-	imap_free_summary().
-	(imap_set_message_flags): Implemented
-	(imap_sync): Added code to set flags on messages that have had
-	their flags changed (however I #if'd it out until we are more
-	confidant in the IMAP code :)
-	(imap_summary_get_by_uid): Now parese flags correctly.
-	(imap_get_summary): Now parese flags correctly. Also correctly
-	parses the UID correctly.
-
-	* camel-url.c (check_equal): No need to check s1 if s2 is NULL
-	(camel_url_equal): Don't check the passwd component of the url.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_add): mark the
-	message info with CAMEL_MESSAGE_FOLDER_FLAGGED if we change the
-	uid, so the folder will know that it's dirty.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended): 
-	Now returns the last line of data that the server sends back as
-	well. This is needed for commands like SELECT (like Peter pointed
-	out).
-	(camel_imap_command): No longer checks for SELECT (no need)
-
-	* providers/imap/camel-imap-folder.c: Added namespace stuff
-	which we will need later on...
-	(imap_parse_subfolder_line): Convenience function for use in
-	get_subfolder_names()
-	(imap_get_subfolder_names): Updated. Also changed it to use LIST
-	instead of LSUB (temporary change).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init): Set
-	summary equal to NULL.
-	(imap_get_summary): Store the summary in the ImapFolder
-	(imap_summary_get_by_uid): If we have a summary cache in the
-	ImapFolder, first check to see if that message info is in the
-	cached summary first, if not fetch it directly from the IMAP
-	server and append it to the summary cache.
-	(imap_get_message_flags): Don't free the message info that we get
-	back from summary_get_by_uid as we don't want to be corrupting our
-	cached summary.
-
-2000-06-19  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command{,_extended}): When
-	SELECT'ing a folder for an IMAP command, use _extended to grab the entire
-	response (before we just used camel_imap_command and missed the OK codes)
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_get_by_uid): 
-	Now gets the message flags as it should.
-	(imap_get_summary): Same as imap_summary_get_by_uid
-	(imap_get_permanent_flags): Return the permanent flags stored
-	on the folder.
-	(imap_get_message_flags): Return message flags associated with
-	given uid. Note: we may want to somehow cache summary info so
-	that we don't have to keep querying the IMAP provider in
-	imap_summary_get_by_uid().
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_free_summary): We were
-	leaking memory - but not anymore!
-	(imap_get_summary): We now get the UIDs and the beginnings of the
-	code to get the message flags as well.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): Don't copy newlines
-	into the parsed header text, and turn any number of tabs and
-	spaces after a newline into a single space.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_init): Should now
-	correctly do CAPABILITY.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Add some debugging printfs
-	when rebulding summary to help figure out why people's summaries
-	are always being rebuilt.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Began to implement, need to get information on how to
-	deconstruct @expression into an IMAP search expression and
-	parse the results.
-	(imap_init): Now queries the IMAP provider for CAPABILITY to
-	determine if SEARCH is implemented or not.
-
-	* providers/imap/imap.c: Removed - no longer a need to have
-	this as an example for anyone interesting to help mecode IMAP
-	support.
-	
-2000-06-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Added code
-	to expunge if called for (still need to finish coding this).
-	(imap_get_uids): Implemented.
-	(imap_get_summary): Found a way to get the date
-	(imap_summary_get_by_uid): Same.
-	(imap_free_summary): Implemented.
-
-	* string-utils.c (strstrcase): Fixed a compile warning
-
-	* providers/imap/camel-imap-summary.c: Removed - we don't
-	need a CamelImapSummary structure.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	Move flag handling from CamelMimeMessage to CamelFolder. This
-	simplifies several flag-handling pieces of code in the mailer, and
-	lets you change a message's flags without having to fetch the
-	message body. It also means that fully-constructed
-	CamelMimeMessages are now essentially constant, which will help
-	simplify locking issues later since it means two threads
-	interested in the same message can just work with separate copies
-	of it.
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed flags
-	and user_flags (moved to summary). Removed expunged and
-	message_number which were unused. Removed message_uid and folder
-	which are no longer needed in the new scheme.
-	(struct CamelMimeMessageClass): Removed message_changed signal and
-	get/set_message_number methods.
-
-	* camel-mime-message.c: Updates for CamelMimeMessage changes.
-	(camel_mime_message_get/set_flags,
-	camel_mime_message_get/set_user_flag): Replaced with methods in
-	CamelFolder.
-	(camel_flag_get, camel_flag_set, camel_flag_list_size,
-	camel_flag_list_free): Moved verbatim to camel-folder-summary.c
-	
-	* camel-folder.c (camel_folder_get/set_message_flags,
-	camel_folder_get/set_message_user_flag): New methods (and
-	corresponding useless default implementations)
-	(camel_folder_class_init): add a message_changed signal
-
-	* camel-folder-summary.c (camel_flag_get, camel_flag_set,
-	camel_flag_list_size, camel_flag_list_free): Moved here from
-	camel-mime-message.c
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Removed.
-	(mbox_get_message_flags, mbox_set_message_flags,
-	mbox_get_message_user_flag, mbox_set_message_user_flag): Tweak
-	summary bits as appropriate. (Functionality moved here from
-	message_changed.)
-	(mbox_get_message_by_uid): Update for CamelMimeMessage changes
-	(less stuff to initialize).
-
-	* providers/imap/camel-imap-folder.c (message_changed): Remove
-	this. It was just copied from the mbox provider and doesn't deal
-	with the real IMAP flag stuff anyway. (So there's currently no
-	flag support in the IMAP provider.)
-	(imap_get_message_by_uid): Update for CamelMimeMessage changes.
-
-	* providers/vee/camel-vee-folder.c: (message_changed): Remove old
-	one. Add a new one to listen for message_changed on each folder
-	and re-emit message_changed signals that correspond to messages in
-	the vfolder.
-	(vee_get/set_message_flags, vee_get/set_message_user_flag): Proxy
-	flag setting to the underlying real messages.
-	(vee_append_message): Removed for now; there's no way to translate
-	this into the new CamelMimeMessage/CamelFolder scheme, but (a)
-	there's also no code which would ever call it and (b) we're
-	probably going want a better interface than append_message for
-	message drag and drop to work anyway. To be revisited.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): 
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): 
-	* camel-folder-summary.c (summary_build_content_info): 
-	KLUDGE! Since neither ETable nor GtkHTML supports UTF-8 yet,
-	output ISO-8859-1 instead, so Ettore can read his Italian mail. :)
-	This will be reverted later.
-
-2000-06-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Started to 
-	implement - may want to use ENVELOPE instead of BODY.PEEK[HEADER]
-	(imap_summary_get_by_uid): Started to code, I've got to find a way to 
-	get the date in time_t format and also get the flags
-
-	* string-utils.c (strstrcase): Added this convenience function - I
-	know about strcasestr() but it's not portable.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c: Remove camel_service_connect_with_url. (URLs
-	must be specified when the service is requested from the session,
-	so that there can only ever be one service for any URL.)
-
-	* camel-folder.c: (camel_folder_open, camel_folder_is_open,
-	camel_folder_get_mode): Kill. Folders are now always open, and
-	handle "closing" sorts of operations at sync or finalize time.
-	(camel_folder_sync): renamed from camel_folder_close. Syncs state
-	to the store but doesn't necessarily close/disconnect.
-
-	* providers/*/camel-*-folder.c: Merge "open" methods into "init"
-	methods. Rename close to sync and update appropriately.
-
-	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open
-	and camel_imap_store_close, which should not have been copied from
-	the POP provider (where the exist to work around limitations of
-	the POP protocol).
-
-	* providers/mbox/camel-mbox-summary.c: fix a bug. (don't expunge
-	deleted messages if called with expunge == FALSE)
-	
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Check
-	server for various interesting extensions.
-
-	* providers/pop3/camel-pop3-folder.c (get_uids): If the server
-	supports UIDL, use real UIDs rather than fake ones.
-	(etc): Map uids back to numbers appropriately
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to
-	previous change: make sure the "seek" variable ends up with the
-	value it should.
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	summary mtime as well as size.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): if the
-	mbox doesn't end with a '\n', write one before appending the new
-	message.
-
-2000-06-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-crlf.c (filter): Updated the encoder to allocate 
-	more memory (since we are also now adding dots). Also updated the
-	decoder as we have found that it sometimes passes the end of the 
-	buffer.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the
-	filter code (we already filter in 
-	camel_pop3_command_get_additional_data)
-
-	* camel-folder.c (init): Updated: a separator is now a char* rather 
-	than a single char because IMAP can have a string for a directory 
-	separator. Also, since IMAP does not begin with a directory separator,
-	there is a new argument (path_begins_with_sep) which decides if a 
-	directory should begin with a directory separator.
-
-	* providers/imap/camel-imap-store.c (imap_create): Since, on connect,
-	Camel tries to create INBOX (which already exists on every IMAP 
-	provider) we can return TRUE when the folder name is "INBOX".
-
-	* providers/vee/camel-vee-folder.c (vee_init): Updated.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Updated.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Updated.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Renamed from camel_mbox_summary_expunge. Takes a gboolean saying
-	whether to expunge or just sync the mbox file. Change some
-	g_errors to g_warning so we don't abort. Make the quick
-	X-Evolution updating code lseek around correctly. Update the
-	mbox mtime in the summary file even in the quick case.
-
-	* providers/mbox/camel-mbox-summary.h: make
-	CAMEL_MESSAGE_FOLDER_NOXEV not conflict with
-	CAMEL_MESSAGE_FOLDER_FLAGGED defined in camel-mime-message.h
-
-	* providers/mbox/camel-mbox-folder.c (mbox_close): call
-	camel_mbox_summary_sync to save flag state if not expunging.
-	(mbox_expunge): Update for camel_mbox_summary_expunge rename.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_open): 
-	(camel_imap_store_close): Added.
-	(camel_imap_command_extended): Fixed a segfault and updated
-	to use camel_imap_status()
-	(camel_imap_command): Updated to use camel_imap_status()
-	(camel_imap_status): New convenience function for parsing
-	the return status of an IMAP command
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	Works like the POP fetch code, should work temporarily until
-	we get around to coding it the way it "Should Be".
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Now uses
-	the camel-mime-filter-crlf decoder when retrieving messages.
-
-	* camel-mime-filter-smtp.c: Deprecated.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Updated to use
-	camel-mime-filter-crlf with my 'dot' extension in place of
-	camel-mime-filter-smtp
-
-	* camel-mime-part.c (write_to_stream): Updated to reflect changes
-	made to camel-mime-filter-crlf.c
-
-	* camel-mime-filter-crlf.c (filter): Modified to be able to
-	encode/decode dots ("\n.\n"<->"\n..\n"). Also fixed the decoder
-	so that it should no longer get caught in an infinite loop.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/*/Makefile.am: don't pass a second (incorrect) -rpath
-	in addition to the (correct) one automatically provided by
-	automake.
-
-	* camel-mime-filter-crlf.c: New filter to do CRLF<->LF conversion.
-	(Currently only tested in the LF->CRLF direction.)
-
-	* camel-mime-part.c (write_to_stream): if content-type is text,
-	and it's QP or B64 encoded, pass through the CRLF filter before
-	the other filter to satisfy the "canonical encoding" rules in the
-	MIME spec.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_query_authenticator): Add another
-	argument, "mode", which can be CAMEL_AUTHENTICATOR_ASK or
-	CAMEL_AUTHENTICATOR_TELL, so callers can get the app to un-cache
-	bad info.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): uncache the
-	password if it doesn't work.
-
-2000-06-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to reflect
-	changes made in camel-imap-store.c
-
-	* providers/imap/camel-imap-store.c (imap_create): No longer checks to
-	make sure a folder doesn't already exists (as this is no longer needed)
-	(camel_imap_command): Now takes a CamelFolder argument so it can detect
-	whether or not it needs to SELECT a folder or not
-	(camel_imap_command_extended): Same.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Will now always
-	send EHLO first, if that fails it will fall back on HELO.
-	(esmtp_get_authtypes): Should now correctly parse authtypes.
-
-2000-06-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Now builds (not that it's worth
-	much yet).
-	
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Now uses the 
-	correct cast to a CamelImapMessageInfo structure (should get rid of 
-	compile warnings).
-
-	* providers/imap/Makefile.am: Added rules to build 
-	camel-imap-stream
-	
-	* providers/imap/camel-imap-store.c (get_folder): Update.
-	Moved imap_create here.
-
-	* providers/imap/camel-imap-folder.c (delete_messages): Remove.
-	(imap_create): Removed.
-	(imap_delete): Removed.
-	(imap_exists): Removed.
-
-	* providers/imap/camel-imap-stream.h: Added typedef's for the stream
-
-	* providers/imap/camel-imap-stream.c: Modified to build cleanly
-
-2000-06-07  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_msgid_decode_internal): Properly
-	dereference warning/debug messages.
-	(header_references_decode): Check we actually have msgid stuff
-	before trying to decode it ...
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-imap-stream.[c,h]: Removed
-
-	* providers/imap/camel-imap-stream.[c,h]: Relocated to this
-	location
-
-	* providers/imap/camel-imap-summary.c: Added
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exists, create, delete. A CamelFolder
-	now always references an existing folder. Remove delete_messages
-	too since it wasn't being used. Add a "create" flag to
-	get_subfolder saying whether or not to create the subfolder if it
-	doesn't yet exist.
-
-	* camel-store.c (camel_store_get_folder): Add a "create" flag to
-	say whether or not to create the folder if it doesn't yet exist.
-	(camel_store_delete_folder): New method, moved from CamelFolder.
-	(cache_folder, uncache_folder): Fix up a bit.
-	(get_folder_name): Explain what this is for.
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/mbox/camel-mbox-store.c: Update. Remove support for
-	hierarchical folders to simplify this for now, since we're not
-	using it, and it's not completely clear how they should work in an
-	ELocalStorage world. Needs to be revisited.
-
-	* providers/pop3/camel-pop3-folder.c (delete_messages): Remove.
-	* providers/pop3/camel-pop3-store.c (get_folder): Update.
-
-	* providers/vee/camel-vee-folder.c (exists): Remove.
-	* providers/vee/camel-vee-store.c (vee_get_folder): Update.
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-*.[c,h]: Started on getting 
-	imap to build cleanly (tho some work has not been completed
-	so it still won't build until camel-imap-summary is finished
-	along with a few methods in camel-imap-folder)
-
-	* camel-stream.[c,h]: Changed the read and write method prototypes
-	to return an ssize_t type rather than an int and also changed
-	the 'number of bytes' to read or write to a size_t type
-
-	* camel-stream-fs.c: same as above
-
-	* camel-stream-mem.c: again, same as above
-
-	* camel-stream-buffer.c: same
-
-	* camel-imap-stream.[c,h]: Added this new stream, cache's previously 
-	read data so each successive call will instead read from the cache
-	
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_disposition): fix
-	typo/braino (set "Content-Disposition", not "Content-Description")
-	(camel_mime_part_set_filename): const poison
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (base64_encode_step): Ick, damn signs!  Fix a
-	bug with sign extended bytes.
-
-	* camel-mime-filter-smtp.c (filter): Changed layout/logic slightly
-	(to match From filter)
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-smtp.c (filter): Fixed the filter so that it 
-	wouldn't insert garbage under certain conditions.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Don't ref the services in the cache.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Rearanged where debug
-	fprintf statements we placed so that any data the server sends 
-	back is printed out before an exception is set and the function
-	returns.
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_decode_date): If we get a funny
-	result, just throw it out.  Basically a fix for the one true
-	broken TradeClient.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (message_info_free): Free
-	references/messsage id.
-	(message_info_save): Save them.
-	(message_info_load): Load them.
-	(message_info_new): And get them from the new message.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped for new changes.
-
-	* camel-folder-summary.h: Added references and messageid to
-	summary.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Ref and unref objects in the service cache
-	properly.
-
-	* camel-store.c: Ref the folder when returning it using
-	lookup_folder.  Used the folder's full name for the key for the
-	folder cache since that's used to uncache it.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	Fun with purify.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): free msg on
-	success as well as failure.
-	(camel_pop3_command_get_additional_data): free buf after reading
-	the last line (".").
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): free
-	body data after creating the memstream from it (which will copy
-	the data).
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): free summary
-	and index paths.
-
-	* camel-data-wrapper.c (finalize): unref the stream, if it exists.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (construct_from_parser): For a message part,
-	set the default content-type to message/rfc822.  Maybe needs to be
-	done for multiparts too?
-
-2000-05-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Typo in assersion.
-
-	* camel-mime-parser.c (folder_scan_step): Use a default type of
-	message/rfc822 for multipart/digest.  Bug Z192.
-	(folder_scan_drop_step): Remove warning.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Init
-	filter_from to NULL, for exception case.
-	(mbox_get_message_by_uid): Cast off_t to long int for diagnostics.
-
-	* camel-url.c (camel_url_hash): Hash funciton for using camel
-	url's as hash keys.
-	(camel_url_equal): equal function for same.
-
-	* camel-session.c (camel_session_finalise): Free cached services.
-	(camel_session_init): Init service cache.
-	(service_cache_remove): destroy callback to remove a service from
-	the cache.
-
-	* camel-store.c (get_folder_internal): Remove the extra ref of the
-	folder.  That seems the right behaviour ...?
-	(camel_store_get_type): Doh, actually call store init, so the
-	cache works.
-	(cache_folder): strdup the folder name!  no wonder it never found
-	it again.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: Implemented a few more
-	methods like imap_append and 1 or 2 others
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-store.c (camel_store_init): Move it to here.  If this
-	level is going to maintain it, it should set it up.  Lets see what
-	caching folders breaks :(
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont
-	init folder cache here.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Make sure we copy messages which are
-	still intact to the new folder.
-	(camel_mbox_summary_expunge): Update the frompos as well when
-	moving the content.
-	(camel_mbox_summary_expunge): Remove some debug, and dont offset
-	frompos?
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the
-	searched folder is open before trying to search it.
-	(message_changed): Track changes to the source message in the
-	summary.
-	(folder_changed): Track folder changes, re-query the folder that
-	changed, and cascade the changed event as well.
-	(camel_vee_folder_finalise): Free subfolder and subfolder summary.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Fix up some glib
-	precondition stuff. Try to set the URL in camel_service_new before
-	checking whether or not it's "empty" so that you can successfully
-	set "sendmail:" as a URL.
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Add a domain field to CamelProvider, to say
-	what kind of data it provides.
-
-	* providers/imap/camel-imap-provider.c: 
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: Set domain to "mail".
-
-	* providers/nntp/camel-nntp-provider.c: Set domain to "news".
-
-	* providers/vee/camel-vee-provider.c: Set domain to "vfolder". (So
-	it doesn't end up being listed as a potential mail source in the
-	mail config wizard.)
-
-	* providers/pop3/camel-pop3-store.c: Split apart password and APOP
-	auth, since some servers seem to do both, but don't really.
-	(connect_to_server): Renamed from try_connect. Now actually does
-	the connection up to the point of checking the greeting for APOP
-	support.
-	(query_auth_types): Return APOP, if appropriate. Call
-	pop3_disconnect after connect_to_server since we don't really want
-	to be connected.
-	(pop3_connect): Use connect_to_server rather than duplicating
-	code. Fix a one-byte buffer overrun in the APOP code.
-	(pop3_disconnect): Make this able to clean up after a partial
-	connect.
-	(connect_to_server): Remove port number from error message since
-	it's not terribly useful and we were getting it from the wrong
-	place anyway.
-
-	* camel-mime-utils.c (header_address_list_format_append): Use
-	`foo@bar' rather than `"" <foo@bar>' for email addresses with no
-	name component.
-
-2000-05-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: Removed 
-	camel_imap_command_get_additional_data() as it was
-	completely useless, replaced with 
-	camel_imap_command_extended() which may eventually replace
-	camel_imap_command() as well.
-
-	* providers/imap/camel-imap-store.h: Modified to reflect
-	changes made to camel-imap-store.c
-
-	* providers/imap/camel-imap-folder.c: Wrote the first of many
-	methods: camel_imap_init(), imap_open(), imap_expunge(), 
-	imap_get_message_count(), and imap_get_subfolder_names()
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (camel_multipart_init): Don't set a default
-	boundary. Require the caller to do that.
-	(set_boundary): if boundary is NULL, generate a "random" boundary.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Add a call to
-	camel_multipart_set_boundary after creating a new multipart.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (try_connect): Removed
-	Exception code - Pop doesn't seem to set exceptions
-
-	* providers/imap/camel-imap-folder.c: Initial code, mostly
-	just a template for future code
-
-	* providers/imap/imap.[c,h]: Source code from my personal
-	mailer - for reference only!
-
-2000-05-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Replace simple
-	data wrapper here too, oops.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-simple-data-wrapper again.  Less code to maintain == better
-	code.
-	
-	* camel-data-wrapper.c (construct_from_stream): Fixes for bug
-	where text attachments dont work.  Made data-wrapper concrete for
-	the second time.
-
-2000-05-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder):
-	Update the vfolder details for a single folder.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Took out code
-	that had been there to reconnect to the server if it was not
-	already connected - Mailer code was fixed so that this should not
-	be needed.
-
-	* providers/imap/camel-imap-store.[c,h]: Initial code.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Re-add camel-simple-data-wrapper.h, which was removed
-	for some reason.
-
-2000-05-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.[c,h]: Moved global
-	variables into struct CamelSmtpTransport to make SMTP
-	thread-safe
-
-	* providers/imap/camel-imap-*.h: Stolen from Mbox. Rough structure
-	for Imap.
-	
-2000-05-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap: Added some initial code to the camel tree
-	for IMAPv4
-
-	* providers/imap/.cvsignore: Added to repository
-
-	* providers/smtp/camel-smtp-transport.c: Added debug fprintf's
-	so that testers can provide more information. Tested with simple
-	messages and a reply to the hello@helixcode.com default message
-	but should really be tested more.
-	(smtp_data): Fixed to use data_wrapper_write_to_stream.
-
-	* camel-mime-filter-smtp.c (filter): Modified to escape all lines
-	beginning with a '.' and to place a \r before each \n if one did
-	not previously exist. Removed code to escape "From " as it was
-	found to not be needed for SMTP.
-
-2000-05-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Fixed the 
-	filtered stream. Fixes for stream changes, updated to use 
-	camel-mime-filter-smtp.
-
-	* Makefile.am: Added camel-mime-filter-smtp.c
-	
-	* camel-mime-filter-smtp.[c,h]: Added to camel tree
-	Smtp filter used to change \n into \r\n, escape lone dots,
-	and escape "From "'s.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* camel-simple-data-wrapper.c (construct_from_stream): If we
-	already have been constructed, unref our content.
-	(write_to_stream): Check we've been constructued, and change for
-	stream api changes.
-
-	* camel-mime-parser.c: Removed exception stuff.
-
-	* md5-utils.c (md5_get_digest_from_stream): repaired.
-
-	* camel-mime-message.c: Remove exception from write_to_stream, and
-	fix, and fix formatting.
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Fix for stream changes.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes
-	for stream changes.
-
-	* providers/mbox/camel-mbox-folder.c, and elsewhere, fix all
-	stream api changes.
-	(mbox_append_message): Use stream_close() now its back.
-	(mbox_append_message): unref the from filter.
-
-	* camel-stream-mem.c: And here.
-
-	* camel-stream-fs.[ch]: Here too.
-
-	* camel-stream-filter.c: Likewise.  This is getting tedious.
-
-	* camel-stream-buffer.c (stream_write): Fix a few little problems.
-	(stream_close): Reimplement.
-	(camel_stream_buffer_read_line): Slightly more efficient version,
-	that also only allocates the right amount of memory for strings.
-
-	* camel-seekable-substream.c: Likewise.
-
-	* camel-seekable-stream.[ch]: Remove exceptions, fix formatting,
-	changes for stream (re)fixes.  set_bounds returns an error.
-
-	* camel-stream.[ch]: Remove exceptions.  Make flush and reset return
-	an error code, repair all the screwed up formatting, and put back
-	close.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): And here.
-
-	* camel-mime-part.c (camel_mime_part_set_content): And this too.
-	(write_to_stream): Fixed for stream changes.
-
-	* camel.h: Fixed.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Implement.  Performs an intersection of the two searches.
-	(camel_vee_folder_finalise): Unref search folders.
-	(vee_append_message): Implement append.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: remove message_number_capability and require uid
-	capatibility.
-	(camel_folder_list_subfolders, camel_folder_get_uid_list,
-	camel_folder_get_subfolder_info, camel_folder_get_message_info):
-	removed
-	(camel_folder_get_subfolder_names,
-	camel_folder_free_subfolder_names): new subfolder interfaces.
-	(camel_folder_get_uids, camel_folder_free_uids): new uid
-	interfaces
-	(camel_folder_get_summary, camel_folder_free_summary): new summary
-	interfaces
-
-	* providers/mbox/camel-mbox-folder.c,
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/vee/camel-vee-folder.c: Update for changes
-
-	* providers/pop3/camel-pop3-folder.c: Implement get_uids, update
-	for other changes.
-
-2000-05-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c: Guess!
-
-	* camel-folder-search.c (search_user_flag): Implement user_flag
-	search term.
-
-	* camel-folder-search.h: Added user_flag search capability
-	(user-flag "blah")
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Set USER flag in
-	permanent flags for the folder.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove unused async open/close and
-	copy_message_to functions.
-	Rename functions without initial _. Fix glib preconditions and
-	gtk-doc comments.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-data-wrapper.c: remove get/set_output_stream operations.
-	They're redundant with write_to_stream, and CamelMimePart and
-	CamelMimeMessage only implement the latter, meaning that trying to
-	get_output_stream on a CamelMimeMessage that was built from pieces
-	rather than being parsed from a stream doesn't work. Anything that
-	uses get_output_stream can be rewritten to use write_to_stream, so
-	we'll standardize on that.
-	(camel_data_wrapper_new): remove this: CamelDataWrapper is
-	supposed to be an abstract class.
-	(write_to_stream): remove default implementation. (Moved to
-	CamelSimpleDataWrapper)
-	
-	* camel-simple-data-wrapper.c: resurrect, although it's not really
-	the same thing it was before. A simple data wrapper, which is
-	backed by a CamelStream.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Use
-	construct_from_stream rather than set_output_stream.
-	(camel_mime_part_construct_content_from_parser): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-
-	* camel-mime-part.c (camel_mime_part_set_content): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-	
-
-2000-05-17  Darin Adler  <darin@eazel.com>
-
-	* camel-folder-summary.c: (message_info_load):
-	Quick fix to get it to compile. I hope I don't get into trouble.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Don't include the no-longer-distributed
-	possibly-to-be-removed headers.
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): fix an off-by-one error in
-	address parsing
-	(smtp_data): use camel_data_wrapper_get_output_stream rather than
-	data_wrapper->output_stream
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Snoop
-	changes to user flags on the message into the summary as well.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_init):
-	Changed version init to include the parent class version info
-	(i.e. add it not overwrite it).
-
-	* camel-folder-summary.c (message_info_new): Initialise user_flags
-	to empty.
-	(message_info_load): And load user flags.
-	(message_info_save): And save user flags.
-	(message_info_free): And free them.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.
-
-	* camel-folder-summary.h: Added user-flags to summary.
-
-	* camel-mime-message.c (camel_mime_message_set_user_flag): Dont
-	use a hashtable for user flags.
-	(camel_mime_message_get_user_flag): And changed here too.
-	(camel_flag_get): New interface to get a flag from a flag
-	list.  Flag lists are easier to work with than hash tables, and
-	save memory too.
-	(camel_flag_set): And set.
-	(camel_flag_list_free): And free.
-	(free_key_only): Discard.
-	(finalize): Remove the flag list.
-
-2000-05-17  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): Error
-	checking on gethostbyaddr() eliminating a possible segfault.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message_by_uid):
-	Implement.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* camel-movemail.c (camel_movemail): Open the destination with
-	O_APPEND, so we dont blow away a partially transferred mbox.
-	(camel_movemail): Loop if we get errno=INTR, and not fail.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	the summarised file size, if everything went ok.
-	(camel_mbox_summary_expunge): Clear header flags after updating.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/nntp/camel-nntp-folder.h:
-	* providers/nntp/camel-nntp-provider.c: 
-	* providers/nntp/camel-nntp-store.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-utils.h: 
-	get things working with new camel summary stuff.
-
-	* providers/nntp/camel-nntp-summary.c: 
-	* providers/nntp/camel-nntp-summary.h: 
-	removed files since camel-folder-summary does all we need.
-
-2000-05-15  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: Added some preliminary
-	AUTH support.
-
-2000-05-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.h: Remove camel_folder_get_summary, which no longer
-	exists.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: remove some cruft that we're not currently using.
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): Change
-	to match prototype (size_t vs unsigned int) so it works on 64-bit
-	machines. Noted by msw.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Indicate
-	the summary changed also.
-
-2000-05-11  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): 
-	Updated to more closely comply with RFC 821 standards
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Unref the filter after
-	adding it to the filtering stream.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_finalise): Free the folder path.
-	(camel_mbox_summary_update): Also save summary when done.
-	(camel_mbox_summary_expunge): Unindex items when deleting them.
-	(camel_mbox_summary_expunge): Save the index as well as the
-	summary.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free the
-	summary path.
-	(camel_folder_summary_touch): New function, indicate the summary
-	info changed.
-	(camel_folder_summary_remove): Dirty here.
-
-	* camel-internet-address.c (internet_decode): Free multiple entry
-	addresses properly.
-
-	* camel-mime-utils.c (header_decode_mailbox): Plugged another
-	memleak, free text after converting it.
-	(header_decode_addrspec): More leaks plugged.
-
-	* camel-mime-message.c (finalize): Free message_uid.
-	(finalize): Free the recipients hashtable.
-
-2000-05-11    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free
-	summary items and charset filters.
-
-2000-05-10    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Don't
-	free stuff in p, after we've free'd p.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref
-	the stream we created for appending.
-
-2000-05-10  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (camel_smtp_transport_class_init):
-	Added initialization for service_class
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (write_to_stream): fix a stupid typo. Thank
-	you, C.
-
-	* camel-mime-part.c (write_to_stream): don't ref the stream before
-	wrapper a filter around it, since nothing will ever unref it.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and
-	camel-thread-proxy.h.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Bleah. Can't fsync a pipe. As a quick kludge, just don't
-	stream_flush it. The right fix will require bringing back
-	stream_close though.
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-	* camel-internet-address.[c,h]: Undid my changes (moved
-	struct _address back into came-internet-address.c)
-	* providers/smtp/camel-smtp-transport.c: (_send): changed
-	from using it's own address manipulation (using struct _address)
-	to using camel_internet_address_get(). Also some format changes
-	to keep consistant with the rest of Camel
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* camel-internet-address.[c,h]: Moved struct _address from
-	camel-internet-address.c to camel-internet-address.h
-	(hopefully this doesn't break anything...)
-	* providers/smtp/camel-smtp-transport.c: (_send): now
-	populates the recipient list with To, Cc, and Bcc addresses.
-	Should now be able to use this module.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	one more refcounting fix I missed before.
-
-2000-05-08  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: no longer frees memory it
-	shouldn't, updated to reflect camel-stream changes involving
-	CamelException (perhaps it should use a different CamelException
-	variable than is passed to the camel smtp module?)
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream.c (camel_stream_read, camel_stream_write,
-	camel_stream_flush, camel_stream_reset, camel_stream_printf,
-	camel_stream_write_to_stream): Use CamelException to signal
-	failure.
-	(camel_stream_write_strings): Remove. camel_stream_printf is more
-	useful in most of the places that used this.
-	(camel_stream_write_string): Change from macro to function to
-	prevent problems with double-evaluation.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek,
-	camel_seekable_stream_set_bounds): Use CamelException.
-	(reset): Update.
-
-	* camel-seekable-substream.c, camel-stream-buffer.c,
-	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:
-	Update.
-
-	* camel-stream-fs.c: Remove the virtual init functions and move
-	the code into the creator functions. Add CamelExceptions to
-	creation functions that could fail.
-
-	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use
-	CamelException.
-	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c
-	(write_to_stream): Update.
-
-	* camel-mime-parser.c: add an exception to the mime parser private
-	data and pass that to stream functions as needed.
-	
-	* gmime-content-field.c, md5-utils.c: Update (badly) for stream
-	changes.
-	
-	* camel-exception.h (camel_exception_is_set): convenience macro.
-
-	* providers/Makefile.am: disable SMTP for now
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass
-	CamelException to the functions that now need it. Check the
-	exception after calling camel_stream_flush, and fail if it fails.
-	(mbox_get_message_by_uid): More updates.
-
-	* providers/pop/camel-pop3-folder.c,
-	providers/pop/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail/transport.c: Update.
-
-
-2000-05-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (process_header): Format From and Reply-To
-	to at least a decoded string.  Should probably store them as an
-	camelinternetaddress.
-
-	* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
-	
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
-	Return status.
-	(camel_mbox_summary_expunge): Force an update of the summary
-	before we do anything.
-	(camel_mbox_summary_expunge): Build new xev line in xevnew, and
-	free that, and consify xev.
-	(camel_mbox_summary_load): If we are rebuilding from scratch, make
-	sure we clear the summary content.
-
-	* camel-stream-filter.c (do_close): We NEED a stream close.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	Make camel not leak like a sieve.
-
-	* camel-object.c: New subclass of GtkObject which is now the base
-	of the Camel object hierarchy. Currently the only difference
-	between CamelObject and GtkObject is that CamelObjects don't start
-	out floating.
-
-	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on
-	using <camel/foo.h> in header files rather than <foo.h>, "foo.h",
-	or "camel/foo.h". Remove some unneeded includes.
-
-	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,
-	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,
-	camel-mime-parser.c, camel-service.c, camel-session.c,
-	camel-stream.c: These are now subclasses of CamelObject.
-
-	* camel-data-wrapper.c (set_output_stream):
-	* camel-medium.c (set_content_object):
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds):
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid): 
-	remove gtk_object_sink calls.
-
-	* camel-stream-buffer.c (init_vbuf): 
-	* camel-stream-filter.c (camel_stream_filter_new_with_stream):
-	ref the original stream.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): unref
-	the filters when finalizing.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser,
-	camel_mime_part_construct_content_from_parser):
-	* camel-mime-part.c (camel_mime_part_set_content): Unref objects
-	that are created only to be handed off to other objects. If
-	they're going to be needed later, they will have been additionally
-	ref'ed by the object that needs them.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	unref the message stream after creating the data from it.
-
-	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,
-	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,
-	since its semantics are dubious (what happens when you close a
-	stream other people still have references on?).
-
-	* providers/nntp/camel-nntp-store.c:
-	* providers/smtp/camel-smtp-transport.c:
-	* providers/pop3/camel-pop3-store.c:
-	replace camel_stream_close calls with gtk_object_unref.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/sendmail/camel-sendmail-transport.c:
-	replace camel_stream_close with camel_stream_flush +
-	gtk_object_unref
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): A machine
-	which serves neither POP nor KPOP is not a POP server.
-
-	* providers/smtp/camel-smtp-provider.c: Note in the description
-	that this provider is not yet tested.
-
-2000-05-08    <notzed@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Free the filter stream when
-	done.
-
-	* camel-mime-parser.c (folder_seek): Make sure we add the \n
-	terminal when we seek as well (frob!).
-
-	* camel-mime-utils.c (header_decode_addrspec): Plug minor memleak.
-
-	* camel-mime-part.c (finalize): Free header tables once finished.
-
-	* camel-folder-summary.c (camel_folder_summary_remove): Dont try
-	to access info after its free'd.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Apply encoding to content
-	part, when writing to a stream *sigh*.
-
-	* camel-stream-filter.c (do_write): implement write for the
-	filtering stream.  Writes shouldn't be mixed with reads.
-	(do_flush): Implemented flush.  Again write/flush shouldn't be
-	mixed with reads.  Only flushes if the last op was write.
-	(do_close): Force flush on close.
-
-	* camel-mime-filter.c (filter_run): Oops, make sure we include the
-	backlen in the total length before passing onto the filter.
-
-	* camel-mime-filter-from.c: New filter, munges 'From ' lines into
-	'>From ', for mbox.
-
-	* camel-mime-parser.c (camel_mime_parser_header_remove): New
-	function to remove the parser's raw header, rather than
-	manipulating the header directly (wich doesn't work with
-	mempools).
-
-	* camel-mime-utils.c (header_address_list_clear): Fixed some
-	broken(tm) logic, which would leak entries on multivalued lists.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Use ibex_save() to save the ibex.  Makes a big difference to
-	startup times for very large mailboxes.
-	(camel_mbox_summary_expunge): Dum de dum, reimplemented.  Designed
-	to be much more robust, and to stop immediately if anything awry
-	happens.
-	(copy_block): Utility function to copy n bytes from one fd to
-	another.
-	(header_write): Utility function to write out raw headers to an
-	fd.
-	(camel_mbox_summary_update): Incremental summary updater.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	Dont unref the stream, because of the broken(tm) ref model of gtk
-	widget that for some odd reason is being perpetuated in camel.	
-	(mbox_expunge): Reenable expunge again.
-	(mbox_append_message): Removed the optimised mbox append.  If its
-	an issue, it can go back later.  Cleaned up a lot, checks error
-	returns, and automagically translates 'From ' into '>From' as
-	necessary.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* camel-mime-filter.c (filter_run): Oops, forgot to add the
-	backlen to the pre-buffer (*poof*).
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow
-	HSCAN_FROM_END to terminate the processing of a message.
-
-	* camel-folder-summary.c (perform_content_info_load): Ick, dont
-	try and append a node onto its own list.
-	(camel_folder_summary_clear): Actually clear the indexes after
-	we've removed the messages.
-	(camel_folder_summary_clear): Set dirty if it changes.
-	(camel_folder_summary_load): Clear dirty.
-	(camel_folder_summary_save): Only save if dirty.
-
-	* providers/mbox/camel-mbox-summary.c (summary_header_load): Oops,
-	remember to call that parent class first ...
-	(summary_header_save): Here too.
-	(camel_mbox_summary_load): Do more checking to verify the index
-	contents as well as teh summary contents, against the mbox
-	contents.
-	(camel_mbox_summary_load): Removed some fo that checking, it needs
-	more code to work reliably.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Set the size and mtime of the mbox we indexed once done.
-
-	* camel-folder-summary.c (camel_folder_summary_set_index): Dont
-	write the index if it changes - let the claler fix it (uh, kind of
-	impacts performance).
-	(camel_folder_summary_load): close in.
-
-	* camel-folder-summary.c (summary_format_string): Check header
-	exists before trying to strip its leading spaces.
-
-2000-05-06  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Removed summary info from here, and include
-	camel-folder-summary.h as well.
-	
-	* camel-mime-parser.c (camel_mime_parser_step): Allow it to accept
-	a NULL databuffer.
-
-	* providers/mbox/camel-mbox-summary.c: Totally new file, now
-	subclasses camel-folder-summary.
-
-	* camel-folder-summary.c (message_info_load): Load the uid as a
-	string.
-	(message_info_save): And save too.
-	(camel_folder_summary_clear): New function, clears the contents of
-	the summary.
-
-	* providers/mbox/camel-mbox-folder.c: Fixes for	summary changes.
-	(mbox_get_message_by_uid): Completely redone.  Now cross-checks
-	the summary information to make sure we get a real message.
-	(mbox_append_message): Disabled the copy version of append for
-	now.
-	(mbox_expunge): Temporarily disabled the expunge function, until
-	it is put back in camel-mbox-summary.c
-
-2000-05-05  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c: And same here ...
-	(camel_folder_summary_encode_fixed_int32): Ugh, fwrite doesn't
-	return -1 on error ..
-	(camel_folder_summary_decode_fixed_int32): Neither deos fread.
-	(camel_folder_summary_encode_token): Fix here too.
-	(summary_build_content_info): Use start-headers to get the pos of
-	the message, not parser_tell(), which might not be what we
-	expected because of parser_unstep().
-	(camel_folder_summary_encode_token): Use bserch() to tokenise the
-	values, rather than a linear search.
-
-	* camel-mime-utils.c: Defined out some memory profiling stuff I
-	left there by mistake.
-	(header_decode_mailbox): Dont try to append the word part of a
-	local address if we ran out of words.
-
-	* camel-mime-parser.c (folder_scan_content): Apply the fix from
-	the header scanner to here too.
-	(folder_scan_header): Only check for end of header if we have
-	space for it (didn't end the read with a newline)
-	(folder_scan_header): inptr is the only real thing we need
-	registerised for performance.  Try to help the compiler be smart
-	about it ..
-	(folder_scan_header): Simplified the save header case a tad.
-
-	Commented out some memory profiling stuff.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.
-	(header_decode_text): Fixed memory leaks with g_string_append().
-	(header_encode_string): And here too, and a few other places.  The
-	glib api is so awful ...
-	(header_content_type_decode): More memory leaks.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we
-	init the end of buffer sentinal!
-	(folder_scan_init_with_stream): And here too ...
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):
-	Maxcount is minimum of the max and the requested count, not the
-	maximum :)
-
-	* camel-mime-parser.c (folder_scan_content): Properly set midline,
-	so we dont falsely catch offset boundary markers (i.e. From inside
-	content).
-	(folder_read): Set a sentinal on the end of the read data (\n) so
-	we dont have to check the buffer boundary in the inner loop.
-	(mempool_*): New experimental memory management routines, speed
-	up simple structure parsing by about 25% ... not compiled in by
-	default.  Something similar may be needed for camel-mime-utils to
-	address performance issues with g_malloc and friends.
-
-	* camel-mime-utils.c: Added a macro w(x) used to wrap all warnings
-	about mime/rfc violations, so they can be turned off.
-
-	* camel-folder-summary.c (summary_build_content_info): Step after
-	the end of a message ...
-	Turn into a stand-alone program for testing and profiling.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Don't fall
-	back to plaintext passwords if APOP fails, since it should also
-	fail.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_list_providers): New function to
-	replace camel_provider_scan. Returns a list of either (a) all
-	currently-loaded providers, or (b) all available providers.
-
-	* camel-url.[ch]: Add an "empty" flag to CamelURL (indicating that
-	it contains only a protocol).
-
-	* camel-service.c (camel_service_query_auth_types): Make this take
-	a CamelException (since it may have to try to connect to the
-	server, and it might not able to.)
-
-	* providers/pop3/camel-pop3-store.c: add KPOP (Kerberized POP)
-	support. This is mostly so I have two kinds of authmech to play
-	with instead of just one. (But it does actually work.)
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): update
-	for prototype change, but disable the functionality, since it
-	doesn't really support any auth types yet.
-	(camel_smtp_transport_get_type): add an object init function to
-	set the service url_flags.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Yes, and anotherone.
-
-	* camel-mime-utils.c: And another one.
-
-	* camel-mime-part.c: And another one.
-
-	* camel-mime-part-utils.c: And another one.
-
-	* camel-folder-search.c: And another one.
-
-	* camel-mime-parser.c: Reverted a change wihtout a ChangeLog entry.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.[hc]: Yes, CamelFolderSummary is back ...
-	... re-usable class to summarise and index any stream or message
-	and to manage/load/save the created summaries.
-	
-	* camel-folder.c: Include string.h to kill a warning.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,
-	people who installed libunicde in non-standard include paths need
-	this.
-
-2000-05-03  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Added pos/bodypos/endpos to the basic message
-	content info object.  Size to be removed?  Moved the
-	messageconentinfo and messageinfo back to camel-folder-summary.h.
-
-	* camel-mime-filter-index.c (camel_mime_filter_index_set_ibex):
-	New function to (re)set the index to use on a filter.
-
-	* camel-mime-parser.c (camel_mime_parser_scan_from): Whole bunch
-	of inline docs.
-	(camel_mime_parser_drop_step): New function to drop a state from
-	the parser.  Needs more testing.
-
-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is
-	-1, then dont try and convert (crashes unicode_iconv?).
-	(rfc2047_decode_word): Use alloca for variables instead of
-	g_malloc - by the rfc they should always be short.
-	(rfc2047_decode_word): If we can't do the charset conversion, undo
-	the quoted-printable/base64 at least?  Should probably convert
-	unknown characters to the utf-8 unknown character.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_date): fix typo when
-	dereferencing saveoffset.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c: Added some header doco.
-
-	* camel.h: REmove gmime-utils.h from here.
-
-	* providers/mbox/camel-mbox-search.[ch]: Removed.  Functionally
-	redundant.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	Use the new CamelFolderSearch class to do the actual searching,
-	just setup the search here.
-
-	* camel-folder-search.[ch]: A helper class that providers may
-	subclass to provide their own search functionality, or they can
-	simply use as is, it supports body searches if an ibex is
-	supplied, and header searches if a summary is supplied.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-	* providers/MH/Makefile.am: same.
-	* providers/maildir/Makefile.am: same.
-	* providers/mbox/Makefile.am: same.
-	* providers/nntp/Makefile.am: same.
-	* providers/pop3/Makefile.am: same.
-	* providers/sendmail/Makefile.am: same.	
-	* providers/smtp/Makefile.am: same.		
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Dont store/remove
-	current search from the search list.
-	
-	* providers/mbox/camel-mbox-folder.h: Removed searches list,
-	searches are all sync now.
-
-	* gmime-utils.[ch]: What the hell, remove it.  This will break the
-	nntp provider.  The mime parser can be used instead though.
-	Removed from all code including it (but none were using it).
-
-	* gmime-utils.c (_store_header_pair_from_string): Removed bizarre
-	string_dichotomy version of this.  This code is somewhat redundant
-	now, and is headed for death anyway.
-
-	* gstring-util.c (g_string_dichotomy): Same with this one.
-	(g_string_clone): Removed a memory leak, g_string_new() allocates
-	its own memory.
-	(g_string_append_g_string): Allow to append an empty gstring onto
-	another gstring, dont abort()!
-
-	* string-utils.c (string_dichotomy): Removed this incredibly weird
-	function.
-
-	* camel-folder.c (_create): Replaced the rather obtuse use of
-	"string_dichotomy" function with a simple strrchr().  Still not
-	sure it'll work.
-
-	* camel-folder-summary.c: cvs removed a long-removed file.
-
-	* camel-mime-parser.c (folder_scan_header): Fix the previous
-	overflow problem properly (can happen in 2 places).
-	(header_append): A new macro to include the code changed above, so
-	it only appears in one place.
-	(folder_scan_step): Change the content type to text/plain if the
-	multipart is broken.  Doesn't actually change the header though.
-	(header_append): Also move the header-start tracking stuff here.
-	Could be a static function to save code.
-
-2000-05-02    <notzed@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Dont use autofill on
-	these fucking long function anmes!!!!!!
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Fix the offset for the summary when
-	an item is expunged to take account of the From line.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.h (CamelMboxFolder): Removed
-	search_id.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_cancel): Remove.d
-	(camel_mbox_folder_search_complete): Removed.
-	(camel_mbox_folder_search_by_expression): Changed back to sync
-	api.
-	(struct _searchcontext): Removed cancelled flag.
-	(find_context): Removed.
-	(func_header_contains): Debug out some search stuff.
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Moved back to sync api.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_set_flags_by_uid): New function to update the
-	flags in the summary.
-	(camel_mbox_summary_expunge): Expunge messages from a folder.
-	(offset_content): Re-align offsets of summary when messages
-	added/removed to an existing summary.
-	(camel_mbox_summary_remove_uid): Remove a message summary entry by
-	uid.
-	(index_folder): Restore flags from X-Evolution header, if they are set.
-	(index_folder): Make sure we index using a decimal uid, since
-	thats what everything else indexes off (oops).
-	Upped SUMMARY_VERSION as a result.
-	(camel_mbox_summary_expunge): Oops, my wrong, use the string uid
-	to unindex on.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Connect to the message_changed signal.
-	(_init): Set permanent flags to something reasonable.  No user
-	flags yet ...
-	(message_changed): If the flags of the message change, update the
-	flags in the summary.
-	(mbox_expunge): Implement the expunge.
-	(camel_mbox_folder_class_init): Renamed all leading _'s to mbox_'s
-	(mbox_expunge): Emit a folder_changed signal on expunge (uh, even
-	if it didn't ...)
-
-	* camel-folder.c (_finalize): Uh, dont free permanent_flags
-	anymore (this wouldn't failed anyway, it was a GList !!!)
-	(camel_folder_search_complete): Removed.
-	(camel_folder_search_cancel): Removed.
-	(camel_folder_expunge): Changed to only allow expunge on an open
-	folder.  It doesn't make sense for mbox, otherwise (?)
-	(camel_folder_class_init): Added a folder_changed signal.
-
-	* camel-folder.h (struct _CamelFolder): Change permanent_flags to
-	a bitfield.
-	(list_permanent_flags): Renamed to get_permanent_flags, and
-	returns a bitfield.
-	(camel_folder_expunge): Changed expunge to a void type.  The
-	messages would no longer be useful after they have been removed
-	...
-	(CamelFolderClass): New function summary_get_by_uid() to get a single
-	summary.
-	(*search*): Moved back to synchronous search api ... *sigh*
-	
-	* camel-folder.h: Removed CamelSearchFunc.
-
-	* camel-mime-message.c (set_flag): Removed.
-	(camel_mime_message_set_flag): Removed.
-	(get_flag): Removed.
-	(camel_mime_message_get_flag): Removed.
-	(add_flag_to_list): Removed.
-	(get_flag_list): Removed.
-	(camel_mime_message_get_flag_list): Removed.
-	(camel_mime_message_get_flags): New interface to get system flags.
-	(camel_mime_message_set_flags):  " to set ".
-	(camel_mime_message_get_user_flag): To get a user flag.
-	(camel_mime_message_set_user_flag): To set a user flag.
-	(finalize): Hmm, the old one free'd the key and data, not good
-	when the data is a boolean ...
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Tweak the definition of CamelProvider. Among
-	other things, a provider may now be both a store and a transport.
-
-	* camel-provider.c: Remove a lot of code we had no intention of
-	using. This now only contains two functions: camel_provider_init
-	to read the installed .urls files, and camel_provider_load to
-	load and register a new provider.
-
-	* camel-session.c: Remove more unused code and simplify some of
-	the remaining code. The list of available provider modules is now
-	stored in the session, and it handles calling camel_provider_load
-	to load them as needed. Provider registration is now done by
-	calling back from the module init routine, which allows a single
-	module to register providers for multiple URL types.
-
-	* providers/*: Update provider structures and init routines for
-	the new stuff. Add a .urls file to each provider specifying what
-	urls it handles, and install that with the library.
-
-	* providers/nntp/camel-nntp-provider.c: Add hints towards
-	supporting both news: and nntp: URLs, and using nntp as both a
-	store and a transport.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-internet-address.c (camel_internet_address_get): const
-	poison
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser):
-	camel_mime_parser_tell() returns an offset from where it started
-	parsing, not necessarily from the start of data. Since we're
-	parsing a bounded seekable_stream, we need to add the stream's
-	starting bound to camel_mime_parser_tell's return value to
-	create the substream in the right place.
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	say CAMEL_STREAM_UNBOUND rather than -1 in doc.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek): Add more
-	info to docs.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): fix a bug that would
-	cause corruption with very long headers.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'
-	to pick the Camel includes.
-	* providers/sendmail/Makefile.am (INCLUDES): Likewise.
-
-	* camel.h: Don't #include <camel/data-wrapper-repository.h> anymore.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (check_header): Dont try and check a NULL
-	header.
-
-	* camel-recipient.[ch]: Dead.  Its not pining.
-
-	* camel-mime-message.h: Dont include recipients.h anymore.
-
-	* camel-mime-message.c (camel_mime_message_add_recipient): Accept
-	name/address separately, and store in an CamelInternetAddress.
-	(add_recipient): Removed.
-	(remove_recipient): Removed.
-	(remove_recipient_address): Renamed from remove_receipient, works
-	via address.
-	(camel_mime_message_remove_recipient_name): New function to remove
-	by name.
-	(get_recipients): Removed.
-	(camel_mime_message_get_recipients): Return a camel-internet-address.
-	(write_to_stream): No longer write receipients directly.
-	(write_recipients_to_stream): Removed.
-	(write_one_recipient_to_stream): Removed.
-	(camel_mime_message_init): Setup recipients hashtable, rather than
-	usign the recipients stuff.
-	(set_recipient_list_from_string): Killed, a violent and lengthy
-	death.
-	(process_header): Simplified recipient handling code a lot.
-	(received_date_str, sent_date_str, reply_to_str, subject_str,
-	from_str): Removed some oddly-defined global statics.
-	(camel_mime_message_class_init): Dont initialise above variables
-	anymore.
-	(init_header_name_table): Removed, use a table to init this, and
-	do it in class init (2 lines of code ...).
-
-	* camel-news-address.c: Class to represent news addresses -
-	currently empty, and not built.
-
-	* camel-internet-address.h: Class to represent internet (email)
-	addresses.
-
-	* camel-address.h: Abstract class to represent (lists of)
-	addresses.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Revert previous change. I
-	was confused.
-
-	* camel-url.[ch] (camel_url_encode, camel_url_decode): expose
-	these routines.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Only write a newline
-	between the headers and the content object if the content object
-	is not a CamelMedium. (If the content is a medium, it may have its
-	own headers, which then need to go before the blank line.)
-
-	* camel-mime-body-part.[ch]: Remove. We weren't using the fields
-	that made this different from camel-mime-part, so it basically
-	just forced us to do lots of gratuitous typecasting.
-
-	* camel-multipart.[ch]: Use CamelMimePart. Remove the multipart
-	parent stuff, since we weren't using that either.
-
-	* etc: update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (set_content_object): sink the content object
-	after referencing it.
-
-	* camel-mime-part.c: fix various little things in the handling
-	of CamelMedium methods. Change camel_mime_part_set_text to the
-	more generic camel_mime_part_set_content.
-
-	* camel.h: sync to current reality
-
-	* camel-folder-utils.[ch]: removed
-
-	* camel-mime-utils.c (header_format_date): fix format specifier
-	for time zone. Fix typo in month names array.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* camel-seekable-substream.c (stream_seek): Changed to have
-	absolute seek semantics, not relative to the bounds.
-
-	* camel-seekable-stream.c (reset): When we reset, seek to the
-	start of the bound, if there is one.
-	(stream_tell): Make tell virtual.
-
-	* camel-stream-filter.c (do_available): Removed.
-
-	* camel-stream-buffer.c: Remove leading _'s from static functions.
-	(stream_read): Renamed from read().  Fancy that conflicting!  (my
-	boo!)  Others too.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	Changed to stream_mem interface.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed
-	for streamfs interface changes, and implement a failure case.
-	(_append_message): Changed for fs stream interface change.
-
-	* camel-multipart.c (print_part): Iterate rahter than callback.  I
-	hate glists's interface (hence, move this to write_to_stream).
-	(write_to_stream): Return an error (yuck, this is a royal PITA to
-	do with the stream write interface).
-
-	* camel-mime-message.c: Removed leading _ from static names.
-
-	* camel-mime-part.h: construct_from_parser() now returns an error
-	code.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Changed to use a
-	camel-data-wrapper instead of a camel-simple-data-wrapper (no
-	change needed elsewhere?).
-	(simple_data_wrapper_construct_from_parser): Fixes for stream-mem
-	interface changes.
-
-	* camel-simple-data-wrapper.[ch],
-	camel-simple-data-wrapper-stream.[ch],
-	camel-stream-data-wrapper.[ch], removed.  Fixed including of these
-	files.
-	
-	* camel-mime-part.c (camel_mime_part_set_text): Remove the use of
-	the camel-simple-data-wrapper-stream, just use a mem stream.
-	(write_to_stream): Renamed from my_*
-	(construct_from_stream): Return an error on error.
-
-	* camel-stream-mem.c (camel_stream_mem_new*): Remove mode
-	parameter.
-
-	* camel-stream-mem.h (enum CamelStreamMemMode): Removed.  It
-	wasn't used at all.
-
-	* camel-data-wrapper.h: Add camel_data_wrapper_new() to create
-	these.
-	(write_to_stream, construct_from_stream): Return an error
-	indicator for success.  Fixed all methods to match (ICK).
-
-	* Makefile.am (libcamel_la_SOURCES): Remove
-	camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c,
-	camel-stream-data-wrapper.c.  Obsoleted by code re-use!
-
-	* camel-data-wrapper.c (construct_from_stream): Change the default
-	implementation to just set the output stream == construction
-	stream.  Well, this lets me get rid of both simple-data-wrapper
-	and stream-data-wrapper (unused anyway), and
-	simple-data-wrapper-stream in one hit.  CamelDataWrapper is now
-	also a concrete class.
-	(write_to_stream): Use camel_stream_write_to_stream() to
-	calculate/return values (and save code).
-	Include <errno.h> for obvious reasons.
-
-	* camel-stream.c (eos): Provide a default implementation of .eos().
-	(camel_stream_write_to_stream): Make it return an error code on
-	error.
-	(camel_stream_printf): Changed to return the number of bytes
-	written/error.
-	(camel_stream_available): Removed.
-
-	* camel-stream-fs.h (enum CamelStreamFsMode): Removed.  Changed to
-	use unix modes and so forth (wasn't used for anything but new file
-	creation and didn't work well either).
-
-	* camel-stream-fs.c: Removed leading _'s for names.  And removed
-	some virtual method 'documentation'.
-	(destroy): Dont try and close a closed/error fd.  Only report
-	error if close returns -1.  Moved all the code to finalise(), and
-	killed this function.
-	(init_with_fd): Properly setup the seek offset, if it is a
-	valid and seekable file descriptor.
-	(init_with_fd_and_bounds): Use off_t for bounds, set bounds on the
-	seekable stream.
-	(init_with_name): Return error codes.
-	(init_with_name_and_bounds): Ditto.
-	(camel_stream_fs_new_with_name): REturn NULL object if it failed.
-	(camel_stream_fs_new_with_name_and_bounds): Return NULL object on
-	failure.  Changed with_name* api's to take unix open style args
-	and flags.
-	(read): The bounded stream bounds checking seemed off, simplified
-	code a bit.
-	(write): Implement bounds checking for writing, the comment was
-	wrong, it could make sense to bound writing.  Cleaned up a little.
-	(available): Gone.
-	(eos): Removed.  Use CamelStream's implementation now.
-	(close): Reset the fd to -1, provide a warning for bad usage.
-	(seek): Cleaned up.  Changed the behaviour a little, the returned
-	offset is the absolute position in the file, even in bounded
-	streams.	
-	(seek): Seek from end mirrors lseek() behaviour (reverse seeking).
-
-2000-04-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof
-	indicator to other parent classes.
-
-	* camel-stream.c (camel_stream_printf): New utility
-	function.  Obvious use.
-
-	* camel-stream-mem.c: Removed leading _'s from static func's.
-	(camel_stream_mem_new_with_byte_array): Fixed for api changes, set
-	the owner for the byte array to us.
-	: Removed A bunch of gtk doc stuff for static (implementation) functions.
-	(available): Removed.
-	(write): Fixed the write implementation so that seek() works on a
-	seekable memory stream, as expected.  Seeking past the end of the
-	buffer has unix semantics (filling with 0).
-	(available): Removed.
-	(write): Implement seekable stream bounded stream.
-	(read): Implement seekable stream bounded stream.
-	(close): Dont free the stream_mem if we're not the owner.
-	(seek): Allow to seek beyond the end of memory area,
-	implement bounds checking.
-	(seek): Set errno on bad policy.
-
-	* camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t.
-	(new_with_buffer): Changed len to be a size_t.
-	(set_buffer, set_byte_array): New interface functions.
-	(struct _CamelStreamMem): Removed position, it is stored in the
-	superclass.
-
-	* camel-stream.h: Removed some of the seemingly random
-	whitespace.  Removed the available method (its not
-	impelemented/useful enough).
-
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds): Remove the data_available
-	stuff, it hasn't been properly implemented/finished, and may never
-	work (unfortunately *sigh).
-	(reemit_parent_signal): Removed part of the above change.
-	(set_bounds): Removed (moved to seekable-stream).
-	: Fixed up some of the generally unreadable indenting (sorry,
-	wrapping at 80 characters with
-	camels_really_long_function_names()
-	just_doesnt_work_very_well_does_it().
-	(available): Removed.
-	(stream_seek): Fixup for object changes.  Make sure we return -1
-	if the parent stream can't seek.
-
-	* camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New
-	function to bound any seekable stream.
-	: Removed _'s.
-	(camel_seekable_stream_class_init): Implement an init function, to
-	setup the stream bounds to unbound.
-
-	* camel-seekable-stream.h (CamelSeekableStreamClass): New virtual
-	method set_bounds for seekable streams.
-	(CAMEL_STREAM_UNBOUND): New define for no bound.
-
-	* camel-seekable-substream.h (struct _CamelSeekableSubstream):
-	Removed sup_bound and inf_bound, moved to CamelSeekableStream (and
-	renamed, and changed to off_t's).
-	(new_with_seekable_stream_and_bounds): Use off_t as the bounds.
-	(CamelSeekableSubstreamClass): Uh, why was the intialiser virtual?
-	Removed.
-
-	* camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek
-	to accept an off_t as the offset.
-	(struct _CamelSeekableStream): Renamed cur_pos to position and
-	changed it to an off_t type.
-	(enum CamelStreamSeekPolicy): Set to match the SEEK_* constants
-	from lseek().
-	(get_current_position): Renamed to tell().
-
-	* camel-stream-buffer.h: Commented out set_vbuf - never implemented.
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (_eos): only return TRUE if the parent is
-	at eos AND the buffer has been exhausted
-
-	* camel-mime-message.c: fix some incorrect macro usage that
-	resulted in bogus casts
-
-2000-04-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): fix a cut-and-pasto.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): ref
-	(and sink) the message stream if we're going to unref it later.
-	Otherwise it could get destroyed while there are still substreams
-	attached to it. This needs a cleaner solution.
-
-	* camel.h: remove data-wrapper-repository.h include(s)
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow MESSAGE_END
-	_or_ EOF as valid termination conditions.
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Decode
-	and then re-encode the addresses, so they are consistently
-	formatted.
-
-	* camel-mime-utils.c (header_decode_mailbox): Store the address in
-	a _header_address.  And try to get a comment-stored name if there
-	is one.
-	(header_decode_address): Actually return an address.
-	(header_to_decode): Renamed to header_address_decode()
-	(header_mailbox_decode): New function to get a single mailbox.
-	(header_mime_decode): Return the major/minor value, as
-	appropriate.
-	(header_address_new, and friends): Whole bunch of utility
-	functions for working with the address thingies.
-	(header_decode_domain): Free the string header, and dont expand
-	'.' into ' . '.
-
-	* camel.c (camel_init): No longer call
-	data_wrapper_repository_init.
-
-	* camel-medium.c (write_to_stream): Moved (back) to
-	camel-mime-part.
-	(add_header):
-	(set_header):
-	(remove_header): 
-	(get_header): Make all these abstract, and spit warnings if
-	called.  I guess it could manage the list, but well, it doesn't.
-
-	* camel-medium.h (struct _CamelMedium): Dont store headers here,
-	the implementor is the only one who knows their format.
-	(CamelMediumClass): Changed header values to be void *'s.  They
-	need not be strings?
-
-	* camel-simple-data-wrapper.c (construct_from_stream): And we're
-	back.  Set the output stream.
-	(construct_from_parser): Moved to camel-mime-part-utils.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Create the
-	contents of multipart and simple messages.
-	(camel_mime_part_construct_content_from_parser): Oops, this was
-	totally screwed up, try creating the right cotnent on the right
-	object.
-
-	* camel-multipart.c (construct_from_parser): Moved to
-	camel-mime-part-utils.
-	(separate_part): Removed.
-
-	* camel-mime-part.c (construct_from_stream): Back again!  This now
-	switches over to using a mime parser for any mime parts, only.
-	(my_write_to_stream): Write our headers and so forth here.
-	(add_header): Add header directly, parent class is abstract.
-	(remove_header): Ditto.
-	(set_header): Ditto.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):
-	Remade abstract.
-	(camel_data_wrapper_construct_from_parser): Moved to
-	camel_mime_part.
-
-	* camel-data-wrapper.h: Put back construct_from_stream.
-
-	* camel-mime-part.h: Put construct_from_parser in here, the
-	data-wrapper shouldn't know about mime.  Ok, so now to undo half
-	of the last hours changes ... duh.
-	
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_to_decode, header_mime_decode): fix
-	some obvious minor bugs noted by -Wall.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use
-	construct_from_stream instead of set_input_stream().
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): REmoved the destroy
-	callback code.
-	(wrapper_destroy_cb): Removed.
-
-	* camel-simple-data-wrapper.h: Add prototype for _construct()
-	method.
-
-	* camel.c: Include unicode.h to kill a warning.
-
-	* camel-data-wrapper.h (CameldataWrapperClass): Removed
-	construct_from_stream virtual method.
-	Removed get/set input stream.
-
-	* data-wrapper-repository.[ch]: Removed&from build.  Obsoleted?
-	The justification as is follows: It is mixing storage
-	protocol/format with message architecture.  It really just doesn't
-	serve any purpose, as each medium implementor will have to have its
-	own type->handler mapping, and the only current implementor,
-	mimepart has a very simple structure and no need for this.
-
-	* camel-medium.c (write_to_stream): Moved here from most of the
-	stuff in camel-mime-part.  Well, the MEDIUM is the one that knows
-	what the headers are, and the content is, let it write it out.
-
-	* camel-mime-part-utils.c (camel_mime_part_construct_content):
-	Copied from camel-mime-part.c, removed handling of message
-	followon state (moved to camel-mime-message).
-	(camel_mime_part_construct_content_from_parser): Renamed from
-	construct_content.
-	(camel_mime_part_construct_headers_from_stream):
-	(camel_mime_part_construct_content_from_stream):
-	(camel_mime_part_store_stream_in_buffer): Removed.  Replaced by
-	the new construct from parser stuff.
-
-	* camel-mime-message.c (construct_from_parser): Do
-	construct_from_parser for mime-message.
-	(_write_to_stream): Set the mime-version header for medium to
-	write out, rather than writing it out ourselves.
-
-	* camel-data-wrapper.c (set_mime_type_field): Ref the
-	content_field when we get it?
-	(construct_from_stream): Removed.
-	(camel_data_wrapper_construct_from_stream): Changed to a helper
-	function, creates a mime_parser, and constructs from that.
-	(set_input_stream): Removed.
-	(camel_data_wrapper_set_input_stream): Removed.
-	(get_input_stream): Removed.
-	(camel_data_wrapper_get_input_stream): Removed.
-
-	* camel-mime-parser.c (camel_mime_parser_unstep): New function.
-	Cause a subsequent call to mime_parser_step() to return the same
-	state over again.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Initial test code using the mime parser to construct the message.
-	(_get_message_by_uid): Use construct_from_stream() instead of
-	creating our own parser.
-
-	* camel-mime-part.c (construct_from_parser): part constructor.
-	(camel_mime_part_construct_content): Basically a simpler
-	replacement for the datawrapper repository.
-	(camel_mime_part_init): Set the default type to text/plain.
-	(camel_mime_part_construct_content): Removed to
-	camel-mime-part-utils.c
-	(my_get_output_stream): Removed.  The streeam is in the
-	data-wrapper.
-	(my_get_content_object): Removed.  The content object is stored in
-	the medium.  If none is there, the object wasn't created properly.
-	(my_write_content_to_stream): Removed.  The content object is the
-	one that knows how to write itself out!!!!!!!!
-	(my_write_to_stream): Remove the base header writing stuff - has
-	been moved to camel-medium, where it belongs.  This can just be
-	used to check for mandatory headers.
-	(my_construct_from_stream): Removed.
-	(my_set_input_stream): What the hell, i'll remove this too.
-	Nobody seems to understand how it differs from create from stream,
-	and they both seem to serve the same purpose ...
-
-	* camel-simple-data-wrapper.c (construct_from_parser): Initial
-	implementation of a content constructor.
-	(construct_from_stream): Removed!  Job taken over by
-	construct_from_parser.
-
-	* camel-multipart.c (construct_from_parser): Multipart
-	construction routine.
-	(camel_multipart_init): Set the default multipart type to
-	multipart/mixed.  Duh, no subtype is not allowed anyway.
-	(set_input_stream): REmoved.  Replaced by construct_from_parser.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.[ch]: clean, document, etc.
-	(camel_multipart_init): pick a prettier default boundary. Still
-	need to deal with the larger problem
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed
-	send_date, and received_date, and replaced it with a time_t
-	'date' (this is what the header is called), and date_offset to
-	store the GMT offset of the date.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Update raw
-	header as we go.
-	(_set_from): Removed.
-	(_get_from): Removed.
-	(camel_mime_message_get_from): Moved implementation here.
-	(camel_mime_message_get_subject): Move implementation here.
-	(_get_subject): Nuked.
-	(camel_mime_message_set_subject): Handle utf-8 input, and also
-	update raw header when changed.
-	(_set_subject): Removed.
-	(_set_received_date): Removed.
-	(camel_mime_message_set_received_date): Removed.
-	(_get_received_date): Removed.
-	(camel_mime_message_get_received_date): Removed.
-	(_get_sent_date): Removed.
-	(camel_mime_message_get_sent_date): Removed.
-	(camel_mime_message_get_date): New function to get the date as a
-	time_t/offset.
-	(camel_mime_message_set_date): Set the date as a time_t/offset.
-	(camel_mime_message_get_date_string): Get the date as a string.
-	(camel_mime_message_init): Initialise the current date as
-	'CMAEL_MESSAGE_DATE_CURRENT'.
-	(_set_reply_to): Removed.
-	(camel_mime_message_set_reply_to): Moved implementation here.
-	This is still broken, reply-to can have multiple addresses.
-	(_get_reply_to): Removed.
-	(_set_field): Removed, no longer used anywhere.
-	(_get_field): Also removed.
-	(_init_header_name_table): Add the Date header.
-	(process_header): Also handle snooping of Date header here.
-
-	* camel-stream-filter.c (finalise): Unref the source stream on
-	finalise, and also call the parent class (oops).
-
-	* camel-mime-parser.c (camel_mime_parser_state): New function to
-	get the current parser state.
-	(camel_mime_parser_stream): Allow you to get the stream back from
-	the mime_parser.
-	(camel_mime_parser_fd): Alternative to allow you to get the fd
-	back from the mime_parser.
-	(folder_scan_init_with_stream): Properly ref/unref the stream.
-	(folder_scan_close): Properly unref the stream/close the fd on
-	exit.
-	(folder_scan_init_with_fd): Close the old fd if there is one.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):
-	New method, construct a data wrapper from an initialised parser.
-	(construct_from_parser): Empty implementation.
-	
-	* providers/mbox/camel-mbox-summary.c (message_struct_new):
-	Convert subject line to unicode, before storing in the summary.
-	(strdup_trim): Removed, no longer needed.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref
-	the folder after setting it in the new message.
-
-	* camel-mime-part.c (my_set_content_object): Have the headers
-	follow the content-type change here too.
-	(my_write_to_stream): Dont write content-type here, automatically
-	stored in the headers ...
-	(my_write_to_stream): Use header_disposition_format() to format
-	the content-disposition header.
-	(my_write_to_stream): Removed old code, all headers are now stored
-	in the camel-medium level, always.  Need to do the same with
-	camel-mime-message i suppose ...
-	(my_write_to_stream): Write the content using the parent class,
-	not some weird function.
-	(camel_mime_part_class_init): Dont override get_output_stream.
-	(camel_mime_part_encoding_from_string): Bleh, make it
-	case-insensitive.
-
-	* camel-mime-utils.c (header_content_type_is): Handle empty types.
-	(header_encode_string): Start of an implementation of the rfc2047
-	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get
-	tricky *sigh*)
-	(rfc2047_encode_word): Convert a single word/string into rfc2047
-	encoding.
-	(quoted_encode): Different quoted-printable encoding for rfc2047
-	encoding of headers.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream): Use
-	header_content_type_format() to format it.
-
-2000-04-21  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.h: Add prototype for header_param_list_free.
-
-	* camel-recipient.c: New function to remove all the types of a
-	recipient list.  I think this whole object needs a major review.
-
-	* camel-mime-message.c (camel_mime_message_class_init): Removed
-	parse_header_pair override, override add_header instead.
-	(_parse_header_pair): Renamed to add_header.
-	(remove_header): Add this method, to make sure we keep upto date
-	with removed headers too.
-	(_set_field): If given a NULL value, clear it out.
-	(_set_recipient_list_from_string): Constify.
-	(set_header): Override set_header from camel_medium.
-	(process_header): Local function to handle set/add/remove of each
-	header we know about.
-
-	* camel-mime-part.c (camel_mime_part_class_init): Removed
-	parse_header_pair setup.
-	(my_parse_header_pair): Moved into add_header(), removed.
-	(my_set_disposition): Allow a NULL disposition to clear it.
-	(my_set_content_id): Allow NULL content id to clear it.
-	(remove_header): Track removed headers.
-	(my_set_description): Allow NULL description to clear it.
-	(my_set_content_MD5): Make sure we copy the md5 value, and allow a
-	NULL value to reset it.
-	(my_set_filename): Copy the filename.
-	(my_set_header_lines): Removed.  Nothing uses it, it doesn't
-	actually serve any purpose.
-	(camel_mime_part_set_header_lines): Ditto.
-	(my_get_header_lines): Ditto.
-	(camel_mime_part_get_header_lines): Ditto.
-	(camel_mime_part_class_init): Remove *_header_lines setup.
-	(camel_mime_part_init): Remove header_lines init.
-	(my_finalize): Remove header_lines finalise.
-	(my_write_to_stream): Write the headers here.  This is just WRONG,
-	camel_medium should be doing this.
-	(my_get_output_stream): Kill a warning.
-	(camel_mime_part_encoding_to_string): Ditto.
-	(camel_mime_part_set_description): Unvirtualiase, use add_header()
-	to do the processing.
-	(my_set_description): Removed.
-	(set_disposition): Renamed from my_set_disposition.
-	(camel_mime_part_get_description): Get the descriptionf rom the
-	get_header method.
-	(my_get_description): Removed.
-	(my_set_filename): Removed.
-	(camel_mime_part_get_filename): Get the parameter from the
-	disposition.
-	(camel_mime_part_encoding_from_string): Handle NULL string.
-	(camel_mime_part_init): Remove reference to filename.
-	(my_finalize): Dont free filename.
-
-	* camel-mime-part.h (CamelMimePartClass): Removed
-	parse_header_pair() method, it doesn't add anything that
-	add_header() can't be used for.
-	(CamelMimePartClass): Remove *_header_lines methods.
-	(struct _CamelMimePart): Remove header_lines list.
-	(struct _CamelMimePart): Removed filename attribute.
-
-	* camel-medium.c (camel_medium_init): Init headers to null, not a
-	hashtable.
-	(add_header): Append the headers as a list.
-	(remove_header): Remove headers as a list.
-	(get_header): Likewise for lookup.
-	(free_header): Removed, no longer needed.
-	(finalize): Free headers using header_raw_clear().
-	(camel_medium_set_header): New function, to reset and override all
-	values of a header with a new value.
-
-	* camel-medium.h (struct _CamelMedium): Changed to use a
-	header_raw struct rather than a hash table, to store headers
-	(many headers can occur multiple times).
-
-	* camel-mime-utils.c (header_raw_find_next): New function, allows
-	you to find multi-valued header fields.
-	(header_disposition_format): New function to format/create
-	content-disposition header string.
-	(header_param_list_format_append): Function to format parameter
-	lists into a GString.
-	(header_content_type_format): Function to format content-type into
-	a usable format.
-	(header_set_param): allow NULL value to remove the parameter.
-	(decode_token): Renamed from header_decode_token.
-	(header_decode_token): New interface for external use.
-	(quoted_decode): Made static to kill annoying warnings.
-	(g_strdup_len): Killed, replaced with calls to g_strndup().
-	(rfc2047_decode_word): Made static to kill warnings.
-	(decode_coded_string): Terminated.
-	(g_string_append_len): Made static to kill warnings.
-	(header_decode_text): Made static to kill warnings.
-	(header_decode_text): Constify.
-	(rfc2047_decode_word): Constify.
-	(header_param): Constify.
-	(header_content_type_new): Copy the type/subtype strings.
-	(header_param_list_decode): Made static.
-	(header_param_list_format_append): Made static.
-	(quoted_decode): Constify.
-	(g_string_append_len): Constify.
-	(header_token_decode): New function to decode a single token.
-
-	* providers/mbox/camel-mbox-summary.c (header_write): Append a
-	trailing \n when writing headers.
-	(strdup_trim): Killed a warning.
-	(camel_mbox_summary_set_uid): Make sure the next uid is at least 1
-	higher than any existing one.
-	(header_evolution_decode): Use header_token_decode to get the
-	token.
-
-	* camel-mime-parser.c (folder_scan_header): Strip the trailing \n
-	of the end of all header lines.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.[ch]: Removed.
-
-	* providers/mbox/camel-mbox-parser.[ch]: Removed.  Removed
-	references to it.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): use libunicode iconv
-	functions rather than libc ones (since libc might not have them).
-	(header_decode_date): add autoconfiscation on timezone code
-
-	* camel.c (camel_init): call unicode_init ()
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Trim
-	leading/trailing spaces off the raw headers.
-
-	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.
-	
-	* gmime-content-field.c (_print_parameter): Duh, removed again
-	(@@#$@ cvs merge).
-
-	* camel-mime-utils.c (header_content_type_is): Constify.
-	(header_content_type_unref): Killed a couple warnings.
-
-	* camel-folder.c (_init): Removed more log crap.
-
-	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for
-	summary changes.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	Fixed for new summary interface.  Added a warning for using this
-	broken api.
-	(_get_message_by_uid): Fixed for message new with session
-	vanishing.
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_get_type): This is a subtype of
-	CamelSeekableStream, not CamelStream.
-
-	* camel-seekable-substream.c: clean up a lot.
-	(eos): When testing for end-of-stream, reset the parent position
-	before testing if it is at end-of-stream, since either (a) it may
-	have been seek'ed to eos by someone else, or (b) we may have been
-	seek'ed away from eos and it hasn't been synced yet.
-
-	* camel-medium.[ch] (camel_medium_add_header): const poison.
-	(Belatedly goes with my change of 2000-02-23.)
-	(camel_medium_init): Use g_strcase_{hash,equal} on the header
-	array.
-	
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (my_set_input_stream): 
-	* camel-data-wrapper.c (set_input_stream, set_output_stream): do
-	better reference counting of streams so they actually go away
-	when they should.
-
-	* camel-log.[ch], *: Nuke camel log stuff. Replace calls to
-	CAMEL_LOG_WARNING with calls to g_warning.
-
-	* camel-data-wrapper.[ch]:
-	* camel-simple-data-wrapper.[ch]:
-	* camel-medium.[ch]: Clean, polish, document. Most of the gtk-doc
-	comments added to camel-data-wrapper.c note serious problems that
-	need to be fixed.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.[ch]: Remove the "session" field from
-	CamelMimeMessage. Nothing uses it, about half of the existing
-	calls to camel_mime_message_new_with_session pass NULL, and
-	there's no obvious reason for it to be there.
-
-	* providers/MH/camel-mh-folder.c:
-	* providers/maildir/camel-maildir-folder.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-utils.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/pop3/camel-pop3-folder.c: Use camel_mime_message_new
-	instead of camel_mime_message_new_with_session.
-
-	* camel-session.c (get_store_for_protocol_with_url): Set the
-	exception if no provider is found.
-
-	* camel-url.c: Add code to encode and decode %-escapes in URLs,
-	and do some additional correctness-checking on URL syntax. From
-	Tiago Antào with modifications by me.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): add nntp
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c: Fix switch statement.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c (_exists): always return TRUE
-	for now.  we need to check the server response to make sure the
-	group exists.
-	(_get_message_by_uid): make sure to account for the \n we add to
-	the string after every line.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): function
-	to get the headers using the XOVER command.
-	(get_HEAD_headers): function to get the headers using the HEAD
-	command on each message. slooooooow.
-	(camel_nntp_get_headers): make this function use either XOVER or HEAD
-	versions depending on whether or not the server extension is present.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* camel-formatter.[ch]: This didn't belong in Camel. Move to mail/
-
-	* Makefile.am, camel-types.h: remove references to
-	camel-formatter.
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message
-	for broken function.
-	(_folder_close_cb): Same.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am (pthread_SRC): Use correct names for the pthread
-	source variables.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): fix various
-	bugs in APOP code (still untested) and some of the error cases.
-
-	* camel-provider.h: Clarify what provider.protocol, provider.name,
-	and provider.description should be.
-
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: update protocols, names,
-	and descriptions
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	implement get_message_by_number for the mail fetch code.
-
-2000-04-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: reformatted to fit
-	the standard indent format used by helix code
-
-2000-04-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c: New file with new function to dot-lock an mbox
-	file and copy it to a safe private directory.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/.cvsignore: Added a .cvsignore file.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	actually record the pid returned by fork(). Noticed by clahey.
-
-	* providers/smtp/camel-smtp-transport.c: #include <sys/param.h>
-	for MAXHOSTNAMELEN. (This is a stopgap: some of the uses of
-	MAXHOSTNAMELEN are wrong anyway...)
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: fixes to numerous bugs;
-	should now build fine.
-	* providers/Makefile.am: Readded smtp now that smtp builds without
-	error.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_next_uid): Public function to get the next
-	uid, makes sure its saved to disk too.
-
-	* camel-mime-part.c (my_finalize): Fix disposition crap with a
-	real disposition.
-	(my_set_disposition): Likewise.
-	(my_get_disposition): And here.
-	(my_write_to_stream): And here, needs more cleanup.
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Assign a
-	new uid at this point.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream):
-	Make something up if we have an invalid/missing content type
-	(i.e. text/plain).
-
-2000-04-19  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_delete): Fixed completely
-	broken switch() syntax, only compiled because errno is a macro on
-	some systems.
-	(_list_subfolders): Likewise.
-
-2000-04-18  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_init): init stream to null.
-
-	* providers/mbox/camel-mbox-summary.c
-	(CAMEL_MBOX_SUMMARY_VERSION): Moved to .c file, incremented.
-	(index_folder): Changed to have index passed via the summary.
-	(decode_string): Do a sanity check on the string size, so we dont
-	visit g_malloc()'s friendly abort().
-
-	* camel-folder-pt-proxy.c (camel_folder_pt_proxy_class_init):
-	Removed reference to set_name.
-	(_set_name): Removed.
-
-	* providers/mbox/camel-mbox-utils.c
-	(parsed_information_to_mbox_summary): Removed.  Most of this file
-	is about to be binned.
-
-	* providers/mbox/camel-mbox-search.c (func_header_contains): Fixes
-	for changes to summary interface.
-	(struct _searchcontext): Remove pointer to message info, get it
-	straight from the mboxsummary.
-	(camel_mbox_folder_search_by_expression): New summary interface.
-	(camel_mbox_folder_search_by_expression): Uh, the summary is not
-	an object anymore (well not yet).
-
-	* providers/mbox/camel-mbox-folder.c
-	(camel_mbox_folder_class_init): Removed set_name init.
-	(_set_name): Removed.
-	(_open): Call new summary interface.
-	(_close): Use new summary interface.
-	(_create): Removed a summary object leak.
-	(_get_message_count): New summary interface.
-	(_get_uid_list): Use new summary interface. FIXME: this is leaky.
-	(_get_message_by_uid): Use the new summary interface, some
-	cleanup.
-	(_append_message): Totally changed, basically just appends the
-	message directly, ignores the summary (for now), the summary will
-	fix itself up if it needs to.
-	(_check_get_or_maybe_generate_summary_file): Bye bye old code.
-	(summary_get_message_info): Implement get_message_info again, for
-	folder.
-
-	* camel-folder.c (camel_folder_class_init): Removed set_name
-	setup.
-	(_set_name): Moved contents into _init.
-	(_init): Perform the old functions of set_name here.
-
-	* camel-folder.h: Removed the set_name internal interface.
-
-2000-04-14  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.[ch]: Completely replaced with
-	new code.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-folder-summary.[ch].
-
-	* camel-folder.h (struct _CamelFolder): Removed summary.
-	(struct _CamelFolder): Changed flags to be 1 bit bitfields.
-
-	* camel-folder-summary.[ch]: Class removed entirely.
-
-	* camel-folder.c (camel_folder_get_summary): Removed.
-	(camel_folder_summary_get_message_info): Moved from
-	camel-folder-summary.c
-	(camel_folder_summary_get_subfolder_info): Moved from
-	camel-folder-summary.c
-
-	* camel-mime-parser.c (folder_scan_step): Store the start of
-	headers and start of from in the scan state.
-	(camel_mime_parser_tell_start_headers): Query the start of the
-	headers.
-	(camel_mime_parser_tell_start_from): Query the cached start of
-	from marker.
-
-2000-04-13  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_free): Removed this
-	function.  If its too dangerous to use, it shouldn't be here.
-	(gmime_content_field_ref): Also ref the embedded content-type.
-	(gmime_content_field_unref): Ditto to unref it.
-
-	* camel-mime-utils.h: Add a refcount for content-type header.
-
-	* camel-mime-utils.c (header_content_type_unref): Implement unref
-	for content-type.
-	(header_content_type_ref): Implement ref for header content type.
-
-2000-04-12  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.h: Changed to use a _header_content_type.
-	Added type/subtype back for compatability with clients.
-	
-	* gmime-content-field.c: Basically a total rewrite, and now just a
-	thin wrapper ontop of header_content_type.
-	(_free_parameter): Got rid of it.
-	(gmime_content_field_new): Use header_content_type_* functions.
-	(gmime_content_field_set_parameter): Likewise.
-	(_print_parameter): Blow away.
-	(gmime_content_field_write_to_stream): Get details from the
-	content_type field.  Should check if it needs to escape chars in
-	the paramter value.
-	(gmime_content_field_get_mime_type): Likewise.
-	(___debug_print_parameter): Get rid of this rather annoyingly
-	named function.
-	(gmime_content_field_get_parameter): Simplified function.
-	(gmime_content_field_construct_from_string): Fixed this to use a
-	real parser.
-	(gmime_content_field_is_type): New function to test if a type matches.
-	(gmime_content_field_construct_from_string): Track type/subtype
-	from subordinate content_type header struct.
-
-	* gmime-rfc2047.[ch]: Removed.  Unused.
-
-	* camel-stream-b64.[ch]: Blown away more duplicated code.
-
-	* Makefile.am: Removed camel-stream-b64.[ch], and
-	gmime-base64.[ch].
-
-	* camel-mime-part.c (my_get_content_object): Replaced
-	camel-stream-b64 with camel-stream-filter/camel-mime-filter-basic.
-	(my_write_content_to_stream): Replaced camel-stream-b64 with the
-	camel-stream-filter with an encoder.
-	(my_get_content_object): Also implement quoted-printable decoding.
-	(my_write_content_to_stream): Also implement quoted-printable
-	encoding.
-	(my_get_output_stream): Took out stream-b64 code (nothing's being
-	executed yet anyway).
-
-	* gmime-base64.[ch]: Blown away.  Not used, dont need it.
-
-	* camel-mime-utils.h: Added offset for this header.  Records where
-	it is in the source.
-
-	* camel-mime-utils.c (header_raw_append_parse): Add offset
-	parameter, to store where the header is stored in the stream.
-	(header_raw_append): Added offset param.
-	(header_raw_find): Return offset, if a pointer supplied for it.
-	(header_raw_replace): Add offset param.
-	(header_content_type_new): New function, to create an empty
-	content type.
-	(header_content_type_set_param): Set a parameter in the
-	content-type.
-	(header_set_param): Generic header parameter setting function.
-	(header_decode_string): Handle NULL input.
-
-	* camel-mime-parser.c (camel_mime_parser_headers_raw): New
-	function to get access to all the raw headers.
-	(folder_scan_header): Keep track of the header start position, and
-	store it when saving the header.
-
-2000-04-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c: Moved a bunch of printf's to debug.
-
-	* camel-mime-parser.c: Moved a bunch of printf's to debug.
-	(folder_scan_header): Detect end of each header line using the
-	last scanned char, and not the last scanned position.
-
-	* camel-mime-filter-index.[ch]: Indexing filter.  Indexes unicode
-	sequences into ibex files.
-
-2000-04-09  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c: Dont include gmime-base64.h
-
-	* camel-mime-filter-charset.c (complete): Implement the completion
-	function.
-
-	* camel-mime-parser.c (folder_scan_step): If we get to the end of
-	the body data, check any filters for outstanding completion data.
-	(camel_mime_parser_scan_from): Set whether we scan for "From "
-	headers or not.
-
-	* camel-stream-filter.c (do_read): If we get to end of stream on
-	the source, then call the filtering completion function to see if
-	we have any more data to return.
-
-	* camel-mime-filter-basic.c (filter): Implement quoted printable
-	encoding and decoding filters.
-	(complete): And the complete function as well.
-
-	* camel-mime-utils.c (base64_encode_close): Also take an input
-	buffer, allow closing of filters.
-	(quoted_encode_step): First cut, simple quoted-printable encoder.
-	Doesn't handle trailing spaces/tabs on end of line properly yet.
-	(quoted_encode_close): Complete a quoted-encoding.
-	(is_qpsafe): New type check, for quoted-printable safe characters
-	(that do not need encoding).  Thats all bits used in the type
-	table!  Rebuilt the types table.
-	(header_content_type_is): Checks a content type against at
-	type/subtype match.
-	(header_content_type_param): Handle NULL content type pointer.
-
-2000-04-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (filter): Implement the base64
-	encoder.  Problem is, there is no way to know when to close it.
-	Close/Reset will have to provide the same args as filter, so it can
-	flush remaining data *sigh*
-
-	* camel-mime-utils.c (base64_encode_step): A rather complex base64
-	encoder, fast?
-	(base64_step_close): Companion function to finish off the base64
-	sequence.
-
-	* camel-mime-part.c (my_write_content_to_stream): Changed to use
-	camel_stream_write_to_stream().
-
-	* camel-stream.[ch] (camel_stream_write_to_stream): From
-	camel_stream_b64_write_to_stream().  Fixed some infinite loop
-	bugs with error conditions.
-
-	* camel-stream-b64.[ch] (camel_stream_b64_write_to_stream): Removed.
-	This has nothing to do with stream-b64, so i've moved it to
-	CamelStream.
-
-	* camel-mime-utils.h: Add a comment about refcounting
-	header_content_type struct.
-
-	* Makefile.am: Added camel-stream-filter*.[ch].
-
-	* camel-stream-filter.[ch]: Class to implement a generic
-	(multipass) filter ontop of a stream.  Only implements a read-only
-	stream.
-
-	* camel-mime-parser.c (camel_mime_parser_filter_add): Ref the
-	filter we just added.
-
-	* Makefile.am: Added camel-mime-filter*.[ch].
-
-	* camel-mime-filter-charset.[ch]: A filter to preform character set
-	conversion (uses unicode_iconv).
-
-	* camel-mime-filter-save.[ch]: A simple filter which will save all
-	data directly to a file or file descriptor.
-
-	* camel-mime-filter-basic.[ch]: Implements the basic mime filters,
-	base64 and quoted-printable decoding (encoding not implemented yet).
-
-	* camel-mime-filter.[ch]: A filtering class, which can filter streams
-	of data without having to copy them.  Simpler than stream classes,
-	and can be plugged into a single stream class (when i write it).
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Clarify error
-	messages.
-	(finalize): fix a bug in camel_exception usage
-	(pop3_connect): Remember the password after asking for it the
-	first time.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am: Added camel-mime-parser/camel-mime-utils.
-
-	* camel-mime-parser.c: Fast mime parser.
-
-	* camel-mime-utils.c: Mime utility functions, and email header
-	parsers.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed smtp for now, its a long way from
-	building.
-	* providers/smtp/Makefile.in: Removed file that shouldn't have been
-	checked in.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_get_full_name): Remove exception param
-	from get_full_name() called, since get_full_name() was changed to
-	not have an exception in the last param (see dan's notes below).
-	(_get_name): same.
-
-2000-04-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-store.[ch]: Reorganize the folder-fetching methods and
-	implement a folder cache so that multiple requests for the same
-	folder will yield the same CamelFolder object (as long as it
-	remains active). Includes some code to remove no-longer-active
-	folders from the cache, but it doesn't get used since nothing is
-	ever unref'ed in Camel right now...
-	
-	* providers/mbox/camel-mbox-store.c:
-	* providers/pop3/camel-pop3-store.c: update for CamelStore
-	changes.
-
-	* camel-folder.[ch]: Remove the (unused) CamelException argument
-	from camel_folder_get_name and camel_folder_get_full_name.
-	(camel_folder_set_name): make this go away since changing a
-	folder's name after it has been created could result in it
-	conflicting with a separately-issued folder.
-	
-2000-04-05  Dan Winship  <danw@helixcode.com>
-
-	* g_url_new really wanted to take a CamelException. So, rename
-	Gurl to CamelURL, g_url_* to camel_url_* (with camel_url_new
-	taking an exception), and url-util.[ch] to camel-url.[ch]. Also
-	force url->port to be numeric and remove camel_service_getport. (I
-	was confused before: the URL RFC says the port must be numeric, so
-	we don't want to do getportbyname.)
-
-2000-04-01  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Compare
-	mbox_file_size and mbox_modtime to the results of stat()ing the
-	mbox file, not the summary file. Duh.
-	(_close): Update the summary's mbox_file_size and mbox_modtime
-	before writing it to disk.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_save,
-	camel_mbox_summary_load): Wow. I must have been tired when I wrote
-	this code. First, the comparison bug above. Second, it was using
-	ntohs and htons instead of ntohl and htonl. Third, I was reading
-	the status flag byte in two different places and thus getting out
-	of sync. Fourth, it was writing out field_length bytes of each
-	header field after having converted field_length to network byte
-	order, resulting in lots of random crap being appended, and the
-	summary files being huge. (Fortunately, since the size/modtime
-	comparison was biffed, the garbage summary read from disk was
-	always immediately discarded.)
-
-	* providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): fix
-	an off-by-one error that caused the last-used UID to be reused if
-	the summary file was regenerated. (That one wasn't my fault. :-)
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-mem.c: implement unimplemented methods
-
-	* gmime-content-field.c
-	(gmime_content_field_construct_from_string):
-	* data-wrapper-repository.c
-	(data_wrapper_repository_get_data_wrapper_type):
-	* camel-simple-data-wrapper.c (my_write_to_stream):
-	* camel-mime-part.c (my_set_input_stream):
-	remove debugging printf()s that no longer seem useful.
-
-2000-03-31  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (text_to_html): Added "convert_newlines_to_br"
-	boolean param, to give the option of not converting '\n's to <br>
-	tags. This way, when we stick stuff in a <pre> tag, newlines stay
-	newlines.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (handle_text_plain): Use <pre> tag to force
-	the use of monospaced fonts.
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_getport): Add a htons in the
-	default_number case, and document the fact that the function
-	returns the port in network byte order.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert
-	Miguel's change. The port number bug was actually somewhere
-	else, and the IP address copying code was fine already.
-	
-2000-03-29  Miguel de Icaza  <miguel@gnu.org>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Add htons
-	(port), and only copy 4 bytes for the IP address to prevent a DNS
-	attack. 
-
-2000-03-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	make this return a CamelStream rather than a
-	CamelSeekableSubstream, because that's the way Gtk objects tend to
-	work.
-
-	* camel-service.c (camel_service_gethost,
-	camel_service_getport): convenience functions to canonicalize
-	the host and port values of a service's URL.
-	* providers/pop3/camel-pop3-store.c: use them
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Make this work when
-	the inbox file doesn't yet exist.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): uncomment
-	the call to unlink the temp file: there's no way to tell
-	camel_stream_fs to truncate a file, so reusing the same file was
-	resulting in junk at the ends of messages.
-
-	* camel-folder.[ch]: add delete_message_by_{number,uid}.
-
-	* providers/pop3/camel-pop3-folder.[ch]: implement
-	delete_message_by_uid. Add a close method to do expunging
-	of deleted messages if requested.
-
-	* providers/pop3/camel-pop3-store.[ch]: support for
-	CamelPop3Folder::close. (You have to close the connection
-	in order to expunge the folder, thus the store may be
-	connected in the CamelService::is_connected sense when it
-	is not actually connected to the server.) Also some bugfixes.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Unref the
-	output_stream when done, close doesn't do it.
-	(_append_message): Clear all uid's from the appending messages, so
-	they are reassigned proper unique id's.
-
-	* gmime-utils.c (get_header_array_from_stream): Actually free the
-	header, it is copied elsewhere.
-
-2000-03-26  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Added
-	folder parameter to function.  Fixed callers.
-	(index_message): Index a message as it is assigned a unique id.
-
-	* camel-mime-part.c (my_set_content_id): Make sure we malloc and
-	copy the content_id, otherwise *poof*
-
-2000-03-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-medium.c (_finalize): Another leak, unref the content if
-	finished with it.
-
-	* camel-recipient.c (camel_recipient_table_free): Plug another
-	memory leak - actually free the recipient table.
-
-	* camel-mime-message.c (_finalize): Plugged a memory leak with the
-	flags table.
-
-	* gmime-utils.c (_store_header_pair_from_string): A simpler, more
-	debuggable and functionally identical header extraction function.
-
-2000-03-24  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_set_parameter):
-	Remove the hash table entry before freeing its key and data.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): Add pop3.
-
-	* providers/pop3/camel-pop3-store.c: keep separate input and
-	output streams so the output doesn't end up being buffered.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	finish implementing this.
-
-2000-03-27  Michael Meeks  <michael@helixcode.com>
-
-	* camel-mime-part.c (my_set_disposition): fix so less broken.
-	(my_finalize): remove dodgy disposition free.
-
-	* camel-data-wrapper.c (my_set_mime_type_field): unref instead of
-	free on mime_type.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_free_auth_types): new routine to
-	free the data allocated by camel_service_query_auth_types.
-
-	* providers/pop3/camel-pop3-store.c (free_auth_types): implement
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): rename
-	camel_stream_mem_new_with_buffer to ..._with_byte_array and add a
-	new ..._with_buffer that takes a char * rather than a GByteArray.
-
-	* Remove CamelStreamBufferedFs, since CamelStreamBuffer makes it
-	redundant.
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.[ch]: change the CamelFolderSummary
-	interfaces to allow partial summary queries (for dealing
-	with very large folders). Remove the "extended_fields" from
-	CamelFolderInfo and CamelMessageInfo: this is better dealt
-	with by subtyping.
-
-	* providers/mbox/camel-mbox-summary.[ch]: Make CamelMboxSummary a
-	subclass of CamelFolderSummary. Update interfaces for that. Remove
-	the internal/external summary distinction. Remove the (unused) md5
-	checksum in the folder summary. Change the summary file format
-	(primarily to make it no longer byte-order dependent) and add a
-	version number to it so it will be easier to change in the future.
-	
-	* providers/mbox/camel-mbox-folder.[ch]
-	* providers/mbox/camel-mbox-search.c
-	* providers/mbox/camel-mbox-utils.c: update for summary changes
-
-	* camel-exception-list.def: add
-	CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID
-	
-2000-03-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-provider.c: Added flag to provider
-	initialisation, to match changed structure.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.[ch]: Added async search api.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Changed to use an
-	asynchronous interface.
-	(camel_mbox_folder_search_cancel): Cancel function for async
-	interface.
-
-2000-03-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Function
-	to read one line of any size from a stream and return it in
-	allocated memory.
-
-2000-03-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_query_auth_types): New function
-	to query a service for the authentication protocols it supports.
-	* providers/pop3/camel-pop3-store.c (query_auth_types): implement
-
-	* camel-provider.c (camel_provider_scan): New function to
-	scan the provider dir and return a list of all providers.
-
-	* providers/pop3/camel-pop3-folder.c: fill this in partially
-	* providers/pop3/camel-pop3-store.c: make camel_pop3_command
-	return the text after "+OK"/"-ERR" and add a separate
-	camel_pop3_get_additional_data to get the message body or
-	whatever. Also make them take a CamelPop3Store rather than
-	a CamelStreamBuffer.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (debug): Disabled some useless debug
-	messaging.
-
-2000-03-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3: some initial bits of the POP3 provider, to
-	make Matt happy. Incomplete, untested, etc.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c 
-	(camel_mbox_summary_append_internal_to_external): copy the size field
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): initialize 
-	message_info to NULL
-
-	* camel-folder-summary.h: added the size field.
-
-	* providers/mbox/camel-mbox-summary.h: 
-	added the received_date field.
-
-	* providers/mbox/camel-mbox-summary.c:
-	documented all functions.
-
-	* camel-folder-summary.h: name change and 
-	new fields.
-
-	* providers/mbox/camel-mbox-search.c: update to 
-	conform to name change in the summary fields.
-
-2000-03-10  bertrand  <bertrand@helixcode.com>
-
-	* camel-service.h: cosmetic changes.
-
-2000-03-09  Dan Winship  <danw@helixcode.com>
-
-	* s/HelixCode/Helix Code, Inc./ in the copyrights
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_mime_part): 
-	plug mem leaks due to bad documentation
-	of camel_content_field_get_mime_type
-	(print_camel_body_part): idem
-	(handle_multipart_alternative): idem
-
-	* gmime-content-field.c (gmime_content_field_get_mime_type): 
-	documentation fix.
-
-
-	* camel-mime-part.c (my_finalize): unref the 
-	content_input_stream if any. 
-
-2000-03-06  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-fs.c (_seek): fix a bogus calculation
-	in the return position.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* camel-session.h: cosmetic fixes.
-
-	* camel-stream-fs.c (_read): 
-	(_seek): fixed the current position so that it refers
-	to the current position in the stream, not in its parent.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Ref the summary
-	after we have got it.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* camel-mime-part.c (my_write_content_to_stream): 
-	stream the raw content instead of nothing if the encoding
-	is not supported.
-
-	* camel-stream-fs.c (_seek): handle eos more
-	properly.
-
-	* camel-formatter.c (get_bonobo_tag_for_object): 
-	bonobo-goad-id is the good key to look for. 
-	(get_bonobo_tag_for_object): close the <object> tag.
-	(get_bonobo_tag_for_object): the correct syntax for the
-	to set a parameter inside an <object> tag is :
-	<object classid="..."> <param name="uid" value="..."> <param ...>
-	</object>
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): 
-	use set_input_stream instead of construct_from_stream
-	to feed the message object. 
-
-	* camel-data-wrapper.c (my_write_to_stream): reset output stream.
-	(my_set_input_stream): unref the previous input stream.
-	use the set_output_stream for default behaviour.
-	(my_set_output_stream): unref previous output stream.
-
-	* camel-mime-part.c (my_write_content_to_stream): reset content
-	object output stream.
-
-2000-03-03  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make
-	sure we open with create with a creation mask.
-
-2000-03-01  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_stream): DO NOT assert on
-	content type, we have fallback code 4 lines below it ... *sigh*
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer
-	to build.
-
-	* camel-stream-buffer.[ch]: Generic buffer which can be applied to
-	any stream.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_image): in the case
-	of images, put the content object output stream
-	in the url. This allows the message browser
-	to show inline images.
-
-	* camel-stream-b64.c (my_read_encode): fixed state
-	0 keep value. 
-
-2000-03-02  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): don't forget to 
-	set the state to 0 after 3.
-	(my_read_encode): don't forget to encode, even in state 3.
-
-	* camel-simple-data-wrapper.c: static functions are prefixed 
-	with my_ instead of _
-	* camel-multipart.c: static functions are prefixed 
-	with my_ instead of _
-	(my_write_to_stream): commented.
-	(my_write_to_stream): warning in case the boudary is set
-	but is a zero length string.
-
-	* camel-mime-part.c (camel_mime_part_encoding_from_string): 
-	remove debug trace. 
-	
-	* camel-mime-part.c: Replaced all static functions
-	with name begining with _ by the same name begining
-	with "my_" to prevent the possible conflicts 
-	with system symbols Dan warned us about. 
-	
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	use CamelStreamB64 type for the input stream.
-
-	* camel-mime-part.c (_get_content_object): remove 
-	debugging trace
-	(_write_content_to_stream): implement the b64 
-	encoding the new way (that is using camel_stream_b64)
-
-	* camel-data-wrapper.c (my_write_to_stream): 
-	fix implementation so that it writes properly
-	to the output stream even.
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	fix implementation. 
-
-2000-02-29  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): new
-	utility function. 
-
-	* camel-data-wrapper.c (_write_to_stream): default
-	implementation. 
-
-	* gmime-utils.c (_store_header_pair_from_string): 
-	revert strange changes. 
-
-	* camel-stream-b64.c (my_read_decode): set eos to true when we
-	have read the whole input stream. 
-	(my_reset): set eos to FALSE.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (_parse_header_pair): Dont free this either.
-
-	* camel-medium.c (_remove_header): Ugh, dont free the header
-	before we actually remove it.
-	(_add_header): Ugh, dont free hashtable entries which may be
-	duplicated (hash_insert _will_ reference that memory).
-
-	* string-utils.c (string_trim): Trimming a 0-length string is not
-	an error.
-
-	* camel-mime-message.c (_parse_header_pair): Fixed very broken
-	memory handling of header_name/value.
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev):
-	Initialise end_of_last_message always.
-	(camel_mbox_copy_file_chunk): Stop trying to read if we run out of
-	data, rather than looping forever.
-	(camel_mbox_write_xev): Use an open flag when opening with create.
-
-	* camel-folder.c (camel_folder_search_by_expression): No, its not
-	a fatal error to search on a non-searchable folder, you just dont
-	get any matches.
-	(_open): Dont open an opened folder (i dont see why this is really
-	a bug, but what the hell ...)
-
-	* providers/mbox/camel-mbox-folder.c (_init): Set search cap on.
-	(_open): Call parent class to perform open.  Remove folder-open
-	check to parent instead.
-	(_create): open takes a creation mask, dont use umask to try and
-	set the open mode.
-	(_delete): Dont bother checking folder==NULL, its already been
-	checked on the external interface (changed to an assertion, this
-	would have to be a camel bug).
-	(_delete_messages): Likewise.
-	(_create): Ditto.
-	(_init): Dont go and clear all the paths and shit that the parent
-	open just setup for us.
-	(_delete_messages): Get rid of more umask stuff.
-	(_append_message): Make sure we pass file mode to open with create.
-	(_append_message): Cleaned up some indenting to make it readable.
-
-	* camel-stream-b64.c (my_read_encode): Fixed a typo.
-
-	* providers/mbox/camel-mbox-search.c: Changed to use e-sexp,
-	rather than filter-sexp.
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): encoding
-	filter.
-
-2000-02-23  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c: changed the __static 
-	suffix into a my_ prefix. 
-	(camel_stream_b64_set_mode): reset the persistent
-	status. 
-	(my_read_decode): remove superfluous %
-	
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_copy_file_chunk): 
-	fix exception description message.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: Add camel_session_get_transport_for_protocol.
-
-	* camel-transport.h:
-	* camel-transport.c: Add an abstract CamelTransport class.
-
-	* providers/sendmail/*: A CamelTransport that uses sendmail
-	to deliver mail.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: use CamelExceptions for run-time errors, not
-	incorrect code. Don't bother validating that an object exists from
-	inside one of its methods, since you couldn't have gotten there if
-	it didn't. Fix some code style bugs.
-
-	(_init): Rename init_with_store to init and add parent_folder,
-	separator, and name arguments.
-	(_set_name): Get separator from self, not parent_store now.
-
-	* camel-store.h:
-	* camel-store.c: Remove get/set_separator.
-
-	* providers/mbox/: Update for above.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (_finalize): Free the data in the headers hash
-	table.
-	(_add_header): g_strdup the header name and value when adding it.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_headers_from_stream): Free the header
-	data after calling camel_medium_add_header, since it will have
-	g_strdup()ed it itself.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c: Dont compile by default.
-
-	* providers/mbox/Makefile.am: Fuck off the filter code.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c (read_decode__static): 
-	don't read the char if we reached the length
-	of the output buffer. Hours lost on this
-	%$!@# bug : 3.5
-
-	* camel-folder.c (camel_folder_get_subfolder): 
-	(camel_folder_create): 
-	(camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	(camel_folder_list_subfolders): 
-	(camel_folder_expunge): 
-	(camel_folder_get_message_by_number): 
-	(camel_folder_get_message_count): 
-	(camel_folder_append_message): 
-	(camel_folder_copy_message_to): 
-	(camel_folder_get_summary): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Check folder state (open/close) and raise an
-	exception if it is not ok. 
-	
-	* providers/mbox/camel-mbox-folder.c (_create): 
-	create the file and the path with two different
-	names.
-
-	* camel-folder.c (_create): handle the case 
-	when the folder name starts with '/'
-
-	* camel-exception.c (camel_exception_new): use 
-	(void) instead of () in decl.
-
-	* camel-exception.h: cosmetic fixes.
-
-	* camel-exception.c (camel_exception_init): new routine.
-	Fix a bug in mail/message-list.c
-	
-
-	* camel-folder.h: cosmetic changes.
-
-	* camel-stream-b64.c (reset__static): added a
-	reset method. Thanks message-browser to find
-	so much bugs :)
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd
-	Unicode libs.
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-formatter.c (lookup_unique_id): 
-	awful hack to test get_output_stream.
-	* camel-stream-b64.[ch] :
-	b64 encoding/decoding is now implemented as
-	a stream. 
-	
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-seekable-substream.c (_reemit_parent_signal): 
-	emit "data_available" when parent stream emits it. 
-
-
-2000-02-21  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am: Uh, fixed LIBADD again.  What was
-	there was never ever going to work, wasn't it tested?
-
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.h: (struct _CamelSession): Add authenticator.
-
-	* camel-session.c (camel_session_new): Add authenticator.
-	(camel_session_query_authenticator): New function to query the
-	session authenticator for password, etc, information.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: add CamelExceptions to several functions. Use
-	camel_session_new to initialize the session and URL fields of
-	created CamelStores as appropriate.
-
-	* camel-store.h:
-	* camel-store.c
-	* camel-service.h:
-	* camel-service.c: Move the session and url (and associated
-	functions) from CamelStore to CamelService. Add url_flags to
-	CamelService so subclasses can specify which URL components
-	are mandatory for them.	Add camel_session_new for
-	camel_session_get_store* to use.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-store.c:
-	* providers/mbox/camel-mbox-store.h: Update for above changes.
-
-	* camel-exception-list.def: Once camel is being used for real,
-	exceptions won't be renumberable. So renumber them now to make
-	more room to add exceptions to the various categories later, and
-	add a big warning message.
-
-2000-02-20  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/Makefile.am: add libibex back to
-	libcamelmbox_la_LIBADD
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Added exception to call,
-	and fixed caller.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Major changes, to use
-	the sexp evaluator from filter/filter-sexp.c to implement the
-	searching.
-	(func_body_contains): Changed to support multiple strings in 1
-	command (results or'd together)
-
-	* url-util.c (g_url_new): Fixed a typo (colon == 0 isn't right),
-	and made it so full url's are absolute pathed (Dan, this is how it
-	has to work!).  Also, always include a path part, even if it is an
-	empty string.
-
-2000-02-18  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-types.h: New header with the typedefs for all camel
-	classes. Now the class headers can just include this and the
-	header for the parent type. This makes it possible for
-	CamelService to include a CamelSession without creating an
-	#include loop.
-
-	* camel/*:	
-	* composer/e-msg-composer-attachment-bar.h:
-	* mail/folder-browser.c:
-	* mail/message-list.c: frob #includes to match the new reality
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-service.h:
-	* camel/camel-service.c: Make camel-service us a Gurl internally.
-	Remove the login/password interfaces and instead provide
-	camel_service_connect_with_url. Add CamelExceptions
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	(handle_text_html): use camel_stream_reset instead
-	of seek. The formatter should be able to work 
-	with all streams, not only seekable streams. 
-	In the case where some provider implementation
-	would not be able to provide a reset method 
-	to their stream, implementors would have
-	to find a workaround.
-
-	* camel/camel-session.c (camel_session_new): use
-	(void) instean of () in function decl.
-
-	* camel/camel-folder.c: ifdef async operation 
-	related code. 
-
-	* camel/camel-seekable-stream.c (_seek): added a warning.
-	(_reset): default implementation of reset for seekable
-	stream.
-
-	* camel/camel-mime-message.h: set_received_date declaration fix.
-	cosmetic changes.
-
-	* camel/providers/mbox/camel-mbox-provider.c (camel_provider_module_init): 
-	use (void) instead of ().
-
-	* camel/camel-stream.c (camel_stream_reset): 
-	new method for CamelStream.
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/url-util.c (g_url_to_string): New function to convert
-	a Gurl back into a char *.
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	revamped so that it uses the output stream
-	of the data wrapper
-	(handle_text_html): ditto.
-	
-	
-	* camel/camel-simple-data-wrapper.h: 
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new): 
-	use (void) instead of ().
-	(_get_output_stream): simple implementation. 
-
-2000-02-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_set_input_stream): ref input stream
-	(_set_output_stream): ref output stream
-	(_finalize): unref input and output streams
-
-	* camel/camel-seekable-substream.c (_set_bounds): don't
-	seek the begining of the substream.
-	(_eos): fix eos condition testing. 
-	(_finalize): unref parent stream
-	(_init_with_seekable_stream_and_bounds): ref parent stream
-
-	* camel/gstring-util.c (g_string_equal_for_hash): 
-	(g_string_equal_for_glist): return type is int.
-
-	* camel/camel.h: 
-	* camel/camel.c (camel_init): use (void) 
-	instead of ().
-	
-2000-02-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Added
-	libfilter to link line (temporarily?).  Required for
-	filter-sexp.
-
-2000-02-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-multipart.c (_localize_part): 
-	this routine replaces the _read_part routine
-	and does not store the part in a buffer. 
-	(_set_input_stream): use the set_input_stream
-	instead of the construct_from_stream.
-	each bodypart is given an input stream. 
-
-	* camel/camel-mime-part-utils.c: 
-	include the data-wrapper-repository header. 
-	(camel_mime_part_construct_content_from_stream): 
-	use the set_input_stream instead of the 
-	construct_from_stream method. 
-
-	* camel/camel-seekable-substream.c (_set_bounds): 
-	cur position is set to 0 not to inf_bound.
-
-2000-02-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: include gmime-base64.h
-	various compilation and runtime fixes.
-	(_set_input_stream): store the input substream 
-	for the content object.
-
-	* camel/camel-data-wrapper.h: declare the 
-	set/get function on input/output stream.
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	don't use a temporary mem stream. 	
-
-	* camel/camel-seekable-substream.c (_seek): 
-	(_eos): 
-	(_read): the substream can be unlimited in length
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_class_init): 
-	set the get/set_input/output_stream methods. 	
-
-	* camel/camel-multipart.c (_construct_from_stream): 
-	camel_stream_seek -> camel_seekable_stream_seek
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add
-	the unicode libraries as well.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): Add
-	error reporting here.  Desire to use Solaris increases.  Hair loss
-	in the last two hours: 5,400.
-
-	* camel/providers/mbox/camel-mbox-provider.c
-	(camel_mbox_get_provider): Renamed function.
-
-	* camel/camel.h: All include files use camel/ now here.
-
-	* camel/providers/mbox/Makefile.am: Drop all the dynamism from
-	Camel, and make this a standard library.
-
-2000-02-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_array_from_stream): use the 
-	eos stream method. 
-	(gmime_read_line_from_stream): ditto.
-
-	* camel/camel-stream-fs.h (struct ): add the eof field
-	cosmetics changes. 
-
-	* camel/camel-stream-fs.c (camel_stream_fs_init): set eof.
-	(_read): set eof on end of file.
-	(_eos): implemented.
-
-	* camel/gmime-utils.c (get_header_array_from_stream): 
-	make a blocking version of the header parser. 
-	When the fs stream uses gnome-vfs, this should
-	be changed. 
-	(gmime_read_line_from_stream): ditto. 
-
-2000-02-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c: 
-	everywhere, when using the cur_pos field, do it
-	on the CamelSeekableStream object.
-	(_seek): small fix. 
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_seek): 
-	s/camel_stream_seek/camel_seekable_stream_seek/g
-
-	* camel/camel-seekable-stream.h: 
-	(struct ): added a field to store the
-	current position.
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_get_current_position): 
-	New function. Allows to get the current position 
-	of a seekable stream.
-	
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-search.c: New file, implements the
-	search api for mbox folders.
-
-	* providers/mbox/Makefile.am: Link with ibex.
-
-	* camel-folder.c (camel_folder_has_search_capability): Api
-	additions.
-	(camel_folder_search_by_expression): Ditto.
-
-2000-02-12  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_set_name): Setup index
-	filename as well.
-	(_init_with_store): Init index filename.  Hmm, none of these
-	names ever seem to get free'd (FIXME?)
-
-	* providers/mbox/camel-mbox-folder.h: Add index file name.
-
-2000-02-12  NotZed  <notzed@helixcode.com>
-
-	* camel-folder.h: Add folder search functions.
-
-	** Created ChangeLog just for camel **
-	 - refer to ../ChangeLog for changes prior to this date.
diff --git a/camel/Makefile.am b/camel/Makefile.am
deleted file mode 100644
index adf5662dd4..0000000000
--- a/camel/Makefile.am
+++ /dev/null
@@ -1,173 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = providers tests
-
-libcamelincludedir = $(includedir)/camel
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
-
-lib_LTLIBRARIES = libcamel.la
-
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	 \
-	-I$(top_srcdir)/intl			 \
-	-I$(top_srcdir)/e-util			 \
-	$(GLIB_CFLAGS)				 \
-	$(UNICODE_CFLAGS)			 \
-	$(KRB4_CFLAGS)				 \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-	-DG_LOG_DOMAIN=\"camel\"
-
-libcamel_la_SOURCES = 				\
-	broken-date-parser.c			\
-	camel-address.c				\
-	camel-data-wrapper.c			\
-	camel-exception.c			\
-	camel-filter-driver.c			\
-	camel-filter-search.c			\
-	camel-folder-search.c			\
-	camel-folder-summary.c			\
-	camel-folder-thread.c			\
-	camel-folder.c				\
-	camel-internet-address.c		\
-	camel-lock.c				\
-	camel-medium.c				\
-	camel-mime-filter-bestenc.c		\
-	camel-mime-filter-basic.c		\
-	camel-mime-filter-charset.c		\
-	camel-mime-filter-crlf.c		\
-	camel-mime-filter-from.c		\
-	camel-mime-filter-index.c		\
-	camel-mime-filter-linewrap.c		\
-	camel-mime-filter-save.c		\
-	camel-mime-filter.c			\
-	camel-mime-message.c			\
-	camel-mime-parser.c			\
-	camel-mime-part-utils.c			\
-	camel-mime-part.c			\
-	camel-mime-utils.c			\
-	camel-movemail.c			\
-	camel-multipart.c			\
-	camel-object.c				\
-	camel-operation.c			\
-	camel-provider.c			\
-	camel-remote-store.c			\
-	camel-sasl.c				\
-	camel-sasl-anonymous.c			\
-	camel-sasl-cram-md5.c			\
-	camel-sasl-kerberos4.c			\
-	camel-sasl-plain.c			\
-	camel-search-private.c			\
-	camel-seekable-stream.c			\
-	camel-seekable-substream.c		\
-	camel-service.c				\
-	camel-session.c				\
-	camel-store.c				\
-	camel-stream-buffer.c			\
-	camel-stream-filter.c			\
-	camel-stream-fs.c			\
-	camel-stream-mem.c			\
-	camel-stream-null.c			\
-	camel-stream.c				\
-	camel-transport.c			\
-	camel-uid-cache.c			\
-	camel-url.c				\
-	camel-vee-folder.c			\
-	camel-vee-store.c			\
-	camel-charset-map.c			\
-	camel.c					\
-	gstring-util.c				\
-	hash-table-utils.c			\
-	string-utils.c
-
-libcamelinclude_HEADERS =			\
-	broken-date-parser.h			\
-	camel-address.h				\
-	camel-charset-map.h			\
-	camel-data-wrapper.h			\
-	camel-exception-list.def		\
-	camel-exception.h			\
-	camel-filter-driver.h			\
-	camel-filter-search.h			\
-	camel-folder-search.h			\
-	camel-folder-summary.h			\
-	camel-folder-thread.h			\
-	camel-folder.h				\
-	camel-internet-address.h		\
-	camel-lock.h				\
-	camel-medium.h				\
-	camel-mime-filter-bestenc.h		\
-	camel-mime-filter-basic.h		\
-	camel-mime-filter-charset.h		\
-	camel-mime-filter-crlf.h		\
-	camel-mime-filter-from.h		\
-	camel-mime-filter-index.h		\
-	camel-mime-filter-linewrap.h		\
-	camel-mime-filter-save.h		\
-	camel-mime-filter.h			\
-	camel-mime-message.h			\
-	camel-mime-parser.h			\
-	camel-mime-part-utils.h			\
-	camel-mime-part.h			\
-	camel-mime-utils.h			\
-	camel-movemail.h			\
-	camel-multipart.h			\
-	camel-object.h				\
-	camel-operation.h			\
-	camel-provider.h			\
-	camel-remote-store.h			\
-	camel-sasl.h				\
-	camel-sasl-anonymous.h			\
-	camel-sasl-cram-md5.h			\
-	camel-sasl-kerberos4.h			\
-	camel-sasl-plain.h			\
-	camel-seekable-stream.h			\
-	camel-seekable-substream.h		\
-	camel-service.h				\
-	camel-session.h				\
-	camel-store.h				\
-	camel-stream-buffer.h			\
-	camel-stream-filter.h			\
-	camel-stream-fs.h			\
-	camel-stream-mem.h			\
-	camel-stream-null.h			\
-	camel-stream.h				\
-	camel-transport.h			\
-	camel-types.h				\
-	camel-uid-cache.h			\
-	camel-url.h				\
-	camel-vee-folder.h			\
-	camel-vee-store.h			\
-	camel.h					\
-	gstring-util.h				\
-	hash-table-utils.h			\
-	string-utils.h
-
-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-
-libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
-	$(UNICODE_LIBS)				\
-	$(KRB4_LDFLAGS)
-
-
-noinst_HEADERS =				\
-	camel-charset-map-private.h		\
-	camel-private.h				\
-	camel-search-private.h
-
-EXTRA_DIST =					\
-	README 
-
-#noinst_PROGRAMS =				\
-#	camel-mime-filter-from
-#
-#camel_mime_filter_from_SOURCES = 		\
-#	camel-mime-filter-from.c
-#
-#camel_mime_filter_from_LDADD = 		\
-#	../camel/libcamel.la			\
-#	../e-util/libeutil.la			\
-#	../libibex/libibex.la			\
-#	$(GNOME_LIBDIR)				\
-#	$(GNOMEUI_LIBS)				\
-#	$(INTLLIBS)				\
-#	$(PTHREAD_LIB)				\
-#	$(EXTRA_GNOME_LIBS)
diff --git a/camel/README b/camel/README
deleted file mode 100644
index f020174d5e..0000000000
--- a/camel/README
+++ /dev/null
@@ -1,57 +0,0 @@
-
-                                   CAMEL
-     
-
-			A generic Messaging Library
-
-
-                                   ----
-				
-
-Introduction:
--------------
-
-Camel will be a generic messaging library. It will evntually support 
-the standard messaging system for receiving and sending messages.
-It aims at being the backend for the future gnome-mailer system.
-
-The name "camel" stands for ... nothing. Open area of development there.
-You know, that "bazaar" thing. Maybe could we organize a big contest on
-gnome-list to find the best explanation :)
-
-Camel draws heavily from JavaMail and the IMAP4rev1 RFC. People
-wanting to hack on a provider should read the JavaMail API
-specification, but CMC and MAPI are of interest too.
-
-Please, before starting anything, wait for me to finish the abstract
-classes. Some parts are not definitive yet.
-
- 
-Organization:
--------------
-
-The library is roughly a set of abstract classes, some kind of generic
-"interfaces" (idl interfaces, not java interfaces ).
-
-Particular implementations are called providers.
-
-Here are the basic objects:
-
-* CamelService : an abstract class representing an access to a server.
-Handles the connection and authentication to any server.
-
-* CamelStore (CamelService): A hierarchy of folders on a server.
-
-* CamelFolder : An object containing messages. A folder is always
-associated with a store.
-
-* CamelMessage : An object contained in folders. Is defined by a set
-of attributes and a content. (Attributes include: the date it was
-received, the sender address, .....)
-
-* CamelTransport (CamelService): A way to send messages.
-
-....
-...
-
-
diff --git a/camel/README.COPYRIGHT b/camel/README.COPYRIGHT
deleted file mode 100644
index 91774e7339..0000000000
--- a/camel/README.COPYRIGHT
+++ /dev/null
@@ -1,47 +0,0 @@
-Important note for Camel hackers:
----------------------------------
-
-Camel has been a lot of work, and has been conceived to be general
-enough to be used outside the gnome-mailer. It is possible in the
-future that it is used in softwares with licenses incompatible with the
-LGPL. For this reason, the copyright has to be owned by a unique
-person.  Be sure, however, that Camel will always be available under
-the LGPL.  Significant authors will always be consulted before any
-special use of Camel. Moreover, in special situations, they may be
-given the authorization to use Camel with a license different than the
-LGPL.
-
-Thus, when adding code in Camel, always add the following lines at the
-begining of the file:
-
-/* 
- *
- * Copyright 199x, 200x Helix Code, Inc. (http://www.helixcode.com)
- * 
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-You may also want to add your name to the author name list after this
-header.
-
-Please contact me (Bertrand.Guiheneuf@aful.org) if you want to discuss
-this copyright issue.
-
-Happy hacking,
-
-Bertrand.
-
-
diff --git a/camel/README.HACKING b/camel/README.HACKING
deleted file mode 100644
index a4742ee7b8..0000000000
--- a/camel/README.HACKING
+++ /dev/null
@@ -1,14 +0,0 @@
-You want to hack on Camel ?
-
-Thanks. Camel aims at being the best messaging
-library for Linux and your help is welcome. 
-Please be sure to read the following files before
-commiting any change or sending any patch:
-
-CODING.STYLE
-README.COPYRIGHT
-
-
-Thanks.
-
-	Bertrand <Bertrand.Guiheneuf@aful.org>
\ No newline at end of file
diff --git a/camel/README.mt b/camel/README.mt
deleted file mode 100644
index aeece1b0bb..0000000000
--- a/camel/README.mt
+++ /dev/null
@@ -1,171 +0,0 @@
-
-This version of camel is working towards being multi-thread safe
-(MT-SAFE).  At least, for the important api's.
-
-This code has now been merged into the main head, but this file
-will remain here as a log of how it was done, incase any issues
-arise.  The ChangeLog of course has a much more detailed list
-of changes.
-
-Intended method
-===============
-
-I intend working on it in several stages:
-
-1. Making the api multi-threadable.  Basically removing some const-returns,
-and copying some data where it wasn't before.  The api should
-still continue to work if not being used in a multithreaded
-application.  There is not a significant amount of work here since
-this was more or less the intention all along.
-
-Some functions where references to objects are returned may have to be
-changed slightly, so that refcounts are incremented before return.
-This doesn't affect much though.
-
-camel_folder::get_message_info				done
-camel_folder_summary::uid				done
-camel_folder_summary::index				done
-camel_folder::get_summary
-	Needs to ref each summary item it points to.	done
-camel_folder::free_summary
-	Needs to unref each summary item it points to.	done
-camel_folder_get_message_tag
-	needs to copy the tag return
-camel_maildir_summary filename string
-	should not be able to modify the string
-	array contents after it has been added to
-	the summary.
-camel_folder						done
-	Make every camel-folder use a camel-folder-summary.
-	This just reduces some of the code duplication,
-	since everything but vee-folder does this already.
-
-2. Adding high level locks for proof of concept.  The locks will
-be stored in private or global data, so the api should remain the same for
-non-threaded applications.
-
-A per-folder lock which governs access to the folder
-	summary, the folder file or
-	communications socket, etc.			done
-Locking for exceptions.					done
-Per store locks for internal stuff.			done
-Per-service locks for various internal lists and
-	caches						done
-
-3. Further fine-grained locking where it can be done/is worthwhile.
-
-A per-index lock for libibex				done
-Locking for the search object				half done
-Internal lock for the folder_summary itself
-	So that searching can be detatched from other
-	folder operations, etc.				done
-Possibly a lock for access to parts of a mime-part
-	or message
-
-4. A method to cancel operations.
-
-Individual outstanding operations must be cancellable, and not just
-'all current operations'.  This will probably not use pthread_cancel
-type of cancelling.
-
-This will however, probably use a method for starting a new thread,
-through camel, that can then be cancelled, and/or some method of
-registering that a thread can be cancelled.  Blocking states within
-camel, within that thread, will then act as checkpoints for if the
-operation, and if it is cancelled, the operation will abort
-(i.e. fail, with an appropriate exception code).
-
-Operation cancelling should also function when the application is not
-multi-threaded.  Not sure of the api for this yet, probably a callback
-system.  Hopefully the api for both scenarios can be made the same.
-
-Other thoughts
-==============
-
-Basically much of the code in camel that does the actual work does NOT
-need to be thread safe to make it safely usable in an mt context.
-
-camel-folder, camel-summary, camel-imap-search, and the camel-service
-classes (at least) are the important ones to be made multithreaded.
-
-For other things, they are either resources that are created
-one-off (for example, camel-mime-message, and its associated
-parts, like camel-internet-address), or multithreadedness
-doesn't make a lot of sense - e.g. camel-stream, or camel-mime-parser.
-
-So basically the approach is a low-risk one.  Adding the minimum
-number of locks to start with, and providing further fine-grained
-locks as required.  The locks should not need to be particularly
-fine-grained in order to get reasonable results.
-
-Log of changes
-==============
-
-Changed CamelFolder:get_message_info() to return a ref'd copy, requiring
-all get_message_info()'s to have a matching free_message_info().
-
-Moved the CamelFolder frozen changelog data to a private structure.
-
-Added a mutex for CamelFolder frozen changelog stuff (it was just easy
-to do, although it isn't needed yet).
-
-Added a single mutex around all other CamelFolder functions that need
-it, this is just the first cut at mt'edness.
-
-Fixed all camel-folder implementations that call any other
-camel-folder functions to call via virtual methods, to bypass the locks.
-
-Added camel-store private data.
-
-Added a single mutex lock for camel-store's folder functions.
-
-Added camel-service private data.
-
-Added a single mutex lock for camel-service's connect stuff.
-
-Added a mutex for remote-store stream io stuff.
-
-Added a mutex for imap, so it can bracket a compound command
-exclusively.  Pop doesn't need this since you can only have a single
-folder per store, and the folder interface is already forced
-single-threaded.
-
-Added mutex for camel-session, most operations.
-
-Running the tests finds at least 1 deadlock so far.  Need to
-work on that.
-
-Fixed get_summary to ref/unref its items.
-
-Removed the global folder lock from the toplevel
-camel_folder_search(), each implementation must now handle locking.
-
-Fixed the local-folder implementation of searching.  imap-folder
-searching should already be mt-safe through the command lock.
-
-Fixed imap summary to ref/unref too.
-
-Built some test cases, and expanded the test framework library to
-handle multiple threads.  It works!
-
-Next, added a recursive mutex class, so that locking inside imap had
-any chance of working.  Got imap working.
-
-Moved the camel folder summary into the base folder class, and fixed
-everything to use it that way.
-
-Made the vfolder use a real camel-folder-summary rather than a
-hashtable + array that it was using, and probably fixed some problems
-which caused evolution-mail not to always catch flag updates.  Oh, and
-made it sync/expunge all its subfolders when sync/expungeing.
-
-Made the camel-folder summary completely mt-safe.
-
-Removed all of the locks on the folder functions dealing directly with
-the summary, so now for example all summary lookups will not be
-interupted by long operations.
-
-Made the nntp newsrc thing mt-safe, because of some unfortunate
-sideeffect of it being called from the summary interaction code in
-nntp-folder.
-
diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
deleted file mode 100644
index 544dc04e28..0000000000
--- a/camel/broken-date-parser.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "broken-date-parser.h"
-
-/* prototypes for functions dealing with broken date formats */
-static GList *datetok (const gchar *date);
-static gint get_days_in_month (gint mon, gint year);
-static gint get_weekday (gchar *str);
-static gint get_month (gchar *str);
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-/*****************************************************************************
- * The following functions are here in the case of badly broken date formats *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
-
-typedef struct {
-	gchar dow[6];   /* day of week (should only need 4 chars) */
-	gint day;
-	gint mon;       /* 1->12 or 0 if invalid */
-	gint year;
-	gint hour;
-	gint min;
-	gint sec;
-	gchar zone[6];  /* time zone */
-} date_t;
-
-static
-GList *datetok (const gchar *date)
-{
-	GList *tokens = NULL;
-	gchar *token, *start, *end;
-	
-	start = (gchar *) date;
-	while (*start) {
-		/* find the end of this token */
-		for (end = start; *end && *end != ' '; end++);
-		
-		token = g_strndup (start, (end - start));
-		
-		if (token && *token)
-			tokens = g_list_append (tokens, token);
-		else
-			g_free (token);
-
-		if (*end)
-			start = end + 1;
-		else
-			break;
-	}
-
-	return tokens;
-}
-
-static gint
-get_days_in_month (gint mon, gint year)
-{
-	switch (mon) {
-	case 1: case 3: case 5: case 7: case 8: case 10: case 12:
-		return 31;
-	case 4: case 6: case 9: case 11:
-		return 30;
-	case 2:
-		if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-			return 29;
-		return 28;
-	default:
-		return 30;
-	}
-}
-
-static gint
-get_weekday (gchar *str)
-{
-	g_return_val_if_fail ((str != NULL), 0);
-
-	if (strncmp (str, "Mon", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Tue", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Wed", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Thu", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "Fri", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Sat", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Sun", 3) == 0) {
-		return 7;
-	}
-
-	return 0;  /* unknown week day */
-}
-
-static gint
-get_month (gchar *str)
-{
-	g_return_val_if_fail (str != NULL, 0);
-    
-	if (strncmp (str, "Jan", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Feb", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Mar", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Apr", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "May", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Jun", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Jul", 3) == 0) {
-		return 7;
-	} else if (strncmp (str, "Aug", 3) == 0) {
-		return 8;
-	} else if (strncmp (str, "Sep", 3) == 0) {
-		return 9;
-	} else if (strncmp (str, "Oct", 3) == 0) {
-		return 10;
-	} else if (strncmp (str, "Nov", 3) == 0) {
-		return 11;
-	} else if (strncmp (str, "Dec", 3) == 0) {
-		return 12;
-	}
-    
-	return 0;  /* unknown month */
-}
-
-gchar *
-parse_broken_date (const gchar *datestr)
-{
-	GList *tokens;
-	date_t date;
-	gchar *token, *ptr, *newdatestr;
-	guint len, i, retval;
-	gdouble tz = 0.0;
-
-	memset ((void*)&date, 0, sizeof (date_t));
-	g_return_val_if_fail (datestr != NULL, NULL);
-	
-	tokens = datetok (datestr);
-	len = g_list_length (tokens);
-	for (i = 0; i < len; i++) {
-		token = g_list_nth_data (tokens, i);
-		
-		if ((retval = get_weekday (token))) {
-			strncpy (date.dow, datestr, 4);
-		} else if ((retval = get_month (token))) {
-			date.mon = retval;
-		} else if (strlen (token) <= 2) {
-			/* this could be a 1 or 2 digit day of the month */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval && atoi (token) <= 31 && !date.day)  /* probably should find a better way */
-				date.day = atoi (token);
-			else                                            /* fubar'd client using a 2-digit year */
-				date.year = atoi (token) < 69 ? 2000 + atoi (token) : 1900 + atoi (token);
-		} else if (strlen (token) == 4) {
-			/* this could be the year... */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval)
-				date.year = atoi (token);
-		} else if (strchr (token, ':')) {
-			/* this must be the time: hh:mm:ss */
-			sscanf (token, "%d:%d:%d", &date.hour, &date.min, &date.sec);
-		} else if (*token == '-' || *token == '+') {
-			tz = atoi (token) / 100.0;
-		}
-	}
-	
-	g_list_free (tokens);
-	
-	/* adjust times based on time zones */
-	
-	if (tz != 0) {
-		/* check for time-zone shift */
-		if (tz > 0) {
-			/* correct for positive hours off of UCT */
-			date.hour -= (tz / 100);
-			tz = (gint)tz % 100;
-			
-			if (tz > 0) /* correct for positive minutes off of UCT */
-				date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-		} else {
-			if (tz < 0) {
-				/* correct for negative hours off of UCT */
-				tz = -tz;
-				date.hour += (tz / 100);
-				tz = -((gint)tz % 100);
-				
-				if (tz < 0)
-					date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-			}
-		}
-		
-		/* adjust seconds to proper range */
-		if (date.sec > 59) {
-			date.min += (date.sec / 60);
-			date.sec = (date.sec % 60);
-		}
-		
-		/* adjust minutes to proper range */
-		if (date.min > 59) {
-			date.hour += (date.min / 60);
-			date.min = (date.min % 60);
-		} else {
-			if (date.min < 0) {
-				date.min = -date.min;
-				date.hour -= (date.min / 60) - 1;
-				date.min = 60 - (date.min % 60);
-			}
-		}
-		
-		/* adjust hours to the proper randge */
-		if (date.hour > 23) {
-			date.day += (date.hour / 24);
-			date.hour -= (date.hour % 24);
-		} else {
-			if (date.hour < 0) {
-				date.hour = -date.hour;
-				date.day -= (date.hour / 24) - 1;
-				date.hour = 24 - (date.hour % 60);
-			}
-		}
-		
-		/* adjust days to the proper range */
-		while (date.day > get_days_in_month (date.mon, date.year)) {
-			date.day -= get_days_in_month (date.mon, date.year);
-			date.mon++;
-			if (date.mon > 12) {
-				date.year += (date.mon / 12);
-				date.mon = (date.mon % 12);
-				if (date.mon == 0) {
-					/* month sanity check */
-					date.mon = 12;
-					date.year -= 1;
-				}
-			}
-		}
-		
-		while (date.day < 1) {
-			date.day += get_days_in_month (date.mon, date.year);
-			date.mon--;
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-		
-		/* adjust months to the proper range */
-		if (date.mon > 12) {
-			date.year += (date.mon / 12);
-			date.mon = (date.mon % 12);
-			if (date.mon == 0) {
-				/* month sanity check */
-				date.mon = 12;
-				date.year -= 1;
-			}
-		} else {
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-	}
-
-	/* now lets print this date into a string with the correct format */
-	newdatestr = g_strdup_printf ("%s, %d %s %d %s%d:%s%d:%s%d -0000",
-				      date.dow, date.day, tz_months[date.mon-1],
-				      date.year,
-				      date.hour > 10 ? "" : "0", date.hour,
-				      date.min > 10 ? "" : "0", date.min,
-				      date.sec > 10 ? "" : "0", date.sec);
-	
-	return newdatestr;
-}
-
-/*****************************************************************************
- * This ends the code for the broken date parser...                          *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h
deleted file mode 100644
index 17000b3299..0000000000
--- a/camel/broken-date-parser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include <time.h>
-
-#include <ctype.h>
-
-/* prototypes for functions dealing with broken date formats */
-
-gchar *parse_broken_date (const gchar *datestr);
-
-
-
-
-
diff --git a/camel/camel-address.c b/camel/camel-address.c
deleted file mode 100644
index a1c0990dec..0000000000
--- a/camel/camel-address.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-address.h"
-
-
-static void camel_address_class_init (CamelAddressClass *klass);
-static void camel_address_init       (CamelAddress *obj);
-static void camel_address_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_address_parent;
-
-static void
-camel_address_class_init (CamelAddressClass *klass)
-{
-	camel_address_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-static void
-camel_address_init (CamelAddress *obj)
-{
-	obj->addresses = g_ptr_array_new();
-}
-
-static void
-camel_address_finalize (CamelObject *obj)
-{
-	camel_address_remove((CamelAddress *)obj, -1);
-	g_ptr_array_free(((CamelAddress *)obj)->addresses, TRUE);
-}
-
-CamelType
-camel_address_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelAddress",
-					    sizeof (CamelAddress),
-					    sizeof (CamelAddressClass),
-					    (CamelObjectClassInitFunc) camel_address_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_address_init,
-					    (CamelObjectFinalizeFunc) camel_address_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_address_new:
- *
- * Create a new CamelAddress object.
- * 
- * Return value: A new CamelAddress widget.
- **/
-CamelAddress *
-camel_address_new (void)
-{
-	CamelAddress *new = CAMEL_ADDRESS(camel_object_new(camel_address_get_type()));
-	return new;
-}
-
-/**
- * camel_address_new_clone:
- * @in: 
- * 
- * Clone an existing address type.
- * 
- * Return value: 
- **/
-CamelAddress *
-camel_address_new_clone(const CamelAddress *in)
-{
-	CamelAddress *new = CAMEL_ADDRESS(camel_object_new(CAMEL_OBJECT_GET_TYPE(in)));
-
-	camel_address_cat(new, in);
-	return new;
-}
-
-/**
- * camel_address_length:
- * @a: 
- * 
- * Return the number of addresses stored in the address @a.
- * 
- * Return value: 
- **/
-int
-camel_address_length(CamelAddress *a)
-{
-	return a->addresses->len;
-}
-
-/**
- * camel_address_decode:
- * @a: An address.
- * @raw: Raw address description.
- * 
- * Construct a new address from a raw address field.
- * 
- * Return value: Returns the number of addresses found,
- * or -1 if the addresses could not be parsed fully.
- **/
-int
-camel_address_decode	(CamelAddress *a, const char *raw)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), -1);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->decode(a, raw);
-}
-
-/**
- * camel_address_encode:
- * @a: 
- * 
- * Encode an address in a format suitable for a raw header.
- * 
- * Return value: The encoded address.
- **/
-char *
-camel_address_encode	(CamelAddress *a)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->encode(a);
-}
-
-/**
- * camel_address_unformat:
- * @a: 
- * @raw: 
- * 
- * Attempt to convert a previously formatted and/or edited
- * address back into internal form.
- * 
- * Return value: -1 if it could not be parsed, or the number
- * of valid addresses found.
- **/
-int
-camel_address_unformat(CamelAddress *a, const char *raw)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), -1);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->unformat(a, raw);
-}
-
-/**
- * camel_address_format:
- * @a: 
- * 
- * Format an address in a format suitable for display.
- * 
- * Return value: The formatted address.
- **/
-char *
-camel_address_format	(CamelAddress *a)
-{
-	if (a == NULL)
-		return NULL;
-
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->format(a);
-}
-
-/**
- * camel_address_cat:
- * @dest: 
- * @source: 
- * 
- * Concatenate one address onto another.  The addresses must
- * be of the same type.
- * 
- * Return value: 
- **/
-int
-camel_address_cat	(CamelAddress *dest, const CamelAddress *source)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);
-
-	return CAMEL_ADDRESS_CLASS(CAMEL_OBJECT_GET_CLASS(dest))->cat(dest, source);
-}
-
-/**
- * camel_address_copy:
- * @dest: 
- * @source: 
- * 
- * Copy an address contents.
- * 
- * Return value: 
- **/
-int
-camel_address_copy	(CamelAddress *dest, const CamelAddress *source)
-{
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);
-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);
-
-	camel_address_remove(dest, -1);
-	return camel_address_cat(dest, source);
-}
-
-/**
- * camel_address_remove:
- * @a: 
- * @index: The address to remove, use -1 to remove all address.
- * 
- * Remove an address by index, or all addresses.
- **/
-void
-camel_address_remove	(CamelAddress *a, int index)
-{
-	g_return_if_fail(CAMEL_IS_ADDRESS(a));
-
-	if (index == -1) {
-		for (index=a->addresses->len; index>-1; index--)
-			CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	} else {
-		CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	}
-}
diff --git a/camel/camel-address.h b/camel/camel-address.h
deleted file mode 100644
index 3af3bd3572..0000000000
--- a/camel/camel-address.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_ADDRESS_H
-#define _CAMEL_ADDRESS_H
-
-#include <camel/camel-object.h>
-
-#define CAMEL_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)
-#define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)
-#define CAMEL_IS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_address_get_type ())
-
-typedef struct _CamelAddressClass CamelAddressClass;
-
-struct _CamelAddress {
-	CamelObject parent;
-
-	GPtrArray *addresses;
-
-	struct _CamelAddressPrivate *priv;
-};
-
-struct _CamelAddressClass {
-	CamelObjectClass parent_class;
-
-	int   (*decode)		(CamelAddress *, const char *raw);
-	char *(*encode)		(CamelAddress *);
-
-	int   (*unformat)	(CamelAddress *, const char *raw);
-	char *(*format)		(CamelAddress *);
-
-	int   (*cat)		(CamelAddress *, const CamelAddress *);
-
-	void  (*remove)		(CamelAddress *, int index);
-};
-
-guint		camel_address_get_type	(void);
-CamelAddress   *camel_address_new	(void);
-CamelAddress   *camel_address_new_clone	(const CamelAddress *);
-int		camel_address_length	(CamelAddress *);
-
-int	        camel_address_decode	(CamelAddress *, const char *);
-char	       *camel_address_encode	(CamelAddress *);
-int	        camel_address_unformat	(CamelAddress *, const char *);
-char	       *camel_address_format	(CamelAddress *);
-
-int		camel_address_cat	(CamelAddress *, const CamelAddress *);
-int		camel_address_copy	(CamelAddress *, const CamelAddress *);
-
-void		camel_address_remove	(CamelAddress *, int index);
-
-#endif /* ! _CAMEL_ADDRESS_H */
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
deleted file mode 100644
index 18b603148a..0000000000
--- a/camel/camel-charset-map-private.h
+++ /dev/null
@@ -1,4345 +0,0 @@
-/* This file is automatically generated: DO NOT EDIT */
-
-static unsigned char m000[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xd0, 0xd0, 0xf2, 0xf7, 0xf2, 0xf0, 0xff, 
-	0xf7, 0xf0, 0xb0, 0xf0, 0xe0, 0xff, 0xf2, 0x94, 
-	0xf7, 0xf0, 0xf2, 0xf2, 0xd7, 0xd2, 0xd0, 0xf2, 
-	0xd7, 0xd0, 0x90, 0xe0, 0xd0, 0xf2, 0xd2, 0xc0, 
-	0xd2, 0xc7, 0xc7, 0xc6, 0xc7, 0xc4, 0xc4, 0xc3, 
-	0xc2, 0xc7, 0xc2, 0xc7, 0xc2, 0xc7, 0xc7, 0xc2, 
-	0x42, 0xc2, 0xe2, 0xc3, 0xc7, 0xc4, 0xc7, 0xc7, 
-	0xc4, 0xc2, 0xc7, 0xd6, 0xd7, 0x51, 0x50, 0x97, 
-	0x82, 0x87, 0x87, 0x86, 0x87, 0x84, 0x84, 0x83, 
-	0x82, 0x87, 0x82, 0x87, 0x82, 0x87, 0x87, 0x82, 
-	0x02, 0x82, 0x82, 0x93, 0x97, 0x94, 0x97, 0xd7, 
-	0x94, 0x92, 0x97, 0xd6, 0xd7, 0x51, 0x50, 0xf0, 
-};
-
-static unsigned char m001[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0x0f, 0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x2f, 
-	0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x0f, 
-	0xff, 0x28, 0x6a, 0x6e, 0x72, 0x28, 0x72, 0x7f, 
-	0x70, 0xfe, 0x28, 0x7a, 0x7a, 0x7f, 0x7e, 0x68, 
-	0xfb, 0x7a, 0xea, 0x6a, 0x70, 0x7a, 0x7e, 0xfb, 
-	0x70, 0x6a, 0x28, 0x7a, 0x62, 0x62, 0x62, 0x28, 
-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, 
-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, 
-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0x7a, 
-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x7f, 
-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, 
-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, 
-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0xfa, 
-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x2c, 
-};
-
-static unsigned char m002[256] = {
-	0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1f, 0x18, 0x58, 0x58, 0x18, 0x58, 0x18, 0x7c, 
-	0x78, 0x19, 0x18, 0x1c, 0x58, 0x18, 0x18, 0x18, 
-	0x79, 0x78, 0x19, 0x18, 0x78, 0x18, 0x78, 0x19, 
-	0x18, 0x18, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x02, 0x02, 0x1a, 0x1a, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x79, 
-	0x18, 0x18, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 
-};
-
-static unsigned char m010[256] = {
-	0x04, 0x04, 0x01, 0x01, 0x05, 0x05, 0x01, 0x01, 
-	0x02, 0x02, 0x02, 0x02, 0x05, 0x05, 0x01, 0x01, 
-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x05, 0x05, 0x01, 0x01, 0x02, 0x02, 0x82, 0x82, 
-	0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 
-	0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x82, 0x82, 0x00, 0x00, 0x02, 0x02, 0x04, 0x04, 
-	0x04, 0x01, 0x01, 0x04, 0x04, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x01, 
-	0x01, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x04, 0x04, 
-	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x83, 0x83, 
-	0x05, 0x05, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 
-	0x01, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x03, 0x03, 0x05, 0x05, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m011[256] = {
-	0x43, 0x43, 0x10, 0x10, 0x53, 0x53, 0x52, 0x52, 
-	0x00, 0x00, 0x04, 0x04, 0x53, 0x53, 0x10, 0x10, 
-	0x11, 0x11, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, 
-	0x53, 0x53, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x43, 0x43, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x43, 
-	0x01, 0x10, 0x10, 0x43, 0x43, 0x10, 0x10, 0x00, 
-	0x00, 0x52, 0x52, 0x52, 0x52, 0x43, 0x43, 0x10, 
-	0x10, 0x00, 0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 
-	0x10, 0x10, 0x28, 0x28, 0x10, 0x10, 0x42, 0x42, 
-	0x10, 0x10, 0x52, 0x52, 0x00, 0x00, 0x10, 0x10, 
-	0x7b, 0x7b, 0x10, 0x10, 0x10, 0x10, 0x01, 0x01, 
-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x10, 0x10, 
-	0x10, 0x10, 0x43, 0x43, 0x04, 0x04, 0x04, 0x04, 
-	0x2c, 0x52, 0x52, 0x52, 0x52, 0x7b, 0x7b, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m020[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x07, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m021[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x50, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x50, 0x00, 0x50, 0x20, 0x10, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m022[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m030[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m032[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m040[256] = {
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m041[256] = {
-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m042[256] = {
-	0x00, 0x61, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x60, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x00, 0x61, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m050[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m052[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 
-	0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m060[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m0e2[256] = {
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m102[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m1e1[256] = {
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m200[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m201[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x70, 0x71, 0x00, 0x00, 0x00, 
-	0x70, 0x72, 0x70, 0x00, 0x72, 0x72, 0x72, 0x00, 
-	0x70, 0x70, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m202[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x64, 0x00, 0x00, 0x00, 0x04, 0x60, 0x40, 0x00, 
-	0x78, 0x78, 0x00, 0x00, 0x60, 0x60, 0x18, 0x18, 
-	0x60, 0x60, 0x01, 0x00, 0x00, 0x60, 0x64, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m210[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m211[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m212[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m221[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m222[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x61, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x01, 0x01, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m231[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m232[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m242[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m251[256] = {
-	0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m252[256] = {
-	0x61, 0x60, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x60, 
-	0x61, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x61, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m262[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m302[256] = {
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m322[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m332[256] = {
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4e2[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4f2[256] = {
-	0x20, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-};
-
-static unsigned char m502[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m512[256] = {
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m522[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m532[256] = {
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m542[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-};
-
-static unsigned char m552[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m562[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m572[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m582[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m592[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m5a2[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m5b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5c2[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m5d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m5e2[256] = {
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5f2[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m602[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m612[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m622[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m632[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m642[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m652[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m662[256] = {
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x20, 0x20, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m672[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m682[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m692[256] = {
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m6a2[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6c2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x20, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m6f2[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m702[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m712[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-};
-
-static unsigned char m722[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m732[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m742[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m752[256] = {
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m762[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x20, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m772[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m782[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m792[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7a2[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m7b2[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7c2[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m7d2[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7e2[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7f2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m802[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m812[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m822[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m832[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m842[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m852[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m862[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m872[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m882[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m892[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m8a2[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m8b2[256] = {
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m8c2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m8d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m8e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m8f2[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m902[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m912[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x20, 0x20, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m922[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x20, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, 0x20, 
-};
-
-static unsigned char m932[256] = {
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x20, 0x00, 
-	0x60, 0x20, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m942[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m952[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m962[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m972[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m982[256] = {
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m992[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m9a2[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9c2[256] = {
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9d2[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m9e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m9f2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mf02[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mf92[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mfa2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mff2[256] = {
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-struct {
-	unsigned char *bits0;
-	unsigned char *bits1;
-	unsigned char *bits2;
-} camel_charmap[256] = {
-	{ m000, m001, m002, }, { m010, m011, 0, }, { m020, m021, m022, }, { m030, 0, m032, }, { m040, m041, m042, }, { m050, 0, m052, }, { m060, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, m0e2, }, { 0, 0, 0, }, 
-	{ 0, 0, m102, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, m1e1, 0, }, { 0, 0, 0, }, 
-	{ m200, m201, m202, }, { m210, m211, m212, }, { 0, m221, m222, }, { 0, m231, m232, }, { 0, 0, m242, }, { 0, m251, m252, }, { 0, 0, m262, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, m302, }, { 0, 0, 0, }, { 0, 0, m322, }, { 0, 0, m332, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, m4e2, }, { 0, 0, m4f2, }, 
-	{ 0, 0, m502, }, { 0, 0, m512, }, { 0, 0, m522, }, { 0, 0, m532, }, { 0, 0, m542, }, { 0, 0, m552, }, { 0, 0, m562, }, { 0, 0, m572, }, 
-	{ 0, 0, m582, }, { 0, 0, m592, }, { 0, 0, m5a2, }, { 0, 0, m5b2, }, { 0, 0, m5c2, }, { 0, 0, m5d2, }, { 0, 0, m5e2, }, { 0, 0, m5f2, }, 
-	{ 0, 0, m602, }, { 0, 0, m612, }, { 0, 0, m622, }, { 0, 0, m632, }, { 0, 0, m642, }, { 0, 0, m652, }, { 0, 0, m662, }, { 0, 0, m672, }, 
-	{ 0, 0, m682, }, { 0, 0, m692, }, { 0, 0, m6a2, }, { 0, 0, m6b2, }, { 0, 0, m6c2, }, { 0, 0, m6d2, }, { 0, 0, m6e2, }, { 0, 0, m6f2, }, 
-	{ 0, 0, m702, }, { 0, 0, m712, }, { 0, 0, m722, }, { 0, 0, m732, }, { 0, 0, m742, }, { 0, 0, m752, }, { 0, 0, m762, }, { 0, 0, m772, }, 
-	{ 0, 0, m782, }, { 0, 0, m792, }, { 0, 0, m7a2, }, { 0, 0, m7b2, }, { 0, 0, m7c2, }, { 0, 0, m7d2, }, { 0, 0, m7e2, }, { 0, 0, m7f2, }, 
-	{ 0, 0, m802, }, { 0, 0, m812, }, { 0, 0, m822, }, { 0, 0, m832, }, { 0, 0, m842, }, { 0, 0, m852, }, { 0, 0, m862, }, { 0, 0, m872, }, 
-	{ 0, 0, m882, }, { 0, 0, m892, }, { 0, 0, m8a2, }, { 0, 0, m8b2, }, { 0, 0, m8c2, }, { 0, 0, m8d2, }, { 0, 0, m8e2, }, { 0, 0, m8f2, }, 
-	{ 0, 0, m902, }, { 0, 0, m912, }, { 0, 0, m922, }, { 0, 0, m932, }, { 0, 0, m942, }, { 0, 0, m952, }, { 0, 0, m962, }, { 0, 0, m972, }, 
-	{ 0, 0, m982, }, { 0, 0, m992, }, { 0, 0, m9a2, }, { 0, 0, m9b2, }, { 0, 0, m9c2, }, { 0, 0, m9d2, }, { 0, 0, m9e2, }, { 0, 0, m9f2, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, mf02, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, mf92, }, { 0, 0, mfa2, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, mff2, }, 
-};
-
-struct {
-	const char *name;
-	unsigned int bit;
-} camel_charinfo[] = {
-	{ "iso-8859-2", 0x0001 },
-	{ "iso-8859-3", 0x0002 },
-	{ "iso-8859-4", 0x0004 },
-	{ "iso-8859-5", 0x0008 },
-	{ "iso-8859-6", 0x0010 },
-	{ "iso-8859-7", 0x0020 },
-	{ "iso-8859-8", 0x0040 },
-	{ "iso-8859-9", 0x0080 },
-	{ "iso-8859-10", 0x0100 },
-	{ "iso-8859-13", 0x0200 },
-	{ "iso-8859-14", 0x0400 },
-	{ "iso-8859-15", 0x0800 },
-	{ "windows-1250", 0x1000 },
-	{ "windows-1252", 0x2000 },
-	{ "windows-1257", 0x4000 },
-	{ "koi8-r", 0x8000 },
-	{ "koi8-u", 0x10000 },
-	{ "tis620.2533-1", 0x20000 },
-	{ "armscii-8", 0x40000 },
-	{ "georgian-academy", 0x80000 },
-	{ "georgian-ps", 0x100000 },
-	{ "CP932", 0x200000 },
-	{ "Shift-JIS", 0x400000 },
-};
-
-#define charset_mask(x) \
-	(camel_charmap[(x)>>8].bits0?camel_charmap[(x)>>8].bits0[(x)&0xff]<<0:0)	\
-	| (camel_charmap[(x)>>8].bits1?camel_charmap[(x)>>8].bits1[(x)&0xff]<<8:0)	\
-	| (camel_charmap[(x)>>8].bits2?camel_charmap[(x)>>8].bits2[(x)&0xff]<<16:0)
-
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
deleted file mode 100644
index c8974af936..0000000000
--- a/camel/camel-charset-map.c
+++ /dev/null
@@ -1,287 +0,0 @@
-
-#include <stdio.h>
-
-/*
-  if you want to build the charset map, add the root directory of
-  libunicode to the include path and define BUILD_MAP,
-  then run it as 
-    ./a.out > camel-charset-map-private.h
-
-  The tables genereated work like this:
-
-   An indirect array for each page of unicode character
-   Each array element has an indirect pointer to one of the bytes of
-   the generated bitmask.
-*/
-
-#ifdef BUILD_MAP
-#include "iso/iso8859-2.h"
-#include "iso/iso8859-3.h"
-#include "iso/iso8859-4.h"
-#include "iso/iso8859-5.h"
-#include "iso/iso8859-6.h"
-#include "iso/iso8859-7.h"
-#include "iso/iso8859-8.h"
-#include "iso/iso8859-9.h"
-#include "iso/iso8859-10.h"
-#include "iso/iso8859-13.h"
-#include "iso/iso8859-14.h"
-#include "iso/iso8859-15.h"
-#include "iso/windows-1250.h"
-#include "iso/windows-1252.h"
-#include "iso/windows-1257.h"
-#include "iso/koi8-r.h"
-#include "iso/koi8-u.h"
-#include "iso/tis620.2533-1.h"
-#include "iso/armscii-8.h"
-#include "iso/georgian-academy.h"
-#include "iso/georgian-ps.h"
-#include "msft/cp932.h"
-#include "jis/shiftjis.h"
-
-static struct {
-	unsigned short *table;
-	char *name;
-	int type;		/* type of table */
-	unsigned int bit;	/* assigned bit */
-} tables[] = {
-	{ iso8859_2_table, "iso-8859-2", 0, 0} ,
-	{ iso8859_3_table, "iso-8859-3", 0, 0} ,
-	{ iso8859_4_table, "iso-8859-4", 0, 0},
-	{ iso8859_5_table, "iso-8859-5", 0, 0},
-/* apparently -6 has special digits? */
-	{ iso8859_6_table, "iso-8859-6", 0, 0},
-	{ iso8859_7_table, "iso-8859-7", 0, 0},
-	{ iso8859_8_table, "iso-8859-8", 0, 0},
-	{ iso8859_9_table, "iso-8859-9", 0, 0},
-	{ iso8859_10_table, "iso-8859-10", 0, 0},
-	{ iso8859_13_table, "iso-8859-13", 0, 0},
-	{ iso8859_14_table, "iso-8859-14", 0, 0},
-	{ iso8859_15_table, "iso-8859-15", 0, 0},
-	{ windows_1250_table, "windows-1250", 0, 0},
-	{ windows_1252_table, "windows-1252", 0, 0},
-	{ windows_1257_table, "windows-1257", 0, 0},
-	{ koi8_r_table, "koi8-r", 0, 0},
-	{ koi8_u_table, "koi8-u", 0, 0},
-	{ tis_620_table, "tis620.2533-1", 0, 0},
-	{ armscii_8_table, "armscii-8", 0, 0},
-	{ georgian_academy_table, "georgian-academy", 0, 0},
-	{ georgian_ps_table, "georgian-ps", 0, 0},
-	{ cp932_table, "CP932", 1, 0},
-	{ sjis_table, "Shift-JIS", 1, 0},
-	{ 0, 0}
-};
-
-unsigned int encoding_map[256 * 256];
-
-static void
-add_bigmap(unsigned short **table, int bit)
-{
-	int i;
-	int j;
-
-	for (i=0;i<256;i++) {
-		unsigned short *tab = table[i];
-		if (tab) {
-			for (j=0;j<256;j++) {
-				if (tab[j])
-					encoding_map[tab[j]] |= bit;
-			}
-		}
-	}
-}
-
-void main(void)
-{
-	int i, j;
-	unsigned short *tab;
-	int max, min;
-	int bit = 0x01;
-	int k;
-	int bytes;
-
-#if 0
-	/* iso-latin-1 (not needed-detected in code) */
-	for (i=0;i<256;i++) {
-		encoding_map[i] |= bit;
-	}
-	bit <<= 1;
-#endif
-
-	/* dont count the terminator */
-	bytes = ((sizeof(tables)/sizeof(tables[0]))+7-1)/8;
-
-	/* the other latin charsets */
-	for (j=0;tables[j].table;j++) {
-		switch (tables[j].type) {
-		case 0:		/* table from 128-256 */
-			tab = tables[j].table;
-			for (i=0;i<128;i++) {
-				/* 0-127 is the common */
-				encoding_map[i] |= bit;
-				encoding_map[tab[i]] |= bit;
-			}
-			break;
-		case 1:		/* sparse table */
-			add_bigmap(tables[j].table, bit);
-			break;
-		}
-		tables[j].bit = bit;
-		bit <<= 1;
-	}
-
-	printf("/* This file is automatically generated: DO NOT EDIT */\n\n");
-
-	for (i=0;i<256;i++) {
-		/* first, do we need this block? */
-		for (k=0;k<bytes;k++) {
-			for (j=0;j<256;j++) {
-				if ((encoding_map[i*256 + j] & (0xff << (k*8))) != 0)
-					break;
-			}
-			if (j < 256) {
-				/* yes, dump it */
-				printf("static unsigned char m%02x%x[256] = {\n\t", i, k);
-				for (j=0;j<256;j++) {
-					printf("0x%02x, ", (encoding_map[i*256+j] >> (k*8)) & 0xff );
-					if (((j+1)&7) == 0 && j<255)
-						printf("\n\t");
-				}
-				printf("\n};\n\n");
-			}
-		}
-	}
-
-	printf("struct {\n");
-	for (k=0;k<bytes;k++) {
-		printf("\tunsigned char *bits%d;\n", k);
-	}
-	printf("} camel_charmap[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		/* first, do we need this block? */
-		printf("{ ");
-		for (k=0;k<bytes;k++) {
-			for (j=0;j<256;j++) {
-				if ((encoding_map[i*256 + j] & (0xff << (k*8))) != 0)
-					break;
-			}
-			if (j < 256) {
-				printf("m%02x%x, ", i, k);
-			} else {
-				printf("0, ");
-			}
-		}
-		printf("}, ");
-		if (((i+1)&7) == 0 && i<255)
-			printf("\n\t");
-	}
-	printf("\n};\n\n");
-
-	printf("struct {\n\tconst char *name;\n\tunsigned int bit;\n} camel_charinfo[] = {\n");
-	for (j=0;tables[j].table;j++) {
-		printf("\t{ \"%s\", 0x%04x },\n", tables[j].name, tables[j].bit);
-	}
-	printf("};\n\n");
-
-	printf("#define charset_mask(x) \\\n");
-	for (k=0;k<bytes;k++) {
-		if (k!=0)
-			printf("\t| ");
-		else
-			printf("\t");
-		printf("(camel_charmap[(x)>>8].bits%d?camel_charmap[(x)>>8].bits%d[(x)&0xff]<<%d:0)", k, k, k*8);
-		if (k<bytes-1)
-			printf("\t\\\n");
-	}
-	printf("\n\n");
-
-}
-
-#else
-
-#include "camel-charset-map.h"
-#include "camel-charset-map-private.h"
-#include <unicode.h>
-#include <glib.h>
-
-void camel_charset_init(CamelCharset *c)
-{
-	c->mask = ~0;
-	c->level = 0;
-}
-
-void
-camel_charset_step(CamelCharset *c, const char *in, int len)
-{
-	register unsigned int mask;
-	register int level;
-	const char *inptr = in, *inend = in+len;
-
-	mask = c->mask;
-	level = c->level;
-
-	/* check what charset a given string will fit in */
-	while (inptr < inend) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		if (c<=0xffff) {
-			mask &= charset_mask(c);
-		
-			if (c>=128 && c<256)
-				level = MAX(level, 1);
-			else if (c>=256)
-				level = MAX(level, 2);
-		} else {
-			mask = 0;
-			level = MAX(level, 2);
-		}
-	}
-
-	c->mask = mask;
-	c->level = level;
-}
-
-/* gets the best charset from the mask of chars in it */
-static const char *
-camel_charset_best_mask(unsigned int mask)
-{
-	int i;
-
-	for (i=0;i<sizeof(camel_charinfo)/sizeof(camel_charinfo[0]);i++) {
-		if (camel_charinfo[i].bit & mask)
-			return camel_charinfo[i].name;
-	}
-	return "UTF-8";
-}
-
-const char *camel_charset_best_name(CamelCharset *charset)
-{
-	if (charset->level == 1)
-		return "ISO-8859-1";
-	else if (charset->level == 2)
-		return camel_charset_best_mask(charset->mask);
-	else
-		return NULL;
-
-}
-
-/* finds the minimum charset for this string NULL means US-ASCII */
-const char *
-camel_charset_best(const char *in, int len)
-{
-	CamelCharset charset;
-
-	camel_charset_init(&charset);
-	camel_charset_step(&charset, in, len);
-	return camel_charset_best_name(&charset);
-}
-
-
-#endif /* !BUILD_MAP */
-
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
deleted file mode 100644
index 53ba4af9d9..0000000000
--- a/camel/camel-charset-map.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_CHARSET_MAP_H
-#define _CAMEL_CHARSET_MAP_H
-
-typedef struct _CamelCharset CamelCharset;
-
-struct _CamelCharset {
-	unsigned int mask;
-	int level;
-};
-
-void camel_charset_init(CamelCharset *);
-void camel_charset_step(CamelCharset *, const char *in, int len);
-const char *camel_charset_best_name(CamelCharset *);
-
-/* helper function */
-const char *camel_charset_best(const char *in, int len);
-
-#endif /* ! _CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
deleted file mode 100644
index 277c4025bb..0000000000
--- a/camel/camel-data-wrapper.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */
-/* camel-data-wrapper.c : Abstract class for a data_wrapper */
-
-/*
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-data-wrapper.h"
-#include "camel-mime-utils.h"
-#include "camel-stream.h"
-#include "camel-exception.h"
-
-#include <errno.h>
-
-#define d(x)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelDataWrapper */
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static int construct_from_stream(CamelDataWrapper *, CamelStream *);
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type);
-static gchar *get_mime_type (CamelDataWrapper *data_wrapper);
-static CamelContentType *get_mime_type_field (CamelDataWrapper *data_wrapper);
-static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
-
-static void
-camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	/* virtual method definition */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-	camel_data_wrapper_class->set_mime_type = set_mime_type;
-	camel_data_wrapper_class->get_mime_type = get_mime_type;
-	camel_data_wrapper_class->get_mime_type_field = get_mime_type_field;
-	camel_data_wrapper_class->set_mime_type_field = set_mime_type_field;
-
-	camel_data_wrapper_class->construct_from_stream = construct_from_stream;
-}
-
-static void
-camel_data_wrapper_init (gpointer object, gpointer klass)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-
-	camel_data_wrapper->mime_type = header_content_type_new ("application", "octet-stream");
-	camel_data_wrapper->offline = FALSE;
-}
-
-static void
-camel_data_wrapper_finalize (CamelObject *object)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-
-	if (camel_data_wrapper->mime_type)
-		header_content_type_unref (camel_data_wrapper->mime_type);
-
-	if (camel_data_wrapper->stream)
-		camel_object_unref (CAMEL_OBJECT (camel_data_wrapper->stream));
-}
-
-CamelType
-camel_data_wrapper_get_type (void)
-{
-	static CamelType camel_data_wrapper_type = CAMEL_INVALID_TYPE;
-
-	if (camel_data_wrapper_type == CAMEL_INVALID_TYPE) {
-		camel_data_wrapper_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelDataWrapper",
-							       sizeof (CamelDataWrapper),
-							       sizeof (CamelDataWrapperClass),
-							       (CamelObjectClassInitFunc) camel_data_wrapper_class_init,
-							       NULL,
-							       (CamelObjectInitFunc) camel_data_wrapper_init,
-							       (CamelObjectFinalizeFunc) camel_data_wrapper_finalize);
-	}
-
-	return camel_data_wrapper_type;
-}
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	if (data_wrapper->stream == NULL) {
-		return -1;
-	}
-
-	if (camel_stream_reset (data_wrapper->stream) == -1)
-		return -1;
-
-	return camel_stream_write_to_stream (data_wrapper->stream, stream);
-}
-
-CamelDataWrapper *
-camel_data_wrapper_new(void)
-{
-	return (CamelDataWrapper *)camel_object_new(camel_data_wrapper_get_type());
-}
-
-/**
- * camel_data_wrapper_write_to_stream:
- * @data_wrapper: a data wrapper
- * @stream: stream for data to be written to
- * @ex: a CamelException
- *
- * Writes the data content to @stream in a machine-independent format
- * appropriate for the data. It should be possible to construct an
- * equivalent data wrapper object later by passing this stream to
- * camel_data_construct_from_stream().
- *
- * Return value: the number of bytes written, or -1 if an error occurs.
- **/
-int
-camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
-				    CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CDW_CLASS (data_wrapper)->write_to_stream (data_wrapper, stream);
-}
-
-static int
-construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	if (data_wrapper->stream)
-		camel_object_unref((CamelObject *)data_wrapper->stream);
-
-	data_wrapper->stream = stream;
-	camel_object_ref (CAMEL_OBJECT (stream));
-	return 0;
-}
-
-/**
- * camel_data_wrapper_construct_from_stream:
- * @data_wrapper: a data wrapper
- * @stream: A stream that can be read from.
- *
- * Constructs the content of the data wrapper from the
- * supplied @stream.
- *
- * Return value: -1 on error.
- **/
-int
-camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,
-					  CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CDW_CLASS (data_wrapper)->construct_from_stream (data_wrapper, stream);
-}
-
-
-static void
-set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)
-{
-	if (data_wrapper->mime_type)
-		header_content_type_unref (data_wrapper->mime_type);
-	data_wrapper->mime_type = header_content_type_decode (mime_type);
-}
-
-/**
- * camel_data_wrapper_set_mime_type:
- * @data_wrapper: a data wrapper
- * @mime_type: the text representation of a MIME type
- *
- * This sets the data wrapper's MIME type.
- * It might fail, but you won't know. It will allow you to set
- * Content-Type parameters on the data wrapper, which are meaningless.
- * You should not be allowed to change the MIME type of a data wrapper
- * that contains data, or at least, if you do, it should invalidate the
- * data.
- **/
-void
-camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,
-				  const gchar *mime_type)
-{
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
-	g_return_if_fail (mime_type != NULL);
-
-	CDW_CLASS (data_wrapper)->set_mime_type (data_wrapper, mime_type);
-}
-
-static gchar *
-get_mime_type (CamelDataWrapper *data_wrapper)
-{
-	return header_content_type_simple (data_wrapper->mime_type);
-}
-
-/**
- * camel_data_wrapper_get_mime_type:
- * @data_wrapper: a data wrapper
- *
- * Return value: the text form of the data wrapper's MIME type,
- * which the caller must free.
- **/
-gchar *
-camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
-
-	return CDW_CLASS (data_wrapper)->get_mime_type (data_wrapper);
-}
-
-
-static CamelContentType *
-get_mime_type_field (CamelDataWrapper *data_wrapper)
-{
-	return data_wrapper->mime_type;
-}
-
-/**
- * camel_data_wrapper_get_mime_type_field:
- * @data_wrapper: a data wrapper
- *
- * Return value: the parsed form of the data wrapper's MIME type
- **/
-CamelContentType *
-camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
-
-	return CDW_CLASS (data_wrapper)->get_mime_type_field (data_wrapper);
-}
-
-/**
- * camel_data_wrapper_set_mime_type_field:
- * @data_wrapper: a data wrapper
- * @mime_type: the parsed representation of a MIME type
- *
- * This sets the data wrapper's MIME type. It suffers from the same
- * flaws as camel_data_wrapper_set_mime_type.
- **/
-static void
-set_mime_type_field (CamelDataWrapper *data_wrapper,
-		     CamelContentType *mime_type)
-{
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
-	g_return_if_fail (mime_type != NULL);
-
-	if (data_wrapper->mime_type)
-		header_content_type_unref (data_wrapper->mime_type);
-	data_wrapper->mime_type = mime_type;
-	if (mime_type)
-		header_content_type_ref (data_wrapper->mime_type);
-}
-
-void
-camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
-					CamelContentType *mime_type)
-{
-	CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper, mime_type);
-}
-
-
-/**
- * camel_data_wrapper_is_offline:
- * @data_wrapper: a data wrapper
- *
- * Return value: whether @data_wrapper is "offline" (data stored
- * remotely) or not. Some optional code paths may choose to not
- * operate on offline data.
- **/
-gboolean
-camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper)
-{
-	return data_wrapper->offline;
-}
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
deleted file mode 100644
index 67cce7ed50..0000000000
--- a/camel/camel-data-wrapper.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-data-wrapper.h : Abstract class for a data wrapper */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_DATA_WRAPPER_H
-#define CAMEL_DATA_WRAPPER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-
-#define CAMEL_DATA_WRAPPER_TYPE     (camel_data_wrapper_get_type ())
-#define CAMEL_DATA_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))
-#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))
-#define CAMEL_IS_DATA_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
-
-struct _CamelDataWrapper
-{
-	CamelObject parent_object;
-
-	CamelContentType *mime_type;
-	CamelStream *stream;
-	gboolean offline;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */
-	void                (*set_mime_type)          (CamelDataWrapper *data_wrapper,
-						       const gchar * mime_type);
-	gchar *             (*get_mime_type)          (CamelDataWrapper *data_wrapper);
-	CamelContentType *  (*get_mime_type_field)    (CamelDataWrapper *data_wrapper);
-	void                (*set_mime_type_field)    (CamelDataWrapper *data_wrapper,
-						       CamelContentType *mime_type_field);
-
-	int                 (*write_to_stream)        (CamelDataWrapper *data_wrapper,
-						       CamelStream *stream);
-
-	int                 (*construct_from_stream)  (CamelDataWrapper *data_wrapper,
-						       CamelStream *);
-} CamelDataWrapperClass;
-
-/* Standard Camel function */
-CamelType camel_data_wrapper_get_type (void);
-
-/* public methods */
-CamelDataWrapper *  camel_data_wrapper_new(void);
-int                 camel_data_wrapper_write_to_stream          (CamelDataWrapper *data_wrapper,
-								 CamelStream *stream);
-void                camel_data_wrapper_set_mime_type            (CamelDataWrapper *data_wrapper,
-								 const gchar *mime_type);
-gchar *             camel_data_wrapper_get_mime_type            (CamelDataWrapper *data_wrapper);
-CamelContentType *  camel_data_wrapper_get_mime_type_field      (CamelDataWrapper *data_wrapper);
-void                camel_data_wrapper_set_mime_type_field      (CamelDataWrapper *data_wrapper,
-								 CamelContentType *mime_type);
-
-int                 camel_data_wrapper_construct_from_stream    (CamelDataWrapper *data_wrapper, CamelStream *stream);
-
-gboolean            camel_data_wrapper_is_offline               (CamelDataWrapper *data_wrapper);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DATA_WRAPPER_H */
diff --git a/camel/camel-exception-list.def b/camel/camel-exception-list.def
deleted file mode 100644
index 8fe1e268cf..0000000000
--- a/camel/camel-exception-list.def
+++ /dev/null
@@ -1,37 +0,0 @@
-/* WARNING: Exceptions MUST NOT be renumbered: they need to be
- * consistent across libraries compiled at different times.
- * Categories should be widely separated, old unused exceptions can
- * never be deleted, and new exceptions can be added only to the
- * ends of categories.
- */
-
-CAMEL_EXCEPTION_NONE = 0,
-
-/* Generic exceptions */
-CAMEL_EXCEPTION_INVALID_PARAM,
-CAMEL_EXCEPTION_SYSTEM,
-CAMEL_EXCEPTION_USER_CANCEL,
-
-/* CamelFolderException */
-CAMEL_EXCEPTION_FOLDER_NULL = 100,
-CAMEL_EXCEPTION_FOLDER_INVALID,
-CAMEL_EXCEPTION_FOLDER_INVALID_STATE,
-CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
-CAMEL_EXCEPTION_FOLDER_NON_UID,
-CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
-CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
-CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,
-
-/* CamelStoreException */
-CAMEL_EXCEPTION_STORE_NULL = 200,
-CAMEL_EXCEPTION_STORE_INVALID,
-CAMEL_EXCEPTION_STORE_NO_FOLDER,
-
-/* CamelServiceException */
-CAMEL_EXCEPTION_SERVICE_NULL = 300,
-CAMEL_EXCEPTION_SERVICE_INVALID,
-CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
deleted file mode 100644
index 6f07183f2b..0000000000
--- a/camel/camel-exception.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-execpetion.c : exception utils */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-exception.h"
-
-/* i dont know why gthread_mutex stuff even exists, this is easier */
-
-/* also, i'm not convinced mutexes are needed here.  But it
-   doesn't really hurt either */
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-static pthread_mutex_t exception_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define CAMEL_EXCEPTION_LOCK(e) (pthread_mutex_lock(&exception_mutex))
-#define CAMEL_EXCEPTION_UNLOCK(e) (pthread_mutex_unlock(&exception_mutex))
-#else
-#define CAMEL_EXCEPTION_LOCK(e) 
-#define CAMEL_EXCEPTION_UNLOCK(e) 
-#endif
-
-/**
- * camel_exception_new: allocate a new exception object. 
- * 
- * Create and returns a new exception object.
- * 
- * 
- * Return value: The newly allocated exception object.
- **/
-CamelException *
-camel_exception_new (void)
-{
-	CamelException *ex;
-
-	ex = g_new (CamelException, 1);
-	ex->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	ex->id = CAMEL_EXCEPTION_NONE;
-
-	return ex;
-}
-
-/**
- * camel_exception_init: init a (statically allocated) exception. 
- * 
- * Init an exception. This routine is mainly
- * useful when using a statically allocated
- * exception. 
- * 
- * 
- **/
-void
-camel_exception_init (CamelException *ex)
-{
-	ex->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	ex->id = CAMEL_EXCEPTION_NONE;
-}
-
-
-/**
- * camel_exception_clear: Clear an exception
- * @exception: the exception object
- * 
- * Clear an exception, that is, set the 
- * exception ID to CAMEL_EXCEPTION_NONE and
- * free the description text.
- * If the exception is NULL, this funtion just
- * returns.
- **/
-void 
-camel_exception_clear (CamelException *exception)
-{
-	if (!exception)
-		return;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	if (exception->desc)
-		g_free (exception->desc);
-	exception->desc = NULL;
-	exception->id = CAMEL_EXCEPTION_NONE;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * camel_exception_free: Free an exception 
- * @exception: The exception object to free
- * 
- * Free an exception object. If the exception
- * is NULL, nothing is done, the routine simply
- * returns.
- **/
-void 
-camel_exception_free (CamelException *exception)
-{
-	if (!exception)
-		return;
-	
-	if (exception->desc)
-		g_free (exception->desc);
-	g_free (exception);
-}
-
-/**
- * camel_exception_set: set an exception 
- * @ex: exception object 
- * @id: exception id 
- * @desc: textual description of the exception
- * 
- * Set the value of an exception. The exception id is 
- * a unique number representing the exception. The 
- * textual description is a small text explaining 
- * what happened and provoked the exception.
- *
- * When @ex is NULL, nothing is done, this routine
- * simply returns.
- *
- **/
-void
-camel_exception_set (CamelException *ex,
-		     ExceptionId id,
-		     const char *desc)
-{
-	if (!ex)
-		return;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	ex->id = id;
-
-	if (ex->desc)
-		g_free(ex->desc);
-	ex->desc = g_strdup(desc);
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * camel_exception_setv: set an exception 
- * @ex: exception object 
- * @id: exception id 
- * @format: format of the description string. The format string is
- * used as in printf().
- * 
- * Set the value of an exception. The exception id is 
- * a unique number representing the exception. The 
- * textual description is a small text explaining 
- * what happened and provoked the exception. 
- * In this version, the string is created from the format 
- * string and the variable argument list.
- *
- * It is safe to say:
- *   camel_exception_setv (ex, ..., camel_exception_get_description (ex), ...);
- *
- * When @ex is NULL, nothing is done, this routine
- * simply returns.
- *
- **/
-void
-camel_exception_setv (CamelException *ex,
-		      ExceptionId id,
-		      const char *format, 
-		      ...)
-{
-	va_list args;
-	
-	if (!ex)
-		return;
-
-	CAMEL_EXCEPTION_LOCK(exception);
-	
-	if (ex->desc)
-		g_free (ex->desc);
-	
-	va_start(args, format);
-	ex->desc = g_strdup_vprintf (format, args);
-	va_end (args);
-
-	ex->id = id;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * camel_exception_xfer: transfer an exception
- * @ex_dst: Destination exception object 
- * @ex_src: Source exception object
- * 
- * Transfer the content of an exception from
- * an exception object to another. 
- * The destination exception receives the id and
- * the description text of the source exception. 
- **/
-void 
-camel_exception_xfer (CamelException *ex_dst,
-		      CamelException *ex_src)
-{
-	CAMEL_EXCEPTION_LOCK(exception);
-
-	if (ex_dst->desc)
-		g_free (ex_dst->desc);
-
-	ex_dst->id = ex_src->id;
-	ex_dst->desc = ex_src->desc;
-
-	ex_src->desc = NULL;
-	ex_src->id = CAMEL_EXCEPTION_NONE;
-
-	CAMEL_EXCEPTION_UNLOCK(exception);
-}
-
-/**
- * camel_exception_get_id: get the exception id
- * @ex: The exception object
- * 
- * Return the id of an exception. 
- * If @ex is NULL, return CAMEL_EXCEPTION_NONE;
- * 
- * Return value: Exception ID.
- **/
-ExceptionId
-camel_exception_get_id (CamelException *ex)
-{
-	if (ex)
-		return ex->id;
-	else 
-		return CAMEL_EXCEPTION_NONE;
-}
-
-/**
- * camel_exception_get_description: get the description of an exception.
- * @ex: The exception object
- * 
- * Return the exception description text. 
- * If @ex is NULL, return NULL;
- * 
- * 
- * Return value: Exception description text.
- **/
-const gchar *
-camel_exception_get_description (CamelException *ex)
-{
-	char *ret = NULL;
-
-	if (ex)
-		ret = ex->desc;
-
-	return ret;
-}
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
deleted file mode 100644
index bb8df1a6fc..0000000000
--- a/camel/camel-exception.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-execpetion.h : exception utils */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef CAMEL_EXCEPTION_H
-#define CAMEL_EXCEPTION_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-typedef enum {
-#include "camel-exception-list.def"
-
-} ExceptionId;
-
-
-struct _CamelException {
-	/* do not access the fields directly */
-	ExceptionId id;
-	char *desc;
-
-};
-
-
-
-/* creation and destruction functions */
-CamelException *          camel_exception_new           (void);
-void                      camel_exception_free          (CamelException *exception);
-void                      camel_exception_init          (CamelException *ex);
-
-
-/* exception content manipulation */
-void                      camel_exception_clear         (CamelException *exception);
-void                      camel_exception_set           (CamelException *ex,
-							 ExceptionId id,
-							 const char *desc);
-void                      camel_exception_setv          (CamelException *ex,
-							 ExceptionId id,
-							 const char *format,  
-							 ...);
-
-
-/* exception content transfer */
-void                      camel_exception_xfer          (CamelException *ex_dst,
-							 CamelException *ex_src);
-
-
-/* exception content retrieval */
-ExceptionId               camel_exception_get_id        (CamelException *ex);
-const char *             camel_exception_get_description (CamelException *ex);
-
-#define camel_exception_is_set(ex) (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_EXCEPTION_H */
-
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
deleted file mode 100644
index 20c93d3d61..0000000000
--- a/camel/camel-filter-driver.c
+++ /dev/null
@@ -1,826 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-filter-driver.h"
-#include "camel-filter-search.h"
-
-#include "camel-exception.h"
-#include "camel-service.h"
-#include "camel-mime-message.h"
-
-#include <glib.h>
-
-#include <time.h>
-
-#include "e-util/e-sexp.h"
-#include "e-util/e-memory.h"
-#include "e-util/e-msgport.h"	/* for edlist */
-
-#define d(x)
-
-/* type of status for a log report */
-enum filter_log_t {
-	FILTER_LOG_NONE,
-	FILTER_LOG_START,       /* start of new log entry */
-	FILTER_LOG_ACTION,      /* an action performed */
-	FILTER_LOG_END,	        /* end of log */
-};
-
-/* list of rule nodes */
-struct _filter_rule {
-	struct _filter_rule *next;
-	struct _filter_rule *prev;
-
-	char *match;
-	char *action;
-	char *name;
-};
-
-struct _CamelFilterDriverPrivate {
-	GHashTable *globals;       /* global variables */
-
-	CamelFolder *defaultfolder;	/* defualt folder */
-	
-	CamelFilterStatusFunc *statusfunc; 	/* status callback */
-	void *statusdata;		/* status callback data */
-	
-	/* for callback */
-	CamelFilterGetFolderFunc get_folder;
-	void *data;
-	
-	/* run-time data */
-	GHashTable *folders;       /* folders that message has been copied to */
-	int closed;		   /* close count */
-	GHashTable *forwards;      /* addresses that have been forwarded the message */
-	
-	gboolean terminated;       /* message processing was terminated */
-	gboolean deleted;          /* message was marked for deletion */
-	gboolean copied;           /* message was copied to some folder or another */
-	
-	CamelMimeMessage *message; /* input message */
-	CamelMessageInfo *info;    /* message summary info */
-	const char *uid;           /* message uid */
-	CamelFolder *source;       /* message source folder */
-	
-	FILE *logfile;             /* log file */
-	
-	EDList rules;		   /* list of _filter_rule structs */
-
-	CamelException *ex;
-	
-	/* evaluator */
-	ESExp *eval;
-};
-
-#define _PRIVATE(o) (((CamelFilterDriver *)(o))->priv)
-
-static void camel_filter_driver_class_init (CamelFilterDriverClass *klass);
-static void camel_filter_driver_init       (CamelFilterDriver *obj);
-static void camel_filter_driver_finalise   (CamelObject *obj);
-
-static void camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...);
-
-static CamelFolder *open_folder (CamelFilterDriver *d, const char *folder_url);
-static int close_folders (CamelFilterDriver *d);
-
-static ESExpResult *do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-static ESExpResult *do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);
-
-/* these are our filter actions - each must have a callback */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "delete",          (ESExpFunc *) do_delete,    0 },
-	{ "forward-to",      (ESExpFunc *) mark_forward, 0 },
-	{ "copy-to",         (ESExpFunc *) do_copy,      0 },
-	{ "move-to",         (ESExpFunc *) do_move,      0 },
-	{ "stop",            (ESExpFunc *) do_stop,      0 },
-	{ "set-colour",      (ESExpFunc *) do_colour,    0 },
-	{ "set-score",       (ESExpFunc *) do_score,     0 },
-	{ "set-system-flag", (ESExpFunc *) do_flag,      0 }
-};
-
-static CamelObjectClass *camel_filter_driver_parent;
-
-guint
-camel_filter_driver_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE)	{
-		type = camel_type_register(CAMEL_OBJECT_TYPE, "CamelFilterDriver",
-					   sizeof(CamelFilterDriver),
-					   sizeof(CamelFilterDriverClass),
-					   (CamelObjectClassInitFunc)camel_filter_driver_class_init,
-					   NULL,
-					   (CamelObjectInitFunc)camel_filter_driver_init,
-					   (CamelObjectFinalizeFunc)camel_filter_driver_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_filter_driver_class_init (CamelFilterDriverClass *klass)
-{
-	/*CamelObjectClass *object_class = (CamelObjectClass *) klass;*/
-
-	camel_filter_driver_parent = camel_type_get_global_classfuncs(camel_object_get_type());
-}
-
-static void
-camel_filter_driver_init (CamelFilterDriver *obj)
-{
-	struct _CamelFilterDriverPrivate *p;
-	int i;
-	
-	p = _PRIVATE (obj) = g_malloc0 (sizeof (*p));
-
-	e_dlist_init(&p->rules);
-
-	p->eval = e_sexp_new ();
-	/* Load in builtin symbols */
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (p->eval, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, obj);
-		} else {
-			e_sexp_add_function (p->eval, 0, symbols[i].name, symbols[i].func, obj);
-		}
-	}
-	
-	p->globals = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void
-free_hash_strings (void *key, void *value, void *data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
-camel_filter_driver_finalise (CamelObject *obj)
-{
-	CamelFilterDriver *driver = (CamelFilterDriver *) obj;
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);	
-	struct _filter_rule *node;
-
-	/* close all folders that were opened for appending */
-	close_folders (driver);
-	g_hash_table_destroy (p->folders);
-	
-	g_hash_table_foreach (p->globals, free_hash_strings, driver);
-	g_hash_table_destroy (p->globals);
-
-	e_sexp_unref(p->eval);
-	
-	if (p->defaultfolder) {
-		camel_folder_thaw (p->defaultfolder);
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	}
-
-	while ((node = (struct _filter_rule *)e_dlist_remhead(&p->rules))) {
-		g_free(node->match);
-		g_free(node->action);
-		g_free(node->name);
-		g_free(node);
-	}
-	
-	g_free (p);
-}
-
-/**
- * camel_filter_driver_new:
- * @system: path to system rules
- * @user: path to user rules
- * @get_folder: function to call to fetch folders
- *
- * Create a new CamelFilterDriver object.
- * 
- * Return value: A new CamelFilterDriver widget.
- **/
-CamelFilterDriver *
-camel_filter_driver_new (CamelFilterGetFolderFunc get_folder, void *data)
-{
-	CamelFilterDriver *new;
-	struct _CamelFilterDriverPrivate *p;
-	
-	new = CAMEL_FILTER_DRIVER (camel_object_new(camel_filter_driver_get_type ()));
-	p = _PRIVATE (new);
-	
-	p->get_folder = get_folder;
-	p->data = data;
-	
-	return new;
-}
-
-void
-camel_filter_driver_set_logfile (CamelFilterDriver *d, FILE *logfile)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->logfile = logfile;
-}
-
-void
-camel_filter_driver_set_status_func (CamelFilterDriver *d, CamelFilterStatusFunc *func, void *data)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->statusfunc = func;
-	p->statusdata = data;
-}
-
-void
-camel_filter_driver_set_default_folder (CamelFilterDriver *d, CamelFolder *def)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	
-	if (p->defaultfolder) {
-		camel_folder_thaw (p->defaultfolder);
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	}
-	
-	p->defaultfolder = def;
-	
-	if (p->defaultfolder) {
-		camel_folder_freeze (p->defaultfolder);
-		camel_object_ref (CAMEL_OBJECT (p->defaultfolder));
-	}
-}
-
-void
-camel_filter_driver_add_rule(CamelFilterDriver *d, const char *name, const char *match, const char *action)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	struct _filter_rule *node;
-
-	node = g_malloc(sizeof(*node));
-	node->match = g_strdup(match);
-	node->action = g_strdup(action);
-	node->name = g_strdup(name);
-	e_dlist_addtail(&p->rules, (EDListNode *)node);
-}
-
-static void
-report_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, ...)
-{
-	/* call user-defined status report function */
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	va_list ap;
-	char *str;
-	
-	if (p->statusfunc) {
-		va_start (ap, desc);
-		str = g_strdup_vprintf (desc, ap);
-		p->statusfunc (driver, status, pc, str, p->statusdata);
-		g_free (str);
-	}
-}
-
-
-#if 0
-void
-camel_filter_driver_set_global (CamelFilterDriver *d, const char *name, const char *value)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);
-	char *oldkey, *oldvalue;
-	
-	if (g_hash_table_lookup_extended (p->globals, name, (void *)&oldkey, (void *)&oldvalue)) {
-		g_free (oldvalue);
-		g_hash_table_insert (p->globals, oldkey, g_strdup (value));
-	} else {
-		g_hash_table_insert (p->globals, g_strdup (name), g_strdup (value));
-	}
-}
-#endif
-
-static ESExpResult *
-do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "doing delete\n"));
-	p->deleted = TRUE;
-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Delete");
-	
-	return NULL;
-}
-
-static ESExpResult *
-mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	/*struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);*/
-	
-	d(fprintf (stderr, "marking message for forwarding\n"));
-	/* FIXME: do stuff here */
-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Forward");
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "copying message...\n"));
-	
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to copy to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				break;
-			
-			p->copied = TRUE;
-			if (p->uid && p->source)
-				camel_folder_copy_message_to (p->source, p->uid, outbox, p->ex);
-			else
-				camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s",
-						 service_url);
-			g_free (service_url);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "moving message...\n"));
-	
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to move to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				break;
-			
-			p->copied = TRUE;
-			p->deleted = TRUE;  /* a 'move' is a copy & delete */
-			
-			if (p->uid && p->source)
-				camel_folder_copy_message_to (p->source, p->uid, outbox, p->ex);
-			else
-				camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s",
-						 service_url);
-			g_free (service_url);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Stopped processing");
-	d(fprintf (stderr, "terminating message processing\n"));
-	p->terminated = TRUE;
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting colour tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_STRING) {
-		camel_tag_set (&p->info->user_tags, "colour", argv[0]->value.string);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set colour to %s", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting score tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_INT) {
-		char *value;
-		
-		value = g_strdup_printf ("%d", argv[0]->value.number);
-		camel_tag_set (&p->info->user_tags, "score", value);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set score to %d", argv[0]->value.number);
-		g_free (value);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting flag\n"));
-	if (argc == 1 && argv[0]->type == ESEXP_RES_STRING) {
-		p->info->flags |= camel_system_flag (argv[0]->value.string) | CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set %s flag", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static CamelFolder *
-open_folder (CamelFilterDriver *driver, const char *folder_url)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	CamelFolder *camelfolder;
-	
-	/* we have a lookup table of currently open folders */
-	camelfolder = g_hash_table_lookup (p->folders, folder_url);
-	if (camelfolder)
-		return camelfolder;
-	
-	camelfolder = p->get_folder (driver, folder_url, p->data, p->ex);
-	
-	if (camelfolder) {
-		g_hash_table_insert (p->folders, g_strdup (folder_url), camelfolder);
-		camel_folder_freeze (camelfolder);
-	}
-	
-	return camelfolder;
-}
-
-static void
-close_folder (void *key, void *value, void *data)
-{	
-	CamelFolder *folder = value;
-	CamelFilterDriver *driver = data;
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	p->closed++;
-
-	g_free (key);
-	camel_folder_sync (folder, FALSE, p->ex);
-	camel_folder_thaw (folder);
-	camel_object_unref (CAMEL_OBJECT (folder));
-
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p->folders)* 100 / p->closed, "Syncing folders");
-}
-
-/* flush/close all folders */
-static int
-close_folders (CamelFilterDriver *driver)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 0, "Syncing folders");
-
-	p->closed = 0;
-	g_hash_table_foreach (p->folders, close_folder, driver);
-	g_hash_table_destroy (p->folders);
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	/* FIXME: status from driver */
-	return 0;
-}
-
-#if 0
-static void
-free_key (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-#endif
-
-
-static void
-camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	
-	if (p->logfile) {
-		char *str = NULL;
-		
-		if (desc) {
-			va_list ap;
-			
-			va_start (ap, desc);
-			str = g_strdup_vprintf (desc, ap);
-		}
-		
-		switch (status) {
-		case FILTER_LOG_START: {
-			/* write log header */
-			const char *subject = NULL;
-			char *fromstr;
-			const CamelInternetAddress *from;
-			char date[50];
-			time_t t;
-
-			/* FIXME: does this need locking?  Probably */
-
-			from = camel_mime_message_get_from (p->message);
-			fromstr = camel_address_format((CamelAddress *)from);
-			subject = camel_mime_message_get_subject (p->message);
-			
-			time (&t);
-			strftime (date, 49, "%a, %d %b %Y %H:%M:%S", localtime (&t));
-			fprintf (p->logfile, "Applied filter \"%s\" to message from %s - \"%s\" at %s\n",
-				 str, fromstr ? fromstr : "unknown", subject ? subject : "", date);
-			g_free(fromstr);
-			break;
-		}
-		case FILTER_LOG_ACTION:
-			fprintf (p->logfile, "Action: %s\n", str);
-			break;
-		case FILTER_LOG_END:
-			fprintf (p->logfile, "\n");
-			break;
-		default:
-			/* nothing else is loggable */
-			break;
-		}
-		
-		g_free (str);
-	}
-}
-
-
-/* will filter only an mbox - is more efficient as it doesn't need to open the folder through camel directly */
-void
-camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	CamelMimeParser *mp = NULL;
-	char *source_url = NULL;
-	int fd = -1;
-	int i = 0;
-	struct stat st;
-	
-	fd = open (mbox, O_RDONLY);
-	if (fd == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to open spool folder");
-		goto fail;
-	}
-	/* to get the filesize */
-	fstat (fd, &st);
-	
-	mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mp, TRUE);
-	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to process spool folder");
-		goto fail;
-	}
-	fd = -1;
-	
-	source_url = g_strdup_printf ("file://%s", mbox);
-	
-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
-		CamelMimeMessage *msg;
-		int pc = 0;
-		
-		if (st.st_size > 0)
-			pc = (int)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));
-		
-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, "Getting message %d (%d%%)", i, pc);
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed message %d", i);
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Cannot open message");
-			camel_object_unref (CAMEL_OBJECT (msg));
-			goto fail;
-		}
-		
-		camel_filter_driver_filter_message (driver, msg, NULL, NULL, NULL, source_url, ex);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed message %d", i);
-			goto fail;
-		}
-		
-		i++;
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-	}
-
-	if (p->defaultfolder) {
-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, "Syncing folder");
-		camel_folder_sync(p->defaultfolder, FALSE, ex);
-	}
-
-	report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Complete");
-	
-fail:
-	g_free (source_url);
-	if (fd != -1)
-		close (fd);
-	if (mp)
-		camel_object_unref (CAMEL_OBJECT (mp));
-}
-
-/* will filter a folder */
-void
-camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folder,
-				   GPtrArray *uids, gboolean remove, CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	int freeuids = FALSE;
-	CamelMimeMessage *message;
-	CamelMessageInfo *info;
-	char *source_url, *service_url;
-	
-	service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (folder)));
-	source_url = g_strdup_printf ("%s%s", service_url, camel_folder_get_full_name (folder));
-	g_free (service_url);
-	
-	if (uids == NULL) {
-		uids = camel_folder_get_uids (folder);
-		freeuids = TRUE;
-	}
-	
-	for (i = 0; i < uids->len; i++) {
-		int pc = (100 * i)/uids->len;
-
-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, "Getting message %d of %d", i+1,
-			       uids->len);
-		
-		message = camel_folder_get_message (folder, uids->pdata[i], ex);
-		if (!message || camel_exception_is_set (ex)) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed at message %d of %d",
-				       i+1, uids->len);
-			break;
-		}
-		
-		if (camel_folder_has_summary_capability (folder))
-			info = camel_folder_get_message_info (folder, uids->pdata[i]);
-		else
-			info = NULL;
-		
-		camel_filter_driver_filter_message (driver, message, info, uids->pdata[i],
-						    folder, source_url, ex);
-		
-		if (camel_folder_has_summary_capability (folder))
-			camel_folder_free_message_info (folder, info);
-
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed at message %d of %d",
-				       i+1, uids->len);
-			break;
-		}
-		
-		if (remove)
-			camel_folder_set_message_flags (folder, uids->pdata[i],
-							CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-		
-		camel_object_unref (CAMEL_OBJECT (message));
-	}
-
-	if (freeuids)
-		camel_folder_free_uids (folder, uids);
-	
-	if (p->defaultfolder) {
-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, "Syncing folder");
-		camel_folder_sync (p->defaultfolder, FALSE, ex);
-	}
-
-	if (i == uids->len)
-		report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Complete");
-	
-	
-	g_free (source_url);
-}
-
-void
-camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage *message,
-				    CamelMessageInfo *info, const char *uid,
-				    CamelFolder *source, const char *source_url,
-				    CamelException *ex)
-{
-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
-	ESExpResult *r;
-	struct _filter_rule *node;
-	gboolean freeinfo = FALSE;
-	gboolean filtered = FALSE;
-	
-	if (info == NULL) {
-		struct _header_raw *h = CAMEL_MIME_PART (message)->headers;
-		
-		info = camel_message_info_new_from_header (h);
-		freeinfo = TRUE;
-	} else {
-		if (info->flags & CAMEL_MESSAGE_DELETED)
-			return;
-	}
-	
-	p->ex = ex;
-	p->terminated = FALSE;
-	p->deleted = FALSE;
-	p->copied = FALSE;
-	p->message = message;
-	p->info = info;
-	p->uid = uid;
-	p->source = source;
-	
-	node = (struct _filter_rule *)p->rules.head;
-	while (node->next) {
-		d(fprintf (stderr, "applying rule %s\n action %s\n", node->match, node->action));
-		
-		if (camel_filter_search_match(p->message, p->info, source_url, node->match, p->ex)) {
-			filtered = TRUE;
-			camel_filter_driver_log (driver, FILTER_LOG_START, node->name);
-
-			/* perform necessary filtering actions */
-			e_sexp_input_text (p->eval, node->action, strlen (node->action));
-			if (e_sexp_parse (p->eval) == -1) {
-				camel_exception_setv(ex, 1, _("Error parsing filter: %s: %s"), e_sexp_error(p->eval), node->action);
-				goto error;
-			}
-			r = e_sexp_eval (p->eval);
-			if (r == NULL) {
-				camel_exception_setv(ex, 1, _("Error executing filter: %s: %s"), e_sexp_error(p->eval), node->action);
-				goto error;
-			}
-			e_sexp_result_free (p->eval, r);
-			if (p->terminated)
-				break;
-		}
-		node = node->next;
-	}
-	
-	/* *Now* we can set the DELETED flag... */
-	if (p->deleted)
-		info->flags = info->flags | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	
-	/* Logic: if !Moved and there exists a default folder... */
-	if (!(p->copied && p->deleted) && p->defaultfolder) {
-		/* copy it to the default inbox */
-		filtered = TRUE;
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");
-		if (p->uid && p->source)
-			camel_folder_copy_message_to (p->source, p->uid, p->defaultfolder, p->ex);
-		else
-			camel_folder_append_message (p->defaultfolder, p->message, p->info, p->ex);
-	}
-
-error:	
-	if (filtered)
-		camel_filter_driver_log (driver, FILTER_LOG_END, NULL);
-	
-	if (freeinfo)
-		camel_message_info_free (info);
-}
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
deleted file mode 100644
index 113eec28ed..0000000000
--- a/camel/camel-filter-driver.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_FILTER_DRIVER_H
-#define _CAMEL_FILTER_DRIVER_H
-
-#include <camel/camel-object.h>
-#include <camel/camel-session.h>
-#include <camel/camel-folder.h>
-
-#define CAMEL_FILTER_DRIVER_TYPE   (camel_filter_driver_get_type())
-#define CAMEL_FILTER_DRIVER(obj)         CAMEL_CHECK_CAST (obj, camel_filter_driver_get_type (), CamelFilterDriver)
-#define CAMEL_FILTER_DRIVER_CLASS(klass) CAMEL__CHECK_CLASS_CAST (klass, camel_filter_driver_get_type (), CamelFilterDriverClass)
-#define CAMEL_IS_FILTER_DRIVER(obj)      CAMEL_CHECK_TYPE (obj, camel_filter_driver_get_type ())
-
-typedef struct _CamelFilterDriver      CamelFilterDriver;
-typedef struct _CamelFilterDriverClass CamelFilterDriverClass;
-
-struct _CamelFilterDriver {
-	CamelObject parent;
-
-	struct _CamelFilterDriverPrivate *priv;
-};
-
-struct _CamelFilterDriverClass {
-	CamelObjectClass parent_class;
-};
-
-/* FIXME: this maybe should change... */
-/* type of status for a status report */
-enum camel_filter_status_t {
-	CAMEL_FILTER_STATUS_NONE,
-	CAMEL_FILTER_STATUS_START,	/* start of new message processed */
-	CAMEL_FILTER_STATUS_ACTION,	/* an action performed */
-	CAMEL_FILTER_STATUS_PROGRESS,	/* (an) extra update(s), if its taking longer to process */
-	CAMEL_FILTER_STATUS_END,	/* end of message */
-};
-
-typedef CamelFolder * (*CamelFilterGetFolderFunc) (CamelFilterDriver *, const char *uri, void *data, CamelException *ex);
-/* report status */
-typedef void (CamelFilterStatusFunc)(CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, void *data);
-
-guint         camel_filter_driver_get_type (void);
-CamelFilterDriver  *camel_filter_driver_new     (CamelFilterGetFolderFunc fetcher, void *data);
-
-/* modifiers */
-void    camel_filter_driver_set_logfile         (CamelFilterDriver *d, FILE *logfile);
-void	camel_filter_driver_set_status_func     (CamelFilterDriver *d, CamelFilterStatusFunc *func,
-						 void *data);
-void	camel_filter_driver_set_default_folder  (CamelFilterDriver *d, CamelFolder *def);
-void 	camel_filter_driver_add_rule		(CamelFilterDriver *d, const char *name, const char *match,
-						 const char *action);
-
-/*void camel_filter_driver_set_global(CamelFilterDriver *, const char *name, const char *value);*/
-
-void    camel_filter_driver_filter_message      (CamelFilterDriver *driver, CamelMimeMessage *message,
-						 CamelMessageInfo *info, const char *uri,
-						 CamelFolder *source, const char *source_url,
-						 CamelException *ex);
-void    camel_filter_driver_filter_mbox         (CamelFilterDriver *driver, const char *mbox,
-						 CamelException *ex);
-void    camel_filter_driver_filter_folder       (CamelFilterDriver *driver, CamelFolder *folder,
-						 GPtrArray *uids, gboolean remove, CamelException *ex);
-
-#if 0
-/* generate the search query/action string for a filter option */
-void camel_filter_driver_expand_option (CamelFilterDriver *d, GString *s, GString *action, struct filter_option *op);
-
-/* get info about rules (options) */
-int camel_filter_driver_rule_count (CamelFilterDriver *d);
-struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n);
-#endif
-
-#endif /* ! _CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
deleted file mode 100644
index a680c26146..0000000000
--- a/camel/camel-filter-search.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *  Copyright 2001 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.
- *
- */
-
-/* (from glibc headers:
-   POSIX says that <sys/types.h> must be included (by the caller) before <regex.h>.  */
-#include <sys/types.h>
-#include <regex.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "e-util/e-sexp.h"
-
-#include "camel-mime-message.h"
-#include "camel-filter-search.h"
-#include "camel-exception.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "camel-search-private.h"
-
-#define d(x)
-
-typedef struct {
-	CamelMimeMessage *message;
-	CamelMessageInfo *info;
-	const char *source;
-	CamelException *ex;
-} FilterMessageSearch;
-
-/* ESExp callbacks */
-static ESExpResult *header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms);
-static ESExpResult *body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-
-/* builtin functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "match-all",          (ESExpFunc *) match_all,          1 },
-	{ "body-contains",      (ESExpFunc *) body_contains,      0 },
-	{ "body-regex",         (ESExpFunc *) body_regex,         0 },
-	{ "header-contains",    (ESExpFunc *) header_contains,    0 },
-	{ "header-matches",     (ESExpFunc *) header_matches,     0 },
-	{ "header-starts-with", (ESExpFunc *) header_starts_with, 0 },
-	{ "header-ends-with",   (ESExpFunc *) header_ends_with,   0 },
-	{ "header-exists",      (ESExpFunc *) header_exists,      0 },
-	{ "header-soundex",     (ESExpFunc *) header_soundex,     0 },
-	{ "header-regex",       (ESExpFunc *) header_regex,       0 },
-	{ "header-full-regex",  (ESExpFunc *) header_full_regex,  0 },
-	{ "user-tag",           (ESExpFunc *) user_tag,           0 },
-	{ "user-flag",          (ESExpFunc *) user_flag,          0 },
-	{ "system-flag",        (ESExpFunc *) system_flag,        0 },
-	{ "get-sent-date",      (ESExpFunc *) get_sent_date,      0 },
-	{ "get-received-date",  (ESExpFunc *) get_received_date,  0 },
-	{ "get-current-date",   (ESExpFunc *) get_current_date,   0 },
-	{ "get-score",          (ESExpFunc *) get_score,          0 },
-	{ "get-source",         (ESExpFunc *) get_source,         0 },
-};
-
-static ESExpResult *
-check_header(struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms, camel_search_match_t how)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	int i;
-
-	if (argc > 1 && argv[0]->type == ESEXP_RES_STRING) {
-		char *name = argv[0]->value.string;
-		const char *header;
-
-		if (strcasecmp(name, "x-camel-mlist") == 0)
-			header = camel_message_info_mlist(fms->info);
-		else
-			header = camel_medium_get_header (CAMEL_MEDIUM (fms->message), argv[0]->value.string);
-
-		if (header) {
-			for (i=1;i<argc && !matched;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING
-				    && camel_search_header_match(header, argv[i]->value.string, how)) {
-					matched = TRUE;
-					break;
-				}
-			}
-		}
-	}
-	
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header(f, argc, argv, fms, CAMEL_SEARCH_MATCH_CONTAINS);
-}
-
-
-static ESExpResult *
-header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header(f, argc, argv, fms, CAMEL_SEARCH_MATCH_EXACT);
-}
-
-static ESExpResult *
-header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header(f, argc, argv, fms, CAMEL_SEARCH_MATCH_STARTS);
-}
-
-static ESExpResult *
-header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header(f, argc, argv, fms, CAMEL_SEARCH_MATCH_ENDS);
-}
-
-static ESExpResult *
-header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	return check_header(f, argc, argv, fms, CAMEL_SEARCH_MATCH_SOUNDEX);
-}
-
-static ESExpResult *
-header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	int i;
-
-	for (i=0;i<argc && !matched;i++) {
-		if (argv[i]->type == ESEXP_RES_STRING)
-			matched = camel_medium_get_header (CAMEL_MEDIUM (fms->message), argv[i]->value.string) != NULL;
-	}
-	
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	regex_t pattern;
-	const char *contents;
-
-	if (argc>1
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && (contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), argv[0]->value.string))
-	    && camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, fms->ex) == 0) {
-		r->value.bool = regexec(&pattern, contents, 0, NULL, 0) == 0;
-		regfree(&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static gchar *
-get_full_header (CamelMimeMessage *message)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART (message);
-	GString *str = g_string_new ("");
-	char   *ret;
-	struct _header_raw *h;
-	
-	for (h = mp->headers; h; h = h->next) {
-		if (h->value != NULL) {
-			g_string_append(str, h->name);
-			if (isspace(h->value[0]))
-				g_string_append(str, ":");
-			else
-				g_string_append(str, ": ");
-			g_string_append(str, h->value);
-		}
-	}
-	
-	ret = str->str;
-	g_string_free (str, FALSE);
-	
-	return ret;
-}
-
-static ESExpResult *
-header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	regex_t pattern;
-	char *contents;
-
-	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, fms->ex) == 0) {
-		contents = get_full_header (fms->message);
-		r->value.bool = regexec(&pattern, contents, 0, NULL, 0) == 0;
-		g_free(contents);
-		regfree(&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms)
-{
-	/* match-all: when dealing with single messages is a no-op */
-	ESExpResult *r;
-	
-	if (argc > 0)
-		return e_sexp_term_eval(f, argv[0]);
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	regex_t pattern;
-
-	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, fms->ex) == 0) {
-		r->value.bool = camel_search_message_body_contains((CamelDataWrapper *)fms->message, &pattern);
-		regfree(&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	regex_t pattern;
-
-	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_REGEX, argc, argv, fms->ex) == 0) {
-		r->value.bool = camel_search_message_body_contains((CamelDataWrapper *)fms->message, &pattern);
-		regfree(&pattern);
-	} else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	int i;
-	
-	/* performs an OR of all words */
-	for (i = 0; i < argc && !truth; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING
-		    && camel_flag_get (&fms->info->user_flags, argv[i]->value.string)) {
-			truth = TRUE;
-			break;
-		}
-	}
-	
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	
-	if (argc == 1)
-		truth = camel_system_flag_get (fms->info->flags, argv[0]->value.string);
-	
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, argv[0]->value.string);
-	
-	r = e_sexp_result_new(f, ESEXP_RES_STRING);
-	r->value.string = g_strdup (tag ? tag : "");
-	
-	return r;
-}
-
-static ESExpResult *
-get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date(fms->message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date_received(fms->message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, "score");
-	
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	if (tag)
-		r->value.number = atoi (tag);
-	else
-		r->value.number = 0;
-	
-	return r;
-}
-
-static ESExpResult *
-get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(f, ESEXP_RES_STRING);
-	r->value.string = g_strdup (fms->source);
-	
-	return r;
-}
-
-gboolean camel_filter_search_match(CamelMimeMessage *message, CamelMessageInfo *info,
-				   const char *source, const char *expression, CamelException *ex)
-{
-	FilterMessageSearch fms;
-	ESExp *sexp;
-	ESExpResult *result;
-	gboolean retval;
-	int i;
-	
-	fms.message = message;
-	fms.info = info;
-	fms.source = source;
-	fms.ex = ex;
-	
-	sexp = e_sexp_new ();
-	
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1)
-			e_sexp_add_ifunction (sexp, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &fms);
-		else
-			e_sexp_add_function (sexp, 0, symbols[i].name, symbols[i].func, &fms);
-	}
-	
-	e_sexp_input_text (sexp, expression, strlen (expression));
-	if (e_sexp_parse (sexp) == -1) {
-		if (!camel_exception_is_set(ex))
-			camel_exception_setv(ex, 1, _("Error executing filter search: %s: %s"), e_sexp_error(sexp), expression);
-		goto error;
-	}
-	result = e_sexp_eval (sexp);
-	if (result == NULL) {
-		if (!camel_exception_is_set(ex))
-		camel_exception_setv(ex, 1, _("Error executing filter search: %s: %s"), e_sexp_error(sexp), expression);
-		goto error;
-	}
-
-	if (result->type == ESEXP_RES_BOOL)
-		retval = result->value.bool;
-	else
-		retval = FALSE;
-	
-	e_sexp_result_free (sexp, result);
-	e_sexp_unref(sexp);
-	
-	return retval;
-
-error:
-	e_sexp_unref(sexp);
-	return FALSE;
-}
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
deleted file mode 100644
index 0dba92eb2d..0000000000
--- a/camel/camel-filter-search.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *  Copyright 2001 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 CAMEL_FILTER_SEARCH_H
-#define CAMEL_FILTER_SEARCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder-summary.h>
-
-gboolean camel_filter_search_match(CamelMimeMessage *message, CamelMessageInfo *info,
-				   const char *source, const char *expression, CamelException *ex); 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! CAMEL_FILTER_SEARCH_H */
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
deleted file mode 100644
index aec5627875..0000000000
--- a/camel/camel-folder-search.c
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
- *  Copyright (C) 2000,2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-/* This is a helper class for folders to implement the search function.
-   It implements enough to do basic searches on folders that can provide
-   an in-memory summary and a body index. */
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <glib.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include "camel-folder-search.h"
-#include "string-utils.h"
-
-#include "camel-exception.h"
-#include "camel-medium.h"
-#include "camel-multipart.h"
-#include "camel-mime-message.h"
-#include "camel-stream-mem.h"
-#include "e-util/e-memory.h"
-#include "camel-search-private.h"
-
-#define d(x) 
-#define r(x) 
-
-struct _CamelFolderSearchPrivate {
-	GHashTable *mempool_hash;
-	CamelException *ex;
-};
-
-#define _PRIVATE(o) (((CamelFolderSearch *)(o))->priv)
-
-static ESExpResult *search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_starts_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_ends_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_header_exists(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search);
-static ESExpResult *search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_system_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-static ESExpResult *search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-
-static void camel_folder_search_class_init (CamelFolderSearchClass *klass);
-static void camel_folder_search_init       (CamelFolderSearch *obj);
-static void camel_folder_search_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_folder_search_parent;
-
-static void
-camel_folder_search_class_init (CamelFolderSearchClass *klass)
-{
-	camel_folder_search_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->match_all = search_match_all;
-	klass->body_contains = search_body_contains;
-	klass->header_contains = search_header_contains;
-	klass->header_matches = search_header_matches;
-	klass->header_starts_with = search_header_starts_with;
-	klass->header_ends_with = search_header_ends_with;
-	klass->header_exists = search_header_exists;
-	klass->user_tag = search_user_tag;
-	klass->user_flag = search_user_flag;
-	klass->system_flag = search_system_flag;
-	klass->get_sent_date = search_get_sent_date;
-	klass->get_received_date = search_get_received_date;
-	klass->get_current_date = search_get_current_date;
-}
-
-static void
-camel_folder_search_init (CamelFolderSearch *obj)
-{
-	struct _CamelFolderSearchPrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	obj->sexp = e_sexp_new();
-
-	/* use a hash of mempools to associate the returned uid lists with
-	   the backing mempool.  yes pretty weird, but i didn't want to change
-	   the api just yet */
-
-	p->mempool_hash = g_hash_table_new(0, 0);
-}
-
-static void
-free_mempool(void *key, void *value, void *data)
-{
-	GPtrArray *uids = key;
-	EMemPool *pool = value;
-
-	g_warning("Search closed with outstanding result unfreed: %p", uids);
-
-	g_ptr_array_free(uids, TRUE);
-	e_mempool_destroy(pool);
-}
-
-static void
-camel_folder_search_finalize (CamelObject *obj)
-{
-	CamelFolderSearch *search = (CamelFolderSearch *)obj;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(obj);
-
-	if (search->sexp)
-		e_sexp_unref(search->sexp);
-
-	g_free(search->last_search);
-	g_hash_table_foreach(p->mempool_hash, free_mempool, obj);
-	g_hash_table_destroy(p->mempool_hash);
-	g_free(p);
-}
-
-CamelType
-camel_folder_search_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelFolderSearch",
-					    sizeof (CamelFolderSearch),
-					    sizeof (CamelFolderSearchClass),
-					    (CamelObjectClassInitFunc) camel_folder_search_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_folder_search_init,
-					    (CamelObjectFinalizeFunc) camel_folder_search_finalize);
-	}
-	
-	return type;
-}
-
-#ifdef offsetof
-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))
-#else
-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &((type *) 0)->field))
-#endif
-
-struct {
-	char *name;
-	int offset;
-	int flags;		/* 0x02 = immediate, 0x01 = always enter */
-} builtins[] = {
-	/* these have default implementations in e-sexp */
-	{ "and", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },
-	{ "or", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },
-	{ "not", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, not), 2 },
-	{ "<", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },
-	{ ">", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },
-	{ "=", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, eq), 2 },
-
-	/* these we have to use our own default if there is none */
-	/* they should all be defined in the language? so it poarses, or should they not?? */
-	{ "match-all", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, match_all), 3 },
-	{ "body-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, body_contains), 1 },
-	{ "header-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_contains), 1 },
-	{ "header-matches", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_matches), 1 },
-	{ "header-starts-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_starts_with), 1 },
-	{ "header-ends-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_ends_with), 1 },
-	{ "header-exists", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_exists), 1 },
-	{ "user-tag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_tag), 1 },
-	{ "user-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 1 },
-	{ "system-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, system_flag), 1 },
-	{ "get-sent-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_sent_date), 1 },
-	{ "get-received-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_received_date), 1 },
-	{ "get-current-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_current_date), 1 },
-};
-
-void
-camel_folder_search_construct (CamelFolderSearch *search)
-{
-	int i;
-	CamelFolderSearchClass *klass = (CamelFolderSearchClass *)CAMEL_OBJECT_GET_CLASS(search);
-
-	for (i=0;i<sizeof(builtins)/sizeof(builtins[0]);i++) {
-		void *func;
-		/* c is sure messy sometimes */
-		func = *((void **)(((char *)klass)+builtins[i].offset));
-		if (func == NULL && builtins[i].flags&1) {
-			g_warning("Search class doesn't implement '%s' method: %s", builtins[i].name, camel_type_to_name(CAMEL_OBJECT_GET_CLASS(search)->s.type));
-			func = (void *)search_dummy;
-		}
-		if (func != NULL) {
-			if (builtins[i].flags&2) {
-				e_sexp_add_ifunction(search->sexp, 0, builtins[i].name, (ESExpIFunc *)func, search);
-			} else {
-				e_sexp_add_function(search->sexp, 0, builtins[i].name, (ESExpFunc *)func, search);
-			}
-		}
-	}
-}
-
-/**
- * camel_folder_search_new:
- *
- * Create a new CamelFolderSearch object.
- * 
- * A CamelFolderSearch is a subclassable, extensible s-exp
- * evaluator which enforces a particular set of s-expressions.
- * Particular methods may be overriden by an implementation to
- * implement a search for any sort of backend.
- *
- * Return value: A new CamelFolderSearch widget.
- **/
-CamelFolderSearch *
-camel_folder_search_new (void)
-{
-	CamelFolderSearch *new = CAMEL_FOLDER_SEARCH ( camel_object_new (camel_folder_search_get_type ()));
-
-	camel_folder_search_construct(new);
-	return new;
-}
-
-/**
- * camel_folder_search_set_folder:
- * @search:
- * @folder: A folder.
- * 
- * Set the folder attribute of the search.  This is currently unused, but
- * could be used to perform a slow-search when indexes and so forth are not
- * available.  Or for use by subclasses.
- **/
-void
-camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder)
-{
-	search->folder = folder;
-}
-
-/**
- * camel_folder_search_set_summary:
- * @search: 
- * @summary: An array of CamelMessageInfo pointers.
- * 
- * Set the array of summary objects representing the span of the search.
- *
- * If this is not set, then a subclass must provide the functions
- * for searching headers and for the match-all operator.
- **/
-void
-camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary)
-{
-	search->summary = summary;
-}
-
-/**
- * camel_folder_search_set_body_index:
- * @search: 
- * @index: 
- * 
- * Set the index (ibex) representing the contents of all messages
- * in this folder.  If this is not set, then the folder implementation
- * should sub-class the CamelFolderSearch and provide its own
- * body-contains function.
- **/
-void
-camel_folder_search_set_body_index(CamelFolderSearch *search, ibex *index)
-{
-	search->body_index = index;
-}
-
-/**
- * camel_folder_search_execute_expression:
- * @search: 
- * @expr: 
- * @ex: 
- * 
- * Execute the search expression @expr, returning an array of
- * all matches as a GPtrArray of uid's of matching messages.
- *
- * Note that any settings such as set_body_index(), set_folder(),
- * and so on are reset to #NULL once the search has completed.
- *
- * TODO: The interface should probably return summary items instead
- * (since they are much more useful to any client).
- * 
- * Return value: A GPtrArray of strings of all matching messages.
- * This must only be freed by camel_folder_search_free_result.
- **/
-GPtrArray *
-camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex)
-{
-	ESExpResult *r;
-	GPtrArray *matches;
-	int i;
-	GHashTable *results;
-	EMemPool *pool;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
-
-	p->ex = ex;
-
-	/* only re-parse if the search has changed */
-	if (search->last_search == NULL
-	    || strcmp(search->last_search, expr)) {
-		e_sexp_input_text(search->sexp, expr, strlen(expr));
-		if (e_sexp_parse(search->sexp) == -1) {
-			camel_exception_setv(ex, 1, _("Cannot parse search expression: %s:\n%s"), e_sexp_error(search->sexp), expr);
-			return NULL;
-		}
-
-		g_free(search->last_search);
-		search->last_search = g_strdup(expr);
-	}
-	r = e_sexp_eval(search->sexp);
-	if (r == NULL) {
-		if (!camel_exception_is_set(ex))
-			camel_exception_setv(ex, 1, _("Error executing search expression: %s:\n%s"), e_sexp_error(search->sexp), expr);
-		return NULL;
-	}
-
-	matches = g_ptr_array_new();
-
-	/* now create a folder summary to return?? */
-	if (r
-	    && r->type == ESEXP_RES_ARRAY_PTR) {
-		d(printf("got result ...\n"));
-		/* we use a mempool to store the strings, packed in tight as possible, and freed together */
-		/* because the strings are often short (like <8 bytes long), we would be wasting appx 50%
-		   of memory just storing the size tag that malloc assigns us and alignment padding, so this
-		   gets around that (and is faster to allocate and free as a bonus) */
-		pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-		if (search->summary) {
-			/* reorder result in summary order */
-			results = g_hash_table_new(g_str_hash, g_str_equal);
-			for (i=0;i<r->value.ptrarray->len;i++) {
-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-				g_hash_table_insert(results, g_ptr_array_index(r->value.ptrarray, i), (void *)1);
-			}
-			for (i=0;i<search->summary->len;i++) {
-				CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-				char *uid = (char *)camel_message_info_uid(info);
-				if (g_hash_table_lookup(results, uid)) {
-					g_ptr_array_add(matches, e_mempool_strdup(pool, uid));
-				}
-			}
-			g_hash_table_destroy(results);
-		} else {
-			for (i=0;i<r->value.ptrarray->len;i++) {
-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-				g_ptr_array_add(matches, e_mempool_strdup(pool, g_ptr_array_index(r->value.ptrarray, i)));
-			}
-		}
-		e_sexp_result_free(search->sexp, r);
-		/* instead of putting the mempool_hash in the structure, we keep the api clean by
-		   putting a reference to it in a hashtable.  Lets us do some debugging and catch
-		   unfree'd results as well. */
-		g_hash_table_insert(p->mempool_hash, matches, pool);
-	} else {
-		printf("no result!\n");
-	}
-
-	search->folder = NULL;
-	search->summary = NULL;
-	search->current = NULL;
-	search->body_index = NULL;
-
-	return matches;
-}
-
-/**
- * camel_folder_search_match_expression:
- * @search: 
- * @expr: 
- * @info: 
- * @ex: 
- * 
- * Returns #TRUE if the expression matches the specific message info @info.
- * Note that the folder and index may need to be set for body searches to
- * operate as well.
- * 
- * Return value: 
- **/
-gboolean
-camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr, const CamelMessageInfo *info, CamelException *ex)
-{
-	GPtrArray *uids;
-	int ret = FALSE;
-
-	search->match1 = (CamelMessageInfo *)info;
-
-	uids = camel_folder_search_execute_expression(search, expr, ex);
-	if (uids) {
-		if (uids->len == 1)
-			ret = TRUE;
-		camel_folder_search_free_result(search, uids);
-	}
-	search->match1 = NULL;
-
-	return ret;
-}
-
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *result)
-{
-	int i;
-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
-	EMemPool *pool;
-
-	pool = g_hash_table_lookup(p->mempool_hash, result);
-	if (pool) {
-		e_mempool_destroy(pool);
-		g_hash_table_remove(p->mempool_hash, result);
-	} else {
-		for (i=0;i<result->len;i++)
-			g_free(g_ptr_array_index(result, i));
-	}
-	g_ptr_array_free(result, TRUE);
-}
-
-
-
-
-/* dummy function, returns false always, or an empty match array */
-static ESExpResult *
-search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-
-	if (search->current == NULL) {
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search)
-{
-	int i;
-	ESExpResult *r, *r1;
-
-	if (argc>1) {
-		g_warning("match-all only takes a single argument, other arguments ignored");
-	}
-	r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-	r->value.ptrarray = g_ptr_array_new();
-
-	/* we are only matching a single message? */
-	if (search->match1) {
-		search->current = search->match1;
-
-		d(printf("matching against 1 message: %s\n", camel_message_info_subject(search->current)));
-
-		if (argc>0) {
-			r1 = e_sexp_term_eval(f, argv[0]);
-			if (r1->type == ESEXP_RES_BOOL) {
-				if (r1->value.bool)
-					g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-			} else {
-				g_warning("invalid syntax, matches require a single bool result");
-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));
-			}
-			e_sexp_result_free(f, r1);
-		} else {
-			g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-		}
-		search->current = NULL;
-
-		return r;
-	}
-
-	if (search->summary == NULL) {
-		/* TODO: make it work - e.g. use the folder and so forth for a slower search */
-		g_warning("No summary supplied, match-all doesn't work with no summary");
-		g_assert(0);
-		return r;
-	}
-
-	/* TODO: Could make this a bit faster in the uncommon case (of match-everything) */
-	for (i=0;i<search->summary->len;i++) {
-		search->current = g_ptr_array_index(search->summary, i);
-		if (argc>0) {
-			r1 = e_sexp_term_eval(f, argv[0]);
-			if (r1->type == ESEXP_RES_BOOL) {
-				if (r1->value.bool)
-					g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-			} else {
-				g_warning("invalid syntax, matches require a single bool result");
-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));
-			}
-			e_sexp_result_free(f, r1);
-		} else {
-			g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(search->current));
-		}
-	}
-	search->current = NULL;
-
-	return r;
-}
-
-static ESExpResult *
-check_header(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search, camel_search_match_t how)
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	r(printf("executing check-header %d\n", how));
-
-	/* are we inside a match-all? */
-	if (search->current && argc>1
-	    && argv[0]->type == ESEXP_RES_STRING) {
-		char *headername;
-		const char *header = NULL;
-		char strbuf[32];
-		int i;
-
-		/* only a subset of headers are supported .. */
-		headername = argv[0]->value.string;
-		if (!strcasecmp(headername, "subject")) {
-			header = camel_message_info_subject(search->current);
-		} else if (!strcasecmp(headername, "date")) {
-			/* FIXME: not a very useful form of the date */
-			sprintf(strbuf, "%d", (int)search->current->date_sent);
-			header = strbuf;
-		} else if (!strcasecmp(headername, "from")) {
-			header = camel_message_info_from(search->current);
-		} else if (!strcasecmp(headername, "to")) {
-			header = camel_message_info_to(search->current);
-		} else if (!strcasecmp(headername, "cc")) {
-			header = camel_message_info_cc(search->current);
-		} else if (!strcasecmp(headername, "x-camel-mlist")) {
-			header = camel_message_info_mlist(search->current);
-		} else {
-			e_sexp_resultv_free(f, argc, argv);
-			e_sexp_fatal_error(f, _("Performing query on unknown header: %s"), headername);
-		}
-
-		if (header) {
-			/* performs an OR of all words */
-			for (i=1;i<argc && !truth;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING
-				    && camel_search_header_match(header, argv[i]->value.string, how)) {
-					truth = TRUE;
-				}
-			}
-		}
-	}
-	/* TODO: else, find all matches */
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_CONTAINS);
-}
-
-static ESExpResult *
-search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_EXACT);
-}
-
-static ESExpResult *
-search_header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_STARTS);
-}
-
-static ESExpResult *
-search_header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_ENDS);
-}
-
-static ESExpResult *
-search_header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	
-	r(printf ("executing header-exists\n"));
-	
-	if (search->current) {
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		if (argc == 1 && argv[0]->type == ESEXP_RES_STRING)
-			r->value.bool = camel_medium_get_header(CAMEL_MEDIUM(search->current), argv[0]->value.string) != NULL;
-		
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-	
-	return r;
-}
-
-/* this is just to OR results together */
-struct _glib_sux_donkeys {
-	int count;
-	GPtrArray *uids;
-};
-
-/* or, store all unique values */
-static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	g_ptr_array_add(fuckup->uids, key);
-}
-
-static int
-match_message(CamelFolder *folder, const char *uid, regex_t *pattern, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	int truth = FALSE;
-
-	msg = camel_folder_get_message(folder, uid, ex);
-	if (!camel_exception_is_set(ex) && msg!=NULL) {
-		truth = camel_search_message_body_contains((CamelDataWrapper *)msg, pattern);
-		camel_object_unref((CamelObject *)msg);
-	}
-	return truth;
-}
-
-static ESExpResult *
-search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i, j;
-	regex_t pattern;
-
-	if (search->current) {
-		int truth = FALSE;
-
-		if (search->body_index) {
-			for (i=0;i<argc && !truth;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING) {
-					truth = ibex_find_name(search->body_index, (char *)camel_message_info_uid(search->current),
-							       argv[i]->value.string);
-				} else {
-					e_sexp_resultv_free(f, argc, argv);
-					e_sexp_fatal_error(f, _("Invalid type in body-contains, expecting string"));
-				}
-			}
-		} else if (search->folder) {
-			/* we do a 'slow' direct search */
-			if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
-				truth = match_message(search->folder, camel_message_info_uid(search->current), &pattern, search->priv->ex);
-				regfree(&pattern);
-			}
-		} else {
-			g_warning("Cannot perform indexed body query with no index or folder set");
-		}
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-
-		if (search->body_index) {
-			if (argc==1) {
-				/* common case */
-				r->value.ptrarray = ibex_find(search->body_index, argv[0]->value.string);
-			} else {
-				GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-				GPtrArray *pa;
-				struct _glib_sux_donkeys lambdafoo;
-
-				/* this sux, perform an or operation on the result(s) of each word */
-				for (i=0;i<argc;i++) {
-					if (argv[i]->type == ESEXP_RES_STRING) {
-						pa = ibex_find(search->body_index, argv[i]->value.string);
-						for (j=0;j<pa->len;j++) {
-							g_hash_table_insert(ht, g_ptr_array_index(pa, j), (void *)1);
-						}
-						g_ptr_array_free(pa, FALSE);
-					} else {
-						e_sexp_result_free(f, r);
-						e_sexp_resultv_free(f, argc, argv);
-						e_sexp_fatal_error(f, _("Invalid type in body-contains, expecting string"));
-					}
-				}
-				lambdafoo.uids = g_ptr_array_new();
-				g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
-				r->value.ptrarray = lambdafoo.uids;
-				g_hash_table_destroy(ht);
-			}
-		} else if (search->folder) {
-			/* do a slow search */
-			r->value.ptrarray = g_ptr_array_new();
-			if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc, argv, search->priv->ex) == 0) {
-				if (search->summary) {
-					for (i=0;i<search->summary->len;i++) {
-						CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-
-						if (match_message(search->folder, camel_message_info_uid(info), &pattern, search->priv->ex))
-							g_ptr_array_add(r->value.ptrarray, (char *)camel_message_info_uid(info));
-					}
-				} /* else?  we could always get the summary from the folder, but then
-				     we need to free it later somehow */
-				regfree(&pattern);
-			}
-		} else {
-			g_warning("Cannot perform indexed body query with no index or folder set");
-			r->value.ptrarray = g_ptr_array_new();
-		}
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i;
-
-	r(printf("executing user-flag\n"));
-
-	/* are we inside a match-all? */
-	if (search->current) {
-		int truth = FALSE;
-		/* performs an OR of all words */
-		for (i=0;i<argc && !truth;i++) {
-			if (argv[i]->type == ESEXP_RES_STRING
-			    && camel_flag_get(&search->current->user_flags, argv[i]->value.string)) {
-				truth = TRUE;
-				break;
-			}
-		}
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	
-	r(printf ("executing system-flag\n"));
-	
-	if (search->current) {
-		gboolean truth = FALSE;
-		
-		if (argc == 1)
-			truth = camel_system_flag_get (search->current->flags, argv[0]->value.string);
-		
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-	}
-	
-	return r;
-}
-
-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-
-	r(printf("executing user-tag\n"));
-
-	/* are we inside a match-all? */
-	if (search->current) {
-		const char *value = NULL;
-		if (argc == 1) {
-			value = camel_tag_get(&search->current->user_tags, argv[0]->value.string);
-		}
-		r = e_sexp_result_new(f, ESEXP_RES_STRING);
-		r->value.string = g_strdup(value?value:"");
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-sent-date\n"));
-
-	/* are we inside a match-all? */
-	if (s->current) {
-		r = e_sexp_result_new(f, ESEXP_RES_INT);
-
-		r->value.number = s->current->date_sent;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-received-date\n"));
-
-	/* are we inside a match-all? */
-	if (s->current) {
-		r = e_sexp_result_new(f, ESEXP_RES_INT);
-
-		r->value.number = s->current->date_received;
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-current-date\n"));
-
-	r = e_sexp_result_new(f, ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	return r;
-}
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
deleted file mode 100644
index e085ddf188..0000000000
--- a/camel/camel-folder-search.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_FOLDER_SEARCH_H
-#define _CAMEL_FOLDER_SEARCH_H
-
-#include <camel/camel-object.h>
-#include <e-util/e-sexp.h>
-#include <gal/util/e-util.h>
-#include <libibex/ibex.h>
-#include <camel/camel-folder.h>
-
-#define CAMEL_FOLDER_SEARCH_TYPE         (camel_folder_search_get_type ())
-#define CAMEL_FOLDER_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)
-#define CAMEL_FOLDER_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass)
-#define CAMEL_IS_FOLDER_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_search_get_type ())
-
-typedef struct _CamelFolderSearchClass CamelFolderSearchClass;
-
-struct _CamelFolderSearch {
-	CamelObject parent;
-
-	struct _CamelFolderSearchPrivate *priv;
-
-	ESExp *sexp;		/* s-exp evaluator */
-	char *last_search;	/* last searched expression */
-
-	/* these are only valid during the search, and are reset afterwards */
-	CamelFolder *folder;	/* folder for current search */
-	GPtrArray *summary;	/* summary array for current search */
-	CamelMessageInfo *current; /* current message info, when searching one by one */
-	CamelMessageInfo *match1; /* message info, when searching a single message only */
-	CamelMimeMessage *current_message; /* cache of current message, if required */
-	ibex *body_index;
-};
-
-struct _CamelFolderSearchClass {
-	CamelObjectClass parent_class;
-
-	/* general bool/comparison options, usually these wont need to be set, unless it is compiling into another language */
-	ESExpResult * (*and)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*or)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*not)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*lt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*gt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*eq)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-
-	/* search options */
-	/* (match-all [boolean expression]) Apply match to all messages */
-	ESExpResult * (*match_all)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-
-	/* (body-contains "string1" "string2" ...) Returns a list of matches, or true if in single-message mode */
-	ESExpResult * (*body_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (header-contains "headername" "string1" ...) List of matches, or true if in single-message mode */
-	ESExpResult * (*header_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-matches "headername" "string") */
-	ESExpResult * (*header_matches)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-starts-with "headername" "string") */
-	ESExpResult * (*header_starts_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-ends-with "headername" "string") */
-	ESExpResult * (*header_ends_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (header-exists "headername") */
-	ESExpResult * (*header_exists)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (user-flag "flagname" "flagname" ...) If one of user-flag set */
-	ESExpResult * (*user_flag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (user-tag "flagname") Returns the value of a user tag.  Can only be used in match-all */
-	ESExpResult * (*user_tag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (system-flag "flagname") Returns the value of a system flag.  Can only be used in match-all */
-	ESExpResult * (*system_flag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-	
-	/* (get-sent-date) Retrieve the date that the message was sent on as a time_t */
-	ESExpResult * (*get_sent_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (get-received-date) Retrieve the date that the message was received on as a time_t */
-	ESExpResult * (*get_received_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (get-current-date) Retrieve 'now' as a time_t */
-	ESExpResult * (*get_current_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (mlist-matches "mlist" ...) True if one of the mailing list matches */
-	ESExpResult * (*mlist_matches)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-};
-
-guint		camel_folder_search_get_type	(void);
-CamelFolderSearch      *camel_folder_search_new	(void);
-void camel_folder_search_construct (CamelFolderSearch *search);
-
-void camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder);
-void camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary);
-void camel_folder_search_set_body_index(CamelFolderSearch *search, ibex *index);
-GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);
-gboolean camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr,
-					      const CamelMessageInfo *info, CamelException *ex);
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
-
-#endif /* ! _CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
deleted file mode 100644
index 4e9e9e9d1b..0000000000
--- a/camel/camel-folder-summary.c
+++ /dev/null
@@ -1,2815 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include <unistd.h>
-#include <netinet/in.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "camel-folder-summary.h"
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-index.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-save.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-mem.h>
-
-#include "hash-table-utils.h"
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
-
-#include "camel-private.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* this lock is ONLY for the standalone messageinfo stuff */
-#define GLOBAL_INFO_LOCK(i) pthread_mutex_lock(&info_lock)
-#define GLOBAL_INFO_UNLOCK(i) pthread_mutex_unlock(&info_lock)
-#else
-#define GLOBAL_INFO_LOCK(i) 
-#define GLOBAL_INFO_UNLOCK(i) 
-#endif
-
-/* this should probably be conditional on it existing */
-#define USE_BSEARCH
-
-#define d(x)
-#define io(x)			/* io debug */
-
-#if 0
-extern int strdup_count, malloc_count, free_count;
-#endif
-
-#define CAMEL_FOLDER_SUMMARY_VERSION (12)
-
-#define _PRIVATE(o) (((CamelFolderSummary *)(o))->priv)
-
-/* trivial lists, just because ... */
-struct _node {
-	struct _node *next;
-};
-
-static struct _node *my_list_append(struct _node **list, struct _node *n);
-static int my_list_size(struct _node **list);
-
-static int summary_header_load(CamelFolderSummary *, FILE *);
-static int summary_header_save(CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo * message_info_new(CamelFolderSummary *, struct _header_raw *);
-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg);
-static CamelMessageInfo * message_info_load(CamelFolderSummary *, FILE *);
-static int		  message_info_save(CamelFolderSummary *, FILE *, CamelMessageInfo *);
-static void		  message_info_free(CamelFolderSummary *, CamelMessageInfo *);
-
-static CamelMessageContentInfo * content_info_new(CamelFolderSummary *, struct _header_raw *);
-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummary *s, CamelMimePart *mp);
-static CamelMessageContentInfo * content_info_load(CamelFolderSummary *, FILE *);
-static int		         content_info_save(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-static void		         content_info_free(CamelFolderSummary *, CamelMessageContentInfo *);
-
-static char *next_uid_string(CamelFolderSummary *s);
-
-static CamelMessageContentInfo * summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp);
-static CamelMessageContentInfo * summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object);
-
-static void camel_folder_summary_class_init (CamelFolderSummaryClass *klass);
-static void camel_folder_summary_init       (CamelFolderSummary *obj);
-static void camel_folder_summary_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_folder_summary_parent;
-
-static void
-camel_folder_summary_class_init (CamelFolderSummaryClass *klass)
-{
-	camel_folder_summary_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->summary_header_load = summary_header_load;
-	klass->summary_header_save = summary_header_save;
-
-	klass->message_info_new  = message_info_new;
-	klass->message_info_new_from_parser = message_info_new_from_parser;
-	klass->message_info_new_from_message = message_info_new_from_message;
-	klass->message_info_load = message_info_load;
-	klass->message_info_save = message_info_save;
-	klass->message_info_free = message_info_free;
-
-	klass->content_info_new  = content_info_new;
-	klass->content_info_new_from_parser = content_info_new_from_parser;
-	klass->content_info_new_from_message = content_info_new_from_message;
-	klass->content_info_load = content_info_load;
-	klass->content_info_save = content_info_save;
-	klass->content_info_free = content_info_free;
-
-	klass->next_uid_string = next_uid_string;
-}
-
-static void
-camel_folder_summary_init (CamelFolderSummary *s)
-{
-	struct _CamelFolderSummaryPrivate *p;
-
-	p = _PRIVATE(s) = g_malloc0(sizeof(*p));
-
-	p->filter_charset = g_hash_table_new(g_strcase_hash, g_strcase_equal);
-
-	s->message_info_size = sizeof(CamelMessageInfo);
-	s->content_info_size = sizeof(CamelMessageContentInfo);
-
-	s->message_info_chunks = NULL;
-	s->content_info_chunks = NULL;
-
-#ifdef DOESTRV
-	s->message_info_strings = CAMEL_MESSAGE_INFO_LAST;
-#endif
-
-	s->version = CAMEL_FOLDER_SUMMARY_VERSION;
-	s->flags = 0;
-	s->time = 0;
-	s->nextuid = 1;
-
-	s->messages = g_ptr_array_new();
-	s->messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-
-#ifdef ENABLE_THREADS
-	p->summary_lock = g_mutex_new();
-	p->io_lock = g_mutex_new();
-	p->filter_lock = g_mutex_new();
-	p->alloc_lock = g_mutex_new();
-	p->ref_lock = g_mutex_new();
-#endif
-}
-
-static void free_o_name(void *key, void *value, void *data)
-{
-	camel_object_unref((CamelObject *)value);
-	g_free(key);
-}
-
-static void
-camel_folder_summary_finalize (CamelObject *obj)
-{
-	struct _CamelFolderSummaryPrivate *p;
-	CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj);
-
-	camel_folder_summary_clear(s);
-	g_ptr_array_free(s->messages, TRUE);
-	g_hash_table_destroy(s->messages_uid);
-
-	g_hash_table_foreach(p->filter_charset, free_o_name, 0);
-	g_hash_table_destroy(p->filter_charset);
-
-	g_free(s->summary_path);
-
-	if (s->message_info_chunks)
-		e_memchunk_destroy(s->message_info_chunks);
-	if (s->content_info_chunks)
-		e_memchunk_destroy(s->content_info_chunks);
-
-	if (p->filter_index)
-		camel_object_unref ((CamelObject *)p->filter_index);
-	if (p->filter_64)
-		camel_object_unref ((CamelObject *)p->filter_64);
-	if (p->filter_qp)
-		camel_object_unref ((CamelObject *)p->filter_qp);
-	if (p->filter_save)
-		camel_object_unref ((CamelObject *)p->filter_save);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->summary_lock);
-	g_mutex_free(p->io_lock);
-	g_mutex_free(p->filter_lock);
-	g_mutex_free(p->alloc_lock);
-	g_mutex_free(p->ref_lock);
-#endif
-
-	g_free(p);
-}
-
-CamelType
-camel_folder_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelFolderSummary",
-					    sizeof (CamelFolderSummary),
-					    sizeof (CamelFolderSummaryClass),
-					    (CamelObjectClassInitFunc) camel_folder_summary_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_folder_summary_init,
-					    (CamelObjectFinalizeFunc) camel_folder_summary_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_folder_summary_new:
- *
- * Create a new CamelFolderSummary object.
- * 
- * Return value: A new CamelFolderSummary widget.
- **/
-CamelFolderSummary *
-camel_folder_summary_new (void)
-{
-	CamelFolderSummary *new = CAMEL_FOLDER_SUMMARY ( camel_object_new (camel_folder_summary_get_type ()));	return new;
-}
-
-
-/**
- * camel_folder_summary_set_filename:
- * @s: 
- * @name: 
- * 
- * Set the filename where the summary will be loaded to/saved from.
- **/
-void camel_folder_summary_set_filename(CamelFolderSummary *s, const char *name)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	g_free(s->summary_path);
-	s->summary_path = g_strdup(name);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_set_index:
- * @s: 
- * @index: 
- * 
- * Set the index used to index body content.  If the index is NULL, or
- * not set (the default), no indexing of body content will take place.
- *
- * Unlike earlier behaviour, build_content need not be set to perform indexing.
- **/
-void camel_folder_summary_set_index(CamelFolderSummary *s, ibex *index)
-{
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-
-	p->index = index;
-}
-
-/**
- * camel_folder_summary_set_build_content:
- * @s: 
- * @state: 
- * 
- * Set a flag to tell the summary to build the content info summary
- * (CamelMessageInfo.content).  The default is not to build content info
- * summaries.
- **/
-void camel_folder_summary_set_build_content(CamelFolderSummary *s, gboolean state)
-{
-	s->build_content = state;
-}
-
-/**
- * camel_folder_summary_count:
- * @s: 
- * 
- * Get the number of summary items stored in this summary.
- * 
- * Return value: The number of items int he summary.
- **/
-int
-camel_folder_summary_count(CamelFolderSummary *s)
-{
-	return s->messages->len;
-}
-
-/**
- * camel_folder_summary_index:
- * @s: 
- * @i: 
- * 
- * Retrieve a summary item by index number.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the index @i is out
- * of range.
- * It must be freed using camel_folder_summary_info_free().
- **/
-CamelMessageInfo *
-camel_folder_summary_index(CamelFolderSummary *s, int i)
-{
-	CamelMessageInfo *info = NULL;
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	if (i<s->messages->len)
-		info = g_ptr_array_index(s->messages, i);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_index:
- * @s: 
- * @i: 
- * 
- * Obtain a copy of the summary array.  This is done atomically,
- * so cannot contain empty entries.
- *
- * It must be freed using camel_folder_summary_array_free().
- **/
-GPtrArray *
-camel_folder_summary_array(CamelFolderSummary *s)
-{
-	CamelMessageInfo *info;
-	GPtrArray *res = g_ptr_array_new();
-	int i;
-	
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	g_ptr_array_set_size(res, s->messages->len);
-	for (i=0;i<s->messages->len;i++) {
-		info = res->pdata[i] = g_ptr_array_index(s->messages, i);
-		info->refcount++;
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-
-	return res;
-}
-
-/**
- * camel_folder_summary_array_free:
- * @s: 
- * @array: 
- * 
- * Free the folder summary array.
- **/
-void
-camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array)
-{
-	int i;
-
-	for (i=0;i<array->len;i++)
-		camel_folder_summary_info_free(s, array->pdata[i]);
-
-	g_ptr_array_free(array, TRUE);
-}
-
-/**
- * camel_folder_summary_uid:
- * @s: 
- * @uid: 
- * 
- * Retrieve a summary item by uid.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- * 
- * Return value: The summary item, or NULL if the uid @uid
- * is not available.
- * It must be freed using camel_folder_summary_info_free().
- **/
-CamelMessageInfo *
-camel_folder_summary_uid(CamelFolderSummary *s, const char *uid)
-{
-	CamelMessageInfo *info;
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	info = g_hash_table_lookup(s->messages_uid, uid);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	if (info)
-		info->refcount++;
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_next_uid:
- * @s: 
- * 
- * Generate a new unique uid value as an integer.  This
- * may be used to create a unique sequence of numbers.
- * 
- * Return value: The next unique uid value.
- **/
-guint32 camel_folder_summary_next_uid(CamelFolderSummary *s)
-{
-	guint32 uid;
-
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	uid = s->nextuid++;
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	/* FIXME: sync this to disk */
-/*	summary_header_save(s);*/
-	return uid;
-}
-
-/**
- * camel_folder_summary_set_uid:
- * @s: 
- * @uid: The next minimum uid to assign.  To avoid clashing
- * uid's, set this to the uid of a given messages + 1.
- * 
- * Set the next minimum uid available.  This can be used to
- * ensure new uid's do not clash with existing uid's.
- **/
-void camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)
-{
-	/* TODO: sync to disk? */
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	s->nextuid = MAX(s->nextuid, uid);
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_next_uid_string:
- * @s: 
- * 
- * Retrieve the next uid, but as a formatted string.
- * 
- * Return value: The next uid as an unsigned integer string.
- * This string must be freed by the caller.
- **/
-char *
-camel_folder_summary_next_uid_string(CamelFolderSummary *s)
-{
-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->next_uid_string(s);
-}
-
-/* loads the content descriptions, recursively */
-static CamelMessageContentInfo *
-perform_content_info_load(CamelFolderSummary *s, FILE *in)
-{
-	int i;
-	guint32 count;
-	CamelMessageContentInfo *ci, *part;
-
-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_load(s, in);
-	if (ci == NULL)
-		return NULL;
-
-	if (camel_folder_summary_decode_uint32(in, &count) == -1 || count > 500) {
-		camel_folder_summary_content_info_free(s, ci);
-		return NULL;
-	}
-
-	for (i=0;i<count;i++) {
-		part = perform_content_info_load(s, in);
-		if (part) {
-			my_list_append((struct _node **)&ci->childs, (struct _node *)part);
-			part->parent = ci;
-		} else {
-			g_warning("Summary file format messed up?");
-			camel_folder_summary_content_info_free(s, ci);
-			return NULL;
-		}
-	}
-	return ci;
-}
-
-int
-camel_folder_summary_load(CamelFolderSummary *s)
-{
-	FILE *in;
-	int i;
-	CamelMessageInfo *mi;
-
-	g_assert(s->summary_path);
-
-	in = fopen(s->summary_path, "r");
-	if (in == NULL)
-		return -1;
-
-	CAMEL_SUMMARY_LOCK(s, io_lock);
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in) == -1)
-		goto error;
-
-	/* now read in each message ... */
-	for (i=0;i<s->saved_count;i++) {
-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in);
-
-		if (mi == NULL)
-			goto error;
-
-		if (s->build_content) {
-			mi->content = perform_content_info_load(s, in);
-			if (mi->content == NULL) {
-				camel_folder_summary_info_free(s, mi);
-				goto error;
-			}
-		}
-
-		camel_folder_summary_add(s, mi);
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-	
-	if (fclose(in) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-
-	return 0;
-
-error:
-	g_warning("Cannot load summary file: %s", strerror(ferror(in)));
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-	fclose(in);
-	s->flags |= ~CAMEL_SUMMARY_DIRTY;
-
-	return -1;
-}
-
-/* saves the content descriptions, recursively */
-static int
-perform_content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)
-{
-	CamelMessageContentInfo *part;
-
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_save(s, out, ci);
-	camel_folder_summary_encode_uint32(out, my_list_size((struct _node **)&ci->childs));
-	part = ci->childs;
-	while (part) {
-		perform_content_info_save(s, out, part);
-		part = part->next;
-	}
-	return 0;
-}
-
-/**
- * camel_folder_summary_save:
- * @s: 
- * 
- * Writes the summary to disk.  The summary is only written if changes
- * have occured.
- * 
- * Return value: Returns -1 on error.
- **/
-int
-camel_folder_summary_save(CamelFolderSummary *s)
-{
-	FILE *out;
-	int fd;
-	int i;
-	guint32 count;
-	CamelMessageInfo *mi;
-
-	g_assert(s->summary_path);
-
-	if ((s->flags & CAMEL_SUMMARY_DIRTY) == 0)
-		return 0;
-
-	fd = open(s->summary_path, O_RDWR|O_CREAT, 0600);
-	if (fd == -1)
-		return -1;
-	out = fdopen(fd, "w");
-	if ( out == NULL ) {
-		close(fd);
-		return -1;
-	}
-
-	io(printf("saving header\n"));
-
-	CAMEL_SUMMARY_LOCK(s, io_lock);
-
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_save(s, out) == -1) {
-		fclose(out);
-		CAMEL_SUMMARY_UNLOCK(s, io_lock);
-		return -1;
-	}
-
-	/* now write out each message ... */
-	/* FIXME: check returns */
-
-	count = s->messages->len;
-	for (i=0;i<count;i++) {
-		mi = s->messages->pdata[i];
-		((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_save(s, out, mi);
-
-		if (s->build_content) {
-			perform_content_info_save(s, out, mi->content);
-		}
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, io_lock);
-
-	if (fclose(out) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-	return 0;
-}
-
-static void
-summary_assign_uid(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	const char *uid;
-
-	uid = camel_message_info_uid(info);
-	if (uid == NULL || uid[0] == 0) {
-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));
-		uid = camel_message_info_uid(info);
-	}
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-	while (g_hash_table_lookup(s->messages_uid, uid)) {
-		g_warning("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid(info));
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));
-		uid = camel_message_info_uid(info);
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		CAMEL_SUMMARY_LOCK(s, summary_lock);
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_add:
- * @s: 
- * @info: 
- * 
- * Adds a new @info record to the summary.  If @info->uid is NULL, then a new
- * uid is automatically re-assigned by calling :next_uid_string().
- *
- * The @info record should have been generated by calling one of the
- * info_new_*() functions, as it will be free'd based on the summary
- * class.  And MUST NOT be allocated directly using malloc.
- **/
-void camel_folder_summary_add(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	if (info == NULL)
-		return;
-
-	summary_assign_uid(s, info);
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-
-#ifdef DOESTRV
-	/* this is vitally important, and also if this is ever modified, then
-	   the hash table needs to be resynced */
-	info->strings = e_strv_pack(info->strings);
-#endif
-
-	g_ptr_array_add(s->messages, info);
-	g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_add_from_header:
- * @s: 
- * @h: 
- * 
- * Build a new info record based on a set of headers, and add it to the
- * summary.
- *
- * Note that this function should not be used if build_content_info has
- * been specified for this summary.
- * 
- * Return value: The newly added record.
- **/
-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_header(s, h);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_add_from_parser:
- * @s: 
- * @mp: 
- * 
- * Build a new info record based on the current position of a CamelMimeParser.
- *
- * The parser should be positioned before the start of the message to summarise.
- * This function may be used if build_contnet_info or an index has been
- * specified for the summary.
- * 
- * Return value: The newly added record.
- **/
-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_parser(s, mp);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_add_from_message:
- * @s: 
- * @msg: 
- * 
- * Add a summary item from an existing message.
- * 
- * Return value: 
- **/
-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *info = camel_folder_summary_info_new_from_message(s, msg);
-
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-/**
- * camel_folder_summary_info_new_from_header:
- * @s: 
- * @h: 
- * 
- * Create a new info record from a header.
- * 
- * Return value: Guess?  This info record MUST be freed using
- * camel_folder_summary_info_free(), camel_message_info_free() will not work.
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *s, struct _header_raw *h)
-{
-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -> message_info_new(s, h);
-}
-
-/**
- * camel_folder_summary_info_new_from_parser:
- * @s: 
- * @mp: 
- * 
- * Create a new info record from a parser.  If the parser cannot
- * determine a uid, then a new one is automatically assigned.
- *
- * If indexing is enabled, then the content will be indexed based
- * on this new uid.  In this case, the message info MUST be
- * added using :add().
- *
- * Once complete, the parser will be positioned at the end of
- * the message.
- *
- * Return value: Guess?  This info record MUST be freed using
- * camel_folder_summary_info_free(), camel_message_info_free() will not work.
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *info = NULL;
-	char *buffer;
-	int len;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	off_t start;
-
-	/* should this check the parser is in the right state, or assume it is?? */
-
-	start = camel_mime_parser_tell(mp);
-	if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_EOF) {
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_parser(s, mp);
-
-		camel_mime_parser_unstep(mp);
-
-		/* assign a unique uid, this is slightly 'wrong' as we do not really
-		 * know if we are going to store this in the summary, but no matter */
-		summary_assign_uid(s, info);
-
-		CAMEL_SUMMARY_LOCK(s, filter_lock);
-
-		if (p->index) {
-			if (p->filter_index == NULL)
-				p->filter_index = camel_mime_filter_index_new_ibex(p->index);
-			camel_mime_filter_index_set_name(p->filter_index, (char *)camel_message_info_uid(info));
-			ibex_unindex(p->index, (char *)camel_message_info_uid(info));
-		}
-
-		/* always scan the content info, even if we dont save it */
-		info->content = summary_build_content_info(s, info, mp);
-
-		CAMEL_SUMMARY_UNLOCK(s, filter_lock);
-
-		info->size = camel_mime_parser_tell(mp) - start;
-	}
-	return info;
-}
-
-/**
- * camel_folder_summary_info_new_from_message:
- * @: 
- * @: 
- * 
- * Create a summary item from a message.
- * 
- * Return value: 
- **/
-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *info;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-
-	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_message(s, msg);
-
-	/* assign a unique uid, this is slightly 'wrong' as we do not really
-	 * know if we are going to store this in the summary, but no matter */
-	summary_assign_uid(s, info);
-
-	if (p->index)
-		ibex_unindex(p->index, (char *)camel_message_info_uid(info));
-
-	info->content = summary_build_content_info_message(s, info, (CamelMimePart *)msg);
-	/* FIXME: calculate the size as part of build_content_info_message */
-	/* info->size = ... */
-
-	return info;
-}
-
-/**
- * camel_folder_summary_content_info_free:
- * @s: 
- * @ci: 
- * 
- * Free the content info @ci, and all associated memory.
- **/
-void
-camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)
-{
-	CamelMessageContentInfo *pw, *pn;
-
-	pw = ci->childs;
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_free(s, ci);
-	while (pw) {
-		pn = pw->next;
-		camel_folder_summary_content_info_free(s, pw);
-		pw = pn;
-	}
-}
-
-/**
- * camel_folder_summary_info_free:
- * @s: 
- * @mi: 
- * 
- * Unref and potentially free the message info @mi, and all associated memory.
- **/
-void camel_folder_summary_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-	CamelMessageContentInfo *ci;
-
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-
-	g_assert(mi->refcount >= 1);
-
-	mi->refcount--;
-	if (mi->refcount > 0) {
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		return;
-	}
-
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-
-	ci = mi->content;
-
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_free(s, mi);		
-	if (s->build_content && ci) {
-		camel_folder_summary_content_info_free(s, ci);
-	}
-}
-
-/**
- * camel_folder_summary_info_ref:
- * @s: 
- * @mi: 
- * 
- * Add an extra reference to @mi.
- **/
-void camel_folder_summary_info_ref(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-	g_assert(mi);
-	g_assert(s);
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	g_assert(mi->refcount >= 1);
-	mi->refcount++;
-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-}
-
-/**
- * camel_folder_summary_touch:
- * @s: 
- * 
- * Mark the summary as changed, so that a save will save it.
- **/
-void
-camel_folder_summary_touch(CamelFolderSummary *s)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_clear:
- * @s: 
- * 
- * Empty the summary contents.
- **/
-void
-camel_folder_summary_clear(CamelFolderSummary *s)
-{
-	int i;
-
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	if (camel_folder_summary_count(s) == 0) {
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		return;
-	}
-
-	for (i=0;i<s->messages->len;i++)
-		camel_folder_summary_info_free(s, s->messages->pdata[i]);
-
-	g_ptr_array_set_size(s->messages, 0);
-	g_hash_table_destroy(s->messages_uid);
-	s->messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-}
-
-/**
- * camel_folder_summary_remove:
- * @s: 
- * @info: 
- * 
- * Remove a specific @info record from the summary.
- **/
-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	g_hash_table_remove(s->messages_uid, camel_message_info_uid(info));
-	g_ptr_array_remove(s->messages, info);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	camel_folder_summary_info_free(s, info);
-}
-
-/**
- * camel_folder_summary_remove_uid:
- * @s: 
- * @uid: 
- * 
- * Remove a specific info record from the summary, by @uid.
- **/
-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid)
-{
-        CamelMessageInfo *oldinfo;
-        char *olduid;
-
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-        if (g_hash_table_lookup_extended(s->messages_uid, uid, (void *)&olduid, (void *)&oldinfo)) {
-		/* make sure it doesn't vanish while we're removing it */
-		oldinfo->refcount++;
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		camel_folder_summary_remove(s, oldinfo);
-		camel_folder_summary_info_free(s, oldinfo);
-        } else {
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-	}
-}
-
-/**
- * camel_folder_summary_remove_index:
- * @s: 
- * @index: 
- * 
- * Remove a specific info record from the summary, by index.
- **/
-void camel_folder_summary_remove_index(CamelFolderSummary *s, int index)
-{
-	CAMEL_SUMMARY_LOCK(s, ref_lock);
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	if (index < s->messages->len) {
-		CamelMessageInfo *info = s->messages->pdata[index];
-		/* make sure it doesn't vanish while we're not looking */
-		info->refcount++;
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-		camel_folder_summary_remove(s, info);
-		camel_folder_summary_info_free(s, info);
-	} else {
-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
-	}
-}
-
-/**
- * camel_folder_summary_encode_uint32:
- * @out: 
- * @value: 
- * 
- * Utility function to save an uint32 to a file.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_uint32(FILE *out, guint32 value)
-{
-	int i;
-
-	io(printf("Encoding int %u\n", value));
-
-	for (i=28;i>0;i-=7) {
-		if (value >= (1<<i)) {
-			unsigned int c = (value>>i) & 0x7f;
-			if (fputc(c, out) == -1)
-				return -1;
-		}
-	}
-	return fputc(value | 0x80, out);
-}
-
-/**
- * camel_folder_summary_decode_uint32:
- * @in: 
- * @dest: 
- * 
- * Retrieve an encoded uint32 from a file.
- * 
- * Return value: -1 on error.  @*dest will contain the
- * decoded value.
- **/
-int
-camel_folder_summary_decode_uint32(FILE *in, guint32 *dest)
-{
-        guint32 value=0, v;
-
-        /* until we get the last byte, keep decoding 7 bits at a time */
-        while ( ((v = fgetc(in)) & 0x80) == 0 && v!=EOF) {
-                value |= v;
-                value <<= 7;
-        }
-	if (v == EOF) {
-		*dest = value>>7;
-		return -1;
-	}
-	*dest = value | (v&0x7f);
-
-	io(printf("Decoding int %u\n", *dest));
-
-        return 0;
-}
-
-/**
- * camel_folder_summary_encode_fixed_int32:
- * @out: 
- * @value: 
- * 
- * Encode a gint32, performing no compression, but converting
- * to network order.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_fixed_int32(FILE *out, gint32 value)
-{
-	guint32 save;
-
-	save = htonl(value);
-	if (fwrite(&save, sizeof(save), 1, out) != 1)
-		return -1;
-	return 0;
-}
-
-/**
- * camel_folder_summary_decode_fixed_int32:
- * @in: 
- * @dest: 
- * 
- * Retrieve a gint32.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_decode_fixed_int32(FILE *in, gint32 *dest)
-{
-	guint32 save;
-
-	if (fread(&save, sizeof(save), 1, in) == 1) {
-		*dest = ntohl(save);
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-/**
- * camel_folder_summary_encode_time_t:
- * @out: 
- * @value: 
- * 
- * Encode a time_t value to the file.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_time_t(FILE *out, time_t value)
-{
-	int i;
-
-	for (i=sizeof(time_t)-1;i>=0;i--) {
-		if (fputc((value >> (i*8)) & 0xff, out) == -1)
-			return -1;
-	}
-	return 0;
-}
-
-/**
- * camel_folder_summary_decode_time_t:
- * @in: 
- * @dest: 
- * 
- * Decode a time_t value.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_decode_time_t(FILE *in, time_t *dest)
-{
-	time_t save = 0;
-	unsigned int v;
-	int i = sizeof(time_t) - 1;
-
-        while ( i>=0 && (v = fgetc(in)) != EOF) {
-		save |= v << (i*8);
-		i--;
-	}
-	*dest = save;
-	if (v == EOF)
-		return -1;
-	return 0;
-}
-
-/**
- * camel_folder_summary_encode_off_t:
- * @out: 
- * @value: 
- * 
- * Encode an off_t type.
- * 
- * Return value: 
- **/
-int
-camel_folder_summary_encode_off_t(FILE *out, off_t value)
-{
-	int i;
-
-	for (i=sizeof(off_t)-1;i>=0;i--) {
-		if (fputc((value >> (i*8)) & 0xff, out) == -1)
-			return -1;
-	}
-	return 0;
-}
-
-/**
- * camel_folder_summary_decode_off_t:
- * @in: 
- * @dest: 
- * 
- * Decode an off_t type.
- * 
- * Return value: 
- **/
-int
-camel_folder_summary_decode_off_t(FILE *in, off_t *dest)
-{
-	off_t save = 0;
-	unsigned int v;
-	int i = sizeof(off_t) - 1;
-
-        while ( i>=0 && (v = fgetc(in)) != EOF) {
-		save |= v << (i*8);
-		i--;
-	}
-	*dest = save;
-	if (v == EOF)
-		return -1;
-	return 0;
-}
-
-/* should be sorted, for binary search */
-/* This is a tokenisation mechanism for strings written to the
-   summary - to save space.
-   This list can have at most 31 words. */
-static char * tokens[] = {
-	"7bit",
-	"8bit",
-	"alternative",
-	"application",
-	"base64",
-	"boundary",
-	"charset",
-	"filename",
-	"html",
-	"image",
-	"iso-8859-1",
-	"iso-8859-8",
-	"message",
-	"mixed",
-	"multipart",
-	"name",
-	"octet-stream",
-	"parallel",
-	"plain",
-	"postscript",
-	"quoted-printable",
-	"related",
-	"rfc822",
-	"text",
-	"us-ascii",		/* 25 words */
-};
-
-#define tokens_len (sizeof(tokens)/sizeof(tokens[0]))
-
-/* baiscally ...
-    0 = null
-    1-tokens_len == tokens[id-1]
-    >=32 string, length = n-32
-*/
-
-#ifdef USE_BSEARCH
-static int
-token_search_cmp(char *key, char **index)
-{
-	d(printf("comparing '%s' to '%s'\n", key, *index));
-	return strcmp(key, *index);
-}
-#endif
-
-/**
- * camel_folder_summary_encode_token:
- * @out: 
- * @str: 
- * 
- * Encode a string value, but use tokenisation and compression
- * to reduce the size taken for common mailer words.  This
- * can still be used to encode normal strings as well.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_token(FILE *out, const char *str)
-{
-	io(printf("Encoding token: '%s'\n", str));
-
-	if (str == NULL) {
-		return camel_folder_summary_encode_uint32(out, 0);
-	} else {
-		int len = strlen(str);
-		int i, token=-1;
-
-		if (len <= 16) {
-			char lower[32];
-			char **match;
-
-			for (i=0;i<len;i++)
-				lower[i] = tolower(str[i]);
-			lower[i] = 0;
-#ifdef USE_BSEARCH
-			match = bsearch(lower, tokens, tokens_len, sizeof(char *), (int (*)(const void *, const void *))token_search_cmp);
-			if (match)
-				token = match-tokens;
-#else
-			for (i=0;i<tokens_len;i++) {
-				if (!strcmp(tokens[i], lower)) {
-					token = i;
-					break;
-				}
-			}
-#endif
-		}
-		if (token != -1) {
-			return camel_folder_summary_encode_uint32(out, token+1);
-		} else {
-			if (camel_folder_summary_encode_uint32(out, len+32) == -1)
-				return -1;
-			if (fwrite(str, len, 1, out) != 1)
-				return -1;
-		}
-	}
-	return 0;
-}
-
-/**
- * camel_folder_summary_decode_token:
- * @in: 
- * @str: 
- * 
- * Decode a token value.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_decode_token(FILE *in, char **str)
-{
-	char *ret;
-	guint32 len;
-
-	io(printf("Decode token ...\n"));
-	
-	if (camel_folder_summary_decode_uint32(in, &len) == -1) {
-		g_warning("Could not decode token from file");
-		*str = NULL;
-		return -1;
-	}
-
-	if (len<32) {
-		if (len <= 0) {
-			ret = NULL;
-		} else if (len<= tokens_len) {
-			ret = g_strdup(tokens[len-1]);
-		} else {
-			g_warning("Invalid token encountered: %d", len);
-			*str = NULL;
-			return -1;
-		}
-	} else if (len > 10240) {
-		g_warning("Got broken string header length: %d bytes", len);
-		*str = NULL;
-		return -1;
-	} else {
-		len -= 32;
-		ret = g_malloc(len+1);
-		if (fread(ret, len, 1, in) != 1) {
-			g_free(ret);
-			*str = NULL;
-			return -1;
-		}
-		ret[len]=0;
-	}
-
-	io(printf("Token = '%s'\n", ret));
-
-	*str = ret;
-	return 0;
-}
-
-/**
- * camel_folder_summary_encode_string:
- * @out: 
- * @str: 
- * 
- * Encode a normal string and save it in the output file.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_encode_string(FILE *out, const char *str)
-{
-	register int len;
-
-	io(printf("Encoding string: '%s'\n", str));
-
-	if (str == NULL)
-		return camel_folder_summary_encode_uint32(out, 0);
-
-	len = strlen(str);
-	if (camel_folder_summary_encode_uint32(out, len+1) == -1)
-		return -1;
-	if (fwrite(str, len, 1, out) == 1)
-		return 0;
-	return -1;
-}
-
-
-/**
- * camel_folder_summary_decode_string:
- * @in: 
- * @str: 
- * 
- * Decode a normal string from the input file.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_folder_summary_decode_string(FILE *in, char **str)
-{
-	guint32 len;
-	register char *ret;
-
-	io(printf("Decode string ...\n", str));
-
-	if (camel_folder_summary_decode_uint32(in, &len) == -1) {
-		*str = NULL;
-		return -1;
-	}
-
-	len--;
-	if (len > 65536) {
-		*str = NULL;
-		io(printf("String = '%s'\n", *str));
-		return -1;
-	}
-
-	ret = g_malloc(len+1);
-	if (fread(ret, len, 1, in) != 1) {
-		g_free(ret);
-		*str = NULL;
-		return -1;
-	}
-
-	io(printf("String = '%s'\n", ret));
-
-	ret[len] = 0;
-	*str = ret;
-	return 0;
-}
-
-static struct _node *
-my_list_append(struct _node **list, struct _node *n)
-{
-	struct _node *ln = (struct _node *)list;
-	while (ln->next)
-		ln = ln->next;
-	n->next = 0;
-	ln->next = n;
-	return n;
-}
-
-static int
-my_list_size(struct _node **list)
-{
-	int len = 0;
-	struct _node *ln = (struct _node *)list;
-	while (ln->next) {
-		ln = ln->next;
-		len++;
-	}
-	return len;
-}
-
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
-{
-	gint32 version, flags, nextuid, count;
-	time_t time;
-
-	fseek(in, 0, SEEK_SET);
-
-	io(printf("Loading header\n"));
-
-	if (camel_folder_summary_decode_fixed_int32(in, &version) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &flags) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &nextuid) == -1
-	    || camel_folder_summary_decode_time_t(in, &time) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &count) == -1) {
-		return -1;
-	}
-
-	s->nextuid = nextuid;
-	s->flags = flags;
-	s->time = time;
-	s->saved_count = count;
-	if (s->version != version) {
-		g_warning("Summary header version mismatch");
-		return -1;
-	}
-	return 0;
-}
-
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
-{
-	fseek(out, 0, SEEK_SET);
-
-	io(printf("Savining header\n"));
-
-	camel_folder_summary_encode_fixed_int32(out, s->version);
-	camel_folder_summary_encode_fixed_int32(out, s->flags);
-	camel_folder_summary_encode_fixed_int32(out, s->nextuid);
-	camel_folder_summary_encode_time_t(out, s->time);
-	return camel_folder_summary_encode_fixed_int32(out, camel_folder_summary_count(s));
-}
-
-/* are these even useful for anything??? */
-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *mi = NULL;
-	int state;
-
-	state = camel_mime_parser_state(mp);
-	switch (state) {
-	case HSCAN_HEADER:
-	case HSCAN_MESSAGE:
-	case HSCAN_MULTIPART:
-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new(s, camel_mime_parser_headers_raw(mp));
-		break;
-	default:
-		g_error("Invalid parser state");
-	}
-
-	return mi;
-}
-
-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageContentInfo *ci = NULL;
-
-	switch (camel_mime_parser_state(mp)) {
-	case HSCAN_HEADER:
-	case HSCAN_MESSAGE:
-	case HSCAN_MULTIPART:
-		ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new(s, camel_mime_parser_headers_raw(mp));
-		if (ci) {
-			ci->type = camel_mime_parser_content_type(mp);
-			header_content_type_ref(ci->type);
-		}
-		break;
-	default:
-		g_error("Invalid parser state");
-	}
-
-	return ci;
-}
-
-static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new(s, ((CamelMimePart *)msg)->headers);
-
-	return mi;
-}
-
-static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummary *s, CamelMimePart *mp)
-{
-	CamelMessageContentInfo *ci;
-
-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new(s, mp->headers);
-
-	return ci;
-}
-
-#ifndef NO_WARNINGS
-#warning "These should be made private again, easy to fix (used in filter-driver)"
-#endif
-char *
-camel_folder_summary_format_address(struct _header_raw *h, const char *name)
-{
-	struct _header_address *addr;
-	const char *text;
-	char *ret;
-
-	text = header_raw_find (&h, name, NULL);
-	addr = header_address_decode (text);
-	if (addr) {
-		ret = header_address_list_format (addr);
-		header_address_list_clear (&addr);
-	} else {
-		ret = g_strdup (text);
-	}
-	
-	return ret;
-}
-
-char *
-camel_folder_summary_format_string(struct _header_raw *h, const char *name)
-{
-	const char *text;
-
-	text = header_raw_find(&h, name, NULL);
-	if (text) {
-		while (isspace(*text))
-			text++;
-		return header_decode_string(text);
-	} else {
-		return NULL;
-	}
-}
-
-/**
- * camel_folder_summary_info_new:
- * @s: 
- * 
- * Allocate a new camel message info, suitable for adding
- * to this summary.
- * 
- * Return value: 
- **/
-CamelMessageInfo *
-camel_folder_summary_info_new(CamelFolderSummary *s)
-{
-	CamelMessageInfo *mi;
-
-	CAMEL_SUMMARY_LOCK(s, alloc_lock);
-	if (s->message_info_chunks == NULL)
-		s->message_info_chunks = e_memchunk_new(32, s->message_info_size);
-	mi = e_memchunk_alloc(s->message_info_chunks);
-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);
-
-	memset(mi, 0, s->message_info_size);
-#ifdef DOESTRV
-	mi->strings = e_strv_new(s->message_info_strings);
-#endif
-	mi->refcount = 1;
-	return mi;
-}
-
-/**
- * camel_folder_summary_content_info_new:
- * @s: 
- * 
- * Allocate a new camel message content info, suitable for adding
- * to this summary.
- * 
- * Return value: 
- **/
-CamelMessageContentInfo *
-camel_folder_summary_content_info_new(CamelFolderSummary *s)
-{
-	CamelMessageContentInfo *ci;
-
-	CAMEL_SUMMARY_LOCK(s, alloc_lock);
-	if (s->content_info_chunks == NULL)
-		s->content_info_chunks = e_memchunk_new(32, s->content_info_size);
-	ci = e_memchunk_alloc(s->content_info_chunks);
-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);
-
-	memset(ci, 0, s->content_info_size);
-	return ci;
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	const char *received;
-	guchar digest[16];
-	struct _header_references *refs, *scan;
-	char *msgid;
-	int count;
-
-	mi = camel_folder_summary_info_new(s);
-
-#ifdef DOESTRV
-	msgid = camel_folder_summary_format_string(h, "subject");
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, msgid);
-	msgid = camel_folder_summary_format_address(h, "from");
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_FROM, msgid);
-	msgid = camel_folder_summary_format_address(h, "to");
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_TO, msgid);
-	msgid = camel_folder_summary_format_address(h, "cc");
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_CC, msgid);
-	msgid = header_raw_check_mailing_list(&h);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_MLIST, msgid);
-#else
-	mi->subject = camel_folder_summary_format_string(h, "subject");
-	mi->from = camel_folder_summary_format_address(h, "from");
-	mi->to = camel_folder_summary_format_address(h, "to");
-	mi->cc = camel_folder_summary_format_address(h, "cc");
-	mi->mlist = header_raw_check_mailing_list(&h);
-#endif
-	mi->user_flags = NULL;
-	mi->user_tags = NULL;
-	mi->date_sent = header_decode_date(header_raw_find(&h, "date", NULL), NULL);
-	received = header_raw_find(&h, "received", NULL);
-	if (received)
-		received = strrchr(received, ';');
-	if (received)
-		mi->date_received = header_decode_date(received + 1, NULL);
-	else
-		mi->date_received = 0;
-
-	msgid = header_msgid_decode(header_raw_find(&h, "message-id", NULL));
-	if (msgid) {
-		md5_get_digest(msgid, strlen(msgid), digest);
-		memcpy(mi->message_id.id.hash, digest, sizeof(mi->message_id.id.hash));
-		g_free(msgid);
-	}
-	/* if we have a references, use that, otherwise, see if we have an in-reply-to
-	   header, with parsable content, otherwise *shrug* */
-	if ((refs = header_references_decode(header_raw_find(&h, "references", NULL))) != NULL
-	    || (refs = header_references_decode(header_raw_find(&h, "in-reply-to", NULL))) != NULL) {
-		count = header_references_list_size(&refs);
-		mi->references = g_malloc(sizeof(*mi->references) + ((count-1) * sizeof(mi->references->references[0])));
-		count = 0;
-		scan = refs;
-		while (scan) {
-			/* FIXME: the id might be NULL because of a small bug in camel-mime-utils */
-			if (scan->id) {
-				md5_get_digest(scan->id, strlen(scan->id), digest);
-				memcpy(mi->references->references[count].id.hash, digest, sizeof(mi->message_id.id.hash));
-				count++;
-			}
-			scan = scan->next;
-		}
-		mi->references->size = count;
-		header_references_list_clear(&refs);
-	}
-
-	return mi;
-}
-
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-	guint count;
-	int i;
-#ifdef DOESTRV
-	char *tmp;
-#endif
-
-	mi = camel_folder_summary_info_new(s);
-
-	io(printf("Loading message info\n"));
-#ifdef DOESTRV
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_UID, tmp);
-	camel_folder_summary_decode_uint32(in, &mi->flags);
-	camel_folder_summary_decode_uint32(in, &mi->size);
-	camel_folder_summary_decode_time_t(in, &mi->date_sent);
-	camel_folder_summary_decode_time_t(in, &mi->date_received);
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_SUBJECT, tmp);
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_FROM, tmp);
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_TO, tmp);
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_CC, tmp);
-	camel_folder_summary_decode_string(in, &tmp);
-	e_strv_set_ref_free(mi->strings, CAMEL_MESSAGE_INFO_MLIST, tmp);
-#else
-	camel_folder_summary_decode_string(in, &mi->uid);
-	camel_folder_summary_decode_uint32(in, &mi->flags);
-	camel_folder_summary_decode_uint32(in, &mi->size);
-	camel_folder_summary_decode_time_t(in, &mi->date_sent);
-	camel_folder_summary_decode_time_t(in, &mi->date_received);
-	camel_folder_summary_decode_string(in, &mi->subject);
-	camel_folder_summary_decode_string(in, &mi->from);
-	camel_folder_summary_decode_string(in, &mi->to);
-	camel_folder_summary_decode_string(in, &mi->cc);
-	camel_folder_summary_decode_string(in, &mi->mlist);
-#endif
-	mi->content = NULL;
-
-	camel_folder_summary_decode_fixed_int32(in, &mi->message_id.id.part.hi);
-	camel_folder_summary_decode_fixed_int32(in, &mi->message_id.id.part.lo);
-
-	if (camel_folder_summary_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	if (count > 0) {
-		mi->references = g_malloc(sizeof(*mi->references) + ((count-1) * sizeof(mi->references->references[0])));
-		mi->references->size = count;
-		for (i=0;i<count;i++) {
-			camel_folder_summary_decode_fixed_int32(in, &mi->references->references[i].id.part.hi);
-			camel_folder_summary_decode_fixed_int32(in, &mi->references->references[i].id.part.lo);
-		}
-	}
-
-	if (camel_folder_summary_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	for (i=0;i<count;i++) {
-		char *name;
-		camel_folder_summary_decode_string(in, &name);
-		camel_flag_set(&mi->user_flags, name, TRUE);
-		g_free(name);
-	}
-
-	if (camel_folder_summary_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_folder_summary_decode_string(in, &name);
-		camel_folder_summary_decode_string(in, &value);
-		camel_tag_set(&mi->user_tags, name, value);
-		g_free(name);
-		g_free(value);
-	}
-
-	if (!ferror(in))
-		return mi;
-
-error:
-	camel_folder_summary_info_free(s, mi);
-
-	return NULL;
-}
-
-static int
-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
-{
-	guint32 count;
-	CamelFlag *flag;
-	CamelTag *tag;
-	int i;
-
-	io(printf("Saving message info\n"));
-
-	camel_folder_summary_encode_string(out, camel_message_info_uid(mi));
-	camel_folder_summary_encode_uint32(out, mi->flags);
-	camel_folder_summary_encode_uint32(out, mi->size);
-	camel_folder_summary_encode_time_t(out, mi->date_sent);
-	camel_folder_summary_encode_time_t(out, mi->date_received);
-	camel_folder_summary_encode_string(out, camel_message_info_subject(mi));
-	camel_folder_summary_encode_string(out, camel_message_info_from(mi));
-	camel_folder_summary_encode_string(out, camel_message_info_to(mi));
-	camel_folder_summary_encode_string(out, camel_message_info_cc(mi));
-	camel_folder_summary_encode_string(out, camel_message_info_mlist(mi));
-
-	camel_folder_summary_encode_fixed_int32(out, mi->message_id.id.part.hi);
-	camel_folder_summary_encode_fixed_int32(out, mi->message_id.id.part.lo);
-
-	if (mi->references) {
-		camel_folder_summary_encode_uint32(out, mi->references->size);
-		for (i=0;i<mi->references->size;i++) {
-			camel_folder_summary_encode_fixed_int32(out, mi->references->references[i].id.part.hi);
-			camel_folder_summary_encode_fixed_int32(out, mi->references->references[i].id.part.lo);
-		}
-	} else {
-		camel_folder_summary_encode_uint32(out, 0);
-	}
-
-	count = camel_flag_list_size(&mi->user_flags);
-	camel_folder_summary_encode_uint32(out, count);
-	flag = mi->user_flags;
-	while (flag) {
-		camel_folder_summary_encode_string(out, flag->name);
-		flag = flag->next;
-	}
-
-	count = camel_tag_list_size(&mi->user_tags);
-	camel_folder_summary_encode_uint32(out, count);
-	tag = mi->user_tags;
-	while (tag) {
-		camel_folder_summary_encode_string(out, tag->name);
-		camel_folder_summary_encode_string(out, tag->value);
-		tag = tag->next;
-	}
-
-	return ferror(out);
-}
-
-static void
-message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-#ifdef DOESTRV
-	e_strv_destroy(mi->strings);
-#else
-	g_free(mi->uid);
-	g_free(mi->subject);
-	g_free(mi->from);
-	g_free(mi->to);
-	g_free(mi->cc);
-	g_free(mi->mlist);
-#endif
-	g_free(mi->references);
-	camel_flag_list_free(&mi->user_flags);
-	camel_tag_list_free(&mi->user_tags);
-	e_memchunk_free(s->message_info_chunks, mi);
-}
-
-static CamelMessageContentInfo *
-content_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageContentInfo *ci;
-
-	ci = camel_folder_summary_content_info_new(s);
-
-	ci->id = header_msgid_decode(header_raw_find(&h, "content-id", NULL));
-	ci->description = header_decode_string(header_raw_find(&h, "content-description", NULL));
-	ci->encoding = header_content_encoding_decode(header_raw_find(&h, "content-transfer-encoding", NULL));
-
-	return ci;
-}
-
-static CamelMessageContentInfo *
-content_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageContentInfo *ci;
-	char *type, *subtype;
-	guint32 count, i;
-	struct _header_content_type *ct;
-
-	io(printf("Loading content info\n"));
-
-	ci = camel_folder_summary_content_info_new(s);
-	
-	camel_folder_summary_decode_token(in, &type);
-	camel_folder_summary_decode_token(in, &subtype);
-	ct = header_content_type_new(type, subtype);
-	g_free(type);		/* can this be removed? */
-	g_free(subtype);
-	if (camel_folder_summary_decode_uint32(in, &count) == -1 || count > 500)
-		goto error;
-	    
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_folder_summary_decode_token(in, &name);
-		camel_folder_summary_decode_token(in, &value);
-		header_content_type_set_param(ct, name, value);
-		/* TODO: do this so we dont have to double alloc/free */
-		g_free(name);
-		g_free(value);
-	}
-	ci->type = ct;
-
-	camel_folder_summary_decode_token(in, &ci->id);
-	camel_folder_summary_decode_token(in, &ci->description);
-	camel_folder_summary_decode_token(in, &ci->encoding);
-
-	camel_folder_summary_decode_uint32(in, &ci->size);
-
-	ci->childs = NULL;
-
-	if (!ferror(in))
-		return ci;
-
-error:
-	camel_folder_summary_content_info_free(s, ci);
-	return NULL;
-}
-
-static int
-content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)
-{
-	struct _header_content_type *ct;
-	struct _header_param *hp;
-
-	io(printf("Saving content info\n"));
-
-	ct = ci->type;
-	if (ct) {
-		camel_folder_summary_encode_token(out, ct->type);
-		camel_folder_summary_encode_token(out, ct->subtype);
-		camel_folder_summary_encode_uint32(out, my_list_size((struct _node **)&ct->params));
-		hp = ct->params;
-		while (hp) {
-			camel_folder_summary_encode_token(out, hp->name);
-			camel_folder_summary_encode_token(out, hp->value);
-			hp = hp->next;
-		}
-	} else {
-		camel_folder_summary_encode_token(out, NULL);
-		camel_folder_summary_encode_token(out, NULL);
-		camel_folder_summary_encode_uint32(out, 0);
-	}
-	camel_folder_summary_encode_token(out, ci->id);
-	camel_folder_summary_encode_token(out, ci->description);
-	camel_folder_summary_encode_token(out, ci->encoding);
-	return camel_folder_summary_encode_uint32(out, ci->size);
-}
-
-static void
-content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)
-{
-	header_content_type_unref(ci->type);
-	g_free(ci->id);
-	g_free(ci->description);
-	g_free(ci->encoding);
-	e_memchunk_free(s->content_info_chunks, ci);
-}
-
-static char *
-next_uid_string(CamelFolderSummary *s)
-{
-	return g_strdup_printf("%u", camel_folder_summary_next_uid(s));
-}
-
-/*
-  OK
-  Now this is where all the "smarts" happen, where the content info is built,
-  and any indexing and what not is performed
-*/
-
-/* must have filter_lock before calling this function */
-static CamelMessageContentInfo *
-summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp)
-{
-	int state, len;
-	char *buffer;
-	CamelMessageContentInfo *info = NULL;
-	struct _header_content_type *ct;
-	int body;
-	int enc_id = -1, chr_id = -1, idx_id = -1;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	CamelMimeFilterCharset *mfc;
-	CamelMessageContentInfo *part;
-
-	d(printf("building content info\n"));
-
-	/* start of this part */
-	state = camel_mime_parser_step(mp, &buffer, &len);
-	body = camel_mime_parser_tell(mp);
-
-	if (s->build_content)
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_parser(s, mp);
-
-	switch(state) {
-	case HSCAN_HEADER:
-		/* check content type for indexing, then read body */
-		ct = camel_mime_parser_content_type(mp);
-		/* update attachments flag as we go */
-		if (!header_content_type_is(ct, "text", "*"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		if (p->index && header_content_type_is(ct, "text", "*")) {
-			char *encoding;
-			const char *charset;
-
-			d(printf("generating index:\n"));
-			
-			encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL));
-			if (encoding) {
-				if (!strcasecmp(encoding, "base64")) {
-					d(printf(" decoding base64\n"));
-					if (p->filter_64 == NULL)
-						p->filter_64 = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_64);
-				} else if (!strcasecmp(encoding, "quoted-printable")) {
-					d(printf(" decoding quoted-printable\n"));
-					if (p->filter_qp == NULL)
-						p->filter_qp = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_qp);
-				} else {
-					d(printf(" ignoring encoding %s\n", encoding));
-				}
-				g_free(encoding);
-			}
-				
-			charset = header_content_type_param(ct, "charset");
-			if (charset!=NULL
-			    && !(strcasecmp(charset, "us-ascii")==0
-				 || strcasecmp(charset, "utf-8")==0)) {
-				d(printf(" Adding conversion filter from %s to UTF-8\n", charset));
-				mfc = g_hash_table_lookup(p->filter_charset, charset);
-				if (mfc == NULL) {
-					mfc = camel_mime_filter_charset_new_convert(charset, "UTF-8");
-					if (mfc)
-						g_hash_table_insert(p->filter_charset, g_strdup(charset), mfc);
-				}
-				if (mfc) {
-					chr_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)mfc);
-				} else {
-					g_warning("Cannot convert '%s' to 'UTF-8', message index may be corrupt", charset);
-				}
-			}
-
-			/* and this filter actually does the indexing */
-			idx_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_index);
-		}
-		/* and scan/index everything */
-		while (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_BODY_END)
-			;
-		/* and remove the filters */
-		camel_mime_parser_filter_remove(mp, enc_id);
-		camel_mime_parser_filter_remove(mp, chr_id);
-		camel_mime_parser_filter_remove(mp, idx_id);
-		break;
-	case HSCAN_MULTIPART:
-		d(printf("Summarising multipart\n"));
-		/* update attachments flag as we go */
-		ct = camel_mime_parser_content_type(mp);
-		if (header_content_type_is(ct, "multipart", "mixed"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		while (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_MULTIPART_END) {
-			camel_mime_parser_unstep(mp);
-			part = summary_build_content_info(s, msginfo, mp);
-			if (part) {
-				part->parent = info;
-				my_list_append((struct _node **)&info->childs, (struct _node *)part);
-			}
-		}
-		break;
-	case HSCAN_MESSAGE:
-		d(printf("Summarising message\n"));
-		/* update attachments flag as we go */
-		msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-		part = summary_build_content_info(s, msginfo, mp);
-		if (part) {
-			part->parent = info;
-			my_list_append((struct _node **)&info->childs, (struct _node *)part);
-		}
-		state = camel_mime_parser_step(mp, &buffer, &len);
-		if (state != HSCAN_MESSAGE_END) {
-			g_error("Bad parser state: Expecing MESSAGE_END or MESSAGE_EOF, got: %d", state);
-			camel_mime_parser_unstep(mp);
-		}
-		break;
-	}
-
-	d(printf("finished building content info\n"));
-
-	return info;
-}
-
-/* build the content-info, from a message */
-/* this needs no lock, as we copy all data, and ibex is threadsafe */
-static CamelMessageContentInfo *
-summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object)
-{
-	CamelDataWrapper *containee;
-	int parts, i;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	CamelMessageContentInfo *info = NULL, *child;
-
-	if (s->build_content)
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_message(s, object);
-	
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee == NULL)
-		return info;
-
-	/* TODO: I find it odd that get_part and get_content_object do not
-	   add a reference, probably need fixing for multithreading */
-
-	/* check for attachments */
-	if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "multipart", "*")) {
-		if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "multipart", "mixed"))
-			msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-	} else if (!header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*"))
-		msginfo->flags |= CAMEL_MESSAGE_ATTACHMENTS;
-
-	/* using the object types is more accurate than using the mime/types */
-	if (CAMEL_IS_MULTIPART(containee)) {
-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));
-		for (i=0;i<parts;i++) {
-			CamelMimePart *part = camel_multipart_get_part(CAMEL_MULTIPART(containee), i);
-			g_assert(part);
-			child = summary_build_content_info_message(s, msginfo, part);
-			if (child) {
-				child->parent = info;
-				my_list_append((struct _node **)&info->childs, (struct _node *)child);
-			}
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-		/* for messages we only look at its contents */
-		child = summary_build_content_info_message(s, msginfo, (CamelMimePart *)containee);
-		if (child) {
-			child->parent = info;
-			my_list_append((struct _node **)&info->childs, (struct _node *)child);
-		}
-	} else if (p->index
-		   && header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*")) {
-		/* index all text parts if we're indexing */
-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
-
-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)mem);
-		ibex_index_buffer(p->index, (char *)camel_message_info_uid(msginfo), mem->buffer->data, mem->buffer->len, NULL);
-		camel_object_unref((CamelObject *)mem);
-	}
-
-	return info;
-}
-
-/**
- * camel_flag_get:
- * @list: 
- * @name: 
- * 
- * Find the state of the flag @name in @list.
- * 
- * Return value: The state of the flag (TRUE or FALSE).
- **/
-gboolean
-camel_flag_get(CamelFlag **list, const char *name)
-{
-	CamelFlag *flag;
-	flag = *list;
-	while (flag) {
-		if (!strcmp(flag->name, name))
-			return TRUE;
-		flag = flag->next;
-	}
-	return FALSE;
-}
-
-/**
- * camel_flag_set:
- * @list: 
- * @name: 
- * @value: 
- * 
- * Set the state of a flag @name in the list @list to @value.
- *
- * Return value: Whether or not it changed.
- **/
-gboolean
-camel_flag_set(CamelFlag **list, const char *name, gboolean value)
-{
-	CamelFlag *flag, *tmp;
-
-	/* this 'trick' works because flag->next is the first element */
-	flag = (CamelFlag *)list;
-	while (flag->next) {
-		tmp = flag->next;
-		if (!strcmp(flag->next->name, name)) {
-			if (!value) {
-				flag->next = tmp->next;
-				g_free(tmp);
-			}
-			return !value;
-		}
-		flag = tmp;
-	}
-
-	if (value) {
-		tmp = g_malloc(sizeof(*tmp) + strlen(name));
-		strcpy(tmp->name, name);
-		tmp->next = 0;
-		flag->next = tmp;
-	}
-	return value;
-}
-
-/**
- * camel_flag_list_size:
- * @list: 
- * 
- * Get the length of the flag list.
- * 
- * Return value: The number of TRUE flags in the list.
- **/
-int
-camel_flag_list_size(CamelFlag **list)
-{
-	int count=0;
-	CamelFlag *flag;
-
-	flag = *list;
-	while (flag) {
-		count++;
-		flag = flag->next;
-	}
-	return count;
-}
-
-/**
- * camel_flag_list_free:
- * @list: 
- * 
- * Free the memory associated with the flag list @list.
- **/
-void
-camel_flag_list_free(CamelFlag **list)
-{
-	CamelFlag *flag, *tmp;
-	flag = *list;
-	while (flag) {
-		tmp = flag->next;
-		g_free(flag);
-		flag = tmp;
-	}
-	*list = NULL;
-}
-
-const char
-*camel_tag_get(CamelTag **list, const char *name)
-{
-	CamelTag *tag;
-
-	tag = *list;
-	while (tag) {
-		if (!strcmp(tag->name, name))
-			return (const char *)tag->value;
-		tag = tag->next;
-	}
-	return NULL;
-}
-
-/**
- * camel_tag_set:
- * @list: 
- * @name: 
- * @value: 
- * 
- * Set the tag @name in the tag list @list to @value.
- *
- * Return value: whether or not it changed
- **/
-gboolean
-camel_tag_set(CamelTag **list, const char *name, const char *value)
-{
-	CamelTag *tag, *tmp;
-
-	/* this 'trick' works because tag->next is the first element */
-	tag = (CamelTag *)list;
-	while (tag->next) {
-		tmp = tag->next;
-		if (!strcmp(tmp->name, name)) {
-			if (value == NULL) { /* clear it? */
-				tag->next = tmp->next;
-				g_free(tmp->value);
-				g_free(tmp);
-				return TRUE;
-			} else if (strcmp(tmp->value, value)) { /* has it changed? */
-				g_free(tmp->value);
-				tmp->value = g_strdup(value);
-				return TRUE;
-			}
-			return FALSE;
-		}
-		tag = tmp;
-	}
-
-	if (value) {
-		tmp = g_malloc(sizeof(*tmp)+strlen(name));
-		strcpy(tmp->name, name);
-		tmp->value = g_strdup(value);
-		tmp->next = 0;
-		tag->next = tmp;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * camel_tag_list_size:
- * @list: 
- * 
- * Get the number of tags present in the tag list @list.
- * 
- * Return value: The number of tags.
- **/
-int		camel_tag_list_size(CamelTag **list)
-{
-	int count=0;
-	CamelTag *tag;
-
-	tag = *list;
-	while (tag) {
-		count++;
-		tag = tag->next;
-	}
-	return count;
-}
-
-/**
- * camel_tag_list_free:
- * @list: 
- * 
- * Free the tag list @list.
- **/
-void		camel_tag_list_free(CamelTag **list)
-{
-	CamelTag *tag, *tmp;
-	tag = *list;
-	while (tag) {
-		tmp = tag->next;
-		g_free(tag->value);
-		g_free(tag);
-		tag = tmp;
-	}
-	*list = NULL;
-}
-
-struct flag_names_t {
-	char *name;
-	guint32 value;
-} flag_names[] = {
-	{ "answered", CAMEL_MESSAGE_ANSWERED },
-	{ "deleted", CAMEL_MESSAGE_DELETED },
-	{ "draft", CAMEL_MESSAGE_DELETED },
-	{ "flagged", CAMEL_MESSAGE_FLAGGED },
-	{ "seen", CAMEL_MESSAGE_SEEN },
-	{ "attachments", CAMEL_MESSAGE_ATTACHMENTS },
-	{ NULL, 0 }
-};
-
-/**
- * camel_system_flag:
- * @name: 
- * 
- * Returns the integer value of the flag string.
- **/
-guint32
-camel_system_flag (const char *name)
-{
-	struct flag_names_t *flag;
-	
-	g_return_val_if_fail (name != NULL, 0);
-	
-	for (flag = flag_names; *flag->name; flag++)
-		if (!g_strcasecmp (name, flag->name))
-			return flag->value;
-	
-	return 0;
-}
-
-/**
- * camel_system_flag_get:
- * @flags: 
- * @name: 
- * 
- * Find the state of the flag @name in @flags.
- * 
- * Return value: The state of the flag (TRUE or FALSE).
- **/
-gboolean
-camel_system_flag_get (guint32 flags, const char *name)
-{
-	g_return_val_if_fail (name != NULL, FALSE);
-	
-	return flags & camel_system_flag (name);
-}
-
-
-/**
- * camel_message_info_new:
- *
- * Returns a new CamelMessageInfo structure.
- **/
-CamelMessageInfo *
-camel_message_info_new (void)
-{
-	CamelMessageInfo *info;
-	
-	info = g_malloc0(sizeof(*info));
-#ifdef DOESTRV
-	info->strings = e_strv_new (CAMEL_MESSAGE_INFO_LAST);
-#endif
-	info->refcount = 1;
-
-	return info;
-}
-
-/**
- * camel_message_info_ref:
- * @info: 
- * 
- * Reference an info.
- *
- * NOTE: This interface is not MT-SAFE, like the others.
- **/
-void camel_message_info_ref(CamelMessageInfo *info)
-{
-	GLOBAL_INFO_LOCK(info);
-	info->refcount++;
-	GLOBAL_INFO_UNLOCK(info);
-}
-
-/**
- * camel_message_info_new_from_header:
- * @header: raw header
- *
- * Returns a new CamelMessageInfo structure populated by the header.
- **/
-CamelMessageInfo *
-camel_message_info_new_from_header (struct _header_raw *header)
-{
-	CamelMessageInfo *info;
-	char *subject, *from, *to, *cc, *mlist;
-	
-	subject = camel_folder_summary_format_string(header, "subject");
-	from = camel_folder_summary_format_address(header, "from");
-	to = camel_folder_summary_format_address(header, "to");
-	cc = camel_folder_summary_format_address(header, "cc");
-	mlist = header_raw_check_mailing_list(&header);
-
-	info = camel_message_info_new();
-
-	camel_message_info_set_subject(info, subject);
-	camel_message_info_set_from(info, from);
-	camel_message_info_set_to(info, to);
-	camel_message_info_set_cc(info, cc);
-	camel_message_info_set_mlist(info, mlist);
-
-	return info;
-}
-
-/**
- * camel_message_info_dup_to:
- * @from: source message info
- * @to: destination message info
- *
- * Duplicates the contents of one CamelMessageInfo structure into another.
- * (The destination is assumed to be empty: its contents are not freed.)
- * The slightly odd interface is to allow this to be used to initialize
- * "subclasses" of CamelMessageInfo.
- **/
-void
-camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to)
-{
-	CamelFlag *flag;
-	CamelTag *tag;
-
-	/* Copy numbers */
-	to->flags = from->flags;
-	to->size = from->size;
-	to->date_sent = from->date_sent;
-	to->date_received = from->date_received;
-	to->refcount = 1;
-
-	/* Copy strings */
-#ifdef DOESTRV
-	to->strings = e_strv_new(CAMEL_MESSAGE_INFO_LAST);
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_SUBJECT, camel_message_info_subject(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_FROM, camel_message_info_from(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_TO, camel_message_info_to(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_CC, camel_message_info_cc(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_uid(from));
-	e_strv_set(to->strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_mlist(from));
-#else
-	to->subject = g_strdup(from->subject);
-	to->from = g_strdup(from->from);
-	to->to = g_strdup(from->to);
-	to->cc = g_strdup(from->cc);
-	to->uid = g_strdup(from->uid);
-	to->mlist = g_strdup(from->mlist);
-#endif
-	memcpy(&to->message_id, &from->message_id, sizeof(from->message_id));
-
-	/* Copy structures */
-	if (from->references) {
-		int len = sizeof(*from->references) + ((from->references->size-1) * sizeof(from->references->references[0]));
-
-		to->references = g_malloc(len);
-		memcpy(to->references, from->references, len);
-	} else {
-		to->references = NULL;
-	}
-
-	flag = from->user_flags;
-	while (flag) {
-		camel_flag_set(&to->user_flags, flag->name, TRUE);
-		flag = flag->next;
-	}
-
-	tag = from->user_tags;
-	while (tag) {
-		camel_tag_set(&to->user_tags, tag->name, tag->value);
-		tag = tag->next;
-	}
-
-	/* No, this is impossible without knowing the class of summary we came from */
-	/* FIXME some day */
-	to->content = NULL;
-}
-
-/**
- * camel_message_info_free:
- * @mi: the message info
- *
- * Unref's and potentially frees a CamelMessageInfo and its contents.
- *
- * Can only be used to free CamelMessageInfo's created with
- * camel_message_info_dup_to.
- *
- * NOTE: This interface is not MT-SAFE, like the others.
- *
- **/
-void
-camel_message_info_free(CamelMessageInfo *mi)
-{
-	g_return_if_fail(mi != NULL);
-
-	GLOBAL_INFO_LOCK(info);
-	mi->refcount--;
-	if (mi->refcount > 0) {
-		GLOBAL_INFO_UNLOCK(info);
-		return;
-	}
-	GLOBAL_INFO_UNLOCK(info);
-
-#ifdef DOESTRV
-	e_strv_destroy(mi->strings);
-#else
-	g_free(mi->uid);
-	g_free(mi->subject);
-	g_free(mi->from);
-	g_free(mi->to);
-	g_free(mi->cc);
-	g_free(mi->mlist);
-#endif
-	g_free(mi->references);
-	camel_flag_list_free(&mi->user_flags);
-	camel_tag_list_free(&mi->user_tags);
-	/* FIXME: content info? */
-	g_free(mi);
-}
-
-#ifdef DOESTRV
-const char *camel_message_info_string(const CamelMessageInfo *mi, int type)
-{
-	if (mi->strings == NULL)
-		return "";
-	return e_strv_get(mi->strings, type);
-}
-
-void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str)
-{
-	g_assert(mi->strings != NULL);
-		
-	mi->strings = e_strv_set_ref_free(mi->strings, type, str);
-}
-#endif
-
-#if 0
-static void
-content_info_dump(CamelMessageContentInfo *ci, int depth)
-{
-	char *p;
-
-	p = alloca(depth*4+1);
-	memset(p, ' ', depth*4);
-	p[depth*4] = 0;
-
-	if (ci == NULL) {
-		printf("%s<empty>\n", p);
-		return;
-	}
-
-	printf("%scontent-type: %s/%s\n", p, ci->type->type, ci->type->subtype);
-	printf("%scontent-transfer-encoding: %s\n", p, ci->encoding);
-	printf("%scontent-description: %s\n", p, ci->description);
-	printf("%ssize: %lu\n", p, (unsigned long)ci->size);
-	ci = ci->childs;
-	while (ci) {
-		content_info_dump(ci, depth+1);
-		ci = ci->next;
-	}
-}
-
-void
-message_info_dump(CamelMessageInfo *mi)
-{
-	if (mi == NULL) {
-		printf("No message?\n");
-		return;
-	}
-
-	printf("Subject: %s\n", camel_message_info_subject(mi));
-	printf("To: %s\n", camel_message_info_to(mi));
-	printf("Cc: %s\n", camel_message_info_cc(mi));
-	printf("mailing list: %s\n", camel_message_info_mlist(mi));
-	printf("From: %s\n", camel_message_info_from(mi));
-	printf("UID: %s\n", camel_message_info_uid(mi));
-	printf("Flags: %04x\n", mi->flags & 0xffff);
-	content_info_dump(mi->content, 0);
-}
-
-int main(int argc, char **argv)
-{
-	CamelMimeParser *mp;
-	int fd;
-	CamelFolderSummary *s;
-	char *buffer;
-	int len;
-	int i;
-	ibex *index;
-
-	/*g_tk_init(&argc, &argv);*/
-
-#if 0
-	{
-		int i;
-		char *s;
-		char buf[1024];
-
-		for (i=0;i<434712;i++) {
-			memcpy(buf, "                                                         ", 50);
-			buf[50] = 0;
-#if 0
-			s = g_strdup(buf);
-			g_free(s);
-#endif
-		}
-		return 0;
-	}
-#endif
-
-	if (argc < 2 ) {
-		printf("usage: %s mbox\n", argv[0]);
-		return 1;
-	}
-
-	fd = open(argv[1], O_RDONLY);
-
-	index = ibex_open("index.ibex", O_CREAT|O_RDWR, 0600);
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-/*	camel_mime_parser_set_header_regex(mp, "^(content-[^:]*|subject|from|to|date):");*/
-	camel_mime_parser_init_with_fd(mp, fd);
-
-	s = camel_folder_summary_new();
-	camel_folder_summary_set_build_content(s, TRUE);
-/*	camel_folder_summary_set_index(s, index);*/
-
-	while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM) {
-		/*printf("Parsing message ...\n");*/
-		camel_folder_summary_add_from_parser(s, mp);
-		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM_END) {
-			g_warning("Uknown state encountered, excpecting %d, got %d\n", HSCAN_FROM_END, camel_mime_parser_state(mp));
-			break;
-		}
-	}
-
-	printf("Printing summary\n");
-	for (i=0;i<camel_folder_summary_count(s);i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(s, i);
-		message_info_dump(info);
-		camel_folder_summary_info_free(info);
-	}
-
-	printf("Saivng summary\n");
-	camel_folder_summary_set_filename(s, "index.summary");
-	camel_folder_summary_save(s);
-
-	{
-		CamelFolderSummary *n;
-
-		printf("\nLoading summary\n");
-		n = camel_folder_summary_new();
-		camel_folder_summary_set_build_content(n, TRUE);
-		camel_folder_summary_set_filename(n, "index.summary");
-		camel_folder_summary_load(n);
-
-		printf("Printing summary\n");
-		for (i=0;i<camel_folder_summary_count(n);i++) {
-			CamelMessageInfo *info = camel_folder_summary_index(s, i);
-			message_info_dump(info);
-			camel_folder_summary_info_free(info);
-		}
-		camel_object_unref(n);		
-	}
-
-
-	camel_object_unref(mp);
-	camel_object_unref(s);
-
-	printf("summarised %d messages\n", camel_folder_summary_count(s));
-#if 0
-	printf("g_strdup count = %d\n", strdup_count);
-	printf("g_malloc count = %d\n", malloc_count);
-	printf("g_free count = %d\n", free_count);
-#endif
-	return 0;
-}
-
-#endif
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
deleted file mode 100644
index 48a9ea4688..0000000000
--- a/camel/camel-folder-summary.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_FOLDER_SUMMARY_H
-#define _CAMEL_FOLDER_SUMMARY_H
-
-#include <camel/camel-object.h>
-#include <stdio.h>
-#include <time.h>
-#include <camel/camel-mime-parser.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_FOLDER_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)
-#define CAMEL_FOLDER_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass)
-#define CAMEL_IS_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_summary_get_type ())
-
-/*typedef struct _CamelFolderSummary      CamelFolderSummary;*/
-typedef struct _CamelFolderSummaryClass CamelFolderSummaryClass;
-
-/* A tree of message content info structures
-   describe the content structure of the message (if it has any) */
-struct _CamelMessageContentInfo {
-	struct _CamelMessageContentInfo *next;
-
-	struct _CamelMessageContentInfo *childs;
-	struct _CamelMessageContentInfo *parent;
-
-	struct _header_content_type *type;
-	char *id;
-	char *description;
-	char *encoding;
-	guint32 size;
-};
-
-/* system flag bits */
-enum _CamelMessageFlags {
-	CAMEL_MESSAGE_ANSWERED = 1<<0,
-	CAMEL_MESSAGE_DELETED = 1<<1,
-	CAMEL_MESSAGE_DRAFT = 1<<2,
-	CAMEL_MESSAGE_FLAGGED = 1<<3,
-	CAMEL_MESSAGE_SEEN = 1<<4,
-	CAMEL_MESSAGE_ATTACHMENTS = 1<<5,
-
-	/* following flags are for the folder, and are not really permanent flags */
-	CAMEL_MESSAGE_FOLDER_FLAGGED = 1<<16, /* for use by the folder implementation */
-	CAMEL_MESSAGE_USER = 1<<31 /* supports user flags */
-};
-
-typedef struct _CamelFlag {
-	struct _CamelFlag *next;
-	char name[1];		/* name allocated as part of the structure */
-} CamelFlag;
-
-typedef struct _CamelTag {
-	struct _CamelTag *next;
-	char *value;
-	char name[1];		/* name allocated as part of the structure */
-} CamelTag;
-
-/* a summary messageid is a 64 bit identifier (partial md5 hash) */
-typedef struct _CamelSummaryMessageID {
-	union {
-		guint64 id;
-		unsigned char hash[8];
-		struct {
-			guint32 hi;
-			guint32 lo;
-		} part;
-	} id;
-} CamelSummaryMessageID;
-
-/* summary references is a fixed size array of references */
-typedef struct _CamelSummaryReferences {
-	int size;
-	CamelSummaryMessageID references[1];
-} CamelSummaryReferences;
-
-#define DOESTRV
-
-#ifdef DOESTRV
-/* string array indices */
-enum {
-	CAMEL_MESSAGE_INFO_UID,
-	CAMEL_MESSAGE_INFO_SUBJECT,
-	CAMEL_MESSAGE_INFO_FROM,
-	CAMEL_MESSAGE_INFO_TO,
-	CAMEL_MESSAGE_INFO_CC,
-	CAMEL_MESSAGE_INFO_MLIST,
-	CAMEL_MESSAGE_INFO_LAST,
-};
-#endif
-
-/* information about a given object */
-struct _CamelMessageInfo {
-	/* public fields */
-#ifdef DOESTRV
-	struct _EStrv *strings;		/* all strings packed into a single compact array */
-#else
-	char *subject;
-	char *from;
-	char *to;
-	char *cc;
-	char *mlist;
-
-	char *uid;
-#endif
-	guint32 flags;
-	guint32 size;
-	guint32 refcount;
-
-	time_t date_sent;
-	time_t date_received;
-
-	CamelSummaryMessageID message_id;/* for this message */
-	CamelSummaryReferences *references;/* from parent to root */
-
-	struct _CamelFlag *user_flags;
-	struct _CamelTag *user_tags;
-
-	/* tree of content description - NULL if it is not available */
-	CamelMessageContentInfo *content;
-};
-
-enum _CamelFolderSummaryFlags {
-	CAMEL_SUMMARY_DIRTY = 1<<0,
-};
-
-struct _CamelFolderSummary {
-	CamelObject parent;
-
-	struct _CamelFolderSummaryPrivate *priv;
-
-	/* header info */
-	guint32 version;	/* version of file required, should be set by implementors */
-	guint32 flags;		/* flags */
-	guint32 nextuid;	/* next uid? */
-	guint32 saved_count;	/* how many were saved/loaded */
-	time_t time;		/* timestamp for this summary (for implementors to use) */
-
-	/* sizes of memory objects */
-	guint32 message_info_size;
-	guint32 content_info_size;
-
-#ifdef DOESTRV
-	guint32 message_info_strings;
-#endif	
-	/* memory allocators (setup automatically) */
-	struct _EMemChunk *message_info_chunks;
-	struct _EMemChunk *content_info_chunks;
-
-	char *summary_path;
-	gboolean build_content;	/* do we try and parse/index the content, or not? */
-
-	GPtrArray *messages;	/* CamelMessageInfo's */
-	GHashTable *messages_uid; /* CamelMessageInfo's by uid */
-};
-
-struct _CamelFolderSummaryClass {
-	CamelObjectClass parent_class;
-
-	/* load/save the global info */
-	int (*summary_header_load)(CamelFolderSummary *, FILE *);
-	int (*summary_header_save)(CamelFolderSummary *, FILE *);
-
-	/* create/save/load an individual message info */
-	CamelMessageInfo * (*message_info_new)(CamelFolderSummary *, struct _header_raw *);
-	CamelMessageInfo * (*message_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);
-	CamelMessageInfo * (*message_info_new_from_message)(CamelFolderSummary *, CamelMimeMessage *);
-	CamelMessageInfo * (*message_info_load)(CamelFolderSummary *, FILE *);
-	int		   (*message_info_save)(CamelFolderSummary *, FILE *, CamelMessageInfo *);
-	void		   (*message_info_free)(CamelFolderSummary *, CamelMessageInfo *);
-
-	/* save/load individual content info's */
-	CamelMessageContentInfo * (*content_info_new)(CamelFolderSummary *, struct _header_raw *);
-	CamelMessageContentInfo * (*content_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);
-	CamelMessageContentInfo * (*content_info_new_from_message)(CamelFolderSummary *, CamelMimePart *);
-	CamelMessageContentInfo * (*content_info_load)(CamelFolderSummary *, FILE *);
-	int		          (*content_info_save)(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-	void		          (*content_info_free)(CamelFolderSummary *, CamelMessageContentInfo *);
-
-	/* get the next uid */
-	char *(*next_uid_string)(CamelFolderSummary *);
-};
-
-guint			 camel_folder_summary_get_type	(void);
-CamelFolderSummary      *camel_folder_summary_new	(void);
-
-void camel_folder_summary_set_filename(CamelFolderSummary *, const char *);
-void camel_folder_summary_set_index(CamelFolderSummary *, ibex *);
-void camel_folder_summary_set_build_content(CamelFolderSummary *, gboolean state);
-
-guint32  camel_folder_summary_next_uid        (CamelFolderSummary *s);
-char    *camel_folder_summary_next_uid_string (CamelFolderSummary *s);
-void 	 camel_folder_summary_set_uid	      (CamelFolderSummary *s, guint32 uid);
-
-/* load/save the summary in its entirety */
-int camel_folder_summary_load(CamelFolderSummary *);
-int camel_folder_summary_save(CamelFolderSummary *);
-
-/* set the dirty bit on the summary */
-void camel_folder_summary_touch(CamelFolderSummary *s);
-
-/* add a new raw summary item */
-void camel_folder_summary_add(CamelFolderSummary *, CamelMessageInfo *info);
-
-/* build/add raw summary items */
-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *, struct _header_raw *);
-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *, CamelMimeParser *);
-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *, CamelMimeMessage *);
-
-/* Just build raw summary items */
-CamelMessageInfo *camel_folder_summary_info_new(CamelFolderSummary *s);
-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *, struct _header_raw *);
-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *, CamelMimeMessage *);
-
-void camel_folder_summary_info_ref(CamelFolderSummary *, CamelMessageInfo *);
-void camel_folder_summary_info_free(CamelFolderSummary *, CamelMessageInfo *);
-
-CamelMessageContentInfo *camel_folder_summary_content_info_new(CamelFolderSummary *s);
-void camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci);
-
-/* removes a summary item, doesn't fix content offsets */
-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info);
-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid);
-void camel_folder_summary_remove_index(CamelFolderSummary *s, int);
-/* remove all items */
-void camel_folder_summary_clear(CamelFolderSummary *s);
-
-/* lookup functions */
-int camel_folder_summary_count(CamelFolderSummary *);
-CamelMessageInfo *camel_folder_summary_index(CamelFolderSummary *, int);
-CamelMessageInfo *camel_folder_summary_uid(CamelFolderSummary *, const char *uid);
-GPtrArray *camel_folder_summary_array(CamelFolderSummary *s);
-void camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array);
-
-/* summary formatting utils */
-char *camel_folder_summary_format_address(struct _header_raw *h, const char *name);
-char *camel_folder_summary_format_string(struct _header_raw *h, const char *name);
-
-/* summary file loading/saving helper functions */
-int camel_folder_summary_encode_fixed_int32(FILE *, gint32);
-int camel_folder_summary_decode_fixed_int32(FILE *, gint32 *);
-int camel_folder_summary_encode_uint32(FILE *, guint32);
-int camel_folder_summary_decode_uint32(FILE *, guint32 *);
-int camel_folder_summary_encode_time_t(FILE *out, time_t value);
-int camel_folder_summary_decode_time_t(FILE *in, time_t *dest);
-int camel_folder_summary_encode_off_t(FILE *out, off_t value);
-int camel_folder_summary_decode_off_t(FILE *in, off_t *dest);
-int camel_folder_summary_encode_string(FILE *out, const char *str);
-int camel_folder_summary_decode_string(FILE *in, char **);
-
-/* basically like strings, but certain keywords can be compressed and de-cased */
-int camel_folder_summary_encode_token(FILE *, const char *);
-int camel_folder_summary_decode_token(FILE *, char **);
-
-/* message flag operations */
-gboolean	camel_flag_get(CamelFlag **list, const char *name);
-gboolean	camel_flag_set(CamelFlag **list, const char *name, gboolean state);
-int		camel_flag_list_size(CamelFlag **list);
-void		camel_flag_list_free(CamelFlag **list);
-
-guint32         camel_system_flag (const char *name);
-gboolean        camel_system_flag_get (guint32 flags, const char *name);
-
-/* message tag operations */
-const char	*camel_tag_get(CamelTag **list, const char *name);
-gboolean	camel_tag_set(CamelTag **list, const char *name, const char *value);
-int		camel_tag_list_size(CamelTag **list);
-void		camel_tag_list_free(CamelTag **list);
-
-/* message info utils for working with pseudo-messageinfo structures
-   NOTE: These cannot be added to a real summary object, but suffice for all
-   other external interfaces that use message info's */
-CamelMessageInfo *camel_message_info_new(void);
-void camel_message_info_ref(CamelMessageInfo *info);
-CamelMessageInfo *camel_message_info_new_from_header(struct _header_raw *header);
-void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);
-void camel_message_info_free(CamelMessageInfo *mi);
-
-/* accessors */
-#ifdef DOESTRV
-const char *camel_message_info_string(const CamelMessageInfo *mi, int type);
-#define camel_message_info_subject(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_SUBJECT)
-#define camel_message_info_from(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_FROM)
-#define camel_message_info_to(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_TO)
-#define camel_message_info_cc(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_CC)
-#define camel_message_info_uid(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_UID)
-#define camel_message_info_mlist(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_MLIST)
-
-void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str);
-#define camel_message_info_set_subject(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_SUBJECT, s)
-#define camel_message_info_set_from(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_FROM, s)
-#define camel_message_info_set_to(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_TO, s)
-#define camel_message_info_set_cc(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_CC, s)
-#define camel_message_info_set_uid(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_UID, s)
-#define camel_message_info_set_mlist(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_MLIST, s)
-
-#else
-
-#define camel_message_info_subject(x) (((CamelMessageInfo *)(x))->subject?((CamelMessageInfo *)(x))->subject:"")
-#define camel_message_info_from(x) (((CamelMessageInfo *)(x))->from?((CamelMessageInfo *)(x))->from:"")
-#define camel_message_info_to(x) (((CamelMessageInfo *)(x))->to?((CamelMessageInfo *)(x))->to:"")
-#define camel_message_info_cc(x) (((CamelMessageInfo *)(x))->cc?((CamelMessageInfo *)(x))->cc:"")
-#define camel_message_info_uid(x) (((CamelMessageInfo *)(x))->uid?((CamelMessageInfo *)(x))->uid:"")
-#define camel_message_info_mlist(x) (((CamelMessageInfo *)(x))->mlist?((CamelMessageInfo *)(x))->mlist:"")
-
-#define camel_message_info_set_subject(x, s) (g_free(((CamelMessageInfo *)(x))->subject),((CamelMessageInfo *)(x))->subject = (s))
-#define camel_message_info_set_from(x, s) (g_free(((CamelMessageInfo *)(x))->from),((CamelMessageInfo *)(x))->from = (s))
-#define camel_message_info_set_to(x, s) (g_free(((CamelMessageInfo *)(x))->to),((CamelMessageInfo *)(x))->to = (s))
-#define camel_message_info_set_cc(x, s) (g_free(((CamelMessageInfo *)(x))->cc),((CamelMessageInfo *)(x))->cc = (s))
-#define camel_message_info_set_uid(x, s) (g_free(((CamelMessageInfo *)(x))->uid),((CamelMessageInfo *)(x))->uid = (s))
-#define camel_message_info_set_mlist(x, s) (g_free(((CamelMessageInfo *)(x))->mlist),((CamelMessageInfo *)(x))->mlist = (s))
-#endif
-
-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c
deleted file mode 100644
index 3a1c4addde..0000000000
--- a/camel/camel-folder-thread.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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
- */
-
-/* TODO: This could probably be made a camel object, but it isn't really required */
-
-#include <config.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-#include <ctype.h>
-
-#include "camel-folder-thread.h"
-#include "e-util/e-memory.h"
-
-#define d(x)
-
-#define TIMEIT
-
-#ifdef TIMEIT
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-static void
-container_add_child(CamelFolderThreadNode *node, CamelFolderThreadNode *child)
-{
-	d(printf("\nAdding child %p to parent %p \n", child, node));
-	child->next = node->child;
-	node->child = child;
-	child->parent = node;
-}
-
-static void
-container_parent_child(CamelFolderThreadNode *parent, CamelFolderThreadNode *child)
-{
-	CamelFolderThreadNode *c, *node;
-
-	/* are we already the right parent? */
-	if (child->parent == parent)
-		return;
-
-	/* would this create a loop? */
-	node = parent->parent;
-	while (node) {
-		if (node == child)
-			return;
-		node = node->parent;
-	}
-
-	/* are we unparented? */
-	if (child->parent == NULL) {
-		container_add_child(parent, child);
-		return;
-	}
-
-	/* else remove child from its existing parent, and reparent */
-	node = child->parent;
-	c = (CamelFolderThreadNode *)&node->child;
-	d(printf("scanning children:\n"));
-	while (c->next) {
-		d(printf(" %p\n", c));
-	        if (c->next==child) {
-			d(printf("found node %p\n", child));
-			c->next = c->next->next;
-			child->parent = NULL;
-			container_add_child(parent, child);
-			return;
-		}
-		c = c->next;
-	}
-
-	printf("DAMN, we shouldn't  be here!\n");
-}
-
-static void
-prune_empty(CamelFolderThread *thread, CamelFolderThreadNode **cp)
-{
-	CamelFolderThreadNode *child, *next, *c, *lastc;
-
-	/* yes, this is intentional */
-	lastc = (CamelFolderThreadNode *)cp;
-	while (lastc->next) {
-		c = lastc->next;
-
-		d(printf("checking message %p %p (%08x%08x)\n", c,
-			 c->message, c->message?c->message->message_id.id.part.hi:0,
-			 c->message?c->message->message_id.id.part.lo:0));
-		if (c->message == NULL) {
-			if (c->child == NULL) {
-				d(printf("removing empty node\n"));
-				lastc->next = c->next;
-				e_memchunk_free(thread->node_chunks, c);
-				continue;
-			}
-			if (c->parent || c->child->next==0) {
-				d(printf("promoting child\n"));
-				lastc->next = c->next; /* remove us */
-				child = c->child;
-				while (child) {
-					next = child->next;
-
-					child->parent = c->parent;
-					child->next = lastc->next;
-					lastc->next = child;
-
-					child = next;
-				}
-				continue;
-			}
-		}
-		prune_empty(thread, &c->child);
-		lastc = c;
-	}
-}
-
-static void
-hashloop(void *key, void *value, void *data)
-{
-	CamelFolderThreadNode *c = value;
-	CamelFolderThreadNode *tail = data;
-
-	if (c->parent == NULL) {
-		c->next = tail->next;
-		tail->next = c;
-	}
-}
-
-static char *
-get_root_subject(CamelFolderThreadNode *c, int *re)
-{
-	char *s, *p;
-	CamelFolderThreadNode *scan;
-	
-	s = NULL;
-	*re = FALSE;
-	if (c->message)
-		s = (char *)camel_message_info_subject(c->message);
-	else {
-		/* one of the children will always have a message */
-		scan = c->child;
-		while (scan) {
-			if (scan->message) {
-				s = (char *)camel_message_info_subject(scan->message);
-				break;
-			}
-			scan = scan->next;
-		}
-	}
-	if (s != NULL) {
-		while (*s) {
-			while (isspace(*s))
-				s++;
-			if (s[0] == 0)
-				break;
-			if ((s[0] == 'r' || s[0]=='R')
-			    && (s[1] == 'e' || s[1]=='E')) {
-				p = s+2;
-				while (isdigit(*p) || (ispunct(*p) && (*p != ':')))
-					p++;
-				if (*p==':') {
-					*re = TRUE;
-					s = p+1;
-				} else
-					break;
-			} else
-				break;
-		}
-		if (*s)
-			return s;
-	}
-	return NULL;
-}
-
-/* this can be pretty slow, but not used often */
-/* clast cannot be null */
-static void
-remove_node(CamelFolderThreadNode **list, CamelFolderThreadNode *node, CamelFolderThreadNode **clast)
-{
-	CamelFolderThreadNode *c;
-
-	/* this is intentional, even if it looks funny */
-	/* if we have a parent, then we should remove it from the parent list,
-	   otherwise we remove it from the root list */
-	if (node->parent) {
-		c = (CamelFolderThreadNode *)&node->parent->child;
-	} else {
-		c = (CamelFolderThreadNode *)list;
-	}
-	while (c->next) {
-		if (c->next == node) {
-			if (*clast == c->next)
-				*clast = c;
-			c->next = c->next->next;
-			return;
-		}
-		c = c->next;
-	}
-
-	printf("ERROR: removing node %p failed\n", node);
-}
-
-static void
-group_root_set(CamelFolderThread *thread, CamelFolderThreadNode **cp)
-{
-	GHashTable *subject_table = g_hash_table_new(g_str_hash, g_str_equal);
-	CamelFolderThreadNode *c, *clast, *scan, *container;
-
-	/* gather subject lines */ 
-	d(printf("gathering subject lines\n"));
-	clast = (CamelFolderThreadNode *)cp;
-	c = clast->next;
-	while (c) {
-		c->root_subject = get_root_subject(c, &c->re);
-		if (c->root_subject) {
-			container = g_hash_table_lookup(subject_table, c->root_subject);
-			if (container == NULL
-			    || (container->message == NULL && c->message)
-			    || (container->re == TRUE && !c->re)) {
-				g_hash_table_insert(subject_table, c->root_subject, c);
-			}
-		}
-		c = c->next;
-	}
-
-	/* merge common subjects? */
-	clast = (CamelFolderThreadNode *)cp;
-	while (clast->next) {
-		c = clast->next;
-		d(printf("checking %p %s\n", c, c->root_subject));
-		if (c->root_subject
-		    && (container = g_hash_table_lookup(subject_table, c->root_subject))
-		    && (container != c)) {
-			d(printf(" matching %p %s\n", container, container->root_subject));
-			if (c->message == NULL && container->message == NULL) {
-				d(printf("merge containers children\n"));
-				/* steal the children from c onto container, and unlink c */
-				scan = (CamelFolderThreadNode *)&container->child;
-				while (scan->next)
-					scan = scan->next;
-				scan->next = c->child;
-				clast->next = c->next;
-				e_memchunk_free(thread->node_chunks, c);
-				continue;
-			} if (c->message == NULL && container->message != NULL) {
-				d(printf("container is non-empty parent\n"));
-				remove_node(cp, container, &clast);
-				container_add_child(c, container);
-			} else if (c->message != NULL && container->message == NULL) {
-				d(printf("container is empty child\n"));
-				clast->next = c->next;
-				container_add_child(container, c);
-				continue;
-			} else if (c->re && !container->re) {
-				d(printf("container is re\n"));
-				clast->next = c->next;
-				container_add_child(container, c);
-				continue;
-			} else if (!c->re && container->re) {
-				d(printf("container is not re\n"));
-				remove_node(cp, container, &clast);
-				container_add_child(c, container);
-			} else if (c->re && container->re) {
-				d(printf("subjects are common %p and %p\n", c, container));
-
-				/* build a phantom node */
-				remove_node(cp, container, &clast);
-				remove_node(cp, c, &clast);
-
-				scan = e_memchunk_alloc0(thread->node_chunks);
-
-				scan->root_subject = c->root_subject;
-				scan->re = c->re && container->re;
-				scan->next = c->next;
-				clast->next = scan;
-				container_add_child(scan, c);
-				container_add_child(scan, container);
-				clast = scan;
-				g_hash_table_insert(subject_table, scan->root_subject, scan);
-				continue;
-			}
-		}
-		clast = c;
-	}
-	g_hash_table_destroy(subject_table);
-}
-
-struct _tree_info {
-	GHashTable *visited;
-};
-
-static int
-dump_tree_rec(struct _tree_info *info, CamelFolderThreadNode *c, int depth)
-{
-	char *p;
-	int count=0;
-
-	p = alloca(depth*2+1);
-	memset(p, ' ', depth*2);
-	p[depth*2] = 0;
-
-	while (c) {
-		if (g_hash_table_lookup(info->visited, c)) {
-			printf("WARNING: NODE REVISITED: %p\n", c);
-		} else {
-			g_hash_table_insert(info->visited, c, c);
-		}
-		if (c->message) {
-			printf("%s %p Subject: %s <%.8s>\n", p, c, camel_message_info_subject(c->message), c->message->message_id.id.hash);
-			count += 1;
-		} else {
-			printf("%s %p <empty>\n", p, c);
-		}
-		if (c->child)
-			count += dump_tree_rec(info, c->child, depth+1);
-		c = c->next;
-	}
-	return count;
-}
-
-int
-camel_folder_threaded_messages_dump(CamelFolderThreadNode *c)
-{
-	int count;
-	struct _tree_info info;
-
-	info.visited = g_hash_table_new(g_direct_hash, g_direct_equal);
-	count = dump_tree_rec(&info, c, 0);
-	g_hash_table_destroy(info.visited);
-	return count;
-}
-
-static int
-sort_node(const void *a, const void *b)
-{
-	const CamelFolderThreadNode *a1 = ((CamelFolderThreadNode **)a)[0];
-	const CamelFolderThreadNode *b1 = ((CamelFolderThreadNode **)b)[0];
-
-	/* if we have no message, it must be a dummy node, which 
-	   also means it must have a child, just use that as the
-	   sort data (close enough?) */
-	if (a1->message == NULL)
-		a1 = a1->child;
-	if (b1->message == NULL)
-		b1 = b1->child;
-	if (a1->order == b1->order)
-		return 0;
-	if (a1->order < b1->order)
-		return -1;
-	else
-		return 1;
-}
-
-static void
-sort_thread(CamelFolderThreadNode **cp)
-{
-	CamelFolderThreadNode *c, *head, **carray;
-	int size=0;
-
-	c = *cp;
-	while (c) {
-		/* sort the children while we're at it */
-		if (c->child)
-			sort_thread(&c->child);
-		size++;
-		c = c->next;
-	}
-	if (size<2)
-		return;
-	carray = alloca(size*sizeof(CamelFolderThreadNode *));
-	c = *cp;
-	size=0;
-	while (c) {
-		carray[size] = c;
-		c = c->next;
-		size++;
-	}
-	qsort(carray, size, sizeof(CamelFolderThreadNode *), sort_node);
-	size--;
-	head = carray[size];
-	head->next = NULL;
-	size--;
-	do {
-		c = carray[size];
-		c->next = head;
-		head = c;
-		size--;
-	} while (size>=0);
-	*cp = head;
-}
-
-static guint id_hash(void *key)
-{
-	CamelSummaryMessageID *id = (CamelSummaryMessageID *)key;
-
-	return id->id.part.lo;
-}
-
-static gint id_equal(void *a, void *b)
-{
-	return ((CamelSummaryMessageID *)a)->id.id == ((CamelSummaryMessageID *)b)->id.id;
-}
-
-/**
- * camel_folder_thread_messages_new:
- * @folder: 
- * @uids: The subset of uid's to thread.  If NULL. then thread all
- * uid's in @folder.
- * 
- * Thread a (subset) of the messages in a folder.  And sort the result
- * in summary order.
- * 
- * Return value: A CamelFolderThread contianing a tree of CamelFolderThreadNode's
- * which represent the threaded structure of the messages.
- **/
-CamelFolderThread *
-camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids)
-{
-	GHashTable *id_table, *no_id_table;
-	int i;
-	CamelFolderThreadNode *c, *child, *head;
-	CamelFolderThread *thread;
-	GHashTable *wanted = NULL;
-	GPtrArray *summary;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	gettimeofday(&start, NULL);
-#endif
-
-	thread = g_malloc(sizeof(*thread));
-	thread->tree = NULL;
-	thread->node_chunks = e_memchunk_new(32, sizeof(CamelFolderThreadNode));
-	thread->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-
-	/* wanted is the list of what we want, we put it in a hash for quick lookup */
-	if (uids) {
-		wanted = g_hash_table_new(g_str_hash, g_str_equal);
-		for (i=0;i<uids->len;i++)
-			g_hash_table_insert(wanted, uids->pdata[i], uids->pdata[i]);
-	}
-
-	thread->summary = summary = camel_folder_get_summary(folder);
-	
-	id_table = g_hash_table_new((GHashFunc)id_hash, (GCompareFunc)id_equal);
-	no_id_table = g_hash_table_new(NULL, NULL);
-	for (i=0;i<summary->len;i++) {
-		CamelMessageInfo *mi = summary->pdata[i];
-		const char *uid = camel_message_info_uid(mi);
-
-		if (wanted && g_hash_table_lookup(wanted, uid) == 0)
-			continue;
-
-		if (mi->message_id.id.id) {
-			c = g_hash_table_lookup(id_table, &mi->message_id);
-			/* check for duplicate messages */
-			if (c) {
-				/* if duplicate, just make out it is a no-id message,  but try and insert it
-				   into the right spot in the tree */
-				d(printf("doing: (duplicate message id)\n"));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(no_id_table, (void *)mi, c);
-			} else {
-				d(printf("doing : %08x%08x (%s)\n", mi->message_id.id.part.hi, mi->message_id.id.part.lo, camel_message_info_subject(mi)));
-				c = e_memchunk_alloc0(thread->node_chunks);
-				g_hash_table_insert(id_table, (void *)&mi->message_id, c);
-			}
-		} else {
-			d(printf("doing : (no message id)\n"));
-			c = e_memchunk_alloc0(thread->node_chunks);
-			g_hash_table_insert(no_id_table, (void *)mi, c);
-		}
-
-		c->message = mi;
-		c->order = i;
-		child = c;
-		if (mi->references) {
-			int j;
-
-			d(printf("references:\n"));
-			for (j=0;j<mi->references->size;j++) {
-				/* should never be empty, but just incase */
-				if (mi->references->references[j].id.id == 0)
-					continue;
-
-				c = g_hash_table_lookup(id_table, &mi->references->references[j]);
-				if (c == NULL) {
-					d(printf("not found\n"));
-					c = e_memchunk_alloc0(thread->node_chunks);
-					g_hash_table_insert(id_table, &mi->references->references[j], c);
-				}
-				if (c!=child)
-					container_parent_child(c, child);
-				child = c;
-			}
-		}
-	}
-
-	d(printf("\n\n"));
-	/* build a list of root messages (no parent) */
-	head = NULL;
-	g_hash_table_foreach(id_table, hashloop, &head);
-	g_hash_table_foreach(no_id_table, hashloop, &head);
-
-	g_hash_table_destroy(id_table);
-	g_hash_table_destroy(no_id_table);
-
-	/* remove empty parent nodes */
-	prune_empty(thread, &head);
-
-	/* find any siblings which missed out */
-	group_root_set(thread, &head);
-
-#if 0
-	printf("finished\n");
-	i = camel_folder_thread_messages_dump(head);
-	printf("%d count, %d items in tree\n", uids->len, i);
-#endif
-
-	sort_thread(&head);
-
-	/* remove any phantom nodes, this could possibly be put in group_root_set()? */
-	c = (CamelFolderThreadNode *)&head;
-	while (c && c->next) {
-		CamelFolderThreadNode *scan, *newtop;
-
-		child = c->next;
-		if (child->message == NULL) {
-			newtop = child->child;
-			/* unlink pseudo node */
-			c->next = newtop;
-
-			/* link its siblings onto the end of its children */
-			scan = (CamelFolderThreadNode *)&newtop->child;
-			while (scan->next)
-				scan = scan->next;
-			scan->next = newtop->next;
-			/* and link the now 'real' node into the list */
-			newtop->next = child->next;
-			c = newtop;
-			e_memchunk_free(thread->node_chunks, child);
-		} else {
-			c = child;
-		}
-	}
-
-	/* this is only debug assertion stuff */
-	c = (CamelFolderThreadNode *)&head;
-	while (c->next) {
-		c = c->next;
-		if (c->message == NULL)
-			g_warning("threading missed removing a pseudo node: %s\n", c->root_subject);
-	}
-
-	thread->tree = head;
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Message threading %d messages took %ld.%03ld seconds\n",
-	       uids->len, diff / 1000, diff % 1000);
-#endif
-
-	return thread;
-}
-
-/**
- * camel_folder_thread_messages_destroy:
- * @thread: 
- * 
- * Free all memory associated with the thread descriptor @thread.
- **/
-void
-camel_folder_thread_messages_destroy(CamelFolderThread *thread)
-{
-	camel_folder_free_summary(thread->folder, thread->summary);
-	camel_object_unref((CamelObject *)thread->folder);
-	e_memchunk_destroy(thread->node_chunks);
-	g_free(thread);
-}
-
-#if 0
-/* intended for incremental update.  Not implemented yet as, well, its probbaly
-   not worth it (memory overhead vs speed, may as well just rethread the whole
-   lot?)
-
-   But it might be implemented at a later date.
-*/
-void
-camel_folder_thread_messages_add(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)
-{
-	
-}
-
-void
-thread_messages_remove(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)
-{
-	
-}
-#endif
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
deleted file mode 100644
index 843ade0b56..0000000000
--- a/camel/camel-folder-thread.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_FOLDER_THREAD_H
-#define _CAMEL_FOLDER_THREAD_H
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-
-typedef struct _CamelFolderThreadNode {
-	struct _CamelFolderThreadNode *next,
-		*parent,
-		*child;
-	const CamelMessageInfo *message;
-	char *root_subject;	/* cached root equivalent subject */
-	int re;			/* re version of subject? */
-	int order;
-} CamelFolderThreadNode;
-
-typedef struct CamelFolderThread {
-	struct _CamelFolderThreadNode *tree;
-	struct _EMemChunk *node_chunks;
-	CamelFolder *folder;
-	GPtrArray *summary;
-} CamelFolderThread;
-
-CamelFolderThread *camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids);
-/*
-void camel_folder_thread_messages_add(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);
-void camel_folder_thread_messages_remove(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);
-*/
-void camel_folder_thread_messages_destroy(CamelFolderThread *threads);
-
-/* debugging function only */
-int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
-
-#endif /* !_CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
deleted file mode 100644
index faff5f7556..0000000000
--- a/camel/camel-folder.c
+++ /dev/null
@@ -1,1675 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-folder.c: Abstract class for an email folder */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <string.h>
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "string-utils.h"
-#include "e-util/e-memory.h"
-
-#include "camel-private.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelFolder */
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void camel_folder_finalize (CamelObject *object);
-
-static void refresh_info (CamelFolder *folder, CamelException *ex);
-
-static void folder_sync (CamelFolder *folder, gboolean expunge,
-			 CamelException *ex);
-
-static const gchar *get_name (CamelFolder *folder);
-static const gchar *get_full_name (CamelFolder *folder);
-static CamelStore *get_parent_store   (CamelFolder *folder);
-
-static guint32 get_permanent_flags (CamelFolder *folder);
-static guint32 get_message_flags (CamelFolder *folder, const char *uid);
-static void set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set);
-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);
-static void set_message_user_flag (CamelFolder *folder, const char *uid,
-				   const char *name, gboolean value);
-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);
-static void set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
-
-static gint get_message_count (CamelFolder *folder);
-static gint get_unread_message_count (CamelFolder *folder);
-
-static void expunge             (CamelFolder *folder,
-				 CamelException *ex);
-
-
-static void append_message (CamelFolder *folder, CamelMimeMessage *message,
-			    const CamelMessageInfo *info, CamelException *ex);
-
-
-static GPtrArray        *get_uids            (CamelFolder *folder);
-static void              free_uids           (CamelFolder *folder,
-					      GPtrArray *array);
-static GPtrArray        *get_summary         (CamelFolder *folder);
-static void              free_summary        (CamelFolder *folder,
-					      GPtrArray *array);
-
-static CamelMimeMessage *get_message         (CamelFolder *folder,
-					      const gchar *uid,
-					      CamelException *ex);
-
-static CamelMessageInfo *get_message_info	(CamelFolder *folder, const char *uid);
-static void		 free_message_info	(CamelFolder *folder, CamelMessageInfo *info);
-
-static GPtrArray      *search_by_expression  (CamelFolder *folder,
-					      const char *exp,
-					      CamelException *ex);
-static void            search_free           (CamelFolder * folder, 
-					      GPtrArray * result);
-
-static void            copy_message_to       (CamelFolder *source,
-					      const char *uid,
-					      CamelFolder *dest,
-					      CamelException *ex);
-
-static void            move_message_to       (CamelFolder *source,
-					      const char *uid,
-					      CamelFolder *dest,
-					      CamelException *ex);
-
-static void            freeze                (CamelFolder *folder);
-static void            thaw                  (CamelFolder *folder);
-
-static gboolean        folder_changed        (CamelObject *object,
-					      gpointer event_data);
-static gboolean        message_changed       (CamelObject *object,
-					      /*const char *uid*/gpointer event_data);
-
-static void
-camel_folder_class_init (CamelFolderClass *camel_folder_class)
-{
-	CamelObjectClass *camel_object_class =
-		CAMEL_OBJECT_CLASS (camel_folder_class);
-
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	/* virtual method definition */
-	camel_folder_class->sync = folder_sync;
-	camel_folder_class->refresh_info = refresh_info;
-	camel_folder_class->get_name = get_name;
-	camel_folder_class->get_full_name = get_full_name;
-	camel_folder_class->get_parent_store = get_parent_store;
-	camel_folder_class->expunge = expunge;
-	camel_folder_class->get_message_count = get_message_count;
-	camel_folder_class->get_unread_message_count = get_unread_message_count;
-	camel_folder_class->append_message = append_message;
-	camel_folder_class->get_permanent_flags = get_permanent_flags;
-	camel_folder_class->get_message_flags = get_message_flags;
-	camel_folder_class->set_message_flags = set_message_flags;
-	camel_folder_class->get_message_user_flag = get_message_user_flag;
-	camel_folder_class->set_message_user_flag = set_message_user_flag;
-	camel_folder_class->get_message_user_tag = get_message_user_tag;
-	camel_folder_class->set_message_user_tag = set_message_user_tag;
-	camel_folder_class->get_message = get_message;
-	camel_folder_class->get_uids = get_uids;
-	camel_folder_class->free_uids = free_uids;
-	camel_folder_class->get_summary = get_summary;
-	camel_folder_class->free_summary = free_summary;
-	camel_folder_class->search_by_expression = search_by_expression;
-	camel_folder_class->search_free = search_free;
-	camel_folder_class->get_message_info = get_message_info;
-	camel_folder_class->free_message_info = free_message_info;
-	camel_folder_class->copy_message_to = copy_message_to;
-	camel_folder_class->move_message_to = move_message_to;
-	camel_folder_class->freeze = freeze;
-	camel_folder_class->thaw = thaw;
-
-	/* virtual method overload */
-	camel_object_class_declare_event (camel_object_class,
-					  "folder_changed", folder_changed);
-	camel_object_class_declare_event (camel_object_class,
-					  "message_changed", message_changed);
-}
-
-static void
-camel_folder_init (gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-
-	folder->priv = g_malloc0(sizeof(*folder->priv));
-	folder->priv->frozen = 0;
-	folder->priv->changed_frozen = camel_folder_change_info_new();
-#ifdef ENABLE_THREADS
-	folder->priv->lock = g_mutex_new();
-	folder->priv->change_lock = g_mutex_new();
-#endif
-}
-
-static void
-camel_folder_finalize (CamelObject *object)
-{
-	CamelFolder *camel_folder = CAMEL_FOLDER (object);
-
-	g_free (camel_folder->name);
-	g_free (camel_folder->full_name);
-
-	if (camel_folder->parent_store)
-		camel_object_unref (CAMEL_OBJECT (camel_folder->parent_store));
-
-	if (camel_folder->summary)
-		camel_object_unref((CamelObject *)camel_folder->summary);
-
-	camel_folder_change_info_free(camel_folder->priv->changed_frozen);
-#ifdef ENABLE_THREADS
-	g_mutex_free(camel_folder->priv->lock);
-	g_mutex_free(camel_folder->priv->change_lock);
-#endif
-	g_free(camel_folder->priv);
-}
-
-CamelType
-camel_folder_get_type (void)
-{
-	static CamelType camel_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_folder_type == CAMEL_INVALID_TYPE)	{
-		camel_folder_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelFolder",
-							 sizeof (CamelFolder),
-							 sizeof (CamelFolderClass),
-							 (CamelObjectClassInitFunc) camel_folder_class_init,
-							 NULL,
-							 (CamelObjectInitFunc) camel_folder_init,
-							 (CamelObjectFinalizeFunc) camel_folder_finalize );
-	}
-
-	return camel_folder_type;
-}
-
-
-/**
- * camel_folder_construct:
- * @folder: folder object to construct
- * @parent_store: parent store object of the folder
- * @full_name: full name of the folder
- * @name: short name of the folder
- *
- * Initalizes the folder by setting the parent store and name.
- **/
-void
-camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
-			const char *full_name, const char *name)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (CAMEL_IS_STORE (parent_store));
-	g_return_if_fail (folder->parent_store == NULL);
-	g_return_if_fail (folder->name == NULL);
-
-	folder->parent_store = parent_store;
-	camel_object_ref (CAMEL_OBJECT (parent_store));
-
-	folder->name = g_strdup (name);
-	folder->full_name = g_strdup (full_name);
-}
-
-
-static void
-folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	g_warning ("CamelFolder::sync not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_sync:
- * @folder: The folder object
- * @expunge: whether or not to expunge deleted messages
- * @ex: exception object
- *
- * Sync changes made to a folder to its backing store, possibly expunging
- * deleted messages as well.
- **/
-void
-camel_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->sync (folder, expunge, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-static void
-refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	/* No op */
-}
-
-/**
- * camel_folder_refresh_info:
- * @folder: The folder object
- * @ex: exception object
- *
- * Updates a folder's summary to be in sync with its backing store.
- **/
-void
-camel_folder_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->refresh_info (folder, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-static const char *
-get_name (CamelFolder *folder)
-{
-	return folder->name;
-}
-
-/**
- * camel_folder_get_name:
- * @folder: a folder
- *
- * Get the (short) name of the folder. The fully qualified name
- * can be obtained with the get_full_name method.
- *
- * Return value: name of the folder
- **/
-const char *
-camel_folder_get_name (CamelFolder * folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_name (folder);
-}
-
-
-static const char *
-get_full_name (CamelFolder *folder)
-{
-	return folder->full_name;
-}
-
-/**
- * camel_folder_get_full_name:
- * @folder: a folder
- *
- * Get the (full) name of the folder.
- *
- * Return value: full name of the folder
- **/
-const char *
-camel_folder_get_full_name (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_full_name (folder);
-}
-
-
-static CamelStore *
-get_parent_store (CamelFolder * folder)
-{
-	return folder->parent_store;
-}
-
-/**
- * camel_folder_get_parent_store:
- * @folder: folder to get the parent of
- *
- * Return value: the parent store of the folder.
- **/
-CamelStore *
-camel_folder_get_parent_store (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_parent_store (folder);
-}
-
-
-static void
-expunge (CamelFolder *folder, CamelException *ex)
-{
-	g_warning ("CamelFolder::expunge not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-
-/**
- * camel_folder_expunge:
- * @folder: the folder
- * @ex: a CamelException
- *
- * Delete messages which have been marked as "DELETED"
- **/
-void
-camel_folder_expunge (CamelFolder *folder, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->expunge (folder, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-static int
-get_message_count (CamelFolder *folder)
-{
-	g_return_val_if_fail(folder->summary != NULL, -1);
-
-	return camel_folder_summary_count(folder->summary);
-}
-
-/**
- * camel_folder_get_message_count:
- * @folder: A CamelFolder object
- *
- * Return value: the number of messages in the folder, or -1 if unknown.
- **/
-int
-camel_folder_get_message_count (CamelFolder *folder)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-
-	ret = CF_CLASS (folder)->get_message_count (folder);
-
-	return ret;
-}
-
-static int
-get_unread_message_count(CamelFolder *folder)
-{
-	int i, count, unread=0;
-
-	g_return_val_if_fail(folder->summary != NULL, -1);
-
-	count = camel_folder_summary_count(folder->summary);
-	for (i=0; i<count; i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(folder->summary, i);
-
-		if (info && !(info->flags & CAMEL_MESSAGE_SEEN))
-			unread++;
-
-		camel_folder_summary_info_free(folder->summary, info);
-	}
-
-	return unread;
-}
-
-/**
- * camel_folder_unread_get_message_count:
- * @folder: A CamelFolder object
- *
- * Return value: the number of unread messages in the folder, or -1 if unknown.
- **/
-int
-camel_folder_get_unread_message_count (CamelFolder *folder)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-	
-	ret = CF_CLASS (folder)->get_unread_message_count (folder);
-
-	return ret;
-}
-
-static void
-append_message (CamelFolder *folder, CamelMimeMessage *message,
-		const CamelMessageInfo *info, CamelException *ex)
-{
-	g_warning ("CamelFolder::append_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return;
-
-}
-
-/**
- * camel_folder_append_message: add a message to a folder
- * @folder: folder object to add the message to
- * @message: message object
- * @info: message info with additional flags/etc to set on
- * new message, or %NULL
- * @ex: exception object
- *
- * Add a message to a folder. Only the flag and tag data from @info
- * is used. If @info is %NULL, no flags or tags will be set.
- **/
-void
-camel_folder_append_message (CamelFolder *folder, CamelMimeMessage *message,
-			     const CamelMessageInfo *info, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	CF_CLASS (folder)->append_message (folder, message, info, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-}
-
-
-static guint32
-get_permanent_flags (CamelFolder *folder)
-{
-	return folder->permanent_flags;
-}
-
-/**
- * camel_folder_get_permanent_flags:
- * @folder: a CamelFolder
- *
- * Return value: the set of CamelMessageFlags that can be permanently
- * stored on a message between sessions. If it includes %CAMEL_FLAG_USER,
- * then user-defined flags will be remembered.
- **/
-guint32
-camel_folder_get_permanent_flags (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	return CF_CLASS (folder)->get_permanent_flags (folder);
-}
-
-static guint32
-get_message_flags(CamelFolder *folder, const char *uid)
-{
-	CamelMessageInfo *info;
-	guint32 flags;
-
-	g_return_val_if_fail(folder->summary != NULL, 0);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, 0);
-
-	flags = info->flags;
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return flags;
-}
-
-/**
- * camel_folder_get_message_flags:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- *
- * Return value: the CamelMessageFlags that are set on the indicated
- * message.
- **/
-guint32
-camel_folder_get_message_flags (CamelFolder *folder, const char *uid)
-{
-	guint32 ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	ret = CF_CLASS (folder)->get_message_flags (folder, uid);
-
-	return ret;
-}
-
-static void
-set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelMessageInfo *info;
-	guint32 new;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	new = (info->flags & ~flags) | (set & flags);
-	if (new == info->flags) {
-		camel_folder_summary_info_free(folder->summary, info);
-		return;
-	}
-
-	info->flags = new | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(folder->summary);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-/**
- * camel_folder_set_message_flags:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @flags: a set of CamelMessageFlag values to set
- * @set: the mask of values in @flags to use.
- *
- * Sets those flags specified by @set to the values specified by @flags
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_flags (CamelFolder *folder, const char *uid,
-				guint32 flags, guint32 set)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_flags (folder, uid, flags, set);
-}
-
-
-static gboolean
-get_message_user_flag(CamelFolder *folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	gboolean ret;
-
-	g_return_val_if_fail(folder->summary != NULL, FALSE);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	ret = camel_flag_get(&info->user_flags, name);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return ret;
-}
-
-/**
- * camel_folder_get_message_user_flag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of a user flag
- *
- * Return value: whether or not the given user flag is set on the message.
- **/
-gboolean
-camel_folder_get_message_user_flag (CamelFolder *folder, const char *uid,
-				    const char *name)
-{
-	gboolean ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	ret = CF_CLASS (folder)->get_message_user_flag (folder, uid, name);
-
-	return ret;
-}
-
-static void
-set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_flag_set(&info->user_flags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * camel_folder_set_message_user_flag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of the user flag to set
- * @value: the value to set it to
- *
- * Sets the user flag specified by @name to the value specified by @value
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_user_flag (CamelFolder *folder, const char *uid,
-				    const char *name, gboolean value)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_user_flag (folder, uid, name, value);
-}
-
-static const char *
-get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	const char *ret;
-
-	g_return_val_if_fail(folder->summary != NULL, NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-#warning "Need to duplicate tag string"
-
-	ret = camel_tag_get(&info->user_tags, name);
-	camel_folder_summary_info_free(folder->summary, info);
-
-	return ret;
-}
-
-/**
- * camel_folder_get_message_user_tag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of a user tag
- *
- * Return value: Returns the value of the user tag.
- **/
-const char *
-camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid,  const char *name)
-{
-	const char *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-#warning "get_message_user_tag() needs to copy the tag contents"
-	ret = CF_CLASS (folder)->get_message_user_tag (folder, uid, name);
-
-	return ret;
-}
-
-static void
-set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_tag_set(&info->user_tags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * camel_folder_set_message_user_tag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of the user tag to set
- * @value: the value to set it to
- *
- * Sets the user tag specified by @name to the value specified by @value
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_user_tag (CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_user_tag (folder, uid, name, value);
-}
-
-static CamelMessageInfo *
-get_message_info (CamelFolder *folder, const char *uid)
-{
-	g_return_val_if_fail(folder->summary != NULL, NULL);
-
-	return camel_folder_summary_uid(folder->summary, uid);
-}
-
-/**
- * camel_folder_get_message_info:
- * @folder: a CamelFolder
- * @uid: the uid of a message
- *
- * Retrieve the CamelMessageInfo for the specified @uid.  This return
- * must be freed using free_message_info().
- *
- * Return value: the summary information for the indicated message, or NULL
- * if the uid does not exist.
- **/
-CamelMessageInfo *
-camel_folder_get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelMessageInfo *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	ret = CF_CLASS (folder)->get_message_info (folder, uid);
-
-	return ret;
-}
-
-static void
-free_message_info (CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(folder->summary != NULL);
-
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-/**
- * camel_folder_free_message_info:
- * @folder: 
- * @info: 
- * 
- * Free (unref) a CamelMessageInfo, previously obtained with get_message_info().
- **/
-void
-camel_folder_free_message_info(CamelFolder *folder, CamelMessageInfo *info)
-{
-	g_return_if_fail(CAMEL_IS_FOLDER (folder));
-	g_return_if_fail(info != NULL);
-
-	CF_CLASS (folder)->free_message_info(folder, info);
-}
-
-/* TODO: is this function required anyway? */
-gboolean
-camel_folder_has_summary_capability (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
-
-	return folder->has_summary_capability;
-}
-
-
-/* UIDs stuff */
-
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	g_warning ("CamelFolder::get_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_message:
- * @folder: the folder object
- * @uid: the UID
- * @ex: a CamelException
- *
- * Get a message from its UID in the folder. Messages are cached
- * within a folder, that is, asking twice for the same UID returns the
- * same message object. (FIXME: is this true?)
- *
- * Return value: Message corresponding to the UID
- **/
-CamelMimeMessage *
-camel_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelMimeMessage *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	CAMEL_FOLDER_LOCK(folder, lock);
-
-	ret = CF_CLASS (folder)->get_message (folder, uid, ex);
-
-	CAMEL_FOLDER_UNLOCK(folder, lock);
-
-	return ret;
-}
-
-static GPtrArray *
-get_uids(CamelFolder *folder)
-{
-	GPtrArray *array;
-	int i, count;
-
-	array = g_ptr_array_new();
-
-	g_return_val_if_fail(folder->summary != NULL, array);
-
-	count = camel_folder_summary_count(folder->summary);
-	g_ptr_array_set_size(array, count);
-	for (i=0; i<count; i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(folder->summary, i);
-
-		if (info) {
-			array->pdata[i] = g_strdup(camel_message_info_uid(info));
-			camel_folder_summary_info_free(folder->summary, info);
-		} else {
-			array->pdata[i] = g_strdup("xx unknown uid xx");
-		}
-	}
-
-	return array;
-}
-
-/**
- * camel_folder_get_uids:
- * @folder: folder object
- *
- * Get the list of UIDs available in a folder. This routine is useful
- * for finding what messages are available when the folder does not
- * support summaries. The returned array shoudl not be modified, and
- * must be freed by passing it to camel_folder_free_uids().
- *
- * Return value: GPtrArray of UIDs corresponding to the messages
- * available in the folder.
- **/
-GPtrArray *
-camel_folder_get_uids (CamelFolder *folder)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	ret = CF_CLASS (folder)->get_uids (folder);
-
-	return ret;
-}
-
-static void
-free_uids (CamelFolder *folder, GPtrArray *array)
-{
-	int i;
-
-	for (i=0; i<array->len; i++)
-		g_free(array->pdata[i]);
-	g_ptr_array_free(array, TRUE);
-}
-
-/**
- * camel_folder_free_uids:
- * @folder: folder object
- * @array: the array of uids to free
- *
- * Frees the array of UIDs returned by camel_folder_get_uids().
- **/
-void
-camel_folder_free_uids (CamelFolder *folder, GPtrArray *array)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->free_uids (folder, array);
-}
-
-static GPtrArray *
-get_summary(CamelFolder *folder)
-{
-	g_assert(folder->summary != NULL);
-
-	return camel_folder_summary_array(folder->summary);
-}
-
-/**
- * camel_folder_get_summary:
- * @folder: a folder object
- *
- * This returns the summary information for the folder. This array
- * should not be modified, and must be freed with
- * camel_folder_free_summary().
- *
- * Return value: an array of CamelMessageInfo
- **/
-GPtrArray *
-camel_folder_get_summary (CamelFolder *folder)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	ret = CF_CLASS (folder)->get_summary (folder);
-
-	return ret;
-}
-
-static void
-free_summary(CamelFolder *folder, GPtrArray *summary)
-{
-	g_assert(folder->summary != NULL);
-
-	camel_folder_summary_array_free(folder->summary, summary);
-}
-
-/**
- * camel_folder_free_summary:
- * @folder: folder object
- * @array: the summary array to free
- *
- * Frees the summary array returned by camel_folder_get_summary().
- **/
-void camel_folder_free_summary(CamelFolder * folder, GPtrArray * array)
-{
-	g_return_if_fail(CAMEL_IS_FOLDER(folder));
-
-	CF_CLASS(folder)->free_summary(folder, array);
-}
-
-/**
- * camel_folder_has_search_capability:
- * @folder: Folder object
- *
- * Checks if a folder supports searching.
- *
- * Return value: %TRUE if the folder supports searching
- **/
-gboolean
-camel_folder_has_search_capability (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
-
-	return folder->has_search_capability;
-}
-
-static GPtrArray *
-search_by_expression (CamelFolder *folder, const char *expression,
-		      CamelException *ex)
-{
-	g_warning ("CamelFolder::search_by_expression not implemented for "
-		   "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_search_by_expression:
- * @folder: Folder object
- * @expression: a search expression
- * @ex: a CamelException
- *
- * Searches the folder for messages matching the given search expression.
- *
- * Return value: a list of uids of matching messages. The caller must
- * free the list and each of the elements when it is done.
- **/
-GPtrArray *
-camel_folder_search_by_expression (CamelFolder *folder, const char *expression,
-				   CamelException *ex)
-{
-	GPtrArray *ret;
-
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (folder->has_search_capability, NULL);
-
-	/* NOTE: that it is upto the callee to lock */
-
-	ret = CF_CLASS (folder)->search_by_expression (folder, expression, ex);
-
-	return ret;
-}
-
-static void
-search_free (CamelFolder *folder, GPtrArray *result)
-{
-	int i;
-
-	for (i = 0; i < result->len; i++)
-		g_free (g_ptr_array_index (result, i));
-	g_ptr_array_free (result, TRUE);
-}
-
-/**
- * camel_folder_search_free:
- * @folder: 
- * @result: 
- * 
- * Free the result of a search.
- **/
-void 
-camel_folder_search_free (CamelFolder *folder, GPtrArray *result)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (folder->has_search_capability);
-
-	/* NOTE: upto the callee to lock */
-	CF_CLASS (folder)->search_free (folder, result);
-}
-
-
-static void
-copy_message_to (CamelFolder *source, const char *uid, CamelFolder *dest, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info = NULL;
-
-	/* Default implementation. */
-	
-	/* we alredy have the lock, dont deadlock */
-	msg = CF_CLASS(source)->get_message(source, uid, ex);
-	if (!msg)
-		return;
-	if (source->has_summary_capability)
-		info = CF_CLASS(source)->get_message_info (source, uid);
-	else
-		info = camel_message_info_new_from_header(((CamelMimePart *)msg)->headers);
-	camel_folder_append_message (dest, msg, info, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-	if (info) {
-		if (source->has_summary_capability)
-			CF_CLASS(source)->free_message_info(source, info);
-		else
-			camel_message_info_free(info);
-	}
-}
-
-/**
- * camel_folder_copy_message_to:
- * @source: source folder
- * @uid: UID of message in @source
- * @dest: destination folder
- * @ex: a CamelException
- *
- * This copies a message from one folder to another. If the @source and
- * @dest folders have the same parent_store, this may be more efficient
- * than a camel_folder_append_message().
- *
- * This function is still depcreated, it is not the same as move_message_to.
- **/
-void
-camel_folder_copy_message_to (CamelFolder *source, const char *uid,
-			      CamelFolder *dest, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (CAMEL_IS_FOLDER (dest));
-	g_return_if_fail (uid != NULL);
-
-	CAMEL_FOLDER_LOCK(source, lock);
-
-	if (source->parent_store == dest->parent_store)
-		CF_CLASS (source)->copy_message_to (source, uid, dest, ex);
-	else
-		copy_message_to (source, uid, dest, ex);
-
-	CAMEL_FOLDER_UNLOCK(source, lock);
-}
-
-
-static void
-move_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *dest, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info = NULL;
-
-	/* Default implementation. */
-	
-	msg = CF_CLASS(source)->get_message (source, uid, ex);
-	if (!msg)
-		return;
-	if (source->has_summary_capability)
-		info = CF_CLASS(source)->get_message_info (source, uid);
-	else
-		info = camel_message_info_new_from_header(((CamelMimePart *)msg)->headers);
-	camel_folder_append_message (dest, msg, info, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-	if (!camel_exception_is_set(ex))
-		CF_CLASS(source)->set_message_flags(source, uid, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-	if (info) {
-		if (source->has_summary_capability)
-			CF_CLASS(source)->free_message_info(source, info);
-		else
-			camel_message_info_free(info);
-	}
-}
-
-/**
- * camel_folder_move_message_to:
- * @source: source folder
- * @uid: UID of message in @source
- * @dest: destination folder
- * @ex: a CamelException
- *
- * This moves a message from one folder to another. If the @source and
- * @dest folders have the same parent_store, this may be more efficient
- * than a camel_folder_append_message() followed by
- * camel_folder_delete_message().
- **/
-void
-camel_folder_move_message_to (CamelFolder *source, const char *uid,
-			      CamelFolder *dest, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (CAMEL_IS_FOLDER (dest));
-	g_return_if_fail (uid != NULL);
-
-	CAMEL_FOLDER_LOCK(source, lock);
-
-	if (source->parent_store == dest->parent_store)
-		CF_CLASS (source)->move_message_to (source, uid, dest, ex);
-	else
-		move_message_to (source, uid, dest, ex);
-
-	CAMEL_FOLDER_UNLOCK(source, lock);
-}
-
-static void
-freeze (CamelFolder *folder)
-{
-	CAMEL_FOLDER_LOCK(folder, change_lock);
-
-	folder->priv->frozen++;
-
-	printf("freeze(%p) = %d\n", folder, folder->priv->frozen);
-	CAMEL_FOLDER_UNLOCK(folder, change_lock);
-}
-
-/**
- * camel_folder_freeze:
- * @folder: a folder
- *
- * Freezes the folder so that a series of operation can be performed
- * without "message_changed" and "folder_changed" signals being emitted.
- * When the folder is later thawed with camel_folder_thaw(), the
- * suppressed signals will be emitted.
- **/
-void
-camel_folder_freeze (CamelFolder * folder)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->freeze (folder);
-}
-
-static void
-thaw (CamelFolder * folder)
-{
-	int i;
-	CamelFolderChangeInfo *info;
-
-	CAMEL_FOLDER_LOCK(folder, change_lock);
-
-	folder->priv->frozen--;
-
-	printf("thaw(%p) = %d\n", folder, folder->priv->frozen);
-
-	if (folder->priv->frozen == 0) {
-		/* If we have more or less messages, do a folder changed, otherwise just
-		   do a message changed for each one.
-		   TODO: message_changed is now probably irrelevant and not required */
-		info = folder->priv->changed_frozen;
-		if (info->uid_added->len > 0 || info->uid_removed->len > 0 || info->uid_changed->len > 10) {
-			camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", info);
-		} else if (info->uid_changed->len > 0) {
-			for (i=0;i<info->uid_changed->len;i++) {
-				camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", info->uid_changed->pdata[i]);
-			}
-		}
-		camel_folder_change_info_clear(info);
-	}
-
-	CAMEL_FOLDER_UNLOCK(folder, change_lock);
-}
-
-/**
- * camel_folder_thaw:
- * @folder: a folder
- *
- * Thaws the folder and emits any pending folder_changed or
- * message_changed signals.
- **/
-void
-camel_folder_thaw (CamelFolder *folder)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (folder->priv->frozen != 0);
-
-	CF_CLASS (folder)->thaw (folder);
-}
-
-
-/* Event hooks that block emission when frozen */
-static gboolean
-folder_changed (CamelObject *obj, gpointer event_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (obj);
-	CamelFolderChangeInfo *changed = event_data;
-	gboolean ret = TRUE;
-
-	printf("folder_changed(%p, %p), frozen=%d\n", obj, event_data, folder->priv->frozen);
-
-	if (folder->priv->frozen) {
-		CAMEL_FOLDER_LOCK(folder, change_lock);
-
-		if (changed != NULL)
-			camel_folder_change_info_cat(folder->priv->changed_frozen, changed);
-		else
-			g_warning("Class %s is passing NULL to folder_changed event",
-				  camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-		ret = FALSE;
-
-		CAMEL_FOLDER_UNLOCK(folder, change_lock);
-	}
-
-	return ret;
-}
-
-static gboolean
-message_changed (CamelObject *obj, /*const char *uid*/gpointer event_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (obj);
-	gboolean ret = TRUE;
-
-	printf("message_changed(%p, %p), frozen=%d\n", folder, event_data, folder->priv->frozen);
-
-	if (folder->priv->frozen) {
-		CAMEL_FOLDER_LOCK(folder, change_lock);
-	
-		camel_folder_change_info_change_uid(folder->priv->changed_frozen, (char *)event_data);
-		ret = FALSE;
-
-		CAMEL_FOLDER_UNLOCK(folder, change_lock);
-	}
-
-	return ret;
-}
-
-
-/**
- * camel_folder_free_nop:
- * @folder: a folder
- * @array: an array of uids or CamelMessageInfo
- *
- * "Frees" the provided array by doing nothing. Used by CamelFolder
- * subclasses as an implementation for free_uids, or free_summary when
- * the returned array is "static" information and should not be freed.
- **/
-void
-camel_folder_free_nop (CamelFolder *folder, GPtrArray *array)
-{
-	;
-}
-
-/**
- * camel_folder_free_shallow:
- * @folder: a folder
- * @array: an array of uids or CamelMessageInfo
- *
- * Frees the provided array but not its contents. Used by CamelFolder
- * subclasses as an implementation for free_uids or free_summary when
- * the returned array needs to be freed but its contents come from
- * "static" information.
- **/
-void
-camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)
-{
-	g_ptr_array_free (array, TRUE);
-}
-
-/**
- * camel_folder_free_deep:
- * @folder: a folder
- * @array: an array of uids
- *
- * Frees the provided array and its contents. Used by CamelFolder
- * subclasses as an implementation for free_uids when the provided
- * information was created explicitly by the corresponding get_ call.
- **/
-void
-camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)
-{
-	int i;
-
-	for (i = 0; i < array->len; i++)
-		g_free (array->pdata[i]);
-	g_ptr_array_free (array, TRUE);
-}
-
-struct _CamelFolderChangeInfoPrivate {
-	GHashTable *uid_stored;	/* what we have stored, which array they're in */
-	GHashTable *uid_source;	/* used to create unique lists */
-	struct _EMemPool *uid_pool;	/* pool used to store copies of uid strings */
-};
-
-/**
- * camel_folder_change_info_new:
- * @void: 
- * 
- * Create a new folder change info structure.
- *
- * Change info structures are not MT-SAFE and must be
- * locked for exclusive access externally.
- * 
- * Return value: 
- **/
-CamelFolderChangeInfo *
-camel_folder_change_info_new(void)
-{
-	CamelFolderChangeInfo *info;
-
-	info = g_malloc(sizeof(*info));
-	info->uid_added = g_ptr_array_new();
-	info->uid_removed = g_ptr_array_new();
-	info->uid_changed = g_ptr_array_new();
-	info->priv = g_malloc0(sizeof(*info->priv));
-	info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
-	info->priv->uid_source = NULL;
-	info->priv->uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-
-	return info;
-}
-
-/**
- * camel_folder_change_info_add_source:
- * @info: 
- * @uid: 
- * 
- * Add a source uid for generating a changeset.
- **/
-void
-camel_folder_change_info_add_source(CamelFolderChangeInfo *info, const char *uid)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	if (p->uid_source == NULL)
-		p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
-
-	if (g_hash_table_lookup(p->uid_source, uid) == NULL)
-		g_hash_table_insert(p->uid_source, e_mempool_strdup(p->uid_pool, uid), (void *)1);
-}
-
-/**
- * camel_folder_change_info_add_source_list:
- * @info: 
- * @list: 
- * 
- * Add a list of source uid's for generating a changeset.
- **/
-void
-camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list)
-{
-	int i;
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	if (p->uid_source == NULL)
-		p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for (i=0;i<list->len;i++) {
-		char *uid = list->pdata[i];
-
-		if (g_hash_table_lookup(p->uid_source, uid) == NULL)
-			g_hash_table_insert(p->uid_source, e_mempool_strdup(p->uid_pool, uid), (void *)1);
-	}
-}
-
-/**
- * camel_folder_change_info_add_update:
- * @info: 
- * @uid: 
- * 
- * Add a uid from the updated list, used to generate a changeset diff.
- **/
-void
-camel_folder_change_info_add_update(CamelFolderChangeInfo *info, const char *uid)
-{
-	char *key;
-	int value;
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	if (p->uid_source == NULL) {
-		camel_folder_change_info_add_uid(info, uid);
-		return;
-	}
-
-	if (g_hash_table_lookup_extended(p->uid_source, uid, (void **)&key, (void **)&value)) {
-		g_hash_table_remove(p->uid_source, key);
-	} else {
-		camel_folder_change_info_add_uid(info, uid);
-	}
-}
-
-/**
- * camel_folder_change_info_add_update_list:
- * @info: 
- * @list: 
- * 
- * Add a list of uid's from the updated list.
- **/
-void
-camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list)
-{
-	int i;
-
-	for (i=0;i<list->len;i++)
-		camel_folder_change_info_add_update(info, list->pdata[i]);
-}
-
-static void
-change_info_remove(char *key, void *value, CamelFolderChangeInfo *info)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-	GPtrArray *olduids;
-	char *olduid;
-
-	if (g_hash_table_lookup_extended(p->uid_stored, key, (void **)&olduid, (void **)&olduids)) {
-		/* if it was added/changed them removed, then remove it */
-		if (olduids != info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_removed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-		}
-		return;
-	}
-
-
-	/* we dont need to copy this, as they've already been copied into our pool */
-	g_ptr_array_add(info->uid_removed, key);
-	g_hash_table_insert(p->uid_stored, key, info->uid_removed);
-}
-
-/**
- * camel_folder_change_info_build_diff:
- * @info: 
- * 
- * Compare the source uid set to the updated uid set and generate the differences
- * into the added and removed lists.
- **/
-void
-camel_folder_change_info_build_diff(CamelFolderChangeInfo *info)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	if (p->uid_source) {
-		g_hash_table_foreach(p->uid_source, (GHFunc)change_info_remove, info);
-		g_hash_table_destroy(p->uid_source);
-		p->uid_source = NULL;
-	}
-}
-
-static void
-change_info_cat(CamelFolderChangeInfo *info, GPtrArray *source, void (*add)(CamelFolderChangeInfo *info, const char *uid))
-{
-	int i;
-
-	for (i=0;i<source->len;i++)
-		add(info, source->pdata[i]);
-}
-
-/**
- * camel_folder_change_info_cat:
- * @info: 
- * @source: 
- * 
- * Concatenate one change info onto antoher.  Can be used to copy
- * them too.
- **/
-void
-camel_folder_change_info_cat(CamelFolderChangeInfo *info, CamelFolderChangeInfo *source)
-{
-	change_info_cat(info, source->uid_added, camel_folder_change_info_add_uid);
-	change_info_cat(info, source->uid_removed, camel_folder_change_info_remove_uid);
-	change_info_cat(info, source->uid_changed, camel_folder_change_info_change_uid);
-}
-
-/**
- * camel_folder_change_info_add_uid:
- * @info: 
- * @uid: 
- * 
- * Add a new uid to the changeinfo.
- **/
-void
-camel_folder_change_info_add_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-	GPtrArray *olduids;
-	char *olduid;
-
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if it was removed then added, promote it to a changed */
-		/* if it was changed then added, leave as changed */
-		if (olduids == info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_changed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
-		}
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_added, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
-}
-
-/**
- * camel_folder_change_info_remove_uid:
- * @info: 
- * @uid: 
- * 
- * Add a uid to the removed uid list.
- **/
-void
-camel_folder_change_info_remove_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-	GPtrArray *olduids;
-	char *olduid;
-
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if it was added/changed them removed, then remove it */
-		if (olduids != info->uid_removed) {
-			g_ptr_array_remove_fast(olduids, olduid);
-			g_ptr_array_add(info->uid_removed, olduid);
-			g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-		}
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_removed, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
-}
-
-/**
- * camel_folder_change_info_change_uid:
- * @info: 
- * @uid: 
- * 
- * Add a uid to the changed uid list.
- **/
-void
-camel_folder_change_info_change_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-	GPtrArray *olduids;
-	char *olduid;
-
-	if (g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
-		/* if we have it already, leave it as that */
-		return;
-	}
-
-	olduid = e_mempool_strdup(p->uid_pool, uid);
-	g_ptr_array_add(info->uid_changed, olduid);
-	g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
-}
-
-/**
- * camel_folder_change_info_changed:
- * @info: 
- * 
- * Return true if the changeset contains any changes.
- *
- * Return Value:
- **/
-gboolean
-camel_folder_change_info_changed(CamelFolderChangeInfo *info)
-{
-	return (info->uid_added->len || info->uid_removed->len || info->uid_changed->len);
-}
-
-/**
- * camel_folder_change_info_clear:
- * @info: 
- * 
- * Empty out the change info; called after changes have been processed.
- **/
-void
-camel_folder_change_info_clear(CamelFolderChangeInfo *info)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	g_ptr_array_set_size(info->uid_added, 0);
-	g_ptr_array_set_size(info->uid_removed, 0);
-	g_ptr_array_set_size(info->uid_changed, 0);
-	if (p->uid_source) {
-		g_hash_table_destroy(p->uid_source);
-		p->uid_source = NULL;
-	}
-	g_hash_table_destroy(p->uid_stored);
-	p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
-	e_mempool_flush(p->uid_pool, TRUE);
-}
-
-/**
- * camel_folder_change_info_free:
- * @info: 
- * 
- * Free memory associated with the folder change info lists.
- **/
-void
-camel_folder_change_info_free(CamelFolderChangeInfo *info)
-{
-	struct _CamelFolderChangeInfoPrivate *p = info->priv;
-
-	if (p->uid_source)
-		g_hash_table_destroy(p->uid_source);
-
-	g_hash_table_destroy(p->uid_stored);
-	e_mempool_destroy(p->uid_pool);
-	g_free(p);
-
-	g_ptr_array_free(info->uid_added, TRUE);
-	g_ptr_array_free(info->uid_removed, TRUE);
-	g_ptr_array_free(info->uid_changed, TRUE);
-	g_free(info);
-}
-
-
-
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
deleted file mode 100644
index 53fa626e85..0000000000
--- a/camel/camel-folder.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * camel-folder.h: Abstract class for an email folder
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_FOLDER_H
-#define CAMEL_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-folder-summary.h>
-
-#define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())
-#define CAMEL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))
-#define CAMEL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))
-#define CAMEL_IS_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))
-
-typedef struct _CamelFolderChangeInfo CamelFolderChangeInfo;
-
-struct _CamelFolderChangeInfo {
-	GPtrArray *uid_added;
-	GPtrArray *uid_removed;
-	GPtrArray *uid_changed;
-
-	struct _CamelFolderChangeInfoPrivate *priv;
-};
-
-struct _CamelFolder
-{
-	CamelObject parent_object;
-
-	struct _CamelFolderPrivate *priv;
-
-	char *name;
-	char *full_name;
-	CamelStore *parent_store;
-	CamelFolderSummary *summary;
-
-	guint32 permanent_flags;
-	gboolean has_summary_capability:1;
-	gboolean has_search_capability:1;
-
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */	
-	void   (*refresh_info) (CamelFolder *folder, CamelException *ex);
-
-	void   (*sync) (CamelFolder *folder, gboolean expunge, 
-			CamelException *ex);
-
-	const char *  (*get_name)  (CamelFolder *folder);
-	const char *  (*get_full_name)   (CamelFolder *folder);
-
-	CamelStore *  (*get_parent_store) (CamelFolder *folder);
-
-	void (*expunge)  (CamelFolder *folder, 
-			  CamelException *ex);
-
-	int   (*get_message_count)   (CamelFolder *folder);
-
-	int   (*get_unread_message_count) (CamelFolder *folder);
-
-	void (*append_message)  (CamelFolder *folder, 
-				 CamelMimeMessage *message,
-				 const CamelMessageInfo *info,
-				 CamelException *ex);
-	
-	guint32 (*get_permanent_flags) (CamelFolder *folder);
-	guint32 (*get_message_flags)   (CamelFolder *folder,
-					const char *uid);
-	void    (*set_message_flags)   (CamelFolder *folder,
-					const char *uid,
-					guint32 flags, guint32 set);
-
-	gboolean (*get_message_user_flag) (CamelFolder *folder,
-					   const char *uid,
-					   const char *name);
-	void     (*set_message_user_flag) (CamelFolder *folder,
-					   const char *uid,
-					   const char *name,
-					   gboolean value);
-
-	const char * (*get_message_user_tag) (CamelFolder *folder,
-					      const char *uid,
-					      const char *name);
-	void     (*set_message_user_tag) (CamelFolder *folder,
-					  const char *uid,
-					  const char *name,
-					  const char *value);
-
-	CamelMimeMessage * (*get_message)  (CamelFolder *folder, 
-					    const char *uid, 
-					    CamelException *ex);
-
-	GPtrArray * (*get_uids)       (CamelFolder *folder);
-	void (*free_uids)             (CamelFolder *folder,
-				       GPtrArray *array);
-
-	GPtrArray * (*get_summary)    (CamelFolder *folder);
-	void (*free_summary)          (CamelFolder *folder,
-				       GPtrArray *summary);
-
-	gboolean (*has_search_capability) (CamelFolder *folder);
-
-	GPtrArray * (*search_by_expression) (CamelFolder *folder,
-					     const char *expression,
-					     CamelException *ex);
-
-	void (*search_free) (CamelFolder *folder, GPtrArray *result);
-
-	CamelMessageInfo * (*get_message_info) (CamelFolder *, const char *uid);
-	void (*free_message_info) (CamelFolder *, CamelMessageInfo *);
-
-	void (*copy_message_to) (CamelFolder *source,
-				 const char *uid,
-				 CamelFolder *destination,
-				 CamelException *ex);
-	
-	void (*move_message_to) (CamelFolder *source,
-				 const char *uid,
-				 CamelFolder *destination,
-				 CamelException *ex);
-
-	void (*freeze) (CamelFolder *folder);
-	void (*thaw)   (CamelFolder *folder);
-} CamelFolderClass;
-
-/* Standard Camel function */
-CamelType camel_folder_get_type (void);
-
-
-/* public methods */
-void               camel_folder_construct              (CamelFolder *folder,
-							CamelStore *parent_store,
-							const char *full_name,
-							const char *name);
-
-void               camel_folder_refresh_info           (CamelFolder * folder, 
-							CamelException * ex);
-void               camel_folder_sync                   (CamelFolder *folder, 
-							gboolean expunge, 
-							CamelException *ex);
-
-CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
-
-
-/* delete operations */
-void		   camel_folder_expunge                (CamelFolder *folder, 
-							CamelException *ex);
-
-
-/* folder name operations */
-const char *      camel_folder_get_name                (CamelFolder *folder);
-const char *      camel_folder_get_full_name           (CamelFolder *folder);
-
-
-/* various properties accessors */
-guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder);
-
-guint32		   camel_folder_get_message_flags      (CamelFolder *folder,
-							const char *uid);
-
-void		   camel_folder_set_message_flags      (CamelFolder *folder,
-							const char *uid,
-							guint32 flags,
-							guint32 set);
-
-gboolean	   camel_folder_get_message_user_flag  (CamelFolder *folder,
-							const char *uid,
-							const char *name);
-
-void		   camel_folder_set_message_user_flag  (CamelFolder *folder,
-							const char *uid,
-							const char *name,
-							gboolean value);
-const char *	   camel_folder_get_message_user_tag  (CamelFolder *folder,
-						       const char *uid,
-						       const char *name);
-
-void		   camel_folder_set_message_user_tag  (CamelFolder *folder,
-						       const char *uid,
-						       const char *name,
-						       const char *value);
-
-
-
-/* message manipulation */
-void               camel_folder_append_message         (CamelFolder *folder, 
-							CamelMimeMessage *message,
-							const CamelMessageInfo *info,
-							CamelException *ex);
-
-
-/* summary related operations */
-gboolean           camel_folder_has_summary_capability (CamelFolder *folder);
-
-
-int                camel_folder_get_message_count     (CamelFolder *folder);
-
-int                camel_folder_get_unread_message_count (CamelFolder *folder);
-
-GPtrArray *        camel_folder_get_summary           (CamelFolder *folder);
-void               camel_folder_free_summary          (CamelFolder *folder,
-						       GPtrArray *array);
-
-/* uid based access operations */
-CamelMimeMessage * camel_folder_get_message           (CamelFolder *folder, 
-						       const char *uid, 
-						       CamelException *ex);
-#define camel_folder_delete_message(folder, uid) \
-	camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED)
-
-GPtrArray *        camel_folder_get_uids              (CamelFolder *folder);
-void               camel_folder_free_uids             (CamelFolder *folder,
-						       GPtrArray *array);
-
-/* search api */
-gboolean           camel_folder_has_search_capability (CamelFolder *folder);
-GPtrArray *	   camel_folder_search_by_expression  (CamelFolder *folder,
-						       const char *expression,
-						       CamelException *ex);
-void		   camel_folder_search_free	      (CamelFolder *folder, GPtrArray *);
-
-/* summary info */
-CamelMessageInfo *camel_folder_get_message_info		(CamelFolder *folder, const char *uid);
-void		  camel_folder_free_message_info	(CamelFolder *folder, CamelMessageInfo *info);
-
-void               camel_folder_copy_message_to       (CamelFolder *source,
-						       const char *uid,
-						       CamelFolder *dest,
-						       CamelException *ex);
-
-void               camel_folder_move_message_to       (CamelFolder *source,
-						       const char *uid,
-						       CamelFolder *dest,
-						       CamelException *ex);
-
-/* stop/restart getting events */
-void               camel_folder_freeze                (CamelFolder *folder);
-void               camel_folder_thaw                  (CamelFolder *folder);
-
-#if 0
-/* lock/unlock at the thread level, NOTE: only used internally */
-void		   camel_folder_lock		      (CamelFolder *folder);
-void		   camel_folder_unlock		      (CamelFolder *folder);
-#endif
-
-/* For use by subclasses (for free_{uids,summary,subfolder_names}) */
-void camel_folder_free_nop     (CamelFolder *folder, GPtrArray *array);
-void camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array);
-void camel_folder_free_deep    (CamelFolder *folder, GPtrArray *array);
-
-/* update functions for change info */
-CamelFolderChangeInfo *	camel_folder_change_info_new		(void);
-void			camel_folder_change_info_clear		(CamelFolderChangeInfo *info);
-void			camel_folder_change_info_free		(CamelFolderChangeInfo *info);
-gboolean		camel_folder_change_info_changed	(CamelFolderChangeInfo *info);
-
-/* for building diff's automatically */
-void			camel_folder_change_info_add_source	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list);
-void			camel_folder_change_info_add_update	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list);
-void			camel_folder_change_info_build_diff	(CamelFolderChangeInfo *info);
-
-/* for manipulating diff's directly */
-void			camel_folder_change_info_cat		(CamelFolderChangeInfo *info, CamelFolderChangeInfo *s);
-void			camel_folder_change_info_add_uid	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_remove_uid	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_change_uid	(CamelFolderChangeInfo *info, const char *uid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_FOLDER_H */
-
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
deleted file mode 100644
index e97e9029eb..0000000000
--- a/camel/camel-internet-address.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-utils.h"
-#include "camel-internet-address.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#define d(x) 
-
-static int    internet_decode		(CamelAddress *, const char *raw);
-static char * internet_encode		(CamelAddress *);
-static int    internet_unformat		(CamelAddress *, const char *raw);
-static char * internet_format		(CamelAddress *);
-static int    internet_cat		(CamelAddress *dest, const CamelAddress *source);
-static void   internet_remove		(CamelAddress *, int index);
-
-static void camel_internet_address_class_init (CamelInternetAddressClass *klass);
-static void camel_internet_address_init       (CamelInternetAddress *obj);
-
-static CamelAddressClass *camel_internet_address_parent;
-
-struct _address {
-	char *name;
-	char *address;
-};
-
-static void
-camel_internet_address_class_init(CamelInternetAddressClass *klass)
-{
-	CamelAddressClass *address = (CamelAddressClass *) klass;
-
-	camel_internet_address_parent = CAMEL_ADDRESS_CLASS(camel_type_get_global_classfuncs(camel_address_get_type()));
-
-	address->decode = internet_decode;
-	address->encode = internet_encode;
-	address->unformat = internet_unformat;
-	address->format = internet_format;
-	address->remove = internet_remove;
-	address->cat = internet_cat;
-}
-
-static void
-camel_internet_address_init(CamelInternetAddress *obj)
-{
-}
-
-CamelType
-camel_internet_address_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_address_get_type(), "CamelInternetAddress",
-					   sizeof (CamelInternetAddress),
-					   sizeof (CamelInternetAddressClass),
-					   (CamelObjectClassInitFunc) camel_internet_address_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_internet_address_init,
-					   NULL);
-	}
-	
-	return type;
-}
-
-static int
-internet_decode	(CamelAddress *a, const char *raw)
-{
-	struct _header_address *ha, *n;
-	int count = a->addresses->len;
-
-	/* Should probably use its own decoder or something */
-	ha = header_address_decode(raw);
-	if (ha) {
-		n = ha;
-		while (n) {
-			if (n->type == HEADER_ADDRESS_NAME) {
-				camel_internet_address_add((CamelInternetAddress *)a, n->name, n->v.addr);
-			} else if (n->type == HEADER_ADDRESS_GROUP) {
-				struct _header_address *g = n->v.members;
-				while (g) {
-					if (g->type == HEADER_ADDRESS_NAME)
-						camel_internet_address_add((CamelInternetAddress *)a, g->name, g->v.addr);
-					/* otherwise, it's an error, infact */
-					g = g->next;
-				}
-			}
-			n = n->next;
-		}
-		header_address_list_clear(&ha);
-	}
-	
-	return a->addresses->len - count;
-}
-
-static char *
-internet_encode	(CamelAddress *a)
-{
-	int i;
-	GString *out;
-	char *ret;
-	int len = 6;		/* "From: ", assume longer of the address headers */
-
-	if (a->addresses->len == 0)
-		return NULL;
-	
-	out = g_string_new("");
-	
-	for (i = 0;i < a->addresses->len; i++) {
-		struct _address *addr = g_ptr_array_index(a->addresses, i);
-		char *enc;
-
-		if (i != 0)
-			g_string_append(out, ", ");
-
-		enc = camel_internet_address_encode_address(&len, addr->name, addr->address);
-		g_string_sprintfa(out, "%s", enc);
-		g_free(enc);
-	}
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-	
-	return ret;
-}
-
-static int
-internet_unformat(CamelAddress *a, const char *raw)
-{
-	char *buffer, *p, *name, *addr;
-	int c;
-	int count = a->addresses->len;
-
-	if (raw == NULL)
-		return 0;
-
-	d(printf("unformatting address: %s\n", raw));
-
-	/* we copy, so we can modify as we go */
-	buffer = g_strdup(raw);
-
-	/* this can be simpler than decode, since there are much fewer rules */
-	p = buffer;
-	name = NULL;
-	addr = p;
-	do {
-		c = (unsigned char)*p++;
-		switch (c) {
-			/* removes quotes, they should only be around the total name anyway */
-		case '"':
-			p[-1] = ' ';
-			while (*p)
-				if (*p == '"') {
-					*p++ = ' ';
-					break;
-				} else {
-					p++;
-				}
-			break;
-		case '<':
-			if (name == NULL)
-				name = addr;
-			addr = p;
-			addr[-1] = 0;
-			while (*p && *p != '>')
-				p++;
-			if (*p == 0)
-				break;
-			p++;
-			/* falls through */
-		case ',':
-			p[-1] = 0;
-			/* falls through */
-		case 0:
-			if (name)
-				name = g_strstrip(name);
-			addr = g_strstrip(addr);
-			if (addr[0]) {
-				d(printf("found address: '%s' <%s>\n", name, addr));
-				camel_internet_address_add((CamelInternetAddress *)a, name, addr);
-			}
-			name = NULL;
-			addr = p;
-			break;
-		}
-	} while (c);
-
-	g_free(buffer);
-
-	return a->addresses->len - count;
-}
-
-static char *
-internet_format	(CamelAddress *a)
-{
-	int i;
-	GString *out;
-	char *ret;
-	
-	if (a->addresses->len == 0)
-		return NULL;
-	
-	out = g_string_new("");
-	
-	for (i = 0;i < a->addresses->len; i++) {
-		struct _address *addr = g_ptr_array_index(a->addresses, i);
-		char *enc;
-
-		if (i != 0)
-			g_string_append(out, ", ");
-
-		enc = camel_internet_address_format_address(addr->name, addr->address);
-		g_string_sprintfa(out, "%s", enc);
-		g_free(enc);
-	}
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-	
-	return ret;
-}
-
-static int    internet_cat		(CamelAddress *dest, const CamelAddress *source)
-{
-	int i;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(source));
-
-	for (i=0;i<source->addresses->len;i++) {
-		struct _address *addr = g_ptr_array_index(source->addresses, i);
-		camel_internet_address_add((CamelInternetAddress *)dest, addr->name, addr->address);
-	}
-
-	return i;
-}
-
-static void
-internet_remove	(CamelAddress *a, int index)
-{
-	struct _address *addr;
-	
-	if (index < 0 || index >= a->addresses->len)
-		return;
-	
-	addr = g_ptr_array_index(a->addresses, index);
-	g_free(addr->name);
-	g_free(addr->address);
-	g_free(addr);
-	g_ptr_array_remove_index(a->addresses, index);
-}
-
-/**
- * camel_internet_address_new:
- *
- * Create a new CamelInternetAddress object.
- * 
- * Return value: A new CamelInternetAddress object.
- **/
-CamelInternetAddress *
-camel_internet_address_new (void)
-{
-	CamelInternetAddress *new = CAMEL_INTERNET_ADDRESS(camel_object_new(camel_internet_address_get_type()));
-	return new;
-}
-
-/**
- * camel_internet_address_add:
- * @a: internet address object
- * @name: 
- * @address: 
- * 
- * Add a new internet address to the address object.
- * 
- * Return value: Index of added entry.
- **/
-int
-camel_internet_address_add	(CamelInternetAddress *a, const char *name, const char *address)
-{
-	struct _address *new;
-	int index;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));
-
-	new = g_malloc(sizeof(*new));
-	new->name = g_strdup(name);
-	new->address = g_strdup(address);
-	index = ((CamelAddress *)a)->addresses->len;
-	g_ptr_array_add(((CamelAddress *)a)->addresses, new);
-
-	return index;
-}
-
-/**
- * camel_internet_address_get:
- * @a: internet address object
- * @index: address's array index
- * @namep: Holder for the returned name, or NULL, if not required.
- * @addressp: Holder for the returned address, or NULL, if not required.
- * 
- * Get the address at @index.
- * 
- * Return value: TRUE if such an address exists, or FALSE otherwise.
- **/
-gboolean
-camel_internet_address_get	(const CamelInternetAddress *a, int index, const char **namep, const char **addressp)
-{
-	struct _address *addr;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));
-
-	if (index < 0 || index >= ((CamelAddress *)a)->addresses->len)
-		return FALSE;
-
-	addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, index);
-	if (namep)
-		*namep = addr->name;
-	if (addressp)
-		*addressp = addr->address;
-	return TRUE;
-}
-
-/**
- * camel_internet_address_find_name:
- * @a: 
- * @name: 
- * @addressp: Holder for address part, or NULL, if not required.
- * 
- * Find address by real name.
- * 
- * Return value: The index of the address matching the name, or -1
- * if no match was found.
- **/
-int
-camel_internet_address_find_name(CamelInternetAddress *a, const char *name, const char **addressp)
-{
-	struct _address *addr;
-	int i, len;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));
-
-	len = ((CamelAddress *)a)->addresses->len;
-	for (i=0;i<len;i++) {
-		addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, i );
-		if (!strcmp(addr->name, name)) {
-			if (addressp)
-				*addressp = addr->address;
-			return i;
-		}
-	}
-	return -1;
-}
-
-/**
- * camel_internet_address_find_address:
- * @a: 
- * @address: 
- * @namep: Return for the matching name, or NULL, if not required.
- * 
- * Find an address by address.
- * 
- * Return value: The index of the address, or -1 if not found.
- **/
-int
-camel_internet_address_find_address(CamelInternetAddress *a, const char *address, const char **namep)
-{
-	struct _address *addr;
-	int i, len;
-
-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));
-
-	len = ((CamelAddress *)a)->addresses->len;
-	for (i=0;i<len;i++) {
-		addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, i );
-		if (!strcmp(addr->address, address)) {
-			if (namep)
-				*namep = addr->name;
-			return i;
-		}
-	}
-	return -1;
-}
-
-/**
- * camel_internet_address_encode_address:
- * @len: The encoded length so far, of this line
- * @name: 
- * @addr: 
- * 
- * Encode a single address ready for internet usage.  Header folding
- * as per rfc 822 is also performed, based on the length in len.
- * 
- * Return value: The encoded address.
- **/
-char *
-camel_internet_address_encode_address(int *inlen, const char *real, const char *addr)
-{
-	char *name = header_encode_phrase(real);
-	char *ret = NULL, *addra = NULL;
-	int len = *inlen;
-	GString *out = g_string_new("");
-
-	g_assert(addr);
-
-	if (name && name[0]) {
-		if (strlen(name) + len > CAMEL_FOLD_SIZE) {
-			char *folded = header_fold(name, len);
-			char *last;
-			g_string_append(out, folded);
-			g_free(folded);
-			last = strrchr(out->str, '\n');
-			if (last)
-				len = last-(out->str+out->len);
-			else
-				len = out->len;
-		} else {
-			g_string_append(out, name);
-			len += strlen(name);
-		}
-		addr = addra = g_strdup_printf("<%s>", addr);
-	}
-
-	/* NOTE: Strictly speaking, we could and should split the
-	 * internal address up if we need to, on atom or specials
-	 * boundaries - however, to aid interoperability with mailers
-	 * that will probably not handle this case, we will just move
-	 * the whole address to its own line */
-	if (strlen(addr) + len > CAMEL_FOLD_SIZE) {
-		g_string_append(out, "\n\t");
-		g_string_append(out, addr);
-		len = strlen(addr)+1;
-	} else {
-		g_string_append(out, addr);
-		len += strlen(addr);
-	}
-
-	*inlen = len;
-#if 0
-	if (name && name[0])
-		ret = g_strdup_printf("%s <%s>", name, addr);
-	else
-		ret = g_strdup_printf("%s", addr);
-#endif
-	g_free(name);
-	g_free(addra);
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-
-	return ret;
-}
-
-/**
- * camel_internet_address_format_address:
- * @name: A name, quotes may be stripped from it.
- * @addr: Assumes a valid rfc822 email address.
- * 
- * Function to format a single address, suitable for display.
- * 
- * Return value: 
- **/
-char *
-camel_internet_address_format_address(const char *name, const char *addr)
-{
-	char *ret = NULL;
-
-	g_assert(addr);
-
-	if (name && name[0]) {
-		const char *p = name;
-		char *o, c;
-
-		while ((c = *p++)) {
-			if (c == '\"' || c == ',') {
-				o = ret = g_malloc(strlen(name)+3+strlen(addr)+3 + 1);
-				p = name;
-				*o++ = '\"';
-				while ((c = *p++))
-					if (c != '\"')
-						*o++ = c;
-				*o++ = '\"';
-				sprintf(o, " <%s>", addr);
-				d(printf("encoded '%s' => '%s'\n", name, ret));
-				return ret;
-			}
-		}
-		ret = g_strdup_printf("%s <%s>", name, addr);
-	} else
-		ret = g_strdup(addr);
-
-	return ret;
-}
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
deleted file mode 100644
index 7afd74fad9..0000000000
--- a/camel/camel-internet-address.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_INTERNET_ADDRESS_H
-#define _CAMEL_INTERNET_ADDRESS_H
-
-#include <camel/camel-address.h>
-
-#define CAMEL_INTERNET_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)
-#define CAMEL_INTERNET_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass)
-#define CAMEL_IS_INTERNET_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_internet_address_get_type ())
-
-typedef struct _CamelInternetAddressClass CamelInternetAddressClass;
-
-struct _CamelInternetAddress {
-	CamelAddress parent;
-
-	struct _CamelInternetAddressPrivate *priv;
-};
-
-struct _CamelInternetAddressClass {
-	CamelAddressClass parent_class;
-};
-
-guint			camel_internet_address_get_type	(void);
-CamelInternetAddress   *camel_internet_address_new	(void);
-
-int			camel_internet_address_add	(CamelInternetAddress *, const char *, const char *);
-gboolean		camel_internet_address_get	(const CamelInternetAddress *, int, const char **, const char **);
-
-int			camel_internet_address_find_name(CamelInternetAddress *, const char *, const char **);
-int			camel_internet_address_find_address(CamelInternetAddress *, const char *, const char **);
-
-/* utility functions, for network/display formatting */
-char *			camel_internet_address_encode_address(int *len, const char *name, const char *addr);
-char *			camel_internet_address_format_address(const char *real, const char *addr);
-
-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
deleted file mode 100644
index f1a43a3543..0000000000
--- a/camel/camel-lock.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <time.h>
-
-#ifdef USE_DOT
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#ifdef USE_FCNTL
-#include <unistd.h>
-#include <fcntl.h>
-#endif
-
-#ifdef USE_FLOCK
-#include <sys/file.h>
-#endif
-
-#include "camel-lock.h"
-
-/* dunno where this fucking thing is got from */
-#define _(x) (x)
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-/**
- * camel_lock_dot:
- * @path: 
- * @ex: 
- * 
- * Create an exclusive lock using .lock semantics.
- * All locks are equivalent to write locks (exclusive).
- * 
- * Return value: -1 on error, sets @ex appropriately.
- **/
-int
-camel_lock_dot(const char *path, CamelException *ex)
-{
-#ifdef USE_DOT
-	char *locktmp, *lock;
-	int retry = 0;
-	int fdtmp;
-	struct stat st;
-
-	/* TODO: Is there a reliable way to refresh the lock, if we're still busy with it?
-	   Does it matter?  We will normally also use fcntl too ... */
-
-	/* use alloca, save cleaning up afterwards */
-	lock = alloca(strlen(path) + strlen(".lock") + 1);
-	sprintf(lock, "%s.lock", path);
-	locktmp = alloca(strlen(path) + strlen("XXXXXX") + 1);
-
-#ifndef HAVE_MKSTEMP
-	sprintf(locktmp, "%sXXXXXX", path);
-	if (mktemp(locktmp) == NULL) {
-		/* well, this is really only a programatic error */
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));
-		return -1;
-	}
-#endif
-
-	while (retry < CAMEL_LOCK_DOT_RETRY) {
-
-		d(printf("trying to lock '%s', attempt %d\n", lock, retry));
-
-		if (retry > 0)
-			sleep(CAMEL_LOCK_DOT_DELAY);
-
-#ifdef HAVE_MKSTEMP
-		sprintf(locktmp, "%sXXXXXX", path);
-		fdtmp = mkstemp(locktmp);
-#else
-		fdtmp = open(locktmp, O_RDWR|O_CREAT|O_EXCL, 0600);
-#endif
-		if (fdtmp == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));
-			return -1;
-		}
-		close(fdtmp);
-
-		/* apparently return code from link can be unreliable for nfs (see link(2)), so we ignore it */
-		link(locktmp, lock);
-
-		/* but we check stat instead (again, see link(2)) */
-		if (stat(locktmp, &st) == -1) {
-			d(printf("Out lock file %s vanished!?\n", locktmp));
-
-			/* well that was unexpected, try cleanup/retry */
-			unlink(locktmp);
-			unlink(lock);
-		} else {
-			d(printf("tmp lock created, link count is %d\n", st.st_nlink));
-
-			unlink(locktmp);
-
-			/* if we had 2 links, we have created the .lock, return ok, otherwise we need to keep trying */
-			if (st.st_nlink == 2)
-				return 0;
-		}
-
-		/* check for stale lock, kill it */
-		if (stat(lock, &st) == 0) {
-			time_t now = time(0);
-			(printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));
-			if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
-				d(printf("Removing it now\n"));
-				unlink(lock);
-			}
-		}
-
-		retry++;
-	}
-
-	d(printf("failed to get lock after %d retries\n", retry));
-
-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Timed out trying to get lock file on %s. Try again later."), path);
-	return -1;
-#else /* ! USE_DOT */
-	return 0;
-#endif
-}
-
-/**
- * camel_unlock_dot:
- * @path: 
- * 
- * Attempt to unlock a .lock lock.
- **/
-void
-camel_unlock_dot(const char *path)
-{
-#ifdef USE_DOT
-	char *lock;
-
-	lock = alloca(strlen(path) + strlen(".lock") + 1);
-	sprintf(lock, "%s.lock", path);
-	d(printf("unlocking %s\n", lock));
-	(void)unlink(lock);
-#endif
-}
-
-/**
- * camel_lock_fcntl:
- * @fd: 
- * @type: 
- * @ex: 
- * 
- * Create a lock using fcntl(2).
- *
- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,
- * to create exclusive or shared read locks
- * 
- * Return value: -1 on error.
- **/
-int
-camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex)
-{
-#ifdef USE_FCNTL
-	struct flock lock;
-
-	d(printf("fcntl locking %d\n", fd));
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = type==CAMEL_LOCK_READ?F_RDLCK:F_WRLCK;
-	if (fcntl(fd, F_SETLK, &lock) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using fcntl(2): %s"), strerror(errno));
-		return -1;
-	}
-#endif
-	return 0;
-}
-
-/**
- * camel_unlock_fcntl:
- * @fd: 
- * 
- * Unlock an fcntl lock.
- **/
-void
-camel_unlock_fcntl(int fd)
-{
-#ifdef USE_FCNTL
-	struct flock lock;
-
-	d(printf("fcntl unlocking %d\n", fd));
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = F_UNLCK;
-	fcntl(fd, F_SETLK, &lock);
-#endif
-}
-
-/**
- * camel_lock_flock:
- * @fd: 
- * @type: 
- * @ex: 
- * 
- * Create a lock using flock(2).
- * 
- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,
- * to create exclusive or shared read locks
- *
- * Return value: -1 on error.
- **/
-int
-camel_lock_flock(int fd, CamelLockType type, CamelException *ex)
-{
-#ifdef USE_FLOCK
-	int op;
-
-	d(printf("flock locking %d\n", fd));
-
-	if (type == CAMEL_LOCK_READ)
-		op = LOCK_SH|LOCK_NB;
-	else
-		op = LOCK_EX|LOCK_NB;
-
-	if (flock(fd, op) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using flock(2): %s"), strerror(errno));
-		return -1;
-	}
-#endif
-	return 0;
-}
-
-/**
- * camel_unlock_flock:
- * @fd: 
- * 
- * Unlock an flock lock.
- **/
-void
-camel_unlock_flock(int fd)
-{
-#ifdef USE_FLOCK
-	d(printf("flock unlocking %d\n", fd));
-
-	(void)flock(fd, LOCK_UN);
-#endif
-}
-
-/**
- * camel_lock_folder:
- * @path: Path to the file to lock (used for .locking only).
- * @fd: Open file descriptor of the right type to lock.
- * @type: Type of lock, CAMEL_LOCK_READ or CAMEL_LOCK_WRITE.
- * @ex: 
- * 
- * Attempt to lock a folder, multiple attempts will be made using all
- * locking strategies available.
- * 
- * Return value: -1 on error, @ex will describe the locking system that failed.
- **/
-int
-camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex)
-{
-	int retry = 0;
-
-	while (retry < CAMEL_LOCK_RETRY) {
-		if (retry > 0)
-			sleep(CAMEL_LOCK_DELAY);
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd, type, ex) == 0) {
-			if (camel_lock_flock(fd, type, ex) == 0) {
-				if (camel_lock_dot(path, ex) == 0)
-					return 0;
-				camel_unlock_flock(fd);
-			}
-			camel_unlock_fcntl(fd);
-		}
-		retry++;
-	}
-
-	return -1;
-}
-
-/**
- * camel_unlock_folder:
- * @path: Filename of folder.
- * @fd: Open descrptor on which locks were placed.
- * 
- * Free a lock on a folder.
- **/
-void
-camel_unlock_folder(const char *path, int fd)
-{
-	camel_unlock_dot(path);
-	camel_unlock_flock(fd);
-	camel_unlock_fcntl(fd);
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	CamelException *ex;
-	int fd1, fd2;
-
-	ex = camel_exception_new();
-
-#if 0
-	if (camel_lock_dot("mylock", ex) == 0) {
-		if (camel_lock_dot("mylock", ex) == 0) {
-			printf("Got lock twice?\n");
-		} else {
-			printf("failed to get lock 2: %s\n", camel_exception_get_description(ex));
-		}
-		camel_unlock_dot("mylock");
-	} else {
-		printf("failed to get lock 1: %s\n", camel_exception_get_description(ex));
-	}
-
-	camel_exception_clear(ex);
-#endif
-
-	fd1 = open("mylock", O_RDWR);
-	fd2 = open("mylock", O_RDWR);
-
-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_WRITE, ex) == 0) {
-		printf("got fcntl write lock once\n");
-		sleep(5);
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {
-			printf("got fcntl write lock twice!\n");
-		} else {
-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {
-			printf("got fcntl read lock as well?\n");
-			camel_unlock_fcntl(fd2);
-		} else {
-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-		camel_unlock_fcntl(fd1);
-	} else {
-		printf("failed to get write lock at all: %s\n", camel_exception_get_description(ex));
-	}
-
-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_READ, ex) == 0) {
-		printf("got fcntl read lock once\n");
-		sleep(5);
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {
-			printf("got fcntl write lock too?!\n");
-		} else {
-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-
-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {
-			printf("got fcntl read lock twice\n");
-			camel_unlock_fcntl(fd2);
-		} else {
-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));
-		}
-
-		camel_exception_clear(ex);
-		camel_unlock_fcntl(fd1);
-	}
-
-	close(fd1);
-	close(fd2);
-
-	return 0;
-}
-#endif
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
deleted file mode 100644
index 37da6ea135..0000000000
--- a/camel/camel-lock.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _CAMEL_LOCK_H
-#define _CAMEL_LOCK_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-exception.h>
-
-/* for .lock locking, retry, delay and stale counts */
-#define CAMEL_LOCK_DOT_RETRY (5) /* number of times to retry lock */
-#define CAMEL_LOCK_DOT_DELAY (2) /* delay between locking retries */
-#define CAMEL_LOCK_DOT_STALE (60) /* seconds before a lock becomes stale */
-
-/* for locking folders, retry/interretry delay */
-#define CAMEL_LOCK_RETRY (5) /* number of times to retry lock */
-#define CAMEL_LOCK_DELAY (2) /* delay between locking retries */
-
-typedef enum {
-	CAMEL_LOCK_READ,
-	CAMEL_LOCK_WRITE,
-} CamelLockType;
-
-/* specific locking strategies */
-int camel_lock_dot(const char *path, CamelException *ex);
-int camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex);
-int camel_lock_flock(int fd, CamelLockType type, CamelException *ex);
-
-void camel_unlock_dot(const char *path);
-void camel_unlock_fcntl(int fd);
-void camel_unlock_flock(int fd);
-
-/* lock a folder in a standard way */
-int camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex);
-void camel_unlock_folder(const char *path, int fd);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !_CAMEL_LOCK_H */
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
deleted file mode 100644
index 1854cf1891..0000000000
--- a/camel/camel-medium.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* camelMedium.c : Abstract class for a medium
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "camel-medium.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-
-#define d(x)
-
-static CamelDataWrapperClass *parent_class = NULL;
-
-/* Returns the class for a CamelMedium */
-#define CM_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void add_header (CamelMedium *medium, const gchar *header_name,
-			const void *header_value);
-static void set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-static void remove_header (CamelMedium *medium, const gchar *header_name);
-static const void *get_header (CamelMedium *medium, const gchar *header_name);
-
-static CamelDataWrapper *get_content_object (CamelMedium *medium);
-static void set_content_object (CamelMedium *medium,
-				CamelDataWrapper *content);
-
-static void
-camel_medium_class_init (CamelMediumClass *camel_medium_class)
-{
-	/*
-	 * CamelDataWrapperClass *camel_data_wrapper_class =
-	 *	CAMEL_DATA_WRAPPER_CLASS (camel_medium_class);
-	 */
-
-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));
-
-	/* virtual method definition */
-	camel_medium_class->add_header = add_header;
-	camel_medium_class->set_header = set_header;
-	camel_medium_class->remove_header = remove_header;
-	camel_medium_class->get_header = get_header;
-
-	camel_medium_class->set_content_object = set_content_object;
-	camel_medium_class->get_content_object = get_content_object;
-}
-
-static void
-camel_medium_init (gpointer object, gpointer klass)
-{
-	CamelMedium *camel_medium = CAMEL_MEDIUM (object);
-
-	camel_medium->content = NULL;
-}
-
-static void
-camel_medium_finalize (CamelObject *object)
-{
-	CamelMedium *medium = CAMEL_MEDIUM (object);
-
-	if (medium->content)
-		camel_object_unref (CAMEL_OBJECT (medium->content));
-}
-
-
-CamelType
-camel_medium_get_type (void)
-{
-	static CamelType camel_medium_type = CAMEL_INVALID_TYPE;
-
-	if (camel_medium_type == CAMEL_INVALID_TYPE) {
-		camel_medium_type = camel_type_register (CAMEL_DATA_WRAPPER_TYPE, "medium",
-							 sizeof (CamelMedium),
-							 sizeof (CamelMediumClass),
-							 (CamelObjectClassInitFunc) camel_medium_class_init,
-							 NULL,
-							 (CamelObjectInitFunc) camel_medium_init,
-							 (CamelObjectFinalizeFunc) camel_medium_finalize);
-	}
-
-	return camel_medium_type;
-}
-
-static void
-add_header (CamelMedium *medium, const gchar *header_name,
-	    const void *header_value)
-{
-	g_warning("No %s::add_header implemented, adding %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_add_header:
- * @medium: a CamelMedium
- * @header_name: name of the header
- * @header_value: value of the header
- *
- * Adds a header to a medium.
- *
- * FIXME: Where does it add it? We need to be able to prepend and
- * append headers, and also be able to insert them relative to other
- * headers.   No we dont, order isn't important! Z
- **/
-void
-camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-	g_return_if_fail (header_value != NULL);
-
-	CM_CLASS (medium)->add_header(medium, header_name, header_value);
-}
-
-static void
-set_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	g_warning("No %s::set_header implemented, setting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_set_header:
- * @medium: a CamelMedium
- * @header_name: name of the header
- * @header_value: value of the header
- *
- * Sets the value of a header.  Any other occurances of the header
- * will be removed.  Setting a %NULL header can be used to remove
- * the header also.
- **/
-void
-camel_medium_set_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-
-	if (header_value == NULL)
-		CM_CLASS(medium)->remove_header(medium, header_name);
-	else
-		CM_CLASS(medium)->set_header(medium, header_name, header_value);
-}
-
-static void
-remove_header(CamelMedium *medium, const char *header_name)
-{
-	g_warning("No %s::remove_header implemented, removing %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_remove_header:
- * @medium: a medium
- * @header_name: the name of the header
- *
- * Removes the named header from the medium.  All occurances of the
- * header are removed.
- **/
-void
-camel_medium_remove_header(CamelMedium *medium, const char *header_name)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-
-	CM_CLASS(medium)->remove_header(medium, header_name);
-}
-
-
-static const void *
-get_header(CamelMedium *medium, const char *header_name)
-{
-	g_warning("No %s::get_header implemented, getting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-	return NULL;
-}
-
-/**
- * camel_medium_get_header:
- * @medium: a medium
- * @header_name: the name of the header
- *
- * Returns the value of the named header in the medium, or %NULL if
- * it is unset. The caller should not modify or free the data.
- *
- * FIXME: What if the header occurs more than once?
- *
- * Return value: the value of the named header, or %NULL
- **/
-const void *
-camel_medium_get_header(CamelMedium *medium, const char *header_name)
-{
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);
-	g_return_val_if_fail (header_name != NULL, NULL);
-
-#ifndef NO_WARNINGS
-#warning No way to get multi-valued headers?
-#endif
-
-	return CM_CLASS (medium)->get_header (medium, header_name);
-}
-
-
-static CamelDataWrapper *
-get_content_object(CamelMedium *medium)
-{
-	return medium->content;
-}
-
-/**
- * camel_medium_get_content_object:
- * @medium: a medium
- *
- * Returns a data wrapper that represents the content of the medium,
- * without its headers.
- *
- * Return value: the medium's content object.
- **/
-CamelDataWrapper *
-camel_medium_get_content_object (CamelMedium *medium)
-{
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);
-
-	return CM_CLASS (medium)->get_content_object (medium);
-}
-
-
-static void
-set_content_object (CamelMedium *medium, CamelDataWrapper *content)
-{
-	if (medium->content)
-		camel_object_unref (CAMEL_OBJECT (medium->content));
-	camel_object_ref (CAMEL_OBJECT (content));
-	medium->content = content;
-}
-
-/**
- * camel_medium_set_content_object:
- * @medium: a medium
- * @content: a data wrapper representing the medium's content
- *
- * Sets the content of @medium to be @content.
- **/
-void
-camel_medium_set_content_object (CamelMedium *medium,
-				 CamelDataWrapper *content)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (content));
-
-	CM_CLASS (medium)->set_content_object (medium, content);
-}
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
deleted file mode 100644
index 9ce548ba1d..0000000000
--- a/camel/camel-medium.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-medium.h : class for a medium object */
-
-/*
- *
- * Authors:  Bertrand Guiheneuf <bertrand@helixcode.com>
- *	     Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MEDIUM_H
-#define CAMEL_MEDIUM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-
-#define CAMEL_MEDIUM_TYPE     (camel_medium_get_type ())
-#define CAMEL_MEDIUM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))
-#define CAMEL_MEDIUM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))
-#define CAMEL_IS_MEDIUM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))
-
-
-struct _CamelMedium
-{
-	CamelDataWrapper parent_object;
-
-	/* The content of the medium, as opposed to our parent
-	 * CamelDataWrapper, which wraps both the headers and the
-	 * content.
-	 */
-	CamelDataWrapper *content;
-
-};
-
-
-
-typedef struct {
-	CamelDataWrapperClass parent_class;
-
-	/* Virtual methods */
-	void  (*add_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
-	void  (*set_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
-	void  (*remove_header) (CamelMedium *medium, const gchar *header_name);
-	const void * (*get_header) (CamelMedium *medium,  const gchar *header_name);
-
-	CamelDataWrapper * (*get_content_object) (CamelMedium *medium);
-	void (*set_content_object) (CamelMedium *medium, CamelDataWrapper *content);
-
-} CamelMediumClass;
-
-/* Standard Camel function */
-CamelType camel_medium_get_type (void);
-
-/* Header get/set interface */
-void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-void camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-void camel_medium_remove_header (CamelMedium *medium, const gchar *header_name);
-const void *camel_medium_get_header (CamelMedium *medium, const gchar *header_name);
-
-/* accessor methods */
-CamelDataWrapper *camel_medium_get_content_object (CamelMedium *medium);
-void camel_medium_set_content_object (CamelMedium *medium,
-				      CamelDataWrapper *content);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MEDIUM_H */
-
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
deleted file mode 100644
index 17e667c5ae..0000000000
--- a/camel/camel-mime-filter-basic.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-basic.h"
-
-#include "camel-mime-utils.h"
-
-static void reset(CamelMimeFilter *mf);
-static void complete(CamelMimeFilter *mf, char *in, size_t len, 
-		     size_t prespace, char **out, 
-		     size_t *outlen, size_t *outprespace);
-static void filter(CamelMimeFilter *mf, char *in, size_t len, 
-		   size_t prespace, char **out, 
-		   size_t *outlen, size_t *outprespace);
-
-static void camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass);
-static void camel_mime_filter_basic_init       (CamelMimeFilterBasic *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_basic_parent;
-
-static void
-camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_basic_parent = CAMEL_MIME_FILTER_CLASS(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_basic_init (CamelMimeFilterBasic *obj)
-{
-	obj->state = 0;
-	obj->save = 0;
-}
-
-
-CamelType
-camel_mime_filter_basic_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBasic",
-					    sizeof (CamelMimeFilterBasic),
-					    sizeof (CamelMimeFilterBasicClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_basic_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_basic_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/* should this 'flush' outstanding state/data bytes? */
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		f->state = -1;
-		break;
-	default:
-		f->state = 0;
-	}
-	f->save = 0;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-	int newlen;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-		/* wont go to more than 2x size (overly conservative) */
-		camel_mime_filter_set_size(mf, len*2+6, FALSE);
-		newlen = base64_encode_close(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*2+6);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is definetly more than needed ... */
-		camel_mime_filter_set_size(mf, len*4+4, FALSE);
-		newlen = quoted_encode_close(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*4+4);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-		/* output can't possibly exceed the input size */
- 		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len);
-		break;
-	default:
-		g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
-		goto donothing;
-	}
-
-	*out = mf->outbuf;
-	*outlen = newlen;
-	*outprespace = mf->outpre;
-
-	return;
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/* here we do all of the basic mime filtering */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-	int newlen;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-		/* wont go to more than 2x size (overly conservative) */
-		camel_mime_filter_set_size(mf, len*2+6, FALSE);
-		newlen = base64_encode_step(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*2+6);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is overly conservative, but will do */
-		camel_mime_filter_set_size(mf, len*4+4, FALSE);
-		newlen = quoted_encode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len*4+4);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		g_assert(newlen <= len);
-		break;
-	default:
-		g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
-		goto donothing;
-	}
-
-	*out = mf->outbuf;
-	*outlen = newlen;
-	*outprespace = mf->outpre;
-
-	return;
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/**
- * camel_mime_filter_basic_new:
- *
- * Create a new CamelMimeFilterBasic object.
- * 
- * Return value: A new CamelMimeFilterBasic widget.
- **/
-CamelMimeFilterBasic *
-camel_mime_filter_basic_new (void)
-{
-	CamelMimeFilterBasic *new = CAMEL_MIME_FILTER_BASIC ( camel_object_new (camel_mime_filter_basic_get_type ()));
-	return new;
-}
-
-CamelMimeFilterBasic *
-camel_mime_filter_basic_new_type(CamelMimeFilterBasicType type)
-{
-	CamelMimeFilterBasic *new;
-
-	switch (type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		new = camel_mime_filter_basic_new();
-		new->type = type;
-		break;
-	default:
-		g_warning("Invalid type of CamelMimeFilterBasic requested: %d", type);
-		new = NULL;
-		break;
-	}
-	camel_mime_filter_reset((CamelMimeFilter *)new);
-	return new;
-}
-
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
deleted file mode 100644
index f11b7da479..0000000000
--- a/camel/camel-mime-filter-basic.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_BASIC_H
-#define _CAMEL_MIME_FILTER_BASIC_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_BASIC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)
-#define CAMEL_MIME_FILTER_BASIC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass)
-#define CAMEL_IS_MIME_FILTER_BASIC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_basic_get_type ())
-
-typedef struct _CamelMimeFilterBasicClass CamelMimeFilterBasicClass;
-
-typedef enum {
-	CAMEL_MIME_FILTER_BASIC_BASE64_ENC = 1,
-	CAMEL_MIME_FILTER_BASIC_BASE64_DEC,
-	CAMEL_MIME_FILTER_BASIC_QP_ENC,
-	CAMEL_MIME_FILTER_BASIC_QP_DEC,
-} CamelMimeFilterBasicType;
-
-struct _CamelMimeFilterBasic {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterBasicPrivate *priv;
-
-	CamelMimeFilterBasicType type;
-
-	int state;
-	int save;
-};
-
-struct _CamelMimeFilterBasicClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_basic_get_type	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new_type	(CamelMimeFilterBasicType type);
-
-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
deleted file mode 100644
index 18ee7039f0..0000000000
--- a/camel/camel-mime-filter-bestenc.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-bestenc.h"
-
-#include <string.h>
-
-static void camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass);
-static void camel_mime_filter_bestenc_init       (CamelMimeFilter *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_bestenc_parent;
-
-CamelType
-camel_mime_filter_bestenc_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBestenc",
-					    sizeof (CamelMimeFilterBestenc),
-					    sizeof (CamelMimeFilterBestencClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_bestenc_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_bestenc_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-
-	f->count0 = 0;
-	f->count8 = 0;
-	f->countline = 0;
-	f->total = 0;
-	f->lastc = ~0;
-	f->crlfnoorder = FALSE;
-	f->fromcount = 0;
-	f->hadfrom = FALSE;
-	f->startofline = TRUE;
-
-	camel_charset_init(&f->charset);
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-	register unsigned char *p, *pend;
-
-	if (len == 0)
-		goto donothing;
-
-	if (f->flags & CAMEL_BESTENC_GET_ENCODING) {
-		register unsigned int /* hopefully reg's are assinged in the order they appear? */
-			c,
-			lastc=f->lastc, 
-			countline=f->countline,
-			count0=f->count0,
-			count8 = f->count8;
-
-		/* Check ^From  lines first call, or have the start of a new line waiting? */
-		if ((f->flags & CAMEL_BESTENC_NO_FROM) && !f->hadfrom
-		    && (f->fromcount > 0 || f->startofline)) {
-			if (f->fromcount + len >=5) {
-				memcpy(&f->fromsave[f->fromcount], in, 5-f->fromcount);
-				f->hadfrom = strncmp(f->fromsave, "From ", 5) == 0;
-				f->fromcount = 0;
-			} else {
-				memcpy(&f->fromsave[f->fromcount], in, len);
-				f->fromcount += len;
-			}
-		}
-
-		f->startofline = FALSE;
-
-		/* See rfc2045 section 2 for definitions of 7bit/8bit/binary */
-		p = in;
-		pend = p + len;
-		while (p<pend) {
-			c = *p++;
-			/* check for 8 bit characters */
-			if (c & 0x80)
-				count8++;
-
-			/* check for nul's */
-			if (c == 0)
-				count0++;
-
-			/* check for wild '\r's in a unix format stream */
-			if (c == '\r' && (f->flags & CAMEL_BESTENC_LF_IS_CRLF)) {
-				f->crlfnoorder = TRUE;
-			}
-
-			/* check for end of line */
-			if (c == '\n') {
-				/* check for wild '\n's in canonical format stream */
-				if (lastc == '\r' || (f->flags & CAMEL_BESTENC_LF_IS_CRLF)) {
-					if (countline > f->maxline)
-						f->maxline = countline;
-					countline = 0;
-
-					/* Check for "^From " lines */
-					if ((f->flags & CAMEL_BESTENC_NO_FROM) && !f->hadfrom) {
-						if (pend-p >= 5) {
-							f->hadfrom = strncmp(p, "From ", 5) == 0;
-						} else if (pend-p == 0) {
-							f->startofline = TRUE;
-						} else {
-							f->fromcount = pend-p;
-							memcpy(f->fromsave, p, pend-p);
-						}
-					}
-				} else {
-					f->crlfnoorder = TRUE;
-				}
-			} else {
-				countline++;
-			}
-			lastc = c;
-		}
-		f->count8 = count8;
-		f->count0 = count0;
-		f->countline = countline;
-		f->lastc = lastc;
-	}
-
-	f->total += len;
-
-	if (f->flags & CAMEL_BESTENC_GET_CHARSET)
-		camel_charset_step(&f->charset, in, len);
-
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;
-
-	filter(mf, in, len, prespace, out, outlen, outprespace);
-
-	if (f->countline > f->maxline)
-		f->maxline = f->countline;
-	f->countline = 0;
-}
-
-static void
-camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-
-	camel_mime_filter_bestenc_parent = (CamelMimeFilterClass *)(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_bestenc_init (CamelMimeFilter *f)
-{
-	reset(f);
-}
-
-/**
- * camel_mime_filter_bestenc_new:
- * @flags: A bitmask of data required.
- *
- * Create a new CamelMimeFilterBestenc object. 
- * 
- * Return value:
- **/
-CamelMimeFilterBestenc *
-camel_mime_filter_bestenc_new (unsigned int flags)
-{
-	CamelMimeFilterBestenc *new = (CamelMimeFilterBestenc *)camel_object_new(camel_mime_filter_bestenc_get_type());
-	new->flags = flags;
-	return new;
-}
-
-/**
- * camel_mime_filter_bestenc_get_best_encoding:
- * @f: 
- * @required: maximum level of output encoding allowed.
- * 
- * Return the best encoding, given specific constraints, that can be used to
- * encode a stream of bytes.
- * 
- * Return value: 
- **/
-CamelMimePartEncodingType
-camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required)
-{
-	CamelMimePartEncodingType bestenc;
-
-#if 0
-	printf("count0 = %d, count8 = %d, total = %d\n", f->count0, f->count8, f->total);
-	printf("maxline = %d, crlfnoorder = %s\n", f->maxline, f->crlfnoorder?"TRUE":"FALSE");
-	printf(" %d%% require encoding?\n", (f->count0+f->count8)*100 / f->total);
-#endif
-
-	/* if we're not allowed to have From lines and we had one, use an encoding
-	   that will never let it show.  Unfortunately only base64 can at present,
-	   although qp could be modified to allow it too */
-	if ((f->flags & CAMEL_BESTENC_NO_FROM) && f->hadfrom)
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-
-	/* if we need to encode, see how we do it */
-	if (required == CAMEL_BESTENC_BINARY)
-		bestenc = CAMEL_MIME_PART_ENCODING_BINARY;
-	else if (f->count8 + f->count0 >= (f->total*17/100))
-		bestenc = CAMEL_MIME_PART_ENCODING_BASE64;
-	else
-		bestenc = CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	
-	/* if we have nocrlf order, or long lines, we need to encode always */
-	if (f->crlfnoorder || f->maxline >= 998)
-		return bestenc;
-
-	/* if we have no 8 bit chars or nul's, we can just use 7 bit */
-	if (f->count8 + f->count0 == 0)
-		return CAMEL_MIME_PART_ENCODING_7BIT;
-
-	/* otherwise, we see if we can use 8 bit, or not */
-	switch(required) {
-	case CAMEL_BESTENC_7BIT:
-		return bestenc;
-	case CAMEL_BESTENC_8BIT:
-	case CAMEL_BESTENC_BINARY:
-		if (f->count0 == 0)
-			return CAMEL_MIME_PART_ENCODING_8BIT;
-		else
-			return bestenc;
-	}
-
-	return CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-/**
- * camel_mime_filter_bestenc_get_best_charset:
- * @f: 
- * 
- * Gets the best charset that can be used to contain this content.
- * 
- * Return value: 
- **/
-const char *
-camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f)
-{
-	return camel_charset_best_name(&f->charset);
-}
-
-/**
- * camel_mime_filter_bestenc_set_flags:
- * @f: 
- * @flags: 
- * 
- * Set the flags for subsequent operations.
- **/
-void
-camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags)
-{
-	f->flags = flags;
-}
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
deleted file mode 100644
index de8caec191..0000000000
--- a/camel/camel-mime-filter-bestenc.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_BESTENC_H
-#define _CAMEL_MIME_FILTER_BESTENC_H
-
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-charset-map.h>
-
-#define CAMEL_MIME_FILTER_BESTENC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestenc)
-#define CAMEL_MIME_FILTER_BESTENC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestencClass)
-#define CAMEL_IS_MIME_FILTER_BESTENC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_bestenc_get_type ())
-
-typedef struct _CamelMimeFilterBestencClass CamelMimeFilterBestencClass;
-
-enum _CamelBestencRequired {
-	CAMEL_BESTENC_GET_ENCODING = 1<<0,
-	CAMEL_BESTENC_GET_CHARSET = 1<<1,
-
-	/* do we treat 'lf' as if it were crlf? */
-	CAMEL_BESTENC_LF_IS_CRLF = 1<<8,
-	/* do we not allow "From " to appear at the start of a line in any part? */
-	CAMEL_BESTENC_NO_FROM = 1<<9,
-};
-typedef enum _CamelBestencRequired CamelBestencRequired;
-
-enum _CamelBestencEncoding {
-	CAMEL_BESTENC_7BIT,
-	CAMEL_BESTENC_8BIT,
-	CAMEL_BESTENC_BINARY,
-};
-typedef enum _CamelBestencEncoding CamelBestencEncoding;
-
-struct _CamelMimeFilterBestenc {
-	CamelMimeFilter parent;
-
-	unsigned int flags;	/* our creation flags, see above */
-
-	unsigned int count0;	/* count of NUL characters */
-	unsigned int count8;	/* count of 8 bit characters */
-	unsigned int total;	/* total characters read */
-
-	unsigned int lastc;	/* the last character read */
-	int crlfnoorder;	/* if crlf's occured where they shouldn't have */
-
-	int startofline;	/* are we at the start of a new line? */
-
-	int fromcount;
-	char fromsave[6];	/* save a few characters if we found an \nF near the end of the buffer */
-	int hadfrom;		/* did we encounter a "\nFrom " in the data? */
-
-	unsigned int countline;	/* current count of characters on a given line */
-	unsigned int maxline;	/* max length of any line */
-
-	CamelCharset charset;	/* used to determine the best charset to use */
-};
-
-struct _CamelMimeFilterBestencClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_bestenc_get_type	(void);
-CamelMimeFilterBestenc      *camel_mime_filter_bestenc_new	(unsigned int flags);
-
-
-CamelMimePartEncodingType	camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required);
-const char *		camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f);
-void 			camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags);
-
-#endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
deleted file mode 100644
index a45a318367..0000000000
--- a/camel/camel-mime-filter-charset.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include <iconv.h>
-
-#include <string.h>
-#include <errno.h>
-
-#include "camel-mime-filter-charset.h"
-
-#define d(x)
-
-static void camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass);
-static void camel_mime_filter_charset_init       (CamelMimeFilterCharset *obj);
-static void camel_mime_filter_charset_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_charset_parent;
-
-CamelType
-camel_mime_filter_charset_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterCharset",
-					    sizeof (CamelMimeFilterCharset),
-					    sizeof (CamelMimeFilterCharsetClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_charset_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_charset_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_charset_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_charset_finalize(CamelObject *o)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)o;
-
-	g_free(f->from);
-	g_free(f->to);
-	if (f->ic != (iconv_t)-1) {
-		iconv_close(f->ic);
-		f->ic = (iconv_t) -1;
-	}
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	char buf[16];
-	char *buffer;
-	int outlen = 16;
-
-	/* what happens with the output bytes if this resets the state? */
-	if (f->ic != (iconv_t) -1) {
-		buffer = buf;
-		iconv(f->ic, NULL, 0, &buffer, &outlen);
-	}
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	int converted;
-	char *inbuf;
-	char *outbuf;
-	int inlen, outlen;
-
-	if (f->ic == (iconv_t) -1) {
-		goto donothing;
-	}
-
-	/* FIXME: there's probably a safer way to size this ...? */
-	/* We could always resize if we run out of room in outbuf (but it'd be nice not
-	   to have to) */
-	camel_mime_filter_set_size(mf, len*5+16, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-
-	/* temporary fix to find another bug somewhere */
-	d(memset(outbuf, 0, outlen));
-
-	if (inlen>0) {
-		converted = iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-		if (converted == -1) {
-			if (errno != EINVAL) {
-				g_warning("error occured converting: %s", strerror(errno));
-				goto donothing;
-			}
-		}
-
-		if (inlen>0) {
-			g_warning("Output lost in character conversion, invalid sequence encountered?");
-		}
-	}
-
-	/* this 'resets' the output stream, returning back to the initial
-	   shift state for multishift charactersets */
-	converted = iconv(f->ic, NULL, 0, &outbuf, &outlen);
-	if (converted == -1) {
-		g_warning("Conversion failed to complete: %s", strerror(errno));
-	}
-
-	/* debugging assertion - check for NUL's in output */
-	d({
-		int i;
-		
-		for (i=0;i<(mf->outsize - outlen);i++) {
-			g_assert(mf->outbuf[i]);
-		}
-	});
-
-	*out = mf->outbuf;
-	*outlenptr = mf->outsize - outlen;
-	*outprespace = mf->outpre;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	int converted;
-	char *inbuf;
-	char *outbuf;
-	int inlen, outlen;
-
-	if (f->ic == (iconv_t) -1) {
-		goto donothing;
-	}
-
-	/* FIXME: there's probably a safer way to size this ...? */
-	camel_mime_filter_set_size(mf, len*5+16, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-	converted = iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-	if (converted == -1) {
-		if (errno != EINVAL) {
-			g_warning("error occured converting: %s", strerror(errno));
-			goto donothing;
-		}
-	}
-
-	/*
-	  NOTE: This assumes EINVAL only occurs because we ran out of
-	  bytes for a multibyte sequence, if not, we're in trouble.
-	*/
-
-	if (inlen>0) {
-		camel_mime_filter_backup(mf, inbuf, inlen);
-	}
-
-	*out = mf->outbuf;
-	*outlenptr = mf->outsize - outlen;
-	*outprespace = mf->outpre;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_charset_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)
-{
-	obj->ic = (iconv_t)-1;
-}
-
-/**
- * camel_mime_filter_charset_new:
- *
- * Create a new CamelMimeFilterCharset object.
- * 
- * Return value: A new CamelMimeFilterCharset widget.
- **/
-CamelMimeFilterCharset *
-camel_mime_filter_charset_new (void)
-{
-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( camel_object_new (camel_mime_filter_charset_get_type ()));
-	return new;
-}
-
-CamelMimeFilterCharset *
-camel_mime_filter_charset_new_convert(const char *from_charset, const char *to_charset)
-{
-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( camel_object_new (camel_mime_filter_charset_get_type ()));
-
-	new->ic = iconv_open(to_charset, from_charset);
-	if (new->ic == (iconv_t) -1) {
-		g_warning("Cannot create charset conversion from %s to %s: %s", from_charset, to_charset, strerror(errno));
-		camel_object_unref((CamelObject *)new);
-		new = NULL;
-	} else {
-		new->from = g_strdup(from_charset);
-		new->to = g_strdup(to_charset);
-	}
-	return new;
-}
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
deleted file mode 100644
index ba1586ca7a..0000000000
--- a/camel/camel-mime-filter-charset.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_CHARSET_H
-#define _CAMEL_MIME_FILTER_CHARSET_H
-
-#include <camel/camel-mime-filter.h>
-#include <unicode.h>
-
-#define CAMEL_MIME_FILTER_CHARSET(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)
-#define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)
-#define CAMEL_IS_MIME_FILTER_CHARSET(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_charset_get_type ())
-
-typedef struct _CamelMimeFilterCharsetClass CamelMimeFilterCharsetClass;
-
-struct _CamelMimeFilterCharset {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterCharsetPrivate *priv;
-
-	unicode_iconv_t ic;
-	char *from;
-	char *to;
-};
-
-struct _CamelMimeFilterCharsetClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_charset_get_type	(void);
-CamelMimeFilterCharset      *camel_mime_filter_charset_new	(void);
-
-CamelMimeFilterCharset      *camel_mime_filter_charset_new_convert	(const char *from_charset, const char *to_charset);
-
-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
deleted file mode 100644
index 71a3e8bace..0000000000
--- a/camel/camel-mime-filter-crlf.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code, Inc.
- *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-crlf.h"
-
-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-		    char **out, size_t *outlen, size_t *outprespace);
-static void complete (CamelMimeFilter *f, char *in, size_t len,
-		      size_t prespace, char **out, size_t *outlen,
-		      size_t *outprespace);
-static void reset (CamelMimeFilter *f);
-
-
-static void
-camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *klass)
-{
-	CamelMimeFilterClass *mime_filter_class =
-		(CamelMimeFilterClass *) klass;
-	
-	mime_filter_class->filter = filter;
-	mime_filter_class->complete = complete;
-	mime_filter_class->reset = reset;
-}
-
-CamelType
-camel_mime_filter_crlf_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterCRLF",
-					    sizeof (CamelMimeFilterCRLF),
-					    sizeof (CamelMimeFilterCRLFClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_crlf_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-
-	return type;
-}
-
-static void
-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;
-	gboolean do_dots;
-	char *p, *q;
-
-	do_dots = crlf->mode == CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS;
-
-	if (crlf->direction == CAMEL_MIME_FILTER_CRLF_ENCODE) {
-		camel_mime_filter_set_size (f, 3 * len, FALSE);
-
-		p = in;
-		q = f->outbuf;
-		while (p < in + len) {
-			if (*p == '\n')
-				*q++ = '\r';
-			else
-				if (do_dots && *(p - 1) == '\n' && *p == '.')
-					*q++ = '.';
-			*q++ = *p++;
-		}
-	} else {
-		camel_mime_filter_set_size (f, len, FALSE);
-
-		p = in;
-		q = f->outbuf;
-		while (p < in + len) {
-			if (*p == '\r') {
-				crlf->saw_cr = TRUE;
-			} else {
-				if (crlf->saw_cr) {
-					if (*p != '\n')
-						*q++ = '\r';
-					crlf->saw_cr = FALSE;
-				}
-				*q++ = *p;
-			}
-
-			if (do_dots) {
-				if (*p == '.' && *(p - 1) == '\n') {
-					crlf->saw_dot = TRUE;
-				} else {
-					if (crlf->saw_dot) {
-						if (*p == '.')
-							p++;
-						crlf->saw_dot = FALSE;
-					}
-					*q++ = *p;
-				}
-			}
-
-			p++;
-		}
-	}
-
-	*out = f->outbuf;
-	*outlen = q - f->outbuf;
-	*outprespace = f->outpre;
-}
-
-static void 
-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	  char **out, size_t *outlen, size_t *outprespace)
-{
-	if (len)
-		filter (f, in, len, prespace, out, outlen, outprespace);
-}
-
-static void
-reset (CamelMimeFilter *f)
-{
-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;
-
-	crlf->saw_cr = FALSE;
-}
-
-CamelMimeFilter *
-camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode)
-{
-	CamelMimeFilterCRLF *crlf = CAMEL_MIME_FILTER_CRLF(camel_object_new (CAMEL_MIME_FILTER_CRLF_TYPE));
-
-	crlf->direction = direction;
-	crlf->mode = mode;
-	crlf->saw_cr = FALSE;
-
-	return (CamelMimeFilter *)crlf;
-}
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
deleted file mode 100644
index 6ba109d154..0000000000
--- a/camel/camel-mime-filter-crlf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_CRLF_H
-#define _CAMEL_MIME_FILTER_CRLF_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_CRLF_TYPE         (camel_mime_filter_crlf_get_type ())
-#define CAMEL_MIME_FILTER_CRLF(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLF)
-#define CAMEL_MIME_FILTER_CRLF_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass)
-#define CAMEL_IS_MIME_FILTER_CRLF(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CRLF_TYPE)
-
-typedef struct _CamelMimeFilterCRLFClass CamelMimeFilterCRLFClass;
-
-typedef enum {
-	CAMEL_MIME_FILTER_CRLF_ENCODE,
-	CAMEL_MIME_FILTER_CRLF_DECODE
-} CamelMimeFilterCRLFDirection;
-
-typedef enum {
-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS,
-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY,
-} CamelMimeFilterCRLFMode;
-
-struct _CamelMimeFilterCRLF {
-	CamelMimeFilter parent;
-
-	CamelMimeFilterCRLFDirection direction;
-	CamelMimeFilterCRLFMode mode;
-	gboolean saw_cr;
-	gboolean saw_dot;
-};
-
-struct _CamelMimeFilterCRLFClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_crlf_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode);
-
-#endif /* ! _CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
deleted file mode 100644
index 017a256471..0000000000
--- a/camel/camel-mime-filter-from.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-mime-filter-from.h"
-#include <string.h>
-
-#define d(x)
-
-struct _CamelMimeFilterFromPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMimeFilterFrom *)(o))->priv)
-
-static void camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass);
-static void camel_mime_filter_from_init       (CamelMimeFilterFrom *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_from_parent;
-
-CamelType
-camel_mime_filter_from_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterFrom",
-					    sizeof (CamelMimeFilterFrom),
-					    sizeof (CamelMimeFilterFromClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_from_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_from_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-struct fromnode {
-	struct fromnode *next;
-	char *pointer;
-};
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/* Yes, it is complicated ... */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterFrom *f = (CamelMimeFilterFrom *)mf;
-	register char *inptr, *inend;
-	int left;
-	int midline = f->midline;
-	int fromcount = 0;
-	struct fromnode *head = NULL, *tail = (struct fromnode *)&head, *node;
-	char *outptr;
-
-	inptr = in;
-	inend = inptr+len;
-
-	d(printf("Filtering '%.*s'\n", len, in));
-
-	/* first, see if we need to escape any from's */
-	while (inptr<inend) {
-		register int c = -1;
-
-		if (midline)
-			while (inptr < inend && (c = *inptr++) != '\n')
-				;
-
-		if (c == '\n' || !midline) {
-			left = inend-inptr;
-			if (left > 0) {
-				midline = TRUE;
-				if (left < 5) {
-					if (inptr[0] == 'F') {
-						camel_mime_filter_backup(mf, inptr, left);
-						midline = FALSE;
-						inend = inptr;
-						break;
-					}
-				} else {
-					if (!strncmp(inptr, "From ", 5)) {
-						fromcount++;
-						/* yes, we do alloc them on the stack ... at most we're going to get
-						   len / 7 of them anyway */
-						node = alloca(sizeof(*node));
-						node->pointer = inptr;
-						node->next = NULL;
-						tail->next = node;
-						tail = node;
-						inptr += 5;
-					}
-				}
-			} else {
-				/* \n is at end of line, check next buffer */
-				midline = FALSE;
-			}
-		}
-	}
-
-	f->midline = midline;
-
-	if (fromcount > 0) {
-		camel_mime_filter_set_size(mf, len + fromcount, FALSE);
-		node = head;
-		inptr = in;
-		outptr = mf->outbuf;
-		while (node) {
-			memcpy(outptr, inptr, node->pointer - inptr);
-			outptr += node->pointer - inptr;
-			*outptr++ = '>';
-			inptr = node->pointer;
-			node = node->next;
-		}
-		memcpy(outptr, inptr, inend - inptr);
-		outptr += inend - inptr;
-		*out = mf->outbuf;
-		*outlen = outptr - mf->outbuf;
-		*outprespace = mf->outbuf - mf->outreal;
-
-		d(printf("Filtered '%.*s'\n", *outlen, *out));
-	} else {
-		*out = in;
-		*outlen = inend - in;
-		*outprespace = prespace;
-		
-		d(printf("Filtered '%.*s'\n", *outlen, *out));
-	}
-}
-
-static void
-camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_from_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_from_init (CamelMimeFilterFrom *obj)
-{
-	struct _CamelMimeFilterFromPrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-	obj->midline = FALSE;
-}
-
-/**
- * camel_mime_filter_from_new:
- *
- * Create a new CamelMimeFilterFrom object.
- * 
- * Return value: A new CamelMimeFilterFrom widget.
- **/
-CamelMimeFilterFrom *
-camel_mime_filter_from_new (void)
-{
-	CamelMimeFilterFrom *new = CAMEL_MIME_FILTER_FROM ( camel_object_new (camel_mime_filter_from_get_type ()));
-	return new;
-}
-
-#if 0
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-{
-	CamelMimeFilterFrom *f;
-	char *buffer;
-	int len, prespace;
-
-	g_tk_init(&argc, &argv);
-
-
-	f = camel_mime_filter_from_new();
-
-	buffer = "This is a test\nFrom Someone\nTo someone. From Someone else, From\n From blah\nFromblah\nBye! \nFrom ";
-	len = strlen(buffer);
-	prespace = 0;
-
-	printf("input = '%.*s'\n", len, buffer);
-	camel_mime_filter_filter(f, buffer, len, prespace, &buffer, &len, &prespace);
-	printf("output = '%.*s'\n", len, buffer);
-	buffer = "";
-	len = 0;
-	prespace = 0;
-	camel_mime_filter_complete(f, buffer, len, prespace, &buffer, &len, &prespace);
-	printf("complete = '%.*s'\n", len, buffer);
-	
-
-	return 0;
-}
-
-#endif
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
deleted file mode 100644
index 730f92f5e4..0000000000
--- a/camel/camel-mime-filter-from.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_MIME_FILTER_FROM_H
-#define _CAMEL_MIME_FILTER_FROM_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_FROM(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)
-#define CAMEL_MIME_FILTER_FROM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass)
-#define CAMEL_IS_MIME_FILTER_FROM(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_from_get_type ())
-
-typedef struct _CamelMimeFilterFrom      CamelMimeFilterFrom;
-typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass;
-
-struct _CamelMimeFilterFrom {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterFromPrivate *priv;
-
-	int midline;		/* are we between lines? */
-};
-
-struct _CamelMimeFilterFromClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_from_get_type	(void);
-CamelMimeFilterFrom      *camel_mime_filter_from_new	(void);
-
-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
deleted file mode 100644
index 46e0f3f5e8..0000000000
--- a/camel/camel-mime-filter-index.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-index.h"
-
-
-static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);
-static void camel_mime_filter_index_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_index_parent;
-
-CamelType
-camel_mime_filter_index_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterIndex",
-					    sizeof (CamelMimeFilterIndex),
-					    sizeof (CamelMimeFilterIndexClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_index_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_index_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_index_finalize(CamelObject *o)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;
-
-	g_free(f->name);
-	f->index = NULL;	/* ibex's need refcounting? */
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
-
-	if (f->index == NULL || f->name==NULL) {
-		goto donothing;
-	}
-
-	ibex_index_buffer(f->index, f->name, in, len, NULL);
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
-	int inleft = 0;
-
-	if (f->index == NULL || f->name==NULL) {
-		goto donothing;
-	}
-
-	ibex_index_buffer(f->index, f->name, in, len, &inleft);
-
-	if (inleft>0) {
-		camel_mime_filter_backup(mf, in+(len-inleft), inleft);
-	}
-
-	*out = in;
-	*outlenptr = len-inleft;
-	*outprespace = prespace;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_index_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	/*filter_class->reset = reset;*/
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-/**
- * camel_mime_filter_index_new:
- *
- * Create a new CamelMimeFilterIndex object.
- * 
- * Return value: A new CamelMimeFilterIndex widget.
- **/
-CamelMimeFilterIndex *
-camel_mime_filter_index_new (void)
-{
-	CamelMimeFilterIndex *new = CAMEL_MIME_FILTER_INDEX ( camel_object_new (camel_mime_filter_index_get_type ()));
-	return new;
-}
-
-CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *index)
-{
-	CamelMimeFilterIndex *new = camel_mime_filter_index_new();
-
-	if (new) {
-		new->index = index;
-		new->name = g_strdup("");
-	}
-	return new;
-}
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *mf, char *name)
-{
-	g_free(mf->name);
-	mf->name = g_strdup(name);
-}
-
-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index)
-{
-	if (mf->index) {
-		char *out;
-		size_t outlen, outspace;
-
-		camel_mime_filter_complete((CamelMimeFilter *)mf, "", 0, 0, &out, &outlen, &outspace);
-	}
-	mf->index = index;
-}
-
-
-
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
deleted file mode 100644
index e7733bd4ca..0000000000
--- a/camel/camel-mime-filter-index.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_INDEX_H
-#define _CAMEL_MIME_FILTER_INDEX_H
-
-#include <camel/camel-mime-filter.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MIME_FILTER_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)
-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)
-#define CAMEL_IS_MIME_FILTER_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_index_get_type ())
-
-typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass;
-
-struct _CamelMimeFilterIndex {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterIndexPrivate *priv;
-
-	ibex *index;
-	char *name;
-};
-
-struct _CamelMimeFilterIndexClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_index_get_type	(void);
-CamelMimeFilterIndex      *camel_mime_filter_index_new	(void);
-
-CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *);
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, char *);
-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index);
-
-#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
deleted file mode 100644
index dee6c19abb..0000000000
--- a/camel/camel-mime-filter-linewrap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code, Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-linewrap.h"
-#include <ctype.h>
-
-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-		    char **out, size_t *outlen, size_t *outprespace);
-static void complete (CamelMimeFilter *f, char *in, size_t len,
-		      size_t prespace, char **out, size_t *outlen,
-		      size_t *outprespace);
-static void reset (CamelMimeFilter *f);
-
-
-static void
-camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *klass)
-{
-	CamelMimeFilterClass *mime_filter_class =
-		(CamelMimeFilterClass *) klass;
-	
-	mime_filter_class->filter = filter;
-	mime_filter_class->complete = complete;
-	mime_filter_class->reset = reset;
-}
-
-CamelType
-camel_mime_filter_linewrap_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterLinewrap",
-					    sizeof (CamelMimeFilterLinewrap),
-					    sizeof (CamelMimeFilterLinewrapClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_linewrap_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;
-	char *inend, *last, *p, *q;
-	int nchars = linewrap->nchars;
-	
-	/* we'll be adding chars here so we need a bigger buffer */
-	camel_mime_filter_set_size (f, 3 * len, FALSE);
-	
-	p = in;
-	q = f->outbuf;
-	inend = in + len;
-	
-	while (p < inend) {
-		if (*p == '\n') {
-			last = q;
-			*q++ = *p++;
-			nchars = 0;
-		} else if (isspace (*p)) {
-			last = q;
-			
-			if (nchars >= linewrap->wrap_len) {
-				*q++ = '\n';
-				p++;
-				nchars = 0;
-			} else {
-				*q++ = *p++;
-			}
-		} else {
-			*q++ = *p++;
-			nchars++;
-		}
-		
-		/* line is getting way too long, we must force a wrap here */
-		if (nchars >= (linewrap->max_len - 1) && *p != '\n') {
-			*q++ = '\n';
-			*q++ = linewrap->indent;
-			nchars = 0;
-		}
-	}
-	
-	linewrap->nchars = nchars;
-	
-	*out = f->outbuf;
-	*outlen = q - f->outbuf;
-	*outprespace = f->outpre;
-}
-
-static void 
-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	  char **out, size_t *outlen, size_t *outprespace)
-{
-	if (len)
-		filter (f, in, len, prespace, out, outlen, outprespace);
-}
-
-static void
-reset (CamelMimeFilter *f)
-{
-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;
-	
-	linewrap->nchars = 0;
-}
-
-CamelMimeFilter *
-camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char)
-{
-	CamelMimeFilterLinewrap *linewrap =
-		CAMEL_MIME_FILTER_LINEWRAP (camel_object_new (CAMEL_MIME_FILTER_LINEWRAP_TYPE));
-	
-	linewrap->indent = indent_char;
-	linewrap->wrap_len = preferred_len;
-	linewrap->max_len = max_len;
-	linewrap->nchars = 0;
-	
-	return (CamelMimeFilter *) linewrap;
-}
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
deleted file mode 100644
index 189b80d014..0000000000
--- a/camel/camel-mime-filter-linewrap.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_LINEWRAP_H
-#define _CAMEL_MIME_FILTER_LINEWRAP_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_LINEWRAP_TYPE         (camel_mime_filter_linewrap_get_type ())
-#define CAMEL_MIME_FILTER_LINEWRAP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrap)
-#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass)
-#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE)
-
-typedef struct _CamelMimeFilterLinewrapClass CamelMimeFilterLinewrapClass;
-
-struct _CamelMimeFilterLinewrap {
-	CamelMimeFilter parent;
-	
-	guint wrap_len;
-	guint max_len;
-	char indent;
-	int nchars;
-};
-
-struct _CamelMimeFilterLinewrapClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_linewrap_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char);
-
-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
deleted file mode 100644
index e1761994ed..0000000000
--- a/camel/camel-mime-filter-save.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <string.h>
-#include <errno.h>
-
-#include "camel-mime-filter-save.h"
-
-static void camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass);
-static void camel_mime_filter_save_init       (CamelMimeFilterSave *obj);
-static void camel_mime_filter_save_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_save_parent;
-
-CamelType
-camel_mime_filter_save_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterSave",
-					    sizeof (CamelMimeFilterSave),
-					    sizeof (CamelMimeFilterSaveClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_save_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_save_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_save_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_save_finalize(CamelObject *o)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)o;
-
-	g_free(f->filename);
-	if (f->fd != -1) {
-		/* FIXME: what do we do with failed writes???? */
-		close(f->fd);
-	}
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;
-
-	/* i dunno, how do you 'reset' a file?  reopen it? do i care? */
-	if (f->fd != -1){
-		lseek(f->fd, 0, SEEK_SET);
-	}
-}
-
-/* all this code just to support this little trivial filter! */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;
-
-	if (f->fd != -1) {
-		/* FIXME: check return */
-		int outlen = write(f->fd, in, len);
-		if (outlen != len) {
-			g_warning("could not write to '%s': %s", f->filename?f->filename:"<descriptor>", strerror(errno));
-		}
-	}
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-
-	camel_mime_filter_save_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-}
-
-static void
-camel_mime_filter_save_init (CamelMimeFilterSave *f)
-{
-	f->fd = -1;
-}
-
-/**
- * camel_mime_filter_save_new:
- *
- * Create a new CamelMimeFilterSave object.
- * 
- * Return value: A new CamelMimeFilterSave widget.
- **/
-CamelMimeFilterSave *
-camel_mime_filter_save_new (void)
-{
-	CamelMimeFilterSave *new = CAMEL_MIME_FILTER_SAVE ( camel_object_new (camel_mime_filter_save_get_type ()));
-	return new;
-}
-
-CamelMimeFilterSave *
-camel_mime_filter_save_new_name (const char *name, int flags, int mode)
-{
-	CamelMimeFilterSave *new = NULL;
-
-	new = camel_mime_filter_save_new();
-	if (new) {
-		new->fd = open(name, flags, mode);
-		if (new->fd != -1) {
-			new->filename = g_strdup(name);
-		} else {
-			camel_object_unref((CamelObject *)new);
-			new = NULL;
-		}
-	}
-	return new;
-}
-
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
deleted file mode 100644
index 1cc05aed14..0000000000
--- a/camel/camel-mime-filter-save.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_SAVE_H
-#define _CAMEL_MIME_FILTER_SAVE_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_SAVE(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)
-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)
-#define CAMEL_IS_MIME_FILTER_SAVE(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ())
-
-typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass;
-
-struct _CamelMimeFilterSave {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterSavePrivate *priv;
-
-	char *filename;
-	int fd;
-};
-
-struct _CamelMimeFilterSaveClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_save_get_type	(void);
-CamelMimeFilterSave      *camel_mime_filter_save_new	(void);
-
-CamelMimeFilterSave *camel_mime_filter_save_new_name (const char *name, int flags, int mode);
-
-#endif /* ! _CAMEL_MIME_FILTER_SAVE_H */
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
deleted file mode 100644
index 9a81dfb452..0000000000
--- a/camel/camel-mime-filter.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter.h"
-
-/*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */
-
-/* only suitable for glibc */
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-struct _CamelMimeFilterPrivate {
-	char *inbuf;
-	size_t inlen;
-};
-
-#define PRE_HEAD (64)
-#define BACK_HEAD (64)
-#define _PRIVATE(o) (((CamelMimeFilter *)(o))->priv)
-#define FCLASS(o) ((CamelMimeFilterClass *)(CAMEL_OBJECT_GET_CLASS(o)))
-
-static CamelObjectClass *camel_mime_filter_parent;
-
-static void complete (CamelMimeFilter *mf, char *in, size_t len, 
-		      size_t prespace, char **out, size_t *outlen, 
-		      size_t *outprespace);
-
-static void
-camel_mime_filter_class_init (CamelMimeFilterClass *klass)
-{
-	camel_mime_filter_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->complete = complete;
-}
-
-static void
-camel_mime_filter_init (CamelMimeFilter *obj)
-{
-	obj->outreal = NULL;
-	obj->outbuf = NULL;
-	obj->outsize = 0;
-
-	obj->backbuf = NULL;
-	obj->backsize = 0;
-	obj->backlen = 0;
-
-	_PRIVATE(obj) = g_malloc0(sizeof(*obj->priv));
-}
-
-static void
-camel_mime_filter_finalize(CamelObject *o)
-{
-	CamelMimeFilter *f = (CamelMimeFilter *)o;
-	struct _CamelMimeFilterPrivate *p = _PRIVATE(f);
-
-	g_free(f->outreal);
-	g_free(f->backbuf);
-	g_free(p->inbuf);
-	g_free(p);
-}
-
-CamelType
-camel_mime_filter_get_type (void)
-{
-	static CamelType camel_mime_filter_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_filter_type == CAMEL_INVALID_TYPE) {
-		camel_mime_filter_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelMimeFilter",
-							      sizeof (CamelMimeFilter),
-							      sizeof (CamelMimeFilterClass),
-							      (CamelObjectClassInitFunc) camel_mime_filter_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) camel_mime_filter_init,
-							      (CamelObjectFinalizeFunc) camel_mime_filter_finalize);
-	}
-	
-	return camel_mime_filter_type;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	/* default - do nothing */
-}
-
-/**
- * camel_mime_filter_new:
- *
- * Create a new CamelMimeFilter object.
- * 
- * Return value: A new CamelMimeFilter widget.
- **/
-CamelMimeFilter *
-camel_mime_filter_new (void)
-{
-	CamelMimeFilter *new = CAMEL_MIME_FILTER ( camel_object_new (camel_mime_filter_get_type ()));
-	return new;
-}
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-static void filter_run(CamelMimeFilter *f,
-		       char *in, size_t len, size_t prespace,
-		       char **out, size_t *outlen, size_t *outprespace,
-		       void (*filterfunc)(CamelMimeFilter *f,
-					  char *in, size_t len, size_t prespace,
-					  char **out, size_t *outlen, size_t *outprespace))
-{
-	struct _CamelMimeFilterPrivate *p;
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-	/*
-	  here we take a performance hit, if the input buffer doesn't
-	  have the pre-space required.  We make a buffer that does ...
-	*/
-	if (prespace < f->backlen) {
-		int newlen = len+prespace+f->backlen;
-		p = _PRIVATE(f);
-		if (p->inlen < newlen) {
-			/* NOTE: g_realloc copies data, we dont need that (slower) */
-			g_free(p->inbuf);
-			p->inbuf = g_malloc(newlen+PRE_HEAD);
-			p->inlen = newlen+PRE_HEAD;
-		}
-		/* copy to end of structure */
-		memcpy(p->inbuf+p->inlen - len, in, len);
-		in = p->inbuf+p->inlen - len;
-		prespace = p->inlen - len;
-	}
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-
-	/* preload any backed up data */
-	if (f->backlen > 0) {
-		memcpy(in-f->backlen, f->backbuf, f->backlen);
-		in -= f->backlen;
-		len += f->backlen;
-		prespace -= f->backlen;
-		f->backlen = 0;
-	}
-	
-	filterfunc(f, in, len, prespace, out, outlen, outprespace);
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-
-}
-
-void camel_mime_filter_filter(CamelMimeFilter *f,
-			      char *in, size_t len, size_t prespace,
-			      char **out, size_t *outlen, size_t *outprespace)
-{
-	if (FCLASS(f)->filter)
-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)->filter);
-	else
-		g_error("Filter function unplmenented in class");
-}
-
-void camel_mime_filter_complete(CamelMimeFilter *f,
-				char *in, size_t len, size_t prespace,
-				char **out, size_t *outlen, size_t *outprespace)
-{
-	if (FCLASS(f)->complete)
-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)->complete);
-}
-
-void camel_mime_filter_reset(CamelMimeFilter *f)
-{
-	if (FCLASS(f)->reset) {
-		FCLASS(f)->reset(f);
-	}
-
-	/* could free some buffers, if they are really big? */
-	f->backlen = 0;
-}
-
-/* sets number of bytes backed up on the input, new calls replace previous ones */
-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length)
-{
-	if (f->backsize < length) {
-		/* g_realloc copies data, unnecessary overhead */
-		g_free(f->backbuf);
-		f->backbuf = g_malloc(length+BACK_HEAD);
-		f->backsize = length+BACK_HEAD;
-	}
-	f->backlen = length;
-	memcpy(f->backbuf, data, length);
-}
-
-/* ensure this much size available for filter output (if required) */
-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep)
-{
-	if (f->outsize < size) {
-		int offset = f->outptr - f->outreal;
-		if (keep) {
-			f->outreal = g_realloc(f->outreal, size + PRE_HEAD*4);
-		} else {
-			g_free(f->outreal);
-			f->outreal = g_malloc(size + PRE_HEAD*4);
-		}
-		f->outptr = f->outreal + offset;
-		f->outbuf = f->outreal + PRE_HEAD*4;
-		f->outsize = size;
-		/* this could be offset from the end of the structure, but 
-		   this should be good enough */
-		f->outpre = PRE_HEAD*4;
-	}
-}
-
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
deleted file mode 100644
index 1a05b36794..0000000000
--- a/camel/camel-mime-filter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* Abstract class for non-copying filters */
-
-#ifndef _CAMEL_MIME_FILTER_H
-#define _CAMEL_MIME_FILTER_H
-
-#include <camel/camel-object.h>
-#include <sys/types.h>
-
-#define CAMEL_MIME_FILTER_TYPE         (camel_mime_filter_get_type ())
-#define CAMEL_MIME_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)
-#define CAMEL_MIME_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)
-#define CAMEL_IS_MIME_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_get_type ())
-
-typedef struct _CamelMimeFilterClass CamelMimeFilterClass;
-
-struct _CamelMimeFilter {
-	CamelObject parent;
-
-	struct _CamelMimeFilterPrivate *priv;
-
-	char *outreal;		/* real malloc'd buffer */
-	char *outbuf;		/* first 'writable' position allowed (outreal + outpre) */
-	char *outptr;
-	int outsize;
-	int outpre;		/* prespace of this buffer */
-
-	char *backbuf;
-	int backsize;
-	int backlen;		/* significant data there */
-};
-
-struct _CamelMimeFilterClass {
-	CamelObjectClass parent_class;
-
-	/* virtual functions */
-	void (*filter)(CamelMimeFilter *f,
-		       char *in, size_t len, size_t prespace,
-		       char **out, size_t *outlen, size_t *outprespace);
-	void (*complete)(CamelMimeFilter *f,
-			 char *in, size_t len, size_t prespace,
-			 char **out, size_t *outlen, size_t *outprespace);
-	void (*reset)(CamelMimeFilter *f);
-};
-
-CamelType	      camel_mime_filter_get_type	(void);
-CamelMimeFilter      *camel_mime_filter_new	(void);
-
-void camel_mime_filter_filter(CamelMimeFilter *f,
-			      char *in, size_t len, size_t prespace,
-			      char **out, size_t *outlen, size_t *outprespace);
-
-void camel_mime_filter_complete(CamelMimeFilter *f,
-				char *in, size_t len, size_t prespace,
-				char **out, size_t *outlen, size_t *outprespace);
-
-void camel_mime_filter_reset(CamelMimeFilter *f);
-
-/* sets/returns number of bytes backed up on the input */
-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length);
-
-/* ensure this much size available for filter output */
-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep);
-
-#endif /* ! _CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
deleted file mode 100644
index 9e0fb7de11..0000000000
--- a/camel/camel-mime-message.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-message.c : class for a mime_message */
-
-/* 
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-
-#include "camel-stream-filter.h"
-#include "camel-stream-null.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-bestenc.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#define d(x)
-
-/* these 2 below should be kept in sync */
-typedef enum {
-	HEADER_UNKNOWN,
-	HEADER_FROM,
-	HEADER_REPLY_TO,
-	HEADER_SUBJECT,
-	HEADER_TO,
-	HEADER_CC,
-	HEADER_BCC,
-	HEADER_DATE,
-	HEADER_MESSAGE_ID
-} CamelHeaderType;
-
-static char *header_names[] = {
-	/* dont include HEADER_UNKNOWN string */
-	"From", "Reply-To", "Subject", "To", "Cc", "Bcc", "Date", "Message-Id", NULL
-};
-
-static GHashTable *header_name_table;
-
-static CamelMimePartClass *parent_class=NULL;
-
-static char *recipient_names[] = {
-	"To", "Cc", "Bcc", NULL
-};
-
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void add_header (CamelMedium *medium, const char *header_name, const void *header_value);
-static void set_header (CamelMedium *medium, const char *header_name, const void *header_value);
-static void remove_header (CamelMedium *medium, const char *header_name);
-static int construct_from_parser (CamelMimePart *, CamelMimeParser *);
-static void unref_recipient (gpointer key, gpointer value, gpointer user_data);
-
-/* Returns the class for a CamelMimeMessage */
-#define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void
-camel_mime_message_class_init (CamelMimeMessageClass *camel_mime_message_class)
-{
-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_message_class);
-	CamelMimePartClass *camel_mime_part_class = CAMEL_MIME_PART_CLASS (camel_mime_message_class);
-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_message_class);
-	int i;
-	
-	parent_class = CAMEL_MIME_PART_CLASS(camel_type_get_global_classfuncs (camel_mime_part_get_type ()));
-
-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	for (i=0;header_names[i];i++)
-		g_hash_table_insert (header_name_table, header_names[i], (gpointer)i+1);
-
-	/* virtual method overload */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-
-	camel_medium_class->add_header = add_header;
-	camel_medium_class->set_header = set_header;
-	camel_medium_class->remove_header = remove_header;
-	
-	camel_mime_part_class->construct_from_parser = construct_from_parser;
-}
-
-
-static void
-camel_mime_message_init (gpointer object, gpointer klass)
-{
-	CamelMimeMessage *mime_message = (CamelMimeMessage *)object;
-	int i;
-	
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (object), "message/rfc822");
-
-	mime_message->recipients =  g_hash_table_new(g_strcase_hash, g_strcase_equal);
-	for (i=0;recipient_names[i];i++) {
-		g_hash_table_insert(mime_message->recipients, recipient_names[i], camel_internet_address_new());
-	}
-
-	mime_message->subject = NULL;
-	mime_message->reply_to = NULL;
-	mime_message->from = NULL;
-	mime_message->date = CAMEL_MESSAGE_DATE_CURRENT;
-	mime_message->date_offset = 0;
-	mime_message->date_received = CAMEL_MESSAGE_DATE_CURRENT;
-	mime_message->date_received_offset = 0;
-	mime_message->message_id = NULL;
-}
-
-static void           
-camel_mime_message_finalize (CamelObject *object)
-{
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (object);
-	
-	g_free(message->subject);
-
-	g_free(message->message_id);
-	
-	if (message->reply_to)
-		camel_object_unref((CamelObject *)message->reply_to);
-
-	if (message->from)
-		camel_object_unref((CamelObject *)message->from);
-
-	g_hash_table_foreach(message->recipients, unref_recipient, NULL);
-	g_hash_table_destroy(message->recipients);
-}
-
-
-CamelType
-camel_mime_message_get_type (void)
-{
-	static CamelType camel_mime_message_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_message_type == CAMEL_INVALID_TYPE)	{
-		camel_mime_message_type = camel_type_register (camel_mime_part_get_type(), "CamelMimeMessage",
-							       sizeof (CamelMimeMessage),
-							       sizeof (CamelMimeMessageClass),
-							       (CamelObjectClassInitFunc) camel_mime_message_class_init,
-							       NULL,
-							       (CamelObjectInitFunc) camel_mime_message_init,
-							       (CamelObjectFinalizeFunc) camel_mime_message_finalize);
-	}
-	
-	return camel_mime_message_type;
-}
-
-static void unref_recipient (gpointer key, gpointer value, gpointer user_data)
-{
-	camel_object_unref (CAMEL_OBJECT (value));
-}
-
-CamelMimeMessage *
-camel_mime_message_new (void) 
-{
-	CamelMimeMessage *mime_message;
-	mime_message = CAMEL_MIME_MESSAGE(camel_object_new (CAMEL_MIME_MESSAGE_TYPE));
-	
-	return mime_message;
-}
-
-/* **** Date: */
-
-void
-camel_mime_message_set_date(CamelMimeMessage *message,  time_t date, int offset)
-{
-	char *datestr;
-
-	g_assert(message);
-	if (date == CAMEL_MESSAGE_DATE_CURRENT) {
-		struct tm *local;
-		int tz;
-
-		date = time(0);
-		local = localtime(&date);
-#if defined(HAVE_TIMEZONE)
-		tz = timezone;
-#elif defined(HAVE_TM_GMTOFF)
-		tz = local->tm_gmtoff;
-#endif
-		offset = -(((tz/60/60) * 100) + (tz/60 % 60));
-		if (local->tm_isdst>0)
-			offset += 100;
-	}
-	message->date = date;
-	message->date_offset = offset;
-
-	datestr = header_format_date(date, offset);
-	CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)message, "Date", datestr);
-	g_free(datestr);
-}
-
-time_t
-camel_mime_message_get_date(CamelMimeMessage *msg, int *offset)
-{
-	if (offset)
-		*offset = msg->date_offset;
-
-	return msg->date;
-}
-
-time_t
-camel_mime_message_get_date_received(CamelMimeMessage *msg, int *offset)
-{
-	if (msg->date_received == CAMEL_MESSAGE_DATE_CURRENT) {
-		const char *received;
-
-		received = camel_medium_get_header((CamelMedium *)msg, "received");
-		if (received)
-			received = strrchr(received, ';');
-		if (received)
-			msg->date_received = header_decode_date(received + 1, &msg->date_received_offset);
-	}
-
-	if (offset)
-		*offset = msg->date_received_offset;
-
-	return msg->date_received;
-}
-
-/* **** Message-Id: */
-
-void
-camel_mime_message_set_message_id (CamelMimeMessage *mime_message, const char *message_id)
-{
-	char *id;
-	
-	g_assert (mime_message);
-	
-	g_free (mime_message->message_id);
-	
-	if (message_id) {
-		id = g_strstrip (g_strdup (message_id));
-	} else {
-		id = header_msgid_generate ();
-	}
-	
-	mime_message->message_id = id;
-	id = g_strdup_printf ("<%s>", mime_message->message_id);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Message-Id", id);
-	g_free (id);
-}
-
-const char *
-camel_mime_message_get_message_id (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-	
-	return mime_message->message_id;
-}
-
-/* **** Reply-To: */
-
-void
-camel_mime_message_set_reply_to (CamelMimeMessage *msg, const CamelInternetAddress *reply_to)
-{
-	char *addr;
-	
-	g_assert(msg);
-
-	if (msg->reply_to) {
-		camel_object_unref((CamelObject *)msg->reply_to);
-		msg->reply_to = NULL;
-	}
-
-	if (reply_to == NULL) {
-		CAMEL_MEDIUM_CLASS(parent_class)->remove_header(CAMEL_MEDIUM(msg), "Reply-To");
-		return;
-	}
-
-	msg->reply_to = (CamelInternetAddress *)camel_address_new_clone((CamelAddress *)reply_to);
-	addr = camel_address_encode((CamelAddress *)msg->reply_to);
-	CAMEL_MEDIUM_CLASS(parent_class)->set_header(CAMEL_MEDIUM(msg), "Reply-To", addr);
-	g_free(addr);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_reply_to(CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-
-	/* TODO: ref for threading? */
-
-	return mime_message->reply_to;
-}
-
-/* **** Subject: */
-
-void
-camel_mime_message_set_subject(CamelMimeMessage *mime_message, const char *subject)
-{
-	char *text;
-	
-	g_assert(mime_message);
-	
-	g_free(mime_message->subject);
-	mime_message->subject = g_strstrip (g_strdup (subject));
-	text = header_encode_string((unsigned char *)mime_message->subject);
-	CAMEL_MEDIUM_CLASS(parent_class)->set_header(CAMEL_MEDIUM (mime_message), "Subject", text);
-	g_free (text);
-}
-
-const char *
-camel_mime_message_get_subject(CamelMimeMessage *mime_message)
-{
-	g_assert(mime_message);
-
-	return mime_message->subject;
-}
-
-/* *** From: */
-
-/* Thought: Since get_from/set_from are so rarely called, it is probably not useful
-   to cache the from (and reply_to) addresses as InternetAddresses internally, we
-   could just get it from the headers and reprocess every time. */
-void
-camel_mime_message_set_from(CamelMimeMessage *msg, const CamelInternetAddress *from)
-{
-	char *addr;
-	
-	g_assert(msg);
-
-	if (msg->from) {
-		camel_object_unref((CamelObject *)msg->from);
-		msg->from = NULL;
-	}
-
-	if (from == NULL || camel_address_length((CamelAddress *)from) == 0) {
-		CAMEL_MEDIUM_CLASS(parent_class)->remove_header(CAMEL_MEDIUM(msg), "From");
-		return;
-	}
-
-	msg->from = (CamelInternetAddress *)camel_address_new_clone((CamelAddress *)from);
-	addr = camel_address_encode((CamelAddress *)msg->from);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header(CAMEL_MEDIUM(msg), "From", addr);
-	g_free(addr);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_from(CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-
-	/* TODO: we should really ref this for multi-threading to work */
-
-	return mime_message->from;
-}
-
-/*  **** To: Cc: Bcc: */
-
-void
-camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const char *type, const CamelInternetAddress *r)
-{
-	char *text;
-	CamelInternetAddress *addr;
-
-	g_assert(mime_message);
-
-	addr = g_hash_table_lookup(mime_message->recipients, type);
-	if (addr == NULL) {
-		g_warning("trying to set a non-valid receipient type: %s", type);
-		return;
-	}
-
-	if (r == NULL || camel_address_length((CamelAddress *)r) == 0) {
-		camel_address_remove((CamelAddress *)addr, -1);
-		CAMEL_MEDIUM_CLASS(parent_class)->remove_header(CAMEL_MEDIUM(mime_message), type);
-		return;
-	}
-
-	/* note this does copy, and not append (cat) */
-	camel_address_copy((CamelAddress *)addr, (const CamelAddress *)r);
-
-	/* and sync our headers */
-	text = camel_address_encode(CAMEL_ADDRESS(addr));
-	CAMEL_MEDIUM_CLASS(parent_class)->set_header(CAMEL_MEDIUM(mime_message), type, text);
-	g_free(text);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_recipients(CamelMimeMessage *mime_message, const char *type)
-{
-	g_assert(mime_message);
-	
-	return g_hash_table_lookup(mime_message->recipients, type);
-}
-
-/* mime_message */
-static int
-construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	char *buf;
-	int len;
-	int state;
-	int ret;
-
-	d(printf("constructing mime-message\n"));
-
-	d(printf("mime_message::construct_from_parser()\n"));
-
-	/* let the mime-part construct the guts ... */
-	ret = ((CamelMimePartClass *)parent_class)->construct_from_parser(dw, mp);
-
-	if (ret == -1)
-		return -1;
-
-	/* ... then clean up the follow-on state */
-	state = camel_mime_parser_step(mp, &buf, &len);
-	switch (state) {
-	case HSCAN_EOF: case HSCAN_FROM_END: /* these doesn't belong to us */
-		camel_mime_parser_unstep(mp);
-	case HSCAN_MESSAGE_END:
-		break;
-	default:
-		g_error("Bad parser state: Expecing MESSAGE_END or EOF or EOM, got: %d", camel_mime_parser_state(mp));
-		camel_mime_parser_unstep(mp);
-		return -1;
-	}
-
-	d(printf("mime_message::construct_from_parser() leaving\n"));
-#ifndef NO_WARNINGS
-#warning "return a real error code"
-#endif
-	return 0;
-}
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimeMessage *mm = CAMEL_MIME_MESSAGE (data_wrapper);
-
-	/* force mandatory headers ... */
-	if (mm->from == NULL) {
-		/* FIXME: should we just abort?  Should we make one up? */
-		g_warning("No from set for message");
-		camel_medium_set_header((CamelMedium *)mm, "From", "");
-	}
-	if (!camel_medium_get_header((CamelMedium *)mm, "Date")) {
-		g_warning("Application did not set date, using 'now'");
-		camel_mime_message_set_date(mm, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	}
-	if (mm->subject == NULL) {
-		g_warning("Application did not set subject, creating one");
-		camel_mime_message_set_subject(mm, "No Subject");
-	}
-	if (mm->message_id == NULL) {
-		g_warning ("Application did not set message-id, creating one");
-		camel_mime_message_set_message_id (mm, NULL);
-	}
-
-	/* FIXME: "To" header needs to be set explicitly as well ... */
-
-	if (!camel_medium_get_header ((CamelMedium *)mm, "Mime-Version"))
-		camel_medium_set_header((CamelMedium *)mm, "Mime-Version", "1.0");
-
-	return CAMEL_DATA_WRAPPER_CLASS (parent_class)->write_to_stream (data_wrapper, stream);
-}
-
-/* FIXME: check format of fields. */
-static gboolean
-process_header (CamelMedium *medium, const char *header_name, const char *header_value)
-{
-	CamelHeaderType header_type;
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (medium);
-	CamelInternetAddress *addr;
-
-	header_type = (CamelHeaderType)g_hash_table_lookup(header_name_table, header_name);
-	switch (header_type) {
-	case HEADER_FROM:
-		if (message->from)
-			camel_object_unref((CamelObject *)message->from);
-		message->from = camel_internet_address_new();
-		camel_address_decode((CamelAddress *)message->from, header_value);
-		break;
-	case HEADER_REPLY_TO:
-		if (message->reply_to)
-			camel_object_unref((CamelObject *)message->reply_to);
-		message->reply_to = camel_internet_address_new();
-		camel_address_decode((CamelAddress *)message->reply_to, header_value);
-		break;
-	case HEADER_SUBJECT:
-		g_free(message->subject);
-		message->subject = g_strstrip(header_decode_string(header_value));
-		break;
-	case HEADER_TO:
-	case HEADER_CC:
-	case HEADER_BCC:
-		addr = g_hash_table_lookup (message->recipients, header_name);
-		if (header_value)
-			camel_address_decode(CAMEL_ADDRESS (addr), header_value);
-		else
-			camel_address_remove(CAMEL_ADDRESS (addr), -1);
-		break;
-	case HEADER_DATE:
-		if (header_value) {
-			message->date = header_decode_date(header_value, &message->date_offset);
-		} else {
-			message->date = CAMEL_MESSAGE_DATE_CURRENT;
-			message->date_offset = 0;
-		}
-		break;
-	case HEADER_MESSAGE_ID:
-		g_free (message->message_id);
-		if (header_value)
-			message->message_id = header_msgid_decode (header_value);
-		else
-			message->message_id = NULL;
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-set_header(CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	process_header(medium, header_name, header_value);
-	parent_class->parent_class.set_header (medium, header_name, header_value);
-}
-
-static void
-add_header(CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	/* if we process it, then it must be forced unique as well ... */
-	if (process_header(medium, header_name, header_value))
-		parent_class->parent_class.set_header (medium, header_name, header_value);
-	else
-		parent_class->parent_class.add_header (medium, header_name, header_value);
-}
-
-static void
-remove_header(CamelMedium *medium, const char *header_name)
-{
-	process_header(medium, header_name, NULL);
-	parent_class->parent_class.remove_header (medium, header_name);
-}
-
-typedef gboolean (*CamelPartFunc)(CamelMimeMessage *, CamelMimePart *, void *data);
-
-static gboolean
-message_foreach_part_rec(CamelMimeMessage *msg, CamelMimePart *part, CamelPartFunc callback, void *data)
-{
-	CamelDataWrapper *containee;
-	int parts, i;
-	int go = TRUE;
-
-	if (callback(msg, part, data) == FALSE)
-		return FALSE;
-
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(part));
-
-	if (containee == NULL)
-		return go;
-
-	/* using the object types is more accurate than using the mime/types */
-	if (CAMEL_IS_MULTIPART(containee)) {
-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));
-		for (i=0;go && i<parts;i++) {
-			CamelMimePart *part = camel_multipart_get_part(CAMEL_MULTIPART(containee), i);
-
-			go = message_foreach_part_rec(msg, part, callback, data);
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-		go = message_foreach_part_rec(msg, (CamelMimePart *)containee, callback, data);
-	}
-
-	return go;
-}
-
-/* dont make this public yet, it might need some more thinking ... */
-/* MPZ */
-static void
-camel_mime_message_foreach_part(CamelMimeMessage *msg, CamelPartFunc callback, void *data)
-{
-	message_foreach_part_rec(msg, (CamelMimePart *)msg, callback, data);
-}
-
-static gboolean
-check_8bit(CamelMimeMessage *msg, CamelMimePart *part, void *data)
-{
-	int *has8bit = data;
-
-	/* check this part, and stop as soon as we are done */
-	*has8bit = camel_mime_part_get_encoding(part) == CAMEL_MIME_PART_ENCODING_8BIT;
-	return !(*has8bit);
-}
-
-gboolean
-camel_mime_message_has_8bit_parts(CamelMimeMessage *msg)
-{
-	int has8bit = FALSE;
-
-	camel_mime_message_foreach_part(msg, check_8bit, &has8bit);
-
-	return has8bit;
-}
-
-/* finds the best charset and transfer encoding for a given part */
-static CamelMimePartEncodingType
-find_best_encoding(CamelMimePart *part, CamelBestencRequired required, CamelBestencEncoding enctype, char **charsetp)
-{
-	const char *charsetin = NULL;
-	char *charset = NULL;
-	CamelStream *null;
-	CamelStreamFilter *filter;
-	CamelMimeFilterCharset *charenc = NULL;
-	CamelMimeFilterBestenc *bestenc;
-	int idb, idc = -1;
-	gboolean istext;
-	unsigned int flags, callerflags;
-	CamelMimePartEncodingType encoding;
-	CamelDataWrapper *content;
-
-	/* we use all these weird stream things so we can do it with streams, and
-	   not have to read the whole lot into memory - although i have a feeling
-	   it would make things a fair bit simpler to do so ... */
-
-	d(printf("starting to check part\n"));
-
-	content = camel_medium_get_content_object((CamelMedium *)part);
-	if (content == NULL) {
-		/* charset might not be right here, but it'll get the right stuff
-		   if it is ever set */
-		*charsetp = NULL;
-		return CAMEL_MIME_PART_ENCODING_DEFAULT;
-	}
-
-	istext = header_content_type_is(part->content_type, "text", "*");
-	if (istext) {
-		flags = CAMEL_BESTENC_GET_CHARSET|CAMEL_BESTENC_GET_ENCODING;
-	} else {
-		flags = CAMEL_BESTENC_GET_ENCODING;
-	}
-
-	/* when building the message, any encoded parts are translated already */
-	flags |= CAMEL_BESTENC_LF_IS_CRLF;
-	/* and get any flags the caller passed in */
-	callerflags = (required & CAMEL_BESTENC_NO_FROM);
-	flags |= callerflags;
-
-	/* first a null stream, so any filtering is thrown away; we only want the sideeffects */
-	null = (CamelStream *)camel_stream_null_new();
-	filter = camel_stream_filter_new_with_stream(null);
-
-	/* if we're not looking for the best charset, then use the one we have */
-	if (istext && (required & CAMEL_BESTENC_GET_CHARSET) == 0
-	    && (charsetin = header_content_type_param(part->content_type, "charset"))) {
-		/* if libunicode doesn't support it, we dont really have utf8 anyway, so
-		   we dont need a converter */
-		charenc = camel_mime_filter_charset_new_convert("UTF-8", charsetin);
-		if (charenc != NULL)
-			idc = camel_stream_filter_add(filter, (CamelMimeFilter *)charenc);
-		charsetin = NULL;
-	}
-
-	bestenc = camel_mime_filter_bestenc_new(flags);
-	idb = camel_stream_filter_add(filter, (CamelMimeFilter *)bestenc);
-	d(printf("writing to checking stream\n"));
-	camel_data_wrapper_write_to_stream(content, (CamelStream *)filter);
-	camel_stream_filter_remove(filter, idb);
-	if (idc != -1) {
-		camel_stream_filter_remove(filter, idc);
-		camel_object_unref((CamelObject *)charenc);
-		charenc = NULL;
-	}
-
-	if (istext)
-		charsetin = camel_mime_filter_bestenc_get_best_charset(bestenc);
-
-	d(printf("charsetin = %s\n", charsetin));
-
-	/* if we have US-ASCII, or we're not doing text, we dont need to bother with the rest */
-	if (charsetin != NULL && (required & CAMEL_BESTENC_GET_CHARSET) != 0) {
-		charset = g_strdup(charsetin);
-
-		d(printf("have charset, trying conversion/etc\n"));
-
-		/* now the 'bestenc' can has told us what the best encoding is, we can use that to create
-		   a charset conversion filter as well, and then re-add the bestenc to filter the
-		   result to find the best encoding to use as well */
-		
-		charenc = camel_mime_filter_charset_new_convert("UTF-8", charset);
-
-		/* eek, libunicode doesn't undertand this charset anyway, then the 'utf8' we
-		   thought we had is really the native format, in which case, we just treat
-		   it as binary data (and take the result we have so far) */
-		   
-		if (charenc != NULL) {
-
-			/* otherwise, try another pass, converting to the real charset */
-
-			camel_mime_filter_reset((CamelMimeFilter *)bestenc);
-			camel_mime_filter_bestenc_set_flags(bestenc, CAMEL_BESTENC_GET_ENCODING|CAMEL_BESTENC_LF_IS_CRLF|callerflags);
-
-			camel_stream_filter_add(filter, (CamelMimeFilter *)charenc);
-			camel_stream_filter_add(filter, (CamelMimeFilter *)bestenc);
-
-			/* and write it to the new stream */
-			camel_data_wrapper_write_to_stream(content, (CamelStream *)filter);
-
-			camel_object_unref((CamelObject *)charenc);
-		}
-	}
-	
-	encoding = camel_mime_filter_bestenc_get_best_encoding(bestenc, enctype);
-
-	camel_object_unref((CamelObject *)filter);
-	camel_object_unref((CamelObject *)bestenc);
-	camel_object_unref((CamelObject *)null);
-
-	d(printf("done, best encoding = %d\n", encoding));
-
-	if (charsetp)
-		*charsetp = charset;
-	else
-		g_free(charset);
-
-	return encoding;
-}
-
-struct _enc_data {
-	CamelBestencRequired required;
-	CamelBestencEncoding enctype;
-};
-
-static gboolean
-best_encoding(CamelMimeMessage *msg, CamelMimePart *part, void *datap)
-{
-	struct _enc_data *data = datap;
-	char *charset;
-	CamelMimePartEncodingType encoding;
-
-	/* we only care about actual content objects */
-	if (!CAMEL_IS_MULTIPART(part) && !CAMEL_IS_MIME_MESSAGE(part)) {
-
-		encoding = find_best_encoding(part, data->required, data->enctype, &charset);
-		/* we always set the encoding, if we got this far.  GET_CHARSET implies
-		   also GET_ENCODING */
-		camel_mime_part_set_encoding(part, encoding);
-
-		if ((data->required & CAMEL_BESTENC_GET_CHARSET) != 0) {
-			if (header_content_type_is(part->content_type, "text", "*")) {
-				char *newct;
-
-				/* FIXME: ick, the part content_type interface needs fixing bigtime */
-				header_content_type_set_param(part->content_type, "charset", charset?charset:"us-ascii");
-				newct = header_content_type_format(part->content_type);
-				if (newct) {
-					d(printf("Setting content-type to %s\n", newct));
-
-					camel_mime_part_set_content_type(part, newct);
-					g_free(newct);
-				}
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-void
-camel_mime_message_set_best_encoding(CamelMimeMessage *msg, CamelBestencRequired required, CamelBestencEncoding enctype)
-{
-	struct _enc_data data;
-
-	if ((required & (CAMEL_BESTENC_GET_ENCODING|CAMEL_BESTENC_GET_CHARSET)) == 0)
-		return;
-
-	data.required = required;
-	data.enctype = enctype;
-
-	camel_mime_message_foreach_part(msg, best_encoding, &data);
-}
-
-void
-camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)
-{
-	camel_mime_message_set_best_encoding(mime_message, CAMEL_BESTENC_GET_ENCODING, CAMEL_BESTENC_7BIT);
-}
-
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
deleted file mode 100644
index 0ab406c27e..0000000000
--- a/camel/camel-mime-message.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camelMimeMessage.h : class for a mime message
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MIME_MESSAGE_H
-#define CAMEL_MIME_MESSAGE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-filter-bestenc.h>
-
-#define CAMEL_RECIPIENT_TYPE_TO "To"
-#define CAMEL_RECIPIENT_TYPE_CC "Cc"
-#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"
-
-
-#define CAMEL_MIME_MESSAGE_TYPE     (camel_mime_message_get_type ())
-#define CAMEL_MIME_MESSAGE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))
-#define CAMEL_MIME_MESSAGE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))
-#define CAMEL_IS_MIME_MESSAGE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))
-
-
-/* specify local time */
-#define CAMEL_MESSAGE_DATE_CURRENT (~0)
-
-struct _CamelMimeMessage
-{
-	CamelMimePart parent_object;
-
-	/* header fields */
-	time_t date;
-	int date_offset;	/* GMT offset */
-
-	/* cached internal copy */
-	time_t date_received;
-	int date_received_offset;	/* GMT offset */
-
-	char *subject;
-
-	char *message_id;
-
-	CamelInternetAddress *reply_to;
-	CamelInternetAddress *from;
-
-	GHashTable *recipients;	/* hash table of CamelInternetAddress's */
-};
-
-typedef struct {
-	CamelMimePartClass parent_class;
-
-	/* Virtual methods */	
-
-} CamelMimeMessageClass;
-
-
-
-/* Standard Camel function */
-CamelType                   camel_mime_message_get_type           (void);
-
-
-/* public methods */
-CamelMimeMessage           *camel_mime_message_new                (void);
-void                        camel_mime_message_set_date           (CamelMimeMessage           *mime_message,
-								   time_t                      date,
-								   int                         offset);
-time_t                      camel_mime_message_get_date           (CamelMimeMessage           *mime_message,
-								   int                        *offset);
-time_t                      camel_mime_message_get_date_received  (CamelMimeMessage           *mime_message,
-								   int                        *offset);
-void                        camel_mime_message_set_message_id     (CamelMimeMessage           *mime_message,
-								   const char                 *message_id);
-const char                 *camel_mime_message_get_message_id     (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_reply_to       (CamelMimeMessage           *mime_message,
-								   const CamelInternetAddress *reply_to);
-const CamelInternetAddress *camel_mime_message_get_reply_to       (CamelMimeMessage           *mime_message);
-
-void                        camel_mime_message_set_subject        (CamelMimeMessage           *mime_message,
-								   const char                 *subject);
-const char                 *camel_mime_message_get_subject        (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_from           (CamelMimeMessage           *mime_message,
-								   const CamelInternetAddress *from);
-const CamelInternetAddress *camel_mime_message_get_from           (CamelMimeMessage           *mime_message);
-
-const CamelInternetAddress *camel_mime_message_get_recipients     (CamelMimeMessage           *mime_message,
-								   const char                 *type);
-void                        camel_mime_message_set_recipients     (CamelMimeMessage           *mime_message,
-								   const char                 *type,
-								   const CamelInternetAddress *r);
-
-/* utility functions */
-gboolean                    camel_mime_message_has_8bit_parts     (CamelMimeMessage           *mime_message);
-void                        camel_mime_message_set_best_encoding  (CamelMimeMessage           *msg,
-								   CamelBestencRequired        required,
-								   CamelBestencEncoding        enctype);
-void                        camel_mime_message_encode_8bit_parts  (CamelMimeMessage           *mime_message);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MIME_MESSAGE_H */
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
deleted file mode 100644
index b9fc3d2ebb..0000000000
--- a/camel/camel-mime-parser.c
+++ /dev/null
@@ -1,1956 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* What should hopefully be a fast mail parser */
-
-/* Do not change this code without asking me (Michael Zucchi) first
-
-   There is almost always a reason something was done a certain way.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <string.h>
-
-#include <stdio.h>
-#include <errno.h>
-
-#include <unicode.h>
-
-#include <regex.h>
-#include <ctype.h>
-
-#include <glib.h>
-#include "camel-mime-parser.h"
-#include "camel-mime-utils.h"
-#include "camel-mime-filter.h"
-#include "camel-stream.h"
-#include "camel-seekable-stream.h"
-
-#define r(x) 
-#define h(x) 
-#define c(x) 
-#define d(x) 
-
-/*#define PURIFY*/
-
-#define MEMPOOL
-
-#define STRUCT_ALIGN 4
-
-#ifdef PURIFY
-int inend_id = -1,
-  inbuffer_id = -1;
-#endif
-
-#if 0
-extern int strdup_count;
-extern int malloc_count;
-extern int free_count;
-
-#define g_strdup(x) (strdup_count++, g_strdup(x))
-#define g_malloc(x) (malloc_count++, g_malloc(x))
-#define g_free(x) (free_count++, g_free(x))
-#endif
-
-#ifdef MEMPOOL
-typedef struct _MemPoolNode {
-	struct _MemPoolNode *next;
-
-	int free;
-	char data[1];
-} MemPoolNode;
-
-typedef struct _MemPoolThresholdNode {
-	struct _MemPoolThresholdNode *next;
-	char data[1];
-} MemPoolThresholdNode;
-
-typedef struct _MemPool {
-	int blocksize;
-	int threshold;
-	struct _MemPoolNode *blocks;
-	struct _MemPoolThresholdNode *threshold_blocks;
-} MemPool;
-
-MemPool *mempool_new(int blocksize, int threshold);
-void *mempool_alloc(MemPool *pool, int size);
-void mempool_flush(MemPool *pool, int freeall);
-void mempool_free(MemPool *pool);
-
-MemPool *mempool_new(int blocksize, int threshold)
-{
-	MemPool *pool;
-
-	pool = g_malloc(sizeof(*pool));
-	if (threshold >= blocksize)
-		threshold = blocksize * 2 / 3;
-	pool->blocksize = blocksize;
-	pool->threshold = threshold;
-	pool->blocks = NULL;
-	pool->threshold_blocks = NULL;
-	return pool;
-}
-
-void *mempool_alloc(MemPool *pool, int size)
-{
-	size = (size + STRUCT_ALIGN) & (~(STRUCT_ALIGN-1));
-	if (size>=pool->threshold) {
-		MemPoolThresholdNode *n;
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + size);
-		n->next = pool->threshold_blocks;
-		pool->threshold_blocks = n;
-		return &n->data[0];
-	} else {
-		MemPoolNode *n;
-
-		n = pool->blocks;
-		while (n) {
-			if (n->free >= size) {
-				n->free -= size;
-				return &n->data[n->free];
-			}
-			n = n->next;
-		}
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + pool->blocksize);
-		n->next = pool->blocks;
-		pool->blocks = n;
-		n->free = pool->blocksize - size;
-		return &n->data[n->free];
-	}
-}
-
-void mempool_flush(MemPool *pool, int freeall)
-{
-	MemPoolThresholdNode *tn, *tw;
-	MemPoolNode *pw, *pn;
-
-	tw = pool->threshold_blocks;
-	while (tw) {
-		tn = tw->next;
-		g_free(tw);
-		tw = tn;
-	}
-	pool->threshold_blocks = NULL;
-
-	if (freeall) {
-		pw = pool->blocks;
-		while (pw) {
-			pn = pw->next;
-			g_free(pw);
-			pw = pn;
-		}
-		pool->blocks = NULL;
-	} else {
-		pw = pool->blocks;
-		while (pw) {
-			pw->free = pool->blocksize;
-			pw = pw->next;
-		}
-	}
-}
-
-void mempool_free(MemPool *pool)
-{
-	if (pool) {
-		mempool_flush(pool, 1);
-		g_free(pool);
-	}
-}
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-#define SCAN_BUF 4096		/* size of read buffer */
-#define SCAN_HEAD 128		/* headroom guaranteed to be before each read buffer */
-
-/* a little hacky, but i couldn't be bothered renaming everything */
-#define _header_scan_state _CamelMimeParserPrivate
-#define _PRIVATE(o) (((CamelMimeParser *)(o))->priv)
-
-struct _header_scan_state {
-
-    /* global state */
-
-	enum _header_state state;
-
-	/* for building headers during scanning */
-	char *outbuf;
-	char *outptr;
-	char *outend;
-
-	int fd;			/* input for a fd input */
-	CamelStream *stream;	/* or for a stream */
-
-	/* for scanning input buffers */
-	char *realbuf;		/* the real buffer, SCAN_HEAD*2 + SCAN_BUF bytes */
-	char *inbuf;		/* points to a subset of the allocated memory, the underflow */
-	char *inptr;		/* (upto SCAN_HEAD) is for use by filters so they dont copy all data */
-	char *inend;
-
-	int atleast;
-
-	int seek;		/* current offset to start of buffer */
-	int unstep;		/* how many states to 'unstep' (repeat the current state) */
-
-	unsigned int midline:1;		/* are we mid-line interrupted? */
-	unsigned int scan_from:1;	/* do we care about From lines? */
-	unsigned int scan_pre_from:1;	/* do we return pre-from data? */
-
-	int start_of_from;	/* where from started */
-	int start_of_headers;	/* where headers started from the last scan */
-
-	int header_start;	/* start of last header, or -1 */
-
-	/* filters to apply to all content before output */
-	int filterid;		/* id of next filter */
-	struct _header_scan_filter *filters;
-
-    /* per message/part info */
-	struct _header_scan_stack *parts;
-
-};
-
-struct _header_scan_stack {
-	struct _header_scan_stack *parent;
-
-	enum _header_state savestate; /* state at invocation of this part */
-
-#ifdef MEMPOOL
-	MemPool *pool;		/* memory pool to keep track of headers/etc at this level */
-#endif
-	struct _header_raw *headers;	/* headers for this part */
-
-	struct _header_content_type *content_type;
-
-	/* I dont use GString's casue you can't efficiently append a buffer to them */
-	GByteArray *pretext;	/* for multipart types, save the pre-boundary data here */
-	GByteArray *posttext;	/* for multipart types, save the post-boundary data here */
-	int prestage;		/* used to determine if it is a pre-boundary or post-boundary data segment */
-
-	GByteArray *from_line;	/* the from line */
-
-	char *boundary;		/* for multipart/ * boundaries, including leading -- and trailing -- for the final part */
-	int boundarylen;	/* actual length of boundary, including leading -- if there is one */
-	int boundarylenfinal;	/* length of boundary, including trailing -- if there is one */
-	int atleast;		/* the biggest boundary from here to the parent */
-};
-
-struct _header_scan_filter {
-	struct _header_scan_filter *next;
-	int id;
-	CamelMimeFilter *filter;
-};
-
-static void folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength);
-static void folder_scan_drop_step(struct _header_scan_state *s);
-static int folder_scan_init_with_fd(struct _header_scan_state *s, int fd);
-static int folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream);
-static struct _header_scan_state *folder_scan_init(void);
-static void folder_scan_close(struct _header_scan_state *s);
-static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length);
-static struct _header_scan_stack *folder_scan_header(struct _header_scan_state *s, int *lastone);
-static int folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save);
-static off_t folder_seek(struct _header_scan_state *s, off_t offset, int whence);
-static off_t folder_tell(struct _header_scan_state *s);
-static int folder_read(struct _header_scan_state *s);
-#ifdef MEMPOOL
-static void header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset);
-#endif
-
-static void camel_mime_parser_class_init (CamelMimeParserClass *klass);
-static void camel_mime_parser_init       (CamelMimeParser *obj);
-
-#if d(!)0
-static char *states[] = {
-	"HSCAN_INITIAL",
-	"HSCAN_PRE_FROM",	/* pre-from data */
-	"HSCAN_FROM",		/* got 'From' line */
-	"HSCAN_HEADER",		/* toplevel header */
-	"HSCAN_BODY",		/* scanning body of message */
-	"HSCAN_MULTIPART",	/* got multipart header */
-	"HSCAN_MESSAGE",	/* rfc822/news message */
-
-	"HSCAN_PART",		/* part of a multipart */
-
-	"HSCAN_EOF",		/* end of file */
-	"HSCAN_PRE_FROM_END",
-	"HSCAN_FROM_END",
-	"HSCAN_HEAER_END",
-	"HSCAN_BODY_END",
-	"HSCAN_MULTIPART_END",
-	"HSCAN_MESSAGE_END",
-};
-#endif
-
-static CamelObjectClass *camel_mime_parser_parent;
-
-static void
-camel_mime_parser_class_init (CamelMimeParserClass *klass)
-{
-	camel_mime_parser_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-static void
-camel_mime_parser_init (CamelMimeParser *obj)
-{
-	struct _header_scan_state *s;
-
-	s = folder_scan_init();
-	_PRIVATE(obj) = s;
-}
-
-static void
-camel_mime_parser_finalise(CamelObject *o)
-{
-	struct _header_scan_state *s = _PRIVATE(o);
-#ifdef PURIFY
-	purify_watch_remove_all();
-#endif
-	folder_scan_close(s);
-}
-
-CamelType
-camel_mime_parser_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelMimeParser",
-					    sizeof (CamelMimeParser),
-					    sizeof (CamelMimeParserClass),
-					    (CamelObjectClassInitFunc) camel_mime_parser_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_parser_init,
-					    (CamelObjectFinalizeFunc) camel_mime_parser_finalise);
-	}
-	
-	return type;
-}
-
-/**
- * camel_mime_parser_new:
- *
- * Create a new CamelMimeParser object.
- * 
- * Return value: A new CamelMimeParser widget.
- **/
-CamelMimeParser *
-camel_mime_parser_new (void)
-{
-	CamelMimeParser *new = CAMEL_MIME_PARSER ( camel_object_new (camel_mime_parser_get_type ()));
-	return new;
-}
-
-
-/**
- * camel_mime_parser_filter_add:
- * @m: 
- * @mf: 
- * 
- * Add a filter that will be applied to any body content before it is passed
- * to the caller.  Filters may be pipelined to perform multi-pass operations
- * on the content, and are applied in the order they were added.
- *
- * Note that filters are only applied to the body content of messages, and once
- * a filter has been set, all content returned by a filter_step() with a state
- * of HSCAN_BODY will have passed through the filter.
- * 
- * Return value: An id that may be passed to filter_remove() to remove
- * the filter, or -1 if the operation failed.
- **/
-int
-camel_mime_parser_filter_add(CamelMimeParser *m, CamelMimeFilter *mf)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	struct _header_scan_filter *f, *new;
-
-	new = g_malloc(sizeof(*new));
-	new->filter = mf;
-	new->id = s->filterid++;
-	if (s->filterid == -1)
-		s->filterid++;
-	new->next = 0;
-	camel_object_ref((CamelObject *)mf);
-
-	/* yes, this is correct, since 'next' is the first element of the struct */
-	f = (struct _header_scan_filter *)&s->filters;
-	while (f->next)
-		f = f->next;
-	f->next = new;
-	return new->id;
-}
-
-/**
- * camel_mime_parser_filter_remove:
- * @m: 
- * @id: 
- * 
- * Remove a processing filter from the pipeline.  There is no
- * restriction on the order the filters can be removed.
- **/
-void
-camel_mime_parser_filter_remove(CamelMimeParser *m, int id)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	struct _header_scan_filter *f, *old;
-	
-	f = (struct _header_scan_filter *)&s->filters;
-	while (f && f->next) {
-		old = f->next;
-		if (old->id == id) {
-			camel_object_unref((CamelObject *)old->filter);
-			f->next = old->next;
-			g_free(old);
-			/* there should only be a single matching id, but
-			   scan the whole lot anyway */
-		}
-		f = f->next;
-	}
-}
-
-/**
- * camel_mime_parser_header:
- * @m: 
- * @name: Name of header.
- * @offset: Pointer that can receive the offset of the header in
- * the stream from the start of parsing.
- * 
- * Lookup a header by name.
- * 
- * Return value: The header value, or NULL if the header is not
- * defined.
- **/
-const char *
-camel_mime_parser_header(CamelMimeParser *m, const char *name, int *offset)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts &&
-	    s->parts->headers) {
-		return header_raw_find(&s->parts->headers, name, offset);
-	}
-	return NULL;
-}
-
-/**
- * camel_mime_parser_headers_raw:
- * @m: 
- * 
- * Get the list of the raw headers which are defined for the
- * current state of the parser.  These headers are valid
- * until the next call to parser_step(), or parser_drop_step().
- * 
- * Return value: The raw headers, or NULL if there are no headers
- * defined for the current part or state.  These are READ ONLY.
- **/
-struct _header_raw *
-camel_mime_parser_headers_raw(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return s->parts->headers;
-	return NULL;
-}
-
-static const char *
-byte_array_to_string(GByteArray *array)
-{
-	if (array == NULL)
-		return NULL;
-
-	if (array->len == 0 || array->data[array->len-1] != '\0')
-		g_byte_array_append(array, "", 1);
-
-	return array->data;
-}
-
-/**
- * camel_mime_parser_preface:
- * @m: 
- * 
- * Retrieve the preface text for the current multipart.
- * Can only be used when the state is HSCAN_MULTIPART_END.
- * 
- * Return value: The preface text, or NULL if there wasn't any.
- **/
-const char *
-camel_mime_parser_preface(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->pretext);
-
-	return NULL;
-}
-
-/**
- * camel_mime_parser_postface:
- * @m: 
- * 
- * Retrieve the postface text for the current multipart.
- * Only returns valid data when the current state if
- * HSCAN_MULTIPART_END.
- * 
- * Return value: The postface text, or NULL if there wasn't any.
- **/
-const char *
-camel_mime_parser_postface(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->posttext);
-
-	return NULL;
-}
-
-/**
- * camel_mime_parser_from_line:
- * @m: 
- * 
- * Get the last scanned "From " line, from a recently scanned from.
- * This should only be called in the HSCAN_FROM state.  The
- * from line will include the closing \n found (if there was one).
- *
- * The return value will remain valid while in the HSCAN_FROM
- * state, or any deeper state.
- * 
- * Return value: The From line, or NULL if called out of context.
- **/
-const char *
-camel_mime_parser_from_line(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->from_line);
-
-	return NULL;
-}
-
-/**
- * camel_mime_parser_init_with_fd:
- * @m: 
- * @fd: A valid file descriptor.
- * 
- * Initialise the scanner with an fd.  The scanner's offsets
- * will be relative to the current file position of the file
- * descriptor.  As a result, seekable descritors should
- * be seeked using the parser seek functions.
- * 
- * An initial buffer will be read from the file descriptor
- * immediately, although no parsing will occur.
- *
- * Return value: Returns -1 on error.
- **/
-int
-camel_mime_parser_init_with_fd(CamelMimeParser *m, int fd)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_scan_init_with_fd(s, fd);
-}
-
-/**
- * camel_mime_parser_init_with_stream:
- * @m: 
- * @stream: 
- * 
- * Initialise the scanner with a source stream.  The scanner's
- * offsets will be relative to the current file position of
- * the stream.  As a result, seekable streams should only
- * be seeked using the parser seek function.
- *
- * An initial buffer will be read from the stream
- * immediately, although no parsing will occur.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_scan_init_with_stream(s, stream);
-}
-
-/**
- * camel_mime_parser_scan_from:
- * @m: 
- * @scan_from: #TRUE if the scanner should scan From lines.
- * 
- * Tell the scanner if it should scan "^From " lines or not.
- *
- * If the scanner is scanning from lines, two additional
- * states HSCAN_FROM and HSCAN_FROM_END will be returned
- * to the caller during parsing.
- *
- * This may also be preceeded by an optional
- * HSCAN_PRE_FROM state which contains the scanned data
- * found before the From line is encountered.  See also
- * scan_pre_from().
- **/
-void
-camel_mime_parser_scan_from(CamelMimeParser *m, int scan_from)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	s->scan_from = scan_from;
-}
-
-/**
- * camel_mime_parser_scan_pre_from:
- * @: 
- * @scan_pre_from: #TRUE if we want to get pre-from data.
- * 
- * Tell the scanner whether we want to know abou the pre-from
- * data during a scan.  If we do, then we may get an additional
- * state HSCAN_PRE_FROM which returns the specified data.
- **/
-void
-camel_mime_parser_scan_pre_from(CamelMimeParser *m, int scan_pre_from)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	s->scan_pre_from = scan_pre_from;
-}
-
-/**
- * camel_mime_parser_content_type:
- * @m: 
- * 
- * Get the content type defined in the current part.
- * 
- * Return value: A content_type structure, or NULL if there
- * is no content-type defined for this part of state of the
- * parser.
- **/
-struct _header_content_type *
-camel_mime_parser_content_type(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	/* FIXME: should this search up until it's found the 'right'
-	   content-type?  can it? */
-	if (s->parts)
-		return s->parts->content_type;
-	return NULL;
-}
-
-/**
- * camel_mime_parser_unstep:
- * @m: 
- * 
- * Cause the last step operation to repeat itself.  If this is 
- * called repeated times, then the same step will be repeated
- * that many times.
- *
- * Note that it is not possible to scan back using this function,
- * only to have a way of peeking the next state.
- **/
-void camel_mime_parser_unstep(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	s->unstep++;
-}
-
-/**
- * camel_mime_parser_drop_step:
- * @m: 
- * 
- * Drop the last step call.  This should only be used
- * in conjunction with seeking of the stream as the
- * stream may be in an undefined state relative to the
- * state of the parser.
- *
- * Use this call with care.
- **/
-void camel_mime_parser_drop_step(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	s->unstep = 0;
-	folder_scan_drop_step(s);
-}
-
-/**
- * camel_mime_parser_step:
- * @m: 
- * @databuffer: Pointer to accept a pointer to the data
- * associated with this step (if any).  May be #NULL,
- * in which case datalength is also ingored.
- * @datalength: Pointer to accept a pointer to the data
- * length associated with this step (if any).
- * 
- * Parse the next part of the MIME message.  If _unstep()
- * has been called, then continue to return the same state
- * for that many calls.
- *
- * If the step is HSCAN_BODY then the databuffer and datalength
- * pointers will be setup to point to the internal data buffer
- * of the scanner and may be processed as required.  Any
- * filters will have already been applied to this data.
- *
- * Refer to the state diagram elsewhere for a full listing of
- * the states an application is gauranteed to get from the
- * scanner.
- *
- * Return value: The current new state of the parser
- * is returned.
- **/
-enum _header_state
-camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	d(printf("OLD STATE:  '%s' :\n", states[s->state]));
-
-	if (s->unstep <= 0) {
-		char *dummy;
-		int dummylength;
-
-		if (databuffer == NULL) {
-			databuffer = &dummy;
-			datalength = &dummylength;
-		}
-			
-		folder_scan_step(s, databuffer, datalength);
-	} else
-		s->unstep--;
-
-	d(printf("NEW STATE:  '%s' :\n", states[s->state]));
-
-	return s->state;
-}
-
-/**
- * camel_mime_parser_read:
- * @m: 
- * @databuffer: 
- * @len: 
- * 
- * Read at most @len bytes from the internal mime parser buffer.
- *
- * Returns the address of the internal buffer in @databuffer,
- * and the length of useful data.
- *
- * @len may be specified as INT_MAX, in which case you will
- * get the full remainder of the buffer at each call.
- *
- * Note that no parsing of the data read through this function
- * occurs, so no state changes occur, but the seek position
- * is updated appropriately.
- *
- * Return value: The number of bytes available, or -1 on error.
- **/
-int
-camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	int there;
-
-	if (len == 0)
-		return 0;
-
-	d(printf("parser::read() reading %d bytes\n", len));
-
-	there = MIN(s->inend - s->inptr, len);
-	d(printf("parser::read() there = %d bytes\n", there));
-	if (there > 0) {
-		*databuffer = s->inptr;
-		s->inptr += there;
-		return there;
-	}
-
-	if (folder_read(s) == -1)
-		return -1;
-
-	there = MIN(s->inend - s->inptr, len);
-	d(printf("parser::read() had to re-read, now there = %d bytes\n", there));
-
-	*databuffer = s->inptr;
-	s->inptr += there;
-
-	return there;
-}
-
-/**
- * camel_mime_parser_tell:
- * @m: 
- * 
- * Return the current scanning offset.  The meaning of this
- * value will depend on the current state of the parser.
- *
- * An incomplete listing of the states:
- *
- * HSCAN_INITIAL, The start of the current message.
- * HSCAN_HEADER, HSCAN_MESSAGE, HSCAN_MULTIPART, the character
- * position immediately after the end of the header.
- * HSCAN_BODY, Position within the message of the start
- * of the current data block.
- * HSCAN_*_END, The position of the character starting
- * the next section of the scan (the last position + 1 of
- * the respective current state).
- * 
- * Return value: See above.
- **/
-off_t camel_mime_parser_tell(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_tell(s);
-}
-
-/**
- * camel_mime_parser_tell_start_headers:
- * @m: 
- * 
- * Find out the position within the file of where the
- * headers started, this is cached by the parser
- * at the time.
- * 
- * Return value: The header start position, or -1 if
- * no headers were scanned in the current state.
- **/
-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return s->start_of_headers;
-}
-
-/**
- * camel_mime_parser_tell_start_from:
- * @m: 
- * 
- * If the parser is scanning From lines, then this returns
- * the position of the start of the From line.
- * 
- * Return value: The start of the from line, or -1 if there
- * was no From line, or From lines are not being scanned.
- **/
-off_t camel_mime_parser_tell_start_from(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return s->start_of_from;
-}
-
-/**
- * camel_mime_parser_seek:
- * @m: 
- * @off: Number of bytes to offset the seek by.
- * @whence: SEEK_SET, SEEK_CUR, SEEK_END
- * 
- * Reset the source position to a known value.
- *
- * Note that if the source stream/descriptor was not
- * positioned at 0 to begin with, and an absolute seek
- * is specified (whence != SEEK_CUR), then the seek
- * position may not match the desired seek position.
- * 
- * Return value: The new seek offset, or -1 on
- * an error (for example, trying to seek on a non-seekable
- * stream or file descriptor).
- **/
-off_t camel_mime_parser_seek(CamelMimeParser *m, off_t off, int whence)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return folder_seek(s, off, whence);
-}
-
-/**
- * camel_mime_parser_state:
- * @m: 
- * 
- * Get the current parser state.
- * 
- * Return value: The current parser state.
- **/
-enum _header_state camel_mime_parser_state(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->state;
-}
-
-/**
- * camel_mime_parser_stream:
- * @m: 
- * 
- * Get the stream, if any, the parser has been initialised
- * with.  May be used to setup sub-streams, but should not
- * be read from directly (without saving and restoring
- * the seek position in between).
- * 
- * Return value: The stream from _init_with_stream(), or NULL
- * if the parser is reading from a file descriptor or is
- * uninitialised.
- **/
-CamelStream *camel_mime_parser_stream(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->stream;
-}
-
-/**
- * camel_mime_parser_fd:
- * @m: 
- * 
- * Return the file descriptor, if any, the parser has been
- * initialised with.
- *
- * Should not be read from unless the parser it to terminate,
- * or the seek offset can be reset before the next parse
- * step.
- * 
- * Return value: The file descriptor or -1 if the parser
- * is reading from a stream or has not been initialised.
- **/
-int camel_mime_parser_fd(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->fd;
-}
-
-/* ********************************************************************** */
-/*    Implementation							  */
-/* ********************************************************************** */
-
-/* read the next bit of data, ensure there is enough room 'atleast' bytes */
-static int
-folder_read(struct _header_scan_state *s)
-{
-	int len;
-	int inoffset;
-
-	if (s->inptr<s->inend-s->atleast)
-		return s->inend-s->inptr;
-#ifdef PURIFY
-	purify_watch_remove(inend_id);
-	purify_watch_remove(inbuffer_id);
-#endif
-	/* check for any remaning bytes (under the atleast limit( */
-	inoffset = s->inend - s->inptr;
-	if (inoffset>0) {
-		memcpy(s->inbuf, s->inptr, inoffset);
-	}
-	if (s->stream) {
-		len = camel_stream_read(s->stream, s->inbuf+inoffset, SCAN_BUF-inoffset);
-	} else {
-		len = read(s->fd, s->inbuf+inoffset, SCAN_BUF-inoffset);
-	}
-	r(printf("read %d bytes, offset = %d\n", len, inoffset));
-	if (len>=0) {
-		/* add on the last read block */
-		s->seek += s->inptr - s->inbuf;
-		s->inptr = s->inbuf;
-		s->inend = s->inbuf+len+inoffset;
-		r(printf("content = %d '%.*s'\n",s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
-	}
-
-	g_assert(s->inptr<=s->inend);
-#ifdef PURIFY
-	inend_id = purify_watch(&s->inend);
-	inbuffer_id = purify_watch_n(s->inend+1, SCAN_HEAD-1, "rw");
-#endif
-	r(printf("content = %d '%.*s'\n", s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
-	/* set a sentinal, for the inner loops to check against */
-	s->inend[0] = '\n';
-	return s->inend-s->inptr;
-}
-
-/* return the current absolute position of the data pointer */
-static off_t
-folder_tell(struct _header_scan_state *s)
-{
-	return s->seek + (s->inptr - s->inbuf);
-}
-
-/*
-  need some way to prime the parser state, so this actually works for 
-  other than top-level messages
-*/
-static off_t
-folder_seek(struct _header_scan_state *s, off_t offset, int whence)
-{
-	off_t newoffset;
-	int len;
-
-	if (s->stream) {
-		if (CAMEL_IS_SEEKABLE_STREAM(s->stream)) {
-			/* NOTE: assumes whence seekable stream == whence libc, which is probably
-			   the case (or bloody well should've been) */
-			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence);
-		} else {
-			newoffset = -1;
-			errno = EINVAL;
-		}
-	} else {
-		newoffset = lseek(s->fd, offset, whence);
-	}
-#ifdef PURIFY
-	purify_watch_remove(inend_id);
-	purify_watch_remove(inbuffer_id);
-#endif
-	if (newoffset != -1) {
-		s->seek = newoffset;
-		s->inptr = s->inbuf;
-		s->inend = s->inbuf;
-		if (s->stream)
-			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF);
-		else
-			len = read(s->fd, s->inbuf, SCAN_BUF);
-		if (len>=0) {
-			s->inend = s->inbuf+len;
-			s->inend[0] = '\n';
-		} else
-			newoffset = -1;
-	}
-#ifdef PURIFY
-	inend_id = purify_watch(&s->inend);
-	inbuffer_id = purify_watch_n(s->inend+1, SCAN_HEAD-1, "rw");
-#endif
-	return newoffset;
-}
-
-static void
-folder_push_part(struct _header_scan_state *s, struct _header_scan_stack *h)
-{
-	if (s->parts && s->parts->atleast > h->boundarylenfinal)
-		h->atleast = s->parts->atleast;
-	else
-		h->atleast = MAX(h->boundarylenfinal, 1);
-
-	h->parent = s->parts;
-	s->parts = h;
-}
-
-static void
-folder_pull_part(struct _header_scan_state *s)
-{
-	struct _header_scan_stack *h;
-
-	h = s->parts;
-	if (h) {
-		s->parts = h->parent;
-		g_free(h->boundary);
-#ifdef MEMPOOL
-		mempool_free(h->pool);
-#else
-		header_raw_clear(&h->headers);
-#endif
-		header_content_type_unref(h->content_type);
-		if (h->pretext)
-			g_byte_array_free(h->pretext, TRUE);
-		if (h->posttext)
-			g_byte_array_free(h->posttext, TRUE);
-		if (h->from_line)
-			g_byte_array_free(h->from_line, TRUE);
-		g_free(h);
-	} else {
-		g_warning("Header stack underflow!\n");
-	}
-}
-
-static int
-folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save)
-{
-	int atleast = s->atleast;
-	register char *inptr, *inend, c;
-	int len;
-
-	s->atleast = 1;
-
-	while ( (len = folder_read(s)) > 0 && len > s->atleast) { /* ensure we have at least enough room here */
-		inptr = s->inptr;
-		inend = s->inend-1;
-
-		c = -1;
-		while (inptr<inend
-		       && (c = *inptr++)!='\n')
-			;
-
-		if (save)
-			g_byte_array_append(save, s->inptr, inptr-s->inptr);
-
-		s->inptr = inptr;
-
-		if (c=='\n') {
-			s->atleast = atleast;
-			return 0;
-		}
-	}
-
-	s->atleast = atleast;
-
-	return -1;		/* not found */
-}
-
-/* TODO: Is there any way to make this run faster?  It gets called a lot ... */
-static struct _header_scan_stack *
-folder_boundary_check(struct _header_scan_state *s, const char *boundary, int *lastone)
-{
-	struct _header_scan_stack *part;
-	int len = s->atleast;	/* make sure we dont access past the buffer */
-	
-	h(printf("checking boundary marker upto %d bytes\n", len));
-	part = s->parts;
-	while (part) {
-		h(printf("  boundary: %s\n", part->boundary));
-		h(printf("   against: '%.*s'\n", s->atleast, boundary));
-		if (part->boundary
-		    && part->boundarylen <= len
-		    && memcmp(boundary, part->boundary, part->boundarylen)==0) {
-			h(printf("matched boundary: %s\n", part->boundary));
-			/* again, make sure we're in range */
-			if (part->boundarylenfinal <= len) {
-				int extra = part->boundarylenfinal - part->boundarylen;
-				
-				/* check the extra stuff on an final boundary, normally -- for mime parts */
-				if (extra>0) {
-					*lastone = memcmp(&boundary[part->boundarylen],
-							  &part->boundary[part->boundarylen],
-							  extra) == 0;
-				} else {
-					*lastone = TRUE;
-				}
-				h(printf("checking lastone = %s\n", *lastone?"TRUE":"FALSE"));
-			} else {
-				h(printf("not enough room to check last one?\n"));
-				*lastone = FALSE;
-			}
-			/*printf("ok, we found it! : %s \n", (*lastone)?"Last one":"More to come?");*/
-			return part;
-		}
-		part = part->parent;
-	}
-	return NULL;
-}
-
-#ifdef MEMPOOL
-static void
-header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset)
-{
-	struct _header_raw *l, *n;
-	char *content;
-	
-	content = strchr(header, ':');
-	if (content) {
-		register int len;
-		n = mempool_alloc(h->pool, sizeof(*n));
-		n->next = NULL;
-		
-		len = content-header;
-		n->name = mempool_alloc(h->pool, len+1);
-		memcpy(n->name, header, len);
-		n->name[len] = 0;
-		
-		content++;
-		
-		len = s->outptr - content;
-		n->value = mempool_alloc(h->pool, len+1);
-		memcpy(n->value, content, len);
-		n->value[len] = 0;
-		
-		n->offset = offset;
-		
-		l = (struct _header_raw *)&h->headers;
-		while (l->next) {
-			l = l->next;
-		}
-		l->next = n;
-	}
-	
-}
-
-#define header_raw_append_parse(a, b, c) (header_append_mempool(s, h, b, c))
-
-#endif
-
-/* Copy the string start->inptr into the header buffer (s->outbuf),
-   grow if necessary
-   remove trailing \r chars (\n's assumed already removed)
-   and track the start offset of the header */
-/* Basically an optimised version of g_byte_array_append() */
-#define header_append(s, start, inptr)								\
-{												\
-	register int headerlen = inptr-start;							\
-												\
-	if (headerlen > 0) {									\
-		if (headerlen >= (s->outend - s->outptr)) {					\
-			register char *outnew;							\
-			register int len = ((s->outend - s->outbuf)+headerlen)*2+1;		\
-			outnew = g_realloc(s->outbuf, len);					\
-			s->outptr = s->outptr - s->outbuf + outnew;				\
-			s->outbuf = outnew;							\
-			s->outend = outnew + len;						\
-		}										\
-		if (start[headerlen-1] == '\r')							\
-			headerlen--;								\
-		memcpy(s->outptr, start, headerlen);						\
-		s->outptr += headerlen;								\
-	}											\
-	if (s->header_start == -1)								\
-		s->header_start = (start-s->inbuf) + s->seek;					\
-}
-
-static struct _header_scan_stack *
-folder_scan_header(struct _header_scan_state *s, int *lastone)
-{
-	int atleast = s->atleast, newatleast;
-	char *start = NULL;
-	int len;
-	struct _header_scan_stack *h;
-	char *inend;
-	register char *inptr;
-
-	h(printf("scanning first bit\n"));
-
-	h = g_malloc0(sizeof(*h));
-#ifdef MEMPOOL
-	h->pool = mempool_new(8192, 4096);
-#endif
-
-	if (s->parts)
-		newatleast = s->parts->atleast;
-	else
-		newatleast = 1;
-	*lastone = FALSE;
-
-	do {
-		s->atleast = newatleast;
-
-		h(printf("atleast = %d\n", s->atleast));
-
-		while ((len = folder_read(s))>0 && len >= s->atleast) { /* ensure we have at least enough room here */
-			inptr = s->inptr;
-			inend = s->inend-s->atleast+1;
-			
-			while (inptr<inend) {
-				if (!s->midline) {
-					if (folder_boundary_check(s, inptr, lastone)) {
-						if ((s->outptr>s->outbuf))
-							goto header_truncated; /* may not actually be truncated */
-						
-						goto header_done;
-					}
-				}
-				
-				start = inptr;
-
-				/* goto next line/sentinal */
-				while ((*inptr++)!='\n')
-					;
-			
-				g_assert(inptr<=s->inend+1);
-				
-				/* check for sentinal or real end of line */
-				if (inptr > inend) {
-					h(printf("not at end of line yet, going further\n"));
-					/* didn't find end of line within our allowed area */
-					inptr = inend;
-					s->midline = TRUE;
-					header_append(s, start, inptr);
-				} else {
-					h(printf("got line part: '%.*s'\n", inptr-1-start, start));
-					/* got a line, strip and add it, process it */
-					s->midline = FALSE;
-					header_append(s, start, inptr-1);
-
-					/* check for end of headers */
-					if (s->outbuf == s->outptr)
-						goto header_done;
-
-					/* check for continuation/compress headers, we have atleast 1 char here to work with */
-					if (inptr[0] ==  ' ' || inptr[0] == '\t') {
-						h(printf("continuation\n"));
-						/* TODO: this wont catch multiple space continuation across a read boundary, but
-						   that is assumed rare, and not fatal anyway */
-						do
-							inptr++;
-						while (*inptr == ' ' || *inptr == '\t');
-						inptr--;
-						*inptr = ' ';
-					} else {
-						/* otherwise, complete header, add it */
-						s->outptr[0] = 0;
-				
-						h(printf("header '%.20s' at %d\n", s->outbuf, s->header_start));
-						
-						header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-						s->outptr = s->outbuf;
-						s->header_start = -1;
-					}
-				}
-			}
-			s->inptr = inptr;
-		}
-		h(printf("end of file?  read %d bytes\n", len));
-		newatleast = 1;
-	} while (s->atleast > 1);
-
-	if ((s->outptr > s->outbuf) || s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		if (inptr > start) {
-			if (inptr[-1] == '\n')
-				inptr--;
-		}
-		goto header_truncated;
-	}
-	
-	s->atleast = atleast;
-	
-	return h;
-	
-header_truncated:
-	header_append(s, start, inptr);
-	
-	s->outptr[0] = 0;
-	if (s->outbuf == s->outptr)
-		goto header_done;
-	
-	header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-	
-	s->outptr = s->outbuf;
-header_done:
-	s->inptr = inptr;
-	s->atleast = atleast;
-	s->header_start = -1;
-	return h;
-}
-
-static struct _header_scan_stack *
-folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length)
-{
-	int atleast = s->atleast, newatleast;
-	register char *inptr;
-	char *inend;
-	char *start;
-	int len;
-	struct _header_scan_stack *part;
-	int onboundary = FALSE;
-
-	c(printf("scanning content\n"));
-
-	part = s->parts;
-	if (part)
-		newatleast = part->atleast;
-	else
-		newatleast = 1;
-	*lastone = FALSE;
-
-	c(printf("atleast = %d\n", s->atleast));
-
-	do {
-		s->atleast = newatleast;
-
-		while ((len = folder_read(s))>0 && len >= s->atleast) { /* ensure we have at least enough room here */
-			inptr = s->inptr;
-			inend = s->inend-s->atleast+1;
-			start = inptr;
-
-			c(printf("inptr = %p, inend = %p\n", inptr, inend));
-
-			while (inptr<inend) {
-				if (!s->midline
-				    && (part = folder_boundary_check(s, inptr, lastone))) {
-					onboundary = TRUE;
-
-					/* since we truncate the boundary data, we need at least 1 char here spare,
-					   to remain in the same state */
-					if ( (inptr-start) > 1)
-						goto content;
-
-					/* otherwise, jump to the state of the boundary we actually found */
-					goto normal_exit;
-				}
-				
-				/* goto the next line */
-				while ((*inptr++)!='\n')
-					;
-
-				/* check the sentinal, if we went past the atleast limit, and reset it to there */
-				if (inptr > inend) {
-					s->midline = TRUE;
-					inptr = inend;
-				} else {
-					s->midline = FALSE;
-				}
-			}
-
-			c(printf("ran out of input, dumping what i have (%d) bytes midline = %s\n",
-				 inptr-start, s->midline?"TRUE":"FALSE"));
-			goto content;
-		}
-		newatleast = 1;
-	} while (s->atleast > 1);
-
-	c(printf("length read = %d\n", len));
-
-	if (s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		goto content;
-	}
-
-	*length = 0;
-	s->atleast = atleast;
-	return NULL;
-
-content:
-	part = s->parts;
-normal_exit:
-	s->atleast = atleast;
-	s->inptr = inptr;
-
-	*data = start;
-	/* if we hit a boundary, we should not include the closing \n */
-	if (onboundary && (inptr-start)>0)
-		*length = inptr-start-1;
-	else
-		*length = inptr-start;
-
-	/*printf("got %scontent: '%.*s'\n", s->midline?"partial ":"", inptr-start, start);*/
-
-	return part;
-}
-
-
-static void
-folder_scan_close(struct _header_scan_state *s)
-{
-	g_free(s->realbuf);
-	g_free(s->outbuf);
-	while (s->parts)
-		folder_pull_part(s);
-	if (s->fd != -1)
-		close(s->fd);
-	if (s->stream) {
-		camel_object_unref((CamelObject *)s->stream);
-	}
-	g_free(s);
-}
-
-
-static struct _header_scan_state *
-folder_scan_init(void)
-{
-	struct _header_scan_state *s;
-
-	s = g_malloc(sizeof(*s));
-
-	s->fd = -1;
-	s->stream = NULL;
-
-	s->outbuf = g_malloc(1024);
-	s->outptr = s->outbuf;
-	s->outend = s->outbuf+1024;
-
-	s->realbuf = g_malloc(SCAN_BUF + SCAN_HEAD*2);
-	s->inbuf = s->realbuf + SCAN_HEAD;
-	s->inptr = s->inbuf;
-	s->inend = s->inbuf;
-	s->atleast = 0;
-
-	s->seek = 0;		/* current character position in file of the last read block */
-	s->unstep = 0;
-
-	s->header_start = -1;
-
-	s->start_of_from = -1;
-	s->start_of_headers = -1;
-
-	s->midline = FALSE;
-	s->scan_from = FALSE;
-	s->scan_pre_from = FALSE;
-
-	s->filters = NULL;
-	s->filterid = 1;
-
-	s->parts = NULL;
-
-	s->state = HSCAN_INITIAL;
-	return s;
-}
-
-static int
-folder_scan_init_with_fd(struct _header_scan_state *s, int fd)
-{
-	int len;
-
-	len = read(fd, s->inbuf, SCAN_BUF);
-	if (len>=0) {
-		s->inend = s->inbuf+len;
-		s->inptr = s->inbuf;
-		s->inend[0] = '\n';
-		if (s->fd != -1)
-			close(s->fd);
-		s->fd = fd;
-		if (s->stream) {
-			camel_object_unref((CamelObject *)s->stream);
-			s->stream = NULL;
-		}
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-static int
-folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
-{
-	int len;
-
-	len = camel_stream_read(stream, s->inbuf, SCAN_BUF);
-	if (len >= 0) {
-		s->inend = s->inbuf+len;
-		s->inptr = s->inbuf;
-		s->inend[0] = '\n';
-		if (s->stream)
-			camel_object_unref((CamelObject *)s->stream);
-		s->stream = stream;
-		camel_object_ref((CamelObject *)stream);
-		if (s->fd != -1) {
-			close(s->fd);
-			s->fd = -1;
-		}
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-#define USE_FROM
-
-static void
-folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength)
-{
-	struct _header_scan_stack *h, *hb;
-	const char *content;
-	const char *bound;
-	int type;
-	int state;
-	struct _header_content_type *ct = NULL;
-	struct _header_scan_filter *f;
-	size_t presize;
-
-/*	printf("\nSCAN PASS: state = %d '%s'\n", s->state, states[s->state]);*/
-
-tail_recurse:
-	d({
-		printf("\nSCAN STACK:\n");
-		printf(" '%s' :\n", states[s->state]);
-		hb = s->parts;
-		while (hb) {
-			printf("  '%s' : %s ", states[hb->savestate], hb->boundary);
-			if (hb->content_type) {
-				printf("(%s/%s)", hb->content_type->type, hb->content_type->subtype);
-			} else {
-				printf("(default)");
-			}
-			printf("\n");
-			hb = hb->parent;
-		}
-		printf("\n");
-	});
-
-	switch (s->state) {
-
-#ifdef USE_FROM
-	case HSCAN_INITIAL:
-		if (s->scan_from) {
-			h = g_malloc0(sizeof(*h));
-			h->boundary = g_strdup("From ");
-			h->boundarylen = strlen(h->boundary);
-			h->boundarylenfinal = h->boundarylen;
-			h->from_line = g_byte_array_new();
-			folder_push_part(s, h);
-			s->state = HSCAN_PRE_FROM;
-		} else {
-			s->start_of_from = -1;
-			goto scan_header;
-		}
-
-	case HSCAN_PRE_FROM:
-
-		h = s->parts;
-		do {
-			hb = folder_scan_content(s, &state, databuffer, datalength);
-			if (s->scan_pre_from && *datalength > 0) {
-				d(printf("got pre-from content %d bytes\n", *datalength));
-				return;
-			}
-		} while (hb==h && *datalength>0);
-
-		if (*datalength==0 && hb==h) {
-			d(printf("found 'From '\n"));
-			s->start_of_from = folder_tell(s);
-			folder_scan_skip_line(s, h->from_line);
-			h->savestate = HSCAN_INITIAL;
-			s->state = HSCAN_FROM;
-		} else {
-			folder_pull_part(s);
-			s->state = HSCAN_EOF;
-		}
-		return;
-#else
-	case HSCAN_INITIAL:
-	case HSCAN_PRE_FROM:
-#endif /* !USE_FROM */
-
-	scan_header:
-	case HSCAN_FROM:
-		s->start_of_headers = folder_tell(s);
-		h = folder_scan_header(s, &state);
-#ifdef USE_FROM
-		if (s->scan_from)
-			h->savestate = HSCAN_FROM_END;
-		else
-#endif
-			h->savestate = HSCAN_EOF;
-
-		/* FIXME: should this check for MIME-Version: 1.0 as well? */
-
-		type = HSCAN_HEADER;
-		if ( (content = header_raw_find(&h->headers, "Content-Type", NULL))
-		     && (ct = header_content_type_decode(content))) {
-			if (!strcasecmp(ct->type, "multipart")) {
-				bound = header_content_type_param(ct, "boundary");
-				if (bound) {
-					d(printf("multipart, boundary = %s\n", bound));
-					h->boundarylen = strlen(bound)+2;
-					h->boundarylenfinal = h->boundarylen+2;
-					h->boundary = g_malloc(h->boundarylen+3);
-					sprintf(h->boundary, "--%s--", bound);
-					type = HSCAN_MULTIPART;
-				} else {
-					header_content_type_unref(ct);
-					ct = header_content_type_decode("text/plain");
-/* We can't quite do this, as it will mess up all the offsets ... */
-/*					header_raw_replace(&h->headers, "Content-Type", "text/plain", offset);*/
-					g_warning("Multipart with no boundary, treating as text/plain");
-				}
-			} else if (!strcasecmp(ct->type, "message")) {
-				if (!strcasecmp(ct->subtype, "rfc822")
-				    || !strcasecmp(ct->subtype, "news")
-				    /*|| !strcasecmp(ct->subtype, "partial")*/) {
-					type = HSCAN_MESSAGE;
-				}
-			}
-		} else {
-			/* make the default type for multipart/digest be message/rfc822 */
-			if ((s->parts
-			     && header_content_type_is(s->parts->content_type, "multipart", "digest"))) {
-				ct = header_content_type_decode("message/rfc822");
-				type = HSCAN_MESSAGE;
-				d(printf("parent was multipart/digest, autoupgrading to message/rfc822?\n"));
-				/* maybe we should do this too?
-				   header_raw_append_parse(&h->headers, "Content-Type: message/rfc822", -1);*/
-			}
-		}
-		h->content_type = ct;
-		folder_push_part(s, h);
-		s->state = type;
-		return;
-		
-	case HSCAN_HEADER:
-		s->state = HSCAN_BODY;
-		
-	case HSCAN_BODY:
-		h = s->parts;
-		*datalength = 0;
-		presize = SCAN_HEAD;
-		f = s->filters;
-		
-		do {
-			hb = folder_scan_content (s, &state, databuffer, datalength);
-
-			d(printf ("\n\nOriginal content: '"));
-			d(fwrite(*databuffer, sizeof(char), *datalength, stdout));
-			d(printf("'\n"));
-
-			if (*datalength > 0) {
-				while (f) {
-					camel_mime_filter_filter(f->filter, *databuffer, *datalength, presize,
-								 databuffer, datalength, &presize);
-					d(printf ("Filtered content (%s): '",
-						  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-					d(fwrite(*databuffer, sizeof(char), *datalength, stdout));
-					d(printf("'\n"));
-					f = f->next;
-				}
-				return;
-			}
-		} while (hb == h && *datalength > 0);
-		
-		/* check for any filter completion data */
-		if (*datalength > 0) {
-			while (f) {
-				camel_mime_filter_complete(f->filter, *databuffer, *datalength, presize,
-							   databuffer, datalength, &presize);
-				f = f->next;
-			}
-		}
-		if (*datalength > 0)
-			return;
-		
-		s->state = HSCAN_BODY_END;
-		break;
-		
-	case HSCAN_MULTIPART:
-		h = s->parts;
-		do {
-			do {
-				hb = folder_scan_content(s, &state, databuffer, datalength);
-				if (*datalength>0) {
-					/* instead of a new state, we'll just store it locally and provide
-					   an accessor function */
-					d(printf("Multipart %s Content %p: '%.*s'\n",
-						 h->prestage>0?"post":"pre", h, *datalength, *databuffer));
-					if (h->prestage > 0) {
-						if (h->posttext == NULL)
-							h->posttext = g_byte_array_new();
-						g_byte_array_append(h->posttext, *databuffer, *datalength);
-					} else {
-						if (h->pretext == NULL)
-							h->pretext = g_byte_array_new();
-						g_byte_array_append(h->pretext, *databuffer, *datalength);
-					}
-				}
-			} while (hb==h && *datalength>0);
-			h->prestage++;
-			if (*datalength==0 && hb==h) {
-				d(printf("got boundary: %s\n", hb->boundary));
-				folder_scan_skip_line(s, NULL);
-				if (!state) {
-					s->state = HSCAN_FROM;
-					folder_scan_step(s, databuffer, datalength);
-					s->parts->savestate = HSCAN_MULTIPART; /* set return state for the new head part */
-					return;
-				}
-			} else {
-				break;
-			}
-		} while (1);
-
-		s->state = HSCAN_MULTIPART_END;
-		break;
-
-	case HSCAN_MESSAGE:
-		s->state = HSCAN_FROM;
-		folder_scan_step(s, databuffer, datalength);
-		s->parts->savestate = HSCAN_MESSAGE_END;
-		break;
-
-	case HSCAN_FROM_END:
-	case HSCAN_BODY_END:
-	case HSCAN_MULTIPART_END:
-	case HSCAN_MESSAGE_END:
-		s->state = s->parts->savestate;
-		folder_pull_part(s);
-		if (s->state & HSCAN_END)
-			return;
-		goto tail_recurse;
-
-	case HSCAN_EOF:
-		return;
-
-	default:
-		g_warning("Invalid state in camel-mime-parser: %d", s->state);
-		break;
-	}
-
-	return;
-}
-
-/* drops the current state back one */
-static void
-folder_scan_drop_step(struct _header_scan_state *s)
-{
-	switch (s->state) {
-	case HSCAN_INITIAL:
-	case HSCAN_EOF:
-		return;
-
-	case HSCAN_FROM:
-	case HSCAN_PRE_FROM:
-		s->state = HSCAN_INITIAL;
-		folder_pull_part(s);
-		return;
-
-	case HSCAN_MESSAGE:
-	case HSCAN_HEADER:
-	case HSCAN_MULTIPART:
-
-	case HSCAN_FROM_END:
-	case HSCAN_BODY_END:
-	case HSCAN_MULTIPART_END:
-	case HSCAN_MESSAGE_END:
-
-		s->state = s->parts->savestate;
-		folder_pull_part(s);
-		if (s->state & HSCAN_END) {
-			s->state &= ~HSCAN_END;
-		}
-		return;
-	default:
-		/* FIXME: not sure if this is entirely right */
-	}
-}
-
-#ifdef STANDALONE
-int main(int argc, char **argv)
-{
-	int fd;
-	struct _header_scan_state *s;
-	char *data;
-	int len;
-	int state;
-	char *name = "/tmp/evmail/Inbox";
-	struct _header_scan_stack *h;
-	int i;
-	int attach = 0;
-
-	if (argc==2)
-		name = argv[1];
-
-	printf("opening: %s", name);
-
-	for (i=1;i<argc;i++) {
-		const char *encoding = NULL, *charset = NULL;
-		char *attachname;
-
-		name = argv[i];
-		printf("opening: %s", name);
-		
-		fd = open(name, O_RDONLY);
-		if (fd==-1) {
-			perror("Cannot open mailbox");
-			exit(1);
-		}
-		s = folder_scan_init();
-		folder_scan_init_with_fd(s, fd);
-		s->scan_from = FALSE;
-#if 0
-		h = g_malloc0(sizeof(*h));
-		h->savestate = HSCAN_EOF;
-		folder_push_part(s, h);
-#endif	
-		while (s->state != HSCAN_EOF) {
-			folder_scan_step(s, &data, &len);
-			printf("\n -- PARSER STEP RETURN -- %d '%s'\n\n", s->state, states[s->state]);
-			switch (s->state) {
-			case HSCAN_HEADER:
-				if (s->parts->content_type
-				    && (charset = header_content_type_param(s->parts->content_type, "charset"))) {
-					if (strcasecmp(charset, "us-ascii")) {
-#if 0
-						folder_push_filter_charset(s, "UTF-8", charset);
-#endif
-					} else {
-						charset = NULL;
-					}
-				} else {
-					charset = NULL;
-				}
-
-				encoding = header_raw_find(&s->parts->headers, "Content-transfer-encoding", 0);
-				printf("encoding = '%s'\n", encoding);
-				if (encoding && !strncasecmp(encoding, " base64", 7)) {
-					printf("adding base64 filter\n");
-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);
-#if 0
-					folder_push_filter_save(s, attachname);
-#endif
-					g_free(attachname);
-#if 0
-					folder_push_filter_mime(s, 0);
-#endif
-				}
-				if (encoding && !strncasecmp(encoding, " quoted-printable", 17)) {
-					printf("adding quoted-printable filter\n");
-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);
-#if 0
-					folder_push_filter_save(s, attachname);
-#endif
-					g_free(attachname);
-#if 0
-					folder_push_filter_mime(s, 1);
-#endif
-				}
-
-				break;
-			case HSCAN_BODY:
-				printf("got body %d '%.*s'\n",  len, len, data);
-				break;
-			case HSCAN_BODY_END:
-				printf("end body %d '%.*s'\n",  len, len, data);
-				if (encoding && !strncasecmp(encoding, " base64", 7)) {
-					printf("removing filters\n");
-#if 0
-					folder_filter_pull(s);
-					folder_filter_pull(s);
-#endif
-				}
-				if (encoding && !strncasecmp(encoding, " quoted-printable", 17)) {
-					printf("removing filters\n");
-#if 0
-					folder_filter_pull(s);
-					folder_filter_pull(s);
-#endif
-				}
-				if (charset) {
-#if 0
-					folder_filter_pull(s);
-#endif
-					charset = NULL;
-				}
-				encoding = NULL;
-				break;
-			default:
-				break;
-			}
-		}
-		folder_scan_close(s);
-		close(fd);
-	}
-	return 0;
-}
-
-#endif /* STANDALONE */
-
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
deleted file mode 100644
index cef51696df..0000000000
--- a/camel/camel-mime-parser.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_PARSER_H
-#define _CAMEL_MIME_PARSER_H
-
-#include <camel/camel-object.h>
-
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-stream.h>
-
-#define CAMEL_MIME_PARSER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)
-#define CAMEL_MIME_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)
-#define CAMEL_IS_MIME_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_parser_get_type ())
-
-typedef struct _CamelMimeParserClass CamelMimeParserClass;
-
-/* NOTE: if you add more states, you may need to bump the
-   start of the END tags to 16 or 32, etc - so they are
-   the same as the matching start tag, with a bit difference */
-enum _header_state {
-	HSCAN_INITIAL,
-	HSCAN_PRE_FROM,		/* data before a 'From' line */
-	HSCAN_FROM,		/* got 'From' line */
-	HSCAN_HEADER,		/* toplevel header */
-	HSCAN_BODY,		/* scanning body of message */
-	HSCAN_MULTIPART,	/* got multipart header */
-	HSCAN_MESSAGE,		/* rfc822 message */
-
-	HSCAN_PART,		/* part of a multipart */
-
-	HSCAN_END = 8,		/* bit mask for 'end' flags */
-
-	HSCAN_EOF = 8,		/* end of file */
-	HSCAN_PRE_FROM_END,	/* pre from end */
-	HSCAN_FROM_END,		/* end of whole from bracket */
-	HSCAN_HEADER_END,	/* dummy value */
-	HSCAN_BODY_END,		/* end of message */
-	HSCAN_MULTIPART_END,	/* end of multipart  */
-	HSCAN_MESSAGE_END,	/* end of message */
-
-};
-
-struct _CamelMimeParser {
-	CamelObject parent;
-
-	struct _CamelMimeParserPrivate *priv;
-};
-
-struct _CamelMimeParserClass {
-	CamelObjectClass parent_class;
-
-	void (*message)(CamelMimeParser *, void *headers);
-	void (*part)(CamelMimeParser *);
-	void (*content)(CamelMimeParser *);
-};
-
-guint		camel_mime_parser_get_type	(void);
-CamelMimeParser      *camel_mime_parser_new	(void);
-
-/* using an fd will be a little faster, but not much (over a simple stream) */
-int		camel_mime_parser_init_with_fd(CamelMimeParser *, int fd);
-int		camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream);
-
-/* get the stream or fd back of the parser */
-CamelStream    *camel_mime_parser_stream(CamelMimeParser *m);
-int		camel_mime_parser_fd(CamelMimeParser *m);
-
-/* scan 'From' separators? */
-void camel_mime_parser_scan_from(CamelMimeParser *, int);
-/* Do we want to know about the pre-from data? */
-void camel_mime_parser_scan_pre_from(CamelMimeParser *, int);
-
-/* what headers to save, MUST include ^Content-Type: */
-int camel_mime_parser_set_header_regex(CamelMimeParser *m, char *matchstr);
-
-/* normal interface */
-enum _header_state camel_mime_parser_step(CamelMimeParser *, char **, int *);
-void camel_mime_parser_unstep(CamelMimeParser *);
-void camel_mime_parser_drop_step(CamelMimeParser *m);
-enum _header_state camel_mime_parser_state(CamelMimeParser *);
-
-/* read through the parser */
-int camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len);
-
-/* get content type for the current part/header */
-struct _header_content_type *camel_mime_parser_content_type(CamelMimeParser *);
-
-/* get/change raw header by name */
-const char *camel_mime_parser_header(CamelMimeParser *, const char *, int *offset);
-
-/* get all raw headers. READ ONLY! */
-struct _header_raw *camel_mime_parser_headers_raw(CamelMimeParser *);
-
-/* get multipart pre/postface */
-const char *camel_mime_parser_preface(CamelMimeParser *m);
-const char *camel_mime_parser_postface(CamelMimeParser *m);
-
-/* return the from line content */
-const char *camel_mime_parser_from_line(CamelMimeParser *m);
-
-/* add a processing filter for body contents */
-int camel_mime_parser_filter_add(CamelMimeParser *, CamelMimeFilter *);
-void camel_mime_parser_filter_remove(CamelMimeParser *, int);
-
-/* these should be used with caution, because the state will not
-   track the seeked position */
-/* FIXME: something to bootstrap the state? */
-off_t camel_mime_parser_tell(CamelMimeParser *);
-off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int);
-
-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *);
-off_t camel_mime_parser_tell_start_from(CamelMimeParser *);
-
-#endif /* ! _CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
deleted file mode 100644
index 6d9f7e1804..0000000000
--- a/camel/camel-mime-part-utils.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-part-utils : Utility for mime parsing and so on
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include <string.h>
-#include "string-utils.h"
-#include "camel-mime-part-utils.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-seekable-substream.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-crlf.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-/* simple data wrapper */
-static void
-simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp)
-{
-	GByteArray *buffer;
-	char *buf;
-	int len;
-	off_t start = 0, end;
-	CamelMimeFilter *fdec = NULL, *fcrlf = NULL, *fch = NULL;
-	struct _header_content_type *ct;
-	int decid=-1, crlfid=-1, chrid=-1;
-	CamelStream *source;
-	CamelSeekableStream *seekable_source = NULL;
-	char *encoding;
-
-	d(printf("constructing data-wrapper\n"));
-
-		/* Ok, try and be smart.  If we're storing a small message (typical) convert it,
-		   and store it in memory as we parse it ... if not, throw away the conversion
-		   and scan till the end ... */
-
-		/* if we can't seek, dont have a stream/etc, then we must cache it */
-	source = camel_mime_parser_stream(mp);
-	if (source) {
-		camel_object_ref((CamelObject *)source);
-		if (CAMEL_IS_SEEKABLE_STREAM (source)) {
-			seekable_source = CAMEL_SEEKABLE_STREAM (source);
-		}
-	}
-
-	/* first, work out conversion, if any, required, we dont care about what we dont know about */
-	encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL));
-	if (encoding) {
-		if (!strcasecmp(encoding, "base64")) {
-			d(printf("Adding base64 decoder ...\n"));
-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
-			decid = camel_mime_parser_filter_add(mp, fdec);
-		} else if (!strcasecmp(encoding, "quoted-printable")) {
-			d(printf("Adding quoted-printable decoder ...\n"));
-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);
-			decid = camel_mime_parser_filter_add(mp, fdec);
-		}
-		g_free(encoding);
-	}
-
-	/* If we're doing text, we also need to do CRLF->LF and may have to convert it to UTF8 as well. */
-	ct = camel_mime_parser_content_type(mp);
-	if (header_content_type_is(ct, "text", "*")) {
-		const char *charset = header_content_type_param(ct, "charset");
-
-		if (fdec) {
-			d(printf("Adding CRLF conversion filter\n"));
-			fcrlf = (CamelMimeFilter *)camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_DECODE,
-									      CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-			crlfid = camel_mime_parser_filter_add(mp, fcrlf);
-		}
-
-		if (charset!=NULL
-		    && !(strcasecmp(charset, "us-ascii")==0
-			 || strcasecmp(charset, "utf-8")==0)) {
-			d(printf("Adding conversion filter from %s to UTF-8\n", charset));
-			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "UTF-8");
-			if (fch) {
-				chrid = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)fch);
-			} else {
-				g_warning("Cannot convert '%s' to 'UTF-8', message display may be corrupt", charset);
-			}
-		}
-
-	}
-
-	buffer = g_byte_array_new();
-
-	if (seekable_source /* !cache */) {
-		start = camel_mime_parser_tell(mp) + seekable_source->bound_start;
-	}
-	while ( camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END ) {
-		d(printf("appending o/p data: %d: %.*s\n", len, len, buf));
-		if (buffer) {
-			if (buffer->len > 20480 && seekable_source) {
-				/* is this a 'big' message?  Yes?  We dont want to convert it all then.*/
-				camel_mime_parser_filter_remove(mp, decid);
-				camel_mime_parser_filter_remove(mp, chrid);
-				decid = -1;
-				chrid = -1;
-				g_byte_array_free(buffer, TRUE);
-				buffer = NULL;
-			} else {
-				g_byte_array_append(buffer, buf, len);
-			}
-		}
-	}
-
-	if (buffer) {
-		CamelStream *mem;
-
-		d(printf("Small message part, kept in memory!\n"));
-
-		mem = camel_stream_mem_new_with_byte_array(buffer);
-		camel_data_wrapper_construct_from_stream (dw, mem);
-		camel_object_unref ((CamelObject *)mem);
-	} else {
-		CamelStream *sub;
-		CamelStreamFilter *filter;
-
-		d(printf("Big message part, left on disk ...\n"));
-
-		end = camel_mime_parser_tell(mp) + seekable_source->bound_start;
-		sub = camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_source, start, end);
-		if (fdec || fch) {
-			filter = camel_stream_filter_new_with_stream(sub);
-			if (fdec) {
-				camel_mime_filter_reset(fdec);
-				camel_stream_filter_add(filter, fdec);
-			}
-			if (fcrlf) {
-				camel_mime_filter_reset(fcrlf);
-				camel_stream_filter_add(filter, fcrlf);
-			}
-			if (fch) {
-				camel_mime_filter_reset(fch);
-				camel_stream_filter_add(filter, fch);
-			}
-			camel_data_wrapper_construct_from_stream (dw, (CamelStream *)filter);
-			camel_object_unref ((CamelObject *)filter);
-		} else {
-			camel_data_wrapper_construct_from_stream (dw, sub);
-		}
-		camel_object_unref ((CamelObject *)sub);
-	}
-
-	camel_mime_parser_filter_remove(mp, decid);
-	camel_mime_parser_filter_remove(mp, crlfid);
-	camel_mime_parser_filter_remove(mp, chrid);
-
-	if (fdec)
-		camel_object_unref((CamelObject *)fdec);
-	if (fcrlf)
-		camel_object_unref((CamelObject *)fcrlf);
-	if (fch)
-		camel_object_unref((CamelObject *)fch);
-	if (source)
-		camel_object_unref((CamelObject *)source);
-
-}
-
-/* This replaces the data wrapper repository ... and/or could be replaced by it? */
-void
-camel_mime_part_construct_content_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	CamelDataWrapper *content = NULL;
-	char *buf;
-	int len;
-
-	switch (camel_mime_parser_state(mp)) {
-	case HSCAN_HEADER:
-		d(printf("Creating body part\n"));
-		content = camel_data_wrapper_new();
-		simple_data_wrapper_construct_from_parser(content, mp);
-		break;
-	case HSCAN_MESSAGE:
-		d(printf("Creating message part\n"));
-		content = (CamelDataWrapper *)camel_mime_message_new();
-		camel_mime_part_construct_from_parser((CamelMimePart *)content, mp);
-		break;
-	case HSCAN_MULTIPART: {
-		CamelDataWrapper *bodypart;
-
-#ifndef NO_WARNINGS
-#warning This should use a camel-mime-multipart
-#endif
-		d(printf("Creating multi-part\n"));
-		content = (CamelDataWrapper *)camel_multipart_new();
-
-		/* FIXME: use the real boundary? */
-		camel_multipart_set_boundary((CamelMultipart *)content, NULL);
-		while (camel_mime_parser_step(mp, &buf, &len) != HSCAN_MULTIPART_END) {
-			camel_mime_parser_unstep(mp);
-			bodypart = (CamelDataWrapper *)camel_mime_part_new();
-			camel_mime_part_construct_from_parser((CamelMimePart *)bodypart, mp);
-			camel_multipart_add_part((CamelMultipart *)content, (CamelMimePart *)bodypart);
-			camel_object_unref ((CamelObject *)bodypart);
-		}
-
-		/* these are only return valid data in the MULTIPART_END state */
-		camel_multipart_set_preface((CamelMultipart *)content, camel_mime_parser_preface(mp));
-		camel_multipart_set_postface((CamelMultipart *)content, camel_mime_parser_postface(mp));
-
-		d(printf("Created multi-part\n"));
-		break; }
-	default:
-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));
-	}
-	if (content) {
-#ifndef NO_WARNINGS
-#warning there just has got to be a better way ... to transfer the mime-type to the datawrapper
-#endif
-		/* would you believe you have to set this BEFORE you set the content object???  oh my god !!!! */
-		camel_data_wrapper_set_mime_type_field (content, 
-							camel_mime_part_get_content_type ((CamelMimePart *)dw));
-		camel_medium_set_content_object((CamelMedium *)dw, content);
-		camel_object_unref ((CamelObject *)content);
-	}
-}
-
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
deleted file mode 100644
index 1e1c3655aa..0000000000
--- a/camel/camel-mime-part-utils.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mime-part-utils : Utility for mime parsing and so on */
-
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MIME_PART_UTILS_H
-#define CAMEL_MIME_PART_UTILS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-mime-part.h>
-
-void camel_mime_part_construct_content_from_parser(CamelMimePart *, CamelMimeParser *mp);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*  CAMEL_MIME_PART_UTILS_H  */
-
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
deleted file mode 100644
index 4409ee5f72..0000000000
--- a/camel/camel-mime-part.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camelMimePart.c : Abstract class for a mime_part */
-
-/* 
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <string.h>
-#include "camel-mime-part.h"
-#include <stdio.h>
-#include "string-utils.h"
-#include "hash-table-utils.h"
-#include "camel-mime-part-utils.h"
-#include <ctype.h>
-#include "camel-mime-parser.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-exception.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-typedef enum {
-	HEADER_UNKNOWN,
-	HEADER_DESCRIPTION,
-	HEADER_DISPOSITION,
-	HEADER_CONTENT_ID,
-	HEADER_ENCODING,
-	HEADER_CONTENT_MD5,
-	HEADER_CONTENT_LANGUAGES,
-	HEADER_CONTENT_TYPE
-} CamelHeaderType;
-
-
-static GHashTable *header_name_table;
-static GHashTable *header_formatted_table;
-
-static CamelMediumClass *parent_class=NULL;
-
-/* Returns the class for a CamelMimePart */
-#define CMP_CLASS(so) CAMEL_MIME_PART_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-/* from CamelDataWrapper */
-static int             write_to_stream                 (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static int	       construct_from_stream	       (CamelDataWrapper *dw, CamelStream *s);
-
-/* from CamelMedia */ 
-static void            add_header                      (CamelMedium *medium, const char *header_name, const void *header_value);
-static void            set_header                      (CamelMedium *medium, const char *header_name, const void *header_value);
-static void            remove_header                   (CamelMedium *medium, const char *header_name);
-static const void     *get_header                      (CamelMedium *medium, const char *header_name);
-
-static void            set_content_object              (CamelMedium *medium, CamelDataWrapper *content);
-
-/* from camel mime parser */
-static int             construct_from_parser           (CamelMimePart *, CamelMimeParser *);
-
-/* forward references */
-static void set_disposition (CamelMimePart *mime_part, const gchar *disposition);
-
-
-/* loads in a hash table the set of header names we */
-/* recognize and associate them with a unique enum  */
-/* identifier (see CamelHeaderType above)           */
-static void
-init_header_name_table()
-{
-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	g_hash_table_insert (header_name_table, "Content-Description", (gpointer)HEADER_DESCRIPTION);
-	g_hash_table_insert (header_name_table, "Content-Disposition", (gpointer)HEADER_DISPOSITION);
-	g_hash_table_insert (header_name_table, "Content-id", (gpointer)HEADER_CONTENT_ID);
-	g_hash_table_insert (header_name_table, "Content-Transfer-Encoding", (gpointer)HEADER_ENCODING);
-	g_hash_table_insert (header_name_table, "Content-MD5", (gpointer)HEADER_CONTENT_MD5);
-	g_hash_table_insert (header_name_table, "Content-Type", (gpointer)HEADER_CONTENT_TYPE);
-
-	header_formatted_table = g_hash_table_new(g_strcase_hash, g_strcase_equal);
-	g_hash_table_insert(header_formatted_table, "Content-Type", (void *)1);
-	g_hash_table_insert(header_formatted_table, "Content-Disposition", (void *)1);
-	g_hash_table_insert(header_formatted_table, "To", (void *)1);
-	g_hash_table_insert(header_formatted_table, "From", (void *)1);
-	g_hash_table_insert(header_formatted_table, "Cc", (void *)1);
-	g_hash_table_insert(header_formatted_table, "Bcc", (void *)1);
-	g_hash_table_insert(header_formatted_table, "Message-ID", (void *)1);
-}
-
-static void
-camel_mime_part_class_init (CamelMimePartClass *camel_mime_part_class)
-{
-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_part_class);
-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_part_class);
-
-	parent_class = CAMEL_MEDIUM_CLASS (camel_type_get_global_classfuncs (camel_medium_get_type ()));
-	init_header_name_table();
-
-	camel_mime_part_class->construct_from_parser = construct_from_parser;
-	
-	/* virtual method overload */	
-	camel_medium_class->add_header                = add_header;
-	camel_medium_class->set_header                = set_header;
-	camel_medium_class->get_header                = get_header;
-	camel_medium_class->remove_header             = remove_header;
-	camel_medium_class->set_content_object        = set_content_object;
-
-	camel_data_wrapper_class->write_to_stream     = write_to_stream;
-	camel_data_wrapper_class->construct_from_stream= construct_from_stream;
-}
-
-static void
-camel_mime_part_init (gpointer   object,  gpointer   klass)
-{
-	CamelMimePart *camel_mime_part = CAMEL_MIME_PART (object);
-	
-	camel_mime_part->content_type         = header_content_type_new ("text", "plain");
-	camel_mime_part->description          = NULL;
-	camel_mime_part->disposition          = NULL;
-	camel_mime_part->content_id           = NULL;
-	camel_mime_part->content_MD5          = NULL;
-	camel_mime_part->content_languages    = NULL;
-	camel_mime_part->encoding             = CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-
-static void           
-camel_mime_part_finalize (CamelObject *object)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (object);
-
-	g_free (mime_part->description);
-	g_free (mime_part->content_id);
-	g_free (mime_part->content_MD5);
-	string_list_free (mime_part->content_languages);
-	header_disposition_unref(mime_part->disposition);
-	
-	if (mime_part->content_type)
-		header_content_type_unref (mime_part->content_type);
-
-	header_raw_clear(&mime_part->headers);
-}
-
-
-
-CamelType
-camel_mime_part_get_type (void)
-{
-	static CamelType camel_mime_part_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_part_type == CAMEL_INVALID_TYPE)	{
-		camel_mime_part_type = camel_type_register (CAMEL_MEDIUM_TYPE, "CamelMimePart",
-							    sizeof (CamelMimePart),
-							    sizeof (CamelMimePartClass),
-							    (CamelObjectClassInitFunc) camel_mime_part_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_mime_part_init,
-							    (CamelObjectFinalizeFunc) camel_mime_part_finalize);
-	}
-	
-	return camel_mime_part_type;
-}
-
-
-/* **** */
-
-static gboolean
-process_header(CamelMedium *medium, const char *header_name, const char *header_value)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);
-	CamelHeaderType header_type;
-	char *text;
-
-	/* Try to parse the header pair. If it corresponds to something   */
-	/* known, the job is done in the parsing routine. If not,         */
-	/* we simply add the header in a raw fashion                      */
-
-	header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name);
-	switch (header_type) {
-	case HEADER_DESCRIPTION: /* raw header->utf8 conversion */
-		text = header_decode_string(header_value);
-		g_free(mime_part->description);
-		mime_part->description = g_strstrip (text);
-		break;
-	case HEADER_DISPOSITION:
-		set_disposition(mime_part, header_value);
-		break;
-	case HEADER_CONTENT_ID:
-		text = header_msgid_decode(header_value);
-		g_free(mime_part->content_id);
-		mime_part->content_id = text;
-		break;
-	case HEADER_ENCODING:
-		text = header_token_decode(header_value);
-		mime_part->encoding = camel_mime_part_encoding_from_string (text);
-		g_free(text);
-		break;
-	case HEADER_CONTENT_MD5:
-		g_free(mime_part->content_MD5);
-		mime_part->content_MD5 = g_strdup(header_value);
-		break;
-	case HEADER_CONTENT_TYPE: 
-		if (mime_part->content_type)
-			header_content_type_unref (mime_part->content_type);
-		mime_part->content_type = header_content_type_decode (header_value);
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-set_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	CamelMimePart *part = CAMEL_MIME_PART (medium);
-	
-	process_header(medium, header_name, header_value);
-	header_raw_replace(&part->headers, header_name, header_value, -1);
-}
-
-static void
-add_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	CamelMimePart *part = CAMEL_MIME_PART (medium);
-	
-	/* Try to parse the header pair. If it corresponds to something   */
-	/* known, the job is done in the parsing routine. If not,         */
-	/* we simply add the header in a raw fashion                      */
-
-	/* If it was one of the headers we handled, it must be unique, set it instead of add */
-	if (process_header(medium, header_name, header_value))
-		header_raw_replace(&part->headers, header_name, header_value, -1);
-	else
-		header_raw_append(&part->headers, header_name, header_value, -1);
-}
-
-static void
-remove_header (CamelMedium *medium, const char *header_name)
-{
-	CamelMimePart *part = (CamelMimePart *)medium;
-	
-	process_header(medium, header_name, NULL);
-	header_raw_remove(&part->headers, header_name);
-}
-
-static const void *
-get_header (CamelMedium *medium, const char *header_name)
-{
-	CamelMimePart *part = (CamelMimePart *)medium;
-
-	return header_raw_find(&part->headers, header_name, NULL);
-}
-
-
-/* **** Content-Description */
-void
-camel_mime_part_set_description (CamelMimePart *mime_part, const gchar *description)
-{
-	char *text = header_encode_string (description);
-	
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Description", text);
-	g_free (text);
-}
-
-const gchar *
-camel_mime_part_get_description (CamelMimePart *mime_part)
-{
-	return mime_part->description;
-}
-
-/* **** Content-Disposition */
-
-static void
-set_disposition (CamelMimePart *mime_part, const gchar *disposition)
-{
-	header_disposition_unref(mime_part->disposition);
-	if (disposition)
-		mime_part->disposition = header_disposition_decode(disposition);
-	else
-		mime_part->disposition = NULL;
-}
-
-
-void
-camel_mime_part_set_disposition (CamelMimePart *mime_part, const gchar *disposition)
-{
-	char *text;
-
-	/* we poke in a new disposition (so we dont lose 'filename', etc) */
-	if (mime_part->disposition == NULL) {
-		set_disposition(mime_part, disposition);
-	}
-	if (mime_part->disposition != NULL) {
-		g_free(mime_part->disposition->disposition);
-		mime_part->disposition->disposition = g_strdup(disposition);
-	}
-	text = header_disposition_format(mime_part->disposition);
-
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Disposition", text);
-
-	g_free(text);
-}
-
-const gchar *
-camel_mime_part_get_disposition (CamelMimePart *mime_part)
-{
-	if (mime_part->disposition)
-		return (mime_part->disposition)->disposition;
-	else
-		return NULL;
-}
-
-
-/* **** Content-Disposition: filename="xxx" */
-
-void
-camel_mime_part_set_filename (CamelMimePart *mime_part, const gchar *filename)
-{
-	char *str;
-	if (mime_part->disposition == NULL)
-		mime_part->disposition = header_disposition_decode("attachment");
-
-	header_set_param(&mime_part->disposition->params, "filename", filename);
-	str = header_disposition_format(mime_part->disposition);
-
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Disposition", str);
-	g_free(str);
-}
-
-const gchar *
-camel_mime_part_get_filename (CamelMimePart *mime_part)
-{
-	if (mime_part->disposition) {
-		const gchar *name = header_param (mime_part->disposition->params, "filename");
-		if (name)
-			return name;
-	}
-
-	return header_content_type_param (mime_part->content_type, "name");
-}
-
-
-/* **** Content-ID: */
-
-void
-camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID",
-				 contentid);
-}
-
-const gchar *
-camel_mime_part_get_content_id (CamelMimePart *mime_part)
-{
-	return mime_part->content_id;
-}
-
-/* **** Content-MD5: */
-
-void
-camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, const char *md5)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-MD5", md5);
-}
-
-const gchar *
-camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
-{
-	return mime_part->content_MD5;
-}
-
-/* **** Content-Transfer-Encoding: */
-
-void
-camel_mime_part_set_encoding (CamelMimePart *mime_part,
-			      CamelMimePartEncodingType encoding)
-{
-	const char *text;
-
-	text = camel_mime_part_encoding_to_string (encoding);
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Transfer-Encoding", text);
-}
-
-const CamelMimePartEncodingType
-camel_mime_part_get_encoding (CamelMimePart *mime_part)
-{
-	return mime_part->encoding;
-}
-
-/* FIXME: do something with this stuff ... */
-
-void
-camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages)
-{
-	if (mime_part->content_languages) string_list_free (mime_part->content_languages);
-	mime_part->content_languages = content_languages;
-
-	/* FIXME: translate to a header and set it */
-}
-
-const GList *
-camel_mime_part_get_content_languages (CamelMimePart *mime_part)
-{
-	return mime_part->content_languages;
-}
-
-
-/* **** */
-
-/* **** Content-Type: */
-
-void 
-camel_mime_part_set_content_type (CamelMimePart *mime_part, gchar *content_type)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Type", content_type);
-}
-
-CamelContentType *
-camel_mime_part_get_content_type (CamelMimePart *mime_part)
-{
-	return mime_part->content_type;
-}
-
-/*********/
-
-
-
-static void
-set_content_object (CamelMedium *medium, CamelDataWrapper *content)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);
-	CamelContentType *object_content_type;
-
-	parent_class->set_content_object (medium, content);
-
-	object_content_type = camel_data_wrapper_get_mime_type_field (content);
-	if (mime_part->content_type != object_content_type) {
-		char *txt;
-
-		txt = header_content_type_format (object_content_type);
-		camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Type", txt);
-		g_free(txt);
-	}
-}
-
-/**********************************************************************/
-
-static int
-write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART(data_wrapper);
-	CamelMedium *medium = CAMEL_MEDIUM(data_wrapper);
-	CamelDataWrapper *content;
-	int total = 0;
-	int count;
-
-	d(printf("mime_part::write_to_stream\n"));
-
-	/* FIXME: something needs to be done about this ... */
-	/* FIXME: need to count these bytes too */
-#ifndef NO_WARNINGS
-#warning content-languages should be stored as a header
-#endif
-
-	if (mp->headers) {
-		struct _header_raw *h = mp->headers;
-		char *val;
-
-		/* fold/write the headers.   But dont fold headers that are already formatted
-		   (e.g. ones with parameter-lists, that we know about, and have created) */
-		while (h) {
-			val = h->value;
-			if (val == NULL) {
-				g_warning("h->value is NULL here for %s", h->name);
-				count = 0;
-			} else if (g_hash_table_lookup(header_formatted_table, h->name) == NULL) {
-				val = header_fold(val, strlen(h->name));
-				count = camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
-				g_free(val);
-			} else {
-				count = camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
-			}
-			if (count == -1)
-				return -1;
-			total += count;
-			h = h->next;
-		}
-	}
-
-	count = camel_stream_write(stream, "\n", 1);
-	if (count == -1)
-		return -1;
-	total += count;
-
-	content = camel_medium_get_content_object(medium);
-	if (content) {
-		/* I dont really like this here, but i dont know where else it might go ... */
-#define CAN_THIS_GO_ELSEWHERE
-#ifdef CAN_THIS_GO_ELSEWHERE
-		CamelMimeFilter *filter = NULL;
-		CamelStreamFilter *filter_stream = NULL;
-		CamelMimeFilter *charenc = NULL;
-		const char *charset;
-
-		switch(mp->encoding) {
-		case CAMEL_MIME_PART_ENCODING_BASE64:
-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_ENC);
-			break;
-		case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:
-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_ENC);
-			break;
-		default:
-			break;
-		}
-
-		if (header_content_type_is(mp->content_type, "text", "*")) {
-			charset = header_content_type_param(mp->content_type, "charset");
-			if (!(charset == NULL || !strcasecmp(charset, "us-ascii") || !strcasecmp(charset, "utf-8"))) {
-				charenc = (CamelMimeFilter *)camel_mime_filter_charset_new_convert("utf-8", charset);
-			} 
-		}
-
-		if (filter || charenc) {
-			filter_stream = camel_stream_filter_new_with_stream(stream);
-
-			/* if we have a character encoder, add that always */
-			if (charenc) {
-				camel_stream_filter_add(filter_stream, charenc);
-				camel_object_unref((CamelObject *)charenc);
-			}
-
-			/* we only re-do crlf on encoded blocks */
-			if (filter && header_content_type_is(mp->content_type, "text", "*")) {
-				CamelMimeFilter *crlf = camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_ENCODE,
-										   CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-
-				camel_stream_filter_add(filter_stream, crlf);
-				camel_object_unref((CamelObject *)crlf);
-
-			}
-
-			if (filter) {
-				camel_stream_filter_add(filter_stream, filter);
-				camel_object_unref((CamelObject *)filter);
-			}
-
-			stream = (CamelStream *)filter_stream;
-		}
-
-#endif
-		count = camel_data_wrapper_write_to_stream(content, stream);
-		if (filter_stream) {
-			camel_stream_flush((CamelStream *)filter_stream);
-			camel_object_unref((CamelObject *)filter_stream);
-		}
-		if (count == -1)
-			return -1;
-		total += count;
-	} else {
-		g_warning("No content for medium, nothing to write");
-	}
-	return total;
-}
-
-/* mime_part */
-static int
-construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	struct _header_raw *headers;
-	char *buf;
-	int len;
-
-	d(printf("mime_part::construct_from_parser()\n"));
-
-	switch (camel_mime_parser_step(mp, &buf, &len)) {
-	case HSCAN_MESSAGE:
-		/* set the default type of a message always */
-		if (dw->content_type)
-			header_content_type_unref (dw->content_type);
-		dw->content_type = header_content_type_decode ("message/rfc822");
-	case HSCAN_HEADER:
-	case HSCAN_MULTIPART:
-		/* we have the headers, build them into 'us' */
-		headers = camel_mime_parser_headers_raw(mp);
-		while (headers) {
-			camel_medium_add_header((CamelMedium *)dw, headers->name, headers->value);
-			headers = headers->next;
-		}
-		camel_mime_part_construct_content_from_parser(dw, mp);
-		break;
-	default:
-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));
-	}
-
-	d(printf("mime_part::construct_from_parser() leaving\n"));
-#ifndef NO_WARNINGS
-#warning "Need to work out how to detect a (fatally) bad parse in the parser"
-#endif
-	return 0;
-}
-
-/**
- * camel_mime_part_construct_from_parser:
- * @mime_part: 
- * @mp: 
- * 
- * 
- * 
- * Return value: 
- **/
-int
-camel_mime_part_construct_from_parser(CamelMimePart *mime_part, CamelMimeParser *mp)
-{
-	return CMP_CLASS (mime_part)->construct_from_parser (mime_part, mp);
-}
-
-static int
-construct_from_stream(CamelDataWrapper *dw, CamelStream *s)
-{
-	CamelMimeParser *mp;
-	int ret;
-
-	d(printf("mime_part::construct_from_stream()\n"));
-
-	mp = camel_mime_parser_new();
-	if (camel_mime_parser_init_with_stream(mp, s) == -1) {
-		g_warning("Cannot create parser for stream");
-		ret = -1;
-	} else {
-		ret = camel_mime_part_construct_from_parser((CamelMimePart *)dw, mp);
-	}
-	camel_object_unref((CamelObject *)mp);
-	return ret;
-}
-
-/* this must be kept in sync with the header */
-static const char *encodings[] = {
-	"",
-	"7bit",
-	"8bit",
-	"base64",
-	"quoted-printable",
-	"binary"
-};
-
-const char *
-camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)
-{
-	if (encoding >= sizeof(encodings)/sizeof(encodings[0]))
-		encoding = 0;
-
-	return encodings[encoding];
-}
-
-/* FIXME I am not sure this is the correct way to do this.  */
-CamelMimePartEncodingType
-camel_mime_part_encoding_from_string (const gchar *string)
-{
-	int i;
-
-	if (string != NULL) {
-		for (i=0;i<sizeof(encodings)/sizeof(encodings[0]);i++)
-			if (!strcasecmp(string, encodings[i]))
-				return i;
-	}
-
-	return CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-
-/******************************/
-/**  Misc utility functions  **/
-
-/**
- * camel_mime_part_new:
- *
- * Return value: a new CamelMimePart
- **/
-CamelMimePart *
-camel_mime_part_new (void)
-{
-	return (CamelMimePart *)camel_object_new (CAMEL_MIME_PART_TYPE);
-}
-
-/**
- * camel_mime_part_set_content:
- * @camel_mime_part: Mime part
- * @data: data to put into the part
- * @length: length of @data
- * @type: Content-Type of the data
- * 
- * Utility function used to set the content of a mime part object to 
- * be the provided data. If @length is 0, this routine can be used as
- * a way to remove old content (in which case @data and @type are
- * ignored and may be %NULL).
- **/
-void 
-camel_mime_part_set_content (CamelMimePart *camel_mime_part,
-			     const char *data, int length,
-			     const char *type) /* why on earth is the type last? */
-{
-	CamelMedium *medium = CAMEL_MEDIUM (camel_mime_part);
-
-	if (length) {
-		CamelDataWrapper *dw;
-		CamelStream *stream;
-
-		dw = camel_data_wrapper_new ();
-		camel_data_wrapper_set_mime_type (dw, type);
-		stream = camel_stream_mem_new_with_buffer (data, length);
-		camel_data_wrapper_construct_from_stream (dw, stream);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_medium_set_content_object (medium, dw);
-		camel_object_unref (CAMEL_OBJECT (dw));
-	} else {
-		if (medium->content)
-			camel_object_unref (CAMEL_OBJECT (medium->content));
-		medium->content = NULL;
-	}
-}
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
deleted file mode 100644
index 75f7bff6db..0000000000
--- a/camel/camel-mime-part.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-part.h : class for a mime part */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MIME_PART_H
-#define CAMEL_MIME_PART_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-parser.h>
-
-#define CAMEL_MIME_PART_TYPE     (camel_mime_part_get_type ())
-#define CAMEL_MIME_PART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))
-#define CAMEL_MIME_PART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))
-#define CAMEL_IS_MIME_PART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))
-
-/* note, if you change this, make sure you change the 'encodings' array in camel-mime-part.c */
-enum _CamelMimePartEncodingType {
-        CAMEL_MIME_PART_ENCODING_DEFAULT,
-        CAMEL_MIME_PART_ENCODING_7BIT,
-        CAMEL_MIME_PART_ENCODING_8BIT,
-        CAMEL_MIME_PART_ENCODING_BASE64,
-        CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE,
-        CAMEL_MIME_PART_ENCODING_BINARY,
-        CAMEL_MIME_PART_NUM_ENCODINGS
-};
-typedef enum _CamelMimePartEncodingType CamelMimePartEncodingType;
-
-
-/* Do not change these values directly, you would regret it one day */
-struct _CamelMimePart
-{
-	CamelMedium parent_object;
-	
-	/* All fields here are -** PRIVATE **- */
-	gchar *description;
-	CamelMimeDisposition *disposition;
-	gchar *content_id;
-	gchar *content_MD5;
-	GList *content_languages;
-	CamelMimePartEncodingType encoding;
-	
-	CamelContentType *content_type;
-
-	struct _header_raw *headers; /* mime headers */
-};
-
-typedef struct _CamelMimePartClass {
-	CamelMediumClass parent_class;
-	
-	/* Virtual methods */
-	int (*construct_from_parser) (CamelMimePart *, CamelMimeParser *);
-} CamelMimePartClass;
-
-/* Standard Camel function */
-CamelType camel_mime_part_get_type (void);
-
-/* public methods */
-CamelMimePart *  camel_mime_part_new                    (void);
-
-void	         camel_mime_part_set_description	(CamelMimePart *mime_part, const gchar *description);
-const     gchar *camel_mime_part_get_description	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_disposition	(CamelMimePart *mime_part, const gchar *disposition);
-const     gchar *camel_mime_part_get_disposition	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_filename		(CamelMimePart *mime_part, const gchar *filename);
-const	  gchar *camel_mime_part_get_filename		(CamelMimePart *mime_part);
-
-void             camel_mime_part_set_content_id		(CamelMimePart *mime_part, const char *contentid);
-const	  gchar *camel_mime_part_get_content_id		(CamelMimePart *mime_part);
-
-void		 camel_mime_part_set_content_MD5	(CamelMimePart *mime_part, const char *);
-const	  gchar *camel_mime_part_get_content_MD5	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_encoding		(CamelMimePart *mime_part, CamelMimePartEncodingType type);
-CamelMimePartEncodingType camel_mime_part_get_encoding	(CamelMimePart *mime_part);
-
-void	 	 camel_mime_part_set_content_languages	(CamelMimePart *mime_part, GList *content_languages);
-const	  GList *camel_mime_part_get_content_languages	(CamelMimePart *mime_part);
-
-/* FIXME: what about content-type parameters?   what about major/minor parts? */
-void               camel_mime_part_set_content_type 	(CamelMimePart *mime_part, gchar *content_type);
-CamelContentType  *camel_mime_part_get_content_type	(CamelMimePart *mime_part);
-
-const     gchar *         camel_mime_part_encoding_to_string   (CamelMimePartEncodingType encoding);
-CamelMimePartEncodingType camel_mime_part_encoding_from_string (const gchar *string);
-
-/* construction */
-int		camel_mime_part_construct_from_parser  (CamelMimePart *, CamelMimeParser *);
-
-/* utility functions */
-void      	camel_mime_part_set_content 	       (CamelMimePart *camel_mime_part,
-							const char *content, int length, const char *type);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MIME_PART_H */
-
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
deleted file mode 100644
index ad2a200708..0000000000
--- a/camel/camel-mime-utils.c
+++ /dev/null
@@ -1,3401 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* dont touch this file without my permission - Michael */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>  /* for MAXHOSTNAMELEN */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 1024
-#endif
-
-#include <unicode.h>
-#include <iconv.h>
-
-#include <glib.h>
-#include <time.h>
-
-#include <ctype.h>
-#include <errno.h>
-
-#include <regex.h>
-
-#include "camel-mime-utils.h"
-#include "camel-charset-map.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#ifndef CLEAN_DATE
-#include "broken-date-parser.h"
-#endif
-
-#if 0
-int strdup_count = 0;
-int malloc_count = 0;
-int free_count = 0;
-
-#define g_strdup(x) (strdup_count++, g_strdup(x))
-#define g_malloc(x) (malloc_count++, g_malloc(x))
-#define g_free(x) (free_count++, g_free(x))
-#endif
-
-/* for all warnings ... */
-#define w(x) x
-
-#define d(x)
-#define d2(x)
-
-#define	CAMEL_UUDECODE_CHAR(c)	(((c) - ' ') & 077)
-
-static char *base64_alphabet =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static unsigned char tohex[16] = {
-	'0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-static unsigned short camel_mime_special_table[256] = {
-	  5,  5,  5,  5,  5,  5,  5,  5,  5,231,  7,  5,  5, 39,  5,  5,
-	  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-	242,448, 76,192,192,192,192,192, 76, 76,448,448, 76,448, 72,324,
-	448,448,448,448,448,448,448,448,448,448, 76, 76, 76,  4, 76, 68,
-	 76,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-	448,448,448,448,448,448,448,448,448,448,448,108,236,108,192, 64,
-	192,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-	448,448,448,448,448,448,448,448,448,448,448,192,192,192,192,  5,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-static unsigned char camel_mime_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,
-};
-
-/*
-  if any of these change, then the tables above should be regenerated
-  by compiling this with -DBUILD_TABLE, and running.
-
-  gcc -DCLEAN_DATE -o buildtable -I.. `glib-config --cflags --libs` -lunicode -DBUILD_TABLE camel-mime-utils.c camel-charset-map.c
-  ./buildtable
-
-*/
-enum {
-	IS_CTRL		= 1<<0,
-	IS_LWSP		= 1<<1,
-	IS_TSPECIAL	= 1<<2,
-	IS_SPECIAL	= 1<<3,
-	IS_SPACE	= 1<<4,
-	IS_DSPECIAL	= 1<<5,
-	IS_QPSAFE	= 1<<6,
-	IS_ESAFE	= 1<<7,	/* encoded word safe */
-	IS_PSAFE	= 1<<8,	/* encoded word in phrase safe */
-};
-
-#define is_ctrl(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_CTRL) != 0)
-#define is_lwsp(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_LWSP) != 0)
-#define is_tspecial(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_TSPECIAL) != 0)
-#define is_type(x, t) ((camel_mime_special_table[(unsigned char)(x)] & (t)) != 0)
-#define is_ttoken(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_TSPECIAL|IS_LWSP|IS_CTRL)) == 0)
-#define is_atom(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_SPECIAL|IS_SPACE|IS_CTRL)) == 0)
-#define is_dtext(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_DSPECIAL) == 0)
-#define is_fieldname(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_CTRL|IS_SPACE)) == 0)
-#define is_qpsafe(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_QPSAFE) != 0)
-#define is_especial(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_ESPECIAL) != 0)
-#define is_psafe(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_PSAFE) != 0)
-
-/* only needs to be run to rebuild the tables above */
-#ifdef BUILD_TABLE
-
-#define CHARS_LWSP " \t\n\r"
-#define CHARS_TSPECIAL "()<>@,;:\\\"/[]?="
-#define CHARS_SPECIAL "()<>@,;:\\\".[]"
-#define CHARS_CSPECIAL "()\\\r"	/* not in comments */
-#define CHARS_DSPECIAL "[]\\\r \t"	/* not in domains */
-#define CHARS_ESPECIAL "()<>@,;:\"/[]?.=_" /* list of characters that must be encoded.
-					      encoded word in text specials: rfc 2047 5(1)*/
-#define CHARS_PSPECIAL "!*+-/" /* list of additional characters that can be left unencoded.
-				  encoded word in phrase specials: rfc 2047 5(3) */
-
-static void
-header_remove_bits(unsigned short bit, unsigned char *vals)
-{
-	int i;
-
-	for (i=0;vals[i];i++)
-		camel_mime_special_table[vals[i]] &= ~ bit;
-}
-
-static void
-header_init_bits(unsigned short bit, unsigned short bitcopy, int remove, unsigned char *vals)
-{
-	int i;
-	int len = strlen(vals);
-
-	if (!remove) {
-		for (i=0;i<len;i++) {
-			camel_mime_special_table[vals[i]] |= bit;
-		}
-		if (bitcopy) {
-			for (i=0;i<256;i++) {
-				if (camel_mime_special_table[i] & bitcopy)
-					camel_mime_special_table[i] |= bit;
-			}
-		}
-	} else {
-		for (i=0;i<256;i++)
-			camel_mime_special_table[i] |= bit;
-		for (i=0;i<len;i++) {
-			camel_mime_special_table[vals[i]] &= ~bit;
-		}
-		if (bitcopy) {
-			for (i=0;i<256;i++) {
-				if (camel_mime_special_table[i] & bitcopy)
-					camel_mime_special_table[i] &= ~bit;
-			}
-		}
-	}
-}
-
-static void
-header_decode_init(void)
-{
-	int i;
-
-	for (i=0;i<256;i++) {
-		camel_mime_special_table[i] = 0;
-		if (i<32)
-			camel_mime_special_table[i] |= IS_CTRL;
-		if ((i>=33 && i<=60) || (i>=62 && i<=126) || i==32 || i==9)
-			camel_mime_special_table[i] |= (IS_QPSAFE|IS_ESAFE);
-		if ((i>='0' && i<='9') || (i>='a' && i<='z') || (i>='A' && i<= 'Z'))
-			camel_mime_special_table[i] |= IS_PSAFE;
-	}
-	camel_mime_special_table[127] |= IS_CTRL;
-	camel_mime_special_table[' '] |= IS_SPACE;
-	header_init_bits(IS_LWSP, 0, 0, CHARS_LWSP);
-	header_init_bits(IS_TSPECIAL, IS_CTRL, 0, CHARS_TSPECIAL);
-	header_init_bits(IS_SPECIAL, 0, 0, CHARS_SPECIAL);
-	header_init_bits(IS_DSPECIAL, 0, FALSE, CHARS_DSPECIAL);
-	header_remove_bits(IS_ESAFE, CHARS_ESPECIAL);
-	header_init_bits(IS_PSAFE, 0, 0, CHARS_PSPECIAL);
-}
-
-void
-base64_init(void)
-{
-	int i;
-
-	memset(camel_mime_base64_rank, 0xff, sizeof(camel_mime_base64_rank));
-	for (i=0;i<64;i++) {
-		camel_mime_base64_rank[(unsigned int)base64_alphabet[i]] = i;
-	}
-	camel_mime_base64_rank['='] = 0;
-}
-
-int main(int argc, char **argv)
-{
-	int i;
-	void run_test(void);
-
-	header_decode_init();
-	base64_init();
-
-	printf("static unsigned short camel_mime_special_table[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		printf("%3d,", camel_mime_special_table[i]);
-		if ((i&15) == 15) {
-			printf("\n");
-			if (i!=255) {
-				printf("\t");
-			}
-		}
-	}
-	printf("};\n");
-
-	printf("static unsigned char camel_mime_base64_rank[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		printf("%3d,", camel_mime_base64_rank[i]);
-		if ((i&15) == 15) {
-			printf("\n");
-			if (i!=255) {
-				printf("\t");
-			}
-		}
-	}
-	printf("};\n");
-
-	run_test();
-
-	return 0;
-}
-
-#endif
-
-
-/* call this when finished encoding everything, to
-   flush off the last little bit */
-int
-base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
-	int c1, c2;
-	unsigned char *outptr = out;
-
-	if (inlen>0)
-		outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);
-
-	c1 = ((unsigned char *)save)[1];
-	c2 = ((unsigned char *)save)[2];
-	
-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",
-		 (int)((char *)save)[0],
-		 (int)((char *)save)[1],
-		 (int)((char *)save)[2]));
-
-	switch (((char *)save)[0]) {
-	case 2:
-		outptr[2] = base64_alphabet[ ( (c2 &0x0f) << 2 ) ];
-		g_assert(outptr[2] != 0);
-		goto skip;
-	case 1:
-		outptr[2] = '=';
-	skip:
-		outptr[0] = base64_alphabet[ c1 >> 2 ];
-		outptr[1] = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 )];
-		outptr[3] = '=';
-		outptr += 4;
-		break;
-	}
-	if (break_lines)
-		*outptr++ = '\n';
-
-	*save = 0;
-	*state = 0;
-
-	return outptr-out;
-}
-
-/*
-  performs an 'encode step', only encodes blocks of 3 characters to the
-  output at a time, saves left-over state in state and save (initialise to
-  0 on first invocation).
-*/
-int
-base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
-	register unsigned char *inptr, *outptr;
-
-	if (len<=0)
-		return 0;
-
-	inptr = in;
-	outptr = out;
-
-	d(printf("we have %d chars, and %d saved chars\n", len, ((char *)save)[0]));
-
-	if (len + ((char *)save)[0] > 2) {
-		unsigned char *inend = in+len-2;
-		register int c1, c2, c3;
-		register int already;
-
-		already = *state;
-
-		switch (((char *)save)[0]) {
-		case 1:	c1 = ((unsigned char *)save)[1]; goto skip1;
-		case 2:	c1 = ((unsigned char *)save)[1];
-			c2 = ((unsigned char *)save)[2]; goto skip2;
-		}
-		
-		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */
-		while (inptr < inend) {
-			c1 = *inptr++;
-		skip1:
-			c2 = *inptr++;
-		skip2:
-			c3 = *inptr++;
-			*outptr++ = base64_alphabet[ c1 >> 2 ];
-			*outptr++ = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 ) ];
-			*outptr++ = base64_alphabet[ ( (c2 &0x0f) << 2 ) | (c3 >> 6) ];
-			*outptr++ = base64_alphabet[ c3 & 0x3f ];
-			/* this is a bit ugly ... */
-			if (break_lines && (++already)>=19) {
-				*outptr++='\n';
-				already = 0;
-			}
-		}
-
-		((char *)save)[0] = 0;
-		len = 2-(inptr-inend);
-		*state = already;
-	}
-
-	d(printf("state = %d, len = %d\n",
-		 (int)((char *)save)[0],
-		 len));
-
-	if (len>0) {
-		register char *saveout;
-
-		/* points to the slot for the next char to save */
-		saveout = & (((char *)save)[1]) + ((char *)save)[0];
-
-		/* len can only be 0 1 or 2 */
-		switch(len) {
-		case 2:	*saveout++ = *inptr++;
-		case 1:	*saveout++ = *inptr++;
-		}
-		((char *)save)[0]+=len;
-	}
-
-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",
-		 (int)((char *)save)[0],
-		 (int)((char *)save)[1],
-		 (int)((char *)save)[2]));
-
-	return outptr-out;
-}
-
-
-/**
- * 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
- **/
-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 = camel_mime_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 (camel_mime_base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-char *
-base64_encode_simple (const char *data, int len)
-{
-	unsigned char *out;
-	int state = 0, outlen;
-	unsigned int save = 0;
-
-	out = g_malloc (len * 4 / 3 + 5);
-	outlen = base64_encode_close ((unsigned char *)data, len, FALSE,
-				      out, &state, &save);
-	out[outlen] = '\0';
-	return (char *)out;
-}
-
-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);
-}
-
-
-/**
- * uudecode_step: uudecode a chunk of data
- * @in: input stream
- * @len: max length of data to decode ( normally strlen(in) ??)
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- * @uulen: holds the value of the length-char which is used to calculate
- *         how many more chars need to be decoded for that 'line'
- *
- * uudecodes a chunk of data. Assumes the "begin <mode> <file name>" line
- * has been stripped off.
- **/
-int
-uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, ch;
-	register guint32 saved;
-	gboolean last_was_eoln;
-	int i;
-
-	if (*uulen <= 0)
-		last_was_eoln = TRUE;
-	else
-		last_was_eoln = FALSE;
-	
-	inend = in + len;
-	outptr = out;
-	saved = *save;
-	i = *state;
-	inptr = in;
-	while (inptr < inend && *inptr) {
-		if (*inptr == '\n' || last_was_eoln) {
-			if (last_was_eoln) {
-				*uulen = CAMEL_UUDECODE_CHAR (*inptr);
-				last_was_eoln = FALSE;
-			} else {
-				last_was_eoln = TRUE;
-			}
-
-			inptr++;
-			continue;
-		}
-
-		ch = *inptr++;
-		
-		if (*uulen > 0) {
-			/* save the byte */
-			saved = (saved << 8) | ch;
-			i++;
-			if (i == 4) {
-				/* convert 4 uuencoded bytes to 3 normal bytes */
-				unsigned char b0, b1, b2, b3;
-
-				b0 = saved >> 24;
-				b1 = saved >> 16 & 0xff;
-				b2 = saved >> 8 & 0xff;
-				b3 = saved & 0xff;
-
-				if (*uulen >= 3) {
-					*outptr++ = CAMEL_UUDECODE_CHAR (b0) << 2 | CAMEL_UUDECODE_CHAR (b1) >> 4;
-					*outptr++ = CAMEL_UUDECODE_CHAR (b1) << 4 | CAMEL_UUDECODE_CHAR (b2) >> 2;
-				        *outptr++ = CAMEL_UUDECODE_CHAR (b2) << 6 | CAMEL_UUDECODE_CHAR (b3);
-				} else {
-					if (*uulen >= 1) {
-						*outptr++ = CAMEL_UUDECODE_CHAR (b0) << 2 | CAMEL_UUDECODE_CHAR (b1) >> 4;
-					}
-					if (*uulen >= 2) {
-						*outptr++ = CAMEL_UUDECODE_CHAR (b1) << 4 | CAMEL_UUDECODE_CHAR (b2) >> 2;
-					}
-				}
-
-				i = 0;
-				saved = 0;
-				*uulen -= 3;
-			}
-		} else {
-			break;
-		}
-	}
-
-	*save = saved;
-	*state = i;
-
-	return outptr - out;
-}
-
-/* complete qp encoding */
-int
-quoted_encode_close(unsigned char *in, int len, unsigned char *out, int *state, int *save)
-{
-	register unsigned char *outptr = out;
-	int last;
-
-	if (len>0)
-		outptr += quoted_encode_step(in, len, outptr, state, save);
-
-	last = *state;
-	if (last != -1) {
-		/* space/tab must be encoded if it's the last character on
-		   the line */
-		if (is_qpsafe(last) && last!=' ' && last!=9) {
-			*outptr++ = last;
-		} else {
-			*outptr++ = '=';
-			*outptr++ = tohex[(last>>4) & 0xf];
-			*outptr++ = tohex[last & 0xf];
-		}
-	}
-
-	*save = 0;
-	*state = -1;
-
-	return outptr-out;
-}
-
-/* perform qp encoding, initialise state to -1 and save to 0 on first invocation */
-int
-quoted_encode_step (unsigned char *in, int len, unsigned char *out, int *statep, int *save)
-{
-	register guchar *inptr, *outptr, *inend;
-	guchar c;
-	register int sofar = *save;  /* keeps track of how many chars on a line */
-	register int last = *statep; /* keeps track if last char to end was a space cr etc */
-	
-	inptr = in;
-	inend = in + len;
-	outptr = out;
-	while (inptr < inend) {
-		c = *inptr++;
-		if (c == '\r') {
-			if (last != -1) {
-				*outptr++ = '=';
-				*outptr++ = tohex[(last >> 4) & 0xf];
-				*outptr++ = tohex[last & 0xf];
-				sofar += 3;
-			}
-			last = c;
-		} else if (c == '\n') {
-			if (last != -1 && last != '\r') {
-				*outptr++ = '=';
-				*outptr++ = tohex[(last >> 4) & 0xf];
-				*outptr++ = tohex[last & 0xf];
-			}
-			*outptr++ = '\n';
-			sofar = 0;
-			last = -1;
-		} else {
-			if (last != -1) {
-				if (is_qpsafe(last)) {
-					*outptr++ = last;
-					sofar++;
-				} else {
-					*outptr++ = '=';
-					*outptr++ = tohex[(last >> 4) & 0xf];
-					*outptr++ = tohex[last & 0xf];
-					sofar += 3;
-				}
-			}
-			
-			if (is_qpsafe(c)) {
-				if (sofar > 74) {
-					*outptr++ = '=';
-					*outptr++ = '\n';
-					sofar = 0;
-				}
-				
-				/* delay output of space char */
-				if (c==' ' || c=='\t') {
-					last = c;
-				} else {
-					*outptr++ = c;
-					sofar++;
-					last = -1;
-				}
-			} else {
-				if (sofar > 72) {
-					*outptr++ = '=';
-					*outptr++ = '\n';
-					sofar = 3;
-				} else
-					sofar += 3;
-				
-				*outptr++ = '=';
-				*outptr++ = tohex[(c >> 4) & 0xf];
-				*outptr++ = tohex[c & 0xf];
-				last = -1;
-			}
-		}
-	}
-	*save = sofar;
-	*statep = last;
-	
-	return (outptr - out);
-}
-
-/*
-  FIXME: this does not strip trailing spaces from lines (as it should, rfc 2045, section 6.7)
-  Should it also canonicalise the end of line to CR LF??
-
-  Note: Trailing rubbish (at the end of input), like = or =x or =\r will be lost.
-*/ 
-
-int
-quoted_decode_step(unsigned char *in, int len, unsigned char *out, int *savestate, int *saveme)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	int state, save;
-
-	inend = in+len;
-	outptr = out;
-
-	d(printf("quoted-printable, decoding text '%.*s'\n", len, in));
-
-	state = *savestate;
-	save = *saveme;
-	inptr = in;
-	while (inptr<inend) {
-		switch (state) {
-		case 0:
-			while (inptr<inend) {
-				c = *inptr++;
-				if (c=='=') { 
-					state = 1;
-					break;
-				}
-#ifdef CANONICALISE_EOL
-				/*else if (c=='\r') {
-					state = 3;
-				} else if (c=='\n') {
-					*outptr++ = '\r';
-					*outptr++ = c;
-					} */
-#endif
-				else {
-					*outptr++ = c;
-				}
-			}
-			break;
-		case 1:
-			c = *inptr++;
-			if (c=='\n') {
-				/* soft break ... unix end of line */
-				state = 0;
-			} else {
-				save = c;
-				state = 2;
-			}
-			break;
-		case 2:
-			c = *inptr++;
-			if (isxdigit(c) && isxdigit(save)) {
-				c = toupper(c);
-				save = toupper(save);
-				*outptr++ = (((save>='A'?save-'A'+10:save-'0')&0x0f) << 4)
-					| ((c>='A'?c-'A'+10:c-'0')&0x0f);
-			} else if (c=='\n' && save == '\r') {
-				/* soft break ... canonical end of line */
-			} else {
-				/* just output the data */
-				*outptr++ = '=';
-				*outptr++ = save;
-				*outptr++ = c;
-			}
-			state = 0;
-			break;
-#ifdef CANONICALISE_EOL
-		case 3:
-			/* convert \r -> to \r\n, leaves \r\n alone */
-			c = *inptr++;
-			if (c=='\n') {
-				*outptr++ = '\r';
-				*outptr++ = c;
-			} else {
-				*outptr++ = '\r';
-				*outptr++ = '\n';
-				*outptr++ = c;
-			}
-			state = 0;
-			break;
-#endif
-		}
-	}
-
-	*savestate = state;
-	*saveme = save;
-
-	return outptr-out;
-}
-
-/*
-  this is for the "Q" encoding of international words,
-  which is slightly different than plain quoted-printable (mainly by allowing 0x20 <> _)
-*/
-static int
-quoted_decode(const unsigned char *in, int len, unsigned char *out)
-{
-	register const unsigned char *inptr;
-	register unsigned char *outptr;
-	unsigned const char *inend;
-	unsigned char c, c1;
-	int ret = 0;
-
-	inend = in+len;
-	outptr = out;
-
-	d(printf("decoding text '%.*s'\n", len, in));
-
-	inptr = in;
-	while (inptr<inend) {
-		c = *inptr++;
-		if (c=='=') {
-			/* silently ignore truncated data? */
-			if (inend-in>=2) {
-				c = toupper(*inptr++);
-				c1 = toupper(*inptr++);
-				*outptr++ = (((c>='A'?c-'A'+10:c-'0')&0x0f) << 4)
-					| ((c1>='A'?c1-'A'+10:c1-'0')&0x0f);
-			} else {
-				ret = -1;
-				break;
-			}
-		} else if (c=='_') {
-			*outptr++ = 0x20;
-		} else if (c==' ' || c==0x09) {
-			/* FIXME: this is an error! ignore for now ... */
-			ret = -1;
-			break;
-		} else {
-			*outptr++ = c;
-		}
-	}
-	if (ret==0) {
-		return outptr-out;
-	}
-	return -1;
-}
-
-/* rfc2047 version of quoted-printable */
-/* safemask is the mask to apply to the camel_mime_special_table to determine what
-   characters can safely be included without encoding */
-static int
-quoted_encode(const unsigned char *in, int len, unsigned char *out, unsigned short safemask)
-{
-	register const unsigned char *inptr, *inend;
-	unsigned char *outptr;
-	unsigned char c;
-
-	inptr = in;
-	inend = in + len;
-	outptr = out;
-	while (inptr < inend) {
-		c = *inptr++;
-		if (c==' ') {
-			*outptr++ = '_';
-		} else if (camel_mime_special_table[c] & safemask) {
-			*outptr++ = c;
-		} else {
-			*outptr++ = '=';
-			*outptr++ = tohex[(c >> 4) & 0xf];
-			*outptr++ = tohex[c & 0xf];
-		}
-	}
-
-	d(printf("encoding '%.*s' = '%.*s'\n", len, in, outptr-out, out));
-
-	return (outptr - out);
-}
-
-
-static void
-header_decode_lwsp(const char **in)
-{
-	const char *inptr = *in;
-	char c;
-
-	d2(printf("is ws: '%s'\n", *in));
-
-	while (is_lwsp(*inptr) || (*inptr =='(' && *inptr != '\0')) {
-		while (is_lwsp(*inptr) && inptr != '\0') {
-			d2(printf("(%c)", *inptr));
-			inptr++;
-		}
-		d2(printf("\n"));
-
-		/* check for comments */
-		if (*inptr == '(') {
-			int depth = 1;
-			inptr++;
-			while (depth && (c=*inptr) && *inptr != '\0') {
-				if (c=='\\' && inptr[1]) {
-					inptr++;
-				} else if (c=='(') {
-					depth++;
-				} else if (c==')') {
-					depth--;
-				}
-				inptr++;
-			}
-		}
-	}
-	*in = inptr;
-}
-
-/* decode rfc 2047 encoded string segment */
-static char *
-rfc2047_decode_word(const char *in, int len)
-{
-	const char *inptr = in+2;
-	const char *inend = in+len-2;
-	const char *inbuf;
-	char *encname;
-	int tmplen;
-	int ret;
-	char *decword = NULL;
-	char *decoded = NULL;
-	char *outbase = NULL;
-	char *outbuf;
-	int inlen, outlen;
-	iconv_t ic;
-
-	d(printf("rfc2047: decoding '%.*s'\n", len, in));
-
-	/* just make sure we're not passed shit */
-	if (len<7
-	    || !(in[0]=='=' && in[1]=='?' && in[len-1]=='=' && in[len-2]=='?')) {
-		d(printf("invalid\n"));
-		return NULL;
-	}
-
-	inptr = memchr(inptr, '?', inend-inptr);
-	if (inptr!=NULL
-	    && inptr<inend+2
-	    && inptr[2]=='?') {
-		d(printf("found ?, encoding is '%c'\n", inptr[0]));
-		inptr++;
-		tmplen = inend-inptr-2;
-		decword = alloca(tmplen); /* this will always be more-than-enough room */
-		switch(toupper(inptr[0])) {
-		case 'Q':
-			inlen = quoted_decode(inptr+2, tmplen, decword);
-			break;
-		case 'B': {
-			int state=0;
-			unsigned int save=0;
-			inlen = base64_decode_step((char *)inptr+2, tmplen, decword, &state, &save);
-			/* if state != 0 then error? */
-			break;
-		}
-		}
-		d(printf("The encoded length = %d\n", inlen));
-		if (inlen>0) {
-			/* yuck, all this snot is to setup iconv! */
-			tmplen = inptr-in-3;
-			encname = alloca(tmplen+1);
-			encname[tmplen]=0;
-			memcpy(encname, in+2, tmplen);
-
-			inbuf = decword;
-
-			outlen = inlen*6+16;
-			outbase = alloca(outlen);
-			outbuf = outbase;
-
-			/* TODO: Should this cache iconv converters? */
-			ic = iconv_open("UTF-8", encname);
-			if (ic != (iconv_t)-1) {
-				ret = iconv(ic, &inbuf, &inlen, &outbuf, &outlen);
-				if (ret>=0) {
-					iconv(ic, NULL, 0, &outbuf, &outlen);
-					*outbuf = 0;
-					decoded = g_strdup(outbase);
-				}
-				iconv_close(ic);
-			} else {
-				w(g_warning("Cannot decode charset, header display may be corrupt: %s: %s", encname, strerror(errno)));
-				/* TODO: Should this do this, or just leave the encoded strings? */
-				decword[inlen] = 0;
-				decoded = g_strdup(decword);
-			}
-		}
-	}
-
-	d(printf("decoded '%s'\n", decoded));
-
-	return decoded;
-}
-
-/* grrr, glib should have this ! */
-static GString *
-g_string_append_len(GString *st, const char *s, int l)
-{
-	char *tmp;
-
-	tmp = alloca(l+1);
-	tmp[l]=0;
-	memcpy(tmp, s, l);
-	return g_string_append(st, tmp);
-}
-
-/* ok, a lot of mailers are BROKEN, and send iso-latin1 encoded
-   headers, when they should just be sticking to US-ASCII
-   according to the rfc's.  Anyway, since the conversion to utf-8
-   is trivial, just do it here without iconv */
-static GString *
-append_latin1(GString *out, const char *in, int len)
-{
-	unsigned int c;
-
-	while (len) {
-		c = (unsigned int)*in++;
-		len--;
-		if (c & 0x80) {
-			out = g_string_append_c(out, 0xc0 | ((c>>6) & 0x3));		/* 110000xx */
-			out = g_string_append_c(out, 0x80 | (c&0x3f)); 	/* 10xxxxxx */
-		} else {
-			out = g_string_append_c(out, c);
-		}
-	}
-	return out;
-}
-
-/* decodes a simple text, rfc822 */
-static char *
-header_decode_text (const char *in, int inlen)
-{
-	GString *out;
-	char *inptr, *inend, *start;
-	char *decoded;
-	unsigned char lastc = 0;
-	int wasdword = FALSE;
-
-	out = g_string_new ("");
-	start = inptr = (char *) in;
-	inend = inptr + inlen;
-	
-	while (inptr && inptr < inend) {
-		unsigned char c = *inptr++;
-		
-		if (is_lwsp(c)) {
-			char *word, *dword;
-			guint len;
-			
-			len = inptr - start - 1;
-			word = start;
-			
-			dword = rfc2047_decode_word (word, len);
-
-			if (dword) {
-				if (!wasdword && lastc)
-					g_string_append_c(out, lastc);
-					
-				g_string_append (out, dword);
-				g_free (dword);
-				lastc = c;
-				wasdword = TRUE;
-			} else {
-				if (lastc)
-					g_string_append_c(out, lastc);
-				out = append_latin1 (out, word, len);
-				lastc = c;
-				wasdword = FALSE;
-			}
-						
-			start = inptr;
-		}
-	}
-	
-	if (inptr - start) {
-		char *word, *dword;
-		guint len;
-		
-		len = inptr - start;
-		word = start;
-		
-		dword = rfc2047_decode_word (word, len);
-		
-		if (dword) {
-			if (!wasdword && lastc)
-				g_string_append_c(out, lastc);
-			g_string_append (out, dword);
-			g_free (dword);
-		} else {
-			if (lastc)
-				g_string_append_c(out, lastc);
-			out = g_string_append_len (out, word, len);
-		}
-	}
-	
-	decoded = out->str;
-	g_string_free (out, FALSE);
-	
-	return decoded;
-}
-
-#if 0     /* This is broken */
-
-/* so in what way is it broken? */
-
-/* decodes a simple text, rfc822 */
-static char *
-header_decode_text(const char *in, int inlen)
-{
-	GString *out;
-	const char *inptr = in;
-	const char *inend = in+inlen;
-	char *encstart, *encend;
-	char *decword;
-
-	out = g_string_new("");
-	while ( (encstart = strstr(inptr, "=?"))
-		&& (encend = strstr(encstart+2, "?=")) ) {
-
-		decword = rfc2047_decode_word(encstart, encend-encstart+2);
-		if (decword) {
-			out = g_string_append_len(out, inptr, encstart-inptr);
-			out = g_string_append_len(out, decword, strlen(decword));
-			g_free (decword);
-		} else {
-			out = append_latin1(out, inptr, encend-inptr+2);
-		}
-		inptr = encend+2;
-	}
-	out = append_latin1(out, inptr, inend-inptr);
-
-	encstart = out->str;
-	g_string_free(out, FALSE);
-
-	return encstart;
-}
-#endif
-
-char *
-header_decode_string(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-	return header_decode_text(in, strlen(in));
-}
-
-/* how long a sequence of pre-encoded words should be less than, to attempt to 
-   fit into a properly folded word.  Only a guide. */
-#define CAMEL_FOLD_PREENCODED (24)
-
-/* FIXME: needs a way to cache iconv opens for different charsets? */
-static void
-rfc2047_encode_word(GString *outstring, const char *in, int len, const char *type, unsigned short safemask)
-{
-	iconv_t ic = (iconv_t *)-1;
-	char *buffer, *out, *ascii;
-	size_t inlen, outlen, enclen, bufflen;
-	const char *inptr, *p;
-	int first = 1;
-
-	d(printf("Converting [%d] '%.*s' to %s\n", len, len, in, type));
-
-	/* convert utf8->encoding */
-	bufflen = len*6+16;
-	buffer = alloca(bufflen);
-	inlen = len;
-	inptr = (char *) in;
-
-	ascii = alloca(bufflen);
-
-	if (strcasecmp(type, "UTF-8") != 0)
-		ic = iconv_open(type, "UTF-8");
-
-	while (inlen) {
-		int convlen, i, proclen;
-
-		/* break up words into smaller bits, what we really want is encoded + overhead < 75,
-		   but we'll just guess what that means in terms of input chars, and assume its good enough */
-
-		out = buffer;
-		outlen = bufflen;
-
-		if (ic == (iconv_t) -1) {
-			/* native encoding case, the easy one (?) */
-			/* we work out how much we can convert, and still be in length */
-			/* proclen will be the result of input characters that we can convert, to the nearest
-			   (approximated) valid utf8 char */
-			convlen = 0;
-			proclen = 0;
-			p = inptr;
-			i = 0;
-			while (p < (in+len) && convlen < (75 - strlen("=?utf-8?q??="))) {
-				unsigned char c = *p++;
-
-				if (c >= 0xc0)
-					proclen = i;
-				i++;
-				if (c < 0x80)
-					proclen = i;
-				if (camel_mime_special_table[c] & safemask)
-					convlen += 1;
-				else
-					convlen += 3;
-			}
-			/* well, we probably have broken utf8, just copy it anyway what the heck */
-			if (proclen == 0) {
-				w(g_warning("Appear to have truncated utf8 sequence"));
-				proclen = inlen;
-			}
-			memcpy(out, inptr, proclen);
-			inptr += proclen;
-			inlen -= proclen;
-			out += proclen;
-		} else {
-			/* well we could do similar, but we can't (without undue effort), we'll just break it up into
-			   hopefully-small-enough chunks, and leave it at that */
-			convlen = MIN(inlen, CAMEL_FOLD_PREENCODED);
-			p = inptr;
-			if (iconv(ic, &inptr, &convlen, &out, &outlen) == -1) {
-				w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno)));
-				/* blah, we include it anyway, better than infinite loop ... */
-				inptr = p + convlen;
-			} else {
-				/* make sure we flush out any shift state */
-				iconv(ic, NULL, 0, &out, &outlen);
-			}
-			inlen -= (inptr - p);
-		}
-
-		enclen = out-buffer;
-
-		/* create token */
-		out = ascii;
-		if (first)
-			first = 0;
-		else
-			*out++ = ' ';
-		out += sprintf(out, "=?%s?Q?", type);
-		out += quoted_encode(buffer, enclen, out, safemask);
-		sprintf(out, "?=");
-
-		d(printf("converted part = %s\n", ascii));
-
-		g_string_append(outstring, ascii);
-	}
-
-	if (ic == (iconv_t) -1) {
-		iconv_close(ic);
-	}
-}
-
-
-/* TODO: Should this worry about quotes?? */
-char *
-header_encode_string(const unsigned char *in)
-{
-	GString *out;
-	const unsigned char *inptr = in, *start;
-	int encoding;
-	char *outstr;
-
-	if (in == NULL)
-		return NULL;
-
-	/* do a quick us-ascii check (the common case?) */
-	while (*inptr) {
-		if (*inptr > 127)
-			break;
-		inptr++;
-	}
-	if (*inptr == 0)
-		return g_strdup(in);
-
-	/* This gets each word out of the input, and checks to see what charset
-	   can be used to encode it. */
-	/* TODO: Work out when to merge subsequent words, or across word-parts */
-	out = g_string_new("");
-	inptr = in;
-	encoding = 0;
-	start = inptr;
-	while (inptr && *inptr) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			w(g_warning("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s", (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		if (unicode_isspace(c)) {
-			/* we've reached the end of a 'word' */
-			switch (encoding) {
-			case 0:
-				out = g_string_append_len(out, start, inptr-start);
-				break;
-			case 1:
-				rfc2047_encode_word(out, start, inptr-start-1, "ISO-8859-1", IS_ESAFE);
-				out = g_string_append_c (out, c);
-				break;
-			case 2:
-				rfc2047_encode_word(out, start, inptr-start-1,
-						    camel_charset_best(start, inptr-start-1), IS_ESAFE);
-				out = g_string_append_c(out, c);
-				break;
-			}
-			start = inptr;
-			encoding = 0;
-		} else if (c > 127 && c < 256) {
-			encoding = MAX(encoding, 1);
-		} else if (c >= 256) {
-			encoding = MAX(encoding, 2);
-		}
-	}
-	if (inptr-start) {
-		switch (encoding) {
-		case 0:
-			out = g_string_append_len(out, start, inptr-start);
-			break;
-		case 1:
-			rfc2047_encode_word(out, start, inptr-start, "ISO-8859-1", IS_ESAFE);
-			break;
-		case 2:
-			rfc2047_encode_word(out, start, inptr-start,
-					    camel_charset_best(start, inptr-start-1), IS_ESAFE);
-			break;
-		}
-	}
-	outstr = out->str;
-	g_string_free(out, FALSE);
-	return outstr;
-}
-
-/* apply quoted-string rules to a string */
-static void
-quote_word(GString *out, gboolean do_quotes, const char *start, int len)
-{
-	int i, c;
-
-	/* TODO: What about folding on long lines? */
-	if (do_quotes)
-		g_string_append_c(out, '"');
-	for (i=0;i<len;i++) {
-		c = *start++;
-		if (c == '\"' || c=='\\' || c=='\r')
-			g_string_append_c(out, '\\');
-		g_string_append_c(out, c);
-	}
-	if (do_quotes)
-		g_string_append_c(out, '"');
-}
-
-/* incrementing possibility for the word type */
-enum _phrase_word_t {
-	WORD_ATOM,
-	WORD_QSTRING,
-	WORD_2047
-};
-
-struct _phrase_word {
-	const unsigned char *start, *end;
-	enum _phrase_word_t type;
-	int encoding;
-};
-
-/* split the input into words
-   with info about each word
-   merge common word types
-   clean up
-*/
-/* encodes a phrase sequence (different quoting/encoding rules to strings) */
-char *
-header_encode_phrase(const unsigned char *in)
-{
-	GString *out;
-	const unsigned char *inptr = in, *start, *last;
-	int encoding;
-	char *outstr;
-	struct _phrase_word *word, *next;
-	enum _phrase_word_t type;
-	GList *words = NULL, *wordl, *nextl;
-	int count;
-
-	if (in == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-#if 0
-	{
-		int i;
-
-		printf("encoding phrase: %s\n", in);
-		for (i=0;in[i];i++) {
-			printf(" %02x", in[i]);
-			if (((i) & 15) == 15)
-				printf("\n");
-		}
-		printf("\n");
-	}
-#endif
-
-	/* break the input into words */
-	type = WORD_ATOM;
-	count = 0;
-	last = inptr;
-	start = inptr;
-	encoding = 0;
-	while (inptr && *inptr) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			w(g_warning("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s", (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		/* save this word out, multiple whitespace is not explicitly counted (?) */
-		if (unicode_isspace(c)) {
-			if (count > 0) {
-				word = g_malloc0(sizeof(*word));
-				word->start = start;
-				word->end = last;
-				word->type = type;
-				word->encoding = encoding;
-				words = g_list_append(words, word);
-				count = 0;
-			}
-			start = inptr;
-			type = WORD_ATOM;
-			encoding = 0;
-		} else {
-			count++;
-			if (c<128) {
-				if (!is_atom(c))
-					type = MAX(type, WORD_QSTRING);
-			} else if (c>127 && c < 256) {
-				type = WORD_2047;
-				encoding = MAX(encoding, 1);
-			} else if (c >=256) {
-				type = WORD_2047;
-				encoding = MAX(encoding, 2);
-			}
-		}
-		last = inptr;
-	}
-	if (count > 0) {
-		word = g_malloc0(sizeof(*word));
-		word->start = start;
-		word->end = last;
-		word->type = type;
-		word->encoding = encoding;
-		words = g_list_append(words, word);
-	}
-
-	/* now scan the list, checking for words of similar types that can be merged */
-	wordl = words;
-	while (wordl) {
-		word = wordl->data;
-		/* leave atoms as atoms (unless they're surrounded by quoted words??) */
-		if (word->type != WORD_ATOM) {
-			nextl = g_list_next(wordl);
-			while (nextl) {
-				next = nextl->data;
-				/* merge nodes of the same type AND we are not creating too long a string */
-				if (word->type == next->type) {
-					if (next->end - word->start < CAMEL_FOLD_PREENCODED) {
-						word->end = next->end;
-						words = g_list_remove_link(words, nextl);
-						g_free(next);
-						nextl = g_list_next(wordl);
-					} else {
-						/* if it is going to be too long, make sure we include the separating whitespace */
-						word->end = next->start;
-						break;
-					}
-				} else {
-					break;
-				}
-			}
-		}
-		wordl = g_list_next(wordl);
-	}
-
-	/* output words now with spaces between them */
-	wordl = words;
-	while (wordl) {
-		word = wordl->data;
-		switch (word->type) {
-		case WORD_ATOM:
-			out = g_string_append_len(out, word->start, word->end-word->start);
-			break;
-		case WORD_QSTRING:
-			quote_word(out, TRUE, word->start, word->end-word->start);
-			break;
-		case WORD_2047:
-			if (word->encoding == 1)
-				rfc2047_encode_word(out, word->start, word->end-word->start, "ISO-8859-1", IS_PSAFE);
-			else
-				rfc2047_encode_word(out, word->start, word->end-word->start,
-						    camel_charset_best(word->start, word->end-word->start), IS_PSAFE);
-			break;
-		}
-
-		/* copy across the right number of spaces between words */
-		nextl = g_list_next(wordl);
-		if (nextl) {
-			int i;
-			next = nextl->data;
-			/* if they are adjacent, it means we already had the spaces encoded internally,
-			   so now we just need to output 1 space */
-			i=next->start-word->end;
-			if (i==0)
-				i=1;
-			for (;i>0;i--)
-				out = g_string_append_c(out, ' ');
-		}
-
-		g_free(word);
-		wordl = g_list_next(wordl);
-	}
-	/* and we no longer need the list */
-	g_list_free(words);
-
-	outstr = out->str;
-	g_string_free(out, FALSE);
-	return outstr;
-}
-
-
-/* these are all internal parser functions */
-
-static char *
-decode_token(const char **in)
-{
-	const char *inptr = *in;
-	const char *start;
-
-	header_decode_lwsp(&inptr);
-	start = inptr;
-	while (is_ttoken(*inptr))
-		inptr++;
-	if (inptr>start) {
-		*in = inptr;
-		return g_strndup(start, inptr-start);
-	} else {
-		return NULL;
-	}
-}
-
-char *
-header_token_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return decode_token(&in);
-}
-
-/*
-   <"> * ( <any char except <"> \, cr  /  \ <any char> ) <">
-*/
-static char *
-header_decode_quoted_string(const char **in)
-{
-	const char *inptr = *in;
-	char *out = NULL, *outptr;
-	int outlen;
-	int c;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		const char *intmp;
-		int skip = 0;
-
-		/* first, calc length */
-		inptr++;
-		intmp = inptr;
-		while ( (c = *intmp++) && c!= '"') {
-			if (c=='\\' && *intmp) {
-				intmp++;
-				skip++;
-			}
-		}
-		outlen = intmp-inptr-skip;
-		out = outptr = g_malloc(outlen+1);
-		while ( (c = *inptr++) && c!= '"') {
-			if (c=='\\' && *inptr) {
-				c = *inptr++;
-			}
-			*outptr++ = c;
-		}
-		*outptr = 0;
-	}
-	*in = inptr;
-	return out;
-}
-
-static char *
-header_decode_atom(const char **in)
-{
-	const char *inptr = *in, *start;
-
-	header_decode_lwsp(&inptr);
-	start = inptr;
-	while (is_atom(*inptr))
-		inptr++;
-	*in = inptr;
-	if (inptr > start)
-		return g_strndup(start, inptr-start);
-	else
-		return NULL;
-}
-
-static char *
-header_decode_word(const char **in)
-{
-	const char *inptr = *in;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		*in = inptr;
-		return header_decode_quoted_string(in);
-	} else {
-		*in = inptr;
-		return header_decode_atom(in);
-	}
-}
-
-static char *
-header_decode_value(const char **in)
-{
-	const char *inptr = *in;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		d(printf("decoding quoted string\n"));
-		return header_decode_quoted_string(in);
-	} else if (is_ttoken(*inptr)) {
-		d(printf("decoding token\n"));
-		/* this may not have the right specials for all params? */
-		return decode_token(in);
-	}
-	return NULL;
-}
-
-/* shoudl this return -1 for no int? */
-static int
-header_decode_int(const char **in)
-{
-	const char *inptr = *in;
-	int c, v=0;
-
-	header_decode_lwsp(&inptr);
-	while ( (c=*inptr++ & 0xff)
-		&& isdigit(c) ) {
-		v = v*10+(c-'0');
-	}
-	*in = inptr-1;
-	return v;
-}
-
-static int
-header_decode_param(const char **in, char **paramp, char **valuep)
-{
-	const char *inptr = *in;
-	char *param, *value=NULL;
-
-	param = decode_token(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == '=') {
-		inptr++;
-		value = header_decode_value(&inptr);
-	}
-
-	if (param && value) {
-		*paramp = param;
-		*valuep = value;
-		*in = inptr;
-		return 0;
-	} else {
-		g_free(param);
-		g_free(value);
-		return 1;
-	}
-}
-
-char *
-header_param(struct _header_param *p, const char *name)
-{
-	while (p && strcasecmp(p->name, name) != 0)
-		p = p->next;
-	if (p)
-		return p->value;
-	return NULL;
-}
-
-struct _header_param *
-header_set_param(struct _header_param **l, const char *name, const char *value)
-{
-	struct _header_param *p = (struct _header_param *)l, *pn;
-
-	while (p->next) {
-		pn = p->next;
-		if (!strcasecmp(pn->name, name)) {
-			g_free(pn->value);
-			if (value) {
-				pn->value = g_strdup(value);
-				return pn;
-			} else {
-				p->next = pn->next;
-				g_free(pn);
-				return NULL;
-			}
-		}
-		p = pn;
-	}
-
-	if (value == NULL)
-		return NULL;
-
-	pn = g_malloc(sizeof(*pn));
-	pn->next = 0;
-	pn->name = g_strdup(name);
-	pn->value = g_strdup(value);
-	p->next = pn;
-
-	return pn;
-}
-
-const char *
-header_content_type_param(struct _header_content_type *t, const char *name)
-{
-	if (t==NULL)
-		return NULL;
-	return header_param(t->params, name);
-}
-
-void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value)
-{
-	header_set_param(&t->params, name, value);
-}
-
-/**
- * header_content_type_is:
- * @ct: A content type specifier, or #NULL.
- * @type: A type to check against.
- * @subtype: A subtype to check against, or "*" to match any subtype.
- * 
- * Returns #TRUE if the content type @ct is of type @type/@subtype.
- * The subtype of "*" will match any subtype.  If @ct is #NULL, then
- * it will match the type "text/plain".
- * 
- * Return value: #TRUE or #FALSE depending on the matching of the type.
- **/
-int
-header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype)
-{
-	/* no type == text/plain or text/"*" */
-	if (ct==NULL || (ct->type == NULL && ct->subtype == NULL)) {
-		return (!strcasecmp(type, "text")
-			&& (!strcasecmp(subtype, "plain")
-			    || !strcasecmp(subtype, "*")));
-	}
-
-	return (ct->type != NULL
-		&& (!strcasecmp(ct->type, type)
-		    && ((ct->subtype != NULL
-			 && !strcasecmp(ct->subtype, subtype))
-			|| !strcasecmp("*", subtype))));
-}
-
-void
-header_param_list_free(struct _header_param *p)
-{
-	struct _header_param *n;
-
-	while (p) {
-		n = p->next;
-		g_free(p->name);
-		g_free(p->value);
-		g_free(p);
-		p = n;
-	}
-}
-
-struct _header_content_type *
-header_content_type_new(const char *type, const char *subtype)
-{
-	struct _header_content_type *t = g_malloc(sizeof(*t));
-
-	t->type = g_strdup(type);
-	t->subtype = g_strdup(subtype);
-	t->params = NULL;
-	t->refcount = 1;
-	return t;
-}
-
-void
-header_content_type_ref(struct _header_content_type *ct)
-{
-	if (ct)
-		ct->refcount++;
-}
-
-
-void
-header_content_type_unref(struct _header_content_type *ct)
-{
-	if (ct) {
-		if (ct->refcount <= 1) {
-			header_param_list_free(ct->params);
-			g_free(ct->type);
-			g_free(ct->subtype);
-			g_free(ct);
-		} else {
-			ct->refcount--;
-		}
-	}
-}
-
-/* for decoding email addresses, canonically */
-static char *
-header_decode_domain(const char **in)
-{
-	const char *inptr = *in, *start;
-	int go = TRUE;
-	char *ret;
-	GString *domain = g_string_new("");
-
-				/* domain ref | domain literal */
-	header_decode_lwsp(&inptr);
-	while (go) {
-		if (*inptr == '[') { /* domain literal */
-			domain = g_string_append(domain, "[ ");
-			inptr++;
-			header_decode_lwsp(&inptr);
-			start = inptr;
-			while (is_dtext(*inptr)) {
-				domain = g_string_append_c(domain, *inptr);
-				inptr++;
-			}
-			if (*inptr == ']') {
-				domain = g_string_append(domain, " ]");
-				inptr++;
-			} else {
-				w(g_warning("closing ']' not found in domain: %s", *in));
-			}
-		} else {
-			char *a = header_decode_atom(&inptr);
-			if (a) {
-				domain = g_string_append(domain, a);
-				g_free(a);
-			} else {
-				w(g_warning("missing atom from domain-ref"));
-				break;
-			}
-		}
-		header_decode_lwsp(&inptr);
-		if (*inptr == '.') { /* next sub-domain? */
-			domain = g_string_append_c(domain, '.');
-			inptr++;
-			header_decode_lwsp(&inptr);
-		} else
-			go = FALSE;
-	}
-
-	*in = inptr;
-
-	ret = domain->str;
-	g_string_free(domain, FALSE);
-	return ret;
-}
-
-static char *
-header_decode_addrspec(const char **in)
-{
-	const char *inptr = *in;
-	char *word;
-	GString *addr = g_string_new("");
-
-	header_decode_lwsp(&inptr);
-
-	/* addr-spec */
-	word = header_decode_word(&inptr);
-	if (word) {
-		addr = g_string_append(addr, word);
-		header_decode_lwsp(&inptr);
-		g_free(word);
-		while (*inptr == '.' && word) {
-			inptr++;
-			addr = g_string_append_c(addr, '.');
-			word = header_decode_word(&inptr);
-			if (word) {
-				addr = g_string_append(addr, word);
-				header_decode_lwsp(&inptr);
-				g_free(word);
-			} else {
-				w(g_warning("Invalid address spec: %s", *in));
-			}
-		}
-		if (*inptr == '@') {
-			inptr++;
-			addr = g_string_append_c(addr, '@');
-			word = header_decode_domain(&inptr);
-			if (word) {
-				addr = g_string_append(addr, word);
-				g_free(word);
-			} else {
-				w(g_warning("Invalid address, missing domain: %s", *in));
-			}
-		} else {
-			w(g_warning("Invalid addr-spec, missing @: %s", *in));
-		}
-	} else {
-		w(g_warning("invalid addr-spec, no local part"));
-	}
-
-	/* FIXME: return null on error? */
-
-	*in = inptr;
-	word = addr->str;
-	g_string_free(addr, FALSE);
-	return word;
-}
-
-/*
-  address:
-   word *('.' word) @ domain |
-   *(word) '<' [ *('@' domain ) ':' ] word *( '.' word) @ domain |
-
-   1*word ':' [ word ... etc (mailbox, as above) ] ';'
- */
-
-/* mailbox:
-   word *( '.' word ) '@' domain
-   *(word) '<' [ *('@' domain ) ':' ] word *( '.' word) @ domain
-   */
-
-static struct _header_address *
-header_decode_mailbox(const char **in)
-{
-	const char *inptr = *in;
-	char *pre;
-	int closeme = FALSE;
-	GString *addr;
-	GString *name = NULL;
-	struct _header_address *address = NULL;
-	const char *comment = NULL;
-
-	addr = g_string_new("");
-
-	/* for each address */
-	pre = header_decode_word(&inptr);
-	header_decode_lwsp(&inptr);
-	if (!(*inptr == '.' || *inptr == '@' || *inptr==',' || *inptr=='\0')) {
-		/* ',' and '\0' required incase it is a simple address, no @ domain part (buggy writer) */
-		name = g_string_new("");
-		while (pre) {
-			char *text, *last;
-
-			/* perform internationalised decoding, and append */
-			text = header_decode_string(pre);
-			name = g_string_append(name, text);
-			last = pre;
-			g_free(text);
-
-			pre = header_decode_word(&inptr);
-			if (pre) {
-				int l = strlen(last);
-				int p = strlen(pre);
-				/* dont append ' ' between sucsessive encoded words */
-				if ((l>6 && last[l-2] == '?' && last[l-1] == '=')
-				    && (p>6 && pre[0] == '=' && pre[1] == '?')) {
-					/* dont append ' ' */
-				} else {
-					name = g_string_append_c(name, ' ');
-				}
-			}
-			g_free(last);
-		}
-		header_decode_lwsp(&inptr);
-		if (*inptr == '<') {
-			closeme = TRUE;
-			inptr++;
-			header_decode_lwsp(&inptr);
-			if (*inptr == '@') {
-				while (*inptr == '@') {
-					inptr++;
-					header_decode_domain(&inptr);
-					header_decode_lwsp(&inptr);
-					if (*inptr == ',') {
-						inptr++;
-						header_decode_lwsp(&inptr);
-					}
-				}
-				if (*inptr == ':') {
-					inptr++;
-				} else {
-					w(g_warning("broken route-address, missing ':': %s", *in));
-				}
-			}
-			pre = header_decode_word(&inptr);
-			header_decode_lwsp(&inptr);
-		} else {
-			w(g_warning("broken address? %s", *in));
-		}
-	}
-
-	if (pre) {
-		addr = g_string_append(addr, pre);
-	} else {
-		w(g_warning("No local-part for email address: %s", *in));
-	}
-
-	/* should be at word '.' localpart */
-	while (*inptr == '.' && pre) {
-		inptr++;
-		g_free(pre);
-		pre = header_decode_word(&inptr);
-		if (pre) {
-			addr = g_string_append_c(addr, '.');
-			addr = g_string_append(addr, pre);
-		}
-		comment = inptr;
-		header_decode_lwsp(&inptr);
-	}
-	g_free(pre);
-
-	/* now at '@' domain part */
-	if (*inptr == '@') {
-		char *dom;
-
-		inptr++;
-		addr = g_string_append_c(addr, '@');
-		comment = inptr;
-		dom = header_decode_domain(&inptr);
-		addr = g_string_append(addr, dom);
-		g_free(dom);
-	} else {
-		w(g_warning("invalid address, no '@' domain part at %c: %s", *inptr, *in));
-	}
-
-	if (closeme) {
-		header_decode_lwsp(&inptr);
-		if (*inptr == '>') {
-			inptr++;
-		} else {
-			w(g_warning("invalid route address, no closing '>': %s", *in));
-		} 
-	} else if (name == NULL && comment != NULL && inptr>comment) { /* check for comment after address */
-		char *text, *tmp;
-		const char *comstart, *comend;
-
-		/* this is a bit messy, we go from the last known position, because
-		   decode_domain/etc skip over any comments on the way */
-		/* FIXME: This wont detect comments inside the domain itself,
-		   but nobody seems to use that feature anyway ... */
-
-		d(printf("checking for comment from '%s'\n", comment));
-
-		comstart = strchr(comment, '(');
-		if (comstart) {
-			comstart++;
-			header_decode_lwsp(&inptr);
-			comend = inptr-1;
-			while (comend > comstart && comend[0] != ')')
-				comend--;
-			
-			if (comend > comstart) {
-				d(printf("  looking at subset '%.*s'\n", comend-comstart, comstart));
-				tmp = g_strndup(comstart, comend-comstart);
-				text = header_decode_string(tmp);
-				name = g_string_new(text);
-				g_free(tmp);
-				g_free(text);
-			}
-		}
-	}
-
-	*in = inptr;
-
-	if (addr->len > 0) {
-		address = header_address_new_name(name?name->str:"", addr->str);
-	}
-
-	g_string_free(addr, TRUE);
-	if (name)
-		g_string_free(name, TRUE);
-
-	d(printf("got mailbox: %s\n", addr->str));
-	return address;
-}
-
-static struct _header_address *
-header_decode_address(const char **in)
-{
-	const char *inptr = *in;
-	char *pre;
-	GString *group = g_string_new("");
-	struct _header_address *addr = NULL, *member;
-
-	/* pre-scan, trying to work out format, discard results */
-	header_decode_lwsp(&inptr);
-	while ( (pre = header_decode_word(&inptr)) ) {
-		group = g_string_append(group, pre);
-		group = g_string_append(group, " ");
-		g_free(pre);
-	}
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':') {
-		d(printf("group detected: %s\n", group->str));
-		addr = header_address_new_group(group->str);
-		/* that was a group spec, scan mailbox's */
-		inptr++;
-		/* FIXME: check rfc 2047 encodings of words, here or above in the loop */
-		header_decode_lwsp(&inptr);
-		if (*inptr != ';') {
-			int go = TRUE;
-			do {
-				member = header_decode_mailbox(&inptr);
-				if (member)
-					header_address_add_member(addr, member);
-				header_decode_lwsp(&inptr);
-				if (*inptr == ',')
-					inptr++;
-				else
-					go = FALSE;
-			} while (go);
-			if (*inptr == ';') {
-				inptr++;
-			} else {
-				w(g_warning("Invalid group spec, missing closing ';': %s", *in));
-			}
-		} else {
-			inptr++;
-		}
-		*in = inptr;
-	} else {
-		addr = header_decode_mailbox(in);
-	}
-
-	g_string_free(group, TRUE);
-
-	return addr;
-}
-
-static char *
-header_msgid_decode_internal(const char **in)
-{
-	const char *inptr = *in;
-	char *msgid = NULL;
-
-	d(printf("decoding Message-ID: '%s'\n", *in));
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '<') {
-		inptr++;
-		header_decode_lwsp(&inptr);
-		msgid = header_decode_addrspec(&inptr);
-		if (msgid) {
-			header_decode_lwsp(&inptr);
-			if (*inptr == '>') {
-				inptr++;
-			} else {
-				w(g_warning("Missing closing '>' on message id: %s", *in));
-			}
-		} else {
-			w(g_warning("Cannot find message id in: %s", *in));
-		}
-	} else {
-		w(g_warning("missing opening '<' on message id: %s", *in));
-	}
-	*in = inptr;
-
-	return msgid;
-}
-
-char *
-header_msgid_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_msgid_decode_internal(&in);
-}
-
-void
-header_references_list_append_asis(struct _header_references **list, char *ref)
-{
-	struct _header_references *w = (struct _header_references *)list, *n;
-	while (w->next)
-		w = w->next;
-	n = g_malloc(sizeof(*n));
-	n->id = ref;
-	n->next = 0;
-	w->next = n;
-}
-
-int
-header_references_list_size(struct _header_references **list)
-{
-	int count = 0;
-	struct _header_references *w = *list;
-	while (w) {
-		count++;
-		w = w->next;
-	}
-	return count;
-}
-
-void
-header_references_list_clear(struct _header_references **list)
-{
-	struct _header_references *w = *list, *n;
-	while (w) {
-		n = w->next;
-		g_free(w->id);
-		g_free(w);
-		w = n;
-	}
-	*list = NULL;
-}
-
-/* generate a list of references, from most recent up */
-struct _header_references *
-header_references_decode(const char *in)
-{
-	const char *inptr = in;
-	struct _header_references *head = NULL, *node;
-	char *id, *word;
-
-	if (in == NULL || in[0] == '\0')
-		return NULL;
-
-	while (*inptr) {
-		header_decode_lwsp(&inptr);
-		if (*inptr == '<') {
-			id = header_msgid_decode_internal(&inptr);
-			if (id) {
-				node = g_malloc(sizeof(*node));
-				node->next = head;
-				head = node;
-				node->id = id;
-			}
-		} else {
-			word = header_decode_word(&inptr);
-			if (word)
-				g_free (word);
-			else if (*inptr != '\0')
-				inptr++; /* Stupid mailer tricks */
-		}
-	}
-
-	return head;
-}
-
-struct _header_references *
-header_references_dup(const struct _header_references *list)
-{
-	struct _header_references *new = NULL, *tmp;
-
-	while (list) {
-		tmp = g_new(struct _header_references, 1);
-		tmp->next = new;
-		tmp->id = g_strdup(list->id);
-		new = tmp;
-		list = list->next;
-	}
-	return new;
-}
-
-struct _header_address *
-header_mailbox_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_decode_mailbox(&in);
-}
-
-struct _header_address *
-header_address_decode(const char *in)
-{
-	const char *inptr = in, *last;
-	struct _header_address *list = NULL, *addr;
-
-	d(printf("decoding To: '%s'\n", in));
-
-	if (in == NULL)
-		return NULL;
-
-	do {
-		last = inptr;
-		addr = header_decode_address(&inptr);
-		if (addr)
-			header_address_list_append(&list, addr);
-		header_decode_lwsp(&inptr);
-		if (*inptr == ',')
-			inptr++;
-		else
-			break;
-	} while (inptr != last);
-
-	if (*inptr) {
-		w(g_warning("Invalid input detected at %c (%d): %s\n or at: %s", *inptr, inptr-in, in, inptr));
-	}
-
-	if (inptr == last) {
-		w(g_warning("detected invalid input loop at : %s", last));
-	}
-
-	return list;
-}
-
-void
-header_mime_decode(const char *in, int *maj, int *min)
-{
-	const char *inptr = in;
-	int major=-1, minor=-1;
-
-	d(printf("decoding MIME-Version: '%s'\n", in));
-
-	if (in != NULL) {
-		header_decode_lwsp(&inptr);
-		if (isdigit(*inptr)) {
-			major = header_decode_int(&inptr);
-			header_decode_lwsp(&inptr);
-			if (*inptr == '.') {
-				inptr++;
-				header_decode_lwsp(&inptr);
-				if (isdigit(*inptr))
-					minor = header_decode_int(&inptr);
-			}
-		}
-	}
-
-	if (maj)
-		*maj = major;
-	if (min)
-		*min = minor;
-
-	d(printf("major = %d, minor = %d\n", major, minor));
-}
-
-static struct _header_param *
-header_decode_param_list(const char **in)
-{
-	const char *inptr = *in;
-	struct _header_param *head = NULL, *tail = NULL;
-
-	header_decode_lwsp(&inptr);
-	while (*inptr == ';') {
-		char *param, *value;
-		struct _header_param *p;
-
-		inptr++;
-		/* invalid format? */
-		if (header_decode_param(&inptr, &param, &value) != 0)
-			break;
-
-		p = g_malloc(sizeof(*p));
-		p->name = param;
-		p->value = value;
-		p->next = NULL;
-		if (head == NULL)
-			head = p;
-		if (tail)
-			tail->next = p;
-		tail = p;
-		header_decode_lwsp(&inptr);
-	}
-	*in = inptr;
-	return head;
-}
-
-struct _header_param *
-header_param_list_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_decode_param_list(&in);
-}
-
-void
-header_param_list_format_append(GString *out, struct _header_param *p)
-{
-	int len = out->len;
-	char *ch;
-
-	while (p) {
-		int here = out->len;
-		if (len+strlen(p->name)+strlen(p->value)>60) {
-			out = g_string_append(out, ";\n\t");
-			len = 0;
-		} else
-			out = g_string_append (out, "; ");
-		
-		g_string_sprintfa(out, "%s=", p->name);
-
-		for (ch = p->value; *ch; ch++) {
-			if (is_tspecial(*ch))
-				break;
-		}
-		if (!*ch)
-			g_string_append(out, p->value);
-		else
-			quote_word(out, TRUE, p->value, strlen(p->value));
-
-		len += (out->len - here);
-		p = p->next;
-	}
-}
-
-char *
-header_param_list_format(struct _header_param *p)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	header_param_list_format_append(out, p);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-struct _header_content_type *
-header_content_type_decode(const char *in)
-{
-	const char *inptr = in;
-	char *type, *subtype = NULL;
-	struct _header_content_type *t = NULL;
-
-	if (in==NULL)
-		return NULL;
-
-	type = decode_token(&inptr);
-	header_decode_lwsp(&inptr);
-	if (type) {
-		if  (*inptr == '/') {
-			inptr++;
-			subtype = decode_token(&inptr);
-		}
-		if (subtype == NULL && (!strcasecmp(type, "text"))) {
-			w(g_warning("text type with no subtype, resorting to text/plain: %s", in));
-			subtype = g_strdup("plain");
-		}
-		if (subtype == NULL) {
-			w(g_warning("MIME type with no subtype: %s", in));
-		}
-
-		t = header_content_type_new(type, subtype);
-		t->params = header_decode_param_list(&inptr);
-		g_free(type);
-		g_free(subtype);
-	} else {
-		g_free(type);
-		d(printf("cannot find MIME type in header (2) '%s'", in));
-	}
-	return t;
-}
-
-void
-header_content_type_dump(struct _header_content_type *ct)
-{
-	struct _header_param *p;
-
-	printf("Content-Type: ");
-	if (ct==NULL) {
-		printf("<NULL>\n");
-		return;
-	}
-	printf("%s / %s", ct->type, ct->subtype);
-	p = ct->params;
-	if (p) {
-		while (p) {
-			printf(";\n\t%s=\"%s\"", p->name, p->value);
-			p = p->next;
-		}
-	}
-	printf("\n");
-}
-
-char *
-header_content_type_format(struct _header_content_type *ct)
-{
-	GString *out;
-	char *ret;
-
-	if (ct==NULL)
-		return NULL;
-
-	out = g_string_new("");
-	if (ct->type == NULL) {
-		g_string_sprintfa(out, "text/plain");
-		w(g_warning("Content-Type with no main type"));
-	} else if (ct->subtype == NULL) {
-		w(g_warning("Content-Type with no sub type: %s", ct->type));
-		if (!strcasecmp(ct->type, "multipart"))
-			g_string_sprintfa(out, "%s/mixed", ct->type);
-		else
-			g_string_sprintfa(out, "%s", ct->type);
-	} else {
-		g_string_sprintfa(out, "%s/%s", ct->type, ct->subtype);
-	}
-	header_param_list_format_append(out, ct->params);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-char *
-header_content_type_simple(struct _header_content_type *ct)
-{
-	return g_strdup_printf("%s/%s", ct->type, ct->subtype);
-}
-
-char *
-header_content_encoding_decode(const char *in)
-{
-	if (in)
-		return decode_token(&in);
-	return NULL;
-}
-
-CamelMimeDisposition *header_disposition_decode(const char *in)
-{
-	CamelMimeDisposition *d = NULL;
-	const char *inptr = in;
-
-	if (in == NULL)
-		return NULL;
-
-	d = g_malloc(sizeof(*d));
-	d->refcount = 1;
-	d->disposition = decode_token(&inptr);
-	if (d->disposition == NULL)
-		w(g_warning("Empty disposition type"));
-	d->params = header_decode_param_list(&inptr);
-	return d;
-}
-
-void header_disposition_ref(CamelMimeDisposition *d)
-{
-	if (d)
-		d->refcount++;
-}
-void header_disposition_unref(CamelMimeDisposition *d)
-{
-	if (d) {
-		if (d->refcount<=1) {
-			header_param_list_free(d->params);
-			g_free(d->disposition);
-			g_free(d);
-		} else {
-			d->refcount--;
-		}
-	}
-}
-
-char *header_disposition_format(CamelMimeDisposition *d)
-{
-	GString *out;
-	char *ret;
-
-	if (d==NULL)
-		return NULL;
-
-	out = g_string_new("");
-	if (d->disposition)
-		out = g_string_append(out, d->disposition);
-	else
-		out = g_string_append(out, "attachment");
-	header_param_list_format_append(out, d->params);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-/* hrm, is there a library for this shit? */
-static struct {
-	char *name;
-	int offset;
-} tz_offsets [] = {
-	{ "UT", 0 },
-	{ "GMT", 0 },
-	{ "EST", -500 },	/* these are all US timezones.  bloody yanks */
-	{ "EDT", -400 },
-	{ "CST", -600 },
-	{ "CDT", -500 },
-	{ "MST", -700 },
-	{ "MDT", -600 },
-	{ "PST", -800 },
-	{ "PDT", -700 },
-	{ "Z", 0 },
-	{ "A", -100 },
-	{ "M", -1200 },
-	{ "N", 100 },
-	{ "Y", 1200 },
-};
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-char *
-header_format_date(time_t time, int offset)
-{
-	struct tm tm;
-
-	d(printf("offset = %d\n", offset));
-
-	d(printf("converting date %s", ctime(&time)));
-
-	time += ((offset / 100) * (60*60)) + (offset % 100)*60;
-
-	d(printf("converting date %s", ctime(&time)));
-
-	memcpy(&tm, gmtime(&time), sizeof(tm));
-
-	return g_strdup_printf("%02d %s %04d %02d:%02d:%02d %+05d",
-			       tm.tm_mday, tz_months[tm.tm_mon],
-			       tm.tm_year + 1900,
-			       tm.tm_hour, tm.tm_min, tm.tm_sec,
-			       offset);
-}
-
-/* convert a date to time_t representation */
-/* this is an awful mess oh well */
-time_t
-header_decode_date(const char *in, int *saveoffset)
-{
-	const char *inptr = in;
-	char *monthname;
-	int year, offset = 0;
-	struct tm tm;
-	int i;
-	time_t t;
-
-	if (in == NULL) {
-		if (saveoffset)
-			*saveoffset = 0;
-		return 0;
-	}
-
-	d(printf ("\ndecoding date '%s'\n", inptr));
-
-	memset (&tm, 0, sizeof(tm));
-
-	header_decode_lwsp (&inptr);
-	if (!isdigit (*inptr)) {
-		char *day = decode_token (&inptr);
-		/* we dont really care about the day, it's only for display */
-		if (day) {
-			d(printf ("got day: %s\n", day));
-			g_free (day);
-			header_decode_lwsp (&inptr);
-			if (*inptr == ',') {
-				inptr++;
-			} else {
-#ifndef CLEAN_DATE
-				char *newdate;
-
-				w(g_warning("day not followed by ',' it's probably a broken mail client, so we'll ignore its date entirely"));
-				w(printf ("Giving it one last chance...\n"));
-				newdate = parse_broken_date (in);
-				if (newdate) {
-					w(printf ("Got: %s\n", newdate));
-					t = header_decode_date (newdate, saveoffset);
-					g_free (newdate);
-					return t;
-				}
-#endif
-				if (saveoffset)
-					*saveoffset = 0;
-				return 0;
-			}
-		}
-	}
-	tm.tm_mday = header_decode_int(&inptr);
-	monthname = decode_token(&inptr);
-	if (monthname) {
-		for (i=0;i<sizeof(tz_months)/sizeof(tz_months[0]);i++) {
-			if (!strcasecmp(tz_months[i], monthname)) {
-				tm.tm_mon = i;
-				break;
-			}
-		}
-		g_free(monthname);
-	}
-	year = header_decode_int(&inptr);
-	if (year < 69 || (year >= 100 && year < 1900)) {
-		tm.tm_year = 100 + year;
-	} else if (year < 100) {
-		tm.tm_year = year;
-	} else {
-		tm.tm_year = year - 1900;
-	}
-	/* get the time ... yurck */
-	tm.tm_hour = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':')
-		inptr++;
-	tm.tm_min = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':')
-		inptr++;
-	tm.tm_sec = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == '+'
-	    || *inptr == '-') {
-		offset = (*inptr++)=='-'?-1:1;
-		offset = offset * header_decode_int(&inptr);
-		d(printf("abs signed offset = %d\n", offset));
-	} else if (isdigit(*inptr)) {
-		offset = header_decode_int(&inptr);
-		d(printf("abs offset = %d\n", offset));
-	} else {
-		char *tz = decode_token(&inptr);
-
-		if (tz) {
-			for (i=0;i<sizeof(tz_offsets)/sizeof(tz_offsets[0]);i++) {
-				if (!strcasecmp(tz_offsets[i].name, tz)) {
-					offset = tz_offsets[i].offset;
-					break;
-				}
-			}
-			g_free(tz);
-		}
-		/* some broken mailers seem to put in things like GMT+1030 instead of just +1030 */
-		header_decode_lwsp(&inptr);
-		if (*inptr == '+' || *inptr == '-') {
-			int sign = (*inptr++)=='-'?-1:1;
-			offset = offset + (header_decode_int(&inptr)*sign);
-		}
-		d(printf("named offset = %d\n", offset));
-	}
-
-	t = mktime(&tm);
-#if defined(HAVE_TIMEZONE)
-	t -= timezone;
-#elif defined(HAVE_TM_GMTOFF)
-	t += tm.tm_gmtoff;
-#else
-#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.
-#endif
-
-	/* t is now GMT of the time we want, but not offset by the timezone ... */
-
-	d(printf(" gmt normalized? = %s\n", ctime(&t)));
-
-	/* this should convert the time to the GMT equiv time */
-	t -= ( (offset/100) * 60*60) + (offset % 100)*60;
-
-	d(printf(" gmt normalized for timezone? = %s\n", ctime(&t)));
-
-	d({
-		char *tmp;
-		tmp = header_format_date(t, offset);
-		printf(" encoded again: %s\n", tmp);
-		g_free(tmp);
-	});
-
-	if (saveoffset)
-		*saveoffset = offset;
-
-	return t;
-}
-
-/* extra rfc checks */
-#define CHECKS
-
-#ifdef CHECKS
-static void
-check_header(struct _header_raw *h)
-{
-	unsigned char *p;
-
-	p = h->value;
-	while (p && *p) {
-		if (!isascii(*p)) {
-			w(g_warning("Appending header violates rfc: %s: %s", h->name, h->value));
-			return;
-		}
-		p++;
-	}
-}
-#endif
-
-void
-header_raw_append_parse(struct _header_raw **list, const char *header, int offset)
-{
-	register const char *in;
-	int fieldlen;
-	char *name;
-
-	in = header;
-	while (is_fieldname(*in) || *in==':')
-		in++;
-	fieldlen = in-header-1;
-	while (is_lwsp(*in))
-		in++;
-	if (fieldlen == 0 || header[fieldlen] != ':') {
-		printf("Invalid header line: '%s'\n", header);
-		return;
-	}
-	name = alloca(fieldlen+1);
-	memcpy(name, header, fieldlen);
-	name[fieldlen] = 0;
-
-	header_raw_append(list, name, in, offset);
-}
-
-void
-header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset)
-{
-	struct _header_raw *l, *n;
-
-	d(printf("Header: %s: %s\n", name, value));
-
-	n = g_malloc(sizeof(*n));
-	n->next = NULL;
-	n->name = g_strdup(name);
-	n->value = g_strdup(value);
-	n->offset = offset;
-#ifdef CHECKS
-	check_header(n);
-#endif
-	l = (struct _header_raw *)list;
-	while (l->next) {
-		l = l->next;
-	}
-	l->next = n;
-
-	/* debug */
-#if 0
-	if (!strcasecmp(name, "To")) {
-		printf("- Decoding To\n");
-		header_to_decode(value);
-	} else if (!strcasecmp(name, "Content-type")) {
-		printf("- Decoding content-type\n");
-		header_content_type_dump(header_content_type_decode(value));		
-	} else if (!strcasecmp(name, "MIME-Version")) {
-		printf("- Decoding mime version\n");
-		header_mime_decode(value);
-	}
-#endif
-}
-
-static struct _header_raw *
-header_raw_find_node(struct _header_raw **list, const char *name)
-{
-	struct _header_raw *l;
-
-	l = *list;
-	while (l) {
-		if (!strcasecmp(l->name, name))
-			break;
-		l = l->next;
-	}
-	return l;
-}
-
-const char *
-header_raw_find(struct _header_raw **list, const char *name, int *offset)
-{
-	struct _header_raw *l;
-
-	l = header_raw_find_node(list, name);
-	if (l) {
-		if (offset)
-			*offset = l->offset;
-		return l->value;
-	} else
-		return NULL;
-}
-
-const char *
-header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last)
-{
-	struct _header_raw *l;
-
-	if (last == NULL || name == NULL)
-		return NULL;
-
-	l = *list;
-	while (l && l->value != last)
-		l = l->next;
-	return header_raw_find(&l, name, offset);
-}
-
-static void
-header_raw_free(struct _header_raw *l)
-{
-	g_free(l->name);
-	g_free(l->value);
-	g_free(l);
-}
-
-void
-header_raw_remove(struct _header_raw **list, const char *name)
-{
-	struct _header_raw *l, *p;
-
-	/* the next pointer is at the head of the structure, so this is safe */
-	p = (struct _header_raw *)list;
-	l = *list;
-	while (l) {
-		if (!strcasecmp(l->name, name)) {
-			p->next = l->next;
-			header_raw_free(l);
-			l = p->next;
-		} else {
-			p = l;
-			l = l->next;
-		}
-	}
-}
-
-void
-header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset)
-{
-	header_raw_remove(list, name);
-	header_raw_append(list, name, value, offset);
-}
-
-void
-header_raw_clear(struct _header_raw **list)
-{
-	struct _header_raw *l, *n;
-	l = *list;
-	while (l) {
-		n = l->next;
-		header_raw_free(l);
-		l = n;
-	}
-	*list = NULL;
-}
-
-char *
-header_msgid_generate (void)
-{
-	char host[MAXHOSTNAMELEN], domain[MAXHOSTNAMELEN];
-#ifdef ENABLE_THREADS
-	static pthread_mutex_t count_lock = PTHREAD_MUTEX_INITIALIZER;
-#define COUNT_LOCK() pthread_mutex_lock (&count_lock)
-#define COUNT_UNLOCK() pthread_mutex_unlock (&count_lock)
-#else
-#define COUNT_LOCK()
-#define COUNT_UNLOCK()
-#endif /* ENABLE_THREADS */
-	static gint count = 0;
-	gint hrv, drv;
-	char *ret;
-	
-	hrv = gethostname (host, sizeof (host));
-	drv = getdomainname (domain, sizeof (domain));
-	
-	COUNT_LOCK ();
-	ret = g_strdup_printf ("%d.%d.%d.camel@%s.%s", (gint) time (NULL), getpid (), count++,
-			       (hrv == 0 && host && *host) ? host : "unknown.host",
-			       (drv && domain && *domain) ? domain : "unknown.domain");
-	COUNT_UNLOCK ();
-	
-	return ret;
-}
-
-
-static struct {
-	char *name;
-	char *pattern;
-} mail_list_magic[] = {
-	{ "Sender", " *owner-([^@]+)" },
-	{ "X-BeenThere", " *([^@]+)" },
-	{ "Delivered-To", " *mailing list ([^@]+)" },
-	{ "X-Mailing-List", " *([^@]+)" },
-	{ "X-Loop", " *([^@]+)" },
-	{ "List-Id", " *([^<]+)" },
-};
-
-char *
-header_raw_check_mailing_list(struct _header_raw **list)
-{
-	const char *v;
-	regex_t pattern;
-	regmatch_t match[2];
-	int i;
-
-	for (i=0;i<sizeof(mail_list_magic)/sizeof(mail_list_magic[0]);i++) {
-		if (regcomp(&pattern, mail_list_magic[i].pattern, REG_EXTENDED|REG_ICASE) == -1) {
-			g_warning("Internal error, compiling regex failed: %s: %s", mail_list_magic[i].pattern, strerror(errno));
-			continue;
-		}
-
-		v = header_raw_find(list, mail_list_magic[i].name, NULL);
-		if (v != NULL && regexec(&pattern, v, 2, match, 0) == 0 && match[1].rm_so != -1) {
-			regfree(&pattern);
-			return g_strndup(v+match[1].rm_so, match[1].rm_eo-match[1].rm_so);
-		}
-		regfree(&pattern);
-	}
-
-	return NULL;
-}
-
-/* ok, here's the address stuff, what a mess ... */
-struct _header_address *header_address_new(void)
-{
-	struct _header_address *h;
-	h = g_malloc0(sizeof(*h));
-	h->type = HEADER_ADDRESS_NONE;
-	h->refcount = 1;
-	return h;
-}
-
-struct _header_address *header_address_new_name(const char *name, const char *addr)
-{
-	struct _header_address *h;
-
-	h = header_address_new();
-	h->type = HEADER_ADDRESS_NAME;
-	h->name = g_strdup(name);
-	h->v.addr = g_strdup(addr);
-	return h;
-}
-
-struct _header_address *header_address_new_group(const char *name)
-{
-	struct _header_address *h;
-
-	h = header_address_new();
-	h->type = HEADER_ADDRESS_GROUP;
-	h->name = g_strdup(name);
-	return h;
-}
-
-void header_address_ref(struct _header_address *h)
-{
-	if (h)
-		h->refcount++;
-}
-
-void header_address_unref(struct _header_address *h)
-{
-	if (h) {
-		if (h->refcount <= 1) {
-			if (h->type == HEADER_ADDRESS_GROUP) {
-				header_address_list_clear(&h->v.members);
-			} else if (h->type == HEADER_ADDRESS_NAME) {
-				g_free(h->v.addr);
-			}
-			g_free(h->name);
-			g_free(h);
-		} else {
-			h->refcount--;
-		}
-	}
-}
-
-void header_address_set_name(struct _header_address *h, const char *name)
-{
-	if (h) {
-		g_free(h->name);
-		h->name = g_strdup(name);
-	}
-}
-
-void header_address_set_addr(struct _header_address *h, const char *addr)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_NAME
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_NAME;
-			g_free(h->v.addr);
-			h->v.addr = g_strdup(addr);
-		} else {
-			g_warning("Trying to set the address on a group");
-		}
-	}
-}
-
-void header_address_set_members(struct _header_address *h, struct _header_address *group)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_GROUP
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_GROUP;
-			header_address_list_clear(&h->v.members);
-			/* should this ref them? */
-			h->v.members = group;
-		} else {
-			g_warning("Trying to set the members on a name, not group");
-		}
-	}
-}
-
-void header_address_add_member(struct _header_address *h, struct _header_address *member)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_GROUP
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_GROUP;
-			header_address_list_append(&h->v.members, member);
-		}		    
-	}
-}
-
-void header_address_list_append_list(struct _header_address **l, struct _header_address **h)
-{
-	if (l) {
-		struct _header_address *n = (struct _header_address *)l;
-
-		while (n->next)
-			n = n->next;
-		n->next = *h;
-	}
-}
-
-
-void header_address_list_append(struct _header_address **l, struct _header_address *h)
-{
-	if (h) {
-		header_address_list_append_list(l, &h);
-		h->next = NULL;
-	}
-}
-
-void header_address_list_clear(struct _header_address **l)
-{
-	struct _header_address *a, *n;
-	a = *l;
-	while (a) {
-		n = a->next;
-		header_address_unref(a);
-		a = n;
-	}
-	*l = NULL;
-}
-
-/* if encode is true, then the result is suitable for mailing, otherwise
-   the result is suitable for display only (and may not even be re-parsable) */
-static void
-header_address_list_encode_append(GString *out, int encode, struct _header_address *a)
-{
-	char *text;
-
-	while (a) {
-		switch (a->type) {
-		case HEADER_ADDRESS_NAME:
-			if (encode)
-				text = header_encode_phrase (a->name);
-			else
-				text = a->name;
-			if (text && *text)
-				g_string_sprintfa(out, "%s <%s>", text, a->v.addr);
-			else
-				g_string_append(out, a->v.addr);
-			if (encode)
-				g_free(text);
-			break;
-		case HEADER_ADDRESS_GROUP:
-			if (encode)
-				text = header_encode_phrase(a->name);
-			else
-				text = a->name;
-			g_string_sprintfa(out, "%s: ", text);
-			header_address_list_encode_append(out, encode, a->v.members);
-			g_string_sprintfa(out, ";");
-			if (encode)
-				g_free(text);
-			break;
-		default:
-			g_warning("Invalid address type");
-			break;
-		}
-		a = a->next;
-		if (a)
-			g_string_append(out, ", ");
-	}
-}
-
-char *
-header_address_list_encode(struct _header_address *a)
-{
-	GString *out;
-	char *ret;
-
-	if (a == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-	header_address_list_encode_append(out, TRUE, a);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-char *
-header_address_list_format(struct _header_address *a)
-{
-	GString *out;
-	char *ret;
-
-	if (a == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-	header_address_list_encode_append(out, FALSE, a);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-/* simple header folding */
-/* will work even if the header is already folded */
-char *
-header_fold(const char *in, int headerlen)
-{
-	int len, outlen, i;
-	const char *inptr = in, *space, *p, *n;
-	GString *out;
-	char *ret;
-	int needunfold = FALSE;
-
-	if (in == NULL)
-		return NULL;
-
-	/* first, check to see if we even need to fold */
-	len = headerlen + 2;
-	p = in;
-	while (*p) {
-		n = strchr(p, '\n');
-		if (n == NULL) {
-			n = p+strlen(p);
-		} else {
-			needunfold = TRUE;
-		}
-		len += n-p;
-		
-		if (len >= CAMEL_FOLD_SIZE)
-			break;
-		len = 0;
-		p = n + 1;
-	}
-	if (len < CAMEL_FOLD_SIZE)
-		return g_strdup(in);
-
-	/* we need to fold, so first unfold (if we need to), then process */
-	if (needunfold)
-		inptr = in = header_unfold(in);
-
-	out = g_string_new("");
-	outlen = headerlen+2;
-	while (*inptr) {
-		space = strchr(inptr, ' ');
-		if (space) {
-			len = space-inptr+1;
-		} else {
-			len = strlen(inptr);
-		}
-		d(printf("next word '%.*s'\n", len, inptr));
-		if (outlen + len > CAMEL_FOLD_SIZE) {
-			d(printf("outlen = %d wordlen = %d\n", outlen, len));
-			/* strip trailing space */
-			if (out->len > 0 && out->str[out->len-1] == ' ')
-				g_string_truncate(out, out->len-1);
-			g_string_append(out, "\n\t");
-			outlen = 1;
-			/* check for very long words, just cut them up */
-			while (outlen+len > CAMEL_FOLD_SIZE) {
-				for (i=0;i<CAMEL_FOLD_SIZE-outlen;i++)
-					g_string_append_c(out, inptr[i]);
-				inptr += CAMEL_FOLD_SIZE-outlen;
-				len -= CAMEL_FOLD_SIZE-outlen;
-				g_string_append(out, "\n\t");
-				outlen = 1;
-			}
-		}
-		outlen += len;
-		for (i=0;i<len;i++) {
-			g_string_append_c(out, inptr[i]);
-		}
-		inptr += len;
-	}
-	ret = out->str;
-	g_string_free(out, FALSE);
-
-	if (needunfold)
-		g_free((char *)in);
-
-	return ret;	
-}
-
-char *
-header_unfold(const char *in)
-{
-	char *out = g_malloc(strlen(in)+1);
-	const char *inptr = in;
-	char c, *o = out;
-
-	o = out;
-	while ((c = *inptr++)) {
-		if (c == '\n') {
-			if (is_lwsp(*inptr)) {
-				do {
-					inptr++;
-				} while (is_lwsp(*inptr));
-				*o++ = ' ';
-			} else {
-				*o++ = c;
-			}
-		} else {
-			*o++ = c;
-		}
-	}
-	*o = 0;
-
-	return out;
-}
-
-#ifdef BUILD_TABLE
-
-/* for debugging tests */
-/* should also have some regression tests somewhere */
-
-void test_phrase(const char *in)
-{
-	printf("'%s' -> '%s'\n", in, header_encode_phrase(in));
-}
-
-void test_fold(const char *in)
-{
-	printf("'%s'\n ->\n '%s'\n", in, header_fold(in));
-}
-
-void run_test(void)
-{
-	char *to = "gnome hacker dudes: license-discuss@opensource.org,
-        \"Richard M. Stallman\" <rms@gnu.org>,
-        Barry Chester <barry_che@antdiv.gov.au>,
-        Michael Zucchi <zucchi.michael(this (is a nested) comment)@zedzone.mmc.com.au>,
-        Miguel de Icaza <miguel@gnome.org>;,
-	zucchi@zedzone.mmc.com.au, \"Foo bar\" <zed@zedzone>,
-	<frob@frobzone>";
-
-#if 0
-	header_to_decode(to);
-
-	header_mime_decode("1.0", 0, 0);
-	header_mime_decode("1.3 (produced by metasend V1.0)", 0, 0);
-	header_mime_decode("(produced by metasend V1.0) 5.2", 0, 0);
-	header_mime_decode("7(produced by metasend 1.0) . (produced by helix/send/1.0) 9 . 5", 0, 0);
-	header_mime_decode("3.", 0, 0);
-	header_mime_decode(".", 0, 0);
-	header_mime_decode(".5", 0, 0);
-	header_mime_decode("c.d", 0, 0);
-	header_mime_decode("", 0, 0);
-
-	header_msgid_decode(" <\"L3x2i1.0.Nm5.Xd-Wu\"@lists.redhat.com>");
-	header_msgid_decode("<200001180446.PAA02065@beaker.htb.com.au>");
-#endif
-
-	test_fold("Header: This is a long header that should be folded properly at the right place, or so i hope.  I should probably set the fold value to something lower for testing");
-	test_fold("Header: nowletstryfoldingsomethingthatistoolongtofold,iwonderwhatitshoulddointsteadtofoldit?hmm,iguessicanjusttruncateitatsomepointortrytorefoldthepreviousstuff(yuck)tofit");
-	test_phrase("Michael Zucchi (NotZed)");
-	test_phrase("Zucchi, ( \\ NotZed \\ ) Michael");
-	{
-		int ic;
-		char *outbuf, *inbuf, buffer[256];
-		int inlen, outlen;
-
-		outlen = 256;
-		inbuf = "Dra¾en Kaèar";
-		inlen = strlen(inbuf);
-		outbuf = buffer;
-		ic = iconv_open("UTF-8", "ISO-8859-1");
-		iconv(ic, &inbuf, &inlen, &outbuf, &outlen);
-		test_phrase(buffer);
-
-		outlen = 256;
-		inbuf = "This is an encoded phrase Tomasz K³oczko";
-		inlen = strlen(inbuf);
-		outbuf = buffer;
-		ic = iconv_open("UTF-8", "ISO-8859-2");
-		iconv(ic, &inbuf, &inlen, &outbuf, &outlen);
-		test_phrase(buffer);
-
-	}
-
-	{
-		char *str = "Blah blah\n\t = ? =? ?= This is a TEST For quoted-printable-encoding-encoding-of
-	long lines, and lines that end in spaces                                                                       
-	and line sthat end in tabs 						
-	And lines that just end.";
-
-		char encoded[256];
-		int state=-1,save=0;
-		int len;
-
-		len = quoted_encode_step(str, strlen(str), encoded, &state, &save);
-		len += quoted_encode_close("", 0, encoded+len, &state, &save);
-		printf("encoded = '%.*s'\n", len, encoded);
-	}
-}
-
-#endif /* BUILD_TABLE */
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
deleted file mode 100644
index 691653d43b..0000000000
--- a/camel/camel-mime-utils.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_UTILS_H
-#define _CAMEL_MIME_UTILS_H
-
-#include <glib.h>
-#include <time.h>
-
-/* maximum size of a line from header_fold() */
-#define CAMEL_FOLD_SIZE (77)
-
-/* a list of references for this message */
-struct _header_references {
-	struct _header_references *next;
-	char *id;
-};
-
-struct _header_param {
-	struct _header_param *next;
-	char *name;
-	char *value;
-};
-
-/* describes a content-type */
-struct _header_content_type {
-	char *type;
-	char *subtype;
-	struct _header_param *params;
-	unsigned int refcount;
-};
-
-/* a raw rfc822 header */
-/* the value MUST be US-ASCII */
-struct _header_raw {
-	struct _header_raw *next;
-	char *name;
-	char *value;
-	int offset;		/* in file, if known */
-};
-
-typedef struct _CamelMimeDisposition {
-	char *disposition;
-	struct _header_param *params;
-	unsigned int refcount;
-} CamelMimeDisposition;
-
-enum _header_address_type {
-	HEADER_ADDRESS_NONE,	/* uninitialised */
-	HEADER_ADDRESS_NAME,
-	HEADER_ADDRESS_GROUP
-};
-
-struct _header_address {
-	struct _header_address *next;
-	enum _header_address_type type;
-	char *name;
-	union {
-		char *addr;
-		struct _header_address *members;
-	} v;
-	unsigned int refcount;
-};
-
-/* Address lists */
-struct _header_address *header_address_new(void);
-struct _header_address *header_address_new_name(const char *name, const char *addr);
-struct _header_address *header_address_new_group(const char *name);
-void header_address_ref(struct _header_address *);
-void header_address_unref(struct _header_address *);
-void header_address_set_name(struct _header_address *, const char *name);
-void header_address_set_addr(struct _header_address *, const char *addr);
-void header_address_set_members(struct _header_address *, struct _header_address *group);
-void header_address_add_member(struct _header_address *, struct _header_address *member);
-void header_address_list_append_list(struct _header_address **l, struct _header_address **h);
-void header_address_list_append(struct _header_address **, struct _header_address *);
-void header_address_list_clear(struct _header_address **);
-
-struct _header_address *header_address_decode(const char *in);
-struct _header_address *header_mailbox_decode(const char *in);
-/* for mailing */
-char *header_address_list_encode(struct _header_address *a);
-/* for display */
-char *header_address_list_format(struct _header_address *a);
-
-/* structured header prameters */
-struct _header_param *header_param_list_decode(const char *in);
-char *header_param(struct _header_param *p, const char *name);
-struct _header_param *header_set_param(struct _header_param **l, const char *name, const char *value);
-void header_param_list_format_append(GString *out, struct _header_param *p);
-char *header_param_list_format(struct _header_param *p);
-void header_param_list_free(struct _header_param *p);
-
-/* Content-Type header */
-struct _header_content_type *header_content_type_new(const char *type, const char *subtype);
-struct _header_content_type *header_content_type_decode(const char *in);
-void header_content_type_unref(struct _header_content_type *ct);
-void header_content_type_ref(struct _header_content_type *ct);
-const char *header_content_type_param(struct _header_content_type *t, const char *name);
-void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value);
-int header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype);
-char *header_content_type_format(struct _header_content_type *ct);
-char *header_content_type_simple(struct _header_content_type *ct);
-
-/* DEBUGGING function */
-void header_content_type_dump(struct _header_content_type *ct);
-
-/* Content-Disposition header */
-CamelMimeDisposition *header_disposition_decode(const char *in);
-void header_disposition_ref(CamelMimeDisposition *);
-void header_disposition_unref(CamelMimeDisposition *);
-char *header_disposition_format(CamelMimeDisposition *d);
-
-/* decode the contents of a content-encoding header */
-char *header_content_encoding_decode(const char *in);
-
-/* raw headers */
-void header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset);
-void header_raw_append_parse(struct _header_raw **list, const char *header, int offset);
-const char *header_raw_find(struct _header_raw **list, const char *name, int *ofset);
-const char *header_raw_find_next(struct _header_raw **list, const char *name, int *ofset, const char *last);
-void header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset);
-void header_raw_remove(struct _header_raw **list, const char *name);
-void header_raw_fold(struct _header_raw **list);
-void header_raw_clear(struct _header_raw **list);
-
-char *header_raw_check_mailing_list(struct _header_raw **list);
-
-/* fold a header */
-char *header_fold(const char *in, int headerlen);
-char *header_unfold(const char *in);
-
-/* decode a header which is a simple token */
-char *header_token_decode(const char *in);
-
-/* decode/encode a string type, like a subject line */
-char *header_decode_string(const char *in);
-char *header_encode_string(const unsigned char *in);
-
-/* encode a phrase, like the real name of an address */
-char *header_encode_phrase(const unsigned char *in);
-
-/* decode an email date field into a GMT time, + optional offset */
-time_t header_decode_date(const char *in, int *saveoffset);
-char *header_format_date(time_t time, int offset);
-
-/* decode a message id */
-char *header_msgid_decode(const char *in);
-
-/* generate msg id */
-char *header_msgid_generate (void);
-
-/* decode a References header */
-struct _header_references *header_references_decode(const char *in);
-void header_references_list_clear(struct _header_references **list);
-void header_references_list_append_asis(struct _header_references **list, char *ref);
-int header_references_list_size(struct _header_references **list);
-struct _header_references *header_references_dup(const struct _header_references *list);
-
-/* decode the mime-type header */
-void header_mime_decode(const char *in, int *maj, int *min);
-
-/* do incremental base64/quoted-printable (de/en)coding */
-int base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save);
-
-int base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save);
-int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
-
-int uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen);
-
-int quoted_decode_step(unsigned char *in, int len, unsigned char *out, int *savestate, int *saveme);
-
-int quoted_encode_step(unsigned char *in, int len, unsigned char *out, int *state, int *save);
-int quoted_encode_close(unsigned char *in, int len, unsigned char *out, int *state, int *save);
-
-char *base64_encode_simple (const char *data, int len);
-int base64_decode_simple (char *data, int len);
-
-#endif /* ! _CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
deleted file mode 100644
index a0873b25ad..0000000000
--- a/camel/camel-movemail.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-movemail.c: mbox copying function */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include "camel-movemail.h"
-#include "camel-exception.h"
-
-#include "camel-mime-parser.h"
-#include "camel-mime-filter.h"
-#include "camel-mime-filter-from.h"
-
-#define d(x)
-
-#ifdef MOVEMAIL_PATH
-#include <sys/wait.h>
-
-static void movemail_external (const char *source, const char *dest,
-			       CamelException *ex);
-#endif
-
-/* these could probably be exposed as a utility? (but only mbox needs it) */
-#if 0
-static int camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter);
-static int camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes);
-#endif
-
-/**
- * camel_movemail: Copy an mbox file from a shared spool directory to a
- * new folder in a Camel store
- * @source: source file
- * @dest: destination file
- * @ex: a CamelException
- *
- * This copies an mbox file from a shared directory with multiple
- * readers and writers into a private (presumably Camel-controlled)
- * directory. Dot locking is used on the source file (but not the
- * destination).
- **/
-void
-camel_movemail (const char *source, const char *dest, CamelException *ex)
-{
-	gboolean locked;
-	int sfd, dfd, tmpfd;
-	char *locktmpfile, *lockfile;
-	struct stat st;
-	time_t now, timeout;
-	int nread, nwrote;
-	char buf[BUFSIZ];
-
-	camel_exception_clear (ex);
-
-	/* Stat and then open the spool file. If it doesn't exist or
-	 * is empty, the user has no mail. (There's technically a race
-	 * condition here in that an MDA might have just now locked it
-	 * to deliver a message, but we don't care. In that case,
-	 * assuming it's unlocked is equivalent to pretending we were
-	 * called a fraction earlier.)
-	 */
-	if (stat (source, &st) == -1) {
-		if (errno != ENOENT) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not check mail file "
-						"%s: %s"), source,
-					      g_strerror (errno));
-		}
-		return;
-	}
-	if (st.st_size == 0)
-		return;
-
-	/* Create the unique lock file. */
-	locktmpfile = g_strdup_printf ("%s.lock.XXXXXX", source);
-#ifdef HAVE_MKSTEMP
-	tmpfd = mkstemp (locktmpfile);
-#else
-	if (mktemp (locktmpfile)) {
-		tmpfd = open (locktmpfile, O_RDWR | O_CREAT | O_EXCL,
-			      S_IRUSR | S_IWUSR);
-	} else
-		tmpfd = -1;
-#endif
-	if (tmpfd == -1) {
-		g_free (locktmpfile);
-#ifdef MOVEMAIL_PATH
-		if (errno == EACCES) {
-			/* movemail_external will fail if the dest file
-			 * already exists, so if it does, return now,
-			 * let the fetch code process the mail that's
-			 * already there, and then the user can try again.
-			 */
-			if (stat (dest, &st) == 0)
-				return;
-
-			movemail_external (source, dest, ex);
-			return;
-		}
-#endif
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create lock file "
-					"for %s: %s"), source,
-				      g_strerror (errno));
-		return;
-	}
-	close (tmpfd);
-
-	sfd = open (source, O_RDWR);
-	if (sfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open mail file %s: %s"),
-				      source, g_strerror (errno));
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		return;
-	}
-
-	dfd = open (dest, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-	if (dfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open temporary mail "
-					"file %s: %s"), dest,
-				      g_strerror (errno));
-		close (sfd);
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		return;
-	}
-
-	lockfile = g_strdup_printf ("%s.lock", source);
-	locked = FALSE;
-	time (&timeout);
-	timeout += 30;
-
-	/* Loop trying to lock the file for 30 seconds. */
-	while (time (&now) < timeout) {
-		/* Try to make the lock. */
-		if (symlink (locktmpfile, lockfile) == 0) {
-			locked = TRUE;
-			break;
-		}
-
-		/* If we fail for a reason other than that someone
-		 * else has the lock, then abort.
-		 */
-		if (errno != EEXIST) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not create lock "
-						"file for %s: %s"), source,
-					      g_strerror (errno));
-			break;
-		}
-
-		/* Check the modtime on the lock file. */
-		if (stat (lockfile, &st) == -1) {
-			/* If the lockfile disappeared, try again. */
-			if (errno == ENOENT)
-				continue;
-
-			/* Some other error. Abort. */
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not test lock "
-						"file for %s: %s"), source,
-					      g_strerror (errno));
-			break;
-		}
-
-		/* If the lock file is stale, remove it and try again. */
-		if (st.st_mtime < now - 60) {
-			unlink (lockfile);
-			continue;
-		}
-
-		/* Otherwise, sleep and try again. */
-		sleep (5);
-	}
-
-	if (!locked) {
-		/* Something has gone awry. */
-		if (now >= timeout) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Timed out trying to get "
-						"lock file on %s. Try again "
-						"later."), source);
-		}
-		g_free (lockfile);
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		close (sfd);
-		close (dfd);
-		return;
-	}
-
-	/* OK. We have the file locked now. */
-
-	/* FIXME: Set a timer to keep the file locked. */
-
-	while (1) {
-		int written = 0;
-
-		nread = read (sfd, buf, sizeof (buf));
-		if (nread == 0)
-			break;
-		else if (nread == -1) {
-			if (errno == EINTR)
-				continue;
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error reading mail file: %s"),
-					      g_strerror (errno));
-			break;
-		}
-
-		while (nread) {
-			nwrote = write (dfd, buf + written, nread);
-			if (nwrote == -1) {
-				if (errno == EINTR)
-					continue; /* continues inner loop */
-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Error writing "
-							"mail temp file: %s"),
-						      g_strerror (errno));
-				break;
-			}
-			written += nwrote;
-			nread -= nwrote;
-		}
-	}
-
-	/* If no errors occurred copying the data, and we successfully
-	 * close the destination file, then truncate the source file.
-	 */
-	if (!camel_exception_is_set (ex)) {
-		if (close (dfd) == 0)
-			ftruncate (sfd, 0);
-		else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to store mail in "
-						"temp file %s: %s"), dest,
-					      g_strerror (errno));
-		}
-	} else
-		close (dfd);
-	close (sfd);
-
-	/* Clean up lock files. */
-	unlink (lockfile);
-	g_free (lockfile);
-	unlink (locktmpfile);
-	g_free (locktmpfile);
-}
-
-#ifdef MOVEMAIL_PATH
-static void
-movemail_external (const char *source, const char *dest, CamelException *ex)
-{
-	sigset_t mask, omask;
-	pid_t pid;
-	int fd[2], len = 0, nread, status;
-	char buf[BUFSIZ], *output = NULL;
-
-	/* Block SIGCHLD so the app can't mess us up. */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGCHLD);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-
-	if (pipe (fd) == -1) {
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create pipe: %s"),
-				      g_strerror (errno));
-		return;
-	}
-
-	pid = fork ();
-	switch (pid) {
-	case -1:
-		close (fd[0]);
-		close (fd[1]);
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not fork: %s"),
-				      g_strerror (errno));
-		return;
-
-	case 0:
-		/* Child */
-		close (fd[0]);
-		close (STDIN_FILENO);
-		dup2 (fd[1], STDOUT_FILENO);
-		dup2 (fd[1], STDERR_FILENO);
-
-		execl (MOVEMAIL_PATH, MOVEMAIL_PATH, source, dest, NULL);
-		_exit (255);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Parent */
-	close (fd[1]);
-
-	/* Read movemail's output. */
-	while ((nread = read (fd[0], buf, sizeof (buf))) > 0) {
-		output = g_realloc (output, len + nread + 1);
-		memcpy (output + len, buf, nread);
-		len += nread;
-		output[len] = '\0';
-	}
-	close (fd[0]);
-
-	/* Now get the exit status. */
-	while (waitpid (pid, &status, 0) == -1 && errno == EINTR)
-		;
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-
-	if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Movemail program failed: %s"),
-				      output ? output : _("(Unknown error)"));
-	}
-	g_free (output);
-}
-#endif
-
-
-#if 0
-static int
-camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes)
-{
-        char buffer[4096];
-        int written = 0;
-
-	d(printf("writing %d bytes ... ", bytes));
-
-	if (lseek(fromfd, start, SEEK_SET) != start)
-		return -1;
-
-        while (bytes>0) {
-                int toread, towrite;
-
-                toread = bytes;
-                if (bytes>4096)
-                        toread = 4096;
-                else
-                        toread = bytes;
-		do {
-			towrite = read(fromfd, buffer, toread);
-		} while (towrite == -1 && errno == EINTR);
-
-		if (towrite == -1)
-			return -1;
-
-                /* check for 'end of file' */
-                if (towrite == 0) {
-			d(printf("end of file?\n"));
-                        break;
-		}
-
-		do {
-			toread = write(tofd, buffer, towrite);
-		} while (toread == -1 && errno == EINTR);
-
-		if (toread == -1)
-			return -1;
-
-                written += toread;
-                bytes -= toread;
-        }
-
-        d(printf("written %d bytes\n", written));
-
-        return written;
-}
-#endif
-
-#define PRE_SIZE (32)
-
-#if 0
-static int
-camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter)
-{
-        char buffer[4096+PRE_SIZE];
-        int written = 0;
-	char *filterbuffer;
-	int filterlen, filterpre;
-
-	d(printf("writing %d bytes ... ", bytes));
-
-	camel_mime_filter_reset(filter);
-
-	if (lseek(fromfd, start, SEEK_SET) != start)
-		return -1;
-
-        while (bytes>0) {
-                int toread, towrite;
-
-                toread = bytes;
-                if (bytes>4096)
-                        toread = 4096;
-                else
-                        toread = bytes;
-		do {
-			towrite = read(fromfd, buffer+PRE_SIZE, toread);
-		} while (towrite == -1 && errno == EINTR);
-
-		if (towrite == -1)
-			return -1;
-
-                /* check for 'end of file' */
-                if (towrite == 0) {
-			d(printf("end of file?\n"));
-			camel_mime_filter_complete(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,
-						   &filterbuffer, &filterlen, &filterpre);
-			towrite = filterlen;
-			if (towrite == 0)
-				break;
-		} else {
-			camel_mime_filter_filter(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,
-						 &filterbuffer, &filterlen, &filterpre);
-			towrite = filterlen;
-		}
-
-		do {
-			toread = write(tofd, filterbuffer, towrite);
-		} while (toread == -1 && errno == EINTR);
-
-		if (toread == -1)
-			return -1;
-
-                written += toread;
-                bytes -= toread;
-        }
-
-        d(printf("written %d bytes\n", written));
-
-        return written;
-}
-
-/* write the headers back out again, but not he Content-Length header, because we dont
-   want	to maintain it! */
-static int
-solaris_header_write(int fd, struct _header_raw *header)
-{
-        struct iovec iv[4];
-        int outlen = 0, len;
-
-        iv[1].iov_base = ":";
-        iv[1].iov_len = 1;
-        iv[3].iov_base = "\n";
-        iv[3].iov_len = 1;
-
-        while (header) {
-		if (strcasecmp(header->name, "Content-Length")) {
-			iv[0].iov_base = header->name;
-			iv[0].iov_len = strlen(header->name);
-			iv[2].iov_base = header->value;
-			iv[2].iov_len = strlen(header->value);
-		
-			do {
-				len = writev(fd, iv, 4);
-			} while (len == -1 && errno == EINTR);
-			
-			if (len == -1)
-				return -1;
-			outlen += len;
-		}
-                header = header->next;
-        }
-
-	do {
-		len = write(fd, "\n", 1);
-	} while (len == -1 && errno == EINTR);
-
-	if (len == -1)
-		return -1;
-
-	outlen += 1;
-
-	d(printf("Wrote %d bytes of headers\n", outlen));
-
-        return outlen;
-}
-
-/* Well, since Solaris is a tad broken wrt its 'mbox' folder format,
-   we must convert it to a real mbox format.  Thankfully this is
-   mostly pretty easy */
-static int
-camel_movemail_solaris (int sfd, int dfd, CamelException *ex)
-{
-	CamelMimeParser *mp;
-	char *buffer;
-	int len;
-	CamelMimeFilterFrom *ffrom;
-	int ret = 1;
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_init_with_fd(mp, sfd);
-
-	ffrom = camel_mime_filter_from_new();
-
-	while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM) {
-		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM_END) {
-			const char *cl;
-			int length;
-			int start, body;
-			off_t newpos;
-
-			ret = 0;
-
-			start = camel_mime_parser_tell_start_from(mp);
-			body = camel_mime_parser_tell(mp);
-
-			/* write out headers, but NOT content-length header */
-			solaris_header_write(dfd, camel_mime_parser_headers_raw(mp));
-
-			cl = camel_mime_parser_header(mp, "content-length", NULL);
-			if (cl == NULL) {
-				g_warning("Required Content-Length header is missing from solaris mail box @ %d", (int)camel_mime_parser_tell(mp));
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_step(mp, &buffer, &len);
-				camel_mime_parser_unstep(mp);
-				length = camel_mime_parser_tell_start_from(mp) - body;
-				newpos = -1;
-			} else {
-				length = atoi(cl);
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_drop_step(mp);
-				newpos = length+body;
-			}
-			/* copy body->length converting From lines */
-			if (camel_movemail_copy_filter(sfd, dfd, body, length, (CamelMimeFilter *)ffrom) == -1)
-				goto fail;
-			if (newpos != -1)
-				camel_mime_parser_seek(mp, newpos, SEEK_SET);
-		} else {
-			g_error("Inalid parser state: %d", camel_mime_parser_state(mp));
-		}
-	}
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return ret;
-
-fail:
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      "Error copying "
-			      "mail temp file: %s",
-			      g_strerror (errno));
-
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return -1;
-}
-#endif
-
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
deleted file mode 100644
index 8b73435a43..0000000000
--- a/camel/camel-movemail.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-movemail.h: mbox copy function */
-
-/* 
- * Author: 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MOVEMAIL_H
-#define CAMEL_MOVEMAIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-exception.h>
-
-void camel_movemail (const char *source, const char *dest, CamelException *ex);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MOVEMAIL_H */
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
deleted file mode 100644
index 898bd7ace6..0000000000
--- a/camel/camel-multipart.c
+++ /dev/null
@@ -1,518 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-multipart.c : Abstract class for a multipart */
-
-#ifndef NO_WARNINGS
-#warning This should be a mostly abstract class, but it is not!
-#endif
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-mem.h"
-#include "camel-multipart.h"
-#include "camel-mime-part.h"
-#include "camel-exception.h"
-#include "md5-utils.h"
-
-#include <unistd.h> /* for getpid */
-#include <time.h>   /* for time */
-
-#define d(x)
-
-static void                  add_part          (CamelMultipart *multipart,
-						CamelMimePart *part);
-static void                  add_part_at       (CamelMultipart *multipart,
-						CamelMimePart *part,
-						guint index);
-static void                  remove_part       (CamelMultipart *multipart,
-						CamelMimePart *part);
-static CamelMimePart *       remove_part_at    (CamelMultipart *multipart,
-						guint index);
-static CamelMimePart *       get_part          (CamelMultipart *multipart,
-						guint index);
-static guint                 get_number        (CamelMultipart *multipart);
-static void                  set_boundary      (CamelMultipart *multipart,
-						gchar *boundary);
-static const gchar *         get_boundary      (CamelMultipart *multipart);
-static int                   write_to_stream   (CamelDataWrapper *data_wrapper,
-						CamelStream *stream);
-static void                  unref_part        (gpointer data, gpointer user_data);
-
-static CamelDataWrapperClass *parent_class = NULL;
-
-
-
-/* Returns the class for a CamelMultipart */
-#define CMP_CLASS(so) CAMEL_MULTIPART_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-/* Returns the class for a CamelDataWrapper */
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void
-camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)
-{
-	CamelDataWrapperClass *camel_data_wrapper_class =
-		CAMEL_DATA_WRAPPER_CLASS (camel_multipart_class);
-
-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));
-
-	/* virtual method definition */
-	camel_multipart_class->add_part = add_part;
-	camel_multipart_class->add_part_at = add_part_at;
-	camel_multipart_class->remove_part = remove_part;
-	camel_multipart_class->remove_part_at = remove_part_at;
-	camel_multipart_class->get_part = get_part;
-	camel_multipart_class->get_number = get_number;
-	camel_multipart_class->set_boundary = set_boundary;
-	camel_multipart_class->get_boundary = get_boundary;
-
-	/* virtual method overload */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-}
-
-static void
-camel_multipart_init (gpointer object, gpointer klass)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (object);
-
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-					  "multipart/mixed");
-	multipart->preface = NULL;
-	multipart->postface = NULL;
-}
-
-static void
-camel_multipart_finalize (CamelObject *object)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (object);
-
-	g_list_foreach (multipart->parts, unref_part, NULL);
-
-	if (multipart->boundary)
-		g_free (multipart->boundary);
-	if (multipart->preface)
-		g_free (multipart->preface);
-	if (multipart->postface)
-		g_free (multipart->postface);
-}
-
-
-CamelType
-camel_multipart_get_type (void)
-{
-	static CamelType camel_multipart_type = CAMEL_INVALID_TYPE;
-
-	if (camel_multipart_type == CAMEL_INVALID_TYPE) {
-		camel_multipart_type = camel_type_register (camel_data_wrapper_get_type (), "CamelMultipart",
-							    sizeof (CamelMultipart),
-							    sizeof (CamelMultipartClass),
-							    (CamelObjectClassInitFunc) camel_multipart_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_multipart_init,
-							    (CamelObjectFinalizeFunc) camel_multipart_finalize);
-	}
-
-	return camel_multipart_type;
-}
-
-static void
-unref_part (gpointer data, gpointer user_data)
-{
-	CamelObject *part = CAMEL_OBJECT (data);
-
-	camel_object_unref (part);
-}
-
-/**
- * camel_multipart_new:
- *
- * Create a new CamelMultipart object.
- *
- * Return value: a new CamelMultipart
- **/
-CamelMultipart *
-camel_multipart_new (void)
-{
-	CamelMultipart *multipart;
-
-	multipart = (CamelMultipart *)camel_object_new (CAMEL_MULTIPART_TYPE);
-	multipart->preface = NULL;
-	multipart->postface = NULL;
-
-	return multipart;
-}
-
-
-static void
-add_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	multipart->parts = g_list_append (multipart->parts, part);
-	camel_object_ref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_add_part:
- * @multipart: a CamelMultipart
- * @part: the part to add
- *
- * Appends the part to the multipart object.
- **/
-void
-camel_multipart_add_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->add_part (multipart, part);
-}
-
-
-static void
-add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index)
-{
-	multipart->parts = g_list_insert (multipart->parts, part, index);
-	camel_object_ref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_add_part_at:
- * @multipart: a CamelMultipart
- * @part: the part to add
- * @index: index to add the multipart at
- *
- * Adds the part to the multipart object after the @index'th
- * element. If @index is greater than the number of parts, it is
- * equivalent to camel_multipart_add_part().
- **/
-void
-camel_multipart_add_part_at (CamelMultipart *multipart,
-			     CamelMimePart *part, guint index)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->add_part_at (multipart, part, index);
-}
-
-
-static void
-remove_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	if (!multipart->parts)
-		return;
-	multipart->parts = g_list_remove (multipart->parts, part);
-	camel_object_unref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_remove_part:
- * @multipart: a CamelMultipart
- * @part: the part to remove
- *
- * Removes @part from @multipart.
- **/
-void
-camel_multipart_remove_part (CamelMultipart *multipart,
-			     CamelMimePart *part)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->remove_part (multipart, part);
-}
-
-
-static CamelMimePart *
-remove_part_at (CamelMultipart *multipart, guint index)
-{
-	GList *parts_list;
-	GList *part_to_remove;
-	CamelMimePart *removed_part;
-
-	if (!(multipart->parts))
-		return NULL;
-
-	parts_list = multipart->parts;
-	part_to_remove = g_list_nth (parts_list, index);
-	if (!part_to_remove) {
-		g_warning ("CamelMultipart::remove_part_at: "
-			   "part to remove is NULL\n");
-		return NULL;
-	}
-	removed_part = CAMEL_MIME_PART (part_to_remove->data);
-
-	multipart->parts = g_list_remove_link (parts_list, part_to_remove);
-	if (part_to_remove->data)
-		camel_object_unref (CAMEL_OBJECT (part_to_remove->data));
-	g_list_free_1 (part_to_remove);
-
-	return removed_part;
-}
-
-/**
- * camel_multipart_remove_part_at:
- * @multipart: a CamelMultipart
- * @index: a zero-based index indicating the part to remove
- *
- * Remove the indicated part from the multipart object.
- *
- * Return value: the removed part. Note that it is camel_object_unref()ed
- * before being returned, which may cause it to be destroyed.
- **/
-CamelMimePart *
-camel_multipart_remove_part_at (CamelMultipart *multipart, guint index)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);
-
-	return CMP_CLASS (multipart)->remove_part_at (multipart, index);
-}
-
-
-static CamelMimePart *
-get_part (CamelMultipart *multipart, guint index)
-{
-	GList *part;
-
-	if (!(multipart->parts))
-		return NULL;
-
-	part = g_list_nth (multipart->parts, index);
-	if (part)
-		return CAMEL_MIME_PART (part->data);
-	else
-		return NULL;
-}
-
-/**
- * camel_multipart_get_part:
- * @multipart: a CamelMultipart
- * @index: a zero-based index indicating the part to get
- *
- * Return value: the indicated subpart, or %NULL
- **/
-CamelMimePart *
-camel_multipart_get_part (CamelMultipart *multipart, guint index)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);
-
-	return CMP_CLASS (multipart)->get_part (multipart, index);
-}
-
-
-static guint
-get_number (CamelMultipart *multipart)
-{
-	return g_list_length (multipart->parts);
-}
-
-/**
- * camel_multipart_get_number:
- * @multipart: a CamelMultipart
- *
- * Return value: the number of subparts in @multipart
- **/
-guint
-camel_multipart_get_number (CamelMultipart *multipart)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), 0);
-
-	return CMP_CLASS (multipart)->get_number (multipart);
-}
-
-
-static void
-set_boundary (CamelMultipart *multipart, gchar *boundary)
-{
-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);
-	char *bgen, digest[16], bbuf[27], *p;
-	int state, save;
-
-	g_return_if_fail (cdw->mime_type != NULL);
-
-	if (!boundary) {
-		/* Generate a fairly random boundary string. */
-		bgen = g_strdup_printf ("%p:%lu:%lu", multipart,
-					(unsigned long) getpid(),
-					(unsigned long) time(0));
-		md5_get_digest (bgen, strlen (bgen), digest);
-		g_free (bgen);
-		strcpy (bbuf, "=-");
-		p = bbuf + 2;
-		state = save = 0;
-		p += base64_encode_step (digest, 16, FALSE, p, &state, &save);
-		*p = '\0';
-
-		boundary = bbuf;
-	}
-
-	header_content_type_set_param (cdw->mime_type, "boundary", boundary);
-}
-
-/**
- * camel_multipart_set_boundary:
- * @multipart: a CamelMultipart
- * @boundary: the message boundary, or %NULL
- *
- * Sets the message boundary for @multipart to @boundary. This should
- * be a string which does not occur anywhere in any of @multipart's
- * subparts. If @boundary is %NULL, a randomly-generated boundary will
- * be used.
- **/
-void
-camel_multipart_set_boundary (CamelMultipart *multipart, gchar *boundary)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-
-	CMP_CLASS (multipart)->set_boundary (multipart, boundary);
-}
-
-
-static const gchar *
-get_boundary (CamelMultipart *multipart)
-{
-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);
-
-	g_return_val_if_fail (cdw->mime_type != NULL, NULL);
-	return header_content_type_param (cdw->mime_type, "boundary");
-}
-
-/**
- * camel_multipart_get_boundary:
- * @multipart: a CamelMultipart
- *
- * Return value: @multipart's message boundary
- **/
-const gchar *
-camel_multipart_get_boundary (CamelMultipart *multipart)
-{
-	return CMP_CLASS (multipart)->get_boundary (multipart);
-}
-
-/* this is MIME specific, doesn't belong here really */
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
-	const gchar *boundary;
-	int total = 0;
-	int count;
-	GList *node;
-
-	/* get the bundary text */
-	boundary = camel_multipart_get_boundary (multipart);
-
-	/* we cannot write a multipart without a boundary string */
-	g_return_val_if_fail (boundary && *boundary, -1);
-
-	/*
-	 * write the preface text (usually something like
-	 *   "This is a mime message, if you see this, then
-	 *    your mail client probably doesn't support ...."
-	 */
-	if (multipart->preface) {
-		count = camel_stream_write_string (stream, multipart->preface);
-		if (count == -1)
-			return -1;
-		total += count;
-	}
-
-	/*
-	 * Now, write all the parts, separated by the boundary
-	 * delimiter
-	 */
-	node = multipart->parts;
-	while (node) {
-		count = camel_stream_printf (stream, "\n--%s\n", boundary);
-		if (count == -1)
-			return -1;
-		total += count;
-
-		count = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (node->data), stream);
-		if (count == -1)
-			return -1;
-		total += count;
-		node = node->next;
-	}
-
-	/* write the terminating boudary delimiter */
-	count = camel_stream_printf (stream, "\n--%s--\n", boundary);
-	if (count == -1)
-		return -1;
-	total += count;
-
-	/* and finally the postface */
-	if (multipart->postface) {
-		count = camel_stream_write_string (stream, multipart->postface);
-		if (count == -1)
-			return -1;
-		total += count;
-	}
-
-	return total;
-}
-
-/**
- * camel_multipart_set_preface:
- * @multipart: 
- * @preface: 
- * 
- * Set the preface text for this multipart.  Will be written out infront
- * of the multipart.  This text should only include US-ASCII strings, and
- * be relatively short, and will be ignored by any MIME mail client.
- **/
-void
-camel_multipart_set_preface(CamelMultipart *multipart, const char *preface)
-{
-	if (multipart->preface != preface) {
-		g_free(multipart->preface);
-		if (preface)
-			multipart->preface = g_strdup(preface);
-		else
-			multipart->preface = NULL;
-	}
-}
-
-/**
- * camel_multipart_set_postface:
- * @multipart: 
- * @postface: 
- * 
- * Set the postfix text for this multipart.  Will be written out after
- * the last boundary of the multipart, and ignored by any MIME mail
- * client.
- *
- * Generally postface texts should not be sent with multipart messages.
- **/
-void
-camel_multipart_set_postface(CamelMultipart *multipart, const char *postface)
-{
-	if (multipart->postface != postface) {
-		g_free(multipart->postface);
-		if (postface)
-			multipart->postface = g_strdup(postface);
-		else
-			multipart->postface = NULL;
-	}
-}
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
deleted file mode 100644
index 3058b8f2e0..0000000000
--- a/camel/camel-multipart.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-multipart.h : class for a multipart */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MULTIPART_H
-#define CAMEL_MULTIPART_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-
-#define CAMEL_MULTIPART_TYPE     (camel_multipart_get_type ())
-#define CAMEL_MULTIPART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))
-#define CAMEL_MULTIPART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))
-#define CAMEL_IS_MULTIPART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))
-
-
-struct _CamelMultipart
-{
-	CamelDataWrapper parent_object;
-
-	CamelMimePart *parent;
-	GList *parts;
-	gchar *boundary;
-	gchar *preface;
-	gchar *postface;
-
-};
-
-
-
-typedef struct {
-	CamelDataWrapperClass parent_class;
-
-	/* Virtual methods */
-	void (*add_part) (CamelMultipart *multipart, CamelMimePart *part);
-	void (*add_part_at) (CamelMultipart *multipart, CamelMimePart *part, guint index);
-	void (*remove_part) (CamelMultipart *multipart, CamelMimePart *part);
-	CamelMimePart * (*remove_part_at) (CamelMultipart *multipart, guint index);
-	CamelMimePart * (*get_part) (CamelMultipart *multipart, guint index);
-	guint (*get_number) (CamelMultipart *multipart);
-	void (*set_boundary) (CamelMultipart *multipart, gchar *boundary);
-	const gchar * (*get_boundary) (CamelMultipart *multipart);
-
-} CamelMultipartClass;
-
-
-/* Standard Camel function */
-CamelType camel_multipart_get_type (void);
-
-
-/* public methods */
-CamelMultipart *    camel_multipart_new            (void);
-void                camel_multipart_add_part       (CamelMultipart *multipart,
-						    CamelMimePart *part);
-void                camel_multipart_add_part_at    (CamelMultipart *multipart,
-						    CamelMimePart *part,
-						    guint index);
-void                camel_multipart_remove_part    (CamelMultipart *multipart,
-						    CamelMimePart *part);
-CamelMimePart *     camel_multipart_remove_part_at (CamelMultipart *multipart,
-						    guint index);
-CamelMimePart *     camel_multipart_get_part       (CamelMultipart *multipart,
-						    guint index);
-guint               camel_multipart_get_number     (CamelMultipart *multipart);
-void                camel_multipart_set_boundary   (CamelMultipart *multipart,
-						    gchar *boundary);
-const gchar *       camel_multipart_get_boundary   (CamelMultipart *multipart);
-
-void		    camel_multipart_set_preface	   (CamelMultipart *multipart, const char *preface);
-void		    camel_multipart_set_postface   (CamelMultipart *multipart, const char *postface);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MULTIPART_H */
-
diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c
deleted file mode 100644
index ebd35b80c7..0000000000
--- a/camel/camel-news-address.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-news-address.h"
-
-
-static void camel_news_address_class_init (CamelNewsAddressClass *klass);
-
-static CamelAddressClass *camel_news_address_parent;
-
-static void
-camel_news_address_class_init (CamelNewsAddressClass *klass)
-{
-	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));
-}
-
-
-CamelType
-camel_news_address_get_type (void)
-{
-	static guint type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_address_get_type (), "CamelNewsAddress",
-					    sizeof (CamelNewsAddress),
-					    sizeof (CamelNewsAddressClass),
-					    (CamelObjectClassInitFunc) camel_news_address_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/**
- * camel_news_address_new:
- *
- * Create a new CamelNewsAddress object.
- * 
- * Return value: A new CamelNewsAddress widget.
- **/
-CamelNewsAddress *
-camel_news_address_new (void)
-{
-	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( camel_object_new (camel_news_address_get_type ()));
-	return new;
-}
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
deleted file mode 100644
index b1c7856675..0000000000
--- a/camel/camel-news-address.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: 
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_NEWS_ADDRESS_H
-#define _CAMEL_NEWS_ADDRESS_H
-
-#include <camel/camel-address.h>
-
-#define CAMEL_NEWS_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)
-#define CAMEL_NEWS_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass)
-#define CAMEL_IS_NEWS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_news_address_get_type ())
-
-typedef struct _CamelNewsAddressClass CamelNewsAddressClass;
-
-struct _CamelNewsAddress {
-	CamelAddress parent;
-
-	struct _CamelNewsAddressPrivate *priv;
-};
-
-struct _CamelNewsAddressClass {
-	CamelAddressClass parent_class;
-};
-
-guint		camel_news_address_get_type	(void);
-CamelNewsAddress      *camel_news_address_new	(void);
-
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
diff --git a/camel/camel-object.c b/camel/camel-object.c
deleted file mode 100644
index 75c14b8978..0000000000
--- a/camel/camel-object.c
+++ /dev/null
@@ -1,973 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-object.c: Base class for Camel */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-object.h"
-
-/* I just mashed the keyboard for these... */
-#define CAMEL_OBJECT_MAGIC_VALUE           0x77A344EF
-#define CAMEL_OBJECT_CLASS_MAGIC_VALUE     0xEE26A990
-#define CAMEL_OBJECT_FINALIZED_VALUE       0x84AC3656
-#define CAMEL_OBJECT_CLASS_FINALIZED_VALUE 0x7621ABCD
-
-#define DEFAULT_PREALLOCS 8
-
-#define BAST_CASTARD 1		/* Define to return NULL when casts fail */
-
-#define NULL_PREP_VALUE ((gpointer)make_global_classfuncs)	/* See camel_object_class_declare_event */
-
-/* ** Quickie type system ************************************************* */
-
-typedef struct _CamelTypeInfo
-{
-	CamelType self;
-	CamelType parent;
-	const gchar *name;
-
-	size_t instance_size;
-	GMemChunk *instance_chunk;
-	CamelObjectInitFunc instance_init;
-	CamelObjectFinalizeFunc instance_finalize;
-	GList *free_instances;
-
-	size_t classfuncs_size;
-	CamelObjectClassInitFunc class_init;
-	CamelObjectClassFinalizeFunc class_finalize;
-	CamelObjectClass *global_classfuncs;
-}
-CamelTypeInfo;
-
-typedef struct _CamelHookPair
-{
-	CamelObjectEventHookFunc func;
-	gpointer user_data;
-}
-CamelHookPair;
-
-/* ************************************************************************ */
-
-static void camel_type_lock_up (void);
-static void camel_type_lock_down (void);
-
-static void obj_init (CamelObject * obj);
-static void obj_finalize (CamelObject * obj);
-static void obj_class_init (CamelObjectClass * class);
-static void obj_class_finalize (CamelObjectClass * class);
-
-static gboolean shared_is_of_type (CamelObjectShared * sh, CamelType ctype,
-				   gboolean is_obj);
-static void make_global_classfuncs (CamelTypeInfo * type_info);
-
-/* ************************************************************************ */
-
-G_LOCK_DEFINE_STATIC (type_system);
-G_LOCK_DEFINE_STATIC (type_system_level);
-static GPrivate *type_system_locklevel = NULL;
-
-G_LOCK_DEFINE_STATIC (refcount);
-
-static gboolean type_system_initialized = FALSE;
-static GHashTable *ctype_to_typeinfo = NULL;
-static const CamelType camel_object_type = 1;
-static CamelType cur_max_type = CAMEL_INVALID_TYPE;
-
-/* ************************************************************************ */
-
-#define LOCK_VAL (GPOINTER_TO_INT (g_private_get (type_system_locklevel)))
-#define LOCK_SET( val ) g_private_set (type_system_locklevel, GINT_TO_POINTER (val))
-
-static void
-camel_type_lock_up (void)
-{
-	G_LOCK (type_system_level);
-
-	if (type_system_locklevel == NULL)
-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));
-
-	if (LOCK_VAL == 0) {
-		G_UNLOCK (type_system_level);
-		G_LOCK (type_system);
-		G_LOCK (type_system_level);
-	}
-
-	LOCK_SET (LOCK_VAL + 1);
-
-	G_UNLOCK (type_system_level);
-}
-
-static void
-camel_type_lock_down (void)
-{
-	G_LOCK (type_system_level);
-
-	if (type_system_locklevel == NULL) {
-		g_warning
-			("camel_type_lock_down: lock down before a lock up?");
-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));
-		G_UNLOCK (type_system_level);
-		return;
-	}
-
-	LOCK_SET (LOCK_VAL - 1);
-
-	if (LOCK_VAL == 0)
-		G_UNLOCK (type_system);
-
-	G_UNLOCK (type_system_level);
-}
-
-void
-camel_type_init (void)
-{
-	CamelTypeInfo *obj_info;
-
-	camel_type_lock_up ();
-
-	if (type_system_initialized) {
-		g_warning
-			("camel_type_init: type system already initialized.");
-		camel_type_lock_down ();
-		return;
-	}
-
-	type_system_initialized = TRUE;
-	ctype_to_typeinfo = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-	obj_info = g_new (CamelTypeInfo, 1);
-	obj_info->self = camel_object_type;
-	obj_info->parent = CAMEL_INVALID_TYPE;
-	obj_info->name = "CamelObject";
-
-	obj_info->instance_size = sizeof (CamelObject);
-	obj_info->instance_chunk =
-		g_mem_chunk_create (CamelObject, DEFAULT_PREALLOCS,
-				    G_ALLOC_ONLY);
-	obj_info->instance_init = obj_init;
-	obj_info->instance_finalize = obj_finalize;
-	obj_info->free_instances = NULL;
-
-	obj_info->classfuncs_size = sizeof (CamelObjectClass);
-	obj_info->class_init = obj_class_init;
-	obj_info->class_finalize = obj_class_finalize;
-
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (CAMEL_INVALID_TYPE), NULL);
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (camel_object_type), obj_info);
-
-	/* Sigh. Ugly */
-	make_global_classfuncs (obj_info);
-
-	cur_max_type = camel_object_type;
-
-	camel_type_lock_down ();
-}
-
-CamelType
-camel_type_register (CamelType parent, const gchar * name,
-		     size_t instance_size, size_t classfuncs_size,
-		     CamelObjectClassInitFunc class_init,
-		     CamelObjectClassFinalizeFunc class_finalize,
-		     CamelObjectInitFunc instance_init,
-		     CamelObjectFinalizeFunc instance_finalize)
-{
-	CamelTypeInfo *parent_info;
-	CamelTypeInfo *obj_info;
-	gchar *chunkname;
-
-	g_return_val_if_fail (parent != CAMEL_INVALID_TYPE,
-			      CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (name, CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (instance_size, CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (classfuncs_size, CAMEL_INVALID_TYPE);
-
-	camel_type_lock_up ();
-
-	if (type_system_initialized == FALSE) {
-		G_UNLOCK (type_system);
-		camel_type_init ();
-		G_LOCK (type_system);
-	}
-
-	parent_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (parent));
-
-	if (parent_info == NULL) {
-		g_warning
-			("camel_type_register: no such parent type %d of class `%s'",
-			 parent, name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	if (parent_info->instance_size > instance_size) {
-		g_warning
-			("camel_type_register: instance of class `%s' would be smaller than parent `%s'",
-			 name, parent_info->name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	if (parent_info->classfuncs_size > classfuncs_size) {
-		g_warning
-			("camel_type_register: classfuncs of class `%s' would be smaller than parent `%s'",
-			 name, parent_info->name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	cur_max_type++;
-
-	obj_info = g_new (CamelTypeInfo, 1);
-	obj_info->self = cur_max_type;
-	obj_info->parent = parent;
-	obj_info->name = name;
-
-	obj_info->instance_size = instance_size;
-	chunkname =
-		g_strdup_printf ("chunk for instances of Camel type `%s'",
-				 name);
-	obj_info->instance_chunk =
-		g_mem_chunk_new (chunkname, instance_size,
-				 instance_size * DEFAULT_PREALLOCS,
-				 G_ALLOC_ONLY);
-	g_free (chunkname);
-	obj_info->instance_init = instance_init;
-	obj_info->instance_finalize = instance_finalize;
-	obj_info->free_instances = NULL;
-
-	obj_info->classfuncs_size = classfuncs_size;
-	obj_info->class_init = class_init;
-	obj_info->class_finalize = class_finalize;
-
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (obj_info->self), obj_info);
-
-	/* Sigh. Ugly. */
-	make_global_classfuncs (obj_info);
-
-	camel_type_lock_down ();
-	return obj_info->self;
-}
-
-CamelObjectClass *
-camel_type_get_global_classfuncs (CamelType type)
-{
-	CamelTypeInfo *type_info;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);
-
-	camel_type_lock_up ();
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-	camel_type_lock_down ();
-
-	g_return_val_if_fail (type_info != NULL, NULL);
-
-	return type_info->global_classfuncs;
-}
-
-const gchar *
-camel_type_to_name (CamelType type)
-{
-	CamelTypeInfo *type_info;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE,
-			      "(the invalid type)");
-
-	camel_type_lock_up ();
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-	camel_type_lock_down ();
-
-	g_return_val_if_fail (type_info != NULL,
-			      "(a bad type parameter was specified)");
-
-	return type_info->name;
-}
-
-/* ** The CamelObject ***************************************************** */
-
-static void
-obj_init (CamelObject * obj)
-{
-	obj->s.magic = CAMEL_OBJECT_MAGIC_VALUE;
-	obj->ref_count = 1;
-	obj->event_to_hooklist = NULL;
-	obj->in_event = 0;
-}
-
-static void
-obj_finalize (CamelObject * obj)
-{
-	g_return_if_fail (obj->s.magic == CAMEL_OBJECT_MAGIC_VALUE);
-	g_return_if_fail (obj->ref_count == 0);
-	g_return_if_fail (obj->in_event == 0);
-
-	obj->s.magic = CAMEL_OBJECT_FINALIZED_VALUE;
-
-	if (obj->event_to_hooklist) {
-		g_hash_table_foreach (obj->event_to_hooklist, (GHFunc) g_free,
-				      NULL);
-		g_hash_table_destroy (obj->event_to_hooklist);
-		obj->event_to_hooklist = NULL;
-	}
-}
-
-static void
-obj_class_init (CamelObjectClass * class)
-{
-	class->s.magic = CAMEL_OBJECT_CLASS_MAGIC_VALUE;
-
-	camel_object_class_declare_event (class, "finalize", NULL);
-}
-
-static void
-obj_class_finalize (CamelObjectClass * class)
-{
-	g_return_if_fail (class->s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE);
-
-	class->s.magic = CAMEL_OBJECT_CLASS_FINALIZED_VALUE;
-
-	if (class->event_to_preplist) {
-		g_hash_table_foreach (class->event_to_preplist,
-				      (GHFunc) g_free, NULL);
-		g_hash_table_destroy (class->event_to_preplist);
-		class->event_to_preplist = NULL;
-	}
-}
-
-CamelType
-camel_object_get_type (void)
-{
-	if (type_system_initialized == FALSE)
-		camel_type_init ();
-
-	return camel_object_type;
-}
-
-CamelObject *
-camel_object_new (CamelType type)
-{
-	CamelTypeInfo *type_info;
-	GSList *parents = NULL;
-	GSList *head = NULL;
-	CamelObject *instance;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);
-
-	/* Look up the type */
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-
-	if (type_info == NULL) {
-		g_warning
-			("camel_object_new: trying to create object of invalid type %d",
-			 type);
-		camel_type_lock_down ();
-		return NULL;
-	}
-
-	/* Grab an instance out of the freed ones if possible, alloc otherwise */
-
-	if (type_info->free_instances) {
-		GList *first;
-
-		first = g_list_first (type_info->free_instances);
-		instance = first->data;
-		type_info->free_instances =
-			g_list_remove_link (type_info->free_instances, first);
-		g_list_free_1 (first);
-	} else {
-		instance = g_mem_chunk_alloc0 (type_info->instance_chunk);
-	}
-
-	/* Init the instance and classfuncs a bit */
-
-	instance->s.type = type;
-	instance->classfuncs = type_info->global_classfuncs;
-
-	/* Loop through the parents in simplest -> most complex order, initing the class and instance.
-
-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL
-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?
-	 */
-
-	while (type_info) {
-		parents = g_slist_prepend (parents, type_info);
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->instance_init)
-			(thisinfo->instance_init) (instance);
-	}
-
-	g_slist_free (head);
-
-	camel_type_lock_down ();
-	return instance;
-}
-
-void
-camel_object_ref (CamelObject * obj)
-{
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-
-	G_LOCK (refcount);
-	obj->ref_count++;
-	G_UNLOCK (refcount);
-}
-
-void
-camel_object_unref (CamelObject * obj)
-{
-	CamelTypeInfo *type_info;
-	CamelTypeInfo *iter;
-	GSList *parents = NULL;
-	GSList *head = NULL;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-
-	G_LOCK (refcount);
-	obj->ref_count--;
-
-	if (obj->ref_count > 0) {
-		G_UNLOCK (refcount);
-		return;
-	}
-
-	G_UNLOCK (refcount);
-
-	/* Oh no! We want to emit a "finalized" event, but that function refs the object
-	 * because it's not supposed to get finalized in an event, but it is being finalized
-	 * right now, and AAUGH AAUGH AUGH AUGH!
-	 *
-	 * So we don't call camel_object_trigger_event. We do it ourselves. We even know
-	 * that CamelObject doesn't provide a prep for the finalized event, so we plunge
-	 * right in and call our hooks.
-	 *
-	 * And there was much rejoicing.
-	 */
-
-#define hooklist parents	/*cough */
-
-	if (obj->event_to_hooklist) {
-		CamelHookPair *pair;
-
-		hooklist =
-			g_hash_table_lookup (obj->event_to_hooklist,
-					     "finalize");
-
-		while (hooklist && hooklist->data) {
-			pair = hooklist->data;
-			(pair->func) (obj, NULL, pair->user_data);
-			hooklist = hooklist->next;
-		}
-	}
-
-	hooklist = NULL;	/* Don't mess with this line */
-
-#undef hooklist
-
-	/* Destroy it! hahaha! */
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (obj->s.type));
-
-	if (type_info == NULL) {
-		g_warning
-			("camel_object_unref: seemingly valid object has a bad type %d",
-			 obj->s.type);
-		camel_type_lock_down ();
-		return;
-	}
-
-	/* Loop through the parents in most complex -> simplest order, finalizing the class 
-	 * and instance.
-	 *
-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL
-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?
-	 *
-	 * Use iter to preserve type_info for free_{instance,classfunc}s
-	 */
-
-	iter = type_info;
-
-	while (iter) {
-		parents = g_slist_prepend (parents, iter);
-		iter =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (iter->parent));
-	}
-
-	parents = g_slist_reverse (parents);
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->instance_finalize)
-			(thisinfo->instance_finalize) (obj);
-	}
-
-	g_slist_free (head);
-
-	/* A little bit of cleaning up.
-
-	 * Don't erase the type, so we can peek at it if a finalized object
-	 * is check_cast'ed somewhere.
-	 */
-
-	memset (obj, 0, type_info->instance_size);
-	obj->s.type = type_info->self;
-	obj->s.magic = CAMEL_OBJECT_FINALIZED_VALUE;
-
-	/* Tuck away the pointer for use in a new object */
-
-	type_info->free_instances =
-		g_list_prepend (type_info->free_instances, obj);
-
-	camel_type_lock_down ();
-}
-
-gboolean
-camel_object_is_of_type (CamelObject * obj, CamelType ctype)
-{
-	return shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE);
-}
-
-gboolean
-camel_object_class_is_of_type (CamelObjectClass * class, CamelType ctype)
-{
-	return shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE);
-}
-
-#ifdef BAST_CASTARD
-#define ERRVAL NULL
-#else
-#define ERRVAL obj
-#endif
-
-CamelObject *
-camel_object_check_cast (CamelObject * obj, CamelType ctype)
-{
-	if (shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE))
-		return obj;
-	return ERRVAL;
-}
-
-CamelObjectClass *
-camel_object_class_check_cast (CamelObjectClass * class, CamelType ctype)
-{
-	if (shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE))
-		return class;
-	return ERRVAL;
-}
-
-#undef ERRVAL
-
-gchar *
-camel_object_describe (CamelObject * obj)
-{
-	if (obj == NULL)
-		return g_strdup ("a NULL pointer");
-
-	if (obj->s.magic == CAMEL_OBJECT_MAGIC_VALUE) {
-		return g_strdup_printf ("an instance of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_FINALIZED_VALUE) {
-		return g_strdup_printf ("a finalized instance of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-		return g_strdup_printf ("the classfuncs of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {
-		return
-			g_strdup_printf
-			("the finalized classfuncs of `%s' at %p",
-			 camel_type_to_name (obj->s.type), obj);
-	}
-
-	return g_strdup ("not a CamelObject");
-}
-
-/* This is likely to be called in the class_init callback,
- * and the type will likely be somewhat uninitialized. 
- * Is this a problem? We'll see....
- */
-void
-camel_object_class_declare_event (CamelObjectClass * class,
-				  const gchar * name,
-				  CamelObjectEventPrepFunc prep)
-{
-	g_return_if_fail (CAMEL_IS_OBJECT_CLASS (class));
-	g_return_if_fail (name);
-
-	if (class->event_to_preplist == NULL)
-		class->event_to_preplist =
-			g_hash_table_new (g_str_hash, g_str_equal);
-	else if (g_hash_table_lookup (class->event_to_preplist, name) != NULL) {
-		g_warning
-			("camel_object_class_declare_event: event `%s' already declared for `%s'",
-			 name, camel_type_to_name (class->s.type));
-		return;
-	}
-
-	/* AIEEEEEEEEEEEEEEEEEEEEEE
-
-	 * I feel so naughty. Since it's valid to declare an event and not
-	 * provide a hook, it should be valid to insert a NULL value into
-	 * the table. However, then our lookup in trigger_event would be
-	 * ambiguous, not telling us whether the event is undefined or whether
-	 * it merely has no hook.
-	 *
-	 * So we create an 'NULL prep' value that != NULL... specifically, it
-	 * equals the address of one of our static functions , because that
-	 * can't possibly be your hook.
-	 *
-	 * Just don't forget to check for the 'evil value' and it'll work,
-	 * I promise.
-	 */
-
-	if (prep == NULL)
-		prep = NULL_PREP_VALUE;
-
-	g_hash_table_insert (class->event_to_preplist, g_strdup (name), prep);
-}
-
-void
-camel_object_hook_event (CamelObject * obj, const gchar * name,
-			 CamelObjectEventHookFunc hook, gpointer user_data)
-{
-	GSList *hooklist;
-	CamelHookPair *pair;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-	g_return_if_fail (hook);
-
-	if (obj->event_to_hooklist == NULL)
-		obj->event_to_hooklist =
-			g_hash_table_new (g_str_hash, g_str_equal);
-
-	pair = g_new (CamelHookPair, 1);
-	pair->func = hook;
-	pair->user_data = user_data;
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-	hooklist = g_slist_prepend (hooklist, pair);
-	g_hash_table_insert (obj->event_to_hooklist, g_strdup (name),
-			     hooklist);
-}
-
-void
-camel_object_unhook_event (CamelObject * obj, const gchar * name,
-			   CamelObjectEventHookFunc hook, gpointer user_data)
-{
-	GSList *hooklist;
-	GSList *head;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-	g_return_if_fail (hook);
-
-	if (obj->event_to_hooklist == NULL) {
-		g_warning
-			("camel_object_unhook_event: trying to unhook `%s' from an instance "
-			 "of `%s' with no hooks attached", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-
-	if (hooklist == NULL) {
-		g_warning
-			("camel_object_unhook_event: trying to unhook `%s' from an instance "
-			 "of `%s' with no hooks attached to that event.",
-			 name, camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	head = hooklist;
-
-	while (hooklist) {
-		CamelHookPair *pair = (CamelHookPair *) hooklist->data;
-
-		if (pair->func == hook && pair->user_data == user_data) {
-			g_free (hooklist->data);
-			head = g_slist_remove_link (head, hooklist);
-			g_slist_free_1 (hooklist);
-			g_hash_table_insert (obj->event_to_hooklist, (char *) name,
-					     head);
-			return;
-		}
-
-		hooklist = hooklist->next;
-	}
-
-	g_warning
-		("camel_object_unhook_event: cannot find hook/data pair %p/%p in an "
-		 "instance of `%s' attached to `%s'", hook, user_data,
-		 camel_type_to_name (obj->s.type), name);
-}
-
-void
-camel_object_trigger_event (CamelObject * obj, const gchar * name,
-			    gpointer event_data)
-{
-	GSList *hooklist;
-	CamelHookPair *pair;
-	CamelObjectEventPrepFunc prep;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-
-	if (obj->in_event) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger `%s' in class "
-			 "`%s' while already triggering another event", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	if (obj->classfuncs->event_to_preplist == NULL) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger `%s' in class "
-			 "`%s' with no defined events.", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	prep = g_hash_table_lookup (obj->classfuncs->event_to_preplist, name);
-
-	if (prep == NULL) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger undefined "
-			 "event `%s' in class `%s'.", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	/* Ref so that it can't get destroyed in the event, which would
-	 * be Bad. And it's a valid ref anyway...
-	 */
-
-	camel_object_ref (obj);
-	obj->in_event = 1;
-
-	if ((prep != NULL_PREP_VALUE && !prep (obj, event_data))
-	    || obj->event_to_hooklist == NULL) {
-		obj->in_event = 0;
-		camel_object_unref (obj);
-		return;
-	}
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-
-	while (hooklist && hooklist->data) {
-		pair = hooklist->data;
-		(pair->func) (obj, event_data, pair->user_data);
-		hooklist = hooklist->next;
-	}
-
-	obj->in_event = 0;
-	camel_object_unref (obj);
-}
-
-/* ** Static helpers ****************************************************** */
-
-static gboolean
-shared_is_of_type (CamelObjectShared * sh, CamelType ctype, gboolean is_obj)
-{
-	CamelTypeInfo *type_info;
-	gchar *targtype;
-
-	if (is_obj)
-		targtype = "instance";
-	else
-		targtype = "classdata";
-
-	if (ctype == CAMEL_INVALID_TYPE) {
-		g_warning
-			("shared_is_of_type: trying to cast to CAMEL_INVALID_TYPE");
-		return FALSE;
-	}
-
-	if (sh == NULL) {
-		g_warning
-			("shared_is_of_type: trying to cast NULL to %s of `%s'",
-			 targtype, camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (sh->magic == CAMEL_OBJECT_FINALIZED_VALUE) {
-		g_warning
-			("shared_is_of_type: trying to cast finalized instance "
-			 "of `%s' into %s of `%s'",
-			 camel_type_to_name (sh->type), targtype,
-			 camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (sh->magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {
-		g_warning
-			("shared_is_of_type: trying to cast finalized classdata "
-			 "of `%s' into %s of `%s'",
-			 camel_type_to_name (sh->type), targtype,
-			 camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (is_obj) {
-		if (sh->magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast classdata "
-				 "of `%s' into instance of `%s'",
-				 camel_type_to_name (sh->type),
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-
-		if (sh->magic != CAMEL_OBJECT_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast junk data "
-				 "into instance of `%s'",
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-	} else {
-		if (sh->magic == CAMEL_OBJECT_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast instance "
-				 "of `%s' into classdata of `%s'",
-				 camel_type_to_name (sh->type),
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-
-		if (sh->magic != CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast junk data "
-				 "into classdata of `%s'",
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-	}
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (sh->type));
-
-	if (type_info == NULL) {
-		g_warning ("shared_is_of_type: seemingly valid %s has "
-			   "bad type %d.", targtype, sh->type);
-		camel_type_lock_down ();
-		return FALSE;
-	}
-
-	while (type_info) {
-		if (type_info->self == ctype) {
-			camel_type_lock_down ();
-			return TRUE;
-		}
-
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	/* this isn't an error, e.g. CAMEL_IS_FOLDER(folder), its upto  the
-	   caller to handle the false case */
-	/*g_warning
-		("shared_is_of_type: %s of `%s' (@%p) is not also %s of `%s'",
-		 targtype, camel_type_to_name (sh->type), sh, targtype,
-		 camel_type_to_name (ctype));*/
-
-	camel_type_lock_down ();
-	return FALSE;
-}
-
-static void
-make_global_classfuncs (CamelTypeInfo * type_info)
-{
-	CamelObjectClass *funcs;
-	GSList *parents;
-	GSList *head;
-
-	g_assert (type_info);
-
-	funcs = g_malloc0 (type_info->classfuncs_size);
-	funcs->s.type = type_info->self;
-
-	type_info->global_classfuncs = funcs;
-
-	parents = NULL;
-	while (type_info) {
-		parents = g_slist_prepend (parents, type_info);
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->class_init)
-			(thisinfo->class_init) (funcs);
-	}
-
-	g_slist_free (head);
-}
diff --git a/camel/camel-object.h b/camel/camel-object.h
deleted file mode 100644
index 1d27807d24..0000000000
--- a/camel/camel-object.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-object.h: Base class for Camel */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_OBJECT_H
-#define CAMEL_OBJECT_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-
-#include <stdlib.h>		/* size_t */
-#include <camel/camel-types.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#ifdef G_DISABLE_CHECKS
-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) obj)
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) class)
-#define CAMEL_CHECK_TYPE( obj, ctype )                (TRUE)
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (TRUE)
-#else
-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) camel_object_check_cast( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(class), (CamelType)(ctype) ))
-#define CAMEL_CHECK_TYPE( obj, ctype )                (camel_object_is_of_type( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(class), (CamelType)(ctype) ))
-#endif
-
-#define CAMEL_INVALID_TYPE ((CamelType)0)
-
-#define CAMEL_OBJECT_TYPE        (camel_object_get_type ())
-
-#define CAMEL_OBJECT(obj)        (CAMEL_CHECK_CAST((obj), CAMEL_OBJECT_TYPE, CamelObject))
-#define CAMEL_OBJECT_CLASS(k)    (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_OBJECT_TYPE, CamelObjectClass))
-#define CAMEL_IS_OBJECT(o)       (CAMEL_CHECK_TYPE((o), CAMEL_OBJECT_TYPE))
-#define CAMEL_IS_OBJECT_CLASS(k) (CAMEL_CHECK_CLASS_TYPE((k), CAMEL_OBJECT_TYPE))
-
-#define CAMEL_OBJECT_GET_CLASS(o) ((CamelObjectClass *)(CAMEL_OBJECT(o))->classfuncs)
-#define CAMEL_OBJECT_GET_TYPE(o)  ((CamelType)(CAMEL_OBJECT(o))->s.type)
-
-typedef guint32 CamelType;
-
-typedef struct _CamelObjectShared
-{
-	guint32 magic;
-	CamelType type;
-}
-CamelObjectShared;
-
-typedef struct _CamelObjectClass
-{
-	CamelObjectShared s;
-	
-	GHashTable *event_to_preplist;
-}
-CamelObjectClass;
-
-typedef struct _CamelObject
-{
-	CamelObjectShared s;
-	guint32 ref_count:31;
-	guint32 in_event:1;
-	CamelObjectClass *classfuncs;
-	GHashTable *event_to_hooklist;
-}
-CamelObject;
-
-typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);
-typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);
-typedef void (*CamelObjectInitFunc) (CamelObject *);
-typedef void (*CamelObjectFinalizeFunc) (CamelObject *);
-
-typedef gboolean (*CamelObjectEventPrepFunc) (CamelObject *,
-					      gpointer);
-typedef void (*CamelObjectEventHookFunc) (CamelObject *, gpointer,
-					  gpointer);
-
-/* The type system .... it's pretty simple..... */
-
-void camel_type_init (void);
-CamelType camel_type_register (CamelType parent, const gchar * name,
-			       size_t instance_size,
-			       size_t classfuncs_size,
-			       CamelObjectClassInitFunc class_init,
-			       CamelObjectClassFinalizeFunc
-			       class_finalize,
-			       CamelObjectInitFunc instance_init,
-			       CamelObjectFinalizeFunc
-			       instance_finalize);
-CamelObjectClass *camel_type_get_global_classfuncs (CamelType type);
-const gchar *camel_type_to_name (CamelType type);
-
-CamelType camel_object_get_type (void);
-CamelObject *camel_object_new (CamelType type);
-void camel_object_ref (CamelObject * obj);
-void camel_object_unref (CamelObject * obj);
-CamelObject *camel_object_check_cast (CamelObject * obj,
-				      CamelType ctype);
-CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *
-						 class,
-						 CamelType ctype);
-gboolean camel_object_is_of_type (CamelObject * obj, CamelType ctype);
-gboolean camel_object_class_is_of_type (CamelObjectClass * class,
-					CamelType ctype);
-gchar *camel_object_describe (CamelObject * obj);
-void camel_object_class_declare_event (CamelObjectClass * class,
-				       const gchar * name,
-				       CamelObjectEventPrepFunc prep);
-void camel_object_hook_event (CamelObject * obj, const gchar * name,
-			      CamelObjectEventHookFunc hook,
-			      gpointer user_data);
-void camel_object_unhook_event (CamelObject * obj, const gchar * name,
-				CamelObjectEventHookFunc hook,
-				gpointer user_data);
-void camel_object_trigger_event (CamelObject * obj,
-				 const gchar * name,
-				 gpointer event_data);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif				/* CAMEL_OBJECT_H */
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
deleted file mode 100644
index 9d631fca7b..0000000000
--- a/camel/camel-operation.c
+++ /dev/null
@@ -1,540 +0,0 @@
-
-#include "config.h"
-
-#include <stdio.h>
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-#include <glib.h>
-#include "camel-operation.h"
-#include "e-util/e-msgport.h"
-
-#define d(x)
-
-/* ********************************************************************** */
-
-struct _CamelOperation {
-	pthread_t id;		/* id of running thread */
-	guint32 flags;		/* cancelled ? */
-	int blocked;		/* cancellation blocked depth */
-	int refcount;
-
-	CamelOperationStatusFunc status;
-	void *status_data;
-	time_t status_update;
-
-	/* stack of status messages (char *) */
-	GSList *status_stack;
-
-#ifdef ENABLE_THREADS
-	EMsgPort *cancel_port;
-	int cancel_fd;
-	pthread_mutex_t lock;
-#endif
-};
-
-#define CAMEL_OPERATION_CANCELLED (1<<0)
-
-#ifdef ENABLE_THREADS
-#define CAMEL_OPERATION_LOCK(cc) pthread_mutex_lock(&cc->lock)
-#define CAMEL_OPERATION_UNLOCK(cc) pthread_mutex_unlock(&cc->lock)
-#define CAMEL_ACTIVE_LOCK() pthread_mutex_lock(&operation_active_lock)
-#define CAMEL_ACTIVE_UNLOCK() pthread_mutex_unlock(&operation_active_lock)
-static pthread_mutex_t operation_active_lock = PTHREAD_MUTEX_INITIALIZER;
-#else
-#define CAMEL_OPERATION_LOCK(cc)
-#define CAMEL_OPERATION_UNLOCK(cc)
-#define CAMEL_ACTIVE_LOCK()
-#define CAMEL_ACTIVE_UNLOCK()
-#endif
-
-static GHashTable *operation_active;
-
-typedef struct _CamelOperationMsg {
-	EMsg msg;
-} CamelOperationMsg ;
-
-/**
- * camel_operation_new:
- * @status: Callback for receiving status messages.
- * @status_data: User data.
- * 
- * Create a new camel operation handle.  Camel operation handles can
- * be used in a multithreaded application (or a single operation
- * handle can be used in a non threaded appliation) to cancel running
- * operations and to obtain notification messages of the internal
- * status of messages.
- * 
- * Return value: A new operation handle.
- **/
-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data)
-{
-	CamelOperation *cc;
-
-	cc = g_malloc0(sizeof(*cc));
-
-	cc->flags = 0;
-	cc->blocked = 0;
-	cc->refcount = 1;
-	cc->status = status;
-	cc->status_data = status_data;
-#ifdef ENABLE_THREADS
-	cc->id = ~0;
-	cc->cancel_port = e_msgport_new();
-	cc->cancel_fd = e_msgport_fd(cc->cancel_port);
-	pthread_mutex_init(&cc->lock, NULL);
-#endif
-
-	return cc;
-}
-
-/**
- * camel_operation_reset:
- * @cc: 
- * 
- * Resets an operation cancel state and message.
- **/
-void camel_operation_reset(CamelOperation *cc)
-{
-	GSList *n;
-
-#ifdef ENABLE_THREADS
-	CamelOperationMsg *msg;
-
-	while ((msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port)))
-		g_free(msg);
-#endif
-
-	n = cc->status_stack;
-	while (n) {
-		g_free(n->data);
-		n = n->next;
-	}
-	g_slist_free(cc->status_stack);
-	cc->status_stack = NULL;
-
-	cc->flags = 0;
-	cc->blocked = 0;
-}
-
-/**
- * camel_operation_ref:
- * @cc: 
- * 
- * Add a reference to the CamelOperation @cc.
- **/
-void camel_operation_ref(CamelOperation *cc)
-{
-	CAMEL_OPERATION_LOCK(cc);
-	cc->refcount++;
-	CAMEL_OPERATION_UNLOCK(cc);
-}
-
-/**
- * camel_operation_unref:
- * @cc: 
- * 
- * Unref and potentially free @cc.
- **/
-void camel_operation_unref(CamelOperation *cc)
-{
-	GSList *n;
-#ifdef ENABLE_THREADS
-	CamelOperationMsg *msg;
-
-	if (cc->refcount == 1) {
-		while ((msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port)))
-			g_free(msg);
-
-		e_msgport_destroy(cc->cancel_port);
-#endif
-		n = cc->status_stack;
-		while (n) {
-			g_warning("Camel operation status stack non empty: %s", (char *)n->data);
-			g_free(n->data);
-			n = n->next;
-		}
-		g_slist_free(cc->status_stack);
-
-		g_free(cc);
-	} else {
-		CAMEL_OPERATION_LOCK(cc);
-		cc->refcount--;
-		CAMEL_OPERATION_UNLOCK(cc);
-	}
-}
-
-/**
- * camel_operation_cancel_block:
- * @cc: 
- * 
- * Block cancellation for this operation.  If @cc is NULL, then the
- * current thread is blocked.
- **/
-void camel_operation_cancel_block(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-	CAMEL_ACTIVE_UNLOCK();
-
-	if (cc) {
-		CAMEL_OPERATION_LOCK(cc);
-		cc->blocked++;
-		CAMEL_OPERATION_UNLOCK(cc);
-	}
-}
-
-/**
- * camel_operation_cancel_unblock:
- * @cc: 
- * 
- * Unblock cancellation, when the unblock count reaches the block
- * count, then this operation can be cancelled.  If @cc is NULL, then
- * the current thread is unblocked.
- **/
-void camel_operation_cancel_unblock(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL)
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-	CAMEL_ACTIVE_UNLOCK();
-
-	if (cc) {
-		CAMEL_OPERATION_LOCK(cc);
-		cc->blocked--;
-		CAMEL_OPERATION_UNLOCK(cc);
-	}
-}
-
-static void
-cancel_thread(void *key, CamelOperation *cc, void *data)
-{
-	if (cc)
-		camel_operation_cancel(cc);
-}
-
-/**
- * camel_operation_cancel:
- * @cc: 
- * 
- * Cancel a given operation.  If @cc is NULL then all outstanding
- * operations are cancelled.
- **/
-void camel_operation_cancel(CamelOperation *cc)
-{
-	CamelOperationMsg *msg;
-
-	if (cc == NULL) {
-		if (operation_active) {
-			CAMEL_ACTIVE_LOCK();
-			g_hash_table_foreach(operation_active, (GHFunc)cancel_thread, NULL);
-			CAMEL_ACTIVE_UNLOCK();
-		}
-	} else if ((cc->flags & CAMEL_OPERATION_CANCELLED) == 0) {
-		d(printf("cancelling thread %d\n", cc->id));
-
-		CAMEL_OPERATION_LOCK(cc);
-		msg = g_malloc0(sizeof(*msg));
-		e_msgport_put(cc->cancel_port, (EMsg *)msg);
-		cc->flags |= CAMEL_OPERATION_CANCELLED;
-		CAMEL_OPERATION_UNLOCK(cc);
-	}
-}
-
-/**
- * camel_operation_register:
- * @cc: 
- * 
- * Register a thread or the main thread for cancellation through @cc.
- * If @cc is NULL, then a new cancellation is created for this thread,
- * but may only be cancelled from the same thread.
- *
- * All calls to operation_register() should be matched with calls to
- * operation_unregister(), or resources will be lost.
- **/
-void camel_operation_register(CamelOperation *cc)
-{
-	pthread_t id = pthread_self();
-
-	CAMEL_ACTIVE_LOCK();
-
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL) {
-		cc = g_hash_table_lookup(operation_active, (void *)id);
-		if (cc == NULL) {
-			cc = camel_operation_new(NULL, NULL);
-		}
-	}
-
-	cc->id = id;
-	g_hash_table_insert(operation_active, (void *)id, cc);
-
-	d(printf("registering thread %ld for cancellation\n", id));
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	camel_operation_ref(cc);
-}
-
-/**
- * camel_operation_unregister:
- * @cc: 
- * 
- * Unregister a given operation from being cancelled.  If @cc is NULL,
- * then the current thread is used.
- **/
-void camel_operation_unregister(CamelOperation *cc)
-{
-	CAMEL_ACTIVE_LOCK();
-
-	if (operation_active == NULL)
-		operation_active = g_hash_table_new(NULL, NULL);
-
-	if (cc == NULL) {
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		if (cc == NULL) {
-			g_warning("Trying to unregister a thread that was never registered for cancellation");
-		}
-	}
-
-	if (cc)
-		g_hash_table_remove(operation_active, (void *)cc->id);
-
-	CAMEL_ACTIVE_UNLOCK();
-
-	d({if (cc) printf("unregistering thread %d for cancellation\n", cc->id);});
-
-	if (cc)
-		camel_operation_unref(cc);
-}
-
-/**
- * camel_operation_cancel_check:
- * @cc: 
- * 
- * Check if cancellation has been applied to @cc.  If @cc is NULL,
- * then the CamelOperation registered for the current thread is used.
- * 
- * Return value: TRUE if the operation has been cancelled.
- **/
-gboolean camel_operation_cancel_check(CamelOperation *cc)
-{
-	CamelOperationMsg *msg;
-
-	d(printf("checking for cancel in thread %d\n", pthread_self()));
-
-	if (cc == NULL) {
-		if (operation_active) {
-			CAMEL_ACTIVE_LOCK();
-			cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-			CAMEL_ACTIVE_UNLOCK();
-		}
-		if (cc == NULL)
-			return FALSE;
-	}
-
-	if (cc->blocked > 0) {
-		d(printf("ahah!  cancellation is blocked\n"));
-		return FALSE;
-	}
-
-	if (cc->flags & CAMEL_OPERATION_CANCELLED) {
-		d(printf("previously cancelled\n"));
-		return TRUE;
-	}
-
-	msg = (CamelOperationMsg *)e_msgport_get(cc->cancel_port);
-	if (msg) {
-		d(printf("Got cancellation message\n"));
-		CAMEL_OPERATION_LOCK(cc);
-		cc->flags |= CAMEL_OPERATION_CANCELLED;
-		CAMEL_OPERATION_UNLOCK(cc);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * camel_operation_cancel_fd:
- * @cc: 
- * 
- * Retrieve a file descriptor that can be waited on (select, or poll)
- * for read, to asynchronously detect cancellation.
- * 
- * Return value: The fd, or -1 if cancellation is not available
- * (blocked, or has not been registered for this thread).
- **/
-int camel_operation_cancel_fd(CamelOperation *cc)
-{
-	if (cc == NULL) {
-		if (operation_active) {
-			CAMEL_ACTIVE_LOCK();
-			cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-			CAMEL_ACTIVE_UNLOCK();
-		}
-		if (cc == NULL)
-			return -1;
-	}
-	if (cc->blocked)
-		return -1;
-
-	return cc->cancel_fd;
-}
-
-/**
- * camel_operation_start:
- * @cc: 
- * @what: 
- * @: 
- * 
- * Report the start of an operation.  All start operations should have
- * similar end operations.
- **/
-void camel_operation_start(CamelOperation *cc, char *what, ...)
-{
-	va_list ap;
-	char *msg;
-
-	if (operation_active == NULL)
-		return;
-
-	if (cc == NULL) {
-		CAMEL_ACTIVE_LOCK();
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		CAMEL_ACTIVE_UNLOCK();
-		if (cc == NULL)
-			return;
-	}
-
-	if (cc->status == NULL)
-		return;
-
-	va_start(ap, what);
-	msg = g_strdup_vprintf(what, ap);
-	va_end(ap);
-	cc->status(cc, msg, CAMEL_OPERATION_START, cc->status_data);
-	cc->status_update = 0;
-	cc->status_stack = g_slist_prepend(cc->status_stack, msg);
-	d(printf("start '%s'\n", msg, pc));
-}
-
-/**
- * camel_operation_progress:
- * @cc: Operation to report to.
- * @pc: Percent complete, 0 to 100.
- * 
- * Report progress on the current operation.  If @cc is NULL, then the
- * currently registered operation is used.  @pc reports the current
- * percentage of completion, which should be in the range of 0 to 100.
- *
- * If the total percentage is not know, then use
- * camel_operation_progress_count().
- **/
-void camel_operation_progress(CamelOperation *cc, int pc)
-{
-	char *msg;
-	time_t now;
-
-	if (operation_active == NULL)
-		return;
-
-	if (cc == NULL) {
-		CAMEL_ACTIVE_LOCK();
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		CAMEL_ACTIVE_UNLOCK();
-		if (cc == NULL)
-			return;
-	}
-
-	if (cc->status == NULL)
-		return;
-
-	if (cc->status_stack == NULL)
-		return;
-
-	now = time(0);
-	if (cc->status_update != now) {
-		msg =cc->status_stack->data;
-		cc->status(cc, msg, pc, cc->status_data);
-		d(printf("progress '%s' %d %%\n", msg, pc));
-		cc->status_update = now;
-	}
-}
-
-void camel_operation_progress_count(CamelOperation *cc, int sofar)
-{
-	char *msg;
-	time_t now;
-
-	if (operation_active == NULL)
-		return;
-
-	if (cc == NULL) {
-		CAMEL_ACTIVE_LOCK();
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		CAMEL_ACTIVE_UNLOCK();
-		if (cc == NULL)
-			return;
-	}
-
-	if (cc->status == NULL)
-		return;
-
-	if (cc->status_stack == NULL)
-		return;
-
-	/* FIXME: generate some meaningful pc value */
-	now = time(0);
-	if (cc->status_update != now) {
-		msg =cc->status_stack->data;
-		cc->status(cc, msg, sofar, cc->status_data);
-		d(printf("progress '%s' %d done\n", msg, sofar));
-		cc->status_update = now;
-	}
-}
-
-/**
- * camel_operation_end:
- * @cc: 
- * @what: Format string.
- * @: 
- * 
- * Report the end of an operation.  If @cc is NULL, then the currently
- * registered operation is notified.
- **/
-void camel_operation_end(CamelOperation *cc)
-{
-	char *msg;
-
-	if (operation_active == NULL)
-		return;
-
-	if (cc == NULL) {
-		CAMEL_ACTIVE_LOCK();
-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());
-		CAMEL_ACTIVE_UNLOCK();
-		if (cc == NULL)
-			return;
-	}
-
-	if (cc->status == NULL)
-		return;
-
-	if (cc->status_stack == NULL)
-		return;
-
-	msg = cc->status_stack->data;
-	cc->status(cc, msg, CAMEL_OPERATION_END, cc->status_data);
-	g_free(msg);
-	cc->status_stack = g_slist_remove_link(cc->status_stack, cc->status_stack);
-}
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
deleted file mode 100644
index 4a61b40dfc..0000000000
--- a/camel/camel-operation.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <NotZed@Ximian.com>
- *
- * Copyright 2001 Ximian, Inc. (http://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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_OPERATION_H
-#define CAMEL_OPERATION_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* cancellation helper stuff, not yet finalised */
-
-typedef struct _CamelOperation CamelOperation;
-
-typedef void (*CamelOperationStatusFunc)(struct _CamelOperation *op, const char *what, int pc, void *data);
-
-enum _camel_operation_status_t {
-	CAMEL_OPERATION_START = -1,
-	CAMEL_OPERATION_END = -2,
-};
-
-/* main thread functions */
-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data);
-void camel_operation_ref(CamelOperation *cc);
-void camel_operation_unref(CamelOperation *cc);
-void camel_operation_reset(CamelOperation *cc);
-void camel_operation_cancel(CamelOperation *cc);
-/* subthread functions */
-void camel_operation_register(CamelOperation *cc);
-void camel_operation_unregister(CamelOperation *cc);
-/* called internally by camel, for the current thread */
-void camel_operation_cancel_block(CamelOperation *cc);
-void camel_operation_cancel_unblock(CamelOperation *cc);
-int camel_operation_cancel_check(CamelOperation *cc);
-int camel_operation_cancel_fd(CamelOperation *cc);
-
-void camel_operation_start(CamelOperation *cc, char *what, ...);
-void camel_operation_progress(CamelOperation *cc, int pc);
-void camel_operation_progress_count(CamelOperation *cc, int sofar);
-void camel_operation_end(CamelOperation *cc);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_OPERATION_H */
diff --git a/camel/camel-private.h b/camel/camel-private.h
deleted file mode 100644
index 9be3a24209..0000000000
--- a/camel/camel-private.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *  camel-private.h: Private info for class implementers.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
-
-#include "config.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#include "e-util/e-msgport.h"
-#endif
-
-struct _CamelFolderPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-	GMutex *change_lock;
-#endif
-
-	/* must require the 'change_lock' to access this */
-	int frozen;
-	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelFolder *)f)->priv->l))
-#define CAMEL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelFolder *)f)->priv->l))
-#else
-#define CAMEL_FOLDER_LOCK(f, l)
-#define CAMEL_FOLDER_UNLOCK(f, l)
-#endif
-
-struct _CamelStorePrivate {
-#ifdef ENABLE_THREADS
-	GMutex *folder_lock;	/* for locking folder operations */
-	GMutex *cache_lock;	/* for locking access to the cache */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_STORE_LOCK(f, l) (g_mutex_lock(((CamelStore *)f)->priv->l))
-#define CAMEL_STORE_UNLOCK(f, l) (g_mutex_unlock(((CamelStore *)f)->priv->l))
-#else
-#define CAMEL_STORE_LOCK(f, l)
-#define CAMEL_STORE_UNLOCK(f, l)
-#endif
-
-struct _CamelServicePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *connect_lock;	/* for locking connection operations */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
-#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
-#else
-#define CAMEL_SERVICE_LOCK(f, l)
-#define CAMEL_SERVICE_UNLOCK(f, l)
-#endif
-
-struct _CamelSessionPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;		/* for locking everything basically */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)->priv->l))
-#define CAMEL_SESSION_UNLOCK(f, l) (g_mutex_unlock(((CamelSession *)f)->priv->l))
-#else
-#define CAMEL_SESSION_LOCK(f, l)
-#define CAMEL_SESSION_UNLOCK(f, l)
-#endif
-
-
-struct _CamelRemoteStorePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *stream_lock;	/* for locking stream operations */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_REMOTE_STORE_LOCK(f, l) (e_mutex_lock(((CamelRemoteStore *)f)->priv->l))
-#define CAMEL_REMOTE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelRemoteStore *)f)->priv->l))
-#else
-#define CAMEL_REMOTE_STORE_LOCK(f, l)
-#define CAMEL_REMOTE_STORE_UNLOCK(f, l)
-#endif
-
-/* most of this stuff really is private, but the lock can be used by subordinate classes */
-struct _CamelFolderSummaryPrivate {
-	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
-
-	CamelMimeFilterIndex *filter_index;
-	CamelMimeFilterBasic *filter_64;
-	CamelMimeFilterBasic *filter_qp;
-	CamelMimeFilterSave *filter_save;
-
-	struct ibex *index;
-
-#ifdef ENABLE_THREADS
-	GMutex *summary_lock;	/* for the summary hashtable/array */
-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)->priv->l))
-#define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)->priv->l))
-#else
-#define CAMEL_SUMMARY_LOCK(f, l)
-#define CAMEL_SUMMARY_UNLOCK(f, l)
-#endif
-
-struct _CamelVeeStorePrivate {
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_VEE_STORE_LOCK(f, l) (e_mutex_lock(((CamelVeeStore *)f)->priv->l))
-#define CAMEL_VEE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelVeeStore *)f)->priv->l))
-#else
-#define CAMEL_VEE_STORE_LOCK(f, l)
-#define CAMEL_VEE_STORE_UNLOCK(f, l)
-#endif
-
-struct _CamelVeeFolderPrivate {
-	GList *folders;		/* lock using subfolder_lock before changing/accessing */
-
-#ifdef ENABLE_THREADS
-	GMutex *summary_lock;		/* for locking vfolder summary */
-	GMutex *subfolder_lock;		/* for locking the subfolder list */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_VEE_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelVeeFolder *)f)->priv->l))
-#define CAMEL_VEE_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelVeeFolder *)f)->priv->l))
-#else
-#define CAMEL_VEE_FOLDER_LOCK(f, l)
-#define CAMEL_VEE_FOLDER_UNLOCK(f, l)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_H */
-
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
deleted file mode 100644
index 03be7cdf1e..0000000000
--- a/camel/camel-provider.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-provider.c: provider framework */
-
-/*
- *
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-/* FIXME: Shouldn't we add a version number to providers ? */
-
-#include "config.h"
-#include "camel-provider.h"
-#include "camel-exception.h"
-#include "hash-table-utils.h"
-
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <gmodule.h>
-
-/**
- * camel_provider_init:
- *
- * Initialize the Camel provider system by reading in the .urls
- * files in the provider directory and creating a hash table mapping
- * URLs to module names.
- *
- * A .urls file has the same initial prefix as the shared library it
- * correspond to, and consists of a series of lines containing the URL
- * protocols that that library handles.
- *
- * Return value: a hash table mapping URLs to module names
- **/
-GHashTable *
-camel_provider_init (void)
-{
-	GHashTable *providers;
-	DIR *dir;
-	struct dirent *d;
-	char *p, *name, buf[80];
-	FILE *f;
-
-	providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-
-	dir = opendir (CAMEL_PROVIDERDIR);
-	if (!dir) {
-		g_error ("Could not open camel provider directory: %s",
-			 g_strerror (errno));
-		return NULL;
-	}
-
-	while ((d = readdir (dir))) {
-		p = strchr (d->d_name, '.');
-		if (!p || strcmp (p, ".urls") != 0)
-			continue;
-
-		name = g_strdup_printf ("%s/%s", CAMEL_PROVIDERDIR, d->d_name);
-		f = fopen (name, "r");
-		if (!f) {
-			g_warning ("Could not read provider info file %s: %s",
-				   name, g_strerror (errno));
-			g_free (name);
-			continue;
-		}
-
-		p = strrchr (name, '.');
-		strcpy (p, ".so");
-		while ((fgets (buf, sizeof (buf), f))) {
-			buf[sizeof (buf) - 1] = '\0';
-			p = strchr (buf, '\n');
-			if (p)
-				*p = '\0';
-
-			g_hash_table_insert (providers, g_strdup (buf), name);
-		}
-		fclose (f);
-	}
-
-	closedir (dir);
-	return providers;
-}
-
-/**
- * camel_provider_load:
- * @session: the current session
- * @path: the path to a shared library
- * @ex: a CamelException
- *
- * Loads the provider at @path, and calls its initialization function,
- * passing @session as an argument. The provider should then register
- * itself with @session.
- **/ 
-void
-camel_provider_load (CamelSession *session, const char *path, CamelException *ex)
-{
-	GModule *module;
-	CamelProvider *(*camel_provider_module_init) ();
-
-	if (!g_module_supported ()) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not load %s: Module loading "
-				      "not supported on this system.",
-				      path);
-		return;
-	}
-
-	module = g_module_open (path, 0);
-	if (!module) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load %s: %s"),
-				      path, g_module_error ());
-		return;
-	}
-
-	if (!g_module_symbol (module, "camel_provider_module_init",
-			      (gpointer *)&camel_provider_module_init)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load %s: No initialization "
-					"code in module."), path);
-		g_module_close (module);
-		return;
-	}
-
-	camel_provider_module_init (session);
-}
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
deleted file mode 100644
index 07d62106ea..0000000000
--- a/camel/camel-provider.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-provider.h :  provider definition  */
-
-/*
- *
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_PROVIDER_H
-#define CAMEL_PROVIDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-types.h>
-#include <camel/camel-object.h>
-
-#define CAMEL_PROVIDER(obj) ((CamelProvider *)(obj))
-
-typedef enum {
-	CAMEL_PROVIDER_STORE,
-	CAMEL_PROVIDER_TRANSPORT,
-	CAMEL_NUM_PROVIDER_TYPES
-} CamelProviderType;
-
-extern char *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
-
-/* _IS_SOURCE means the user can get mail from there.
- * _IS_STORAGE means the user can read mail from there.
- */
-#define CAMEL_PROVIDER_IS_REMOTE	(1 << 0)
-#define CAMEL_PROVIDER_IS_SOURCE	(1 << 1)
-#define CAMEL_PROVIDER_IS_STORAGE	(1 << 2)
-
-
-/* Flags for url_flags. "ALLOW" means the config dialog will let
- * the user configure it. "NEED" implies "ALLOW" but means the user
- * must configure it. Service code can assume that any url part
- * for which it has set the NEED flag will be set when the service
- * is created.
- */
-#define CAMEL_URL_ALLOW_USER	 (1 << 0)
-#define CAMEL_URL_ALLOW_AUTH	 (1 << 1)
-#define CAMEL_URL_ALLOW_PASSWORD (1 << 2)
-#define CAMEL_URL_ALLOW_HOST	 (1 << 3)
-#define CAMEL_URL_ALLOW_PORT	 (1 << 4)
-#define CAMEL_URL_ALLOW_PATH	 (1 << 5)
-
-#define CAMEL_URL_NEED_USER	 (1 << 6 | 1 << 0)
-#define CAMEL_URL_NEED_AUTH	 (1 << 7 | 1 << 1)
-#define CAMEL_URL_NEED_PASSWORD	 (1 << 8 | 1 << 2)
-#define CAMEL_URL_NEED_HOST	 (1 << 9 | 1 << 3)
-#define CAMEL_URL_NEED_PORT	 (1 << 10 | 1 << 4)
-#define CAMEL_URL_NEED_PATH	 (1 << 11 | 1 << 5)
-
-#define CAMEL_URL_PATH_IS_ABSOLUTE (1 << 12)
-
-typedef struct {
-	/* Provider name used in CamelURLs. */
-	char *protocol;
-
-	/* Provider name as used by people. (May be the same as protocol) */
-	char *name;
-
-	/* Description of the provider. A novice user should be able
-	 * to read this description, and the information provided by
-	 * an ISP, IS department, etc, and determine whether or not
-	 * this provider is relevant to him, and if so, which
-	 * information goes with it.
-	 */
-	char *description;
-
-	/* The category of message that this provider works with.
-	 * (evolution-mail will only list a provider in the store/transport
-	 * config dialogs if its domain is "mail".)
-	 */
-	char *domain;
-
-	int flags, url_flags;
-
-	CamelType object_types [CAMEL_NUM_PROVIDER_TYPES];
-
-	GHashTable *service_cache;
-	
-} CamelProvider;
-
-GHashTable *camel_provider_init (void);
-void camel_provider_load (CamelSession *session, const char *path, CamelException *ex);
-
-/* This is defined by each module, not by camel-provider.c. */
-void camel_provider_module_init (CamelSession *session);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_PROVIDER_H */
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
deleted file mode 100644
index 41e16a27fc..0000000000
--- a/camel/camel-remote-store.c
+++ /dev/null
@@ -1,643 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-remote-store.c : class for an remote store */
-
-/*
- *  Authors: Peter Williams <peterw@helixcode.com>
- *           based on camel-imap-provider.c
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "camel-remote-store.h"
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-session.h"
-#include "camel-stream.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#include "camel-private.h"
-#include "camel-operation.h"
-
-#define d(x) x
-#if d(!)0
-extern gboolean camel_verbose_debug;
-#endif
-
-#define CSRVC(obj) (CAMEL_SERVICE_CLASS      (CAMEL_OBJECT_GET_CLASS (obj)))
-#define CSTRC(obj) (CAMEL_STORE_CLASS        (CAMEL_OBJECT_GET_CLASS (obj)))
-#define CRSC(obj)  (CAMEL_REMOTE_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (obj)))
-
-static CamelStoreClass *store_class = NULL;
-
-static gboolean remote_connect         (CamelService *service, CamelException *ex);
-static gboolean remote_disconnect      (CamelService *service, gboolean clean, CamelException *ex);
-static GList   *remote_query_auth_types(CamelService *service, gboolean connect, CamelException *ex);
-static void     remote_free_auth_types (CamelService *service, GList *authtypes);
-static char    *remote_get_name        (CamelService *service, gboolean brief);
-static gint     remote_send_string     (CamelRemoteStore *store, CamelException *ex, 
-					char *fmt, va_list ap);
-static gint     remote_send_stream     (CamelRemoteStore *store, CamelStream *stream,
-					CamelException *ex);
-static gint     remote_recv_line       (CamelRemoteStore *store, char **dest, 
-					CamelException *ex);
-
-static void
-camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)
-{
-	/* virtual method overload */
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_remote_store_class);
-	
-	store_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = remote_connect;
-	camel_service_class->disconnect = remote_disconnect;
-	camel_service_class->query_auth_types = remote_query_auth_types;
-	camel_service_class->free_auth_types = remote_free_auth_types;
-	camel_service_class->get_name = remote_get_name;
-	
-	camel_remote_store_class->send_string = remote_send_string;
-	camel_remote_store_class->send_stream = remote_send_stream;
-	camel_remote_store_class->recv_line = remote_recv_line;
-	camel_remote_store_class->keepalive = NULL;
-}
-
-static void
-camel_remote_store_init (CamelObject *object)
-{
-	CamelStore *store = CAMEL_STORE (object);
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	
-	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	remote_store->istream = NULL;
-	remote_store->ostream = NULL;
-	remote_store->timeout_id = 0;
-
-	remote_store->priv = g_malloc0(sizeof(*remote_store->priv));
-#ifdef ENABLE_THREADS
-	remote_store->priv->stream_lock = e_mutex_new(E_MUTEX_REC);
-#endif
-}
-
-static void
-camel_remote_store_finalise(CamelObject *object)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-
-#ifdef ENABLE_THREADS
-	e_mutex_destroy(remote_store->priv->stream_lock);
-#endif
-	g_free(remote_store->priv);
-}
-
-
-CamelType
-camel_remote_store_get_type (void)
-{
-	static CamelType camel_remote_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_remote_store_type == CAMEL_INVALID_TYPE) {
-		camel_remote_store_type =
-			camel_type_register (CAMEL_STORE_TYPE, "CamelRemoteStore",
-					     sizeof (CamelRemoteStore),
-					     sizeof (CamelRemoteStoreClass),
-					     (CamelObjectClassInitFunc) camel_remote_store_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_remote_store_init,
-					     (CamelObjectFinalizeFunc) camel_remote_store_finalise);
-	}
-	
-	return camel_remote_store_type;
-}
-
-/* Auth stuff */
-
-/*
-static CamelServiceAuthType password_authtype = {
-	N_("SSH Tunneling"),
-	
-	N_("This option will connect to the server using a "
-	   "SSH tunnel."),
-	
-	"",
-	TRUE
-};
-*/
-
-static GList *
-remote_query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	return NULL;
-}
-
-static void
-remote_free_auth_types (CamelService *service, GList *authtypes)
-{
-	g_list_free (authtypes);
-}
-
-static char *
-remote_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf (_("%s server %s"),
-					service->provider->name,
-					service->url->host);
-	else {
-		return g_strdup_printf (_("%s service for %s on %s"),
-					service->provider->name,
-					service->url->user,
-					service->url->host);
-	}
-}
-
-static gboolean
-timeout_cb (gpointer data)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE(data);
-
-	CRSC (data)->keepalive(store);
-
-	return TRUE;
-}
-
-/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */
-/* returns -1 & errno == EINTR if the connection was cancelled */
-static int socket_connect(struct hostent *h, int port)
-{
-	struct sockaddr_in sin;
-	int fd;
-	int ret;
-	socklen_t len;
-	struct timeval tv;
-	int cancel_fd;
-
-	/* see if we're cancelled yet */
-	if (camel_operation_cancel_check(NULL)) {
-		errno = EINTR;
-		return -1;
-	}
-
-	/* setup connect, we do it using a nonblocking socket so we can poll it */
-	sin.sin_port = htons(port);
-	sin.sin_family = h->h_addrtype;
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-		ret = connect(fd, (struct sockaddr *)&sin, sizeof (sin));
-		if (ret == -1) {
-			close(fd);
-			return -1;
-		}
-		return fd;
-	} else {
-		fd_set rdset, wrset;
-		int flags, fdmax;
-
-		flags = fcntl(fd, F_GETFL);
-		fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-
-		ret = connect(fd, (struct sockaddr *)&sin, sizeof (sin));
-		if (ret == 0) {
-			fcntl(fd, F_SETFL, flags);
-			return fd;
-		}
-
-		if (errno != EINPROGRESS) {
-			close(fd);
-			return -1;
-		}
-
-		FD_ZERO(&rdset);
-		FD_ZERO(&wrset);
-		FD_SET(fd, &wrset);
-		FD_SET(cancel_fd, &rdset);
-		fdmax = MAX(fd, cancel_fd)+1;
-		tv.tv_usec = 0;
-		tv.tv_sec = 60*4;
-		if (select(fdmax, &rdset, &wrset, 0, &tv) == 0) {
-			close(fd);
-			errno = ETIMEDOUT;
-			return -1;
-		}
-		if (cancel_fd != -1 && FD_ISSET(cancel_fd, &rdset)) {
-			close(fd);
-			errno = EINTR;
-			return -1;
-		} else {
-			len = sizeof(int);
-			if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len) == -1) {
-				close(fd);
-				return -1;
-			}
-			if (ret != 0) {
-				close(fd);
-				errno = ret;
-				return -1;
-			}
-		}
-		fcntl(fd, F_SETFL, flags);
-	}
-
-	return fd;
-}
-
-static gboolean
-remote_connect (CamelService *service, CamelException *ex)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);
-	struct hostent *h;
-	struct sockaddr_in sin;
-	gint fd;
-	gint port;
-	
-	h = camel_service_gethost (service, ex);
-	if (!h)
-		return FALSE;
-	
-	/* connect to the server */
-	sin.sin_family = h->h_addrtype;
-	
-	if (service->url->port)
-		port = service->url->port;
-	else
-		port = store->default_port;	
-
-#if 1
-	fd = socket_connect(h, port);
-	if (fd == -1) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Connection cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not connect to %s (port %d): %s"),
-					      service->url->host ? service->url->host : _("(unknown host)"),
-					      port, strerror (errno));
-		return FALSE;
-	}
-#else
-	sin.sin_port = htons (port);
-	
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof (sin)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not connect to %s (port %d): %s"),
-				      service->url->host ? service->url->host : _("(unknown host)"),
-				      port, g_strerror (errno));
-		if (fd > -1)
-			close (fd);
-		
-		return FALSE;
-	}
-#endif
-	
-	/* parent class connect initialization */
-	if (CAMEL_SERVICE_CLASS (store_class)->connect (service, ex) == FALSE)
-		return FALSE;
-	
-	store->ostream = camel_stream_fs_new_with_fd (fd);
-	store->istream = camel_stream_buffer_new (store->ostream, CAMEL_STREAM_BUFFER_READ);
-	
-	/* Okay, good enough for us */
-	CAMEL_SERVICE (store)->connected = TRUE;
-	
-	/* Add a timeout so that we can hopefully prevent getting disconnected */
-	/* (Only if the implementation supports it) */
-	if (CRSC (store)->keepalive) {
-		CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));
-		
-		store->timeout_id = camel_session_register_timeout (session, 10 * 60 * 1000, 
-								    timeout_cb, 
-								    store);
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-remote_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);
-	
-	if (store->timeout_id) {
-		camel_session_remove_timeout (camel_service_get_session (CAMEL_SERVICE (store)),
-					      store->timeout_id);
-		store->timeout_id = 0;
-	}
-	
-	if (!CAMEL_SERVICE_CLASS (store_class)->disconnect (service, clean, ex))
-		return FALSE;
-	
-	if (store->istream) {
-		camel_object_unref (CAMEL_OBJECT (store->istream));
-		store->istream = NULL;
-	}
-	
-	if (store->ostream) {
-		camel_object_unref (CAMEL_OBJECT (store->ostream));
-		store->ostream = NULL;
-	}
-	
-	return TRUE;
-}
-
-static gint
-remote_send_string (CamelRemoteStore *store, CamelException *ex, char *fmt, va_list ap)
-{
-	gchar *cmdbuf;
-	
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. */
-	if (!camel_remote_store_connected (store, ex))
-		return -1;
-	
-	/* create the command */
-	cmdbuf = g_strdup_vprintf (fmt, ap);
-
-#if d(!)0
-	if (camel_verbose_debug) {
-		if (strncmp (cmdbuf, "PASS ", 5) == 0)
-			fprintf (stderr, "sending : PASS xxxx\n");
-		else if (strstr (cmdbuf, "LOGIN \""))
-			fprintf (stderr, "sending : ---- LOGIN \"xxxx\" \"xxxx\"\n");
-		else
-			fprintf (stderr, "sending : %s", cmdbuf);
-	}
-#endif
-	
-	if (camel_stream_printf (store->ostream, "%s", cmdbuf) == -1) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-		g_free (cmdbuf);
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-	g_free (cmdbuf);
-	
-	return 0;
-}
-
-/* FIXME: All of these functions need an api overhaul, they're not like
-   any other functions, anywhere in the world ... */
-
-/**
- * camel_remote_store_send_string: Writes a string to the server
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- * @fmt: the printf-style format to use for creating the string to send
- * @...: the arguments to the printf string @fmt
- * Return value: 0 on success, nonzero on error
- *
- * Formats the string and sends it to the server.
- **/
-
-gint 
-camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,
-				char *fmt, ...)
-{
-	va_list ap;
-	gint ret;
-	
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (fmt, -1);
-	
-	va_start (ap, fmt);
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	ret = CRSC (store)->send_string (store, ex, fmt, ap);
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-	va_end (ap);
-	
-	return ret;
-}
-
-static gint
-remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)
-{
-	int ret;
-
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. */
-
-	if (!camel_remote_store_connected (store, ex))
-		return -1;
-	
-	d(fprintf (stderr, "(sending stream)\n"));
-	
-	ret = camel_stream_write_to_stream (stream, store->ostream);
-	if (ret == -1) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-	}
-
-	return ret;
-}
-
-/**
- * camel_remote_store_send_stream: Writes a CamelStream to the server
- * @store: a CamelRemoteStore
- * @stream: the stream to write
- * @ex: a CamelException
- * Return value: 0 on success, nonzero on error
- *
- * Sends the stream to the server.
- **/
-
-gint 
-camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	
-	ret = CRSC (store)->send_stream (store, stream, ex);
-
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-
-	return ret;
-}
-
-static int
-remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)
-{
-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store->istream);
-	GByteArray *bytes;
-	gchar buf[1024], *ret;
-	gint nread;
-	
-	*dest = NULL;
-	
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. We can't expect a read to have any
-	 * meaning if we reconnect, so always set an exception.
-	 */
-	
-	if (!camel_remote_store_connected (store, ex)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-				     g_strerror (errno));
-		return -1;
-	}
-
-	bytes = g_byte_array_new ();
-	
-	do {
-		nread = camel_stream_buffer_gets (stream, buf, sizeof (buf));
-		if (nread > 0)
-			g_byte_array_append (bytes, buf, nread);
-	} while (nread == sizeof (buf) - 1);
-
-	if (nread == -1) {
-		if (errno == EINTR)
-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-		else
-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-	} else if (bytes->len == 0) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-				    _("Server unexpectedly disconnected"));
-	}
-	if (camel_exception_is_set (ex)) {
-		g_byte_array_free(bytes, TRUE);
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-
-	g_byte_array_append (bytes, "", 1);
-	ret = bytes->data;
-	nread = bytes->len - 1;
-	g_byte_array_free (bytes, FALSE);
-	
-	/* strip off the CRLF sequence */
-	while (nread > 0 && ret[nread] != '\r')
-		ret[nread--] = '\0';
-	ret[nread] = '\0';
-	
-	*dest = ret;
-	
-#if d(!)0
-	if (camel_verbose_debug)
-		fprintf (stderr, "received: %s\n", *dest);
-#endif
-	
-	return nread;
-}
-
-/**
- * camel_remote_store_recv_line: Reads a line from the server
- * @store: a CamelRemoteStore
- * @dest: a pointer that will be set to the location of a buffer
- *        holding the server's response
- * @ex: a CamelException
- * Return value: -1 on error, otherwise the length read.
- *
- * Reads a line from the server (terminated by \n or \r\n).
- **/
-
-gint 
-camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,
-			      CamelException *ex)
-{
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (dest, -1);
-
-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);
-	
-	ret = CRSC (store)->recv_line (store, dest, ex);
-
-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);
-
-	return ret;
-}
-
-static void
-refresh_folder_info (gpointer key, gpointer value, gpointer data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (value);
-	
-	camel_folder_refresh_info (folder, (CamelException *) data);
-}
-
-/**
- * camel_remote_store_refresh_folders: Refresh the folders that I
- * contain
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- *
- * Refreshes the folders listed in the folders hashtable.
- **/
-void
-camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)
-{
-	CAMEL_STORE_LOCK(store, cache_lock);
-
-	g_hash_table_foreach (CAMEL_STORE (store)->folders, refresh_folder_info, ex);
-
-	CAMEL_STORE_UNLOCK(store, cache_lock);
-}	
-
-/**
- * camel_remote_store_connected:
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- *
- * Ensure that the remote store is connected.
- *
- * Return value: Whether or not it is connected
- **/
-gboolean
-camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex)
-{
-	if (store->istream == NULL) {
-		camel_service_connect (CAMEL_SERVICE (store), ex);
-		return !camel_exception_is_set (ex);
-	}
-	return TRUE;
-}
diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
deleted file mode 100644
index 51322b6886..0000000000
--- a/camel/camel-remote-store.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-remote-store.h : class for a remote store */
-
-/* 
- * Authors: Peter Williams <peterw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_REMOTE_STORE_H
-#define CAMEL_REMOTE_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-store.h"
-
-#define CAMEL_REMOTE_STORE_TYPE     (camel_remote_store_get_type ())
-#define CAMEL_REMOTE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStore))
-#define CAMEL_REMOTE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStoreClass))
-#define CAMEL_IS_REMOTE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_REMOTE_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;	
-	struct _CamelRemoteStorePrivate *priv;
-
-	CamelStream *istream, *ostream;
-	guint timeout_id, default_port;
-} CamelRemoteStore;
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-	gint (*send_string)   (CamelRemoteStore *store, CamelException *ex, 
-			       char *fmt, va_list ap);
-	gint (*send_stream)   (CamelRemoteStore *store, CamelStream *stream, 
-			       CamelException *ex);
-	gint (*recv_line)     (CamelRemoteStore *store, char **dest, 
-			       CamelException *ex);
-	void (*keepalive)     (CamelRemoteStore *store);
-} CamelRemoteStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_remote_store_get_type (void);
-
-/* FIXME: All of these i/o functions need an api overhaul, they're not like
-   any other functions, anywhere in the world ... */
-
-/* Extra public functions */
-gint camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,
-				     char *fmt, ...);
-gint camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, 
-				     CamelException *ex);
-gint camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,
-				   CamelException *ex);
-void camel_remote_store_refresh_folders (CamelRemoteStore *store, 
-					 CamelException *ex);
-gboolean camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_REMOTE_STORE_H */
diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c
deleted file mode 100644
index f6d7d4ec24..0000000000
--- a/camel/camel-sasl-anonymous.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "camel-sasl-anonymous.h"
-#include "camel-internet-address.h"
-#include <string.h>
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslAnonymous */
-#define CSA_CLASS(so) CAMEL_SASL_ANONYMOUS_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_anonymous_class_init (CamelSaslAnonymousClass *camel_sasl_anonymous_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_anonymous_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = anon_challenge;
-}
-
-static void
-camel_sasl_anonymous_finalize (CamelObject *object)
-{
-	CamelSaslAnonymous *sasl = CAMEL_SASL_ANONYMOUS (object);
-	
-	g_free (sasl->trace_info);
-}
-
-
-CamelType
-camel_sasl_anonymous_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslAnonymous",
-					    sizeof (CamelSaslAnonymous),
-					    sizeof (CamelSaslAnonymousClass),
-					    (CamelObjectClassInitFunc) camel_sasl_anonymous_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_sasl_anonymous_finalize);
-	}
-	
-	return type;
-}
-
-CamelSasl *
-camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info)
-{
-	CamelSaslAnonymous *sasl_anon;
-	
-	if (!trace_info && type != CAMEL_SASL_ANON_TRACE_EMPTY) return NULL;
-	
-	sasl_anon = CAMEL_SASL_ANONYMOUS (camel_object_new (camel_sasl_anonymous_get_type ()));
-	sasl_anon->trace_info = g_strdup (trace_info);
-	sasl_anon->type = type;
-	
-	return CAMEL_SASL (sasl_anon);
-}
-
-static GByteArray *
-anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	CamelSaslAnonymous *sasl_anon = CAMEL_SASL_ANONYMOUS (sasl);
-	CamelInternetAddress *cia;
-	GByteArray *ret = NULL;
-
-	if (token) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Authentication failed."));
-		return NULL;
-	}
-
-	switch (sasl_anon->type) {
-	case CAMEL_SASL_ANON_TRACE_EMAIL:
-		cia = camel_internet_address_new ();
-		if (camel_internet_address_add (cia, NULL, sasl_anon->trace_info) != 1) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Invalid email address trace information:\n%s"),
-					      sasl_anon->trace_info);
-			camel_object_unref (CAMEL_OBJECT (cia));
-			return NULL;
-		}
-		camel_object_unref (CAMEL_OBJECT (cia));
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, sasl_anon->trace_info, strlen (sasl_anon->trace_info));
-		break;
-	case CAMEL_SASL_ANON_TRACE_OPAQUE:
-		if (strchr (sasl_anon->trace_info, '@')) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Invalid opaque trace information:\n%s"),
-					      sasl_anon->trace_info);
-			return NULL;
-		}
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, sasl_anon->trace_info, strlen (sasl_anon->trace_info));
-		break;
-	case CAMEL_SASL_ANON_TRACE_EMPTY:
-		ret = g_byte_array_new ();
-		break;
-	default:
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Invalid trace information:\n%s"),
-				      sasl_anon->trace_info);
-		return NULL;
-	}
-
-	sasl->authenticated = TRUE;
-	return ret;
-}
diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h
deleted file mode 100644
index 3b27aeb183..0000000000
--- a/camel/camel-sasl-anonymous.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_SASL_ANONYMOUS_H
-#define CAMEL_SASL_ANONYMOUS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_ANONYMOUS_TYPE     (camel_sasl_anonymous_get_type ())
-#define CAMEL_SASL_ANONYMOUS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymous))
-#define CAMEL_SASL_ANONYMOUS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymousClass))
-#define CAMEL_IS_SASL_ANONYMOUS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_ANONYMOUS_TYPE))
-
-typedef enum {
-	CAMEL_SASL_ANON_TRACE_EMAIL,
-	CAMEL_SASL_ANON_TRACE_OPAQUE,
-	CAMEL_SASL_ANON_TRACE_EMPTY
-} CamelSaslAnonTraceType;
-
-typedef struct _CamelSaslAnonymous {
-	CamelSasl parent_object;
-	
-	char *trace_info;
-	CamelSaslAnonTraceType type;
-} CamelSaslAnonymous;
-
-
-typedef struct _CamelSaslAnonymousClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslAnonymousClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_anonymous_get_type (void);
-
-/* public methods */
-CamelSasl * camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_ANONYMOUS_H */
diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c
deleted file mode 100644
index 458517c5d5..0000000000
--- a/camel/camel-sasl-cram-md5.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "camel-sasl-cram-md5.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
-#include <e-util/md5-utils.h>
-#include <stdio.h>
-#include <string.h>
-
-CamelServiceAuthType camel_sasl_cram_md5_authtype = {
-	N_("CRAM-MD5"),
-
-	N_("This option will connect to the server using a "
-	   "secure CRAM-MD5 password, if the server supports it."),
-
-	"CRAM-MD5",
-	TRUE
-};
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslCramMd5 */
-#define CSCM_CLASS(so) CAMEL_SASL_CRAM_MD5_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *camel_sasl_cram_md5_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_cram_md5_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = cram_md5_challenge;
-}
-
-CamelType
-camel_sasl_cram_md5_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslCramMd5",
-					    sizeof (CamelSaslCramMd5),
-					    sizeof (CamelSaslCramMd5Class),
-					    (CamelObjectClassInitFunc) camel_sasl_cram_md5_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/* CRAM-MD5 algorithm:
- * MD5 ((passwd XOR opad), MD5 ((passwd XOR ipad), timestamp))
- */
-
-static GByteArray *
-cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	char *passwd;
-	guchar digest[16], md5asc[33], *s, *p;
-	GByteArray *ret = NULL;
-	guchar ipad[64];
-	guchar opad[64];
-	MD5Context ctx;
-	int i, pw_len;
-
-	/* Need to wait for the server */
-	if (!token)
-		return NULL;
-
-	g_return_val_if_fail (sasl->service->url->passwd != NULL, NULL);
-
-	memset (ipad, 0, sizeof (ipad));
-	memset (opad, 0, sizeof (opad));
-
-	passwd = sasl->service->url->passwd;
-	pw_len = strlen (passwd);
-	if (pw_len <= 64) {
-		memcpy (ipad, passwd, pw_len);
-		memcpy (opad, passwd, pw_len);
-	} else {
-		md5_get_digest (passwd, pw_len, ipad);
-		memcpy (opad, ipad, 16);
-	}
-
-	for (i = 0; i < 64; i++) {
-		ipad[i] ^= 0x36;
-		opad[i] ^= 0x5c;
-	}
-
-	md5_init (&ctx);
-	md5_update (&ctx, ipad, 64);
-	md5_update (&ctx, token->data, token->len);
-	md5_final (&ctx, digest);
-
-	md5_init (&ctx);
-	md5_update (&ctx, opad, 64);
-	md5_update (&ctx, digest, 16);
-	md5_final (&ctx, digest);
-
-	/* lowercase hexify that bad-boy... */
-	for (s = digest, p = md5asc; p < md5asc + 32; s++, p += 2)
-		sprintf (p, "%.2x", *s);
-
-	ret = g_byte_array_new ();
-	g_byte_array_append (ret, sasl->service->url->user, strlen (sasl->service->url->user));
-	g_byte_array_append (ret, " ", 1);
-	g_byte_array_append (ret, md5asc, 32);
- 
-	sasl->authenticated = TRUE;
-	
-	return ret;
-}
diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h
deleted file mode 100644
index 801dc4a4bb..0000000000
--- a/camel/camel-sasl-cram-md5.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_SASL_CRAM_MD5_H
-#define CAMEL_SASL_CRAM_MD5_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_CRAM_MD5_TYPE     (camel_sasl_cram_md5_get_type ())
-#define CAMEL_SASL_CRAM_MD5(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5))
-#define CAMEL_SASL_CRAM_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5Class))
-#define CAMEL_IS_SASL_CRAM_MD5(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_CRAM_MD5_TYPE))
-
-typedef struct _CamelSaslCramMd5 {
-	CamelSasl parent_object;
-
-} CamelSaslCramMd5;
-
-
-typedef struct _CamelSaslCramMd5Class {
-	CamelSaslClass parent_class;
-	
-} CamelSaslCramMd5Class;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_cram_md5_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_cram_md5_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_CRAM_MD5_H */
diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c
deleted file mode 100644
index 0079a88b25..0000000000
--- a/camel/camel-sasl-kerberos4.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#ifdef HAVE_KRB4
-
-#include <krb.h>
-/* MIT krb4 des.h #defines _. Sigh. We don't need it. #undef it here
- * so we get the gettexty _ definition later.
- */
-#undef _
-
-#include "camel-sasl-kerberos4.h"
-#include "camel-service.h"
-#include <string.h>
-
-CamelServiceAuthType camel_sasl_kerberos4_authtype = {
-	N_("Kerberos 4"),
-
-	N_("This option will connect to the server using "
-	   "Kerberos 4 authentication."),
-
-	"KERBEROS_V4",
-	FALSE
-};
-
-#define KERBEROS_V4_PROTECTION_NONE      1
-#define KERBEROS_V4_PROTECTION_INTEGRITY 2
-#define KERBEROS_V4_PROTECTION_PRIVACY   4
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslKerberos4 */
-#define CSK4_CLASS(so) CAMEL_SASL_KERBEROS4_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-struct _CamelSaslKerberos4Private {
-	int state;
-	
-	guint32 nonce_n;
-	guint32 nonce_h;
-	
-	des_cblock session;
-	des_key_schedule schedule;
-};
-
-static void
-camel_sasl_kerberos4_class_init (CamelSaslKerberos4Class *camel_sasl_kerberos4_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_kerberos4_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = krb4_challenge;
-}
-
-static void
-camel_sasl_kerberos4_init (gpointer object, gpointer klass)
-{
-	CamelSaslKerberos4 *sasl_krb4 = CAMEL_SASL_KERBEROS4 (object);
-	
-	sasl_krb4->priv = g_new0 (struct _CamelSaslKerberos4Private, 1);
-}
-
-static void
-camel_sasl_kerberos4_finalize (CamelObject *object)
-{
-	CamelSaslKerberos4 *sasl = CAMEL_SASL_KERBEROS4 (object);
-
-	if (sasl->priv) {
-		memset (sasl->priv, 0, sizeof (sasl->priv));
-		g_free (sasl->priv);
-	}
-}
-
-
-CamelType
-camel_sasl_kerberos4_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslKerberos4",
-					    sizeof (CamelSaslKerberos4),
-					    sizeof (CamelSaslKerberos4Class),
-					    (CamelObjectClassInitFunc) camel_sasl_kerberos4_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_sasl_kerberos4_init,
-					    (CamelObjectFinalizeFunc) camel_sasl_kerberos4_finalize);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	struct _CamelSaslKerberos4Private *priv = CAMEL_SASL_KERBEROS4 (sasl)->priv;
-	GByteArray *ret = NULL;
-	char *inst, *realm, *username;
-	struct hostent *h;
-	int status, len;
-	KTEXT_ST authenticator;
-	CREDENTIALS credentials;
-	guint32 plus1;
-
-	/* Need to wait for the server */
-	if (!token)
-		return NULL;
-
-	switch (priv->state) {
-	case 0:
-		if (token->len != 4)
-			goto lose;
-
-		memcpy (&priv->nonce_n, token->data, 4);
-		priv->nonce_h = ntohl (priv->nonce_n);
-
-		/* Our response is an authenticator including that number. */
-		h = camel_service_gethost (sasl->service, ex);
-		inst = g_strndup (h->h_name, strcspn (h->h_name, "."));
-		g_strdown (inst);
-		realm = g_strdup (krb_realmofhost (h->h_name));
-		status = krb_mk_req (&authenticator, sasl->service_name, inst, realm, priv->nonce_h);
-		if (status == KSUCCESS) {
-			status = krb_get_cred (sasl->service_name, inst, realm, &credentials);
-			memcpy (priv->session, credentials.session, sizeof (priv->session));
-			memset (&credentials, 0, sizeof (credentials));
-		}
-		g_free (inst);
-		g_free (realm);
-
-		if (status != KSUCCESS) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Could not get Kerberos ticket:\n%s"),
-					      krb_err_txt[status]);
-			goto lose;
-		}
-		des_key_sched (&priv->session, priv->schedule);
-
-		ret = g_byte_array_new ();
-		g_byte_array_append (ret, (const guint8 *)authenticator.dat, authenticator.length);
-		break;
-
-	case 1:
-		if (token->len != 8)
-			goto lose;
-
-		/* This one is encrypted. */
-		des_ecb_encrypt ((des_cblock *)token->data, (des_cblock *)token->data, priv->schedule, 0);
-
-		/* Check that the returned value is the original nonce plus one. */
-		memcpy (&plus1, token->data, 4);
-		if (ntohl (plus1) != priv->nonce_h + 1)
-			goto lose;
-
-		/* "the fifth octet contain[s] a bit-mask specifying the
-		 * protection mechanisms supported by the server"
-		 */
-		if (!(token->data[4] & KERBEROS_V4_PROTECTION_NONE)) {
-			g_warning ("Server does not support `no protection' :-(");
-			goto lose;
-		}
-
-		username = sasl->service->url->user;
-		len = strlen (username) + 9;
-		len += 8 - len % 8;
-		ret = g_byte_array_new ();
-		g_byte_array_set_size (ret, len);
-		memset (ret->data, 0, len);
-		memcpy (ret->data, &priv->nonce_n, 4);
-		ret->data[4] = KERBEROS_V4_PROTECTION_NONE;
-		ret->data[5] = ret->data[6] = ret->data[7] = 0;
-		strcpy (ret->data + 8, username);
-
-		des_pcbc_encrypt ((void *)ret->data, (void *)ret->data, len,
-				  priv->schedule, &priv->session, 1);
-		memset (&priv->session, 0, sizeof (priv->session));
-
-		sasl->authenticated = TRUE;
-		break;
-	}
-
-	priv->state++;
-	return ret;
-
- lose:
-	memset (&priv->session, 0, sizeof (priv->session));
-
-	if (!camel_exception_is_set (ex)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Bad authentication response from server."));
-	}
-	return NULL;
-}
-
-#endif /* HAVE_KRB4 */
diff --git a/camel/camel-sasl-kerberos4.h b/camel/camel-sasl-kerberos4.h
deleted file mode 100644
index 38ac9d7e4a..0000000000
--- a/camel/camel-sasl-kerberos4.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_SASL_KERBEROS4_H
-#define CAMEL_SASL_KERBEROS4_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-#include <sys/types.h>
-#include <netdb.h>
-
-#define CAMEL_SASL_KERBEROS4_TYPE     (camel_sasl_kerberos4_get_type ())
-#define CAMEL_SASL_KERBEROS4(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4))
-#define CAMEL_SASL_KERBEROS4_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4Class))
-#define CAMEL_IS_SASL_KERBEROS4(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_KERBEROS4_TYPE))
-
-typedef struct _CamelSaslKerberos4 {
-	CamelSasl parent_object;
-	struct _CamelSaslKerberos4Private *priv;
-
-} CamelSaslKerberos4;
-
-
-typedef struct _CamelSaslKerberos4Class {
-	CamelSaslClass parent_class;
-	
-} CamelSaslKerberos4Class;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_kerberos4_get_type (void);
-
-extern CamelServiceAuthType camel_sasl_kerberos4_authtype;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_KERBEROS4_H */
diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
deleted file mode 100644
index e4e4612dc8..0000000000
--- a/camel/camel-sasl-plain.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "camel-sasl-plain.h"
-#include "camel-service.h"
-#include <string.h>
-
-static CamelSaslClass *parent_class = NULL;
-
-/* Returns the class for a CamelSaslPlain */
-#define CSP_CLASS(so) CAMEL_SASL_PLAIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_plain_class_init (CamelSaslPlainClass *camel_sasl_plain_class)
-{
-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_plain_class);
-	
-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
-	
-	/* virtual method overload */
-	camel_sasl_class->challenge = plain_challenge;
-}
-
-CamelType
-camel_sasl_plain_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_sasl_get_type (),
-					    "CamelSaslPlain",
-					    sizeof (CamelSaslPlain),
-					    sizeof (CamelSaslPlainClass),
-					    (CamelObjectClassInitFunc) camel_sasl_plain_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static GByteArray *
-plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	GByteArray *buf = NULL;
-	CamelURL *url = sasl->service->url;
-
-	if (token) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Authentication failed."));
-		return NULL;
-	}
-
-	g_return_val_if_fail (url->passwd != NULL, NULL);
-
-	/* FIXME: make sure these are "UTF8-SAFE" */
-	buf = g_byte_array_new ();
-	g_byte_array_append (buf, "", 1);
-	g_byte_array_append (buf, url->user, strlen (url->user));
-	g_byte_array_append (buf, "", 1);
-	g_byte_array_append (buf, url->passwd, strlen (url->passwd));
-
-	sasl->authenticated = TRUE;
-	
-	return buf;
-}
diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h
deleted file mode 100644
index 94efb317f9..0000000000
--- a/camel/camel-sasl-plain.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_SASL_PLAIN_H
-#define CAMEL_SASL_PLAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-sasl.h>
-
-#define CAMEL_SASL_PLAIN_TYPE     (camel_sasl_plain_get_type ())
-#define CAMEL_SASL_PLAIN(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlain))
-#define CAMEL_SASL_PLAIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlainClass))
-#define CAMEL_IS_SASL_PLAIN(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_PLAIN_TYPE))
-
-typedef struct _CamelSaslPlain {
-	CamelSasl parent_object;
-
-} CamelSaslPlain;
-
-
-typedef struct _CamelSaslPlainClass {
-	CamelSaslClass parent_class;
-	
-} CamelSaslPlainClass;
-
-
-/* Standard Camel function */
-CamelType camel_sasl_plain_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_PLAIN_H */
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
deleted file mode 100644
index 1e7fc9108c..0000000000
--- a/camel/camel-sasl.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "camel-sasl.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
-
-#include "camel-sasl-cram-md5.h"
-#include "camel-sasl-kerberos4.h"
-#include "camel-sasl-plain.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelSasl */
-#define CS_CLASS(so) CAMEL_SASL_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static GByteArray *sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-static void
-camel_sasl_class_init (CamelSaslClass *camel_sasl_class)
-{
-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);
-	
-	/* virtual method definition */
-	camel_sasl_class->challenge = sasl_challenge;
-}
-
-static void
-camel_sasl_finalize (CamelSasl *sasl)
-{
-	g_free (sasl->service_name);
-	camel_object_unref (CAMEL_OBJECT (sasl->service));
-}
-
-CamelType
-camel_sasl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_OBJECT_TYPE,
-					    "CamelSasl",
-					    sizeof (CamelSasl),
-					    sizeof (CamelSaslClass),
-					    (CamelObjectClassInitFunc) camel_sasl_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_sasl_finalize);
-	}
-	
-	return type;
-}
-
-
-static GByteArray *
-sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	g_warning ("sasl_challenge: Using default implementation!");
-	return NULL;
-}
-
-/**
- * camel_sasl_challenge:
- * @sasl: a SASL object
- * @token: a token, or %NULL
- * @ex: exception
- *
- * If @token is %NULL, generate the initial SASL message to send to
- * the server. (This will be %NULL if the client doesn't initiate the
- * exchange.) Otherwise, @token is a challenge from the server, and
- * the return value is the response.
- *
- * Return value: The SASL response or %NULL. If an error occurred, @ex
- * will also be set.
- **/
-GByteArray *
-camel_sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);
-
-	return CS_CLASS (sasl)->challenge (sasl, token, ex);
-}
-
-/**
- * camel_sasl_challenge_base64:
- * @sasl: a SASL object
- * @token: a base64-encoded token
- * @ex: exception
- *
- * As with camel_sasl_challenge(), but the challenge @token and the
- * response are both base64-encoded.
- *
- * Return value: As with camel_sasl_challenge(), but base64-encoded.
- **/
-char *
-camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex)
-{
-	GByteArray *token_binary, *ret_binary;
-	char *ret;
-	int len;
-
-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);
-
-	if (token) {
-		token_binary = g_byte_array_new ();
-		len = strlen (token);
-		g_byte_array_append (token_binary, token, len);
-		token_binary->len = base64_decode_simple (token_binary->data, len);
-	} else
-		token_binary = NULL;
-
-	ret_binary = camel_sasl_challenge (sasl, token_binary, ex);
-	if (token_binary)
-		g_byte_array_free (token_binary, TRUE);
-	if (!ret_binary)
-		return NULL;
-
-	ret = base64_encode_simple (ret_binary->data, ret_binary->len);
-	g_byte_array_free (ret_binary, TRUE);
-
-	return ret;
-}
-
-/**
- * camel_sasl_authenticated:
- * @sasl: a SASL object
- *
- * Return value: whether or not @sasl has successfully authenticated
- * the user. This will be %TRUE after it returns the last needed response.
- * The caller must still pass that information on to the server and verify
- * that it has accepted it.
- **/
-gboolean
-camel_sasl_authenticated (CamelSasl *sasl)
-{
-	return sasl->authenticated;
-}
-
-
-/**
- * camel_sasl_new:
- * @service_name: the SASL service name
- * @mechanism: the SASL mechanism
- * @service: the CamelService that will be using this SASL
- *
- * Return value: a new CamelSasl for the given @service_name,
- * @mechanism, and @service, or %NULL if the mechanism is not
- * supported.
- **/
-CamelSasl *
-camel_sasl_new (const char *service_name, const char *mechanism, CamelService *service)
-{
-	CamelSasl *sasl;
-
-	g_return_val_if_fail (service_name != NULL, NULL);
-	g_return_val_if_fail (mechanism != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-
-	/* We don't do ANONYMOUS here, because it's a little bit weird. */
-
-	if (!strcmp (mechanism, "CRAM-MD5"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_CRAM_MD5_TYPE);
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_KERBEROS4_TYPE);
-#endif
-	else if (!strcmp (mechanism, "PLAIN"))
-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_PLAIN_TYPE);
-	else
-		return NULL;
-
-	sasl->service_name = g_strdup (service_name);
-	sasl->service = service;
-	camel_object_ref (CAMEL_OBJECT (service));
-
-	return sasl;
-}
-
-/**
- * camel_sasl_authtype_list:
- *
- * Return value: a GList of SASL-supported authtypes. The caller must
- * free the list, but not the contents.
- **/
-GList *
-camel_sasl_authtype_list (void)
-{
-	GList *types = NULL;
-
-	/* We don't do PLAIN here, because it's considered to be
-	 * normal password authentication, just behind SSL.
-	 */
-
-	types = g_list_prepend (types, &camel_sasl_cram_md5_authtype);
-#ifdef HAVE_KRB4
-	types = g_list_prepend (types, &camel_sasl_kerberos4_authtype);
-#endif
-
-	return types;
-}
-
-/**
- * camel_sasl_authtype:
- * @mechanism: the SASL mechanism to get an authtype for
- *
- * Return value: a CamelServiceAuthType for the given mechanism, if
- * it is supported.
- **/
-CamelServiceAuthType *
-camel_sasl_authtype (const char *mechanism)
-{
-	if (!strcmp (mechanism, "CRAM-MD5"))
-		return &camel_sasl_cram_md5_authtype;
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		return &camel_sasl_kerberos4_authtype;
-#endif
-	else
-		return NULL;
-}
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
deleted file mode 100644
index 02f05eb8cf..0000000000
--- a/camel/camel-sasl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_SASL_H
-#define CAMEL_SASL_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-object.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-
-#define CAMEL_SASL_TYPE     (camel_sasl_get_type ())
-#define CAMEL_SASL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_TYPE, CamelSasl))
-#define CAMEL_SASL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_TYPE, CamelSaslClass))
-#define CAMEL_IS_SASL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_TYPE))
-
-typedef struct _CamelSasl {
-	CamelObject parent_object;
-	
-	char *service_name;
-	CamelService *service;
-	gboolean authenticated;
-} CamelSasl;
-
-
-typedef struct _CamelSaslClass {
-	CamelObjectClass parent_class;
-	
-	GByteArray *    (*challenge)   (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-
-} CamelSaslClass;
-
-
-/* Standard Camel function */
-CamelType  camel_sasl_get_type (void);
-
-/* public methods */
-GByteArray *camel_sasl_challenge        (CamelSasl *sasl, GByteArray *token, CamelException *ex);
-char       *camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex);
-
-gboolean    camel_sasl_authenticated    (CamelSasl *sasl);
-
-/* utility functions */
-CamelSasl  *camel_sasl_new              (const char *service_name, const char *mechanism, CamelService *service);
-
-GList                *camel_sasl_authtype_list (void);
-CamelServiceAuthType *camel_sasl_authtype      (const char *mechanism);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SASL_H */
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
deleted file mode 100644
index a6a87c0728..0000000000
--- a/camel/camel-search-private.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *	     Michael Zucchi <NotZed@Ximian.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *  Copyright 2001 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.
- *
- */
-
-/* (from glibc headers:
-   POSIX says that <sys/types.h> must be included (by the caller) before <regex.h>.  */
-#include <sys/types.h>
-#include <regex.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "camel-exception.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "e-util/e-sexp.h"
-#include <unicode.h>
-
-#include "camel-search-private.h"
-
-#define d(x)
-
-/* builds the regex into pattern */
-/* taken from camel-folder-search, with added isregex & exception parameter */
-/* Basically, we build a new regex, either based on subset regex's, or substrings,
-   that can be executed once over the whoel body, to match anything suitable.
-   This is more efficient than multiple searches, and probably most (naive) strstr
-   implementations, over long content.
-
-   A small issue is that case-insenstivity wont work entirely correct for utf8 strings. */
-int
-camel_search_build_match_regex (regex_t *pattern, camel_search_flags_t type, int argc,
-				struct _ESExpResult **argv, CamelException *ex)
-{
-	GString *match = g_string_new("");
-	int c, i, count=0, err;
-	char *word;
-	int flags;
-
-	/* build a regex pattern we can use to match the words, we OR them together */
-	if (argc>1)
-		g_string_append_c(match, '(');
-	for (i=0;i<argc;i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			if (count > 0)
-				g_string_append_c(match, '|');
-
-			word = argv[i]->value.string;
-			if (type & CAMEL_SEARCH_MATCH_REGEX) {
-				/* no need to escape because this should already be a valid regex */
-				g_string_append(match, word);
-			} else {
-				/* escape any special chars (not sure if this list is complete) */
-				if (type & CAMEL_SEARCH_MATCH_START)
-					g_string_append_c(match, '^');
-				while ((c = *word++)) {
-					if (strchr("*\\.()[]^$+", c) != NULL) {
-						g_string_append_c(match, '\\');
-					}
-					g_string_append_c(match, c);
-				}
-				if (type & CAMEL_SEARCH_MATCH_END)
-					g_string_append_c(match, '^');
-			}
-			count++;
-		} else {
-			g_warning("Invalid type passed to body-contains match function");
-		}
-	}
-	if (argc>1)
-		g_string_append_c(match, ')');
-	flags = REG_EXTENDED|REG_NOSUB;
-	if (type & CAMEL_SEARCH_MATCH_ICASE)
-		flags |= REG_ICASE;
-	err = regcomp(pattern, match->str, flags);
-	if (err != 0) {
-		/* regerror gets called twice to get the full error string 
-		   length to do proper posix error reporting */
-		int len = regerror(err, pattern, 0, 0);
-		char *buffer = g_malloc0(len + 1);
-
-		regerror(err, pattern, buffer, len);
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Regular expression compilation failed: %s: %s"),
-				     match->str, buffer);
-
-		regfree(pattern);
-	}
-	d(printf("Built regex: '%s'\n", match->str));
-	g_string_free(match, TRUE);
-	return err;
-}
-
-static unsigned char soundex_table[256] = {
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-static void
-soundexify (const gchar *sound, gchar code[5])
-{
-	guchar *c, last = '\0';
-	gint n;
-	
-	for (c = (guchar *) sound; *c && !isalpha (*c); c++);
-	code[0] = toupper (*c);
-	memset (code + 1, '0', 3);
-	for (n = 1; *c && n < 5; c++) {
-		guchar ch = soundex_table[*c];
-		
-		if (ch && ch != last) {
-			code[n++] = ch;
-			last = ch;
-		}
-	}
-	code[4] = '\0';
-}
-
-static gboolean
-header_soundex(const char *header, const char *match)
-{
-	char mcode[5], hcode[5];
-	const char *p;
-	char c;
-	GString *word;
-	int truth = FALSE;
-
-	soundexify(match, mcode);
-
-	/* split the header into words, and soundexify and compare each one */
-	/* FIXME: Should this convert to utf8, and split based on that, and what not?
-	   soundex only makes sense for us-ascii though ... */
-
-	word = g_string_new("");
-	p = header;
-	do {
-		c = *p++;
-		if (c == 0 || isspace(c)) {
-			if (word->len > 0) {
-				soundexify(word->str, hcode);
-				if (strcmp(hcode, mcode) == 0)
-					truth = TRUE;
-			}
-			g_string_truncate(word, 0);
-		} else if (isalpha(c))
-			g_string_append_c(word, c);
-	} while (c && !truth);
-	g_string_free(word, TRUE);
-
-	return truth;
-}
-
-#if 0
-/* Why do it this way when the unicode lib already has a function to do this? */
-static unicode_char_t
-utf8_get (const char **inp)
-{
-	guint32 c, v = 0, s, shift;
-	const unsigned char *p = *inp;
-
-	if (p == NULL)
-		return 0;
-
-	s = *p++;
-	if ((s & 0x80) == 0) {	/* 7 bit char */
-		v = s;
-	} else if (s>0xf7) {	/* invalid char, we can only have upto 4 bits encoded */
-		p = NULL;
-	} else if (s>=0xc0) {	/* valid start char */
-		shift = 0;
-		do {
-			c = *p++;
-			if ((c & 0xc0) == 0x80) {
-				v = (v<<6) | (c&0x3f);
-				shift += 5;
-			} else {
-				*inp = NULL;
-				return 0;
-			}
-			s <<= 1;
-		} while ((s & 0x80) != 0);
-		v |= s << shift;
-	} else {		/* invalid start char, internal char */
-		p = NULL;
-	}
-
-	*inp = p;
-	return v;
-}
-#endif
-
-static unicode_char_t
-utf8_get (const char **inp)
-{
-	const unsigned char *p = *inp;
-	unicode_char_t c;
-	
-	g_return_val_if_fail (p != NULL, 0);
-	
-	p = unicode_get_utf8 (p, &c);
-	*inp = p;
-	
-	return c;
-}
-
-static const char *
-camel_ustrstrcase (const char *haystack, const char *needle)
-{
-	unicode_char_t *nuni, *puni;
-	unicode_char_t u;
-	const char *p;
-	
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-
-	if (strlen(needle) == 0)
-		return haystack;
-	if (strlen(haystack) == 0)
-		return NULL;
-	
-	puni = nuni = alloca (sizeof (unicode_char_t) * strlen (needle));
-	
-	p = needle;
-	while ((u = utf8_get (&p)))
-		*puni++ = unicode_tolower (u);
-	
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p)
-		return NULL;
-	
-	p = haystack;
-	while ((u = utf8_get (&p))) {
-		unicode_char_t c;
-		
-		c = unicode_tolower (u);
-		/* We have valid stripped char */
-		if (c == nuni[0]) {
-			const gchar *q = p;
-			gint npos = 1;
-			
-			while (nuni + npos < puni) {
-				u = utf8_get (&q);
-				if (!q || !u)
-					return NULL;
-				
-				c = unicode_tolower (u);				
-				if (c != nuni[npos])
-					break;
-				
-				npos++;
-			}
-			
-			if (nuni + npos == puni)
-				return p;
-		}
-	}
-	
-	return NULL;
-}
-
-#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START {   \
-	if ((x) == (z)) {                              \
-		if ((y) == (z))                        \
-			return 0;                      \
-		else                                   \
-			return -1;                     \
-	} else if ((y) == (z))                         \
-		return 1;                              \
-} G_STMT_END
-
-static int
-camel_ustrcasecmp (const char *s1, const char *s2)
-{
-	unicode_char_t u1, u2 = 0;
-	
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	u1 = utf8_get (&s1);
-	u2 = utf8_get (&s2);
-	while (u1 && u2) {
-		u1 = unicode_tolower (u1);
-		u2 = unicode_tolower (u2);
-		if (u1 < u2)
-			return -1;
-		else if (u1 > u2)
-			return 1;
-		
-		u1 = utf8_get (&s1);
-		u2 = utf8_get (&s2);
-	}
-	
-	/* end of one of the strings ? */
-	CAMEL_SEARCH_COMPARE (u1, u2, 0);
-	
-	/* if we have invalid utf8 sequence ?  */
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	return 0;
-}
-
-static int
-camel_ustrncasecmp (const char *s1, const char *s2, size_t len)
-{
-	unicode_char_t u1, u2 = 0;
-	
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	u1 = utf8_get (&s1);
-	u2 = utf8_get (&s2);
-	while (len > 0 && u1 && u2) {
-		u1 = unicode_tolower (u1);
-		u2 = unicode_tolower (u2);
-		if (u1 < u2)
-			return -1;
-		else if (u1 > u2)
-			return 1;
-		
-		len--;
-		u1 = utf8_get (&s1);
-		u2 = utf8_get (&s2);
-	}
-	
-	if (len == 0)
-		return 0;
-	
-	/* end of one of the strings ? */
-	CAMEL_SEARCH_COMPARE (u1, u2, 0);
-	
-	/* if we have invalid utf8 sequence ?  */
-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);
-	
-	return 0;
-}
-
-
-/* searhces for match inside value, if match is mixed case, hten use case-sensitive,
-   else insensitive */
-gboolean
-camel_search_header_match (const char *value, const char *match, camel_search_match_t how)
-{
-	const char *p;
-	int vlen, mlen;
-
-	while (*value && isspace (*value))
-		value++;
-	
-	if (how == CAMEL_SEARCH_MATCH_SOUNDEX)
-		return header_soundex (value, match);
-	
-	vlen = strlen (value);
-	mlen = strlen (match);
-	if (vlen < mlen)
-		return FALSE;
-	
-	/* from dan the man, if we have mixed case, perform a case-sensitive match,
-	   otherwise not */
-	p = match;
-	while (*p) {
-		if (isupper(*p)) {
-			switch(how) {
-			case CAMEL_SEARCH_MATCH_EXACT:
-				return strcmp(value, match) == 0;
-			case CAMEL_SEARCH_MATCH_CONTAINS:
-				return strstr(value, match) != NULL;
-			case CAMEL_SEARCH_MATCH_STARTS:
-				return strncmp (value, match, mlen) == 0;
-			case CAMEL_SEARCH_MATCH_ENDS:
-				return strcmp (value + vlen - mlen, match) == 0;
-			default:
-				break;
-			}
-			return FALSE;
-		}
-		p++;
-	}
-	switch(how) {
-	case CAMEL_SEARCH_MATCH_EXACT:
-		return camel_ustrcasecmp(value, match) == 0;
-	case CAMEL_SEARCH_MATCH_CONTAINS:
-		return camel_ustrstrcase(value, match) != NULL;
-	case CAMEL_SEARCH_MATCH_STARTS:
-		return camel_ustrncasecmp (value, match, mlen) == 0;
-	case CAMEL_SEARCH_MATCH_ENDS:
-		return camel_ustrcasecmp (value + vlen - mlen, match) == 0;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-/* performs a 'slow' content-based match */
-/* there is also an identical copy of this in camel-filter-search.c */
-gboolean
-camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern)
-{
-	CamelDataWrapper *containee;
-	int truth = FALSE;
-	int parts, i;
-
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee == NULL)
-		return FALSE;
-
-	/* TODO: I find it odd that get_part and get_content_object do not
-	   add a reference, probably need fixing for multithreading */
-
-	/* using the object types is more accurate than using the mime/types */
-	if (CAMEL_IS_MULTIPART(containee)) {
-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));
-		for (i=0;i<parts && truth==FALSE;i++) {
-			CamelDataWrapper *part = (CamelDataWrapper *)camel_multipart_get_part(CAMEL_MULTIPART(containee), i);
-			if (part)
-				truth = camel_search_message_body_contains(part, pattern);
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-		/* for messages we only look at its contents */
-		truth = camel_search_message_body_contains((CamelDataWrapper *)containee, pattern);
-	} else if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*")) {
-		/* for all other text parts, we look inside, otherwise we dont care */
-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
-
-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)mem);
-		camel_stream_write((CamelStream *)mem, "", 1);
-		truth = regexec(pattern, mem->buffer->data, 0, NULL, 0) == 0;
-		camel_object_unref((CamelObject *)mem);
-	}
-	return truth;
-}
-
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
deleted file mode 100644
index aff881f32f..0000000000
--- a/camel/camel-search-private.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (C) 2001 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_SEARCH_PRIVATE_H
-#define _CAMEL_SEARCH_PRIVATE_H
-
-typedef enum {
-	CAMEL_SEARCH_MATCH_START = 1<<0,
-	CAMEL_SEARCH_MATCH_END = 1<<1,
-	CAMEL_SEARCH_MATCH_REGEX = 1<<2, /* disables the first 2 */
-	CAMEL_SEARCH_MATCH_ICASE = 1<<3,
-} camel_search_flags_t;
-
-typedef enum {
-	CAMEL_SEARCH_MATCH_EXACT,
-	CAMEL_SEARCH_MATCH_CONTAINS,
-	CAMEL_SEARCH_MATCH_STARTS,
-	CAMEL_SEARCH_MATCH_ENDS,
-	CAMEL_SEARCH_MATCH_SOUNDEX,
-} camel_search_match_t;
-
-/* builds a regex that represents a string search */
-int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, struct _ESExpResult **argv, CamelException *ex);
-gboolean camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern);
-
-gboolean camel_search_header_match(const char *value, const char *match, camel_search_match_t how);
-gboolean camel_search_header_soundex(const char *header, const char *match);
-
-#endif /* ! _CAMEL_SEARCH_PRIVATE_H */
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
deleted file mode 100644
index c4ca950baa..0000000000
--- a/camel/camel-seekable-stream.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include "camel-seekable-stream.h"
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelSeekableStream */
-#define CSS_CLASS(so) CAMEL_SEEKABLE_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static off_t seek        (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-static off_t stream_tell (CamelSeekableStream *stream);
-static int   reset       (CamelStream *stream);
-static int   set_bounds  (CamelSeekableStream *stream, off_t start, off_t end);
-
-static void
-camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_seekable_stream_class);
-
-	parent_class = CAMEL_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_STREAM_TYPE ) );
-
-	/* seekable stream methods */
-	camel_seekable_stream_class->seek = seek;
-	camel_seekable_stream_class->tell = stream_tell;
-	camel_seekable_stream_class->set_bounds = set_bounds;
-
-	/* camel stream methods overload */
-	camel_stream_class->reset = reset;
-}
-
-static void
-camel_seekable_stream_init (void *o)
-{
-	CamelSeekableStream *stream = (CamelSeekableStream *)o;
-
-	stream->bound_start = 0;
-	stream->bound_end = CAMEL_STREAM_UNBOUND;
-}
-
-CamelType
-camel_seekable_stream_get_type (void)
-{
-	static CamelType camel_seekable_stream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_seekable_stream_type == CAMEL_INVALID_TYPE) {
-		camel_seekable_stream_type = camel_type_register( CAMEL_STREAM_TYPE,
-								  "CamelSeekableStream",
-								  sizeof( CamelSeekableStream ),
-								  sizeof( CamelSeekableStreamClass ),
-								  (CamelObjectClassInitFunc) camel_seekable_stream_class_init,
-								  NULL,
-								  (CamelObjectInitFunc) camel_seekable_stream_init,
-								  NULL );
-	}
-
-	return camel_seekable_stream_type;
-}
-
-
-static off_t
-seek (CamelSeekableStream *stream, off_t offset,
-      CamelStreamSeekPolicy policy)
-{
-	g_warning ("CamelSeekableStream::seek called on default "
-		   "implementation\n");
-	return -1;
-}
-
-/**
- * camel_stream_seek:
- * @stream: a CamelStream object.
- * @offset: offset value
- * @policy: what to do with the offset
- *
- * Seek to the specified position in @stream.
- *
- * If @policy is CAMEL_STREAM_SET, seeks to @offset.
- *
- * If @policy is CAMEL_STREAM_CUR, seeks to the current position plus
- * @offset.
- *
- * If @policy is CAMEL_STREAM_END, seeks to the end of the stream plus
- * @offset.
- *
- * Regardless of @policy, the stream's final position will be clamped
- * to the range specified by its lower and upper bounds, and the
- * stream's eos state will be updated.
- *
- * Return value: new position, -1 if operation failed.
- **/
-off_t
-camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,
-			    CamelStreamSeekPolicy policy)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-
-	return CSS_CLASS (stream)->seek (stream, offset, policy);
-}
-
-
-static off_t
-stream_tell (CamelSeekableStream *stream)
-{
-	return stream->position;
-}
-
-/**
- * camel_seekable_stream_tell:
- * @stream: seekable stream object
- *
- * Get the current position of a seekable stream.
- *
- * Return value: the position.
- **/
-off_t
-camel_seekable_stream_tell (CamelSeekableStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-
-	return CSS_CLASS (stream)->tell (stream);
-}
-
-static int
-set_bounds (CamelSeekableStream *stream, off_t start, off_t end)
-{
-	/* store the bounds */
-	stream->bound_start = start;
-	stream->bound_end = end;
-
-	if (start > stream->position)
-		return camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET);
-
-	return 0;
-}
-
-/**
- * camel_seekable_stream_set_bounds:
- * @stream: a seekable stream
- * @start: the first valid position
- * @end: the first invalid position, or CAMEL_STREAM_UNBOUND
- *
- * Set the range of valid data this stream is allowed to cover.  If
- * there is to be no @end value, then @end should be set to
- * #CAMEL_STREAM_UNBOUND.
- *
- * Return value: -1 on error.
- **/
-int
-camel_seekable_stream_set_bounds (CamelSeekableStream *stream,
-				  off_t start, off_t end)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-	g_return_val_if_fail (end == CAMEL_STREAM_UNBOUND || end >= start, -1);
-
-	return CSS_CLASS (stream)->set_bounds (stream, start, end);
-}
-
-/* a default implementation of reset for seekable streams */
-static int
-reset (CamelStream *stream)
-{
-	CamelSeekableStream *seekable_stream;
-
-	seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-
-	return camel_seekable_stream_seek (seekable_stream,
-					   seekable_stream->bound_start,
-					   CAMEL_STREAM_SET);
-}
-
-
-
-
-
-
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
deleted file mode 100644
index 0fc67d59f8..0000000000
--- a/camel/camel-seekable-stream.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.h :stream based on unix filesystem */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SEEKABLE_STREAM_H
-#define CAMEL_SEEKABLE_STREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-stream.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define CAMEL_SEEKABLE_STREAM_TYPE     (camel_seekable_stream_get_type ())
-#define CAMEL_SEEKABLE_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStream))
-#define CAMEL_SEEKABLE_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass))
-#define CAMEL_IS_SEEKABLE_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_STREAM_TYPE))
-
-
-typedef enum
-{
-	CAMEL_STREAM_SET = SEEK_SET,
-	CAMEL_STREAM_CUR = SEEK_CUR,
-	CAMEL_STREAM_END = SEEK_END
-} CamelStreamSeekPolicy;
-
-#define CAMEL_STREAM_UNBOUND (~0)
-
-struct _CamelSeekableStream
-{
-	CamelStream parent_object;
-
-	off_t position;		/* current postion in the stream */
-	off_t bound_start;	/* first valid position */
-	off_t bound_end;	/* first invalid position */
-};
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	off_t (*seek)       (CamelSeekableStream *stream, off_t offset,
-			     CamelStreamSeekPolicy policy);
-	off_t (*tell)	    (CamelSeekableStream *stream);
-	int  (*set_bounds)  (CamelSeekableStream *stream,
-			     off_t start, off_t end);
-} CamelSeekableStreamClass;
-
-/* Standard Camel function */
-CamelType camel_seekable_stream_get_type (void);
-
-/* public methods */
-off_t    camel_seekable_stream_seek            (CamelSeekableStream *stream, off_t offset,
-						CamelStreamSeekPolicy policy);
-off_t	 camel_seekable_stream_tell    	       (CamelSeekableStream *stream);
-int	 camel_seekable_stream_set_bounds      (CamelSeekableStream *, off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SEEKABLE_STREAM_H */
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
deleted file mode 100644
index 294526ada3..0000000000
--- a/camel/camel-seekable-substream.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.c : file system based stream
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-seekable-substream.h"
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelSeekableSubStream */
-#define CSS_CLASS(so) CAMEL_SEEKABLE_SUBSTREAM_CLASS (CAMEL_OBJECT(so)->klass)
-
-static	int	 stream_read  (CamelStream *stream, char *buffer, unsigned int n);
-static	int	 stream_write (CamelStream *stream, const char *buffer, unsigned int n);
-static	int	 stream_flush (CamelStream *stream);
-static	int	 stream_close (CamelStream *stream);
-static	gboolean eos	      (CamelStream *stream);
-static	off_t	 stream_seek  (CamelSeekableStream *stream, off_t offset,
-			       CamelStreamSeekPolicy policy);
-
-static void
-camel_seekable_substream_class_init (CamelSeekableSubstreamClass *camel_seekable_substream_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_seekable_substream_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_seekable_substream_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->eos = eos;
-
-	camel_seekable_stream_class->seek = stream_seek;
-
-}
-
-static void
-camel_seekable_substream_finalize (CamelObject *object)
-{
-	CamelSeekableSubstream *seekable_substream =
-		CAMEL_SEEKABLE_SUBSTREAM (object);
-
-	if (seekable_substream->parent_stream)
-		camel_object_unref (CAMEL_OBJECT (seekable_substream->parent_stream));
-}
-
-
-CamelType
-camel_seekable_substream_get_type (void)
-{
-	static CamelType camel_seekable_substream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_seekable_substream_type == CAMEL_INVALID_TYPE) {
-		camel_seekable_substream_type = camel_type_register (camel_seekable_stream_get_type (), "CamelSeekableSubstream",
-								     sizeof (CamelSeekableSubstream),
-								     sizeof (CamelSeekableSubstreamClass),
-								     (CamelObjectClassInitFunc) camel_seekable_substream_class_init,
-								     NULL,
-								     NULL,
-								     (CamelObjectFinalizeFunc) camel_seekable_substream_finalize);
-	}
-
-	return camel_seekable_substream_type;
-}
-
-/**
- * camel_seekable_substream_new_with_seekable_stream_and_bounds:
- * @parent_stream: a seekable parent stream
- * @inf_bound: a lower bound
- * @sup_bound: an upper bound
- *
- * Creates a new CamelSeekableSubstream that references the portion
- * of @parent_stream from @inf_bound to @sup_bound. (If @sup_bound is
- * #CAMEL_STREAM_UNBOUND, it references to the end of stream, even if
- * the stream grows.)
- *
- * While the substream is open, the caller cannot assume anything about
- * the current position of @parent_stream. After the substream has been
- * closed, @parent_stream will stabilize again.
- *
- * Return value: the substream
- **/
-CamelStream *
-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream,
-							      off_t start, off_t end)
-{
-	CamelSeekableSubstream *seekable_substream;
-
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (parent_stream), NULL);
-
-	/* Create the seekable substream. */
-	seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (camel_object_new (camel_seekable_substream_get_type ()));
-
-	/* Initialize it. */
-	seekable_substream->parent_stream = parent_stream;
-	camel_object_ref (CAMEL_OBJECT (parent_stream));
-
-	/* Set the bound of the substream. We can ignore any possible error
-	 * here, because if we fail to seek now, it will try again later.
-	 */
-	camel_seekable_stream_set_bounds ((CamelSeekableStream *)seekable_substream, start, end);
-
-	return CAMEL_STREAM (seekable_substream);
-}
-
-static gboolean
-parent_reset (CamelSeekableSubstream *seekable_substream, CamelSeekableStream *parent)
-{
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (seekable_substream);
-
-	if (camel_seekable_stream_tell (parent) == seekable_stream->position)
-		return TRUE;
-
-	return camel_seekable_stream_seek (parent, seekable_stream->position, CAMEL_STREAM_SET)	== seekable_stream->position;
-}
-
-static int
-stream_read (CamelStream *stream, char *buffer, unsigned int n)
-{
-	CamelSeekableStream *parent;
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (stream);
-	int v;
-
-	if (n == 0)
-		return 0;
-
-	parent = seekable_substream->parent_stream;
-
-	/* Go to our position in the parent stream. */
-	if (!parent_reset (seekable_substream, parent)) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	/* Compute how many bytes should be read. */
-	if (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable_stream->bound_end -  seekable_stream->position, n);
-
-	if (n == 0) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	v = camel_stream_read (CAMEL_STREAM (parent), buffer, n);
-
-	/* ignore <0 - it's an error, let the caller deal */
-	if (v > 0)
-		seekable_stream->position += v;
-
-	return v;
-}
-
-static int
-stream_write (CamelStream *stream, const char *buffer, unsigned int n)
-{
-	CamelSeekableStream *parent;
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM(stream);
-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(stream);
-	int v;
-
-	if (n == 0)
-		return 0;
-
-	parent = seekable_substream->parent_stream;
-
-	/* Go to our position in the parent stream. */
-	if (!parent_reset (seekable_substream, parent)) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	/* Compute how many bytes should be written. */
-	if (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable_stream->bound_end -  seekable_stream->position, n);
-
-	if (n == 0) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	v = camel_stream_write((CamelStream *)parent, buffer, n);
-
-	/* ignore <0 - it's an error, let the caller deal */
-	if (v > 0)
-		seekable_stream->position += v;
-
-	return v;
-
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)stream;
-
-	return camel_stream_flush(CAMEL_STREAM(sus->parent_stream));
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	/* we dont really want to close the substream ... */
-	return 0;
-}
-
-static gboolean
-eos (CamelStream *stream)
-{
-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(stream);
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM(stream);
-	CamelSeekableStream *parent;
-	gboolean eos;
-
-	if (stream->eos)
-		eos = TRUE;
-	else {
-		parent = seekable_substream->parent_stream;
-		if (!parent_reset (seekable_substream, parent))
-			return TRUE;
-
-		eos = camel_stream_eos (CAMEL_STREAM (parent));
-		if (!eos && (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)) {
-			eos = seekable_stream->position >= seekable_stream->bound_end;
-		}
-	}
-
-	return eos;
-}
-
-static off_t
-stream_seek (CamelSeekableStream *seekable_stream, off_t offset,
-	     CamelStreamSeekPolicy policy)
-{
-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(seekable_stream);
-	CamelStream *stream = CAMEL_STREAM(seekable_stream);
-	off_t real_offset = 0;
-
-	stream->eos = FALSE;
-
-	switch (policy) {
-	case CAMEL_STREAM_SET:
-		real_offset = offset;
-		break;
-
-	case CAMEL_STREAM_CUR:
-		real_offset = seekable_stream->position + offset;
-		break;
-
-	case CAMEL_STREAM_END:
-		if (seekable_stream->bound_end == CAMEL_STREAM_UNBOUND) {
-			real_offset = camel_seekable_stream_seek(seekable_substream->parent_stream,
-								 offset,
-								 CAMEL_STREAM_END);
-			if (real_offset != -1) {
-				if (real_offset<seekable_stream->bound_start)
-					real_offset = seekable_stream->bound_start;
-				seekable_stream->position = real_offset;
-			}
-			return real_offset;
-		}
-		real_offset = seekable_stream->bound_end + offset;
-		break;
-	}
-
-	if (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)
-		real_offset = MIN (real_offset, seekable_stream->bound_end);
-
-	if (real_offset<seekable_stream->bound_start)
-		real_offset = seekable_stream->bound_start;
-
-	seekable_stream->position = real_offset;
-	return real_offset;
-}
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
deleted file mode 100644
index 6ac5588a42..0000000000
--- a/camel/camel-seekable-substream.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-seekable-substream.h: stream that piggybacks on another stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SEEKABLE_SUBSTREAM_H
-#define CAMEL_SEEKABLE_SUBSTREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-
-#define CAMEL_SEEKABLE_SUBSTREAM_TYPE       (camel_seekable_substream_get_type ())
-#define CAMEL_SEEKABLE_SUBSTREAM(obj)       (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))
-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k)   (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))
-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o)      (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE))
-
-struct _CamelSeekableSubstream
-{
-	CamelSeekableStream parent_object;
-
-	/*  --**-- Private fields --**--  */
-	CamelSeekableStream *parent_stream;
-};
-
-typedef struct {
-	CamelSeekableStreamClass parent_class;
-
-} CamelSeekableSubstreamClass;
-
-/* Standard Camel function */
-CamelType camel_seekable_substream_get_type (void);
-
-/* public methods */
-
-/* obtain a new seekable substream */
-CamelStream *
-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream    *parent_stream,
-							      off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SEEKABLE_SUBSTREAM_H */
diff --git a/camel/camel-service.c b/camel/camel-service.c
deleted file mode 100644
index bdaa807572..0000000000
--- a/camel/camel-service.c
+++ /dev/null
@@ -1,522 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-service.c : Abstract class for an email service */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-service.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-
-#include "camel-private.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelService */
-#define CSERV_CLASS(so) CAMEL_SERVICE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void construct (CamelService *service, CamelSession *session,
-		       CamelProvider *provider, CamelURL *url,
-		       CamelException *ex);
-static gboolean service_connect(CamelService *service, CamelException *ex);
-static gboolean service_disconnect(CamelService *service, gboolean clean,
-				   CamelException *ex);
-/*static gboolean is_connected (CamelService *service);*/
-static GList *  query_auth_types (CamelService *service, gboolean connect, CamelException *ex);
-static void     free_auth_types (CamelService *service, GList *authtypes);
-static char *   get_name (CamelService *service, gboolean brief);
-static char *   get_path (CamelService *service);
-
-
-static void
-camel_service_class_init (CamelServiceClass *camel_service_class)
-{
-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);
-
-	/* virtual method definition */
-	camel_service_class->construct = construct;
-	camel_service_class->connect = service_connect;
-	camel_service_class->disconnect = service_disconnect;
-	camel_service_class->query_auth_types = query_auth_types;
-	camel_service_class->free_auth_types = free_auth_types;
-	camel_service_class->get_name = get_name;
-	camel_service_class->get_path = get_path;
-}
-
-static void
-camel_service_init (void *o, void *k)
-{
-	CamelService *service = o;
-
-	service->priv = g_malloc0(sizeof(*service->priv));
-#ifdef ENABLE_THREADS
-	service->priv->connect_lock = e_mutex_new(E_MUTEX_REC);
-#endif
-}
-
-static void
-camel_service_finalize (CamelObject *object)
-{
-	CamelService *camel_service = CAMEL_SERVICE (object);
-
-	if (camel_service->connected) {
-		CamelException ex;
-
-		/*g_warning ("camel_service_finalize: finalizing while still connected!");*/
-		camel_exception_init (&ex);
-		CSERV_CLASS (camel_service)->disconnect (camel_service, FALSE, &ex);
-		if (camel_exception_is_set (&ex)) {
-			g_warning ("camel_service_finalize: silent disconnect failure: %s",
-				   camel_exception_get_description(&ex));
-		}
-		camel_exception_clear (&ex);
-	}
-
-	if (camel_service->url)
-		camel_url_free (camel_service->url);
-	if (camel_service->session)
-		camel_object_unref (CAMEL_OBJECT (camel_service->session));
-
-#ifdef ENABLE_THREADS
-	e_mutex_destroy(camel_service->priv->connect_lock);
-#endif
-	g_free(camel_service->priv);
-}
-
-
-
-CamelType
-camel_service_get_type (void)
-{
-	static CamelType camel_service_type = CAMEL_INVALID_TYPE;
-
-	if (camel_service_type == CAMEL_INVALID_TYPE) {
-		camel_service_type =
-			camel_type_register (CAMEL_OBJECT_TYPE, "CamelService",
-					     sizeof (CamelService),
-					     sizeof (CamelServiceClass),
-					     (CamelObjectClassInitFunc) camel_service_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_service_init,
-					     camel_service_finalize );
-	}
-	
-	return camel_service_type;
-}
-
-
-static void
-construct (CamelService *service, CamelSession *session,
-	   CamelProvider *provider, CamelURL *url, CamelException *ex)
-{
-	char *url_string;
-
-	if (((provider->url_flags & CAMEL_URL_NEED_USER)
-	     == CAMEL_URL_NEED_USER) &&
-	    (url->user == NULL || url->user[0] == '\0')) {
-		url_string = camel_url_to_string (url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a username component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	} else if (((provider->url_flags & CAMEL_URL_NEED_HOST)
-		    == CAMEL_URL_NEED_HOST) &&
-		   (url->host == NULL || url->host[0] == '\0')) {
-		url_string = camel_url_to_string (url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a host component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	} else if (((provider->url_flags & CAMEL_URL_NEED_PATH)
-		    == CAMEL_URL_NEED_PATH) &&
-		   (url->path == NULL || url->path[0] == '\0')) {
-		url_string = camel_url_to_string (url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a path component"),
-				      url_string);
-		g_free (url_string);
-		return;
-	}
-
-	service->provider = provider;
-	service->url = url;
-	service->session = session;
-	camel_object_ref (CAMEL_OBJECT (session));
-
-	service->connected = FALSE;
-}
-
-/**
- * camel_service_construct:
- * @service: the CamelService
- * @session: the session for the service
- * @provider: the service's provider
- * @url: the default URL for the service (may be NULL)
- * @ex: a CamelException
- *
- * Constructs a CamelService initialized with the given parameters.
- **/
-void
-camel_service_construct (CamelService *service, CamelSession *session,
-			 CamelProvider *provider, CamelURL *url,
-			 CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_SERVICE (service));
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-
-	CSERV_CLASS (service)->construct (service, session, provider, url, ex);
-}
-
-
-static gboolean
-service_connect (CamelService *service, CamelException *ex)
-{
-	/* Things like the CamelMboxStore can validly
-	 * not define a connect function.
-	 */
-	 return TRUE;
-}
-
-/**
- * camel_service_connect:
- * @service: CamelService object
- * @ex: a CamelException
- *
- * Connect to the service using the parameters it was initialized
- * with.
- *
- * Return value: whether or not the connection succeeded
- **/
-
-gboolean
-camel_service_connect (CamelService *service, CamelException *ex)
-{
-	gboolean ret = FALSE;
-
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), FALSE);
-	g_return_val_if_fail (service->session != NULL, FALSE);
-	g_return_val_if_fail (service->url != NULL, FALSE);
-
-	CAMEL_SERVICE_LOCK(service, connect_lock);
-
-	if (service->connected) {
-		/* But we're still connected, so no exception
-		 * and return true.
-		 */
-		g_warning ("camel_service_connect: trying to connect to an already connected service");
-		ret = TRUE;
-	} else if (CSERV_CLASS (service)->connect (service, ex)) {
-		service->connected = TRUE;
-		ret = TRUE;
-	}
-
-	CAMEL_SERVICE_UNLOCK(service, connect_lock);
-
-	return ret;
-}
-
-static gboolean
-service_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	/*service->connect_level--;*/
-
-	/* We let people get away with not having a disconnect
-	 * function -- CamelMboxStore, for example. 
-	 */
-
-	return TRUE;
-}
-
-/**
- * camel_service_disconnect:
- * @service: CamelService object
- * @clean: whether or not to try to disconnect cleanly.
- * @ex: a CamelException
- *
- * Disconnect from the service. If @clean is %FALSE, it should not
- * try to do any synchronizing or other cleanup of the connection.
- *
- * Return value: whether or not the disconnection succeeded without
- * errors. (Consult @ex if %FALSE.)
- **/
-gboolean
-camel_service_disconnect (CamelService *service, gboolean clean,
-			  CamelException *ex)
-{
-	gboolean res = TRUE;
-
-	CAMEL_SERVICE_LOCK(service, connect_lock);
-
-	if (service->connected) {
-		res = CSERV_CLASS (service)->disconnect (service, clean, ex);
-		service->connected = FALSE;
-	}
-
-	CAMEL_SERVICE_UNLOCK(service, connect_lock);
-
-	return res;
-}
-
-/**
- * camel_service_get_url:
- * @service: a service
- *
- * Returns the URL representing a service. The returned URL must be
- * freed when it is no longer needed. For security reasons, this
- * routine does not return the password.
- *
- * Return value: the url name
- **/
-char *
-camel_service_get_url (CamelService *service)
-{
-	return camel_url_to_string(service->url, FALSE);
-}
-
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	g_warning ("CamelService::get_name not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service)));
-	return g_strdup ("???");
-}		
-
-/**
- * camel_service_get_name:
- * @service: the service
- * @brief: whether or not to use a briefer form
- *
- * This gets the name of the service in a "friendly" (suitable for
- * humans) form. If @brief is %TRUE, this should be a brief description
- * such as for use in the folder tree. If @brief is %FALSE, it should
- * be a more complete and mostly unambiguous description.
- *
- * Return value: the description, which the caller must free.
- **/
-char *
-camel_service_get_name (CamelService *service, gboolean brief)
-{
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	g_return_val_if_fail (service->url, NULL);
-
-	return CSERV_CLASS (service)->get_name (service, brief);
-}
-
-
-static char *
-get_path (CamelService *service)
-{
-	GString *gpath;
-	char *path;
-	CamelURL *url = service->url;
-	int flags = service->provider->url_flags;
-
-	/* A sort of ad-hoc default implementation that works for our
-	 * current set of services.
-	 */
-
-	gpath = g_string_new (service->provider->protocol);
-	if (flags & CAMEL_URL_ALLOW_USER) {
-		if (flags & CAMEL_URL_ALLOW_HOST) {
-			g_string_sprintfa (gpath, "/%s@%s",
-					   url->user ? url->user : "",
-					   url->host ? url->host : "");
-		} else {
-			g_string_sprintfa (gpath, "/%s%s",
-			   url->user ? url->user : "",
-			   ((flags & CAMEL_URL_NEED_USER) == CAMEL_URL_NEED_USER) ? "" : "@");
-		}
-	} else if (flags & CAMEL_URL_ALLOW_HOST) {
-		g_string_sprintfa (gpath, "/%s%s",
-		   ((flags & CAMEL_URL_NEED_HOST) == CAMEL_URL_NEED_HOST) ? "" : "@",
-		   url->host ? url->host : "");
-	}
-	if ((flags & CAMEL_URL_NEED_PATH) == CAMEL_URL_NEED_PATH) {
-		g_string_sprintfa (gpath, "%s%s",
-				   *url->path == '/' ? "" : "/",
-				   url->path);
-	}
-
-	path = gpath->str;
-	g_string_free (gpath, FALSE);
-	return path;
-}		
-
-/**
- * camel_service_get_path:
- * @service: the service
- *
- * This gets a valid UNIX relative path describing the service, which
- * is guaranteed to be different from the path returned for any
- * different service. This path MUST start with the name of the
- * provider, followed by a "/", but after that, it is up to the
- * provider.
- *
- * Return value: the path, which the caller must free.
- **/
-char *
-camel_service_get_path (CamelService *service)
-{
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	g_return_val_if_fail (service->url, NULL);
-
-	return CSERV_CLASS (service)->get_path (service);
-}
-
-
-/**
- * camel_service_get_session:
- * @service: a service
- *
- * Returns the CamelSession associated with the service.
- *
- * Return value: the session
- **/
-CamelSession *
-camel_service_get_session (CamelService *service)
-{
-	return service->session;
-}
-
-/**
- * camel_service_get_provider:
- * @service: a service
- *
- * Returns the CamelProvider associated with the service.
- *
- * Return value: the provider
- **/
-CamelProvider *
-camel_service_get_provider (CamelService *service)
-{
-	return service->provider;
-}
-
-static GList *
-query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	return NULL;
-}
-
-/**
- * camel_service_query_auth_types:
- * @service: a CamelService
- * @connect: specifies whether or not to connect
- * @ex: a CamelException
- *
- * This is used by the mail source wizard to get the list of
- * authentication types supported by the protocol, and information
- * about them.
- *
- * This may be called on a service with or without an associated URL.
- * If there is no URL, the routine must return a generic answer. If
- * the service does have a URL, the routine should connect to the
- * server and query what authentication mechanisms it supports only if
- * @connect is TRUE. If it cannot do that for any reason, it should
- * set @ex accordingly.
- *
- * Return value: a list of CamelServiceAuthType records. The caller
- * must free the list by calling camel_service_free_auth_types when
- * it is done.
- **/
-GList *
-camel_service_query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	GList *ret;
-
-	/* note that we get the connect lock here, which means the callee
-	   must not call the connect functions itself */
-	CAMEL_SERVICE_LOCK(service, connect_lock);
-	ret = CSERV_CLASS (service)->query_auth_types (service, connect, ex);
-	CAMEL_SERVICE_UNLOCK(service, connect_lock);
-
-	return ret;
-}
-
-static void
-free_auth_types (CamelService *service, GList *authtypes)
-{
-	;
-}
-
-/**
- * camel_service_free_auth_types:
- * @service: the service
- * @authtypes: the list of authtypes
- *
- * This frees the data allocated by camel_service_query_auth_types().
- **/
-void
-camel_service_free_auth_types (CamelService *service, GList *authtypes)
-{
-	CSERV_CLASS (service)->free_auth_types (service, authtypes);
-}
-
-
-/* URL utility routines */
-
-/**
- * camel_service_gethost:
- * @service: a CamelService
- * @ex: a CamelException
- *
- * This is a convenience function to do a gethostbyname on the host
- * for the service's URL.
- *
- * Return value: a (statically-allocated) hostent.
- **/
-struct hostent *
-camel_service_gethost (CamelService *service, CamelException *ex)
-{
-	struct hostent *h;
-	char *hostname;
-
-#warning "This needs to use gethostbyname_r()"
-
-	if (service->url->host)
-		hostname = service->url->host;
-	else
-		hostname = "localhost";
-	h = gethostbyname (hostname);
-	if (!h) {
-		extern int h_errno;
-
-		if (h_errno == HOST_NOT_FOUND || h_errno == NO_DATA) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("No such host %s."), hostname);
-		} else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Temporarily unable to look "
-						"up hostname %s."), hostname);
-		}
-		return NULL;
-	}
-
-	return h;
-}
diff --git a/camel/camel-service.h b/camel/camel-service.h
deleted file mode 100644
index aeb71c933d..0000000000
--- a/camel/camel-service.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-service.h : Abstract class for an email service */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SERVICE_H
-#define CAMEL_SERVICE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-provider.h>
-#include <netdb.h>
-
-#define CAMEL_SERVICE_TYPE     (camel_service_get_type ())
-#define CAMEL_SERVICE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))
-#define CAMEL_SERVICE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))
-#define CAMEL_IS_SERVICE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))
-
-
-struct _CamelService {
-	CamelObject parent_object;
-	struct _CamelServicePrivate *priv;
-
-	CamelSession *session;
-	CamelProvider *provider;
-	gboolean connected;
-	CamelURL *url;
-};
-
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	void      (*construct)         (CamelService *service,
-					CamelSession *session,
-					CamelProvider *provider,
-					CamelURL *url,
-					CamelException *ex);
-
-	gboolean  (*connect)           (CamelService *service, 
-					CamelException *ex);
-	gboolean  (*disconnect)        (CamelService *service,
-					gboolean clean,
-					CamelException *ex);
-
-	GList *   (*query_auth_types)  (CamelService *service,
-					gboolean connect,
-					CamelException *ex);
-	void      (*free_auth_types)   (CamelService *service,
-					GList *authtypes);
-
-	char *    (*get_name)          (CamelService *service,
-					gboolean brief);
-	char *    (*get_path)          (CamelService *service);
-
-} CamelServiceClass;
-
-
-/* query_auth_types returns a GList of these */
-typedef struct {
-	char *name, *description, *authproto;
-	gboolean need_password;
-} CamelServiceAuthType;
-
-
-/* public methods */
-void                camel_service_construct          (CamelService *service,
-						      CamelSession *session,
-						      CamelProvider *provider,
-						      CamelURL *url, 
-						      CamelException *ex);
-gboolean            camel_service_connect            (CamelService *service, 
-						      CamelException *ex);
-gboolean            camel_service_disconnect         (CamelService *service,
-						      gboolean clean,
-						      CamelException *ex);
-char *              camel_service_get_url            (CamelService *service);
-char *              camel_service_get_name           (CamelService *service,
-						      gboolean brief);
-char *              camel_service_get_path           (CamelService *service);
-CamelSession *      camel_service_get_session        (CamelService *service);
-CamelProvider *     camel_service_get_provider       (CamelService *service);
-GList *             camel_service_query_auth_types   (CamelService *service,
-						      gboolean connect,
-						      CamelException *ex);
-void                camel_service_free_auth_types    (CamelService *service,
-						      GList *authtypes);
-
-/* convenience functions */
-struct hostent *    camel_service_gethost            (CamelService *service,
-						      CamelException *ex);
-
-
-/* Standard Camel function */
-CamelType camel_service_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SERVICE_H */
-
diff --git a/camel/camel-session.c b/camel/camel-session.c
deleted file mode 100644
index f8e27c382b..0000000000
--- a/camel/camel-session.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-session.c : Abstract class for an email session */
-
-/*
- *
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include "camel-session.h"
-#include "camel-store.h"
-#include "camel-transport.h"
-#include "camel-exception.h"
-#include "string-utils.h"
-#include "camel-url.h"
-#include "hash-table-utils.h"
-#include <gal/util/e-util.h>
-#include "camel-vee-store.h"
-
-#include "camel-private.h"
-
-#define d(x)
-
-static CamelObjectClass *parent_class;
-
-/* The vfolder provider is always avilable */
-static CamelProvider vee_provider = {
-	"vfolder",
-	N_("Virtual folder email provider"),
-
-	N_("For reading mail as a query of another set of folders"),
-
-	"vfolder",
-
-	0,
-
-	0,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-static void
-camel_session_init (CamelSession *session)
-{
-	session->modules = camel_provider_init ();
-	session->providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	session->priv = g_malloc0(sizeof(*session->priv));
-#ifdef ENABLE_THREADS
-	session->priv->lock = g_mutex_new();
-#endif	
-}
-
-static gboolean
-camel_session_destroy_provider (gpointer key, gpointer value, gpointer user_data)
-{
-	CamelProvider *prov = (CamelProvider *)value;
-
-	g_hash_table_destroy (prov->service_cache);
-
-	return TRUE;
-}
-
-static void
-camel_session_finalise (CamelObject *o)
-{
-	CamelSession *session = (CamelSession *)o;
-
-	g_free(session->storage_path);
-	g_hash_table_foreach_remove (session->providers,
-				     camel_session_destroy_provider, NULL);
-	g_hash_table_destroy (session->providers);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(session->priv->lock);
-#endif	
-
-	g_free(session->priv);
-}
-
-static void
-camel_session_class_init (CamelSessionClass *camel_session_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-CamelType
-camel_session_get_type (void)
-{
-	static CamelType camel_session_type = CAMEL_INVALID_TYPE;
-
-	if (camel_session_type == CAMEL_INVALID_TYPE) {
-		camel_session_type = camel_type_register (camel_object_get_type (), "CamelSession",
-							  sizeof (CamelSession),
-							  sizeof (CamelSessionClass),
-							  (CamelObjectClassInitFunc) camel_session_class_init,
-							  NULL,
-							  (CamelObjectInitFunc) camel_session_init,
-							  (CamelObjectFinalizeFunc) camel_session_finalise);
-	}
-
-	return camel_session_type;
-}
-
-/**
- * camel_session_new:
- * @storage_path: Path to a directory Camel can use for persistent storage.
- * (This directory must already exist.)
- * @authenticator: A callback for discussing authentication information
- * @registrar: A callback for registering timeout callbacks
- * @remove: A callback for removing timeout callbacks
- *
- * This creates a new CamelSession object, which represents global state
- * for the Camel library, and contains callbacks that can be used to
- * interact with the main application.
- *
- * Return value: the new CamelSession
- **/
-CamelSession *
-camel_session_new (const char *storage_path,
-		   CamelAuthCallback authenticator,
-		   CamelTimeoutRegisterCallback registrar,
-		   CamelTimeoutRemoveCallback remover)
-{
-	CamelSession *session = CAMEL_SESSION (camel_object_new (CAMEL_SESSION_TYPE));
-
-	session->storage_path = g_strdup (storage_path);
-	session->authenticator = authenticator;
-	session->registrar = registrar;
-	session->remover = remover;
-
-	vee_provider.object_types[CAMEL_PROVIDER_STORE] = camel_vee_store_get_type();
-	vee_provider.service_cache = g_hash_table_new(camel_url_hash, camel_url_equal);
-	camel_session_register_provider(session, &vee_provider);
-
-	return session;
-}
-
-/**
- * camel_session_register_provider:
- * @session: a session object
- * @protocol: the protocol the provider provides for
- * @provider: provider object
- *
- * Registers a protocol to provider mapping for the session.
- *
- * Assumes the session lock has already been obtained,
- * which is the case for automatically loaded provider modules.
- **/
-void
-camel_session_register_provider (CamelSession *session,
-				 CamelProvider *provider)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (provider != NULL);
-
-	g_hash_table_insert (session->providers, provider->protocol, provider);
-}
-
-static void
-ensure_loaded (gpointer key, gpointer value, gpointer user_data)
-{
-	CamelSession *session = user_data;
-	char *name = key;
-	char *path = value;
-
-	if (!g_hash_table_lookup (session->providers, name)) {
-		CamelException ex;
-
-		camel_exception_init (&ex);
-		camel_provider_load (session, path, &ex);
-		camel_exception_clear (&ex);
-	}
-}
-
-static gint
-provider_compare (gconstpointer a, gconstpointer b)
-{
-	const CamelProvider *cpa = (const CamelProvider *)a;
-	const CamelProvider *cpb = (const CamelProvider *)b;
-
-	return strcmp (cpa->name, cpb->name);
-}
-
-static void
-add_to_list (gpointer key, gpointer value, gpointer user_data)
-{
-	GList **list = user_data;
-	CamelProvider *prov = value;
-
-	*list = g_list_insert_sorted (*list, prov, provider_compare);
-}
-
-/**
- * camel_session_list_providers:
- * @session: the session
- * @load: whether or not to load in providers that are not already loaded
- *
- * This returns a list of available providers in this session. If @load
- * is %TRUE, it will first load in all available providers that haven't
- * yet been loaded.
- *
- * Return value: a GList of providers, which the caller must free.
- **/
-GList *
-camel_session_list_providers (CamelSession *session, gboolean load)
-{
-	GList *list;
-
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-
-	CAMEL_SESSION_LOCK(session, lock);
-
-	if (load)
-		g_hash_table_foreach (session->modules, ensure_loaded, session);
-
-	list = NULL;
-	g_hash_table_foreach (session->providers, add_to_list, &list);
-
-	CAMEL_SESSION_UNLOCK(session, lock);
-
-	return list;
-}
-
-static void
-service_cache_remove (CamelService *service, gpointer event_data, gpointer user_data)
-{
-	CamelProvider *provider;
-	CamelSession *session = CAMEL_SESSION (user_data);
-
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (service != NULL);
-	g_return_if_fail (service->url != NULL);
-	
-	CAMEL_SESSION_LOCK(session, lock);
-
-	provider = g_hash_table_lookup (session->providers, service->url->protocol);
-	g_hash_table_remove (provider->service_cache, service->url);
-
-	CAMEL_SESSION_UNLOCK(session, lock);
-}
-
-/**
- * camel_session_get_service:
- * @session: the CamelSession
- * @url_string: a Camel URL describing the service to get
- * @type: the provider type (%CAMEL_PROVIDER_STORE or
- * %CAMEL_PROVIDER_TRANSPORT) to get, since some URLs may be able
- * to specify either type.
- * @ex: a CamelException
- *
- * This resolves a CamelURL into a CamelService, including loading the
- * provider library for that service if it has not already been loaded.
- *
- * Services are cached, and asking for "the same" @url_string multiple
- * times will return the same CamelService (with its reference count
- * incremented by one each time). What constitutes "the same" URL
- * depends in part on the provider.
- *
- * Return value: the requested CamelService, or %NULL
- **/
-CamelService *
-camel_session_get_service (CamelSession *session, const char *url_string,
-			   CamelProviderType type, CamelException *ex)
-{
-	CamelURL *url;
-	CamelProvider *provider;
-	CamelService *service;
-
-	url = camel_url_new (url_string, ex);
-	if (!url)
-		return NULL;
-
-	/* We need to look up the provider so we can then lookup
-	   the service in the provider's cache */
-	CAMEL_SESSION_LOCK(session, lock);
-	provider = g_hash_table_lookup (session->providers, url->protocol);
-	if (!provider) {
-		/* See if there's one we can load. */
-		char *path;
-
-		path = g_hash_table_lookup (session->modules, url->protocol);
-		if (path) {
-			camel_provider_load (session, path, ex);
-			if (camel_exception_get_id (ex) !=
-			    CAMEL_EXCEPTION_NONE) {
-				camel_url_free (url);
-				CAMEL_SESSION_UNLOCK(session, lock);
-				return NULL;
-			}
-		}
-		provider = g_hash_table_lookup (session->providers, url->protocol);
-	}
-
-	if (!provider || !provider->object_types[type]) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("No provider available for protocol `%s'"),
-				      url->protocol);
-		camel_url_free (url);
-		CAMEL_SESSION_UNLOCK(session, lock);
-		return NULL;
-	}
-	
-	/* Now look up the service in the provider's cache */
-	service = g_hash_table_lookup (provider->service_cache, url);
-	if (service != NULL) {
-		camel_url_free (url);
-		camel_object_ref (CAMEL_OBJECT (service));
-		CAMEL_SESSION_UNLOCK(session, lock);
-		return service;
-	}
-
-	service = (CamelService *)camel_object_new (provider->object_types[type]);
-	camel_service_construct (service, session, provider, url, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (service));
-		service = NULL;
-	} else {
-		g_hash_table_insert (provider->service_cache, url, service);
-		camel_object_hook_event (CAMEL_OBJECT (service), "finalize", (CamelObjectEventHookFunc) service_cache_remove, session);
-	}
-	CAMEL_SESSION_UNLOCK(session, lock);
-
-	return service;
-}
-
-/**
- * camel_session_get_service_connected:
- * @session: the CamelSession
- * @url_string: a Camel URL describing the service to get
- * @type: the provider type
- * @ex: a CamelException
- *
- * This works like camel_session_get_service(), but also ensures that
- * the returned service will have been successfully connected (via
- * camel_service_connect().)
- *
- * Return value: the requested CamelService, or %NULL
- **/
-CamelService *
-camel_session_get_service_connected (CamelSession *session,
-				     const char *url_string,
-				     CamelProviderType type,
-				     CamelException *ex)
-{
-	CamelService *svc;
-
-	svc = camel_session_get_service (session, url_string, type, ex);
-	if (svc == NULL)
-		return NULL;
-
-	if (svc->connected == FALSE) {
-		if (camel_service_connect (svc, ex) == FALSE) {
-			camel_object_unref (CAMEL_OBJECT (svc));
-			return NULL;
-		}
-	}
-
-	return svc;
-}
-
-/**
- * camel_session_get_storage_path:
- * @session: session object
- * @service: a CamelService
- * @ex: a CamelException
- *
- * This returns the path to a directory which the service can use for
- * its own purposes. Data stored there will remain between Evolution
- * sessions. No code outside of that service should ever touch the
- * files in this directory. If the directory does not exist, it will
- * be created.
- *
- * Return value: the path (which the caller must free), or %NULL if
- * an error occurs.
- **/
-char *
-camel_session_get_storage_path (CamelSession *session, CamelService *service,
-				CamelException *ex)
-{
-	char *path, *p;
-
-	p = camel_service_get_path (service);
-	path = g_strdup_printf ("%s/%s", session->storage_path, p);
-	g_free (p);
-
-	if (access (path, F_OK) == 0)
-		return path;
-
-	if (e_mkdir_hier (path, S_IRWXU) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create directory %s:\n%s"),
-				      path, g_strerror (errno));
-		g_free (path);
-		return NULL;
-	}
-
-	return path;
-}
-
-/**
- * camel_session_query_authenticator: query the session authenticator
- * @session: session object
- * @mode: %CAMEL_AUTHENTICATOR_ASK or %CAMEL_AUTHENTICATOR_TELL
- * @data: prompt to query user with, or data to cache
- * @secret: whether or not the data is secret (eg, a password)
- * @service: the service this query is being made by
- * @item: an identifier, unique within this service, for the information
- * @ex: a CamelException
- *
- * This function is used by a CamelService to discuss authentication
- * information with the application.
- *
- * @service and @item together uniquely identify the piece of data the
- * caller is concerned with.
- *
- * If @mode is %CAMEL_AUTHENTICATOR_ASK, then @data is a question to
- * ask the user (if the application doesn't already have the answer
- * cached). If @secret is set, the user's input should not be echoed
- * back. The authenticator should set @ex to
- * %CAMEL_EXCEPTION_USER_CANCEL if the user did not provide the
- * information. The caller must g_free() the information returned when
- * it is done with it.
- *
- * If @mode is %CAMEL_AUTHENTICATOR_TELL, then @data is information
- * that the application should cache, or %NULL if it should stop
- * caching anything about that datum (eg, because the data is a
- * password that turned out to be incorrect).
- *
- * Return value: the authentication information or %NULL.
- **/
-char *
-camel_session_query_authenticator (CamelSession *session,
-				   CamelAuthCallbackMode mode,
-				   char *prompt, gboolean secret,
-				   CamelService *service, char *item,
-				   CamelException *ex)
-{
-	return session->authenticator (mode, prompt, secret,
-				       service, item, ex);
-}
-
-#ifdef U_CANT_TOUCH_THIS
-/**
- * camel_session_query_cert_authenticator:
- * @session: session object
- * @prompt: prompt to query user with
- *
- * This function is used by SSL to discuss certificate authentication
- * information with the application and/or user. Allows the user to
- * override the SSL certificate authenticator, which, at this point,
- * must have failed to authenticate the server.
- *
- * UI should be a Yes/No prompt probably defaulting to No.
- *
- * Return value: TRUE if the user decides that the SSL connection
- * should continue with the untrusted server or FALSE otherwise.
- **/
-gboolean
-camel_session_query_cert_authenticator (CamelSession *session,
-					char *prompt)
-{
-	return session->cert_authenticator (prompt);
-}
-#endif /* U_CANT_TOUCH_THIS */
-
-
-/**
- * camel_session_register_timeout: Register a timeout to be called
- * periodically.
- *
- * @session: the CamelSession
- * @interval: the number of milliseconds interval between calls
- * @callback: the function to call
- * @user_data: extra data to be passed to the callback
- *
- * This function will use the registrar callback provided upon
- * camel_session_new to register the timeout. The callback will
- * be called every @interval milliseconds until it returns @FALSE.
- * It will be passed one argument, @user_data.
- *
- * Returns a nonzero handle that can be used with 
- * camel_session_remove_timeout on success, and 0 on failure to 
- * register the timeout.
- **/
-guint
-camel_session_register_timeout (CamelSession *session,
-				guint32 interval,
-				CamelTimeoutCallback callback,
-				gpointer user_data)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
-
-	return session->registrar (interval, callback, user_data);
-}
-
-/**
- * camel_session_remove_timeout: Remove a previously registered
- * timeout.
- *
- * @session: the CamelSession
- * @handle: a value returned from camel_session_register_timeout
- *
- * This function will use the remover callback provided upon
- * camel_session_new to remove the timeout.
- *
- * Returns TRUE on success and FALSE on failure.
- **/
-gboolean
-camel_session_remove_timeout (CamelSession *session, guint handle)
-{
-	return session->remover (handle);
-}
diff --git a/camel/camel-session.h b/camel/camel-session.h
deleted file mode 100644
index c530c6ffe6..0000000000
--- a/camel/camel-session.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-session.h : Abstract class for an email session */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SESSION_H
-#define CAMEL_SESSION_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-provider.h>
-
-#define CAMEL_SESSION_TYPE     (camel_session_get_type ())
-#define CAMEL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))
-#define CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))
-#define CAMEL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SESSION_TYPE))
-
-
-typedef enum {
-	CAMEL_AUTHENTICATOR_ASK, CAMEL_AUTHENTICATOR_TELL
-} CamelAuthCallbackMode;
-
-typedef char *(*CamelAuthCallback) (CamelAuthCallbackMode mode,
-				    char *data, gboolean secret,
-				    CamelService *service, char *item,
-				    CamelException *ex);
-
-#ifdef U_CANT_TOUCH_THIS
-/* this is just a guess as to what we'll actually need */
-typedef gboolean (*CamelBadCertCallback) (char *data);
-#endif
-
-typedef gboolean (*CamelTimeoutCallback) (gpointer data);
-typedef guint (*CamelTimeoutRegisterCallback) (guint32 interval,
-					       CamelTimeoutCallback cb,
-					       gpointer camel_data);
-typedef gboolean (*CamelTimeoutRemoveCallback) (guint id);
-
-struct _CamelSession
-{
-	CamelObject parent_object;
-	struct _CamelSessionPrivate *priv;
-
-	char *storage_path;
-	CamelAuthCallback authenticator;
-#ifdef U_CANT_TOUCH_THIS
-	CamelBadCertCallback cert_authenticator;
-#endif
-	CamelTimeoutRegisterCallback registrar;
-	CamelTimeoutRemoveCallback remover;
-
-	GHashTable *providers, *modules;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-} CamelSessionClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_session_get_type (void);
-
-
-CamelSession *  camel_session_new (const char *storage_path,
-				   CamelAuthCallback authenticator,
-				   CamelTimeoutRegisterCallback registrar,
-				   CamelTimeoutRemoveCallback remover);
-
-void            camel_session_register_provider       (CamelSession *session,
-						       CamelProvider *provider);
-GList *         camel_session_list_providers          (CamelSession *session,
-						       gboolean load);
-
-CamelService *  camel_session_get_service             (CamelSession *session,
-						       const char *url_string,
-						       CamelProviderType type,
-						       CamelException *ex);
-CamelService *  camel_session_get_service_connected   (CamelSession *session, 
-						       const char *url_string,
-						       CamelProviderType type, 
-						       CamelException *ex);
-
-#define camel_session_get_store(session, url_string, ex) \
-	((CamelStore *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_STORE, ex))
-#define camel_session_get_transport(session, url_string, ex) \
-	((CamelTransport *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))
-
-char *          camel_session_get_storage_path (CamelSession *session,
-						CamelService *service,
-						CamelException *ex);
-
-char *          camel_session_query_authenticator (CamelSession *session,
-						   CamelAuthCallbackMode mode,
-						   char *prompt,
-						   gboolean secret,
-						   CamelService *service,
-						   char *item,
-						   CamelException *ex);
-
-#ifdef U_CANT_TOUCH_THIS
-gboolean        camel_session_query_cert_authenticator (CamelSession *session,
-							char *prompt);
-#endif
-
-guint           camel_session_register_timeout (CamelSession *session,
-						guint32 interval,
-						CamelTimeoutCallback callback,
-						gpointer user_data);
-
-gboolean        camel_session_remove_timeout (CamelSession *session,
-					      guint handle);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SESSION_H */
diff --git a/camel/camel-store.c b/camel/camel-store.c
deleted file mode 100644
index 19d4a53d5e..0000000000
--- a/camel/camel-store.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-store.c : Abstract class for an email store */
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <string.h>
-
-#include "camel-session.h"
-
-#include "camel-store.h"
-#include "camel-folder.h"
-#include "camel-vee-store.h"
-#include "camel-vee-folder.h"
-#include "camel-exception.h"
-
-#include "camel-private.h"
-
-static CamelServiceClass *parent_class = NULL;
-
-/* Returns the class for a CamelStore */
-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void construct (CamelService *service, CamelSession *session,
-		       CamelProvider *provider, CamelURL *url,
-		       CamelException *ex);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,
-				guint32 flags, CamelException *ex);
-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);
-
-static void        init_trash (CamelStore *store);
-static CamelFolder *get_trash (CamelStore *store, CamelException *ex);
-
-static CamelFolderInfo *create_folder (CamelStore *store,
-				       const char *parent_name,
-				       const char *folder_name,
-				       CamelException *ex);
-static void delete_folder (CamelStore *store, const char *folder_name,
-			   CamelException *ex);
-static void rename_folder (CamelStore *store, const char *old_name,
-			   const char *new_name, CamelException *ex);
-
-static void store_sync (CamelStore *store, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-static void free_folder_info (CamelStore *store, CamelFolderInfo *tree);
-
-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);
-static void subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
-static void unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
-
-static void
-camel_store_class_init (CamelStoreClass *camel_store_class)
-{
-	CamelObjectClass *camel_object_class =
-		CAMEL_OBJECT_CLASS (camel_store_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_store_class);
-	
-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method definition */
-	camel_service_class->construct = construct;
-	
-	camel_store_class->hash_folder_name = g_str_hash;
-	camel_store_class->compare_folder_name = g_str_equal;
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_inbox = get_inbox;
-	camel_store_class->init_trash = init_trash;
-	camel_store_class->get_trash = get_trash;
-	camel_store_class->create_folder = create_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->sync = store_sync;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = free_folder_info;
-	camel_store_class->folder_subscribed = folder_subscribed;
-	camel_store_class->subscribe_folder = subscribe_folder;
-	camel_store_class->unsubscribe_folder = unsubscribe_folder;
-	
-	/* virtual method overload */
-	camel_object_class_declare_event (camel_object_class,
-					  "folder_created", NULL);
-	camel_object_class_declare_event (camel_object_class,
-					  "folder_deleted", NULL);
-}
-
-static void
-camel_store_init (void *o)
-{
-	CamelStore *store = o;
-	CamelStoreClass *store_class = (CamelStoreClass *)CAMEL_OBJECT_GET_CLASS (o);
-
-	if (store_class->hash_folder_name) {
-		store->folders = g_hash_table_new (store_class->hash_folder_name,
-						   store_class->compare_folder_name);
-	} else
-		store->folders = NULL;
-	
-	store->flags = 0;
-	
-	store->priv = g_malloc0 (sizeof (*store->priv));
-#ifdef ENABLE_THREADS
-	store->priv->folder_lock = g_mutex_new();
-	store->priv->cache_lock = g_mutex_new();
-#endif
-}
-
-static void
-construct (CamelService *service, CamelSession *session, CamelProvider *provider,
-	   CamelURL *url, CamelException *ex)
-{
-	CamelStoreClass *store_class;
-	
-	parent_class->construct (service, session, provider, url, ex);
-	
-	/* initialize the vTrash folder */
-	store_class = (CamelStoreClass *) CAMEL_OBJECT_GET_CLASS (service);
-	store_class->init_trash (CAMEL_STORE (service));
-}
-
-static void
-camel_store_finalize (CamelObject *object)
-{
-	CamelStore *store = CAMEL_STORE (object);
-	
-	if (store->folders) {
-		if (g_hash_table_size (store->folders) != 0) {
-			g_warning ("Folder cache for store %p contains "
-				   "%d folders at destruction.", store,
-				   g_hash_table_size (store->folders));
-		}
-		g_hash_table_destroy (store->folders);
-	}
-	
-	if (store->vtrash)
-		camel_object_unref (CAMEL_OBJECT (store->vtrash));
-	
-#ifdef ENABLE_THREADS
-	g_mutex_free (store->priv->folder_lock);
-	g_mutex_free (store->priv->cache_lock);
-#endif
-	g_free (store->priv);
-}
-
-
-CamelType
-camel_store_get_type (void)
-{
-	static CamelType camel_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_store_type == CAMEL_INVALID_TYPE) {
-		camel_store_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelStore",
-							sizeof (CamelStore),
-							sizeof (CamelStoreClass),
-							(CamelObjectClassInitFunc) camel_store_class_init,
-							NULL,
-							(CamelObjectInitFunc) camel_store_init,
-							(CamelObjectFinalizeFunc) camel_store_finalize );
-	}
-
-	return camel_store_type;
-}
-
-
-static gboolean
-folder_matches (gpointer key, gpointer value, gpointer user_data)
-{
-	if (value == user_data) {
-		g_free (key);
-		return TRUE;
-	} else
-		return FALSE;
-}
-
-static void
-folder_finalize (CamelObject *folder, gpointer event_data, gpointer user_data)
-{
-	CamelStore *store = CAMEL_STORE (user_data);
-
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		g_hash_table_foreach_remove (store->folders, folder_matches, folder);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	g_warning ("CamelStore::get_folder not implemented for `%s'",
-		   camel_type_to_name(CAMEL_OBJECT_GET_TYPE(store)));
-	return NULL;
-}
-
-/** 
- * camel_store_get_folder: Return the folder corresponding to a path.
- * @store: a CamelStore
- * @folder_name: name of the folder to get
- * @flags: folder flags (create, save body index, etc)
- * @ex: a CamelException
- * 
- * Return value: the folder corresponding to the path @folder_name.
- **/
-CamelFolder *
-camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder = NULL;
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	if (store->folders) {
-		/* Try cache first. */
-		CAMEL_STORE_LOCK(store, cache_lock);
-		folder = g_hash_table_lookup (store->folders, folder_name);
-		if (folder)
-			camel_object_ref (CAMEL_OBJECT (folder));
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-
-	if (!folder) {
-		folder = CS_CLASS (store)->get_folder (store, folder_name, flags, ex);
-		if (folder && store->folders) {
-			CAMEL_STORE_LOCK(store, cache_lock);
-
-			g_hash_table_insert (store->folders, g_strdup (folder_name), folder);
-			
-			/* Add the folder to the vTrash folder if this store implements it */
-			if (store->vtrash)
-				camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store->vtrash), folder);
-			
-			camel_object_hook_event (CAMEL_OBJECT (folder), "finalize", folder_finalize, store);
-			CAMEL_STORE_UNLOCK(store, cache_lock);
-		}
-	}
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-	return folder;
-}
-
-
-static CamelFolderInfo *
-create_folder (CamelStore *store, const char *parent_name,
-	       const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::create_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return NULL;
-}
-
-/** 
- * camel_store_create_folder:
- * @store: a CamelStore
- * @parent_name: name of the new folder's parent, or %NULL
- * @folder_name: name of the folder to create
- * @ex: a CamelException
- * 
- * Creates a new folder as a child of an existing folder.
- * @parent_name can be %NULL to create a new top-level folder.
- *
- * Return value: info about the created folder, which the caller must
- * free with camel_store_free_folder_info().
- **/
-CamelFolderInfo *
-camel_store_create_folder (CamelStore *store, const char *parent_name,
-			   const char *folder_name, CamelException *ex)
-{
-	CamelFolderInfo *fi;
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-	fi = CS_CLASS (store)->create_folder (store, parent_name, folder_name, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return fi;
-}
-
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::delete_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/** 
- * camel_store_delete_folder: Delete the folder corresponding to a path.
- * @store: a CamelStore
- * @folder_name: name of the folder to delete
- * @ex: a CamelException
- * 
- * Deletes the named folder. The folder must be empty.
- **/
-void
-camel_store_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	CAMEL_STORE_LOCK(store, folder_lock);
-	CS_CLASS (store)->delete_folder (store, folder_name, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-
-static void
-rename_folder (CamelStore *store, const char *old_name,
-	       const char *new_name, CamelException *ex)
-{
-	g_warning ("CamelStore::rename_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/**
- * camel_store_rename_folder:
- * @store: a CamelStore
- * @old_name: the current name of the folder
- * @new_name: the new name of the folder
- * @ex: a CamelException
- * 
- * Rename a named folder to a new name.
- **/
-void
-camel_store_rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
-{
-	CAMEL_STORE_LOCK(store, folder_lock);
-	CS_CLASS (store)->rename_folder (store, old_name, new_name, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-
-static CamelFolder *
-get_inbox (CamelStore *store, CamelException *ex)
-{
-	/* Default: assume the inbox's name is "inbox"
-	 * and open with default flags.
-	 */
-	return CS_CLASS (store)->get_folder (store, "inbox", 0, ex);
-}
-
-/** 
- * camel_store_get_inbox:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Return value: the folder in the store into which new mail is
- * delivered, or %NULL if no such folder exists.
- **/
-CamelFolder *
-camel_store_get_inbox (CamelStore *store, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-	folder = CS_CLASS (store)->get_inbox (store, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return folder;
-}
-
-
-static void
-init_trash (CamelStore *store)
-{
-	char *name;
-	
-	name = g_strdup_printf ("%s?(match-all (system-flag \"Deleted\"))", "vTrash");
-	
-	store->vtrash = camel_vee_folder_new (store, name, CAMEL_STORE_FOLDER_CREATE |
-					      CAMEL_STORE_VEE_FOLDER_AUTO, NULL);
-	
-	g_free (name);
-}
-
-
-static CamelFolder *
-get_trash (CamelStore *store, CamelException *ex)
-{
-	if (store->vtrash) {
-		camel_object_ref (CAMEL_OBJECT (store->vtrash));
-		return store->vtrash;
-	} else {
-		g_warning ("This store does not support vTrash.");
-		return NULL;
-	}
-}
-
-/** 
- * camel_store_get_trash:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Return value: the folder in the store into which trash is
- * delivered, or %NULL if no such folder exists.
- **/
-CamelFolder *
-camel_store_get_trash (CamelStore *store, CamelException *ex)
-{
-	CamelFolder *folder;
-	
-	CAMEL_STORE_LOCK(store, folder_lock);
-	folder = CS_CLASS (store)->get_trash (store, ex);
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-	
-	return folder;
-}
-
-
-static void
-sync_folder (gpointer key, gpointer folder, gpointer ex)
-{
-	if (!camel_exception_is_set (ex))
-		camel_folder_sync (folder, FALSE, ex);
-}
-
-static void
-store_sync (CamelStore *store, CamelException *ex)
-{
-	if (store->folders) {
-		CAMEL_STORE_LOCK(store, cache_lock);
-		g_hash_table_foreach (store->folders, sync_folder, ex);
-		CAMEL_STORE_UNLOCK(store, cache_lock);
-	}
-}
-
-/**
- * camel_store_sync:
- * @store: a CamelStore
- * @ex: a CamelException
- *
- * Syncs any changes that have been made to the store object and its
- * folders with the real store.
- **/
-void
-camel_store_sync (CamelStore *store, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-
-	CS_CLASS (store)->sync (store, ex);
-}
-
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only,
-		 CamelException *ex)
-{
-	g_warning ("CamelStore::get_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return NULL;
-}
-
-/**
- * camel_store_get_folder_info:
- * @store: a CamelStore
- * @top: the name of the folder to start from
- * @fast: whether or not to do a "fast" scan.
- * @recursive: whether to include information for subfolders
- * @ex: a CamelException
- *
- * This fetches information about the folder structure of @store,
- * starting with @top, and returns a tree of CamelFolderInfo
- * structures. If @fast is %TRUE, the message_count or
- * unread_message_count fields of some or all of the structures may be
- * set to -1, if the store cannot determine that information quickly.
- * If @recursive is %TRUE, the returned tree will include all levels of
- * hierarchy below @top. If it is %FALSE, it will only include the
- * immediate subfolders of @top.
- *
- * Return value: a CamelFolderInfo tree, which must be freed with
- * camel_store_free_folder_info.
- **/
-CamelFolderInfo *
-camel_store_get_folder_info (CamelStore *store, const char *top,
-			     gboolean fast, gboolean recursive,
-			     gboolean subscribed_only,
-			     CamelException *ex)
-{
-	CamelFolderInfo *ret;
-
-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	ret = CS_CLASS (store)->get_folder_info (store, top, fast, recursive, subscribed_only, ex);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return ret;
-}
-
-
-static void
-free_folder_info (CamelStore *store, CamelFolderInfo *fi)
-{
-	g_warning ("CamelStore::free_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/**
- * camel_store_free_folder_info:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * Frees the data returned by camel_store_get_folder_info().
- **/
-void
-camel_store_free_folder_info (CamelStore *store, CamelFolderInfo *fi)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-
-	CS_CLASS (store)->free_folder_info (store, fi);
-}
-
-/**
- * camel_store_free_folder_info_full:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * An implementation for CamelStore::free_folder_info. Frees all
- * of the data.
- **/
-void
-camel_store_free_folder_info_full (CamelStore *store, CamelFolderInfo *fi)
-{
-	camel_folder_info_free (fi);
-}
-
-/**
- * camel_store_free_folder_info_nop:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * An implementation for CamelStore::free_folder_info. Does nothing.
- **/
-void
-camel_store_free_folder_info_nop (CamelStore *store, CamelFolderInfo *fi)
-{
-	;
-}
-
-
-/**
- * camel_folder_info_free:
- * @fi: the CamelFolderInfo
- *
- * Frees @fi.
- **/
-void
-camel_folder_info_free (CamelFolderInfo *fi)
-{
-	if (fi) {
-		camel_folder_info_free (fi->sibling);
-		camel_folder_info_free (fi->child);
-		g_free (fi->name);
-		g_free (fi->full_name);
-		g_free (fi->url);
-		g_free (fi);
-	}
-}
-
-
-/**
- * camel_folder_info_build:
- * @folders: an array of CamelFolderInfo
- * @namespace: an ignorable prefix on the folder names
- * @separator: the hieararchy separator character
- * @short_names: %TRUE if the (short) name of a folder is the part after
- * the last @separator in the full name. %FALSE if it is the full name.
- *
- * This takes an array of folders and attaches them together according
- * to the hierarchy described by their full_names and @separator. If
- * @namespace is non-%NULL, then it will be ignored as a full_name
- * prefix, for purposes of comparison. If necessary,
- * camel_folder_info_build will create additional CamelFolderInfo with
- * %NULL urls to fill in gaps in the tree. The value of @short_names
- * is used in constructing the names of these intermediate folders.
- *
- * Return value: the top level of the tree of linked folder info.
- **/
-CamelFolderInfo *
-camel_folder_info_build (GPtrArray *folders, const char *namespace,
-			 char separator, gboolean short_names)
-{
-	CamelFolderInfo *fi, *pfi, *top = NULL;
-	GHashTable *hash;
-	char *name, *p, *pname;
-	int i, nlen;
-
-	if (!namespace)
-		namespace = "";
-	nlen = strlen (namespace);
-
-	/* Hash the folders. */
-	hash = g_hash_table_new (g_str_hash, g_str_equal);
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (!strncmp (namespace, fi->full_name, nlen))
-			name = fi->full_name + nlen;
-		else
-			name = fi->full_name;
-		if (*name == separator)
-			name++;
-		g_hash_table_insert (hash, name, fi);
-	}
-
-	/* Now find parents. */
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (!strncmp (namespace, fi->full_name, nlen))
-			name = fi->full_name + nlen;
-		else
-			name = fi->full_name;
-		if (*name == separator)
-			name++;
-		p = strrchr (name, separator);
-		if (p) {
-			pname = g_strndup (name, p - name);
-			pfi = g_hash_table_lookup (hash, pname);
-			if (pfi) {
-				g_free (pname);
-			} else {
-				pfi = g_new0 (CamelFolderInfo, 1);
-				pfi->full_name = pname;
-				if (short_names) {
-					pfi->name = strrchr (pname, separator);
-					if (pfi->name)
-						pfi->name = g_strdup (pfi->name + 1);
-					else
-						pfi->name = g_strdup (pname);
-				} else
-					pfi->name = g_strdup (pname);
-				g_hash_table_insert (hash, pname, pfi);
-				g_ptr_array_add (folders, pfi);
-			}
-			fi->sibling = pfi->child;
-			fi->parent = pfi;
-			pfi->child = fi;
-		} else if (!top)
-			top = fi;
-	}
-	g_hash_table_destroy (hash);
-
-	/* Link together the top-level folders */
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (fi->parent || fi == top)
-			continue;
-		if (top)
-			fi->sibling = top;
-		top = fi;
-	}
-
-	return top;			
-}
-
-gboolean
-camel_store_supports_subscriptions (CamelStore *store)
-{
-	return (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-}
-
-
-static gboolean
-folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return FALSE;
-}
-
-/**
- * camel_store_folder_subscribed: Tell whether or not a folder has been subscribed to.
- * @store: a CamelStore
- * @folder_name: the folder on which we're querying subscribed status.
- * Return value: TRUE if folder is subscribed, FALSE if not.
- **/
-gboolean
-camel_store_folder_subscribed (CamelStore *store,
-			       const char *folder_name)
-{
-	gboolean ret;
-
-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
-	g_return_val_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS, FALSE);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	ret = CS_CLASS (store)->folder_subscribed (store, folder_name);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-
-	return ret;
-}
-
-static void
-subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/**
- * camel_store_subscribe_folder: marks a folder as subscribed.
- * @store: a CamelStore
- * @folder_name: the folder to subscribe to.
- **/
-void
-camel_store_subscribe_folder (CamelStore *store,
-			      const char *folder_name,
-			      CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	CS_CLASS (store)->subscribe_folder (store, folder_name, ex);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
-
-static void
-unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-
-/**
- * camel_store_unsubscribe_folder: marks a folder as unsubscribed.
- * @store: a CamelStore
- * @folder_name: the folder to unsubscribe from.
- **/
-void
-camel_store_unsubscribe_folder (CamelStore *store,
-				const char *folder_name,
-				CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-
-	CAMEL_STORE_LOCK(store, folder_lock);
-
-	CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex);
-
-	CAMEL_STORE_UNLOCK(store, folder_lock);
-}
diff --git a/camel/camel-store.h b/camel/camel-store.h
deleted file mode 100644
index 6ea20b4d2c..0000000000
--- a/camel/camel-store.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-store.h : Abstract class for an email store */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STORE_H
-#define CAMEL_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-service.h>
-
-
-typedef struct _CamelFolderInfo {
-	struct _CamelFolderInfo *parent, *sibling, *child;
-	char *url, *full_name, *name;
-	int unread_message_count;
-} CamelFolderInfo;
-
-
-#define CAMEL_STORE_TYPE     (camel_store_get_type ())
-#define CAMEL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))
-#define CAMEL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))
-#define CAMEL_IS_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STORE_TYPE))
-
-
-/* Flags for store flags */
-#define CAMEL_STORE_SUBSCRIPTIONS (1 << 0)
-
-struct _CamelStore
-{
-	CamelService parent_object;
-	struct _CamelStorePrivate *priv;
-	
-	CamelFolder *vtrash;
-	
-	/* should have cache_lock when accessing this (priv->cache_lock) */
-	GHashTable *folders;
-
-	int flags;
-};
-
-
-/* open mode for folder */
-#define CAMEL_STORE_FOLDER_CREATE (1<<0)
-#define CAMEL_STORE_FOLDER_BODY_INDEX (1<<1)
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	GHashFunc       hash_folder_name;
-	GCompareFunc    compare_folder_name;
-
-	CamelFolder *   (*get_folder)               (CamelStore *store,
-						     const char *folder_name,
-						     guint32 flags,
-						     CamelException *ex);
-	CamelFolder *   (*get_inbox)                (CamelStore *store,
-						     CamelException *ex);
-	
-	void            (*init_trash)               (CamelStore *store);
-	CamelFolder *   (*get_trash)                (CamelStore *store,
-						     CamelException *ex);
-	
-	CamelFolderInfo *(*create_folder)           (CamelStore *store,
-						     const char *parent_name,
-						     const char *folder_name,
-						     CamelException *ex);
-	void            (*delete_folder)            (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-	void		(*rename_folder)	    (CamelStore *store,
-						     const char *old_name,
-						     const char *new_name,
-						     CamelException *ex);
-
-	void            (*sync)                     (CamelStore *store,
-						     CamelException *ex);
-
-	/* this should take flags instead, so its more futureproof */
-	CamelFolderInfo *(*get_folder_info)         (CamelStore *store,
-						     const char *top,
-						     gboolean fast,
-						     gboolean recursive,
-						     gboolean subscribed_only,
-						     CamelException *ex);
-	void            (*free_folder_info)         (CamelStore *store,
-						     CamelFolderInfo *fi);
-
-	gboolean        (*folder_subscribed)        (CamelStore *store,
-						     const char *folder_name);
-	void            (*subscribe_folder)         (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-	void            (*unsubscribe_folder)       (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-} CamelStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_store_get_type (void);
-
-/* public methods */
-CamelFolder *    camel_store_get_folder         (CamelStore *store,
-					         const char *folder_name,
-						 guint32 flags,
-					         CamelException *ex);
-CamelFolder *    camel_store_get_inbox          (CamelStore *store,
-						 CamelException *ex);
-CamelFolder *    camel_store_get_trash          (CamelStore *store,
-						 CamelException *ex);
-
-CamelFolderInfo *camel_store_create_folder      (CamelStore *store,
-						 const char *parent_name,
-						 const char *folder_name,
-						 CamelException *ex);
-void             camel_store_delete_folder      (CamelStore *store,
-						 const char *folder_name,
-						 CamelException *ex);
-void             camel_store_rename_folder      (CamelStore *store,
-						 const char *old_name,
-						 const char *new_name,
-						 CamelException *ex);
-
-void             camel_store_sync               (CamelStore *store,
-						 CamelException *ex);
-
-CamelFolderInfo *camel_store_get_folder_info    (CamelStore *store,
-						 const char *top,
-						 gboolean fast,
-						 gboolean recursive,
-						 gboolean subscribed_only,
-						 CamelException *ex);
-void             camel_store_free_folder_info   (CamelStore *store,
-						 CamelFolderInfo *fi);
-
-void             camel_store_free_folder_info_full (CamelStore *store,
-						    CamelFolderInfo *fi);
-void             camel_store_free_folder_info_nop  (CamelStore *store,
-						    CamelFolderInfo *fi);
-
-void             camel_folder_info_free            (CamelFolderInfo *fi);
-CamelFolderInfo *camel_folder_info_build           (GPtrArray *folders,
-						    const char *namespace,
-						    char separator,
-						    gboolean short_names);
-
-gboolean         camel_store_supports_subscriptions   (CamelStore *store);
-
-gboolean         camel_store_folder_subscribed        (CamelStore *store,
-						       const char *folder_name);
-void             camel_store_subscribe_folder         (CamelStore *store,
-						       const char *folder_name,
-						       CamelException *ex);
-void             camel_store_unsubscribe_folder       (CamelStore *store,
-						       const char *folder_name,
-						       CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STORE_H */
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
deleted file mode 100644
index 7df9fa30ee..0000000000
--- a/camel/camel-stream-buffer.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-
-/* camel-stream-buffer.c : Buffer any other other stream
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include "camel-stream-buffer.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-static CamelStreamClass *parent_class = NULL;
-
-enum {
-	BUF_USER = 1<<0,	/* user-supplied buffer, do not free */
-};
-
-#define BUF_SIZE 1024
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush (CamelStream *stream);
-static int stream_close (CamelStream *stream);
-static gboolean stream_eos (CamelStream *stream);
-
-static void init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size);
-static void init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode);
-
-static void
-camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_class)
-{
-	CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_stream_buffer_class);
-
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-
-	/* virtual method definition */
-	camel_stream_buffer_class->init = init;
-	camel_stream_buffer_class->init_vbuf = init_vbuf;
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->eos = stream_eos;
-}
-
-static void
-camel_stream_buffer_init (gpointer object, gpointer klass)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
-
-	sbf->flags = 0;
-	sbf->size = BUF_SIZE;
-	sbf->buf = g_malloc(BUF_SIZE);
-	sbf->ptr = sbf->buf;
-	sbf->end = sbf->buf;
-	sbf->mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;
-	sbf->stream = 0;
-	sbf->linesize = 80;
-	sbf->linebuf = g_malloc(sbf->linesize);
-}
-
-static void
-camel_stream_buffer_finalize (CamelObject *object)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
-
-	if (!(sbf->flags & BUF_USER)) {
-		g_free(sbf->buf);
-	}
-	if (sbf->stream)
-		camel_object_unref(CAMEL_OBJECT(sbf->stream));
-
-	g_free(sbf->linebuf);
-}
-
-
-CamelType
-camel_stream_buffer_get_type (void)
-{
-	static CamelType camel_stream_buffer_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_buffer_type == CAMEL_INVALID_TYPE)	{
-		camel_stream_buffer_type = camel_type_register (camel_stream_get_type (), "CamelStreamBuffer",
-								sizeof (CamelStreamBuffer),
-								sizeof (CamelStreamBufferClass),
-								(CamelObjectClassInitFunc) camel_stream_buffer_class_init,
-								NULL,
-								(CamelObjectInitFunc) camel_stream_buffer_init,
-								(CamelObjectFinalizeFunc) camel_stream_buffer_finalize);
-	}
-
-	return camel_stream_buffer_type;
-}
-
-
-static void
-set_vbuf(CamelStreamBuffer *sbf, char *buf, CamelStreamBufferMode mode, int size)
-{
-	if (sbf->buf && !(sbf->flags & BUF_USER)) {
-		g_free(sbf->buf);
-	}
-	if (buf) {
-		sbf->buf = buf;
-		sbf->flags |= BUF_USER;
-	} else {
-		sbf->buf = g_malloc(size);
-		sbf->flags &= ~BUF_USER;
-	}
-	sbf->size = size;
-	sbf->mode = mode;
-}
-
-static void
-init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size)
-{
-	set_vbuf(sbf, buf, mode, size);
-	if (sbf->stream)
-		camel_object_unref(CAMEL_OBJECT(sbf->stream));
-	sbf->stream = s;
-	camel_object_ref(CAMEL_OBJECT(sbf->stream));
-}
-
-static void
-init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)
-{
-	init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);
-}
-
-
-/**
- * camel_stream_buffer_new:
- * @stream: Existing stream to buffer.
- * @mode: Operational mode of buffered stream.
- *
- * Create a new buffered stream of another stream.  A default
- * buffer size (1024 bytes), automatically managed will be used
- * for buffering.
- *
- * See camel_stream_buffer_new_with_vbuf() for details on the
- * @mode parameter.
- *
- * Return value: A newly created buffered stream.
- **/
-CamelStream *
-camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)
-{
-	CamelStreamBuffer *sbf;
-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));
-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))->init (sbf, stream, mode);
-
-	return CAMEL_STREAM (sbf);
-}
-
-/**
- * camel_stream_buffer_new_with_vbuf:
- * @stream: An existing stream to buffer.
- * @mode: Mode to buffer in.
- * @buf: Memory to use for buffering.
- * @size: Size of buffer to use.
- *
- * Create a new stream which buffers another stream, @stream.
- *
- * The following values are available for @mode:
- *
- * CAMEL_STREAM_BUFFER_BUFFER, Buffer the input/output in blocks.
- * CAMEL_STREAM_BUFFER_NEWLINE, Buffer on newlines (for output).
- * CAMEL_STREAM_BUFFER_NONE, Perform no buffering.
- *
- * Note that currently this is ignored and CAMEL_STREAM_BUFFER_BUFFER
- * is always used.
- *
- * In addition, one of the following mode options should be or'd
- * together with the buffering mode:
- *
- * CAMEL_STREAM_BUFFER_WRITE, Buffer in write mode.
- * CAMEL_STREAM_BUFFER_READ, Buffer in read mode.
- *
- * Buffering can only be done in one direction for any
- * buffer instance.
- *
- * If @buf is non-NULL, then use the memory pointed to
- * (for upto @size bytes) as the buffer for all buffering
- * operations.  It is upto the application to free this buffer.
- * If @buf is NULL, then allocate and manage @size bytes
- * for all buffering.
- *
- * Return value: A new stream with buffering applied.
- **/
-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size)
-{
-	CamelStreamBuffer *sbf;
-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));
-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))->init_vbuf (sbf, stream, mode, buf, size);
-
-	return CAMEL_STREAM (sbf);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-	ssize_t bytes_read = 1;
-	ssize_t bytes_left;
-	char *bptr = buffer;
-
-	g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_READ, 0);
-
-	while (n && bytes_read > 0) {
-		bytes_left = sbf->end - sbf->ptr;
-		if (bytes_left < n) {
-			if (bytes_left > 0) {
-				memcpy(bptr, sbf->ptr, bytes_left);
-				n -= bytes_left;
-				bptr += bytes_left;
-				sbf->ptr += bytes_left;
-			}
-			/* if we are reading a lot, then read directly to the destination buffer */
-			if (n >= sbf->size/3) {
-				bytes_read = camel_stream_read(sbf->stream, bptr, n);
-				if (bytes_read>0) {
-					n -= bytes_read;
-					bptr += bytes_read;
-				}
-			} else {
-				bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
-				if (bytes_read>0) {
-					size_t bytes_used = bytes_read > n ? n : bytes_read;
-					sbf->ptr = sbf->buf;
-					sbf->end = sbf->buf+bytes_read;
-					memcpy(bptr, sbf->ptr, bytes_used);
-					sbf->ptr += bytes_used;
-					bptr += bytes_used;
-					n -= bytes_used;
-				}
-			}
-		} else {
-			memcpy(bptr, sbf->ptr, n);
-			sbf->ptr += n;
-			bptr += n;
-			n = 0;
-		}
-	}
-
-	return (ssize_t)(bptr - buffer);
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-	const char *bptr = buffer;
-	ssize_t bytes_written = 1;
-        ssize_t bytes_left;
-	ssize_t total = n;
-
-	g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE, 0);
-
-	while (n && bytes_written > 0) {
-		bytes_left = sbf->size - (sbf->ptr-sbf->buf);
-		if (bytes_left<n) {
-			memcpy(sbf->ptr, bptr, bytes_left);
-			n -= bytes_left;
-			bptr += bytes_left;
-			bytes_written = camel_stream_write(sbf->stream, sbf->buf, sbf->size);
-			sbf->ptr = sbf->buf;
-			/* if we are writing a lot, write directly to the stream */
-			if (n >= sbf->size/3) {
-				bytes_written = camel_stream_write(sbf->stream, bptr, n);
-				if (bytes_written >0) {
-					bytes_written = n;
-					n -= bytes_written;
-					bptr += bytes_written;
-				}
-			} else {
-				memcpy(sbf->ptr, bptr, n);
-				sbf->ptr += n;
-				bptr += n;
-				n = 0;
-			}
-		} else {
-			memcpy(sbf->ptr, bptr, n);
-			sbf->ptr += n;
-			bptr += n;
-			n = 0;
-		}
-	}
-	if (bytes_written == -1)
-		return -1;
-	
-	return total;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	if ((sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE) {
-		int len = sbf->ptr-sbf->buf;
-		int written = camel_stream_write(sbf->stream, sbf->buf, len);
-		if (written > 0)
-			sbf->ptr += written;
-		if (written != len)
-			return -1;
-	} else {
-		/* nothing to do for read mode 'flush' */
-	}
-
-	return camel_stream_flush(sbf->stream);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	if (stream_flush(stream) == -1)
-		return -1;
-	return camel_stream_close(sbf->stream);
-}
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	return camel_stream_eos(sbf->stream) && sbf->ptr == sbf->end;
-}
-
-/**
- * camel_stream_buffer_gets:
- * @sbf: A CamelStreamBuffer.
- * @buf: Memory to write the string to.
- * @max: Maxmimum number of characters to store.
- *
- * Read a line of characters up to the next newline character or
- * @max-1 characters.
- *
- * If the newline character is encountered, then it will be
- * included in the buffer @buf.  The buffer will be #NUL terminated.
- *
- * Return value: The number of characters read, or 0 for end of file,
- * and -1 on error.
- **/
-int camel_stream_buffer_gets(CamelStreamBuffer *sbf, char *buf, unsigned int max)
-{
-	register char *outptr, *inptr, *inend, c, *outend;
-	int bytes_read;
-
-	outptr = buf;
-	inptr = sbf->ptr;
-	inend = sbf->end;
-	outend = buf+max-1;	/* room for NUL */
-
-	do {
-		while (inptr<inend && outptr<outend) {
-			c = *inptr++;
-			*outptr++ = c;
-			if (c == '\n') {
-				*outptr = 0;
-				sbf->ptr = inptr;
-				return outptr-buf;
-			}
-		}
-		if (outptr == outend)
-			break;
-
-		bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
-		if (bytes_read == -1)
-			return -1;
-		inptr = sbf->ptr = sbf->buf;
-		inend = sbf->end = sbf->buf + bytes_read;
-	} while (bytes_read>0);
-
-	sbf->ptr = inptr;
-	*outptr = 0;
-
-	return (int)(outptr - buf);
-}
-
-/**
- * camel_stream_buffer_read_line: read a complete line from the stream
- * @sbf: A CamelStreamBuffer
- *
- * This function reads a complete newline-terminated line from the stream
- * and returns it in allocated memory. The trailing newline (and carriage
- * return if any) are not included in the returned string.
- *
- * Return value: the line read, which the caller must free when done with,
- * or NULL on eof. If an error occurs, @ex will be set.
- **/
-char *
-camel_stream_buffer_read_line (CamelStreamBuffer *sbf)
-{
-	unsigned char *p;
-	int nread;
-
-	p = sbf->linebuf;
-
-	while (1) {
-		nread = camel_stream_buffer_gets (sbf, p, sbf->linesize - (p - sbf->linebuf));
-		if (nread <=0) {
-			if (p > sbf->linebuf)
-				break;
-			return NULL;
-		}
-
-		p += nread;
-		if (p[-1] == '\n')
-			break;
-
-		nread = p - sbf->linebuf;
-		sbf->linesize *= 2;
-		sbf->linebuf = g_realloc (sbf->linebuf, sbf->linesize);
-		p = sbf->linebuf + nread;
-	}
-
-	p--;
-	if (p[-1] == '\r')
-		p--;
-	p[0] = 0;
-
-	return g_strdup(sbf->linebuf);
-}
-
-
-
-
-
-
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
deleted file mode 100644
index 5c9037595a..0000000000
--- a/camel/camel-stream-buffer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-buffer.h :stream which buffers another stream */
-
-/*
- *
- * Author :
- *  Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 2000 Helix Code Inc. (http://www.helixcode.com) .
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_BUFFER_H
-#define CAMEL_STREAM_BUFFER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-#include <stdio.h>
-
-#define CAMEL_STREAM_BUFFER_TYPE     (camel_stream_buffer_get_type ())
-#define CAMEL_STREAM_BUFFER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))
-#define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))
-#define CAMEL_IS_STREAM_BUFFER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))
-
-typedef enum
-{
-	CAMEL_STREAM_BUFFER_BUFFER = 0,
-	CAMEL_STREAM_BUFFER_NEWLINE,
-	CAMEL_STREAM_BUFFER_NONE,
-	CAMEL_STREAM_BUFFER_READ = 0x00,
-	CAMEL_STREAM_BUFFER_WRITE = 0x80,
-	CAMEL_STREAM_BUFFER_MODE = 0x80
-} CamelStreamBufferMode;
-
-struct _CamelStreamBuffer
-{
-	CamelStream parent_object;
-
-	/* these are all of course, private */
-	CamelStream *stream;
-
-	unsigned char *buf, *ptr, *end;
-	int size;
-
-	unsigned char *linebuf;	/* for reading lines at a time */
-	int linesize;
-
-	CamelStreamBufferMode mode;
-	unsigned int flags;	/* internal flags */
-};
-
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	void (*init) (CamelStreamBuffer *stream_buffer, CamelStream *stream,
-		      CamelStreamBufferMode mode);
-	void (*init_vbuf) (CamelStreamBuffer *stream_buffer,
-			   CamelStream *stream, CamelStreamBufferMode mode,
-			   char *buf, guint32 size);
-
-} CamelStreamBufferClass;
-
-
-/* Standard Camel function */
-CamelType camel_stream_buffer_get_type (void);
-
-
-/* public methods */
-CamelStream *camel_stream_buffer_new (CamelStream *s,
-				      CamelStreamBufferMode mode);
-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s,
-						CamelStreamBufferMode mode,
-						char *buf, guint32 size);
-
-/* unimplemented
-   CamelStream *camel_stream_buffer_set_vbuf (CamelStreamBuffer *b, CamelStreamBufferMode mode, char *buf, guint32 size); */
-
-/* read a line of characters */
-int camel_stream_buffer_gets (CamelStreamBuffer *b, char *buf, unsigned int max);
-
-char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_BUFFER_H */
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
deleted file mode 100644
index 866c8d2416..0000000000
--- a/camel/camel-stream-filter.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-stream-filter.h"
-
-#define d(x)
-/*#include <stdio.h>*/
-
-struct _filter {
-	struct _filter *next;
-	int id;
-	CamelMimeFilter *filter;
-};
-
-struct _CamelStreamFilterPrivate {
-	struct _filter *filters;
-	int filterid;		/* next filter id */
-	
-	char *realbuffer;	/* buffer - READ_PAD */
-	char *buffer;		/* READ_SIZE bytes */
-
-	char *filtered;		/* the filtered data */
-	size_t filteredlen;
-
-	int last_was_read;	/* was the last op read or write? */
-};
-
-#define READ_PAD (64)		/* bytes padded before buffer */
-#define READ_SIZE (4096)
-
-#define _PRIVATE(o) (((CamelStreamFilter *)(o))->priv)
-
-static void camel_stream_filter_class_init (CamelStreamFilterClass *klass);
-static void camel_stream_filter_init       (CamelStreamFilter *obj);
-
-static	ssize_t   do_read       (CamelStream *stream, char *buffer, size_t n);
-static	ssize_t   do_write      (CamelStream *stream, const char *buffer, size_t n);
-static	int       do_flush      (CamelStream *stream);
-static	int       do_close      (CamelStream *stream);
-static	gboolean  do_eos        (CamelStream *stream);
-static	int       do_reset      (CamelStream *stream);
-
-static CamelStreamClass *camel_stream_filter_parent;
-
-static void
-camel_stream_filter_class_init (CamelStreamFilterClass *klass)
-{
-	CamelStreamClass *camel_stream_class = (CamelStreamClass *) klass;
-
-	camel_stream_filter_parent = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-
-	camel_stream_class->read = do_read;
-	camel_stream_class->write = do_write;
-	camel_stream_class->flush = do_flush;
-	camel_stream_class->close = do_close;
-	camel_stream_class->eos = do_eos; 
-	camel_stream_class->reset = do_reset;
-
-}
-
-static void
-camel_stream_filter_init (CamelStreamFilter *obj)
-{
-	struct _CamelStreamFilterPrivate *p;
-	
-	_PRIVATE(obj) = p = g_malloc0(sizeof(*p));
-	p->realbuffer = g_malloc(READ_SIZE + READ_PAD);
-	p->buffer = p->realbuffer + READ_PAD;
-	p->last_was_read = TRUE;
-}
-
-static void
-camel_stream_filter_finalize(CamelObject *o)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)o;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	f = p->filters;
-	while (f) {
-		fn = f->next;
-		camel_object_unref((CamelObject *)f->filter);
-		g_free(f);
-		f = fn;
-	}
-	g_free(p->realbuffer);
-	g_free(p);
-	camel_object_unref((CamelObject *)filter->source);
-}
-
-CamelType
-camel_stream_filter_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_STREAM_TYPE, "CamelStreamFilter",
-					    sizeof (CamelStreamFilter),
-					    sizeof (CamelStreamFilterClass),
-					    (CamelObjectClassInitFunc) camel_stream_filter_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_stream_filter_init,
-					    (CamelObjectFinalizeFunc) camel_stream_filter_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_stream_filter_new:
- *
- * Create a new CamelStreamFilter object.
- * 
- * Return value: A new CamelStreamFilter object.
- **/
-CamelStreamFilter *
-camel_stream_filter_new_with_stream(CamelStream *stream)
-{
-	CamelStreamFilter *new = CAMEL_STREAM_FILTER ( camel_object_new (camel_stream_filter_get_type ()));
-
-	new->source = stream;
-	camel_object_ref ((CamelObject *)stream);
-
-	return new;
-}
-
-/**
- * camel_stream_filter_add:
- * @filter: Initialised CamelStreamFilter.
- * @mf:  Filter to perform processing on stream.
- * 
- * Add a new CamelMimeFilter to execute during the processing of this
- * stream.  Each filter added is processed after the previous one.
- *
- * Note that a filter should only be added to a single stream
- * at a time, otherwise unpredictable results may occur.
- * 
- * Return value: A filter id for this CamelStreamFilter.
- **/
-int
-camel_stream_filter_add(CamelStreamFilter *filter, CamelMimeFilter *mf)
-{
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	fn = g_malloc(sizeof(*fn));
-	fn->id = p->filterid++;
-	fn->filter = mf;
-	camel_object_ref((CamelObject *)mf);
-
-	/* sure, we could use a GList, but we wouldn't save much */
-	f = (struct _filter *)&p->filters;
-	while (f->next)
-		f = f->next;
-	f->next = fn;
-	fn->next = NULL;
-	return fn->id;
-}
-
-/**
- * camel_stream_filter_remove:
- * @filter: Initialised CamelStreamFilter.
- * @id: Filter id, as returned from camel_stream_filter_add().
- * 
- * Remove a processing filter from the stream, by id.
- **/
-void
-camel_stream_filter_remove(CamelStreamFilter *filter, int id)
-{
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	f = (struct _filter *)&p->filters;
-	while (f && f->next) {
-		fn = f->next;
-		if (fn->id == id) {
-			f->next = fn->next;
-			camel_object_unref((CamelObject *)fn->filter);
-			g_free(fn);
-		}
-		f = f->next;
-	}
-}
-
-static ssize_t
-do_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	ssize_t size;
-	struct _filter *f;
-
-	p->last_was_read = TRUE;
-
-	if (p->filteredlen<=0) {
-		int presize = READ_SIZE;
-
-		size = camel_stream_read(filter->source, p->buffer, READ_SIZE);
-		if (size <= 0) {
-			/* this is somewhat untested */
-			if (camel_stream_eos(filter->source)) {
-				f = p->filters;
-				p->filtered = p->buffer;
-				p->filteredlen = 0;
-				while (f) {
-					camel_mime_filter_complete(f->filter, p->filtered, p->filteredlen,
-								   presize, &p->filtered, &p->filteredlen, &presize);
-					f = f->next;
-				}
-				size = p->filteredlen;
-			}
-			if (size <= 0)
-				return size;
-		} else {
-			f = p->filters;
-			p->filtered = p->buffer;
-			p->filteredlen = size;
-
-			d(printf ("\n\nOriginal content: '"));
-			d(fwrite(p->filtered, sizeof(char), p->filteredlen, stdout));
-			d(printf("'\n"));
-
-			while (f) {
-				camel_mime_filter_filter(f->filter, p->filtered, p->filteredlen, presize,
-							 &p->filtered, &p->filteredlen, &presize);
-
-				d(printf ("Filtered content (%s): '",
-					  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-				d(fwrite(p->filtered, sizeof(char), p->filteredlen, stdout));
-				d(printf("'\n"));
-
-				f = f->next;
-			}
-		}
-	}
-
-	size = MIN(n, p->filteredlen);
-	memcpy(buffer, p->filtered, size);
-	p->filteredlen -= size;
-	p->filtered += size;
-
-	return size;
-}
-
-/* Note: Since the caller expects to write out as much as they asked us to
-   write (for 'success'), we return what they asked us to write (for 'success')
-   rather than the true number of written bytes */
-static ssize_t
-do_write (CamelStream *stream, const char *buf, size_t n)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-	int presize;
-	char *buffer = (char *)buf;
-	size_t len = n;
-
-	p->last_was_read = FALSE;
-
-	d(printf ("\n\nWriting: Original content: '"));
-	d(fwrite(buffer, sizeof(char), len, stdout));
-	d(printf("'\n"));
-
-	f = p->filters;
-	presize = 0;
-	while (f) {
-		camel_mime_filter_filter(f->filter, buffer, len, presize, &buffer, &len, &presize);
-
-		d(printf ("Filtered content (%s): '",
-			  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-		d(fwrite(buffer, sizeof(char), len, stdout));
-		d(printf("'\n"));
-
-		f = f->next;
-	}
-
-	if (camel_stream_write(filter->source, buffer, len) != len)
-		return -1;
-
-	return n;
-}
-
-static int
-do_flush (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-	char *buffer;
-	int len, presize;
-
-	if (p->last_was_read) {
-		g_warning("Flushing a filter stream without writing to it");
-		return 0;
-	}
-
-	buffer = "";
-	len = 0;
-	presize = 0;
-	f = p->filters;
-	
-	d(printf ("\n\nFlushing: Original content: '"));
-	d(fwrite(buffer, sizeof(char), len, stdout));
-	d(printf("'\n"));
-
-	while (f) {
-		camel_mime_filter_complete(f->filter, buffer, len, presize, &buffer, &len, &presize);
-
-		d(printf ("Filtered content (%s): '",
-			  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-		d(fwrite(buffer, sizeof(char), len, stdout));
-		d(printf("'\n"));
-
-		f = f->next;
-	}
-	if (len > 0 && camel_stream_write(filter->source, buffer, len) == -1)
-		return -1;
-	return camel_stream_flush(filter->source);
-}
-
-static int
-do_close (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
-	if (!p->last_was_read) {
-		do_flush(stream);
-	}
-	return camel_stream_close(filter->source);
-}
-
-static gboolean
-do_eos (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
-	if (p->filteredlen > 0)
-		return FALSE;
-
-	return camel_stream_eos(filter->source);
-}
-
-static int
-do_reset (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-
-	p->filteredlen = 0;
-
-	/* and reset filters */
-	f = p->filters;
-	while (f) {
-		camel_mime_filter_reset(f->filter);
-		f = f->next;
-	}
-
-	return camel_stream_reset(filter->source);
-}
-
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
deleted file mode 100644
index b3906eef31..0000000000
--- a/camel/camel-stream-filter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_STREAM_FILTER_H
-#define _CAMEL_STREAM_FILTER_H
-
-#include <camel/camel-stream.h>
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_STREAM_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)
-#define CAMEL_STREAM_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)
-#define CAMEL_IS_STREAM_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_filter_get_type ())
-
-typedef struct _CamelStreamFilterClass CamelStreamFilterClass;
-
-struct _CamelStreamFilter {
-	CamelStream parent;
-
-	CamelStream *source;
-
-	struct _CamelStreamFilterPrivate *priv;
-};
-
-struct _CamelStreamFilterClass {
-	CamelStreamClass parent_class;
-};
-
-guint			camel_stream_filter_get_type	(void);
-
-CamelStreamFilter      *camel_stream_filter_new_with_stream	(CamelStream *stream);
-
-int camel_stream_filter_add	(CamelStreamFilter *filter, CamelMimeFilter *);
-void camel_stream_filter_remove	(CamelStreamFilter *filter, int id);
-
-#endif /* ! _CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
deleted file mode 100644
index d19000b37e..0000000000
--- a/camel/camel-stream-fs.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream-fs.c : file system based stream */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-operation.h"
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelStreamFS */
-#define CSFS_CLASS(so) CAMEL_STREAM_FS_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static ssize_t stream_read   (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write  (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush  (CamelStream *stream);
-static int stream_close  (CamelStream *stream);
-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-
-static void
-camel_stream_fs_class_init (CamelStreamFsClass *camel_stream_fs_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_fs_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_stream_fs_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-
-	camel_seekable_stream_class->seek = stream_seek;
-}
-
-static void
-camel_stream_fs_init (gpointer object, gpointer klass)
-{
-	CamelStreamFs *stream = CAMEL_STREAM_FS (object);
-
-	stream->fd = -1;
-	((CamelSeekableStream *)stream)->bound_end = CAMEL_STREAM_UNBOUND;
-}
-
-static void
-camel_stream_fs_finalize (CamelObject *object)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (object);
-
-	if (stream_fs->fd != -1)
-		close (stream_fs->fd);
-}
-
-
-CamelType
-camel_stream_fs_get_type (void)
-{
-	static CamelType camel_stream_fs_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_fs_type == CAMEL_INVALID_TYPE) {
-		camel_stream_fs_type = camel_type_register (camel_seekable_stream_get_type (), "CamelStreamFs",
-							    sizeof (CamelStreamFs),
-							    sizeof (CamelStreamFsClass),
-							    (CamelObjectClassInitFunc) camel_stream_fs_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_stream_fs_init,
-							    (CamelObjectFinalizeFunc) camel_stream_fs_finalize);
-	}
-
-	return camel_stream_fs_type;
-}
-
-/**
- * camel_stream_fs_new_with_fd:
- * @fd: a file descriptor
- *
- * Returns a stream associated with the given file descriptor.
- * When the stream is destroyed, the file descriptor will be closed.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_fs_new_with_fd (int fd)
-{
-	CamelStreamFs *stream_fs;
-	off_t offset;
-
-	if (fd == -1)
-		return NULL;
-
-	stream_fs = CAMEL_STREAM_FS (camel_object_new (camel_stream_fs_get_type ()));
-	stream_fs->fd = fd;
-	offset = lseek (fd, 0, SEEK_CUR);
-	if (offset == -1)
-		offset = 0;
-	CAMEL_SEEKABLE_STREAM (stream_fs)->position = offset;
-
-	return CAMEL_STREAM (stream_fs);
-}
-
-/**
- * camel_stream_fs_new_with_fd_and_bounds:
- * @fd: a file descriptor
- * @start: the first valid position in the file
- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND
- *
- * Returns a stream associated with the given file descriptor and bounds.
- * When the stream is destroyed, the file descriptor will be closed.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end)
-{
-	CamelStream *stream;
-
-	stream = camel_stream_fs_new_with_fd (fd);
-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream), start, end);
-
-	return stream;
-}
-
-/**
- * camel_stream_fs_new_with_name:
- * @name: a local filename
- * @flags: flags as in open(2)
- * @mode: a file mode
- *
- * Creates a new CamelStream corresponding to the named file, flags,
- * and mode.
- *
- * Return value: the stream, or #NULL on error.
- **/
-CamelStream *
-camel_stream_fs_new_with_name (const char *name, int flags, mode_t mode)
-{
-	int fd;
-
-	fd = open (name, flags, mode);
-	if (fd == -1) {
-		return NULL;
-	}
-
-	return camel_stream_fs_new_with_fd (fd);
-}
-
-/**
- * camel_stream_fs_new_with_name_and_bounds:
- * @name: a local filename
- * @flags: flags as in open(2)
- * @mode: a file mode
- * @start: the first valid position in the file
- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND
- *
- * Creates a new CamelStream corresponding to the given arguments.
- *
- * Return value: the stream, or NULL on error.
- **/
-CamelStream *
-camel_stream_fs_new_with_name_and_bounds (const char *name, int flags,
-					  mode_t mode, off_t start, off_t end)
-{
-	CamelStream *stream;
-
-	stream = camel_stream_fs_new_with_name (name, flags, mode);
-	if (stream == NULL)
-		return NULL;
-
-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream),
-					  start, end);
-
-	return stream;
-}
-
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nread;
-	int cancel_fd;
-
-	if (camel_operation_cancel_check(NULL)) {
-		errno = EINTR;
-		return  -1;
-	}
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-		do {
-			nread = read (stream_fs->fd, buffer, n);
-		} while (nread == -1 && errno == EINTR);
-	} else {
-		fd_set rdset;
-		int flags, fdmax;
-
-		flags = fcntl(stream_fs->fd, F_GETFL);
-		fcntl(stream_fs->fd, F_SETFL, flags | O_NONBLOCK);
-		FD_ZERO(&rdset);
-		FD_SET(stream_fs->fd, &rdset);
-		FD_SET(cancel_fd, &rdset);
-		fdmax = MAX(stream_fs->fd, cancel_fd)+1;
-		select(fdmax, &rdset, 0, 0, NULL);
-		if (FD_ISSET(cancel_fd, &rdset)) {
-			fcntl(stream_fs->fd, F_SETFL, flags);
-			errno = EINTR;
-			return -1;
-		}
-		nread = read(stream_fs->fd, buffer, n);
-		fcntl(stream_fs->fd, F_SETFL, flags);
-	}
-
-	if (nread > 0)
-		seekable->position += nread;
-	else if (nread == 0)
-		stream->eos = TRUE;
-
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t v, written = 0;
-	int cancel_fd;
-
-	if (camel_operation_cancel_check(NULL)) {
-		errno = EINTR;
-		return  -1;
-	}
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-
-	cancel_fd = camel_operation_cancel_fd(NULL);
-	if (cancel_fd == -1) {
-		do {
-			v = write (stream_fs->fd, buffer+written, n-written);
-			if (v > 0)
-				written += v;
-		} while (v == -1 && errno == EINTR);
-	} else {
-		fd_set rdset, wrset;
-		int flags, fdmax;
-
-		flags = fcntl(stream_fs->fd, F_GETFL);
-		fcntl(stream_fs->fd, F_SETFL, flags | O_NONBLOCK);
-		fdmax = MAX(stream_fs->fd, cancel_fd)+1;
-		do {
-			FD_ZERO(&rdset);
-			FD_ZERO(&wrset);
-			FD_SET(stream_fs->fd, &wrset);
-			FD_SET(cancel_fd, &rdset);
-			select(fdmax, &rdset, &wrset, 0, NULL);
-			if (FD_ISSET(cancel_fd, &rdset)) {
-				fcntl(stream_fs->fd, F_SETFL, flags);
-				errno = EINTR;
-				return -1;
-			}
-			v = write(stream_fs->fd, buffer+written, n-written);
-			if (v>0)
-				written += v;
-		} while (v != -1 && written < n);
-		fcntl(stream_fs->fd, F_SETFL, flags);
-	}
-
-	if (written > 0)
-		seekable->position += written;
-	else if (v == -1)
-		return -1;
-
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return fsync(((CamelStreamFs *)stream)->fd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (close (((CamelStreamFs *)stream)->fd) == -1)
-		return -1;
-	
-	((CamelStreamFs *)stream)->fd = -1;
-	return 0;
-}
-
-static off_t
-stream_seek (CamelSeekableStream *stream, off_t offset, CamelStreamSeekPolicy policy)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	off_t real = 0;
-
-	switch (policy) {
-	case CAMEL_STREAM_SET:
-		real = offset;
-		break;
-	case CAMEL_STREAM_CUR:
-		real = stream->position + offset;
-		break;
-	case CAMEL_STREAM_END:
-		if (stream->bound_end == CAMEL_STREAM_UNBOUND) {
-			real = lseek(stream_fs->fd, offset, SEEK_END);
-			if (real != -1) {
-				if (real<stream->bound_start)
-					real = stream->bound_start;
-				stream->position = real;
-			}
-			return real;
-		}
-		real = stream->bound_end + offset;
-		break;
-	}
-
-	if (stream->bound_end != CAMEL_STREAM_UNBOUND)
-		real = MIN (real, stream->bound_end);
-	real = MAX (real, stream->bound_start);
-
-	real = lseek(stream_fs->fd, real, SEEK_SET);
-	if (real == -1)
-		return -1;
-
-	if (real != stream->position && ((CamelStream *)stream)->eos)
-		((CamelStream *)stream)->eos = FALSE;
-
-	stream->position = real;
-
-	return real;
-}
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
deleted file mode 100644
index ea403f584f..0000000000
--- a/camel/camel-stream-fs.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.h :stream based on unix filesystem */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_FS_H
-#define CAMEL_STREAM_FS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-
-/* for open flags */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define CAMEL_STREAM_FS_TYPE     (camel_stream_fs_get_type ())
-#define CAMEL_STREAM_FS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))
-#define CAMEL_STREAM_FS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))
-#define CAMEL_IS_STREAM_FS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))
-
-struct _CamelStreamFs
-{
-	CamelSeekableStream parent_object;
-
-	int fd;             /* file descriptor on the underlying file */
-};
-
-typedef struct {
-	CamelSeekableStreamClass parent_class;
-
-} CamelStreamFsClass;
-
-/* Standard Camel function */
-CamelType camel_stream_fs_get_type (void);
-
-/* public methods */
-CamelStream * camel_stream_fs_new_with_name            (const char *name, int flags, mode_t mode);
-CamelStream * camel_stream_fs_new_with_name_and_bounds (const char *name, int flags, mode_t mode,
-							off_t start, off_t end);
-
-CamelStream * camel_stream_fs_new_with_fd              (int fd);
-CamelStream * camel_stream_fs_new_with_fd_and_bounds   (int fd, off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_FS_H */
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
deleted file mode 100644
index b9012bcccb..0000000000
--- a/camel/camel-stream-mem.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-mem.c: memory buffer based stream */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-mem.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelStreamMem */
-#define CSM_CLASS(so) CAMEL_STREAM_MEM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static gboolean stream_eos (CamelStream *stream);
-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-
-static void camel_stream_mem_finalize (CamelObject *object);
-
-static void
-camel_stream_mem_class_init (CamelStreamMemClass *camel_stream_mem_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_mem_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_stream_mem_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_SEEKABLE_STREAM_TYPE ) );
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->eos = stream_eos;
-
-	camel_seekable_stream_class->seek = stream_seek;
-}
-
-static void
-camel_stream_mem_init (CamelObject *object)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);
-
-	stream_mem->owner = FALSE;
-	stream_mem->buffer = 0;
-}
-
-CamelType
-camel_stream_mem_get_type (void)
-{
-	static CamelType camel_stream_mem_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_mem_type == CAMEL_INVALID_TYPE) {
-		camel_stream_mem_type = camel_type_register( CAMEL_SEEKABLE_STREAM_TYPE,
-							     "CamelStreamMem",
-							     sizeof( CamelStreamMem ),
-							     sizeof( CamelStreamMemClass ),
-							     (CamelObjectClassInitFunc) camel_stream_mem_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_stream_mem_init,
-							     (CamelObjectFinalizeFunc) camel_stream_mem_finalize );
-	}
-
-	return camel_stream_mem_type;
-}
-
-
-CamelStream *
-camel_stream_mem_new (void)
-{
-	return camel_stream_mem_new_with_byte_array (g_byte_array_new ());
-}
-
-CamelStream *
-camel_stream_mem_new_with_buffer (const char *buffer, size_t len)
-{
-	GByteArray *ba;
-
-	ba = g_byte_array_new ();
-	g_byte_array_append (ba, (const guint8 *)buffer, len);
-	return camel_stream_mem_new_with_byte_array (ba);
-}
-
-CamelStream *
-camel_stream_mem_new_with_byte_array (GByteArray *byte_array)
-{
-	CamelStreamMem *stream_mem;
-
-	stream_mem = CAMEL_STREAM_MEM( camel_object_new (CAMEL_STREAM_MEM_TYPE) );
-	stream_mem->buffer = byte_array;
-	stream_mem->owner = TRUE;
-
-	return CAMEL_STREAM (stream_mem);
-}
-
-/* note: with these functions the caller is the 'owner' of the buffer */
-void camel_stream_mem_set_byte_array (CamelStreamMem *s, GByteArray *buffer)
-{
-	if (s->buffer && s->owner)
-		g_byte_array_free(s->buffer, TRUE);
-	s->owner = FALSE;
-	s->buffer = buffer;
-}
-
-void camel_stream_mem_set_buffer (CamelStreamMem *s, const char *buffer, size_t len)
-{
-	GByteArray *ba;
-
-	ba = g_byte_array_new ();
-	g_byte_array_append(ba, (const guint8 *)buffer, len);
-	camel_stream_mem_set_byte_array(s, ba);
-	s->owner = TRUE;
-}
-
-static void
-camel_stream_mem_finalize (CamelObject *object)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);
-
-	if (stream_mem->buffer && stream_mem->owner)
-		g_byte_array_free (stream_mem->buffer, TRUE);
-
-	/* Will be called automagically in the Camel Type System!
-	 * Wheeee!
-	 * G_TK_OBJECT_CLASS (parent_class)->finalize (object);
-	 */
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamMem *camel_stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nread;
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN(seekable->bound_end - seekable->position, n);
-
-	nread = MIN (n, camel_stream_mem->buffer->len - seekable->position);
-	if (nread > 0) {
-		memcpy (buffer, camel_stream_mem->buffer->data + seekable->position, nread);
-		seekable->position += nread;
-	} else
-		nread = 0;
-
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nwrite = n;
-	
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		nwrite = MIN(seekable->bound_end - seekable->position, n);
-
-#ifndef NO_WARNINGS
-#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object"
-#endif
-	if (seekable->position == stream_mem->buffer->len) {
-		g_byte_array_append(stream_mem->buffer, (const guint8 *)buffer, nwrite);
-	} else {
-		g_byte_array_set_size(stream_mem->buffer, nwrite + stream_mem->buffer->len);
-		memcpy(stream_mem->buffer->data + seekable->position, buffer, nwrite);
-	}
-	seekable->position += nwrite;
-
-	return nwrite;
-}
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-
-	return stream_mem->buffer->len <= seekable_stream->position;
-}
-
-static off_t
-stream_seek (CamelSeekableStream *stream, off_t offset,
-	     CamelStreamSeekPolicy policy)
-{
-	off_t position;
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-
-	switch  (policy) {
-	case CAMEL_STREAM_SET:
-		position = offset;
-		break;
-	case CAMEL_STREAM_CUR:
-		position = stream->position + offset;
-		break;
-	case CAMEL_STREAM_END:
-		position = (stream_mem->buffer)->len + offset;
-		break;
-	default:
-		position = offset;
-		break;
-	}
-
-	if (stream->bound_end != CAMEL_STREAM_UNBOUND)
-		position = MIN (position, stream->bound_end);
-	if (stream->bound_start != CAMEL_STREAM_UNBOUND)
-		position = MAX (position, 0);
-	else
-		position = MAX (position, stream->bound_start);
-
-	if (position > stream_mem->buffer->len) {
-		int oldlen = stream_mem->buffer->len;
-		g_byte_array_set_size (stream_mem->buffer, position);
-		memset (stream_mem->buffer->data + oldlen, 0,
-			position - oldlen);
-	}
-
-	stream->position = position;
-
-	return position;
-}
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
deleted file mode 100644
index 422d05426c..0000000000
--- a/camel/camel-stream-mem.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-mem.h: stream based on memory buffer */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_MEM_H
-#define CAMEL_STREAM_MEM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-#include <sys/types.h>
-
-#define CAMEL_STREAM_MEM_TYPE     (camel_stream_mem_get_type ())
-#define CAMEL_STREAM_MEM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))
-#define CAMEL_STREAM_MEM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))
-#define CAMEL_IS_STREAM_MEM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))
-
-typedef struct _CamelStreamMemClass CamelStreamMemClass;
-
-struct _CamelStreamMem {
-	CamelSeekableStream parent_object;
-
-	gboolean owner;		/* do we own the buffer? */
-	GByteArray *buffer;
-};
-
-struct _CamelStreamMemClass {
-	CamelSeekableStreamClass parent_class;
-
-	/* Virtual methods */
-};
-
-/* Standard Camel function */
-CamelType camel_stream_mem_get_type (void);
-
-/* public methods */
-CamelStream *camel_stream_mem_new(void);
-CamelStream *camel_stream_mem_new_with_byte_array(GByteArray *buffer);
-CamelStream *camel_stream_mem_new_with_buffer(const char *buffer, size_t len);
-
-/* these are really only here for implementing classes */
-void camel_stream_mem_set_byte_array(CamelStreamMem *, GByteArray *buffer);
-void camel_stream_mem_set_buffer(CamelStreamMem *, const char *buffer, size_t len);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_MEM_H */
diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
deleted file mode 100644
index 34cc67ec7c..0000000000
--- a/camel/camel-stream-null.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream.c : abstract class for a stream */
-
-/*
- * Author:
- *  Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-null.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelStream */
-#define CS_CLASS(so) CAMEL_STREAM_NULL_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-/* dummy implementations, for a NULL stream */
-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }
-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { return n; }
-static int       stream_close      (CamelStream *stream) { return 0; }
-static int       stream_flush      (CamelStream *stream) { return 0; }
-static gboolean  stream_eos        (CamelStream *stream) { return TRUE; }
-static int       stream_reset      (CamelStream *stream) { return 0; }
-
-static void
-camel_stream_null_class_init (CamelStreamClass *camel_stream_null_class)
-{
-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_stream_null_class;
-
-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );
-
-	/* virtual method definition */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->eos = stream_eos;
-	camel_stream_class->reset = stream_reset;
-}
-
-CamelType
-camel_stream_null_get_type (void)
-{
-	static CamelType camel_stream_null_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_null_type == CAMEL_INVALID_TYPE) {
-		camel_stream_null_type = camel_type_register( camel_stream_get_type(),
-							      "CamelStreamNull",
-							      sizeof( CamelStreamNull ),
-							      sizeof( CamelStreamNullClass ),
-							      (CamelObjectClassInitFunc) camel_stream_null_class_init,
-							      NULL,
-							      NULL,
-							      NULL );
-	}
-
-	return camel_stream_null_type;
-}
-
-/**
- * camel_stream_fs_new_with_fd:
- * @fd: a file descriptor
- *
- * Returns a NULL stream.  A null stream is always at eof, and
- * always returns success for all reads and writes.
- *
- * Return value: the stream
- **/
-CamelStreamNull *
-camel_stream_null_new(void)
-{
-	return (CamelStreamNull *)camel_object_new(camel_stream_null_get_type ());
-}
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
deleted file mode 100644
index 70978c5d61..0000000000
--- a/camel/camel-stream-null.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_STREAM_NULL_H
-#define _CAMEL_STREAM_NULL_H
-
-#include <camel/camel-stream.h>
-
-#define CAMEL_STREAM_NULL(obj)         CAMEL_CHECK_CAST (obj, camel_stream_null_get_type (), CamelStreamNull)
-#define CAMEL_STREAM_NULL_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_null_get_type (), CamelStreamNullClass)
-#define CAMEL_IS_STREAM_NULL(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_null_get_type ())
-
-typedef struct _CamelStreamNullClass CamelStreamNullClass;
-
-struct _CamelStreamNull {
-	CamelStream parent;
-};
-
-struct _CamelStreamNullClass {
-	CamelStreamClass parent_class;
-};
-
-guint			camel_stream_null_get_type	(void);
-
-CamelStreamNull      *camel_stream_null_new		(void);
-
-#endif /* ! _CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-stream-ssl.c b/camel/camel-stream-ssl.c
deleted file mode 100644
index 9e328e47fe..0000000000
--- a/camel/camel-stream-ssl.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include "camel-stream-ssl.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelStreamSSL */
-#define CSSSL_CLASS(so) CAMEL_STREAM_SSL_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static SSL *open_ssl_connection (int sockfd);
-static int close_ssl_connection (SSL *ssl);
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush  (CamelStream *stream);
-static int stream_close  (CamelStream *stream);
-
-static void
-camel_stream_ssl_class_init (CamelStreamSSLClass *camel_stream_ssl_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_stream_ssl_class);
-	
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-	
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-}
-
-static void
-camel_stream_ssl_init (gpointer object, gpointer klass)
-{
-	CamelStreamSSL *stream = CAMEL_STREAM_SSL (object);
-	
-	stream->fd = -1;
-	stream->ssl = NULL;
-}
-
-static void
-camel_stream_ssl_finalize (CamelObject *object)
-{
-	CamelStreamSSL *stream = CAMEL_STREAM_SSL (object);
-	
-	if (stream->ssl) {
-		SSL_shutdown (stream->ssl);
-		
-		if (stream->ssl->ctx)
-			SSL_CTX_free (stream->ssl->ctx);
-		
-		SSL_free (stream->ssl);
-	}
-	
-	if (stream->fd != -1)
-		close (stream->fd);
-}
-
-
-CamelType
-camel_stream_ssl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_stream_get_type (),
-					    "CamelStreamSSL",
-					    sizeof (CamelStreamSSL),
-					    sizeof (CamelStreamSSLClass),
-					    (CamelObjectClassInitFunc) camel_stream_ssl_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_stream_ssl_init,
-					    (CamelObjectFinalizeFunc) camel_stream_ssl_finalize);
-	}
-	
-	return type;
-}
-
-static int
-verify_callback (int ok, X509_STORE_CTX *ctx) 
-{
-	char *str, buf[256];
-	X509 *cert;
-	int err;
-	
-	cert = X509_STORE_CTX_get_current_cert (ctx);
-	err = X509_STORE_CTX_get_error (ctx);
-	
-	str = X509_NAME_oneline (X509_get_subject_name (cert), buf, 256);
-	if (str) {
-		if (ok)
-			d(fprintf (stderr, "CamelStreamSSL: depth=%d %s\n", ctx->error_depth, buf));
-		else
-			d(fprintf (stderr, "CamelStreamSSL: depth=%d error=%d %s\n",
-				   ctx->error_depth, err, buf));
-	}
-	
-	if (!ok) {
-		switch (err) {
-		case X509_V_ERR_CERT_NOT_YET_VALID:
-		case X509_V_ERR_CERT_HAS_EXPIRED:
-		case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-			ok = 1;
-		}
-	}
-	
-	return ok;
-}
-
-static SSL *
-open_ssl_connection (int sockfd)
-{
-	SSL_CTX *ssl_ctx = NULL;
-	SSL *ssl = NULL;
-	int n;
-	
-	/* SSLv23_client_method will negotiate with SSL v2, v3, or TLS v1 */
-	ssl_ctx = SSL_CTX_new (SSLv23_client_method ());
-	SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, &verify_cb);
-	ssl = SSL_new (ssl_ctx);
-	SSL_set_fd (ssl, sockfd);
-	
-	n = SSL_connect (ssl);
-	if (n != 1) {
-		SSL_shutdown (ssl);
-		
-		if (ssl->ctx)
-			SSL_CTX_free (ssl->ctx);
-		
-		SSL_free (ssl);
-		ssl = NULL;
-	}
-	
-	return ssl;
-}
-
-static int
-close_ssl_connection (SSL *ssl)
-{
-	if (ssl) {
-		SSL_shutdown (ssl);
-		
-		if (ssl->ctx)
-			SSL_CTX_free (ssl->ctx);
-		
-		SSL_free (ssl);
-	}
-	
-	return 0;
-}
-
-
-/**
- * camel_stream_ssl_new:
- * @sockfd: a socket file descriptor
- *
- * Returns a stream associated with the given file descriptor.
- * When the stream is destroyed, the file descriptor will be closed.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_ssl_new (int sockfd)
-{
-	CamelStreamSSL *stream_ssl;
-	SSL *ssl;
-	
-	if (sockfd == -1)
-		return NULL;
-	
-	ssl = open_ssl_connection (sockfd);
-	if (!ssl)
-		return NULL;
-	
-	stream_ssl = CAMEL_STREAM_SSL (camel_object_new (camel_stream_ssl_get_type ()));
-	stream_ssl->sockfd = sockfd;
-	stream_ssl->ssl = ssl;
-	
-	return CAMEL_STREAM (stream_ssl);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamSSL *stream_ssl = CAMEL_STREAM_SSL (stream);
-	ssize_t nread;
-	
-	do {
-		nread = SSL_read (stream_ssl->ssl, buffer, n);
-	} while (nread == -1 && errno == EINTR);
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamSSL *stream_ssl = CAMEL_STREAM_SSL (stream);
-	ssize_t v, written = 0;
-	
-	do {
-		v = SSL_write (stream_ssl->ssl, buffer, n);
-		if (v > 0)
-			written += v;
-	} while (v == -1 && errno == EINTR);
-	
-	if (v == -1)
-		return -1;
-	else
-		return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return fsync (((CamelStreamSSL *)stream)->fd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	close_ssl_connection (((CamelStreamSSL *)stream)->ssl);
-	
-	return close (((CamelStreamSSL *)stream)->fd);
-}
diff --git a/camel/camel-stream-ssl.h b/camel/camel-stream-ssl.h
deleted file mode 100644
index 9bed6fbffc..0000000000
--- a/camel/camel-stream-ssl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_STREAM_SSL_H
-#define CAMEL_STREAM_SSL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-stream.h>
-#include <openssl/ssl.h>
-
-#define CAMEL_STREAM_SSL_TYPE     (camel_stream_ssl_get_type ())
-#define CAMEL_STREAM_SSL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_SSL_TYPE, CamelStreamSSL))
-#define CAMEL_STREAM_SSL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_SSL_TYPE, CamelStreamSSLClass))
-#define CAMEL_IS_STREAM_SSL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_SSL_TYPE))
-
-struct _CamelStreamSSL {
-	CamelStream parent_object;
-	
-	int sockfd;             /* file descriptor on the underlying socket */
-	SSL *ssl;               /* SSL structure */
-};
-
-typedef struct {
-	CamelStreamClass parent_class;
-} CamelStreamSSLClass;
-
-/* Standard Camel function */
-CamelType camel_stream_ssl_get_type (void);
-
-/* public methods */
-CamelStream *camel_stream_ssl_new (int sockfd);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_SSL_H */
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
deleted file mode 100644
index 2c8924ee7c..0000000000
--- a/camel/camel-stream.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream.c : abstract class for a stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelStream */
-#define CS_CLASS(so) CAMEL_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-/* default implementations, do very little */
-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }
-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { return n; }
-static int       stream_close      (CamelStream *stream) { return 0; }
-static int       stream_flush      (CamelStream *stream) { return 0; }
-static gboolean  stream_eos        (CamelStream *stream) { return stream->eos; }
-static int       stream_reset      (CamelStream *stream) { return 0; }
-
-static void
-camel_stream_class_init (CamelStreamClass *camel_stream_class)
-{
-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );
-
-	/* virtual method definition */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->eos = stream_eos;
-	camel_stream_class->reset = stream_reset;
-}
-
-CamelType
-camel_stream_get_type (void)
-{
-	static CamelType camel_stream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_type == CAMEL_INVALID_TYPE) {
-		camel_stream_type = camel_type_register( CAMEL_OBJECT_TYPE,
-							 "CamelStream",
-							 sizeof( CamelStream ),
-							 sizeof( CamelStreamClass ),
-							 (CamelObjectClassInitFunc) camel_stream_class_init,
-							 NULL,
-							 NULL,
-							 NULL );
-	}
-
-	return camel_stream_type;
-}
-
-/**
- * camel_stream_read:
- * @stream: a CamelStream.
- * @buffer: buffer where bytes pulled from the stream are stored.
- * @n: max number of bytes to read.
- *
- * Read at most @n bytes from the @stream object and stores them
- * in the buffer pointed at by @buffer.
- *
- * Return value: number of bytes actually read, or -1 on error and
- * set errno.
- **/
-ssize_t
-camel_stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (n == 0 || buffer, -1);
-
-	return CS_CLASS (stream)->read (stream, buffer, n);
-}
-
-/**
- * camel_stream_write:
- * @stream: a CamelStream object.
- * @buffer: buffer to write.
- * @n: number of bytes to write
- *
- * Write @n bytes from the buffer pointed at by @buffer into @stream.
- *
- * Return value: the number of bytes actually written to the stream,
- * or -1 on error.
- **/
-ssize_t
-camel_stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (n == 0 || buffer, -1);
-
-	return CS_CLASS (stream)->write (stream, buffer, n);
-}
-
-/**
- * camel_stream_flush:
- * @stream: a CamelStream object
- *
- * Flushes the contents of the stream to its backing store. Only meaningful
- * on writable streams.
- *
- * Return value: -1 on error.
- **/
-int
-camel_stream_flush (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->flush (stream);
-}
-
-/**
- * camel_stream_close:
- * @stream: 
- * 
- * Close a stream.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_stream_close (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->close (stream);
-}
-
-/**
- * camel_stream_eos:
- * @stream: a CamelStream object
- *
- * Test if there are bytes left to read on the @stream object.
- *
- * Return value: %TRUE if all the contents on the stream has been read, or
- * %FALSE if information is still available.
- **/
-gboolean
-camel_stream_eos (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), TRUE);
-
-	return CS_CLASS (stream)->eos (stream);
-}
-
-/**
- * camel_stream_reset: reset a stream
- * @stream: the stream object
- *
- * Reset a stream. That is, put it in a state where it can be read
- * from the beginning again. Not all streams in Camel are seekable,
- * but they must all be resettable.
- *
- * Return value: -1 on error.
- **/
-int
-camel_stream_reset (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->reset (stream);
-}
-
-/***************** Utility functions ********************/
-
-/**
- * camel_stream_write_string:
- * @stream: a stream object
- * @string: a string
- *
- * Writes the string to the stream.
- *
- * Return value: the number of characters output, -1 on error.
- **/
-ssize_t
-camel_stream_write_string (CamelStream *stream, const char *string)
-{
-	return camel_stream_write (stream, string, strlen (string));
-}
-
-/**
- * camel_stream_printf:
- * @stream: a stream object
- * @fmt: a printf-style format string
- *
- * This printfs the given data to @stream.
- *
- * Return value: the number of characters output, -1 on error.
- **/
-ssize_t
-camel_stream_printf (CamelStream *stream, const char *fmt, ... )
-{
-	va_list args;
-	char *string;
-	ssize_t ret;
-
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	va_start (args, fmt);
-	string = g_strdup_vprintf (fmt, args);
-	va_end (args);
-
-	if (!string)
-		return -1;
-
-	ret = camel_stream_write (stream, string, strlen (string));
-	g_free (string);
-	return ret;
-}
-
-/**
- * camel_stream_write_to_stream:
- * @stream: Source CamelStream.
- * @output_stream: Destination CamelStream.
- *
- * Write all of a stream (until eos) into another stream, in a blocking
- * fashion.
- *
- * Return value: Returns -1 on error, or the number of bytes succesfully
- * copied across streams.
- **/
-ssize_t
-camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream)
-{
-	char tmp_buf[4096];
-	ssize_t total = 0;
-	ssize_t nb_read;
-	ssize_t nb_written;
-
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (output_stream), -1);
-
-	while (!camel_stream_eos (stream)) {
-		nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));
-		if (nb_read < 0)
-			return -1;
-		else if (nb_read > 0) {
-			nb_written = 0;
-
-			while (nb_written < nb_read) {
-				ssize_t len = camel_stream_write (output_stream, tmp_buf + nb_written,
-								  nb_read - nb_written);
-				if (len < 0)
-					return -1;
-				nb_written += len;
-			}
-			total += nb_written;
-		}
-	}
-	return total;
-}
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
deleted file mode 100644
index dec4e638e1..0000000000
--- a/camel/camel-stream.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream.h : class for an abstract stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_H
-#define CAMEL_STREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#define CAMEL_STREAM_TYPE     (camel_stream_get_type ())
-#define CAMEL_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))
-#define CAMEL_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))
-#define CAMEL_IS_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_TYPE))
-
-struct _CamelStream
-{
-	CamelObject parent_object;
-
-	gboolean eos;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */
-
-	ssize_t   (*read)       (CamelStream *stream, char *buffer, size_t n);
-	ssize_t   (*write)      (CamelStream *stream, const char *buffer, size_t n);
-	int       (*close)      (CamelStream *stream);
-	int       (*flush)      (CamelStream *stream);
-	gboolean  (*eos)        (CamelStream *stream);
-	int       (*reset)      (CamelStream *stream);
-
-} CamelStreamClass;
-
-/* Standard Camel function */
-CamelType camel_stream_get_type (void);
-
-/* public methods */
-ssize_t    camel_stream_read       (CamelStream *stream, char *buffer, size_t n);
-ssize_t    camel_stream_write      (CamelStream *stream, const char *buffer, size_t n);
-int        camel_stream_flush      (CamelStream *stream);
-int        camel_stream_close      (CamelStream *stream);
-gboolean   camel_stream_eos        (CamelStream *stream);
-int        camel_stream_reset      (CamelStream *stream);
-
-/* utility macros and funcs */
-ssize_t camel_stream_write_string (CamelStream *stream, const char *string);
-ssize_t camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);
-ssize_t camel_stream_vprintf (CamelStream *stream, const char *fmt, va_list ap);
-
-/* Write a whole stream to another stream, until eof or error on
- * either stream.
- */
-ssize_t camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_H */
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
deleted file mode 100644
index 6467eed5da..0000000000
--- a/camel/camel-tcp-stream-raw.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include "camel-tcp-stream-raw.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-static CamelTcpStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStreamRaw */
-#define CTSR_CLASS(so) CAMEL_TCP_STREAM_RAW_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush  (CamelStream *stream);
-static int stream_close  (CamelStream *stream);
-
-static int stream_connect (CamelTcpStream *stream, struct hostent *host, int port);
-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-
-static void
-camel_tcp_stream_raw_class_init (CamelTcpStreamRawClass *camel_tcp_stream_raw_class)
-{
-	CamelTcpStreamClass *camel_tcp_stream_class =
-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_raw_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_raw_class);
-	
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_stream_get_type ()));
-	
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	
-	camel_tcp_stream_class->connect = stream_connect;
-	camel_tcp_stream_class->getsockopt = stream_getsockopt;
-	camel_tcp_stream_class->setsockopt = stream_setsockopt;
-}
-
-static void
-camel_tcp_stream_raw_init (gpointer object, gpointer klass)
-{
-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);
-	
-	stream->sockfd = -1;
-}
-
-static void
-camel_tcp_stream_raw_finalize (CamelObject *object)
-{
-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);
-	
-	if (stream->sockfd != -1)
-		close (stream->sockfd);
-}
-
-
-CamelType
-camel_tcp_stream_raw_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_stream_get_type (),
-					    "CamelTcpStreamRaw",
-					    sizeof (CamelTcpStreamRaw),
-					    sizeof (CamelTcpStreamRawClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_raw_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_raw_init,
-					    (CamelObjectFinalizeFunc) camel_tcp_stream_raw_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_tcp_stream_raw_new:
- *
- * Return value: a tcp stream
- **/
-CamelStream *
-camel_tcp_stream_raw_new ()
-{
-	CamelTcpStreamRaw *stream;
-	
-	stream = CAMEL_TCP_STREAM_RAW (camel_object_new (camel_tcp_stream_raw_get_type ()));
-	
-	return CAMEL_STREAM (stream);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);
-	ssize_t nread;
-	
-	do {
-		nread = read (tcp_stream_raw->sockfd, buffer, n);
-	} while (nread == -1 && errno == EINTR);
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);
-	ssize_t v, written = 0;
-	
-	do {
-		v = write (tcp_stream_raw->sockfd, buffer, n);
-		if (v > 0)
-			written += v;
-	} while (v == -1 && errno == EINTR);
-	
-	if (v == -1)
-		return -1;
-	else
-		return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return fsync (((CamelTcpStreamRaw *)stream)->sockfd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (close (((CamelTcpStreamRaw *)stream)->sockfd) == -1)
-		return -1;
-	
-	((CamelTcpStreamRaw *)stream)->sockfd = -1;
-	return 0;
-}
-
-
-static int
-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	CamelTcpStreamRaw *raw = CAMEL_TCP_STREAM_RAW (stream);
-	struct sockaddr_in sin;
-	int fd;
-	
-	g_return_val_if_fail (host != NULL, -1);
-	
-	sin.sin_family = host->h_addrtype;
-	sin.sin_port = htons (port);
-	
-	memcpy (&sin.sin_addr, host->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (host->h_addrtype, SOCK_STREAM, 0);
-	
-	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof (sin)) == -1) {
-		if (fd > -1)
-			close (fd);
-		
-		return -1;
-	}
-	
-	raw->sockfd = fd;
-	
-	return 0;
-}
-
-
-static int
-get_sockopt_level (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-	case CAMEL_SOCKOPT_NODELAY:
-		return IPPROTO_TCP;
-	default:
-		return SOL_SOCKET;
-	}
-}
-
-static int
-get_sockopt_optname (const CamelSockOptData *data)
-{
-	switch (data->option) {
-	case CAMEL_SOCKOPT_MAXSEGMENT:
-		return TCP_MAXSEG;
-	case CAMEL_SOCKOPT_NODELAY:
-		return TCP_NODELAY;
-	case CAMEL_SOCKOPT_BROADCAST:
-		return SO_BROADCAST;
-	case CAMEL_SOCKOPT_KEEPALIVE:
-		return SO_KEEPALIVE;
-	case CAMEL_SOCKOPT_LINGER:
-		return SO_LINGER;
-	case CAMEL_SOCKOPT_RECVBUFFERSIZE:
-		return SO_RCVBUF;
-	case CAMEL_SOCKOPT_SENDBUFFERSIZE:
-		return SO_SNDBUF;
-	case CAMEL_SOCKOPT_REUSEADDR:
-		return SO_REUSEADDR;
-	case CAMEL_SOCKOPT_IPTYPEOFSERVICE:
-		return SO_TYPE;
-	default:
-		return -1;
-	}
-}
-
-static int
-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	int optname, optlen;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags;
-		
-		flags = fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		data->value.non_blocking = flags & O_NONBLOCK;
-		
-		return 0;
-	}
-	
-	return getsockopt (((CamelTcpStreamRaw *)stream)->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   &optlen);
-}
-
-static int
-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	int optname;
-	
-	if ((optname = get_sockopt_optname (data)) == -1)
-		return -1;
-	
-	if (data->option == CAMEL_SOCKOPT_NONBLOCKING) {
-		int flags, set;
-		
-		fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_GETFL);
-		if (flags == -1)
-			return -1;
-		
-		set = data->value.non_blocking ? 1 : 0;
-		flags = (flags & ~O_NONBLOCK) | (set & O_NONBLOCK);
-		
-		if (fcntl (((CamelTcpStreamRaw *)stream)->sockfd, F_SETFL, flags) == -1)
-			return -1;
-		
-		return 0;
-	}
-	
-	return setsockopt (((CamelTcpStreamRaw *)stream)->sockfd,
-			   get_sockopt_level (data),
-			   optname,
-			   (void *) &data->value,
-			   sizeof (data->value));
-}
diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h
deleted file mode 100644
index 41304efde7..0000000000
--- a/camel/camel-tcp-stream-raw.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_TCP_STREAM_RAW_H
-#define CAMEL_TCP_STREAM_RAW_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-tcp-stream.h>
-
-#define CAMEL_TCP_STREAM_RAW_TYPE     (camel_tcp_stream_raw_get_type ())
-#define CAMEL_TCP_STREAM_RAW(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRaw))
-#define CAMEL_TCP_STREAM_RAW_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRawClass))
-#define CAMEL_IS_TCP_STREAM_RAW(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_RAW_TYPE))
-
-struct _CamelTcpStreamRaw
-{
-	CamelTcpStream parent_object;
-	
-	int sockfd;
-};
-
-typedef struct {
-	CamelTcpStreamClass parent_class;
-	
-	/* virtual functions */
-	
-} CamelTcpStreamRawClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_raw_get_type (void);
-
-/* public methods */
-CamelStream *camel_tcp_stream_raw_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_RAW_H */
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
deleted file mode 100644
index 4249e2ea70..0000000000
--- a/camel/camel-tcp-stream-ssl.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include "camel-tcp-stream-ssl.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-static CamelTcpStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStreamSSL */
-#define CTSS_CLASS(so) CAMEL_TCP_STREAM_SSL_CLASS (CAMEL_OBJECT_GET_CLASS (so))
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush  (CamelStream *stream);
-static int stream_close  (CamelStream *stream);
-
-static int stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-
-/* callbacks */
-
-static SECStatus ssl_bad_cert  (void *data, PRFileDesc *fd);
-static SECStatus ssl_auth_cert (void *data, PRFileDesc *fd, PRBool checksig, PRBool is_server);
-
-
-static void
-camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *camel_tcp_stream_ssl_class)
-{
-	CamelTcpStreamClass *camel_tcp_stream_class =
-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_ssl_class);
-	
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_stream_get_type ()));
-	
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	
-	camel_tcp_stream_class->connect = stream_connect;
-	camel_tcp_stream_class->getsockopt = stream_getsockopt;
-	camel_tcp_stream_class->setsockopt = stream_setsockopt;
-}
-
-static void
-camel_tcp_stream_ssl_init (gpointer object, gpointer klass)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	stream->sockfd = NULL;
-	stream->session = NULL;
-	stream->expected_host = NULL;
-}
-
-static void
-camel_tcp_stream_ssl_finalize (CamelObject *object)
-{
-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
-	
-	if (stream->sockfd != NULL)
-		PR_Close (stream->sockfd);
-	
-	camel_object_unref (CAMEL_OBJECT (stream->session));
-	g_free (stream->expected_host);
-}
-
-
-CamelType
-camel_tcp_stream_ssl_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_stream_get_type (),
-					    "CamelTcpStreamSSL",
-					    sizeof (CamelTcpStreamSSL),
-					    sizeof (CamelTcpStreamSSLClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_ssl_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_ssl_init,
-					    (CamelObjectFinalizeFunc) camel_tcp_stream_ssl_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_tcp_stream_ssl_new:
- * @session: camel session
- * @expected_host: host that the stream is expected to connect with.
- *
- * Since the SSL certificate authenticator may need to prompt the
- * user, a CamelSession is needed. #expected_host is needed as a
- * protection against an MITM attack.
- *
- * Return value: a tcp stream
- **/
-CamelStream *
-camel_tcp_stream_ssl_new (CamelSession *session, const char *expected_host)
-{
-	CamelTcpStreamSSL *stream;
-	
-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
-	
-	camel_object_ref (CAMEL_OBJECT (session));
-	stream->session = session;
-	stream->expected_host = g_strdup (expected_host);
-	
-	return CAMEL_STREAM (stream);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);
-	ssize_t nread;
-	
-	do {
-		nread = PR_Read (tcp_stream_ssl->sockfd, buffer, n);
-	} while (nread == -1 && errno == EINTR);
-	
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);
-	ssize_t v, written = 0;
-	
-	do {
-		v = PR_Write (tcp_stream_ssl->sockfd, buffer, n);
-		if (v > 0)
-			written += v;
-	} while (v == -1 && errno == EINTR);
-	
-	if (v == -1)
-		return -1;
-	else
-		return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return PR_Fsync (((CamelTcpStreamSSL *)stream)->sockfd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	if (PR_Close (((CamelTcpStreamSSL *)stream)->sockfd) == PR_Failure)
-		return -1;
-	
-	((CamelTcpStreamSSL *)stream)->sockfd = NULL;
-	
-	return 0;
-}
-
-
-static SECStatus
-ssl_auth_cert (void *data, PRFileDesc *fd, PRBool checksig, PRBool is_server)
-{
-	return SSL_AuthCertificate (NULL, fd, TRUE, FALSE);
-}
-
-static SECStatus
-ssl_bad_cert (void *data, PRFileDesc *fd)
-{
-	CamelSession *session;
-	char *string;
-	PRInt32 len;
-	
-	g_return_val_if_fail (data != NULL, SECFailure);
-	g_return_val_if_fail (CAMEL_IS_SESSION (data), SECFailure);
-	
-	/* FIXME: International issues here?? */
-	len = PR_GetErrorTextLen (PR_GetError ());
-	string = g_malloc0 (len);
-	PR_GetErrorText (string);
-	
-	session = CAMEL_SESSION (data);
-	if (camel_session_query_cert_authenticator (session, string))
-		return SECSuccess;
-	
-	return SECFailure;
-}
-
-static int
-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);
-	PRIntervalTime timeout;
-	PRNetAddr netaddr;
-	PRFileDesc *fd, *ssl_fd;
-	
-	g_return_val_if_fail (host != NULL, -1);
-	
-	memset ((void *) &netaddr, 0, sizeof (PRNetAddr));
-	memcpy (&netaddr.inet.ip, host->h_addr, sizeof (netaddr.inet.ip));
-	
-	if (PR_InitializeNetAddr (PR_IpAddrNull, port, &netaddr) == PR_FAILUE)
-		return -1;
-	
-	fd = PR_OpenTCPSocket (host->h_addrtype);
-	ssl_fd = SSL_ImportFD (NULL, fd);
-	
-	SSL_SetUrl (ssl_fd, ssl->expected_host);
-	
-	if (ssl_fd == NULL || PR_Connect (ssl_fd, &netaddr, timeout) == PR_FAILURE) {
-		if (ssl_fd != NULL)
-			PR_Close (ssl_fd);
-		
-		return -1;
-	}
-	
-	SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, NULL);
-	SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl->session);
-	
-	ssl->sockfd = ssl_fd;
-	
-	return 0;
-}
-
-
-static int
-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	PRSocketOptionData sodata;
-	
-	memset ((void *) &sodata, 0, sizeof (sodata));
-	memcpy ((void *) &sodata, (void *) data, sizeof (CamelSockOptData));
-	
-	if (PR_GetSocketOption (((CamelTcpStreamSSL *)stream)->sockfd, &sodata) == PR_FAILURE)
-		return -1;
-	
-	memcpy ((void *) data, (void *) &sodata, sizeof (CamelSockOptData));
-	
-	return 0;
-}
-
-static int
-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	PRSocketOptionData sodata;
-	
-	memset ((void *) &sodata, 0, sizeof (sodata));
-	memcpy ((void *) &sodata, (void *) data, sizeof (CamelSockOptData));
-	
-	if (PR_SetSocketOption (((CamelTcpStreamRaw *)stream)->sockfd, &sodata) == PR_FAILURE)
-		return -1;
-	
-	return 0;
-}
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
deleted file mode 100644
index de6eb1a8bc..0000000000
--- a/camel/camel-tcp-stream-ssl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_TCP_STREAM_SSL_H
-#define CAMEL_TCP_STREAM_SSL_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-tcp-stream.h>
-#include <camel/camel-session.h>
-#include <nspr.h>
-
-#define CAMEL_TCP_STREAM_SSL_TYPE     (camel_tcp_stream_ssl_get_type ())
-#define CAMEL_TCP_STREAM_SSL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSL))
-#define CAMEL_TCP_STREAM_SSL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSLClass))
-#define CAMEL_IS_TCP_STREAM_SSL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_SSL_TYPE))
-
-struct _CamelTcpStreamSSL
-{
-	CamelTcpStream parent_object;
-	
-	PRFileDesc *sockfd;
-	
-	CamelSession *session;
-	char *expected_host;
-};
-
-typedef struct {
-	CamelTcpStreamClass parent_class;
-	
-	/* virtual functions */
-	
-} CamelTcpStreamSSLClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_ssl_get_type (void);
-
-/* public methods */
-CamelStream *camel_tcp_stream_ssl_new (CamelSession *session, const char *expected_host);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_SSL_H */
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
deleted file mode 100644
index 6edd545a1f..0000000000
--- a/camel/camel-tcp-stream.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include "camel-tcp-stream.h"
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelTcpStream */
-#define CTS_CLASS(so) CAMEL_TCP_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int tcp_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-static int tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-static int tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-
-static void
-camel_tcp_stream_class_init (CamelTcpStreamClass *camel_tcp_stream_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_tcp_stream_class);
-	
-	parent_class = CAMEL_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_STREAM_TYPE ) );
-	
-	/* tcp stream methods */
-	camel_tcp_stream_class->connect    = tcp_connect;
-	camel_tcp_stream_class->getsockopt = tcp_getsockopt;
-	camel_tcp_stream_class->setsockopt = tcp_setsockopt;
-}
-
-static void
-camel_tcp_stream_init (void *o)
-{
-	;
-}
-
-CamelType
-camel_tcp_stream_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_STREAM_TYPE,
-					    "CamelTcpStream",
-					    sizeof (CamelTcpStream),
-					    sizeof (CamelTcpStreamClass),
-					    (CamelObjectClassInitFunc) camel_tcp_stream_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_tcp_stream_init,
-					    NULL);
-	}
-
-	return type;
-}
-
-
-static int
-tcp_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	g_warning ("CamelTcpStream::connect called on default implementation\n");
-	return -1;
-}
-
-/**
- * camel_tcp_stream_connect:
- * @stream: a CamelTcpStream object.
- * @host: a hostent value
- * @port: port
- *
- * Create a socket and connect based upon the data provided.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->connect (stream, host, port);
-}
-
-
-static int
-tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	g_warning ("CamelTcpStream::getsockopt called on default implementation\n");
-	return -1;
-}
-
-
-/**
- * camel_tcp_stream_getsockopt:
- * @stream: tcp stream object
- * @data: socket option data
- *
- * Get the socket options set on the stream and populate #data.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->getsockopt (stream, data);
-}
-
-
-static int
-tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	g_warning ("CamelTcpStream::setsockopt called on default implementation\n");
-	return -1;
-}
-
-
-/**
- * camel_tcp_stream_setsockopt:
- * @stream: tcp stream object
- * @data: socket option data
- *
- * Set the socket options contained in #data on the stream.
- *
- * Return value: zero on success or -1 on fail.
- **/
-int
-camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
-{
-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);
-	
-	return CTS_CLASS (stream)->setsockopt (stream, data);
-}
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
deleted file mode 100644
index 56afa7a1fd..0000000000
--- a/camel/camel-tcp-stream.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 CAMEL_TCP_STREAM_H
-#define CAMEL_TCP_STREAM_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-stream.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <unistd.h>
-
-#define CAMEL_TCP_STREAM_TYPE     (camel_tcp_stream_get_type ())
-#define CAMEL_TCP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_TYPE, CamelTcpStream))
-#define CAMEL_TCP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_TYPE, CamelTcpStreamClass))
-#define CAMEL_IS_TCP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_TYPE))
-
-typedef enum {
-	CAMEL_SOCKOPT_NONBLOCKING,     /* nonblocking io */
-	CAMEL_SOCKOPT_LINGER,          /* linger on close if data present */
-	CAMEL_SOCKOPT_REUSEADDR,       /* allow local address reuse */
-	CAMEL_SOCKOPT_KEEPALIVE,       /* keep connections alive */
-	CAMEL_SOCKOPT_RECVBUFFERSIZE,  /* receive buffer size */
-	CAMEL_SOCKOPT_SENDBUFFERSIZE,  /* send buffer size */
-	
-	CAMEL_SOCKOPT_IPTIMETOLIVE,    /* time to live */
-	CAMEL_SOCKOPT_IPTYPEOFSERVICE, /* type of service and precedence */
-	
-	CAMEL_SOCKOPT_ADDMEMBER,       /* add an IP group membership */
-	CAMEL_SOCKOPT_DROPMEMBER,      /* drop an IP group membership */
-	CAMEL_SOCKOPT_MCASTINTERFACE,  /* multicast interface address */
-	CAMEL_SOCKOPT_MCASTTIMETOLIVE, /* multicast timetolive */
-	CAMEL_SOCKOPT_MCASTLOOPBACK,   /* multicast loopback */
-	
-	CAMEL_SOCKOPT_NODELAY,         /* don't delay send to coalesce packets */
-	CAMEL_SOCKOPT_MAXSEGMENT,      /* maximum segment size */
-	CAMEL_SOCKOPT_BROADCAST,       /* enable broadcast */
-	CAMEL_SOCKOPT_LAST
-} CamelSockOpt;
-
-typedef struct linger CamelLinger;
-
-typedef struct _CamelSockOptData {
-	CamelSockOpt option;
-	union {
-		guint       ip_ttl;              /* IP time to live */
-		guint       mcast_ttl;           /* IP multicast time to live */
-		guint       tos;                 /* IP type of service and precedence */
-		gboolean    non_blocking;        /* Non-blocking (network) I/O */
-		gboolean    reuse_addr;          /* Allow local address reuse */
-		gboolean    keep_alive;          /* Keep connections alive */
-		gboolean    mcast_loopback;      /* IP multicast loopback */
-		gboolean    no_delay;            /* Don't delay send to coalesce packets */
-		gboolean    broadcast;           /* Enable broadcast */
-		size_t      max_segment;         /* Maximum segment size */
-		size_t      recv_buffer_size;    /* Receive buffer size */
-		size_t      send_buffer_size;    /* Send buffer size */
-		CamelLinger linger;              /* Time to linger on close if data present */
-	} value;
-} CamelSockOptData;
-
-struct _CamelTcpStream
-{
-	CamelStream parent_object;
-	
-};
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	int (*connect)    (CamelTcpStream *stream, struct hostent *host, int port);
-	int (*getsockopt) (CamelTcpStream *stream, CamelSockOptData *data);
-	int (*setsockopt) (CamelTcpStream *stream, const CamelSockOptData *data);
-	
-} CamelTcpStreamClass;
-
-/* Standard Camel function */
-CamelType camel_tcp_stream_get_type (void);
-
-/* public methods */
-int camel_tcp_stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);
-int camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);
-int camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TCP_STREAM_H */
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
deleted file mode 100644
index ff07728f5f..0000000000
--- a/camel/camel-transport.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-transport.c : Abstract class for an email transport */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-transport.h"
-#include "camel-exception.h"
-
-/* Returns the class for a CamelTransport */
-#define CT_CLASS(so) CAMEL_TRANSPORT_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-CamelType
-camel_transport_get_type (void)
-{
-	static CamelType camel_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_transport_type == CAMEL_INVALID_TYPE)	{
-		camel_transport_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelTransport",
-							    sizeof (CamelTransport),
-							    sizeof (CamelTransportClass),
-							    NULL,
-							    NULL,
-							    NULL,
-							    NULL);
-	}
-	
-	return camel_transport_type;
-}
-
-
-/**
- * camel_transport_can_send: Determine if a message is send-able on a transport
- * @transport: the transport
- * @message: the message
- *
- * Determines if a CamelMedium is of an appropriate subclass to send
- * via the given @transport. (Mail transports are not able to send
- * netnews articles, and vice versa.)
- *
- * Return value: TRUE or FALSE
- **/
-gboolean
-camel_transport_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CT_CLASS (transport)->can_send (transport, message);
-}
-
-/**
- * camel_transport_send: Send a message via a transport
- * @transport: the transport
- * @message: the message
- * @ex: a CamelException
- *
- * Sends the message to the recipients indicated in the message.
- *
- * Return value: success or failure.
- **/
-gboolean
-camel_transport_send (CamelTransport *transport, CamelMedium *message,
-		      CamelException *ex)
-{
-	return CT_CLASS (transport)->send (transport, message, ex);
-}
-
-/**
- * camel_transport_send_to: Send a message non-standard recipients
- * @transport: the transport
- * @message: the message
- * @recipients: the recipients
- * @ex: a CamelException
- *
- * Sends the message to the given recipients, rather than to the
- * recipients indicated in the message.
- *
- * Return value: success or failure.
- **/
-gboolean
-camel_transport_send_to (CamelTransport *transport, CamelMedium *message,
-			 GList *recipients, CamelException *ex)
-{
-	return CT_CLASS (transport)->send_to (transport, message,
-					      recipients, ex);
-}
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
deleted file mode 100644
index 87d3628264..0000000000
--- a/camel/camel-transport.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-transport.h : Abstract class for an email transport */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_TRANSPORT_H
-#define CAMEL_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-service.h>
-
-#define CAMEL_TRANSPORT_TYPE     (camel_transport_get_type ())
-#define CAMEL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TRANSPORT_TYPE, CamelTransport))
-#define CAMEL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass))
-#define CAMEL_IS_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE))
-
-
-struct _CamelTransport
-{
-	CamelService parent_object;
-	
-	gboolean supports_8bit;
-};
-
-
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	gboolean (*can_send) (CamelTransport *transport, CamelMedium *message);
-	gboolean (*send) (CamelTransport *transport, CamelMedium *message,
-			  CamelException *ex);
-	gboolean (*send_to) (CamelTransport *transport,
-			     CamelMedium *message, GList *recipients,
-			     CamelException *ex);
-} CamelTransportClass;
-
-
-/* public methods */
-gboolean camel_transport_can_send (CamelTransport *transport,
-				   CamelMedium *message);
-
-gboolean camel_transport_send (CamelTransport *transport,
-			       CamelMedium *message,
-			       CamelException *ex);
-
-/* FIXME: This should use a camel-address */
-gboolean camel_transport_send_to (CamelTransport *transport,
-				  CamelMedium *message,
-				  GList *recipients,
-				  CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TRANSPORT_H */
diff --git a/camel/camel-types.h b/camel/camel-types.h
deleted file mode 100644
index 8cf64d17ff..0000000000
--- a/camel/camel-types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_TYPES_H
-#define CAMEL_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-typedef struct _CamelAddress CamelAddress;
-typedef struct _header_content_type CamelContentType;
-typedef struct _CamelDataWrapper CamelDataWrapper;
-typedef struct _CamelException CamelException;
-typedef struct _CamelFolder CamelFolder;
-typedef struct _CamelFolderSearch CamelFolderSearch;
-typedef struct _CamelFolderSummary CamelFolderSummary;
-typedef struct _CamelInternetAddress CamelInternetAddress;
-typedef struct _CamelMedium CamelMedium;
-typedef struct _CamelMessageContentInfo CamelMessageContentInfo;
-typedef struct _CamelMessageInfo CamelMessageInfo;
-typedef struct _CamelMimeFilter CamelMimeFilter;
-typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;
-typedef struct _CamelMimeFilterBestenc CamelMimeFilterBestenc;
-typedef struct _CamelMimeFilterCharset CamelMimeFilterCharset;
-typedef struct _CamelMimeFilterIndex CamelMimeFilterIndex;
-typedef struct _CamelMimeFilterLinewrap CamelMimeFilterLinewrap;
-typedef struct _CamelMimeFilterSave CamelMimeFilterSave;
-typedef struct _CamelMimeFilterCRLF CamelMimeFilterCRLF;
-typedef struct _CamelMimeMessage CamelMimeMessage;
-typedef struct _CamelMimeParser CamelMimeParser;
-typedef struct _CamelMimePart CamelMimePart;
-typedef struct _CamelMultipart CamelMultipart;
-typedef struct _CamelNewsAddress CamelNewsAddress;
-typedef struct _CamelSeekableStream CamelSeekableStream;
-typedef struct _CamelSeekableSubstream CamelSeekableSubstream;
-typedef struct _CamelService CamelService;
-typedef struct _CamelSession CamelSession;
-typedef struct _CamelSimpleDataWrapper CamelSimpleDataWrapper;
-typedef struct _CamelStore CamelStore;
-typedef struct _CamelStream CamelStream;
-typedef struct _CamelStreamNull CamelStreamNull;
-typedef struct _CamelStreamBuffer CamelStreamBuffer;
-typedef struct _CamelStreamDataWrapper CamelStreamDataWrapper;
-typedef struct _CamelStreamFilter CamelStreamFilter;
-typedef struct _CamelStreamFs CamelStreamFs;
-typedef struct _CamelStreamMem CamelStreamMem;
-typedef struct _CamelTransport CamelTransport;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TYPES_H */
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
deleted file mode 100644
index 2b5faddb91..0000000000
--- a/camel/camel-uid-cache.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-uid-cache.c: UID caching code. */
-
-/* 
- * Authors:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-uid-cache.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-static void free_uid (gpointer key, gpointer value, gpointer data);
-static void maybe_write_uid (gpointer key, gpointer value, gpointer data);
-
-/**
- * camel_uid_cache_new:
- * @filename: path to load the cache from
- *
- * Creates a new UID cache, initialized from @filename. If @filename
- * doesn't already exist, the UID cache will be empty. Otherwise, if
- * it does exist but can't be read, the function will return %NULL.
- *
- * Return value: a new UID cache, or %NULL
- **/
-CamelUIDCache *
-camel_uid_cache_new (const char *filename)
-{
-	CamelUIDCache *cache;
-	struct stat st;
-	char *buf, **uids;
-	int fd, i;
-
-	fd = open (filename, O_RDWR | O_CREAT, 0700);
-	if (fd == -1)
-		return NULL;
-
-	if (fstat (fd, &st) != 0) {
-		close (fd);
-		return NULL;
-	}
-	buf = g_malloc (st.st_size + 1);
-
-	if (read (fd, buf, st.st_size) == -1) {
-		close (fd);
-		g_free (buf);
-		return NULL;
-	}
-	buf[st.st_size] = '\0';
-
-	cache = g_new (CamelUIDCache, 1);
-	cache->fd = fd;
-	cache->level = 1;
-	cache->uids = g_hash_table_new (g_str_hash, g_str_equal);
-
-	uids = g_strsplit (buf, "\n", 0);
-	g_free (buf);
-	for (i = 0; uids[i]; i++) {
-		g_hash_table_insert (cache->uids, uids[i],
-				     GINT_TO_POINTER (cache->level));
-	}
-	g_free (uids);
-
-	return cache;
-}
-
-/**
- * camel_uid_cache_save:
- * @cache: a CamelUIDCache
- *
- * Attempts to save @cache back to disk.
- *
- * Return value: success or failure
- **/
-gboolean
-camel_uid_cache_save (CamelUIDCache *cache)
-{
-	if (lseek (cache->fd, 0, SEEK_SET) != 0)
-		return FALSE;
-	g_hash_table_foreach (cache->uids, maybe_write_uid, cache);
-	return ftruncate (cache->fd, lseek (cache->fd, 0, SEEK_CUR)) == 0;
-}
-
-static void
-maybe_write_uid (gpointer key, gpointer value, gpointer data)
-{
-	CamelUIDCache *cache = data;
-
-	if (GPOINTER_TO_INT (value) == cache->level) {
-		write (cache->fd, key, strlen (key));
-		write (cache->fd, "\n", 1);
-	}
-}
-
-/**
- * camel_uid_cache_destroy:
- * @cache: a CamelUIDCache
- *
- * Destroys @cache and frees its data.
- **/
-void
-camel_uid_cache_destroy (CamelUIDCache *cache)
-{
-	g_hash_table_foreach (cache->uids, free_uid, NULL);
-	g_hash_table_destroy (cache->uids);
-	close (cache->fd);
-	g_free (cache);
-}
-
-static void
-free_uid (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-}
-
-/**
- * camel_uid_cache_get_new_uids:
- * @cache: a CamelUIDCache
- * @uids: an array of UIDs
- *
- * Returns an array of UIDs from @uids that are not in @cache, and
- * removes UIDs from @cache that aren't in @uids.
- *
- * Return value: an array of new UIDs, which must be freed with
- * camel_uid_cache_free_uids().
- **/
-GPtrArray *
-camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids)
-{
-	GPtrArray *new_uids;
-	char *uid;
-	int i;
-
-	new_uids = g_ptr_array_new ();
-	cache->level++;
-
-	for (i = 0; i < uids->len; i++) {
-		uid = uids->pdata[i];
-		if (g_hash_table_lookup (cache->uids, uid))
-			g_hash_table_remove (cache->uids, uid);
-		else
-			g_ptr_array_add (new_uids, g_strdup (uid));
-		g_hash_table_insert (cache->uids, g_strdup (uid),
-				     GINT_TO_POINTER (cache->level));
-	}
-
-	return new_uids;
-}
-
-/**
- * camel_uid_cache_free_uids:
- * @uids: an array returned from camel_uid_cache_get_new_uids()
- *
- * Frees the array of UIDs.
- **/
-void
-camel_uid_cache_free_uids (GPtrArray *uids)
-{
-	int i;
-
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-}
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
deleted file mode 100644
index 92226a3afd..0000000000
--- a/camel/camel-uid-cache.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-uid-cache.h: UID caching code. */
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_UID_CACHE_H
-#define CAMEL_UID_CACHE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <stdio.h>
-
-typedef struct {
-	int fd, level;
-	GHashTable *uids;
-} CamelUIDCache;
-
-CamelUIDCache *camel_uid_cache_new (const char *filename);
-gboolean camel_uid_cache_save (CamelUIDCache *cache);
-void camel_uid_cache_destroy (CamelUIDCache *cache);
-
-GPtrArray *camel_uid_cache_get_new_uids (CamelUIDCache *cache,
-					 GPtrArray *uids);
-void camel_uid_cache_free_uids (GPtrArray *uids);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* CAMEL_UID_CACHE_H */
diff --git a/camel/camel-url.c b/camel/camel-url.c
deleted file mode 100644
index 9de03dba1e..0000000000
--- a/camel/camel-url.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-url.c : utility functions to parse URLs */
-
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Tiago Antào <tiagoantao@bigfoot.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "camel-url.h"
-#include "camel-mime-utils.h"
-#include "camel-exception.h"
-#include "camel-object.h"
-
-/**
- * camel_url_new: create a CamelURL object from a string
- * @url_string: The string containing the URL to scan
- * 
- * This routine takes a string and parses it as a URL of the form:
- *
- *   protocol://user;AUTH=mech:password@host:port/path
- *
- * The protocol, followed by a ":" is required. If it is followed by * "//",
- * there must be an "authority" containing at least a host,
- * which ends at the end of the string or at the next "/". If there
- * is an "@" in the authority, there must be a username before it,
- * and the host comes after it. The authmech, password, and port are
- * optional, and the punctuation that preceeds them is omitted if
- * they are. Everything after the authority (or everything after the
- * protocol if there was no authority) is the path. We consider the
- * "/" between the authority and the path to be part of the path,
- * although this is incorrect according to RFC 1738.
- *
- * The port, if present, must be numeric.
- * 
- * Return value: a CamelURL structure containing the URL items.
- **/
-CamelURL *
-camel_url_new (const char *url_string, CamelException *ex)
-{
-	CamelURL *url;
-	char *semi, *colon, *at, *slash;
-	char *p;
-
-	g_assert (url_string);
-
-	/* Find protocol: initial substring until ":" */
-	colon = strchr (url_string, ':');
-	if (!colon) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL string `%s' contains no protocol"),
-				      url_string);
-		return NULL;
-	}
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strndup (url_string, colon - url_string);
-	g_strdown (url->protocol);
-
-	/* Check protocol */
-	p = url->protocol;
-	while (*p) {
-		if (!((*p >= 'a' && *p <= 'z') ||
-		      (*p == '-') || (*p == '+') || (*p == '.'))) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("URL string `%s' contains an invalid protocol"),
-					      url_string);
-			return NULL;
-		}
-		p++;
-	}
-
-	if (strncmp (colon, "://", 3) != 0) {
-		if (*(colon + 1)) {
-			url->path = g_strdup (colon + 1);
-			camel_url_decode (url->path);
-		}
-		return url;
-	}
-
-	url_string = colon + 3;
-
-	/* If there is an @ sign in the authority, look for user,
-	 * authmech, and password before it.
-	 */
-	slash = strchr (url_string, '/');
-	at = strchr (url_string, '@');
-	if (at && (!slash || at < slash)) {
-		colon = strchr (url_string, ':');
-		if (colon && colon < at) {
-			url->passwd = g_strndup (colon + 1, at - colon - 1);
-			camel_url_decode (url->passwd);
-		} else {
-			url->passwd = NULL;
-			colon = at;
-		}
-
-		semi = strchr(url_string, ';');
-		if (semi && (semi < colon || (!colon && semi < at)) &&
-		    !strncasecmp (semi, ";auth=", 6)) {
-			url->authmech = g_strndup (semi + 6,
-						     colon - semi - 6);
-			camel_url_decode (url->authmech);
-		} else {
-			url->authmech = NULL;
-			semi = colon;
-		}
-
-		url->user = g_strndup (url_string, semi - url_string);
-		camel_url_decode (url->user);
-		url_string = at + 1;
-	} else
-		url->user = url->passwd = url->authmech = NULL;
-
-	/* Find host and port. */
-	slash = strchr (url_string, '/');
-	colon = strchr (url_string, ':');
-	if (slash && colon > slash)
-		colon = NULL;
-
-	if (colon) {
-		url->host = g_strndup (url_string, colon - url_string);
-		url->port = strtoul (colon + 1, &colon, 10);
-		if (*colon && colon != slash) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("Port number in URL `%s' is non-"
-						"numeric"), url_string);
-			camel_url_free (url);
-			return NULL;
-		}
-	} else if (slash) {
-		url->host = g_strndup (url_string, slash - url_string);
-		camel_url_decode (url->host);
-		url->port = 0;
-	} else {
-		url->host = g_strdup (url_string);
-		camel_url_decode (url->host);
-		url->port = 0;
-	}
-
-	if (!slash)
-		slash = "/";
-	url->path = g_strdup (slash);
-	camel_url_decode (url->path);
-
-	return url;
-}
-
-char *
-camel_url_to_string (CamelURL *url, gboolean show_passwd)
-{
-	char *return_result;
-	char *user = NULL, *authmech = NULL, *passwd = NULL;
-	char *host = NULL, *path = NULL;
-	char port[20];
-
-	if (url->user)
-		user = camel_url_encode (url->user, TRUE, ":;@/");
-	
-	if (url->authmech && *url->authmech)
-		authmech = camel_url_encode (url->authmech, TRUE, ":@/");
-	
-	if (show_passwd && url->passwd)
-		passwd = camel_url_encode (url->passwd, TRUE, "@/");
-	
-	if (url->host)
-		host = camel_url_encode (url->host, TRUE, ":/");
-	
-	if (url->port)
-		g_snprintf (port, sizeof (port), "%d", url->port);
-	else
-		*port = '\0';
-	
-	if (url->path)
-		path = camel_url_encode (url->path, FALSE, NULL);
-
-	return_result = g_strdup_printf ("%s:%s%s%s%s%s%s%s%s%s%s%s%s",
-					 url->protocol,
-					 host ? "//" : "",
-					 user ? user : "",
-					 authmech ? ";auth=" : "",
-					 authmech ? authmech : "",
-					 passwd ? ":" : "",
-					 passwd ? passwd : "",
-					 user ? "@" : "",
-					 host ? host : "",
-					 *port ? ":" : "",
-					 port,
-					 path && host && *path != '/' ? "/" : "",
-					 path ? path : "");
-	g_free (user);
-	g_free (authmech);
-	g_free (passwd);
-	g_free (host);
-	g_free (path);
-
-	return return_result;
-}
-
-void
-camel_url_free (CamelURL *url)
-{
-	g_assert (url);
-
-	g_free (url->protocol);
-	g_free (url->user);
-	g_free (url->authmech);
-	g_free (url->passwd);
-	g_free (url->host);
-	g_free (url->path);
-
-	g_free (url);
-}
-
-void camel_url_set_protocol(CamelURL *url, const char *p)
-{
-	g_free(url->protocol);
-	url->protocol = g_strdup(p);
-}
-
-void camel_url_set_host(CamelURL *url, const char *h)
-{
-	g_free(url->host);
-	url->host = g_strdup(h);
-}
-
-void camel_url_set_port(CamelURL *url, int port)
-{
-	url->port = port;
-}
-void camel_url_set_path(CamelURL *url, const char *p)
-{
-	g_free(url->path);
-	url->path = g_strdup(p);
-}
-
-
-/**
- * camel_url_encode:
- * @part: a URL part
- * @escape_unsafe: whether or not to %-escape "unsafe" characters.
- * ("%#<>{}|\^~[]`)
- * @escape_extra: additional characters to escape.
- *
- * This %-encodes the given URL part and returns the escaped version
- * in allocated memory, which the caller must free when it is done.
- **/
-char *
-camel_url_encode (char *part, gboolean escape_unsafe, char *escape_extra)
-{
-	char *work, *p;
-
-	/* worst case scenario = 3 times the initial */
-	p = work = g_malloc (3 * strlen (part) + 1);
-
-	while (*part) {
-		if (((guchar) *part >= 127) || ((guchar) *part <= ' ') ||
-		    (escape_unsafe && strchr ("\"%#<>{}|\\^~[]`", *part)) ||
-		    (escape_extra && strchr (escape_extra, *part))) {
-			sprintf (p, "%%%.02hX", (guchar) *part++);
-			p += 3;
-		} else
-			*p++ = *part++;
-	}
-	*p = '\0';
-
-	return work;
-}
-
-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)
-
-/**
- * camel_url_decode:
- * @part: a URL part
- *
- * %-decodes the passed-in URL *in place*. The decoded version is
- * never longer than the encoded version, so there does not need to
- * be any additional space at the end of the string.
- */
-void
-camel_url_decode (char *part)
-{
-	guchar *s, *d;
-
-	s = d = (guchar *)part;
-	while (*s) {
-		if (*s == '%') {
-			if (isxdigit (s[1]) && isxdigit (s[2])) {
-				*d++ = HEXVAL (s[1]) * 16 + HEXVAL (s[2]);
-				s += 3;
-			} else
-				*d++ = *s++;
-		} else
-			*d++ = *s++;
-	}
-	*d = '\0';
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-guint camel_url_hash (const void *v)
-{
-	const CamelURL *u = v;
-	guint hash = 0;
-
-	add_hash (&hash, u->protocol);
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
-	add_hash (&hash, u->host);
-	add_hash (&hash, u->path);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static int
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-int camel_url_equal(const void *v, const void *v2)
-{
-	const CamelURL *u1 = v, *u2 = v2;
-	
-	return check_equal(u1->protocol, u2->protocol)
-		&& check_equal(u1->user, u2->user)
-		&& check_equal(u1->authmech, u2->authmech)
-		&& check_equal(u1->host, u2->host)
-		&& check_equal(u1->path, u2->path)
-		&& u1->port == u2->port;
-}
diff --git a/camel/camel-url.h b/camel/camel-url.h
deleted file mode 100644
index 996c4b4e74..0000000000
--- a/camel/camel-url.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-url.h : utility functions to parse URLs */
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_URL_H
-#define CAMEL_URL_H 1
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct {
-	char *protocol;
-	char *user;
-	char *authmech;
-	char *passwd;
-	char *host;
-	int   port;
-	char *path;
-} CamelURL;
-
-CamelURL *camel_url_new (const char *url_string, CamelException *ex);
-char *camel_url_to_string (CamelURL *url, gboolean show_password);
-void camel_url_free (CamelURL *url);
-
-char *camel_url_encode (char *part, gboolean escape_unsafe, char *escape_extra);
-void camel_url_decode (char *part);
-
-/* for editing url's */
-void camel_url_set_protocol(CamelURL *url, const char *);
-void camel_url_set_host(CamelURL *url, const char *);
-void camel_url_set_port(CamelURL *url, int port);
-void camel_url_set_path(CamelURL *url, const char *);
-
-/* for putting url's into hash tables */
-guint camel_url_hash (const void *v);
-int camel_url_equal(const void *v, const void *v2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* URL_UTIL_H */
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
deleted file mode 100644
index 9db4294bc7..0000000000
--- a/camel/camel-vee-folder.c
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-exception.h"
-#include "camel-vee-folder.h"
-#include "camel-store.h"
-#include "camel-folder-summary.h"
-#include "camel-mime-message.h"
-#include "camel-folder-search.h"
-
-#include "camel-vee-store.h"	/* for open flags */
-#include "camel-private.h"
-
-#ifdef DOESTRV
-#include "e-util/e-memory.h"
-#endif
-
-#include <string.h>
-
-#define d(x)
-
-/* our message info includes the parent folder */
-typedef struct _CamelVeeMessageInfo {
-	CamelMessageInfo info;
-	CamelFolder *folder;
-} CamelVeeMessageInfo;
-
-#define _PRIVATE(o) (((CamelVeeFolder *)(o))->priv)
-
-static void vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static void vee_expunge (CamelFolder *folder, CamelException *ex);
-
-static CamelMimeMessage *vee_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex);
-static void vee_move_message_to(CamelFolder *source, const char *uid, CamelFolder *dest, CamelException *ex);
-
-static GPtrArray *vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);
-
-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);
-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value);
-
-static void camel_vee_folder_class_init (CamelVeeFolderClass *klass);
-static void camel_vee_folder_init       (CamelVeeFolder *obj);
-static void camel_vee_folder_finalise   (CamelObject *obj);
-
-static void unmatched_finalise(CamelFolder *sub, gpointer type, CamelVeeFolder *vf);
-
-static void folder_changed(CamelFolder *sub, gpointer type, CamelVeeFolder *vf);
-static void message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf);
-
-static void vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);
-
-static CamelFolderClass *camel_vee_folder_parent;
-
-/* a vfolder for unmatched messages */
-static CamelVeeFolder *folder_unmatched;
-static GHashTable *unmatched_uids;
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-static pthread_mutex_t unmatched_lock = PTHREAD_MUTEX_INITIALIZER;
-#define UNMATCHED_LOCK() pthread_mutex_lock(&unmatched_lock)
-#define UNMATCHED_UNLOCK() pthread_mutex_unlock(&unmatched_lock)
-#else
-#define UNMATCHED_LOCK()
-#define UNMATCHED_UNLOCK()
-#endif
-
-CamelType
-camel_vee_folder_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_folder_get_type (), "CamelVeeFolder",
-					    sizeof (CamelVeeFolder),
-					    sizeof (CamelVeeFolderClass),
-					    (CamelObjectClassInitFunc) camel_vee_folder_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_vee_folder_init,
-					    (CamelObjectFinalizeFunc) camel_vee_folder_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_vee_folder_class_init (CamelVeeFolderClass *klass)
-{
-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;
-
-	camel_vee_folder_parent = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	folder_class->sync = vee_sync;
-	folder_class->expunge = vee_expunge;
-
-	folder_class->get_message = vee_get_message;
-	folder_class->move_message_to = vee_move_message_to;
-
-	folder_class->search_by_expression = vee_search_by_expression;
-
-	folder_class->set_message_flags = vee_set_message_flags;
-	folder_class->set_message_user_flag = vee_set_message_user_flag;
-}
-
-static void
-camel_vee_folder_init (CamelVeeFolder *obj)
-{
-	struct _CamelVeeFolderPrivate *p;
-	CamelFolder *folder = (CamelFolder *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-
-	/* FIXME: what to do about user flags if the subfolder doesn't support them? */
-	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
-		CAMEL_MESSAGE_DELETED |
-		CAMEL_MESSAGE_DRAFT |
-		CAMEL_MESSAGE_FLAGGED |
-		CAMEL_MESSAGE_SEEN;
-
-	obj->changes = camel_folder_change_info_new();
-	obj->search = camel_folder_search_new();
-
-#ifdef ENABLE_THREADS
-	p->summary_lock = g_mutex_new();
-	p->subfolder_lock = g_mutex_new();
-#endif
-
-}
-
-static void
-camel_vee_folder_finalise (CamelObject *obj)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)obj;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	/* FIXME: some leaks here, summary etc */
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		camel_object_unhook_event ((CamelObject *)f, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-		camel_object_unhook_event ((CamelObject *)f, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
-		camel_object_unref((CamelObject *)f);
-		node = g_list_next(node);
-	}
-
-	g_free(vf->expression);
-	g_free(vf->vname);
-
-	camel_folder_change_info_free(vf->changes);
-	camel_object_unref((CamelObject *)vf->search);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(p->summary_lock);
-	g_mutex_free(p->subfolder_lock);
-#endif
-	g_free(p);
-}
-
-/**
- * camel_vee_folder_new:
- * @parent_store: the parent CamelVeeStore
- * @name: the vfolder name
- * @ex: a CamelException
- *
- * Create a new CamelVeeFolder object.
- *
- * Return value: A new CamelVeeFolder widget.
- **/
-CamelFolder *
-camel_vee_folder_new(CamelStore *parent_store, const char *name, guint32 flags, CamelException *ex)
-{
-	CamelFolderInfo *fi;
-	CamelFolder *folder;
-	CamelVeeFolder *vf;
-	char *namepart, *searchpart;
-
-	namepart = g_strdup(name);
-	searchpart = strchr(namepart, '?');
-	if (searchpart == NULL) {
-		/* no search, no result! */
-		searchpart = "(body-contains \"=some-invalid_string-sequence=xx\")";
-	} else {
-		*searchpart++ = 0;
-	}
-
-	UNMATCHED_LOCK();
-
-	if (folder_unmatched == NULL) {
-		printf("setting up unmatched folder\n");
-		unmatched_uids = g_hash_table_new(g_str_hash, g_str_equal);
-
-		folder = (CamelFolder *)camel_object_new(camel_vee_folder_get_type());
-		folder_unmatched = vf = (CamelVeeFolder *)folder;
-		camel_folder_construct(folder, parent_store, "UNMATCHED", "UNMATCHED");
-		folder->summary = camel_folder_summary_new();
-		folder->summary->message_info_size = sizeof(CamelVeeMessageInfo);
-
-		vf->expression = g_strdup("(header-contains \"subject\" \"--= in =-=-=+ valid , ., .l\")");
-		vf->vname = g_strdup("UNMATCHED");
-	}
-
-	UNMATCHED_UNLOCK();
-
-	printf("opening vee folder %s\n", name);
-	if (strcmp(namepart, "UNMATCHED") == 0) {
-		camel_object_ref((CamelObject *)folder_unmatched);
-		g_free(namepart);
-		printf("opened UNMATCHED folder %p %s with %d messages\n", folder_unmatched, name, camel_folder_get_message_count((CamelFolder *)folder_unmatched));
-		return (CamelFolder *)folder_unmatched;
-	}
-
-
-	folder =  CAMEL_FOLDER (camel_object_new (camel_vee_folder_get_type()));
-	vf = (CamelVeeFolder *)folder;
-	vf->flags = flags;
-
-	/* remove folders as they vanish */
-	camel_object_hook_event((CamelObject *)vf, "finalize", (CamelObjectEventHookFunc)unmatched_finalise, folder_unmatched);
-
-	camel_folder_construct (folder, parent_store, namepart, namepart);
-
-	folder->summary = camel_folder_summary_new();
-	folder->summary->message_info_size = sizeof(CamelVeeMessageInfo);
-
-	vf->expression = g_strdup(searchpart);
-	vf->vname = namepart;
-
-	printf("opened normal folder folder %p %s with %d messages\n", folder, name, camel_folder_get_message_count(folder));
-
-	/* FIXME: should be moved to store */
-	fi = g_new0(CamelFolderInfo, 1);
-	fi->full_name = g_strdup(name);
-	fi->name = g_strdup(name);
-	fi->url = g_strdup_printf("vfolder:%s?%s", vf->vname, vf->expression);
-	fi->unread_message_count = -1;
-	
-	camel_object_trigger_event(CAMEL_OBJECT(parent_store), "folder_created", fi);
-	camel_folder_info_free (fi);
-
-	return folder;
-}
-
-static CamelVeeMessageInfo * vee_folder_add_uid(CamelVeeFolder *vf, CamelFolder *f, const char *inuid);
-
-/* must be called with summary_lock held */
-static void
-unmatched_uid_remove(const char *uidin, CamelFolder *source)
-{
-	char *oldkey, *uid;
-	int n;
-
-	uid = g_strdup_printf("%p:%s", source, uidin);
-	
-	/*printf("checking unmatched uid (remove from source) %s\n", uid);*/
-
-	UNMATCHED_LOCK();
-
-	if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-		if (n == 1) {
-			/*printf("lost all matches, adding uid to unmatched\n");*/
-			if (vee_folder_add_uid(folder_unmatched, source, oldkey))
-				camel_folder_change_info_add_uid(folder_unmatched->changes, uid);
-			g_hash_table_remove(unmatched_uids, oldkey);
-			g_free(oldkey);
-		} else
-			g_hash_table_insert(unmatched_uids, oldkey, (void *)n-1);
-	} else {
-		/*printf("unknown uid, adding to unmatched\n");*/
-		/* FIXME: lookup to see if we already have it first, to save doing it later */
-		if (vee_folder_add_uid(folder_unmatched, source, uidin))
-			camel_folder_change_info_add_uid(folder_unmatched->changes, uid);
-	}
-
-	UNMATCHED_UNLOCK();
-
-	g_free(uid);
-}
-
-/* add a uid to the unmatched folder if it is unmatched everywhere else */
-static void
-unmatched_uid_check(const char *uidin, CamelFolder *source)
-{
-	char *oldkey, *uid;
-	int n;
-
-	uid = g_strdup_printf("%p:%s", source, uidin);
-	
-	/*printf("checking unmatched uid (remove from source) %s\n", uid);*/
-
-	UNMATCHED_LOCK();
-
-	if (!g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-		/*printf("unknown uid, adding to unmatched\n");*/
-		/* FIXME: lookup to see if we already have it first, to save doing it later */
-		if (vee_folder_add_uid(folder_unmatched, source, uidin))
-			camel_folder_change_info_add_uid(folder_unmatched->changes, uid);
-	}
-
-	UNMATCHED_UNLOCK();
-
-	g_free(uid);
-}
-
-/* must be called with summary_lock held */
-static void
-unmatched_uid_add(const char *uidin, CamelFolder *source)
-{
-	char *oldkey, *uid;
-	int n;
-	CamelMessageInfo *info;
-
-	uid = g_strdup_printf("%p:%s", source, uidin);
-
-	/*printf("checking unmatched uid (added to source) %s\n", uid);*/
-
-	UNMATCHED_LOCK();
-
-	info = camel_folder_summary_uid(((CamelFolder *)folder_unmatched)->summary, uid);
-	if (info) {
-		/*printf("we have it, lets remove it\n");*/
-		camel_folder_summary_remove_uid(((CamelFolder *)folder_unmatched)->summary, uid);
-		camel_folder_change_info_remove_uid(folder_unmatched->changes, uid);
-		camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)->summary, info);
-	}
-
-	if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-		g_hash_table_insert(unmatched_uids, oldkey, (void **)n+1);
-		g_free(uid);
-	} else
-		g_hash_table_insert(unmatched_uids, uid, (void **)1);
-
-	UNMATCHED_UNLOCK();
-}
-
-/* must be called with summary_lock held */
-static CamelVeeMessageInfo *
-vee_folder_add(CamelVeeFolder *vf, CamelFolder *f, CamelMessageInfo *info)
-{
-	CamelVeeMessageInfo *mi;
-	char *uid;
-	CamelFolder *folder = (CamelFolder *)vf;
-	CamelMessageInfo *dinfo;
-
-	uid = g_strdup_printf("%p:%s", f, camel_message_info_uid(info));
-	/* FIXME: Has races */
-	dinfo = camel_folder_summary_uid(folder->summary, uid);
-	if (dinfo) {
-		g_free(uid);
-		camel_folder_summary_info_free(folder->summary, dinfo);
-		return NULL;
-	}
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_info_new(folder->summary);
-	camel_message_info_dup_to(info, (CamelMessageInfo *)mi);
-#ifdef DOESTRV
-	mi->info.strings = e_strv_set_ref_free(mi->info.strings, CAMEL_MESSAGE_INFO_UID, uid);
-	mi->info.strings = e_strv_pack(mi->info.strings);
-#else	
-	g_free(mi->info.uid);
-	mi->info.uid = uid;
-#endif		
-	mi->folder = f;
-	camel_folder_summary_add(folder->summary, (CamelMessageInfo *)mi);
-
-	return mi;
-}
-
-/* must be called with summary_lock held */
-static CamelVeeMessageInfo *
-vee_folder_add_uid(CamelVeeFolder *vf, CamelFolder *f, const char *inuid)
-{
-	CamelMessageInfo *info;
-	CamelVeeMessageInfo *mi = NULL;
-
-	info = camel_folder_get_message_info(f, inuid);
-	if (info) {
-		if ((mi = vee_folder_add(vf, f, info)))
-			if (vf != folder_unmatched)
-				unmatched_uid_add(inuid, f);
-
-		camel_folder_free_message_info(f, info);
-	}
-	return mi;
-}
-
-/* must be called with summary_lock held */
-static void
-vfolder_remove_match(CamelVeeFolder *vf, CamelVeeMessageInfo *vinfo)
-{
-	const char *uid = camel_message_info_uid(vinfo);
-
-	printf("removing match %s\n", uid);
-
-	unmatched_uid_remove(strchr(uid, ':'), vinfo->folder);
-
-	camel_folder_change_info_remove_uid(vf->changes, uid);
-	camel_folder_summary_remove(((CamelFolder *)vf)->summary, (CamelMessageInfo *)vinfo);
-}
-
-/* must be called with summary_lock held */
-static CamelVeeMessageInfo *
-vee_folder_add_change(CamelVeeFolder *vf, CamelFolder *f, CamelMessageInfo *info)
-{
-	CamelVeeMessageInfo *mi = NULL;
-
-	mi = vee_folder_add(vf, f, info);
-	if (mi) {
-		unmatched_uid_add(camel_message_info_uid(info), f);
-
-		camel_folder_change_info_add_uid(vf->changes, camel_message_info_uid(mi));
-	}
-	
-	return mi;
-}
-
-/* must be called with summary_lock held */
-static void
-vfolder_change_match(CamelVeeFolder *vf, CamelVeeMessageInfo *vinfo, const CamelMessageInfo *info)
-{
-	CamelFlag *flag;
-	CamelTag *tag;
-
-	d(printf("changing match %s\n", camel_message_info_uid(vinfo)));
-
-	vinfo->info.flags = info->flags;
-	camel_flag_list_free(&vinfo->info.user_flags);
-	flag = info->user_flags;
-	while (flag) {
-		camel_flag_set(&vinfo->info.user_flags, flag->name, TRUE);
-		flag = flag->next;
-	}
-	camel_tag_list_free(&vinfo->info.user_tags);
-	tag = info->user_tags;
-	while (tag) {
-		camel_tag_set(&vinfo->info.user_tags, tag->name, tag->value);
-		tag = tag->next;
-	}
-	camel_folder_change_info_change_uid(vf->changes, camel_message_info_uid(vinfo));
-}
-
-/* track changes to the unmatched folders */
-static void
-unmatched_finalise(CamelFolder *sub, gpointer type, CamelVeeFolder *vf)
-{
-	int count, i;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-	UNMATCHED_LOCK();
-
-	count = camel_folder_summary_count(((CamelFolder *)folder_unmatched)->summary);
-	for (i=0;i<count;i++) {
-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(((CamelFolder *)folder_unmatched)->summary, i);
-		const char *uid;
-		char *oldkey;
-		int n;
-
-		if (mi) {
-			uid = camel_message_info_uid(mi);
-			if (mi->folder == sub) {
-				if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-					if (n == 1)
-						g_hash_table_remove(unmatched_uids, oldkey);
-					else
-						camel_folder_change_info_remove_uid(folder_unmatched->changes, uid);
-				}
-				camel_folder_summary_remove(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)mi);
-				i--;
-			}
-			camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)mi);
-		}
-	}
-	
-	if (camel_folder_change_info_changed(folder_unmatched->changes)) {
-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", folder_unmatched->changes);
-		camel_folder_change_info_clear(folder_unmatched->changes);
-	}
-
-	UNMATCHED_UNLOCK();
-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-}
-
-/* FIXME: This code is a big race, as it is never called locked ... */
-
-static void
-folder_changed(CamelFolder *sub, gpointer type, CamelVeeFolder *vf)
-{
-	CamelFolderChangeInfo *changes = type;
-	CamelFolder *folder = (CamelFolder *)vf;
-	char *vuid;
-	CamelVeeMessageInfo *vinfo;
-	int i;
-	CamelMessageInfo *info;
-
-	printf("folder_changed(%p, %p) (for %s)\n", sub, vf, vf->expression);
-
-	/* if not auto-updating, only propagate changed events, not added/removed items */
-	if ((vf->flags & CAMEL_STORE_VEE_FOLDER_AUTO) == 0) {
-		CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-
-		for (i=0;i<changes->uid_changed->len;i++) {
-			info = camel_folder_get_message_info(sub, changes->uid_changed->pdata[i]);
-			vuid = g_strdup_printf("%p:%s", sub, (char *)changes->uid_changed->pdata[i]);
-			vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, vuid);
-			if (vinfo && info)
-				vfolder_change_match(vf, vinfo, info);
-			
-			g_free(vuid);
-			
-			if (info)
-				camel_folder_free_message_info(sub, info);
-			if (vinfo)
-				camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)vinfo);
-		}
-
-		if (camel_folder_change_info_changed(vf->changes)) {
-			camel_object_trigger_event((CamelObject *)vf, "folder_changed", vf->changes);
-			camel_folder_change_info_clear(vf->changes);
-		}
-
-		CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-
-		return;
-	}
-
-	/* if we are autoupdating, then do the magic */
-
-	/* assume its faster to search a long list in whole, than by part */
-	if (changes && (changes->uid_added->len + changes->uid_changed->len) < 500) {
-		gboolean match;
-
-		/* FIXME: We dont search body contents with this search, so, it isn't as
-		   useful as it might be.
-		   We shold probably just perform a whole search if we need to, i.e. there
-		   are added items.  Changed items we are unlikely to want to remove immediately
-		   anyway, although I guess it might be useful.
-		   Removed items can always just be removed.
-		*/
-
-		/* see if added ones now match us */
-		for (i=0;i<changes->uid_added->len;i++) {
-			printf("checking new uid: %s\n", (char *)changes->uid_added->pdata[i]);
-			info = camel_folder_get_message_info(sub, changes->uid_added->pdata[i]);
-			if (info) {
-				printf("uid ok, subject: %s\n", camel_message_info_subject(info));
-				camel_folder_search_set_folder(vf->search, sub);
-				match = camel_folder_search_match_expression(vf->search, vf->expression, info, NULL);
-				if (match)
-					vinfo = vee_folder_add_change(vf, sub, info);
-				camel_folder_free_message_info(sub, info);
-			}
-		}
-
-		/* check if changed ones still match */
-		for (i=0;i<changes->uid_changed->len;i++) {
-			info = camel_folder_get_message_info(sub, changes->uid_changed->pdata[i]);
-			vuid = g_strdup_printf("%p:%s", sub, (char *)changes->uid_changed->pdata[i]);
-			vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, vuid);
-			if (info) {
-				camel_folder_search_set_folder(vf->search, sub);
-				match = camel_folder_search_match_expression(vf->search, vf->expression, info, NULL);
-				if (vinfo) {
-					if (!match)
-						vfolder_remove_match(vf, vinfo);
-					else
-						vfolder_change_match(vf, vinfo, info);
-				} else if (match)
-					vee_folder_add_change(vf, sub, info);
-				camel_folder_free_message_info(sub, info);
-			} else if (vinfo)
-				vfolder_remove_match(vf, vinfo);
-
-			if (vinfo)
-				camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)vinfo);
-
-			g_free(vuid);
-		}
-
-		/* mirror removes directly, if they used to match */
-		for (i=0;i<changes->uid_removed->len;i++) {
-			vuid = g_strdup_printf("%p:%s", sub, (char *)changes->uid_removed->pdata[i]);
-			vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, vuid);
-			if (vinfo) {
-				vfolder_remove_match(vf, vinfo);
-				camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)vinfo);
-			}
-			g_free(vuid);
-		}
-	} else {
-		vee_folder_build_folder(vf, sub, NULL);
-	}
-
-	/* cascade up, if we need to */
-	if (camel_folder_change_info_changed(vf->changes)) {
-		printf("got folder changes\n");
-		camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", vf->changes);
-		camel_folder_change_info_clear(vf->changes);
-	} else
-		printf("no, we didn't really get any changes\n");
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-
-	UNMATCHED_LOCK();
-
-	if (camel_folder_change_info_changed(folder_unmatched->changes)) {
-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", folder_unmatched->changes);
-		camel_folder_change_info_clear(folder_unmatched->changes);
-	}
-
-	UNMATCHED_UNLOCK();
-}
-
-/* FIXME: This code is a race, as it is never called locked */
-
-/* track flag changes in the summary */
-static void
-message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf)
-{
-	CamelMessageInfo *info;
-	CamelVeeMessageInfo *vinfo;
-	char *vuid;
-	CamelFolder *folder = (CamelFolder *)vf;
-	gboolean match;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-
-	info = camel_folder_get_message_info(f, uid);
-	vuid = g_strdup_printf("%p:%s", f, uid);
-	vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, vuid);
-
-	/* see if this message now matches/doesn't match anymore */
-
-	/* Hmm, this might not work if the folder uses some weird search thing,
-	   and/or can be slow since it wont use any index index, hmmm. */
-
-	if (vf->flags & CAMEL_STORE_VEE_FOLDER_AUTO) {
-		camel_folder_search_set_folder(vf->search, f);
-		
-		match = camel_folder_search_match_expression(vf->search, vf->expression, info, NULL);
-
-		if (info) {
-			if (vinfo) {
-				if (!match)
-					vfolder_remove_match(vf, vinfo);
-				else
-					vfolder_change_match(vf, vinfo, info);
-			}
-			else if (match)
-				vee_folder_add_change(vf, f, info);
-		} else if (vinfo)
-			vfolder_remove_match(vf, vinfo);
-	} else {
-		if (info && vinfo)
-			vfolder_change_match(vf, vinfo, info);
-	}
-
-	if (info)
-		camel_folder_free_message_info(f, info);
-	if (vinfo)
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)vinfo);
-
-	/* cascade up, if required.  This could probably be delayed,
-	   but doesn't matter really, that is what freeze is for. */
-	if (camel_folder_change_info_changed(vf->changes)) {
-		camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", vf->changes);
-		camel_folder_change_info_clear(vf->changes);
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-
-	UNMATCHED_LOCK();
-
-	if (camel_folder_change_info_changed(folder_unmatched->changes)) {
-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", folder_unmatched->changes);
-		camel_folder_change_info_clear(folder_unmatched->changes);
-	}
-
-	UNMATCHED_UNLOCK();
-
-	g_free(vuid);
-}
-
-void
-camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf), *up = _PRIVATE(folder_unmatched);
-
-	camel_object_ref((CamelObject *)sub);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	/* the reference is shared with both the real vfolder and the unmatched vfolder */
-	p->folders = g_list_append(p->folders, sub);
-	up->folders = g_list_append(up->folders, sub);
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	printf("camel_vee_folder_add_folde(%p, %p)\n", vf, sub);
-
-	camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc)folder_changed, vf);
-	camel_object_hook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc)message_changed, vf);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-
-	vee_folder_build_folder(vf, sub, NULL);
-
-	/* we'll assume the caller is going to update the whole list after they do this
-	   this may or may not be the right thing to do, but it should be close enough */
-	camel_folder_change_info_clear(vf->changes);
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);
-}
-
-static void
-vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		camel_folder_sync(f, expunge, ex);
-		if (camel_exception_is_set(ex))
-			break;
-
-		node = node->next;
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-}
-
-static void
-vee_expunge (CamelFolder *folder, CamelException *ex)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-
-		camel_folder_expunge(f, ex);
-		if (camel_exception_is_set(ex))
-			break;
-		vee_folder_build_folder(vf, f, ex);
-		if (camel_exception_is_set(ex))
-			break;
-
-		node = node->next;
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-}
-
-static CamelMimeMessage *vee_get_message(CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelVeeMessageInfo *mi;
-	CamelMimeMessage *msg = NULL;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		msg =  camel_folder_get_message(mi->folder, strchr(camel_message_info_uid(mi), ':') + 1, ex);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     "No such message %s in %s", uid,
-				     folder->name);
-	}
-
-	return msg;
-}
-
-static GPtrArray *
-vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	GList *node;
-	GPtrArray *matches, *result = g_ptr_array_new ();
-	char *expr;
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-
-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);
-
-	expr = g_strdup_printf("(and %s %s)", vf->expression, expression);
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		int i;
-
-		matches = camel_folder_search_by_expression(f, expression, ex);
-		for (i = 0; i < matches->len; i++) {
-			char *uid = matches->pdata[i];
-			g_ptr_array_add(result, g_strdup_printf("%p:%s", f, uid));
-		}
-		camel_folder_search_free(f, matches);
-		node = g_list_next(node);
-	}
-
-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);
-
-	return result;
-}
-
-static void
-vee_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		((CamelFolderClass *)camel_vee_folder_parent)->set_message_flags(folder, uid, flags, set);
-		camel_folder_set_message_flags(mi->folder, strchr(camel_message_info_uid(mi), ':') + 1, flags, set);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-	}
-}
-
-static void
-vee_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		((CamelFolderClass *)camel_vee_folder_parent)->set_message_user_flag(folder, uid, name, value);
-		camel_folder_set_message_user_flag(mi->folder, strchr(camel_message_info_uid(mi), ':') + 1, name, value);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-	}
-}
-
-static void
-vee_move_message_to(CamelFolder *folder, const char *uid, CamelFolder *dest, CamelException *ex)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder->summary, uid);
-	if (mi) {
-		/* noop if it we're moving from the same vfolder (uh, which should't happen but who knows) */
-		if (folder != mi->folder) {
-			camel_folder_move_message_to(mi->folder, strchr(camel_message_info_uid(mi), ':')+1, dest, ex);
-		}
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("No such message: %s"), uid);
-	}
-}
-
-static void
-removed_uid(void *key, void *value, void *data)
-{
-	unmatched_uid_check(key, data);
-}
-
-/* build query contents for a single folder */
-/* must have summary_lock held when calling */
-static void
-vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)
-{
-	GPtrArray *matches, *all;
-	GHashTable *left;
-	CamelFolder *f = source;
-	CamelVeeMessageInfo *mi;
-	CamelFolder *folder = (CamelFolder *)vf;
-	int i;
-	int count;
-
-	left = g_hash_table_new(g_str_hash, g_str_equal);
-	all = camel_folder_get_uids(f);
-	for (i=0;i<all->len;i++)
-		g_hash_table_insert(left, all->pdata[i], (void *)1);
-
-	count = camel_folder_summary_count(folder->summary);
-	for (i=0;i<count;i++) {
-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(folder->summary, i);
-		if (mi) {
-			if (mi->folder == source) {
-				camel_folder_change_info_add_source(vf->changes, camel_message_info_uid(mi));
-				camel_folder_summary_remove(folder->summary, (CamelMessageInfo *)mi);
-				unmatched_uid_remove(camel_message_info_uid(mi), source);
-				i--;
-			}
-			camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
-		}
-	}
-
-	matches = camel_folder_search_by_expression(f, vf->expression, ex);
-	for (i = 0; i < matches->len; i++) {
-		g_hash_table_remove(left, matches->pdata[i]);
-		mi = vee_folder_add_uid(vf, f, matches->pdata[i]);
-		if (mi)
-			camel_folder_change_info_add_update(vf->changes, camel_message_info_uid(mi));
-	}
-
-	/* check if we have a match for these in another vfolder, else add them to the UNMATCHED folder */
-	g_hash_table_foreach(left, removed_uid, source);
-	g_hash_table_destroy(left);
-	camel_folder_search_free(f, matches);
-	camel_folder_free_uids(f, all);
-
-	camel_folder_change_info_build_diff(vf->changes);
-	camel_folder_change_info_build_diff(folder_unmatched->changes);
-
-	if (camel_folder_change_info_changed(folder_unmatched->changes)) {
-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", folder_unmatched->changes);
-		camel_folder_change_info_clear(folder_unmatched->changes);
-	}
-}
-
-/*
-
-  (match-folder "folder1" "folder2")
-
- */
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
deleted file mode 100644
index 6ae685a8fe..0000000000
--- a/camel/camel-vee-folder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_VEE_FOLDER_H
-#define _CAMEL_VEE_FOLDER_H
-
-#include <camel/camel-folder.h>
-
-#define CAMEL_VEE_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_vee_folder_get_type (), CamelVeeFolder)
-#define CAMEL_VEE_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass)
-#define CAMEL_IS_VEE_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_folder_get_type ())
-
-typedef struct _CamelVeeFolder      CamelVeeFolder;
-typedef struct _CamelVeeFolderClass CamelVeeFolderClass;
-
-struct _CamelVeeFolder {
-	CamelFolder parent;
-
-	struct _CamelVeeFolderPrivate *priv;
-
-	char *expression;	/* query expression */
-	char *vname;		/* local name */
-	CamelFolder *local;	/* local storage for folder */
-
-	guint32 flags;		/* folder open flags */
-
-	CamelFolderChangeInfo *changes;
-	CamelFolderSearch *search;
-};
-
-struct _CamelVeeFolderClass {
-	CamelFolderClass parent_class;
-};
-
-guint		camel_vee_folder_get_type	(void);
-CamelFolder    *camel_vee_folder_new		(CamelStore *parent_store, const char *name, guint32 flags, CamelException *ex);
-
-void camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub);
-
-#endif /* ! _CAMEL_VEE_FOLDER_H */
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
deleted file mode 100644
index 38d535dbee..0000000000
--- a/camel/camel-vee-store.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-vee-store.h"
-#include "camel-vee-folder.h"
-
-static CamelFolder *vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static void vee_init_trash (CamelStore *store);
-static CamelFolder *vee_get_trash  (CamelStore *store, CamelException *ex);
-
-struct _CamelVeeStorePrivate {
-};
-
-#define _PRIVATE(o) (((CamelVeeStore *)(o))->priv)
-
-static void camel_vee_store_class_init (CamelVeeStoreClass *klass);
-static void camel_vee_store_init       (CamelVeeStore *obj);
-
-static CamelStoreClass *camel_vee_store_parent;
-
-CamelType
-camel_vee_store_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_store_get_type (), "CamelVeeStore",
-					    sizeof (CamelVeeStore),
-					    sizeof (CamelVeeStoreClass),
-					    (CamelObjectClassInitFunc) camel_vee_store_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_vee_store_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-
-camel_vee_store_class_init (CamelVeeStoreClass *klass)
-{
-	CamelStoreClass *store_class = (CamelStoreClass *) klass;
-	
-	camel_vee_store_parent = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));
-
-	/* virtual method overload */
-	store_class->get_folder = vee_get_folder;
-	store_class->init_trash = vee_init_trash;
-	store_class->get_trash = vee_get_trash;
-}
-
-static void
-camel_vee_store_init (CamelVeeStore *obj)
-{
-	struct _CamelVeeStorePrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-}
-
-/**
- * camel_vee_store_new:
- *
- * Create a new CamelVeeStore object.
- * 
- * Return value: A new CamelVeeStore widget.
- **/
-CamelVeeStore *
-camel_vee_store_new (void)
-{
-	CamelVeeStore *new = CAMEL_VEE_STORE ( camel_object_new (camel_vee_store_get_type ()));
-	return new;
-}
-
-static CamelFolder *
-vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	return camel_vee_folder_new(store, folder_name, flags, ex);
-}
-
-static void
-vee_init_trash (CamelStore *store)
-{
-	/* no-op */
-	;
-}
-
-static CamelFolder *
-vee_get_trash (CamelStore *store, CamelException *ex)
-{
-	return NULL;
-}
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
deleted file mode 100644
index ff3d548180..0000000000
--- a/camel/camel-vee-store.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_VEE_STORE_H
-#define _CAMEL_VEE_STORE_H
-
-#include <camel/camel-store.h>
-
-#define CAMEL_VEE_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_vee_store_get_type (), CamelVeeStore)
-#define CAMEL_VEE_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass)
-#define CAMEL_IS_VEE_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_store_get_type ())
-
-typedef struct _CamelVeeStore      CamelVeeStore;
-typedef struct _CamelVeeStoreClass CamelVeeStoreClass;
-
-/* open mode for folder, vee folder auto-update */
-#define CAMEL_STORE_VEE_FOLDER_AUTO (1<<16)
-
-struct _CamelVeeStore {
-	CamelStore parent;
-
-	struct _CamelVeeStorePrivate *priv;
-};
-
-struct _CamelVeeStoreClass {
-	CamelStoreClass parent_class;
-};
-
-guint		camel_vee_store_get_type	(void);
-CamelVeeStore      *camel_vee_store_new	(void);
-
-#endif /* ! _CAMEL_VEE_STORE_H */
diff --git a/camel/camel.c b/camel/camel.c
deleted file mode 100644
index 5383c4d32a..0000000000
--- a/camel/camel.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel.h"
-#include <unicode.h>
-
-gboolean camel_verbose_debug = FALSE;
-
-gint
-camel_init(void)
-{
-#ifdef ENABLE_THREADS
-#ifdef G_THREADS_ENABLED	
-	/*g_thread_init (NULL);*/
-#else  /* G_THREADS_ENABLED */
-	printf ("Threads are not supported by your version of glib\n");
-#endif /* G_THREADS_ENABLED */
-#endif /* ENABLE_THREADS */
-
-	if (getenv ("CAMEL_VERBOSE_DEBUG"))
-		camel_verbose_debug = TRUE;
-
-	unicode_init ();
-
-	return 0;
-}
-
-#ifdef U_CANT_TOUCH_THIS
-#include <ssl.h>
-#include <nss.h>
-
-gint
-camel_ssl_init (char *configdir, gboolean nss_init)
-{
-#ifdef ENABLE_THREADS
-#ifdef G_THREADS_ENABLED	
-	/*g_thread_init (NULL);*/
-#else  /* G_THREADS_ENABLED */
-	printf ("Threads are not supported by your version of glib\n");
-#endif /* G_THREADS_ENABLED */
-#endif /* ENABLE_THREADS */
-	
-	if (getenv ("CAMEL_VERBOSE_DEBUG"))
-		camel_verbose_debug = TRUE;
-	
-	unicode_init ();
-	
-	if (nss_init) {
-		PR_init ();
-		
-		if (NSS_init (configdir) == SECFailure)
-			return -1;
-		
-		/* FIXME: Erm, use appropriate policy? */
-		NSS_SetDomesticPolicy ();
-	}
-	
-	SSL_OptionSetDefault (SSL_ENABLE_SSL2, PR_TRUE);
-	SSL_OptionSetDefault (SSL_ENABLE_SSL3, PR_TRUE);
-	SSL_OptionSetDefault (SSL_ENABLE_TLS, PR_TRUE);
-	SSL_OptionSetDefault (SSL_V2_COMPATIBLE_HELLO, PR_TRUE /* maybe? */);
-	
-	return 0;
-}
-#endif
diff --git a/camel/camel.h b/camel/camel.h
deleted file mode 100644
index 6de1ae6462..0000000000
--- a/camel/camel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_H
-#define CAMEL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-index.h>
-#include <camel/camel-mime-filter-save.h>
-#include <camel/camel-mime-filter-crlf.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-mime-part-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-movemail.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-provider.h>
-#include <camel/camel-seekable-stream.h>
-#include <camel/camel-seekable-substream.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-transport.h>
-#include <camel/camel-uid-cache.h>
-#include <camel/camel-url.h>
-#include <camel/gstring-util.h>
-#include <camel/hash-table-utils.h>
-#include <camel/string-utils.h>
-
-gint camel_init (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_H */
diff --git a/camel/devel-docs/camel_data_wrapper.dia b/camel/devel-docs/camel_data_wrapper.dia
deleted file mode 100644
index 301563d1ee..0000000000
--- a/camel/devel-docs/camel_data_wrapper.dia
+++ /dev/null
diff --git a/camel/devel-docs/camel_parser_states.dia b/camel/devel-docs/camel_parser_states.dia
deleted file mode 100644
index 556a5b1c49..0000000000
--- a/camel/devel-docs/camel_parser_states.dia
+++ /dev/null
diff --git a/camel/devel-docs/camel_stream.dia b/camel/devel-docs/camel_stream.dia
deleted file mode 100644
index d91d1bb153..0000000000
--- a/camel/devel-docs/camel_stream.dia
+++ /dev/null
diff --git a/camel/gstring-util.c b/camel/gstring-util.c
deleted file mode 100644
index a0c1345b71..0000000000
--- a/camel/gstring-util.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gstring-util : utilities for gstring object  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#include <config.h>
-#include "gstring-util.h"
-#include <string.h>
-
-/**
- * g_string_equals : test if two string are equal
- *
- * @string1 : first string
- * @string2 : second string
- *
- * @Return Value : true if the strings equal, false otherwise
- **/
-gboolean
-g_string_equals (GString *string1, GString *string2)
-{
-	g_assert (string1);
-	g_assert (string2);
-	return !strcmp (string1->str, string2->str);
-}
-
-
-
-
-/**
- * g_string_clone : clone a GString
- *
- * @string : the string to clone
- *
- * @Return Value : the clone ...
- **/
-GString *
-g_string_clone (GString *string)
-{
-	return g_string_new (string->str);
-}
-
-/**
- * g_string_append_g_string : append a GString to another  GString
- *
- * @dest_string : string which will be appended
- * @other_string : string to append
- *
- **/
-void 
-g_string_append_g_string(GString *dest_string, GString *other_string)
-{
-	g_assert(other_string);
-	g_assert(dest_string);
-
-	if (other_string->len)
-		g_string_append(dest_string, other_string->str);
-}
-
-/**
- * g_string_equal_for_hash: test equality of two GStrings for hash tables
- * @v: string 1
- * @v2: string 2
- * 
- * 
- * 
- * Return value: 
- **/
-gint
-g_string_equal_for_hash (gconstpointer v, gconstpointer v2)
-{
-  return strcmp ( ((const GString*)v)->str, ((const GString*)v2)->str) == 0;
-}
-
-gint
-g_string_equal_for_glist (gconstpointer v, gconstpointer v2)
-{
-  return !strcmp ( ((const GString*)v)->str, ((const GString*)v2)->str) == 0;
-}
-
-
-/**
- * g_string_hash: computes a hash value for a Gstring
- * @v: Gstring object
- * 
- * 
- * 
- * Return value: 
- **/
-guint 
-g_string_hash (gconstpointer v)
-{
-	return g_str_hash(((const GString*)v)->str);
-}
-
-
-
-
-/* utility func : frees a GString element in a GList */
-static void 
-__g_string_list_free_string (gpointer data, gpointer user_data)
-{
-	GString *string = (GString *)data;
-	g_string_free(string, TRUE);
-}
-
-
-void 
-g_string_list_free (GList *string_list)
-{
-	g_list_foreach(string_list, __g_string_list_free_string, NULL);
-	g_list_free(string_list);
-}
-
-
-
-
-
-
-GList *
-g_string_split (GString *string, char sep, gchar *trim_chars, GStringTrimOption trim_options)
-{
-	GList *result = NULL;
-	gint first, last, pos;
-	gchar *str;
-	gchar *new_str;
-	GString *new_gstring;
-
-	g_assert (string);
-	str = string->str;
-	if (!str) return NULL;
-
-	first = 0;
-	last = strlen(str) - 1;
-	
-	/* strip leading and trailing separators */
-	while ( (first<=last) && (str[first]==sep) )
-		first++;
-	while ( (first<=last) && (str[last]==sep) )
-		last--;
-
-	
-	while (first<=last)  {
-		pos = first;
-		/* find next separator */
-		while ((pos<=last) && (str[pos]!=sep)) pos++;
-		if (first != pos) {
-			new_str = g_strndup (str+first, pos-first);
-			new_gstring = g_string_new (new_str);
-			g_free (new_str);
-			/* could do trimming in line to speed up this code */
-			if (trim_chars) g_string_trim (new_gstring, trim_chars, trim_options);
-			result = g_list_append (result, new_gstring);
-		}	
-		first = pos + 1;
-	}
-
-	return result;
-}
-
-
-void 
-g_string_trim (GString *string, gchar *chars, GStringTrimOption options)
-{
-	gint first_ok;
-	gint last_ok;
-	guint length;
-	gchar *str;
-
-	if ((!string) || (!string->str))
-		return; 
-	str = string->str;
-	length = strlen (str);
-	if (!length)
-		return;
-
-	first_ok = 0;
-	last_ok = length - 1;
-	
-	if (options & GSTRING_TRIM_STRIP_LEADING)
-		while  ( (first_ok <= last_ok) && (strchr (chars, str[first_ok])) )
-			first_ok++;
-
-	if (options & GSTRING_TRIM_STRIP_TRAILING)
-		while  ( (first_ok <= last_ok) && (strchr (chars, str[last_ok])) )
-			last_ok++;
-
-	if (first_ok > 0)
-		g_string_erase (string, 0, first_ok);
-
-	if (last_ok < length-1)
-		g_string_truncate (string, last_ok - first_ok +1);
-	
-}
diff --git a/camel/gstring-util.h b/camel/gstring-util.h
deleted file mode 100644
index 487bbc8a3b..0000000000
--- a/camel/gstring-util.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gstring-util : utilities for gstring object  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef GSTRING_UTIL_H
-#define GSTRING_UTIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-typedef enum {
-    GSTRING_TRIM_NONE            =     0,
-    GSTRING_TRIM_STRIP_TRAILING  =     1,
-    GSTRING_TRIM_STRIP_LEADING   =     2
-} GStringTrimOption;
-
-
-gboolean g_string_equals          (GString *string1, GString *string2);
-GString *g_string_clone           (GString *string);
-void     g_string_append_g_string (GString *dest_string,
-				   GString *other_string);
-
-gboolean g_string_equal_for_hash  (gconstpointer v, gconstpointer v2);
-gboolean g_string_equal_for_glist (gconstpointer v, gconstpointer v2);
-guint    g_string_hash            (gconstpointer v);
-void     g_string_list_free       (GList *string_list);
-
-GList   *g_string_split           (GString *string, char sep,
-				   gchar *trim_chars, GStringTrimOption trim_options);
-void     g_string_trim            (GString *string, gchar *chars,
-				   GStringTrimOption options);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GSTRING_UTIL_H */
diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c
deleted file mode 100644
index b04eaa3ce7..0000000000
--- a/camel/hash-table-utils.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* generic utilities for hash tables */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <ctype.h>
-#include "glib.h"
-#include "hash-table-utils.h"
-
-
-/* 
- * free a (key/value) hash table pair.
- * to be called in a g_hash_table_foreach()
- * before g_hash_table_destroy().
- */
-void
-g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-
-
-/***/
-/* use these two funcs for case insensitive hash table */
-
-gint 
-g_strcase_equal (gconstpointer a, gconstpointer b)
-{
-	return (g_strcasecmp ((gchar *)a, (gchar *)b) == 0);
-}
-
-
-/* modified g_str_hash from glib/gstring.c
-   because it would have been too slow to
-   us g_strdown() on the string */
-/* a char* hash function from ASU */
-guint
-g_strcase_hash (gconstpointer v)
-{
-	const char *s = (char*)v;
-	const char *p;
-	guint h=0, g;
-	
-	for(p = s; *p != '\0'; p += 1) {
-		h = ( h << 4 ) + toupper(*p);
-		if ( ( g = h & 0xf0000000 ) ) {
-			h = h ^ (g >> 24);
-			h = h ^ g;
-		}
-  }
-
-  return h /* % M */;
-}
-
-
-
-/***/
diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h
deleted file mode 100644
index 2904991848..0000000000
--- a/camel/hash-table-utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* generic utilities for hash tables */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef HASH_TABLE_UTILS_H
-#define HASH_TABLE_UTILS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data);
-
-gint g_strcase_equal (gconstpointer a, gconstpointer b);
-guint g_strcase_hash (gconstpointer v);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* HASH_TABLE_UTILS_H */
diff --git a/camel/providers/.cvsignore b/camel/providers/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/camel/providers/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
deleted file mode 100644
index 5fd7c83e50..0000000000
--- a/camel/providers/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-if ENABLE_NNTP
-NNTP_DIR=nntp
-endif
-
-# SUBDIRS = mbox pop3 sendmail smtp vee
-SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local
-
-# these ones are deprecated, and will no longer be maintained
-# mbox mh maildir vee
\ No newline at end of file
diff --git a/camel/providers/cache/.cvsignore b/camel/providers/cache/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/providers/cache/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/cache/Makefile.am b/camel/providers/cache/Makefile.am
deleted file mode 100644
index 7f9f6a9df5..0000000000
--- a/camel/providers/cache/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = 
-
-libcamelcacheincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelcache.la
-provider_DATA = libcamelcache.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-        -I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	$(GTK_INCLUDEDIR)			\
-	-I$(top_srcdir)/camel			\
-	-DG_LOG_DOMAIN=\"camel-cache-provider\"
-
-libcamelcache_la_SOURCES = 			\
-	camel-cache-folder.c			\
-	camel-cache-provider.c			\
-	camel-cache-store.c			\
-	camel-cache-map.c
-
-libcamelcacheinclude_HEADERS =			\
-	camel-cache-folder.h			\
-	camel-cache-store.h
-
-
-libcamelcache_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelcache.urls
diff --git a/camel/providers/cache/camel-cache-folder.c b/camel/providers/cache/camel-cache-folder.c
deleted file mode 100644
index c4379f8135..0000000000
--- a/camel/providers/cache/camel-cache-folder.c
+++ /dev/null
@@ -1,810 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-folder.c : class for a cache folder */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-/*
- * Notes on the cache provider:
- *
- * We require that the remote folder have persistent UIDs, and nothing
- * else. We require that the local store folder have persistent UIDs
- * and summary capability.
- *
- * If the remote folder does not have summary capability, we will need
- * to sync any new messages over to the local folder when the folder
- * is opened or when it changes. If the remote folder does have
- * summary capability, we can be more relaxed about doing this.
- *
- * If the remote folder has search capability, we will use it, at
- * least when the folder isn't synced. Otherwise if the local folder
- * has search capability, we will use that (but it will require
- * syncing the remote folder locally to use). Otherwise the cache
- * folder won't have search capability.
- *
- * CamelCacheFolder UIDs are remote UIDs, because we need to be able
- * to return a complete list of them at get_uids time, and the
- * messages might not all be present in the local folder, and we can't
- * predict what UIDs will be assigned to them when they are cached
- * there. We keep hash tables mapping remote to local UIDs and vice
- * versa, and a map file to cache this information between sessions.
- * The maps must always be 100% accurate.
- *
- * The messages in the local folder may not be in the same order as
- * the messages in the remote folder.
- *
- *
- * Many operations on the local folder are done with a NULL
- * CamelException, because having them fail only results in efficiency
- * problems, not actual permanent failures. (Eg, get_message will
- * try to append the message to the local folder, but doesn't check
- * for failure, because it already has the message to pass back to the
- * user.)
- */
-
-#include "camel-cache-folder.h"
-#include "camel-cache-store.h"
-#include <camel/camel-exception.h>
-#include <camel/camel-medium.h>
-
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-static CamelFolderClass *folder_class = NULL;
-
-static void init (CamelFolder *folder, CamelStore *parent_store,
-		  CamelFolder *parent_folder, const gchar *name,
-		  gchar *separator, gboolean path_begins_with_sep,
-		  CamelException *ex);
-
-static void refresh_info (CamelFolder *folder, CamelException *ex);
-
-static void cache_sync (CamelFolder *folder, gboolean expunge, 
-			CamelException *ex);
-
-static void expunge (CamelFolder *folder, CamelException *ex);
-
-static gint get_message_count (CamelFolder *folder);
-
-static void append_message (CamelFolder *folder, CamelMimeMessage *message, 
-			    const CamelMessageInfo *info, CamelException *ex);
-
-static guint32 get_message_flags (CamelFolder *folder, const char *uid);
-static void set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set);
-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid,
-				       const char *name);
-static void set_message_user_flag (CamelFolder *folder, const char *uid,
-				   const char *name, gboolean value);
-static const char *get_message_user_tag (CamelFolder *folder, const char *uid,
-					 const char *name);
-static void set_message_user_tag (CamelFolder *folder, const char *uid,
-				  const char *name, const char *value);
-
-static CamelMimeMessage *get_message (CamelFolder *folder, 
-				      const gchar *uid,
-				      CamelException *ex);
-
-static GPtrArray *get_uids (CamelFolder *folder);
-static GPtrArray *get_summary (CamelFolder *folder);
-static GPtrArray *get_subfolder_names (CamelFolder *folder);
-static void free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders);
-
-static GPtrArray *search_by_expression (CamelFolder *folder,
-					const char *expression,
-					CamelException *ex);
-
-static const CamelMessageInfo *get_message_info (CamelFolder *folder,
-						 const char *uid);
-
-static void copy_message_to (CamelFolder *source, const char *uid,
-			     CamelFolder *destination, CamelException *ex);
-
-static void move_message_to (CamelFolder *source, const char *uid,
-			     CamelFolder *destination, CamelException *ex);
-
-static void finalize (CamelObject *object);
-
-static void
-camel_cache_folder_class_init (CamelCacheFolderClass *camel_cache_folder_class)
-{
-	CamelFolderClass *camel_folder_class =
-		CAMEL_FOLDER_CLASS (camel_cache_folder_class);
-
-	folder_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	/* virtual method overload */
-	camel_folder_class->init = init;
-	camel_folder_class->refresh_info = refresh_info;
-	camel_folder_class->sync = cache_sync;
-	camel_folder_class->expunge = expunge;
-	camel_folder_class->get_message_count = get_message_count;
-	camel_folder_class->append_message = append_message;
-	camel_folder_class->get_message_flags = get_message_flags;
-	camel_folder_class->set_message_flags = set_message_flags;
-	camel_folder_class->get_message_user_flag = get_message_user_flag;
-	camel_folder_class->set_message_user_flag = set_message_user_flag;
-	camel_folder_class->get_message_user_tag = get_message_user_tag;
-	camel_folder_class->set_message_user_tag = set_message_user_tag;
-	camel_folder_class->get_message = get_message;
-	camel_folder_class->get_uids = get_uids;
-	camel_folder_class->free_uids = camel_folder_free_nop;
-	camel_folder_class->get_summary = get_summary;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	camel_folder_class->get_subfolder_names = get_subfolder_names;
-	camel_folder_class->free_subfolder_names = free_subfolder_names;
-	camel_folder_class->search_by_expression = search_by_expression;
-	camel_folder_class->get_message_info = get_message_info;
-	camel_folder_class->copy_message_to = copy_message_to;
-	camel_folder_class->move_message_to = move_message_to;
-}
-
-CamelType
-camel_cache_folder_get_type (void)
-{
-	static CamelType camel_cache_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_cache_folder_type == CAMEL_INVALID_TYPE) {
-		camel_cache_folder_type = camel_type_register (
-			CAMEL_FOLDER_TYPE, "CamelCacheFolder",
-			sizeof (CamelCacheFolder),
-			sizeof (CamelCacheFolderClass),
-			(CamelObjectClassInitFunc) camel_cache_folder_class_init,
-			NULL,
-			NULL,
-			(CamelObjectFinalizeFunc) finalize);
-	}
-
-	return camel_cache_folder_type;
-}
-
-
-static void
-cache_free_summary (CamelCacheFolder *cache_folder)
-{
-	if (cache_folder->remote_summary) {
-		camel_folder_free_summary (cache_folder->remote,
-					   cache_folder->summary);
-	} else {
-		int i;
-
-		for (i = 0; i < cache_folder->summary->len; i++) {
-			camel_message_info_free (
-				cache_folder->summary->pdata[i]);
-		}
-		g_ptr_array_free (cache_folder->summary, TRUE);
-		g_hash_table_destroy (cache_folder->summary_uids);
-	}
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelCacheFolder *cache_folder = CAMEL_CACHE_FOLDER (object);
-
-	if (cache_folder->uids) {
-		camel_folder_free_uids (cache_folder->remote,
-					cache_folder->uids);
-	}
-	if (cache_folder->summary)
-		cache_free_summary (cache_folder);
-
-	if (cache_folder->uidmap)
-		camel_cache_map_destroy (cache_folder->uidmap);
-
-	camel_object_unref (CAMEL_OBJECT (cache_folder->local));
-	camel_object_unref (CAMEL_OBJECT (cache_folder->remote));
-
-	g_free (cache_folder->mapfile);
-}
-
-
-static void
-update (CamelCacheFolder *cache_folder, CamelException *ex)
-{
-	if (cache_folder->uids) {
-		camel_folder_free_uids (cache_folder->remote,
-					cache_folder->uids);
-	}
-	cache_folder->uids = camel_folder_get_uids (cache_folder->remote);
-
-	if (cache_folder->summary)
-		cache_free_summary (cache_folder);
-
-	if (cache_folder->remote_summary) {
-		cache_folder->summary =
-			camel_folder_get_summary (cache_folder->remote);
-	} else {
-		CamelMessageInfo *mi;
-		GPtrArray *lsummary;
-		const char *ruid;
-		int i;
-
-		if (!cache_folder->is_synced) {
-			camel_cache_folder_sync (cache_folder, ex);
-			if (camel_exception_is_set (ex))
-				return;
-		}
-
-		cache_folder->summary = g_ptr_array_new ();
-		cache_folder->summary_uids = g_hash_table_new (g_str_hash,
-							       g_str_equal);
-
-		lsummary = camel_folder_get_summary (cache_folder->local);
-
-		/* For each local message, duplicate its info, replace
-		 * the uid with the remote one, and add it to the
-		 * uid->info cache.
-		 */
-		for (i = 0; i < lsummary->len; i++) {
-			mi = lsummary->pdata[i];
-			ruid = camel_cache_map_get_remote (cache_folder->uidmap, mi->uid);
-			if (!ruid) {
-				/* Stale message. Delete it from cache. */
-				camel_folder_delete_message (
-					cache_folder->local, mi->uid);
-				continue;
-			}
-
-			mi = g_new (CamelMessageInfo, 1);
-			camel_message_info_dup_to (lsummary->pdata[i], mi);
-			g_free (mi->uid);
-			mi->uid = g_strdup (ruid);
-			g_hash_table_insert (cache_folder->summary_uids,
-					     mi->uid, mi);
-		}
-		camel_folder_free_summary (cache_folder->local, lsummary);
-
-		/* Now build the summary array in remote UID order. */
-		for (i = 0; i < cache_folder->uids->len; i++) {
-			mi = g_hash_table_lookup (cache_folder->summary_uids,
-						  cache_folder->uids->pdata[i]);
-			g_ptr_array_add (cache_folder->summary, mi);
-		}
-	}
-	
-}
-
-static void
-init (CamelFolder *folder, CamelStore *parent_store,
-      CamelFolder *parent_folder, const gchar *name, gchar *separator,
-      gboolean path_begins_with_sep, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	char *path;
-
-	CF_CLASS (folder)->init (folder, parent_store, parent_folder,
-				 name, separator, path_begins_with_sep, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	folder->permanent_flags =
-		camel_folder_get_permanent_flags (cache_folder->local);
-	folder->can_hold_folders = cache_folder->remote->can_hold_folders;
-	folder->can_hold_messages = cache_folder->remote->can_hold_messages;
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability =
-		camel_folder_has_search_capability (cache_folder->local) ||
-		camel_folder_has_search_capability (cache_folder->remote);
-
-	cache_folder->remote_summary =
-		camel_folder_has_summary_capability (cache_folder->remote);
-
-	/* Load UIDs, summary, etc. */
-	path = CAMEL_SERVICE (cache_folder->local->parent_store)->url->path;
-	cache_folder->mapfile = g_strdup_printf ("%s/%s.map", path, name);
-	cache_folder->uidmap = camel_cache_map_new ();
-	camel_cache_map_read (cache_folder->uidmap, cache_folder->mapfile, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	update (cache_folder, ex);
-
-	return;
-}
-
-/* If the remote folder changes, cache the new messages if necessary,
- * update the summary, and propagate the signal.
- */
-static void
-remote_folder_changed (CamelObject *remote_folder, gpointer type,
-		       gpointer user_data)
-{
-	CamelCacheFolder *cache_folder = user_data;
-
-	update (cache_folder, NULL);
-	camel_object_trigger_event (CAMEL_OBJECT (cache_folder),
-				    "folder_changed", type);
-}
-
-/* If the local folder changes, it's because we just cached a message
- * or expunged messages. Look for new messages and update the UID maps.
- */
-static void
-local_folder_changed (CamelObject *local, gpointer type, gpointer data)
-{
-	CamelFolder *local_folder = CAMEL_FOLDER (local);
-	CamelCacheFolder *cache_folder = data;
-	CamelMimeMessage *msg;
-	GPtrArray *new_luids;
-	char *luid;
-	const char *ruid;
-	int i;
-
-	/* Get the updated list of local UIDs. For any that we didn't
-	 * already know about, figure out the corresponding remote
-	 * UID.
-	 */
-	new_luids = camel_folder_get_uids (local_folder);
-	for (i = 0; i < new_luids->len; i++) {
-		luid = new_luids->pdata[i];
-		if (!camel_cache_map_get_remote (cache_folder->uidmap, luid)) {
-			msg = camel_folder_get_message (local_folder,
-							luid, NULL);
-			if (!msg)
-				continue; /* Hrmph. */
-			ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),
-							"X-Evolution-Remote-UID");
-			if (!ruid) {
-				/* How'd that get here? */
-				camel_folder_delete_message (local_folder,
-							     luid);
-				continue;
-			}
-
-			camel_cache_map_update (cache_folder->uidmap,
-						luid, ruid);
-		}
-	}
-	camel_folder_free_uids (local_folder, new_luids);
-
-	/* FIXME: the uidmaps contain bad data now. */
-}
-
-/* DONE */
-static void
-refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_refresh_info (cache_folder->remote, ex);
-}
-
-/* DONE */
-static void
-cache_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_sync (cache_folder->remote, expunge, ex);
-	if (!camel_exception_is_set (ex)) {
-		camel_folder_sync (cache_folder->local, expunge, NULL);
-		camel_cache_map_write (cache_folder->uidmap,
-				       cache_folder->mapfile, ex);
-	}
-}
-
-/* DONE */
-static void
-expunge (CamelFolder *folder, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_expunge (cache_folder->remote, ex);
-	if (!camel_exception_is_set (ex))
-		camel_folder_expunge (cache_folder->local, NULL);
-}
-
-/* DONE */
-static gint
-get_message_count (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->summary->len;
-}
-
-/* DONE */
-static void
-append_message (CamelFolder *folder, CamelMimeMessage *message, 
-		const CamelMessageInfo *info, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	/* We'd like to cache this locally as well, but we have no
-	 * 100% reliable way to determine the UID assigned to the
-	 * remote message, so we can't.
-	 */
-	camel_folder_append_message (cache_folder->remote, message, info, ex);
-}
-
-/* DONE */
-static guint32
-get_message_flags (CamelFolder *folder, const char *uid)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, 0);
-	return mi->flags;
-}
-
-/* DONE */
-static void
-set_message_flags (CamelFolder *folder, const char *uid,
-		   guint32 flags, guint32 set)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_flags (cache_folder->local, luid,
-						flags, set);
-	}
-	camel_folder_set_message_flags (cache_folder->remote, uid, flags, set);
-}
-
-/* DONE */
-static gboolean
-get_message_user_flag (CamelFolder *folder, const char *uid, const char *name)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, 0);
-	return camel_flag_get ((CamelFlag **)&mi->user_flags, name);
-}
-
-/* DONE */
-static void
-set_message_user_flag (CamelFolder *folder, const char *uid,
-		       const char *name, gboolean value)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_user_flag (cache_folder->local, luid,
-						    name, value);
-	}
-	camel_folder_set_message_user_flag (cache_folder->remote, uid,
-					    name, value);
-}
-
-
-/* DONE */
-static const char *
-get_message_user_tag (CamelFolder *folder, const char *uid, const char *name)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, NULL);
-	return camel_tag_get ((CamelTag **)&mi->user_tags, name);
-}
-
-/* DONE */
-static void
-set_message_user_tag (CamelFolder *folder, const char *uid,
-		      const char *name, const char *value)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_user_tag (cache_folder->local, luid,
-						   name, value);
-	}
-	camel_folder_set_message_user_tag (cache_folder->remote, uid,
-					   name, value);
-}
-
-
-/* DONE */
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	CamelMimeMessage *msg;
-	const CamelMessageInfo *info;
-	const char *luid;
-
-	/* Check if we have it cached first. */
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		msg = camel_folder_get_message (cache_folder->local,
-						luid, NULL);
-		if (msg)
-			return msg;
-
-		/* Hm... Oh well. Update the map and try for real. */
-		camel_cache_map_remove (cache_folder->uidmap, NULL, uid);
-	}
-
-	/* OK. It's not cached. Get the remote message. */
-	msg = camel_folder_get_message (cache_folder->remote, uid, ex);
-	if (!msg)
-		return NULL;
-	info = camel_folder_get_message_info (cache_folder->remote, uid);
-
-	/* Add a header giving the remote UID and append it to the
-	 * local folder. (This should eventually invoke
-	 * local_folder_changed(), which will take care of updating
-	 * the uidmaps.)
-	 */
-	camel_medium_add_header (CAMEL_MEDIUM (msg), "X-Evolution-Remote-UID",
-				 uid);
-	camel_folder_append_message (cache_folder->local, msg, info, NULL);
-
-	return msg;
-}
-
-/* DONE */
-static GPtrArray *
-get_uids (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->uids;
-}
-
-/* DONE */
-static GPtrArray *
-get_summary (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->summary;
-}
-
-/* DONE */
-static GPtrArray *
-get_subfolder_names (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return camel_folder_get_subfolder_names (cache_folder->remote);
-}
-
-/* DONE */
-static void
-free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_free_subfolder_names (cache_folder->remote, subfolders);
-}
-
-/* DONE */
-static GPtrArray *
-search_by_expression (CamelFolder *folder, const char *expression,
-		      CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	/* Search on the remote folder if we're not synced. */
-	if (!cache_folder->is_synced &&
-	    camel_folder_has_search_capability (cache_folder->remote)) {
-		return camel_folder_search_by_expression (cache_folder->remote,
-							  expression, ex);
-	} else {
-		GPtrArray *matches;
-		const char *ruid;
-		int i;
-
-		if (!cache_folder->is_synced)
-			camel_cache_folder_sync (cache_folder, ex);
-		if (camel_exception_is_set (ex))
-			return NULL;
-		matches = search_by_expression (cache_folder->local,
-						expression, ex);
-		if (camel_exception_is_set (ex))
-			return NULL;
-
-		/* Convert local uids to remote. */
-		for (i = 0; i < matches->len; i++) {
-			ruid = camel_cache_map_get_remote (cache_folder->uidmap,
-							   matches->pdata[i]);
-			g_free (matches->pdata[i]);
-			matches->pdata[i] = g_strdup (ruid);
-		}
-
-		return matches;
-	}
-}
-
-/* DONE */
-static const CamelMessageInfo *
-get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	if (cache_folder->remote_summary) {
-		return camel_folder_get_message_info (cache_folder->remote,
-						      uid);
-	} else
-		return g_hash_table_lookup (cache_folder->summary_uids, uid);
-}
-
-/* DONE */
-static void
-copy_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *destination, CamelException *ex)
-{
-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;
-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;
-
-	/* If we are here, we know that the folders have the same parent
-	 * store, which implies their remote and local folders have the
-	 * same parent store as well.
-	 */
-
-	if (CF_CLASS (source_cache_folder->remote)->copy_message_to !=
-	    folder_class->copy_message_to) {
-		/* The remote store has a non-default copy method, so
-		 * use it to avoid unnecessary network traffic.
-		 */
-		CF_CLASS (source_cache_folder->remote)->copy_message_to (
-			source_cache_folder->remote, uid,
-			dest_cache_folder->remote, ex);
-	} else {
-		/* The remote store uses the default copy method,
-		 * meaning if we proxy the copy_message_to over to it,
-		 * it will suck the message over the network. We may
-		 * already have a local copy, and if we don't, we want
-		 * to, and if we're going to have the message in
-		 * memory, then we should get it into the destination
-		 * cache too. So do this by hand.
-		 */
-		CamelMimeMessage *msg;
-		const CamelMessageInfo *info;
-
-		msg = get_message (source, uid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (source, uid);
-
-		camel_medium_remove_header (CAMEL_MEDIUM (msg),
-					    "X-Evolution-Remote-UID");
-		append_message (destination, msg, info, ex);
-	}
-}
-
-/* DONE */
-static void
-move_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *destination, CamelException *ex)
-{
-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;
-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;
-
-	/* See comments in copy_message_to. */
-
-	if (CF_CLASS (source_cache_folder)->move_message_to !=
-	    folder_class->move_message_to) {
-		CF_CLASS (source_cache_folder)->move_message_to (
-			source_cache_folder->remote, uid,
-			dest_cache_folder->remote, ex);
-	} else {
-		CamelMimeMessage *msg;
-		const CamelMessageInfo *info;
-
-		msg = get_message (source, uid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (source, uid);
-
-		camel_medium_remove_header (CAMEL_MEDIUM (msg),
-					    "X-Evolution-Remote-UID");
-		append_message (destination, msg, info, ex);
-		if (!camel_exception_is_set (ex))
-			camel_folder_delete_message (source, uid);
-	}
-}
-
-
-CamelFolder *
-camel_cache_folder_new (CamelStore *store, CamelFolder *parent,
-			CamelFolder *remote, CamelFolder *local,
-			CamelException *ex)
-{
-	CamelCacheFolder *cache_folder;
-	CamelFolder *folder;
-
-	cache_folder = CAMEL_CACHE_FOLDER (camel_object_new (CAMEL_CACHE_FOLDER_TYPE));
-	folder = (CamelFolder *)cache_folder;
-
-	cache_folder->local = local;
-	camel_object_ref (CAMEL_OBJECT (local));
-	camel_object_hook_event (CAMEL_OBJECT (local), "folder_changed",
-				 local_folder_changed, cache_folder);
-
-	cache_folder->remote = remote;
-	camel_object_ref (CAMEL_OBJECT (remote));
-	camel_object_hook_event (CAMEL_OBJECT (remote), "folder_changed",
-				 remote_folder_changed, cache_folder);
-
-	/* XXX */
-
-	return folder;
-}
-
-void
-camel_cache_folder_sync (CamelCacheFolder *cache_folder, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	const char *ruid, *luid;
-	int lsize, i;
-	const CamelMessageInfo *info;
-
-	lsize = camel_folder_get_message_count (cache_folder->local);
-
-	camel_folder_freeze (cache_folder->local);
-	for (i = 0; i < cache_folder->uids->len; i++) {
-		ruid = cache_folder->uids->pdata[i];
-		luid = camel_cache_map_get_local (cache_folder->uidmap, ruid);
-
-		/* Don't re-copy messages we already have. */
-		if (luid &&
-		    camel_folder_get_message_info (cache_folder->local, luid))
-			continue;
-
-		msg = camel_folder_get_message (cache_folder->remote,
-						ruid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (cache_folder->remote,
-						      ruid);
-
-		camel_medium_add_header (CAMEL_MEDIUM (msg),
-					 "X-Evolution-Remote-UID", ruid);
-		camel_folder_append_message (cache_folder->local, msg,
-					     info, ex);
-		if (camel_exception_is_set (ex))
-			return;
-	}
-	camel_folder_thaw (cache_folder->local);
-}
-
-static void
-get_mappings (CamelCacheFolder *cache_folder, int first, CamelException *ex)
-{
-	GPtrArray *uids;
-	CamelMimeMessage *msg;
-	const char *ruid;
-	int i;
-
-	uids = camel_folder_get_uids (cache_folder->local);
-	for (i = first; i < uids->len; i++) {
-		msg = camel_folder_get_message (cache_folder->local,
-						uids->pdata[i], ex);
-		if (!msg)
-			break;
-		ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),
-						"X-Evolution-Remote-UID");
-
-		camel_cache_map_add (cache_folder->uidmap,
-				     uids->pdata[i], ruid);
-	}
-	camel_folder_free_uids (cache_folder->local, uids);
-}
diff --git a/camel/providers/cache/camel-cache-folder.h b/camel/providers/cache/camel-cache-folder.h
deleted file mode 100644
index 2495f133b3..0000000000
--- a/camel/providers/cache/camel-cache-folder.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-folder.h: Class for a cache folder */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_FOLDER_H
-#define CAMEL_CACHE_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-folder.h>
-#include "camel-cache-map.h"
-
-#define CAMEL_CACHE_FOLDER_TYPE     (camel_cache_folder_get_type ())
-#define CAMEL_CACHE_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolder))
-#define CAMEL_CACHE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolderClass))
-#define CAMEL_IS_CACHE_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	/* Remote and local folders */
-	CamelFolder *remote, *local;
-
-	/* Remote UIDs, in order, summary, and uid->info map if
-	 * summary is from local info.
-	 */
-	GPtrArray *uids, *summary;
-	GHashTable *summary_uids;
-
-	/* UID map */
-	CamelCacheMap *uidmap;
-	char *mapfile;
-
-	/* Is the summary remote? Is the folder known to be synced? */
-	gboolean remote_summary, is_synced;
-
-} CamelCacheFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelCacheFolderClass;
-
-
-CamelFolder *camel_cache_folder_new (CamelStore *store, CamelFolder *parent,
-				     CamelFolder *remote, CamelFolder *local,
-				     CamelException *ex);
-
-void camel_cache_folder_sync (CamelCacheFolder *cache_folder,
-			      CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_cache_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_FOLDER_H */
diff --git a/camel/providers/cache/camel-cache-map.c b/camel/providers/cache/camel-cache-map.c
deleted file mode 100644
index d3cece6f60..0000000000
--- a/camel/providers/cache/camel-cache-map.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-map.c : functions for a local<->remote uid map */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-cache-map.h"
-#include <camel/camel-exception.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/**
- * camel_cache_map_new:
- *
- * Return value: a new CamelCacheMap
- **/
-CamelCacheMap *
-camel_cache_map_new (void)
-{
-	CamelCacheMap *map = g_new (CamelCacheMap, 1);
-
-	map->l2r = g_hash_table_new (g_str_hash, g_str_equal);
-	map->r2l = g_hash_table_new (g_str_hash, g_str_equal);
-
-	return map;
-}
-
-static void
-free_mapping (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-	g_free (data);
-}
-
-/**
- * camel_cache_map_destroy:
- * @map: a CamelCacheMap
- *
- * Frees @map and all of the data stored in it.
- **/
-void
-camel_cache_map_destroy (CamelCacheMap *map)
-{
-	g_hash_table_foreach (map->l2r, free_mapping, NULL);
-	g_hash_table_destroy (map->l2r);
-	g_hash_table_destroy (map->r2l);
-	g_free (map);
-}
-
-/**
- * camel_cache_map_add:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Adds a mapping between @luid and @ruid. If either already exists
- * in the map, this may leak memory and result in incorrect map entries.
- * Use camel_cache_map_update() in that case instead.
- **/
-void
-camel_cache_map_add (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	char *map_luid = g_strdup (luid);
-	char *map_ruid = g_strdup (ruid);
-
-	g_hash_table_insert (map->l2r, map_luid, map_ruid);
-	g_hash_table_insert (map->r2l, map_ruid, map_luid);
-}
-
-/**
- * camel_cache_map_remove:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Removes the mapping between @luid and @ruid. Either (but not both)
- * of the uids can be %NULL if they are not both known.
- **/
-void
-camel_cache_map_remove (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	gpointer map_luid, map_ruid;
-
-	if ((luid && g_hash_table_lookup_extended (map->l2r, luid,
-						   &map_luid, &map_ruid)) ||
-	    (ruid && g_hash_table_lookup_extended (map->r2l, ruid,
-						  &map_luid, &map_ruid))) {
-		g_hash_table_remove (map->l2r, map_luid);
-		g_hash_table_remove (map->r2l, map_ruid);
-		g_free (map_luid);
-		g_free (map_ruid);
-	}
-}
-
-/**
- * camel_cache_map_update:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Updates the mappings to associate @luid with @ruid, clearing any
- * previous mappings for both of them.
- **/
-void
-camel_cache_map_update (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	camel_cache_map_remove (map, luid, ruid);
-	camel_cache_map_add (map, luid, ruid);
-}
-
-/**
- * camel_cache_map_get_local
- * @map: a CamelCacheMap
- * @ruid: the remote uid
- *
- * Return value: the corresponding local uid, or %NULL
- **/
-const char *
-camel_cache_map_get_local (CamelCacheMap *map, const char *ruid)
-{
-	return g_hash_table_lookup (map->r2l, ruid);
-}
-
-/**
- * camel_cache_map_get_remote
- * @map: a CamelCacheMap
- * @luid: the local uid
- *
- * Return value: the corresponding remote uid, or %NULL
- **/
-const char *
-camel_cache_map_get_remote (CamelCacheMap *map, const char *luid)
-{
-	return g_hash_table_lookup (map->l2r, luid);
-}
-
-
-
-static void
-write_mapping (gpointer key, gpointer value, gpointer user_data)
-{
-	int fd = *(int *)user_data;
-
-	/* FIXME: We assume the local UID has no ':'s in it. */
-	write (fd, key, strlen (key));
-	write (fd, ":", 1);
-	write (fd, value, strlen (value));
-	write (fd, "\n", 1);
-}
-
-/**
- * camel_cache_map_write:
- * @map: a CamelCacheMap
- * @file: the filename to write the map to
- * @ex: a CamelException
- *
- * Writes @map out to @file, setting @ex if something goes wrong.
- **/
-void
-camel_cache_map_write (CamelCacheMap *map, const char *file,
-		       CamelException *ex)
-{
-	int fd;
-	char *tmpfile;
-
-	tmpfile = g_strdup_printf ("%s~", file);
-	fd = open (tmpfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
-	if (fd == -1) {
-		g_free (tmpfile);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not create cache map file: %s",
-				      g_strerror (errno));
-		return;
-	}
-
-	g_hash_table_foreach (map->l2r, write_mapping, &fd);
-
-	if (close (fd) == -1 ||
-	    rename (tmpfile, file) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not save cache map file: %s",
-				      g_strerror (errno));
-		unlink (tmpfile);
-	}
-	g_free (tmpfile);
-}
-
-/**
- * camel_cache_map_read:
- * @map: a CamelCacheMap
- * @file: the filename to read the map from
- * @ex: a CamelException
- *
- * Reads @map from @file, setting @ex if something goes wrong. @map
- * should be a freshly-created CamelCacheMap.
- **/
-void
-camel_cache_map_read (CamelCacheMap *map, const char *file, CamelException *ex)
-{
-	FILE *f;
-	char buf[1024], *p, *q;
-
-	/* FIXME: lazy implementation. We could make this work with
-	 * lines longer than 1024 chars. :)
-	 */
-
-	f = fopen (file, "r");
-	if (!f) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not open cache map file: %s",
-				      g_strerror (errno));
-		return;
-	}
-
-	while (fgets (buf, sizeof (buf), f)) {
-		p = strchr (buf, ':');
-		if (p)
-			q = strchr (buf, '\n');
-		if (!p || !q) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-					     "Bad cache file.");
-			return;
-		}
-		*p++ = *q = '\0';
-
-		/* Local uid at buf, remote at p. */
-		camel_cache_map_add (map, buf, p);
-	}
-
-	fclose (f);
-}
diff --git a/camel/providers/cache/camel-cache-map.h b/camel/providers/cache/camel-cache-map.h
deleted file mode 100644
index a15c9afe1a..0000000000
--- a/camel/providers/cache/camel-cache-map.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-map.h: functions for dealing with UID maps */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_MAP_H
-#define CAMEL_CACHE_MAP_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-typedef struct {
-	GHashTable *l2r, *r2l;
-} CamelCacheMap;
-
-CamelCacheMap *camel_cache_map_new (void);
-void camel_cache_map_destroy (CamelCacheMap *map);
-
-void camel_cache_map_add (CamelCacheMap *map, const char *luid,
-			  const char *ruid);
-void camel_cache_map_remove (CamelCacheMap *map, const char *luid,
-			     const char *ruid);
-void camel_cache_map_update (CamelCacheMap *map, const char *luid,
-			     const char *ruid);
-
-const char *camel_cache_map_get_local (CamelCacheMap *map, const char *ruid);
-const char *camel_cache_map_get_remote (CamelCacheMap *map, const char *luid);
-
-void camel_cache_map_write (CamelCacheMap *map, const char *file,
-			    CamelException *ex);
-void camel_cache_map_read (CamelCacheMap *map, const char *file,
-			   CamelException *ex);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_MAP_H */
diff --git a/camel/providers/cache/camel-cache-provider.c b/camel/providers/cache/camel-cache-provider.c
deleted file mode 100644
index 217f06816a..0000000000
--- a/camel/providers/cache/camel-cache-provider.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-provider.c: cache provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-cache-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-
-static CamelProvider cache_provider = {
-	"cache",
-	"Cache",
-
-	"For caching remote mail into a local store.",
-
-	"cache",
-
-	0,
-
-	{ 0, 0 }
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	cache_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_cache_store_get_type();
-
-	camel_session_register_provider (session, &cache_provider);
-}
diff --git a/camel/providers/cache/camel-cache-store.c b/camel/providers/cache/camel-cache-store.c
deleted file mode 100644
index 544cca69a1..0000000000
--- a/camel/providers/cache/camel-cache-store.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-store.c : class for a cache store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "camel-cache-store.h"
-#include "camel-cache-folder.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "md5-utils.h"
-
-static CamelServiceClass *service_class = NULL;
-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void finalize (CamelObject *object);
-
-static gboolean cache_connect (CamelService *service, CamelException *ex);
-static gboolean cache_disconnect (CamelService *service, CamelException *ex);
-static char *get_path (CamelService *service);
-static char *get_name (CamelService *service, gboolean brief);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, 
-				gboolean create, CamelException *ex);
-static void delete_folder (CamelStore *store, const char *folder_name, 
-			   CamelException *ex);
-static void rename_folder (CamelStore *store, const char *old_name,
-			   const char *new_name, CamelException *ex);
-static char *get_folder_name (CamelStore *store, const char *folder_name, 
-			      CamelException *ex);
-static char *get_root_folder_name (CamelStore *store, CamelException *ex);
-static char *get_default_folder_name (CamelStore *store, CamelException *ex);
-
-
-static void
-camel_cache_store_class_init (CamelCacheStoreClass *camel_cache_store_class)
-{
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_cache_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_cache_store_class);
-	
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-
-	/* virtual method overload */
-	camel_service_class->connect = cache_connect;
-	camel_service_class->disconnect = cache_disconnect;
-	camel_service_class->get_path = get_path;
-	camel_service_class->get_name = get_name;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_root_folder_name = get_root_folder_name;
-	camel_store_class->get_default_folder_name = get_default_folder_name;
-}
-
-
-CamelType
-camel_cache_store_get_type (void)
-{
-	static CamelType camel_cache_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_cache_store_type == CAMEL_INVALID_TYPE) {
-		camel_cache_store_type = camel_type_register (
-			CAMEL_STORE_TYPE, "CamelCacheStore",
-			sizeof (CamelCacheStore),
-			sizeof (CamelCacheStoreClass),
-			(CamelObjectClassInitFunc) camel_cache_store_class_init,
-			NULL,
-			NULL,
-			(CamelObjectFinalizeFunc) finalize);
-	}
-
-	return camel_cache_store_type;
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (object);
-
-	camel_object_unref (CAMEL_OBJECT (cache_store->local));
-	camel_object_unref (CAMEL_OBJECT (cache_store->remote));
-	g_free (cache_store->local_base);
-}
-
-
-static gboolean
-cache_connect (CamelService *service, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_connect (CAMEL_SERVICE (cache_store->remote), ex) &&
-		camel_service_connect (CAMEL_SERVICE (cache_store->local), ex);
-}
-
-static gboolean
-cache_disconnect (CamelService *service, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_disconnect (CAMEL_SERVICE (cache_store->local), ex) &&
-		camel_service_disconnect (CAMEL_SERVICE (cache_store->remote), ex);
-}
-
-static char *
-get_path (CamelService *service)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-	char *path, *subpath;
-
-	subpath = camel_service_get_path (CAMEL_SERVICE (cache_store->remote));
-	path = g_strdup_printf ("cache/%s", subpath);
-	g_free (subpath);
-	return path;
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_get_name (CAMEL_SERVICE (cache_store->remote),
-				       brief);
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name,
-	    gboolean create, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-	CamelFolder *parent, *rf, *lf;
-
-	rf = camel_store_get_folder (cache_store->remote, folder_name,
-				     create, ex);
-	if (!rf)
-		return NULL;
-
-	lf = camel_store_get_folder (cache_store->local, folder_name,
-				     TRUE, ex);
-	if (!lf) {
-		camel_object_unref (CAMEL_OBJECT (rf));
-		camel_exception_setv (ex, camel_exception_get_id (ex),
-				      "Could not create cache folder:\n%s",
-				      camel_exception_get_description (ex));
-		return NULL;
-	}
-
-	return camel_cache_folder_new (store, parent, rf, lf, ex);
-}
-
-/* XXX these two need to be better about failure recovery. */
-static void
-delete_folder (CamelStore *store, const char *folder_name,
-	       CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	camel_store_delete_folder (cache_store->remote, folder_name, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	camel_store_delete_folder (cache_store->local, folder_name, NULL);
-}
-
-static void
-rename_folder (CamelStore *store, const char *old_name,
-	       const char *new_name, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	camel_store_rename_folder (cache_store->remote, old_name,
-				   new_name, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	camel_store_rename_folder (cache_store->local, old_name,
-				   new_name, NULL);
-}
-
-static char *
-get_folder_name (CamelStore *store, const char *folder_name,
-		 CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_folder_name (
-		cache_store->remote, folder_name, ex);
-}
-
-static char *
-get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_root_folder_name (
-		cache_store->remote, ex);
-}
-
-static char *
-get_default_folder_name (CamelStore *store, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_default_folder_name (
-		cache_store->remote, ex);
-}
-
-
-/**
- * camel_cache_store_new:
- * @remote: a remote store
- * @ex: a CamelException
- *
- * Return value: a CamelCacheStore for the given remote store.
- **/
-CamelStore *
-camel_cache_store_new (CamelStore *remote, CamelException *ex)
-{
-	CamelCacheStore *cache_store;
-	CamelService *remote_service = (CamelService *)remote;
-	CamelSession *session;
-	char *url_string;
-	CamelURL *url;
-
-	session = camel_service_get_session (remote_service);
-
-	url_string = camel_service_get_url (remote_service);
-	url = camel_url_new (url_string, ex);
-	g_free (url_string);
-
-	if (!url)
-		return NULL;
-
-	cache_store = (CamelCacheStore *)
-		camel_service_new (CAMEL_CACHE_STORE_TYPE, session,
-				   camel_service_get_provider (remote_service),
-				   url, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_url_free (url);
-		return NULL;
-	}
-
-	cache_store->remote = remote;
-	camel_object_ref (CAMEL_OBJECT (remote));
-
-	cache_store->local_base = camel_session_get_storage_path (
-		session, (CamelService *)cache_store, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (cache_store));
-		return NULL;
-	}
-
-	url_string = g_strdup_printf ("mbox:%s", cache_store->local_base);
-	cache_store->local = camel_session_get_store (session, url_string, ex);
-	g_free (url_string);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (cache_store));
-		return NULL;
-	}
-
-	return (CamelStore *)cache_store;
-}
diff --git a/camel/providers/cache/camel-cache-store.h b/camel/providers/cache/camel-cache-store.h
deleted file mode 100644
index 97fae62a51..0000000000
--- a/camel/providers/cache/camel-cache-store.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-store.h: class for a cache store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_STORE_H
-#define CAMEL_CACHE_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-store.h>
-
-#define CAMEL_CACHE_STORE_TYPE     (camel_cache_store_get_type ())
-#define CAMEL_CACHE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_STORE_TYPE, CamelCacheStore))
-#define CAMEL_CACHE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_STORE_TYPE, CamelCacheStoreClass))
-#define CAMEL_IS_CACHE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;
-
-	char *local_base;
-	CamelStore *remote, *local;
-
-} CamelCacheStore;
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-} CamelCacheStoreClass;
-
-
-/* support functions */
-CamelStore *camel_cache_store_new (CamelStore *remote, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_cache_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_STORE_H */
-
-
diff --git a/camel/providers/cache/libcamelcache.urls b/camel/providers/cache/libcamelcache.urls
deleted file mode 100644
index 06cf65390f..0000000000
--- a/camel/providers/cache/libcamelcache.urls
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/camel/providers/imap/.cvsignore b/camel/providers/imap/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/providers/imap/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
deleted file mode 100644
index 39e160c879..0000000000
--- a/camel/providers/imap/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelimapincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelimap.la
-provider_DATA = libcamelimap.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-imap-provider\"	
-
-libcamelimap_la_SOURCES = 			\
-	camel-imap-command.c			\
-	camel-imap-folder.c			\
-	camel-imap-provider.c			\
-	camel-imap-search.c			\
-	camel-imap-store.c			\
-	camel-imap-summary.c			\
-	camel-imap-utils.c			\
-	camel-imap-wrapper.c
-
-libcamelimapinclude_HEADERS =			\
-	camel-imap-command.h			\
-	camel-imap-folder.h			\
-	camel-imap-search.h			\
-	camel-imap-store.h			\
-	camel-imap-summary.h			\
-	camel-imap-types.h			\
-	camel-imap-utils.h			\
-	camel-imap-wrapper.h
-
-libcamelimap_la_LDFLAGS = -version-info 0:0:0
-
-noinst_HEADERS =				\
-	camel-imap-private.h
-
-EXTRA_DIST = libcamelimap.urls
-
-
-
-
-
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
deleted file mode 100644
index 8a713cde8b..0000000000
--- a/camel/providers/imap/camel-imap-command.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-command.c: IMAP command sending/parsing routines */
-
-/*
- *  Authors:
- *    Dan Winship <danw@helixcode.com>
- *    Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "camel-imap-command.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-folder.h"
-#include "camel-imap-store.h"
-#include <camel/camel-exception.h>
-
-static char *imap_read_untagged (CamelImapStore *store, char *line,
-				 CamelException *ex);
-static CamelImapResponse *imap_read_response (CamelImapStore *store,
-					      CamelException *ex);
-static char *imap_command_strdup_vprintf (CamelImapStore *store,
-					  const char *fmt, va_list ap);
-
-/**
- * camel_imap_command: Send a command to a IMAP server and get a response
- * @store: the IMAP store
- * @folder: The folder to perform the operation in (or %NULL if not
- * relevant).
- * @ex: a CamelException
- * @fmt: an sort of printf-style format string, followed by arguments
- *
- * This function makes sure that @folder (if non-%NULL) is the
- * currently-selected folder on @store and then sends the IMAP command
- * specified by @fmt and the following arguments. It then reads the
- * server's response(s) and parses the final result.
- *
- * As a special case, if @fmt is %NULL, it will just select @folder
- * and return the response from doing so.
- * 
- * @fmt can include the following %-escapes ONLY:
- *	%s, %d, %%: as with printf
- *	%S: an IMAP "string" (quoted string or literal)
- *
- * %S strings will be passed as literals if the server supports LITERAL+
- * and quoted strings otherwise. (%S does not support strings that
- * contain newlines.)
- *
- * This function assumes you have an exclusive lock on the command
- * channel/stream.
- *
- * Return value: %NULL if an error occurred (in which case @ex will
- * be set). Otherwise, a CamelImapResponse describing the server's
- * response, which the caller must free with camel_imap_response_free().
- **/
-CamelImapResponse *
-camel_imap_command (CamelImapStore *store, CamelFolder *folder,
-		    CamelException *ex, const char *fmt, ...)
-{
-	gchar *cmdbuf;
-	va_list ap;
-
-	/* Check for current folder */
-	if (folder && (!fmt || folder != store->current_folder)) {
-		CamelImapResponse *response;
-
-		store->current_folder = NULL;
-		response = camel_imap_command (store, NULL, ex, "SELECT %S",
-					       folder->full_name);
-		if (!response)
-			return NULL;
-		store->current_folder = folder;
-
-		if (!fmt)
-			return response;
-
-		camel_imap_folder_selected (folder, response, ex);
-		camel_imap_response_free (response);
-	}
-
-	/* Send the command */
-	va_start (ap, fmt);
-	cmdbuf = imap_command_strdup_vprintf (store, fmt, ap);
-	va_end (ap);
-
-	camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,
-					"A%.5d %s\r\n", store->command++,
-					cmdbuf);
-	g_free (cmdbuf);
-	if (camel_exception_is_set (ex))
-		return NULL;
-
-	/* Read the response. */
-	return imap_read_response (store, ex);
-}
-
-/**
- * camel_imap_command_continuation: Send more command data to the IMAP server
- * @store: the IMAP store
- * @ex: a CamelException
- * @cmdbuf: buffer containing the response/request data
- *
- * This method is for sending continuing responses to the IMAP server
- * after camel_imap_command returns a CAMEL_IMAP_PLUS response.
- * 
- * This function assumes you have an exclusive lock on the remote stream.
- *
- * Return value: as for camel_imap_command()
- **/
-CamelImapResponse *
-camel_imap_command_continuation (CamelImapStore *store, CamelException *ex,
-				 const char *cmdbuf)
-{
-	if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,
-					    "%s\r\n", cmdbuf) < 0)
-		return NULL;
-
-	return imap_read_response (store, ex);
-}
-
-/* Read the response to an IMAP command. */
-static CamelImapResponse *
-imap_read_response (CamelImapStore *store, CamelException *ex)
-{
-	CamelImapResponse *response;
-	int number, exists = 0;
-	GArray *expunged = NULL;
-	char *respbuf, *retcode, *word, *p;
-
-	/* Read first line */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),
-					  &respbuf, ex) < 0)
-		return NULL;
-
-	response = g_new0 (CamelImapResponse, 1);
-	response->untagged = g_ptr_array_new ();
-
-	/* Check for untagged data */
-	while (!strncmp (respbuf, "* ", 2)) {
-		/* Read the rest of the response if it is multi-line. */
-		respbuf = imap_read_untagged (store, respbuf, ex);
-		if (camel_exception_is_set (ex))
-			break;
-
-		/* If it starts with a number, we might deal with
-		 * it ourselves.
-		 */
-		word = imap_next_word (respbuf);
-		number = strtoul (word, &p, 10);
-		if (p != word && store->current_folder) {
-			word = imap_next_word (p);
-			if (!g_strcasecmp (word, "EXISTS")) {
-				exists = number;
-				g_free (respbuf);
-				goto next;
-			} else if (!g_strcasecmp (word, "EXPUNGE")) {
-				if (!expunged) {
-					expunged = g_array_new (FALSE, FALSE,
-								sizeof (int));
-				}
-				g_array_append_val (expunged, number);
-				g_free (respbuf);
-				goto next;
-			}
-		} else {
-			if (!g_strncasecmp (word, "BYE", 3)) {
-				/* connection was lost, no more data to fetch */
-				store->connected = FALSE;
-				g_free (respbuf);
-				respbuf = NULL;
-				break;
-			}
-		}
-
-		g_ptr_array_add (response->untagged, respbuf);
-	next:
-		if (camel_remote_store_recv_line (
-			CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0)
-			break;
-	}
-
-	/* Update the summary */
-	if (store->current_folder && (exists > 0 || expunged)) {
-		camel_imap_folder_changed (store->current_folder, exists,
-					   expunged, NULL);
-	}
-	if (expunged)
-		g_array_free (expunged, TRUE);
-
-	if (!respbuf || camel_exception_is_set (ex)) {
-		camel_imap_response_free (response);
-		return NULL;
-	}
-
-	response->status = respbuf;
-
-	/* Check for OK or continuation response. */
-	if (!strncmp (respbuf, "+ ", 2))
-		return response;
-	retcode = imap_next_word (respbuf);
-	if (!strncmp (retcode, "OK", 2))
-		return response;
-
-	/* We should never get BAD, or anything else but +, OK, or NO
-	 * for that matter.
-	 */
-	if (strncmp (retcode, "NO", 2) != 0) {
-		g_warning ("Unexpected response from IMAP server: %s",
-			   respbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unexpected response from IMAP "
-					"server: %s"), respbuf);
-		camel_imap_response_free (response);
-		return NULL;
-	}
-
-	retcode = imap_next_word (retcode);
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-			      _("IMAP command failed: %s"),
-			      retcode ? retcode : _("Unknown error"));
-	camel_imap_response_free (response);
-	return NULL;
-}
-
-/* Given a line that is the start of an untagged response, read and
- * return the complete response, which may include an arbitrary number
- * of literals.
- */
-static char *
-imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)
-{
-	int fulllen, length, ldigits, nread, i;
-	GPtrArray *data;
-	GString *str;
-	char *end, *p, *s, *d;
-
-	p = strrchr (line, '{');
-	if (!p)
-		return line;
-
-	data = g_ptr_array_new ();
-	fulllen = 0;
-
-	while (1) {
-		str = g_string_new (line);
-		g_free (line);
-		fulllen += str->len;
-		g_ptr_array_add (data, str);
-
-		p = strrchr (str->str, '{');
-		if (!p)
-			break;
-
-		length = strtoul (p + 1, &end, 10);
-		if (*end != '}' || *(end + 1) || end == p + 1)
-			break;
-		ldigits = end - (p + 1);
-
-		/* Read the literal */
-		str = g_string_sized_new (length + 2);
-		str->str[0] = '\n';
-		nread = camel_stream_read (CAMEL_REMOTE_STORE (store)->istream,
-					   str->str + 1, length);
-		if (nread == -1) {
-			if (errno == EINTR)
-				camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-			else
-				camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));
-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-			goto lose;
-		}
-		if (nread < length) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Server response ended too soon."));
-			camel_service_disconnect (CAMEL_SERVICE (store),
-						  FALSE, NULL);
-			goto lose;
-		}
-		str->str[length + 1] = '\0';
-
-		/* Fix up the literal, turning CRLFs into LF. Also, if
-		 * we find any embedded NULs, strip them. This is
-		 * dubious, but:
-		 *   - The IMAP grammar says you can't have NULs here
-		 *     anyway, so this will not affect our behavior
-		 *     against any completely correct server.
-		 *   - WU-imapd 12.264 (at least) will cheerily pass
-		 *     NULs along if they are embedded in the message
-		 *   - The only cause of embedded NULs we've seen is an
-		 *     Evolution base64-encoder bug that sometimes
-		 *     inserts a NUL into the last line when it
-		 *     shouldn't.
-		 */
-
-		s = d = str->str + 1;
-		end = str->str + 1 + length;
-		while (s < end) {
-			while (s < end && *s == '\0') {
-				s++;
-				length--;
-			}
-			if (*s == '\r' && *(s + 1) == '\n') {
-				s++;
-				length--;
-			}
-			*d++ = *s++;
-		}
-		*d = '\0';
-		str->len = length + 1;
-
-		/* p points to the "{" in the line that starts the
-		 * literal. The length of the CR-less response must be
-		 * less than or equal to the length of the response
-		 * with CRs, therefore overwriting the old value with
-		 * the new value cannot cause an overrun. However, we
-		 * don't want it to be shorter either, because then the
-		 * GString's length would be off...
-		 */
-		sprintf (p, "{%0*d}", ldigits, length);
-
-		fulllen += str->len;
-		g_ptr_array_add (data, str);
-
-		/* Read the next line. */
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),
-						  &line, ex) < 0)
-			goto lose;
-	}
-
-	/* Now reassemble the data. */
-	p = line = g_malloc (fulllen + 1);
-	for (i = 0; i < data->len; i++) {
-		str = data->pdata[i];
-		memcpy (p, str->str, str->len);
-		p += str->len;
-		g_string_free (str, TRUE);
-	}
-	*p = '\0';
-	g_ptr_array_free (data, TRUE);
-	return line;
-
- lose:
-	for (i = 0; i < data->len; i++)
-		g_string_free (data->pdata[i], TRUE);
-	g_ptr_array_free (data, TRUE);
-	return NULL;
-}
-
-
-/**
- * camel_imap_response_free:
- * response: a CamelImapResponse:
- *
- * Frees all of the data in @response.
- **/
-void
-camel_imap_response_free (CamelImapResponse *response)
-{
-	int i;
-
-	if (!response)
-		return;
-	for (i = 0; i < response->untagged->len; i++)
-		g_free (response->untagged->pdata[i]);
-	g_ptr_array_free (response->untagged, TRUE);
-	g_free (response->status);
-	g_free (response);
-}
-
-/**
- * camel_imap_response_extract:
- * @response: the response data returned from camel_imap_command
- * @type: the response type to extract
- * @ex: a CamelException
- *
- * This checks that @response contains a single untagged response of
- * type @type and returns just that response data. If @response
- * doesn't contain the right information, the function will set @ex and
- * return %NULL. Either way, @response will be freed.
- *
- * Return value: the desired response string, which the caller must free.
- **/
-char *
-camel_imap_response_extract (CamelImapResponse *response, const char *type,
-			     CamelException *ex)
-{
-	int len = strlen (type), i;
-	char *resp;
-
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i];
-		/* Skip "* ", and initial sequence number, if present */
-		strtoul (resp + 2, &resp, 10);
-		if (*resp == ' ')
-			resp = imap_next_word (resp);
-
-		if (!g_strncasecmp (resp, type, len))
-			break;
-		
-		g_free (response->untagged->pdata[i]);
-	}
-
-	if (i < response->untagged->len) {
-		resp = response->untagged->pdata[i];
-		for (i++; i < response->untagged->len; i++)
-			g_free (response->untagged->pdata[i]);
-	} else {
-		resp = NULL;
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("IMAP server response did not contain "
-					"%s information"), type);
-	}
-
-	g_ptr_array_free (response->untagged, TRUE);
-	g_free (response->status);
-	g_free (response);
-	return resp;
-}
-
-/**
- * camel_imap_response_extract_continuation:
- * @response: the response data returned from camel_imap_command
- * @ex: a CamelException
- *
- * This checks that @response contains a continuation response, and
- * returns just that data. If @response doesn't contain a continuation
- * response, the function will set @ex and return %NULL. Either way,
- * @response will be freed.
- *
- * Return value: the desired response string, which the caller must free.
- **/
-char *
-camel_imap_response_extract_continuation (CamelImapResponse *response,
-					  CamelException *ex)
-{
-	char *status;
-
-	if (response->status && !strncmp (response->status, "+ ", 2)) {
-		status = response->status;
-		response->status = NULL;
-		camel_imap_response_free (response);
-		return status;
-	}
-
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-			      _("Unexpected OK response from IMAP server: %s"),
-			      response->status);
-	camel_imap_response_free (response);
-	return NULL;
-}
-
-
-static char *
-imap_command_strdup_vprintf (CamelImapStore *store, const char *fmt,
-			     va_list ap)
-{
-	GPtrArray *args;
-	const char *p, *start;
-	char *out, *op, *string;
-	int num, len, i;
-
-	args = g_ptr_array_new ();
-
-	/* Determine the length of the data */
-	len = strlen (fmt);
-	p = start = fmt;
-	while (*p) {
-		p = strchr (start, '%');
-		if (!p)
-			break;
-
-		switch (*++p) {
-		case 'd':
-			num = va_arg (ap, int);
-			g_ptr_array_add (args, GINT_TO_POINTER (num));
-			start = p + 1;
-			len += 10;
-			break;
-
-		case 's':
-			string = va_arg (ap, char *);
-			g_ptr_array_add (args, string);
-			start = p + 1;
-			len += strlen (string);
-			break;
-
-		case 'S':
-			string = va_arg (ap, char *);
-			g_ptr_array_add (args, string);
-			if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS)
-				len += strlen (string) + 15;
-			else
-				len += strlen (string) * 2;
-			start = p + 1;
-			break;
-
-		case '%':
-			start = p;
-			break;
-
-		default:
-			g_warning ("camel-imap-command is not printf. I don't "
-				   "know what '%%%c' means.", *p);
-			start = *p ? p + 1 : p;
-			break;
-		}
-	}
-
-	/* Now write out the string */
-	op = out = g_malloc (len + 1);
-	p = start = fmt;
-	i = 0;
-	while (*p) {
-		p = strchr (start, '%');
-		if (!p) {
-			strcpy (op, start);
-			break;
-		} else {
-			strncpy (op, start, p - start);
-			op += p - start;
-		}
-
-		switch (*++p) {
-		case 'd':
-			num = GPOINTER_TO_INT (args->pdata[i++]);
-			op += sprintf (op, "%d", num);
-			break;
-
-		case 's':
-			string = args->pdata[i++];
-			op += sprintf (op, "%s", string);
-			break;
-
-		case 'S':
-			string = args->pdata[i++];
-			if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS) {
-				op += sprintf (op, "{%d+}\r\n%s",
-					       strlen (string), string);
-			} else {
-				char *quoted = imap_quote_string (string);
-				op += sprintf (op, "%s", quoted);
-				g_free (quoted);
-			}
-			break;
-
-		default:
-			*op++ = '%';
-			*op++ = *p;
-		}
-
-		start = *p ? p + 1 : p;
-	}
-
-	return out;
-}
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
deleted file mode 100644
index a7d3c3eae9..0000000000
--- a/camel/providers/imap/camel-imap-command.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-command.h: IMAP command sending/parsing routines */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *   Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_COMMAND_H
-#define CAMEL_IMAP_COMMAND_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-imap-types.h"
-#include <glib.h>
-
-struct _CamelImapResponse {
-	GPtrArray *untagged;
-	char *status;
-};
-
-CamelImapResponse *camel_imap_command              (CamelImapStore *store,
-						    CamelFolder *folder,
-						    CamelException *ex,
-						    const char *fmt, ...);
-CamelImapResponse *camel_imap_command_continuation (CamelImapStore *store,
-						    CamelException *ex,
-						    const char *cmdbuf);
-
-void  camel_imap_response_free                 (CamelImapResponse *response);
-char *camel_imap_response_extract              (CamelImapResponse *response,
-						const char *type,
-						CamelException *ex);
-char *camel_imap_response_extract_continuation (CamelImapResponse *response,
-						CamelException *ex);
-
-#endif /* CAMEL_IMAP_COMMAND_H */
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
deleted file mode 100644
index cf91bceb12..0000000000
--- a/camel/providers/imap/camel-imap-folder.c
+++ /dev/null
@@ -1,1152 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-folder.c: class for an imap folder */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h> 
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include <gal/util/e-util.h>
-
-#include "camel-imap-folder.h"
-#include "camel-imap-command.h"
-#include "camel-imap-search.h"
-#include "camel-imap-store.h"
-#include "camel-imap-summary.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-wrapper.h"
-#include "string-utils.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-buffer.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-exception.h"
-#include "camel-mime-utils.h"
-#include "camel-imap-private.h"
-#include "camel-multipart.h"
-#include "camel-operation.h"
-
-#define d(x) x
-
-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))
-
-static CamelFolderClass *parent_class = NULL;
-
-static void imap_finalize (CamelObject *object);
-static void imap_rescan (CamelFolder *folder, int exists, CamelException *ex);
-static void imap_refresh_info (CamelFolder *folder, CamelException *ex);
-static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static const char *imap_get_full_name (CamelFolder *folder);
-static void imap_expunge (CamelFolder *folder, CamelException *ex);
-
-/* message manipulation */
-static CamelMimeMessage *imap_get_message (CamelFolder *folder, const gchar *uid,
-					   CamelException *ex);
-static void imap_append_message (CamelFolder *folder, CamelMimeMessage *message,
-				 const CamelMessageInfo *info, CamelException *ex);
-static void imap_copy_message_to (CamelFolder *source, const char *uid,
-				  CamelFolder *destination, CamelException *ex);
-static void imap_move_message_to (CamelFolder *source, const char *uid,
-				  CamelFolder *destination, CamelException *ex);
-
-/* summary info */
-static void imap_update_summary (CamelFolder *folder, int first, int last,
-				 CamelFolderChangeInfo *changes,
-				 CamelException *ex);
-
-/* searching */
-static GPtrArray *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex);
-static void       imap_search_free          (CamelFolder *folder, GPtrArray *uids);
-
-static void
-camel_imap_folder_class_init (CamelImapFolderClass *camel_imap_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_imap_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-	
-	/* virtual method definition */
-	
-	/* virtual method overload */
-	camel_folder_class->refresh_info = imap_refresh_info;
-	camel_folder_class->sync = imap_sync;
-	camel_folder_class->expunge = imap_expunge;
-	camel_folder_class->get_full_name = imap_get_full_name;
-	
-	camel_folder_class->get_message = imap_get_message;
-	camel_folder_class->append_message = imap_append_message;
-	camel_folder_class->copy_message_to = imap_copy_message_to;
-	camel_folder_class->move_message_to = imap_move_message_to;
-	
-	camel_folder_class->search_by_expression = imap_search_by_expression;
-	camel_folder_class->search_free = imap_search_free;
-}
-
-static void
-camel_imap_folder_init (gpointer object, gpointer klass)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);
-	CamelFolder *folder = CAMEL_FOLDER (object);
-	
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-	
-	imap_folder->priv = g_malloc0(sizeof(*imap_folder->priv));
-#ifdef ENABLE_THREADS
-	imap_folder->priv->search_lock = g_mutex_new();
-#endif
-}
-
-CamelType
-camel_imap_folder_get_type (void)
-{
-	static CamelType camel_imap_folder_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_folder_type == CAMEL_INVALID_TYPE) {
-		camel_imap_folder_type =
-			camel_type_register (CAMEL_FOLDER_TYPE, "CamelImapFolder",
-					     sizeof (CamelImapFolder),
-					     sizeof (CamelImapFolderClass),
-					     (CamelObjectClassInitFunc) camel_imap_folder_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_imap_folder_init,
-					     (CamelObjectFinalizeFunc) imap_finalize);
-	}
-	
-	return camel_imap_folder_type;
-}
-
-CamelFolder *
-camel_imap_folder_new (CamelStore *parent, const char *folder_name,
-		       const char *short_name, const char *summary_file,
-		       CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (parent);
-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (camel_imap_folder_get_type ()));
-	CamelImapResponse *response;
-	char *resp;
-	guint32 validity = 0;
-	int i, exists = 0;
-
-	camel_folder_construct (folder, parent, folder_name, short_name);
-
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	response = camel_imap_command (imap_store, folder, ex, NULL);
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-
-	if (!response) {
-		camel_object_unref ((CamelObject *)folder);
-		return NULL;
-	}
-
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i] + 2;
-		if (!g_strncasecmp (resp, "FLAGS ", 6)) {
-			resp += 6;
-			folder->permanent_flags = imap_parse_flag_list (&resp);
-		} else if (!g_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {
-			resp += 19;
-			folder->permanent_flags = imap_parse_flag_list (&resp);
-		} else if (!g_strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {
-			validity = strtoul (resp + 16, NULL, 10);
-		} else if (isdigit ((unsigned char)*resp)) {
-			unsigned long num = strtoul (resp, &resp, 10);
-
-			if (!g_strncasecmp (resp, " EXISTS", 7))
-				exists = num;
-		}
-	}
-	camel_imap_response_free (response);
-
-	folder->summary = camel_imap_summary_new (summary_file, validity);
-	if (!folder->summary) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load summary for %s"),
-				      folder_name);
-		return NULL;
-	}
-
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	imap_rescan (folder, exists, ex);
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-/* Called with the store's command_lock locked */
-void
-camel_imap_folder_selected (CamelFolder *folder, CamelImapResponse *response,
-			    CamelException *ex)
-{
-	unsigned long exists = 0, val, uid;
-	CamelMessageInfo *info;
-	int i, count;
-	char *resp;
-
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i] + 2;
-
-		exists = strtoul (resp, &resp, 10);
-		if (!g_strncasecmp (resp, " EXISTS", 7))
-			break;
-	}
-	if (i == response->untagged->len) {
-		g_warning ("Server response did not include EXISTS info");
-		return;
-	}
-
-	count = camel_folder_summary_count (folder->summary);
-
-	/* If we've lost messages, we have to rescan everything */
-	if (exists < count) {
-		imap_rescan (folder, exists, ex);
-		return;
-	}
-
-	if (count != 0) {
-		/* Similarly, if the UID of the highest message we
-		 * know about has changed, then that indicates that
-		 * messages have been both added and removed, so we
-		 * have to rescan to find the removed ones. (We pass
-		 * NULL for the folder since we know that this folder
-		 * is selected, and we don't want camel_imap_command
-		 * to worry about it.)
-		 */
-		response = camel_imap_command (CAMEL_IMAP_STORE (folder->parent_store),
-					       NULL, ex, "FETCH %d UID", count);
-		if (!response)
-			return;
-		uid = 0;
-		for (i = 0; i < response->untagged->len; i++) {
-			resp = response->untagged->pdata[i];
-			val = strtoul (resp + 2, &resp, 10);
-			if (val != count || g_strncasecmp (resp, " FETCH (", 8) != 0)
-				continue;
-			resp = e_strstrcase (resp, "UID ");
-			if (!resp)
-				continue;
-			uid = strtoul (resp + 4, NULL, 10);
-			break;
-		}
-		camel_imap_response_free (response);
-
-		info = camel_folder_summary_index (folder->summary, count - 1);
-		val = strtoul (camel_message_info_uid (info), NULL, 10);
-		camel_folder_summary_info_free (folder->summary, info);
-		if (uid == 0 || uid != val) {
-			imap_rescan (folder, exists, ex);
-			return;
-		}
-	}
-
-	/* OK. So now we know that no messages have been expunged. Whew.
-	 * Now see if messages have been added.
-	 */
-	if (exists > count)
-		camel_imap_folder_changed (folder, exists, NULL, ex);
-
-	/* And we're done. */
-}	
-
-static void           
-imap_finalize (CamelObject *object)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);
-
-	if (imap_folder->search)
-		camel_object_unref ((CamelObject *)imap_folder->search);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(imap_folder->priv->search_lock);
-#endif
-	g_free(imap_folder->priv);
-}
-
-static void
-imap_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	CAMEL_IMAP_STORE_LOCK (folder->parent_store, command_lock);
-	imap_rescan (folder, camel_folder_summary_count (folder->summary), ex);
-	CAMEL_IMAP_STORE_UNLOCK (folder->parent_store, command_lock);
-}
-
-/* Called with the store's command_lock locked */
-static void
-imap_rescan (CamelFolder *folder, int exists, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	struct {
-		char *uid;
-		guint32 flags;
-	} *new = NULL;
-	char *resp, *p, *flags;
-	const char *uid;
-	int i, j, seq, summary_len;
-	CamelMessageInfo *info;
-	CamelImapMessageInfo *iinfo;
-	GArray *removed;
-
-	camel_operation_start(NULL, _("Scanning IMAP folder"));
-
-	/* Get UIDs and flags of all messages. */
-	if (exists > 0) {
-		response = camel_imap_command (store, folder, ex,
-					       "FETCH 1:%d (UID FLAGS)",
-					       exists);
-		if (!response)
-			return;
-
-		new = g_malloc0 (exists * sizeof (*new));
-		for (i = 0; i < response->untagged->len; i++) {
-			resp = response->untagged->pdata[i];
-
-			seq = strtoul (resp + 2, &resp, 10);
-			if (g_strncasecmp (resp, " FETCH ", 7) != 0)
-				continue;
-
-			uid = e_strstrcase (resp, "UID ");
-			if (uid) {
-				uid += 4;
-				strtoul (uid, &p, 10);
-				new[seq - 1].uid = g_strndup (uid, p - uid);
-			}
-
-			flags = e_strstrcase (resp, "FLAGS ");
-			if (flags) {
-				flags += 6;
-				new[seq - 1].flags = imap_parse_flag_list (&flags);
-			}
-		}
-		camel_imap_response_free (response);
-	}
-
-	/* If we find a UID in the summary that doesn't correspond to
-	 * the UID in the folder, that it means the message was
-	 * deleted on the server, so we remove it from the summary.
-	 */
-	removed = g_array_new (FALSE, FALSE, sizeof (int));
-	summary_len = camel_folder_summary_count (folder->summary);
-	for (i = 0; i < summary_len && i < exists; i++) {
-		int pc = (i*100)/MIN(summary_len, exists);
-
-		camel_operation_progress(NULL, pc);
-
-		/* Shouldn't happen, but... */
-		if (!new[i].uid)
-			continue;
-
-		info = camel_folder_summary_index (folder->summary, i);
-		iinfo = (CamelImapMessageInfo *)info;
-
-		if (strcmp (camel_message_info_uid (info), new[i].uid) != 0) {
-			seq = i + 1;
-			g_array_append_val (removed, seq);
-			i--;
-			summary_len--;
-			continue;
-		}
-
-		/* Update summary flags */
-		if (new[i].flags != iinfo->server_flags) {
-			guint32 server_set, server_cleared;
-
-			server_set = new[i].flags & ~iinfo->server_flags;
-			server_cleared = iinfo->server_flags & ~new[i].flags;
-
-			info->flags = (info->flags | server_set) & ~server_cleared;
-			iinfo->server_flags = new[i].flags;
-
-			camel_object_trigger_event (CAMEL_OBJECT (folder),
-						    "message_changed",
-						    g_strdup (new[i].uid));
-		}
-
-		camel_folder_summary_info_free(folder->summary, info);
-
-		g_free (new[i].uid);
-	}
-
-	/* Remove any leftover cached summary messages. */
-	for (j = i + 1; j < summary_len; j++) {
-		seq = j - removed->len;
-		g_array_append_val (removed, seq);
-	}
-
-	/* Free remaining memory. */
-	while (i < exists)
-		g_free (new[i++].uid);
-	g_free (new);
-
-	/* And finally update the summary. */
-	camel_imap_folder_changed (folder, exists, removed, ex);
-	g_array_free (removed, TRUE);
-
-	camel_operation_end(NULL);
-}
-
-/* Find all messages in @folder with flags matching @flags and @mask.
- * If no messages match, returns %NULL. Otherwise, returns an array of
- * CamelMessageInfo and sets *@set to a message set corresponding the
- * UIDs of the matched messages. The caller must free the infos, the
- * array, and the set string.
- */
-static GPtrArray *
-get_matching (CamelFolder *folder, guint32 flags, guint32 mask, char **set)
-{
-	GPtrArray *matches;
-	CamelMessageInfo *info;
-	int i, max, range;
-	GString *gset;
-
-	matches = g_ptr_array_new ();
-	gset = g_string_new ("");
-	max = camel_folder_summary_count (folder->summary);
-	range = -1;
-	for (i = 0; i < max; i++) {
-		info = camel_folder_summary_index (folder->summary, i);
-		if (!info)
-			continue;
-		if ((info->flags & mask) != flags) {
-			camel_folder_summary_info_free (folder->summary, info);
-			if (range != -1) {
-				if (range != i - 1) {
-					info = matches->pdata[matches->len - 1];
-					g_string_sprintfa (gset, ":%s", camel_message_info_uid (info));
-				}
-				range = -1;
-			}
-			continue;
-		}
-
-		g_ptr_array_add (matches, info);
-		if (range != -1)
-			continue;
-		range = i;
-		if (gset->len)
-			g_string_append_c (gset, ',');
-		g_string_sprintfa (gset, "%s", camel_message_info_uid (info));
-	}
-	if (range != -1 && range != max - 1) {
-		info = matches->pdata[matches->len - 1];
-		g_string_sprintfa (gset, ":%s", camel_message_info_uid (info));
-	}
-
-	if (matches->len) {
-		*set = gset->str;
-		g_string_free (gset, FALSE);
-		return matches;
-	} else {
-		g_string_free (gset, TRUE);
-		g_ptr_array_free (matches, TRUE);
-		return NULL;
-	}
-}
-
-static void
-imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	CamelMessageInfo *info;
-	GPtrArray *matches;
-	char *set, *flaglist;
-	int i, j, max;
-
-	max = camel_folder_summary_count (folder->summary);
-
-	/* If we're expunging then we don't need to be precise about the
-	 * flags of deleted messages. Just add \Deleted to anything that
-	 * should have it.
-	 */
-	if (expunge && (matches = get_matching (folder, CAMEL_MESSAGE_DELETED,
-						CAMEL_MESSAGE_DELETED, &set))) {
-		for (i = 0; i < matches->len; i++) {
-			info = matches->pdata[i];
-			info->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
-			camel_folder_summary_info_free (folder->summary, info);
-		}
-		g_ptr_array_free (matches, TRUE);
-		camel_folder_summary_touch (folder->summary);
-
-		CAMEL_IMAP_STORE_LOCK (store, command_lock);
-		response = camel_imap_command (store, folder, ex,
-					       "UID STORE %s +FLAGS.SILENT \\Deleted",
-					       set);
-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-		g_free (set);
-		if (response)
-			camel_imap_response_free (response);
-		if (camel_exception_is_set (ex))
-			return;
-	}
-
-	/* OK, now, find a message with changed flags, find all of the
-	 * other messages like it, sync them as a group, mark them as
-	 * updated, and continue.
-	 */
-	for (i = 0; i < max; i++) {
-		info = camel_folder_summary_index (folder->summary, i);
-		if (!info)
-			continue;
-		if (!(info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED)) {
-			camel_folder_summary_info_free (folder->summary, info);
-			continue;
-		}
-
-		flaglist = imap_create_flag_list (info->flags);
-		matches = get_matching (folder, info->flags & (CAMEL_IMAP_SERVER_FLAGS | CAMEL_MESSAGE_FOLDER_FLAGGED),
-					CAMEL_IMAP_SERVER_FLAGS | CAMEL_MESSAGE_FOLDER_FLAGGED, &set);
-		camel_folder_summary_info_free (folder->summary, info);
-
-		CAMEL_IMAP_STORE_LOCK (store, command_lock);
-		response = camel_imap_command (store, folder, ex,
-					       "UID STORE %s FLAGS.SILENT %s",
-					       set, flaglist);
-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-		g_free (set);
-		g_free (flaglist);
-		if (response)
-			camel_imap_response_free (response);
-		if (!camel_exception_is_set (ex)) {
-			for (j = 0; j < matches->len; j++) {
-				info = matches->pdata[j];
-				info->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
-				((CamelImapMessageInfo*)info)->server_flags =
-					info->flags & CAMEL_IMAP_SERVER_FLAGS;
-			}
-			camel_folder_summary_touch (folder->summary);
-		}
-		for (j = 0; j < matches->len; j++) {
-			info = matches->pdata[j];
-			camel_folder_summary_info_free (folder->summary, info);
-		}
-		g_ptr_array_free (matches, TRUE);
-
-		if (camel_exception_is_set (ex))
-			return;
-	}
-
-	if (expunge) {
-		CAMEL_IMAP_STORE_LOCK(store, command_lock);
-		response = camel_imap_command (store, folder, ex, "EXPUNGE");
-		CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-		camel_imap_response_free (response);
-	}
-
-	camel_folder_summary_save (folder->summary);
-
-	camel_operation_end(NULL);
-}
-
-static void
-imap_expunge (CamelFolder *folder, CamelException *ex)
-{
-	imap_sync (folder, TRUE, ex);
-}
-
-static const char *
-imap_get_full_name (CamelFolder *folder)
-{
-	CamelURL *url = ((CamelService *)folder->parent_store)->url;
-	int len;
-
-	if (!url->path || !*url->path || !strcmp (url->path, "/"))
-		return folder->full_name;
-	len = strlen (url->path + 1);
-	if (!strncmp (url->path + 1, folder->full_name, len) &&
-	    strlen (folder->full_name) > len + 1)
-		return folder->full_name + len + 1;
-	return folder->full_name;
-}	
-
-static void
-imap_append_message (CamelFolder *folder, CamelMimeMessage *message,
-		     const CamelMessageInfo *info, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	CamelStream *memstream;
-	CamelMimeFilter *crlf_filter;
-	CamelStreamFilter *streamfilter;
-	GByteArray *ba;
-	char *flagstr, *result;
-	
-	/* create flag string param */
-	if (info && info->flags)
-		flagstr = imap_create_flag_list (info->flags);
-	else
-		flagstr = NULL;
-
-	/* FIXME: We could avoid this if we knew how big the message was. */
-	memstream = camel_stream_mem_new ();
-	ba = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);
-
-	streamfilter = camel_stream_filter_new_with_stream (memstream);
-	crlf_filter = camel_mime_filter_crlf_new (
-		CAMEL_MIME_FILTER_CRLF_ENCODE,
-		CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	camel_stream_filter_add (streamfilter, crlf_filter);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
-					    CAMEL_STREAM (streamfilter));
-	camel_object_unref (CAMEL_OBJECT (streamfilter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (memstream));
-
-	CAMEL_IMAP_STORE_LOCK(store, command_lock);
-	response = camel_imap_command (store, NULL, ex, "APPEND %S%s%s {%d}",
-				       folder->full_name, flagstr ? " " : "",
-				       flagstr ? flagstr : "", ba->len);
-	g_free (flagstr);
-	
-	if (!response) {
-		g_byte_array_free (ba, TRUE);
-		CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-		return;
-	}
-	result = camel_imap_response_extract_continuation (response, ex);
-	if (!result) {
-		g_byte_array_free (ba, TRUE);
-		CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-		return;
-	}
-	g_free (result);
-
-	/* send the rest of our data - the mime message */
-	g_byte_array_append (ba, "\0", 3);
-	response = camel_imap_command_continuation (store, ex, ba->data);
-	g_byte_array_free (ba, TRUE);
-	CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-	if (!response)
-		return;
-	camel_imap_response_free (response);
-}
-
-static void
-imap_copy_message_to (CamelFolder *source, const char *uid,
-		      CamelFolder *destination, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (source->parent_store);
-	CamelImapResponse *response;
-	CamelMessageInfo *mi;
-
-	mi = camel_folder_summary_uid (source->summary, uid);
-	g_return_if_fail (mi != NULL);
-
-	/* Sync message flags if needed. */
-	if (mi->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) {
-		char *flaglist;
-
-		flaglist = imap_create_flag_list (mi->flags);
-		CAMEL_IMAP_STORE_LOCK (store, command_lock);
-		response = camel_imap_command (store, source, ex,
-					       "UID STORE %s FLAGS.SILENT %s",
-					       camel_message_info_uid (mi),
-					       flaglist);
-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-		g_free (flaglist);
-		if (camel_exception_is_set (ex)) {
-			camel_folder_summary_info_free (source->summary, mi);
-			return;
-		}
-		camel_imap_response_free (response);
-
-		mi->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
-		((CamelImapMessageInfo *)mi)->server_flags =
-			mi->flags & CAMEL_IMAP_SERVER_FLAGS;
-	}
-	camel_folder_summary_info_free (source->summary, mi);
-
-	if (camel_exception_is_set (ex))
-		return;
-
-	/* Now copy it */
-	CAMEL_IMAP_STORE_LOCK(store, command_lock);
-	response = camel_imap_command (store, source, ex, "UID COPY %s %S",
-				       uid, destination->full_name);
-	CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-
-	if (camel_exception_is_set (ex))
-		return;
-
-	camel_imap_response_free (response);
-
-	/* Force the destination folder to notice its new messages. */
-	response = camel_imap_command (store, destination, NULL, "NOOP");
-	camel_imap_response_free (response);
- }
-
-static void
-imap_move_message_to (CamelFolder *source, const char *uid,
-		      CamelFolder *destination, CamelException *ex)
-{
-	imap_copy_message_to (source, uid, destination, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	camel_folder_delete_message (source, uid);
-}
-
-static GPtrArray *
-imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	GPtrArray *matches, *summary;
-
-	/* we could get around this by creating a new search object each time,
-	   but i doubt its worth it since any long operation would lock the
-	   command channel too */
-	CAMEL_IMAP_FOLDER_LOCK(folder, search_lock);
-
-	if (!imap_folder->search)
-		imap_folder->search = camel_imap_search_new ();
-
-	camel_folder_search_set_folder (imap_folder->search, folder);
-	summary = camel_folder_get_summary(folder);
-	camel_folder_search_set_summary(imap_folder->search, summary);
-	matches = camel_folder_search_execute_expression (imap_folder->search, expression, ex);
-
-	CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock);
-
-	camel_folder_free_summary(folder, summary);
-
-	return matches;
-}
-
-static void
-imap_search_free (CamelFolder *folder, GPtrArray *uids)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-
-	g_return_if_fail (imap_folder->search);
-
-	CAMEL_IMAP_FOLDER_LOCK(folder, search_lock);
-
-	camel_folder_search_free_result (imap_folder->search, uids);
-
-	CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock);
-}
-
-/* parse a header response (starting after the first ' ' after
- * *@headers_p) and construct a content-free CamelMedium from it.
- */
-static CamelMedium *
-parse_headers (char **headers_p, CamelType medium_type)
-{
-	CamelMedium *medium; 
-	CamelStream *stream;
-	char *headers;
-	int len;
-
-	*headers_p = strchr (*headers_p, ' ');
-	if (!*headers_p)
-		return FALSE;
-	(*headers_p)++;
-
-	headers = imap_parse_nstring (headers_p, &len);
-	if (!headers)
-		return FALSE;
-	stream = camel_stream_mem_new_with_buffer (headers, len);
-	g_free (headers);
-
-	medium = CAMEL_MEDIUM (camel_object_new (medium_type));
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (medium), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-
-	return medium;
-}
-
-static CamelMedium *
-fetch_medium (CamelFolder *folder, const char *uid, const char *section_text,
-	      CamelType type, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	CamelMedium *medium;
-	char *result, *p;
-
-	CAMEL_IMAP_STORE_LOCK (store, command_lock);
-	if (store->server_level < IMAP_LEVEL_IMAP4REV1 && !*section_text) {
-		response = camel_imap_command (store, folder, ex,
-					       "UID FETCH %s RFC822.PEEK",
-					       uid);
-	} else {
-		response = camel_imap_command (store, folder, ex,
-					       "UID FETCH %s BODY.PEEK[%s]",
-					       uid, section_text);
-	}
-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-	if (!response)
-		return NULL;
-
-	/* FIXME: there could be multiple lines of FETCH response. */
-	result = camel_imap_response_extract (response, "FETCH", ex);
-	if (!result)
-		return NULL;
-
-	
-	if (store->server_level < IMAP_LEVEL_IMAP4REV1 && !*section_text)
-		p = e_strstrcase (result, "RFC822");
-	else
-		p = e_strstrcase (result, "BODY");
-
-	if (p)
-		medium = parse_headers (&p, type);
-	else {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not find message body in FETCH "
-					"response."));
-		medium = NULL;
-	}
-	g_free (result);
-
-	return medium;
-}
-
-static CamelMimeMessage *get_message (CamelFolder *folder, const char *uid,
-				      const char *part_specifier,
-				      CamelMessageContentInfo *ci,
-				      CamelException *ex);
-
-/* Fetch the contents of the MIME part indicated by @ci, which is part
- * of message @uid in @folder.
- */
-static CamelDataWrapper *
-get_content (CamelFolder *folder, const char *uid, const char *part_spec,
-	     CamelMimePart *part, CamelMessageContentInfo *ci,
-	     CamelException *ex)
-{
-	char *child_spec;
-
-	/* There are three cases: multipart, message/rfc822, and "other" */
-
-	if (header_content_type_is (ci->type, "multipart", "*")) {
-		CamelMultipart *body_mp;
-		CamelDataWrapper *content;
-		int speclen, num;
-
-		body_mp = camel_multipart_new ();
-		camel_data_wrapper_set_mime_type_field (
-			CAMEL_DATA_WRAPPER (body_mp), ci->type);
-		camel_multipart_set_boundary (body_mp, NULL);
-
-		speclen = strlen (part_spec);
-		child_spec = g_malloc (speclen + 15);
-		memcpy (child_spec, part_spec, speclen);
-		if (speclen > 0)
-			child_spec[speclen++] = '.';
-
-		ci = ci->childs;
-		num = 1;
-		while (ci) {
-			sprintf (child_spec + speclen, "%d.MIME", num++);
-			part = (CamelMimePart *)fetch_medium (folder, uid, child_spec, CAMEL_MIME_PART_TYPE, ex);
-			*(strchr (child_spec + speclen, '.')) = '\0';
-			if (part)
-				content = get_content (folder, uid, child_spec, part, ci, ex);
-			if (!part || !content) {
-				g_free (child_spec);
-				camel_object_unref (CAMEL_OBJECT (part));
-				camel_object_unref (CAMEL_OBJECT (body_mp));
-				return NULL;
-			}
-			camel_medium_set_content_object (CAMEL_MEDIUM (part),
-							 content);
-			camel_object_unref (CAMEL_OBJECT (content));
-			camel_multipart_add_part (body_mp, part);
-			camel_object_unref (CAMEL_OBJECT (part));
-
-			ci = ci->next;
-		}
-		g_free (child_spec);
-
-		return (CamelDataWrapper *)body_mp;
-	} else if (header_content_type_is (ci->type, "message", "rfc822")) {
-		return (CamelDataWrapper *)
-			get_message (folder, uid, part_spec, ci->childs, ex);
-	} else {
-		CamelDataWrapper *content;
-
-		if (!ci->parent || header_content_type_is (ci->parent->type, "message", "rfc822"))
-			child_spec = g_strdup_printf ("%s%s1", part_spec, *part_spec ? "." : "");
-		else
-			child_spec = g_strdup (part_spec);
-		content = camel_imap_wrapper_new (folder, ci->type, uid, child_spec, part);
-		g_free (child_spec);
-		return content;
-	}
-}
-
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const char *uid, const char *part_spec,
-	     CamelMessageContentInfo *ci, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelDataWrapper *content;
-	CamelMimeMessage *msg;
-	char *section_text;
-
-	section_text = g_strdup_printf ("%s%s%s", part_spec, *part_spec ? "." : "",
-					store->server_level >= IMAP_LEVEL_IMAP4REV1 ? "HEADER" : "0");
-	msg = (CamelMimeMessage *)fetch_medium (folder, uid, section_text, CAMEL_MIME_MESSAGE_TYPE, ex);
-	g_free (section_text);
-	if (!msg)
-		return NULL;
-
-	content = get_content (folder, uid, part_spec, CAMEL_MIME_PART (msg), ci, ex);
-	if (!content) {
-		camel_object_unref (CAMEL_OBJECT (msg));
-		return NULL;
-	}
-
-	camel_medium_set_content_object (CAMEL_MEDIUM (msg), content);
-	camel_object_unref (CAMEL_OBJECT (content));
-
-	return msg;
-}
-
-/* FIXME: I pulled this number out of my butt. */
-#define IMAP_SMALL_BODY_SIZE 5120
-
-static CamelMimeMessage *
-imap_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	CamelMessageInfo *mi;
-	CamelMimeMessage *msg;
-
-	mi = camel_folder_summary_uid (folder->summary, uid);
-	g_return_val_if_fail (mi != NULL, NULL);
-
-	/* Fetch small messages directly. */
-	if (mi->size < IMAP_SMALL_BODY_SIZE) {
-		camel_folder_summary_info_free (folder->summary, mi);
-		return (CamelMimeMessage *)fetch_medium (folder, uid, "", CAMEL_MIME_MESSAGE_TYPE, ex);
-	}
-
-	/* For larger messages, fetch the structure and build a message
-	 * with offline parts. (We check mi->content->type rather than
-	 * mi->content because camel_folder_summary_info_new always creates
-	 * an empty content struct.)
-	 */
-	if (!mi->content->type) {
-		CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-		CamelImapResponse *response;
-		char *result, *p;
-
-		CAMEL_IMAP_STORE_LOCK (store, command_lock);
-		response = camel_imap_command (store, folder, ex,
-					       "UID FETCH %s BODY", uid);
-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-		if (!response) {
-			camel_folder_summary_info_free (folder->summary, mi);
-			return NULL;
-		}
-		/* FIXME, wrong */
-		result = camel_imap_response_extract (response, "FETCH", ex);
-		if (!result) {
-			camel_folder_summary_info_free (folder->summary, mi);
-			return NULL;
-		}
-
-		p = e_strstrcase (result, "BODY ");
-		if (p) {
-			p += 5;
-			imap_parse_body (&p, folder, mi->content);
-		}
-		g_free (result);
-		if (!mi->content->type) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not find message body in FETCH response."));
-			camel_folder_summary_info_free (folder->summary, mi);
-			return NULL;
-		}
-	}
-
-	msg = get_message (folder, uid, "", mi->content, ex);
-	camel_folder_summary_info_free (folder->summary, mi);
-
-	return msg;
-}
-
-static const char *
-imap_protocol_get_summary_specifier (CamelImapStore *store)
-{
-	if (store->server_level >= IMAP_LEVEL_IMAP4REV1)
-		return "UID FLAGS RFC822.SIZE BODY.PEEK[HEADER]";
-	else
-		return "UID FLAGS RFC822.SIZE RFC822.HEADER";
-}
-
-static void
-imap_update_summary (CamelFolder *folder, int first, int last,
-		     CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	GPtrArray *headers, *messages;
-	const char *summary_specifier;
-	char *p, *uid;
-	int i, seq, count;
-	CamelMimeMessage *msg;
-	CamelMessageInfo *mi;
-	guint32 flags, size;
-
-	summary_specifier = imap_protocol_get_summary_specifier (store);
-	/* We already have the command lock */
-	if (first == last) {
-		response = camel_imap_command (store, folder, ex,
-					       "FETCH %d (%s)", first,
-					       summary_specifier);
-	} else {
-		response = camel_imap_command (store, folder, ex,
-					       "FETCH %d:%d (%s)", first,
-					       last, summary_specifier);
-	}
-
-	if (!response)
-		return;
-
-	count = camel_folder_summary_count (folder->summary);
-	messages = g_ptr_array_new ();
-	g_ptr_array_set_size (messages, last - first + 1);
-	headers = response->untagged;
-	for (i = 0; i < headers->len; i++) {
-		p = headers->pdata[i];
-		if (*p++ != '*' || *p++ != ' ')
-			continue;
-		seq = strtoul (p, &p, 10);
-		if (!seq || seq < count)
-			continue;
-		if (g_strncasecmp (p, " FETCH (", 8) != 0)
-			continue;
-		p += 8;
-
-		mi = messages->pdata[seq - first];
-		flags = size = 0;
-		uid = NULL;
-		while (p && *p != ')') {
-			if (*p == ' ')
-				p++;
-			if (!g_strncasecmp (p, "FLAGS ", 6)) {
-				p += 6;
-				/* FIXME user flags */
-				flags = imap_parse_flag_list (&p);
-			} else if (!g_strncasecmp (p, "RFC822.SIZE ", 12)) {
-				size = strtoul (p + 12, &p, 10);
-			} else if (!g_strncasecmp (p, "UID ", 4)) {
-				uid = p + 4;
-				strtoul (uid, &p, 10);
-				uid = g_strndup (uid, p - uid);
-			} else if (!g_strncasecmp (p, "BODY[HEADER", 11) ||
-				   !g_strncasecmp (p, "RFC822.HEADER", 13)) {
-				msg = (CamelMimeMessage *) parse_headers (&p, CAMEL_MIME_MESSAGE_TYPE);
-				mi = camel_folder_summary_info_new_from_message (folder->summary, msg);
-				camel_object_unref (CAMEL_OBJECT (msg));
-			} else {
-				g_warning ("Waiter, I did not order this %.*s",
-					   (int)strcspn (p, " \n"), p);
-				p = NULL;
-			}
-		}
-
-		/* Ideally we got everything on one line, but if we
-		 * we didn't, and we didn't get the body yet, then we
-		 * have to postpone this line for later.
-		 */
-		if (mi == NULL) {
-			p = headers->pdata[i];
-			g_ptr_array_remove_index (headers, i);
-			g_ptr_array_add (headers, p);
-			continue;
-		}
-
-		messages->pdata[seq - first] = mi;
-		if (uid)
-			camel_message_info_set_uid (mi, uid);
-		if (flags)
-			mi->flags = flags;
-		if (size)
-			mi->size = size;
-	}
-	camel_imap_response_free (response);
-
-	for (i = 0; i < messages->len; i++) {
-		mi = messages->pdata[i];
-		camel_folder_summary_add (folder->summary, mi);
-		camel_folder_change_info_add_uid (changes, camel_message_info_uid (mi));
-	}
-	g_ptr_array_free (messages, TRUE);
-}
-
-/* Called with the store's command_lock locked */
-void
-camel_imap_folder_changed (CamelFolder *folder, int exists,
-			   GArray *expunged, CamelException *ex)
-{
-	CamelFolderChangeInfo *changes;
-	CamelMessageInfo *info;
-	int len;
-
-	changes = camel_folder_change_info_new ();
-	if (expunged) {
-		int i, id;
-
-		for (i = 0; i < expunged->len; i++) {
-			id = g_array_index (expunged, int, i);
-			info = camel_folder_summary_index (folder->summary, id - 1);
-			camel_folder_change_info_remove_uid (changes, camel_message_info_uid (info));
-			camel_folder_summary_remove (folder->summary, info);
-			camel_folder_summary_info_free(folder->summary, info);
-		}
-	}
-
-	len = camel_folder_summary_count (folder->summary);
-	if (exists > len)
-		imap_update_summary (folder, len + 1, exists, changes, ex);
-
-	if (camel_folder_change_info_changed (changes)) {
-		camel_object_trigger_event (CAMEL_OBJECT (folder),
-					    "folder_changed", changes);
-	}
-	camel_folder_change_info_free (changes);
-}
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
deleted file mode 100644
index a943189f5a..0000000000
--- a/camel/providers/imap/camel-imap-folder.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-folder.h : Abstract class for an imap folder */
-
-/* 
- * Author: 
- *   Jeffrey Stedfast <fejj@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_FOLDER_H
-#define CAMEL_IMAP_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-imap-types.h"
-#include "camel-folder.h"
-#include <camel/camel-folder-search.h>
-
-#define CAMEL_IMAP_FOLDER_TYPE     (camel_imap_folder_get_type ())
-#define CAMEL_IMAP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))
-#define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))
-#define CAMEL_IS_IMAP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE))
-
-struct _CamelImapFolder {
-	CamelFolder parent_object;
-
-	struct _CamelImapFolderPrivate *priv;
-
-	CamelFolderSearch *search;
-};
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelImapFolderClass;
-
-
-/* public methods */
-CamelFolder *camel_imap_folder_new (CamelStore *parent,
-				    const char *folder_name,
-				    const char *short_name,
-				    const char *summary_file,
-				    CamelException *ex);
-
-void camel_imap_folder_selected (CamelFolder *folder,
-				 CamelImapResponse *response,
-				 CamelException *ex);
-
-void camel_imap_folder_changed (CamelFolder *folder, int exists,
-				GArray *expunged, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_imap_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_FOLDER_H */
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
deleted file mode 100644
index c7af3ee5e6..0000000000
--- a/camel/providers/imap/camel-imap-private.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *  camel-imap-private.h: Private info for imap.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_IMAP_PRIVATE_H
-#define CAMEL_IMAP_PRIVATE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
-
-#include "config.h"
-
-#ifdef ENABLE_THREADS
-#include "e-util/e-msgport.h"
-#endif
-
-struct _CamelImapStorePrivate {
-#ifdef ENABLE_THREADS
-	EMutex *command_lock;	/* for locking the command stream for a complete operation */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_IMAP_STORE_LOCK(f, l) (e_mutex_lock(((CamelImapStore *)f)->priv->l))
-#define CAMEL_IMAP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelImapStore *)f)->priv->l))
-#else
-#define CAMEL_IMAP_STORE_LOCK(f, l)
-#define CAMEL_IMAP_STORE_UNLOCK(f, l)
-#endif
-
-struct _CamelImapFolderPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *search_lock;	/* for locking the search object */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_IMAP_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelImapFolder *)f)->priv->l))
-#define CAMEL_IMAP_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelImapFolder *)f)->priv->l))
-#else
-#define CAMEL_IMAP_FOLDER_LOCK(f, l)
-#define CAMEL_IMAP_FOLDER_UNLOCK(f, l)
-#endif
-
-struct _CamelImapWrapperPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_IMAP_WRAPPER_LOCK(f, l) (g_mutex_lock(((CamelImapWrapper *)f)->priv->l))
-#define CAMEL_IMAP_WRAPPER_UNLOCK(f, l) (g_mutex_unlock(((CamelImapWrapper *)f)->priv->l))
-#else
-#define CAMEL_IMAP_WRAPPER_LOCK(f, l)
-#define CAMEL_IMAP_WRAPPER_UNLOCK(f, l)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_PRIVATE_H */
-
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
deleted file mode 100644
index 9b962df5f4..0000000000
--- a/camel/providers/imap/camel-imap-provider.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-provider.c: imap provider registration code */
-
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include "config.h"
-#include "camel-imap-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static void add_hash (guint *hash, char *s);
-static guint imap_url_hash (gconstpointer key);
-static gint check_equal (char *s1, char *s2);
-static gint imap_url_equal (gconstpointer a, gconstpointer b);
-
-static CamelProvider imap_provider = {
-	"imap",
-	N_("IMAPv4"),
-
-	N_("For reading and storing mail on IMAP servers."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
-	CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST |
-	CAMEL_URL_ALLOW_PATH | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	imap_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_imap_store_get_type();
-
-	imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
-
-	camel_session_register_provider (session, &imap_provider);
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-static guint
-imap_url_hash (gconstpointer key)
-{
-	const CamelURL *u = (CamelURL *)key;
-	guint hash = 0;
-
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
-	add_hash (&hash, u->host);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static gint
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-static gint
-imap_url_equal (gconstpointer a, gconstpointer b)
-{
-	const CamelURL *u1 = a, *u2 = b;
-	
-	return check_equal (u1->user, u2->user)
-		&& check_equal (u1->authmech, u2->authmech)
-		&& check_equal (u1->host, u2->host)
-		&& u1->port == u2->port;
-}
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
deleted file mode 100644
index 06cf4a8d30..0000000000
--- a/camel/providers/imap/camel-imap-search.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-search.c: IMAP folder search */
-
-/*
- *  Authors:
- *    Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <string.h>
-
-#include "camel-imap-command.h"
-#include "camel-imap-folder.h"
-#include "camel-imap-store.h"
-#include "camel-imap-search.h"
-#include "camel-imap-private.h"
-
-static ESExpResult *
-imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv,
-		    CamelFolderSearch *s);
-
-static void
-camel_imap_search_class_init (CamelImapSearchClass *camel_imap_search_class)
-{
-	/* virtual method overload */
-	CamelFolderSearchClass *camel_folder_search_class =
-		CAMEL_FOLDER_SEARCH_CLASS (camel_imap_search_class);
-	
-	/* virtual method overload */
-	camel_folder_search_class->body_contains = imap_body_contains;
-}
-
-CamelType
-camel_imap_search_get_type (void)
-{
-	static CamelType camel_imap_search_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_search_type == CAMEL_INVALID_TYPE) {
-		camel_imap_search_type = camel_type_register (
-			CAMEL_FOLDER_SEARCH_TYPE, "CamelImapSearch",
-			sizeof (CamelImapSearch),
-			sizeof (CamelImapSearchClass),
-			(CamelObjectClassInitFunc) camel_imap_search_class_init,
-			NULL, NULL, NULL);
-	}
-
-	return camel_imap_search_type;
-}
-
-static ESExpResult *
-imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv,
-		    CamelFolderSearch *s)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (s->folder->parent_store);
-	char *value = argv[0]->value.string;
-	CamelImapResponse *response;
-	char *result, *p, *lasts = NULL, *real_uid;
-	const char *uid = "";
-	ESExpResult *r;
-	CamelMessageInfo *info;
-	GHashTable *uid_hash = NULL;
-
-	CAMEL_IMAP_STORE_LOCK(store, command_lock);
-
-	if (s->current) {
-		uid = camel_message_info_uid (s->current);
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
-		response = camel_imap_command (store, s->folder, NULL,
-					       "UID SEARCH UID %s BODY \"%s\"",
-					       uid, value);
-	} else {
-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-		response = camel_imap_command (store, s->folder, NULL,
-					       "UID SEARCH BODY \"%s\"",
-					       value);
-	}
-
-	CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-
-	if (!response)
-		return r;
-	result = camel_imap_response_extract (response, "SEARCH", NULL);
-	if (!result)
-		return r;
-
-	p = result + sizeof ("* SEARCH");
-	for (p = strtok_r (p, " ", &lasts); p; p = strtok_r (NULL, " ", &lasts)) {
-		if (s->current) {
-			if (!strcmp (uid, p)) {
-				r->value.bool = TRUE;
-				break;
-			}
-		} else {
-			/* if we need to setup a hash of summary items, this way we get
-			   access to the summary memory which is locked for the duration of
-			   the search, and wont vanish on us */
-			if (uid_hash == NULL) {
-				int i;
-
-				uid_hash = g_hash_table_new(g_str_hash, g_str_equal);
-				for (i=0;i<s->summary->len;i++) {
-					info = s->summary->pdata[i];
-					g_hash_table_insert(uid_hash, (char *)camel_message_info_uid(info), info);
-				}
-			}
-			if (g_hash_table_lookup_extended(uid_hash, p, (void *)&real_uid, (void *)&info))
-				g_ptr_array_add (r->value.ptrarray, real_uid);
-		}
-	}
-
-	/* we could probably cache this globally, but its probably not worth it */
-	if (uid_hash)
-		g_hash_table_destroy(uid_hash);
-
-	return r;
-}
-
-/**
- * camel_imap_search_new:
- *
- * Return value: A new CamelImapSearch widget.
- **/
-CamelFolderSearch *
-camel_imap_search_new (void)
-{
-	CamelFolderSearch *new = CAMEL_FOLDER_SEARCH (camel_object_new (camel_imap_search_get_type ()));
-
-	camel_folder_search_construct (new);
-	return new;
-}
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
deleted file mode 100644
index 97fd6cd6c4..0000000000
--- a/camel/providers/imap/camel-imap-search.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-search.h: IMAP folder search */
-
-/*
- *  Authors:
- *    Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _CAMEL_IMAP_SEARCH_H
-#define _CAMEL_IMAP_SEARCH_H
-
-#include <camel/camel-folder-search.h>
-
-#define CAMEL_IMAP_SEARCH_TYPE         (camel_imap_search_get_type ())
-#define CAMEL_IMAP_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_imap_search_get_type (), CamelImapSearch)
-#define CAMEL_IMAP_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_search_get_type (), CamelImapSearchClass)
-#define CAMEL_IS_IMAP_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_search_get_type ())
-
-typedef struct _CamelImapSearchClass CamelImapSearchClass;
-
-struct _CamelImapSearch {
-	CamelFolderSearch parent;
-
-};
-
-struct _CamelImapSearchClass {
-	CamelFolderSearchClass parent_class;
-
-};
-
-guint              camel_imap_search_get_type (void);
-CamelFolderSearch *camel_imap_search_new      (void);
-
-#endif /* ! _CAMEL_IMAP_SEARCH_H */
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
deleted file mode 100644
index a924c4dab7..0000000000
--- a/camel/providers/imap/camel-imap-store.c
+++ /dev/null
@@ -1,1135 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-store.c : class for an imap store */
-
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <gal/util/e-util.h>
-
-#include "camel-imap-store.h"
-#include "camel-imap-folder.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-command.h"
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-session.h"
-#include "camel-stream.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-url.h"
-#include "camel-sasl.h"
-#include "string-utils.h"
-
-#include "camel-imap-private.h"
-#include "camel-private.h"
-
-#define d(x) x
-
-/* Specified in RFC 2060 */
-#define IMAP_PORT 143
-
-static CamelRemoteStoreClass *remote_store_class = NULL;
-
-static gboolean imap_connect (CamelService *service, CamelException *ex);
-static gboolean imap_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *query_auth_types (CamelService *service, gboolean connect, CamelException *ex);
-static guint hash_folder_name (gconstpointer key);
-static gint compare_folder_name (gconstpointer a, gconstpointer b);
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static CamelFolderInfo *create_folder (CamelStore *store, const char *parent_name, const char *folder_name, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);
-static void subscribe_folder (CamelStore *store, const char *folder_name,
-			      CamelException *ex);
-static void unsubscribe_folder (CamelStore *store, const char *folder_name,
-				CamelException *ex);
-static void imap_keepalive (CamelRemoteStore *store);
-
-static void
-camel_imap_store_class_init (CamelImapStoreClass *camel_imap_store_class)
-{
-	/* virtual method overload */
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_imap_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_imap_store_class);
-	CamelRemoteStoreClass *camel_remote_store_class =
-		CAMEL_REMOTE_STORE_CLASS (camel_imap_store_class);
-	
-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						      (camel_remote_store_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->query_auth_types = query_auth_types;
-	camel_service_class->connect = imap_connect;
-	camel_service_class->disconnect = imap_disconnect;
-	
-	camel_store_class->hash_folder_name = hash_folder_name;
-	camel_store_class->compare_folder_name = compare_folder_name;
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->create_folder = create_folder;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->folder_subscribed = folder_subscribed;
-	camel_store_class->subscribe_folder = subscribe_folder;
-	camel_store_class->unsubscribe_folder = unsubscribe_folder;
-
-	camel_remote_store_class->keepalive = imap_keepalive;
-}
-
-static gboolean
-free_key (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	return TRUE;
-}
-
-static void
-camel_imap_store_finalize (CamelObject *object)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
-
-	if (imap_store->subscribed_folders) {
-		g_hash_table_foreach_remove (imap_store->subscribed_folders,
-					     free_key, NULL);
-		g_hash_table_destroy (imap_store->subscribed_folders);
-	}
-	if (imap_store->authtypes) {
-		g_hash_table_foreach_remove (imap_store->authtypes,
-					     free_key, NULL);
-		g_hash_table_destroy (imap_store->authtypes);
-	}
-	if (imap_store->namespace)
-		g_free (imap_store->namespace);
-#ifdef ENABLE_THREADS
-	e_mutex_destroy(imap_store->priv->command_lock);
-#endif
-	g_free(imap_store->priv);
-}
-
-static void
-camel_imap_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-	
-	remote_store->default_port = 143;
-
-	imap_store->dir_sep = '\0';
-	imap_store->current_folder = NULL;
-
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-	
-	imap_store->connected = FALSE;
-	imap_store->subscribed_folders = NULL;
-
-	imap_store->priv = g_malloc0(sizeof(*imap_store->priv));
-#ifdef ENABLE_THREADS
-	imap_store->priv->command_lock = e_mutex_new(E_MUTEX_REC);
-#endif
-}
-
-CamelType
-camel_imap_store_get_type (void)
-{
-	static CamelType camel_imap_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_store_type == CAMEL_INVALID_TYPE)	{
-		camel_imap_store_type =
-			camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelImapStore",
-					     sizeof (CamelImapStore),
-					     sizeof (CamelImapStoreClass),
-					     (CamelObjectClassInitFunc) camel_imap_store_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_imap_store_init,
-					     (CamelObjectFinalizeFunc) camel_imap_store_finalize);
-	}
-	
-	return camel_imap_store_type;
-}
-
-static struct {
-	const char *name;
-	guint32 flag;
-} capabilities[] = {
-	{ "IMAP4",		IMAP_CAPABILITY_IMAP4 },
-	{ "IMAP4REV1",		IMAP_CAPABILITY_IMAP4REV1 },
-	{ "STATUS",		IMAP_CAPABILITY_STATUS },
-	{ "NAMESPACE",		IMAP_CAPABILITY_NAMESPACE },
-	{ "UIDPLUS",		IMAP_CAPABILITY_UIDPLUS },
-	{ "LITERAL+",		IMAP_CAPABILITY_LITERALPLUS },
-	{ NULL, 0 }
-};
-
-/* we have remote-store:connect_lock by now */
-static gboolean
-connect_to_server (CamelService *service, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelImapResponse *response;
-	char *result, *buf, *capa, *lasts;
-	int i;
-
-	if (!CAMEL_SERVICE_CLASS (remote_store_class)->connect (service, ex))
-		return FALSE;
-
-	store->command = 0;
-
-	/* Read the greeting, if any. FIXME: deal with PREAUTH */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service),
-					  &buf, ex) < 0) {
-		return FALSE;
-	}
-	g_free (buf);
-	store->connected = TRUE;
-	
-	/* Find out the IMAP capabilities */
-	store->capabilities = 0;
-	store->authtypes = g_hash_table_new (g_str_hash, g_str_equal);
-	response = camel_imap_command (store, NULL, ex, "CAPABILITY");
-	if (!response)
-		return FALSE;
-	result = camel_imap_response_extract (response, "CAPABILITY", ex);
-	if (!result)
-		return FALSE;
-
-	/* Skip over "* CAPABILITY". */
-	capa = imap_next_word (result + 2);
-
-	for (capa = strtok_r (capa, " ", &lasts); capa;
-	     capa = strtok_r (NULL, " ", &lasts)) {
-		if (!strncmp (capa, "AUTH=", 5)) {
-			g_hash_table_insert (store->authtypes,
-					     g_strdup (capa + 5),
-					     GINT_TO_POINTER (1));
-			continue;
-		}
-		for (i = 0; capabilities[i].name; i++) {
-			if (g_strcasecmp (capa, capabilities[i].name) == 0) {
-				store->capabilities |= capabilities[i].flag;
-				break;
-			}
-		}
-	}
-	g_free (result);
-
-	if (store->capabilities & IMAP_CAPABILITY_IMAP4REV1) {
-		store->server_level = IMAP_LEVEL_IMAP4REV1;
-		store->capabilities |= IMAP_CAPABILITY_STATUS;
-	} else if (store->capabilities & IMAP_CAPABILITY_IMAP4)
-		store->server_level = IMAP_LEVEL_IMAP4;
-	else
-		store->server_level = IMAP_LEVEL_UNKNOWN;
-
-	return TRUE;
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-	
-	N_("This option will connect to the IMAP server using a "
-	   "plaintext password."),
-	
-	"",
-	TRUE
-};
-
-static GList *
-query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelServiceAuthType *authtype;
-	GList *types, *sasl_types, *t;
-
-	if (connect && !connect_to_server (service, ex))
-		return NULL;
-
-	types = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, connect, ex);
-
-	sasl_types = camel_sasl_authtype_list ();
-	if (connect) {
-		for (t = types; t; t = t->next) {
-			authtype = t->data;
-
-			if (!g_hash_table_lookup (store->authtypes, authtype->authproto)) {
-				g_list_remove_link (types, t);
-				g_list_free_1 (t);
-			}
-		}
-	}
-	types = g_list_concat (types, sasl_types);
-
-	return g_list_prepend (types, &password_authtype);
-}
-
-/* call refresh folder directly, bypassing the folder lock */
-static void
-refresh_folder_info (gpointer key, gpointer value, gpointer data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (value);
-
-	CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))->refresh_info(folder, data);
-}
-
-/* This is a little 'hack' to avoid the deadlock conditions that would otherwise
-   ensue when calling camel_folder_refresh_info from inside a lock */
-/* NB: on second thougts this is probably not entirely safe, but it'll do for now */
-/* the alternative is to:
-   make the camel folder->lock recursive (which should probably be done)
-   or remove it from camel_folder_refresh_info, and use another locking mechanism */
-static void
-imap_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)
-{
-	CAMEL_STORE_LOCK(store, cache_lock);
-
-	g_hash_table_foreach (CAMEL_STORE (store)->folders, refresh_folder_info, ex);
-
-	CAMEL_STORE_UNLOCK(store, cache_lock);
-}	
-
-static gboolean
-try_auth (CamelImapStore *store, const char *mech, CamelException *ex)
-{
-	CamelSasl *sasl;
-	CamelImapResponse *response;
-	char *resp;
-	char *sasl_resp;
-
-	sasl = camel_sasl_new ("imap", mech, CAMEL_SERVICE (store));
-
-	sasl_resp = camel_sasl_challenge_base64 (sasl, NULL, ex);
-
-	CAMEL_IMAP_STORE_LOCK (store, command_lock);
-	response = camel_imap_command (store, NULL, ex, "AUTHENTICATE %s%s%s",
-				       mech, sasl_resp ? " " : "",
-				       sasl_resp ? sasl_resp : "");
-	if (!response)
-		goto lose;
-
-	while (!camel_sasl_authenticated (sasl)) {
-		resp = camel_imap_response_extract_continuation (response, ex);
-		if (!resp)
-			goto lose;
-
-		sasl_resp = camel_sasl_challenge_base64 (sasl, resp + 2, ex);
-		g_free (resp);
-		if (camel_exception_is_set (ex))
-			goto break_and_lose;
-
-		response = camel_imap_command_continuation (store, ex, sasl_resp);
-		g_free (sasl_resp);
-		if (!response)
-			goto lose;
-	}
-
-	resp = camel_imap_response_extract_continuation (response, NULL);
-	if (resp) {
-		/* Oops. SASL claims we're done, but the IMAP server
-		 * doesn't think so...
-		 */
-		g_free (resp);
-		goto lose;
-	}
-
-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-	return TRUE;
-
- break_and_lose:
-	/* Get the server out of "waiting for continuation data" mode. */
-	response = camel_imap_command_continuation (store, NULL, "*");
-	if (response)
-		camel_imap_response_free (response);
-
- lose:
-	if (!camel_exception_is_set (ex)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Bad authentication response from server."));
-	}
-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-	return FALSE;
-}
-
-static gboolean
-imap_connect (CamelService *service, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelSession *session = camel_service_get_session (service);
-	char *result, *errbuf = NULL, *name;
-	CamelImapResponse *response;
-	gboolean authenticated = FALSE;
-	int len, i, flags;
-	CamelServiceAuthType *authtype = NULL;
-
-	if (connect_to_server (service, ex) == 0)
-		return FALSE;
-	
-	if (service->url->authmech) {
-		if (!g_hash_table_lookup (store->authtypes, service->url->authmech)) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      "IMAP server %s does not "
-					      "support requested "
-					      "authentication type %s",
-					      service->url->host,
-					      service->url->authmech);
-			camel_service_disconnect (service, TRUE, NULL);
-			return FALSE;
-		}
-
-		authtype = camel_sasl_authtype (service->url->authmech);
-		if (!authtype) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      "No support for "
-					      "authentication type %s",
-					      service->url->authmech);
-			camel_service_disconnect (service, TRUE, NULL);
-			return FALSE;
-		}
-
-		if (!authtype->need_password) {
-			authenticated = try_auth (store, authtype->authproto, ex);
-			if (!authenticated) {
-				camel_service_disconnect (service, TRUE, NULL);
-				return FALSE;
-			}
-		}
-	}
-
-	while (!authenticated) {
-		if (errbuf) {
-			/* We need to un-cache the password before prompting again */
-			camel_session_query_authenticator (
-				session, CAMEL_AUTHENTICATOR_TELL, NULL,
-				TRUE, service, "password", ex);
-			g_free (service->url->passwd);
-			service->url->passwd = NULL;
-		}
-
-		if (!service->url->passwd) {
-			char *prompt;
-
-			prompt = g_strdup_printf (_("%sPlease enter the IMAP "
-						    "password for %s@%s"),
-						  errbuf ? errbuf : "",
-						  service->url->user,
-						  service->url->host);
-			service->url->passwd =
-				camel_session_query_authenticator (
-					session, CAMEL_AUTHENTICATOR_ASK,
-					prompt, TRUE, service, "password", ex);
-			g_free (prompt);
-			g_free (errbuf);
-			errbuf = NULL;
-
-			if (!service->url->passwd) {
-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-						     "You didn\'t enter a password.");
-				camel_service_disconnect (service, TRUE, NULL);
-				return FALSE;
-			}
-		}
-
-		if (authtype)
-			authenticated = try_auth (store, authtype->authproto, ex);
-		else {
-			CAMEL_IMAP_STORE_LOCK(store, command_lock);
-			response = camel_imap_command (store, NULL, ex,
-						       "LOGIN %S %S",
-						       service->url->user,
-						       service->url->passwd);
-			CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-			if (response) {
-				camel_imap_response_free (response);
-				authenticated = TRUE;
-			}
-		}
-		if (!authenticated) {
-			errbuf = g_strdup_printf (_("Unable to authenticate "
-						    "to IMAP server.\n%s\n\n"),
-						  camel_exception_get_description (ex));
-			camel_exception_clear (ex);
-		}
-	}
-
-	/* Get subscribed folders */
-	CAMEL_IMAP_STORE_LOCK (store, command_lock);
-	response = camel_imap_command (store, NULL, ex, "LSUB \"\" \"*\"");
-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-	if (!response)
-		return FALSE;
-	store->subscribed_folders = g_hash_table_new (g_str_hash, g_str_equal);
-	for (i = 0; i < response->untagged->len; i++) {
-		result = response->untagged->pdata[i];
-		if (!imap_parse_list_response (result, &flags, NULL, &name))
-			continue;
-		if (flags & (IMAP_LIST_FLAG_MARKED | IMAP_LIST_FLAG_UNMARKED))
-			store->useful_lsub = TRUE;
-		if (flags & IMAP_LIST_FLAG_NOSELECT) {
-			g_free (name);
-			continue;
-		}
-		g_hash_table_insert (store->subscribed_folders, name,
-				     GINT_TO_POINTER (1));
-	}
-	camel_imap_response_free (response);
-
-	/* Get namespace and hierarchy separator */
-	if (service->url->path && strlen (service->url->path) > 1)
-		store->namespace = g_strdup (service->url->path + 1);
-	else if (store->capabilities & IMAP_CAPABILITY_NAMESPACE) {
-		CAMEL_IMAP_STORE_LOCK (store, command_lock);
-		response = camel_imap_command (store, NULL, ex, "NAMESPACE");
-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-		if (!response)
-			return FALSE;
-
-		result = camel_imap_response_extract (response, "NAMESPACE", ex);
-		if (!result)
-			return FALSE;
-
-		name = e_strstrcase (result, "NAMESPACE ((");
-		if (name) {
-			char *sep;
-
-			name += 12;
-			store->namespace = imap_parse_string (&name, &len);
-			if (name && *name++ == ' ') {
-				sep = imap_parse_string (&name, &len);
-				if (sep) {
-					store->dir_sep = *sep;
-					g_free (sep);
-				}
-			}
-		}
-		g_free (result);
-	}
-	if (!store->namespace)
-		store->namespace = g_strdup ("");
-
-	if (!store->dir_sep) {
-		CAMEL_IMAP_STORE_LOCK(store, command_lock);
-		if (store->server_level >= IMAP_LEVEL_IMAP4REV1) {
-			/* This idiom means "tell me the hierarchy separator
-			 * for the given path, even if that path doesn't exist.
-			 */
-			response = camel_imap_command (store, NULL, ex,
-						       "LIST %S \"\"",
-						       store->namespace);
-		} else {
-			/* Plain IMAP4 doesn't have that idiom, so we fall back
-			 * to "tell me about this folder", which will fail if
-			 * the folder doesn't exist (eg, if namespace is "").
-			 */
-			response = camel_imap_command (store, NULL, ex,
-						       "LIST \"\" %S",
-						       store->namespace);
-		}
-		CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-
-		if (!response)
-			return FALSE;
-
-		result = camel_imap_response_extract (response, "LIST", NULL);
-		if (result) {
-			imap_parse_list_response (result, NULL, &store->dir_sep, NULL);
-			g_free (result);
-		}
-		if (!store->dir_sep)
-			store->dir_sep = '/';	/* Guess */
-	}
-
-	/* Generate base URL */
-	store->base_url = camel_url_to_string (service->url, FALSE);
-	len = strlen (store->base_url);
-	if (service->url->path)
-		store->base_url[len - strlen (service->url->path) + 1] = '\0';
-	else {
-		store->base_url = g_realloc (store->base_url, len + 2);
-		store->base_url[len] = '/';
-		store->base_url[len + 1] = '\0';
-	}
-
-	/* Find our storage path. */
-	if (!store->storage_path) {
-		store->storage_path =
-			camel_session_get_storage_path (session, service, ex);
-		if (camel_exception_is_set (ex)) 
-			return FALSE;
-	}
-
-	imap_store_refresh_folders (CAMEL_REMOTE_STORE (store), ex);
-
-	return !camel_exception_is_set (ex);
-}
-
-static gboolean
-imap_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelImapResponse *response;
-	
-	if (store->connected && clean) {
-		/* send the logout command */
-
-		/* NB: this lock probably isn't required */
-		CAMEL_IMAP_STORE_LOCK(store, command_lock);
-		response = camel_imap_command (store, NULL, ex, "LOGOUT");
-		CAMEL_IMAP_STORE_UNLOCK(store, command_lock);
-		camel_imap_response_free (response);
-	}
-	store->connected = FALSE;
-	store->current_folder = NULL;
-
-	if (store->subscribed_folders) {
-		g_hash_table_foreach_remove (store->subscribed_folders,
-					     free_key, NULL);
-		g_hash_table_destroy (store->subscribed_folders);
-		store->subscribed_folders = NULL;
-	}
-
-	if (store->namespace) {
-		g_free (store->namespace);
-		store->namespace = NULL;
-	}
-
-	return CAMEL_SERVICE_CLASS (remote_store_class)->disconnect (service, clean, ex);
-}
-
-/* NOTE: Must have imap_store::command_lock before calling this */
-static gboolean
-imap_folder_exists (CamelImapStore *store, const char *folder_name,
-		    gboolean *selectable, char **short_name,
-		    CamelException *ex)
-{
-	CamelImapResponse *response;
-	char *result, sep;
-	int flags;
-
-	if (!g_strcasecmp (folder_name, "INBOX")) {
-		if (selectable)
-			*selectable = TRUE;
-		if (short_name)
-			*short_name = g_strdup ("INBOX");
-		return TRUE;
-	}
-
-	response = camel_imap_command (store, NULL, ex, "LIST \"\" %S",
-				       folder_name);
-	if (!response)
-		return FALSE;
-	result = camel_imap_response_extract (response, "LIST", ex);
-	if (!result)
-		return FALSE;
-
-	if (!imap_parse_list_response (result, &flags, &sep, NULL))
-		return FALSE;
-
-	if (selectable)
-		*selectable = !(flags & IMAP_LIST_FLAG_NOSELECT);
-	if (short_name) {
-		*short_name = strrchr (folder_name, sep);
-		if (*short_name)
-			*short_name = g_strdup (*short_name + 1);
-		else
-			*short_name = g_strdup (folder_name);
-	}
-
-	return TRUE;
-}
-
-/* NOTE: Must have imap_store::command_lock before calling this */
-static gboolean
-imap_create (CamelImapStore *store, const char *folder_name,
-	     CamelException *ex)
-{
-	CamelImapResponse *response;
-
-	response = camel_imap_command (store, NULL, ex, "CREATE %S",
-				       folder_name);
-	camel_imap_response_free (response);
-
-	return !camel_exception_is_set (ex);
-}
-
-static guint
-hash_folder_name (gconstpointer key)
-{
-	if (g_strcasecmp (key, "INBOX") == 0)
-		return g_str_hash ("INBOX");
-	else
-		return g_str_hash (key);
-}
-
-static gint
-compare_folder_name (gconstpointer a, gconstpointer b)
-{
-	gconstpointer aname = a, bname = b;
-
-	if (g_strcasecmp (a, "INBOX") == 0)
-		aname = "INBOX";
-	if (g_strcasecmp (b, "INBOX") == 0)
-		bname = "INBOX";
-	return g_str_equal (aname, bname);
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name, guint32 flags,
-	    CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelFolder *new_folder = NULL;
-	char *short_name, *summary_file, *p;
-	gboolean selectable;
-
-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))
-		return NULL;
-
-	/* lock around the whole lot to check/create atomically */
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	if (!imap_folder_exists (imap_store, folder_name,
-				 &selectable, &short_name, ex)) {
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0
-		    || (!imap_create (imap_store, folder_name, ex))
-		    || (!imap_folder_exists (imap_store, folder_name,
-					     &selectable, &short_name, ex))) {
-			CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-			return NULL;
-		}
-	}
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-
-	if (!selectable) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      "%s is not a selectable folder",
-				      folder_name);
-		g_free (short_name);
-		return NULL;
-	}
-
-	summary_file = g_strdup_printf ("%s/%s/#summary",
-					imap_store->storage_path,
-					folder_name);
-	p = strrchr (summary_file, '/');
-	*p = '\0';
-	if (e_mkdir_hier (summary_file, S_IRWXU) == 0) {
-		*p = '/';
-		new_folder = camel_imap_folder_new (store, folder_name,
-						    short_name, summary_file,
-						    ex);
-	} else {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create directory %s: %s"),
-				      summary_file, g_strerror (errno));
-	}
-	g_free (summary_file);
-	g_free (short_name);
-
-	if (camel_exception_is_set (ex))
-		return NULL;
-
-	return new_folder;
-}
-
-static char *
-imap_concat (CamelImapStore *imap_store, const char *prefix, const char *suffix)
-{
-	int len;
-
-	len = strlen (prefix);
-	if (len > 0 && prefix[len - 1] == imap_store->dir_sep)
-		return g_strdup_printf ("%s%s", prefix, suffix);
-	else
-		return g_strdup_printf ("%s%c%s", prefix, imap_store->dir_sep, suffix);
-}
-
-static CamelFolderInfo *
-create_folder (CamelStore *store, const char *parent_name,
-	       const char *folder_name, CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelFolderInfo *fi;
-	char *full_name;
-
-	if (!parent_name)
-		parent_name = imap_store->namespace;
-	full_name = imap_concat (imap_store, parent_name, folder_name);
-
-	imap_create (imap_store, full_name, ex);
-	if (camel_exception_is_set (ex)) {
-		g_free (full_name);
-		return NULL;
-	}
-
-	fi = get_folder_info (store, full_name, FALSE, FALSE, FALSE, ex);
-	g_free (full_name);
-	
-	return fi;
-}
-
-static CamelFolderInfo *
-parse_list_response_as_folder_info (CamelImapStore *imap_store,
-				    const char *response)
-{
-	CamelFolderInfo *fi;
-	int flags;
-	char sep, *dir, *name = NULL;
-
-	if (!imap_parse_list_response (response, &flags, &sep, &dir))
-		return NULL;
-
-	if (sep) {
-		name = strrchr (dir, sep);
-		if (name && !*++name) {
-			g_free (dir);
-			return NULL;
-		}
-	}
-
-	fi = g_new0 (CamelFolderInfo, 1);
-	fi->full_name = dir;
-	if (sep && name)
-		fi->name = g_strdup (name);
-	else
-		fi->name = g_strdup (dir);
-	if (!(flags & IMAP_LIST_FLAG_NOSELECT))
-		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, dir);
-	if (!(flags & IMAP_LIST_FLAG_UNMARKED))
-		fi->unread_message_count = -1;
-
-	return fi;
-}
-
-static void
-copy_folder_name (gpointer name, gpointer key, gpointer array)
-{
-	g_ptr_array_add (array, name);
-}
-
-static void
-get_subscribed_folders_by_hand (CamelImapStore *imap_store, const char *top,
-				GPtrArray *folders, CamelException *ex)
-{
-	GPtrArray *names;
-	CamelImapResponse *response;
-	CamelFolderInfo *fi;
-	char *result;
-	int i, toplen = strlen (top);
-
-	names = g_ptr_array_new ();
-	g_hash_table_foreach (imap_store->subscribed_folders,
-			      copy_folder_name, names);
-
-	for (i = 0; i < names->len; i++) {
-		CAMEL_IMAP_STORE_LOCK (imap_store, command_lock);
-		response = camel_imap_command (imap_store, NULL, ex,
-					       "LIST \"\" %S",
-					       names->pdata[i]);
-		CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);
-
-		if (!response) {
-			g_ptr_array_free (names, TRUE);
-			return;
-		}
-		result = camel_imap_response_extract (response, "LIST", NULL);
-		if (!result) {
-			g_hash_table_remove (imap_store->subscribed_folders,
-					     names->pdata[i]);
-			g_free (names->pdata[i]);
-			g_ptr_array_remove_index_fast (names, i--);
-			continue;
-		}
-
-		fi = parse_list_response_as_folder_info (imap_store, result);
-		if (!fi)
-			continue;
-
-		if (strncmp (top, fi->full_name, toplen) != 0) {
-			camel_folder_info_free (fi);
-			continue;
-		}
-
-		g_ptr_array_add (folders, fi);
-	}
-	g_ptr_array_free (names, TRUE);
-}
-
-static void
-get_folders (CamelImapStore *imap_store, const char *pattern,
-	     GPtrArray *folders, gboolean lsub, CamelException *ex)
-{
-	CamelImapResponse *response;
-	CamelFolderInfo *fi;
-	char *list;
-	int i;
-
-	CAMEL_IMAP_STORE_LOCK (imap_store, command_lock);
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "%s \"\" %S", lsub ? "LSUB" : "LIST",
-				       pattern);
-	CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);
-	if (!response)
-		return;
-
-	for (i = 0; i < response->untagged->len; i++) {
-		list = response->untagged->pdata[i];
-		fi = parse_list_response_as_folder_info (imap_store, list);
-		if (!fi)
-			continue;
-		g_ptr_array_add (folders, fi);
-	}
-	camel_imap_response_free (response);
-}
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top, gboolean fast,
-		 gboolean recursive, gboolean subscribed_only,
-		 CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	gboolean need_inbox = FALSE;
-	CamelImapResponse *response;
-	GPtrArray *folders;
-	const char *name, *p;
-	char *pattern, *status;
-	CamelFolderInfo *fi;
-	int i;
-
-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))
-		return NULL;
-
-	/* Sync flag changes to the server so it has the same ideas about
-	 * read/unread as we do.
-	 */
-	camel_store_sync (store, ex);
-	if (camel_exception_is_set (ex))
-		return NULL;
-
-	name = top;
-	if (!name) {
-		need_inbox = TRUE;
-		name = imap_store->namespace;
-	}
-
-	folders = g_ptr_array_new ();
-
-	get_folders (imap_store, name, folders, FALSE, ex);
-	if (camel_exception_is_set (ex))
-		return NULL;
-	if (folders->len) {
-		fi = folders->pdata[0];
-		if (!fi->url)
-			g_ptr_array_remove_index (folders, 0);
-	}
-
-	if (subscribed_only && !imap_store->useful_lsub)
-		get_subscribed_folders_by_hand (imap_store, name, folders, ex);
-	else {
-		pattern = imap_concat (imap_store, name, recursive ? "*" : "%");
-		get_folders (imap_store, pattern, folders, subscribed_only, ex);
-		g_free (pattern);
-	}
-	if (camel_exception_is_set (ex)) {
-		for (i = 0; i < folders->len; i++)
-			camel_folder_info_free (folders->pdata[i]);
-		g_ptr_array_free (folders, TRUE);
-		return NULL;
-	}
-
-	/* Add INBOX, if necessary */
-	if (need_inbox) {
-		for (i = 0; i < folders->len; i++) {
-			fi = folders->pdata[i];
-			if (!g_strcasecmp (fi->full_name, "INBOX")) {
-				need_inbox = FALSE;
-				break;
-			}
-		}
-	}
-	if (need_inbox) {
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->full_name = g_strdup ("INBOX");
-		fi->name = g_strdup ("INBOX");
-		fi->url = g_strdup_printf ("%sINBOX", imap_store->base_url);
-		fi->unread_message_count = -1;
-
-		g_ptr_array_add (folders, fi);
-	}
-
-	if (!fast) {
-		/* Get unread counts */
-		for (i = 0; i < folders->len; i++) {
-			fi = folders->pdata[i];
-			if (!fi->url || fi->unread_message_count != -1)
-				continue;
-
-			/* UW will give cached data for the currently
-			 * selected folder. Grr. Well, I guess this
-			 * also potentially saves us one IMAP command.
-			 */
-			if (imap_store->current_folder &&
-			    !strcmp (imap_store->current_folder->full_name,
-				     fi->full_name)) {
-				fi->unread_message_count = camel_folder_get_unread_message_count (imap_store->current_folder);
-				continue;
-			}
-
-			CAMEL_IMAP_STORE_LOCK (imap_store, command_lock);
-			response = camel_imap_command (imap_store, NULL, NULL,
-						       "STATUS %S (UNSEEN)",
-						       fi->full_name);
-			CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);
-			if (!response)
-				continue;
-			status = camel_imap_response_extract (response, "STATUS", NULL);
-			if (!status)
-				continue;
-
-			p = e_strstrcase (status, "UNSEEN");
-			if (p)
-				fi->unread_message_count = strtoul (p + 6, NULL, 10);
-			g_free (status);
-		}
-	}
-
-	/* And assemble. */
-	fi = camel_folder_info_build (folders, name, imap_store->dir_sep, TRUE);
-	g_ptr_array_free (folders, TRUE);
-	return fi;
-}
-
-static gboolean
-folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-
-	g_return_val_if_fail (imap_store->subscribed_folders != NULL, FALSE);
-
-	return g_hash_table_lookup (imap_store->subscribed_folders,
-				    folder_name) != NULL;
-}
-
-static void
-subscribe_folder (CamelStore *store, const char *folder_name,
-		  CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-	
-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))
-		return;
-
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "SUBSCRIBE %S", folder_name);
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-	if (response) {
-		CamelFolderInfo *fi;
-		char *name;
-		
-		g_hash_table_insert (imap_store->subscribed_folders,
-				     g_strdup (folder_name),
-				     GUINT_TO_POINTER (1));
-		
-		name = strrchr (folder_name, imap_store->dir_sep);
-		if (name)
-			name++;
-		
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->full_name = g_strdup (folder_name);
-		fi->name = g_strdup (name);
-		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, folder_name);
-		fi->unread_message_count = -1;
-		
-		camel_object_trigger_event (CAMEL_OBJECT (store),
-					    "folder_created", fi);
-		
-		camel_folder_info_free (fi);
-	}
-	camel_imap_response_free (response);
-}
-
-static void
-unsubscribe_folder (CamelStore *store, const char *folder_name,
-		    CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-	gpointer key, value;
-	
-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))
-		return;
-
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "UNSUBSCRIBE %S", folder_name);
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-	if (response) {
-		CamelFolderInfo *fi;
-		char *name;
-		
-		g_hash_table_lookup_extended (imap_store->subscribed_folders,
-					      folder_name, &key, &value);
-		g_hash_table_remove (imap_store->subscribed_folders,
-				     folder_name);
-		g_free (key);
-		
-		name = strrchr (folder_name, imap_store->dir_sep);
-		if (name)
-			name++;
-		
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->full_name = g_strdup (folder_name);
-		fi->name = g_strdup (name);
-		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, folder_name);
-		fi->unread_message_count = -1;
-		
-		camel_object_trigger_event (CAMEL_OBJECT (store),
-					    "folder_deleted", fi);
-		
-		camel_folder_info_free (fi);
-	}
-	camel_imap_response_free (response);
-}
-
-static void
-imap_keepalive (CamelRemoteStore *store)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-
-	CAMEL_IMAP_STORE_LOCK(imap_store, command_lock);
-	response = camel_imap_command (imap_store, NULL, NULL, "NOOP");
-	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
-	camel_imap_response_free (response);
-}
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
deleted file mode 100644
index 3792e92872..0000000000
--- a/camel/providers/imap/camel-imap-store.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-store.h : class for an imap store */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_STORE_H
-#define CAMEL_IMAP_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-imap-types.h"
-#include "camel-remote-store.h"
-
-#define CAMEL_IMAP_STORE_TYPE     (camel_imap_store_get_type ())
-#define CAMEL_IMAP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STORE_TYPE, CamelImapStore))
-#define CAMEL_IMAP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass))
-#define CAMEL_IS_IMAP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STORE_TYPE))
-
-typedef enum {
-	IMAP_LEVEL_UNKNOWN,
-	IMAP_LEVEL_IMAP4,
-	IMAP_LEVEL_IMAP4REV1
-} CamelImapServerLevel;
-
-#define IMAP_CAPABILITY_IMAP4			(1 << 0)
-#define IMAP_CAPABILITY_IMAP4REV1		(1 << 1)
-#define IMAP_CAPABILITY_STATUS			(1 << 2)
-#define IMAP_CAPABILITY_NAMESPACE		(1 << 3)
-#define IMAP_CAPABILITY_UIDPLUS			(1 << 4)
-#define IMAP_CAPABILITY_LITERALPLUS		(1 << 5)
-
-struct _CamelImapStore {
-	CamelRemoteStore parent_object;	
-	struct _CamelImapStorePrivate *priv;
-
-	CamelFolder *current_folder;
-	
-	guint32 command;
-	
-	CamelImapServerLevel server_level;
-	guint32 capabilities;
-	GHashTable *authtypes;
-	
-	char *namespace, dir_sep, *storage_path, *base_url;
-	
-	gboolean connected;
-
-	GHashTable *subscribed_folders;
-	gboolean useful_lsub;
-};
-
-
-typedef struct {
-	CamelRemoteStoreClass parent_class;
-
-} CamelImapStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_imap_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_STORE_H */
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
deleted file mode 100644
index 66228649bc..0000000000
--- a/camel/providers/imap/camel-imap-summary.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-imap-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define CAMEL_IMAP_SUMMARY_VERSION (0x300)
-
-static int summary_header_load (CamelFolderSummary *, FILE *);
-static int summary_header_save (CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo *message_info_load (CamelFolderSummary *s, FILE *in);
-static int message_info_save (CamelFolderSummary *s, FILE *out,
-			      CamelMessageInfo *info);
-static CamelMessageContentInfo *content_info_load (CamelFolderSummary *s, FILE *in);
-static int content_info_save (CamelFolderSummary *s, FILE *out,
-			      CamelMessageContentInfo *info);
-
-static void camel_imap_summary_class_init (CamelImapSummaryClass *klass);
-static void camel_imap_summary_init       (CamelImapSummary *obj);
-
-static CamelFolderSummaryClass *camel_imap_summary_parent;
-
-CamelType
-camel_imap_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(
-			camel_folder_summary_get_type(), "CamelImapSummary",
-			sizeof (CamelImapSummary),
-			sizeof (CamelImapSummaryClass),
-			(CamelObjectClassInitFunc) camel_imap_summary_class_init,
-			NULL,
-			(CamelObjectInitFunc) camel_imap_summary_init,
-			NULL);
-	}
-
-	return type;
-}
-
-static void
-camel_imap_summary_class_init (CamelImapSummaryClass *klass)
-{
-	CamelFolderSummaryClass *cfs_class = (CamelFolderSummaryClass *) klass;
-
-	camel_imap_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs (camel_folder_summary_get_type()));
-
-	cfs_class->summary_header_load = summary_header_load;
-	cfs_class->summary_header_save = summary_header_save;
-	cfs_class->message_info_load = message_info_load;
-	cfs_class->message_info_save = message_info_save;
-	cfs_class->content_info_load = content_info_load;
-	cfs_class->content_info_save = content_info_save;
-}
-
-static void
-camel_imap_summary_init (CamelImapSummary *obj)
-{
-	CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelImapMessageInfo);
-	s->content_info_size = sizeof(CamelImapMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_IMAP_SUMMARY_VERSION;
-}
-
-/**
- * camel_imap_summary_new:
- * @filename: the file to store the summary in.
- * @validity: the current UIDVALIDITY value of the folder
- *
- * This will create a new CamelImapSummary object and read in the
- * summary data from disk, if it exists and has the right UIDVALIDITY
- * value.
- *
- * Return value: A new CamelImapSummary object.
- **/
-CamelFolderSummary *
-camel_imap_summary_new (const char *filename, guint32 validity)
-{
-	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (
-		camel_object_new (camel_imap_summary_get_type ()));
-	CamelImapSummary *imap_summary = (CamelImapSummary *)summary;
-
-	camel_folder_summary_set_build_content (summary, TRUE);
-	camel_folder_summary_set_filename (summary, filename);
-
-	if (camel_folder_summary_load (summary) == -1) {
-		if (errno == ENOENT) {
-			imap_summary->validity = validity;
-			return summary;
-		} else {
-			/* FIXME: are there error conditions where this won't work? */
-			camel_folder_summary_clear (summary);
-			camel_folder_summary_touch (summary);
-			
-			return summary;
-		}
-	}
-	
-	if (imap_summary->validity != validity) {
-		camel_folder_summary_clear (summary);
-		imap_summary->validity = validity;
-	}
-
-	return summary;
-}
-
-
-static int
-summary_header_load (CamelFolderSummary *s, FILE *in)
-{
-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY (s);
-
-	if (camel_imap_summary_parent->summary_header_load (s, in) == -1)
-		return -1;
-
-	return camel_folder_summary_decode_uint32 (in, &ims->validity);
-}
-
-static int
-summary_header_save (CamelFolderSummary *s, FILE *out)
-{
-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY(s);
-
-	if (camel_imap_summary_parent->summary_header_save (s, out) == -1)
-		return -1;
-
-	return camel_folder_summary_encode_uint32 (out, ims->validity);
-}
-
-
-static CamelMessageInfo *
-message_info_load (CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *info;
-	CamelImapMessageInfo *iinfo;
-
-	info = camel_imap_summary_parent->message_info_load (s, in);
-	if (info) {
-		iinfo = (CamelImapMessageInfo *)info;
-
-		if (camel_folder_summary_decode_uint32 (in, &iinfo->server_flags) == -1)
-			goto error;
-	}
-
-	return info;
-error:
-	camel_folder_summary_info_free (s, info);
-	return NULL;
-}
-
-static int
-message_info_save (CamelFolderSummary *s, FILE *out, CamelMessageInfo *info)
-{
-	CamelImapMessageInfo *iinfo = (CamelImapMessageInfo *)info;
-
-	if (camel_imap_summary_parent->message_info_save (s, out, info) == -1)
-		return -1;
-
-	return camel_folder_summary_encode_uint32 (out, iinfo->server_flags);
-}
-
-
-static CamelMessageContentInfo *
-content_info_load (CamelFolderSummary *s, FILE *in)
-{
-	if (fgetc (in))
-		return camel_imap_summary_parent->content_info_load (s, in);
-	else
-		return camel_folder_summary_content_info_new (s);
-}
-
-static int
-content_info_save (CamelFolderSummary *s, FILE *out,
-		   CamelMessageContentInfo *info)
-{
-	if (info->type) {
-		fputc (1, out);
-		return camel_imap_summary_parent->content_info_save (s, out, info);
-	} else
-		return fputc (0, out);
-}
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
deleted file mode 100644
index 7ad1e3f4e8..0000000000
--- a/camel/providers/imap/camel-imap-summary.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_IMAP_SUMMARY_H
-#define _CAMEL_IMAP_SUMMARY_H
-
-#include "camel-imap-types.h"
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
-
-#define CAMEL_IMAP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_imap_summary_get_type (), CamelImapSummary)
-#define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass)
-#define CAMEL_IS_IMAP_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_summary_get_type ())
-
-#define CAMEL_IMAP_SERVER_FLAGS (CAMEL_MESSAGE_ANSWERED | \
-				 CAMEL_MESSAGE_DELETED | \
-				 CAMEL_MESSAGE_DRAFT | \
-				 CAMEL_MESSAGE_FLAGGED | \
-				 CAMEL_MESSAGE_SEEN)
-
-typedef struct _CamelImapSummaryClass CamelImapSummaryClass;
-
-typedef struct _CamelImapMessageContentInfo {
-	CamelMessageContentInfo info;
-
-} CamelImapMessageContentInfo;
-
-typedef struct _CamelImapMessageInfo {
-	CamelMessageInfo info;
-
-	guint32 server_flags;
-} CamelImapMessageInfo;
-
-struct _CamelImapSummary {
-	CamelFolderSummary parent;
-
-	guint32 validity;
-};
-
-struct _CamelImapSummaryClass {
-	CamelFolderSummaryClass parent_class;
-
-};
-
-guint               camel_imap_summary_get_type     (void);
-CamelFolderSummary *camel_imap_summary_new          (const char *filename,
-						     guint32 validity);
-
-#endif /* ! _CAMEL_IMAP_SUMMARY_H */
-
diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
deleted file mode 100644
index af5d8b8c77..0000000000
--- a/camel/providers/imap/camel-imap-types.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-types.h: IMAP types */
-
-/* 
- * Copyright (C) 2001 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_IMAP_TYPES_H
-#define CAMEL_IMAP_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-types.h"
-
-typedef struct _CamelImapResponse CamelImapResponse;
-typedef struct _CamelImapFolder   CamelImapFolder;
-typedef struct _CamelImapSearch   CamelImapSearch;
-typedef struct _CamelImapStore    CamelImapStore;
-typedef struct _CamelImapSummary  CamelImapSummary;
-
-#endif /* CAMEL_IMAP_TYPES_H */
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
deleted file mode 100644
index 8116f12386..0000000000
--- a/camel/providers/imap/camel-imap-utils.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "camel-imap-utils.h"
-#include "camel-imap-summary.h"
-#include "camel-folder.h"
-
-#define d(x) x
-
-char *
-imap_next_word (const char *buf)
-{
-	char *word;
-	
-	/* skip over current word */
-	for (word = (char *)buf; *word && *word != ' '; word++);
-	
-	/* skip over white space */
-	for ( ; *word && *word == ' '; word++);
-	
-	return word;
-}
-
-/**
- * imap_parse_list_response:
- * @buf: the LIST or LSUB response
- * @flags: a pointer to a variable to store the flags in, or %NULL
- * @sep: a pointer to a variable to store the hierarchy separator in, or %NULL
- * @folder: a pointer to a variable to store the folder name in, or %NULL
- *
- * Parses a LIST or LSUB response and returns the desired parts of it.
- * If @folder is non-%NULL, its value must be freed by the caller.
- *
- * Return value: whether or not the response was successfully parsed.
- **/
-gboolean
-imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder)
-{
-	char *word;
-	int len;
-
-	if (*buf != '*')
-		return FALSE;
-
-	word = imap_next_word (buf);
-	if (g_strncasecmp (word, "LIST", 4) && g_strncasecmp (word, "LSUB", 4))
-		return FALSE;
-
-	/* get the flags */
-	word = imap_next_word (word);
-	if (*word != '(')
-		return FALSE;
-
-	if (flags)
-		*flags = 0;
-
-	word++;
-	while (*word != ')') {
-		len = strcspn (word, " )");
-		if (flags) {
-			if (!g_strncasecmp (word, "\\Noinferiors", len))
-				*flags |= IMAP_LIST_FLAG_NOINFERIORS;
-			else if (!g_strncasecmp (word, "\\Noselect", len))
-				*flags |= IMAP_LIST_FLAG_NOSELECT;
-			else if (!g_strncasecmp (word, "\\Marked", len))
-				*flags |= IMAP_LIST_FLAG_MARKED;
-			else if (!g_strncasecmp (word, "\\Unmarked", len))
-				*flags |= IMAP_LIST_FLAG_UNMARKED;
-		}
-
-		word += len;
-		while (*word == ' ')
-			word++;
-	}
-
-	/* get the directory separator */
-	word = imap_next_word (word);
-	if (!strncmp (word, "NIL", 3)) {
-		if (sep)
-			*sep = '\0';
-	} else if (*word++ == '"') {
-		if (*word == '\\')
-			word++;
-		if (sep)
-			*sep = *word;
-		word++;
-		if (*word++ != '"')
-			return FALSE;
-	} else
-		return FALSE;
-
-	if (folder) {
-		/* get the folder name */
-		word = imap_next_word (word);
-		*folder = imap_parse_astring (&word, &len);
-		return *folder != NULL;
-	}
-
-	return TRUE;
-}
-
-char *
-imap_create_flag_list (guint32 flags)
-{
-	GString *gstr;
-	char *flag_list;
-	
-	gstr = g_string_new ("(");
-	
-	if (flags & CAMEL_MESSAGE_ANSWERED)
-		g_string_append (gstr, "\\Answered ");
-	if (flags & CAMEL_MESSAGE_DELETED)
-		g_string_append (gstr, "\\Deleted ");
-	if (flags & CAMEL_MESSAGE_DRAFT)
-		g_string_append (gstr, "\\Draft ");
-	if (flags & CAMEL_MESSAGE_FLAGGED)
-		g_string_append (gstr, "\\Flagged ");
-	if (flags & CAMEL_MESSAGE_SEEN)
-		g_string_append (gstr, "\\Seen ");
-	
-	if (gstr->str[gstr->len - 1] == ' ')
-		gstr->str[gstr->len - 1] = ')';
-	else
-		g_string_append_c (gstr, ')');
-	
-	flag_list = gstr->str;
-	g_string_free (gstr, FALSE);
-	return flag_list;
-}
-
-guint32
-imap_parse_flag_list (char **flag_list_p)
-{
-	char *flag_list = *flag_list_p;
-	guint32 flags = 0;
-	int len;
-	
-	if (*flag_list++ != '(') {
-		*flag_list_p = NULL;
-		return 0;
-	}
-	
-	while (*flag_list && *flag_list != ')') {
-		len = strcspn (flag_list, " )");
-		if (!g_strncasecmp (flag_list, "\\Answered", len))
-			flags |= CAMEL_MESSAGE_ANSWERED;
-		else if (!g_strncasecmp (flag_list, "\\Deleted", len))
-			flags |= CAMEL_MESSAGE_DELETED;
-		else if (!g_strncasecmp (flag_list, "\\Draft", len))
-			flags |= CAMEL_MESSAGE_DRAFT;
-		else if (!g_strncasecmp (flag_list, "\\Flagged", len))
-			flags |= CAMEL_MESSAGE_FLAGGED;
-		else if (!g_strncasecmp (flag_list, "\\Seen", len))
-			flags |= CAMEL_MESSAGE_SEEN;
-		
-		flag_list += len;
-		if (*flag_list == ' ')
-			flag_list++;
-	}
-
-	if (*flag_list++ != ')') {
-		*flag_list_p = NULL;
-		return 0;
-	}
-
-	*flag_list_p = flag_list;
-	return flags;
-}
-
-static char imap_atom_specials[128] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-};
-#define imap_is_atom_char(ch) (isascii (ch) && !imap_atom_specials[ch])
-
-/**
- * imap_parse_string_generic:
- * @str_p: a pointer to a string
- * @len: a pointer to an int to return the length in
- * @type: type of string (#IMAP_STRING, #IMAP_ASTRING, or #IMAP_NSTRING)
- * to parse.
- *
- * This parses an IMAP "string" (quoted string or literal), "nstring"
- * (NIL or string), or "astring" (atom or string) starting at *@str_p.
- * On success, *@str_p will point to the first character after the end
- * of the string, and *@len will contain the length of the returned
- * string. On failure, *@str_p will be set to %NULL.
- *
- * This assumes that the string is in the form returned by
- * camel_imap_command(): that line breaks are indicated by LF rather
- * than CRLF.
- *
- * Return value: the parsed string, or %NULL if a NIL or no string
- * was parsed. (In the former case, *@str_p will be %NULL; in the
- * latter, it will point to the character after the NIL.)
- **/
-char *
-imap_parse_string_generic (char **str_p, int *len, int type)
-{
-	char *str = *str_p;
-	char *out;
-
-	if (!str)
-		return NULL;
-	else if (*str == '"') {
-		char *p;
-		int size;
-
-		str++;
-		size = strcspn (str, "\"") + 1;
-		p = out = g_malloc (size);
-
-		while (*str && *str != '"') {
-			if (*str == '\\')
-				str++;
-			*p++ = *str++;
-			if (p - out == size) {
-				out = g_realloc (out, size * 2);
-				p = out + size;
-				size *= 2;
-			}
-		}
-		if (*str != '"') {
-			*str_p = NULL;
-			g_free (out);
-			return NULL;
-		}
-		*p = '\0';
-		*str_p = str + 1;
-		*len = strlen (out);
-		return out;
-	} else if (*str == '{') {
-		*len = strtoul (str + 1, (char **)&str, 10);
-		if (*str++ != '}' || *str++ != '\n' || strlen (str) < *len) {
-			*str_p = NULL;
-			return NULL;
-		}
-		
-		out = g_strndup (str, *len);
-		*str_p = str + *len;
-		return out;
-	} else if (type == IMAP_NSTRING && !g_strncasecmp (str, "nil", 3)) {
-		*str_p += 3;
-		*len = 0;
-		return NULL;
-	} else if (type == IMAP_ASTRING &&
-		   imap_is_atom_char ((unsigned char)*str)) {
-		while (imap_is_atom_char ((unsigned char)*str))
-			str++;
-
-		*len = str - *str_p;
-		str = g_strndup (*str_p, *len);
-		*str_p += *len;
-		return str;
-	} else {
-		*str_p = NULL;
-		return NULL;
-	}
-}
-
-static inline void
-skip_char (char **str_p, char ch)
-{
-	if (*str_p && **str_p == ch)
-		*str_p = *str_p + 1;
-	else
-		*str_p = NULL;
-}
-
-/* Skip atom, string, or number */
-static void
-skip_asn (char **str_p)
-{
-	char *str = *str_p;
-
-	if (!str)
-		return;
-	else if (*str == '"') {
-		while (*++str && *str != '"') {
-			if (*str == '\\') {
-				str++;
-				if (!*str)
-					break;
-			}
-		}
-		if (*str == '"')
-			*str_p = str + 1;
-		else
-			*str_p = NULL;
-	} else if (*str == '{') {
-		unsigned long len;
-
-		len = strtoul (str + 1, &str, 10);
-		if (*str != '}' || *(str + 1) != '\n' ||
-		    strlen (str + 2) < len) {
-			*str_p = NULL;
-			return;
-		}
-		*str_p = str + 2 + len;
-	} else {
-		/* We assume the string is well-formed and don't
-		 * bother making sure it's a valid atom.
-		 */
-		while (*str && *str != ')' && *str != ' ')
-			str++;
-		*str_p = str;
-	}
-}
-
-static void
-skip_list (char **str_p)
-{
-	skip_char (str_p, '(');
-	while (*str_p && **str_p != ')') {
-		if (**str_p == '(')
-			skip_list (str_p);
-		else
-			skip_asn (str_p);
-		if (*str_p && **str_p == ' ')
-			skip_char (str_p, ' ');
-	}
-	skip_char (str_p, ')');
-}
-
-static void
-parse_params (char **parms_p, CamelContentType *type)
-{
-	char *parms = *parms_p, *name, *value;
-	int len;
-
-	if (!g_strncasecmp (parms, "nil", 3)) {
-		*parms_p += 3;
-		return;
-	}
-
-	if (*parms++ != '(') {
-		*parms_p = NULL;
-		return;
-	}
-
-	while (parms && *parms != ')') {
-		name = imap_parse_nstring (&parms, &len);
-		skip_char (&parms, ' ');
-		value = imap_parse_nstring (&parms, &len);
-
-		if (name && value)
-			header_content_type_set_param (type, name, value);
-		g_free (name);
-		g_free (value);
-
-		if (parms && *parms == ' ')
-			parms++;
-	}
-
-	if (!parms || *parms++ != ')') {
-		*parms_p = NULL;
-		return;
-	}
-	*parms_p = parms;
-}
-
-/**
- * imap_parse_body:
- * @body_p: pointer to the start of an IMAP "body"
- * @folder: an imap folder
- * @ci: a CamelMessageContentInfo to fill in
- *
- * This filles in @ci with data from *@body_p. On success *@body_p
- * will point to the character after the body. On failure, it will be
- * set to %NULL and @ci will be unchanged.
- **/
-void
-imap_parse_body (char **body_p, CamelFolder *folder,
-		 CamelMessageContentInfo *ci)
-{
-	char *body = *body_p;
-	CamelMessageContentInfo *child;
-	CamelContentType *type;
-	int len;
-
-	if (*body++ != '(') {
-		*body_p = NULL;
-		return;
-	}
-
-	if (*body == '(') {
-		/* multipart */
-		GPtrArray *children;
-		char *subtype;
-		int i;
-
-		/* Parse the child body parts */
-		children = g_ptr_array_new ();
-		i = 0;
-		while (body && *body == '(') {
-			child = camel_folder_summary_content_info_new (folder->summary);
-			g_ptr_array_add (children, child);
-			imap_parse_body (&body, folder, child);
-			if (!body)
-				break;
-			child->parent = ci;
-		}
-		skip_char (&body, ' ');
-
-		/* Parse the multipart subtype */
-		subtype = imap_parse_string (&body, &len);
-
-		/* If there is a parse error, abort. */
-		if (!body) {
-			for (i = 0; i < children->len; i++) {
-				child = children->pdata[i];
-				camel_folder_summary_content_info_free (folder->summary, child);
-			}
-			g_ptr_array_free (children, TRUE);
-			*body_p = NULL;
-			return;
-		}
-
-		g_strdown (subtype);
-		ci->type = header_content_type_new ("multipart", subtype);
-		g_free (subtype);
-
-		/* Chain the children. */
-		ci->childs = children->pdata[0];
-		ci->size = 0;
-		for (i = 0; i < children->len - 1; i++) {
-			child = children->pdata[i];
-			child->next = children->pdata[i + 1];
-			ci->size += child->size;
-		}
-		g_ptr_array_free (children, TRUE);
-	} else {
-		/* single part */
-		char *main_type, *subtype;
-		char *id, *description, *encoding;
-		guint32 size;
-
-		main_type = imap_parse_string (&body, &len);
-		skip_char (&body, ' ');
-		subtype = imap_parse_string (&body, &len);
-		skip_char (&body, ' ');
-		if (!body) {
-			g_free (main_type);
-			g_free (subtype);
-			*body_p = NULL;
-			return;
-		}
-		g_strdown (main_type);
-		g_strdown (subtype);
-		type = header_content_type_new (main_type, subtype);
-		g_free (main_type);
-		g_free (subtype);
-		parse_params (&body, type);
-		skip_char (&body, ' ');
-
-		id = imap_parse_nstring (&body, &len);
-		skip_char (&body, ' ');
-		description = imap_parse_nstring (&body, &len);
-		skip_char (&body, ' ');
-		encoding = imap_parse_string (&body, &len);
-		skip_char (&body, ' ');
-		if (body)
-			size = strtoul (body, &body, 10);
-
-		child = NULL;
-		if (header_content_type_is (type, "message", "rfc822")) {
-			skip_char (&body, ' ');
-			skip_list (&body); /* envelope */
-			skip_char (&body, ' ');
-			child = camel_folder_summary_content_info_new (folder->summary);
-			imap_parse_body (&body, folder, child);
-			if (!body)
-				camel_folder_summary_content_info_free (folder->summary, child);
-			skip_char (&body, ' ');
-			if (body)
-				strtoul (body, &body, 10);
-		} else if (header_content_type_is (type, "text", "*")) {
-			if (body)
-				strtoul (body, &body, 10);
-		}
-
-		if (body) {
-			ci->type = type;
-			ci->id = id;
-			ci->description = description;
-			ci->encoding = encoding;
-			ci->size = size;
-			ci->childs = child;
-		} else {
-			header_content_type_unref (type);
-			g_free (id);
-			g_free (description);
-			g_free (encoding);
-		}
-	}
-
-	if (!body || *body++ != ')') {
-		*body_p = NULL;
-		return;
-	}
-
-	*body_p = body;
-}
-
-/**
- * imap_quote_string:
- * @str: the string to quote, which must not contain CR or LF
- *
- * Return value: an IMAP "quoted" corresponding to the string, which
- * the caller must free.
- **/
-char *
-imap_quote_string (const char *str)
-{
-	const char *p;
-	char *quoted, *q;
-	int len;
-
-	len = strlen (str);
-	p = str;
-	while ((p = strpbrk (p, "\"\\"))) {
-		len++;
-		p++;
-	}
-
-	quoted = q = g_malloc (len + 3);
-	*q++ = '"';
-	while ((p = strpbrk (str, "\"\\"))) {
-		memcpy (q, str, p - str);
-		q += p - str;
-		*q++ = '\\';
-		*q++ = *p++;
-		str = p;
-	}
-	sprintf (q, "%s\"", str);
-
-	return quoted;
-}
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
deleted file mode 100644
index 985f177b3a..0000000000
--- a/camel/providers/imap/camel-imap-utils.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef CAMEL_IMAP_UTILS_H
-#define CAMEL_IMAP_UTILS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder-summary.h"
-
-char *imap_next_word (const char *buf);
-
-#define IMAP_LIST_FLAG_NOINFERIORS	(1 << 0)
-#define IMAP_LIST_FLAG_NOSELECT		(1 << 1)
-#define IMAP_LIST_FLAG_MARKED		(1 << 2)
-#define IMAP_LIST_FLAG_UNMARKED		(1 << 3)
-gboolean imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder);
-
-char *imap_create_flag_list (guint32 flags);
-guint32 imap_parse_flag_list (char **flag_list);
-
-enum { IMAP_STRING, IMAP_NSTRING, IMAP_ASTRING };
-char *imap_parse_string_generic (char **str_p, int *len, int type);
-#define imap_parse_string(str_p, len_p) \
-	imap_parse_string_generic (str_p, len_p, IMAP_STRING)
-#define imap_parse_nstring(str_p, len_p) \
-	imap_parse_string_generic (str_p, len_p, IMAP_NSTRING)
-#define imap_parse_astring(str_p, len_p) \
-	imap_parse_string_generic (str_p, len_p, IMAP_ASTRING)
-
-void imap_parse_body (char **body_p, CamelFolder *folder,
-		      CamelMessageContentInfo *ci);
-
-char *imap_quote_string (const char *str);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_UTILS_H */
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
deleted file mode 100644
index e4d06a009b..0000000000
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */
-/* camel-imap-wrapper.c: data wrapper for offline IMAP data */
-
-/*
- * Author: Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include "camel-imap-wrapper.h"
-#include "camel-imap-command.h"
-#include "camel-imap-store.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-private.h"
-#include "camel-exception.h"
-#include "camel-folder.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-part.h"
-
-#include <errno.h>
-#include <string.h>
-
-static CamelDataWrapperClass *parent_class = NULL;
-
-/* Returns the class for a CamelDataWrapper */
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int write_to_stream (CamelDataWrapper *imap_wrapper, CamelStream *stream);
-
-static void
-camel_imap_wrapper_class_init (CamelImapWrapperClass *camel_imap_wrapper_class)
-{
-	CamelDataWrapperClass *camel_data_wrapper_class =
-		CAMEL_DATA_WRAPPER_CLASS (camel_imap_wrapper_class);
-
-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));
-
-	/* virtual method override */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-}
-
-static void
-camel_imap_wrapper_finalize (CamelObject *object)
-{
-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (object);
-
-	if (imap_wrapper->folder)
-		camel_object_unref (CAMEL_OBJECT (imap_wrapper->folder));
-	if (imap_wrapper->uid)
-		g_free (imap_wrapper->uid);
-	if (imap_wrapper->part)
-		g_free (imap_wrapper->part_spec);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free (imap_wrapper->priv->lock);
-#endif
-	g_free (imap_wrapper->priv);
-}
-
-static void
-camel_imap_wrapper_init (gpointer object, gpointer klass)
-{
-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (object);
-
-	imap_wrapper->priv = g_new0 (struct _CamelImapWrapperPrivate, 1);
-#ifdef ENABLE_THREADS
-	imap_wrapper->priv->lock = g_mutex_new ();
-#endif
-}
-
-CamelType
-camel_imap_wrapper_get_type (void)
-{
-	static CamelType camel_imap_wrapper_type = CAMEL_INVALID_TYPE;
-
-	if (camel_imap_wrapper_type == CAMEL_INVALID_TYPE) {
-		camel_imap_wrapper_type = camel_type_register (
-			CAMEL_DATA_WRAPPER_TYPE, "CamelImapWrapper",
-			sizeof (CamelImapWrapper),
-			sizeof (CamelImapWrapperClass),
-			(CamelObjectClassInitFunc) camel_imap_wrapper_class_init,
-			NULL,
-			(CamelObjectInitFunc) camel_imap_wrapper_init,
-			(CamelObjectFinalizeFunc) camel_imap_wrapper_finalize);
-	}
-
-	return camel_imap_wrapper_type;
-}
-
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (data_wrapper);
-	CamelImapStore *store;
-	CamelImapResponse *response;
-	CamelStream *memstream;
-	CamelStreamFilter *filterstream;
-	CamelMimeFilter *filter;
-	CamelContentType *ct;
-	char *result, *p, *body;
-	int len;
-
-	CAMEL_IMAP_WRAPPER_LOCK (imap_wrapper, lock);
-	if (!data_wrapper->offline) {
-		CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);
-		return parent_class->write_to_stream (data_wrapper, stream);
-	}
-
-	store = CAMEL_IMAP_STORE (imap_wrapper->folder->parent_store);
-	CAMEL_IMAP_STORE_LOCK (store, command_lock);
-	response = camel_imap_command (store, imap_wrapper->folder, NULL,
-				       "UID FETCH %s BODY.PEEK[%s]",
-				       imap_wrapper->uid,
-				       imap_wrapper->part_spec);
-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);
-	if (!response)
-		goto lose;
-
-	result = camel_imap_response_extract (response, "FETCH", NULL);
-	if (!result)
-		goto lose;
-
-	p = strchr (result, ']');
-	if (!p) {
-		g_free (result);
-		goto lose;
-	}
-	p += 2;
-
-	body = imap_parse_nstring (&p, &len);
-	g_free (result);
-	if (!body)
-		goto lose;
-
-	memstream = camel_stream_mem_new_with_buffer (body, len);
-	g_free (body);
-	filterstream = camel_stream_filter_new_with_stream (memstream);
-
-	if (camel_mime_part_get_encoding (imap_wrapper->part) ==
-	    CAMEL_MIME_PART_ENCODING_BASE64) {
-		filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
-		camel_stream_filter_add (filterstream, filter);
-	} else if (camel_mime_part_get_encoding (imap_wrapper->part) ==
-		   CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE) {
-		filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_QP_DEC);
-		camel_stream_filter_add (filterstream, filter);
-	} else
-		filter = NULL;
-
-	ct = camel_mime_part_get_content_type (imap_wrapper->part);
-	if (header_content_type_is (ct, "text", "*")) {
-		const char *charset;
-
-		/* If we just did B64/QP, need to also do CRLF->LF */
-		if (filter) {
-			filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE,
-							     CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-			camel_stream_filter_add (filterstream, filter);
-		}
-
-		charset = header_content_type_param (ct, "charset");
-		if (charset && !(strcasecmp (charset, "us-ascii") == 0
-				 || strcasecmp (charset, "utf-8") == 0)) {
-			filter = (CamelMimeFilter *)camel_mime_filter_charset_new_convert (charset, "UTF-8");
-			if (filter)
-				camel_stream_filter_add (filterstream, filter);
-		}
-	}
-
-	data_wrapper->stream = CAMEL_STREAM (filterstream);
-	data_wrapper->offline = FALSE;
-
-	camel_object_unref (CAMEL_OBJECT (imap_wrapper->folder));
-	imap_wrapper->folder = NULL;
-	g_free (imap_wrapper->uid);
-	imap_wrapper->uid = NULL;
-	g_free (imap_wrapper->part_spec);
-	imap_wrapper->part = NULL;
-
-	CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);
-
-	return parent_class->write_to_stream (data_wrapper, stream);
-
- lose:
-	CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);
-	errno = ENETUNREACH;
-	return -1;
-}
-
-
-CamelDataWrapper *
-camel_imap_wrapper_new (CamelFolder *folder, CamelContentType *type,
-			const char *uid, const char *part_spec,
-			CamelMimePart *part)
-{
-	CamelImapWrapper *imap_wrapper;
-
-	imap_wrapper = (CamelImapWrapper *)camel_object_new(camel_imap_wrapper_get_type());
-
-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (imap_wrapper), type);
-	((CamelDataWrapper *)imap_wrapper)->offline = TRUE;
-
-	imap_wrapper->folder = folder;
-	camel_object_ref (CAMEL_OBJECT (folder));
-	imap_wrapper->uid = g_strdup (uid);
-	imap_wrapper->part_spec = g_strdup (part_spec);
-
-	/* Don't ref this, it's our parent. */
-	imap_wrapper->part = part;
-
-	return (CamelDataWrapper *)imap_wrapper;
-}
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
deleted file mode 100644
index 8eb9d0969a..0000000000
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-wrapper.h: data wrapper for offline IMAP data */
-
-/*
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_WRAPPER_H
-#define CAMEL_IMAP_WRAPPER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-
-#define CAMEL_IMAP_WRAPPER_TYPE     (camel_imap_wrapper_get_type ())
-#define CAMEL_IMAP_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapper))
-#define CAMEL_IMAP_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapperClass))
-#define CAMEL_IS_IMAP_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_WRAPPER_TYPE))
-
-typedef struct
-{
-	CamelDataWrapper parent_object;
-
-	struct _CamelImapWrapperPrivate *priv;
-
-	CamelFolder *folder;
-	char *uid, *part_spec;
-	CamelMimePart *part;
-} CamelImapWrapper;
-
-typedef struct {
-	CamelDataWrapperClass parent_class;
-
-} CamelImapWrapperClass;
-
-/* Standard Camel function */
-CamelType camel_imap_wrapper_get_type (void);
-
-/* Constructor */
-CamelDataWrapper *camel_imap_wrapper_new (CamelFolder *folder,
-					  CamelContentType *type,
-					  const char *uid,
-					  const char *part_spec,
-					  CamelMimePart *part);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DATA_WRAPPER_H */
diff --git a/camel/providers/imap/libcamelimap.urls b/camel/providers/imap/libcamelimap.urls
deleted file mode 100644
index c301c0ffac..0000000000
--- a/camel/providers/imap/libcamelimap.urls
+++ /dev/null
@@ -1 +0,0 @@
-imap
diff --git a/camel/providers/local/.cvsignore b/camel/providers/local/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/providers/local/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
deleted file mode 100644
index 2e95021334..0000000000
--- a/camel/providers/local/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamellocalincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamellocal.la
-provider_DATA = libcamellocal.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-local-provider\"	
-
-libcamellocal_la_SOURCES = 			\
-	camel-local-folder.c			\
-	camel-local-store.c			\
-	camel-local-summary.c			\
-	camel-local-provider.c			\
-	camel-mh-folder.c			\
-	camel-mh-store.c			\
-	camel-mh-summary.c			\
-	camel-mbox-folder.c			\
-	camel-mbox-store.c			\
-	camel-mbox-summary.c			\
-	camel-maildir-folder.c			\
-	camel-maildir-store.c			\
-	camel-maildir-summary.c
-
-libcamellocalinclude_HEADERS =			\
-	camel-local-folder.h			\
-	camel-local-store.h			\
-	camel-local-summary.h			\
-	camel-mh-folder.h			\
-	camel-mh-store.h			\
-	camel-mh-summary.h			\
-	camel-mbox-folder.h			\
-	camel-mbox-store.h			\
-	camel-mbox-summary.h			\
-	camel-maildir-folder.h			\
-	camel-maildir-store.h			\
-	camel-maildir-summary.h
-
-noinst_HEADERS =				\
-	camel-local-private.h
-
-libcamellocal_la_LDFLAGS = -version-info 0:0:0
-
-libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamellocal.urls
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
deleted file mode 100644
index ea2894aa2e..0000000000
--- a/camel/providers/local/camel-local-folder.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- * 
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-local-folder.h"
-#include "camel-local-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-local-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-exception.h"
-
-#include "camel-local-private.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-static CamelFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelLocalFolder */
-#define CLOCALF_CLASS(so) CAMEL_LOCAL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CLOCALS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int local_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);
-static void local_unlock(CamelLocalFolder *lf);
-
-static void local_sync(CamelFolder *folder, gboolean expunge, CamelException *ex);
-static void local_expunge(CamelFolder *folder, CamelException *ex);
-
-static GPtrArray *local_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);
-static void local_search_free(CamelFolder *folder, GPtrArray * result);
-
-static void local_finalize(CamelObject * object);
-
-static void
-camel_local_folder_class_init(CamelLocalFolderClass * camel_local_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_local_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs(camel_folder_get_type()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = local_sync;
-	camel_folder_class->expunge = local_expunge;
-
-	camel_folder_class->search_by_expression = local_search_by_expression;
-	camel_folder_class->search_free = local_search_free;
-
-	camel_local_folder_class->lock = local_lock;
-	camel_local_folder_class->unlock = local_unlock;
-}
-
-static void
-local_init(gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-	CamelLocalFolder *local_folder = object;
-
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-
-	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
-	    CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |
-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;
-
-	folder->summary = NULL;
-	local_folder->search = NULL;
-
-	local_folder->priv = g_malloc0(sizeof(*local_folder->priv));
-#ifdef ENABLE_THREADS
-	local_folder->priv->search_lock = g_mutex_new();
-#endif
-}
-
-static void
-local_finalize(CamelObject * object)
-{
-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(object);
-	CamelFolder *folder = (CamelFolder *)object;
-
-	if (folder->summary) {
-		camel_local_summary_sync((CamelLocalSummary *)folder->summary, FALSE, local_folder->changes, NULL);
-		camel_object_unref((CamelObject *)folder->summary);
-		folder->summary = NULL;
-	}
-
-	if (local_folder->search) {
-		camel_object_unref((CamelObject *)local_folder->search);
-	}
-
-	/* must free index after summary, since it isn't refcounted */
-	if (local_folder->index)
-		ibex_close(local_folder->index);
-
-	while (local_folder->locked> 0)
-		camel_local_folder_unlock(local_folder);
-
-	g_free(local_folder->base_path);
-	g_free(local_folder->folder_path);
-	g_free(local_folder->summary_path);
-	g_free(local_folder->index_path);
-
-	camel_folder_change_info_free(local_folder->changes);
-
-#ifdef ENABLE_THREADS
-	g_mutex_free(local_folder->priv->search_lock);
-#endif
-	g_free(local_folder->priv);
-}
-
-CamelType camel_local_folder_get_type(void)
-{
-	static CamelType camel_local_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_local_folder_type == CAMEL_INVALID_TYPE) {
-		camel_local_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelLocalFolder",
-							     sizeof(CamelLocalFolder),
-							     sizeof(CamelLocalFolderClass),
-							     (CamelObjectClassInitFunc) camel_local_folder_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) local_init,
-							     (CamelObjectFinalizeFunc) local_finalize);
-	}
-
-	return camel_local_folder_type;
-}
-
-CamelLocalFolder *
-camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolderInfo *fi;
-	CamelFolder *folder;
-	const char *root_dir_path, *name;
-	struct stat st;
-	int forceindex;
-
-	folder = (CamelFolder *)lf;
-
-	name = strrchr(full_name, '/');
-	if (name)
-		name++;
-	else
-		name = full_name;
-
-	camel_folder_construct(folder, parent_store, full_name, name);
-
-	root_dir_path = camel_local_store_get_toplevel_dir(CAMEL_LOCAL_STORE(folder->parent_store));
-
-	lf->base_path = g_strdup(root_dir_path);
-	lf->folder_path = g_strdup_printf("%s/%s", root_dir_path, full_name);
-	lf->summary_path = g_strdup_printf("%s/%s.ev-summary", root_dir_path, full_name);
-	lf->index_path = g_strdup_printf("%s/%s.ibex", root_dir_path, full_name);
-
-	lf->changes = camel_folder_change_info_new();
-
-	/* if we have no index file, force it */
-	forceindex = stat(lf->index_path, &st) == -1;
-	if (flags & CAMEL_STORE_FOLDER_BODY_INDEX) {
-
-		lf->index = ibex_open(lf->index_path, O_CREAT | O_RDWR, 0600);
-		if (lf->index == NULL) {
-			/* yes, this isn't fatal at all */
-			g_warning("Could not open/create index file: %s: indexing not performed", strerror(errno));
-			forceindex = FALSE;
-			/* record that we dont have an index afterall */
-			flags &= ~CAMEL_STORE_FOLDER_BODY_INDEX;
-		}
-	} else {
-		/* if we do have an index file, remove it */
-		if (forceindex == FALSE) {
-			unlink(lf->index_path);
-		}
-		forceindex = FALSE;
-	}
-
-	lf->flags = flags;
-
-	folder->summary = (CamelFolderSummary *)CLOCALF_CLASS(lf)->create_summary(lf->summary_path, lf->folder_path, lf->index);
-	if (camel_local_summary_load((CamelLocalSummary *)folder->summary, forceindex, ex) == -1) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-	
-	fi = g_new0 (CamelFolderInfo, 1);
-	fi->full_name = g_strdup (full_name);
-	fi->name = g_strdup (name);
-	fi->url = g_strdup (lf->folder_path);
-	fi->unread_message_count = -1;
-	
-	camel_object_trigger_event (CAMEL_OBJECT (parent_store),
-				    "folder_deleted", fi);
-	
-	camel_folder_info_free (fi);
-	
-	return lf;
-}
-
-/* lock the folder, may be called repeatedly (with matching unlock calls),
-   with type the same or less than the first call */
-int camel_local_folder_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)
-{
-	if (lf->locked > 0) {
-		/* lets be anal here - its important the code knows what its doing */
-		g_assert(lf->locktype == type || lf->locktype == CAMEL_LOCK_WRITE);
-	} else {
-		if (CLOCALF_CLASS(lf)->lock(lf, type, ex) == -1)
-			return -1;
-		lf->locktype = type;
-	}
-
-	lf->locked++;
-
-	return 0;
-}
-
-/* unlock folder */
-int camel_local_folder_unlock(CamelLocalFolder *lf)
-{
-	g_assert(lf->locked>0);
-	lf->locked--;
-	if (lf->locked == 0)
-		CLOCALF_CLASS(lf)->unlock(lf);
-
-	return 0;
-}
-
-static int
-local_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)
-{
-	return 0;
-}
-
-static void
-local_unlock(CamelLocalFolder *lf)
-{
-	/* nothing */
-}
-
-static void
-local_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelLocalFolder *lf = CAMEL_LOCAL_FOLDER(folder);
-
-	d(printf("local sync, expunge=%s\n", expunge?"true":"false"));
-
-	if (camel_local_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)
-		return;
-
-	/* if sync fails, we'll pass it up on exit through ex */
-	camel_local_summary_sync((CamelLocalSummary *)folder->summary, expunge, lf->changes, ex);
-	camel_local_folder_unlock(lf);
-
-	if (camel_folder_change_info_changed(lf->changes)) {
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", lf->changes);
-		camel_folder_change_info_clear(lf->changes);
-	}
-
-	/* force save of metadata */
-	if (lf->index)
-		ibex_save(lf->index);
-	if (folder->summary)
-		camel_folder_summary_save(folder->summary);
-}
-
-static void
-local_expunge(CamelFolder *folder, CamelException *ex)
-{
-	d(printf("expunge\n"));
-
-	/* Just do a sync with expunge, serves the same purpose */
-	/* call the callback directly, to avoid locking problems */
-	CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))->sync(folder, TRUE, ex);
-}
-
-static GPtrArray *
-local_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(folder);
-	GPtrArray *summary, *matches;
-
-	/* NOTE: could get away without the search lock by creating a new
-	   search object each time */
-
-	CAMEL_LOCAL_FOLDER_LOCK(folder, search_lock);
-
-	if (local_folder->search == NULL)
-		local_folder->search = camel_folder_search_new();
-
-	camel_folder_search_set_folder(local_folder->search, folder);
-	camel_folder_search_set_body_index(local_folder->search, local_folder->index);
-	summary = camel_folder_get_summary(folder);
-	camel_folder_search_set_summary(local_folder->search, summary);
-
-	matches = camel_folder_search_execute_expression(local_folder->search, expression, ex);
-
-	CAMEL_LOCAL_FOLDER_UNLOCK(folder, search_lock);
-
-	camel_folder_free_summary(folder, summary);
-
-	return matches;
-}
-
-static void
-local_search_free(CamelFolder *folder, GPtrArray * result)
-{
-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(folder);
-
-	/* we need to lock this free because of the way search_free_result works */
-	/* FIXME: put the lock inside search_free_result */
-	CAMEL_LOCAL_FOLDER_LOCK(folder, search_lock);
-
-	camel_folder_search_free_result(local_folder->search, result);
-
-	CAMEL_LOCAL_FOLDER_UNLOCK(folder, search_lock);
-}
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
deleted file mode 100644
index 7c975c8f7a..0000000000
--- a/camel/providers/local/camel-local-folder.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Author: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_LOCAL_FOLDER_H
-#define CAMEL_LOCAL_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-search.h>
-#include <libibex/ibex.h>
-#include "camel-local-summary.h"
-#include "camel-lock.h"
-
-/*  #include "camel-store.h" */
-
-#define CAMEL_LOCAL_FOLDER_TYPE     (camel_local_folder_get_type ())
-#define CAMEL_LOCAL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_LOCAL_FOLDER_TYPE, CamelLocalFolder))
-#define CAMEL_LOCAL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_FOLDER_TYPE, CamelLocalFolderClass))
-#define CAMEL_IS_LOCAL_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_FOLDER_TYPE))
-
-typedef struct {
-	CamelFolder parent_object;
-	struct _CamelLocalFolderPrivate *priv;
-
-	guint32 flags;		/* open mode flags */
-
-	int locked;		/* lock counter */
-	CamelLockType locktype;	/* what type of lock we have */
-
-	char *base_path;	/* base path of the local folder */
-	char *folder_path;	/* the path to the folder itself */
-	char *summary_path;	/* where the summary lives */
-	char *index_path;	/* where the index file lives */
-
-	ibex *index;		   /* index for this folder */
-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */
-	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */
-} CamelLocalFolder;
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-
-	/* summary factory, only used at init */
-	CamelLocalSummary *(*create_summary)(const char *path, const char *folder, ibex *index);
-
-	/* Lock the folder for my operations */
-	int (*lock)(CamelLocalFolder *, CamelLockType type, CamelException *ex);
-
-	/* Unlock the folder for my operations */
-	void (*unlock)(CamelLocalFolder *);
-} CamelLocalFolderClass;
-
-
-/* public methods */
-/* flags are taken from CAMEL_STORE_FOLDER_* flags */
-CamelLocalFolder *camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store,
-					       const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_local_folder_get_type(void);
-
-/* Lock the folder for internal use.  May be called repeatedly */
-/* UNIMPLEMENTED */
-int camel_local_folder_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);
-int camel_local_folder_unlock(CamelLocalFolder *lf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_LOCAL_FOLDER_H */
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
deleted file mode 100644
index 1d1a89ea27..0000000000
--- a/camel/providers/local/camel-local-private.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *  camel-local-private.h: Private info for local provider.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
-
-#include "config.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-struct _CamelLocalFolderPrivate {
-#ifdef ENABLE_THREADS
-	GMutex *search_lock;	/* for locking the search object */
-#endif
-};
-
-#ifdef ENABLE_THREADS
-#define CAMEL_LOCAL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelLocalFolder *)f)->priv->l))
-#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelLocalFolder *)f)->priv->l))
-#else
-#define CAMEL_LOCAL_FOLDER_LOCK(f, l)
-#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_H */
-
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
deleted file mode 100644
index 2d66d59503..0000000000
--- a/camel/providers/local/camel-local-provider.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * 
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 2000 HelixCode (www.helixcode.com).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <stdio.h>
-
-#include "config.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-#include "camel-mh-store.h"
-#include "camel-mbox-store.h"
-#include "camel-maildir-store.h"
-
-static CamelProvider mh_provider = {
-	"mh",
-	N_("MH-format mail directories"),
-	N_("For storing local mail in MH-like mail directories"),
-	"mail",
-	CAMEL_PROVIDER_IS_STORAGE,
-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,
-	{0, 0},
-	NULL
-};
-
-static CamelProvider mbox_provider = {
-	"mbox",
-	N_("Standard Unix mailbox file"),
-	N_("For storing local mail in standard mbox format"),
-	"mail",
-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,
-	{ 0, 0 },
-	NULL
-};
-
-static CamelProvider maildir_provider = {
-	"maildir",
-	N_("Qmail maildir-format mail files"),
-	N_("For storing local mail in qmail maildir directories"),
-	"mail",
-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,
-	{ 0, 0 },
-	NULL
-};
-
-void camel_provider_module_init(CamelSession * session)
-{
-	mh_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mh_store_get_type();
-	mh_provider.service_cache = g_hash_table_new(camel_url_hash, camel_url_equal);
-	camel_session_register_provider(session, &mh_provider);
-
-	mbox_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mbox_store_get_type();
-	mbox_provider.service_cache = g_hash_table_new(camel_url_hash, camel_url_equal);
-	camel_session_register_provider(session, &mbox_provider);
-
-	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type();
-	maildir_provider.service_cache = g_hash_table_new(camel_url_hash, camel_url_equal);
-	camel_session_register_provider(session, &maildir_provider);
-}
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
deleted file mode 100644
index 34da035301..0000000000
--- a/camel/providers/local/camel-local-store.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#include "camel-local-store.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-#define d(x)
-
-/* Returns the class for a CamelLocalStore */
-#define CLOCALS_CLASS(so) CAMEL_LOCAL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex);
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);
-static char *get_name(CamelService *service, gboolean brief);
-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);
-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);
-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex);
-
-static CamelStoreClass *parent_class = NULL;
-
-static void
-camel_local_store_class_init (CamelLocalStoreClass *camel_local_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_local_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_local_store_class);
-	
-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));
-
-	/* virtual method overload */
-	camel_service_class->construct = construct;
-	camel_service_class->get_name = get_name;
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_inbox = get_inbox;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-}
-
-CamelType
-camel_local_store_get_type (void)
-{
-	static CamelType camel_local_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_local_store_type == CAMEL_INVALID_TYPE)	{
-		camel_local_store_type = camel_type_register (CAMEL_STORE_TYPE, "CamelLocalStore",
-							     sizeof (CamelLocalStore),
-							     sizeof (CamelLocalStoreClass),
-							     (CamelObjectClassInitFunc) camel_local_store_class_init,
-							     NULL,
-							     NULL,
-							     NULL);
-	}
-	
-	return camel_local_store_type;
-}
-
-static void
-construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex)
-{
-	int len;
-
-	CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	len = strlen (service->url->path);
-	if (service->url->path[len - 1] != '/') {
-		service->url->path = g_realloc (service->url->path, len + 2);
-		strcpy (service->url->path + len, "/");
-	}
-}
-
-const char *
-camel_local_store_get_toplevel_dir (CamelLocalStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-
-	g_assert (url != NULL);
-	return url->path;
-}
-
-static CamelFolder *
-get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)
-{
-	struct stat st;
-	char *path = ((CamelService *)store)->url->path;
-	char *sub, *slash;
-
-	if (path[0] != '/') {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("Store root %s is not an absolute path"), path);
-		return NULL;
-	}
-
-	if (stat(path, &st) == 0) {
-		if (!S_ISDIR(st.st_mode)) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Store root %s is not a regular directory"), path);
-		}
-		return NULL;
-	}
-
-	if (errno != ENOENT
-	    || (flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("Cannot get folder: %s: %s"), path, strerror(errno));
-		return NULL;
-	}
-
-	/* need to create the dir heirarchy */
-	sub = alloca(strlen(path)+1);
-	strcpy(sub, path);
-	slash = sub;
-	do {
-		slash = strchr(slash+1, '/');
-		if (slash)
-			*slash = 0;
-		if (stat(sub, &st) == -1) {
-			if (errno != ENOENT
-			    || mkdir(sub, 0700) == -1) {
-				camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-						     _("Cannot get folder: %s: %s"), path, strerror(errno));
-				return NULL;
-			}
-		}
-		if (slash)
-			*slash = '/';
-	} while (slash);
-
-	return NULL;
-}
-
-static CamelFolder *
-get_inbox(CamelStore *store, CamelException *ex)
-{
-	camel_exception_set(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-			    _("Local stores do not have an inbox"));
-	return NULL;
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup (service->url->path);
-	else
-		return g_strdup_printf (_("Local mail file %s"), service->url->path);
-}
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only,
-		 CamelException *ex)
-{
-	/* FIXME: This is broken, but it corresponds to what was
-	 * there before.
-	 */
-	return NULL;
-}
-
-static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, int missingok, CamelException *ex)
-{
-	struct stat st;
-	char *old = g_strconcat(prefix, oldp, suffix, 0);
-	char *new = g_strconcat(prefix, newp, suffix, 0);
-	int ret = -1;
-	int err = 0;
-
-	d(printf("renaming %s%s to %s%s\n", oldp, suffix, newp, suffix));
-
-	if (stat(old, &st) == -1) {
-		if (missingok && errno == ENOENT) {
-			ret = 0;
-		} else {
-			err = errno;
-			ret = -1;
-		}
-	} else if (S_ISDIR(st.st_mode)) { /* use rename for dirs */
-		if (rename(old, new) == 0
-		    || stat(new, &st) == 0) {
-			ret = 0;
-		} else {
-			err = errno;
-			ret = -1;
-		}
-	} else if (link(old, new) == 0 /* and link for files */
-		   || (stat(new, &st) == 0 && st.st_nlink == 2)) {
-		if (unlink(old) == 0) {
-			ret = 0;
-		} else {
-			err = errno;
-			unlink(new);
-			ret = -1;
-		}
-	} else {
-		err = errno;
-		ret = -1;
-	}
-
-	if (ret == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not rename folder %s to %s: %s"),
-				     old, new, strerror(err));
-	}
-
-	g_free(old);
-	g_free(new);
-	return ret;
-}
-
-/* default implementation, rename all */
-static void
-rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)
-{
-	char *path = CAMEL_SERVICE (store)->url->path;
-
-	/* try to rollback failures, has obvious races */
-	if (xrename(old, new, path, ".ibex", TRUE, ex)) {
-		return;
-	}
-	if (xrename(old, new, path, ".ev-summary", TRUE, ex)) {
-		xrename(new, old, path, ".ibex", TRUE, ex);
-		return;
-	}
-	if (xrename(old, new, path, "", FALSE, ex)) {
-		xrename(new, old, path, ".ev-summary", TRUE, ex);
-		xrename(new, old, path, ".ibex", TRUE, ex);
-	}
-}
-
-/* default implementation, only delete metadata */
-static void
-delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	CamelFolderInfo *fi;
-	char *name;
-	char *str;
-
-	/* remove metadata only */
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-	str = g_strdup_printf("%s.ev-summary", name);
-	if (unlink(str) == -1 && errno != ENOENT) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder summary file `%s': %s"),
-				     str, strerror(errno));
-		g_free(str);
-		g_free (name);
-		return;
-	}
-	g_free(str);
-	str = g_strdup_printf("%s.ibex", name);
-	if (unlink(str) == -1 && errno != ENOENT) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder index file `%s': %s"),
-				     str, strerror(errno));
-		g_free(str);
-		g_free (name);
-		return;
-	}
-	g_free(str);
-	g_free(name);
-	
-	fi = g_new0 (CamelFolderInfo, 1);
-	fi->full_name = g_strdup (folder_name);
-	fi->name = g_strdup (g_basename (folder_name));
-	fi->url = g_strdup_printf ("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-	fi->unread_message_count = -1;
-	
-	camel_object_trigger_event (CAMEL_OBJECT (store),
-				    "folder_deleted", fi);
-	
-	camel_folder_info_free (fi);
-}
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
deleted file mode 100644
index 9335b73eaa..0000000000
--- a/camel/providers/local/camel-local-store.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-store.h : class for an mbox store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <bertrand@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_LOCAL_STORE_H
-#define CAMEL_LOCAL_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-store.h"
-
-#define CAMEL_LOCAL_STORE_TYPE     (camel_local_store_get_type ())
-#define CAMEL_LOCAL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_LOCAL_STORE_TYPE, CamelLocalStore))
-#define CAMEL_LOCAL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_STORE_TYPE, CamelLocalStoreClass))
-#define CAMEL_IS_LOCAL_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_STORE_TYPE))
-
-
-typedef struct {
-	CamelStore parent_object;	
-	
-} CamelLocalStore;
-
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-} CamelLocalStoreClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_local_store_get_type (void);
-
-const gchar *camel_local_store_get_toplevel_dir (CamelLocalStore *store);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_LOCAL_STORE_H */
-
-
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
deleted file mode 100644
index 869b7c712a..0000000000
--- a/camel/providers/local/camel-local-summary.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-local-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define io(x)
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-#define CAMEL_LOCAL_SUMMARY_VERSION (0x200)
-
-struct _CamelLocalSummaryPrivate {
-};
-
-#define _PRIVATE(o) (((CamelLocalSummary *)(o))->priv)
-
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
-
-static int local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi);
-static char *local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi);
-
-static int local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);
-static int local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static int local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static CamelMessageInfo *local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);
-
-static void camel_local_summary_class_init (CamelLocalSummaryClass *klass);
-static void camel_local_summary_init       (CamelLocalSummary *obj);
-static void camel_local_summary_finalise   (CamelObject *obj);
-static CamelFolderSummaryClass *camel_local_summary_parent;
-
-CamelType
-camel_local_summary_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_folder_summary_get_type(), "CamelLocalSummary",
-					   sizeof (CamelLocalSummary),
-					   sizeof (CamelLocalSummaryClass),
-					   (CamelObjectClassInitFunc) camel_local_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_local_summary_init,
-					   (CamelObjectFinalizeFunc) camel_local_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_local_summary_class_init(CamelLocalSummaryClass *klass)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;
-	
-	camel_local_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));
-
-	sklass->message_info_new  = message_info_new;
-
-	klass->load = local_summary_load;
-	klass->check = local_summary_check;
-	klass->sync = local_summary_sync;
-	klass->add = local_summary_add;
-
-	klass->encode_x_evolution = local_summary_encode_x_evolution;
-	klass->decode_x_evolution = local_summary_decode_x_evolution;
-}
-
-static void
-camel_local_summary_init(CamelLocalSummary *obj)
-{
-	struct _CamelLocalSummaryPrivate *p;
-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelMessageInfo);
-	s->content_info_size = sizeof(CamelMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_LOCAL_SUMMARY_VERSION;
-}
-
-static void
-camel_local_summary_finalise(CamelObject *obj)
-{
-	CamelLocalSummary *mbs = CAMEL_LOCAL_SUMMARY(obj);
-
-	g_free(mbs->folder_path);
-}
-
-void
-camel_local_summary_construct(CamelLocalSummary *new, const char *filename, const char *local_name, ibex *index)
-{
-	camel_folder_summary_set_build_content(CAMEL_FOLDER_SUMMARY(new), FALSE);
-	camel_folder_summary_set_filename(CAMEL_FOLDER_SUMMARY(new), filename);
-	new->folder_path = g_strdup(local_name);
-	new->index = index;
-}
-
-static int
-local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)
-{
-	return camel_folder_summary_load((CamelFolderSummary *)cls);
-}
-
-/* load/check the summary */
-int
-camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)
-{
-	struct stat st;
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-
-	d(printf("Loading summary ...\n"));
-
-	if (forceindex
-	    || stat(s->summary_path, &st) == -1
-	    || ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->load(cls, forceindex, ex) == -1) {
-		camel_folder_summary_clear((CamelFolderSummary *)cls);
-	}
-
-	if (camel_local_summary_check(cls, NULL, ex) == 0) {
-		if (camel_folder_summary_save(s) == -1)
-			g_warning("Could not save summary for %s: %s", cls->folder_path, strerror(errno));
-		if (cls->index && ibex_save(cls->index) == -1)
-			g_warning("Could not sync index for %s: %s", cls->folder_path, strerror(errno));
-
-		return 0;
-	}
-	return -1;
-}
-
-char *
-camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *info)
-{
-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->encode_x_evolution(cls, info);
-}
-
-int
-camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info)
-{
-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->decode_x_evolution(cls, xev, info);
-}
-
-/*#define DOSTATS*/
-#ifdef DOSTATS
-struct _stat_info {
-	int mitotal;
-	int micount;
-	int citotal;
-	int cicount;
-	int msgid;
-	int msgcount;
-};
-
-static void
-do_stat_ci(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageContentInfo *ci)
-{
-	info->cicount++;
-	info->citotal += ((CamelFolderSummary *)cls)->content_info_size /*+ 4 memchunks are 1/4 byte overhead per mi */;
-	if (ci->id)
-		info->citotal += strlen(ci->id) + 4;
-	if (ci->description)
-		info->citotal += strlen(ci->description) + 4;
-	if (ci->encoding)
-		info->citotal += strlen(ci->encoding) + 4;
-	if (ci->type) {
-		struct _header_content_type *ct = ci->type;
-		struct _header_param *param;
-
-		info->citotal += sizeof(*ct) + 4;
-		if (ct->type)
-			info->citotal += strlen(ct->type) + 4;
-		if (ct->subtype)
-			info->citotal += strlen(ct->subtype) + 4;
-		param = ct->params;
-		while (param) {
-			info->citotal += sizeof(*param) + 4;
-			if (param->name)
-				info->citotal += strlen(param->name)+4;
-			if (param->value)
-				info->citotal += strlen(param->value)+4;
-			param = param->next;
-		}
-	}
-	ci = ci->childs;
-	while (ci) {
-		do_stat_ci(cls, info, ci);
-		ci = ci->next;
-	}
-}
-
-static void
-do_stat_mi(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageInfo *mi)
-{
-	info->micount++;
-	info->mitotal += ((CamelFolderSummary *)cls)->content_info_size /*+ 4*/;
-
-	if (mi->subject)
-		info->mitotal += strlen(mi->subject) + 4;
-	if (mi->to)
-		info->mitotal += strlen(mi->to) + 4;
-	if (mi->from)
-		info->mitotal += strlen(mi->from) + 4;
-	if (mi->cc)
-		info->mitotal += strlen(mi->cc) + 4;
-	if (mi->uid)
-		info->mitotal += strlen(mi->uid) + 4;
-
-	if (mi->references) {
-		info->mitotal += (mi->references->size-1) * sizeof(CamelSummaryMessageID) + sizeof(CamelSummaryReferences) + 4;
-		info->msgid += (mi->references->size) * sizeof(CamelSummaryMessageID);
-		info->msgcount += mi->references->size;
-	}
-
-	/* dont have any user flags yet */
-
-	if (mi->content) {
-		do_stat_ci(cls, info, mi->content);
-	}
-}
-
-#endif
-
-int
-camel_local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	int ret;
-
-	ret = ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->check(cls, changeinfo, ex);
-
-#ifdef DOSTATS
-	if (ret != -1) {
-		int i;
-		CamelFolderSummary *s = (CamelFolderSummary *)cls;
-		struct _stat_info stats = { 0 };
-
-		for (i=0;i<camel_folder_summary_count(s);i++) {
-			CamelMessageInfo *info = camel_folder_summary_index(s, i);
-			do_stat_mi(cls, &stats, info);
-			camel_folder_summary_info_free(s, info);
-		}
-
-		printf("\nMemory used by summary:\n\n");
-		printf("Total of %d messages\n", camel_folder_summary_count(s)); 
-		printf("Total: %d bytes (ave %f)\n", stats.citotal + stats.mitotal,
-		       (double)(stats.citotal+stats.mitotal)/(double)camel_folder_summary_count(s));
-		printf("Message Info: %d (ave %f)\n", stats.mitotal, (double)stats.mitotal/(double)stats.micount);
-		printf("Content Info; %d (ave %f) count %d\n", stats.citotal, (double)stats.citotal/(double)stats.cicount, stats.cicount);
-		printf("message id's: %d (ave %f) count %d\n", stats.msgid, (double)stats.msgid/(double)stats.msgcount, stats.msgcount);
-	}
-#endif
-	return ret;
-}
-
-int
-camel_local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->sync(cls, expunge, changeinfo, ex);
-}
-
-CamelMessageInfo *
-camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)
-{
-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->add(cls, msg, info, ci, ex);
-}
-
-/**
- * camel_local_summary_write_headers:
- * @fd: 
- * @header: 
- * @xevline: 
- * 
- * Write a bunch of headers to the file @fd.  IF xevline is non NULL, then
- * an X-Evolution header line is created at the end of all of the headers.
- * The headers written are termianted with a blank line.
- * 
- * Return value: -1 on error, otherwise the number of bytes written.
- **/
-int
-camel_local_summary_write_headers(int fd, struct _header_raw *header, char *xevline)
-{
-	int outlen = 0, len;
-	int newfd;
-	FILE *out;
-
-	/* dum de dum, maybe the whole sync function should just use stdio for output */
-	newfd = dup(fd);
-	if (newfd == -1)
-		return -1;
-
-	out = fdopen(newfd, "w");
-	if (out == NULL) {
-		close(newfd);
-		errno = EINVAL;
-		return -1;
-	}
-
-	while (header) {
-		if (strcmp(header->name, "X-Evolution")) {
-			len = fprintf(out, "%s:%s\n", header->name, header->value);
-			if (len == -1) {
-				fclose(out);
-				return -1;
-			}
-			outlen += len;
-		}
-		header = header->next;
-	}
-
-	if (xevline) {
-		len = fprintf(out, "X-Evolution: %s\n\n", xevline);
-		if (len == -1) {
-			fclose(out);
-			return -1;
-		}
-		outlen += len;
-	}
-
-	if (fclose(out) == -1)
-		return -1;
-
-	return outlen;
-}
-
-static int
-local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	/* FIXME: sync index here ? */
-	return 0;
-}
-
-static int
-local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	return 0;
-}
-
-static CamelMessageInfo *
-local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)
-{
-	CamelMessageInfo *mi;
-	char *xev;
-
-	d(printf("Adding message to summary\n"));
-	
-	mi = camel_folder_summary_add_from_message((CamelFolderSummary *)cls, msg);
-	if (mi) {
-		d(printf("Added, uid = %s\n", mi->uid));
-		if (info) {
-			CamelTag *tag = info->user_tags;
-			CamelFlag *flag = info->user_flags;
-
-			while (flag) {
-				camel_flag_set(&mi->user_flags, flag->name, TRUE);
-				flag = flag->next;
-			}
-			
-			while (tag) {
-				camel_tag_set(&mi->user_tags, tag->name, tag->value);
-				tag = tag->next;
-			}
-
-			mi->flags = mi->flags | (info->flags & 0xffff);
-		}
-		mi->flags &= ~(CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED);
-		xev = camel_local_summary_encode_x_evolution(cls, mi);
-		camel_medium_set_header((CamelMedium *)msg, "X-Evolution", xev);
-		g_free(xev);
-		camel_folder_change_info_add_uid(ci, camel_message_info_uid(mi));
-	} else {
-		d(printf("Failed!\n"));
-		camel_exception_set(ex, 1, "Unable to add message to summary: unknown reason");
-	}
-	return mi;
-}
-
-static char *
-local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi)
-{
-	GString *out = g_string_new("");
-	struct _header_param *params = NULL;
-	GString *val = g_string_new("");
-	CamelFlag *flag = mi->user_flags;
-	CamelTag *tag = mi->user_tags;
-	char *ret;
-	const char *p, *uidstr;
-	guint32 uid;
-
-	/* FIXME: work out what to do with uid's that aren't stored here? */
-	/* FIXME: perhaps make that a mbox folder only issue?? */
-	p = uidstr = camel_message_info_uid(mi);
-	while (*p && isdigit(*p))
-		p++;
-	if (*p == 0 && sscanf(uidstr, "%u", &uid) == 1) {
-		g_string_sprintf(out, "%08x-%04x", uid, mi->flags & 0xffff);
-	} else {
-		g_string_sprintf(out, "%s-%04x", uidstr, mi->flags & 0xffff);
-	}
-
-	if (flag || tag) {
-		val = g_string_new("");
-
-		if (flag) {
-			while (flag) {
-				g_string_append(val, flag->name);
-				if (flag->next)
-					g_string_append_c(val, ',');
-				flag = flag->next;
-			}
-			header_set_param(&params, "flags", val->str);
-			g_string_truncate(val, 0);
-		}
-		if (tag) {
-			while (tag) {
-				g_string_append(val, tag->name);
-				g_string_append_c(val, '=');
-				g_string_append(val, tag->value);
-				if (tag->next)
-					g_string_append_c(val, ',');
-				tag = tag->next;
-			}
-			header_set_param(&params, "tags", val->str);
-		}
-		g_string_free(val, TRUE);
-		header_param_list_format_append(out, params);
-		header_param_list_free(params);
-	}
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static int
-local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi)
-{
-	struct _header_param *params, *scan;
-	guint32 uid, flags;
-	char *header;
-	int i;
-
-	/* check for uid/flags */
-	header = header_token_decode(xev);
-	if (header && strlen(header) == strlen("00000000-0000")
-	    && sscanf(header, "%08x-%04x", &uid, &flags) == 2) {
-		char uidstr[20];
-		if (mi) {
-			sprintf(uidstr, "%u", uid);
-			camel_message_info_set_uid(mi, g_strdup(uidstr));
-			mi->flags = flags;
-		}
-	} else {
-		g_free(header);
-		return -1;
-	}
-	g_free(header);
-
-	if (mi == NULL)
-		return 0;
-
-	/* check for additional data */	
-	header = strchr(xev, ';');
-	if (header) {
-		params = header_param_list_decode(header+1);
-		scan = params;
-		while (scan) {
-			if (!strcasecmp(scan->name, "flags")) {
-				char **flagv = g_strsplit(scan->value, ",", 1000);
-
-				for (i=0;flagv[i];i++) {
-					camel_flag_set(&mi->user_flags, flagv[i], TRUE);
-				}
-				g_strfreev(flagv);
-			} else if (!strcasecmp(scan->name, "tags")) {
-				char **tagv = g_strsplit(scan->value, ",", 10000);
-				char *val;
-
-				for (i=0;tagv[i];i++) {
-					val = strchr(tagv[i], '=');
-					if (val) {
-						*val++ = 0;
-						camel_tag_set(&mi->user_tags, tagv[i], val);
-						val[-1]='=';
-					}
-				}
-				g_strfreev(tagv);
-			}
-			scan = scan->next;
-		}
-		header_param_list_free(params);
-	}
-	return 0;
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	CamelLocalSummary *cls = (CamelLocalSummary *)s;
-
-	mi = ((CamelFolderSummaryClass *)camel_local_summary_parent)->message_info_new(s, h);
-	if (mi) {
-		const char *xev;
-		int doindex = FALSE;
-
-		xev = header_raw_find(&h, "X-Evolution", NULL);
-		if (xev==NULL || camel_local_summary_decode_x_evolution(cls, xev, mi) == -1) {
-			/* to indicate it has no xev header */
-			mi->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV;
-			camel_message_info_set_uid(mi, camel_folder_summary_next_uid_string(s));
-
-			/* shortcut, no need to look it up in the index library */
-			doindex = TRUE;
-		}
-		
-		if (cls->index
-		    && (doindex
-			|| cls->index_force
-			|| !ibex_contains_name(cls->index, (char *)camel_message_info_uid(mi)))) {
-			d(printf("Am indexing message %s\n", camel_message_info_uid(mi)));
-			camel_folder_summary_set_index(s, cls->index);
-		} else {
-			d(printf("Not indexing message %s\n", camel_message_info_uid(mi)));
-			camel_folder_summary_set_index(s, NULL);
-		}
-	}
-	
-	return mi;
-}
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
deleted file mode 100644
index 332175b451..0000000000
--- a/camel/providers/local/camel-local-summary.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_LOCAL_SUMMARY_H
-#define _CAMEL_LOCAL_SUMMARY_H
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_LOCAL_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_local_summary_get_type (), CamelLocalSummary)
-#define CAMEL_LOCAL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_local_summary_get_type (), CamelLocalSummaryClass)
-#define CAMEL_IS_LOCAL_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_local_summary_get_type ())
-
-typedef struct _CamelLocalSummary      CamelLocalSummary;
-typedef struct _CamelLocalSummaryClass CamelLocalSummaryClass;
-
-/* extra summary flags */
-enum {
-	CAMEL_MESSAGE_FOLDER_NOXEV = 1<<17,
-	CAMEL_MESSAGE_FOLDER_XEVCHANGE = 1<<18,
-};
-
-struct _CamelLocalSummary {
-	CamelFolderSummary parent;
-
-	struct _CamelLocalSummaryPrivate *priv;
-
-	char *folder_path;	/* name of matching folder */
-
-	ibex *index;
-	int index_force;	/* do we force index during creation? */
-};
-
-struct _CamelLocalSummaryClass {
-	CamelFolderSummaryClass parent_class;
-
-	int (*load)(CamelLocalSummary *cls, int forceindex, CamelException *ex);
-	int (*check)(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-	int (*sync)(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-	CamelMessageInfo *(*add)(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);
-
-	char *(*encode_x_evolution)(CamelLocalSummary *cls, const CamelMessageInfo *info);
-	int (*decode_x_evolution)(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info);
-};
-
-guint	camel_local_summary_get_type	(void);
-void	camel_local_summary_construct	(CamelLocalSummary *new, const char *filename, const char *local_name, ibex *index);
-
-/* load/check the summary */
-int camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);
-/* check for new/removed messages */
-int camel_local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *, CamelException *ex);
-/* perform a folder sync or expunge, if needed */
-int camel_local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *, CamelException *ex);
-/* add a new message to the summary */
-CamelMessageInfo *camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);
-
-/* generate an X-Evolution header line */
-char *camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *info);
-int camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info);
-
-/* utility functions - write headers to a file with optional X-Evolution header */
-int camel_local_summary_write_headers(int fd, struct _header_raw *header, char *xevline);
-
-#endif /* ! _CAMEL_LOCAL_SUMMARY_H */
-
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
deleted file mode 100644
index c4d347d083..0000000000
--- a/camel/providers/local/camel-maildir-folder.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-maildir-folder.h"
-#include "camel-maildir-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-maildir-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-exception.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-static CamelLocalFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelMaildirFolder */
-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMAILDIRS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelLocalSummary *maildir_create_summary(const char *path, const char *folder, ibex *index);
-
-static void maildir_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);
-static CamelMimeMessage *maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);
-
-static void maildir_finalize(CamelObject * object);
-
-static void camel_maildir_folder_class_init(CamelObjectClass * camel_maildir_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_maildir_folder_class);
-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_maildir_folder_class;
-
-	parent_class = CAMEL_LOCAL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_local_folder_get_type()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->append_message = maildir_append_message;
-	camel_folder_class->get_message = maildir_get_message;
-
-	lclass->create_summary = maildir_create_summary;
-}
-
-static void maildir_init(gpointer object, gpointer klass)
-{
-	/*CamelFolder *folder = object;
-	  CamelMaildirFolder *maildir_folder = object;*/
-}
-
-static void maildir_finalize(CamelObject * object)
-{
-	/*CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(object);*/
-}
-
-CamelType camel_maildir_folder_get_type(void)
-{
-	static CamelType camel_maildir_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_maildir_folder_type == CAMEL_INVALID_TYPE) {
-		camel_maildir_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMaildirFolder",
-							   sizeof(CamelMaildirFolder),
-							   sizeof(CamelMaildirFolderClass),
-							   (CamelObjectClassInitFunc) camel_maildir_folder_class_init,
-							   NULL,
-							   (CamelObjectInitFunc) maildir_init,
-							   (CamelObjectFinalizeFunc) maildir_finalize);
-	}
- 
-	return camel_maildir_folder_type;
-}
-
-CamelFolder *
-camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	d(printf("Creating maildir folder: %s\n", full_name));
-
-	folder = (CamelFolder *)camel_object_new(CAMEL_MAILDIR_FOLDER_TYPE);
-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,
-							     parent_store, full_name, flags, ex);
-
-	return folder;
-}
-
-static CamelLocalSummary *maildir_create_summary(const char *path, const char *folder, ibex *index)
-{
-	return (CamelLocalSummary *)camel_maildir_summary_new(path, folder, index);
-}
-
-static void maildir_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex)
-{
-	CamelMaildirFolder *maildir_folder = (CamelMaildirFolder *)folder;
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelStream *output_stream;
-	CamelMessageInfo *mi;
-	CamelMaildirMessageInfo *mdi;
-	char *name, *dest;
-
-	d(printf("Appending message\n"));
-
-	/* add it to the summary/assign the uid, etc */
-	mi = camel_local_summary_add((CamelLocalSummary *)folder->summary, message, info, lf->changes, ex);
-	if (camel_exception_is_set(ex)) {
-		return;
-	}
-
-	mdi = (CamelMaildirMessageInfo *)mi;
-
-	d(printf("Appending message: uid is %s filename is %s\n", camel_message_info_uid(mi), mdi->filename));
-
-	/* write it out to tmp, use the uid we got from the summary */
-	name = g_strdup_printf("%s/tmp/%s", lf->folder_path, camel_message_info_uid(mi));
-	output_stream = camel_stream_fs_new_with_name(name, O_WRONLY|O_CREAT, 0600);
-	if (output_stream == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to maildir folder: %s: %s"), name, g_strerror(errno));
-		g_free(name);
-		return;
-	}
-
-	if (camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, output_stream) == -1
-	    || camel_stream_close(output_stream) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to maildir folder: %s: %s"), name, g_strerror(errno));
-		camel_object_unref((CamelObject *)output_stream);
-		unlink(name);
-		g_free(name);
-		return;
-	}
-
-	/* now move from tmp to cur (bypass new, does it matter?) */
-	dest = g_strdup_printf("%s/cur/%s", lf->folder_path, camel_maildir_info_filename(mdi));
-	if (rename(name, dest) == 1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to maildir folder: %s: %s"), name, g_strerror(errno));
-		camel_object_unref((CamelObject *)output_stream);	
-		unlink(name);
-		g_free(name);
-		g_free(dest);
-		return;
-	}
-
-	g_free(dest);
-	g_free(name);
-
-	camel_object_trigger_event((CamelObject *)folder, "folder_changed", ((CamelLocalFolder *)maildir_folder)->changes);
-	camel_folder_change_info_clear(((CamelLocalFolder *)maildir_folder)->changes);
-}
-
-static CamelMimeMessage *maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)
-{
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelMessageInfo *info;
-	char *name;
-	CamelMaildirMessageInfo *mdi;
-
-	d(printf("getting message: %s\n", uid));
-
-	/* get the message summary info */
-	if ((info = camel_folder_summary_uid(folder->summary, uid)) == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"), uid, _("No such message"));
-		return NULL;
-	}
-
-	mdi = (CamelMaildirMessageInfo *)info;
-
-	/* what do we do if the message flags (and :info data) changes?  filename mismatch - need to recheck I guess */
-	name = g_strdup_printf("%s/cur/%s", lf->folder_path, camel_maildir_info_filename(mdi));
-
-	camel_folder_summary_info_free(folder->summary, info);
-
-	if ((message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0)) == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),
-				     name, g_strerror(errno));
-		g_free(name);
-		return NULL;
-	}
-
-	message = camel_mime_message_new();
-	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, message_stream) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),
-				     name, _("Invalid message contents"));
-		g_free(name);
-		camel_object_unref((CamelObject *)message_stream);
-		camel_object_unref((CamelObject *)message);
-		return NULL;
-
-	}
-	camel_object_unref((CamelObject *)message_stream);
-	g_free(name);
-
-	return message;
-}
diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
deleted file mode 100644
index 5076e2f73c..0000000000
--- a/camel/providers/local/camel-maildir-folder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors:
- * 	Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MAILDIR_FOLDER_H
-#define CAMEL_MAILDIR_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-#include "camel-local-folder.h"
-
-#define CAMEL_MAILDIR_FOLDER_TYPE     (camel_maildir_folder_get_type ())
-#define CAMEL_MAILDIR_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolder))
-#define CAMEL_MAILDIR_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolderClass))
-#define CAMEL_IS_MAILDIR_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_FOLDER_TYPE))
-
-typedef struct {
-	CamelLocalFolder parent_object;
-
-} CamelMaildirFolder;
-
-typedef struct {
-	CamelLocalFolderClass parent_class;
-	
-	/* Virtual methods */
-	
-} CamelMaildirFolderClass;
-
-/* public methods */
-CamelFolder *camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_maildir_folder_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MAILDIR_FOLDER_H */
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
deleted file mode 100644
index d419095ea0..0000000000
--- a/camel/providers/local/camel-maildir-store.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <dirent.h>
-
-#include "camel-maildir-store.h"
-#include "camel-maildir-folder.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-static CamelLocalStoreClass *parent_class = NULL;
-
-/* Returns the class for a CamelMaildirStore */
-#define CMAILDIRS_CLASS(so) CAMEL_MAILDIR_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);
-
-static void camel_maildir_store_class_init(CamelObjectClass * camel_maildir_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_maildir_store_class);
-	/*CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_maildir_store_class);*/
-
-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());
-
-	/* virtual method overload, use defaults for most */
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-}
-
-CamelType camel_maildir_store_get_type(void)
-{
-	static CamelType camel_maildir_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_maildir_store_type == CAMEL_INVALID_TYPE) {
-		camel_maildir_store_type = camel_type_register(CAMEL_LOCAL_STORE_TYPE, "CamelMaildirStore",
-							  sizeof(CamelMaildirStore),
-							  sizeof(CamelMaildirStoreClass),
-							  (CamelObjectClassInitFunc) camel_maildir_store_class_init,
-							  NULL,
-							  NULL,
-							  NULL);
-	}
-
-	return camel_maildir_store_type;
-}
-
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)
-{
-	char *name, *tmp, *cur, *new;
-	struct stat st;
-	CamelFolder *folder = NULL;
-
-	(void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex);
-	if (camel_exception_is_set(ex))
-		return NULL;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-	tmp = g_strdup_printf("%s/tmp", name);
-	cur = g_strdup_printf("%s/cur", name);
-	new = g_strdup_printf("%s/new", name);
-
-	if (stat(name, &st) == -1) {
-		if (errno != ENOENT) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not open folder `%s':\n%s"),
-					     folder_name, strerror(errno));
-		} else if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s' does not exist."), folder_name);
-		} else {
-			if (mkdir(name, 0700) != 0
-			    || mkdir(tmp, 0700) != 0
-			    || mkdir(cur, 0700) != 0
-			    || mkdir(new, 0700) != 0) {
-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Could not create folder `%s':\n%s"),
-						     folder_name, strerror(errno));
-				rmdir(tmp);
-				rmdir(cur);
-				rmdir(new);
-				rmdir(name);
-			} else {
-				folder = camel_maildir_folder_new(store, folder_name, flags, ex);
-			}
-		}
-	} else if (!S_ISDIR(st.st_mode)
-		   || stat(tmp, &st) != 0 || !S_ISDIR(st.st_mode)
-		   || stat(cur, &st) != 0 || !S_ISDIR(st.st_mode)
-		   || stat(new, &st) != 0 || !S_ISDIR(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a maildir directory."), name);
-	} else {
-		folder = camel_maildir_folder_new(store, folder_name, flags, ex);
-	}
-
-	g_free(name);
-	g_free(tmp);
-	g_free(cur);
-	g_free(new);
-
-	return folder;
-}
-
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)
-{
-	char *name, *tmp, *cur, *new;
-	struct stat st;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-
-	tmp = g_strdup_printf("%s/tmp", name);
-	cur = g_strdup_printf("%s/cur", name);
-	new = g_strdup_printf("%s/new", name);
-
-	if (stat(name, &st) == -1 || !S_ISDIR(st.st_mode)
-	    || stat(tmp, &st) == -1 || !S_ISDIR(st.st_mode)
-	    || stat(cur, &st) == -1 || !S_ISDIR(st.st_mode)
-	    || stat(new, &st) == -1 || !S_ISDIR(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder `%s': %s"),
-				     folder_name, errno?strerror(errno):_("not a maildir directory"));
-	} else {
-		int err = 0;
-
-		/* remove subdirs first - will fail if not empty */
-		if (rmdir(cur) == -1 || rmdir(new) == -1) {
-			err = errno;
-		} else {
-			DIR *dir;
-			struct dirent *d;
-
-			/* for tmp (only), its contents is irrelevant */
-			dir = opendir(tmp);
-			if (dir) {
-				while ( (d=readdir(dir)) ) {
-					char *name = d->d_name, *file;
-
-					if (!strcmp(name, ".") || !strcmp(name, ".."))
-						continue;
-					file = g_strdup_printf("%s/%s", tmp, name);
-					unlink(file);
-					g_free(file);
-				}
-				closedir(dir);
-			}
-			if (rmdir(tmp) == -1 || rmdir(name) == -1)
-				err = errno;
-		}
-
-		if (err != 0) {
-			/* easier just to mkdir all (and let them fail), than remember what we got to */
-			mkdir(name, 0700);
-			mkdir(cur, 0700);
-			mkdir(new, 0700);
-			mkdir(tmp, 0700);
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not delete folder `%s': %s"),
-					     folder_name, strerror(err));
-		} else {
-			/* and remove metadata */
-			((CamelStoreClass *)parent_class)->delete_folder(store, folder_name, ex);
-		}
-	}
-
-	g_free(name);
-	g_free(tmp);
-	g_free(cur);
-	g_free(new);
-}
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
deleted file mode 100644
index 27b6a6e590..0000000000
--- a/camel/providers/local/camel-maildir-store.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU 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 CAMEL_MAILDIR_STORE_H
-#define CAMEL_MAILDIR_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-
-#include "camel-local-store.h"
-
-#define CAMEL_MAILDIR_STORE_TYPE     (camel_maildir_store_get_type ())
-#define CAMEL_MAILDIR_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStore))
-#define CAMEL_MAILDIR_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStoreClass))
-#define CAMEL_IS_MAILDIR_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_STORE_TYPE))
-
-typedef struct {
-	CamelLocalStore parent_object;
-	
-} CamelMaildirStore;
-
-typedef struct {
-	CamelLocalStoreClass parent_class;
-	
-} CamelMaildirStoreClass;
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_maildir_store_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MAILDIR_STORE_H */
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
deleted file mode 100644
index a65adafc0f..0000000000
--- a/camel/providers/local/camel-maildir-summary.c
+++ /dev/null
@@ -1,751 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-maildir-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <ctype.h>
-
-#include "camel-private.h"
-#include "e-util/e-memory.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-#define CAMEL_MAILDIR_SUMMARY_VERSION (0x2000)
-
-static CamelMessageInfo *message_info_load(CamelFolderSummary *s, FILE *in);
-static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *);
-static void message_info_free(CamelFolderSummary *, CamelMessageInfo *mi);
-
-static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);
-static int maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static int maildir_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);
-
-static char *maildir_summary_next_uid_string(CamelFolderSummary *s);
-static int maildir_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi);
-static char *maildir_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi);
-
-static void camel_maildir_summary_class_init	(CamelMaildirSummaryClass *class);
-static void camel_maildir_summary_init	(CamelMaildirSummary *gspaper);
-static void camel_maildir_summary_finalise	(CamelObject *obj);
-
-#define _PRIVATE(x) (((CamelMaildirSummary *)(x))->priv)
-
-struct _CamelMaildirSummaryPrivate {
-	char *current_file;
-	char *hostname;
-
-	GHashTable *load_map;
-};
-
-static CamelLocalSummaryClass *parent_class;
-
-CamelType
-camel_maildir_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_local_summary_get_type (), "CamelMaildirSummary",
-					   sizeof(CamelMaildirSummary),
-					   sizeof(CamelMaildirSummaryClass),
-					   (CamelObjectClassInitFunc)camel_maildir_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc)camel_maildir_summary_init,
-					   (CamelObjectFinalizeFunc)camel_maildir_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_maildir_summary_class_init (CamelMaildirSummaryClass *class)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;
-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)class;
-
-	parent_class = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type ());
-
-	/* override methods */
-	sklass->message_info_load = message_info_load;
-	sklass->message_info_new = message_info_new;
-	sklass->message_info_free = message_info_free;
-	sklass->next_uid_string = maildir_summary_next_uid_string;
-
-	lklass->load = maildir_summary_load;
-	lklass->check = maildir_summary_check;
-	lklass->sync = maildir_summary_sync;
-	lklass->add = maildir_summary_add;
-	lklass->encode_x_evolution = maildir_summary_encode_x_evolution;
-	lklass->decode_x_evolution = maildir_summary_decode_x_evolution;
-}
-
-static void
-camel_maildir_summary_init (CamelMaildirSummary *o)
-{
-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;
-	char hostname[256];
-
-	o->priv = g_malloc0(sizeof(*o->priv));
-	/* set unique file version */
-	s->version += CAMEL_MAILDIR_SUMMARY_VERSION;
-
-	s->message_info_size = sizeof(CamelMaildirMessageInfo);
-	s->content_info_size = sizeof(CamelMaildirMessageContentInfo);
-
-#ifdef DOESTRV
-	s->message_info_strings = CAMEL_MAILDIR_INFO_LAST;
-#endif
-
-	if (gethostname(hostname, 256) == 0) {
-		o->priv->hostname = g_strdup(hostname);
-	} else {
-		o->priv->hostname = g_strdup("localhost");
-	}
-}
-
-static void
-camel_maildir_summary_finalise(CamelObject *obj)
-{
-	CamelMaildirSummary *o = (CamelMaildirSummary *)obj;
-
-	g_free(o->priv->hostname);
-	g_free(o->priv);
-}
-
-/**
- * camel_maildir_summary_new:
- *
- * Create a new CamelMaildirSummary object.
- * 
- * Return value: A new #CamelMaildirSummary object.
- **/
-CamelMaildirSummary	*camel_maildir_summary_new	(const char *filename, const char *maildirdir, ibex *index)
-{
-	CamelMaildirSummary *o = (CamelMaildirSummary *)camel_object_new(camel_maildir_summary_get_type ());
-
-	camel_local_summary_construct((CamelLocalSummary *)o, filename, maildirdir, index);
-	return o;
-}
-
-/* the 'standard' maildir flags.  should be defined in sorted order. */
-static struct {
-	char flag;
-	guint32 flagbit;
-} flagbits[] = {
-	{ 'F', CAMEL_MESSAGE_FLAGGED },
-	{ 'R', CAMEL_MESSAGE_ANSWERED },
-	{ 'S', CAMEL_MESSAGE_SEEN },
-	{ 'T', CAMEL_MESSAGE_DELETED },
-};
-
-/* convert the uid + flags into a unique:info maildir format */
-char *camel_maildir_summary_info_to_name(const CamelMessageInfo *info)
-{
-	char *p, *buf;
-	int i;
-	const char *uid;
-
-	uid = camel_message_info_uid(info);
-	buf = alloca(strlen(uid) + strlen(":2,") +  (sizeof(flagbits)/sizeof(flagbits[0])) + 1);
-	p = buf + sprintf(buf, "%s:2,", uid);
-	for (i=0;i<sizeof(flagbits)/sizeof(flagbits[0]);i++) {
-		if (info->flags & flagbits[i].flagbit)
-			*p++ = flagbits[i].flag;
-	}
-	*p = 0;
-
-	return g_strdup(buf);
-}
-
-/* returns 0 if the info matches (or there was none), otherwise we changed it */
-int camel_maildir_summary_name_to_info(CamelMessageInfo *info, const char *name)
-{
-	char *p, c;
-	guint32 set = 0;	/* what we set */
-	/*guint32 all = 0;*/	/* all flags */
-	int i;
-
-	p = strstr(name, ":2,");
-	if (p) {
-		p+=3;
-		while ((c = *p++)) {
-			/* we could assume that the flags are in order, but its just as easy not to require */
-			for (i=0;i<sizeof(flagbits)/sizeof(flagbits[0]);i++) {
-				if (flagbits[i].flag == c && (info->flags & flagbits[i].flagbit) == 0) {
-					set |= flagbits[i].flagbit;
-				}
-				/*all |= flagbits[i].flagbit;*/
-			}
-		}
-
-		/* changed? */
-		/*if ((info->flags & all) != set) {*/
-		if ((info->flags & set) != set) {
-			/* ok, they did change, only add the new flags ('merge flags'?) */
-			/*info->flags &= all;  if we wanted to set only the new flags, which we probably dont */
-			info->flags |= set;
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-/* for maildir, x-evolution isn't used, so dont try and get anything out of it */
-static int maildir_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi)
-{
-	return -1;
-}
-
-static char *maildir_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi)
-{
-	return NULL;
-}
-
-/* FIXME:
-   both 'new' and 'add' will try and set the filename, this is not ideal ...
-*/
-static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelLocalSummaryClass *) parent_class)->add(cls, msg, info, changes, ex);
-	if (mi) {
-		if (info) {
-			camel_maildir_info_set_filename(mi, camel_maildir_summary_info_to_name(mi));
-			d(printf("Setting filename to %s\n", camel_maildir_info_filename(mi)));
-		}
-	}
-
-	return mi;
-}
-
-static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;
-	CamelMaildirMessageInfo *mdi;
-	const char *uid;
-
-	mi = ((CamelFolderSummaryClass *) parent_class)->message_info_new(s, h);
-	/* assign the uid and new filename */
-	if (mi) {
-		mdi = (CamelMaildirMessageInfo *)mi;
-
-		uid = camel_message_info_uid(mi);
-		if (uid==NULL || uid[0] == 0)
-			camel_message_info_set_uid(mi, camel_folder_summary_next_uid_string(s));
-
-		/* with maildir we know the real received date, from the filename */
-		mi->date_received = strtoul(camel_message_info_uid(mi), NULL, 10);
-
-		if (mds->priv->current_file) {
-#if 0
-			char *p1, *p2, *p3;
-			unsigned long uid;
-#endif
-			/* if setting from a file, grab the flags from it */
-			camel_maildir_info_set_filename(mi, g_strdup(mds->priv->current_file));
-			camel_maildir_summary_name_to_info(mi, mds->priv->current_file);
-
-#if 0
-			/* Actually, I dont think all this effort is worth it at all ... */
-
-			/* also, see if we can extract the next-id from tne name, and safe-if-fy ourselves against collisions */
-			/* we check for something.something_number.something */
-			p1 = strchr(mdi->filename, '.');
-			if (p1) {
-				p2 = strchr(p1+1, '.');
-				p3 = strchr(p1+1, '_');
-				if (p2 && p3 && p3<p2) {
-					uid = strtoul(p3+1, &p1, 10);
-					if (p1 == p2 && uid>0)
-						camel_folder_summary_set_uid(s, uid);
-				}
-			}
-#endif
-		} else {
-			/* if creating a file, set its name from the flags we have */
-			camel_maildir_info_set_filename(mdi, camel_maildir_summary_info_to_name(mi));
-			d(printf("Setting filename to %s\n", camel_maildir_info_filename(mi)));
-		}
-	}
-
-	return mi;
-}
-
-
-static void message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-#ifndef DOESTRV
-	CamelMaildirMessageInfo *mdi = (CamelMaildirMessageInfo *)mi;
-
-	g_free(mdi->filename);
-#endif
-	((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi);
-}
-
-
-static char *maildir_summary_next_uid_string(CamelFolderSummary *s)
-{
-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;
-
-	d(printf("next uid string called?\n"));
-
-	/* if we have a current file, then use that to get the uid */
-	if (mds->priv->current_file) {
-		char *cln;
-
-		cln = strchr(mds->priv->current_file, ':');
-		if (cln)
-			return g_strndup(mds->priv->current_file, cln-mds->priv->current_file);
-		else
-			return g_strdup(mds->priv->current_file);
-	} else {
-		/* the first would probably work, but just to be safe, check for collisions */
-#if 0
-		return g_strdup_printf("%ld.%d_%u.%s", time(0), getpid(), camel_folder_summary_next_uid(s), mds->priv->hostname);
-#else
-		CamelLocalSummary *cls = (CamelLocalSummary *)s;
-		char *name = NULL, *uid = NULL;
-		struct stat st;
-		int retry = 0;
-		guint32 nextuid = camel_folder_summary_next_uid(s);
-
-		/* we use time.pid_count.hostname */
-		do {
-			if (retry > 0) {
-				g_free(name);
-				g_free(uid);
-				sleep(2);
-			}
-			uid = g_strdup_printf("%ld.%d_%u.%s", time(0), getpid(), nextuid, mds->priv->hostname);
-			name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
-			retry++;
-		} while (stat(name, &st) == 0 && retry<3);
-
-		/* I dont know what we're supposed to do if it fails to find a unique name?? */
-
-		g_free(name);
-		return uid;
-#endif
-	}
-}
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;
-
-	mi = ((CamelFolderSummaryClass *) parent_class)->message_info_load(s, in);
-	if (mi) {
-		char *name;
-
-		if (mds->priv->load_map
-		    && (name = g_hash_table_lookup(mds->priv->load_map, camel_message_info_uid(mi)))) {
-			d(printf("Setting filename of %s to %s\n", camel_message_info_uid(mi), name));
-			camel_maildir_info_set_filename(mi, g_strdup(name));
-			camel_maildir_summary_name_to_info(mi, name);
-		}
-	}
-
-	return mi;
-}
-
-static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)
-{
-	char *cur;
-	DIR *dir;
-	struct dirent *d;
-	CamelMaildirSummary *mds = (CamelMaildirSummary *)cls;
-	char *uid;
-	EMemPool *pool;
-	int ret;
-
-	cur = g_strdup_printf("%s/cur", cls->folder_path);
-
-	d(printf("pre-loading uid <> filename map\n"));
-
-	dir = opendir(cur);
-	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno));
-		g_free(cur);
-		return -1;
-	}
-
-	mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal);
-	pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
-
-	while ( (d = readdir(dir)) ) {
-		if (d->d_name[0] == '.')
-			continue;
-		
-		/* map the filename -> uid */
-		uid = strchr(d->d_name, ':');
-		if (uid) {
-			int len = uid-d->d_name;
-			uid = e_mempool_alloc(pool, len+1);
-			memcpy(uid, d->d_name, len);
-			uid[len] = 0;
-			g_hash_table_insert(mds->priv->load_map, uid, e_mempool_strdup(pool, d->d_name));
-		} else {
-			uid = e_mempool_strdup(pool, d->d_name);
-			g_hash_table_insert(mds->priv->load_map, uid, uid);
-		}
-	}
-	closedir(dir);
-	g_free(cur);
-
-	ret = ((CamelLocalSummaryClass *) parent_class)->load(cls, forceindex, ex);
-
-	g_hash_table_destroy(mds->priv->load_map);
-	mds->priv->load_map = NULL;
-	e_mempool_destroy(pool);
-
-	return ret;
-}
-
-static int camel_maildir_summary_add(CamelLocalSummary *cls, const char *name, int forceindex)
-{
-	CamelMaildirSummary *maildirs = (CamelMaildirSummary *)cls;
-	char *filename = g_strdup_printf("%s/cur/%s", cls->folder_path, name);
-	int fd;
-	CamelMimeParser *mp;
-
-	d(printf("summarising: %s\n", name));
-
-	fd = open(filename, O_RDONLY);
-	if (fd == -1) {
-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));
-		g_free(filename);
-		return -1;
-	}
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, FALSE);
-	camel_mime_parser_init_with_fd(mp, fd);
-	if (cls->index && (forceindex || !ibex_contains_name(cls->index, (char *)name))) {
-		d(printf("forcing indexing of message content\n"));
-		camel_folder_summary_set_index((CamelFolderSummary *)maildirs, cls->index);
-	} else {
-		camel_folder_summary_set_index((CamelFolderSummary *)maildirs, NULL);
-	}
-	maildirs->priv->current_file = (char *)name;
-	camel_folder_summary_add_from_parser((CamelFolderSummary *)maildirs, mp);
-	camel_object_unref((CamelObject *)mp);
-	maildirs->priv->current_file = NULL;
-	camel_folder_summary_set_index((CamelFolderSummary *)maildirs, NULL);
-	g_free(filename);
-	return 0;
-}
-
-static void
-remove_summary(char *key, CamelMessageInfo *info, CamelLocalSummary *cls)
-{
-	d(printf("removing message %s from summary\n", key));
-	if (cls->index)
-		ibex_unindex(cls->index, (char *)camel_message_info_uid(info));
-	camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-	camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-}
-
-static int
-sort_receive_cmp(const void *ap, const void *bp)
-{
-	const CamelMessageInfo
-		*a = *((CamelMessageInfo **)ap),
-		*b = *((CamelMessageInfo **)bp);
-
-	if (a->date_received < b->date_received)
-		return -1;
-	else if (a->date_received > b->date_received)
-		return 1;
-
-	return 0;
-}
-
-static int
-maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	DIR *dir;
-	struct dirent *d;
-	char *p;
-	CamelMessageInfo *info;
-	CamelMaildirMessageInfo *mdi;
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-	GHashTable *left;
-	int i, count;
-	int forceindex;
-	char *new, *cur;
-	char *uid;
-
-	new = g_strdup_printf("%s/new", cls->folder_path);
-	cur = g_strdup_printf("%s/cur", cls->folder_path);
-
-	/* FIXME: Handle changeinfo */
-
-	d(printf("checking summary ...\n"));
-
-	/* scan the directory, check for mail files not in the index, or index entries that
-	   no longer exist */
-	dir = opendir(cur);
-	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno));
-		g_free(cur);
-		g_free(new);
-		return -1;
-	}
-
-	/* keeps track of all uid's that have not been processed */
-	left = g_hash_table_new(g_str_hash, g_str_equal);
-	count = camel_folder_summary_count((CamelFolderSummary *)cls);
-	forceindex = count == 0;
-	for (i=0;i<count;i++) {
-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);
-		if (info) {
-			g_hash_table_insert(left, (char *)camel_message_info_uid(info), info);
-		}
-	}
-
-	while ( (d = readdir(dir)) ) {
-		/* FIXME: also run stat to check for regular file */
-		p = d->d_name;
-		if (p[0] == '.')
-			continue;
-
-		/* map the filename -> uid */
-		uid = strchr(d->d_name, ':');
-		if (uid)
-			uid = g_strndup(d->d_name, uid-d->d_name);
-		else
-			uid = g_strdup(d->d_name);
-
-		info = camel_folder_summary_uid((CamelFolderSummary *)cls, uid);
-		if (info == NULL || (cls->index && (!ibex_contains_name(cls->index, uid)))) {
-			/* need to add this file to the summary */
-			if (info != NULL) {
-				CamelMessageInfo *old = g_hash_table_lookup(left, camel_message_info_uid(info));
-				if (old) {
-					g_hash_table_remove(left, uid);
-					camel_folder_summary_info_free((CamelFolderSummary *)cls, old);
-				}
-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-			}
-			camel_maildir_summary_add(cls, d->d_name, forceindex);
-		} else {
-			const char *filename;
-			CamelMessageInfo *old;
-
-			old = g_hash_table_lookup(left, camel_message_info_uid(info));
-			if (old) {
-				camel_folder_summary_info_free((CamelFolderSummary *)cls, old);
-				g_hash_table_remove(left, camel_message_info_uid(info));
-			}
-
-			mdi = (CamelMaildirMessageInfo *)info;
-			filename = camel_maildir_info_filename(mdi);
-			/* TODO: only store the extension in the mdi->filename struct, not the whole lot */
-			if (filename == NULL || strcmp(filename, d->d_name) != 0) {
-#ifdef DOESTRV
-#warning "cannot modify the estrv after its been setup, for mt-safe code"
-				d(printf("filename changed: %s to %s\n", filename, d->d_name));
-
-				/* need to update the summary hash string reference since it might (will) change */
-				CAMEL_SUMMARY_LOCK(s, summary_lock);
-				g_hash_table_remove(s->messages_uid, uid);
-				info->strings = e_strv_set_ref(info->strings, CAMEL_MAILDIR_INFO_FILENAME, d->d_name);
-				/* we need to re-pack as well */
-				info->strings = e_strv_pack(info->strings);
-				g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
-				CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-#else	
-				g_free(mdi->filename);
-				mdi->filename = g_strdup(d->d_name);
-#endif	
-			}
-			camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-		}
-		g_free(uid);
-	}
-	closedir(dir);
-	g_hash_table_foreach(left, (GHFunc)remove_summary, cls);
-	g_hash_table_destroy(left);
-
-	/* now, scan new for new messages, and copy them to cur, and so forth */
-	dir = opendir(new);
-	if (dir != NULL) {
-		while ( (d = readdir(dir)) ) {
-			char *name, *newname, *destname, *destfilename;
-			char *src, *dest;
-
-			name = d->d_name;
-			if (name[0] == '.')
-				continue;
-
-			/* already in summary?  shouldn't happen, but just incase ... */
-			if ((info = camel_folder_summary_uid((CamelFolderSummary *)cls, name))) {
-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-				newname = destname = camel_folder_summary_next_uid_string(s);
-			} else {
-				newname = NULL;
-				destname = name;
-			}
-
-			/* copy this to the destination folder, use 'standard' semantics for maildir info field */
-			src = g_strdup_printf("%s/%s", new, name);
-			destfilename = g_strdup_printf("%s:2,", destname);
-			dest = g_strdup_printf("%s/%s", cur, destfilename);
-
-			/* FIXME: This should probably use link/unlink */
-
-			if (rename(src, dest) == 0) {
-				camel_maildir_summary_add(cls, destfilename, forceindex);
-				if (changes)
-					camel_folder_change_info_add_uid(changes, destname);
-			} else {
-				/* else?  we should probably care about failures, but wont */
-				g_warning("Failed to move new maildir message %s to cur %s", src, dest);
-			}
-
-			/* c strings are painful to work with ... */
-			g_free(destfilename);
-			g_free(newname);
-			g_free(src);
-			g_free(dest);
-		}
-	}
-	closedir(dir);
-
-	g_free(new);
-	g_free(cur);
-
-	/* sort the summary based on receive time, since the directory order is not useful */
-	CAMEL_SUMMARY_LOCK(s, summary_lock);
-	qsort(s->messages->pdata, s->messages->len, sizeof(CamelMessageInfo *), sort_receive_cmp);
-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-
-	/* FIXME: move this up a class? */
-
-	/* force a save of the index, just to make sure */
-	/* note this could be expensive so possibly shouldn't be here
-	   as such */
-	if (cls->index) {
-		ibex_save(cls->index);
-	}
-
-	return 0;
-}
-
-/* sync the summary with the ondisk files. */
-static int
-maildir_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	int count, i;
-	CamelMessageInfo *info;
-	CamelMaildirMessageInfo *mdi;
-#ifdef DOESTRV
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-#endif
-	char *name;
-	struct stat st;
-
-	d(printf("summary_sync(expunge=%s)\n", expunge?"true":"false"));
-
-	if (cls->index) {
-		ibex_save(cls->index);
-	}
-
-	count = camel_folder_summary_count((CamelFolderSummary *)cls);
-	for (i=count-1;i>=0;i--) {
-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);
-		mdi = (CamelMaildirMessageInfo *)info;
-		if (info && (info->flags & CAMEL_MESSAGE_DELETED) && expunge) {
-			name = g_strdup_printf("%s/cur/%s", cls->folder_path, camel_maildir_info_filename(mdi));
-			d(printf("deleting %s\n", name));
-			if (unlink(name) == 0 || errno==ENOENT) {
-
-				/* FIXME: put this in folder_summary::remove()? */
-				if (cls->index)
-					ibex_unindex(cls->index, (char *)camel_message_info_uid(info));
-
-				camel_folder_change_info_remove_uid(changes, camel_message_info_uid(info));
-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-			}
-			g_free(name);
-		} else if (info && (info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED)) {
-			char *newname = camel_maildir_summary_info_to_name(info);
-			char *dest;
-
-			/* do we care about additional metainfo stored inside the message? */
-			/* probably should all go in the filename? */
-
-			/* have our flags/ i.e. name changed? */
-			if (strcmp(newname, camel_maildir_info_filename(mdi))) {
-				name = g_strdup_printf("%s/cur/%s", cls->folder_path, camel_maildir_info_filename(mdi));
-				dest = g_strdup_printf("%s/cur/%s", cls->folder_path, newname);
-				rename(name, dest);
-				if (stat(dest, &st) == -1) {
-					/* we'll assume it didn't work, but dont change anything else */
-					g_free(newname);
-				} else {
-					/* TODO: If this is made mt-safe, then this code could be a problem, since
-					   the estrv is being modified.
-					   Sigh, this may mean the maildir name has to be cached another way */
-#ifdef DOESTRV
-#warning "cannot modify the estrv after its been setup, for mt-safe code"
-					CAMEL_SUMMARY_LOCK(s, summary_lock);
-					/* need to update the summary hash ref */
-					g_hash_table_remove(s->messages_uid, camel_message_info_uid(info));
-					info->strings = e_strv_set_ref_free(info->strings, CAMEL_MAILDIR_INFO_FILENAME, newname);
-					info->strings = e_strv_pack(info->strings);
-					g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
-					CAMEL_SUMMARY_UNLOCK(s, summary_lock);
-#else
-					g_free(mdi->filename);
-					mdi->filename = newname;
-#endif
-				}
-				g_free(name);
-				g_free(dest);
-			} else {
-				g_free(newname);
-			}
-
-			/* strip FOLDER_MESSAGE_FLAGED, etc */
-			info->flags &= 0xffff;
-		}
-		camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-	}
-	return 0;
-}
-
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
deleted file mode 100644
index 456492b5e5..0000000000
--- a/camel/providers/local/camel-maildir-summary.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MAILDIR_SUMMARY_H
-#define _CAMEL_MAILDIR_SUMMARY_H
-
-#include "camel-local-summary.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MAILDIR_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_maildir_summary_get_type (), CamelMaildirSummary)
-#define CAMEL_MAILDIR_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_maildir_summary_get_type (), CamelMaildirSummaryClass)
-#define CAMEL_IS_MAILDIR_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_maildir_summary_get_type ())
-
-typedef struct _CamelMaildirSummary	CamelMaildirSummary;
-typedef struct _CamelMaildirSummaryClass	CamelMaildirSummaryClass;
-
-typedef struct _CamelMaildirMessageContentInfo {
-	CamelMessageContentInfo info;
-} CamelMaildirMessageContentInfo;
-
-#ifdef DOESTRV
-enum {
-	CAMEL_MAILDIR_INFO_FILENAME = CAMEL_MESSAGE_INFO_LAST,
-	CAMEL_MAILDIR_INFO_LAST,
-};
-#endif
-
-typedef struct _CamelMaildirMessageInfo {
-	CamelMessageInfo info;
-
-#ifndef DOESTRV
-	char *filename;		/* maildir has this annoying status shit on the end of the filename, use this to get the real message id */
-#endif
-} CamelMaildirMessageInfo;
-
-struct _CamelMaildirSummary {
-	CamelLocalSummary parent;
-	struct _CamelMaildirSummaryPrivate *priv;
-};
-
-struct _CamelMaildirSummaryClass {
-	CamelLocalSummaryClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-CamelType	 camel_maildir_summary_get_type	(void);
-CamelMaildirSummary	*camel_maildir_summary_new	(const char *filename, const char *maildirdir, ibex *index);
-
-/* convert some info->flags to/from the messageinfo */
-char *camel_maildir_summary_info_to_name(const CamelMessageInfo *info);
-int camel_maildir_summary_name_to_info(CamelMessageInfo *info, const char *name);
-
-#ifdef DOESTRV
-#define camel_maildir_info_filename(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MAILDIR_INFO_FILENAME)
-#define camel_maildir_info_set_filename(x, s) camel_message_info_set_string((CamelMessageInfo *)(x), CAMEL_MAILDIR_INFO_FILENAME, s)
-#else
-#define camel_maildir_info_filename(x) (((CamelMaildirMessageInfo *)x)->filename)
-#define camel_maildir_info_set_filename(x, s) (g_free(((CamelMaildirMessageInfo *)x)->filename),((CamelMaildirMessageInfo *)x)->filename = s)
-#endif
-
-#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */
-
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
deleted file mode 100644
index 14dca0049e..0000000000
--- a/camel/providers/local/camel-mbox-folder.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-mbox-folder.h"
-#include "camel-mbox-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-mbox-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-exception.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-static CamelLocalFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelMboxFolder */
-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);
-static void mbox_unlock(CamelLocalFolder *lf);
-
-static void mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);
-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
-
-static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,	CamelException *ex);
-static CamelMimeMessage *mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);
-static CamelLocalSummary *mbox_create_summary(const char *path, const char *folder, ibex *index);
-
-static void mbox_finalise(CamelObject * object);
-
-static void
-camel_mbox_folder_class_init(CamelMboxFolderClass * camel_mbox_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mbox_folder_class);
-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_mbox_folder_class;
-
-	parent_class = (CamelLocalFolderClass *)camel_type_get_global_classfuncs(camel_local_folder_get_type());
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->append_message = mbox_append_message;
-	camel_folder_class->get_message = mbox_get_message;
-
-	camel_folder_class->set_message_user_flag = mbox_set_message_user_flag;
-	camel_folder_class->set_message_user_tag = mbox_set_message_user_tag;
-
-	lclass->create_summary = mbox_create_summary;
-	lclass->lock = mbox_lock;
-	lclass->unlock = mbox_unlock;
-}
-
-static void
-mbox_init(gpointer object, gpointer klass)
-{
-	/*CamelFolder *folder = object;*/
-	CamelMboxFolder *mbox_folder = object;
-
-	mbox_folder->lockfd = -1;
-}
-
-static void
-mbox_finalise(CamelObject * object)
-{
-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)object;
-
-	g_assert(mbox_folder->lockfd == -1);
-}
-
-CamelType camel_mbox_folder_get_type(void)
-{
-	static CamelType camel_mbox_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mbox_folder_type == CAMEL_INVALID_TYPE) {
-		camel_mbox_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMboxFolder",
-							     sizeof(CamelMboxFolder),
-							     sizeof(CamelMboxFolderClass),
-							     (CamelObjectClassInitFunc) camel_mbox_folder_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) mbox_init,
-							     (CamelObjectFinalizeFunc) mbox_finalise);
-	}
-
-	return camel_mbox_folder_type;
-}
-
-CamelFolder *
-camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	d(printf("Creating mbox folder: %s in %s\n", full_name, camel_local_store_get_toplevel_dir((CamelLocalStore *)parent_store)));
-
-	folder = (CamelFolder *)camel_object_new(CAMEL_MBOX_FOLDER_TYPE);
-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,
-							     parent_store, full_name, flags, ex);
-
-	return folder;
-}
-
-static CamelLocalSummary *mbox_create_summary(const char *path, const char *folder, ibex *index)
-{
-	return (CamelLocalSummary *)camel_mbox_summary_new(path, folder, index);
-}
-
-static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)
-{
-	CamelMboxFolder *mf = (CamelMboxFolder *)lf;
-
-	/* make sure we have matching unlocks for locks, camel-local-folder class should enforce this */
-	g_assert(mf->lockfd == -1);
-
-	mf->lockfd = open(lf->folder_path, O_RDWR, 0);
-	if (mf->lockfd == -1) {
-		camel_exception_setv(ex, 1, "Cannot create folder lock on %s: %s", lf->folder_path, strerror(errno));
-		return -1;
-	}
-
-	return camel_lock_folder(lf->folder_path, mf->lockfd, type, ex);
-}
-
-static void mbox_unlock(CamelLocalFolder *lf)
-{
-	CamelMboxFolder *mf = (CamelMboxFolder *)lf;
-
-	g_assert(mf->lockfd != -1);
-	camel_unlock_folder(lf->folder_path, mf->lockfd);
-	close(mf->lockfd);
-	mf->lockfd = -1;
-}
-
-static void
-mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, CamelException *ex)
-{
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelStream *output_stream = NULL, *filter_stream = NULL;
-	CamelMimeFilter *filter_from = NULL;
-	CamelMboxSummary *mbs = (CamelMboxSummary *)folder->summary;
-	CamelMessageInfo *mi;
-	char *fromline = NULL;
-	int fd;
-	struct stat st;
-#if 0
-	char *xev;
-#endif
-	/* If we can't lock, dont do anything */
-	if (camel_local_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)
-		return;
-
-	d(printf("Appending message\n"));
-
-	/* first, check the summary is correct (updates folder_size too) */
-	camel_local_summary_check((CamelLocalSummary *)folder->summary, lf->changes, ex);
-	if (camel_exception_is_set(ex))
-		goto fail;
-
-	/* add it to the summary/assign the uid, etc */
-	mi = camel_local_summary_add((CamelLocalSummary *)folder->summary, message, info, lf->changes, ex);
-	if (camel_exception_is_set(ex))
-		goto fail;
-
-	d(printf("Appending message: uid is %s\n", camel_message_info_uid(mi)));
-
-	output_stream = camel_stream_fs_new_with_name(lf->folder_path, O_WRONLY|O_APPEND, 0600);
-	if (output_stream == NULL) {
-		camel_exception_setv(ex, 1, _("Cannot open mailbox: %s: %s\n"), lf->folder_path, strerror(errno));
-		goto fail;
-	}
-
-	/* and we need to set the frompos/XEV explicitly */
-	((CamelMboxMessageInfo *)mi)->frompos = mbs->folder_size?mbs->folder_size+1:0;
-#if 0
-	xev = camel_local_summary_encode_x_evolution((CamelLocalSummary *)folder->summary, mi);
-	if (xev) {
-		/* the x-ev header should match the 'current' flags, no problem, so store as much */
-		camel_medium_set_header((CamelMedium *)message, "X-Evolution", xev);
-		mi->flags &= ~ CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED;
-		g_free(xev);
-	}
-#endif
-
-	/* we must write this to the non-filtered stream ... prepend a \n if not at the start of the file */
-	fromline = camel_mbox_summary_build_from(((CamelMimePart *)message)->headers);
-	if (camel_stream_printf(output_stream, mbs->folder_size==0?"%s":"\n%s", fromline) == -1)
-		goto fail_write;
-
-	/* and write the content to the filtering stream, that translated '\nFrom' into '\n>From' */
-	filter_stream = (CamelStream *) camel_stream_filter_new_with_stream(output_stream);
-	filter_from = (CamelMimeFilter *) camel_mime_filter_from_new();
-	camel_stream_filter_add((CamelStreamFilter *) filter_stream, filter_from);
-	if (camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, filter_stream) == -1)
-		goto fail_write;
-
-	if (camel_stream_close(filter_stream) == -1)
-		goto fail_write;
-
-	/* unlock as soon as we can */
-	camel_local_folder_unlock(lf);
-
-	/* filter stream ref's the output stream itself, so we need to unref it too */
-	camel_object_unref((CamelObject *)filter_from);
-	camel_object_unref((CamelObject *)filter_stream);
-	camel_object_unref((CamelObject *)output_stream);
-	g_free(fromline);
-
-	/* now we 'fudge' the summary  to tell it its uptodate, because its idea of uptodate has just changed */
-	/* the stat really shouldn't fail, we just wrote to it */
-	if (stat(lf->folder_path, &st) == 0) {
-		mbs->folder_size = st.st_size;
-		((CamelFolderSummary *)mbs)->time = st.st_mtime;
-	}
-
-	if (camel_folder_change_info_changed(lf->changes)) {
-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf->changes);
-		camel_folder_change_info_clear(lf->changes);
-	}
-
-	return;
-
-fail_write:
-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-			     _("Cannot append message to mbox file: %s: %s"), lf->folder_path, strerror(errno));
-
-	if (filter_stream)
-		camel_object_unref(CAMEL_OBJECT(filter_stream));
-
-	if (output_stream)
-		camel_object_unref(CAMEL_OBJECT(output_stream));
-
-	if (filter_from)
-		camel_object_unref(CAMEL_OBJECT(filter_from));
-
-	g_free(fromline);
-
-	/* reset the file to original size */
-	fd = open(lf->folder_path, O_WRONLY, 0600);
-
-	if (fd != -1) {
-		ftruncate(fd, mbs->folder_size);
-		close(fd);
-	}
-
-	/* and tell the summary its uptodate */
-	if (stat(lf->folder_path, &st) == 0) {
-		mbs->folder_size = st.st_size;
-		((CamelFolderSummary *)mbs)->time = st.st_mtime;
-	}
-
-fail:
-	/* make sure we unlock the folder - before we start triggering events into appland */
-	camel_local_folder_unlock(lf);
-
-	/* cascade the changes through, anyway, if there are any outstanding */
-	if (camel_folder_change_info_changed(lf->changes)) {
-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf->changes);
-		camel_folder_change_info_clear(lf->changes);
-	}
-}
-
-static CamelMimeMessage *
-mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex)
-{
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelMimeMessage *message;
-	CamelMboxMessageInfo *info;
-	CamelMimeParser *parser;
-	int fd;
-	int retried = FALSE;
-	
-	d(printf("Getting message %s\n", uid));
-
-	/* lock the folder first, burn if we can't */
-	if (camel_local_folder_lock(lf, CAMEL_LOCK_READ, ex) == -1)
-		return NULL;
-	
-retry:
-	/* get the message summary info */
-	info = (CamelMboxMessageInfo *) camel_folder_summary_uid(folder->summary, uid);
-
-	if (info == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Cannot get message: %s\n  %s"), uid, _("No such message"));
-		camel_local_folder_unlock(lf);
-		return NULL;
-	}
-
-	/* no frompos, its an error in the library (and we can't do anything with it */
-	g_assert(info->frompos != -1);
-	
-	/* we use an fd instead of a normal stream here - the reason is subtle, camel_mime_part will cache
-	   the whole message in memory if the stream is non-seekable (which it is when built from a parser
-	   with no stream).  This means we dont have to lock the mbox for the life of the message, but only
-	   while it is being created. */
-
-	fd = open(lf->folder_path, O_RDONLY);
-	if (fd == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf->folder_path,
-				     strerror(errno));
-		camel_local_folder_unlock(lf);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)info);
-		return NULL;
-	}
-
-	/* we use a parser to verify the message is correct, and in the correct position */
-	parser = camel_mime_parser_new();
-	camel_mime_parser_init_with_fd(parser, fd);
-	camel_mime_parser_scan_from(parser, TRUE);
-
-	camel_mime_parser_seek(parser, info->frompos, SEEK_SET);
-	if (camel_mime_parser_step(parser, NULL, NULL) != HSCAN_FROM
-	    || camel_mime_parser_tell_start_from(parser) != info->frompos) {
-
-		g_warning("Summary doesn't match the folder contents!  eek!\n"
-			  "  expecting offset %ld got %ld, state = %d", (long int)info->frompos,
-			  (long int)camel_mime_parser_tell_start_from(parser),
-			  camel_mime_parser_state(parser));
-
-		camel_object_unref((CamelObject *)parser);
-		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)info);
-
-		if (!retried) {
-			retried = TRUE;
-			camel_local_summary_check((CamelLocalSummary *)folder->summary, lf->changes, ex);
-			if (!camel_exception_is_set(ex))
-				goto retry;
-		}
-
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf->folder_path,
-				     _("The folder appears to be irrecoverably corrupted."));
-
-		camel_local_folder_unlock(lf);
-		return NULL;
-	}
-
-	camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)info);
-	
-	message = camel_mime_message_new();
-	if (camel_mime_part_construct_from_parser((CamelMimePart *)message, parser) == -1) {
-		g_warning("Construction failed");
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf->folder_path,
-				     _("Message construction failed: Corrupt mailbox?"));
-		camel_object_unref((CamelObject *)parser);
-		camel_object_unref((CamelObject *)message);
-		camel_local_folder_unlock(lf);
-		return NULL;
-	}
-
-	/* and unlock now we're finished with it */
-	camel_local_folder_unlock(lf);
-
-	camel_object_unref((CamelObject *)parser);
-	
-	/* use the opportunity to notify of changes (particularly if we had a rebuild) */
-	if (camel_folder_change_info_changed(lf->changes)) {
-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf->changes);
-		camel_folder_change_info_clear(lf->changes);
-	}
-	
-	return message;
-}
-
-static void
-mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_flag_set(&info->user_flags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
-
-static void
-mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	CamelMessageInfo *info;
-
-	g_return_if_fail(folder->summary != NULL);
-
-	info = camel_folder_summary_uid(folder->summary, uid);
-	g_return_if_fail(info != NULL);
-
-	if (camel_tag_set(&info->user_tags, name, value)) {
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;
-		camel_folder_summary_touch(folder->summary);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-	}
-	camel_folder_summary_info_free(folder->summary, info);
-}
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
deleted file mode 100644
index 688135ff76..0000000000
--- a/camel/providers/local/camel-mbox-folder.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code .
- *
- * 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 CAMEL_MBOX_FOLDER_H
-#define CAMEL_MBOX_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-local-folder.h"
-#include "camel-mbox-summary.h"
-
-#define CAMEL_MBOX_FOLDER_TYPE     (camel_mbox_folder_get_type ())
-#define CAMEL_MBOX_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolder))
-#define CAMEL_MBOX_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass))
-#define CAMEL_IS_MBOX_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE))
-
-typedef struct {
-	CamelLocalFolder parent_object;
-
-	int lockfd;		/* for when we have a lock on the folder */
-} CamelMboxFolder;
-
-typedef struct {
-	CamelLocalFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelMboxFolderClass;
-
-/* public methods */
-/* flags are taken from CAMEL_STORE_FOLDER_* flags */
-CamelFolder *camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_mbox_folder_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MBOX_FOLDER_H */
diff --git a/camel/providers/local/camel-mbox-provider.c b/camel/providers/local/camel-mbox-provider.c
deleted file mode 100644
index bfce8b5ada..0000000000
--- a/camel/providers/local/camel-mbox-provider.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-provider.c: mbox provider registration code */
-
-/* 
- * Authors :
- *   Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright (C) 2000 HelixCode (www.helixcode.com).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-mbox-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider mbox_provider = {
-	"mbox",
-	N_("UNIX mbox-format mail files"),
-
-	N_("For reading mail delivered by the local system, and for "
-	   "storing mail on local disk."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_PATH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	mbox_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_mbox_store_get_type();
-
-	mbox_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-
-	camel_session_register_provider (session, &mbox_provider);
-}
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
deleted file mode 100644
index c6ddc7ce0a..0000000000
--- a/camel/providers/local/camel-mbox-store.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "camel-mbox-store.h"
-#include "camel-mbox-folder.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-static CamelLocalStoreClass *parent_class = NULL;
-
-/* Returns the class for a CamelMboxStore */
-#define CMBOXS_CLASS(so) CAMEL_MBOX_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelFolder *get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);
-
-static void
-camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_mbox_store_class);
-
-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());
-	
-	/* virtual method overload */
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-}
-
-CamelType
-camel_mbox_store_get_type (void)
-{
-	static CamelType camel_mbox_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mbox_store_type == CAMEL_INVALID_TYPE)	{
-		camel_mbox_store_type = camel_type_register (CAMEL_LOCAL_STORE_TYPE, "CamelMboxStore",
-							     sizeof (CamelMboxStore),
-							     sizeof (CamelMboxStoreClass),
-							     (CamelObjectClassInitFunc) camel_mbox_store_class_init,
-							     NULL,
-							     NULL,
-							     NULL);
-	}
-	
-	return camel_mbox_store_type;
-}
-
-static CamelFolder *
-get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	char *name;
-	struct stat st;
-
-	(void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex);
-	if (camel_exception_is_set(ex))
-		return NULL;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-
-	if (stat(name, &st) == -1) {
-		int fd;
-
-		if (errno != ENOENT) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not open file `%s':\n%s"),
-					     name, g_strerror(errno));
-			g_free(name);
-			return NULL;
-		}
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s' does not exist."),
-					     folder_name);
-			g_free(name);
-			return NULL;
-		}
-
-		fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0600);
-		if (fd == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not create file `%s':\n%s"),
-					     name, g_strerror(errno));
-			g_free(name);
-			return NULL;
-		}
-		g_free(name);
-		close(fd);
-	} else if (!S_ISREG(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a regular file."),
-				     name);
-		g_free(name);
-		return NULL;
-	} else
-		g_free(name);
-
-	return camel_mbox_folder_new(store, folder_name, flags, ex);
-}
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	char *name;
-	struct stat st;
-
-	name = g_strdup_printf ("%s%s", CAMEL_SERVICE (store)->url->path, folder_name);
-	if (stat (name, &st) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s':\n%s"),
-				      folder_name, g_strerror (errno));
-		g_free (name);
-		return;
-	}
-	
-	if (!S_ISREG (st.st_mode)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      _("`%s' is not a regular file."), name);
-		g_free (name);
-		return;
-	}
-	
-	if (st.st_size != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
-				      _("Folder `%s' is not empty. Not deleted."),
-				      folder_name);
-		g_free (name);
-		return;
-	}
-
-	if (unlink(name) == -1 && errno != ENOENT) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s':\n%s"),
-				      name, g_strerror (errno));
-		g_free(name);
-		return;
-	}
-
-	g_free(name);
-
-	/* and remove metadata */
-	((CamelStoreClass *)parent_class)->delete_folder(store, folder_name, ex);
-}
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
deleted file mode 100644
index bc8d5149f5..0000000000
--- a/camel/providers/local/camel-mbox-store.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MBOX_STORE_H
-#define CAMEL_MBOX_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-local-store.h"
-
-#define CAMEL_MBOX_STORE_TYPE     (camel_mbox_store_get_type ())
-#define CAMEL_MBOX_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_STORE_TYPE, CamelMboxStore))
-#define CAMEL_MBOX_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass))
-#define CAMEL_IS_MBOX_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_STORE_TYPE))
-
-typedef struct {
-	CamelLocalStore parent_object;	
-	
-} CamelMboxStore;
-
-typedef struct {
-	CamelLocalStoreClass parent_class;
-
-} CamelMboxStoreClass;
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_mbox_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MBOX_STORE_H */
-
-
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
deleted file mode 100644
index b8219b4c78..0000000000
--- a/camel/providers/local/camel-mbox-summary.c
+++ /dev/null
@@ -1,880 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-mbox-summary.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define io(x)
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-#define CAMEL_MBOX_SUMMARY_VERSION (0x1000)
-
-struct _CamelMboxSummaryPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMboxSummary *)(o))->priv)
-
-static int summary_header_load (CamelFolderSummary *, FILE *);
-static int summary_header_save (CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
-static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *);
-static int		  message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *);
-/*static void		  message_info_free (CamelFolderSummary *, CamelMessageInfo *);*/
-
-static int mbox_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static int mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-
-static void camel_mbox_summary_class_init (CamelMboxSummaryClass *klass);
-static void camel_mbox_summary_init       (CamelMboxSummary *obj);
-static void camel_mbox_summary_finalise   (CamelObject *obj);
-
-static CamelLocalSummaryClass *camel_mbox_summary_parent;
-
-CamelType
-camel_mbox_summary_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_local_summary_get_type(), "CamelMboxSummary",
-					   sizeof (CamelMboxSummary),
-					   sizeof (CamelMboxSummaryClass),
-					   (CamelObjectClassInitFunc) camel_mbox_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_mbox_summary_init,
-					   (CamelObjectFinalizeFunc) camel_mbox_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_mbox_summary_class_init(CamelMboxSummaryClass *klass)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *)klass;
-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)klass;
-	
-	camel_mbox_summary_parent = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type());
-
-	sklass->summary_header_load = summary_header_load;
-	sklass->summary_header_save = summary_header_save;
-
-	sklass->message_info_new  = message_info_new;
-	sklass->message_info_new_from_parser = message_info_new_from_parser;
-	sklass->message_info_load = message_info_load;
-	sklass->message_info_save = message_info_save;
-	/*sklass->message_info_free = message_info_free;*/
-
-	lklass->check = mbox_summary_check;
-	lklass->sync = mbox_summary_sync;
-}
-
-static void
-camel_mbox_summary_init(CamelMboxSummary *obj)
-{
-	struct _CamelMboxSummaryPrivate *p;
-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelMboxMessageInfo);
-	s->content_info_size = sizeof(CamelMboxMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_MBOX_SUMMARY_VERSION;
-}
-
-static void
-camel_mbox_summary_finalise(CamelObject *obj)
-{
-	/*CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(obj);*/
-}
-
-/**
- * camel_mbox_summary_new:
- *
- * Create a new CamelMboxSummary object.
- * 
- * Return value: A new CamelMboxSummary widget.
- **/
-CamelMboxSummary *
-camel_mbox_summary_new(const char *filename, const char *mbox_name, ibex *index)
-{
-	CamelMboxSummary *new = (CamelMboxSummary *)camel_object_new(camel_mbox_summary_get_type());
-
-	camel_local_summary_construct((CamelLocalSummary *)new, filename, mbox_name, index);
-	return new;
-}
-
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->summary_header_load(s, in) == -1)
-		return -1;
-
-	return camel_folder_summary_decode_uint32(in, &mbs->folder_size);
-}
-
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->summary_header_save(s, out) == -1)
-		return -1;
-
-	return camel_folder_summary_encode_uint32(out, mbs->folder_size);
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_new(s, h);
-	if (mi) {
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-		mbi->frompos = -1;
-	}
-	
-	return mi;
-}
-
-static CamelMessageInfo *
-message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_new_from_parser(s, mp);
-	if (mi) {
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-		mbi->frompos = camel_mime_parser_tell_start_from(mp);
-	}
-	
-	return mi;
-}
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-
-	io(printf("loading mbox message info\n"));
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_load(s, in);
-	if (mi) {
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-		
-		if (camel_folder_summary_decode_off_t(in, &mbi->frompos) == -1)
-			goto error;
-	}
-	
-	return mi;
-error:
-	camel_folder_summary_info_free(s, mi);
-	return NULL;
-}
-
-static int
-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
-{
-	CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-	io(printf("saving mbox message info\n"));
-
-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_save(s, out, mi) == -1
-	    || camel_folder_summary_encode_off_t(out, mbi->frompos) == -1)
-		return -1;
-
-	return 0;
-}
-
-static int
-summary_rebuild(CamelMboxSummary *mbs, off_t offset, CamelException *ex)
-{
-	CamelLocalSummary *cls = (CamelLocalSummary *)mbs;
-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;
-	CamelMimeParser *mp;
-	int fd;
-	int ok = 0;
-	struct stat st;
-	off_t size = 0;
-
-	/* FIXME: If there is a failure, it shouldn't clear the summary and restart,
-	   it should try and merge the summary info's.  This is a bit tricky. */
-
-	camel_operation_start(NULL, _("Summarising folder"));
-
-	fd = open(cls->folder_path, O_RDONLY);
-	if (fd == -1) {
-		printf("%s failed to open: %s", cls->folder_path, strerror(errno));
-		camel_exception_setv(ex, 1, _("Could not open folder: %s: summarising from position %ld: %s"),
-				     cls->folder_path, offset, strerror(errno));
-		camel_operation_end(NULL);
-		return -1;
-	}
-	
-	if (fstat(fd, &st) == 0)
-		size = st.st_size;
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_init_with_fd(mp, fd);
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_seek(mp, offset, SEEK_SET);
-
-	if (offset > 0) {
-		if (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {
-			if (camel_mime_parser_tell_start_from(mp) != offset) {
-				g_warning("The next message didn't start where I expected, building summary from start");
-				camel_mime_parser_drop_step(mp);
-				offset = 0;
-				camel_mime_parser_seek(mp, offset, SEEK_SET);
-				camel_folder_summary_clear(s);
-			} else {
-				camel_mime_parser_unstep(mp);
-			}
-		} else {
-			d(printf("mime parser state ran out? state is %d\n", camel_mime_parser_state(mp)));
-			camel_object_unref(CAMEL_OBJECT(mp));
-			/* end of file - no content? no error either */
-			camel_operation_end(NULL);
-			return 0;
-		}
-	}
-
-	while (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {
-		CamelMessageInfo *info;
-		int pc = (camel_mime_parser_tell(mp)+1) * 100/size;
-
-		camel_operation_progress(NULL, pc);
-
-		info = camel_folder_summary_add_from_parser(s, mp);
-		if (info == NULL) {
-			camel_exception_setv(ex, 1, _("Fatal mail parser error near position %ld in folder %s"),
-					     camel_mime_parser_tell(mp), cls->folder_path);
-			ok = -1;
-			break;
-		}
-
-		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);
-	}
-
-	camel_object_unref(CAMEL_OBJECT (mp));
-	
-	/* update the file size/mtime in the summary */
-	if (ok != -1) {
-		if (stat(cls->folder_path, &st) == 0) {
-			camel_folder_summary_touch(s);
-			mbs->folder_size = st.st_size;
-			s->time = st.st_mtime;
-		}
-	}
-
-	camel_operation_end(NULL);
-
-	return ok;
-}
-
-/* like summary_rebuild, but also do changeinfo stuff (if supplied) */
-static int
-summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	int ret, i, count;
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
-
-	d(printf("Calling summary update, from pos %d\n", (int)offset));
-
-	if (changeinfo) {
-		/* we use the diff function of the change_info to build the update list. */
-		for (i = 0; i < camel_folder_summary_count(s); i++) {
-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-
-			camel_folder_change_info_add_source(changeinfo, camel_message_info_uid(mi));
-			camel_folder_summary_info_free(s, mi);
-		}
-	}
-
-	/* do the actual work */
-	cls->index_force = FALSE;
-	ret = summary_rebuild(mbs, offset, ex);
-
-	if (changeinfo) {
-		count = camel_folder_summary_count(s);
-		for (i = 0; i < count; i++) {
-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-			camel_folder_change_info_add_update(changeinfo, camel_message_info_uid(mi));
-			camel_folder_summary_info_free(s, mi);
-		}
-		camel_folder_change_info_build_diff(changeinfo);
-	}
-
-	return ret;
-}
-
-static int
-mbox_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-	struct stat st;
-	int ret = 0;
-
-	d(printf("Checking summary\n"));
-
-	/* check if the summary is up-to-date */
-	if (stat(cls->folder_path, &st) == -1) {
-		camel_folder_summary_clear(s);
-		camel_exception_setv(ex, 1, _("Cannot summarise folder: %s: %s"), cls->folder_path, strerror(errno));
-		return -1;
-	}
-
-	if (st.st_size == 0) {
-		/* empty?  No need to scan at all */
-		d(printf("Empty mbox, clearing summary\n"));
-		camel_folder_summary_clear(s);
-		ret = 0;
-	} else if (s->messages->len == 0) {
-		/* if we are empty, then we rebuilt from scratch */
-		d(printf("Empty summary, rebuilding from start\n"));
-		ret = summary_update(cls, 0, changes, ex);
-	} else {
-		/* is the summary uptodate? */
-		if (st.st_size != mbs->folder_size || st.st_mtime != s->time) {
-			if (mbs->folder_size < st.st_size) {
-				/* this will automatically rescan from 0 if there is a problem */
-				d(printf("folder grew, attempting to rebuild from %d\n", mbs->folder_size));
-				ret = summary_update(cls, mbs->folder_size, changes, ex);
-			} else {
-				d(printf("folder shrank!  rebuilding from start\n"));
-				camel_folder_summary_clear(s);
-				ret = summary_update(cls, 0, changes, ex);
-			}
-		}
-	}
-
-	/* FIXME: move upstream? */
-
-	if (ret != -1) {
-		mbs->folder_size = st.st_size;
-		s->time = st.st_mtime;
-#if 0
-		/* this failing is not a fatal event */
-		if (camel_folder_summary_save(s) == -1)
-			g_warning("Could not save summary: %s", strerror(errno));
-		if (cls->index)
-			ibex_save(cls->index);
-#endif
-	}
-
-	return ret;
-}
-
-static char *tz_months[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *tz_days[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-/* tries to build a From line, based on message headers */
-char *
-camel_mbox_summary_build_from(struct _header_raw *header)
-{
-	GString *out = g_string_new("From ");
-	char *ret;
-	const char *tmp;
-	time_t thetime;
-	int offset;
-	struct tm tm;
-
-	tmp = header_raw_find(&header, "Sender", NULL);
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "From", NULL);
-	if (tmp != NULL) {
-		struct _header_address *addr = header_address_decode(tmp);
-
-		tmp = NULL;
-		if (addr) {
-			if (addr->type == HEADER_ADDRESS_NAME) {
-				g_string_append(out, addr->v.addr);
-				tmp = "";
-			}
-			header_address_unref(addr);
-		}
-	}
-	if (tmp == NULL) {
-		g_string_append(out, "unknown@nodomain.now.au");
-	}
-
-	/* try use the received header to get the date */
-	tmp = header_raw_find(&header, "Received", NULL);
-	if (tmp) {
-		tmp = strrchr(tmp, ';');
-		if (tmp)
-			tmp++;
-	}
-
-	/* if there isn't one, try the Date field */
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "Date", NULL);
-
-	thetime = header_decode_date(tmp, &offset);
-
-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;
-
-	/* a pseudo, but still bogus attempt at thread safing the function */
-	/*memcpy(&tm, gmtime(&thetime), sizeof(tm));*/
-	gmtime_r(&thetime, &tm);
-
-	g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n",
-			  tz_days[tm.tm_wday],
-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-/* perform a full sync */
-static int
-mbox_summary_sync_full(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;
-	CamelMimeParser *mp = NULL;
-	int i, count;
-	CamelMboxMessageInfo *info = NULL;
-	int fd = -1, fdout = -1;
-	char *tmpname = NULL;
-	char *buffer, *xevnew = NULL;
-	int len;
-	const char *fromline;
-	int lastdel = FALSE;
-
-	d(printf("performing full summary/sync\n"));
-
-	camel_operation_start(NULL, _("Synchronising folder"));
-
-	fd = open(cls->folder_path, O_RDONLY);
-	if (fd == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not open folder to summarise: %s: %s"),
-				     cls->folder_path, strerror(errno));
-		camel_operation_end(NULL);
-		return -1;
-	}
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_scan_pre_from(mp, TRUE);
-	camel_mime_parser_init_with_fd(mp, fd);
-
-	tmpname = alloca(strlen (cls->folder_path) + 5);
-	sprintf(tmpname, "%s.tmp", cls->folder_path);
-	d(printf("Writing tmp file to %s\n", tmpname));
-	fdout = open(tmpname, O_WRONLY|O_CREAT|O_TRUNC, 0600);
-	if (fdout == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot open temporary mailbox: %s"), strerror(errno));
-		goto error;
-	}
-
-	count = camel_folder_summary_count(s);
-	for (i = 0; i < count; i++) {
-		int pc = (i+1)*100/count;
-
-		camel_operation_progress(NULL, pc);
-
-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);
-
-		g_assert(info);
-
-		d(printf("Looking at message %s\n", info->info.uid));
-
-		/* only need to seek past deleted messages, otherwise we should be at the right spot/state already */
-		if (lastdel) {
-			d(printf("seeking to %d\n", (int)info->frompos));
-			camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
-		}
-
-		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM) {
-			g_warning("Expected a From line here, didn't get it");
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Summary and folder mismatch, even after a sync"));
-			goto error;
-		}
-
-		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
-			g_warning("Didn't get the next message where I expected (%d) got %d instead",
-				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Summary and folder mismatch, even after a sync"));
-			goto error;
-		}
-
-		lastdel = FALSE;
-		if (expunge && info->info.flags & CAMEL_MESSAGE_DELETED) {
-			const char *uid = camel_message_info_uid(info);
-
-			d(printf("Deleting %s\n", uid));
-
-			if (cls->index)
-				ibex_unindex(cls->index, (char *)uid);
-
-			/* remove it from the change list */
-			camel_folder_change_info_remove_uid(changeinfo, uid);
-			camel_folder_summary_remove(s, (CamelMessageInfo *)info);
-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-			count--;
-			i--;
-			info = NULL;
-			lastdel = TRUE;
-		} else {
-			/* otherwise, the message is staying, copy its From_ line across */
-			if (i>0) {
-				write(fdout, "\n", 1);
-			}
-			info->frompos = lseek(fdout, 0, SEEK_CUR);
-			fromline = camel_mime_parser_from_line(mp);
-			write(fdout, fromline, strlen(fromline));
-		}
-
-		if (info && info->info.flags & (CAMEL_MESSAGE_FOLDER_NOXEV | CAMEL_MESSAGE_FOLDER_FLAGGED)) {
-			d(printf("Updating header for %s flags = %08x\n", info->info.uid, info->info.flags));
-
-			if (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM_END) {
-				g_warning("camel_mime_parser_step failed (2)");
-				goto error;
-			}
-
-			xevnew = camel_local_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);
-			if (camel_local_summary_write_headers(fdout, camel_mime_parser_headers_raw(mp), xevnew) == -1) {
-				d(printf("Error writing to tmp mailbox\n"));
-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Error writing to temp mailbox: %s"),
-						     strerror(errno));
-				goto error;
-			}
-			info->info.flags &= 0xffff;
-			g_free(xevnew);
-			xevnew = NULL;
-			camel_mime_parser_drop_step(mp);
-		}
-
-		camel_mime_parser_drop_step(mp);
-		if (info) {
-			d(printf("looking for message content to copy across from %d\n", (int)camel_mime_parser_tell(mp)));
-			while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_PRE_FROM) {
-				d(printf("copying mbox contents to tmp: '%.*s'\n", len, buffer));
-				if (write(fdout, buffer, len) != len) {
-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Writing to tmp mailbox failed: %s: %s"),
-							     cls->folder_path, strerror(errno));
-					goto error;
-				}
-			}
-			d(printf("we are now at %d, from = %d\n", (int)camel_mime_parser_tell(mp),
-				 (int)camel_mime_parser_tell_start_from(mp)));
-			camel_mime_parser_unstep(mp);
-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-			info = NULL;
-		}
-	}
-
-	d(printf("Closing folders\n"));
-
-	if (close(fd) == -1) {
-		g_warning("Cannot close source folder: %s", strerror(errno));
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not close source folder %s: %s"),
-				     cls->folder_path, strerror(errno));
-		fd = -1;
-		goto error;
-	}
-
-	if (close(fdout) == -1) {
-		g_warning("Cannot close tmp folder: %s", strerror(errno));
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not close temp folder: %s"),
-				     strerror(errno));
-		fdout = -1;
-		goto error;
-	}
-
-	/* this should probably either use unlink/link/unlink, or recopy over
-	   the original mailbox, for various locking reasons/etc */
-	if (rename(tmpname, cls->folder_path) == -1) {
-		g_warning("Cannot rename folder: %s", strerror(errno));
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not rename folder: %s"),
-				     strerror(errno));
-		goto error;
-	}
-	tmpname = NULL;
-
-	camel_object_unref((CamelObject *)mp);
-	camel_operation_end(NULL);
-		
-	return 0;
- error:
-	if (fd != -1)
-		close(fd);
-	
-	if (fdout != -1)
-		close(fdout);
-	
-	g_free(xevnew);
-	
-	if (tmpname)
-		unlink(tmpname);
-	if (mp)
-		camel_object_unref((CamelObject *)mp);
-	if (info)
-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-
-	camel_operation_end(NULL);
-
-	return -1;
-}
-
-/* perform a quick sync - only system flags have changed */
-static int
-mbox_summary_sync_quick(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;
-	CamelMimeParser *mp = NULL;
-	int i, count;
-	CamelMboxMessageInfo *info = NULL;
-	int fd = -1;
-	char *xevnew, *xevtmp;
-	const char *xev;
-	int len;
-	off_t lastpos;
-
-	d(printf("Performing quick summary sync\n"));
-
-	camel_operation_start(NULL, _("Synchronising folder"));
-
-	fd = open(cls->folder_path, O_RDWR);
-	if (fd == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not open folder to summarise: %s: %s"),
-				     cls->folder_path, strerror(errno));
-
-		camel_operation_end(NULL);
-		return -1;
-	}
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_scan_pre_from(mp, TRUE);
-	camel_mime_parser_init_with_fd(mp, fd);
-
-	count = camel_folder_summary_count(s);
-	for (i = 0; i < count; i++) {
-		int xevoffset;
-		int pc = (i+1)*100/count;
-
-		camel_operation_progress(NULL, pc);
-
-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);
-
-		g_assert(info);
-
-		d(printf("Checking message %s %08x\n", info->info.uid, info->info.flags));
-
-		if ((info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) == 0) {
-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-			info = NULL;
-			continue;
-		}
-
-		d(printf("Updating message %s\n", info->info.uid));
-
-		camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
-
-		if (camel_mime_parser_step(mp, 0, 0) != HSCAN_FROM) {
-			g_warning("Expected a From line here, didn't get it");
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Summary and folder mismatch, even after a sync"));
-			goto error;
-		}
-
-		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
-			g_warning("Didn't get the next message where I expected (%d) got %d instead",
-				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Summary and folder mismatch, even after a sync"));
-			goto error;
-		}
-
-		if (camel_mime_parser_step(mp, 0, 0) == HSCAN_FROM_END) {
-			g_warning("camel_mime_parser_step failed (2)");
-			goto error;
-		}
-
-		xev = camel_mime_parser_header(mp, "X-Evolution", &xevoffset);
-		if (xev == NULL || camel_local_summary_decode_x_evolution(cls, xev, NULL) == -1) {
-			g_warning("We're supposed to have a valid x-ev header, but we dont");
-			goto error;
-		}
-		xevnew = camel_local_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);
-		/* SIGH: encode_param_list is about the only function which folds headers by itself.
-		   This should be fixed somehow differently (either parser doesn't fold headers,
-		   or param_list doesn't, or something */
-		xevtmp = header_unfold(xevnew);
-		/* the raw header contains a leading ' ', so (dis)count that too */
-		if (strlen(xev)-1 != strlen(xevtmp)) {
-			g_free(xevnew);
-			g_free(xevtmp);
-			g_warning("Hmm, the xev headers shouldn't have changed size, but they did");
-			goto error;
-		}
-		g_free(xevtmp);
-
-		/* we write out the xevnew string, assuming its been folded identically to the original too! */
-
-		lastpos = lseek(fd, 0, SEEK_CUR);
-		lseek(fd, xevoffset+strlen("X-Evolution: "), SEEK_SET);
-		do {
-			len = write(fd, xevnew, strlen(xevnew));
-		} while (len == -1 && errno == EINTR);
-		lseek(fd, lastpos, SEEK_SET);
-		g_free(xevnew);
-
-		camel_mime_parser_drop_step(mp);
-		camel_mime_parser_drop_step(mp);
-
-		info->info.flags &= 0xffff;
-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-	}
-
-	d(printf("Closing folders\n"));
-
-	if (close(fd) == -1) {
-		g_warning("Cannot close source folder: %s", strerror(errno));
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not close source folder %s: %s"),
-				     cls->folder_path, strerror(errno));
-		fd = -1;
-		goto error;
-	}
-
-	camel_object_unref((CamelObject *)mp);
-
-	camel_operation_end(NULL);
-	
-	return 0;
- error:
-	if (fd != -1)
-		close(fd);
-	if (mp)
-		camel_object_unref((CamelObject *)mp);
-	if (info)
-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);
-
-	camel_operation_end(NULL);
-
-	return -1;
-}
-
-static int
-mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	struct stat st;
-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
-	CamelFolderSummary *s = (CamelFolderSummary *)cls;
-	int i, count;
-	int quick = TRUE, work=FALSE;
-	int ret;
-
-	/* first, sync ourselves up, just to make sure */
-	summary_update(cls, mbs->folder_size, changeinfo, ex);
-	if (camel_exception_is_set(ex))
-		return -1;
-
-	count = camel_folder_summary_count(s);
-	if (count == 0)
-		return 0;
-
-	/* check what work we have to do, if any */
-	for (i=0;quick && i<count; i++) {
-		CamelMessageInfo *info = camel_folder_summary_index(s, i);
-		g_assert(info);
-		if ((expunge && (info->flags & CAMEL_MESSAGE_DELETED)) ||
-		    (info->flags & (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_XEVCHANGE)))
-			quick = FALSE;
-		else
-			work |= (info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0;
-		camel_folder_summary_info_free(s, info);
-	}
-
-	/* yuck i hate this logic, but its to simplify the 'all ok, update summary' and failover cases */
-	ret = -1;
-	if (quick) {
-		if (work) {
-			ret = mbox_summary_sync_quick(cls, expunge, changeinfo, ex);
-			if (ret == -1) {
-				g_warning("failed a quick-sync, trying a full sync");
-				camel_exception_clear(ex);
-			}
-		} else {
-			ret = 0;
-		}
-	}
-
-	if (ret == -1)
-		ret = mbox_summary_sync_full(cls, expunge, changeinfo, ex);
-	if (ret == -1)
-		return -1;
-
-	if (stat(cls->folder_path, &st) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unknown error: %s"), strerror(errno));
-		return -1;
-	}
-
-	camel_folder_summary_touch(s);
-	s->time = st.st_mtime;
-	mbs->folder_size = st.st_size;
-	camel_folder_summary_save(s);
-
-	return 0;
-}
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
deleted file mode 100644
index e24c2b4cdd..0000000000
--- a/camel/providers/local/camel-mbox-summary.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU 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 _CAMEL_MBOX_SUMMARY_H
-#define _CAMEL_MBOX_SUMMARY_H
-
-#include "camel-local-summary.h"
-
-#define CAMEL_MBOX_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_mbox_summary_get_type (), CamelMboxSummary)
-#define CAMEL_MBOX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass)
-#define CAMEL_IS_MBOX_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mbox_summary_get_type ())
-
-typedef struct _CamelMboxSummary      CamelMboxSummary;
-typedef struct _CamelMboxSummaryClass CamelMboxSummaryClass;
-
-typedef struct _CamelMboxMessageContentInfo {
-	CamelMessageContentInfo info;
-} CamelMboxMessageContentInfo;
-
-typedef struct _CamelMboxMessageInfo {
-	CamelMessageInfo info;
-
-	off_t frompos;
-} CamelMboxMessageInfo;
-
-struct _CamelMboxSummary {
-	CamelLocalSummary parent;
-
-	struct _CamelMboxSummaryPrivate *priv;
-
-	size_t folder_size;	/* size of the mbox file, last sync */
-};
-
-struct _CamelMboxSummaryClass {
-	CamelLocalSummaryClass parent_class;
-};
-
-guint		camel_mbox_summary_get_type	(void);
-CamelMboxSummary      *camel_mbox_summary_new	(const char *filename, const char *mbox_name, ibex *index);
-
-/* generate a From line from headers */
-char *camel_mbox_summary_build_from(struct _header_raw *header);
-
-#endif /* ! _CAMEL_MBOX_SUMMARY_H */
-
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
deleted file mode 100644
index fec620edea..0000000000
--- a/camel/providers/local/camel-mh-folder.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-mh-folder.h"
-#include "camel-mh-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-mh-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-exception.h"
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-static CamelLocalFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelMhFolder */
-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMHS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelLocalSummary *mh_create_summary(const char *path, const char *folder, ibex *index);
-
-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);
-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);
-
-static void mh_finalize(CamelObject * object);
-
-static void camel_mh_folder_class_init(CamelObjectClass * camel_mh_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mh_folder_class);
-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_mh_folder_class;
-
-	parent_class = CAMEL_LOCAL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_local_folder_get_type()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->append_message = mh_append_message;
-	camel_folder_class->get_message = mh_get_message;
-
-	lclass->create_summary = mh_create_summary;
-}
-
-static void mh_init(gpointer object, gpointer klass)
-{
-	/*CamelFolder *folder = object;
-	  CamelMhFolder *mh_folder = object;*/
-}
-
-static void mh_finalize(CamelObject * object)
-{
-	/*CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(object);*/
-}
-
-CamelType camel_mh_folder_get_type(void)
-{
-	static CamelType camel_mh_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mh_folder_type == CAMEL_INVALID_TYPE) {
-		camel_mh_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMhFolder",
-							   sizeof(CamelMhFolder),
-							   sizeof(CamelMhFolderClass),
-							   (CamelObjectClassInitFunc) camel_mh_folder_class_init,
-							   NULL,
-							   (CamelObjectInitFunc) mh_init,
-							   (CamelObjectFinalizeFunc) mh_finalize);
-	}
-
-	return camel_mh_folder_type;
-}
-
-CamelFolder *
-camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	d(printf("Creating mh folder: %s\n", full_name));
-
-	folder = (CamelFolder *)camel_object_new(CAMEL_MH_FOLDER_TYPE);
-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,
-							     parent_store, full_name, flags, ex);
-
-	return folder;
-}
-
-static CamelLocalSummary *mh_create_summary(const char *path, const char *folder, ibex *index)
-{
-	return (CamelLocalSummary *)camel_mh_summary_new(path, folder, index);
-}
-
-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = (CamelMhFolder *)folder;
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelStream *output_stream;
-	CamelMessageInfo *mi;
-	char *name;
-
-	/* FIXME: probably needs additional locking (although mh doesn't appear do do it) */
-
-	d(printf("Appending message\n"));
-
-	/* add it to the summary/assign the uid, etc */
-	mi = camel_local_summary_add((CamelLocalSummary *)folder->summary, message, info, lf->changes, ex);
-	if (camel_exception_is_set(ex)) {
-		return;
-	}
-
-	d(printf("Appending message: uid is %s\n", camel_message_info_uid(mi)));
-
-	/* write it out, use the uid we got from the summary */
-	name = g_strdup_printf("%s/%s", lf->folder_path, camel_message_info_uid(mi));
-	output_stream = camel_stream_fs_new_with_name(name, O_WRONLY|O_CREAT, 0600);
-	if (output_stream == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to mh folder: %s: %s"), name, g_strerror(errno));
-		g_free(name);
-		return;
-	}
-
-	if (camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, output_stream) == -1
-	    || camel_stream_close(output_stream) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to mh folder: %s: %s"), name, g_strerror(errno));
-		camel_object_unref((CamelObject *)output_stream);
-		unlink(name);
-		g_free(name);
-		return;
-	}
-
-	/* close this? */
-	camel_object_unref((CamelObject *)output_stream);
-
-	g_free(name);
-
-	camel_object_trigger_event((CamelObject *)folder, "folder_changed", ((CamelLocalFolder *)mh_folder)->changes);
-	camel_folder_change_info_clear(((CamelLocalFolder *)mh_folder)->changes);
-}
-
-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)
-{
-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelMessageInfo *info;
-	char *name;
-
-	d(printf("getting message: %s\n", uid));
-
-	/* get the message summary info */
-	if ((info = camel_folder_summary_uid(folder->summary, uid)) == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"), uid, _("No such message"));
-		return NULL;
-	}
-
-	/* we only need it to check the message exists */
-	camel_folder_summary_info_free(folder->summary, info);
-
-	name = g_strdup_printf("%s/%s", lf->folder_path, uid);
-	if ((message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0)) == NULL) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),
-				     name, g_strerror(errno));
-		g_free(name);
-		return NULL;
-	}
-
-	message = camel_mime_message_new();
-	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, message_stream) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),
-				     name, _("Invalid message contents"));
-		g_free(name);
-		camel_object_unref((CamelObject *)message_stream);
-		camel_object_unref((CamelObject *)message);
-		return NULL;
-
-	}
-	camel_object_unref((CamelObject *)message_stream);
-	g_free(name);
-
-	return message;
-}
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
deleted file mode 100644
index 175aef2946..0000000000
--- a/camel/providers/local/camel-mh-folder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors:
- * 	Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MH_FOLDER_H
-#define CAMEL_MH_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-#include "camel-local-folder.h"
-
-#define CAMEL_MH_FOLDER_TYPE     (camel_mh_folder_get_type ())
-#define CAMEL_MH_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_FOLDER_TYPE, CamelMhFolder))
-#define CAMEL_MH_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass))
-#define CAMEL_IS_MH_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE))
-
-typedef struct {
-	CamelLocalFolder parent_object;
-
-} CamelMhFolder;
-
-typedef struct {
-	CamelLocalFolderClass parent_class;
-	
-	/* Virtual methods */
-	
-} CamelMhFolderClass;
-
-/* public methods */
-CamelFolder *camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_mh_folder_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MH_FOLDER_H */
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
deleted file mode 100644
index a488a71c12..0000000000
--- a/camel/providers/local/camel-mh-store.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "camel-mh-store.h"
-#include "camel-mh-folder.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-static CamelLocalStoreClass *parent_class = NULL;
-
-/* Returns the class for a CamelMhStore */
-#define CMHS_CLASS(so) CAMEL_MH_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);
-
-static void camel_mh_store_class_init(CamelObjectClass * camel_mh_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_mh_store_class);
-	/*CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_mh_store_class);*/
-
-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());
-
-	/* virtual method overload, use defaults for most */
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-}
-
-CamelType camel_mh_store_get_type(void)
-{
-	static CamelType camel_mh_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mh_store_type == CAMEL_INVALID_TYPE) {
-		camel_mh_store_type = camel_type_register(CAMEL_LOCAL_STORE_TYPE, "CamelMhStore",
-							  sizeof(CamelMhStore),
-							  sizeof(CamelMhStoreClass),
-							  (CamelObjectClassInitFunc) camel_mh_store_class_init,
-							  NULL,
-							  NULL,
-							  NULL);
-	}
-
-	return camel_mh_store_type;
-}
-
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)
-{
-	char *name;
-	struct stat st;
-
-	(void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex);
-	if (camel_exception_is_set(ex))
-		return NULL;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-
-	if (stat(name, &st) == -1) {
-		if (errno != ENOENT) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not open folder `%s':\n%s"),
-					     folder_name, g_strerror(errno));
-			g_free (name);
-			return NULL;
-		}
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s' does not exist."), folder_name);
-			g_free (name);
-			return NULL;
-		}
-		if (mkdir(name, 0700) != 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not create folder `%s':\n%s"),
-					     folder_name, g_strerror(errno));
-			g_free (name);
-			return NULL;
-		}
-	} else if (!S_ISDIR(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a directory."), name);
-		g_free (name);
-		return NULL;
-	}
-	g_free(name);
-
-	return camel_mh_folder_new(store, folder_name, flags, ex);
-}
-
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)
-{
-	char *name;
-
-	/* remove folder directory - will fail if not empty */
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-	if (rmdir(name) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder `%s': %s"),
-				     folder_name, strerror(errno));
-		g_free(name);
-		return;
-	}
-	g_free(name);
-
-	/* and remove metadata */
-	((CamelStoreClass *)parent_class)->delete_folder(store, folder_name, ex);
-}
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
deleted file mode 100644
index f1f8eb9983..0000000000
--- a/camel/providers/local/camel-mh-store.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU 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 CAMEL_MH_STORE_H
-#define CAMEL_MH_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-
-#include "camel-local-store.h"
-
-#define CAMEL_MH_STORE_TYPE     (camel_mh_store_get_type ())
-#define CAMEL_MH_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_STORE_TYPE, CamelMhStore))
-#define CAMEL_MH_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass))
-#define CAMEL_IS_MH_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_STORE_TYPE))
-
-typedef struct {
-	CamelLocalStore parent_object;
-	
-} CamelMhStore;
-
-typedef struct {
-	CamelLocalStoreClass parent_class;
-	
-} CamelMhStoreClass;
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_mh_store_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MH_STORE_H */
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
deleted file mode 100644
index c933626653..0000000000
--- a/camel/providers/local/camel-mh-summary.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mh-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <ctype.h>
-
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-
-#define CAMEL_MH_SUMMARY_VERSION (0x2000)
-
-static int mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-static int mh_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-/*static int mh_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);*/
-
-static char *mh_summary_next_uid_string(CamelFolderSummary *s);
-
-static void camel_mh_summary_class_init	(CamelMhSummaryClass *class);
-static void camel_mh_summary_init	(CamelMhSummary *gspaper);
-static void camel_mh_summary_finalise	(CamelObject *obj);
-
-#define _PRIVATE(x) (((CamelMhSummary *)(x))->priv)
-
-struct _CamelMhSummaryPrivate {
-	char *current_uid;
-};
-
-static CamelLocalSummaryClass *parent_class;
-
-CamelType
-camel_mh_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_local_summary_get_type (), "CamelMhSummary",
-					   sizeof(CamelMhSummary),
-					   sizeof(CamelMhSummaryClass),
-					   (CamelObjectClassInitFunc)camel_mh_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc)camel_mh_summary_init,
-					   (CamelObjectFinalizeFunc)camel_mh_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_mh_summary_class_init (CamelMhSummaryClass *class)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;
-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)class;
-
-	parent_class = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type ());
-
-	/* override methods */
-	sklass->next_uid_string = mh_summary_next_uid_string;
-
-	lklass->check = mh_summary_check;
-	lklass->sync = mh_summary_sync;
-	/*lklass->add = mh_summary_add;*/
-}
-
-static void
-camel_mh_summary_init (CamelMhSummary *o)
-{
-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;
-
-	o->priv = g_malloc0(sizeof(*o->priv));
-	/* set unique file version */
-	s->version += CAMEL_MH_SUMMARY_VERSION;
-}
-
-static void
-camel_mh_summary_finalise(CamelObject *obj)
-{
-	CamelMhSummary *o = (CamelMhSummary *)obj;
-
-	g_free(o->priv);
-}
-
-/**
- * camel_mh_summary_new:
- *
- * Create a new CamelMhSummary object.
- * 
- * Return value: A new #CamelMhSummary object.
- **/
-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index)
-{
-	CamelMhSummary *o = (CamelMhSummary *)camel_object_new(camel_mh_summary_get_type ());
-
-	camel_local_summary_construct((CamelLocalSummary *)o, filename, mhdir, index);
-	return o;
-}
-
-static char *mh_summary_next_uid_string(CamelFolderSummary *s)
-{
-	CamelMhSummary *mhs = (CamelMhSummary *)s;
-	CamelLocalSummary *cls = (CamelLocalSummary *)s;
-	int fd = -1;
-	guint32 uid;
-	char *name;
-
-	/* if we are working to add an existing file, then use current_uid */
-	if (mhs->priv->current_uid)
-		return g_strdup(mhs->priv->current_uid);
-
-	/* else scan for one - and create it too, to make sure */
-	do {
-		close(fd);
-		uid = camel_folder_summary_next_uid(s);
-		name = g_strdup_printf("%s/%u", cls->folder_path, uid);
-		/* O_EXCL isn't guaranteed, sigh.  Oh well, bad luck, mh has problems anyway */
-		fd = open(name, O_WRONLY|O_CREAT|O_EXCL, 0600);
-		g_free(name);
-	} while (fd == -1 && errno == EEXIST);
-
-	close(fd);
-
-	return g_strdup_printf("%u", uid);
-}
-
-static int camel_mh_summary_add(CamelLocalSummary *cls, const char *name, int forceindex)
-{
-	CamelMhSummary *mhs = (CamelMhSummary *)cls;
-	char *filename = g_strdup_printf("%s/%s", cls->folder_path, name);
-	int fd;
-	CamelMimeParser *mp;
-
-	d(printf("summarising: %s\n", name));
-
-	fd = open(filename, O_RDONLY);
-	if (fd == -1) {
-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));
-		g_free(filename);
-		return -1;
-	}
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, FALSE);
-	camel_mime_parser_init_with_fd(mp, fd);
-	if (cls->index && (forceindex || !ibex_contains_name(cls->index, (char *)name))) {
-		d(printf("forcing indexing of message content\n"));
-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, cls->index);
-	} else {
-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);
-	}
-	mhs->priv->current_uid = (char *)name;
-	camel_folder_summary_add_from_parser((CamelFolderSummary *)mhs, mp);
-	camel_object_unref((CamelObject *)mp);
-	mhs->priv->current_uid = NULL;
-	camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);
-	g_free(filename);
-	return 0;
-}
-
-static void
-remove_summary(char *key, CamelMessageInfo *info, CamelLocalSummary *cls)
-{
-	d(printf("removing message %s from summary\n", key));
-	if (cls->index)
-		ibex_unindex(cls->index, (char *)camel_message_info_uid(info));
-	camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-	camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-}
-
-static int
-mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	DIR *dir;
-	struct dirent *d;
-	char *p, c;
-	CamelMessageInfo *info;
-	GHashTable *left;
-	int i, count;
-	int forceindex;
-
-	/* FIXME: Handle changeinfo */
-
-	d(printf("checking summary ...\n"));
-
-	/* scan the directory, check for mail files not in the index, or index entries that
-	   no longer exist */
-	dir = opendir(cls->folder_path);
-	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open MH directory path: %s: %s", cls->folder_path, strerror(errno));
-		return -1;
-	}
-
-	/* keeps track of all uid's that have not been processed */
-	left = g_hash_table_new(g_str_hash, g_str_equal);
-	count = camel_folder_summary_count((CamelFolderSummary *)cls);
-	forceindex = count == 0;
-	for (i=0;i<count;i++) {
-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);
-		if (info) {
-			g_hash_table_insert(left, (char *)camel_message_info_uid(info), info);
-		}
-	}
-
-	while ( (d = readdir(dir)) ) {
-		/* FIXME: also run stat to check for regular file */
-		p = d->d_name;
-		while ( (c = *p++) ) {
-			if (!isdigit(c))
-				break;
-		}
-		if (c==0) {
-			info = camel_folder_summary_uid((CamelFolderSummary *)cls, d->d_name);
-			if (info == NULL || (cls->index && (!ibex_contains_name(cls->index, d->d_name)))) {
-				/* need to add this file to the summary */
-				if (info != NULL) {
-					g_hash_table_remove(left, camel_message_info_uid(info));
-					camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-					camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-				}
-				camel_mh_summary_add(cls, d->d_name, forceindex);
-			} else {
-				const char *uid = camel_message_info_uid(info);
-				CamelMessageInfo *old = g_hash_table_lookup(left, uid);
-
-				if (old) {
-					camel_folder_summary_info_free((CamelFolderSummary *)cls, old);
-					g_hash_table_remove(left, uid);
-				}
-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-			}	
-		}
-	}
-	closedir(dir);
-	g_hash_table_foreach(left, (GHFunc)remove_summary, cls);
-	g_hash_table_destroy(left);
-
-	/* FIXME: move this up a class */
-
-	/* force a save of the index, just to make sure */
-	/* note this could be expensive so possibly shouldn't be here
-	   as such */
-	if (cls->index) {
-		ibex_save(cls->index);
-	}
-
-	return 0;
-}
-
-static int
-mh_summary_sync_message(CamelLocalSummary *cls, CamelMessageInfo *info, CamelException *ex)
-{
-	CamelMimeParser *mp;
-	const char *xev, *buffer;
-	int xevoffset;
-	int fd, outfd, len, outlen, ret=0;
-	char *name, *tmpname, *xevnew;
-
-	name = g_strdup_printf("%s/%s", cls->folder_path, camel_message_info_uid(info));
-	fd = open(name, O_RDWR);
-	if (fd == -1)
-		return -1;
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_init_with_fd(mp, fd);
-	if (camel_mime_parser_step(mp, 0, 0) != HSCAN_EOF) {
-		xev = camel_mime_parser_header(mp, "X-Evolution", &xevoffset);
-		d(printf("xev = '%s'\n", xev));
-		xevnew = camel_local_summary_encode_x_evolution(cls, info);
-		if (xev == NULL
-		    || camel_local_summary_decode_x_evolution(cls, xev, NULL) == -1
-		    || strlen(xev)-1 != strlen(xevnew)) {
-
-			d(printf("camel local summary_decode_xev = %d\n", camel_local_summary_decode_x_evolution(cls, xev, NULL)));
-
-			/* need to write a new copy/unlink old */
-			tmpname = g_strdup_printf("%s/.tmp.%d.%s", cls->folder_path, getpid(), camel_message_info_uid(info));
-			d(printf("old xev was %d %s new xev is %d %s\n", strlen(xev), xev, strlen(xevnew), xevnew));
-			d(printf("creating new message %s\n", tmpname));
-			outfd = open(tmpname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
-			if (outfd != -1) {
-				outlen = 0;
-				len = camel_local_summary_write_headers(outfd, camel_mime_parser_headers_raw(mp), xevnew);
-				if (len != -1) {
-					while (outlen != -1 && (len = camel_mime_parser_read(mp, &buffer, 10240)) > 0) {
-						d(printf("camel mime parser read, read %d bytes: %.*s\n", len, len, buffer));
-						do {
-							outlen = write(outfd, buffer, len);
-						} while (outlen == -1 && errno == EINTR);
-					}
-				}
-
-				d(printf("len = %d outlen = %d, renaming/finishing\n", len, outlen));
-				if (close(outfd) == -1
-				    || len == -1
-				    || outlen == -1
-				    || rename(tmpname, name) == -1) {
-					unlink(tmpname);
-					ret = -1;
-				}
-			} else {
-				g_warning("sync can't create tmp file: %s", strerror(errno));
-			}
-			g_free(tmpname);
-		} else {
-			d(printf("stamping in updated X-EV at %d\n", (int)xevoffset));
-			/* else, we can just update the flags field */
-			lseek(fd, xevoffset+strlen("X-Evolution: "), SEEK_SET);
-			do {
-				len = write(fd, xevnew, strlen(xevnew));
-			} while (len == -1 && errno == EINTR);
-			if (len == -1)
-				ret = -1;
-		}
-
-		g_free(xevnew);
-	}
-
-	camel_object_unref((CamelObject *)mp);
-	g_free(name);
-	return ret;
-}
-
-/* sync the summary file with the ondisk files */
-static int
-mh_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	int count, i;
-	CamelMessageInfo *info;
-	char *name;
-	const char *uid;
-
-	d(printf("summary_sync(expunge=%s)\n", expunge?"true":"false"));
-
-	/* we could probably get away without this ... but why not use it, esp if we're going to
-	   be doing any significant io already */
-	if (camel_local_summary_check(cls, changes, ex) == -1)
-		return -1;
-
-	count = camel_folder_summary_count((CamelFolderSummary *)cls);
-	for (i=count-1;i>=0;i--) {
-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);
-		g_assert(info);
-		if (expunge && (info->flags & CAMEL_MESSAGE_DELETED)) {
-			uid = camel_message_info_uid(info);
-			name = g_strdup_printf("%s/%s", cls->folder_path, uid);
-			d(printf("deleting %s\n", name));
-			if (unlink(name) == 0 || errno==ENOENT) {
-
-				/* FIXME: put this in folder_summary::remove()? */
-				if (cls->index)
-					ibex_unindex(cls->index, (char *)uid);
-				
-				camel_folder_change_info_remove_uid(changes, uid);
-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);
-			}
-			g_free(name);
-		} else if (info->flags & (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED)) {
-			if (mh_summary_sync_message(cls, info, ex) != -1) {
-				info->flags &= 0xffff;
-			} else {
-				g_warning("Problem occured when trying to expunge, ignored");
-			}
-		}
-		camel_folder_summary_info_free((CamelFolderSummary *)cls, info);
-	}
-
-	return 0;
-}
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
deleted file mode 100644
index 52cc496610..0000000000
--- a/camel/providers/local/camel-mh-summary.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MH_SUMMARY_H
-#define _CAMEL_MH_SUMMARY_H
-
-#include "camel-local-summary.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MH_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_mh_summary_get_type (), CamelMhSummary)
-#define CAMEL_MH_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass)
-#define CAMEL_IS_MH_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mh_summary_get_type ())
-
-typedef struct _CamelMhSummary	CamelMhSummary;
-typedef struct _CamelMhSummaryClass	CamelMhSummaryClass;
-
-struct _CamelMhSummary {
-	CamelLocalSummary parent;
-	struct _CamelMhSummaryPrivate *priv;
-};
-
-struct _CamelMhSummaryClass {
-	CamelLocalSummaryClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-CamelType	 camel_mh_summary_get_type	(void);
-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index);
-
-#endif /* ! _CAMEL_MH_SUMMARY_H */
-
diff --git a/camel/providers/local/libcamellocal.urls b/camel/providers/local/libcamellocal.urls
deleted file mode 100644
index 35a7049145..0000000000
--- a/camel/providers/local/libcamellocal.urls
+++ /dev/null
@@ -1,3 +0,0 @@
-mh
-mbox
-maildir
diff --git a/camel/providers/nntp/.cvsignore b/camel/providers/nntp/.cvsignore
deleted file mode 100644
index 2fbeab8712..0000000000
--- a/camel/providers/nntp/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-test-newsrc
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
deleted file mode 100644
index 4b686735e3..0000000000
--- a/camel/providers/nntp/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelnntpincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelnntp.la
-provider_DATA = libcamelnntp.urls
-
-INCLUDES = -I../..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR) 			\
-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
-
-libcamelnntp_la_SOURCES = 			\
-	camel-nntp-auth.c			\
-	camel-nntp-folder.c			\
-	camel-nntp-grouplist.c			\
-	camel-nntp-newsrc.c			\
-	camel-nntp-provider.c			\
-	camel-nntp-store.c			\
-	camel-nntp-utils.c
-
-libcamelnntpinclude_HEADERS =			\
-	camel-nntp-auth.h			\
-	camel-nntp-folder.h			\
-	camel-nntp-grouplist.h			\
-	camel-nntp-newsrc.h			\
-	camel-nntp-resp-codes.h			\
-	camel-nntp-store.h			\
-	camel-nntp-types.h			\
-	camel-nntp-utils.h
-
-libcamelnntp_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelnntp.urls
-
-#noinst_PROGRAMS = test-newsrc
-
-#LDADD = \
-	#$(top_builddir)/camel/libcamel.la 	\
-	#$(top_builddir)/e-util/libeutil.la	\
-	#$(top_builddir)/libibex/libibex.la 	\
-	#$(GNOME_LIBDIR) 			\
-	#$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-#	$(BONOBO_LIBS)				
-
-#test_newsrc_LDADD = libcamelnntp.la $(LDADD)
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
deleted file mode 100644
index 1f1e6ab2d8..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.c : authentication for nntp */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <camel-nntp-auth.h>
-#include <camel-nntp-store.h>
-#include <camel-nntp-resp-codes.h>
-#include <camel-exception.h>
-#include <camel-session.h>
-
-int
-camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelService *service = CAMEL_SERVICE (store);
-	CamelSession *session = camel_service_get_session (service);
-	int resp;
-
-	if (!service->url->authmech && !service->url->passwd) {
-		gchar *prompt;
-			
-		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),
-					  service->url->user, service->url->host);
-		service->url->passwd =
-			camel_session_query_authenticator (session,
-							   CAMEL_AUTHENTICATOR_ASK, prompt,
-							   TRUE, service, "password", ex);
-		g_free (prompt);
-			
-		if (!service->url->passwd) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, 
-					     "You didn\'t enter a password.");
-			resp = 666;
-			goto done;
-		}
-	}
-
-	/* first send username */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO USER %s", service->url->user);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username"));
-		goto done;
-
-	}
-	else if (resp != NNTP_AUTH_CONTINUE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Failed to send username to server"));
-		goto done;
-	}
-
-	/* then send the username if the server asks for it */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO PASS %s", service->url->passwd);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username/password"));
-		goto done;
-	}
-
- done:
-
-	if (service->url->passwd) {
-		/* let's be paranoid */
-		memset (service->url->passwd, 0, strlen (service->url->passwd));
-		g_free (service->url->passwd);
-		service->url->passwd = NULL;
-	}
-	return resp;
-}
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
deleted file mode 100644
index 2708d9d335..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.h : authentication for nntp */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * 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 CAMEL_NNTP_AUTH_H
-#define CAMEL_NNTP_AUTH_H 1
-
-#include <camel-nntp-store.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_AUTH_H */
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
deleted file mode 100644
index 7edc4a98fd..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.c : Abstract class for an email folder */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h> 
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-
-#include "string-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-folder-summary.h"
-
-#include "camel-exception.h"
-
-static CamelFolderClass *parent_class=NULL;
-
-/* Returns the class for a CamelNNTPFolder */
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void
-nntp_folder_sync (CamelFolder *folder, gboolean expunge, 
-		  CamelException *ex)
-{
-	CamelNNTPStore *store;
-
-	camel_folder_summary_save (folder->summary);
-
-	store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-}
-
-static void
-nntp_folder_set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set)
-{
-        ((CamelFolderClass *)parent_class)->set_message_flags(folder, uid, flags, set);
-
-	if (flags & set & CAMEL_MESSAGE_SEEN) {
-		int article_num;
-		CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-		sscanf (uid, "%d", &article_num);
-
-		camel_nntp_newsrc_mark_article_read (nntp_store->newsrc,
-						     folder->name,
-						     article_num);
-	}
-}
-
-static CamelMimeMessage *
-nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelStore *parent_store;
-	char *buf;
-	int buf_len;
-	int buf_alloc;
-	int status;
-	gboolean done;
-	char *message_id;
-
-	/* get the parent store */
-	parent_store = camel_folder_get_parent_store (folder);
-
-	message_id = strchr (uid, ',') + 1;
-	status = camel_nntp_command (CAMEL_NNTP_STORE( parent_store ), ex, NULL, "ARTICLE %s", message_id);
-
-	/* if the message_id was not found, raise an exception and return */
-	if (status == NNTP_NO_SUCH_ARTICLE) {
-		camel_exception_setv (ex, 
-				     CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Message %s not found."),
-				      message_id);
-		return NULL;
-	}
-	else if (status != NNTP_ARTICLE_FOLLOWS) {
-		/* XXX */
-		g_warning ("weird nntp error %d\n", status);
-		return NULL;
-	}
-
-	/* this could probably done fairly easily with an nntp stream that
-	   returns eof after '.' */
-
-	/* XXX ick ick ick.  read the entire message into a buffer and
-	   then create a stream_mem for it. */
-	buf_alloc = 2048;
-	buf_len = 0;
-	buf = g_malloc(buf_alloc);
-	done = FALSE;
-
-	buf[0] = 0;
-
-	while (!done) {
-		int line_length;
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (parent_store), &line, ex) < 0) {
-			g_warning ("recv_line failed while building message\n");
-			break;
-		}
-
-		/* XXX check exception */
-
-		line_length = strlen ( line );
-
-		if (!strcmp(line, ".")) {
-			done = TRUE;
-			g_free (line);
-		}
-		else {
-			if (buf_len + line_length > buf_alloc) {
-				buf_alloc *= 2;
-				buf = g_realloc (buf, buf_alloc);
-			}
-			strcat(buf, line);
-			strcat(buf, "\n");
-			buf_len += strlen(line) + 1;
-			g_free (line);
-		}
-	}
-
-	/* create a stream bound to the message */
-	message_stream = camel_stream_mem_new_with_buffer(buf, buf_len);
-
-	message = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER(message), message_stream);
-
-	camel_object_unref (CAMEL_OBJECT (message_stream));
-
-#if 0
-	gtk_signal_connect (CAMEL_OBJECT (message), "message_changed", message_changed, folder);
-#endif
-
-	g_free (buf);
-
-	return message;
-}
-
-static GPtrArray*
-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	g_assert (0);
-	return NULL;
-}
-
-static void           
-nntp_folder_finalize (CamelObject *object)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (object);
-
-	g_free (nntp_folder->summary_file_path);
-}
-
-static void
-camel_nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_nntp_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-		
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = nntp_folder_sync;
-	camel_folder_class->set_message_flags = nntp_folder_set_message_flags;
-	camel_folder_class->get_message = nntp_folder_get_message;
-	camel_folder_class->search_by_expression = nntp_folder_search_by_expression;
-}
-
-CamelType
-camel_nntp_folder_get_type (void)
-{
-	static CamelType camel_nntp_folder_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_folder_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelNNTPFolder",
-							      sizeof (CamelNNTPFolder),
-							      sizeof (CamelNNTPFolderClass),
-							      (CamelObjectClassInitFunc) camel_nntp_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) NULL,
-							      (CamelObjectFinalizeFunc) nntp_folder_finalize);
-	}
-	
-	return camel_nntp_folder_type;
-}
-
-CamelFolder *
-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
-{
-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (CAMEL_NNTP_FOLDER_TYPE));
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	const gchar *root_dir_path;
-
-	camel_folder_construct (folder, parent, folder_name, folder_name);
-	folder->has_summary_capability = TRUE;
-
-	root_dir_path = camel_nntp_store_get_toplevel_dir (CAMEL_NNTP_STORE(folder->parent_store));
-	nntp_folder->summary_file_path = g_strdup_printf ("%s/%s-ev-summary",
-							  root_dir_path,
-							  folder->name);
-
-	folder->summary = camel_folder_summary_new ();
-	camel_folder_summary_set_filename (folder->summary,
-					   nntp_folder->summary_file_path);
-
-	if (-1 == camel_folder_summary_load (folder->summary)) {
-		/* Bad or nonexistant summary file */
-		camel_nntp_get_headers (CAMEL_FOLDER( folder )->parent_store,
-					nntp_folder, ex);
-		if (camel_exception_get_id (ex)) {
-			camel_object_unref (CAMEL_OBJECT (folder));
-			return NULL;
-		}
-
-		/* XXX check return value */
-		camel_folder_summary_save (folder->summary);
-	}
-
-	return folder;
-}
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
deleted file mode 100644
index 190d0bf346..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.h : NNTP group (folder) support. */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 CAMEL_NNTP_FOLDER_H
-#define CAMEL_NNTP_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-/*  #include "camel-store.h" */
-
-#define CAMEL_NNTP_FOLDER_TYPE     (camel_nntp_folder_get_type ())
-#define CAMEL_NNTP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))
-#define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))
-#define CAMEL_IS_NNTP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	gchar *summary_file_path;  /* contains the messages summary */
-	CamelFolderSummary *summary;
-} CamelNNTPFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelNNTPFolderClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_nntp_folder_get_type (void);
-
-CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_FOLDER_H */
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
deleted file mode 100644
index d7ee85d182..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-exception.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-resp-codes.h"
-
-static CamelNNTPGroupList *
-camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	gboolean done = FALSE;
-	CamelNNTPGroupList *list;
-
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not get group list from server."));
-		return NULL;
-	}
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->time = time (NULL);
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			return list;
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-			char **split_line = g_strsplit (line, " ", 4);
-
-			entry->group_name = g_strdup (split_line[0]);
-			entry->high = atoi (split_line[1]);
-			entry->low = atoi (split_line[2]);
-
-			g_strfreev (split_line);
-			
-			list->group_list = g_list_append (list->group_list, entry);
-		}
-	}
-
-	return list;
-}
-
-static CamelNNTPGroupList*
-camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-	CamelNNTPGroupList *list;
-	FILE *fp;
-	char buf[300];
-	unsigned long time;
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "r");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	/* read the time */
-	if (!fgets (buf, 300, fp)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		fclose (fp);
-		return NULL;
-	}
-
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->store = store;
-	sscanf (buf, "%lu", &time);
-	list->time = time;
-
-	while (fgets (buf, 300, fp)) {
-		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-		char **split_line = g_strsplit (buf, " ", 4);
-
-		entry->group_name = g_strdup (split_line[0]);
-		entry->high = atoi (split_line[1]);
-		entry->low = atoi (split_line[2]);
-
-		g_strfreev (split_line);
-
-		list->group_list = g_list_append (list->group_list, entry);
-	}
-
-	fclose (fp);
-
-	return list;
-}
-
-static void
-save_entry (CamelNNTPGroupListEntry *entry, FILE *fp)
-{
-	fprintf (fp, "%s %d %d\n", entry->group_name, entry->low, entry->high);
-}
-
-void
-camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	FILE *fp;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(group_list->store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "w");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to save grouplist file for %s: %s"),
-				      CAMEL_SERVICE(group_list->store)->url->host,
-				      strerror(errno));
-		return;
-	}
-
-	fprintf (fp, "%lu\n", (long)group_list->time);
-
-	g_list_foreach (group_list->group_list, (GFunc)save_entry, fp);
-
-	fclose (fp);
-}
-
-static void
-free_entry (CamelNNTPGroupListEntry *entry, void *data)
-{
-	g_free (entry->group_name);
-	g_free (entry);
-}
-
-void
-camel_nntp_grouplist_free (CamelNNTPGroupList *group_list)
-{
-	g_return_if_fail (group_list);
-
-	g_list_foreach (group_list->group_list, (GFunc)free_entry, NULL);
-
-	g_free (group_list);
-}
-
-CamelNNTPGroupList*
-camel_nntp_grouplist_fetch (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelNNTPGroupList *list;
-
-	list = camel_nntp_get_grouplist_from_file (store, ex);
-
-	printf ("camel_nntp_get_grouplist_from_file returned %p\n", list);
-
-	if (!list) {
-		camel_exception_clear (ex);
-
-		list = camel_nntp_get_grouplist_from_server (store, ex);
-
-		if (!list) {
-			camel_nntp_grouplist_free (list);
-		}
-		else {
-			list->store = store;
-			camel_nntp_grouplist_save (list, ex);
-			return list;
-		}
-	}
-
-	return list;
-}
-
-gint
-camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	return 0;
-}
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
deleted file mode 100644
index 67c74d5dc2..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 CAMEL_NNTP_GROUPLIST_H
-#define CAMEL_NNTP_GROUPLIST_H 1
-
-#include <time.h>
-#include "camel-nntp-store.h"
-
-struct CamelNNTPGroupListEntry {
-	char *group_name;
-	guint32 low;
-	guint32 high;
-	guint32 flags;
-};
-
-struct CamelNNTPGroupList {
-	CamelNNTPStore *store;
-	time_t time;
-	GList *group_list;
-};
-
-CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);
-gint                camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_save   (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_free   (CamelNNTPGroupList *group_list);
-
-#endif /* CAMEL_NNTP_GROUPLIST_H */
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
deleted file mode 100644
index d0b56222cf..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ /dev/null
@@ -1,645 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "camel-nntp-newsrc.h"
-#include <camel/camel-folder-summary.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)->l))
-#define NEWSRC_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPNewsrc *)f)->l))
-#else
-#define NEWSRC_LOCK(f, l)
-#define NEWSRC_UNLOCK(f, l)
-#endif
-
-typedef struct {
-	guint low;
-	guint high;
-} ArticleRange;
-
-typedef struct {
-	char *name;
-	GArray *ranges;
-	gboolean subscribed;
-} NewsrcGroup;
-
-struct CamelNNTPNewsrc {
-	gchar *filename;
-	GHashTable *groups;
-	gboolean dirty;
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-} ;
-
-
-static NewsrcGroup *
-camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const char *group_name, gboolean subscribed)
-{
-	NewsrcGroup *new_group = g_malloc(sizeof(NewsrcGroup));
-
-	new_group->name = g_strdup(group_name);
-	new_group->subscribed = subscribed;
-	new_group->ranges = g_array_new (FALSE, FALSE, sizeof (ArticleRange));
-
-	g_hash_table_insert (newsrc->groups, new_group->name, new_group);
-
-	newsrc->dirty = TRUE;
-
-	return new_group;
-}
-
-static int
-camel_nntp_newsrc_group_get_highest_article_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	if (!group || group->ranges->len == 0)
-		return 0;
-
-	return g_array_index(group->ranges, ArticleRange, group->ranges->len - 1).high;
-}
-
-static int
-camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	int i;
-	int count = 0;
-
-	if (group == NULL)
-		return 0;
-
-	for (i = 0; i < group->ranges->len; i ++)
-		count += (g_array_index(group->ranges, ArticleRange, i).high -
-			  g_array_index(group->ranges, ArticleRange, i).low) + 1;
-
-	return count;
-}
-
-
-static void
-camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, long low, long high)
-{
-	int i;
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		g_array_index (group->ranges, ArticleRange, 0).low = low;
-		g_array_index (group->ranges, ArticleRange, 0).high = high;
-
-		newsrc->dirty = TRUE;
-	}
-	else  {
-		ArticleRange tmp_range;
-
-		for (i = 0; i < group->ranges->len; i ++) {
-			guint range_low = g_array_index (group->ranges, ArticleRange, i).low;
-			guint range_high = g_array_index (group->ranges, ArticleRange, i).high;
-			
-			/* if it's already part of a range, return immediately. */
-			if (low >= range_low &&
-			    low <= range_high &&
-			    high >= range_low &&
-			    high <= range_high) {
-				return;
-			}
-			/* if we have a new lower bound for this range, set it. */
-			else if (low <= range_low
-				 && high >= range_low
-				 && high <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we have a new upper bound for this range, set it. */
-			else if (high >= range_high
-				 && low >= range_low
-				 && low <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           starts one index higher than an existing
-                           one, make the upper value of the existing
-                           range the upper value of the new one. */
-			else if (low == range_high + 1) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           ends one index lower than an existing one,
-                           group the existing range by setting its low
-                           to the new low */
-			else if (high == range_low - 1) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if the range lies entirely outside another
-                           range, doesn't coincide with it's
-                           endpoints, and has lower values, insert it
-                           into the middle of the list. */
-			else if (low < range_low
-				 && high < range_low) {
-				tmp_range.low = low;
-				tmp_range.high = high;
-
-				group->ranges = g_array_insert_val (group->ranges, i, tmp_range);
-				newsrc->dirty = TRUE;
-
-				return;
-			}
-		}
-
-		/* if we made it here, the range needs to go at the end */
-		tmp_range.low = low;
-		tmp_range.high = high;
-		group->ranges = g_array_append_val (group->ranges, tmp_range);
-		newsrc->dirty = TRUE;
-	} 
-}
-
-int
-camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	ret = camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-int
-camel_nntp_newsrc_get_num_articles_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	ret = camel_nntp_newsrc_group_get_num_articles_read (newsrc, group);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-void
-camel_nntp_newsrc_mark_article_read (CamelNNTPNewsrc *newsrc, const char *group_name, int num)
-{
-	NEWSRC_LOCK(newsrc, lock);
-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_mark_range_read(CamelNNTPNewsrc *newsrc, const char *group_name, long low, long high)
-{
-	NewsrcGroup *group;
-
-	/* swap them if they're in the wrong order. */
-	if (low > high) {
-		long tmp;
-
-		tmp = high;
-		high = low;
-		low = tmp;
-	}
-
-	NEWSRC_LOCK(newsrc, lock);
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-gboolean
-camel_nntp_newsrc_article_is_read (CamelNNTPNewsrc *newsrc, const char *group_name, long num)
-{
-	int i;
-	NewsrcGroup *group;
-	int ret = FALSE;
-
-	NEWSRC_LOCK(newsrc, lock);
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	
-	for (i = 0; i < group->ranges->len; i++) {
-		if (num >= g_array_index (group->ranges, ArticleRange, i).low && 
-		    num <= g_array_index (group->ranges, ArticleRange, i).high) {
-			ret = TRUE;
-			break;
-		}
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return FALSE;
-}
-
-gboolean  
-camel_nntp_newsrc_group_is_subscribed (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret = FALSE;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		ret = group->subscribed;
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-void
-camel_nntp_newsrc_subscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		if (!group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = TRUE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, TRUE);
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_unsubscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	if (group) {
-		if (group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = FALSE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, FALSE);
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-struct newsrc_ptr_array {
-	GPtrArray *ptr_array;
-	gboolean subscribed_only;
-};
-
-/* this needs to strdup the grup_name, if the group array is likely to change */
-static void
-get_group_foreach (char *group_name, NewsrcGroup *group, struct newsrc_ptr_array *npa)
-{
-	if (group->subscribed || !npa->subscribed_only) {
-		g_ptr_array_add (npa->ptr_array, group_name);
-	}
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = TRUE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return npa.ptr_array;
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = FALSE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return npa.ptr_array;
-}
-
-void
-camel_nntp_newsrc_free_group_names (CamelNNTPNewsrc *newsrc, GPtrArray *group_names)
-{
-	g_ptr_array_free (group_names, TRUE);
-}
-
-struct newsrc_fp {
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-};
-
-static void
-camel_nntp_newsrc_write_group_line(gpointer key, NewsrcGroup *group, struct newsrc_fp *newsrc_fp)
-{
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-	int i;
-
-	fp = newsrc_fp->fp;
-	newsrc = newsrc_fp->newsrc;
-
-	fprintf (fp, "%s%c", group->name, group->subscribed ? ':' : '!');
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		fprintf (fp, "\n");
-
-		return; /* special case since our parsing code will insert this
-			   bogus range if there were no read articles.  The code
-			   to add a range is smart enough to remove this one if we
-			   ever mark an article read, but we still need to deal with
-			   it if that code doesn't get hit. */
-	}
-
-	fprintf (fp, " ");
-
-	for (i = 0; i < group->ranges->len; i ++) {
-		char range_buffer[100];
-		guint low = g_array_index (group->ranges, ArticleRange, i).low;
-		guint high = g_array_index (group->ranges, ArticleRange, i).high;
-
-		if (low == high)
-			sprintf(range_buffer, "%d", low);
-		else if (low == high - 1)
-			sprintf(range_buffer, "%d,%d", low, high);
-		else
-			sprintf(range_buffer, "%d-%d", low, high);
-
-		if (i != group->ranges->len - 1)
-			strcat(range_buffer, ",");
-
-		fprintf (fp, range_buffer);
-	}
-
-	fprintf (fp, "\n");
-}
-
-void 
-camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)
-{
-	struct newsrc_fp newsrc_fp;
-
-	g_return_if_fail (newsrc);
-
-	newsrc_fp.newsrc = newsrc;
-	newsrc_fp.fp = fp;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)camel_nntp_newsrc_write_group_line,
-			      &newsrc_fp);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_write(CamelNNTPNewsrc *newsrc)
-{
-	FILE *fp;
-
-	g_return_if_fail (newsrc);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	if (!newsrc->dirty)
-		return;
-
-	if ((fp = fopen(newsrc->filename, "w")) == NULL) {
-		g_warning ("Couldn't open newsrc file '%s'.\n", newsrc->filename);
-		NEWSRC_UNLOCK(newsrc, lock);
-		return;
-	}
-
-	newsrc->dirty = FALSE;
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	camel_nntp_newsrc_write_to_file(newsrc, fp);
-
-	fclose(fp);
-}
-
-static void
-camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, char *line)
-{
-	char *p, *comma, *dash;
-	gboolean is_subscribed;
-	NewsrcGroup *group;
-
-	p = strchr(line, ':');
-
-	if (p) {
-		is_subscribed = TRUE;
-	}
-	else {
-		p = strchr(line, '!');
-		if (p)
-			is_subscribed = FALSE;
-		else
-			return; /* bogus line. */
-	}
-
-	*p++ = '\0';
-
-	group = camel_nntp_newsrc_group_add (newsrc, line, is_subscribed);
-
-	do {
-		guint high, low;
-
-		comma = strchr(p, ',');
-
-		if (comma)
-			*comma = '\0';
-
-		dash = strchr(p, '-');
-
-		if (!dash) { /* there wasn't a dash.  must be just one number */
-			high = low = atol(p);
-		}
-		else { /* there was a dash. */
-			*dash = '\0';
-			low = atol(p);
-			*dash = '-';
-			p = dash + 1;
-			high = atol(p);
-		}
-
-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-
-		if (comma) {
-			*comma = ',';
-			p = comma + 1;
-		}
-
-	} while(comma);
-}
-
-static char*
-get_line (char *buf, char **p)
-{
-	char *l;
-	char *line;
-
-	g_assert (*p == NULL || **p == '\n' || **p == '\0');
-
-	if (*p == NULL) {
-		*p = buf;
-
-		if (**p == '\0')
-			return NULL;
-	}
-	else {
-		if (**p == '\0')
-			return NULL;
-
-		(*p) ++;
-	
-		/* if we just incremented to the end of the buffer, return NULL */
-		if (**p == '\0')
-			return NULL;
-	}
-
-	l = strchr (*p, '\n');
-	if (l) {
-		*l = '\0';
-		line = g_strdup (*p);
-		*l = '\n';
-		*p = l;
-	}
-	else {
-		/* we're at the last line (which isn't terminated by a \n, btw) */
-		line = g_strdup (*p);
-		(*p) += strlen (*p);
-	}
-
-	return line;
-}
-
-CamelNNTPNewsrc *
-camel_nntp_newsrc_read_for_server (const char *server)
-{
-	int fd;
-	char buf[1024];
-	char *file_contents, *line, *p;
-	char *filename;
-	CamelNNTPNewsrc *newsrc;
-	int newsrc_len;
-	int len_read = 0;
-	struct stat sb;
-
-	filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);
-
-	newsrc = g_new0(CamelNNTPNewsrc, 1);
-	newsrc->filename = filename;
-	newsrc->groups = g_hash_table_new (g_str_hash, g_str_equal);
-#ifdef ENABLE_THREADS
-	newsrc->lock = g_mutex_new();
-#endif
-
-	if ((fd = open(filename, O_RDONLY)) == -1) {
-		g_warning ("~/.newsrc-%s not present.\n", server);
-		return newsrc;
-	}
-
-	if (fstat (fd, &sb) == -1) {
-		g_warning ("failed fstat on ~/.newsrc-%s: %s\n", server, strerror(errno));
-		return newsrc;
-	}
-	newsrc_len = sb.st_size;
-
-	file_contents = g_malloc (newsrc_len + 1);
-
-	while (len_read < newsrc_len) {
-		int c = read (fd, buf, sizeof (buf));
-
-		if (c == -1)
-			break;
-
-		memcpy (&file_contents[len_read], buf, c);
-		len_read += c;
-	}
-	file_contents [len_read] = 0;
-
-	p = NULL;
-	while ((line = get_line (file_contents, &p))) {
-		camel_nntp_newsrc_parse_line(newsrc, line);
-		g_free (line);
-	}
-
-	close (fd);
-	g_free (file_contents);
-
-	return newsrc;
-}
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
deleted file mode 100644
index 652e3edbce..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef _CAMEL_NNTP_NEWSRC_H_
-#define _CAMEL_NNTP_NEWSRC_H_
-
-#include <stdio.h>
-#include "glib.h"
-
-typedef struct CamelNNTPNewsrc CamelNNTPNewsrc;
-
-int              camel_nntp_newsrc_get_highest_article_read   (CamelNNTPNewsrc *newsrc, const char *group_name);
-int              camel_nntp_newsrc_get_num_articles_read      (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_mark_article_read          (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, int num);
-void             camel_nntp_newsrc_mark_range_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long low, long high);
-
-gboolean         camel_nntp_newsrc_article_is_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long num);
-
-gboolean         camel_nntp_newsrc_group_is_subscribed        (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_subscribe_group            (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_unsubscribe_group          (CamelNNTPNewsrc *newsrc, const char *group_name);
-
-GPtrArray*       camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc);
-GPtrArray*       camel_nntp_newsrc_get_all_group_names        (CamelNNTPNewsrc *newsrc);
-void             camel_nntp_newsrc_free_group_names           (CamelNNTPNewsrc *newsrc, GPtrArray *group_names);
-
-void             camel_nntp_newsrc_write_to_file              (CamelNNTPNewsrc *newsrc, FILE *fp);
-void             camel_nntp_newsrc_write                      (CamelNNTPNewsrc *newsrc);
-CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server            (const char *server);
-
-#endif /* _CAMEL_NNTP_NEWSRC_H_ */
-
-
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
deleted file mode 100644
index 76ac521ec6..0000000000
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-provider.c: nntp provider registration code */
-
-/* 
- * Authors :
- *   Chris Toshok <toshok@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-nntp-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-
-static void add_hash (guint *hash, char *s);
-static guint nntp_url_hash (gconstpointer key);
-static gint check_equal (char *s1, char *s2);
-static gint nntp_url_equal (gconstpointer a, gconstpointer b);
-
-static CamelProvider news_provider = {
-	"nntp",
-	N_("USENET news"),
-
-	N_("This is a provider for reading from and posting to"
-	   "USENET newsgroups."),
-
-	"news",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	news_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_nntp_store_get_type();
-
-	news_provider.service_cache = g_hash_table_new (nntp_url_hash, nntp_url_equal);
-
-	camel_session_register_provider (session, &news_provider);
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-static guint
-nntp_url_hash (gconstpointer key)
-{
-	const CamelURL *u = (CamelURL *)key;
-	guint hash = 0;
-
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->host);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static gint
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-static gint
-nntp_url_equal (gconstpointer a, gconstpointer b)
-{
-	const CamelURL *u1 = a, *u2 = b;
-	
-	return check_equal (u1->user, u2->user)
-		&& check_equal (u1->host, u2->host)
-		&& u1->port == u2->port;
-}
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
deleted file mode 100644
index 8b9dc8ff6c..0000000000
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-resp-codes.h : #defines for all the response codes we care about */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_RESP_CODES_H
-#define CAMEL_NNTP_RESP_CODES_H 1
-
-#define CAMEL_NNTP_OK(x) ((x) < 400)
-#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) && (x) < 500)
-#define CAMEL_NNTP_FAIL(x) (!CAMEL_NNTP_OK(x) && !CAMEL_NNTP_ERR(x))
-
-#define NNTP_GREETING_POSTING_OK    200
-#define NNTP_GREETING_NO_POSTING    201
-
-#define NNTP_GROUP_SELECTED           211
-#define NNTP_LIST_FOLLOWS             215
-#define NNTP_ARTICLE_FOLLOWS          220
-#define NNTP_HEAD_FOLLOWS             221
-#define NNTP_DATA_FOLLOWS             224
-#define NNTP_NEW_ARTICLE_LIST_FOLLOWS 230
-#define NNTP_NEW_GROUP_LIST_FOLLOWS   231
-
-#define NNTP_NO_SUCH_GROUP          411
-#define NNTP_NO_SUCH_ARTICLE        430
-
-/* authentication */
-#define NNTP_AUTH_ACCEPTED          281
-#define NNTP_AUTH_CONTINUE          381
-#define NNTP_AUTH_REQUIRED          480
-#define NNTP_AUTH_REJECTED          482
-
-#define NNTP_PROTOCOL_ERROR         666
-
-#endif /* CAMEL_NNTP_RESP_CODES_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
deleted file mode 100644
index c1e8fb81e8..0000000000
--- a/camel/providers/nntp/camel-nntp-store.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.c : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "libgnome/libgnome.h"
-
-#include "camel-nntp-resp-codes.h"
-#include "camel-folder-summary.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-auth.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#include <gal/util/e-util.h>
-
-#define NNTP_PORT 119
-
-#define DUMP_EXTENSIONS
-
-/* define if you want the subscribe ui to show folders in tree form */
-/* #define INFO_AS_TREE */
-
-static CamelRemoteStoreClass *remote_store_class = NULL;
-
-static CamelServiceClass *service_class = NULL;
-
-/* Returns the class for a CamelNNTPStore */
-#define CNNTPS_CLASS(so) CAMEL_NNTP_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static gboolean ensure_news_dir_exists (CamelNNTPStore *store);
-
-static void
-camel_nntp_store_get_extensions (CamelNNTPStore *store, CamelException *ex)
-{
-	store->extensions = 0;
-
-	if (camel_nntp_command (store, ex, NULL, "LIST EXTENSIONS") == NNTP_LIST_FOLLOWS) {
-		gboolean done = FALSE;
-		CamelException ex;
-
-		camel_exception_init (&ex);
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, &ex) < 0)
-				break; /* XXX */
-
-			if (*line == '.') {
-				done = TRUE;
-			}
-			else {
-#define CHECK_EXT(name,val) if (!strcasecmp (line, (name))) store->extensions |= (val)
-
-				CHECK_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-				CHECK_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-				CHECK_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-				CHECK_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-				CHECK_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-				CHECK_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-				CHECK_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-				CHECK_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-
-#undef CHECK_EXT
-			}
-
-			g_free (line);
-		}
-	}
-
-#ifdef DUMP_EXTENSIONS
-	g_print ("NNTP Extensions:");
-#define DUMP_EXT(name,val) if (store->extensions & (val)) g_print (" %s", name);
-	DUMP_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-	DUMP_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-	DUMP_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-	DUMP_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-	DUMP_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-	DUMP_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-	DUMP_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-	DUMP_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-	g_print ("\n");
-#undef DUMP_EXT
-#endif
-}
-
-static void
-camel_nntp_store_get_overview_fmt (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	int i;
-	gboolean done = FALSE;
-	
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST OVERVIEW.FMT");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		if (store->extensions & CAMEL_NNTP_EXT_OVER) {
-			/* if we can't get the overview format, we should
-			   disable OVER support */
-			g_warning ("server reported support of OVER but LIST OVERVIEW.FMT failed."
-				   "  disabling OVER.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-			return;
-		}
-	}
-	else {
-		if (!(store->extensions & CAMEL_NNTP_EXT_OVER)) {
-			g_warning ("server didn't report support of OVER but LIST OVERVIEW.FMT worked."
-				   "  enabling OVER.\n");
-			store->extensions |= CAMEL_NNTP_EXT_OVER;
-		}
-	}
-
-	/* start at 1 because the article number is always first */
-	store->num_overview_fields = 1;
-	
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		store->overview_field [i].index = -1;
-	}
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			break; /* XXX */
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPOverField *over_field = NULL;
-			char *colon = NULL;;
-
-			if (!strncasecmp (line, "From:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_FROM ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Subject:", 7)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 7;
-			}
-			else if (!strncasecmp (line, "Date:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_DATE ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Message-ID:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "References:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_REFERENCES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "Bytes:", 6)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_BYTES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-		
-			if (colon && !strncmp (colon + 1, "full", 4))
-				over_field->full = TRUE;
-
-			store->num_overview_fields ++;
-		}
-
-		g_free (line);
-	}
-
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		if (store->overview_field [i].index == -1) {
-			g_warning ("server's OVERVIEW.FMT doesn't support minimum set we require,"
-				   " disabling OVER support.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-		}
-	}
-}
-
-static gboolean
-nntp_store_connect (CamelService *service, CamelException *ex)
-{
-	char *buf;
-	int resp_code;
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (!ensure_news_dir_exists(store)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open directory for news server: %s"),
-				      strerror (errno));
-		return FALSE;
-	}
-
-	if (CAMEL_SERVICE_CLASS (remote_store_class)->connect (service, ex) == FALSE)
-		return FALSE;
-
-	/* Read the greeting */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service), &buf, ex) < 0) {
-		return FALSE;
-	}
-
-	/* check if posting is allowed. */
-	resp_code = atoi (buf);
-	if (resp_code == NNTP_GREETING_POSTING_OK) {
-		g_print ("posting allowed\n");
-		store->posting_allowed = TRUE;
-	}
-	else if (resp_code == NNTP_GREETING_NO_POSTING) {
-		g_print ("no posting allowed\n");
-		store->posting_allowed = FALSE;
-	}
-	else {
-		g_warning ("unexpected server greeting code %d, no posting allowed\n", resp_code);
-		store->posting_allowed = FALSE;
-	}
-
-	g_free (buf);
-
-	/* get a list of extensions that the server supports */
-	camel_nntp_store_get_extensions (store, ex);
-
-	/* try to get the overview.fmt */
-	camel_nntp_store_get_overview_fmt (store, ex);
-
-	return TRUE;
-}
-
-static gboolean
-nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (clean)
-		camel_nntp_command (store, ex, NULL, "QUIT");
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static char *
-nntp_store_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf ("%s", service->url->host);
-	else
-		return g_strdup_printf (_("USENET News via %s"), service->url->host);
-	
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-	
-	N_("This option will authenticate with the NNTP server using a "
-	   "plaintext password."),
-	
-	"",
-	TRUE
-};
-
-static GList *
-nntp_store_query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	GList *prev;
-	
-	g_warning ("nntp::query_auth_types: not implemented. Defaulting.");
-	prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, connect, ex);
-	return g_list_prepend (prev, &password_authtype);
-}
-
-static CamelFolder *
-nntp_store_get_folder (CamelStore *store, const gchar *folder_name,
-		       guint32 flags, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	printf ("get_folder called on folder_name=%s\n", folder_name);
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	return camel_nntp_folder_new (store, folder_name, ex);
-}
-
-#ifdef INFO_AS_TREE
-static void
-build_folder_info (CamelNNTPStore *nntp_store, CamelFolderInfo **root,
-		   CamelFolderInfo *parent, CamelNNTPGroupListEntry *entry,
-		   char *prefix, char *suffix,
-		   GHashTable *name_to_info)
-{
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-	char *dot;
-	if ((dot = strchr (suffix, '.'))) {
-		/* it's an internal node, figure out the next node in
-                   the chain */
-		CamelFolderInfo *node;
-		char *node_name, *node_full_name;
-
-		node_name = g_malloc0 (dot - suffix + 1);
-		strncpy (node_name, suffix, dot - suffix);
-		node_full_name = g_strdup_printf ("%s.%s", prefix, node_name);
-
-		node = g_hash_table_lookup (name_to_info, node_full_name);
-		if (!node) {
-			/* we need to add one */
-			node = g_new0 (CamelFolderInfo, 1);
-			node->name = g_strdup (node_name);
-			node->full_name = g_strdup (node_full_name);
-			node->url = NULL;
-			node->unread_message_count = -1;
-
-			if (parent) {
-				if (parent->child) {
-					node->sibling = parent->child;
-					parent->child = node;
-				}
-				else {
-					parent->child = node;
-				}
-			}
-			else {
-				if (*root) {
-					*root = node;
-				}
-				else {
-					node->sibling = *root;
-					*root = node;
-				}
-			}
-
-			g_hash_table_insert (name_to_info, node_full_name, node);
-		}
-
-		build_folder_info (nntp_store, root, node, entry, node_full_name, dot + 1, name_to_info);
-	}
-	else {
-		/* it's a leaf node, make the CamelFolderInfo and
-                   append it to @parent's list of children. */
-		CamelFolderInfo *new_group;
-
-		new_group = g_new0 (CamelFolderInfo, 1);
-		new_group->name = g_strdup (entry->group_name);
-		new_group->full_name = g_strdup (entry->group_name);
-		new_group->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						  url->user ? url->user : "",
-						  url->user ? "@" : "",
-						  url->host, (char *)entry->group_name);
-
-		new_group->unread_message_count = (entry->high - entry->low - 
-						   camel_nntp_newsrc_get_num_articles_read (nntp_store->newsrc, entry->group_name));
-
-		if (parent) {
-			if (parent->child) {
-				new_group->sibling = parent->child;
-				parent->child = new_group;
-			}
-			else {
-				parent->child = new_group;
-			}
-		}
-		else {
-			if (*root) {
-				*root = new_group;
-			}
-			else {
-				new_group->sibling = *root;
-				*root = new_group;
-			}
-		}
-	}
-}
-#endif
-
-static CamelFolderInfo *
-build_folder_info_from_grouplist (CamelNNTPStore *nntp_store, const char *top)
-{
-	GList *g;
-	CamelFolderInfo *groups = NULL;
-#ifdef INFO_AS_TREE
-	GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
-#else
-	CamelFolderInfo *last = NULL, *fi;
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-#endif
-
-	for (g = nntp_store->group_list->group_list; g; g = g_list_next (g)) {
-		CamelNNTPGroupListEntry *entry = g->data;
-
-		if (!top || !strncmp (top, entry->group_name, strlen (top))) {
-#ifdef INFO_AS_TREE
-			build_folder_info (nntp_store, &groups, NULL, entry,
-					   "", entry->group_name, hash);
-#else
-
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (entry->group_name);
-			fi->full_name = g_strdup (entry->group_name);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)entry->group_name);
-
-			fi->unread_message_count = (entry->high - entry->low - 
-						    camel_nntp_newsrc_get_num_articles_read (
-							     nntp_store->newsrc, entry->group_name));
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-#endif
-		}
-	}
-
-	return groups;
-}
-
-static CamelFolderInfo *
-nntp_store_get_folder_info (CamelStore *store, const char *top,
-			    gboolean fast, gboolean recursive,
-			    gboolean subscribed_only,
-			    CamelException *ex)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)store;
-	GPtrArray *names;
-	CamelFolderInfo *groups = NULL, *last = NULL, *fi;
-	int i;
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	if (!subscribed_only) {
-		if (!nntp_store->group_list)
-			nntp_store->group_list = camel_nntp_grouplist_fetch (nntp_store, ex);
-		if (camel_exception_is_set (ex)) {
-			return NULL;
-		}
-		else {
-			fi = build_folder_info_from_grouplist (nntp_store, top);
-			return fi;
-		}
-	}
-
-	if (top == NULL) {
-		/* return the list of groups */
-		names = camel_nntp_newsrc_get_subscribed_group_names (nntp_store->newsrc);
-		for (i = 0; i < names->len; i++) {
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (names->pdata[i]);
-			fi->full_name = g_strdup (names->pdata[i]);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)names->pdata[i]);
-			/* FIXME */
-			fi->unread_message_count = -1;
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-		}
-		camel_nntp_newsrc_free_group_names (nntp_store->newsrc, names);
-
-		return groups;
-	}
-	else {
-		/* getting a specific group */
-
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->name = g_strdup (top);
-		fi->full_name = g_strdup (top);
-		fi->url = g_strdup_printf ("nntp://%s/%s", url->host, top);
-		/* FIXME */
-		fi->unread_message_count = -1;
-
-		return fi;
-	}
-}
-
-static gboolean
-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	return camel_nntp_newsrc_group_is_subscribed (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,
-			     CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_subscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,
-			       CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_unsubscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);
-	if (nntp_store->newsrc)
-		camel_nntp_newsrc_write (nntp_store->newsrc);
-}
-
-static void
-camel_nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_nntp_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_class);
-
-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						      (camel_remote_store_get_type ()));
-
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = nntp_store_connect;
-	camel_service_class->disconnect = nntp_store_disconnect;
-	camel_service_class->query_auth_types = nntp_store_query_auth_types;
-	camel_service_class->get_name = nntp_store_get_name;
-
-	camel_store_class->get_folder = nntp_store_get_folder;
-	camel_store_class->get_folder_info = nntp_store_get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->folder_subscribed = nntp_store_folder_subscribed;
-	camel_store_class->subscribe_folder = nntp_store_subscribe_folder;
-	camel_store_class->unsubscribe_folder = nntp_store_unsubscribe_folder;
-}
-
-
-
-static void
-camel_nntp_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-
-	remote_store->default_port = NNTP_PORT;
-
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-}
-
-CamelType
-camel_nntp_store_get_type (void)
-{
-	static CamelType camel_nntp_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_store_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelNNTPStore",
-							     sizeof (CamelNNTPStore),
-							     sizeof (CamelNNTPStoreClass),
-							     (CamelObjectClassInitFunc) camel_nntp_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_nntp_store_init,
-							     (CamelObjectFinalizeFunc) finalize);
-	}
-	
-	return camel_nntp_store_type;
-}
-
-
-/**
- * camel_nntp_command: Send a command to a NNTP server.
- * @store: the NNTP store
- * @ret: a pointer to return the full server response in
- * @fmt: a printf-style format string, followed by arguments
- *
- * This command sends the command specified by @fmt and the following
- * arguments to the connected NNTP store specified by @store. It then
- * reads the server's response and parses out the status code. If
- * the caller passed a non-NULL pointer for @ret, camel_nntp_command
- * will set it to point to an buffer containing the rest of the
- * response from the NNTP server. (If @ret was passed but there was
- * no extended response, @ret will be set to NULL.) The caller must
- * free this buffer when it is done with it.
- *
- * Return value: the response code of the nntp command.
- **/
-static int
-camel_nntp_command_send_recv (CamelNNTPStore *store, CamelException *ex, char **ret, char *cmd)
-{
-	char *respbuf;
-	int resp_code;
-	gboolean again;
-
-	do {
-		again = FALSE;
-
-		/* Send the command */
-		if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, cmd) < 0) {
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		/* Read the response */
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0) {
-			if (ret)
-				*ret = g_strdup (g_strerror (errno));
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		resp_code = atoi (respbuf);
-
-		/* this is kind of a gross hack, but since an auth challenge
-		   can pop up at any time, and we want to shield this from our
-		   callers, we handle authentication here. */
-		if (resp_code == NNTP_AUTH_REQUIRED) {
-			resp_code = camel_nntp_auth_authenticate (store, ex);
-			if (resp_code != NNTP_AUTH_ACCEPTED) {
-				return resp_code;
-			}
-
-			/* need to resend our command here */
-			again = TRUE;
-		}
-	} while (again);
-
-	if (ret) {
-		*ret = strchr (respbuf, ' ');
-		if (*ret)
-			*ret = g_strdup (*ret + 1);
-	}
-	g_free (respbuf);
-
-	return resp_code;
-}
-
-int
-camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...)
-{
-	char *cmdbuf;
-	va_list ap;
-	int resp_code;
-	char *real_fmt;
-
-	real_fmt = g_strdup_printf ("%s\r\n", fmt);
-
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (real_fmt, ap);
-	va_end (ap);
-
-	g_free (real_fmt);
-
-	resp_code = camel_nntp_command_send_recv (store, ex, ret, cmdbuf);
-
-	g_free (cmdbuf);
-
-	return resp_code;
-}
-
-void
-camel_nntp_store_subscribe_group (CamelStore *store,
-				  const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	char *ret = NULL;
-	CamelException *ex = camel_exception_new();
-
-	if (camel_exception_get_id (ex)) {
-		g_free (root_dir);
-		camel_exception_free (ex);
-		return;
-	}
-
-	if (camel_nntp_command ( CAMEL_NNTP_STORE (store),
-				 ex, &ret, "GROUP %s", group_name) == NNTP_GROUP_SELECTED) {
-		/* we create an empty summary file here, so that when
-                   the group is opened we'll know we need to build it. */
-		gchar *summary_file;
-		int fd;
-		summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-		
-		fd = open (summary_file, O_CREAT | O_RDWR, 0666);
-		close (fd);
-
-		g_free (summary_file);
-	}
-	if (ret) g_free (ret);
-
-	g_free (root_dir);
-	camel_exception_free (ex);
-}
-
-void
-camel_nntp_store_unsubscribe_group (CamelStore *store,
-				    const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *summary_file;
-
-	summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-	if (g_file_exists (summary_file))
-		unlink (summary_file);
-	g_free (summary_file);
-
-	g_free (root_dir);
-}
-
-GList *
-camel_nntp_store_list_subscribed_groups(CamelStore *store)
-{
-	GList *group_name_list = NULL;
-	struct stat stat_buf;
-	gint stat_error = 0;
-	gchar *entry_name;
-	gchar *full_entry_name;
-	gchar *real_group_name;
-	struct dirent *dir_entry;
-	DIR *dir_handle;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-
-	dir_handle = opendir (root_dir);
-	g_return_val_if_fail (dir_handle, NULL);
-
-	/* read the first entry in the directory */
-	dir_entry = readdir (dir_handle);
-	while ((stat_error != -1) && (dir_entry != NULL)) {
-
-		/* get the name of the next entry in the dir */
-		entry_name = dir_entry->d_name;
-		full_entry_name = g_strdup_printf ("%s/%s", root_dir, entry_name);
-		stat_error = stat (full_entry_name, &stat_buf);
-		g_free (full_entry_name);
-
-		/* is it a normal file ending in -ev-summary ? */
-		if ((stat_error != -1) && S_ISREG (stat_buf.st_mode)) {
-			gboolean summary_suffix_found;
-
-			real_group_name = string_prefix (entry_name, "-ev-summary",
-							 &summary_suffix_found);
-
-			if (summary_suffix_found)
-				/* add the folder name to the list */
-				group_name_list = g_list_append (group_name_list, 
-								 real_group_name);
-		}
-		/* read next entry */
-		dir_entry = readdir (dir_handle);
-	}
-
-	closedir (dir_handle);
-
-	return group_name_list;
-}
-
-gchar *
-camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	char *top_dir;
-
-	g_assert(url != NULL);
-
-	top_dir = g_strdup_printf( "%s/evolution/news/%s",
-				   g_get_home_dir (),
-				   url->host );
-
-	return top_dir;
-}
-
-static gboolean
-ensure_news_dir_exists (CamelNNTPStore *store)
-{
-	gchar *dir = camel_nntp_store_get_toplevel_dir (store);
-
-	if (access (dir, F_OK) == 0) {
-		g_free (dir);
-		return TRUE;
-	}
-
-	if (e_mkdir_hier (dir, S_IRWXU) == -1) {
-		g_free (dir);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
deleted file mode 100644
index d7836f47ae..0000000000
--- a/camel/providers/nntp/camel-nntp-store.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.h : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_STORE_H
-#define CAMEL_NNTP_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-remote-store.h"
-#include "camel-nntp-newsrc.h"
-#include "camel-nntp-types.h"
-
-#define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())
-#define CAMEL_NNTP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))
-#define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))
-#define CAMEL_IS_NNTP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_STORE_TYPE))
-
-
-enum {
-	CAMEL_NNTP_OVER_FROM,
-	CAMEL_NNTP_OVER_SUBJECT,
-	CAMEL_NNTP_OVER_DATE,
-	CAMEL_NNTP_OVER_MESSAGE_ID,
-	CAMEL_NNTP_OVER_REFERENCES,
-	CAMEL_NNTP_OVER_BYTES,
-
-	CAMEL_NNTP_OVER_LAST
-};
-
-struct CamelNNTPOverField {
-	int index;
-	gboolean full; /* full in the OVER sense - the field name
-                          precedes the ':' in the XOVER list. */
-};
-
-struct CamelNNTPStore {
-	CamelRemoteStore parent_object;	
-
-#define CAMEL_NNTP_EXT_SEARCH     (1<<0)
-#define CAMEL_NNTP_EXT_SETGET     (1<<1)
-#define CAMEL_NNTP_EXT_OVER       (1<<2)
-#define CAMEL_NNTP_EXT_XPATTEXT   (1<<3)
-#define CAMEL_NNTP_EXT_XACTIVE    (1<<4)
-#define CAMEL_NNTP_EXT_LISTMOTD   (1<<5)
-#define CAMEL_NNTP_EXT_LISTSUBSCR (1<<6)
-#define CAMEL_NNTP_EXT_LISTPNAMES (1<<7)
-	guint32 extensions;
-
-	gboolean posting_allowed;
-
-	int num_overview_fields;
-	CamelNNTPOverField overview_field[ CAMEL_NNTP_OVER_LAST ];
-
-	CamelNNTPNewsrc *newsrc;
-	CamelNNTPGroupList *group_list;
-
-};
-
-struct CamelNNTPStoreClass {
-	CamelRemoteStoreClass parent_class;
-
-};
-
-
-/* public methods */
-void camel_nntp_store_open (CamelNNTPStore *store, CamelException *ex);
-void camel_nntp_store_close (CamelNNTPStore *store, gboolean expunge,
-			     CamelException *ex);
-
-void camel_nntp_store_subscribe_group (CamelStore *store, const gchar *group_name);
-void camel_nntp_store_unsubscribe_group (CamelStore *store, const gchar *group_name);
-GList *camel_nntp_store_list_subscribed_groups(CamelStore *store);
-
-gchar *camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store);
-
-/* support functions */
-int camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...);
-
-/* Standard Camel function */
-CamelType camel_nntp_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_STORE_H */
-
-
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
deleted file mode 100644
index b1d91779b1..0000000000
--- a/camel/providers/nntp/camel-nntp-types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 CAMEL_NNTP_TYPES_H
-#define CAMEL_NNTP_TYPES_H 1
-
-typedef struct CamelNNTPGroupList CamelNNTPGroupList;
-typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry;
-typedef struct CamelNNTPOverField CamelNNTPOverField;
-typedef struct CamelNNTPStore CamelNNTPStore;
-typedef struct CamelNNTPStoreClass CamelNNTPStoreClass;
-
-#endif /* CAMEL_NNTP_TYPES_H */
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
deleted file mode 100644
index 439626d977..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.c : utilities used by the nntp code. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-exception.h"
-
-#include "e-util/md5-utils.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-static void
-get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		  int first_message, int last_message, CamelException *ex)
-{
-	int status;
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	char digest[16];
-
-	status = camel_nntp_command (nntp_store, ex, NULL,
-				     "XOVER %d-%d",
-				     first_message,
-				     last_message);
-
-	if (status == NNTP_DATA_FOLLOWS) {
-		gboolean done = FALSE;
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (nntp_store), &line, ex) < 0) {
-				g_warning ("failed to recv_line while building OVER header list\n");
-				break;
-			}
-
-			if (*line == '.') {
-				done = TRUE;
-				g_print ("done\n");
-			}
-			else {
-				CamelMessageInfo *new_info = camel_folder_summary_info_new(nntp_folder->summary);
-				char **split_line = g_strsplit (line, "\t", 7);
-				char *subject, *from, *date, *message_id, *bytes;
-				char *uid;
-
-				subject = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_SUBJECT].index];
-				from = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_FROM].index];
-				date = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_DATE].index];
-				message_id = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_MESSAGE_ID].index];
-				bytes = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_BYTES].index];
-
-				/* if the overview format flagged this
-                                   field as "full", skip over the
-                                   preceding field name and colon */
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ].full)
-					subject += strlen ("Subject:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_FROM ].full)
-					from += strlen ("From:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_DATE ].full)
-					date += strlen ("Date:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ].full)
-					message_id += strlen ("Message-ID:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_BYTES ].full)
-					bytes += strlen ("Bytes:");
-
-				uid = g_strdup_printf ("%s,%s", split_line[0], message_id);
-				camel_message_info_set_subject(new_info, g_strdup(subject));
-				camel_message_info_set_from(new_info, g_strdup(from));
-				camel_message_info_set_to(new_info, g_strdup(folder->name));
-				camel_message_info_set_uid(new_info, uid);
-
-				new_info->date_sent = header_decode_date(date, NULL);
-#if 0
-				/* XXX do we need to fill in both dates? */
-				new_info->headers.date_received = g_strdup(date);
-#endif
-				new_info->size = atoi(bytes);
-				md5_get_digest(message_id, strlen(message_id), digest);
-				memcpy(new_info->message_id.id.hash, digest, sizeof(new_info->message_id.id.hash));
-
-				if (camel_nntp_newsrc_article_is_read (nntp_store->newsrc,
-								       folder->name,
-								       atoi (split_line[0])))
-				    new_info->flags |= CAMEL_MESSAGE_SEEN;
-
-				camel_folder_summary_add (nntp_folder->summary, new_info);
-				g_strfreev (split_line);
-			}
-			g_free (line);
-		}
-	}
-	else {
-		/* XXX */
-		g_warning ("weird nntp response for XOVER: %d\n", status);
-	}
-}
-
-#if 0
-static GArray*
-get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		 int first_message, int last_message, CamelException *ex)
-{
-	int i;
-	int status;
-
-	for (i = first_message; i < last_message; i ++) {
-		status = camel_nntp_command (nntp_store, ex, NULL,
-					     "HEAD %d", i);
-
-		if (status == NNTP_HEAD_FOLLOWS) {
-			gboolean done = FALSE;
-			char *buf;
-			int buf_len;
-			int buf_alloc;
-			int h;
-			CamelStream *header_stream;
-			GArray *header_array;
-			CamelStream *nntp_istream;
-			CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);
-
-			buf_alloc = 2048;
-			buf_len = 0;
-			buf = g_malloc(buf_alloc);
-			done = FALSE;
-
-			buf[0] = 0;
-
-			nntp_istream = nntp_store->istream;
-
-			while (!done) {
-				char *line;
-				int line_length;
-
-				line = camel_stream_buffer_read_line ( 
-						      CAMEL_STREAM_BUFFER ( nntp_istream ));
-				line_length = strlen ( line );
-
-				if (*line == '.') {
-					done = TRUE;
-				}
-				else {
-					if (buf_len + line_length > buf_alloc) {
-						buf_alloc *= 2;
-						buf = g_realloc (buf, buf_alloc);
-					}
-					strcat(buf, line);
-					strcat(buf, "\n");
-					buf_len += strlen(line);
-					g_free (line);
-				}
-			}
-
-			/* create a stream from which to parse the headers */
-			header_stream = camel_stream_mem_new_with_buffer(buf,
-								 buf_len,
-								 CAMEL_STREAM_MEM_READ);
-
-			header_array = get_header_array_from_stream (header_stream);
-
-			memset (&info, 0, sizeof(info));
-
-			for (h = 0; h < header_array->len; h ++) {
-				Rfc822Header *header = &((Rfc822Header*)header_array->data)[h];
-				if (!g_strcasecmp(header->name, "From"))
-					new_info->from = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "To"))
-					new_info->to = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Subject"))
-					new_info->subject = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Message-ID")) {
-					new_info->uid = g_strdup_printf("%d,%s", i, header->value);
-					new_info->message_id = g_strdup(header->value);
-				}
-				else if (!g_strcasecmp(header->name, "Date")) {
-					new_info->date_sent = header_decode_date (header->value);
-#if 0
-					new_info->date_sent = g_strdup(header->value);
-					new_info->date_received = g_strdup(header->value);
-#endif
-				}
-			}
-
-			camel_folder_summary_add (nntp_folder->summary, new_info);
-		}
-		else if (status == CAMEL_NNTP_FAIL) {
-			/* nasty things are afoot */
-			g_warning ("failure doing HEAD\n");
-			break;
-		}
-	}
-}
-#endif
-
-void
-camel_nntp_get_headers (CamelStore *store,
-			CamelNNTPFolder *nntp_folder,
-			CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-	CamelFolder *folder = CAMEL_FOLDER (nntp_folder);
-	char *ret;
-	int first_message, nb_message, last_message;
-	int status;
-
-	status = camel_nntp_command (nntp_store, ex, &ret,
-				     "GROUP %s", folder->name);
-
-	sscanf (ret, "%d %d %d", &nb_message, &first_message, &last_message);
-	g_free (ret);
-
-	if (status == NNTP_NO_SUCH_GROUP) {
-		/* XXX throw invalid group exception */
-		camel_exception_setv (ex, 
-				      CAMEL_EXCEPTION_FOLDER_INVALID,
-				      "group %s not found on server",
-				      folder->name);
-		return;
-	}
-
-
-	if (nntp_store->extensions & CAMEL_NNTP_EXT_OVER) {
-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);
-	}
-	else {
-		g_warning ("need to fix get_HEAD_headers\n");
-#if 0
-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);
-#endif
-	}		
-}
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
deleted file mode 100644
index f28697c744..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.h : Utilities for the NNTP provider */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * 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 CAMEL_NNTP_UTILS_H
-#define CAMEL_NNTP_UTILS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void camel_nntp_get_headers (CamelStore *store, CamelNNTPFolder *nntp_folder, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_UTILS_H */
diff --git a/camel/providers/nntp/libcamelnntp.urls b/camel/providers/nntp/libcamelnntp.urls
deleted file mode 100644
index dee2e70f14..0000000000
--- a/camel/providers/nntp/libcamelnntp.urls
+++ /dev/null
@@ -1,2 +0,0 @@
-news
-nntp
diff --git a/camel/providers/nntp/test-newsrc.c b/camel/providers/nntp/test-newsrc.c
deleted file mode 100644
index c4b985e565..0000000000
--- a/camel/providers/nntp/test-newsrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <glib.h>
-#include "camel-nntp-newsrc.h"
-
-int
-main(int argc, char *argv[])
-{
-  CamelNNTPNewsrc *newsrc = camel_nntp_newsrc_read_for_server (argv[1]);
-  camel_nntp_newsrc_write_to_file (newsrc, stdout);
-}
diff --git a/camel/providers/pop3/.cvsignore b/camel/providers/pop3/.cvsignore
deleted file mode 100644
index ddf4c8b28d..0000000000
--- a/camel/providers/pop3/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
deleted file mode 100644
index 608e640cd9..0000000000
--- a/camel/providers/pop3/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelpop3includedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelpop3.la
-provider_DATA = libcamelpop3.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-        -I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
-	$(KRB4_CFLAGS)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
-
-libcamelpop3_la_SOURCES = 			\
-	camel-pop3-folder.c			\
-	camel-pop3-provider.c			\
-	camel-pop3-store.c
-
-libcamelpop3include_HEADERS =			\
-	camel-pop3-folder.h			\
-	camel-pop3-store.h
-
-
-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
-
-libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelpop3.urls
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
deleted file mode 100644
index 810faed846..0000000000
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-folder.c : class for a pop3 folder */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-pop3-folder.h"
-#include "camel-pop3-store.h"
-#include "camel-exception.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-message.h"
-#include "camel-operation.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))
-static CamelFolderClass *parent_class;
-
-static void pop3_finalize (CamelObject *object);
-
-static void pop3_refresh_info (CamelFolder *folder, CamelException *ex);
-static void pop3_sync (CamelFolder *folder, gboolean expunge,
-		       CamelException *ex);
-
-static gint pop3_get_message_count (CamelFolder *folder);
-static GPtrArray *pop3_get_uids (CamelFolder *folder);
-static CamelMimeMessage *pop3_get_message (CamelFolder *folder, 
-					   const char *uid,
-					   CamelException *ex);
-static void pop3_set_message_flags (CamelFolder *folder, const char *uid,
-				    guint32 flags, guint32 set);
-
-static GPtrArray *parse_listing (int count, char *data);
-
-static void
-camel_pop3_folder_class_init (CamelPop3FolderClass *camel_pop3_folder_class)
-{
-	CamelFolderClass *camel_folder_class =
-		CAMEL_FOLDER_CLASS (camel_pop3_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	/* virtual method overload */
-	camel_folder_class->refresh_info = pop3_refresh_info;
-	camel_folder_class->sync = pop3_sync;
-
-	camel_folder_class->get_message_count = pop3_get_message_count;
-	camel_folder_class->get_uids = pop3_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_nop;
-
-	camel_folder_class->get_message = pop3_get_message;
-	camel_folder_class->set_message_flags = pop3_set_message_flags;
-}
-
-static void
-camel_pop3_folder_init (gpointer object)
-{
-	CamelFolder *folder = CAMEL_FOLDER (object);
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);
-
-	folder->has_summary_capability = FALSE;
-	folder->has_search_capability = FALSE;
-
-	pop3_folder->uids = NULL;
-	pop3_folder->flags = NULL;
-}
-
-CamelType
-camel_pop3_folder_get_type (void)
-{
-	static CamelType camel_pop3_folder_type = CAMEL_INVALID_TYPE;
-
-	if (!camel_pop3_folder_type) {
-		camel_pop3_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelPop3Folder",
-							      sizeof (CamelPop3Folder),
-							      sizeof (CamelPop3FolderClass),
-							      (CamelObjectClassInitFunc) camel_pop3_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) camel_pop3_folder_init,
-							      (CamelObjectFinalizeFunc) pop3_finalize);
-	}
-
-	return camel_pop3_folder_type;
-}
-
-void
-pop3_finalize (CamelObject *object)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);
-
-	if (pop3_folder->uids)
-		camel_folder_free_deep (NULL, pop3_folder->uids);
-	if (pop3_folder->flags)
-		g_free (pop3_folder->flags);
-}
-
-CamelFolder *
-camel_pop3_folder_new (CamelStore *parent, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_POP3_FOLDER_TYPE));
-	camel_folder_construct (folder, parent, "inbox", "inbox");
-
-	/* mt-ok, since we dont have the folder-lock for new() */
-	camel_folder_refresh_info (folder, ex);/* mt-ok */
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		folder = NULL;
-	}
-
-	return folder;
-}
-
-static void 
-pop3_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	GPtrArray *uids;
-	int status, count;
-	char *data;
-	CamelPop3Folder *pop3_folder = (CamelPop3Folder *) folder;
-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-
-	camel_operation_start(NULL, _("Retrieving POP summary"));
-
-	status = camel_pop3_command (pop3_store, &data, ex, "STAT");
-	if (status != CAMEL_POP3_OK) {
-		camel_operation_end(NULL);
-		return;
-	}
-
-	count = atoi (data);
-	g_free (data);
-
-	if (pop3_store->supports_uidl != FALSE) {
-		status = camel_pop3_command (pop3_store, NULL, ex, "UIDL");
-		switch (status) {
-		case CAMEL_POP3_ERR:
-			pop3_store->supports_uidl = FALSE;
-			break;
-		case CAMEL_POP3_FAIL:
-			camel_operation_end(NULL);
-			return;
-		}
-	}
-
-	if (pop3_store->supports_uidl == FALSE) {
-		int i;
-
-		uids = g_ptr_array_new ();
-		g_ptr_array_set_size (uids, count);
-
-		for (i = 0; i < count; i++)
-			uids->pdata[i] = g_strdup_printf ("%d", i + 1);
-		camel_operation_end(NULL);
-	} else {
-		data = camel_pop3_command_get_additional_data (pop3_store, 0, ex);
-		camel_operation_end(NULL);
-		if (camel_exception_is_set (ex))
-			return;
-
-		uids = parse_listing (count, data);
-		g_free (data);
-
-		if (!uids) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not open folder: "
-						"message listing was "
-						"incomplete."));
-			return;
-		}
-	}
-
-	pop3_folder->uids = uids;
-	pop3_folder->flags = g_new0 (guint32, uids->len);
-}
-
-static void
-pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelPop3Folder *pop3_folder;
-	CamelPop3Store *pop3_store;
-	int i, status;
-	char *resp;
-
-	if (!expunge)
-		return;
-
-	pop3_folder = CAMEL_POP3_FOLDER (folder);
-	pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-
-	for (i = 0; i < pop3_folder->uids->len; i++) {
-		if (pop3_folder->flags[i] & CAMEL_MESSAGE_DELETED) {
-			status = camel_pop3_command (pop3_store, &resp, ex,
-						     "DELE %d", i + 1);
-			if (status != CAMEL_POP3_OK)
-				return;
-		}
-	}
-
-	camel_pop3_store_expunge (pop3_store, ex);
-}
-
-
-static GPtrArray *
-parse_listing (int count, char *data)
-{
-	GPtrArray *ans;
-	char *p;
-	int index, len;
-
-	ans = g_ptr_array_new ();
-	g_ptr_array_set_size (ans, count);
-
-	p = data;
-	while (*p) {
-		index = strtoul (p, &p, 10);
-		len = strcspn (p, "\n");
-		if (index <= count && *p == ' ')
-			ans->pdata[index - 1] = g_strndup (p + 1, len - 1);
-		p += len;
-		if (*p == '\n')
-			p++;
-	}
-
-	for (index = 0; index < count; index++) {
-		if (ans->pdata[index] == NULL) {
-			g_ptr_array_free (ans, TRUE);
-			return NULL;
-		}
-	}
-
-	return ans;
-}
-
-static int
-uid_to_number (CamelPop3Folder *pop3_folder, const char *uid)
-{
-	int i;
-
-	for (i = 0; i < pop3_folder->uids->len; i++) {
-		if (!strcmp (uid, pop3_folder->uids->pdata[i]))
-			return i + 1;
-	}
-
-	return -1;
-}
-
-
-static CamelMimeMessage *
-pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	int status, num, total;
-	char *result, *body;
-	CamelStream *msgstream;
-	CamelMimeMessage *msg;
-
-	num = uid_to_number (CAMEL_POP3_FOLDER (folder), uid);
-	if (num == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				      _("No message with uid %s"), uid);
-		return NULL;
-	}
-
-	camel_operation_start(NULL, _("Retrieving POP message %d"), num);
-
-	status = camel_pop3_command (CAMEL_POP3_STORE (folder->parent_store),
-				     &result, ex, "RETR %d", num);
-	if (status != CAMEL_POP3_OK) {
-		camel_operation_end(NULL);
-		return NULL;
-	}
-
-	/* this should be "nnn octets" ? */
-	if (sscanf(result, "%d", &total) != 1)
-		total = 0;
-
-	g_free (result);
-	body = camel_pop3_command_get_additional_data (CAMEL_POP3_STORE (folder->parent_store), total, ex);
-	if (!body) {
-		CamelService *service = CAMEL_SERVICE (folder->parent_store);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not retrieve message from POP "
-					"server %s: %s"), service->url->host,
-				      camel_exception_get_description (ex));
-		camel_operation_end(NULL);
-		return NULL;
-	}
-
-	msgstream = camel_stream_mem_new_with_buffer (body, strlen (body));
-	g_free (body);
-	
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
-						  CAMEL_STREAM (msgstream));
-
-	camel_object_unref (CAMEL_OBJECT (msgstream));
-
-	camel_operation_end(NULL);
-
-	return msg;
-}
-
-static void
-pop3_set_message_flags (CamelFolder *folder, const char *uid,
-			guint32 flags, guint32 set)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-	int num;
-
-	num = uid_to_number (pop3_folder, uid);
-	if (num == -1)
-		return;
-
-	pop3_folder->flags[num - 1] =
-		(pop3_folder->flags[num] & ~flags) | (set & flags);
-}
-
-static gint
-pop3_get_message_count (CamelFolder *folder)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-
-	return pop3_folder->uids->len;
-}
-
-static GPtrArray *
-pop3_get_uids (CamelFolder *folder)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-
-	return pop3_folder->uids;
-}
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
deleted file mode 100644
index 278cd0e8e9..0000000000
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-folder.h : Class for a POP3 folder */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_POP3_FOLDER_H
-#define CAMEL_POP3_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-#define CAMEL_POP3_FOLDER_TYPE     (camel_pop3_folder_get_type ())
-#define CAMEL_POP3_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPop3Folder))
-#define CAMEL_POP3_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPop3FolderClass))
-#define CAMEL_IS_POP3_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	GPtrArray *uids;
-	guint32 *flags;
-
-} CamelPop3Folder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelPop3FolderClass;
-
-
-/* public methods */
-CamelFolder *camel_pop3_folder_new (CamelStore *parent, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_pop3_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_POP3_FOLDER_H */
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
deleted file mode 100644
index 5af0dad73c..0000000000
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-provider.c: pop3 provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-pop3-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider pop3_provider = {
-	"pop",
-	N_("POP"),
-
-	N_("For connecting to POP servers. The POP protocol can also "
-	   "be used to retrieve mail from certain web mail providers "
-	   "and proprietary email systems."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,
-
-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	pop3_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_pop3_store_get_type();
-
-	pop3_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &pop3_provider);
-}
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
deleted file mode 100644
index fac9cae931..0000000000
--- a/camel/providers/pop3/camel-pop3-store.c
+++ /dev/null
@@ -1,681 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-store.c : class for a pop3 store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "camel-operation.h"
-
-#ifdef HAVE_KRB4
-/* Specified nowhere */
-#define KPOP_PORT 1109
-
-#include <krb.h>
-/* MIT krb4 des.h #defines _. Sigh. We don't need it. */
-#undef _
-
-#ifdef NEED_KRB_SENDAUTH_PROTO
-extern int krb_sendauth(long options, int fd, KTEXT ticket, char *service,
-			char *inst, char *realm, unsigned KRB4_32 checksum,
-			MSG_DAT *msg_data, CREDENTIALS *cred,
-			Key_schedule schedule, struct sockaddr_in *laddr,
-			struct sockaddr_in *faddr, char *version);
-#endif
-#endif
-
-#include "camel-pop3-store.h"
-#include "camel-pop3-folder.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "e-util/md5-utils.h"
-
-/* Specified in RFC 1939 */
-#define POP3_PORT 110
-
-static CamelRemoteStoreClass *parent_class = NULL;
-
-static void finalize (CamelObject *object);
-
-static gboolean pop3_connect (CamelService *service, CamelException *ex);
-static gboolean pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *query_auth_types (CamelService *service, gboolean connect, CamelException *ex);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, 
-				guint32 flags, CamelException *ex);
-
-static int pop3_get_response (CamelPop3Store *store, char **ret, CamelException *ex);
-
-
-static void
-camel_pop3_store_class_init (CamelPop3StoreClass *camel_pop3_store_class)
-{
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_pop3_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_pop3_store_class);
-
-	parent_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						(camel_remote_store_get_type ()));
-
-	/* virtual method overload */
-	camel_service_class->query_auth_types = query_auth_types;
-	camel_service_class->connect = pop3_connect;
-	camel_service_class->disconnect = pop3_disconnect;
-
-	camel_store_class->get_folder = get_folder;
-}
-
-
-
-static void
-camel_pop3_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-
-	remote_store->default_port = 110;
-}
-
-CamelType
-camel_pop3_store_get_type (void)
-{
-	static CamelType camel_pop3_store_type = CAMEL_INVALID_TYPE;
-
-	if (!camel_pop3_store_type) {
-		camel_pop3_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelPop3Store",
-							     sizeof (CamelPop3Store),
-							     sizeof (CamelPop3StoreClass),
-							     (CamelObjectClassInitFunc) camel_pop3_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_pop3_store_init,
-							     finalize);
-	}
-
-	return camel_pop3_store_type;
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (object);
-
-	if (pop3_store->apop_timestamp)
-		g_free (pop3_store->apop_timestamp);
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-
-	N_("This option will connect to the POP server using a plaintext "
-	   "password. This is the only option supported by many POP servers."),
-
-	"",
-	TRUE
-};
-
-static CamelServiceAuthType apop_authtype = {
-	"APOP",
-
-	N_("This option will connect to the POP server using an encrypted "
-	   "password via the APOP protocol. This may not work for all users "
-	   "even on servers that claim to support it."),
-
-	"+APOP",
-	TRUE
-};
-
-#ifdef HAVE_KRB4
-static CamelServiceAuthType kpop_authtype = {
-	"Kerberos 4 (KPOP)",
-
-	N_("This will connect to the POP server and use Kerberos 4 "
-	   "to authenticate to it."),
-
-	"+KPOP",
-	FALSE
-};
-#endif
-
-static gboolean
-connect_to_server (CamelService *service, /*gboolean real, */CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-	char *buf, *apoptime, *apopend;
-	gint status;
-#ifdef HAVE_KRB4
-	gboolean kpop = service->url->authmech &&
-		!strcmp (service->url->authmech, "+KPOP");
-#endif
-
-#ifdef HAVE_KRB4
-	if (kpop) {
-		KTEXT_ST ticket_st;
-		MSG_DAT msg_data;
-		CREDENTIALS cred;
-		Key_schedule schedule;
-		char *hostname;
-		struct hostent *h;
-		int fd;
-
-		/* Need to copy hostname, because krb_realmofhost will
-		 * call gethostbyname as well, and gethostbyname uses
-		 * static storage.
-		 */
-		h = camel_service_gethost (service, ex);
-		hostname = g_strdup (h->h_name);
-
-		fd = CAMEL_STREAM_FS (CAMEL_REMOTE_STORE (service)->ostream)->fd;
-
-		status = krb_sendauth (0, fd, &ticket_st, "pop", hostname,
-				       krb_realmofhost (hostname), 0,
-				       &msg_data, &cred, schedule,
-				       NULL, NULL, "KPOPV0.1");
-		g_free (hostname);
-		if (status != KSUCCESS) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not authenticate to "
-						"KPOP server: %s"),
-					      krb_err_txt[status]);
-			return FALSE;
-		}
-
-		if (!service->url->passwd)
-			service->url->passwd = g_strdup (service->url->user);
-	}
-#endif /* HAVE_KRB4 */
-
-	/* Read the greeting, check status */
-	status = pop3_get_response (store, &buf, ex);
-	if (status != CAMEL_POP3_OK)
-		return FALSE;
-
-	if (buf) {
-		apoptime = strchr (buf, '<');
-		apopend = apoptime ? strchr (apoptime, '>') : NULL;
-		if (apopend) {
-			store->apop_timestamp =
-				g_strndup (apoptime, apopend - apoptime + 1);
-			memmove (apoptime, apopend + 1, strlen (apopend + 1));
-		}
-		store->implementation = buf;
-	}
-
-	/* Check extensions */
-	store->login_delay = -1;
-	store->supports_top = -1;
-	store->supports_uidl = -1;
-	store->expires = -1;
-
-	status = camel_pop3_command (store, NULL, ex, "CAPA");
-	if (status == CAMEL_POP3_OK) {
-		char *p;
-		int len;
-
-		buf = camel_pop3_command_get_additional_data (store, 0, ex);
-		if (camel_exception_is_set (ex))
-			return FALSE;
-
-		p = buf;
-		while (*p) {
-			len = strcspn (p, "\n");
-			if (!strncmp (p, "IMPLEMENTATION ", 15)) {
-				g_free (store->implementation);
-				store->implementation =
-					g_strndup (p + 15, len - 15);
-			} else if (len == 3 && !strncmp (p, "TOP", 3))
-				store->supports_top = TRUE;
-			else if (len == 4 && !strncmp (p, "UIDL", 4))
-				store->supports_uidl = TRUE;
-			else if (!strncmp (p, "LOGIN-DELAY ", 12))
-				store->login_delay = atoi (p + 12);
-			else if (!strncmp (p, "EXPIRE NEVER", 12))
-				store->expires = FALSE;
-			else if (!strncmp (p, "EXPIRE ", 7))
-				store->expires = TRUE;
-
-			p += len;
-			if (*p)
-				p++;
-		}
-
-		g_free (buf);
-	}
-
-	return TRUE;
-}
-
-static GList *
-query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-	GList *types = NULL;
-	gboolean passwd = TRUE, apop = TRUE;
-#ifdef HAVE_KRB4
-	gboolean kpop = TRUE;
-	int saved_port;
-#endif
-	
-        types = CAMEL_SERVICE_CLASS (parent_class)->query_auth_types (service, connect, ex);
-	
-	if (connect) {
-		passwd = camel_service_connect (service, ex);
-		/*ignore the exception here; the server may just not support passwd */
-		
-		/* should we check apop too? */
-		apop = store->apop_timestamp != NULL;
-		if (passwd)
-			camel_service_disconnect (service, TRUE, ex);
-		camel_exception_clear (ex);
-		
-#ifdef HAVE_KRB4
-		saved_port = service->url->port;
-		service->url->port = KPOP_PORT;
-		kpop = camel_service_connect (service, ex);
-		service->url->port = saved_port;
-		/*ignore the exception here; the server may just not support kpop */
-		
-		if (kpop)
-			camel_service_disconnect (service, TRUE, ex);
-		camel_exception_clear (ex);
-#endif
-		
-		if (passwd)
-			types = g_list_append (types, &password_authtype);
-		if (apop)
-			types = g_list_append (types, &apop_authtype);
-#ifdef HAVE_KRB4
-		if (kpop)
-			types = g_list_append (types, &kpop_authtype);
-#endif
-		
-		if (!types) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not connect to POP server on "
-						"%s."), service->url->host);
-		}
-	} else {
-		types = g_list_append (types, &password_authtype);
-		types = g_list_append (types, &apop_authtype);
-#ifdef HAVE_KRB4
-		types = g_list_append (types, &kpop_authtype);
-#endif
-	}
-	
-	return types;
-}
-
-/**
- * camel_pop3_store_expunge:
- * @store: the store
- * @ex: a CamelException
- *
- * Expunge messages from the store. This will result in the connection
- * being closed, which may cause later commands to fail if they can't
- * reconnect.
- **/
-void
-camel_pop3_store_expunge (CamelPop3Store *store, CamelException *ex)
-{
-	camel_pop3_command (store, NULL, ex, "QUIT");
-	camel_service_disconnect (CAMEL_SERVICE (store), FALSE, ex);
-}
-
-
-static gboolean
-pop3_try_authenticate (CamelService *service, gboolean kpop,
-		       const char *errmsg, CamelException *ex)
-{
-	CamelPop3Store *store = (CamelPop3Store *)service;
-	int status;
-	char *msg;
-
-	/* The KPOP code will have set the password to be the username
-	 * in connect_to_server. Password and APOP are the only other
-	 * cases, and they both need a password. So if there's no
-	 * password stored, query for it.
-	 */
-	if (!service->url->passwd) {
-		char *prompt;
-
-		prompt = g_strdup_printf (_("%sPlease enter the POP3 password "
-					    "for %s@%s"), errmsg ? errmsg : "",
-					  service->url->user,
-					  service->url->host);
-		service->url->passwd = camel_session_query_authenticator (
-			camel_service_get_session (service),
-			CAMEL_AUTHENTICATOR_ASK, prompt, TRUE,
-			service, "password", ex);
-		g_free (prompt);
-		if (!service->url->passwd)
-			return FALSE;
-	}
-
-	if (!service->url->authmech || kpop) {
-		status = camel_pop3_command (store, &msg, ex, "USER %s",
-					     service->url->user);
-		switch (status) {
-		case CAMEL_POP3_ERR:
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Unable to connect to POP "
-						"server.\nError sending "
-						"username: %s"),
-					      msg ? msg : _("(Unknown)"));
-			g_free (msg);
-			/*fallll*/
-		case CAMEL_POP3_FAIL:
-			return FALSE;
-		}
-		g_free (msg);
-
-		status = camel_pop3_command (store, &msg, ex, "PASS %s",
-					     service->url->passwd);
-	} else if (!strcmp (service->url->authmech, "+APOP")
-		   && store->apop_timestamp) {
-		char *secret, md5asc[33], *d;
-		unsigned char md5sum[16], *s;
-
-		secret = g_strdup_printf ("%s%s", store->apop_timestamp,
-					  service->url->passwd);
-		md5_get_digest (secret, strlen (secret), md5sum);
-		g_free (secret);
-
-		for (s = md5sum, d = md5asc; d < md5asc + 32; s++, d += 2)
-			sprintf (d, "%.2x", *s);
-
-		status = camel_pop3_command (store, &msg, ex, "APOP %s %s",
-					     service->url->user, md5asc);
-	} else {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Unable to connect to POP server.\n"
-				       "No support for requested "
-				       "authentication mechanism."));
-		return FALSE;
-	}
-
-	if (status == CAMEL_POP3_ERR) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Unable to connect to POP server.\n"
-					"Error sending password: %s"),
-				      msg ? msg : _("(Unknown)"));
-	}
-
-	g_free (msg);
-	return status == CAMEL_POP3_ERR;
-}
-
-static gboolean
-pop3_connect (CamelService *service, CamelException *ex)
-{
-	char *errbuf = NULL;
-	gboolean tryagain, kpop = FALSE;
-	gboolean res;
-
-#ifdef HAVE_KRB4
-	gboolean set_port = FALSE;
-
-	kpop = (service->url->authmech &&
-		!strcmp (service->url->authmech, "+KPOP"));
-
-	if (kpop && service->url->port == 0) {
-		set_port = TRUE;
-		service->url->port = KPOP_PORT;
-	}
-#endif
-
-  	res = CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex);
-
-#ifdef HAVE_KRB4
-	/* This is veeery nasty. When we set the port, we're changing the
-	 * hash value of our URL. service_cache_remove() gets called when
-	 * we're done checking the mail, but the hash table lookup fails
-	 * because the url port has changed. Then, a finalized instance of
-	 * the CamelService is stuck in the hash table, and the next time
-	 * we try to look up the service, with a URL of port 0, we look
-	 * up the freed service and a segfault results.
-	 */
-
-	if (kpop && set_port)
-		service->url->port = 0;
-#endif
-
-	if (res == FALSE)
-		return FALSE;
-
-	/*FIXME integrate these functions */
-	if (!connect_to_server (service, ex))
-		return FALSE;
-
-	camel_exception_clear (ex);
-	do {
-		if (camel_exception_is_set (ex)) {
-			errbuf = g_strdup_printf (
-				"%s\n\n",
-				camel_exception_get_description (ex));
-			camel_exception_clear (ex);
-
-			/* Uncache the password before prompting again. */
-			camel_session_query_authenticator (
-				camel_service_get_session (service),
-				CAMEL_AUTHENTICATOR_TELL, NULL, TRUE, service,
-				"password", ex);
-			g_free (service->url->passwd);
-			service->url->passwd = NULL;
-		}
-
-		tryagain = pop3_try_authenticate (service, kpop, errbuf, ex);
-		g_free (errbuf);
-	} while (tryagain);
-
-	if (camel_exception_is_set (ex)) {
-		camel_service_disconnect (service, TRUE, ex);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-
-	if (clean)
-		camel_pop3_command (store, NULL, ex, "QUIT");
-
-	if (!CAMEL_SERVICE_CLASS (parent_class)->disconnect (service, clean, ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name,
-	    guint32 flags, CamelException *ex)
-{
-	if (g_strcasecmp (folder_name, "inbox") != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-				      _("No such folder `%s'."), folder_name);
-		return NULL;
-	}
-	return camel_pop3_folder_new (store, ex);
-}
-
-
-/**
- * camel_pop3_command: Send a command to a POP3 server.
- * @store: the POP3 store
- * @ret: a pointer to return the full server response in
- * @fmt: a printf-style format string, followed by arguments
- *
- * This command sends the command specified by @fmt and the following
- * arguments to the connected POP3 store specified by @store. It then
- * reads the server's response and parses out the status code. If
- * the caller passed a non-NULL pointer for @ret, camel_pop3_command
- * will set it to point to an buffer containing the rest of the
- * response from the POP3 server. (If @ret was passed but there was
- * no extended response, @ret will be set to NULL.) The caller must
- * free this buffer when it is done with it.
- *
- * Return value: one of CAMEL_POP3_OK (command executed successfully),
- * CAMEL_POP3_ERR (command encounted an error), or CAMEL_POP3_FAIL
- * (a protocol-level error occurred, and Camel is uncertain of the
- * result of the command.)
- **/
-int
-camel_pop3_command (CamelPop3Store *store, char **ret, CamelException *ex, char *fmt, ...)
-{
-	char *cmdbuf;
-	va_list ap;
-
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (fmt, ap);
-	va_end (ap);
-
-	/* Send the command */
-	if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, "%s\r\n", cmdbuf) < 0) {
-		g_free (cmdbuf);
-		if (ret)
-			*ret = NULL;
-		return CAMEL_POP3_FAIL;
-	}
-	g_free (cmdbuf);
-
-	return pop3_get_response (store, ret, ex);
-}
-
-static int
-pop3_get_response (CamelPop3Store *store, char **ret, CamelException *ex)
-{
-	char *respbuf;
-	int status;
-
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0) {
-		if (ret)
-			*ret = NULL;
-		return CAMEL_POP3_FAIL;
-	}
-
-	if (!strncmp (respbuf, "+OK", 3))
-		status = CAMEL_POP3_OK;
-	else if (!strncmp (respbuf, "-ERR", 4))
-		status = CAMEL_POP3_ERR;
-	else
-		status = CAMEL_POP3_FAIL;
-
-	if (ret) {
-		if (status != CAMEL_POP3_FAIL) {
-			*ret = strchr (respbuf, ' ');
-			if (*ret)
-				*ret = g_strdup (*ret + 1);
-		} else
-			*ret = NULL;
-	}
-	g_free (respbuf);
-
-	return status;
-}
-
-/**
- * camel_pop3_command_get_additional_data: get "additional data" from
- * a POP3 command.
- * @store: the POP3 store
- * @total: Total bytes expected (for progress reporting), use 0 for 'unknown'.
- *
- * This command gets the additional data returned by "multi-line" POP
- * commands, such as LIST, RETR, TOP, and UIDL. This command _must_
- * be called after a successful (CAMEL_POP3_OK) call to
- * camel_pop3_command for a command that has a multi-line response.
- * The returned data is un-byte-stuffed, and has lines termined by
- * newlines rather than CR/LF pairs.
- *
- * Return value: the data, which the caller must free.
- **/
-char *
-camel_pop3_command_get_additional_data (CamelPop3Store *store, int total, CamelException *ex)
-{
-	GPtrArray *data;
-	char *buf, *p;
-	int i, len = 0, status = CAMEL_POP3_OK;
-	int pc = 0;
-
-	data = g_ptr_array_new ();
-	while (1) {
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &buf, ex) < 0) {
-			status = CAMEL_POP3_FAIL;
-			break;
-		}
-
-		if (!strcmp (buf, "."))
-			break;
-
-		g_ptr_array_add (data, buf);
-		len += strlen (buf) + 1;
-
-		if (total) {
-			pc = (len+1) * 100 / total;
-			camel_operation_progress(NULL, pc);
-		} else {
-			camel_operation_progress_count(NULL, len);
-		}
-	}
-	
-	if (buf)
-		g_free (buf);
-
-	if (status == CAMEL_POP3_OK) {
-		buf = g_malloc0 (len + 1);
-
-		for (i = 0, p = buf; i < data->len; i++) {
-			char *ptr, *datap;
-
-			datap = (char *) data->pdata[i];
-			ptr = (*datap == '.') ? datap + 1 : datap;
-			len = strlen (ptr);
-			memcpy (p, ptr, len);
-			p += len;
-			*p++ = '\n';
-		}
-		*p = '\0';
-	} else
-		buf = NULL;
-
-	for (i = 0; i < data->len; i++)
-		g_free (data->pdata[i]);
-	g_ptr_array_free (data, TRUE);
-
-	return buf;
-}
-
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
deleted file mode 100644
index 078a317a14..0000000000
--- a/camel/providers/pop3/camel-pop3-store.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-store.h : class for an pop3 store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_POP3_STORE_H
-#define CAMEL_POP3_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-types.h"
-#include "camel-remote-store.h"
-
-#define CAMEL_POP3_STORE_TYPE     (camel_pop3_store_get_type ())
-#define CAMEL_POP3_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_STORE_TYPE, CamelPop3Store))
-#define CAMEL_POP3_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPop3StoreClass))
-#define CAMEL_IS_POP3_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_STORE_TYPE))
-
-
-typedef struct {
-	CamelRemoteStore parent_object;
-
-	char *apop_timestamp, *implementation;
-	gboolean supports_top, supports_uidl, expires;
-	int login_delay;
-
-} CamelPop3Store;
-
-
-
-typedef struct {
-	CamelRemoteStoreClass parent_class;
-
-} CamelPop3StoreClass;
-
-
-/* public methods */
-void camel_pop3_store_expunge (CamelPop3Store *store, CamelException *ex);
-
-/* support functions */
-enum { CAMEL_POP3_OK, CAMEL_POP3_ERR, CAMEL_POP3_FAIL };
-int camel_pop3_command (CamelPop3Store *store, char **ret, CamelException *ex, char *fmt, ...);
-char *camel_pop3_command_get_additional_data (CamelPop3Store *store, int total, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_pop3_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_POP3_STORE_H */
-
-
diff --git a/camel/providers/pop3/libcamelpop3.urls b/camel/providers/pop3/libcamelpop3.urls
deleted file mode 100644
index 7fffa4d861..0000000000
--- a/camel/providers/pop3/libcamelpop3.urls
+++ /dev/null
@@ -1 +0,0 @@
-pop
diff --git a/camel/providers/sendmail/.cvsignore b/camel/providers/sendmail/.cvsignore
deleted file mode 100644
index 097fdedafb..0000000000
--- a/camel/providers/sendmail/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-*.o
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
deleted file mode 100644
index 965f56afb8..0000000000
--- a/camel/providers/sendmail/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelsendmailincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelsendmail.la
-provider_DATA = libcamelsendmail.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-	-I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \
-        -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
-
-libcamelsendmail_la_SOURCES = 			\
-	camel-sendmail-provider.c		\
-	camel-sendmail-transport.c
-
-libcamelsendmailinclude_HEADERS =		\
-	camel-sendmail-transport.h
-
-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelsendmail.urls
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
deleted file mode 100644
index d0e40b4cf8..0000000000
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-provider.c: sendmail provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-provider.h"
-#include "camel-sendmail-transport.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider sendmail_provider = {
-	"sendmail",
-	N_("Sendmail"),
-
-	N_("For delivering mail by passing it to the \"sendmail\" program "
-	   "on the local system."),
-
-	"mail",
-
-	0,
-
-	0,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	sendmail_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
-		camel_sendmail_transport_get_type();
-
-	sendmail_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &sendmail_provider);
-}
-
-
-
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
deleted file mode 100644
index d76edfeca9..0000000000
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-transport.c: Sendmail-based transport class. */
-
-/* 
- *
- * Authors: Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "camel-sendmail-transport.h"
-#include "camel-mime-message.h"
-#include "camel-data-wrapper.h"
-#include "camel-stream-fs.h"
-#include "camel-exception.h"
-
-static char *get_name (CamelService *service, gboolean brief);
-
-static gboolean sendmail_can_send (CamelTransport *transport, CamelMedium *message);
-static gboolean sendmail_send (CamelTransport *transport, CamelMedium *message,
-			       CamelException *ex);
-static gboolean sendmail_send_to (CamelTransport *transport, CamelMedium *message,
-				  GList *recipients, CamelException *ex);
-
-
-static void
-camel_sendmail_transport_class_init (CamelSendmailTransportClass *camel_sendmail_transport_class)
-{
-	CamelTransportClass *camel_transport_class =
-		CAMEL_TRANSPORT_CLASS (camel_sendmail_transport_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_sendmail_transport_class);
-
-	/* virtual method overload */
-	camel_service_class->get_name = get_name;
-
-	camel_transport_class->can_send = sendmail_can_send;
-	camel_transport_class->send = sendmail_send;
-	camel_transport_class->send_to = sendmail_send_to;
-}
-
-CamelType
-camel_sendmail_transport_get_type (void)
-{
-	static CamelType camel_sendmail_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_sendmail_transport_type == CAMEL_INVALID_TYPE)	{
-		camel_sendmail_transport_type =
-			camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSendmailTransport",
-					     sizeof (CamelSendmailTransport),
-					     sizeof (CamelSendmailTransportClass),
-					     (CamelObjectClassInitFunc) camel_sendmail_transport_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) NULL,
-					     NULL);
-	}
-	
-	return camel_sendmail_transport_type;
-}
-
-
-static gboolean
-sendmail_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CAMEL_IS_MIME_MESSAGE (message);
-}
-
-
-static gboolean
-sendmail_send_internal (CamelMedium *message, char **argv, CamelException *ex)
-{
-	int fd[2], nullfd, wstat;
-	sigset_t mask, omask;
-	CamelStream *out;
-	pid_t pid;
-
-	g_assert (CAMEL_IS_MIME_MESSAGE (message));
-
-	if (pipe (fd) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create pipe to sendmail: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-
-	/* Block SIGCHLD so the calling application doesn't notice
-	 * sendmail exiting before we do.
-	 */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGCHLD);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-
-	pid = fork ();
-	switch (pid) {
-	case -1:
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not fork sendmail: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		return FALSE;
-
-	case 0:
-		/* Child process */
-		nullfd = open ("/dev/null", O_RDWR);
-		dup2 (fd[0], STDIN_FILENO);
-		dup2 (nullfd, STDOUT_FILENO);
-		dup2 (nullfd, STDERR_FILENO);
-		close (nullfd);
-		close (fd[1]);
-
-		execv (SENDMAIL_PATH, argv);
-		_exit (255);
-	}
-
-	/* Parent process. Write the message out. */
-	close (fd[0]);
-	out = camel_stream_fs_new_with_fd (fd[1]);
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out) == -1
-	    || camel_stream_close(out) == -1) {
-		camel_object_unref (CAMEL_OBJECT (out));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not send message: %s"),
-				      strerror(errno));
-		return FALSE;
-	}
-	camel_object_unref (CAMEL_OBJECT (out));
-
-	/* Wait for sendmail to exit. */
-	while (waitpid (pid, &wstat, 0) == -1 && errno == EINTR)
-		;
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-
-	if (!WIFEXITED (wstat)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("sendmail exited with signal %s: "
-					"mail not sent."),
-				      g_strsignal (WTERMSIG (wstat)));
-		return FALSE;
-	} else if (WEXITSTATUS (wstat) != 0) {
-		if (WEXITSTATUS (wstat) == 255) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not execute %s: "
-						"mail not sent."),
-					      SENDMAIL_PATH);
-		} else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("sendmail exited with status "
-						"%d: mail not sent."),
-					      WEXITSTATUS (wstat));
-		}
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-sendmail_send_to (CamelTransport *transport, CamelMedium *message,
-		  GList *recipients, CamelException *ex)
-{
-	GList *r;
-	char **argv;
-	int i, len;
-	gboolean status;
-
-	len = g_list_length (recipients);
-	argv = g_malloc ((len + 4) * sizeof (char *));
-	argv[0] = "sendmail";
-	argv[1] = "-i";
-	argv[2] = "--";
-
-	for (i = 1, r = recipients; i <= len; i++, r = r->next)
-		argv[i + 2] = r->data;
-	argv[i + 2] = NULL;
-	
-	status = sendmail_send_internal (message, argv, ex);
-	g_free (argv);
-	return status;
-}
-
-static gboolean
-sendmail_send (CamelTransport *transport, CamelMedium *message,
-       CamelException *ex)
-{
-	char *argv[4] = { "sendmail", "-t", "-i", NULL };
-	
-	return sendmail_send_internal (message, argv, ex);
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup (_("sendmail"));
-	else
-		return g_strdup (_("Mail delivery via the sendmail program"));
-}
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
deleted file mode 100644
index bb5dca071b..0000000000
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-transport.h: Sendmail-based transport class */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SENDMAIL_TRANSPORT_H
-#define CAMEL_SENDMAIL_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-transport.h"
-
-#define CAMEL_SENDMAIL_TRANSPORT_TYPE     (camel_sendmail_transport_get_type ())
-#define CAMEL_SENDMAIL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))
-#define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass))
-#define CAMEL_IS_SENDMAIL_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SENDMAIL_TRANSPORT_TYPE))
-
-
-typedef struct {
-	CamelTransport parent_object;
-
-} CamelSendmailTransport;
-
-
-typedef struct {
-	CamelTransportClass parent_class;
-
-} CamelSendmailTransportClass;
-
-
-/* Standard Camel function */
-CamelType camel_sendmail_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SENDMAIL_TRANSPORT_H */
diff --git a/camel/providers/sendmail/libcamelsendmail.urls b/camel/providers/sendmail/libcamelsendmail.urls
deleted file mode 100644
index ccad52828e..0000000000
--- a/camel/providers/sendmail/libcamelsendmail.urls
+++ /dev/null
@@ -1 +0,0 @@
-sendmail
diff --git a/camel/providers/smtp/.cvsignore b/camel/providers/smtp/.cvsignore
deleted file mode 100644
index b948585108..0000000000
--- a/camel/providers/smtp/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
deleted file mode 100644
index 734a4e5128..0000000000
--- a/camel/providers/smtp/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelsmtpincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelsmtp.la
-provider_DATA = libcamelsmtp.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-	-I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
-	$(GTK_INCLUDEDIR)			\
-        -DG_LOG_DOMAIN=\"camel-smtp-provider\"
-
-libcamelsmtp_la_SOURCES = 			\
-	camel-smtp-provider.c			\
-	camel-smtp-transport.c
-
-libcamelsmtpinclude_HEADERS =			\
-	camel-smtp-transport.h
-
-
-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
-
-libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelsmtp.urls
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
deleted file mode 100644
index 83fb54bc8e..0000000000
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-provider.c: smtp provider registration code */
-
-/* 
- * Authors :
- *   Jeffrey Stedfast <fejj@stampede.org>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-smtp-transport.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider smtp_provider = {
-	"smtp",
-	N_("SMTP"),
-
-	N_("For delivering mail by connecting to a remote mailhub "
-	   "using SMTP.\n"),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE,
-
-	CAMEL_URL_NEED_HOST,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
-		camel_smtp_transport_get_type();
-
-	smtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &smtp_provider);
-}
-
-
-
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
deleted file mode 100644
index 1d7b4e5622..0000000000
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ /dev/null
@@ -1,836 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-transport.c : class for a smtp transport */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#undef MIN
-#undef MAX
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-linewrap.h"
-#include "camel-stream-filter.h"
-#include "camel-smtp-transport.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-mime-part.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include <gal/util/e-util.h>
-
-#define d(x) x
-
-/* Specified in RFC 821 */
-#define SMTP_PORT 25
-
-/* camel smtp transport class prototypes */
-static gboolean smtp_can_send (CamelTransport *transport, CamelMedium *message);
-static gboolean smtp_send (CamelTransport *transport, CamelMedium *message, CamelException *ex);
-static gboolean smtp_send_to (CamelTransport *transport, CamelMedium *message, GList *recipients, CamelException *ex);
-
-/* support prototypes */
-static gboolean smtp_connect (CamelService *service, CamelException *ex);
-static gboolean smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *esmtp_get_authtypes (gchar *buffer);
-static GList *query_auth_types (CamelService *service, gboolean connect, CamelException *ex);
-static void free_auth_types (CamelService *service, GList *authtypes);
-static char *get_name (CamelService *service, gboolean brief);
-
-static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);
-static gboolean smtp_mail (CamelSmtpTransport *transport, const char *sender,
-			   gboolean has_8bit_parts, CamelException *ex);
-static gboolean smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex);
-static gboolean smtp_data (CamelSmtpTransport *transport, CamelMedium *message,
-			   gboolean has_8bit_parts, CamelException *ex);
-static gboolean smtp_rset (CamelSmtpTransport *transport, CamelException *ex);
-static gboolean smtp_quit (CamelSmtpTransport *transport, CamelException *ex);
-
-/* private data members */
-static CamelServiceClass *service_class = NULL;
-
-static void
-camel_smtp_transport_class_init (CamelSmtpTransportClass *camel_smtp_transport_class)
-{
-	CamelTransportClass *camel_transport_class =
-		CAMEL_TRANSPORT_CLASS (camel_smtp_transport_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_smtp_transport_class);
-	
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = smtp_connect;
-	camel_service_class->disconnect = smtp_disconnect;
-	camel_service_class->query_auth_types = query_auth_types;
-	camel_service_class->free_auth_types = free_auth_types;
-	camel_service_class->get_name = get_name;
-
-	camel_transport_class->can_send = smtp_can_send;
-	camel_transport_class->send = smtp_send;
-	camel_transport_class->send_to = smtp_send_to;
-}
-
-static void
-camel_smtp_transport_init (gpointer object)
-{
-	CamelTransport *transport = CAMEL_TRANSPORT (object);
-	
-	transport->supports_8bit = FALSE;
-}
-
-CamelType
-camel_smtp_transport_get_type (void)
-{
-	static CamelType camel_smtp_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_smtp_transport_type == CAMEL_INVALID_TYPE) {
-		camel_smtp_transport_type =
-			camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSmtpTransport",
-					     sizeof (CamelSmtpTransport),
-					     sizeof (CamelSmtpTransportClass),
-					     (CamelObjectClassInitFunc) camel_smtp_transport_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_smtp_transport_init,
-					     NULL);
-	}
-	
-	return camel_smtp_transport_type;
-}
-
-static const char *
-get_smtp_error_string (int error)
-{
-	/* SMTP error codes grabbed from rfc821 */
-	switch (error) {
-	case 0:
-		/* looks like a read problem, check errno */
-		return g_strerror (errno);
-	case 500:
-		return _("Syntax error, command unrecognized");
-	case 501:
-		return _("Syntax error in parameters or arguments");
-	case 502:
-		return _("Command not implemented");
-	case 504:
-		return _("Command parameter not implemented");
-	case 211:
-		return _("System status, or system help reply");
-	case 214:
-		return _("Help message");
-	case 220:
-		return _("Service ready");
-	case 221:
-		return _("Service closing transmission channel");
-	case 421:
-		return _("Service not available, closing transmission channel");
-	case 250:
-		return _("Requested mail action okay, completed");
-	case 251:
-		return _("User not local; will forward to <forward-path>");
-	case 450:
-		return _("Requested mail action not taken: mailbox unavailable");
-	case 550:
-		return _("Requested action not taken: mailbox unavailable");
-	case 451:
-		return _("Requested action aborted: error in processing");
-	case 551:
-		return _("User not local; please try <forward-path>");
-	case 452:
-		return _("Requested action not taken: insufficient system storage");
-	case 552:
-		return _("Requested mail action aborted: exceeded storage allocation");
-	case 553:
-		return _("Requested action not taken: mailbox name not allowed");
-	case 354:
-		return _("Start mail input; end with <CRLF>.<CRLF>");
-	case 554:
-		return _("Transaction failed");
-	default:
-		return _("Unknown");
-	}
-}
-
-static gboolean
-smtp_connect (CamelService *service, CamelException *ex)
-{
-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
-	struct hostent *h;
-	struct sockaddr_in sin;
-	gint fd, num, i;
-	guint32 addrlen;
-	gchar *pass = NULL, *respbuf = NULL;
-	
-	if (!service_class->connect (service, ex))
-		return FALSE;
-	
-	h = camel_service_gethost (service, ex);
-	if (!h)
-		return FALSE;
-	
-	/* set some smtp transport defaults */
-	transport->is_esmtp = FALSE;
-	transport->esmtp_supported_authtypes = NULL;
-	CAMEL_TRANSPORT (transport)->supports_8bit = FALSE;
-	
-	sin.sin_family = h->h_addrtype;
-	sin.sin_port = htons (service->url->port ? service->url->port : SMTP_PORT);
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof (sin)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not connect to %s (port %d): %s"),
-				      service->url->host,
-				      service->url->port ? service->url->port : SMTP_PORT,
-				      strerror (errno));
-		if (fd > -1)
-			close (fd);
-		g_free (pass);
-		return FALSE;
-	}
-	
-	/* get the localaddr - needed later by smtp_helo */
-	addrlen = sizeof (transport->localaddr);
-	getsockname (fd, (struct sockaddr*)&transport->localaddr, &addrlen);
-	
-	transport->ostream = camel_stream_fs_new_with_fd (fd);
-	transport->istream = camel_stream_buffer_new (transport->ostream, 
-						      CAMEL_STREAM_BUFFER_READ);
-	
-	/* Read the greeting, note whether the server is ESMTP or not. */
-	do {
-		/* Check for "220" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		if (!respbuf || strncmp (respbuf, "220", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Welcome response error: %s: possibly non-fatal"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-		if (strstr (respbuf, "ESMTP"))
-			transport->is_esmtp = TRUE;
-	} while (*(respbuf+3) == '-'); /* if we got "220-" then loop again */
-	g_free (respbuf);
-	
-	/* send HELO (or EHLO, depending on the service type) */
-	if (!transport->is_esmtp) {
-		/* If we did not auto-detect ESMTP, we should still send EHLO */
-		transport->is_esmtp = TRUE;
-		if (!smtp_helo (transport, NULL)) {
-			/* Okay, apprently this server doesn't support ESMTP */
-			transport->is_esmtp = FALSE;
-			smtp_helo (transport, ex);
-		}
-	} else {
-		/* send EHLO */
-		smtp_helo (transport, ex);
-	}
-	
-	/* check to see if AUTH is required, if so...then AUTH ourselves */
-	if (transport->is_esmtp && transport->esmtp_supported_authtypes) {
-		/* not really supported yet, but we can at least show what auth types are supported */
-		d(fprintf (stderr, "camel-smtp-transport::connect(): %s requires AUTH\n", service->url->host));
-		num = g_list_length (transport->esmtp_supported_authtypes);
-		
-		for (i = 0; i < num; i++)
-			d(fprintf (stderr, "\nSupported AUTH: %s\n\n", 
-				(gchar *) g_list_nth_data (transport->esmtp_supported_authtypes, i)));
-		
-		g_list_free (transport->esmtp_supported_authtypes);
-		transport->esmtp_supported_authtypes = NULL;
-	} else {
-		d(fprintf (stderr, "\ncamel-smtp-transport::connect(): provider does not use AUTH\n\n"));
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
-	
-	/*if (!service->connected)
-	 *	return TRUE;
-	 */
-
-	if (clean) {
-		/* send the QUIT command to the SMTP server */
-		smtp_quit (transport, ex);
-	}
-	
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-	
-	g_free (transport->esmtp_supported_authtypes);
-	transport->esmtp_supported_authtypes = NULL;
-	camel_object_unref (CAMEL_OBJECT (transport->ostream));
-	camel_object_unref (CAMEL_OBJECT (transport->istream));
-	transport->ostream = NULL;
-	transport->istream = NULL;
-	
-	return TRUE;
-}
-
-static GList *
-esmtp_get_authtypes (gchar *buffer)
-{
-	GList *ret = NULL;
-	gchar *start, *end;
-	
-	/* advance to the first token */
-	for (start = buffer; *start == ' ' || *start == '='; start++);
-	
-	for ( ; *start; ) {
-		/* advance to the end of the token */
-		for (end = start; *end && *end != ' '; end++);
-		
-		ret = g_list_append (ret, g_strndup (start, end - start));
-		
-		/* advance to the next token */
-		for (start = end; *start == ' '; start++);
-	}
-	
-	return ret;
-}
-
-/* FIXME: use these? */
-#ifdef notyet
-static CamelServiceAuthType no_authtype = {
-	_("No authentication required"),
-	
-	_("This option will connect to the SMTP server without using any "
-	  "kind of authentication. This should be fine for connecting to "
-	  "most SMTP servers.")
-	
-	_(""),
-	FALSE
-};
-
-static CamelServiceAuthType cram_md5_authtype = {
-	_("CRAM-MD5"),
-	
-	_("This option will connect to the SMTP server using CRAM-MD5 "
-	  "authentication."),
-	
-	_("CRAM-MD5"),
-	TRUE
-};
-#endif
-
-static GList *
-query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	/* FIXME: Re-enable this when auth types are actually
-	 * implemented.
-	 */
-	
-	return NULL;
-}
-
-static void
-free_auth_types (CamelService *service, GList *authtypes)
-{
-	g_list_free (authtypes);
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf (_("SMTP server %s"), service->url->host);
-	else {
-		return g_strdup_printf (_("SMTP mail delivery via %s"),
-					service->url->host);
-	}
-}
-
-static gboolean
-smtp_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CAMEL_IS_MIME_MESSAGE (message);
-}
-
-static gboolean
-smtp_send_to (CamelTransport *transport, CamelMedium *message,
-	      GList *recipients, CamelException *ex)
-{
-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);
-	const CamelInternetAddress *cia;
-	char *recipient;
-	const char *addr;
-	gboolean has_8bit_parts;
-	GList *r;
-	
-	cia = camel_mime_message_get_from(CAMEL_MIME_MESSAGE (message));
-	if (!cia) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot send message: "
-					"sender address not defined."));
-		return FALSE;
-	}
-	
-	if (!camel_internet_address_get (cia, 0, NULL, &addr)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot send message: "
-					"sender address not valid."));
-		return FALSE;
-	}
-	
-	/* find out if the message has 8bit mime parts */
-	has_8bit_parts = camel_mime_message_has_8bit_parts (CAMEL_MIME_MESSAGE (message));
-	
-	/* rfc1652 (8BITMIME) requires that you notify the ESMTP daemon that
-	   you'll be sending an 8bit mime message at "MAIL FROM:" time. */
-	smtp_mail (smtp_transport, addr, has_8bit_parts, ex);
-	
-	if (!recipients) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot send message: "
-					"no recipients defined."));
-		return FALSE;
-	}
-	
-	for (r = recipients; r; r = r->next) {
-		recipient = (char *) r->data;
-		if (!smtp_rcpt (smtp_transport, recipient, ex)) {
-			g_free (recipient);
-			return FALSE;
-		}
-		g_free (recipient);
-	}
-	
-	/* passing in has_8bit_parts saves time as we don't have to
-           recurse through the message all over again if the user is
-           not sending 8bit mime parts */
-	if (!smtp_data (smtp_transport, message, has_8bit_parts, ex))
-		return FALSE;
-	
-	/* reset the service for our next transfer session */
-	smtp_rset (smtp_transport, ex);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_send (CamelTransport *transport, CamelMedium *message, CamelException *ex)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *recipients = NULL;
-	guint index, len;
-	
-	to = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_TO);
-	cc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_CC);
-	bcc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_BCC);
-	
-	/* get all of the To addresses into our recipient list */
-	len = CAMEL_ADDRESS (to)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (to, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	/* get all of the Cc addresses into our recipient list */
-	len = CAMEL_ADDRESS (cc)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (cc, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	/* get all of the Bcc addresses into our recipient list */
-	len = CAMEL_ADDRESS (bcc)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (bcc, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	return smtp_send_to (transport, message, recipients, ex);
-}
-
-static gboolean
-smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* say hello to the server */
-	gchar *cmdbuf, *respbuf = NULL;
-	struct hostent *host;
-	
-	/* get the local host name */
-	host = gethostbyaddr ((gchar *)&transport->localaddr.sin_addr, sizeof (transport->localaddr.sin_addr), AF_INET);
-	
-	/* hiya server! how are you today? */
-	if (transport->is_esmtp) {
-		if (host && host->h_name)
-			cmdbuf = g_strdup_printf ("EHLO %s\r\n", host->h_name);
-		else
-			cmdbuf = g_strdup_printf ("EHLO [%s]\r\n", inet_ntoa (transport->localaddr.sin_addr));
-	} else {
-		if (host && host->h_name)
-			cmdbuf = g_strdup_printf ("HELO %s\r\n", host->h_name);
-		else
-			cmdbuf = g_strdup_printf ("HELO [%s]\r\n", inet_ntoa (transport->localaddr.sin_addr));
-	}
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("HELO request timed out: %s: non-fatal"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			int error;
-
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("HELO response error: %s: non-fatal"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-		
-		if (e_strstrcase (respbuf, "8BITMIME")) {
-			d(fprintf (stderr, "This server supports 8bit MIME\n"));
-			CAMEL_TRANSPORT (transport)->supports_8bit = TRUE;
-		}
-		
-		if (transport->is_esmtp && strstr (respbuf, "AUTH")) {
-			/* parse for supported AUTH types */
-			char *auths = strstr (respbuf, "AUTH") + 4;
-			
-			transport->esmtp_supported_authtypes = esmtp_get_authtypes (auths);
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_mail (CamelSmtpTransport *transport, const char *sender, gboolean has_8bit_parts, CamelException *ex)
-{
-	/* we gotta tell the smtp server who we are. (our email addy) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	/* enclose address in <>'s since some SMTP daemons *require* that */
-	if (CAMEL_TRANSPORT (transport)->supports_8bit && has_8bit_parts)
-		cmdbuf = g_strdup_printf ("MAIL FROM: <%s> BODY=8BITMIME\r\n", sender);
-	else
-		cmdbuf = g_strdup_printf ("MAIL FROM: <%s>\r\n", sender);
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("MAIL FROM request timed out: %s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("MAIL FROM response error: %s: mail not sent"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex)
-{
-	/* we gotta tell the smtp server who we are going to be sending
-	 * our email to */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	/* enclose address in <>'s since some SMTP daemons *require* that */
-	cmdbuf = g_strdup_printf ("RCPT TO: <%s>\r\n", recipient);
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("RCPT TO request timed out: %s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("RCPT TO response error: %s: mail not sent"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_data (CamelSmtpTransport *transport, CamelMedium *message, gboolean has_8bit_parts, CamelException *ex)
-{
-	/* now we can actually send what's important :p */
-	gchar *cmdbuf, *respbuf = NULL;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlffilter;
-	
-	/* if the message contains 8bit mime parts and the server
-           doesn't support it, encode 8bit parts to the best
-           encoding.  This will also enforce an encoding to keep the lines in limit */
-	if (has_8bit_parts && !CAMEL_TRANSPORT (transport)->supports_8bit)
-		camel_mime_message_encode_8bit_parts (CAMEL_MIME_MESSAGE (message));
-	
-	cmdbuf = g_strdup ("DATA\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("DATA request timed out: %s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-	
-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-	
-	if (!respbuf || strncmp (respbuf, "354", 3)) {
-		/* we should have gotten instructions on how to use the DATA command:
-		 * 354 Enter mail, end with "." on a line by itself
-		 */
-		int error;
-			
-		error = respbuf ? atoi (respbuf) : 0;
-		g_free (respbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("DATA response error: %s: mail not sent"),
-				      get_smtp_error_string (error));
-		return FALSE;
-	}
-
-	g_free (respbuf);
-	respbuf = NULL;
-	
-	/* setup stream filtering */
-	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);
-	filtered_stream = camel_stream_filter_new_with_stream (transport->ostream);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlffilter));
-	
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (filtered_stream)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("DATA send timed out: message termination: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		
-		camel_object_unref (CAMEL_OBJECT (filtered_stream));
-		
-		return FALSE;
-	}
-	
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	
-	/* terminate the message body */
-	
-	d(fprintf (stderr, "sending : \\r\\n.\\r\\n\n"));
-	
-	if (camel_stream_write (transport->ostream, "\r\n.\r\n", 5) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("DATA send timed out: message termination: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("DATA response error: message termination: "
-						"%s: mail not sent"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_rset (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* we are going to reset the smtp server (just to be nice) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	cmdbuf = g_strdup ("RSET\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("RSET request timed out: %s"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("RSET response error: %s"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_quit (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* we are going to reset the smtp server (just to be nice) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	cmdbuf = g_strdup ("QUIT\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("QUIT request timed out: %s: non-fatal"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "221" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "221", 3)) {
-			int error;
-			
-			error = respbuf ? atoi (respbuf) : 0;
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("QUIT response error: %s: non-fatal"),
-					      get_smtp_error_string (error));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "221-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
deleted file mode 100644
index 7d647e6544..0000000000
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-transport.h : class for an smtp transfer */
-
-/* 
- * Authors:
- *   Jeffrey Stedfast <fejj@stampede.org>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SMTP_TRANSPORT_H
-#define CAMEL_SMTP_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "camel-transport.h"
-
-#define CAMEL_SMTP_TRANSPORT_TYPE     (camel_smtp_transport_get_type ())
-#define CAMEL_SMTP_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))
-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))
-#define CAMEL_IS_SMTP_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SMTP_TRANSPORT_TYPE))
-
-
-typedef struct {
-	CamelTransport parent_object;
-
-	CamelStream *istream, *ostream;
-
-	gboolean is_esmtp;
-
-	struct sockaddr_in localaddr;
-
-	GList *esmtp_supported_authtypes;
-	
-} CamelSmtpTransport;
-
-
-
-typedef struct {
-	CamelTransportClass parent_class;
-
-} CamelSmtpTransportClass;
-
-
-/* Standard Camel function */
-CamelType camel_smtp_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SMTP_TRANSPORT_H */
-
-
diff --git a/camel/providers/smtp/libcamelsmtp.urls b/camel/providers/smtp/libcamelsmtp.urls
deleted file mode 100644
index ec2fc0fc16..0000000000
--- a/camel/providers/smtp/libcamelsmtp.urls
+++ /dev/null
@@ -1 +0,0 @@
-smtp
diff --git a/camel/providers/vee/.cvsignore b/camel/providers/vee/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/providers/vee/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/vee/libcamelvee.urls b/camel/providers/vee/libcamelvee.urls
deleted file mode 100644
index 6fa58dadb5..0000000000
--- a/camel/providers/vee/libcamelvee.urls
+++ /dev/null
@@ -1 +0,0 @@
-vfolder
diff --git a/camel/string-utils.c b/camel/string-utils.c
deleted file mode 100644
index 023aee16af..0000000000
--- a/camel/string-utils.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* string-util : utilities for gchar* strings  */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "string-utils.h"
-#include "string.h"
-
-gboolean
-string_equal_for_glist (gconstpointer v, gconstpointer v2)
-{
-	return (!strcmp ( ((const gchar *)v), ((const gchar*)v2))) == 0;
-}
-
-/* utility func : frees a gchar element in a GList */
-static void 
-__string_list_free_string (gpointer data, gpointer user_data)
-{
-	gchar *string = (gchar *)data;
-	g_free (string);
-}
-
-void 
-string_list_free (GList *string_list)
-{
-	if (string_list == NULL) return; 
-
-	g_list_foreach (string_list, __string_list_free_string, NULL);
-	g_list_free (string_list);
-}
-
-GList *
-string_split (const gchar *string, char sep, const gchar *trim_chars, StringTrimOption trim_options)
-{
-	GList *result = NULL;
-	gint first, last, pos;
-	gchar *new_string;
-
-	g_assert (string);
-	
-	first = 0;
-	last = strlen(string) - 1;
-	
-	/* strip leading and trailing separators */
-	while ( (first<=last) && (string[first]==sep) )
-		first++;
-	while ( (first<=last) && (string[last]==sep) )
-		last--;
-
-	
-	while (first<=last)  {
-		pos = first;
-		/* find next separator */
-		while ((pos<=last) && (string[pos]!=sep)) pos++;
-		if (first != pos) {
-			new_string = g_strndup (string+first, pos-first);
-			/* could do trimming in line to speed up this code */
-			if (trim_chars) string_trim (new_string, trim_chars, trim_options);
-			result = g_list_append (result, new_string);
-		}	
-		first = pos + 1;
-	}
-
-	return result;
-}
-
-void 
-string_trim (gchar *string, const gchar *trim_chars, StringTrimOption options)
-{
-	gint first_ok;
-	gint last_ok;
-	guint length;
-
-	g_return_if_fail (string);
-	length = strlen (string);
-	if (length==0)
-		return;
-	
-	first_ok = 0;
-	last_ok = length - 1;
-
-	if (options & STRING_TRIM_STRIP_LEADING)
-		while  ( (first_ok <= last_ok) && (strchr (trim_chars, string[first_ok])!=NULL) )
-			first_ok++;
-	
-	if (options & STRING_TRIM_STRIP_TRAILING)
-		while  ( (first_ok <= last_ok) && (strchr (trim_chars, string[last_ok])!=NULL) )
-			last_ok--;
-	
-	if (first_ok > 0)
-		memmove (string, string+first_ok, last_ok - first_ok + 1);
-	string[last_ok - first_ok +1] = '\0';
-	
-}
-
-
-/**
- * remove_suffix: remove a suffix from a string
- * @s: the string to remove the suffix from. 
- * @suffix: the suffix to remove
- * @suffix_found : suffix found flag
- *
- * Remove a suffix from a string. If the 
- * string ends with the full suffix, a copy 
- * of the string without the suffix is returned and
- * @suffix_found is set to %TRUE. 
- * Otherwise, NULL is returned and
- * @suffix_found is set to %FALSE. 
- * 
- * Return value: an allocated copy of the string without the suffix or NULL if the suffix was not found.
- **/
-gchar *
-string_prefix (const gchar *s, const gchar *suffix, gboolean *suffix_found)
-{
-	guint s_len, suf_len;
-	guint suffix_pos;
-	char *result_string;
-
-	g_assert (s);
-	g_assert (suffix);
-	g_assert (suffix_found);
-
-	s_len = strlen (s);
-	suf_len = strlen (suffix);
-
-	/* if the string is shorter than the suffix, do nothing */
-	if (s_len < suf_len) {
-		*suffix_found = FALSE;
-		return NULL;
-	}
-	
-	/* theoretical position of the prefix */
-	suffix_pos = s_len - suf_len;
-
-	/* compare the right hand side of the string with the suffix */
-	if (!strncmp (s+suffix_pos, suffix, suf_len)) {
-
-		/* if the suffix matches, check that there are 
-		   characters before */
-		if (suffix_pos == 0) {
-			result_string = NULL;
-			*suffix_found = TRUE;
-		} else { 
-			result_string = g_strndup (s, suffix_pos);
-			*suffix_found = TRUE;
-		}
-
-	} else { 
-		result_string = NULL;
-		*suffix_found = FALSE;
-	}
-
-	return result_string;
-}
-
-void
-string_unquote (gchar *string)
-{
-	/* if the string is quoted, unquote it */
-
-	g_return_if_fail (string != NULL);
-	
-	if (*string == '"' && *(string + strlen (string) - 1) == '"') {
-		*(string + strlen (string) - 1) = '\0';
-		if (*string)
-			memmove (string, string+1, strlen (string));
-	}
-}
-
-gchar *
-strip (gchar *string, gchar c)
-{
-	/* strip all occurances of c from the string */
-	gchar *src, *dst;
-	
-	g_return_val_if_fail (string != NULL, NULL);
-	
-	for (src = dst = string; *src; src++)
-		if (*src != c)
-			*dst++ = *src;
-	*dst = '\0';
-	
-	return string;
-}
diff --git a/camel/string-utils.h b/camel/string-utils.h
deleted file mode 100644
index 1556faa1df..0000000000
--- a/camel/string-utils.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* string-util : utilities for normal gchar * strings  */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef STRING_UTIL_H
-#define STRING_UTIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-typedef enum {
-	STRING_TRIM_NONE            =     0,
-	STRING_TRIM_STRIP_TRAILING  =     1,
-	STRING_TRIM_STRIP_LEADING   =     2
-} StringTrimOption;
-
-
-
-gboolean string_equal_for_glist (gconstpointer v, gconstpointer v2);
-
-void     string_list_free       (GList *string_list);
-
-GList   *string_split           (const gchar *string, char sep,
-				 const gchar *trim_chars, StringTrimOption trim_options);
-void     string_trim            (gchar *string, const gchar *chars,
-				 StringTrimOption options);
-
-gchar   *string_prefix          (const gchar *s, const gchar *suffix,
-				 gboolean *suffix_found);
-
-void    string_unquote          (gchar *string);
-
-gchar   *strip                  (gchar *string, gchar c);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* STRING_UTIL_H */
diff --git a/camel/tests/.cvsignore b/camel/tests/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am
deleted file mode 100644
index f604cb81a1..0000000000
--- a/camel/tests/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = lib \
-	message folder stream
-
diff --git a/camel/tests/README b/camel/tests/README
deleted file mode 100644
index 6815330102..0000000000
--- a/camel/tests/README
+++ /dev/null
@@ -1,44 +0,0 @@
-
-This directory is to contain regression tests that should be run
-before committing anything to camel.
-
-In each subdirectory of tests there is a README containing a
-one-line description of each test file.  This README must be kept
-uptodate.
-
-To write a new test: copy an existing one and replace the contents.
-
-See camel-test.h for a number of functions and macros which setup and
-define the test environmet, and help provide meaningful messages when
-something actually fails.
-
-All tests have the following options:
- -v[vvvv]
-	verbose.  more v's more verbose.  2 v's will give you
-	a simple test backtrace of any partially failed tests.
-	No v's give you a simple backtrace of any failed tests.
- -q
-	quiet.  Dont print anything, unless there is a SEGV.
-
-See the other files in lib/* for utility functions that help to
-write the tests (object comparison, creation, etc functions).
-
-Tests may fail and be non-fatal.  In this case, you will see "Partial
-success" on the result of each test line.  To get more information
-about the test, run the test manually with a -v command line argument.
-The more v's you have the more detail you get (upto about -vvvvv),
-generally use -vv to find out which parts of a partially successful
-test failed, and where.
-
-Note that if writing tests, non-fatal tests (bracketed by a
-camel_test_nonfatal() and camel_test_fatal() pair) should only be
-defined where: 1. The test in question should ideally pass, and 2. The
-code has known limitations currently that stop it passing, but
-otherwise works for nominal input.
-
-To debug tests, set a breakpoint on camel_test_fail, which will be
-called for any failure, even a non-fatal one.  Or set it to
-camel_test_break, which will only be called for fatal errors which are
-to print to the screen.
-
- Michael <notzed@helixcode.com>
diff --git a/camel/tests/data/gendoc.pl b/camel/tests/data/gendoc.pl
deleted file mode 100755
index 732f05a4ed..0000000000
--- a/camel/tests/data/gendoc.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-
-# Generate 'documents' in different encodings, from po files
-
-if ($#ARGV < 0) {
-    print "Usage: gendoc.pl pofile pofile ...\n";
-    exit 1;
-}
-
-$fmt = "| fmt -u ";
-
-sub read_msgstr()
-{
-    my $str = "";
-    while (<IN>) {
-	if (m/^msgstr \"(.*)\"/) {
-	    $str = $1;
-	    if ($str eq "") {
-		while (<IN>) {
-		    if (m/\"(.*)\"/) {
-			$str .= $1;
-		    } else {
-			last;
-		    }
-		}
-	    }
-	    return $str;
-	}
-    }
-    return "";
-}
-
-$unknown = "x-unknown-1";
-
-foreach $name (@ARGV) {
-    if ($name =~ m@([^/]*).po$@) {
-	$poname = $1;
-	    
-	open IN,"<$name";
-
-	$header = read_msgstr;
-	if ($header =~ /Content-Type:.*charset=([-a-zA-Z0-9]*)/i) {
-	    $charset = $1;
-	} else {
-	    $charset = $unknown++;
-	}
-
-	print "Building $poname.$charset.txt from $name\n";
-
-	open OUT,"$fmt > $poname.$charset.txt";
-	while (!eof(IN)) {
-	    $msg = read_msgstr;
-	    # de-escape
-	    $msg =~ s/\\n/\n/gso;
-	    $msg =~ s/\\t/\t/gso;
-	    $msg =~ s/\\(.)/$1/gso;
-	    print OUT $msg." ";
-	}
-	close OUT;
-	close IN;
-    } else {
-	printf("ignoring $name, probably not intended\n");
-    }
-}
-
diff --git a/camel/tests/data/genline.pl b/camel/tests/data/genline.pl
deleted file mode 100755
index 99ff43c882..0000000000
--- a/camel/tests/data/genline.pl
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/perl
-
-# Generate 'documents' in different encodings, from po files
-
-if ($#ARGV < 0) {
-    print "Usage: genline.pl pofile pofile ...\n";
-    exit 1;
-}
-
-sub read_msgstr()
-{
-    my $str = "";
-    while (<IN>) {
-	if (m/^msgstr \"(.*)\"/) {
-	    $str = $1;
-	    if ($str eq "") {
-		while (<IN>) {
-		    if (m/\"(.*)\"/) {
-			$str .= $1;
-		    } else {
-			last;
-		    }
-		}
-	    }
-	    return $str;
-	}
-    }
-    return "";
-}
-
-$unknown = "x-unknown-1";
-open OUT, ">test-lines.h";
-
-print OUT <<END;
-struct _l {
-    char *type;
-    char *line;
-} test_lines[] = {
-END
-
-foreach $name (@ARGV) {
-    if ($name =~ m@([^/]*).po$@) {
-	$poname = $1;
-	    
-	open IN,"<$name";
-
-	$header = read_msgstr;
-	if ($header =~ /Content-Type:.*charset=([-a-zA-Z0-9]*)/i) {
-	    $charset = $1;
-	} else {
-	    $charset = $unknown++;
-	}
-
-	while (!eof(IN)) {
-	    $msg = read_msgstr;
-	    if (length($msg) > 60 && length($msg) < 160) {
-		print OUT "\t{ \"$charset\", \"$msg\" },\n";
-		last;
-	    }
-#	    $msg =~ s/\\n/\n/gso;
-#	    $msg =~ s/\\t/\t/gso;
-#	    $msg =~ s/\\(.)/$1/gso;
-#	    print OUT $msg." ";
-	}
-	close IN;
-    } else {
-	printf("ignoring $name, probably not intended\n");
-    }
-}
-
-print OUT "};\n";
-close OUT;
diff --git a/camel/tests/data/getaddr.pl b/camel/tests/data/getaddr.pl
deleted file mode 100755
index 74a8a81f74..0000000000
--- a/camel/tests/data/getaddr.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-
-# get addresses out of messages
-
-if ($#ARGV < 0) {
-    print "Usage: $0 message(s) mbox(es)\n";
-    exit 1;
-}
-
-foreach $name (@ARGV) {
-    open IN,"<$name";
-    while (<IN>) {
-	if (/^From: (.*)/i
-	    || /^To: (.*)/i
-	    || /^Cc: (.*)/i) {
-	    $base = $1;
-	    while (<IN>) {
-		if (/^\s+(.*)/) {
-		    $base .= " ".$1;
-		} else {
-		    last;
-		}
-	    }
-	    $uniq{$base} = 1;
-	}
-    }
-    close IN;
-}
-
-foreach $key (sort keys %uniq) {
-    print $key."\n";
-}
diff --git a/camel/tests/folder/.cvsignore b/camel/tests/folder/.cvsignore
deleted file mode 100644
index ba98331a6d..0000000000
--- a/camel/tests/folder/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-temp-test
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
deleted file mode 100644
index f6dd852dd8..0000000000
--- a/camel/tests/folder/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
-	-I$(includedir) \
-	-I$(top_srcdir)/camel/tests/lib \
-	-DG_LOG_DOMAIN=\"evolution-tests\"	
-
-LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-check_PROGRAMS =  	\
-	test1	test4	test5	\
-	test2	test6	test7	\
-	test3			\
-	test8			\
-	test9
-
-TESTS = test1 test4 test5 \
-	test2 test6 test7 \
-	test3		  \
-	test8		  \
-	test9
-
-
-
diff --git a/camel/tests/folder/README b/camel/tests/folder/README
deleted file mode 100644
index 4fed421413..0000000000
--- a/camel/tests/folder/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-test1	camel store folder operations (local only)
-test2	basic folder operations, local
-test3	folder searching and indexing, local
-test4	camel store folder operations, IMAP
-test5	camel store folder operations, NNTP
-test6	basic folder operations, IMAP
-test7	basic folder operations, NNTP
-
-test8	multithreaded folder torture test, local
-test9	filtering
diff --git a/camel/tests/folder/test1.c b/camel/tests/folder/test1.c
deleted file mode 100644
index e7d1ac0604..0000000000
--- a/camel/tests/folder/test1.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* store testing */
-
-#include "camel-test.h"
-#include "folders.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *local_providers[] = {
-	"mbox",
-	"mh",
-	"maildir"
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-	char *path;
-
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
-
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: subscriptions? */
-	/* todo: work out how to do imap/pop/nntp tests */
-	for (i=0;i<ARRAY_LEN(local_providers);i++) {
-		path = g_strdup_printf("%s:///tmp/camel-test/%s", local_providers[i], local_providers[i]);
-
-		test_folder_basic(session, path, TRUE);
-
-		g_free(path);
-	}
-
-	camel_object_unref((CamelObject *)session);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
deleted file mode 100644
index 47e0f44feb..0000000000
--- a/camel/tests/folder/test2.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* folder testing */
-
-#include "camel-test.h"
-#include "messages.h"
-#include "folders.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *stores[] = {
-	"mbox:///tmp/camel-test/mbox",
-	"mh:///tmp/camel-test/mh",
-	"maildir:///tmp/camel-test/maildir"
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-
-	camel_test_init(argc, argv);
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	ex = camel_exception_new();
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
-
-	/* we iterate over all stores we want to test, with indexing or indexing turned on or off */
-	for (i=0;i<ARRAY_LEN(stores);i++) {
-		char *name = stores[i];
-
-		test_folder_message_ops(session, name, TRUE);
-	}
-
-	check_unref(session, 1);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c
deleted file mode 100644
index 99369e5317..0000000000
--- a/camel/tests/folder/test3.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* folder/index testing */
-
-#include "camel-test.h"
-#include "messages.h"
-#include "folders.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-
-static void
-test_folder_search_sub(CamelFolder *folder, const char *expr, int expected)
-{
-	CamelException *ex = camel_exception_new();
-	GPtrArray *uids;
-	GHashTable *hash;
-	int i;
-
-	uids = camel_folder_search_by_expression(folder, expr, ex);
-	check(uids != NULL);
-	check_msg(uids->len == expected, "search %s expected %d got %d", expr, expected, uids->len);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-	/* check the uid's are actually unique, too */
-	hash = g_hash_table_new(g_str_hash, g_str_equal);
-	for (i=0;i<uids->len;i++) {
-		check(g_hash_table_lookup(hash, uids->pdata[i]) == NULL);
-		g_hash_table_insert(hash, uids->pdata[i], uids->pdata[i]);
-	}
-	g_hash_table_destroy(hash);
-
-	camel_folder_search_free(folder, uids);
-
-	camel_exception_free(ex);
-}
-
-static void
-test_folder_search(CamelFolder *folder, const char *expr, int expected)
-{
-	char *matchall;
-
-#if 0
-	/* FIXME: ??? */
-	camel_test_nonfatal("most searches require match-all construct");
-	push("Testing search: %s", expr);
-	test_folder_search_sub(folder, expr, expected);
-	pull();
-	camel_test_fatal();
-#endif
-
-	matchall = g_strdup_printf("(match-all %s)", expr);
-	push("Testing search: %s", matchall);
-	test_folder_search_sub(folder, matchall, expected);
-	test_free(matchall);
-	pull();
-}
-
-static struct {
-	int counts[3];
-	char *expr;
-} searches[] = {
-	{ { 1, 1, 0 }, "(header-matches \"subject\" \"Test1 message99 subject\")" },
-	
-	{ { 100, 50, 0 }, "(header-contains \"subject\" \"subject\")" },
-	{ { 0, 0, 0 }, "(header-contains \"subject\" \"Subject\")" },
-
-	{ { 100, 50, 0 }, "(body-contains \"content\")" },
-	{ { 100, 50, 0 }, "(body-contains \"Content\")" },
-
-	{ { 0, 0, 0 }, "(user-flag \"every7\")" },
-	{ { 100/13+1, 50/13+1, 0 }, "(user-flag \"every13\")" },
-	{ { 1, 1, 0 }, "(= \"7tag1\" (user-tag \"every7\"))" },
-	{ { 100/11+1, 50/11+1, 0 }, "(= \"11tag\" (user-tag \"every11\"))" },
-	
-	{ { 100/13 + 100/17 + 1, 50/13 + 50/17 + 2, 0 }, "(user-flag \"every13\" \"every17\")" },
-	{ { 100/13 + 100/17 + 1, 50/13 + 50/17 + 2, 0 }, "(or (user-flag \"every13\") (user-flag \"every17\"))" },
-	{ { 1, 0, 0 }, "(and (user-flag \"every13\") (user-flag \"every17\"))" },
-	
-	{ { 0, 0, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"Test2\"))" },
-	/* we get 11 here as the header-contains is a substring match */
-	{ { 11, 6, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))" },
-	{ { 1, 1, 0 }, "(and (header-contains \"subject\" \"Test19\") (header-contains \"subject\" \"subject\"))" },
-	{ { 0, 0, 0 }, "(and (header-contains \"subject\" \"Test191\") (header-contains \"subject\" \"subject\"))" },
-	{ { 1, 1, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"message99\"))" },
-	
-	{ { 22, 11, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"Test2\"))" },
-	{ { 2, 1, 0 }, "(or (header-contains \"subject\" \"Test16\") (header-contains \"subject\" \"Test99\"))" },
-	{ { 1, 1, 0 }, "(or (header-contains \"subject\" \"Test123\") (header-contains \"subject\" \"Test99\"))" },
-	{ { 100, 50, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))" },
-	{ { 11, 6, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"message99\"))" },
-	
-	/* 72000 is 24*60*100 == half the 'sent date' of the messages */
-	{ { 100/2, 50/2, 0 }, "(> 72000 (get-sent-date))" },
-	{ { 100/2-1, 50/2, 0 }, "(< 72000 (get-sent-date))" },
-	{ { 1, 0, 0 }, "(= 72000 (get-sent-date))" },
-	{ { 0, 0, 0 }, "(= 72001 (get-sent-date))" },
-	
- 	{ { (100/2-1)/17+1, (50/2-1)/17+1, 0 }, "(and (user-flag \"every17\") (< 72000 (get-sent-date)))" },
-	{ { (100/2-1)/17+1, (50/2-1)/17, 0 }, "(and (user-flag \"every17\") (> 72000 (get-sent-date)))" },
-	{ { (100/2-1)/13+1, (50/2-1)/13+1, 0 }, "(and (user-flag \"every13\") (< 72000 (get-sent-date)))" },
-	{ { (100/2-1)/13+1, (50/2-1)/13+1, 0 }, "(and (user-flag \"every13\") (> 72000 (get-sent-date)))" },
-	
-	{ { 100/2+100/2/17, 50/2+50/2/17, 0 }, "(or (user-flag \"every17\") (< 72000 (get-sent-date)))" },
-	{ { 100/2+100/2/17+1, 50/2+50/2/17+1, 0 }, "(or (user-flag \"every17\") (> 72000 (get-sent-date)))" },
-	{ { 100/2+100/2/13, 50/2+50/2/13+1, 0 }, "(or (user-flag \"every13\") (< 72000 (get-sent-date)))" },
-	{ { 100/2+100/2/13+1, 50/2+50/2/13+1, 0 }, "(or (user-flag \"every13\") (> 72000 (get-sent-date)))" },
-};
-
-static void
-run_search(CamelFolder *folder, int m)
-{
-	int i, j = 0;
-
-	check(m == 50 || m == 100 || m == 0);
-
-	/* *shrug* messy, but it'll do */
-	if (m==50)
-		j = 1;
-	else if (m==0)
-		j = 2;
-
-	push("performing searches, expected %d", m);
-	for (i=0;i<ARRAY_LEN(searches);i++) {
-		push("running search %d: %s", i, searches[i].expr);
-		test_folder_search(folder, searches[i].expr, searches[i].counts[j]);
-		pull();
-	}
-	pull();
-}
-
-
-static char *stores[] = {
-	"mbox:///tmp/camel-test/mbox",
-	"mh:///tmp/camel-test/mh",
-	"maildir:///tmp/camel-test/maildir"
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelStore *store;
-	CamelException *ex;
-	CamelFolder *folder;
-	CamelMimeMessage *msg;
-	int i, j;
-	int indexed;
-	GPtrArray *uids;
-
-	gtk_init(&argc, &argv);
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
-
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: work out how to do imap/pop/nntp tests */
-
-	/* we iterate over all stores we want to test, with indexing or indexing turned on or off */
-	for (i=0;i<ARRAY_LEN(stores);i++) {
-		char *name = stores[i];
-		for (indexed = 0;indexed<2;indexed++) {
-			char *what = g_strdup_printf("folder search: %s (%sindexed)", name, indexed?"":"non-");
-			int flags;
-
-			camel_test_start(what);
-			test_free(what);
-
-			push("getting store");
-			store = camel_session_get_store(session, stores[i], ex);
-			check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));
-			check(store != NULL);
-			pull();
-
-			push("creating %sindexed folder", indexed?"":"non-");
-			if (indexed)
-				flags = CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX;
-			else
-				flags = CAMEL_STORE_FOLDER_CREATE;
-			folder = camel_store_get_folder(store, "testbox", flags, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			check(folder != NULL);
-
-			/* we need an empty folder for this to work */
-			test_folder_counts(folder, 0, 0);
-			pull();
-
-			/* append a bunch of messages with specific content */
-			push("appending 100 test messages");
-			for (j=0;j<100;j++) {
-				char *content, *subject;
-
-				push("creating test message");
-				msg = test_message_create_simple();
-				content = g_strdup_printf("data%d content\n", j);
-				test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
-								content, strlen(content));
-				test_free(content);
-				subject = g_strdup_printf("Test%d message%d subject", j, 100-j);
-				camel_mime_message_set_subject(msg, subject);
-
-				camel_mime_message_set_date(msg, j*60*24, 0);
-				pull();
-
-				push("appending simple message %d", j);
-				camel_folder_append_message(folder, msg, NULL, ex);
-				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-				pull();
-
-				test_free(subject);
-
-				check_unref(msg, 1);
-			}
-			pull();
-
-			push("Setting up some flags &c");
-			uids = camel_folder_get_uids(folder);
-			check(uids->len == 100);
-			for (j=0;j<100;j++) {
-				char *uid = uids->pdata[j];
-
-				if ((j/13)*13 == j) {
-					camel_folder_set_message_user_flag(folder, uid, "every13", TRUE);
-				}
-				if ((j/17)*17 == j) {
-					camel_folder_set_message_user_flag(folder, uid, "every17", TRUE);
-				}
-				if ((j/7)*7 == j) {
-					char *tag = g_strdup_printf("7tag%d", j/7);
-					camel_folder_set_message_user_tag(folder, uid, "every7", tag);
-					test_free(tag);
-				}
-				if ((j/11)*11 == j) {
-					camel_folder_set_message_user_tag(folder, uid, "every11", "11tag");
-				}
-			}
-			camel_folder_free_uids(folder, uids);
-			pull();
-
-			push("Search before sync");
-			run_search(folder, 100);
-			pull();
-
-			push("syncing folder, searching");
-			camel_folder_sync(folder, FALSE, ex);
-			run_search(folder, 100);
-			pull();
-
-			push("syncing wiht expunge, search");
-			camel_folder_sync(folder, TRUE, ex);
-			run_search(folder, 100);
-			pull();
-
-			push("deleting every 2nd message");
-			uids = camel_folder_get_uids(folder);
-			check(uids->len == 100);
-			for (j=0;j<uids->len;j+=2) {
-				camel_folder_delete_message(folder, uids->pdata[j]);
-			}
-			camel_folder_free_uids(folder, uids);
-			run_search(folder, 100);
-
-			push("syncing");
-			camel_folder_sync(folder, FALSE, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			run_search(folder, 100);
-			pull();
-
-			push("expunging");
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			run_search(folder, 50);
-			pull();
-
-			pull();
-
-			push("closing and re-opening folder");
-			check_unref(folder, 1);
-			folder = camel_store_get_folder(store, "testbox", flags&~(CAMEL_STORE_FOLDER_CREATE), ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			check(folder != NULL);
-
-			push("deleting remaining messages");
-			uids = camel_folder_get_uids(folder);
-			check(uids->len == 50);
-			for (j=0;j<uids->len;j++) {
-				camel_folder_delete_message(folder, uids->pdata[j]);
-			}
-			camel_folder_free_uids(folder, uids);
-			run_search(folder, 50);
-
-			push("syncing");
-			camel_folder_sync(folder, FALSE, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			run_search(folder, 50);
-			pull();
-
-			push("expunging");
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			run_search(folder, 0);
-			pull();
-
-			pull();
-
-			check_unref(folder, 1);
-			pull();
-
-			push("deleting test folder, with no messages in it");
-			camel_store_delete_folder(store, "testbox", ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			pull();
-
-			check_unref(store, 1);
-			camel_test_end();
-		}
-	}
-
-	check_unref(session, 1);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c
deleted file mode 100644
index bae2b7bb0b..0000000000
--- a/camel/tests/folder/test4.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* store testing, for remote folders */
-
-#include "camel-test.h"
-#include "folders.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *remote_providers[] = {
-	"IMAP_TEST_URL",
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-	char *path;
-
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, regtimeout, unregtimeout);
-
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: subscriptions? */
-	for (i=0;i<ARRAY_LEN(remote_providers);i++) {
-		path = getenv(remote_providers[i]);
-
-		if (path == NULL) {
-			printf("Aborted (ignored).\n");
-			printf("Set '%s', to re-run test.\n", remote_providers[i]);
-			/* tells make check to ignore us in the total count */
-			_exit(77);
-		}
-		camel_test_nonfatal("The IMAP code is just rooted");
-		test_folder_basic(session, path, FALSE);
-		camel_test_fatal();
-	}
-
-	camel_object_unref((CamelObject *)session);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test5.c b/camel/tests/folder/test5.c
deleted file mode 100644
index 9e2544d7e5..0000000000
--- a/camel/tests/folder/test5.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* store testing, for remote folders */
-
-#include "camel-test.h"
-#include "folders.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *remote_providers[] = {
-	"NNTP_TEST_URL",
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-	char *path;
-
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, regtimeout, unregtimeout);
-
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: subscriptions? */
-	for (i=0;i<ARRAY_LEN(remote_providers);i++) {
-		path = getenv(remote_providers[i]);
-
-		if (path == NULL) {
-			printf("Aborted (ignored).\n");
-			printf("Set '%s', to re-run test.\n", remote_providers[i]);
-			/* tells make check to ignore us in the total count */
-			_exit(77);
-		}
-		camel_test_nonfatal("Not sure how many tests apply to NNTP");
-		test_folder_basic(session, path, FALSE);
-		camel_test_fatal();
-	}
-
-	camel_object_unref((CamelObject *)session);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c
deleted file mode 100644
index 6f4e387fca..0000000000
--- a/camel/tests/folder/test6.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* folder testing */
-
-#include "camel-test.h"
-#include "messages.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *remote_providers[] = {
-	"IMAP_TEST_URL",
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-	char *path;
-
-	camel_test_init(argc, argv);
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	ex = camel_exception_new();
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, regtimeout, unregtimeout);
-
-	for (i=0;i<ARRAY_LEN(remote_providers);i++) {
-		path = getenv(remote_providers[i]);
-
-		if (path == NULL) {
-			printf("Aborted (ignored).\n");
-			printf("Set '%s', to re-run test.\n", remote_providers[i]);
-			/* tells make check to ignore us in the total count */
-			_exit(77);
-		}
-		/*camel_test_nonfatal("The IMAP code is just rooted");*/
-		test_folder_message_ops(session, path, FALSE);
-		/*camel_test_fatal();*/
-	}
-
-	check_unref(session, 1);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c
deleted file mode 100644
index 7acacebbcd..0000000000
--- a/camel/tests/folder/test7.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* folder testing */
-
-#include "camel-test.h"
-#include "messages.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-static int regtimeout()
-{
-	return 1;
-}
-
-static int unregtimeout()
-{
-	return 1;
-}
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *remote_providers[] = {
-	"NNTP_TEST_URL",
-};
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i;
-	char *path;
-
-	camel_test_init(argc, argv);
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	ex = camel_exception_new();
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, regtimeout, unregtimeout);
-
-	for (i=0;i<ARRAY_LEN(remote_providers);i++) {
-		path = getenv(remote_providers[i]);
-
-		if (path == NULL) {
-			printf("Aborted (ignored).\n");
-			printf("Set '%s', to re-run test.\n", remote_providers[i]);
-			/* tells make check to ignore us in the total count */
-			_exit(77);
-		}
-		camel_test_nonfatal("Dont know how many tests apply to NNTP");
-		test_folder_message_ops(session, path, FALSE);
-		camel_test_fatal();
-	}
-
-	check_unref(session, 1);
-	camel_exception_free(ex);
-
-	return 0;
-}
diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c
deleted file mode 100644
index 5665f96f2a..0000000000
--- a/camel/tests/folder/test8.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* threaded folder testing */
-
-#include "camel-test.h"
-#include "folders.h"
-#include "messages.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
-#define MAX_MESSAGES (100)
-#define MAX_THREADS (10)
-
-#define d(x) 
-
-#ifndef ENABLE_THREADS
-int main(int argc, char **argv)
-{
-	printf("Test %s is only compiled with threads enabled\n", argv[0]);
-	return 77;
-}
-#else
-
-#include <pthread.h>
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-static char *local_providers[] = {
-	"mbox",
-	"mh",
-	"maildir"
-};
-
-static void
-test_add_message(CamelFolder *folder, int j)
-{
-	CamelMimeMessage *msg;
-	char *content;
-	char *subject;
-	CamelException ex;
-
-	camel_exception_init(&ex);
-
-	push("creating message %d\n", j);
-	msg = test_message_create_simple();
-	content = g_strdup_printf("Test message %d contents\n\n", j);
-	test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
-							content, strlen(content));
-	test_free(content);
-	subject = g_strdup_printf("Test message %d subject", j);
-	camel_mime_message_set_subject(msg, subject);
-	pull();
-
-	push("appending simple message %d", j);
-	camel_folder_append_message(folder, msg, NULL, &ex);
-	check_msg(!camel_exception_is_set(&ex), "%s", camel_exception_get_description(&ex));
-	pull();
-
-	check_unref(msg, 1);
-}
-
-struct _threadinfo {
-	int id;
-	CamelFolder *folder;
-};
-
-static void *
-worker(void *d)
-{
-	struct _threadinfo *info = d;
-	int i, j, id = info->id;
-	char *sub, *content;
-	GPtrArray *res;
-	CamelException *ex = camel_exception_new();
-	CamelMimeMessage *msg;
-
-	/* we add a message, search for it, twiddle some flags, delete it */
-	/* and flat out */
-	for (i=0;i<MAX_MESSAGES;i++) {
-		d(printf("Thread %ld message %i\n", pthread_self(), i));
-		test_add_message(info->folder, id+i);
-
-		sub = g_strdup_printf("(match-all (header-contains \"subject\" \"message %d subject\"))", id+i);
-
-		push("searching for message %d\n\tusing: %s", id+i, sub);
-		res = camel_folder_search_by_expression(info->folder, sub, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check_msg(res->len == 1, "res->len = %d", res->len);
-		pull();
-
-		push("getting message '%s'", res->pdata[0]);
-		msg = camel_folder_get_message(info->folder, (char *)res->pdata[0], ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		pull();
-
-		push("comparing content");
-		content = g_strdup_printf("Test message %d contents\n\n", id+i);
-		test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg), content, strlen(content));
-		test_free(content);
-		pull();
-
-		push("deleting message, cleanup");
-		j=(100.0*rand()/(RAND_MAX+1.0));
-		if (j<=70) {
-			camel_folder_delete_message(info->folder, res->pdata[0]);
-		}
-
-		camel_folder_search_free(info->folder, res);
-		res = NULL;
-		test_free(sub);
-
-		check_unref(msg, 1);
-		pull();
-
-		/* about 1-in 100 calls will expunge */
-		j=(200.0*rand()/(RAND_MAX+1.0));
-		if (j<=2) {
-			d(printf("Forcing an expuge\n"));
-			push("expunging folder");
-			camel_folder_expunge(info->folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			pull();
-		}
-	}
-
-	camel_exception_free(ex);
-
-	return info;
-}
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	int i, j, index;
-	char *path;
-	CamelStore *store;
-	pthread_t threads[MAX_THREADS];
-	struct _threadinfo *info;
-	CamelFolder *folder;
-	GPtrArray *uids;
-
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
-
-	for (j=0;j<ARRAY_LEN(local_providers);j++) {
-		for (index=0;index<2;index++) {
-			path = g_strdup_printf("method %s %s", local_providers[j], index?"indexed":"nonindexed");
-			camel_test_start(path);
-			test_free(path);
-
-			push("trying %s index %d", local_providers[j], index);
-			path = g_strdup_printf("%s:///tmp/camel-test/%s", local_providers[j], local_providers[j]);
-			store = camel_session_get_store(session, path, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-			test_free(path);
-			
-			if (index == 0)
-				folder = camel_store_get_folder(store, "testbox", CAMEL_STORE_FOLDER_CREATE, ex);
-			else
-				folder = camel_store_get_folder(store, "testbox",
-								CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-			for (i=0;i<MAX_THREADS;i++) {
-				info = g_malloc(sizeof(*info));
-				info->id = i*MAX_MESSAGES;
-				info->folder = folder;
-				pthread_create(&threads[i], 0, worker, info);
-			}
-
-			for (i=0;i<MAX_THREADS;i++) {
-				pthread_join(threads[i], (void **)&info);
-				g_free(info);
-			}
-			pull();
-
-			push("deleting remaining messages");
-			uids = camel_folder_get_uids(folder);
-			for (i=0;i<uids->len;i++) {
-				camel_folder_delete_message(folder, uids->pdata[i]);
-			}
-			camel_folder_free_uids(folder, uids);
-
-			camel_folder_expunge(folder, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-			check_unref(folder, 1);
-
-			camel_store_delete_folder(store, "testbox", ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-			check_unref(store, 1);
-
-			pull();
-
-			camel_test_end();
-		}
-	}
-
-	camel_object_unref((CamelObject *)session);
-	camel_exception_free(ex);
-
-	return 0;
-}
-
-#endif /* ENABLE_THREADS */
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
deleted file mode 100644
index 3b757815b0..0000000000
--- a/camel/tests/folder/test9.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* folder/index testing */
-
-#include "camel-test.h"
-#include "messages.h"
-#include "folders.h"
-
-#include "camel/camel-exception.h"
-#include "camel/camel-service.h"
-#include "camel/camel-session.h"
-#include "camel/camel-store.h"
-
-#include "camel/camel-folder.h"
-#include "camel/camel-folder-summary.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-stream-fs.h"
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-
-/* god, who designed this horrid interface */
-static char *auth_callback(CamelAuthCallbackMode mode,
-			   char *data, gboolean secret,
-			   CamelService *service, char *item,
-			   CamelException *ex)
-{
-	return NULL;
-}
-
-struct {
-	char *name;
-	CamelFolder *folder;
-} mailboxes[] = {
-	{ "INBOX", NULL },
-	{ "folder1", NULL },
-	{ "folder2", NULL },
-	{ "folder3", NULL },
-	{ "folder4", NULL },
-};
-
-struct {
-	char *name, *match, *action;
-} rules[] = {
-	{ "empty1", "(match-all (header-contains \"Frobnitz\"))", "(copy-to \"folder1\")" },
-	{ "empty2", "(header-contains \"Frobnitz\")", "(copy-to \"folder2\")" },
-	{ "count11", "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))", "(move-to \"folder3\")" },
-	{ "empty3", "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))", "(move-to \"folder4\")" },
-	{ "count1", "(body-contains \"data50\")", "(copy-to \"folder1\")" },
-	{ "stop", "(body-contains \"data2\")", "(stop)" },
-	{ "notreached1", "(body-contains \"data2\")", "(move-to \"folder2\")" },
-	{ "count1", "(body-contains \"data3\")", "(move-to \"folder2\")" },
-	{ "ustrcasecmp", "(header-matches \"Subject\" \"Test0 message100 subject\")", "(copy-to \"folder2\")" },
-};
-
-/* broken match rules */
-struct {
-	char *name, *match, *action;
-} brokens[] = {
-	{ "count1", "(body-contains data50)", "(copy-to \"folder1\")" }, /* non string argument */
-	{ "count1", "(body-contains-stuff \"data3\")", "(move-to-folder \"folder2\")" }, /* invalid function */
-	{ "count1", "(or (body-contains \"data3\") (foo))", "(move-to-folder \"folder2\")" }, /* invalid function */
-	{ "count1", "(or (body-contains \"data3\") (foo)", "(move-to-folder \"folder2\")" }, /* missing ) */
-	{ "count1", "(and body-contains \"data3\") (foo)", "(move-to-folder \"folder2\")" }, /* missing ( */
-	{ "count1", "body-contains \"data3\")", "(move-to-folder \"folder2\")" }, /* missing ( */
-	{ "count1", "body-contains \"data3\"", "(move-to-folder \"folder2\")" }, /* missing ( ) */
-	{ "count1", "(body-contains \"data3\" ())", "(move-to-folder \"folder2\")" }, /* extra () */
-	{ "count1", "()", "(move-to-folder \"folder2\")" }, /* invalid () */
-	{ "count1", "", "(move-to-folder \"folder2\")" }, /* empty */
-};
-
-/* broken action rules */
-struct {
-	char *name, *match, *action;
-} brokena[] = {
-	{ "a", "(body-contains \"data2\")", "(body-contains \"help\")" }, /* rule in action */
-	{ "a", "(body-contains \"data2\")", "(move-to-folder-name \"folder2\")" }, /* unknown function */
-	{ "a", "(body-contains \"data2\")", "(or (move-to-folder \"folder2\")" }, /* missing ) */
-	{ "a", "(body-contains \"data2\")", "(or move-to-folder \"folder2\"))" }, /* missing ( */
-	{ "a", "(body-contains \"data2\")", "move-to-folder \"folder2\")" }, /* missing ( */
-	{ "a", "(body-contains \"data2\")", "(move-to-folder \"folder2\" ())" }, /* invalid () */
-	{ "a", "(body-contains \"data2\")", "()" }, /* invalid () */
-	{ "a", "(body-contains \"data2\")", "" }, /* empty */
-};
-
-static CamelFolder *get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)
-{
-	int i;
-
-	for (i=0;i<ARRAY_LEN(mailboxes);i++)
-		if (!strcmp(mailboxes[i].name, uri)) {
-			camel_object_ref((CamelObject *)mailboxes[i].folder);
-			return mailboxes[i].folder;
-		}
-	return NULL;
-}
-
-int main(int argc, char **argv)
-{
-	CamelSession *session;
-	CamelStore *store;
-	CamelException *ex;
-	CamelFolder *folder;
-	CamelMimeMessage *msg;
-	int i, j;
-	CamelStream *mbox;
-	CamelFilterDriver *driver;
-
-	/*gtk_init(&argc, &argv);*/
-
-	camel_test_init(argc, argv);
-
-	ex = camel_exception_new();
-
-	/* clear out any camel-test data */
-	system("/bin/rm -rf /tmp/camel-test");
-
-	camel_test_start("Simple filtering of mbox");
-
-	session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
-
-	/* todo: cross-check everything with folder_info checks as well */
-	/* todo: work out how to do imap/pop/nntp tests */
-
-	push("getting store");
-	store = camel_session_get_store(session, "mbox:///tmp/camel-test/mbox", ex);
-	check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));
-	check(store != NULL);
-	pull();
-
-	push("Creating output folders");
-	for (i=0;i<ARRAY_LEN(mailboxes);i++) {
-		push("creating %s", mailboxes[i].name);
-		mailboxes[i].folder = folder = camel_store_get_folder(store, mailboxes[i].name, CAMEL_STORE_FOLDER_CREATE, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check(folder != NULL);
-		
-		/* we need an empty folder for this to work */
-		test_folder_counts(folder, 0, 0);
-		pull();
-	}
-	pull();
-
-	/* append a bunch of messages with specific content */
-	push("creating 100 test message mbox");
-	mbox = camel_stream_fs_new_with_name("/tmp/camel-test/inbox", O_WRONLY|O_CREAT|O_EXCL, 0600);
-	for (j=0;j<100;j++) {
-		char *content, *subject;
-			
-		push("creating test message");
-		msg = test_message_create_simple();
-		content = g_strdup_printf("data%d content\n", j);
-		test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
-						content, strlen(content));
-		test_free(content);
-		subject = g_strdup_printf("Test%d message%d subject", j, 100-j);
-		camel_mime_message_set_subject(msg, subject);
-		
-		camel_mime_message_set_date(msg, j*60*24, 0);
-		pull();
-		
-		camel_stream_printf(mbox, "From \n");
-		check(camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, mbox) != -1);
-#if 0		
-		push("appending simple message %d", j);
-		camel_folder_append_message(folder, msg, NULL, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		pull();
-#endif				
-		test_free(subject);
-		
-		check_unref(msg, 1);
-	}
-	check(camel_stream_close(mbox) != -1);
-	check_unref(mbox, 1);
-	pull();
-
-	push("Building filters");
-	driver = camel_filter_driver_new(get_folder, NULL);
-	for (i=0;i<ARRAY_LEN(rules);i++) {
-		camel_filter_driver_add_rule(driver, rules[i].name, rules[i].match, rules[i].action);
-	}
-	pull();
-
-	push("Executing filters");
-	camel_filter_driver_set_default_folder(driver, mailboxes[0].folder);
-	camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-	/* now need to check the folder counts/etc */
-
-	check_unref(driver, 1);
-	pull();
-
-	/* this tests that invalid rules are caught */
-	push("Testing broken match rules");
-	for (i=0;i<ARRAY_LEN(brokens);i++) {
-		push("rule %s", brokens[i].match);
-		driver = camel_filter_driver_new(get_folder, NULL);
-		camel_filter_driver_add_rule(driver, brokens[i].name, brokens[i].match, brokens[i].action);
-		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", ex);
-		check(camel_exception_is_set(ex));
-		camel_exception_clear(ex);
-		check_unref(driver, 1);
-		pull();
-	}
-	pull();
-
-	push("Testing broken action rules");
-	for (i=0;i<ARRAY_LEN(brokena);i++) {
-		push("rule %s", brokena[i].action);
-		driver = camel_filter_driver_new(get_folder, NULL);
-		camel_filter_driver_add_rule(driver, brokena[i].name, brokena[i].match, brokena[i].action);
-		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", ex);
-		check(camel_exception_is_set(ex));
-		camel_exception_clear(ex);
-		check_unref(driver, 1);
-		pull();
-	}
-	pull();
-
-
-	for (i=0;i<ARRAY_LEN(mailboxes);i++) {
-		check_unref(mailboxes[i].folder, 1);
-	}
-
-	check_unref(store, 1);
-
-	check_unref(session, 1);
-	camel_exception_free(ex);
-
-	camel_test_end();
-
-	return 0;
-}
diff --git a/camel/tests/lib/.cvsignore b/camel/tests/lib/.cvsignore
deleted file mode 100644
index ba98331a6d..0000000000
--- a/camel/tests/lib/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-temp-test
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
deleted file mode 100644
index ea51a2c28a..0000000000
--- a/camel/tests/lib/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-INCLUDES = -I$(includedir)
-
-check_LIBRARIES = libcameltest.a
-
-libcameltest_a_SOURCES = \
-	camel-test.c camel-test.h \
-	messages.c messages.h \
-	addresses.c addresses.h \
-	folders.c folders.h \
-	streams.c streams.h \
-	address-data.h
-
diff --git a/camel/tests/lib/address-data.h b/camel/tests/lib/address-data.h
deleted file mode 100644
index acecac596a..0000000000
--- a/camel/tests/lib/address-data.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* BE WARY of editing this file with emacs.
-	Otherwise it might be smart and try to re-encode everything, which
-	you really do not want
-*/
-
-static struct _a {
-	int count;
-	char *addr;
-	char *utf8;		/* the utf8 in this table was generated by camel itself.  As a result i'm making the assumption it
-				   was right when it was created.  It also depends on the format of ::format(),. which is likely to
-				   change, to handle other bugs ! */
-} test_address[] = {
-	{ 1, "\"=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=\" <david@iiia.csic.es>", "David Gutiérrez Magallanes <david@iiia.csic.es>" },
-	{ 1, "\"=?iso-8859-1?Q?Jos=E9?= Antonio Milke G.\" <gerencia@ovoplus.com>", "José Antonio Milke G. <gerencia@ovoplus.com>" },
-	{ 1, "\"=?iso-8859-2?Q?Hi-Fi_Internert_market_=3D_1.Virtu=E1ln=ED_Internetov=E9_H?= =?iso-8859-2?Q?i-Fi_Studio?=\" <hifimarket@atlas.cz>", "Hi-Fi Internert market = 1.Virtuální Internetové Hi-Fi Studio <hifimarket@atlas.cz>" },
-	{ 3, "\"James M. Cape\" <jcape@jcinteractive.com>, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= <cuenca@ie2.u-psud.fr>, gnome-hackers@nuclecu.unam.mx", "James M. Cape <jcape@jcinteractive.com>, Joaquín Cuenca Abela <cuenca@ie2.u-psud.fr>, gnome-hackers@nuclecu.unam.mx" },
-	{ 1, "=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?= <david@iiia.csic.es>", "David Gutiérrez Magallanes <david@iiia.csic.es>" },
-	{ 1, "=?ISO-8859-2?Q?Tomasz_K=B3oczko?= <kloczek@rudy.mif.pg.gda.pl>", "Tomasz KÅ‚oczko <kloczek@rudy.mif.pg.gda.pl>" },
-	{ 1, "=?ISO-8859-2?Q?Vladim=EDr_Solnick=FD?= <vs@utia.cas.cz>", "Vladimír Solnický <vs@utia.cas.cz>" },
-	{ 1, "=?iso-8859-1?Q?=22S=F6rensen=2C_Daniel=22?= <dasar@wmdata.com>", "\"Sörensen, Daniel\" <dasar@wmdata.com>" },
-	{ 1, "=?iso-8859-1?Q?=C1=C2=AAQ=A7=CA?= <dennys@iim.nctu.edu.tw>", "�ªQ§Ê <dennys@iim.nctu.edu.tw>" },
-	{ 1, "=?iso-8859-1?Q?=C1=C2=AAQ=A7=CA?= <dennys@news.iim.nctu.edu.tw>", "�ªQ§Ê <dennys@news.iim.nctu.edu.tw>" },
-	{ 1, "=?iso-8859-1?Q?=C1kos?= Valentinyi <A.Valentinyi@soton.ac.uk>", "�kos Valentinyi <A.Valentinyi@soton.ac.uk>" },
-	{ 1, "=?iso-8859-1?Q?Joaqu=EDn?= Cuenca Abela <cuenca@ie2.u-psud.fr>", "Joaquín Cuenca Abela <cuenca@ie2.u-psud.fr>" },
-	{ 2, "=?iso-8859-1?Q?Joaqu=EDn?= Cuenca Abela <cuenca@ie2.u-psud.fr>, gnome-hackers@nuclecu.unam.mx", "Joaquín Cuenca Abela <cuenca@ie2.u-psud.fr>, gnome-hackers@nuclecu.unam.mx" },
-	{ 1, "=?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= <cuenca@celium.net>", "Joaquín Cuenca Abela <cuenca@celium.net>" },
-	{ 1, "=?iso-8859-1?Q?Juantom=E1s=20Garc=EDa?= <juantomas@lared.es>", "Juantomás García <juantomas@lared.es>" },
-	{ 1, "=?iso-8859-1?Q?Kenneth_ll=E9phaane_Christiansen?= <kenneth@ripen.dk>", "Kenneth lléphaane Christiansen <kenneth@ripen.dk>" },
-	{ 1, "=?iso-8859-1?Q?Kjell_Tage_=D8hman?= <tage@ohman.no>", "Kjell Tage Øhman <tage@ohman.no>" },
-	{ 1, "=?iso-8859-1?Q?Martin_Norb=E4ck?= <d95mback@dtek.chalmers.se>", "Martin Norbäck <d95mback@dtek.chalmers.se>" },
-	{ 1, "=?iso-8859-1?Q?P=E5llen?= <pollen@astrakan.hig.se>", "PÃ¥llen <pollen@astrakan.hig.se>" },
-	{ 1, "=?iso-8859-1?Q?Ville_P=E4tsi?= <drc@gnu.org>", "Ville Pätsi <drc@gnu.org>" },
-	{ 1, "=?iso-8859-1?q?Joaqu=EDn?= Cuenca Abela <cuenca@celium.net>", "Joaquín Cuenca Abela <cuenca@celium.net>" },
-	{ 1, "=?iso-8859-2?Q?Dra=BEen_Ka=E8ar?= <dave@srce.hr>", "Dražen Ka�ar <dave@srce.hr>" },
-        /* yep this is right, this isn't valid so doesn't decode at all */
-	{ 1, "=?windows-1250?Q? \"Jaka Mo=E8nik\" ?= <jaka.mocnik@kiss.uni-lj.si>", "=?windows-1250?Q? Jaka Mo=E8nik ?= <jaka.mocnik@kiss.uni-lj.si>" },
-	{ 3, "George <jirka@5z.com>, Juantomas =?ISO-8859-1?Q?Garc=C3=83=C2=ADa?= <juantomas@lared.es>, gnome-hackers@gnome.org", "George <jirka@5z.com>, Juantomas García <juantomas@lared.es>, gnome-hackers@gnome.org" },
-	{ 7, "Jon Trowbridge <trow@emccta.com>, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz <cinamod@hotmail.com>, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= <cuenca@celium.net>, sam th <sam@uchicago.edu>", "Jon Trowbridge <trow@emccta.com>, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz <cinamod@hotmail.com>, Joaquín Cuenca Abela <cuenca@celium.net>, sam th <sam@uchicago.edu>" },
-	{ 6, "Jon Trowbridge <trow@emccta.com>, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz <cinamod@hotmail.com>, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= <cuenca@ie2.u-psud.fr>", "Jon Trowbridge <trow@emccta.com>, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz <cinamod@hotmail.com>, Joaquín Cuenca Abela <cuenca@ie2.u-psud.fr>" },
-	{ 1, "Kai =?iso-8859-1?Q?Gro=DFjohann?= <Kai.Grossjohann@CS.Uni-Dortmund.DE>", "Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>" },
-	{ 1, "Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai =?iso-8859-1?q?Gro=DFjohann?=)", "Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>" },
-	{ 1, "Rickard =?iso-8859-1?Q?Nordstr=F6m?= <rzi@ebox.tninet.se>", "Rickard Nordström <rzi@ebox.tninet.se>" },
-	{ 1, "Tomasz =?iso-8859-2?q?K=B3oczko?= <kloczek@rudy.mif.pg.gda.pl>", "Tomasz KÅ‚oczko <kloczek@rudy.mif.pg.gda.pl>" },
-	{ 1, "VALCKE =?iso-8859-1?Q?C=E9dric?= <cvalcke@freesurf.fr>", "VALCKE Cédric <cvalcke@freesurf.fr>" },
-	{ 1, "Ville =?iso-8859-1?q?P=E4tsi?= <drc@gnu.org>", "Ville Pätsi <drc@gnu.org>" },
-	{ 1, "david@iiia.csic.es (=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=)", "David Gutiérrez Magallanes <david@iiia.csic.es>" },
-	{ 1, "kloczek@rudy.mif.pg.gda.pl (=?ISO-8859-2?Q?Tomasz_K=B3oczko?=)", "Tomasz KÅ‚oczko <kloczek@rudy.mif.pg.gda.pl>" },
-	{ 1, "lassehp@imv.aau.dk (Lasse =?ISO-8859-1?Q?Hiller=F8e?= Petersen)", "Lasse Hillerøe Petersen <lassehp@imv.aau.dk>" },
-	{ 1, "ysato@etl.go.jp (Yutaka Sato =?ISO-2022-JP?B?GyRAOjRGI0stGyhK?=)", "Yutaka Sato �藤豊 <ysato@etl.go.jp>" },
-};
-
-static struct _l {
-    char *type;
-    char *line;
-} test_lines[] = {
-	/* commented out unsupported charsets - FIXME: camel should somehow handle this, although it can't really of course */
-	/*{ "windows-1251", "Åäèí àïëåò íå îòãîâàðÿ íà çàÿâêà çà çàïèñ.\nÄà ãî ïðåìàõíà ëè èëè äà ïî÷àêàì?" },*/
-	{ "iso-8859-1", "Omple les miniatures de la finestra amb contingut de la pantalla" },
-	{ "ISO-8859-2", "Správce oken hýbe s okrajem okna\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "ISO-8859-1", "Vindueshåndtering flytter dekorationsvindue istedet\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	{ "ISO-8859-1", "Vorschaubilder der Fenster mit dem Bildschirminhalt ausfüllen" },
-	{ "iso-8859-7", "ÅìöÜíéóç åñãáóéþí ðïõ äå öáßíïíôáé óôç ëßóôá ðáñáèýñùí (ÐÁÑÁÊÁÌØÇ-ËÉÓÔÁÐÁÑÁÈÕÑÙÍ)" },
-	{ "iso-8859-1", "You've chosen to disable the startup hint.\nTo re-enable it, choose \"Startup Hint\"\nin the GNOME Control Centre" },
-	{ "iso-8859-1", "El aplique de reloj muestra en su panel la fecha y la hora de forma simple \ny ligero " },
-	{ "iso-8859-1", "Applet ei vasta salvestuskäsule.\nKas peaks ta niisama sulgema, või veel ootama?" },
-	{ "iso-8859-1", "Lehio kudeatzaileak lehioaren dekorazaioa mugiarazten\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-15", "Näytä sovellukset, joiden ikkunoista on näkyvillä vain otsikkopalkki" },
-	{ "ISO-8859-1", "Afficher les tâches qui ne sont pas dans la liste des fenêtres" },
-	{ "iso-8859-1", "Níl applet ag tabhair freagra ar iarratas sábháil.\nBain amach an applet nó lean ar fánacht?" },
-	{ "iso-8859-1", "Amosa-las tarefas agochadas da lista de fiestras (SKIP-WINLIST)" },
-	{ "iso-8859-2", "Az ablakkezelõ a dekorációt mozgassa az ablak helyett\n(AfterStep, Enlightenment, FVWM, IceWM, SawMill)" },
-	{ "iso-8859-1", "Riempi la finestra delle anteprime con il contenuto dello schermo" },
-	{ "euc-jp", "¥¦¥¤¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï¾þ¤ê¥¦¥¤¥ó¥É¥¦¤òÆ°¤«¤¹\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	{ "euc-kr", "â °ü¸®ÀÚ°¡ ²Ù¹Î â ´ë½Å À̵¿\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-13", "Priedas neatsakinëja á praðymà iðsisaugoti.\nPaðalinti priedà ar laukti toliau?" },
-	{ "iso-8859-1", "Window manager verplaatst dekoratie\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-1", "Vindushåndtereren flytter dekorasjonsvinduet i stedet\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	{ "iso-8859-2", "Przemieszczanie dekoracji zamiast okna\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-1", "Este programa é responsável por executar outras aplicações, embeber pequenos applets, a paz no mundo e crashes aleatórios do X." },
-	{ "iso-8859-1", "Mostrar tarefas que se escondem da lista de janelas (SKIP-WINLIST)" },
-	{ "koi8-r", "÷ÙÓÏÔÁ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ × ÐÅÒÅËÌÀÞÁÔÅÌÅ ÓÏ×ÐÁÄÁÅÔ Ó ×ÙÓÏÔÏÊ ÐÁÎÅÌÉ" },
-	{ "iso-8859-2", "Správca okien presúva okraje okien\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	{ "iso-8859-2", "Ka¾i posle, ki se skrivajo pred upravljalnik oken (SKIP-WINLIST)" },
-	{ "iso-8859-5", "Window ÜÕÝÐÔ×ÕàØ ßÞÜÕàÐ ÔÕÚÞàÐæØÞÝØ ßàÞ×Þà ãÜÕáâÞ âÞÓa\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-2", "Window menadzeri pomera dekoracioni prozor umesto toga\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-	{ "iso-8859-1", "Fönsterhanteraren flyttar dekorationsfönstret istället\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	/*{ "TSCII", "À½¢ì¸¼î-ºð¼¸ò¾¢ø À¡÷ì¸ ÓÊ¡¾ À½¢ì¸¼í¸¨Ç ¸¡Á¢ (À½¢ì¸¼î-ºð¼¸õ-¾Å¢÷)" },*/
-	{ "iso-8859-9", "Kaydetme isteðine bir uygulak cevap vermiyor .\nUygulaðý sileyim mi , yoksa bekleyeyim mi ?" },
-	{ "koi8-u", "ðÅÒÅͦÝÅÎÎÑ ÄÅËÏÒÁæ§ ÚÁͦÓÔØ ×¦ËÎÁ\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },
-	{ "iso-8859-1", "Cwand on scriftôr est bodjî foû, li scriftôr èt totes\nles apliketes å dvins sont pierdowes. Bodjî ci scriftôr chal?" },
-	{ "gb2312", "ǨÒƵ½×°Êδ°¿Ú¹ÜÀí³ÌÐò(AfterStep, Enlightenment, FVWM, IceWM, SawMill)" },
-	{ "big5", "µøµ¡ºÞ²zªÌ¥u²¾°Ê¸Ë¹¢µøµ¡\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },
-};
diff --git a/camel/tests/lib/addresses.c b/camel/tests/lib/addresses.c
deleted file mode 100644
index a97ac5e4f9..0000000000
--- a/camel/tests/lib/addresses.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#include "addresses.h"
-#include "camel-test.h"
-
-void
-test_address_compare(CamelInternetAddress *addr, CamelInternetAddress *addr2)
-{
-	const char *r1, *r2, *a1, *a2;
-	char *e1, *e2, *f1, *f2;
-	int j;
-
-	check(camel_address_length(CAMEL_ADDRESS(addr)) == camel_address_length(CAMEL_ADDRESS(addr2)));
-	for (j=0;j<camel_address_length(CAMEL_ADDRESS(addr));j++) {
-		
-		check(camel_internet_address_get(addr, j, &r1, &a1) == TRUE);
-		check(camel_internet_address_get(addr2, j, &r2, &a2) == TRUE);
-
-		check(string_equal(r1, r2));
-		check(strcmp(a1, a2) == 0);
-	}
-	check(camel_internet_address_get(addr, j, &r1, &a1) == FALSE);
-	check(camel_internet_address_get(addr2, j, &r2, &a2) == FALSE);
-
-	e1 = camel_address_encode(CAMEL_ADDRESS(addr));
-	e2 = camel_address_encode(CAMEL_ADDRESS(addr2));
-
-	if (camel_address_length(CAMEL_ADDRESS(addr)) == 0)
-		check(e1 == NULL && e2 == NULL);
-	else
-		check(e1 != NULL && e2 != NULL);
-
-	if (e1 != NULL) {
-		check_msg(string_equal(e1, e2), "e1 = '%s' e2 = '%s'", e1, e2);
-		test_free(e1);
-		test_free(e2);
-	}
-
-	f1 = camel_address_format(CAMEL_ADDRESS(addr));
-	f2 = camel_address_format(CAMEL_ADDRESS(addr2));
-
-	if (camel_address_length(CAMEL_ADDRESS(addr)) == 0)
-		check(f1 == NULL && f2 == NULL);
-	else
-		check(f1 != NULL && f2 != NULL);
-
-	if (f1 != NULL) {
-		check_msg(string_equal(f1, f2), "f1 = '%s' f2 = '%s'", f1, f2);
-		test_free(f1);
-		test_free(f2);
-	}
-}
diff --git a/camel/tests/lib/addresses.h b/camel/tests/lib/addresses.h
deleted file mode 100644
index dc35a19f05..0000000000
--- a/camel/tests/lib/addresses.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include <camel/camel-internet-address.h>
-
-/* addresses.c */
-void test_address_compare(CamelInternetAddress *addr, CamelInternetAddress *addr2);
diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
deleted file mode 100644
index a61f949f0a..0000000000
--- a/camel/tests/lib/camel-test.c
+++ /dev/null
@@ -1,350 +0,0 @@
-
-#include "camel-test.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#include <unistd.h>
-#endif
-
-#ifdef ENABLE_THREADS
-/* well i dunno, doesn't seem to be in the headers but hte manpage mentions it */
-/* a nonportable checking mutex for glibc, not really needed, just validates
-   the test harness really */
-# ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-static pthread_mutex_t lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
-# else
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-# endif
-#define CAMEL_TEST_LOCK pthread_mutex_lock(&lock)
-#define CAMEL_TEST_UNLOCK pthread_mutex_unlock(&lock)
-#define CAMEL_TEST_ID (pthread_self())
-#else
-#define CAMEL_TEST_LOCK
-#define CAMEL_TEST_UNLOCK
-#define CAMEL_TEST_ID (0)
-#endif
-
-static int setup;
-static int ok;
-
-struct _stack {
-	struct _stack *next;
-	int fatal;
-	char *what;
-};
-
-/* per-thread state */
-struct _state {
-	char *test;
-	int nonfatal;
-	struct _stack *state;
-};
-
-static GHashTable *info_table;
-
-int camel_test_verbose;
-
-static void
-dump_action(int id, struct _state *s, void *d)
-{
-	struct _stack *node;
-
-#ifdef ENABLE_THREADS
-	printf("\nThread %d:\n", id);
-#endif
-	node = s->state;
-	if (node) {
-		printf("Current action:\n");
-		while (node) {
-			printf("\t%s%s\n", node->fatal?"":"[nonfatal]", node->what);
-			node = node->next;
-		}
-	}
-	printf("\tTest: %s\n", s->test);
-}
-
-static void die(int sig)
-{
-	static int indie = 0;
-
-	if (!indie) {
-		indie = 1;
-		printf("\n\nReceived fatal signal %d\n", sig);
-		g_hash_table_foreach(info_table, (GHFunc)dump_action, 0);
-
-#ifdef ENABLE_THREADS
-		if (camel_test_verbose > 2) {
-			printf("Attach debugger to pid %d to debug\n", getpid());
-			sleep(1000);
-		}
-#endif
-	}
-
-	_exit(1);
-}
-
-static struct _state *
-current_state(void)
-{
-	struct _state *info;
-
-	if (info_table == NULL)
-		info_table = g_hash_table_new(0, 0);
-
-	info = g_hash_table_lookup(info_table, (void *)CAMEL_TEST_ID);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(info_table, (void *)CAMEL_TEST_ID, info);
-	}
-	return info;
-}
-	
-
-void camel_test_init(int argc, char **argv)
-{
-	void camel_init(void);
-	int i;
-
-	setup = 1;
-
-#ifndef ENABLE_THREADS
-	camel_init();
-#endif
-
-	info_table = g_hash_table_new(0, 0);
-
-	/* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */
-	g_thread_init(NULL);
-
-	signal(SIGSEGV, die);
-	signal(SIGABRT, die);
-
-	/* default, just say what, how well we did, unless fail, then abort */
-	camel_test_verbose = 1;
-
-	for (i=0;i<argc;i++) {
-		if (argv[i][0] == '-') {
-			switch (argv[i][1]) {
-			case 'v':
-				camel_test_verbose = strlen(argv[i]);
-				break;
-			case 'q':
-				camel_test_verbose = 0;
-				break;
-			}
-		}
-	}
-}
-
-void camel_test_start(const char *what)
-{
-	struct _state *s;
-
-	CAMEL_TEST_LOCK;
-
-	s = current_state();
-
-	if (!setup)
-		camel_test_init(0, 0);
-
-	ok = 1;
-
-	s->test = g_strdup(what);
-
-	if (camel_test_verbose > 0) {
-		printf("Test: %s ... ", what);
-		fflush(stdout);
-	}
-
-	CAMEL_TEST_UNLOCK;
-}
-
-void camel_test_push(const char *what, ...)
-{
-	struct _stack *node;
-	va_list ap;
-	char *text;
-	struct _state *s;
-
-	CAMEL_TEST_LOCK;
-
-	s = current_state();
-
-	va_start(ap, what);
-	text = g_strdup_vprintf(what, ap);
-	va_end(ap);
-
-	if (camel_test_verbose > 3)
-		printf("Start step: %s\n", text);
-
-	node = g_malloc(sizeof(*node));
-	node->what = text;
-	node->next = s->state;
-	node->fatal = 1;
-	s->state = node;
-
-	CAMEL_TEST_UNLOCK;
-}
-
-void camel_test_pull(void)
-{
-	struct _stack *node;
-	struct _state *s;
-
-	CAMEL_TEST_LOCK;
-
-	s = current_state();
-
-	g_assert(s->state);
-
-	if (camel_test_verbose > 3)
-		printf("Finish step: %s\n", s->state->what);
-
-	node = s->state;
-	s->state = node->next;
-	if (!node->fatal)
-		s->nonfatal--;
-	g_free(node->what);
-	g_free(node);
-
-	CAMEL_TEST_UNLOCK;
-}
-
-/* where to set breakpoints */
-void camel_test_break(void);
-
-void camel_test_break(void)
-{
-}
-
-void camel_test_fail(const char *why, ...)
-{
-	va_list ap;
-
-	va_start(ap, why);
-	camel_test_failv(why, ap);
-	va_end(ap);
-}
-
-
-void camel_test_failv(const char *why, va_list ap)
-{
-	char *text;
-	struct _state *s;
-
-	CAMEL_TEST_LOCK;
-
-	s = current_state();
-
-	text = g_strdup_vprintf(why, ap);
-
-	if ((s->nonfatal == 0 && camel_test_verbose > 0)
-	    || (s->nonfatal && camel_test_verbose > 1)) {
-		printf("Failed.\n%s\n", text);
-		camel_test_break();
-	}
-
-	g_free(text);
-
-	if ((s->nonfatal == 0 && camel_test_verbose > 0)
-	    || (s->nonfatal && camel_test_verbose > 2)) {
-		g_hash_table_foreach(info_table, (GHFunc)dump_action, 0);
-	}
-
-	if (s->nonfatal == 0) {
-		exit(1);
-	} else {
-		ok=0;
-		if (camel_test_verbose > 1) {
-			printf("Known problem (ignored):\n");
-			dump_action(CAMEL_TEST_ID, s, 0);
-		}
-	}
-
-	CAMEL_TEST_UNLOCK;
-}
-
-void camel_test_nonfatal(const char *what, ...)
-{
-	struct _stack *node;
-	va_list ap;
-	char *text;
-	struct _state *s;
-
-	CAMEL_TEST_LOCK;
-
-	s = current_state();
-
-	va_start(ap, what);
-	text = g_strdup_vprintf(what, ap);
-	va_end(ap);
-
-	if (camel_test_verbose > 3)
-		printf("Start nonfatal: %s\n", text);
-
-	node = g_malloc(sizeof(*node));
-	node->what = text;
-	node->next = s->state;
-	node->fatal = 0;
-	s->nonfatal++;
-	s->state = node;
-
-	CAMEL_TEST_UNLOCK;
-}
-
-void camel_test_fatal(void)
-{
-	camel_test_pull();
-}
-
-void camel_test_end(void)
-{
-	if (camel_test_verbose > 0) {
-		if (ok)
-			printf("Ok\n");
-		else
-			printf("Partial success\n");
-	}
-
-	fflush(stdout);
-}
-
-
-
-
-/* compare strings, ignore whitespace though */
-int string_equal(const char *a, const char *b)
-{
-	const char *ap, *bp;
-
-	ap = a;
-	bp = b;
-
-	while (*ap && *bp) {
-		while (*ap == ' ' || *ap == '\n' || *ap == '\t')
-			ap++;
-		while (*bp == ' ' || *bp == '\n' || *bp == '\t')
-			bp++;
-
-		a = ap;
-		b = bp;
-
-		while (*ap && *ap != ' ' && *ap != '\n' && *ap != '\t')
-			ap++;
-		while (*bp && *bp != ' ' && *bp != '\n' && *bp != '\t')
-			bp++;
-
-		if (ap - a != bp - a
-		    && ap - 1 > 0
-		    && memcmp(a, b, ap-a) != 0) {
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
diff --git a/camel/tests/lib/camel-test.h b/camel/tests/lib/camel-test.h
deleted file mode 100644
index 986a943fa3..0000000000
--- a/camel/tests/lib/camel-test.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-/* some utilities for testing */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <glib.h>
-
-void camel_test_failv(const char *why, va_list ap);
-
-/* perform a check assertion */
-#define check(x) do {if (!(x)) { camel_test_fail("%s:%d: %s", __FILE__, __LINE__, #x); } } while (0)
-/* check with message */
-#ifdef  __GNUC__
-#define check_msg(x, y, z...) do {if (!(x)) { camel_test_fail("%s:%d: %s\n\t" #y, __FILE__, __LINE__, #x, ##z); } } while (0)
-#else
-static void check_msg(int truth, char *fmt, ...)
-{
-	/* no gcc, we lose the condition that failed, nm */
-	if (!truth) {
-		va_list ap;
-		va_start(ap, fmt);
-		camel_test_failv(fmt, ap);
-		va_end(ap);
-	}
-}
-#endif
-
-#define check_count(object, expected) do { \
-	if (CAMEL_OBJECT(object)->ref_count != expected) { \
-		camel_test_fail("%s->ref_count != %s\n\tref_count = %d", #object, #expected, CAMEL_OBJECT(object)->ref_count); \
-	} \
-} while (0)
-
-#define check_unref(object, expected) do { \
-	check_count(object, expected); \
-	camel_object_unref(CAMEL_OBJECT(object)); \
-	if (expected == 1) { \
-		object = NULL; \
-	} \
-} while (0)
-
-#define test_free(mem) (g_free(mem), mem=NULL)
-
-#define push camel_test_push
-#define pull camel_test_pull
-
-void camel_test_init(int argc, char **argv);
-
-/* start/finish a new test */
-void camel_test_start(const char *what);
-void camel_test_end(void);
-
-/* start/finish a new test part */
-void camel_test_push(const char *what, ...);
-void camel_test_pull(void);
-
-/* fail a test, with a reason why */
-void camel_test_fail(const char *why, ...);
-void camel_test_failv(const char *why, va_list ap);
-
-/* Set whether a failed test quits.  May be nested, but must be called in nonfatal/fatal pairs  */
-void camel_test_nonfatal(const char *why, ...);
-void camel_test_fatal(void);
-
-/* utility functions */
-/* compare strings, ignore whitespace though */
-int string_equal(const char *a, const char *b);
diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c
deleted file mode 100644
index ba02001bcc..0000000000
--- a/camel/tests/lib/folders.c
+++ /dev/null
@@ -1,526 +0,0 @@
-#include <string.h>
-
-#include "camel-test.h"
-#include "folders.h"
-#include "messages.h"
-
-#include "camel/camel-exception.h"
-
-/* check the total/unread is what we think it should be */
-void
-test_folder_counts(CamelFolder *folder, int total, int unread)
-{
-	GPtrArray *s;
-	int i, myunread;
-	CamelMessageInfo *info;
-
-	push("test folder counts %d total %d unread", total, unread);
-
-	/* first, use the standard functions */
-	check(camel_folder_get_message_count(folder) == total);
-	check(camel_folder_get_unread_message_count(folder) == total);
-
-	/* next, use the summary */
-	s = camel_folder_get_summary(folder);
-	check(s != NULL);
-	check(s->len == total);
-	myunread = s->len;
-	for (i=0;i<s->len;i++) {
-		info = s->pdata[i];
-		if (info->flags & CAMEL_MESSAGE_SEEN)
-			myunread--;
-	}
-	check(unread == myunread);
-	camel_folder_free_summary(folder, s);
-
-	/* last, use the uid list */
-	s = camel_folder_get_uids(folder);
-	check(s != NULL);
-	check(s->len == total);
-	myunread = s->len;
-	for (i=0;i<s->len;i++) {
-		info = camel_folder_get_message_info(folder, s->pdata[i]);
-		if (info->flags & CAMEL_MESSAGE_SEEN)
-			myunread--;
-		camel_folder_free_message_info(folder, info);
-	}
-	check(unread == myunread);
-	camel_folder_free_uids(folder, s);
-
-	pull();
-}
-
-static int
-safe_strcmp(const char *a, const char *b)
-{
-	if (a == NULL && b == NULL)
-		return 0;
-	if (a == NULL)
-		return 1;
-	if (b == NULL)
-		return -1;
-	return strcmp(a, b);
-}
-
-void
-test_message_info(CamelMimeMessage *msg, const CamelMessageInfo *info)
-{
-	check_msg(safe_strcmp(camel_message_info_subject(info), camel_mime_message_get_subject(msg)) == 0,
-		  "info->subject = '%s', get_subject() = '%s'", camel_message_info_subject(info), camel_mime_message_get_subject(msg));
-
-	/* FIXME: testing from/cc/to, etc is more tricky */
-
-	check(info->date_sent == camel_mime_message_get_date(msg, NULL));
-
-	/* date received isn't set for messages that haven't been sent anywhere ... */
-	/*check(info->date_received == camel_mime_message_get_date_received(msg, NULL));*/
-
-	/* so is messageid/references, etc */
-}
-
-/* check a message is present */
-void
-test_folder_message(CamelFolder *folder, const char *uid)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	GPtrArray *s;
-	int i;
-	CamelException *ex = camel_exception_new();
-	int found;
-
-	push("uid %s is in folder", uid);
-
-	/* first try getting info */
-	info = camel_folder_get_message_info(folder, uid);
-	check(info != NULL);
-	check(strcmp(camel_message_info_uid(info), uid) == 0);
-	camel_folder_free_message_info(folder, info);
-
-	/* then, getting message */
-	msg = camel_folder_get_message(folder, uid, ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	check(msg != NULL);
-
-	/* cross check with info */
-	test_message_info(msg, info);
-
-	camel_object_unref((CamelObject *)msg);
-
-	/* see if it is in the summary (only once) */
-	s = camel_folder_get_summary(folder);
-	check(s != NULL);
-	found = 0;
-	for (i=0;i<s->len;i++) {
-		info = s->pdata[i];
-		if (strcmp(camel_message_info_uid(info), uid) == 0)
-			found++;
-	}
-	check(found == 1);
-	camel_folder_free_summary(folder, s);
-
-	/* check it is in the uid list */
-	s = camel_folder_get_uids(folder);
-	check(s != NULL);
-	found = 0;
-	for (i=0;i<s->len;i++) {
-		if (strcmp(s->pdata[i], uid) == 0)
-			found++;
-	}
-	check(found == 1);
-	camel_folder_free_uids(folder, s);
-
-	camel_exception_free(ex);
-
-	pull();
-}
-
-/* check message not present */
-void
-test_folder_not_message(CamelFolder *folder, const char *uid)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	GPtrArray *s;
-	int i;
-	CamelException *ex = camel_exception_new();
-	int found;
-
-	push("uid %s is not in folder", uid);
-
-	/* first try getting info */
-	info = camel_folder_get_message_info(folder, uid);
-	check(info == NULL);
-
-	/* then, getting message */
-	msg = camel_folder_get_message(folder, uid, ex);
-	check(camel_exception_is_set(ex));
-	check(msg == NULL);
-	camel_exception_clear(ex);
-
-	/* see if it is not in the summary (only once) */
-	s = camel_folder_get_summary(folder);
-	check(s != NULL);
-	found = 0;
-	for (i=0;i<s->len;i++) {
-		info = s->pdata[i];
-		if (strcmp(camel_message_info_uid(info), uid) == 0)
-			found++;
-	}
-	check(found == 0);
-	camel_folder_free_summary(folder, s);
-
-	/* check it is not in the uid list */
-	s = camel_folder_get_uids(folder);
-	check(s != NULL);
-	found = 0;
-	for (i=0;i<s->len;i++) {
-		if (strcmp(s->pdata[i], uid) == 0)
-			found++;
-	}
-	check(found == 0);
-	camel_folder_free_uids(folder, s);
-
-	camel_exception_free(ex);
-
-	pull();
-}
-
-/* test basic store operations on folders */
-/* TODO: Add subscription stuff */
-void
-test_folder_basic(CamelSession *session, const char *storename, int local)
-{
-	CamelStore *store;
-	CamelException *ex = camel_exception_new();
-	CamelFolder *folder, *root;
-	char *what = g_strdup_printf("testing store: %s", storename);
-
-	camel_test_start(what);
-	test_free(what);
-
-	push("getting store");
-	store = camel_session_get_store(session, storename, ex);
-	check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));
-	check(store != NULL);
-	pull();
-
-	/* local providers == no root folder */
-	push("getting root folder");
-	root = camel_store_get_root_folder(store, ex);
-	if (local) {
-		check(camel_exception_is_set(ex));
-		check(root == NULL);
-		camel_exception_clear(ex);
-	} else {
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check(root != NULL);
-		check_unref(root, 1);
-	}
-	pull();
-
-	/* same for default folder */
-	push("getting default folder");
-	root = camel_store_get_root_folder(store, ex);
-	if (local) {
-		check(camel_exception_is_set(ex));
-		check(root == NULL);
-		camel_exception_clear(ex);
-	} else {
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check(root != NULL);
-		check_unref(root, 1);
-	}
-	pull();
-
-	push("getting a non-existant folder, no create");
-	folder = camel_store_get_folder(store, "unknown", 0, ex);
-	check(camel_exception_is_set(ex));
-	check(folder == NULL);
-	camel_exception_clear(ex);
-	pull();
-
-	push("getting a non-existant folder, with create");
-	folder = camel_store_get_folder(store, "testbox", CAMEL_STORE_FOLDER_CREATE, ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	check(folder != NULL);
-	check_unref(folder, 1);
-	pull();
-
-	push("getting an existing folder");
-	folder = camel_store_get_folder(store, "testbox", 0, ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	check(folder != NULL);
-	check_unref(folder, 1);
-	pull();
-
-	push("renaming a non-existant folder");
-	camel_store_rename_folder(store, "unknown1", "unknown2", ex);
-	check(camel_exception_is_set(ex));
-	camel_exception_clear(ex);
-	pull();
-
-	push("renaming an existing folder");
-	camel_store_rename_folder(store, "testbox", "testbox2", ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	pull();
-
-	push("opening the old name of a renamed folder");
-	folder = camel_store_get_folder(store, "testbox", 0, ex);
-	check(camel_exception_is_set(ex));
-	check(folder == NULL);
-	camel_exception_clear(ex);
-	pull();
-
-	push("opening the new name of a renamed folder");
-	folder = camel_store_get_folder(store, "testbox2", 0, ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	check(folder != NULL);
-	check_unref(folder, 1);
-	pull();
-
-	push("deleting a non-existant folder");
-	camel_store_delete_folder(store, "unknown", ex);
-	check(camel_exception_is_set(ex));
-	camel_exception_clear(ex);
-	pull();
-
-	push("deleting an existing folder");
-	camel_store_delete_folder(store, "testbox2", ex);
-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-	pull();
-
-	push("opening a folder that has been deleted");
-	folder = camel_store_get_folder(store, "testbox2", 0, ex);
-	check(camel_exception_is_set(ex));
-	check(folder == NULL);
-	camel_exception_clear(ex);
-	pull();
-
-	check_unref(store, 1);
-
-	camel_test_end();
-
-	camel_exception_free(ex);
-}
-
-
-/* todo: cross-check everything with folder_info checks as well */
-/* this should probably take a folder instead of a session ... */
-void
-test_folder_message_ops(CamelSession *session, const char *name, int local)
-{
-	CamelStore *store;
-	CamelException *ex = camel_exception_new();
-	CamelFolder *folder;
-	CamelMimeMessage *msg;
-	int j;
-	int indexed, max;
-	GPtrArray *uids;
-	CamelMessageInfo *info;
-
-	max=local?2:1;
-
-	for (indexed = 0;indexed<max;indexed++) {
-		char *what = g_strdup_printf("folder ops: %s %s", name, local?(indexed?"indexed":"non-indexed"):"");
-		int flags;
-
-		camel_test_start(what);
-		test_free(what);
-
-		push("getting store");
-		store = camel_session_get_store(session, name, ex);
-		check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));
-		check(store != NULL);
-		pull();
-
-		push("creating %sindexed folder", indexed?"":"non-");
-		if (indexed)
-			flags = CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX;
-		else
-			flags = CAMEL_STORE_FOLDER_CREATE;
-		folder = camel_store_get_folder(store, "testbox", flags, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check(folder != NULL);
-
-		/* verify empty/can't get nonexistant stuff */
-		test_folder_counts(folder, 0, 0);
-		test_folder_not_message(folder, "0");
-		test_folder_not_message(folder, "");
-
-		for (j=0;j<10;j++) {
-			char *content, *subject;
-
-			push("creating test message");
-			msg = test_message_create_simple();
-			content = g_strdup_printf("Test message %d contents\n\n", j);
-			test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
-							content, strlen(content));
-			test_free(content);
-			subject = g_strdup_printf("Test message %d", j);
-			camel_mime_message_set_subject(msg, subject);
-			pull();
-
-			push("appending simple message %d", j);
-			camel_folder_append_message(folder, msg, NULL, ex);
-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-
-			/* sigh, this shouldn't be required, but the imap code is too dumb to do it itself */
-			if (!local) {
-				push("forcing a refresh of folder updates");
-				camel_folder_refresh_info(folder, ex);
-				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-				pull();
-			}
-
-			if (!local)
-				camel_test_nonfatal("unread counts dont seem right for imap");
-
-			test_folder_counts(folder, j+1, j+1);
-
-			if (!local)
-				camel_test_fatal();
-
-			push("checking it is in the right uid slot & exists");
-			uids = camel_folder_get_uids(folder);
-			check(uids != NULL);
-			check(uids->len == j+1);
-			test_folder_message(folder, uids->pdata[j]);
-			pull();
-
-			push("checking it is the right message (subject): %s", subject);
-			info = camel_folder_get_message_info(folder, uids->pdata[j]);
-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-				  "info->subject %s", camel_message_info_subject(info));
-			camel_folder_free_uids(folder, uids);
-			camel_folder_free_message_info(folder, info);
-			pull();
-
-			test_free(subject);
-
-			check_unref(msg, 1);
-			pull();
-		}
-
-		check_unref(folder, 1);
-		pull();
-
-		push("deleting test folder, with messages in it");
-		camel_store_delete_folder(store, "testbox", ex);
-		check(camel_exception_is_set(ex));
-		camel_exception_clear(ex);
-		pull();
-
-		push("re-opening folder");
-		folder = camel_store_get_folder(store, "testbox", flags, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		check(folder != NULL);
-
-			/* verify counts */
-		test_folder_counts(folder, 10, 10);
-
-		/* re-check uid's, after a reload */
-		uids = camel_folder_get_uids(folder);
-		check(uids != NULL);
-		check(uids->len == 10);
-		for (j=0;j<10;j++) {
-			char *subject = g_strdup_printf("Test message %d", j);
-
-			push("verify reload of %s", subject);
-			test_folder_message(folder, uids->pdata[j]);
-
-			info = camel_folder_get_message_info(folder, uids->pdata[j]);
-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-				  "info->subject %s", camel_message_info_subject(info));
-			test_free(subject);
-			camel_folder_free_message_info(folder, info);
-			pull();
-		}
-
-		push("deleting first message & expunging");
-		camel_folder_delete_message(folder, uids->pdata[0]);
-		test_folder_counts(folder, 10, 10);
-		camel_folder_expunge(folder, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		test_folder_not_message(folder, uids->pdata[0]);
-		test_folder_counts(folder, 9, 9);
-
-		camel_folder_free_uids(folder, uids);
-
-		uids = camel_folder_get_uids(folder);
-		check(uids != NULL);
-		check(uids->len == 9);
-		for (j=0;j<9;j++) {
-			char *subject = g_strdup_printf("Test message %d", j+1);
-
-			push("verify after expunge of %s", subject);
-			test_folder_message(folder, uids->pdata[j]);
-
-			info = camel_folder_get_message_info(folder, uids->pdata[j]);
-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-				  "info->subject %s", camel_message_info_subject(info));
-			test_free(subject);
-			camel_folder_free_message_info(folder, info);
-			pull();
-		}
-		pull();
-
-		push("deleting last message & expunging");
-		camel_folder_delete_message(folder, uids->pdata[8]);
-		/* sync? */
-		test_folder_counts(folder, 9, 9);
-		camel_folder_expunge(folder, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		test_folder_not_message(folder, uids->pdata[8]);
-		test_folder_counts(folder, 8, 8);
-
-		camel_folder_free_uids(folder, uids);
-
-		uids = camel_folder_get_uids(folder);
-		check(uids != NULL);
-		check(uids->len == 8);
-		for (j=0;j<8;j++) {
-			char *subject = g_strdup_printf("Test message %d", j+1);
-
-			push("verify after expunge of %s", subject);
-			test_folder_message(folder, uids->pdata[j]);
-
-			info = camel_folder_get_message_info(folder, uids->pdata[j]);
-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,
-				  "info->subject %s", camel_message_info_subject(info));
-			test_free(subject);
-			camel_folder_free_message_info(folder, info);
-			pull();
-		}
-		pull();
-
-		push("deleting all messages & expunging");
-		for (j=0;j<8;j++) {
-			camel_folder_delete_message(folder, uids->pdata[j]);
-		}
-		/* sync? */
-		test_folder_counts(folder, 8, 8);
-		camel_folder_expunge(folder, ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		for (j=0;j<8;j++) {
-			test_folder_not_message(folder, uids->pdata[j]);
-		}
-		test_folder_counts(folder, 0, 0);
-
-		camel_folder_free_uids(folder, uids);
-		pull();
-
-		check_unref(folder, 1);
-		pull(); /* re-opening folder */
-
-		push("deleting test folder, with no messages in it");
-		camel_store_delete_folder(store, "testbox", ex);
-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
-		pull();
-
-		check_unref(store, 1);
-		camel_test_end();
-	}
-
-	camel_exception_free(ex);
-}
diff --git a/camel/tests/lib/folders.h b/camel/tests/lib/folders.h
deleted file mode 100644
index 2cb2d97028..0000000000
--- a/camel/tests/lib/folders.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#include "camel/camel-session.h"
-#include "camel/camel-store.h"
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
-/* check the total/unread is what we think it should be, everywhere it can be determined */
-void test_folder_counts(CamelFolder *folder, int total, int unread);
-/* cross-check info/msg */
-void test_message_info(CamelMimeMessage *msg, const CamelMessageInfo *info);
-/* check a message is present everywhere it should be */
-void test_folder_message(CamelFolder *folder, const char *uid);
-/* check message not present everywhere it shouldn't be */
-void test_folder_not_message(CamelFolder *folder, const char *uid);
-/* test basic folder ops on a store */
-void test_folder_basic(CamelSession *session, const char *storename, int local);
-/* test basic message operations on a folder */
-void test_folder_message_ops(CamelSession *session, const char *storename, int local);
diff --git a/camel/tests/lib/messages.c b/camel/tests/lib/messages.c
deleted file mode 100644
index a8c8b30465..0000000000
--- a/camel/tests/lib/messages.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include <string.h>
-
-#include "messages.h"
-#include "camel-test.h"
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-
-CamelMimeMessage *
-test_message_create_simple(void)
-{
-	CamelMimeMessage *msg;
-	CamelInternetAddress *addr;
-
-	msg = camel_mime_message_new();
-
-	addr = camel_internet_address_new();
-	camel_internet_address_add(addr, "Michael Zucchi", "zed@nowhere.com");
-	camel_mime_message_set_from(msg, addr);
-	camel_address_remove((CamelAddress *)addr, -1);
-	camel_internet_address_add(addr, "POSTMASTER", "POSTMASTER@somewhere.net");
-	camel_mime_message_set_recipients(msg, CAMEL_RECIPIENT_TYPE_TO, addr);
-	camel_address_remove((CamelAddress *)addr, -1);
-	camel_internet_address_add(addr, "Michael Zucchi", "zed@nowhere.com");
-	camel_mime_message_set_recipients(msg, CAMEL_RECIPIENT_TYPE_CC, addr);
-
-	check_unref(addr, 1);
-
-	camel_mime_message_set_subject(msg, "Simple message subject");
-	camel_mime_message_set_date(msg, time(0), 930);
-
-	return msg;
-}
-
-static void
-content_finalise(CamelObject *folder, void *crap, void *ba)
-{
-	g_byte_array_free(ba, TRUE);
-}
-
-void
-test_message_set_content_simple(CamelMimePart *part, int how, const char *type, const char *text, int len)
-{
-	CamelStreamMem *content = NULL;
-	CamelDataWrapper *dw;
-	static GByteArray *ba;
-
-	switch (how) {
-	case 0:
-		camel_mime_part_set_content(part, text, len, type);
-		break;
-	case 1:
-		content = (CamelStreamMem *)camel_stream_mem_new_with_buffer(text, len);
-		break;
-	case 2:
-		content = (CamelStreamMem *)camel_stream_mem_new();
-		camel_stream_mem_set_buffer(content, text, len);
-		break;
-	case 3:
-		ba = g_byte_array_new();
-		g_byte_array_append(ba, text, len);
-
-		content = (CamelStreamMem *)camel_stream_mem_new_with_byte_array(ba);
-		ba = NULL;
-		break;
-	case 4:
-		ba = g_byte_array_new();
-		g_byte_array_append(ba, text, len);
-
-		content = (CamelStreamMem *)camel_stream_mem_new();
-		camel_stream_mem_set_byte_array(content, ba);
-
-		camel_object_hook_event((CamelObject *)content, "finalize", content_finalise, ba);
-		break;
-	}
-
-	if (content != 0) {
-		dw = camel_data_wrapper_new();
-                camel_data_wrapper_set_mime_type (dw, type);
-
-		camel_data_wrapper_construct_from_stream(dw, (CamelStream *)content);
-		camel_medium_set_content_object((CamelMedium *)part, dw);
-
-		check_unref(content, 2);
-		check_unref(dw, 2);
-	}
-}
-
-int
-test_message_write_file(CamelMimeMessage *msg, const char *name)
-{
-	CamelStreamFs *file;
-	int ret;
-
-	file = (CamelStreamFs *)camel_stream_fs_new_with_name(name, O_CREAT|O_WRONLY, 0600);
-	camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, (CamelStream *)file);
-	ret = camel_stream_close((CamelStream *)file);
-
-	check(((CamelObject *)file)->ref_count == 1);
-	camel_object_unref((CamelObject *)file);
-
-	return ret;
-}
-
-CamelMimeMessage *
-test_message_read_file(const char *name)
-{
-	CamelStreamFs *file;
-	CamelMimeMessage *msg2;
-
-	file = (CamelStreamFs *)camel_stream_fs_new_with_name(name, O_RDONLY, 0);
-	msg2 = camel_mime_message_new();
-
-	camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg2, (CamelStream *)file);
-	/* file's refcount may be > 1 if the message is real big */
-	check(CAMEL_OBJECT(file)->ref_count >=1);
-
-	return msg2;
-}
-
-int
-test_message_compare_content(CamelDataWrapper *dw, const char *text, int len)
-{
-	CamelStreamMem *content;
-
-	/* sigh, ok, so i len == 0, dw will probably be 0 too
-	   camel_mime_part_set_content is weird like that */
-	if (dw == 0 && len == 0)
-		return 0;
-
-	content = (CamelStreamMem *)camel_stream_mem_new();
-	camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);
-
-	check_msg(content->buffer->len == len, "buffer->len = %d, len = %d", content->buffer->len, len);
-	check_msg(memcmp(content->buffer->data, text, content->buffer->len) == 0, "len = %d", len);
-
-	check_unref(content, 1);
-
-	return 0;
-}
-
-int
-test_message_compare_header(CamelMimeMessage *m1, CamelMimeMessage *m2)
-{
-	return 0;
-}
-
-int
-test_message_compare_messages(CamelMimeMessage *m1, CamelMimeMessage *m2)
-{
-	return 0;
-}
diff --git a/camel/tests/lib/messages.h b/camel/tests/lib/messages.h
deleted file mode 100644
index 9cb5758826..0000000000
--- a/camel/tests/lib/messages.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include <camel/camel-mime-message.h>
-
-/* how many ways to set the content contents */
-#define SET_CONTENT_WAYS (5)
-
-/* messages.c */
-CamelMimeMessage *test_message_create_simple(void);
-void test_message_set_content_simple(CamelMimePart *part, int how, const char *type, const char *text, int len);
-int test_message_write_file(CamelMimeMessage *msg, const char *name);
-CamelMimeMessage *test_message_read_file(const char *name);
-int test_message_compare_content(CamelDataWrapper *dw, const char *text, int len);
diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c
deleted file mode 100644
index e4dc006363..0000000000
--- a/camel/tests/lib/streams.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-	stream tests
-
-	todo: do we need a seek test that seeks beyond the eos, writes,
-		then reads and checks for 0's in the space?
-*/
-
-#include <string.h>
-
-#include "camel/camel-stream.h"
-#include "camel/camel-seekable-stream.h"
-#include "camel/camel-seekable-substream.h"
-
-#include "streams.h"
-
-#include "camel-test.h"
-
-static char teststring[] = "\xaa\x55\xc0\x0c\xff\x00";
-static char testbuf[10240];
-
-/* pass in an empty read/write stream */
-void
-test_stream_seekable_writepart(CamelSeekableStream *s)
-{
-	off_t end;
-	int i;
-
-	push("seekable stream test, writing ");
-
-	check(camel_seekable_stream_tell(s) == 0);
-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_SET) == 0);
-	check(camel_seekable_stream_tell(s) == 0);
-
-	check(camel_stream_write(CAMEL_STREAM(s), "", 0) == 0);
-	check(camel_seekable_stream_tell(s) == 0);
-	check(camel_stream_write(CAMEL_STREAM(s), "\n", 1) == 1);
-	check(camel_seekable_stream_tell(s) == 1);
-
-	for (i=0;i<10240;i++) {
-		check(camel_stream_write(CAMEL_STREAM(s), teststring, sizeof(teststring)) == sizeof(teststring));
-		check(camel_seekable_stream_tell(s) == 1 + (i+1)*sizeof(teststring));
-	}
-	end = 10240*sizeof(teststring)+1;
-
-	check_msg(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END) == end, "seek =%d end = %d",
-		  camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END), end);
-
-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END) == end);
-	check(camel_seekable_stream_tell(s) == end);
-	/* need to read 0 first to set eos */
-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 0);
-	check(camel_stream_eos(CAMEL_STREAM(s)));
-
-	pull();
-}
-
-void
-test_stream_seekable_readpart(CamelSeekableStream *s)
-{
-	off_t off, new, end;
-	int i, j;
-
-	push("seekable stream test, re-reading");
-
-	end = 10240*sizeof(teststring)+1;
-
-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_SET) == 0);
-	check(camel_seekable_stream_tell(s) == 0);
-	check(!camel_stream_eos(CAMEL_STREAM(s)));
-
-	off = 0;
-	for (i=0;i<1024;i++) {
-
-		new = i*3;
-
-		/* exercise all seek methods */
-		switch(i % 3) {
-		case 0:
-			check(camel_seekable_stream_seek(s, new, CAMEL_STREAM_SET) == new);
-			break;
-		case 1:
-			check(camel_seekable_stream_seek(s, new-off, CAMEL_STREAM_CUR) == new);
-			break;
-		case 2:
-			check(camel_seekable_stream_seek(s, new-end, CAMEL_STREAM_END) == new);
-			break;
-		}
-		check(camel_seekable_stream_tell(s) == new);
-
-		check(camel_stream_read(CAMEL_STREAM(s), testbuf, i*3) == i*3);
-		for (j=0;j<i*3;j++) {
-			int k = new + j;
-
-			if (k==0) {
-				check(testbuf[j] == '\n');
-			} else {
-				check(testbuf[j] == teststring[(k-1) % sizeof(teststring)]);
-			}
-		}
-		off = new+i*3;
-	}
-
-	/* verify end-of-file behaviour */
-	check(camel_seekable_stream_seek(s, -1, CAMEL_STREAM_END) == end-1);
-	check(camel_seekable_stream_tell(s) == end-1);
-
-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 1);
-	check(testbuf[0] == teststring[sizeof(teststring)-1]);
-
-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 0);
-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_CUR) == end);
-	check(camel_seekable_stream_tell(s) == end);
-	check(camel_stream_eos(CAMEL_STREAM(s)));
-
-	pull();
-}
-
-/*
-  0 = write to the substream
-  1 = write to the parent stream at the right spot
-*/
-void
-test_seekable_substream_writepart(CamelStream *s, int type)
-{
-	CamelSeekableStream *ss = (CamelSeekableStream *)s;
-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s;
-	CamelSeekableStream *sp = sus->parent_stream;
-	int i, len;
-	off_t end;
-
-	push("writing substream, type %d", type);
-
-	if (type == 1) {
-		check(camel_seekable_stream_seek(sp, ss->bound_start, CAMEL_STREAM_SET) == ss->bound_start);
-		s = (CamelStream *)sp;
-	} else {
-		check(camel_seekable_stream_tell(ss) == ss->bound_start);
-		check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_SET) == ss->bound_start);
-	}
-
-	check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_start);
-
-	check(camel_stream_write(s, "", 0) == 0);
-	check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_start);
-
-	/* fill up the bounds with writes */
-	if (ss->bound_end != CAMEL_STREAM_UNBOUND) {
-		for (i=0;i<(ss->bound_end-ss->bound_start)/sizeof(teststring);i++) {
-			check(camel_stream_write(s, teststring, sizeof(teststring)) == sizeof(teststring));
-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_start + (i+1)*sizeof(teststring));
-		}
-		len = (ss->bound_end-ss->bound_start) % sizeof(teststring);
-		check(camel_stream_write(s, teststring, len) == len);
-		check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_end);
-		if (type == 0) {
-			check(camel_stream_write(s, teststring, sizeof(teststring)) == 0);
-			check(camel_stream_eos(s));
-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_end);
-		}
-	} else {
-		/* just 10K */
-		for (i=0;i<10240;i++) {
-			check(camel_stream_write(CAMEL_STREAM(s), teststring, sizeof(teststring)) == sizeof(teststring));
-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss->bound_start + (i+1)*sizeof(teststring));
-		}
-
-		/* we can't really verify any end length here */
-	}
-
-	pull();
-}
-
-void
-test_seekable_substream_readpart(CamelStream *s)
-{
-	CamelSeekableStream *ss = (CamelSeekableStream *)s;
-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s;
-	CamelSeekableStream *sp = sus->parent_stream;
-	int i, len;
-	off_t end;
-
-	push("reading substream");
-
-	check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_SET) == ss->bound_start);
-	check(camel_seekable_stream_tell(ss) == ss->bound_start);
-
-	check(camel_seekable_stream_seek(sp, ss->bound_start, CAMEL_STREAM_SET) == ss->bound_start);
-	check(camel_seekable_stream_tell(sp) == ss->bound_start);
-
-	/* check writes, cross check with parent stream */
-	if (ss->bound_end != CAMEL_STREAM_UNBOUND) {
-		for (i=0;i<(ss->bound_end-ss->bound_start)/sizeof(teststring);i++) {
-			check(camel_stream_read(s, testbuf, sizeof(teststring)) == sizeof(teststring));
-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);
-			check(camel_seekable_stream_tell(ss) == ss->bound_start + (i+1)*sizeof(teststring));
-
-			/* yeah great, the substreams affect the seek ... */
-			check(camel_seekable_stream_seek(sp, ss->bound_start + (i)*sizeof(teststring), CAMEL_STREAM_SET) == ss->bound_start + i*sizeof(teststring));
-			check(camel_stream_read(CAMEL_STREAM(sp), testbuf, sizeof(teststring)) == sizeof(teststring));
-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);
-			check(camel_seekable_stream_tell(sp) == ss->bound_start + (i+1)*sizeof(teststring));
-		}
-		len = (ss->bound_end-ss->bound_start) % sizeof(teststring);
-		check(camel_stream_read(s, testbuf, len) == len);
-		check(memcmp(testbuf, teststring, len) == 0);
-
-		check(camel_seekable_stream_seek(sp, ss->bound_end - len, CAMEL_STREAM_SET) == ss->bound_end - len);
-		check(camel_stream_read(CAMEL_STREAM(sp), testbuf, len) == len);
-		check(memcmp(testbuf, teststring, len) == 0);
-
-		check(camel_stream_eos(s));
-		check(camel_seekable_stream_tell(ss) == ss->bound_end);
-		check(camel_seekable_stream_tell(sp) == ss->bound_end);
-		check(camel_stream_read(s, testbuf, 1024) == 0);
-		check(camel_seekable_stream_tell(ss) == ss->bound_end);
-		check(camel_seekable_stream_tell(sp) == ss->bound_end);
-		check(camel_stream_eos(s));
-	} else {
-		/* just 10K */
-		for (i=0;i<10240;i++) {
-			check(camel_stream_read(s, testbuf, sizeof(teststring)) == sizeof(teststring));
-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);
-			check(camel_seekable_stream_tell(ss) == ss->bound_start + (i+1)*sizeof(teststring));
-
-			check(camel_seekable_stream_seek(sp, ss->bound_start + (i)*sizeof(teststring), CAMEL_STREAM_SET) == ss->bound_start + i*sizeof(teststring));
-			check(camel_stream_read(CAMEL_STREAM(sp), testbuf, sizeof(teststring)) == sizeof(teststring));
-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);
-			check(camel_seekable_stream_tell(sp) == ss->bound_start + (i+1)*sizeof(teststring));
-		}
-
-		/* unbound - we dont know the real length */
-#if 0
-		end = 10240*sizeof(teststring)+ss->bound_start;
-
-		check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_END) == end);
-		check(camel_seekable_stream_tell(ss) == end);
-		/* need to read 0 first to set eos */
-		check(camel_stream_read(s, testbuf, 10240) == 0);
-		check(camel_stream_eos(s));
-#endif
-	}
-
-	pull();
-}
diff --git a/camel/tests/lib/streams.h b/camel/tests/lib/streams.h
deleted file mode 100644
index df52e283d0..0000000000
--- a/camel/tests/lib/streams.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include "camel/camel-seekable-stream.h"
-
-/* call one, then the other on the same stream content */
-void test_stream_seekable_writepart(CamelSeekableStream *s);
-void test_stream_seekable_readpart(CamelSeekableStream *s);
-
-/* same, for substreams, multiple ways of writing */
-#define SEEKABLE_SUBSTREAM_WAYS (2)
-
-void test_seekable_substream_writepart(CamelStream *s, int type);
-void test_seekable_substream_readpart(CamelStream *s);
diff --git a/camel/tests/message/.cvsignore b/camel/tests/message/.cvsignore
deleted file mode 100644
index 4f58c83bd0..0000000000
--- a/camel/tests/message/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-test1
-test2
-test3
-*.msg
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
deleted file mode 100644
index aa430fa409..0000000000
--- a/camel/tests/message/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
-	-I$(includedir) \
-	-I$(top_srcdir)/camel/tests/lib \
-	-DG_LOG_DOMAIN=\"evolution-tests\"	
-
-LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-check_PROGRAMS =  	\
-	test1		\
-	test2		\
-	test3
-
-TESTS = test1 test2 test3
-
-
-
diff --git a/camel/tests/message/README b/camel/tests/message/README
deleted file mode 100644
index 280344ce9b..0000000000
--- a/camel/tests/message/README
+++ /dev/null
@@ -1,5 +0,0 @@
-
-test1	creating, saving, loading simple messages
-test2	camelinternetaddress tests, internationalised addresses, etc.
-test3	multipart messages
-
diff --git a/camel/tests/message/test1.c b/camel/tests/message/test1.c
deleted file mode 100644
index 3294000550..0000000000
--- a/camel/tests/message/test1.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-  test1.c
-
-  Create a message, save it.
-
-  Retrieve message, compare content.
-
-
-  Operations:
-	writing/loading from different types of streams
-	reading/writing different content
-	reading/writing different encodings
-	reading/writing different charsets
-
-  Just testing streams:
-  	different stream types
-	different file ops
-	seek, eof, etc.
-*/
-
-#include "camel-test.h"
-#include "messages.h"
-
-/* for stat */
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-
-struct _text {
-	char *text;
-	int len;
-};
-
-#define MAX_TEXTS (14)
-struct _text texts[MAX_TEXTS];
-
-static void
-setup(void)
-{
-	int i, j;
-	char *p;
-
-	/* setup various edge and other general cases */
-	texts[0].text = "";
-	texts[0].len = 0;
-	texts[1].text = "";
-	texts[1].len = 1;
-	texts[2].text = "\n";
-	texts[2].len = 1;
-	texts[3].text = "A";
-	texts[3].len = 1;
-	texts[4].text = "This is a test.\n.";
-	texts[4].len = strlen(texts[4].text);
-	texts[5].text = "This is a test.\n\n.\n";
-	texts[5].len = strlen(texts[5].text);
-	texts[6].text = g_malloc0(1024);
-	texts[6].len = 1024;
-	texts[7].text = g_malloc0(102400);
-	texts[7].len = 102400;
-	texts[8].text = g_malloc(1024);
-	memset(texts[8].text, '\n', 1024);
-	texts[8].len = 1024;
-	texts[9].text = g_malloc(102400);
-	memset(texts[9].text, '\n', 102400);
-	texts[9].len = 102400;
-	texts[10].text = g_malloc(1024);
-	memset(texts[10].text, ' ', 1024);
-	texts[10].len = 1024;
-	texts[11].text = g_malloc(102400);
-	memset(texts[11].text, ' ', 102400);
-	texts[11].len = 102400;
-
-	srand(42);
-	p = texts[12].text = g_malloc(1024);
-	for (i=0;i<1024;i++) {
-		j = rand();
-		if (j<RAND_MAX/120)
-			*p++ = '\n';
-		else
-			*p++ = (j % 95) + 32;
-	}
-	texts[12].len = 1024;
-	p = texts[13].text = g_malloc(102400);
-	for (i=0;i<102400;i++) {
-		j = rand();
-		if (j<RAND_MAX/120)
-			*p++ = '\n';
-		else
-			*p++ = (j % 95) + 32;
-	}
-	texts[13].len = 102400;
-}
-
-static void cleanup(void)
-{
-	int i;
-
-	for (i=6;i<14;i++) {
-		g_free(texts[i].text);
-	}
-}
-
-int main(int argc, char **argv)
-{
-	CamelMimeMessage *msg, *msg2;
-	int i, j;
-	char *text;
-	int len;
-
-	camel_test_init(argc, argv);
-
-	setup();
-
-	camel_test_start("Simple memory-based content creation");
-
-	/* test all ways of setting simple content for a message (i.e. memory based) */
-	for (j=0;j<MAX_TEXTS;j++) {
-		push("testing text number %d", j);
-		text = texts[j].text;
-		len = texts[j].len;
-		for (i=0;i<SET_CONTENT_WAYS;i++) {
-			push("create simple message %d", i);
-			msg = test_message_create_simple();
-
-			push("set simple content");
-			test_message_set_content_simple((CamelMimePart *)msg, i, "text/plain", text, len);
-			pull();
-
-			push("compare original content");
-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg), text, len);
-			pull();
-
-			push("save message to test1.msg");
-			unlink("test1.msg");
-			test_message_write_file(msg, "test1.msg");
-			check_unref(msg, 1);
-			pull();
-	
-			push("read from test1.msg");
-			msg2 = test_message_read_file("test1.msg");
-			pull();
-
-			push("compare read with original content");
-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg2), text, len);
-			check_unref(msg2, 1);
-			pull();
-
-			unlink("test1.msg");
-			pull();
-		}
-		pull();
-	}
-
-	camel_test_end();
-
-	camel_test_start("Different encodings");
-	for (j=0;j<MAX_TEXTS;j++) {
-		push("testing text number %d", j);
-		text = texts[j].text;
-		len = texts[j].len;
-		for (i=0;i<CAMEL_MIME_PART_NUM_ENCODINGS;i++) {
-			
-			push("test simple message, encoding %s", camel_mime_part_encoding_to_string(i));
-			msg = test_message_create_simple();
-
-			push("set simple content");
-			test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain", text, len);
-			pull();
-
-			camel_mime_part_set_encoding((CamelMimePart *)msg, i);
-
-			push("save message to test1.msg");
-			unlink("test1.msg");
-			test_message_write_file(msg, "test1.msg");
-			check_unref(msg, 1);
-			pull();
-	
-			push("read from test1.msg");
-			msg2 = test_message_read_file("test1.msg");
-			pull();
-
-			push("compare read with original content");
-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg2), text, len);
-			check_unref(msg2, 1);
-			pull();
-
-			unlink("test1.msg");
-			pull();
-		}
-		pull();
-	}
-	camel_test_end();
-
-	cleanup();
-
-	return 0;
-}
diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c
deleted file mode 100644
index abeafa9524..0000000000
--- a/camel/tests/message/test2.c
+++ /dev/null
@@ -1,327 +0,0 @@
-#include "camel-test.h"
-#include "messages.h"
-#include "addresses.h"
-
-/* for stat */
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <unicode.h>
-
-#include <camel/camel-internet-address.h>
-#include <camel/camel-address.h>
-
-#include "address-data.h"
-
-static char *convert(const char *in, const char *from, const char *to)
-{
-	unicode_iconv_t ic = unicode_iconv_open(to, from);
-	char *out, *outp;
-	const char *inp;
-	int inlen, outlen;
-
-	if (ic == (unicode_iconv_t)-1)
-		return g_strdup(in);
-
-	inlen = strlen(in);
-	outlen = inlen*5 + 16;
-
-	outp = out = g_malloc(outlen);
-	inp = in;
-
-	if (unicode_iconv(ic, &inp, &inlen, &outp, &outlen) == -1) {
-		test_free(out);
-		unicode_iconv_close(ic);
-		return g_strdup(in);
-	}
-
-	if (unicode_iconv(ic, NULL, 0, &outp, &outlen) == -1) {
-		test_free(out);
-		unicode_iconv_close(ic);
-		return g_strdup(in);
-	}
-
-	unicode_iconv_close(ic);
-
-	*outp = 0;
-
-#if 0
-	/* lets see if we can convert back again? */
-	{
-		char *nout, *noutp;
-		unicode_iconv_t ic = unicode_iconv_open(from, to);
-
-		inp = out;
-		inlen = strlen(out);
-		outlen = inlen*5 + 16;
-		noutp = nout = g_malloc(outlen);
-		if (unicode_iconv(ic, &inp, &inlen, &noutp, &outlen) == -1
-		    || unicode_iconv(ic, NULL, 0, &noutp, &outlen) == -1) {
-			g_warning("Cannot convert '%s' \n from %s to %s: %s\n", in, to, from, strerror(errno));
-		}
-		unicode_iconv_close(ic);
-	}
-
-	/* and lets see what camel thinks out optimal charset is */
-	{
-		printf("Camel thinks the best encoding of '%s' is %s, although we converted from %s\n",
-		       in, camel_charset_best(out, strlen(out)), from);
-	}
-#endif
-
-	return out;
-}
-
-#define to_utf8(in, type) convert(in, type, "utf-8")
-#define from_utf8(in, type) convert(in, "utf-8", type)
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-int main(int argc, char **argv)
-{
-	int i;
-	CamelInternetAddress *addr, *addr2;
-	char *name;
-	char *charset;
-	const char *real, *where;
-	char *enc, *enc2, *format, *format2;
-
-	camel_test_init(argc, argv);
-
-	camel_test_start("CamelInternetAddress, basics");
-
-	addr = camel_internet_address_new();
-
-	push("Test blank address");
-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 0);
-	check(camel_internet_address_get(addr, 0, &real, &where) == FALSE);
-	pull();
-
-	push("Test blank clone");
-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));
-	test_address_compare(addr, addr2);
-	check_unref(addr2, 1);
-	pull();
-
-	push("Test add 1");
-	camel_internet_address_add(addr, "Zed", "nowhere@here.com.au");
-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 1);
-	check(camel_internet_address_get(addr, 0, &real, &where) == TRUE);
-	check_msg(string_equal("Zed", real), "real = '%s'", real);
-	check(strcmp(where, "nowhere@here.com.au") == 0);
-	pull();
-
-	push("Test clone 1");
-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));
-	test_address_compare(addr, addr2);
-	check_unref(addr2, 1);
-	pull();
-
-	push("Test add many");
-	for (i=1;i<10;i++) {
-		char name[16], a[32];
-		sprintf(name, "Zed %d", i);
-		sprintf(a, "nowhere@here-%d.com.au", i);
-		camel_internet_address_add(addr, name, a);
-		check(camel_address_length(CAMEL_ADDRESS(addr)) == i+1);
-		check(camel_internet_address_get(addr, i, &real, &where) == TRUE);
-		check_msg(string_equal(name, real), "name = '%s' real = '%s'", name, real);
-		check(strcmp(where, a) == 0);
-	}
-	pull();
-
-	/* put a few of these in to make it look like its doing something impressive ... :) */
-	camel_test_end();
-	camel_test_start("CamelInternetAddress, search");
-
-	push("Test search");
-	camel_test_nonfatal("Address comparisons should ignore whitespace??");
-	check(camel_internet_address_find_name(addr, "Zed 1", &where) == 1);
-	check(camel_internet_address_find_name(addr, "Zed 9", &where) == 9);
-	check(camel_internet_address_find_name(addr, "Zed", &where) == 0);
-	check(camel_internet_address_find_name(addr, " Zed", &where) == 0);
-	check(camel_internet_address_find_name(addr, "Zed ", &where) == 0);
-	check(camel_internet_address_find_name(addr, "  Zed ", &where) == 0);
-	check(camel_internet_address_find_name(addr, "Zed 20", &where) == -1);
-	check(camel_internet_address_find_name(addr, "", &where) == -1);
-	/* interface dont handle nulls :) */
-	/*check(camel_internet_address_find_name(addr, NULL, &where) == -1);*/
-
-	check(camel_internet_address_find_address(addr, "nowhere@here-1.com.au", &where) == 1);
-	check(camel_internet_address_find_address(addr, "nowhere@here-1 . com.au", &where) == 1);
-	check(camel_internet_address_find_address(addr, "nowhere@here-2 .com.au ", &where) == 2);
-	check(camel_internet_address_find_address(addr, " nowhere @here-3.com.au", &where) == 3);
-	check(camel_internet_address_find_address(addr, "nowhere@here-20.com.au ", &where) == -1);
-	check(camel_internet_address_find_address(addr, "", &where) == -1);
-	/*check(camel_internet_address_find_address(addr, NULL, &where) == -1);*/
-	camel_test_fatal();
-	pull();
-
-	camel_test_end();
-	camel_test_start("CamelInternetAddress, copy/cat/clone");
-
-	push("Test clone many");
-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));
-	test_address_compare(addr, addr2);
-	pull();
-
-	push("Test remove items");
-	camel_address_remove(CAMEL_ADDRESS(addr2), 0);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 9);
-	camel_address_remove(CAMEL_ADDRESS(addr2), 0);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 8);
-	camel_address_remove(CAMEL_ADDRESS(addr2), 5);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 7);
-	camel_address_remove(CAMEL_ADDRESS(addr2), 10);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 7);
-	camel_address_remove(CAMEL_ADDRESS(addr2), -1);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 0);
-	check_unref(addr2, 1);
-	pull();
-
-	push("Testing copy/cat");
-	push("clone + cat");
-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));
-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));
-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 10);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 20);
-	check_unref(addr2, 1);
-	pull();
-
-	push("cat + cat + copy");
-	addr2 = camel_internet_address_new();
-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));
-	test_address_compare(addr, addr2);
-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));
-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 10);
-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 20);
-	camel_address_copy(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));
-	test_address_compare(addr, addr2);
-	check_unref(addr2, 1);
-	pull();
-
-	push("copy");
-	addr2 = camel_internet_address_new();
-	camel_address_copy(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));
-	test_address_compare(addr, addr2);
-	check_unref(addr2, 1);
-	pull();
-
-	pull();
-
-	check_unref(addr, 1);
-
-	camel_test_end();
-
-	camel_test_start("CamelInternetAddress, I18N");
-
-	for (i=0;i<ARRAY_LEN(test_lines);i++) {
-		push("Testing text line %d (%s) '%s'", i, test_lines[i].type, test_lines[i].line);
-
-		addr = camel_internet_address_new();
-
-		/* first, convert to api format (utf-8) */
-		charset = test_lines[i].type;
-		name = to_utf8(test_lines[i].line, charset);
-
-		push("Address setup");
-		camel_internet_address_add(addr, name, "nobody@nowhere.com");
-		check(camel_internet_address_get(addr, 0, &real, &where) == TRUE);
-		check_msg(string_equal(name, real), "name = '%s' real = '%s'", name, real);
-		check(strcmp(where, "nobody@nowhere.com") == 0);
-		test_free(name);
-
-		check(camel_internet_address_get(addr, 1, &real, &where) == FALSE);
-		check(camel_address_length(CAMEL_ADDRESS(addr)) == 1);
-		pull();
-
-		push("Address encode/decode");
-		enc = camel_address_encode(CAMEL_ADDRESS(addr));
-
-		addr2 = camel_internet_address_new();
-		check(camel_address_decode(CAMEL_ADDRESS(addr2), enc) == 1);
-		check(camel_address_length(CAMEL_ADDRESS(addr2)) == 1);
-
-		enc2 = camel_address_encode(CAMEL_ADDRESS(addr2));
-		check_msg(string_equal(enc, enc2), "enc = '%s' enc2 = '%s'", enc, enc2);
-		test_free(enc2);
-
-		push("Compare addresses");
-		test_address_compare(addr, addr2);
-		pull();
-		check_unref(addr2, 1);
-		test_free(enc);
-		pull();
-
-		/* FIXME: format/unformat arne't guaranteed to be reversible, at least at the moment */
-		camel_test_nonfatal("format/unformat not (yet) reversible for all cases");
-
-		push("Address format/unformat");
-		format = camel_address_format(CAMEL_ADDRESS(addr));
-
-		addr2 = camel_internet_address_new();
-		check(camel_address_unformat(CAMEL_ADDRESS(addr2), format) == 1);
-		check(camel_address_length(CAMEL_ADDRESS(addr2)) == 1);
-
-		format2 = camel_address_format(CAMEL_ADDRESS(addr2));
-		check_msg(string_equal(format, format2), "format = '%s\n\tformat2 = '%s'", format, format2);
-		test_free(format2);
-
-		/* currently format/unformat doesn't handle ,'s and other special chars at all */
-		if (camel_address_length(CAMEL_ADDRESS(addr2)) == 1) {
-			push("Compare addresses");
-			test_address_compare(addr, addr2);
-			pull();
-		}
-
-		test_free(format);
-		pull();
-
-		camel_test_fatal();
-
-		check_unref(addr2, 1);
-
-		check_unref(addr, 1);
-		pull();
-
-	}
-
-	camel_test_end();
-
-	camel_test_start("CamelInternetAddress, I18N decode");
-
-	for (i=0;i<ARRAY_LEN(test_address);i++) {
-		push("Testing address line %d '%s'", i, test_address[i].addr);
-
-		addr = camel_internet_address_new();
-		push("checking decoded");
-		check(camel_address_decode(CAMEL_ADDRESS(addr), test_address[i].addr) == test_address[i].count);
-		format = camel_address_format(CAMEL_ADDRESS(addr));
-		check(strcmp(format, test_address[i].utf8) == 0);
-		test_free(format);
-		pull();
-		
-		push("Comparing re-encoded output");
-		addr2 = CAMEL_INTERNET_ADDRESS(camel_internet_address_new());
-		enc = camel_address_encode(CAMEL_ADDRESS(addr));
-		check_msg(camel_address_decode(CAMEL_ADDRESS(addr2), enc) == test_address[i].count, "enc = '%s'", enc);
-		test_free(enc);
-		test_address_compare(addr, addr2);
-		check_unref(addr2, 1);
-		pull();
-
-		check_unref(addr, 1);
-
-		pull();
-	}
-
-	camel_test_end();
-
-	/* FIXME: Add test of decoding of broken addresses */
-
-	return 0;
-}
-
-
diff --git a/camel/tests/message/test3.c b/camel/tests/message/test3.c
deleted file mode 100644
index 0a9683d146..0000000000
--- a/camel/tests/message/test3.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-  Multipart.
-*/
-
-#include "camel-test.h"
-#include "messages.h"
-
-/* for stat */
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include "camel/camel-multipart.h"
-
-int main(int argc, char **argv)
-{
-	CamelMimeMessage *msg, *msg2, *msg3;
-	CamelMultipart *mp, *mp2;
-	CamelMimePart *part, *part2, *part3;
-
-	camel_test_init(argc, argv);
-
-	camel_test_start("multipart message");
-
-	push("building message");
-	msg = test_message_create_simple();
-	mp = camel_multipart_new();
-
-	/* Hrm, this should be able to set its own boundary, no? */
-	camel_multipart_set_boundary(mp, "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D");
-	check(strcmp(camel_multipart_get_boundary(mp), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
-
-	camel_medium_set_content_object((CamelMedium *)msg, (CamelDataWrapper *)mp);
-	check(camel_multipart_get_number(mp) == 0);
-	check(camel_multipart_get_part(mp, 0) == NULL);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	push("adding/removing parts");
-	part = camel_mime_part_new();
-	test_message_set_content_simple(part, 0, "text/plain", "content part 1", strlen("content part 1"));
-	camel_multipart_add_part(mp, part);
-	check(CAMEL_OBJECT(part)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 1);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	camel_multipart_remove_part(mp, part);
-	check(CAMEL_OBJECT(part)->ref_count == 1);
-	check(camel_multipart_get_number(mp) == 0);
-	check(camel_multipart_get_part(mp, 0) == NULL);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	camel_multipart_add_part_at(mp, part, 0);
-	check(CAMEL_OBJECT(part)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 1);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	check(camel_multipart_remove_part_at(mp, 1) == NULL);
-	check(CAMEL_OBJECT(part)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 1);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	check(camel_multipart_remove_part_at(mp, 0) == part);
-	check(CAMEL_OBJECT(part)->ref_count == 1);
-	check(camel_multipart_get_number(mp) == 0);
-	check(camel_multipart_get_part(mp, 0) == NULL);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	camel_multipart_add_part(mp, part);
-	check(CAMEL_OBJECT(part)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 1);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == NULL);
-
-	part2 = camel_mime_part_new();
-	test_message_set_content_simple(part2, 0, "text/plain", "content part 2", strlen("content part 2"));
-	camel_multipart_add_part(mp, part2);
-	check(CAMEL_OBJECT(part2)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 2);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == part2);
-
-	part3 = camel_mime_part_new();
-	test_message_set_content_simple(part3, 0, "text/plain", "content part 3", strlen("content part 3"));
-	camel_multipart_add_part_at(mp, part3, 1);
-	check(CAMEL_OBJECT(part3)->ref_count == 2);
-	check(camel_multipart_get_number(mp) == 3);
-	check(camel_multipart_get_part(mp, 0) == part);
-	check(camel_multipart_get_part(mp, 1) == part3);
-	check(camel_multipart_get_part(mp, 2) == part2);
-	pull();
-
-	push("save message to test3.msg");
-	unlink("test3.msg");
-	test_message_write_file(msg, "test3.msg");
-	pull();
-	
-	push("read from test3.msg");
-	msg2 = test_message_read_file("test3.msg");
-	pull();
-
-	push("compre content of multipart");
-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);
-	check(mp2 != NULL);
-	check(CAMEL_IS_MULTIPART(mp2));
-	check(camel_multipart_get_number(mp2) == 3);
-
-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
-	check(mp2->preface == NULL || strlen(mp2->preface) == 0);
-
-	/* FIXME */
-	camel_test_nonfatal("postface may gain a single \\n?");
-	check_msg(mp2->postface == NULL || strlen(mp2->postface) == 0, "postface: '%s'", mp2->postface);
-	camel_test_fatal();
-
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
-				     "content part 1", strlen("content part 1"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
-				     "content part 3", strlen("content part 3"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
-				     "content part 2", strlen("content part 2"));
-	pull();
-
-	push("writing again, & re-reading");
-	unlink("test3-2.msg");
-	test_message_write_file(msg2, "test3-2.msg");
-	msg3 = test_message_read_file("test3-2.msg");
-
-	push("comparing again");
-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg3);
-	check(mp2 != NULL);
-	check(CAMEL_IS_MULTIPART(mp2));
-	check(camel_multipart_get_number(mp2) == 3);
-
-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
-	check(mp2->preface == NULL || strlen(mp2->preface) == 0);
-
-	/* FIXME */
-	camel_test_nonfatal("postface may gain a single \\n?");
-	check_msg(mp2->postface == NULL || strlen(mp2->postface) == 0, "postface: '%s'", mp2->postface);
-	camel_test_fatal();
-
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
-				     "content part 1", strlen("content part 1"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
-				     "content part 3", strlen("content part 3"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
-				     "content part 2", strlen("content part 2"));
-	pull();
-	pull();
-
-	check_unref(msg2, 1);
-	check_unref(msg3, 1);
-
-	push("testing pre/post text");
-	camel_multipart_set_preface(mp, "pre-text\nLines.");
-	camel_multipart_set_postface(mp, "post-text, no lines.\nOne line.\n");
-
-	check(strcmp(mp->preface, "pre-text\nLines.") == 0);
-	check(strcmp(mp->postface, "post-text, no lines.\nOne line.\n") == 0);
-
-	push("writing /re-reading");
-	unlink("test3-3.msg");
-	test_message_write_file(msg, "test3-3.msg");
-	msg2 = test_message_read_file("test3-3.msg");
-
-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);
-	check(mp2 != NULL);
-	check(CAMEL_IS_MULTIPART(mp2));
-	check(camel_multipart_get_number(mp2) == 3);
-
-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);
-	check(strcmp(mp2->preface, "pre-text\nLines.") == 0);
-	check(strcmp(mp2->postface, "post-text, no lines.\nOne line.\n") == 0);
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),
-					   "content part 1", strlen("content part 1"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),
-				     "content part 3", strlen("content part 3"));
-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),
-				     "content part 2", strlen("content part 2"));
-	pull();
-	check_unref(msg2, 1);
-	pull();
-
-	check_unref(msg, 1);
-	check_unref(mp, 1);
-	check_unref(part, 1);
-	check_unref(part2, 1);
-	check_unref(part3, 1);
-
-	camel_test_end();
-
-	return 0;
-}
diff --git a/camel/tests/stream/.cvsignore b/camel/tests/stream/.cvsignore
deleted file mode 100644
index 3fa8afaa38..0000000000
--- a/camel/tests/stream/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am
deleted file mode 100644
index d16f8aaa55..0000000000
--- a/camel/tests/stream/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
-	-I$(includedir) \
-	-I$(top_srcdir)/camel/tests/lib \
-	-DG_LOG_DOMAIN=\"evolution-tests\"	
-
-LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-check_PROGRAMS =  	\
-	test1 test2 test3
-
-TESTS = test1 test2 test3
-
-
-
diff --git a/camel/tests/stream/README b/camel/tests/stream/README
deleted file mode 100644
index 8ca6a9602d..0000000000
--- a/camel/tests/stream/README
+++ /dev/null
@@ -1,4 +0,0 @@
-
-test1	camelstreamfs, creating, read/write, eos, refcounting
-test2	camelstreammem, creating, read/write, eos, refcounting
-test3	camelseekablesubstream
diff --git a/camel/tests/stream/test1.c b/camel/tests/stream/test1.c
deleted file mode 100644
index 452d45274f..0000000000
--- a/camel/tests/stream/test1.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-  test ... camelstreamfs */
-
-#include "camel-test.h"
-#include "streams.h"
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "camel/camel-stream-fs.h"
-
-int main(int argc, char **argv)
-{
-	CamelSeekableStream *ss = NULL;
-	int i;
-	int fd = -1;
-	struct stat st;
-	int size;
-	char buffer[1024];
-
-	camel_test_init(argc, argv);
-
-	camel_test_start("CamelStream fs, open, seek, read, write, eos");
-	for (i=0;i<2;i++) {
-
-		(void)unlink("stream.txt");
-
-		push("trying to open a nonexistant stream, method %d", i);
-		switch(i) {
-		case 0:
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);
-			break;
-		case 1:
-			fd = open("stream.txt", O_RDWR, 0);
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);
-			break;
-		}
-		check(ss == NULL && errno == ENOENT);
-		check(stat("stream.txt", &st) == -1 && errno == ENOENT);
-		pull();
-
-		push("Creating stream using method %d", i);
-		switch(i) {
-		case 0:
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);
-			fd = ((CamelStreamFs *)ss)->fd;
-			break;
-		case 1:
-			fd = open("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);
-			break;
-		}
-		check(ss != NULL);
-		check(stat("stream.txt", &st) == 0 && (st.st_mode&0777) == 0600 && S_ISREG(st.st_mode) && st.st_size == 0);
-		pull();
-
-		test_stream_seekable_writepart(ss);
-		test_stream_seekable_readpart(ss);
-
-		push("getting filesize");
-		check(stat("stream.txt", &st) == 0 && (st.st_mode&0777) == 0600 && S_ISREG(st.st_mode));
-		size = st.st_size;
-		pull();
-
-		push("checking close closes");
-		check_unref(ss, 1);
-		check(close(fd) == -1);
-		pull();
-
-		push("re-opening stream");
-		switch(i) {
-		case 0:
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);
-			fd = ((CamelStreamFs *)ss)->fd;
-			break;
-		case 1:
-			fd = open("stream.txt", O_RDWR, 0);
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);
-			break;
-		}
-		check(ss != NULL);
-		check(stat("stream.txt", &st) == 0 && (st.st_mode&0777) == 0600 && S_ISREG(st.st_mode) && st.st_size == size);
-
-		test_stream_seekable_readpart(ss);
-
-		check_unref(ss, 1);
-		check(close(fd) == -1);
-		pull();
-
-		push("re-opening stream with truncate");
-		switch(i) {
-		case 0:
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_TRUNC, 0);
-			fd = ((CamelStreamFs *)ss)->fd;
-			break;
-		case 1:
-			fd = open("stream.txt", O_RDWR|O_TRUNC, 0);
-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);
-			break;
-		}
-		check(ss != NULL);
-		check(stat("stream.txt", &st) == 0 && (st.st_mode&0777) == 0600 && S_ISREG(st.st_mode) && st.st_size == 0);
-
-		/* read has to return 0 before eos is set */
-		check(camel_stream_read(CAMEL_STREAM(ss), buffer, 1) == 0);
-		check(camel_stream_eos(CAMEL_STREAM(ss)));
-
-		check_unref(ss, 1);
-		check(close(fd) == -1);
-		pull();
-		
-		(void)unlink("stream.txt");
-	}
-
-	camel_test_end();
-
-	return 0;
-}
diff --git a/camel/tests/stream/test2.c b/camel/tests/stream/test2.c
deleted file mode 100644
index 02ad88e95c..0000000000
--- a/camel/tests/stream/test2.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  test ... camelstreammem */
-
-#include "camel-test.h"
-#include "streams.h"
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "camel/camel-stream-mem.h"
-
-int main(int argc, char **argv)
-{
-	CamelSeekableStream *ss = NULL;
-	int i;
-	int fd = -1;
-	struct stat st;
-	int size;
-	char buffer[1024];
-	GByteArray *ba;
-
-	camel_test_init(argc, argv);
-
-	camel_test_start("CamelStream mem, create, seek, read, write, eos");
-	for (i=0;i<3;i++) {
-
-		push("Creating stream using method %d", i);
-		switch(i) {
-		case 0:
-			ss = (CamelSeekableStream *)camel_stream_mem_new();
-			break;
-		case 1:
-			ba = g_byte_array_new();
-			ss = (CamelSeekableStream *)camel_stream_mem_new_with_byte_array(ba);
-			break;
-		case 2:
-			ss = (CamelSeekableStream *)camel_stream_mem_new_with_buffer("", 0);
-			break;
-		}
-		check(ss != NULL);
-
-		test_stream_seekable_writepart(ss);
-		test_stream_seekable_readpart(ss);
-
-		check_unref(ss, 1);
-		pull();
-	}
-
-	camel_test_end();
-
-	return 0;
-}
diff --git a/camel/tests/stream/test3.c b/camel/tests/stream/test3.c
deleted file mode 100644
index b870a7773e..0000000000
--- a/camel/tests/stream/test3.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-  test ... camelseekablesubstream */
-
-#include "camel-test.h"
-#include "streams.h"
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-fs.h"
-#include "camel/camel-seekable-substream.h"
-
-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
-
-struct {
-	off_t lower, upper;
-} ranges[] = {
-	{ 3, 10241 },
-	{ 0, 1024 },
-	{ 0, 0 },
-	{ 0, 1 },
-	{ 0, 2 },
-	{ 0, 3 },
-	{ 0, 7 },
-	{ 1, 8 },
-	{ 1, 9 },
-	{ 10245, 10300 },
-	{ 0, CAMEL_STREAM_UNBOUND },
-/*	{ 1, CAMEL_STREAM_UNBOUND },
-	{ 2, CAMEL_STREAM_UNBOUND },
-	{ 3, CAMEL_STREAM_UNBOUND },  these take too long to run
-	{ 7, CAMEL_STREAM_UNBOUND },*/
-	{ 10245, CAMEL_STREAM_UNBOUND },
-};
-
-int main(int argc, char **argv)
-{
-	CamelSeekableStream *ss = NULL;
-	int i, j;
-	CamelSeekableSubstream *sus, *sus2;
-
-	camel_test_init(argc, argv);
-
-	camel_test_start("CamelSeekableSubstream, mem backing");
-	for (j=0;j<SEEKABLE_SUBSTREAM_WAYS;j++) {
-		push("testing writing method %d", j);
-		ss = (CamelSeekableStream *)camel_stream_mem_new();
-		check(ss != NULL);
-		for (i=0;i<ARRAY_LEN(ranges);i++) {
-			push("stream subrange %d-%d", ranges[i].lower, ranges[i].upper);
-			sus = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);
-			check(sus != NULL);
-			
-			test_seekable_substream_writepart((CamelStream *)sus, j);
-			test_seekable_substream_readpart((CamelStream *)sus);
-			
-			sus2 = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);
-			check(sus2 != NULL);
-			test_seekable_substream_readpart((CamelStream *)sus2);
-			
-			check_unref(sus, 1);
-			check_unref(sus2, 1);
-			pull();
-		}
-		check_unref(ss, 1);
-		pull();
-	}
-
-	camel_test_end();
-
-	(void)unlink("stream.txt");
-
-	camel_test_start("CamelSeekableSubstream, file backing");
-	for (j=0;j<SEEKABLE_SUBSTREAM_WAYS;j++) {
-		push("testing writing method %d", j);
-		ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_CREAT|O_TRUNC, 0600);
-		check(ss != NULL);
-		for (i=0;i<ARRAY_LEN(ranges);i++) {
-			push("stream subrange %d-%d", ranges[i].lower, ranges[i].upper);
-			sus = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);
-			check(sus != NULL);
-
-			test_seekable_substream_writepart((CamelStream *)sus, j);
-			test_seekable_substream_readpart((CamelStream *)sus);
-
-			sus2 = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);
-			check(sus2 != NULL);
-			test_seekable_substream_readpart((CamelStream *)sus2);
-			
-			check_unref(sus, 1);
-			check_unref(sus2, 1);
-			pull();
-		}
-		check_unref(ss, 1);
-		(void)unlink("stream.txt");
-		pull();
-	}
-
-	camel_test_end();
-
-	return 0;
-}
diff --git a/cmdline/.cvsignore b/cmdline/.cvsignore
deleted file mode 100644
index b29b403eec..0000000000
--- a/cmdline/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-compose
diff --git a/cmdline/Makefile.am b/cmdline/Makefile.am
deleted file mode 100644
index 6a888e7468..0000000000
--- a/cmdline/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-man_MANS = compose.1
-
-bin_PROGRAMS = compose
-
-INCLUDES = 			\
-	-I$(top_builddir)	\
-	$(COMPOSE_CFLAGS) 	\
-	$(INTLLIBS)
-
-compose_LDADD =				\
-	../composer/libcomposer.a	\
-	$(COMPOSE_LIBS)
-
-compose_SOURCES =	\
-	compose.c	\
-	../composer/Composer-stubs.c \
-	../composer/Composer-common.c
diff --git a/cmdline/compose.1 b/cmdline/compose.1
deleted file mode 100644
index 946eb01eaa..0000000000
--- a/cmdline/compose.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\" 
-.\" Evolution's compose command line utility manual page.
-.\" (C) Ximian, Inc. http://www.ximian.com
-.\"
-.\" Author:
-.\"   Miguel de Icaza (miguel@kernel.org)
-.\"
-.TH Evolution 1 "Evolution 1.0"
-.SH NAME
-compose \- invokes the Evolution Mail composer tool.
-.SH SYNOPSIS
-.PP
-.B compose 
-[\-\-subject SUBJECT] [\-s SUBJECT] [\-\-cc LIST] [\-c LIST] [\-\-bcc
-LIST] [\-b LIST] [\-\-body FNAME] to...
-.SH DESCRIPTION
-The 
-.I compose
-program is a command line tool that can be used to invoke the
-Evolution Mail composer directly from the command line, and allows for
-simple configuration trough a number of flags.
-.SH OPTIONS
-The following options are supported
-.TP
-.I \-\-subject SUBJECT, \-s SUBJECT
-Both forms are used to specify the subject to be used in the mail
-message.
-.TP
-.I \-\-cc LIST, \-c LIST
-Both forms are used to specify a comma separated list of addresses to
-CC the message to.
-.TP
-.I \-\-bcc LIST, \-b LIST
-Both forms are used to specify a comma separated list of addresses
-that this message will be blind copied to.
-.TP
-.I \-\-body FNAME
-Loads the filename FNAME as the contents for the Evolution Mail
-composer. 
-.SH OTHERS
-If these options are not enough, you might want to look into accessing
-the Evolution Mail Composer directly by using CORBA.
-.SH INTERFACES
-The Evolution Mail Composer supports the
-IDL:GNOME/Evolution/Composer:1.0 interface and is implemented as the
-component OAFIID:GNOME_Evolution_Mail_Composer.
-.SH SEE ALSO
-Evolution-Composer.idl
-.SH BUGS
-If you find bugs in the Evolution groupware suite, please report these
-using the \fIbug-buddy\fP program in the GNOME distribution.
\ No newline at end of file
diff --git a/cmdline/compose.c b/cmdline/compose.c
deleted file mode 100644
index 95a39a3dec..0000000000
--- a/cmdline/compose.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * compose.c: A commnand line tool to invoke the Evolution mail composer
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include "composer/Composer.h"
-
-static char *subject;
-static char *cc;
-static char *bcc;
-static char *body;
-static char *to = "";
-
-const struct poptOption compose_popt_options [] = {
-	{ "subject", 's', POPT_ARG_STRING,
-	  &subject,  0,   N_("Subject for the mail message"), N_("SUBJECT") },
-	{ "cc",      'c', POPT_ARG_STRING,
-	  &cc,       0,   N_("List of people that will be Carbo Copied"), N_("CC-LIST") },
-	{ "bcc",     'b', POPT_ARG_STRING,
-	  &bcc,      0,   N_("List of people to Blind Carbon Copy this mail to"), N_("BCC-LIST") },
-	{ "body",    0,   POPT_ARG_STRING,
-	  &body,     0,   N_("Filename containing the body of the message"), N_("BODY-FILE") },
-	{ NULL,      0, 0, NULL, 0 }
-};
-
-static void
-error (const char *msg)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_message_box_new (
-		msg,
-		GNOME_MESSAGE_BOX_ERROR,
-		GNOME_STOCK_BUTTON_OK,
-		NULL);
-	
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	exit (1);
-	g_assert_not_reached ();
-}
-
-GNOME_Evolution_Composer_RecipientList *
-make_list (char *str)
-{
-	GNOME_Evolution_Composer_RecipientList *list;
-	char *p;
-	int count = 0;
-
-	if (str == NULL)
-		str = "";
-	
-	list = GNOME_Evolution_Composer_RecipientList__alloc();
-
-	if (*str)
-		count = 1;
-
-	for (p = str; *p; p++){
-		if (*p == ',')
-			count++;
-	}
-	list->_maximum = count;
-	list->_length = count;
-	list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (count);
-	
-	for (count = 0; (p = strtok (str, ",")) != NULL; count++){
-		GNOME_Evolution_Composer_Recipient *x;
-
-		x = GNOME_Evolution_Composer_Recipient__alloc ();
-
-		list->_buffer [count].name = CORBA_string_dup ("");
-		list->_buffer [count].address = CORBA_string_dup (p);
-		count++;
-		str = NULL;
-	}
-
-	return list;
-}
-
-gint
-do_launch (void)
-{
-	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	GNOME_Evolution_Composer composer;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	composer = bonobo_get_object (
-		"OAFIID:GNOME_Evolution_Mail_Composer",
-		"GNOME/Evolution/Composer", &ev);
-	CORBA_exception_free (&ev);
-
-	if (composer == CORBA_OBJECT_NIL)
-		error (_("It was not possible to start up the Evolution Mail Composer"));
-
-	to_list = make_list (to);
-	cc_list = make_list (cc);
-	bcc_list = make_list (bcc);
-
-	if (subject == NULL)
-		subject = "";
-	
-	GNOME_Evolution_Composer_setHeaders (composer, to_list, cc_list, bcc_list, subject, &ev);
-	GNOME_Evolution_Composer_show (composer, &ev);
-
-	return FALSE;
-}
-
-int 
-main (int argc, char *argv [])
-{
-	poptContext ctxt = NULL;
-	CORBA_ORB orb;
-	
-	gnomelib_register_popt_table (oaf_popt_options, _("Oaf options"));
-	gnome_init_with_popt_table ("Compose", "1.0", argc, argv,
-				    compose_popt_options, 0, &ctxt);
-
-	orb = oaf_init (argc, argv);
-	if (bonobo_init (NULL, NULL, NULL) == FALSE)
-		error (_("It was not possible to initialize the Bonobo component system"));
-
-	if (ctxt){
-		const char **to_args = NULL;
-		GString *to_str = g_string_new ("");
-		int i;
-		
-		to_args = poptGetArgs (ctxt);
-
-		if (to_args){
-			for (i = 0; to_args [i]; i++) {
-				if (i > 1)
-					g_string_append_c (to_str, ',');
-				
-				g_string_append (to_str, to_args [i]);
-			}
-		}
-		to = to_str->str;
-	}
-
-	gtk_idle_add (GTK_SIGNAL_FUNC (do_launch), NULL);
-	
-	bonobo_main ();
-	
-	return 0;
-}
diff --git a/composer/.cvsignore b/composer/.cvsignore
deleted file mode 100644
index ec7a9d7288..0000000000
--- a/composer/.cvsignore
+++ /dev/null
@@ -1,20 +0,0 @@
-.deps
-.libs
-evolution-msg-composer
-Makefile
-Makefile.in
-*.lo
-*.la
-Composer-stubs.c
-Composer-skels.c
-Composer-common.c
-Composer.h
-Editor-stubs.c
-Editor-skels.c
-Editor.h
-Editor-common.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
-HTMLEditor*.[ch]
diff --git a/composer/ChangeLog b/composer/ChangeLog
deleted file mode 100644
index d3aad74928..0000000000
--- a/composer/ChangeLog
+++ /dev/null
@@ -1,1415 +0,0 @@
-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 a6cb35c037..0000000000
--- a/composer/Composer.idl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <Evolution-Addressbook-SelectNames.idl>
-#include <Evolution-Composer.idl>
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
deleted file mode 100644
index 3fcda3873e..0000000000
--- a/composer/Evolution-Composer.idl
+++ /dev/null
@@ -1,96 +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@helixcode.com>
- * 
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	
-	interface Composer : Bonobo::Unknown {
-		struct Recipient {
-			string name;	/* UTF-8 */
-			string address;
-		};
-		typedef sequence<Recipient> RecipientList;
-
-		/**
-		 * setHeaders:
-		 * @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.
-		 **/
-		void setHeaders (in RecipientList to, in RecipientList cc,
-				 in RecipientList bcc, in string subject);
-
-		/**
-		 * setBodyText:
-		 * @body: the body
-		 *
-		 * Sets the text in the body of the composer to
-		 * the given UTF-8 plain text.
-		 **/
-		void setBodyText (in string body);
-
-		/**
-		 * 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 string data);
-
-
-		/**
-		 * show:
-		 *
-		 * Shows the composer and lets the user edit things
-		 * and send the message.
-		 **/
-		void show ();
-	};
-};
-};
diff --git a/composer/Makefile.am b/composer/Makefile.am
deleted file mode 100644
index db5c56dc26..0000000000
--- a/composer/Makefile.am
+++ /dev/null
@@ -1,89 +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
-
-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
-
-$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(selectnamesdir)  $(srcdir)/Composer.idl
-
-Editor-commmon.c:	$(GTK_HTML_EDITOR_IDL)
-
-$(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL)
-	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
-
-##
-
-idldir = $(datadir)/idl
-idl_DATA = $(IDLS)
-
-gladedir = $(datadir)/evolution/glade
-
-glade_DATA =					\
-	e-msg-composer-attachment.glade
-
-libcomposerincludedir = $(includedir)/composer
-
-noinst_LIBRARIES = libcomposer.a
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_builddir)/widgets					\
-	-I$(top_srcdir)/camel					 	\
-	-I$(top_builddir)/camel					 	\
-	-I$(top_builddir)/addressbook/gui/component/select-names	\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	$(GNOME_INCLUDEDIR)						\
-	$(BONOBO_GNOME_CFLAGS)						\
-	$(GTKHTML_CFLAGS)						\
-	$(UNICODE_CFLAGS)						\
-	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
-	-DE_GLADEDIR=\"$(gladedir)\"					\
-	-DG_LOG_DOMAIN=\"composer\"
-
-libcomposer_a_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			\
-	e-icon-list.c				\
-	e-icon-list.h				\
-	evolution-composer.c			\
-	evolution-composer.h			\
-	listener.c				\
-	listener.h
-
-EXTRA_DIST =					\
-	$(glade_DATA)				\
-	$(IDLS)					\
-	bad-icon.xpm
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(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-icon-list.c b/composer/e-icon-list.c
deleted file mode 100644
index d71ecc262f..0000000000
--- a/composer/e-icon-list.c
+++ /dev/null
@@ -1,2667 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
-  @NOTATION@
- */
-
-/*
- * GnomeIconList widget - scrollable icon list
- *
- * Authors:
- *    Federico Mena <federico@ximian.com>
- *    Miguel de Icaza <miguel@ximian.com>
- *
- * Rewrote from scratch from the code written by Federico Mena
- * <federico@ximian.com> to be based on a GnomeCanvas, and
- * to support banding selection and allow inline icon renaming.
- *
- * Redone somewhat by Elliot to support gdk-pixbuf, and to use GArray instead of
- * GList for item storage.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include "e-icon-list.h"
-#include <libgnomeui/gnome-icon-item.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-#include "bad-icon.xpm"
-
-/* Aliases to minimize screen use in my laptop */
-#define EIL(x)       E_ICON_LIST(x)
-#define EIL_CLASS(x) E_ICON_LIST_CLASS(x)
-#define IS_EIL(x)    E_IS_ICON_LIST(x)
-
-typedef EIconList Eil;
-typedef EIconListClass EilClass;
-
-
-/* default spacings */
-#define DEFAULT_ROW_SPACING  4
-#define DEFAULT_COL_SPACING  2
-#define DEFAULT_TEXT_SPACING 2
-#define DEFAULT_ICON_BORDER  2
-
-/* Autoscroll timeout in milliseconds */
-#define SCROLL_TIMEOUT 30
-
-
-/* Signals */
-enum {
-	SELECT_ICON,
-	UNSELECT_ICON,
-	TEXT_CHANGED,
-	LAST_SIGNAL
-};
-
-typedef enum {
-	SYNC_INSERT,
-	SYNC_REMOVE
-} SyncType;
-
-enum {
-	ARG_0,
-};
-
-static guint eil_signals[LAST_SIGNAL] = { 0 };
-
-
-static GnomeCanvasClass *parent_class;
-
-
-/* Icon structure */
-typedef struct {
-	/* Icon image and text items */
-	GnomeCanvasPixbuf *image;
-	GnomeIconTextItem *text;
-
-	/* Filename of the icon file. */
-	gchar *icon_filename;
-
-	/* User data and destroy notify function */
-	gpointer data;
-	GtkDestroyNotify destroy;
-
-	/* ID for the text item's event signal handler */
-	guint text_event_id;
-
-	/* Whether the icon is selected, and temporary storage for rubberband
-         * selections.
-	 */
-	guint selected : 1;
-	guint tmp_selected : 1;
-} Icon;
-
-/* A row of icons */
-typedef struct {
-	GList *line_icons;
-	gint16 y;
-	gint16 icon_height, text_height;
-} IconLine;
-
-/* Private data of the EIconList structure */
-struct _EIconListPrivate {
-	/* List of icons */
-	GArray *icon_list;
-
-	/* List of rows of icons */
-	GList *lines;
-
-	/* Separators used to wrap the text below icons */
-	char *separators;
-
-	Icon *last_selected_icon;
-
-	/* Rubberband rectangle */
-	GnomeCanvasItem *sel_rect;
-
-	/* Saved event for a pending selection */
-	GdkEvent select_pending_event;
-
-	/* Max of the height of all the icon rows and window height */
-	int total_height;
-
-	/* Selection mode */
-	GtkSelectionMode selection_mode;
-
-	/* A list of integers with the indices of the currently selected icons */
-	GList *selection;
-
-	/* Number of icons in the list */
-	int icons;
-
-	/* Freeze count */
-	int frozen;
-
-	/* Width allocated for icons */
-	int icon_width;
-
-	/* Spacing values */
-	int row_spacing;
-	int col_spacing;
-	int text_spacing;
-	int icon_border;
-
-	/* Index and pointer to last selected icon */
-	int last_selected_idx;
-
-	/* Timeout ID for autoscrolling */
-	guint timer_tag;
-
-	/* Change the adjustment value by this amount when autoscrolling */
-	int value_diff;
-
-	/* Mouse position for autoscrolling */
-	int event_last_x;
-	int event_last_y;
-
-	/* Selection start position */
-	int sel_start_x;
-	int sel_start_y;
-
-	/* Modifier state when the selection began */
-	guint sel_state;
-
-	/* Whether the icon texts are editable */
-	guint is_editable : 1;
-
-	/* Whether the icon texts need to be copied */
-	guint static_text : 1;
-
-	/* Whether the icons need to be laid out */
-	guint dirty : 1;
-
-	/* Whether the user is performing a rubberband selection */
-	guint selecting : 1;
-
-	/* Whether editing an icon is pending after a button press */
-	guint edit_pending : 1;
-
-	/* Whether selection is pending after a button press */
-	guint select_pending : 1;
-
-	/* Whether the icon that is pending selection was selected to begin with */
-	guint select_pending_was_selected : 1;
-};
-
-
-static inline int
-icon_line_height (Eil *eil, IconLine *il)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	return il->icon_height + il->text_height + priv->row_spacing + priv->text_spacing;
-}
-
-static void
-icon_get_height (Icon *icon, int *icon_height, int *text_height)
-{
-	double d_icon_height;
-	gtk_object_get(GTK_OBJECT(icon->image), "height", &d_icon_height, NULL);
-	*icon_height = d_icon_height;
-	*text_height = icon->text->ti->height;
-}
-
-static int
-eil_get_items_per_line (Eil *eil)
-{
-	EIconListPrivate *priv;
-	int items_per_line;
-
-	priv = eil->_priv;
-
-	items_per_line = GTK_WIDGET (eil)->allocation.width / (priv->icon_width + priv->col_spacing);
-	if (items_per_line == 0)
-		items_per_line = 1;
-
-	return items_per_line;
-}
-
-/**
- * e_icon_list_get_items_per_line:
- * @eil: An icon list.
- *
- * Returns the number of icons that fit in a line or row.
- */
-int
-e_icon_list_get_items_per_line (EIconList *eil)
-{
-	g_return_val_if_fail (eil != NULL, 1);
-	g_return_val_if_fail (IS_EIL (eil), 1);
-
-	return eil_get_items_per_line (eil);
-}
-
-static void
-eil_place_icon (Eil *eil, Icon *icon, int x, int y, int icon_height)
-{
-	EIconListPrivate *priv;
-	int x_offset, y_offset;
-	double d_icon_image_height;
-	double d_icon_image_width;
-	int icon_image_height;
-	int icon_image_width;
-
-	priv = eil->_priv;
-
-	gtk_object_get(GTK_OBJECT(icon->image), "height", &d_icon_image_height, NULL);
-	icon_image_height = d_icon_image_height;
-	g_assert(icon_image_height != 0);
-	if (icon_height > icon_image_height)
-		y_offset = (icon_height - icon_image_height) / 2;
-	else
-		y_offset = 0;
-
-	gtk_object_get(GTK_OBJECT(icon->image), "width", &d_icon_image_width, NULL);
-	icon_image_width = d_icon_image_width;
-	g_assert(icon_image_width != 0);
-	if (priv->icon_width > icon_image_width)
-		x_offset = (priv->icon_width - icon_image_width) / 2;
-	else
-		x_offset = 0;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon->image),
-			       "x",  (double) (x + x_offset),
-			       "y",  (double) (y + y_offset),
-			       NULL);
-	gnome_icon_text_item_setxy (icon->text,
-				    x,
-				    y + icon_height + priv->text_spacing);
-}
-
-static void
-eil_layout_line (Eil *eil, IconLine *il)
-{
-	EIconListPrivate *priv;
-	GList *l;
-	int x;
-
-	priv = eil->_priv;
-
-	x = 0;
-	for (l = il->line_icons; l; l = l->next) {
-		Icon *icon = l->data;
-
-		eil_place_icon (eil, icon, x, il->y, il->icon_height);
-		x += priv->icon_width + priv->col_spacing;
-	}
-}
-
-static void
-eil_add_and_layout_line (Eil *eil, GList *line_icons, int y,
-			 int icon_height, int text_height)
-{
-	EIconListPrivate *priv;
-	IconLine *il;
-
-	priv = eil->_priv;
-
-	il = g_new (IconLine, 1);
-	il->line_icons = line_icons;
-	il->y = y;
-	il->icon_height = icon_height;
-	il->text_height = text_height;
-
-	eil_layout_line (eil, il);
-	priv->lines = g_list_append (priv->lines, il);
-}
-
-static void
-eil_relayout_icons_at (Eil *eil, int pos, int y)
-{
-	EIconListPrivate *priv;
-	int col, row, text_height, icon_height;
-	int items_per_line, n;
-	GList *line_icons;
-
-	priv = eil->_priv;
-	items_per_line = eil_get_items_per_line (eil);
-
-	col = row = text_height = icon_height = 0;
-	line_icons = NULL;
-
-	for (n = pos; n < priv->icon_list->len; n++) {
-		Icon *icon = g_array_index(priv->icon_list, Icon*, n);
-		int ih, th;
-
-		if (!(n % items_per_line)) {
-			if (line_icons) {
-				eil_add_and_layout_line (eil, line_icons, y,
-							 icon_height, text_height);
-				line_icons = NULL;
-
-				y += (icon_height + text_height
-				      + priv->row_spacing + priv->text_spacing);
-			}
-
-			icon_height = 0;
-			text_height = 0;
-		}
-
-		icon_get_height (icon, &ih, &th);
-
-		icon_height = MAX (ih, icon_height);
-		text_height = MAX (th, text_height);
-
-		line_icons = g_list_append (line_icons, icon);
-	}
-
-	if (line_icons)
-		eil_add_and_layout_line (eil, line_icons, y, icon_height, text_height);
-}
-
-static void
-eil_free_line_info (Eil *eil)
-{
-	EIconListPrivate *priv;
-	GList *l;
-
-	priv = eil->_priv;
-
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		g_list_free (il->line_icons);
-		g_free (il);
-	}
-
-	g_list_free (priv->lines);
-	priv->lines = NULL;
-	priv->total_height = 0;
-}
-
-static void
-eil_free_line_info_from (Eil *eil, int first_line)
-{
-	EIconListPrivate *priv;
-	GList *l, *ll;
-
-	priv = eil->_priv;
-	ll = g_list_nth (priv->lines, first_line);
-
-	for (l = ll; l; l = l->next) {
-		IconLine *il = l->data;
-
-		g_list_free (il->line_icons);
-		g_free (il);
-	}
-
-	if (priv->lines) {
-		if (ll->prev)
-			ll->prev->next = NULL;
-		else
-			priv->lines = NULL;
-	}
-
-	g_list_free (ll);
-}
-
-static void
-eil_layout_from_line (Eil *eil, int line)
-{
-	EIconListPrivate *priv;
-	GList *l;
-	int height;
-
-	priv = eil->_priv;
-
-	eil_free_line_info_from (eil, line);
-
-	height = 0;
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		height += icon_line_height (eil, il);
-	}
-
-	eil_relayout_icons_at (eil, line * eil_get_items_per_line (eil), height);
-}
-
-static void
-eil_layout_all_icons (Eil *eil)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	eil_free_line_info (eil);
-	eil_relayout_icons_at (eil, 0, 0);
-	priv->dirty = FALSE;
-}
-
-static void
-eil_scrollbar_adjust (Eil *eil)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	GList *l;
-	double wx, wy, wx1, wy1, wx2, wy2;
-	int height, step_increment;
-
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	height = 0;
-	step_increment = 0;
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		height += icon_line_height (eil, il);
-
-		if (l == priv->lines)
-			step_increment = height;
-	}
-
-	if (!step_increment)
-		step_increment = 10;
-
-	priv->total_height = MAX (height, GTK_WIDGET (eil)->allocation.height);
-
-	gnome_canvas_c2w (GNOME_CANVAS (eil), 0, 0, &wx1, &wy1);
-	gnome_canvas_c2w (GNOME_CANVAS (eil),
-			  GTK_WIDGET (eil)->allocation.width,
-			  priv->total_height,
-			  &wx2, &wy2);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil),
-					wx1, wy1, wx2, wy2);
-
-	wx = wy = 0;
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), 0, 0, &wx, &wy);
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	adj->upper = priv->total_height;
-	adj->step_increment = step_increment;
-	adj->page_increment = GTK_WIDGET (eil)->allocation.height;
-	adj->page_size = GTK_WIDGET (eil)->allocation.height;
-
-	if (wy > adj->upper - adj->page_size)
-		wy = adj->upper - adj->page_size;
-
-	adj->value = wy;
-
-	gtk_adjustment_changed (adj);
-}
-
-/* Emits the select_icon or unselect_icon signals as appropriate */
-static void
-emit_select (Eil *eil, int sel, int i, GdkEvent *event)
-{
-	gtk_signal_emit (GTK_OBJECT (eil),
-			 eil_signals[sel ? SELECT_ICON : UNSELECT_ICON],
-			 i,
-			 event);
-}
-
-static int
-eil_unselect_all (EIconList *eil, GdkEvent *event, gpointer keep)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-	int i, idx = 0;
-
-	g_return_val_if_fail (eil != NULL, 0);
-	g_return_val_if_fail (IS_EIL (eil), 0);
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		if (icon == keep)
-			idx = i;
-		else if (icon->selected)
-			emit_select (eil, FALSE, i, event);
-	}
-
-	return idx;
-}
-
-/**
- * e_icon_list_unselect_all:
- * @eil:   An icon list.
- *
- * Returns: the number of icons in the icon list
- */
-int
-e_icon_list_unselect_all (EIconList *eil)
-{
-	return eil_unselect_all (eil, NULL, NULL);
-}
-
-static void
-sync_selection (Eil *eil, int pos, SyncType type)
-{
-	GList *list;
-
-	for (list = eil->_priv->selection; list; list = list->next) {
-		if (GPOINTER_TO_INT (list->data) >= pos) {
-			int i = GPOINTER_TO_INT (list->data);
-
-			switch (type) {
-			case SYNC_INSERT:
-				list->data = GINT_TO_POINTER (i + 1);
-				break;
-
-			case SYNC_REMOVE:
-				list->data = GINT_TO_POINTER (i - 1);
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		}
-	}
-}
-
-static int
-eil_icon_to_index (Eil *eil, Icon *icon)
-{
-	EIconListPrivate *priv;
-	int n;
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++)
-		if (g_array_index(priv->icon_list, Icon*, n) == icon)
-			return n;
-
-	g_assert_not_reached ();
-	return -1; /* Shut up the compiler */
-}
-
-/* Event handler for icons when we are in SINGLE or BROWSE mode */
-static gint
-selection_one_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	GnomeIconTextItem *text;
-	int retval;
-
-	priv = eil->_priv;
-	retval = FALSE;
-
-	/* We use a separate variable and ref the object because it may be
-	 * destroyed by one of the signal handlers.
-	 */
-	text = icon->text;
-	gtk_object_ref (GTK_OBJECT (text));
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		priv->edit_pending = FALSE;
-		priv->select_pending = FALSE;
-
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		if (!icon->selected) {
-			eil_unselect_all (eil, NULL, NULL);
-			emit_select (eil, TRUE, idx, event);
-		} else {
-			if (priv->selection_mode == GTK_SELECTION_SINGLE
-			    && (event->button.state & GDK_CONTROL_MASK))
-				emit_select (eil, FALSE, idx, event);
-			else if (on_text && priv->is_editable && event->button.button == 1)
-				priv->edit_pending = TRUE;
-			else
-				emit_select (eil, TRUE, idx, event);
-		}
-
-		retval = TRUE;
-		break;
-
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		emit_select (eil, TRUE, idx, event);
-		retval = TRUE;
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-		}
-
-		retval = TRUE;
-		break;
-
-	default:
-		break;
-	}
-
-	/* If the click was on the text and we actually did something, stop the
-	 * icon text item's own handler from executing.
-	 */
-	if (on_text && retval)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");
-
-	gtk_object_unref (GTK_OBJECT (text));
-
-	return retval;
-}
-
-/* Handles range selections when clicking on an icon */
-static void
-select_range (Eil *eil, Icon *icon, int idx, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	int a, b;
-	Icon *i;
-
-	priv = eil->_priv;
-
-	if (priv->last_selected_idx == -1) {
-		priv->last_selected_idx = idx;
-		priv->last_selected_icon = icon;
-	}
-
-	if (idx < priv->last_selected_idx) {
-		a = idx;
-		b = priv->last_selected_idx;
-	} else {
-		a = priv->last_selected_idx;
-		b = idx;
-	}
-
-	for (; a <= b; a++) {
-		i = g_array_index(priv->icon_list, Icon*, a);
-
-		if (!i->selected)
-			emit_select (eil, TRUE, a, NULL);
-	}
-
-	/* Actually notify the client of the event */
-	emit_select (eil, TRUE, idx, event);
-}
-
-/* Handles icon selection for MULTIPLE or EXTENDED selection modes */
-static void
-do_select_many (Eil *eil, Icon *icon, int idx, GdkEvent *event, int use_event)
-{
-	EIconListPrivate *priv;
-	int range, additive;
-
-	priv = eil->_priv;
-
-	range = (event->button.state & GDK_SHIFT_MASK) != 0;
-	additive = (event->button.state & GDK_CONTROL_MASK) != 0;
-
-	if (!additive) {
-		if (icon->selected)
-			eil_unselect_all (eil, NULL, icon);
-		else
-			eil_unselect_all (eil, NULL, NULL);
-	}
-
-	if (!range) {
-		if (additive)
-			emit_select (eil, !icon->selected, idx, use_event ? event : NULL);
-		else
-			emit_select (eil, TRUE, idx, use_event ? event : NULL);
-
-		priv->last_selected_idx = idx;
-		priv->last_selected_icon = icon;
-	} else
-		select_range (eil, icon, idx, use_event ? event : NULL);
-}
-
-/* Event handler for icons when we are in MULTIPLE or EXTENDED mode */
-static gint
-selection_many_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	GnomeIconTextItem *text;
-	int retval;
-	int additive, range;
-	int do_select;
-
-	priv = eil->_priv;
-	retval = FALSE;
-
-	/* We use a separate variable and ref the object because it may be
-	 * destroyed by one of the signal handlers.
-	 */
-	text = icon->text;
-	gtk_object_ref (GTK_OBJECT (text));
-
-	range = (event->button.state & GDK_SHIFT_MASK) != 0;
-	additive = (event->button.state & GDK_CONTROL_MASK) != 0;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		priv->edit_pending = FALSE;
-		priv->select_pending = FALSE;
-
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		do_select = TRUE;
-
-		if (additive || range) {
-			if (additive && !range) {
-				priv->select_pending = TRUE;
-				priv->select_pending_event = *event;
-				priv->select_pending_was_selected = icon->selected;
-
-				/* We have to emit this so that the client will
-				 * know about the click.
-				 */
-				emit_select (eil, TRUE, idx, event);
-				do_select = FALSE;
-			}
-		} else if (icon->selected) {
-			priv->select_pending = TRUE;
-			priv->select_pending_event = *event;
-			priv->select_pending_was_selected = icon->selected;
-
-			if (on_text && priv->is_editable && event->button.button == 1)
-				priv->edit_pending = TRUE;
-
-			emit_select (eil, TRUE, idx, event);
-			do_select = FALSE;
-		}
-#if 0
-		} else if (icon->selected && on_text && priv->is_editable
-			   && event->button.button == 1) {
-			priv->edit_pending = TRUE;
-			do_select = FALSE;
-		}
-#endif
-
-		if (do_select)
-			do_select_many (eil, icon, idx, event, TRUE);
-
-		retval = TRUE;
-		break;
-
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		emit_select (eil, TRUE, idx, event);
-		retval = TRUE;
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if (priv->select_pending) {
-			icon->selected = priv->select_pending_was_selected;
-			do_select_many (eil, icon, idx, &priv->select_pending_event, FALSE);
-			priv->select_pending = FALSE;
-			retval = TRUE;
-		}
-
-		if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-			retval = TRUE;
-		}
-#if 0
-		if (priv->select_pending) {
-			icon->selected = priv->select_pending_was_selected;
-			do_select_many (eil, icon, idx, &priv->select_pending_event);
-			priv->select_pending = FALSE;
-			retval = TRUE;
-		} else if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-			retval = TRUE;
-		}
-#endif
-
-		break;
-
-	default:
-		break;
-	}
-
-	/* If the click was on the text and we actually did something, stop the
-	 * icon text item's own handler from executing.
-	 */
-	if (on_text && retval)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");
-
-	gtk_object_unref (GTK_OBJECT (text));
-
-	return retval;
-}
-
-/* Event handler for icons in the icon list */
-static gint
-icon_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	Icon *icon;
-	Eil *eil;
-	EIconListPrivate *priv;
-	int idx;
-	int on_text;
-
-	icon = data;
-	eil = EIL (item->canvas);
-	priv = eil->_priv;
-	idx = eil_icon_to_index (eil, icon);
-	on_text = item == GNOME_CANVAS_ITEM (icon->text);
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-		return selection_one_icon_event (eil, icon, idx, on_text, event);
-
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		return selection_many_icon_event (eil, icon, idx, on_text, event);
-
-	default:
-		g_assert_not_reached ();
-		return FALSE; /* Shut up the compiler */
-	}
-}
-
-/* Handler for the editing_started signal of an icon text item.  We block the
- * event handler so that it will not be called while the text is being edited.
- */
-static void
-editing_started (GnomeIconTextItem *iti, gpointer data)
-{
-	Icon *icon;
-
-	icon = data;
-	gtk_signal_handler_block (GTK_OBJECT (iti), icon->text_event_id);
-	eil_unselect_all (EIL (GNOME_CANVAS_ITEM (iti)->canvas), NULL, icon);
-}
-
-/* Handler for the editing_stopped signal of an icon text item.  We unblock the
- * event handler so that we can get events from it again.
- */
-static void
-editing_stopped (GnomeIconTextItem *iti, gpointer data)
-{
-	Icon *icon;
-
-	icon = data;
-	gtk_signal_handler_unblock (GTK_OBJECT (iti), icon->text_event_id);
-}
-
-static gboolean
-text_changed (GnomeCanvasItem *item, Icon *icon)
-{
-	Eil *eil;
-	gboolean accept;
-	int idx;
-
-	eil = EIL (item->canvas);
-	accept = TRUE;
-
-	idx = eil_icon_to_index (eil, icon);
-	gtk_signal_emit (GTK_OBJECT (eil),
-			 eil_signals[TEXT_CHANGED],
-			 idx, gnome_icon_text_item_get_text (icon->text),
-			 &accept);
-
-	return accept;
-}
-
-static void
-height_changed (GnomeCanvasItem *item, Icon *icon)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	int n;
-
-	eil = EIL (item->canvas);
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	n = eil_icon_to_index (eil, icon);
-	eil_layout_from_line (eil, n / eil_get_items_per_line (eil));
-	eil_scrollbar_adjust (eil);
-}
-
-static Icon *
-icon_new_from_pixbuf (EIconList *eil, GdkPixbuf *im,
-		      const char *icon_filename, const char *text)
-{
-	EIconListPrivate *priv;
-	GnomeCanvas *canvas;
-	GnomeCanvasGroup *group;
-	Icon *icon;
-
-	priv = eil->_priv;
-	canvas = GNOME_CANVAS (eil);
-	group = GNOME_CANVAS_GROUP (canvas->root);
-
-	icon = g_new0 (Icon, 1);
-
-	if (icon_filename)
-		icon->icon_filename = g_strdup (icon_filename);
-	else
-		icon->icon_filename = NULL;
-
-	if (im == NULL)
-		im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); 
-	else
-		gdk_pixbuf_ref (im);
-
-	icon->image = GNOME_CANVAS_PIXBUF (gnome_canvas_item_new (
-		group,
-		gnome_canvas_pixbuf_get_type (),
-		"x", 0.0,
-		"y", 0.0,
-		"width", (double) gdk_pixbuf_get_width (im),
-		"height", (double) gdk_pixbuf_get_height (im),
-		"pixbuf", im,
-		NULL));
-	gdk_pixbuf_unref (im);
-
-	icon->text = GNOME_ICON_TEXT_ITEM (gnome_canvas_item_new (
-		group,
-		gnome_icon_text_item_get_type (),
-		NULL));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon->text),
-			       "use_broken_event_handling", FALSE,
-			       NULL);
-
-	gnome_icon_text_item_configure (icon->text,
-					0, 0, priv->icon_width, 
-					"-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1",
-					text, priv->is_editable, priv->static_text);
-
-	gtk_signal_connect (GTK_OBJECT (icon->image), "event",
-			    GTK_SIGNAL_FUNC (icon_event),
-			    icon);
-	icon->text_event_id = gtk_signal_connect (GTK_OBJECT (icon->text), "event",
-						  GTK_SIGNAL_FUNC (icon_event),
-						  icon);
-
-	gtk_signal_connect (GTK_OBJECT (icon->text), "editing_started",
-			    GTK_SIGNAL_FUNC (editing_started),
-			    icon);
-	gtk_signal_connect (GTK_OBJECT (icon->text), "editing_stopped",
-			    GTK_SIGNAL_FUNC (editing_stopped),
-			    icon);
-
-	gtk_signal_connect (GTK_OBJECT (icon->text), "text_changed",
-			    GTK_SIGNAL_FUNC (text_changed),
-			    icon);
-	gtk_signal_connect (GTK_OBJECT (icon->text), "height_changed",
-			    GTK_SIGNAL_FUNC (height_changed),
-			    icon);
-
-	return icon;
-}
-
-static Icon *
-icon_new (Eil *eil, const char *icon_filename, const char *text)
-{
-	GdkPixbuf *im;
-	Icon *retval;
-
-	if (icon_filename) {
-		im = gdk_pixbuf_new_from_file (icon_filename);
-
-		/* Bad icon image 
-		   Fixme. Need a better graphic. */
-		if (im == NULL)
-			im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); 
-	} else
-		im = NULL;
-
-	retval = icon_new_from_pixbuf (eil, im, icon_filename, text);
-
-	if(im)
-		gdk_pixbuf_unref(im);
-
-	return retval;
-}
-
-static int
-icon_list_append (Eil *eil, Icon *icon)
-{
-	EIconListPrivate *priv;
-	int pos;
-
-	priv = eil->_priv;
-
-	pos = priv->icons++;
-	g_array_append_val(priv->icon_list, icon);
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_BROWSE:
-		e_icon_list_select_icon (eil, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	if (!priv->frozen) {
-		/* FIXME: this should only layout the last line */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-
-	return priv->icons - 1;
-}
-
-static void
-icon_list_insert (Eil *eil, int pos, Icon *icon)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	if (pos == priv->icons) {
-		icon_list_append (eil, icon);
-		return;
-	}
-
-	g_array_insert_val(priv->icon_list, pos, icon);
-	priv->icons++;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_BROWSE:
-		e_icon_list_select_icon (eil, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	if (!priv->frozen) {
-		/* FIXME: this should only layout the lines from then one
-		 * containing the Icon to the end.
-		 */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-
-	sync_selection (eil, pos, SYNC_INSERT);
-}
-
-/**
- * e_icon_list_insert_pixbuf:
- * @eil:      An icon list.
- * @pos:      Position at which the new icon should be inserted.
- * @im:       Pixbuf image with the icon image.
- * @filename: Filename of the image file.
- * @text:     Text to be used for the icon's caption.
- *
- * Inserts an icon in the specified icon list.  The icon is created from the
- * specified Imlib image, and it is inserted at the @pos index.
- */
-void
-e_icon_list_insert_pixbuf (EIconList *eil, int pos, GdkPixbuf *im,
-			       const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);
-	icon_list_insert (eil, pos, icon);
-	return;
-}
-
-/**
- * e_icon_list_insert:
- * @eil:           An icon list.
- * @pos:           Position at which the new icon should be inserted.
- * @icon_filename: Name of the file that holds the icon's image.
- * @text:          Text to be used for the icon's caption.
- *
- * Inserts an icon in the specified icon list.  The icon's image is loaded
- * from the specified file, and it is inserted at the @pos index.
- */
-void
-e_icon_list_insert (EIconList *eil, int pos, const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	icon = icon_new (eil, icon_filename, text);
-	icon_list_insert (eil, pos, icon);
-	return;
-}
-
-/**
- * e_icon_list_append_pixbuf:
- * @eil:      An icon list.
- * @im:       Pixbuf image with the icon image.
- * @filename: Filename of the image file.
- * @text:     Text to be used for the icon's caption.
- *
- * Appends an icon to the specified icon list.  The icon is created from
- * the specified Imlib image.
- */
-int
-e_icon_list_append_pixbuf (EIconList *eil, GdkPixbuf *im,
-			       const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);
-	return icon_list_append (eil, icon);
-}
-
-/**
- * e_icon_list_append:
- * @eil:           An icon list.
- * @icon_filename: Name of the file that holds the icon's image.
- * @text:          Text to be used for the icon's caption.
- *
- * Appends an icon to the specified icon list.  The icon's image is loaded from
- * the specified file, and it is inserted at the @pos index.
- */
-int
-e_icon_list_append (EIconList *eil, const char *icon_filename,
-			const char *text)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	icon = icon_new (eil, icon_filename, text);
-	return icon_list_append (eil, icon);
-}
-
-static void
-icon_destroy (Icon *icon)
-{
-	if (icon->destroy)
-		(* icon->destroy) (icon->data);
-
-	g_free (icon->icon_filename);
-
-	gtk_object_destroy (GTK_OBJECT (icon->image));
-	gtk_object_destroy (GTK_OBJECT (icon->text));
-	g_free (icon);
-}
-
-/**
- * e_icon_list_remove:
- * @eil: An icon list.
- * @pos: Index of the icon that should be removed.
- *
- * Removes the icon at index position @pos.  If a destroy handler was specified
- * for that icon, it will be called with the appropriate data.
- */
-void
-e_icon_list_remove (EIconList *eil, int pos)
-{
-	EIconListPrivate *priv;
-	int was_selected;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	was_selected = FALSE;
-
-	icon = g_array_index(priv->icon_list, Icon*, pos);
-
-	if (icon->selected) {
-		was_selected = TRUE;
-
-		switch (priv->selection_mode) {
-		case GTK_SELECTION_SINGLE:
-		case GTK_SELECTION_BROWSE:
-		case GTK_SELECTION_MULTIPLE:
-		case GTK_SELECTION_EXTENDED:
-			e_icon_list_unselect_icon (eil, pos);
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	g_array_remove_index(priv->icon_list, pos);
-	priv->icons--;
-
-	sync_selection (eil, pos, SYNC_REMOVE);
-
-	if (was_selected) {
-		switch (priv->selection_mode) {
-		case GTK_SELECTION_BROWSE:
-			if (pos == priv->icons)
-				e_icon_list_select_icon (eil, pos - 1);
-			else
-				e_icon_list_select_icon (eil, pos);
-
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	if (priv->icons >= priv->last_selected_idx)
-		priv->last_selected_idx = -1;
-
-	if (priv->last_selected_icon == icon)
-		priv->last_selected_icon = NULL;
-
-	icon_destroy (icon);
-
-	if (!priv->frozen) {
-		/* FIXME: Optimize, only re-layout from pos to end */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-/**
- * e_icon_list_clear:
- * @eil: An icon list.
- *
- * Clears the contents for the icon list by removing all the icons.  If destroy
- * handlers were specified for any of the icons, they will be called with the
- * appropriate data.
- */
-void
-e_icon_list_clear (EIconList *eil)
-{
-	EIconListPrivate *priv;
-	int i;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++)
-		icon_destroy (g_array_index (priv->icon_list, Icon*, i));
-
-	eil_free_line_info (eil);
-
-	g_list_free (priv->selection);
-	priv->selection = NULL;
-	g_array_set_size(priv->icon_list, 0);
-	priv->icons = 0;
-	priv->last_selected_idx = -1;
-	priv->last_selected_icon = NULL;
-
-	if (!priv->frozen) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-static void
-eil_destroy (GtkObject *object)
-{
-	Eil *eil;
-
-	/* remember, destroy can be run multiple times! */
-
-	eil = EIL (object);
-
-	g_free (eil->_priv->separators);
-	eil->_priv->separators = NULL;
-
-	eil->_priv->frozen = 1;
-	eil->_priv->dirty  = TRUE;
-	if(eil->_priv->icon_list) {
-		e_icon_list_clear (eil);
-		g_array_free(eil->_priv->icon_list, TRUE);
-	}
-	eil->_priv->icon_list = NULL;
-
-	if (eil->_priv->timer_tag != 0) {
-		gtk_timeout_remove (eil->_priv->timer_tag);
-		eil->_priv->timer_tag = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-eil_finalize (GtkObject *object)
-{
-	Eil *eil;
-
-	eil = EIL (object);
-
-	g_free (eil->_priv);
-	eil->_priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(*GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-static void
-select_icon (Eil *eil, int pos, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	gint i;
-	Icon *icon;
-
-	priv = eil->_priv;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-		i = 0;
-
-		for (i = 0; i < priv->icon_list->len; i++) {
-			icon = g_array_index (priv->icon_list, Icon*, i);
-
-			if (i != pos && icon->selected)
-				emit_select (eil, FALSE, i, event);
-		}
-
-		emit_select (eil, TRUE, pos, event);
-		break;
-
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		emit_select (eil, TRUE, pos, event);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/**
- * e_icon_list_select_icon:
- * @eil: An icon list.
- * @pos: Index of the icon to be selected.
- *
- * Selects the icon at the index specified by @pos.
- */
-void
-e_icon_list_select_icon (EIconList *eil, int pos)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	select_icon (eil, pos, NULL);
-}
-
-static void
-unselect_icon (Eil *eil, int pos, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		emit_select (eil, FALSE, pos, event);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/**
- * e_icon_list_unselect_icon:
- * @eil: An icon list.
- * @pos: Index of the icon to be unselected.
- *
- * Unselects the icon at the index specified by @pos.
- */
-void
-e_icon_list_unselect_icon (EIconList *eil, int pos)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	unselect_icon (eil, pos, NULL);
-}
-
-static void
-eil_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	requisition->width = 1;
-	requisition->height = 1;
-}
-
-static void
-eil_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	if (priv->frozen)
-		return;
-
-	eil_layout_all_icons (eil);
-}
-
-static void
-eil_realize (GtkWidget *widget)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	GtkStyle *style;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	priv->frozen++;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	priv->frozen--;
-
-	/* Change the style to use the base color as the background */
-
-	style = gtk_style_copy (gtk_widget_get_style (widget));
-	style->bg[GTK_STATE_NORMAL] = style->base[GTK_STATE_NORMAL];
-	gtk_widget_set_style (widget, style);
-
-	gdk_window_set_background (GTK_LAYOUT (eil)->bin_window,
-				   &widget->style->bg[GTK_STATE_NORMAL]);
-
-	if (priv->frozen)
-		return;
-
-	if (priv->dirty) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	}
-}
-
-static void
-real_select_icon (Eil *eil, gint num, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (num >= 0 && num < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	icon = g_array_index (priv->icon_list, Icon*, num);
-
-	if (icon->selected)
-		return;
-
-	icon->selected = TRUE;
-	gnome_icon_text_item_select (icon->text, TRUE);
-	priv->selection = g_list_append (priv->selection, GINT_TO_POINTER (num));
-}
-
-static void
-real_unselect_icon (Eil *eil, gint num, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (num >= 0 && num < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	icon = g_array_index (priv->icon_list, Icon*, num);
-
-	if (!icon->selected)
-		return;
-
-	icon->selected = FALSE;
-	gnome_icon_text_item_select (icon->text, FALSE);
-	priv->selection = g_list_remove (priv->selection, GINT_TO_POINTER (num));
-}
-
-/* Saves the selection of the icon list to temporary storage */
-static void
-store_temp_selection (Eil *eil)
-{
-	EIconListPrivate *priv;
-	int i;
-	Icon *icon;
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		icon->tmp_selected = icon->selected;
-	}
-}
-
-#define gray50_width 2
-#define gray50_height 2
-static const char gray50_bits[] = {
-  0x02, 0x01, };
-
-/* Button press handler for the icon list */
-static gint
-eil_button_press (GtkWidget *widget, GdkEventButton *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	int only_one;
-	GdkBitmap *stipple;
-	double tx, ty;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	/* Invoke the canvas event handler and see if an item picks up the event */
-
-	if ((* GTK_WIDGET_CLASS (parent_class)->button_press_event) (widget, event))
-		return TRUE;
-
-	if (!(event->type == GDK_BUTTON_PRESS
-	      && event->button == 1
-	      && priv->selection_mode != GTK_SELECTION_BROWSE))
-		return FALSE;
-
-	only_one = priv->selection_mode == GTK_SELECTION_SINGLE;
-
-	if (only_one || (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0)
-		eil_unselect_all (eil, NULL, NULL);
-
-	if (only_one)
-		return TRUE;
-
-	if (priv->selecting)
-		return FALSE;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &tx, &ty);
-	priv->sel_start_x = tx;
-	priv->sel_start_y = ty;
-	priv->sel_state = event->state;
-	priv->selecting = TRUE;
-
-	store_temp_selection (eil);
-
-	stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
-	priv->sel_rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (eil)),
-						gnome_canvas_rect_get_type (),
-						"x1", tx,
-						"y1", ty,
-						"x2", tx,
-						"y2", ty,
-						"outline_color", "black",
-						"width_pixels", 1,
-						"outline_stipple", stipple,
-						NULL);
-	gdk_bitmap_unref (stipple);
-
-	gnome_canvas_item_grab (priv->sel_rect, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-				NULL, event->time);
-
-	return TRUE;
-}
-
-/* Returns whether the specified icon is at least partially inside the specified
- * rectangle.
- */
-static int
-icon_is_in_area (Icon *icon, int x1, int y1, int x2, int y2)
-{
-	double ix1, iy1, ix2, iy2;
-
-	if (x1 == x2 && y1 == y2)
-		return FALSE;
-
-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon->image), &ix1, &iy1, &ix2, &iy2);
-
-	if (ix1 <= x2 && iy1 <= y2 && ix2 >= x1 && iy2 >= y1)
-		return TRUE;
-
-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon->text), &ix1, &iy1, &ix2, &iy2);
-
-	if (ix1 <= x2 && iy1 <= y2 && ix2 >= x1 && iy2 >= y1)
-		return TRUE;
-
-	return FALSE;
-}
-
-/* Updates the rubberband selection to the specified point */
-static void
-update_drag_selection (Eil *eil, int x, int y)
-{
-	EIconListPrivate *priv;
-	int x1, x2, y1, y2;
-	int i;
-	Icon *icon;
-	int additive, invert;
-
-	priv = eil->_priv;
-
-	/* Update rubberband */
-
-	if (priv->sel_start_x < x) {
-		x1 = priv->sel_start_x;
-		x2 = x;
-	} else {
-		x1 = x;
-		x2 = priv->sel_start_x;
-	}
-
-	if (priv->sel_start_y < y) {
-		y1 = priv->sel_start_y;
-		y2 = y;
-	} else {
-		y1 = y;
-		y2 = priv->sel_start_y;
-	}
-
-	if (x1 < 0)
-		x1 = 0;
-
-	if (y1 < 0)
-		y1 = 0;
-
-	if (x2 >= GTK_WIDGET (eil)->allocation.width)
-		x2 = GTK_WIDGET (eil)->allocation.width - 1;
-
-	if (y2 >= priv->total_height)
-		y2 = priv->total_height - 1;
-
-	gnome_canvas_item_set (priv->sel_rect,
-			       "x1", (double) x1,
-			       "y1", (double) y1,
-			       "x2", (double) x2,
-			       "y2", (double) y2,
-			       NULL);
-
-	/* Select or unselect icons as appropriate */
-
-	additive = priv->sel_state & GDK_SHIFT_MASK;
-	invert = priv->sel_state & GDK_CONTROL_MASK;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		if (icon_is_in_area (icon, x1, y1, x2, y2)) {
-			if (invert) {
-				if (icon->selected == icon->tmp_selected)
-					emit_select (eil, !icon->selected, i, NULL);
-			} else if (additive) {
-				if (!icon->selected)
-					emit_select (eil, TRUE, i, NULL);
-			} else {
-				if (!icon->selected)
-					emit_select (eil, TRUE, i, NULL);
-			}
-		} else if (icon->selected != icon->tmp_selected)
-			emit_select (eil, icon->tmp_selected, i, NULL);
-	}
-}
-
-/* Button release handler for the icon list */
-static gint
-eil_button_release (GtkWidget *widget, GdkEventButton *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	double x, y;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (!priv->selecting)
-		return (* GTK_WIDGET_CLASS (parent_class)->button_release_event) (widget, event);
-
-	if (event->button != 1)
-		return FALSE;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &x, &y);
-	update_drag_selection (eil, x, y);
-	gnome_canvas_item_ungrab (priv->sel_rect, event->time);
-
-	gtk_object_destroy (GTK_OBJECT (priv->sel_rect));
-	priv->sel_rect = NULL;
-	priv->selecting = FALSE;
-
-	if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
-		priv->timer_tag = 0;
-	}
-
-	return TRUE;
-}
-
-/* Autoscroll timeout handler for the icon list */
-static gint
-scroll_timeout (gpointer data)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	double x, y;
-	int value;
-
-	eil = data;
-	priv = eil->_priv;
-
-	GDK_THREADS_ENTER ();
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	value = adj->value + priv->value_diff;
-	if (value > adj->upper - adj->page_size)
-		value = adj->upper - adj->page_size;
-
-	gtk_adjustment_set_value (adj, value);
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil),
-				      priv->event_last_x, priv->event_last_y,
-				      &x, &y);
-	update_drag_selection (eil, x, y);
-
-	GDK_THREADS_LEAVE();
-
-	return TRUE;
-}
-
-/* Motion event handler for the icon list */
-static gint
-eil_motion_notify (GtkWidget *widget, GdkEventMotion *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	double x, y;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (!priv->selecting)
-		return (* GTK_WIDGET_CLASS (parent_class)->motion_notify_event) (widget, event);
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &x, &y);
-	update_drag_selection (eil, x, y);
-
-	/* If we are out of bounds, schedule a timeout that will do the scrolling */
-
-	if (event->y < 0 || event->y > widget->allocation.height) {
-		if (priv->timer_tag == 0)
-			priv->timer_tag = gtk_timeout_add (SCROLL_TIMEOUT, scroll_timeout, eil);
-
-		if (event->y < 0)
-			priv->value_diff = event->y;
-		else
-			priv->value_diff = event->y - widget->allocation.height;
-
-		priv->event_last_x = event->x;
-		priv->event_last_y = event->y;
-
-		/* Make the steppings be relative to the mouse distance from the
-		 * canvas.  Also notice the timeout above is small to give a
-		 * more smooth movement.
-		 */
-		priv->value_diff /= 5;
-	} else if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
-		priv->timer_tag = 0;
-	}
-
-	return TRUE;
-}
-
-typedef gboolean (*xGtkSignal_BOOL__INT_POINTER) (GtkObject * object,
-						  gint     arg1,
-						  gpointer arg2,
-						  gpointer user_data);
-static void
-xgtk_marshal_BOOL__INT_POINTER (GtkObject *object, GtkSignalFunc func, gpointer func_data,
-				GtkArg *args)
-{
-  xGtkSignal_BOOL__INT_POINTER rfunc;
-  gboolean *return_val;
-
-  return_val = GTK_RETLOC_BOOL (args[2]);
-  rfunc = (xGtkSignal_BOOL__INT_POINTER) func;
-  *return_val = (*rfunc) (object,
-			  GTK_VALUE_INT (args[0]),
-			  GTK_VALUE_POINTER (args[1]),
-			  func_data);
-}
-
-static void
-eil_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EIconList *eil;
-
-	eil = E_ICON_LIST (object);
-
-	switch (arg_id) {
-	default:
-		break;
-	}
-}
-
-static void
-eil_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EIconList *eil;
-	EIconListPrivate *priv;
-
-	eil = E_ICON_LIST (object);
-	priv = eil->_priv;
-
-	switch (arg_id) {
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-eil_class_init (EilClass *eil_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkLayoutClass *layout_class;
-	GnomeCanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass *)   eil_class;
-	widget_class = (GtkWidgetClass *)   eil_class;
-	layout_class = (GtkLayoutClass *)   eil_class;
-	canvas_class = (GnomeCanvasClass *) eil_class;
-
-	parent_class = gtk_type_class (gnome_canvas_get_type ());
-
-	eil_signals[SELECT_ICON] =
-		gtk_signal_new (
-			"select_icon",
-			GTK_RUN_FIRST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, select_icon),
-			gtk_marshal_NONE__INT_POINTER,
-			GTK_TYPE_NONE, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_GDK_EVENT);
-
-	eil_signals[UNSELECT_ICON] =
-		gtk_signal_new (
-			"unselect_icon",
-			GTK_RUN_FIRST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, unselect_icon),
-			gtk_marshal_NONE__INT_POINTER,
-			GTK_TYPE_NONE, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_GDK_EVENT);
-
-	eil_signals[TEXT_CHANGED] =
-		gtk_signal_new (
-			"text_changed",
-			GTK_RUN_LAST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, text_changed),
-			xgtk_marshal_BOOL__INT_POINTER,
-			GTK_TYPE_BOOL, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, eil_signals, LAST_SIGNAL);
-
-	object_class->destroy = eil_destroy;
-	object_class->finalize = eil_finalize;
-	object_class->set_arg = eil_set_arg;
-	object_class->get_arg = eil_get_arg;
-
-	widget_class->size_request = eil_size_request;
-	widget_class->size_allocate = eil_size_allocate;
-	widget_class->realize = eil_realize;
-	widget_class->button_press_event = eil_button_press;
-	widget_class->button_release_event = eil_button_release;
-	widget_class->motion_notify_event = eil_motion_notify;
-
-	eil_class->select_icon = real_select_icon;
-	eil_class->unselect_icon = real_unselect_icon;
-}
-
-static void
-eil_init (Eil *eil)
-{
-	eil->_priv = g_new0 (EIconListPrivate, 1);
-
-	eil->_priv->icon_list = g_array_new(FALSE, FALSE, sizeof(gpointer));
-	eil->_priv->row_spacing = DEFAULT_ROW_SPACING;
-	eil->_priv->col_spacing = DEFAULT_COL_SPACING;
-	eil->_priv->text_spacing = DEFAULT_TEXT_SPACING;
-	eil->_priv->icon_border = DEFAULT_ICON_BORDER;
-	eil->_priv->separators = g_strdup (" ");
-
-	eil->_priv->selection_mode = GTK_SELECTION_SINGLE;
-	eil->_priv->dirty = TRUE;
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil), 0.0, 0.0, 1000000.0, 1000000.0);
-	gnome_canvas_scroll_to (GNOME_CANVAS (eil), 0, 0);
-}
-
-/**
- * e_icon_list_get_type:
- *
- * Registers the &EIconList class if necessary, and returns the type ID
- * associated to it.
- *
- * Returns: The type ID of the &EIconList class.
- */
-guint
-e_icon_list_get_type (void)
-{
-	static guint eil_type = 0;
-
-	if (!eil_type) {
-		GtkTypeInfo eil_info = {
-			"EIconList",
-			sizeof (EIconList),
-			sizeof (EIconListClass),
-			(GtkClassInitFunc) eil_class_init,
-			(GtkObjectInitFunc) eil_init,
-			NULL,
-			NULL,
-			NULL
-		};
-
-		eil_type = gtk_type_unique (gnome_canvas_get_type (),
-					    &eil_info);
-	}
-
-	return eil_type;
-}
-
-/**
- * e_icon_list_set_icon_width:
- * @eil: An icon list.
- * @w:   New width for the icon columns.
- *
- * Sets the amount of horizontal space allocated to the icons, i.e. the column
- * width of the icon list.
- */
-void
-e_icon_list_set_icon_width (EIconList *eil, int w)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	priv->icon_width  = w;
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	eil_layout_all_icons (eil);
-	eil_scrollbar_adjust (eil);
-}
-
-
-/**
- * e_icon_list_construct:
- * @eil: An icon list.
- * @icon_width: Width for the icon columns.
- * @flags: A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.
- *
- * Constructor for the icon list, to be used by derived classes.
- **/
-void
-e_icon_list_construct (EIconList *eil, guint icon_width, int flags)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	e_icon_list_set_icon_width (eil, icon_width);
-	priv->is_editable = (flags & E_ICON_LIST_IS_EDITABLE) != 0;
-	priv->static_text = (flags & E_ICON_LIST_STATIC_TEXT) != 0;
-}
-
-
-/**
- * e_icon_list_new: [constructor]
- * @icon_width: Width for the icon columns.
- * @flags:      A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.
- *
- * Creates a new icon list widget.  The icon columns are allocated a width of
- * @icon_width pixels.  Icon captions will be word-wrapped to this width as
- * well.
- *
- * If @flags has the %E_ICON_LIST_IS_EDITABLE flag set, then the user will be
- * able to edit the text in the icon captions, and the "text_changed" signal
- * will be emitted when an icon's text is changed.
- *
- * If @flags has the %E_ICON_LIST_STATIC_TEXT flags set, then the text
- * for the icon captions will not be copied inside the icon list; it will only
- * store the pointers to the original text strings specified by the application.
- * This is intended to save memory.  If this flag is not set, then the text
- * strings will be copied and managed internally.
- *
- * Returns: a newly-created icon list widget
- */
-GtkWidget *
-e_icon_list_new (guint icon_width, int flags)
-{
-	Eil *eil;
-
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	eil = EIL (gtk_type_new (e_icon_list_get_type ()));
-	gtk_widget_pop_colormap ();
-
-	e_icon_list_construct (eil, icon_width, flags);
-
-	return GTK_WIDGET (eil);
-}
-
-
-/**
- * e_icon_list_freeze:
- * @eil:  An icon list.
- *
- * Freezes an icon list so that any changes made to it will not be
- * reflected on the screen until it is thawed with e_icon_list_thaw().
- * It is recommended to freeze the icon list before inserting or deleting
- * many icons, for example, so that the layout process will only be executed
- * once, when the icon list is finally thawed.
- *
- * You can call this function multiple times, but it must be balanced with the
- * same number of calls to e_icon_list_thaw() before the changes will take
- * effect.
- */
-void
-e_icon_list_freeze (EIconList *eil)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	eil->_priv->frozen++;
-
-	/* We hide the root so that the user will not see any changes while the
-	 * icon list is doing stuff.
-	 */
-
-	if (eil->_priv->frozen == 1)
-		gnome_canvas_item_hide (GNOME_CANVAS (eil)->root);
-}
-
-/**
- * e_icon_list_thaw:
- * @eil:  An icon list.
- *
- * Thaws the icon list and performs any pending layout operations.  This
- * is to be used in conjunction with e_icon_list_freeze().
- */
-void
-e_icon_list_thaw (EIconList *eil)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (eil->_priv->frozen > 0);
-
-	eil->_priv->frozen--;
-
-	if (eil->_priv->dirty) {
-                eil_layout_all_icons (eil);
-                eil_scrollbar_adjust (eil);
-        }
-
-	if (eil->_priv->frozen == 0)
-		gnome_canvas_item_show (GNOME_CANVAS (eil)->root);
-}
-
-/**
- * e_icon_list_set_selection_mode
- * @eil:  An icon list.
- * @mode: New selection mode.
- *
- * Sets the selection mode for an icon list.  The %GTK_SELECTION_MULTIPLE and
- * %GTK_SELECTION_EXTENDED modes are considered equivalent.
- */
-void
-e_icon_list_set_selection_mode (EIconList *eil, GtkSelectionMode mode)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	eil->_priv->selection_mode = mode;
-	eil->_priv->last_selected_idx = -1;
-	eil->_priv->last_selected_icon = NULL;
-}
-
-/**
- * e_icon_list_set_icon_data_full:
- * @eil:     An icon list.
- * @pos:     Index of an icon.
- * @data:    User data to set on the icon.
- * @destroy: Destroy notification handler for the icon.
- *
- * Associates the @data pointer to the icon at the index specified by @pos.  The
- * @destroy argument points to a function that will be called when the icon is
- * destroyed, or NULL if no function is to be called when this happens.
- */
-void
-e_icon_list_set_icon_data_full (EIconList *eil,
-				    int pos, gpointer data,
-				    GtkDestroyNotify destroy)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, pos);
-	icon->data = data;
-	icon->destroy = destroy;
-}
-
-/**
- * e_icon_list_get_icon_data:
- * @eil:  An icon list.
- * @pos:  Index of an icon.
- * @data: User data to set on the icon.
- *
- * Associates the @data pointer to the icon at the index specified by @pos.
- */
-void
-e_icon_list_set_icon_data (EIconList *eil, int pos, gpointer data)
-{
-	e_icon_list_set_icon_data_full (eil, pos, data, NULL);
-}
-
-/**
- * e_icon_list_get_icon_data:
- * @eil: An icon list.
- * @pos: Index of an icon.
- *
- * Returns the user data pointer associated to the icon at the index specified
- * by @pos.
- */
-gpointer
-e_icon_list_get_icon_data (EIconList *eil, int pos)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, NULL);
-	g_return_val_if_fail (IS_EIL (eil), NULL);
-	g_return_val_if_fail (pos >= 0 && pos < eil->_priv->icons, NULL);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, pos);
-	return icon->data;
-}
-
-/**
- * e_icon_list_find_icon_from_data:
- * @eil:    An icon list.
- * @data:   Data pointer associated to an icon.
- *
- * Returns the index of the icon whose user data has been set to @data,
- * or -1 if no icon has this data associated to it.
- */
-int
-e_icon_list_find_icon_from_data (EIconList *eil, gpointer data)
-{
-	EIconListPrivate *priv;
-	int n;
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		icon = g_array_index(priv->icon_list, Icon*, n);
-		if (icon->data == data)
-			return n;
-	}
-
-	return -1;
-}
-
-/* Sets an integer value in the private structure of the icon list, and updates it */
-static void
-set_value (EIconList *eil, EIconListPrivate *priv, int *dest, int val)
-{
-	if (val == *dest)
-		return;
-
-	*dest = val;
-
-	if (!priv->frozen) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-/**
- * e_icon_list_set_row_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels for inter-row spacing.
- *
- * Sets the spacing to be used between rows of icons.
- */
-void
-e_icon_list_set_row_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->row_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_col_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels for inter-column spacing.
- *
- * Sets the spacing to be used between columns of icons.
- */
-void
-e_icon_list_set_col_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->col_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_text_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels between an icon's image and its caption.
- *
- * Sets the spacing to be used between an icon's image and its text caption.
- */
-void
-e_icon_list_set_text_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->text_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_icon_border:
- * @eil:    An icon list.
- * @pixels: Number of border pixels to be used around an icon's image.
- *
- * Sets the width of the border to be displayed around an icon's image.  This is
- * currently not implemented.
- */
-void
-e_icon_list_set_icon_border (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->icon_border, pixels);
-}
-
-/**
- * e_icon_list_set_separators:
- * @eil: An icon list.
- * @sep: String with characters to be used as word separators.
- *
- * Sets the characters that can be used as word separators when doing
- * word-wrapping in the icon text captions.
- */
-void
-e_icon_list_set_separators (EIconList *eil, const char *sep)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (sep != NULL);
-
-	priv = eil->_priv;
-
-	if (priv->separators)
-		g_free (priv->separators);
-
-	priv->separators = g_strdup (sep);
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	eil_layout_all_icons (eil);
-	eil_scrollbar_adjust (eil);
-}
-
-/**
- * e_icon_list_moveto:
- * @eil:    An icon list.
- * @pos:    Index of an icon.
- * @yalign: Vertical alignment of the icon.
- *
- * Makes the icon whose index is @pos be visible on the screen.  The icon list
- * gets scrolled so that the icon is visible.  An alignment of 0.0 represents
- * the top of the visible part of the icon list, and 1.0 represents the bottom.
- * An icon can be centered on the icon list.
- */
-void
-e_icon_list_moveto (EIconList *eil, int pos, double yalign)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	IconLine *il;
-	GList *l;
-	int i, y, uh, line;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-	g_return_if_fail (yalign >= 0.0 && yalign <= 1.0);
-
-	priv = eil->_priv;
-
-	g_return_if_fail (priv->lines != NULL);
-
-	line = pos / eil_get_items_per_line (eil);
-
-	y = 0;
-	for (i = 0, l = priv->lines; l && i < line; l = l->next, i++) {
-		il = l->data;
-		y += icon_line_height (eil, il);
-	}
-
-	il = l->data;
-
-	uh = GTK_WIDGET (eil)->allocation.height - icon_line_height (eil,il);
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-	gtk_adjustment_set_value (adj, y - uh * yalign);
-}
-
-/**
- * e_icon_list_is_visible:
- * @eil: An icon list.
- * @pos: Index of an icon.
- *
- * Returns whether the icon at the index specified by @pos is visible.  This
- * will be %GTK_VISIBILITY_NONE if the icon is not visible at all,
- * %GTK_VISIBILITY_PARTIAL if the icon is at least partially shown, and
- * %GTK_VISIBILITY_FULL if the icon is fully visible.
- */
-GtkVisibility
-e_icon_list_icon_is_visible (EIconList *eil, int pos)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	IconLine *il;
-	GList *l;
-	int line, y1, y2, i;
-
-	g_return_val_if_fail (eil != NULL, GTK_VISIBILITY_NONE);
-	g_return_val_if_fail (IS_EIL (eil), GTK_VISIBILITY_NONE);
-	g_return_val_if_fail (pos >= 0 && pos < eil->_priv->icons,
-			      GTK_VISIBILITY_NONE);
-
-	priv = eil->_priv;
-
-	if (priv->lines == NULL)
-		return GTK_VISIBILITY_NONE;
-
-	line = pos / eil_get_items_per_line (eil);
-	y1 = 0;
-	for (i = 0, l = priv->lines; l && i < line; l = l->next, i++) {
-		il = l->data;
-		y1 += icon_line_height (eil, il);
-	}
-
-	y2 = y1 + icon_line_height (eil, (IconLine *) l->data);
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	if (y2 < adj->value)
-		return GTK_VISIBILITY_NONE;
-
-	if (y1 > adj->value + GTK_WIDGET (eil)->allocation.height)
-		return GTK_VISIBILITY_NONE;
-
-	if (y2 <= adj->value + GTK_WIDGET (eil)->allocation.height &&
-	    y1 >= adj->value)
-		return GTK_VISIBILITY_FULL;
-
-	return GTK_VISIBILITY_PARTIAL;
-}
-
-/**
- * e_icon_list_get_icon_at:
- * @eil: An icon list.
- * @x:   X position in the icon list window.
- * @y:   Y position in the icon list window.
- *
- * Returns the index of the icon that is under the specified coordinates, which
- * are relative to the icon list's window.  If there is no icon in that
- * position, -1 is returned.
- */
-int
-e_icon_list_get_icon_at (EIconList *eil, int x, int y)
-{
-	EIconListPrivate *priv;
-	double wx, wy;
-	double dx, dy;
-	int cx, cy;
-	int n;
-	GnomeCanvasItem *item;
-	double dist;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	priv = eil->_priv;
-
-	dx = x;
-	dy = y;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), dx, dy, &wx, &wy);
-	gnome_canvas_w2c (GNOME_CANVAS (eil), wx, wy, &cx, &cy);
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		Icon *icon = g_array_index(priv->icon_list, Icon*, n);
-		GnomeCanvasItem *image = GNOME_CANVAS_ITEM (icon->image);
-		GnomeCanvasItem *text = GNOME_CANVAS_ITEM (icon->text);
-
-		if (wx >= image->x1 && wx <= image->x2 && wy >= image->y1 && wy <= image->y2) {
-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (image)->klass)->point) (
-				image,
-				wx, wy,
-				cx, cy,
-				&item);
-
-			if ((int) (dist * GNOME_CANVAS (eil)->pixels_per_unit + 0.5)
-			    <= GNOME_CANVAS (eil)->close_enough)
-				return n;
-		}
-
-		if (wx >= text->x1 && wx <= text->x2 && wy >= text->y1 && wy <= text->y2) {
-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (text)->klass)->point) (
-				text,
-				wx, wy,
-				cx, cy,
-				&item);
-
-			if ((int) (dist * GNOME_CANVAS (eil)->pixels_per_unit + 0.5)
-			    <= GNOME_CANVAS (eil)->close_enough)
-				return n;
-		}
-	}
-
-	return -1;
-}
-
-
-/**
- * e_icon_list_get_num_icons:
- * @eil: An icon list.
- *
- * Returns the number of icons in the icon list.
- */
-guint
-e_icon_list_get_num_icons (EIconList *eil)
-{
-	g_return_val_if_fail (E_IS_ICON_LIST (eil), 0);
-
-	return eil->_priv->icons;
-}
-
-
-/**
- * e_icon_list_get_selection:
- * @eil: An icon list.
- *
- * Returns a list of integers with the indices of the currently selected icons.
- */
-GList *
-e_icon_list_get_selection (EIconList *eil)
-{
-	g_return_val_if_fail (E_IS_ICON_LIST (eil), NULL);
-
-	return eil->_priv->selection;
-}
-
-
-/**
- * e_icon_list_get_selection:
- * @eil: An icon list.
- * @idx: Index of an @icon.
- *
- * Returns the filename of the icon with index @idx.
- */
-gchar *
-e_icon_list_get_icon_filename (EIconList *eil, int idx)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, NULL);
-	g_return_val_if_fail (IS_EIL (eil), NULL);
-	g_return_val_if_fail (idx >= 0 && idx < eil->_priv->icons, NULL);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, idx);
-	return icon->icon_filename;
-}
-
-
-/**
- * e_icon_list_find_icon_from_filename:
- * @eil:       An icon list.
- * @filename:  Filename of an icon.
- *
- * Returns the index of the icon whose filename is @filename or -1 if
- * there is no icon with this filename.
- */
-int
-e_icon_list_find_icon_from_filename (EIconList *eil,
-				     const gchar *filename)
-{
-	EIconListPrivate *priv;
-	int n;
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-	g_return_val_if_fail (filename != NULL, -1);
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		icon = g_array_index(priv->icon_list, Icon*, n);
-		if (!strcmp (icon->icon_filename, filename))
-			return n;
-	}
-
-	return -1;
-}
-
diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h
deleted file mode 100644
index 7cdaf6e85f..0000000000
--- a/composer/e-icon-list.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 1998, 1999 Free Software Foundation
- * Copyright (C) 2000 Red Hat, Inc.
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
-  @NOTATION@
- */
-
-/* GnomeIconList widget - scrollable icon list
- *
- *
- * Authors:
- *   Federico Mena   <federico@ximian.com>
- *   Miguel de Icaza <miguel@ximian.com>
- */
-
-#ifndef _E_ICON_LIST_H_
-#define _E_ICON_LIST_H_
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_ICON_LIST            (e_icon_list_get_type ())
-#define E_ICON_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList))
-#define E_ICON_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass))
-#define E_IS_ICON_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ICON_LIST))
-#define E_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST))
-#define E_ICON_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ICON_LIST, EIconListClass))
-
-typedef struct _EIconList        EIconList;
-typedef struct _EIconListPrivate EIconListPrivate;
-typedef struct _EIconListClass   EIconListClass;
-
-typedef enum {
-	E_ICON_LIST_ICONS,
-	E_ICON_LIST_TEXT_BELOW,
-	E_ICON_LIST_TEXT_RIGHT
-} EIconListMode;
-
-/* This structure has been converted to use public and private parts.  To avoid
- * breaking binary compatibility, the slots for private fields have been
- * replaced with padding.  Please remove these fields when gnome-libs has
- * reached another major version and it is "fine" to break binary compatibility.
- */
-struct _EIconList {
-	GnomeCanvas canvas;
-
-	/*< private >*/
-	EIconListPrivate * _priv;
-};
-
-struct _EIconListClass {
-	GnomeCanvasClass parent_class;
-
-	void     (*select_icon)    (EIconList *gil, gint num, GdkEvent *event);
-	void     (*unselect_icon)  (EIconList *gil, gint num, GdkEvent *event);
-	gboolean (*text_changed)   (EIconList *gil, gint num, const char *new_text);
-};
-
-enum {
-	E_ICON_LIST_IS_EDITABLE	= 1 << 0,
-	E_ICON_LIST_STATIC_TEXT	= 1 << 1
-};
-
-guint          e_icon_list_get_type            (void) G_GNUC_CONST;
-
-GtkWidget     *e_icon_list_new                 (guint         icon_width,
-						int           flags);
-void           e_icon_list_construct           (EIconList *gil,
-						guint icon_width,
-						int flags);
-
-
-/* To avoid excesive recomputes during insertion/deletion */
-void           e_icon_list_freeze              (EIconList *gil);
-void           e_icon_list_thaw                (EIconList *gil);
-
-
-void           e_icon_list_insert              (EIconList *gil,
-						int idx,
-						const char *icon_filename,
-						const char *text);
-void           e_icon_list_insert_pixbuf       (EIconList *gil,
-						int idx,
-						GdkPixbuf *im,
-						const char *icon_filename,
-						const char *text);
-
-int            e_icon_list_append              (EIconList *gil,
-						const char *icon_filename,
-						const char *text);
-int            e_icon_list_append_pixbuf       (EIconList *gil,
-						GdkPixbuf *im,
-						const char *icon_filename,
-						const char *text);
-
-void           e_icon_list_clear               (EIconList *gil);
-void           e_icon_list_remove              (EIconList *gil,
-						int idx);
-
-guint          e_icon_list_get_num_icons       (EIconList *gil);
-
-
-/* Managing the selection */
-void           e_icon_list_set_selection_mode  (EIconList *gil,
-						GtkSelectionMode mode);
-void           e_icon_list_select_icon         (EIconList *gil,
-						int idx);
-void           e_icon_list_unselect_icon       (EIconList *gil,
-						int idx);
-int            e_icon_list_unselect_all        (EIconList *gil);
-GList *        e_icon_list_get_selection       (EIconList *gil);
-
-/* Setting the spacing values */
-void           e_icon_list_set_icon_width      (EIconList *gil,
-						int w);
-void           e_icon_list_set_row_spacing     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_col_spacing     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_text_spacing    (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_icon_border     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_separators      (EIconList *gil,
-						const char *sep);
-/* Icon filename. */
-gchar *        e_icon_list_get_icon_filename   (EIconList *gil,
-						int idx);
-int            e_icon_list_find_icon_from_filename (EIconList *gil,
-						    const char *filename);
-
-/* Attaching information to the icons */
-void           e_icon_list_set_icon_data       (EIconList *gil,
-						int idx, gpointer data);
-void           e_icon_list_set_icon_data_full  (EIconList *gil,
-						int idx, gpointer data,
-						GtkDestroyNotify destroy);
-int            e_icon_list_find_icon_from_data (EIconList *gil,
-						gpointer data);
-gpointer       e_icon_list_get_icon_data       (EIconList *gil,
-						int idx);
-
-/* Visibility */
-void           e_icon_list_moveto              (EIconList *gil,
-						int idx, double yalign);
-GtkVisibility  e_icon_list_icon_is_visible     (EIconList *gil,
-						int idx);
-
-int            e_icon_list_get_icon_at         (EIconList *gil,
-						int x, int y);
-
-int            e_icon_list_get_items_per_line  (EIconList *gil);
-
-END_GNOME_DECLS
-
-#endif /* _GNOME_ICON_LIST_H_ */
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
deleted file mode 100644
index 9c125e08b8..0000000000
--- a/composer/e-msg-composer-attachment-bar.c
+++ /dev/null
@@ -1,800 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment-bar.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.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 "e-icon-list.h"
-
-#include "camel/camel-data-wrapper.h"
-#include "camel/camel-stream-fs.h"
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-mime-part.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 EIconListClass *parent_class = NULL;
-
-struct _EMsgComposerAttachmentBarPrivate {
-	GList *attachments;
-	guint num_attachments;
-
-	GtkWidget *context_menu;
-	GtkWidget *icon_context_menu;
-};
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static void update (EMsgComposerAttachmentBar *bar);
-
-
-static gchar *
-size_to_string (gulong size)
-{
-	gchar *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) {
-		if (size == 1)
-			size_string = g_strdup (_("1 byte"));
-		else
-			size_string = g_strdup_printf (_("%u bytes"),
-						       (guint) size);
-	} else {
-		gdouble displayed_size;
-
-		if (size < 1e6L) {
-			displayed_size = (gdouble) size / 1.0e3;
-			size_string = g_strdup_printf (_("%.1fK"),
-						       displayed_size);
-		} else if (size < 1e9L) {
-			displayed_size = (gdouble) size / 1.0e6;
-			size_string = g_strdup_printf (_("%.1fM"),
-						       displayed_size);
-		} else {
-			displayed_size = (gdouble) size / 1.0e9;
-			size_string = g_strdup_printf (_("%.1fG"),
-						       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)
-		gtk_object_unref (GTK_OBJECT (p->data));
-}
-
-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);
-
-	gtk_signal_connect (GTK_OBJECT (attachment), "changed",
-			    GTK_SIGNAL_FUNC (attachment_changed_cb),
-			    bar);
-
-	bar->priv->attachments = g_list_append (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments++;
-
-	update (bar);
-
-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);
-}
-
-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 gchar *file_name)
-{
-	add_common (bar, e_msg_composer_attachment_new (file_name));
-}
-
-static void
-remove_attachment (EMsgComposerAttachmentBar *bar,
-		   EMsgComposerAttachment *attachment)
-{
-	bar->priv->attachments = g_list_remove (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments--;
-
-	gtk_object_unref (GTK_OBJECT (attachment));
-
-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);
-}
-
-
-/* Icon list contents handling.  */
-
-static GdkPixbuf *
-pixbuf_for_mime_type (const char *mime_type)
-{
-	const char *icon_name;
-	char *filename = NULL;
-	GdkPixbuf *pixbuf;
-
-	icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
-	if (icon_name) {
-		if (*icon_name == '/') {
-			pixbuf = gdk_pixbuf_new_from_file (icon_name);
-			if (pixbuf)
-				return pixbuf;
-		}
-		
-		filename = gnome_pixmap_file (icon_name);
-		if (!filename) {
-			char *fm_icon;
-			
-			fm_icon = g_strdup_printf ("nautilus/%s", icon_name);
-			filename = gnome_pixmap_file (fm_icon);
-			if (!filename) {
-				fm_icon = g_strdup_printf ("mc/%s", icon_name);
-				filename = gnome_pixmap_file (fm_icon);
-			}
-			g_free (fm_icon);
-		}
-	}
-	
-	if (!filename)
-		filename = gnome_pixmap_file ("gnome-unknown.png");
-	
-	pixbuf = gdk_pixbuf_new_from_file (filename);
-	g_free (filename);
-	
-	return pixbuf;
-}
-
-static void
-update (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	EIconList *icon_list;
-	GList *p;
-
-	priv = bar->priv;
-	icon_list = E_ICON_LIST (bar);
-
-	e_icon_list_freeze (icon_list);
-
-	e_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;
-		const gchar *desc;
-		gchar *size_string, *label;
-		CamelContentType *content_type;
-		GdkPixbuf *pixbuf;
-		gboolean image;
-		
-		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 */
-		image = header_content_type_is (content_type, "image", "*");
-		
-		if (image && attachment->pixbuf_cache == NULL) {
-			CamelDataWrapper *wrapper;
-			CamelStream *mstream;
-			GdkPixbufLoader *loader;
-			gboolean error = TRUE;
-			char tmp[4096];
-			int t;
-
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-			mstream = camel_stream_mem_new ();
-
-			camel_data_wrapper_write_to_stream (wrapper, mstream);
-
-			camel_stream_reset (mstream);
-
-			/* Stream image into pixbuf loader */
-			loader = gdk_pixbuf_loader_new ();
-			do {
-				t = camel_stream_read (mstream, tmp, 4096);
-				if (t > 0) {
-					error = !gdk_pixbuf_loader_write (loader,
-									  tmp, t);
-					if (error) {
-						break;
-					}
-				} else {
-					if (camel_stream_eos (mstream))
-						break;
-					error = TRUE;
-					break;
-				}
-				
-			} while (!camel_stream_eos (mstream));
-
-			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);
-			} else {
-				g_warning ("GdkPixbufLoader Error");
-				image = FALSE;
-			}
-
-			/* Destroy everything */
-			gdk_pixbuf_loader_close (loader);
-			gtk_object_destroy (GTK_OBJECT (loader));
-			camel_stream_close (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 (image) {
-			e_icon_list_append_pixbuf (icon_list, attachment->pixbuf_cache, NULL, label);
-		} else {
-			char *mime_type;
-
-			mime_type = header_content_type_simple (content_type);
-			pixbuf = pixbuf_for_mime_type (mime_type);
-			g_free (mime_type);
-			e_icon_list_append_pixbuf (icon_list, pixbuf, 
-						   NULL, label);
-			if (pixbuf)
-				gdk_pixbuf_unref (pixbuf);
-		}
-
-		g_free (label);
-	}
-
-	e_icon_list_thaw (icon_list);
-}
-
-static void
-remove_selected (EMsgComposerAttachmentBar *bar)
-{
-	EIconList *icon_list;
-	EMsgComposerAttachment *attachment;
-	GList *attachment_list;
-	GList *p;
-	gint num;
-
-	icon_list = E_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 = e_icon_list_get_selection (icon_list);
-	for (; p != NULL; p = p->next) {
-		num = GPOINTER_TO_INT (p->data);
-		attachment = E_MSG_COMPOSER_ATTACHMENT
-			(g_list_nth (bar->priv->attachments, num)->data);
-		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);
-}
-
-static void
-edit_selected (EMsgComposerAttachmentBar *bar)
-{
-	EIconList *icon_list;
-	EMsgComposerAttachment *attachment;
-	GList *selection;
-	gint num;
-
-	icon_list = E_ICON_LIST (bar);
-
-	selection = e_icon_list_get_selection (icon_list);
-	num = GPOINTER_TO_INT (selection->data);
-	attachment = g_list_nth (bar->priv->attachments, num)->data;
-
-	e_msg_composer_attachment_edit (attachment, GTK_WIDGET (bar));
-}
-
-
-/* "Attach" dialog.  */
-
-static void
-add_from_user (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposer *composer;
-	char *file_name;
-	
-	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	
-	file_name = e_msg_composer_select_file (composer, _("Attach a file"));
-	
-	add_from_file (bar, file_name);
-	
-	g_free (file_name);
-}
-
-
-/* Callbacks.  */
-
-static void
-add_cb (GtkWidget *widget,
-	gpointer data)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	add_from_user (E_MSG_COMPOSER_ATTACHMENT_BAR (data));
-}
-
-static void
-properties_cb (GtkWidget *widget,
-	       gpointer data)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);
-	edit_selected (data);
-}
-
-static void
-remove_cb (GtkWidget *widget,
-	   gpointer data)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);
-	remove_selected (bar);
-}
-
-
-/* Popup menu handling.  */
-
-static GnomeUIInfo icon_context_menu_info[] = {
-	GNOMEUIINFO_ITEM (N_("Remove"),
-			  N_("Remove selected items from the attachment list"),
-			  remove_cb, NULL),
-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (properties_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GtkWidget *
-get_icon_context_menu (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-
-	priv = bar->priv;
-	if (priv->icon_context_menu == NULL)
-		priv->icon_context_menu = gnome_popup_menu_new
-			(icon_context_menu_info);
-
-	return priv->icon_context_menu;
-}
-
-static void
-popup_icon_context_menu (EMsgComposerAttachmentBar *bar,
-			 gint num,
-			 GdkEventButton *event)
-{
-	GtkWidget *menu;
-
-	menu = get_icon_context_menu (bar);
-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);
-}
-
-static GnomeUIInfo context_menu_info[] = {
-	GNOMEUIINFO_ITEM (N_("Add attachment..."),
-			  N_("Attach a file to the message"),
-			  add_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GtkWidget *
-get_context_menu (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-
-	priv = bar->priv;
-	if (priv->context_menu == NULL)
-		priv->context_menu = gnome_popup_menu_new (context_menu_info);
-
-	return priv->context_menu;
-}
-
-static void
-popup_context_menu (EMsgComposerAttachmentBar *bar,
-		    GdkEventButton *event)
-{
-	GtkWidget *menu;
-
-	menu = get_context_menu (bar);
-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (object);
-
-	free_attachment_list (bar);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* GtkWidget methods.  */
-
-static gint
-button_press_event (GtkWidget *widget,
-		    GdkEventButton *event)
-{
-	EMsgComposerAttachmentBar *bar;
-	EIconList *icon_list;
-	gint icon_number;
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (widget);
-	icon_list = E_ICON_LIST (widget);
-
-	if (event->button != 3)
-		return GTK_WIDGET_CLASS (parent_class)->button_press_event
-			(widget, event);
-
-	icon_number = e_icon_list_get_icon_at (icon_list,
-					       event->x, event->y);
-
-	if (icon_number >= 0) {
-		e_icon_list_select_icon (icon_list, icon_number);
-		popup_icon_context_menu (bar, icon_number, event);
-	} else {
-		popup_context_menu (bar, event);
-	}
-
-	return TRUE;
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EMsgComposerAttachmentBarClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	EIconListClass *icon_list_class;
-
-	object_class = GTK_OBJECT_CLASS (class);
-	widget_class = GTK_WIDGET_CLASS (class);
-	icon_list_class = E_ICON_LIST_CLASS (class);
-
-	parent_class = gtk_type_class (e_icon_list_get_type ());
-
-	object_class->destroy = destroy;
-
-	widget_class->button_press_event = button_press_event;
-
-	/* Setup signals.  */
-
-	signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerAttachmentBarClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	guint icon_size, icon_height;
-	GdkFont *font;
-
-	priv = g_new (EMsgComposerAttachmentBarPrivate, 1);
-
-	priv->attachments = NULL;
-	priv->context_menu = NULL;
-	priv->icon_context_menu = NULL;
-
-	priv->num_attachments = 0;
-
-	bar->priv = priv;
-
-	/* FIXME partly hardcoded.  We should compute height from the font, and
-           allow at least 2 lines for every item.  */
-	icon_size = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;
-
-	font = GTK_WIDGET (bar)->style->font;
-	icon_height = icon_size + ((font->ascent + font->descent) * 2);
-	icon_size += 24;
-	
-	gtk_widget_set_usize (GTK_WIDGET (bar), icon_size * 4, icon_height);
-}
-
-
-GtkType
-e_msg_composer_attachment_bar_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerAttachmentBar",
-			sizeof (EMsgComposerAttachmentBar),
-			sizeof (EMsgComposerAttachmentBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (e_icon_list_get_type (), &info);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_attachment_bar_new (GtkAdjustment *adj)
-{
-	EMsgComposerAttachmentBar *new;
-	EIconList *icon_list;
-
-	gdk_rgb_init ();
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	new = gtk_type_new (e_msg_composer_attachment_bar_get_type ());
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	icon_list = E_ICON_LIST (new);
-
-	e_icon_list_construct (icon_list, ICON_WIDTH, 0);
-
-	e_icon_list_set_separators (icon_list, ICON_SEPARATORS);
-	e_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);
-	e_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);
-	e_icon_list_set_icon_border (icon_list, ICON_BORDER);
-	e_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);
-	e_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
-
-	return GTK_WIDGET (new);
-}
-
-/* FIXME: is_8bit() and best_encoding() should really be shared
-   between e-msg-composer.c and this file. */
-static gboolean
-is_8bit (const guchar *text)
-{
-	guchar *c;
-	
-	for (c = (guchar *) text; *c; c++)
-		if (*c > (guchar) 127)
-			return TRUE;
-	
-	return FALSE;
-}
-
-static int
-best_encoding (const guchar *text)
-{
-	guchar *ch;
-	int count = 0;
-	int total;
-	
-	for (ch = (guchar *) text; *ch; ch++)
-		if (*ch > (guchar) 127)
-			count++;
-	
-	total = (int) (ch - text);
-	
-	if ((float) count <= total * 0.17)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-}
-
-static void
-attach_to_multipart (CamelMultipart *multipart,
-		     EMsgComposerAttachment *attachment)
-{
-	CamelContentType *content_type;
-	
-	content_type = camel_mime_part_get_content_type (attachment->body);
-	
-	if (!header_content_type_is (content_type, "multipart", "*")) {
-		if (header_content_type_is (content_type, "text", "*")) {
-			CamelStream *stream;
-			GByteArray *array;
-			guchar *text;
-			
-			array = g_byte_array_new ();
-			stream = camel_stream_mem_new_with_byte_array (array);
-			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment->body), stream);
-			g_byte_array_append (array, "", 1);
-			text = array->data;
-			
-			if (is_8bit (text))
-				camel_mime_part_set_encoding (attachment->body, best_encoding (text));
-			else
-				camel_mime_part_set_encoding (attachment->body, CAMEL_MIME_PART_ENCODING_7BIT);
-			
-			camel_object_unref (CAMEL_OBJECT (stream));
-		} else if (!header_content_type_is (content_type, "message", "*")) {
-			camel_mime_part_set_encoding (attachment->body,
-						      CAMEL_MIME_PART_ENCODING_BASE64);
-		}
-	}
-	
-	camel_multipart_add_part (multipart, attachment->body);
-}
-
-void
-e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar,
-					    CamelMultipart *multipart)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GList *p;
-
-	g_return_if_fail (bar != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	g_return_if_fail (multipart != NULL);
-	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);
-	}
-}
-
-
-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);
-}
-
-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 17d717cc10..0000000000
--- a/composer/e-msg-composer-attachment-bar.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-attachment-bar.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
-
-#include <gnome.h>
-#include "e-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) \
-	(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar))
-#define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \
-	(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-
-
-typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate;
-
-struct _EMsgComposerAttachmentBar {
-	EIconList parent;
-
-	EMsgComposerAttachmentBarPrivate *priv;
-};
-typedef struct _EMsgComposerAttachmentBar       EMsgComposerAttachmentBar;
-
-struct _EMsgComposerAttachmentBarClass {
-	EIconListClass parent_class;
-
-	void (* changed) (EMsgComposerAttachmentBar *bar);
-};
-typedef struct _EMsgComposerAttachmentBarClass  EMsgComposerAttachmentBarClass;
-
-
-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);
-guint e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar);
-void e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar, const gchar *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 223d118de5..0000000000
--- a/composer/e-msg-composer-attachment.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* This is the object representing an email attachment.  It is implemented as a
-   GtkObject 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. */
-
-#include <sys/stat.h>
-
-#include <gnome.h>
-#include <camel/camel.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-attachment.h"
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GtkObjectClass *parent_class = NULL;
-
-
-static void
-changed (EMsgComposerAttachment *attachment)
-{
-	gtk_signal_emit (GTK_OBJECT (attachment), signals[CHANGED]);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerAttachment *attachment;
-
-	attachment = E_MSG_COMPOSER_ATTACHMENT (object);
-
-	camel_object_unref (CAMEL_OBJECT (attachment->body));
-	if (attachment->pixbuf_cache != NULL)
-		gdk_pixbuf_unref (attachment->pixbuf_cache);
-}
-
-
-/* Signals.  */
-
-static void
-real_changed (EMsgComposerAttachment *msg_composer_attachment)
-{
-	g_return_if_fail (msg_composer_attachment != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (msg_composer_attachment));
-}
-
-
-static void
-class_init (EMsgComposerAttachmentClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = destroy;
-
-	signals[CHANGED] = gtk_signal_new ("changed",
-					   GTK_RUN_FIRST,
-					   object_class->type,
-					   GTK_SIGNAL_OFFSET
-					   	(EMsgComposerAttachmentClass,
-						 changed),
-					   gtk_marshal_NONE__NONE,
-					   GTK_TYPE_NONE, 0);
-
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	klass->changed = real_changed;
-}
-
-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;
-}
-
-GtkType
-e_msg_composer_attachment_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerAttachment",
-			sizeof (EMsgComposerAttachment),
-			sizeof (EMsgComposerAttachmentClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-
-/**
- * e_msg_composer_attachment_new:
- * @file_name: 
- * 
- * Return value: 
- **/
-EMsgComposerAttachment *
-e_msg_composer_attachment_new (const gchar *file_name)
-{
-	EMsgComposerAttachment *new;
-	CamelMimePart *part;
-	CamelDataWrapper *wrapper;
-	CamelStream *stream;
-	struct stat statbuf;
-	gchar *mime_type;
-	
-	g_return_val_if_fail (file_name != NULL, NULL);
-	
-	if (stat (file_name, &statbuf) < 0)
-		return NULL;
-	
-	/* return if it's not a regular file */
-	if (!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);
-	if (mime_type) {
-		camel_data_wrapper_set_mime_type (wrapper, mime_type);
-		g_free (mime_type);
-	} else
-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (CAMEL_OBJECT (wrapper));
-
-	camel_mime_part_set_disposition (part, "attachment");
-	if (strchr (file_name, '/'))
-		camel_mime_part_set_filename (part, strrchr (file_name, '/') + 1);
-	else
-		camel_mime_part_set_filename (part, file_name);
-	
-	new = e_msg_composer_attachment_new_from_mime_part (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;
-
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);
-
-	new = gtk_type_new (e_msg_composer_attachment_get_type ());
-
-	new->editor_gui = NULL;
-	new->body = part;
-	camel_object_ref (CAMEL_OBJECT (part));
-	new->guessed_type = FALSE;
-	new->size = 0;
-
-	return new;
-}
-
-
-/* The attachment property dialog.  */
-
-struct _DialogData {
-	GtkWidget *dialog;
-	GtkEntry *file_name_entry;
-	GtkEntry *description_entry;
-	GtkEntry *mime_type_entry;
-	GtkOptionMenu *disposition_option;
-	EMsgComposerAttachment *attachment;
-};
-typedef struct _DialogData 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
-update_mime_type (DialogData *data)
-{
-	const gchar *mime_type;
-	gchar *file_name;
-
-	if (!data->attachment->guessed_type)
-		return;
-
-	file_name = e_utf8_gtk_entry_get_text (data->file_name_entry);
-	mime_type = e_msg_composer_guess_mime_type (file_name);
-	g_free (file_name);
-
-	e_utf8_gtk_entry_set_text (data->mime_type_entry, mime_type);
-}
-
-static void
-set_entry (GladeXML *xml,
-	   const gchar *widget_name,
-	   const gchar *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
-		e_utf8_gtk_entry_set_text (entry, value ? value : "");
-}
-
-static void
-connect_widget (GladeXML *gui,
-		const gchar *name,
-		const gchar *signal_name,
-		GtkSignalFunc func,
-		gpointer data)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget (gui, name);
-	gtk_signal_connect (GTK_OBJECT (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 (glade_xml_get_widget (attachment->editor_gui,
-						  "dialog"));
-	gtk_object_unref (GTK_OBJECT (attachment->editor_gui));
-	attachment->editor_gui = NULL;
-
-	destroy_dialog_data (dialog_data);
-}
-
-/* Why was this never part of GTK? */
-static int
-option_menu_get_history (GtkOptionMenu *menu)
-{
-	GtkWidget *active;
-
-	g_return_val_if_fail (menu != NULL, -1);
-	g_return_val_if_fail (GTK_IS_OPTION_MENU (menu), -1);
-
-	if (menu->menu) {
-		active = gtk_menu_get_active (GTK_MENU (menu->menu));
-
-		if (active)
-			return g_list_index (GTK_MENU_SHELL (menu->menu)->children,
-					     active);
-		else 
-			return -1;
-	} else 
-		return -1;
-}
-
-static void
-ok_cb (GtkWidget *widget,
-       gpointer data)
-{
-	DialogData *dialog_data;
-	EMsgComposerAttachment *attachment;
-	gchar *str;
-	int option;
-	
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-
-	str = e_utf8_gtk_entry_get_text (dialog_data->file_name_entry);
-	camel_mime_part_set_filename (attachment->body, str);
-	g_free (str);
-
-	str = e_utf8_gtk_entry_get_text (dialog_data->description_entry);
-	camel_mime_part_set_description (attachment->body, str);
-	g_free (str);
-
-	str = e_utf8_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);
-	g_free (str);
-
-	option = option_menu_get_history (dialog_data->disposition_option);
-	switch (option) {
-	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
-file_name_focus_out_cb (GtkWidget *widget,
-			GdkEventFocus *event,
-			gpointer data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-	update_mime_type (dialog_data);
-}
-
-
-void
-e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
-				GtkWidget *parent)
-{
-	DialogData *dialog_data;
-	GladeXML *editor_gui;
-
-	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 (E_GLADEDIR "/e-msg-composer-attachment.glade",
-				    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);
-	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_option = GTK_OPTION_MENU (glade_xml_get_widget 
-							  (editor_gui,
-							   "disposition_option"));
-
-	if (attachment != NULL) {
-		CamelContentType *content_type;
-		char *type;
-
-		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 = header_content_type_simple (content_type);
-		set_entry (editor_gui, "mime_type_entry", type);
-		g_free (type);
-	}
-
-	connect_widget (editor_gui, "ok_button", "clicked", ok_cb, dialog_data);
-	connect_widget (editor_gui, "close_button", "clicked", close_cb, dialog_data);
-
-	connect_widget (editor_gui, "file_name_entry", "focus_out_event",
-			file_name_focus_out_cb, dialog_data);
-}
diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade
deleted file mode 100644
index 4679a0d8e0..0000000000
--- a/composer/e-msg-composer-attachment.glade
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-msg-composer-attachment</name>
-  <program_name>e-msg-composer-attachment</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title>Attachment properties</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>4</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>10</row_spacing>
-      <column_spacing>5</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>description_entry</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>10</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>True</xshrink>
-	  <yshrink>True</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>file_name_entry</name>
-	  <width>290</width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>mime_type_entry</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<sensitive>False</sensitive>
-	<can_focus>True</can_focus>
-	<editable>False</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>MIME type:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Description:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>File name:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Send as:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkOptionMenu</class>
-	<name>disposition_option</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<items>Attachment
-Inline attachment
-</items>
-	<initial_choice>1</initial_choice>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>ok_button</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>close_button</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
deleted file mode 100644
index 47bc85ece0..0000000000
--- a/composer/e-msg-composer-attachment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-#ifndef __E_MSG_COMPOSER_ATTACHMENT_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_H__
-
-#include <gnome.h>
-#include <glade/glade-xml.h>
-#include <camel/camel-mime-part.h>
-#include <gdk-pixbuf/gdk-pixbuf.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)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment))
-#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-
-
-typedef struct _EMsgComposerAttachment       EMsgComposerAttachment;
-typedef struct _EMsgComposerAttachmentClass  EMsgComposerAttachmentClass;
-
-struct _EMsgComposerAttachment {
-	GtkObject parent;
-
-	GladeXML *editor_gui;
-
-	CamelMimePart *body;
-	gboolean guessed_type;
-	gulong size;
-
-	GdkPixbuf *pixbuf_cache;
-};
-
-struct _EMsgComposerAttachmentClass {
-	GtkObjectClass parent_class;
-
-	void (*changed)	(EMsgComposerAttachment *msg_composer_attachment);
-};
-
-
-GtkType e_msg_composer_attachment_get_type (void);
-EMsgComposerAttachment *e_msg_composer_attachment_new (const gchar *file_name);
-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 3fa0634e52..0000000000
--- a/composer/e-msg-composer-hdrs.c
+++ /dev/null
@@ -1,816 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.c
- *
- * Copyright (C) 1999 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <camel/camel.h>
-
-#include <bonobo.h>
-
-#include <liboaf/liboaf.h>
-
-#include "Composer.h"
-
-#include "e-msg-composer-hdrs.h"
-#include <gal/e-text/e-entry.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "mail/mail-config.h"
-
-
-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-
-struct _EMsgComposerHdrsPrivate {
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-
-	/* Total number of headers that we have.  */
-	guint num_hdrs;
-
-	/* The tooltips.  */
-	GtkTooltips *tooltips;
-	
-	GSList *from_options;
-	
-	/* Standard headers.  */
-	GtkWidget *from_entry;
-	GtkWidget *to_entry;
-	GtkWidget *cc_entry;
-	GtkWidget *bcc_entry;
-	GtkWidget *subject_entry;
-};
-
-
-static GtkTableClass *parent_class = NULL;
-
-enum {
-	SHOW_ADDRESS_DIALOG,
-	SUBJECT_CHANGED,
-	HDRS_CHANGED,
-	LAST_SIGNAL
-};
-
-enum {
-	HEADER_ADDRBOOK,
-	HEADER_OPTIONMENU,
-	HEADER_ENTRYBOX
-};
-
-static gint signals[LAST_SIGNAL];
-
-
-static gboolean
-setup_corba (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-	CORBA_Environment ev;
-
-	priv = hdrs->priv;
-
-	g_assert (priv->corba_select_names == CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-
-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without
-           raising an exception in `ev'.  */
-	if (ev._major != CORBA_NO_EXCEPTION || priv->corba_select_names == CORBA_OBJECT_NIL) {
-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-typedef struct {
-	EMsgComposerHdrs *hdrs;
-	char *string;
-} EMsgComposerHdrsAndString;
-
-static void
-e_msg_composer_hdrs_and_string_free(EMsgComposerHdrsAndString *emchas)
-{
-	if (emchas->hdrs)
-		gtk_object_unref(GTK_OBJECT(emchas->hdrs));
-	g_free(emchas->string);
-}
-
-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)
-		gtk_object_ref(GTK_OBJECT(emchas->hdrs));
-
-	return emchas;
-}
-
-static void
-address_button_clicked_cb (GtkButton *button,
-			   gpointer data)
-{
-	EMsgComposerHdrsAndString *emchas;
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-	CORBA_Environment ev;
-
-	emchas = data;
-	hdrs = emchas->hdrs;
-	priv = hdrs->priv;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv->corba_select_names, emchas->string, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-from_changed (GtkWidget *item, gpointer data)
-{
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (data);
-	
-	hdrs->account = gtk_object_get_data (GTK_OBJECT (item), "account");
-}
-
-static GtkWidget *
-create_optionmenu (EMsgComposerHdrs *hdrs,
-		   const char *name)
-{
-	GtkWidget *omenu, *menu, *first = NULL;
-	int i = 0, history = 0;
-	
-	omenu = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	
-	if (!strcmp (name, _("From:"))) {
-		const GSList *accounts;
-		GtkWidget *item;
-		
-		accounts = mail_config_get_accounts ();
-		while (accounts) {
-			const MailConfigAccount *account;
-			char *label;
-			char *native_label;
-
-			account = accounts->data;
-			
-			/* this should never ever fail */
-			if (!account || !account->name || !account->id) {
-				g_assert_not_reached ();
-				continue;
-			}
-			
-			if (strcmp (account->name, account->id->address))
-				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);
-			    
-
-			native_label = e_utf8_to_gtk_string (GTK_WIDGET (menu), label);
-			item = gtk_menu_item_new_with_label (native_label);
-			g_free (native_label);
-			g_free (label);
-			
-			gtk_object_set_data (GTK_OBJECT (item), "account", account_copy (account));
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (from_changed), hdrs);
-			
-			if (account->default_account) {
-				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_append (GTK_MENU (menu), item);
-			gtk_widget_show (item);
-			
-			accounts = accounts->next;
-			i++;
-		}
-	}
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	if (first) {
-		gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", hdrs);
-	}
-	
-	return omenu;
-}
-
-static void
-addressbook_entry_changed (BonoboListener    *listener,
-			   char              *event_name,
-			   CORBA_any         *arg,
-			   CORBA_Environment *ev,
-			   gpointer           user_data)
-{
-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (user_data);
-
-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[HDRS_CHANGED]);
-}
-
-static GtkWidget *
-create_addressbook_entry (EMsgComposerHdrs *hdrs,
-			  const char *name)
-{
-	EMsgComposerHdrsPrivate *priv;
-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
-	Bonobo_Control corba_control;
-	GtkWidget *control_widget;
-	CORBA_Environment ev;
-	BonoboControlFrame *cf;
-	Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;
-
-	priv = hdrs->priv;
-	corba_select_names = priv->corba_select_names;
-
-	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, CORBA_OBJECT_NIL);
-
-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control_widget));
-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);
-
-	bonobo_event_source_client_add_listener (pb, addressbook_entry_changed,
-						 "Bonobo/Property:change:entry_changed",
-						 NULL, hdrs);
-
-	return control_widget;
-}
-
-static void
-entry_changed (GtkWidget *entry, EMsgComposerHdrs *hdrs)
-{
-	gchar *tmp;
-	gchar *subject;
-
-	tmp = e_msg_composer_hdrs_get_subject (hdrs);
-	subject = e_utf8_to_gtk_string (GTK_WIDGET (entry), tmp);
-
-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[SUBJECT_CHANGED], subject);
-	g_free (tmp);
-
-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[HDRS_CHANGED]);
-}
-
-static GtkWidget *
-add_header (EMsgComposerHdrs *hdrs,
-	    const gchar *name,
-	    const gchar *tip,
-	    const gchar *tip_private,
-	    int type)
-{
-	EMsgComposerHdrsPrivate *priv;
-	GtkWidget *label;
-	GtkWidget *entry;
-	guint pad;
-	
-	priv = hdrs->priv;
-	
-	if (type == HEADER_ADDRBOOK) {
-		label = gtk_button_new_with_label (name);
-		GTK_OBJECT_UNSET_FLAGS (label, GTK_CAN_FOCUS);
-		gtk_signal_connect_full (GTK_OBJECT (label), "clicked",
-					 GTK_SIGNAL_FUNC (address_button_clicked_cb), NULL,
-					 e_msg_composer_hdrs_and_string_create(hdrs, name),
-					 (GtkDestroyNotify) e_msg_composer_hdrs_and_string_free,
-					 FALSE, FALSE);
-		pad = 2;
-		gtk_tooltips_set_tip (hdrs->priv->tooltips, label,
-				      _("Click here for the address book"),
-				      NULL);
-	} else {
-		label = gtk_label_new (name);
-		pad = GNOME_PAD;
-	}
-	
-	gtk_table_attach (GTK_TABLE (hdrs), label,
-			  0, 1, priv->num_hdrs, priv->num_hdrs + 1,
-			  GTK_FILL, GTK_FILL,
-			  pad, pad);
-	gtk_widget_show (label);
-	
-	switch (type) {
-	case HEADER_ADDRBOOK:
-		entry = create_addressbook_entry (hdrs, name);
-		break;
-	case HEADER_OPTIONMENU:
-		entry = create_optionmenu (hdrs, name);
-		break;
-	case HEADER_ENTRYBOX:
-	default:
-		entry = e_entry_new ();
-		gtk_object_set (GTK_OBJECT(entry),
-				"editable", TRUE,
-				"use_ellipsis", TRUE,
-				"allow_newlines", FALSE,
-				NULL);
-		gtk_signal_connect (GTK_OBJECT (entry), "changed",
-				    GTK_SIGNAL_FUNC (entry_changed), hdrs);
-	}
-
-	if (entry != NULL) {
-		gtk_widget_show (entry);
-		
-		gtk_table_attach (GTK_TABLE (hdrs), entry,
-				  1, 2, priv->num_hdrs, priv->num_hdrs + 1,
-				  GTK_FILL | GTK_EXPAND, 0,
-				  2, 2);
-		
-		gtk_tooltips_set_tip (hdrs->priv->tooltips, entry, tip, tip_private);
-	}
-	
-	priv->num_hdrs++;
-	
-	return entry;
-}
-
-static void
-setup_headers (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-
-	priv = hdrs->priv;
-	
-	priv->from_entry = add_header
-		(hdrs, _("From:"), 
-		 _("Enter the identity you wish to send this message from"),
-		 NULL,
-		 HEADER_OPTIONMENU);
-	priv->to_entry = add_header
-		(hdrs, _("To:"), 
-		 _("Enter the recipients of the message"),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->cc_entry = add_header
-		(hdrs, _("Cc:"),
-		 _("Enter the addresses that will receive a carbon copy of "
-		   "the message"),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->bcc_entry = add_header
-		(hdrs, _("Bcc:"),
-		 _("Enter the addresses that will receive a carbon copy of "
-		   "the message without appearing in the recipient list of "
-		   "the message."),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->subject_entry = add_header
-		(hdrs, _("Subject:"),
-		 _("Enter the subject of the mail"),
-		 NULL,
-		 HEADER_ENTRYBOX);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-	GSList *l;
-
-	hdrs = E_MSG_COMPOSER_HDRS (object);
-	priv = hdrs->priv;
-
-	if (priv->corba_select_names != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->corba_select_names, &ev);
-		CORBA_exception_free (&ev);
-	}
-
-	gtk_object_destroy (GTK_OBJECT (priv->tooltips));
-	
-	l = priv->from_options;
-	while (l) {
-		MailConfigAccount *account;
-		GtkWidget *item = l->data;
-		
-		account = gtk_object_get_data (GTK_OBJECT (item), "account");
-		account_destroy (account);
-		
-		l = l->next;
-	}
-	g_slist_free (priv->from_options);
-	
-	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 = gtk_type_class (gtk_table_get_type ());
-
-	signals[SHOW_ADDRESS_DIALOG] =
-		gtk_signal_new ("show_address_dialog",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,
-						   show_address_dialog),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	signals[SUBJECT_CHANGED] =
-		gtk_signal_new ("subject_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,
-						   subject_changed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE,
-				1, GTK_TYPE_STRING);
-
-	signals[HDRS_CHANGED] =
-		gtk_signal_new ("hdrs_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,
-						   hdrs_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-
-	priv = g_new (EMsgComposerHdrsPrivate, 1);
-
-	priv->corba_select_names = CORBA_OBJECT_NIL;
-	
-	priv->from_options  = NULL;
-	
-	priv->from_entry    = NULL;
-	priv->to_entry      = NULL;
-	priv->cc_entry      = NULL;
-	priv->bcc_entry     = NULL;
-	priv->subject_entry = NULL;
-	
-	priv->tooltips = gtk_tooltips_new ();
-
-	priv->num_hdrs = 0;
-	
-	hdrs->priv = priv;
-	
-	hdrs->account = NULL;
-}
-
-
-GtkType
-e_msg_composer_hdrs_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerHdrs",
-			sizeof (EMsgComposerHdrs),
-			sizeof (EMsgComposerHdrsClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_new (void)
-{
-	EMsgComposerHdrs *new;
-	EMsgComposerHdrsPrivate *priv;
-	
-	new = gtk_type_new (e_msg_composer_hdrs_get_type ());
-	priv = new->priv;
-	
-	if (! setup_corba (new)) {
-		gtk_widget_destroy (GTK_WIDGET (new));
-		return NULL;
-	}
-	
-	setup_headers (new);
-
-	return GTK_WIDGET (new);
-}
-
-
-static void
-set_recipients (CamelMimeMessage *msg, GtkWidget *entry_widget, const gchar *type)
-{
-	CamelInternetAddress *addr;
-	char *string;
-	
-	bonobo_widget_get_property (BONOBO_WIDGET (entry_widget), "text", &string, NULL);
-	
-	addr = camel_internet_address_new ();
-	camel_address_unformat (CAMEL_ADDRESS (addr), string);
-	
-	/* TODO: In here, we could cross-reference the names with an alias book
-	   or address book, it should be sufficient for unformat to do the parsing too */
-	
-	camel_mime_message_set_recipients (msg, type, addr);
-	
-	camel_object_unref (CAMEL_OBJECT (addr));
-	g_free (string);
-}
-
-void
-e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs,
-				CamelMimeMessage *msg)
-{
-	gchar *subject;
-	CamelInternetAddress *from;
-	
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (msg != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));
-	
-	subject = e_msg_composer_hdrs_get_subject (hdrs);
-	camel_mime_message_set_subject (msg, subject);
-	g_free (subject);
-	
-	from = e_msg_composer_hdrs_get_from (hdrs);
-	camel_mime_message_set_from (msg, from);
-	camel_object_unref (CAMEL_OBJECT (from));
-	
-	set_recipients (msg, hdrs->priv->to_entry, CAMEL_RECIPIENT_TYPE_TO);
-	set_recipients (msg, hdrs->priv->cc_entry, CAMEL_RECIPIENT_TYPE_CC);
-	set_recipients (msg, hdrs->priv->bcc_entry, CAMEL_RECIPIENT_TYPE_BCC);
-}
-
-
-static void
-set_entry (BonoboWidget *bonobo_widget,
-	   const GList *list)
-{
-	GString *string;
-	const GList *p;
-	
-	string = g_string_new ("");
-	for (p = list; p != NULL; p = p->next) {
-		if (string->str[0] != '\0')
-			g_string_append (string, ", ");
-		g_string_append (string, p->data);
-	}
-	
-	bonobo_widget_set_property (BONOBO_WIDGET (bonobo_widget), "text", string->str, NULL);
-	
-	g_string_free (string, 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;
-	GtkWidget *item;
-	GSList *l;
-	int i = 0;
-	
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	omenu = GTK_OPTION_MENU (hdrs->priv->from_entry);
-
-	/* find the item that represents the account and activate it */
-	l = hdrs->priv->from_options;
-	while (l) {
-		MailConfigAccount *account;
-		item = l->data;
-		
-		account = gtk_object_get_data (GTK_OBJECT (item), "account");
-		if ((account_name && !strcmp (account_name, account->name)) ||
-		    (!account_name && account->default_account)) {
-			gtk_option_menu_set_history (omenu, i);
-			gtk_signal_emit_by_name (GTK_OBJECT (item), "activate", hdrs);
-			return;
-		}
-		
-		l = l->next;
-		i++;
-	}
-}
-
-void
-e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
-			    const GList *to_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->to_entry), to_list);
-}
-
-void
-e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
-			    const GList *cc_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->cc_entry), cc_list);
-}
-
-void
-e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
-			     const GList *bcc_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->bcc_entry), bcc_list);
-}
-
-void
-e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
-				 const char *subject)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (subject != NULL);
-
-	gtk_object_set (GTK_OBJECT (hdrs->priv->subject_entry),
-			"text", subject,
-			NULL);
-}
-
-
-CamelInternetAddress *
-e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs)
-{
-	const MailConfigAccount *account;
-	CamelInternetAddress *addr;
-	
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	account = hdrs->account;
-	if (!account || !account->id) {
-		/* 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;
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-char *
-e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)
-{
-	gchar *subject;
-	
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	gtk_object_get (GTK_OBJECT (hdrs->priv->subject_entry),
-			"text", &subject, NULL);
-	
-	return subject;
-}
-
-
-GtkWidget *
-e_msg_composer_hdrs_get_to_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	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 (hdrs != NULL, NULL);
-	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 (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	return hdrs->priv->bcc_entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_subject_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	return hdrs->priv->subject_entry;
-}
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
deleted file mode 100644
index 9b1c5c4c84..0000000000
--- a/composer/e-msg-composer-hdrs.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.h
- *
- * Copyright (C) 1999 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef ___E_MSG_COMPOSER_HDRS_H__
-#define ___E_MSG_COMPOSER_HDRS_H__
-
-#include <gnome.h>
-#include <camel/camel-mime-message.h>
-#include <mail/mail-config.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)		(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs))
-#define E_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass))
-#define E_IS_MSG_COMPOSER_HDRS(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))
-#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_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;
-	
-	const MailConfigAccount *account;
-	
-	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);
-};
-
-
-GtkType     e_msg_composer_hdrs_get_type           (void);
-GtkWidget  *e_msg_composer_hdrs_new                (void);
-
-void        e_msg_composer_hdrs_to_message         (EMsgComposerHdrs *hdrs,
-						    CamelMimeMessage *msg);
-
-void        e_msg_composer_hdrs_set_from_account   (EMsgComposerHdrs *hdrs,
-						    const char *account_name);
-void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,
-						    const GList      *to_list);
-void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,
-						    const GList      *cc_list);
-void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,
-						    const GList      *bcc_list);
-void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,
-						    const char       *subject);
-
-CamelInternetAddress *e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_to             (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_cc             (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_bcc            (EMsgComposerHdrs *hdrs);
-char       *e_msg_composer_hdrs_get_subject        (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_subject_entry  (EMsgComposerHdrs *hdrs);
-
-#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 36b53c8446..0000000000
--- a/composer/e-msg-composer-select-file.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-select-file.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <gtk/gtkfilesel.h>
-
-#include "e-msg-composer-select-file.h"
-
-
-struct _FileSelectionInfo {
-	GtkWidget *widget;
-	char *selected_file;
-};
-typedef struct _FileSelectionInfo FileSelectionInfo;
-
-
-static void
-confirm (FileSelectionInfo *info)
-{
-	const char *filename;
-
-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (info->widget));
-	info->selected_file = g_strdup (filename);
-
-	gtk_widget_hide (info->widget);
-
-	gtk_main_quit ();
-}
-
-static void
-cancel (FileSelectionInfo *info)
-{
-	g_assert (info->selected_file == NULL);
-
-	gtk_widget_hide (info->widget);
-
-	gtk_main_quit ();
-}
-
-
-/* Callbacks.  */
-
-static void
-ok_clicked_cb (GtkWidget *widget,
-	       void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	confirm (info);
-}
-
-static void
-cancel_clicked_cb (GtkWidget *widget,
-		   void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	cancel (info);
-}
-
-static int
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	cancel (info);
-
-	return TRUE;
-}
-
-
-/* Setup.  */
-
-static FileSelectionInfo *
-create_file_selection (EMsgComposer *composer)
-{
-	FileSelectionInfo *info;
-	GtkWidget *widget;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	info = g_new (FileSelectionInfo, 1);
-
-	widget        = gtk_file_selection_new (NULL);
-	gtk_window_set_wmclass (GTK_WINDOW (widget), "fileselection", 
-				"Evolution:composer");
-	ok_button     = GTK_FILE_SELECTION (widget)->ok_button;
-	cancel_button = GTK_FILE_SELECTION (widget)->cancel_button;
-
-	gtk_signal_connect (GTK_OBJECT (ok_button),
-			    "clicked", GTK_SIGNAL_FUNC (ok_clicked_cb), info);
-	gtk_signal_connect (GTK_OBJECT (cancel_button),
-			    "clicked", GTK_SIGNAL_FUNC (cancel_clicked_cb), info);
-	gtk_signal_connect (GTK_OBJECT (widget), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), info);
-
-	info->widget        = widget;
-	info->selected_file = NULL;
-
-	return info;
-}
-
-static void
-file_selection_info_destroy_notify (void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-
-	g_free (info->selected_file);
-	g_free (info);
-}
-
-
-char *
-e_msg_composer_select_file (EMsgComposer *composer,
-			    const char *title)
-{
-	FileSelectionInfo *info;
-	char *retval;
-
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-
-	info = gtk_object_get_data (GTK_OBJECT (composer),
-				    "e-msg-composer-file-selection-info");
-
-	if (info == NULL) {
-		info = create_file_selection (composer);
-		gtk_object_set_data_full (GTK_OBJECT (composer),
-					  "e-msg-composer-file-selection-info", info,
-					  file_selection_info_destroy_notify);
-	}
-
-	if (GTK_WIDGET_VISIBLE (info->widget))
-		return NULL;		/* Busy!  */
-
-	gtk_window_set_title (GTK_WINDOW (info->widget), title);
-	gtk_widget_show (info->widget);
-
-	GDK_THREADS_ENTER();
-	gtk_main ();
-	GDK_THREADS_LEAVE();
-
-	retval = info->selected_file;
-	info->selected_file = NULL;
-
-	return retval;
-}
diff --git a/composer/e-msg-composer-select-file.h b/composer/e-msg-composer-select-file.h
deleted file mode 100644
index 2f89bd58b4..0000000000
--- a/composer/e-msg-composer-select-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-select-file.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_MSG_COMPOSER_SELECT_FILE_H
-#define E_MSG_COMPOSER_SELECT_FILE_H
-
-#include "e-msg-composer.h"
-
-char *e_msg_composer_select_file (EMsgComposer *composer,
-				  const char *title);
-
-#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 03e747c481..0000000000
--- a/composer/e-msg-composer.c
+++ /dev/null
@@ -1,2369 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ettore Perazzoli, Jeffrey Stedfast
- */
-
-/*
-
-   TODO
-
-   - Somehow users should be able to see if any file(s) are attached even when
-     the attachment bar is not shown.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <errno.h>
-
-#include <bonobo.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <glade/glade.h>
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include "camel/camel.h"
-#include "camel-charset-map.h"
-
-#include "mail/mail.h"
-#include "mail/mail-crypto.h"
-#include "mail/mail-tools.h"
-#include "mail/mail-ops.h"
-
-#include "e-util/e-html-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.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 "Editor.h"
-#include "listener.h"
-
-#include <libgnomevfs/gnome-vfs.h>
-
-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor"
-
-
-#define DEFAULT_WIDTH 600
-#define DEFAULT_HEIGHT 500
-
-enum {
-	SEND,
-	POSTPONE,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GnomeAppClass *parent_class = NULL;
-
-/* local prototypes */
-static GList *add_recipients (GList *list, const char *recips, gboolean decode);
-static void free_recipients (GList *list);
-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-
-
-static char *
-get_text (Bonobo_PersistStream persist, char *format)
-{
-	BonoboStream *stream;
-	BonoboStreamMem *stream_mem;
-	CORBA_Environment ev;
-	char *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_malloc (stream_mem->pos + 1);
-	memcpy (text, stream_mem->buffer, stream_mem->pos);
-	text[stream_mem->pos] = 0;
-	bonobo_object_unref (BONOBO_OBJECT(stream));
-	
-	return text;
-}
-
-#define LINE_LEN 72
-
-typedef enum {
-	MSG_FORMAT_PLAIN,
-	MSG_FORMAT_ALTERNATIVE,
-} MsgFormat;
-
-static gboolean
-is_8bit (const guchar *text)
-{
-	guchar *c;
-	
-	for (c = (guchar *) text; *c; c++)
-		if (*c > (guchar) 127)
-			return TRUE;
-	
-	return FALSE;
-}
-
-static int
-best_encoding (const guchar *text)
-{
-	guchar *ch;
-	int count = 0;
-	int total;
-	
-	for (ch = (guchar *) text; *ch; ch++)
-		if (*ch > (guchar) 127)
-			count++;
-	
-	total = (int) (ch - text);
-	
-	if ((float) count <= total * 0.17)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-}
-
-static char *
-best_content (gchar *plain)
-{
-	char *result;
-	const char *best;
-
-	if ((best = camel_charset_best (plain, strlen (plain)))) {
-		result = g_strdup_printf ("text/plain; charset=%s", best);
-	} else {
-		result = g_strdup ("text/plain");
-	}
-	
-	return result;
-}
-
-static gboolean
-clear_inline_images (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-
-	return TRUE;
-}
-
-void
-e_msg_composer_clear_inlined_table (EMsgComposer *composer)
-{
-	g_hash_table_foreach_remove (composer->inline_images, clear_inline_images, NULL);
-}
-
-static void
-add_inlined_image (gpointer key, gpointer value, gpointer data)
-{
-	gchar *file_name          = (gchar *) key;
-	gchar *cid                = (gchar *) value;
-	gchar *id, *mime_type;
-	CamelMultipart *multipart = (CamelMultipart *) data;
-	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;
-
-	if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0)))
-		return;
-
-	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 (CAMEL_OBJECT (wrapper));
-
-	id = g_strconcat ("<", cid, ">", NULL);
-	camel_mime_part_set_content_id (part, id);
-	g_free (id);
-	/* FIXME: should this use g_basename (file_name)? */
-	camel_mime_part_set_filename (part, strchr (file_name, '/') ? strrchr (file_name, '/') + 1 : file_name);
-	camel_mime_part_set_encoding (part, CAMEL_MIME_PART_ENCODING_BASE64);
-
-	camel_multipart_add_part (multipart, part);
-	camel_object_unref (CAMEL_OBJECT (part));
-}
-
-static void
-add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)
-{
-	g_hash_table_foreach (composer->inline_images, add_inlined_image, multipart);
-}
-
-/* This functions builds a CamelMimeMessage for the message that the user has
-   composed in `composer'.  */
-static CamelMimeMessage *
-build_message (EMsgComposer *composer)
-{
-	EMsgComposerAttachmentBar *attachment_bar =
-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	MsgFormat type = MSG_FORMAT_ALTERNATIVE;
-	CamelInternetAddress *from;
-	CamelMimeMessage *new;
-	CamelMultipart *body = NULL;
-	CamelMimePart *part;
-	gboolean plain_e8bit = FALSE, html_e8bit = FALSE;
-	CamelException ex;
-	char *html = NULL, *plain = NULL;
-	char *content_type = NULL;
-	int i;
-	
-	if (composer->persist_stream_interface == CORBA_OBJECT_NIL)
-		return NULL;
-	
-	if (composer->send_html)
-		type = MSG_FORMAT_ALTERNATIVE;
-	else
-		type = MSG_FORMAT_PLAIN;
-	
-	/* get and/or set the From field */
-	from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	if (!from) {
-		const MailConfigAccount *account = NULL;
-		
-		account = mail_config_get_default_account ();
-		
-		/* if !account then we have mucho problemos, amigo */
-		if (!account)
-			return NULL;
-		
-		e_msg_composer_hdrs_set_from_account (E_MSG_COMPOSER_HDRS (composer->hdrs), account->name);
-	}
-	camel_object_unref (CAMEL_OBJECT (from));
-	
-	new = camel_mime_message_new ();
-	
-	e_msg_composer_hdrs_to_message (E_MSG_COMPOSER_HDRS (composer->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]);
-	}
-	
-	plain = get_text (composer->persist_stream_interface, "text/plain");
-
-	/* the component has probably died */ 
-	if (plain == NULL)
-		return NULL;
-	
-	plain_e8bit = is_8bit (plain);
-	
-	if (type != MSG_FORMAT_PLAIN) {
-		e_msg_composer_clear_inlined_table (composer);
-		html = get_text (composer->persist_stream_interface, "text/html");
-		
-		html_e8bit = is_8bit (html);
-		/* the component has probably died */
-		if (html == NULL) {
-			g_free (plain);
-			return NULL;
-		}
-	}
-
-	if (type == MSG_FORMAT_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 ();
-		
-		content_type = best_content (plain);
-		camel_mime_part_set_content (part, plain, strlen (plain), content_type);
-		g_free (content_type);
-		
-		if (plain_e8bit)
-			camel_mime_part_set_encoding (part, best_encoding (plain));		
-
-		g_free (plain);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-		
-		part = camel_mime_part_new ();
-		if (g_hash_table_size (composer->inline_images)) {
-			CamelMultipart *html_with_images;
-			CamelMimePart  *text_html;
-
-			html_with_images = camel_multipart_new ();
-			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (html_with_images),
-							  "multipart/related");
-			camel_multipart_set_boundary (html_with_images, NULL);
-
-			text_html = camel_mime_part_new ();
-			camel_mime_part_set_content (text_html, html, strlen (html), "text/html; charset=utf-8");
-
-			if (html_e8bit)
-				camel_mime_part_set_encoding (text_html, best_encoding (html));		
-
-			camel_multipart_add_part (html_with_images, text_html);
-			camel_object_unref (CAMEL_OBJECT (text_html));
-
-			add_inlined_images (composer, html_with_images);
-			camel_medium_set_content_object (CAMEL_MEDIUM (part),
-							 CAMEL_DATA_WRAPPER (html_with_images));
-		} else {
-			camel_mime_part_set_content (part, html, strlen (html), "text/html; charset=utf-8");
-			
-			if (html_e8bit)
-				camel_mime_part_set_encoding (part, best_encoding (html));		
-		}
-
-		g_free (html);
-		
-		camel_multipart_add_part (body, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-	}
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
-		CamelMultipart *multipart = camel_multipart_new ();
-		
-		/* Generate a random boundary. */
-		camel_multipart_set_boundary (multipart, NULL);
-		
-		part = camel_mime_part_new ();
-		switch (type) {
-		case MSG_FORMAT_ALTERNATIVE:
-			camel_medium_set_content_object (CAMEL_MEDIUM (part),
-							 CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (CAMEL_OBJECT (body));
-			break;
-		case MSG_FORMAT_PLAIN:
-			content_type = best_content (plain);
-			camel_mime_part_set_content (part, plain, strlen (plain), content_type);
-			g_free (content_type);
-			
-			if (plain_e8bit)
-				camel_mime_part_set_encoding (part, best_encoding (plain));
-			
-			g_free (plain);
-			break;
-		}
-		camel_multipart_add_part (multipart, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-		
-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);
-		
-		part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (multipart));
-		camel_object_unref (CAMEL_OBJECT (multipart));
-	} else {
-		switch (type) {
-		case MSG_FORMAT_ALTERNATIVE:
-			part = camel_mime_part_new ();
-			
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (CAMEL_OBJECT (body));
-			break;
-		case MSG_FORMAT_PLAIN:
-			part = camel_mime_part_new ();
-			
-			content_type = best_content (plain);
-			camel_mime_part_set_content (CAMEL_MIME_PART (part), plain, strlen (plain), content_type);
-			g_free (content_type);
-			
-			if (plain_e8bit)
-				camel_mime_part_set_encoding (part, best_encoding (plain));
-			
-			g_free (plain);
-			
-			break;
-		}
-	}
-	
-	camel_exception_init (&ex);
-	
-	if (composer->pgp_sign) {
-		/* FIXME: should use the PGP key id rather than email address */
-		const char *pgpid;
-		
-		camel_exception_init (&ex);
-		from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer->hdrs));
-		camel_internet_address_get (from, 0, NULL, &pgpid);
-		pgp_mime_part_sign (&part, pgpid, PGP_HASH_TYPE_SHA1,
-				    &ex);
-		camel_object_unref (CAMEL_OBJECT (from));
-		if (camel_exception_is_set (&ex))
-			goto exception;
-	}
-	
-	if (composer->pgp_encrypt) {
-		/* FIXME: recipients should be an array of key ids rather than email addresses */
-		const CamelInternetAddress *addr;
-		const char *address;
-		GPtrArray *recipients;
-		int i, len;
-		
-		camel_exception_init (&ex);
-		recipients = g_ptr_array_new ();
-		
-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_TO);
-		len = camel_address_length (CAMEL_ADDRESS (addr));
-		for (i = 0; i < len; i++) {
-			camel_internet_address_get (addr, i, NULL, &address);
-			g_ptr_array_add (recipients, g_strdup (address));
-		}
-		
-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_CC);
-		len = camel_address_length (CAMEL_ADDRESS (addr));
-		for (i = 0; i < len; i++) {
-			camel_internet_address_get (addr, i, NULL, &address);
-			g_ptr_array_add (recipients, g_strdup (address));
-		}
-		
-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_BCC);
-		len = camel_address_length (CAMEL_ADDRESS (addr));
-		for (i = 0; i < len; i++) {
-			camel_internet_address_get (addr, i, NULL, &address);
-			g_ptr_array_add (recipients, g_strdup (address));
-		}
-		
-		pgp_mime_part_encrypt (&part, recipients, &ex);
-		for (i = 0; i < recipients->len; i++)
-			g_free (recipients->pdata[i]);
-		g_ptr_array_free (recipients, TRUE);
-		if (camel_exception_is_set (&ex))
-			goto exception;
-	}
-	
-	camel_medium_set_content_object (CAMEL_MEDIUM (new),
-					 camel_medium_get_content_object (CAMEL_MEDIUM (part)));
-	camel_object_unref (CAMEL_OBJECT (part));
-	
-	return new;
-	
- exception:
-	
-	camel_object_unref (CAMEL_OBJECT (part));
-	camel_object_unref (CAMEL_OBJECT (new));
-	
-	if (camel_exception_is_set (&ex)) {
-		GtkWidget *dialog;
-		
-		dialog = gnome_error_dialog_parented (camel_exception_get_description (&ex),
-						      GTK_WINDOW (composer));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		camel_exception_clear (&ex);
-	}
-	
-	return NULL;
-}
-
-static char *
-get_signature (const char *sigfile, gboolean in_html)
-{
-	GString *rawsig;
-	gchar  buf[1024];
-	gchar *file_name;
-	gchar *htmlsig = NULL;
-	int fd, n;
-
-	if (!sigfile || !*sigfile) {
-		return NULL;
-	}
-
-	file_name = in_html ? g_strconcat (sigfile, ".html", NULL) : (gchar *) sigfile;
-	
-	fd = open (file_name, O_RDONLY);
-	if (fd == -1) {
-		char *msg;
-		
-		msg = g_strdup_printf (_("Could not open signature file %s:\n"
-					 "%s"), file_name, g_strerror (errno));
-		gnome_error_dialog (msg);
-		g_free (msg);
-		
-		htmlsig = NULL;
-	} else {
-		rawsig = g_string_new ("");
-		while ((n = read (fd, buf, 1023)) > 0) {
-			buf[n] = '\0';
-			g_string_append (rawsig, buf);
-		}
-		close (fd);
-
-		htmlsig = in_html ? rawsig->str : e_text_to_html (rawsig->str, 0);
-		g_string_free (rawsig, !in_html);
-	}
-	if (in_html) g_free (file_name);
-
-	return htmlsig;
-}
-
-static void
-prepare_engine (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-
-	g_assert (composer);
-	g_assert (E_IS_MSG_COMPOSER (composer));
-
-	/* printf ("prepare_engine\n"); */
-
-	CORBA_exception_init (&ev);
-	composer->editor_engine = (GNOME_GtkHTML_Editor_Engine) bonobo_object_client_query_interface
-		(bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		
-		/* printf ("trying set listener\n"); */
-		composer->editor_listener = BONOBO_OBJECT (listener_new (composer));
-		if (composer->editor_listener != CORBA_OBJECT_NIL)
-			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);
-		else
-			g_warning ("Can't establish Editor Listener\n");
-	} else
-		g_warning ("Can't get Editor Engine\n");
-	CORBA_exception_free (&ev);
-}
-
-void
-e_msg_composer_mark_text_orig (EMsgComposer *composer)
-{
-	g_assert (composer);
-	g_assert (E_IS_MSG_COMPOSER (composer));
-
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		CORBA_any *flag = bonobo_arg_new (TC_boolean);
-		*((CORBA_boolean *) flag->_value) = CORBA_TRUE;
-
-		CORBA_exception_init (&ev);
-		GNOME_GtkHTML_Editor_Engine_setObjectDataByType (composer->editor_engine, "ClueFlow", "orig", flag, &ev);
-		CORBA_free (flag);
-		CORBA_exception_free (&ev);
-	}
-}
-
-static void
-set_editor_text (EMsgComposer *composer, const char *sig_file, const char *text)
-{
-	Bonobo_PersistStream persist;
-	BonoboStream *stream;
-	BonoboWidget *editor;
-	CORBA_Environment ev;
-	char *sig, *fulltext;
-	gboolean html_sig = composer->send_html;
-
-	editor = BONOBO_WIDGET (composer->editor);
-	sig    = get_signature (sig_file, html_sig);
-	/* if we tried HTML sig and it's not available, try also non HTML signature */
-	if (html_sig && !sig) {
-		html_sig = FALSE;
-		sig      = get_signature (sig_file, html_sig);
-	}
-		
-	if (sig) {
-		if (html_sig)
-			fulltext = g_strdup_printf ("%s<br>%s",
-						    text, sig);
-		else if (!strncmp ("-- \n", sig, 3))
-			fulltext = g_strdup_printf ("%s<br>\n<pre>\n%s</pre>",
-						    text, sig);
-		else
-			fulltext = g_strdup_printf ("%s<br>\n<pre>\n-- \n%s</pre>",
-						    text, sig);
-	} else {
-		if (!*text)
-			return;
-		fulltext = (char*)text;
-	}
-	
-	CORBA_exception_init (&ev);
-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
-		bonobo_widget_get_server (editor), "IDL:Bonobo/PersistStream:1.0", &ev);
-	g_assert (persist != CORBA_OBJECT_NIL);
-	
-	stream = bonobo_stream_mem_create (fulltext, strlen (fulltext),
-					   TRUE, FALSE);
-	if (sig)
-		g_free (fulltext);
-	Bonobo_PersistStream_load (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
-				   "text/html", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		/* FIXME. Some error message. */
-		return;
-	}
-	if (ev._major != CORBA_SYSTEM_EXCEPTION)
-		CORBA_Object_release (persist, &ev);
-	
-	Bonobo_Unknown_unref (persist, &ev);
-	CORBA_exception_free (&ev);
-	bonobo_object_unref (BONOBO_OBJECT(stream));
-}
-
-
-/* Commands.  */
-
-static void
-show_attachments (EMsgComposer *composer,
-		  gboolean show)
-{
-	if (show) {
-		gtk_widget_show (composer->attachment_scroll_frame);
-		gtk_widget_show (composer->attachment_bar);
-	} else {
-		gtk_widget_hide (composer->attachment_scroll_frame);
-		gtk_widget_hide (composer->attachment_bar);
-	}
-
-	composer->attachment_bar_visible = show;
-
-	/* Update the GUI.  */
-
-#if 0
-	gtk_check_menu_item_set_active
-		(GTK_CHECK_MENU_ITEM
-		 (glade_xml_get_widget (composer->menubar_gui,
-					"menu_view_attachments")),
-		 show);
-#endif
-
-	/* XXX we should update the toggle toolbar item as well.  At
-	   this point, it is not a toggle because Glade is broken.  */
-}
-
-static void
-save (EMsgComposer *composer,
-      const char *file_name)
-{
-	CORBA_Environment ev;
-	char *my_file_name;
-
-	if (file_name != NULL)
-		my_file_name = g_strdup (file_name);
-	else
-		my_file_name = e_msg_composer_select_file (composer, _("Save as..."));
-
-	if (my_file_name == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_PersistFile_save (composer->persist_file_interface, my_file_name, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,
-			  _("Error saving file: %s"), g_basename (file_name));
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (my_file_name);
-}
-
-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_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,
-			  _("Error loading file: %s"), g_basename (file_name));
-
-	CORBA_exception_free (&ev);
-}
-
-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */
-
-enum { REPLY_YES = 0, REPLY_NO, REPLY_CANCEL };
-
-struct _save_info {
-	EMsgComposer *composer;
-	int quitok;
-};
-
-static void save_done(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data)
-{
-	struct _save_info *si = data;
-
-	if (ok && si->quitok)
-		gtk_widget_destroy((GtkWidget *)si->composer);
-	else
-		gtk_object_unref((GtkObject *)si->composer);
-
-	g_free(info);
-	g_free(si);
-}
-
-static void
-save_draft(EMsgComposer *composer, int quitok)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	extern CamelFolder *drafts_folder;
-	struct _save_info *si;
-
-	composer->send_html = TRUE;  /* always save drafts as HTML to keep formatting */
-	msg = e_msg_composer_get_message(composer);
-
-	info = g_new0 (CamelMessageInfo, 1);
-	info->flags = CAMEL_MESSAGE_DRAFT;
-
-	si = g_malloc(sizeof(*si));
-	si->composer = composer;
-	gtk_object_ref((GtkObject *)composer);
-	si->quitok = quitok;
-
-	mail_append_mail(drafts_folder, msg, info, save_done, si);
-	camel_object_unref((CamelObject *)msg);
-}
-
-static void
-menu_file_save_draft_cb (BonoboUIComponent *uic, void *data, const char *path)
-{
-	save_draft(E_MSG_COMPOSER(data), FALSE);
-}
-
-static void
-exit_dialog_cb (int reply, EMsgComposer *composer)
-{
-	switch (reply) {
-	case REPLY_YES:
-		/* this has to be done async */
-		save_draft(composer, TRUE);
-		break;
-	case REPLY_NO:
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		break;
-	case REPLY_CANCEL:
-	default:
-	}
-}
-
-static void
-do_exit (EMsgComposer *composer)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-	gint button;
-	
-	if (composer->has_changed) {
-		dialog = gnome_dialog_new (_("Evolution"),
-					   GNOME_STOCK_BUTTON_YES,      /* Save */
-					   GNOME_STOCK_BUTTON_NO,       /* Don't save */
-					   GNOME_STOCK_BUTTON_CANCEL,   /* Cancel */
-					   NULL);
-		
-		label = gtk_label_new (_("This message has not been sent.\n\nDo you wish to save your changes?"));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
-		gtk_widget_show (label);
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (composer));
-		gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-		button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		
-		exit_dialog_cb (button, composer);
-	} else {
-		gtk_widget_destroy (GTK_WIDGET (composer));
-	}
-}
-
-/* Menu callbacks.  */
-
-static void
-menu_file_open_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	char *file_name;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	file_name = e_msg_composer_select_file (composer, _("Open file"));
-	if (file_name == NULL)
-		return;
-	
-	load (composer, file_name);
-	
-	g_free (file_name);
-}
-
-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) {
-		save (composer, NULL);
-	} 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)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	save (composer, NULL);
-}
-
-static void
-menu_file_send_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
-}
-
-static void
-menu_file_send_later_cb (BonoboUIComponent *uic,
-			 void *data,
-			 const char *path)
-{
-	gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);
-}
-
-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_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);
-}
-
-#if 0
-static void
-insert_file_ok_cb (GtkWidget *widget, void *user_data)
-{
-	GtkFileSelection *fs;
-	GdkAtom selection_atom = GDK_NONE;
-	char *name;
-	EMsgComposer *composer;
-	struct stat sb;
-	int fd;
-	guint8 *buffer;
-	size_t bufsz, actual;
-	
-	fs = GTK_FILE_SELECTION (gtk_widget_get_ancestor (widget,
-							  GTK_TYPE_FILE_SELECTION));
-	composer = E_MSG_COMPOSER (user_data);
-	name = gtk_file_selection_get_filename (fs);
-	
-	if (stat (name, &sb) < 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented( _("That file does not exist."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if (!(S_ISREG (sb.st_mode))) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That is not a regular file."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if (access (name, R_OK) != 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That file exists but is not readable."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if ((fd = open (name, O_RDONLY)) < 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That file appeared accesible but open(2) failed."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	buffer = NULL;
-	bufsz = 0;
-	actual = 0;
-#define CHUNK 5120
-	
-	while (TRUE) {
-		ssize_t chunk;
-		
-		if (bufsz - actual < CHUNK) {
-			bufsz += CHUNK;
-			
-			if (bufsz >= 102400) {
-				GtkWidget *dlg;
-				gint result;
-				
-				dlg = gnome_dialog_new (_("The file is very large (more than 100K).\n"
-							  "Are you sure you wish to insert it?"),
-							GNOME_STOCK_BUTTON_YES,
-							GNOME_STOCK_BUTTON_NO,
-							NULL);
-				gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (fs));
-				result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-				gtk_widget_destroy (GTK_WIDGET (dlg));
-				
-				if (result == 1)
-					goto cleanup;
-			}
-			
-			buffer = g_realloc (buffer, bufsz * sizeof (guint8));
-		}
-		
-		chunk = read (fd, &(buffer[actual]), CHUNK);
-
-		if (chunk < 0) {
-			GtkWidget *dlg;
-			
-			dlg = gnome_error_dialog_parented (_("An error occurred while reading the file."),
-							   GTK_WINDOW (fs));
-			gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-			gtk_widget_destroy (GTK_WIDGET (dlg));
-			goto cleanup;
-		}
-		
-		if (chunk == 0)
-			break;
-		
-		actual += chunk;
-	}
-	
-	buffer[actual] = '\0';
-	
-	if (selection_atom == GDK_NONE)
-		selection_atom = gdk_atom_intern ("TEMP_PASTE", FALSE);
-	gtk_object_set_data (GTK_OBJECT (fs), "ev_file_buffer", buffer);
-	gtk_selection_owner_set (GTK_WIDGET (fs), selection_atom, GDK_CURRENT_TIME);
-	/*gtk_html_paste (composer->send_html);*/
-	
- cleanup:
-	close (fd);
-	g_free (buffer);
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-fs_selection_get (GtkWidget *widget, GtkSelectionData *sdata,
-		  guint info, guint time)
-{
-	gchar *buffer;
-	GdkAtom encoding;
-	gint format;
-	guchar *ctext;
-	gint length;
-	
-	buffer = gtk_object_get_data (GTK_OBJECT (widget), "ev_file_buffer");
-	if (gdk_string_to_compound_text (buffer, &encoding, &format, &ctext,
-					 &length) == Success)
-		gtk_selection_data_set (sdata, encoding, format, ctext, length);
-	g_free (buffer);
-	gtk_object_remove_data (GTK_OBJECT (widget), "ev_file_buffer");
-}
-
-#endif
-static void
-menu_file_insert_file_cb (BonoboUIComponent *uic,
-		void *data,
-		const char *path)
-{
-#if 0
-	EMsgComposer *composer;
-	GtkFileSelection *fs;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new ("Choose File"));
-	/* FIXME: remember the location or something */
-	/*gtk_file_selection_set_filename( fs, g_get_home_dir() );*/
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    GTK_SIGNAL_FUNC (insert_file_ok_cb), data);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), 
-				   "clicked",
-				   GTK_SIGNAL_FUNC (gtk_widget_destroy), 
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET(fs));
-#else
-	g_message ("Insert file is unimplemented! oh no!");
-#endif
-}
-
-static void
-menu_format_html_cb (BonoboUIComponent           *component,
-		     const char                  *path,
-		     Bonobo_UIComponent_EventType type,
-		     const char                  *state,
-		     gpointer                     user_data)
-
-{
-	EMsgComposer *composer;
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	composer = E_MSG_COMPOSER (user_data);
-	
-	new_state = atoi (state);
-	
-	if ((new_state && composer->send_html) ||
-	    (! new_state && ! composer->send_html))
-		return;
-	
-	e_msg_composer_set_send_html (composer, new_state);
-}
-
-static void
-menu_security_pgp_sign_cb (BonoboUIComponent           *component,
-			   const char                  *path,
-			   Bonobo_UIComponent_EventType type,
-			   const char                  *state,
-			   gpointer                     user_data)
-
-{
-	EMsgComposer *composer;
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	composer = E_MSG_COMPOSER (user_data);
-	
-	new_state = atoi (state);
-	
-	if ((new_state && composer->pgp_sign) ||
-	    (!new_state && ! composer->pgp_sign))
-		return;
-	
-	e_msg_composer_set_pgp_sign (composer, new_state);
-}
-
-static void
-menu_security_pgp_encrypt_cb (BonoboUIComponent           *component,
-			      const char                  *path,
-			      Bonobo_UIComponent_EventType type,
-			      const char                  *state,
-			      gpointer                     user_data)
-
-{
-	EMsgComposer *composer;
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	composer = E_MSG_COMPOSER (user_data);
-	
-	new_state = atoi (state);
-	
-	if ((new_state && composer->pgp_encrypt) ||
-	    (!new_state && ! composer->pgp_encrypt))
-		return;
-	
-	e_msg_composer_set_pgp_encrypt (composer, new_state);
-}
-
-
-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 ("FileInsertFile", menu_file_insert_file_cb),
-	BONOBO_UI_VERB ("FileAttach",     menu_file_add_attachment_cb),
-		  
-	BONOBO_UI_VERB ("FileSend",       menu_file_send_cb),
-	BONOBO_UI_VERB ("FileSendLater",  menu_file_send_later_cb),
-	
-	BONOBO_UI_VERB_END
-};	
-
-static void
-setup_ui (EMsgComposer *composer)
-{
-	BonoboUIContainer *container;
-	
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));
-	
-	composer->uic = bonobo_ui_component_new ("evolution-message-composer");
-	bonobo_ui_component_set_container (
-		composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		composer->uic, verbs, composer);	
-	
-	bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
-			       "evolution-message-composer.xml",
-			       "evolution-message-composer");
-	
-	/* 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);
-	
-	/* 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);
-	
-	/* View -> Attachments */
-	bonobo_ui_component_add_listener (composer->uic, "ViewAttach",
-					  menu_view_attachments_activate_cb, composer);
-}
-
-
-/* Miscellaneous callbacks.  */
-
-static void
-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,
-			   void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (bar) > 0)
-		e_msg_composer_show_attachments (composer, TRUE);
-	else
-		e_msg_composer_show_attachments (composer, FALSE);
-
-	/* Mark the composer as changed so it prompts about unsaved changes on close */
-	e_msg_composer_set_changed (composer);
-}
-
-static void
-subject_changed_cb (EMsgComposerHdrs *hdrs,
-		    gchar *subject,
-		    void *data)
-{
-	EMsgComposer *composer;
-
-	composer = E_MSG_COMPOSER (data);
-
-	if (strlen (subject))
-		gtk_window_set_title (GTK_WINDOW (composer), subject);
-	else
-		gtk_window_set_title (GTK_WINDOW (composer),
-				      _("Compose a message"));
-	g_free (subject);
-}
-
-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);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposer *composer;
-	CORBA_Environment ev;
-	
-	composer = E_MSG_COMPOSER (object);
-	
-	if (composer->uic)
-		bonobo_object_unref (BONOBO_OBJECT (composer->uic));
-	composer->uic = NULL;
-
-	/* FIXME?  I assume the Bonobo widget will get destroyed
-           normally?  */
-	
-	if (composer->address_dialog != NULL)
-		gtk_widget_destroy (composer->address_dialog);
-	if (composer->hdrs != NULL)
-		gtk_widget_destroy (composer->hdrs);
-	
-	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);
-	
-	CORBA_exception_init (&ev);
-	
-	if (composer->persist_stream_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_stream_interface, &ev);
-		CORBA_Object_release (composer->persist_stream_interface, &ev);
-	}
-	
-	if (composer->persist_file_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_file_interface, &ev);
-		CORBA_Object_release (composer->persist_file_interface, &ev);
-	}
-	
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->editor_engine, &ev);
-		CORBA_Object_release (composer->editor_engine, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (composer->editor_listener)
-		bonobo_object_unref (composer->editor_listener);
-
-	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
-drag_data_received (EMsgComposer *composer,
-		    GdkDragContext *context,
-		    gint x,
-		    gint y,
-		    GtkSelectionData *selection,
-		    guint info,
-		    guint time)
-{
-	gchar *temp, *filename;
-	
-	filename = g_strdup (selection->data);
-	temp = strchr (filename, '\n');
-	if (temp) {
-		if (*(temp - 1) == '\r')
-			*(temp - 1) = '\0';
-		*temp = '\0';
-	}
-	
-	/* Chop the file: part off */
-	if (strncasecmp (filename, "file:", 5) == 0) {
-		temp = g_strdup (filename + 5);
-		g_free (filename);
-		filename = temp;
-	}
-	
-	e_msg_composer_attachment_bar_attach
-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-		 filename);
-	
-	g_free (filename);
-}
-
-
-static void
-class_init (EMsgComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	
-	object_class->destroy = destroy;
-	
-	widget_class->delete_event = delete_event;
-	
-	parent_class = gtk_type_class (bonobo_window_get_type ());
-	
-	signals[SEND] =
-		gtk_signal_new ("send",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerClass, send),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	
-	signals[POSTPONE] =
-		gtk_signal_new ("postpone",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerClass, postpone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposer *composer)
-{
-	composer->uic                      = NULL;
-	
-	composer->hdrs                     = NULL;
-	composer->extra_hdr_names          = g_ptr_array_new ();
-	composer->extra_hdr_values         = g_ptr_array_new ();
-	
-	composer->editor                   = NULL;
-	
-	composer->address_dialog           = NULL;
-	
-	composer->attachment_bar           = NULL;
-	composer->attachment_scroll_frame  = 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->attachment_bar_visible   = FALSE;
-	composer->send_html                = FALSE;
-	composer->pgp_sign                 = FALSE;
-	composer->pgp_encrypt              = FALSE;
-
-	composer->has_changed              = FALSE;
-}
-
-
-GtkType
-e_msg_composer_get_type (void)
-{
-	static GtkType type = 0;
-	
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposer",
-			sizeof (EMsgComposer),
-			sizeof (EMsgComposerClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (bonobo_window_get_type (), &info);
-	}
-	
-	return type;
-}
-
-/**
- * e_msg_composer_construct:
- * @composer: A message composer widget
- * 
- * Construct @composer.
- **/
-void
-e_msg_composer_construct (EMsgComposer *composer)
-{
-	GtkWidget *vbox;
-	BonoboObject *editor_server;
-
-	static GtkTargetEntry drop_types[] = {
-		{"text/uri-list", 0, 1}
-	};
-	
-	g_return_if_fail (gtk_main_level () > 0);
-	
-	gtk_window_set_default_size (GTK_WINDOW (composer),
-				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	
-	bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",
-				 _("Compose a message"));
-	
-	/* DND support */
-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
-			   drop_types, 1, GDK_ACTION_COPY);
-	gtk_signal_connect (GTK_OBJECT (composer), "drag_data_received",
-			    GTK_SIGNAL_FUNC (drag_data_received), NULL);
-	
-	setup_ui (composer);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	
-	composer->hdrs = e_msg_composer_hdrs_new ();
-	gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (composer->hdrs), "subject_changed",
-			    GTK_SIGNAL_FUNC (subject_changed_cb), composer);
-	gtk_signal_connect (GTK_OBJECT (composer->hdrs), "hdrs_changed",
-			    GTK_SIGNAL_FUNC (hdrs_changed_cb), composer);
-	gtk_widget_show (composer->hdrs);
-	
-	/* Editor component.  */
-	composer->editor = bonobo_widget_new_control (
-		GNOME_GTKHTML_EDITOR_CONTROL_ID,
-		bonobo_ui_component_get_container (composer->uic));
-	
-	if (!composer->editor)
-		return;
-	
-	editor_server = BONOBO_OBJECT (bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)));
-	
-	composer->persist_file_interface
-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistFile:1.0");
-	composer->persist_stream_interface
-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistStream:1.0");
-	
-	gtk_widget_show (composer->editor);
-	gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
-	gtk_widget_show (composer->editor);
-
-	/* Attachment editor, wrapped into an EScrollFrame.  We don't
-           show it for now.  */
-	
-	composer->attachment_scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (composer->attachment_scroll_frame),
-					GTK_SHADOW_IN);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (composer->attachment_scroll_frame),
-				   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_scroll_frame),
-			   composer->attachment_bar);
-	gtk_box_pack_start (GTK_BOX (vbox),
-			    composer->attachment_scroll_frame,
-			    FALSE, FALSE, GNOME_PAD_SMALL);
-	
-	gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed",
-			    GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);
-	
-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
-	gtk_widget_show (vbox);
-	
-	e_msg_composer_show_attachments (composer, FALSE);
-
-	/* Set focus on the `To:' field.
-	
-	   gtk_widget_grab_focus (e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs)));
-	   GTK_WIDGET_SET_FLAGS (composer->editor, GTK_CAN_FOCUS);
-	   gtk_window_set_focus (GTK_WINDOW (composer), composer->editor); */
-	gtk_widget_grab_focus (composer->editor);
-}
-
-static EMsgComposer *
-create_composer (void)
-{
-	EMsgComposer *new;
-	
-	new = gtk_type_new (E_TYPE_MSG_COMPOSER);
-	e_msg_composer_construct (new);
-	if (!new->editor) {
-		e_notice (GTK_WINDOW (new), GNOME_MESSAGE_BOX_ERROR,
-			  _("Could not create composer window."));
-		gtk_object_unref (GTK_OBJECT (new));
-		return NULL;
-	}
-	prepare_engine (new);
-	
-	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)
-{
-	EMsgComposer *new;
-	
-	new = create_composer ();
-	if (new) {
-		/* Load the signature, if any. */
-		set_editor_text (new, NULL, "");
-	}
-	
-	return new;
-}
-
-/**
- * e_msg_composer_new_with_sig_file:
- *
- * Create a new message composer widget. Sets the signature file.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_sig_file (const char *sig_file, gboolean send_html)
-{
-	EMsgComposer *new;
-	
-	new = create_composer ();
-	if (new) {
-		e_msg_composer_set_send_html (new, send_html);
-		/* Load the signature, if any. */
-		set_editor_text (new, sig_file, "");
-		
-		e_msg_composer_set_sig_file (new, sig_file);
-	}
-	
-	return new;
-}
-
-static void
-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart)
-{
-	/* Find the text/html part and set the composer body to it's contents */
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		CamelContentType *content_type;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		
-		if (header_content_type_is (content_type, "text", "html")) {
-			CamelDataWrapper *contents;
-			char *text, *final_text;
-			gboolean is_html;
-			
-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			text = mail_get_message_body (contents, FALSE, &is_html);
-			if (text) {
-				if (is_html)
-					final_text = g_strdup (text);
-				else
-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-								     E_TEXT_TO_HTML_CONVERT_SPACES);
-				g_free (text);
-				
-				e_msg_composer_set_body_text (composer, final_text);
-			}
-			
-			return;
-		}
-	}
-}
-
-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;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		
-		if (header_content_type_is (content_type, "multipart", "alternative")) {
-			/* this structure contains the body */
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			handle_multipart_alternative (composer, mpart);
-		} else if (header_content_type_is (content_type, "multipart", "*")) {
-			/* another layer of multipartness... */
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			handle_multipart (composer, mpart, depth + 1);
-		} else if (depth == 0 && i == 0) {
-			/* Since the first part is not multipart/alternative, then this must be the body */
-			CamelDataWrapper *contents;
-			char *text, *final_text;
-			gboolean is_html;
-			
-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			text = mail_get_message_body (contents, FALSE, &is_html);
-			if (text) {
-				if (is_html)
-					final_text = g_strdup (text);
-				else
-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-								     E_TEXT_TO_HTML_CONVERT_SPACES);
-				g_free (text);
-				
-				e_msg_composer_set_body_text (composer, final_text);
-			}
-		} else {
-			/* this is a leaf of the tree, so attach it */
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-/**
- * e_msg_composer_new_with_message:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_message (CamelMimeMessage *msg)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *To = NULL, *Cc = NULL, *Bcc = NULL;
-	CamelContentType *content_type;
-	const gchar *subject;
-	EMsgComposer *new;
-	guint len, i;
-	
-	g_return_val_if_fail (gtk_main_level () > 0, NULL);
-	
-	new = create_composer ();
-	if (!new)
-		return NULL;
-	
-	subject = camel_mime_message_get_subject (msg);
-	
-	to = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_TO);
-	cc = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_CC);
-	bcc = camel_mime_message_get_recipients (msg, 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)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			To = g_list_append (To, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	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)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			Cc = g_list_append (Cc, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	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)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			Bcc = g_list_append (Bcc, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	e_msg_composer_set_headers (new, NULL, To, Cc, Bcc, subject);
-	
-	free_recipients (To);
-	free_recipients (Cc);
-	free_recipients (Bcc);
-	
-	content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (msg));
-	if (header_content_type_is (content_type, "multipart", "alternative")) {
-		/* multipart/alternative contains the text/plain and text/html versions of the message body */
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		handle_multipart_alternative (new, multipart);
-	} else if (header_content_type_is (content_type, "multipart", "*")) {
-		/* there must be attachments... */
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		handle_multipart (new, multipart, 0);
-	} else {
-		/* We either have a text/plain or a text/html part */
-		CamelDataWrapper *contents;
-		char *text, *final_text;
-		gboolean is_html;
-		
-		contents = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
-		text = mail_get_message_body (contents, FALSE, &is_html);
-		if (text) {
-			if (is_html)
-				final_text = g_strdup (text);
-			else
-				final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-							     E_TEXT_TO_HTML_CONVERT_SPACES);
-			g_free (text);
-			
-			e_msg_composer_set_body_text (new, final_text);
-		}
-	}
-	
-	return new;
-}
-
-#if 0
-static GList *
-add_recipients (GList *list, const char *recips, gboolean decode)
-{
-	int len;
-	char *addr;
-	
-	while (*recips) {
-		len = strcspn (recips, ",");
-		if (len) {
-			addr = g_strndup (recips, len);
-			if (decode)
-				camel_url_decode (addr);
-			list = g_list_append (list, addr);
-		}
-		recips += len;
-		if (*recips == ',')
-			recips++;
-	}
-	
-	return list;
-}
-#endif
-
-static GList *
-add_recipients (GList *list, const char *recips, gboolean decode)
-{
-	CamelInternetAddress *cia;
-	const char *name, *addr;
-	int num, i;
-	
-	cia = camel_internet_address_new ();
-	if (decode)
-		num = camel_address_decode (CAMEL_ADDRESS (cia), recips);
-	else
-		num = camel_address_unformat (CAMEL_ADDRESS (cia), recips);
-	
-	for (i = 0; i < num; i++) {
-		if (camel_internet_address_get (cia, i, &name, &addr)) {
-			char *str;
-			
-			str = camel_internet_address_format_address (name, addr);
-			list = g_list_append (list, str);
-		}
-	}
-	
-	return list;
-}
-
-static void
-free_recipients (GList *list)
-{
-	GList *l;
-	
-	for (l = list; l; l = l->next)
-		g_free (l->data);
-	g_list_free (list);
-}
-
-/**
- * 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;
-	EMsgComposerHdrs *hdrs;
-	GList *to = NULL, *cc = NULL, *bcc = NULL;
-	char *subject = NULL, *body = NULL;
-	const char *p, *header;
-	int len, clen;
-	char *content;
-	
-	g_return_val_if_fail (g_strncasecmp (url, "mailto:", 7) == 0, NULL);
-	
-	composer = e_msg_composer_new ();
-	if (!composer)
-		return NULL;
-
-	/* Parse recipients (everything after ':' until '?' or eos. */
-	p = url + 7;
-	len = strcspn (p, "?,");
-	if (len) {
-		content = g_strndup (p, len);
-		to = add_recipients (to, content, TRUE);
-		g_free (content);
-	}
-	
-	p += len;
-	if (*p == '?') {
-		p++;
-		
-		while (*p) {
-			len = strcspn (p, "=&");
-			
-			/* If it's malformed, give up. */
-			if (p[len] != '=')
-				break;
-			
-			header = p;
-			p += len + 1;
-			
-			clen = strcspn (p, "&");
-			content = g_strndup (p, clen);
-			camel_url_decode (content);
-			
-			if (!g_strncasecmp (header, "to", len))
-				to = add_recipients (to, content, FALSE);
-			else if (!g_strncasecmp (header, "cc", len))
-				cc = add_recipients (cc, content, FALSE);
-			else if (!g_strncasecmp (header, "bcc", len))
-				bcc = add_recipients (bcc, content, FALSE);
-			else if (!g_strncasecmp (header, "subject", len))
-				subject = g_strdup (content);
-			else if (!g_strncasecmp (header, "body", len))
-				body = g_strdup (content);
-			
-			g_free (content);
-			p += clen;
-			if (*p == '&') {
-				p++;
-				if (!strcmp (p, "amp;"))
-					p += 4;
-			}
-		}
-	}
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	e_msg_composer_hdrs_set_to (hdrs, to);
-	free_recipients (to);
-	e_msg_composer_hdrs_set_cc (hdrs, cc);
-	free_recipients (cc);
-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
-	free_recipients (bcc);
-	if (subject) {
-		e_msg_composer_hdrs_set_subject (hdrs, subject);
-		g_free (subject);
-	}
-	
-	if (body) {
-		char *htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);
-		set_editor_text (composer, NULL, htmlbody);
-		g_free (htmlbody);
-	}
-	
-	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 (composer != NULL);
-	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,
-			    const GList *to,
-			    const GList *cc,
-			    const GList *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_from_account (hdrs, from);
-	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_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)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, composer->sig_file, text);
-}
-
-
-/**
- * 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_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)
-{
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return build_message (composer);
-}
-
-
-
-/**
- * e_msg_composer_set_sig:
- * @composer: A message composer widget
- * @path: Signature file
- * 
- * Set a signature
- **/
-void
-e_msg_composer_set_sig_file (EMsgComposer *composer, const char *sig_file)
-{
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->sig_file = g_strdup (sig_file);
-}
-
-/**
- * e_msg_composer_get_sig_file:
- * @composer: A message composer widget
- * 
- * Get the signature file
- * 
- * Return value: The signature file.
- **/
-const char *
-e_msg_composer_get_sig_file (EMsgComposer *composer)
-{
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->sig_file;
-}
-
-
-/**
- * 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)
-{
-	g_return_if_fail (composer != NULL);
-	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;
-
-	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
-				      "state", composer->send_html ? "1" : "0", NULL);
-}
-
-/**
- * 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 (composer != NULL, FALSE);
-	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).
- */
-const MailConfigAccount *
-e_msg_composer_get_preferred_account (EMsgComposer *composer)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_val_if_fail (composer != NULL, NULL);
-	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 (composer != NULL);
-	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;
-	
-	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 (composer != NULL, FALSE);
-	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 (composer != NULL);
-	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;
-	
-	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 (composer != NULL, FALSE);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	return composer->pgp_encrypt;
-}
-
-
-/**
- * e_msg_composer_guess_mime_type:
- * @file_name: filename
- *
- * Returns the guessed mime type of the file given by #file_name.
- **/
-gchar *
-e_msg_composer_guess_mime_type (const gchar *file_name)
-{
-	GnomeVFSFileInfo info;
-	GnomeVFSResult result;
-
-	result = gnome_vfs_get_file_info (file_name, &info,
-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result == GNOME_VFS_OK) {
-		gchar *type;
-
-		type = g_strdup (gnome_vfs_file_info_get_mime_type (&info));
-		gnome_vfs_file_info_unref (&info);
-		return type;
-	} else
-		return NULL;
-}
-
-/**
- * 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 (composer != NULL);
-	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 (composer != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	composer->has_changed = FALSE;
-}
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
deleted file mode 100644
index 485ca6f9f1..0000000000
--- a/composer/e-msg-composer.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef ___E_MSG_COMPOSER_H__
-#define ___E_MSG_COMPOSER_H__
-
-typedef struct _EMsgComposer       EMsgComposer;
-typedef struct _EMsgComposerClass  EMsgComposerClass;
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "Editor.h"
-
-#include <mail/mail-config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-#define E_TYPE_MSG_COMPOSER	       (e_msg_composer_get_type ())
-#define E_MSG_COMPOSER(obj)	       (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer))
-#define E_MSG_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass))
-#define E_IS_MSG_COMPOSER(obj)	       (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-#define E_IS_MSG_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-
-
-
-struct _EMsgComposer {
-	BonoboWindow parent;
-	
-	BonoboUIComponent *uic;
-	
-	GtkWidget *hdrs;
-	GPtrArray *extra_hdr_names, *extra_hdr_values;
-	
-	GtkWidget *editor;
-	
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scroll_frame;
-	
-	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;
-	
-	char *sig_file;
-	
-	gboolean attachment_bar_visible : 1;
-	gboolean send_html : 1;
-	gboolean pgp_sign : 1;
-	gboolean pgp_encrypt : 1;
-
-	gboolean has_changed : 1;
-};
-
-struct _EMsgComposerClass {
-	BonoboWindowClass parent_class;
-	
-	void (* send) (EMsgComposer *composer);
-	void (* postpone) (EMsgComposer *composer);
-};
-
-
-GtkType           e_msg_composer_get_type             (void);
-void              e_msg_composer_construct            (EMsgComposer     *composer);
-EMsgComposer     *e_msg_composer_new                  (void);
-EMsgComposer     *e_msg_composer_new_with_sig_file    (const char       *sig_file,
-						       gboolean          send_html);
-EMsgComposer     *e_msg_composer_new_with_message     (CamelMimeMessage *msg);
-EMsgComposer     *e_msg_composer_new_from_url         (const char       *url);
-void              e_msg_composer_show_attachments     (EMsgComposer     *composer,
-						       gboolean          show);
-void              e_msg_composer_set_headers          (EMsgComposer     *composer,
-						       const char       *from,
-						       const GList      *to,
-						       const GList      *cc,
-						       const GList      *bcc,
-						       const char       *subject);
-void              e_msg_composer_set_body_text        (EMsgComposer     *composer,
-						       const char       *text);
-void              e_msg_composer_mark_text_orig       (EMsgComposer     *composer);
-void              e_msg_composer_add_header           (EMsgComposer     *composer,
-						       const char       *name,
-						       const char       *value);
-void              e_msg_composer_attach               (EMsgComposer     *composer,
-						       CamelMimePart    *attachment);
-CamelMimeMessage *e_msg_composer_get_message          (EMsgComposer     *composer);
-void              e_msg_composer_set_sig_file         (EMsgComposer     *composer,
-						       const char       *sig_file);
-const char       *e_msg_composer_get_sig_file         (EMsgComposer     *composer);
-void              e_msg_composer_set_send_html        (EMsgComposer     *composer,
-						       gboolean          send_html);
-gboolean          e_msg_composer_get_send_html        (EMsgComposer     *composer);
-void              e_msg_composer_set_pgp_sign         (EMsgComposer     *composer,
-						       gboolean          pgp_sign);
-
-const MailConfigAccount *e_msg_composer_get_preferred_account (EMsgComposer *composer);
-
-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);
-void              e_msg_composer_clear_inlined_table  (EMsgComposer     *composer);
-gchar *           e_msg_composer_guess_mime_type      (const gchar *file_name);
-
-void              e_msg_composer_set_changed          (EMsgComposer *composer);
-void              e_msg_composer_unset_changed        (EMsgComposer *composer);
-
-#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 2ea7949462..0000000000
--- a/composer/evolution-composer.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Dan Winship <danw@helixcode.com>
- */
-
-#include <config.h>
-
-#include <bonobo.h>
-#include <camel/camel.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <bonobo/bonobo-item-handler.h>
-#include "evolution-composer.h"
-#include "mail/mail-config.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-static void (*send_cb) (EMsgComposer *, gpointer);
-static void (*postpone_cb) (EMsgComposer *, gpointer);
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Composer__vepv Composer_vepv;
-
-static GList *
-corba_recipientlist_to_glist (const GNOME_Evolution_Composer_RecipientList *cl)
-{
-	GNOME_Evolution_Composer_Recipient *recip;
-	GList *gl = NULL;
-	char *str;
-	int i;
-
-	for (i = cl->_length - 1; i >= 0; i--) {
-		recip = &(cl->_buffer[i]);
-
-		/* Let's copy this code into yet another place! */
-		if (*recip->name) {
-			str = camel_internet_address_format_address (recip->name, recip->address);
-		} else
-			str = g_strdup (recip->address);
-		
-		gl = g_list_prepend (gl, str);		
-	}
-
-	return gl;
-}
-
-static void
-free_recipient_glist (GList *gl)
-{
-	GList *tmp;
-
-	while (gl) {
-		tmp = gl->next;
-		g_free (gl->data);
-		g_list_free_1 (gl);
-		gl = tmp;
-	}
-}
-
-static void
-impl_Composer_set_headers (PortableServer_Servant servant,
-			   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;
-	GList *gto, *gcc, *gbcc;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	gto = corba_recipientlist_to_glist (to);
-	gcc = corba_recipientlist_to_glist (cc);
-	gbcc = corba_recipientlist_to_glist (bcc);
-	
-	e_msg_composer_set_headers (composer->composer, NULL, gto, gcc, gbcc,
-				    subject);
-
-	free_recipient_glist (gto);
-	free_recipient_glist (gcc);
-	free_recipient_glist (gbcc);
-}
-
-static void
-impl_Composer_set_body_text (PortableServer_Servant servant,
-			     const CORBA_char *text,
-			     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	e_msg_composer_set_body_text (composer->composer, text);
-}
-
-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 (CAMEL_OBJECT (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 CORBA_char *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, strlen (data),
-				     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 (CAMEL_OBJECT (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));
-}
-
-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->setBodyText = impl_Composer_set_body_text;
-	epv->attachMIME  = impl_Composer_attach_MIME;
-	epv->attachData  = impl_Composer_attach_data;
-	epv->show        = impl_Composer_show;
-
-	return epv;
-}
-
-
-/* GtkObject stuff */
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionComposer *composer = EVOLUTION_COMPOSER (object);
-
-	if (composer->composer)
-		gtk_object_unref (GTK_OBJECT (composer->composer));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-class_init (EvolutionComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv ();
-}
-
-static void
-init (EvolutionComposer *composer)
-{
-	const MailConfigAccount *account;
-	gboolean send_html;
-	gchar *sig_file = NULL;
-
-	account = mail_config_get_default_account ();
-	send_html = mail_config_get_send_html ();
-
-	if (account->id)
-		sig_file = account->id->signature;
-	
-	if (sig_file)
-		composer->composer = e_msg_composer_new_with_sig_file (sig_file, send_html);
-	else
-		composer->composer = e_msg_composer_new ();
-	
-	gtk_signal_connect (GTK_OBJECT (composer->composer), "send",
-			    GTK_SIGNAL_FUNC (send_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (composer->composer), "postpone",
-			    GTK_SIGNAL_FUNC (postpone_cb), NULL);
-}
-
-#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)
-{
-	EvolutionComposer *new;
-	POA_GNOME_Evolution_Composer *servant;
-	CORBA_Environment ev;
-	GNOME_Evolution_Composer corba_object;
-	
-	servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Composer_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	new = gtk_type_new (evolution_composer_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new),
-						       servant);
-	evolution_composer_construct (new, corba_object);
-
-	return new;
-}
-
-E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE)
-
-
-#define GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, void *closure)
-{
-	if (!mail_config_is_configured ()) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Could not create composer window, because you "
-			    "have not yet\nconfigured any identities in the "
-			    "mail component."));
-		return NULL;
-	}
-	return BONOBO_OBJECT (evolution_composer_new ());
-}
-
-void
-evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
-				 void (*postpone) (EMsgComposer *, gpointer))
-{
-	if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID,
-					factory_fn, NULL) == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's composer."));
-		exit (1);
-	}
-
-	send_cb = send;
-	postpone_cb = postpone;
-}
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
deleted file mode 100644
index 65f3f246d2..0000000000
--- a/composer/evolution-composer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: 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)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer))
-#define EVOLUTION_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass))
-#define EVOLUTION_IS_COMPOSER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-#define EVOLUTION_IS_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-
-typedef struct _EvolutionComposer        EvolutionComposer;
-typedef struct _EvolutionComposerClass   EvolutionComposerClass;
-
-struct _EvolutionComposer {
-	BonoboObject parent;
-
-	EMsgComposer *composer;
-};
-
-struct _EvolutionComposerClass {
-	BonoboObjectClass parent_class;
-};
-
-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);
-
-void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
-						    void (*postpone) (EMsgComposer *, gpointer));
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_COMPOSER_H__ */
diff --git a/composer/listener.c b/composer/listener.c
deleted file mode 100644
index 938122a480..0000000000
--- a/composer/listener.c
+++ /dev/null
@@ -1,225 +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 Helix Code, Inc.
-    Authors:           Radek Doulik <rodo@helixcode.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <bonobo.h>
-
-#include "listener.h"
-
-static BonoboObjectClass *listener_parent_class;
-static POA_GNOME_GtkHTML_Editor_Listener__vepv listener_vepv;
-
-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)
-{
-	gchar *cid = NULL;
-
-	printf ("resolve_image_url %s\n", url);
-
-	if (!strncmp (url, "file:", 5)) {
-		gchar *id;
-
-		id = (gchar *) g_hash_table_lookup (l->composer->inline_images, url + 5);
-		if (!id) {
-			id = header_msgid_generate ();
-			g_hash_table_insert (l->composer->inline_images, g_strdup (url + 5), id);
-		}
-		cid = g_strconcat ("cid:", id, NULL);
-		printf ("resolved to %s\n", cid);
-	}
-
-	return cid;
-}
-
-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, "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, "italic-off", ev);
-}
-
-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);
-	BonoboArg *data;
-	CORBA_any *rv = NULL;
-
-	/* printf ("impl_event\n"); */
-
-	if (!strcmp (name, "command")) {
-		/* FIXME check for insert-paragraph command */
-		data = GNOME_GtkHTML_Editor_Engine_getParagraphData (l->composer->editor_engine, "orig", ev);
-		if (ev->_major == CORBA_NO_EXCEPTION && data) {
-			if (CORBA_TypeCode_equal (data->_type, TC_boolean, ev) && BONOBO_ARG_GET_BOOLEAN (data))
-				reply_indent (l, ev);
-			BONOBO_ARG_SET_BOOLEAN (data, CORBA_FALSE);
-			GNOME_GtkHTML_Editor_Engine_setParagraphData (l->composer->editor_engine, "orig", data, ev);
-		}
-	} else if (!strcmp (name, "image_url")) {
-		gchar *url;
-
-		if ((url = resolve_image_url (l, BONOBO_ARG_GET_STRING (arg)))) {
-			rv = bonobo_arg_new (TC_string);
-			BONOBO_ARG_SET_STRING (rv, url);
-			printf ("new url: %s\n", url);
-			g_free (url);
-		}
-	}
-
-	return rv ? rv : get_any_null ();
-}
-
-POA_GNOME_GtkHTML_Editor_Listener__epv *
-listener_get_epv (void)
-{
-	POA_GNOME_GtkHTML_Editor_Listener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_GtkHTML_Editor_Listener__epv, 1);
-
-	epv->event = impl_event;
-
-	return epv;
-}
-
-static void
-init_listener_corba_class (void)
-{
-	listener_vepv.Bonobo_Unknown_epv            = bonobo_object_get_epv ();
-	listener_vepv.GNOME_GtkHTML_Editor_Listener_epv = listener_get_epv ();
-}
-
-static void
-listener_class_init (EditorListenerClass *klass)
-{
-	listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	init_listener_corba_class ();
-}
-
-GtkType
-listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EditorListener",
-			sizeof (EditorListener),
-			sizeof (EditorListenerClass),
-			(GtkClassInitFunc) listener_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-EditorListener *
-listener_construct (EditorListener *listener, GNOME_GtkHTML_Editor_Listener corba_listener)
-{
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_EDITOR_LISTENER (listener), NULL);
-	g_return_val_if_fail (corba_listener != CORBA_OBJECT_NIL, NULL);
-
-	if (!bonobo_object_construct (BONOBO_OBJECT (listener), (CORBA_Object) corba_listener))
-		return NULL;
-
-	return listener;
-}
-
-static GNOME_GtkHTML_Editor_Listener
-create_listener (BonoboObject *listener)
-{
-	POA_GNOME_GtkHTML_Editor_Listener *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_GtkHTML_Editor_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_GtkHTML_Editor_Listener__init ((PortableServer_Servant) servant, &ev);
-	ORBIT_OBJECT_KEY(servant->_private)->object = NULL;
-
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return (GNOME_GtkHTML_Editor_Listener) bonobo_object_activate_servant (listener, servant);
-}
-
-EditorListener *
-listener_new (EMsgComposer *composer)
-{
-	EditorListener *listener;
-	GNOME_GtkHTML_Editor_Listener corba_listener;
-
-	listener = gtk_type_new (EDITOR_LISTENER_TYPE);
-	listener->composer = composer;
-
-	corba_listener = create_listener (BONOBO_OBJECT (listener));
-
-	if (corba_listener == CORBA_OBJECT_NIL) {
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return NULL;
-	}
-	
-	return listener_construct (listener, corba_listener);
-}
diff --git a/composer/listener.h b/composer/listener.h
deleted file mode 100644
index 0c50ef2111..0000000000
--- a/composer/listener.h
+++ /dev/null
@@ -1,56 +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 Helix Code, Inc.
-    Authors:           Radek Doulik <rodo@helixcode.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  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 <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "Editor.h"
-#include "e-msg-composer.h"
-
-BEGIN_GNOME_DECLS
-
-#define EDITOR_LISTENER_TYPE        (listener_get_type ())
-#define EDITOR_LISTENER(o)          (GTK_CHECK_CAST ((o), EDITOR_LISTENER_TYPE, EditorListener))
-#define EDITOR_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), EDITOR_LISTENER_TYPE, EditorListenerClass))
-#define IS_EDITOR_LISTENER(o)       (GTK_CHECK_TYPE ((o), EDITOR_LISTENER_TYPE))
-#define IS_EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_LISTENER_TYPE))
-
-typedef struct {
-	BonoboObject parent;
-	EMsgComposer *composer;
-} EditorListener;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-} EditorListenerClass;
-
-GtkType                                 listener_get_type   (void);
-EditorListener                         *listener_construct  (EditorListener                *listener,
-									GNOME_GtkHTML_Editor_Listener  corba_listener);
-EditorListener                         *listener_new        (EMsgComposer                  *composer);
-POA_GNOME_GtkHTML_Editor_Listener__epv *listener_get_epv    (void);
-
-END_GNOME_DECLS
-
-#endif /* LISTENER_H_ */
diff --git a/configure.in b/configure.in
deleted file mode 100644
index b1296a1e23..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,879 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(camel)
-AM_CONFIG_HEADER(config.h)
-
-cflags_set=${CFLAGS+set}
-
-EVOLUTION_MAJOR_VERSION=0
-EVOLUTION_MINOR_VERSION=0
-EVOLUTION_MICRO_VERSION=8
-VERSION=$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
-PACKAGE=evolution
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_SUBST(VERSION)
-
-dnl Initialize xml-i18n-tools
-AM_PROG_XML_I18N_TOOLS
-
-dnl Initialize libtool
-AM_PROG_LIBTOOL
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-AC_CANONICAL_HOST
-
-AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT(capplet)
-GNOME_COMPILE_WARNINGS
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_LEX
-AC_PROG_YACC
-AC_STDC_HEADERS
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, /usr/sbin:/usr/lib)
-AC_DEFINE_UNQUOTED(SENDMAIL_PATH, "$SENDMAIL")
-
-AC_MSG_CHECKING(system mail directory)
-if test -d /var/mail; then
-	system_mail_dir=/var/mail
-else
-	system_mail_dir=/var/spool/mail
-fi
-AC_MSG_RESULT($system_mail_dir)
-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir")
-
-dnl Check for new enough gnome-libs
-CFLAGS_save=$CFLAGS
-LIBS_save=$LIBS
-CFLAGS=`gnome-config --cflags gnomeui`
-LIBS=`gnome-config --libs gnomeui`
-
-AC_CHECK_LIB(gnomeui, gnome_dialog_grab_focus, ,[
-AC_MSG_ERROR(gnome-libs 1.2.9 or higher is required.)])
-
-CFLAGS=$CFLAGS_save
-LIBS=$LIBS_save
-
-ALL_LINGUAS="ca da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ru sk sl sv tr uk"
-
-AM_GNOME_GETTEXT
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
-GNOME_X_CHECKS
-
-dnl
-dnl Purify support
-dnl
-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"
-
-dnl * Time zone stuff
-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)
-else
-	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)
-	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)
-fi
-
-dnl **************************************************
-dnl * pas-backend-file stuff.
-dnl * check for db_185.h.  if it's there, we use it.
-dnl * otherwise, we use db.h (since it'll be 185).
-dnl * Except on RH7.0, which puts db in yet another place
-dnl **************************************************
-AC_CHECK_HEADERS(db_185.h)
-AC_CHECK_HEADERS(db1/db.h)
-
-dnl **************************************************
-dnl * ldap related stuff.
-dnl **************************************************
-AC_ARG_ENABLE(ldap, 
-[  --enable-ldap=[no/yes]      Enable LDAP support in evolution],,enable_ldap=no)
-if test x$enable_ldap = xyes; then
-  AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")
-  if test x$ac_cv_lib_lber_ber_get_tag = xyes; then
-    AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)
-  fi
-fi
-if test x$ac_cv_lib_ldap_ldap_open = xyes; then
-	AC_DEFINE(HAVE_LDAP)
-	AC_SUBST(LDAP_LIBS)
-	msg_ldap=Yes
-else
-	msg_ldap=No
-        enable_ldap=no
-fi
-AM_CONDITIONAL(ENABLE_LDAP, test x$enable_ldap = xyes)
-
-dnl **************************************************
-dnl NNTP support.
-dnl **************************************************
-AC_ARG_ENABLE(nntp, 
-[  --enable-nntp=[no/yes]      Enable NNTP support in evolution],,enable_nntp=no)
-if test "x$enable_nntp" = "xyes"; then
-	AC_DEFINE(ENABLE_NNTP)
-	msg_nntp=Yes
-else
-	msg_nntp=No
-fi
-AM_CONDITIONAL(ENABLE_NNTP, test x$enable_nntp = xyes)
-
-dnl **************************************************
-dnl * Posix thread support
-dnl **************************************************
-
-dnl Hah! Threads are no longer an option
-dnl AC_ARG_WITH(threads, [  --with-threads          Include thread support],[
-dnl FIXME: support more thread types, pth at least
-
-GNOME_PTHREAD_CHECK
-
-if test "x$PTHREAD_LIB" = "x" ; then
-	AC_MSG_ERROR([POSIX threads are currently required for Evolution])
-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
-
-THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
-THREADS_CFLAGS="`glib-config --cflags gthread`"
-
-AC_SUBST(THREADS_LIBS)
-AC_SUBST(THREADS_CFLAGS)
-AC_DEFINE(ENABLE_THREADS)
-
-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)
-  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)
-  msg_file=fcntl
-else
-  if test "x$enable_file_locking" = "xflock"; then
-    AC_DEFINE(USE_FLOCK)
-    msg_file=flock
-  else
-    msg_file=No	
-  fi
-fi
-
-dnl **************************************************
-dnl * Print check
-dnl **************************************************
-AC_MSG_CHECKING(for GnomePrint libraries version either 0.20 or later)
-  if gnome-config --libs print > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-    if test "$vers" -ge 20; then
-      if test "$vers" -ge 21; then
-          AC_MSG_RESULT(found >=0.21)
-      else
-          AC_MSG_RESULT(found 0.20)
-	  AC_DEFINE(USING_GNOME_PRINT_0_20)
-      fi
-    else
-        AC_MSG_ERROR(Please upgrade your gnome-print to version 0.20 or later.)
-    fi
-  else
-     AC_MSG_ERROR(Did not find GnomePrint installed)
-  fi
-
-GNOME_PRINT_LIBS=`gnome-config --libs print`
-GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
-AC_SUBST(GNOME_PRINT_LIBS)
-AC_SUBST(GNOME_PRINT_CFLAGS)
-
-dnl ******************************
-dnl Check for Bonobo
-dnl ******************************
-AC_MSG_CHECKING(for Bonobo >= 0.36)
-if gnome-config --libs bonobox > /dev/null 2>&1; then
-	vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
-		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
-	if test "$vers" -ge 36; then
-		bonobo_ok=true
-	else
-		bonobo_ok=false
-	fi
-else
-	bonobo_ok=false
-fi
-
-if $bonobo_ok; then
-	AC_MSG_RESULT($vers found)
-else
-	AC_MSG_ERROR(Bonobo 0.36 or newer is required to compile Evolution)
-fi
-
-dnl ******************************
-dnl OAF
-dnl ******************************
-
-AC_PATH_PROG(OAF_CONFIG,oaf-config,no)
-if test x$OAF_CONFIG = xno; then
-	AC_MSG_ERROR("The oaf-config program was not found")
-else
-	OAF_LIBS=`$OAF_CONFIG --libs`
-	OAF_CFLAGS=`$OAF_CONFIG --cflags`
-fi
-
-AC_SUBST(OAF_LIBS)
-AC_SUBST(OAF_CFLAGS)
-
-
-dnl ******************************
-dnl LibGlade checking
-dnl ******************************
-AC_MSG_CHECKING(for Glade libraries)
-if gnome-config --libs libglade > /dev/null 2>&1; then 
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(Did not find libGlade installed)
-fi
-
-dnl ******************************
-dnl libunicode checking
-dnl ******************************
-AC_MSG_CHECKING(for libunicode)
-if unicode-config --libs > /dev/null 2>&1; then 
-    UNICODE_LIBS=`unicode-config --libs`
-    UNICODE_CFLAGS=`unicode-config --cflags`
-    AC_SUBST(UNICODE_LIBS)
-    AC_SUBST(UNICODE_CFLAGS)
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(libunicode not found)
-fi
-
-dnl ******************************
-dnl GdkPixbuf checking
-dnl ******************************
-AC_MSG_CHECKING(for Gdkpixbuf libraries)
-if gnome-config --libs gdk_pixbuf gnomecanvaspixbuf > /dev/null 2>&1; then 
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(Did not find gdkpixbuf installed)
-fi
-
-dnl ******************************
-dnl Gnome App Lib checking
-dnl ******************************
-AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.5.99.2)
-if gnome-config --libs gal > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
-        awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
-    if test "$vers" -ge 59902; then
-        AC_MSG_RESULT(found)
-    else
-        AC_MSG_ERROR(You need at least GNOME Application libs 0.5.99.2 for this version of Evolution)
-    fi
-else
-    AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
-fi
-
-GLIB_CFLAGS="`glib-config --cflags`"
-GLIB_LIBS="`glib-config --libs`"
-
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-
-EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_LIBS $UNICODE_LIBS"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS $UNICODE_CFLAGS"
-
-AC_SUBST(EXTRA_GNOME_LIBS)
-AC_SUBST(EXTRA_GNOME_CFLAGS)
-
-
-BONOBO_GNOME_LIBS="`gnome-config --libs bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $UNICODE_LIBS $OAF_LIBS"
-BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $UNICODE_CFLAGS $OAF_CFLAGS"
-AC_SUBST(BONOBO_GNOME_LIBS)
-AC_SUBST(BONOBO_GNOME_CFLAGS)
-
-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS $UNICODE_LIBS"
-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS $UNICODE_CFLAGS"
-AC_SUBST(BONOBO_HTML_GNOME_LIBS)
-AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
-
-dnl ******************************
-dnl GtkHTML checking
-dnl ******************************
-
-AC_MSG_CHECKING(for GtkHTML)
-if gnome-config --libs gtkhtml > /dev/null 2>&1; then
-	vers=`gnome-config --modversion gtkhtml`
-	case $vers
-	in
-	    gtkhtml-0.[012345678]) gtkhtml_ok=false ;;
-	    *) gtkhtml_ok=true ;;
-	esac
-else
-	gtkhtml_ok=false
-fi
-
-if $gtkhtml_ok; then
-	AC_MSG_RESULT($vers found)
-else
-	AC_MSG_ERROR(GtkHTML 0.8 or later is required to compile Evolution)
-fi
-
-GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`"
-GTKHTML_LIBS="`gnome-config --libs gtkhtml`"
-
-AC_SUBST(GTKHTML_CFLAGS)
-AC_SUBST(GTKHTML_LIBS)
-
-if test x${prefix} = xNONE; then
-	html_prefix=$ac_default_prefix
-else
-	html_prefix=$prefix
-fi
-AC_MSG_CHECKING(for Editor.idl in `gnome-config --datadir`/gtkhtml or ${html_prefix}/share/gtkhtml)
-if test -f `gnome-config --datadir`/gtkhtml/Editor.idl; then
-	GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/Editor.idl
-	AC_MSG_RESULT(found)
-else
-	if test -f ${html_prefix}/share/gtkhtml/Editor.idl; then
-		GTK_HTML_EDITOR_IDL=${html_prefix}/share/gtkhtml/Editor.idl
-		AC_MSG_RESULT(found)
-	else
-		AC_MSG_ERROR(Editor.idl is required to compile Evolution composer, it's included in GtkHTML
-You need GtkHTML build with html-editor-control)
-	fi
-fi
-
-AC_SUBST(GTK_HTML_EDITOR_IDL)
-
-dnl ******************************
-dnl Gnome-VFS checking
-dnl ******************************
-AC_MSG_CHECKING(for GNOME-VFS)
-if gnome-config --libs vfs > /dev/null 2>&1; then
-	vers=`gnome-config --modversion vfs`
-	case $vers
-	in
-	    gnome-vfs-0.[012]) vfs_ok=false ;;
-	    *) vfs_ok=true ;;
-	esac
-else
-	vfs_ok=false
-fi
-
-if $vfs_ok; then
-	AC_MSG_RESULT($vers)
-else
-	AC_MSG_ERROR(GNOME-VFS 0.3 or newer is required to compile Evolution)
-fi
-
-GNOME_VFS_LIBS="`gnome-config --libs vfs`"
-GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
-AC_SUBST(GNOME_VFS_LIBS)
-AC_SUBST(GNOME_VFS_CFLAGS)
-
-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-AC_SUBST(BONOBO_VFS_GNOME_LIBS)
-AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
-
-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
-GNOME_PILOT_CHECK
-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
-
-dnl ******
-dnl XML
-dnl ******
-GNOME_XML_CHECK
-xmlversion=`xml-config --version | sed 's/^libxml//'`
-xmlmajor=`echo $xmlversion | awk -F. '{print $1;}'`
-xmlminor=`echo $xmlversion | awk -F. '{print $2;}'`
-xmlpatch=`echo $xmlversion | awk -F. '{print $3;}'`
-if test "$xmlmajor" -ne 1 -o "$xmlminor" -ne 8 -o "$xmlpatch" -lt 7; then
-	AC_MSG_ERROR(gnome-xml 1.8.7 (or later, but not 2.0) is required to compile Evolution)
-fi
-
-AC_SUBST(CAPPLET_LIBS)
-
-
-dnl ********
-dnl Kerberos
-dnl ********
-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 libs/includes])
-AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 libs/includes])
-msg_krb5=No
-if test ${with_krb5:=no} != no; then
-	LDFLAGS_save="$LDFLAGS"
-
-	mitlibs="-lkrb5 -lk5crypto -lcom_err"
-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken"
-	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
-	[
-		LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs"
-		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
-		[
-			LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $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)
-		msg_krb5=Yes
-		KRB5_CFLAGS="-I$with_krb5/include/krb5"
-		KRB5_LDFLAGS="-L$with_krb5/lib $ac_cv_lib_kerberos5"
-	fi
-else
-	AC_MSG_CHECKING(for Kerberos 5)
-	AC_MSG_RESULT($with_krb5)
-fi
-
-msg_krb4=No
-if test x${with_krb4:=no} != xno; then
-	LDFLAGS_save="$LDFLAGS"
-	AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,
-	[
-		ac_cv_lib_kerberos4=no
-
-		case $ac_cv_lib_kerberos5 in
-		*k5crypto*)
-			# Look for MIT krb5 compat krb4
-			LDFLAGS="$LDFLAGS -L$with_krb4/lib -lkrb4 -ldes425 $KRB5_LDFLAGS"
-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb4 -ldes425 $KRB5_LDFLAGS")
-			;;
-		esac
-
-		if test "$ac_cv_lib_kerberos4" = no; then
-			# Look for KTH krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -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/lib -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)
-		msg_krb4=Yes
-		if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then
-			KRB4_CFLAGS="-I$with_krb4/include"
-		else
-			KRB4_CFLAGS="-I$with_krb4/include/kerberosIV"
-		fi
-		KRB4_LDFLAGS="-L$with_krb4/lib $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)],)
-		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 ====================================
-dnl = security extension support (SSL, S/MIME, and SASL)
-dnl =
-dnl = The following voodoo does detection of mozilla libraries (nspr and nss) needed by
-dnl = Camel (SSL and SASL) and Evolution (S/MIME).
-dnl =
-dnl = The Evolution security extensions are only built if these libraries are found
-dnl =
-dnl = --enable-assbarn-security can be used to enable these features
-dnl ====================================
-assbarn_security_enabled="no"
-
-AC_ARG_ENABLE(,
-              [  --enable-assbarn-security     	Enable security extensions such as SSL and S/MIME],
-              ,
-              assbarn_security_enabled="yes")
-
-found_mozilla=false
-
-if test "x$assbarn_security_enabled" = "xyes"
-then 
-BUILD_MOZILLA=
-MOZILLA_CFLAGS=
-MOZILLA_LDFLAGS=
-MOZILLA_LIBS=
-
-mozilla_lib_path=/usr/lib/mozilla
-mozilla_include_path=/usr/include/mozilla
-
-dnl Add a flag to override the default mozilla lib dir
-AC_ARG_WITH(mozilla-lib-path,
-	[  --with-mozilla-lib-path		Set mozilla 'lib' path ],
-	[ mozilla_lib_path="$withval" ])
-
-dnl Add a flag to override the default mozilla include dir
-AC_ARG_WITH(mozilla-include-path,
-	[  --with-mozilla-include-path		Set mozilla 'include' path ],
-	[ mozilla_include_path="$withval" ])
-
-mozilla_nspr_libs=
-mozilla_plc_libs=
-mozilla_plds_libs=
-mozilla_nss_libs=
-
-dnl Save flags and compiler
-_save_cflags="$CFLAGS"
-_save_ldflags="$LDFLAGS"
-
-dnl Hack flags to find the mozilla stuff
-CFLAGS="$_save_cflags -I$mozilla_include_path"
-LDFLAGS="$_save_ldflags -L$mozilla_lib_path"
-
-dnl Check for nspr and friends
-AC_CHECK_LIB(nspr4, PR_Init, [mozilla_nspr_libs="-lnspr4"])
-LDFLAGS="$LDFLAGS $mozilla_nspr_libs"
-AC_CHECK_LIB(plc4, PL_strcmp, [mozilla_plc_libs="-lplc4"])
-AC_CHECK_LIB(plds4, PL_NewHashTable, [mozilla_plds_libs="-lplds4"])
-
-mozilla_all_nspr_flags="$mozilla_nspr_libs $mozilla_plc_libs $mozilla_plds_libs"
-
-dnl Check for nss
-AC_CHECK_LIB(nss, NSS_Init, [mozilla_nss_libs="-lnss"])
-
-dnl Restore the flags and compiler
-CFLAGS="$_save_cflags"
-LDFLAGS="$_save_ldflags"
-
-dnl Now make sure all the libraries are good
-AC_MSG_CHECKING(for Mozilla)
-
-if test -n "$mozilla_nspr_libs" -a \
-	-n "$mozilla_plc_libs" -a \
-	-n "$mozilla_plds_libs" -a \
-	-n "$mozilla_nss_libs"
-then
-	AC_MSG_RESULT(yes)
-	AC_PROG_CXX
-	found_mozilla=true
-
-	MOZILLA_RPATH_FLAGS="-Wl,-rpath=$mozilla_lib_path"
-	MOZILLA_CFLAGS="-I$mozilla_include_path -fno-rtti -fno-exceptions"
-	MOZILLA_LDFLAGS="-L$mozilla_lib_path"
-	MOZILLA_LIBS="$mozilla_nspr_libs \
-                      $mozilla_plc_libs \
-                      $mozilla_plds_libs \
-                      $mozilla_nss_libs"
-	AC_SUBST(MOZILLA_RPATH_FLAGS)
-	AC_SUBST(MOZILLA_CFLAGS)
-	AC_SUBST(MOZILLA_LDFLAGS)
-	AC_SUBST(MOZILLA_LIBS)
-else
-	AC_MSG_RESULT(no)
-	assbarn_security_enabled="no"
-	found_mozilla=false
-fi
-fi
-
-AM_CONDITIONAL(BUILD_MOZILLA, test "x$found_mozilla" = "xtrue")
-
-dnl ====================================
-dnl = End mozilla hacks
-dnl ====================================
-
-
-dnl ******************************
-dnl gtk-doc
-dnl ******************************
-
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
-AC_SUBST(HAVE_GTK_DOC)
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-
-dnl NOTE: We need to use a separate automake conditional for this
-dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
-dnl ********
-dnl movemail
-dnl ********
-AC_ARG_WITH(movemail, [  --with-movemail=PATH    Path to a movemail binary])
-AC_MSG_CHECKING(for movemail)
-if test x$with_movemail = xyes -o x$with_movemail = x; then
-    with_movemail=no
-fi
-if test x$with_movemail != xno; then
-    AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$with_movemail")
-    AC_MSG_RESULT($with_movemail)
-else
-    emacs_exec_dir=`emacs --batch --eval '(message exec-directory)' 2>&1`
-    case $emacs_exec_dir in
-    /*) if test -x $emacs_exec_dir/movemail; then
-	    if test -u $emacs_exec_dir/movemail -o -g $emacs_exec_dir/movemail; then
-		AC_MSG_RESULT($emacs_exec_dir/movemail)
-		AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$emacs_exec_dir/movemail")
-	    else
-		AC_MSG_RESULT($emacs_exec_dir/movemail... not set-id: ignored)
-	    fi
-	else
-	    AC_MSG_RESULT(no)
-	fi
-	;;
-    *)
-	AC_MSG_RESULT(no)
-	;;
-    esac
-fi
-
-dnl
-dnl Compose program
-dnl
-compose_libs="bonobo gnomeui"
-COMPOSE_LIBS="`gnome-config --libs $compose_libs`"
-COMPOSE_CFLAGS="`gnome-config --cflags $compose_libs`"
-AC_SUBST(COMPOSE_LIBS)
-AC_SUBST(COMPOSE_CFLAGS)
-
-dnl ******************
-dnl Sub-version number
-dnl ******************
-AC_ARG_WITH(sub-version, [  --with-sub-version=VERSION Specify a sub-version string])
-AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version")
-
-dnl ******************************
-dnl Makefiles
-dnl ******************************
-
-AC_CONFIG_SUBDIRS(libical)
-
-EVOLUTION_DIR=`(cd $srcdir; pwd)`
-AC_SUBST(EVOLUTION_DIR)
-
-AC_OUTPUT([
-Makefile
-macros/Makefile
-intl/Makefile
-po/Makefile.in
-e-util/Makefile
-e-util/ename/Makefile
-libibex/Makefile
-executive-summary/Makefile
-executive-summary/evolution-services/Makefile
-executive-summary/widgets/Makefile
-executive-summary/idl/Makefile
-executive-summary/component/Makefile
-executive-summary/test-service/Makefile
-camel/Makefile
-camel/providers/Makefile
-camel/providers/pop3/Makefile
-camel/providers/sendmail/Makefile
-camel/providers/smtp/Makefile
-camel/providers/vee/Makefile
-camel/providers/imap/Makefile
-camel/providers/nntp/Makefile
-camel/providers/local/Makefile
-camel/tests/Makefile
-camel/tests/lib/Makefile
-camel/tests/message/Makefile
-camel/tests/folder/Makefile
-camel/tests/stream/Makefile
-composer/Makefile
-widgets/Makefile
-widgets/meeting-time-sel/Makefile
-widgets/misc/Makefile
-widgets/menus/Makefile
-addressbook/Makefile
-addressbook/conduit/Makefile
-addressbook/contact-editor/Makefile
-addressbook/printing/Makefile
-addressbook/backend/Makefile
-addressbook/backend/idl/Makefile
-addressbook/backend/pas/Makefile
-addressbook/backend/ebook/Makefile
-addressbook/gui/Makefile
-addressbook/gui/widgets/Makefile
-addressbook/gui/search/Makefile
-addressbook/gui/component/Makefile
-addressbook/gui/component/select-names/Makefile
-shell/Makefile
-shell/glade/Makefile
-shell/importer/Makefile
-mail/Makefile
-data/Makefile
-libversit/Makefile
-libibex/Makefile
-calendar/Makefile
-calendar/idl/Makefile
-calendar/cal-util/Makefile
-calendar/cal-client/Makefile
-calendar/pcs/Makefile
-calendar/gui/Makefile
-calendar/gui/alarm-notify/Makefile
-calendar/gui/dialogs/Makefile
-calendar/conduits/Makefile
-calendar/conduits/calendar/Makefile
-calendar/conduits/todo/Makefile
-filter/Makefile
-wombat/Makefile
-composer/Makefile
-art/Makefile
-ui/Makefile
-default_user/Makefile
-default_user/local/Makefile
-default_user/local/Calendar/Makefile
-default_user/local/Contacts/Makefile
-default_user/local/Drafts/Makefile
-default_user/local/Executive-Summary/Makefile
-default_user/local/Inbox/Makefile
-default_user/local/Outbox/Makefile
-default_user/local/Sent/Makefile
-default_user/local/Tasks/Makefile
-default_user/local/Trash/Makefile
-views/Makefile
-views/mail/Makefile
-views/tasks/Makefile
-tools/Makefile
-doc/Makefile
-doc/C/Makefile
-doc/devel/Makefile
-doc/devel/calendar/Makefile
-doc/devel/calendar/cal-client/Makefile
-doc/devel/calendar/cal-util/Makefile
-doc/devel/importer/Makefile
-])
-
-if test "x$with_sub_version" != "x"; then
-echo "
-	Evolution ($with_sub_version) has been configured as follows: "
-else
-echo "
-	Evolution has been configured as follows: "
-fi
-
-echo "
-	Mail Directory:   $system_mail_dir
-	LDAP support:     $msg_ldap
-	NNTP support:     $msg_nntp
-	Pilot conduits:   $msg_pilot
-	Kerberos 4/5:     $msg_krb4/$msg_krb5
-	SSL support:      $assbarn_security_enabled
-	Use movemail:	  $with_movemail
-	Dot Locking:	  $msg_dot
-	File Locking:	  $msg_file
-	Gtk-doc:	  $enable_gtk_doc"
-
-if test x$enable_gtk_doc = xyes; then
-echo "
-	Programming documentation files will be built automatically.
-"
-else
-echo "
-	Programming documentation files will not be built.
-	You may want to install the gtk-doc package
-	so that you will get the Evolution Developer's Guide.
-"
-fi
diff --git a/data/.cvsignore b/data/.cvsignore
deleted file mode 100644
index 13fe803164..0000000000
--- a/data/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-evolution.keys
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 250a51a7f2..0000000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-mimedir = $(datadir)/mime-info
-mime_in_files = evolution.keys.in
-mime_DATA = $(mime_in_files:.keys.in=.keys)
-@XML_I18N_MERGE_KEYS_RULE@
-
-EXTRA_DIST = $(mime_in_files)
diff --git a/data/evolution.keys.in b/data/evolution.keys.in
deleted file mode 100644
index c2c27d1af7..0000000000
--- a/data/evolution.keys.in
+++ /dev/null
@@ -1,24 +0,0 @@
-text/x-vcard
-	_description=address card
-	default_action_type=component
-	default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-
-text/x-calendar
-	_description=calendar information
-	default_action_type=component
-	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-
-text/calendar
-	_description=calendar information
-	default_action_type=component
-	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-
diff --git a/default_user/.cvsignore b/default_user/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
deleted file mode 100644
index 0a74213d91..0000000000
--- a/default_user/ChangeLog
+++ /dev/null
@@ -1,163 +0,0 @@
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: Added searches.xml to default user data.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Contacts/Makefile.am (defaultcalendar_DATA): Added
-	create-initial.
-
-	* local/Contacts/create-initial: New empty file to trigger the
-	contact manager to add the initial Hello contact.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* local/Makefile.am (SUBDIRS): added Tasks subdir.
-
-	* local/Tasks/Makefile.am: 
-	* local/Tasks/folder-metadata.xml: new files for the default Tasks
-	folder.
-
-	* shortcuts.xml: added Tasks folder shortcut.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ldap-servers.xml, addressbook-sources.xml: down with
-	ldap-servers.xml, up with addressbook-sources.xml.
-
-	* Makefile.am (default_DATA): same.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: Added executive-summary again.
-
-	* shortcurts.xml: In out, in out and shake it all about
-	The executive summary is back in.
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: And removed it again.
-
-	* shortcuts.xml: Commented out the Exec-summary.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: Added the Executive-Summary dir.
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile: Added Executive-Summary.
-
-	* shortcuts.xml: Added the Executive-Summary
-
-	* local/Executive-Summary/*: Added.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* ldapservers.xml: added yahoo, whowhere, and infospace servers.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (defaultdir): Use $(datadir), not $(prefix)/share
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* local/Sent/Makefile.am (defaultcalendardir): Install the Sent
-	dir in Sent, not Sentbox
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* local/Makefile.am: Renamed Sentbox to Sent
-
-	* local/{Sent\ Mail,Sentbox}/*: removed
-
-	* local/Sent/*: created
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change, folders with spaces in the name breaks
-	configure
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* local/Makefile.am: Renamed Sentbox to Sent\ Mail
-
-	* local/Sent\ Mail/*: Updated
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* local/Makefile.am: Added Sentbox
-
-	* local/Sentbox/*: New folder for storing sent messages
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	(install-data-hook): ignore error on mkdir.
-	
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (install-data-hook): create an empty news directory
-	in $(defaultdir).
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* ldapservers.xml: break up the uri into it's component pieces. -
-	don't store the uri in this file.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* shortcuts.xml: remove the Internet Directories group.
-
-	* Makefile.am (default_DATA): add ldapservers.xml.
-
-	* local/Makefile.am (SUBDIRS): remove Directories.
-
-	* ldapservers.xml: new ldap metadata.
-	
-	* local/Directories/*: remove directories.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* local/Inbox/mbox: Removed `<blockquote>' from the main text so
-	that the welcome mail is all visible when loaded into Evolution at
-	startup.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* local/Inbox/mbox: Commented out currently unimplemented shortcut
-	items.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, local/Calendar/Makefile.am,
-	local/Contacts/Makefile.am, local/Directories/Makefile.am,
-	local/Directories/subfolders/Bigfoot/Makefile.am,
-	local/Directories/subfolders/Netcenter/Makefile.am,
-	local/Drafts/Makefile.am, local/Inbox/Makefile.am,
-	local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a
-	proper EXTRA_DIST section.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Directories/subfolders/Bigfoot/.cvsignore: New .cvsignore
-	file.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Contacts/Makefile.am, local/Contacts/addressbook.db:
-	Removed addressbook.db since this is now handled by the pas.
-
-2000-05-08  Matt Loper  <matt@helixcode.com>
-
-	* shortcuts.xml: Removed unused shortcuts which point to
-	unimplemented folders.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Contacts/Makefile.am: Install `addressbook.db'.
-
-000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* default_user/local/Inbox/Makefile.am: Install `mbox'.
-
-	
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
deleted file mode 100644
index 3dabe74653..0000000000
--- a/default_user/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = local
-
-defaultdir = $(datadir)/evolution/default_user
-default_DATA = addressbook-sources.xml shortcuts.xml searches.xml
-
-EXTRA_DIST = $(default_DATA)
-
-install-data-hook:
-	-mkdir $(defaultdir)/news
diff --git a/default_user/addressbook-sources.xml b/default_user/addressbook-sources.xml
deleted file mode 100644
index 52a52a001c..0000000000
--- a/default_user/addressbook-sources.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<addressbooks>
-  <contactserver>
-      <name>Bigfoot</name>
-      <description>Bigfoot</description>
-      <host>ldap.bigfoot.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>InfoSpace</name>
-      <description>Infospace</description>
-      <host>ldap.infospace.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Netcenter</name>
-      <description>Netcenter Member Directory</description>
-      <host>memberdir.netscape.com</host>
-      <port>389</port>
-      <rootdn>ou=member_directory,o=netcenter.com</rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>WhoWhere</name>
-      <description>WhoWhere</description>
-      <host>ldap.whowhere.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Yahoo!</name>
-      <description>Yahoo! People Search</description>
-      <host>ldap.yahoo.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-</addressbooks>
diff --git a/default_user/local/.cvsignore b/default_user/local/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Calendar/.cvsignore b/default_user/local/Calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am
deleted file mode 100644
index 9117ae6373..0000000000
--- a/default_user/local/Calendar/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar
-defaultcalendar_DATA = folder-metadata.xml
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Calendar/folder-metadata.xml b/default_user/local/Calendar/folder-metadata.xml
deleted file mode 100644
index 9313cb5f50..0000000000
--- a/default_user/local/Calendar/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>calendar</type>
-	<description>Calendar items</description>
-</efolder>
diff --git a/default_user/local/Contacts/.cvsignore b/default_user/local/Contacts/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Contacts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am
deleted file mode 100644
index 3a30a122fe..0000000000
--- a/default_user/local/Contacts/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts
-defaultcalendar_DATA =		\
-	folder-metadata.xml	\
-	create-initial
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Contacts/create-initial b/default_user/local/Contacts/create-initial
deleted file mode 100644
index e69de29bb2..0000000000
--- a/default_user/local/Contacts/create-initial
+++ /dev/null
diff --git a/default_user/local/Contacts/folder-metadata.xml b/default_user/local/Contacts/folder-metadata.xml
deleted file mode 100644
index dcee1ec826..0000000000
--- a/default_user/local/Contacts/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>contacts</type>
-	<description>Contacts</description>
-</efolder>
diff --git a/default_user/local/Drafts/.cvsignore b/default_user/local/Drafts/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Drafts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am
deleted file mode 100644
index 144b8bb834..0000000000
--- a/default_user/local/Drafts/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Drafts
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Drafts/folder-metadata.xml b/default_user/local/Drafts/folder-metadata.xml
deleted file mode 100644
index ee9cafe3b2..0000000000
--- a/default_user/local/Drafts/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Drafts</description>
-</efolder>
diff --git a/default_user/local/Executive-Summary/.cvsignore b/default_user/local/Executive-Summary/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Executive-Summary/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Executive-Summary/Makefile.am b/default_user/local/Executive-Summary/Makefile.am
deleted file mode 100644
index 6fae47d4ab..0000000000
--- a/default_user/local/Executive-Summary/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Executive-Summary
-
-defaultcalendar_DATA = 		\
-	folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Executive-Summary/folder-metadata.xml b/default_user/local/Executive-Summary/folder-metadata.xml
deleted file mode 100644
index 86e9e425e4..0000000000
--- a/default_user/local/Executive-Summary/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>executive-summary</type>
-	<description>Executive Summary folder</description>
-</efolder>
diff --git a/default_user/local/Inbox/.cvsignore b/default_user/local/Inbox/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Inbox/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am
deleted file mode 100644
index ed3ecd58d4..0000000000
--- a/default_user/local/Inbox/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox
-
-defaultcalendar_DATA = 		\
-	folder-metadata.xml	\
-	mbox
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Inbox/folder-metadata.xml b/default_user/local/Inbox/folder-metadata.xml
deleted file mode 100644
index 64cfbadfc3..0000000000
--- a/default_user/local/Inbox/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Inbox folder</description>
-</efolder>
diff --git a/default_user/local/Inbox/mbox b/default_user/local/Inbox/mbox
deleted file mode 100644
index 9b3910df46..0000000000
--- a/default_user/local/Inbox/mbox
+++ /dev/null
@@ -1,2225 +0,0 @@
-From -
-Return-Path: danw@helixcode.com
-Delivery-Date: Tue May  9 11:16:21 2000
-Received: from trna.helixcode.com (IDENT:root@trna.helixcode.com [140.239.238.2])
-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA26395
-	for <danw@twelve-monkeys.helixcode.com>; Tue, 9 May 2000 11:16:21 -0400 (EDT)
-Received: from twelve-monkeys.helixcode.com (twelve-monkeys.helixcode.com [140.239.238.12])
-	by trna.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA02867
-	for <danw@helixcode.com>; Tue, 9 May 2000 11:14:49 -0400
-Received: (from danw@localhost)
-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) id LAA26391;
-	Tue, 9 May 2000 11:16:21 -0400 (EDT)
-Message-Id: <200005091516.LAA26391@twelve-monkeys.helixcode.com>
-To: Eva Lucy Ann Tester <eltester@helixcode.com>
-MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <26389.957885364.0@twelve-monkeys.helixcode.com>
-Date: Tue, 09 May 2000 11:16:21 -0400
-From: "Helix Code, Inc." <hello@helixcode.com>
-Subject: Welcome to Evolution!
-
-------- =_aaaaaaaaaa0
-Content-Type: text/html; charset="us-ascii"
-Content-ID: <26389.957885364.1@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: quoted-printable
-
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>Welcome to Evolution Pre-Release!</title>
-  </head>
-
-  <body background=3D"cid:26389.957885364.2@twelve-monkeys.helixcode.com">
-		<img src=3D"cid:26389.957885364.3@twelve-monkeys.helixcode.com" align=3Dcenter><br>
-		=
-
-		<blockquote>
-		  =
-
-		<p>A warm welcome from the whole Evolution development
-		team. Thank you for helping us test Evolution; with
-		your feedback we can make it the best groupware suite
-		available today.</p>
-		=
-
-		</blockquote>	=
-
-
-		<h4>Getting Started</h4>
-
-		<blockquote>
-
-   <p>On the left of the Evolution window is the Shortcut Bar, with
-	 icons labelled Inbox, Calendar, and Contacts.  You can click on those icons to jump from one tool to
-	 another.</p>
-		  =
-
-		  <dl> <!-- <dt><b><font color=3D"#993366">Today</font></b></dt> =
-
-		  <dd>This tool offers a summary of new messages and the tasks
-			 and appointments you have lined up for today.</dd>-->
-			 =
-
-		  <img src=3D"cid:26389.957885364.4@twelve-monkeys.helixcode.com" align=3Dright>
-
-        <dt><b><font color=3D"#993366">Inbox</font></b></dt> =
-
-		  <dd>Click on this icon to see your email - all of it.  Your
-		  Inbox is also where you can access Evolution's powerful tools
-		  to sort, filter, organize, and search your mail.
-		     </dd>
-		  =
-
-		  <dt><b><font
-		  color=3D"#993366">Calendar</font></b></dt> <dd>Network
-		  and share your calendar to keep your whole
-		  organization on schedule and up to date.  </dd>
-		  =
-
-        <dt><b><font color=3D"#993366">Contacts</font></b></dt> =
-
-		  <dd>The Contact manager holds your addresses, phone numbers, and
-        contact information.  Like calendar information, contact data
-        can be synchronized with hand-held devices and shared over a
-        network.</dd>
-		  =
-
-		  <!-- <dt><b><font color=3D"#993366">Tasks</font></b></dt>
-		  <dd>The Tasks tool combines a "to do" list with
-		  alarms and reminders to help you keep track of
-		  daily events.
-		  </dd> -->
-		  =
-
-        <!--<dt><b><font color=3D"#993366">Notes</font></b></dt> =
-
-		  <dd> Write poems, take down messages from phone conversations,
-		  or keep small things organized: Notes is your catch-all
-		  notepad.</dd> -->
-
-		</dl>
-		  =
-
-		</blockquote>
-		=
-
-  </body>
-</html>
-
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.2@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhEcJQyUsSkAACAASURB
-VHjabL3ZcuRIkiyqAByOLSJIZlZN95z//6Hzch5G5J5lZrqWriQZG/btPpiruYHZKVLSXZVkBBZ3
-czM1VbXkr7/+c++6Fnmew/sCSZJg2zY45zDPM/7885/4+9//hiRJsCwLsixDkiRwLsM0zUiSBGma
-Yl1XpGmKtn2iqmqkaYp933G73dE0NZxzWNcV27Yizz32fce2bfq7+75hXTcURQHvc+w7kKUJrrc7
-8jxHlmXI8xzrumJZFgDAy+WMfQfGaULfd3AuR5qm2LYNAJCmKbquQ13XAIBt28K1O2zbpj93u93Q
-NA2SJNHfA4Asy9C2LZqmwb7vh89YlgVJkiDPc4zjgCRJkWUZvM9xvd7gfY6iKPHx8YG3tzds24b7
-/Y6Xlxf9rHVd9fklSYJ931FVJR6PB+Z5Rl03uN1uOJ1OODUNxmnCMAzw3qPwOQBgmhc4l2GeF0zT
-hDRN4ZzD4/GAcw7TNOF0OgEA5nnGvu8oy1LvbxgGZFmGrutQVRWausK8rGjbFmVZYhgGNE2D3GWY
-lxXbtmGeJyRJqp+fZRmcc3AuQ+E9lnXFMIxYlgWPxwOnUwPncuR5jnmesW0b8jzXZ5BlGbIsxTTN
-KAsPX1Ro2ye2bcPtdsMvv3zHum7h9xy6rkOSpMjzXJ/bvu/o+x7OZfC+0Pt9PB749ddfkSTAum6Y
-5zk8dyDPPfLcYV1lHS7LgjRNkWUp+l6ey+12w+vrK/Z9R5IkuN2u8L5AXdfIsiysaVkT67qCf5xz
-KIsCv//xB15fX8NzTnE+n+F9gc/PT2RZhsLncC7Hf/7nf6E5NZjnGWVZoChK7PuO6/WKt7c3fXdN
-XSFNM3R9jyRJMAyDfFdZoqpqDEOHdd10bX1+fuJ8PqOpK+R5jmGcdP8kSQI3zxPSNEOeeziXYVlW
-fXh84Fxs27bp/+dGybJMN5M3P1dVJaZp1oeR5w5pmmKe5d+fzyecc7oQk8Rhmlp0XYd5zrFtG+q6
-hssyDTphfyJNU6RpinGadBHxpUtg2jQATdOMpkl0ocpmk2vs+14XYha+x75E+f1JAwg3Lu+Jf/Lc
-h8Uni0muN0XuMgDAOI5I0xRVVcmzcA7DOKLrOhRFoQFgHAc8nyucy5EkKcqywLLUsnGWBfM8I89z
-5LnDs23hfQGfO92wSQINvlVVwXtZ4HVVYl5Wvb91XQ/P3jmHl5cXDVrz46FBQn4mRZKm2Pcl3Hse
-3uWMJJFnwWc9z4v+ngS3DFVVY1kW3fhZKv9921Z9H/zzeLYY3z/0+vnMs0w2pssc8tzr5x/fiaxj
-e4gBcpBs+66HFJ+DHD6brneuJR5IaZojy5weVgBQFCXKssQpbFZ+zrIs2Pdd11HuMizrgvv9JuvY
-OQlYSND3na7pddsxdh3KqkSe56iqSp6TyzCFZynXI4HbFwX6fsC6ruH5J7qGPz8/UJYlpmk6HCzO
-yRqRZybPbZ5neffruoUIUmCaZkzTiDz3WJYZSZJKVpCm+Py8Is9zbOFFcyMuy3J4mN4XaJoaRVGi
-74fwIFPsu2y6fd+RpQmqqkKSJOi6Ds45VFWJNE1DJJPgkaYpun5AnQB8z2ma4vl8Is9zvFzO2MJf
-JGYV8cYl0u260HmyM8jJZsrx8vIiGyWcuM45XbDjOGGaRl30/HwGkKqqkKYpvPdo6jqckDOKosAw
-ThiGEUmSoK4rZFmGZVlQFrJIJdvx8D5H23YhCDsU3uPZtti3DdM4hcxMNhoXmHMSJJM0xTRJICuK
-Iiws6CIch10XUpqmaOoaaZZiWzcNoAzi0zTrBuA9TtOMYRj13m1Ak8zMI8vSsIkWzQ64OadJMgFm
-CO/vH6jrWt8XN2vMroCyLPSkkw2wIctkffX9U7PBLE303mQjePOOFw0Az7ZFkqQagJjJSrayYFlW
-zUTWdQ17QLILCVapHijOORSFx75t+m6TJNHf5Trb9h3zvMB7CRi5y7Bushb5nJkV8x3UVYmyOmEc
-O+R5gXG6Azh+/vPZ6gHrvdxvlib6/Ppe1hGzWhvE123XYMLrdNyIcmFTSNWc3gwXAX9OFuCmF87/
-pidFkqBtO11EXAgMFAAwLyucy7CuG8qyRJIk8CED4SmUpRmmeQoLzZuMQ05Gpr88mXkPf/z+J5pT
-oxuTfyQFv8E52Sh5nuvJJRt+xTTKC73fb2FDlchzp6eKDTRMsfZ9R+7kOd3ud5RleThpm6bBt2+v
-ckJlDl3fY5wmOc2cQ+4yZGGh8zrXTZ79vKzYwulzu900YMzzrCcwF1Lf9/C5g3M5+pDWT/OC2/2B
-t7dM31E/DPqu5B1IOfR4PPS5LMt8CHh1VWKaFz0lsyxFmsbP5OaX8iPH8/nUbIf/bNuGYVg0SOUu
-w2hKyHme9ZTMXQxwfL/Lsup75rNfwvsYx1GvhYGbz0WCc6Hvimuav8PgxQ3BNVuWBfYdmOYZdSgx
-sizTTKdfh8P65jriRmd5XFUl6qpEmjl8fn7qu2Pg4J+iKNB2fcjUUixLxzz0EGT6vsM8zxiGFE3T
-IEsTJGmK57PVbLSpa+z7Du9zTOOoQZSlii3nHdPKBEnYFBIZh2HUl/31j6YPYRNz4S4hzdz3HZJZ
-ZADkAbVtGzd3+EwGiaLwmgauqyxGbiBZjE7xgmGQ07gsPOZlxTgO8TRMElS1RNyyKND1fXhxKbZN
-rsX7HE1daTSU615wu91Q1xWcE/whz+VklvLIwWUO4zTpy2bq7HNn0tENXddpRsDNmmUZHo8H0jTU
-ypnDskrK2HY9siyWJ/u+YxhGXcBMLcuy0JrVPud5XkKpsGDddmyznOqs2SV1zvS04QKUZ9shTTPF
-XQDA5043HlPFYZx0bazrphux8B7DOGKaZnif4/F4AgBOpxOqqtRyIUnketouXpsvKozhJDyWDKmU
-NF2v2RQPjySB3jt/j5vWOafZhJSEHmVZoO+9btKi8JrN2FOZ98M1lGUZfO4PWBKzV/4s/2Hw4j76
-vF5DEJVrABLZ2CF48vM/Pz+1zLEBK2Yly6H0mKYxZFYpiqLU4DZOsx6wDLbLItciWXSm1/n1z/P5
-gPvx4x0vLxeM4xguHJjnTqOUTauZDXChzvNyqMM0mCSJPtxtk438uN/x7ft3FN5jnCaN4ltIpfZ9
-1xSO0UletDyAYRg0SEhNLJu/KCTCDuMUUqMahc/hiwqDiX5JkuByueByOSPLCoxDq9fgnMPpdJJT
-30u2UZUlXO4xjiP6fkCe59j3XR8kXwyBMZuplGWBfdswTnPAOuRE46kzLwu6rgsvPQOQ/UtQ0G4K
-1vvO5Zim9lDSAID3XmvreR4wTjHaO+eQpQmWZT+8TwZOYijysznybdc6VDZ9zOb4Xpdl0Wzifr+j
-rmMpxAzNZRnWkGJv26Z177ysGKf7IXMj0Et8hnWt9zFbk39HWCvukEr73CFNMwxhHe/7DpdlGEcp
-QYqiwLZtmp00daW4wRjWyTgOWFfBnt4/PjSoSMaTKvBrMaLn84ksk3JIsJc6lHepPsOIc8VUndlW
-4b1mbBL8FozjqBkF9x1BZv5cWXgkIfiMYwR/y8JrZriuK4ZxwOl8OoCVfd9j3zc4l8Odzyf88v27
-qZUSfTFyyuCQikmaNcP7QlFkbgBe4LIsGMYppGdyar6+veHlcoEvCjzbVoG0ZVm0ls7zXGuYeONA
-13Wa3shLiXVr7jIkAUhq21ZPjbaTurjrOpxOJ3jvw80PSJIBfT/ooiL6630OXxQYpwnbtioSzbQy
-or6rvhAJYIOcKAFR3sMC3sJL5LOqqhIuy9D1QwDsKgFHkwRdP+jG5POX551odH88W33RfB/7vuP3
-3/9A0zRYQ/DlZzCAyDUnh4XIf6T7w+7KimmeQrDYMC/xxCJAzLRdAr6UjHVdCfZTV5LKh3sc90mz
-CHZTyrJUFJplpr0XBlnnMs1CuYmmeYkZV5oiyyLwPM0LlmXQ7GxZZs1KmZFIyVlI/VxUeDzuWnbI
-ppSs5dQ0GMYxnNqJBhqu2b7vw6b3GkirqsRvv/2uHZfL5YxlWUNGuR9K2GVZUdc1cucE1BuGQ2a2
-batmPty07KBwDX58XjUYMOPJc4d9h64lCaqyx5Zl0cOZ2EHfd3Cvry/IfQEgh58nuMzpySmnw89R
-j6eZbSexRcfOAVO1ovABIKuwY8e27boIuYHKsghYADDPqYIvy7LpTRIUWtYlpKGyOFnnykbzWk91
-XafdiWVZNCUlyPP5eUOSJHh9vSBJUkzTqBnOtm0YJ6K+PrysTE/8adr1dCCYJxtWntk///oMi+Ci
-z0zR5dwhyySNK8KLWLfVBNCITMvvxv/PwMtsSzbXhDQAVWXhD6DY7XY7gJjDMGCaRtR1rZ/De5aU
-8BmyqErxkRiMwvOeRq3/pTySANL3A5L0jHWbMHX9YVNL8KsEH0kTDGEx8n3Zzc8/LDW2bcUwTnoq
-Lt5r+cNgl4fui63lidsQUPRFhWWWwyhNEiyhVGIwimUE4HKPItTeW+jqxJ/JEBIf5CEYFT5Hnhea
-CXifYxylrOv6DkVZYN93PcjKshTAbhjweD4PKTrBTJsNz/OE57ONXaTcYVkyDVzTNGLfQ4u07zVj
-A+RQBHZpP4aOEbOVLDsj+d//+3/tdV3h+WyxLHOoqTIAe2gnpOELF6235FQSpHvfgWHo0dQ15kXa
-J0mShv8l8CIpaB96lkz7y7LQk7UJrbau75E7SXXvj4cGlKqskPscHyE1S9MMfd/rjTLQrOsKn3s8
-no+QLo9wzuF8PqFteyzLjLaVWvV8vuB8PmEYRuUrJEkaIq3cqwCj8v3crI/HU/vWPvRxiWssoV03
-jiPO57MAb/2AovAovA/YwxI2GMKGYneB4NikCDjATZhi2+REKbzH/fFAbur1pm7gco/H4w5gD4j8
-LFlHyLTWdcU4jmiaE/Z9U6zma7Cpqgr7LgHHlgwA0HU9yrIIte8SShjJ0oQvIFiJPTTk/yfa7dh3
-CTLrKmBcURT6/ZIBBMAynLTe+5AF5aGrk2gLERAQkF/nQ4CQz0PoFMza/ZFywOsaZwAiCMnP5Pr9
-+PiQ9dk0ep3DINdcVQU+P69aoo3jiLoqUdVnDEOLMWQRzNj4TLLMBUxhC1mCZDvbtuJ8voR3Ks+B
-e7Pve5xOTdjcUlrxsxjgvc9xu93R9x2a5oSiiDgG12/btQdgPvnx4792/gderHMOwyAtvOezxa+/
-/orH46Fts0iYyFCVJT6v14B+p/rQCU6QyGD751yIZSmtP+IPrMN4wuz7jo+PD/z66696MhJMKYpC
-ywWmPkmCkOJLRK2rCu/v77i8vKCqavR9h2URwkxZljifX5AkGdZ1wPV60xbP89lqjfTx8YHv37/r
-M4mdkUlblvu2KQZhEd7L5YL39w8NJnKCRsBPUjz2/ZMDQMPP+Pz8xMvLiy7UsvBS2vSDPhP20omU
-82fZqvzbv/0bukCSWZYV5/MZfd8pnhPRfTlV6rrGPE3o+h73+/1AhGEaSsIS+/nO5TifGiRpisfj
-qTjO7XbT989Fx9//+PgIQarWGp3P5vF46Lv69ddf9fRNwuZvu16zL7YlWVJwjZKItK0bmpNs4HVd
-NRW2YCezRa47tpp/+8fv+Pf/8Xf88v27Es6kPe51vTKl5+exXBBQeMAvv3zTLIt7Zllm3SMsd7uu
-w/l81g5Jmqa43e44n09I0xSn0wnrsqALHZ9hnDDPsxLDhnHS766qEmmS4P3jE29vrwo8E7dj9uey
-LNN+KlNKvqiiKFB4j3/+85/Ytx3fvn+THqipUduAegvjrJFI9i9ALNvrJamhCiUEA4psoECkyF04
-YaS1QiLHNE3aA04S2URVWSpCz0CSJInUccty6JNy0VRliW2b8f7+Z+ixh99DoimaBKPUoPEbkkR6
-8WVZhgXvsK0LxlCGcONKytdiW1fkudNsRTYqF56kqoXPw/1tyrRzTtpx87wc0t15WTGHvjUDDhev
-dBAGTa8jHtJhnidsm3zm4xE3ex5qWoJSbAnak5vvzmIPxGQkBZdDwAYulnnPkOI2TaP1ts8dXJYp
-wHdqhCn44/1d61OSYoZ+QOE95mUJPJVJDyKCeNuWK4bD7hNLvW3bcL6c4b3HqanR9YMwTbcN03wE
-RW3qXJYFvC/w/ZfveHt7Re5rTIHjwEyFwHVRRH7INI0YBimzqqrGOE7wucc0zXp49AE3syVPkiQ4
-n884nSQ7e7YtnMv1pF/XFY/Hw3QfsuO1h64Wn5/PPdIsRZokmOcFfT8oDmBxIMeTna2ibZPTqq5r
-TNOEddsDcFLjcjnracFFSYCKNS4/r6oq9H2P5/OJl5cXZf7xu9Z11TYdb1BeZiAoZE5TNgJPSZLg
-/f0D57OASfxettQ+Pj5wPp+VSEQgqOsH/QyeQG3XGcDJacCZA/AipYcH0OK///sf8D7H29ubAn3T
-NIVuxnBgmFmG4Lpu6IceRVlocKirUjc7f29eVmGOhWfKHjxbaFw4Nl3lhrSdAAZAkotut5vWuNys
-XKQEJplKp2kqLahlDjjHFFLpCCbyVJW2VCTHrJt8b1l45SEQnS/LCk3TaPpKIJHlonMCvO4Be7D3
-VVcV5vCc9y+EL6Lzuwl+PGF3fX855nmVNmfukLkc29YpuDgMg8kkc91UQkWXtmHTVFiWFX13MyxP
-6Tps+64Z7+3+EKwol/KiaQRn+fHjHffHQ1vB5L1YYJB09Dp0JoSjkRvsZ1EMiP898jkyDYQ8LJM0
-xe1+l0MgrKlpGjHPcqjbbNYRuWfqI+kR9N/7fsDLy0tI8Uu0bYdhGDRKc2FL6yUCX2VRoG2fUv8H
-cMs5Sf3IxGPqbxl62hoMpBzb7tq2DW9vr3h9fUFdN7her6EF5LGuUmeTLdf3Nz0p2BbiRuILIK8+
-z11AjldlSvHnkyTBr7/+gqIo0DSNdhpI+2XrzmokyNbi9zJtZpdhWzfcB8kYqCN4PEYFE4m6p4nT
-mn+cJkzTFAJYeih92DPm7+Yu03dDlucwjApkEjiKYF7M2NjWfDweaJpG+8jHGjYzVOBEg2WSpsjC
-Pe27dAmyLMXp1EiNPPS68Xi93qeGny/Pz4UaeZwm3O4PfA8AM4HJ2H9fvnRMoGAhsYXcZfC5Q9v1
-uN7uShcmPySu41wziGEYQ8a04Xq94+0tVSajtsS1I7ZgMUGL7eoECdZlASDvRJ5FYDBmKeZ5N5ia
-4C5VVSs+Ro2JpRezfOEfliNt22JdSyV/2T9sgRdFibqOnJYlXK9j7V54j7br8ecff8IXHlVVaY06
-zwv+/PM/Q4TLlXxDUIQvhH3SsijgCxE0nE47TqeTElKKokTXtVq72jYQe8pFUQSAcdceMmub0+mE
-wnuJwuGF9cMQePUlTk2NJBWQ0PsC+xbTO5bZTJ1tWvvx8QHvC21TsWVjazqi76xHheyR670wiEnw
-3A7tNv7d4/HUFy+YSxQ68Tn2fWcWdqTsWk6AZb7xDwUnz2WGn5dwLysys4lZ6qWpUE/ZzmNWwe8p
-AtawrdsBVyAhiO1etummeVfaMIFj5xy6bsAYKNG2FZYkkYGXpbHlx3SVB5AtKyzvnRnl17KL77oo
-5F2yJczsk6Sqvh8CMSuDz4Uy64sK7+8/VHB2OuVBaDWHzGkzQTDVg4zXxeyS19h2nWZQ6yoZTtPU
-AFKs61OvlZhW7qRDdAvfF2nQobMROBjEuvZdshV+X1WW6Ppen+u6SmZpWYzM+ngfjkgwF1nd1HAu
-w+nUoO8H7eOfTiejqltRVTXqWoA1exLu+45xmvBsW72J5/Op7ZdpHPXBuXDDBPd4WtmUlui1jYTP
-tgPQaUfBplPLumJoO6XkkvwhAKU3GgGz2L03hJNMyxirDnw+BdiiUjGyH/GTipBlDhFsZiUA8P7+
-Hlti4fqE3lxiGgXN/fz8RF3HrIxZBBcauegsaxggmRnY5yGAmQQUKwhyzmGaF5RFEeraCEaNo5QI
-VVX+lDFxE/FkoaCF74tkoNxJm1DqUXfQI5DPkTuHHXvAJR4a+C0piKkt01YudoJ/3nvt1BA74SZ0
-gWbNYOW9V/xBxTjrhonah73T35W2aoHb7aZZgsVaJsOH+CoqExJZjmfbout6NE2jJLlt3fD+8UMz
-NB42SZKowk/S9CxQ0Qfd2PO86SHAcrMoPBIk2LEjzVLtiKgyNrQf+Tz7XoIGW4LOLjCypC7nC4qy
-CqdZxASaptH0TjYlDmQhLrwpBBMGi2mSE+Ya2hWsQ6xIiIANU/ay8Pi8XnXzE3VlXz/PhXPO9ImY
-gDMABwAs64I0TUz/NJJPCJQJ9Tc36r5c+7n237lgSPf9ypYk1TbiHJtmMNwcTdMcGGBrAAmlRz8j
-CboLLgLbossy+VwBlNKfWm15LpRg8tgFcFwUp7GnFkFKboxpmhRniF0KwXReX18VYRe6ao4xoNrc
-FJYtSLCWp81kGKPK46c6MFCWlUUYiDH8OX4HM0gLKgufIdeUX07qTDcWAFxvN3z//i1QaVleThG/
-CCfw9fqJqqo1YOfOhe6GU9BZuBSjZsZ57nVtc42s64p+GLD3MevgZxIE5ua3JWkkvsk1tu2odT9B
-Q3vIxKx71extGEYjFoskO5EgR6FUmsQunYtgD4LwRaSnw+2K6/WKruuNcq/VL5GA8TjwstmO4Yti
-QODNVlWlCDNPWda99CMg33wYJxRFiaapUVXloUZnPcbAwBNx3XaVMUcCjjC8hKJaKl+dbcjC5wc9
-t6X9WoGOBRBPp5O2bSzPnp97bC1FZFnr3twhDzx6BlDZ7HPcrGlyUIpRT28ZcrZ9ZaXZfT9ocCPI
-6ZwwDu1GZNCzKkc+V5Kx+LMx3ZbT5Wutyc1vWYgSrISIdL890Jwa1EGown9Enz7rKc3ft5tz33fc
-7w8jtXWqg5d03wfQrjhQghk4ZPMJRbcqS8WXuOmkz3/Ssu09dCOsepOfGQVxWShxxEujaWokSJRN
-S6qyc5IRJAk0y1aKcZpg/cLaJEef3hjEPfi+vBeOP/8b1bQ2A/ntt98AAG9vbyoNJ/W564ewTybh
-IEhNAqgsuCjgco/n8xEkslK3jON0ZFoFfjvJOxaRPPLUowFH7jLk395QljVOpxHjOKlAwzlJS3xR
-4Y8/fkfX9Xh5uRiBxBo2BZREI+24ImQDbaghY50mJcSMNG1EELRuh5qN1ziG048LPUkSXK+fmKZa
-a1XNBFymqDXBwCxN9Hu5OEiRXgK3m1TOJAHartcTlKkvF5yeotse0rnk0AkYhlgSMWjZzc97Jxst
-4h+iBbC1Mr8vS5PIyjNGKXJ/sUPEhON6u2pXwX5eZF7OyHOvmw8ALi9nZT92oSUahTUpytIHZucE
-73MlMvHaRdwyYtskcyL7jTJ0fg/bpwfNe9Bb7DvgcockaFH4rtSnIMs0QHGd9GFtD+OoWg4CeTE7
-9MjzAsMQO0up4RlwfU3ThI+PTxV2jdOmhwp/lp9ZVTnqqgL0cIgdDitIIpfG+1zlySQtff/2DX+G
-5zdOk3IAZB2mqCoPlyYiJ0xVpDFhWYXhVdcNHo8n8lxAk64btaX0z78+0TSNRhZeoFBTi6j9z1Ij
-TpAbTZMEZVUjSzO4oFqa51nbQ1mW4eVFhDt//fWOv368B7Q+V+CLG2dZVgzDgPv9Hii/lVKUmbKn
-aYr7/diCIVouRJb5IL4AgKY5aXbDjcZSyaaQEtj84YUwIq/rGngAudaR9pTs+14XHx2Y+DnMHsho
-4wJi6cJ692sb0LZVy6LQAIwv0lkLvq7brqn4uu6HFHNdoypN3uVyUCVaujAXM4VFs9KSpRPAVls/
-DIcM0foF+NwHSngsTYpgDOKcQ1PX6AMWQAbmPC8q5OmzKP+NJUnEqO73x0/CK1u+jIHVum1bbAkb
-jQIPiVml6Ahq1+ehKzIvUGMYObh2pSZXVa2OWsxA+BxIBS7LArn3mOYJ5RrNWabQ+bCZqZWU7/uO
-19dXnE5nOFejLB8KrlrtBUtiR8KBBZzIxmNt9fHxI8h4s/AiMhXvUCdOCjBBv7qu0bZP9H1vNgV7
-7Su6jw89hVjDcGOQFVYUNcrioVROy42mDRJTIql7C2Wj8eGyxScLdA7uPV0gWayH+o01mqTkTk9E
-vnxGT4Kgqi0PVlx8bsQH6tBJYSDxPkcaEPgu1IhFUSihaFnuuoDi5lj1ngl++dwZwk2q7EdKTKuq
-CifQCmA/gI3blh+YiAxq879webL4EHUI8QSRUoaZDDdUFF/lyjQkbkHg0rZG7SlGfsbXMmKcJs2i
-mCFEUll0JErTTU9nbnoi9rv2wyeT0UQO/v1+x+VyCSB2zCCIwpPJR5zCOjQx+3HO4ePjA+Mw4Nv3
-76EMW1UYJ98p+BYADNt4MDexRh3TNCt5x5aoNlPghp5m4cpwrQmT8o51/UTbtni5/F1BeWbjxPDS
-57PVupm+Y87l0Zwhd6rhtzVTXddClKgrVbzJgi7Vvkkinbj9WCMNe2rQt4/ZAhf2NE24Xj+CR1qp
-9S83QlVVKLxHlmYqA67rGmVVI8+LQ0RlUCmKEufz6eCe4wLYw2uTzseovz+ZhRpPqtgh+Pz8xDgO
-B5MMnhRdIEJt24a//vqBHz9+hJclC3rbNpV19n13wAoIaJVlob5x9DlIzAZJDVeiacQIpa4qTPMS
-ar0l0H4nNe0Yx0Flsgzy9iSyGvTPj6tufouLLMui4F1E93MFL6WXPh8wBmvYYSnT2hpE8pM3wDiO
-+Pz81ExJXIGGw+flAWMiuJpqCbipIjBmMcF0xljbSXu6ONiFRaOYBX/99QPjOBpzkxW5yapYio7j
-iLbt4IsCL5cLTk19AIopCLrdH3i2nQkK8TpyFyXR5ATwmVlcxNrYuX8hOY7PfVdNB1vPlrLsiBA2
-Ta09ajHv8OJk8pMtE9l+/qCk8j5XhJk/fz41+PHjB1LVGgh6um1pJOcEezBp0Xi0c6engvc5ltlk
-J4Fwwo1N7MGCYY/HQ1+2JbBwQQl4lCuHWmpvYR7OATWVk3INJJhUAxo30MVu8gAAIABJREFUQFWV
-8ME2TbIbOdmfz6ec6OcTPj7E146p1+VyRl3XOJ1OISgEvCFNNdLbAKn2UqFEs+41wzBqS4wLgr3v
-fZd2EF/0V8cbZhV5Huvz9tni8iI+CQR5WU+fLydcLqKlmOdRuxpW2mr78Lzmqixxf9wPBjJ2kfIk
-svRwptX0tGOwvVzOxoh2O6S/Sch0+FlDIAJF78LsIDPm2pyDToLt2PtdSkpmbTGjS1EUhfhIBJeq
-aV7QdXc1IJVW84BlmfH9+zf8/e9/R55fMM/PQ0s28iicZr7btuGf//wL3uc4nU7BF7INOpNKRW5s
-RTP7tGYoq8G2bGlFOT5l5F+9IPd9h2PKtK1iO3W5XA6KKqtoWgJ9kzUgXxi982xaxowiSVJMc+T6
-F0WJtm21sxB9AyJoxii8LLKQ81ADrtuukVuygcimsuSe2D5ag/Bo0F63DQT7Lh6GQu3tNbWk4y1d
-YIvC43Q6oSyEWkm9+bqJzLLwHi7PjaXWeshabCoqBCVxRiqKAknQ+0fAMtOSpCg8tnVVLoYYps5a
-L1vHIEuc6XvxJ4jsulzTTMpBq6pU7gHReTHvXPV9sJwRk5TNuETFQ+GrMSWNPeXkS/V05s9pmRHk
-3l9bmRTh8H5ut0/UdYlT04hrlYvlifoOzssBS7Agme2+0FKLh5pz2UFNSsCVz/e3337HNI0oy78J
-dyDQnOMBkx9wInatksRhnu+4hjb2UUrvDu1dcScq1Pm57TpUlVjllWURCTuO/IRC3bDkvmIwbNun
-4ixRFu00gNhDUa9HPc76QXvUzmWSChsFk233WbOQrwwyopgAsG7Sa57nFxUKRdUZKbtDQHjl1Kuq
-UqWokmYuX4AxKPhiRTSWiMRNzgVMjIM37XOHpGm0TKFgZVlWTQXLosCOHS8vL1JaFB5dP2hrkWk6
-PfTGadKIneeFtpxsCryuW2jxrAY1Xw/GnFJvjtphGacJuY+eiGS45U5MNyzKb/0ZyTMg9pEkCZL8
-qFOY51lBJZFn1+b5RV3DNVhh2xadXfg8RK7Xm5ZWLK/atkMV3GgpGrN1rGUZCjU4PxwwcoJDn4X8
-vQseiaUCzyQXxSxqC2Yc8XSkY1KkvMt1p6FtV5YFXF7h+f6hmdztJmy6W8gQRKknG7SuxKWXrWU+
-k8/PH5rB0Udhnme1Xmd5RUD9crlIlqTu2bVK03k/47hr5uBcXPepOfFJZiPJx7oCiy16XCe0fU/+
-z//5X/vj8VRTDrFRzvDb77/Be4/z+aInBxcrRSqsU6lbV5useQl24tHuyAcbL0kbl3BaSruRCy5L
-E/iixDQO6PohGC4kwe64Umvxr6mOJSzdbleUZa1mDYJnSPvEuRxd3wWXlFm9BdVBxWWY5lk12tSm
-F97DF+K0ynsjKMNFFlmLW6DB5iqPZtB1mTDfqImnr0Gkli7hpe8hUOWqracfAGWh+77hdrsbYJY+
-+8vBaisq9/ID/kLd+7atSqwqiiKAXfvhpJ/nGVVZBTOWFV0XsyWdCZA5vH98BE/7AmnIPKg/T5JU
-/e5YTt505kOqPA8KYaRd2GlGJn4Ondaz4zgdNlN0SkpC5id6ezo08+/2fQte+ZfA7pNSj07ARVHg
-+XzGtmySoKrPWGZx7dkCZsJ16PP84DfA05228FxbDERlWQWMZNDNSeyJfgrX201LTV6zDZgHe7V5
-0QxBOgJO1znXEvckM14+w6IokDwf/9yfbXsQeJAAQSeY86nRejsi8YKGF0V5kCHaVlXuMvz2+x/4
-29/+FvTjz58svK0mO9Y0q/aTu65Hnjs0zUlRZ56eLBektSWnOb322Wa53x94e3tV9RNLA74knrxM
-+cn7Jjg5DAMulwvSNMXH+wfKqlTbpwhMrYeoTiBUvl/QZZJDxARjCItuOqTPdpAJlXX//Y9/KJOL
-15bn4u5jdd/zsqIqS01Ref8fHx/45ZdfVL02m3KMmQjNPE5NLR2BgOVs24YfP97xyy/f9dqp+rSq
-Tm4IMSapdLCHVWgKVhJZjGkipBnKodkdsG1SKcHu6qqcJgl+hNOZFm9lUWAYRziXmRIpV0n3+/s7
-/v73vx06Knz+r68vanfPNVuVJdquk9Q59/jt99/x9vamknNiTdZUg+vADpShnPx2e+DXX+PzL8sS
-27ppt4OHxLIsaOoamXN4f/+h4qR//vMvvL6+Hmp8i39IK3nV098CtWma4uPjAy8vLxo0qrLEsi64
-XsU23M1m2o8VyBQ+x7rt+Py8Kjpv/dFlkZUB/ZwOZYC2Gjbp0d7vN0VRrYjEAiRRMLOYm5VT6uXl
-BT73yAJ/XUC67QAokesstEtyvRcF7yLivx0AM0tisRzrLE2Auj448J4vZxRFoToJy9GnSIc22uu6
-YUljej+OA7quDfxur4gy68+27XS4CkuLx/V6QOd5HZYOHU8Ah3Vbf6rz+L5GM8uBz4/PnaIuOvHa
-dxy177HWJMvQmrRqgNt2TGN/mPyUqTlndgD95KSnD+N8GNwicxKE/EMtvQuALSfqDKNIhX3ucLs/
-sG2rHhTX2101AkUInrynqpIAKwq52tC3U8F2QqYkLj3Cv7BlmzUesd2mWILCeChk2jYUyvHtUEJZ
-KvBvv/+u8ykKnyvXwe5N+25YEpJfIG3t5QCME5inj8Lj+dSuR547uLLwaNdVQTu+XDHNzAPqWKqW
-2+IA3PzcfOmX6MQBBnXdBAOOVfXJtu6z3upH89EFbfvE9+/f0HbdwZU1puDRY0BkwZtaP9t+McEz
-a39t6Z1WJcg2IO+rKkvMQQjkMqfKu7Z9hsk3cYoNBUkE7uJCyBWM25RFKKdWXVXB2nsF4IKcOlqK
-83eYLsahHBEITBIcHJv54lnL871xQVufO/otZlkalHOZtg/7IFDJUvHhZwAh9iOjukY11ByV3vyz
-1Xbhc8Uc+N7HadbgxO4Hs7/oiZAoBnA6iWNOUVaaDUYwrURdVUgzh6oKa3mVcoB6BF2bQQtRFF7p
-xTtk07NWJzGMAY7ZrTWIjYKy3HR0oujJ57OuKYKhEoCTn1qEbKM3tZiPtF2vhiA2cFqbcn3WSEJn
-KrY8qYBlV83yP1juu2fbHSSVdN+hqWKahtosTX5KL8jg2/ddI7IVLTBSSstKuOj00+P0IerNLYNN
-DSqKQk/VwucHQs7XwSPP5xNzAPCinXN2GLzAkob//f64BxpqqSAV/e1Yy4oD66c+wL5/6mfWdY00
-zXBqGmzbiq6nuWZ7iNqWrlsWcXYeAcW261D4XFNHEpS8z9VPcZ7jadF1UgtXVS3OSOHZTkZAY3EA
-uuNwM1G9xtQR8Ni2SCSZZ+GKc9ITg7fy94dYAxOUEtJMeujKsEZlyUCyCjeWBaW+/pERXEK5tqWh
-dIOkJRZZmpYgBfzzn38Gfn+NcVx+AlqtgetkRE3TNGHfN6WXF4XH45EdAFob3OK8xU0di59PwdP4
-rOdlVRJOtON2gcUaO17EKpqmhssLNfzg95D5GklPqWJHXdehbZ8KilJEtCzrof1HA1XiD9u2wZHg
-ot7+ppfvc/rJL5jDTdtBopS72oXOGXk8EZ/PFt+/vyl4xtSXRpfWStwqtBh5mdo45w/e9NY7UNP2
-ID4Rn7kquAItZrGm6uM2z5nRoyeHsUkMPIWmuokuYqbtzDDUAjt4JBzNQdxPPAWWOPM8qf8A0+D7
-/aHZCp/pNI3qf2c7Mnw+lOLOYTNwQCafrZxm5ZfTn3MKRXhFZNu6GXkvzyBLU7jc4+Pjh3RedPxY
-Ehh0j8NwUOF6bEZvkGqKvavjkWzU5/MRvufoDmx9Irp+gDMDWMVIc/mJ+MKMTIZqbsjzMmycO5Lk
-fMCb7vc75nnG+Xw6TCBi4KFxCgfTMNuhyQj3DD0AmCEQeSe4TJZsFGVlcK7UzJL2e5ansa4r7vfr
-IRummQj3mkwGGqL0OrgQsZQjmLzv80//3ZL+qqqMcmCbhrOunWYREVTBB4C9Ti5CRk9uRiKnZFtx
-Qq0M+XQKjLEWt1N2483flffPDcPJK4pIV5XxoxMDxSi3TELP1B3kuNYEkmnxvmeK2M9BvMMa1078
-4aIvC49/BD1/HfCBZVnx+fmB0+mMuorDSPjCv7ZI44y5aCBB1p7NWqxAxWoUWNfaIRDWMo0cAuli
-IFC0oQM67YDSNE2xJLOq+5ittW0r/g9ViS5NMQzRzpoppDgWJeofIBbU8RSyAYveksu6oG07FTcJ
-0OXD1KD+wLiMWov1MHTFUpG/KhmZNYisHZrm0gaNa4bZ3fl8xr5t4hZ0veosvc3o/RnU6bdg260M
-pmUpXQ+xz5MyxBcF1q0NqkAxkBVVqhwayyqEHlrhUfzE+6P/AWcLAFI6SJm7aqbLbIs8D87cELFP
-DZfJxOUxrBuLKRXeSwZghw/ak8tO5rEIJwGKOJ7pOKpJUvwCRTEjzwdtfz2CYo9ur7yJ+/2O0+kU
-ZqmJFr4sCh2QwEkq0gVwurn/+udfeHl90YxCRi6neDEuwEztv9ajDBSSom4HCbE13+TzmecZHYCm
-adD3vZqjrOuqQNKO/RBsyHug5j62GpeD3Rmzh+fzib4flDUozkepMbxcD2CmGKPgCzAbx3R3/aBW
-U8J3eChAKhbRnOE4HdxphHX20K6OqMhSnS67mwGxLK8o2aYzDTnwwzDi5UV8GVzmtHTM89gpkpbp
-dKAMW/amLRGpg7DdIt53kiRwmWSf9PkT1eCupSb9A6g1WZcRWTYFsZJXVV1sN0Ml7MyM6qpS/Uca
-XJApNOPkp2Vd1IVaMKJcB4MO26iuS1maHMBEAYK9Blw793DfYbo8TjsVTOmjI3CNcRxxv9/Epm+V
-ISWWX0JMxUU0/YjK26mjFH7M4UPkBJgP4hFbbwtfuzNUz1WBHh3mkOd6StrZdEmSoKkrLCutnyMI
-s267zg+YMKEMi04MNUYVKPncY56mA4JvdfBc2HYTWgziK4JuT18rG+ULFsrpFowtS0VjbZvIcrm/
-ljwRb0nRNLVKUtkqskxLzoS30lFeM7kNbdsFzoK0UUWVuCjmcAt95qY5HWbqEVS6XC7wuUNZ1ehV
-p5EpRZyGI/xeDryoKxn+4nKHx2PQuY4kxHBsFzEIps1MnS1Zy2akYpDRKknLIuzRH284UITr+hTY
-jZVmqUAJn8dx34/HzVhylcrQpLeE7RiRmSdZ36yZK9cvW6CPZ6sHHFN/Aujx72fZzKFcdm4+6EBs
-MGc2/XxOB/NSUoDHfVJmKolFuTE0mYMIiwe1Have94OYgtJg0Tq8pGmKwURYPhB+uaC/ndEKrNoi
-2znUMRAg7LSao6trFlhYucpI7/c7bvdHHEAZggNLjjYstnmehFvfNMi9vBjq59MsVcdh27n4V4w5
-K3CyFFNrN0ZugRhOiuqRtTX76lkm4GldlBiUwJKEfjUOBhlfTzkGChmdVaAsT1jXOSi6loMpqr12
-Bs15jtx3y70/nYRI4s3EGLLgmFLbGtbKTOdlRTIO8IU3bU7RjGRB0huNZIKyUh2DZzPhJvjc3W5B
-3GTLCHdI563PgXWfPnY+Uvz2j3/g8nJBVdWHZ8N1FAeNCPGGpZHFZOigy4wsy1IdypqGMkRS8EUy
-ylLGiQEdXCjbmOWtq2zuLJQLfO+BH4c6eG4suv5SpMGDgXiIHXrKjg/dnKjPoOCOGfBR1hwVjmz1
-Ub3piwrz8tTMl4d5lmVwBDwW4zTKhcQXbJFlKyqxP8eXer3efjL6/Ooqa80srIEHiTTclCQbUQBj
-qb6kWI5hgEUU8WxqxiG/12OeG62NbTtN56av28EnkKgp/05SdKemqJx+MwVuAyXE4lt/PURjCoq4
-2G1bz3ZL7Kiptr0JLdlTtSiim65rcb8/0TQiKvK5xxpMW63Dzel0kv5zWQv7q6gwzY8DiEjnYLrU
-dF0ceMET6PF44H5/4JdffjlYvTVNfWjZRVPT4xhqMtDEjrpUghbfoxirLgeWGzf75+c1DMTIzKCa
-kKG8XHA6nYPg6BFnHIR3Q2+9aewDntHo7EIC3eu6HrgREXBbDP8+zkHo+h73x/0AhNrOyjjN2Pb2
-gE3Qk5HXbYMPZw9wFgU9FrnxibEQBCTGVpUyanwYuoP4LkrpvR5cbfvE89mpgI7ZcBtGtznn4Gxq
-LvVHbIGwjcAW3mpcX+wUFT5AOrlYE08yx65hehAjo3NORx6rXvyLVzrTRdbSVsOtJhvG/825HKem
-DhqFBbfbVfvDtNY+1lS7ahFsGWDTzCxL0TQnNLWUF7f7Q+o2M6xExyzxZMkjJ+B2u6LvC3z//k3b
-ilmaIEszXYiWzLQHq7E8F5fmYRhwPp/Vnef19UVFRxwqaVtcVio6jT2ez1YBR56gbN9mUxQWMbOL
-I87W4OoTx8AT5I3gbzSgZKvR+yIE40xLS3GpifMI6dXQhyEd9DMgW3MMzL5tWwMOkuicClkDQivO
-fYEs6/Dx8SEDRk4nsd4KaD0PEQse2vVu02GrarRTrLwvFNGnJJolHAE6OmUzSBLbmqZJcJi6Pvgh
-cu3ZQ+2r1Prj4xOXywXDMOJ0avSz2ZngoWIPWnkHkQtS1w3u96cGWjt1W0lvX6m5bdvicrkgSzMs
-WNX+2k4EspxkBg4aFPJl78FJhVkCnXoo8iDCas00Se+0rMOmbnBqGk05rU8eBySw9cWUmGVCUZSY
-5zVYhcvoZdsP5axCm3pZVFlqwE3Te6Zdn9cr6rr5Msl3AxCxAo6/8l6kpJfzWX3hSEBidNdTZJwU
-E6DvwbFcgEpWfVGogpILiKXKvm/qmWcHX349haLqcvkC/K4/ZW9U4bGDMBvzCVqjM5hzTFZZeDyf
-Lqj8WizLTdtods3Z2RTkV+z7jrqq8HhGHMR7r0GiHwY821Z9JOiDMAacJnpTxpNc2nITpinqA74a
-sHxVJxK/ii1NYbayBRjbu6sCmwwezHL4nCzQbFV+5ITweqRjIKA37cNs2m8zFErgl2VGXddY1/Rw
-MDdNoyPv7RwFgusuKoUInlQKKpDkw8XJ3qMl29hgEF2BZ6NDFzSVclqmytw8TN9sLWjT43GaAnjk
-dGCEZTqRw02fwGfbKWmiLEv5Dpcr8KW1PY7ZxsfHhwzwLMpDNOYDn6YZS7oeWnP3+01bWWpH7QzZ
-JFB7ZQJzhXnq8fHxGYZvbqpXt0YU7GmTCJXnk7LwGDCHcQy2WO4w8MQOA2HvvQ+KQctKjIHr2KK0
-ZhGWebauGxbTIua74nPwuUe/DgfTFNGxFxrg2cmJcxWcptwsH1iPW3/7aRxwPn07UMlfXy5IUoe2
-FTLQ29s3aZGF0e7WvYmnLDcvn6G1GrdtywjMuS/PYDVdokwp3WxFE4xOA8vQOl2xlJTuyXiYibCu
-ycGUl5uU05dFtOS0I1cEl6F1YwkFXevi6fE4ZDbTNOLzehU5tap1ncrPXRF8x3ijy7KiqlIRdHS9
-Ejv4EC2d1d5YtBnaDwDaMIxomgbbtuF2f6hwiGpCuuW8vr7gfGrweLYH+THrabE/jsi5pMnRI57y
-XY635uKcpgn3e7Ta4mZpAwMyuu+kSlm2Mw2ou2edH1NK4HJ5CdOIZVAjwVJr7En8gkIUmTnnfzLT
-oOEpuyZ5LqaQXdcpSj6Og/jFBW65tTi3nP4sTZCE+QXkpdODkNRpzjRg/e9CO46dBCvKoRkFZzpa
-4I3OR1ZbwEPA1qj0ILBrh2Ufy7J1XRV4Y6AhxmNVoMu6wmfybmVq7in8vASf2+2mwVAA5DRYsaWh
-k+PVZanvOwCZli1fN//XrIDu1nT6FX/IDPPcSkCZJlU2fi0voklJbG3yGfJgsfMGHs9n8M4o9NAc
-Qxlg236abYTsS8q1aAqbJKkGDHnmQjWf0hTu/eNDp7vyNBZGX6dRjeDUsmRqkUxZ59eJqJbqKewt
-eWjP5wPzPON0OisDijdaFPlhjJcFFY+TdZaDbtz7IqrcluWn4Rl5XiBNrwe2FcVB6ZcBpmLIIDTM
-OXDr2RmhH53lsPNF0aCELZo8EDUYfQlqMSUvilKBnLZ9aokVDR7CGKfA3ovjtOtgcLoq2ePrZGG2
-GDlrsAv++lE8FUdcdd1oHH8z5RtQhZYqsy3Tz0jTTE1R4lTiI8BrQT3LMOWCFSxC/Bzv94duVH4W
-dfZrqOH3QAbb9x1//vEHXoIybhhGtOE5iH+DD+amTvX159MpmKPU2NZFyU5t22JZCni/KlIuGMNo
-3IWPQzvshkuSRGcXLMuMJffKKIzlUHIwIrEqQjuQl+tShsFU2hK2Za5kzdMBRLZdm7ZtFWvRATpp
-prZvljkJzCHQBvLYf/zH/9zJCnq2XTCzLJGkaVBkOYzBu31ZFjyfbZjNJ4YFfGjHgYeZzoK3qd/z
-+cDb2zekaYr39x8oy0qdWOqqRuYyfH5eg4KqDAi1zIMH9p+UbtShcwIwR2ZbNSFtzGKdK/W6kFHc
-oY63TjfWEVc0/rmiul812naSLt11qVGvgmVY27UHFtbRxyB6KkRHn0KNGy2ZiTpz61tAHX80Zt1V
-F09jlHEcMU2jYjFxuEkWho44FScxq4qU0k215uwc0DCTwYPfSbELNw9PJ7LTxKNOUnFq8H2eH2bt
-cYaBOEB5tF2r0tbX19fgDdDj8bijLCu8vb0iTTPcblf1aEAgbbVtq9dvS1SWunxuLJmaug4uVTCO
-zOu/sCHbAvV6EHelIjr3tl2r921r7iRJ9UA8qmGz8P0OhS8wjIMBLhd9nsw+hbGYHHwoxDG5wbLM
-QTi3qmAvDg1JA3gYuTHJ/fb7Ps0LmrrCQO//VNoa8zyhbTvVv7NOfH2RyUGcMW8jPNM9ors/fvzA
-v//7v2uq8/r6im1b8f7+gZfLBTuEVca5Z5Z3fTqd8OPHD7y9vR3qTpmyKiafFnuIPvAxIH18fODt
-7e2gNZehHq3R4cvvcNKQ5btfr1e8vr5qGTAbW2YL7nifqzXz7X5Xrf7j/sTr24si3ZRZ22zGLk67
-CaZpQtu2+B///u/aY2fJMZsJP01dhdRwO2AkaZrier3qwNY4tiyWbtbZ12o6uEg/Pz/x+vqqGoz5
-C6/CeuuL+5P0zdlqbZ9PNGGQyr9C34ntfIZBrza4SxfljtOp0RKhrioU5QW321+YphGnpkFZSe1L
-7MTOd3w+Hqib5qdMRNx8Kjyfj58Gb9ANel5WvL+/4+3t7XCiM2vj763riqaptZVq5fVcf2Iykisu
-EudPxmy38DnKqsb//b//N6D4NZ7PFr/88t1QyKU9OIzTAU/hcyR2wvfZPp/4/v07HsHkxLItAcBx
-019vd/R9j8vlgqpqtLaxeu+mkQsqqxpJkmNdn0aS6w5tNEveIFghqqUWZZBg7thRFDWAzgB61mcN
-yDKnUU5ntgVvdXuyW/Se+nAGAmuX/NU+yfoTML0qy0LrU9u3JYuObTi+ONkoV508a0lO27YGiSj1
-DKL1Xr9oA76OgiYaPk2TTGoKYFUenJWI/pZlcQCcrFTbBjcdpx3UkFys/8qWiwGNs+UZvNc1+6nP
-zZ9nK64Jm43ZDi247iEoCkchgpTTNGPCrNjEV0LSui4HO++u77FjVwu3cZoxzXcN/oIHedyCPoE4
-TDxRJySJUL27/tN45MvQl74f8N///Q98+/YGH6ZG0TSF+EC0hJsUCCQFl0GRJZec+onyQpq6wrPt
-NEiQkSr1/Yx5eQQMK8WpaVREx5JsDwmxlOLpoQMnEn6nWAeDOPUp0s1xOm59WRa4ZRGkVFh8p9A/
-HrXG5A9S5kqnk33rvgyOHA+tl9QM4WSUJEj18Sn9+T///CdOp5M5lVbtzSdJIgNEQokg6WyhqSRP
-Qp4iTNO34D3PDe0NpkAlldV45+GkEuIMlXlVCEobgOTgN0jEldr2SCIRk8g4508AmH4Y4IsiIMeB
-wmkWJUFIKzeldJQb1g5ykA0sL14ARZkqy2m5dMLhzHmO3SKISRrxviPMTJTgbN8le9oSXNLDyDfr
-BG1baBRInU4NtnXDSkPWaURVVwrM2qGvFuylLiBJU4zj9FOrkP9Okhclu3zOUfItxibXzyvSLP1J
-iGVPR7FHn0JWuil99/v3N1wuL6Ek6oO2JcrRrW+ilX1XVam28tFMZdN1Iy7Qlo2YHcrPyGcRK/2q
-PqF8tjrAVP0qtk07LV9NR9mVmCbBBshDIAZh5xns+47UuRxVVemH5yYSk8nGqb0+tCM4yotDEtkf
-jidanGCyrit+/Pihc/SskolZgzi2LD+9rHXblanG1Imbre97dKFWTpVVOGtWUJbiJGv5z5aTr2aL
-4fNpMrpuO+732yHVt78XhRjHBcFpuhy3TsdZAm08GcST3usmsK1QO4SUcwycy3TAictcSHVHdSDy
-uYNjOyr44lPnbqWuNAGNWU4Z3umR32GHoc7zopkXXY6tmIpqTQYZMu0oMrLybG7Qy/mMsizUsZlE
-H7oJP5/toWWZZe4g/Y1DYJ3Kzu1kITG47VFWJS6XC87n02HoDdczr+lyueAcphaJv3+JtzBZpyxP
-B/SfTDy7RtmKnOcFj8dTXajpv2cZtELr7UwJhIMk/Xa7KmYhdnI3Q2mfD9dCDEls2rYwtLaVwzaU
-mKRuq3Q87I0D5Vi90KpSFWRWz82UegjOP/SAiyOSJv3/Nn3nQtp3hCmuhf4u7YjeXl+lregLVTnZ
-aE8vAm7651NYgefzSWiiiTDq7gG85EnlvUcXzCj7QRaDdXJhGkgMQLKODkVRqt++de3liWxxEEsb
-js4swGJGZ5VljarsjCXWgmVxGJbxsKj7vg8TZzgBGZqyZwEg6rpZTzzy0ykl7vpPdYO1p54IdyrD
-ghwOarA0zOKL2vdFmYw0WWXwJ9hlTTyHYQwjuoWyPAYBFrM4S0JSv4hhQO4yvL2+qkks3wH5IGzJ
-FUER+vXk9XkQugQSVVmKi461KONAzMezC6rPWTMcOuJeLi9Sjrochd/02uZlxXj9PIC1KqAJOEMc
-1gE1rOGhR9qz+GA+NPOUCUtOMQprVz+rCUqpvn1t2xnLt/wgmLKIIQQ/AAAgAElEQVR4lJWYW5KQ
-cw5rIPHFtYqgkhWeibNtnS5QM6mhZw02TrNuDGqsWdvbIYxpYHxZiiLNOkkCUmPCRcwnkzTFNvQH
-YOJ+vyNNE1wuL4YZmOn8+JfLBS73WOZJnVNInIlEByiTTySZpTnhIoFjmhedAc/R5SRv2GBkCUCU
-cHbGQoyL4n6/4f39E7/88h3ruuF6u+EtjZZVVVXjzz9/N6YqcR79uu2aonPB3R8PpGkSXGbojJyh
-rkr8eP84gJbrtusJamcjdIEpyWyEpJiPz4eeelmW4f3HO85BisyNnOe56v6ZEdgOCPEQGagxw+fi
-28gTh6egdZwi14ODab+ebJRaU436k8OREabxfpZlhi+qQzdnnKZg+W4UroYdKAM2Ntzvd7TtU+t1
-uvyI4/OucxKsiSxxrrquUVcVXO5Vb8H1b6duxdFz0V4tdlicSuHrqkLmHLpbr2uZA3TjcJT5y3DV
-JI4tK2XWRB+MU+QZtJoVs81Mta+bl1VPbhJWvv6Jtd4WZIZH8QwNIiUCDQe0lYYR1hEndxk+Pq+h
-fXUcmWz9y05Ng+v1qoYj7BFnrkCSpDryymoEnMvgMheYhwXW14u2lZYvDD8uJC7i86kJ46qXw89b
-U1GaKwzjdFgU0Ywkx7dvb3h9ufw0YRcAlnlSvkBReIxjNPgovNex6V+ppKfT+dCNyVyOl8tZjTQi
-kWs5DJs8Wqdnx5FaYXY9vR3Pl7NYUmVRpbcsC+gaXfhcrcI42IXZwPpF8h2lyz22bQmj5Eql1RI3
-spwMrgWxPj8DODrwWkm3tFkzJfm0Xa9DZqws3QaQ2+0WMosytJ+Bx6PVE1b+zh9k21zH5N5b3j6D
-yrIuat9u/962rSMommrLU4KX18Om7wc81ShHMj7sEPXhNB02vR1uyoAu+M10yAasJJ9+Cl0vGFVd
-13BVWcq4o/BiCBZZ6aytvXixkdQh9eLj8QzqrdTYHe8HGir/d17WcMrEmXN22qzM/ZPSgHRZPnwx
-wegOhA2e5sIN90rEkDSqx7/9WsMXFcbpfhBlsPVjh5lw0wzjpOIKG/Gvt7ueDl+n8/KlNk0NXxQA
-UhSFpPbDOClXn0w0EZFMCgSu66pRuiwKLOuCLHM4n0+H2rM3zLt/Vbp9FTTZhWlprczGXO4xTbOK
-fXLvkWiqu+q0InYV6rrWqUKbWXT2e2zwaZoTTqdG7dPiXAh3UA9yw0lZ1B0cc21ZKsSXJJCUNqxf
-5gla5uo4jihLH8qy4ECUO2Uq8hmxBZjnhd6PrPXEyIkz5REcDpI1Suitd581+7SAuFX90XGZcSta
-z8XBMMyYvlJ8efgQ2CZdmlgN9THcuyyT9qAGzLIMjm6y0TNu+3r+ayq4GwYYgRXKItfgviqLesQ0
-7Tqa2XriU1giixZK4eUpxUXzbFs82xbrGhaLc8o+/Ko92PddjCXmWeWa8cWsIgJZngeMIU5ZcQf5
-8VcxkGVY8WXyeUT6K6KWPHgr9P1V0+stUJelD5yrMEUox+wDzz9ZQAu4swRvvB5+oXFnqtF83SQo
-2uDMICwL4XhCsFQhAj+MI6bHXYNZ3w+hbo0W3Uyzh6AHkXJvPIyqlhN8PDDZiA1RSTmNoxKQWFqk
-LsO84IC9kKdAMJNmnbxG3cihazAZS3H6G1rXIg67VbPZQHrj5ieLU+7hph0Vmqx8HWpqdSuWLajO
-VcGaXuYULIqtUPdveRq2nqcG56se46DgC/6VLH+s8jJyKLKg+BSXLJbu0zypjL6qKpk98fF5/ekD
-rMSXbQxKP7/SaDnvj+lYEVDZyATLdKqrcgpCe4wofNd1OvSQDz8izvLgWOvboZI2ABCJJw14DESJ
-rutRFE/UdXMYXfbV430YBqX13m43DRDkBezbdrC05sx3RnGyBC2VOXcZljm2WWmR3ratlgZ2s+d5
-PMHuj7t6GpIYxQ2mIpyiwhJ0HF+djARLueF2u+P19eUnBqV122HtG0uJo1GKXYzqyhPKEw61kNM7
-6icoJSe28Xg8Dy43DOg0FbVINYMVA7C8n/mghiODkuPPLD5gefwqSksTAHJKcohrBChrBbvHaVab
-9yKoD5n96cDW8HwpE7aMPz19DUEqBpP1X1p8W3MPBl57D1ZQtaWpll3cyJI5FsZ+3R8wHOJWQ9AG
-HAxXN2O7bKOSrf95obYXTdujiLx6rR01SucOQ1F8+Txo7cfNS4loFQZasl2278D4BRSLfey4gezD
-J388erhF1Jt1lF3YNnqTK872EtV0CRIs27FfO5o00Fp7FYUXEGYYMM1iJMHJQmlwVeYz4kkiL3c1
-qjVxc73fHgoECdaRq2Js2zZ8fn4cQC978oq8ukBdN8ocpKbBPjPBZ1Y1lVzCc7QlBKmkXDz25LXp
-PrGM1KwZtmEZJHT2Y0C5o6TYh9kGo9bb9hmdz+fAJfHhdFswTbNmGZKZpOrFYLM4vlu2ZkkW2oxQ
-x7kMvigwBExGSEDWNCY1gjinY92SZD1I4ilEIo/Cbr77/X7g+8soufUwlUr9+l0GIAvDUrPQEnZ6
-PxYYratScIIgGV+COzefa+FzpYMTMKZxjqP5pDilLEr0+Vrfkk+dJgm6kAbKB63GA/3o7rIZ1xid
-XrNu6gnHKMb6yhcFpo931HWDsqxxv9/QDwPqudEHZlFWLn47yGNZZvx///gNLy8Xcc3xPoy3LkVd
-Nk5mfLQ7ePbzZKLayxcF2rY9eNLbMsECRbE2mw+tLVuHczQXxVHW1ryuG5RFgWfb6si1b9+/YZ7E
-/5+Lfd9z9Sakew/rwK/XU1UVsjQT5uY4HOjUUpJ4SQ2nCW37RJ/GzWgnEX2doDSMIoIpitKkwrNS
-s9nGpFCFhqH2uRFXitOHEXreErQj2p0dCFtZmqHwCQbTiv461coOkLHmFyxH+S5cRixgPhDQqBHg
-qc9yhMxFBm3bV4+j46vg8e/Vx3Hddnifo66rMGZ9PkzAsi5ADLBUgJZlgaY5oa4qXG/XgxFIDOCb
-OmNL2TNrpruEUW/rOgV+wq5dljzPxRIsTVNMs+jOHw9pGdR1dhikwDRx3fYDsYXkkyFciF0wP368
-o++Hwyw9PsijJJbqrmhH1rZPba9ZR2I7hYUtL2vaCQAvLxd8+/amc9+psXeZE+KME0FLbiIqh2Sy
-ZfT+8R4EK7OmmdZdxgKQthzhNVg+uD2JYpsJ2nlY1y0AfvRZyHWw6rqJoefRtckfamXnMq31nHPK
-5HPOYZon/PjxV+iXi5lnlprNV/g4Cs10R7iJisBPkAWWHdyCbPBMEqcDLOycBp6W1obNTlb+66+/
-cD6fo/ErnY8zh2EbA4hawOUe+zCo3ZcFGdkCoyqw0yG1s25YUqfZ8RGcZoiDaQ1VnFmWXG+C//zP
-/8L53KiQzaLr0zSpHwXfjfxTqAU6SzySxWgCop4YaYItWJ/TacrqTcqiQBaGfjKLY1bFk57j4PmH
-bFViZkLlP4lJTe71ObphnJBMs3moW4g69aFlFDe9oLCcpEpSECM7qajjOISBlssh3WHQYB1DW24h
-7qS6MLkZ0jQaN6rrbdfjX/2xTLXCe7i8Qtf9P1wu5+AkLKc39Q92SAcdXSJYlunJOhlPdW4yCwAy
-Rf6qKrTp8dfWUVmWuJzPYlZy/1DHlji2LFU5sLRsKh3RTR9HjqIizZpuQQw0tIKqqko/b1mWsNjy
-AzI9jgsu5zNcXmCZR6WzzssS/O4FB/m8XsO7Lw8Zx3FaUjQ44ffwmc3zruOp60ARJo/gGdaVdWdK
-0wzvH++hW7R9acdtP7np0hAkalGkbKX9WFmWmpLHISWJthOnedESRk72Dedzg5eXV5zPZyX28DsY
-eIgfqGah61BXJZ7PXDGxRTPs8UDbJm5Bl2RmSHyPNMXh5m/qSvkFTdNoJ4gDZJQvMC9o2xYvoSWt
-hKwtEpucbfVxuAL924QxlGgH4I8//tTU5uXlErzinBmuGMEdaRcVyNIMp1ODNnjYc8Fdr0+NxgTw
-LOuMwxGmaTRz3Y6DGQofhTEEPFh7fXxekSTXgxuvTIzxPw0kYfAgFVhaRyGCLueDSQTR3Nhf3dTD
-7XSq1SSEABk3iBXakEBDEY1kH6sGv2ledNiHc5mMjc5zlIFtt64kxcQN6L3gD1k4ebMs1TmG1Pwf
-OR170IWPuoHarsM8X7+Uf8kB1CWxh3oEdnU43TfLsiAnd8FT4lgujeMQgq1T34N9B1xeAGg1UJSG
-5861QQovS0gmAHnoJLAEsziUjrbLMqRprmzLaV4MczRXgG7fd8WCJBjnaE4nscnLaqzrVe+bjEK2
-7fh7zJznedVTnpZ3mZp2rIf3YEtFrk/ibLZU+Aoaei/Y27puuF4/dUYjcTW6ekn5uCneRGOf5D/+
-43/utoYVf/3yMCJ8DPpo6RUH80Uk8IUPwzgyM1v+OOtexRDeBwnrri9K2nsZfrz/QJ4XMqopc0FP
-nYeFRc88KDjGceDn0xld3+kJ6DKHx/OhrS+2mpI0RYIE4zT+Cx+8yOsW9HTGvCzB9y6CQOy1x0GP
-KR6PO7Is14m+7HdTVsw2DdtxxFEsEkwuRTxNUwUEI9MrDSYiSTAI2VVbz+zEAntfSSixZ7789P30
-AyBoaGfZcwNMhvrMkquuKnQaqI89am7A6K+wajuOugHOPHQux/3xOMy453VFVuoaAlyB2+0WNwPv
-Lxiu/PjxgaapzKjsaGlGZ6c0SXALRiQEWKO+JTvY3H0Fwu0fu1fEO2HVTpmMVEvQBsUls8CXkIkm
-gV+hMzPC/uI6oTv2um4KJEpHaNYSmV4K7LwAO7qu17mEfNf8b3aYbgSvMyQ/fvzXblsOjFSsg263
-m6oEqVLKshLbNqmX3uPx0BnwtBVnUPntt9/x/fs39eez6KVMRsnweb0qgYYnEk/59/cP/I9//zum
-ecLj8VRzEdqAaS0TrKCSBKjrRk+Sru1QlIUirBKIlujQE059m3bZCUe///4nvn//pq1C7h/v43BH
-GUfVBopyjvv9rn/3xx9/4m9/+zf1R7CgFFNwK/ckxZcn2O12w8vLy0/26+y7d12POohwSHG2JceP
-H+/4/v2b6hm+moNajoPlNvRhtsE4TrhcLgdFpPoKpFGXTuDQPkPrp0DpLO/VuRyf16ueVn3fKwIe
-uewZ/vzzL7y+vpiW2ao4kJSDYlpzu91U2ccMripL/PHnn7hcLrpGCJYyo0gSwOdebeB4QHATPp8t
-zufzQaU5jkOwiPdo6hpp5vB8PnC9XlUVyUPmfr/j27dvOjglScS3kid8UcgsjKqqBA8KdHCWyl3b
-4du318Po9ljiRT9PAs40jO26Fi5z+O333/H29qYkJckmI+nOsX3Di+dY5qostSalNZjPfRB5DPrF
-cvpEmyO2ffiyCPhVpTj8ECSS8U1DHP6RO+R51OHbFlTX92jb50HDLzW+B1QttejmPzV1GNG9YhgH
-mVYThkAImShGQk40tu1BBgdiFbF+FkSem5mZUlFI4OIkH3YlODuOo8snM8PP3h9fBkk+dqbdV9KI
-BSJFyRnq7nCyMfWLQyLlc3789QMuz1AUL3qv1kuBPXfrceB9gX07jnG3GQQzJGGDugPgxABqrcYI
-3o7jFMo6KNbCYMxOibSpFjwedz1lLeloC179fH5FIRyLl5cXbNsaWozC5LMgrCUcRfWoZb3CuPck
-hs7tjGV5tKMbpwnbNpiBsT7U49FxiQGXlGrrhDyOowaNoqzw8fFxsFTvhx7jVB+CKoVrhc/xeLZ6
-P/QMnAPethhLtyiq20NmKjMgHSMtraKyTFpOO3Y1FhiGAbfbqJpuSw4Rk4czzqcGmSvU54xAFVMv
-C7qx3pZZ9O4wJ94SfexC5hRZpukERiyPoa4bNHWNzOV4tp3KI+u61lFX0zii7wdM06iDLKn4s044
-rMNsKl0UpbCnnAQAOhz3/cdhkfEk4RwA7/PAaoy6d8EahpDmleY714NvnO0kWEqspTL73CPNUhTF
-pLyHvh8MGSbD+XIOLdGL4CohGFlC1DAMSpDJc2Gz9eaebDr8r6zD7WzBI9FlPbSq7Jw9BvN1lVmC
-3ueHNJyuy9a5yA7wiMh9rhOIpmmSCUah5CCBinoW62PJFjSZnNuWHTo4VBuShcfZlefzGdu64Lf/
-91+oagk+0lLPkWbuYBdv+R42i+IamedZW6HExCwoTMpyFCJlBx6LzSitqzFlxGRfns9npTsnSYem
-acQVWOoWr5NLpUVVHF4onVwIbhHp54iprh9Q+CjcICDC0+7H+7v2fkVWWhhTxPRAjrFGEcBuXFPT
-MBSz1ZrVLqhlWXC73w+8dbIR123H0HfaAfC+UAMJIut86WxbSls0MywtYbVNfa8RWrKBFc8wjoky
-1I/Pq57MWRoZYZSF0i0nTTM9+azd1DzPWEL9b0EqOxiTp9YzcOOpMS+81ynMPNG99zg1tbDn+uEQ
-VGjGYvUMz+cTt9uIeV5Q1dWhNPpKoRXAeDBDXqFya1KZv+IBVqBDkdft/jjoQ+hsRL2CFfvwfXz1
-epD5hXkAA29hzeYGxM3DzMAaWdYFt+AMaTofAkr8nkWNWTZDiZ+mEeM4oTk1KIoCTV2j7bqQwYz6
-WdSSMBMehgHX6w1NU2u2xnUo/pqRRflVy6EGqMHLIUszJMmg4HucaJXpXoqEpBxNcwrDYsxId6ZR
-BPs+g922Pc2kxeTDF8pmZ83JsUUSwccDWEL3Fj4w8VLP8Xy2ivjKaZIc0zsTobl4+bJ5vYzMlopL
-IwXWR2VZYgumE23Xo+8jy4zqu23bcLu94/+n6017JLuSLDF7++pLRCTJUo8awuj//xBBgDCD+TCt
-akDVXWSxmJmREeHL29f5YHbs2vWgCBSqm5UZ4f7eXcyOnWUcJ3p6etJxECcDh5ohh01r8+tsICX4
-1kWea/mHCQpsrVHmvn9cVPGIMhHhnZg/47B9DHTAYnAhILvXN0Nzb9OeccDd5bnb0tYKcdjjP6ZA
-DoWyLGiefFILtw6zlPaRVgrzPNPhUEuoB3l++48Vo61icHuBploUpQLOeIbjNKlxC6pIjMRQPblo
-d1Za1lWpXA8c1kg3iuOI9m3Ri8uOEm0lh8+ITYzRI1B4cC7KsqQkLWi53eTvLB5LFFOZ799fKY5j
-quuSXp5fuFURNec8z5RmGd1u90+HkMXOwPJ0GQaRZ5HPAC63u23bKv+AcyrYGRl7cds2xgAAKuGF
-ATCzXu/Q+btRhEN2YYVsyRFWVIMSnvnwpQKF/ABHT42HGCoHBCVqSx4abzVgEs6vblWFHpKEYIF0
-lYcK9RSAP1QS4B/YHtUp5za1/rIjyGEY3LjQlHHcQ05qUnEzNzV/TtIbD1TU0Yx6gAxvW0j7HilB
-ybeJ3kVYlOrzxZx+HBdtNZqm0cWyPQiBHg1IAUrNcyyEmZROpxP1wahmp3bmDxwHseU/Xl/p5cuL
-5hUCcCUKPD+9R899a/2Oag1jO1irPTozqfdfnuuftyNDbKhhGGmSMRhKfLD59njzRER4Nvg8bgMG
-nv+ha00iWY/8Xseh9VqHbduoae4uMi5iXX9ZVkIN5ynFuu2UZ3xBQdAGNSHGgG3b0O16o/PTk6Yu
-oRLAZWdjxwIxDQWYjz0FvMuOeUN7+uOWYsAs9k5DVf+JSw8UgDY6ygJP8F/nYMjMZKRvklePfjrW
-F4+IJStZtbpuSHRxKzats9oehSiBPgkeB3aUk+qYb/Xam7Is6enpTHlR6xzVDHx0AfaSsGv1CrDR
-jiWOuesHdyhuK72+/vhUrsK8I01STybtnl/4SbzTto0GZEJ3AFUlPtMoM3B8ToREoBR1nIDYEEbi
-T/+pqordcvJcrNd6BdBwuINB2vcDh7/UtRhskNjIL+I2tHsXh3VDBu9DGW9ym4PXjyzJNIm9DESk
-UAcB6eEE23o1E92cchM4D9o9ti3rPU79o/QYzxSjRJ9uHOmhClUdzEgsc9UlNbGZKTIheDryRvf7
-1YTgoqUWu7Ys9QxssfmxrqEsZStxfkbWh8NVnCkfyqtLz3b4EjERyMk5wY5KdS5uOdzoq/edRz9F
-kchJtdKvv/5Gz89PdDgcnGyxquh+v+tm6/tBYrVLjdp69Eez1F6UNDbk0c6o2TQhdTLPLGNTDenH
-+ecE+hKsGuty+eDgR3OLDMMHDRK4WRSF52nvwjFCKXnZ+gktR5rE9OPtneq6VrIGK/xcKrCfmjsr
-ucbX0G/euAxceFRYPH/vFWdBdYLfta6JuPNyjPftduP3GAaK2o+jy3Lo+14JWbj5DnWl+MQw9FQU
-+Se9/rz4Go+npyeqqoqWedbUXOslADegYVw9EBEtRJqk6ksBezXwPvjvD2rn1vedSr25l49M5Fek
-LlBWIIaEXPzvqBLw387ZylWKVmNhS/FhGBUwTaW9tNmaUE3y2kDlxJVWPwx0vd1k7p+KeCiW0XWi
-I1g18RSS3aGu2adBWs9hGNUSDWvDqhUxmt3Exuz97Z2KMtcLbt34z8Q24NOJc5hDHppwDZiEoFyd
-55nKMlBWXFWVVFUV1XXNltNSMtVVpRRKXkSJztJxG9jTj0u40AthsMIUoJ3WhBSLMMt4NGhzAdjq
-/ED7HgnpJhUPu1yps4NxLHKRUu52dvHMuaK1QGbTNGE1VlJQ1rRK5QXACc4/A3muzLSsRNs2WZtp
-LtlWSVRiYVOSZhQLddkiyxg3RlFEr68/XF7AyNFaVVno1AXPEN+VGZ+VVnZfv7K5S1VVn7j8uP1s
-6AvGZ7fbTTc/gEsXsMGx1DgM7G0LHYh9lzxSZlLUXay1kHmPYBEGDJ1lmU3KgQVa1/VUVZU3vcLa
-wvjSUrgt4BxHsbL3bAuC8ttWUuu2G6ffSP/3QWTvmG7ZdGsIthhELDSQZNsSz/U5inh83d8Gz7vC
-+idYF6OyKCQIN9KLtaxKOh6ZqwNW7rLMXAFALqqGEjKWA23Qesjjxq6qWmWGc8AmlezAmtO63jXJ
-ZBgGOk4TWxEJWJHnB3p9/eGJfJg8FGoaikV2MZKzBpOgLStoJ30ebmQAPxwRxqQVlL+7IPJ1VVGS
-ZjRI64A+D6KSpu0U57BhpT7wlsi/I32RYRTTNN/VVUZLQnWB2fRmt+iu9TLwcgMjFz5p1Wm2ekN2
-orVqw8+DswxQ+vvtTmVVSlkcCjgbu8joOKGThIlcw0jjvOxoytqsYzGCm2B9BNG+aWSVMY191Njr
-xGbdNGAThJjHDIWiyCkg8eIb+0/WZ1pFmXeKdhIGnlDPYWrAEvRdBTnLunhkLbRTuCiS2OUesNkH
-H0zcEmS0yCQMpqw46DlGnVu4XQD2e9PS5XKhWsRhPLp2PXxAgcqnQZMvC/bhcLJlaYdWHl9/+/am
-nApWfbKnwjRNVJUFY2YWFLKMIi6LHOEEDx9iiFQAM5sW3LYdJfHonZT4QNM00/VyofPTkzyYUD3+
-0dep2WY/fJoxwzXHEmkQnzWKpBMKtT+LcYpCB3Au0n92fU/RNH0yV1zXVcs6FrPMOo77M+ONeV5U
-3YUJyWNYB8JBITRCVQDHG5SvURh9sunGs1/Xjdq28VBiHnulOp6Kooiens6SmJsb7n/EPonSV4OJ
-Cfnyvjsch8vmlfKiVFoyAipwOIOQhYw7bFx4Ntgb9zGVJwgCent7U+6JdbIJg4BmM3K0Y1M8f3bU
-nSQHcfFGlJZYlmaZsWeP1O3KWtYz/2HTdOkgcN8H4zhMZ6zNF/NjNrXEWwyAh1g9WKph6mPXA3/m
-SKpf5trUNVfLACxhggNpsjugY5XPL/NC96al97c3Op6OdDyeVGTH4DQnDg0S77euK1VlIXTk2caD
-r+rIC4VWFEU0a0+2M3ouNEdIZYlmz6hxniPvg76/f6gO+/z0RE/nM2V5TenoYpuxYcZxUsNELPCu
-42gynLpZmqhL8b7vMn/n8RHm7HYzY9FhdAbPABvkaVl21tgCB2El0cq8qF2pCTEJbnTYRyEM9HHs
-ZUUd1iFGzU1k5PXIuLPUXme1xZtFHV+i0EPL7/cbJUmn8/pty9XwM05iut8bShLmsEPnsK7Gv35Z
-aF5WdUq2cmFr+LpFkdrGXy4XjVjHJWG9Ie0/rDitqCxy+d2rHpKP8mkr58X0yB4+jyPSbWOHa1fF
-bjpWXB48Kyw+AeDQsjTtQQ9cQenIIujCz4TZBgOTzr7Nkna4Xa6pKguK4kRFX2VZUp5llGY834dd
-u429w82PgxucgjAM6XQ+i5aBlE7PMfQ73ZuW+r6n0+kknIqYFolKjyFdBNpYloUKdYZhYL+5xCHq
-oMiCLMO+Z7OO2VDK2jRavHCYjsTrpC9q2zYq8px2CY20RCCrBNMTXiSe0xRqqq81C7HeadyHB+qE
-Yo0imKji7MNtxWL7rL7nHhLhEdYQApuhbRnYZOBnFGDLEU8sjRYLxjowoWfGi7bfR0G3eZIDsZVF
-m1M/uUUSGlcaO9JCZFUurVDb9XR7ffWo2vem9cprlM5JHKmkeDativU84PZiFpyiorqqOCrtcqFt
-K/WAfSTwFAUb0URxQuvaakKuu3xCORBcm2DNaiFr/jOCEhKEwLWADgHvDJcGbOLgKYnDE7kRuJQ4
-+8A3ScHzGUyKEUJQnJR4NxeHs6GPIha50TR51eo4TZo7gPh06zGBwx7Sc2BQbozNGFHb3j0rOXaV
-5vTry/WmJjd1XXMwyLpuWjbxuIzHLBjpIe3GOqDiIdpNhVEP/PJmKaVAPwR6Cq69IuKS7msViI5n
-EDlLo2lib75pVgBHqbuU0zCOak6yLLvh7+dqKwVr7wWL/954uXEWiQWJAj3o/d7oHN0RUTLtB2GI
-ChDL8d1DVe3BRu1xpr6uGy2ipGO76kYO2eDB+CLTWwqVA3j5+Ls296BpGpUYs4lKo+0Tekho6K3s
-F6Dd6+t3+stf/jdKkoQulwtVVaVpPI8j1jzPKM9LmqfR+/eWyIIKM8s4DIaFYKFiHAzM5jSo07Dj
-kljji0f5rL2tNUJrHLSFdc9sV0q7HfnZywNrAG0SDD9ADS44tBgAACAASURBVEdFCaotDjN7efG4
-fDe+EL4f4GOVYcNt/Ti00DOizbOUZllbGP2hxYGBjPVphEdDVZUUJzUliQ+KxnmW0rLkSnPFh0BE
-NXL4lA4pHxzKOB6phGoPxZxvP4657wdx79lMFHLisZvWlRRjOB6PWkUEQUA/3t6V+LEZthb3nO7W
-zNKE4iSmuWkUZXeuRUwSYjNSuM3OejtAYmsXEwxPApEUAzHGyBG3P8tjjxRGzshjk81sc/+s95tN
-G3bx0YExFY30lsahwWlDMjcPI7rdV73FASihVePQTP5O4NEjpBR02CRJNJ/Bthd/+9t/0NPTmY7H
-I6VprpLmw+Gg4JETuzjef9t2+p6LoqRKAkbsP9j8uRwAkHJjMsMhGxktbWc8GGcVnvH8mpF2TKDc
-JGVUdio89ebZ+R0mMYNxGP3ypdR9unRsiIkLVyXPCIQlyplMcnzffzBMg2DxDiisdeskhX8PKvlj
-e9i2DZUyvoP6UpWrxn0LICY0HVEU0fV6pWEY6Xw+C67wrnR8BPUE//Zv/23nUUzPMVJZqtrxvh9U
-LAEtNXpUNjishCjBaLstw4PA6ead86wtoSLV+9tZeNf1Okvn2zSSyoF7GKgN4Q4Dog4YfTzHDTRX
-blU7Lf6zNmiCgZJUrMNuhJzEKAyoaTvxpou1BOUDZ/N6TjX4SFOaZMOnwoBzn5E/bxQhv07syGT2
-z71zTmVZsNAj5ANn3zZKs5wul4vmNUCzzmVm7GkQVskRYDux3pTHzmeOM/k2Oh4OtG6rjupQ1ez7
-Tt+/fafnl2d6enqmtm01k34YXGTX7Xb7JP1FeT+Ok8S3Z1LCL14/i2fFvoR843Os+l0Ulq7CcWrJ
-jaqylEO8Nx6QbmL08X6hOOH2om1bqusDlUVOmRCaLIBrDw5L0OJLzmER8BLAGuKIt1meN6qwx4M9
-kGlEqLyBVC4gHMD8sxdtSZCcXBYlTfOkVl8Ig8W6t/6cFh8C5wVMUvg8gBAGxi32tAK6f/zxtx2n
-TmYcdFFSdl1P//Ivf6FpHMV4YfS0xXnOL7ksOR8dckv0RE3T0NPTk3qtgc47TrM6+jw65B4PBwqj
-mG63K91udzqdjtLvH2ieR5UR294Lm82GlURRSF+/fqPz+axWTdZIcxiYx82kHDa1RGpREHCgxf1+
-p6ens45GYZFuLZ2AYwxi3f329kHPz0+U5zldrzc6Hg8eeGT9BjjWuZcwU+avY9QGujFixvDnrTJu
-nieqq0qz7h/xhcvlQs/Pz0JeWqjrWsoytiNDkCfaorvwGLZto+fnZ4qiiv7jP/6NzuczlQWPN+/3
-m3dgO8do/vlod+AK/e37Kz09PX3itKNHh/szSmt85kK087fbnc7nM+37TufTkdZ1Ewnupq2k1Wlw
-5t+B/vrXf6fT6UQBEb28MO/e9uuPiUOggWNtwevvcrnwzzGWeUnC8vbZMg8fxFTwH2zbjsoyV84H
-ql9MGUD3LYqCDgcevf71r/8vVVVJp9OZrtcbvbzw+4P2xFYpbduoYvLj40OEQrnuqff3D/o//+v/
-oepYVDRpmnJbWhQ5xVFsnGzdogCFchgGen//UHYcCCBZmggxo1PjSgsO8WkYarbZvhONs4uGQh8z
-L/7Du95uOtrCIs8yNhvJs1T7b9zO6IWxmKDkA0vOllzwh3PjLtePFbKhh36g0/lEeZZR2zQs+zU9
-L9BeZK0jgy2XEvx8PrHaK03F8stlzC/LzJFMJrmX3YtiiuKEZnH8wecbx8m41TJOsxnSB9oNou0T
-X9+OjhzCLoESEoQJsorlwIPGncSjYhBd3+vh+jiVAOFkUADLn9/bRYv/RqYeI/a9xmEVRak26ojn
-htYCASjWBt4CxhCtBUFIX758kcM9UH28NfS0ZCRIkYEtOD0+9+Bu08aa2hRFITXtSGWRU57l1EjL
-gmeYpgkVRU7bumkSVBg6NijnUUZ6kRQyDr3fb+LzV0jLuamfpj2YbCAosKi6rihNM3p7e9Pnge+W
-55l6X0LDEUUhxRwbPXyyPbJpqvO8SBwUu8pCibbtO41D79kcY0MhIGTfN817v16vciq2Gr6ASuNR
-bAMgbhxHprXK7XdvWrMBgcKG3gjOBoPgZwJlR6w0QDLm7rMTLysde0ozTktOs4wm+W6QmQLVj6JQ
-Z9D22SHngIHTzJOYgr8Nj3ubhMQ92vZJRcYONJyInOeZx09w72qh2+2VAdMs101s2W2WiIMAyWEc
-xSU59lxi8OwHY2NmPRAtecd+D3gJ4KYbH9Shj8KzcXJJQwDZ7LqDmAgtShiG9Pb2ptqSSfr5oshp
-F508/8xRE6+n6UbbFnt8fgvAPY5nUb0MGo0207alypC9XK5a6gNcddZxkQayZFnO1d0wUBRHNE5E
-Ybjqd4BzLyrSYRxpE83F8Xiksigoywv6449venldLh8COLp0KYD3KsxLYvr555+ZqVsUFAgIOE+T
-5FaEVBY5tzZRzGpAO3d/fCAAxuyCA8NsmmZaHh4sIqxb435igbOicF8a82O7+R2hg1QJCOApinix
-PfL6LUKLUd3tdpODIlbAMo4T+n555flzWdI///lVQcDz05kWyeura/Ym3LbdmKVmHiXWmjRgJDOo
-IIkty7ftTtfrVQ+7oijper0KXTilvr95kmsGeVaPmxBFPK758vJCYRTS5XLVgA3ekKCz5hqEwoxI
-8PEXwVZaNVWxmXib2ZQYB3M71+t78bEdFxwShYEnFsPvv1yu1DYtVaIpsBsNPwMx59ZaHsExcRTT
-7X6jy3URQ43FM2hBiq5zXprFVyBjc8yPD5mLMw/l559/ojiOhUcQ6SHeto3yQexYNIkj2uTz4LBB
-hB2qDtjA2XxJZC1gcjQMA/V9T09PZ+8ZpGnKY7n6wK4/faffEVXGMI7UCfgKWrV6WAjBSG3ml5W2
-bfY0GjDo2fadZjNexOUexyxTj29ioIE5uS0heZHsugCmadcXFlDgzUF//PihC71tG0aBq5IWYT+h
-auCHV9I8j5Smmc5FIZ9EP4MNjnBQlInbtlHfd56Xu1WKJXFMd4kXY4vqiIjcDBsjkHmeaZy4uvjy
-5QulSaq5bGEY0sfloj6GznHGjXdUqy4JwRYstXpr5laUFMc8U8YGLWRGbduTefGDPcCpOJ/Ya3Db
-dhWgpEmqL3XfiV5ff1BdlzqHfwx2KYrSMArdGOt+7xWo7dqODseDgF7ynaWFsso5R7vdTAUzeIYf
-h+OBnp/OdLnevb9jPQDAaGPJ9WQ4EKswL1MtY3HA1HXF9O60oHH8pocHVzF8w23bSufTUcEuXE6M
-/Keqf+ASPPFyAOAkHMcOsASbsB8GHXdySzp4HBI8bxzOWcZkp6qqaRg65ZCg/YmihNr2qsw9x+u3
-sWC7trS4eJMko8vlu5cibR2rMcK93b7xaHddvHezritt4k8ZQwmWZ6kktzrnUYQbWmtrJNNaRxrX
-x7IKbdtWqquKivJIbdOpwi5JEvrjj6/Kzw+C1ltcLLhJlavNwNlC80MIhHP6ib2ydBf+Nh5MEsfU
-zA2VknGAW4ZpooW+rDw/0b7PFMU8QnTKw53SJFEGYZqmNEspDXkwV0Shjk6x2dBy5HmmVtR3ibTm
-1KHC87B/XEg2F6BpW+rkhTn14qyHD8u02bI7jEIPII2imD4+PqiuueqJo1h56VikGJOdn87c0xYl
-HY+zKA8nnj3L7YvPaA1SWWCVKlsOlV6cFER01/bndrvrGAqbGov/sVXAtCUKI2Xc4XexOUmjbrc7
-cdoN7M/r+kBFeXSyceFCoNcOArA4RVabpEr1jeOIdtr1MOr6gacI66AVkq854GeH9wOfCvhY8ufe
-6H5vjBFpwBJrmbDMM6+vv/3tP+h8PtHpdDLeAhH7PAgjF+NrjE5tWrFNh8LIdZkX/X4WZ1PujuNN
-F5rdjpMaaDoQdDU9lLmxTWc5Hk8irinEjiqhdR2p7Vqd65dFLgakH1RVtRed7ND7WHrvRRhdo04W
-7LgGbYINoYTwBe7BLN4ZKcszPcHRO217R2XBh8A8NXIDLR7bMU1i6kXAhN/P4E2oJeD5fNToaxxC
-EBwVeU5d19HH5aK3jXW4scEh6DGXZSVUZSj/VgGSQIgZNBAz1ISl0/lE5xN71wdBZzznF6nMMnW/
-xUaxSbVJzDcjTxc6BYDHoaM8izyPP4xdy7L0xlGsbst13HS/36lpWpkC8YIE2OryGmcdK+OdQZAU
-xxGNJkqMmXS78ueLgidP6InRe/N7ejehNqHn0TAMo0e4+bhcVB8BUZXDbpiC7Pz/mYoLfkYcx7TK
-n8WGhFw7TTOa55aGYaC2aelwPFCSxNKiTR6IGYYhvbw80fF4ouPxQB8fF70AWeuyfMqBDEWF+Aiw
-Wl0EuB/zPCnhD4D/tm0sB56XVeOzrYXUvDh/fZhbIu5o38lbEIgXg/mlzYDjh5FSIAkqT0/PdDw+
-0Tz1CgTt+y4WX6v8jkB6+ljLa+s6y+Vro23FrkGPpFwAa+v0iG9wRmGj828LYKkl2cZJM8fTSQ1S
-lI8tgOC6rhQLoGWzCpHvB7IIxqVR6DICMVK83e50PB4oSWqVOvNCy7SFKPJckXhlm0XOxjrGRGK9
-6vtANNb5fGYcJcko7Hu63+/eoYZEHWu5lefM3Bynkaa58IxIeWSaqUEqLM/++fvvdDqf9Ta21RoO
-rbLIKRG2JsDU9/cPxW8slsROyy2tG2TIuZdXqMlG2+7x8fOMWXnrtguj80R1lepNahOuUXh0XWsc
-rlLdIK+vb/Tzzy+UJAcVS0VhpBZpvinqJozAxatW0ySlsuKWGF4YaCXg3RjHkW7+JDlQHDee8xbz
-SBINVmEAPdQcT8vGtYcBxp/c+uxaRbA+YmIMAHNObASAQ0kceUGOaZJSHw5KNbTRUChHrTedRVuR
-L4DRW9/dKM0KmudWudbQds9yM12vV8eii2Lqupvq662oxpbsMJnI84ySBxoqbug0Tb1NYA8R++dx
-6loKKDZgmjFn/eNyUYMJ8NY5bTeVm4epzLHwyjEuto48dV3qpoGdV1nkukE53ZbHjKoajGBiMnoO
-StfrldZ1U7oryExdP9DatJ5BJWsqbJjLqhOBgHw/OuugpJJf0LPlcDg/PdHpeFCm4ONtFIYhzctK
-0/2us3s++DNxiSpp31jdZpF/UHHtAWUTeYOAqJTw1ziOaFlXRebzvJBoNHdIW+MQKAKR28eKQBf1
-VhQZnU5nwbMW6oeBBlHvYSTq2Y7LwYZSe9tWakSxaY1RkyThRJ9I2iqZnDRNS0HQ6UWAvwMeAV8o
-u4d9Oa3E7rXEeGZ4jrzPEs8aLj4ej1SVzD4CIIX+LpHeAYfAKDPIKAwozjOaJidw+PXX3+n5+Uwv
-Ly8qUcUH1MguKdG3MFQbcABzQMnHoVf7IhVghIEEdHJJBk9BHWtlqb7wr1+/0eFQKzX1cdyD74je
-N8v4MHDCCWaSWVooNhhwh3meqW0bA9iwdHYYRn1JccyHVtM0VIkbL8pb9Go4gPI8p6qqiCikJBl0
-AQ3mluHFOmnpZ6O5bVmIMSBKcSTwEDlyEErXPC9pXRsRwCyetwA2AH6HndSoW42M7bDY4G0fBBEN
-w7sGftj0Ziy+6+VKlQiswLbbt4X++PqNHW+NYSpuSCT48PoYVBeBagr05rbtdA0hUi2RQBh3qK9a
-zSUJz+yLolSNCw61w+Hg3JSHxhzwifd9HoNWHL8k8BKH4XgEjwYrQkOli4sA2JmlXMP/IkkSGnQM
-uxhNyfogjuLL+fX1h2phbEx6DDcXlN9M6kiVNGNBAywE+L4BuY7jiM6nIz0/c2kPzKAscs+aKQwj
-ipOYprmlv//9V6qrio6ng2xm3kzzsupMvxQueWjklUmSSO9JanYwTpv2gXCySdNEXYh8S7OQbjcm
-YRRFLj4BbtTJ1NGC7ve7N7rC34WFVlWVKkyal5XCcfwUCNp1HU3jLL1XrgYh07TrDYcTHONB25uy
-jmD95A4LZ1eblWil0GnK5pOL6BAu15vOna1as+87xSzQtuCgQmlpfQRtS9U0dy+zD8+5aRp1rgUK
-DgNUa2SSZqk6Mn1/fVUAFcaxaJXYIHWjvp89z4Msy2kcB280iU3DrarLIJiXhQZ5PxZ0Bv6EZz5P
-k1rdp6lTD0ItiQvg9fWV6rqiJMmNtVnySfbN686xJVFl2cpOcw4WRzfHpZtLOE+R54IjcTW0GPUi
-BHxcPTREtKsnACq7OGbuyZP4Co5DT4us0xg3O3zUVHUlriZJ4ju5Wulk0zRCbsno/HSmuj6oh1+W
-JpTlBRF9qCNK1/cUDOxDV5YljdNIcfxMXdfRumZaksFdh3UAPd2bRi2WMIpj0kOqnvhN2yqXnzX8
-pYwKmeWIWC6X/BvSPC/ag3FPXyoHHTNiaxoJUVQQBDSNIxOhZGGhpGWzilH7ycOxFjVWLVRdF1SJ
-hCE7R7cR64+cdZsKxMBg9GlMhr66bVu63a40TSOVZa6It3XogUMRRnjwebSVBMaJ1rwUHHlbEVjf
-PMzq8yylRXrxJI5p3x1xiqPkMsryQsdiO0kWgAhVfry90TRN9PHxIUS0XL0cMc6FpBseCfBiVFGW
-CUeBwhN4jy/IIbo3jZi1xMZKfqCyLHSsu22biqLmZZXnW2r75RKlXAXjqNPkYRcWi7AsRPzvuK2R
-G2jJb05n4zwtEOGHjAJoa8Iw0EsTkw0FW/HBnN2xYzhBkgm2luWY49RLEnYk5ZK70eivTZR9TdOq
-AgzlTJqm9NNPTCs+HL7Q8djwBg0Dz/1l0T6O1UuwpgrDSAMlEQGNh4YSt2laNpvoeq+KgXCGbc1K
-vXnGaVbXFEQ/8YEzeQ49TMZIKY6YReiiythqvOtaHddFYSA360bT2Ht6ACC0sIECD+NR1w6zj8Vw
-BELPiSn6VAZmqZM7c3lb6nO8XK46YrN5eNxycR/ciyNTmqbq3gTcx2EiqxfmAg/FZZnp9fUH5XlO
-379/pzhOaF4+h7hAwbZvjToqo+K4G4INiFnMSGR9RpIkmr+w76T2bbCuS1NHF0+S2Ku2sEFh5mL5
-I70AbUybhvAplcQfPhDwXMIwoqoqHKlrcI6+IBlxhPriJUM/KgLt2sI7dSYljKVxliDvi8C4HuH9
-QxPBNnclxUlGsRCtAKKDIDdNF70I13VlSzBrKAjJJcQmcI7N80wYYqP235jZJ0lCX799174CD2wY
-7jQMvVoyQz9twyX7/kOz5rO0oCiaPzm2JJKOCmsquxl6IQghJISlyZmQPtjaClZPrqzetLREKo87
-dRNvo2UyHrKl3TTN1Eyt01RLfkF7u3GSb1FQUeRs13Rv9PklMSlmgp8HEw2EQljOOnzpoQVAmbmu
-q6bybNtGt9tVuAcp9X0nJp+uf87SVDMQnBOvT4/FXBnWaVpJdK3yKGz+H8IxLQcfbeH5fPLCZp6f
-n9XCCwYyWMDItAfmwdmUkTEPDelQ17QTj9XWdWMNg5T8qDhiLxnHaejhXCVwkq4nO0IGfwQmIEkc
-Udv19P7+zuK3B+UdEdHtftPDBlZb8MeoyoI2MWHp+14NRrDpHyu6x39vJzM43BF7DkKXvSjwfeM4
-Vum8f1E4Q5JNKNaoImIIC97f3ukgqrVF0FYcDkDveVOP+pDGadMse3DB67qmKAwUrT8cDlq+8d9N
-9DScF6J1nXRWafPP0A6gh7NqKzffjZSiG4UBrWb8Mc+LlPiT58Xm8tdinXZAa76uHPEFVxpYSyWy
-enBQIvONKFKRD8p+pY1uG/XDQOfzmTMH8hO17bsCVuDbY56+zIuna3c+jJvnn7Cuq5qrghtQ1weP
-qg2hET5vI4QTmzEPpx9kOtiWo+97nSLYVGxLIWYLNufahCTdIAjpdDpRnpcym2+oLJ9pGP7wSlmb
-sPRoFxbKuBhMOFQq8C9s2laVi5Y9xzLlK5VlpQcI3j2byKTqUYkLBa0gJiD7vtP1dtd3CSrz99dX
-rWIwckZBAzCb13foCdng7WCtxXChqIGOfAZ4DYIubPMKwLko8lxDb1j9l6mzUSLCIlxq1i4cno4M
-fjrBWfA//+f/s0N7fDqdtaRwHzLxONr35q7jPqa8ZoqEHuoDZXlJb2+vWqpD2x5HkbzISAkTzu4o
-0NMJixwPmeWXiSLa7IAaeJpojAn7oVeNNrLTUe46SnCgZT40+k7EtGqPyLr92XM9ciqyUOXHiTix
-4KQF43CWMnnfdyqLkuIkptvtRsMwip99objL8VAroIp3gXEsq8FWSpKYirygfuBgU4y39m1lAVOa
-6jOG0eY0zd7nw7vkDL1GFrhL0B3k+fGtnipCD6OJvu+1+rIWZtDptyI3xWhu34nBUjG8gDMyyCto
-X5xuI1JPB8dY3L2UHoCfWBOYzUOVCZ57XZU0i/oRnwXZCGzGOnlyZtva4sDNBAMjCunbt2+MBYh/
-IrQlaZro4d91HZUlqxnZrPOuVQ94/LYlcIYnC7Vtp/sJa8ONZ5HiHInZyEqTcDy2baPz6aQ8DgC5
-8ITAhV1X/I6m2VUVcRxT8Ntv/74jHYets0L6+PjQ3rC53+nl5UXTYRySftNy34JVkP6iJ/727Ru9
-vLx8isTWubA6EHHPBbACt823b9/py5cXT4hjI8vQH1tVHhBUIqLX11f66aefPN5C17UaKIGSG/23
-zl1FKdg0DbMTjTWYLdUsCw6gntWZv76+KnsS2gKIZrC5eBy3UtPcpaS/aU7h6+sPOp/P+mwhRLJj
-MXtzPvItmvudyqrSdgr9ohW+MJjluPjMemPA9f3tnZ6ezmqwacFGLHr0vU5xGKqt+cfHhb58eaZh
-GCnPMwoltgoa/CRJnONTlmpcGn7e5XLR7w8dhR1z7kJks34CeZZSLqYgX79+o5NMmvB+LdBqzWJx
-mTVNwwaaRU7/+Mfvyp47HA5ijXZVQRAmYsiPgDcDaMBd21JRlp78/M+8EfB+IM8Hn+B2Y3mwrR7s
-gaVmLX2nWRR930sAT0Ft29H5zN8FY3FU/dfrlWI2ImBziHVZqB86RZb3fafL9UqJIP0ujSeh8/ns
-5qsmqhuo+ob8NBO8aDnqlt5rxyjWk856srmgicBzVekECIJHgUZzp5xR5zL5Vh2VQfsAk8xHOS9b
-eTFrjTMREw3OnGaWBgNYsfLYcdw/ZcjxSy3U/ALe7lEU6Tx/HC/6GYDmpmlC+4PhpWWfocUB6Kl2
-VIYsNAwLNW1HhZCM+CbcDLYSCe26dWQv4cYjzXleFqVl2zRh3KhbntM4jlTXtWIMuHXatpEIuU05
-/2jlkiTRZCPLKmy77k/dkAEawrcRt5/dFPjPME5qOIMx2CMGZHEWFVhJpQMrOGxu7qnZoWkSMxjE
-2KElZD7EJpuw1/U7LysVOkrld/JnbSzG5hwtvtE+DJRK1biuC0e1Gb4LJhJoGdhladFWPI5jyU5w
-JL45ddOF243HzjFnrLFPu5XvwqWG+2GXzw76K8qNfSdlWLkQRVJOteXvo7xn1iB581Cc/iix7KHx
-aKYI92G475xORzVQsAQWe1MBgYYTCrAL5xIbKa9eXV+xSQzYOc3OcYgNK0BySbWlwVwcn5Utn1PN
-UUB5DtcYTky+a5XB8dwt4d20bavjJpsN/2gVjsUExVgr6DFuxlmsoLGJQcays/44ioUUFunzwkaD
-ExK+XxTG5jm5Vsqaa0LPgCgrYAZgpimBRWLXbQ4CDsVHIZhda0ppNTN9RIxbXwW7luBGhH7e2biR
-FxiayXrAcwgEh8DPseM8HCSxtLJoVbitXBU8tu7LFmyGccc8t17aELdRNR3qihoxi/GDQF0ep90r
-PO0qqe9Hj6wFVeE9CCnPE4q3ddNbySKw+GJFXqibCUwOcZKOQoKxL+hx1uoLGIi+fftOWZZQXR+U
-2TSOA3XdpjmDeEn4HChPsWjcKC2k47Gm56cnvsnGkaJo+VMvfXuAIJXlQ7z4MLu3VstxnFDTdhIT
-HuhtZeezbC6SqHaCN6KLLgOnAOagvhw2pKEflAyDFuVy+dADBsYWSFdmh5vF8wuw1GvQsSGiAjsP
-FYEVToUPnoaO579oOOfhcKCm6bxDFFRhpPdoXNu6iFR6U3ltnuc0jpN+FyDh1gXKXgwqioojFcDY
-1o7jsGO9ZIZhlFCORVWIoM0CfLNVhw0OQfkOh2lElDkKLzsVgaTmFICh8gyYrn7RUWvfdxRFBy+J
-ehwnquvNc1PC2gB5Ca0wJMpY98gfPNQ1xUlBYTjogeVcl1J9n5PR3swze2K0LbczsAfHJYYWOZ7m
-Sfqeu4RlZp5rTpxEgvJP3ukFD0H4qLnFHenJj5eKFzBNIxVFTnXNJ9o88wHy22+/U55n9PPPP6tZ
-hKNjhh5aisWItJOqqinNCtp3dl+xfSjz3AMPVbfThLo+6NhwWRY6HGrtk/AQUTJbrwRk753PJy3f
-bO8KgopdCPb3opw9ng6sJJRxJQNPTzqXZrv0iPKajUGPx4P4KIaf+Pk6z5bNiR7f3hbAZ3Bj/tno
-CVRX+NldLhf6y19+8aiuYRDQMM+0bZGW5DbV2ZJw1nXR8Sa/h9hzn0bVBo9Gm7dnnZTtAYTEHfSx
-4JhgI6MyYFXe5lUSqFjcDbzohYBoeBsQ49ylGZgE/dkeXkXBPgyaCRAG3mfFfmCQclJbL0u15kMh
-1LVLRHS9XPnvLAuNtw/FWyyWoOtp9h2IofVI5PlZpiK3k3yRxtZsgJHkWOmnURTROOwUJK6PVvQ1
-gcVWZII0Ji1RMWu1o5h9J938cZLR5Xqjfd/o5eWJwjCil5cXJRIFAbPzlnnx6JsIYEwSN+rouruO
-UfCy7bjS2n3f73d2lBEz0DDM2KFXyvXD4UTrMtJibiS0D5BwVhWPh07HI0tmp9njUmAkxDeS34pY
-LITn2itNo/HRT2JhUPKsue1aeilenJd7GGklYstHtUNLU8VEQPLClMRm9D0q2XC7sgox1568aVpl
-CoJcsytiH+jkw/LgsXn48AmVnoy/g4sBjEIcRHme5FpWKAAAIABJREFUi2tPbA6SwBvfxjHbXe87
-qU0diE5oQ7q+p7/+9d/p+flZrdwRQIs26/ff/6C6LlWWjv758fPjc0CLsZuqh3UsNdUVr2c3f2fq
-Oq8pUgcnduSNlcsAFaOjCkdeNmdZMTjMLseNCSQlWtdAAFzycg1A4cZn3kzlhINuFjpyHMcUwwkH
-2eWryAcd0DFTRpmHQmqCyrJ6pBYr+Hh7f/NUe5ZcMs+zJtWu60rH44ktjKKKsnTUsM5hnLS0nGeH
-9Pf9QH3v2E+h8d3Dza1l7ea7+QDXsO44KHud/ffqiTzY8XbWzVYUpXi2HWmZG413srfVtq1ezDPM
-TUE0cvHPDOaxXj+mQG61R1cfVo9FFCcFRSIi4dZiUpBr2zb1DETFxEywWIg2o/bosEKD8zCAI1QY
-19tdA2GQa4fodzjUAky0vIZ13YxpCVt64eAEDhKQ890Hgs+HV0J7XcscO1YMyU5+5plHujAd6XtS
-ang/DFSI3uGXX36m5+dnbSOwWUEXrqqS+RNC+rHEKKDkTIN3KUU4ANXKLI5oXVlluG7OZanre10v
-1kMCGxXveVtmT5X6qEgty5LaptHoPs2/EDs+EKDs38GaQcs3z7NWDexjuXpVUNwJ8BIEgRIM1Bbr
-44PatqVM7KuwgTGjtOIQoKJsybRJL5NSEs8eR31dN+qlp8cHA3V1vH9X1pW3cZbVA740/ktJQ7vn
-VOMird3IZ1kWWuWWwYwbefHWDBPtECcPR577kbVPX9aFxtsPL90XLwK3AJewzoqab5HxE4inBpvb
-Tn1717bhdrvSOM7yLt4FrOq0HE7T1MNKbFqPE6YEqjeA3h74CeKp45h9FwGyjWP7YP21iDakoG1d
-NAjD4hCwP1NvCKmKPL77ttMyjS7uTA1JVrrdOgEwM6N+XD9Roy3ZKssLFWMBzOyHgW63m9iDH+l6
-HWnfezEInZkwlKbUioFHlpXqTu1s3wdlUSaqzttUlqyYlnx/aBWsn4GNtstz9nvM0oIPB+Ph52zy
-Mj3wMAmbponePz4oSRPFNaZpdH4VIn7Cbf7Yoj9WzZjEWKBaydlW/cVkm5gqmR8fDwfq+p6maaRl
-iT7Ngq09tFVaZWlC85R4p3gQBHS9XClOHMr88fEuIEpPbdvSTz990Vz00Bwc+G/0exbdxYNgnvdg
-TB3WTwEQiN+Gnx7MSPCQ8LNRYsdRrP09NmqWptRMrRcGikPJBkfixEdSkCVO4SWBfejahI2iCIm/
-KG0d9oH05GWZ6XplC/VCqNCP1lo8D849JqG15cqyVJNmb7c7NU0jZXVBVVnSKFMVBkHvn1yLAcxa
-Gnkgt52VYIN7YcVDzm47obpO1A8CakdOm+o/4Rtw0b1LzJmND09ip/XoupYulx/05csXGsdJk4NQ
-lvf94MlzHR0+UbLT7bZ7ORR936nrUCTtD+LhwOjDJYRDsihKniDMk1bVIDM1TSOOzzlN090bT377
-9p3WdVGvCHbXTj5NWyz3AgeItZez3hF2jcZxxFqAx/GKTgDEZCGKY4mljtSY4JEEg9Nu2zb69dff
-NBij63s6CV96GEa+cRIm/Dydz14PmKYpVVVFT0/PagzBJJX5UwCD7SUBcljHWjALLUCGG0UrAqN/
-YIAGrjK5ovqsflwUnEQ5frlePBqstXbyTUgWNT7F5ofRJObInKnHXnXfv78y4SSOGOBMJ8ryQj0T
-8qI004hEZKmxuuzY94ES3WovLF7BtN9Bqo07LcvMEeJSqi/LTMM4UCySU9trWnBRc+klRBQ5i4xQ
-Rx4LEbFluM1A8Nl3FtUEAem42QrVJpOabB1vnK8go+hLltO+b5SmufbMqCbRKoXG7o7Hzr0aveL9
-RRHP/Yehp7IsTFSdc2tGPFocu2zIeXaJwLD0CgLSCDkYctjRISjKTsLLysXz+UR9P1BVHajvGomp
-I60QIU+OY35/j4ehtXHDgWGxmnXdKIYDzSNXGXZJ0zTR169/KNca5iH4Qkyumbz59PPzE/3ll18o
-lkBJgEFcWbB/YJomYhrZU11VtG6rxiJHUUKbnjG798DwxZWp9v5OWZZ7Xv8IIEUFY28oy8SyCkfb
-xqA8xedumkb75G1zSbXWqgyKQCDJVhuulYD0lujpmAHGC3OeZ8qzVIVEccwg5+XSUxS9O9uzeaY0
-ibVvZZJRSUEQeSCcxVwY/InVHRY3xroGynpECZ9nGecrzjNdb3cxP2FfRyteAT3aJunaQBJsFLw7
-y0/AAVCWld6e93vjuRW7g3qmOD44LCR2IKh1FsbmBVkGhxuSd6yNGkCwUWzcsXZaoVFbzAEXlJ2U
-YWKAuT7GxBhtYpSXxDGNwyAu2IuyXdFaJhITxz4WR48gtO9Ex+NRXKASBWGhU2GjmUoMTifPSWoU
-fOB2u3nYla3Omf9yZ1PQPMuoaVtdOL49OB8EmBuuwpfHTQu9gG0Ljscj+8+FmXdrnE5n5o0nCQ19
-R8vc0zBOCoRgg18ub96MGskziPAKQ9yemzcLxwLlcoo3YZok3me1SL1F0T+PD6H849FllmXiNPRQ
-AstILIp8lR8onnZkZLX3LMDZ5GDcRP3FmXNxFFMYxTR3HW3bquMfJPqgTcBn/vh4/9SWIdATbcG2
-rWwiaUpztCLT7A4NCIeGYdCRKIeEJlQWBScwZ6mHhlsFI2ba+r1Dh+kMw0jfvn3XiYANDsElgsVp
-rdHx/eHpD9DVchf00AtDKvJEfCJIDyLrZGQj8Hzk35mLvL+/0/F4VMt0TMqSJKHr7a5tI1yFbEYE
-ngmb1Ux0v9+05Lbcl3VNhPe/0jT2oiuYFMjOMg7i+e23/4+enp6UKszipVlThZqm1YCULMtp3Vqf
-F2Hi02xYTJIkFHM4Zuj1Cz6QtFGeVxrgOJkSEmXlME5eJHMYRnS9fuj4xYJJoyTdfn/9oaMtkCTw
-8lEeO7CMVL+Nw0aDJrNcEWH0PjgEioITUayLsL2VLCcct+diUGm9VTR7PaV1WajtOjWiAECJGxGo
-7N///isdjwePFYhbhohoMGUaMgZRIs7LQhachRIMGxaHLnrmdY08Q1PnhBtr1QG5LfIZLA4B1pp9
-/2VZSvZ8QOfzmcZx0OonkrK+ae56i6dJSpMw/Wx68ibP+TEdOE1irz/FRsV7xgFmDVHCIFCji8dW
-B3x+dwCyyQyqVExCuq6jSezYcRtDvNV1LftJiiCnLHKaxGRjE5ffWDAGeBmCA8OCn0RbM3uQOfwp
-VLMRNsFZ9WdleSHxaqNiNHEc0UfPictZltHpeNC2No65fbFjWGBbOOSzLCPayeQixN60LklSiqdp
-pmEbvVNSraIxKhDyBiKSWSk3qlGIdbMBDmCJQXZzYCECUc3ShJqGD4e6rqSc2fSkAmmBVU6hlvmY
-oeJnvr7+8Bbe29sbFQWbRMSGsw+9OCidjwvJKapCIXaQ/rvb7WYUYwuPqzb6k6iuic7nIz09PQvw
-FOtsnoMiSp31gsEHlt84+r0uqh4G0NzBjPEnxjrgmrvv5XvAb2rbXSjvvRVqKdo3x6EY1JqLK6ld
-Y7/TNFPCVZrys2Yl5qDrxo4h1W5rnr2KLi9KWrddfSLtpAV+AzhYITaydvH2UsEzUUNbY3y6rZtO
-FTCCnufFE0yNk09RhlrTOgS7Km4VxyO+bbFhq6oSxmZKrbhUWSNaVG2sZ3AZjSBn3e93qsrCrLtd
-cJGEfv75Jzodj5TlFV2vXO0dDgf2RFjmT9FrPPdHtTTRNE9aBaNiUkMZ9CAooXFb4L+xoewXWZZF
-F6S15oaABYsSH4bzzZlws9NOAXE5hISVouDeCP8eOmYAFXya5SpCsQIenyTkePFlyV74aAXA9gPt
-F85EdtE6xlmiJR3m3KPhgMN/3uoNsOj4c0tOQl3T9cqZiFVVq5hqXTfK5f8Pw5zGaWKHWJlwWAo1
-MyETPUQtE3CaHVUWh7Fl0E3TqIvJJS3FXo48U5HZsy8MArreOq/Cu9/vpjKIKE1iPXyBgTyO6hzn
-fjRp0aT6knXd6PX1lcZxlNSk2BPocF5hyZwUuWF7sURno9FOJwhoRwFegg+Adq7rOwqj0POZKIqC
-zucTLfOixh54Zqk4OE8zV2FQBq7rplgCeP3QczCL9KA9uJ3DW8svtHs8mRLAUVqSdduVIIRnye3Z
-TMfTSTCbWeXFibTRgRk/932noLQLy3VAb2SegwL4//2//187fP2c0QSPnUBJdL02RkyBnpTct/m2
-VOBMMyrKJ1RVMtAHAYizRYo01z7PUmq7TvXvDhCKPI09TvnHTHS2ZCpU157IKfj99btIKiMr4tWN
-ge+JF2V16Sg9p3nWEFIOLK0oSzMaJe3n0afAIuMIutyEoQiR0ThxDnyaZjQMvZSDpIflsi5a5dgo
-MEd3XT3qq0V4NY8hST6l+kAYxOSeWpJsOj0kNG4riWgaJ5nXb57uQNVu86KVoUPnQy/Hvm1but9b
-Oh4P9PL8zADdwCPfw+GgNz3Sk/Ocw2DB5kR7h3YM2AQfzuzpwK7CLu8wFCXj9XqRiUDmuQcdDgea
-xonarpUq0gppXKsFfUCeZ67yCiU9WTQPyG9klD6kIpdDPY7ofm+klXLPBM8ROMhjgjIo8PYfNqNN
-RQk56t+/Xm+6Z6EOdUrPlC6Xm4494WPhuU798cff9r7vFeVFSY3b7e3tnb58eVFgCDenl62epRRJ
-ft8jAeE///M/6V//9V+pLPJPjCvQGlG22oBGxHu/v7/T8/Oz56cH1p6jRgYPoSa8eaZppre3d47r
-Lpm+u5gYc5hzYAwDtRr+f+aa3+hwqLUi+vjgmPTnpzNFMd+QMGq0ACPUdD9+vNPpdPQio7IspYAC
-ZYyxWxK7Ij2dOUgyzTh56OPjg56enlxak7EU8/3nN514uJYhoKZp6Hg86uJlK7FUf15dV7Stm/bW
-SCjC3PlyudLpdPSixi2aDHaaJQXhImFA90JlyWarX16eKQhj2tZFhDYuJ7LvB5mfR0rtBRD5yy8/
-iWx6YM69HNp5zrZruBTazlUJaNW+f3+lX375mer6QG3beMQ1cPJt2q6Vd3Pm5Rudzyet8FDN8HdM
-lftQlDWNQ0/DOHqt2MfHB728vKgxrdKtRWWJ0a19n5Y+3zQNPT8/e5JvFaxFMV1vNw0ZGcdJsBW3
-zv/5zz/oy5cvlGepRz1WjgsUY2VR0JZlNIoQByMOBF7aiCVrEQ1+vUVw7S21LFzWbjLuscm+ViyE
-UYxFXG1U2cOH/rQgLcEE5TJO8zznEjegXcCXTUt7/r/Jo1FaBiAcXFR3LcYe67rRvbk82DuzTRhK
-xGWZ9cQfhlHos5s3ZcmyjArJrONo8oKGodNbLnhgRgLNtac4Ji0XsY6G4+4kijocnKDM2jTltu1E
-LxFotYHsenYXbqgs809ho/jzwQMN24FuiZqXgAYcxQlNknoLrsEwdMr+LApWnuZFqZoAtCt8MaQa
-WDMvKzVN60V1A8G30xz2N4hFPTiYFKlF7bPASHyU6QK5B/IOqy1E31n/zHm56ibd90h8M1JvkoFn
-EQQkzk6TN5GCLB0THwCFePeIq5vmRdykRgVUeTTYfnKYRvWOww1eGtpC4yaG0Qd6NvxCBEuM66p9
-Beya3Dgp+kSFBXHmeDzQ0/lMWV5R216NGm76pBVAKAM+MIwvYCphR4WIV+Y/M5qgjJne3j7oeKyl
-vdiMNoA599b9B301Tk2EVIyjawUs6YRvjNQD43AAJQkrsEJjp6YKMSlzcVBaIAsmGBgHPXoiwFIL
-VFmrR7dRYgD4MFPGxse7uTetSZpx0uu26z/lEazrSKfTyfPpx5z7UacPIdjHx1VSjio1oYxjxobg
-Es0VT8ZxdPOgFSF8AOdlpbVtVbizCBEMG2pdN4rTlLZtVg6CpcOCFGQPqnXj5wf+BTZZkecUJymt
-W+cRzOwIEoc38JpJuAMYsa7GoQdTDEs62o11fFEUsglJKyfbtqmfQ8ouSQC1szRx41LjlqT4jxig
-2CmIdcy2l5od2a/rygcAUysnyRBzUl7cxriJQZ3th+HTLwIRAQcAa/x7Hb9sm/MwA7j2mMWHFwi2
-mA02iGPyRDT8Yjo2sJhmb+pwONRiDBkrCQibNQoDb7GHYahGJEuPvL7J9NGbHlJxHGlvqdFK4vLi
-WIBEs1G74VDl3mtjuXWc0eXCsWds8uFm6NO8PBBCdu1BYUkOJPoxXtyVs5xGa//hwwCgLnm8cwv6
-hmFI5/MT7ftOpxOHvODAwy2CcSYf8EdF3w+HWiTLfIDNhjk3G/JOGAS0mwMYhyNuYi7jcwHEVp0C
-QWsAuywl3Ch127V1wAiALfB3nlW6y3ySkC6XD/1ctj2wuArezyLVICoHiOYspoWRo5vQOOdohNde
-LleliuNZotJOJU8DRjHLPFOaZcKOjPTn2kwOy8lomrva3cEty7YW1jBU1LyhxxEOw5A3SRjLzDHy
-yr3HwM3g4QQEis9OOIVQFHmEhlPcZ/aFylpipmFBaZZpeIFNsmEUM/xki2U/D6LGDoeaoiijj4+L
-Y/7JYWbHkhjtsPXS6rEhUfaD2+2Hi646irMpLOj9oKt3N07lsheiWNKYMqqrSu2f8Vwu15seki63
-nunDURjRsIw6J4fEMwwj+vH2RvOcUGKIMhYw1YgtMcpoJSkY38WCoOzKu1FAgWfTBc/7ICCJzapo
-l9aKe9GSoiihvev1GfB7mhRQtvwD67VowUu47bZtq1RcKDoxkXFe/7wxAo/KGykJCQy6snTeejb3
-Am1PkrAU2h6GtvVkMtokB4+jZCMwFZgAi+JSkQ874HWaZnUjqqvSi86zUl2oSNXXsWl19AyuDW5z
-jBHxObBfsVcgHtI2WcaLSoO3gQT4g4u5OdqupSgO9SS3fHyrSbckA/Th/MUyeWB+RBI2rhNMFLoQ
-GgmGsGNHqLRQWuFFwL/QHkz4GVE06Je1L9UCWYgKQ3TZYwaAPT0hRrFzV5TPMKnAYdm2rUhsEynj
-WE03jT1FUUhlWWl6Erceq2klEuVIgNCDg+p+f9cACqU+j5Mi5G7CMH8ShsBqDJsHXnjWxRcUVVSE
-wzhQWZXqNsT8jUQPa/T1ThTVmXe7PojFEkoSH+yFohFrCOaarHzklge5CfM8K9KPgwuiIttKqGuV
-VEp5nrG9GvEtjgsHMXMw1kTOJMbMlsDkvAEirZijKBKswll/b9tGl8tFCU+P9mGq3JSfdbvfnPN2
-GNK2zd6lNw4DRVXlqS/DMBLBVq4/Gwd4URSUJjGlGac7l2VJVVlyRPiy0v3eaKXCjkCmv7JlsS9V
-jR587gI1H8AXt4GINjIcI7osTU16rqOxWsUYEnfQiozj6Pno44R1lmGp0iutqSZ6X1+L75tIQr0F
-bAF6fFhW4zs1TUtVValT0jT1XpWAzwOhBlSMEO9E8mdZBrp4Jfe8rNT+ePV84C3HnUtiUvsxHKr2
-s1umHTTqaVbo7WRRbfvuEhH4QMQyjBPlWUo/3t6V9g38AswzO3VIhdx0uVxUyAV3H7QbkBxjc6K1
-hCsyxo3WQQitI1cTPB3Z9p2mcVRRlZUJjybzDxJauPgg1i7Lck07hrEHwOGqqllEtCxUFLmuZ6s8
-tAnJ4JQkhrWaJKm2rUxiEhJREnsgsc3J3LeNhmmm+70RR+5CVYfQL+z7rrZrLs5898h30DvYKorl
-0Y1iWF3ff6reoSqNcaL41lLuhrbyYJvdbjMDbNADNkae59R1XMp8/fZd6a5WFWdJNOiNgCADIR/H
-UUcYjxyCJIn5wNhGT+Ti+OXzJzkwHhw00fxzUhWqcH7fogYXoBVDaz4Mg2coYinDQOnBmNu2jSO6
-zGFoDyYbNmpvbStSwYv9/Z//pDzPvPSaaV29mTzK5tEzrlzVbINzFxJnbyXGqOC2z3Ou/TxorfDV
-t2zDfd/VxNOCWIxNrEoMs+QX50rsDGeRS3m9XulwOLAhzbrS8ZioXfrteuVJRZJ4GYz2AIbP4KZu
-R5FMijbzXCbFgXBQ26mGDQiBM1YYuBg33pSjtiIIq8HFkWaZmrHgEkBV6arYjYIg0haEx7C1BOoc
-tPS3lQJo8PbWBpV5HLmaQhIXPpO1Gm9bTqfG1AOfK80KxjBs78/o96Qnny2B7MjHGiNi7vjx8aGl
-qUMgEwGTjnqqslmkWGGZhYpeDKMOq6xKM8e5tlHMEAj5VMj1kzsRPgs+K/fmkffzLperByjB622a
-ZrVkQmIORmxOMeZAOYyM0oRjmvp+oPPpSOu2i2nm7lVaeZ6Jz3+iyD8+R5omYnTKJV9V1RrBNRt/
-Ai/vXaYSkM+inYAXv0PtrUou9CTDKNfv90Y8IJzO3CoYbavnnItS40rsoraZtHKVg9G9I4C07Dkw
-6eHGE5SRun6gU5oog46fG6+r9/d3LYXnhSnVAPp43EyeWeqj8y8R0TT2wgyFAUgsbYIzGdGqJ810
-CrQKvoPN3PWDYhr8/Ec9NJYlV5s7tG33pqWmaaiua3kfo4av4LJk8U+mzw/jWwugq6/gungzfrSN
-VVWpaAhhsNw2MZAa+x9680I+HHuIVKjCxgrOAut6u0uZlUkr4ayckiQh2olOpyda5pHiJKGua5lq
-aR4uNhFOct6ks5B+errfG7k5+dCAUAXjSJyIlsRke3mYJdh+/fEws2g6ytUoDKiNhbgiijSAN9wn
-r0Ztt3mGpRBtZFlGeVHSm/js2w2r3gMJP/eyyLXMZSCWNQ/cy1VU15WGV8KVxzrI4HZzB0KoPARr
-mAn3WTXxiDL1ll+WWRc0m7CGHtDLWMSmZb+d3uCSAIEIC9Zt9kli2Uvqulbp0Tic06yg2+3KNOXr
-zZiZ5qr/QJWFLD6MgsdxkF6+9sI6VPQiz8aCooinsy3IMI5eSKtVTkZRRIVJXbIXD7/rXKcsuByt
-sSnCOjdZX5wazQG1sIFn1eRgJMqj5jVkaUqt8l9CDRBBK/DYSmqisJDQoAkAEHy/37kFeEytfQTA
-YBm+rolurvv9rtbKmKuO4ygpN45x9fXbH7Sss4wrWG+P8k8VWaEjs6zbTm3X6Ak9ygvB/88hoMxZ
-uDeN3ngQF2ER2lmpi1mKvAhmKyayNmLjuAvowzfIP//4g3vSLKUgjGleBg+QtNVGFIXi7y5gTky0
-iQsuzEzx56E/j2M+yNDqoJS/Ny2N40hHyWxs205vM1sm8uGUeWUyqinITRUdDwOP+w7J7jQvagln
-gWGuPDi7EJRi+AZwLkSiP/ftetFN4HrV2ESPsxnr4XCQg8JZVa/bLtOFwFu8g3ymeSFFtruON9+X
-L1+oLCvaNibnIFsijlhzgiAVvGdUtnj/jwGpTkkZeTN1uxc+LhevB7cXzmPZju9v9SqonKEELMtK
-R3uROZSLIqdQhFb2vdoJmHWpst8HI0BwIuZ58QJOIevPsoxiBHdCGWb9xhDZVRS5arhdFnvsWW4V
-BfcZyzxJ+ugoZVOu5ReflAtLXmWmvO87zYajbZ1LeAEWKsfFOEpjpKSXLsvSlI2zUimxKR/993j0
-GBn/uumTl55tTRBXFoaR3lAYZ6KCcEDRpm6w/Fxb5ivEkVpJ4bay2AkOJFtB2V53fwD71EdwhZ14
-rrRqHGhwv8nzTM1TZiljo4i95Fk3H3pqQIiW2JWHbxcbSooDy7oJw3QTIS/cH7vAEGx0zPaxWI/H
-k1JrrZrSElbwnoBLwcMwL0qaxpHehZ4dxwnd7neK4/WTFBeVGlKVgebb5CieraeeshPrAWNq1dHH
-Mb29/WAHZbnQ7O9Be7SuLnMC4C2k7tu20f1+9yoS7C2wGPuhp/pQa8uG9wKOg12naA8gMXcZHpM3
-qge5Kk1TivkkafVUVNqo9GWJKWP4w0W66ZqmUSILegomS7iQEAgvypK1+Z2o5SzZx86hH+2q7dzf
-2jst66rABzz0t3n6NMbzBUCkAg93E4ceW85ODfCPeqynKQXCOkuTmP7+91/pcDzqSM6aVPBL3YSJ
-uKi7bBgEtG2peNbx7LyuSmraTqsqTGSsbdU4Tao5fxwtFUXhHT62FZrmWeyoE6qqWkddXT/Qalic
-lv9uWYyowDC35/4/Fhpxq9VfHHPvfr3dJQCWpz7jNFFRFnozIWBFb655olRIMY54E0moRUtdxwnL
-iaGf6yx/HGkUPn+SxHS5XhzBJY49p2e0AOMYeeEbWF/7vuvkpqpKvRCxD6Bcxe/Os5SyLFcAbhhH
-xVSwZvKcHbSsC+/j2M6u70UOC7hPwasATEsAjDjA5znwvBXtd2Uad0ePIL+djAVBQHEvybKWxw0O
-NBscyuklmwz6Z6TY8sI60L6vEv9kgQjEZ3X0/ft3DQnlQyZSlqDlB3Rdp9MFHEaLQTfVilrGKPjf
-HxOAMCXgqPL9k4+hs5lePGNFpxvHLRRrybXvnaP+hiEVZSlpsCcVmqB/5BN6JiInsNl3okHAORhL
-4BmgnUIbgnn9tq2qAkQ/i8PTkVISzxQDIh33LmO9OZkOu2kL46jBiReXfb1elYCDRV+WpVYxcKxx
-tmirI6pME1VVSfd740lQH8MsOMePbeC/f3+lqio02vt4PFJd19T3Pctxl9k7oGFCg0qo65xEGFgK
-+x5kXpDG7Xanl5dnvYnxmbmKzYWkFX7KWygKDs/d1k1FXPYQsZ/FS1paV0ozdgVG1Jfl6sNmTG3C
-pLqoZJTYSIUA7wWbiMzrdxI+R6IXbxxHdLlc9RmfjgdJT169DI+u6yk+Hg98KwmCjh5o312cV2xy
-3/Z9p7cfb5RmKYtOspSINnp7++EBRviANp4KqkE2jyDPpwxEGixKFw+1fqoKuFfzVVt2YTHifKG6
-5i+eLYsnnHFxy6Hnhgyw835vlHoKvTtOWuu+cj6f5UXlFEWd2TilZuqxLRnzC5AvADRdDRwDx26D
-SMYJqxy4pjyHDQeh40VwtcVmq6FYmdmDEQfNPC+6MR9dhHDrzPMiugJ2lGHb9kUTcrBYcWgDhGIf
-vk7BQVcGr9qSPbZXzgO/4JCNuqK27XQMHIY7C+wxAAAgAElEQVQJBUFG6zo+yMD9gE3cjucT29HN
-tyu1bUPD0FMcv9A4rnLLl4qKo7XBGsANfvnjD8rzXCda1nMBIrl1c7023rnlOeBz8hRpV6djJF1Z
-qjguq1lyJ6MoVMtxhLtq8Okw0LbFXmBJGG68h4kPmF0uQLUBM5mGsR4e4p78P/7H/72XZSF66F09
-/fmHG+5zltH9fpc+igkL59OJdtrpcrnqCQp9fxCE9PXrN6prdsCJopiqqqRtW1WjjC/AizFSRZ1b
-1L3aKDmtPT+Ir1+/URSGVB9qwRRmr42Atvx4POnDdm4piSDqkYA1sTFqCLT/KgtmUKHf5Wpj1c3D
-v6dXPTaeDasrc/r++oPKsqDD4Ui9xqs7TwVQP/nfBQqSoi0JglB9AxwYxZvuer3pDb2uK7Vtq2zK
-NEnp67evPDkQqjHeZxAEdL1eKM9L9jjcNq0wHklgEB85XYENXWXde9u1WnF1Mgev61oouy5ODlZk
-lsjj/ByY5lpXFWV5rvx8pE0z/yHwEHmeFLFlHacwpTKGzmiZufUYxb+wF1o5vAzTJKGirFQgxIdI
-rDyTprkznVwuEHx3pEKnYsUFP4ZlWagq2fob/HtcnhbH4VaQgUG8C76MuGphOT1X17YaxDsfx5Fu
-txsdj0eqyor6offEeNh3WMfDMFJdV+pnEQkF3Zm7JhT89tu/70mSUF1V1EhPB9FM2/V0v9/p6enJ
-c/6dpkmCF04SXsGsvKos6Xq70ffv3+nLly80zzNN00T/+3/5L3S733WOC2mpFVvglm3bRm7eWMCX
-O3358qybGn+3bRua54V+/umLloThn7qjBFTXpZao+OxOZrqphTg83aMo1Jz3f/zjH3Q6HT2LLksn
-xtwWwCYWaF3X9Pb2g4Zhon/5l78ok80uYjgowcACOgWrO7jdbnQ6ncyGIW0RDnWtB7DaoWvQ5UDH
-44HutzslwrbDxuNpDbPg+P2NniejJWddr1c6nU4PzE4HRoLGiylQWeSU5YV6J97vDX15eaKuHyjP
-MzZRFRqtcwsKjF1bpBl668o8eC7ZI88PAgefksbSRJ8vLLGSJKWhHzRiC9jHo2TdthGYPhR5Tkma
-0X/+53/Q+XxWVR8AaMu03LaNjocDhRFXjzZC/XK50OFwUGAQCcIY26GV4PW4KbbC76eky8eVDsda
-n9s4jpojcL83WjlM06QHrNXttG1LX768aAAwFLPgbIRlWdLxcKAsL7ScXpaFrre7h0DjRsBCHMeB
-+q7R0ximCix+YLbfX/7yCx0ONSUpl13M8d/cLNL0TDb6Gz2zs5neRNEVKmGpLCs6n89UlEfK8sJz
-H8JUgu2QepWVso8d++EFFOiGHcXeyQkzMlq3nW63K20bW2f9/vvv1DR3Q6VMdeHnGZND8HmnaaLb
-7eYi1LfNU/mh/B3HiZq2pUnYeNCrw97adzziZzAMg1s8y6LZjEgZDgLSNJtpmumPr1/per2ogAQY
-CttRLd6hNk0jTdMoWMhKXdd6h9rjWIw/S69ZkGAIrstCt/td7NnZ+RktFg5wfGbMqTGyss7JwBgw
-A3dWaaFnTAM7dn8kG4lib1DX6VRQfFt+W0oxDuUkjiR05UJt66TCeMZpVqhFGX5e1/eeAhOKTfu8
-cIixYnHzMhPDwM9ARKJy07Yc6iGYhyWqYW/YfAQQuex0w1ZcqGJRNYTTNNH1dqPffvvVc7RBqQNb
-bRdeEDp+tRgY4gO9vb9TEIT0l7/8QqfTM0VRSU3T0u32rl+WTR9SBQvxHzDX4MaK/gv216g+7Jdf
-loVutw9aZYTGVcFEmfDMeU5PGkCBh962Hf362z+o73ulTeJ2wSJ8TDnifptbBwYC3ahpNi/Ijvf4
-mQXqVGN7Xvd5kKwT6mLf5MCwQSMOBU7Vq6/vO3r/uCgpiNlgqybzgO785csXenn54iXWruuqiksQ
-q9ifLzH+eHxbff3jD2qa5pN1FdYIbhTcPqP8XnAcsGgXORjgb6CbLnHkFWz+OGYLbABeILxYm/VK
-/ATDMBIAejYblSsRYAn4u9ZZ2bY7OFCgKpzEMg3JwwD5+ELoTPJv/IkrMI6D+gK8v7/r2BemLdYI
-pOtYVg1c5zHJFz27HWVPoiGwOEqeZ3Jp+JgYsi5cUK6zN6+qkmLLjAPXG2YYCFGACeaj4GYcdy19
-p9lZUfMIpqEk4ZuXS/dYbsuMYuPT/2cuLMx+G4yxyKgYAQAlVBpwdcVCxox01JhvTjCeyDdMqOuK
-DoeDsN8WZSEuS6LKO0uw+OmnL3Q6nSgIMuq7D9WuP7IQH2O7M+Mqa5lxAEAdASlWJySevbPlFBOw
-VqWq8lhoVdAry1L69u27nOiZ8yCU2/X56ZnKsqIgcFXXanLkraAJASe4fe53rgK//PSToutIdMaB
-bCPNiiLX6QVKXn6H9ImPgU0JdxwnMBvF4DPTiQJuOcflZ9fnw+HgIfyW4LNuu4p8oEOIQPeVCjSO
-Yrrf7zqyg4JwHMUePM8pywY6HQ/a81spsqVOO/SfPE8BVgWy+UjTtkwllpAUBhQj3XdgaFrmYVmU
-VJWFslh3dUT6PNqeTUQ4qkmIklgj4rwtxpFb3RgbuKpK2reNk1s0nGARcUclrC9H0AF5Zl0Den9/
-5yy5qvIoiu/v758UbOM0qV+Zj+rP6mhqkVSAHLZdKIrck+VaL7pK3XbdzLPr3Tw4ikK631mTzQSf
-iKKoUwoy+tBEWYWhGjx0XUth0KlCyx5eWGh2MpHEEe0CrKrRp/RnbdsyndlMWKKQOeIuXSb+dDjj
-lj8ej1QWBcVJRlXFYF8nFY3t1+/NnaIfoRKX2N12VOdjJuUkNM+OjISDAQErp+OR4iSRQ8S5BtuZ
-diwV4rJcneLNLEyX0BSqwzPGlvYW1s2ZxPT9+yv1fa/P1DIUj8ej5hG4sJTdKO5Yl9+2DR0OB6Y4
-x7NXjjssh8vycRzkorPxcYuwM1e1qbOS+M1wDGzZn6bJA/lpMyYurCto204zLSxD1E43pnmirh+0
-9dl3Ukr0n01UnFWcY/BaHYizKueJUIyyCzNWgGl2rgm+OGyhQHOE0cK+7bTvG5VFTk3bef00qKQB
-CZff6N4tE8t6C1i7JBvhlaaJOMWG3szd9Wi5ptKweeYuhhSzfqemuaszzjTxIYUZ67IM4g9wU2GT
-OgaHIU3Se9uHyYrBUumv3mx4d0YZ9juCYFOWJeVZpsaQsHVyz2XzWH/TNJuDzE0H9p038vF40Mg2
-FpZ0MiaKHjz7IwX+WAdBEoqRyI2Vyviq4FszSeh6vXqyYtxwuIFvt6sHVHLuAGtDijxXZBoAmfWF
-xM/QNRcEtK2bVhiI+8KmwO2WJinFSUa7HHwuUIO578vSOz8GvXF5fQ3DpjiEnb8jhQqsTFd1ur3x
-mIn4OPrDWBQXgTWMHcdBvCGdBoYPn8mzlMPPhO7BXZSOqmwrTbQk+B2agxhGn0bk+O8gCJgJ6Nh8
-s76QaRo94GhZFiKxLELfjzLzdD7xg08KCsNBNziXH+yzjkRbi/pbv7wwTBQVX8SNx94ODNRMCmJY
-/gBKLpghZHmh0kpUMZBGghGXxDG9f3xISMRBe29sDGyEMIy8l2ldYhCOweVxobFl4zRpyq1FuwE6
-xXFMu8yR2f2o90gyllE4z7MyBFGhPAacJknKISPbrrl1GGllWarVHfIaLPqMAwuHYJrwjDlLU2ra
-ltqupfAt9A49/H44EbmDaFcTjEgISjGyIIS0gsAPnnmnnh8jfvY4zdQJe7HImRCDBCYchn3fC425
-88pebOhpniTgttAbl3kmTOdm5Jxt0QsBT8HJCMQW3MqJH0NksMYfDVdwiDklauRNGsKwNsKr5U8D
-O2cvmSryDhbbxlpQ1FYEeK6wc0flCysyAOZRFFEMBBU9L6in7HSS0Lruao7A46VFfyBKjbqupKxY
-PHJNGIbUDwP9/s8/ZGademWIjTm27sKuhPdvzUcvv0cCEKSZ69Zp/BLK3ixzVNiqLIQZtTCZp2JO
-OXo2RHrHJv7a9ay+FRWz41JOUO46WtfBq0ogYAIfH6Yop/NJlWU2LvrRcBPAKKfOZJqmCxNUT60m
-oh4smG/fvjHLLIyoE8vozSjF+PsyIaYoWLIaRxE1bacMOcs0tLbh+84LrOvuXl8NYQs894gCveW6
-rqdlWaUkX9T0ZF0nD0SzPgvzsmheobXFtrLz6/WqrRvWn036YVu1xuPLp2lGdR1oa8ZU3tEztLEB
-Gn9Wmbpsgl3xHR5huvj6t7cftG0rnU4nozSNH+jukby7XaY9redubNmY8EcEI5Nl0R8SmNKrE9Em
-CceoGn1Ha5Yd13VNMVszj57NNNR2DLrwS53kh0BMYQMiUM51XatlZ5qGRldfaN/Xtp32+zgpnbMu
-f1nQOuua551pEnvpwEB7bdinXRxA8rmkSrQyQCkPJPVwONDxeCSikMapURlmKiEebddLZVGqDhyG
-lHw772o/FsejZ1XuEn7A/CLPCp2BqpXCzWEP9lZx4Gyo0eF5XtI09nS5XD0ZM0hAqxwgEIx8+fKF
-Fol33/edPi4XsZPKvcguAJNc+q66mC+Xi8SVjXo5wIeBQWDkKhRKs31EseEJyC6/HP9eFLnXRtgb
-znpNYo4dhoFUDqFWf056nVJd19p2hFLFgGtgzWGAt4BBycS1xJsygAOAjAuLc1i9hwO7B8VNMKHB
-Jsf7AV4BWj1vyk3p9rxmV8/aHCQwXLw2DAYmK6g+sGZxSYFIBI0KPAiaho1FijynWUxt4v1PLLym
-2amKMC5yo5LME+VYdHddmZXFfVtGy8qmnfzia5rGnufUMj7CIn5M+AXzsK4qIZpERDSrDNl6uGG8
-gUQYfE5YibdtQ6fTUd1i4C4D6W3XtSqrtKcu+m+rIAQNNgqDTziG5fPzgnsEORcaR8e5R1ruOLq4
-KTundzeEA3z6nisbHMD4/XVd6xRjFM96Dd6cZ6HTBgqyYnEyM7LTQ8qmO0HkE4YstoFFFfIF5tm5
-OyFcBC3JY+w6Do2iyDmGTMhX07z/6XjUfxaxoRWHn8ao4zRRWRQ0LwtlaUrfX19pnmeqqlp4Ef70
-wX5P+EzYSnJdVzUm4X8deGW6BZhd8nWolvkq+eWxAxVFQcfjgaIo84I7scYcFXtWARaL7XJKZUN3
-XasXATNtV88EN01TsTiPaRpHyrITjeMk7MhYR4lWvp7nOedETOJegwf0qHF+f/+gX375WRVw96b1
-eng7GrQOp1EUUj841VPbNp6FEmb0nXiaPXLD66qiCJRgA1LCm9+WwY+x3MsyCz00cyaOMicGmQmO
-Q3aRKtiYpNQtvRk3hqKT4Ipg+f9x4rEpxha5HobBux1sLoJdeKo8M4fnJI7BqAzw+xAG0fWDZvul
-WaHpS1i0rKq7yu/dVL56vzfKr3i0BYf5SVWxkebhUFPbdlQWDLKCIVrXPF5klplzXirE0QbVkvV+
-CMKY2ubuWaOB+WjXEcRYaZrRWTAmbhObTwcFvBbv8yygX67tg9UNWD0LMgXsO2GSWqAXBV+Mdn04
-sZqVy9d1TcfjicIwoHWZqWk7+vF2dZOYe0P7fvd6eBc6u3l5lLgg2a17UD9GPFtbZeIyCuS7Yhpy
-vV7peDzqJY4pDNZNLJOTcV0p3raNo6xPR9VJ84J1eWY8jyy8fh0fBMGGGL9gdJTEkZB7SMtvAHFb
-UVI4Lx7l1N6kithfr4qWv/14o7IqVfqJZNaPjw8tER3LMKGy9EeHZZHToGWsr/u3hCTObV89CypM
-PGwJaAkldq7PsdmONDNNoyTJZp5e/zEXwSOSKHff0WPtzYdDj6W3Ia2yMObZgUo2UQa23Hifg8kY
-tMQlvN88z/VQ6YeemqZVvT50CnXNo0e0kHbujwh4+1xxKWzr8imMFWNJP6GalEOwLMzGTI2lvJ2q
-2DId8txYPPUt+m0rFGxiGxOGn7l7DL5Qb20brIH3AH/IeR69PImiEGatOczsev8z0NeRqxicvd3u
-tCwMVMKuTEHGkAV867bT/L/oeq8dybLkStSOlu7hkaK7SV5gZv7/W+ZlLgZzQRIg2dUlMiPC5dHy
-Ppgt27Y9ahIgmlWVGel+zhZmy5aQNYvLlrU9pLiW8wWYaZDLT63xoyiiLM+pLCuqypJaI9pYFr4x
-D3VFUZxIgEGspbB1XLEgEcILsyyjtm01TgkPniOzSF/uNI0yiXAPFl75ePhFmevYrB8Gul6vmg/I
-6bCVij7caITjl3nenlA4O+8AO5Gw45QkST2PePRb1oQSC8neKhYcAhJdliX34CCiRBEFwWJCJCJ9
-js+bwo1hI9UqIKHWxoRBAGTHh2ypnXrVHBYuiESDfC7cgLYCQjvF0tjAO7BADQYIBYq1neHj1rO+
-BOCVAJSCFR2sy9DKrduuF4dLJSZN433eMBYHwia9XK9q/IlnDDIaLhBMaUCqwUQkzzMKKDD5AqEn
-6LHR55bWbseAOHByER8BP7AeEzaMxClw+bvD2Zip75Hy/e1ocl4+U3yhhwgCppKnWfanPoG2Koq3
-bRNWXE1xXFIvwQVRGBBlKd1uD+r6gZrmTft/SD9hJ/0sy03TTMcQruxZPFfgLOUyJE13LxDymQSE
-8ho9XZK6/MJlkamFmDOA4ACHmX1PBfQqOeRCbqfnktc5BPMMuCwZtMzSlGaTioQbyVUzrZe7zlbm
-fBpXVUVVVdH7+ztVNYs59m2jnz/fqChyAa548//6669UVZXaSQPD4KkJ8wOsFTbchgBuJkkiiz40
-zk27VkMQmoRhqKGp1uhV3YNkkrBgw9HszbvhsY+Dv2lb/fkIl9n3SIlP1hLMklvczD3W952YTWQN
-NHFBoJWzGZIKpsr6A/0ZgCZ0GYggh19jGEbaNuBnaDW4bbSb9Yc21+JdAEAt8cs6NeG53u4Pejwe
-9P37d09G7ZyvQnVSfqa5R1EqorfOO2TxHm1UueIJcmBO06ijVJ+lCD+BmAbsLeZK8ygoCkc5qWda
-xPQDHxROJC6qOPMIQ0BgEZdkuc27AczwwqZ5olKCDXAAzHK7jeMgUsbaM9zs+p7IsN1sHJQtvzAL
-hRjlfr/pLQbQCw+v7zvP4Rcegtu2UZywE08hmw8Cn7IsXZ6d3Chc4YQyqps96y81MRGM4Hg80PH4
-QsPQ6Uirrms6Hg7ax0EUBTEQFocKaIwl2yBmm3i2l8tFJyiIJLOAFfgKwCCwwdjEZHsqrVflRgC4
-xC2EGzaOYoqi5VNFhGg5e9BgFBkqil/ooYwIOhfHRcpUxKFox3NIasboFu8efTl4HBbFB2/Btp5o
-2Syt2B02n7n4wJmAKVl7NtvO8npI9WaeplGt22wrAK5AmiZ0Pj/YFOUpbMTmNtpcSxx6zDdxvoNJ
-QnoBONk5STS70yYE//Wf/2ffQPSRhccz91BQ/Z6mcabXLyeqSo63ut1vOpsGkARQDn8WCwisrK7v
-1AocJTn05VhUGAWiPISTCUon9Ib7vtF//Md/0ffvX+l0OsnDjj89LLQweChY7IyoZrSumzobwVVl
-mmb1ucOf5T/PNycz2woaZTFCLHUX5xag/EkcixHDJBhEwcSatqWvX79Snh/px49/yO2z0evrScRT
-F0+jjkBLEiYlemVo4e3CxILBdyrLwmtVGNEOleJspzA8u2bfBRiYWnT82Y/BzfnJW8iM7s/eRrAl
-up2hI94Mz2wWPYnFOjrhwNvQDrb2GtW4hKvJ3szKJzocai/RZ1NyTaTP14Ggu0aF48BlVN7ZyKNN
-y7LU+055ltNOO+0bR6zbCoX5J8wzGA3HwOpHrL/CPM/09vZGr6+vVJn8Qn5uoefpgM9pfQDsWJcN
-XRKt9mxwDVc1MhW4Xn/bkaDr+jz3F//xxw/OV68qCgJOkrU3LUqaZVnocrno3BPA2f1+13x7S/2E
-+g8nOqSdP3++0eFQ08uRJcq//fabkhsQuYWe7tu3b3Q4HCTOOvRGbtiMt9uN/p9/+WfVA+DfYyyJ
-FCLYPU3zJA4vnCP38fFBX758Mc62uc7j4W1n2Yp2FJTEEf32+x+GBMIbqK4ryrKczuezAmR2k1hE
-/Hq9qh4dSjkg4hYwtSSaJIll1p/Q77//phULeA7PYZqoMGz8NW7sj48P+vr1q2fpZclHz2vBjkb3
-fafb7U5fv37xHIJA0GKwi2/Ipm01DgzkpH3f6MePn/TXv/6FyrKk8/kieE+tEWZJklAUZ/R43DyU
-H1OkX375hb59+6o9tG1Vn1OJizz3Lhx2lrrT4VB7gKwFIDHxcJVb4LkstW1Hr68n7x09j4cRjwbg
-+euXr5RmGd3vd41J37ZV1+RzeKmdntgRYZrE9PPtg5mgJi0JeFyaJhT/8fsPqupKuey//fY7ZVlK
-r6+vyvoax5FOpy8ikug8Zl5ZFPLQJgnNyJVpt22rF+SBRWXde/Cw4CfAvnCs6uu6jpqm1QWfJLEu
-GvaErymKKgqCu5bb/N8iBTHnmccyqDBcpFKnQNO2bTSNoyquwLiz9EssgGVZ6XI56wMFCOU4BBFn
-0C2jsvKsJBU3Og4yEFj6fv0UxmLj1qwfAyzGcCBi9IpDfN+JLpcrH6rk1JTou8FWs+QW5fAnqQHb
-yJtwWPvsZ4rss20b5tlI98V7B6sySRI61BU1bScWaNyboy3ELw56PSihC2KaaWJq87rtROOk7x+t
-E+KwiAKdItjDE4cR5NzbttHH+SzMu/STug9gdJ45TQx8AJ4pvTat2Y0TdyWIKX5mPpNmNYr5LJ5p
-07R0PNYyvs0kKHSj6/VOdV2xFse0yZZqDx8G4B9d16rnIiqluKor1YOP40RFkYvSjIU9ccyimPP5
-XdNdLPI8L3AjybUaCKOY9n1Saa7NWbMuptYJaN3gmJJr8gpuLEhl52XVGyOOWcqZZaNHckAfzH8H
-+w8UOZdpNl3VGmJO00TzHEh4ZqMLDZUQx127GCyc2Fb/jdASjNFsUhEzsXj6YEMt0Zviz2GEiA1t
-Kc+KbcQuLwF6cR4RRaqtsEDqMA5UxaUab+AgfTxYj5+mibI052X1jEt4DQbaEqFkBYfBhqy6sacD
-p9CD8vPhgwkbP80KCgUf+P33C9V1pUSleVm9PEGMtNgss5SNcdafz6PNUdZa5NmJP0uQ2Q0pexpD
-TiZB+Wldrs6JuG0bejweGolu9SjAssBUxESjbRvNdXh23IYy0nkgROqIbL0K0pQFdUmSURzze4eG
-oSwKut6uehkREX18fOi0Dqa0vJYjBQEfTcP2eyzjLZkOO0708vJCdV1TGOYUBL0ackRRpKWQJSWg
-fEe/cblctDoACgymHfvR3dQbAIcO2gX8PbYMswmreEnny9UtpDRTkRBSb4CUcv4533Jd39NNgitQ
-ygGF5e9IQmtNdAoyyEa6XK9qMQZ6JZulxCK84U2EbAR2P2o07z2KWBYMIo8FRO1iQ0UCu67Hg0tA
-VFYcfRV5IJUzLEloVSkxZ84fj0dh+SXqSmyfK4AvtqLmw9WnhDMNeJln5WDg9gpNFPefzbP9xOld
-M+u3baM0K2hbF2qaXtbVwR0g8+IpURXNh6RYvP7SNFMyUpKkaspZ5DlNs4u3W8RNmLMlElVoWotv
-jEJBmeV3ihbVmcJUVc3tY1lIr+2APBvOiUPMui8h0s1WTlmWm2kNqxvvj4f3XJNEHIKjSByqNo1D
-CyigJC0ojlvd5OAgANM6n6+UZamavha5MAybhtcGEakHOr7M5XLxuOg4JR+Pho6HA00S/gGzBqDD
-IEYURU77tsn4atGpAd82mR4YUGfBZ9DJXifNn8szSQA2fQ5O+LbrvTEkZuPYqEFA1DQL3e53AZJK
-lYau66oBmU46GcrNTpRmmeQWBKqWrMqCgjCkvh9EMhzrPBxe8UscaWiDvVGeyU7Pv6wTEUxSQd8F
-MwyGlTjE4AMHujZcedldt6Y8S6k3YN7tdqNpmuhwOJg46ZKSOFZjUFs98MKOJR2ZDyV2XZqVUPX8
-nWxCEgOMbk0kScYmHfNEnQCVdhNWVUWPx8MzEIWjjSVcuQBTpsAGAXtCwpwDUttFbOzBF8EhkiT8
-5643NzrFwY2EX6zJ9/ezOgRjVBwnGQVhrCU26x2I9j3+xGjV1lCmES7FKfVjxdKUwij2Mv9uN97w
-m8SRO+4AiaX5LKK2WcaxqRvBhgHlRU2Pe0O7HKhtKweFfFep7CIZIYyfiAUOuAo0R34VcQfLOWNv
-JmlJBmlWmNGDK33gvsJAIJRKszFPiNUoAn1MWZVavqu5hqgWp3kiokSrDPi3p2km1cAq38FVHXya
-PtS7H5RQvDCmTg56A/R9R0VRahINV0CxItjo64ZxUq06iC1JHH3qoe20wsqtYT02zwt13UPxAf6M
-AXVdT1mW0+n0wrkIcqNkaUr3x13MSA8MgEUhLesqxCvHgDscDnR6OdKyrtQ0rQZ4ctJy7JFZoCdn
-AlbqJLOGBu58EXpPJMY8DHY75pj0iLaVtQebuX2BuA/DQFHIoBqMWzEGtF6P4GLMxpQzzQpa2o5W
-STqy7V2aJhIbx447uCBGaVux5tHuWZo7nKPQIvOUa9Gb2I7lrKEpKs08z71wFYS8IutwnGbPdsy5
-WO1GmRoI5XjwxqOY3tiUbnx2tMvT/Upt11IiVShCZWyoa2xzw56BjHVd6Xq9KukkikLJI581hdVq
-nfGl2IRx1IWEW5B780mpqM9BneB17/tGeV5RkefSUnwOa8SiBkWZjUIi9exHxgFRoGKXKAxc0IkZ
-P+HE//j4ULeZREAre0O/v7/paAfEpFgcX+D7Dy84INXjNFFlCE72JsOhCOwECa6Yiz+P4k6nkxB/
-Mi2LucUIVYTFFuzsK983LXV9p3wK0GSjOKN17Z+is1Z6PBpqm5aOLwcvPhsL+M906Ou60eVy1o2O
-9+QCMbmf74dBSFLbJz1EkqQUBItiEM76zM3ILeAI9Sk7B69EBlBFxWrp6mmaiB1YIsSwTN+FdQpO
-00QdhqBKZRDyhYg2nY7Y3r/veyrLwuYt0FsAACAASURBVPEbJEQEcXaWyo2KDlULkrFgpmonK2hb
-7veHYkb4OZjaIbsClxeqd45YPyogjACRJEnVOPbRCItxXVcaJ6fEs2glKKUgcPAIcJPEn0RHDWx6
-OSvPfBwHqirn2mojqPnPOqou996bh4rDRinUPxMLj34yRqF8YHV9T9M0eo6qTYPbfZWXWCr6jI2I
-AyESLQP2QlEUVNeVxnLbA6wsS6OTZ3szBGryz4vEZiygqixpmifjbLx6Cr4oipSwA6EQbzL6BKzF
-cUJZmlBelHS/32nbO9G4r95tURQ5RSHr+d1t4Vx7mBCy0P3xQycmz242QeguAz4Ad2Wq4TDA4W0X
-dZ7ndKgr9jMU8VMYhrStKyVxTP/4x6+UCwMyzzKaxfrbXgIKcE6zR1Z53tCWMfqs1AOuAhsuJZ5N
-rsrEpGYWPUXXdfT6+kpxFKuRiObsrSsNfUOTjBFtddy2DRHt0pIl2mqi145MIKnVXjRSisOCnsvx
-Tn+vzZGEliPPc2qaxsPEwI607xDahLquNEUa3xkEPOazcLUdWw88e+Oh1CjLkl6OR3kwm+fistNO
-AcEgI/IAlbquKI4iuih/3r2wxKSTgPPP1NeESiEbAfl1Cb+r2eSpviB2Q0kUGErk4XE5zWYJmA7Y
-OfYufRU2JnrLuq4oDBOal05vIHvzgEc+S4CHZb31IqLad6IojilcnGmHS/oJ9TZlM5FM9Q3gy4ON
-aWPEOVPvLoSO3KMyIwYcVlM47X1XZbYo43BTrlC6rv3kD/D6+qrKNkivIcxJn0apeJ7suhNT1w/q
-qwfeQdt1lKSpkxiL0pEnPInmMwA4szHnwBCe0fZnZybo6i2vZF4cym+5DrfbTcwzOmW3vry8iCPU
-qmo/ENpcOtOgoaZ29FlVNVVVrRbr+IytCTt1lPbI009gLVvjGJfo4zIGWOqbmkxB8i7G9/cPIf6k
-ymnJspKicDRs3VAdj1BBb9tGMW76zniOo6RlM85YRnKjUj95bjp76C8WonK9jc+7TT3F3PX5sKmq
-Wkk2P3/+8NBllMs21RZe8rsAXxDGbLLZgG3kOfsKwJ3IevbZ8RuwCm57ziJdTnU6cb3yXJ03Tqdo
-q69g23UBYvPYX1aYoU5BWUZxktIuoBhaAjxTHNCY9yuqLGnJ4IdbhmCaZnqjWx75MIxit80WZvjs
-VVlqBef5DsSRtFDkvQ+MNWFC+uxUw+X9qDN56/OfZgUN96uX/GPZhM/CqmfVnB0zPh4P8YUoTby3
-09XbfhqXQJ5nMhV5UYNZTKKWZdXpAE9xCmfxJu8mTWJ1KMoyVk2GYUBtP2mlDI6GVU8iG3AxEmUL
-LDqTkpKCoFPlYxSF1LQt7XujVetmDEAhPgO+1feDxMjztKQVJ2LwZ/7r77/Ty8tR1LMrawGsVXQY
-htR2vTd6243PWRzF1PeN28wmhhu3PBMkBo/E8owOW+GDqs2CgLZ1UXIDQAvbF9l0H4z7+CTPdDM1
-zUODH3XUFoUq4oB0+LPHn5GeykPDCzydTkJ8yo2GO1KePZDxHz9+0rYudHp91enB82K2JqH9MNAu
-4Rp4NpbhRRRou4SWjJ2Oe681AsEHv3ddA2HKxZ+ixCXky7x314/inWI9EDmQad12BTzZ5mtQiykc
-/PAfdLNzpseeXk+C16zqP4FS/XZ/6EjWjnOrqvZGi7bkT5JYx6NFwaxKtEvO2nww34MoCgMF4NIs
-o2VeKM3YnReTKhyMZVlSnmfU0+iHoYwT7Ttpa8wWdK1ueADfIFsp1dpkXH6WMjuhF7cVRN3S6xQJ
-E4nAxLnbSgQ5CGinYxPJnucFt5nCASkKVtXW9YEejzvFQLSxmKz5JW/SXa2q3Q2TGlBuo20LPD80
-oP0WbMMLAI6A0gdaaZhBgoiSS9bbc2Q4b1b3RTkUk8eFO+00DJ1Hpd33XXuu6/UqAhGrhXc2U1DS
-HQ4HLbNwkyJNKIozSpJJQj9TWoJZudUw4cyyA3398oXGaaKP9zMlSawMrOfvY/tauziMNYv2sPDm
-n2f3nPDZtfSV5z8MA61mNm11Csg/BMHpcr1SmmaepNtFV9s0IHd4fXx8mDATly7dNK1OBLhVDBXf
-iCJJIzIgIg5/vgk3nfLAr3AypiLOcJOrQAZNI6k0rDMu/3dshMlIy2Htfbs/mBikSlC+vXdiKnQc
-x3IhrbSu/iGOUfL9/tB/tqQiUL6TxBHh+n7wQkTsYcsWfKlJpHbOvVh/uVCO953X2DMdeBgnbREw
-jcB6qeuKiDiKHWzDMJQ4NowYbDgETheUgG3bUlVVKvFFTwGQyfKkUVE822WB1QfjQvQ6UOZZ4QIs
-smezuC35xQkoDEAkxgi4HVg/PnrcaHDwq6qiq5B78MBtJh2kybuIk1j622kbge9mxR/YyF+/fpWZ
-94HC6EH1gXtE9PnAIqBu8+2lt0+2YFyCB1rCzfNMwSdTDCdFZbAv9iYcKI0BGsHf8P64K/BUls5/
-Ds/6/f2Duq6n4/GgwaexAHp1VdHrty9UFrlWjGiXVFOywHyyUt4G2HJcfWy0GKeaJEnodn9QEscU
-SfApAEw7ckRbE4imv+3OHtMRLs78eUhUkX47gfeG2bjKhbOUxnHgKVKaUtu1dEpPXrUbx9x6ck7f
-gaqy9LQAcZw6x6h5oTiKJfjV5T5aQpVrlUbKMnqKy1s9N6yqKikVlaq1xcdoj4F3J4KaZbqDy5bF
-fA+1oI8ZLY09iyvLVtt3RhYPdcVzcJHE4iXoyY7MPAk/DAjpsJEXIoGyLUtTleZawAW9m81tw2GB
-Htq2K+Dtg7mHeCeYe2CchfFMHEe0StoO2GkudnnTFGQbZsKLdvHENwDa8OecRJMPO4SB8uEYUZKm
-9NvvrLMoilKdaa17z/5EdsKNbq3UbE9qqwX+PQzALuuiWE4qzxE0W91EK9teg9m470RVVapPHrIL
-932jPGOL8K7rqCxL+vLllV5eXuh0+ivNc/vEhNsoTXPFCcAVAXGItQbtJw9AVH+w8goCop9vb9Q0
-HX3//u1PAzBw6MEU1YKm8JHAJsF4FRcXbtiqqnRjA7tBiZ/nGT0ewSfLuHXdqJ8mzrwoS4qTjLau
-M9FdTtY+jjMV4vMAQ5bRmLpglBhFEdV1LSBeSY/H3RMuWTARmAvovnYigp/7HKaCaVaSBOqLEIQh
-ewJaRhZSgJEEZEMuNqPxd+UO+O6uv2Tb4UH57JYVlWcZbdtKNzlIMDVAP2/HLNaEAX0hDpw0zTVH
-gBfP/km4YufWuO3neVa+P0YhlmOAMAoFXNQfYPXCSTCfxonOlVRnXG6ci8zj0dA0zSLeKJWogQMD
-1Y/1nHs2n0SLtO+Tbm6k2UK8EgaOCQduP3gIalohfzdKaE7BTYWh53sz1jWPPYvySMM4CcmqlP44
-F975u5b4YOgh4NPansF6e547r0e2mgKLC8VRLNLVm1YXocmitOsEmx9TCqzZosglX5B1GKhccaCr
-wCdnEA2VAzgBcRQpr8AeuHakPc0TrXJL2/wHbjcOFEW9176MsmesCQueW56l6lptLcnsFAS8gDRN
-6X6/e9W0bYGex4NWIevWQkTBv/3b/9qZYtooZ1wZRcY6Gmkybn6/C5jnct7x0MDXfiZw8I0j1NWu
-V7oq00Ij9h6QPHhGsl3AJb5IlnHENOKRkC0PsA46d5h3wFKJhSixzlURBmFTg/A99n1Te7S+H6gs
-SyLaJXGWtedd12ugJvrpYRxUw2+NTqFyW7jnojCKROoJg5Fa/QmWxaUDwYIrlpt8mmc1L2E682ZI
-IKsuvOfIqGfVHlRy8Dx0I7ZAmZ84BHg0W9LQ97TJZtnWnTqZvLgc+0S16mCJ2tYNKc0+m3AR/In/
-rLXvxq11uVzoy5evaoltAzJRsmNtVGVF/dDre0cJDYDZovkQOHFbtMlG3w23gSdA8ICAlR3WmPb5
-wq1gnj8JIJ24+O0woG3bqWkeFEUs63UXlPs70yShNMupF14LLkS0TBB9Kb6SZdQ0jVa48FV8fk5Y
-NxbbwUQpzwsKfvnlX/ckSejt5086vb7S4VB7LqK3211CPRJ9kTj9vcy6hfPXh3HyaKKPB9ty42bO
-80xpnIiMatpWZ/vw0sNt/v7+Tt++ffP018vi8IFFmIMYUeJhIUL7fL7Q9+/fPPBoENWja1OcwScA
-mSxN6NG09Mcfv9N/+2//3SvzQe+c51lyBchDteM4EZQ+ovf3D3p9fVWRybKsn1yJcCjiMxciiZ3n
-hW63G72+vmqVwDRpbmcsEARDC4wsUeHcbjc6nU5edWdDSq1yDjiBVbrdbndVs9lRIByTUS4ji8/Z
-wjH77h+//kqn04mWZdbPbOPAcGmAjWe/CxHRP/7xD/of/+O/U1keqOseYi7TezJyjJXjOFaeAbIL
-LpeL+lFYnwIrakPLaydW+PXz5xt9//7N4xpgfQP3QptmA0MxVYGfAg5KvPtcQ2EWLwnq2W8A2Qwv
-L0f9XGWR6xrLs0xGhZ0HHLrq80Ffv7yqOOnZhDZmU82YTq+vdDq98MvoOu0Zt22l6+VKlWiPUTbO
-UsLB7z6KIhqeeAG86VftU5yIhP/yZYU5BN/SWcoIbSJxUvZBYFxk+QNg9m2b/J3KugM5Z9VsuUE0
-43GcqJTXJsBYKzHWPPDtdzy+qOEoMhTBvOM5bqSLDYSd2/2hZhrTNFNVTbRtsUF/QzWNhD06lGLI
-xmN2YmBcfgbdOEweSkUMMutoMUtTmgVnQfbB3fSQ7obYlINuzVEhKbXEq2ka6X7f9WdyDuBdJxsg
-hcECHEy2fduoHUa1JgeTsixyCbskYzk2uUxHmSokSazrkO3fHxLCsXpVQpIkMhePdU3N86Kg87Pv
-v93kGJGO4yi2YEyXvl6vKoACeSc0VdHz5sfm7rqW1jVTlicAVqRegYNgR602adn28mixl2Wlqip0
-BN20rfr9hWFIl+tVhVP8fGbKMlaOAl+D1RoOfcW2ImECxlFMh0NNURiJ5RZ5RodFUaggpGk7mpdF
-mYPPQAVONEYlZ01Cga+c/SAIrkSJdrs/vNsUNxx8z3ADq6uJoa1icuBe9CpBDIs+YHvKos0BNmBH
-M+62dic+0mwmMzaCXrws2EkGZSnonYdDLa2Ocyy24BVoodYsdds2bW/meda4KrtwoTFAJaU25eui
-hwRs1/6sHQB2AdYiosgta4z1FYPLXBReRNO0SjypylLLbDwnPlSIGgmz4BaHY+E4NXpSZSJYiNap
-KBbgkINESmrbThe2tQ536cetJ5+174BlzpOuU48GLsQfTCR41JZRUZQyass0um3fd2UpWmIRkHbn
-fszvpxY7L9iZ5Xkm68YF0jB/gygMnRQZlZlzhuJ38Xo68bNJWGDHbUfogeUAHsuypEK4GWhZLJ4G
-3Ot8YXel2MYiIfgCNwxTZU0OWxR7Pms+FdWVXPgizNKKdeYLP/M4z6iX8EeAaOPkACH8TCLetL//
-/ju9vLxIpBgvpDlY6NG0XriGG2WuOv5p205jnvIspTDk6iXPUpkBJ4bItOimxKGBRQXTURxy1tdt
-ngUDEGdctCNFntO+kWYYWP4BqgUsbNhRW9deq7C0s3lEOz8n2nh6dFFs2pGZy5LnEM04YmT88Wgk
-vgoLZ5VNmEmfztoMBH7CiZlluKN+J5vyiyonimJl16VZQTt1NAyLylez1NnNV2Wh9ufruqpZp+Nn
-HFWObMVkIGTZGDAm6iQUSMm8bs4Sjd+fA3JByy4lphuuy1GUfELgIWj7M3tykJKimAHMuqpoGDeK
-xZ0qz3NJ1x6Ut4CWBe/w58+fdDgc6HA4qPgozTKaxlHbVXcIrJ77EGK/LGEqjie9rKwSkNu3jWJX
-Ho/GmCLQMlZPwHmmnz9/6ikPkMSimPu+UyW021SopGEYeGOobd9pltIQc3dUAzbwEQBREIRUVSUd
-DgdOVF0X1iCI44yV48Kh1kYoA+gDBoFblkvOxRMq2VIZBwp82h067OjIOMnnZRVMYvUW5DT11PUd
-Xa9Xj9Jsx3Ef7x90fDl6VFa3eRj881mHm6q7rOz12VJ9N5Ro9Mm4OTkZ6KGLuCxLQcxLOp/Pn7zr
-4jii//P//St9//5NMQ8bBrIsi44T1RXKuOSwHRVPcLI08aSxSZJRnvOBZHt5/Pemab1wTLRfFmAE
-2w6tnHVb6vqBvn9PiCTvEs8Ehyy3GYkg+osahuBngsoM89YwjOQzJtKy+mKlaZqVCTlOPHHKs1fJ
-wkRQba4EtGVdVLm67zudTi9UVTUdDgea54k6AaKtRN4e9GjHqqpWleGjaQ2uwM7M6+pT1uEvGC8y
-p57n0HN5sf+LB4vMPkdbTdQqCeMoiFt2khe0OQIGSmrcnogQx/+PjYYZJ3/HnV5eTsLOi2nr7nqj
-Kqde8uND8YIDkAcqZVWxDBYv9dE0tK6RF09lfzl6sCuXY/EpaJqGDoeDSJFzCsJQwjojb6Fa4onl
-9zfNw5NwHl+OdDy+UFmy0m/fSeKsuTyHvfowjOoKzOUhfepr7cjTjuAsDXX3HKADmfowuQT+BwDI
-wOmfppleX0/05csrFaJItHNmXADADuzocppmKktHDgK2wfTWmS7i7hQEJBdGqK1dGJY0jhPVdc0+
-AuuilwZixnEQWeCLJzwgoPV0fzwU79i2jcIgVht7bb8Ef+LyP/feI96/i0DnSikwOJdv4R15btKw
-yge+48bfkzI58a7AkQkCNrAZx0mswkKP22AvXOtSNIyO/IYWcjIBrzgY4bcQ3+8Ple2CPmjlspP8
-N6DISZKKvpwU9WWaa6w3QycLQI0qTUoN3Fng+gK7JBs8sa6rKu7wq20d33oYr2okse87LfLZ9z1R
-BDxN+eQGH7vrB0WmrTIM0w2O8GLbKyjGgqBQJRximSwZqWlbdRlCUiwSaCDwsJlyXDq7LARYU2Vp
-quWok25uurj2fafr5UpFmWuqshqYxBEN46qVAwhPSLm9yThMy35ZQNzHZ5RlJbXtg1q5odHHWjJJ
-EATsE1my8Ibo/hQ+4oNYDvz1tfw44LEZ8Bxikc3O4kBkQ0fgorNtG3VLb9qw9UnItXnYCrAMGIpm
-4vqDfh5O0mVZUlWW1LStWoE75p0jDKEtRXXAaH8kbY+j3oJgY63VQPbBhcr5BuQZ0mDqsa4r3R8P
-2ve7THW4BcVkKAw4uMUd4NKOhTENox+jHoahOk9jNG15AMMwshbA+tKhX0TySdd3lOWZzjXZGuzx
-xBHgQM1QLLYs1RLltJMvBiq9hfBi21Z15F2WVVODMGXAaWZvU8x6ne7dKezKsqSqKukuIhM82Lad
-tT1Bmi9Gfj/f3lXjgEyAXPL8wJyL45hOpxMdjy+0b4JBxDFt0u7gEMDBp+GVs4u/wk3CbjGLZgEy
-7hB6M3jr9R+EgWTaH2gae1qMys4SabyWYHNAkIt7W+h+v9PhcGBXob75lMIEEA4TC6yPtm2JqPW0
-+RBoobpK4kgDO5JELhGZUbvwVaeYcyavPNZyPgfMqDx/XDwgkmPGMxW32LWFQwtVCzz53YjTgZxA
-5IuCPQSHYWDTmzCgcVxMS+ZuW8STgWPvR6/Fyhe4XK+0LDOVZSXitVFB11Auq2dDHJurYZWvmAbg
-n62JiDOlnXSK5KL5XBYhJmzTvKgXQxTKCN99CKO0iv1ZoiWQYPNYamwQBOr4AlQfY7+u7ygXBN2p
-n7hE32mnKIzo59ub9vNsKDIajr0b0VmKMkYxcFfFGKiqKuq6TpFQHDh29IMbZFlWKoqYsrygl5cX
-OhyOFIaB2j/HSaoVADYHm1wsLo9eNgfMLKuyoLyoaZlHzxAEtN8kjulyvXJvKH1zFAa0PGED+PmJ
-ADh1XVNdV+LE7KPZhQpFds/Gehg2L9kGtxhGXM9pPIqwBwENoj4DvdiOS6391DOmMU4iy4Zl1rJQ
-ludqyMIyYTeLZlAvURmxL0QjejkdaZeRbCYsUgvOPhuSRhHEQUiCGjToBJccV66haDYSEf9wG5Bm
-GbVd72VB5lmq4itMw7K8oFXYhJbotkWbVmiFjBH18JOxrt1n8CC0fhm4iGdZUzjcbPYm9pm1MnNj
-2MTsVwZ7kzSlaX7Qx/lDHLz5GcQ2ywyl0zhtZtzyORrJqrMsOMPosU9dtBZNasQxjDIWiuj946xj
-M/TjQH2xCWx8ts2Tgy6fS3W3QFFaVWVBj8fDW6TzvND5fNYbha2+3vWGYCCF0fhff/tNBS7jOOmt
-ABtmHCQWgGra1psioM1pmodyENqmpbIqneXW00J2GAxRP/QUxVy17NtG8zR6i9NOFhhoS5QdZt+p
-9SPAlIcP18Wb6GA6YYU3lvyCxYsAT7Q0ALjAVGNEvKQougquMyjXAOuGXY5n2Yyh+ik6diE7LB2P
-B6qqg1fa80a9Gusxd2vDGCPPMrpuNy+OGy0LvAiAJaVpRuu2qxYCLVYYsiGtbV83aRmxJmy68az5
-h0w/tjoNJuMsyq8AGOrckzfvGSsHQSjQVjNjMQmbRA3qMLCENE1op53GoRfODnshHg4HbgGArEOj
-z4y0XsEdINvPiiwk0GCOjLEOIsMxorBiBSwwlIcMeMUUBAzURWHE6cTSR80zM98Oh8Mn+2nwmrlc
-T8UHcNGbgogoF89C9L3IJ+DcuEzn85aLD4sv0JXZRCM2oNb0yZ7KVkJMmR6oKBI9FOEspOEgL0TH
-w5FSER75FF3XLyPXD4ku88I5gJbK+mljy4u/y8+1hpqWf992vlmGPUDtXB4tEOLabGCGFXrhz9oJ
-wPl8Nhs6UWfmYeA8xmVZqa4PVBY5ZXmhh8xDQDuOSmv49g4CyotSN8q+D588LJ2eRSTRYlKC7wHc
-YFlcXBgOEBuTZnMo9t2ZlvBkizUN+Fncpq4ajwcW7SJKSJf8tKnoDKnPDmid1JnY4hqh2W/AkIqi
-pL7vtN3atthcCIkn18cB9Hg8lAF6OByoqkqKYXcH5pSlQt7vD8pEj2+jquwiRYmyKCNw1ROLU0p3
-ORyc/DfwEFCXvxbHMQXECD6TJmaa50HHh9bFh5FfFzaZQX8g5ZP1JLhcr8KmWtRfvyoLojwXbfqm
-PTsbfKZqWR0EAX379pWWZaG6/kLjcFcpMFEoICGpHmIyPIayZEPTMAzpcrnq3+0wj43iJFYHInsL
-WLYZJgJqQybvZxydlxyio60jLNx0gyD0WjVMWDaRsgYBefRce/sCT3BuTJnacAOgA6kEQhuLmHMv
-7SSzECJtst7GcZRcP2YSrsuik4/D4cDjSvFuWBa2PR9Mn2uRc1wy9iCwrSJEY3YCYinQAHXBEMUt
-/9xeWJ69TW1iZyeeRAFsxTpnPkwp4buBGU/7BqsWI8P3G8ZVR9xwE2bPST7MIMNWz0f5XzsV4e/F
-QbvWkux65Si1uChKmqabd3IeDrXEW9d0vV692xf8ZqSyYgpgT02AOJawYckabla7Kz+6l1sCYx2U
-UcgTiMKIpnliMY25eS311rYO6IUsZRS32jSzX7z1QRjGkTaT/oNxUt/1RDTz4SDEFBsTHkWhLmhO
-nXEtRLgFtCwzHY8HPcS6vtcTHCM7WEut624qHB75pWJT/scfP+h4rEVKnAqwx3bbuHUgqx0nhyyz
-x6FTiKFCwvvADe/Hu6fKZ7BjUsdTCDzlJbghyPxDBZGmGc0ilGLzWUddZmv3WME/Ta6VEebhcKAg
-jJWJiug44B/2wLRtihspj/qcnEM0eQeDOyxICU92fm5BcRCoLOiM5+aPCDNtefadqOt6ejwanVZZ
-FiMqHhtZbpmYMNwBRZ2IaJ4mut8fahy677uQgkiNci6XCy3LSi/CL4GtOcamODSLoqR4390tiEVa
-VZWUM6OW9IjucsQRvtFghBlHES3rSlnKpddzyR4GAS1PjDQXLpqowMb63sWinurFXgw9vAUmHQKb
-eOyoICC6Xnl8ZEEyK2JClDTAONt/60sfB/r4ePcimcFR4E0/eGlDFhmHeKqqqiewzAKLbj5u5/pd
-11NZEk3zTOEwUFHkVNcHlSPHkjeA8i4ShSH6b8tJgLwWbR7iy6ZxFHceFh1hpoxyeBxXD5Tb952m
-eaGua7Uys+w7TUaWf49Al34YtE2x5qiYHtgDhcEtxjsej7v+/dO8UJaltO+Lp3vHxrYpS2AiwlAF
-Gw3PHBMutHNg0eHPgyi0LLNOV6xHhPVuUA8IqU4sxsAj7uETtf0iNFyujCPBXBbT/s3aVttAXR5B
-rgafcD4Hl8tZNjq7FdV1omsLvz8gZ86jrNz//I//ojRL9cOgpIX/P/cqEa3bYkofSfSR3ngYNm9T
-gi/gSYrlFH5GjkErhlVREHJpDjMNa5zw3Cc/TwMsWAPTRqLJyDhZ/ZfEEbXd5L1IbCzEVmNDo3zy
-DTvJAzntC8Ehpmq1LOMQ0zBQ15gsy3T0Bd86bBoAskgdgq9+XddUVQcVDjnvQDdeRGAK2qimaeh2
-u2tVggWPDYt0Y9jCwbUXxhnc58ZPphKRUJ2N2YbhJAA4AxjWNC2t66ImKBYQ5ViyQUdWEALBaszm
-FHLbMn1yiLKb344zbTDLs7W4c6xCHL0TYvH7nzUkNo65dMdnK/KcWgGfgXvgtkfJ70xIIs03YPdj
-h12hXQTd167tHz9+Upom9PpaihhqMhkKibYbMGaFaApeE1vB1vSHQ61/N2siFsPQZF1G8L//9//c
-Uc4v80zDOHg9BPeyEfVDr7pt9PtQG6G3+L9FX+HG5EARUHwDBXyiiN1awzBSLjN03TjlsanYwTX8
-FJxp9fxEboFAZ81mi4GqoJxuPKQiLyiMIjUTxW1VFLmIPZzO2nIQwJo71AdaxbsAFQ0y7J+foQv5
-RK7gqOBhFAY0GSk1rL2GcdKF1Ha+A8/z8+XZdkGtxG1DKu209pHq2XmzoHVbqMgZB0HUNvwA8XuB
-2MNXARp5X1MvClJRqWlVKRLv6+1Gy7LQ4XCQvMORoihWTMK3fMMhH3qfHeIj56AUyAE+iKcCVwt8
-wPZeBQOgD6AwKwd72tadXr+cfFNg4wAAIABJREFUtDJhjCUxh88oB3eqAi42rQ2FkOYYkTwJiWkc
-Jx07g4I9ClOPqcQpXa5XXftEDAj2fU/H45GOxyMt80I/335SURR0PBz082Mtwfu/yHMetw6DXjTQ
-pAQU0CD6A7ynLOUxfHC9/rbzTDhUR1Jrqdy2Lb2+vnpaY4w14ohPIKCfzrfcvZzL5Upfv35RR16r
-94f3Gs9WmaCAvgsLgPPdvwn1k11mYcKICgEMszRNdTzFoaEjXa83+utf/6LEERvZ7URHpA7CTjLJ
-KsmPjw96Ob2IocTsudMi0ATjqkXn847Jd71e9flZTTyQ9XXdRLLM9GnccvaARFqxteC2ikRL/rH9
-7bZt9PHxQf/yL//8FCWWKFZj7drxc8C8y/Ocrter6PkXRZizlA+lZ7q4jYgDsWYcRjocOA14mSe6
-3e9SFR0ku7Hx9Cb2AICsFvbrim4bVyC0K89W5CjV398/6Pv3b58cpqwDERSex+ORpmnUGK4kien9
-/YNeXl68KghzeOt9uSwLVWVB67arurLrWur7gf72t7+yBiBNtT3G50D7neeZ4l+4vcMwob///T8p
-TVN6fT1Rntc0Dq2XVI22CjF5wLWwNrB+0HrhUtI2ezGmgX8W8ogYL2uhFEpAJm4fFr5MCijZ/t+W
-YPjv6NGDIKSyzETw0CtHGbxlB4bFGlcOA8k4ThSVRw/HmgZuP1LRk6s4x3i14wbAYmvbRok6jnS0
-6k2PHEGUp9a8U/UMBtu4Xm+eYalz/42EUryqFTYTUcZP7RFGQ3Y8a7n3znjCf28YVcZxTD9/vum8
-OstSTzZt26f4iebs3k9gpkCOM4/Fb3PqbOQ2V4Q5lUUhaTQLjdNd6eHbtnFOoIxcoU5LEt4IaD/h
-XKTsTEn3hUsvfPfQQizLSnmeGEk3UndjejStmtsCI0Hluq4r1VVJYZhQHC3eyNpKqJPYGZdYVisO
-z9msGd4vm7I+r9ebJ5+38lzGu3i0u20bVVUlNPaGbrcb/e1vf5PPOdPlevWi2q3pK/NwEgWp8Wyf
-nb7R8u47UYzACyugsH/AUUI/9952ZvlsZYy+ahI67zxPuuGdFJetmGc5rZ8XOv8dibIP4UNvc+xB
-c83gP1jwuAk88iAglb3aXD6L3qK3ShNOh7WEinGaqCxzk1w8GyLLqA8zjhOVsuKf+VncVeuAeGuX
-K+DrwwEQWp6B671jb5KCEty+CzviYv7+gcYxpaosqGk7baWgJEQFgPeGv5P/PEtVM9GCANMJJBIN
-iDvoyPvuwjlwGHZ9LxHetQeiQt/P2vtdD3/Wb4xKIc9SkSHLRGgTOq497IAl2EhxuAXjUJilTEbQ
-J6PznTMU2TZq2o7yfNUNjTVs21oO6CDFq6BezGWs7KqwWEd3WGPPFZoKkwx/AdbfaOkwieK4+kiD
-XG2VhJ9h8wJ4vzmMKo5jxaaAbQFgj7H5izzXcYzlE/PJsijDix1MQ8qyXDc1HgL72Tl98rNkM0ki
-DbgIlezCi+9Q15SkKf38+VNMPzMNrcDGQB+GDEPLCrRU5ChiZLUoCr5daP9To1CuSEhSWZDWOhmz
-ylTZa1kK0Gr0sv5A8bQbG1z1JGGtexRG+nmjMKBhXPXADcOIpnlUKTNKROX3h5Z8Rd53t4nO27bR
-7XbVeLUgCOjleKDrbZcw0Men719XlQJawDhsWTtOE23mgGmahi4XvnGzLBOW5CbMzkTJLPj89vYE
-Y47fD6+fKAyoaXqn4ZCpkoLD267qQVSZaDF8c5OI9i2g1QiT2rYTYBVZA7xJy7KibduNOYh7N/B8
-eHZmtll8qEC3fRc+hlPqDcOolSXo7kGw0jIvTz4XRMtijFyWhR6z02wgD2FZdmOiMyuIiwwPyNkx
-8rYVm1WnPrd6XdfR4/6goswp/vL6ymypNKW1abQUwwwVABgefF3XKsGF/591Ju06jtK2HxaUWNcf
-jp6QKM9z6oeBmrZVB5R13eh2v6vJ4v3xkEqFo5wgsHgGiywPIBWVXUCBZ4pgS22g7mw1NQnbLTIm
-IbNHj8VNaQkvm2S5T9Oko7RpXqjrB/rx44eSSzB+QfnOzL5RbpuN/vj4QWVVugBLUUTWRuGGPtm6
-x6CUzbJcVX7jONEshI84jhR7SKQ8t2V+lqUclilTCYwuq6rU3t+BjZkGp3DWPY8nWSG6ebcaDgOb
-6YjFiT8L8RZATqtBeQ5JsUo9EG4ADLsenehyuXr6DbQ4TDC7SUI1E5SemYGW7QmzU0zF7Awfwp00
-DZ8qkljbPahY0erZMbb1bZhnNmXBeL1pWu9ZLMtCI2jIZiqGdguf345+wX6cppHmOfcSsIKA6HA8
-MB8EdNTp8dAHDORy30kYXYOGdzB1eFXutDWNqKpSwQ7ndU86OoGtMT4gjEXyLKVOT1pGx7OkoFRe
-8jCMetAgdxCeeqPc4taIAuQcjCxRsj7bgS3L+icTi0gByUxcZaCkmk3OHghMIGhwWkzGTEMTdJnn
-hSz0jMYxMJ57jD2AQ7DvO6VZSl3b0ddvXw3Is3lKTRCesjRVQhbKWICJSZrqAsXYLgoDmmdnuAGp
-NDaQUy+uHIldV9piWJIYx39V6lMYhiGVRc6W6CbPDiWsLX2de02i3vRxnFAYhbStm1agFodCBWSl
-xsCKnvt0l1MR6cju9sSz53fvrN93E8P2PG6eZ0bkQRLChgSYyvLxRLgFjqWIdi0UFqIFVqFG9UG8
-RMfFRcEuVhaHsJs9oFjBcl5HgQfg4rtaPQ4mQeAsoKLN8oJi8LXxcBxXmU/waZ4pldub+7pB0O/O
-e1hYDEEQ0Cr5b9fbnemu2+opCJ2LbKiKP3uTsyCDZae//fY7/eUv3+h0OlEtuXM/39505omeHKXQ
-c5KspXsCRbb0ZjvPxcm+RpuqFu2N5Fucr9L+sLgCCy5OOGV2mltpJWKRHSdykE1edWVBoePxSPM8
-08vLKy3zSDcx3rD4SBzH9Hg8TERV5hFxur4n6nuv2nHJQ6tuEOQYnk4vlGWZUqgRplqUR9q2+VPF
-hMkExoPzPNMoVGhLB7csOugQLPKOtOIgIPrx44coSDfloyhbTsDR/YnjYct/HGC2J87ShGIRHmGG
-bpF8XDxsmjF5JC4ckGyAk6qGBL/OH2et1JaFD7u7TDfsRCaKInp7e6O//OUvOjlTebcp1zkct6I8
-S4nI187Y5KlWQHCAxFADguGpTlXm2bNGITMSbF5D277T4/Gg+M9UaFzGF15wJ060WVJxLPCHzVJX
-FWe7S8ACf9hAGUhA7HHyz3OnsmFnhLh7G7euK3p95SSadZnpLA4ySeLYic+RzZv5jHbkw5sxp7u4
-C6NEdDbRkbodzfNC48ToKlDz55EbQEqmsPZ0uZyV8IJSCyUmlGNAiLlfntVs83x+UJYJjXgeKYxi
-vf0x+nrOa3g5Msc+lQ1sLd3wTJxOfvdMK+ZlVTlsWRR6gADNH4ZGbyJbgtseX63TolgPTeYjLNp3
-4nDFyPNwONDlclZuAjZ+kpBKlCHhhevP7XaT5NzC8EEGHb09x9GN40ht11Pb9TpFieOIzueL4kvz
-PFMrAKSdellefpLEVOQFpUlK/epk6ofjQd2xGRjcNdcBgDUOPaT3WBeeRTz9JtMOBEGgMmRfq0B+
-cG/bqsLU3vwgFWEyAno52rJ5WbW1wXi8rkuKyyL35J/YFGVR0DS7P9A0s46f8OIReoi0nk3ah/P5
-orNrRnGdGy425jjN3uYFicZaWQGlZYluQl3/cKw32UDYJM8P1NqD42e9v7/r54de3AIkuHWswaRF
-aZ3sefEkmUREx+OB5rnwXF05y+/mWXbBkzBNE4mCDmjfNnNwMKDphFATe7qZWxAtRRxFdL3d6SFO
-vaAHA/EFcHW73eR9hPr954U9Bg51RXFSUJoOSr9GBqI94HGr2LEXwEc1qxThiv3vMG1BLDkYjmhl
-tm2jl5cXsQNjGjmj6pFyN7Duipzdl13oBk8BoC/ArY3LC8xFrInD4UC321VDZ4IgURwBTlTLsn6q
-VOCWhCp2XVdW1CUZRdGgNzXMRJ3lN+NSnEdZ0zyPhnPCFxi8/myLgT/PeMLiWe6B6m3zFTDpUnMe
-KfctM9bZ3ieCVTHLMM6LksaJFylLL/mk/e3337TEQEmC01fniQZouVwuKkApioLquqJlWalpWgmF
-jHX0Za2J8OVC4zjr22CH9Gga7Q9dEMksXmuJHihAOPn0TilNA6LdCUcQ+nmoK5qXVeiZIc1zoGVe
-aOzAYYuNHs56sD0Hn+57qkEnnEDLfm/TNFPbtlSWpUdjHYZRHWLiOKFoWVnJZyTEvAH5u9lQ0Xl2
-OnZUMAAyrZYBCwhzb4Sl4vlCznq93XUzwt/fsi0di85VQM8HLvj1zj1n0moKBw9GhIdDra67bftg
-3cE0U5L4FSBjLqTtVSrYjP27mral+/0muY+x9sr7TpI/2WubGYYhHY8vdDy+0LYuNM1MC7c6DNu2
-rOtG/dBTLpUS1iys087nd71t3QYe1CEaZDd2MUqIOTcPAYknFYW5qnM2OYqBmuJycvOm75q1CpzP
-gPW4rptGk4GvgurT4l5cAfFBUtcHillM4qyS8LC7LlHBArLXqqqmZZ4UuV5Xl3IKameepUK3jbT0
-fzautKorINdAM3Gzv3/ctNQBCQRknsejMXr1QF5i6CHkUG/dHw/a9tVTwRVlTdQ16gEAHjyMN1nd
-luttiSrGmqNYRRrSWGfhgaMsZmJKJr5zhUY4Wzk1FHx8szgsBhsIcVvbttHbzzcqypzKsvKANetS
-bDXlibEfY3DzqLc1+l1rMZUmMafzJgntu6tuAHbisN+2TceD2OxYsLjhbJDmbDQHkMxaPX3fd9Q0
-HZ1OLxL5HYt5hfNmaNqWoqdAF1Rvx+OLTlaCMKSAAiUZsZ+ePwKe55GyzGUaoA216Dp+b98PVNez
-SbMOdCScpSk1piXDBWRxqaqqtLobhlFve9zYaLsCCigMZw/byASzmqZRvSO5wpvUdr8ocvXPVEu3
-OJL8hVmNbXGgn88XHgHXXJHE1i6blUQZpVlGQcCGinG8UJZyeQ+qsKVC2sWaZynFSUnDOClYaH8B
-qXcediERsaY8TlIahruKKbBhl9mN4dIkplVuJxtEast1tB1YuKzIyqmqSr15r9eLWn7j5+D2xBwf
-6sKu68XsJBPwKFEWpANxOEw1Eedg9KE6KhSlZBQGtJmQSXtbA0fB3wPOhZ1H50Wu0muU+ejrrFIR
-G8RGVi/LKvHTmVqlO5s0wXhkRm/BUVexDFp6WuDWEltgYuH35Bt9vH9QWZXahgC4jGPmFvBtxKGj
-SRzr52aDi/apolm9cBBsyDQriGij+/2hmgjIaS3TkAlcHOJifxaqPDhFuZY49KTR+87chKFpNQQE
-z3NeVi9u/rlNxMibvf0mul459i0KI2W1ooJBrgNXcKX4ZnbKU4GxTZ6XtG9sZw5wnSvQ2Sf1CTkK
-7VSa8LOM7UwSHG42oeCF3ncdhWFNaRJTOwzad1nZJA6Crh9oE+DIctKfNycMQFGy9MNAJLFbAIyy
-LGdmnjEVBdUSVN9AXqY1M8HvY81BRUmc0On0Stu6eAva6haso00UJRrZBYqlzaJ7PB50udzo9fVF
-gSwQlkah70IyDUzFKsSAh9hEGfeiYvPyJ201YEtWVRVPQsQw02bbWxqzM5OcvYMG7U23bcpxwAJB
-u4J3aw84xErneaYzZ/uOtcSUmwh8BXx+PrhY7zFIpiK/4y9ejHsSx5TllaQsufeKVqlpW33/9u8f
-xkkXvJ2uwNTU8kVcCb+baO7QgN2xV7EiZSlNUq1skC6MFhGAn2VTgikI0BezfbBJ53mmL1++0On0
-QknKBChUNfhszzyIzISOam7F2Hu5f6hA7MQDTshYj6kcmE3zoBjKPCvssJziaZ4pk54YAFaepbTt
-uyb0WNqq3Yhc1vogxjg5yiZuArDMAAyhZOKxY0epsQ23Udno1VHyw2oc5qKQPM7zqGPKZwELXFMt
-t98FfWxebwj67Zcvr3QQemsjqKzln+/SFs3zTHEUq804LKQtB9+Kr+xhiY04TZNEj3EZ2na9Jt+g
-/bAecjCStLLf5wMZ3x2BrDZRyaLpduKBhftsDmoP0EfjIuFxC2ZpSmVVUV0fNB4bybh9PwjZiMeH
-DxEG2QgvZAPy4dvQ4VBrOc63diubNPO48W6s5yTfWZbqd7BVBaom9S2MI+r6WZ2ueMMuT8k67lC1
-uBEOvdv9oXiN5UDgWUIAlGWlRoDZz41n+vb2oSEpVwlqFTdflc4PIiBzhqiBF9b6bOjD7sZsix6j
-lLOjBqtoc1ZXIT0eiGXipNKP84eWjUTxJ9dY3CxlWaqvnY29gp1Uon27z36K88zjN0OYZC2sYeoB
-22WLogKYwfzU3kqWPAJN9rOqzi380Qsw4Zw2jn62Jfq277TK98ONBNkxj4EyfSmuCog8x2MrbrGU
-VhY8RTq+ZForcyHSrKDH4y7fcfEYjmq5JuMntGu+mMkdAE3TeNiLnaLAtAUH3vPY1s7r9ZCV38OC
-q8RT+hVFTlmWayDKvm/qI4DvjyqMiOjr169UlQWFcqg6DwG2cGeZLvMzYPHFfg6rEp7sAWbfsTWN
-WbedyiKnKY5Vrm1JRnZUCBs2Vw2FmnLV972hsu/eCBcGnaBzW4GRnT5VVUFfvrxKmlPDIaXbRjdZ
-07x2ZvVntGNB29ZaU1f8vn3fKfj3f/9/d7tx7cw3FLtviG2ut5uaemJxBgGJq04hC3xRFRfIItAf
-R1GoKjjLhLIe+GzQaUUYgWao//jjB72cTlRVlQI4uMHiOFHWGHT2WZZJf9UTUaA68s+eBYGWgnyD
-BXIqx4Z+G3l6ajL6AhxQ1idh21Z17kG8WZZl+sysRZXrN2NBuEM1jYS2nFuSVRiObt4chpFKQdMk
-pbZzYZnI+MN3hyEEpwFFNAwua36XcR407Ha6YDfMIunDaOGs/h6XAbcCiwacwNYKzxWbUBmKhm6M
-nwFjmqZp9fDMcx7vLfNM4zTq2liWhcqylIPe4kOboucMRs5eGMk4jjKhqYQMNevzhFEu3jdjLrGO
-Nnken3r8GWBB7qBwBwuCW5+9NRljspcTee5BcRxRVZYUJzndbmcqi5LCKKDb7a7rzrFgI90ruFSm
-aXbKv9glC8G7Ifj113/fIdN8TvolIrpcLvTlyxeKolBBpKIoVc6JGxkGC2AI4qa9Xq/07Rvnqz8e
-Dz0dYcbgypKJ47bKUllL27bR+Xym0+lEQRDQ+Xym4/FIr6+vqiN3kdKJGB+MnhHk+8eFXl9PHksM
-bEf4GNge7tkI8uPjg+pakFwBqKwJiWenLQpHRdjHkbquo7/97a+0w9BTKgObHPOMl3C/x9pxfn5f
-lcCEXxgrAYXHiMqSoTiKjIM/fYIQSYzaoJMRtEi4PaD1uF6vwv0PlCRm+Qzcd/pluEWdf/vtd3p9
-fVXQ1YpnULEBVFXbMeN7//PnG/3lL9917LjvO/3xxw86HGqq61q9ALHpt23TidG2bdQ8HvT161eN
-oge4CL5E23b0/fs3Korc+OVFqnK8Xm/0/fs3D1vBZ8YzR1WG6s3exOfzmf75n/6mVvGImEOLDRfu
-sixoWfx9uO873aTst2vStjqwCs+ynF2C910BP/aDONP3798U+wCXQr0b2cW21EVhbZh2b9Qza4nI
-Wee5fnkXOlkqBx8v0aHxkXAABkUln9F7fHkAFpauSyRyziKnMEw8vCGREeI//vErvbwcqSgKncNi
-zGONLc/nC9V1SWn64hGg7KiR8wI+aJpGp8+WktSyB11O4ua5F+OfU9EuXB4PtQ+zTrT4TCAluZbC
-PgNSQ0rrAGR15Tagwv67+/0uY8BYOepN03qtS9/P3ndZxH4cd4G9jVB58Kw90pucJasBvX+ctapA
-fDrIWn//+y/0ejrR129fNdHmeVIE+ioTnZiNl0i4BrgeLy9HqqpKPSIw+gpCvqTAEGUPQwZxATbi
-cFoWXj9fv36h0+mk3pOBxsxtytFPUTGJ8atNLE4MO/J6vevBhICbeV5oEuKP8vnlkEmSRDgMBZ1e
-TrRuzJthKjNfAAjpseAkTETQpmF0CpLUYFijTBdnj8VFzG9ddTBSjOSTZV1lbr+YkyXyNiGALXt6
-ObnvSn3fUVWWNMptjnhoeOWjl4WgAgvL4wjEsTrj2MMB6Oe67XS/X7yHwWwqLrOPx4NYfg0eGAmO
-N6cHlVRVNZVlJf3n7s3EUQIfDjVNU0qvpxNN82Ty+py5pg1VccEni3IS5mWh6+2uiDLKUAuUgdxh
-xUlt12u5bEvHyfgaWDooblSYWaIKw0gzy1IVVVlWG4BYkEdQlQGfgGkqemgEu2J23fW9jtoSIUKF
-oYuXz/NMq6fv37/R6+srHY+vdL1+KKaDw89uvtmwU6F1d8BgqmsGz6LrB6+qeh5j2jwJVGgYOxKF
-tIvuwbUJiY5HufKYNXkJxpvP7k1lWXDMeFlqC7ptu/osYi0DEM7SVPkmYRSKZd5Mh7qmnZimfH80
-9D13eZLLQkrk4fcVqJLSHv54lsPQU9t2niU6S/cXVCQ8o4aWOZIsc/izaa9gEGSM4FzMkkOCp3nS
-TZGlCfWit86yXHnm+05emW/FPIOwvOxt9vb2psYIll8OMhDmq0FAVJYHZ/P9JJ20iarcv4WekYal
-ECdxRKfTC/fEaSE5e74MGBMNu7ieNzb7EPKIL01cfl1R5Fr6ohTGz2jbht7ePuj7969aRdk2AUo1
-LFLYZmHECI5GEsNaPVVffAsMwmFH8xyj2COxLMLEAwqN6ZBNRLKpO8M4cpLP4ag5djAV7fqeTqeT
-kFtSfXeoSpYlNO69kaEcs+9BnmdC4d0U/bc2XM9GoTbS3bIV7eZwY+PHp8kGRmo3YUliTWYZawBC
-eVa25YI+wEqRJwkn4Qsw9eLqpnkSnCqgbd2o7XrlCQALyLKUysLlFNzvdyXmcUDMoGNq247i0mua
-htI0lTWffbKai/O8pJ8/f+jsHZs+CAI2tZDeHcgwgw5u/l0UuSdYwIFgFWjolfp+4BjjdaVtIwVb
-XEILtyGb9LXn80VkwKDYxt6MEyUp05fZ13DoG6Uew+DRvlT06X0/eDJYp6iK1MaKU1Ua9cKDOSQb
-jey6CS1KbmfoGA2qVFN8AfkwzKUn9XPu+IbI6XR6oS9fvtD7+4eU8ZnOtXGgYgwIWTV/9sGEg+6a
-DIM/a6WoYRhRHLrE22eXZUjD88w5Mlk6KjzsIPBidmDuouFFjm1DTPthoEfzi7Y9yDZYV9dTszmq
-m7mjciyLXEBkF76SpCmNQ0+jSflJ4kis0PzqrO87TU4GVmFLZxfCkSsL0V4yqMTshrMHB4fp9jRe
-r7I3Cg1+5cM61vBT3kuk5jWjTNvshYwxKqs8B3XPxt/XmkkAWjc7ZWGNylGp+drai+3Yoa4o3jcX
-eng4HBRI0/GBQX0R/vA8KdgEebRCGJRlYPXxghmo7XrxulufmGo+9sAHUkpZltLXr1+ZyprXtO83
-vfHwEh+Ph24+lPrOGYXBDsR/o+R1c303ejmfz+oZB00BEGwcEGqpPY0eG9FWGja0YjOfMRV/gXVd
-6Xw+s3dCFunGBc02iiIB/moqik5vj+dKIFFPeRL0O6M4HvU53MSBF+0T4tjQ+1vqclmWVBa5LjTL
-CUCmnTtUZ81q2DbrDUEmoXfWDeaoyRFtu0+1xWjueV6tkwdlj/r2dLxRFhqbSTeUbVvB/cfF5WTd
-bGbTSvu6rIsXoYbSGoKaRRKLrGrV+hJY0ByVLycuFTptgf6e3ZPJu6k5A6JTS3F+j4boI99L2bZ5
-zpOLwmVRBAEp5mUrRK44YEOeEdFGTdNqgAkRUdy0nQaBZBlbEeFWnJdQNzWPYbgEhyXSvpNyu7ll
-SP7UFhzCiqIoVOFl46XtL9wW4zhpRFRVVTSOA63rzOWSWFelCRN9wB9I00QNPLHowOirqloXnuUD
-uLLaZys6FyTDIgsDGmUhlWWli3qQReymKe4gwmZDpYJFxfTiUBeXsinl4GHzlItz5xEn5X4Y1JwS
-txLMQ3/77VfdzOq01Pu8Aoz5rOlEkqTMyjQJuu5wDD01GZKY3UEbUZalHN/Vdfr7bWp0fTh47ss4
-TLFUbDTdsiw0S+la17WWvrOkOdlJFYd7DvpssYFddZFp2c9+Cy9UFDlFcUJRNHmViXMA4mczjiMd
-j0dti9iRulXxja0q3Y1uqLZpoocJREtFUXqaA0fISnSyAhIPKsJxHKnrB9r3je73Vh25AIjatWwr
-WHhO6KRpWyQEJvBwphj215gB+84poT6UYRh1pgi3G7Cinum+z1lzAOnSNPMSVNgfb/IeJjThKC2n
-aab7/a48fizwJGE64yBppwiYBKnHqp9AOsH4cpSRputnF01EIiL+OfOiggxLybR+d0z+CbXNgUrN
-ft9pmtR9BrgH+v5UTnrQqcGTRxkLy7Vt26gfBiqkP+z6gZqmobIsqK4qCYmIVD+Pfn3bNjoeDnLI
-bNq3Q7f+HIgyTrNyOVDWJybzYVCZcurbdIl3oevVc12YzDqbNJHHLlIrabU2XLi53RTBxz/wOYCk
-53nmefIx94HX17qstMarp4mIo1kUnJtnU4aLwFZz87LoJAb8E57bO40EgMFWEHyMFB+Ph2YjctKS
-W3OomC3jkttYoih07RWIWVVVKeaT5xmFsoca4ZWgesShgMuGzWgYswNPgttfXqsxynx7EqrkNww8
-zznf5JNvhevlSseXAx0PR20ZbP4fSqXUKJtgwrk/AYCWAQU0H6CUPbk0mnt2yOq2cwQyPnuR5/T2
-/kb3+52+ffvGnn/TpASPbVuJyJf1ogybplFtwcZpEpxj/1NP+VRUcuM4UV3X2vvxLR952gN7uO47
-aaoL97n+QbM9CXKsuAfejIy4RzTPg3IB0oTps/vW07rynymrUm3ZbLURRaycQ5u2yiRIS+pl1RYG
-VHDb4jgLKtL+FIdxJ20vxTDQAAAgAElEQVRJmiZqeoIwWBzoOLB6cTBiTkJsIr6dAg+HNP+zLway
-/A0LUI7T7FHJnSMxWJLpp1IerUuec4T2NI26WfWmlooLzsKwlC8rngDgmSKbEs8OlnpN23nMPKwP
-XLD/+V9/pzRN6OXlhXv1w8Gb1CVpSrfbjeZl1SRtu09sqCvHii+0rp0qUK0GJU6TVIUIdhyHUhSn
-sL3p7aZha6RUFU4QSji02Uknd3KBncw8m0UrnSnIhl4LJSb3Mi4WGv29M01wiadBECg+gPSVNM3o
-UFe0bruCPfhvlh9g+28nS2YtgwItoc2940nAuq1K8uGTOKI0ccw89GN2mvIsjcYzBcJrLdqsIatV
-r4GIs9Oull4YWU3zwxzWfn4eDjIwBVF+owdmwCr2jEDA6YCS0LoXW/086xJCGmRcaE011bQ0TWk/
-HMSLv9J3AiCTLb5WLfu5FD94IC6X2rlGXmGaYgU/zzoIKATxbDXOzPhA2A2kwTXzqpMcG+pZFo46
-jLaWQ0xTCqNYHYVQ2SnF3bxDtAi+m/BKVVVQWVZ0ONSslhTeB3gKFoQ8X660bZuk/8ZGHr/rQfnc
-lmP9hmFI8TRPlKYJNSJvdKSPWHPMLWnFzmfZCkncaZKMfv3td2EKFk/ZbZHHDQgC8kIUAPJgfIO+
-qOtaatuODoeDdwPbcQ02Pl4e/AvyLKNGvNnzoqRxHGgYFk8E4ma+sfegmqah0TDr9ObXOT9LYymO
-aRTJMfp3nOJZllO/DtQL264oMo9/b2W8SvkUABKcAAfgcTkbhdxCIGGJNyinvF4uZ4+rDtSbc+MS
-VS7ag9byxsdxoLKsFOEHFdf6FzgX2+WTmxMswtB6WFPTeV70ZgURpapKSrNCDVSyjH0T1mXx0ngx
-igTOUBQ5zfMis+9VZ+O4oHBA4JbD5wGzEN/Boeb0KS9CjU23jYZxoDIqPdPNcdpUnAWpOtYJG8F0
-ymzlVqAxwi8/eCQ0akrEwJclYz5RxBVp1/caP2a9NKy6DzF2NreCKffhJz8OG8Yas4fbatDV2DPQ
-zIXv7CyWIw1vwAcBPgCABKQT5sfPCvygLLHiI8RE53kuCKULT1zXjOZ51QkC2hH4zgGHuN1uLu5Y
-Dq4kTSkSrjrGYLZ6sVMH9Ob4edqHpr40FvFnz8oubOCuW3WMhxgzzhgsPFEN2F1AladppG1LFBiL
-woimbVZ+ubV+RvWDZ8SbsdH35tuigwSUmxSkVp2CbTWCUVeWcmgLmGgIIIXYCgeTiklkk2+b8wBA
-eCU0H6g4gHbDg98i19u20WjyGgFqMXOOQeGPjw8JPDlqNdkqvZfX5o8//qDjy1EBa/THuHjefr5R
-nER0PL4YRtykwN08L3Q+nynPMwWO0Y7Ad89dhi501qUWbR6tmxV/2adIczt29LgjoHC3LW2Phx4s
-POWKdI0AG0GOQJJkNE2Nrg0bL24vOrw7BT7n2U8ndTpmPv3vjwd9NdFbz6GcFhdAr7ebnDjravpn
-aD+P8xzVlfEBdr5FOZMkGaXprGAMWgx8dk5gwQvkl9pJ4AXRrtRcWwrZlxSEIUWEG5UMbTYRAcvu
-jz6fkmid8CZRn/t9hxtNrv6KaDmGcdU+lzPhnIkGL7DNa0/QFtnSMctYP29HtmxiwkxKPG+Occ8/
-ORnhPY3T5vHjd3le1sDFWWGxqclCfmmJwwS3qs0dhFYBOBCYiFYOjctgnDavveSNG+vfjfdcVxVt
-20rdOHmJ1Pue0un1Vb53KUk6rn3r+oHSLKW6rj1WJiTVURTR9XoT6/Paq4hh0PGcyOPG5auW+vy9
-N6bGT7Pv27f4TFuMZlEtPKsrQQQDY7AoSlrmiebZ+mfMSkrCQe6b67pD3O6BbdsoRt+LHhjuoRas
-Qs8AooH7M5Hm5OF0RwmPkxeJvG5UGCufOs9zytJEhRJW0BEL/3uZZ7rfb+pahL7Gxj3j0AgtoScM
-aNucIurPpKrYUG9v7yp4sQxE9KdWP25/RhDQ0yyeb5l1WdRUMxaiyf1+Y4OSJFbU/5k4FYUBLSJk
-WleUqBv98suvlKYJHY9HXahoAyzFE+lN9kWD1BSok1LMstKw9uynbZxbbERPziMfM3A35oP/AlKg
-pmnWwA8+zCbPMMYdJqEe5FzZhd47sV4Ny+L8D+HDn+UVDUOjaDdMQGDEgtbSti7zwj/3cDhQXZUU
-xQkN4sk3yN8JIDLPc6qqyk16TIw8U6JHHc8CE+LyezJy7Yj6vqP740F5kcuFOn4i6li7cWdZNikZ
-DyNujKe3ddF22iUu+e0ksA3Gd0JPh+BAbM2QjL2eDbeNih2S+FMAg3U+wcaCkxD+OxMVEnp/f9eR
-GxY5UNayKChOYkoNmQXZ8RiVOeeWzsyPAw/wQT8/yMnLJ7YP6FgPOfsz7M/Ms0zNR20JZUt+mxOw
-LCvTbI3Ec1036tfBePqtkmKTa4+njC/1xxOyVRjrRnLfL6bjkU/+4/FAbdt5GgqU9tDM29Qg9Oe4
-6Yoi10N8WZZPibTcVsSew+zzd8e/04RowW9QGjP+kSmyzfiDk+fiZ7j4q0XB3izLtSQHY9Fy/lEy
-r+vFe+Z2LItJztA3VFUl/fz5RvM8eRfMo2m1VC6K3LtQMB57PB56mWGT2TbueDxSLhJoG9iJzQ/n
-K0b+E801fKYbWwZf27aaLsXy6pCapnHkpm2nUSY5fzaVspUpAkO8oFNTUSrP49/+7X/ttlwA+GMf
-CuvaY5NJv3txzsAB6rqiLE2p6wflpWNBY7HwREFy7CUSjMEcLl8fzUM2JGvukQ67rove8vdHo6AJ
-3GWg/OM2Bv3Y6gGWIBjlYjRCtNP5zF7+X15fKYojOp/PT38/qZ7ejv+sjPdZOYnMeD8JNlLgatLS
-0znWMOjZ6+ltF8myLHQ8HChOCuq7uwCo/GwYCXeR01nKzLdH81DvvudxJPwJYqGu+od7LFTcWemm
-wGk4ZTjT5xxF7DoMwo2jGyeaSY9NwSXq5t3K0MzjgMLBAQMWPHOYsbDPIpxuQ61M+r4XvCNWXTzU
-lPadYN26yyvSTEQ3/eqVVOZcsCNPeosqKc8zattenYdLSYVCL98ZAPhyuSoxDWnUzrI80F6dbcQz
-xb3Q2o2iRIQewnomILAUtGabe8nfLTA+FqTfIwwjCn755V93WBKDJgo2ExHRx8eZ6rpSIosl7tg0
-2WmaqCoLJucMnc5U7/c7vby8aBjFx8eHot2WL+DP+WMxILnT7XYTP4JIZ7CX61VBv/v9Rn030OF4
-MCYZDLSN00wfHx90Op20UgD5Asq5UXzoUflAOsu5arPq4a3pJgt2Wu35rY2VjYDuupbGcRK56fbJ
-Yssh0pEcnP2TQUhEl8uVqqr0BEaWdo0+1TrbIMyEiOj33/+gf/qnvyk5CDe7fX//t18sxHqnv/71
-L+wJKTRui5jbNbAYBB+f53K50svLUW91O33Bn4Nyzh7YuDXf3z/om8iH7Qx7WRbK0kTjuoFBOQLS
-pH4Ir6+vHrHKkqAcxrJ4YR51XdEyL/T2/i6tl2+ECvu1rmuV+4AwXWRewOru+7dvOl5FVHmSJJKS
-PX/y/cuLkqZxpPvjrn4FqLAsC9G+BxixgGiHdXq5XOh0OnmXlTuAYm4B3t/eKJVsMpgPnM9nDeZU
-FNU47VgzyEI28zjNCgA1TcOMJQmGWDfedDDXKIpcdelAOVEKssVX5M3OcWv0MoLD5ACuNLDHGqXf
-n4wVNT6nFeugFMd/R6Amxk3W/NKmxthN+8wBf+7DbAyU7W/tBkGVNCBqPHGjJSxQbHQAs70cFGma
-0uPxEKZjIfTOzpt02IWCgxZqzqaZvLLRMvXsYYyk4yRZFPNwN3ggZi+Ntna+B97uTQKQP1GWpU4V
-bArvuq4qJbbAMdolbII0TSmQdgSbKQjZtg4VFRyb933X1B0cCNy2MrYAsRUSqaMoomVetIKyORWP
-x0P8MwKT75ApKw/Vm+3xB3GIRvoP9Aicc7B6beXt/lDTXBw41mkZbTSLh2LVWwAMZiWvc3aGR6TF
-sKyALc7znL58/cre9dWBiDZajC8++i78n0tkHfXh32XMZvsQ2IxjxIhEFR7VMZj07MNuqaY46TC/
-tlruPwtCqKoDrctIwzip1TQCRz7eP+hwPEhkM4/Ftn2XwMxNOeiVGKPA1WjfN42WglYeNwRukQQ+
-+ZvLEwSinmUZ0U5UlaWSrWxLYvkVuqDGSauSHz9+Utu29PJy/GS2CtLJLIAbBFT25bqqKRHGIGMt
-7x9npVNjjo7ZOHAfkHBmUarhpmq7XoVVfBjsEn02UF0fKEtTuj/unruwxWJ4Zl1oRj1u3kZav+Ph
-SHGS6iSq7wfVAABvQBmMCDEr+0Zcl6sUZv09aZrS4VBrIrLNt0QQqnIdloXu95uyF/HvwVYEs5Kt
-uXNaVk6XxgHlftbmAdb7zlHlaK8sxsEuz0RxnAtBaeU2a3N4x/1+k4kXsxE/Pj480NIBfrFHlLOV
-GQ75LE15CoBZYhAkdLn80MXDXyb20mDwC+msz+aSDFqEyuqKQj/zD+O+KBo/AYvY3FEYSHTS6s1N
-8zzTRYwFA9FD1z0kGvqiL4lfLttSBwHR8fiiopd5WWkxQNI8T4QoPHcohYpQYzQH0A09L4Ava6Ht
-YsW5F4Wdta0C7Jjv2fMen72qKrVx6vqefvvtd6rEXz/Pc4qTlIhaZSV2XasjOTuHDqTPfXZggqkF
-7N2tao0JNKui93bsicpwmp3xSVXVSu6JpSfGoW1pw5gKAPTVkl+4Cpx/1xhiFwfHcIu6acbDMi/0
-aBoF/lDio8VDqe/nJEbaimZZrmV1XdcKSFv77TTNxHbeYTxZlol/ZGQOBF7nUFzCWSswN7djxybq
-WzgaUBCHI55nmrAOJgr5Gby9vYvsvdQ9ApesJOEwn/ePDzMFIs8l+HkUj2o6hpqKSSutxwfo+oH6
-flQjDKLUEyjAvAAWWrAnUinjNFM/9BSEpB/kuVKwozfoD9j+adITEwsJBhcoj+a5p9MpE9YbHyzI
-u0NQBFEgJ2RJeV47Zx4htDg+PRMtkJVo6bjOHHN1dtdSCdn+EZsLzycIAjVOGcUsA9gATnGM7jC2
-tO1FXVe0rRuPvcZRb8+qLPjzz5PncXg8vnDUej945T9AWCu44sOWFziosGg9tm1S8wt2tEm118Yh
-CAdi5zocSLXX6SjQGlDY4A3NOxB+AFKA1pW1DHbW3os8GRHy8OnD76nrWhOQ4BC975v6BfgGLrNx
-Nx682PplXWgRoBlhsDrVkedptfjLslBdVdQPg1Yibvw5e20rcx9mNWqBzThGt5As88GaCTYwqRgJ
-lQq8GlGxMIuXHZHjJFOw0K5FZhDuSmAbx0Gt6ZZlodiaOdhMus3w3bGpAayhtMHCg9oNp2cQhhSF
-cNoJVOgCAOhZhWYR6mkalVQDFSK0zbOUmvgCnKle0Y8fP9iBtSgEe8gpLwJ6PFyJd7lc//+2vmxH
-jmvZLnIeq6q7SUp6uv//M36zDRgwYPvcI4pkT1WZlfPkh4gVO3bxChDOla7YXZW5h4gVa6CiYLWa
-jcdS8EyCOuE954DJwJhjpHpz7UIzBtvvEbxTmujMCyNNE+1tgfSmSayhIWgHcCAhn2EYB3p7+0lx
-HNP5fKaqLKgoaxo/P9Trzoq3WOmXePx4NjKZvYUB5yEs1Edxihv9kurRgSTjszmMgAFMeD+iAovC
-QP87fsaFRs/Ny2w2g3M3Yg67s3pXcs1+KNJ9u900VDQKA4oTdt5xNGa+9eFOBX0IqqxQvAOtbwR6
-fRsaY29S7AEen+YSP55QKBZtiDiDrgXPDyxUvqkTbSXBh0EliA3JHICAShnZYv05HIi9CcfJCeH6
-YWCZuOyZSnIo122lt9c3yvNchWogBKE1iANx4HlkN4HvPS8LVVIRpFlG08yxzXmeUZqk9CY9SJIk
-HNUchmo6wBv7cEi3mZnD8++RocalUORSgLNU883tBIKVZCERceAjSmWo7sahlxBNdlzFS8GNbTct
-qJywKHMhEZFWIIhHRyAKTxCcb2Ep7i+WXFPkOX1+fjrLL6FWJ0mibMFfr28q6+VEnENJVnyzOGQ9
-TfkQpP6uQJrlqC8r0XGsv4FBeCY+0SrWlm6SpBqAojjsl5VkbLkKsWVSMg7Ay2EYtZSGxRqAMPA5
-8P6tjySAVsSfoQTO85LmadDbVunMKYvWMLas65pOpzMNQy95FbNcDCkVRazSb0R3p2mqACaqLoyR
-IfwBaGsNVNM00/gvHIZII5pNCMs8M4CM4A4w84qioNPpRJczq2UboffisM2yTIxuI/XpgxsRWlhc
-ytu2USu8AJuP+Gimcr3x5GpZVqpPJzqdTlQWObVisQ5S377vFA/DQNM0id449man9odO86J9jQVY
-EAi6H4dok39XH63rotxlawTBikOfugiDC8Q1P7rGQtEFO7FhYGJEIT0xAJo0y9Q0Y5pGXbgBBVp+
-WcYVnGQdKBd64zKb84by7DH7zbrKsCPtrJ83DDez+FeaRo504lsx09ElUaojHQipoPzDAl4kbAUm
-LZimuECI1cv9c24zkUegQdUXBAG9vb3Tly/PVNcV38rr7x72PO7iXvnnz1+q259nh4TjZum6nsZo
-0mw9EMBg5x5FvtstiGdddzc3XqiGl9j4jq3HDjcuLcrP4mvbRpV+HDsWSas3eGI3IO0WPMWNjtKd
-jU8Pz5cAVQW4C5huVdWFjmNVv0z9XXFMi5CycLjhUA7CkA46TCsc6Wd/NM6F+IczKHn+//iejoPE
-xi9XA9x5GtTOzhqhxDChYPeYnsZxUjolHHGwqGyFYI03gjCkPMmIqFfE1sZEn89nimMyllqrOtHY
-AwNmpGAtQW+NESNKniBgZxxWfi16esIOaxhHHb1gYeIEtR6BKDvxO/FSgOTGcaSpRQgOQRvwSDCy
-M3wVf8jPg3iKk5acFTZosHmWURTHdGsax4/30n0iapqeNvkeeA9vb+/0x7evv4V52u+WiveCCqmE
-oDIMvd7YYRjS0xPHZmeZ88e3laCCWduq5TyYdKBaR2GgJqN45nGcKE183ze5jRMJMXHuR0kceQck
-t4srTfNEURxq6cqBLVyNdV2vFFxQxyGUQYXiOC4HHcfsKT+jMKJ9nzwg1ordLA3a5gvadiaKInp9
-fWWuSBjQugyi95+FRu8SltEOaZstrtZdd6eyrLyQGRxMjyxFF6zKgh8kOjvQm9SgpKpKut0a6ro7
-9X1PZcm+EPfdTbbi4yC6nE+UF6Xw7EN1IeXbwW8NsEFsvziOkz60MAzp+/fv9PR0UXUe5tthGNFB
-h3eYzMq35/4S7r74kvCIH4bRpPG6+S9uufu9pePINEyirvnkcyzDSEhKn6r+Au0TM3SXWsz/++vX
-By3LSqVUR2wK4Y9UUDrbxGO40yzmZLa6eZTJQVCoicq96/SgtaSjpmk1tAMvzY1zmJyDTWhRd9wa
-wzgSBSSjxYySJFUJLjQU9iYOgtjLGcD3YUBuoG3jkExgR3EU0RZt+r6gznNBqKsy9IIg8SYC+D3W
-UxFzeDD+cCNic6r3QBhSGB7KzMM7ZTJbSPseeenKj8IjmHuijHbpTqtwK0JRA4Ye3XxZFmGPFtxy
-bquOrcdpVkNa58UXK72aPSAz41SVCVg+6edjNyk3draXDExFrKCL7fU3SpJCVbho/eBIvG2bp46E
-bfy27RRC5z5N3G8WwmhC+YEZqi0zlESgZZQLTCQiulwu9Pz0ROfzxZtHTyIOefQLxGjJOgPjxufo
-p83zKcAhBB4AWFg4kYsi57FUWTg0dz9ongbPYAOsP2u4gb9Z6JIqeISDoipLURt2+kCHoVc6Lls/
-zaaCCvU5OtZW5H33LHWuuwDmEPMM8BATlzhyM+myrDgsRW4P+zMBMMFBBxvUxmRlKWsMMmHojeNI
-TfPp2YBx2d6KsGfyTGHHaabrraFlYaS6aVtPiHS93pRKjBYGEWrTPOsYEO/VypLDB1DVJRhPWl7j
-f9HT42LhXt0J2oBZIJLNHsbOGizWOX6eZ1SWlYC0TjHIDEM2q4Xv4jwvdDqd6Hw+06mu9Oej9QJz
-8v3jXSYdktAklXUcR0KM44wCDRM1hjDOWIQrnziKDY6yUFXVVNcVRUK6G4aB+r5TkhF+zjRNdL01
-1PcDdd2ddTccxcVjB6voAoPKItQWcQbfGL39cTCqPI4TnU41ZXlBYZi7xe85szr6L9/QMZVFQeu6
-sGhCWgTnXLMakUWsPgPguGOysO87lQVbOWVZSlGceL9vWXbtN7M0UXZYUTDwtCxuHAZuxDRx7hw7
-s7CxCXr8ssg1Ex4jnba9C+Ox1s8OH3Z2Oc4VRQedFCWvTY3FYscBDbYXRk7gYrRtS9+//0MvLy/a
-N6JPdovQhXPEiaPiBmHIvaEAVugvozAimri9slz8OGbqc12V9Pr2rmlOiUwz3CTCiaw4GIQR7Vla
-A2s6Yr0Z8J6YGbl5BBqwH3GgYgJlDzwNTJX5d5axYxDkxJZ1aNci+zdEoptI1Kuf28BE3xc8Fooi
-p7KsPE5H13UabedlC+674hCoVrdtU0dmV0nePHPSXYhBu/z5aRo1OgwTBFR1cRxJroCLbUuSRMag
-yYPYyxnmlkVBMQgFlheOB4HFA6ME67RikXu1IpKc9zzPaRoH6voP6rpOiSsOLMMEINY8OSTvuJ5t
-9/ps3KDOwivxePAurWhX4Qq//FhZiy5HkNF0lwPX6yzcGjWGQUA/fnynaRrYrWY/9MYoipLSLKNt
-d/7xbMyQ6CK3C7uuK7XEQqqy9XnHS8mFiuwCPnjisAQO2OO0nkxn+7zouF2a58HDM2ye3cfnp+oa
-MHfn22RRMtQwkOFAREJIKimU70BEFCeZ4kSI3MbixqQIU4tCJkQYQ1r672OOvcVgrPsv9BUYpx77
-Tu298xY1Pzvpj4UghYg1cEQsyDcJRgTq8mFakyAgZT9yRFikF50r1Tttu6y67v39nc7nM9VVRes6
-qd8mgljSjNtZ66tgGaKguccRtzwANyHqgmYCOAT2FVpISwCLBd9yFvkOP2IwN6O4vXeeyyuAKQuO
-hWr8kHr6d3f7Hyr2ONU1pRKJhDKe04UTRZatPhkgCYglruRDT9pT09wUCziO+DdvPTj4zvMikwHe
-lFikAArRq6VpQm3b6s9M00ymCTvd7634zaVizBmKZ35BvTDAmOHHefWsREvF+7+X6qOk4+CoNLDG
-cBLHSaolO0pstFBpyuIQFaRUFW3r5nEl8L2qqqQkySgMRBeQFYzhjKMyAkHlthUXHzopvb290bbt
-dDrVv01hrFVYIoQujBXTNKUoZD386VQrW049BYSIYo1F7Vh4ErbeOB6/aSegILVcen5H3KrlGdNf
-V3FvQvvHMWoHrRtbhY1j77nkgmgF5p016USM3LJuEjYKnUhsotY3r2W1LWnTNAKGsuX96XSSkNDY
-0yLANGRe+FmschHaKZgble4URbz2kpirsn3P5QBhsR1MSvFMxn1SXIt1DqRRcI8GIYgUvzUNxegx
-YJ0FExAswnmedP7+aCxoT2vt07aVhtuovQs70hQUJynduzfjAehYUdDOW8Tz/e2dnp6fKIpilVle
-zidaxfcMC2UcRxNX3eq/54Ua0LatVJYnj/xgJc5wH8JEIsuYNFGWJc0zT0SYaZXQ0feejhtlOHp9
-jpFmk8q+l7wF4/bLQphWUe80K+jYVxWMoLy1Tkr90NNz/uwZVqL3DCjQQxXjM4ww8TzhqrSsDASl
-SUyx3NZ1XVNRcHuDUjPLElVKgq2XZplWhOM4anoO99+9d4PNi2/hbf/q+06TeSzCrTPu9k77vqml
-GqPou7YWy7J4IiEEguJnWYYd9CrL4kxKbrebRKVBP0GaYoSR6zwvRGYM+7jmXfpxJKlVhW72XpKv
-mCjE5ChImq1234agAqex1Glen7AG6ymBlmMNaT96WhaXZN2JfBnVK8aMID3Bmg/mLcBjlpVl18H/
-/t///eBEmEFv8TTlLDmejfsSTGeuseupzV/OIcagI1p+/OfnBxEd4sUWeiIJTBss57zvB/EXyKjr
-O539juMkXOvFhEnC0nuRwBCWiVZVKSmts/RKsVYu3A7EVOQF3Zqb6sjneaJKhDIcShnQz5+vdDpV
-Oi0AQDqOA0URS0cTCQJF69APo/q3z8uitwhcjQCGOTuqWG2roigUjr47tDBKA9sLfx4oOI9fQwX5
-KnFr7rq76sFxOKCsrqqS0jSl6/VKURTRzx8/6fL0RE+Xi1pXQfuPnh5MQ6UFRzEN4uX3//7fv+jp
-6aIb7NEDAii4ajHWxbO9AuBs/xv4HhAd9Pff36mu2SbbEccCr120Gw0tZRhGAq5yqGlVVupDYac0
-TEmePJcjYDVgrfJEIyGiQyLCYzrVJ07nUV0FG5DkWUqf15t6Rtpy/9FvwsfUdk8qjyph21bde/he
-APeOY5d2eudE6jihYRxkJBs7Y1QJlQFuE7y///uwNtzWZ7zIc/r56xfVdU1Z6sQL+BIofzGbtHpu
-nO6fn5/08vKiWMDpdKZlmbxZMxHR6+sbPT2dPX/8p6cLNU1PRJvHwXZe6k55V5WFfr48y6i931Wc
-xL2jC2aEDZl62MumA8BmqZzfv/9DZVnQy8sLVWVBd1EM2Tipqio9x1f0fHmW0q9fr1RIK2JFGdAL
-4LZ/zFxAFfPvf/+bXl5e1JAFno12BAknXPTCoCmv60avr2/0119/eqnEaIlwQKHtQIhFVdV0vX5S
-GIZ0u93o+flZD2YWPpEHAONz3243qutaOfJd19H1eqNv377qhq3KQqWz+MzwGsBzq6uSjoPo1jTU
-ti29vLzQsizUdXe6XJ7odDpT2zb6XaHJtyM/OAsNw0B//vmHrrc0iSkvSmqaxhu5ProeAdv4+fMn
-ffv2TfwFGDDGhAVtSBAEur4zGc1htHi9Xunr169cwaybly6Nzw/WKNOpBy9/4fPzSs/PT1QWuTgO
-bwpiWtWhdXcGc7nZ1KwAACAASURBVHYSP4tv375SHMXawkLAtm3iCWhVYvwhZ411Wk1+nP3A1tQS
-vTMCN5h1l3p9K2f7ZWKSMHsedlEUiRd6SXle0sfHmzin9HS9MtXYWY3vdL8Pehti0YyC9t7vrfbT
-qu2Wf4b+YNtjJajg4X1+fiqFld15enV94Ujrs/jhtbrRQGiJk4zmafCYjeu60n1d6e39nb7KwmG6
-qJsDp2nqub5YeTSAoKqqFRyK40gi3H1cAHHPCBCFwGcSyy0bwwaSkA0kxYK8XCQ6K+LvcL1eNS0K
-ZS8mRpb3gfbkcmGn3Syv6CDnZov3kKapbHQ7n3dlPPwgPj5nLVVZjAP6r/j5RYnO/XEJ2FQquyHa
-tqW6rrXl5Pfe6YUHgI9xmEXFNQcdxpk4Vh4A8iLw+6zEFuNmm8cQBE7gNi+rYim2QsYzsjRyq5jc
-910PSFQFsB2zlzJXgIkGw+J9D8OoLQurHytto2NsbivSYBDDBTrYTYQP6rwAJ47lkrLPkkBshgD6
-7kcLcn2wgpBD8IAS0k0mNp1KQKr5GCqZxBFVVa1l8+12o2EY6du3r96isFhAksQ62y7Lig+pMNID
-AOypfd/oev3wDCtd1l2nZZ0FYngMVqjfPg7bJInV+51LsU3BLGvNFga8KJ+eLpqPCEospi82Bhtz
-cfgJpCnzGDAFwc2Im8tmyjMzsOJsyLWXQ7miMIxkHDorJZfTckiNQbG54Q0ZBJ9iEsMb+eX5mUNE
-s4L2vdG1g3J2Fo99EIZ6b5w1Ul3XrLYTlRwcdaxRS5HntAnibx2pi4J1FiBcIbClbe/0n//5b/rr
-rz91ps8WWruyOhfj5KymKcaAExMNGKnkWUbrZuzm05TWZaVdSEeWcpwmsWesYqPO4CKNyZvv8OuE
-QYGOyRexVgs8+jrwGkzpMEJEZFsYhhSjjED0lE1htWmsTredKUVXUcv9UI+5IIyJiOef4Jnb+CSM
-JWwqDk7Pddvo7f0f7dWRac/jjoziKJKXz1OLqixVgIPPYYGlLMsEJMxVEosMA/egdjE/Sekk8WZt
-29DpVCvXehhH6t479YmzYZko2UFA4hLL6uc5XwC25VmaErIYenE+yjJOk8G4y96czlO/oziKPTah
-deWxwKaaski2H1oaqxm3IyE+tEa9OSx6Tgepdt7y7i27zrYuYMiF8lnb9i5S5ROFIZfK0A/EcUJV
-VeqFA/CZBTKFqulYb8+3aD8MCnRhIjULqciCYxY0PYjn97emoSiK6O3tncIwpK9fv9DLyzMVRSkA
-YaKALo+TU8/W3kXIxXpwWf3BIiAcRuLwqQRmZEeRdjPbS27bNvof/+f/0rdvX9Vnomlu0mrWjigl
-ZimogJhvM6utH8am8PTAGHFZVpVTp2nK2YA4kcbJpfKwtJPdU97f3qkoXR+NRYMHDS963GD2xPrX
-v/6TSF4A3xKx3jqgAXOJn1NAriqwtl4oV4/YF0Z8Xq88AxcKJE48/myL/t9xFNFMi24QOABhfDnP
-E1VVTfd7Sx8fHxTHMV0uF15g0yzxZ4mCKM4Hzy066+uvVE2xbGKLp5nyjDd/1/fqVHscB318fKrL
-kHW5VZWf8CZA0HosdSHDXlaeLgAMi+NE59BZmqpmHNUeo9S7cAkqnVNjbMdt4EBt2/5mjwbQCuNi
-+NGx/VZvWImhHpp933n07eMgYbxFHvfeXkZsgTZCkaaXCP4CWcpSobHxYO46jhNdrze9lc/nM3Mz
-qpLipCaiXScFqAQY0HbBLPf73QPDkbBk2bGgzWOS8RhGg7W877tOS+y/w2Hy/PxEZVnSqa6o70cq
-y1wFRwhmcQ7XqY7Y55mt6kFk4vfBz/gq1nHA62A3HmP0MRn/du7vkVIbS6+fa4QYghb4YezKInyM
-IGLN9pkulycvlcQZZ7SevBQZhCAyYJEDgNn31FuEzkfAtRUw0ET1wWKWXeWtQeCIJSidrC4AhB2U
-lNM8U32qlT8Q2FSgB+WjjYnG3Bf0W+Ark+jfmdXFt+g8zWaaQl4CEJfakTHdWD2gENXHsrpMRatM
-JAoUz/n+zz8S5ZZ7ixeTG0x77XdCdXi9XtXM1foL2nHbSZKIQYW2N1wYMAiGA4CJMsvDBgG4OosT
-b/SbSak6Egkaz6M45mns+2Y8KTt1YrbtZp5nSvqZ5pne3v+lqUfYHCBQsQ/hQHeR0drR6mP7CVGS
-DVnBO7cXosXTgiCgv//+m6qqpPP5os/q69cvEj9fUBT9YjlyGFKWlRTQoCpFG2uGUh8t7LZvimts
-++EpQ5lZuVCWha4CsNn0Lss+pDRLmR4peXe4RZd18ySRlvkGeSj03HzSFtR1NwqDgNaVb6i6Psl4
-r5RxFUkLsj+QL1zv5IwznMsu3GIgcOgEqYdy0Oapg/GHMs2ewkWeUyN+8IUsdOsptywrte1dyzCo
-sIDGW2AH5hDsBFRoIAgQ+HnmCco0TZRLdPnlcqFefN+tTz/EWbFEioGZaf3dePPExjuukUxFJ5nF
-5o/jiMkvpgqxhqO4Ce0ti3/Xi+koi7YC9a2HytEFnbBasRffPBcswpuFw2D4d5wk6Rjy7UdpLlKl
-USlAHTrNzsPgoEPz+o7joPP5TOfTiW5NqwdAksT0+XnVZGKYjsDNB7N7PmRjPYD1XQjoZs1b23un
-XpM2zyI0Phv0QPqxCcvY/OfzRaXtmKiEYauHT57nys3AvlK14upGtbC5By6DyxpEJQi2gLXEWZqq
-h5nNcsOCf3v7oD///EMcf1tPcYZkFOtAa/nMrZgfjNNMwczIdCPZdJaX3baNQeozFchM8mfw4ACc
-PPadLodg15sRC/Z+v3sJP1B0wcTExm9v+6YYx+vbqwKbIGqg14R2wRI80HehysFMFlLcRwkytASB
-tFMQBDHKvAi70bkxz4LkgrOOhB/LeHO/gwG8oshp30yyjABM4Hw8ehRqrqIw51DSMz8+V+IN0pPn
-ZdaWgkfFKYURO/MilmyWePXZyLnB7QcgtawrJWozxu5PLtwycGi6Uck5F6FUpyPWYHXbNn3vbhOu
-GiDrvP1zqsqCcyTENxHOPbYsR+KujQkfxS8Q7S3W4HEQLQbRV6cp46gN23Iea9YURTmta+MxcvE5
-wKS9Na2H0aEqdVqHVQ+sLE1pkfYJdu6oQNEKxXFM8b3rOQVlmqkoc6qqTG9ULi9Db8RidedsP1So
-Xxx6wzzPKQoDGqS04kTXRUgkqY6r1nWjJI7o3rFhBwdScH/TSM8CbQB8/B6ttW3bYTPXCtUe+Hn2
-t+uNcgHr0LOhVEVp23Ud1XVFdVXpuAkvclkWPf0dAzBQsBElOsp+8A7w8tI003y8/TioSF1w5M+f
-P8UpiA+2pmno+9/fKQwDqqpaS3ubCoSFtxrK8DwvYjmW0pTM+jmiiG9+DphIaVlmWpbNG0FadeJm
-WGZRFLJQaxglrjukVWbWPOLlpJ9gD83CJ3E/qigMejURtZmDwG/Azcfmx/dwFuIsOmJZ+K5YCEJY
-u67TC8k5Py0yanZGrnDKzSRDIAhYbMUHX/Ygvd7ZkUret2JKhqOPgA+sH7w7VMTruqiXhJ2+uJ8V
-0/v7B23bq6nmAv3v1f4uLyh7YOQis9BWyzCKiZOY7pJdgRE4522GCgofx8FjwDAM6cvXL5TnmeAB
-s56A+MJMtV29OeRxHPTr9ZWCIFRDBDjg4sTHl3h9fZOk1Fxvma7r9RRPZMM8BiU4RVuifaTVjj+C
-KBo2Mc80DL1SMQE8FmVO5/NFFYC+c5FT4IUhU3WzDJmGkRp8MMtq1AMHBwhKNCua6rqBKiECoSVA
-BXIc7FNvxRoA9MZJTC9PJ7pcLuq79xjOmogRxjx3npoOXnFt29LlcvHsp5kSmlJVltRJfDgOkTAM
-qWlbYQCGgmG4DMh1XTQDwKYmb1vvJf5Yq+1xcJvfG3mJm667JSMdxYHIggWLtYl3A54A/qqqSvGf
-2bQGOMzwrgA+jtMsAHEsz3VRth8OaMV2draQt5gTnhUqMvAiQLCxawBGJgBMyyLXKQ0qA6xxPGdU
-vVmWeWG3CBMdhl7Hm0gl9rUlm+4zGwuG548DMt73XdlfUZTQtt00rRQvGKVmmqZKmOGRREzrmggS
-mSqohmRdAA77tip9E4w7ZNLB2PIxFcdyyW2K774vv3HM7WGg8+QopjVJKY5nz2gCNymHLDqXWGd0
-QvT8/Ex1VVIQRDQOHdWnkyrK4jhWXzccFhAMZWnKvahQQoG2OpZbRGlSUdcPdD6dRHU2a2mapqmG
-cIxCX07ihKrqhY5jou4Nt0QmLsK70JVD7VPRCwKQGganlbDPF0Bdoc7Om1Y4cNjBrW5BTlilJXFE
-b+8fSpu1QhMLjMExynrtIXVp2zaD7PPIUHMnZheznSQxRWFE09SqToDjy2c1kMUF8ei4M4ycCAz1
-XFUWmrwzjKMe5FEU0e12U3csSyleloXWh5GvDVyxQp7HDEUVI4mwat83HRVy67poS5gmKW3R5mlT
-+BKGocimDk1Jknp5g6pHMBHsblK16J9xsWF8WMfcw3Be2aNDadM0NE2zoLspWfswmGAi4y+MYrq+
-vzunmNipCT+vVzqfznTvOkkLcg8NFMpH73L7gK1zrn3Qj2myTnTSC6U3+y0O3IomfG8D598Odl4Q
-DDQLZmAz6LEQkB+Pg22R8YxllzkwkgHIQ1qkMIoV9MH3QDUx6UtNaJo6Wpe7OM3wYQtlG9RmeZ7R
-7XYTzkTuRWjZeG8sTotgYxSIhQljFZT2i6Qrw7sBBwBwF7xvkFpsdegyFObfbMtsJeMqIMeCRKIN
-8KIwWKRS5IkHfr8TE+00iM14ksSerZfFOIIwZLMMQ1IDSQp/g86L99Y0N61EoaWAyhOHnwWn7azf
-AtlN2+h48DcG7rLoJcgYD8lId5e15Axxrb3XGm5egjGP8Fm+Po4j9eJQhAtcSWbIWuQxXKakGw0B
-kd6BU2gcyy/Pc93w7+//iOX0pLfdtm207Qct40jjOEpUU0VpOomRwayBFDiFoOizmxi0XBf66eiR
-PK2IdIPbzWytxJIkYWab4cGP0gNDQ7+oNn3WcSfKNxxgNgIrNESj1LjfwoYZAhIAjuM40eVCHtDH
-VNre24w4LDCPtmM/yF3RBycJb7jX1zeqqsJ4GMaatoNnWFWlptgCFIM4ZTMAIdB3KP76vpf+daTL
-5aKlN54L9+aFWlAfx+IRXbDZVzMGw/uGMo2RdTY6wVQGRi2w39YQTYTBhiEROUdirDvngRjLtGDR
-NsNiRiA04bPa9hDlcpYXRvLOJh8go7H3AZuClobJiXVqI7vt2NDlMkZqeMttNa99+xmxYXtxXLbt
-G+T68DqwbTqeR1mWdD6dNLELFQ00I7gUyrKkkG/WneYH/7FRMvieLhcqS+YOY7w2zTO1baObua5r
-BXuqqhRE1821QdYpxbffzolh713KQ3BEGNKe2lIvnSGj89W3KDj+7yzL1BHlkXBhbblA+LBmFBDy
-pEmqYy/9TMame5xmuned/v329qalNzYa+/AlSm758fOnRIJvnmgKwJiN7LKkKjybdd20pShLphl3
-Hcdd11VJiQA8YRjSx8cn3W4NzctKt6ZR5B+3jD0Um6bRCPF5npSeDWYfgDT+m3vusiwpjBhsslbX
-EKV0Xady3kdTCjz/QZKi7EjLXir7vqkFO+zW/Ci21XvH87JqWxmGoSL39nc/Ol7j+cNSbltXyjLH
-OeFJQakHBFSNZVlSWZ689kixjQeG377vwlfIlZugbEsjifbt2zdlkjofwFRp5KnoSiwvA8rIdV3o
-fDqpjV1iplFoFe/3lnMBxnFUauZirKynaaT7vaeyKr2SBh+0rkt6eXmhPD9RnjlXnXmZxdEkliSa
-TBxYXW9WFM59lo0qd40Lt0QX6/6DTYh+moUxTqtgnVt5PDjQMA6UZqmhJKfqcrNvu5bA1oxyWVZq
-hWwBJPfR2PMxf4+pwKUSpiDA4JIylZAKlrdipIkcQ/ToOtcPA0ozDh3BgrdTGJvwU+Q5hV++MMAW
-J/T+/v5bv2+/OyK00Kei7dDKYuJ5++V8oqKsaVs3ipNYgGEXd87Pg2hZJq+qAE9CDV5ltLl4QBb3
-7GVZ6cFjW4RlWagsCzqdamrbuyf4sfbctr2xUnW0cEVRGAntpvN4IPgWNINRa9+ztyHwK7zbeZlp
-7hbvUEjThLZ1ol+/XqmqCsUnAjMxAhHLXkKoWC1ZKhGbL0w2fv78pYdMILd3lmV0v7dU1yfFN/DM
-hmH0pij7cQiYuysZCOsAI+yyLCn417/+15Ek7BCDU69tG0nKCYWbnWrmuu3PX1/f6evXF7pcLnS7
-3Uw806ia8eMg8a/nLHXOd2NjgqZphGKZiNhlorZtqKpqtbsiCrS0wkz+cXEHAWff4UDRYE6jpsLN
-1zQ3Ksta/PxWQeo75eq7oIhZDCAzqXBSvdFA6EEmve/LHghANWoJj1IbpV9VVpSkCTUNG2py+Emq
-oaaYEwNxxjODdh757vaw4/FPTU3zqRr+deXnUFU1NQ0TYNIkoRmegPJ7cEilWU77tlF7b6nIcwl5
-uaumH4SsRIhEvrEHa/YXcWcCVlAUBc3TSF3fayISPCbyPJOJQqTto7thU9UD3JrWodmHSdK9XSlN
-cy2h4S+wCKclw+zbBNlaXwQ4RrvJT6imouw+RZqpaKPD4f2AdYNqDCW9k65v+iwcOBd5uAc4+phw
-MKmOE5Q5s7Ck9t6KYW/heR9iogReCE9ddiXrgcrs2mheEywVF2zn8/P7gRIJuWNdP2jKz48fP+k/
-/uM/NFrZlXo8f0UsN+yQbeABEdHb2xsbVsYs5BmGgZ1yhEuNOXuepdLr7mqc2TQ36ntW8zHldPRK
-MDv2A9KJHh4n7sfHB10uF42tmqZRxoC58sOBjMJCjBVlk3rZ/fXnH3pyW8qtFYqAATYb26l5nqhp
-eAyH/xbuNhy1PmvcM1tntapmBIjVNA09PT1pZWJRZ8ufh5/gXbzy8S5ut4b++vMPmTYsKnXGiAit
-B4g/ViQ0zzO1bUtfvnzxVJCWc28Ze9aunAFe5pg8PT0p2ImLoet6VRAOQ69aCw2Jjfnz/f39Hzqf
-z55IB2sQm6quKlrWVTUJSBbO0pT+/fffVNeV9t7o1+GrYFWrNhUpzRgX++fHLzqfT78Fg1i8pq5K
-imTk+ePHP1QUpZOE3zv649sXJePY32ezFp2IyJHTTnVFTesCUKE2ZE5/rp4GzpfAjbJxob2+vqmf
-gyOEOVfhGKDDtm3iRNqzt5wxO5jnSUt4II1gE+VZSqtBP7XHDgPVJH9+fmjceJLE5kEsiiK7Pp8d
-V9/eXtX5BP0Reqwsi7zejcMeJ0XpwYDbBDzkci5TeWhpAEeUkTi1Me4rCgbPgiD6zc4coKELkti9
-eKvjIKXtwixUrZxl/AjGm4vmmtmL0JCMLLMSI7txmoQWmygzEtyD/uH9oEpg2u9ivPVJKx+n/yBv
-kdhxlhMcpeoUZPv2x7+4QuKQ0Ka5sW+CMDzBOrXPEm2eNRuZ5oX6YdQpkfWMHMdR3nNBeZZRmhU0
-zTe9TNBeMfGHAUJu59xoGxx9zPOtFn+cZrXB27ZVy2goLnGQvb6+0bdvX6VVaVVDY4NPEK2G9ovb
-7FUt0raNS3Ec2EWeS/IUsLY7PT1dZD1t4ma16uewADUuB7gRpVlGkdjIW+k0fCvWdaGYxRS5IrZK
-4BDTS5TDdryBnhlc6I/3DyHYnHS+30pc1TTNdLmcdU7e97364eG2BEkkFals0zR0HJwvMM+Lx9G2
-OXF6cOEWE0okZJIs2ZzUGAN8b/TjCHkMQy5pkZSst91x0DyNNE2jotZWZrptm0ZeYTHhVoLs1UWr
-zXqADkOvpaNjDvIGgGssDlOmj6Z0HKmWlFFU6gFrWyELbOG2tMAn6/idKevpdBIKdqKzZ2vLZkdV
-mHIAL3I5DoHSU53VO0tp6zoiokC56VB46uUh2BC0/mlWqBORH0Weqi4jSVJFtaFpgBgNhwm48Tjc
-mVCT6yGGQJD7/a6HE2c7zFTXleIN+77T9XpVroPTMvBGf3l5Fk2EH93FRrWzZhOg1ZpnoihiIPbX
-r1dKU/YnZKl7LI4/LseBD7xdyVbWkGdZFnp/e6eqrkT2PnkYwxiGdO86iQPLdbRvI+yDIKQ4z1Iv
-IsnO8ZmVF/w2RwfqiNOnrEpB+nMta/p+01OaUfuEEjGo2I+Djn3VPtrO0tMkpXvXyedIdT6KUmdd
-V1oE9MFLh/Amz1IKVEu/6yQCaKol/Gh+fBjqGApjtjRJJXpsUStw0FanaVZGGyih+76YYNNUk3z3
-faddyBu2XOeflXuGGnjh29Z7ElN4FeLQ6aWXtgeVA4L4YMHz4MpnNWm3iW5wtFMuU3FURR4qhyzL
-qOs6SuJIS1iLIjtptRv1ITUHLLYiL5Q6vK0rdX3vjT4P0y7O0+BVPCBmuUM6UFEViDMcStLpGPQx
-Is2G027bpoYdcKPidRLpGLGuKmXWRVEkk61Kq595nsWVueZItyikMMyJqDEOVNb9OvRuYBzYdc3K
-SvbIJJrGQWXCMESB8aodo1oOTFGygS0o9NYZyI2TI2370HJhUpFlKcUs1Fm8mK5RblfL8LJkh0dZ
-LysCU6V8Wgrv/d5JuRsryLWuG8XRrlRRxgImRZaxAcZpoo+PD3p+ftYHCPEDFg1CK5OEI84XOQkR
-OFLkuUSUiY7fjpyW2SOj4AXdmkZNFqMw0N8JNSRuwONIaJwm+v79u9hhEX18XOmPP75x3yiA0uPt
-zOUwp/ygekDqjHU6enSASWJmN1pCE8pAjMPYhShXXMP6KIL8YQkyy7oqAcWCV0CxEc2N6gcHTxxH
-FEeR59IL5B1KQbgKv76+6RqxvTZm4zbfAd/NBliyUO3wLOqDIFDKMucCxppuZCvVR3n6OK66NmEY
-EwSk+QBpVtC6zDTPg4yTU91UCCvZ953WZaaDDrreGoqiTg9o6zcB3MNpN3iKhTDeQhylYWNncQZM
-SpgIxZWP88JcJWviJNoRomluFKhkqjRPupZ50e9grflB3Irt6cSoZqxEFKi2ONEmMydMpP2W08Bv
-enBkqQMymJQReSAZTDjSNPPUc2CfoZSE/TUWSRAEFAqwBztrTBSQ/ooTU4lMyyoz5UxPSvTnuIUt
-pRNtSZKACbfR+XwWgDTUchKfdV2Z5lzXtTxo0pIMOXNPT096wFpLbYij8NmtmxECSGwGAqYhRMR+
-DCYmzfrEp1lG8zRpm+EmIpFx3s31fWh0m4nItmIe4AbsYZBoFWQJP4+RcVVVUd93NI4DhWHpaeYt
-M9HejPguavstt7pyBoZBo7tCY6sFzCkMIxr1e84acWc3DVpI8P3RdlZVSW17p667/3ZjL8tC7X1X
-kByA5CjOzS4H0SUWofLcNheuyhLfSMM8EHdu9xVufvBHoMewB5qVFg9D702leHKV6++Ik0jbAxYH
-pT5lGSw5cI6rqqKnp2edq1pyilM4uX7EppyCxpmawwKuuXle0iH9C8c8hR4wUZWFzvZRaXCZnmgS
-LYgiEFDg38ei08ZcFKdgmibU9R1rzfteuOOrAnqQBicmGNJy6sMHggqyBfd9E1xho2XhkpBLuovm
-xF0uz3oT2ufECzDREnieZ+qHUaKkNr0peAOk+hz6vhdmGN+4uHnZ93DQA3IRDGRe/HIbh8ayLHS/
-t8L5X9QYNZW2D7fYJHwATkYelRAFsOu/0m1gEa/rStfrVSOsy7Lk9xuZSYjhqD+yIYeh98gxOLQQ
-7ILRIAhIifhTAOxkGbojYqkhi3j8TUKIAqDIepVdKw/3mfz8SgbO+EJ5e/9Qhqm9RCzBJwzZoj7P
-Uh1Xw94e7wAg9qOxzDTNGvtupxNgZGIq13U93e93r2UBw3IYRnp7+xCrsEPp6RhFSpUcm4z2TBYn
-eaix5sXJKQwars1qs9Fc9oOjOljXXoI6NpdXHwYUpImJP549WaU7sRO1ZkKflWWZhH8ShVFM69oa
-B5ud4jjVXLYkYQusQ4JG8cDxHRe5PVG1gMbJ/7wLn91l8l2vDVVVocSLYRjo169X73lgXux6N1I3
-HeAr+C4wMsEpfsifR99urcOtRgKHHWK6kXZk+2huWWYjMOK+sCxy7wazYirc/FmW0SBEKbxvfB47
-jnx07LE0bphyMmOw8Zx4QYLC4YHPUhSlphp9fn7K2DihfXeUbfT7XdfpM8Dti7WYiogGDj/47BZj
-yfNcM/jc4RTpmBAHHDvz9vrf4L/DLYznjnXUNDdhs85KwsH6jcX4dp5nqqrKk3hzS7wRUexNWqwZ
-L9oMawYTx0wgi9KEp290mPcZelmNDISOTNxD2cimi/ylwdUuipzyLOcbYBh0XssjsszrF1HitG2r
-1cM0TTSOg4pvptkFP5RlSWlW6FgDMmA+/UatPoIg1NOdJwxOPIFRDYNfkcye78pIXCR4g91PYwWV
-0D+jX06k3QFq/PHxqYcElHbor+OYg0Cen57odDpp5XM6nQxhJpCgiEk2ys6eeRJGse2bZzGls2/p
-8+yEgIhfHCTF1hEYYNLlfOIKS54NKgybneduIf6suYw5MRkJ5TC53+/08+cvJ4CKYhPQGooV1eGx
-Am1kvOO9r1qdzcus6wKINhZ/VZVqK4bZOqoVsAWLIqdURqaW7wFpM/wmdjF0OdU1nU8n2YybquhQ
-eSQPZJyqYu8HxVpEigx3pv8qHRttACcrJ14qMkbWvCZcajEOiXXb6HSqmU4tCD0OeTBjXRQ8c2VQ
-mSgNXRizwLjw89HbQxdgE4rBpIUmJMsyHgN2vZ+qYscZhyxAuLKodxv5fGosSkRl3W43ZVVZtR6Y
-TFEU0TwN6tRrx4sQ8uTCfrMIqA1zwIO1M1xNYZX+HV++63pDe3W9JQQ6+P3sU5jTqa5EfrzpiYub
-Ms9zyeILFCzFS0jTlMoiV0IONjQcl+I4oYACPXRYMDTqjb9tm5pqsrxzoLqedKPBv46TgCL1KeSw
-h1SrBoxWkVqoDgAAEPFJREFUXR+feIfs7XbTfjqKQmX2resqHHfWdEzzRFmemeiw3AMg8ZxRNdn8
-gff3d5ombpHs+NQKXtCPL7LxjiNzgjKJ3srzkkE3xXZ4zq523DmHl3IGAIPH2to+AKrLg6MU/ndd
-FzV0gZ4fVZB1XQI+g+/Qdb1n88VTnZAPlbo2TkjO8yCgQOS9s25G9gdwLZ9zH950QmUPIWzsg1w6
-9uP3Qpl/v3N1fD5flHWo6+nz80p1XdH5fFKiBX7gNI2qVoLUFPReOw5Tb7fTibI0pSTN9IF197um
-7yA8JI4LNf94PESs0o7LaZ9+jJkqUHocAPaUQ0rtfozq5Au/OLDAdpnbr+uinwN+fWVZUV6U1Lat
-aPWdkg0HwTj2KrtN4oiOfVX7q3vXa6kKYUaSpGrueJBTsqE8tWM9d1BGakXOz8LlKdpIcfamb70M
-QiQsYz4/yA0CQo0zqiAhnjjM5nSqKc9LJQvB9xE9KEpjZMzZigDeAvf7XUtlTJbwHVEJ7CblFyQX
-JgMluhn2fVOpum0pt23UVoRj6UcFmm2KtA3HdF4JE93vnY6oIewaJeT0x4+flCQxffnyhXYjT8fv
-c+vMHeI4GNDOQZt/v7f0/PyseBIz9RxbFLLnJEn0UgUtGj/LZRDaEWMsPAWOHkO2AbQ9WHvIuzwO
-NjWJwoiOw2UbxKdTLS88p3XtHuSvyW9sLxYJzaqLx0Nl+yUWBNU1c/nzvGTLos0RjLIsknIrpP5h
-TGPjxsbp0I2J8s4l2nArgL6UwTbShwkKJvdOq7LlPj8/6enpSUtN9EZ242ECAjUbOAV2RONIGocS
-mWajwV+WWZxvS9U6YOOkaegh7yokEiEU+liUhGmaeQwygJWg9WICYBWDrn0KKMvm3zIE/JtvfUgf
-3qSEn2iaZp3OsMvS4gFVNm0J1ZAdXfKhkSjzEqYdoxxeltwTBKFa0MHohAG/wHvuoEQ3TaMMQfTH
-eZ5r8GnX9YqEWwoxvifH1NXK/nRis4PqulTl3ufnJ8VJ4jn6qnW93MTANWwoR55l6qVg3YUsp8Za
-6zEnIvJwFtCmY/VLXL1cAjwvjLlBcLJELpT6URhoQAmew77vFBdFIYET4W837TD0ctNE6j2GhT/P
-uz4wVAtcMkU6LrnfW7rfW0rTRFHksmTJqnPT8S2o0ctDXPRYGQAkwuTg1rTUNI06z+KWwBe06DTA
-JA495SRcLFqw1wBgDcMoCcEcojlPE82y8GymnxJMpCTGhKESfjhaFnDAJ3HAARiKiQeYgta7nZHf
-2GTVH+prWFalcsM5jNU/ADTFNvR5+/aZOnmvlRyLJFvGkpymm1JAzvjVahE0YkonB6FWMEmSUJxE
-dGsaAUB32gyRyG4GVAcAqHCQW4k3Dl4o46qyoDDkhY93G8UZte1NCU0Qp8EK3ZmcRlLl7F7MGSLI
-yiKXzAB6CPV0fAmQb+Z5omGQqHWpgtr7XTEwHC7WuMPyHlAhweEaBy1i1zG6DALSypGDcpmEFYWB
-HnqYUqkXpTy/aXJ7Axb9RMQ8gH4YKBBQwXeXTdTT3d6S1tXUUj9RlsAgg2g1RhCbChbYE2BUUMSW
-d+jhcVMjeAN91LpuBgTi0w0lGLjkcMyxvvZW752mmRgkck8GcxJWV4UqqUSwB9tqlbQfPeV5pimz
-KOlAF8WNw5wIF4OG0tACRTachIHPyTsQ0I9P80SlpBzrjF1YZHGSKkbzOErSymzddNph0WTwMECV
-tWKUMAwpNMxJO0nAbeXGmJNeHta7AbHZQz8ohmCrg02rwljf1yhjPOtteBy7JzjCpsGYDeuSk6FD
-WpfJqCNziiLY3Ee0rn5oDRyZgNw74DcQYVrvHXq4reHR50JsWPGH9ClwV9I0oa9fvtDpVMv4dfTE
-RLaNw4gzMJgXEqH2/UVowquCvxZ8v3cdtT9+Up5nHPCS5QoKQpXpyZ5l0hOGIcUowUCxRInBJTYj
-nGmW0bL23swXC8U60uIl30VkYl96HMv0IC+Vsmr19JYxhY1RFgVt26Ea9nFcFWxajFVXXdfCiGI+
-wi6jPHsjop8cx9HzfTv23evFsaj4Vl7087Rto2M/BjtLGkeewYLck+cZ/fz5S01QgoB03Aj7KLyE
-RzUfSjWLqjvDzU0rDp7hFmKgEuipD259QAyCGf6mB6I6wDSiQWK2Us1kdCMmeAH+V/ZWfkmeKJiK
-9ZHEER0Zh2wuy6rOvlVV6o21rg7U3YJAx8tO1bbKZvOpsNaabd831YQQ69oMsYZ06uKMPNff2lY1
-xxSWHrz0Lbcf6x3aj/0hFFXR+zgyGgYGg8d408PBrnOLKTz6KNrvm+eFtk69HMKYkux7oHoWXLoQ
-E4GFaUVdwGgWsb3b952C//k//9uBEdOtaWXkwppxd+I6JRKyxicxreSct9nrkbk/zPTh4/8HF1bW
-yofKOYeSD77mIMJwj76bcSMZn/ZY3F4WJUZYvTjMIhkAnE2oiOOe82J1+fb8gBiZZlvyUOa1wBwS
-z4MAnx0ZCVma0sfnJ0VRSE+Xi2oYNCXpfJHfFXibE/+MKmnbNsrSTMlBFiuII//z+vn2TuttWwH+
-s7HyO+znT1MWfjln2f03r4XjYBsvvtVZX4B/D14DpgEufjw07QBboBUFjyqTJPaqFXgepGmmAbXc
-OsUqeuIqYfa+rwP3QnmWgXoV2EmWNSjFe59FHs0isUInNAj8nOdJKOqL6kAAiFpPBg7smH2qt+wf
-PGOU5D6YuKt/Qp5nXvVh2zLmMyQS6NEJ32FSTAX7hFvjjKIoo6a5Cms08t4LgGHQ8adpoqC5/XMk
-SUL94NRwP378pKLI6Xw+U9M0qidellmRd0wHrCLPykfBF397e9dy3toeWU01Tkz0y9aN5Xq90dPT
-Rf8MXjyCQx5vJmfdzOo/RFq5uSqpOytcgR1t2VFSgcziWYAN+frrlYqSJcu2JyzynC2z7x3leU6n
-04Xa9kafn5/0/PzMscwSh7U8SFAfP7t1kPn8vNKXLy+eE9Mj8QY4BiYH9kbB78dBhAWIYJG65nn0
-uix0vV29Wz0MQ3p//6CyZOpyJeCtrfg0y084IkmSerr519dXtWhjw5VQKyBURnj28PNDBTNNE3Vd
-R9++ffOchLHmbNAIQEFUWZiB//z5k6dTgtuogeviDlc2KdnU8xHxYkREP378pL/++lMdssLQof1Y
-/wCg7YGL6rTrOvUzwJ8DIcziKfYzowrouo6GYaQ//vimzxoEJQSkAnd5fX2jui7Veh4jzKZp6eXl
-yYuCh+tzEEg0GD44wJnL5Syz7VzdZkFNTZNYmU0oOW+3m4JX+FJdd9dNcr1+qr+cLW9sJlySxAak
-iNSJFcaH9nS0c0/w6x+FS6BsWgYVnHlsa2JxDRujbdNh8jyj8+lE67pQVbMXHmb96iA0z0qsYTyh
-lwonEIuwTa3Suq4xVMxEe1BNNVagchNUfvXoprYiABMNt43jtx9Cfd29Del4FaQhsPhzaH+sHwBu
-mDxP1Pbcj20LdNT0GJ/FFvADFXnBpJ+ypDhJaN/ZI8Jy7h2GsT3Yve8ysSEvZ/HRORqakDSJqevd
-eBa4BVqL2+3GlUaRu5aKHEsvDCPatlmnHHmeKZPR6iPQog6yqdVlWXIW0EoAY7AxbtZ3weo/bNQ7
-Ds19PyQF+VCqNwhQ6OW3bddJHlepuwbtWJm/i1xPtPqOl3VTI0aXFMthi0laUBD88l42bi8HRJjZ
-uyH12HDRQE49kBCsKg0fiA0zVol9WoQMlFKSzF4ZhxuAf9ZueuPYsAITpT0uZv5vN75dvFbzjhcH
-80seGfHC7SU3jzMUIiLqdZRmQ0ERZc7g4m6synaa50FP3yjKdPHbkhXP2I72vv/9NxVlyfLPB8PJ
-IGAhV1kWyglHeQivP034kZIa1VaWsYy6MziDM5ZATqOAT+RSbxwY5aq2TJB8N75dWTf/5YWqsqQw
-wucs9Z3gsANJy7dgj9XZGOvKeTE6vwN87txMT+CLB+k0vj+AT8sqBEaRZ6m2rQ6bikSe7gJkwzCk
-qixUQAUZPPYOuzNxCzyFToWJjRcGAXX9aqLfe+f6HEfKUWG9xiQt7qox6gCIrWgO77yqTqpc3dZF
-359/+B8spsoyii0Cb8cSwzjSvMwKEAFAsRvR8qkRLb2uztk0y1Kap4Ri4fNneUHL0picdf5voNNG
-2mnT3AQwzNSJ5fHEn0ygBHp53KjO/40Zi3YsZkdfLn8t8r4HcuitWxL44rxg2t9QXFZTuuDQ6Zip
-73ux1T48U089oEQ9OEWRIeks3ggT3IiiZNLK+XRS11vLTrtcLoq9WK98S2BiDIS8jctBnb0njpnn
-SW2t7GYHpZZ9I1v97wBejtNkvO6g2Uid1Zy4SgNBZ/p5QrPkBDpV4uT1wk3T8u0m5a/FOCxQOYlQ
-yt5w+77R+/u7tGUnja1jiu7mAdr7cSjD0h40MAHBc9j3nd7eP/QQsu2pcwXmsJuu72g/GGCe58PP
-a5D+XJOSkkSqa9KwXLhIAY/Bc7UXGS4enj71orhdPG6HJWBZR+vwcVRmN8e27XRIv29VUlgUls8+
-inoJ831mQXWKyo7TTG9vb3oapUIBdWknO31+fkrZyw8hoECFRTrXNtFS1kl2GEe1y2azzUVptrbc
-hzsQej4LFEE/ADdVTAAGAfOwiSdZ6HYMComtdeFBFQLV32yca1grwFRQeC1CpWUptZ+frEu4XJ7o
-y5evFAstG88OQB5YaaUwxg5DXbYjQmuWYUtX6C9wewBpBsr9CKix8qz0bOB9R6JImW79MNL1dtVA
-VMixp3kRs9BApyWuMkl1wwEUhiLOgZ6ruhy5NjVR6zFL+4V9HcDuz+vVmwQEQaC6B2cMO4nv3uJd
-HDgYIAt3HnurhK2MdGtaGkcmk0Hnkee5KhJx4KBN4RQoNrcZhtHZ7JcMLoM+D/KVnXAp5z+JKZZW
-wkbFAyS0Kc46xbFJsNhU9kUiW9yOriyy/Qh88ElJOtdcl9XjL9ubC8IRhCugVK0qnmUy3z70Nlog
-IyOg/4+MOkhAp2miuq494gbwBsu7hwcf7LVcsOOio0Gks9oZrZNU7jrBQEsD9xiktNZ15bHNbBQX
-fkffd146EhY5CDKMFE90vd40odhVNc70Y9s3KgoetUah8+m33A3779y7SRXQws9j08zYc7DFYke/
-nxclbetCt6ZXNSPGYmzUEWmwCxJ1HxN0sOk4apyJXgjggNEJ+ypGKgBzVGbfaQeH4rq6No+NOyuK
-4oyWe6c9PNYyDphHYxS0DAgnsb6QSZLKBIVTg3n+P5sbl3X/EL4lcUytyHaZyEYauYd9AGyGtQ5M
-Vx8HUro02qN19XkXbetck+GPYBORbHAqHL+gkYj5RfgJwKCZck8/UJ6nnkINQgksKDtmQQ45NhRu
-LCU8CNI7iakmRltw+o0ilqrempbWZdKXZNFtgFwITgT9FiabIBNx6Ejs+bLFMbcjmHyAJgxj0m0j
-Z3qaxNTnBeVZashNZNJgd0MhznTjrNuqYp9Z0oHAzIJwBxsAwFOahtoOjeMklk68+NhsJKe+77SE
-rMqC2nvnTQXiOKZj32mZZ03Rta2O3ZioVLCI+r6jMIwUqG3bVtKaHIiKvl459ctKy9oqgIw1g3KU
-vRldJh0AQsz8eZw2a54kfgaLcjZVf7Ls1/XJdkyZJEzJdaCpu1yYiTfR6XRiMHWZ9MCOTXgH5uez
-gKb2gM6Ez0BEtEWuQuYIOesFYAlYcMrKKZf1Yzn9+GcbR4ZDP8syKotCK8RxGikvck1rOp1qz5vS
-8kcwQXhkfCrOJlqCXTAAIqL/Dyy2Xw3ACWE3AAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.3@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAgIAAABaCAYAAADKBz5/AAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIaFX5RmFoAACAASURB
-VHja7J13mCVVmf8/Vbdu7tu5p8P05MwwTCQnySAgyYTKKogBMK26JtR1Dav+TKuiYkBRxCVKkKDk
-AWaAgck5h8755lTp98c9ZZ+pud3TAzMEt77PU0+HW7fCOe/7nu95wzkKb0L8+GuXqmvXdzRHaiqm
-R2Paglik5ngjYJxjGlZ9X1+uPxzm7lC4+u/5XOHRn/3sfh0PHjx48ODBw6uC8mZ6mP/92QeUPe3F
-2aZlXdrR1Xtqw/j6k3vjicoqNUzSp2PrClplJY2xGqpqK4zaytbP7F277JYbf3xPwXUp2+taDx48
-ePDg4S1CBG79wfVqfyEVSeWLX0l2FS6dMrFmmuLXAts6u5i/cD6nnvQ+fn3LL3noHw9y9vnn8j/f
-/jn+gJ9Eoi+xddtTnzn11A/eXiyYlnRJyyMEHjx48ODBw8GhvdEPcPP/XDV5oJD9oBnihlBcbfC3
-TmBb7yADXR2sWLWB2Uedw4xZMwlGoxRzBqueXcsd9/+VbCpDJr2tSk/k3vnu8459+s8PvtgrCIAt
-CI7tOjx48ODBgwcPbxaPwF9++mnf7kzHBZVKxafymnXOQHs/6ZzCjd/6KZm+Ns6/4lpMw6Shpopx
-4+pYs34rqUwGza+B6kcv6CiKwZknzUw11FW94ze3Pr5GEAFTHJZ0eGTAgwcPHjx4KAPfG3HT39x0
-Xayts+eT2Xzue4Sb5w11divnnXM+a7YMUNRNdu3p4777HkLVVHr6B+lPZDHMImF/jGAkjF0sEoxE
-sYsFGirDwUg0+OSa9Xvbxfuo4lC87vXgwYMHDx5Gx+seGrjzr1+c276h62taqPI9+oCPlvmTec+7
-r2fqlFmY4alcdPEVhCIRqmsqSefSxCoqSScT+ANhjICNBmihIKpPxQxqFE2D2mjFImA1oANFIC9+
-OmTA8wh48ODBgwcPbyQR+P4Pr1TCmfyivm29Px4cHDzFopJ1Gzbxzve/j6lTZgFw8y9+QSwaxrB1
-0tkMiqqRSKb4wFXvJZu1ePhvj5DPpVAUhUI+T6QiSko3MC2rCagFCkBO8grYDIcGoBQy8ODBgwcP
-HjwIqK/XjQJJ8/RQTfVfO7v7T776w59QF550PjlD47Of+ibvee+VLF6yhGUvrMIXCqHaFr/81U00
-1lWj6yb11TF+9YufMW3aRAzbZsHC+Xzx6zeQzKewDZtxNZXzgXFAPVADVAIRIAj4GQ4VeOECDx48
-ePDg4fUmAnfe/NF5mWzmr6l+Ju7bO+SbdvR5TB4/EfCzY/culi9fTnf/AJZqYxl5wMe7L3sP//Zv
-HyIWsln58mpQCtiWgc8yuejCi/jK576Dr2gR8kNNbWwqMB5oFGSgCqgAwoIIaHh5Ax48ePDgwcMB
-OOLJgjd/5/wZmUzwJ35/8KihREZZt2U3xWySO/5yFytWr8MfjKKpGnWNjXz+E59kzcpVWIUUHT19
-PP/C0wwmB+iPp3ny6cfoau9Az+UJ+KA26uOue+5hfGM9c6dPtB5+etU68T42YIjDyRkwGK4k8HIF
-PHjw4MGDh9eDCDz15/NCvYZ6naoFPrhxd6/W06uTzCvc9/en2blnF7bPR9inYKo+Jk6bws9+8iM2
-bXqeLdvb2Ll9E2kjTyKRR/Gp9HT0ktPzKAE/Q719LF+6lIxRZPa0JmZNG289+PjKnQyvH1AUJKAg
-EQGD4YWGPHjw4MGDBw8c4dBApj9dX+juunLSrOn+n9/8KPPmL2LHll0EbBPFH2D+0VOYNXMShUyc
-LavXsGDOXB5/6HkKuTwP3nMvzzz5LIuPn4dt51mweAENLeOwsEnreQYSOaqCQWJakEBAt4A6SgmD
-clggSCks4JQVeqEBDx48ePDg4fUiAsVqKzzt2BNnnXHWtfhUjRlHLcT0+TBtH6qm8qUbv8bPfvEr
-qhrqiFaG6I8PUDBsLBT+dOfddLR18tGPXUNdrJnb/3g7119zNUP9Q3z4Ix/muJNPYzBnE4oEWbOp
-O00pQbACiEokwO8iAV7CoAcPHjx48CDhiJYPBpXGgekz3/6Az998ybe+/H6eWrGbcChEOBxhKNXH
-I488xMypU0nl8/gNBdWv8Y5LLuelVS/wh1v/wD333o8SMFiwcCE1VXVc97HP84tf385Xb/wmd9//
-Bx5+/CGqI2F6hrJQqhKIACFBAgKSN8AjAB48ePDgwcPrTQSWPbcy9dDybS9rhf+65OGlHRR0hcqK
-KlKpFLbi5667H6KYLwAKpqqwaOFCbvr5TbT37uHUk05iyTGN9Lb1oUp7C158wWI0xcfe3b2EolFC
-1RGUbMEnBv6AiwB4ZYMePHjw4MHDKDiiyYLvXzLJfmZ7ccIrawbO9WmBgKHDzJkz+OY3v8kra18m
-lUljFnQCqkqqWCQUVOkb3McjDzzJ4O6tnHr0eKojQXZu38Vzz68g37aB9dt3oIY0HnziYaZObaWl
-2s+OHR3ZLbu6UpQWE0oBCSApjjSlpEGdUsKgt8qgBw8ePHjw8HoQgYdX9jKtuTYTT6VP9PsDE1vG
-N9OXyPPD73+XbD7Liy88S3NrE4/edzOKFWX9+hWsWv48mf5txDSF6dU6x4YKpLNZJugdrF6/lueX
-beZvTzzG2886jWNmNJPr38PSFbvSvQOpDJAVRGAIiEtEIEepesApIfTgwYMHDx48cOSXGFb29Mbb
-FJ+ybfbsWSfd/8Bj6g2f/gSnnX4KPr9JMWuh+VQaxp/C939wHrNmtHDvL3/CR945kw0bephp5mio
-q+P0TJ5qn8L4cdUEYgHaEgaP3n832aLGF649E9te795y2MLbfdCDBw8ePHh4Yz0CgDI0lFXmHd3o
-69nXc2FXZ2dg1erV7NixjWw2RbBCY8/WfUyc0MSiRcex4Jg57FtzFzVmEX0wS7BCQ0kV0HwKxXFB
-lEyWHXGbSTXVRKsiBEIhzjllPvc8sioVT2ZTYvYfBwbEz4TwEOTYPzTgwYMHDx48eBirR+D66y5W
-Kir0aE1ttKG6oS5ayNvJ7nQqPpCyM7/9zp2jbeSjAEpiKLeUoNJ3+1/+t2LcuEpOPvl4+nt7+fPt
-d/Pv13+U55Yt5+xzL2LX6kdZvjZFdE6AuXMaGdjVjw+bign1ZNIJAiEfiqKQzmXoTVk0VofRLdPW
-DdOZ+RtlDtPzDHjw4MGDBw+v0iPw9a9d5AtXN5w9cdLMT0Qj0a9PGD/3a1WxljMjvrqjx1dOnLNk
-yYmx09+2uOuZZ17Qy5AAFVB7ejMcN6+1LpO3Tjl9yRx+d9vfSA7uZuuWLcycM5tf3/Qr/vdPt7Ls
-idU0BgtUa1Dr0wnWVhJTFXr7hvD5FPZEguhFhUA4RntXksYJTeQNU//70+uTumEmhQdgEOhnOE8g
-RWlbYh1viWEPHjx48ODh0DwCCZ9yZrO/+jeXXXr9pKqKEIXUXlZu2T5/z9aO+XYoihahwyxEV3/l
-y+96oDFQvPPT//VAqgzZ8MWivudnTol88bmXNvG5T1zHlt3b2L7iJcxQmIa6OrSwxofOmcTcap0d
-O3tQ4wV2JeOs2JqjI6UTUX3kSdPYEGFKSxV5RaOpuoJk1jYLhuXsK+AcRfbfY8D2vAEePHjw4MHD
-IXgErr/+NN+ZZxx/cW2o9uYvfeUXkyoilfz59t9x5dUf44n7HuPppS+xdsUGtq3dVNnWsXdmwCie
-P3lC+F3vuvz49PVfOKc32RfLbt2+UxX3CFiaZs6YVtewr3tgbsfO7XR1DhAIRZjWFOWso6rxFZIo
-+QFmNoeIpXW6ckV643n8LY1cMg0qagNs687R2uJnXJ1FVzLFCQtmsLUtnntlzY6E8AbEhTdA9ghk
-GC4f9MiABw8ePHjwMBYicPTR0+c1jW/58UeuvmFORayJvz/5GN/98c+w0iaGrmBpAUL+AKlsBttn
-0tM34Hv6le31mXTvRX39AwuOXZJPNDXW7lu9plcBAn19af+s+U3jDNM6LpU0A7FIiPqqCA3+Ai3V
-Ieo1i/Y+k+lRCzUAG7pzTJs+k0/+5C9kuv9Ojd+iZY6fceMC9MUt+jMqjZPq6EkUs6vX7nLKBAfE
-0cdw+WAWr3TQgwcPHjx4KIuyew386EdX+mMx7VvZgr3Yp1g8/exSvv7VG+nc3U4iXSSezGCYJmYw
-iD8YpqKilmIBND3M6o1J7a47Np1z+517f5nMDPz2CzeeP07cR924uW9964TYroKtY1hFLJ9O1oow
-WNBpmBhkYkzhub0ZwgtbScUC3PFKN0mji5a3Xcnsyy5g3oXX074nRWVtHfG+Aq2tDdhK0CkX1MTM
-3znKhQY8ePDgwYMHDwcjAt3dxhmx6LiLE71DXPWpr/CBaz7InvZuApEIKBaTZ07ny1/8PO+6/BIM
-FDK5InlDozdZ4Jijj+E/PvVR0ml/y66N6nueemzrC28/f+71rZPqa9e90jZAuPaV2rDfyOYM0ski
-scYQBrX05TRCLS34/CpPPt1JciAA6SQnzTifX333V3QmZzO5ZRa5VIiCBS2tMdSiqj/39NI0pWTA
-MKUywaz429mK2PEEeETAgwcPHjx4cOGAZMH/+s9LfF2p3Cc/+aH/UCorwnzz//03mzQTFR+2ZeH3
-+TjqqKP4xCc+XfpCIMhtv/4jiuZH9YeYOH4WanACqYSKpqFYvfq4nu7erze2VCyoqFYee+pvrzx7
-2aULLnzmse3jdNNi1544VqVO+95+zrvgZIr+KjZu3cz8Ga3U1vqwIyHuf7yTh5f+O7oNV5xeT188
-QbUFOT1ndvZm88IDEBJEIO/yCFgeEfDgwYMHDx7K44AcgcmLW49OdiWvnzCxqm7Vhs3c89cnKOTy
-5HI6hlkgncmwfecennjyKf7x6FOsePFlBocG0M0itqWwauUaNmzYhG5bBLQAtgm2AgO9AzMSKWOh
-EtSGNEXr0FRlfjyZZ/z4Fr7ww1+T6OkiVtXIZ3/0fdo2rqN9zx4WTa9k7qwGlkyNYvltckWVaa0B
-YsEQuUSSqbNjxTv+tq2PUi6ACmymlCMwSKls0EkU9MIDHjx48ODBw1g8AheddsXZ0WBt6y//8hvW
-LN9MoWASAiojEdauWsPO9p1cdfVVrN+4htX6y2j+IJYKdTUVnHHWOZgFg2eXP4+d1MkXdFQtREAL
-8/Cjv1e37Nja8vOf3vZJxR7a1NxUu2+gPzcxm8uR7l9F04xGVjz9JDdPvo2GqJ/KmB8jG6K6MkZj
-pMAxxzXSOzFFsF5j1ZZBJk5SyeRTReEFyAkikBVHThAAQ/IGeImCHjx48ODBw2hE4Cc3XaVd+LYL
-JoSqJoX/8exj7Khowx8woGCTzxe48etfJpmLM9AziOozGF83jqF8hlR/mspINd/48udobJrM5798
-Lbf87n4aaqoIBjU6u3vp6Ehz+cWf5PKLr1XOeNviuYWCTUNtFe3tg1xz9VcoFC1Mw6K2QmNC2Mec
-JhszkaKqIUBOt0lU2fh1HVQ/Qb9KVLfsZ1btdnYWLAgi4IQGnPwAOTTgwYMHDx48eBjVIxBo1bRI
-S8C0bVYuX0s6kUcNKBTyFioqf779XoJRH1beIBgNc8edd9A4roWhgQH+/Qs3cNHF7+Gb3/gsG9bu
-RdVsMsUshbxFSINvf+sHnHP25dz6x9/Q2TFIMKKj6CbVVRHyBR9TJlSQjCc4urmCOTPriLZ3QNFm
-3/ZB1JxJbaKIokOxYJFOm0ycBq88mEhLHoHiCN4AjwR48ODBgwcPI2C/qoFw0N/Y1ds226eoGEEd
-Q7VIJQoctegovv/drzF33lSMgg8lEKSY1vnvb30fFYtsNkt3T5LdHTv40DUfZ/XqVdRFI1RofgIh
-qKqJ0tPfTWNzjM994WvE/DGUokVIiwIW2byO369yzFETmNTajGUX6asJEmiq4JLvnMlgUxhfzsRq
-CWHZNr6QRWR8hb11ezolBn9naeGMRAScigEvN8CDBw8ePHgYi0cg27+XwcEeamoaSfSmqYpVkSgO
-8Z9f/A9OO+VsVry8hu0b29FzBuObmli+YgUXXXwhHZ0DpJND+KIBogE/QZ9N0bTwqX60YJBCwSCr
-FxhXXUs0HAFdwSiYFC0DFYWKiEbXYJramI/taZPBwTg9PQOcP6+avuUa0XHVmP095NUIhpUiaVvs
-G8gUbOufA39WeABkEiDnB3jw4MGDBw8eymC/qoHKqoqal9avueTvTz0yZeuWvRTSefApbNy4nhdf
-fIXnnn6SVMGgvrGJv91/N9OmzeC2P92OpvmoigQJaBqa5sO2LUIRDVCxC0WKxQKhgEYqmcdPAFXx
-oft8+GwbVTUIh6A/naMuGqS9L8lVH/0wl7znVDauWEZi807uer6PigqFurog+AwCFXn2Zhha9kp6
-n/AEDAhvwD5KFQQZDlxQyIMHDx48ePAwChFQjjt2VsSXKp7bXB2e1REfwLTzhDQ/A939tO3rIJsq
-ENBUMokhCsUh7rz7AfKpDK11tdiajaqAiU3ADyFVQ8cmns0T0lQqA37i6QyqT8MwdVRVxe9XsJUi
-yUKe6roQuztzXHbpVbz9sg8wuC9D/IV/MPuEZk4PqUxqrcWn2eR2ZJi9JMDdzwzu3bFP7xYkIA90
-Ad2UygazklfACw148ODBgwcPI2C/0EC6dzB54plndFaEwHzuBQzbQjFLJYC1jTWk+uKkMjn8gRC3
-3/ZQiSj4A6SyKVpa67FtnURWh2yWnF4ka+hMn9LIdddeR2NdAx+74dP4ikWyKvhNA9MIUFsbQin6
-8CkqoaCPhx65i5eW3cHaFR3MmVbN4ikt+PUh8v1JNMuHv0WndU6YvEleEACnSiDv8gJYHgnw4MGD
-Bw8eRoeTLKgAylPLNhgnnXlF/gMf/iqf//g1ZFMGuWKA1gkTufeee/nF724mFU+RyaZRDIOa6hpa
-JzSTKmTYsn0PnZ1xUukcaRN0S8VPkAvPfTvv/+B1hKpNFNPADBiEwhBQFbKFPPF0CjWoEA5HGN9a
-z7iaGqZOnEBtUwU1NX5U20IL+gjVVxIcV4NeUFm1Tk9s2mkkGa4YMF1eAG81QQ8ePHjw4OEQiACA
-MpgsYuTTXZFwde708z/M5KkzCUY08IOl5zj15JOINVTjC4Vobm1k69ZtLH/hFZYcdzrRiijjmuqY
-Mq6eaDSMYhoU8ln+dNufmD25iUsv+jCKZjB/RgPXXHYsJy6sozqskMlYZNI5hnrSFAZz2GaOzi37
-uODsKSxZVM9QKkC2pZreXI5cPgOTi7y4PRXv6Sk6ewwUAD+lbYe9nAAPHjx48ODhEOCTPAIqoFWY
-2/NBRTnn2eXP1z79/DIKuQLxoRQvLn+C559fwfatOwkHNQrFHDt27mLnzp08ev/91FTGaKxvoKG5
-jvraBqZPbmF8cxPxwSLJfJG6qiATmmOcf/ZMaptrqauw6e0dpD9hoGkqOV3ByhWIBFWKFqAomDZU
-+WpYsaWNtGFCJEl9pWWua9d6Xl6b6hGDf0I8/z7hFShXOugRAw8ePHjw4KEMFMkz4ANC06fX106Z
-WP1Xf+34RV27EwwmMxh2nrAWIpcYQotWYOYNLAVsw6RY1ImEfdiKn0goiM9nEzRN1HAIyzSpidZR
-KKTpSwxQFbSpqNQ49ZQp1FWGeGZZGys2DBALB6mKRqitrSSR7sLIm6iKTSiiMHdGC3ohy8KjGojW
-J8n3dqeu/0H/BrNodaDQVVet9Q8MGQawXBCDOKWqgTxvrjJCZQz/L/eM9hivbf8LyePB4BE7Dx48
-eDiMHgHHG6ACgcHBrO/tpzRNam2ZcPycJcexafsOIoEAuUSSU885gU985NNs3b6DgaEBPvC+d5JK
-xclkdaqiUWJVEQKBIFUN9Vx3w/WcftKJPPDw45iWRUt9FYZdoD9lsmFbN1t39JJNm4R8KroCM1pb
-mT13EsnuPnL5AnPmzCRQUUGoLkIxn6VnMElYNenNmpmly5M9VVHF/u8v1R/zH5+se1tTvd9q6zJ3
-xRNmmgMTBd8MBMAnDk0cfunQXP93fveJPlFGGPzkflNd574VCYDP1Taa6/C9Rd9R7iffW7yf/i9N
-kP6v95nien/VE4t/XWiujlcAZeve+MNfeMdRn6yacQUdW/fwzOrVWKrFtR+6hjNPv4S2rm5u/f3v
-+NRnPsPKV1YTrTYI+YKotkm2YBKJ6OQGE/TaIdJ6kaKqMLW+idaKKpKpFJpRoLOrwGA6hS8QJRSy
-SZgFdnf0EY5V0xwOsPi0hbTvaSeRjpNImQSDNsFYJc1RK3r+WRWTzj9JC4QrlKZ1G7KcuDjyjunT
-IupPbxm8de26tMH+CYPu6gH7dVYmH3AKMEca7BSXYVFcz+dsknSv8HDIng1ZSWcBpwL9wD/EOW+1
-PAnH2LwTqB3F8FrAKmAtw3tJvNkTQp1+mgycDaSBB0T/6Ly5l8BWXHL6fyXM5vTZROAcSt7Ft0qf
-He42WAwsBPYCz79F7YuHQyQC/zTMS1/s7Puvb9srjp2/8Lieyy7gmdVr0FG46abb6O3Nc/ttf6Kj
-t58zzriA6oZqbMtgIJslFo5SXV+Palrccdd97O3upiqkodsWQ6kcqh6jJ5HDZxrsyxSJaSEaakP0
-pfLEU1kaxtex8MwLiPd08vhjLxHvjtPcWEtlTSXHz6vGsIuEw/7gzKnZ1gGfppLx0ZvIkDZs31mL
-w2//xnWN7Zddl76H4fUDTMlD8EYMGqpo4w8CH3oV339FPH/aZYQVcd1TgJvFeS9SCoc4+y68FZTV
-MThB4FvAtIOc/wNgt9Qe+luACGjAEtFPu4ClUj8V3qSDq0NgjwECwDqhP/8X9u9w+mwh8Gtg51uk
-zw633fID7wBuBO4TMuC0gY1XlfUv7REAsItF9L/e9re7p4x/21H+UKpCKSpUKBGee34pfsXmo9de
-w//7+c84422n8dtf/ZYrrrycjWs3EQwGUPQCuVSOnAKVsUoKhTwUdfa2ddHDIJlihmAgiKabZG2V
-TNFPZX0loYhGZyJPavlKtq/dgWIUqa2K0DuUptgxhJlJc9yiyfQVdKxQgzqU8LNjWyfVDZV0RTT6
-k6p/75DeDEoN2M5A6Mwc34h1BRRJofYBK8XvsqtthvjZRym/QfYGWEAlEJM8As7g7hMGOiju5Qca
-KK2qaLve961gdMOS63FAtIfbS2IJQ1QjDUpv5r0k5P53+snn6qc34zLYDgmYBawQ73CW8MQ4a3X8
-qw6Ecp+FJRv5Zu+zI9EGsn0JizZIiHc38TZz+5clAvsZ3bse69v2qa/PWH3eeaeceuYpr/DCi6sp
-2jbf/+EPmTxxCr+77VY6Ozr5+U2/oKOzi6r6Jux8moJexAyESAz2U8wXMAp5bJ9N0YTmCa3UaY3o
-CtQ0RDj3nPOI+qPcde/dJPoGMXw+lGKQgqET80fIZkyKuUHqmipR0j70gsFL27vxR6qZMXchSs86
-ioTQFJv+3qHss892KmDPYHgXQnngVd4gpfIBfwT+DjRScn9XABHg60LJ1guj6+ybkBGGxwRCHBhO
-cBTVMVYBYJz43NmW2XiLGB2feA+ngmUN8KwwNEXpyFBaTjos+vWtELd195MmZEAVfZR/HfpJkdp5
-LLkziqQzDtGKCEIK//prdDh9FpL6bNzr3GdvBp0MSkQgJIiAzXDJtuNt9fAvRgTkmZe5b293/J2X
-X3H7Cy++2PiJT94wc8+W69H1AK+sW87qVWsI+UN0D3Zz25/+SFEtYOVzKCr4CIGRpzISIDq+ldNO
-WUx1NMJgPMX8o6fQ05ti9XMr0XwKm1/ewMZNG2nv76CmLorPX0lBT+PDRzaTxB8KEjJt4okM2UyA
-1Ip2wg11ZPIakUCMc088w9yya6teUx3UN+ztXnf/Y/E1lNzGC4Ct0gDyRg0YtjRDN8TzFCQFQ2Lc
-FZL3wjnPnRvgdt35pX6sFd9JiXc2JMPNIRhud2zY/S72ETI6qtQWMfYvBXXITdE1IyuXQEkZb4L7
-cw6hTRTXYY+xPf5ZkuvyCNQIYxpnOFmXEd6j3LMeyjs4+RdVwGeA70kzOjlkVq5PeoELRF/0A1Gp
-H5TXSYYUV5+WuxaHUSZH6rM6IXvJV6lbh7s9lCOslw4ZcuxLUNiXvLAvOendD5UUjvYOh8NOjVU3
-D4d+Qfl8r3KT6zc1cdbKkQBhfIsrXl7VdfzipluvueFzV9bXF8fnbX/Nd278f4qBYfpCPiOZydqa
-qioLpk9WjIqIr7WlSZ1SW62Eq+uZPL6evniCdWvbGDSzbNi6k+62NqZMnkBP/y4sxUI1bPqSQ9RF
-QlTYEQYHMyghBUvxU9TzVFWomNEgKd1HwIIKK0CNoVLXZLBhxWO5l9Z2de3c1NUO9ACdQkELQJsw
-XDNEx7S9gURAF4oTlxh1hv3j25Y4Z0gY4CFhdBKC2Mgxf9kroEnGKiaUNCquBfuHFA4W25WzhH2u
-QUoePA63O1513UsRz50SA5C8gmRa/O3MymzXdeTqCdtFGORMcHlmO5IhUw+hPUa6hlwx4vwdEYZ1
-JBKgSt9zv4fcT/Jn1ghkUQPqKSWdAvxW0pHRymude/SKc91VG8pBiN1raTO3LKqu+youWzUW2T5U
-uPssJmSvQtKt4hh1S5YjTXoX5zvGIbaH5pINc4zXeDUeJKcN/JTClI7+FSU91cd474PZl9dqp9xy
-NlLo0G0nLEmeFJd+jWYj3O2kliEnR9JuHnYiILMnuRELQP6VNYPtKz9y4z1TWqtmaeGKCabuq8rk
-c8FsJhdIpzM+y7a13Zt2aSeevCR86VknRkLBCt/GTbtI9g1iVqi09/QRCAYIh2y6BjsJhkwmNtfy
-8totjKutpToYJGcUSRRzWLZJLp+lsT5GTyFJPJVB80OxaKIE/BgGWLaFrRd56omt8e6+TMrVgc7g
-a1BK8tGFAM8BNrzOLj2nPXUx8JvCiCTEMxUloSgIotALtDO8m6IzABbYP/nPPaipwARKCYnzxN8v
-AN8QnpG8azZdTrmcWP3HgauA6eKeK4H/AZZJbsHDHSdVXe2Wk9pjSGoDwiiI+AAAIABJREFUJ3SS
-d7WHYxh+AhxPqYLix5KhsgVBelC4Ob8m3qdc9YE8K5wAfFrMjCeIZ9gK/BX4iyArBYmoWaMYLrmd
-3eEqx6g77/ER4GrgGeC/pQEb4LPAZWJwv9kh7a4ZqvP8TeJZF4t2e0QaPD4ObBFtqrue3RaycLu4
-zueF3I42u3Hu2SDa7GJgqrj2DuBvwK2iX/OjtJljXN8mPBj7gO8AX6CUxR+kFEb7ptBpt0werlCK
-3GdNwPuEp9FPKTn3mwznTRRG8dxpwAnAV8TPqJi03Af8rEx72CPoZj2lhNoLxe89lJIYf8twIt/h
-ShJ2t0EUeI+wLXWCoD8K/FDoqBwusEYh+5XAJ8W1pgrZexn4EaWKoIPZF6c9xwv9OEHIm3sWfhml
-MKLjUUTSL03c70ShP/dI+qWI9pwDfBd4gv3zzOwyz/K8+P064HIhJ41i/PmZ6Oe89CxvyrCaNooL
-Oy8YYNiG3l3tCQUScaC+qqqiNp3Jhi3bDsdqQlVf/vJ7J2jhyf5YTYVSyNkoWpHBoRx2Joxh6vS2
-dZQClKZGciBDVjexfQGskEIxbZNIFzC0IgEzgG3l8BuQ01XMYo7ZE2sI+jUi0QDRsEJDJaBbnHv6
-+Ni9f98Zz6RNdRR3U4rSroRB0fGbKCWiFV+n9rWkgd4QbZoV9/e7iEBKGIUBoWhy9r/MuMu5oarF
-AGEJwzmVUrnaPOASQS5S0izQLmNoYsCd4nuI5wgBp1GqTviEGEiS0rMdLoMjow6YTSku2yp5RHTg
-OfEeZpnB2y+MyQ1Ckf8q+jorzv034GRKO1TukWY47jCDE3Y5A/hf4VZHXCdKqQJgiVD4j1AqrcpI
-XoqDDUbqCC5vOUlrirhHlwgl5MT1bUHQlgjjXyPu7ciQ3B71lMreFoj/RYCjpOdoEQOSXaYN5KoB
-xDON5g1w2myRaPcm8f+80L354vgA8GFBptLivdxt5lxrnCAwk4X8BShVXUwXJGGBkO1dkrv6cJEB
-XIPgvwsd2UuprPBUMYBcKgx+ssz9nTacBzzp8r5OFGRpDvApoffpEQi/kxj8Z+BM8dkg0CxksFJc
-K+my4xxG3ZwjDscWNYmB+AzxDPsk++LuA0UKiT0EHCv+3y9k8mzgdHE9R7+zZeyUIxcnAvdLeinb
-+z5x70bxHEnJ2yC35WwhW1OE7cxKXo65lCpGJorPMuKQ29UhNmGhiwiSO0OMMT7RXr8S9/ubINLZ
-w2Q3j2hoQHZV6ZILOyDFcC2fTzHy+VzOsqzogoUTpl72nrOaTznp9MC6je3s29tB92Ce3r49FHMG
-GcvEyPuIVUSJBgN09w6Ss03GVVegtzbR35+kMlZFfeNEOvq7GewcIBIOkrTyzJvRjOLTsXSDwe4U
-0aBGJBxhdkOYvA3HTAtVvH2xPeGnt+0rvrCpMCTNtHwutyJC0ZYLAZgAbJZmOK8HGbBd7i8fw2U4
-MJwX4BCFnGRY7FHczjIReAV4WBiJIPBVoRBXAb9j/3JKs0w88N+FUvYLpt8t/n+WYPDODEh1eTvs
-w2x0ZomjHN4p3s/t0naMxFIxeDYL78gfGc50/ri4xt9EvFORZtOm9AyaMBAOCVgpZsZOouJCYfyO
-Bn4OfEzMiuwRYpPKIQ4+QdHuCCI2TsivKg3KzgDVIGTJcLWH49L9AnClMLIdghhkRB9nJVd3wRV6
-Ul22IcKBSZqKa5Y1TngpmoR+/VHMWoOCgHxADOq/Fu3XI3l/3OEbOcGyTnhG/iyes1J4uhoEqfgf
-DqyUOZwENSo8D/czXM3yFfG+1wrPU7n7O+3SLN7xj5SSgh2SeQVwriA060YImTiDV5MgAQivQJto
-nwXi+WqkCdzh9NY5bWAI3XpF6NM0qT+/Kg6FA9dtkQffbwgS0CFm5IPi/xeL41tCVtVRrhMUg2sV
-8JSQ5yrxvTliovKEkOuYy0uCNHg7sl0p5MhZjVaVdKdakGmljL1x7ETEpSNfErZAAT4qJh43CA8W
-b+YQgeryCFjSoJQTjZMQndYLdFuW3VEomG0zp9emv/XFd804bsH8yKZN29i7Z4j1G3aQ7eqlkChi
-KAqBokkxD6lsnJ6+OG17d9Ld3UNjfQP9Q3mKpsbMRUdzwXnncsxR86htaaB1/ASax9UQqY4SiPip
-jgV51+WnMG/uRGa0tBAOmdRW+QiGkkxtKVR87MLg5KooMYazXB1D6iS7OATBFgYqLQbHE9+AMIE1
-wmDsjnkeasyvW7BpR1mKwuWGmKU1CKF3x6ZVSaCvFf/7X6FA48SAuUrMhOqFMaoTxsfPkVltLCsM
-bpcweHvErG+HGBhjrvdQXKGS+8R13i1ciOMEmZkl2uUlYTgjDFdjlCNFVeLev5VCTH4xKPxa9MuS
-EdpEeZVG110W6mRrV0mDcUAyPPVSe7g9Y0XRhjmXjOUlElzuWeXBGMlgVoj/+UbwYnxUDHr9wE1C
-zyrFZzuBX4p2nC5ct3XSNVVGrojpEwa+ShhnhdKaGQgvwzjxWVAy4ocTCeBxcV+nkkC+v6NboRFk
-MkVpHZG/iz7xCXKZF9c4WmoLt07JoSQnNHScaOeI0PF7xL0PdyWNfJ3tIozkE/fZLvoEQWYmjaBT
-jkxXCY8cwG1CFp0KqmVCZqaId3Ou4yadTkhgthi4b2c45+p+ce1LhU7I/eGO5wcZToKMSToUlp4f
-8czlZFQZgQjcLf5fI77zrPj/dOF9G8nmvOk8AnJygy4JqjOA5YCMbZMAort2D8Zvuum+EMHoArTq
-xlhFTTAYqwlZ4aBqBmIECjr4w+j2IPHuDCctaiaZ6megb4gn126kp6+HgmXw+IMDPMk/0Px+IrU1
-DA4OEK3wEw7ZoMRY++IWErkUQcvHoklRIpPG0aAZGH6wdGiZMaHqD9/WFl/71eWZwYzuxJAdN5s7
-flsAtonZyKVCEB+T4khvVeiSR8FJRIxLRrxa/J2QPA24ZsBNkmE6Who4ZDmZJ4ygkz1dPAIxr22U
-SgiTIj8gLe6VEuGKcBmDKTPsf4iZYqMgAEsZXszpJWmgUUZwh4fE9xDkKsxwfkdRfH+HOGaI0Mkq
-KXdBf5XuaXkmrkmz/5jUBrb0WVB8Fmc4CY2DxPGdxNW05JovF7f0ScYSYdjCZQZtJON6rvh7mTjP
-krwNDjFZJ1yyp4gZXdb1DLLB9kv2J8z+24zHJUPulu3Dve+G20NaFHJZ7v5Zly1RhJw0CHksiPeZ
-JfVXlRgkBoXMF6R3cGTCEAPNlcD5YnB5QNzT5MjU9duuccEJFSfEO74sCJ2z+NKgK0RjSyG7+YIo
-26L/NZd9ce51DLDRFR6wXCTZOb/Kpce4bIO7EkGVPIc+iWhXSKEdWY+cSq5QGf1yP49jI/0MVzsN
-SMS2SbSP47kuvtkGkHLrCFjSQCHPVJ1krUzQT+3Mqa2R1tkL+9OZ/Cpd97ceNW/q5HA02jw0mFcD
-4Xrad++lvy9JeiBJRs+zdNVmEv1xIuEIA/t6wVaIRmJMbx3PULyP/v40RjpHTUWIQCTMjMnTCFdX
-sW3rLvwBjektk8jGh4iNG0+sejKq9hKmWkVH90zqihuqfvRvcxZ//i/rCgOJ/Wp9DZd73ZYU+U8i
-TPCvAFsYqSHBrnUhkI4gyrNJn8vQOAleDk4awRjkheFzst61I+QRsCXj65CbkcoH5UHPcY0OClfy
-ecDbhSfrBGkmp43gRnXaIiRmAjBcepoW7eq4D6uFF2aGOLdK3DfBcCLjq4Uc0pJnMD6X29/9mXsp
-YJP9kwwtYfCcBZscw10uLq24ZteBMt4AN3mqF/9LSzPhfvFTFW3UJc6pEW045BrA4cBEWMelmpHC
-QhlJtsMc2bUlbKFLcfE+Ben+iku3VBfBdGxpQUw63ivCApbUvmExSIbKzBZl/btFnHOJIAKfopTT
-cxeHt2qgHBkwhez0S/bFIadRoQMxye0ue0ScfA+nvU4bxb5Uu+yL4pLHjPBMzKa06uHz4tkuFNfY
-xXCCsF6GICkuGfZLOqS52t/vsnMjec7kd8lLYQb53ULsXy2k8iZLGhxpHQE3G3TiwcaPvnr2cUtO
-PePDXXuTlZZWMW5dW0bbt71d27StK6SoATq7eglHwrTt2kVQUxhIDGFYFhWaSkV1CAubUDRKnRak
-qqaSxdOaWbOjSG4oQ1ApYBs+zLzCylXriDbUUNNchV6wMRWdoxZNJd25i6MWRkgOhUm0F5g6fQZW
-KkdTvGPc9Wc3z//eA91F3bCLLje7XYaBmsJl+VZeGEUmb1lhVAcYTkx0s1V3qY2jGDnp3D+Kazmz
-fkuSk1SZGOqR8G44RqdXKFZWeqZySVWW9M7O2vDnCoN5lVC8XdJA4lxPzrKWZwxpMXDVivMTYvBM
-SEQiKu5dEEoeOgzhknIJhHIJXbkyqJHq003JIDrGPCXeIS7NgnRGT0Qtdy+ljLFPS4O8k6jVx3B+
-Q1Fy9+ddbeZzzezc7+TUrw9JYUvnPeVNqg4XEXDPJjOSbhUlku3WLbXMQG6KsMmnKSXV/YpS8u53
-xOCpCRKhcWD+hSPbzj3vER6zy4CZlOL0GvBTjuwCW47sOCFiR2ZCkg6EJLKoumbyWek6v2P/NRlk
-L1fC1f/lBt8fAt+nlDD6NldI8VGG86tGypdQRtAv98A+loXoFJfdSgsZTbnGVs0lo2O5nn0I9uI1
-n68dhAXKxMA8dv7kSPPEJR9du7Jv4fq1m1m9rY1Uqki0pgbDgGhlhFR/gh7DpKmpjnwmxfSJk7Hs
-HP2pFJXBavr6+2hoquXUJbPZ3dnLI39/jtraCJe/fTaZlMIr6/aQSiTRjTy7+nuY3NyEVh+lI56n
-89l1bNywk/e+sJd/+0wr1aECe++9lZaTVWqOrdbmqqHpnwsGtO/9Za/J/vW2spI5BsvJEjXeomTA
-dv1eYHhVQkNyP8mDnLtkzTmGhNFuEGGBFey/sp9znRzly80Op+GVZx/dwvg47ja56sIq872C6N8d
-lBIbFzCceLhWvGtWcj0WR5gxrBfxyIUi1leU3t0nPpsrvrOb/ZNUOQzuaV3ST58rXOBzzUiUEZRc
-Tk5FknnHszJa/bdyEIJSbma0Xrh2F4rwjNNmWfF5jXALQyn3wt1mlPFqIHnxcpJrvljm/od7ILRH
-0K1iGd3yjTJrPJnSYk69wJfFYFntIlm+gxAJXSJCO4DfU8q0v4BSLsydEklWD1N4pFwf5CX9P048
-sy5CrWoZT45jX/aJ9otQSupby/5LwDuJhhlXSMA9ITUEoX9AEHyTUuXLbhGq6JE8FfkRbLst6VeA
-/Xc91Tgwr2Cskx6D/VeGzZaxK+ooBEcmIzblq3lGknn30vSM4Xw5iX1EduJOHjQBs6m+3pdNFRcu
-XbaBp1ZvYsbR8/mPGz+HP6yiGwW+8Z+f4qc3fZ9MNo0flVAoTCYTJ5vOMmlCK1e86x1MmTuB9t5u
-nnxpFVs2bqU6pnLKMeNYMG0ypy2ayfHzWgmE/ERiYeqrq7A0H4mhPOmMQayqlauv/ywts1rYs0ph
-3Z1DbFq5j+7nOgkMhGkK1yonTmue9N4T6uZRSqhpEsc44b6qllxYAQ5c2OKNGshHi+uO9RqGyy1W
-rj57pJXNdErJTAg3+mxJsDNidvxuMfiVcycfTviFwXAyf50Yaq342xyh7eSZU5JSqRKSJ6NNfJ4S
-xiI/QpjBopRwaAnX/8WSvAQolTR+X7j5eoSr0hpFCe1XYXx3ib+nM5zkGRYk7bQys/TR9NcxSA2S
-6zZIab0F7RBn0vYo93pQtG+zkBUnySpIKT7+XaF/SUo5IOUWarFHMbJul+9oxOVw66fpegbzILMt
-OaFMLpcLCU9SwGV7RyMTTsnod4UsxIUM75S+O47hBLkjkYzml54xRKl88tPis5Xsn4dllZGNPKVs
-fsR3p7F/vkoNpWTCycLeyPbFHWY5HrhGDP6/EF6SZQznE8VHsVHOtXaLv+cK+QwJ3TiPUuk1jG3r
-Zbf9dcup+7yRSIBP2JVfAZ8TuhMcoS+d86dTSmT+6EHCtc758wWBfH+ZMEVZj4D88DJDx19VoTRM
-nYzx0k6SOYtTzzyND3/o44yfNJkPXfVB/nDrX6mpqEYxTfp7eyjmdKK1EWx/gIrKaqbObmbK7skM
-7O3Glytg5guMn9jA+OoQvnCSUKSK9vYEhVyBQMBCqYphqyqpbBpdU/neD77NwqMXs+eZn7Lijz9n
-+tsnsFgpkOiqIbPDRKsPMn5uk/qubOGoXQOGtWJ7wpJcVDajL/n4eu7WZ48SkrEPcdCQZw7lVsIa
-6dpyLLlIKRnpJKGk54tY5qAwXJXiOy8x8mp0r3XW4cCp0y+HRyiV67mrMOQZQ04YgpeFC7aVUqZ/
-TnKNlwsvyCWRmyhlN39QGIcTxEwsKEiSJgbY2xnOnRnrQksjbYst98cyQTIaKZWqrRHG+ARpNqoy
-8nKmMut/UTxbhbiW0yZrhRF3zjUYeZlXawTZUaQ2a6NUTXGDmAUvEG5sp6baL867neFExbEssjJW
-2T6S+jnaLqYj6a2T+LlX/H0UpRyBXjGbdkJLsyjlV/ygTHhAHjwuohQL3y5kb7b43Ll+hPLJnIfj
-/ecJ8uuQGSenqFt4fxxvXZEDyygd+3Kb0OsWSvH9c8SgHROyiUQmzRH62RTPYAnScJrQy50ML9aW
-4MBEZtv1PA8JsjqZ0u6Km8Q7HSO+F+LAvJuDwXoVMiLLyVcYrtzaIOxXhgNLkp1Q3HcolaB+UNiH
-7WXOl0N3PxKhlPcLve9mOMHZ1sYoGCrgq62fqS1YdBHFmx+kqibCL396E5n+3Tz+1CqKhSJLH3uC
-pilNhEIaOb3I1NlTiad6KORsVr+wgq0bNlMZCePzQc9QnFg0yOrtHazfvoNIUCFp+IlEapgybRpD
-Q0MkU1lMFcZHK1CLWW7+9FVMmuBnMNHDcaEo+qBKW3c12S0DTDpHwdZ8pDf5aRrXHPjSxxcv/O5v
-/sbLW3tUVwxPTkLxlelM63UgAO5FP4wRlOhgA6jbdadzYBaxNUq8zJYGz0FKK7ldLVh3UMzuELHR
-Rykl5xyJZKyxtnlIzB5sDkyQsl3hgUFBHD4oBsNB8R5ydrddZsBxvn+fIA6XiVDAYmlQWCEMoDML
-kaso3EtByzIl95M1woBriGt+h1JdcotQ4DSl0s4pYqB1G5+RBtA+SrXunxDelSrxjtsZ3snRdJEq
-u0xIoVzylbvNHhOG5Z3iORdKz7lWyFAfw5tqpcfYZrpLtk3XZ4ezdr5cPpG8nLDpIp+jxaJVISuP
-i4HvXPG8TmXFZEEKHna5puUYuypI4Z/FADpTukcbpQWcRssXeS3vv04MslPFjNlJrs6L93pS6EiK
-AxcCkol1VrzDtylV9CxkOMkT8dlDUviOEbyZPuFV6hRk9lhxOCvJ3i/CEKN5DXURmvqxIK3jxdFL
-aSXAyyktJsRB7PFIOmJIHiQ51KePIiN+QWgc72VRTL5MSbZM1/nbxPnO2hYxDlxa2Rm7A5QW8Xqb
-kJmQdL4OWGMhAv/shGw6rTXUBqmtUynuM8llkuzaleLyd76LhoYWVq1cxeXvuIhHHnyG7q5utu7Z
-Sm0ojKr4OXnxQsLhED2JFFs291NfXcsPv/efhGJNbN++ll/cfCvptm58/hiB+kn4DYtowSZkmKT6
-OpnVWM1ZZ53K9KNNtOIghb0p0m1tBMIBqhcpGGmDrBWjf3cHr7S1ceJFReV9Z7fO6erp19vjpjxD
-UlwdYrkGZF4HMuAI5CXC0Ackd/VYPBPOQHi/YI5VUhzVMUy3C0WNSbE9owxDdojAkBCS3wulHC/u
-NSgUNTVKHPe1wGmLDwlXfDPDayE4jNWZdceFgjjJfsoIA2lWvM9DDC/ZnBDKnhzFbWgyXGffT6l8
-cCPDteq6uIbz3aw4b1Aa1Kwys4QnKFUwVEsuUZ0Dy6ec2VNGzFJuFIY/SGkhlqJg/w9JcevCKCEO
-pw2XCgM5Q3y+UxjTqBTPVFzfjVMqo3R2tXTnZrjbzKlIeElcv16EcwxhrJwBIifabEDyzIzUZhcI
-sqJLsq2LmeNLEqnJcXiWb5UJ5dOu+2el+z9EaXGdcvcvF676sdBFZ50FJ7lugpCdnWW8PHJ8OiNm
-dHcKd3aTRBizjF4K+mrbwSEsXYIITJDsVK80iDj5PEPiWdybgsn6uIfSsr6Nwu45qwH2CfuiUL6s
-1wmzfEEQWsdrV5BCT7OAL4r++h+pPWTyKpPWZ8XzTBeft4tzfi7ulZH0q5ytcOzWGQzvKCpvlDYg
-yJ9TTeNOTna77u8V3h2nyiTMcM4HHJjg+AfhOXAqm8IMVzW5k3k1SsuvLxf9EMJVFukbAwlwanr9
-c+fOrX7v+67+WHu8g7XrNuIrKHzq3z/Nle9+L1OnT+ahxx5jx+YddPV0o2katmGiKgbTp7dSV19J
-Z18/8fgQvb0JDJ9FfW0dPttkyUknEYxUsXnTBuqbJ2BhEu/vIxIJ01xZQ9Yq0lBXQ0QzWfZCH7kd
-eyh2DqD1FzHT4G+uw2xoIZQpcOfLXdy3ehBfKMTsea3+iRX5yu6+QmEgbbg3+SnnbjzUnfpeDZw2
-lRc6cga5IVd8a1QPjTR7cDJWE+L7ukuhndhZuQ17ygm4IT1PWhp0ZNf6WJfUPVhbOAw3IIWqHGWQ
-Z2Kj1cCPFKt1XIkpyeDEXaRoLF6XnNR+TsKdYwB7GN4caaQlYh2FM1x94X4OdwkdDGciyzsxZsQ1
-+oTBGYncyJuiOEtuO3s3OG3pJFbprlmoI5+WdL94mVlfufaSS6kSUps5a0H0Sm2WP0ib6dL9ndmS
-Lc20RpPtVyOPo/VZiv0TFd3PlnN5N+REtKLUfo4+Of0XZ7j8NOfyVsnbIjsEOSn13aDUnvFDmEyM
-1e47Nf8Z6RllGewVOjAwAhkuJx+6ZF8yUnskXaE7Z2KmCRL9J/H7/1DKzekQM93l4ruzBHG+j+Hy
-43JLHstJeU4VjVyu7Oic0z+pMp4rec0PuWrLKSGWJ50Z9l9rwijj6g9JfeesW1JuXxWfdH5OOj/r
-Ii6W6/pB8bm8Ed4/yYk2BoH45+DT3rbXBDadc9JZR93557/SmRri05//Erf8/ves37ydbHwA/AFm
-zp7JrbfcQsu4Rs458xR27m5jx869aD4/waBGJOLHKir88re/x+8PUhGoJJVLoNh+ahpM0okh6moj
-7OvqMhNpTQ0oAWX15h6eXbWLXO8AlfVhJk+fQmNNgHcvCJDPGKRWtvH7R/bS74uyO7mXx/70Gza/
-8iSzZs2uvGygOO+36T57IG04jSIrvHtXM/0I5wzILNkpZ3NK+JJjIAGySzIluZNMicXKm0clJWNW
-jgS4r2WI6zgJK7LBS4wwgL0Wb4DTFgOiD1KC3fo4cI2ADPsvilTO4Diz6rTExH3STGC0Z7fZfw0G
-R8HkRCykmXZCGgQO1rZOxYrcT0aZ2bDT1v3i3LTUHpbUHg4ZGcn4yySwT7pWUPq9XAmh7M4dFNdW
-GDmj2+1VcoxYJfuv1KZLxl4mQqaLgI/UZk42tkziU9K7HI4BsJw+jPX+OZcr2ZLk0OnLBAfWxzvy
-MET5ZcVNiUT5GS7l0yS9HhJ9dTj1siA9rzNwBxmutMpLBEkmSeU8RnJ7OhUQMYYX5ClKg6Wb0Dl2
-2rFHlniukBSO00WoCymHIceB1QNyn/RJ9jHoyqsxpJyDVBly47bhBclrJj8TDJe6yhVdliuXx5Ds
-vy7JhDtpUnHZTE06Z6QF3mR91qT22C+UqY1BMf6JbbvWG08svWXXth1DR+WSKcY3NtPX28Oqlaux
-TINIOEIym6MiEKKncw9de3czadIE2l/qYsb0KRiWQvuedlRFoaq2Cl0PUCiYFIw8gWgYtQBBzSaq
-QTybpbOjy5wyfQrhqOorWhGu/tCHUI0C9f5ervrct1i/9D7W3/I9zEgF9z3fht0S4TPvv5KBpM74
-BYvp2beRRDHBpEVTKs9V1Vn/+2hHTmp4gwPXCHcnlxypRCSn453V1xTXLPhgyVOWNDMxpEFTFkBn
-9uhj/1LA0VzitqS0YYk0mRJrzx2GmZf73vLWrkPsvziMmwxkJTexNULszpAMc06a2Y20k1i5tnW7
-NeUlbHUp3JJzxf0ZQQkN8V6H0heO0Qyw/x4PptS/uRG8AZb0/rY0k/RLf2dHGNxl+cy45MkYwYsk
-t5kTXnG3WYH9d9Q0xtBmmitPwJJmb7LcH65KFpmMGaL9X839ZflxPCRDHFilZLF/qaW7Lxx5QHoe
-Rx6cz+TZ4OEIj8hk2pEBtz3Qpb7MMfLuprJMyCQrJF3PYOTdRR3vp7Oa4bGUkupWCE9EQbjmnc3S
-NkgkVF4Ey3L1iUx2/Oy/V4K8um5+BIIj60i2TK5XUSLiI+mPm3g7pNIpWR0podkhTqakH4UyZNgu
-I8+a9O7/XPxMOwThsHu70vovbrplu1+pwO/zk8gnyeVyvOOiCznvoou44/bbefTRx1izfgPXfvQG
-0pkChXSKCZMmkstBR1cHmAYWPqxsDl0v0FBVRTJToJhLEonWceVVH+D9V1zBipUrrDPOPCdfURsJ
-G1l8lVVwyfkLyaTTPHrHbbz0wlLW3PoTxleGiLXWULdmL9d9/kssuvSTbF7+QXpfzrD6pa3kMDhh
-YSsnzq6tzw5acx54qQtXwo/hSpZyu8yPxGpdlqTwBUkIx7q3uryroe4aJOTdz3QO3L/dHuF6stsu
-z/41tTJ5OtyrmLnbYrSFVSzXM9gHIVuWK0xijWGwsKVzDMkN6nO1s9weo5UOGlK7uvvJGsVLIhst
-H+XrheXktZG8I25joLruo48yKzfYf292cxTyZbmMYJr9y5lMycCO9swHazOk51YOoV8Plajb0vuX
-u3+xDDmzR5AjSyLl6gj95NatcraiKMmi/Kz6QeTw1ZKBvDTgaS5ybrrkZ7T2l99Bvt5I9mWkScZ3
-KG1etIDhhD4Zm0T+yGiltZaL0GU4sL7erV/WCPkfst3CFWZWJPmJaZ0yAAAQjElEQVRhFP2xysg7
-Lt22D6IfsgxZYzjfdp+vjVEo/tmAg4lMx4JjJ+vx5IC/d3cfFfUxzn77BVx8/oVMaqlh7bptJNMJ
-0ok0s2bPZM/OHbT3thPW/GQSGfyRABYmRrqI6lPo7BskqCpUVtbh92ucftJ8/MEIW7ft1vWCkZtU
-VxXcNrAbVQ9x3Yc+xdGzKjjhhAkkH/suQc1HXs/TEFF4x8njKPT/ifWPp9n04iaeerqf9r0pFi2p
-Z7BziPrx1crRU5XWngy8uKFLjrXLA+dINc0mhxeyJ8JdomIfwgDqXKfcNZQyn9ljfCbDpUhH0kvi
-vu9omc8j7fA32nnmSB6uMT6TKQ067oQ6+xDa1XTJmD3Gvi0y8j4CY7m/fK1yfTrSwF5OPg+lzYsc
-uLjN4WqzQ5XtVyuTr/X+Y5Htcm0zmiwWy3gU7CPQBu5Q0Wu1B/J7HMr1ZOLdQ2k9hXmUSlIrJPf+
-bimXJsPIOURuOS23CNjBSs3HqiPKGGV0JFs+kjzYh3i+WwYPOH8su3WpkntGe8+7Lox95obPHBcO
-azWPP/0iqq2yeeMW+gcGueeBR2nftwe/ohKrquTm3/0Kw9R5bukLHD19Cr5ghP6BARRMFs6bgeYP
-MNSfxBfyEwyFiFTE0CIROnv6uPbqa5KGruemT2+IWpmcVqlAZbBIfdBPtZqhSgVrTz+Gz0dVax2K
-qdG5qo+dS19g1/Y49dWVXDQpwPyjGqit87N1bwqNWizbF22Pp9RcXs+4WJzlYuTlapaPBA6HAtsH
-mR2/mkVtrDLHkV5nYbR7W7wx23faI8wQXusCUK+lPexX2a+vpj/tw/Tc5hFoM/t1ksnDcf/R5PpQ
-+uL11gn34nLWa/QIjiQbI11PTu5zEl8zlDLst1BKFtzLcM6JnOSXPEjIyD6InXk1a7q8Vhk5lHsf
-tvPHUjWwXxmCbgbNz332a8c0VVkzfn/HfSiqxmB/gvWr17Bv1y7yus7gQD+FfJ5N6zexactWpk2a
-xIMPPsTV11zL1j3bMHMmTz61lNPOOIs///F2IlWVKNhYus2mzbv5+z8e1Tv3tcWB3NvOOrair6c/
-4DMVmqpqqQwrmP09TDt+EvrOAaoaYoRDAdL5BGHdplJVmXF0hAXTTeyCSc0MG82qZtm6PsxAmC3d
-Q+pR02dGw9VVRldXrzGCobc5sAzmrbwngQcPHjy8leHeTMvJy3ByJJyKmH6Gq4OyHP7l0P8loR1q
-B6x48cWh1atWLY9o+VMnTp9Q0bmti5b6eizFx1nnnMvRs2dz5113s237Dl5ZuRLLhi/c+FlyVp4V
-y15k98atRGoq2L59J7t278EG0vE09TU1GLZOhaLbu9vbnMzwTCgQMi3VxPZFSBYtgsUCe/p9aM/s
-4oGNORZlLGoTFslckoaojxOXTCazfi8JVKqnQ9sqFV80z9QZLazZmKK7L8WlV10fOFNTpm/Z9CUr
-myu460zl38vlC3hC5cGDBw+vHwGQKw+cBNgw+yejygnNToVLkdd3xdi3LMYSGpA9Airge3HFc0OR
-Kt+Fho+qnq5uUmmDytpKvvaVr3Dm284ibxRZtvwFmsa3Usxn6Oho5+GHHuDWP9zJnvYuUvEh/nrv
-Pdxx931MnNTExRecxfbdu/FHfVAs5HbvboublpUC0osWTavv6yuGE9kiuzuSbNk7QE+2SKS2BcvM
-0Z30MWnhBSw4+Qq27exBCRcJxFMoWKT2KITqKljfb/PEqn5SSoiFJ5zEJz71OQb6uv3r1q2L9vYO
-ZCRhkRM03GECzyvgwYMHD28cIZArNpzywIwgCEmG9xGRFxPybPZhIgIOGcAhAz3d/fqxixcl/usr
-3zi7JhRUVm3aQrw7zspVa3jkiad5+OF/YOl55i1ahF7Q2bGrjYHuAQp2kdrGGvLpHEVbR/MHaJ40
-jllzZ7Fl525aWhuNbes2Dwwm0knRsclZs2a09GQKEX8gyu9v+QMfu+EGJs+cwee++j22tXdx3FlX
-8JkvfJU58xezp7+X1cvWsXhSiFRbmqCiMGQGeOCVHhZdcQU3//YvzJo3j4pojMWLjmPz9i3BXbu2
-h7OZfIYD42CG63ePDHjw4MHDG08GDPZfAMg5nCqqw7nk9P8JjHXvdMvVAbm//+OFp2uqJz235JQz
-qGusxUJh4+bNLF+2jEx8iONPP5bf/OInfPHznyEaCtLUOp7bbrmVe+/6E/XNEwn7Y/gUP+tWbOc3
-N/2ZqU1NpLtTibau/jjDq+QNtYybpGdSGcK+ANlcjq079/Dcc8/y0GNP8Ktb7kXXhxf62rGzk0fX
-7OObTyT54x6DPXWNrPfVUtSqeNel78OnBRhX38TFF13Ecy88RzgYo662uq65tW62ojCO0kIUzk95
-t0L37k6KJzoePHjw8IYSgYLr8EjAEfYIHOAV6Orq+v/tnXtsU+cZxp9zsY/t2LETyI1rGi7hEli4
-3zsuAqH1grZK7daOMaAqaOPSThvStmpbWammru2mQaFF29oBE1QCSjtooTSUGCgtNEBJAiEJiUMS
-27HjS+zj67F99kdymhPj0LJOLYj3J33K8cnxybEU5Xvyfu/3PEmdTteycOGSMn2WIb+65jIiYgJG
-gw5dogi3O4i6a/U4/t67cLm9ePyxR7By5WoUDByMv7+5CwzLQyMI0BsETCgdgoKiwsjBtw/bZVlW
-bCa9AHxTxw4vag+IeaLfh5qGBhz+zwFUVJzC6dPHoGElBMIhjB4xCOc+O4sdO17HhMnfwebnX8T0
-mbOw6/0atHQEcN3hRO2Vy3jsh49AJ5iwY/sO7N69G1drr0LLC0wgENSBQVKSEhH03TKmjpbsL1mK
-IAiC+PbEAf09/gaFgCIGvvBDr6ioCESCvprVK9dMqW+8khuTojBodZAZFojHcK2xEU6nCwmGwfWm
-dhz+4AO8feQIaqtroON5mHRajC8dhJKhQ+JHjla2ezzeTqUSgJ4wF8GSK3GpxIS83Hy89NLLKCos
-QNn4SXht+07U1V/FZ5cv4djRkzh+4kOEwmEUFA/FL9ZvQkfYiz1vHUJjayd++/vnMG/BQjz/h9+h
-4YYN1sozSDIsIKcw+f5y3D9nOtvRYjf7u4JhudchTZ0klW7YQb94BEEQxD0pBG7i3PkLgdOnK6oe
-evC7Yxcsmjdgzdr1nOjzo6G5FRazCZyGRyImIRIN4UbrDXTYHWAYGTISKCrKQknJgMhx64Wmq7X1
-DvR6ZnvQvQWkc/jQbGgY/Vy70wshy4BzZ6xgNUYsXTIP7xx9H87WToRDQYjBCAAOtvpmHHrnEPbt
-OQh3hxMbnl6PDes2wGQ2Y83ap1FXew2JZAo8xyEFGUvnL8YLW15GU6uNvd7cYEzGEmIilUqPk4zj
-Zie524nPJQiCIIi7Xggozkvp1q9oa3OGvG7/5XmzF4WHFRePFYMOTbaRR1FBLlpdPhg0enAA4vEU
-si0ChhQOxIyZEzGkiI8fO1pVU1vd2KaqBHh6xEB3RYBnvWOGFX/f1eWH1foxWmxONNpaYD1Zidoa
-G+JSDCNGl2LL5s2IxmKwd7iQiEbRJYYgSUmEwyF0BQJ4Y9cutNrsyDYZsGHdo5g4aQ4qz5yF0+VG
-ltGIqk/Po8Xepsk1GbhQKCymUrLiFa2sRcXR10uaKgMEQRDEXQ/zP1yvjmDUoruJTgfAKOgEy+y5
-s0dOnDhyyc/Wrps7etT4nE6vTydoBeG9w3txvdWOKdOmg5Eckarzte5/vrm3trHB6cLNMZRKj0AA
-QOSpVfOPNTVJRkP2AHT6PHC5umA2ZcHlDoLRJPHAkgXY+uqr+Msrf8W2nTshxeJYt24NZs2cieUr
-ngTLsMjPNcNgysbFS5dxYP8eLJ6/BBt++Svs378fLCMjEgqAE7SwGLWpiBhuaGvz1KA7i9uB7ix3
-J3odq9TRrbRFhSAIgrgnKgKZBEQfj+hkIinZmmy+T89eqN629bUTtpaWWrMp22k2ZwezLfnto0aM
-axeDYce2bXtO7djxr0+8XtGBbgcoT8/o7BEAXpUQEIsHmZJ5w/JmP/H4A1j10xXYuPEpmPMKUGk9
-A44HXHYH9h04iI8+OglJSmCgxYJhQweD5VhcvFgNKRbDvrf2YO2qn+DkyROwnr2E8kllsFZY0WRr
-gsViRiKVBAMWWk5mhg8qMsejklcMRwIqkZK+ReXrWM0SBEEQxF1ZEVC/T51BoOmpDmjR7fikR/eW
-OwOALNU5oedaJZNb2Qqi7AcV0esKpRhDxMvLC0ZZ8kzbps6aNHbZ936OkvtKEQx24bk/bkGnuxOd
-dheanHbwHAdB0HbPy3IKPMcjGo4iCRbLli3BxPETsOffe+H2dMFsyYbH5UUyJUFv1EOKxcHJKcTj
-EVgMHPJMOQ5rVW0FgHYAbQDsAFw9owt94zKpV4AgCIK4pyoCyFQRQF8DHrUftJIzHeqZ4BUnKH+G
-0YW+DlExny/i0glyu73TM7Kh5fPCG61NiPrcqLM5oGV4TB07CM9sfBLDBw9BW5sdiXgU5dOnYsq0
-6RhXNg55hRZ8ePwYrNZzCPi7wCSTiEsxyHIKMgPIiRQ4gYVOlrBo/nRsffE3GFxSrK+6dDHs94dv
-KJUJ9LpZKbnSJAIIgiCIuxr+a7w3PT5THdqjdn3S9lQBlKFkcqfnWivZ70qTnjLZpmKxFGqrvYfL
-pgiXCkz6Z+ubG8pu1DeM5WMJXo7IGDd5Bh58eAXmzHfA7nfA1erErzdtwtTyaV887JpnVuPKlXpk
-sTyu1jVBjoWhN1kwY9o0BEUfrtka8MKmZ/GDR1cAAOpb/saPLCkcFg5EtC6PGEf/mdsMaGmAIAiC
-uEcrAsDN2dFq9ye1MFAmd2WtPdLPULtEqSdf2eUQxfqr9kqTJqvKoGcv5+rMosyxuSGf1+hsuYaa
-i6fQ3NGKYNAHzsDC7XKg/kodImE3Ovz1mFc+Ew8tnQNnswusTosf/fgJvPKnP2P0qJH45MwpDBie
-g1iXC/94fTvqqs+heNgAQyIWr2lu9VzvqQqEVBUBdaMgCQGCIAjiroT5P98rPbaYVVUAWFUlgM0g
-HNRLC6m0/77V91N2KuiNBr1ZI2gt+XnGonxzdsl9owaPGTpyyLSwK5Yl68F5EyG20+MRomKUc7vD
-zJjSEjy8eDH27T5o8oaCbGnp+Mjy5SukiuPv4mjlx8jR8SmO4aMTp5TJ5hxT4MAb+45eaXR8HpeS
-bnRvbVSWM5RdA3FQIiFBEARBQuCWgqC/oUa9vKAWB+n35HqGeuuigO5GRF3PEAAYdFmCMZFICgWF
-5sIskz6L4WU2EpQ4PsWymqQ8Jid/oODz+tu9ouiPJSQmx2SR9XpWsjU7HNFYUmlcVGddB9Hb4xBB
-7xIGGQsRBEEQJARucW8m7Tj9++rSevpx+v3UVQYevX0Hyo4Fjeorr7pG8T1gM1QnmDRBos4aUPoc
-lGULZadAerMgLQ0QBEEQJARu8+dkEgJftdqgFgScatJPP/4yAZAuBOQMYqC/JkYSAQRBEAQJgW/p
-mdWCgEHfXgQuw8TPpl3f3xJFpp4F9a4G5TgF6g0gCIIgSAjcMYIgkzDIdD59maI/IYC0yT6Z9poq
-AQRBEAQJgTvwMzBfMuEzX+Ezy7cQBennCYIgCIKEwB38eZjbPJ+pUVHO8JogCIIgSAjcAc9OSwME
-QRAE8TX4Lybv2o9oSY6CAAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.4@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAFcAAABVCAYAAAA8AHhnAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIKIGIgTigAACAASURB
-VHja5b13lGTned75u/neylXdXZ27p2emJw9mgJlBIEAkggkkQXIZlHkoWV6ttVrJKx3t2pZ2Ja7P
-UtJ65bUtyaa8FkVZgZJMUzTFAFAgQBJxBmEiJvZ093QOlcPNYf/oauxFoQeBHJAKdc53qupUd917
-n/u+zxu/twT+4T2Ezoo/wrfqQP8QgRW3APaGAyz+AwNWBKSPv/fmD44WE0lA6qy3RNDEH6D0CN9H
-zXlZYm/emfxfbav9hf2Tg+/uALsJ+t9pcF+WHEDuLOmturCtrnWkQLbVdH5ZkuTTi2vm051j/73Q
-XhFQAB1IdVay815+iy9SBJSizr+9ZTL/BJAHckAaMN6q48s/AKlVAa3zPgLc2HorDIsACH1Jbb+m
-RT+T682/nyvVzc+iznrL7uj3W3rVw5NDRztSk45JjxqjiRvOtZHofWZ8Z+9fPPbM9PNdwL5l4Eo/
-CMkVHfOz+ZR6qG4Hz3W0R+hcZNhZ0Q28mcIt+3v/aTKp3LNWDT9Wb1hx1yu+uNFAS99Hqd0EWN45
-2js+Mtz/j3sKyebSWuNKjCJCILhBFykAwp1Htk2KQvQnyXTmo2fOLy1vcSP/3oArAEI2k5kRIu+H
-7rv/3rvDMHhhYWm9FJOmG6WuIiCMDKS+HIbhf376hfn/FvNK4jcyfKvo4fsJ7uYFCOV6yzQ05Ykw
-9D501523v+vkmZe+5riB3bn4sEuyvusbedfR8X/mum7vc2dXfzHm8kVbUNBbwrvfT3BfAXKlaZer
-1fITVrv1Yx9+6H3Hnj5x8uHolcBG34MUiw/eu+eWRrP1a00z/HC5avpdvnR0g7Xkbw24L1+c6YQl
-WQgvCEg//c773p448eLZZ7ti/rhxe6MAiPsm87oiRX/VaJj//YXpynxXoBLy6pvI3ydwXwa40rBm
-hcg5p+vy/3HHrUevnDx7YbpLfaM3YXAEQEjn+TeiIH/x9MXKN7dw76IucLuTWMKNCtF/kOC+TBGl
-Wnsmk1ZqiiL/GkTfLFXq1S6efiMSLABCcYf8kB+EO69cbv32dcLrrdy96DWAja/o7xK4L3sIi8vV
-k7LombcdO/LP5xaWv2TZjreFBMddOjEGngiImVHGBMJfsWv8rGtHdH2+FZC8DqjX+7u/M+C+LJ1r
-5ebJSml970c++L6Hnnvx7Ne2kJiXfeWtVqqPz4aW8PP1UmR2JYbELdT+FRFc7GbFpV3sWtdzL/9W
-gHs9HntZQust69HK2tJ7//FPfXLHU88+/1wXMJsZNa2T8NE7obNeGBd+KXT5Um2Zuc7nShf4cZCl
-LjDjWTqp879K1/+Jb0CyX3VR3wtI35W6vI7jL2VSemqkv+fPP/DQhz77W//P7z3ZxbubF/8ygNke
-blEMaby0EHxxMzAYG0ru7uspTIgCo57nRK7nlBCks+evVJ6/jo+7lWTHDZ/fFXjEX7OVTRC+C4mL
-q1L3a15Dfa5HCWxxkVImnUzumRj7kwfe8+Cvffr/+u15QJgY7r+nv9jz6YH+gYHZ2ZnLl2cXfj0I
-AyWblz++tup+rtBrHMjlEnf157O3G5KSzOeLeJ6H69p4votpNgjCYNnzo98/eX7lT7sMm7AFN0dd
-QPqA13ntXSfKi94oLcTVKK4u6haqmYg9x1dyi9dGbG1+hxZ7Vh3XE+qN5pOOZf2aphvPVKpVxkcG
-/8D3g+G777kH3/d7dFUOfM+6X1IMc2yi/2d27dr5YFJPbh/o6VdDV0AQdcJgQ/tFUUYUFDLpfDqT
-Tt/bk1XvaFut47YTBZ1jajGNUDvnEqeHbj4WtqC1NyRRAq+uHGweRO06aPfBX+sEXuUlbJFAiTrS
-ABBJMLlrYviTdTv4DUMW/ri/f3RClgxSqSzDw7n2E099J7n/0AH80MfQVcrldYQgQBZErKZNEILv
-efh+QCQI9PX2MTQ8jOfZXLry3MzzZxZ/yg8iNyZsQlcOwo9JrBN7jueh/c45B3Gpl18D2LikajEp
-M7IZY3tCU7fJUpTpyecGdC2RSiRSoq4lBUmSxX37DgpRFAmjoyPMzc0Js7OzeJ7L6Ogonh9U10sl
-q91uoypSJEmSOzUzs6rreuh5XrheKrUXV9dKm+oWQLtUqT5W7Ov5V6qW+urFi5d/7uMf/Un27TtE
-uTGTvMV2WVpeYOfOCRYWZnEsCyOh4vs+ohAiiuCHPpbpEAkS5XKLVNJldHQMb9yaqNfMT12YqfzG
-Fp5BELv5m4CqgMUri5rhFgGPsBW4m8DKMVATyaTWf2DPjk9oonxXykgdzKQzSsJIIqsGAwODyLJG
-b08R07QprVfpzfYRRiHNapPIj0jqSUQjjWf7mG2TlJZACSUK2RyyJHHz7ptIJlNYlokgiEiSjGm2
-Lcv3n3rkW48eP3PxpWt+KJ4ZKEof+PjHP4rjtllenWXm6lnm52a5447buXDhHGarDkKIFGjYtotv
-u0iCSOgEBLaDJCn4tKmurLBzfJSx0THqjbW7G6Z1fHHVOhnT1HhaclMyNzVW6gAMYG7BueH1VFWM
-SawOpI4cO/yz/T29//P+XXvUYrYXvACr2abdtFiut1BUHc/zERAIggjbdogiyOay1BtLGIa+UU+S
-ZVKpFM1mk3Q6TWl9jchyMdttJicnCaOIVCpFFEW4jkMYRezYu5+HPvQQ80vXnJ/7p/9TfdeeyeKl
-qasEIfze7/57PvzgO3nvu97Nr3/q1/nZf/IzSJKI5zmomky72SKwA1zbwzYtPC9AEkQSegJdTzAy
-OszA5ACW2+TE808vPXdm6V9u4c8GMePldMBsd5YJtDrPTowyXvYmpC6pjfuRyWN33Pmr99/7zl/Y
-t/uAtDC9yNzVWVbmlikvr9OoNTADC9tu44cOrtvGD0yiyEVVIyyngaooCIKAqqqk02nCMMQPAkzT
-JJVKIIsufcUsghTQaFaQ5YhafR3Pt1hYnmdprcqpM+fYtWeffM999yeXV9c5dMstnDl7iumZKVKq
-Sn+xn/n5BZrNNn4QYRhpFFnHtnxCL8RxXDzPJ/R8Qj9AEQXEKKLVbCAYEggiuqama7VKrWl69Zhh
-VWOlJykWvARbeBBxV+1lD0Tqklpx01LefPOh+z724R/59J6dezn+5DPMz84hI3ZEWyAioOnX8EML
-P2gThiae38KPWoiKC9iE4QYl+YFDq9XAcS1EMUI3VGRZwA9MvMBBVkRsz6bRbqAYKn39vYxv34Yd
-RFydmeXFU6ept0yCSGRgcIjZa7OIsoIiaRT7B1leXWdhaZ2x8UnyPQOsrdUJULBdC8fzkGQJRZaB
-aOP8xQhZElhYX0U3EoyNb8NsN7Pzy+XLMWCVLaK8sPPsd62t3DJB3qoMA2jjY2O/sGNwnAtnznPt
-8lVSCR1VlRGiAM9z8UKXKIoIgxCCgDDa+F5RijBNB1GUMHQVP9gwxJIkEYRgNmokEgmCMCST66PV
-auM7Er0DO9ANnXK5zErVoXx1iUJPlm07h1lcrDA3t4wgytQaJoqaxrID9u+5iVqtQd/gds5PLTO0
-bS+rqyWM7Ahes0ZoN0nrBrIYYdZqyLqC4LogQCSG+H6AJCmMju6gUW+Pv3hueshyvFrMUG1SgtJF
-E3qHd5WYZHdHbpHUBawCaHfddefeH//Rn/gX5mqdxx/5G3RVRtcU/NDBx8OLXNzQxw80BBREQUWU
-VAI/QpZUfC9EECSCwMVxTaIoQFElwshDkgRUVSKTzeJFvezacytDI7vIFkYp9IwxPLqbsYn9DAyO
-02jNM3ttlkQyh+9L+KFIOpMn39MLosTySolDt9zG7PwymVyRw7fcgZbIUambDI1O0NOfwnJt2mab
-SAjxPRfbMnEcEz/wQVPxg4jdu/YxOraNmZlpc7VcqXRJLF0GLtjCJfM6y9+KFsQYuPonP/mTn/zQ
-hz7ytvmLV7hw7iyI4IUefhjghQFeGOKFIWHQMZCCgCAIRBGI0sZ5SaKMKHqoiowkyng+OE6IJKeQ
-pCSKmmVoaIJSqczs3CKimmRhpULFDEnmRxnduZe2WeWmg7fSrIWUSxbpVB/DY9u4trSIqKpUWz67
-9hxkdWWNZMJgbW2VEyeOoyeSuJ6LbddJpwwUUcB1WkhiROQHRKGAJKoYqoJlmh1qGEdWkJ8/dXY6
-VpGOS+Km1G56D3YHXLsL3E0X7hWSuxkgGJM7d/yK2XIGHn/4YdbWV9ANnZAIUZYJI4EgEogQEAQP
-UQpBjBCECFHaOA9FUdAMHc9uoSgKkqDh+RKCmGR4ZA/JVD+ilCTy6zQaZZZWl1mt1DByPbR8ETmV
-x5cNVM2g1RYpZMfYM3kztXqTQl8vs4uzSAkNxzNYWS1z9ObD7N01ydrSAhcvXUSUJEzbxmu3kSJw
-7CaRbxP6DkIoEIUSBCJy6COLIl4Qsn33DoyUlnj08ScvdIX0USyw8WISa3WAtWLBxCvcMrk7Gtu9
-a3vxnrvuPNyXH+SJICCbTiMS4fkeiBBGIWEQEoYBoti5L9HGs+97G2ogSoiI5HK9BGFEGCkkVINE
-skAun6daM4lCWKmW8Yko9BRJF4aomzb9w8OUKlValsu1+ctkEmn0QKa6eoXJ7aOMjo/zX/768+zK
-7SFCZP7aKs1dLr65zvDIDm4+HKEm0rx4+iyRbdLSgMjHbnt4poMUBkRCRBD5BMHG6Z8/fx4xoXL4
-yMFNbyleHN30BMQtos2teiCI04IYN2THbjnw0PjQyLtPPPk05eUVhDDED3xURSYIA8IwIAx8otBH
-lCQEYeO+CIKArhskkykMI4koSQRBiKwYJFM50pkevEDAdgKaLZMgDIkIcL2QIFJwApGm5bG4UiGR
-ypMtFEkWR7k6s4SeSHPfvfeyd+8ujj//DK5vMzs3RyozhusEhJ7HttExPvbRD/HEky+gJdIMj24n
-l81hGEnS6QypdIowCAhDD8cxcT2byPVAFIgkmXxfD7Im8/zJcxe2yCNvqrsVo4JNn9ftvPe7aOHl
-u/Fysri3p++Ogd5ecB3sdhNJDFHEjbuvSgKaLKLKApIoIEnyhkETZSRRxfcjPC8kCCJEFHKFAUQp
-geOJLK1WcLwQ03bxw5AgjChXmwSRhKqnQFCY2LGHm246yk2HjtJsu7xw7iq7Dx5Dz+R58dxZnLBB
-qVLB9UPCUMZ2I1KpPNlcH6Zt8e9+9w/J5ArISopGyyaTLYKcRNYLaHofg6O7KfSPIicShLKAIIl4
-no8kSWQyWYIgYIvEObGmle7gItziOdqqV0wExPe///0333HsGG6jhqEpaLKEqojoiowqi4iECFGA
-LIKuJpBlDbFjXGVJw9BTKIqB4wTMza1TaziUKy0Gh8YYG9tBIpkmmc6CrLB330G279hNNtfDxI7d
-SJJBrWUxt7jC5alZDu7dT+j7tJs1FhZmmFtYJxIE8j0DVKttjGQSRde4OjtDo2Xz9PFn+aM/+hxI
-IkEUUmpUGRwbx/FFikM78QIdpAyZwiCKnkIUJXRdR1VVYCMyVFVZv04KNYpRQNCVrAnihmwTULm7
-lysIgp0XT59hZe4aLdOGTJYgCtETBoqk4roBhAGqomLbLhEgCiKyKOK6HpZVRdM00pksucIoqWyG
-nr5+5hcWuTa/wMDQCOlsDj8IWF1eQRB9JC1F23SotEzQ0ly+MsP+AzeRSxqceuEUoVnh9AtPc/LZ
-b3L09lspFAfJFYcZGRth9uoljKQGckgyqXHsztt46eJZRsbHMc0W56+cZ7h/iKXVKgNDk6yvyjQa
-DTK5QcRodYO+FA1BENENg4SuJlzXd7fIF4Rdvm8Y42N/qzL9K0oXud58enb2Gj25HDu3bSOh6yQM
-HVEAURAgClFkCUWWIApRVQVRlDaOEAToRoLR0VG2b99OX1+RVDpLEIicOXseP4goDgyhJ5KsrK5y
-4dJlBKQN7yMUmJqeJZFM027b3PG2u1BkhTPHn0B2G1SWZxnpz7Fz+zYM3WDH5BiCYuBHLj29eWy/
-zej4MHfffzerpWUGh3s5efp5EmmNZNpgenaGXL6P9UqLRKqX4ZFJwCAKIQxDyuUyvu8zNjbGyHB/
-pstYRVtIqx9zyfyuisTWLaT5ntzQ+lqJ3t4BevNF8qkUCVVGikJ820ZGQEZCQUYMJdqWhSCJpDMZ
-Cj295PMFZFkhDMAybZbW1/GBsW3b6OkromoaKytLRFGIAoS2hy4bOJaPYWTxvYA7jtzMYEbn2unj
-rM1doVWr4viQKoxgBgb1RkBvYZDJ7btot5r0Dw5SHBrl8adOYIUiiUyB5bUyt9xyhCunXkL2A1Kq
-wOL8ZQYHe/AC0FMDaKkhhGQKJaViGNCfyzFSGGGodygbC3OFLYIINwauF5Pi7j6IV4I7c2nmcqVc
-xnMjMtkijt1GCHz68jkG+nrRZAVJEBEjEUmQ0FNJAgFsd8NIGYkUmWyBldUSzZZJtlBAVFVsz6Nt
-mSwtLeLYNo5lUuzrRRYE5mfnaTZMBCR2ToyjhBZf/NzvUJo5RUqTcByP3QeOUncU1mo+1VbEyrKJ
-02gyuW2CSrnM2nqV4fFJ1GQCPV2gWmuxurJGwciwNDVFSoWkETI9fZZsLoEXCKiJApGewMMnmVLR
-EHBqHpFFbotkf9AVJLgxnvWv15n5qnq+KAluKAgoCaPzaYSiyARBQBB4CAKIokAUBeB7aKpCJp0i
-k0lTqVS5Oj1N/8AgvcUBgiAimUwhywr1eoNsNkcmk8V1fZaWl1iulJnYtZ1MPsHuXaOsLF7h63/9
-59jtNeTIpFKtMTw6xvmLl1FVne07dnL01iNcm76KRMjpF0/QV8igyiJ7d42ytrJGJpmkkM9tREWK
-gCCFrK0t4HsmouAxN3uJTEom8s0NF1KU0DSN+flriKLAof0HCoosq10+bhCrSsTpwLkeJcRdjJej
-kInt26eSPQWWqzXCaCOjFRFg2W0azQaua20AS4AQBUS+S7NZZ2VpmSiKyGTzVOpNHC9EUTRKpQqV
-SvVlUE3TJp8vkMrkGNm+jYZZo6+YZmXxEpfPHSd0SoRuFT9oMbl7D+vlKv0Dg7RMC9NscfbkSW49
-ehO3HTtCWhdZvjbF4b27OPH0Cf67Dz5Au9Wg2WwQhgFIAcmUynppmbn5K7Qaa0hYLF67QH8xRcJI
-ISCjaRql8joXL51n9+494r7JnYWuyCwuofFyz3UpodvNiIDw2uLCybptc9+DD9Jb7EOUwLZNqrUy
-YeghySKCGCGKApIYEbg2oe+iqgqeH7BertJbHEDVE7RaFkQiimzQbFikklkSRpowECCSsOw2hUIG
-s7HO8vwlGpV5KusL6LpMtpAl29NDKCoIkoJhGOSyWVRVxjZtJkaHSMqQlGBssMCB3ROsLS2T0BUG
-+4vIkkgmmyaby9DblycKHFQZQq+NJvk0Sqtk0z3IcgIQUFWZ8+fPkUwmeOd994zFcOnOkG0C676W
-MesGNwSCheXlZ64uziEmk2SyKSyrjSQJJBIa2VyadDqJrqsYuooQeCgSiFGIaZlYlsXQyCjVRoty
-vUUqnUeSVEAklysgCBKCIFEuV8nn8rhmk2tT57l6/hRuvUTkWQwODpAq9JLtG8YNJfoHh/HDiCAI
-MC0TVZaw2y3WluYoL85QXbnG8Sce5+KZUxw9fDP5bAZNlUklk4ShQBBAf98AKSPJ4twcTruFKoAS
-RZgtByKRMIyQJBHd0FleXkURpEFZEpWu0DaIGTG/q+pw3Y6bePZHajQa5dGJnZ84dPiomhPazExd
-Qjd0enp6yefzCKIIkoAkSfj+Rk3M8wNUPUEyncN0fBQ9RU9fP62mhW05KLIKCKytrROGEQMDg6yu
-LJOUQ5Znp8joCookoqo6WroHIz+MQ4KGBaqepGXaqKqK2awzOtjL+GAfa/OzjAxkUEU4dvQIiWSS
-VttmeWUV1/Op1erokopjOfTks1itJilDI7B8EooOASTTBYgsBByEMCCKZDQtjZpQhcXla3al3lyN
-Zb9anVUHmp21mbCJrgduFAfXbFtB7/D4vn17D+wpKg4nXzhBuVxBVjWqtRqlSpkgDBFEEc/1cFwP
-UVZIpXMIooakJcgVilRrLTzHJ5fLE4YR9XqDTDpNb0+Rq1evIokCVmUBQ4KUruGYNj3FIfTsIIFe
-QEwUECQD03aoNVokDR1NFhnsySNHLoFrsjhzjnazzlNPP83ly1e4+977sV0X03FQZA3P9NE0jVaz
-iqEpKIKI2zIRQoF8poe2E+A4NUTBQhbBtkI0Pc3eg3txvJZx7uLUhQ64m8A2gUZnmTFq4PVo4eUa
-/ckXnvn3337i6zR8ifHJw4QkwFdJGwXaTZ9G06fR9onCiJSRIJdOIYtA5JJQRarlRVIJgVRGBhxK
-a0sErkW9tMzK3Euk9TZ++xq2tU42n6TpmLiSgq+k8CSDlh2iqEkC18I1WwiBTyqRxG6b2FaLRn2d
-2269iRdePMHcwgzJlEFxoMju3ROISIQeNOptbMdCkiRCZFQjixNKhFqCtu+zWFmjZyBBOp8gCCPc
-IEIzZBpmhUJvL+9690PZbWODg1sUKoMuro1erxHvFX1SlfX1+vi2vr3vuO/9k7fefg8ri+sszi4R
-edBs2Wh6imQmjyxGGy6PrBCEAa7nIxBu5HaFEC/waTUbDA30Y7daeGadvoKG3VqmUZsDEZqOjYOM
-mMhRGNyOg8rg0DaWlpZJqjKtRpN8poDvBOgyFNIqIwMp/vpLf0YmreH7AYVikR/5kR9DNwpMz8wj
-KwaNehMhcrAdE4Bmq0kkiggiKIaGLwS0rBVuu/VmGvU6rXoTQRLp6SvSUxwile2hXFkTLl6+cqWT
-DYvTQqsj0e7rce5Wzb+i57mXewr9Pzo2Mi7VqzVeOneWZrNJPpchndYRIg9dU4kiCCKwLBcECT8C
-SZKRJIVatY6hG5RWVunrKVDIp2i1qqyuLpFOJ/EjiTCS2L5zH7YLbSdk28QeTNMjmUhit5qk0lks
-y0XXdJIJhXxSIanB7slt9PflmNy1m92799FsOyiqxuy1BTTdYHFxkaSh0W43MdtNrHYLVZHRNAlN
-VVA1Fdts4dkOtx09RiFboFJpUKtZZHJFLNun1ljLvnThwskoijZpYJNv2x3A/TcC7qt6GNbXKs0Q
-0bg6M3PbwYMHufmmQ1y5dBERj75CmkImgSirOI5LGEQb5R1BwXV9JEmGUEAIwXdddu3YgSrD1NWL
-mGYTSRJotduISgJVT1HoHcILRIZHd9A2fRTVYH11DVURaTRa9BcHqFYqGJpEQg0ZHczRm0vw7cce
-pa+3yP4DB3jm2efoHxhhdX2NdCZDrVZFQsD17I0ctL+h0bomE4UBRBFEYDbbVEplDu2/idtvvwtV
-TbJt+14OHDqCIPni2bOnrzWareWOtLaBWgfoTXCjNwJu1A300tLimbbVuvvIkaMDtxw5QuC6VNZX
-8Kw6uioSomDbDoIgIckKCBKOF4AgIgoiKT3BkcOHaTUqTE1doN2qEYQeju2Sy/ci6UkSyRyuL5Ap
-FEmm8hh6mlqtidXhV1VVMbQkltlGEUL68gkCt8HMlfMUsllUWcV2PARBZs++vSwuL5FMGSwtLiKw
-QQNRsIFBFPposkQYbtgg17GRBYFWo8n87CyqmuCBd76Hvv4R8j1FkimdE889W11cWroSM2ib9OC9
-lqfwel2Ogu/7YRC432nWax9VFd146IMPkcukuXLpJaqVUqfo6CHJKkEIYSRS6OmlUq1x8MBBDu3b
-T6te5eyZ5wkjB0naKAHJioZpe+SKQxjJHEEk4gUSkqzTatq4jocoimRSOvVqHT2RJPADdFkgnZQZ
-G8zTm09QWlklQsD1XA4cPEjbNAnY8GRKpTVaLQvHsVEUGU2VCXyXjYTeRjQbBi4EHroq4tkWpXKJ
-5dV1ltdLrJcr9PX18MyzT1kz12ZOdiR10wUzYz7vmwL3Ffu1TNO2SqW1p4IgfF8QCMadd72NWqXM
-mdOnUEQNTdURRIkgjDBtj77iAHfd9XZ27phk6vx5nj/+FI7bRpFDgshDkVUkWSed7SVfHGJ1vUIy
-lSOb78MyPdptC8/xkQSJRELBc31kRdswBr6LoYaUV6bJJjUuX7xM4IfYjotlWViODUJErV5FFCVc
-NyIMQ1RFpl6rQhSgKiKiAIoio6ohlllDlSFpqKQzKZaXV7g0NcXi8hKTu/Zy4eL5mUtXzl/sANqM
-tTJZrxdEiNfbwhSLSOxyrXHm2089+aOPP/X0fCDpfOQTP8U973wvzWYT27bxfY97776HT//mb/KB
-970fWZI49eKLzExd2QhDUwaObaKpCpqhIYoKqVSWcqVOMpWl0Fuk3baxTAtZlJEEEbPVoidfQJZF
-FEnEd2xkReKHP/YRCvk8mUyaXCaLgEC1XAYiBgeLtJo1MukEq6uLGx6M69I2TRKJxEa4FYUEwUZj
-i6IIqJpI26ojiAG208QLTMLIwbQatFsWpmnWu6oSwnVaZN8ULbyi69u0zFLbbD0yNrpt56Fjt0+M
-jGxn4qZD7Dl8lKGJ3Xz0Jz+JIOv81z/7POvLS8xNXUQMWqSTCpbZQJJk2raPbuQZHt9NIGik0lk0
-WaPdsJFFFdsOAAlDT+K6HmrGoFytkUlnUSQRMXQwGxXGR/qZnr5MhIWqSzieyTvecS/5Qpql+Xny
-6RSryyvYgU6j0cSslOhNJ5CjgBCBdhCxVquT11wE38Iya0gKuJ7LWrlKIplBkg3uvfedfPmrf/nc
-ytryakdiNxvvzFiO4bvi3FcBXK1X21/66n/7+vy15WttN5jce/ut+bn1GrfcejsD/UX+47/5DPNX
-LyMFbUTfxPUbRPi4jo+iJDGSBUIpiaRmMJI5FEQKmTy25XF1aobBgRFEFBRZJQgj7MjD9TwIA3RJ
-wGyU6C0k0dQQy2pQayxh2U0kWcB1bXZO7GB5YYFWrQGhSMURMNsmmgAZQ0MkwidEz6QxrRZKfR4V
-GyMhIUgRLcvCC0SSyV727zvM3v373d/87U893lXtjXc2vmYgIb7eDsdYRrZsCwAADsZJREFURLLZ
-CNH847/4wy/8/C//k/f94s//jz/2hb/80z9JpzQWp69x+rln2L1jhIQcktQEVCNDywZBzyDqaQJB
-ZXBgCE0WsVt12o0mYRBimW0md+6E0EdVRKIwwNBVDEVHE2XSRgLHbqMqYCQgwsZxGtz5trdTq7UZ
-HZmgXKoBIg8++H5arTae69CT1YlCl0DRKJkBDgqB3Uaz1uijgtheY7wvw9F9e+lJZ9BklZ7eIoqe
-YGhsnIuXz61fZ9dOd6sTbxbcOMivAhioPf6tR5/xrNbE8twsn//Pn6U3ZzA/9RJeq0xWBy8ICUQV
-HxVf1Mn3DnWaki16UgYiAp7jktQNErqOoalY7TqBbyJEHm6ziRoJRI5FYLWQcGnU11hdvUrbLHHT
-wZtJpfKYpoMkyczPzbNtYoL77ruXSmUV2W+gyj6e71EzLSIiBKeBOXeWYUqMF3QSuIRmi4XpWSRk
-2qZH03KRNI1HHv3qUtc2qXhztMjrjM16o+CGXYU5G2hnc9nBu+6+684D+/dz+tTzHD64m9LKHKMD
-eQwlRPRdCpk06VSG7Tt2IUoqYRAhBAGC55FJpqlVqiiiSOC5pFMGZruBGHmoUkDkNNEiF6dVoTeb
-wDVryILH6to8hd4MFy9eJJ/LMTU1ha6piBJcOH+GIHScYjGL114lMNfQBBPVr9NamSLpVeiJarx9
-/xg37dtBFHhMX5mmXGpgGHmaLYd0tsDEzh088+wT89eLYN/I3uA3M0/mVTQxtmPygUNHjyGqGplC
-ASOZQJQERCGgXl5j32AO3W2SM2Rc08RstZBEiVw6QzaVplVrICORNAwMVWZhfhZdFdF1EUKbpOKS
-0j10wSbymihiyP69k4Sez9rqKtMzU4RiUNk2MYIgBayXF3jq2cfXf/lXf/Hc0aP7qJdmaCyfR6xc
-pNebZ0KtcsdkL2lMArOBqCdxBY1K20fWCjTbIc2WS09vH1dnrlRXVldaXbZJejPewpudzhRvjKA4
-tu1Yy4uo2xZ2EDGxazeFvuJG/1c+w1AyolVqIUg+lVYdAhHfcdELeURBoFKusn3nTkRBxHYd6tUS
-o+NjCGKIIAVUy/Ok+orYQQsCjUppBV3RWV5eI5dLsO2uET71r37r0tuPHT4yOjqsprMC//GP/vzi
-5alrc1/+yp8f3DM5qib9CsO6QMKuoUcht47vpF89zNx6hTPTZeq2RK64A7mgY/oKd997C/fc/w7+
-4r/80bXrbAAUuwTzupuuv5vRV5v530jUjB25gWFqloPpBVyZmaN3YIh0TiXdk2Z3UkAT4exqlSgI
-2TZ+EMsJMPQk6ysr9BZ6yaZzhFGA53tk0imiKMS1bXRdQgib+LaIpsgookyxt4f+4gCFbB+TuydA
-8HE913v0yWefHO7PbPvqN4LqwmpjGnBOnnlhblt/dufhnUPsT4dkTbj60jQ56iwKAr6SYqZUIRBT
-jO/byey5aXKFAvfc+y76+4vh3zzy5Zmua5auA/INoYVXRXITE7u4+dBe6rUmkR/yjUceRlUV1tZX
-ccOA4kAfvTnokVfJWFdoXHgCa+ES1YVpZqdOkWSG5txllHqA3KiSDqeJGk9DbRa1KZKIFLzGCrI1
-g9ieQg/WqazN0bCbVJwWp849j+N6lusHzZnF6vGF1caZTZepWm9dadcWSSVV1GQ/1aCPNb/AtWaK
-P3vkBdpKDtnIIatpREWnVKmy58AeRsaKfPnLn581zbZ3HVqka0vUDaOFV6jI1MXLfPuxE+wZGcJu
-tRkdyBKFPtPTV5m51GJX+gHWV68xmmtz+4EJZubaXJhbxGspFBNraJZLY3WUsV0fwG5dRNWeI5Lq
-VBujZKUikdBk+zaV0Ckz0DfEuYtVxFaDIwcP07djhOX5c2HMizFjqUC7aXFmvb7y3iuKxsmzK5gV
-nz277+E7ixbnyj6jcpr+4hiakeHCSy+Ry6Qo5AzOX3gx/NznPnO5S9WjLaRVeL0BG9/LRDxhfXm+
-NDdzBXN1CVnTqLUs9u8ao/GczUhPnnLZRlWT3P/eO1Bos3e3w95rLU5PneKudx0k9FXWF/v5+lf+
-mOKwwtseGKLQP8nidJavfulbDI7Y/MRP/BDXzr3ASHEPw4UQVU4RrfvsumMXV86daHeiJDuWb20B
-dtsM/TnTWXbM5uDIyDjZPo2db7uVb33nSbRCEV80cD2L2bmNNqoH3nU/B27azTe++bXZer1ubVEy
-32oszGsOuPhuaUEAkCLnxLNPPMbg4ADvePd7KDXbXF1Y5oH3vZ9scZBqpONoOf7669/gyvw0ckHG
-al7jvtt76UsuMjzcYrRvgaMHLN59T4E92wR6jDoT/Q57xgMGB1NIakRPXy/T8wssr5XxbJ+luUW2
-DY2gKIl6xzXcLCDWgApQBWpr7fAE6Sy1KGR4726uldaYXVzmnre/k+q6yZWpJTxf5IMf/giFnhRf
-/OKftv/DZz5zrmunTve22a3Gw9wwyX35TlVX57504MH3/NKxYzcRuD43r93J/OXThH6TXDrDuXKL
-cmkeMahxbrnCkXmfpDDMoJDBcSwCrwGCimFEjOwY48rF59i+bwcyOqlUhnW28Sd/cY5iX5LvfOc0
-ojiOvvoUY4cn8HWLk2fPrccoYbN4uJnMDlbnWg/fvF/5oK7qzMxcpV22MCSFpx75NqlMnluO3kEi
-ZVAc6OXC5RfDL3zpS896nudtsVvd6wI63KJZ74YNsxAAsV5rlraNDLyv2fb6jVSebD5P6LucOnmc
-kICe8UmWGnUagYCU3IbLOKY3xMOPnuexx+ZJZbKEYj96ejsXLy/zB398houXljl89AN85ZtXyOz6
-GH/16ElaJLnzPR/jxKV5Ts1O8wu/+nM89uxX+cM/+MvjjuNtAlqOSW0dsBzTL+2ZGBrLJo3t46Oj
-/MtP/waH9x0ioyX5wHs/yJH77+OmWw7iR63gt/7v33p2ba1U6soIbkak7a5kudVZHq8xwe97AhcQ
-7WZtdmFp7Uci0eDQzUdJJjXOnX6BZr3Ezh376evvwwkEVGOAnoGDVBsyc8tVlFSa+YpAxcriacM8
-/NRL1IOIpbpCqv8QFxY8Pv7T/4zJg0fIDRX59L/+HZxI5Zf+xf/Czbfu5//8zU8tnjs1fb5z4ZUu
-YDcLiEGt2jw3ur3n3vnSQqZcLXPo1tsYHZ1gYHSc2dIKU7MXmr/zu//6WxcuXlqP9YZ5sfb8dhe4
-ccMZvFYd7XsBF0As1RrLupFMOZF8649/4ifQNYWB3hTZhMal46fpzaSwLZN602T37gMEvs1qeQrT
-r2H0HyI9uB8lP8rzl+aoehq21IOUHmOhYmE5Hk898whf/8Z/5R/99D/iQx/8GOPDowiByz//5V89
-4dh+qQNmGSh1AG7EdtqErbZtVertJws7C6NT64tDJ86elsZ27eWRbz+++LWHv3Ly9373t59aWFhs
-bzGwonvvQ7urOOl09YrdsDEsxDepAMl3vffBf3v02O0f37PrIBMjEyQVlSf/6vM89/wTzC1fo394
-iJtuOsyttxykUb1Gs1XiqZNLZHI9vO3Ou5idm6O/fwRdz/Cnf/YF1lYrSHKSj/7Q+/ixT/wojz3+
-GKlUFs9zOPfS87O/8r/979/qALsCLAHLHZBrsQ0gmxvEc0AWKHRWhv9/OLLGK4cTb4Jsxri8Aqx3
-nusdDWl3AXxDBwi94sZcnbrybSFqppqmf6R/9BByapRDRw+TKQ7RckCUda5eneKl8+dYXF5naaXO
-xWtXKNcrVGtV1lYrvHTuMn/zjcepV1scvulmPv7jP8X9DzyA5wv8p8/+vyhaxInnv934/d//T0/Y
-trPJtaXOhdc6F76Za91s3OjOAyi8eqZj3DtwY/vLWrEOm3asAmx31dCiG+3nhl2NwdZ3vvP8b1yd
-XT3p+vzKz/wPvzTcPzrMA4MfZMfeI0hCxNSlC6wszTM7PY1pNikUDSRZBrmPMAwYnxxg3+EMR48c
-ww8Cas0mjdY6mi7xxJOPUCpPt77zxFNP1WvNeqzMXY31E1hd/bNC1wyJ7n1mm4ZLie2aDGPGrBkD
-047tlvS7poJwo2mhe/iF2plfk5Zkqf/DH//hH3773Q99aHRsYlQWZXbt2M7c3DKpRIpsOkvCkJmb
-m+f4c8e58223s7q2wvbt47iuQ6tV42tff5jdu0ZIJFQe+cZXOH78mdWZ6cVnXNevd8BcBxY6dLDW
-AbodA2BTopTOlJMUr5w2neyszanTcXC9rtx1I/b9zS7teEs4t9tz2JxHbnROPgf0jO/cddvR2972
-jg995CMHp67M9OQyvTzwzgcQibh0YZmTL77IsWOHcT2L8W3DPPrNh/E8myuXL2C3lzh96mS93XIu
-Li6sz8bcolIH1CVgtcOF7S7Jjbo2jCdiPJvqGnYUnyG2KdF2F++2YiUet+s4bxm43QBvGpFkx4jk
-Nw2JkUqM79i1a/Ke++4fq1Rq/Yvz1cz2iQlNkhDmFmbYsWNMOHfudNho1Jori8vVVr22ZLadRkyK
-zI4ErXXAXekYsVbMuvtdjr4Qm9VjdE2I0mNTmOLjvePca8ZK6VaMb1+XGm7k7zMIW0wb2VTHTAzo
-bOd9OiY5Wkw1pa52eTcGbKMD5lqHFqodqYobmPgkD6HLs1FjgOpdE0HELbrIvRjXOl0jAAJeZ/bu
-jfwpg6grqRHGJGBTnesdUDddoVTXfDEldk7d4LZiBqzaed3qUtHu5EoYA8zvcrU225HiowaFrr9x
-Y3/nbjVT4Q27U2+RFMfHA2oxMBNd6hmX3nhhNC65ce6Lb8XfasZM9Bpz0iReOetR6RoBQNeGPm+L
-jdOvOzH6rf7ZFoGtJ4eqsaXxykFwUpe7F1fPuGpuNVvmtX4hStjipktbVHTjm6fDrr29b2oa9ff7
-h4deawKoGDMqxNQ5Dp7XtYl5qxHZr6eu3Tv1hS12p0dcf3D8Gx7z/YP4PbQ3MnBzqyz/VkPio+/m
-otl6hm53Nfd63x29mQv9QT+26mh5o/0U0RZtV2/2Jl+3w/M6x+LvErhvBOw30st2I7Tphn7v3/af
-SewGOrpeVeRv4+P/A9Q+PxXM9RiwAAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0--
diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am
deleted file mode 100644
index 9a2bf358d3..0000000000
--- a/default_user/local/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS =					\
-	Calendar				\
-	Contacts				\
-	Drafts					\
-	Executive-Summary			\
-	Inbox					\
-	Outbox					\
-	Sent					\
-	Tasks					\
-	Trash
diff --git a/default_user/local/Outbox/.cvsignore b/default_user/local/Outbox/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Outbox/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am
deleted file mode 100644
index d9ccc4dba4..0000000000
--- a/default_user/local/Outbox/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Outbox
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Outbox/folder-metadata.xml b/default_user/local/Outbox/folder-metadata.xml
deleted file mode 100644
index 4452fb9e0c..0000000000
--- a/default_user/local/Outbox/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Outbox</description>
-</efolder>
diff --git a/default_user/local/Sent/.cvsignore b/default_user/local/Sent/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Sent/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am
deleted file mode 100644
index 024f5c76eb..0000000000
--- a/default_user/local/Sent/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Sent
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Sent/folder-metadata.xml b/default_user/local/Sent/folder-metadata.xml
deleted file mode 100644
index 87188daedb..0000000000
--- a/default_user/local/Sent/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Sent</description>
-</efolder>
diff --git a/default_user/local/Tasks/.cvsignore b/default_user/local/Tasks/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Tasks/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Tasks/Makefile.am b/default_user/local/Tasks/Makefile.am
deleted file mode 100644
index 10ac77fb38..0000000000
--- a/default_user/local/Tasks/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-defaulttasksdir = $(datadir)/evolution/default_user/local/Tasks
-defaulttasks_DATA = folder-metadata.xml
-EXTRA_DIST = $(defaulttasks_DATA)
diff --git a/default_user/local/Tasks/folder-metadata.xml b/default_user/local/Tasks/folder-metadata.xml
deleted file mode 100644
index 32b3381af6..0000000000
--- a/default_user/local/Tasks/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>tasks</type>
-	<description>Tasks</description>
-</efolder>
diff --git a/default_user/local/Trash/.cvsignore b/default_user/local/Trash/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Trash/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am
deleted file mode 100644
index 25def5bfe9..0000000000
--- a/default_user/local/Trash/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Trash
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Trash/folder-metadata.xml b/default_user/local/Trash/folder-metadata.xml
deleted file mode 100644
index 6f1acf7a4a..0000000000
--- a/default_user/local/Trash/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Trash</description>
-</efolder>
diff --git a/default_user/searches.xml b/default_user/searches.xml
deleted file mode 100644
index 2a05fb98db..0000000000
--- a/default_user/searches.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<filteroptions>
-  <ruleset>
-    <rule grouping="any" source="demand">
-      <title>Body or subject contains</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="contains"/>
-          <value name="subject" type="string">
-            <string>crap</string>
-          </value>
-        </part>
-        <part name="body">
-          <value name="body-type" type="option" value="contains"/>
-          <value name="word" type="string">
-            <string>crap</string>
-          </value>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Body contains</title>
-      <partset>
-        <part name="body">
-          <value name="body-type" type="option" value="contains"/>
-          <value name="word" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Subject contains</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="contains"/>
-          <value name="subject" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Body does not contain</title>
-      <partset>
-        <part name="body">
-          <value name="body-type" type="option" value="not contains"/>
-          <value name="word" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Subject does not contain</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="not contains"/>
-          <value name="subject" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Sender contains</title>
-      <partset>
-        <part name="sender">
-          <value name="sender-type" type="option" value="contains"/>
-          <value name="sender" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-  </ruleset>
-</filteroptions>
diff --git a/default_user/shortcuts.xml b/default_user/shortcuts.xml
deleted file mode 100644
index 4532b0a17b..0000000000
--- a/default_user/shortcuts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<shortcuts>
-	<group title="Evolution shortcuts">
-		<item>evolution:/local/Executive-Summary</item> 
-		<item>evolution:/local/Inbox</item>
-<!--		<item>evolution:/local/Outbox</item>
-		<item>evolution:/local/Trash</item>
-		<item>evolution:/local/Drafts</item> -->
-		<item>evolution:/local/Calendar</item>
-		<item>evolution:/local/Tasks</item>
-		<item>evolution:/local/Contacts</item>
-	</group>
-
-
-<!--	<group title="Personal shortcuts">
-	</group>
--->
-</shortcuts>
-
diff --git a/devel-docs/.cvsignore b/devel-docs/.cvsignore
deleted file mode 100644
index d436efd0f7..0000000000
--- a/devel-docs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-
diff --git a/devel-docs/Makefile.am b/devel-docs/Makefile.am
deleted file mode 100644
index 74a5ff5b60..0000000000
--- a/devel-docs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS=camel
diff --git a/devel-docs/camel/.cvsignore b/devel-docs/camel/.cvsignore
deleted file mode 100644
index 56d9506207..0000000000
--- a/devel-docs/camel/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-sgml
-html
-Makefile.in
-Makefile
-camel.signals
-camel.hierarchy
-camel.args
-camel-decl.txt
-camel-unused.txt
-camel.html
-camel-decl-list.txt
-
diff --git a/devel-docs/camel/Makefile.am b/devel-docs/camel/Makefile.am
deleted file mode 100644
index 276059cf88..0000000000
--- a/devel-docs/camel/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=camel
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=camel-docs.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(top_srcdir)/camel
-
-CFLAGS=`gtk-config --cflags gtk`
-LDFLAGS="-lcamel `gtk-config --libs gtk` "
-
-
-HTML_DIR=$(datadir)/gnome/html
-
-
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/camel-data-wrapper.sgml		\
-	tmpl/camel-folder.sgml			\
-	tmpl/camel-mime-message.sgml		\
-	tmpl/camel-mime-part.sgml		\
-	tmpl/camel-recipient.sgml		\
-	tmpl/camel-service.sgml			\
-	tmpl/camel-store.sgml			\
-	tmpl/camel-stream.sgml		
-
-
-camel_docdir = $(HTML_DIR)
-camel_doc_DATA =				\
-	camel.html				\
-	camel.hierarchy			\
-	camel.types				\
-	camel-scan.c				\
-	camel-decl.txt			\
-	camel-sections.txt
-
-EXTRA_DIST = $(camel_doc_DATA)
-
-camel.html: html/book1.html
-	-cd $(srcdir) && cp html/book1.html camel.html
-
-html/book1.html: sgml/camel-doc.bottom
-	$(MAKE) html
-
-sgml/camel-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-camel-scan.c:
-
-scan: camel-scan.c				
-	CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) gtkdoc-scanobj --module=$(DOC_MODULE)
-	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-templates: scan
-	gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml: 
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-html: 
-	if ! test -d html ; then mkdir html ; fi
-	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-
-clean-local:
-	rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt camel.html
-
-maintainer-clean-local: clean
-	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt Makefile.in 
-
-install-data-local: 
-	$(mkinstalldirs) $(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-
-dist-hook:
-	mkdir $(distdir)/html
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-
-.PHONY : html sgml templates scan
diff --git a/devel-docs/camel/README_AND_TODO.txt b/devel-docs/camel/README_AND_TODO.txt
deleted file mode 100644
index 5feeb1e4e9..0000000000
--- a/devel-docs/camel/README_AND_TODO.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Camel is currently (conceptualy) separated in four parts:
-
-* the session handling 
-* the storage mechanism.
-* the (mime) message handling.
-* some general utilities class/functions.
-
-
-
-* Session handling 
-------------------
-
-(This is not gnome session managing related)
-CamelSession is an object used to store some parameters on a user
-basis. This can be a permanent (fs based) or volatile 
-(ram only) storage depending on user preferences. 
-The session object is, for example, responsible for 
-remembering authentication datas during application lifetime.
-It is also responsible for selecting and loading providers 
-corresponding to protocols. In the case where only one 
-provider exists for a given protocol, the task is trivial, 
-but when multiple providers exist for a given protocol, the
-user can choose their prefered one. Given its relationship
-with providers, the session object is also used to instanciate
-a store given an URL.
-
-Associated Classes:
-  CamelSession 
-    implementation: 5%
-
-Associated Files:
-  camel-provider.[ch]
-    implementation: 2.5% (a struct in camel-provider.h)
-
-
-* the storage mechanism.
-------------------------
-
-The storage mechanism is  mainly represented by 
-the Store class and the Folder class. 
-* the (mime) message handling.
-* some general utilities class/functions.
-
diff --git a/devel-docs/camel/camel-docs.sgml b/devel-docs/camel/camel-docs.sgml
deleted file mode 100644
index 33c6623731..0000000000
--- a/devel-docs/camel/camel-docs.sgml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity CamelDataWrapper SYSTEM "sgml/camel-data-wrapper.sgml">
-<!entity CamelFolder SYSTEM "sgml/camel-folder.sgml">
-<!entity CamelMimeMessage SYSTEM "sgml/camel-mime-message.sgml">
-<!entity CamelMimePart SYSTEM "sgml/camel-mime-part.sgml">
-<!entity CamelRecipient SYSTEM "sgml/camel-recipient.sgml">
-<!entity CamelService SYSTEM "sgml/camel-service.sgml">
-<!entity CamelStore SYSTEM "sgml/camel-store.sgml">
-<!entity CamelStream SYSTEM "sgml/camel-stream.sgml">
-]>
-
-<book>
-  <bookinfo>
-    <title>Camel Messaging Library Reference Manual</title>
-  </bookinfo>
-
-  <chapter id="camel-objects">
-    <title>Camel Objects</title>
-    &CamelMimeMessage;
-    &CamelService;
-    &CamelStore;
-    &CamelFolder;
-    &CamelMimePart;
-    &CamelDataWrapper;
-    &CamelRecipient;
-
-  </chapter>
-</book>
diff --git a/devel-docs/camel/camel-sections.txt b/devel-docs/camel/camel-sections.txt
deleted file mode 100644
index 1f6d45c03c..0000000000
--- a/devel-docs/camel/camel-sections.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<INCLUDE>gnome.h</INCLUDE>
-<INCLUDE>camel-data-wrapper.h</INCLUDE>
-
-
-<SECTION>
-<FILE>camel-data-wrapper</FILE>
-CamelDataWrapper
-<TITLE>CamelDataWrapper</TITLE>
-camel_data_wrapper_write_to_stream
-<SUBSECTION Standard>
-CAMEL_DATA_WRAPPER
-camel_data_wrapper_get_type
-CAMEL_DATA_WRAPPER_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-recipient</FILE>
-CamelRecipientTable
-<TITLE>CamelRecipientTable</TITLE>
-camel_recipient_table_new
-camel_recipient_table_get
-camel_recipient_table_add
-camel_recipient_table_add_list
-camel_recipient_table_remove
-camel_recipient_table_ref
-camel_recipient_table_unref
-</SECTION>
-
-<SECTION>
-<FILE>camel-mime-part</FILE>
-CamelMimePart
-<TITLE>CamelMimePart</TITLE>
-camel_mime_part_add_header
-camel_mime_part_set_content_object
-camel_mime_part_set_filename
-camel_mime_part_get_disposition
-camel_mime_part_get_content_MD5
-camel_mime_part_get_encoding
-camel_mime_part_set_header_lines
-camel_mime_part_get_content_object
-camel_mime_part_get_content_id
-camel_mime_part_set_description
-camel_mime_part_set_text
-camel_mime_part_set_encoding
-camel_mime_part_set_disposition
-camel_mime_part_remove_header
-camel_mime_part_get_filename
-camel_mime_part_get_content_languages
-camel_mime_part_set_content_languages
-camel_mime_part_get_header_lines
-camel_mime_part_get_description
-camel_mime_part_get_header
-<SUBSECTION Standard>
-CAMEL_MIME_PART
-camel_mime_part_get_type
-CAMEL_MIME_PART_CLASS
-</SECTION>
-
-
-
-<SECTION>
-<FILE>camel-mime-message</FILE>
-CamelMimeMessage
-<TITLE>CamelMimeMessage</TITLE>
-camel_mime_message_remove_recipient
-camel_mime_message_get_recipients
-camel_mime_message_set_flag
-camel_mime_message_set_subject
-camel_mime_message_get_reply_to
-camel_mime_message_get_from
-camel_mime_message_set_reply_to
-camel_mime_message_get_sent_date
-camel_mime_message_new_with_session
-camel_mime_message_add_recipient
-camel_mime_message_get_subject
-camel_mime_message_set_from
-camel_mime_message_get_flag
-camel_mime_message_get_message_number
-camel_mime_message_get_received_date
-camel_mime_message_set_received_date
-<SUBSECTION Standard>
-CAMEL_MIME_MESSAGE
-camel_mime_message_get_type
-CAMEL_MIME_MESSAGE_CLASS
-</SECTION>
-
-
-<SECTION>
-<FILE>camel-folder</FILE>
-CamelFolder
-<TITLE>CamelFolder</TITLE>
-camel_folder_get_folder
-camel_folder_create
-camel_folder_delete
-camel_folder_delete_messages
-camel_folder_get_parent_folder
-camel_folder_get_parent_store
-camel_folder_get_mode
-camel_folder_list_subfolders
-<SUBSECTION Standard>
-CAMEL_FOLDER
-camel_folder_get_type
-CAMEL_FOLDER_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-service</FILE>
-CamelService
-<TITLE>CamelService</TITLE>
-camel_service_connect
-camel_service_is_connected
-camel_service_connect_to_with_login_passwd
-camel_service_connect_to_with_login_passwd_port
-camel_service_get_url
-<SUBSECTION Standard>
-CAMEL_SERVICE
-camel_service_get_type
-CAMEL_SERVICE_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-store</FILE>
-CamelStore
-<TITLE>CamelStore</TITLE>
-camel_store_get_separator
-camel_store_get_folder
-<SUBSECTION Standard>
-CAMEL_STORE
-camel_store_get_type
-CAMEL_STORE_CLASS
-</SECTION>
-
-
-<SECTION>
-<FILE>camel-stream</FILE>
-CamelStream
-<TITLE>CamelStream</TITLE>
-camel_stream_seek
-camel_stream_write
-camel_stream_flush
-camel_stream_eos
-camel_stream_write_string
-camel_stream_close
-camel_stream_write_strings
-camel_stream_read
-camel_stream_available
-<SUBSECTION Standard>
-CAMEL_STREAM
-camel_stream_get_type
-CAMEL_STREAM_CLASS
-</SECTION>
-
-
diff --git a/devel-docs/camel/camel.types b/devel-docs/camel/camel.types
deleted file mode 100644
index 93142d8692..0000000000
--- a/devel-docs/camel/camel.types
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <gtk/gtk.h>
-#include <camel/camel-data-wrapper.h>
-camel_data_wrapper_get_type
-camel_folder_get_type
-camel_mime_message_get_type
-camel_mime_part_get_type
-camel_service_get_type
-camel_store_get_type
-camel_stream_get_type
diff --git a/devel-docs/camel/tmpl/.cvsignore b/devel-docs/camel/tmpl/.cvsignore
deleted file mode 100644
index 29db8d052d..0000000000
--- a/devel-docs/camel/tmpl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-camel-unused.sgml
-
diff --git a/devel-docs/camel/tmpl/camel-data-wrapper.sgml b/devel-docs/camel/tmpl/camel-data-wrapper.sgml
deleted file mode 100644
index 6fce9eb128..0000000000
--- a/devel-docs/camel/tmpl/camel-data-wrapper.sgml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelDataWrapper
-
-<!-- ##### SECTION Short_Description ##### -->
-data container with streaming methods
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A CamelDataWrapper is wrapper around data which can save them to a stream
-and restore them from a stream. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_data_wrapper_write_to_stream ##### -->
-<para>
-
-</para>
-
-@data_wrapper: 
-@stream: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-folder.sgml b/devel-docs/camel/tmpl/camel-folder.sgml
deleted file mode 100644
index 882d63499c..0000000000
--- a/devel-docs/camel/tmpl/camel-folder.sgml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelFolder
-
-<!-- ##### SECTION Short_Description ##### -->
-Represents a folder of messages on a store.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-CamelFolder represents a folder in a message store. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelFolder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_folder_get_folder ##### -->
-<para>
-
-</para>
-
-@folder: 
-@folder_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_create ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_delete ##### -->
-<para>
-
-</para>
-
-@folder: 
-@recurse: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_delete_messages ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_parent_folder ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_parent_store ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_mode ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_list_subfolders ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-mime-message.sgml b/devel-docs/camel/tmpl/camel-mime-message.sgml
deleted file mode 100644
index 704f3d3572..0000000000
--- a/devel-docs/camel/tmpl/camel-mime-message.sgml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelMimeMessage
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelMimeMessage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_mime_message_remove_recipient ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_recipients ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_flag ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@flag: 
-@value: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_subject ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@subject: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_reply_to ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_from ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_reply_to ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@reply_to: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_sent_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_new_with_session ##### -->
-<para>
-
-</para>
-
-@session: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_add_recipient ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_subject ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_from ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@from: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_flag ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@flag: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_message_number ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_received_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_received_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@received_date: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-mime-part.sgml b/devel-docs/camel/tmpl/camel-mime-part.sgml
deleted file mode 100644
index 2db158b25f..0000000000
--- a/devel-docs/camel/tmpl/camel-mime-part.sgml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelMimePart
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_mime_part_set_filename ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@filename: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_disposition ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_MD5 ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_encoding ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_header_lines ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@header_lines: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_id ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_description ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@description: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_text ##### -->
-<para>
-
-</para>
-
-@camel_mime_part: 
-@text: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_encoding ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@encoding: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_disposition ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@disposition: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_filename ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_languages ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_content_languages ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@content_languages: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_header_lines ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_description ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-recipient.sgml b/devel-docs/camel/tmpl/camel-recipient.sgml
deleted file mode 100644
index 4af84cf58e..0000000000
--- a/devel-docs/camel/tmpl/camel-recipient.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelRecipientTable
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelRecipientTable ##### -->
-<para>
-
-</para>
-
-@recipient_hash_table: 
-@ref_count: 
-
-<!-- ##### FUNCTION camel_recipient_table_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_unref ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_get ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_add ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_remove ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_add_list ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient_list: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_ref ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-service.sgml b/devel-docs/camel/tmpl/camel-service.sgml
deleted file mode 100644
index 5b51ea902e..0000000000
--- a/devel-docs/camel/tmpl/camel-service.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelService
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelService ##### -->
-<para>
-
-</para>
-
-@e: 
-
-<!-- ##### FUNCTION camel_service_connect ##### -->
-<para>
-
-</para>
-
-@service: 
-
-
-<!-- ##### FUNCTION camel_service_is_connected ##### -->
-<para>
-
-</para>
-
-@service: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_service_connect_to_with_login_passwd ##### -->
-<para>
-
-</para>
-
-@service: 
-@host: 
-@login: 
-@passwd: 
-
-
-<!-- ##### FUNCTION camel_service_connect_to_with_login_passwd_port ##### -->
-<para>
-
-</para>
-
-@service: 
-@host: 
-@login: 
-@passwd: 
-@port: 
-
-
-<!-- ##### FUNCTION camel_service_get_url ##### -->
-<para>
-
-</para>
-
-@service: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-store.sgml b/devel-docs/camel/tmpl/camel-store.sgml
deleted file mode 100644
index 2882c09986..0000000000
--- a/devel-docs/camel/tmpl/camel-store.sgml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelStore
-
-<!-- ##### SECTION Short_Description ##### -->
-
-A class representing a message (local or distant) repository
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The store class models a place where messages can be stored and retreived. It can be a local 
-store (for example an mbox-style store) or a distant server (for example an POP3 server). Messages are
-not retreived or stored directly with a CamelStore object. Instead, a CamelFolder object must be
-obtained from the store first. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelStore ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_store_get_separator ##### -->
-<para>
-
-</para>
-
-@store: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_store_get_folder ##### -->
-<para>
-
-</para>
-
-@store: 
-@folder_name: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-stream.sgml b/devel-docs/camel/tmpl/camel-stream.sgml
deleted file mode 100644
index e965db2e45..0000000000
--- a/devel-docs/camel/tmpl/camel-stream.sgml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelStream
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_stream_seek ##### -->
-<para>
-
-</para>
-
-@stream: 
-@offset: 
-@policy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_write ##### -->
-<para>
-
-</para>
-
-@stream: 
-@buffer: 
-@n: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_flush ##### -->
-<para>
-
-</para>
-
-@stream: 
-
-
-<!-- ##### FUNCTION camel_stream_eos ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Returns: 
-
-
-<!-- ##### MACRO camel_stream_write_string ##### -->
-<para>
-
-</para>
-
-@stream: 
-@string: 
-
-
-<!-- ##### FUNCTION camel_stream_close ##### -->
-<para>
-
-</para>
-
-@stream: 
-
-
-<!-- ##### FUNCTION camel_stream_write_strings ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION camel_stream_read ##### -->
-<para>
-
-</para>
-
-@stream: 
-@buffer: 
-@n: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_available ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Returns: 
-
-
diff --git a/devel-docs/misc/ref_and_id_proposition.txt b/devel-docs/misc/ref_and_id_proposition.txt
deleted file mode 100644
index 2127b45a57..0000000000
--- a/devel-docs/misc/ref_and_id_proposition.txt
+++ /dev/null
@@ -1,237 +0,0 @@
-Author: Bertrand Guiheneuf <Bertrand.Guiheneuf@aful.org>
-Date: August 9th 1999
-Last revision date : September 3rd 1999
-Version: 0.2
-
-The last version of this document is always available in gnome CVS in
-the gnome-mailer module: devel-docs/misc/ref_and_id_proposition.txt
-
-
-
-A) Identifying messages within folders
---------------------------------------
-
-Currently, in Camel there is only one way to retrieve a message from a
-mail store:
-     CamelMimeMessage * 
-     get_message (CamelFolder *folder, gint number)
-
-where number is an integer representing the message rank within its
-parent folder.
-
-This is a traditional method (JavaMail, MAPI) and it is very useful
-because this is often the only way to get a message in from a
-classical store (pop3 for example).
-
-Moreover, various documents ([1], [2]) proposed to generalize the URL
-scheme used in Camel ([3]) to access mail stores in order to identify
-messages. Such an URL would be, for instance:
-
-pop3://po.myisp.com:1
-
-Meaning: "Access message 1 on Pop3 server po.myisp.com"
-
- 
-However, referencing a message with its number within a folder is a
-very unreliable method:
-
-1) Message order in a folder can change during a session: 
-   
-   The user can move or remove messages from the folder, thus
-   completely changing message numbers.  We could however imagine to
-   follow message operations in order to keep camel in a coherent
-   state at each time instant. This could be quite complex but may
-   be feasible using gtk signal system.
-
-2) Message order can change between sessions:
-
-   Gnome-mailer was designed from the begining to allow messages to be
-   stored in classical mailboxes (mbox, maildir, MH, IMAP ...), in
-   order to allow users to run other MUA on their mailboxes if
-   necessary.  These other MUA can change message order within folders
-   without any chance for Camel to trace the operations.
-   
-These two scenarii show that it is quite impossible to use reliable
-folder caching or message referencing if messages are referenced only
-by their position within their parent folder.
-   
-
-We thus have to find a general way to identify and retreive a message
-within its folder. One thing is sure, however: all folders
-implementation won't allow this method. Pop3 stores will always access
-messages using their rank on the server. MUA using Camel will thus
-have to be prepared to access some stores providing only the old
-fashionned message number access method.
-
-Basically, we have two choices:
-
-1) Accessing messages using (mailbox) Unique ID (UID)
-
-   A UID is a string identifier associated to a message, which is
-   guaranteed to be unique within its parent folder and which will not
-   change between sessions.
-
-2) Accessing messages using Message ID
-
-   A Message ID is a string identifier associated to a messages which
-   is guaranteed to be unique in the world, that is, no other message
-   can have the same Message ID. The message ID is defined in RFC 822,
-   and is stored as the message header "Message-id"
-   
-Method (1) already exists in IMAP.  
-It is quite simple to define on local stores (MH, mbox, ....) but it
-may not resist to message modification by other MUA.
-Methods based on Message-id matching or message content checksum seem
-to be the best one. Using an "X-" header is another possibility for
-non read-only folders. A combination of these three methods may be the
-most reliable solution.
-The UID is impossible to implement in a POP3 store provider.
-
-(2) Can be used with IMAP, but would be very ineficient. 
-The main issue with this method is its dependancy upon other MUAs and
-MTAs. Message-id is set before or during message transport. Moreover,
-some rfc822 compliant messages may not even have any Message-id
-header.
-These are major issues when accessing read-only stores.  
-The M-ID is also impossible to implement in a POP3 store provider.
-   
-
-We may not rely on external MUA and MTA to guarentee the uniqueness of
-the identifier . We may loose messages by never being able to read them
-if two had the same uid. It would be possible to find workarounds, but
-it could make Camel use a bit tricky.
-
-Given that most users will use IMAP or a database based store as their
-main mail store, and given that this stores allow UID very
-easily, I suggest that we use method (1). Discussion is still open,
-though.
-
-Here are the public methods I propose to add to CamelFolder:
-
-gboolean camel_folder_supports_uid (CamelFolder *folder)
-    returns true if the folder can get messages 
-    by their uid.
-
-gchar * camel_folder_get_uid_by_number (CamelFolder *folder, gint message_number)
-    return the uid of message which number in the folder
-    is %message_number.
-
-gchar * camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message)
-    return the uid of the message within the folder.
-
-CamelMimeMessage *camel_folder_get_message_by_uid  (CamelFolder *folder, gchar *uid)
-    return the message which uid is %uid
-
-In addition, the CamelMessage Class will have a new public method
-
-gchar * camel_mime_message_get_uid (CamelMimeMessage *message) 
-    return the uid associated to the message in its physical parent
-    folder.
-
-
-
-B) Handling message references in (v)folders.
----------------------------------------------
- 
-
-We want the future Gnome mailer to be able to build (virtual) folders
-holding references to messages physically located in other
-folders. More generally, we would like folders to be able to hold:
-
-1) messages
-2) subfolders
-3) references to messages
-
-(1) and (2) are already implemented in Camel because most mail stores
-can hold messages and/or subfolders.
-
-(3) is a different issue, because no existing mail store can currently
-hold, within folders, references to messages in other folders.
-It will thus be a specific gnome-mailer extension. 
-
-
-One of the main issue is to determine what kind of behaviour we expect
-from folders holding references. Here is a possible API.
-
-( the world (v)folder is used to distinguish between the physical
-parent folder and the folder holding a reference to the message, when
-a confusion may arise)
-
-Addition to CamelFolder:
-
-gboolean camel_folder_can_hold_references (CamelFolder *folder)
-    return true if the folder can contain references
-
-void camel_folder_add_reference_by_uid (CamelFolder *folder, gchar *folder_url, gchar *message_uid)
-    add a reference into a folder. %folder_url is the url of 
-    the folder, %message_uid is the uid of the message within 
-    its physical parent folder.
- 
-void camel_folder_add_reference_by_message (CamelFolder *folder, CamelMessage *message)
-    add a reference. The place where the reference points 
-    to is found using CamelMessage methods
-
-void camel_folder_remove_reference_by_uid (CamelFolder *folder, gchar *uid)
-    remove a message reference form a folder. Reference 
-    is identified using its uid within the folder.
-
-gboolean camel_folder_uid_is_reference (CamelFolder *folder, gchar *uid)
-    return true if the message corresponding to the uid is a reference.
-
-Then all usual operations on the folder act if the message was
-actually physically stored in this folder. For example, when the mailer
-uses camel_folder_get_message_by_uid onto the (v)folder, the actual
-message is retreived from its physical store.
-
-As you can see, the uid of the message within its physical parent
-folder is different than its uid within the (v)folder. This is because
-there is no way to guarantee that the uids of two messages in two
-different folders would be different. Using references on this two
-message in the same vfolder would break uniqueness of the uid in the
-(v)folder.
-
-A couple of other methods could be defined but all the basics are
-described here.  
-
-This draft API is far from complete nor perfect, and is described here
-only to stimulate discussions before the actual implementation.
-
-
-The question now is to know how we store references. There are basically 
-two ways:
-
-1) references are stored using the URL of the physical folder
-   and the uid of the message within the folder
-
-2) a list of reference is kept, and in this list, reference are stored
-as in (1). Folders would refer to the actual message using index in
-the list
-
-
-   
-The main problem with (1) is that references get lost as soon
-as the actual message is moved. There is no way to find in which
-folders references to the message exist. 
-
-(2) is a way to solve this issue. When messages are used, Camel looks
-in the list to see if the message is refered somewhere, and actualize 
-the URL and the uid with their new values. 
-
-The problem with (2) is that we need to keep this information in a file
-and libraries writing automatically to files are generally a bad idea.
-
-As in additional remark, it is clear that Camel will only be able to
-hold references to messages on stores supporting UIDs.
-
-
-Thanks in advance for your comments and ideas,
-
-
-       Bertrand <Bertrand.Guiheneuf@aful.org>
-
-
---
-
-[1] : http://www.selequa.com/%7epurp/gnomail/mail2db.html 
-[2] : http://www.selequa.com/%7epurp/gnomail/dbRecFmt.html 
-[3] : http://www.gnome.org/mailing-lists/archives/gnome-mailer-list/1999-April/0248.shtml
diff --git a/devel-docs/query/virtual-folder-in-depth.sgml b/devel-docs/query/virtual-folder-in-depth.sgml
deleted file mode 100644
index d3e3e0504b..0000000000
--- a/devel-docs/query/virtual-folder-in-depth.sgml
+++ /dev/null
@@ -1,407 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []>
-
-<!-- SGMLized by Bertrand <Bertrand.Guiheneuf@aful.org> -->
-
-<article id="index">
-  <artheader>
-    <authorgroup>
-      <author>
-	<firstname>Giao</firstname>
-	<surname>Nguyen</surname>
-      </author>
-    </authorgroup>
-
-    <title>An in-depth look at the virtual folder mechanism</title>
-    <abstract>
-      <para>
-	This document describes a different way of approaching mail
-	organization and how all things are possible in this brave new
-	world. This document does not describe physical storage issues
-	nor interface issues.
-      </para>
-      <para>
-	Historically mail has been organized into folders. These
-	folders usually mapped to a single storage medium. The
-	relationship between mail organization and storage medium was
-	one to one. There was one mail organization for every storage
-	medium. This scheme had its limitations.
-      </para>
-      <para>  
-	Efforts at categorizations are only meaningful at the instance that
-	one categorized. To find any piece of data, regardless of how well
-	it was categorized, required some amount of searching. Therefore, any
-	attempts to nullify searching is doomed to fail. It's time to embrace
-	searching as a way of life.
-      </para>
-      <para>  
-	These are the terms and their definitions. The example rules used are
-	based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle
-	Jones whose ideas form the basis for this. I'm only adding the
-	existence of summary files to aid in scaling. I currently use VM and
-	it's virtual-folder rules for my daily mail purposes. To date, my only 
-	complaints are speed (it has no caches) and for the unitiated, it's
-	not very user-friendly.
-      </para>
-      <para>  
-	Comments, questions, rants, etc. should be directed at Giao Nguyen
-	(grail@cafebabe.org) who will try to address issues in a timely
-	manner.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Definitions -->
-  <sect1 id="definitions">
-    <title>Definitions</title>
-    <sect2>
-      <title>Store</title> 
-      <para>
-	A location where mail can be found. This may be a file (Berkeley
-	mbox), directory (MH), IMAP server, POP3 server, Exchange server,
-	Lotus Notes server, a stack of Post-Its by your monitor fed through
-	some OCR system.
-      </para>
-    </sect2>
-
-    <sect2>
-      <title>Message</title> 
-      <para>  
-	An individual mail message.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Vfolder</title> 
-      <para>  
-	A group of messages sharing some commonality. This is the result of a
-	query. The vfolder maybe contained in a store, but it is not necessary
-	that a store holds only one vfolder. There is always an implicit
-	vfolder rule which matches all messages. A store contains the vfolder
-	which is the result of the query (any). It's short for virtual folder
-	or maybe view folder. I dunno.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Default-vfolder</title> 
-      <para>  
-	The vfolder defined by (any) applied to the store. This is not the
-	inbox. The inbox could easily be defined by a query. A default rule
-	for the inbox could be (new) but it doesn't have to be. Mine happens
-	to be (or (unread) (new)).
-      </para>
-    </sect2>
-    <sect2>
-      <title>Folder</title> 
-      <para>  
-	The classical mail folder approach: one message organization per
-	store.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Query</title> 
-      <para>  
-	A search for messages. The result of this is a vfolder. There are two
-	kinds of queries: named queries and lambda queries. More on this
-	later.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Summary file </title> 
-      <para>  
-	An external file that contains pointers to messages which are matches
-	for a named query. In addition to pointers, the summary file should
-	also contain signatures of the store for sanity checks. When the term
-	"index" is used as a verb, it means to build a summary file for a
-	given name-value pair.
-      </para>
-    </sect2>
-  </sect1>
-
-  <!-- Queries -->
-  <sect1>
-    <title>Queries</title> 
-    <para>  
-      Named queries are analogous to classical mail folders. Because named
-      queries maybe reused, summary files are kept as caches to reduce
-      the overall cost of viewing a vfolder. Summary files are superior to
-      folders in that they allow for the same messages to appear in multiple
-      vfolders without message duplications. Duplications of messages
-      defeats attempts at tagging a message with additional user information
-      like annotations. Named queries will define folders.
-    </para>
-    <para>
-      Lambda queries are similar to named queries except that they have no
-      name. These are created on the fly by the user to filter out or
-      include certain messages.
-    </para>
-    <para>
-      All queries can be layered on top of each other. A lambda query can be 
-      layered on a named query and a named query can be layered on a lambda
-      query. The possibilities are endless.
-    </para>
-    <para>
-      The layerings can be done as boolean operations (and, or, not). Short
-      circuiting should be used. 
-    </para>
-    <para>
-      Examples:
-      <programlisting>
-(and (author "Giao")
-  (unread))
-      </programlisting>
-      The (unread) query should only be evaluated on the results of (author
-      "Giao").
-      <programlisting>
-(or (author "Giao")
-  (unread))
-      </programlisting>
-      Both of these queries should be evaluated. Any matches are added to the
-      resulting vfolder.
-    </para>
-  </sect1>
-
-  <!-- Summary files -->
-  <sect1>
-    <title>Summary files</title> 
-    <para>    
-      Summary files are only meaningful when applied to the context of the
-      default-vfolder of a store.
-    </para>
-    <para>
-      Summary files should be generated for queries of the form:
-      <programlisting>
-(function "constant value")
-      </programlisting>
-      Summary files should never be generated for queries of the form:
-      <programlisting>
-	(function (function1))
-	
-	(and (function "value")
-	(another-function "another value"))
-      </programlisting>
-      Given a query of the form:
-      <programlisting>
-	(and (function "value")
-	(another-function "another value"))
-      </programlisting>
-      The system should use one summary file for (function "value") and
-      another summary file for (another-function "another value"). I will
-      call the prior form the "plain form".
-    </para>
-    <para>
-      It should be noted that the signature of the store should be based on
-      the assumption that new data may have been added to the store since
-      the application generated the summary file. Signatures generated on
-      the entirety of the store will most likely be meaningless for things
-      like POP/IMAP servers. 
-    </para>
-  </sect1>
-
-  <!-- Incremental Indexing -->
-  <sect1>
-    <title>Incremental indexing</title> 
-    <para>
-      When new messages are detected, all known queries should be evaluated
-      on the new messages. vfolders should be notified of new messages that
-      are positive matches for their queries. The indexes generated by this
-      process should be merged into the current indexes for the vfolder.
-    </para>
-  </sect1>
-
-  <!-- Can I have multiple stores -->
-  <sect1>
-    <title>Can I have multiple stores?</title> 
-    <para> 
-      I don't see why not. Again, the inbox is a vfolder so you can get a
-      unified inbox consisting of all new mail sent to all your stores or
-      your can get inboxes for each store or any combination your heart
-      desire. You get your cake, eat it, and someone else cleans the dishes!
-    </para>
-  </sect1>
-
-  <!-- Why all this? -->
-  <sect1>
-    <title>Why all this?</title> 
-    <para> 
-      Consider the dynamic nature of the following query:
-      <programlisting>
-(and (author "Giao")
-  (sent-after (today-midnight)))
-      </programlisting>
-      today-midnight would be a function that is evaluated at run-time to
-      calculate the appropriate object.
-    </para>
-  </sect1>
-
-  <!-- Scenarios of usage and their solutions -->
-  <sect1>
-    <title>Scenarios of usage and their solutions</title> 
-    <sect2>
-      <title>Mesage alterations</title>
-      <para>
-	This is a fuzzy area that should be left to the UI to handle. Messages 
-	are altered. Read status are altered when a new message is read for
-	example. How do we handle this if our query is for unread messages?
-	Upon viewing the state would change.
-      </para>
-      <para>
-	One idea is to not evaluate the queries unless we're changing between
-	vfolder views. This assumes that one can only view a particular
-	vfolder at a time. For multi-vfolder viewing, a message change should
-	propagate through the vfolder system. Certain effects (as in our
-	example) would not be intuitive.
-      </para>
-      <para> 
-	It would not be a clean solution to make special cases but they may be 
-	necessary where certain defined fields are ignored when they are
-	changed. Some combination of the above rules can be used. I don't
-	think it's an easy solution.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Message inclusion and exclusion</title>
-      <para>
-	Messages are included and excluded also with queries. The final query
-	will have the form of:
-	<programlisting>
-	  (and (author "Giao")
-	  (criteria value)
-	  (not (criteria other-value)))
-	</programlisting>
-	Userland criterias may be a label of some sort. These may be userland
-	labels or Message-IDs. What are the performance issues involved in
-	this? With short circuiting, it's not a major problem.
-      </para>
-      <para>    
-	The criterias and values are determined by the UI. The vfolder
-	mechanism isn't concerned with such issues.
-      </para>
-      <para>   
-	Messages can be included and excluded at will. The idea is often
-	called "arbitrary inclusion/exclusion". This can be done by
-	Message-IDs or other fields. It's been noted that Message-IDs are not
-	unique. 
-      </para>
-      <para>  
-	I propose that any given vfolder is allocated an inclusion label and an 
-	exclusion label. These should be randomly generated. This should be
-	part of the vfolder description. It should be noted that the vfolder
-	description has not been drafted yet.
-      </para>
-      <para>   
-	The result is such that the rules for a given named query is:
-	<programlisting>
-	  (and (user-query)
-	  (label inclusion-label)
-	  (not exclusion-label))
-	</programlisting>
-      </para>
-    </sect2>
-    <sect2>
-      <title>Query scheduling</title>
-      <para>
-	Consider the following extremely dynamic queries:
-	<programlisting>
-	  A:
-	  (and (author "Giao")
-	  (sent-after (today-midnight)))
-	  
-	  B:
-	  (and (sent-after (today-midnight))
-	  (author "Giao"))
-	  
-	  C:
-	  (or (author "Giao")
-	  (sent-after (today-midnight)))
-	</programlisting>
-	Query A would be significantly faster because (author "Giao") is not
-	dynamic. A summary file could be generated for this query. Query B is
-	slow and can be optimized if there was a query compiler of some
-	sort. Query C demonstrates a query in which there is no good
-	optimization which can be applied. These come with a certain amount of
-	baggage.
-      </para>
-      <para>
-	It seems then that for boolean 'and' operations, plain forms should be 
-	moved forward and other queries should be moved such that they are
-	evaluated later. I would expect that the majority of queries would be
-	of the plain form.
-      </para>
-      <para>  
-	First is that the summary file is tied to the query and the store
-	where the query originates from. Second, a hashing function for
-	strings needs to be calculated for the query so that the query and the 
-	summary file can be associated. This hashing function could be similar 
-	to the hashing function described in Rob Pike's "The Practice of
-	Programming". (FIXME: Stick page number here)
-      </para>
-    </sect2>
-    <sect2>
-      <title>Archives</title>
-      <para>
-	Many people are concerned that archives won't be preserved, archives
-	aren't supported, and many other archive related issues. This is the
-	short version.
-      </para>
-      <para>    
-	Archives are just that, archives. Archives are stores. Take your
-	vfolder, export it to a store. You are done. If you load up the store
-	again, then the default-vfolder of that store is the view of the
-	vfolder, except the query is different.
-      </para>
-      <para>    
-	The point to vfolder is not to do away with classical folder
-	representation but to move the queries to the front where it would
-	make data management easier for people who don't think in terms of
-	files but in terms of queries because ordinary people don't think in
-	terms of files.
-      </para>    
-    </sect2>
-  </sect1>
-
-  <!-- Miscellany -->
-  <sect1>
-    <title>Miscellany</title>
-    <sect2>
-      <title>Annotations</title>
-      <para>
-	There should be a scheme to add annotations to messages. Common mail
-	user agents have used a tag in the message header to mark messages as
-	read/unread for example. Extending on this we have the ability to add
-	our own data to a message to add meaning to it. If we have a good
-	scheme for doing this, new possibilities are opened.
-      </para>
-      <sect3>
-	<title>Keywords</title>  
-	<para>
-	  When sending a message, a message could have certain keywords attached 
-	  to it. While this can be done with the subject line, the subject line
-	  has a tendency to be munged by other mail applications. One popular
-	  example is the "[rR]e:" prefix. Using the subject line also breaks the 
-	  "contract" with other mail user agents. Using keywords in another
-	  field in the message header allows the sender to assist the recipient
-	  in organizing data automatically. Note that the sender can only
-	  provide hints as the sender is unlikely to know the organization
-	  schemes of the recipient.
-	</para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Scope</title>  
-      <para>
-	Let us assume that we have multiple stores. Does a query work on a
-	given store? Or does it work on all stores? Or is it configurable such 
-	that a query can work on a user-selected list of stores?
-      </para>
-    </sect2>
-  </sect1>
-
-  <!-- Alternatives to the above -->
-  <sect1>
-    <title>Alternatives to the above</title>
-    <para>
-      Jim Meyer (purp@selequa.com) is putting some notes on where
-      annotations needs to be located. They'll be located here as well as
-      any contributions I may have to them.
-    </para>
-  </sect1>
-</article>
diff --git a/devel-docs/query/virtual-folder-in-depth.txt b/devel-docs/query/virtual-folder-in-depth.txt
deleted file mode 100644
index 01718a5f05..0000000000
--- a/devel-docs/query/virtual-folder-in-depth.txt
+++ /dev/null
@@ -1,309 +0,0 @@
-TITLE: An in-depth look at the virtual folder mechanism
-AUTHOR: Giao Nguyen <grail@cafebabe.org>
-
-* introduction
-
-This document describes a different way of approaching mail
-organization and how all things are possible in this brave new
-world. This document does not describe physical storage issues nor
-interface issues.
-
-Historically mail has been organized into folders. These folders
-usually mapped to a single storage medium. The relationship between
-mail organization and storage medium was one to one. There was one
-mail organization for every storage medium. This scheme had its
-limitations.
-
-Efforts at categorizations are only meaningful at the instance that
-one categorized. To find any piece of data, regardless of how well
-it was categorized, required some amount of searching. Therefore, any
-attempts to nullify searching is doomed to fail. It's time to embrace
-searching as a way of life.
-
-These are the terms and their definitions. The example rules used are
-based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle
-Jones whose ideas form the basis for this. I'm only adding the
-existence of summary files to aid in scaling. I currently use VM and
-it's virtual-folder rules for my daily mail purposes. To date, my only 
-complaints are speed (it has no caches) and for the unitiated, it's
-not very user-friendly.
-
-Comments, questions, rants, etc. should be directed at Giao Nguyen
-<grail@cafebabe.org> who will try to address issues in a timely
-manner.
-
-* Definitions
-
-** store 
-
-A location where mail can be found. This may be a file (Berkeley
-mbox), directory (MH), IMAP server, POP3 server, Exchange server,
-Lotus Notes server, a stack of Post-Its by your monitor fed through
-some OCR system.
-
-** message 
-
-An individual mail message.
-
-** vfolder 
-
-A group of messages sharing some commonality. This is the result of a
-query. The vfolder maybe contained in a store, but it is not necessary
-that a store holds only one vfolder. There is always an implicit
-vfolder rule which matches all messages. A store contains the vfolder
-which is the result of the query (any). It's short for virtual folder
-or maybe view folder. I dunno.
-
-** default-vfolder 
-
-The vfolder defined by (any) applied to the store. This is not the
-inbox. The inbox could easily be defined by a query. A default rule
-for the inbox could be (new) but it doesn't have to be. Mine happens
-to be (or (unread) (new)).
-
-** folder 
-
-The classical mail folder approach: one message organization per
-store.
-
-** query 
-
-A search for messages. The result of this is a vfolder. There are two
-kinds of queries: named queries and lambda queries. More on this
-later.
-
-** summary file 
-
-An external file that contains pointers to messages which are matches
-for a named query. In addition to pointers, the summary file should
-also contain signatures of the store for sanity checks. When the term
-"index" is used as a verb, it means to build a summary file for a
-given name-value pair.
-
-* Queries
-
-Named queries are analogous to classical mail folders. Because named
-queries maybe reused, summary files are kept as caches to reduce
-the overall cost of viewing a vfolder. Summary files are superior to
-folders in that they allow for the same messages to appear in multiple
-vfolders without message duplications. Duplications of messages
-defeats attempts at tagging a message with additional user information
-like annotations. Named queries will define folders.
-
-Lambda queries are similar to named queries except that they have no
-name. These are created on the fly by the user to filter out or
-include certain messages.
-
-All queries can be layered on top of each other. A lambda query can be 
-layered on a named query and a named query can be layered on a lambda
-query. The possibilities are endless.
-
-The layerings can be done as boolean operations (and, or, not). Short
-circuiting should be used. 
-
-Examples:
-
-(and (author "Giao")
-     (unread))
-
-The (unread) query should only be evaluated on the results of (author
-"Giao").
-
-(or (author "Giao")
-    (unread))
-
-Both of these queries should be evaluated. Any matches are added to the
-resulting vfolder.
-
-* Summary files
-
-Summary files are only meaningful when applied to the context of the
-default-vfolder of a store.
-
-Summary files should be generated for queries of the form:
-
-(function "constant value")
-
-Summary files should never be generated for queries of the form:
-
-(function (function1))
-
-(and (function "value")
-     (another-function "another value"))
-
-Given a query of the form:
-
-(and (function "value")
-     (another-function "another value"))
-
-The system should use one summary file for (function "value") and
-another summary file for (another-function "another value"). I will
-call the prior form the "plain form".
-
-It should be noted that the signature of the store should be based on
-the assumption that new data may have been added to the store since
-the application generated the summary file. Signatures generated on
-the entirety of the store will most likely be meaningless for things
-like POP/IMAP servers. 
-
-* Incremental indexing
-
-When new messages are detected, all known queries should be evaluated
-on the new messages. vfolders should be notified of new messages that
-are positive matches for their queries. The indexes generated by this
-process should be merged into the current indexes for the vfolder.
-
-* Can I have multiple stores?
-
-I don't see why not. Again, the inbox is a vfolder so you can get a
-unified inbox consisting of all new mail sent to all your stores or
-your can get inboxes for each store or any combination your heart
-desire. You get your cake, eat it, and someone else cleans the dishes!
-
-* Why all this?
-
-Consider the dynamic nature of the following query:
-
-(and (author "Giao")
-     (sent-after (today-midnight)))
-
-today-midnight would be a function that is evaluated at run-time to
-calculate the appropriate object.
-
-* Scenarios of usage and their solutions
-
-** Mesage alterations
-
-This is a fuzzy area that should be left to the UI to handle. Messages 
-are altered. Read status are altered when a new message is read for
-example. How do we handle this if our query is for unread messages?
-Upon viewing the state would change.
-
-One idea is to not evaluate the queries unless we're changing between
-vfolder views. This assumes that one can only view a particular
-vfolder at a time. For multi-vfolder viewing, a message change should
-propagate through the vfolder system. Certain effects (as in our
-example) would not be intuitive.
-
-It would not be a clean solution to make special cases but they may be 
-necessary where certain defined fields are ignored when they are
-changed. Some combination of the above rules can be used. I don't
-think it's an easy solution.
-
-** Message inclusion and exclusion
-
-Messages are included and excluded also with queries. The final query
-will have the form of:
-
-(and (author "Giao")
-     (criteria value)
-     (not (criteria other-value)))
-
-Userland criterias may be a label of some sort. These may be userland
-labels or Message-IDs. What are the performance issues involved in
-this? With short circuiting, it's not a major problem.
-
-The criterias and values are determined by the UI. The vfolder
-mechanism isn't concerned with such issues.
-
-Messages can be included and excluded at will. The idea is often
-called "arbitrary inclusion/exclusion". This can be done by
-Message-IDs or other fields. It's been noted that Message-IDs are not
-unique. 
-
-I propose that any given vfolder is allocated an inclusion label and an 
-exclusion label. These should be randomly generated. This should be
-part of the vfolder description. It should be noted that the vfolder
-description has not been drafted yet.
-
-The result is such that the rules for a given named query is:
-
-(and (user-query)
-     (label inclusion-label)
-     (not exclusion-label))
-
-** Query scheduling
-
-Consider the following extremely dynamic queries:
-
-A:
-(and (author "Giao")
-     (sent-after (today-midnight)))
-
-B:
-(and (sent-after (today-midnight))
-     (author "Giao"))
-
-C:
-(or (author "Giao")
-    (sent-after (today-midnight)))
-
-Query A would be significantly faster because (author "Giao") is not
-dynamic. A summary file could be generated for this query. Query B is
-slow and can be optimized if there was a query compiler of some
-sort. Query C demonstrates a query in which there is no good
-optimization which can be applied. These come with a certain amount of
-baggage.
-
-It seems then that for boolean 'and' operations, plain forms should be 
-moved forward and other queries should be moved such that they are
-evaluated later. I would expect that the majority of queries would be
-of the plain form.
-
-First is that the summary file is tied to the query and the store
-where the query originates from. Second, a hashing function for
-strings needs to be calculated for the query so that the query and the 
-summary file can be associated. This hashing function could be similar 
-to the hashing function described in Rob Pike's "The Practice of
-Programming". (FIXME: Stick page number here)
-
-** Archives
-
-Many people are concerned that archives won't be preserved, archives
-aren't supported, and many other archive related issues. This is the
-short version.
-
-Archives are just that, archives. Archives are stores. Take your
-vfolder, export it to a store. You are done. If you load up the store
-again, then the default-vfolder of that store is the view of the
-vfolder, except the query is different.
-
-The point to vfolder is not to do away with classical folder
-representation but to move the queries to the front where it would
-make data management easier for people who don't think in terms of
-files but in terms of queries because ordinary people don't think in
-terms of files.
-
-* Miscellany
-
-** Annotations
-
-There should be a scheme to add annotations to messages. Common mail
-user agents have used a tag in the message header to mark messages as
-read/unread for example. Extending on this we have the ability to add
-our own data to a message to add meaning to it. If we have a good
-scheme for doing this, new possibilities are opened.
-
-*** Keywords
-
-When sending a message, a message could have certain keywords attached 
-to it. While this can be done with the subject line, the subject line
-has a tendency to be munged by other mail applications. One popular
-example is the "[rR]e:" prefix. Using the subject line also breaks the 
-"contract" with other mail user agents. Using keywords in another
-field in the message header allows the sender to assist the recipient
-in organizing data automatically. Note that the sender can only
-provide hints as the sender is unlikely to know the organization
-schemes of the recipient.
-
-** Scope
-
-Let us assume that we have multiple stores. Does a query work on a
-given store? Or does it work on all stores? Or is it configurable such 
-that a query can work on a user-selected list of stores?
-
-* Alternatives to the above
-
-Jim Meyer <purp@selequa.com> is putting some notes on where
-annotations needs to be located. They'll be located here as well as
-any contributions I may have to them.
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/C/.cvsignore b/doc/C/.cvsignore
deleted file mode 100644
index 2f4c48adbf..0000000000
--- a/doc/C/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-evolution-guide
-evolution-guide.junk
-evolution-guide.log
-evolution-guide.ps
-evolution-guide.dvi
-evolution-guide.tex
-fig/*.eps
\ No newline at end of file
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
deleted file mode 100644
index 15f1e047b6..0000000000
--- a/doc/C/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-SGML_FILES =			\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-fdl.sgml		\
-	apx-gloss.sgml		\
-	config-prefs.sgml	\
-	config-setupassist.sgml	\
-	config-sync.sgml	\
-	evolution-guide.sgml	\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-sync.sgml
-
-
-EXTRA_DIST = \
-	$(SGML_FILES)
-
-all: evolution-guide
-
-evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
-
-dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
-	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
-
-install-data-local: evolution-guide
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
deleted file mode 100644
index 89f0dd6bc5..0000000000
--- a/doc/C/apx-authors.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@helixcode.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
-     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@helixcode.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@helixcode.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@helixcode.com</email></member>     
-     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@helixcode.com</email></member>
-     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
-</simplelist>
-and other dedicated GNOME programmers. 
-</para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.helixcode.com/apps/evolution.php3"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugs.gnome.org" type="http">GNOME bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
-      command <command>bug-buddy</command> for submitting bug reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@helixcode.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
-      application programmers and the GNOME Documentation Project.
-      Please send all comments and suggestions regarding the manual to
-      the GNOME Documentation Project at
-      <email>docs@gnome.org</email>. You can also add your comments
-      online by using <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
-    </para>
-    <!-- For translations: uncomment this: <para> Latin translation
-      was done by ME (<email>MYNAME@MYADDRESS</email>). Please send
-      all comments and suggestions regarding this translation to
-      SOMEWHERE.  </para> -->
-    </appendix>
-
-
-
-
-
diff --git a/doc/C/apx-bugs.sgml b/doc/C/apx-bugs.sgml
deleted file mode 100644
index e4a96a8155..0000000000
--- a/doc/C/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Known bugs and limitations</title>
-    <abstract>
-    <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
-    </para>
-  </appendix>
-
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
deleted file mode 100644
index 129020aa3d..0000000000
--- a/doc/C/apx-gloss.sgml
+++ /dev/null
@@ -1,459 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glossary</title>
-
- <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
-  <glossdef>
-   <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Conduit</glossterm>
-  <glossdef>
-   <para>
-     A synchronization conduit is a small application which controls
-     the transfer of data between a handheld device and a desktop
-     computer.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Druid</glossterm>
-  <glossdef>
-   <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
-     account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward</glossterm>
-  <glossdef>
-   <para>
-       the user can send a third party a message
-    which was sent to the user originally.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
-    for describing page layout in electronic documents like web pages,
-    help files, and email messages.  HTML can be used in email and
-    news posts to insert images and apply text treatments.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
-  <glossdef>
-   <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, it allows access to email which is typically (although
-    not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP</glossterm>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Inline</glossterm>
-  <glossdef>
-   <para>
-     Displayed as part of a message or other document, rather than
-     attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly.*so[a|u]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
-  <glossdef>
-   <para>
-      As its name implies, <application>sendmail</application> is a
-      program which sends mail.  <application>Evolution</application>
-      can use it instead of <glossterm>SMTP</glossterm>; some people
-      prefer it because it offers more flexibility, but is more
-      difficult to set up.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
-  <glossdef>
-   <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signature</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unsolicited e-mail.  Spam normally comes in forms of
-    chain letters and advertisements for unscrupulous or clueless
-    companies.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="tooltip">
-  <glossterm>Tool-Tip</glossterm>
-  <glossdef>
-   <para>
-      A small box of explanatory text which appears when the mouse
-      pointer is held motionless over a button or other interface
-      element.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
-  <glossdef>
-   <para>
-    A file format for the exchange of contact information. When you
-    get an address card attached to an email, it's probably in vCard
-    format.  Not to be confused with <glossterm
-    linkend="vfolder">vFolder</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
-  <glossdef>
-   <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
deleted file mode 100644
index 157b61e1cc..0000000000
--- a/doc/C/config-prefs.sgml
+++ /dev/null
@@ -1,646 +0,0 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Mail
-        configuration</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	<varlistentry>
-          <term><guilabel>Identities</guilabel></term>
-          <listitem>
-	    <para>
-               This allows you to create and alter one or more
-               identities for your email.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Sources</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> where to get the
-               mail sent to you, and how to get it.
-            </para>
-          </listitem>
-	</varlistentry>
-	<varlistentry>
-
-	  <term><guilabel>Mail Transport</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> how to send mail.
-            </para>
-          </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>News Servers</guilabel></term>
-	  <listitem>
-	    <para>
-              If you would like to use
-              <application>Evolution</application> to read newsgroups,
-              you can specify your news server preferences here.
-           </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>Other</guilabel></term>
-	  <listitem>
-	    <para>
-              Miscellaneous mail and news settings, such as HTML
-              handling preferences, and how long
-              <application>Evolution</application> should wait before
-              marking a message read.
-           </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
-      <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
-       </para>
-       <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
-      <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from <glossterm
-                  linkend="imap">IMAP</glossterm> or <glossterm
-                  linkend="pop">POP</glossterm> servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
-                  <glossterm linkend="smtp">SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server-- this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.
-          </para>
-      </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
-	<para>
-           The <interface>Mail Transports</interface> tab lets you set
-           how you will send mail.  Evolution currently supports two
-           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
-           uses a remote mail server, and
-           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <glossterm>SMTP</glossterm>.
-        </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-                <term> 
-                   <guilabel>Send messages in HTML format</guilabel>
-                </term>
-                <listitem><para>
-                    If you check this box, you will send
-                    messages as HTML by default.  If you leave it unchecked, your
-                    messages will be sent without HTML formatting unless you select 
-                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-                    </menuchoice> in the message composer.
-                    See <xref linkend="usage-mail-getnsend-send-html">
-                    for more information about HTML mail.
-                </para></listitem>
-              </varlistentry>
-             <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Weeks start on</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day range</term>
-	    <listitem>
-               <para>
-                 When does your work day start, and when does it end?
-                 In the day and week views,
-                 <application>Evolution</application> displays all the
-                 hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, you can
-                 still schedule an appointment outside of these hours,
-                 and if you do, the display will be extended to show
-                 it.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Calendar Colors</title>
-      <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements whose color you can set are:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
-       <variablelist>
-	 <varlistentry>
-	   <term>Show on To Do List</term>
-	    <listitem>
-	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Style Options</term>
-	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</title>
-	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
-	<para>
-          You can set the following options: <!--insert variable list
-          here-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
deleted file mode 100644
index b9b72b568a..0000000000
--- a/doc/C/config-setupassist.sgml
+++ /dev/null
@@ -1,213 +0,0 @@
-    <chapter id="config-setupassist">
-      <title>Easy Setup with the Setup Assistant</title>
-      <para>
-        The first time you try to use email, the mail setup assistant
-        will ask you for some basic information, so
-        <application>Evolution</application> can let you use email. If
-        you prefer more detailed configuration, or if you want to make
-        changes to an existing email setup, see <xref
-        linkend="config-prefs">.
-      </para>
-
-   <sect1 id="config-setupassist-mail">
-      <title>Mail Setup</title>
-      <para>
-        The first time you try to send or receive mail with
-	<application>Evolution</application>, the <interface>mail
-	setup assistant</interface> will pop up to help you with your
-	email preferences.  If you don't plan to use email, or if
-	you'd rather deal with your email preferences later, click
-	<guibutton>Cancel</guibutton>.
-      </para>
-
-<!--  
-
-        Before you get it, though, you should decide where you want to
-	keep it.  Your options will vary a little depending on your
-	network setup, but they come down to storing the mail on your
-	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
-	storing it on the network (using <glossterm
-	linkend="imap">IMAP</glossterm>).  If you store your mail on
-	your local hard disk, you can read it whether you're online or
-	not, but you can only read it from one computer.  If you store
-	it on the network, you can only read it when you're online,
-	but you can access it from almost any computer with a network
-	connection, even if it doesn't have
-	<application>Evolution</application>.
-
-
-        If you choose POP, you'll be putting mail in the
-        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
-        folder.  If you choose IMAP, it's the
-        <guilabel>Inbox</guilabel> of a folder with the same name as
-        your mail server.  That's so you can maintain several distinct
-        IMAP servers if you want.  See <xref
-        linkend="config-prefs-mail"> for more information about mail
-        servers.
--->
-
-      <para>
-         The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
-	 network configuration process.  It will ask you for some
-	 basic information; your system administrator or ISP should
-	 have the answers you'll need.  The mail setup assistant is
-	 pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
-	<figure id="usage-setup-fig">
-	<title>Mail Setup Assistant</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
-	    </graphic>
-	</screenshot>
-	</figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
-  The assistant will ask you for the following information:
-        <variablelist>
-
-          <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term> <listitem>
-	  <para>Your full name. </para></listitem>
-         </varlistentry>
-
-       <varlistentry>
-          <term><guilabel>Email address:</guilabel></term>
-	  <listitem><para>
-                 Your complete email address.
-                 </para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-          <term> <guilabel>Organization:</guilabel></term>
-	  <listitem>
-	    <para>
-              Any organization you represent, or the company where you
-              work.  Leave this blank if you wish, or type "My own bad
-              self" so people know your opinions are yours alone.
-            </para>
-	  </listitem>
-      </varlistentry>
-
-      <varlistentry>
-	 <term><guilabel>Signature File:</guilabel></term>
-          <listitem>
-            <para>
-             A text file appended to any email you send.  A signature
-             file typically consists of your name and email address,
-             or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remember,
-             this is attached to every email you send.
-            </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-           <term> <guilabel>Mail source type:</guilabel></term>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> supports several
-              mail sources: <glossterm linkend="pop">POP</glossterm> and
-              <glossterm linkend="imap">IMAP</glossterm> servers, and UNIX-style
-              <systemitem><filename>mbox</filename></systemitem> and
-              <systemitem><filename>mh</filename></systemitem> files.
-              POP servers retrieve your mail and store it on your
-              local system so you can refer to it even when not
-              connected to a network; <glossterm>IMAP</glossterm>
-              servers store the mail on the server so you can access
-              it from multiple locations;
-              <systemitem><filename>mbox</filename>></systemitem>
-              files are used by your computer for internal mail, and
-              may be useful if you want to switch from another email
-              client such as <application>Spruce</application> or
-              <application>Netscape Communicator</application>.  Ask
-              your system administrator which you should use, or keep
-              guessing until one works.  You may use multiple sources
-              if you wish; see <xref
-              linkend="config-prefs-mail-network"> for more
-              information.
-            </para>
-            <para>
-              If you decide not to have
-              <application>Evolution</application> use any servers,
-              the remaining items are not relevant; you only need to
-              point to the location of the files you wish to access.
-            </para>
-	  </listitem>
-	  </varlistentry>
-          
-       <varlistentry>
-          <term> <guilabel>Server:</guilabel></term>
-	  <listitem>
-	    <para>
-              This should be the name of the server where you get
-              incoming mail.  It may (or may not) be the same as the
-              server where you send your outgoing mail.
-            </para>
-	  </listitem>
-	</varlistentry>
-
-     <varlistentry>
-	  <term><guilabel>Username:</guilabel></term>
-	<listitem>
-             <para>
-              Enter the username for your mail server account, if you
-              have one. In almost all cases, this is the part of your email
-              address before the @ character, and
-              <application>Evolution</application> has selected that
-              value as the default.  If you have a different username,
-              you can enter it here.
-            </para>
-	  </listitem>
-      </varlistentry>
-     
-       <varlistentry>
-            <term><guilabel>Authentication:</guilabel></term> 
-	    <listitem>
-	    <para>
-              Select the type of authentication you will use.  You can
-              click <guibutton>Detect supported types</guibutton> to
-              find out which authentication protocols your network
-              allows.
-            </para>
-	  </listitem>
-       </varlistentry>
-
-      <varlistentry> 
-         <term><guilabel>Mail Transport:</guilabel></term>
-	  <listitem>
-	    <para>
-              This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both
-              <glossterm linkend="smtp">SMTP</glossterm> and
-              <application>sendmail</application>; SMTP is by far the
-              more common.
-            </para>
-	  </listitem>
-      </varlistentry>
-     </variablelist>
-      </para>
-      <para>
-        To learn how to configure <application>Evolution</application>
-        in greater detail, or to change preferences once you have set
-        them, see <xref linkend="config-prefs">.
-      </para>
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml
deleted file mode 100644
index 0445b474c4..0000000000
--- a/doc/C/config-sync.sgml
+++ /dev/null
@@ -1,124 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        deal with. 
-        <simplelist>
-          <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, <application>Evolution</application> only
-            supports Palm-OS devices like the PalmPilot and the
-            Handspring Visor.
-          </member>
-          <member>
-           You should decide what sort of synchronization behavior you
-           want.
-          </member>
-        </simplelist>
-
-    </para>
-    <para>
-       If you haven't used a handheld device with your computer
-       before, you'll need to run the GNOME <application>Control
-       Center</application> and make sure that <application>Pilot
-       Link</application> is properly configured. Then, select the
-       <application>Evolution</application> <glossterm
-       linkend="conduit">conduits</glossterm> under the
-       <guilabel>Pilot Conduits</guilabel> section of the Control
-       Center.
-      </para>
-     <para>
-        Once your computer and your Palm-OS device are talking happily
-        to each other, you'll have to decide what exactly you want
-        them to do with the data they exchange.  Your options may vary
-        depending on the conduit, but typically they will be:
-
-        <variablelist>
-         <varlistentry>
-            <term>Disabled </term>
-            <listitem> 
-               <para>
-                  Do nothing.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Synchronize</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  from the handheld to the computer.  Remove items
-                  that were on both systems but have been deleted on
-                  one.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy From Pilot</term>
-            <listitem> 
-               <para>
-                  If there is any new data on the the handheld device,
-                  copy it to the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy To Pilot</term>
-            <listitem> 
-               <para>
-                 Copy new data from the computer to the handheld. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge From Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the handheld to the computer, and
-                  remove any information from the computer that has
-                  been deleted on the handheld.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge To Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  remove any information from the handheld that has
-                  been deleted on the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Select a behavior for each conduit available.  For the most
-      part, you'll want to stick with
-      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the synchronization button.
-    </para>
-
-
-      <para> 
-         <warning> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  To do that,
-	    make a copy of your <systemitem>
-	    <filename>~/evolution</filename> </systemitem> directory.
-          </para>
-	</warning>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
deleted file mode 100644
index 114f2e87d9..0000000000
--- a/doc/C/evolution.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000</year>
-      <holder> Ximian, Inc., </holder>
-      <holder> Kevin Breit </holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation
-         License</citetitle></ulink>, Version 1.1 or any later version
-         published by the Free Software Foundation with no Invariant
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-         may obtain a copy of the <citetitle>GNU Free Documentation
-         License</citetitle> from the Free Software Foundation by
-         visiting <ulink type="http" url="http://www.fsf.org">their
-         Web site</ulink> or by writing to: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and those trademarks
-         are made aware to the members of the GNOME Documentation
-         Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-
-   <releaseinfo>
-      This is version 0.9 of the Evolution manual.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Using Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application> for
-        email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that there's more
-        than one way to do things, and you can pick whichever method
-        you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable" means
-        what it ought to.  It means that, while you can expect the
-        program to work perfectly well in its default settings, it's
-        also easy to alter its behavior in a wide variety of ways, so
-        that it fits your needs exactly.  This part of the book will
-        describe that process, from the quickest glimpse of the Setup
-        Assistant to an in-depth tour of the preferences dialogs.
-      </para>
-    </partintro>
-
-    &CONFIG-SETUPASSIST;
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
- 
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/fig/calendar.png b/doc/C/fig/calendar.png
deleted file mode 100644
index c9703f4903..0000000000
--- a/doc/C/fig/calendar.png
+++ /dev/null
diff --git a/doc/C/fig/config-cal.png b/doc/C/fig/config-cal.png
deleted file mode 100644
index 25b5b68621..0000000000
--- a/doc/C/fig/config-cal.png
+++ /dev/null
diff --git a/doc/C/fig/config-mail.png b/doc/C/fig/config-mail.png
deleted file mode 100644
index cd8543d94e..0000000000
--- a/doc/C/fig/config-mail.png
+++ /dev/null
diff --git a/doc/C/fig/contact-editor.png b/doc/C/fig/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/doc/C/fig/contact-editor.png
+++ /dev/null
diff --git a/doc/C/fig/contact.png b/doc/C/fig/contact.png
deleted file mode 100644
index a9ed02251a..0000000000
--- a/doc/C/fig/contact.png
+++ /dev/null
diff --git a/doc/C/fig/filter-assist-fig.png b/doc/C/fig/filter-assist-fig.png
deleted file mode 100644
index 5248e0effe..0000000000
--- a/doc/C/fig/filter-assist-fig.png
+++ /dev/null
diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png
deleted file mode 100644
index a8b41ca678..0000000000
--- a/doc/C/fig/filter-new-fig.png
+++ /dev/null
diff --git a/doc/C/fig/mail-composer.png b/doc/C/fig/mail-composer.png
deleted file mode 100644
index 22c16365b5..0000000000
--- a/doc/C/fig/mail-composer.png
+++ /dev/null
diff --git a/doc/C/fig/mail-druid-pic.png b/doc/C/fig/mail-druid-pic.png
deleted file mode 100644
index f29f3e77be..0000000000
--- a/doc/C/fig/mail-druid-pic.png
+++ /dev/null
diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png
deleted file mode 100644
index b4f18640b4..0000000000
--- a/doc/C/fig/mail-inbox.png
+++ /dev/null
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
deleted file mode 100644
index 28bf487bf9..0000000000
--- a/doc/C/fig/mainwindow-pic.png
+++ /dev/null
diff --git a/doc/C/fig/print-dest.png b/doc/C/fig/print-dest.png
deleted file mode 100644
index 464705711e..0000000000
--- a/doc/C/fig/print-dest.png
+++ /dev/null
diff --git a/doc/C/fig/print-preview.png b/doc/C/fig/print-preview.png
deleted file mode 100644
index 7f9a8d661a..0000000000
--- a/doc/C/fig/print-preview.png
+++ /dev/null
diff --git a/doc/C/fig/vfolder-createrule-fig.png b/doc/C/fig/vfolder-createrule-fig.png
deleted file mode 100644
index 162bebf48c..0000000000
--- a/doc/C/fig/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
deleted file mode 100644
index d82191cb17..0000000000
--- a/doc/C/menuref.sgml
+++ /dev/null
@@ -1,1470 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Menu Reference</title>
-  <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-
-
-  <sect1 id="menuref-universal">
-    <title>Menus that are the same everywhere</title>
-    <para>
-      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in
-      the main <application>Evolution</application> window do not
-      change, because they refer to universal items.  Other menus have
-      contents that change depending on context.
-    </para>
-   
- <sect2 id="menuref-universal-file">
-      <title>File Menu</title>
-      <para>
-	<variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>New...</guisubmenu> Submenu</term>
-	    <listitem><para>
-		<itemizedlist>
-		  <listitem><para>
-		      <guimenuitem>Folder</guimenuitem> &mdash;
-		       Create a new folder. See <xref 
-		       linkend="usage-mainwindow-folderbar">
-		       for more information about folders.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Shortcut</guimenuitem> &mdash;
-		       Create a new Shortcut in the Shortcut Bar.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Mail Message</guimenuitem> &mdash;
-		       Compose a new mail message. Covered in
-		       <xref linkend="usage-mail-getnsend-send">.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Appointment</guimenuitem> &mdash;
-		       Enter a new appointment in your calendar. See <xref
-			linkend="usage-calendar-apts-basic"> for more information.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Task</guimenuitem> &mdash;
-		       Enter a new to-do item in your taskpad. Covered in 
-		       <xref linkend="usage-calendar-todo">.
-		    </para></listitem>
-		</itemizedlist>
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Go to Folder</guimenuitem></term>
-	    <listitem><para>
-               View the items in a particular folder.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Create New Folder</guimenuitem></term>
-	    <listitem><para>
-		 This item doesn't belong here any more.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-		 Print the current message.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Exit</guimenuitem></term>
-	    <listitem><para>
-		 Quit using <application>Evolution</application>.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-universal-help">
-      <title>The Help Menu</title>
-      <para>
-      <variablelist>
-	<varlistentry>
-	  <term><guimenuitem>Help Index</guimenuitem></term>
-	  <listitem><para>
-             Displays the table of contents for this document.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Getting Started</guimenuitem></term>
-	  <listitem><para>
-              A quick look around, and a summary of the things
-              <application>Evolution</application> can do for you.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Mailer</guimenuitem></term>
-	  <listitem><para>
-              An in-depth tour of <application>Evolution</application> Mail.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Calendar</guimenuitem></term>
-	  <listitem><para>
-             A step-by-step guide to using the Calendar.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>
-	  <listitem><para>
-            Find your way around the Contact Manager.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Submit Bug Report</guimenuitem></term>
-	  <listitem><para>
-             If you don't report them, they can't fix them.  Select this item to let the 
-             developers know what's wrong.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>About Evolution</guimenuitem></term>
-	  <listitem><para>
-              Displays a window with information about the application and its authors.
-              This has the same information as <xref linkend="authors">.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-exec">
-   <title>Executive Summary Menus</title>
-   <para>
-     We'll leave this section blank until the UI stabilizes a little
-     more.
-   </para>
-  </sect1>
-
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </para>
-   
-    <sect2 id="menuref-mail-edit">
-      <title>The Edit Menu</title>
-      <para>
-        This menu is currently empty.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-view">
-      <title>The Mail View Menu</title>
-      <para>
-        This menu lets you control the way
-        <application>Evolution</application> displays your information
-        for you.
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the shortcut bar on and off with this item.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Threaded Message List</guimenuitem></term>
-	    <listitem><para>
-               This item controls whether your message list is displayed by thread 
-               or by other criteria.  The default order is by date; see
-               <xref linkend="usage-mail-listorder"> for information about the
-               order of the message list.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-tools">
-      <title>The Mail Settings Menu</title>
-      <para>
-      <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mail Filters</guimenuitem></term>
-	    <listitem><para>
-             Edit your mail filters here.  
-             See <xref linkend="usage-mail-organize-filters">
-             for more information about mail filtering.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               with this tool. 
-              To learn about using vFolders with mail, see 
-              <xref linkend="usage-mail-organize-vfolders">.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Mail Configuration</guimenuitem></term>
-	    <listitem><para> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-   <sect2 id="menuref-mail-messagelistheader">
-      <title>The Message Heading Right-Click Menu</title>
-      <para>
-         At the top of the message list is the message list heading
-         bar; you can click on an individual heading &mdash;
-         <guilabel>Subject</guilabel>, for example, to have the
-         message list sorted by that attribute.  However, if you right
-         click on a heading, you'll get the following menu:
-      </para>
-
-      <para>
-          <variablelist>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list, in ascending order, by the attribute you clicked.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Descending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list in descending order.
-	      </para></listitem>
-	    </varlistentry>
-  
-	  <varlistentry>
-	      <term><guimenuitem>Unsort</guimenuitem></term>
-	      <listitem><para>
-		 Undo any sorting by this attribute, and leave the message list sorted 
-                 by the previous one.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by this Field</guimenuitem></term>
-	      <listitem><para>
-		 Instead of sorting the messages, group them in boxes. 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by Box</guimenuitem></term>
-	      <listitem><para> If you have your messages grouped in
-	      boxes, you can arrange the boxes as well, by choosing
-	      this item.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Remove this column</guimenuitem></term>
-	      <listitem><para>
-		 Choose this to remove the column from the message list display.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Field Chooser</guimenuitem></term>
-	      <listitem><para>
-		 Opens a palette of columns. You can drag the columns
-		 you want from the palette into position in the
-		 message list heading bar; red arrows appear
-		 when you get close enough to a possibile position.</para>
-                 
-              <para>
-                 Your options are: 
-                 <itemizedlist>
-                     <listitem><para>
-                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>An Exclamation Point</guiicon> for priority
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
-                     </para></listitem>
-                     <listitem><para>
-                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Date</guilabel>, for the date and time a message was sent.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Received</guilabel>, for the date and time you got the message. 
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Size</guilabel>, for a message's size.
-                     </para></listitem>
-		  </itemizedlist>
-             </para>   
-
-	      </listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Alignment</guimenuitem></term>
-	      <listitem><para> Use this item to decide upon the
-	      alignment of the message attributes within their
-	      columns.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Best Fit</guimenuitem></term>
-	      <listitem><para>
-		 Alters the width of the message list columns to maximize the amount of information displayed.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Format Columns...</guimenuitem></term>
-	      <listitem><para>
-		 This item is not yet available.
-	      </para></listitem>
-	    </varlistentry>
-
-
-	  <varlistentry>
-	      <term><guimenuitem>Customize
-	      Views...</guimenuitem></term> <listitem><para> Opens a
-	      dialog box that lets you choose a complex set of
-	      arrangements for your message list, so you can combine
-	      sorting and grouping in as many ways as you like.
-	      </para></listitem>
-	    </varlistentry>
-
-          </variablelist>
-      </para>
-   </sect2>
-  </sect1>
-
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
-      <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
-      <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
deleted file mode 100644
index ddb6a0d2dd..0000000000
--- a/doc/C/preface.sgml
+++ /dev/null
@@ -1,438 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.
-        <application>Evolution</application>'s goal is to make the
-        tasks of storing, organizing, and retrieving your personal
-        information easier, so you can work and communicate with
-        others.  That is, it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop. On the inside, it's a
-        powerful database; on the outside, it's a tool to help you get
-        your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>Evolution</application> is Free Software.  The
-        program and its source code are released under the terms of
-        the GNU <ulink type="help" url="gnome-help:gpl"><citetitle>General
-        Public License (GPL)</citetitle></ulink>, and the
-        documentation falls under the <ulink type="help"
-        url="gnome-help:fdl"><citetitle>Free Documentation
-        License</citetitle></ulink> (FDL). For more information about
-        the GPL and the FDL, visit the Free Software Foundation's
-        website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>This is a preview release</title>
-           <para>
-             <application>Evolution</application> is not complete, and
-             still has a lot of flaws.  Please help improve it by
-             letting us know about them.  You should do this by
-             submitting bug reports with the GNOME <application>Bug
-             Report Tool</application> (known as
-             <command>bug-buddy</command> at the command line).
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> can help you work in a
-        group by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-      </para>
-      <para>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. In other words, it needs a familiar
-             and intuitive interface that users can customize to their
-             liking, and users should have access to shortcuts for
-             complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Data must be safe: <application>Evolution</application>
-               must not lose mail, corrupt mailbox files or other
-               data, execute arbitrary <glossterm linkend="script">scripts</glossterm>,
-               or delete files from your hard disk.
-            </para>
-          </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        <application>Evolution</application> is designed to make most
-        daily tasks faster.  For example, it takes only one or two
-        clicks to enter an appointment or an address card sent to you
-        by email, or to send email to a contact or appointment.
-        <application>Evolution</application> makes displays faster and
-        more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate advanced
-        features like <link
-        linkend="usage-mail-organize-vFolders">Virtual Folders</link>,
-        which let you save searches as though they were ordinary mail
-        folders.
-      </para>
-
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>About This Book</title>
-    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
-      <para>
-        This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@ximian.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
-        url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
-      </para>
-    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
-
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this section is for you. The second section, covering
-        <link linkend="config">configuration</link>, is targeted at
-        more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
-        from reading it.  In addition, there is a comprehensive <link
-        linkend="menuref">menu reference</link> which describes nearly
-        every capability that <application>Evolution</application> has
-        to offer.
-      </para>
-      <formalpara>
-        <title>Typographical conventions</title>
-	<para>
-          Some kinds of words are marked off with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-        </para>
-      </formalpara>
-  </sect1>
-  <sect1 id="commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-        You might want to copy this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
-    </para>
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use:
-         
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>`
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-	  <varlistentry>
-	    <term>Check Mail</term>
-	    <listitem>
-	      <para>
-                Click <guibutton>Get Mail</guibutton> in the
-                toolbar. There is no keyboard shortcut for this task,
-                but you can ask <application>Evolution</application>
-                to check for new mail periodically. To do so, FIXME.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>J</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
-	    <listitem>
-	      <para>
-                You can create filters and Virtual Folders based on
-                specific message attributes from the message's
-                right-click menu.  Alternately, select a message, and
-                then choose <menuchoice> <guimenu>Settings</guimenu>
-                <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Settings</guimenu>
-                <guimenuitem>Virtual Folder Editor</guimenuitem>
-                </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and Virtual
-                Folders in <xref
-                linkend="usage-mail-organize-vfolders">.
-            </para>
-	    </listitem>
-	</varlistentry>
-	</variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-cal">
-        <title>Calendar</title>
-        <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-
-
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
deleted file mode 100644
index a2c14e99a6..0000000000
--- a/doc/C/usage-calendar.sgml
+++ /dev/null
@@ -1,371 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>The Evolution Calendar</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a ruled background.  At the upper right, there's a
-    monthly calendar you can use to switch days.  Below that, there's
-    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
-    seperate from your calendar appointments.  The calendar's daily
-    view is shown in <xref linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-
-    <para>
-       The toolbar offers you four different views of your calendar:
-       one day, five days, a week, or a month at once. Press the
-       calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of
-       days&mdash; three days, ten days, a fortnight if you want
-       &mdash; in the small calendar at the upper right.
-    </para>
-    <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
-       buttons will move you forward and back in your calendar pages.
-       If you're looking at only one day, you'll see tomorrow's page,
-       or yesterday's.  If you're looking at your calendar by week,
-       month, fortnight, or anything else, you'll move around by just
-       that much. To come back to today's listing, click
-       <guibutton>Today</guibutton>.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      events, set alarms, and determine event recurrence.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
-      <para>
-	To create a new calendar event, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your event must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <note>
-       <title>Doing Two Things At Once</title>
-         <para>
-           If you create calendar events that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
-         <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your event.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like to run a program as a
-	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
-	        button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> is a little more
-         complicated, and only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and
-         implementations of this feature have yet to be
-         determined. <!-- FIXME -->
-      </para>
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        event will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        event will <emphasis>not</emphasis> recur. Make your
-        selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
-        or "Every month on the first Friday for 12 occurrences."
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event then
-	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization with a hand-held device.  You can use the list
-       in a larger format by choosing the <guibutton>Tasks</guibutton>
-       button in the shortcut bar or in the folder tree.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
-	  <listitem>
-	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of task
-       list.  To view or edit a detailed description of an item,
-       double-click on it, or select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Keelyn, the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
-      </menuchoice>.
-       You can place the calendar in any calendar folder and access it
-       from the folder view.  Alarms, configuration, and display for
-       each calendar are separate from each other.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
deleted file mode 100644
index 0c6b976e4d..0000000000
--- a/doc/C/usage-contact.sgml
+++ /dev/null
@@ -1,617 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>The Evolution Address Book</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> address book can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>Evolution</application> supports the <glossterm
-      linkend="ldap">LDAP</glossterm> directory protocol, you can use
-      it with almost any type of existing directory server on your
-      network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of Evolution.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks. To
-      learn about configuring the address book, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Address Book</title>	
-    
-    <para>
-       To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the address book in all
-       its organizational glory.  By default, the address book
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-
-    <figure id="usage-contact-fig">
-      <title>Evolution Address Book</title>
-      <screenshot>
-	<screeninfo>Evolution Address Book Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-       The toolbar for the address book is quite simple:
-       <itemizedlist>
-	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar at the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is a quick search field. To use it, select
-    	   from the drop-down list which sort of search you'd like to
-    	   perform (the whole card, just the name, or just the email
-    	   address), then enter one or more words in the text entry
-    	   box, and press <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. You can refine searches by doing several in
-    	   succession, or start over by pressing the <guibutton>View
-    	   All</guibutton> button.
-	</para>
-      <para>
-	   If there are no matches, the card display will be
-	   blank. When you'd like to see all the cards again, press
-	   <guilabel>Show All</guilabel>.
-       </para>
-      <example id="contact-quicksearch-ex">
-	<title>Refining a Quick Search</title>
-	<para>
-	    Tom comes back from lunch and finds a note on his
-	    keyboard: "Curtis in sales called for you, but he didn't
-	    leave a number, and I forgot to write down the name of the
-	    company he works for. He said it was important, though."
-	    Tom is not at all annoyed.
-         </para>
-	 <para>
-	    He opens his contacts folder, and runs a quick search for
-	    "Curtis." There are eighteen different people with that name
-	    in the file. He then enters "Sales," and
-	    <application>Evolution</application> narrows it down to the
-	    right Curtis. He only becomes annoyed when he discovers that
-	    the call was not actually important.
-          </para>
-      </example>
-    
-      <para>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the
-        in-depth search window, which lets you use multiple search
-        criteria in the same way that email filters and <glossterm
-        linkend="vfolder">virtual folders</glossterm> do..  </para>
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a search within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select from
-        all the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
-  </sect1>
-  <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
-    <para>
-       To delete a card, click on it once to select it, then press the
-       <guibutton>Delete</guibutton> button.  If you have multiple
-       cards selected, you'll delete multiple cards.
-    </para>
-    <para>
-       If you want to add or change cards, you'll use the contact
-       editor.  To change a card that already exists, double click on
-       it to open the contact editor window with all the current
-       information already filled in.  If you want to create a new
-       one, clicking the <guibutton>New</guibutton> button in the
-       toolbar will open the same window, with blank entry boxes for
-       you to fill in.
-    </para>
-
-      <para>
-	The contact editor window has two tabs,
-    	<guilabel>General</guilabel>, for basic contact information,
-    	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, (see <xref
-    	linkend="menuref-contact-editor">) and a toolbar with three
-    	items: <guilabel>Save and Close</guilabel>,
-    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-      </para>
-      
-      <figure id="usage-contact-editor-fig">
-	  <title>Evolution Contact Editor</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor.png" format="png" srccredit="Aaron Weber">
-		</graphic>
-	</screenshot>
-      </figure>
-      
-      <para> The <guilabel>General</guilabel> tab has seven sections,
-         each with an icon: a face, for name and company; a telephone
-         for phone numbers; an envelope for email address; a globe for
-         web page address; a house for postal address; a file folder
-         for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Rupert T. Monkey</userinput>.  You'll
-                    notice that the <guilabel>File As</guilabel> field
-                    also fills up, but in reverse:
-                    <computeroutput>Monkey, Rupert</computeroutput>.
-                    You can pick <computeroutput>Rupert Monkey
-                    </computeroutput> from the drop-down, or type in
-                    your own, such as <userinput> T. Rupert Monkey
-                    </userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Rupert's information under "F" for
-                      "Fictitious Ximian Employee."
-                    </para>
-		  </tip>
-		</listitem>
-	      </itemizedlist>
-             </para>
-           </listitem>
-	</varlistentry>
-	<varlistentry>
-            <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                store them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is, fortunately, much more
-       simple: three sections, all of which are more or less obvious:
-       the briefcase next to the details about the contact's
-       professional life; the face next to the details about their
-       personal life; the globe next to a big blank space you can use
-       for anything and everything else you'd like to note about them.
-       If you ever wanted to have that uncanny knack for remembering
-       obscure details like the date of someone's anniversary (perhaps
-       your own) this is the way to develop it.
-     </para>
-
-
-
-
-<!--- ############# This section isn't implemented yet either:
-    <sect2>
-      <title></title>
-      <para>
-        <tip>
-	  <title>Contact Shortcuts</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-            right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change!  unimplemented!)
-          </para>
-	</tip>
-      </para>
-      <para>
-        You can move cards around just as you would move email
-        messages: dragging and dropping works, as does right-clicking
-        and choosing <guimenuitem>Move</guimenuitem> from the menu
-        that appears.
-      </para>
-    </sect2>
-############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
-    <para>
-       Organizing your address book is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow vFolders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!--
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your address book share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
-         different categories.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
-
-       <!-- FIXME: Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <para>
-       If you keep your cards on a network using an <glossterm
-       linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other address books, or maintain a shared set of
-       contact information for your company or your department.  This
-       is the sort of feature you'll want to use if your company has a
-       list of vendors and clients that needs constant updating.  If
-       share calendars as well as address books, people can avoid
-       duplicating work and keep up to date on developments within
-       their work-group or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X. 
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem>
-	  <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory and then synchronize your copy with
-              the networked version periodically.  <!-- FIXME: HOW? -->
-	  </para>
-	  </listitem>
-
-          <listitem>
-	  <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para>
-	  </listitem>
-	  <listitem>
-	  <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
-          </para>
-	  </listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Address Book Tools</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your address book's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group if you choose.
-      </para>
-
-<!-- FIXME this feature not yet implemented 
-
-      <para>
-         You can also use the address book to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
- -->
-
-    </sect2>
-<!---  FIXME this feature not yet implemented 
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-
-  </sect1>
-
-</chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
deleted file mode 100644
index 5ff67029d7..0000000000
--- a/doc/C/usage-exec-summary.sgml
+++ /dev/null
@@ -1,91 +0,0 @@
-<chapter id="usage-exec-summary">
-   <title>The Executive Summary</title>
-    <para>
-       The Evolution Executive Summary is designed to show you a
-       summary of important information: the appointments for a given
-       day, important email, and so forth. To see your executive
-       summary, click on the <guibutton>Executive Summary</guibutton>
-       button in the shortcut bar, or select the
-       <guilabel>executive-summary</guilabel> folder in the folder
-       bar.
-    </para>
-
-    <sect1 id="exec-intro">
-      <title>Introducing the Executive Summary</title>
-      <para>
-        The first thing you'll want to do with the executive summary
-        is add a service. Click the <guibutton>Add Service</guibutton>
-        button in the toolbar, then select one of the available
-        services.  Services may vary depending upon your system, but
-        most installations will have at least the following options:
-
-        <variablelist>
-
-          <varlistentry>
-             <term>Calendar</term>
-             <listitem>
-               <para>
-                  Pending appointments and other events.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>Inbox</term>
-             <listitem>
-               <para>
-                 Information about your mail, such as the number of
-                 new messages you have waiting.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>To Do</term>
-             <listitem>
-               <para>
-                 A short summary of your task pad.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>RDF Summary</term>
-             <listitem>
-               <para>
-                  News headlines for any valid RDF file. The default
-                  is news about the GNOME project from <ulink
-                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
-               </para>
-             </listitem>
-           </varlistentry>
-
-        </variablelist>
-
-     </para>
-
-     <para>
-       Each service appears in a small box on the screen; you can
-       remove the service by clicking the <guibutton>x</guibutton>
-       button in the upper right, or bring up a settings dialog by
-       clicking the little wrench icon below that.
-     </para>
-   </sect1>
-   <sect1 id="exec-services-detail">
-     <title>Services in Detail</title>
-      <para>
-          This section will show you how to use several
-          <application>Evolution</application> services. 
-
-      </para>
-     
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
deleted file mode 100644
index 9ec12d9e5b..0000000000
--- a/doc/C/usage-mail.sgml
+++ /dev/null
@@ -1,1539 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-mail"> 
-  <title>Evolution Mail</title>
-  <abstract>
-    <title> An Overview of the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   It can sort and organize your mail in a wide variety of ways with
-	   folders, searches, and filters.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	  It can send and receive mail in HTML or as plain text, and
-	  permits multiple file attachments.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   It supports multiple mail sources, including <glossterm
-	   linkend="imap">IMAP</glossterm>, <glossterm
-	   linkend="pop">POP3</glossterm>, local
-	   <systemitem><filename>mbox</filename></systemitem> and
-	   <systemitem><filename>mh</filename></systemitem> files, and
-	   even NNTP messages (newsgroups), which aren't technically
-	   email.
-	 </para>
-       </listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</link>, an advanced organizational feature not found in
-      other mail clients.  If you get a lot of mail, or if you keep
-      every message you get in case you need to refer to it later,
-      you'll find this feature especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
-      <para>
-	Your <application>Evolution</application>
-	<guilabel>Inbox</guilabel> will look something like the one in
-	<xref linkend="usage-mail-intro-fig">. Just below the toolbar
-	is the <interface>message list</interface>, showing message
-	header information like <guilabel>Subject</guilabel> and
-	<guilabel>Date</guilabel>.  The message itself appears below
-	that, in the <interface>view pane</interface>.  If you find
-	the <interface>view pane</interface> too small, you can resize
-	the pane, enlarge the whole window, or double-click on the
-	message in the <interface>message list</interface> to have it
-	open in a new window.  Just like with folders, you can
-	right-click on messages in the message list and get a menu of
-	possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="usage-mail-intro-fig">
-	  <title>Evolution Mail</title>
-	  <screenshot>
-	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-      <para>
-         Most of the mail-related actions you'll want to perform are
-         listed in the <guimenu>Message</guimenu> menu in the menu
-         bar.  The most frequently used ones, like
-         <guimenuitem>Reply</guimenuitem> and
-         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-         right-click menu and as keyboard shortcuts, which tend to be
-         faster once you get the hang of them.  You can choose
-         whichever way you like best; the idea is that the software
-         should work the way you want, rather than making you work the
-         way the it does.
-	 <tip id="view-headers">
-	 <title>Take a look at the headers</title>
-	 <para>
-	 To look at the entire source of your email message, including
-	 all the header information, select
-	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
-	 </para>
-	 </tip>
-       </para>
-
-      <sect3 id="usage-mail-listorder">
-	<title>Sorting the message list</title>
-	<para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list. The direction of the arrow next to the label indicates
-          the direction of the sort, and if you click again, you'll
-          sort them in reverse order. For example, click once on
-          <guilabel>Date</guilabel> to sort messages by date from
-          oldest to newest.  Click again, and
-          <application>Evolution</application> sorts the list from
-          newest to oldest. You can also right-click on the message
-          header bars to get a set of sorting options, and add or
-          remove columns from the message list.  You can find detailed
-          instructions on how to customize your message display
-          columns in <xref linkend="usage-mail-organize-columns">.
-        </para>
-	<para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  When you select this option,
-          <application>Evolution</application> groups the replies to a
-          message with the original, so you can follow the thread of a
-          conversation from one message to the next.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar. Or, right-click on a message and choose
-          <guimenuitem>Delete</guimenuitem> from the right-click
-          menu. The message will appear with a line through it, to
-          show that you've marked it for deletion.
-        </para>
-        <para>
-          If you change your mind and decide you want to keep it,
-          select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
-          really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently.
-        </para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-	Now that you've had a look around the
-	<interface>Inbox</interface>, it's time to check for new mail.
-	Click <guibutton>Get mail</guibutton> in the toolbar to check
-	your mail.  If it's the first time you've done so, the
-	<interface>mail setup assistant</interface> will ask you for
-	the information it needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). 
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        your password until until you select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Forget
-        Passwords</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-        Once it's validated the password,
-	<application>Evolution</application> will check your mail.
-	New mail will appear in the local <interface>Inbox</interface>
-	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
-	you have chosen to use IMAP, and you have multiple folders on
-	your IMAP server, you may need to subscribe to them.  To learn
-	how to use the subscription manager, read <xref
-	linkend="usage-mail-subscriptions">.
-      </para>
-   
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title> 
-     <para>
-	If you get an error message instead of mail, you probably need
-	to change your network settings.  To learn how to do that,
-	have a look at <xref linkend="config-prefs-mail-network">, or
-	ask your system administrator.
-      </para>
-    </note>
-
-      <sect3 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email that there's no reason not
-         to read them side by side.  If you want to do that, add a
-         news source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
-       </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Attachments and HTML Mail</title>
-	<para>
-	  If someone sends you an <glossterm>attachment</glossterm>, a
-	  file attached to an email,
-	  <application>Evolution</application> will display the file
-	  at the bottom of the message to which it's attached.  Text,
-	  HTML, and most images will be displayed within the message
-	  itself.  For other files,
-	  <application>Evolution</application> will show an icon at
-	  the end of the message.  Right-click on the icon to get a
-	  list of options which will vary depending on the type of
-	  attachment. You will have the option to display most files
-	  as part of the message, export them to a different
-	  application (images to Eye of GNOME, spreadsheets to
-	  Gnumeric, and so forth), or save them to disk.
-        </para>
-
-	<para>
-	   <application>Evolution</application> can also display
-	   HTML-formatted mail, complete with graphics.  HTML
-	   formatting will display automatically, although you can
-	   turn it off if you prefer.
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
-      <para>
-	 You can start writing a new email message by selecting
-	 <menuchoice> <guimenu>File</guimenu>
-	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail Message</guimenuitem></menuchoice>, or by pressing the
-	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
-	 When you do so, the <interface>New Message</interface> window
-	 will open, as shown in <xref
-	 linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-	<title>New Message Window</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
- <!-- Check the alignment of the following paragraph in the PS and
- HTML output: it's indented for no good reason -->
-      <para>
-	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 subject in the <guilabel>Subject:</guilabel> and a message in
-	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.
-       </para>
-
-      <sect3 id="usage-mail-getnsend-send-delay">
-	<title>Saving Messages for Later</title>
-	<para>
-	   Evolution will send mail immediately unless you tell it to
-	   do otherwise by selecting <menuchoice>
-	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  This will add your
-	   messages to the <guilabel>Outbox</guilabel> queue.  Then,
-	   when you press <guibutton>Send</guibutton> in another
-	   message, or <guibutton>Get Mail</guibutton> in the main
-	   mail window, all your unsent messages will go out at once.
-	   I like to use "Send Later" because it gives me a chance to
-	   change my mind about a message before it goes out.  That
-	   way, I don't send anything I'll regret the next day.
-	</para>
-	<para>
-	   To learn more about how you can specify message queue and
-	   filter behavior, see <xref linkend="config-prefs-mail">.
-	</para>
-
-	<para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
-	  </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>. 
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-	  You can probably guess the purpose of the buttons labelled
-	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton>, but there's a bit more to
-	  sending mail that's less obvious.  In the next few sections,
-	  you'll see how <application>Evolution</application> handles
-	  additional features, including large recipient lists,
-	  attachments, and forwarding.
-        </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
-	<title>Attachments</title>
-	<para>
-	    If you want to attach a file to your email message, you
-	    can drag it from your desktop into the message window, or
-	    click the button in the toolbar with a paper clip on it,
-	    labelled <guibutton>Attach</guibutton>.  If you click the
-	    <guibutton>Attach</guibutton> button,
-	    <application>Evolution</application> will open a file
-	    selection dialog box to ask you which file you want to
-	    send.  Select the file and click <guilabel>OK</guilabel>.
-        </para>
-	<para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-	<para>
-            When you send the message, a copy of the attached file
-	    will go with it.  Be aware that big attachments can take a
-	    long time to download.
-          </para>
-	</sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
-        <para>
-	    <application>Evolution</application>, like most email
-	    programs recognizes three types of addressee: primary
-	    recipients, secondary recipients, and hidden ("blind")
-	    recipients.
-         </para>
-         <para>
-	    The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the the
-            <guilabel>Cc:</guilabel> field.
-	  </para>
-	  <para>
-	    Hearkening back to the dark ages when people used
-	    typewriters and there were no copy machines, "Cc" stands
-	    for "Carbon Copy."  Use it whenever you want to share a
-	    message you've written to someone else.
-	    <example id="ex-mail-cc">
-	      <title>Using the Cc: field</title>
-	      <para>
-	         When Susan sends an email to a client, she puts her
-	         co-worker, Tim, in the in the
-	         <guilabel>Cc:</guilabel> field, so that he know
-	         what's going on.  The client can see that Tim also
-	         received the message, and knows that he can talk to
-	         Tim about the message as well.
-	      </para>
-	    </example>
-	  </para>
-	  <para>
-	    If you have a large number of recipients, or if you want
-	    to send mail to several people without sharing the
-	    recipient list, you should use
-	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and it sends messages discreetly.  In other words,
-	    the people in the <guilabel>Bcc:</guilabel> field get the
-	    message, but nobody sees that they got it.  Note that the
-	    contents of the <guilabel>To:</guilabel> and
-	    <guilabel>Cc:</guilabel> fields are visible to all
-	    recipients, even to people on the
-	    <guilabel>Bcc:</guilabel> list.
-
-	    <example id="ex-mail-bcc">
-	      <title>Using the Bcc: field</title>
-	      <para>
-	         Tim is sending an email announcement to all of his
-	         company's clients, some of whom are in competition
-	         with each other, and all of whom value their
-	         privacy. He needs to use the
-	         <guilabel>Bcc:</guilabel> field here.  If he puts
-	         every address from his address book's "Clients"
-	         category into the <guilabel>To:</guilabel> or
-	         <guilabel>Cc:</guilabel> fields, he'll make the
-	         company's <emphasis>entire</emphasis> client list
-	         public. It seems like a small difference, but it can
-	         make a huge difference in some situations.
-	     </para>
-	    </example>
-	  </para>
-	</sect4>
-
-        <sect4 id="usage-mail-getnsend-send-to">
-	<title>Choosing Recipients Quickly</title>
-	<para>
-	  If you have created address cards in the contact manager,
-	  you can also enter nicknames or other portions of address
-	  data, and <application>Evolution</application> will complete
-	  the address for you. <!-- (INSERT description of UI for this
-	  feature, once it is decided upon). --> If you enter a name
-	  or nickname that can go with more than one card, Evolution
-	  will open a dialog box to ask you which person you meant.
-	  <!-- (NOT YET) Also, <application>Evolution</application>
-	  will add a domain to any unqualified addresses.  By default,
-	  this is your domain, but you can choose which one mail
-	  preferences dialog. -->
-          </para>
-	  <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-	  <para>
-            For more information about using email together with the
-	    contact manager and the calendar, see <xref
-	    linkend="usage-contact-automate"> and <xref
-	    linkend="usage-calendar-apts">.
-	  </para>
-        </sect4>
-      </sect3>
-      
-      <sect3 id="usage-mail-getnsend-send-reply">
-	<title>Replying to Messages</title>
-	<para>
-	   To reply to a message, press the
-	   <guibutton>Reply</guibutton> button while it is selected,
-	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open the
-	   <interface>message composer</interface>.  The
-	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
-	   fields will already be filled, although you can alter them
-	   if you wish.  In addition, the full text of the old message
-	   is inserted into the new message, either in italics (for
-	   HTML display) or with the &gt; character before each line
-	   (in plain text mode), to indicate that it's part of the
-	   previous message.  People often intersperse their message
-	   with the quoted material as shown in <xref
-	   linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note that this figure should have a reply message ready to send,
-with quoted materials and the relevant replies interspersed-->
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-	 <title>Reply Message Window</title>
-	 <screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-	</para>
-
-	<para>
-	  If you're reading a message with several recipients, you may
-	   wish to use <guibutton>Reply to All</guibutton> instead of
-	   <guibutton>Reply</guibutton>.  If there are large numbers
-	   of people in the <guilabel>Cc:</guilabel> or
-	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time. 
-	  <example>
-	    <title>Using the Reply to All feature</title>
-	    <para>
-	      Susan sends an email to a client and sends copies to Tim
-	      and to an internal company mailing list of co-workers.
-	      If Tim wants to make a comment for all of them to read,
-	      he uses <guibutton>Reply to All</guibutton>, but if he
-	      just wants to tell Susan that he agrees with her, he
-	      uses <guibutton>Reply</guibutton>.  Note that his reply
-	      will not reach anyone that Susan put on her
-	      <guilabel>Bcc</guilabel> list, since that list is not
-	      shared with anyone.
-	    </para>
-	  </example>
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-	<para>
-           You're probably familiar with search and replace features,
-           and if you come from a Linux or Unix background, you
-           probably know what <guimenuitem>Find Regex</guimenuitem>
-           does.  If you aren't among the lucky who already know,
-           here's a quick rundown of an important section of the
-           <guimenu>Edit</guimenu> menu.
-        </para>
-	<para>
-           <variablelist>
-	    <varlistentry>
-	      <term><guimenuitem>Find</guimenuitem></term>
-	      <listitem><para> Enter a word or phrase, and
-	      <application>Evolution</application> will find it
-              in your message.
-	      </para></listitem>
-	    </varlistentry>
-	    
-	    <varlistentry>
-	      <term><guimenuitem>Find Regex</guimenuitem></term>
-	      <listitem>
-		<para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenuitem>Find Again</guimenuitem></term>
-	      <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	       <term><guimenuitem>Replace</guimenuitem></term>
-	       <listitem><para> 
-                 Find a word or phrase, and replace it with
-	         something else.  
-               </para></listitem>
-	    </varlistentry>
-
-	  </variablelist>
-        </para>  
-	<para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
-	<title>Embellish your email with HTML</title>
-	<para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis, or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to
-            convey their feelings.  However, most newer email programs
-            can display images and text styles as well as basic
-            alignment and paragraph formatting. They do this with
-            <glossterm linkend="html">HTML</glossterm>, just like web
-            pages do.
-        </para>
-	<note>
-	  <title>HTML Mail is not a Default Setting</title>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.  <emphasis>Some</emphasis>
-	    people refer to HTML mail as "the root of all evil" and
-	    get very angry if you send them HTML mail, which is why
-	    <application>Evolution</application> sends plain text
-	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <menuchoice>
-	    <guimenu>Format</guimenu> <guimenuitem>
-	    HTML</guimenuitem></menuchoice>.  Alternately, you can set
-	    your default mail format preferences in the mail
-	    configuration dialog.  See <xref
-	    linkend="config-prefs-mail-other"> for more information.
-          </para>
-	</note>
-	<para>
-           HTML formatting tools are located in the toolbar just above
-	   the space where you'll actually compose the message, and
-	   they also appear in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  
-	  </para>
-	  <para>
-            The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
-            you hold your mouse over the buttons.  The buttons fall
-            into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-	      <listitem>
-		<para>
-                  At the left edge of the toolbar, you can choose
-                  <guilabel>Normal</guilabel> for a default text style
-                  or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6). Other styles
-                  include <guilabel>pre</guilabel>, to use the HTML
-                  tag for preformatted blocks of text, and three types
-                  of <guilabel>List Item</guilabel> for the highly
-                  organized.
-                </para>
-	      </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-	      <listitem>
-		<para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">      
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
-                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                 </itemizedlist>
-               </para>               
-	      </listitem>    
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Alignment</term>
-	      <listitem>
-		<para>
-                   Located next to the text style buttons, these three
-                   paragraph icons should be familiar to users of most
-                   word processing software.  The leftmost button will
-                   make your text aligned to the left, the center
-                   button, centered, and the right hand button,
-                   aligned on the right side.
-                </para>
-	      </listitem>
-	      </varlistentry>
-
-	    <varlistentry>
-	      <term>Indentation rules</term>
-	      <listitem>
-		<para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	    <varlistentry>
-	      <term>Color Selection</term>
-	      <listitem>
-		<para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
-                  choose a new one, click the arrow button just to the
-                  right. If you have text selected, the color will
-                  apply to the selected text.  If you do not have text
-                  selected, the color will apply to whatever you type
-                  next.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  </variablelist>
-        </para>
-	<para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-	       <listitem>
-	        <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL). If you don't
-                  want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.
-               </para>
-	    </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-	    <listitem>
-	      <para>
-               Select this item to embed an image into your email, as
-               was done in the welcome message.  Images will appear at
-               the location of the cursor. This is different from
-               attaching them to a message, but not very different.
-              </para>
-	    </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-	</varlistentry>
-
-	  </variablelist>
-          </para>
-	  <note>
-	    <title>A Technical note on HTML Tags</title>
-	    <para>
-	      The composer is a WYSIWYG (What You See Is What You Get)
-	      editor for HTML. That means that if you enter HTML
-	      directly into the composer&mdash; say, <markup
-	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	      the composer will assume you meant exactly that string
-	      of characters, and not "make this text bold," as an HTML
-	      composition tool or text editor would.
-	    </para>
-	</note>
-      </sect3>
-   
-
-<!-- Function not implemented, 
-possibly never will be due to security evil. -->
-<!--
-	<sect3 id="usage-mail-getnsend-send-live">
-	  <title>Live Documents</title>
-	  <para>
-	    Later versions of <application>Evolution</application>
-	    will allow you to enliven your email with almost any
-	    sort of document, and even with entire
-	    applications. At this point, however, this feature has not 
-	    yet been implemented.
-	  </para>
-	</sect3>
--->
-
-      <sect3 id="usage-mail-getnsend-fwd">
-	<title>Forwarding Mail</title>      
-	<para>
-	  The post office forwards your mail for you when you change
-	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> button
-	  works in much the same way.  It's particularly useful if you
-	  have received a message and you think someone else would
-	  like to see it.  You can forward a message as an attachment
-	  to a new message (this is the default) or
-	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-	  portion of the message you are sending.  Attachment
-	  forwarding is best if you want to send the full, unaltered
-	  message on to someone else.  Inline forwarding is best if
-	  you want to send portions of a message, or if you have a
-	  large number of comments on different sections of the
-	  message you are forwarding.  Remember to note from whom the
-	  message came, and where, if at all, you have removed or
-	  altered content.
-	</para>
-	<para>
-	  To forward a message you are reading, press
-	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <menuchoice> <guimenu>Message</guimenu>
-	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-	  instead of attached, select <menuchoice>
-	  <guimenu>Message</guimenu> <guimenuitem>Forward
-	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-	  addressee as you would when sending a new message; the
-	  subject will already be entered, but you can alter it.
-	  Enter your comments on the message in the
-	  <interface>composition frame</interface>, and press
-	  <guibutton>Send</guibutton>.
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Courtesy</title>
-	<para>
-	  I started with ten, but four were "Don't send
-	  <glossterm linkend="spam">spam</glossterm>."
-	  <itemizedlist>
-
-	    <listitem>
-	      <para>
-		 Don't send spam or forward chain mail.  If you must,
-		 watch out for hoaxes and urban legends, and make sure
-		 the message doesn't have multiple layers of
-		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless in-line forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Always begin and close with a salutation. Say "please"
-		and "thank you," just like you do in real life. You
-		can keep your pleasantries short, but be pleasant!
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-		message in capital letters.  It hurts people's ears.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Never write anything in email you wouldn't say in
-		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	       Check your spelling and use complete sentences.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Don't send nasty emails (flames).  If you get one,
-		don't write back.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 When you reply or forward, include just enough of
-		 the previous message to provide context: not too
-		 much, not too little.
-	       </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-	<para> Happy mailing! </para>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-organize">
-    <title>Organizing Your Mail</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-    <sect2 id="usage-mail-organize-columns">
-      <title>Sorting Mail with Column Headers</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message (closed for unread, open for read,
-         and open with an arrow on it to indicate you've sent a
-         reply), an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  You can add
-         new ones with the <guimenuitem>Field Chooser</guimenuitem>
-         item in the right click menu for the column headings.
-      </para>
-      <para>
-         Right-click on one of the column headers to get a list of
-         options:
-             <variablelist>
-
-               <varlistentry>
-                  <term><guimenuitem>Sort Ascending</guimenuitem>,
-                  <guimenuitem>Sort Descending</guimenuitem>, and
-                  <guimenuitem>Unsort</guimenuitem></term>
-                  <listitem><para>Which should be pretty obvious. You
-                  can also set these sorts by just clicking on the
-                  column headers.</para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Group By this Field</guimenuitem></term>
-                  <listitem><para>
-                     Groups messages instead of sorting them. (FIXME: Explain further) 
-                  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Remove this
-                  Column</guimenuitem></term> <listitem><para> Remove
-                  this column from the display. You can also remove
-                  columns by dragging the header off the list and
-                  letting it drop.  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Field
-                  Chooser</guimenuitem></term> <listitem><para> A list
-                  of column headers; just drag and drop them into
-                  place between two existing headers. A red arrow will
-                  appear to show you where you're about to put the
-                  column.  </para></listitem>
-               </varlistentry>
-            </variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	moved to your folder automatically.
-      </para>
-        </sect2>    
-
-    <sect2 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains:</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains:</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
-      </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box. If you're
-         sneaky, just enter a blank search: since every message has at
-         least one space in it, you'll see every message in the
-         folder.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and virtual folders in the next few sections.
-     </para>
-
-    </sect2>
-
-    <sect2 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
-      <para>
-        I once worked in the mail room of a large company, where my
-        job was to bundle, sort, and distribute mail to the various
-        mail boxes and desks throughout the building.  Filters do that
-        same job with email, but they lose much less mail than I did.
-        In addition, you can have multiple filters performing multiple
-        actions that may effect the same message in several ways.  For
-        example, your filters could put copies of one message into
-        multiple folders, or keep a copy and send one to another
-        person as well, and it can do that in under a second. Which is
-        to say, it's faster and more flexible than an actual person
-        with a pile of envelopes.
-      </para>
-      <para>
-        Most often, you'll want to have
-        <application>Evolution</application> put mail into different
-        folders, but you can have it do almost anything you like.
-        People who get lots of mail, or who often need to refer to old
-        messages, find filters especially helpful, but they're good
-        for anybody who gets more than a few messages a day.  To
-        create a filter, open the <interface>filter
-        assistant</interface> by selecting
-	<menuchoice>
-	  <guimenu>Settings</guimenu> 
-          <guimenuitem>Mail Filters</guimenuitem>
-        </menuchoice>.
-      </para>
-            
-       <figure id="usage-mail-filters-fig-assist">
-	 <title>The Filter Assistant</title>
-	 <screenshot>
-	  <screeninfo>The Filter Assistant</screeninfo>
-	  <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-
-      <para>
-        The <interface>filter assistant</interface> window contains a
-        list of your current filters, sorted by the order in which
-        they are used.  From the drop-down box at the top of the
-        window, choose <guilabel>Incoming</guilabel> to display
-        filters for incoming mail, and <guilabel>Outgoing</guilabel>
-        for those which sort only outgoing mail.
-      </para>
-      <para>
-         The <interface>filter assistant</interface> also has a set of
-         buttons:
-        <itemizedlist>
-
-           <listitem><para>
-            <guibutton>Add</guibutton> &mdash; Create a new filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
-           </para></listitem>
-
-           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the
-            selected filter up in the list so it gets applied first.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list, so it comes into play later.
-           </para></listitem>
-        </itemizedlist>
-
-        If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>, which
-        will open a dialog to let you add a filter rule.  If you do
-        have filters, you can either add a new filter rule, or select
-        one from your list and click <guibutton>Edit</guibutton>.
-      </para>
-      <para>
-        The filter rule editor, shown in <xref
-        linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.
-
-       <figure id="usage-mail-filters-fig-new">
-	 <title>Creating a new Filter</title>
-	 <screenshot>
-	  <screeninfo>Creating a new Filter</screeninfo>
-	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-      <para>
-        Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing the criteria
-        you'd like to use as you sort your mail.  Choose how many
-        criteria you'd like by pressing <guibutton>Add
-        Criterion</guibutton> and <guibutton>Remove
-        Criterion</guibutton>.  If you have multiple criteria, you
-        should then decide whether to have the filter do its job only
-        <guilabel>if all criteria are met</guilabel>, or <guilabel>if
-        any criteria are met</guilabel>.
-     </para>
-     <para>
-        For each filter criterion, you must first select what
-        part of the message you want the filter to examine:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Sender</guilabel></term>
-	    <listitem><para>
-                The sender's address.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Recipients</guilabel></term>
-	    <listitem><para>
-               The recipients of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Subject</guilabel></term>
-	    <listitem><para>
-                The subject line of the message.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Specific Header</guilabel></term>
-	    <listitem><para>
-              The filter can look at any header you
-	      want, even obscure or custom ones. Enter the header name
-	      in the first text box, and put your search text in the
-	      second one.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Message Body</guilabel></term>
-	    <listitem><para>
-                Search in the actual text of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Expression</guilabel></term>
-	    <listitem>
-             <para>
-               Enter a <glossterm linkend="regular-expression">regular
-	       expression</glossterm>, and
-	       <application>Evolution</application> will search the
-	       entire message, including headers, to match it for you.
-	     </para>
-           </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para> Filter messages by when they were sent:
-	    First, choose the conditions you want a message to
-	    meet&mdash; <guilabel>before</guilabel> a given time,
-	    <guilabel>after</guilabel> it, and so forth.  Then, choose
-	    the time. The filter will compare the message's time-stamp
-	    to the system clock when the filter is run, or to a
-	    specific time and date you choose from a calendar.  You
-	    can even have it look for messages within a range of time
-	    relative to the filter&mdash perhaps you're looking for
-	    messages less than two days old.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Date Recieved</guilabel></term>
-	    <listitem><para>
-                This works the same way as the <guilabel>Date Sent</guilabel> 
-                option, except that it compares the time you got the message 
-                with the dates you specify.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Priority</guilabel></term>
-	    <listitem><para>
-               Emails have a standard priority range from -3 (least
-               important) to 3 (most important). You can have filters set the
-               priority of messages you recieve, and then have other filters 
-               applied only to those messages which have a certain priority.
-            </para></listitem>
-           </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Regex Match</guilabel></term>
-	    <listitem>
-              <para>
-                If you know your way around a <glossterm
-  	        linkend="regular-expression">regex</glossterm>, or
-  	        regular expression, put your knowledge to use here.
-  	       </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Source</guilabel></term>
-	    <listitem>
-               <para>
-               Filter messages according the server you got them from.
-               You can enter a URL or choose one from the drop-down
-               list.  This ability is only relevant if you use more
-               than one mail source.
-             </para>
-            </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-        <para>
-        Now, tell it what to do with those messages.  If you want more
-        actions, click <guibutton>Add Action</guibutton>; if you want
-        fewer, click <guibutton>Remove Action</guibutton>.  And choose
-        again:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guilabel>Copy to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Move to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Forward to Address</guilabel></term>
-	    <listitem><para>
-                Select this, enter an address, and the addressee will
-                get a copy of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Delete</guilabel></term>
-	    <listitem><para>
-                Marks the message for deletion.  You can still get the message
-                back, at least until you <guimenuitem>Expunge</guimenuitem> your
-                mail yourself.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para>
-              Select this if you want to tell all other filters to ignore 
-              this message, because whatever you've done with it so far
-              is plenty.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Color</guilabel></term>
-	    <listitem><para>
-                Select this item, and <application>Evolution</application>
-                will mark the message with whatever color you please.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Score</guilabel></term>
-	    <listitem><para> If you know that all mail with
-	    "important" somewhere in the message body line is
-	    important, you can give it a high priority score. In a subsequent filter you can 
-            then arrange your messages by their priority score.
-	  </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-      <para>
-        You're done.  Click <guibutton>OK</guibutton> to use this
-        filter, or <guibutton>Cancel</guibutton> to close the window
-        without saving any changes.
-      </para>
-
-
-
-   <!-- FIXME: This needs to be in there.  But the feature is temporarily
-         disabled and I don't know how it will be reimplemented.
-
-	  <itemizedlist>
-	    <listitem>
-	       <para>
-		 <guilabel>When mail arrives:</guilabel> Select
-		 this option to have messages filtered as they
-		 arrive.
-	       </para>
-	     </listitem>
-	     <listitem>
-	       <para>
-		 <guilabel>When mail is sent:</guilabel> Select
-		 this option to filter your outgoing mail.  You
-		 can use this feature to keep your
-		 <interface>Outbox</interface> as organized as
-		 your <interface>Inbox</interface>.
-	     </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-
-    -->
-
-      <note>
-	<title>Two Notable Filter Features</title>
-	<para>
-	  <itemizedlist>
-	    <listitem><para>
-              Incoming email that your filters don't move goes into the Inbox; 
-              outgoing mail that they don't move ends up in the Sent folder.
-             </para>
-	    </listitem>
-
-	    <listitem><para>If you move a folder, your filters
-	    will follow it.  </para></listitem>
-	  </itemizedlist>
-	</para>
-      </note>
-    </sect2>
-
-
-
-    <sect2 id="usage-mail-organize-vFolders">
-      <title>Getting Really Organized with Virtual Folders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A virtual folder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a virtual folder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and remove them from the
-	virtual folder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any virtual folders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  Virtual folders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-      <example id="usage-mail-organize-vFolders-ex">
-	<title>Using Folders, Searches, and Virtual Folders</title>
-	<para>
-	   To organize my mail box, I set up a virtual folder for
-	   emails from my friend and co-worker Anna.  I have another
-	   one for messages that have "ximian.com" in the address and
-	   "Evolution" in the subject line, so I can keep a record of
-	   what people from work send me about
-	   <application>Evolution</application>.  If Anna sends me a
-	   message about anything other than Evolution, it only shows
-	   up in the "Anna" folder. When Anna sends me mail about the
-	   user interface for <application>Evolution</application>, I
-	   can see that message both in the "Anna" virtual folder and
-	   in the "Internal Evolution Discussion" virtual folder.
-	</para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
-
-      <para>
-	 To create a virtual folder, select <menuchoice>
-	 <guimenu>Settings</guimenu> <guimenuitem>Virtual Folder
-	 Editor</guimenuitem> </menuchoice>.  This will bring up a
-	 dialog box that looks suspiciously like the filter window
-	 (for more information on filters, see <xref
-	 linkend="usage-mail-organize-filters">), and which
-	 presents you with a list of virtual folders you have previously
-	 created. If you have created any virtual folders, they are listed
-	 here, and you can select, edit or remove them if you wish.
-	 If you have not created any, there will be only one available
-	 option: click <guibutton>Add</guibutton> to add a new
-	 Virtual Folder.
-      </para>
-      <para>
-	 You can enter a name for your virtual folder in the
-	 <guilabel>Name</guilabel>.  Then, tell
-	 <application>Evolution</application> what messages to look
-	 for.  This process is exactly like filter creation: decide
-	 between <guilabel>Match all parts</guilabel> and
-	 <guilabel>Match any part</guilabel>, then choose what part of
-	 the message to look in, what sort of matching to perform, and
-	 specify exactly what it is that you want to find, be it a
-	 line of text, a score, a regular expression, or a particular date or
-	 range of dates.
-       </para>
-       <para>
-         The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>Virtual Folder Sources
-         </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the
-         contents of your vFolder.  Click <guibutton>Add</guibutton>
-         to add a folder, or <guibutton>Remove</guibutton> to remove
-         one.  That way, you can have your vFolder search in
-         newsgroups, or just in one of your mailboxes, or just in a
-         select few folders you've already screened with filters.
-       </para>
-       <para>
-        The vFolder creation window is shown in <xref
-	linkend="usage-mail-vfolder-fig-createrule">
-
-       <figure id="usage-mail-vfolder-fig-createrule">
-	 <title>Selecting a vFolder Rule</title>
-	 <screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-    <sect2 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-      </para>
-
-    </sect2>
-  </sect1>
-</chapter>
-
-
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
deleted file mode 100644
index bbcb2b5a39..0000000000
--- a/doc/C/usage-mainwindow.sgml
+++ /dev/null
@@ -1,453 +0,0 @@
-<!--
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>The Main Window: Evolution Basics</title>
-  <para>
-     Start <application>Evolution</application> by selecting
-     <menuchoice><guimenu>Main Panel Menu</guimenu>
-     <guisubmenu>Applications</guisubmenu>
-     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing
-     <command>evolution</command> at the command line.  The first time
-     you run the program, it will create a directory called
-     <filename>evolution</filename> in your home directory, where it
-     will keep all your <application>Evolution</application>-related
-     files.
-   </para>
-   <para>
-     After <application>Evolution</application> starts
-     up, you will see the <interface>main window</interface>, with the
-     <interface>Inbox</interface> open.  It should look a lot like the
-     picture in <xref linkend="usage-mainwindow-fig">. On the left of
-     the <interface>main window</interface> is the <interface>shortcut
-     bar</interface>, with several buttons in it.  Just underneath the
-     title bar is a series of menus in the <interface>menu
-     bar</interface>, and below that, the <interface>tool
-     bar</interface> with buttons for different functions. The largest
-     part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, where messages are listed
-     and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Ximian.
-
-
-<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
-</para>
-
-   <para>
-    <note>
-      <title>The Way Evolution Looks</title>
-      <para>
-	The appearance of both <application>Evolution</application>
-	and <application>GNOME</application> is very easy to
-	customize, so your screen might not look like this picture.
-	You might decide to have <application>Evolution</application>
-	start with the calendar and a folder bar, or with the contact
-	manager occupying the entire window.
-      </para>
-    </note>
-  </para>
-  
-  <sect1 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       The shortcut group buttons are <guibutton>Evolution
-       Shortcuts</guibutton> and <guibutton>Internet
-       Directories</guibutton>.  When you click on them, they'll slide
-       up and down to give you access to different sorts of shortcuts.
-       When you first start <application>Evolution</application>, you
-       are looking at the <guilabel>Evolution Shortcuts</guilabel>
-       category.  If you click <guilabel>Internet
-       Directories</guilabel>, it will slide up and you'll see buttons
-       for the <guilabel>Bigfoot</guilabel> and
-       <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator may have added. You can
-       add more groups by right-clicking on the background of the
-       shortcut bar and selecting <guimenuitem>Menu
-       Group</guimenuitem>.  Internet directories behave a lot like
-       the local contact manager, which is covered in <xref
-       linkend="usage-contact">.
-       </para>
-    <para>
-       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
-       again.  The shortcut buttons in that category are:
-
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-
-
-	<varlistentry>
-	  <term> <guibutton>Executive Summary:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Start your day here.  The Executive summary gives you
-              lists of new or important messages, daily appointments
-              and urgent tasks.  You can customize its appearance and
-              content, and use it to access Evolution services.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-
-	<varlistentry>
-	  <term> <guibutton>Inbox:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks:</guibutton></term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate the main window. Press 
-            <keycombo action="simul">
-                 <keycap>Ctrl</keycap> 
-                 <keycap>O</keycap> 
-             </keycombo>
-      to choose from a list of folders you'd like to visit, or use the
-      drop-down folder bar.  You can hide and show the folder bar and
-      the shortcut bar by selecting those items in the
-      <guimenu>View</guimenu> menu.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>.
-      </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three or four
-      folders at the base.  First is the <guilabel>Local</guilabel>
-      folder, which holds all the <application>Evolution</application>
-      data that's stored on your computer.  After that come
-      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders">, followed by any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you may
-      have available to you over your network.  Lastly, there are
-      <guilabel>External Directories</guilabel>, <glossterm
-      linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network.
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, which is used to store
-	    messages you don't want, but keep around just in case you
-	    change your mind.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
-         to move about the folder tree.
-       </para>
-     </tip>
-
-    <para>
-       To create a new folder, select <menuchoice>
-       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
-       put it, and what kind of folder it should be.  You can choose
-       from three types: <guilabel>Mail</guilabel>, for storing mail,
-       <guilabel>Calendar</guilabel> for storing calendars, and
-       <guilabel>Contacts</guilabel> for storing contacts.
-    </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-      </itemizedlist>.
-    </para>
-
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 will support context-sensitive help, which means you
-	can almost always get help on an item by right-clicking it.
-	If you're not sure what something is, or don't know what you
-	can do with it, choosing <guimenuitem>Help</guimenuitem> from
-	the right-click menu is a good way to find out.
-      </para>
-    </tip>
-
-    <para>
-      Any time new information arrives in a folder, that folder label
-      is displayed in bold text.
-    </para>
-    <para>
-      To delete a folder, right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
-      To change the order of folders, or put one inside another, use
-      drag-and-drop.  To move individual
-      messages, appointments, and address cards between folders, you
-      can do the same thing: drag them where you want them, and
-      they'll go.
-    </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu> Menu</term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu> Menu </term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu> Menu </term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Settings</guimenu> Menu </term>
-          <listitem><para> Tools for configuring, changing, and
-          setting up go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration. </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu> Menu</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-   <para>
-     Other menus, like <guilabel>Folder</guilabel>,
-     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
-     appear only occasionally.  <guilabel>Message</guilabel> and
-     <guilabel>Folder</guilabel>, for example, have commands that only
-     relate to email, so they're only available when you're looking at
-     email.
-   </para>
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with your email inbox, since you've got a letter waiting
-      for you already.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/doc/C/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
deleted file mode 100644
index cc1ac16357..0000000000
--- a/doc/C/usage-print.sgml
+++ /dev/null
@@ -1,105 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  This is a very short chapter, because printing with
-  <application>Evolution</application> is not a complex task.  Like
-  most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
-      or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the things
-      look, click <guibutton>Print</guibutton> to send your document
-      on its way.  If you'd like to change it, just close the
-      <guilabel>Print Preview</guilabel> window and make the changes
-      you want from the Mail, Calendar, or Contact Manager.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; at this time, only <guilabel>Generic
-       Postscript</guilabel> is available&mdash; and whether to print
-       to a file or to an actual printer.  If you choose a printer,
-       you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
deleted file mode 100644
index a6b53e9526..0000000000
--- a/doc/C/usage-sync.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Synchronizing with a Hand-held Device</title>
-      <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device on its cradle and press the
-          HotSync button.
-        </para>
-        <para>
-         No, really.  That's all there is to it.
-        </para>
-       </sect1>
-    </chapter>
\ No newline at end of file
diff --git a/doc/COPYING-DOCS b/doc/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/doc/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/doc/Camel-Classes b/doc/Camel-Classes
deleted file mode 100644
index 93aec087dd..0000000000
--- a/doc/Camel-Classes
+++ /dev/null
@@ -1,35 +0,0 @@
-CamelException
-CamelProvider
-CamelThreadProxy
-CamelURL
-GtkObject
- + CamelObject
-   + CamelAddress
-   |  + CamelInternetAddress
-   |  ` CamelNewsAddress
-   + CamelDataWrapper
-   | + CamelMedium
-   | |  ` CamelMimePart
-   | |     ` CamelMimeMessage
-   | ` CamelMultipart
-   + CamelFolder
-   |  ` CamelFolderPtProxy
-   + CamelFolderSearch
-   + CamelFolderSummary
-   + CamelMimeFilter
-   |  + CamelMimeFilterBasic
-   |  + CamelMimeFilterCharset
-   |  + CamelMimeFilterIndex
-   |  ` CamelMimeFilterSave
-   + CamelService
-   |  + CamelStore
-   |  ` CamelTransport
-   + CamelSession
-   + CamelStream
-   |  + CamelSeekableStream
-   |  |  + CamelSeekableSubstream
-   |  |  + CamelStreamFs
-   |  |  ` CamelStreamMem
-   |  + CamelStreamBuffer
-   |  ` CamelStreamFilter
-   ` CamelThreadProxy
\ No newline at end of file
diff --git a/doc/ChangeLog b/doc/ChangeLog
deleted file mode 100644
index 407bbbdde6..0000000000
--- a/doc/ChangeLog
+++ /dev/null
@@ -1,694 +0,0 @@
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: IMAP subscriptions stuff. 
-
-2001-02-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
-
-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for Nautilus Readiness.
-
-	* C/apx-gloss.sgml: glossterm conduit.
-
-	* C/config-sync.sgml: Glossterm conduit.
-
-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other truthfulness.
-
-2001-02-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
-	several individual files.
-
-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-2001-02-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and clear.
-
-	* C/usage-calendar.sgml: Minor Changes.
-
-2001-02-08  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Minor Changes.
-
-	* C/usage-mail.sgml: Minor Changes.
-
-2001-02-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
-
-	* C/usage-exec-summary.sgml: A little functionality described.
-
-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
-
-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
-
-2001-02-06 Aaron Weber <aaron@ximian.com>
-
-	* C/usage-contact.sgml: s/contact manager/address book/ and
-	revised text.
-
-	* C/usage-exec-summary.sgml: New file. Describes Executive Summary.
-	
-2001-01-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
-	functions in the Sort section.
-
-	* C/apx-gloss.sgml: added "ToolTip"
-
-2001-01-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
-
-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
-	comments.
-
-	* C/evolution-guide.sgml: s/Helix Code/Ximian/
-
-2000-12-13  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
-	filter dialogs... which still need some renaming, IMHO.
-
-	* C/usage-mainwindow.sgml: Revisions as suggested by
-	Dan. Especially to the Folder Limits thing, which still upsets me
-	somehow.
-
-	* C/preface.sgml: Revisions as suggested by Dan. 
-
-2000-11-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-setupassist.sgml: added some <glossterms>, added linkends to existing glossterms.
-
-2000-11-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Changed intro to Config section. Now
-	defines what, exactly, "configurable" means.
-
-	* C/usage-print.sgml: Stylistic revisions.
-
-	* C/usage-calendar.sgml: Stylistic revisions.
-
-	* C/usage-contact.sgml: Stylistic revisions.
-
-2000-11-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Message heading Right-Click Menu.
-
-2000-11-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to Sasha.
-
-2000-11-02  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Style and spelling.
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.	
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml:  Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml:  Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
-	bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-        description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml:  Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.	
-
-	* C/config-prefs.sgml: Revision to reflect current options labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-=======
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
->>>>>>> 1.26
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.	
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
-	but marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release. 
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/doc/Design b/doc/Design
deleted file mode 100644
index 7b7cf6f821..0000000000
--- a/doc/Design
+++ /dev/null
@@ -1,201 +0,0 @@
-
-The Evolution Project specification
-Miguel de Icaza.
-
-
-* Introduction
-
-	Evolution is a project aiming at providing the free software
-	community with a professional, high-quality tool for managing
-	mail, appointments, tasks and other personal information
-	tools.  
-
-	We want to make Evolution a system that addresses our needs
-	(the free software development community) and we believe that
-	by addressing our needs, we will provide a system that will
-	scale in the years to come for other users that are just
-	starting to use computers and the internet.
-
-	The main objectives of Evolution are to provide these powerful
-	features, and to make the user interface as pretty and
-	polished as possible.
-
-	Evolution is a GNOME application and a number of auxiliary
-	CORBA servers that act as the storage backends. 
-
-	Evolution will copy the best user interface bits and the best
-	ideas and features found on contemporary groupware systems.
-
-* Evolution internals.
-
-	Evolution can store its information locally (files for mail,
-	calendar and address book) or on a remote server (imap/pop,
-	cap, ldap).  
-
-	Given the importance of syncing in this modern PDA world,
-	the Evolution GUI acts as a client to the data repository.
-	The data repository is a GUI-less CORBA server called Wombat.
-
-	Wombat provides a unified access system to the calendar and
-	addressbook data (doing mail is a bit hard, so we are leaving
-	this as a TODO item for now).
-
-	Wombat's CORBA interfaces are notifier-based.  This means that
-	CORBA requests sent to Wombat do not return values
-	inmediately, but rather than for Wombat requests the user has
-	to provide a CORBA object that will be notified of what
-	happened.
-
-	Yes, that sounds hairy.  It is actually pretty simple.  It
-	basically means that you submit requests to Wombat, and a
-	callback is invoked in your code when the request has been
-	carried away. 
-
-	This enables a Palm to sync to the repository without having
-	the GUI for Evolution running.  It also means that volunteers
-	will be able to write text-based and web-based versions of
-	Evolution (not me though :-).
-
-* Evolution as a platform
-
-	Evolution is more than a client for managing the above
-	information: Evolution is a platform for building groupware
-	applications that use the above components to get their work done.
-
-	To achieve this Evolution is designed to be scriptable, and it
-	exports its internals trough CORBA/Bonobo.  It is implemented
-	as a collection of Bonobo containers and Bonobo components.
-
-	There is a clean separation between the views (the user
-	interface) and the model (the view).  The views that we are
-	writing are GNOME based, and they talk to the Wombat CORBA
-	server.
-
-	Wombat takes care of notifications to the various clients for
-	the data. 
-
-* The overall organization
-
-	A bar similar to outlook provides shortcuts for accessing the
-	various resources managed by Evolution: mail folders,
-	contacts, tasks, journal entries, notes, messages and other
-	user-defined destinations. 
-
-* User interface widgets
-
-** The ETable package
-
-	This package provides a way of displaying and editing tables.
-
-	Tables are displayed based on a TableColumn definition that
-	defines the layout used for the display.  Table Columns can be
-	nested, and the package does grouping of information displayed
-	according to the criteria defined there.
-
-	This is used in multiple places troughout evolution: it is
-	used for the Mail summary display, for the TODO display and
-	TODO new data entry and for the address book.
-
-	Nesting in the address book can be performed on various
-	fields.  For example, a first level of nesting could be
-	"Company" and a second level would be "Country" the result is
-	a 2-level tree that can be collapsed expanded and contains the
-	information sorted/grouped by those two criteria.
-
-	The user interface for this will be copied from Outlook: the
-	possibility of adding and removing fields with drag and drop
-	as well as grouping using drag and drop.
-
-* The Mail system
-
-** The Mail sources
-
-	The mail system will support 4 sources of mail:
-
-		POP3 (transfer to a local file).
-		IMAP
-		Local mbox format in $MAIL.
-		Local mbox format that have other delivery points.
-
-	On top of that, it will be possible to browse existing mbox
-	archives (and possibly other formats in the future, like
-	Mailbox and Maildir).
-
-** Storing the mail
-
-	Mail that gets incorporated into the system is stored in mbox
-	format, and summary files are provided for quick access to the
-	files.  No modifications to the file on disk is performed (I
-	am not quite sure about this, perhaps we want to add the
-	status flags and some method for adding metadata to the mail).
-
-	Summary files are rebuilt on demand or rebuild if the mbox
-	file and the summary file have got out of sync.
-
-	A Metadata system that will enable us to attach information to
-	a message will have to be designed and implemented (enabling
-	users to add annotations to mails, and special keywords and
-	flags in a per-message fashion).
-
-** Folders
-
-	Michael Zucchi is working on a system that will let users
-	easily define rules for splitting their incoming mail into
-	physical folders.  
-
-	A further refinement to Folders are Virtual Folders.  This
-	basically provides a powerful search and viewing facility for
-	mail.  It works like this: when a mail is "incorporated" into
-	Evolution it is scanned and indexed.
-
-	Then users can enter queries into Evolution that will search
-	the entire database of messages.	
-
-** Virtual folders
-
-	Virtual folders will enable users to read/browse their mail in
-	new ways: by specifying search criterias, these folders will
-	contain messages that match the criteria given.  
-
-	There is more information about this in the libcamel
-	directory. 
-
-	We will index all headers from a message, and possible the
-	contents of messages and keep those on a separate file, to
-	enable users to query their mail database.
-
-** Mail summary display
-
-	The summary will be displayed using the ETable package, to
-	enable users to add a number of sorting criteria and various
-	display methods for the summary view.
-
-	The Outlook methods for displaying will be present on the
-	system.
-
-	Message threading will be supported in Evolution.
-
-** Message display engine
-
-	We are going to be using a combination of
-	libcamel/limime/libjamie to parse messages and render them
-	into an HTML buffer.
-
-* The HTML engine
-
-	The GtkHTML engine will be used to display messages, and will
-	be extended to support a number of features that we require:
-	internal handling of characters will be based on Unicode
-
-* The message composer
-
-	Regular features found in composers will be added: connecting
-	the composer to the address book, support for drag and drop
-	for including attachments, editing the message, archiving
-	drafts and archiving messages sent.
-
-	Ettore has been working on adding editing support to the
-	GtkHTML and he is working currently on a Bonobo component that
-	will provide a ready-to-use Bonobo control for embedding into
-	other applications.
-
diff --git a/doc/Keybindings b/doc/Keybindings
deleted file mode 100644
index f232802110..0000000000
--- a/doc/Keybindings
+++ /dev/null
@@ -1,13 +0,0 @@
-* Keybindings for the mailer
-
-	Delete key: 	Deletes message, moves forward.
-	
-* Keybindings for the composer
-
-	Control-s:		Saves message to file.
-	Control-w:		Closes composer window.
-	Control-Return: 	Sends message now.
-
-	F6:			Opens find dialog.
-	F7:			Opens replace dialog.
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 7b5420fee8..0000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = C devel
diff --git a/doc/NAMESPACE b/doc/NAMESPACE
deleted file mode 100644
index 4ca7c454d1..0000000000
--- a/doc/NAMESPACE
+++ /dev/null
@@ -1,65 +0,0 @@
-
-	Here is how both the Evolution implementation and IDL namespacing
-is to be organized, NB. for implementations and oafinfo filenames we replace
-'/' with '_'
-
-Files:
-
-/GNOME/Evolution/
-
-	Addressbook/
-	Calendar/
-		Control
-		gnomecal
-	Composer/
-	Mail/
-	Notes/		
-	Shell/
-	Summary/
-		test
-		rdf
-	Wombat/
-
-Components:
-
-	Shell components end in _ShellComponent, controls in _Control,
-executive summary components in _ExecutiveSummaryComponent and
-factories append 'Factory'.
-
-GNOME/
-	Evolution/
-
-		Shell
-
-		Addressbook/
-			MiniCard/
-				Control, ControlFactory
-			SelectNames, SelectNamesFactory
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-		Calendar/		
-			iTip/
-				Control, ControlFactory
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory
-		Mail/
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory
-			Composer, ComposerFactory
-		Notes/
-			control, controlFactory
-			shellComponent, shellComponentFactory
-		Summary/
-			rdf/
-				SummaryComponent, SummaryComponentFactory
-			test/
-				Component, ComponentFactory
-
-			ShellComponent, ShellComponentFactory
-
-		Wombat/
-			ServerFactory
-			CalendarFactory
-
diff --git a/doc/devel/.cvsignore b/doc/devel/.cvsignore
deleted file mode 100644
index c24a54fbcc..0000000000
--- a/doc/devel/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-html
-evolution-devel-guide.html
diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
deleted file mode 100644
index d00a1df434..0000000000
--- a/doc/devel/ChangeLog
+++ /dev/null
@@ -1,159 +0,0 @@
-2001-01-26  John R. Sheets  <dusk@ravendusk.org>
-
-	* importer/Makefile.am: Change (nonexistant) importer.sgml
-	references to evolution-importer.sgml to fix dependency problem.
-
-2001-01-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am (local_entities): Added the importer stuff.
-
-	* evolution-devel-guide.sgml: Added entities for the importer documents.
-
-	* reference.sgml: Added the public and private APIs for the importer.
-
-	* importer/*: New directory containing all the documenation for the
-	importer.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-devel-guide.sgml: Ximianified.
-
-	* calendar/evolution-calendar.sgml: Ditto.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-2001-01-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Make it work when gtk-doc is not installed.
-
-	* calendar/cal-client/Makefile.am: Likewise.
-
-	* calendar/cal-util/Makefile.am: Likewise.
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	Added proper dependency lists to the gtk-doc mess.
-
-	* calendar/cal-client/Makefile.am (TARGET_DIR): Removed unused
-	variable.
-	(SOURCE_FILES): New variable with the list of source files we
-	depend on.
-	(IGNORED_SOURCE_HEADERS): New variable with the headers we ignore
-	for the gtkdoc-scan phase.
-	(scan_generated):
-	(tmpl_dependencies):
-	(tmpl_sources):
-	(tmpl_generated);
-	(sgml_dependencies):
-	(sgml_generated): Lists of stuff that is generated and that other
-	stuff depends on.
-	(all): Added the $(sgml_generated) as the final target.
-	(install-data-local): Added an installation hook; gtk-doc seems to
-	want some of its generated files to be installed.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-	* calendar/cal-util/Makefile.am: Made the same changes as for
-	calendar/cal-client/Makefile.am.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* Makefile.am (local_entities): Added alarm-generation.sgml.
-	(all): Made the main target be the html/index.html.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/alarm-generation.sgml: New file with a description of
-	the algorithm used to generate alarm instances.
-
-	* evolution-devel-guide.sgml: Added an entity for the above
-	chapter.
-
-	* calendar/evolution-calendar.sgml: Reference the entity here.
-
-	* calendar/Makefile.am (EXTRA_DIST): Added alarm-generation.sgml.
-
-2000-12-13  Larry Ewing  <lewing@helixcode.com>
-
-	* calendar/Makefile.am (EXTRA_DIST): make it public-reference.sgml
-	not referenc.sgml here.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/architecture.sgml: Finished the calendar architecture
-	chapter.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Added an id for the API reference <part>.
-	Added the FDL <legalnotice>.
-	Added the preface and toplevel reference entities.
-	Added entities for Evolution, Wombat, and Camel.
-	Added an appendix for the GNU FDL.
-	
-	* preface.sgml: New file with the introduction to the Evolution
-	Developer's Guide.
-
-	* reference.sgml: Split the toplevel reference part into its own
-	file.
-
-	* fdl.sgml: Added the GNU Free Documentation License.
-
-	* calendar/evolution-calendar.sgml: Added an id for the <part>.
-
-	* calendar/public-reference.sgml: Added an id for the <reference>.
-	Moved this file over from calendar/reference.sgml.
-
-	* Makefile.am (local_entities): Added a list of the SGML files
-	that define entities for inclusion in the toplevel document.  This
-	way we can track documentation file dependencies down to all
-	levels.
-	(html/index.html): Made the toplevel document depend on
-	$(local_entities).  Also, removed the "html" target and put its
-	contents directly here; this way we avoid having .PHONY targets.
-	(EXTRA_DIST): Removed the evolution_devel_guideDATA; it made no
-	sense.
-	(content_files): Added preface.sgml and reference.sgml.
-
-2000-09-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Made the toplevel <book> id be
-	"index".
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-util/*: Integrated the cal-util library into the
-	documentation framework.
-
-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.
-
-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.
-	Added entity for libical.
-
-	* calendar/reference.sgml: Added the cal-util reference entries.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated
-	for new API.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (maintainer-clean-local): Don't depend
-	on 'clean'; this messes up maintainer-clean.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.
-
-	* evolution-devel-guide.sgml: New <book> toplevel for the
-	Evolution Developer's Guide.
-
-	* calendar/evolution-calendar.sgml: New <part> for the calendar
-	developer's documentation.
-
-	* calendar/architecture.sgml: New <chapter> for the calendar
-	architecture.
-
-	* calendar/reference.sgml: New <reference> for the calendar API
-	reference.
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
deleted file mode 100644
index c5ee7a8e50..0000000000
--- a/doc/devel/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-SUBDIRS = calendar importer executive-summary
-
-# The name of the module.
-DOC_MODULE=evolution-devel-guide
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-# Add your toplevel files here
-
-content_files =				\
-	evolution-devel-guide.sgml	\
-	fdl.sgml			\
-	preface.sgml			\
-	reference.sgml
-
-# Add your module's hand-written and auto-generated files here; these
-# are used for dependency tracking.
-
-local_entities =					\
-	calendar/alarm-generation.sgml			\
-	calendar/architecture.sgml			\
-	calendar/evolution-calendar.sgml		\
-	calendar/public-reference.sgml			\
-							\
-	calendar/cal-client/sgml/cal-client.sgml	\
-							\
-	calendar/cal-util/sgml/cal-component.sgml	\
-	calendar/cal-util/sgml/cal-recur.sgml		\
-	calendar/cal-util/sgml/cal-util.sgml		\
-	calendar/cal-util/sgml/timeutil.sgml		\
-							\
-	importer/sgml/evolution-importer.sgml		\
-	importer/sgml/evolution-importer-client.sgml	\
-							\
-	executive-summary/sgml/executive-summary-component.sgml	\
-	executive-summary/sgml/executive-summary-component-factory.sgml	\
-	executive-summary/sgml/executive-summary-component-factory-client.sgml	\
-	executive-summary/sgml/executive-summary-html-view.sgml
-
-EXTRA_DIST =			\
-	$(content_files)
-
-all: html/index.html
-
-if ENABLE_GTK_DOC
-html/index.html: $(content_files) $(local_entities)
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
-	-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-else
-html/index.html:
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local:
-	cd $(srcdir) && rm -rf html
-
-if ENABLE_GTK_DOC
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-endif
-
-dist-hook:
-	mkdir $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
diff --git a/doc/devel/calendar/.cvsignore b/doc/devel/calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/doc/devel/calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/Makefile.am b/doc/devel/calendar/Makefile.am
deleted file mode 100644
index 207672f303..0000000000
--- a/doc/devel/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = cal-client cal-util
-
-EXTRA_DIST =				\
-	alarm-generation.sgml		\
-	architecture.sgml		\
-	evolution-calendar.sgml		\
-	public-reference.sgml
diff --git a/doc/devel/calendar/alarm-generation.sgml b/doc/devel/calendar/alarm-generation.sgml
deleted file mode 100644
index 77d35258da..0000000000
--- a/doc/devel/calendar/alarm-generation.sgml
+++ /dev/null
@@ -1,139 +0,0 @@
-  <chapter id="calendar-alarm-generation">
-    <title>How the Wombat generates alarm instances</title>
-
-    <para>
-      This chapter describes the algorithm that the &Wombat; uses
-      internally to generate instances of a calendar component's
-      alarms.  You do not need to read this chapter if you are simply
-      using the client-side functions.
-    </para>
-
-    <sect1 id="what-makes-up-an-alarm-trigger">
-      <title>What makes up an alarm trigger</title>
-
-      <para>
-	VTODO and VEVENT calendar components can have any number of
-	alarms defined for them.  Each alarm has a trigger
-	specification, an alarm type (display, audio, email, or
-	procedure), and data corresponding to the alarm type.  The
-	Wombat side of things is interested only in the trigger
-	specification, since this is all that the Wombat needs to
-	produce alarm instances.
-      </para>
-
-      <para>
-	An alarm trigger can be relative or absolute.  Relative
-	triggers occur a certain time before or after the start or end
-	of a calendar component's occurrence.  For example, you could
-	configure a trigger to notify you 15 minutes before an
-	appointment starts, so that you can get to its location on
-	time; or another one to notify you 5 minutes after another
-	person's meeting has ended, so that you can call that person
-	on the phone after the meeting and not disturb him while
-	there.  Absolute triggers occur at a specific point in time;
-	you can configure an alarm to trigger exactly at a particular
-	date and time that has no relation to the component's
-	occurrences at all.
-      </para>
-    </sect1>
-
-    <sect1 id="generating-trigger-instances">
-      <title>Generating trigger instances</title>
-
-      <para>
-	Generating absolute triggers is trivial; you just use the date
-	and time they specify.  However, relative triggers are
-	associated to recurrence instances, so in order to generate
-	trigger instances we must generate the corresponding
-	recurrence instances and compute the trigger times based on
-	those.
-      </para>
-
-      <para>
-	Since relative triggers are specified as occurring a certain
-	amount of time before or after each of a calendar component's
-	recurrence instances, we can compute a trigger time by adding
-	or subtracting that amount of time to the corresponding
-	recurrence instance's time.
-      </para>
-
-      <para>
-	Recurrence instances are generated by specifying a range of
-	time and asking the Wombat to generate the instances that
-	occur within that range.  We shall see that the range of time
-	in which instances occur is not necessarily the same range of
-	time in which those instances' alarm triggers occur.
-      </para>
-
-      <para>
-	Consider an alarm that is set to trigger 10 minutes before the
-	start time of an event's occurrence, that is, the trigger has
-	an offset of -10 minutes.  Say this event recurs every hour at
-	5 minutes past the hour:  it would occur at 1:05, 2:05, 3:05,
-	etc.; the corresponding triggers would occur at 12:55, 1:55,
-	2:55, etc.  If we wish to compute the alarm triggers that
-	occur between 4:00 and 6:00 (which would be at 4:55 and 5:55),
-	then we cannot just generate recurrence instances between 4:00
-	and 6:00 because we will miss the 6:05 occurrence which
-	corresponds to the 5:55 trigger.
-      </para>
-
-      <para>
-	The solution is to expand the range of time on both sides to
-	fit the relative triggers that have the largest time periods.
-	If a trigger's offset is negative, like the -10 minutes in the
-	example above, then we must expand the
-	<emphasis>end</emphasis> of the time range: in the case above,
-	the range's ending time of 6:00 must be grown by 10 minutes to
-	6:10 so that the last recurrence instance will be that of
-	6:05; computing the trigger's offset we will get the 5:55
-	trigger, which is what we wanted.  For triggers with positive
-	offsets, like if an alarm were to trigger 20 minutes after an
-	event's occurrence, we must expand the
-	<emphasis>start</emphasis> of the time range in an analogous
-	way, by subtracting the time offset from it.
-      </para>
-
-      <para>
-	Again, absolute triggers need no special computation.  We can
-	just see if the trigger time is within the requested range of
-	time, and if so, we take that trigger occurrence into account
-	for the final result.
-      </para>
-    </sect1>
-
-    <sect1 id="alarm-trigger-generation-code">
-      <title>Alarm trigger generation code</title>
-
-      <para>
-	The main function to generate alarm trigger instances is
-	<function>generate_alarms_for_comp()</function> in
-	<filename>evolution/calendar/pcs/cal-backend-file.c</filename>.
-	This function calls <function>compute_alarm_range()</function>
-	to expand the specified range of time in the way described in
-	the previous section.  It then generates the instances for
-	relative alarm triggers inside the
-	<function>add_alarm_occurrences_cb()</function> callback,
-	which is used by
-	<function>cal_recur_generate_instances()</function> with the
-	expanded range of time.  The callback goes through all of the
-	calendar component's relative alarm triggers and adds the
-	trigger offsets to the occurrence's time; the results are
-	added as <structname>CalAlarmInstance</structname> structures
-	to the final list of trigger instances.  Finally,
-	<function>generate_alarms_for_comp()</function> calls
-	<function>generate_absolute_triggers()</function>, which
-	simply adds the instances for absolute alarm triggers; these
-	are the absolute times that are within the time range that was
-	requested originally.  In the very end, the list of instances
-	is sorted to produce nicer results.
-      </para>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/calendar/architecture.sgml b/doc/devel/calendar/architecture.sgml
deleted file mode 100644
index d261f0a7f4..0000000000
--- a/doc/devel/calendar/architecture.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-  <chapter id="calendar-architecture">
-    <title>Architecture of the Calendar</title>
-
-    <para>
-      This chapter gives an overview of the &Evolution; Calendar
-      architecture.  It describes the model/view split of the calendar
-      into a personal calendar server, or &PCS;, and the GUI clients
-      that appear inside the &Evolution; Shell.
-    </para>
-
-    <!-- Model/View Separation -->
-
-    <sect1 id="calendar-model-view">
-      <title>Model/View Separation</title>
-
-      <para>
-	Like other base components in &Evolution;, the calendar
-	separates the data model from the views or clients.  This is
-	done so that multiple clients can access the same calendar
-	data in an orderly fashion and without clashes.  For example,
-	the user may be running a graphical calendar client.  If he
-	then wants to synchronize his calendar with a handheld device,
-	then the corresponding synchronization program (e.g. a conduit
-	for the <application>gnome-pilot</application> package) will
-	also need to access the calendar storage.  It is important
-	that both the GUI client and the synchronization program keep
-	a consistent view of the calendar at all times, otherwise one
-	of them will be left in an inconsistent state if the
-	calendar's data changes unexpectedly.
-      </para>
-
-      <para>
-	&Evolution; puts the calendar storage in a daemon called the
-	&Wombat; and completely separates it from clients who wants to
-	access calendar data.  This part of the &Wombat; is called the
-	personal calendar server, or &PCS;.  Clients must contact the
-	&PCS; and ask it to open an existing calendar or create a new
-	one.  When a calendar component object (e.g. an appointment or
-	to-do item) changes in the &PCS; it will notify all the
-	clients that are using the component's parent calendar.
-      </para>
-    </sect1>
-
-    <!-- Personal Calendar Server -->
-
-    <sect1>
-      <title>Personal Calendar Server</title>
-
-      <para>
-	The personal calendar server, or &PCS;, provides centralized
-	management and storage of a user's personal calendar.
-	Multiple clients can connect to the &PCS; simultaneously to
-	query and modify the user's calendar in a synchronized
-	fashion.  The main features of the &PCS; are as follows:
-      </para>
-
-      <formalpara>
-	<title>Storage</title>
-
-	<para>
-	  The &PCS; is responsible for loading and saving calendars.
-	  Centralizing the loading and saving functionality allows
-	  multiple clients to use the same calendar at the same time
-	  without having to worry about each other.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Basic Queries</title>
-
-	<para>
-	  The &PCS; provides functions to do basic queries on a
-	  calendar, for example, a client can ask the server for a
-	  list of all the appointments in the calendar, or for all the
-	  data for a specific appointment.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Recurrence and Alarm Queries</title>
-
-	<para>
-	  Looking for the events that recur or have alarm triggers in
-	  a specific period of time involves scanning all the
-	  appointments in a calendar.  To keep clients from having to
-	  load whole calendars at once, the &PCS; can do these
-	  computations and send the results to clients.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Modification Log</title>
-
-	<para>
-	  To allow multiple handheld devices to be synchronized
-	  against a calendar, the &PCS; keeps a log of all the
-	  modifications that are done to the calendar.  When an
-	  appointment is updated or removed, the &PCS; logs this
-	  action in the modification log.  Synchronization conduit
-	  programs can then use this information to do their work.
-	</para>
-      </formalpara>
-    </sect1>
-
-    <!-- Data Views -->
-
-    <sect1>
-      <title>Data Views</title>
-
-      <para>
-	&Evolution; provides a graphical calendar client inside the
-	shell that is just a view onto the data stored in the personal
-	calendar server.  You can launch as many views of a calendar
-	as you like and they will all receive notification from the
-	&PCS; when changes occur.  The views are then responsible for
-	updating their respective displays.
-      </para>
-
-      <para>
-	Even within a single calendar view in the &Evolution; shell
-	there can be multiple clients of a single calendar.  For
-	example, in the day view of the &Evolution; calendar there are
-	three widgets that act as three different clients of the
-	&PCS;:  the multi-day view, the busy days calendar, and the
-	task list.
-      </para>
-    </sect1>
-
-    <!-- Non-graphical Clients -->
-
-    <sect1>
-      <title>Non-graphical Clients</title>
-
-      <para>
-	Clients of the personal calendar server can be non-graphical,
-	that is, they do not have to provide views of the data to the
-	user.  Examples of such clients are the synchronization
-	conduit programs for handheld devices.  These usually run with
-	no user interface as a result of being invoked by a daemon
-	that watches the connection to a handheld device.  For
-	example, the calendar synchronization conduit in &Evolution;
-	gets run when the <application>gpilotd</application> daemon
-	from the <application>gnome-pilot</application> package
-	detects that the HotSync button has been pressed on a Palm
-	Pilot device.
-      </para>
-
-      <para>
-	Such clients simply take advantage of the centralized storage
-	in the &PCS; without presenting any graphical display of the
-	data; they just act as middlemen between the &PCS; and other
-	applications.
-      </para>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/calendar/cal-client/.cvsignore b/doc/devel/calendar/cal-client/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/doc/devel/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
deleted file mode 100644
index f3a2b39ec6..0000000000
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,131 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-cal-client
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-client
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-client/.libs/libcal-client.a	\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/.libs/libical.a		\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =				\
-	 evolution-cal-client.args		\
-	 evolution-cal-client.hierarchy		\
-	 evolution-cal-client.signals		\
-	 evolution-cal-client.types		\
-	 evolution-cal-client-decl.txt		\
-	 evolution-cal-client-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/calendar/cal-client/cal-client.c		\
-	$(top_srcdir)/calendar/cal-client/cal-client.h		\
-	$(top_srcdir)/calendar/cal-client/cal-client-types.c	\
-	$(top_srcdir)/calendar/cal-client/cal-client-types.h
-
-IGNORED_HEADER_FILES =		\
-	cal-listener.h		\
-	evolution-calendar.h
-
-scan_generated =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals		\
-	evolution-cal-client.types
-
-tmpl_dependencies =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt	\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals
-
-tmpl_sources =					\
-	tmpl/cal-client.sgml			\
-	tmpl/evolution-cal-client-unused.sgml
-
-tmpl_generated =				\
-	evolution-cal-client-unused.txt
-
-sgml_dependencies =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt	\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals		\
-	tmpl/cal-client.sgml
-
-sgml_generated = 				\
-	sgml/cal-client.sgml			\
-	sgml/evolution-cal-client-doc.bottom	\
-	sgml/evolution-cal-client-doc.top	\
-	sgml/object_index.sgml			\
-	sgml/tree_index.sgml
-
-EXTRA_DIST = 					\
-	 evolution-cal-client.args		\
-	 evolution-cal-client.hierarchy		\
-	 evolution-cal-client.signals		\
-	 evolution-cal-client.types		\
-	 evolution-cal-client-decl.txt		\
-	 evolution-cal-client-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)									\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)					\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)					\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILES)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
deleted file mode 100644
index 0bc30e6462..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-<MACRO>
-<NAME>CAL_CLIENT_TYPE</NAME>
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT</NAME>
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT_CLASS</NAME>
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT</NAME>
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT_CLASS</NAME>
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>CalClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientPrivate</NAME>
-</STRUCT>
-<ENUM>
-<NAME>CalClientOpenStatus</NAME>
-typedef enum {
-	CAL_CLIENT_OPEN_SUCCESS,
-	CAL_CLIENT_OPEN_ERROR,
-	CAL_CLIENT_OPEN_NOT_FOUND,
-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED
-} CalClientOpenStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientGetStatus</NAME>
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientLoadState</NAME>
-typedef enum {
-	CAL_CLIENT_LOAD_NOT_LOADED,
-	CAL_CLIENT_LOAD_LOADING,
-	CAL_CLIENT_LOAD_LOADED
-} CalClientLoadState;
-</ENUM>
-<STRUCT>
-<NAME>CalClient</NAME>
-struct CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_construct</NAME>
-<RETURNS>CalClient  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_new</NAME>
-<RETURNS>CalClient  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_open_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri, gboolean only_if_exists
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_load_state</NAME>
-<RETURNS>CalClientLoadState  </RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uri</NAME>
-<RETURNS>const char  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_n_objects</NAME>
-<RETURNS>int  </RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_object</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,const char *uid,CalComponent **comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_changes</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type, const char *change_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_objects_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_generate_instances</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_in_range</NAME>
-<RETURNS>GSList  *</RETURNS>
-CalClient *client, time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_free_alarms</NAME>
-<RETURNS>void  </RETURNS>
-GSList *comp_alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_for_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms **alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_remove_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid
-</FUNCTION>
-<ENUM>
-<NAME>CalClientChangeType</NAME>
-typedef enum {
-	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
-	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
-	CAL_CLIENT_CHANGE_DELETED = 1 << 2
-} CalClientChangeType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_client_change_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
deleted file mode 100644
index 0ce8d9427d..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-<INCLUDE>cal-client/cal-client.h</INCLUDE>
-
-<SECTION>
-<FILE>cal-client</FILE>
-CAL_CLIENT
-<TITLE>CalClient</TITLE>
-
-CalClientOpenStatus
-CalClientGetStatus
-CalClientLoadState
-
-CalClientChangeType
-
-cal_client_new
-cal_client_open_calendar
-cal_client_get_load_state
-cal_client_get_uri
-cal_client_get_n_objects
-cal_client_get_uids
-cal_client_get_object
-cal_client_get_changes
-cal_client_change_list_free
-cal_client_get_objects_in_range
-cal_client_generate_instances
-cal_client_get_alarms_in_range
-cal_client_free_alarms
-cal_client_get_alarms_for_object
-cal_client_update_object
-cal_client_remove_object
-
-<SUBSECTION Standard>
-
-CAL_CLIENT_TYPE
-IS_CAL_CLIENT
-CAL_CLIENT_CLASS
-IS_CAL_CLIENT_CLASS
-cal_client_get_type
-cal_client_construct
-
-<SUBSECTION Private>
-CalClient
-CalClientPrivate
-
-</SECTION>
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.args b/doc/devel/calendar/cal-client/evolution-cal-client.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.args
+++ /dev/null
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy b/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy
deleted file mode 100644
index 88efa3e673..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalClient
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.signals b/doc/devel/calendar/cal-client/evolution-cal-client.signals
deleted file mode 100644
index 65d142777a..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.signals
+++ /dev/null
@@ -1,21 +0,0 @@
-<SIGNAL>
-<NAME>CalClient::cal-opened</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gint  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-updated</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gchar *arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-removed</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gchar *arg1
-</SIGNAL>
-
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.types b/doc/devel/calendar/cal-client/evolution-cal-client.types
deleted file mode 100644
index 84d65a6637..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-cal_client_get_type
diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
deleted file mode 100644
index 06195ca454..0000000000
--- a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ /dev/null
@@ -1,303 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GTK+ object for communication with personal calendar server.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalClient object provides a nice GTK+ wrapper for the CORBA
-    interfaces that are used to communicate between calendar clients
-    and the personal calendar server in the user's Wombat daemon.  The
-    CORBA interfaces transfer calendar components in RFC 2445 text
-    format; the #CalClient object automatically converts these into
-    #CalComponent structures that are easier to handle.
-  </para>
-
-  <para>
-    After a #CalClient object is created with cal_client_new(), it
-    should be asked to send a request to the personal calendar server
-    to load or create a calendar based on its URI.  The server will
-    asynchronously notify the client about completion of the request,
-    and will return an appropriate result code; this should be noted
-    by the client with the <link
-    linkend="CalClient--cal-loaded">cal_loaded</link> signal.
-  </para>
-
-  <para>
-    When a client asks the server to update or delete a calendar
-    component from the storage, the server will do so and then notify
-    all the clients about the update or removal.  This is the core of
-    the model/view split between calendar clients and the storage in
-    the personal calendar server.  Clients should watch the <link
-    linkend="calclient-obj-updated">obj_updated</link> and <link
-    linkend="calclient-obj-removed">obj_removed</link> signals on the
-    CalClient objects they create so that they can be notified about
-    changes in the storage.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #CalComponent
-  </para>
-
-<!-- ##### MACRO CAL_CLIENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalClient.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalClientOpenStatus ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_OPEN_SUCCESS: 
-@CAL_CLIENT_OPEN_ERROR: 
-@CAL_CLIENT_OPEN_NOT_FOUND: 
-@CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED: 
-
-<!-- ##### ENUM CalClientGetStatus ##### -->
-  <para>
-    These values describe the result of the cal_client_get_object()
-    function.
-  </para>
-
-@CAL_CLIENT_GET_SUCCESS: 
-@CAL_CLIENT_GET_NOT_FOUND: 
-@CAL_CLIENT_GET_SYNTAX_ERROR: 
-
-<!-- ##### ENUM CalClientLoadState ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_LOAD_NOT_LOADED: 
-@CAL_CLIENT_LOAD_LOADING: 
-@CAL_CLIENT_LOAD_LOADED: 
-
-<!-- ##### ENUM CalClientChangeType ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_CHANGE_ADDED: 
-@CAL_CLIENT_CHANGE_MODIFIED: 
-@CAL_CLIENT_CHANGE_DELETED: 
-
-<!-- ##### FUNCTION cal_client_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_open_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@only_if_exists: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_load_state ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_uri ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_n_objects ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_uids ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_get_changes ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@change_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_change_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### FUNCTION cal_client_get_objects_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_generate_instances ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_free_alarms ##### -->
-<para>
-
-</para>
-
-@comp_alarms: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_for_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@start: 
-@end: 
-@alarms: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_remove_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### SIGNAL CalClient::cal-opened ##### -->
-<para>
-
-</para>
-
-@calclient: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
diff --git a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
deleted file mode 100644
index 56bcf3aff5..0000000000
--- a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
-
-<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
-
-<!-- ##### FUNCTION cal_client_is_loaded ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_client_create_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@pilot_id: 
-@uid: 
-@Returns: 
-
diff --git a/doc/devel/calendar/cal-util/.cvsignore b/doc/devel/calendar/cal-util/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/doc/devel/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
deleted file mode 100644
index 7f567652ef..0000000000
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-cal-util
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-util
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/.libs/libical.a		\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =				\
-	 evolution-cal-util.args		\
-	 evolution-cal-util.hierarchy		\
-	 evolution-cal-util.signals		\
-	 evolution-cal-util.types		\
-	 evolution-cal-util-decl.txt		\
-	 evolution-cal-util-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/calendar/cal-util/cal-component.c		\
-	$(top_srcdir)/calendar/cal-util/cal-component.h		\
-	$(top_srcdir)/calendar/cal-util/cal-recur.c		\
-	$(top_srcdir)/calendar/cal-util/cal-recur.h		\
-	$(top_srcdir)/calendar/cal-util/cal-util.c		\
-	$(top_srcdir)/calendar/cal-util/cal-util.h		\
-	$(top_srcdir)/calendar/cal-util/timeutil.c		\
-	$(top_srcdir)/calendar/cal-util/timeutil.h
-
-IGNORED_HEADER_FILES =	\
-	calobj.h
-
-scan_generated =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals		\
-	evolution-cal-util.types
-
-tmpl_dependencies =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals
-
-tmpl_sources =					\
-	tmpl/cal-component.sgml			\
-	tmpl/cal-recur.sgml			\
-	tmpl/cal-util.sgml			\
-	tmpl/evolution-cal-util-unused.sgml	\
-	tmpl/timeutil.sgml
-
-tmpl_generated =				\
-	evolution-cal-util-unused.txt
-
-sgml_dependencies =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals		\
-	tmpl/cal-component.sgml			\
-	tmpl/cal-recur.sgml			\
-	tmpl/cal-util.sgml			\
-	tmpl/timeutil.sgml
-
-sgml_generated = 				\
-	sgml/cal-component.sgml			\
-	sgml/cal-recur.sgml			\
-	sgml/cal-util.sgml			\
-	sgml/evolution-cal-util-doc.bottom	\
-	sgml/evolution-cal-util-doc.top		\
-	sgml/object_index.sgml			\
-	sgml/timeutil.sgml			\
-	sgml/tree_index.sgml
-
-EXTRA_DIST = 					\
-	 evolution-cal-util.args		\
-	 evolution-cal-util.hierarchy		\
-	 evolution-cal-util.signals		\
-	 evolution-cal-util.types		\
-	 evolution-cal-util-decl.txt		\
-	 evolution-cal-util-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)									\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)					\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)					\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILES)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
deleted file mode 100644
index b524235de2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ /dev/null
@@ -1,780 +0,0 @@
-<MACRO>
-<NAME>CAL_COMPONENT_TYPE</NAME>
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT</NAME>
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT_CLASS</NAME>
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT</NAME>
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT_CLASS</NAME>
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-</MACRO>
-<ENUM>
-<NAME>CalComponentVType</NAME>
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentField</NAME>
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-</ENUM>
-<ENUM>
-<NAME>CalComponentClassification</NAME>
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentDateTime</NAME>
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentPeriodType</NAME>
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentPeriod</NAME>
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentText</NAME>
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentTransparency</NAME>
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-</ENUM>
-<STRUCT>
-<NAME>CalComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-struct CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_gen_uid</NAME>
-<RETURNS>char  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_new</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_clone</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_new_vtype</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentVType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_icalcomponent</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp, icalcomponent *icalcomp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_icalcomponent</NAME>
-<RETURNS>icalcomponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_vtype</NAME>
-<RETURNS>CalComponentVType  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_as_string</NAME>
-<RETURNS>char  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_commit_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **categories
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *categories
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification *classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_property_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exceptions</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype **geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_property_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_recurrences</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, icalproperty_status *status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, icalproperty_status status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency *transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_event_dates_match</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp1, CalComponent *comp2
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_datetime</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_geo</NAME>
-<RETURNS>void  </RETURNS>
-struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_icaltimetype</NAME>
-<RETURNS>void  </RETURNS>
-struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_percent</NAME>
-<RETURNS>void  </RETURNS>
-int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_priority</NAME>
-<RETURNS>void  </RETURNS>
-int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_period_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_recur_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_sequence</NAME>
-<RETURNS>void  </RETURNS>
-int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_text_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *text_list
-</FUNCTION>
-<STRUCT>
-<NAME>CalComponentAlarm</NAME>
-</STRUCT>
-<TYPEDEF>
-<NAME>CalAlarmInstance</NAME>
-typedef struct {
-	/* UID of the alarm that triggered */
-	const char *auid;
-
-	/* Trigger time, i.e. "5 minutes before the appointment" */
-	time_t trigger;
-
-	/* Actual event occurrence to which this trigger corresponds */
-	time_t occur;
-} CalAlarmInstance;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentAlarms</NAME>
-typedef struct {
-	/* The actual component */
-	CalComponent *comp;
-
-	/* List of CalAlarmInstance structures */
-	GSList *alarms;
-} CalComponentAlarms;
-</TYPEDEF>
-<ENUM>
-<NAME>CalAlarmAction</NAME>
-typedef enum {
-	CAL_ALARM_NONE,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_EMAIL,
-	CAL_ALARM_PROCEDURE,
-	CAL_ALARM_UNKNOWN
-} CalAlarmAction;
-</ENUM>
-<ENUM>
-<NAME>CalAlarmTriggerType</NAME>
-typedef enum {
-	CAL_ALARM_TRIGGER_NONE,
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	CAL_ALARM_TRIGGER_ABSOLUTE
-} CalAlarmTriggerType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalAlarmTrigger</NAME>
-typedef struct {
-	CalAlarmTriggerType type;
-
-	union {
-		struct icaldurationtype rel_duration;
-		struct icaltimetype abs_time;
-	} u;
-} CalAlarmTrigger;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_component_has_alarms</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_add_alarm</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_remove_alarm</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *auid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_alarm_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp, const char *auid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarms_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarms *alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_new</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_uid</NAME>
-<RETURNS>const char  *</RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmAction *action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmAction action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmTrigger *trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmTrigger trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>CalRecurInstanceFn</NAME>
-<RETURNS>gboolean </RETURNS>
-CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instance_end,
-					 gpointer      data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_generate_instances</NAME>
-<RETURNS>void 	</RETURNS>
-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalObjInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_obj_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<ENUM>
-<NAME>CalObjType</NAME>
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_obj_uid_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<FUNCTION>
-<NAME>isodate_from_time_t</NAME>
-<RETURNS>char    *</RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_day</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int days
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_week</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int weeks
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_month</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int months
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int years
-</FUNCTION>
-<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int  </RETURNS>
-int year, int month
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t  </RETURNS>
-int year, int month, int day
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void  </RETURNS>
-time_t t
-</FUNCTION>
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt b/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt
deleted file mode 100644
index 1a03226591..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-<SECTION>
-<FILE>cal-component</FILE>
-CAL_COMPONENT
-<TITLE>CalComponent</TITLE>
-
-CalComponentVType
-CalComponentField
-CalComponentClassification
-CalComponentDateTime
-CalComponentPeriodType
-CalComponentPeriod
-CalComponentText
-CalComponentTransparency
-
-cal_component_gen_uid
-cal_component_new
-cal_component_clone
-cal_component_set_new_vtype
-cal_component_set_icalcomponent
-cal_component_get_icalcomponent
-cal_component_get_vtype
-cal_component_get_as_string
-cal_component_commit_sequence
-cal_component_get_uid
-cal_component_set_uid
-cal_component_get_categories
-cal_component_set_categories
-cal_component_get_categories_list
-cal_component_set_categories_list
-cal_component_get_classification
-cal_component_set_classification
-cal_component_get_comment_list
-cal_component_set_comment_list
-cal_component_get_completed
-cal_component_set_completed
-cal_component_get_created
-cal_component_set_created
-cal_component_get_description_list
-cal_component_set_description_list
-cal_component_get_dtend
-cal_component_set_dtend
-cal_component_get_dtstamp
-cal_component_set_dtstamp
-cal_component_get_dtstart
-cal_component_set_dtstart
-cal_component_get_due
-cal_component_set_due
-cal_component_get_exdate_list
-cal_component_set_exdate_list
-cal_component_has_exdates
-cal_component_get_exrule_list
-cal_component_get_exrule_property_list
-cal_component_set_exrule_list
-cal_component_has_exrules
-cal_component_has_exceptions
-cal_component_get_geo
-cal_component_set_geo
-cal_component_get_last_modified
-cal_component_set_last_modified
-cal_component_get_percent
-cal_component_set_percent
-cal_component_get_priority
-cal_component_set_priority
-cal_component_get_rdate_list
-cal_component_set_rdate_list
-cal_component_has_rdates
-cal_component_get_rrule_list
-cal_component_get_rrule_property_list
-cal_component_set_rrule_list
-cal_component_has_rrules
-cal_component_has_recurrences
-cal_component_get_sequence
-cal_component_set_sequence
-cal_component_get_status
-cal_component_set_status
-cal_component_get_summary
-cal_component_set_summary
-cal_component_get_transparency
-cal_component_set_transparency
-cal_component_get_url
-cal_component_set_url
-
-<SUBSECTION Functions to free returned values>
-cal_component_free_categories_list
-cal_component_free_datetime
-cal_component_free_exdate_list
-cal_component_free_geo
-cal_component_free_icaltimetype
-cal_component_free_percent
-cal_component_free_priority
-cal_component_free_period_list
-cal_component_free_recur_list
-cal_component_free_sequence
-cal_component_free_text_list
-
-<SUBSECTION Alarms>
-CalComponentAlarm
-CalAlarmInstance
-CalComponentAlarms
-CalAlarmAction
-CalAlarmTriggerType
-CalAlarmTrigger
-
-cal_component_has_alarms
-cal_component_get_alarm_uids
-cal_component_get_alarm
-cal_component_alarm_free
-cal_component_alarms_free
-cal_component_alarm_get_uid
-cal_component_alarm_get_action
-cal_component_alarm_set_action
-cal_component_alarm_get_trigger
-cal_component_alarm_set_trigger
-
-<SUBSECTION Standard>
-CAL_COMPONENT_TYPE
-CAL_COMPONENT_CLASS
-IS_CAL_COMPONENT
-IS_CAL_COMPONENT_CLASS
-cal_component_get_type
-
-<SUBSECTION Private>
-CalComponent
-CalComponentPrivate
-
-</SECTION>
-
-<SECTION>
-<FILE>cal-recur</FILE>
-CalRecurInstanceFn
-cal_recur_generate_instances
-</SECTION>
-
-<SECTION>
-<FILE>cal-util</FILE>
-CalObjInstance
-cal_obj_instance_list_free
-CalObjType
-cal_obj_uid_list_free
-</SECTION>
-
-<SECTION>
-<FILE>timeutil</FILE>
-isodate_from_time_t
-time_add_minutes
-time_add_day
-time_add_week
-time_add_month
-time_add_year
-time_days_in_month
-time_from_day
-time_year_begin
-time_year_end
-time_month_begin
-time_month_end
-time_week_begin
-time_week_end
-time_day_begin
-time_day_end
-print_time_t
-</SECTION>
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.args b/doc/devel/calendar/cal-util/evolution-cal-util.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.args
+++ /dev/null
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy b/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy
deleted file mode 100644
index cc235653f2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalComponent
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.signals b/doc/devel/calendar/cal-util/evolution-cal-util.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.signals
+++ /dev/null
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.types b/doc/devel/calendar/cal-util/evolution-cal-util.types
deleted file mode 100644
index 52b2d9bf90..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-util/cal-component.h>
-
-cal_component_get_type
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
deleted file mode 100644
index 0cf6089d60..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ /dev/null
@@ -1,991 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-RFC 2445 iCalendar component object.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalComponent object provides a wrapper over the &libical;
-    functions for manipulating calendar components.  #CalComponent
-    presents a GTK+-like interface to calendar components according to
-    RFC 2445.
-  </para>
-
-  <para>
-    While &libical; supports almost all of the features of the
-    iCalendar RFCs, applications are normally not interested in all
-    the mindless gunk that is there.  Still, applications should do
-    their best not to drop extension fields from calendar components
-    or any other extra information they do not support (including
-    standard fields they are not interested in).  The #CalComponent
-    object provides a wrapper over
-    <structname>icalcomponent</structname> structures from &libical;
-    so that no information in them will be lost even if the
-    application is not designed to handle it.  Also, #CalComponent
-    provides a higher-level API to many of the &libical; operations so
-    as to make it less painful to deal with iCalendar components.
-  </para>
-
-  <para>
-    A #CalComponent object starts out empty.  It must be initialized
-    from an existing <structname>icalcomponent</structname> structure
-    by using the cal_component_set_icalcomponent() function, or from a
-    completely new data by specifying the desired component type to
-    the cal_component_set_new_vtype() function.
-  </para>
-
-  <para>
-    #CalComponent will create an internal map of the properties in the
-    <structname>icalcomponent</structname> structure and then allow
-    random access to them via the #CalComponent API functions;
-    normally the &libical; API would have to be used by creating many
-    iterators and other unpleasant constructs.  #CalComponent keeps
-    handles to the properties it scanned from the
-    <structname>icalcomponent</structname> and will let the parent
-    application modify them at any time without having to do any
-    iteration.
-  </para>
-
-  <para>
-    Eventually a #CalComponent may be turned into the RFC 2445 string
-    representation of an iCalendar component by using the
-    cal_component_get_as_string() function.  Applications can then
-    transfer this interoperable
-    <footnote>
-      <para>
-	&ldquo;Interoperable.&rdquo;  Heavens, I love that word.
-      </para>
-    </footnote>
-    string to other programs that deal with iCalendar.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-
-  </para>
-
-<!-- ##### MACRO CAL_COMPONENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalComponent.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalComponentVType ##### -->
-  <para>
-    Calendar component types as defined by RFC 2445.  These values can
-    be used to create a new calendar component by passing them to the
-    cal_component_set_new_vtype() function.  They are also the return
-    value of the cal_component_get_vtype() function.  The only time
-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the
-    vtype of an uninitialized #CalComponent.
-  </para>
-
-@CAL_COMPONENT_NO_TYPE: 
-@CAL_COMPONENT_EVENT: 
-@CAL_COMPONENT_TODO: 
-@CAL_COMPONENT_JOURNAL: 
-@CAL_COMPONENT_FREEBUSY: 
-@CAL_COMPONENT_TIMEZONE: 
-
-<!-- ##### ENUM CalComponentField ##### -->
-  <para>
-    These values are used as identifiers for #ETable columns.  These
-    are used by the calendar GUI code in &Evolution;.
-  </para>
-
-@CAL_COMPONENT_FIELD_CATEGORIES: 
-@CAL_COMPONENT_FIELD_CLASSIFICATION: 
-@CAL_COMPONENT_FIELD_COMPLETED: 
-@CAL_COMPONENT_FIELD_DTEND: 
-@CAL_COMPONENT_FIELD_DTSTART: 
-@CAL_COMPONENT_FIELD_DUE: 
-@CAL_COMPONENT_FIELD_GEO: 
-@CAL_COMPONENT_FIELD_PERCENT: 
-@CAL_COMPONENT_FIELD_PRIORITY: 
-@CAL_COMPONENT_FIELD_SUMMARY: 
-@CAL_COMPONENT_FIELD_TRANSPARENCY: 
-@CAL_COMPONENT_FIELD_URL: 
-@CAL_COMPONENT_FIELD_HAS_ALARMS: 
-@CAL_COMPONENT_FIELD_ICON: 
-@CAL_COMPONENT_FIELD_COMPLETE: 
-@CAL_COMPONENT_FIELD_RECURRING: 
-@CAL_COMPONENT_FIELD_OVERDUE: 
-@CAL_COMPONENT_FIELD_COLOR: 
-@CAL_COMPONENT_FIELD_NUM_FIELDS: 
-
-<!-- ##### ENUM CalComponentClassification ##### -->
-  <para>
-    Values for the access classification property of a calendar
-    component.
-  </para>
-
-@CAL_COMPONENT_CLASS_NONE: 
-@CAL_COMPONENT_CLASS_PUBLIC: 
-@CAL_COMPONENT_CLASS_PRIVATE: 
-@CAL_COMPONENT_CLASS_CONFIDENTIAL: 
-@CAL_COMPONENT_CLASS_UNKNOWN: 
-
-<!-- ##### TYPEDEF CalComponentDateTime ##### -->
-  <para>
-    This structure defines a date and time value.
-  </para>
-
-
-<!-- ##### ENUM CalComponentPeriodType ##### -->
-  <para>
-    Defines how a period of time is specified.
-  </para>
-
-@CAL_COMPONENT_PERIOD_DATETIME: 
-@CAL_COMPONENT_PERIOD_DURATION: 
-
-<!-- ##### TYPEDEF CalComponentPeriod ##### -->
-  <para>
-    This structure defines a period of time.
-  </para>
-
-
-<!-- ##### TYPEDEF CalComponentText ##### -->
-  <para>
-    This structure defines the value of a text property that may have
-    an alternate representation parameter.
-  </para>
-
-
-<!-- ##### ENUM CalComponentTransparency ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_TRANSP_NONE: 
-@CAL_COMPONENT_TRANSP_TRANSPARENT: 
-@CAL_COMPONENT_TRANSP_OPAQUE: 
-@CAL_COMPONENT_TRANSP_UNKNOWN: 
-
-<!-- ##### FUNCTION cal_component_gen_uid ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_clone ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_set_new_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@type: 
-
-
-<!-- ##### FUNCTION cal_component_set_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@icalcomp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_as_string ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_commit_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-
-
-<!-- ##### FUNCTION cal_component_get_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_set_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categories: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categories: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_set_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_get_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_exdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_property_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_exrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_has_exceptions ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_set_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_get_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_set_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_get_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_set_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_get_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_property_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_has_recurrences ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_set_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_get_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@status: 
-
-
-<!-- ##### FUNCTION cal_component_set_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@status: 
-
-
-<!-- ##### FUNCTION cal_component_get_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_set_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_get_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_set_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_get_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_set_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_free_categories_list ##### -->
-<para>
-
-</para>
-
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_datetime ##### -->
-<para>
-
-</para>
-
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_free_exdate_list ##### -->
-<para>
-
-</para>
-
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_geo ##### -->
-<para>
-
-</para>
-
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_free_icaltimetype ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_free_percent ##### -->
-<para>
-
-</para>
-
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_free_priority ##### -->
-<para>
-
-</para>
-
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_free_period_list ##### -->
-<para>
-
-</para>
-
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_recur_list ##### -->
-<para>
-
-</para>
-
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_sequence ##### -->
-<para>
-
-</para>
-
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_free_text_list ##### -->
-<para>
-
-</para>
-
-@text_list: 
-
-
-<!-- ##### STRUCT CalComponentAlarm ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF CalAlarmInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF CalComponentAlarms ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM CalAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_ALARM_NONE: 
-@CAL_ALARM_AUDIO: 
-@CAL_ALARM_DISPLAY: 
-@CAL_ALARM_EMAIL: 
-@CAL_ALARM_PROCEDURE: 
-@CAL_ALARM_UNKNOWN: 
-
-<!-- ##### ENUM CalAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_ALARM_TRIGGER_NONE: 
-@CAL_ALARM_TRIGGER_RELATIVE_START: 
-@CAL_ALARM_TRIGGER_RELATIVE_END: 
-@CAL_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### TYPEDEF CalAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_has_alarms ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_alarm_uids ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@auid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free ##### -->
-<para>
-
-</para>
-
-@alarm: 
-
-
-<!-- ##### FUNCTION cal_component_alarms_free ##### -->
-<para>
-
-</para>
-
-@alarms: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_uid ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
deleted file mode 100644
index 092b547809..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-cal-recur
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION CalRecurInstanceFn ##### -->
-<para>
-
-</para>
-
-@comp: 
-@instance_start: 
-@instance_end: 
-@data: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@instace_end: 
-
-
-<!-- ##### FUNCTION cal_recur_generate_instances ##### -->
-<para>
-
-</para>
-
-@comp: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
deleted file mode 100644
index ccd35fac2e..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Miscellaneous utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### TYPEDEF CalObjInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### ENUM CalObjType ##### -->
-<para>
-
-</para>
-
-@CALOBJ_TYPE_EVENT: 
-@CALOBJ_TYPE_TODO: 
-@CALOBJ_TYPE_JOURNAL: 
-@CALOBJ_TYPE_ANY: 
-
-<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
deleted file mode 100644
index ff68fae99d..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
-<para>
-
-</para>
-
-@r: 
-
-<!-- ##### ENUM CalRecurType ##### -->
-<para>
-
-</para>
-
-@CAL_RECUR_YEARLY: 
-@CAL_RECUR_MONTHLY: 
-@CAL_RECUR_WEEKLY: 
-@CAL_RECUR_DAILY: 
-@CAL_RECUR_HOURLY: 
-@CAL_RECUR_MINUTELY: 
-@CAL_RECUR_SECONDLY: 
-
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-<!-- ##### FUNCTION get_time_t_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
-<para>
-
-</para>
-
-@trigger: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
-<!-- ##### FUNCTION time_day_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@hour: 
-@Returns: 
-
-<!-- ##### FUNCTION time_from_isodate ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-<!-- ##### STRUCT CalObjTime ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@hour: 
-@minute: 
-@second: 
-
-<!-- ##### STRUCT CalComponentPrivate ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
-<para>
-
-</para>
-
-@ir: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-<!-- ##### TYPEDEF CalRecurrence ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
-<para>
-
-</para>
-
-@itt: 
-@Returns: 
-
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_NONE: 
-@CAL_COMPONENT_ALARM_AUDIO: 
-@CAL_COMPONENT_ALARM_DISPLAY: 
-@CAL_COMPONENT_ALARM_EMAIL: 
-@CAL_COMPONENT_ALARM_PROCEDURE: 
-@CAL_COMPONENT_ALARM_UNKNOWN: 
-
-<!-- ##### FUNCTION time_from_start_duration ##### -->
-<para>
-
-</para>
-
-@start: 
-@duration: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
-<para>
-
-</para>
-
-@secs: 
-@Returns: 
-
-<!-- ##### FUNCTION format_simple_hour ##### -->
-<para>
-
-</para>
-
-@hour: 
-@use_am_pm: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-<!-- ##### FUNCTION parse_date ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
deleted file mode 100644
index 2b197ad685..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-timeutil
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION isodate_from_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time: 
-@minutes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_day ##### -->
-<para>
-
-</para>
-
-@time: 
-@days: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_week ##### -->
-<para>
-
-</para>
-
-@time: 
-@weeks: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_month ##### -->
-<para>
-
-</para>
-
-@time: 
-@months: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time: 
-@years: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_days_in_month ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
diff --git a/doc/devel/calendar/evolution-calendar.sgml b/doc/devel/calendar/evolution-calendar.sgml
deleted file mode 100644
index ea0d8c7127..0000000000
--- a/doc/devel/calendar/evolution-calendar.sgml
+++ /dev/null
@@ -1,52 +0,0 @@
-  <part id="evolution-calendar">
-    <docinfo>
-      <authorgroup>
-	<author>
-	  <firstname>Federico</firstname>
-	  <surname>Mena Quintero</surname>
-	  <affiliation>
-	    <address>
-	      <email>federico@ximian.com</email>
-	    </address>
-	  </affiliation>
-	</author>
-      </authorgroup>
-    </docinfo>
-
-    <title>Developing Applications with the &Evolution; Calendar</title>
-
-    <partintro>
-      <para>
-	This part of the &Evolution; Developer's Guide describes how
-	to write applications for the &Evolution; Calendar by using
-	its public interfaces.  The &Evolution; Calendar exports its
-	functionality through a number of interfaces, including CORBA,
-	GTK+ wrappers for Bonobo objects, and other utility libraries.
-	This part also describes the internals of the calendar so that
-	it will be easy for you to make changes to &Evolution;'s core
-	code.
-      </para>
-
-      <para>
-	You should read this part of the &Evolution; Developer's guide
-	if you intend to write client applications that use the
-	functionality of the &Evolution; Calendar, such as its storage
-	interfaces and generic recurrence engine.  If you intend to
-	make changes to the calendar's core code, it will be useful to
-	read the sections on the calendar internals as well.  Even if
-	you do not intend to modify the core code of the calendar, it
-	may be useful to know a few things about the way it works so
-	that you can make better use of the public interfaces.
-      </para>
-    </partintro>
-
-    &calendar-architecture;
-    &calendar-alarm-generation;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/doc/devel/calendar/public-reference.sgml b/doc/devel/calendar/public-reference.sgml
deleted file mode 100644
index b880bd2972..0000000000
--- a/doc/devel/calendar/public-reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference id="calendar-public-reference">
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the &Evolution;
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml
deleted file mode 100644
index 4a88261da4..0000000000
--- a/doc/devel/evolution-devel-guide.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE book PUBLIC "-//Davenport//DTD DocBook V3.0//EN"[
-<!ENTITY preface SYSTEM "preface.sgml">
-<!ENTITY evolution-reference SYSTEM "reference.sgml">
-<!ENTITY FDL SYSTEM "fdl.sgml">
-
-<!ENTITY evolution-calendar SYSTEM "calendar/evolution-calendar.sgml">
-<!ENTITY calendar-architecture SYSTEM "calendar/architecture.sgml">
-<!ENTITY calendar-alarm-generation SYSTEM "calendar/alarm-generation.sgml">
-<!ENTITY calendar-public-reference SYSTEM "calendar/public-reference.sgml">
-<!ENTITY CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml">
-<!ENTITY CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml">
-<!ENTITY cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml">
-<!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
-<!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
-
-<!ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
-<!ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
-<!ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
-<!ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
-<!ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
-
-<!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml">
-<!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml">
-<!ENTITY ExecutiveSummaryComponent SYSTEM "executive-summary/sgml/executive-summary-component.sgml">
-<!ENTITY ExecutiveSummaryComponentFactory SYSTEM "executive-summary/sgml/executive-summary-component-factory.sgml">
-<!ENTITY ExecutiveSummaryComponentFactoryClient SYSTEM "executive-summary/sgml/executive-summary-component-factory-client.sgml">
-<!ENTITY ExecutiveSummaryHtmlView SYSTEM "executive-summary/sgml/executive-summary-html-view.sgml">
-
-<!ENTITY Evolution "<application>Evolution</application>">
-<!ENTITY Wombat "<application>Wombat</application>">
-<!ENTITY Camel "<application>Camel</application>">
-<!ENTITY PCS "<acronym>PCS</acronym>">
-<!ENTITY libical "<application>libical</application>">
-<!ENTITY Executive-Summary "<application>Executive Summary</application>">
-]>
-
-<book id="index">
-  <bookinfo>
-    <title>&Evolution; Developer's Guide</title>
-
-    <authorgroup>
-      <corpauthor>
-	Ximian, Inc.
-      </corpauthor>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <copyright>
-      <year>2001</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-
-    <legalnotice id="legalnotice">
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the <ulink type="help"
-	url="gnome-help:fdl"><citetitle>GNU Free Documentation
-	License</citetitle></ulink>, Version 1.1 or any later version
-	published by the Free Software Foundation with no Invariant
-	Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-	may obtain a copy of the <citetitle>GNU Free Documentation
-	License</citetitle> from the Free Software Foundation by
-	visiting <ulink type="http" url="http://www.fsf.org">their Web
-	site</ulink> or by writing to: Free Software Foundation, Inc.,
-	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-      </para>
-
-      <para>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-  </bookinfo>
-
-  <!-- Introduction -->
-
-  &preface;
-
-  <!-- DocBook parts for each individual component -->
-
-  &evolution-calendar;
-
-  <!-- API Reference part -->
-
-  &evolution-reference;
-
-  <!-- Appendices -->
-
-  &FDL;
-</book>
diff --git a/doc/devel/executive-summary/Makefile.am b/doc/devel/executive-summary/Makefile.am
deleted file mode 100644
index 9aa53af4ec..0000000000
--- a/doc/devel/executive-summary/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-services
-
-# The directory containing the source code
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/executive-summary/evolution-services
-
-CFLAGS ="						\
-	-I$(top_srcdir)/executive-summary/evolution-services	\
-	-I$(top_srcdir)/executive-summary			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/executive-summary/evolution-services/.libs/libevolution-services.a	\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =					\
-	evolution-services.args			\
-	evolution-services.hierarchy		\
-	evolution-services.signals		\
-	evolution-services.types			\
-	evolution-services-decl.txt		\
-	evolution-services-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component.c	\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component-factory-client.c		\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-html-view.c
-
-IGNORED_HEADER_FILES =		\
-	Executive-Summary.h
-	
-scan_generated =						\
-	evolution-services-decl.txt			\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals			\
-	evolution-services.types
-
-tmpl_dependencies =						\
-	evolution-services-decl.txt			\
-	evolution-services-sections.txt			\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals
-
-tmpl_sources = 						\
-	tmpl/evolution-services.sgml		\
-	tmpl/evolution-services-unused.sgml
-
-tmpl_generated =					\
-	evolution-services-unused.txt
-
-sgml_dependencies =					\
-	evolution-services-decl.txt		\
-	evolution-services-sections.txt		\
-	evolution-services.args			\
-	evolution-services.hierarchy		\
-	evolution-services.signals		\
-	tmpl/evolution-services.sgml
-
-sgml_generated =						\
-	sgml/evolution-services.sgml					\
-	sgml/evolution-services-doc.bottom		\
-	sgml/evolution-services-doc.top			\
-	sgml/object_index.sgml					\
-	sgml/tree_index.sgml
-
-EXTRA_DIST =							\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals			\
-	evolution-services.types				\
-	evolution-services-decl.txt			\
-	evolution-services-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)						\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)		\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)		\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILE)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/doc/devel/executive-summary/evolution-services-decl.txt b/doc/devel/executive-summary/evolution-services-decl.txt
deleted file mode 100644
index df84080700..0000000000
--- a/doc/devel/executive-summary/evolution-services-decl.txt
+++ /dev/null
@@ -1,599 +0,0 @@
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClient</NAME>
-struct ExecutiveSummaryClient {
-	BonoboObjectClient parent;
-	
-	ExecutiveSummaryClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClientClass</NAME>
-struct ExecutiveSummaryClientClass {
-	BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,CORBA_Object object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_set_title</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *title
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_set_icon</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_flash</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_update</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *html
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClient</NAME>
-struct ExecutiveSummaryComponentFactoryClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentFactoryClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientClass</NAME>
-struct ExecutiveSummaryComponentFactoryClientClass {
-  BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentFactoryClient *client,CORBA_Object corba_object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_new</NAME>
-<RETURNS>ExecutiveSummaryComponentFactoryClient  *</RETURNS>
-const char *id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_create_view</NAME>
-<RETURNS>CORBA_Object  </RETURNS>
-ExecutiveSummaryComponentFactoryClient *client
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponent</NAME>
-struct ExecutiveSummaryComponent {
-  BonoboObject parent;
-
-  ExecutiveSummaryComponentPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClass</NAME>
-struct ExecutiveSummaryComponentClass {
-  BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE (executive_summary_component_factory_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactory))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactoryClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactory</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClass</NAME>
-</STRUCT>
-<USER_FUNCTION>
-<NAME>EvolutionServicesCreateViewFn</NAME>
-<RETURNS>BonoboObject *</RETURNS>
-ExecutiveSummaryComponentFactory *factory,
-							 void *closure
-</USER_FUNCTION>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactory</NAME>
-struct ExecutiveSummaryComponentFactory {
-	BonoboObject parent;
-
-	ExecutiveSummaryComponentFactoryPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClass</NAME>
-struct ExecutiveSummaryComponentFactoryClass {
-	BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_factory_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-EvolutionServicesCreateViewFn create_view,void *closure
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED "GNOME:Evolution:Summary:HTMLView:html_changed"
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_TYPE (executive_summary_html_view_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlView))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlViewClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_HTML_VIEW</NAME>
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlView</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlView</NAME>
-struct ExecutiveSummaryHtmlView {
-	BonoboObject parent;
-	
-	ExecutiveSummaryHtmlViewPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewClass</NAME>
-struct ExecutiveSummaryHtmlViewClass {
-	BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_new_full</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-BonoboEventSource *event_source
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_set_html</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryHtmlView *view,const char *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_html</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryHtmlView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_event_source</NAME>
-<RETURNS>BonoboEventSource  *</RETURNS>
-ExecutiveSummaryHtmlView *view
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClient</NAME>
-struct ExecutiveSummaryComponentClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientClass</NAME>
-struct ExecutiveSummaryComponentClientClass {
-  BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_new</NAME>
-<RETURNS>ExecutiveSummaryComponentClient  *</RETURNS>
-const char *id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_set_owner</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummary *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_unset_owner</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_supports</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,gboolean *bonobo,gboolean *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_configure</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_destroy_view</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY</NAME>
-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY</NAME>
-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummary</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummary</NAME>
-struct ExecutiveSummary {
-	BonoboObject parent;
-	
-	ExecutiveSummaryPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClass</NAME>
-struct ExecutiveSummaryClass {
-	BonoboObjectClass parent_class;
-
-	void (* update) (ExecutiveSummary *summary,
-			 const GNOME_Evolution_Summary_Component component,
-			 const char *html);
-	void (* set_title) (ExecutiveSummary *summary,
-			    const GNOME_Evolution_Summary_Component component,
-			    const char *title);
-	void (* set_icon) (ExecutiveSummary *summary,
-			   const GNOME_Evolution_Summary_Component component,
-			   const char *icon);
-	void (* flash) (ExecutiveSummary *summary,
-			const GNOME_Evolution_Summary_Component component);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummary *es,GNOME_Evolution_Summary_ViewFrame corba_object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentView</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentView</NAME>
-struct ExecutiveSummaryComponentView {
-	GtkObject object;
-	
-	ExecutiveSummaryComponentViewPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewClass</NAME>
-struct ExecutiveSummaryComponentViewClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void (* configure) (ExecutiveSummaryComponentView *view);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_construct</NAME>
-<RETURNS>void</RETURNS>
-ExecutiveSummaryComponentView *view,ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_new</NAME>
-<RETURNS>ExecutiveSummaryComponentView  *</RETURNS>
-ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_title</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *title
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_title</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_icon</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_icon</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_flash</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_html</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_html</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_control</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_id</NAME>
-<RETURNS>int  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_id</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,int id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_configure</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_objref</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,Bonobo_Control objref
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_widget</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
diff --git a/doc/devel/executive-summary/evolution-services-sections.txt b/doc/devel/executive-summary/evolution-services-sections.txt
deleted file mode 100644
index 8ba2b42317..0000000000
--- a/doc/devel/executive-summary/evolution-services-sections.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-<INCLUDE>executive-summary-component.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-component</FILE>
-EXECUTIVE_SUMMARY_COMPONENT
-<TITLE>ExecutiveSummaryComponent</TITLE>
-
-executive_summary_component_new
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_TYPE
-EXECUTIVE_SUMMARY_COMPONENT
-EXECUTIVE_SUMMARY_COMPONENT_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT
-IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS
-executive_summary_component_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponent
-ExecutiveSummaryComponentPrivate
-
-</SECTION>
-
-<SECTION>
-<FILE>executive-summary-component-factory</FILE>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-<TITLE>ExecutiveSummaryComponentFactory</TITLE>
-
-EvolutionServicesCreateViewFn
-
-executive_summary_component_factory_new
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS
-executive_summary_component_factory_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponentFactory
-ExecutiveSummaryComponentFactoryPrivate
-
-</SECTION>
-
-<INCLUDE>executive-summary-component-factory-client.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-component-factory-client</FILE>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-<TITLE>ExecutiveSummaryComponentFactoryClient</TITLE>
-
-executive_summary_component_factory_client_construct
-executive_summary_component_factory_client_new
-executive_summary_component_factory_client_create_view
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS
-executive_summary_component_factory_client_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponentFactoryClient
-ExecutiveSummaryComponentFactoryClientPrivate
-
-</SECTION>
-
-<INCLUDE>executive-summary-html-view.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-html-view</FILE>
-EXECUTIVE_SUMMARY_HTML_VIEW
-<TITLE>ExecutiveSummaryHtmlView</TITLE>
-
-EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED
-
-executive_summary_html_view_new_full
-executive_summary_html_view_new
-executive_summary_html_view_set_html
-executive_summary_html_view_get_html
-executive_summary_html_view_get_event_source
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_HTML_VIEW_TYPE
-EXECUTIVE_SUMMARY_HTML_VIEW
-IS_EXECUTIVE_SUMMARY_HTML_VIEW
-EXECUTIVE_SUMMARY_HTML_VIEW_CLASS
-IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS
-executive_summary_html_view_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryHtmlView
-ExecutiveSummaryHtmlViewPrivate
-</SECTION>
diff --git a/doc/devel/executive-summary/evolution-services.args b/doc/devel/executive-summary/evolution-services.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/executive-summary/evolution-services.args
+++ /dev/null
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 07e7aad6ff..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,15 +0,0 @@
-GtkObject
-  GtkWidget
-    GtkRange
-      GtkScale
-    GtkContainer
-      GtkBin
-        GtkButton
-          GtkToggleButton
-            GtkCheckButton
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/executive-summary/evolution-services.signals b/doc/devel/executive-summary/evolution-services.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/executive-summary/evolution-services.signals
+++ /dev/null
diff --git a/doc/devel/executive-summary/evolution-services.types b/doc/devel/executive-summary/evolution-services.types
deleted file mode 100644
index b7ac05b89c..0000000000
--- a/doc/devel/executive-summary/evolution-services.types
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <gnome.h>
-#include <bonobo.h>
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-factory-client.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-executive_summary_component_get_type
-executive_summary_component_factory_get_type
-executive_summary_component_factory_client_get_type
-executive_summary_html_view_get_type
diff --git a/doc/devel/executive-summary/private-reference.sgml b/doc/devel/executive-summary/private-reference.sgml
deleted file mode 100644
index e06d7c1690..0000000000
--- a/doc/devel/executive-summary/private-reference.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-  <reference id="evolution-services-private-reference">
-    <title>Evolution Services Private API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	private APIs of the different components of the &Evolution;
-	Executive Summary Services Framework.
-      </para>
-    </partintro>
-    
-    &ExecutiveSummaryComponentFactoryClient;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/executive-summary/public-reference.sgml b/doc/devel/executive-summary/public-reference.sgml
deleted file mode 100644
index 7758a9a5c8..0000000000
--- a/doc/devel/executive-summary/public-reference.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
- <reference id="evolution-services-public-reference">
-    <title>Evolution Services Public API Reference</title>
-
-    <partintro>
-      <para>
-        This part presents the class and function reference for the
-        public APIs of the different components of the &Evolution;
-        Executive Summary Services Framework.
-      </para>
-    </partintro>
-
-    &ExecutiveSummaryComponent;
-    &ExecutiveSummaryComponentFactory;
-    &ExecutiveSummaryHtmlView;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml b/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml
+++ /dev/null
diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml
deleted file mode 100644
index ee8ef25689..0000000000
--- a/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponentFactoryClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GtkObject client to simplfy use of GNOME_Evolution_Summary_ComponentFactory
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This object provides an easy wrapper around the CORBA object that represents the
- GNOME_Evolution_Summary_ComponentFactory interface. It handles conversion from
-normal types to CORBA types and has error checking.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT ##### -->
-<para>
-Casts a #GtkObject into an #ExecutiveSummaryComponentFactoryClient
-</para>
-
-@obj: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_construct ##### -->
-<para>
-
-</para>
-
-@client: 
-@corba_object: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_new ##### -->
-<para>
-
-</para>
-
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_create_view ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml
deleted file mode 100644
index 7069eea9d0..0000000000
--- a/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponentFactory
-
-<!-- ##### SECTION Short_Description ##### -->
-GtkObject wrapper for GNOME/Evolution/Summary/ComponentFactory.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-An ExecutiveSummaryComponentFactory simplifies the creation of a 
-GNOME_Evolution_Summary_ComponentFactory object. It also allows error checking
-and all the standard #GtkObject signals.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY ##### -->
-<para>
-Casts a #GtkObject to an #ExecutiveSummaryComponentFactory.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### USER_FUNCTION EvolutionServicesCreateViewFn ##### -->
-<para>
-The type of function that is called when the factory has to create a new view.
-</para>
-
-@factory: The #ExecutiveSummaryComponent that is creating the view.
-@closure: The data that was passed into executive_summary_factory_new ().
-@Returns: An #ExecutiveSummaryComponent.
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_new ##### -->
-<para>
-
-</para>
-
-@create_view: 
-@closure: 
-@Returns: 
-
-
diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component.sgml
deleted file mode 100644
index 04768b1b1c..0000000000
--- a/doc/devel/executive-summary/tmpl/executive-summary-component.sgml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-The base #BonoboObject that implements GNOME/Evolution/Summary/Component.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This #GtkObject wrapper around the GNOME/Evolution/Summary/Component, is the
-base object that has all the other interfaces aggregated onto it. These
-interfaces are: GNOME/Evolution/HTMLView, Bonobo/Control, Bonobo/EventSource,
-Bonobo/PropertyBag, Bonobo/PropertyControl and Bonobo/PersistStream. Each of
-the aggregated interfaces performs a specific job in the creation of the service.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#ExecutiveSummaryHtmlView, #BonoboControl, #BonoboEventSource, #BonoboPropertyBag,
-#BonoboPropertyControl, #BonoboPersistStream.
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT ##### -->
-<para>
-Casts a #GtkObject to an #ExecutiveSummaryComponent.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### FUNCTION executive_summary_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
diff --git a/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml b/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml
deleted file mode 100644
index 2fb66a2035..0000000000
--- a/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryHtmlView
-
-<!-- ##### SECTION Short_Description ##### -->
-A Bonobo component used to implement HTML based services.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-When writing HTML services, this component is aggregated onto an #ExecutiveSummaryComponent, to allow the Executive Summary to be able to find the HTML.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#ExecutiveSummaryComponent, #BonoboEventSource
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW ##### -->
-<para>
-  Casts a #GtkObject into an #ExecutiveSummaryHtmlView
-</para>
-
-@obj: A #GtkObject
-
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED ##### -->
-<para>
-This is the event that is emitted on the BonoboEventSource when the HTML is changed.
-</para>
-
-
-
-<!-- ##### FUNCTION executive_summary_html_view_new_full ##### -->
-<para>
-
-</para>
-
-@event_source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_set_html ##### -->
-<para>
-
-</para>
-
-@view: 
-@html: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_get_html ##### -->
-<para>
-
-</para>
-
-@view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_get_event_source ##### -->
-<para>
-
-</para>
-
-@view: 
-@Returns: 
-
-
diff --git a/doc/devel/fdl.sgml b/doc/devel/fdl.sgml
deleted file mode 100644
index 817adbdbb7..0000000000
--- a/doc/devel/fdl.sgml
+++ /dev/null
@@ -1,671 +0,0 @@
-<!--  
-     The GNU Free Documentation License 1.1 in DocBook
-     Markup by Eric Baudais <baudais@okstate.edu>
-     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
-     Version: 1.0.1
-     Last Modified: Nov 16, 2000
--->
-
-<appendix id="fdl">
-  <docinfo>
-    <releaseinfo>
-      Version 1.1, March 2000
-    </releaseinfo>
-    <copyright>
-      <year>2000</year><holder>Free Software Foundation, Inc.</holder>
-    </copyright>
-    <legalnotice id="fdl-legalnotice">
-      <para>
-	<address>Free Software Foundation, Inc. <street>59 Temple Place, 
-        Suite 330</street>, <city>Boston</city>, <state>MA</state>  
-        <postcode>02111-1307</postcode>  <country>USA</country></address> 
-	Everyone is permitted to copy and distribute verbatim copies of this 
-        license document, but changing it is not allowed.
-      </para>
-    </legalnotice>
-  </docinfo>
-  <title>GNU Free Documentation License</title>
-
-  <sect1 id="fdl-preamble">
-    <title>0. PREAMBLE</title>
-    <para>
-      The purpose of this License is to make a manual, textbook, or
-      other written document <quote>free</quote> 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.
-    </para>
-    
-    <para>
-      This License is a kind of <quote>copyleft</quote>, 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.
-    </para>
-    
-    <para>
-      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.
-    </para>
-  </sect1>
-  <sect1 id="fdl-section1">
-    <title>1. APPLICABILITY AND DEFINITIONS</title>
-    <para id="fdl-document">
-      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
-      <quote>Document</quote>, below, refers to any such manual or
-      work. Any member of the public is a licensee, and is addressed
-      as <quote>you</quote>.
-    </para>
-    
-    <para id="fdl-modified">
-      A <quote>Modified Version</quote> 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.
-    </para>
-	
-    <para id="fdl-secondary">
-      A <quote>Secondary Section</quote> is a named appendix or a
-      front-matter section of the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-
-    <para id="fdl-invariant">
-      The <quote>Invariant Sections</quote> are certain <link
-      linkend="fdl-secondary"> Secondary Sections</link> whose titles
-      are designated, as being those of Invariant Sections, in the
-      notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-    
-    <para id="fdl-cover-texts">
-      The <quote>Cover Texts</quote> are certain short passages of
-      text that are listed, as Front-Cover Texts or Back-Cover Texts,
-      in the notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-	
-    <para id="fdl-transparent">
-      A <quote>Transparent</quote> copy of the <link
-      linkend="fdl-document"> Document</link> 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 <quote>Transparent</quote> is called
-      <quote>Opaque</quote>.
-    </para>
-    
-    <para>
-      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.
-    </para>
-    
-    <para id="fdl-title-page">
-      The <quote>Title Page</quote> 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, <quote>Title Page</quote> means the text near the
-      most prominent appearance of the work's title, preceding the
-      beginning of the body of the text.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section2">
-    <title>2. VERBATIM COPYING</title>
-    <para>
-      You may copy and distribute the <link
-      linkend="fdl-document">Document</link> 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 <link
-      linkend="fdl-section3">section 3</link>.
-    </para>
-    
-    <para>
-      You may also lend copies, under the same conditions stated
-      above, and you may publicly display copies.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section3">
-    <title>3. COPYING IN QUANTITY</title>
-    <para>
-      If you publish printed copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      and the Document's license notice requires <link
-      linkend="fdl-cover-texts">Cover Texts</link>, 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
-      <link linkend="fdl-document">Document</link> and satisfy these
-      conditions, can be treated as verbatim copying in other
-      respects.
-    </para>
-    
-    <para>
-      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.
-    </para>
-    
-    <para>
-      If you publish or distribute <link
-      linkend="fdl-transparent">Opaque</link> copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      you must either include a machine-readable <link
-      linkend="fdl-transparent">Transparent</link> 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.
-    </para>
-    
-    <para>
-      It is requested, but not required, that you contact the authors
-      of the <link linkend="fdl-document">Document</link> well before
-      redistributing any large number of copies, to give them a chance
-      to provide you with an updated version of the Document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section4">
-    <title>4. MODIFICATIONS</title>
-    <para>
-      You may copy and distribute a <link
-      linkend="fdl-modified">Modified Version</link> of the <link
-      linkend="fdl-document">Document</link> under the conditions of
-      sections <link linkend="fdl-section2">2</link> and <link
-      linkend="fdl-section3">3</link> 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:
-    </para>
-    
-    <itemizedlist mark="opencircle">
-      <listitem>
-	<formalpara>
-	  <title>A</title>
-	  <para>
-	    Use in the <link linkend="fdl-title-page">Title
-	    Page</link> (and on the covers, if any) a title distinct
-	    from that of the <link
-	    linkend="fdl-document">Document</link>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>B</title>
-	  <para>
-	    List on the <link linkend="fdl-title-page">Title
-	    Page</link>, as authors, one or more persons or entities
-	    responsible for authorship of the modifications in the
-	    <link linkend="fdl-modified">Modified Version</link>,
-	    together with at least five of the principal authors of
-	    the <link linkend="fdl-document">Document</link> (all of
-	    its principal authors, if it has less than five).
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>C</title>
-	  <para>
-	    State on the <link linkend="fdl-title-page">Title
-	    Page</link> the name of the publisher of the <link
-	    linkend="fdl-modified">Modified Version</link>, as the
-	    publisher.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>D</title>
-	  <para>
-	    Preserve all the copyright notices of the <link
-	    linkend="fdl-document">Document</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>E</title>
-	  <para>
-	    Add an appropriate copyright notice for your modifications
-	    adjacent to the other copyright notices.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>F</title>
-	  <para>
-	    Include, immediately after the copyright notices, a
-	    license notice giving the public permission to use the
-	    <link linkend="fdl-modified">Modified Version</link> under
-	    the terms of this License, in the form shown in the
-	    Addendum below.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>G</title>
-	  <para>
-	    Preserve in that license notice the full lists of <link
-	    linkend="fdl-invariant"> Invariant Sections</link> and
-	    required <link linkend="fdl-cover-texts">Cover
-	    Texts</link> given in the <link
-	    linkend="fdl-document">Document's</link> license notice.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>H</title>
-	  <para>
-	    Include an unaltered copy of this License.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>I</title>
-	  <para>
-	    Preserve the section entitled <quote>History</quote>, and
-	    its title, and add to it an item stating at least the
-	    title, year, new authors, and publisher of the <link
-	    linkend="fdl-modified">Modified Version </link>as given on
-	    the <link linkend="fdl-title-page">Title Page</link>.  If
-	    there is no section entitled <quote>History</quote> in the
-	    <link linkend="fdl-document">Document</link>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>J</title>
-	  <para>
-	    Preserve the network location, if any, given in the <link
-	    linkend="fdl-document">Document</link> for public access
-	    to a <link linkend="fdl-transparent">Transparent</link>
-	    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 <quote>History</quote>
-	    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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>K</title>
-	  <para>
-	    In any section entitled <quote>Acknowledgements</quote> or
-	    <quote>Dedications</quote>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>L</title>
-	  <para>
-	    Preserve all the <link linkend="fdl-invariant">Invariant
-	    Sections</link> of the <link
-	    linkend="fdl-document">Document</link>, unaltered in their
-	    text and in their titles.  Section numbers or the
-	    equivalent are not considered part of the section titles.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>M</title>
-	  <para>
-	    Delete any section entitled
-	    <quote>Endorsements</quote>. Such a section may not be
-	    included in the <link linkend="fdl-modified">Modified
-	    Version</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>N</title>
-	  <para>
-	    Do not retitle any existing section as
-	    <quote>Endorsements</quote> or to conflict in title with
-	    any <link linkend="fdl-invariant">Invariant
-	    Section</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-    </itemizedlist>
-    
-    <para>
-      If the <link linkend="fdl-modified">Modified Version</link>
-      includes new front-matter sections or appendices that qualify as
-      <link linkend="fdl-secondary">Secondary Sections</link> 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 <link
-      linkend="fdl-invariant">Invariant Sections</link> in the
-      Modified Version's license notice.  These titles must be
-      distinct from any other section titles.
-    </para>
-    
-    <para>
-      You may add a section entitled <quote>Endorsements</quote>,
-      provided it contains nothing but endorsements of your <link
-      linkend="fdl-modified">Modified Version</link> 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.
-    </para>
-    
-    <para>
-      You may add a passage of up to five words as a <link
-      linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage
-      of up to 25 words as a <link
-      linkend="fdl-cover-texts">Back-Cover Text</link>, to the end of
-      the list of <link linkend="fdl-cover-texts">Cover Texts</link>
-      in the <link linkend="fdl-modified">Modified Version</link>.
-      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 <link linkend="fdl-document">Document</link>
-      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.
-    </para>
-    
-    <para>
-      The author(s) and publisher(s) of the <link
-      linkend="fdl-document">Document</link> do not by this License
-      give permission to use their names for publicity for or to
-      assert or imply endorsement of any <link
-      linkend="fdl-modified">Modified Version </link>.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section5">
-    <title>5. COMBINING DOCUMENTS</title>
-    <para>
-      You may combine the <link linkend="fdl-document">Document</link>
-      with other documents released under this License, under the
-      terms defined in <link linkend="fdl-section4">section 4</link>
-      above for modified versions, provided that you include in the
-      combination all of the <link linkend="fdl-invariant">Invariant
-      Sections</link> of all of the original documents, unmodified,
-      and list them all as Invariant Sections of your combined work in
-      its license notice.
-    </para>
-    
-    <para>
-      The combined work need only contain one copy of this License,
-      and multiple identical <link linkend="fdl-invariant">Invariant
-      Sections</link> 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.
-    </para>
-    
-    <para>
-      In the combination, you must combine any sections entitled
-      <quote>History</quote> in the various original documents,
-      forming one section entitled <quote>History</quote>; likewise
-      combine any sections entitled <quote>Acknowledgements</quote>,
-      and any sections entitled <quote>Dedications</quote>.  You must
-      delete all sections entitled <quote>Endorsements.</quote>
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section6">
-    <title>6. COLLECTIONS OF DOCUMENTS</title>
-    <para>
-      You may make a collection consisting of the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-    
-    <para>
-      You may extract a single document from such a collection, and
-      dispbibute 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section7">
-    <title>7. AGGREGATION WITH INDEPENDENT WORKS</title>
-    <para>
-      A compilation of the <link
-      linkend="fdl-document">Document</link> 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 <link linkend="fdl-modified">Modified Version</link>
-      of the Document, provided no compilation copyright is claimed
-      for the compilation.  Such a compilation is called an
-      <quote>aggregate</quote>, 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 <link
-      linkend="fdl-cover-texts">Cover Text</link> requirement of <link
-      linkend="fdl-section3">section 3</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section8">
-    <title>8. TRANSLATION</title>
-    <para>
-      Translation is considered a kind of modification, so you may
-      distribute translations of the <link
-      linkend="fdl-document">Document</link> under the terms of <link
-      linkend="fdl-section4">section 4</link>. Replacing <link
-      linkend="fdl-invariant"> Invariant Sections</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section9">
-    <title>9. TERMINATION</title>
-    <para>
-      You may not copy, modify, sublicense, or distribute the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section10">
-    <title>10. FUTURE REVISIONS OF THIS LICENSE</title>
-    <para>
-      The <ulink type="http"
-      url="http://www.gnu.org/fsf/fsf.html">Free Software
-      Foundation</ulink> 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 <ulink
-      type="http"
-      url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
-    </para>
-    
-    <para>
-      Each version of the License is given a distinguishing version
-      number. If the <link linkend="fdl-document">Document</link>
-      specifies that a particular numbered version of this License
-      <quote>or any later version</quote> 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.
-    </para>
-  </sect1>
-
-  <sect1 id="fdl-using">
-    <title>Addendum</title>
-    <para>
-      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:
-    </para>
-    
-    <blockquote>
-      <para>
-	Copyright &copy; YEAR YOUR NAME.
-      </para>
-      <para>
-	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 <link
-	linkend="fdl-invariant">Invariant Sections</link> being LIST
-	THEIR TITLES, with the <link
-	linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
-	and with the <link linkend="fdl-cover-texts">Back-Cover
-	Texts</link> being LIST.  A copy of the license is included in
-	the section entitled <quote>GNU Free Documentation
-	License</quote>.
-      </para>
-    </blockquote>
-      
-    <para>
-      If you have no <link linkend="fdl-invariant">Invariant
-      Sections</link>, write <quote>with no Invariant Sections</quote>
-      instead of saying which ones are invariant.  If you have no
-      <link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
-      <quote>no Front-Cover Texts</quote> instead of
-      <quote>Front-Cover Texts being LIST</quote>; likewise for <link
-      linkend="fdl-cover-texts">Back-Cover Texts</link>.
-    </para>
-    
-    <para>
-      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 <ulink type="http"
-      url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
-      License</ulink>, to permit their use in free software.
-    </para>
-  </sect1>
-</appendix>  
-
-
-
-
-
-
diff --git a/doc/devel/importer/.cvsignore b/doc/devel/importer/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/doc/devel/importer/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/doc/devel/importer/Makefile.am b/doc/devel/importer/Makefile.am
deleted file mode 100644
index ef3b2b98ee..0000000000
--- a/doc/devel/importer/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-shell-importer
-
-# The directory containing the source code
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/shell/importer
-
-CFLAGS ="						\
-	-I$(top_srcdir)/shell/importer			\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/shell/importer/.libs/libevolution-importer.a	\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =					\
-	evolution-shell-importer.args			\
-	evolution-shell-importer.hierarchy		\
-	evolution-shell-importer.signals		\
-	evolution-shell-importer.types			\
-	evolution-shell-importer-decl.txt		\
-	evolution-shell-importer-sections.txt
-
-SOURCE_FILES =								\
-	$(top_srcdir)/shell/importer/evolution-importer.c		\
-	$(top_srcdir)/shell/importer/evolution-importer.h		\
-	$(top_srcdir)/shell/importer/evolution-importer-client.c	\
-	$(top_srcdir)/shell/importer/evolution-importer-client.h
-
-IGNORED_HEADER_FILES =			\
-	GNOME_Evolution_Importer.h	\
-	importer.h
-
-scan_generated =						\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals			\
-	evolution-shell-importer.types
-
-tmpl_dependencies =						\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer-sections.txt			\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals
-
-tmpl_sources = 						\
-	tmpl/evolution-importer.sgml			\
-	tmpl/evolution-shell-importer-unused.sgml
-
-tmpl_generated =					\
-	evolution-shell-importer-unused.txt
-
-sgml_dependencies =					\
-	evolution-shell-importer-decl.txt		\
-	evolution-shell-importer-sections.txt		\
-	evolution-shell-importer.args			\
-	evolution-shell-importer.hierarchy		\
-	evolution-shell-importer.signals		\
-	tmpl/evolution-importer.sgml
-
-sgml_generated =					\
-	sgml/evolution-importer.sgml			\
-	sgml/evolution-shell-importer-doc.bottom	\
-	sgml/evolution-shell-importer-doc.top		\
-	sgml/object_index.sgml				\
-	sgml/tree_index.sgml
-
-EXTRA_DIST =							\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals			\
-	evolution-shell-importer.types				\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)						\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)		\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)		\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILE)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/doc/devel/importer/evolution-shell-importer-sections.txt b/doc/devel/importer/evolution-shell-importer-sections.txt
deleted file mode 100644
index e2474f6375..0000000000
--- a/doc/devel/importer/evolution-shell-importer-sections.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-<INCLUDE>evolution-importer.h</INCLUDE>
-
-<SECTION>
-<FILE>evolution-importer</FILE>
-EVOLUTION_IMPORTER
-<TITLE>EvolutionImporter</TITLE>
-
-EvolutionImporterSupportFormatFn
-EvolutionImporterLoadFileFn
-EvolutionImporterProcessItemFn
-EvolutionImporterGetErrorFn
-
-EvolutionImporterResult
-
-evolution_importer_new
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER
-EVOLUTION_IMPORTER
-EVOLUTION_IS_IMPORTER
-EVOLUTION_IMPORTER_CLASS
-EVOLUTION_IS_IMPORTER_CLASS
-evolution_importer_get_type
-
-<SUBSECTION Private>
-EvolutionImporter
-EvolutionImporterPrivate
-
-</SECTION>
-
-<INCLUDE>evolution-importer-listener.h</INCLUDE>
-<SECTION>
-<FILE>evolution-importer-listener</FILE>
-EVOLUTION_IMPORTER_LISTENER
-<TITLE>EvolutionImporterListener</TITLE>
-
-EvolutionImporterListenerCallback
-
-evolution_importer_listener_new
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER_LISTENER
-EVOLUTION_IMPORTER_LISTENER
-EVOLUTION_IMPORTER_LISTENER_CLASS
-EVOLUTION_IS_IMPORTER_LISTENER
-EVOLUTION_IS_IMPORTER_LISTENER_CLASS
-evolution_importer_listener_get_type
-
-<SUBSECTION Private>
-EvolutionImporterListener
-EvolutionImporterListenerPrivate
-
-</SECTION>
-
-<INCLUDE>evolution-importer-client.h</INCLUDE>
-<SECTION>
-<FILE>evolution-importer-client</FILE>
-EVOLUTION_IMPORTER_CLIENT
-<TITLE>EvolutionImporterClient</TITLE>
-
-evolution_importer_client_new
-evolution_importer_client_new_from_id
-evolution_importer_client_support_format
-evolution_importer_client_load_file
-evolution_importer_client_process_item
-evolution_importer_client_get_error
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER_CLIENT
-EVOLUTION_IMPORTER_CLIENT
-EVOLUTION_IMPORTER_CLIENT_CLASS
-EVOLUTION_IS_IMPORTER_CLIENT
-EVOLUTION_IS_IMPORTER_CLIENT_CLASS
-evolution_importer_client_get_type
-
-<SUBSECTION Private>
-EvolutionImporterClient
-
-</SECTION>
diff --git a/doc/devel/importer/evolution-shell-importer.args b/doc/devel/importer/evolution-shell-importer.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/importer/evolution-shell-importer.args
+++ /dev/null
diff --git a/doc/devel/importer/evolution-shell-importer.heirarchy b/doc/devel/importer/evolution-shell-importer.heirarchy
deleted file mode 100644
index 78e430d311..0000000000
--- a/doc/devel/importer/evolution-shell-importer.heirarchy
+++ /dev/null
@@ -1,5 +0,0 @@
-GtkObject
-  BonoboObject
-    EvolutionImporter
-  BonoboObjectClient
-    EvolutionImporterClient
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index 5f1b55c709..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,14 +0,0 @@
-GtkObject
-  GtkWidget
-    GtkRange
-      GtkScale
-    GtkContainer
-      GtkBin
-        GtkButton
-          GtkToggleButton
-            GtkCheckButton
-  BonoboObject
-    EvolutionImporter
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
-    EvolutionImporterListener
diff --git a/doc/devel/importer/evolution-shell-importer.types b/doc/devel/importer/evolution-shell-importer.types
deleted file mode 100644
index 9dcdf5f0f1..0000000000
--- a/doc/devel/importer/evolution-shell-importer.types
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <gnome.h>
-#include <bonobo.h>
-#include <evolution/importer/evolution-importer.h>
-#include <evolution/importer/evolution-importer-client.h>
-#include <evolution/importer/evolution-importer-listener.h>
-
-evolution_importer_get_type
-evolution_importer_client_get_type
-evolution_importer_listener_get_type
diff --git a/doc/devel/importer/private-reference.sgml b/doc/devel/importer/private-reference.sgml
deleted file mode 100644
index d28c7b8591..0000000000
--- a/doc/devel/importer/private-reference.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
-  <reference id="importer-private-reference">
-    <title>Importer Private API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	private APIs of the different components of the &Evolution;
-	Import Framework.
-      </para>
-    </partintro>
-
-    &EvolutionImporterListener;
-    &EvolutionImporterClient;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/importer/public-reference.sgml b/doc/devel/importer/public-reference.sgml
deleted file mode 100644
index ba99c9b309..0000000000
--- a/doc/devel/importer/public-reference.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-  <reference id="importer-public-reference">
-    <title>Importer Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the &Evolution;
-	Import Framework.
-      </para>
-    </partintro>
-
-    &EvolutionImporter;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/importer/tmpl/evolution-importer-client.sgml b/doc/devel/importer/tmpl/evolution-importer-client.sgml
deleted file mode 100644
index 8122e4fb2d..0000000000
--- a/doc/devel/importer/tmpl/evolution-importer-client.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EvolutionImporterClient
-
-<!-- ##### SECTION Short_Description ##### -->
-A #GtkObject based client to simplify use of a GNOME_Evolution_Importer object.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This #GtkObject provides a convience wrapper to the GNOME_Evolution_Importer object, providing error checking and hiding all the CORBA internals from the user.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EVOLUTION_IMPORTER_CLIENT ##### -->
-<para>
-Casts a #GtkObject into an #EvolutionImporterClient
-</para>
-
-@obj: A #GtkObject
-
-
-<!-- ##### FUNCTION evolution_importer_client_new ##### -->
-<para>
-
-</para>
-
-@objref: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_new_from_id ##### -->
-<para>
-
-</para>
-
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_support_format ##### -->
-<para>
-
-</para>
-
-@client: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_load_file ##### -->
-<para>
-
-</para>
-
-@client: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_process_item ##### -->
-<para>
-
-</para>
-
-@client: 
-@listener: 
-<!-- # Unused Parameters # -->
-@callback: 
-@closure: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_get_error ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
diff --git a/doc/devel/importer/tmpl/evolution-importer.sgml b/doc/devel/importer/tmpl/evolution-importer.sgml
deleted file mode 100644
index 8d8351aed2..0000000000
--- a/doc/devel/importer/tmpl/evolution-importer.sgml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EvolutionImporter
-
-<!-- ##### SECTION Short_Description ##### -->
-A #BonoboObject that implements the GNOME/Evolution/Importer interface.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #BonoboObject wrapper around the GNOME/Evolution/Importer interface, providing error checking and reference counting, hiding the CORBA internals from the user and providing a simple way to create a GNOME_Evolution_Importer object.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EVOLUTION_IMPORTER ##### -->
-<para>
-Casts a #GtkObject into an #EvolutionImporter.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterSupportFormatFn ##### -->
-<para>
-The type of function that is called when the importer wishes to find out if the importing component can support the file given in @filename.
-</para>
-
-@importer: The #EvolutionImporter.
-@filename: The filename of the file to check.
-@closure: The data passed into evolution_importer_new ().
-@Returns: A #gboolean. TRUE if the importing component can import the file, FALSE otherwise.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterLoadFileFn ##### -->
-<para>
-The type of function that is called when the importer wishes the importing component to load the file given in @filename, and initialise itself.
-</para>
-
-@importer: The #EvolutionImporter.
-@filename: The filename of the file to load.
-@closure: The data passed into evolution_importer_new ().
-@Returns: A #gboolean. TRUE if the load and initialisation was successful, FALSE otherwise.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterProcessItemFn ##### -->
-<para>
-The type of function that is called when the importer wants the importing component to process the next item (or items) in a file.
-</para>
-
-@importer: The #EvolutionImporter
-@listener: A GNOME_Evolution_Importer_Listener CORBA object.
-@closure: The data passed into evolution_importer_new ().
-@ev: A #CORBA_Environment for returning any CORBA exceptions.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterGetErrorFn ##### -->
-<para>
-The type of function that is called when the importer wants to get a string version of an error. Not all importing components support this function.
-</para>
-
-@importer: The #EvolutionImporter.
-@closure: The data passed to evolution_importer_new ().
-@Returns: A string representation of the error, or NULL if there was no error, or the importing component does not support the getError method.
-
-
-<!-- ##### ENUM EvolutionImporterResult ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION evolution_importer_new ##### -->
-<para>
-
-</para>
-
-@support_format_fn: 
-@load_file_fn: 
-@process_item_fn: 
-@get_error_fn: 
-@closure: 
-@Returns: 
-
-
diff --git a/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml b/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml
deleted file mode 100644
index 7a9a98034b..0000000000
--- a/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- ##### USER_FUNCTION EvolutionImporterClientCallback ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@more_items: 
-@data: 
-
diff --git a/doc/devel/preface.sgml b/doc/devel/preface.sgml
deleted file mode 100644
index fdaa824a8b..0000000000
--- a/doc/devel/preface.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-  <preface id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      This is the &Evolution; Developer's Guide or programming guide
-      for the &Evolution; groupware suite.  If you are a programmer
-      and you wish to use &Evolution;'s functionality from your own
-      applications or if you wish to modify the &Evolution; core code,
-      you should read this guide.
-    </para>
-
-    <para>
-      If you are an end-user of &Evolution; you do not need to read
-      this guide; please read the &Evolution; User's Guide instead.
-    </para>
-
-    <para>
-      This guide contains the information you need to know to do the
-      following:
-
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Write applications that use &Evolution;'s data
-	    repositories via the &Wombat; personal information server.
-	    Examples of this would be a <application>GNOME
-	    Panel</application> applet that displays today's
-	    appointments, or a telephone dialer application that uses
-	    the contents of the &Evolution; Addressbook.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write applications that use the &Camel; mail library.
-	    This includes extending &Evolution;'s own mail component
-	    to perform additional functions.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write new components for the &Evolution; Shell.  Instead
-	    of writing a stand-alone application, you can provide your
-	    users with the benefit of having integrated views of their
-	    data from within Evolution.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write new modules for the &Evolution; Executive Summary.
-	    This allows you to present commonly-accessed information
-	    in a convenient fashion directly in the &Evolution; Shell.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Modify the core &Evolution; code to add new features or
-	    change its architecture.
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-
-    <sect1 id="organization">
-      <title>Organization of this Guide</title>
-
-      <para>
-	This guide is organized in two big sections.  The first is a
-	programming guide, which consists of one part for each one of
-	&Evolution;'s components:  there are separate parts for the
-	calendar, the addressbook, the mailer, the executive summary,
-	and the shell.  Each part gives a description of the
-	architecture of its corresponding component, and also gives
-	information about the component's internal architecture and
-	some implementation details.
-      </para>
-
-      <para>
-	The second section of this guide is a reference guide for
-	&Evolution;'s programming interfaces.  We have separated these
-	into public and private interfaces.  The public ones are those
-	that most people will need to use when writing extensions or
-	third-party components; the private interfaces are those used
-	internally in &Evolution;.  Even if you do not intend to
-	modify the &Evolution; core code, it may be useful to know a
-	bit about the way it is organized internally.
-      </para>
-
-      <para>
-	&Evolution; is free software, and we want you as a programmer
-	to make the most of it.  We have provided many useful
-	interfaces that you can use in your own applications.  Still,
-	we want you to view &Evolution; as a framework for building
-	groupware applications, and this may occasionally involve
-	making changes to its core code.  We want you to learn from
-	&Evolution;'s design because we think it marks an important
-	milestone in the development of large-scale free software
-	applications.  We want you to modify it as you see fit.  Free
-	software gives you this freedom, and we want the whole world
-	to benefit from it.
-      </para>
-    </sect1>
-  </preface>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/doc/devel/reference.sgml b/doc/devel/reference.sgml
deleted file mode 100644
index b0c81de77f..0000000000
--- a/doc/devel/reference.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-  <part id="evolution-api-reference">
-    <title>&Evolution; API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	different libraries and interfaces that &Evolution; provides.
-	Classes are described together with their methods; individual
-	functions are grouped by functional group.
-      </para>
-
-      <para>
-	&Evolution; provides two kinds of interfaces, public and
-	private.  The public interfaces are those designed to be used
-	from third-party applications or components; if you wanted to
-	write an application that uses &Evolution;'s data repositories
-	to display data in a particular way, you would use the public
-	interfaces.  The private interfaces are those used inside
-	&Evolution; itself; these are generally not interesting unless
-	you intend to make modifications to the &Evolution; code base.
-      </para>
-
-      <para>
-	While the public and private interfaces are described in
-	separate reference sections, we have decided to put them
-	together in the same book, this guide, because we want to
-	encourage you to regard &Evolution; as something more than a
-	black box that stores and dispatches personal information.  We
-	want you to make modifications to the &Evolution; core if
-	these would allow you to present or store your data in better
-	ways.  &Evolution; is free software; we want you to learn from
-	its design and implementation details so that you can make it
-	even better for the whole world to use.
-      </para>
-    </partintro>
-
-    &calendar-public-reference;
-    &importer-public-reference;
-    &evolution-services-public-reference;
-    &importer-private-reference;
-    &evolution-services-private-reference;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/doc/white-papers/calendar/calendar.sgml b/doc/white-papers/calendar/calendar.sgml
deleted file mode 100644
index 2cb3132e2b..0000000000
--- a/doc/white-papers/calendar/calendar.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity CUA "<acronym>CUA</acronym>">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity Bonobo "<application>Bonobo</application>">
-<!entity CORBA "<acronym>CORBA</acronym>">
-<!entity GTK "<acronym>GTK+</acronym>">
-]>
-
-<article class="whitepaper" id="calendar">
-
-  <artheader>
-    <title>&Evolution; Calendaring Framework</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Federico</firstname>
-	<surname>Mena Quintero</surname>
-	<affiliation>
-	  <address>
-	    <email>federico@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <abstract>
-      <para>
-	The &Evolution; groupware suite provides a framework for
-	developing calendaring applications, as well as a graphical
-	calendar client and a personal calendar server.  This white
-	paper describes the architecture of the &Evolution;
-	calendaring framework.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Introduction -->
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      Calendaring is an important part of a groupware suite.  A
-      calendaring framework will allow a user to keep a personal
-      calendar and have several applications use it.  Such
-      applications could be a graphical calendar client that the user
-      employs to schedule appointments and keep track of his time, a
-      <productname>Palm Pilot</productname> synchronization client, or
-      a simple alarm or reminder utility.  A comprehensive calendaring
-      framework will also allow multiple users to schedule
-      appointments between each other; for example, a project director
-      may want to schedule a weekly meeting with the rest of the
-      project members, or a person who owns a large house may want to
-      schedule a big party with his friends.  The attendees will then
-      want to reply with messages such as, &ldquo;I will
-      attend&rdquo;, or &ldquo;I will attend only if the proposed time
-      is changed&rdquo;.
-    </para>
-
-    <para>
-      The &Evolution; groupware suite provides a framework for
-      developing calendaring applications, as well as a graphical
-      calendar client or calendar user agent (&CUA;) and a personal
-      calendar server (&PCS;).
-    </para>
-
-    <para>
-      The following sections explain the basic calendaring framework,
-      the functions of the calendar user agent and the personal
-      calendar server, and the relationship between the two.
-    </para>
-  </sect1>
-
-  <!-- Personal Calendar Server -->
-
-  <sect1 id="pcs">
-    <title>Personal Calendar Server</title>
-
-    <para>
-      The personal calendar server (&PCS;) provides centralized
-      management and storage of a user's personal calendar.  Multiple
-      clients can connect to the &PCS; simultaneously to query and
-      modify the user's calendar in a synchronized fashion.  The main
-      features of the &PCS; are as follows:
-    </para>
-
-    <formalpara>
-      <title>Storage</title>
-
-      <para>
-	The &PCS; is responsible for loading and saving calendars.
-	Centralizing the loading and saving functionality allows
-	multiple clients to use the same calendar at the same time
-	without having to worry about each other.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Basic Queries</title>
-
-      <para>
-	The &PCS; provides functions to do basic queries on a
-	calendar, for example, a client can ask the server for a list
-	of all the appointments in the calendar, or for all the data
-	for a specific appointment.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Recurrence and Alarm Queries</title>
-
-      <para>
-	Clients can ask the &PCS; for a list of the appointments that
-	occur within a specified time range; for example a graphical
-	client that has a per-week view could ask the &PCS; for all
-	the appointments that occur in a particular week.  This
-	includes multiple occurrences of a single recurring event; for
-	example, the object for &ldquo;a 1-hour meeting that occurs on
-	every Tuesday and Thursday&rdquo; is represented inside the
-	&PCS; as a single event with a recurrence rule.  Similarly,
-	clients can ask the &PCS; for a list of events that have
-	alarms that trigger within a specified time range.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Notification of Changes</title>
-
-      <para>
-	This is the most important function of the &PCS;, as it allows
-	multiple calendar clients to maintain a unified view of the
-	calendar between the server and themselves.  When a client
-	asks the &PCS; to modify or remove an event, the &PCS;
-	notifies all the clients that are connected to it about the
-	change.  The policy is that &ldquo;the server is always
-	right&rdquo;; clients can act as dumb views onto the
-	calendar's data and they will be notified by the &PCS; when
-	something changes.
-      </para>
-    </formalpara>
-  </sect1>
-
-  <!-- Calenar User Agent -->
-
-  <sect1 id="cua">
-    <title>Calendar User Agent</title>
-
-    <para>
-      A calendar user agent (&CUA;) is a program that lets a user
-      manipulate a calendar.  &Evolution; provides an attractive,
-      graphical calendar client that communicates with the &Evolution;
-      personal calendar server.
-    </para>
-
-    <para>
-      The &Evolution; calendar client just provides a view onto the
-      data that is stored and managed by the personal calendar server.
-      The calendar client does not perform direct manipulations on a
-      calendar's data; instead it offloads those requests to the
-      calendar server, which takes care of making the appropriate
-      modifications in the calendar and then notifies all the clients
-      about the changes.
-    </para>
-  </sect1>
-
-  <!-- Calendar Client Library -->
-
-  <sect1 id="client-lib">
-    <title>Calendar Client Library</title>
-
-    <para>
-      Communication between the personal calendar server and calendar
-      clients is defined by a set of &Bonobo; &CORBA; interfaces.
-      Clients can be written by implementing the client-side
-      <classname>Listener</classname> interface, which defines the
-      notification callbacks that the PCS uses to inform clients about
-      changes to the calendar.
-    </para>
-
-    <para>
-      As a convenience for &GTK; programmers, &Evolution; also
-      includes a library which provides a
-      <classname>CalClient</classname> class which can be used for
-      communication with the personal calendar server.  Objects of
-      this class automatically contact the PCS when they are created.
-      <classname>CalClient</classname> provides functions to request
-      changes in the calendar, and it also emits signals when it gets
-      notification about changes from the PCS.  This makes it easy and
-      convenient to write calendar clients for &Evolution; using
-      &GTK;.
-    </para>
-
-    <para>
-      The implementation of the <classname>CalClient</classname> class
-      simply wraps the &Evolution; &CORBA; interfaces for calendaring
-      with a familiar-looking &GTK; object.  Calls to the
-      <classname>Listener</classname> interface get translated to
-      signal emissions from the <classname>CalClient</classname>, thus
-      shielding programmers from the details of the &CORBA;
-      interfaces.
-    </para>
-  </sect1>
-</article>
diff --git a/doc/white-papers/mail/camel.sgml b/doc/white-papers/mail/camel.sgml
deleted file mode 100644
index a339909f54..0000000000
--- a/doc/white-papers/mail/camel.sgml
+++ /dev/null
@@ -1,339 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-]>
-
-<article class="whitepaper" id="camel">
-
-  <artheader>
-    <title>The &Camel; Messaging Library</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-
-      <author>
-	<firstname>Bertrand</firstname>
-	<surname>Guiheneuf</surname>
-	<affiliation>
-	  <address>
-	    <email>bertrand@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Camel; is a generic messaging library. It is being used as the
-      back end for the mail component of &Evolution;. The name
-      "&Camel;" is an acronym; it refers to the fact that the
-      library is capable of going several days without food or water.
-      It means : Camel's Acronym Makes Everyone Laugh.
-    </para>
-
-    <para>
-      &Camel;'s initial design is heavily based on Sun's
-      <trademark>JavaMail</trademark> API. It uses the Gtk+ object
-      system, and many of its classes are direct analags of JavaMail
-      classes. Its design has also been influenced by the features of
-      IMAP, and the limitations of the standard UNIX mbox mail store,
-      which set some of the boundaries on its requirements and
-      extensibility.
-    </para>
-
-    <para>
-      &Camel; sees all message repositories as stores containing
-      folders. These folders in turn contain the messages the client
-      actually accesses. The use of such a unified interface allows
-      the client applications to be very extensible. &Camel; includes
-      an external provider mechanism which allows applications to
-      dynamically load and use protocols which were not available when
-      the application was initially written.
-    </para>
-
-    <para>
-      The abstract store/folder mechanism is a powerful and versatile
-      way of accessing messages. No particular asumptions are made on
-      the client side, thus allowing new ways of managing the
-      messages. For example, the messages stored in the folders don't
-      necessarily have to share some common physical location. The
-      folder can be a purely virtual folder, containing only
-      references to the actual messages. This is used by the "vFolder"
-      provider, which allows you select messages meeting particular
-      criteria and deal with them as a group.
-    </para>
-
-    <para>
-      In addition to these possibilities, &Camel; has full MIME
-      support. &Camel; MIME messages are lightweight objects
-      representing the MIME skeleton of the actual message. The data
-      contained in the subparts are never stored in memory except when
-      they are actually needed. The application, when accessing the
-      various MIME objects contained in the message (text parts,
-      attachments, embedded binary objects ...) asks &Camel; for a
-      stream that it can read data from. This scheme is particularly
-      useful with the IMAP provider. IMAP has strong MIME support
-      built-in, which allows &Camel; to download only the parts of
-      messages that it actually needs: attachments need not be
-      downloaded until they are viewed, and unnecessary
-      "multipart/alternative" parts will never be read off the server.
-    </para>
-  </sect1>
-
-  <sect1 id="overview">
-    <title>Overview</title>
-
-    <graphic format="gif" fileref="camel"></graphic>
-
-    <para>
-      To begin using &Camel;, an application first creates a
-      <classname>CamelSession</classname> object. This object is used
-      to store application defaults, and to coordinate communication
-      between providers and the application.
-    </para>
-
-    <para>
-      A <classname>CamelProvider</classname> is a dynamically-loadable
-      module that provides functionality associated with a specific
-      service. Examples of providers are IMAP and SMTP. Providers
-      include subclasses of the various other &Camel; classes for
-      accessing and manipulating messages.
-    </para>
-
-    <para>
-      <classname>CamelService</classname> is an abstract class for
-      describing a connection to a local or remote service. It
-      currently has two subclasses: <classname>CamelStore</classname>,
-      for services that store messages (such as IMAP servers and mbox
-      files), and <classname>CamelTransport</classname>, for services
-      that deliver messages (such as SMTP, or a local MTA). A provider
-      could also be both a store and a transport, as in the case of
-      NNTP.
-    </para>
-
-    <para>
-      A <classname>CamelStore</classname> contains some number of
-      <classname>CamelFolder</classname> objects, which in turn
-      contain messages. A <classname>CamelFolder</classname> provides
-      a <classname>CamelFolderSummary</classname> object, which
-      includes details about the subject, date, and sender of each
-      message in the folder. The folder also includes the messages
-      themselves, as subclasses of <classname>CamelMedium</classname>.
-    </para>
-
-    <para>
-      Email messages are represented by the
-      <classname>CamelMimeMessage</classname> class, a subclass of
-      <classname>CamelMedium</classname>. This class includes
-      operations for accessing RFC822 and MIME headers, accessing
-      subparts of MIME messages, encoding and decoding Base64 and
-      Quoted-Printable, etc.
-    </para>
-
-    <para>
-      <classname>CamelTransport</classname> includes methods for
-      delivering messages. While the abstract
-      <function>CamelTransport::send</function> method takes a
-      <classname>CamelMedium</classname>, its subclasses may only be
-      able to deliver messages of specific
-      <classname>CamelMedium</classname> subclasses. For instance,
-      <classname>CamelSendmailTransport</classname> requires a
-      <classname>CamelMimeMessage</classname>, because it needs a
-      message that includes a "To:" header. A hypothetical
-      <classname>CamelNNTPTransport</classname> would need a
-      <classname>CamelNewsMessage</classname>, which would have a
-      "Newsgroups:" header.
-    </para>
-
-    <para>
-      The content of messages are referred to using
-      <classname>CamelStream</classname> and its subclasses. In the
-      case of an mbox-based store, the
-      <classname>CamelStream</classname> would abstract the operation
-      of reading the correct section of the mbox file. For IMAP,
-      reading off the <classname>CamelStream</classname> might result
-      in commands being issued to the remote IMAP server and data
-      being read off a socket.
-    </para>
-
-    <para>
-      The final major class in &Camel; is
-      <classname>CamelException</classname>, which is used to
-      propagate information about errors. Many methods take a
-      <classname>CamelException</classname> as an argument, which the
-      caller can then check if an error occurs. It includes both a
-      numeric error code which can be interpreted by the program, and
-      a text error message that can be displayed to the user.
-    </para>
-  </sect1>
-
-  <sect1 id="classes">
-    <title>Major Subcomponents</title>
-
-    <sect2 id="store">
-      <title>The Message Store</title>
-
-      <para>
-        A <classname>CamelStore</classname> inherits the ability to
-        connect and authenticate to a service from its parent class,
-        <classname>CamelService</classname>. It then adds the ability
-        to retrieve folders. A store must contain at least one folder,
-        which can be retrieved with
-        <function>CamelStore::get_default_folder</function>. There are
-        also methods to retrieve the "top-level" folder (for
-        hieararchical stores), and to retrieve an arbitrary folder by
-        name.
-      </para>
-
-      <para>
-        All <classname>CamelFolder</classname>s must implement certain
-        core operations, most notably generating a summary and
-        retrieving and deleting messages. A
-        <classname>CamelFolder</classname> must assign a permanently
-        unique identifier to each message it contains. Messages can
-        then be retrieved via
-        <function>CamelFolder::get_message_by_uid</function>. Alternately,
-        within a single mail-reading session, messages can be referred
-        to by their linear position within the store using
-        <function>CamelFolder::get_message_by_number</function>.
-      </para>
-
-      <para>
-        Folders must also implement the
-        <function>get_parent_folder</function> and
-        <function>list_subfolders</function> methods. For stores that
-        don't allow multiple folders, they would return NULL and an
-        empty list, respectively. Stores that do allow multiple
-        folders will also define methods for creating and deleting
-        folders, and for moving messages between them (assuming the
-        folders are writable).
-      </para>
-
-      <para>
-        Folders that support searching can define the
-        <function>search_by_expression</function> method. For mbox
-        folders, this is implemented by indexing the messages with the
-        ibex library and using that to search them later. For IMAP
-        folders, this uses the IMAP SEARCH command. Other folder types
-        might not be able to implement this functionality, in which
-        case users would not be able to do full-content searches on
-        them.
-      </para>
-    </sect2>
-
-    <sect2 id="messages">
-      <title>Messages</title>
-
-      <para>
-        As mentioned before, messages are represented by subclasses of
-        <classname>CamelMedium</classname>.
-        <classname>CamelMedium</classname> itself is a subclass of
-        <classname>CamelDataWrapper</classname>, a generic class for
-        connecting a typed data source to a data sink.
-        <classname>CamelMedium</classname> adds the concept of message
-        headers versus message body.
-        (<classname>CamelDataWrapper</classname> has one other
-        important subclass, <classname>CamelMultipart</classname>,
-        which is used to provide separate access to the multiple
-        independent parts of a multipart MIME type.)
-        <classname>CamelMedium</classname>'s subclasses provide more
-        specialized handling of various headers:
-        <classname>CamelMimePart</classname> adds special handling for
-        the &ldquot;Content-*&rdquot; headers in MIME messages, and
-        its subclass <classname>CamelMimeMessage</classname> adds
-        handling for the RFC822 headers.
-      </para>
-
-      <graphic format="gif" fileref="mimemessage"></graphic>
-
-      <para>
-        Consider a message with two parts: a text part (in both plain
-        text and HTML), and an attached image:
-
-	<programlisting>
-
-	  From: Dan Winship &lt;danw@helixcode.com&gt;
-	  To: Matt Loper &lt;matt@helixcode.com&gt;
-	  Subject: the Camel white paper
-	  MIME-Version: 1.0
-	  Content-Type: multipart/mixed;
-		boundary="jhTYrnsRrdhDFGa"
-
-	  This is a multi-part message in MIME format.
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: multipart/alternative;
-		boundary="sFSenbAFDSgDfg"
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/plain
-
-	  Hey, Matt
-
-	  Check out this graphic...
-
-	  -- Dan
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/html
-
-	  Hey, Matt&lt;br&gt;
-	  &lt;br&gt;
-	  Check out this graphic...&lt;br&gt;
-	  &lt;br&gt;
-	  -- Dan&lt;br&gt;
-	  &lt;br&gt;
-	  --sFSenbAFDSgDfg--
-
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: image/png
-	  Content-Transfer-Encoding: base64
-
-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...
-	  --jhTYrnsRrdhDFGa--
-	</programlisting>
-
-	<para>
-	  In &Camel;, this would be represented as follows:
-	</para>
-
-        <graphic fileref="samplemsg"></graphic>
-      </sect2>
-
-      <sect2 id="streams">
-        <title>Streams</title>
-
-	<para>
-	  Streams are a generic data transport layer. Two basic stream
-	  classes are <classname>CamelStreamFs</classname>, for
-	  reading and writing files, and
-	  <classname>CamelStreamMem</classname>, for reading from and
-	  writing to objects that are already in memory.
-	</para>
-
-	<para>
-	  Streams can also be chained together. So a CamelMimePart
-	  containing base64-encoded data can filter its output through
-	  a CamelStreamB64. Other parts of the application that want
-	  to read its data will never need to even realize that the
-	  original data was encoded.
-	</para>
-      </sect2>
-
-</article>
diff --git a/doc/white-papers/mail/ibex.sgml b/doc/white-papers/mail/ibex.sgml
deleted file mode 100644
index dcb8f5ca4b..0000000000
--- a/doc/white-papers/mail/ibex.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-<!entity Ibex "Ibex">
-]>
-
-<article class="whitepaper" id="ibex">
-
-  <artheader>
-    <title>Ibex: an Indexing System</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Ibex; is a library for text indexing. It is being used by
-      &Camel; to allow it to quickly search locally-stored messages,
-      either because the user is looking for a specific piece of text,
-      or because the application is contructing a vFolder or filtering
-      incoming mail.
-    </para>
-  </sect1>
-
-  <sect1 id="goals">
-    <title>Design Goals and Requirements for Ibex</title>
-
-    <para>
-      The design of &Ibex; is based on a number of requirements.
-
-    <itemizedlist>
-      <listitem>
-        <para>
-	  First, obviously, it must be fast. In particular, searching
-	  the index must be appreciably faster than searching through
-	  the messages themselves, and constructing and maintaining
-	  the index must not take a noticeable amount of time.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexes must not take up too much space. Many users have
-	  limited filesystem quotas on the systems where they read
-	  their mail, and even users who read mail on private machines
-	  have to worry about running out of space on their disks. The
-	  indexes should be able to do their job without taking up so
-	  much space that the user decides he would be better off
-	  without them.
-	</para>
-
-	<para>
-	  Another aspect of this problem is that the system as a whole
-	  must be clever about what it does and does not index:
-	  accidentally indexing a "text" mail message containing
-	  uuencoded, BinHexed, or PGP-encrypted data will drastically
-	  affect the size of the index file. Either the caller or the
-	  indexer itself has to avoid trying to index these sorts of
-	  things.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexing system must allow data to be added to the index
-	  incrementally, so that new messages can be added to the
-	  index (and deleted messages can be removed from it) without
-	  having to re-scan all existing messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must allow the calling application to explain the
-	  structure of the data however it wants to, rather than
-	  requiring that the unit of indexing be individual files.
-	  This way, &Camel; can index a single mbox-format file and
-	  treat it as multiple messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must support non-ASCII text, given that many people send
-	  and receive non-English email, and even people who only
-	  speak English may receive email from people whose names
-	  cannot be written in the US-ASCII character set.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      While there are a number of existing indexing systems, none of
-      them met all (or even most) of our requirements.
-    </para>
-  </sect1>
-
-  <sect1 id="implementation">
-    <title>The Implementation</title>
-
-    <para>
-      &Ibex; is still young, and many of the details of the current
-      implementation are not yet finalized.
-    </para>
-
-    <para>
-      With the current index file format, 13 megabytes of Info files
-      can be indexed into a 371 kilobyte index file&mdash;a bit under
-      3% of the original size. This is reasonable, but making it
-      smaller would be nice. (The file format includes some simple
-      compression, but <application>gzip</application> can compress an
-      index file to about half its size, so we can clearly do better.)
-    </para>
-
-    <para>
-      The implementation has been profiled and optimized for speed to
-      some degree. But, it has so far only been run on a 500MHz
-      Pentium III system with very fast disks, so we have no solid
-      benchmarks.
-    </para>
-
-    <para>
-      Further optimization (of both the file format and the in-memory
-      data structures) awaits seeing how the library is most easily
-      used by &Evolution;: if the indexes are likely to be kept in
-      memory for long periods of time, the in-memory data structures
-      need to be kept small, but the reading and writing operations
-      can be slow. On the other hand, if the indexes will only be
-      opened when they are needed, reading and writing must be fast,
-      and memory usage is less critical.
-    </para>
-
-    <para>
-      Of course, to be useful for other applications that have
-      indexing needs, the library should provide several options, so
-      that each application can use the library in the way that is
-      most suited for its needs.
-    </para>
-  </sect1>
-</article>
diff --git a/doc/white-papers/widgets/e-table.sgml b/doc/white-papers/widgets/e-table.sgml
deleted file mode 100644
index 5ff4faf2ae..0000000000
--- a/doc/white-papers/widgets/e-table.sgml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity ETable "<classname>ETable</classname>">
-<!entity ETableModel "<classname>ETableModel</classname>">
-<!entity ETableSimple "<classname>ETableSimple</classname>">
-<!entity ETableHeader "<classname>ETableHeader</classname>">
-<!entity ETableSpecification "<classname>ETableSpecification</classname>">
-<!entity ETableCol "<classname>ETableCol</classname>">
-]>
-
-<article class="whitepaper" id="e-table">
-
-  <artheader>
-    <title>The ETable Widget</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Chris</firstname>
-	<surname>Lahey</surname>
-	<affiliation>
-	  <address>
-	    <email>clahey@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Miguel</firstname>
-	<surname>de Icaza</surname>
-	<affiliation>
-	  <address>
-	    <email>miguel@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &ETable; is a table widget on steroids. It is intended to provide
-      all the table functionality needed throughout &Evolution;, and
-      hopefully be general purpose enough to be used in other projects.
-    </para>
-
-    <para>
-      &ETable; provides a lot of interactive control over the data in the
-      table.  Without any work from the programmer, &ETable; provides
-      rearrangeable columns and editable data.  When finished, &ETable; will
-      also provide, again with no programmer intervention, easy interactive
-      sorting and grouping.  
-    </para>
-
-    <para>
-      &ETable; gives you a great deal of functionality, flexibility, and
-      power. Most of this power is internal to the widget, but some of
-      the flexibility requires a bit of work by the programmer.
-      However, once you learn it, &ETable; is not very hard at all to
-      use.
-    </para>
-
-    <para>
-      &ETable;'s power comes from the fact that it is fully
-      model/view/controller based.  Various models are involved into
-      the process of rendering the information, and various views are
-      provided.  The programmer has a wide range of options: from the
-      most finely hand-tuned table to a generic all-encompasing widget
-      that takes over most of tasks.  It is up to the programmer: he
-      can use the simple to use &ETable; widget that takes care of
-      everything in a generic way, or he can use the various
-      components to roll his own tabular display.
-    </para>
-
-    <para>
-      &ETable; ships with a standard set of information renderers:
-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line
-      strings.  But the programmer can write and implement his own
-      renderer for his information.  This means that by default
-      &ETable; provides the basic display facilities that programmers
-      required, but they offer the programmer a complete freedom to
-      incorporate new cell renderers.
-    </para>
-    
-  </sect1>
-
-  <sect1 id="model">
-    <title>ETableModel</title>
-
-    <para>
-      The data back end for the &ETable; is an &ETableModel;. The
-      &ETableModel is an abstract interface that acts as the
-      information repository for the various &ETable components.
-    </para>
-    
-    <para>
-      To use &ETable; you have to create a subclass of the abstract
-      &ETableModel; class.  However, to save you the work of defining
-      a new <classname>GtkClass</classname> every time you use
-      &ETable, there is a predefined subclass of &ETableModel; called
-      &ETableSimple; which simply takes a list of function callbacks
-      to perform the various operations.
-    </para>
-
-  </sect1>
-    
-  <sect1 id="columns">
-    <title>Columns</title>
-
-    <para>
-      There are two different meanings to the word "column". The first
-      is the model column (defined by the &ETableCol: object). A model
-      column describes how it maps to the column in the &ETableModel;
-      as well as containing information about its properties (name,
-      resizability, resize dimensions, and a renderer for this
-      specific columns). 
-    </para>
-
-    <para>
-      &ETable; distinguishes between a model column index, and a view
-      column index.  The former reflects the column in which the data
-      is stored in the &ETableModel;  The later represents the actual
-      location at which the column is being displayed in the screen.
-    </para>
-
-    <para>
-      Each view column index corresponds to a specific model column,
-      though a model column may have any number of view columns
-      associated with it (including zero).  For example the same
-      column might be rendered twice, or the data from one column
-      could be used to display different bits of information
-    </para>
-
-    <para>
-      The view column does not necessarily depend on only one model
-      column. In some cases, the view column renderer can be given a
-      reference to another model column to get extra information about
-      its display. For example, a mail program could display deleted
-      messages with a line through them by creating a model column
-      with no corresponding view column that told whether or not the
-      message is deleted, and then having the text column
-      strikethrough the display if the invisible column had a value
-      corresponding to "deleted".
-    </para>
-
-    <para>
-      The view column also specifies a few other pieces of
-      information. One piece of information is the renderer. &ETable;
-      provides a number of renderers to choose from, or you can write
-      your own. Currently, there are renderers for text, image sets,
-      and checkboxes.
-    </para>
-
-    <para>
-      The view column also includes information about the header.
-      There are two types of headers: text, and pixbuf. The first
-      allows you to specify a string which is rendered in the header.
-      The second allows you to specify an image to copy into the
-      header.
-    </para>
-  </sect1>
-
-  <sect1 id="header">
-    <title>Header</title>
-
-    <para>
-      The &ETableHeader; represents the header information for the
-      table. The &ETableHeader; is used in two different ways. The
-      first is the in the <structfield>full_header</structfield>
-      element of an &ETable;. This is the list of possible columns in
-      the view. You add each of your columns to this &ETableHeader;
-      and then pass it into the &ETable;.
-    </para>
-
-    <para>
-      The second use is completely internal. &ETable; uses another
-      &ETableHeader; to store the actual displayed columns. Many of
-      the &ETableHeader; functions are for this purpose. The only
-      functions that users of the library should need to use are
-      <function>e_table_header_new</function> and
-      <function>e_table_header_add_col</function>.
-    </para>
-  </sect1>
-
-  <sect1 id="layout">
-    <title>Layout Specification</title>
-
-    <para>
-      &ETable; uses an &ETableSpecification; to layout the columns of
-      the widget. The &ETableSpecification; is specified as XML data
-      passed into the &ETable; as a string.
-    </para>
-
-    <para>
-      The most powerful part of the &ETableSpecification; is that when
-      finished, &ETable; will allow you to get a copy of an
-      &ETableSpecification; that describes the current view of the
-      tree. This allows the developer to save the current view so that
-      next time the user opens this table, they find it in exactly the
-      state that they left it.
-    </para>
-
-    <para>
-      The XML specification allows for a number of things. First, it
-      allows you to pick a set of default columns to be shown. Thus,
-      even if you had hundreds of pieces of data, you could choose to
-      only display a few that fit on the screen by default.
-    </para>
-
-    <para>
-      The second major thing that the &ETableSpecification; allows you
-      to specify is the column grouping and sorting. &ETable; has a
-      powerful mechanism for allowing the user to choose columns to
-      group by, thus allowing multiple columns of sorting, as well as
-      visual grouping of similar elements and interactive selection of
-      what data to display.
-    </para>
-
-    <para>
-      The grouping in &ETableSpecification; is specified as a
-      hierarchy of columns to group by. Each level of the hierarchy
-      lets you sort by a particular column, either ascending or
-      descending. All levels except the last cause the canvas to group
-      by the given column.
-    </para>
-
-    <para>
-      An example &ETableSpecification; follows.
-    </para>
-
-    <programlisting>
-      &lt;ETableSpecification&gt;
-        &lt;columns-shown frozen_columns="2"&gt;
-	  &lt;column&gt; 0 &lt;/column&gt;
-	  &lt;column&gt; 1 &lt;/column&gt;
-	  &lt;column&gt; 2 &lt;/column&gt;
-	  &lt;column&gt; 3 &lt;/column&gt;
-	  &lt;column&gt; 4 &lt;/column&gt;
-	&lt;/columns-shown&gt;
-	&lt;grouping&gt;
-	  &lt;group column="3" ascending="1"&gt;
-	    &lt;group column="4" ascending="0"&gt;
-	      &lt;leaf column="2" ascending="1"/&gt;
-	    &lt;/group&gt;
-	  &lt;/group&gt;
-	&lt;/grouping&gt;
-      &lt;/ETableSpecification&gt;
-    </programlisting>
-
-    <para>
-      This example has 5 columns which are initially in order. It has
-      2 levels of grouping. The first is grouped by the 4th column
-      (all indexes are 0 based) and sorts those groups in ascending
-      order. Inside those groups, the data is grouped by the fifth
-      column and sorted in descending order of the fifth column.
-      Finally, the data in those groups is sorted by the third column
-      in ascending order. Due to the "frozen_columns" attribute on the
-      columns-shown element, the user will not be
-      able to rearrange the first two columns. They will always be the
-      first two.
-    </para>
-  </sect1>
-
-  <sect1 id="conclusion">
-    <title>Conclusion</title>
-
-    <para>
-      All in all, &ETable; is a very powerful widget. Once you learn
-      to use it, you have access to a vast amount of power requiring a
-      comparatively small amount of work.
-    </para>
-  </sect1>
-</article>
diff --git a/e-util/.cvsignore b/e-util/.cvsignore
deleted file mode 100644
index cb49036068..0000000000
--- a/e-util/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-*.lo
-*.la
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
deleted file mode 100644
index 8cf1b9c216..0000000000
--- a/e-util/ChangeLog
+++ /dev/null
@@ -1,987 +0,0 @@
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* e-path.c (e_path_to_physical): New function to turn foo/bar into
-	foo/subfolders/bar. The inverse function doesn't exist yet because
-	I didn't need it. Also, if the shell were going to use this, we'd
-	need a few more tools...
-
-	* Makefile.am (libeutil_la_SOURCES): Add e-path.[ch]
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (e_sexp_encode_string): Make it handle a NULL string as
-	an empty string.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Wait a lot lot longer for
-	threads to finish.
-	: Turned off some of the debug.
-
-2001-02-08  Not Zed  <NotZed@Ximian.com>
-
-	* e-memory.c (EMemChunk): Changed to allocate raw blocks for the
-	data, and keep track of them with an array, this is so the native
-	malloc alignment is not lost at the allocation stage.
-
-2001-01-30  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_destroy): Turn on joining of cancelled threads.
-	(e_msgport_wait): Put a cleanup handler to clear the mp lock if it
-	happens in cond_wait, since it will be locked again.
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* e-msgport.c (e_thread_put): If we have waiting threads, then
-	dont start a new one for the NEW case.
-	(thread_dispatch): For the NEW case, dont exit, just keep running,
-	waiting for a new message to come along.
-	(e_thread_destroy): When cleaning up NEW threads, cancel any
-	non-busy threads.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.h (ESExp): Add chunk allocators.
-
-	* e-sexp.c: Removed some redundant debug printfs.
-	(e_sexp_term_eval): Dont allocate result till we have it. so we
-	can have a fatal error, and not leak it.
-	(term_eval_plus): If we have to abort, free our arguments.
-	(term_eval_sub): Same.
-	(parse_new_term): Renamed to parse_term_new for consistency.
-	Fixed callers.
-	(e_sexp_result_new): Add the esexp as an argument.  Ouch, lots of
-	code to change for this.  Allocate blocks from an ememchunk.
-	Fixed all callers.
-	(e_sexp_result_free): Same as above, free blocks from the
-	ememchunk.  Fixed all callers.
-	(parse_term_new): 
-	(parse_term_free): Similarly, add the esexp to the argument, and
-	alloc/free from memchunks.  Fixed all local callers.
-	(e_sexp_init): Setup the memory chunk allocators.
-	(e_sexp_finalise): Destroy memchunk allocators.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* e-sexp.c (e_sexp_parse): Setup error return and return error on
-	parse error.
-	(parse_list): Fail if we have a problem.
-	(parse_value): Here too.
-	(fatal_error): Fatal error handling function, jumps back to the
-	top caller.
-	(term_eval_and):
-	(e_sexp_term_eval): 
-	(term_eval_sub): 
-	(term_eval_plus): 
-	(term_eval_gt): 
-	(term_eval_lt): 
-	(term_eval_or):  Fail on error.
-	(e_sexp_term_eval): Added a comment about where this can be
-	called, which is only from inside e_sexp_eval().
-	(e_sexp_eval): Setup setjmp error handler.
-	(e_sexp_error): Error accessor function.
-
-	* e-sexp.h: Added a longjmp environment to the structure, and an
-	error return to parse.	
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* e-dbhash.c (md5_to_dbt): New function, can't use strlen on the md5
-	hash because it might have null chars in it.
-	(e_dbhash_add): use md5_to_dbt
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* e-pilot-map.c (e_pilot_map_remove_by_pid): Remove an item by pid
-	(e_pilot_map_remove_by_uid): ditto for uid
-
-	* e-pilot-map.h: new protos
-
-2001-01-17  Jason Leach  <jasonleach@usa.net>
-
-	* e-gtk-utils.c (gtk_radio_button_get_nth_selected): New function,
-	name describes it well.
-	(gtk_radio_button_select_nth): New function.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-dialog-widgets.[ch]: Ximianified.
-
-2001-01-15  JP Roseveaer  <jpr@ximian.com>
-
-	* e-pilot-util.c (e_pilot_utf8_from_pchar): Dup the string passed
-	in, not the temporary string. d'oh.
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* e-msgport.c: #define E_THREAD_NONE as ((pthread_t)~0) and use
-	that instead of ~0 throughout. (pthread_t is a pointer type on my
-	system, so there are lots of warnings without the cast.)
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Check for null strings
-	(e_pilot_utf8_from_pchar): ditto
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Convert utf8 strings to
-	pilot character set
-	(e_pilot_utf8_from_pchar): vice versa
-
-	* Makefile.am: Conditionally build e-pilot-util.[hc] because
-	they depend on pilot-link stuff
-
-2000-12-23  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msgport.c (e_dlist_length): Util function.
-	(e_thread_new): Another new thread primitive.  This one is a
-	re-usable 'server thread' thingy.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* Makefile.am (libeutil_la_SOURCES): Added msgport stuff.
-
-	* e-msgport.[ch]: Some thread primitives.  e_dlist, a
-	double-linked list (ok, not a thread primitive, but used in ...),
-	e_msgport - an asynchronous, non-copying message passing
-	rendesvous port, and e_mutex, a portably configurable mutex.
-
-2000-12-19  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c: Make the code compile without being a gtk object (the
-	old code can still be built as a gtk object if required).  Also
-	removed some dead code.
-	(e_sexp_ref): New function to ref if we're not a gkt object.
-	(e_sexp_unref): Same for unref.
-
-2000-12-13  Larry Ewing  <lewing@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): make sure we actually make
-	enough space for "&nbsp;".
-
-2000-12-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_get): Updated
-	documentation comment.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-corba-utils.h: New.
-
-	* e-corba-utils.c: New.
-	(e_safe_corba_string): New.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_strv_new): Fix typename of args (for all funcs).
-	(e_strv_set_ref): Assert the index is in range.
-	(e_strv_set_ref_free): "
-	(e_strv_set): "
-	(e_strv_get): "
-
-2000-11-29  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (term_eval_lt): Plug a memleak, need to free results
-	from term_eval().
-	(term_eval_gt): 
-	(term_eval_eq): 
-
-2000-11-27  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_mempool_new): Added some locking to global data.
-	This should make the interfaces mt-safe, although each object is
-	only per-thread safe.
-
-2000-11-22  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_mempool_alloc): If we dont get a big enough chunk
-	in the first node, give up.  Otherwise we spend too much time
-	searching.
-	(e_mempool_strdup): Doh, and allocate enough for the terminating
-	NUL at that.
-	(e_strv_set_ref_free): New function, set a reference to a string
-	that is then owned/free'd by the strv.
-	(e_strv_destroy): If there are any strings to destroy, free them
-	here.
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.c (e_memchunk_alloc0): New function to allocate a
-	zero'd out chunk.
-	(e_mempool_strdup): New function to strdup into a mempool.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* e-memory.[ch]: New routines for fast memory management and
-	compact string array storage.
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-memory.[ch].
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* e-dbhash.h: oops thats func not *func
-
-	* e-dbhash.c (e_dbhash_foreach_key): Memset the data DBT to 0
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Build e-dbhash.[hc]
-
-	* e-dbhash.[hc]: New routines to manage a db database on disk that
-	contains md5 hashed data and indexed by uids.  Provides comparison
-	functions and such so the caller does not have to do the md5 bits.
-
-200-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-dialog-widgets.c: #include <string.h> to quench warning.
-	* e-sexp.c: #include <stdlib.h> for same reason.
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* Makefile.am: build md5-utils
-
-	* md5-utils.c: Make part of util, get rid of camel stream util
-	function include string.h
-
-	* md5-utils.h: ditto
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_uid): Return null if no
-	pnode was found.
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (map_sax_start_element): Get archive field while
-	parsing
-	(map_write_foreach): Write out archive field
-	(e_pilot_map_pid_is_archived): implement
-	(e_pilot_map_uid_is_archived): ditto
-	(e_pilot_map_insert): Insert new node structures
-	(e_pilot_map_lookup_pid): Take into account the list is now
-	a list of structures
-	(e_pilot_map_lookup_uid): ditto
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_is_postal): 
-	unsigned chars.
-
-	* ename/e-name-western.c (e_name_western_get_one_prefix_at_str):
-	cast to unsigned char.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Deal properly with URLs at the
-	end of the buffer. (The old code would append a "&#0;" to the
-	text.)
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_pid): Lookup a pid by uid.
-	(e_pilot_map_lookup_uid): Lookup a uid by pid.
-	Now this is wrapped, we can store archive info internally
-
-	* e-pilot-map.h: New accessor prototypes
-	
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* ename/Makefile.am (INCLUDES): Remove unused GNOMELOCALEDIR
-	setting.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Operate with EPilotMap structure so things are
-	abstract to the caller
-	(e_pilot_map_pid_is_archived): Infrastructure for marking records
-	as archived
-	(e_pilot_map_uid_is_archived): ditto
-
-	* e-pilot-map.h: Add more to public interface, including EPilotMap
-	structure
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Pilot map functions grabbed from existing conduits
-
-	* e-pilot-map.h (e_pilot_map_write): Header
-
-2000-10-18  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,
-	assume it was actually undeclared iso-8859-1 text.
-
-2000-10-17  Jesse Pavel  <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: made the routines use the stardard
-	e_strstrcase instead of the included function that existed
-	earlier.
-
-2000-10-11  Iain Holmes  <iain@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_parse): g_strconcat
-	needs to be NULL terminated or it goes funny.
-
-Tue Sep 26 16:48:49 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS).
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: add ename as a SUBDIR
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list-iterator.c, e-list.c, e-list.h: Made e_list a bit more
-	reentrant.  If a iterator gets its data pulled out from under it
-	while in a loop, it goes back one so that loops will be able to
-	continue.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed all the files moved to gal.
-
-	* e-dialog-widgets.c: Fixed the #include lines to deal properly
-	with gal.
-
-	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality
-	that was moved to gal.
-
-	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,
-	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,
-	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,
-	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,
-	e-xml-utils.c, e-xml-utils.h: Moved to gal.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-font.c: Fixed an uninitialized variable.
-
-2000-09-12  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c (e_utf8_to_gtk_string_sized): Use underscores
-	for untranslatable characters
-	(e_utf8_from_gtk_string_sized): Ditto
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (e_font_from_gdk_font): Change this a bit so that if
-	you pass it a bold font, it puts that in font->bold and finds a
-	lighter font for font->font (if it can). This is for themes like
-	Metal where the default font is bold.
-	(find_variants): renamed from find_best_bold
-	
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (find_best_bold): Thou shalt leave space for the
-	trailing \0.
-
-	* e-util.c (e_strstrcase): The return value should not be
-	const. (Well, unless the input was, but you can't know that.)
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-unicode.c, e-unicode.h: Added e_utf8_gtk_editable_get_text and
-	e_utf8_gtk_editable_set_text.
-
-2000-09-11  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Try to find real bold variant of X font, fall
-	to double stroke only if not found
-
-2000-09-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gtk-utils.c: New.
-	(e_gtk_signal_connect_full_while_alive): New.
-
-	* e-gtk-utils.h: New.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Use experimental 16-bit font stuff for EFonts
-
-2000-09-08  Dan Winship  <danw@helixcode.com>
-
-	* e-popup-menu.h: remove consts from the EPopupMenu structure: the
-	caller may want to modify its own EPopupMenu before calling
-	e_popup_menu_run.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_get): Use UTF-8
-	(e_dialog_editable_set): Use UTF-8
-
-	* e-font.c (translate_encoding): More encodings
-	(e_gdk_font_encoding): Use experimental stuff
-
-	* e-unicode.* (e_utf8_gtk_editable_insert_text): New wrapper
-	
-2000-09-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-canvas.c (emit_event): Remove incorrect optimization.  Events
-	are read-only!
-
-2000-09-04  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c: Added new font code, but comment it out now
-	* e-font.h, e-font.c: Test code for font analyzing
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h, e-unicode.c: New functions
-	e_utf8_gtk_clist_append, e_utf8_gtk_clist_set_text
-	e_unicode_init
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Use UTF-8
-
-	* e-unicode.h:
-	* e-unicode.c (g_unichar_to_utf8): glib 1.3 function
-	(gdk_keyval_to_unicode): gdk 1.3 function
-	(e_utf8_from_gdk_event_key): Use keyval, not string
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h: #define gnome_font_get_size and
-	gnome_font_get_width, and gnome_font_lookup_default,
-	if compiling with gnome-print 0.20
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libeutil_la_LIBADD): make e-util depend on
-	libunicode
-
-	* e-popup-menu.c (make_item): Use GtkMenuItem rather than
-	GtkPixmapMenuItem for items with no pixmaps, so that if the whole
-	menu is pixmapless, you don't get a column of blank pixmaps.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_gtk_menu_item_new_with_label): New wrapper
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_strstrcase): New function
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Constify.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: e_utf8_gtk_editable_get_chars
-	e_utf8_gtk_entry_get_text
-	e_utf8_gtk_entry_set_text
-	e_utf8_to_gtk_string: New convenience functions
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: Some convenience functions to deal with Gtk+ and UTF-8
-
-	* Makefile.am: Added e-unicode.h, e-unicode.c
-
-2000-08-21  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.h:
-	* e-font.c: Changed UTF-8 syntax from char-based to byte-based
-	
-2000-08-21  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix a booboo in the tab
-	expansion code (didn't use the new value of 'out').
-
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h: #define e_font_height(f) to save some space
-	
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h:
-	* e-font.c: Thin wrapper around GdkFont to deal with UTF-8 directly
-	Also handles bold/italic styling
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* e-sexp.c (scanner_config): Add "-" to be an acceptable
-	first character for an operation -- yaaay subtraction!
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix the tab expansion
-	for when the length would exceed the ten characters that
-	we allocated.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-setup.[ch]: Remove. The shell tells the components where
-	the evolution homedir is now.
-	
-	* Makefile.am (libeutil_la_SOURCES): Remove e-setup.c
-
-	* e-html-utils.c (e_text_to_html): If converting both spaces and
-	newlines, then convert tabs too. The joys of pseudo-<PRE>.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Fix the bug where it truncates the last item
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Ooops.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added uncompiled e_read_uri function.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c, e-popup-menu.h: Added a hide_mask argument to
-	the two popup menu functions.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.c: Added
-	e_container_change_tab_order.
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* e-canvas.c (e_canvas_destroy): Chain the
-	destroy handler.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>	
-	
-	* e-canvas.c (emit_event): Don't bother with 
-	dereferencing the event pointer.
-	(e_canvas_item_set_cursor): Reference our selection
-	item; print a debug message. Deref when destroying
-	(e_canvas_item_add_selection): Same.
-	(e_canvas_item_remove_selection): Same.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): Build both libraries
-	(a typo didn't build libeutil.la, only -static.)
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): build static version
-	of library for conduit to use
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added a bunch of e_marshal functions.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strstrcase function.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-vbox.c: Removed some debugging printfs.
-	
-	* e-canvas.c (e_canvas_unrealize): Call parent unrealize method.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-sexp.c (eval_dump_result): `#if 0'ed out.
-
-	* e-popup-menu.h (e_popup_menu_create): New prototype.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c: Fix warnings.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list.c, e-list.h: Added e_list_duplicate.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strsplit to work around a bug in
-	g_strsplit.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h: Added last and insert functions.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c: Added docstrings.  This file did not have
-	them at all.  EEEEEEK!
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* e-sexp.c (e_sexp_parse): Kill debugging message
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h, e-list.c, e-list.h: New list class with
-	iterators.
-
-	* e-canvas.c: Made it so that you don't get the same selection in
-	the selection list more than once.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gui-utils.h: #include <libgnomeui/gnome-messagebox.h>.  It's
-	needed to be able to pass an appropriate @type arg to
-	`e_notice()'.
-
-2000-06-29  Jody Goldberg <jgoldberg@home.com>
-
-	* e-canvas.c (e_canvas_init) : Init the InputContext members
-	(e_canvas_class_init) : Add a handler for unrealize.
-	(e_canvas_focus_in) : enable the input context.
-	(e_canvas_focus_out) : enable the input context.
-	(e_canvas_realize) : Create an input context.
-	(e_canvas_unrealize) : New function to release the input context.
-
-2000-06-28  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (url_extract): add ")" to the set of characters
-	to back up over at the end of a potential URL.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-dialog-widgets.c (get_toggle_value): Use `value_var', not
-	`value'.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_srcdir)' to fix compilation
-	with builddir != srcdir.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h.
-
-	* e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like
-	a vbox using the reflow system.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Added a variable to keep track of the
-	cursor.  Set the cursor when selection_add is called.  Properly
-	unset the cursor at the right times.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Grab the focus when setting the cursor.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Built a system for doing selections
-	and/or a cursor in canvas.
-
-2000-06-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Changed the needed e_marshal functions.
-
-	* e-printable.c, e-printable.h: Added a quantize parameter to
-	e_printable_height.  Also, added a e_printable_will_fit function.
-	
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-printable.c and e-printable.h.
-
-	* e-printable.c, e-printable.h: This new class is a printing
-	context.  Other classes return an EPrintable which represents a
-	context for printing that object.
-
-	* e-util.c, e-util.h: Added
-	e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL and
-	e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c: Fixed e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-util.c (g_int_compare): Duh! -1 != 1. :)
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-sexp.c (e_sexp_term_eval): g_return_val_if_fail to prevent a crash.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_encode_bool): Utility function to build a bool
-	as part of an expression string.
-	(e_sexp_encode_string): Likewise for strings.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-utils.c, e-canvas-utils.h: Added
-	e_canvas_item_show_area which makes sure that a particular area of
-	a given item is in the scroll area.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (hook_radio): Use the exported function to
-	set the value.
-	(get_radio_value): Likewise.
-	(hook_option_menu): Likewise.
-	(get_option_menu_value): Likewise.
-	(hook_toggle): Likewise.
-	(get_toggle_value): Likewise.
-	(hook_spin_button): Likewise.
-	(get_spin_button_value): Likewise.
-	(hook_editable): Likewise.
-	(get_editable_value): Likewise.
-	(e_dialog_radio_set): Radio buttons are prepended to their parent
-	group's list, so we need to flip the index around when
-	getting/setting the value.
-	(e_dialog_radio_get): Likewise.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Moved over from
-	event-editor-utils.c.
-	(e_dialog_editable_get): Likewise.
-	(e_dialog_toggle_set): Likewise.
-	(e_dialog_toggle_get): Likewise.
-	(e_dialog_spin_set): Likewise.
-	(e_dialog_spin_get_double): Likewise.
-	(e_dialog_spin_get_int): Likewise.
-	(e_dialog_option_menu_set): Likewise, and added a value map.
-	(e_dialog_option_menu_get): Likewise.
-	(e_dialog_dateedit_set): Likewise.
-	(e_dialog_dateedit_get): Likewise.
-	(e_dialog_radio_set): New function.
-	(e_dialog_radio_get): New function.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned.c, e-paned.h: Removed.
-
-2000-05-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (get_radio_value): Implemented.  Amazing that
-	one has to go through so much pain to get a stupid value from
-	GTK+.
-	(hook_option_menu): Implemented.  Same complaint.
-	(get_toggle_value): Implemented.
-	(get_spin_button_value): Implemented.
-	(get_entry_value): Implemented.
-	(e_dialog_widget_hook_value): Function to hook a widget to the
-	variable it will modify.
-	(e_dialog_get_values): Function to feed the variables from a
-	dialog's widgets.
-	(e_dialog_xml_widget_hook_value): Function to hook a widget from
-	a Glade file.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_write_file.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.[ch]: New files with utilities for hooking up
-	widgets in Glade-generated dialogs.
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-dialog-widgets.[ch].
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_container_foreach_leaf.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add imagesdir support.
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_create_image_widget for
-	glade use.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: xmlGetProp appears to return malloced memory.
-	Thus we must free it.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.c (e_free_string_list): New function.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strdup_strip which returns a copy of
-	the string with the leading and trailing spaces removed.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Destroy the g_scanner when cleaning up.
-	(e_sexp_finalise): Free symbol table on finalise.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Remove reflow idle when being destroyed.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-html-utils.c: Got rid of some warnings.
-
-	* e-util.c, e-util.h: Added e_read_file which takes a filename and
-	returns a newly allocated string containing the contents of that
-	file.
-
-2000-05-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.h: #include <glib.h> and <gtk/gtktypeutils.h>.
-
-	* e-util.c (e_free_object_list): New utility function.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* e-canvas.c (e_canvas_focus_in): 
-	(e_canvas_focus_out): set and reset the GTK_HAS_FOCUS flag. We now get
-	focus_out events correctly.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Free the parse tree if we have one.
-	(e_sexp_parse): If we already have a parse tree, free it.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Constified all the functions.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Moved here from the mailer,
-	since it's of general use, and the composer needs it too.
-
-2000-04-24  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-popup-menu.c: New file.  Implements easy to use popup menus. 
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* e-paned.c: New file. Makes a GtkPaned with more than two
-	children.
-	* e-paned.h: same.
-
-	* Makefile.am: added e-paned.[ch].
-
-2000-04-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Added
-	e_xml_get_child_by_name_by_lang.
-
-2000-04-16  Anders Carlsson  <andersca@gnu.org>
-
-      * e-canvas.c (e_canvas_class_init): Add realize.
-      (e_canvas_realize): Set the back pixmap to NULL to reduce flicker.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Fixing a warning.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Add g_return_if_fails.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Added proper keyboard focus handling.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory
-	via gnome-config.
-	(mkdir_if_necessary): New function.
-	(e_setup_base_dir): Use mkdir_if_necessary().
-
-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.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to
-	speed up reflow and to make it fail less often.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for
-	doing hierarchical displays in the canvas.  Adds an extra idle
-	loop to the canvas system.
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c: Fixed e_xml_set_integer_prop_by_name.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_set_integer_prop_by_name.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-	
-	* e-util/e-sexp.[ch]: Added.  moved from filter-sexp.[ch]
-
-	* e-util/Makefile.am (libeutil_a_SOURCES): Add e-sexp.
-	(noinst_LTLIBRARIES): Changed to a libtool library.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_get_integer_prop_by_name.
-
-	* e-util/Makefile.am: Added e-util.c.
-
-	* e-util/e-util.h: Added e-util.c functions.
-
-	* e-util/e-util.c: New file for compare functions
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas-utils.h: Fixed the comment at the top and added
-	#ifndef __E_CANVAS_UTILS__.
-
-	* e-util/Makefile.am: Added e-xml-utils.c and
-	e-xml-utils.h.
-
-	* e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some
-	xml utilities.
-
-	* e-util/e-util.h: Added type EFocus which describes which
-	direction the focus will be coming from.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* e-util/e-setup.c (e_setup_base_dir): Make ~/evolution mode 700
-	rather than mode 600 (and use the symbolic name rather than the
-	number).
-	
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/Makefile.am: Add canvas utilities to libeutil.
-
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
deleted file mode 100644
index fd9364ccd4..0000000000
--- a/e-util/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-SUBDIRS = . ename
-
-imagesdir = $(datadir)/images/evolution
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(UNICODE_CFLAGS)			\
-	$(PISOCK_INCLUDEDIR)			\
-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\
-	-DG_LOG_DOMAIN=\"e-utils\"
-
-noinst_LTLIBRARIES = libeutil.la libeutil-static.la \
-	libeconduit.la libeconduit-static.la
-
-libeutil_la_SOURCES =			\
-	e-corba-utils.c			\
-	e-corba-utils.h			\
-	e-dialog-widgets.c		\
-	e-dialog-widgets.h		\
-	e-gtk-utils.c			\
-	e-gtk-utils.h			\
-	e-gui-utils.c			\
-	e-gui-utils.h			\
-	e-html-utils.c			\
-	e-html-utils.h			\
-	e-iterator.c			\
-	e-iterator.h			\
-	e-list-iterator.c		\
-	e-list-iterator.h		\
-	e-list.c			\
-	e-list.h			\
-	e-memory.c			\
-	e-memory.h			\
-	e-msgport.c			\
-	e-msgport.h			\
-	e-path.c			\
-	e-path.h			\
-	e-sexp.c			\
-	e-sexp.h			\
-	e-dbhash.c			\
-	e-dbhash.h			\
-	md5-utils.c			\
-	md5-utils.h
-
-libeutil_la_LIBADD = $(UNICODE_LIBS)
-
-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
-libeutil_static_la_LDFLAGS = --all-static
-
-if ENABLE_PILOT_CONDUITS
-pl_needed = e-pilot-util.c e-pilot-util.h
-else
-pl_needed = 
-endif
-
-libeconduit_la_SOURCES =		\
-	e-pilot-map.c			\
-	e-pilot-map.h			\
-	$(pl_needed)
-
-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)
-libeconduit_static_la_LDFLAGS = --all-static
-
-
-
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
deleted file mode 100644
index 893a1f9dce..0000000000
--- a/e-util/e-corba-utils.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c
-* 
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Ettore Perazzoli <ettore@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-corba-utils.h"
-
-
-const CORBA_char *
-e_safe_corba_string (const char *s)
-{
-	if (s == NULL)
-		return (CORBA_char *) "";
-
-	return s;
-}
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
deleted file mode 100644
index 327026087a..0000000000
--- a/e-util/e-corba-utils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-corba-utils.h
- * 
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Ettore Perazzoli <ettore@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CORBA_UTILS_H
-#define E_CORBA_UTILS_H
-
-#include <glib.h>
-#include <orb/orbit.h>
-
-const CORBA_char *e_safe_corba_string (const char *s);
-
-#endif
diff --git a/e-util/e-dbhash.c b/e-util/e-dbhash.c
deleted file mode 100644
index e286500066..0000000000
--- a/e-util/e-dbhash.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   JP Rosevear (jpr@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <string.h>
-#include <fcntl.h>
-#ifdef HAVE_DB_185_H
-#include <db_185.h>
-#else
-#ifdef HAVE_DB1_DB_H
-#include <db1/db.h>
-#else
-#include <db.h>
-#endif
-#endif
-#include "md5-utils.h"
-#include "e-dbhash.h"
-
-struct _EDbHashPrivate 
-{
-	DB *db;
-};
-
-EDbHash *
-e_dbhash_new (const char *filename)
-{
-	EDbHash *edbh;
-	DB *db;
-
-	/* Attempt to open the database */
-	db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);
-	if (db == NULL) {
-		db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
-
-		if (db == NULL)
-			return NULL;
-	}
-	
-	edbh = g_new (EDbHash, 1);
-	edbh->priv = g_new (EDbHashPrivate, 1);
-	edbh->priv->db = db;
-	
-	return edbh;
-}
-
-static void
-string_to_dbt(const char *str, DBT *dbt)
-{
-	dbt->data = (void*)str;
-	dbt->size = strlen (str) + 1;
-}
-
-static void
-md5_to_dbt(const char str[16], DBT *dbt)
-{
-	dbt->data = (void*)str;
-	dbt->size = 16;
-}
-
-void 
-e_dbhash_add (EDbHash *edbh, const gchar *key, const gchar *data)
-{
-	DB *db;
-	DBT dkey;
-	DBT ddata;
-	guchar local_hash[16];
-
-	g_return_if_fail (edbh != NULL);
-	g_return_if_fail (edbh->priv != NULL);
-	g_return_if_fail (edbh->priv->db != NULL);
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (data != NULL);
-
-	db = edbh->priv->db;
-	
-	/* Key dbt */
-	string_to_dbt (key, &dkey);
-
-	/* Data dbt */
-	md5_get_digest (data, strlen (data), local_hash);
-	md5_to_dbt (local_hash, &ddata);
-
-	/* Add to database */
-	db->put (db, &dkey, &ddata, 0);
-}
-
-void 
-e_dbhash_remove (EDbHash *edbh, const char *key)
-{
-	DB *db;
-	DBT dkey;
-	
-	g_return_if_fail (edbh != NULL);
-	g_return_if_fail (edbh->priv != NULL);
-	g_return_if_fail (key != NULL);
-
-	db = edbh->priv->db;
-	
-	/* Key dbt */
-	string_to_dbt (key, &dkey);
-
-	/* Remove from database */
-	db->del (db, &dkey, 0);
-}
-
-void 
-e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc func, gpointer user_data)
-{
-	DB *db;
-	DBT dkey;
-	DBT ddata;
-	int db_error = 0;
-	
-	g_return_if_fail (edbh != NULL);
-	g_return_if_fail (edbh->priv != NULL);
-	g_return_if_fail (func != NULL);
-
-	db = edbh->priv->db;
-
-	db_error = db->seq(db, &dkey, &ddata, R_FIRST);
-
-	while (db_error == 0) {
-		(*func) ((const char *)dkey.data, user_data);
-
-		db_error = db->seq(db, &dkey, &ddata, R_NEXT);
-	}
-}
-
-EDbHashStatus
-e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data)
-{
-	DB *db;
-	DBT dkey;
-	DBT ddata;
-	guchar compare_hash[16];
-	
-	g_return_val_if_fail (edbh != NULL, FALSE);
-	g_return_val_if_fail (edbh->priv != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (compare_hash != NULL, FALSE);
-
-	db = edbh->priv->db;
-	
-	/* Key dbt */
-	string_to_dbt (key, &dkey);
-
-	/* Lookup in database */
-	memset (&ddata, 0, sizeof (DBT));
-	db->get (db, &dkey, &ddata, 0);
-	
-	/* Compare */
-	if (ddata.data) {
-		md5_get_digest (compare_data, strlen (compare_data), compare_hash);
-		
-		if (memcmp (ddata.data, compare_hash, sizeof (guchar) * 16))
-			return E_DBHASH_STATUS_DIFFERENT;
-	} else {
-		return E_DBHASH_STATUS_NOT_FOUND;
-	}
-	
-	return E_DBHASH_STATUS_SAME;
-}
-
-void
-e_dbhash_write (EDbHash *edbh)
-{
-	DB *db;
-	
-	g_return_if_fail (edbh != NULL);
-	g_return_if_fail (edbh->priv != NULL);
-
-	db = edbh->priv->db;
-	
-	/* Flush database to disk */
-	db->sync (db, 0);
-}
-
-void 
-e_dbhash_destroy (EDbHash *edbh)
-{
-	DB *db;
-	
-	g_return_if_fail (edbh != NULL);
-	g_return_if_fail (edbh->priv != NULL);
-
-	db = edbh->priv->db;
-	
-	/* Close datbase */
-	db->close (db);
-	
-	g_free (edbh->priv);
-	g_free (edbh);
-}
-
-
diff --git a/e-util/e-dbhash.h b/e-util/e-dbhash.h
deleted file mode 100644
index ac0b28d6a8..0000000000
--- a/e-util/e-dbhash.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Writes hashes that go to/from disk in db form. Hash keys are strings
- *
- * Author:
- *   JP Rosevear (jpr@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_DBHASH_H__
-#define __E_DBHASH_H__
-
-#include <glib.h>
-
-typedef enum {
-	E_DBHASH_STATUS_SAME,
-	E_DBHASH_STATUS_DIFFERENT,
-	E_DBHASH_STATUS_NOT_FOUND,
-} EDbHashStatus;
-
-typedef struct _EDbHash EDbHash;
-typedef struct _EDbHashPrivate EDbHashPrivate;
-
-struct _EDbHash
-{
-	EDbHashPrivate *priv;
-};
-
-typedef void (*EDbHashFunc) (const char *key, gpointer user_data);
-
-EDbHash *e_dbhash_new (const char *filename);
-
-void e_dbhash_add (EDbHash *edbh, const char *key, const char *data);
-void e_dbhash_remove (EDbHash *edbh, const char *key);
-
-EDbHashStatus e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data);
-void e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc func, gpointer user_data);
-
-void e_dbhash_write (EDbHash *edbh);
-
-void e_dbhash_destroy (EDbHash *edbh);
-
-#endif /* ! __E_DBHASH_H__ */
-
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
deleted file mode 100644
index 380bc0d3a8..0000000000
--- a/e-util/e-dialog-widgets.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 2000 Helix Code, 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 the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <libgnomeui/gnome-dateedit.h>
-#include "e-dialog-widgets.h"
-#include <gal/widgets/e-unicode.h>
-
-
-
-/* A widget, a pointer to the variable it will modify, and extra information */
-typedef struct {
-	GtkWidget *widget;
-	gpointer value_var;
-	gpointer info;
-} WidgetHook;
-
-/* Hook information for a complete dialog */
-typedef struct {
-	GSList *whooks;
-} DialogHooks;
-
-
-
-/* Destroy handler for the dialog; frees the dialog hooks */
-static void
-dialog_destroy_cb (GtkObject *dialog, gpointer data)
-{
-	DialogHooks *hooks;
-
-	hooks = data;
-
-	g_slist_free (hooks->whooks);
-	hooks->whooks = NULL;
-
-	g_free (hooks);
-	gtk_object_set_data (dialog, "dialog-hooks", NULL);
-}
-
-/* Ensures that the dialog has the necessary attached data to store the widget
- * hook information.
- */
-static DialogHooks *
-get_dialog_hooks (GtkWidget *dialog)
-{
-	DialogHooks *hooks;
-
-	hooks = gtk_object_get_data (GTK_OBJECT (dialog), "dialog-hooks");
-	if (!hooks) {
-		hooks = g_new0 (DialogHooks, 1);
-		gtk_object_set_data (GTK_OBJECT (dialog), "dialog-hooks", hooks);
-		gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-				    GTK_SIGNAL_FUNC (dialog_destroy_cb), hooks);
-	}
-
-	return hooks;
-}
-
-/* Converts an mapped value to the appropriate index in an item group.  The
- * values for the items are provided as a -1-terminated array.
- */
-static int
-value_to_index (const int *value_map, int value)
-{
-	int i;
-
-	for (i = 0; value_map[i] != -1; i++)
-		if (value_map[i] == value)
-			return i;
-
-	return -1;
-}
-
-/* Converts an index in an item group to the appropriate mapped value.  See the
- * function above.
- */
-static int
-index_to_value (const int *value_map, int index)
-{
-	int i;
-
-	/* We do this the hard way, i.e. not as a simple array reference, to
-	 * check for correctness.
-	 */
-
-	for (i = 0; value_map[i] != -1; i++)
-		if (i == index)
-			return value_map[i];
-
-	return -1;
-}
-
-/* Callback for the "toggled" signal of toggle buttons */
-static void
-toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-
-	/* For radio buttons, we only notify the property box if the button is
-	 * active, because we'll get one call for each of the changed buttons in
-	 * the radio group.
-	 */
-	if (!GTK_IS_RADIO_BUTTON (toggle) || toggle->active)
-		gnome_property_box_changed (pbox);
-}
-
-/* Hooks a radio button group */
-static void
-hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpointer info)
-{
-	GSList *group;
-	GSList *l;
-	int *value;
-	const int *value_map;
-
-	group = gtk_radio_button_group (radio);
-
-	/* Set the value */
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		for (l = group; l; l = l->next)
-			gtk_signal_connect (GTK_OBJECT (l->data), "toggled",
-					    GTK_SIGNAL_FUNC (toggled_cb), dialog);
-}
-
-/* Gets the value of a radio button group */
-static void
-get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	*value = e_dialog_radio_get (GTK_WIDGET (radio), value_map);
-}
-
-/* Callback for the "activate" signal of menu items */
-static void
-activate_cb (GtkMenuItem *item, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks an option menu */
-static void
-hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	/* Set the value */
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog)) {
-		GtkMenu *menu;
-		GList *l;
-
-		menu = GTK_MENU (gtk_option_menu_get_menu (omenu));
-
-		for (l = GTK_MENU_SHELL (menu)->children; l; l = l->next)
-			gtk_signal_connect (GTK_OBJECT (l->data), "activate",
-					    GTK_SIGNAL_FUNC (activate_cb), dialog);
-	}
-}
-
-/* Gets the value of an option menu */
-static void
-get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	*value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map);
-}
-
-/* Hooks a toggle button */
-static void
-hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info)
-{
-	gboolean *value;
-
-	/* Set the value */
-
-	value = (gboolean *) value_var;
-	e_dialog_toggle_set (GTK_WIDGET (toggle), *value);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
-				    GTK_SIGNAL_FUNC (toggled_cb), dialog);
-}
-
-/* Gets the value of a toggle button */
-static void
-get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info)
-{
-	gboolean *value;
-
-	value = (gboolean *) value_var;
-	*value = e_dialog_toggle_get (GTK_WIDGET (toggle));
-}
-
-/* Callback for the "value_changed" signal of the adjustment of a spin button */
-static void
-value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks a spin button */
-static void
-hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gpointer info)
-{
-	double *value;
-	GtkAdjustment *adj;
-
-	/* Set the value */
-
-	value = (double *) value_var;
-	e_dialog_spin_set (GTK_WIDGET (spin), *value);
-
-	/* Hook to changed */
-
-	adj = gtk_spin_button_get_adjustment (spin);
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-				    GTK_SIGNAL_FUNC (value_changed_cb), dialog);
-}
-
-/* Gets the value of a spin button */
-static void
-get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info)
-{
-	double *value;
-
-	value = (double *) value_var;
-	*value = e_dialog_spin_get_double (GTK_WIDGET (spin));
-}
-
-/* Callback for the "changed" signal of a GtkEditable widget */
-static void
-changed_cb (GtkEditable *editable, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks a GtkEditable widget */
-static void
-hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info)
-{
-	char **value;
-
-	/* Set the value */
-
-	value = (char **) value_var;
-
-	e_dialog_editable_set (GTK_WIDGET (editable), *value);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (editable), "changed",
-				    GTK_SIGNAL_FUNC (changed_cb), dialog);
-}
-
-/* Gets the value of a GtkEditable widget */
-static void
-get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)
-{
-	char **value;
-
-	value = (char **) value_var;
-	if (*value)
-		g_free (*value);
-
-	*value = e_dialog_editable_get (GTK_WIDGET (editable));
-}
-
-/**
- * e_dialog_editable_set:
- * @widget: A #GtkEditable widget.
- * @value: String value.
- * 
- * Sets the string value inside a #GtkEditable-derived widget.
- **/
-void
-e_dialog_editable_set (GtkWidget *widget, const char *value)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_EDITABLE (widget));
-
-	gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1);
-
-	if (value) {
-		gint pos;
-
-		pos = 0;
-		e_utf8_gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &pos);
-	}
-}
-
-/**
- * e_dialog_editable_get:
- * @widget: A #GtkEditable widget.
- * 
- * Queries the string value inside a #GtkEditable-derived widget.
- * 
- * Return value: String value.  You should free it when you are done with it.
- * This function can return NULL if the string could not be converted from
- * GTK+'s encoding into UTF8.
- **/
-char *
-e_dialog_editable_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL);
-
-	return e_utf8_gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
-}
-
-/**
- * e_dialog_radio_set:
- * @widget: A #GtkRadioButton in a radio button group.
- * @value: Enumerated value.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Sets the selected item in a radio group.  The specified @widget can be any of
- * the #GtkRadioButtons in the group.  Each radio button should correspond to an
- * enumeration value; the specified @value will be mapped to an integer from
- * zero to the number of items in the group minus 1 by using a mapping table
- * specified in @value_map.  The last element in this table should be -1.  Thus
- * a table to map three possible interpolation values to integers could be
- * specified as { NEAREST_NEIGHBOR, BILINEAR, HYPERBOLIC, -1 }.
- **/
-void
-e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)
-{
-	GSList *group;
-	int i;
-	GSList *l;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_RADIO_BUTTON (widget));
-	g_return_if_fail (value_map != NULL);
-
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));
-
-	i = value_to_index (value_map, value);
-	if (i != -1) {
-		/* Groups are built by prepending items, so the list ends up in reverse
-		 * order; we need to flip the index around.
-		 */
-		i = g_slist_length (group) - i - 1;
-
-		l = g_slist_nth (group, i);
-		if (!l)
-			g_message ("e_dialog_radio_set(): could not find index %d in radio group!",
-				   i);
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l->data), TRUE);
-	} else
-		g_message ("e_dialog_radio_set(): could not find value %d in value map!",
-			   value);
-}
-
-/**
- * e_dialog_radio_get:
- * @widget: A #GtkRadioButton in a radio button group.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Queries the selected item in a #GtkRadioButton group.  Please read the
- * description of e_dialog_radio_set() to see how @value_map maps enumeration
- * values to button indices.
- * 
- * Return value: Enumeration value which corresponds to the selected item in the
- * radio group.
- **/
-int
-e_dialog_radio_get (GtkWidget *widget, const int *value_map)
-{
-	GSList *group;
-	GSList *l;
-	int i;
-	int v;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1);
-	g_return_val_if_fail (value_map != NULL, -1);
-
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));
-
-	for (i = 0, l = group; l; l = l->next, i++) {
-		widget = GTK_WIDGET (l->data);
-
-		if (GTK_TOGGLE_BUTTON (widget)->active)
-			break;
-	}
-
-	if (!l)
-		g_assert_not_reached ();
-
-	/* Groups are built by prepending items, so the list ends up in reverse
-	 * order; we need to flip the index around.
-	 */
-	i = g_slist_length (group) - i - 1;
-
-	v = index_to_value (value_map, i);
-	if (v == -1) {
-		g_message ("e_dialog_radio_get(): could not find index %d in value map!", i);
-		return -1;
-	}
-
-	return v;
-}
-
-/**
- * e_dialog_toggle_set:
- * @widget: A #GtkToggleButton.
- * @value: Toggle value.
- * 
- * Sets the value of a #GtkToggleButton-derived widget.  This should not be used
- * for radio buttons; it is more convenient to use use e_dialog_radio_set()
- * instead.
- **/
-void
-e_dialog_toggle_set (GtkWidget *widget, gboolean value)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-}
-
-/**
- * e_dialog_toggle_get:
- * @widget: A #GtkToggleButton.
- * 
- * Queries the value of a #GtkToggleButton-derived widget.  This should not be
- * used for radio buttons; it is more convenient to use e_dialog_radio_get()
- * instead.
- * 
- * Return value: Toggle value.
- **/
-gboolean
-e_dialog_toggle_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE);
-
-	return GTK_TOGGLE_BUTTON (widget)->active;
-}
-
-/**
- * e_dialog_spin_set:
- * @widget: A #GtkSpinButton.
- * @value: Numeric value.
- * 
- * Sets the value of a #GtkSpinButton widget.
- **/
-void
-e_dialog_spin_set (GtkWidget *widget, double value)
-{
-	GtkAdjustment *adj;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-
-	adj->value = value;
-	gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
-}
-
-/**
- * e_dialog_spin_get_double:
- * @widget: A #GtkSpinButton.
- * 
- * Queries the floating-point value of a #GtkSpinButton widget.
- * 
- * Return value: Numeric value.
- **/
-double
-e_dialog_spin_get_double (GtkWidget *widget)
-{
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (widget != NULL, 0.0);
-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-	return adj->value;
-}
-
-/**
- * e_dialog_spin_get_int:
- * @widget: A #GtkSpinButton.
- * 
- * Queries the integer value of a #GtkSpinButton widget.
- * 
- * Return value: Numeric value.
- **/
-int
-e_dialog_spin_get_int (GtkWidget *widget)
-{
-	double value;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);
-
-	value = e_dialog_spin_get_double (widget);
-	return (int) floor (value);
-}
-
-/**
- * e_dialog_option_menu_set:
- * @widget: A #GtkOptionMenu.
- * @value: Enumerated value.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Sets the selected item in a #GtkOptionMenu.  Please read the description of
- * e_dialog_radio_set() to see how @value_map maps enumeration values to item
- * indices.
- **/
-void
-e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)
-{
-	int i;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-	g_return_if_fail (value_map != NULL);
-
-	i = value_to_index (value_map, value);
-
-	if (i != -1)
-		gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i);
-	else
-		g_message ("e_dialog_option_menu_set(): could not find value %d in value map!",
-			   value);
-}
-
-/**
- * e_dialog_option_menu_get:
- * @widget: A #GtkOptionMenu.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Queries the selected item in a #GtkOptionMenu.  Please read the description
- * of e_dialog_radio_set() to see how @value_map maps enumeration values to item
- * indices.
- * 
- * Return value: Enumeration value which corresponds to the selected item in the
- * option menu.
- **/
-int
-e_dialog_option_menu_get (GtkWidget *widget, const int *value_map)
-{
-	GtkMenu *menu;
-	GtkWidget *active;
-	GList *children;
-	GList *l;
-	int i;
-	int v;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1);
-	g_return_val_if_fail (value_map != NULL, -1);
-
-	menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)));
-
-	active = gtk_menu_get_active (menu);
-	g_assert (active != NULL);
-
-	children = GTK_MENU_SHELL (menu)->children;
-
-	for (i = 0, l = children; l; l = l->next, i++) {
-		if (GTK_WIDGET (l->data) == active)
-			break;
-	}
-
-	if (!l)
-		g_assert_not_reached ();
-
-	v = index_to_value (value_map, i);
-	if (v == -1) {
-		g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i);
-		return -1;
-	}
-
-	return v;
-}
-
-/**
- * e_dialog_dateedit_set:
- * @widget: A #GnomeDateEdit widget.
- * @t: Date/time value.
- * 
- * Sets the value of a #GnomeDateEdit widget.
- **/
-void
-e_dialog_dateedit_set (GtkWidget *widget, time_t t)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));
-
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);
-}
-
-/**
- * e_dialog_dateedit_get:
- * @widget: A #GnomeDateEdit widget.
- * 
- * Queries the value of a #GnomeDateEdit widget.
- * 
- * Return value: Date/time value.
- **/
-time_t
-e_dialog_dateedit_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);
-
-	return gnome_date_edit_get_date (GNOME_DATE_EDIT (widget));
-}
-
-/**
- * e_dialog_widget_hook_value:
- * @dialog: Dialog box in which the @widget lives in.
- * @widget: A widget that will control a variable.
- * @value_var: Pointer to the variable that the @widget will control.
- * @info: NULL for most widgets, or an integer value map array (see
- * e_dialog_radio_set() for details).
- * 
- * Hooks a widget from a dialog box to the variable it will modify.  Supported
- * widgets are:  #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see
- * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean),
- * #GtkSpinButton (double), #GtkOptionMenu (int/value_map pair), and
- * #GnomeDateEdit (time_t).
- *
- * A pointer to the appropriate variable to modify should be passed in @value_var.
- * For values that take a value_map array as well, it should be passed in @info.
- *
- * The widgets within a dialog that are hooked with this function will set their
- * respective variables only when e_dialog_get_values() is called.  The typical
- * use is to call that function in the handler for the "OK" button of a dialog
- * box.
- *
- * In addition, if the specified @dialog is a #GnomePropertyBox, the widgets wil
- * automatically turn on the "Apply" button of the property box when they are
- * modified by the user.
- * 
- * Return value: TRUE if the type of the specified @widget is supported, FALSE
- * otherwise.
- **/
-gboolean
-e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
-			    gpointer value_var, gpointer info)
-{
-	DialogHooks *hooks;
-	WidgetHook *wh;
-
-	g_return_val_if_fail (dialog != NULL, FALSE);
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (value_var != NULL, FALSE);
-
-	hooks = get_dialog_hooks (dialog);
-
-	/* First check if it is a "group" widget, like a radio button or an
-	 * option menu.  Then we check for normal ungrouped widgets.
-	 */
-
-	if (GTK_IS_RADIO_BUTTON (widget))
-		hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info);
-	else if (GTK_IS_OPTION_MENU (widget))
-		hook_option_menu (dialog, GTK_OPTION_MENU (widget), value_var, info);
-	else if (GTK_IS_TOGGLE_BUTTON (widget))
-		hook_toggle (dialog, GTK_TOGGLE_BUTTON (widget), value_var, info);
-	else if (GTK_IS_SPIN_BUTTON (widget))
-		hook_spin_button (dialog, GTK_SPIN_BUTTON (widget), value_var, info);
-	else if (GTK_IS_EDITABLE (widget))
-		hook_editable (dialog, GTK_EDITABLE (widget), value_var, info);
-	else
-		return FALSE;
-
-	wh = g_new (WidgetHook, 1);
-	wh->widget = widget;
-	wh->value_var = value_var;
-	wh->info = info;
-
-	hooks->whooks = g_slist_prepend (hooks->whooks, wh);
-
-	return TRUE;
-}
-
-/**
- * e_dialog_get_values:
- * @dialog: A dialog box whose widgets have been hooked to the appropriate
- * variables with e_dialog_widget_hook_value().
- * 
- * Makes every widget in a @dialog that was hooked with
- * e_dialog_widget_hook_value() apply its value to its corresponding variable.
- * The typical usage is to call this function in the handler for the "OK" button
- * of a dialog box.
- **/
-void
-e_dialog_get_values (GtkWidget *dialog)
-{
-	DialogHooks *hooks;
-	GSList *l;
-
-	g_return_if_fail (dialog != NULL);
-
-	hooks = get_dialog_hooks (dialog);
-
-	for (l = hooks->whooks; l; l = l->next) {
-		WidgetHook *wh;
-
-		wh = l->data;
-
-		if (GTK_IS_RADIO_BUTTON (wh->widget))
-			get_radio_value (GTK_RADIO_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_OPTION_MENU (wh->widget))
-			get_option_menu_value (GTK_OPTION_MENU (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_TOGGLE_BUTTON (wh->widget))
-			get_toggle_value (GTK_TOGGLE_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_SPIN_BUTTON (wh->widget))
-			get_spin_button_value (GTK_SPIN_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_EDITABLE (wh->widget))
-			get_editable_value (GTK_EDITABLE (wh->widget), wh->value_var, wh->info);
-		else
-			g_assert_not_reached ();
-	}
-}
-
-/**
- * e_dialog_xml_widget_hook_value:
- * @xml: Glade XML description of a dialog box.
- * @dialog: Dialog box in which the widget lives in.
- * @widget_name: Name of the widget in the Glade XML data.
- * @value_var: Pointer to the variable that the widget will control.
- * @info: NULL for most widgets, or an integer value map array (see
- * e_dialog_radio_set() for details).
- * 
- * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML
- * data structure.
- * 
- * Return value: TRUE if the type of the specified widget is supported, FALSE
- * otherwise.
- **/
-gboolean
-e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,
-				gpointer value_var, gpointer info)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (xml != NULL, FALSE);
-	g_return_val_if_fail (GLADE_IS_XML (xml), FALSE);
-	g_return_val_if_fail (dialog != NULL, FALSE);
-	g_return_val_if_fail (widget_name != NULL, FALSE);
-	g_return_val_if_fail (value_var != NULL, FALSE);
-
-	widget = glade_xml_get_widget (xml, widget_name);
-	if (!widget) {
-		g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in "
-			   "Glade data!", widget_name);
-		return FALSE;
-	}
-
-	return e_dialog_widget_hook_value (dialog, widget, value_var, info);
-}
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
deleted file mode 100644
index 7b20218fff..0000000000
--- a/e-util/e-dialog-widgets.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 2000 Helix Code, 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 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_DIALOG_WIDGETS_H
-#define E_DIALOG_WIDGETS_H
-
-#include <time.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-propertybox.h>
-
-
-
-void e_dialog_editable_set (GtkWidget *widget, const char *value);
-char *e_dialog_editable_get (GtkWidget *widget);
-
-void e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map);
-int e_dialog_radio_get (GtkWidget *widget, const int *value_map);
-
-void e_dialog_toggle_set (GtkWidget *widget, gboolean value);
-gboolean e_dialog_toggle_get (GtkWidget *widget);
-
-void e_dialog_spin_set (GtkWidget *widget, double value);
-double e_dialog_spin_get_double (GtkWidget *widget);
-int e_dialog_spin_get_int (GtkWidget *widget);
-
-void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map);
-int e_dialog_option_menu_get (GtkWidget *widget, const int *value_map);
-
-void e_dialog_dateedit_set (GtkWidget *widget, time_t t);
-time_t e_dialog_dateedit_get (GtkWidget *widget);
-
-gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
-				     gpointer value_var, gpointer info);
-
-void e_dialog_get_values (GtkWidget *dialog);
-
-gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,
-					 gpointer value_var, gpointer info);
-
-
-
-#endif
diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c
deleted file mode 100644
index c00ca4c8ef..0000000000
--- a/e-util/e-gtk-utils.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-gtk-utils.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-gtk-utils.h"
-
-
-/* (Cut and pasted from Gtk.)  */
-
-typedef struct DisconnectInfo {
-	unsigned int signal_handler;
-
-	GtkObject *object1;
-	unsigned int disconnect_handler1;
-
-	GtkObject *object2;
-	unsigned int disconnect_handler2;
-} DisconnectInfo;
-
-static unsigned int
-alive_disconnecter (GtkObject *object,
-		    DisconnectInfo *info)
-{
-	g_assert (info != NULL);
-
-	gtk_signal_disconnect (info->object1, info->disconnect_handler1);
-	gtk_signal_disconnect (info->object1, info->signal_handler);
-	gtk_signal_disconnect (info->object2, info->disconnect_handler2);
-	
-	g_free (info);
-	
-	return 0;
-}
-
-/**
- * e_gtk_signal_connect_full_while_alive:
- * @object: 
- * @name: 
- * @func: 
- * @marshal: 
- * @data: 
- * @destroy_func: 
- * @object_signal: 
- * @after: 
- * @alive_object: 
- * 
- * Connect a signal like `gtk_signal_connect_while_alive()', but with full
- * params like `gtk_signal_connect_full()'.
- **/
-void
-e_gtk_signal_connect_full_while_alive (GtkObject *object,
-				       const char *name,
-				       GtkSignalFunc func,
-				       GtkCallbackMarshal marshal,
-				       void *data,
-				       GtkDestroyNotify destroy_func,
-				       gboolean object_signal,
-				       gboolean after,
-				       GtkObject *alive_object)
-{
-	DisconnectInfo *info;
-	
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (func != NULL);
-	g_return_if_fail (GTK_IS_OBJECT (alive_object));
-	
-	info = g_new (DisconnectInfo, 1);
-
-	info->signal_handler = gtk_signal_connect_full (object, name,
-							func, marshal, data,
-							destroy_func,
-							object_signal, after);
-
-	info->object1 = object;
-	info->disconnect_handler1 = gtk_signal_connect (object, "destroy",
-							GTK_SIGNAL_FUNC (alive_disconnecter), info);
-
-	info->object2 = alive_object;
-	info->disconnect_handler2 = gtk_signal_connect (alive_object, "destroy",
-							GTK_SIGNAL_FUNC (alive_disconnecter), info);
-}
-
-/**
- * gtk_radio_button_get_nth_selected:
- * @button: A GtkRadioButton
- *
- * Returns an int indicating which button in the radio group is
- * toggled active.  NOTE: radio group item numbering starts at zero.
- **/
-int
-gtk_radio_button_get_nth_selected (GtkRadioButton *button)
-{
-	GSList *l;
-	int i, c;
-
-	g_return_val_if_fail (button != NULL, 0);
-	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (button), 0);
-	
-	c = g_slist_length (button->group);
-
-	for (i = 0, l = button->group; l; l = l->next, i++) {
-		GtkRadioButton *tmp = l->data;
-
-		if (GTK_TOGGLE_BUTTON (tmp)->active)
-			return c - i - 1;
-	}
-
-	return 0;
-}
-
-/**
- * gtk_radio_button_select_nth:
- * @button: A GtkRadioButton
- * @n: Which button to select from the group
- *
- * Select the Nth item of a radio group.  NOTE: radio group items
- * start numbering from zero
- **/
-void
-gtk_radio_button_select_nth (GtkRadioButton *button, int n)
-{
-	GSList *l;
-	int len;
-
-	g_return_if_fail (button != NULL);
-	g_return_if_fail (GTK_IS_RADIO_BUTTON (button));	
-		
-	len = g_slist_length (button->group);
-
-	if ((n <= len) && (n > 0)) {
-		l = g_slist_nth (button->group, len - n - 1);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l->data), TRUE);
-	}
-	       
-}
diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h
deleted file mode 100644
index 0bbee2910a..0000000000
--- a/e-util/e-gtk-utils.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-gtk-utils.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_GTK_UTILS_H
-#define E_GTK_UTILS_H
-
-#include <gtk/gtk.h>
-
-void  e_gtk_signal_connect_full_while_alive  (GtkObject          *object,
-					      const char         *name,
-					      GtkSignalFunc       func,
-					      GtkCallbackMarshal  marshal,
-					      void               *data,
-					      GtkDestroyNotify    destroy_func,
-					      gboolean            object_signal,
-					      gboolean            after,
-					      GtkObject          *alive_object);
-
-
-/* GtkRadioButton API extensions */
-void gtk_radio_button_select_nth       (GtkRadioButton *button, int n);
-int  gtk_radio_button_get_nth_selected (GtkRadioButton *button);
-
-#endif
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
deleted file mode 100644
index 3ce7110fff..0000000000
--- a/e-util/e-gui-utils.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GUI utility functions
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 1999 Miguel de Icaza
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gnome.h>
-#include "e-gui-utils.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-GtkWidget *e_create_image_widget(gchar *name,
-				 gchar *string1, gchar *string2,
-				 gint int1, gint int2)
-{
-	char *filename;
-	GdkPixbuf *pixbuf;
-	double width, height;
-	GtkWidget *canvas, *alignment;
-	if (string1) {
-		if (*string1 == '/')
-			filename = g_strdup(string1);
-		else
-			filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1);
-		pixbuf = gdk_pixbuf_new_from_file(filename);
-		width = gdk_pixbuf_get_width(pixbuf);
-		height = gdk_pixbuf_get_height(pixbuf);
-
-		canvas = gnome_canvas_new_aa();
-		GTK_OBJECT_UNSET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS);
-		gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(canvas)),
-				      gnome_canvas_pixbuf_get_type(),
-				      "pixbuf", pixbuf,
-				      NULL);
-
-		alignment = gtk_widget_new(gtk_alignment_get_type(),
-					   "child", canvas,
-					   "xalign", (double) 0,
-					   "yalign", (double) 0,
-					   "xscale", (double) 0,
-					   "yscale", (double) 0,
-					   NULL);
-	
-		gtk_widget_set_usize(canvas, width, height);
-
-		gdk_pixbuf_unref(pixbuf);
-
-		gtk_widget_show(canvas);
-		gtk_widget_show(alignment);
-		g_free(filename);
-
-		return alignment;
-	} else
-		return NULL;
-}
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
deleted file mode 100644
index 9cbb64fbf6..0000000000
--- a/e-util/e-gui-utils.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef E_GUI_UTILS_H
-#define E_GUI_UTILS_H
-
-#include <gtk/gtkwidget.h>
-
-GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
-
-#endif /* E_GUI_UTILS_H */
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
deleted file mode 100644
index e63b233676..0000000000
--- a/e-util/e-html-utils.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Dan Winship <danw@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-html-utils.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-#include <unicode.h>
-
-static char *
-check_size (char **buffer, int *buffer_size, char *out, int len)
-{
-	if (out + len > *buffer + *buffer_size) {
-		int index = out - *buffer;
-
-		*buffer_size *= 2;
-		*buffer = g_realloc (*buffer, *buffer_size);
-		out = *buffer + index;
-	}
-	return out;
-}
-
-static char *
-url_extract (const unsigned char **text, gboolean check)
-{
-	const unsigned char *end = *text, *p;
-	char *out;
-
-	while (*end && !isspace (*end) && (*end != '"') && (*end < 0x80))
-		end++;
-
-	/* Back up if we probably went too far. */
-	while (end > *text && strchr (",.!?;:>)", *(end - 1)))
-		end--;
-
-	if (check) {
-		/* Make sure we weren't fooled. */
-		p = memchr (*text, ':', end - *text);
-		if (!p || end - p < 3)
-			return NULL;
-	}
-
-	out = g_strndup (*text, end - *text);
-	*text = end;
-	return out;
-}
-
-/**
- * e_text_to_html:
- * @input: a NUL-terminated input buffer
- * @flags: some combination of the E_TEXT_TO_HTML_* flags defined
- * in e-html-utils.h
- *
- * This takes a buffer of text as input and produces a buffer of
- * "equivalent" HTML, subject to certain transformation rules.
- *
- * The set of possible flags is:
- *
- *   - E_TEXT_TO_HTML_PRE: wrap the output HTML in <PRE> and </PRE>.
- *     Should only be used if @input is the entire buffer to be
- *     converted. If e_text_to_html is being called with small pieces
- *     of data, you should wrap the entire result in <PRE> yourself.
- *
- *   - E_TEXT_TO_HTML_CONVERT_NL: convert "\n" to "<BR>\n" on output.
- *     (should not be used with E_TEXT_TO_HTML_PRE, since that would
- *     result in double-newlines).
- *
- *   - E_TEXT_TO_HTML_CONVERT_SPACES: convert a block of N spaces
- *     into N-1 non-breaking spaces and one normal space. A space
- *     at the start of the buffer is always converted to a
- *     non-breaking space, regardless of the following character,
- *     which probably means you don't want to use this flag on
- *     pieces of data that aren't delimited by at least line breaks.
- *
- *     If E_TEXT_TO_HTML_CONVERT_NL and E_TEXT_TO_HTML_CONVERT_SPACES
- *     are both defined, then TABs will also be converted to spaces.
- *
- *   - E_TEXT_TO_HTML_CONVERT_URLS: wrap <a href="..."> </a> around
- *     strings that look like URLs.
- **/
-char *
-e_text_to_html (const char *input, unsigned int flags)
-{
-	const unsigned char *cur = input;
-	char *buffer = NULL;
-	char *out = NULL;
-	int buffer_size = 0, col;
-
-	/* Allocate a translation buffer.  */
-	buffer_size = strlen (input) * 2 + 5;
-	buffer = g_malloc (buffer_size);
-
-	out = buffer;
-	if (flags & E_TEXT_TO_HTML_PRE)
-		out += sprintf (out, "<PRE>\n");
-
-	col = 0;
-
-	for (cur = input; cur && *cur; cur = unicode_next_utf8 (cur)) {
-		unicode_char_t u;
-
-		unicode_get_utf8 (cur, &u);
-		if (unicode_isalpha (u) &&
-		    (flags & E_TEXT_TO_HTML_CONVERT_URLS)) {
-			char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;
-
-			if (!strncasecmp (cur, "http://", 7) ||
-			    !strncasecmp (cur, "https://", 8) ||
-			    !strncasecmp (cur, "ftp://", 6) ||
-			    !strncasecmp (cur, "nntp://", 7) ||
-			    !strncasecmp (cur, "mailto:", 7) ||
-			    !strncasecmp (cur, "news:", 5)) {
-				tmpurl = url_extract (&cur, TRUE);
-				if (tmpurl) {
-					refurl = e_text_to_html (tmpurl, 0);
-					dispurl = g_strdup (refurl);
-				}
-			} else if (!strncasecmp (cur, "www.", 4) &&
-				   (*(cur + 4) < 0x80) &&
-				   unicode_isalnum (*(cur + 4))) {
-				tmpurl = url_extract (&cur, FALSE);
-				dispurl = e_text_to_html (tmpurl, 0);
-				refurl = g_strdup_printf ("http://%s",
-							  dispurl);
-			}
-
-			if (tmpurl) {
-				out = check_size (&buffer, &buffer_size, out,
-						  strlen (refurl) +
-						  strlen (dispurl) + 15);
-				out += sprintf (out,
-						"<a href=\"%s\">%s</a>",
-						refurl, dispurl);
-				col += strlen (tmpurl);
-				g_free (tmpurl);
-				g_free (refurl);
-				g_free (dispurl);
-			}
-
-			if (!*cur)
-				break;
-			unicode_get_utf8 (cur, &u);
-		}
-		if (u == (unicode_char_t)-1) {
-			/* Sigh. Someone sent undeclared 8-bit data.
-			 * Assume it's iso-8859-1.
-			 */
-			u = *cur;
-		}
-
-		out = check_size (&buffer, &buffer_size, out, 10);
-
-		switch (u) {
-		case '<':
-			strcpy (out, "&lt;");
-			out += 4;
-			col++;
-			break;
-
-		case '>':
-			strcpy (out, "&gt;");
-			out += 4;
-			col++;
-			break;
-
-		case '&':
-			strcpy (out, "&amp;");
-			out += 5;
-			col++;
-			break;
-
-		case '"':
-			strcpy (out, "&quot;");
-			out += 6;
-			col++;
-			break;
-
-		case '\n':
-			if (flags & E_TEXT_TO_HTML_CONVERT_NL) {
-				strcpy (out, "<br>");
-				out += 4;
-			}
-			*out++ = *cur;
-			col = 0;
-			break;
-
-		case '\t':
-			if (flags & (E_TEXT_TO_HTML_CONVERT_SPACES |
-				     E_TEXT_TO_HTML_CONVERT_NL)) {
-				do {
-					out = check_size (&buffer, &buffer_size,
-						    out, 7);
-					strcpy (out, "&nbsp;");
-					out += 6;
-					col++;
-				} while (col % 8);
-				break;
-			}
-			/* otherwise, FALL THROUGH */
-
-		case ' ':
-			if (flags & E_TEXT_TO_HTML_CONVERT_SPACES) {
-				if (cur == (const unsigned char *)input ||
-				    *(cur + 1) == ' ' || *(cur + 1) == '\t') {
-					strcpy (out, "&nbsp;");
-					out += 6;
-					col++;
-					break;
-				}
-			}
-			/* otherwise, FALL THROUGH */
-
-		default:
-			if ((u >= 0x20 && u < 0x80) ||
-			    (u == '\r' || u == '\t')) {
-				/* Default case, just copy. */
-				*out++ = u;
-			} else {
-				out += g_snprintf(out, 9, "&#%d;", u);
-			}
-			col++;
-			break;
-		}
-	}
-
-	out = check_size (&buffer, &buffer_size, out, 7);
-	if (flags & E_TEXT_TO_HTML_PRE)
-		strcpy (out, "</PRE>");
-	else
-		*out = '\0';
-
-	return buffer;
-}
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
deleted file mode 100644
index a56889f4d9..0000000000
--- a/e-util/e-html-utils.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c */
-/* 
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Dan Winship <danw@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_HTML_UTILS__
-#define __E_HTML_UTILS__
-
-#define E_TEXT_TO_HTML_PRE            (1 << 0)
-#define E_TEXT_TO_HTML_CONVERT_NL     (1 << 1)
-#define E_TEXT_TO_HTML_CONVERT_SPACES (1 << 2)
-#define E_TEXT_TO_HTML_CONVERT_URLS   (1 << 3)
-
-char *e_text_to_html (const char *input, unsigned int flags);
-
-#endif /* __E_HTML_UTILS__ */
diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h
deleted file mode 100644
index 58d3420be3..0000000000
--- a/e-util/e-i18n.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copied from gnome-i18nP.h, because this header is typically not installed
- *
- * This file has to be included before any file from the GNOME libraries
- * to have this override the definitions that are pulled from the gnome-i18n.h
- *
- * the difference is that gnome-i18n.h is used for applications, and this is
- * used by libraries (because libraries have to use dcgettext instead of
- * gettext and they need to provide the translation domain, unlike apps).
- *
- * So you can just put this after you include config.h
- */
-
-#ifndef __E_I18N_H__
-#define __E_I18N_H__
-
-#include <glib.h>
-#include "libgnome/gnome-defs.h"
-
-BEGIN_GNOME_DECLS
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    undef _
-#    define _(String) dgettext (PACKAGE, String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
-#endif
-
-/*
- * Do not remove the following define, nor do surround it with ifdefs.
- *
- * If you get any `redefined' errors, it means that you are including
- * -incorrectly- a header file provided by gnome-libs before this file.
- * To correctly solve this issue include this file before any libgnome/
- * libgnomeui headers
- */
-
-#define __GNOME_I18N_H__ 1
-
-
-/* This is copied staight out of the prototypes for gnome-i18n.h */
-const char *gnome_i18n_get_language(void);
-GList      *gnome_i18n_get_language_list (const gchar *category_name);
-void	   gnome_i18n_set_preferred_language (const char *val);
-const char *gnome_i18n_get_preferred_language (void);
-void gnome_i18n_init (void);
-
-END_GNOME_DECLS
-
-#endif /* __E_I18N_H__ */
diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c
deleted file mode 100644
index 874d05ccea..0000000000
--- a/e-util/e-iterator.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-iterator.h"
-
-#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
-
-static void e_iterator_init (EIterator *card);
-static void e_iterator_class_init (EIteratorClass *klass);
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-enum {
-	INVALIDATE,
-	LAST_SIGNAL
-};
-
-static guint e_iterator_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * e_iterator_get_type:
- * @void: 
- * 
- * Registers the &EIterator class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EIterator class.
- **/
-GtkType
-e_iterator_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EIterator",
-			sizeof (EIterator),
-			sizeof (EIteratorClass),
-			(GtkClassInitFunc) e_iterator_class_init,
-			(GtkObjectInitFunc) e_iterator_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_iterator_class_init (EIteratorClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_iterator_signals [INVALIDATE] =
-		gtk_signal_new ("invalidate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EIteratorClass, invalidate),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_iterator_signals, LAST_SIGNAL);
-
-	klass->invalidate = NULL;
-	klass->get        = NULL;
-	klass->reset      = NULL;
-	klass->last       = NULL;
-	klass->next       = NULL;
-	klass->prev       = NULL;
-	klass->delete     = NULL;
-	klass->insert     = NULL;
-	klass->set        = NULL;
-	klass->is_valid   = NULL;
-}
-
-/**
- * e_iterator_init:
- */
-static void
-e_iterator_init (EIterator *card)
-{
-}
-
-/*
- * Virtual functions: 
- */
-const void *
-e_iterator_get      (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->get)
-		return ECI_CLASS(iterator)->get(iterator);
-	else
-		return NULL;
-}
-
-void
-e_iterator_reset    (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->reset)
-		ECI_CLASS(iterator)->reset(iterator);
-}
-
-void
-e_iterator_last     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->last)
-		ECI_CLASS(iterator)->last(iterator);
-}
-
-gboolean
-e_iterator_next     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->next)
-		return ECI_CLASS(iterator)->next(iterator);
-	else
-		return FALSE;
-}
-
-gboolean
-e_iterator_prev     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->prev)
-		return ECI_CLASS(iterator)->prev(iterator);
-	else
-		return FALSE;
-}
-
-void
-e_iterator_delete   (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->delete)
-		ECI_CLASS(iterator)->delete(iterator);
-}
-
-void           e_iterator_insert     (EIterator  *iterator,
-				      const void *object,
-				      gboolean    before)
-{
-	if (ECI_CLASS(iterator)->insert)
-		ECI_CLASS(iterator)->insert(iterator, object, before);
-}
-
-void
-e_iterator_set      (EIterator *iterator,
-			  const void    *object)
-{
-	if (ECI_CLASS(iterator)->set)
-		ECI_CLASS(iterator)->set(iterator, object);
-}
-
-gboolean
-e_iterator_is_valid (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->is_valid)
-		return ECI_CLASS(iterator)->is_valid(iterator);
-	else
-		return FALSE;
-}
-
-void
-e_iterator_invalidate (EIterator *iterator)
-{
-	g_return_if_fail (iterator != NULL);
-	g_return_if_fail (E_IS_ITERATOR (iterator));
-
-	gtk_signal_emit (GTK_OBJECT (iterator),
-			 e_iterator_signals [INVALIDATE]);
-}
diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h
deleted file mode 100644
index 84a2db142b..0000000000
--- a/e-util/e-iterator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_ITERATOR_H__
-#define __E_ITERATOR_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-#define E_TYPE_ITERATOR            (e_iterator_get_type ())
-#define E_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))
-#define E_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))
-#define E_IS_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ITERATOR))
-#define E_IS_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))
-
-typedef struct _EIterator EIterator;
-typedef struct _EIteratorClass EIteratorClass;
-
-struct _EIterator {
-	GtkObject object;
-};
-
-struct _EIteratorClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void         (*invalidate) (EIterator  *iterator);
-	
-	/* Virtual functions */
-	const void * (*get)        (EIterator  *iterator);
-	void         (*reset)      (EIterator  *iterator);
-	void         (*last)       (EIterator  *iterator);
-	gboolean     (*next)       (EIterator  *iterator);
-	gboolean     (*prev)       (EIterator  *iterator);
-	void         (*delete)     (EIterator  *iterator);
-	void         (*insert)     (EIterator  *iterator,
-				    const void *object,
-				    gboolean   	before);
-	void         (*set)        (EIterator  *iterator,
-				    const void *object);
-	gboolean     (*is_valid)   (EIterator  *iterator);
-};
-
-const void    *e_iterator_get        (EIterator  *iterator);
-void           e_iterator_reset      (EIterator  *iterator);
-void           e_iterator_last       (EIterator  *iterator);
-gboolean       e_iterator_next       (EIterator  *iterator);
-gboolean       e_iterator_prev       (EIterator  *iterator);
-void           e_iterator_delete     (EIterator  *iterator);
-void           e_iterator_insert     (EIterator  *iterator,
-				      const void *object,
-				      gboolean    before);
-void           e_iterator_set        (EIterator  *iterator, 
-				      const void *object);
-gboolean       e_iterator_is_valid   (EIterator  *iterator);
-
-void           e_iterator_invalidate (EIterator  *iterator);
-
-/* Standard Gtk function */
-GtkType        e_iterator_get_type   (void);
-
-#endif /* ! __E_ITERATOR_H__ */
diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c
deleted file mode 100644
index d53a155cf8..0000000000
--- a/e-util/e-list-iterator.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-list-iterator.h"
-#include "e-list.h"
-
-static void        e_list_iterator_init       (EListIterator *list);
-static void        e_list_iterator_class_init (EListIteratorClass *klass);
-		   
-static void        e_list_iterator_invalidate (EIterator *iterator);
-static gboolean    e_list_iterator_is_valid   (EIterator *iterator);
-static void        e_list_iterator_set        (EIterator  *iterator,
-	           			       const void *object);
-static void        e_list_iterator_delete     (EIterator  *iterator);
-static void        e_list_iterator_insert     (EIterator  *iterator,
-		   			       const void *object,
-		   			       gboolean    before);
-static gboolean    e_list_iterator_prev       (EIterator  *iterator);
-static gboolean    e_list_iterator_next       (EIterator  *iterator);
-static void        e_list_iterator_reset      (EIterator *iterator);
-static void        e_list_iterator_last       (EIterator *iterator);
-static const void *e_list_iterator_get        (EIterator *iterator);
-static void        e_list_iterator_destroy    (GtkObject *object);
-
-#define PARENT_TYPE (e_iterator_get_type ())
-
-static GtkObjectClass *parent_class;
-#define PARENT_CLASS (E_ITERATOR_CLASS(parent_class))
-
-/**
- * e_list_iterator_get_type:
- * @void: 
- * 
- * Registers the &EListIterator class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EListIterator class.
- **/
-GtkType
-e_list_iterator_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EListIterator",
-			sizeof (EListIterator),
-			sizeof (EListIteratorClass),
-			(GtkClassInitFunc) e_list_iterator_class_init,
-			(GtkObjectInitFunc) e_list_iterator_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_list_iterator_class_init (EListIteratorClass *klass)
-{
-	GtkObjectClass *object_class;
-	EIteratorClass *iterator_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	iterator_class = E_ITERATOR_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = e_list_iterator_destroy;
-
-	iterator_class->invalidate = e_list_iterator_invalidate;
-	iterator_class->get        = e_list_iterator_get;
-	iterator_class->reset      = e_list_iterator_reset;
-	iterator_class->last       = e_list_iterator_last;
-	iterator_class->next       = e_list_iterator_next;
-	iterator_class->prev       = e_list_iterator_prev;
-	iterator_class->delete     = e_list_iterator_delete;
-	iterator_class->insert     = e_list_iterator_insert;
-	iterator_class->set        = e_list_iterator_set;
-	iterator_class->is_valid   = e_list_iterator_is_valid;
-}
-
-
-
-/**
- * e_list_iterator_init:
- */
-static void
-e_list_iterator_init (EListIterator *list)
-{
-}
-
-EIterator *
-e_list_iterator_new (EList *list)
-{
-	EListIterator *iterator = gtk_type_new(e_list_iterator_get_type());
-
-	iterator->list = list;
-	gtk_object_ref(GTK_OBJECT(list));
-	iterator->iterator = list->list;
-
-	return E_ITERATOR(iterator);
-}
-
-/*
- * Virtual functions: 
- */
-static void
-e_list_iterator_destroy (GtkObject *object)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(object);
-	e_list_remove_iterator(iterator->list, E_ITERATOR(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator->list));
-}
-
-static const void *
-e_list_iterator_get      (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		return iterator->iterator->data;
-	else
-		return NULL;
-}
-
-static void
-e_list_iterator_reset    (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = iterator->list->list;
-}
-
-static void
-e_list_iterator_last     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = g_list_last(iterator->list->list);
-}
-
-static gboolean
-e_list_iterator_next     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		iterator->iterator = g_list_next(iterator->iterator);
-	return (iterator->iterator != NULL);
-}
-
-static gboolean
-e_list_iterator_prev     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		iterator->iterator = g_list_previous(iterator->iterator);
-	return (iterator->iterator != NULL);
-}
-
-static void
-e_list_iterator_insert   (EIterator  *_iterator,
-			  const void *object,
-			  gboolean    before)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	void *data;
-	if (iterator->list->copy)
-		data = iterator->list->copy(object, iterator->list->closure);
-	else
-		data = (void *) object;
-	if (iterator->iterator) {
-		if (before) {
-			iterator->list->list = g_list_first(g_list_prepend(iterator->iterator, data));
-			iterator->iterator = iterator->iterator->prev;
-		} else {
-			if (iterator->iterator->next)
-				g_list_prepend(iterator->iterator->next, data);
-			else
-				g_list_append(iterator->iterator, data);
-			iterator->iterator = iterator->iterator->next;
-		}
-		e_list_invalidate_iterators(iterator->list, E_ITERATOR(iterator));
-	} else {
-		if (before) {
-			iterator->list->list = g_list_append(iterator->list->list, data);
-			iterator->iterator = g_list_last(iterator->list->list);
-		} else {
-			iterator->list->list = g_list_prepend(iterator->list->list, data);
-			iterator->iterator = iterator->list->list;
-		}
-		e_list_invalidate_iterators(iterator->list, E_ITERATOR(iterator));
-	}
-}
-
-static void
-e_list_iterator_delete   (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator) {
-		e_list_remove_link (iterator->list, iterator->iterator);
-	}
-}
-
-static void
-e_list_iterator_set      (EIterator  *_iterator,
-			  const void *object)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator) {
-		if (iterator->list->free)
-			iterator->list->free(iterator->iterator->data, iterator->list->closure);
-		if (iterator->list->copy)
-			iterator->iterator->data = iterator->list->copy(object, iterator->list->closure);
-		else
-			iterator->iterator->data = (void *) object;
-	}
-}
-
-static gboolean
-e_list_iterator_is_valid (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	return iterator->iterator != NULL;
-}
-
-static void
-e_list_iterator_invalidate (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = NULL;
-}
diff --git a/e-util/e-list-iterator.h b/e-util/e-list-iterator.h
deleted file mode 100644
index a2b7d82988..0000000000
--- a/e-util/e-list-iterator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_LIST_ITERATOR_H__
-#define __E_LIST_ITERATOR_H__
-
-typedef struct _EListIterator EListIterator;
-typedef struct _EListIteratorClass EListIteratorClass;
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-iterator.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())
-#define E_LIST_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST_ITERATOR, EListIterator))
-#define E_LIST_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST_ITERATOR, EListIteratorClass))
-#define E_IS_LIST_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST_ITERATOR))
-#define E_IS_LIST_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST_ITERATOR))
-
-struct _EListIterator {
-	EIterator      parent;
-
-	EList         *list;
-	GList         *iterator;
-};
-
-struct _EListIteratorClass {
-	EIteratorClass parent_class;
-};
-
-EIterator *e_list_iterator_new      (EList *list);
-
-/* Standard Gtk function */
-GtkType    e_list_iterator_get_type (void);
-
-#endif /* ! __E_LIST_ITERATOR_H__ */
diff --git a/e-util/e-list.c b/e-util/e-list.c
deleted file mode 100644
index 6fd0e559d5..0000000000
--- a/e-util/e-list.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-list.h"
-#include "e-list-iterator.h"
-
-#define ECL_CLASS(object) (E_LIST_CLASS(GTK_OBJECT((object))->klass))
-
-static void e_list_init (EList *list);
-static void e_list_class_init (EListClass *klass);
-static void e_list_destroy (GtkObject *object);
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-/**
- * e_list_get_type:
- * @void: 
- * 
- * Registers the &EList class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EList class.
- **/
-GtkType
-e_list_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EList",
-			sizeof (EList),
-			sizeof (EListClass),
-			(GtkClassInitFunc) e_list_class_init,
-			(GtkObjectInitFunc) e_list_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_list_class_init (EListClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = e_list_destroy;
-}
-
-/**
- * e_list_init:
- */
-static void
-e_list_init (EList *list)
-{
-	list->list = NULL;
-	list->iterators = NULL;
-}
-
-EList *
-e_list_new          (EListCopyFunc copy, EListFreeFunc free, void *closure)
-{
-	EList *list = gtk_type_new(e_list_get_type());
-	list->copy    = copy;
-	list->free    = free;
-	list->closure = closure;
-	return list;
-}
-
-EList *
-e_list_duplicate    (EList *old)
-{
-	EList *list = gtk_type_new(e_list_get_type());
-
-	list->copy    = old->copy;
-	list->free    = old->free;
-	list->closure = old->closure;
-	list->list    = g_list_copy(old->list);
-	if (list->copy) {
-		GList *listlist;
-		for (listlist = list->list; listlist; listlist = listlist->next) {
-			listlist->data = list->copy (listlist->data, list->closure);
-		}
-	}
-	return list;
-}
-
-EIterator *
-e_list_get_iterator (EList *list)
-{
-	EIterator *iterator = e_list_iterator_new(list);
-	list->iterators = g_list_append(list->iterators, iterator);
-	return iterator;
-}
-
-int
-e_list_length (EList *list)
-{
-	return g_list_length(list->list);
-}
-
-void
-e_list_append       (EList *list, const void *data)
-{
-	e_list_invalidate_iterators(list, NULL);
-	if (list->copy)
-		list->list = g_list_append(list->list, list->copy(data, list->closure));
-	else
-		list->list = g_list_append(list->list, (void *) data);
-}
-
-void
-e_list_invalidate_iterators (EList *list, EIterator *skip)
-{
-	GList *iterators = list->iterators;
-	for (; iterators; iterators = iterators->next) {
-		if (iterators->data != skip) {
-			e_iterator_invalidate(E_ITERATOR(iterators->data));
-		}
-	}
-}
-
-/* FIXME: This doesn't work properly if the iterator is the first
-   iterator in the list.  Well, the iterator doesn't continue on after
-   the next time next is called, at least. */
-void
-e_list_remove_link (EList *list, GList *link)
-{
-	GList *iterators = list->iterators;
-	for (; iterators; iterators = iterators->next) {
-		if (((EListIterator *)iterators->data)->iterator == link) {
-			e_iterator_prev(iterators->data);
-		}
-	}
-	if (list->free)
-		list->free(link->data, list->closure);
-	list->list = g_list_remove_link(list->list, link);
-	g_list_free_1(link);
-}
-
-void
-e_list_remove_iterator (EList *list, EIterator *iterator)
-{
-	list->iterators = g_list_remove(list->iterators, iterator);
-}
-
-/* 
- * Virtual functions 
- */
-static void
-e_list_destroy (GtkObject *object)
-{
-	EList *list = E_LIST(object);
-	g_list_foreach(list->list, (GFunc) list->free, list->closure);
-	g_list_free(list->list);
-}
-
diff --git a/e-util/e-list.h b/e-util/e-list.h
deleted file mode 100644
index 017f48d813..0000000000
--- a/e-util/e-list.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_LIST_H__
-#define __E_LIST_H__
-
-typedef struct _EList EList;
-typedef struct _EListClass EListClass;
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list-iterator.h>
-
-#define E_TYPE_LIST            (e_list_get_type ())
-#define E_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST, EList))
-#define E_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass))
-#define E_IS_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST))
-#define E_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST))
-
-typedef void *(*EListCopyFunc) (const void *data, void *closure);
-typedef void (*EListFreeFunc) (void *data, void *closure);
-
-struct _EList {
-	GtkObject      object;
-	GList         *list;
-	GList         *iterators;
-	EListCopyFunc  copy;
-	EListFreeFunc  free;
-	void          *closure;
-};
-
-struct _EListClass {
-	GtkObjectClass parent_class;
-};
-
-EList     *e_list_new                  (EListCopyFunc  copy, 
-					EListFreeFunc  free,
-					void          *closure);
-EList     *e_list_duplicate            (EList *list);
-EIterator *e_list_get_iterator         (EList         *list);
-void       e_list_append               (EList         *list,
-					const void    *data);
-int        e_list_length               (EList         *list);
-
-/* For iterators to call. */
-void       e_list_remove_link          (EList         *list, 
-					GList         *link);
-void       e_list_remove_iterator      (EList         *list,
-					EIterator     *iterator);
-void       e_list_invalidate_iterators (EList         *list,
-					EIterator     *skip);
-
-/* Standard Gtk function */
-GtkType    e_list_get_type             (void);
-
-#endif /* ! __E_LIST_H__ */
diff --git a/e-util/e-memory.c b/e-util/e-memory.c
deleted file mode 100644
index 2e505785f6..0000000000
--- a/e-util/e-memory.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * Copyright (c) 2000 Helix Code Inc.
- *
- * Author: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
-
-*/
-
-#include "e-memory.h"
-#include <glib.h>
-
-#define s(x)			/* strv debug */
-
-/*#define TIMEIT*/
-
-#ifdef TIMEIT
-#include <sys/time.h>
-#include <unistd.h>
-
-struct timeval timeit_start;
-
-static time_start(const char *desc)
-{
-	gettimeofday(&timeit_start, NULL);
-	printf("starting: %s\n", desc);
-}
-
-static time_end(const char *desc)
-{
-	unsigned long diff;
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= timeit_start.tv_sec * 1000 + timeit_start.tv_usec/1000;
-	printf("%s took %ld.%03ld seconds\n",
-	       desc, diff / 1000, diff % 1000);
-}
-#else
-#define time_start(x)
-#define time_end(x)
-#endif
-
-/* mempool class */
-
-#define STRUCT_ALIGN (4)
-
-typedef struct _MemChunkFreeNode {
-	struct _MemChunkFreeNode *next;
-	unsigned int atoms;
-} MemChunkFreeNode;
-
-typedef struct _EMemChunk {
-	unsigned int blocksize;	/* number of atoms in a block */
-	unsigned int atomsize;	/* size of each atom */
-	GPtrArray *blocks;	/* blocks of raw memory */
-	struct _MemChunkFreeNode *free;
-} MemChunk;
-
-/**
- * e_memchunk_new:
- * @atomcount: The number of atoms stored in a single malloc'd block of memory.
- * @atomsize: The size of each allocation.
- * 
- * Create a new memchunk header.  Memchunks are an efficient way to allocate
- * and deallocate identical sized blocks of memory quickly, and space efficiently.
- * 
- * e_memchunks are effectively the same as gmemchunks, only faster (much), and
- * they use less memory overhead for housekeeping.
- *
- * Return value: The new header.
- **/
-MemChunk *e_memchunk_new(int atomcount, int atomsize)
-{
-	MemChunk *m = g_malloc(sizeof(*m));
-
-	m->blocksize = atomcount;
-	m->atomsize = MAX(atomsize, sizeof(MemChunkFreeNode));
-	m->blocks = g_ptr_array_new();
-	m->free = NULL;
-
-	return m;
-}
-
-/**
- * memchunk_alloc:
- * @m: 
- * 
- * Allocate a new atom size block of memory from a memchunk.
- **/
-void *e_memchunk_alloc(MemChunk *m)
-{
-	char *b;
-	MemChunkFreeNode *f;
-	void *mem;
-
-	f = m->free;
-	if (f) {
-		f->atoms--;
-		if (f->atoms > 0) {
-			mem = ((char *)f) + (f->atoms*m->atomsize);
-		} else {
-			mem = f;
-			m->free = m->free->next;
-		}
-		return mem;
-	} else {
-		b = g_malloc(m->blocksize * m->atomsize);
-		g_ptr_array_add(m->blocks, b);
-		f = (MemChunkFreeNode *)&b[m->atomsize];
-		f->atoms = m->blocksize-1;
-		f->next = NULL;
-		m->free = f;
-		return b;
-	}
-}
-
-void *e_memchunk_alloc0(EMemChunk *m)
-{
-	void *mem;
-
-	mem = e_memchunk_alloc(m);
-	memset(mem, 0, m->atomsize);
-
-	return mem;
-}
-
-/**
- * e_memchunk_free:
- * @m: 
- * @mem: Address of atom to free.
- * 
- * Free a single atom back to the free pool of atoms in the given
- * memchunk.
- **/
-void
-e_memchunk_free(MemChunk *m, void *mem)
-{
-	MemChunkFreeNode *f;
-
-	/* put the location back in the free list.  If we knew if the preceeding or following
-	   cells were free, we could merge the free nodes, but it doesn't really add much */
-	f = mem;
-	f->next = m->free;
-	m->free = f;
-	f->atoms = 1;
-
-	/* we could store the free list sorted - we could then do the above, and also
-	   probably improve the locality of reference properties for the allocator */
-	/* and it would simplify some other algorithms at that, but slow this one down
-	   significantly */
-}
-
-/**
- * e_memchunk_empty:
- * @m: 
- * 
- * Clean out the memchunk buffers.  Marks all allocated memory as free blocks,
- * but does not give it back to the system.  Can be used if the memchunk
- * is to be used repeatedly.
- **/
-void
-e_memchunk_empty(MemChunk *m)
-{
-	int i;
-	MemChunkFreeNode *f, *h = NULL;
-
-	for (i=0;i<m->blocks->len;i++) {
-		f = (MemChunkFreeNode *)m->blocks->pdata[i];
-		f->atoms = m->blocksize;
-		f->next = h;
-		h = f;
-	}
-	m->free = h;
-}
-
-struct _cleaninfo {
-	struct _cleaninfo *next;
-	char *base;
-	int count;
-	int size;		/* just so tree_search has it, sigh */
-};
-
-static int tree_compare(struct _cleaninfo *a, struct _cleaninfo *b)
-{
-	if (a->base < b->base)
-		return -1;
-	else if (a->base > b->base)
-		return 1;
-	return 0;
-}
-
-static int tree_search(struct _cleaninfo *a, char *mem)
-{
-	if (a->base <= mem) {
-		if (mem < &a->base[a->size])
-			return 0;
-		return 1;
-	}
-	return -1;
-}
-
-/**
- * e_memchunk_clean:
- * @m: 
- * 
- * Scan all empty blocks and check for blocks which can be free'd 
- * back to the system.
- *
- * This routine may take a while to run if there are many allocated
- * memory blocks (if the total number of allocations is many times
- * greater than atomcount).
- **/
-void
-e_memchunk_clean(MemChunk *m)
-{
-	GTree *tree;
-	int i;
-	MemChunkFreeNode *f;
-	struct _cleaninfo *ci, *hi = NULL;
-
-	f = m->free;
-	if (m->blocks->len == 0 || f == NULL)
-		return;
-
-	/* first, setup the tree/list so we can map free block addresses to block addresses */
-	tree = g_tree_new((GCompareFunc)tree_compare);
-	for (i=0;i<m->blocks->len;i++) {
-		ci = alloca(sizeof(*ci));
-		ci->count = 0;
-		ci->base = m->blocks->pdata[i];
-		ci->size = m->blocksize * m->atomsize;
-		g_tree_insert(tree, ci, ci);
-		ci->next = hi;
-		hi = ci;
-	}
-
-	/* now, scan all free nodes, and count them in their tree node */
-	while (f) {
-		ci = g_tree_search(tree, (GSearchFunc)tree_search, f);
-		if (ci) {
-			ci->count += f->atoms;
-		} else {
-			g_warning("error, can't find free node in memory block\n");
-		}
-		f = f->next;
-	}
-
-	/* if any nodes are all free, free & unlink them */
-	ci = hi;
-	while (ci) {
-		if (ci->count == m->blocksize) {
-			g_ptr_array_remove_fast(m->blocks, ci->base);
-			g_free(ci->base);
-		}
-		ci = ci->next;
-	}
-
-	g_tree_destroy(tree);
-}
-
-/**
- * e_memchunk_destroy:
- * @m: 
- * 
- * Free the memchunk header, and all associated memory.
- **/
-void
-e_memchunk_destroy(MemChunk *m)
-{
-	int i;
-
-	if (m == NULL)
-		return;
-
-	for (i=0;i<m->blocks->len;i++)
-		g_free(m->blocks->pdata[i]);
-	g_ptr_array_free(m->blocks, TRUE);
-	g_free(m);
-}
-
-typedef struct _MemPoolNode {
-	struct _MemPoolNode *next;
-
-	int free;
-	char data[1];
-} MemPoolNode;
-
-typedef struct _MemPoolThresholdNode {
-	struct _MemPoolThresholdNode *next;
-	char data[1];
-} MemPoolThresholdNode;
-
-typedef struct _EMemPool {
-	int blocksize;
-	int threshold;
-	unsigned int align;
-	struct _MemPoolNode *blocks;
-	struct _MemPoolThresholdNode *threshold_blocks;
-} MemPool;
-
-/* a pool of mempool header blocks */
-static MemChunk *mempool_memchunk;
-#ifdef G_THREADS_ENABLED
-static GStaticMutex mempool_mutex = G_STATIC_MUTEX_INIT;
-#endif
-
-/**
- * e_mempool_new:
- * @blocksize: The base blocksize to use for all system alocations.
- * @threshold: If the allocation exceeds the threshold, then it is
- * allocated separately and stored in a separate list.
- * @flags: Alignment options: E_MEMPOOL_ALIGN_STRUCT uses native
- * struct alignment, E_MEMPOOL_ALIGN_WORD aligns to 16 bits (2 bytes),
- * and E_MEMPOOL_ALIGN_BYTE aligns to the nearest byte.  The default
- * is to align to native structures.
- * 
- * Create a new mempool header.  Mempools can be used to efficiently
- * allocate data which can then be freed as a whole.
- *
- * Mempools can also be used to efficiently allocate arbitrarily
- * aligned data (such as strings) without incurring the space overhead
- * of aligning each allocation (which is not required for strings).
- *
- * However, each allocation cannot be freed individually, only all
- * or nothing.
- * 
- * Return value: 
- **/
-MemPool *e_mempool_new(int blocksize, int threshold, EMemPoolFlags flags)
-{
-	MemPool *pool;
-
-#ifdef G_THREADS_ENABLED
-	g_static_mutex_lock(&mempool_mutex);
-#endif
-	if (mempool_memchunk == NULL) {
-		mempool_memchunk = e_memchunk_new(8, sizeof(MemPool));
-	}
-	pool = e_memchunk_alloc(mempool_memchunk);
-#ifdef G_THREADS_ENABLED
-	g_static_mutex_unlock(&mempool_mutex);
-#endif
-	if (threshold >= blocksize)
-		threshold = blocksize * 2 / 3;
-	pool->blocksize = blocksize;
-	pool->threshold = threshold;
-	pool->blocks = NULL;
-	pool->threshold_blocks = NULL;
-
-	switch (flags & E_MEMPOOL_ALIGN_MASK) {
-	case E_MEMPOOL_ALIGN_STRUCT:
-	default:
-		pool->align = STRUCT_ALIGN-1;
-		break;
-	case E_MEMPOOL_ALIGN_WORD:
-		pool->align = 2-1;
-		break;
-	case E_MEMPOOL_ALIGN_BYTE:
-		pool->align = 1-1;
-	}
-	return pool;
-}
-
-/**
- * e_mempool_alloc:
- * @pool: 
- * @size: 
- * 
- * Allocate a new data block in the mempool.  Size will
- * be rounded up to the mempool's alignment restrictions
- * before being used.
- **/
-void *e_mempool_alloc(MemPool *pool, register int size)
-{
-	size = (size + pool->align) & (~(pool->align));
-	if (size>=pool->threshold) {
-		MemPoolThresholdNode *n;
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + size);
-		n->next = pool->threshold_blocks;
-		pool->threshold_blocks = n;
-		return &n->data[0];
-	} else {
-		register MemPoolNode *n;
-
-		n = pool->blocks;
-		if (n && n->free >= size) {
-			n->free -= size;
-			return &n->data[n->free];
-		}
-
-		/* maybe we could do some sort of the free blocks based on size, but
-		   it doubt its worth it at all */
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + pool->blocksize);
-		n->next = pool->blocks;
-		pool->blocks = n;
-		n->free = pool->blocksize - size;
-		return &n->data[n->free];
-	}
-}
-
-char *e_mempool_strdup(EMemPool *pool, const char *str)
-{
-	char *out;
-
-	out = e_mempool_alloc(pool, strlen(str)+1);
-	strcpy(out, str);
-
-	return out;
-}
-
-/**
- * e_mempool_flush:
- * @pool: 
- * @freeall: Free all system allocated blocks as well.
- * 
- * Flush used memory and mark allocated blocks as free.
- *
- * If @freeall is #TRUE, then all allocated blocks are free'd
- * as well.  Otherwise only blocks above the threshold are
- * actually freed, and the others are simply marked as empty.
- **/
-void e_mempool_flush(MemPool *pool, int freeall)
-{
-	MemPoolThresholdNode *tn, *tw;
-	MemPoolNode *pw, *pn;
-
-	tw = pool->threshold_blocks;
-	while (tw) {
-		tn = tw->next;
-		g_free(tw);
-		tw = tn;
-	}
-	pool->threshold_blocks = NULL;
-
-	if (freeall) {
-		pw = pool->blocks;
-		while (pw) {
-			pn = pw->next;
-			g_free(pw);
-			pw = pn;
-		}
-		pool->blocks = NULL;
-	} else {
-		pw = pool->blocks;
-		while (pw) {
-			pw->free = pool->blocksize;
-			pw = pw->next;
-		}
-	}
-}
-
-/**
- * e_mempool_destroy:
- * @pool: 
- * 
- * Free all memory associated with a mempool.
- **/
-void e_mempool_destroy(MemPool *pool)
-{
-	if (pool) {
-		e_mempool_flush(pool, 1);
-		e_memchunk_free(mempool_memchunk, pool);
-	}
-}
-
-
-/*
-  string array classes
-*/
-
-#define STRV_UNPACKED ((unsigned char)(~0))
-
-struct _EStrv {
-	unsigned char length;	/* how many entries we have (or the token STRV_UNPACKED) */
-	char data[1];		/* data follows */
-};
-
-struct _s_strv_string {
-	char *string;		/* the string to output */
-	char *free;		/* a string to free, if we referenced it */
-};
-
-struct _e_strvunpacked {
-	unsigned char type;	/* we overload last to indicate this is unpacked */
-	MemPool *pool;		/* pool of memory for strings */
-	struct _EStrv *source;	/* if we were converted from a packed one, keep the source around for a while */
-	unsigned int length;
-	struct _s_strv_string strings[1]; /* the string array data follows */
-};
-
-/**
- * e_strv_new:
- * @size: The number of elements in the strv.  Currently this is limited
- * to 254 elements.
- * 
- * Create a new strv (string array) header.  strv's can be used to
- * create and work with arrays of strings that can then be compressed
- * into a space-efficient static structure.  This is useful
- * where a number of strings are to be stored for lookup, and not
- * generally edited afterwards.
- *
- * The size limit is currently 254 elements.  This will probably not
- * change as arrays of this size suffer significant performance
- * penalties when looking up strings with high indices.
- * 
- * Return value: 
- **/
-struct _EStrv *
-e_strv_new(int size)
-{
-	struct _e_strvunpacked *s;
-
-	g_assert(size<255);
-
-	s = g_malloc(sizeof(*s) + (size-1)*sizeof(s->strings[0]));
-	s(printf("new strv=%p, size = %d bytes\n", s, sizeof(*s) + (size-1)*sizeof(char *)));
-	s->type = STRV_UNPACKED;
-	s->pool = NULL;
-	s->length = size;
-	s->source = NULL;
-	memset(s->strings, 0, size*sizeof(s->strings[0]));
-
-	return (struct _EStrv *)s;
-}
-
-static struct _e_strvunpacked *
-strv_unpack(struct _EStrv *strv)
-{
-	struct _e_strvunpacked *s;
-	register char *p;
-	int i;
-
-	s(printf("unpacking\n"));
-
-	s = (struct _e_strvunpacked *)e_strv_new(strv->length);
-	p = strv->data;
-	for (i=0;i<s->length;i++) {
-		if (i>0)
-			while (*p++)
-				;
-		s->strings[i].string = p;
-	}
-	s->source = strv;
-	s->type = STRV_UNPACKED;
-
-	return s;
-}
-
-/**
- * e_strv_set_ref:
- * @strv: 
- * @index: 
- * @str: 
- * 
- * Set a string array element by reference.  The string
- * is not copied until the array is packed.
- * 
- * If @strv has been packed, then it is unpacked ready
- * for more inserts, and should be packed again once finished with.
- * The memory used by the original @strv is not freed until
- * the new strv is packed, or freed itself.
- *
- * Return value: A new EStrv if the strv has already
- * been packed, otherwise @strv.
- **/
-struct _EStrv *
-e_strv_set_ref(struct _EStrv *strv, int index, char *str)
-{
-	struct _e_strvunpacked *s;
-
-	s(printf("set ref %d '%s'\n ", index, str));
-
-	if (strv->length != STRV_UNPACKED)
-		s = strv_unpack(strv);
-	else
-		s = (struct _e_strvunpacked *)strv;
-
-	g_assert(index>=0 && index < s->length);
-
-	s->strings[index].string = str;
-
-	return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_set_ref_free:
- * @strv: 
- * @index: 
- * @str: 
- * 
- * Set a string by reference, similar to set_ref, but also
- * free the string when finished with it.  The string
- * is not copied until the strv is packed, and not at
- * all if the index is overwritten.
- * 
- * Return value: @strv if already unpacked, otherwise an packed
- * EStrv.
- **/
-struct _EStrv *
-e_strv_set_ref_free(struct _EStrv *strv, int index, char *str)
-{
-	struct _e_strvunpacked *s;
-
-	s(printf("set ref %d '%s'\n ", index, str));
-
-	if (strv->length != STRV_UNPACKED)
-		s = strv_unpack(strv);
-	else
-		s = (struct _e_strvunpacked *)strv;
-
-	g_assert(index>=0 && index < s->length);
-
-	s->strings[index].string = str;
-	if (s->strings[index].free)
-		g_free(s->strings[index].free);
-	s->strings[index].free = str;
-
-	return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_set:
- * @strv: 
- * @index: 
- * @str: 
- * 
- * Set a string array reference.  The string @str is copied
- * into the string array at location @index.
- * 
- * If @strv has been packed, then it is unpacked ready
- * for more inserts, and should be packed again once finished with.
- *
- * Return value: A new EStrv if the strv has already
- * been packed, otherwise @strv.
- **/
-struct _EStrv *
-e_strv_set(struct _EStrv *strv, int index, const char *str)
-{
-	struct _e_strvunpacked *s;
-
-	s(printf("set %d '%s'\n", index, str));
-
-	if (strv->length != STRV_UNPACKED)
-		s = strv_unpack(strv);
-	else
-		s = (struct _e_strvunpacked *)strv;
-
-	g_assert(index>=0 && index < s->length);
-
-	if (s->pool == NULL)
-		s->pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
-
-	s->strings[index].string = e_mempool_alloc(s->pool, strlen(str)+1);
-	strcpy(s->strings[index].string, str);
-
-	return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_pack:
- * @strv: 
- * 
- * Pack the @strv into a space efficient structure for later lookup.
- *
- * All strings are packed into a single allocated block, separated
- * by single \0 characters, together with a count byte.
- * 
- * Return value: 
- **/
-struct _EStrv *
-e_strv_pack(struct _EStrv *strv)
-{
-	struct _e_strvunpacked *s;
-	int len, i;
-	register char *src, *dst;
-
-	if (strv->length == STRV_UNPACKED) {
-		s = (struct _e_strvunpacked *)strv;
-
-		s(printf("packing string\n"));
-
-		len = 0;
-		for (i=0;i<s->length;i++)
-			len += s->strings[i].string?strlen(s->strings[i].string)+1:1;
-
-		strv = g_malloc(sizeof(*strv) + len);
-		s(printf("allocating strv=%p, size = %d\n", strv, sizeof(*strv)+len));
-		strv->length = s->length;
-		dst = strv->data;
-		for (i=0;i<s->length;i++) {
-			if ((src = s->strings[i].string)) {
-				while ((*dst++ = *src++))
-					;
-			} else {
-				*dst++ = 0;
-			}
-		}
-		e_strv_destroy((struct _EStrv *)s);
-	}
-	return strv;
-}
-
-/**
- * e_strv_get:
- * @strv: 
- * @index: 
- * 
- * Retrieve a string by index.  This function works
- * identically on both packed and unpacked strv's, although
- * may be much slower on a packed strv.
- * 
- * Return value: 
- **/
-char *
-e_strv_get(struct _EStrv *strv, int index)
-{
-	struct _e_strvunpacked *s;
-	char *p;
-
-	if (strv->length != STRV_UNPACKED) {
-		g_assert(index>=0 && index < strv->length);
-		p = strv->data;
-		while (index > 0) {
-			while (*p++ != 0)
-				;
-			index--;
-		}
-		return p;
-	} else {
-		s = (struct _e_strvunpacked *)strv;
-		g_assert(index>=0 && index < s->length);
-		return s->strings[index].string?s->strings[index].string:"";
-	}
-}
-
-/**
- * e_strv_destroy:
- * @strv: 
- * 
- * Free a strv and all associated memory.  Works on packed
- * or unpacked strv's.
- **/
-void
-e_strv_destroy(struct _EStrv *strv)
-{
-	struct _e_strvunpacked *s;
-	int i;
-
-	s(printf("freeing strv\n"));
-
-	if (strv->length == STRV_UNPACKED) {
-		s = (struct _e_strvunpacked *)strv;
-		if (s->pool)
-			e_mempool_destroy(s->pool);
-		if (s->source)
-			e_strv_destroy(s->source);
-		for (i=0;i<s->length;i++) {
-			if (s->strings[i].free)
-				g_free(s->strings[i].free);
-		}
-	}
-
-	s(printf("freeing strv=%p\n", strv));
-
-	g_free(strv);
-}
-
-#if 0
-
-#define CHUNK_SIZE (20)
-#define CHUNK_COUNT (32)
-
-#define s(x)
-
-main()
-{
-	int i;
-	MemChunk *mc;
-	void *mem, *last;
-	GMemChunk *gmc;
-	struct _EStrv *s;
-
-	s = strv_new(8);
-	s = strv_set(s, 1, "Testing 1");
-	s = strv_set(s, 2, "Testing 2");
-	s = strv_set(s, 3, "Testing 3");
-	s = strv_set(s, 4, "Testing 4");
-	s = strv_set(s, 5, "Testing 5");
-	s = strv_set(s, 6, "Testing 7");
-
-	for (i=0;i<8;i++) {
-		printf("s[%d] = %s\n", i, strv_get(s, i));
-	}
-
-	s(sleep(5));
-
-	printf("packing ...\n");
-	s = strv_pack(s);
-
-	for (i=0;i<8;i++) {
-		printf("s[%d] = %s\n", i, strv_get(s, i));
-	}
-
-	printf("setting ...\n");
-
-	s = strv_set_ref(s, 1, "Testing 1 x");
-
-	for (i=0;i<8;i++) {
-		printf("s[%d] = %s\n", i, strv_get(s, i));
-	}
-
-	printf("packing ...\n");
-	s = strv_pack(s);
-
-	for (i=0;i<8;i++) {
-		printf("s[%d] = %s\n", i, strv_get(s, i));
-	}
-
-	strv_free(s);
-
-#if 0
-	time_start("Using memchunks");
-	mc = memchunk_new(CHUNK_COUNT, CHUNK_SIZE);
-	for (i=0;i<1000000;i++) {
-		mem = memchunk_alloc(mc);
-		if ((i & 1) == 0)
-			memchunk_free(mc, mem);
-	}
-	s(sleep(10));
-	memchunk_destroy(mc);
-	time_end("allocating 1000000 memchunks, freeing 500k");
-
-	time_start("Using gmemchunks");
-	gmc = g_mem_chunk_new("memchunk", CHUNK_SIZE, CHUNK_SIZE*CHUNK_COUNT, G_ALLOC_AND_FREE);
-	for (i=0;i<1000000;i++) {
-		mem = g_mem_chunk_alloc(gmc);
-		if ((i & 1) == 0)
-			g_mem_chunk_free(gmc, mem);
-	}
-	s(sleep(10));
-	g_mem_chunk_destroy(gmc);
-	time_end("allocating 1000000 gmemchunks, freeing 500k");
-
-	time_start("Using memchunks");
-	mc = memchunk_new(CHUNK_COUNT, CHUNK_SIZE);
-	for (i=0;i<1000000;i++) {
-		mem = memchunk_alloc(mc);
-	}
-	s(sleep(10));
-	memchunk_destroy(mc);
-	time_end("allocating 1000000 memchunks");
-
-	time_start("Using gmemchunks");
-	gmc = g_mem_chunk_new("memchunk", CHUNK_SIZE, CHUNK_COUNT*CHUNK_SIZE, G_ALLOC_ONLY);
-	for (i=0;i<1000000;i++) {
-		mem = g_mem_chunk_alloc(gmc);
-	}
-	s(sleep(10));
-	g_mem_chunk_destroy(gmc);
-	time_end("allocating 1000000 gmemchunks");
-
-	time_start("Using malloc");
-	for (i=0;i<1000000;i++) {
-		malloc(CHUNK_SIZE);
-	}
-	time_end("allocating 1000000 malloc");
-#endif
-	
-}
-
-#endif
diff --git a/e-util/e-memory.h b/e-util/e-memory.h
deleted file mode 100644
index 911bb36b7a..0000000000
--- a/e-util/e-memory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2000, Helix Code Inc.
- *
- * Author: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _E_MEMORY_H
-#define _E_MEMORY_H
-
-/* memchunks - allocate/free fixed-size blocks of memory */
-/* this is like gmemchunk, only faster and less overhead (only 4 bytes for every atomcount allocations) */
-typedef struct _EMemChunk EMemChunk;
-
-EMemChunk *e_memchunk_new(int atomcount, int atomsize);
-void *e_memchunk_alloc(EMemChunk *m);
-void *e_memchunk_alloc0(EMemChunk *m);
-void e_memchunk_free(EMemChunk *m, void *mem);
-void e_memchunk_empty(EMemChunk *m);
-void e_memchunk_clean(EMemChunk *m);
-void e_memchunk_destroy(EMemChunk *m);
-
-/* mempools - allocate variable sized blocks of memory, and free as one */
-/* allocation is very fast, but cannot be freed individually */
-typedef struct _EMemPool EMemPool;
-typedef enum {
-	E_MEMPOOL_ALIGN_STRUCT = 0,	/* allocate to native structure alignment */
-	E_MEMPOOL_ALIGN_WORD = 1,	/* allocate to words - 16 bit alignment */
-	E_MEMPOOL_ALIGN_BYTE = 2,	/* allocate to bytes - 8 bit alignment */
-	E_MEMPOOL_ALIGN_MASK = 3, /* which bits determine the alignment information */
-} EMemPoolFlags;
-
-EMemPool *e_mempool_new(int blocksize, int threshold, EMemPoolFlags flags);
-void *e_mempool_alloc(EMemPool *pool, int size);
-char *e_mempool_strdup(EMemPool *pool, const char *str);
-void e_mempool_flush(EMemPool *pool, int freeall);
-void e_mempool_destroy(EMemPool *pool);
-
-/* strv's string arrays that can be efficiently modified and then compressed mainly for retrival */
-/* building is relatively fast, once compressed it takes the minimum amount of memory possible to store */
-typedef struct _EStrv EStrv;
-
-EStrv *e_strv_new(int size);
-EStrv *e_strv_set_ref(EStrv *strv, int index, char *str);
-EStrv *e_strv_set_ref_free(EStrv *strv, int index, char *str);
-EStrv *e_strv_set(EStrv *strv, int index, const char *str);
-EStrv *e_strv_pack(EStrv *strv);
-char *e_strv_get(EStrv *strv, int index);
-void e_strv_destroy(EStrv *strv);
-
-#endif /* ! _E_MEMORY_H */
diff --git a/e-util/e-msgport.c b/e-util/e-msgport.c
deleted file mode 100644
index eb6e07e24f..0000000000
--- a/e-util/e-msgport.c
+++ /dev/null
@@ -1,869 +0,0 @@
-
-
-#include <glib.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-
-#include <stdio.h>
-
-#include "e-msgport.h"
-
-#include <pthread.h>
-
-#define m(x)			/* msgport debug */
-#define t(x) 			/* thread debug */
-
-void e_dlist_init(EDList *v)
-{
-        v->head = (EDListNode *)&v->tail;
-        v->tail = 0;
-        v->tailpred = (EDListNode *)&v->head;
-}
-
-EDListNode *e_dlist_addhead(EDList *l, EDListNode *n)
-{
-        n->next = l->head;
-        n->prev = (EDListNode *)&l->head;
-        l->head->prev = n;
-        l->head = n;
-        return n;
-}
-
-EDListNode *e_dlist_addtail(EDList *l, EDListNode *n)
-{
-        n->next = (EDListNode *)&l->tail;
-        n->prev = l->tailpred;
-        l->tailpred->next = n;
-        l->tailpred = n;
-        return n;
-}
-
-EDListNode *e_dlist_remove(EDListNode *n)
-{
-        n->next->prev = n->prev;
-        n->prev->next = n->next;
-        return n;
-}
-
-EDListNode *e_dlist_remhead(EDList *l)
-{
-	EDListNode *n, *nn;
-
-	n = l->head;
-	nn = n->next;
-	if (nn) {
-		nn->prev = n->prev;
-		l->head = nn;
-		return n;
-	}
-	return NULL;
-}
-
-EDListNode *e_dlist_remtail(EDList *l)
-{
-	EDListNode *n, *np;
-
-	n = l->tailpred;
-	np = n->prev;
-	if (np) {
-		np->next = n->next;
-		l->tailpred = np;
-		return n;
-	}
-	return NULL;
-}
-
-int e_dlist_empty(EDList *l)
-{
-	return (l->head == (EDListNode *)&l->tail);
-}
-
-int e_dlist_length(EDList *l)
-{
-	EDListNode *n, *nn;
-	int count = 0;
-
-	n = l->head;
-	nn = n->next;
-	while (nn) {
-		count++;
-		n = nn;
-		nn = n->next;
-	}
-
-	return 0;
-}
-
-struct _EMsgPort {
-	EDList queue;
-	int condwait;		/* how many waiting in condwait */
-	union {
-		int pipe[2];
-		struct {
-			int read;
-			int write;
-		} fd;
-	} pipe;
-	/* @#@$#$ glib stuff */
-	GCond *cond;
-	GMutex *lock;
-};
-
-EMsgPort *e_msgport_new(void)
-{
-	EMsgPort *mp;
-
-	mp = g_malloc(sizeof(*mp));
-	e_dlist_init(&mp->queue);
-	mp->lock = g_mutex_new();
-	mp->cond = g_cond_new();
-	mp->pipe.fd.read = -1;
-	mp->pipe.fd.write = -1;
-	mp->condwait = 0;
-
-	return mp;
-}
-
-void e_msgport_destroy(EMsgPort *mp)
-{
-	g_mutex_free(mp->lock);
-	g_cond_free(mp->cond);
-	if (mp->pipe.fd.read != -1) {
-		close(mp->pipe.fd.read);
-		close(mp->pipe.fd.write);
-	}
-	g_free(mp);
-}
-
-/* get a fd that can be used to wait on the port asynchronously */
-int e_msgport_fd(EMsgPort *mp)
-{
-	int fd;
-
-	g_mutex_lock(mp->lock);
-	fd = mp->pipe.fd.read;
-	if (fd == -1) {
-		pipe(mp->pipe.pipe);
-		fd = mp->pipe.fd.read;
-	}
-	g_mutex_unlock(mp->lock);
-
-	return fd;
-}
-
-void e_msgport_put(EMsgPort *mp, EMsg *msg)
-{
-	m(printf("put:\n"));
-	g_mutex_lock(mp->lock);
-	e_dlist_addtail(&mp->queue, &msg->ln);
-	if (mp->condwait > 0) {
-		m(printf("put: condwait > 0, waking up\n"));
-		g_cond_signal(mp->cond);
-	}
-	if (mp->pipe.fd.write != -1) {
-		m(printf("put: have pipe, writing notification to it\n"));
-		write(mp->pipe.fd.write, "", 1);
-	}
-	g_mutex_unlock(mp->lock);
-	m(printf("put: done\n"));
-}
-
-static void
-msgport_cleanlock(void *data)
-{
-	EMsgPort *mp = data;
-
-	g_mutex_unlock(mp->lock);
-}
-
-EMsg *e_msgport_wait(EMsgPort *mp)
-{
-	EMsg *msg;
-
-	m(printf("wait:\n"));
-	g_mutex_lock(mp->lock);
-	while (e_dlist_empty(&mp->queue)) {
-		if (mp->pipe.fd.read == -1) {
-			m(printf("wait: waiting on condition\n"));
-			mp->condwait++;
-			/* if we are cancelled in the cond-wait, then we need to unlock our lock when we cleanup */
-			pthread_cleanup_push(msgport_cleanlock, mp);
-			g_cond_wait(mp->cond, mp->lock);
-			pthread_cleanup_pop(0);
-			m(printf("wait: got condition\n"));
-			mp->condwait--;
-		} else {
-			fd_set rfds;
-
-			m(printf("wait: waitng on pipe\n"));
-			FD_ZERO(&rfds);
-			FD_SET(mp->pipe.fd.read, &rfds);
-			g_mutex_unlock(mp->lock);
-			select(mp->pipe.fd.read+1, &rfds, NULL, NULL, NULL);
-			pthread_testcancel();
-			g_mutex_lock(mp->lock);
-			m(printf("wait: got pipe\n"));
-		}
-	}
-	msg = (EMsg *)mp->queue.head;
-	m(printf("wait: message = %p\n", msg));
-	g_mutex_unlock(mp->lock);
-	m(printf("wait: done\n"));
-	return msg;
-}
-
-EMsg *e_msgport_get(EMsgPort *mp)
-{
-	EMsg *msg;
-	char dummy[1];
-
-	g_mutex_lock(mp->lock);
-	msg = (EMsg *)e_dlist_remhead(&mp->queue);
-	if (msg && mp->pipe.fd.read != -1)
-		read(mp->pipe.fd.read, dummy, 1);
-	m(printf("get: message = %p\n", msg));
-	g_mutex_unlock(mp->lock);
-
-	return msg;
-}
-
-void e_msgport_reply(EMsg *msg)
-{
-	if (msg->reply_port) {
-		e_msgport_put(msg->reply_port, msg);
-	}
-	/* else lost? */
-}
-
-struct _thread_info {
-	pthread_t id;
-	int busy;
-};
-
-struct _EThread {
-	EMsgPort *server_port;
-	EMsgPort *reply_port;
-	pthread_mutex_t mutex;
-	e_thread_t type;
-	int queue_limit;
-
-	int waiting;		/* if we are waiting for a new message, count of waiting processes */
-	pthread_t id;		/* id of our running child thread */
-	GList *id_list;		/* if THREAD_NEW, then a list of our child threads in thread_info structs */
-
-	EThreadFunc destroy;
-	void *destroy_data;
-
-	EThreadFunc received;
-	void *received_data;
-
-	EThreadFunc lost;
-	void *lost_data;
-};
-
-#define E_THREAD_NONE ((pthread_t)~0)
-
-static void thread_destroy_msg(EThread *e, EMsg *m);
-
-static struct _thread_info *thread_find(EThread *e, pthread_t id)
-{
-	GList *node;
-	struct _thread_info *info;
-
-	node = e->id_list;
-	while (node) {
-		info = node->data;
-		if (info->id == id)
-			return info;
-		node = node->next;
-	}
-	return NULL;
-}
-
-#if 0
-static void thread_remove(EThread *e, pthread_t id)
-{
-	GList *node;
-	struct _thread_info *info;
-
-	node = e->id_list;
-	while (node) {
-		info = node->data;
-		if (info->id == id) {
-			e->id_list = g_list_remove(e->id_list, info);
-			g_free(info);
-		}
-		node = node->next;
-	}
-}
-#endif
-
-EThread *e_thread_new(e_thread_t type)
-{
-	EThread *e;
-
-	e = g_malloc0(sizeof(*e));
-	pthread_mutex_init(&e->mutex, 0);
-	e->type = type;
-	e->server_port = e_msgport_new();
-	e->id = E_THREAD_NONE;
-	e->queue_limit = INT_MAX;
-
-	return e;
-}
-
-/* close down the threads & resources etc */
-void e_thread_destroy(EThread *e)
-{
-	int tries = 0;
-	int busy = FALSE;
-	EMsg *msg;
-	struct _thread_info *info;
-
-	/* make sure we soak up all the messages first */
-	while ( (msg = e_msgport_get(e->server_port)) ) {
-		thread_destroy_msg(e, msg);
-	}
-
-	pthread_mutex_lock(&e->mutex);
-
-	switch(e->type) {
-	case E_THREAD_QUEUE:
-	case E_THREAD_DROP:
-		/* if we have a thread, 'kill' it */
-		while (e->id != E_THREAD_NONE && tries < 500) {
-			if (e->waiting > 0) {
-				pthread_t id = e->id;
-				e->id = E_THREAD_NONE;
-				pthread_mutex_unlock(&e->mutex);
-				if (pthread_cancel(id) == 0)
-					pthread_join(id, 0);
-				pthread_mutex_lock(&e->mutex);
-			} else {
-				(printf("thread still active, waiting for it to finish\n"));
-				pthread_mutex_unlock(&e->mutex);
-				sleep(1);
-				pthread_mutex_lock(&e->mutex);
-			}
-			tries++;
-		}
-		busy = e->id != E_THREAD_NONE;
-		break;
-	case E_THREAD_NEW:
-		while (e->id_list && tries < 500) {
-			info = e->id_list->data;
-			if (!info->busy) {
-				e->id_list = g_list_remove(e->id_list, info);
-				printf("cleaning up pool thread %d\n", info->id);
-				pthread_mutex_unlock(&e->mutex);
-				if (pthread_cancel(info->id) == 0)
-					pthread_join(info->id, 0);
-				pthread_mutex_lock(&e->mutex);
-				printf("cleaned up ok\n");
-				g_free(info);
-			} else {
-				(printf("thread(s) still active, waiting for it to finish\n"));
-				tries++;
-				pthread_mutex_unlock(&e->mutex);
-				sleep(1);
-				pthread_mutex_lock(&e->mutex);
-			}
-		}
-#if 0
-		while (g_list_length(e->id_list) && tries < 5) {
-			(printf("thread(s) still active, waiting for them to finish\n"));
-			pthread_mutex_unlock(&e->mutex);
-			sleep(1);
-			pthread_mutex_lock(&e->mutex);
-		}
-#endif
-		busy = g_list_length(e->id_list) != 0;
-		break;
-	}
-
-	pthread_mutex_unlock(&e->mutex);
-
-	/* and clean up, if we can */
-	if (busy) {
-		g_warning("threads were busy, leaked EThread");
-		return;
-	}
-
-	e_msgport_destroy(e->server_port);
-	g_free(e);
-}
-
-/* set the queue maximum depth, what happens when the queue
-   fills up depends on the queue type */
-void e_thread_set_queue_limit(EThread *e, int limit)
-{
-	e->queue_limit = limit;
-}
-
-/* set a msg destroy callback, this can not call any e_thread functions on @e */
-void e_thread_set_msg_destroy(EThread *e, EThreadFunc destroy, void *data)
-{
-	pthread_mutex_lock(&e->mutex);
-	e->destroy = destroy;
-	e->destroy_data = data;
-	pthread_mutex_unlock(&e->mutex);
-}
-
-/* set a message lost callback, called if any message is discarded */
-void e_thread_set_msg_lost(EThread *e, EThreadFunc lost, void *data)
-{
-	pthread_mutex_lock(&e->mutex);
-	e->lost = lost;
-	e->lost_data = lost;
-	pthread_mutex_unlock(&e->mutex);
-}
-
-/* set a reply port, if set, then send messages back once finished */
-void e_thread_set_reply_port(EThread *e, EMsgPort *reply_port)
-{
-	e->reply_port = reply_port;
-}
-
-/* set a received data callback */
-void e_thread_set_msg_received(EThread *e, EThreadFunc received, void *data)
-{
-	pthread_mutex_lock(&e->mutex);
-	e->received = received;
-	e->received_data = data;
-	pthread_mutex_unlock(&e->mutex);
-}
-
-static void
-thread_destroy_msg(EThread *e, EMsg *m)
-{
-	EThreadFunc func;
-	void *func_data;
-
-	/* we do this so we never get an incomplete/unmatched callback + data */
-	pthread_mutex_lock(&e->mutex);
-	func = e->destroy;
-	func_data = e->destroy_data;
-	pthread_mutex_unlock(&e->mutex);
-	
-	if (func)
-		func(e, m, func_data);
-}
-
-static void
-thread_received_msg(EThread *e, EMsg *m)
-{
-	EThreadFunc func;
-	void *func_data;
-
-	/* we do this so we never get an incomplete/unmatched callback + data */
-	pthread_mutex_lock(&e->mutex);
-	func = e->received;
-	func_data = e->received_data;
-	pthread_mutex_unlock(&e->mutex);
-	
-	if (func)
-		func(e, m, func_data);
-	else
-		g_warning("No processing callback for EThread, message unprocessed");
-}
-
-static void
-thread_lost_msg(EThread *e, EMsg *m)
-{
-	EThreadFunc func;
-	void *func_data;
-
-	/* we do this so we never get an incomplete/unmatched callback + data */
-	pthread_mutex_lock(&e->mutex);
-	func = e->lost;
-	func_data = e->lost_data;
-	pthread_mutex_unlock(&e->mutex);
-	
-	if (func)
-		func(e, m, func_data);
-}
-
-/* the actual thread dispatcher */
-static void *
-thread_dispatch(void *din)
-{
-	EThread *e = din;
-	EMsg *m;
-	struct _thread_info *info;
-
-	t(printf("dispatch thread started: %ld\n", pthread_self()));
-
-	while (1) {
-		pthread_mutex_lock(&e->mutex);
-		m = e_msgport_get(e->server_port);
-		if (m == NULL) {
-			/* nothing to do?  If we are a 'new' type thread, just quit.
-			   Otherwise, go into waiting (can be cancelled here) */
-			info = NULL;
-			switch (e->type) {
-			case E_THREAD_NEW:
-			case E_THREAD_QUEUE:
-			case E_THREAD_DROP:
-				info = thread_find(e, pthread_self());
-				if (info)
-					info->busy = FALSE;
-				e->waiting++;
-				pthread_mutex_unlock(&e->mutex);
-				e_msgport_wait(e->server_port);
-				pthread_mutex_lock(&e->mutex);
-				e->waiting--;
-				pthread_mutex_unlock(&e->mutex);
-				break;
-#if 0
-			case E_THREAD_NEW:
-				e->id_list = g_list_remove(e->id_list, (void *)pthread_self());
-				pthread_mutex_unlock(&e->mutex);
-				return 0;
-#endif
-			}
-
-			continue;
-		} else {
-			info = thread_find(e, pthread_self());
-			if (info)
-				info->busy = TRUE;
-		}
-		pthread_mutex_unlock(&e->mutex);
-
-		t(printf("got message in dispatch thread\n"));
-
-		/* process it */
-		thread_received_msg(e, m);
-
-		/* if we have a reply port, send it back, otherwise, lose it */
-		if (m->reply_port) {
-			e_msgport_reply(m);
-		} else {
-			thread_destroy_msg(e, m);
-		}
-	}
-
-	/* if we run out of things to process we could conceivably 'hang around' for a bit,
-	   but to do this we need to use the fd interface of the msgport, and its utility
-	   is probably debatable anyway */
-
-#if 0
-	/* signify we are no longer running */
-	/* This code isn't used yet, but would be if we ever had a 'quit now' message implemented */
-	pthread_mutex_lock(&e->mutex);
-	switch (e->type) {
-	case E_THREAD_QUEUE:
-	case E_THREAD_DROP:
-		e->id = E_THREAD_NONE;
-		break;
-	case E_THREAD_NEW:
-		e->id_list = g_list_remove(e->id_list, (void *)pthread_self());
-		break;
-	}
-	pthread_mutex_unlock(&e->mutex);
-#endif
-
-	return 0;
-}
-
-/* send a message to the thread, start thread if necessary */
-void e_thread_put(EThread *e, EMsg *msg)
-{
-	pthread_t id;
-	EMsg *dmsg = NULL;
-
-	pthread_mutex_lock(&e->mutex);
-
-	/* the caller forgot to tell us what to do, well, we can't do anything can we */
-	if (e->received == NULL) {
-		pthread_mutex_unlock(&e->mutex);
-		g_warning("EThread called with no receiver function, no work to do!");
-		thread_destroy_msg(e, msg);
-		return;
-	}
-
-	msg->reply_port = e->reply_port;
-
-	switch(e->type) {
-	case E_THREAD_QUEUE:
-		/* if the queue is full, lose this new addition */
-		if (e_dlist_length(&e->server_port->queue) < e->queue_limit) {
-			e_msgport_put(e->server_port, msg);
-		} else {
-			printf("queue limit reached, dropping new message\n");
-			dmsg = msg;
-		}
-		break;
-	case E_THREAD_DROP:
-		/* if the queue is full, lose the oldest (unprocessed) message */
-		if (e_dlist_length(&e->server_port->queue) < e->queue_limit) {
-			e_msgport_put(e->server_port, msg);
-		} else {
-			printf("queue limit reached, dropping old message\n");
-			e_msgport_put(e->server_port, msg);
-			dmsg = e_msgport_get(e->server_port);
-		}
-		break;
-	case E_THREAD_NEW:
-		/* it is possible that an existing thread can catch this message, so
-		   we might create a thread with no work to do.
-		   but that doesn't matter, the other alternative that it be lost is worse */
-		e_msgport_put(e->server_port, msg);
-		if (e->waiting == 0
-		    && g_list_length(e->id_list) < e->queue_limit
-		    && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
-			struct _thread_info *info = g_malloc0(sizeof(*info));
-			t(printf("created NEW thread %ld\n", id));
-			info->id = id;
-			info->busy = TRUE;
-			e->id_list = g_list_append(e->id_list, info);
-		}
-		pthread_mutex_unlock(&e->mutex);
-		return;
-	}
-
-	/* create the thread, if there is none to receive it yet */
-	if (e->id == E_THREAD_NONE) {
-		if (pthread_create(&e->id, NULL, thread_dispatch, e) == -1) {
-			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(errno));
-			e->id = E_THREAD_NONE;
-		}
-	}
-
-	pthread_mutex_unlock(&e->mutex);
-
-	if (dmsg) {
-		thread_lost_msg(e, dmsg);
-		thread_destroy_msg(e, dmsg);
-	}
-}
-
-/* yet-another-mutex interface */
-struct _EMutex {
-	int type;
-	pthread_t owner;
-	short waiters;
-	short depth;
-	pthread_mutex_t mutex;
-	pthread_cond_t cond;
-};
-
-/* sigh, this is just painful to have to need, but recursive
-   read/write, etc mutexes just aren't very common in thread
-   implementations */
-/* TODO: Just make it use recursive mutexes if they are available */
-EMutex *e_mutex_new(e_mutex_t type)
-{
-	struct _EMutex *m;
-
-	m = g_malloc(sizeof(*m));
-	m->type = type;
-	m->waiters = 0;
-	m->depth = 0;
-	m->owner = E_THREAD_NONE;
-
-	switch (type) {
-	case E_MUTEX_SIMPLE:
-		pthread_mutex_init(&m->mutex, 0);
-		break;
-	case E_MUTEX_REC:
-		pthread_mutex_init(&m->mutex, 0);
-		pthread_cond_init(&m->cond, 0);
-		break;
-		/* read / write ?  flags for same? */
-	}
-
-	return m;
-}
-
-int e_mutex_destroy(EMutex *m)
-{
-	int ret = 0;
-
-	switch (m->type) {
-	case E_MUTEX_SIMPLE:
-		ret = pthread_mutex_destroy(&m->mutex);
-		if (ret == -1)
-			g_warning("EMutex destroy failed: %s", strerror(errno));
-		g_free(m);
-		break;
-	case E_MUTEX_REC:
-		ret = pthread_mutex_destroy(&m->mutex);
-		if (ret == -1)
-			g_warning("EMutex destroy failed: %s", strerror(errno));
-		ret = pthread_cond_destroy(&m->cond);
-		if (ret == -1)
-			g_warning("EMutex destroy failed: %s", strerror(errno));
-		g_free(m);
-
-	}
-	return ret;
-}
-
-int e_mutex_lock(EMutex *m)
-{
-	pthread_t id;
-
-	switch (m->type) {
-	case E_MUTEX_SIMPLE:
-		return pthread_mutex_lock(&m->mutex);
-	case E_MUTEX_REC:
-		id = pthread_self();
-		if (pthread_mutex_lock(&m->mutex) == -1)
-			return -1;
-		while (1) {
-			if (m->owner == E_THREAD_NONE) {
-				m->owner = id;
-				m->depth = 1;
-				break;
-			} else if (id == m->owner) {
-				m->depth++;
-				break;
-			} else {
-				m->waiters++;
-				if (pthread_cond_wait(&m->cond, &m->mutex) == -1)
-					return -1;
-				m->waiters--;
-			}
-		}
-		return pthread_mutex_unlock(&m->mutex);
-	}
-
-	errno = EINVAL;
-	return -1;
-}
-
-int e_mutex_unlock(EMutex *m)
-{
-	switch (m->type) {
-	case E_MUTEX_SIMPLE:
-		return pthread_mutex_unlock(&m->mutex);
-	case E_MUTEX_REC:
-		if (pthread_mutex_lock(&m->mutex) == -1)
-			return -1;
-		g_assert(m->owner == pthread_self());
-
-		m->depth--;
-		if (m->depth == 0) {
-			m->owner = E_THREAD_NONE;
-			if (m->waiters > 0)
-				pthread_cond_signal(&m->cond);
-		}
-		return pthread_mutex_unlock(&m->mutex);
-	}
-
-	errno = EINVAL;
-	return -1;
-}
-
-#ifdef STANDALONE
-EMsgPort *server_port;
-
-
-void *fdserver(void *data)
-{
-	int fd;
-	EMsg *msg;
-	int id = (int)data;
-	fd_set rfds;
-
-	fd = e_msgport_fd(server_port);
-
-	while (1) {
-		int count = 0;
-
-		printf("server %d: waiting on fd %d\n", id, fd);
-		FD_ZERO(&rfds);
-		FD_SET(fd, &rfds);
-		select(fd+1, &rfds, NULL, NULL, NULL);
-		printf("server %d: Got async notification, checking for messages\n", id);
-		while ((msg = e_msgport_get(server_port))) {
-			printf("server %d: got message\n", id);
-			sleep(1);
-			printf("server %d: replying\n", id);
-			e_msgport_reply(msg);
-			count++;
-		}
-		printf("server %d: got %d messages\n", id, count);
-	}
-}
-
-void *server(void *data)
-{
-	EMsg *msg;
-	int id = (int)data;
-
-	while (1) {
-		printf("server %d: waiting\n", id);
-		msg = e_msgport_wait(server_port);
-		msg = e_msgport_get(server_port);
-		if (msg) {
-			printf("server %d: got message\n", id);
-			sleep(1);
-			printf("server %d: replying\n", id);
-			e_msgport_reply(msg);
-		} else {
-			printf("server %d: didn't get message\n", id);
-		}
-	}
-}
-
-void *client(void *data)
-{
-	EMsg *msg;
-	EMsgPort *replyport;
-	int i;
-
-	replyport = e_msgport_new();
-	msg = g_malloc0(sizeof(*msg));
-	msg->reply_port = replyport;
-	for (i=0;i<10;i++) {
-		/* synchronous operation */
-		printf("client: sending\n");
-		e_msgport_put(server_port, msg);
-		printf("client: waiting for reply\n");
-		e_msgport_wait(replyport);
-		e_msgport_get(replyport);
-		printf("client: got reply\n");
-	}
-
-	printf("client: sleeping ...\n");
-	sleep(2);
-	printf("client: sending multiple\n");
-
-	for (i=0;i<10;i++) {
-		msg = g_malloc0(sizeof(*msg));
-		msg->reply_port = replyport;
-		e_msgport_put(server_port, msg);
-	}
-
-	printf("client: receiving multiple\n");
-	for (i=0;i<10;i++) {
-		e_msgport_wait(replyport);
-		msg = e_msgport_get(replyport);
-		g_free(msg);
-	}
-
-	printf("client: done\n");
-}
-
-int main(int argc, char **argv)
-{
-	pthread_t serverid, clientid;
-
-	g_thread_init(NULL);
-
-	server_port = e_msgport_new();
-
-	/*pthread_create(&serverid, NULL, server, (void *)1);*/
-	pthread_create(&serverid, NULL, fdserver, (void *)1);
-	pthread_create(&clientid, NULL, client, NULL);
-
-	sleep(60);
-
-	return 0;
-}
-#endif
diff --git a/e-util/e-msgport.h b/e-util/e-msgport.h
deleted file mode 100644
index 6e25235bbd..0000000000
--- a/e-util/e-msgport.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-#ifndef _E_MSGPORT_H
-#define _E_MSGPORT_H
-
-/* double-linked list yeah another one, deal */
-typedef struct _EDListNode {
-	struct _EDListNode *next;
-	struct _EDListNode *prev;
-} EDListNode;
-
-typedef struct _EDList {
-	struct _EDListNode *head;
-	struct _EDListNode *tail;
-	struct _EDListNode *tailpred;
-} EDList;
-
-#define E_DLIST_INITIALISER(l) { (EDListNode *)&l.tail, 0, (EDListNode *)&l.head }
-
-void e_dlist_init(EDList *v);
-EDListNode *e_dlist_addhead(EDList *l, EDListNode *n);
-EDListNode *e_dlist_addtail(EDList *l, EDListNode *n);
-EDListNode *e_dlist_remove(EDListNode *n);
-EDListNode *e_dlist_remhead(EDList *l);
-EDListNode *e_dlist_remtail(EDList *l);
-int e_dlist_empty(EDList *l);
-int e_dlist_length(EDList *l);
-
-/* message ports - a simple inter-thread 'ipc' primitive */
-/* opaque handle */
-typedef struct _EMsgPort EMsgPort;
-
-/* header for any message */
-typedef struct _EMsg {
-	EDListNode ln;
-	EMsgPort *reply_port;
-} EMsg;
-
-EMsgPort *e_msgport_new(void);
-void e_msgport_destroy(EMsgPort *mp);
-/* get a fd that can be used to wait on the port asynchronously */
-int e_msgport_fd(EMsgPort *mp);
-void e_msgport_put(EMsgPort *mp, EMsg *msg);
-EMsg *e_msgport_wait(EMsgPort *mp);
-EMsg *e_msgport_get(EMsgPort *mp);
-void e_msgport_reply(EMsg *msg);
-
-/* e threads, a server thread with a message based request-response, and flexible queuing */
-typedef struct _EThread EThread;
-
-typedef enum {
-	E_THREAD_QUEUE = 0,	/* run one by one, until done, if the queue_limit is reached, discard new request */
-	E_THREAD_DROP,		/* run one by one, until done, if the queue_limit is reached, discard oldest requests */
-	E_THREAD_NEW,		/* always run in a new thread, if the queue limit is reached, new requests are
-				   stored in the queue until a thread becomes available for it, creating a thread pool */
-} e_thread_t;
-
-typedef void (*EThreadFunc)(EThread *, EMsg *, void *data);
-
-EThread *e_thread_new(e_thread_t type);
-void e_thread_destroy(EThread *e);
-void e_thread_set_queue_limit(EThread *e, int limit);
-void e_thread_set_msg_lost(EThread *e, EThreadFunc destroy, void *data);
-void e_thread_set_msg_destroy(EThread *e, EThreadFunc destroy, void *data);
-void e_thread_set_reply_port(EThread *e, EMsgPort *reply_port);
-void e_thread_set_msg_received(EThread *e, EThreadFunc received, void *data);
-void e_thread_put(EThread *e, EMsg *msg);
-
-/* sigh, another mutex interface, this one allows different mutex types, portably */
-typedef struct _EMutex EMutex;
-
-typedef enum _e_mutex_t {
-	E_MUTEX_SIMPLE,		/* == pthread_mutex */
-	E_MUTEX_REC,		/* recursive mutex */
-} e_mutex_t;
-
-EMutex *e_mutex_new(e_mutex_t type);
-int e_mutex_destroy(EMutex *m);
-int e_mutex_lock(EMutex *m);
-int e_mutex_unlock(EMutex *m);
-
-#endif
diff --git a/e-util/e-path.c b/e-util/e-path.c
deleted file mode 100644
index d1da9abd38..0000000000
--- a/e-util/e-path.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-path.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <glib.h>
-#include "e-path.h"
-
-#define SUBFOLDER_DIR_NAME     "subfolders"
-#define SUBFOLDER_DIR_NAME_LEN 10
-
-/**
- * e_path_to_physical:
- * @prefix: a prefix to prepend to the path, or %NULL
- * @path: the virtual path to convert to a filesystem path.
- *
- * This converts the "virtual" path @path into an expanded form that
- * allows a given name to refer to both a file and a directory. The
- * expanded path will have a "subfolders" directory inserted between
- * each path component.
- *
- * If @prefix is non-%NULL, it will be prepended to the returned path.
- *
- * Return value: the expanded path
- **/
-char *
-e_path_to_physical (const char *prefix, const char *vpath)
-{
-	const char *p, *newp;
-	char *dp;
-	char *ppath;
-	int ppath_len;
-	int prefix_len;
-
-	while (vpath == '/')
-		vpath++;
-	if (!prefix)
-		prefix = "";
-
-	/* Calculate the length of the real path. */
-	ppath_len = strlen (vpath);
-	ppath_len++;	/* For the ending zero.  */
-
-	prefix_len = strlen (prefix);
-	ppath_len += prefix_len;
-	ppath_len++;	/* For the separating slash.  */
-
-	/* Take account of the fact that we need to translate every
-	 * separator into `subfolders/'.
-	 */
-	p = vpath;
-	while (1) {
-		newp = strchr (p, '/');
-		if (newp == NULL)
-			break;
-
-		ppath_len += SUBFOLDER_DIR_NAME_LEN;
-		ppath_len++; /* For the separating slash.  */
-
-		/* Skip consecutive slashes.  */
-		while (*newp == '/')
-			newp++;
-
-		p = newp;
-	};
-
-	ppath = g_malloc (ppath_len);
-	dp = ppath;
-
-	memcpy (dp, prefix, prefix_len);
-	dp += prefix_len;
-	*(dp++) = '/';
-
-	/* Copy the mangled path.  */
-	p = vpath;
- 	while (1) {
-		newp = strchr (p, '/');
-		if (newp == NULL) {
-			strcpy (dp, p);
-			break;
-		}
-
-		memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too.  */
-		dp += newp - p + 1;
-
-		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
-		dp += SUBFOLDER_DIR_NAME_LEN;
-
-		*(dp++) = '/';
-
-		/* Skip consecutive slashes.  */
-		while (*newp == '/')
-			newp++;
-
-		p = newp;
-	}
-
-	return ppath;
-}
diff --git a/e-util/e-path.h b/e-util/e-path.h
deleted file mode 100644
index 808b666d9e..0000000000
--- a/e-util/e-path.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_PATH__
-#define __E_PATH__
-
-char *e_path_to_physical (const char *prefix, const char *vpath);
-
-#endif /* __E_PATH__ */
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
deleted file mode 100644
index 67aacdcf2a..0000000000
--- a/e-util/e-pilot-map.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include <gnome.h>
-#include <gnome-xml/parser.h>
-#include <e-pilot-map.h>
-
-typedef struct 
-{
-	char *uid;
-	gboolean archived;
-} EPilotMapPidNode;
-
-typedef struct
-{
-	guint32 pid;
-	gboolean archived;
-} EPilotMapUidNode;
-
-
-static void
-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-map_sax_start_element (void *data, const xmlChar *name, 
-		       const xmlChar **attrs)
-{
-	EPilotMap *map = (EPilotMap *)data;
-
-	if (!strcmp (name, "PilotMap")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "timestamp")) 
-				map->since = (time_t)strtoul (*val, NULL, 0);
-
-			attrs = ++val;
-		}
-	}
-	 
-	if (!strcmp (name, "map")) {
-		const char *uid = NULL;
-		guint32 pid = 0;
-		gboolean archived = FALSE;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				uid = *val;
-			
-			if (!strcmp (*attrs, "pilot_id"))
-				pid = strtoul (*val, NULL, 0);
-
-			if (!strcmp (*attrs, "archived"))
-				archived = strtoul (*val, NULL, 0)== 1 ? TRUE : FALSE;
-				
-			attrs = ++val;
-		}
-			
-		if (uid && pid != 0)
-			e_pilot_map_insert (map, pid, uid, archived);
-	}
-}
-
-static void
-map_write_foreach (gpointer key, gpointer value, gpointer data)
-{
-	xmlNodePtr root = data;
-	xmlNodePtr mnode;
-	unsigned long *pid = key;
-	EPilotMapPidNode *pnode = value;
-	char *pidstr;
-
-	mnode = xmlNewChild (root, NULL, "map", NULL);
-	
-	pidstr = g_strdup_printf ("%lu", *pid);
-	xmlSetProp (mnode, "pilot_id", pidstr);
-	g_free (pidstr);
-
-	xmlSetProp (mnode, "uid", pnode->uid);
-
-	if (pnode->archived)
-		xmlSetProp (mnode, "archived", "1");
-	else
-		xmlSetProp (mnode, "archived", "0");
-}
-
-gboolean 
-e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)
-{
-	EPilotMapPidNode *pnode;
-	
-	pnode = g_hash_table_lookup (map->pid_map, &pid);
-
-	if (pnode == NULL)
-		return FALSE;
-	
-	return pnode->archived;
-}
-
-gboolean 
-e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid)
-{
-	EPilotMapUidNode *unode;
-	
-	unode = g_hash_table_lookup (map->uid_map, uid);
-
-	if (unode == NULL)
-		return FALSE;
-	
-	return unode->archived;
-}
-
-void 
-e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived)
-{
-	char *new_uid;
-	guint32 *new_pid = g_new (guint32, 1);
-	EPilotMapPidNode *pnode = g_new0 (EPilotMapPidNode, 1);
-	EPilotMapUidNode *unode = g_new0 (EPilotMapUidNode, 1);
-	
-	*new_pid = pid;
-	new_uid = g_strdup (uid);
-
-	pnode->uid = new_uid;
-	pnode->archived = archived;
-	
-	unode->pid = pid;
-	unode->archived = archived;
-	
-	g_hash_table_insert (map->pid_map, new_pid, pnode);
-	g_hash_table_insert (map->uid_map, new_uid, unode);
-}
-
-void 
-e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid)
-{	
-	EPilotMapPidNode *pnode;
-	EPilotMapUidNode *unode;
-
-	pnode = g_hash_table_lookup (map->pid_map, &pid);
-	if (!pnode)
-		return;
-	
-	unode = g_hash_table_lookup (map->uid_map, pnode->uid);
-
-	g_hash_table_remove (map->pid_map, &pid);
-	g_hash_table_remove (map->uid_map, pnode->uid);
-
-	g_free (pnode);
-	g_free (unode);
-}
-
-void 
-e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid)
-{
-	EPilotMapPidNode *pnode;
-	EPilotMapUidNode *unode;
-
-	unode = g_hash_table_lookup (map->uid_map, uid);
-	if (!unode)
-		return;
-	
-	pnode = g_hash_table_lookup (map->pid_map, &unode->pid);
-
-	g_hash_table_remove (map->uid_map, uid);
-	g_hash_table_remove (map->pid_map, &unode->pid);
-
-	g_free (unode);
-	g_free (pnode);
-}
-
-
-guint32 
-e_pilot_map_lookup_pid (EPilotMap *map, const char *uid) 
-{
-	EPilotMapUidNode *unode = NULL;
-	
-	unode = g_hash_table_lookup (map->uid_map, uid);
-
-	if (unode == NULL)
-		return 0;
-	
-	return unode->pid;
-}
-
-const char *
-e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid)
-{
-	EPilotMapPidNode *pnode = NULL;
-	
-	pnode = g_hash_table_lookup (map->pid_map, &pid);
-
-	if (pnode == NULL)
-		return NULL;
-	
-	return pnode->uid;
-}
-
-int 
-e_pilot_map_read (const char *filename, EPilotMap **map)
-{
-	xmlSAXHandler handler;
-	EPilotMap *new_map = g_new0 (EPilotMap, 1);
-
-	*map = NULL;
-	
-	memset (&handler, 0, sizeof (xmlSAXHandler));
-	handler.startElement = map_sax_start_element;
-
-	new_map->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
-	new_map->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (g_file_exists (filename)) {
-		if (xmlSAXUserParseFile (&handler, new_map, filename) < 0) {
-			g_free (new_map);
-			return -1;
-		}
-	}
-	
-	*map = new_map;
-	
-	return 0;
-}
-		
-int
-e_pilot_map_write (const char *filename, EPilotMap *map)
-{
-	xmlDocPtr doc;
-	int ret;
-	
-	g_return_val_if_fail (map != NULL, -1);
-	
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL) {
-		g_warning ("Pilot map file could not be created\n");
-		return -1;
-	}
-	doc->root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);
-	map->since = time (NULL);
-	map_set_node_timet (doc->root, "timestamp", map->since);
-
-	g_hash_table_foreach (map->pid_map, map_write_foreach, doc->root);
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Pilot map file '%s' could not be saved\n", filename);
-		return -1;
-	}
-	
-	xmlFreeDoc (doc);
-
-	return 0;
-}
-
-void 
-e_pilot_map_destroy (EPilotMap *map)
-{
-	g_hash_table_destroy (map->pid_map);
-	g_hash_table_destroy (map->uid_map);
-	g_free (map);
-}
-
-
-
-
-
-
-
-
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
deleted file mode 100644
index d8d307ac3d..0000000000
--- a/e-util/e-pilot-map.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_PILOT_MAP_H
-#define E_PILOT_MAP_H
-
-#include <glib.h>
-#include <time.h>
-
-typedef struct _EPilotMap EPilotMap;
-
-struct _EPilotMap
-{
-	GHashTable *pid_map;
-	GHashTable *uid_map;
-
-	time_t since;
-};
-
-gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid);
-gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid);
-
-void e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived);
-void e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid);
-void e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid);
-
-guint32 e_pilot_map_lookup_pid (EPilotMap *map, const char *uid);
-const char * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid);
-
-int e_pilot_map_read (const char *filename, EPilotMap **map);
-int e_pilot_map_write (const char *filename, EPilotMap *map);
-
-void e_pilot_map_destroy (EPilotMap *map);
-
-#endif /* E_PILOT_MAP_H */
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
deleted file mode 100644
index 0f91f48e3a..0000000000
--- a/e-util/e-pilot-util.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include <gnome.h>
-#include <gnome-xml/parser.h>
-#include <pi-util.h>
-#include <e-pilot-util.h>
-
-char *
-e_pilot_utf8_to_pchar (const char *string)
-{
-	char *pstring = NULL;
-	int res;
-
-	if (!string)
-		return NULL;
-	
-	res = convert_ToPilotChar ("UTF8", string, strlen (string), &pstring);
-
-	if (res != 0)
-		pstring = strdup (string);
-
-	return pstring;
-}
-
-char *
-e_pilot_utf8_from_pchar (const char *string)
-{
-	char *ustring = NULL;
-	int res;
-
-	if (!string)
-		return NULL;
-	
-	res = convert_FromPilotChar ("UTF8", string, strlen (string), &ustring);
-	
-	if (res != 0)
-		ustring = strdup (string);
-	
-	return ustring;
-}
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
deleted file mode 100644
index 076bd1102e..0000000000
--- a/e-util/e-pilot-util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_PILOT_UTIL_H
-#define E_PILOT_UTIL_H
-
-char *e_pilot_utf8_to_pchar (const char *string);
-char *e_pilot_utf8_from_pchar (const char *string);
-
-#endif /* E_PILOT_UTIL_H */
diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c
deleted file mode 100644
index 69e1c0ca15..0000000000
--- a/e-util/e-sexp.c
+++ /dev/null
@@ -1,1201 +0,0 @@
-/* 
- * Copyright 2000 HelixCode (http://www.helixcode.com).
- *
- * A simple, extensible s-exp evaluation engine.
- *
- * Author : 
- *  Michael Zucchi <notzed@helixcode.com>
-
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
-  The following built-in s-exp's are supported:
-
-  list = (and list*)
-	perform an intersection of a number of lists, and return that.
-
-  bool = (and bool*)
-	perform a boolean AND of boolean values.
-
-  list = (or list*)
-	perform a union of a number of lists, returning the new list.
-
-  bool = (or bool*)
-	perform a boolean OR of boolean values.
-
-  int = (+ int*)
-	Add integers.
-
-  string = (+ string*)
-	Concat strings.
-
-  int = (- int int*)
-	Subtract integers from the first.
-
-  Comparison operators:
-
-  bool = (< int int)
-  bool = (> int int)
-  bool = (= int int)
-
-  bool = (< string string)
-  bool = (> string string)
-  bool = (= string string)
-	Perform a comparision of 2 integers, or 2 string values.
-
-  Function flow:
-
-  type = (if bool function)
-  type = (if bool function function)
-  	Choose a flow path based on a boolean value
-
-  type = (begin  func func func)
-        Execute a sequence.  The last function return is the return type.
-*/
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-#include "e-memory.h"
-#include "e-sexp.h"
-
-#define p(x)			/* parse debug */
-#define r(x)			/* run debug */
-#define d(x)			/* general debug */
-
-
-static struct _ESExpTerm * parse_list(ESExp *f, int gotbrace);
-static struct _ESExpTerm * parse_value(ESExp *f);
-
-static void parse_dump_term(struct _ESExpTerm *t, int depth);
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-static GtkObjectClass *parent_class;
-#endif
-
-static GScannerConfig scanner_config =
-{
-	( " \t\r\n")		/* cset_skip_characters */,
-	( G_CSET_a_2_z
-	  "_+-<=>"
-	  G_CSET_A_2_Z)		/* cset_identifier_first */,
-	( G_CSET_a_2_z
-	  "_0123456789-<>"
-	  G_CSET_A_2_Z
-	  G_CSET_LATINS
-	  G_CSET_LATINC	)	/* cset_identifier_nth */,
-	( ";\n" )		/* cpair_comment_single */,
-  
-	FALSE			/* case_sensitive */,
-  
-	TRUE			/* skip_comment_multi */,
-	TRUE			/* skip_comment_single */,
-	TRUE			/* scan_comment_multi */,
-	TRUE			/* scan_identifier */,
-	TRUE			/* scan_identifier_1char */,
-	FALSE			/* scan_identifier_NULL */,
-	TRUE			/* scan_symbols */,
-	FALSE			/* scan_binary */,
-	TRUE			/* scan_octal */,
-	TRUE			/* scan_float */,
-	TRUE			/* scan_hex */,
-	FALSE			/* scan_hex_dollar */,
-	TRUE			/* scan_string_sq */,
-	TRUE			/* scan_string_dq */,
-	TRUE			/* numbers_2_int */,
-	FALSE			/* int_2_float */,
-	FALSE			/* identifier_2_string */,
-	TRUE			/* char_2_token */,
-	FALSE			/* symbol_2_token */,
-	FALSE			/* scope_0_fallback */,
-};
-
-/* jumps back to the caller of f->failenv, only to be called from inside a callback */
-void
-e_sexp_fatal_error(struct _ESExp *f, char *why, ...)
-{
-	va_list args;
-
-	if (f->error)
-		g_free(f->error);
-	
-	va_start(args, why);
-	f->error = g_strdup_vprintf(why, args);
-	va_end(args);
-
-	longjmp(f->failenv, 1);
-}
-
-const char *
-e_sexp_error(struct _ESExp *f)
-{
-	return f->error;
-}
-
-struct _ESExpResult *
-e_sexp_result_new(struct _ESExp *f, int type)
-{
-	struct _ESExpResult *r = e_memchunk_alloc0(f->result_chunks);
-	r->type = type;
-	return r;
-}
-
-void
-e_sexp_result_free(struct _ESExp *f, struct _ESExpResult *t)
-{
-	if (t == NULL)
-		return;
-
-	switch(t->type) {
-	case ESEXP_RES_ARRAY_PTR:
-		g_ptr_array_free(t->value.ptrarray, TRUE);
-		break;
-	case ESEXP_RES_BOOL:
-	case ESEXP_RES_INT:
-		break;
-	case ESEXP_RES_STRING:
-		g_free(t->value.string);
-		break;
-	case ESEXP_RES_UNDEFINED:
-		break;
-	}
-	e_memchunk_free(f->result_chunks, t);
-}
-
-/* used in normal functions if they have to abort, and free their arguments */
-void
-e_sexp_resultv_free(struct _ESExp *f, int argc, struct _ESExpResult **argv)
-{
-	int i;
-
-	for (i=0;i<argc;i++) {
-		e_sexp_result_free(f, argv[i]);
-	}
-}
-
-/* implementations for the builtin functions */
-
-/* can you tell, i dont like glib? */
-/* we can only itereate a hashtable from a called function */
-struct _glib_sux_donkeys {
-	int count;
-	GPtrArray *uids;
-};
-
-/* ok, store any values that are in all sets */
-static void
-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	if (value == fuckup->count) {
-		g_ptr_array_add(fuckup->uids, key);
-	}
-}
-
-/* or, store all unique values */
-static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	g_ptr_array_add(fuckup->uids, key);
-}
-
-static ESExpResult *
-term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1;
-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
-	int type=-1;
-	int bool = TRUE;
-	int i;
-	
-	r(printf("( and\n"));
-
-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-	
-	for (i=0;bool && i<argc;i++) {
-		r1 = e_sexp_term_eval(f, argv[i]);
-		if (type == -1)
-			type = r1->type;
-		if (type != r1->type) {
-			e_sexp_result_free(f, r);
-			e_sexp_result_free(f, r1);
-			g_hash_table_destroy(ht);
-			e_sexp_fatal_error(f, "Invalid types in AND");
-		} else if ( r1->type == ESEXP_RES_ARRAY_PTR ) {
-			char **a1;
-			int l1, j;
-			
-			a1 = (char **)r1->value.ptrarray->pdata;
-			l1 = r1->value.ptrarray->len;
-			for (j=0;j<l1;j++) {
-				int n;
-				n = (int)g_hash_table_lookup(ht, a1[j]);
-				g_hash_table_insert(ht, a1[j], (void *)n+1);
-			}
-		} else if ( r1->type == ESEXP_RES_BOOL ) {
-			bool &= r1->value.bool;
-		}
-		e_sexp_result_free(f, r1);
-	}
-	
-	if (type == ESEXP_RES_ARRAY_PTR) {
-		lambdafoo.count = argc;
-		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &lambdafoo);
-		r->type = ESEXP_RES_ARRAY_PTR;
-		r->value.ptrarray = lambdafoo.uids;
-	} else if (type == ESEXP_RES_BOOL) {
-		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
-	}
-	
-	g_hash_table_destroy(ht);
-	
-	return r;
-}
-
-static ESExpResult *
-term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1;
-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
-	int type = -1;
-	int bool = FALSE;
-	int i;
-	
-	r(printf("(or \n"));
-
-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-	
-	for (i=0;!bool && i<argc;i++) {
-		r1 = e_sexp_term_eval(f, argv[i]);
-		if (type == -1)
-			type = r1->type;
-		if (r1->type != type) {
-			e_sexp_result_free(f, r);
-			e_sexp_result_free(f, r1);
-			g_hash_table_destroy(ht);
-			e_sexp_fatal_error(f, "Invalid types in OR");
-		} else if (r1->type == ESEXP_RES_ARRAY_PTR) {
-			char **a1;
-			int l1, j;
-			
-			a1 = (char **)r1->value.ptrarray->pdata;
-			l1 = r1->value.ptrarray->len;
-			for (j=0;j<l1;j++) {
-				g_hash_table_insert(ht, a1[j], (void *)1);
-			}
-		} else if (r1->type == ESEXP_RES_BOOL) {
-			bool |= r1->value.bool;				
-		}
-		e_sexp_result_free(f, r1);
-	}
-	
-	if (type == ESEXP_RES_ARRAY_PTR) {
-		lambdafoo.count = argc;
-		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
-		r->type = ESEXP_RES_ARRAY_PTR;
-		r->value.ptrarray = lambdafoo.uids;
-	} else if (type == ESEXP_RES_BOOL) {
-		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
-	}
-	g_hash_table_destroy(ht);
-	
-	return r;
-}
-
-static ESExpResult *
-term_eval_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	int res = TRUE;
-	ESExpResult *r;
-
-	if (argc>0) {
-		if (argv[0]->type == ESEXP_RES_BOOL
-		    && argv[0]->value.bool)
-			res = FALSE;
-	}
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = res;
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_lt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			e_sexp_result_free(f, r1);
-			e_sexp_result_free(f, r2);
-			e_sexp_result_free(f, r);
-			e_sexp_fatal_error(f, "Incompatible types in compare <");
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number < r2->value.number;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) < 0;
-		}
-		e_sexp_result_free(f, r1);
-		e_sexp_result_free(f, r2);
-	}
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_gt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			e_sexp_result_free(f, r1);
-			e_sexp_result_free(f, r2);
-			e_sexp_result_free(f, r);
-			e_sexp_fatal_error(f, "Incompatible types in compare >");
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number > r2->value.number;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) > 0;
-		}
-		e_sexp_result_free(f, r1);
-		e_sexp_result_free(f, r2);
-	}
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_eq(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			r->value.bool = FALSE;
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->value.bool = r1->value.number == r2->value.number;
-		} else if (r1->type == ESEXP_RES_BOOL) {
-			r->value.bool = r1->value.bool == r2->value.bool;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->value.bool = strcmp(r1->value.string, r2->value.string) == 0;
-		}
-		e_sexp_result_free(f, r1);
-		e_sexp_result_free(f, r2);
-	}
-	return r;
-}
-
-static ESExpResult *
-term_eval_plus(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int type;
-	int i;
-
-	if (argc>0) {
-		type = argv[0]->type;
-		switch(type) {
-		case ESEXP_RES_INT: {
-			int total = argv[0]->value.number;
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
-				total += argv[i]->value.number;
-			}
-			if (i<argc) {
-				e_sexp_resultv_free(f, argc, argv);
-				e_sexp_fatal_error(f, "Invalid types in (+ ints)");
-			}
-			r = e_sexp_result_new(f, ESEXP_RES_INT);
-			r->value.number = total;
-			break; }
-		case ESEXP_RES_STRING: {
-			GString *s = g_string_new(argv[0]->value.string);
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_STRING;i++) {
-				g_string_append(s, argv[i]->value.string);
-			}
-			if (i<argc) {
-				e_sexp_resultv_free(f, argc, argv);
-				e_sexp_fatal_error(f, "Invalid types in (+ strings)");
-			}
-			r = e_sexp_result_new(f, ESEXP_RES_STRING);
-			r->value.string = s->str;
-			g_string_free(s, FALSE);
-			break; }
-			
-		}
-	}
-
-	if (!r) {
-		r = e_sexp_result_new(f, ESEXP_RES_INT);
-		r->value.number = 0;
-	}
-	return r;
-}
-
-static ESExpResult *
-term_eval_sub(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int type;
-	int i;
-
-	if (argc>0) {
-		type = argv[0]->type;
-		switch(type) {
-		case ESEXP_RES_INT: {
-			int total = argv[0]->value.number;
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
-				total -= argv[i]->value.number;
-			}
-			if (i<argc) {
-				e_sexp_resultv_free(f, argc, argv);
-				e_sexp_fatal_error(f, "Invalid types in -");
-			}
-			r = e_sexp_result_new(f, ESEXP_RES_INT);
-			r->value.number = total;
-			break; }
-		}
-	}
-
-	if (!r) {
-		r = e_sexp_result_new(f, ESEXP_RES_INT);
-		r->value.number = 0;
-	}
-	return r;
-}
-
-/* implements 'if' function */
-static ESExpResult *
-term_eval_if(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r;
-	int doit;
-
-	if (argc >=2 && argc<=3) {
-		r = e_sexp_term_eval(f, argv[0]);
-		doit = (r->type == ESEXP_RES_BOOL && r->value.bool);
-		e_sexp_result_free(f, r);
-		if (doit) {
-			return e_sexp_term_eval(f, argv[1]);
-		} else if (argc>2) {
-			return e_sexp_term_eval(f, argv[2]);
-		}
-	}
-	return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-}
-
-/* implements 'begin' statement */
-static ESExpResult *
-term_eval_begin(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int i;
-
-	for (i=0;i<argc;i++) {
-		if (r)
-			e_sexp_result_free(f, r);
-		r = e_sexp_term_eval(f, argv[i]);
-	}
-	if (r)
-		return r;
-	else
-		return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-}
-
-
-/* this must only be called from inside term evaluation callbacks! */
-struct _ESExpResult *
-e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)
-{
-	struct _ESExpResult *r = NULL;
-	int i;
-	struct _ESExpResult **argv;
-
-	g_return_val_if_fail(t != NULL, NULL);
-
-	r(printf("eval term :\n"));
-	r(parse_dump_term(t, 0));
-
-	switch (t->type) {
-	case ESEXP_TERM_STRING:
-		r(printf(" (string \"%s\")\n", t->value.string));
-		r = e_sexp_result_new(f, ESEXP_RES_STRING);
-		/* erk, this shoul;dn't need to strdup this ... */
-		r->value.string = g_strdup(t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		r(printf(" (int %d)\n", t->value.number));
-		r = e_sexp_result_new(f, ESEXP_RES_INT);
-		r->value.number = t->value.number;
-		break;
-	case ESEXP_TERM_BOOL:
-		r(printf(" (int %d)\n", t->value.number));
-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = t->value.bool;
-		break;
-	case ESEXP_TERM_IFUNC:
-		if (t->value.func.sym->f.ifunc)
-			r = t->value.func.sym->f.ifunc(f, t->value.func.termcount, t->value.func.terms, t->value.func.sym->data);
-		break;
-	case ESEXP_TERM_FUNC:
-		/* first evaluate all arguments to result types */
-		argv = alloca(sizeof(argv[0]) * t->value.func.termcount);
-		for (i=0;i<t->value.func.termcount;i++) {
-			argv[i] = e_sexp_term_eval(f, t->value.func.terms[i]);
-		}
-		/* call the function */
-		if (t->value.func.sym->f.func)
-			r = t->value.func.sym->f.func(f, t->value.func.termcount, argv, t->value.func.sym->data);
-
-		e_sexp_resultv_free(f, t->value.func.termcount, argv);
-		break;
-	default:
-		e_sexp_fatal_error(f, "Unknown type in parse tree: %d", t->type);
-	}
-
-	if (r==NULL)
-		r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
-
-	return r;
-}
-
-#if 0
-static void
-eval_dump_result(ESExpResult *r, int depth)
-{
-	int i;
-	
-	if (r==NULL) {
-		printf("null result???\n");
-		return;
-	}
-
-	for (i=0;i<depth;i++)
-		printf("   ");
-
-	switch (r->type) {
-	case ESEXP_RES_ARRAY_PTR:
-		printf("array pointers\n");
-		break;
-	case ESEXP_RES_INT:
-		printf("int: %d\n", r->value.number);
-		break;
-	case ESEXP_RES_STRING:
-		printf("string: '%s'\n", r->value.string);
-		break;
-	case ESEXP_RES_BOOL:
-		printf("bool: %c\n", r->value.bool?'t':'f');
-		break;
-	case ESEXP_RES_UNDEFINED:
-		printf(" <undefined>\n");
-		break;
-	}
-	printf("\n");
-}
-#endif
-
-static void
-parse_dump_term(struct _ESExpTerm *t, int depth)
-{
-	int i;
-
-	if (t==NULL) {
-		printf("null term??\n");
-		return;
-	}
-
-	for (i=0;i<depth;i++)
-		printf("   ");
-	
-	switch (t->type) {
-	case ESEXP_TERM_STRING:
-		printf(" \"%s\"", t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		printf(" %d", t->value.number);
-		break;
-	case ESEXP_TERM_BOOL:
-		printf(" #%c", t->value.bool?'t':'f');
-		break;
-	case ESEXP_TERM_IFUNC:
-	case ESEXP_TERM_FUNC:
-		printf(" (function %s\n", t->value.func.sym->name);
-		/*printf(" [%d] ", t->value.func.termcount);*/
-		for (i=0;i<t->value.func.termcount;i++) {
-			parse_dump_term(t->value.func.terms[i], depth+1);
-		}
-		for (i=0;i<depth;i++)
-			printf("   ");
-		printf(" )");
-		break;
-	case ESEXP_TERM_VAR:
-		printf(" (variable %s )\n", t->value.var->name);
-		break;
-	default:
-		printf("unknown type: %d\n", t->type);
-	}
-
-	printf("\n");
-}
-
-/*
-  PARSER
-*/
-
-static struct _ESExpTerm *
-parse_term_new(struct _ESExp *f, int type)
-{
-	struct _ESExpTerm *s = e_memchunk_alloc0(f->term_chunks);
-	s->type = type;
-	return s;
-}
-
-static void
-parse_term_free(struct _ESExp *f, struct _ESExpTerm *t)
-{
-	int i;
-
-	if (t==NULL) {
-		return;
-	}
-	
-	switch (t->type) {
-	case ESEXP_TERM_FUNC:
-	case ESEXP_TERM_IFUNC:
-		for (i=0;i<t->value.func.termcount;i++) {
-			parse_term_free(f, t->value.func.terms[i]);
-		}
-		g_free(t->value.func.terms);
-		break;
-	case ESEXP_TERM_VAR:
-		break;
-	case ESEXP_TERM_STRING:
-		g_free(t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		break;
-	default:
-		printf("parse_term_free: unknown type: %d\n", t->type);
-	}
-	e_memchunk_free(f->term_chunks, t);
-}
-
-static struct _ESExpTerm **
-parse_values(ESExp *f, int *len)
-{
-	int token;
-	struct _ESExpTerm **terms;
-	int i=0;
-	GScanner *gs = f->scanner;
-
-	p(printf("parsing values\n"));
-
-	/* FIXME: This hardcoded nonsense!!! :) */
-	terms = g_malloc0(30*sizeof(*terms));
-
-	while ( (token = g_scanner_peek_next_token(gs)) != G_TOKEN_EOF
-		&& token != ')') {
-		terms[i]=parse_value(f);
-		i++;
-	}
-
-	p(printf("found %d subterms\n", i));
-	*len = i;
-	
-	p(printf("dont parsing values\n"));
-	return terms;
-}
-
-static struct _ESExpTerm *
-parse_value(ESExp *f)
-{
-	int token;
-	struct _ESExpTerm *t = NULL;
-	GScanner *gs = f->scanner;
-	struct _ESExpSymbol *s;
-
-	p(printf("parsing value\n"));
-
-	token = g_scanner_get_next_token(gs);
-	switch(token) {
-	case G_TOKEN_LEFT_PAREN:
-		p(printf("got brace, its a list!\n"));
-		return parse_list(f, TRUE);
-	case G_TOKEN_STRING:
-		p(printf("got string\n"));
-		t = parse_term_new(f, ESEXP_TERM_STRING);
-		t->value.string = g_strdup(g_scanner_cur_value(gs).v_string);
-		break;
-	case G_TOKEN_INT:
-		t = parse_term_new(f, ESEXP_TERM_INT);
-		t->value.number = g_scanner_cur_value(gs).v_int;
-		p(printf("got int\n"));
-		break;
-	case '#':
-		p(printf("got bool?\n"));
-		token = g_scanner_get_next_token(gs);
-		t = parse_term_new(f, ESEXP_TERM_BOOL);
-		t->value.bool = token=='t';
-		break;
-	case G_TOKEN_SYMBOL:
-		s = g_scanner_cur_value(gs).v_symbol;
-		switch (s->type) {
-		case ESEXP_TERM_FUNC:
-		case ESEXP_TERM_IFUNC:
-				/* this is basically invalid, since we can't use function
-				   pointers, but let the runtime catch it ... */
-			t = parse_term_new(f, s->type);
-			t->value.func.sym = s;
-			t->value.func.terms = parse_values(f, &t->value.func.termcount);
-			break;
-		case ESEXP_TERM_VAR:
-			t = parse_term_new(f, s->type);
-			t->value.var = s;
-			break;
-		default:
-			e_sexp_fatal_error(f, "Invalid symbol type: %s: %d", s->name, s->type);
-		}
-		break;
-	case G_TOKEN_IDENTIFIER:
-		e_sexp_fatal_error(f, "Unknown identifier: %s", g_scanner_cur_value(gs).v_identifier);
-		break;
-	default:
-		e_sexp_fatal_error(f, "Unexpected token encountered: %d", token);
-	}
-	p(printf("done parsing value\n"));
-	return t;
-}
-
-/* FIXME: this needs some robustification */
-static struct _ESExpTerm *
-parse_list(ESExp *f, int gotbrace)
-{
-	int token;
-	struct _ESExpTerm *t = NULL;
-	GScanner *gs = f->scanner;
-
-	p(printf("parsing list\n"));
-	if (gotbrace)
-		token = '(';
-	else
-		token = g_scanner_get_next_token(gs);
-	if (token =='(') {
-		token = g_scanner_get_next_token(gs);
-		switch(token) {
-		case G_TOKEN_SYMBOL: {
-			struct _ESExpSymbol *s;
-
-			s = g_scanner_cur_value(gs).v_symbol;
-			p(printf("got funciton: %s\n", s->name));
-			t = parse_term_new(f, s->type);
-			p(printf("created new list %p\n", t));
-			/* if we have a variable, find out its base type */
-			while (s->type == ESEXP_TERM_VAR) {
-				s = ((ESExpTerm *)(s->data))->value.var;
-			}
-			if (s->type == ESEXP_TERM_FUNC
-			    || s->type == ESEXP_TERM_IFUNC) {
-				t->value.func.sym = s;
-				t->value.func.terms = parse_values(f, &t->value.func.termcount);
-			} else {
-				parse_term_free(f, t);
-				e_sexp_fatal_error(f, "Trying to call variable as function: %s", s->name);
-			}
-			break; }
-		case G_TOKEN_IDENTIFIER:
-			e_sexp_fatal_error(f, "Unknown identifier: %s", g_scanner_cur_value(gs).v_identifier);
-			break;
-		default:
-			e_sexp_fatal_error(f, "Unexpected token encountered: %d", token);
-		}
-		token = g_scanner_get_next_token(gs);
-		if (token != ')') {
-			e_sexp_fatal_error(f, "Missing ')'");
-		}
-	} else {
-		e_sexp_fatal_error(f, "Missing '('");
-	}
-
-	p(printf("returning list %p\n", t));
-	return t;
-}
-
-static void e_sexp_finalise(void *);
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-static void
-e_sexp_class_init (ESExpClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-
-	object_class->finalize = e_sexp_finalise;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-}
-#endif
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and", (ESExpFunc *)term_eval_and, 1 },
-	{ "or", (ESExpFunc *)term_eval_or, 1 },
-	{ "not", (ESExpFunc *)term_eval_not, 0 },
-	{ "<", (ESExpFunc *)term_eval_lt, 1 },
-	{ ">", (ESExpFunc *)term_eval_gt, 1 },
-	{ "=", (ESExpFunc *)term_eval_eq, 1 },
-	{ "+", (ESExpFunc *)term_eval_plus, 0 },
-	{ "-", (ESExpFunc *)term_eval_sub, 0 },
-	{ "if", (ESExpFunc *)term_eval_if, 1 },
-	{ "begin", (ESExpFunc *)term_eval_begin, 1 },
-};
-
-static void
-free_symbol(void *key, void *value, void *data)
-{
-	struct _ESExpSymbol *s = value;
-
-	g_free(s->name);
-	g_free(s);
-}
-
-static void
-e_sexp_finalise(void *o)
-{
-	ESExp *s = (ESExp *)o;
-
-	if (s->tree) {
-		parse_term_free(s, s->tree);
-		s->tree = NULL;
-	}
-
-	e_memchunk_destroy(s->term_chunks);
-	e_memchunk_destroy(s->result_chunks);
-
-	g_scanner_scope_foreach_symbol(s->scanner, 0, free_symbol, 0);
-	g_scanner_destroy(s->scanner);
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-	((GtkObjectClass *)(parent_class))->finalize((GtkObject *)o);
-#endif
-}
-
-static void
-e_sexp_init (ESExp *s)
-{
-	int i;
-
-	s->scanner = g_scanner_new(&scanner_config);
-	s->term_chunks = e_memchunk_new(16, sizeof(struct _ESExpTerm));
-	s->result_chunks = e_memchunk_new(16, sizeof(struct _ESExpResult));
-
-	/* load in builtin symbols? */
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(s, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &symbols[i]);
-		} else {
-			e_sexp_add_function(s, 0, symbols[i].name, symbols[i].func, &symbols[i]);
-		}
-	}
-
-#ifndef E_SEXP_IS_GTK_OBJECT
-	s->refcount = 1;
-#endif
-}
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-guint
-e_sexp_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ESExp",
-			sizeof (ESExp),
-			sizeof (ESExpClass),
-			(GtkClassInitFunc) e_sexp_class_init,
-			(GtkObjectInitFunc) e_sexp_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-#endif
-
-ESExp *
-e_sexp_new (void)
-{
-#ifdef E_SEXP_IS_GTK_OBJECT
-	ESExp *f = E_SEXP ( gtk_type_new (e_sexp_get_type ()));
-#else
-	ESExp *f = g_malloc0(sizeof(*f));
-	e_sexp_init(f);
-#endif
-
-	return f;
-}
-
-#ifndef E_SEXP_IS_GTK_OBJECT
-void		e_sexp_ref		(ESExp *f)
-{
-	f->refcount++;
-}
-
-void		e_sexp_unref		(ESExp *f)
-{
-	f->refcount--;
-	if (f->refcount == 0) {
-		e_sexp_finalise(f);
-		g_free(f);
-	}
-}
-#endif
-
-void
-e_sexp_add_function(ESExp *f, int scope, char *name, ESExpFunc *func, void *data)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->f.func = func;
-	s->type = ESEXP_TERM_FUNC;
-	s->data = data;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_add_ifunction(ESExp *f, int scope, char *name, ESExpIFunc *ifunc, void *data)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->f.ifunc = ifunc;
-	s->type = ESEXP_TERM_IFUNC;
-	s->data = data;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_add_variable(ESExp *f, int scope, char *name, ESExpTerm *value)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->type = ESEXP_TERM_VAR;
-	s->data = value;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_remove_symbol(ESExp *f, int scope, char *name)
-{
-	int oldscope;
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	oldscope = g_scanner_set_scope(f->scanner, scope);
-	s = g_scanner_lookup_symbol(f->scanner, name);
-	g_scanner_scope_remove_symbol(f->scanner, scope, name);
-	g_scanner_set_scope(f->scanner, oldscope);
-	if (s) {
-		g_free(s->name);
-		g_free(s);
-	}
-}
-
-int
-e_sexp_set_scope(ESExp *f, int scope)
-{
-	g_return_val_if_fail(FILTER_IS_SEXP(f), 0);
-
-	return g_scanner_set_scope(f->scanner, scope);
-}
-
-void
-e_sexp_input_text(ESExp *f, const char *text, int len)
-{
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(text != NULL);
-
-	g_scanner_input_text(f->scanner, text, len);
-}
-
-void
-e_sexp_input_file (ESExp *f, int fd)
-{
-	g_return_if_fail(FILTER_IS_SEXP(f));
-
-	g_scanner_input_file(f->scanner, fd);
-}
-
-/* returns -1 on error */
-int
-e_sexp_parse(ESExp *f)
-{
-	g_return_val_if_fail(FILTER_IS_SEXP(f), -1);
-
-	if (setjmp(f->failenv)) {
-		g_warning("Error in parsing: %s", f->error);
-		return -1;
-	}
-
-	if (f->tree)
-		parse_term_free(f, f->tree);
-
-	f->tree = parse_list(f, FALSE);
-
-	return 0;
-}
-
-/* returns NULL on error */
-struct _ESExpResult *
-e_sexp_eval(ESExp *f)
-{
-	g_return_val_if_fail(FILTER_IS_SEXP(f), NULL);
-	g_return_val_if_fail(f->tree != NULL, NULL);
-
-	if (setjmp(f->failenv)) {
-		g_warning("Error in execution: %s", f->error);
-		return NULL;
-	}
-
-	return e_sexp_term_eval(f, f->tree);
-}
-
-/**
- * e_sexp_encode_bool:
- * @s: 
- * @state: 
- * 
- * Encode a bool into an s-expression @s.  Bools are
- * encoded using #t #f syntax.
- **/
-void
-e_sexp_encode_bool(GString *s, gboolean state)
-{
-	if (state)
-		g_string_append(s, " #t");
-	else
-		g_string_append(s, " #f");
-}
-
-/**
- * e_sexp_encode_string:
- * @s: Destination string.
- * @string: String expression.
- * 
- * Add a c string @string to the s-expression stored in
- * the gstring @s.  Quotes are added, and special characters
- * are escaped appropriately.
- **/
-void
-e_sexp_encode_string(GString *s, const char *string)
-{
-	char c;
-	const char *p;
-
-	if (string == NULL)
-		p = "";
-	else
-		p = string;
-	g_string_append(s, " \"");
-	while ( (c = *p++) ) {
-		if (c=='\\' || c=='\"' || c=='\'')
-			g_string_append_c(s, '\\');
-		g_string_append_c(s, c);
-	}
-	g_string_append(s, "\"");
-}
-
-#ifdef TESTER
-int main(int argc, char **argv)
-{
-	ESExp *f;
-	char *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";
-	ESExpResult *r;
-
-	gtk_init(&argc, &argv);
-
-	f = e_sexp_new();
-
-	e_sexp_add_variable(f, 0, "test", NULL);
-
-	e_sexp_input_text(f, t, strlen(t));
-	e_sexp_parse(f);
-
-	if (f->tree) {
-		parse_dump_term(f->tree, 0);
-	}
-
-	r = e_sexp_eval(f);
-	if (r) {
-		eval_dump_result(r, 0);
-	} else {
-		printf("no result?|\n");
-	}
-
-	return 0;
-}
-#endif
diff --git a/e-util/e-sexp.h b/e-util/e-sexp.h
deleted file mode 100644
index 9299fdb61a..0000000000
--- a/e-util/e-sexp.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-  generic s-exp evaluator class
-*/
-#ifndef _E_SEXP_H
-#define _E_SEXP_H
-
-#include <glib.h>
-#include <setjmp.h>
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-#include <gtk/gtk.h>
-#endif
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-#define E_SEXP(obj)         GTK_CHECK_CAST (obj, e_sexp_get_type (), ESExp)
-#define E_SEXP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_sexp_get_type (), ESExpClass)
-#define FILTER_IS_SEXP(obj)      GTK_CHECK_TYPE (obj, e_sexp_get_type ())
-#else
-#define E_SEXP(obj)         ((struct _ESExp *)(obj))
-#define E_SEXP_CLASS(klass) 	((struct _ESExpClass *)(klass))
-#define FILTER_IS_SEXP(obj)      (1)
-#endif
-
-typedef struct _ESExp      ESExp;
-typedef struct _ESExpClass ESExpClass;
-
-typedef struct _ESExpSymbol ESExpSymbol;
-typedef struct _ESExpResult ESExpResult;
-typedef struct _ESExpTerm ESExpTerm;
-
-typedef struct _ESExpResult *(ESExpFunc)(struct _ESExp *sexp,
-						   int argc,
-						   struct _ESExpResult **argv,
-						   void *data);
-
-typedef struct _ESExpResult *(ESExpIFunc)(struct _ESExp *sexp,
-						    int argc,
-						    struct _ESExpTerm **argv,
-						    void *data);
-enum _ESExpResultType {
-	ESEXP_RES_ARRAY_PTR=0,	/* type is a ptrarray, what it points to is implementation dependant */
-	ESEXP_RES_INT,		/* type is a number */
-	ESEXP_RES_STRING,	/* type is a pointer to a single string */
-	ESEXP_RES_BOOL,		/* boolean type */
-	ESEXP_RES_UNDEFINED	/* unknown type */
-};
-
-struct _ESExpResult {
-	enum _ESExpResultType type;
-	union {
-		GPtrArray *ptrarray;
-		int number;
-		char *string;
-		int bool;
-	} value;
-};
-
-enum _ESExpTermType {
-	ESEXP_TERM_INT	= 0,	/* integer literal */
-	ESEXP_TERM_BOOL,	/* boolean literal */
-	ESEXP_TERM_STRING,	/* string literal */
-	ESEXP_TERM_FUNC,	/* normal function, arguments are evaluated before calling */
-	ESEXP_TERM_IFUNC,	/* immediate function, raw terms are arguments */
-	ESEXP_TERM_VAR,		/* variable reference */
-};
-
-struct _ESExpSymbol {
-	int type;		/* ESEXP_TERM_FUNC or ESEXP_TERM_VAR */
-	char *name;
-	void *data;
-	union {
-		ESExpFunc *func;
-		ESExpIFunc *ifunc;
-	} f;
-};
-
-struct _ESExpTerm {
-	enum _ESExpTermType type;
-	union {
-		char *string;
-		int number;
-		int bool;
-		struct {
-			struct _ESExpSymbol *sym;
-			struct _ESExpTerm **terms;
-			int termcount;
-		} func;
-		struct _ESExpSymbol *var;
-	} value;
-};
-
-
-
-struct _ESExp {
-#ifdef E_SEXP_IS_GTK_OBJECT
-	GtkObject object;
-#else
-	int refcount;
-#endif
-	GScanner *scanner;	/* for parsing text version */
-	ESExpTerm *tree;	/* root of expression tree */
-
-	/* private stuff */
-	jmp_buf failenv;
-	char *error;
-
-	/* TODO: may also need a pool allocator for term strings, so we dont lose them
-	   in error conditions? */
-	struct _EMemChunk *term_chunks;
-	struct _EMemChunk *result_chunks;
-};
-
-struct _ESExpClass {
-#ifdef E_SEXP_IS_GTK_OBJECT
-	GtkObjectClass parent_class;
-#endif
-};
-
-#ifdef E_SEXP_IS_GTK_OBJECT
-guint		e_sexp_get_type		(void);
-#endif
-ESExp 	       *e_sexp_new		(void);
-#ifndef E_SEXP_IS_GTK_OBJECT
-void		e_sexp_ref		(ESExp *f);
-void		e_sexp_unref		(ESExp *f);
-#endif
-void		e_sexp_add_function  	(ESExp *f, int scope, char *name, ESExpFunc *func, void *data);
-void		e_sexp_add_ifunction  	(ESExp *f, int scope, char *name, ESExpIFunc *func, void *data);
-void		e_sexp_add_variable  	(ESExp *f, int scope, char *name, ESExpTerm *value);
-void		e_sexp_remove_symbol	(ESExp *f, int scope, char *name);
-int		e_sexp_set_scope	(ESExp *f, int scope);
-
-void		e_sexp_input_text	(ESExp *f, const char *text, int len);
-void		e_sexp_input_file	(ESExp *f, int fd);
-
-
-int		e_sexp_parse		(ESExp *f);
-ESExpResult    *e_sexp_eval		(ESExp *f);
-
-ESExpResult    *e_sexp_term_eval	(struct _ESExp *f, struct _ESExpTerm *t);
-ESExpResult    *e_sexp_result_new	(struct _ESExp *f, int type);
-void		e_sexp_result_free	(struct _ESExp *f, struct _ESExpResult *t);
-
-/* used in normal functions if they have to abort, to free their arguments */
-void		e_sexp_resultv_free	(struct _ESExp *f, int argc, struct _ESExpResult **argv);
-
-/* utility functions for creating s-exp strings. */
-void		e_sexp_encode_bool	(GString *s, gboolean state);
-void		e_sexp_encode_string	(GString *s, const char *string);
-
-/* only to be called from inside a callback to signal a fatal execution error */
-void		e_sexp_fatal_error	(struct _ESExp *f, char *why, ...);
-
-/* return the error string */
-const char     *e_sexp_error		(struct _ESExp *f);
-
-#endif /* _E_SEXP_H */
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
deleted file mode 100644
index b6e0c000fc..0000000000
--- a/e-util/e-sorter.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-sorted.c: Virtual sorter class
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000,2001 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-sorter.h"
-
-#define d(x)
-
-#define PARENT_TYPE gtk_object_get_type()
-
-static GtkObjectClass *parent_class;
-
-#define ES_CLASS(es) ((ESorterClass *)((GtkObject *)(es))->klass)
-
-static gint es_model_to_sorted (ESorter *es, int row);
-static gint es_sorted_to_model (ESorter *es, int row);
-static void es_get_model_to_sorted_array (ESorter *es, int **array, int *count);
-static void es_get_sorted_to_model_array (ESorter *es, int **array, int *count);
-static gboolean es_needs_sorting(ESorter *es);
-
-static void
-es_class_init (ESorterClass *klass)
-{
-	parent_class                     = gtk_type_class (PARENT_TYPE);
-
-	klass->model_to_sorted           = es_model_to_sorted;
-	klass->sorted_to_model           = es_sorted_to_model;
-	klass->get_model_to_sorted_array = es_get_model_to_sorted_array;
-	klass->get_sorted_to_model_array = es_get_sorted_to_model_array;
-	klass->needs_sorting             = es_needs_sorting;
-}
-
-static void
-es_init (ESorter *es)
-{
-}
-
-E_MAKE_TYPE(e_sorter, "ESorter", ESorter, es_class_init, es_init, PARENT_TYPE);
-
-ESorter *
-e_sorter_new (void)
-{
-	ESorter *es = gtk_type_new (E_SORTER_TYPE);
-	
-	return es;
-}
-
-
-static gint
-es_model_to_sorted (ESorter *es, int row)
-{
-	return row;
-}
-
-static gint
-es_sorted_to_model (ESorter *es, int row)
-{
-	return row;
-}
-
-
-static void
-es_get_model_to_sorted_array (ESorter *es, int **array, int *count)
-{
-}
-
-static void
-es_get_sorted_to_model_array (ESorter *es, int **array, int *count)
-{
-}
-
-
-static gboolean
-es_needs_sorting(ESorter *es)
-{
-	return FALSE;
-}
-
-gint
-e_sorter_model_to_sorted (ESorter *es, int row)
-{
-	g_return_val_if_fail(es != NULL, -1);
-	g_return_val_if_fail(row >= 0, -1);
-
-	if (ES_CLASS(es)->model_to_sorted)
-		return ES_CLASS(es)->model_to_sorted (es, row);
-	else
-		return -1;
-}
-
-gint
-e_sorter_sorted_to_model (ESorter *es, int row)
-{
-	g_return_val_if_fail(es != NULL, -1);
-	g_return_val_if_fail(row >= 0, -1);
-
-	if (ES_CLASS(es)->sorted_to_model)
-		return ES_CLASS(es)->sorted_to_model (es, row);
-	else
-		return -1;
-}
-
-
-void
-e_sorter_get_model_to_sorted_array (ESorter *es, int **array, int *count)
-{
-	g_return_if_fail(es != NULL);
-
-	if (ES_CLASS(es)->get_model_to_sorted_array)
-		ES_CLASS(es)->get_model_to_sorted_array (es, array, count);
-}
-
-void
-e_sorter_get_sorted_to_model_array (ESorter *es, int **array, int *count)
-{
-	g_return_if_fail(es != NULL);
-
-	if (ES_CLASS(es)->get_sorted_to_model_array)
-		ES_CLASS(es)->get_sorted_to_model_array (es, array, count);
-}
-
-
-gboolean
-e_sorter_needs_sorting(ESorter *es)
-{
-	g_return_val_if_fail (es != NULL, FALSE);
-
-	if (ES_CLASS(es)->needs_sorting)
-		return ES_CLASS(es)->needs_sorting (es);
-	else
-		return FALSE;
-}
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
deleted file mode 100644
index fa6c5bbc60..0000000000
--- a/e-util/e-sorter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SORTER_H_
-#define _E_SORTER_H_
-
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SORTER_TYPE        (e_sorter_get_type ())
-#define E_SORTER(o)          (GTK_CHECK_CAST ((o), E_SORTER_TYPE, ESorter))
-#define E_SORTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SORTER_TYPE, ESorterClass))
-#define E_IS_SORTER(o)       (GTK_CHECK_TYPE ((o), E_SORTER_TYPE))
-#define E_IS_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SORTER_TYPE))
-
-typedef struct {
-	GtkObject base;
-} ESorter;
-
-typedef struct {
-	GtkObjectClass parent_class;
-	gint      (*model_to_sorted)            (ESorter    *sorter,
-						 int         row);
-	gint      (*sorted_to_model)            (ESorter    *sorter,
-						 int         row);
-	  
-	void      (*get_model_to_sorted_array)  (ESorter    *sorter,
-						 int       **array,
-						 int        *count);
-	void      (*get_sorted_to_model_array)  (ESorter    *sorter,
-						 int       **array,
-						 int        *count);
-	  
-	gboolean  (*needs_sorting)              (ESorter    *sorter);
-} ESorterClass;
-
-GtkType   e_sorter_get_type                   (void);
-ESorter  *e_sorter_new                        (void);
-
-gint      e_sorter_model_to_sorted            (ESorter  *sorter,
-					       int       row);
-gint      e_sorter_sorted_to_model            (ESorter  *sorter,
-					       int       row);
-
-void      e_sorter_get_model_to_sorted_array  (ESorter  *sorter,
-					       int     **array,
-					       int      *count);
-void      e_sorter_get_sorted_to_model_array  (ESorter  *sorter,
-					       int     **array,
-					       int      *count);
-
-gboolean  e_sorter_needs_sorting              (ESorter  *sorter);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SORTER_H_ */
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
deleted file mode 100644
index c369177f6a..0000000000
--- a/e-util/e-text-event-processor-emacs-like.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-text-event-processor-emacs-like.h"
-
-static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
-static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);
-static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-
-static ETextEventProcessorClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0
-};
-
-static const ETextEventProcessorCommand control_keys[26] =
-{
-	{ E_TEP_START_OF_LINE,      E_TEP_MOVE, 0, "" }, /* a */
-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_MOVE, 0, "" }, /* b */
-	{ E_TEP_SELECTION,          E_TEP_COPY, 0, "" }, /* c */
-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_DELETE, 0, "" }, /* d */
-	{ E_TEP_END_OF_LINE,        E_TEP_MOVE, 0, "" }, /* e */
-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_MOVE, 0, "" }, /* f */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */
-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_DELETE, 0, "" }, /* h */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */
-	{ E_TEP_END_OF_LINE,        E_TEP_DELETE, 0, "" }, /* k */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */
-	{ E_TEP_FORWARD_LINE,       E_TEP_MOVE, 0, "" }, /* n */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */
-	{ E_TEP_BACKWARD_LINE,      E_TEP_MOVE, 0, "" }, /* p */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */
-	{ E_TEP_START_OF_LINE,      E_TEP_DELETE, 0, "" }, /* u */
-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* v */
-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* w */
-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* x */
-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* y */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */
-};
-
-static const ETextEventProcessorCommand alt_keys[26] =
-{
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* a */
-	{ E_TEP_BACKWARD_WORD,      E_TEP_MOVE, 0, "" }, /* b */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* c */
-	{ E_TEP_FORWARD_WORD,       E_TEP_DELETE, 0, "" }, /* d */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* e */
-	{ E_TEP_FORWARD_WORD,       E_TEP_MOVE, 0, "" }, /* f */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* h */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* k */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* n */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* p */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* u */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* v */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* w */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* x */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* y */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */
-
-};
-
-GtkType
-e_text_event_processor_emacs_like_get_type (void)
-{
-  static GtkType text_event_processor_emacs_like_type = 0;
-
-  if (!text_event_processor_emacs_like_type)
-    {
-      static const GtkTypeInfo text_event_processor_emacs_like_info =
-      {
-        "ETextEventProcessorEmacsLike",
-        sizeof (ETextEventProcessorEmacsLike),
-        sizeof (ETextEventProcessorEmacsLikeClass),
-        (GtkClassInitFunc) e_text_event_processor_emacs_like_class_init,
-        (GtkObjectInitFunc) e_text_event_processor_emacs_like_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      text_event_processor_emacs_like_type = gtk_type_unique (e_text_event_processor_get_type (), &text_event_processor_emacs_like_info);
-    }
-
-  return text_event_processor_emacs_like_type;
-}
-
-static void
-e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass)
-{
-  GtkObjectClass *object_class;
-  ETextEventProcessorClass *processor_class;
-
-  object_class = (GtkObjectClass*) klass;
-  processor_class = (ETextEventProcessorClass*) klass;
-
-  parent_class = gtk_type_class (e_text_event_processor_get_type ());
-
-  processor_class->event = e_text_event_processor_emacs_like_event;
-}
-
-static void
-e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *tep)
-{
-}
-
-static gint
-e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
-{
-	ETextEventProcessorCommand command;
-	ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep);
-	command.action = E_TEP_NOP;
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_GRAB;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-			if (event->button.state & GDK_SHIFT_MASK)
-				command.action = E_TEP_SELECT;
-			else
-				command.action = E_TEP_MOVE;
-			command.position = E_TEP_VALUE;
-			command.value = event->button.position;
-			command.time = event->button.time;
-			tep_el->mouse_down = TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_SELECT_WORD;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_3BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_SELECT_ALL;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button == 1) {
-			command.action = E_TEP_UNGRAB;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-			command.time = event->button.time;
-			tep_el->mouse_down = FALSE;
-			command.action = E_TEP_NOP;
-		} else if (event->button.button == 2) {
-			command.action = E_TEP_MOVE;
-			command.position = E_TEP_VALUE;
-			command.value = event->button.position;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);			
-
-			command.action = E_TEP_GET_SELECTION;
-			command.position = E_TEP_SELECTION;
-			command.value = 0;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (tep_el->mouse_down) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_VALUE;
-			command.time = event->motion.time;
-			command.value = event->motion.position;
-		}
-		break;
-	case GDK_KEY_PRESS: 
-		{
-			ETextEventProcessorEventKey key = event->key;
-			command.time = event->key.time;
-			if (key.state & GDK_SHIFT_MASK)
-				command.action = E_TEP_SELECT;
-			else
-				command.action = E_TEP_MOVE;
-			switch(key.keyval) {
-			case GDK_Home:
-			case GDK_KP_Home:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_START_OF_BUFFER;
-				else
-					command.position = E_TEP_START_OF_LINE;
-				break;
-			case GDK_End:
-			case GDK_KP_End:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_END_OF_BUFFER;
-				else
-					command.position = E_TEP_END_OF_LINE;
-				break;
-			case GDK_Page_Up:
-			case GDK_KP_Page_Up: command.position = E_TEP_BACKWARD_PAGE; break;
-
-			case GDK_Page_Down:
-			case GDK_KP_Page_Down: command.position = E_TEP_FORWARD_PAGE; break;
-				/* CUA has Ctrl-Up/Ctrl-Down as paragraph up down */
-			case GDK_Up:
-			case GDK_KP_Up:        command.position = E_TEP_BACKWARD_LINE; break;
-
-			case GDK_Down:
-			case GDK_KP_Down:      command.position = E_TEP_FORWARD_LINE; break;
-
-			case GDK_Left:
-			case GDK_KP_Left:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_BACKWARD_WORD;
-				else
-					command.position = E_TEP_BACKWARD_CHARACTER;
-				break;
-			case GDK_Right:
-			case GDK_KP_Right:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_FORWARD_WORD;
-				else
-					command.position = E_TEP_FORWARD_CHARACTER;
-				break;
-	  
-			case GDK_BackSpace:
-				command.action = E_TEP_DELETE;
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_BACKWARD_WORD;
-				else
-					command.position = E_TEP_BACKWARD_CHARACTER;
-				break;
-			case GDK_Clear:
-				command.action = E_TEP_DELETE;
-				command.position = E_TEP_END_OF_LINE;
-				break;
-			case GDK_Insert:
-			case GDK_KP_Insert:
-				if (key.state & GDK_SHIFT_MASK) {
-					command.action = E_TEP_PASTE;
-					command.position = E_TEP_SELECTION;
-				} else if (key.state & GDK_CONTROL_MASK) {
-					command.action = E_TEP_COPY;
-					command.position = E_TEP_SELECTION;
-				} else {
-				/* gtk_toggle_insert(text) -- IMPLEMENT -- FIXME */
-				}
-				break;
-			case GDK_Delete:
-			case GDK_KP_Delete:
-				if (key.state & GDK_CONTROL_MASK){
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_FORWARD_WORD;
-				} else if (key.state & GDK_SHIFT_MASK) {
-					command.action = E_TEP_COPY;
-					command.position = E_TEP_SELECTION;
-					gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-				
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_SELECTION;
-				} else {
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_FORWARD_CHARACTER;
-				}
-				break;
-			case GDK_Tab:
-			case GDK_KP_Tab:
-			case GDK_ISO_Left_Tab:
-			case GDK_3270_BackTab:
-				/* Don't insert literally */
-				command.action = E_TEP_NOP;
-				command.position = E_TEP_SELECTION;
-				break;
-			case GDK_Return:
-			case GDK_KP_Enter:
-				if (tep->allow_newlines) {
-					command.action = E_TEP_INSERT;
-					command.position = E_TEP_SELECTION;
-					command.value = 1;
-					command.string = "\n";
-				} else {
-					command.action = E_TEP_ACTIVATE;
-					command.position = E_TEP_SELECTION;
-				}
-				break;
-			case GDK_Escape:
-				/* Don't insert literally */
-				command.action = E_TEP_NOP;
-				command.position = E_TEP_SELECTION;
-				break;
-
-			case GDK_KP_Space:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = " ";
-				break;
-			case GDK_KP_Equal:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "=";
-				break;
-			case GDK_KP_Multiply:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "*";
-				break;
-			case GDK_KP_Add:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "+";
-				break;
-			case GDK_KP_Subtract:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "-";
-				break;
-			case GDK_KP_Decimal:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = ".";
-				break;
-			case GDK_KP_Divide:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "/";
-				break;
-			case GDK_KP_0:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "0";
-				break;
-			case GDK_KP_1:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "1";
-				break;
-			case GDK_KP_2:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "2";
-				break;
-			case GDK_KP_3:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "3";
-				break;
-			case GDK_KP_4:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "4";
-				break;
-			case GDK_KP_5:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "5";
-				break;
-			case GDK_KP_6:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "6";
-				break;
-			case GDK_KP_7:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "7";
-				break;
-			case GDK_KP_8:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "8";
-				break;
-			case GDK_KP_9:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "9";
-				break;
-
-			default:
-				if (key.state & GDK_CONTROL_MASK) {
-					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
-						key.keyval -= 'A' - 'a';
-					
-					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = control_keys[(int) (key.keyval - 'a')].position;
-						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = control_keys[(int) (key.keyval - 'a')].action;
-						command.value = control_keys[(int) (key.keyval - 'a')].value;
-						command.string = control_keys[(int) (key.keyval - 'a')].string;
-					}
-
-					if (key.keyval == 'x' || key.keyval == 'w') {
-						command.action = E_TEP_COPY;
-						command.position = E_TEP_SELECTION;
-						gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-						
-						command.action = E_TEP_DELETE;
-						command.position = E_TEP_SELECTION;
-					}
-					
-					break;
-				} else if (key.state & GDK_MOD1_MASK) {
-					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
-						key.keyval -= 'A' - 'a';
-					
-					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = alt_keys[(int) (key.keyval - 'a')].position;
-						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = alt_keys[(int) (key.keyval - 'a')].action;
-						command.value = alt_keys[(int) (key.keyval - 'a')].value;
-						command.string = alt_keys[(int) (key.keyval - 'a')].string;
-					}
-				} else if (key.length > 0) {
-					if (key.keyval >= GDK_KP_0 && key.keyval <= GDK_KP_9) {
-						key.keyval = '0';
-						key.string = "0";
-					}
-					command.action = E_TEP_INSERT;
-					command.position = E_TEP_SELECTION;
-					command.value = strlen(key.string);
-					command.string = key.string;
-					
-				} else {
-					command.action = E_TEP_NOP;
-				}
-			}
-			break;
-		case GDK_KEY_RELEASE:
-			command.time = event->key.time;
-			command.action = E_TEP_NOP;
-			break;
-		default:
-			command.action = E_TEP_NOP;
-			break;
-		}
-	}
-	if (command.action != E_TEP_NOP) {
-		gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-		return 1;
-	}
-	else
-		return 0;
-}
-
-ETextEventProcessor *
-e_text_event_processor_emacs_like_new (void)
-{
-	ETextEventProcessorEmacsLike *retval = gtk_type_new (e_text_event_processor_emacs_like_get_type ());
-	return E_TEXT_EVENT_PROCESSOR (retval);
-}
-
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
deleted file mode 100644
index dbc909e2c7..0000000000
--- a/e-util/e-text-event-processor-emacs-like.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor-emacs-like.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
-#define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
-
-#include <gnome.h>
-#include <gal/util/e-text-event-processor.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands.  Uses an emacs-ish interface.
- *
- */
-
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE			(e_text_event_processor_emacs_like_get_type ())
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-
-
-typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;
-typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeClass;
-
-struct _ETextEventProcessorEmacsLike
-{
-	ETextEventProcessor parent;
-	
-	/* object specific fields */
-	guint mouse_down : 1;
-};
-
-struct _ETextEventProcessorEmacsLikeClass
-{
-	ETextEventProcessorClass parent_class;
-};
-
-
-GtkType    e_text_event_processor_emacs_like_get_type (void);
-ETextEventProcessor *e_text_event_processor_emacs_like_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
deleted file mode 100644
index 1e012cdf1a..0000000000
--- a/e-util/e-text-event-processor-types.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gdk/gdktypes.h>
-
-typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;
-
-typedef enum {
-	E_TEP_VALUE,
-	E_TEP_SELECTION,
-
-	E_TEP_START_OF_BUFFER,
-	E_TEP_END_OF_BUFFER,
-
-	E_TEP_START_OF_LINE,
-	E_TEP_END_OF_LINE,
-
-	E_TEP_FORWARD_CHARACTER,
-	E_TEP_BACKWARD_CHARACTER,
-
-	E_TEP_FORWARD_WORD,
-	E_TEP_BACKWARD_WORD,
-
-	E_TEP_FORWARD_LINE,
-	E_TEP_BACKWARD_LINE,
-
-	E_TEP_FORWARD_PARAGRAPH,
-	E_TEP_BACKWARD_PARAGRAPH,
-
-	E_TEP_FORWARD_PAGE,
-	E_TEP_BACKWARD_PAGE,
-
-	E_TEP_SELECT_WORD,
-	E_TEP_SELECT_ALL
-
-} ETextEventProcessorCommandPosition;
-
-typedef enum {
-	E_TEP_MOVE,
-	E_TEP_SELECT,
-	E_TEP_DELETE,
-	E_TEP_INSERT,
-
-	E_TEP_COPY,
-	E_TEP_PASTE,
-	E_TEP_GET_SELECTION,
-	E_TEP_SET_SELECT_BY_WORD,
-	E_TEP_ACTIVATE,
-	
-	E_TEP_GRAB,
-	E_TEP_UNGRAB,
-
-	E_TEP_NOP
-} ETextEventProcessorCommandAction;
-
-typedef struct {
-	ETextEventProcessorCommandPosition position;
-	ETextEventProcessorCommandAction action;
-	int value;
-	char *string;
-	guint32 time;
-} ETextEventProcessorCommand;
-
-typedef struct {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	guint button;
-	gint position;
-} ETextEventProcessorEventButton;
-
-typedef struct {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	guint keyval;
-	gint length;
-	gchar *string;
-} ETextEventProcessorEventKey;
-
-typedef struct {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	gint position;
-} ETextEventProcessorEventMotion;
-
-union _ETextEventProcessorEvent {
-	GdkEventType type;
-	ETextEventProcessorEventButton button;
-	ETextEventProcessorEventKey key;
-	ETextEventProcessorEventMotion motion;
-};
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_TYPES_H__ */
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
deleted file mode 100644
index 772ae5c12b..0000000000
--- a/e-util/e-text-event-processor.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-text-event-processor.h"
-
-static void e_text_event_processor_init		(ETextEventProcessor		 *card);
-static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
-
-static void e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static GtkObjectClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ALLOW_NEWLINES,
-};
-
-enum {
-	E_TEP_EVENT,
-	E_TEP_LAST_SIGNAL
-};
-
-static guint e_tep_signals[E_TEP_LAST_SIGNAL] = { 0 };
-
-GtkType
-e_text_event_processor_get_type (void)
-{
-  static GtkType text_event_processor_type = 0;
-
-  if (!text_event_processor_type)
-    {
-      static const GtkTypeInfo text_event_processor_info =
-      {
-        "ETextEventProcessor",
-        sizeof (ETextEventProcessor),
-        sizeof (ETextEventProcessorClass),
-        (GtkClassInitFunc) e_text_event_processor_class_init,
-        (GtkObjectInitFunc) e_text_event_processor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      text_event_processor_type = gtk_type_unique (gtk_object_get_type (), &text_event_processor_info);
-    }
-
-  return text_event_processor_type;
-}
-
-static void
-e_text_event_processor_class_init (ETextEventProcessorClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_tep_signals[E_TEP_EVENT] =
-		gtk_signal_new ("command",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-
-	klass->event = NULL;
-	klass->command = NULL;
-
-	object_class->set_arg = e_text_event_processor_set_arg;
-	object_class->get_arg = e_text_event_processor_get_arg;
-}
-
-static void
-e_text_event_processor_init (ETextEventProcessor *tep)
-{
-	tep->allow_newlines = TRUE;
-}
-
-gint
-e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
-{
-	if (E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)->klass)->event) {
-		return E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)->klass)->event(tep, event);
-	} else {
-		return 0;
-	}
-}
-
-/* Set_arg handler for the text item */
-static void
-e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
-
-	switch (arg_id) {
-	case ARG_ALLOW_NEWLINES:
-		tep->allow_newlines = GTK_VALUE_BOOL (*arg);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the text item */
-static void
-e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
-
-	switch (arg_id) {
-	case ARG_ALLOW_NEWLINES:
-		GTK_VALUE_BOOL (*arg) = tep->allow_newlines;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
deleted file mode 100644
index e11c6451cc..0000000000
--- a/e-util/e-text-event-processor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TEXT_EVENT_PROCESSOR_H__
-#define __E_TEXT_EVENT_PROCESSOR_H__
-
-#include <gnome.h>
-#include <gal/util/e-text-event-processor-types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETextEventProcessor - Turns events on a text widget into commands.
- *
- */
-
-#define E_TEXT_EVENT_PROCESSOR_TYPE			(e_text_event_processor_get_type ())
-#define E_TEXT_EVENT_PROCESSOR(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))
-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
-#define E_IS_TEXT_EVENT_PROCESSOR(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-
-
-typedef struct _ETextEventProcessor       ETextEventProcessor;
-typedef struct _ETextEventProcessorClass  ETextEventProcessorClass;
-
-struct _ETextEventProcessor
-{
-	GtkObject parent;
-
-	/* object specific fields */
-	guint allow_newlines : 1;
-};
-
-struct _ETextEventProcessorClass
-{
-	GtkObjectClass parent_class;
-
-	/* signals */
-	void (* command) (ETextEventProcessor *tep, ETextEventProcessorCommand *command);
-
-	/* virtual functions */
-	gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-};
-
-
-GtkType    e_text_event_processor_get_type (void);
-gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_H__ */
diff --git a/e-util/e-util.c b/e-util/e-util.c
deleted file mode 100644
index 02092041f0..0000000000
--- a/e-util/e-util.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <locale.h>
-#include <stdio.h>
-
-#include "e-util.h"
-#if 0
-#include <libgnomevfs/gnome-vfs.h>
-#endif
-
-int
-g_str_compare(const void *x, const void *y)
-{
-  return strcmp(x, y);
-}
-
-int
-g_int_compare(const void *x, const void *y)
-{
-  if ( GPOINTER_TO_INT(x) < GPOINTER_TO_INT(y) )
-    return -1;
-  else if ( GPOINTER_TO_INT(x) == GPOINTER_TO_INT(y) )
-    return 0;
-  else
-    return 1;
-}
-
-char *
-e_strdup_strip(const char *string)
-{
-	int i;
-	int length = 0;
-	int initial = 0;
-	for ( i = 0; string[i]; i++ ) {
-		if (initial == i && isspace((unsigned char) string[i])) {
-			initial ++;
-		}
-		if (!isspace((unsigned char) string[i])) {
-			length = i - initial + 1;
-		}
-	}
-	return g_strndup(string + initial, length);
-}
-
-void
-e_free_object_list (GList *list)
-{
-	GList *p;
-
-	for (p = list; p != NULL; p = p->next)
-		gtk_object_unref (GTK_OBJECT (p->data));
-
-	g_list_free (list);
-}
-
-void
-e_free_string_list (GList *list)
-{
-	GList *p;
-
-	for (p = list; p != NULL; p = p->next)
-		g_free (p->data);
-
-	g_list_free (list);
-}
-
-#define BUFF_SIZE 1024
-
-char *
-e_read_file(const char *filename)
-{
-	int fd;
-	char buffer[BUFF_SIZE];
-	GList *list = NULL, *list_iterator;
-	GList *lengths = NULL, *lengths_iterator;
-	int length = 0;
-	int bytes;
-	char *ret_val;
-
-	fd = open(filename, O_RDONLY);
-	if (fd == -1)
-		return NULL;
-	bytes = read(fd, buffer, BUFF_SIZE);
-	while (bytes) {
-		if (bytes > 0) {
-			char *temp = g_malloc(bytes);
-			memcpy (temp, buffer, bytes);
-			list = g_list_prepend(list, temp);
-			lengths = g_list_prepend(lengths, GINT_TO_POINTER(bytes));
-			length += bytes;
-		} else {
-			if (errno != EINTR) {
-				close(fd);
-				g_list_foreach(list, (GFunc) g_free, NULL);
-				g_list_free(list);
-				g_list_free(lengths);
-				return NULL;
-			}
-		}
-		bytes = read(fd, buffer, BUFF_SIZE);
-	}
-	ret_val = g_new(char, length + 1);
-	ret_val[length] = 0;
-	lengths_iterator = lengths;
-	list_iterator = list;
-	for ( ; list_iterator; list_iterator = list_iterator->next, lengths_iterator = lengths_iterator->next) {
-		int this_length = GPOINTER_TO_INT(lengths_iterator->data);
-		length -= this_length;
-		memcpy(ret_val + length, list_iterator->data, this_length);
-	}
-	close(fd);
-	g_list_foreach(list, (GFunc) g_free, NULL);
-	g_list_free(list);
-	g_list_free(lengths);
-	return ret_val;
-}
-
-gint
-e_write_file(const char *filename, const char *data, int flags)
-{
-	int fd;
-	int length = strlen(data);
-	int bytes;
-	fd = open(filename, flags, 0666);
-	if (fd == -1)
-		return errno;
-	while (length > 0) {
-		bytes = write(fd, data, length);
-		if (bytes > 0) {
-			length -= bytes;
-			data += bytes;
-		} else {
-			if (errno != EINTR && errno != EAGAIN) {
-				int save_errno = errno;
-				close(fd);
-				return save_errno;
-			}
-		}
-	}
-	close(fd);
-	return 0;
-}
-
-/**
- * e_mkdir_hier:
- * @path: a directory path
- * @mode: a mode, as for mkdir(2)
- *
- * This creates the named directory with the given @mode, creating
- * any necessary intermediate directories (with the same @mode).
- *
- * Return value: 0 on success, -1 on error, in which case errno will
- * be set as for mkdir(2).
- **/
-int
-e_mkdir_hier(const char *path, mode_t mode)
-{
-	char *copy, *p;
-
-	p = copy = g_strdup (path);
-	do {
-		p = strchr (p + 1, '/');
-		if (p)
-			*p = '\0';
-		if (access (copy, F_OK) == -1) {
-			if (mkdir (copy, mode) == -1) {
-				g_free (copy);
-				return -1;
-			}
-		}
-		if (p)
-			*p = '/';
-	} while (p);
-
-	g_free (copy);
-	return 0;
-}
-
-#if 0
-char *
-e_read_uri(const char *uri)
-{
-	GnomeVFSHandle *handle;
-	GList *list = NULL, *list_iterator;
-	GList *lengths = NULL, *lengths_iterator;
-	gchar buffer[1025];
-	gchar *ret_val;
-	int length = 0;
-	GnomeVFSFileSize bytes;
-
-	gnome_vfs_open(&handle, uri, GNOME_VFS_OPEN_READ);
-	
-	gnome_vfs_read(handle, buffer, 1024, &bytes);
-	while (bytes) {
-		if (bytes) {
-			char *temp = g_malloc(bytes);
-			memcpy (temp, buffer, bytes);
-			list = g_list_prepend(list, temp);
-			lengths = g_list_prepend(lengths, GINT_TO_POINTER((gint) bytes));
-			length += bytes;
-		}
-		gnome_vfs_read(handle, buffer, 1024, &bytes);
-	}
-
-	ret_val = g_new(char, length + 1);
-	ret_val[length] = 0;
-	lengths_iterator = lengths;
-	list_iterator = list;
-	for ( ; list_iterator; list_iterator = list_iterator->next, lengths_iterator = lengths_iterator->next) {
-		int this_length = GPOINTER_TO_INT(lengths_iterator->data);
-		length -= this_length;
-		memcpy(ret_val + length, list_iterator->data, this_length);
-	}
-	gnome_vfs_close(handle);
-	g_list_foreach(list, (GFunc) g_free, NULL);
-	g_list_free(list);
-	g_list_free(lengths);
-	return ret_val;
-}
-#endif
-
-typedef gint (*GtkSignal_INT__INT_INT_POINTER) (GtkObject * object,
-						gint arg1,
-						gint arg2,
-						gpointer arg3,
-						gpointer user_data);
-
-void
-e_marshal_INT__INT_INT_POINTER (GtkObject * object,
-				GtkSignalFunc func,
-				gpointer func_data, GtkArg * args)
-{
-	GtkSignal_INT__INT_INT_POINTER rfunc;
-	gint *return_val;
-	return_val = GTK_RETLOC_INT (args[3]);
-	rfunc = (GtkSignal_INT__INT_INT_POINTER) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_INT     (args[0]),
-				GTK_VALUE_INT     (args[1]),
-				GTK_VALUE_POINTER (args[2]),
-				func_data);
-}
-
-typedef void (*GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-							      GtkObject *arg1,
-							      gdouble arg2,
-							      gdouble arg3,
-							      gboolean arg4,
-							      gpointer user_data);
-
-void
-e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					   GtkSignalFunc func,
-					   gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	rfunc = (GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	(*rfunc) (object,
-		  GTK_VALUE_OBJECT (args[0]),
-		  GTK_VALUE_DOUBLE (args[1]),
-		  GTK_VALUE_DOUBLE (args[2]),
-		  GTK_VALUE_BOOL   (args[3]),
-		  func_data);
-}
-
-typedef gdouble (*GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-								GtkObject *arg1,
-								gdouble arg2,
-								gdouble arg3,
-								gboolean arg4,
-								gpointer user_data);
-
-void
-e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					GtkSignalFunc func,
-					gpointer func_data, GtkArg * args)
-{
-	GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	gdouble *return_val;
-	return_val = GTK_RETLOC_DOUBLE (args[4]);
-	rfunc = (GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_OBJECT (args[0]),
-				GTK_VALUE_DOUBLE (args[1]),
-				GTK_VALUE_DOUBLE (args[2]),
-				GTK_VALUE_BOOL   (args[3]),
-				func_data);
-}
-
-typedef gdouble (*GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-							      GtkObject *arg1,
-							      gdouble arg2,
-							      gdouble arg3,
-							      gboolean arg4,
-							      gpointer user_data);
-
-void
-e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					GtkSignalFunc func,
-					gpointer func_data, GtkArg * args)
-{
-	GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	gboolean *return_val;
-	return_val = GTK_RETLOC_BOOL (args[4]);
-	rfunc = (GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_OBJECT (args[0]),
-				GTK_VALUE_DOUBLE (args[1]),
-				GTK_VALUE_DOUBLE (args[2]),
-				GTK_VALUE_BOOL   (args[3]),
-				func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) (GtkObject * object,
-								 gint arg1, 
-								 gint arg2,
-								 gpointer arg3,
-								 gpointer arg4,
-								 gint arg5,
-								 gint arg6,
-								 gpointer user_data);
-void
-e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,
-					   GtkSignalFunc func,
-					   gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]),
-	    GTK_VALUE_POINTER (args[3]),
-	    GTK_VALUE_INT (args[4]), GTK_VALUE_INT (args[5]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT) (GtkObject * object,
-						     gint arg1, 
-						     gint arg2,
-						     gpointer arg3,
-						     gint arg4, gpointer user_data);
-void
-e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,
-			       GtkSignalFunc func,
-			       gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]), GTK_VALUE_INT (args[3]), func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) (GtkObject * object,
-								 gint arg1, 
-								 gint arg2,
-								 gpointer arg3,
-								 gint arg4,
-								 gint arg5,
-								 gint arg6,
-								 gpointer user_data);
-void
-e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,
-				       GtkSignalFunc func,
-				       gpointer func_data, GtkArg * args)
-{
-  GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT rfunc;
-  gboolean *return_val;
-  return_val = GTK_RETLOC_BOOL (args[6]);
-  rfunc = (GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) func;
-  *return_val = (*rfunc) (object,
-			  GTK_VALUE_INT (args[0]),
-			  GTK_VALUE_INT (args[1]), 
-			  GTK_VALUE_POINTER (args[2]),
-			  GTK_VALUE_INT (args[3]),
-			  GTK_VALUE_INT (args[4]),
-			  GTK_VALUE_INT (args[5]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) (GtkObject *
-									 object,
-									 gint arg1, 
-									 gint arg2,
-									 gpointer
-									 arg3,
-									 gint arg4,
-									 gint arg5,
-									 gpointer
-									 arg6,
-									 gint arg7,
-									 gint arg8,
-									 gpointer
-									 user_data);
-
-void
-e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,
-						   GtkSignalFunc func,
-						   gpointer func_data,
-						   GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]),
-	    GTK_VALUE_INT (args[3]),
-	    GTK_VALUE_INT (args[4]),
-	    GTK_VALUE_POINTER (args[5]),
-	    GTK_VALUE_INT (args[6]), GTK_VALUE_INT (args[7]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_POINTER_INT) (GtkObject *, gpointer,
-						     gpointer, gint, gpointer);
-
-void
-e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object, GtkSignalFunc func,
-				     gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__POINTER_POINTER_INT rfunc;
-  rfunc = (GtkSignal_NONE__POINTER_POINTER_INT) func;
-  (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),
-	    GTK_VALUE_INT (args[2]), func_data);
-}	
-
-typedef int (*GtkSignal_INT__POINTER_POINTER) (GtkObject *,
-					       gpointer, gpointer, 
-					       gpointer user_data);
-void
-e_marshal_INT__POINTER_POINTER (GtkObject *object,
-				GtkSignalFunc func,
-				gpointer func_data,
-				GtkArg *args)
-{
-	GtkSignal_INT__POINTER_POINTER rfunc;
-	int *return_val;
-
-	rfunc = (GtkSignal_INT__POINTER_POINTER) func;
-	return_val = GTK_RETLOC_INT (args[2]);
-
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_POINTER (args[0]),
-				GTK_VALUE_POINTER (args[1]), 
-				func_data);
-}
-
-typedef int (*GtkSignal_INT__POINTER_POINTER_POINTER) (GtkObject *,
-						       gpointer, gpointer, gpointer, 
-						       gpointer user_data);
-void
-e_marshal_INT__POINTER_POINTER_POINTER (GtkObject *object,
-					GtkSignalFunc func,
-					gpointer func_data,
-					GtkArg *args)
-{
-	GtkSignal_INT__POINTER_POINTER_POINTER rfunc;
-	int *return_val;
-
-	rfunc = (GtkSignal_INT__POINTER_POINTER_POINTER) func;
-	return_val = GTK_RETLOC_INT (args[3]);
-
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_POINTER (args[0]),
-				GTK_VALUE_POINTER (args[1]), 
-				GTK_VALUE_POINTER (args[2]),
-				func_data);
-}
-
-typedef int (*GtkSignal_INT__POINTER_POINTER_POINTER_POINTER) (GtkObject *,
-							       gpointer, gpointer, gpointer, gpointer,
-							       gpointer user_data);
-void
-e_marshal_INT__POINTER_POINTER_POINTER_POINTER (GtkObject *object,
-						GtkSignalFunc func,
-						gpointer func_data,
-						GtkArg *args)
-{
-	GtkSignal_INT__POINTER_POINTER_POINTER_POINTER rfunc;
-	int *return_val;
-
-	rfunc = (GtkSignal_INT__POINTER_POINTER_POINTER_POINTER) func;
-	return_val = GTK_RETLOC_INT (args[4]);
-
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_POINTER (args[0]),
-				GTK_VALUE_POINTER (args[1]), 
-				GTK_VALUE_POINTER (args[2]),
-				GTK_VALUE_POINTER (args[3]),
-				func_data);
-}
-
-gchar**
-e_strsplit (const gchar *string,
-	    const gchar *delimiter,
-	    gint         max_tokens)
-{
-  GSList *string_list = NULL, *slist;
-  gchar **str_array, *s;
-  guint i, n = 1;
-
-  g_return_val_if_fail (string != NULL, NULL);
-  g_return_val_if_fail (delimiter != NULL, NULL);
-
-  if (max_tokens < 1)
-    max_tokens = G_MAXINT;
-
-  s = strstr (string, delimiter);
-  if (s)
-    {
-      guint delimiter_len = strlen (delimiter);
-
-      do
-	{
-	  guint len;
-	  gchar *new_string;
-
-	  len = s - string;
-	  new_string = g_new (gchar, len + 1);
-	  strncpy (new_string, string, len);
-	  new_string[len] = 0;
-	  string_list = g_slist_prepend (string_list, new_string);
-	  n++;
-	  string = s + delimiter_len;
-	  s = strstr (string, delimiter);
-	}
-      while (--max_tokens && s);
-    }
-
-  n++;
-  string_list = g_slist_prepend (string_list, g_strdup (string));
-
-  str_array = g_new (gchar*, n);
-
-  i = n - 1;
-
-  str_array[i--] = NULL;
-  for (slist = string_list; slist; slist = slist->next)
-    str_array[i--] = slist->data;
-
-  g_slist_free (string_list);
-
-  return str_array;
-}
-
-gchar *
-e_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	/* find the needle in the haystack neglecting case */
-	const gchar *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 (gchar *) haystack;
-
-	for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)
-		if (!g_strncasecmp (ptr, needle, len))
-			return (gchar *) ptr;
-
-	return NULL;
-}
-
-void
-e_filename_make_safe (gchar *string)
-{
-	gchar *p;
-	
-	g_return_if_fail (string != NULL);
-	
-	for (p = string; *p; p++) {
-		if (!isprint ((unsigned char)*p) || strchr (" /'\"`&();|<>${}!", *p))
-			*p = '_';
-	}
-}
-
-static gint
-epow10 (gint number) {
-	gint value;
-
-	for (value = 1; number > 0; number --) {
-		value *= 10;
-	}
-	return value;
-}
-
-gchar *
-e_format_number (gint number)
-{
-	GList *iterator, *list = NULL;
-	struct lconv *locality;
-	gint char_length = 0;
-	gint group_count = 0;
-	guchar *grouping;
-	int last_count = 3;
-	int divider;
-	char *value;
-	char *value_iterator;
-	int initial_grouping;
-
-	locality = localeconv();
-	grouping = locality->grouping;
-	initial_grouping = *grouping;
-	while (number) {
-		char *group;
-		switch (*grouping) {
-		default:
-			last_count = *grouping;
-			grouping++;
-		case 0:
-			divider = epow10(last_count);
-			if(!list && (number/divider) > 0) {
-				group = g_strdup_printf("%0*d", initial_grouping, number % divider);
-			} else {
-				group = g_strdup_printf("%d", number % divider);
-			}
-			number /= divider;
-			break;
-		case CHAR_MAX:
-			group = g_strdup_printf("%d", number);
-			number = 0;
-			break;
-		}
-		char_length += strlen(group);
-		list = g_list_prepend(list, group);
-		group_count ++;
-	}
-
-	if (list) {
-		value = g_new(char, char_length + (group_count - 1) * strlen(locality->thousands_sep));
-
-		iterator = list;
-		value_iterator = value;
-
-		strcpy(value_iterator, iterator->data);
-		value_iterator += strlen(iterator->data);
-		for (iterator = iterator->next; iterator; iterator = iterator->next) {
-			strcpy(value_iterator, locality->thousands_sep);
-			value_iterator += strlen(locality->thousands_sep);
-
-			strcpy(value_iterator, iterator->data);
-			value_iterator += strlen(iterator->data);
-		}
-		e_free_string_list (list);
-		return value;
-	} else {
-		return g_strdup("0");
-	}
-}
-
-gboolean
-e_create_directory (gchar *directory)
-{
-	gchar *full_name;
-	gchar *position;
-	gchar *current_dir = g_get_current_dir();
-	struct stat info;
-	gboolean return_value = TRUE;
-
-	if (directory[0] == '/') {
-		full_name = g_malloc0 (strlen (directory) + 1);
-		strcpy (full_name, directory);
-	} else {
-		full_name = g_malloc0 (strlen (directory) + strlen (current_dir) + 2);
-		sprintf (full_name, "%s/%s", current_dir, directory);
-	}
-
-	if ((position = strrchr (full_name, '/')) == full_name) {
-		if (stat (full_name, &info)) {
-			switch (errno) {
-			case ENOENT:
-				if (mkdir (full_name, 0777)) {
-					switch (errno) {
-					default:
-						return_value = FALSE;
-						break;
-					}
-				}
-				break;
-			default:
-				return_value = FALSE;
-				break;
-			}
-		}
-	} else {
-		*position = 0;
-		e_create_directory (full_name);
-		*position = '/';
-		if (stat (full_name, &info)) {
-			switch (errno) {
-			case ENOENT:
-				if (mkdir (full_name, 0777)) {
-					switch (errno) {
-					default:
-						return_value = FALSE;
-						break;
-					}
-				}
-				break;
-			default:
-				return_value = FALSE;
-				break;
-			}
-		}
-	}
-
-	g_free (current_dir);
-	g_free (full_name);
-
-	return (return_value);
-}
diff --git a/e-util/e-util.h b/e-util/e-util.h
deleted file mode 100644
index 77d056b051..0000000000
--- a/e-util/e-util.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _E_UTIL_H_
-#define _E_UTIL_H_
-
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_MAKE_TYPE(l,str,t,ci,i,parent) \
-GtkType l##_get_type(void)\
-{\
-	static GtkType type = 0;\
-	if (!type){\
-		GtkTypeInfo info = {\
-			str,\
-			sizeof (t),\
-			sizeof (t##Class),\
-			(GtkClassInitFunc) ci,\
-			(GtkObjectInitFunc) i,\
-			NULL, /* reserved 1 */\
-			NULL, /* reserved 2 */\
-			(GtkClassInitFunc) NULL\
-		};\
-                type = gtk_type_unique (parent, &info);\
-	}\
-	return type;\
-}
-
-
-#define E_MAKE_X_TYPE(l,str,t,ci,i,parent,poa_init,offset) \
-GtkType l##_get_type(void)\
-{\
-	static GtkType type = 0;\
-	if (!type){\
-		GtkTypeInfo info = {\
-			str,\
-			sizeof (t),\
-			sizeof (t##Class),\
-			(GtkClassInitFunc) ci,\
-			(GtkObjectInitFunc) i,\
-			NULL, /* reserved 1 */\
-			NULL, /* reserved 2 */\
-			(GtkClassInitFunc) NULL\
-		};\
-                type = bonobo_x_type_unique (\
-			parent, poa_init, NULL,\
-			offset, &info);\
-	}\
-	return type;\
-}
-
-typedef enum {
-	E_FOCUS_NONE,
-	E_FOCUS_CURRENT,
-	E_FOCUS_START,
-	E_FOCUS_END
-} EFocus;
-int       g_str_compare                                            (const void    *x,
-								    const void    *y);
-int       g_int_compare                                            (const void    *x,
-								    const void    *y);
-char     *e_strdup_strip                                           (const char    *string);
-void      e_free_object_list                                       (GList         *list);
-void      e_free_string_list                                       (GList         *list);
-char     *e_read_file                                              (const char    *filename);
-int       e_write_file                                             (const char    *filename,
-								    const char    *data,
-								    int            flags);
-int       e_mkdir_hier                                             (const char    *path,
-								    mode_t         mode);
-
-gchar   **e_strsplit                                               (const gchar   *string,
-								    const gchar   *delimiter,
-								    gint           max_tokens);
-gchar    *e_strstrcase                                             (const gchar   *haystack,
-								    const gchar   *needle);
-void      e_filename_make_safe                                     (gchar         *string);
-gchar    *e_format_number                                          (gint           number);
-gboolean  e_create_directory                                       (gchar         *directory);
-void      e_marshal_INT__INT_INT_POINTER                           (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-void      e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL                (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-void      e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL              (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-void      e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL                (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-
-#define e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT
-void      e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT          (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-
-#define e_marshal_NONE__INT_INT_POINTER_UINT e_marshal_NONE__INT_INT_POINTER_INT
-void      e_marshal_NONE__INT_INT_POINTER_INT                      (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-
-#define e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT
-void      e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT              (GtkObject     *object,
-								    GtkSignalFunc  func,
-								    gpointer       func_data,
-								    GtkArg        *args);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT
-
-void    e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT  (GtkObject     *object,
-								  GtkSignalFunc  func,
-								  gpointer       func_data,
-								  GtkArg        *args);
-void    e_marshal_NONE__POINTER_POINTER_INT                      (GtkObject     *object,
-								  GtkSignalFunc  func,
-								  gpointer       func_data,
-								  GtkArg        *args);
-
-void    e_marshal_INT__POINTER_POINTER                           (GtkObject     *object,
-								  GtkSignalFunc  func,
-								  gpointer       func_data,
-								  GtkArg        *args);
-void    e_marshal_INT__POINTER_POINTER_POINTER                   (GtkObject     *object,
-								  GtkSignalFunc  func,
-								  gpointer       func_data,
-								  GtkArg        *args);
-void    e_marshal_INT__POINTER_POINTER_POINTER_POINTER           (GtkObject     *object,
-								  GtkSignalFunc  func,
-								  gpointer       func_data,
-								  GtkArg        *args);
-
-#endif /* _E_UTIL_H_ */
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
deleted file mode 100644
index 3c5fd5f9ee..0000000000
--- a/e-util/e-xml-utils.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "gal/util/e-i18n.h"
-#include <locale.h>
-#include <libgnome/libgnome.h>
-#include <math.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "e-xml-utils.h"
-
-xmlNode *
-e_xml_get_child_by_name (const xmlNode *parent, const xmlChar *child_name)
-{
-	xmlNode *child;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (child_name != NULL, NULL);
-	
-	for (child = parent->childs; child != NULL; child = child->next) {
-		if (xmlStrcmp (child->name, child_name) == 0) {
-			return child;
-		}
-	}
-	return NULL;
-}
-
-/* Returns the first child with the name child_name and the "lang"
- * attribute that matches the current LC_MESSAGES, or else, the first
- * child with the name child_name and no "lang" attribute.
- */
-xmlNode *
-e_xml_get_child_by_name_by_lang (const xmlNode *parent, const xmlChar *child_name, const gchar *lang)
-{
-	xmlNode *child;
-	/* This is the default version of the string. */
-	xmlNode *C = NULL;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (child_name != NULL, NULL);
-
-	if (lang == NULL) {
-		lang = setlocale (LC_MESSAGES, NULL);
-	}
-	for (child = parent->childs; child != NULL; child = child->next) {
-		if (xmlStrcmp (child->name, child_name) == 0) {
-			xmlChar *this_lang = xmlGetProp (child, "lang");
-			if (this_lang == NULL) {
-				C = child;
-			} else if (xmlStrcmp(this_lang, "lang") == 0) {
-				return child;
-			}
-		}
-	}
-	return C;
-}
-
-static xmlNode *
-e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, const gchar *name, GList *lang_list, gint *best_lang_score)
-{
-	xmlNodePtr best_node = NULL, node;
-
-	for (node = parent->childs; node != NULL; node = node->next) {
-		xmlChar *lang;
-
-		if (node->name == NULL || strcmp (node->name, name) != 0) {
-			continue;
-		}
-		lang = xmlGetProp (node, "xml:lang");
-		if (lang != NULL) {
-			GList *l;
-			gint i;
-
-			for (l = lang_list, i = 0; l != NULL && i < *best_lang_score; l = l->next, i++) {
-				if (strcmp ((gchar *) l->data, lang) == 0) {
-					best_node = node;
-					*best_lang_score = i;
-				}
-			}
-		} else {
-			if (best_node == NULL) {
-				best_node = node;
-			}
-		}
-		xmlFree (lang);
-		if (*best_lang_score == 0) {
-			return best_node;
-		} 
-	}
-
-	return best_node;
-}
-
-/*
- * e_xml_get_child_by_name_by_lang_list:
- *
- */
-xmlNode *
-e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, const gchar *name, GList *lang_list)
-{
-	gint best_lang_score = INT_MAX;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (lang_list == NULL) {
-		lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
-	}
-	return e_xml_get_child_by_name_by_lang_list_with_score (parent, name, lang_list, &best_lang_score);
-}
-
-/*
- * e_xml_get_child_by_name_no_lang
- *
- */
-xmlNode *
-e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name)
-{
-	xmlNodePtr node;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	for (node = parent->childs; node != NULL; node = node->next) {
-		xmlChar *lang;
-
-		if (node->name == NULL || strcmp (node->name, name) != 0) {
-			continue;
-		}
-		lang = xmlGetProp (node, "xml:lang");
-		if (lang == NULL) {
-			return node;
-		}
-		xmlFree (lang);
-	}
-
-	return NULL;
-}
-
-gint
-e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	return e_xml_get_integer_prop_by_name_with_default (parent, prop_name, 0);
-}
-
-gint
-e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, gint def)
-{
-	xmlChar *prop;
-	gint ret_val = def;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		(void) sscanf (prop, "%d", &ret_val);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_integer_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gint value)
-{
-	gchar *valuestr;
-
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	valuestr = g_strdup_printf ("%d", value);
-	xmlSetProp (parent, prop_name, valuestr);
-	g_free (valuestr);
-}
-
-guint
-e_xml_get_uint_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	return e_xml_get_uint_prop_by_name_with_default (parent, prop_name, 0);
-}
-
-guint
-e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, guint def)
-{
-	xmlChar *prop;
-	guint ret_val = def;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		(void) sscanf (prop, "%u", &ret_val);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_uint_prop_by_name (xmlNode *parent, const xmlChar *prop_name, guint value)
-{
-	gchar *valuestr;
-
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	valuestr = g_strdup_printf ("%u", value);
-	xmlSetProp (parent, prop_name, valuestr);
-	g_free (valuestr);
-}
-
-gboolean
-e_xml_get_bool_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	return e_xml_get_bool_prop_by_name_with_default (parent, prop_name, FALSE);
-}
-
-gboolean
-e_xml_get_bool_prop_by_name_with_default(const xmlNode *parent, const xmlChar *prop_name, gboolean def)
-{
-	xmlChar *prop;
-	gboolean ret_val = def;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		if (strcasecmp (prop, "true") == 0) {
-			ret_val = TRUE;
-		} else if (strcasecmp (prop, "false") == 0) {
-			ret_val = FALSE;
-		}
-		xmlFree(prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_bool_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gboolean value)
-{
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (value) {
-		xmlSetProp (parent, prop_name, "true");
-	} else {
-		xmlSetProp (parent, prop_name, "false");
-	}
-}
-
-gdouble
-e_xml_get_double_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	return e_xml_get_double_prop_by_name_with_default (parent, prop_name, 0.0);
-}
-
-gdouble
-e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, gdouble def)
-{
-	xmlChar *prop;
-	gdouble ret_val = def;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		(void) sscanf (prop, "%lf", &ret_val);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gdouble value)
-{
-	gchar *valuestr;
-
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (fabs (value) < 1e9 && fabs (value) > 1e-5) {
-		valuestr = g_strdup_printf ("%f", value);
-	} else {
-		valuestr = g_strdup_printf ("%.*g", DBL_DIG, value);
-	}
-	xmlSetProp (parent, prop_name, valuestr);
-	g_free (valuestr);
-}
-
-gchar *
-e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	return e_xml_get_string_prop_by_name_with_default (parent, prop_name, NULL);
-}
-
-gchar *
-e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, const gchar *def)
-{
-	xmlChar *prop;
-	gchar *ret_val;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		ret_val = g_strdup (prop);
-		xmlFree (prop);
-	} else {
-		ret_val = g_strdup (def);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_string_prop_by_name (xmlNode *parent, const xmlChar *prop_name, const gchar *value)
-{
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (value != NULL) {
-		xmlSetProp (parent, prop_name, value);
-	}
-}
-
-gchar *
-e_xml_get_translated_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	gchar *ret_val = NULL;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		ret_val = g_strdup (_(prop));
-		xmlFree (prop);
-	}
-	return ret_val;
-}
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
deleted file mode 100644
index bdcd756f3b..0000000000
--- a/e-util/e-xml-utils.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_XML_UTILS__
-#define __E_XML_UTILS__
-
-#include <gnome.h>
-#include <gnome-xml/tree.h>
-
-BEGIN_GNOME_DECLS
-
-xmlNode *e_xml_get_child_by_name                     (const xmlNode *parent,
-                                                      const xmlChar *child_name);
-/* lang set to NULL means use the current locale. */
-xmlNode *e_xml_get_child_by_name_by_lang             (const xmlNode *parent,
-                                                      const xmlChar *child_name,
-                                                      const gchar   *lang);
-/* lang_list set to NULL means use the current locale. */
-xmlNode *e_xml_get_child_by_name_by_lang_list        (const xmlNode *parent,
-                                                      const gchar   *name,
-                                                      GList         *lang_list);
-xmlNode *e_xml_get_child_by_name_no_lang             (const xmlNode *parent,
-                                                      const gchar   *name);
-
-gint     e_xml_get_integer_prop_by_name              (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-gint     e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,
-                                                      const xmlChar *prop_name,
-                                                      gint           def);
-void     e_xml_set_integer_prop_by_name              (xmlNode       *parent,
-                                                      const xmlChar *prop_name,
-                                                      gint           value);
-
-guint    e_xml_get_uint_prop_by_name                 (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-guint    e_xml_get_uint_prop_by_name_with_default    (const xmlNode *parent,
-                                                      const xmlChar *prop_name,
-                                                      guint          def);
-void     e_xml_set_uint_prop_by_name                 (xmlNode       *parent,
-                                                      const xmlChar *prop_name,
-                                                      guint          value);
-
-gboolean e_xml_get_bool_prop_by_name                 (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-gboolean e_xml_get_bool_prop_by_name_with_default    (const xmlNode *parent,
-                                                      const xmlChar *prop_name,
-                                                      gboolean       def);
-void     e_xml_set_bool_prop_by_name                 (xmlNode       *parent,
-                                                      const xmlChar *prop_name,
-                                                      gboolean       value);
-
-gdouble  e_xml_get_double_prop_by_name               (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-gdouble  e_xml_get_double_prop_by_name_with_default  (const xmlNode *parent,
-                                                      const xmlChar *prop_name,
-                                                      gdouble        def);
-void      e_xml_set_double_prop_by_name              ( xmlNode       *parent,
-                                                      const xmlChar *prop_name,
-                                                      gdouble        value);
-
-gchar    *e_xml_get_string_prop_by_name              (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-gchar    *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent,
-                                                      const xmlChar *prop_name,
-                                                      const gchar   *def);
-void      e_xml_set_string_prop_by_name              (xmlNode       *parent,
-                                                      const xmlChar *prop_name,
-                                                      const gchar   *value);
-
-gchar    *e_xml_get_translated_string_prop_by_name   (const xmlNode *parent,
-                                                      const xmlChar *prop_name);
-
-END_GNOME_DECLS
-
-#endif /* __E_XML_UTILS__ */
diff --git a/e-util/ename/.cvsignore b/e-util/ename/.cvsignore
deleted file mode 100644
index 4f8c173841..0000000000
--- a/e-util/ename/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-test-ename-western
-test-ename-western-gtk
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
deleted file mode 100644
index b3abe633df..0000000000
--- a/e-util/ename/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"EName\"			\
-	-I$(srcdir)					\
-	-I$(srcdir)/..					\
-	-I$(top_srcdir) 				\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-        -I$(includedir)                                 \
-        $(GNOME_INCLUDEDIR)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-gnome_libs =						\
-	$(BONOBO_GNOME_LIBS)				\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-ename_libs = 						\
-	libename.la 					\
-	$(gnome_libs)
-
-lib_LTLIBRARIES = libename.la
-
-libename_la_SOURCES =					\
-	e-address-western.c				\
-	e-name-western.c
-
-libenameincludedir = $(includedir)/ename
-
-libenameinclude_HEADERS =				\
-	e-address-western.h				\
-	e-name-western-tables.h				\
-	e-name-western.h
-
-
-noinst_LTLIBRARIES = libename-static.la
-libename_static_la_SOURCES = $(libename_la_SOURCES)
-libename_static_la_LDFLAGS = --all-static
-
-
-noinst_PROGRAMS =					\
-	test-ename-western				\
-	test-ename-western-gtk
-
-test_ename_western_SOURCES =				\
-	test-ename-western.c
-
-test_ename_western_LDADD = $(ename_libs)		\
-	$(EXTRA_GNOME_LIBS)
-
-test_ename_western_gtk_SOURCES =				\
-	test-ename-western-gtk.c
-
-test_ename_western_gtk_LDADD = 			\
-	$(ename_libs) 				\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(gnome_libs)
diff --git a/e-util/ename/TODO b/e-util/ename/TODO
deleted file mode 100644
index 669661eea7..0000000000
--- a/e-util/ename/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Support other naming systems.
-* Handle misspelled suffixes better.
diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c
deleted file mode 100644
index 12e977b973..0000000000
--- a/e-util/ename/e-address-western.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* --------------------------------------------------
-
- An address parser, yielding fields as per RFC 2426.
-
- Author:
-   Jesse Pavel (jpavel@helixcode.com)
-
- Copyright 2000, Helix Code, Inc.
-   -------------------------------------------------- 
-*/
-
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
-
-#ifdef E_ADDRESS_WESTERN_TEST 
-
-#include "e-address-western.h"
-
-#else
-
-#include <ename/e-address-western.h>
-#include <gal/util/e-util.h>
-
-#endif
-
-/* These are the keywords that will distinguish the start of an extended
-   address. */
-
-static char *extended_keywords[] = {
-	"apt", "apartment", "suite", NULL
-};
-
-
-
-static gboolean
-e_address_western_is_line_blank (gchar *line)
-{
-	gboolean blank = TRUE;
-	gint cntr;
-
-	/* A blank line consists of whitespace only, or a NULL line. */
-	for (cntr = 0; line[cntr] != '\0'; cntr++ ) {
-		if (!isspace(line[cntr])) {
-			blank = FALSE;
-			break;
-		}
-	}
-
-	return blank;
-}
-
-
-
-/* In the array of lines, `lines', we will erase the line at line_num, and
- shift the remaining lines, up to line number num_lines, up one position. */
-
-static void
-e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines)
-{
-	gint cntr;
-
-	if (line_num >= (num_lines - 1)) {
-		/* It is the last line, so simply shift in a NULL. */
-		lines[line_num] = NULL;
-	}
-	else {
-		for (cntr = line_num; cntr < num_lines; cntr++)
-			lines[cntr] = lines[cntr + 1];
-	}
-}
-
-
-static void 
-e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)
-{
-	gint cntr;
-
-	for (cntr = 0; cntr < *linecntr; cntr++) {
-		if (e_address_western_is_line_blank (lines[cntr])) {
-			/* Delete the blank line, and shift all subsequent lines up
-			   one spot to fill its old spot. */
-			e_address_western_shift_line (lines, cntr, *linecntr);
-
-			/* Since we must check the newly shifted line, let's 
-			  not advance the counter on this next pass. */
-			cntr--;
-
-			/* There is now one less line, total. */
-			*linecntr -= 1;
-		}
-	}
-}
- 
-
-static gboolean
-e_address_western_is_po_box (gchar *line)
-{
-	gboolean retval = FALSE;
-
-	/* In which phase of processing are we? */
-	enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state;
-	
-	
-	/* If the first two letters of the line are `p' and `o', and these
-	 are in turn followed by whitespace before another letter, then I
-	 will deem the line a representation of a PO Box address. */
-	
-	gint cntr;
-
-	state = FIRSTCHAR;
-	for (cntr = 0; line[cntr] != '\0'; cntr++) {
-		if (state == FIRSTCHAR)	{
-			if (isalnum(line[cntr])) {
-				if (tolower(line[cntr]) == 'p')
-					state = SECONDCHAR;
-				else {
-					retval = FALSE;
-					break;
-				}
-			}
-		}
-		else if (state == SECONDCHAR) {
-			if (isalnum (line[cntr])) {
-				if (tolower(line[cntr]) == 'o')
-					state = WHITESPACE;
-				else {
-					retval = FALSE;
-					break;
-				}
-			}
-		}
-		else if (state == WHITESPACE) {
-			if (isspace (line[cntr])) {
-				retval = TRUE;
-				break;
-			}
-			else if (isalnum (line[cntr])) {
-				retval = FALSE;
-				break;
-			}
-		}
-	}
-
-	return retval;
-}
-
-/* A line that contains a comma followed eventually by a number is
-  deemed to be the line in the form of <town, region postal-code>. */
-
-static gboolean
-e_address_western_is_postal (guchar *line)
-{
-	gboolean retval;
-	int cntr;
-	
-	if (strchr (line, ',') == NULL)
-		retval = FALSE;  /* No comma. */
-	else {
-		int index;
-		
-		/* Ensure that the first character after the comma is
-		 a letter. */
-		index = strcspn (line, ",");
-		index++;
-		while (isspace(line[index]))
-			index++;
-		
-		if (!isalpha (line[index]))
-			return FALSE;   /* FIXME: ugly control flow. */
-
-		cntr = strlen(line) - 1;
-
-		/* Go to the character immediately following the last
-		  whitespace character. */
-		while (cntr >= 0 && isspace(line[cntr]))
-			cntr--;	
-		
-		while (cntr >= 0 && !isspace(line[cntr]))
-			cntr--;
-
-		if (cntr == 0)
-			retval = FALSE;
-		else {
-			if (isdigit (line[cntr+1]))
-				retval = TRUE;
-			else
-				retval = FALSE;
-		}
-	}	
-
-	return retval;
-}
-
-static gchar *
-e_address_western_extract_po_box (gchar *line)
-{
-	/* Return everything from the beginning of the line to
-	   the end of the first word that contains a number. */
-	
-	int index;
-
-	index = 0;
-	while (!isdigit(line[index]))
-		index++;
-	
-	while (isgraph(line[index]))
-		index++;
-	
-	return g_strndup (line, index);
-}
-
-static gchar *
-e_address_western_extract_locality (gchar *line)
-{
-	gint index;
-
-	/* Everything before the comma is the locality. */
-	index = strcspn(line, ",");
-
-	if (index == 0)
-		return NULL;
-	else
-		return g_strndup (line, index);
-}
-
-
-/* Whatever resides between the comma and the start of the
-  postal code is deemed to be the region. */
-
-static gchar *
-e_address_western_extract_region (gchar *line)
-{
-	gint start, end;
-
-	start = strcspn (line, ",");
-	start++;
-	while (isspace(line[start]))
-		start++;
-	
-	end = strlen(line) - 1;
-	while (isspace (line[end]))
-		end--;
-
-	while (!isspace (line[end]))
-		end--;
-
-	while (isspace (line[end]))
-		end--;
-	end++;
-
-	/* Between start and end lie the string. */
-	return g_strndup ( (line+start), end-start);
-}
-
-static gchar *
-e_address_western_extract_postal_code (gchar *line)
-{
-	int start, end;
-
-	end = strlen (line) - 1;
-	while (isspace(line[end]))
-		end--;
-	
-	start = end;
-	end++;
-
-	while (!isspace(line[start]))
-		start--;
-	start++;	
-
-	/* Between start and end lie the string. */
-	return g_strndup ( (line+start), end-start);
-}
-
-
-
-static void
-e_address_western_extract_street (gchar *line, gchar **street, gchar **extended)
-{
-        const gchar *split = NULL;
-	gint cntr;
-
-	for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) {
-		split = e_strstrcase (line, extended_keywords[cntr]);
-		if (split != NULL)
-			break;
-	}
-
-	if (split != NULL) {
-		*street = g_strndup (line, (split - line));
-		*extended = g_strdup (split);
-	}
-	else {
-		*street = g_strdup (line);
-		*extended = NULL;
-	}
-
-}
-
-
-
-EAddressWestern *
-e_address_western_parse (const gchar *in_address)
-{
-	gchar **lines;
-	gint linecntr, lineindex;
-	gchar *address;
-	gint cntr;
-	gboolean found_po_box, found_postal;
-
-	EAddressWestern *eaw;
-#if 0
-	gint start, end;  /* To be used to classify address lines. */
-#endif
-
-	if (in_address == NULL)
-		return NULL;
-	
-	eaw = (EAddressWestern *)g_malloc (sizeof(EAddressWestern));
-	eaw->po_box = NULL;
-	eaw->extended = NULL;
-	eaw->street = NULL;
-	eaw->locality = NULL;
-	eaw->region = NULL;
-	eaw->postal_code = NULL;
-	eaw->country = NULL;
-	
-	address = g_strdup (in_address);
-
-	/* The first thing I'll do is divide the multiline input string
-	into lines. */
-
-	/* ... count the lines. */
-	linecntr = 1;
-	lineindex = 0;
-	while (address[lineindex] != '\0') {
-		if (address[lineindex] == '\n')
-			linecntr++;
-			
-		lineindex++;
-	}
-
-	/* ... tally them. */
-	lines = (gchar **)g_malloc (sizeof(gchar *) * (linecntr+3));
-	lineindex = 0;
-	lines[0] = &address[0];
-	linecntr = 1;
-	while (address[lineindex] != '\0') {
-		if (address[lineindex] == '\n') {
-			lines[linecntr] = &address[lineindex + 1];
-			linecntr++;
-		}
-
-		lineindex++;
-	}
-
-	/* Convert the newlines at the end of each line (except the last,
-	 because it is already NULL terminated) to NULLs. */
-	for (cntr = 0; cntr < (linecntr - 1); cntr++) {
-		*(strchr (lines[cntr], '\n')) = '\0';
-	}
-
-	e_address_western_remove_blank_lines (lines, &linecntr);
-
-	/* Let's just test these functions. */
-	found_po_box = FALSE;
-	found_postal = FALSE;
-
-   	for (cntr = 0; cntr < linecntr; cntr++)  {
-		if (e_address_western_is_po_box (lines[cntr])) {
-			if (eaw->po_box == NULL)
-				eaw->po_box = e_address_western_extract_po_box (lines[cntr]);
-			found_po_box = TRUE;
-		}
-		else if (e_address_western_is_postal (lines[cntr])) {
-			if (eaw->locality == NULL)
-				eaw->locality = e_address_western_extract_locality (lines[cntr]);
-			if (eaw->region == NULL)
-				eaw->region = e_address_western_extract_region (lines[cntr]);
-			if (eaw->postal_code == NULL)
-				eaw->postal_code = e_address_western_extract_postal_code (lines[cntr]);
-			found_postal = TRUE;
-		}
-		else {
-			if (found_postal) {
-				if (eaw->country == NULL)
-					eaw->country = g_strdup (lines[cntr]);
-				else {
-					gchar *temp;
-					temp = g_strconcat (eaw->country, "\n", lines[cntr], NULL);
-					g_free (eaw->country);
-					eaw->country = temp;
-				}
-			}
-			else {
-				if (eaw->street == NULL) {
-					e_address_western_extract_street (lines[cntr], &eaw->street,
-										&eaw->extended );
-				}
-				else {
-					if (eaw->extended == NULL) {
-						eaw->extended = g_strdup (lines[cntr]);
-					}
-					else {
-						gchar *temp;
-						temp = g_strconcat (eaw->extended, "\n", lines[cntr], NULL);
-						g_free (eaw->extended);
-						eaw->extended = temp;
-					}
-				}
-			}
-		}
-	}			
-	
-	g_free (lines);
-	g_free (address);	
-	
-	return eaw;
-}	
-
-
-void 
-e_address_western_free (EAddressWestern *eaw)
-{
-	if (eaw == NULL)
-		return;
-	
-	if (eaw->po_box != NULL)
-		g_free(eaw->po_box);
-	if (eaw->extended != NULL)
-		g_free(eaw->extended);
-	if (eaw->street != NULL)
-		g_free(eaw->street);
-	if (eaw->locality != NULL)
-		g_free(eaw->locality);
-	if (eaw->region != NULL)
-		g_free(eaw->region);
-	if (eaw->postal_code != NULL)
-		g_free(eaw->postal_code);
-	if (eaw->country != NULL)
-		g_free(eaw->country);
-	
-	g_free (eaw);
-}
-
diff --git a/e-util/ename/e-address-western.h b/e-util/ename/e-address-western.h
deleted file mode 100644
index e6417f88c4..0000000000
--- a/e-util/ename/e-address-western.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __E_ADDRESS_WESTERN_H__
-#define __E_ADDRESS_WESTERN_H__
-
-typedef struct {
-	
-	/* Public */
-	char *po_box;
-	char *extended;  /* I'm not sure what this is. */
-	char *street;
-	char *locality;  /* For example, the city or town. */
-	char *region;	/* The state or province. */
-	char *postal_code;
-	char *country;
-} EAddressWestern;
-
-EAddressWestern *e_address_western_parse (const char *address);
-void e_address_western_free (EAddressWestern *eaw);
-
-#endif  /* ! __E_ADDRESS_WESTERN_H__ */
-
-
diff --git a/e-util/ename/e-name-western-tables.h b/e-util/ename/e-name-western-tables.h
deleted file mode 100644
index 2e94a94845..0000000000
--- a/e-util/ename/e-name-western-tables.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __E_NAME_WESTERN_TABLES_H__
-#define __E_NAME_WESTERN_TABLES_H__
-
-char *e_name_western_pfx_table[] = {
-
-	/*
-	 * English.
-	 */
-	"mister", "miss.", "mr.", "mrs.", "ms.",
-	"miss", "mr", "mrs", "ms", "sir", 
-	"professor", "prof.", "dr", "dr.", "doctor",
-	"judge", "justice", "chief justice", 
-	"congressman", "congresswoman", "commander",
-	"lieutenant", "lt.", "colonel", "col.", "major", "maj.",
-	"general", "gen.", "admiral", "admr.", "sergeant", "sgt.",
-	"lord", "lady", "baron", "baroness", "duke", "duchess",
-	"king", "queen", "prince", "princess",
-
-	"the most honorable", "the honorable",
-	"the reverend", "his holiness",
-	"his eminence", "his majesty", "her majesty", 
-	"his grace", "her grace",
-
-	"president", "vice president", "secretary", "undersecretary",
-	"consul", "ambassador",
-
-	"senator", "saint", "st.", "pastor", "deacon",
-	"father", "bishop", "archbishop", "cardinal", "pope",
-	"reverend", "rev.", "rabbi", 
-
-	/*
-	 * French.
-	 */
-	"monsieur", "m.", "mademoiselle", "melle",
-	"madame", "mme", "professeur", "dauphin", "dauphine",
-
-	/*
-	 * German
-	 */
-	"herr", "frau", "fraulein", "herr doktor", "doktor frau", "doktor frau doktor",
-	"frau doktor",
- 
-
-	/*
-	 * Spanish.
-	 */
-	"senor", "senora", "sra.", "senorita", "srita.", 
-
-	NULL};
-
-char *e_name_western_sfx_table[]  = {
-
-	/*
-	 * English.
-	 */
-         "junior", "senior", "jr", "sr", "I", "II", "III", "IV", "V",
-	 "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV",
-	 "XV", "XVI", "XVII", "XVIII", "XIX", "XX", "XXI", "XXII",
-	 "phd", "ms", "md", "esq", "esq.", "esquire",
-
-	NULL};
-
-char *e_name_western_twopart_sfx_table[] = {
-
-	/*
-	 * English.
-	 */
-	"the first", "the second", "the third",
-
-	NULL};
-
-char *e_name_western_complex_last_table[] = {"van", "von", "de", NULL};
-
-#endif /* ! __E_NAME_WESTERN_TABLES_H__ */
diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c
deleted file mode 100644
index 3848e7249b..0000000000
--- a/e-util/ename/e-name-western.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/*
- * A simple Western name parser.
- *
- * <Nat> Jamie, do you know anything about name parsing?
- * <jwz> Are you going down that rat hole?  Bring a flashlight.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, Helix Code, Inc.
- */
-
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
- 
-#include <ename/e-name-western.h>
-#include <ename/e-name-western-tables.h>
-
-typedef struct {
-	int prefix_idx;
-	int first_idx;
-	int middle_idx;
-	int nick_idx;
-	int last_idx;
-	int suffix_idx;
-} ENameWesternIdxs;
-
-static int
-e_name_western_str_count_words (char *str)
-{
-	int word_count;
-	char *p;
-
-	word_count = 0;
-
-	for (p = str; p != NULL; p = strchr (p, ' ')) {
-		word_count ++;
-		p ++;
-	}
-
-	return word_count;
-}
-
-static void
-e_name_western_cleanup_string (char **str)
-{
-	char *newstr;
-	char *p;
-
-	if (*str == NULL)
-		return;
-
-	/* skip any spaces and commas at the start of the string */
-	p = *str;
-	while (isspace (*p) || *p == ',')
-		p ++;
-
-	/* make the copy we're going to return */
-	newstr = g_strdup (p);
-
-	if ( strlen(newstr) > 0) {
-		/* now search from the back, skipping over any spaces and commas */
-		p = newstr + strlen (newstr) - 1;
-		while (isspace (*p) || *p == ',')
-			p --;
-		/* advance p to after the character that caused us to exit the
-		   previous loop, and end the string. */
-		if ((! isspace (*p)) && *p != ',')
-			p ++;
-		*p = '\0';
-	}
-
-	g_free (*str);
-	*str = newstr;
-}
-
-static char *
-e_name_western_get_words_at_idx (char *str, int idx, int num_words)
-{
-	char *words;
-	char *p;
-	int   word_count;
-	int   words_len;
-
-	/*
-	 * Walk to the end of the words.
-	 */
-	word_count = 0;
-	p = str + idx;
-	while (word_count < num_words && *p != '\0') {
-		while (! isspace (*p) && *p != '\0')
-			p ++;
-
-		while (isspace (*p) && *p != '\0')
-			p ++;
-
-		word_count ++;
-	}
-
-	words_len = p - str - idx - 1;
-
-	if (*p == '\0')
-		words_len ++;
-
-	words = g_malloc0 (1 + words_len);
-	strncpy (words, str + idx, words_len);
-
-	return words;
-}
-
-/*
- * What the fuck is wrong with glib's MAX macro.
- */ 
-static int
-e_name_western_max (const int a, const int b)
-{
-	if (a > b)
-		return a;
-
-	return b;
-}
-
-static gboolean
-e_name_western_word_is_suffix (char *word)
-{
-	int i;
-
-	for (i = 0; e_name_western_sfx_table [i] != NULL; i ++) {
-		if (g_strcasecmp (word, e_name_western_sfx_table [i]))
-			continue;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static char *
-e_name_western_get_one_prefix_at_str (char *str)
-{
-	char *word;
-	int   i;
-
-	/*
-	 * Check for prefixes from our table.
-	 */
-	for (i = 0; e_name_western_pfx_table [i] != NULL; i ++) {
-		int pfx_words;
-		char *words;
-
-		pfx_words = e_name_western_str_count_words (e_name_western_pfx_table [i]);
-		words = e_name_western_get_words_at_idx (str, 0, pfx_words);
-
-		if (! g_strcasecmp (words, e_name_western_pfx_table [i]))
-			return words;
-
-		g_free (words);
-	}
-
-	/*
-	 * Check for prefixes we don't know about.  These are always a
-	 * sequence of more than one letters followed by a period.
-	 */
-	word = e_name_western_get_words_at_idx (str, 0, 1);
-
-	if (strlen (word) > 2 && 
-	    isalpha ((unsigned char) word [0]) &&
-	    isalpha ((unsigned char) word [1]) &&
-	    word [strlen (word) - 1] == '.')
-		return word;
-
-	g_free (word);
-
-	return NULL;
-}
-
-static char *
-e_name_western_get_prefix_at_str (char *str)
-{
-	char *pfx;
-	char *pfx1;
-	char *pfx2;
-	char *p;
-
-	/* Get the first prefix. */
-	pfx1 = e_name_western_get_one_prefix_at_str (str);
-
-	if (pfx1 == NULL)
-		return NULL;
-
-	/* Check for a second prefix. */
-	p = str + strlen (pfx1);
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	pfx2 = e_name_western_get_one_prefix_at_str (p);
-
-	if (pfx2 != NULL) {
-		int pfx_len;
-
-		pfx_len = (p + strlen (pfx2)) - str;
-		pfx = g_malloc0 (pfx_len + 1);
-		strncpy (pfx, str, pfx_len);
-	} else {
-		pfx = g_strdup (pfx1);
-	}
-
-	g_free (pfx1);
-	g_free (pfx2);
-
-	return pfx;
-}
-
-static void
-e_name_western_extract_prefix (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *pfx;
-
-	pfx = e_name_western_get_prefix_at_str (name->full);
-
-	if (pfx == NULL)
-		return;
-
-	idxs->prefix_idx = 0;
-	name->prefix     = pfx;
-}
-
-static gboolean
-e_name_western_is_complex_last_beginning (char *word)
-{
-	int i;
-
-	for (i = 0; e_name_western_complex_last_table [i] != NULL; i ++) {
-
-		if (! g_strcasecmp (
-			word, e_name_western_complex_last_table [i]))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-e_name_western_extract_first (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	/*
-	 * If there's a prefix, then the first name is right after it.
-	 */
-	if (idxs->prefix_idx != -1) {
-		int   first_idx;
-		char *p;
-
-		first_idx = idxs->prefix_idx + strlen (name->prefix);
-
-		/* Skip past white space. */
-		p = name->full + first_idx;
-		while (isspace (*p) && *p != '\0')
-			p++;
-
-		if (*p == '\0')
-			return;
-
-		idxs->first_idx = p - name->full;
-		name->first = e_name_western_get_words_at_idx (
-			name->full, idxs->first_idx, 1);
-
-	} else {
-
-		/*
-		 * Otherwise, the first name is probably the first string.
-		 */
-		idxs->first_idx = 0;
-		name->first = e_name_western_get_words_at_idx (
-			name->full, idxs->first_idx, 1);
-	}
-
-	/*
-	 * Check that we didn't just assign the beginning of a
-	 * compound last name to the first name.
-	 */
-	if (name->first != NULL) {
-		if (e_name_western_is_complex_last_beginning (name->first)) {
-			g_free (name->first);
-			name->first = NULL;
-			idxs->first_idx = -1;
-		}
-	}
-}
-
-static void
-e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *word;
-	int   middle_idx;
-
-	/*
-	 * Middle names can only exist if you have a first name.
-	 */
-	if (idxs->first_idx == -1)
-		return;
-
-	middle_idx = idxs->first_idx + strlen (name->first) + 1;
-
-	if (middle_idx > strlen (name->full))
-		return;
-	
-	/*
-	 * Search for the first space (or the terminating \0)
-	 */
-	while (isspace (name->full [middle_idx]) &&
-	       name->full [middle_idx] != '\0')
-		middle_idx ++;
-		
-	if (name->full [middle_idx] == '\0')
-		return;
-
-	/*
-	 * Skip past the nickname, if it's there.
-	 */
-	if (name->full [middle_idx] == '\"') {
-		if (idxs->nick_idx == -1)
-			return;
-
-		middle_idx = idxs->nick_idx + strlen (name->nick) + 1;
-		
-		while (isspace (name->full [middle_idx]) &&
-		       name->full [middle_idx] != '\0')
-			middle_idx ++;
-
-		if (name->full [middle_idx] == '\0')
-			return;
-	}
-
-	/*
-	 * Make sure this isn't the beginning of a complex last name.
-	 */
-	word = e_name_western_get_words_at_idx (name->full, middle_idx, 1);
-	if (e_name_western_is_complex_last_beginning (word)) {
-		g_free (word);
-		return;
-	}
-
-	/*
-	 * Make sure this isn't a suffix.
-	 */
-	e_name_western_cleanup_string (& word);
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return;
-	}
-
-	/*
-	 * Make sure we didn't just grab a cute nickname.
-	 */
-	if (word [0] == '\"') {
-		g_free (word);
-		return;
-	}
-	
-	idxs->middle_idx = middle_idx;
-	name->middle = word;
-}
-
-static void
-e_name_western_extract_nickname (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	int   idx;
-	int   start_idx;
-	char *str;
-
-	if (idxs->first_idx == -1)
-		return;
-
-	if (idxs->middle_idx > idxs->first_idx)
-		idx = idxs->middle_idx + strlen (name->middle);
-	else
-		idx = idxs->first_idx + strlen (name->first);
-
-	while (name->full [idx] != '\"' && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] != '\"')
-		return;
-
-	start_idx = idx;
-
-	/*
-	 * Advance to the next double quote.
-	 */
-	idx ++;
-	
-	while (name->full [idx] != '\"' && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] == '\0')
-		return;
-
-	str = g_malloc0 (idx - start_idx + 2);
-	strncpy (str, name->full + start_idx, idx - start_idx + 1);
-
-	name->nick = str;
-	idxs->nick_idx = start_idx;
-}
-
-static int
-e_name_western_last_get_max_idx (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	int max_idx = -1;
-
-	if (name->prefix != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->prefix_idx + strlen (name->prefix));
-
-	if (name->first != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->first_idx + strlen (name->first));
-
-	if (name->middle != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->middle_idx + strlen (name->middle));
-
-	if (name->nick != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->nick_idx + strlen (name->nick));
-
-	return max_idx;
-}
-
-static void
-e_name_western_extract_last (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *word;
-	int   idx = -1;
-
-	idx = e_name_western_last_get_max_idx (name, idxs);
-
-	/*
-	 * In the case where there is no preceding name element, the
-	 * name is either just a first name ("Nat", "John"), is a
-	 * single-element name ("Cher", which we treat as a first
-	 * name), or is just a last name.  The only time we can
-	 * differentiate a last name alone from a single-element name
-	 * or a first name alone is if it's a complex last name ("de
-	 * Icaza", "van Josephsen").  So if there is no preceding name
-	 * element, we check to see whether or not the first part of
-	 * the name is the beginning of a complex name.  If it is,
-	 * we subsume the entire string.  If we accidentally subsume
-	 * the suffix, this will get fixed in the fixup routine.
-	 */
-	if (idx == -1) {
-		word = e_name_western_get_words_at_idx (name->full, 0, 1);
-		if (! e_name_western_is_complex_last_beginning (word)) {
-			g_free (word);
-			return;
-		}
-
-		name->last     = g_strdup (name->full);
-		idxs->last_idx = 0;
-		return;
-	}
-
-	/* Skip past the white space. */
-	while (isspace (name->full [idx]) && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] == '\0')
-		return;
-
-	word = e_name_western_get_words_at_idx (name->full, idx, 1);
-	e_name_western_cleanup_string (& word);
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return;
-	}
-	g_free (word);
-
-	/*
-	 * Subsume the rest of the string into the last name.  If we
-	 * accidentally include the prefix, it will get fixed later.
-	 * This is the only way to handle things like "Miguel de Icaza
-	 * Amozorrutia" without dropping data and forcing the user
-	 * to retype it.
-	 */
-	name->last = g_strdup (name->full + idx);
-	idxs->last_idx = idx;
-}
-
-static char *
-e_name_western_get_preceding_word (char *str, int idx)
-{
-	int   word_len;
-	char *word;
-	char *p;
-
-	p = str + idx;
-
-	while (isspace (*p) && p > str)
-		p --;
-
-	while (! isspace (*p) && p > str)
-		p --;
-
-	if (isspace (*p))
-	    p ++;
-
-	word_len = (str + idx) - p;
-	word = g_malloc0 (word_len + 1);
-	if (word_len > 0)
-		strncpy (word, p, word_len);
-
-	return word;
-}
-
-static char *
-e_name_western_get_suffix_at_str_end (char *str)
-{
-	char *suffix;
-	char *p;
-
-	/*
-	 * Walk backwards till we reach the beginning of the
-	 * (potentially-comma-separated) list of suffixes.
-	 */
-	p = str + strlen (str);
-	while (1) {
-		char *nextp;
-		char *word;
-
-		word = e_name_western_get_preceding_word (str, p - str);
-		nextp = p - strlen (word) - 1;
-		
-		e_name_western_cleanup_string (& word);
-
-		if (e_name_western_word_is_suffix (word)) {
-			p = nextp;
-			g_free (word);
-		} else {
-			g_free (word);
-			break;
-		}
-	}
-
-	if (p == (str + strlen (str)))
-		return NULL;
-
-	suffix = g_strdup (p);
-	e_name_western_cleanup_string (& suffix);
-
-	if (strlen (suffix) == 0) {
-		g_free (suffix);
-		return NULL;
-	}
-
-	return suffix;
-}
-
-static void
-e_name_western_extract_suffix (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-
-	name->suffix = e_name_western_get_suffix_at_str_end (name->full);
-
-	if (name->suffix == NULL)
-		return;
-
-	idxs->suffix_idx = strlen (name->full) - strlen (name->suffix);
-}
-
-static gboolean
-e_name_western_detect_backwards (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *comma;
-	char *word;
-
-	comma = strchr (name->full, ',');
-
-	if (comma == NULL)
-		return FALSE;
-
-	/*
-	 * If there's a comma, we need to detect whether it's
-	 * separating the last name from the first or just separating
-	 * suffixes.  So we grab the word which comes before the
-	 * comma and check if it's a suffix.
-	 */
-	word = e_name_western_get_preceding_word (name->full, comma - name->full);
-
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return FALSE;
-	}
-
-	g_free (word);
-	return TRUE;
-}
-
-static void
-e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *prefix;
-	char *last;
-	char *suffix;
-	char *firstmidnick;
-	char *newfull;
-
-	char *comma;
-	char *p;
-
-	if (! e_name_western_detect_backwards (name, idxs))
-		return;
-
-	/*
-	 * Convert
-	 *    <Prefix> <Last name>, <First name> <Middle[+nick] name> <Suffix>
-	 * to
-	 *    <Prefix> <First name> <Middle[+nick] name> <Last name> <Suffix>
-	 */
-	
-	/*
-	 * Grab the prefix from the beginning.
-	 */
-	prefix = e_name_western_get_prefix_at_str (name->full);
-
-	/*
-	 * Everything from the end of the prefix to the comma is the
-	 * last name.
-	 */
-	comma = strchr (name->full, ',');
-	if (comma == NULL)
-		return;
-
-	p = name->full + (prefix == NULL ? 0 : strlen (prefix));
-
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	last = g_malloc0 (comma - p + 1);
-	strncpy (last, p, comma - p);
-
-	/*
-	 * Get the suffix off the end.
-	 */
-	suffix = e_name_western_get_suffix_at_str_end (name->full);
-
-	/*
-	 * Firstmidnick is everything from the comma to the beginning
-	 * of the suffix.
-	 */
-	p = comma + 1;
-
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	if (suffix != NULL) {
-		char *q;
-
-		/*
-		 * Point q at the beginning of the suffix.
-		 */
-		q = name->full + strlen (name->full) - strlen (suffix) - 1;
-
-		/*
-		 * Walk backwards until we hit the space which
-		 * separates the suffix from firstmidnick.
-		 */
-		while (! isspace (*q) && q > comma)
-			q --;
-
-		if ((q - p + 1) > 0) {
-			firstmidnick = g_malloc0 (q - p + 1);
-			strncpy (firstmidnick, p, q - p);
-		} else
-			firstmidnick = NULL;
-	} else {
-		firstmidnick = g_strdup (p);
-	}
-
-	/*
-	 * Create our new reordered version of the name.
-	 */
-#define NULLSTR(a) ((a) == NULL ? "" : (a))
-	newfull = g_strdup_printf ("%s %s %s %s", NULLSTR (prefix), NULLSTR (firstmidnick),
-				   NULLSTR (last), NULLSTR (suffix));
-	g_strstrip (newfull);
-	g_free (name->full);
-	name->full = newfull;
-
-
-	g_free (prefix);
-	g_free (firstmidnick);
-	g_free (last);
-	g_free (suffix);
-}
-
-static void
-e_name_western_zap_nil (char **str, int *idx)
-{
-	if (*str == NULL)
-		return;
-
-	if (strlen (*str) != 0)
-		return;
-
-	*idx = -1;
-	g_free (*str);
-	*str = NULL;
-}
-
-static void
-e_name_western_fixup (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	/*
-	 * The middle and last names cannot be the same.
-	 */
-	if (idxs->middle_idx != -1 && idxs->middle_idx == idxs->last_idx) {
-		idxs->middle_idx = -1;
-		g_free (name->middle);
-		name->middle = NULL;
-	}
-
-	/*
-	 * If we have a middle name and no last name, then we mistook
-	 * the last name for the middle name.
-	 */
-	if (idxs->last_idx == -1 && idxs->middle_idx != -1) {
-		idxs->last_idx   = idxs->middle_idx;
-		name->last       = name->middle;
-		name->middle     = NULL;
-		idxs->middle_idx = -1;
-	}
-
-	/*
-	 * Check to see if we accidentally included the suffix in the
-	 * last name.
-	 */
-	if (idxs->suffix_idx != -1 && idxs->last_idx != -1 &&
-	    idxs->suffix_idx < (idxs->last_idx + strlen (name->last))) {
-		char *sfx;
-
-		sfx = name->last + (idxs->suffix_idx - idxs->last_idx);
-		if (sfx != NULL) {
-			char *newlast;
-			char *p;
-
-			p = sfx - 1;
-			while (isspace (*p) && p > name->last)
-				p --;
-			p ++;
-
-			newlast = g_malloc0 (p - name->last + 1);
-			strncpy (newlast, name->last, p - name->last);
-			g_free (name->last);
-			name->last = newlast;
-		}
-	}
-
-	/*
-	 * If we have a prefix and a first name, but no last name,
-	 * then we need to assign the first name to the last name.
-	 * This way we get things like "Mr Friedman" correctly.
-	 */
-	if (idxs->first_idx != -1 && idxs->prefix_idx != -1 &&
-	    idxs->last_idx == -1) {
-		name->last      = name->first;
-		idxs->last_idx  = idxs->first_idx;
-		idxs->first_idx = -1;
-		name->first     = NULL;
-	}
-
-	/*
-	 * Remove stray spaces and commas (although there don't seem
-	 * to be any in the test cases, they might show up later).
-	 */
-	e_name_western_cleanup_string (& name->prefix);
-	e_name_western_cleanup_string (& name->first);
-	e_name_western_cleanup_string (& name->middle);
-	e_name_western_cleanup_string (& name->nick);
-	e_name_western_cleanup_string (& name->last);
-	e_name_western_cleanup_string (& name->suffix);
-
-	/*
-	 * Make zero-length strings just NULL.
-	 */
-	e_name_western_zap_nil (& name->prefix, & idxs->prefix_idx);
-	e_name_western_zap_nil (& name->first,  & idxs->first_idx);
-	e_name_western_zap_nil (& name->middle, & idxs->middle_idx);
-	e_name_western_zap_nil (& name->nick,   & idxs->nick_idx);
-	e_name_western_zap_nil (& name->last,   & idxs->last_idx);
-	e_name_western_zap_nil (& name->suffix, & idxs->suffix_idx);
-}
-
-/**
- * e_name_western_western_parse_fullname:
- * @full_name: A string containing a Western name.
- *
- * Parses @full_name and returns an #ENameWestern object filled with
- * the component parts of the name.
- */
-ENameWestern *
-e_name_western_parse (const char *full_name)
-{
-	ENameWesternIdxs *idxs;
-	ENameWestern *wname;
-
-	wname = g_new0 (ENameWestern, 1);
-
-	wname->full = g_strdup (full_name);
-
-	idxs = g_new0 (ENameWesternIdxs, 1);
-
-	idxs->prefix_idx = -1;
-	idxs->first_idx  = -1;
-	idxs->middle_idx = -1;
-	idxs->nick_idx   = -1;
-	idxs->last_idx   = -1;
-	idxs->suffix_idx = -1;
-	
-	/*
-	 * An extremely simple algorithm.
-	 *
-	 * The goal here is to get it right 95% of the time for
-	 * Western names.
-	 *
-	 * First we check to see if this is an ass-backwards name
-	 * ("Prefix Last, First Middle Suffix").  These names really
-	 * suck (imagine "Dr von Johnson, Albert Roderick Jr"), so
-	 * we reorder them first and then parse them.
-	 *
-	 * Next, we grab the most obvious assignments for the various
-	 * parts of the name.  Once this is done, we check for stupid
-	 * errors and fix them up.
-	 */
-	e_name_western_reorder_asshole  (wname, idxs);
-
-	e_name_western_extract_prefix   (wname, idxs);
-	e_name_western_extract_first    (wname, idxs);
-	e_name_western_extract_nickname (wname, idxs);
-	e_name_western_extract_middle   (wname, idxs);
-	e_name_western_extract_last     (wname, idxs);
-	e_name_western_extract_suffix   (wname, idxs);
-
-	e_name_western_fixup            (wname, idxs);
-
-	g_free (idxs);
-
-	return wname;
-}
-
-/**
- * e_name_western_free:
- * @name: An ENameWestern object which needs to be freed.
- *
- * Deep-frees @name
- */
-void
-e_name_western_free (ENameWestern *w)
-{
-
-	g_free (w->prefix);
-	g_free (w->first);
-	g_free (w->middle);
-	g_free (w->nick);
-	g_free (w->last);
-	g_free (w->suffix);
-	
-	g_free (w->full);
-
-	g_free (w);
-}
diff --git a/e-util/ename/e-name-western.h b/e-util/ename/e-name-western.h
deleted file mode 100644
index fa5bac494c..0000000000
--- a/e-util/ename/e-name-western.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __E_NAME_WESTERN_H__
-#define __E_NAME_WESTERN_H__
-
-typedef struct {
-
-	/* Public */
-	char *prefix;
-	char *first;
-	char *middle;
-	char *nick;
-	char *last;
-	char *suffix;
-
-	/* Private */
-	char *full;
-} ENameWestern;
-
-ENameWestern *e_name_western_parse (const char   *full_name);
-void          e_name_western_free  (ENameWestern *w);
-
-#endif /* ! __E_NAME_WESTERN_H__ */
diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c
deleted file mode 100644
index 74adb2a0b4..0000000000
--- a/e-util/ename/test-ename-western-gtk.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <ename/e-name-western.h>
-
-ENameWestern *name;
-GtkWidget    *full;
-GtkWidget    *prefix;
-GtkWidget    *first;
-GtkWidget    *middle;
-GtkWidget    *nick;
-GtkWidget    *last;
-GtkWidget    *suffix;
-
-static void
-fill_entries (void)
-{
-
-#define SET(a,b) (e_utf8_gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))
-	SET(prefix, name->prefix);
-	SET(first,  name->first);
-	SET(middle, name->middle);
-	SET(nick,   name->nick);
-	SET(last,   name->last);
-	SET(suffix, name->suffix);
-}
-
-static void
-full_changed_cb (GtkEntry *fulle)
-{
-	gchar *str;
-
-	e_name_western_free (name);
-	str = e_utf8_gtk_entry_get_text (fulle);
-	name = e_name_western_parse (str);
-	fill_entries ();
-
-	g_free (str);
-}
-
-static void
-create_window (void)
-{
-	GtkWidget *app;
-	GtkTable  *table;
-
-	GtkWidget *prefix_label;
-	GtkWidget *first_label;
-	GtkWidget *middle_label;
-	GtkWidget *nick_label;
-	GtkWidget *last_label;
-	GtkWidget *suffix_label;
-
-	app = gnome_app_new ("test", "Evolution Western Name Parser");
-
-	table = GTK_TABLE (gtk_table_new (3, 6, FALSE));
-
-	full   = gtk_entry_new ();
-	prefix = gtk_entry_new ();
-	first  = gtk_entry_new ();
-	middle = gtk_entry_new ();
-	nick   = gtk_entry_new ();
-	last   = gtk_entry_new ();
-	suffix = gtk_entry_new ();
-
-	gtk_widget_set_usize (prefix, 100, 0);
-	gtk_widget_set_usize (first,  100, 0);
-	gtk_widget_set_usize (middle, 100, 0);
-	gtk_widget_set_usize (nick,   100, 0);
-	gtk_widget_set_usize (last,   100, 0);
-	gtk_widget_set_usize (suffix, 100, 0);
-
-	gtk_table_attach (table, full, 0, 6, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0,
-			  0, 0);
-
-	gtk_table_attach (table, prefix, 0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, first, 1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, middle, 2, 3, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, nick, 3, 4, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, last, 4, 5, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, suffix, 5, 6, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	prefix_label = gtk_label_new ("Prefix"); 
-	first_label  = gtk_label_new ("First"); 
-	middle_label = gtk_label_new ("Middle"); 
-	nick_label   = gtk_label_new ("Nick"); 
-	last_label   = gtk_label_new ("Last"); 
-	suffix_label = gtk_label_new ("Suffix"); 
-
-	gtk_table_attach (table, prefix_label, 0, 1, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, first_label, 1, 2, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, middle_label, 2, 3, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, nick_label, 3, 4, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, last_label, 4, 5, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, suffix_label, 5, 6, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gnome_app_set_contents (GNOME_APP (app), GTK_WIDGET (table));
-
-	gtk_widget_show_all (app);
-
-	gtk_entry_set_text (GTK_ENTRY (full),
-			    "The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");
-
-	name = e_name_western_parse ("The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");
-	fill_entries ();
-
-	gtk_signal_connect (GTK_OBJECT (full), "changed", full_changed_cb, NULL);
-}
-
-int
-main (int argc, char **argv)
-{
-	gnome_init ("Test EName", "Test EName", argc, argv);
-
-	create_window ();
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c
deleted file mode 100644
index 6d3beaf16f..0000000000
--- a/e-util/ename/test-ename-western.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <gnome.h>
-#include <ctype.h>
-
-#include <ename/e-name-western.h>
-
-static void
-do_name (char *n)
-{
-	ENameWestern *wname;
-
-	wname = e_name_western_parse (n);
-
-	printf ("Full Name: [%s]\n", n);
-
-	printf ("Prefix: [%s]\n", wname->prefix);
-	printf ("First:  [%s]\n", wname->first);
-	printf ("Middle: [%s]\n", wname->middle);
-	printf ("Nick:   [%s]\n", wname->nick);
-	printf ("Last:   [%s]\n", wname->last);
-	printf ("Suffix: [%s]\n", wname->suffix);
-
-	printf ("\n");
-
-	e_name_western_free (wname);
-}
-
-int
-main (int argc, char **argv)
-{
-	if (argc == 2) {
-		while (! feof (stdin)) {
-			char s[256];
-
-			if (fgets (s, sizeof (s), stdin) == NULL)
-				return 0;
-
-			g_strstrip (s);
-
-			do_name (s);
-		}
-
-		return 0;
-	}
-
-	do_name ("Nat");
-	do_name ("Karl Anders Carlsson");
-	do_name ("Miguel de Icaza Amozorrutia");
-	do_name ("The Honorable Doctor de Icaza, Miguel \"Sparky\" Junior, PhD, MD");
-	do_name ("Nat Friedman MD, Phd");
-	do_name ("Nat Friedman PhD");
-	do_name ("Friedman, Nat");
-	do_name ("Miguel de Icaza Esquire");
-	do_name ("Dr Miguel \"Sparky\" de Icaza");
-	do_name ("Robert H.B. Netzer");
-	do_name ("W. Richard Stevens");
-	do_name ("Nat Friedman");
-	do_name ("N. Friedman");
-	do_name ("Miguel de Icaza");
-	do_name ("Drew Johnson");
-	do_name ("President Bill \"Slick Willy\" Clinton");
-	do_name ("The Honorable Mark J. Einstein Jr");
-	do_name ("Friedman, Nat");
-	do_name ("de Icaza, Miguel");
-	do_name ("Mr de Icaza, Miguel");
-	do_name ("Smith, John Jr");
-	do_name ("Nick Glennie-Smith");
-	do_name ("Dr von Johnson, Albert Roderick Jr");
-
-	return 0;
-}
diff --git a/e-util/md5-utils.c b/e-util/md5-utils.c
deleted file mode 100644
index a4dd42af8b..0000000000
--- a/e-util/md5-utils.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to md5_init, call md5_update as
- * needed on buffers full of bytes, and then call md5_Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-/* parts of this file are :
- * Written March 1993 by Branko Lankester
- * Modified June 1993 by Colin Plumb for altered md5.c.
- * Modified October 1995 by Erik Troan for RPM
- */
-
-
-#include "md5-utils.h"
-#include <stdio.h>
-#include <string.h>
-
-static void md5_transform (guint32 buf[4], const guint32 in[16]);
-
-static gint _ie = 0x44332211;
-static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&_ie;
-#define	IS_BIG_ENDIAN()		(_endian->b[0] == '\x44')
-#define	IS_LITTLE_ENDIAN()	(_endian->b[0] == '\x11')
-
-
-/*
- * Note: this code is harmless on little-endian machines.
- */
-static void 
-_byte_reverse (guchar *buf, guint32 longs)
-{
-	guint32 t;
-	do {
-		t = (guint32) ((guint32) buf[3] << 8 | buf[2]) << 16 |
-			((guint32) buf[1] << 8 | buf[0]);
-		*(guint32 *) buf = t;
-		buf += 4;
-	} while (--longs);
-}
-
-/**
- * md5_init: Initialise an md5 context object
- * @ctx: md5 context 
- * 
- * Initialise an md5 buffer. 
- *
- **/
-void 
-md5_init (MD5Context *ctx)
-{
-	ctx->buf[0] = 0x67452301;
-	ctx->buf[1] = 0xefcdab89;
-	ctx->buf[2] = 0x98badcfe;
-	ctx->buf[3] = 0x10325476;
-	
-	ctx->bits[0] = 0;
-	ctx->bits[1] = 0;
-	
-	if (IS_BIG_ENDIAN())	
-		ctx->doByteReverse = 1;		
-	else 
-		ctx->doByteReverse = 0;	
-}
-
-
-
-/**
- * md5_update: add a buffer to md5 hash computation
- * @ctx: conetxt object used for md5 computaion
- * @buf: buffer to add
- * @len: buffer length
- * 
- * Update context to reflect the concatenation of another buffer full
- * of bytes. Use this to progressively construct an md5 hash.
- **/
-void 
-md5_update (MD5Context *ctx, const guchar *buf, guint32 len)
-{
-	guint32 t;
-	
-	/* Update bitcount */
-	
-	t = ctx->bits[0];
-	if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
-		ctx->bits[1]++;		/* Carry from low to high */
-	ctx->bits[1] += len >> 29;
-	
-	t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
-	
-	/* Handle any leading odd-sized chunks */
-	
-	if (t) {
-		guchar *p = (guchar *) ctx->in + t;
-		
-		t = 64 - t;
-		if (len < t) {
-			memcpy (p, buf, len);
-			return;
-		}
-		memcpy (p, buf, t);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		buf += t;
-		len -= t;
-	}
-	/* Process data in 64-byte chunks */
-	
-	while (len >= 64) {
-		memcpy (ctx->in, buf, 64);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		buf += 64;
-		len -= 64;
-	}
-	
-	/* Handle any remaining bytes of data. */
-	
-	memcpy (ctx->in, buf, len);
-}
-
-
-
-
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-/**
- * md5_final: copy the final md5 hash to a bufer
- * @digest: 16 bytes buffer
- * @ctx: context containing the calculated md5
- * 
- * copy the final md5 hash to a bufer
- **/
-void 
-md5_final (MD5Context *ctx, guchar digest[16])
-{
-	guint32 count;
-	guchar *p;
-	
-	/* Compute number of bytes mod 64 */
-	count = (ctx->bits[0] >> 3) & 0x3F;
-	
-	/* Set the first char of padding to 0x80.  This is safe since there is
-	   always at least one byte free */
-	p = ctx->in + count;
-	*p++ = 0x80;
-	
-	/* Bytes of padding needed to make 64 bytes */
-	count = 64 - 1 - count;
-	
-	/* Pad out to 56 mod 64 */
-	if (count < 8) {
-		/* Two lots of padding:  Pad the first block to 64 bytes */
-		memset (p, 0, count);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		
-		/* Now fill the next block with 56 bytes */
-		memset (ctx->in, 0, 56);
-	} else {
-		/* Pad block to 56 bytes */
-		memset (p, 0, count - 8);
-	}
-	if (ctx->doByteReverse)
-		_byte_reverse (ctx->in, 14);
-	
-	/* Append length in bits and transform */
-	((guint32 *) ctx->in)[14] = ctx->bits[0];
-	((guint32 *) ctx->in)[15] = ctx->bits[1];
-	
-	md5_transform (ctx->buf, (guint32 *) ctx->in);
-	if (ctx->doByteReverse)
-		_byte_reverse ((guchar *) ctx->buf, 4);
-	memcpy (digest, ctx->buf, 16);
-}
-
-
-
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data.  md5_Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-static void 
-md5_transform (guint32 buf[4], const guint32 in[16])
-{
-	register guint32 a, b, c, d;
-	
-	a = buf[0];
-	b = buf[1];
-	c = buf[2];
-	d = buf[3];
-	
-	MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-	MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-	MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);
-	MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-	MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-	MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-	MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);
-	MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);
-	MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);
-	MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-	MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-	MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-	MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);
-	MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);
-	MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);
-	MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);
-	
-	MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-	MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);
-	MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-	MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-	MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-	MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);
-	MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-	MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-	MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-	MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-	MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-	MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-	MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-	MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-	MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-	MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-	
-	MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-	MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);
-	MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-	MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-	MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-	MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-	MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-	MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-	MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-	MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-	MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-	MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);
-	MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-	MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-	MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-	MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-	
-	MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);
-	MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);
-	MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-	MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-	MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-	MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-	MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-	MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-	MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-	MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-	MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);
-	MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-	MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-	MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-	MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-	MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-	
-	buf[0] += a;
-	buf[1] += b;
-	buf[2] += c;
-	buf[3] += d;
-}
-
-
-
-
-/**
- * md5_get_digest: get the md5 hash of a buffer
- * @buffer: byte buffer
- * @buffer_size: buffer size (in bytes)
- * @digest: 16 bytes buffer receiving the hash code.
- * 
- * Get the md5 hash of a buffer. The result is put in 
- * the 16 bytes buffer @digest .
- **/
-void
-md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])
-{	
-	MD5Context ctx;
-
-	md5_init (&ctx);
-	md5_update (&ctx, buffer, buffer_size);
-	md5_final (&ctx, digest);
-	
-}
-
-
-/**
- * md5_get_digest_from_file: get the md5 hash of a file
- * @filename: file name
- * @digest: 16 bytes buffer receiving the hash code.
- * 
- * Get the md5 hash of a file. The result is put in 
- * the 16 bytes buffer @digest .
- **/
-void
-md5_get_digest_from_file (const gchar *filename, guchar digest[16])
-{	
-	MD5Context ctx;
-	guchar tmp_buf[1024];
-	gint nb_bytes_read;
-	FILE *fp;
-
-	printf("generating checksum\n");
-
-	md5_init (&ctx);
-	fp = fopen(filename, "r");
-	if (!fp) {
-	return;
-	}
-	
-	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) > 0)
-		md5_update (&ctx, tmp_buf, nb_bytes_read);
-	
-	if (ferror(fp)) {
-		fclose(fp);
-		return;
-	}
-
-	
-	md5_final (&ctx, digest);
-	
-	printf("checksum done\n");
-}
-
-
-
-
diff --git a/e-util/md5-utils.h b/e-util/md5-utils.h
deleted file mode 100644
index 08e014e86e..0000000000
--- a/e-util/md5-utils.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to rpmMD5Init, call rpmMD5Update as
- * needed on buffers full of bytes, and then call rpmMD5Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-/* parts of this file are :
- * Written March 1993 by Branko Lankester
- * Modified June 1993 by Colin Plumb for altered md5.c.
- * Modified October 1995 by Erik Troan for RPM
- */
-
-
-#ifndef MD5_UTILS_H
-#define MD5_UTILS_H
-
-#include <glib.h>
-
-typedef struct {
-	guint32 buf[4];
-	guint32 bits[2];
-	guchar in[64];
-	gint doByteReverse;
-
-} MD5Context ;
-
-
-void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);
-
-/* use this one when speed is needed */
-/* for use in provider code only */
-void md5_get_digest_from_file (const gchar *filename, guchar digest[16]);
-
-/* raw routines */
-void md5_init (MD5Context *ctx);
-void md5_update (MD5Context *ctx, const guchar *buf, guint32 len);
-void md5_final (MD5Context *ctx, guchar digest[16]);
-
-
-#endif	/* MD5_UTILS_H */
diff --git a/evolution.desktop.in b/evolution.desktop.in
deleted file mode 100644
index de3c05adb1..0000000000
--- a/evolution.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution
-_Comment=The Evolution groupware suite
-Exec=evolution
-Icon=evolution.png
-Terminal=0
-Type=Application
diff --git a/evolution.png b/evolution.png
deleted file mode 100644
index 3b0f90b292..0000000000
--- a/evolution.png
+++ /dev/null
diff --git a/executive-summary/.cvsignore b/executive-summary/.cvsignore
deleted file mode 100644
index a098ff204f..0000000000
--- a/executive-summary/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-core
-Makefile.in
-Makefile
-GNOME_Evolution_Summary.oaf
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
deleted file mode 100644
index 343838a70f..0000000000
--- a/executive-summary/ChangeLog
+++ /dev/null
@@ -1,771 +0,0 @@
-2001-02-14  Iain Holmes  <iain@ximian.com>
-
-	* component/e-summary-url.c (e_summary_url_click): Remove the new
-	OTHER uri stuff.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* component/component-factory.c (component_destroy_cb): Removed
-	this unused function.
-
-	* evolution-services/executive-summary-html-view.c
-	(impl_GNOME_Evolution_Summary_HTMLView_handleURI): Changed the
-	declaration of this function to match the signature in the
-	generated header file.
-
-	* test-service/rdf-summary.c (property_control): Added a cast here.
-
-2001-02-14  Iain Holmes  <iain@ximian.com>
-
-	* evolution-services/executive-summary-html-view.c 
-	(executive_summary_html_view_destroy): Don't unref the event source.
-	(impl_GNOME_Evolution_Summary_HTMLView_handleURI): Emit the signal.
-	(corba_class_init): Hook up the handleURI method.
-	(executive_summary_html_view_class_init): Create the signal.
-
-	* idl/HTMLView.idl: Add the handleURI method.
-
-2001-02-13  Iain Holmes  <iain@ximian.com>
-
-	* test-service/rdf-summary.c (property_control): Add an update now button.
-
-2001-02-12  Iain Holmes  <iain@ximian.com>
-
-	* test-service/rdf-summary.c (property_control): Add a "Update" spinner.
-	(property_action): Only download a new RDF if the URL changed. Use a cached
-	version otherwise.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* component/e-summary-url.c (e_summary_url_click): Close and remove the
-	window on an idle, so that the whole desktop isn't locked by a 
-	GNOME-VFS bug.
-
-2001-02-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup for .oaf.in files.
-	* GNOME_Evolution_Summary.oaf.in: Mark strings for translation.
-	* test-service/Makefile.am: xml-i18n-tools setup for .oaf.in files.
-	* test-service/*.oaf.in: Mark strings for translation.
-	
-2001-01-23  Iain Holmes  <iain@ximian.com>
-
-	* component/e-summary.c (e_summary_load_page): Don't strdup the NULL.
-
-2001-01-20  Iain Holmes  <iain@ximian.com>
-
-	* component/e-summary.c (e_summary_display_window): Free the html
-	variable and the header too.
-
-2001-01-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component/e-summary-url.c: Change the callbacks in this file to
-	match the callback function types.  Fixes warnings.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/component-factory.c (factory_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-	* evolution-services/executive-summary-component.c
-	(executive_summary_component_destroy): Remove unused variable.
-
-2001-01-12  Iain Holmes  <iain@ximian.com>
-
-	* component/e-summary-util.c (e_summary_rm_dir): If base == NULL return;
-	Closes bug #37077
-
-2000-12-30  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): The number of columns
-	is no longer hardcoded.
-
-	* component/e-summary-prefs.[ch]: Add a columns member, and all the 
-	necessary code to support it.
-
-	* component/e-summary-callbacks.c: Set the columns member.
-
-	* test-service/rdf-summary.c: Add a "Show title" button for turning off
-	the title if it is taking up too much room.
-
-2000-12-29  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/rdf-summary.c (view_destroyed): Cancel all pending
-	async downloads.
-	(load_from_stream): Check if the XML was correctly loaded.
-	(read_callback):
-	(close_callback):
-	(open_callback): Add a cast to remove warnings
-	
-	* component/e-summary.c (listener_event): Check for the correct event names.
-
-2000-12-28  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/rdf-summary.c (create_view): Aggregate a 
-	Bonobo::PersistStream interface.
-	(load_from_stream):
-	(summary_to_string):
-	(save_to_stream):
-	(content_types): Functions to load and save an XML document.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (make_control_html): Neatened the code.
-	(e_summary_add_service): Get the event source that is shared
-	between everything.
-	
-	* component/e-summary-url.c (e_summary_url_click): Use the shared
-	event source.
-
-	* test-service/rdf-summary.c (create_view): Use the EventSource when
-	creating the BonoboPropertyBag.
-
-	* test-service/main.c (create_view): Create a shared BonoboEventSource.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/rdf-summary.c (download): Split this function into
-	many callbacks, for async action.
-
-	* component/e-summary-url.c (e_summary_url_request): Split this 
-	into async callbacks too.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component/e-summary-callbacks.c (configure_summary): Added a
-	cast.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): Display all the windows
-	correctly.
-	(e_summary_save_state): Remove the whole of the Executive-Summary dir.
-
-	* component/e-summary-util.[ch]: Add e_summary_rm_dir, a function to reove
-	everything in the path. RC people have a function to do it too, but I can't
-	remember how to get RC :)
-
-	* component/e-summary-callbacks.c: (configure_summary): Put an HTML 
-	explanation into the configure dialog.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): Count the number
-	of rows correctly.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component/e-summary-callbacks.c: Added #include
-	<e-summary-callbacks.h>.
-	(destroy_prefs_cb): Added a cast.
-	(configure_summary): Added a cast.
-
-	* component/e-summary-callbacks.h: Added #include "e-summary.h"
-
-	* component/e-summary-url.c (e_summary_url_click): Removed an
-	unused variable.
-
-	* component/e-summary-util.c: Added #include <e-summary-util.h>
-
-	* component/e-summary.c: Added #include <gtkhtml/htmlselection.h>.
-	(e_summary_queue_rebuild): Added a cast.
-
-	* component/main.c: Added #include <glade/glade.h>.
-
-	* test-service/main.c: Changed some variable types to make casting
-	easier.
-
-	* test-service/rdf-summary.c: Changed some variable types to make
-	casting easier.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): Add stuff. (From campd.)
-
-2000-12-11  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-html-view.h: Add a define
-	for the "html_changed" signal to name space it. Change the
-	function declarations to fit with the below change too.
-
-	* evolution-services/executive-summary-html-view.c 
-	(executive_summary_html_view_new): Create a default BonoboEventSource
-	and use the new _full function.
-	(executive_summary_html_view_new_full): Creates a new HtmlView with
-	the given BonoboEventSource.
-	(executive_summary_html_view_get_event_source): Returns the 
-	BonoboEventSource for the view.
-	(executive_summary_html_view_set_html): Use the new #define for the event
-	name.
-
-	* test-service/rdf-summary.c (create_view): Share the BonoboEventSource
-	between the HtmlView and the BonoboPropertyControl.
-
-	* component/e-summary.c (html_event): Use the name spaced #define.
-	(e_summary_start_load): Add a new hack to set the border width of the 
-	GtkHTML widget to 0.
-	(e_summary_rebuild_page): Redid the way the tables are drawn. Made the
-	title icon be constrained to 48.
-
-	* evolution-services/executive-summary-component.c 
-	(impl_GNOME_Evolution_Summary_ComponentFactory_createViw): Fixed a warning.
-
-	* component/e-summary-util (e_pixmap_file): Free the edir. 
-
-2000-12-08  Iain Holmes  <iain@helixcode.com>
-
-	* summary.html: Don't hardcode the image paths.
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* component/Makefile.am (evolution-executive-summary.pure): Add purify
-	options for the build
-	
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Remove files from extra_dist since they are already
-	listed
-
-2000-12-07  Iain Holmes  <iain@helixcode.com>
-
-	* summary.html: Prettier HTML summary.
-
-	* Makefile.am: Install the new summary.html
-
-	* component/e-summary.c (load_component): Free corba_subdir and
-	corba_stream.
-	(save_component): Free corba stuff. 
-	
-
-2000-12-06  Iain Holmes  <iain@helixcode.com>
-
-	* e-summary-callbacks.c (new_mail): Update COMPOSER_IID to the new
-	style IIDs.
-	(configure_summary): Set up to do stuff when preferences are changed.
-
-	* e-summary-prefs.c (e_summary_prefs_save): Sync and drop the config file
-	so that changes are written to disk.
-
-	* e-summary.c (e_summary_reconfigure): Change the summary to the new
-	preferences.
-
-2000-12-04  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/rdf-summary.c (entry_changed): Add a NULL for opt_ev.
-
-	* idl/HtmlView.idl: Inherit from Bonobo::Unknown and not 
-	Bonobo::EventSource.
-
-	* evolution-services/executive-summary-html-view.[ch]: Change 
-	implementation of the EventSource so that it is aggregated onto
-	the HtmlView object and not inherited.
-
-	* component/e-summary.c (e_summary_window_free): Free the event_source.
-	(e_summary_add_service): query for the EventSource interface.
-
-2000-12-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_load_state): Fix memory leak.
-	(everywhere): Fixed memory leaks, and unref problems.
-
-2000-11-30  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_window_free): remove the
-	event listener before destruction.
-
-	* component/e-summary-url.c (e_summary_url_click): Handle the
-	new PropertyControl api. Add a listener to detect when the page
-	is changed, and adjust the property box accordingly.
-
-	* test-service/main.c (create_view): Increment running view.
-
-2000-11-29  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c: Big memory leak cleanup.
-
-2000-11-28  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_display_window): If the HTML
-	control dies, then just close the open tags.
-
-	* component/e-summary-url (e_summary_url_click): Put the control
-	into a GnomePropertyBox.
-
-	* evolution-services/executive-summary-component.c 
-	(impl_GNOME_Evolution_Summary_ComponentFactory_createView): 
-	Duplicate the component.
-
-2000-11-27  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_window_free): Free all the
-	interfaces and the component.
-	(e_summary_load_state): Fix typos.
-
-	* component/e-summary-prefs.c: Fix some typos.
-
-	* component/e-summary-url.c: If configure is pressed, retrieve
-	the control and embed it in a window.
-
-	* test-services/main.c (component_destroyed): assign ud from data
-	not from ud!
-
-	* test-services/rdf-summary.c (view_destroyed): Connect this 
-	callback and free the summary.
-	(property_control): Made a simple configuration dialog.
-
-2000-11-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-prefs.[ch]: New files to handle loading,
-	saving, copying and freeing preferences.
-
-	* component/e-summary.c (e_summary_save_state): Use the new
-	prefs stuff to save.
-	(e_summary_load_state): Use the new prefs stuff to load.
-
-	* component/e-summary-factory.c (set_pixmap): Use e_pixmap_file
-	to find the pixbuf.
-
-2000-11-24  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Removed the setOwner and unsetOwner 
-	methods from the Component interface.
-
-	* evolution-services/executive-summary.[ch]
-	  evolution-services/executive-summary-client.[ch]
-	  evolution-services/executive-summary-component-client.[ch]
-	  evolution-services/executive-summary-component-view.[ch]:
-	Removed.
- 
-	* component/main.c (main): Stopped ignoring the signals.
-
-	* component/executive-summary-config.glade: Glade file for the
-	prefs dialog.
-
-2000-11-23  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-factory.c (embed-service): Moved to
-	e-summary-callbacks.c.
-	(e_summary_factory_embed_from_id): Moved to e-summary.c and renamed
-	e_summary_embed_from_id.
-	Added a New Mail button.
-
-	* component/e-summary-callbacks.c: New file.
-
-2000-11-22  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_save_state): removed the #if 0s
-	and changed the save type to fs.
-
-2000-11-21  Iain Holmes  <iain@helixcode.com>
-
-	* test-services/rdf-summary.c: Rewrote to use the new services code.
-
-	* idl/HtmlView.idl: Inherit from Bonobo::EventSource instead of
-	Bonobo::Unknown.
-
-2000-11-20  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_save_state): #if 0'd out the 
-	PersistStream code till it is fixed.
-	(e_summary_window_free): Only Bonobo_Unknown_unref the component,
-	not all the other interfaces.
-	(e_summary_remove_window): Function to remove the window from the
-	window list and free it.
-	(make_control_html): Make "id" the address of the window structure.
-
-	* component/e-summary-url.c: Reimplemented all the functions that the
-	Executive Summary had before the big code change.
-
-2000-11-18  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_save_state): Use Persist stream to
-	save the state of all the components.
-	(e_summary_load_state): Use Persist stream to load the components again.
-	(e_summary_add_service): Add a Property Listener to the property bag to
-	be notified of changes to the title or icon.
-
-2000-12-07  Dave Camp  <dave@helixcode.com>
-
-	* evolution-services/evolution-summary-component.c: Don't include 
-	executive-summary-client.h.
-
-2000-12-07  Dave Camp  <dave@helixcode.com>
-
-	* idl/Makefile.am (IDLS): Include HtmlView.idl
-	
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* component/main.c (main): Remove no-longer-needed e_unicode_init.
-
-2000-17-10  Iain Holmes  <iain@helixcode.com>
-
-	 * component/e-summary.c (make_control_html): Set the configure button
-	active if there is a Bonobo_PropertyControl object associated with the
-	window.
-
-	* Makefile.am: Remove the widgets subdirectory.
-
-2000-16-10  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_display_window): Use the property
-	bag to get the window title and icon.
-
-	* test-service/main.c: (create_view): Add a PropertyBag to the object.
-	(set_property): Set the properties.
-	(get_property): Get the properties.
- 
-2000-15-10  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component-factory-client.[ch]:
-	A client for the factory stuff.
-
-2000-14-10  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-html-view.[ch]: Implementation
-	of the HtmlView interface.
-
-	* component/e-summary-factory.c 
-	(e_summary_factory_embed_service_from_id): Rewrote to use the new
-	component_factory.
-
-	* component/e-summary.c (e_summary_add_service): Rewrote to use
-	the new component stuff. Lots of queryInterfaces :)
-	(e_summary_window_free): Rewrote.
-	
-	* test-service/main.c: Rewrote completely as an example of the
-	new services.
-
-2000-13-10  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component.c:
-	Created the ExecutiveSummaryComponentFactory type, that implements
-	GNOME/Evolution/Summary/ComponentFactory. Changed the way 
-	GNOME/Evolution/Summary/Component is implemented.
-
-	* idl/SummaryComponent.idl: Removed all methods from Component
-	execpt setOwner and unsetOwner. Added ComponentFactory interface
-	with a createView method.
-
-	* idl/HtmlView.idl: New interface for HTML services. One method
-	getHtml.
-
-2000-11-10  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component-view.c
-	(executive_summary_component_view_set_title): Removed the
-	"wrong side" warning.
-
-	* component/e-summary-factory.c (set_icon): Change the view's 
-	icon.
-	(e_summary_factory_embed_service_from_id): Connect to the set_icon
-	signal.
-
-2000-11-09  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/rdf-summary.c: Made Alan Cox's rdf-engine.c from
-	Portaloo into a summary component.
-
-2000-11-08  Iain Holmes  <iain@helixcode.com>
-	
-	* component/e-summary.c (e_summary_window_free): Remove the view
-	from the id_to_view hash table.
-	(make_control_html): Fix the bottom row comparison.
-	
-2000-11-07  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_load_state): Load the HTML
-	page for the background.
-	(load_html_page): Use GnomeVFS to load this page, and split it
-	into a header and footer.
-	(e_summary_rebuild_page): If a header and footer exist, use them
-	otherwise just load the default.
-
-2000-11-06  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (on_object_requested): Load a bonobo 
-	service and try to get it to display (Not working yet).
-
-2000-11-04  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/test-bonobo.c: New file to test Bonobo control
-	based services.
-
-	* test-service/test-service.oafinfo: Added the details for the
-	test-bonobo service.
-
-2000-11-03  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (make_control_html): Make a neater
-	function to create the window controls. Check if a window can
-	be moved in a certain direction before making a link.
-
-	* evolution-services/executive-summary-component-view.c: Added a
-	GtkWidget to the private structure to store the control's widget.
-
-2000-11-03  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component-view.c:
-	(executive_summary_component_view_class_init): Add a "configure"
-	signal.
-
-	* evolution-services/executive-summary-component-view.h: Add the
-	default handler in the class type.
-
-	* idl/SummaryComponent.idl: Add an id to the configure method.
-
-	* evolution-services/executive-summary-component-client.[ch]:
-	executive_summary_component_client_configure: Takes a View param. 
-
-	* component/e-summary-factory.c: Connect to the configure signal
-	of the created view and call the configure method.
-
-	* component/e-summary-url.c: When the [?] is clicked, emit the
-	configure signal.
-
-	* test-service/main.c: Connect the configure signal to something.
-
-2000-11-21  Radek Doulik  <rodo@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): use html_engine_is_selection_active
-	added some includes
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* component/e-summary-factory.c: (control_activate_cb),
-	(embed_service):
-	* evolution-executive-summary.oafinfo:
-	* test-service/test-service.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-10  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* component/Makefile.am: Regenerate the idl-generated files
-	if composer idl changes.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-services/Makefile.am: Clean the idl-generated files
-	properly.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c:
-	  component/e-summary-factory.c:
-	  component/e-summary-url.c: Warning's cleanup.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): Requeue the redraw
-	if there is a selection on the widget.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_display_window): Draw the window 
-	controls to move, close and configure the window.
-	(e_summary_window_move_(left|right|up|down)): Move the window around the
-	window list.
-
-	* component/e-summary-url.c (e_summary_url_click): Add handlers for the
-	window control URIs (close:// configure:// up:// down:// left:// and 
-	right://).
-	(get_protocol): Add support for the new protocols.
-	(parse_uri): Ditto.
-	(e_summary_url_describe): ditto.
-
-2000-10-30  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-factory.c (embed_service): Generate the uid here
-	and pass it into the create_view method.
-
-	* evolution-services/executive-summary-component-client.c
-	(executive_summary_component_client_create_view): Use the passed in UID
-	to generate a view.
-
-	* evolution-services/executive-summary-component.c
-	(impl_Evolution_SummaryComponent_create_view): Don't generate the id here
-	but use the passed in one instead.
-
-	* idl/SummaryComponent.idl: create_view now takes an ID parameter.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (load_default): Neaten the Report bug link.
-	(e_summary_end_load): Put in a <hr> and a mailto to me.
-	(e_summary_new): Create an EvolutionShellClient from the Evolution_Shell.
-	(e_summary_get_shell_client): Retrieve the shell-client.
-
-	* component/e-summary-url.c (e_summary_url_click): On a PROTOCOL_VIEW
-	change the current view to the one specified in the URL. 
-
-2000-10-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/executive-summary/evolution-services' and
-	`-I$(top_srcdir)/executive-summary/evolution-services'.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-url.c (e_summary_url_exec): Execute a program
-	specified in the format "exec://program args".
-	(e_summary_url_mail_compose): Run the mail composer when a mailto:
-	URL is clicked.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_start_load): Add a hack to stop the
-	GtkHTML widget returning to the top when it is redrawn.
-
-	* component/e-summary-url.[ch]
-	* component/e-summary-util.[ch]: Split some functions out of e-summary.c
-
-	* component/Makefile.am: Added the new files, and run orbit-idl on the
-	mail composer idl.
-
-2000-10-25    <jpr@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): User 
-	bonobo_control_get_remote_uid_container, not the old version
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/main.c: Store each individual views data with the view.
-	Add comments to explain everything.
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Only try to create a 
-	control if the returned control != NULL.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Set the UID of the view 
-	before passing it to the create_view method.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* idl/Summary.idl: Added set_icon method, and changed update_html_component
-	to update_component. Made all methods take a long ID instead of an
-	SummaryComponent.
-
-	* idl/SummaryComponent.idl: Combined the create_bonobo_view and 
-	create_html_view into create_view.
-	Added a destroy_view method.
-
-	* evolution-services/Makefile.am: Added the 2 new files.
-
-	* evolution-services/executive-summary-component-view.[ch]: New
-	files implementing a view of an ExecutiveSummaryComponent.
-
-	* evolution-services/executive-summary.[ch]
-	* evolution-services/executive-summary-client.[ch]
-	* evolution-services/executive-summary-component.[ch]
-	* evolution-services/executive-summary-component-client.[ch]:
-	* component/e-summary-factory.c
-	* component/e-summary.c
-	* test-service/main.c:
-	Updated to use new methods and the new ExecutiveSummaryComponentView
-	object.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary.c (executive_summary_class_init):
-	Implement the update, set_title and flash functionality as signals
-	instead of methods.
-	(impl_Evolution_Summary_set_title): Emit signal.
-	(impl_Evolution_Summary_flash): Emit signal.
-	(impl_Evolution_Summary_update_html_component): Emit signal.
-	(executive_summary_new): Don't need the methods anymore.
-	(executive_summary_construct): Same.
-	(executive_summary_init): Remove the private initialisation.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* idl/Makefile.am (INCLUDES): 
-	* evolution-services/Makefile.am (INCLUDES): 
-	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-executive-summary.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* evolution-services/Makefile.am (IDLS): make the built sources
-	depend on the idl files
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added an icon parameter to the
-	create_view methods.
-
-	* evolution-services/executive-summary-component.c: Implement
-	the icon parameter.
-
-	* evolution-services/executive-summary-component-client.c: Ditto
-
-	* component/e-summary.c: Draw the specified icon.
-
-	* component/e-summary-factory.c: Use the icon parameter.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) to 
-	find gnomesupport.h
-
-2000-10-06  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (request_cb): Use gnome-vfs to retrieve
-	the requested files. Allows services to specify remote urls.
-	(load_default, e_summary_display_window, e_summary_rebuild_page): 
-	Change the html to match TigerT's lovely design.
-	(e_summary_add_html_service, e_summary_add_html_service): Add
-	the client argument so we can destroy it when we've quit.
-	(e_summary_window_update): Only do an update if there isn't one
-	pending.
-
-	* component/e-summary-factory.c (embed_service): upd.
-
-	* test-service/main.c: Made the test service be really silly and count
-	the number of seconds since it was started.
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Fix builddir != srcdir.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* widgets/.cvsignore: ignore more stuff.
-
-	* .cvsignore: ignore more stuff.
-
-	* idl/.cvsignore: ignore more stuff.
-
-	* evolution-services/.cvsignore: ignore more stuff.
-
-	* component/.cvsignore: ignore more stuff.
-
-	* .cvsignore: add Makefile
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* component/component-factory.c: include
-	<gal/widgets/e-gui-utils.h> instead of "e-util/e-gui-utils.h" to
-	clear up e_notice declaration, and #include <gnome.h> to get "_".
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): upd.
-	(set_pixmap): upd. (update_pixmaps): upd.
-	(control_activate_cb): upd.
-	(control_deactivate): upd.
-
-2000-10-04  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added a title argument to the 
-	create_view methods.
-
-2000-09-13  Iain Holmes  <iain@helixcode.com>
-
-	* Started the Executive Summary
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
deleted file mode 100644
index eeffbe28c0..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		_value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		_value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo
deleted file mode 100644
index c5119bccd1..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am
deleted file mode 100644
index 6d9aa83a17..0000000000
--- a/executive-summary/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS = idl evolution-services component test-service
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Summary.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-htmldir = $(datadir)/evolution
-html_DATA = summary.html
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(html_DATA)
diff --git a/executive-summary/component/.cvsignore b/executive-summary/component/.cvsignore
deleted file mode 100644
index 75f1a012f2..0000000000
--- a/executive-summary/component/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-core
-Makefile.in
-Makefile
-.deps
-.libs
-evolution-executive-summary
-Composer-common.c
-Composer.h
-Composer-stubs.c
-Composer-skels.c
\ No newline at end of file
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
deleted file mode 100644
index c9931b19c0..0000000000
--- a/executive-summary/component/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-bin_PROGRAMS =	evolution-executive-summary
-
-INCLUDES = \
-	-I$(top_srcdir)/widgets					\
-	-I$(top_srcdir)/widgets/e-text				\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/executive-summary			\
-	-I$(top_srcdir)/executive-summary			\
-	-I$(top_builddir)/executive-summary/evolution-services  \
-	-I$(top_srcdir)/executive-summary/evolution-services    \
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_VFS_CFLAGS)					\
-	$(UNICODE_CFLAGS)					\
-	$(GTKHTML_CFLAGS)					\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-CLEANFILES = $(COMPOSER_GENERATED)
-
-COMPOSER_GENERATED = \
-	Composer.h			\
-	Composer-common.c		\
-	Composer-skels.c		\
-	Composer-stubs.c
-
-Composer-impl.o: Composer.h
-
-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
-
-IDLS = \
-	$(selectnamesdir)/Evolution-Addressbook-SelectNames.idl	\
-	$(top_srcdir)/composer/Evolution-Composer.idl		\
-	$(top_srcdir)/composer/Composer.idl
-
-$(COMPOSER_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		$(top_srcdir)/composer/Composer.idl
-
-evolution_executive_summary_SOURCES =		\
-	$(COMPOSER_GENERATED)		\
-	component-factory.c		\
-	component-factory.h		\
-	e-summary.c			\
-	e-summary.h			\
-	e-summary-callbacks.c		\
-	e-summary-callbacks.h		\
-	e-summary-factory.c		\
-	e-summary-factory.h		\
-	e-summary-prefs.c		\
-	e-summary-prefs.h		\
-	e-summary-url.c			\
-	e-summary-url.h			\
-	e-summary-util.c		\
-	e-summary-util.h		\
-	main.c
-
-evolution_executive_summary_LDADD = 					\
-	$(top_builddir)/shell/libeshell.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	-lgal						\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = executive-summary-config.glade
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-executive-summary.pure
-
-evolution-executive-summary.pure: evolution-executive-summary
-	@rm -f evolution-executive-summary.pure
-	$(PLINK) $(evolution_executive_summary_OBJECTS) $(evolution_executive_summary_LDADD) $(LIBS)
-
-endif
-
-EXTRA_DIST = $(glade_DATA)
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
deleted file mode 100644
index 4fba79c420..0000000000
--- a/executive-summary/component/component-factory.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include <gal/widgets/e-gui-utils.h>
-
-#include "component-factory.h"
-#include "e-summary-factory.h"
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-static gint running_objects = 0;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "executive-summary", "evolution-today.png" },
-	{ NULL, NULL }
-};
-
-char *evolution_dir;
-
-/* EvolutionShellComponent methods and signals */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *folder_type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell corba_shell;
-	BonoboControl *control;
-	
-	if (g_strcasecmp (folder_type, "executive-summary") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-	
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-	
-	control = e_summary_factory_new_control (physical_uri, corba_shell);
-	if (!control)
-		return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-	
-	*control_return = control;
-	
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	GNOME_Evolution_Shell corba_shell;
-	
-	evolution_dir = g_strdup (evolution_homedir);
-	
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	gtk_main_quit ();
-}
-
-static void
-factory_destroy (BonoboObject *component,
-		 gpointer dummy)
-{
-	running_objects--;
-	
-	if (running_objects > 0)
-		return;
-	
-	if (factory)
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-	else
-		g_warning ("Serious ref counting error");
-	factory = NULL;
-	
-	gtk_main_quit ();
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-	
-	running_objects++;
-	
-	shell_component = evolution_shell_component_new (folder_types,
-							 create_view,
-							 NULL, NULL, NULL, NULL,
-							 NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-			    GTK_SIGNAL_FUNC (factory_destroy), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-	
-	return BONOBO_OBJECT (shell_component);
-}
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-	
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-	
-	if (factory == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's Executive Summary component."));
-		exit (1);
-	}
-}
diff --git a/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h
deleted file mode 100644
index 65e4ad1d56..0000000000
--- a/executive-summary/component/component-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
-
-
diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
deleted file mode 100644
index 4ffa7f4d00..0000000000
--- a/executive-summary/component/e-summary-callbacks.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-callbacks.c
- *
- * Author: 
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libgnomeui/gnome-propertybox.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <bonobo/bonobo-selector.h>
-
-#include <stdlib.h> /* For atoi */
-
-#include <liboaf/liboaf.h>
-#include <glade/glade.h>
-#include <e-summary-callbacks.h>
-#include <gtkhtml/gtkhtml.h>
-#include <e-util/e-html-utils.h>
-
-#include "e-summary.h"
-
-#include "Composer.h"
-
-#define COMPOSER_IID "OAFIID:GNOME_Evolution_Mail_Composer"
-typedef struct _PropertyData {
-	ESummary *esummary;
-	GnomePropertyBox *box;
-	GladeXML *xml;
-} PropertyData;
-
-/* HTML helper functions from mail/mail-config-gui.c */
-static void
-html_size_req (GtkWidget *widget,
-	       GtkRequisition *requisition)
-{
-	requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white:
-						       &style->bg[0]);
-	}
-
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else {
-		gtk_widget_show_all (scrolled);
-	}
-
-	return html;
-}
-
-static void
-put_html (GtkHTML *html,
-	  const char *text)
-{
-	GtkHTMLStream *handle;
-	char *htmltext;
-
-	htmltext = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (htmltext);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-
-void
-embed_service (GtkWidget *widget,
-	       ESummary *esummary)
-{
-	char *required_interfaces[2] = {"IDL:GNOME/Evolution:Summary:ComponentFactory:1.0",
-					NULL};
-	char *obj_id;
-	
-	obj_id = bonobo_selector_select_id ("Select a service",
-					    (const char **) required_interfaces);
-	if (obj_id == NULL)
-		return;
-
-	e_summary_embed_service_from_id (esummary, obj_id);
-}
-
-void
-new_mail (GtkWidget *widget,
-	  ESummary *esummary)
-{
-	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;
-	CORBA_char *subject;
-	CORBA_Object composer;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || composer == NULL) {
-		CORBA_exception_free (&ev);
-		g_warning ("Unable to start composer component!");
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	to = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to->_length = 0;
-	to->_maximum = 0;
-	to->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);
-
-	cc = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc->_length = 0;
-	cc->_maximum = 0;
-	cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);
-
-	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc->_length = 0;
-	bcc->_maximum = 0;
-	bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);
-
-	subject = CORBA_string_dup ("");
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Composer_setHeaders (composer, to, cc, 
-					     bcc, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		CORBA_free (to);
-		CORBA_free (cc);
-		CORBA_free (bcc);
-		CORBA_free (subject);
-
-		g_warning ("Error setting headers!");
-		return;
-	}
-
-	CORBA_free (to);
-	CORBA_free (cc);
-	CORBA_free (bcc);
-	CORBA_free (subject);
-
-	GNOME_Evolution_Composer_show (composer, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Error showing composer");
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-static void
-destroy_prefs_cb (GtkObject *object,
-		  PropertyData *data)
-{
-	gtk_object_unref (GTK_OBJECT(data->xml));
-	g_free (data);
-}
-
-static void
-html_page_changed_cb (GtkEntry *entry,
-		      PropertyData *data)
-{
-	ESummaryPrefs *prefs;
-
-	/* Change the tmp prefs so that we can restore if the user cancels */
-	prefs = data->esummary->tmp_prefs;
-
-	if (prefs->page)
-		g_free (prefs->page);
-
-	prefs->page = g_strdup (gtk_entry_get_text (entry));
-
-	gnome_property_box_changed (data->box);
-}
-
-static void
-column_spinner_changed_cb (GtkEntry *entry,
-			   PropertyData *data)
-{
-	ESummaryPrefs *prefs;
-	char *value;
-
-	prefs = data->esummary->tmp_prefs;
-
-	gnome_property_box_changed (data->box);
-	value = gtk_entry_get_text (entry);
-	if (value == NULL || *value == '\0')
-		return;
-
-	prefs->columns = atoi (value);
-}
-
-static void
-apply_prefs_cb (GnomePropertyBox *property_box,
-		int page,
-		ESummary *esummary)
-{
-	g_print ("Applying\n");
-
-	if (page != -1)
-		return;
-
-	esummary->prefs = e_summary_prefs_copy (esummary->tmp_prefs);
-
-	e_summary_reconfigure (esummary);
-}
-
-void
-configure_summary (GtkWidget *widget,
-		   ESummary *esummary)
-{
-	static GtkWidget *prefs = NULL;
-	PropertyData *data;
-	GtkWidget *html_page;
-	GtkWidget *vbox, *html, *spinner;
-	char *tmp;
-
-	if (prefs != NULL) {
-		g_assert (GTK_WIDGET_REALIZED (prefs));
-		gdk_window_show (prefs->window);
-		gdk_window_raise (prefs->window);
-		return;
-	} 
-
-	data = g_new (PropertyData, 1);
-	data->esummary = esummary;
-  
-	if (esummary->tmp_prefs != NULL) {
-		e_summary_prefs_free (esummary->tmp_prefs);
-	}
-
-	esummary->tmp_prefs = e_summary_prefs_copy (esummary->prefs);
-	
-	data->xml = glade_xml_new (EVOLUTION_GLADEDIR
-				   "/executive-summary-config.glade", NULL);
-	prefs = glade_xml_get_widget (data->xml, "summaryprefs");
-	data->box = GNOME_PROPERTY_BOX(prefs);
-
-	vbox = glade_xml_get_widget (data->xml, "vbox");
-	html = html_new (TRUE);
-	put_html (GTK_HTML(html),
-		  _("You can select a different HTML page for the background "
-		    "of the Executive Summary.\n\nJust leave it blank for the "
-		    "default"));
-	gtk_box_pack_start (GTK_BOX (vbox), html->parent->parent, TRUE, TRUE, 0);
-	gtk_box_reorder_child (GTK_BOX (vbox), html->parent->parent, 0);
-
-	html_page = glade_xml_get_widget (data->xml, "htmlpage");
-
-	if (esummary->prefs->page != NULL)
-		gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (html_page))), esummary->prefs->page);
-
-	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (html_page))),
-			    "changed", GTK_SIGNAL_FUNC (html_page_changed_cb),
-			    data);
-
-	spinner = glade_xml_get_widget (data->xml, "columnspinner");
-
-	tmp = g_strdup_printf ("%d", esummary->prefs->columns);
-	gtk_entry_set_text (GTK_ENTRY (spinner), tmp);
-	g_free (tmp);
-	gtk_signal_connect (GTK_OBJECT (spinner), "changed",
-			    GTK_SIGNAL_FUNC (column_spinner_changed_cb), data);
-
-	gtk_signal_connect (GTK_OBJECT (prefs), "apply",
-			    GTK_SIGNAL_FUNC (apply_prefs_cb), esummary);
-
-	gtk_signal_connect (GTK_OBJECT (prefs), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_prefs_cb), data);
-	gtk_signal_connect (GTK_OBJECT (prefs), "destroy",
-			    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &prefs);
-}
-
diff --git a/executive-summary/component/e-summary-callbacks.h b/executive-summary/component/e-summary-callbacks.h
deleted file mode 100644
index 6b908d694c..0000000000
--- a/executive-summary/component/e-summary-callbacks.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __E_SUMMARY_CALLBACKS_H__
-#define __E_SUMMARY_CALLBACKS_H__
-
-#include "e-summary.h"
-
-void embed_service (GtkWidget *widget,
-		    ESummary *esummary);
-void new_mail (GtkWidget *widget,
-	       ESummary *esummary);
-void configure_summary (GtkWidget *widget,
-			ESummary *esummary);
-#endif
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
deleted file mode 100644
index 444c8e8558..0000000000
--- a/executive-summary/component/e-summary-factory.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-
-#include <liboaf/liboaf.h>
-
-#include "gal/util/e-util.h"
-#include "e-util/e-gui-utils.h"
-
-#include "e-summary-factory.h"
-
-#include "e-summary.h"
-#include "e-summary-util.h"
-#include "e-summary-callbacks.h"
-#include "Evolution.h"
-
-#include <evolution-services/Executive-Summary.h>
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-factory-client.h>
-
-static GList *control_list = NULL;
-
-BonoboUIVerb verbs[] = {
-	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),
-	BONOBO_UI_UNSAFE_VERB ("NewMail", new_mail),
-	BONOBO_UI_UNSAFE_VERB ("ESummarySettings", configure_summary),
-	BONOBO_UI_VERB_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *component,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-#if 0
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-#else
-	path = e_pixmap_file (icon);
-#endif
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
-	gdk_pixbuf_unref (pixbuf);
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *component)
-{
-	set_pixmap (component, "/Toolbar/AddService", "add-service.png");
-	set_pixmap (component, "/Toolbar/NewMail", "compose-message.png");
-}
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *ui_component,
-		  ESummary          *esummary)
-{
-	Bonobo_UIContainer container;
-
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (ui_component, container);
-	bonobo_object_release_unref (container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);
-	
-	bonobo_ui_component_freeze (ui_component, NULL);
-
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
-			       "evolution-executive-summary.xml", 
-			       "evolution-executive-summary");
-
-	update_pixmaps (ui_component);
-	bonobo_ui_component_thaw (ui_component, NULL);
-}
-
-static void
-control_deactivate (BonoboControl     *control,
-		    BonoboUIComponent *ui_component,
-		    ESummary          *esummary)
-{
-	e_summary_unset_message (esummary); 
-	bonobo_ui_component_unset_container (ui_component);
-}
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	ESummary *summary;
-	BonoboUIComponent *ui_component;
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	ui_component = bonobo_control_get_ui_component (control);
-	g_assert (ui_component != NULL);
-
-	if (gtk_object_get_data (GTK_OBJECT (control), "shell_view_interface") == NULL) {
-		control_frame = bonobo_control_get_control_frame (control);
-		if (control_frame == NULL) {
-			goto out;
-		}
-
-		CORBA_exception_init (&ev);
-		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-								      "IDL:GNOME/Evolution/ShellView:1.0",
-								      &ev);
-		CORBA_exception_free (&ev);
-
-		if (shell_view_interface != CORBA_OBJECT_NIL) {
-			gtk_object_set_data (GTK_OBJECT (control),
-					     "shell_view_interface",
-					     shell_view_interface);
-		} else {
-			g_warning ("Control frame doesn't have Evolution/ShellView.");
-		}
-									       
-		summary = E_SUMMARY (user_data);
-		e_summary_set_shell_view_interface (summary, 
-						    shell_view_interface);
-	}
-
- out:
-	if (activate)
-		control_activate (control, ui_component, user_data);
-	else
-		control_deactivate (control, ui_component, user_data);
-}
-
-static void
-control_destroy_cb (BonoboControl *control,
-		    gpointer user_data)
-{
-	GtkWidget *esummary = user_data;
-
-	control_list = g_list_remove (control_list, control);
-
-	gtk_object_destroy (GTK_OBJECT (esummary));
-}
-
-BonoboControl *
-e_summary_factory_new_control (const char *uri,
-			       const GNOME_Evolution_Shell shell)
-{
-  BonoboControl *control;
-  GtkWidget *esummary;
-
-  esummary = e_summary_new (shell);
-  if (esummary == NULL)
-    return NULL;
-
-  gtk_widget_show (esummary);
-
-  control = bonobo_control_new (esummary);
-
-  if (control == NULL) {
-    gtk_object_destroy (GTK_OBJECT (esummary));
-    return NULL;
-  }
-
-  gtk_signal_connect (GTK_OBJECT (control), "activate",
-		      control_activate_cb, esummary);
-
-  gtk_signal_connect (GTK_OBJECT (control), "destroy",
-		      control_destroy_cb, esummary);
-
-  control_list = g_list_prepend (control_list, control);
-
-  return control;
-}
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
deleted file mode 100644
index a9489d06a4..0000000000
--- a/executive-summary/component/e-summary-factory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_FACTORY_H__
-#define _E_SUMMARY_FACTORY_H__
-
-#include <Evolution.h>
-#include "e-summary.h"
-
-BonoboControl *e_summary_factory_new_control (const char *uri,
-					      const GNOME_Evolution_Shell shell);
-ESummaryWindow *e_summary_factory_embed_service_from_id (ESummary *esummary,
-							 const char *obj_id);
-
-#endif
diff --git a/executive-summary/component/e-summary-prefs.c b/executive-summary/component/e-summary-prefs.c
deleted file mode 100644
index 5ed9876cf4..0000000000
--- a/executive-summary/component/e-summary-prefs.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-prefs.c: Preference handling routines.
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-config.h>
-#include "e-summary-prefs.h"
-#include "e-summary.h"
-
-void
-e_summary_prefs_free (ESummaryPrefs *prefs)
-{
-	g_return_if_fail (prefs != NULL);
-
-	g_free (prefs->page);
-	g_free (prefs);
-}
-
-ESummaryPrefs *
-e_summary_prefs_new (void)
-{
-	ESummaryPrefs *prefs;
-
-	prefs = g_new0 (ESummaryPrefs, 1);
-	return prefs;
-}
-
-ESummaryPrefs *
-e_summary_prefs_copy (ESummaryPrefs *prefs)
-{
-	ESummaryPrefs *copy;
-
-	g_return_val_if_fail (prefs != NULL, NULL);
-
-	copy = e_summary_prefs_new ();
-	copy->page = g_strdup (prefs->page);
-	copy->columns = prefs->columns;
-
-	return copy;
-}
-
-gboolean
-e_summary_prefs_compare (ESummaryPrefs *p1,
-			 ESummaryPrefs *p2)
-{
-	if (p1 == p2)
-		return TRUE;
-
-	if (strcmp (p1->page, p2->page) == 0)
-		return TRUE;
-
-	if (p1->columns == p2->columns)
-		return TRUE;
-
-	return FALSE;
-}
-
-ESummaryPrefs *
-e_summary_prefs_load (const char *path)
-{
-	ESummaryPrefs *prefs;
-	char *item;
-	
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (*path != '\0', NULL);
-
-	prefs = e_summary_prefs_new ();
-	
-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/page", path);
-	prefs->page = gnome_config_get_string (item);
-	g_free (item);
-
-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/columns=3", path);
-	prefs->columns = gnome_config_get_int (item);
-	g_free (item);
-	return prefs;
-}
-
-void
-e_summary_prefs_save (ESummaryPrefs *prefs,
-		      const char *path)
-{
-	char *item;
-
-	g_return_if_fail (prefs != NULL);
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (*path != '\0');
-
-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/page", path);
-	gnome_config_set_string (item, prefs->page);
-	g_free (item);
-
-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/columns", path);
-	gnome_config_set_int (item, prefs->columns);
-	g_free (item);
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
diff --git a/executive-summary/component/e-summary-prefs.h b/executive-summary/component/e-summary-prefs.h
deleted file mode 100644
index 9dc7b09404..0000000000
--- a/executive-summary/component/e-summary-prefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-prefs.h: Preference handling routines.
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_SUMMARY_PREFS_H__
-#define __E_SUMMARY_PREFS_H__
-
-typedef struct _ESummaryPrefs ESummaryPrefs;
-struct _ESummaryPrefs {
-	char *page; /* Background HTML page URL */
-	int columns; /* Number of components per row (Default = 3) */
-
-	/* If anything is added here, don't forget to add 
-	   copy, compare, load and save routines to the appropriate
-	   functions. */
-};
-
-ESummaryPrefs *e_summary_prefs_new (void);
-void e_summary_prefs_free (ESummaryPrefs *prefs);
-ESummaryPrefs *e_summary_prefs_copy (ESummaryPrefs *prefs);
-gboolean e_summary_prefs_compare (ESummaryPrefs *p1,
-				  ESummaryPrefs *p2);
-ESummaryPrefs *e_summary_prefs_load (const char *path);
-void e_summary_prefs_save (ESummaryPrefs *prefs,
-			   const char *path);
-
-#endif
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
deleted file mode 100644
index 4b26f1a85d..0000000000
--- a/executive-summary/component/e-summary-url.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-property-control.h>
-#include <bonobo/bonobo-event-source.h>
-#include <bonobo/bonobo-widget.h>
-
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-url.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnomeui/gnome-propertybox.h>
-
-#include <stdlib.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "e-summary.h"
-#include "e-summary-url.h"
-#include "e-summary-util.h"
-
-#include "Composer.h"
-
-typedef enum _ESummaryProtocol {
-	PROTOCOL_NONE,
-	PROTOCOL_HTTP,
-	PROTOCOL_MAILTO,
-	PROTOCOL_VIEW,
-	PROTOCOL_EXEC,
-	PROTOCOL_FILE,
-	PROTOCOL_CLOSE,
-	PROTOCOL_LEFT,
-	PROTOCOL_RIGHT,
-	PROTOCOL_UP,
-	PROTOCOL_DOWN,
-	PROTOCOL_CONFIGURE,
-	PROTOCOL_OTHER
-} ESummaryProtocol;
-
-static char *descriptions[] = {
-	N_("Open %s with the default GNOME application"),
-	N_("Open %s with the default GNOME web browser"),
-	N_("Send an email to %s"),
-	N_("Change the view to %s"),
-	N_("Run %s"),
-	N_("Open %s with the default GNOME application"),
-	N_("Close %s"),
-	N_("Move %s to the left"),
-	N_("Move %s to the right"),
-	N_("Move %s into the previous row"),
-	N_("Move %s into the next row"),
-	N_("Configure %s"),
-	N_("Open %s with the default GNOME application")
-};
-
-typedef struct _PropertyDialog {
-	BonoboListener *listener;
-	int listener_id;
-
-	Bonobo_EventSource eventsource;
-	GtkWidget *dialog;
-} PropertyDialog;
-#define COMPOSER_IID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-#if HAVECACHE
-static ESummaryCache *image_cache = NULL;
-#endif
-
-gboolean e_summary_url_mail_compose (ESummary *esummary,
-				     const char *url);
-gboolean e_summary_url_exec (const char *exec);
-
-struct _DownloadInfo {
-	GtkHTMLStream *stream;
-	char *uri;
-	char *buffer;
-
-	gboolean error;
-};
-typedef struct _DownloadInfo DownloadInfo;
-
-static void
-close_callback (GnomeVFSAsyncHandle *handle,
-		GnomeVFSResult result,
-		gpointer data)
-{
-	DownloadInfo *info = data;
-	if (info->error) {
-		gtk_html_stream_close (info->stream, GTK_HTML_STREAM_ERROR);
-	} else {
-		gtk_html_stream_close (info->stream, GTK_HTML_STREAM_OK);
-	}
-
-	g_free (info->uri);
-	g_free (info->buffer);
-	g_free (info);
-}
-
-static void
-read_callback (GnomeVFSAsyncHandle *handle,
-	       GnomeVFSResult result,
-	       gpointer buffer,
-	       GnomeVFSFileSize bytes_requested,
-	       GnomeVFSFileSize bytes_read,
-	       gpointer data)
-{
-	DownloadInfo *info = data;
-	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-		g_warning ("Read error");
-		info->error = TRUE;
-		gnome_vfs_async_close (handle, close_callback, info);
-	}
-	
-	if (bytes_read == 0) {
-		info->error = FALSE;
-		gnome_vfs_async_close (handle, close_callback, info);
-	} else {
-		gtk_html_stream_write (info->stream, buffer, bytes_read);
-		gnome_vfs_async_read (handle, buffer, 4095, read_callback,
-				      info);
-	}
-}
-
-static void
-open_callback (GnomeVFSAsyncHandle *handle,
-	       GnomeVFSResult result,
-	       DownloadInfo *info)
-{
-	if (result != GNOME_VFS_OK) {
-		gtk_html_stream_close (info->stream, GTK_HTML_STREAM_ERROR);
-		g_free (info->uri);
-		g_free (info);
-		return;
-	} 
-
-	info->buffer = g_new (char, 4096);
-	gnome_vfs_async_read (handle, info->buffer, 4095, read_callback, info);
-}
-
-void
-e_summary_url_request (GtkHTML *html,
-		       const gchar *url,
-		       GtkHTMLStream *stream)
-{
-	char *filename;
-	GnomeVFSAsyncHandle *handle;
-	DownloadInfo *info;
-
-	g_print ("url: %s\n", url);
-	if (strncasecmp (url, "file:", 5) == 0) {
-		url += 5;
-		filename = e_pixmap_file (url);
-	} else if (strchr (url, ':') >= strchr (url, '/')) {
-		filename = e_pixmap_file (url);
-	} else
-		filename = g_strdup (url);
-
-	if (filename == NULL) {
-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		return;
-	}
-
-	g_print ("Filename: %s\n", filename);
-
-	info = g_new (DownloadInfo, 1);
-	info->stream = stream;
-	info->uri = filename;
-	info->error = FALSE;
-
-	gnome_vfs_async_open (&handle, filename, GNOME_VFS_OPEN_READ,
-			      (GnomeVFSAsyncOpenCallback) open_callback, info);
-}
-
-static char *
-parse_uri (const char *uri,
-	   ESummaryProtocol protocol,
-	   ESummary *esummary)
-{
-	char *parsed;
-	char *p;
-	int address;
-	ESummaryWindow *window;
-
-	switch (protocol) {
-		
-	case PROTOCOL_HTTP:
-		/* "http://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_EXEC:
-		/* "exec://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_VIEW:
-		/* "view://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_MAILTO:
-		/* Fun. Mailto's might be "mailto:" or "mailto://" */
-		if (strstr (uri, "mailto://") == NULL) {
-			parsed = (char *) (uri + 7);
-		} else {
-			parsed = (char *) (uri + 9);
-		}
-
-		/* Now strip anything after a question mark, 
-		   as it is a parameter (that we ignore for the time being) */
-		if ( (p = strchr (parsed, '?')) != NULL) {
-			parsed = g_strndup (parsed, p - parsed);
-		} else {
-			parsed = g_strdup (parsed);
-		}
-
-		break;
-
-	case PROTOCOL_CLOSE:
-		address = atoi (uri + 8);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_LEFT:
-		address = atoi (uri + 7);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_RIGHT:
-		address = atoi (uri + 8);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_UP:
-		address = atoi (uri + 5);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_DOWN:
-		address = atoi (uri + 7);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		address = atoi (uri + 12);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		parsed = g_strdup (window->title);
-		break;
-
-	case PROTOCOL_NONE:
-	case PROTOCOL_OTHER:
-	default:
-		/* Just return the uneditted uri. */
-		parsed = g_strdup (uri);
-		break;
-	}
-
-	return parsed;
-}
-
-static ESummaryProtocol
-get_protocol (const char *url)
-{
-	char *lowerurl;
-	ESummaryProtocol protocol = PROTOCOL_OTHER;
-	
-	lowerurl = g_strdup (url);
-	g_strdown (lowerurl);
-	
-	/* Check for no :/ */
-	if (strstr (lowerurl, "://") == NULL) {
-		
-		/* Annoying alternative for mailto URLs */
-		if (strncmp (lowerurl, "mailto:", 6) != 0) {
-			g_free (lowerurl);
-			return PROTOCOL_NONE;
-		} else {
-			g_free (lowerurl);
-			return PROTOCOL_MAILTO;
-		}
-	}
-	
-	switch (lowerurl[0]) {
-	case 'c':
-		switch (lowerurl[1]) {
-		case 'l':
-			if (strncmp (lowerurl + 2, "ose", 3) == 0)
-				protocol = PROTOCOL_CLOSE;
-			break;
-		case 'o':
-			if (strncmp (lowerurl + 2, "nfigure", 7) == 0)
-				protocol = PROTOCOL_CONFIGURE;
-			break;
-		}
-
-	case 'd':
-		if (strncmp (lowerurl + 1, "own", 3) == 0)
-			protocol = PROTOCOL_DOWN;
-		break;
-
-	case 'e':
-		if (strncmp (lowerurl + 1, "xec", 3) == 0)
-			protocol = PROTOCOL_EXEC;
-		break;
-		
-	case 'f':
-		if (strncmp (lowerurl + 1, "ile", 3) == 0)
-			protocol = PROTOCOL_FILE;
-		break;
-
-	case 'h':
-		if (strncmp (lowerurl + 1, "ttp", 3) == 0)
-			protocol = PROTOCOL_HTTP;
-		break;
-		
-	case 'l':
-		if (strncmp (lowerurl + 1, "eft", 3) == 0)
-			protocol = PROTOCOL_LEFT;
-		break;
-
-	case 'm':
-		if (strncmp (lowerurl + 1, "ailto", 5) == 0)
-			protocol = PROTOCOL_MAILTO;
-		break;
-		
-	case 'r':
-		if (strncmp (lowerurl + 1, "ight", 4) == 0)
-			protocol = PROTOCOL_RIGHT;
-		break;
-
-	case 'u':
-		if (lowerurl[1] == 'p')
-			protocol = PROTOCOL_UP;
-		break;
-		
-	case 'v':
-		if (strncmp (lowerurl + 1, "iew", 3) == 0)
-			protocol = PROTOCOL_VIEW;
-		break;
-		
-	default:
-		break;
-	}
-	
-	g_free (lowerurl);
-	
-	return protocol;
-}
-
-static void
-property_apply (GnomePropertyBox *propertybox,
-		gint page_num,
-		Bonobo_PropertyControl control)
-{
-	CORBA_Environment ev;
-
-	g_print ("page_num: %d\n", page_num);
-
-	CORBA_exception_init (&ev);
-	Bonobo_PropertyControl_notifyAction (control, page_num, Bonobo_PropertyControl_APPLY, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-property_help (GnomePropertyBox *propertybox,
-	       gint page_num,
-	       Bonobo_PropertyControl control)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	Bonobo_PropertyControl_notifyAction (control, page_num, Bonobo_PropertyControl_HELP, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-property_event (BonoboListener *listener,
-		char *event_name,
-		CORBA_any *any,
-		CORBA_Environment *ev,
-		gpointer user_data)
-{
-	PropertyDialog *data = (PropertyDialog *) user_data;
-	if (strcmp (event_name, BONOBO_PROPERTY_CONTROL_CHANGED) == 0) {
-		gnome_property_box_changed (GNOME_PROPERTY_BOX (data->dialog));
-		return;
-	}
-}
-
-static void
-dialog_destroyed (GtkObject *object,
-		  PropertyDialog *dialog)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	Bonobo_EventSource_removeListener (dialog->eventsource,
-					   dialog->listener_id, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error: %s", CORBA_exception_id (&ev));
-	}
-
-	bonobo_object_unref (BONOBO_OBJECT (dialog->listener));
-	CORBA_exception_free (&ev);
-	g_free (dialog);
-}
-
-struct _idle_data {
-	ESummary *esummary;
-	ESummaryWindow *window;
-};
-
-static gboolean
-idle_remove_window (gpointer data)
-{
-	struct _idle_data *id = data;
-
-	e_summary_remove_window (id->esummary, id->window);
-	e_summary_queue_rebuild (id->esummary);
-	g_free (id);
-
-	return FALSE;
-}
-
-void
-e_summary_url_click (GtkWidget *widget,
-		     const char *url,
-		     ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	char *parsed;
-	int address;
-	ESummaryWindow *window;
-	struct _idle_data *id;
-	Bonobo_Control control;
-	Bonobo_Listener corba_listener;
-	GtkWidget *prefsbox, *control_widget;
-	CORBA_Environment ev;
-	PropertyDialog *data;
-	int num_pages, i;
-
-	protocol = get_protocol (url);
-
-	parsed = parse_uri (url, protocol, esummary);
-
-	switch (protocol) {
-	case PROTOCOL_MAILTO:
-		/* Open a composer window */
-		e_summary_url_mail_compose (esummary, parsed);
-		break;
-		
-	case PROTOCOL_VIEW:
-		/* Change the EShellView's current uri */
-		e_summary_change_current_view (esummary, parsed);
-		break;
-		
-	case PROTOCOL_EXEC:
-		/* Execute the rest of the url */
-		e_summary_url_exec (parsed);
-		break;
-
-	case PROTOCOL_CLOSE:
-		/* Close the window. */
-		address = atoi (url + 8);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-
-		id = g_new (struct _idle_data, 1);
-		id->window = window;
-		id->esummary = esummary;
-
-		/* Close the window on an idle to work around a bug in
-		   gnome-vfs which locks the e_summary_remove_window function 
-		   and as gtkhtml has a pointer grab on, this locks the whole 
-		   display. GAH! */
-		g_idle_add (idle_remove_window, id);
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		/* Configure the window. . . */
-		address = atoi (url + 12);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-	
-		data = g_new (PropertyDialog, 1);
-		/* Create the property box */
-		prefsbox = gnome_property_box_new ();
-		data->dialog = prefsbox;
-
-		CORBA_exception_init (&ev);
-		data->eventsource = window->event_source;
-		data->listener = bonobo_listener_new (property_event, data);
-		corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (data->listener));
-		data->listener_id = Bonobo_EventSource_addListener (data->eventsource,
-								    corba_listener, &ev);
-
-		gtk_signal_connect (GTK_OBJECT (prefsbox), "apply",
-				    GTK_SIGNAL_FUNC (property_apply), 
-				    window->propertycontrol);
-		gtk_signal_connect (GTK_OBJECT (prefsbox), "help",
-				    GTK_SIGNAL_FUNC (property_help),
-				    window->propertycontrol);
-		gtk_signal_connect (GTK_OBJECT (prefsbox), "destroy",
-				    GTK_SIGNAL_FUNC (dialog_destroyed), data);
-
-		num_pages = Bonobo_PropertyControl__get_pageCount (window->propertycontrol, &ev);
-		for (i = 0; i < num_pages; i++) {
-			control = Bonobo_PropertyControl_getControl (window->propertycontrol, i, &ev);
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("Unable to get property control.");
-				CORBA_exception_free (&ev);
-				break;
-			}
-			control_widget = bonobo_widget_new_control_from_objref (control,
-										CORBA_OBJECT_NIL);
-			gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefsbox),
-							control_widget,
-							gtk_label_new ("page"));
-		}
-
-		gtk_widget_show_all (prefsbox);
-
-		break;
-
-	case PROTOCOL_LEFT:
-		/* Window left */
-		address = atoi (url + 7);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-
-		e_summary_window_move_left (esummary, window);
-		e_summary_queue_rebuild (esummary);
-		break;
-
-	case PROTOCOL_RIGHT:
-		address = atoi (url + 8);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-
-		e_summary_window_move_right (esummary, window);
-		e_summary_queue_rebuild (esummary);
-		break;
-
-	case PROTOCOL_UP:
-		address = atoi (url + 5);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-
-		e_summary_window_move_up (esummary, window);
-		e_summary_queue_rebuild (esummary);
-		break;
-
-	case PROTOCOL_DOWN:
-		address = atoi (url + 7);
-		window = (ESummaryWindow *) GINT_TO_POINTER (address);
-		if (window->iid == NULL)
-			break;
-
-		e_summary_window_move_down (esummary, window);
-		e_summary_queue_rebuild (esummary);
-		break;
-
-	case PROTOCOL_OTHER:
-	case PROTOCOL_NONE:
-	case PROTOCOL_HTTP:
-	case PROTOCOL_FILE:
-	default:
-		/* Let browser handle it */
-		gnome_url_show (url);
-		break;
-		
-	}      
-
-	g_free (parsed);
-}
-
-static void
-parse_mail_url (char *url,
-		GList **cc,
-		GList **bcc,
-		char **subject)
-{
-	char **options;
-	int i = 0;
-
-	options = g_strsplit (url, "&", 0);
-	while (options[i] != NULL) {
-		char **params;
-
-		params = g_strsplit (options[i], "=", 2);
-		if (strcmp (params[0], "subject") == 0) {
-			*subject = g_strdup (params[1]);
-		} else if (strcmp (params[0], "cc") == 0) {
-			*cc = g_list_prepend (*cc, g_strdup (params[1]));
-		} else if (strcmp (params[1], "bcc") == 0) {
-			*bcc = g_list_prepend (*bcc, g_strdup (params[1]));
-		}
-
-		g_strfreev (params);
-		i++;
-	}
-	
-	g_strfreev (options);
-	/* Reverse the list so it's in the correct order */
-	*cc = g_list_reverse (*cc);
-	*bcc = g_list_reverse (*bcc);
-}
-
-static void
-recipients_from_list (GNOME_Evolution_Composer_RecipientList *recipients,
-		      GList *list)
-{
-	GList *t;
-	int i;
-
-	for (i = 0, t = list; t; i++, t = t->next) {
-		GNOME_Evolution_Composer_Recipient *recipient;
-		char *address = (char *)t->data;
-
-		recipient = recipients->_buffer + i;
-		recipient->name = CORBA_string_dup ("");
-		recipient->address = CORBA_string_dup (address ? address : "");
-	}
-}
-
-static void
-free_list (GList *list)
-{
-	for (; list; list = list->next) {
-		g_free (list->data);
-	}
-}
-
-gboolean
-e_summary_url_mail_compose (ESummary *esummary,
-			    const char *url)
-{
-	CORBA_Object composer;
-	CORBA_Environment ev;
-	char *full_address, *address, *proto, *q;
-	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;
-	GNOME_Evolution_Composer_Recipient *recipient;
-	CORBA_char *subject;
-	GList *gcc = NULL, *gbcc = NULL;
-	char *gsubject = NULL;
-	
-	CORBA_exception_init (&ev);
-	
-	/* FIXME: Query for IIDs? */
-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Unable to start composer component!");
-		return FALSE;
-	}
-
-	if ( (proto = strstr (url, "://")) != NULL){
-		full_address = proto + 3;
-	} else {
-		if (strncmp (url, "mailto:", 7) == 0)
-			full_address = (char *) (url + 7);
-		else
-			full_address = (char *) url;
-	}
-
-	q = strchr (full_address, '?');
-	if (q != NULL) {
-		address = g_strndup (full_address, q - full_address);
-		parse_mail_url (q + 1, &gcc, &gbcc, &gsubject);
-	} else {
-		address = g_strdup (full_address);
-	}
-
-	to = GNOME_Evolution_Composer_RecipientList__alloc ();
-	to->_length = 1;
-	to->_maximum = 1;
-	to->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to->_maximum);
-	
-	recipient = to->_buffer;
-	recipient->name = CORBA_string_dup ("");
-	recipient->address = CORBA_string_dup (address?address:"");
-	g_free (address);
-
-	/* FIXME: Get these out of the URL */
-	cc = GNOME_Evolution_Composer_RecipientList__alloc ();
-	cc->_length = g_list_length (gcc);
-	cc->_maximum = cc->_length;
-	cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
-	
-	recipients_from_list (cc, gcc);
-	free_list (gcc);
-	g_list_free (gcc);
-
-	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();
-	bcc->_length = g_list_length (gbcc);
-	bcc->_maximum = bcc->_length;
-	bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
-	
-	recipients_from_list (bcc, gbcc);
-	free_list (gbcc);
-	g_list_free (gbcc);
-
-	subject = CORBA_string_dup (gsubject ? gsubject : "");
-	g_free (gsubject);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		CORBA_free (to);
-		CORBA_free (cc);
-		CORBA_free (bcc);
-		CORBA_free (subject);
-
-		g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_free (to);
-	CORBA_free (cc);
-	CORBA_free (bcc);
-	CORBA_free (subject);
-
-	CORBA_exception_init (&ev);  
-	GNOME_Evolution_Composer_show (composer, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	/* FIXME: Free the composer? */
-	
-	return TRUE;
-}
-
-gboolean
-e_summary_url_exec (const char *exec)
-{
-	gchar **exec_array;
-	int argc;
-	
-	exec_array = g_strsplit (exec, " ", 0);
-	
-	argc = 0;
-	while (exec_array[argc] != NULL) {
-		argc++;
-	}
-	
-	gnome_execute_async (NULL, argc, exec_array);
-	
-	g_strfreev (exec_array);
-	return TRUE;
-}
-
-static char *
-e_summary_url_describe (const char *uri, 
-			ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	char *contents, *description;
-
-	protocol = get_protocol (uri);
-	contents = parse_uri (uri, protocol, esummary);
-
-	description = g_strdup_printf (_(descriptions[protocol]), contents);
-	g_free (contents);
-
-	return description;
-}
-
-void
-e_summary_url_over (GtkHTML *html,
-		    const char *uri,
-		    ESummary *esummary)
-{
-	char *description;
-
-	if (uri != NULL) {
-		description = e_summary_url_describe (uri, esummary);
-		e_summary_set_message (esummary, description, FALSE);
-		g_free (description);
-	} else {
-		e_summary_unset_message (esummary);
-	}
-}
-
-/* Cache stuff */
-#if HAVECACHE
-void
-e_summary_url_init_cache (void)
-{
-	if (image_cache != NULL)
-		return;
-
-	image_cache = e_summary_cache_new ();
-}
-
-void
-e_summary_url_cache_destroy (void)
-{
-	if (image_cache == NULL)
-		return;
-
-	gtk_object_unref (GTK_OBJECT (image_cache));
-
-	image_cache = NULL;
-}
-#endif
diff --git a/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h
deleted file mode 100644
index 9844d384e0..0000000000
--- a/executive-summary/component/e-summary-url.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_URL_H__
-#define _E_SUMMARY_URL_H__
-
-void e_summary_url_request (GtkHTML *html,
-			    const gchar *url,
-			    GtkHTMLStream *stream);
-void e_summary_url_click (GtkWidget *widget,
-			  const char *url,
-			  ESummary *esummary);
-void e_summary_url_over (GtkHTML *html,
-			 const char *uri,
-			 ESummary *esummary);
-
-#endif
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
deleted file mode 100644
index a983da39b8..0000000000
--- a/executive-summary/component/e-summary-util.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <e-summary-util.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-
-/**
- * e_pixmap_file:
- * @filename: Filename of pixmap.
- *
- * Finds @filename in the Evolution or GNOME installation dir.
- *
- * Returns: A newly allocated absolute path to @filename, or NULL
- * if it cannot be found.
- */
-char *
-e_pixmap_file (const char *filename)
-{
-	char *ret;
-	char *edir;
-
-	if (g_file_exists (filename)) {
-		ret = g_strdup (filename);
-
-		return ret;
-	}
-
-	/* Try the evolution images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-
-		return ret;
-	}
-	g_free (edir);
-
-	/* Try the evolution button images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-		
-		return ret;
-	}
-	g_free (edir);
-
-	/* Fall back to the gnome_pixmap_file */
-	return gnome_pixmap_file (filename);
-}
-	
-/**
- * e_summary_rm_dir:
- * @path: Full path to the directory or file to be removed.
- *
- * Deletes everything in fullpath.
- */
-void
-e_summary_rm_dir (const char *path)
-{
-	DIR *base;
-	struct stat statbuf;
-	struct dirent *contents;
-
-	stat (path, &statbuf);
-	if (!S_ISDIR (statbuf.st_mode)) {
-		/* Not a directory */
-		g_warning ("Removing: %s", path);
-		unlink (path);
-		return;
-	} else {
-		g_warning ("Opening: %s", path);
-		base = opendir (path);
-
-		if (base == NULL)
-			return;
-
-		contents = readdir (base);
-		while (contents != NULL) {
-			char *fullpath;
-
-			if (strcmp (contents->d_name, ".") == 0|| 
-			    strcmp (contents->d_name, "..") ==0) {
-				contents = readdir (base);
-				continue;
-			}
-
-			fullpath = g_concat_dir_and_file (path, contents->d_name);
-			e_summary_rm_dir (fullpath);
-			g_free (fullpath);
-
-			contents = readdir (base);
-		}
-
-		closedir (base);
-		rmdir (path);
-	}
-}
-
diff --git a/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h
deleted file mode 100644
index 63799a324a..0000000000
--- a/executive-summary/component/e-summary-util.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-util.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_UTIL_H__
-#define _E_SUMMARY_UTIL_H__
-
-char *e_pixmap_file (const char *filename);
-void e_summary_rm_dir (const char *filename);
-
-#endif
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
deleted file mode 100644
index 0e5d613ad8..0000000000
--- a/executive-summary/component/e-summary.c
+++ /dev/null
@@ -1,1333 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-event-source.h>
-#include <bonobo/bonobo-listener.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-property-control.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-embedded.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gtkhtml/htmlengine.h>
-#include <gtkhtml/htmlselection.h>
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#include "e-summary.h"
-#include "e-summary-factory.h"
-#include "e-summary-util.h"
-#include "e-summary-url.h"
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-factory-client.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-#define STORAGE_TYPE "fs"
-#define IID_FILE "oaf.id"
-#define DATA_FILE "data"
-
-/* From component-factory.c */
-extern char *evolution_dir;
-
-static GtkObjectClass *e_summary_parent_class;
-
-struct _ESummaryPrivate {
-	GNOME_Evolution_Shell shell;
-	GNOME_Evolution_ShellView shell_view_interface;
-
-	GtkWidget *html_scroller;
-	GtkWidget *html;
-
-	guint idle;
-
-	GtkHTMLStream *stream;
-	gboolean grabbed;
-
-	GList *window_list;
-
-	char *header;
-	int header_len;
-	char *footer;
-	int footer_len;
-};
-
-static gboolean on_object_requested (GtkHTML *html,
-				     GtkHTMLEmbedded *eb,
-				     ESummary *summary);
-static void e_summary_save_state (ESummary *esummary,
-				  const char *path);
-static void e_summary_load_state (ESummary *esummary,
-				  const char *path);
-
-/* GtkObject methods */
-
-static void
-e_summary_destroy (GtkObject *object)
-{
-	ESummary *esummary = E_SUMMARY (object);
-	ESummaryPrivate *priv;
-	GList *l;
-	char *prefix;
-
-	priv = esummary->private;
-	if (priv == NULL)
-		return;
-
-	prefix = g_concat_dir_and_file (evolution_dir, "config/");
-	e_summary_save_state (esummary, prefix);
-	g_free (prefix);
-
-	e_summary_prefs_free (esummary->prefs);
-	for (l = priv->window_list; l; l = l->next)
-		e_summary_window_free (l->data);
-	g_list_free (priv->window_list);
-
-	g_free (priv->header);
-	g_free (priv->footer);
-	g_free (esummary->private);
-	esummary->private = NULL;
-
-	e_summary_parent_class->destroy (object);
-}
-
-static void
-e_summary_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = e_summary_destroy;
-	
-	e_summary_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_start_load (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	priv->stream = gtk_html_begin (GTK_HTML (priv->html));
-
-	/* HTML hacks */
-	/* Hack to stop page returning to the top */
-	GTK_HTML (priv->html)->engine->newPage = FALSE;
-	/* Hack to make the border width of the page 0 */
-	GTK_HTML (priv->html)->engine->leftBorder = 0;
-	GTK_HTML (priv->html)->engine->rightBorder = 0;
-	GTK_HTML (priv->html)->engine->topBorder = 0;
-	GTK_HTML (priv->html)->engine->bottomBorder = 0;
-}
-
-static void
-load_default_header (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	char *def = "<html><body bgcolor=\"#ffffff\">"
-		"<table width=\"100%\"><tr><td align=\"right\">"
-		"<img src=\"ccsplash.png\"></td></tr></table>"
-		"<table><tr><td><a href=\"exec://bug-buddy\"><img src=\"file://gnome-spider.png\" width=\"24\" height=\"24\" border=\"0\">"
-		"</a></td><td><a href=\"exec://bug-buddy\">Submit a bug report"
-		"</a></td></tr></table><hr>";
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	g_return_if_fail (priv->stream != NULL);
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, def, strlen (def));
-}
-static void
-load_default_footer (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	char *footer = "<hr><p align=\"right\">All Executive Summary comments to <a href=\"mailto:iain@helixcode.com\">Iain Holmes (iain@helixcode.com)</a></p></body></html>";
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, 
-			footer, strlen (footer));
-}
-
-static void
-e_summary_end_load (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-	gtk_html_end (GTK_HTML (priv->html), priv->stream, GTK_HTML_STREAM_OK);
-
-	priv->stream = NULL;
-}
-
-static void
-e_summary_init (ESummary *esummary)
-{
-	GdkColor bgcolour = {0, 0xdfff, 0xdfff, 0xffff};
-	ESummaryPrivate *priv;
-
-	esummary->prefs = NULL;
-	esummary->tmp_prefs = NULL;
-	esummary->private = g_new0 (ESummaryPrivate, 1);
-	priv = esummary->private;
-
-	priv->window_list = NULL;
-	priv->idle = 0;
-
-	/* HTML widget */
-	priv->html_scroller = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->html_scroller),
-					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	priv->html = gtk_html_new ();
-	gtk_html_set_editable (GTK_HTML (priv->html), FALSE);
-	gtk_html_set_default_background_color (GTK_HTML (priv->html), &bgcolour);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url-requested",
-			    GTK_SIGNAL_FUNC (e_summary_url_request), esummary);
-  	gtk_signal_connect (GTK_OBJECT (priv->html), "object-requested", 
-  			    GTK_SIGNAL_FUNC (on_object_requested), esummary); 
-	gtk_signal_connect (GTK_OBJECT (priv->html), "link-clicked",
-			    GTK_SIGNAL_FUNC (e_summary_url_click), esummary);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "on-url",
-			    GTK_SIGNAL_FUNC (e_summary_url_over), esummary);
-
-	gtk_container_add (GTK_CONTAINER (priv->html_scroller), priv->html);
-	gtk_widget_show_all (priv->html_scroller);
-
-	e_summary_queue_rebuild (esummary);
-
-	/* Pack stuff */
-	gtk_box_pack_start (GTK_BOX (esummary), priv->html_scroller, 
-			    TRUE, TRUE, 0);
-}
-
-E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
-	     e_summary_init, PARENT_TYPE);
-
-GtkWidget *
-e_summary_new (const GNOME_Evolution_Shell shell)
-{
-	ESummary *esummary;
-	ESummaryPrivate *priv;
-	char *path;
-
-	esummary = gtk_type_new (e_summary_get_type ());
-	priv = esummary->private;
-
-	priv->shell = shell;
-
-	/* Restore services */
-	path = g_concat_dir_and_file (evolution_dir, 
-				      "config");
-	e_summary_load_state (esummary, path);
-	g_free (path);
-
-	return GTK_WIDGET (esummary);
-}
-
-#if 0
-static void
-control_unrealize (GtkHTMLEmbedded *eb,
-		   GtkWidget *widget)
-{
-	g_print ("Removing\n");
-}
-
-static void
-being_unrealized (GtkWidget *widget,
-		  GtkHTMLEmbedded *eb)
-{
-	g_warning ("Widget is being unrealized");
-	gtk_container_remove (GTK_CONTAINER (eb), widget);
-}
-
-static void
-being_realized (GtkWidget *widget,
-		gpointer user_data)
-{
-	gdk_window_ref (widget->window);
-}
-#endif
-
-static gboolean
-on_object_requested (GtkHTML *html,
-		     GtkHTMLEmbedded *eb,
-		     ESummary *esummary)
-{
-#if 0
-	static GtkWidget *widget = NULL;
-	int id;
-
-	if (sscanf (eb->classid, "cid:%d", &id) != 1) {
-		g_warning ("Could not get the view id: eb->classid = %s",
-			   eb->classid);
-		return FALSE;
-	}
-
-	if (widget == NULL || !GTK_IS_WIDGET (widget)) {
-		g_print ("Create new\n");
-      		widget = executive_summary_component_view_get_widget (view);  
-/*    		widget = gtk_button_new_with_label ("Hello?");  */
-		gtk_signal_connect (GTK_OBJECT (widget), "realize",
-				    GTK_SIGNAL_FUNC (being_realized), NULL);
-		gtk_signal_connect (GTK_OBJECT (widget), "unrealize",
-				    GTK_SIGNAL_FUNC (being_unrealized), eb);
-		g_print ("New widget: %p\n", GTK_BIN (widget)->child);
-	} else {
-		g_print ("No new\n");
-	}
-
-	if (widget == NULL) {
-		g_warning ("View %d has no GtkWidget.", id);
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (eb), "unrealize",
-			    GTK_SIGNAL_FUNC (control_unrealize), widget);
-	gtk_widget_show_all (widget);
-	gtk_widget_ref (widget);
-
-	if (widget->parent == NULL)
-		gtk_container_add (GTK_CONTAINER (eb), widget);
-
-#endif
-	return TRUE;
-}
-
-/* Generates the window controls and works out
-   if they should be disabled or not */
-static char *
-make_control_html (ESummaryWindow *window,
-		   int row, 
-		   int col,
-		   int numwindows)
-{
-	char *html, *tmp;
-	int id = GPOINTER_TO_INT (window);
-	gboolean config;
-
-	config = TRUE;
-
-	if (window->propertycontrol == CORBA_OBJECT_NIL)
-		config = FALSE;
-
-	html = g_strdup_printf ("<table><tr><td><a href=\"close://%d\">"
-				"<img src=\"service-close.png\" border=\"0\">"
-				"</a></td></tr><tr><td>", id);
-
-	tmp = html;
-	if (!config) {
-		html = g_strdup_printf ("%s<img src=\"service-configure.png\">"
-					"</td></tr></table>", tmp);
-	} else {
-		html = g_strdup_printf ("%s<a href=\"configure://%d\">"
-					"<img src=\"service-configure.png\" border=\"0\">"
-					"</a></td></tr></table>", tmp, id);
-	}
-	g_free (tmp);
-
-	return html;
-}
-
-static void
-e_summary_display_window_title (ESummary *esummary,
-				ESummaryWindow *window,
-				int row,
-				int col,
-				int numwindows)
-{
-	ESummaryPrivate *priv;
-	char *title_html;
-	char *control_html;
-	char *title_colour[2] = {"bac1b6",
-				 "cdd1c7"};
-
-	priv = esummary->private;
-
-	control_html = make_control_html (window, row, col, numwindows);
-	title_html = g_strdup_printf ("<td bgcolor=\"#%s\">"
-				      "<table width=\"100%%\" height=\"100%%\"><tr><td>"
-				      "<img src=\"%s\" height=\"48\"></td>"
-				      "<td nowrap align=\"center\" width=\"100%%\">"
-				      "<b>%s</b></td><td>%s</td></tr></table></td>",
-				      title_colour[col % 2], window->icon, 
-				      window->title, control_html);
-	g_free (control_html);
-	
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, title_html,
-			strlen (title_html));
-	g_free (title_html);
-}
-	
-static void
-e_summary_display_window (ESummary *esummary,
-			  ESummaryWindow *window,
-			  int row,
-			  int col,
-			  int numwindows)
-{
-	ESummaryPrivate *priv;
-	char *footer = "</td>";
-	char *header;
-	char *colour[2] = {"e6e8e4", 
-			   "edeeeb"};
-
-	priv = esummary->private;
-
-	header = g_strdup_printf ("<td bgcolor=\"%s\" valign=\"top\">", colour[col % 2]);
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, header, strlen (header));
-	g_free (header);
-
-	if (window->html != CORBA_OBJECT_NIL) {
-		char *html = NULL;
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		html = GNOME_Evolution_Summary_HTMLView_getHtml (window->html,
-								 &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			g_warning ("Cannot get HTML.");
-			if (html)
-				CORBA_free (html);
-		} else {
-			CORBA_exception_free (&ev);
-			
-			gtk_html_write (GTK_HTML (priv->html), priv->stream,
-					html, strlen (html));
-			CORBA_free (html);
-		}
-	} else {
-#if 0
-		char *body_cid;
-
-		body_cid = g_strdup_printf ("<object classid=\"cid:%d\"></object>", id);
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				body_cid, strlen (body_cid));
-		g_free (body_cid);
-#endif
-	}
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream,
-			footer, strlen (footer));
-}
-
-static int
-e_summary_rebuild_page (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	GList *windows;
-	char *service_table = "<table numcols=\"%d\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" height=\"100%%\" width=\"100%%\">";
-	char *tmp;
-	int numwindows, numrows;
-	int i, j, k;
-	int columns;
-
-	g_return_val_if_fail (esummary != NULL, FALSE);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE);
-
-	priv = esummary->private;
-
-	if (priv->idle == 0) {
-		g_warning ("esummary->private->idle == 0! This means that "
-			   "e_summary_rebuild_page was called by itself and "
-			   "not queued. You should use e_summary_queue_rebuild "
-			   "instead.");
-		return FALSE;
-	}
-
-	/* If there is a selection, don't redraw the page so that the selection
-	   isn't cleared */
-	if (GTK_HTML (priv->html)->in_selection == TRUE ||
-	    html_engine_is_selection_active (GTK_HTML (priv->html)->engine) == TRUE)
-		return FALSE;
-
-	gtk_layout_freeze (GTK_LAYOUT (priv->html));
-	e_summary_start_load (esummary);
-	
-	if (priv->header == NULL || *priv->header == '\0') {
-		load_default_header (esummary);
-	} else {
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				priv->header, priv->header_len);
-	}
-
-	/* Load the start of the services */
-	tmp = g_strdup_printf (service_table, esummary->prefs->columns);
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, tmp, strlen (tmp));
-	g_free (tmp);
-	/* Load each of the services */
-	numwindows = g_list_length (priv->window_list);
-
-	columns = esummary->prefs->columns;
-
-	windows = priv->window_list;
-	if (numwindows % columns == 0)
-		numrows = numwindows / columns;
-	else
-		numrows = numwindows / columns + 1;
-
-	for (i = 0; i < numrows; i++) {
-		GList *window = windows;
-		
-		/* Do the same row twice: 
-		   Once for the title, once for the contents */
-		for (j = 0; j < 2; j++) {
-			int limit;
-			
-			gtk_html_write (GTK_HTML (priv->html), priv->stream,
-					"<tr>", 4);
-				/* For each window on row i */
-			limit = MIN (columns, (numwindows - (i * columns)));
-			for (k = 0; k < limit; k++) {
-				
-				if (window == NULL)
-					break;
-
-				if (j == 0) {
-					e_summary_display_window_title (esummary,
-									window->data,
-									k, k, 
-									numwindows);
-				} else {
-					e_summary_display_window (esummary,
-								  window->data,
-								  k, k,
-								  numwindows);
-				}
-				
-				if (window != NULL)
-					window = window->next;
-				
-				if (window == NULL)
-					break;
-			}
-			
-			gtk_html_write (GTK_HTML (priv->html), priv->stream,
-					"</tr>", 5);
-			if (j == 0)
-				window = windows;
-			else {
-				if (window)
-					windows = window;
-				else 
-					break;
-			}
-		}
-	}
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, "</tr></table>", 13);
-	
-	if (priv->footer == NULL || *priv->footer == '\0') {
-		load_default_footer (esummary);
-	} else {
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				priv->footer, priv->footer_len);
-	}
-	
-	e_summary_end_load (esummary);
-	gtk_layout_thaw (GTK_LAYOUT (priv->html));
-
-	priv->idle = 0;
-	return FALSE;
-}
-
-/* This is the function that should be called instead of 
-   e_summary_queue_rebuild. This prevents multiple 
-   rebuilds happening together. */
-void
-e_summary_queue_rebuild (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	priv = esummary->private;
-	if (priv->idle != 0)
-		return;
-
-	priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);
-}
-
-static void
-listener_event (BonoboListener *listener,
-		char *event_name,
-		BonoboArg *event_data,
-		CORBA_Environment *ev,
-		gpointer user_data)
-{
-	ESummaryWindow *window = (ESummaryWindow *) user_data;
-
-	if (strcmp (event_name, "Bonobo/Property:change:window_title") == 0) {
-		if (window->title != NULL)
-			g_free (window->title);
-
-		window->title = g_strdup (BONOBO_ARG_GET_STRING (event_data));
-		e_summary_queue_rebuild (window->esummary);
-	} else if (strcmp (event_name, "Bonobo/Property:change:window_icon") == 0) {
-		if (window->icon != NULL)
-			g_free (window->icon);
-
-		window->icon = g_strdup (BONOBO_ARG_GET_STRING (event_data));
-		e_summary_queue_rebuild (window->esummary);
-	} else if (strcmp (event_name, EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED) == 0) {
-		e_summary_queue_rebuild (window->esummary);
-	}
-
-	return;
-}
-		
-ESummaryWindow *
-e_summary_add_service (ESummary *esummary,
-		       GNOME_Evolution_Summary_Component component,
-		       const char *iid)
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-	Bonobo_Unknown unknown = CORBA_OBJECT_NIL;
-	Bonobo_Listener listener;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (esummary != NULL, NULL);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL);
-	g_return_val_if_fail (component != CORBA_OBJECT_NIL, NULL);
-
-	priv = esummary->private;
-
-	window = g_new0 (ESummaryWindow, 1);
-	window->component = component;
-	window->iid = g_strdup (iid);
-	window->esummary = esummary;
-
-	/* See what interfaces our component supports */
-	CORBA_exception_init (&ev);
-	unknown = Bonobo_Unknown_queryInterface (component,
-						 "IDL:Bonobo/Control:1.0", &ev);
-	window->control = (Bonobo_Control) unknown;
-
-	unknown = Bonobo_Unknown_queryInterface (component,
-						 "IDL:GNOME/Evolution/Summary/HTMLView:1.0", 
-						 &ev);
-	window->html = (GNOME_Evolution_Summary_HTMLView) unknown;
-
-	/* Check at least one of the above interfaces was supported */
-	if (window->html == CORBA_OBJECT_NIL &&
-	    window->control == CORBA_OBJECT_NIL) {
-		CORBA_Environment ev2;
-		g_warning ("This component does not support either" 
-			   "Bonobo/Control:1.0 or GNOME/Evolution/Summary/HTMLView:1.0");
-
-		CORBA_exception_init (&ev2);
-		CORBA_Object_release (component, &ev2);
-		CORBA_exception_free (&ev2);
-
-		g_free (window);
-		return NULL;
-	}
-
-	unknown = Bonobo_Unknown_queryInterface (component,
-						 "IDL:Bonobo/PropertyBag:1.0",
-						 &ev);
-	window->propertybag = (Bonobo_PropertyBag) unknown;
-
-	window->event_source = Bonobo_Unknown_queryInterface(window->propertybag,
-							     "IDL:Bonobo/EventSource:1.0", &ev);
-	if (window->event_source == CORBA_OBJECT_NIL) {
-		g_warning ("There is no Bonobo::EventSource interface");
-
-		/* FIXME: Free whatever objects exist */
-		g_free (window);
-		return NULL;
-	}
-
-	window->listener = bonobo_listener_new (NULL, NULL);
-	gtk_signal_connect (GTK_OBJECT (window->listener), "event_notify",
-			    GTK_SIGNAL_FUNC (listener_event), window);
-	listener = bonobo_object_corba_objref (BONOBO_OBJECT (window->listener));
-	window->listener_id = Bonobo_EventSource_addListener (window->event_source, listener, &ev);
-
-	unknown = Bonobo_Unknown_queryInterface (component,
-						 "IDL:Bonobo/PersistStream:1.0",
-						 &ev);
-	window->persiststream = (Bonobo_PersistStream) unknown;
-	
-	unknown = Bonobo_Unknown_queryInterface (component,
-						 "IDL:Bonobo/PropertyControl:1.0",
-						 &ev);
-	window->propertycontrol = (Bonobo_PropertyControl) unknown;
-
-	/* Cache the title and icon */
-	window->title = bonobo_property_bag_client_get_value_string (window->propertybag,
-								     "window_title", 
-								     NULL);
-	g_print ("title: %s\n", window->title);
-	window->icon = bonobo_property_bag_client_get_value_string (window->propertybag,
-								    "window_icon", NULL);
-	g_print ("icon: %s\n", window->icon);
-
-	CORBA_exception_free (&ev);
-	priv->window_list = g_list_append (priv->window_list, window);
-
-	return window;
-}
-
-
-ESummaryWindow *
-e_summary_embed_service_from_id (ESummary *esummary,
-				 const char *obj_id)
-{
-	GNOME_Evolution_Summary_Component component;
-	ExecutiveSummaryComponentFactoryClient *client;
-	ESummaryWindow *window;
-	
-	client = executive_summary_component_factory_client_new (obj_id);
-	
-	component = executive_summary_component_factory_client_create_view (client);
-
-	/* Don't need the client any more */
-	bonobo_object_unref (BONOBO_OBJECT (client));
-
-	window = e_summary_add_service (esummary, component, obj_id);
-	e_summary_queue_rebuild (esummary);
-	
-	return window;
-}
-
-void
-e_summary_window_free (ESummaryWindow *window)
-{
-	CORBA_Environment ev;
-
-	g_return_if_fail (window != NULL);
-
-	g_free (window->iid);
-	g_free (window->icon);
-	g_free (window->title);
-
-	CORBA_exception_init (&ev);
-
-	if (window->control != CORBA_OBJECT_NIL) {
-		bonobo_object_release_unref (window->control, &ev);
-	}
-
-	if (window->event_source != CORBA_OBJECT_NIL) {
-		Bonobo_EventSource_removeListener (window->event_source,
-						   window->listener_id,
-						   &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("CORBA ERROR: %s", CORBA_exception_id (&ev));
-		}
-		bonobo_object_release_unref (window->event_source, &ev);
-	}
-
-	bonobo_object_release_unref (window->propertybag, &ev);
-	bonobo_object_release_unref (window->persiststream, &ev);
-	bonobo_object_release_unref (window->propertycontrol, &ev);
-	bonobo_object_unref (BONOBO_OBJECT (window->listener));
-	bonobo_object_release_unref (window->html, &ev);
-
-	bonobo_object_release_unref (window->component, &ev);
-	CORBA_exception_free (&ev);
-	g_free (window);
-}
-
-void
-e_summary_remove_window (ESummary *esummary,
-			 ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (window != NULL);
-
-	priv = esummary->private;
-	priv->window_list = g_list_remove (priv->window_list, window);
-	e_summary_window_free (window);
-}
-	
-void
-e_summary_set_shell_view_interface (ESummary *esummary,
-				    GNOME_Evolution_ShellView svi)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (svi != CORBA_OBJECT_NIL);
-
-	priv = esummary->private;
-	priv->shell_view_interface = svi;
-}
-
-/* Wrappers for GNOME_Evolution_ShellView */
-void
-e_summary_set_message (ESummary *esummary,
-		       const char *message,
-		       gboolean busy)
-{
-	ESummaryPrivate *priv;
-	GNOME_Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	if (message != NULL)
-		GNOME_Evolution_ShellView_setMessage (svi, message, busy, &ev);
-	else 
-		GNOME_Evolution_ShellView_setMessage (svi, "", busy, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_unset_message (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	GNOME_Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_ShellView_unsetMessage (svi, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_change_current_view (ESummary *esummary,
-			       const char *uri)
-{
-	ESummaryPrivate *priv;
-	GNOME_Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_ShellView_changeCurrentView (svi, uri, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_set_title (ESummary *esummary,
-		     const char *title)
-{
-	ESummaryPrivate *priv;
-	GNOME_Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_ShellView_setTitle (svi, title, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-e_summary_load_page (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GtkWidget *toplevel;
-	GString *string;
-	char *str, *comment;
-	char *filename;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	
-	priv = esummary->private;
-
-	/* Pass NULL to reset the page to the default */
-	if ((esummary->prefs->page) == NULL || 
-	    *(esummary->prefs->page) == '\0') {
-		filename = g_concat_dir_and_file (EVOLUTION_DATADIR, "/evolution/summary.html");
-	} else {
-		filename = g_strdup (esummary->prefs->page);
-	}
-
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (esummary));
-	string = g_string_new ("");
-	result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
-	if (result != GNOME_VFS_OK) {
-		e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING,
-			  _("Cannot open the HTML file:\n%s"), filename);
-		g_free (filename);
-		return;
-	}
-
-	g_free (filename);
-	while (1) {
-		char buffer[4096];
-		GnomeVFSFileSize size;
-
-		memset (buffer, 0x00, 4096);
-		result = gnome_vfs_read (handle, buffer, 4096, &size);
-		if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-			e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING, 
-				  _("Error reading data:\n%s"),
-				  gnome_vfs_result_to_string (result));
-			gnome_vfs_close (handle);
-			return;
-		}
-		if (size == 0)
-			break; /* EOF */
-
-		string = g_string_append (string, buffer);
-	}
-
-	gnome_vfs_close (handle);
-	str = string->str;
-	g_string_free (string, FALSE);
-
-	comment = strstr (str, "<!-- EVOLUTION EXECUTIVE SUMMARY SERVICES DO NOT REMOVE -->");
-	if (comment == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_WARNING, 
-			  _("File does not have a place for the services.\n"));
-		g_free (str);
-		return;
-	}
-
-	if (priv->header != NULL)
-		g_free (priv->header);
-	priv->header = g_strndup (str, comment - str);
-	priv->header_len = strlen (priv->header);
-
-	if (priv->footer != NULL)
-		g_free (priv->footer);
-	priv->footer = g_strdup (comment);
-	priv->footer_len = strlen (priv->footer);
-	g_free (str);
-}
-
-static char *
-load_component_id_stream_read (Bonobo_Stream stream,
-			       CORBA_Environment *ev)
-{
-	Bonobo_Stream_iobuf *buffer;
-	GString *str;
-	char *ans;
-
-	str = g_string_sized_new (256);
-#define READ_CHUNK_SIZE 65536
-	do {
-		int i;
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE, &buffer, ev);
-		if (ev->_major != CORBA_NO_EXCEPTION)
-			return NULL;
-
-		/* FIXME: make better PLEASE!!!*/
-		for (i = 0; i < buffer->_length; i++)
-			g_string_append_c (str, buffer->_buffer[i]);
-
-		if (buffer->_length <= 0)
-			break;
-		CORBA_free (buffer);
-	} while (1);
-#undef READ_CHUNK_SIZE
-	CORBA_free (buffer);
-
-	ans = str->str;
-	g_string_free (str, FALSE);
-
-	return ans;
-}
-
-static char *
-load_component_id (Bonobo_Storage corba_storage,
-		   CORBA_Environment *ev)
-{
-	Bonobo_Stream corba_stream;
-	char *iid;
-
-	corba_stream = Bonobo_Storage_openStream (corba_storage, IID_FILE,
-						  Bonobo_Storage_READ, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION)
-		return NULL;
-
-	if (corba_stream) {
-		iid = load_component_id_stream_read (corba_stream, ev);
-		Bonobo_Unknown_unref (corba_stream, ev);
-		CORBA_Object_release (corba_stream, ev);
-	} else {
-		g_warning ("Cannot find `%s'", IID_FILE);
-		return NULL;
-	}
-
-	return iid;
-}
-
-static void
-load_component (ESummary *esummary,
-		BonoboStorage *storage,
-		int index)
-{
-	char *curdir;
-	char *iid;
-	Bonobo_Storage corba_subdir;
-	Bonobo_Storage corba_storage;
-	ESummaryWindow *window;
-	CORBA_Environment ev;
-
-	curdir = g_strdup_printf ("%08d", index);
-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));
-	CORBA_exception_init (&ev);
-
-	corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir,
-						   Bonobo_Storage_READ, &ev);
-	if (corba_subdir == CORBA_OBJECT_NIL) {
-		g_free (curdir);
-		return;
-	}
-
-	iid = load_component_id (corba_subdir, &ev);
-
-	if (iid) {
-		Bonobo_Stream corba_stream;
-
-		window = e_summary_embed_service_from_id (esummary, iid);
-		if (window) {
-			if (window->persiststream) {
-				corba_stream = Bonobo_Storage_openStream 
-					(corba_subdir,
-					 DATA_FILE,
-					 Bonobo_Storage_READ |
-					 Bonobo_Storage_CREATE, &ev);
-				if (ev._major != CORBA_NO_EXCEPTION) {
-					g_print ("Gah");
-					return;
-				}
-
-				Bonobo_PersistStream_load (window->persiststream,
-							   corba_stream, 
-							   "", &ev);
-				if (ev._major != CORBA_NO_EXCEPTION)
-					g_warning ("Could not load `%s'", iid);
-
-				bonobo_object_release_unref (corba_stream, &ev);
-			}
-		}
-
-		g_free (iid);
-	}
-
-	bonobo_object_release_unref (corba_subdir, &ev);
-	CORBA_exception_free (&ev);
-	g_free (curdir);
-}
-
-void
-e_summary_reconfigure (ESummary *esummary)
-{
-	e_summary_load_page (esummary);
-	e_summary_queue_rebuild (esummary);
-}
-
-static void
-e_summary_load_state (ESummary *esummary,
-		      const char *path)
-{
-	char *fullpath;
-	BonoboStorage *storage;
-	Bonobo_Storage corba_storage;
-	Bonobo_Storage_DirectoryList *list;
-	CORBA_Environment ev;
-	int i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	fullpath = g_strdup_printf ("%s/Executive-Summary", path);
-	storage = bonobo_storage_open (STORAGE_TYPE, fullpath,
-				       Bonobo_Storage_READ |
-				       Bonobo_Storage_WRITE, 
-				       0664);
-	if (storage != NULL) {
-		CORBA_exception_init (&ev);
-		
-		corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));
-		list = Bonobo_Storage_listContents (corba_storage, "/", 0, &ev);
-		if (list) {
-			for (i = 0; i < list->_length; i++)
-				load_component (esummary, storage, i);
-			
-			CORBA_free (list);
-		}
-
-		bonobo_object_unref (BONOBO_OBJECT (storage));
-		CORBA_exception_free (&ev);
-	}
-
-	g_free (fullpath);
-
-	/* Load the preferences */
-	if (esummary->prefs != NULL)
-		e_summary_prefs_free (esummary->prefs);
-
-	esummary->prefs = e_summary_prefs_load (path);
-	e_summary_reconfigure (esummary);
-}
-
-static void
-save_component (BonoboStorage *storage,
-		ESummaryWindow *window,
-		int index)
-{
-	char *curdir = g_strdup_printf ("%08d", index);
-	Bonobo_Storage corba_storage;
-	Bonobo_Storage corba_subdir;
-	CORBA_Environment ev;
-
-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));
-	CORBA_exception_init (&ev);
-
-	corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir,
-						   Bonobo_Storage_CREATE|
-						   Bonobo_Storage_WRITE|
-						   Bonobo_Storage_READ, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Cannot create '%s'", curdir);
-		g_free (curdir);
-	} else {
-		Bonobo_Stream corba_stream;
-
-		g_free (curdir);
-		corba_stream = Bonobo_Storage_openStream
-			(corba_subdir, IID_FILE, 
-			 Bonobo_Storage_CREATE|
-			 Bonobo_Storage_READ|
-			 Bonobo_Storage_WRITE, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EEK: %s", CORBA_exception_id (&ev));
-			if (corba_subdir != CORBA_OBJECT_NIL)
-				bonobo_object_release_unref (corba_subdir, &ev);
-			CORBA_exception_free (&ev);
-			return;
-		}
-
-		bonobo_stream_client_write_string (corba_stream,
-						   window->iid, TRUE, &ev);
-		bonobo_object_release_unref (corba_stream, &ev);
-
-		corba_stream = Bonobo_Storage_openStream (corba_subdir, DATA_FILE,
-							  Bonobo_Storage_CREATE,
-							  &ev);
-		if (window->persiststream != CORBA_OBJECT_NIL) {
-			Bonobo_PersistStream_save (window->persiststream,
-						   corba_stream, "", &ev);
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("Unable to save %s", window->iid);
-			}
-		}
-
-		bonobo_object_release_unref (corba_stream, &ev);
-	}
-
-	if (corba_subdir != CORBA_OBJECT_NIL)
-		bonobo_object_release_unref (corba_subdir, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-e_summary_save_state (ESummary *esummary,
-		      const char *path)
-{
-	ESummaryPrivate *priv;
-	BonoboStorage *storage;
-	Bonobo_Storage corba_storage;
-	CORBA_Environment ev;
-	GList *windows;
-	char *fullpath;
-	int i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	fullpath = g_strdup_printf("%s/Executive-Summary", path);
-	g_print ("fullpath: %s\n", fullpath);
-
-	e_summary_rm_dir (fullpath);
-
-	storage = bonobo_storage_open (STORAGE_TYPE, fullpath,
-				       Bonobo_Storage_READ |
-				       Bonobo_Storage_WRITE |
-				       Bonobo_Storage_CREATE, 0660);
-	g_return_if_fail (storage);
-
-	CORBA_exception_init (&ev);
-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));
-	
-	i = 0;
-	for (windows = priv->window_list; windows; windows = windows->next) {
-		save_component (storage, windows->data, i);
-		g_print ("IID: %s\n", ((ESummaryWindow *)windows->data)->iid);
-		i++;
-	}
-
-	Bonobo_Storage_commit (corba_storage, &ev);
-	CORBA_exception_free (&ev);
-	bonobo_object_unref (BONOBO_OBJECT (storage));
-
-	e_summary_prefs_save (esummary->prefs, path);
-	g_free (fullpath);
-}
-
-void
-e_summary_window_move_left (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *grandparent;
-	int position;
-
-	priv = esummary->private;
-
-	/* Need to cache this location */
-	win_item = g_list_find (priv->window_list, window);
-	
-	/* Find the item 2 previous. */
-	if (win_item->prev == NULL)
-		return; /* Item was first, can't be moved left */
-
-	grandparent = win_item->prev->prev;
-
-	/* Remove it from the list */
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	/* Insert it after the grandparent */
-	position = g_list_position (priv->window_list, grandparent);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_right (ESummary *esummary,
-			     ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *child;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	if (win_item->next == NULL)
-		return;
-
-	child = win_item->next;
-	
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-	
-	position = g_list_position (priv->window_list, child);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_up (ESummary *esummary,
-			  ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-	
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position - 3);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_down (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 3);
-}
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
deleted file mode 100644
index 36a9be6ed3..0000000000
--- a/executive-summary/component/e-summary.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_H__
-#define _E_SUMMARY_H__
-
-#include <gtk/gtkvbox.h>
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-listener.h>
-#include <bonobo/bonobo-event-source.h>
-#include <Evolution.h>
-#include <evolution-services/Executive-Summary.h>
-
-#include "e-summary-prefs.h"
-
-#define E_SUMMARY_TYPE (e_summary_get_type ())
-#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary))
-#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass))
-#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE))
-#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE))
-
-typedef struct _ESummaryPrivate ESummaryPrivate;
-typedef struct _ESummary ESummary;
-typedef struct _ESummaryClass ESummaryClass;
-typedef struct _ESummaryWindow ESummaryWindow;
-
-struct _ESummaryWindow {
-	GNOME_Evolution_Summary_Component component;
-
-	Bonobo_Control control;
-	GNOME_Evolution_Summary_HTMLView html;
-
-	Bonobo_PersistStream persiststream;
-	Bonobo_PropertyBag propertybag;
-	Bonobo_PropertyControl propertycontrol;
-	Bonobo_EventSource event_source;
-	
-	/* Listener for the event_source */
-	BonoboListener *listener;
-	int listener_id;
-
-	char *iid;
-	char *title;
-	char *icon;
-	
-	ESummary *esummary;
-};
-
-struct _ESummary {
-	GtkVBox parent;
-
-	ESummaryPrefs *prefs;
-	ESummaryPrefs *tmp_prefs;
-	ESummaryPrivate *private;
-};
-
-struct _ESummaryClass {
-	GtkVBoxClass parent_class;
-};
-
-GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell);
-void e_summary_queue_rebuild (ESummary *esummary);
-
-void e_summary_window_free (ESummaryWindow *window);
-void e_summary_remove_window (ESummary *esummary,
-			      ESummaryWindow *window);
-ESummaryWindow *e_summary_add_service (ESummary *esummary,
-				       GNOME_Evolution_Summary_Component component,
-				       const char *iid);
-ESummaryWindow * e_summary_embed_service_from_id (ESummary *esummary,
-						  const char *obj_id);
-
-void e_summary_set_shell_view_interface (ESummary *summary,
-					 GNOME_Evolution_ShellView svi);
-void e_summary_set_message (ESummary *esummary,
-			    const char *message,
-			    gboolean busy);
-void e_summary_unset_message (ESummary *esummary);
-void e_summary_change_current_view (ESummary *esummary,
-				    const char *uri);
-void e_summary_set_title (ESummary *esummary,
-			  const char *title);
-
-void e_summary_window_move_left (ESummary *esummary,
-				 ESummaryWindow *window);
-void e_summary_window_move_right (ESummary *esummary,
-				  ESummaryWindow *window);
-void e_summary_window_move_up (ESummary *esummary,
-			       ESummaryWindow *window);
-void e_summary_window_move_down (ESummary *esummary,
-				 ESummaryWindow *window);
-void e_summary_reconfigure (ESummary *esummary);
-
-#endif
diff --git a/executive-summary/component/executive-summary-config.glade b/executive-summary/component/executive-summary-config.glade
deleted file mode 100644
index 17fd9b0e69..0000000000
--- a/executive-summary/component/executive-summary-config.glade
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Project1</name>
-  <program_name>project1</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <translatable_strings_file></translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>summaryprefs</name>
-  <cxx_use_heap>True</cxx_use_heap>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomePropertyBox:notebook</child_name>
-    <name>notebook1</name>
-    <border_width>2</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox</name>
-      <border_width>2</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<border_width>2</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Appearance</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <homogeneous>False</homogeneous>
-	  <spacing>5</spacing>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <border_width>2</border_width>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <homogeneous>False</homogeneous>
-	    <spacing>5</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label2</name>
-	      <cxx_use_heap>True</cxx_use_heap>
-	      <label>Background:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeFileEntry</class>
-	      <name>htmlpage</name>
-	      <cxx_use_heap>True</cxx_use_heap>
-	      <max_saved>10</max_saved>
-	      <directory>False</directory>
-	      <modal>False</modal>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<child_name>GnomeEntry:entry</child_name>
-		<name>combo-entry1</name>
-		<cxx_use_heap>True</cxx_use_heap>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>0</text_max_length>
-		<text></text>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox2</name>
-	    <border_width>2</border_width>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <homogeneous>False</homogeneous>
-	    <spacing>5</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label3</name>
-	      <cxx_use_heap>True</cxx_use_heap>
-	      <label>Number of columns:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>columnspinner</name>
-	      <cxx_use_heap>True</cxx_use_heap>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>True</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>1</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>Label</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <label>General</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/executive-summary/component/executive-summary.png b/executive-summary/component/executive-summary.png
deleted file mode 100644
index 10a122f39e..0000000000
--- a/executive-summary/component/executive-summary.png
+++ /dev/null
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
deleted file mode 100644
index 0834802da1..0000000000
--- a/executive-summary/component/main.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- * main.c: The core of the executive summary component.
- *
- * Copyright (C) 2000 Helix Code, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
-#include <glade/glade.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include "gal/widgets/e-gui-utils.h"
-#include "gal/widgets/e-cursors.h"
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "component-factory.h"
-
-int
-main (int argc,
-      char **argv)
-{
-  CORBA_ORB orb;
-  
-  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-  textdomain (PACKAGE);
-
-  gnome_init_with_popt_table ("evolution-executive-summary", VERSION,
-			      argc, argv, oaf_popt_options, 0, NULL);
-  orb = oaf_init (argc, argv);
-
-  gdk_rgb_init ();
-  glade_gnome_init ();
-  if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-    g_error (_("Executive summary component could not initialize Bonobo.\n"
-	       "If there was a warning message about the "
-	       "RootPOA, it probably means\nyou compiled "
-	       "Bonobo against GOAD instead of OAF."));
-  }
-
-#ifdef GTKHTML_HAVE_GCONF
-  gconf_init (argc, argv, NULL);
-#endif
-
-  e_cursors_init ();
-
-  component_factory_init ();
-
-  gnome_vfs_init ();
-  bonobo_main ();
-
-  return 0;
-}
diff --git a/executive-summary/default-header.html b/executive-summary/default-header.html
deleted file mode 100644
index 64fc119ea6..0000000000
--- a/executive-summary/default-header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>Evolution - Executive Summary</title>
-</head>
-
-<body bgcolor="#ffffff">
-<table>
-<tr valign="center">
-<td align="right"><img src="executive-summary.png"></td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/executive-summary/evolution-services/.cvsignore b/executive-summary/evolution-services/.cvsignore
deleted file mode 100644
index d9807cd94f..0000000000
--- a/executive-summary/evolution-services/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Executive-Summary.h
-Executive-Summary-common.c
-Executive-Summary-skels.c
-Executive-Summary-stubs.c
-Makefile.in
-Makefile
-core
-.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
deleted file mode 100644
index 40e2972321..0000000000
--- a/executive-summary/evolution-services/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-lib_LTLIBRARIES = libevolution-services.la
-
-INCLUDES = \
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/executive-summary		\
-	-I$(top_builddir)/executive-summary		\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-services\"
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
-Executive-Summary-impl.o: Executive-Summary.h
-
-IDLS = \
-	$(srcdir)/../idl/Executive-Summary.idl		\
-	$(srcdir)/../idl/Summary.idl			\
-	$(srcdir)/../idl/SummaryComponent.idl		\
-	$(srcdir)/../idl/HtmlView.idl
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		$(srcdir)/../idl/Executive-Summary.idl
-
-libevolution_services_la_SOURCES =		\
-	$(IDL_GENERATED)		\
-	executive-summary-component.c	\
-	executive-summary-component.h	\
-	executive-summary-component-factory-client.c	\
-	executive-summary-component-factory-client.h	\
-	executive-summary-html-view.c	\
-	executive-summary-html-view.h
-
-libevolution_services_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
deleted file mode 100644
index 145e385c1a..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary-client.h"
-#include "executive-summary-component.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryClient *client;
-	ExecutiveSummaryClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_client_init (ExecutiveSummaryClient *client)
-{
-	ExecutiveSummaryClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_client_class_init (ExecutiveSummaryClientClass *client)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (client);
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = executive_summary_client_destroy;
-}
-
-void
-executive_summary_client_construct (ExecutiveSummaryClient *client,
-				    CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-E_MAKE_TYPE (executive_summary_client, "ExecutiveSummaryClient",
-	     ExecutiveSummaryClient, executive_summary_client_class_init,
-	     executive_summary_client_init, PARENT_TYPE);
-
-void
-executive_summary_client_set_title (ExecutiveSummaryClient *client,
-				    int id,
-				    const char *title)
-{
-	GNOME_Evolution_Summary_ViewFrame summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	GNOME_Evolution_Summary_ViewFrame_setTitle (summary, id, title, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-				   int id,
-				   const char *icon)
-{
-	GNOME_Evolution_Summary_ViewFrame summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	GNOME_Evolution_Summary_ViewFrame_setIcon (summary, id, icon, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_flash (ExecutiveSummaryClient *client,
-				int id)
-{
-	GNOME_Evolution_Summary_ViewFrame summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	GNOME_Evolution_Summary_ViewFrame_flash (summary, id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error flashing");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_update (ExecutiveSummaryClient *client,
-				 int id,
-				 const char *html)
-{
-	GNOME_Evolution_Summary_ViewFrame summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	GNOME_Evolution_Summary_ViewFrame_updateComponent (summary, id, html, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error updating the component");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-		
diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h
deleted file mode 100644
index c6c138dd69..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))
-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))
-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryClientPrivate ExecutiveSummaryClientPrivate;
-typedef struct _ExecutiveSummaryClient ExecutiveSummaryClient;
-typedef struct _ExecutiveSummaryClientClass ExecutiveSummaryClientClass;
-
-struct _ExecutiveSummaryClient {
-	BonoboObjectClient parent;
-	
-	ExecutiveSummaryClientPrivate *private;
-};
-
-struct _ExecutiveSummaryClientClass {
-	BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_client_get_type (void);
-void executive_summary_client_construct (ExecutiveSummaryClient *client,
-					 CORBA_Object object);
-void executive_summary_client_set_title (ExecutiveSummaryClient *client,
-					 int id,
-					 const char *title);
-void executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-					int id,
-					const char *icon);
-void executive_summary_client_flash (ExecutiveSummaryClient *client,
-				     int id);
-void executive_summary_client_update (ExecutiveSummaryClient *client,
-				      int id,
-				      const char *html);
-
-#endif
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
deleted file mode 100644
index 33225e7d98..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <Executive-Summary.h>
-#include "executive-summary-component-client.h"
-#include "executive-summary.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryComponentClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_component_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentClient *client;
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_COMPONENT_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_client_init (ExecutiveSummaryComponentClient *client)
-{
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_component_client_class_init (ExecutiveSummaryComponentClientClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_client_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-void
-executive_summary_component_client_construct (ExecutiveSummaryComponentClient *client,
-					      CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-ExecutiveSummaryComponentClient*
-executive_summary_component_client_new (const char *id)
-{
-	ExecutiveSummaryComponentClient *client;
-	CORBA_Environment ev;
-	CORBA_Object corba_object;
-	
-	g_return_val_if_fail (id != NULL, NULL);
-	
-	CORBA_exception_init (&ev);
-	
-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start %s\n", id);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (corba_object == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate %s\n", id);
-		return NULL;
-	}
-	
-	client = gtk_type_new (executive_summary_component_client_get_type ());
-	executive_summary_component_client_construct (client, corba_object);
-	
-	return client;
-}
-
-/* External API */
-void
-executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-					      ExecutiveSummary *summary)
-{
-	GNOME_Evolution_Summary_Component component;
-	GNOME_Evolution_Summary_ViewFrame corba_object;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));
-
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	GNOME_Evolution_Summary_Component_setOwner (component, corba_object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-void
-executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)
-{
-	GNOME_Evolution_Summary_Component component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	
-	GNOME_Evolution_Summary_Component_unsetOwner (component, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error unsetting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-E_MAKE_TYPE (executive_summary_component_client, 
-	     "ExecutiveSummaryComponentClient", 
-	     ExecutiveSummaryComponentClient,
-	     executive_summary_component_client_class_init,
-	     executive_summary_component_client_init, PARENT_TYPE)
diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h
deleted file mode 100644
index b98aa9e7e5..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentClientPrivate ExecutiveSummaryComponentClientPrivate;
-typedef struct _ExecutiveSummaryComponentClient ExecutiveSummaryComponentClient;
-typedef struct _ExecutiveSummaryComponentClientClass ExecutiveSummaryComponentClientClass;
-
-struct _ExecutiveSummaryComponentClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentClientPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClientClass {
-  BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_component_client_get_type (void);
-ExecutiveSummaryComponentClient *executive_summary_component_client_new (const char *id);
-
-void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-						   ExecutiveSummary *summary);
-void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client);
-
-void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,
-						  gboolean *bonobo,
-						  gboolean *html);
-
-void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client,
-						   ExecutiveSummaryComponentView *view);
-void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,
-						      ExecutiveSummaryComponentView *view);
-
-#endif
-
diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.c b/executive-summary/evolution-services/executive-summary-component-factory-client.c
deleted file mode 100644
index 19114bfa6f..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-factory-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <Executive-Summary.h>
-#include "executive-summary-component-factory-client.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryComponentFactoryClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_component_factory_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentFactoryClient *client;
-	ExecutiveSummaryComponentFactoryClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_factory_client_init (ExecutiveSummaryComponentFactoryClient *client)
-{
-	ExecutiveSummaryComponentFactoryClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentFactoryClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_component_factory_client_class_init (ExecutiveSummaryComponentFactoryClientClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_factory_client_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE (executive_summary_component_factory_client, 
-	     "ExecutiveSummaryComponentFactoryClient", 
-	     ExecutiveSummaryComponentFactoryClient,
-	     executive_summary_component_factory_client_class_init,
-	     executive_summary_component_factory_client_init, PARENT_TYPE)
-
-
-/*** Public API ***/
-/**
- * executive_summary_component_factory_client_construct:
- * @client: The ExecutiveSummaryComponentFactoryClient to construct.
- * @corba_object: The CORBA_Object to construct it from.
- *
- * Constructs a client from the given CORBA_Object.
- */
-void
-executive_summary_component_factory_client_construct (ExecutiveSummaryComponentFactoryClient *client,
-						      CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-/**
- * executive_summary_component_factory_client_new:
- * @id: The OAFIID of the component to activate.
- *
- * Activates the component specified by @id, and creates a server side client
- * for that object.
- *
- * Returns: A pointer to an ExecutiveSummaryComponentFactoryClient object.
- */
-ExecutiveSummaryComponentFactoryClient *
-executive_summary_component_factory_client_new (const char *id)
-{
-	ExecutiveSummaryComponentFactoryClient *client;
-	CORBA_Environment ev;
-	CORBA_Object corba_object;
-	
-	g_return_val_if_fail (id != NULL, NULL);
-	
-	CORBA_exception_init (&ev);
-	
-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start %s\n", id);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (corba_object == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate %s\n", id);
-		return NULL;
-	}
-	
-	client = gtk_type_new (executive_summary_component_factory_client_get_type ());
-	executive_summary_component_factory_client_construct (client, 
-							      corba_object);
-	
-	return client;
-}
-
-/**
- * executive_summary_component_factory_client_create_view:
- * @client: The client on which to create the view.
- *
- * Creates a new view of a remote component.
- * 
- * Returns: A GNOME_Evolution_Summary_Component.
- */
-GNOME_Evolution_Summary_Component
-executive_summary_component_factory_client_create_view (ExecutiveSummaryComponentFactoryClient *client)
-{
-	GNOME_Evolution_Summary_ComponentFactory factory;
-	GNOME_Evolution_Summary_Component component;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (client),
-			      CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	factory = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	
-	component = GNOME_Evolution_Summary_ComponentFactory_createView (factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error creating view: %s", CORBA_exception_id (&ev));
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return component;
-}
diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.h b/executive-summary/evolution-services/executive-summary-component-factory-client.h
deleted file mode 100644
index 8ab4a05672..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-factory-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__
-
-#include <bonobo.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClientClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentFactoryClientPrivate ExecutiveSummaryComponentFactoryClientPrivate;
-typedef struct _ExecutiveSummaryComponentFactoryClient ExecutiveSummaryComponentFactoryClient;
-typedef struct _ExecutiveSummaryComponentFactoryClientClass ExecutiveSummaryComponentFactoryClientClass;
-
-struct _ExecutiveSummaryComponentFactoryClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentFactoryClientPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentFactoryClientClass {
-  BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_component_factory_client_get_type (void);
-
-void executive_summary_component_factory_client_construct (ExecutiveSummaryComponentFactoryClient *client,
-							   CORBA_Object corba_object);
-ExecutiveSummaryComponentFactoryClient *executive_summary_component_factory_client_new (const char *id);
-CORBA_Object executive_summary_component_factory_client_create_view (ExecutiveSummaryComponentFactoryClient *client);
-
-#endif
-
diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c
deleted file mode 100644
index 6ba24e143c..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-struct _ExecutiveSummaryComponentViewPrivate {
-	ExecutiveSummaryComponent *component;
-
-	BonoboControl *control;
-	Bonobo_Control objref;
-
-	char *html;
-	
-	char *title;
-	char *icon;
-	
-	int id;
-};
-
-static GtkObjectClass *parent_class = NULL;
-#define PARENT_TYPE (gtk_object_get_type ())
-
-enum {
-	CONFIGURE,
-	LAST_SIGNAL
-};
-
-static gint32 view_signals[LAST_SIGNAL] = { 0 };
-
-static void
-executive_summary_component_view_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentView *view;
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	view = EXECUTIVE_SUMMARY_COMPONENT_VIEW (object);
-	priv = view->private;
-	if (priv == NULL)
-		return;
-
-	if (priv->component)
-		bonobo_object_unref (BONOBO_OBJECT (priv->component));
-
-	if (priv->control)
-		bonobo_object_unref (BONOBO_OBJECT (priv->control));
-
-	g_free (priv->html);
-	g_free (priv->title);
-	g_free (priv->icon);
-
-	g_free (priv);
-	view->private = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_view_class_init (ExecutiveSummaryComponentViewClass *view_class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (view_class);
-
-	object_class->destroy = executive_summary_component_view_destroy;
-	
-	view_signals[CONFIGURE] = gtk_signal_new ("configure",
-						  GTK_RUN_FIRST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryComponentViewClass, configure),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, view_signals, LAST_SIGNAL);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-executive_summary_component_view_init (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryComponentViewPrivate, 1);
-	view->private = priv;
-
-	priv->control = NULL;
-	priv->objref = NULL;
-	priv->html = NULL;
-	priv->title = NULL;
-	priv->icon = NULL;
-	priv->id = -1;
-}
-
-E_MAKE_TYPE (executive_summary_component_view, "ExecutiveSummaryComponentView",
-	     ExecutiveSummaryComponentView, 
-	     executive_summary_component_view_class_init,
-	     executive_summary_component_view_init, PARENT_TYPE);
-
-void
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	g_return_if_fail (control != NULL || html != NULL);
-	
-	priv = view->private;
-
-	if (component != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (component));
-		priv->component = component;
-	} else {
-		priv->component = NULL;
-	}
-
-	if (control != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (control));
-		priv->control = control;
-	} else {
-		priv->control = NULL;
-	}
-
-	if (html) {
-		priv->html = g_strdup (html);
-	} else {
-		priv->html = NULL;
-	}
-
-	if (title) {
-		priv->title = g_strdup (title);
-	} else {
-		priv->title = NULL;
-	}
-
-	if (icon) {
-		priv->icon = g_strdup (icon);
-	} else {
-		priv->icon = NULL;
-	}
-}
-
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon)
-{
-	ExecutiveSummaryComponentView *view;
-
-	g_return_val_if_fail (control != NULL || html != NULL, NULL);
-	
-	view = gtk_type_new (executive_summary_component_view_get_type ());
-	executive_summary_component_view_construct (view, component, control,
-						    html, title, icon);
-
-	return view;
-}
-
-void
-executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-					    const char *title)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->title)
-		g_free (priv->title);
-	priv->title = g_strdup (title);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	executive_summary_component_set_title (component, view);
-}
-
-const char *
-executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return priv->title;
-}
-
-void
-executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-					   const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->icon)
-		g_free (priv->icon);
-	priv->icon = g_strdup (icon);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-	
-	executive_summary_component_set_icon (component, view);
-}
-
-const char *
-executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->icon;
-}
-
-void
-executive_summary_component_view_flash (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	
-	priv = view->private;
-	component = priv->component;
-	if (component == NULL) {
-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);
-		return;
-	}
-
-	executive_summary_component_flash (component, view);
-}
-
-void
-executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-					   const char *html)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->html)
-		g_free (priv->html);
-
-	priv->html = g_strdup (html);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	executive_summary_component_update (component, view);
-}
-
-void
-executive_summary_component_view_configure (ExecutiveSummaryComponentView *view)
-{
-	gtk_signal_emit (GTK_OBJECT (view), view_signals[CONFIGURE]);
-}
-
-const char *
-executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->html;
-}
-
-BonoboObject *
-executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return (BonoboObject *)priv->control;
-}
-
-void
-executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,
-					 int id)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-
-	priv->id = id;
-}
-
-int
-executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, -1);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), -1);
-
-	priv = view->private;
-	
-	return priv->id;
-}
-
-void
-executive_summary_component_view_set_objref (ExecutiveSummaryComponentView *view,
-					     Bonobo_Control objref)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-
-	if (priv->objref) {
-		g_warning ("View already has an objref.");
-		return;
-	}
-
-	priv->objref = objref;
-}
-
-GtkWidget *
-executive_summary_component_view_get_widget (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	if (priv->objref == NULL) {
-		g_warning ("View has no objref.");
-		return NULL;
-	}
-
-	return bonobo_widget_new_control_from_objref (priv->objref, NULL);
-}
diff --git a/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h
deleted file mode 100644
index c18f77dcf4..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-#define __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-
-#include <bonobo/bonobo-control.h>
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))
-
-typedef struct _ExecutiveSummaryComponentViewPrivate ExecutiveSummaryComponentViewPrivate;
-typedef struct _ExecutiveSummaryComponentView ExecutiveSummaryComponentView;
-typedef struct _ExecutiveSummaryComponentViewClass ExecutiveSummaryComponentViewClass;
-
-struct _ExecutiveSummaryComponentView {
-	GtkObject object;
-	
-	ExecutiveSummaryComponentViewPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentViewClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void (* configure) (ExecutiveSummaryComponentView *view);
-};
-
-GtkType executive_summary_component_view_get_type (void);
-void 
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon);
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon);
-
-void executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-						 const char *title);
-const char *executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-						const char *icon);
-const char *executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_flash (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-						const char *html);
-const char *executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view);
-BonoboObject *executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view);
-
-int executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view);
-void executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,
-					      int id);
-void executive_summary_component_view_configure (ExecutiveSummaryComponentView *view);
-void executive_summary_component_view_set_objref (ExecutiveSummaryComponentView *view,
-						  Bonobo_Control objref);
-GtkWidget *executive_summary_component_view_get_widget (ExecutiveSummaryComponentView *view);
-
-#endif
-
-
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
deleted file mode 100644
index b3b1e63215..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary-component.h"
-
-static void executive_summary_component_destroy (GtkObject *object);
-static void executive_summary_component_init (ExecutiveSummaryComponent *component);
-static void executive_summary_component_class_init (ExecutiveSummaryComponentClass *esc_class);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-#define FACTORY_PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *parent_class;
-static BonoboObjectClass *factory_parent_class;
-
-struct _ExecutiveSummaryComponentPrivate {
-	int dummy;
-};
-
-struct _ExecutiveSummaryComponentFactoryPrivate {
-	EvolutionServicesCreateViewFn create_view;
-	void *closure;
-};
-
-/* CORBA interface */
-static POA_GNOME_Evolution_Summary_Component__vepv SummaryComponent_vepv;
-static POA_GNOME_Evolution_Summary_ComponentFactory__vepv ComponentFactory_vepv;
-
-static POA_GNOME_Evolution_Summary_Component *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Summary_Component *servant;
-	CORBA_Environment ev;
-	
-	servant = (POA_GNOME_Evolution_Summary_Component *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SummaryComponent_vepv;
-	
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Summary_Component__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return servant;
-}
-
-static void
-executive_summary_component_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	component = EXECUTIVE_SUMMARY_COMPONENT (object);
-	priv = component->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	component->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Init */
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Summary_Component__vepv *vepv;
-	POA_GNOME_Evolution_Summary_Component__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-	
-	epv = g_new0 (POA_GNOME_Evolution_Summary_Component__epv, 1);
-		
-	vepv = &SummaryComponent_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Summary_Component_epv = epv;
-}
-
-static void
-executive_summary_component_class_init (ExecutiveSummaryComponentClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	corba_class_init ();
-}
-
-static void
-executive_summary_component_init (ExecutiveSummaryComponent *component)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	priv = g_new (ExecutiveSummaryComponentPrivate, 1);
-	
-	component->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary_component, "ExecutiveSummaryComponent", 
-	     ExecutiveSummaryComponent, executive_summary_component_class_init,
-	     executive_summary_component_init, PARENT_TYPE);
-
-
-static void
-executive_summary_component_construct (ExecutiveSummaryComponent *component,
-				       GNOME_Evolution_Summary_Component corba_object)
-{
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_construct (BONOBO_OBJECT (component), corba_object);
-}
-
-
-/*** Public API ***/
-/**
- * executive_summary_component_new:
- *
- * Creates a BonoboObject that implements the Summary::Component interface.
- *
- * Returns: A pointer to a BonoboObject.
- */
-BonoboObject *
-executive_summary_component_new (void)
-{
-	ExecutiveSummaryComponent *component;
-	POA_GNOME_Evolution_Summary_Component *servant;
-	GNOME_Evolution_Summary_Component corba_object;
-	
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	component = gtk_type_new (executive_summary_component_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (component),
-						       servant);
-	
-	executive_summary_component_construct (component, corba_object);
-	
-	return BONOBO_OBJECT (component);
-}
-
-
-/**** ComponentFactory implementation ****/
-
-static POA_GNOME_Evolution_Summary_ComponentFactory *
-create_factory_servant (void)
-{
-	POA_GNOME_Evolution_Summary_ComponentFactory *servant;
-	CORBA_Environment ev;
-	
-	servant = (POA_GNOME_Evolution_Summary_ComponentFactory *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &ComponentFactory_vepv;
-	
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Summary_ComponentFactory__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return servant;
-}
-
-static GNOME_Evolution_Summary_Component
-impl_GNOME_Evolution_Summary_ComponentFactory_createView (PortableServer_Servant servant,
-							  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	BonoboObject *view;
-	ExecutiveSummaryComponentFactory *factory;
-	ExecutiveSummaryComponentFactoryPrivate *priv;
-	GNOME_Evolution_Summary_Component component, component_dup;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	factory = EXECUTIVE_SUMMARY_COMPONENT_FACTORY (bonobo_object);
-	priv = factory->private;
-
-	view = (* priv->create_view) (factory, priv->closure);
-	g_return_val_if_fail (view != NULL, CORBA_OBJECT_NIL);
-
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (view));
-
-	component_dup = CORBA_Object_duplicate (component, ev);
-
-	return component_dup;
-}
-
-static void
-corba_factory_init (void)
-{
-	POA_GNOME_Evolution_Summary_ComponentFactory__vepv *vepv;
-	POA_GNOME_Evolution_Summary_ComponentFactory__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-	
-	epv = g_new0 (POA_GNOME_Evolution_Summary_ComponentFactory__epv, 1);
-	epv->createView = impl_GNOME_Evolution_Summary_ComponentFactory_createView;
-
-	vepv = &ComponentFactory_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Summary_ComponentFactory_epv = epv;
-}
-
-/* GtkObject methods */
-static void
-executive_summary_component_factory_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentFactory *factory;
-	ExecutiveSummaryComponentFactoryPrivate *priv;
-
-	factory = EXECUTIVE_SUMMARY_COMPONENT_FACTORY (object);
-	priv = factory->private;
-
-	if (priv == NULL)
-		return;
-
-	g_free (priv);
-	factory->private = NULL;
-
-	(* GTK_OBJECT_CLASS (factory_parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_factory_class_init (ExecutiveSummaryComponentFactoryClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_factory_destroy;
-
-	factory_parent_class = gtk_type_class (FACTORY_PARENT_TYPE);
-	corba_factory_init ();
-}
-
-static void
-executive_summary_component_factory_init (ExecutiveSummaryComponentFactory *factory)
-{
-	ExecutiveSummaryComponentFactoryPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryComponentFactoryPrivate, 1);
-
-	priv->create_view = NULL;
-	priv->closure = NULL;
-	factory->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary_component_factory, 
-	     "ExecutiveSummaryComponentFactory",
-	     ExecutiveSummaryComponentFactory,
-	     executive_summary_component_factory_class_init,
-	     executive_summary_component_factory_init, FACTORY_PARENT_TYPE);
-
-static void
-executive_summary_component_factory_construct (ExecutiveSummaryComponentFactory *factory,
-					       GNOME_Evolution_Summary_ComponentFactory corba_object,
-					       EvolutionServicesCreateViewFn create_view,
-					       void *closure)
-{
-	ExecutiveSummaryComponentFactoryPrivate *priv;
-
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_object);
-	priv = factory->private;
-
-	priv->create_view = create_view;
-	priv->closure = closure;
-}
-
-
-/*** Public API ***/
-/**
- * executive_summary_component_factory_new:
- * @create_view: A pointer to the function to create a new view.
- * @closure: The data to be passed to the @create_view function when it is 
- * called.
- *
- * Creates a BonoboObject that implements the Summary::ComponentFactory
- * interface.
- *
- * Returns: A pointer to a BonoboObject.
- */
-BonoboObject *
-executive_summary_component_factory_new (EvolutionServicesCreateViewFn create_view,
-					 void *closure)
-{
-	ExecutiveSummaryComponentFactory *factory;
-	POA_GNOME_Evolution_Summary_ComponentFactory *servant;
-	GNOME_Evolution_Summary_ComponentFactory corba_object;
-
-	servant = create_factory_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	factory = gtk_type_new (executive_summary_component_factory_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (factory),
-						       servant);
-	executive_summary_component_factory_construct (factory, corba_object,
-						       create_view, closure);
-	return BONOBO_OBJECT (factory);
-}
-	
diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h
deleted file mode 100644
index 9e09fea4a4..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentPrivate ExecutiveSummaryComponentPrivate;
-typedef struct _ExecutiveSummaryComponent ExecutiveSummaryComponent;
-typedef struct _ExecutiveSummaryComponentClass ExecutiveSummaryComponentClass;
-
-struct _ExecutiveSummaryComponent {
-  BonoboObject parent;
-
-  ExecutiveSummaryComponentPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClass {
-  BonoboObjectClass parent_class;
-};
-
-GtkType executive_summary_component_get_type (void);
-
-BonoboObject *executive_summary_component_new (void);
-
-
-/* Factory */
-
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE (executive_summary_component_factory_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactory))
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactoryClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-
-typedef struct _ExecutiveSummaryComponentFactoryPrivate ExecutiveSummaryComponentFactoryPrivate;
-typedef struct _ExecutiveSummaryComponentFactory ExecutiveSummaryComponentFactory;
-typedef struct _ExecutiveSummaryComponentFactoryClass ExecutiveSummaryComponentFactoryClass;
-
-typedef BonoboObject *(* EvolutionServicesCreateViewFn) (ExecutiveSummaryComponentFactory *factory,
-							 void *closure);
-
-struct _ExecutiveSummaryComponentFactory {
-	BonoboObject parent;
-
-	ExecutiveSummaryComponentFactoryPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentFactoryClass {
-	BonoboObjectClass parent_class;
-};
-
-GtkType executive_summary_component_factory_get_type (void);
-
-BonoboObject *executive_summary_component_factory_new (EvolutionServicesCreateViewFn create_view,
-						       void *closure);
-#endif
diff --git a/executive-summary/evolution-services/executive-summary-html-view.c b/executive-summary/evolution-services/executive-summary-html-view.c
deleted file mode 100644
index 45f2e86c16..0000000000
--- a/executive-summary/evolution-services/executive-summary-html-view.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-html-view.c - Bonobo implementation of 
- *                                 HtmlView.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <bonobo/bonobo-event-source.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary-html-view.h"
-
-static void executive_summary_html_view_destroy (GtkObject *object);
-static void executive_summary_html_view_init (ExecutiveSummaryHtmlView *component);
-static void executive_summary_html_view_class_init (ExecutiveSummaryHtmlViewClass *klass);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *parent_class;
-
-enum {
-	HANDLE_URI,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-struct _ExecutiveSummaryHtmlViewPrivate {
-	BonoboEventSource *event_source;
-
-	char *html;
-};
-
-/* CORBA interface */
-static POA_GNOME_Evolution_Summary_HTMLView__vepv HTMLView_vepv;
-
-static POA_GNOME_Evolution_Summary_HTMLView *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Summary_HTMLView *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Summary_HTMLView *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &HTMLView_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Summary_HTMLView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static CORBA_char *
-impl_GNOME_Evolution_Summary_HTMLView_getHtml (PortableServer_Servant servant,
-					       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryHtmlView *view;
-	ExecutiveSummaryHtmlViewPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	view = EXECUTIVE_SUMMARY_HTML_VIEW (bonobo_object);
-	priv = view->private;
-
-	return CORBA_string_dup (priv->html? priv->html: "");
-}
-
-static void
-impl_GNOME_Evolution_Summary_HTMLView_handleURI (PortableServer_Servant servant,
-						 const CORBA_char *uri,
-						 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-
-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[HANDLE_URI], uri);
-}
-
-/* GtkObject methods */
-static void
-executive_summary_html_view_destroy (GtkObject *object)
-{
-	ExecutiveSummaryHtmlView *view;
-	ExecutiveSummaryHtmlViewPrivate *priv;
-
-	g_print ("BANG!");
-	view = EXECUTIVE_SUMMARY_HTML_VIEW (object);
-	priv = view->private;
-
-	if (priv == NULL)
-		return;
-
-	g_free (priv->html);
-	g_free (priv);
-
-	view->private = NULL;
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Summary_HTMLView__vepv *vepv;
-	POA_GNOME_Evolution_Summary_HTMLView__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Summary_HTMLView__epv, 1);
-	epv->getHtml = impl_GNOME_Evolution_Summary_HTMLView_getHtml;
-	epv->handleURI = impl_GNOME_Evolution_Summary_HTMLView_handleURI;
-
-	vepv = &HTMLView_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Summary_HTMLView_epv = epv;
-}
-
-static void
-executive_summary_html_view_class_init (ExecutiveSummaryHtmlViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_html_view_destroy;
-
-	signals[HANDLE_URI] = gtk_signal_new ("handle_uri", GTK_RUN_FIRST,
-					      object_class->type,
-					      GTK_SIGNAL_OFFSET (ExecutiveSummaryHtmlViewClass, handle_uri),
-					      gtk_marshal_NONE__POINTER,
-					      GTK_TYPE_NONE, 1,
-					      GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	corba_class_init ();
-}
-
-static void
-executive_summary_html_view_init (ExecutiveSummaryHtmlView *view)
-{
-	ExecutiveSummaryHtmlViewPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryHtmlViewPrivate, 1);
-	priv->html = NULL;
-	priv->event_source = NULL;
-
-	view->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary_html_view, "ExecutiveSummaryHtmlView",
-	     ExecutiveSummaryHtmlView, executive_summary_html_view_class_init,
-	     executive_summary_html_view_init, PARENT_TYPE);
-
-static void
-executive_summary_html_view_construct (ExecutiveSummaryHtmlView *view,
-				       BonoboEventSource *event_source,
-				       GNOME_Evolution_Summary_HTMLView corba_object)
-{
-	ExecutiveSummaryHtmlViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	priv = view->private;
-	
-	priv->event_source = event_source;
-	bonobo_object_add_interface (BONOBO_OBJECT (view), 
-				     BONOBO_OBJECT (priv->event_source));
-
-	bonobo_object_construct (BONOBO_OBJECT (view), corba_object);
-}
-
-/*** Public API ***/
-/**
- * executive_summary_html_view_new_full:
- * @event_source: A BonoboEventSource that will be aggregated onto the 
- * interface.
- *
- * Creates a new BonoboObject that implements 
- * the HTMLView.idl interface.
- *
- * Returns: A BonoboObject.
- */
-BonoboObject *
-executive_summary_html_view_new_full (BonoboEventSource *event_source)
-{
-	ExecutiveSummaryHtmlView *view;
-	POA_GNOME_Evolution_Summary_HTMLView *servant;
-	GNOME_Evolution_Summary_HTMLView corba_object;
-
-	g_return_val_if_fail (event_source != NULL, NULL);
-	g_return_val_if_fail (BONOBO_IS_EVENT_SOURCE (event_source), NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	view = gtk_type_new (executive_summary_html_view_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (view),
-						       servant);
-
-	executive_summary_html_view_construct (view, event_source, corba_object);
-
-	return BONOBO_OBJECT (view);
-}
-
-/**
- * executive_summary_html_view_new:
- *
- * Creates a new BonoboObject that implements 
- * the HTMLView.idl interface.
- * Creates a default Bonobo::EventSource interface that will be aggregated onto
- * the interface.
- *
- * Returns: A BonoboObject.
- */
-BonoboObject *
-executive_summary_html_view_new (void)
-{
-	BonoboEventSource *event_source;
-
-	event_source = bonobo_event_source_new ();
-	return executive_summary_html_view_new_full (event_source);
-}
-
-/**
- * executive_summary_html_view_set_html:
- * @view: The ExecutiveSummaryHtmlView to operate on,
- * @html: The HTML as a string.
- *
- * Sets the HTML string in @view to @html. @html is copied into @view,
- * so after this call you are free to do what you want with @html.
- */
-void
-executive_summary_html_view_set_html (ExecutiveSummaryHtmlView *view,
-				      const char *html)
-{
-	ExecutiveSummaryHtmlViewPrivate *priv;
-	CORBA_any any;
-	CORBA_short s;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view));
-
-	priv = view->private;
-	if (priv->html)
-		g_free (priv->html);
-
-	if (html != NULL)
-		priv->html = g_strdup (html);
-	else
-		priv->html = NULL;
-
-	/* Notify any listeners */
-	s = 0;
-
-	any._type = (CORBA_TypeCode) TC_short;
-	any._value = &s;
-
-	bonobo_event_source_notify_listeners (BONOBO_EVENT_SOURCE (priv->event_source),
-					      EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED, 
-					      &any, NULL);
-}
-
-/**
- * executive_summary_html_view_get_html:
- * @view: The ExecutiveSummaryHtmlView to operate on.
- *
- * Retrieves the HTML stored in @view. This return value is not duplicated
- * before returning, so you should not free it. Instead, if you want to free
- * the HTML stored in @view, you should use 
- * executive_summary_html_view_set_html (view, NULL);.
- *
- * Returns: A pointer to the HTML stored in @view.
- */
-const char *
-executive_summary_html_view_get_html (ExecutiveSummaryHtmlView *view)
-{
-	ExecutiveSummaryHtmlViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view), NULL);
-
-	priv = view->private;
-	return priv->html;
-}
-	
-/**
- * executive_summary_html_view_get_event_source:
- * @view: The ExecutiveSummaryHtmlView to operate on.
- *
- * Retrieves the BonoboEventSource that is used in this view.
- *
- * Returns: A BonoboEventSource pointer.
- */
-BonoboEventSource *
-executive_summary_html_view_get_event_source (ExecutiveSummaryHtmlView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view), NULL);
-
-	return view->private->event_source;
-}
diff --git a/executive-summary/evolution-services/executive-summary-html-view.h b/executive-summary/evolution-services/executive-summary-html-view.h
deleted file mode 100644
index c09962a619..0000000000
--- a/executive-summary/evolution-services/executive-summary-html-view.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-html-view.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_HTML_VIEW_H__
-#define _EXECUTIVE_SUMMARY_HTML_VIEW_H__
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-event-source.h>
-
-#define EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED "GNOME:Evolution:Summary:HTMLView:html_changed"
-
-#define EXECUTIVE_SUMMARY_HTML_VIEW_TYPE (executive_summary_html_view_get_type ())
-#define EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlView))
-#define EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlViewClass))
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-
-typedef struct _ExecutiveSummaryHtmlViewPrivate ExecutiveSummaryHtmlViewPrivate;
-typedef struct _ExecutiveSummaryHtmlView ExecutiveSummaryHtmlView;
-typedef struct _ExecutiveSummaryHtmlViewClass ExecutiveSummaryHtmlViewClass;
-
-struct _ExecutiveSummaryHtmlView {
-	BonoboObject parent;
-	
-	ExecutiveSummaryHtmlViewPrivate *private;
-};
-
-struct _ExecutiveSummaryHtmlViewClass {
-	BonoboObjectClass parent_class;
-
-	void (* handle_uri) (ExecutiveSummaryHtmlView *view,
-			     char *uri);
-};
-
-GtkType executive_summary_html_view_get_type (void);
-BonoboObject *executive_summary_html_view_new_full (BonoboEventSource *event_source);
-BonoboObject *executive_summary_html_view_new (void);
-
-void executive_summary_html_view_set_html (ExecutiveSummaryHtmlView *view,
-					   const char *html);
-const char *executive_summary_html_view_get_html (ExecutiveSummaryHtmlView *view);
-BonoboEventSource *executive_summary_html_view_get_event_source (ExecutiveSummaryHtmlView *view);
-
-#endif
-
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
deleted file mode 100644
index 868584ad52..0000000000
--- a/executive-summary/evolution-services/executive-summary.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.c - Bonobo implementation of Summary.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary.h"
-
-static void executive_summary_destroy (GtkObject *object);
-static void executive_summary_class_init (ExecutiveSummaryClass *es_class);
-static void executive_summary_init (ExecutiveSummary *es);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-enum {
-	UPDATE,
-	SET_TITLE,
-	SET_ICON,
-	FLASH,
-	LAST_SIGNAL
-};
-
-static guint32 summary_signals [LAST_SIGNAL] = { 0 };
-static BonoboObjectClass *parent_class;
-
-struct _ExecutiveSummaryPrivate {
-	int dummy;
-};
-
-/* CORBA interface implementation */
-static POA_GNOME_Evolution_Summary_ViewFrame__vepv Summary_vepv;
-
-static POA_GNOME_Evolution_Summary_ViewFrame *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Summary_ViewFrame *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Summary_ViewFrame *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Summary_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Summary_ViewFrame__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-#if 0
-static void
-impl_GNOME_Evolution_Summary_ViewFrame_setTitle (PortableServer_Servant servant,
-				  CORBA_long id,
-				  const CORBA_char *title,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_TITLE], 
-			 id, title);
-}
-
-static void
-impl_GNOME_Evolution_Summary_ViewFrame_setIcon (PortableServer_Servant servant,
-				 CORBA_long id,
-				 const CORBA_char *title,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_ICON],
-			 id, title);
-}
-
-static void
-impl_GNOME_Evolution_Summary_ViewFrame_flash (PortableServer_Servant servant,
-					      CORBA_long id,
-					      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[FLASH], id);
-}
-
-static void
-impl_GNOME_Evolution_Summary_ViewFrame_updateComponent (PortableServer_Servant servant,
-							const CORBA_long id,
-							const CORBA_char *html,
-							CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[UPDATE],
-			 id, html);
-}
-#endif
-
-/* GtkObject methods */
-static void
-executive_summary_destroy (GtkObject *object)
-{
-	ExecutiveSummary *es;
-	ExecutiveSummaryPrivate *priv;
-	
-	es = EXECUTIVE_SUMMARY (object);
-	priv = es->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	es->private = NULL;
-}
-
-/* Initialisation */
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Summary_ViewFrame__vepv *vepv;
-	POA_GNOME_Evolution_Summary_ViewFrame__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Summary_ViewFrame__epv, 1);
-
-	vepv = &Summary_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Summary_ViewFrame_epv = epv;
-}
-
-static void
-executive_summary_class_init (ExecutiveSummaryClass *es_class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) es_class;
-	
-	object_class->destroy = executive_summary_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	summary_signals[UPDATE] = gtk_signal_new ("update",
-						  GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, update),
-						  gtk_marshal_NONE__POINTER_POINTER,
-						  GTK_TYPE_NONE, 2,
-						  GTK_TYPE_POINTER,
-						  GTK_TYPE_POINTER);
-	summary_signals[SET_TITLE] = gtk_signal_new ("set_title",
-						     GTK_RUN_LAST,
-						     object_class->type,
-						     GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_title),
-						     gtk_marshal_NONE__POINTER_POINTER,
-						     GTK_TYPE_NONE, 2,
-						     GTK_TYPE_POINTER,
-						     GTK_TYPE_POINTER);
-	summary_signals[SET_ICON] = gtk_signal_new ("set_icon",
-						    GTK_RUN_LAST,
-						    object_class->type,
-						    GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_icon),
-						    gtk_marshal_NONE__POINTER_POINTER,
-						    GTK_TYPE_NONE, 2,
-						    GTK_TYPE_POINTER,
-						    GTK_TYPE_POINTER);
-	summary_signals[FLASH] = gtk_signal_new ("flash",
-						 GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, flash),
-						 gtk_marshal_NONE__POINTER,
-						 GTK_TYPE_NONE, 1,
-						 GTK_TYPE_POINTER);
-	gtk_object_class_add_signals (object_class, summary_signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-executive_summary_init (ExecutiveSummary *es)
-{
-	ExecutiveSummaryPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryPrivate, 1);
-	es->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,
-	     executive_summary_class_init, executive_summary_init, PARENT_TYPE);
-
-void
-executive_summary_construct (ExecutiveSummary *es,
-			     GNOME_Evolution_Summary_ViewFrame corba_object)
-{
-	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);
-}
-
-BonoboObject *
-executive_summary_new (void)
-{
-	POA_GNOME_Evolution_Summary_ViewFrame *servant;
-	GNOME_Evolution_Summary_ViewFrame corba_object;
-	ExecutiveSummary *es;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	es = gtk_type_new (executive_summary_get_type ());
-	
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (es), 
-						       servant);
-	executive_summary_construct (es, corba_object);
-	
-	return BONOBO_OBJECT (es);
-}  
diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h
deleted file mode 100644
index ad5a07149d..0000000000
--- a/executive-summary/evolution-services/executive-summary.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_H__
-#define _EXECUTIVE_SUMMARY_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-#include "Executive-Summary.h"
-
-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())
-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))
-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))
-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-
-typedef struct _ExecutiveSummaryPrivate ExecutiveSummaryPrivate;
-typedef struct _ExecutiveSummary ExecutiveSummary;
-typedef struct _ExecutiveSummaryClass ExecutiveSummaryClass;
-
-struct _ExecutiveSummary {
-	BonoboObject parent;
-	
-	ExecutiveSummaryPrivate *private;
-};
-
-struct _ExecutiveSummaryClass {
-	BonoboObjectClass parent_class;
-
-	void (* update) (ExecutiveSummary *summary,
-			 const GNOME_Evolution_Summary_Component component,
-			 const char *html);
-	void (* set_title) (ExecutiveSummary *summary,
-			    const GNOME_Evolution_Summary_Component component,
-			    const char *title);
-	void (* set_icon) (ExecutiveSummary *summary,
-			   const GNOME_Evolution_Summary_Component component,
-			   const char *icon);
-	void (* flash) (ExecutiveSummary *summary,
-			const GNOME_Evolution_Summary_Component component);
-};
-
-GtkType executive_summary_get_type (void);
-void executive_summary_construct (ExecutiveSummary *es,
-				  GNOME_Evolution_Summary_ViewFrame corba_object);
-BonoboObject *executive_summary_new (void);
-#endif
-
diff --git a/executive-summary/idl/.cvsignore b/executive-summary/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/executive-summary/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl
deleted file mode 100644
index a564e90fe6..0000000000
--- a/executive-summary/idl/Executive-Summary.idl
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <Bonobo.idl>
-#include <SummaryComponent.idl>
-#include <Summary.idl>
-#include <HtmlView.idl>
diff --git a/executive-summary/idl/HtmlView.idl b/executive-summary/idl/HtmlView.idl
deleted file mode 100644
index 25ec63de9b..0000000000
--- a/executive-summary/idl/HtmlView.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for an HTML view.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Summary {
-
-	interface HTMLView : Bonobo::Unknown {
-		string getHtml ();
-
-		void handleURI (in string uri);
-	};
-};
-};
-};
-
diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am
deleted file mode 100644
index 9ff860bd3e..0000000000
--- a/executive-summary/idl/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-EXTRA_DIST = $(IDLS)
-
-CLEANFILES = $(IDL_GENERATED)
-
-IDLS = \
-	Executive-Summary.idl		\
-	HtmlView.idl                    \
-	Summary.idl			\
-	SummaryComponent.idl
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
deleted file mode 100644
index 118a0788d9..0000000000
--- a/executive-summary/idl/Summary.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution shell.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Summary {
-	interface ViewFrame: Bonobo::Unknown {
-	};
-};
-};
-};
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
deleted file mode 100644
index fefc8e518d..0000000000
--- a/executive-summary/idl/SummaryComponent.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution Executive Summary Components.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-/* TODO: Needs Exceptions */
-
-#include <Bonobo.idl>
-#include <oaf-factory.idl>
-
-module GNOME {
-module Evolution {
-module Summary {
-	interface ViewFrame;
-
-	interface Component: Bonobo::Unknown {
-	};
-
-	interface ComponentFactory: Bonobo::Unknown {
-		/**
-		 * createView:
-		 *
- 		 * Creates a new Component object.
-		 *
-		 * Returns: A Component object.
-		 **/
-		Component createView ();
-	};
-};
-};
-};
diff --git a/executive-summary/summary.html b/executive-summary/summary.html
deleted file mode 100644
index 16602da2a6..0000000000
--- a/executive-summary/summary.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<Title>Evolution Executive Summary</title>
-</head>
-
-<body bgcolor="#ffffff" background="executive-summary-bg.png">
-<table cellpadding="0" cellspacing="0" numcols="3" width="100%" height="100%" border="0">
-<tr>
-<td bgcolor="#9aadbf" height="102">
-<img src="butterfly.png"></td>
-<td width="100%" colspan="2" align="middle" bgcolor="#9aadbf">
-E V O L U T I O N
-</td></tr>
-<!-- Hmmmm.
-<tr><td bgcolor="#9aadbf">&nbsp;</td>
-<td valign="top" width="100"><img src="executive-summary-curve.png"></td>
-<td width="95%">
-
-<table border="0" align="middle">
-<tr>
-<td align="left">
- <form method="get" action="/search" name="f">
- <b>Search On Google</b>
- <input type="text" size="15" name=q>
- <input type="submit" name"submit">
- </form>
-</td>
-</tr>
--->
-<tr>
-<td colspan="2">
-<!-- EVOLUTION EXECUTIVE SUMMARY SERVICES DO NOT REMOVE -->
-</td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-
-</table>
-</body>
-</html>
-
-
diff --git a/executive-summary/test-service/.cvsignore b/executive-summary/test-service/.cvsignore
deleted file mode 100644
index e9a7d4280b..0000000000
--- a/executive-summary/test-service/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-core
-.deps
-.libs
-test-service
-rdf-summary
-GNOME_Evolution_Summary_test.oaf
-GNOME_Evolution_Summary_rdf.oaf
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
deleted file mode 100644
index decd499293..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"
-		type="exe"
-		location="rdf-summary">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the RDF summary."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="RDF Summary"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo
deleted file mode 100644
index 4cb096b3ae..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"
-		type="exe"
-		location="rdf-summary">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the RDF summary."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="RDF Summary"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
deleted file mode 100644
index b0c9e8f0d6..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ /dev/null
@@ -1,53 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Test service"/>
-</oaf_server>
-
-<!-- This does not work
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"
-                type="exe"
-                location="test-bonobo-service">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME:GenericFactory:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        _value="Factory for the test bonobo component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-                type="factory"
-                location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:Evolution:SummaryComponent:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        _value="Test bonobo service"/>
-</oaf_server>
-
--->
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
deleted file mode 100644
index 098da5e393..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
+++ /dev/null
@@ -1,53 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-<!-- This does not work
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"
-                type="exe"
-                location="test-bonobo-service">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME:GenericFactory:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        value="Factory for the test bonobo component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-                type="factory"
-                location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:Evolution:SummaryComponent:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        value="Test bonobo service"/>
-</oaf_server>
-
--->
-</oaf_info>
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
deleted file mode 100644
index c31e95035a..0000000000
--- a/executive-summary/test-service/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-bin_PROGRAMS = test-service rdf-summary
-
-CFLAGS += -g 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/executive-summary	\
-	$(EXTRA_GNOME_CFLAGS)		\
-	$(BONOBO_HTML_GNOME_CFLAGS)	\
-	$(UNICODE_CFLAGS)
-
-test_service_SOURCES = 			\
-	main.c
-
-test_service_LDADD = 			\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(BONOBO_VFS_GNOME_LIBS)	\
-	$(EXTRA_GNOME_LIBS)
-
-#test_bonobo_service_SOURCES =		\
-#	test-bonobo.c
-
-#test_bonobo_service_LDADD =		\
-#        $(top_builddir)/executive-summary/evolution-services/libevolution-services.la   \
-#        $(BONOBO_VFS_GNOME_LIBS)        \
-#        $(EXTRA_GNOME_LIBS)
-
-rdf_summary_SOURCES =			\
-	rdf-summary.c
-
-rdf_summary_LDADD =			\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(BONOBO_VFS_GNOME_LIBS)	\
-	$(EXTRA_GNOME_LIBS)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Summary_test.oaf.in \
-	GNOME_Evolution_Summary_rdf.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) 
diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
deleted file mode 100644
index 3134990810..0000000000
--- a/executive-summary/test-service/main.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- * Test Service that counts the number of seconds since it was started.
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-#include <liboaf/liboaf.h>
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-struct _UserData {
-	char *title;
-	char *icon;
-};
-typedef struct _UserData UserData;
-
-static int running_views = 0;
-
-#define TEST_SERVICE_ID "OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-/* PersistStream callbacks */
-static void
-load_from_stream (BonoboPersistStream *ps,
-		  Bonobo_Stream stream,
-		  Bonobo_Persist_ContentType type,
-		  gpointer data,
-		  CORBA_Environment *ev)
-{
-	char *str;
-	
-	if (*type && g_strcasecmp (type, "application/x-test-service") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	bonobo_stream_client_read_string (stream, &str, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION || str == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	g_print ("Restoring with :%s\n", str);
-	g_free (str);
-}
-
-static void
-save_to_stream (BonoboPersistStream *ps,
-		const Bonobo_Stream stream,
-		Bonobo_Persist_ContentType type,
-		gpointer data,
-		CORBA_Environment *ev)
-{
-
-	if (*type && g_strcasecmp (type, "application/x-test-service") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	bonobo_stream_client_printf (stream, TRUE, ev, "Yo yo yo");
-	if (ev->_major != CORBA_NO_EXCEPTION)
-		return;
-}
-
-static Bonobo_Persist_ContentTypeList *
-content_types (BonoboPersistStream *ps,
-	       void *closure,
-	       CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (1, "application/x-test-service");
-}
-
-/* PropertyControl callback */
-
-/* Propertybag set/get functions */
-static void
-set_property (BonoboPropertyBag *bag,
-	      const BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		g_print ("Setting title.\n");
-		break;
-
-	case PROPERTY_ICON:
-		g_print ("Setting icon.\n");
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-get_property (BonoboPropertyBag *bag,
-	      BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	UserData *ud = (UserData *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		BONOBO_ARG_SET_STRING (arg, ud->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, ud->icon);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-component_destroyed (GtkObject *object,
-		     gpointer data)
-{
-	UserData *ud = (UserData *) data;
-	/* Free the UserData structure */
-	g_free (ud->title);
-	g_free (ud->icon);
-	g_free (ud);
-
-	running_views--;
-
-	g_print ("Destroy!\n");
-	if (running_views <= 0) {
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		gtk_main_quit ();
-	}
-}
-
-static BonoboObject *
-create_view (ExecutiveSummaryComponentFactory *_factory,
-	     void *closure)
-{
-	BonoboObject *component, *view;
-	BonoboPersistStream *stream;
-	BonoboPropertyBag *bag;
-	BonoboEventSource *event_source;
-	UserData *ud;
-
-	/* Create the component object */
-	component = executive_summary_component_new ();
-
-	/* Create the UserData structure and fill it */
-	ud = g_new (UserData, 1);
-	ud->title = g_strdup ("Hello World!");
-	ud->icon = g_strdup ("apple-red.png");
-
-	gtk_signal_connect (GTK_OBJECT (component), "destroy",
-			    GTK_SIGNAL_FUNC (component_destroyed), ud);
-
-	/* Now create the aggregate objects. For a "service"
-	   either a Summary::HTMLView or Bonobo::Control are required.
-	   Other supported agreggate objects are 
-	   PersistStream: For saving and restoring the component.
-	   PropertyBag: To set the icon and title and other properties
-	   PropertyControl: To produce a control to configure the service.
-	
-	   To aggregate the objects
-	   i) Create the objects using their creation functions
-	   ii) Use bonobo_object_add_interface ().
-	*/
-	
-	/* Create an event source to share with all the interfaces, 
-	   as we can only aggregate one onto the ExecutiveSummaryComponent */
-	event_source = bonobo_event_source_new ();
-
-	/* The Summary::HTMLView interface */
-	view = executive_summary_html_view_new_full (event_source);
-	/* Set the default HTML */
-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (view),
-					      "<B>Hello World</b>");
-	
-	bonobo_object_add_interface (component, view);
-
-	/* Add the Bonobo::PropertyBag interface */
-	bag = bonobo_property_bag_new_full (get_property, set_property, 
-					    event_source, ud);
-	/* Add the properties. There should be 2:
-	   window_title: For the window title.
-	   window_icon: For the window icon.
-	*/
-	bonobo_property_bag_add (bag,
-				 "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 "The title of this components window", 0);
-	bonobo_property_bag_add (bag,
-				 "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 "The icon for this component's window", 0);
-
-	/* Now add the interface */
-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
-
-	/* Add the Bonobo::PersistStream interface */
-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,
-					    NULL, content_types, NULL);
-	bonobo_object_add_interface (component, BONOBO_OBJECT(stream));
-
-	running_views++;
-	/* Return the ExecutiveSummaryComponent object */
-	return component;
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *generic_factory,
-	    void *closure)
-{
-	BonoboObject *_factory;
-	
-	/* Create an executive summary component factory */
-	_factory = executive_summary_component_factory_new (create_view, NULL);
-	return _factory;
-}
-
-void
-test_service_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-	
-	/* Register the factory creation function and the IID */
-	factory = bonobo_generic_factory_new (TEST_SERVICE_ID, factory_fn, NULL);
-	if (factory == NULL) {
-		g_warning ("Cannot initialize test service");
-		exit (0);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	CORBA_ORB orb;
-	
-	/* Init GNOME, oaf and bonobo */
-	gnome_init_with_popt_table ("Test service", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-	orb = oaf_init (argc, argv);
-	
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo");
-	}
-	
-	/* Register the factory */
-	test_service_factory_init ();
-	
-	/* Enter main */
-	bonobo_main ();
-	
-	return 0;
-}
-
diff --git a/executive-summary/test-service/rdf-summary.c b/executive-summary/test-service/rdf-summary.c
deleted file mode 100644
index b99d939c11..0000000000
--- a/executive-summary/test-service/rdf-summary.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* RDF viewer Evolution Executive Summary Component.
- * Bonoboised by Iain Holmes  <iain@ximian.com>
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Based on code from Portaloo
- * Channel retrieval tool
- *
- * (C) 1998 Alan Cox.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
- 
-#include <glib.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-html-view.h>
-#include <liboaf/liboaf.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-int xmlSubstituteEntitiesDefaultValue = 1;	/* DV thinks of everything */
-
-static int wipe_trackers = FALSE;
-static int running_views = 0;
-
-static BonoboGenericFactory *factory = NULL;
-#define RDF_SUMMARY_ID "OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-struct _RdfSummary {
-	BonoboObject *component;
-	BonoboObject *view;
-	BonoboPropertyBag *bag;
-	BonoboPropertyControl *property_control;
-
-	GtkWidget *rdf;
-	GtkWidget *g_limit;
-	GtkWidget *g_title;
-	GtkWidget *g_update;
-	GtkWidget *g_update_container;
-	GtkAdjustment *adjustment;
-
-	char *title;
-	char *icon;
-	char *location;
-	int limit;
-	gboolean showtitle;
-
-	gboolean usetimer;
-	int time;
-	int timer;
-
-	GString *str;
-	char *buffer;
-
-	GnomeVFSAsyncHandle *handle;
-
-	xmlDocPtr cache;
-};
-typedef struct _RdfSummary RdfSummary;
-
-/************ RDF Parser *******************/
-
-static char *
-layer_find (xmlNodePtr node, 
-	    char *match, 
-	    char *fail)
-{
-	while (node!=NULL) {
-#ifdef RDF_DEBUG
-		xmlDebugDumpNode (stdout, node, 32);
-		printf("%s.\n", node->name);
-#endif
-		if (strcasecmp (node->name, match)==0) {
-			if (node->childs != NULL && node->childs->content != NULL) {
-				return node->childs->content;
-			} else {
-				return fail;
-			}
-		}
-		node = node->next;
-	}
-	return fail;
-}
-
-static char *
-layer_find_url (xmlNodePtr node, 
-		char *match, 
-		char *fail)
-{
-	char *p = layer_find (node, match, fail);
-	char *r = p;
-	static char *wb = NULL;
-	char *w;
-	
-	if (wb) {
-		free (wb);
-	}
-	
-	wb = w = malloc (3 * strlen (p));
-	
-	if (w == NULL) {
-		fprintf(stderr, "Out of memory\n");
-		exit(1);
-	}
-	
-	if (*r == ' ') r++;	/* Fix UF bug */
-
-	while (*r) {
-		if (memcmp (r, "&amp;", 5) == 0) {
-			*w++ = '&';
-			r += 5;
-			continue;
-		}
-		if (memcmp (r, "&lt;", 4) == 0) {
-			*w++ = '<';
-			r += 4;
-			continue;
-		}
-		if (memcmp (r, "&gt;", 4) == 0) {
-			*w++ = '>';
-			r += 4;
-			continue;
-		}
-		if (*r == '"' || *r == ' '){
-			*w++ = '%';
-			*w++ = "0123456789ABCDEF"[*r/16];
-			*w++ = "0123456789ABCDEF"[*r&15];
-			r++;
-			continue;
-		}
-		*w++ = *r++;
-	}
-	*w = 0;
-	return wb;
-}
-
-static void 
-tree_walk (xmlNodePtr root,
-	   RdfSummary *summary,
-	   GString *html)
-{
-	BonoboArg *arg;
-	xmlNodePtr walk;
-	xmlNodePtr rewalk = root;
-	xmlNodePtr channel = NULL;
-	xmlNodePtr image = NULL;
-	xmlNodePtr item[16];
-	int items = 0;
-	int limit = summary->limit;
-	int i;
-	char *t;
-	char n[512];
-	char *tmp;
-	
-	do {
-		walk = rewalk;
-		rewalk = NULL;
-		
-		while (walk!=NULL){
-#ifdef RDF_DEBUG
-			printf ("%p, %s\n", walk, walk->name);
-#endif
-			if (strcasecmp (walk->name, "rdf") == 0) {
-				rewalk = walk->childs;
-				walk = walk->next;
-				continue;
-			}
-			if (strcasecmp (walk->name, "rss") == 0){
-				rewalk = walk->childs;
-				walk = walk->next;
-				continue;
-			}
-			/* This is the channel top level */
-#ifdef RDF_DEBUG
-			printf ("Top level '%s'.\n", walk->name);
-#endif
-			if (strcasecmp (walk->name, "channel") == 0) {
-				channel = walk;
-				rewalk = channel->childs;
-			}
-			if (strcasecmp (walk->name, "image") == 0) {
-				image = walk;
-				g_print ("Image\n");
-			}
-			if (strcasecmp (walk->name, "item") == 0 && items < 16) {
-				item[items++] = walk;
-			}
-			walk = walk->next;
-		}
-	}
-	while (rewalk);
-	
-	if (channel == NULL) {
-		fprintf(stderr, "No channel definition.\n");
-		exit(1);
-	}
-
-	t = layer_find(channel->childs, "title", "No title");
-
-	arg = bonobo_arg_new (BONOBO_ARG_STRING);
-
-	if (summary->showtitle) {
-		BONOBO_ARG_SET_STRING (arg, t);
-	} else {
-		BONOBO_ARG_SET_STRING (arg, "");
-	}
-
-	bonobo_property_bag_set_value (summary->bag,
-				       "window_title", 
-				       (const BonoboArg *) arg, NULL);
-	bonobo_arg_release (arg);
-
-	if (image && !wipe_trackers) {		
-		char *icon;
-
-		icon = layer_find_url (image->childs, "url", "apple-red.png");
-		arg = bonobo_arg_new (BONOBO_ARG_STRING);
-		BONOBO_ARG_SET_STRING (arg, icon);
-		bonobo_property_bag_set_value (summary->bag,
-					       "window_icon", 
-					       (const BonoboArg *) arg, NULL);
-		bonobo_arg_release (arg);
-			
-	}
-
-	g_string_append (html, "<br clear=all><FONT size=\"-1\" face=\"helvetica\"><P><UL>\n");
-
-	items = MIN (limit, items);
-	for (i = 0; i < items; i++) {
-		char *p = layer_find (item[i]->childs, "title", "No information");
-		
-		if (wipe_trackers) {
-			char *p = layer_find_url (item[i]->childs, "link", "");
-			char *x = strchr (p, '?');
-			unsigned char *r, *w;
-			int n;
-			if (x == NULL)
-				continue;
-			x++;
-			r = x;
-			w = x;
-			while (*r) {
-				if (*r == '+') {
-					*w++ = ' ';
-				} else if (*r == '%') {
-					sscanf (r+1, "%02x", &n);
-					*w++ = n;
-					r += 2;
-				} else {
-					*w++ = *r;
-				}
-				r++;
-			}
-			*w = 0;
-			tmp = g_strdup_printf ("<LI><A href=\"%s\">\n", x+4);
-			g_string_append (html, tmp);
-			g_free (tmp);
-		}
-		else {
-			tmp = g_strdup_printf ("<LI><A href=\"%s\">\n", layer_find_url(item[i]->childs, "link", ""));
-			g_string_append (html, tmp);
-			g_free (tmp);
-		}
-
-		tmp = g_strdup_printf ("%s\n</A>\n", p);
-		g_string_append (html, tmp);
-		g_free (tmp);
-	}
-	g_string_append (html, "</UL></FONT>\n");
-}
-
-/********* ExecutiveSummaryComponent section **************/
-static void 
-view_destroyed (GtkObject *object,
-		gpointer data)
-{
-	RdfSummary *summary = (RdfSummary *) data;
-
-	g_warning ("RDF: Point 1");
-	if (summary->handle)
-		gnome_vfs_async_cancel (summary->handle);
-
-	g_warning ("RDF: Point 2");
-
-	if (summary->cache != NULL)
-		xmlFreeDoc (summary->cache);
-
-	g_free (summary->title);
-	g_free (summary->icon);
-	g_free (summary);
-
-	running_views--;
-	g_print ("Running_views: %d\n", running_views);
-	if (running_views <= 0) {
-		gtk_main_quit ();
-	}
-	g_warning ("RDF: Point 3");
-}
-
-/* PersistStream callbacks */
-static void
-load_from_stream (BonoboPersistStream *ps,
-		  Bonobo_Stream stream,
-		  Bonobo_Persist_ContentType type,
-		  gpointer data,
-		  CORBA_Environment *ev)
-{
-	RdfSummary *summary = (RdfSummary *) data;
-	char *str;
-	xmlChar *xml_str;
-	xmlDocPtr doc;
-	xmlNodePtr root, children;
-
-	if (*type && g_strcasecmp (type, "application/x-rdf-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	bonobo_stream_client_read_string (stream, &str, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION || str == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	doc = xmlParseDoc ((xmlChar *) str);
-	
-	if (doc == NULL) {
-		g_warning ("Bad data: %s!", str);
-		g_free (str);
-		return;
-	}
-
-	g_free (str);
-
-	root = doc->root;
-	children = root->childs;
-	while (children) {
-		if (strcasecmp (children->name, "location") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			summary->location = g_strdup (xml_str);
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		} 
-
-		if (strcasecmp (children->name, "limit") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			summary->limit = atoi (xml_str);
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		if (strcasecmp (children->name, "showtitle") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			summary->showtitle = atoi (xml_str);
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		if (strcasecmp (children->name, "usetimer") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			summary->usetimer = atoi (xml_str);
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		if (strcasecmp (children->name, "timer") == 0) {
-			xml_str = xmlNodeListGetString (doc, children->childs, 1);
-			summary->timer = atoi (xml_str);
-			xmlFree (xml_str);
-
-			children = children->next;
-			continue;
-		}
-
-		g_print ("Unknown name: %s\n", children->name);
-		children = children->next;
-	}
-	xmlFreeDoc (doc);
-}
-
-static char *
-summary_to_string (RdfSummary *summary)
-{
-	xmlChar *out_str;
-	int out_len = 0;
-	xmlDocPtr doc;
-	xmlNodePtr root;
-	xmlNsPtr ns;
-	char *tmp_str;
-	
-	doc = xmlNewDoc ("1.0");
-	ns = xmlNewGlobalNs (doc, "http://www.ximian.com", "rdf");
-	
-	doc->root = xmlNewDocNode (doc, ns, "rdf-summary", NULL);
-
-	xmlNewChild (doc->root, ns, "location", summary->location);
-	tmp_str = g_strdup_printf ("%d", summary->limit);
-	xmlNewChild (doc->root, ns, "limit", tmp_str);
-	g_free (tmp_str);
-
-	tmp_str = g_strdup_printf ("%d", summary->showtitle);
-	xmlNewChild (doc->root, ns, "showtitle", tmp_str);
-	g_free (tmp_str);
-
-	tmp_str = g_strdup_printf ("%d", summary->usetimer);
-	xmlNewChild (doc->root, ns, "usetimer", tmp_str);
-	g_free (tmp_str);
-
-	tmp_str = g_strdup_printf ("%d", summary->timer);
-	xmlNewChild (doc->root, ns, "timer", tmp_str);
-	g_free (tmp_str);
-
-	xmlDocDumpMemory (doc, &out_str, &out_len);
-
-	return out_str;
-}
-
-static void
-save_to_stream (BonoboPersistStream *ps,
-		const Bonobo_Stream stream,
-		Bonobo_Persist_ContentType type,
-		gpointer data,
-		CORBA_Environment *ev)
-{
-	RdfSummary *summary = (RdfSummary *) data;
-	char *str;
-
-	if (*type && g_strcasecmp (type, "application/x-rdf-summary") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	str = summary_to_string (summary);
-	if (str)
-		bonobo_stream_client_printf (stream, TRUE, ev, str);
-	xmlFree (str);
-
-	return;
-}
-
-static Bonobo_Persist_ContentTypeList *
-content_types (BonoboPersistStream *ps,
-	       void *closure,
-	       CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (1, "application/x-rdf-summary");
-}
-
-static void 
-display_doc (RdfSummary *summary)
-{
-	GString *html;
-
-	html = g_string_new ("");
-
-	tree_walk (summary->cache->root, summary, html);
-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary->view), html->str);
-	g_string_free (html, TRUE);
-}
-
-static void
-close_callback (GnomeVFSAsyncHandle *handle,
-		GnomeVFSResult result,
-		RdfSummary *summary)
-{
-	xmlDocPtr doc;
-	char *xml;
-
-	if (summary == NULL)
-		return;
-
-	summary->handle = NULL;
-	g_free (summary->buffer);
-	xml = summary->str->str;
-	g_string_free (summary->str, FALSE);
-
-	if (summary->cache != NULL)
-		xmlFreeDoc (summary->cache);
-
-	doc = xmlParseMemory (xml, strlen (xml));
-	if (doc == NULL) {
-		char *emsg;
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_STRING);
-		BONOBO_ARG_SET_STRING (arg, _("Error"));
-		bonobo_property_bag_set_value (summary->bag,
-					       "window_title", 
-					       (const BonoboArg *) arg,
-					       NULL);
-		bonobo_arg_release (arg);
-		
-		emsg = g_strdup_printf ("<b>Cannot open location:<br>%s</b>",
-					summary->location);
-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary->view), emsg);
-		g_free (emsg);
-		g_free (xml);
-		return;
-	}
-	
-	g_free (xml);
-
-	/* Cache it for later */
-	summary->cache = doc;
-
-	/* Draw it */
-	display_doc (summary);
-}
-
-static void
-read_callback (GnomeVFSAsyncHandle *handle,
-	       GnomeVFSResult result,
-	       gpointer buffer,
-	       GnomeVFSFileSize bytes_requested,
-	       GnomeVFSFileSize bytes_read,
-	       RdfSummary *summary)
-{
-	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-		char *emsg;
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_STRING);
-		BONOBO_ARG_SET_STRING (arg, _("Error"));
-		bonobo_property_bag_set_value (summary->bag,
-					       "window_title", 
-					       (const BonoboArg *) arg,
-					       NULL);
-		bonobo_arg_release (arg);
-		
-		emsg = g_strdup_printf ("<b>Cannot open location:<br>%s</b>",
-					summary->location);
-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary->view), emsg);
-		g_free (emsg);
-		gnome_vfs_async_close (handle, 
-				       (GnomeVFSAsyncCloseCallback) close_callback,
-				       NULL);
-		g_print ("NULLING\n");
-		summary->handle = NULL;
-	}
-
-	if (bytes_read == 0) {
-		/* EOF */
-		gnome_vfs_async_close (handle, 
-				       (GnomeVFSAsyncCloseCallback) close_callback,
-				       summary);
-	} else {
-		*((char *) buffer + bytes_read) = 0;
-		g_string_append (summary->str, (const char *) buffer);
-		gnome_vfs_async_read (handle, buffer, 4095, 
-				      (GnomeVFSAsyncReadCallback) read_callback,
-				      summary);
-	}
-}
-
-static void
-open_callback (GnomeVFSAsyncHandle *handle,
-	       GnomeVFSResult result,
-	       RdfSummary *summary)
-{
-	GList *uri;
-	char *buffer;
-
-	if (result != GNOME_VFS_OK) {
-		char *emsg;
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_STRING);
-		BONOBO_ARG_SET_STRING (arg, _("Error"));
-		bonobo_property_bag_set_value (summary->bag,
-					       "window_title", 
-					       (const BonoboArg *) arg,
-					       NULL);
-		bonobo_arg_release (arg);
-		
-		emsg = g_strdup_printf ("<b>Cannot open location:<br>%s</b>",
-					summary->location);
-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary->view), emsg);
-		g_free (emsg);
-		summary->handle = NULL;
-		return;
-	}
-
-	summary->str = g_string_new ("");
-	summary->buffer = g_new (char, 4096);
-
-	gnome_vfs_async_read (handle, summary->buffer, 4095, 
-			      (GnomeVFSAsyncReadCallback) read_callback, 
-			      summary);
-}
-
-static int
-download (RdfSummary *summary)
-{
-	GnomeVFSAsyncHandle *handle;
-	char *html = "<b>Loading RDF file. . .<br>Please wait</b>";
-	
-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary->view),
-					      html);
-
-	gnome_vfs_async_open (&handle, summary->location, GNOME_VFS_OPEN_READ,
-			      (GnomeVFSAsyncOpenCallback) open_callback, 
-			      summary);
-
-	summary->handle = handle;
-	return FALSE;
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg *arg,
-	  guint arg_id,
-	  CORBA_Environment *ev,
-	  gpointer user_data)
-{
-	RdfSummary *summary = (RdfSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		BONOBO_ARG_SET_STRING (arg, summary->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, summary->icon);
-		break;
-		
-	default:
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg *arg,
-	  guint arg_id,
-	  CORBA_Environment *ev,
-	  gpointer user_data)
-{
-	RdfSummary *summary = (RdfSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		if (summary->title)
-			g_free (summary->title);
-
-		summary->title = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		g_print ("Notify listener!\n");
-		bonobo_property_bag_notify_listeners (bag, "window_title",
-						      arg, NULL);
-		break;
-
-	case PROPERTY_ICON:
-		if (summary->icon)
-			g_free (summary->icon);
-
-		summary->icon = g_strdup (BONOBO_ARG_GET_STRING (arg));
-		g_print ("Notify listener 2\n");
-		bonobo_property_bag_notify_listeners (bag, "window_icon",
-						      arg, NULL);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-item_changed (GtkWidget *widget,
-	      RdfSummary *summary)
-{
-	if (widget == summary->g_update) {
-		summary->usetimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-		gtk_widget_set_sensitive (summary->g_update_container, 
-					  summary->usetimer);
-	}
-
-	bonobo_property_control_changed (summary->property_control, NULL);
-}
-
-static BonoboControl *
-property_control (BonoboPropertyControl *property_control,
-		  int page_num,
-		  gpointer user_data)
-{
-	BonoboControl *control;
-	RdfSummary *summary = (RdfSummary *) user_data;
-	GtkWidget *container, *label, *hbox, *spinner, *button;
-	char *climit;
-
-	container = gtk_vbox_new (FALSE, 2);
-	gtk_container_set_border_width (GTK_CONTAINER (container), 2);
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	label = gtk_label_new ("Location:");
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	summary->rdf = gtk_entry_new ();
-	if (summary->location)
-		gtk_entry_set_text (GTK_ENTRY (summary->rdf), summary->location);
-
-	gtk_signal_connect (GTK_OBJECT (summary->rdf), "changed",
-			    GTK_SIGNAL_FUNC (item_changed), summary);
-
-	gtk_box_pack_start (GTK_BOX (hbox), summary->rdf, TRUE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	label = gtk_label_new ("Maximum number of entries:");
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	summary->g_limit = gtk_entry_new ();
-	climit = g_strdup_printf ("%d", summary->limit);
-	gtk_entry_set_text (GTK_ENTRY (summary->g_limit), climit);
-	g_free (climit);
-
-	gtk_signal_connect (GTK_OBJECT (summary->g_limit), "changed",
-			    GTK_SIGNAL_FUNC (item_changed), summary);
-
-	gtk_box_pack_start (GTK_BOX (hbox), summary->g_limit, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	/* FIXME: Do this better? */
-	label = gtk_label_new ("Show window title");
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	summary->g_title = gtk_check_button_new ();
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->g_title),
-				      summary->showtitle);
-
-	gtk_signal_connect (GTK_OBJECT (summary->g_title), "toggled",
-			    GTK_SIGNAL_FUNC (item_changed), summary);
-
-	gtk_box_pack_start (GTK_BOX (hbox), summary->g_title, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 2);
-
-	/* Update */
-	hbox = gtk_hbox_new (FALSE, 2);
-	label = gtk_label_new (_("Update automatically"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	summary->g_update = gtk_check_button_new ();
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary->g_update),
-				      summary->usetimer);
-
-	gtk_signal_connect (GTK_OBJECT (summary->g_update), "toggled",
-			    GTK_SIGNAL_FUNC (item_changed), summary);
-	gtk_box_pack_start (GTK_BOX (hbox), summary->g_update, TRUE, TRUE, 0);
-
-	button = gtk_button_new_with_label (_("Update now"));
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (download), summary);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
-
-	/* Timer */
-	hbox = gtk_hbox_new (FALSE, 2);
-	summary->g_update_container = hbox;
-
-	label = gtk_label_new (_("Update every "));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	summary->adjustment = GTK_ADJUSTMENT(gtk_adjustment_new (summary->time / 1000 / 60,
-								 0.0, 1000.0, 1.0, 10.0, 1.0));
-	spinner = gtk_spin_button_new (summary->adjustment, 1.0, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
-	
-	label = gtk_label_new (_("minutes"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	
-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
-	gtk_widget_set_sensitive (hbox, summary->usetimer);
-
-	gtk_widget_show_all (container);
-
-	control = bonobo_control_new (container);
-	return control;
-}
-
-static void
-property_action (GtkObject *property_control,
-		 int page_num,
-		 Bonobo_PropertyControl_Action action,
-		 RdfSummary *summary)
-{
-	gboolean changed = FALSE;
-	char *old_location;
-
-	switch (action) {
-	case Bonobo_PropertyControl_APPLY:
-		old_location = summary->location;
-		summary->showtitle = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary->g_title));
-		summary->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (summary->rdf)));
-		if (strcmp (old_location, summary->location) != 0) 
-			changed = TRUE;
-
-		summary->limit = atoi (gtk_entry_get_text (GTK_ENTRY (summary->g_limit)));
-		summary->time = summary->adjustment->value * 60 * 1000;
-		if (summary->timer)
-			gtk_timeout_remove (summary->timer);
-		summary->timer = gtk_timeout_add (summary->time, 
-						  (GSourceFunc)download, summary);
-		
-		if (changed)
-			g_idle_add ((GSourceFunc) download, summary);
-		else
-			g_idle_add ((GSourceFunc) display_doc, summary);
-
-		g_free (old_location);
-		break;
- 
-	case Bonobo_PropertyControl_HELP:
-		g_print ("HELP: Page %d!\n", page_num);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static BonoboObject *
-create_view (ExecutiveSummaryComponentFactory *_factory,
-	     void *closure)
-{
-	RdfSummary *summary;
-	BonoboObject *component, *view;
-	BonoboEventSource *event_source;
-	BonoboPersistStream *stream;
-	BonoboPropertyBag *bag;
-	BonoboPropertyControl *property;
-	
-	summary = g_new (RdfSummary, 1);
-	summary->icon = g_strdup ("apple-green.png");
-	summary->title = g_strdup ("Downloading...");
-	summary->location = g_strdup ("http://news.gnome.org/gnome-news/rdf");
-	summary->limit = 10;
-	summary->showtitle = TRUE;
-
-	summary->cache = NULL;
-	
-	summary->usetimer = TRUE;
-	summary->time = 600000; /* 10 minutes */
-	summary->timer = gtk_timeout_add (summary->time, (GSourceFunc) download,
-					  summary);
-
-	component = executive_summary_component_new ();
-	gtk_signal_connect (GTK_OBJECT (component), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroyed), summary);
-
-	summary->component = component;
-
-	/* Share the event source between the ExecutiveSummaryHtmlView and the
-	   BonoboPropertyControl as we can only have one Bonobo::EventSource
-	   interface aggregated */
-	event_source = bonobo_event_source_new ();
-
-	/* Summary::HtmlView */
-	view = executive_summary_html_view_new_full (event_source);
-
-	summary->view = view;
-	bonobo_object_add_interface (component, view);
-
-	/* Bonobo::PropertyBag */
-	bag = bonobo_property_bag_new_full (get_prop, set_prop, 
-					    event_source, summary);
-
-	summary->bag = bag;
-	bonobo_property_bag_add (bag,
-				 "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING, NULL,
-				 "The title of this component's window", 0);
-	bonobo_property_bag_add (bag,
-				 "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING, NULL,
-				 "The icon for this component's window", 0);
-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
-
-	/* Bonobo::PropertyControl */
-	property = bonobo_property_control_new_full (property_control, 1,
-						     event_source,
-						     summary);
-	summary->property_control = property;
-
-	gtk_signal_connect (GTK_OBJECT (property), "action",
-			    GTK_SIGNAL_FUNC (property_action), summary);
-
-	bonobo_object_add_interface (component, BONOBO_OBJECT(property));
-
-	/* Bonobo::PersistStream */
-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,
-					    NULL, content_types, summary);
-	bonobo_object_add_interface (component, BONOBO_OBJECT (stream));
-
-	running_views++;
-	gtk_idle_add ((GSourceFunc) download, summary);
-
-	return component;
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	BonoboObject *component_factory;
-
-	component_factory = executive_summary_component_factory_new (create_view, NULL);
-	return component_factory;
-}
-
-static void
-factory_init (void)
-{
-	if (factory != NULL) {
-		return;
-	}
-
-	factory = bonobo_generic_factory_new (RDF_SUMMARY_ID, factory_fn, NULL);
-	if (factory == NULL) {
-		g_error ("Cannot initialize factory");
-	}
-}
-
-int 
-main (int argc, 
-      char *argv[])
-{
-	CORBA_ORB orb;
-
-	gnome_init_with_popt_table ("RDF-Summary", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-	orb = oaf_init (argc, argv);
-	gnome_vfs_init ();
-
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo");
-	}
-
-	factory_init ();
-	bonobo_main ();
-
-	return 0;
-}
-	
diff --git a/executive-summary/widgets/.cvsignore b/executive-summary/widgets/.cvsignore
deleted file mode 100644
index ddca354b6d..0000000000
--- a/executive-summary/widgets/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-esummary-window-test
\ No newline at end of file
diff --git a/executive-summary/widgets/Makefile.am b/executive-summary/widgets/Makefile.am
deleted file mode 100644
index f83d956d63..0000000000
--- a/executive-summary/widgets/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INCLUDES = 	\
-	-I$(top_srcdir) 	\
-	-I$(includedir)		\
-	$(GNOME_INCLUDEDIR)	\
-	-DG_LOG_DOMAIN=\"Executive-Summary-Widgets\"	\
-	-g 	\
-	-Wall	\
-	-Wmissing-prototypes	\
-	-Wmissing-declarations
-
-noinst_LIBRARIES = libesummary-widgets.a
-
-libesummary_widgets_a_SOURCES = 	\
-	e-summary-subwindow.c		\
-	e-summary-subwindow.h		\
-	e-summary-titlebar.c		\
-	e-summary-titlebar.h		\
-	e-summary-title-button.c	\
-	e-summary-title-button.h
-
-noinst_PROGRAMS =		\
-	esummary-window-test
-
-esummary_window_test_SOURCES =	\
-	esummary-window-test.c
-
-esummary_window_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libesummary-widgets.a	\
-	$(BONOBO_GNOME_LIBS)	\
-	$(top_builddir)/e-util/libeutil.la
-
diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c
deleted file mode 100644
index bf5bcb1eba..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include "e-summary-subwindow.h"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-static void e_summary_subwindow_destroy (GtkObject *object);
-static void e_summary_subwindow_class_init (GtkObjectClass *object_class);
-static void e_summary_subwindow_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-
-struct _ESummarySubwindowPrivate {
-  GnomeCanvasItem *titlebar;
-  GnomeCanvasItem *contents;
-
-  GtkWidget *container;
-
-  char *title;
-};
-
-enum {
-  ARG_0,
-  ARG_X,
-  ARG_Y,
-  ARG_WIDTH,
-  ARG_HEIGHT,
-  ARG_STATE
-};
-
-enum {
-  CLOSE_CLICKED,
-  SHADE_CLICKED,
-  EDIT_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint32 e_summary_subwindow_signals[LAST_SIGNAL] = { 0 };
-
-static void
-e_summary_subwindow_destroy (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  priv = subwindow->private;
-
-  if (priv == NULL)
-    return;
-
-  if (priv->container) {
-    gtk_widget_destroy (priv->container);
-    priv->container = NULL;
-  }
-
-  if (priv->title) {
-    g_free (priv->title);
-    priv->title = NULL;
-  }
-
-  g_free (subwindow->private);
-  subwindow->private = NULL;
-
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-  (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_subwindow_realize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_subwindow_unrealize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_subwindow_class_init (GtkObjectClass *object_class)
-{
-  GnomeCanvasItemClass *item_class;
-
-  item_class = (GnomeCanvasItemClass *) object_class;
-
-  object_class->destroy = e_summary_subwindow_destroy;
-
-  item_class->realize = e_summary_subwindow_realize;
-  item_class->unrealize = e_summary_subwindow_unrealize;
-
-  parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_subwindow_init (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  subwindow->private = g_new0 (ESummarySubwindowPrivate, 1);
-  priv = subwindow->private;
-
-  priv->title = NULL;
-}
-
-E_MAKE_TYPE (e_summary_subwindow, "ESummarySubwindow", ESummarySubwindow,
-	     e_summary_subwindow_class_init, e_summary_subwindow_init,
-	     PARENT_TYPE);
-
-static void
-container_size_allocate (GtkWidget *widget,
-			 GtkAllocation *allocation,
-			 ESummarySubwindow *subwindow)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-
-  priv = subwindow->private;
-
-  gnome_canvas_item_set (priv->titlebar,
-			 "width", (double) allocation->width - 1,
-			 NULL);
-
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummarySubwindow *subwindow)
-{
-	g_print ("EDIT!\n");
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("SHADE!\n");
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("CLOSE!\n");
-	gtk_object_destroy (GTK_OBJECT (subwindow));
-}
-
-void
-e_summary_subwindow_construct (GnomeCanvasItem *item)
-{
-  GnomeCanvasGroup *group;
-  ESummarySubwindow *subwindow;
-  ESummarySubwindowPrivate *priv;
-  EFont *font;
-  int titlebar_height;
-
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (item));
-
-  subwindow = E_SUMMARY_SUBWINDOW (item);
-  priv = subwindow->private;
-
-  group = GNOME_CANVAS_GROUP (item);
-
-  font = e_font_from_gdk_font ( ((GtkWidget *) item->canvas)->style->font);
-
-  titlebar_height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-
-  priv->titlebar = gnome_canvas_item_new (group,
-					  e_summary_titlebar_get_type (),
-					  "text", "Titlebar",
-					  "width", 100.0,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "edit",
-		      GTK_SIGNAL_FUNC (edit_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "shade",
-		      GTK_SIGNAL_FUNC (shade_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "close",
-		      GTK_SIGNAL_FUNC (close_cb), subwindow);
-
-  priv->container = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (priv->container), GTK_SHADOW_ETCHED_IN);
-  gtk_widget_show (priv->container);
-  
-  priv->contents = gnome_canvas_item_new (group,
-					  gnome_canvas_widget_get_type (),
-					  "x", (double) 0,
-					  "y", (double) titlebar_height + 1,
-					  "widget", priv->container,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->container), "size_allocate",
-		      GTK_SIGNAL_FUNC (container_size_allocate), subwindow);
-  
-}
-
-GnomeCanvasItem *
-e_summary_subwindow_new (GnomeCanvasGroup *parent,
-			 double x,
-			 double y)
-{
-  GnomeCanvasItem *item;
-
-  item = gnome_canvas_item_new (parent, e_summary_subwindow_get_type (), 
-				"x", x,
-				"y", y,
-				NULL);
-  e_summary_subwindow_construct (item);
-
-  return item;
-}
-
-/* These functions mimic the GtkContainer methods */
-
-void
-e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			 GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_add (GTK_CONTAINER (priv->container), widget);
-  
-}
-
-void
-e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-			    GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_remove (GTK_CONTAINER (priv->container), widget);
-}
-
-void
-e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-			       const char *title)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (title != NULL);
-
-  priv = subwindow->private;
-  if (priv->title)
-    g_free (priv->title);
-
-  priv->title = g_strdup (title);
-}
diff --git a/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h
deleted file mode 100644
index daad080a9c..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-subwindow.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_SUBWINDOW_H__
-#define _E_SUMMARY_SUBWINDIW_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_SUBWINDOW_TYPE (e_summary_subwindow_get_type ())
-#define E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindow))
-#define E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindowClass))
-#define IS_E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-#define IS_E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-
-typedef struct _ESummarySubwindowPrivate ESummarySubwindowPrivate;
-typedef struct _ESummarySubwindow ESummarySubwindow;
-typedef struct _ESummarySubwindowClass ESummarySubwindowClass;
-
-struct _ESummarySubwindow {
-  GnomeCanvasGroup parent;
-
-  ESummarySubwindowPrivate *private;
-};
-
-struct _ESummarySubwindowClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close_clicked) (ESummarySubwindow *window);
-  void (*shade_clicked) (ESummarySubwindow *window);
-  void (*edit_clicked) (ESummarySubwindow *window);
-};
-
-GtkType e_summary_subwindow_get_type (void);
-
-void e_summary_subwindow_construct (GnomeCanvasItem *subwindow);
-GnomeCanvasItem *e_summary_subwindow_new (GnomeCanvasGroup *parent,
-					  double x,
-					  double y);
-
-void e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			      GtkWidget *widget);
-void e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-				 GtkWidget *widget);
-void e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-				    const char *title);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c
deleted file mode 100644
index 81fa8e5923..0000000000
--- a/executive-summary/widgets/e-summary-title-button.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-buttons.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-title-button.h"
-
-#define PARENT_TYPE (gnome_canvas_rect_get_type ())
-
-enum {
-	ARG_0,
-	ARG_PIXBUF,
-	ARG_X,
-	ARG_Y
-};
-
-enum {
-	CLICKED,
-	LAST_SIGNAL
-};
-
-static void e_summary_title_button_destroy (GtkObject *object);
-static void e_summary_title_button_set_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_get_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class);
-static void e_summary_title_button_init (ESummaryTitleButton *estb);
-static double e_summary_title_button_point (GnomeCanvasItem *item,
-					    double x,
-					    double y,
-					    int cx,
-					    int cy,
-					    GnomeCanvasItem **actual_item);
-static void e_summary_title_button_update (GnomeCanvasItem *item,
-					   double affine[6],
-					   ArtSVP *clip_path,
-					   gint flags);
-static void e_summary_title_button_draw (GnomeCanvasItem *item,
-					 GdkDrawable *drawable,
-					 int x, int y,
-					 int width, int height);
-static gint e_summary_title_button_event (GnomeCanvasItem *item,
-					  GdkEvent *event);
-
-static GnomeCanvasRectClass *parent_class;
-static guint estb_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitleButtonPrivate {
-	GdkPixbuf *pixbuf;
-	double x, y;
-	int width, height;
-
-	int in_button : 1;
-	int button_down : 1;
-};
-
-static void
-e_summary_title_button_destroy (GtkObject *object)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	if (priv == NULL)
-		return;
-	
-	gdk_pixbuf_unref (priv->pixbuf);
-	
-	g_free (priv);
-	estb->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_title_button_set_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	gboolean update = FALSE;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		if (priv->pixbuf)
-			gdk_pixbuf_unref (priv->pixbuf);
-		
-		priv->pixbuf = GTK_VALUE_POINTER (*arg);
-		gdk_pixbuf_ref (priv->pixbuf);
-		
-		priv->width = gdk_pixbuf_get_width (priv->pixbuf);
-		priv->height = gdk_pixbuf_get_height (priv->pixbuf);
-		
-		update = TRUE;
-		break;
-		
-	case ARG_X: 
-		priv->x = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	case ARG_Y:
-		priv->y = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	default:
-		break;
-		
-	}
-	
-	if (update)
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (estb));
-	
-}
-
-static void
-e_summary_title_button_get_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = priv->pixbuf;
-		break;
-		
-	case ARG_X:
-		GTK_VALUE_DOUBLE (*arg) = priv->x;
-		break;
-		
-	case ARG_Y:
-		GTK_VALUE_DOUBLE (*arg) = priv->y;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-		
-	}
-}
-
-static void
-e_summary_title_button_init (ESummaryTitleButton *estb)
-{
-	estb->private = g_new0 (ESummaryTitleButtonPrivate, 1);
-}
-
-static void
-e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass *) estb_class;
-	item_class = (GnomeCanvasItemClass *) estb_class;
-	
-	object_class->destroy = e_summary_title_button_destroy;
-	object_class->set_arg = e_summary_title_button_set_arg;
-	object_class->get_arg = e_summary_title_button_get_arg;
-	
-	item_class->draw = e_summary_title_button_draw;
-	item_class->point = e_summary_title_button_point;
-	item_class->update = e_summary_title_button_update;
-	item_class->event = e_summary_title_button_event;
-	
-	gtk_object_add_arg_type ("ESummaryTitleButton::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("ESummaryTitleButton::x",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_X);
-	gtk_object_add_arg_type ("ESummaryTitleButton::y",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_Y);
-	estb_signals[CLICKED] = gtk_signal_new ("clicked", GTK_RUN_LAST,
-						object_class->type,
-						GTK_SIGNAL_OFFSET (ESummaryTitleButtonClass,
-								   clicked),
-						gtk_marshal_NONE__NONE,
-						GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, estb_signals, LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE (e_summary_title_button, "ESummaryTitleButton", 
-	     ESummaryTitleButton, e_summary_title_button_class_init,
-	     e_summary_title_button_init, PARENT_TYPE);
-
-static double
-e_summary_title_button_point (GnomeCanvasItem *item,
-			      double x,
-			      double y,
-			      int cx,
-			      int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double d = 1.0;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (x >= priv->x && x <= priv->x + gdk_pixbuf_get_width (priv->pixbuf)
-	    && y >= priv->y && y <= priv->y + gdk_pixbuf_get_height (priv->pixbuf)) {
-		d = 0.0;
-		*actual_item = item;
-	}
-
-	return d;
-}
-
-static void
-get_bounds (ESummaryTitleButton *estb,
-	    double *px1, double *py1,
-	    double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	int cx1, cy1, cx2, cy2;
-	
-	item = GNOME_CANVAS_ITEM (estb);
-	priv = estb->private;
-	
-	x1 = priv->x;
-	y1 = priv->y;
-	x2 = x1 + priv->width;
-	y2 = y1 + priv->height;
-	
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &x2);
-	gnome_canvas_w2c (item->canvas, x1, y1, &cx1, &cy1);
-	gnome_canvas_w2c (item->canvas, x2, y2, &cx2, &cy2);
-	
-	*px1 = cx1;
-	*py1 = cy1;
-	*px2 = cx2;
-	*py2 = cy2;
-}
-
-static void
-e_summary_title_button_update (GnomeCanvasItem *item,
-			       double affine[6],
-			       ArtSVP *clip_path,
-			       gint flags)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	get_bounds (estb, &x1, &y1, &x2, &y2);
-	gnome_canvas_update_bbox (item, (int) x1, (int) y1, (int) x2, (int) y2);
-}
-
-static void
-e_summary_title_button_draw (GnomeCanvasItem *item,
-			     GdkDrawable *drawable,
-			     int x, int y,
-			     int width, int height)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double i2w[6], w2c[6], i2c[6];
-	int x1, x2, y1, y2;
-	ArtPoint i1, i2;
-	ArtPoint c1, c2;
-	GdkGC *gc;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->draw)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->draw) (item, drawable, x, y, width, height);
-	
-	gnome_canvas_item_i2w_affine (item, i2w);
-	gnome_canvas_w2c_affine (item->canvas, w2c);
-	art_affine_multiply (i2c, i2w, w2c);
-	
-	i1.x = priv->x;
-	i1.y = priv->y;
-	i2.x = i1.x + priv->width + 4;
-	i2.y = i1.y + priv->height + 4;
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-	x1 = c1.x;
-	y1 = c1.y;
-	x2 = c2.x;
-	y2 = c2.y;
-	
-	gc = gdk_gc_new (item->canvas->layout.bin_window);
-	gdk_draw_rectangle (drawable, gc,
-			    FALSE, x1 - x,
-			    y1 - y,
-			    x2 - x1,
-			    y2 - y1);
-	gdk_gc_unref (gc);
-	
-	gdk_pixbuf_render_to_drawable_alpha (priv->pixbuf,
-					     drawable,
-					     0, 0,
-					     x1 + 2, y1 + 2,
-					     priv->width, priv->height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     127,
-					     GDK_RGB_DITHER_NORMAL,
-					     0, 0);
-}
-
-static gint
-e_summary_title_button_event (GnomeCanvasItem *item,
-			      GdkEvent *event)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-
-	switch (event->type) {
-	case GDK_ENTER_NOTIFY:
-		priv->in_button = TRUE;
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		priv->in_button = FALSE;
-		break;
-
-	case GDK_BUTTON_PRESS:
-		if (priv->in_button) {
-			priv->button_down = TRUE;
-			gnome_canvas_item_grab (item,
-						GDK_LEAVE_NOTIFY_MASK |
-						GDK_ENTER_NOTIFY_MASK |
-						GDK_POINTER_MOTION_MASK |
-						GDK_BUTTON_RELEASE_MASK,
-						NULL, event->button.time);
-		}
-		break;
-	
-	case GDK_BUTTON_RELEASE:
-		priv->button_down = FALSE;
-		gnome_canvas_item_ungrab (item, event->button.time);
-
-		if (priv->in_button) {
-			gtk_signal_emit (GTK_OBJECT (estb), estb_signals[CLICKED]);
-		}
-		break;
-		
-	default:
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h
deleted file mode 100644
index a99a96815a..0000000000
--- a/executive-summary/widgets/e-summary-title-button.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-button.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_TITLE_BUTTON_H__
-#define _E_SUMMARY_TITLE_BUTTON_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLE_BUTTON_TYPE (e_summary_title_button_get_type ())
-#define E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButton))
-#define E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButtonClass))
-#define IS_E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-#define IS_E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-
-typedef struct _ESummaryTitleButtonPrivate ESummaryTitleButtonPrivate;
-typedef struct _ESummaryTitleButton ESummaryTitleButton;
-typedef struct _ESummaryTitleButtonClass ESummaryTitleButtonClass;
-
-struct _ESummaryTitleButton {
-	GnomeCanvasRect parent;
-	
-	ESummaryTitleButtonPrivate *private;
-};
-
-struct _ESummaryTitleButtonClass {
-	GnomeCanvasRectClass parent_class;
-	
-	void (*clicked) (ESummaryTitleButton *estb);
-};
-
-GtkType e_summary_title_button_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c
deleted file mode 100644
index a5c5178a80..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-titlebar.h"
-#include "e-summary-title-button.h"
-
-/* XPMS */
-#include "edit.xpm"
-#include "x.xpm"
-#include "shade.xpm"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-enum {
-	ARG_0,
-	ARG_TEXT,
-	ARG_WIDTH,
-	ARG_HEIGHT
-};
-
-enum {
-	EDIT,
-	SHADE,
-	CLOSE,
-	LAST_SIGNAL
-};
-
-static void e_summary_titlebar_destroy (GtkObject *object);
-static void e_summary_titlebar_class_init (GtkObjectClass *object_class);
-static void e_summary_titlebar_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-static guint titlebar_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitlebarPrivate {
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *titletext;
-	
-	GnomeCanvasItem *edit;
-	GnomeCanvasItem *shade;
-	GnomeCanvasItem *close;
-	
-	char *text;
-	double width, height;
-};
-
-static void
-e_summary_titlebar_destroy (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	titlebar->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[EDIT]);
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[SHADE]);
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[CLOSE]);
-}
-
-static void
-e_summary_titlebar_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvasGroup *group;
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	GdkPixbuf *pb;
-	EFont *font;
-	int font_height;
-	
-	group = GNOME_CANVAS_GROUP (item);
-	titlebar = E_SUMMARY_TITLEBAR (item);
-	priv = titlebar->private;
-	
-	font = e_font_from_gdk_font (GTK_WIDGET (item->canvas)->style->font);
-	font_height = e_font_height (font);
-	priv->height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-	
-	priv->rect = gnome_canvas_item_new (group,
-					    gnome_canvas_rect_get_type (),
-					    "x1", 0.0,
-					    "y1", 0.0,
-					    "y2", (double) priv->height,
-					    "x2", priv->width, 
-					    "fill_color_rgba", 0x88AAFFFF,
-					    NULL);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) x_xpm);
-	priv->close = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - TITLEBAR_BORDER_WIDTH - 18,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) shade_xpm);
-	priv->shade = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 2) - 36,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->shade), "clicked",
-			    GTK_SIGNAL_FUNC (shade_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) edit_xpm);
-	priv->edit = gnome_canvas_item_new (group,
-					    e_summary_title_button_get_type (),
-					    "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 3) - 54,
-					    "y", (double) TITLEBAR_BORDER_WIDTH,
-					    "pixbuf", pb,
-					    NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_cb), titlebar);
-	
-	priv->titletext = gnome_canvas_item_new (group,
-						 e_text_get_type (),
-						 "text", priv->text,
-						 "font_gdk", GTK_WIDGET (item->canvas)->style->font,
-						 "clip_width", (double) priv->width - 
-						 (TITLEBAR_BORDER_WIDTH*4)- 50,
-						 "clip_height", (double) e_font_height (font),
-
-						 "clip", TRUE,
-						 "use_ellipsis", TRUE,
-						 "fill_color", "black",
-						 "anchor", GTK_ANCHOR_NW,
-						 "draw_background", FALSE,
-						 NULL);
-	gnome_canvas_item_move (priv->titletext, TITLEBAR_BORDER_WIDTH,
-				(priv->height - font_height) / 2);
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_titlebar_unrealize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_titlebar_set_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		if (priv->text)
-			g_free (priv->text);
-		
-		priv->text = g_strdup (GTK_VALUE_STRING (*arg));
-		
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "text", priv->text,
-					       NULL);
-		break;
-		
-	case ARG_WIDTH:
-		priv->width = GTK_VALUE_DOUBLE (*arg);
-		
-		if (priv->rect)
-			gnome_canvas_item_set (priv->rect,
-					       "x2", priv->width,
-					       NULL);
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "clip_width", priv->width - 
-					       (TITLEBAR_BORDER_WIDTH* 4) - 42,
-					       NULL);
-		break;
-		
-	default:
-		break;
-	}
-}
-
-static void
-e_summary_titlebar_get_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = priv->text;
-		break;
-		
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = priv->width;
-		break;
-		
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = priv->height;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static gint
-e_summary_titlebar_event (GnomeCanvasItem *item,
-			  GdkEvent *event)
-{
-	if (event->type == GDK_2BUTTON_PRESS &&
-	    event->button.button == 1) {
-		gtk_signal_emit (GTK_OBJECT (item), titlebar_signals[SHADE]);
-		return FALSE;
-	} else {
-		return TRUE;
-	}
-}
-
-static double
-e_summary_titlebar_point (GnomeCanvasItem *item,
-			  double x,
-			  double y,
-			  int cx,
-			  int cy,
-			  GnomeCanvasItem **actual_item)
-{
-	ESummaryTitlebar *est;
-	ESummaryTitlebarPrivate *priv;
-	GnomeCanvasItem *ret_item;
-	double d;
-
-	est = E_SUMMARY_TITLEBAR (item);
-	priv = est->private;
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->edit)->klass)->point) (priv->edit,
-						       x, y, 
-						       cx, cy,
-						       &ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->shade)->klass)->point) (priv->shade,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS
-	     (GTK_OBJECT (priv->close)->klass)->point) (priv->close,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	*actual_item = item;
-	return 0.0;
-}
-
-static void
-e_summary_titlebar_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class;
-	
-	item_class = (GnomeCanvasItemClass *) object_class;
-	
-	object_class->destroy = e_summary_titlebar_destroy;
-	object_class->set_arg = e_summary_titlebar_set_arg;
-	object_class->get_arg = e_summary_titlebar_get_arg;
-	
-	item_class->realize = e_summary_titlebar_realize;
-	item_class->unrealize = e_summary_titlebar_unrealize;
-	item_class->event = e_summary_titlebar_event;
-	item_class->point = e_summary_titlebar_point;
-	
-	gtk_object_add_arg_type ("ESummaryTitlebar::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE,
-				 ARG_TEXT);
-	gtk_object_add_arg_type ("ESummaryTitlebar::width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_WIDTH);
-	gtk_object_add_arg_type ("ESummaryTitlebar::height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE,
-				 ARG_HEIGHT);
-	
-	titlebar_signals[EDIT] = gtk_signal_new ("edit", GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								    edit),
-						 gtk_marshal_NONE__NONE,
-						 GTK_TYPE_NONE, 0);
-	titlebar_signals[SHADE] = gtk_signal_new ("shade", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     shade),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	titlebar_signals[CLOSE] = gtk_signal_new ("close", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     close),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, titlebar_signals,
-				      LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_titlebar_init (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	titlebar->private = g_new0 (ESummaryTitlebarPrivate, 1);
-	priv = titlebar->private;
-	
-	priv->width = 100.0;
-	priv->text = NULL;
-	
-	gdk_rgb_init ();
-}
-
-E_MAKE_TYPE (e_summary_titlebar, "ESummaryTitlebar", ESummaryTitlebar,
-	     e_summary_titlebar_class_init, e_summary_titlebar_init,
-	     PARENT_TYPE);
-
diff --git a/executive-summary/widgets/e-summary-titlebar.h b/executive-summary/widgets/e-summary-titlebar.h
deleted file mode 100644
index b748a4dc8b..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_TITLEBAR_H__
-#define _E_SUMMARY_TITLEBAR_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLEBAR_TYPE (e_summary_titlebar_get_type ())
-#define E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebar))
-#define E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebarClass))
-#define IS_E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-#define IS_E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-
-typedef struct _ESummaryTitlebarPrivate ESummaryTitlebarPrivate;
-typedef struct _ESummaryTitlebar ESummaryTitlebar;
-typedef struct _ESummaryTitlebarClass ESummaryTitlebarClass;
-
-struct _ESummaryTitlebar {
-  GnomeCanvasGroup parent;
-
-  ESummaryTitlebarPrivate *private;
-};
-
-struct _ESummaryTitlebarClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close) (ESummaryTitlebar *window);
-  void (*shade) (ESummaryTitlebar *window);
-  void (*edit) (ESummaryTitlebar *window);
-};
-
-GtkType e_summary_titlebar_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/edit.xpm b/executive-summary/widgets/edit.xpm
deleted file mode 100644
index 7f2deb1525..0000000000
--- a/executive-summary/widgets/edit.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * edit_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-"              ",
-"     ...      ",
-"    .   .     ",
-"    .   .     ",
-"        .     ",
-"        .     ",
-"      ..      ",
-"      ..      ",
-"      ..      ",
-"              ",
-"      ..      ",
-"      ..      ",
-"              "};
diff --git a/executive-summary/widgets/esummary-window-test.c b/executive-summary/widgets/esummary-window-test.c
deleted file mode 100644
index 3a0ad0ab6b..0000000000
--- a/executive-summary/widgets/esummary-window-test.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-summary-subwindow.h"
-#include "e-summary-titlebar.h"
-
-void
-close_test (GtkWidget *widget,
-	    gpointer data)
-{
-  gtk_main_quit ();
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  GtkWidget *window, *canvas;
-  ESummarySubwindow *subwindow;
-  GtkWidget *control;
-
-  gnome_init ("Executive Summary Subwindow Test", "1.0", argc, argv);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (close_test), NULL);
-
-  canvas = e_canvas_new ();
-
-  subwindow = e_summary_subwindow_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas)->root), 100, 100);
-
-  control = gtk_button_new_with_label ("A big button");
-  gtk_widget_set_usize (control, 400, 200);
-
-  e_summary_subwindow_add (subwindow, control); 
-  gtk_widget_show (control);
-
-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 1000.0, 1300.0); 
-  gtk_container_add (GTK_CONTAINER (window), canvas);
-  gtk_widget_show_all (window);
-
-  gtk_main ();
-
-  exit(0);
-}
diff --git a/executive-summary/widgets/shade.xpm b/executive-summary/widgets/shade.xpm
deleted file mode 100644
index 349212e906..0000000000
--- a/executive-summary/widgets/shade.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * shade_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ............ ",
-" ............ ",
-" ............ ",
-" ............ ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" ............ ",
-"              "};
diff --git a/executive-summary/widgets/x.xpm b/executive-summary/widgets/x.xpm
deleted file mode 100644
index ce9e9f19dc..0000000000
--- a/executive-summary/widgets/x.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * x_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ..        .. ",
-" ...      ... ",
-"  ...    ...  ",
-"   ...  ...   ",
-"    ......    ",
-"     ....     ",
-"     ....     ",
-"    ......    ",
-"   ...  ...   ",
-"  ...    ...  ",
-" ...      ... ",
-" ..        .. ",
-"              "};
diff --git a/filter/.cvsignore b/filter/.cvsignore
deleted file mode 100644
index 7c13af9a14..0000000000
--- a/filter/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.la
-*.lo
-.libs
-.deps
-.pure
-Makefile
-Makefile.in
-filter-driver
-filter-editor
diff --git a/filter/ChangeLog b/filter/ChangeLog
deleted file mode 100644
index 382b815c4c..0000000000
--- a/filter/ChangeLog
+++ /dev/null
@@ -1,1534 +0,0 @@
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* filter-rule.c (filter_rule_clone): New function to clone rules.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* filtertypes.xml: Added mailing list matching rules.
-	renamed mailing list options to be more meaningful.
-
-	* vfoldertypes.xml: Added mailing list rules.
-	renamed mailing list options to be more meaningful.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* filter.glade.h: removed.
-	* filter.glade: do not donnt output to above one.
-	* Makefile.am: do not include filter.glade.h in EXTRA_DIST.
-
-2001-02-06  Dan Winship  <danw@ximian.com>
-
-	* filter-option.c (get_widget): Translate the option title.
-	(Noticed by Kjartan).
-
-2001-02-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-code.c, filter-colour.c, filter-context.c,
-	filter-element.c, filter-input.c, filter-score.c,
-	filter-system-flag.c, filter-url.c: Add #include <config.h>
-	and mark some strings for translation.
-	
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* filter-message-search.[ch]: Removed, now lives in
-	camel-filter-search.*
-
-	* Makefile.am (libfilter_la_SOURCES): Removed filter-driver.[ch]
-	and filter-message-search.[ch].
-
-	* filter-driver.[ch]: Removed.  now lives in camel-filter-driver.*
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-driver.c (filter_driver_filter_message): Set the delete
-	bit *before* copying to the default folder.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-filter.c (less_parts): Er, don't set the button
-	insensitive if there is *1* action, set it insensitive if there
-	are less than or equal to *1* actions. Doh!
-	(more_parts): Only set the remove button sensitive if there is
-	more than 1 action.
-	(get_widget): Here too.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* e-search-bar.[ch]: Moved ESearchBar to $(toplevel)/widgets/misc,
-	a more appropriate home.  Bug #1060.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-driver.c (do_copy): Moved p->copied to the inner part of
-	the loop so that in the case of a folder not existing, it doesn't
-	think that the message was already copied to some place and thus
-	not save it to the Inbox.
-	(do_move): Same.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Changed Priority to Score.
-
-	* filter-option.c (get_widget): Attach to the "activate" signal -
-	this should now make it so that a filter-option will "remember"
-	what a user changed.
-
-	* filter-system-flag.c (get_widget): Don't reset fsf->value to the
-	first system flag, this should already be defaulted to the
-	appropriate flag. This should fix the problem of always defaulting
-	to the first menu option and thus "forgetting" the user's settings.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-system-flag.c: comment out some of the system flags as we
-	don't want to use them.
-	(xml_encode): Update the printf
-	(get_widget): Use strcmp instead of g_strcasecmp.
-
-2001-01-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-input.c (xml_encode): Encode utf8
-	(xml_decode): Decode utf8
-
-	* filter-option.c (xml_create): Decode utf8
-
-	* filter-part.c (filter_part_xml_create): Decode utf8
-
-	* filter_rule.c (xml_encode): Encode utf8
-	(xml_decode): Decode utf8
-	
-2001-01-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (do_flag): Set the 'dirty' flag - this should
-	fix the problem of flags not being set (or, more precisely,
-	synced).
-	(filter_driver_filter_message): Here too.
-
-2000-12-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (header_contains): Use
-	e_utf8_strstrcase() instead of just strstr().
-	(header_starts_with): Make sure that the header contents are
-	longer than the starts-with string.
-
-	* vfoldertypes.xml: Don't send \"Subject\" to body-contains.
-	Also added matches, starts-with, and ends-with xml stuff.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* filter-message-search.c (handle_multipart, body_contains,
-	body_regex): Use CamelContentType rather than GMimeContentField.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-21  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (filter_message_search): And here too.
-
-	* filter-driver.c (filter_driver_finalise): Kind of revert an
-	accidentally commited patch for e_sexp_unref.
-
-2000-12-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Oops, slight
-	logic error. We want to copy the message to the default folder if
-	the message hasn't been Moved (which is the same as Copied &&
-	Deleted). This fixes bug #1007.
-
-	* filter-rule.c (more_parts): Make sure we have more than 1 part
-	before we sensitize the "remove" button.
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (filter_message_search): Oops, missed a
-	gtk unref of the now-no-longer gtk e_sexp.
-
-	* filter-driver.c: Remove mail_tool_lock stuff.
-	(filter_driver_finalise): unref e_sexp properly.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c (esb_pack_menubar): Fixed some warnings.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-folder.c (button_clicked): Added a kludge, 'is_active'
-	which is a static variable that holds whether or not there is an
-	active shell folder dialog up or not.
-
-	* vfolder-editor.c (rule_delete): Autoselect the rule that ends up
-	in the same position (or the one above it if the list is shorter
-	than the position).
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-rule.c (get_widget): Don't highlight the title if it's
-	"Untitled" because switching widget focus doesn't cause this
-	selection to go away.
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* filter-editor.c: Mark some strings for translation.
-	
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-element.c (filter_element_new_type_name): Added support
-	for the system-flag type.
-
-	* Makefile.am: Added filter-system-flag.[c,h].
-
-	* filter-system-flag.[c,h]: New type for system flags.
-
-	* filtertypes.xml: Oops, looks like we were still using integers
-	as arguments to set-flag. Change over to using strings which are
-	safer and also change the name to set-system-flag.
-
-	* filter-driver.c (do_flag): Use strings instead of integers.
-	Instead of set-flag, the callback is now set-system-flag for less
-	confusion. Sorry Ettore, but you'll have to change your filters.
-
-	* filtertypes.xml: Added system-flags stuff.
-
-	* vfoldertypes.xml: And here too.
-
-	* filter-message-search.c (system_flag): New ESExp callback for
-	filtering on system flags.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Use
-	camel_message_info_free() instead of freeing everything by hand -
-	is this a new function? I don't ever recall seeing this
-	before. Also use my new function,
-	camel_message_info_new_from_header - ahhh... this code is now so
-	beatiful. Okay, I'm done.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Update to use
-	EStrv in appropriate places (wrapped with #ifdef DOESTRV for the
-	moment).
-
-2000-11-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Moved the regex filter rule around - we've
-	changed the format a bit.
-
-	* filter-option.c (option_activate): Removed.
-	(get_widget): Don't connect the activate signal.
-
-	* filter-folder.c (validate): Updated.
-
-	* filter-datespec.c (validate): Updated.
-
-	* filter-part.c (filter_part_validate): Updated.
-
-	* filter-input.c (validate): Check the filter-input type - if it's
-	of type "regex", then check for regex validity.
-
-	* filter-element.c (filter_element_validate): No longer takes a
-	gpointer argument.
-	(filter_element_new_type_name): Allow type "regex" and create a
-	new filter-input with type "regex".
-
-2000-11-24  Michael Meeks  <michael@helixcode.com>
-
-	* filter-message-search.c (get_full_header): impl.
-	(header_full_regex): use it.
-
-2000-11-23  Michael Meeks  <michael@helixcode.com>
-
-	* filter-message-search.c (header_full_regex): impl.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-message-search.c: took out some no longer needed
-	printfs.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_folder): Sync here
-	instead.
-	(filter_driver_filter_mbox): And here too.
-	(filter_driver_finalise): Don't sync here afterall - it's more
-	preferable to sync right after processing.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_finalise): Sync the
-	defaultfolder.
-	(filter_driver_filter_folder): Sync here instead.
-	(filter_driver_filter_mbox): And here too.
-
-2000-11-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (header_matches): Neglect any leading
-	whitespace in the header contents.
-	(header_starts_with): Same.
-	(header_ends_with): Same.
-	(header_soundex): Same.
-
-2000-11-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): If there is a
-	default folder and the message hasn't been deleted then... should
-	be: If there is a default folder and the message hasn't been
-	copied to another folder and the message hasn't been deleted...
-	(filter_driver_filter_message): Make it so that the FILTER_LOG_END
-	is only called if filtered were applied to the message so we don't
-	get huge gaps of whitespace in the log file.
-	(filter_driver_filter_message): 
-
-2000-11-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c: Made the underline show up properly in the main
-	menu bar.
-
-2000-11-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.c: Switched from using gtk_menu_item_new_with_label
-	for the menu header to using gnome_stock_menu_item.
-
-2000-11-08  Anna Marie Dirks  <anna@helixcode.com>
-	* e-search-bar.c: Fixed two spacing problems: first, changed
-	the spacing around the end of the text-entry widget so that 
-	the text entry is always aligned with the beginning of the scrollbar;
-	second, trimmed down the space between the widgets in the search bar.
-
-
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (do_flag): you shouldn't use an integer to
-	set the flag.  You should use a string, and look it up, because
-	the flag bits might change.
-	(filter_driver_filter_message): Can som e one PLEASE STOP
-	INDENTING THE CODE.  Even if i have to come over the and
-	beat it into you.  YOU DONT INDENT CODE ONCE ITS BEEN CHECKED IN
-	TO CVS, otherwise you SCREW UP THE DIFF's.  Can't you please
-	please learn this?
-	(filter_driver_log): Fixes for api changes to mime_message.
-
-2000-11-05  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-message-search.c (get_sent_date): Fix for date change
-	api.  No longer need to encode/decode the date, after its been
-	encoded/ecoded already.
-	(get_received_date): Likewise.
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-search-bar.h: Fixed the argument comment.  Removed an old enum
-	that's not used here.
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-search-bar.c and e-search-bar.h.
-
-	* e-search-bar.c, e-search-bar.h: Moved this from
-	e-addressbook-search.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_log): Fix for when 'desc' is
-	NULL.
-	(filter_driver_filter_message): Use a more user-friendly filter
-	name in the log file.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Use
-	filter_driver_log() where appropriate.
-	(do_copy): Use the service url for the path rather than the
-	folder->full_name because that'll only get you a "/mbox" which is
-	entirely useless. Replace occurences of report_status with
-	filter_driver_log.
-	(do_move): Same.
-	(report_status): Don't use this for logging anymore, use only for
-	reporting the status back to the caller.
-	(filter_driver_log): Renamed from filter_driver_status_log. Now
-	ONLY handles file logging and is for INTERNAL USE ONLY.
-	(do_flag): Replace occurences of report_status with
-	filter_driver_log.
-	(do_score): Same.
-	(do_colour): Same.
-	(do_stop): Same.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-datespec.c (validate): Check to make sure the user has
-	entered a valid date.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to select "sounds
-	like" or "does not sound like" (uses header-soundex).
-
-	* filter-message-search.c (header_matches): Oops. Should be using
-	!g_strncasecmp. This should fix it so this filter match works
-	right.
-	(header_starts_with): Same.
-	(header_ends_with): Same.
-	(header_soundex): New filter callback for soundex matching (yes,
-	it's probably a bloated feature but hey, it was fun to code)
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-folder.c (validate): Override the default validate
-	function to only return TRUE if a folder has been selected.
-
-	* filter-editor.c (rule_add): Validate that all the rule parts and
-	action parts are correctly filled in.
-	(rule_edit): Same.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to add an action to set message flags.
-
-	* filter-driver.c (do_flag): New callback to set message info
-	flags.
-
-	* filter-element.c (filter_element_set_data): New convenience
-	function to set the data on a FilterElement.
-
-	* filter-url.c (get_widget): Set the sources list to point to the
-	FilterElement data.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* filter-rule.c (get_widget): Do not pad around the Name hbox;
-	its parent already has spacing.  
-	Do not pad around the inframe's children; the inframe already has
-	spacing.
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-option.c (option_activate): If a regex option is
-	selected, change the FilterElement data to TRUE else set to FALSE.
-
-	* filter-rule.c (more_parts): Validate the previously entered
-	FilterPart before allowing the user to add a new FilterPart.
-
-	* filter-part.c (filter_part_validate): New convenience function
-	to validate an entire FilterPart expression.
-
-	* filter-input.c (validate): Validate the entry text if it
-	contains a regular expression.
-
-	* filter-element.[c,h]: New virtual function to validate the
-	contents of the FilterElement (useful for regex and sexp).
-	(filter_element_validate): You get the idea...	
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-input.c: 
-	* filter-option.c: 
-	* filter-part.c: Pure formatting changes, no actual code
-	changes. Since I know I'm going to get flamed for this, I'm sorry
-	but I'll probably have to modify code in these files and it's
-	easier if the code is quickly readable by me.
-
-	* filter-rule.c (get_widget): Set the "remove" button insensitive
-	for <= 1 instead of == 1.
-
-2000-10-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Copy the message
-	to the default folder if it wasn't marked as deleted.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added header-starts-with, header-ends-with, and
-	header-exists menu items.
-
-	* filter-message-search.c (header_starts_with): New callback to
-	match the beginnings of headers.
-	(header_ends_with): New callback to match the ends of headers.
-	(header_exists): New callback to determine if a header exists
-	which is useful when filtering out all those pesky bug-buddy
-	emails!
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Add header-matches expressions ("is" / "is not").
-
-	* filter-message-search.c (header_matches): New callback to match
-	headers exactly (aka strcmp rather than strstr).
-
-2000-10-27  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): divide before
-	multiple so that we don't overflow.
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Fixed this to include EXTRA_GNOME_CFLAGS.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (do_move): Don't mark as deleted here, otherwise
-	the message will have the DELETED flag set in the folder it's
-	being moved to.
-	(do_delete): Don't set the DELETED flag here either...we'll only
-	set it at the very end of the filtering process.
-	(filter_driver_filter_message): Set the DELETED flag after all
-	processing is completed.
-
-2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Readded Source url stuff.
-
-	* filter-element.c (filter_element_new_type_name): Added url stuff
-	back in.
-
-	* filter-url.[c,h]: Back from the dead...
-
-	* Makefile.am: Re-added filter-url.[c,h].
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added option menu items to allow searching
-	based on regular expressions.
-
-	* filter-message-search.c (body_regex): New callback to match text
-	in the body using regex.
-	(body_contains): Modified to only match using strstr.
-	(header_regex): New callback to match headers using regex.
-	(header_contains): Modified to only match using strstr.
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Take out the reference to "Source".
-
-	* filter-element.c (filter_element_new_type_name): Remove
-	filter-url code.
-
-	* filter-url.[c,h]: What was I smoking? There's no good reason to
-	filter on source urls as there are other ways to get the same
-	effect. Thanks to both Zucchi and Miguel for helping me see this
-	:-)
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Fixed NULL in fprintf.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libfilter-i18n.h): Build a fake header file with
-	the titles from the xml files, for translation purposes.
-
-	* filter-rule.c (get_rule_part_widget): Call _() on the rule's
-	title.
-
-	* filter-option.c (get_widget): Call _() on the option's title.
-
-	* filter.glade: Turn on translatable strings.
-
-	* libfilter-i18n.h, filter.glade.h: Translatable string files.
-
-	* add #include <config.h> to a bunch of C files so that _()
-	actually does anything. Undo some UTF8 frobs since we're now
-	dealing in localized strings.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-filter.c (less_parts): Set the remove button insensitive
-	if there is only 1 action left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more actions).
-	(get_widget): If there is only 1 action, disable the remove
-	button.
-
-	* filter-rule.c (xml_encode): If there is a defined source, don't
-	set it to "incoming", set it to whatever the source is!
-	(less_parts): Set the remove button insensitive if there is only 1
-	criterion left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more criterion).
-	(get_widget): If there is no name for the filter then set it to
-	"Untitled", highlight it, and grab the focus. If there is only 1
-	criterion, disable the remove button.
-
-	* filter-editor.c, vfolder-editor.c: GUI fixes here and there as
-	well as some consistancy fixes between them.
-
-	* filter-driver.c (filter_driver_filter_mbox): Updated to send the
-	source url to filter_driver_filter_message()
-	(filter_driver_filter_folder): Updated to send the source url of
-	the folder to filter_driver_filter_message()
-	(filter_driver_filter_message): Now takes a source_url argument
-	that represents the url of the folder the message is coming from
-	(so that we may filter based upon that information).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter.glade: Fixed these widgets to resize properly.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Remove the "demand" source from the list.
-
-	* filter.glade: Remove the "On Demand" option and replace it with
-	an "Outgoing" option.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-part.c, filter-rule.c, rule-context.c, score-editor.c,
-	vfolder-editor.c: Fixed these widgets to resize properly.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added filter-url.[c,h].
-
-	* filter-message-search.c (get_source): New callback to get the
-	source url of the message being filtered.
-	(filter_message_search): Now takes a source argument.
-
-	* filter-element.c (filter_element_new_type_name): Added code to
-	handle URL types.
-
-	* filter-url.[c,h]: New filter object to handle URLs (ie in the
-	case of filtering on source url). FIXME: find a way to populate
-	the source combo box (including mail-config.h breaks the build in
-	the addressbook - how does including mail-tools.h not break the
-	build???)
-
-	* filtertypes.xml: Added the source filter type and added the
-	move-to action.
-
-	* filter-driver.c (do_move): New callback, a "Copy" action should
-	just copy the message to another location while a Move should both
-	copy the message to a new location and delete it from the source
-	location.
-	(do_delete): Set the deleted flag on the message info.
-	(filter_driver_filter_message): Now returns void as we don't care
-	if it was copied or not in the caller functions. Also check the
-	CamelMessageInfo being passed in - if the message has been marked
-	as deleted prior to being filtered, then return immediately as we
-	don't want to apply filter actions to deleted messages.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_folder): Start fetching at
-	1, not 0.
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): Report the
-	percentage of file complete for the filter.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Why on earth does this code
-	ref all these objects for?  This is not right at all.
-	(filter_driver_run): Changed source type to a string.
-	(filter_driver_run): REmove the very weird exception copying
-	stuff - just ref it instead.
-	(do_score): 
-	(do_colour): 
-	(do_stop): 
-	(do_copy): 
-	(mark_forward): 
-	(do_delete): Removed bogus 'terminated' testing.  This is NOT
-	NEEDED HERE.  It is tested after every rule/action, and
-	termination only makes sense at that point.
-	(filter_driver_filter_message): new funciton (renamed), filter
-	only a message.
-	(filter_driver_filter_mbox): Filter a whole mbox.
-	(filter_driver_run): If we aren't given an info, create a simple
-	one based on the message headers.
-	(filter_driver_filter_message): Renamed from filter_driver_run().
-	(filter_driver_set_status_func): Set the status callback function.
-	(filter_driver_set_default_folder): Set the default folder for
-	filtering.
-	(report_status): Internal function to report the status of a given
-	event.
-	(do_copy): Removed a pointless cache lookup - duh, we do it in
-	open_folder anyway (infact, we do it in camel too!!).
-	(filter_driver_filter_message): Removed pointless re-refing of
-	arguments.  Why would anyone think this could be any use at all?
-	(filter_driver_filter_folder): New function to filter a whole
-	folder.
-
-	* filter-editor.c (rule_add): api fixes.
-	(rule_edit): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): This didn't take into account the source, now it
-	does.
-	(select_source): Fix for api changes.  Changed the rather generic
-	'number' argument to be 'source', and a string.
-	(filter_editor_construct): Changed the 'number' to 'source', and
-	set the string appropriately.  Added a warning for one case where
-	the glade file is out of sync.
-
-	* score-editor.c (score_editor_construct): 
-	(rule_edit): 
-	(rule_delete): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): api fixes.
-
-	* vfolder-editor.c (set_sensitive): Api fixes.
-	(vfolder_editor_construct): 
-	(rule_edit): 
-	(vfolder_editor_construct): 
-
-	* rule-context.h (RCNextRuleFunc): Added a source argument.
-
-	* rule-context.c (rule_context_next_rule): Added source argument.
-	(rule_context_find_rule): Added source argument.
-	(rule_context_get_rank_rule): Added source argument.
-	(rule_context_get_rank_rule_with_source): Removed.
-	(save): Fixed for changes to RCNextRuleFunc prototype.
-
-	* filter-rule.h: Changed the source to be a string, removed the
-	filter_source_t type.
-
-	* filter-rule.c (filter_rule_set_source): New function to set the
-	source of a rule.  What idiot ran this code through indent?
-	(filter_rule_find_list): Added a source argument.
-	(filter_rule_next_list): Added a source argument.
-	(get_widget): Fixed the wording.  You dont remove search parts,
-	you can only remove the last one.  Why you even need to mention
-	they are search 'criteria' is beyond me.  Whoever added the
-	scrolled window needs to be shot, its the single most awful GUI
-	feature ever invented (ranks with the close button next to
-	maximise).
-	(xml_encode): Save source as a string (if present).
-	(xml_decode): Likewise for loading & fixed a small memleak.
-	(filter_rule_finalise): Free source.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (load): Remove the stupid on-demand cb shit.
-	(rule_context_load): And here too.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes an argument to
-	specify the log file (or NULL if logging is not to be performed).
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (gladedir, filterdir): Use $(datadir), not
-	$(prefix)/share.
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Modified to use more intuitive naming
-
-	* score-rule.c (xml_decode): Make sure the score is within our
-	range
-	(get_widget): Changed range to -3 to +3
-
-	* filter-score.c (get_widget): Changed range to -3 to +3
-	(xml_decode): Make sure the score is within our range
-
-	* filter-rule.c (get_widget): Rearranged widgets.
-
-	* filter-filter.c (get_widget): Rearranged widgets.
-
-	* filter-editor.c (filter_editor_construct): Updated to allow for
-	double-clicking on a rule to edit it.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-input.c, filter-message-search.c, filter-option.c,
-	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	Fixed the #include lines to deal properly with gal.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (body_contains): Modified to only match
-	text MIME parts in the message rather than the entire MIME message
-	(header_contains): Added regex matching
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* rule-context.c (d): 
-	* filter-datespec.c (d): Turn off debugging output.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: We now use a "copied" variable to record
-	whether a message was marked as copied or not instead of trying to
-	"guess" by looking at the folders hash table as that won't work at
-	all anymore.
-	(do_copy): Renamed as this is more appropriate now that it
-	actually copies the message rather than marking it for copying
-	later. Also fixed a logic error which prevented a message from
-	being dumped into a folder if the fodler had been previously
-	opened.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): No longer takes a
-	self_destruct argument.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Don't freeze/thaw the
-	default inbox here, let the caller freeze/thaw it. Don't destroy
-	the folders hash table here, it's faster if we wait till the
-	filter-driver is destroyed.
-	(filter_driver_finalise): Destroy the folders hash table here
-	(filter_driver_init): Initialize the folders hash table here
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Changed "Header" to be "Message header" so it's
-	not quite as confusing (??)
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to specify arbitrary
-	headers.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Fixed a logic error. Only
-	mark filtered as TRUE if it was successfully copied to another
-	folder, this means don't mark true if the default inbox is NULL.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Erm, okay I misunderstood
-	what camel_folder_[un]hook_event() did - we don't even need this
-	crap in the filter driver so lets take it completely out and let
-	the caller handle this junk.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to not emit the
-	folder_changed signal when a message is appended to the default
-	mailbox - lets leave that up to the caller so we don't queue up a
-	bunch of these emits if the caller is downloading messages for
-	example.
-
-2000-09-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added scoring xml stuffs
-	
-	* Makefile.am: added filter-score.[c,h]
-	
-	* filter-score.[c,h]: New functions to handle the "score" filter
-	type.
-	
-	* filter-element.c (filter_element_new_type_name): Added support
-	for "score" type.
-	
-	* filter-driver.c (do_score): New ESExp callback for filter
-	actions to set the score on a message.
-	
-	* filter-message-search.c (get_score): New ESExp callback for
-	getting the score tag as an integer value.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes a
-	CamelMessageInfo argument in preparation for handling scoring
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Modified to return a
-	boolean value specifying whether or not the message was filtered
-	into a folder other than the default. The default mailbox can now
-	also be specified as NULL if the message shouldn't be appended to
-	it in the case that it's not filtered into some other folder.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Rewrote - this shouldn't
-	need to be an async function
-
-	* filter-message-search.c (match_all): Modified to look at the
-	boolean value being fed to it and just to return that instead of
-	always returning TRUE
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c, filter-option.c:
-	* filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	More UTF-8 wrapping
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Totally rewritten to filter
-	a single message at a time instead of filtering a folder.
-
-	* filter-message-search.c (filter_message_search): New convenience
-	function for searching a message.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-folder.c: Use e_utf8 wrappers
-
-	* filter-input.c: Use e_utf8 wrappers
-
-	* filter-rule.c: Use e_utf8 wrappers
-	
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* filter-datespec.c (cal_day_selected): Set seltime.tm_isdst to
-	-1, not daylight, because the current dst value is not relevant to
-	the selected date.
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Unlink a new parameter, path_to_unlink,
-	if it is empty once the mail is filtered. Fixes a race in 
-	mail_tool_filter_contents_into.
-
-	* filter-driver.h: Update the prototype.
-
-2000-08-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* vfolder-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* score-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* rule-context.c (rule_context_add_rule_gui): Add translation
-	marks and use stock buttons.
-
-	* filter-part.c (main): Add translation marks and use
-	stock buttons.
-
-	* filter-folder.c (button_clicked): Add translation marks and use
-	stock buttons.
-
-	* filter-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* filter-rule.c (get_widget): Add translation marks.
-
-	* filter-filter.c (get_widget): Add translation marks.  Add
-	padding to make it look like the buttons in `filter-rule.c'.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	Implement filtering on demand.
-
-	* rule-context.h: Add a new callback to rule_context_load
-	that allows the caller to hook on-demand rules into its UI.
-
-	* rule-context.c (rule_context_load): Changed to pass the
-	extra parameters to load().
-	(load): If the rule is successfully loaded, call the provided
-	callback so that the UI can be updated.
-
-	* filter-editor.c (rule_add): Set the source of the new filter.
-	(rule_edit): Use the new rule_context_get_rank_rule_with_source()
-	so that we don't get a bad index into the GtkList.
-	(rule_delete): Same as above.
-	(rule_up): Same as above.
-	(rule_down): Same as above.
-	(select_source): New function. When the user changes the 
-	dropdown list to select a new source type, repopulate the
-	list with rules of the appropriate type.
-	(filter_editor_construct): Code moved from here into
-	select_source(). Hook up all the elements of the source optionmenu
-	to callbacks to select_source().
-
-	* filter-rule.c (xml_encode): Save the rule's source type.
-	(xml_decode): Load it. Default to 'incoming' if unspecified.
-
-	* filter-rule.h: New enumeration, _filter_source_t, the
-	specifies the rule's source. Add it to struct _FilterRule.
-	
-	* filter-driver.c (filter_driver_run): Add a new input,
-	sourcetype, that specifies which rules to run (only ones
-	with the same source will be run). struct filter_mail_input_t
-	changed to accomodate.
-	(do_filter_mail): Skip rules if they're not the specified source.
-	If source and dest are the same, don't delete the messages or
-	copy unnecessarily.
-
-	* filter.glade: Make the optionmenu sensitive. Change "Outgoing"
-	to "On Demand" (outgoing should be added later).
-	
-2000-08-15  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* vfoldertype.xml, filtertypes.xml: Add entries defining the
-	date-based message filtering and vfoldering.
-
-	* filter-datespec.{c,h}: New files implementing the UI for
-	date-based filtering and vfoldering -- specifically, choosing
-	what to compare the message to.
-
-	* filter-element,c: Hook up to create a datespec filter if
-	that's what's called for.
-
-	* Makefile.am: Build the new -datespec files.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): remove blank.xpm and check.xpm which
-	no longer exist. Add filter.glade.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (describe_filter_mail): Use
-	mail_tool_get_folder_name here too. (Hm... this directory really
-	shouldn't depend on stuff in mail/, but it already did. We'll have
-	to sort this out later.)
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Remove an '#if 0' that must
-	have been left in accidentally, so that messages which are copied
-	to other folders will not also be copied into the Inbox. Also,
-	#ifdef out the line that printfs the rule, because the rules are
-	often very large.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (do_colour): Use proper accessor function
-	instead of poking the structure.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c, filter-folder.c, rule-context.c,
-	vfolder-editor.c: Fixed some warnings.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Fix the infinite fetchmail.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Save the results of
-	searches till we're done.  So we dont have to go strduping strings
-	agian and again and again and again ...  Remove all the unecessary
-	strdups.
-	(do_colour): Implement.
-	(filter_driver_run): Change for append api change.
-	(free_key): Removed.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (rule_context_add_rule_gui): Helper function to
-	add a rule, but present a gui first, asking for confirmation/allow
-	editing.
-	(rule_context_add_rule_gui): Keep track of context so it isn't freed under us.
-
-	* filter-context.c (filter_context_create_action): Implement,
-	helper to aid filter generation.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (close_folder): Fix an accidental GTK unref
-	of a CamelObject.
-
-2000-08-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-folder.c (button_clicked): Use the base name of the
-	Evoluton URI for the button's label.
-	(get_widget): Likewise.
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (op_filter_mail): Conform to the new mail-threads
-	interface.
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* vfolder-editor.c (rule_add): Oops, create a vfolder_rule when we
-	add a new one.
-
-	* rule-context.c (load): If there are no user rules, dont bomb
-	out.
-
-2000-07-31  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-input.c (filter_input_set_value): Set value of a simple
-	type to a new string.
-
-	* filter-option.c (filter_option_set_current): New function to set
-	the current value of an option.
-
-	* filter-rule.c (filter_rule_find_list): New function to find a
-	rule in a list, by name.
-	(filter_rule_set_name): Let you set the name of a rule.
-
-	* rule-context.c (rule_context_find_rule): Find a rule by name.
-	(rule_context_create_part): Helper to find and clone a part by
-	name.
-
-	* filter-folder.c (button_clicked): Fix warning.
-
-	* filter.glade: Add new widgets for vfolder rule editor.
-	
-	* vfolder-context.c (vfolder_context_init): Changed to use vfolder
-	rule as the rule type.
-
-	* vfolder-rule.c: New class to encode extra information required
-	for vfolder rules.
-
-2000-07-30  Not Zed  <NotZed@HelixCode.com>
-
-	**  Almost a total rewrite of every file, except for filter-driver
-	which just had minor updates.
-
-	The rule format has changed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for
-	CamelFolder API changes. (delete_message and get_uids don't take
-	exceptions any more.)
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (cleanup_filter_mail): Use the exception
-	provided to us by the async manager instead of allocating
-	our own; use mail_tool_camel_lock_{up,down} around camel
-	operations.
-	(filter_driver_run): Make it return void.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Update to make "async".
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to reflect changes to
-	camel_folder_append_message ()
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* filter-xml.[ch]: add a "string" type
-
-	* filtertype.xml, vfoldertypes.xml: Use type="string" rather than
-	"folder" for subject/body matching.
-
-	* filter-arg-types.c: Update some strings for "text" input. Fix
-	some warnings (including one that pointed out a real bug).
-
-	* filter-arg.c, filter-druid.c, filter-format.c: fix warnings
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for camel_folder_search_by_expression
-	change (GList -> GPtrArray).
-
-	* vfoldertypes.xml: sync this to filtertypes.xml (to/cc thing)
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* remove some non-error case debugging messages.
-
-	* filtertypes.xml: Fix typos and update the "to-address" rule to
-	match To or Cc.
-	* vfoldertypes.xml: Fix typos.
-
-	* filter-driver.c (do_delete, do_copy, do_stop,
-	filter_driver_run): Add uids to the "processed" list only after
-	succesfully doing something with them. Fixes the problem where
-	copying a message to a folder that didn't exist would result in it
-	disapearing.
-
-2000-07-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): Don't free the ruleset nor
-	the xmlDoc.  This will make us leak [I think], but at least
-	filters work.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): freeze the folder to avoid
-	multiple folder_changed's
-	(close_folder): and thaw it.
-	
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): kill
-	filter_driver_set_session and filter_driver_set_rules and instead
-	make filter_driver_new take the rules and a callback function it
-	can use to turn URIs into folders.
-	(open_folder): Use the callback function rather than calling camel
-	directly: some URIs need special handling to turn them into stores
-	and folders correctly, so let the mailer do that.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c (arg_folder_edit_value): Only allow type
-	"mail" when selecting a folder for the filter.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Updated to reflect changes made to 
-	camel-folder.
-
-2000-06-30  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* filter-xml.c (filter_load_optionset_file): Check for failure
-	when loading the filter doc.
-
-	* filter-driver.c (filter_driver_set_rules): Ditto.
-
-	* filter-editor.c (filter_editor_set_rule_files): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c: Replaced `global_shell_interface' with
-	`global_shell_client'.
-	(arg_folder_edit_value): Use
-	`evolution_shell_client_user_select_folder()'.
-	(create_listener): Removed.
-	(impl_FolderSelectionListener_selected): Removed, together with
-	all the ::Listener stuff.
-
-2000-06-29  Arik Devens  <arik@helixcode.com>
-
-	* vfoldertypes.xml (ruleset type="match"): Changed Cc to CC to be
-	the same as the other CC rule. None of this works however, cause
-	the CC code is not hooked up to camel... oh well ;-(
-	
-2000-06-29  Arik Devens  <arik@helixcode.com>
-	
-	* vfoldertypes.xml (ruleset type="match"): Added a Cc rule to
-	vfolders. Works like To except on the Cc of a message ;-)
-	
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-arg-types.c (arg_string_edit_value): Changed "Filter name"
-	to "Option value" as "Filter name" made no sense in the dialog
-	(arg_address_edit_value): Same
-	(arg_folder_edit_value): What do we want to return??
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-xml.c (load_desc): Strdup content before assigning the
-	value.  Also, no need to check for NULL when g_strdup()ing as
-	g_strdup() returns NULL for a NULL arg.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_builddir)/shell' so that it
-	works with builddir != srcdir.  [We need to #include
-	"Evolution.h".]
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* Makefile.am (INCLUDES): Add the shell dir for includes (for
-	corba interfaces).
-
-	* filter-arg-types.c (impl_FolderSelectionListener_selected):
-	Listener for folder query.  Sigh.
-	(create_listener): Create the listener object for the folder
-	dialogue query.  Uses a global for linkage to the shell object,
-	via the mail component.
-	(arg_folder_edit_value): Call the folder selection dialogue to
-	edit the value, rather than a simple text widget.
-
-2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Added a #include <gnome-xml/parser.h> as this
-	was needed (since we used the xml parser...)
-	(druid_dialogue_clicked): Do we want to use struct filter_option
-	or do we instead want to use struct filter_optionrule as we had before?
-	Since the function we pass the data to expects filter_option, I suspect 
-	that that is what we want.
-
-	* filter-format.h (filter_description_html_write): Renamed from
-	description_html_write in order to match function name in
-	filter-format.c
-
-	* filter-druid.c (option_name_changed): Fixed a memory leak (Free'd
-	a filter description list).
-
-	* filter-arg-types.c (arg_folder_edit_values): Free'd GList data in
-	argin->values.
-
-	* filter-driver.c (filter_driver_set_rules): Added code to free an
-	xmlDoc and some other data.
-
-	* filter-arg.h: Add prototypes for filter_arg_write_html() and 
-	filter_arg_write_text();
-
-	* filter-arg-types.c: Lets see if we can't get rid of some of these 
-	warnings... (use some casts to make warnings go away)
-	(arg_address_edit_value): Lets make sure that ad exists before looking
-	at member data.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for Camel
-	flag handling changes.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder, close_folder): Update for
-	CamelFolder changes.
-
-2000-06-09  Jacob Berkman  <jacob@helixcode.com>
-
-	* filter-editor.c (add_or_edit): use stock pixmap buttons
-
-	* filter-druid.c (build_druid): remove the border on the notebook,
-	put the html widget in a scroll frame, and add some padding
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): Update for folder
-	existence/creation changes.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c: Free the exception and the priv struct.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg-types.c (arg_address_edit_value): Search for ad in
-	arg->values instead of text since it's a list of
-	filter_arg_adresses.  Also, free the old value in the list.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* filtertypes.xml: And here too.
-
-	* vfoldertypes.xml: Add body-contains and not-body-contains
-	types.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* vfoldertypes.xml: New file - lists rules appropriate for
-	vfolders (no actions, etc).
-
-	* Makefile.am (EXTRA_DIST): Add vfoldertypes.xml
-
-	* filter-driver.c (filter_driver_expand_option): Made public from
-	expand_filter_option.
-	(filter_driver_rule_count): find out how many user rules are
-	defined.
-	(filter_driver_rule_get): Get a user rule by index.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-druid.c: Don't pass an empty URL to `gtk_html_begin()'
-	anymore.
-
-	* filter-arg-types.c: Updated for the new GtkHTML API which uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* filter-arg.c: Likewise.
-	* filter-arg.h: Likewise.
-	* filter-druid.c: Likewise.
-
-	* filter-format.c: Likewise.
-	* filter-format.h: Likewise.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): update for
-	camel_folder_get_uids change
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Fix some html formatting.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Delete all processed
-	messages.  This is probably going to slow it down a bit.
-	(filter_driver_run): Close folders before destroying them *sigh*.
-	(open_folder): Actually open the folder. Doh.
-
-	* filtertypes.xml: Initial filter rules.
-
-	* filter-xml.c (filter_write_optionset): Save the description
-	also.
-	(write_description): Routine to save description - only saves 1
-	node of description.
-
-	* filter-arg.c (filter_arg_edit_clicked): Dont free edata here,
-	let the destroy do it(?)
-
-	* filter-editor.c (main): Simple driver program for testing, so i
-	can fix all this really broken code *sigh*
-
-2000-05-15  NotZed  <NotZed@HelixCode.com>
-
-	* filter-editor.c (filter_editor_set_rule_files): filename based
-	interface.
-	(filter_editor_save_rules): Interface to save the options to a
-	filename.
-
-	* filter-xml.[ch]: Bunch of cleanup.
-
-	* filter-xml.c (filter_*_file): New interfaces to read/write files
-	directly, rather than messing with xmldoc crap.
-
-	* Makefile.am: Removed filter-driver test program, now just part
-	of libfilter.
-
-	* filter-driver.c: Made an object, with an api and everything, can
-	apply a filter to a given mailbox.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg.h: Changed tree.h to gnome-xml/tree.h.
-
-	* Makefile.am: Added filter-arg-types.h, filter-arg.h,
-	filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Fix for api.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (start): Remove no-longer-necessary call to
-	camel_provider_register_as_module.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Use `$(GTKHTML_CFLAGS)'.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c: Removed a bunch of crappy unrequired headers.
-
-	* Makefile.am (filter_driver_LDADD): Added libibex back again.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: remove unused camel-log.h include
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* filter-arg.c (filter_arg_edit_value): Return a value.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (tokenise_xmlfreeprop): Free a prop after
-	tokenising it.
-	(find_node_attr): Free the prop after using it.
-	(load_desc): Ditto.   I use free() because xmlFree() is nowhere to
-	be found.
-	(filter_load_optionset): Ditto.
-
-	* filter-arg-types.c (arg_address_values_add_xml): free() xml
-	stuff, plugs a leak.
-	(arg_folder_values_add_xml): Ditto.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Changed to use async search api.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (html_write_options): Output 'and' bits between
-	the rules.
-
-	* filter-driver.c (main): Actually implement filtering, at least,
-	from Inbox.  Copy messages to folder (in the same store only, so
-	far), delete, and stop processing are implemented, and the logic
-	to handle default processing.
-
-	* filter-xml.c (load_optionvalue): Fix up a bug where we lost the
-	name of the arg (ouch).
-	* filter-xml.c: Wrapped printf's in debug macros.
-
-2000-03-02  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (object_destroy): Disconnect the list signal, so
-	we dont get spurious emits during destroy.
-	(arg_changed): Callback to update filter arg asynchronously.
-	(arg_link_clicked): Edit the value non-modally.
-
-	* filter-arg.c (filter_arg_edit_values_1): Changed to use
-	non-modal interface.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: New file.
-
-	* Makefile: Removed.  I wonder why we are using plain Makefiles
-	instead of automake Makefiles at all.
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Remove gui code, this will be actual
-	filtering code.
-
-	* Makefile: Added filter-editor to the library.
-
-	* filter-editor.c (main): Comment out, make it a proper library.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Removed unused header.
-
-	* Makefile: Removed references to filter-sexp.[ch].
-
-	* filter-sexp.[ch]: Removed some unecessary includes.  Moved to
-	e-util.  Renamed callers.
-
-2000-02-24  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_description_free): 
-	(filter_load_ruleset_free): 
-	(filter_load_optionset_free): Functions for memory management.
-
-	* filter-arg.c (filter_arg_copy): Copy the values of one arg into
-	another.
-
-	* filter-editor.c: New widget, a dialogue which uses filter-druid
-	to present the various editing views.
-	(druid_dialogue_clicked): On finish, save the user's new filter
-	definition where it came from.
-
-	* filter-druid.c: Changed to just being a notebook with no tabs,
-	rather than a full druid (no next/prev/etc buttons).
-	(option_name_changed): Update the option's description as the user
-	enters it in.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_clone_optionrule):
-	(filter_clone_optionrule_free): 
-	(filter_optionrule_new_from_rule): New utility functions for
-	working with the internal rule format.
-
-	* filter-arg.[ch]: Added new callbacks for editing a single value,
-	and a new editor which shows all items in a list, and allows you
-	to edit them via the single-edit method.  This needs some cleanup
-	for some unused/unusable virtual methods (edit_values,
-	write_html?).
-
-	* Makefile: Add the druid for build.
-
-	* filter-druid.c: A 'druid' widget for editing a single filter
-	rule.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: New file.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* blank/check.xpm: Added forgotten files.
-
-	* Uh, more changes, lots, its still work in progress.
-
-2000-02-14  NotZed  <notzed@helixcode.com>
-
-	* Initial import.
-
diff --git a/filter/Makefile.am b/filter/Makefile.am
deleted file mode 100644
index 89a9c2f257..0000000000
--- a/filter/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = filter.glade
-
-INCLUDES = 					\
-	-I $(top_srcdir)			\
-	-I $(top_srcdir)/libibex		\
-	-I $(top_srcdir)/camel			\
-	-I $(top_srcdir)/e-util			\
-	-I $(top_srcdir)/shell			\
-	-I $(top_srcdir)/camel/providers/mbox	\
-	-I $(top_builddir)/shell		\
-	-I $(GNOME_INCLUDEDIR)			\
-	$(GTKHTML_CFLAGS)			\
-	$(UNICODE_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
-	-DG_LOG_DOMAIN=\"filter\"
-##
-
-noinst_LTLIBRARIES =				\
-	libfilter.la
-
-libfilter_la_SOURCES =				\
-	filter-code.c				\
-	filter-code.h				\
-	filter-colour.c				\
-	filter-colour.h				\
-	filter-context.c			\
-	filter-context.h			\
-	filter-datespec.c			\
-	filter-datespec.h			\
-	filter-editor.c				\
-	filter-editor.h				\
-	filter-element.c			\
-	filter-element.h			\
-	filter-filter.c				\
-	filter-filter.h				\
-	filter-folder.c				\
-	filter-folder.h				\
-	filter-input.c				\
-	filter-input.h				\
-	filter-option.c				\
-	filter-option.h				\
-	filter-part.c				\
-	filter-part.h				\
-	filter-rule.c				\
-	filter-rule.h				\
-	filter-score.c				\
-	filter-score.h				\
-	filter-system-flag.c			\
-	filter-system-flag.h			\
-	filter-url.c				\
-	filter-url.h				\
-	rule-context.c				\
-	rule-context.h				\
-	score-context.c				\
-	score-context.h				\
-	score-editor.c				\
-	score-editor.h				\
-	score-rule.c				\
-	score-rule.h				\
-	vfolder-context.c			\
-	vfolder-context.h			\
-	vfolder-editor.c			\
-	vfolder-editor.h			\
-	vfolder-rule.c				\
-	vfolder-rule.h
-
-libfilter_la_DEPENDENCIES = libfilter-i18n.h
-
-EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
-	$(glade_DATA) libfilter-i18n.h
-
-# basic rules.
-filterdir = $(datadir)/evolution
-filter_DATA = filtertypes.xml vfoldertypes.xml
-
-libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
-	echo "/* Automatically generated. Do not edit. */" > $@;	      \
-	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \
-		sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
-		sort -u >> $@
diff --git a/filter/filter-code.c b/filter/filter-code.c
deleted file mode 100644
index c008043a5f..0000000000
--- a/filter/filter-code.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-code.h"
-
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_code_class_init	(FilterCodeClass *class);
-static void filter_code_init	(FilterCode *gspaper);
-static void filter_code_finalise	(GtkObject *obj);
-
-static FilterInputClass *parent_class;
-
-guint
-filter_code_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterCode",
-			sizeof(FilterCode),
-			sizeof(FilterCodeClass),
-			(GtkClassInitFunc)filter_code_class_init,
-			(GtkObjectInitFunc)filter_code_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_input_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_code_class_init (FilterCodeClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_input_get_type ());
-
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	object_class->finalize = filter_code_finalise;
-	/* override methods */
-
-}
-
-static void
-filter_code_init (FilterCode *o)
-{
-	((FilterInput *)o)->type = g_strdup("code");
-}
-
-static void
-filter_code_finalise(GtkObject *obj)
-{
-	FilterCode *o = (FilterCode *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_code_new:
- *
- * Create a new FilterCode object.
- * 
- * Return value: A new #FilterCode object.
- **/
-FilterCode *
-filter_code_new(void)
-{
-	FilterCode *o = (FilterCode *)gtk_type_new(filter_code_get_type ());
-	return o;
-}
-
-/* here, the string IS the code */
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-
-	l = fi->values;
-	while (l) {
-		g_string_append(out, (char *)l->data);
-		l = g_list_next(l);
-	}
-}
-
-/* and we have no value */
-static void format_sexp(FilterElement *fe, GString *out)
-{
-	return;
-}
diff --git a/filter/filter-code.h b/filter/filter-code.h
deleted file mode 100644
index c4bb04caab..0000000000
--- a/filter/filter-code.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_CODE_H
-#define _FILTER_CODE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-input.h"
-
-#define FILTER_CODE(obj)	GTK_CHECK_CAST (obj, filter_code_get_type (), FilterCode)
-#define FILTER_CODE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_code_get_type (), FilterCodeClass)
-#define IS_FILTER_CODE(obj)      GTK_CHECK_TYPE (obj, filter_code_get_type ())
-
-typedef struct _FilterCode	FilterCode;
-typedef struct _FilterCodeClass	FilterCodeClass;
-
-struct _FilterCode {
-	FilterInput parent;
-};
-
-struct _FilterCodeClass {
-	FilterInputClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_code_get_type	(void);
-FilterCode	*filter_code_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_CODE_H */
-
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
deleted file mode 100644
index ffa6489cfb..0000000000
--- a/filter/filter-colour.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-colour.h"
-
-#define d(x)
-
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_colour_class_init	(FilterColourClass *class);
-static void filter_colour_init	(FilterColour *gspaper);
-static void filter_colour_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterColour *)(x))->priv)
-
-struct _FilterColourPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_colour_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterColour",
-			sizeof(FilterColour),
-			sizeof(FilterColourClass),
-			(GtkClassInitFunc)filter_colour_class_init,
-			(GtkObjectInitFunc)filter_colour_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_colour_class_init (FilterColourClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_colour_finalise;
-
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_colour_init (FilterColour *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-}
-
-static void
-filter_colour_finalise(GtkObject *obj)
-{
-	FilterColour *o = (FilterColour *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_colour_new:
- *
- * Create a new FilterColour object.
- * 
- * Return value: A new #FilterColour object.
- **/
-FilterColour *
-filter_colour_new(void)
-{
-	FilterColour *o = (FilterColour *)gtk_type_new(filter_colour_get_type ());
-	return o;
-}
-
-static void xml_create(FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterColour *fc = (FilterColour *)fe;*/
-
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr xml_encode(FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterColour *fc = (FilterColour *)fe;
-	char hex[16];
-
-	d(printf("Encoding colour as xml\n"));
-	value = xmlNewNode(NULL, "value");
-	xmlSetProp(value, "name", fe->name);
-	xmlSetProp(value, "type", "colour");
-
-	sprintf(hex, "%04x", fc->r);
-	xmlSetProp(value, "red", hex);
-	sprintf(hex, "%04x", fc->g);
-	xmlSetProp(value, "green", hex);
-	sprintf(hex, "%04x", fc->b);
-	xmlSetProp(value, "blue", hex);
-	sprintf(hex, "%04x", fc->a);
-	xmlSetProp(value, "alpha", hex);
-
-	return value;
-}
-
-static guint16
-get_value(xmlNodePtr node, char *name)
-{
-	unsigned int ret;
-	char *value;
-
-	value = xmlGetProp(node, name);
-	sscanf(value, "%04x", &ret);
-	xmlFree(value);
-	return ret;
-}
-
-
-static int xml_decode(FilterElement *fe, xmlNodePtr node)
-{
-	FilterColour *fc = (FilterColour *)fe;
-
-	fe->name = xmlGetProp(node, "name");
-	fc->r = get_value(node, "red");
-	fc->g = get_value(node, "green");
-	fc->b = get_value(node, "blue");
-	fc->a = get_value(node, "alpha");
-
-	return 0;
-}
-
-static void set_colour(GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc)
-{
-	fc->r = r;
-	fc->g = g;
-	fc->b = b;
-	fc->a = a;
-}
-
-static GtkWidget *get_widget(FilterElement *fe)
-{
-	FilterColour *fc = (FilterColour *)fe;
-	GnomeColorPicker *cp;
-
-	cp = (GnomeColorPicker *)gnome_color_picker_new();
-	gnome_color_picker_set_i16(cp, fc->r, fc->g, fc->b, fc->a);
-	gtk_widget_show((GtkWidget *)cp);
-	gtk_signal_connect((GtkObject *)cp, "color_set", set_colour, fe);
-	return (GtkWidget *)cp;
-}
-
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void format_sexp(FilterElement *fe, GString *out)
-{
-	char *str;
-	FilterColour *fc = (FilterColour *)fe;
-
-	str =g_strdup_printf("rgb:%04x/%04x/%04x", fc->r, fc->g, fc->b);
-	e_sexp_encode_string(out, str);
-	g_free(str);
-}
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
deleted file mode 100644
index 3526dfcfda..0000000000
--- a/filter/filter-colour.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_COLOUR_H
-#define _FILTER_COLOUR_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_COLOUR(obj)	GTK_CHECK_CAST (obj, filter_colour_get_type (), FilterColour)
-#define FILTER_COLOUR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_colour_get_type (), FilterColourClass)
-#define IS_FILTER_COLOUR(obj)      GTK_CHECK_TYPE (obj, filter_colour_get_type ())
-
-typedef struct _FilterColour	FilterColour;
-typedef struct _FilterColourClass	FilterColourClass;
-
-struct _FilterColour {
-	FilterElement parent;
-	struct _FilterColourPrivate *priv;
-
-	guint16 r,g,b,a;
-};
-
-struct _FilterColourClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_colour_get_type	(void);
-FilterColour	*filter_colour_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_COLOUR_H */
-
diff --git a/filter/filter-context.c b/filter/filter-context.c
deleted file mode 100644
index c6fa69f38a..0000000000
--- a/filter/filter-context.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-context.h"
-#include "filter-filter.h"
-
-#define d(x)
-
-static void filter_context_class_init	(FilterContextClass *class);
-static void filter_context_init	(FilterContext *gspaper);
-static void filter_context_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterContext *)(x))->priv)
-
-struct _FilterContextPrivate {
-};
-
-static RuleContextClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterContext",
-			sizeof(FilterContext),
-			sizeof(FilterContextClass),
-			(GtkClassInitFunc)filter_context_class_init,
-			(GtkObjectInitFunc)filter_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_context_class_init (FilterContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = filter_context_finalise;
-	/* override methods */
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_context_init (FilterContext *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_add_part_set((RuleContext *)o, "actionset", filter_part_get_type(),
-				  (RCPartFunc)filter_context_add_action,
-				  (RCNextPartFunc)filter_context_next_action);
-
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", filter_filter_get_type(),
-				  (RCRuleFunc)rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-filter_context_finalise(GtkObject *obj)
-{
-	FilterContext *o = (FilterContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_context_new:
- *
- * Create a new FilterContext object.
- * 
- * Return value: A new #FilterContext object.
- **/
-FilterContext *
-filter_context_new(void)
-{
-	FilterContext *o = (FilterContext *)gtk_type_new(filter_context_get_type ());
-	return o;
-}
-
-void filter_context_add_action(FilterContext *f, FilterPart *action)
-{
-	d(printf("find action : "));
-	f->actions = g_list_append(f->actions, action);
-}
-
-FilterPart *filter_context_find_action(FilterContext *f, const char *name)
-{
-	d(printf("find action : "));
-	return filter_part_find_list(f->actions, name);
-}
-
-FilterPart 	*filter_context_create_action(FilterContext *f, const char *name)
-{
-	FilterPart *part;
-
-	part = filter_context_find_action(f, name);
-	if (part)
-		part = filter_part_clone(part);
-	return part;
-}
-
-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last)
-{
-	return filter_part_next_list(f->actions, last);
-}
diff --git a/filter/filter-context.h b/filter/filter-context.h
deleted file mode 100644
index 1fa0b80af7..0000000000
--- a/filter/filter-context.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_CONTEXT_H
-#define _FILTER_CONTEXT_H
-
-#include <gtk/gtk.h>
-#include "rule-context.h"
-
-#define FILTER_CONTEXT(obj)	GTK_CHECK_CAST (obj, filter_context_get_type (), FilterContext)
-#define FILTER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_context_get_type (), FilterContextClass)
-#define IS_FILTER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, filter_context_get_type ())
-
-typedef struct _FilterContext	FilterContext;
-typedef struct _FilterContextClass	FilterContextClass;
-
-struct _FilterContext {
-	RuleContext parent;
-	struct _FilterContextPrivate *priv;
-
-	GList *actions;
-};
-
-struct _FilterContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_context_get_type	(void);
-FilterContext	*filter_context_new	(void);
-
-/* methods */
-void		filter_context_add_action(FilterContext *f, FilterPart *action);
-FilterPart	*filter_context_find_action(FilterContext *f, const char *name);
-FilterPart	*filter_context_create_action(FilterContext *f, const char *name);
-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last);
-
-#endif /* ! _FILTER_CONTEXT_H */
-
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
deleted file mode 100644
index e5b24d56a9..0000000000
--- a/filter/filter-datespec.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-datespec.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe);
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *fds);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_datespec_class_init (FilterDatespecClass *class);
-static void filter_datespec_init (FilterDatespec *gspaper);
-static void filter_datespec_finalise (GtkObject *obj);
-
-static void make_span_editor (FilterDatespec *fds);
-static void adj_value_changed (GtkAdjustment *adj, gpointer user_data);
-static gchar *describe_button (FilterDatespec *fds);
-static gchar *stringify_agoness (FilterDatespec *fds);
-static void set_adjustments (FilterDatespec *fds);
-
-static void cal_day_selected (GtkCalendar *cal, gpointer user_data);
-static void cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data);
-
-#define PRIV(x) (((FilterDatespec *)(x))->priv)
-
-typedef struct _timespan {
-	guint32 seconds;
-	const gchar *singular;
-	const gchar *plural;
-	gfloat max;
-} timespan;
-
-static const timespan timespans[] = {
-	{ 31557600, N_("year"), N_("years"), 1000.0 },
-	{ 2419200, N_("month"), N_("months"), 12.0 },
-	{ 604800, N_("week"), N_("weeks"), 52.0 },
-	{ 86400, N_("day"), N_("days"), 31.0 },
-	{ 3600, N_("hour"), N_("hours"), 23.0 },
-	{ 60, N_("minute"), N_("minutes"), 59.0 },
-	{ 1, N_("second"), N_("seconds"), 59.0 }
-};
-
-#define N_TIMECHUNKS 3
-
-static const guint timechunks[N_TIMECHUNKS] = { 2, 2, 3 };
-#define MAX_CHUNK 3
-
-#define N_TIMESPANS (sizeof (timespans) / sizeof (timespans[0]))
-
-struct _FilterDatespecPrivate {
-	GnomeDialog *gd;
-	GtkWidget *descriptive_label;
-	GtkWidget *cur_extra_widget;
-	FilterDatespec_type selected_type;
-
-	GtkWidget *date_chooser;
-	GtkWidget *span_chooser;
-	gboolean double_click;
-	GtkWidget **spinbuttons;
-};
-
-static FilterElementClass *parent_class;
-
-guint
-filter_datespec_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterDatespec",
-			sizeof (FilterDatespec),
-			sizeof (FilterDatespecClass),
-			(GtkClassInitFunc) filter_datespec_class_init,
-			(GtkObjectInitFunc) filter_datespec_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_datespec_class_init (FilterDatespecClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_datespec_finalise;
-	
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-}
-
-static void
-filter_datespec_init (FilterDatespec *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-	o->type = FDST_UNKNOWN;
-	PRIV(o)->selected_type = FDST_UNKNOWN;
-	PRIV(o)->spinbuttons = g_new (GtkWidget *, N_TIMESPANS);
-}
-
-static void
-filter_datespec_finalise(GtkObject *obj)
-{
-	FilterDatespec *o = (FilterDatespec *)obj;
-	
-	if (o->priv) {
-		g_free (PRIV(o)->spinbuttons);
-		g_free (o->priv);
-	}
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_datespec_new:
- *
- * Create a new FilterDatespec object.
- * 
- * Return value: A new #FilterDatespec object.
- **/
-FilterDatespec *
-filter_datespec_new (void)
-{
-	FilterDatespec *o = (FilterDatespec *)gtk_type_new (filter_datespec_get_type ());
-	return o;
-}
-
-static gboolean
-validate (FilterElement *fe)
-{
-	FilterDatespec *fds = (FilterDatespec *) fe;
-	gboolean valid = TRUE;
-	
-	if (fds->value < 0) {
-		GtkWidget *gd;
-		
-		valid = FALSE;
-		
-		if (fds->type == FDST_UNKNOWN)
-			gd = gnome_ok_dialog (_("Oops. You have forgotten to choose a date."));
-		else
-			gd = gnome_ok_dialog (_("Oops. You have chosen an invalid date."));
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	}
-	
-	return valid;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value, work;
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	gchar str[32];
-	
-	d(printf ("Encoding datespec as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "datespec");
-	
-	work = xmlNewChild (value, NULL, "datespec", NULL);
-	sprintf (str, "%d", fds->type);
-	xmlSetProp (work, "type", str);
-	sprintf (str, "%d", (int)fds->value);
-	xmlSetProp (work, "value", str);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	xmlNodePtr n;
-	gchar *val;
-	
-	d(printf ("Decoding datespec from xml %p\n", fe));
-	
-	fe->name = xmlGetProp (node, "name");
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "datespec")) {
-			val = xmlGetProp (n, "type");
-			fds->type = atoi (val);
-			g_free (val);
-			val = xmlGetProp (n, "value");
-			fds->value = atoi (val);
-			g_free (val);
-			break;
-		}
-		n = n->next;
-	}
-	return 0;
-}
-
-static void
-activate_now (GtkMenuItem *item, FilterDatespec *fds)
-{
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV(fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "whatever the time is when the filter is run\n"
-			      "or vfolder is opened."));
-	
-	PRIV (fds)->selected_type = FDST_NOW;
-}
-
-static void
-activate_specified (GtkMenuItem *item, FilterDatespec *fds)
-{
-	struct tm *seltime;
-	
-	/* Remove other widget if it exists */
-	
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	/* Set description */
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "the time that you specify here."));
-	
-	/* Reset if going from one type to another */
-	if (PRIV (fds)->selected_type != FDST_SPECIFIED)
-		fds->value = 0;
-	
-	PRIV (fds)->selected_type = FDST_SPECIFIED;
-	
-	/* Set the calendar's time */
-	
-	if (fds->value > 0) {
-		/* gmtime? */
-		seltime = localtime (&(fds->value));
-		
-		gtk_calendar_select_month (GTK_CALENDAR (PRIV (fds)->date_chooser),
-					   seltime->tm_mon,
-					   seltime->tm_year + 1900);
-		gtk_calendar_select_day (GTK_CALENDAR (PRIV (fds)->date_chooser),
-					 seltime->tm_mday);
-		/* free seltime?? */
-	}
-	
-	gtk_box_pack_start (GTK_BOX (PRIV (fds)->gd->vbox),
-			    PRIV (fds)->date_chooser,
-			    TRUE, TRUE, 3);
-	gtk_widget_show (PRIV (fds)->date_chooser);
-	PRIV (fds)->cur_extra_widget = PRIV (fds)->date_chooser;
-}
-
-static void
-activate_x_ago (GtkMenuItem *item, FilterDatespec *fds)
-{
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "a time relative to when the filter is run;\n"
-			      "\"a week ago\", for example."));
-	
-	/* Reset if going from one type to another */
-	if (PRIV (fds)->selected_type != FDST_X_AGO)
-		fds->value = 0;
-	
-	PRIV (fds)->selected_type = FDST_X_AGO;
-	
-	if (fds->value > 0)
-		set_adjustments (fds);
-	
-	gtk_box_pack_start (GTK_BOX (PRIV (fds)->gd->vbox),
-			    PRIV (fds)->span_chooser,
-			    TRUE, TRUE, 3);
-	gtk_widget_show (PRIV (fds)->span_chooser);
-	PRIV (fds)->cur_extra_widget = PRIV (fds)->span_chooser;
-}
-
-typedef void (*my_menu_callback) (GtkMenuItem *, FilterDatespec *);
-
-static void
-button_clicked (GtkButton *button, FilterDatespec *fds)
-{
-	GnomeDialog *gd;
-	GtkWidget *box;
-	GtkWidget *label;
-	GtkWidget *menu;
-	GtkWidget *selectomatic;
-	GtkWidget *sep;
-	int i;
-	gchar *desc;
-	
-	/* keep in sync with FilterDatespec_type! */
-	const char *items[] = { N_("the current time"), N_("a time you specify"), 
-			       N_("a time relative to the current time"), NULL };
-	const my_menu_callback callbacks[]
-		= { activate_now, activate_specified, activate_x_ago };
-	
-	PRIV (fds)->descriptive_label = gtk_label_new("");
-	PRIV (fds)->cur_extra_widget = NULL;
-	PRIV (fds)->double_click = FALSE;
-	
-	/* The calendar */
-	
-	PRIV (fds)->date_chooser = gtk_calendar_new ();
-	gtk_object_ref (GTK_OBJECT (PRIV (fds)->date_chooser));
-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)->date_chooser), "day_selected",
-			    cal_day_selected, fds);
-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)->date_chooser), "day_selected_double_click",
-			    cal_day_selected_double_click, fds);
-	
-	/* The span editor thingie */
-	
-	make_span_editor (fds);
-	gtk_object_ref (GTK_OBJECT (PRIV (fds)->span_chooser));
-	
-	/* The dialog */
-	
-	gd = (GnomeDialog *) gnome_dialog_new ("Select a time to compare against", 
-					       GNOME_STOCK_BUTTON_OK, 
-					       GNOME_STOCK_BUTTON_CANCEL, 
-					       NULL);
-	PRIV (fds)->gd = gd;
-	
-	/* The menu */
-	
-	menu = gtk_menu_new ();
-	
-	for (i = 0; items[i]; i++) {
-		GtkWidget *item;
-		
-		item = gtk_menu_item_new_with_label (gettext (items[i]));
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    callbacks[i], fds);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-	}
-	
-	gtk_widget_show (menu);
-	
-	/* The selector */
-	
-	selectomatic = gtk_option_menu_new();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (selectomatic), GTK_WIDGET (menu));
-	if (fds->type != FDST_UNKNOWN)
-		/* Keep in sync with FilterDatespec_type! */
-		gtk_option_menu_set_history (GTK_OPTION_MENU (selectomatic), fds->type);
-	
-	gtk_widget_show ((GtkWidget *)selectomatic);
-	
-	/* The label */
-	
-	label = gtk_label_new (_("Compare against"));
-	gtk_widget_show (label);
-	
-	/* The hbox */
-	
-	box = gtk_hbox_new (FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (box), label,
-			    TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (box), selectomatic,
-			    TRUE, TRUE, 2);
-	gtk_widget_show (box);
-	gtk_box_pack_start ((GtkBox *)gd->vbox, (GtkWidget *)box, TRUE, TRUE, 3);
-	
-	/* The separator */
-	
-	sep = gtk_hseparator_new ();
-	gtk_widget_show (sep);
-	gtk_box_pack_start (GTK_BOX (gd->vbox), sep, TRUE, TRUE, 3);
-	
-	/* The descriptive label */
-	
-	gtk_box_pack_start (GTK_BOX (gd->vbox), PRIV (fds)->descriptive_label, TRUE, TRUE, 3);
-	gtk_misc_set_alignment (GTK_MISC (PRIV (fds)->descriptive_label), 0.5, 0.5);
-	gtk_widget_show (PRIV (fds)->descriptive_label);
-	
-	/* Set up the current view */
-	
-	if (fds->type == FDST_UNKNOWN)
-		fds->type = FDST_NOW;
-
-	(callbacks[fds->type]) (NULL, fds);
-	
-	/* go go gadget gnomedialog! */
-	
-	switch (gnome_dialog_run_and_close(gd)) {
-	case -1: /*wm close*/
-		if (PRIV (fds)->double_click == FALSE)
-			break;
-		/* else fall */
-	case 0:
-		fds->type = PRIV (fds)->selected_type;
-		
-		PRIV (fds)->descriptive_label = NULL;
-		
-		desc = describe_button (fds);
-		gtk_label_set_text (GTK_LABEL (GTK_BIN (button)->child), desc);
-		g_free (desc);
-		/* falllllll */
-	case 1:
-		/* cancel */
-		break;
-	}
-	
-	gtk_widget_destroy (PRIV (fds)->date_chooser);
-	gtk_widget_destroy (PRIV (fds)->span_chooser);
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	GtkWidget *button;
-	GtkWidget *label;
-	gchar *desc;
-	
-	desc = describe_button (fds);
-	label = gtk_label_new (desc);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-	g_free (desc);
-	
-	button = gtk_button_new();
-	gtk_container_add (GTK_CONTAINER (button), label);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, fds);
-	
-	gtk_widget_show (button);
-	gtk_widget_show (label);
-	return button;
-}
-
-static void 
-build_code (FilterElement *fe, GString *out, struct _FilterPart *fp)
-{
-	return;
-}
-
-static void 
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	
-	switch (fds->type) {
-	case FDST_UNKNOWN:
-		g_warning ("user hasn't selected a datespec yet!");
-		/* fall through */
-	case FDST_NOW:
-		g_string_append (out, "(get-current-date)");
-		break;
-	case FDST_SPECIFIED:
-		g_string_sprintfa (out, "%d", (int) fds->value);
-		break;
-	case FDST_X_AGO:
-		g_string_sprintfa (out, "(- (get-current-date) %d)", (int) fds->value);
-		break;
-	}
-}
-
-static gchar *
-stringify_agoness (FilterDatespec *fds)
-{
-	time_t val;
-	GString *str;
-	gchar *ret;
-	
-	str = g_string_new("");
-	val = fds->value;
-	
-	if (val == 0) {
-		g_string_append (str, _("now"));
-	} else {
-		int where;
-		
-		where = 0;
-		
-		while (val) {
-			int count;
-			
-			count = 0;
-			
-			while (timespans[where].seconds <= val) {
-				count++;
-				val -= timespans[where].seconds;
-			}
-			
-			if (count != 0 ) {
-				if (count > 1)
-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].plural));
-				else
-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].singular));
-				
-				if (val)
-					g_string_append (str, ", ");
-			}
-			
-			where++;
-		}
-		
-		g_string_append (str, " ago");
-	}
-	
-	ret = str->str;
-	g_string_free (str, FALSE);
-	return ret;
-}
-
-static void
-make_span_editor (FilterDatespec *fds)
-{
-	int i;
-	int chunk;
-	int delta;
-	GtkWidget *table;
-	
-	/*PRIV (fds)->span_chooser = gtk_vbox_new (TRUE, 3);*/
-	table = gtk_table_new (N_TIMECHUNKS, MAX_CHUNK * 2, FALSE);
-	
-	i = 0;
-	
-	for (chunk = 0; chunk < N_TIMECHUNKS; chunk++ ) {
-		/*GtkWidget *hbox;*/
-
-		/*hbox = gtk_hbox_new (FALSE, 1);*/
-		/*gtk_box_pack_start (GTK_BOX (PRIV (fds)->span_chooser),
-		 *		    hbox, TRUE, TRUE, 1);
-		 */
-		/*gtk_table_attach (GTK_TABLE (PRIV (fds)->span_chooser),
-		 *		  hbox,
-		 *		  0, 1, chunk, chunk + 1,
-		 *		  0, GTK_EXPAND | GTK_FILL,
-		 *		  3, 3);
-		 *gtk_widget_show (hbox);
-		 */
-		
-		for (delta = 0; delta < timechunks[chunk]; delta++, i++ ) {
-			gchar *text;
-			GtkObject *adj;
-			GtkWidget *sb;
-			GtkWidget *label;
-			
-			adj = gtk_adjustment_new (0.0, 0.0,
-						  timespans[i].max,
-						  1.0, 10.0, 0.0);
-			
-			sb = gtk_spin_button_new (GTK_ADJUSTMENT (adj),
-						  0, 0);
-			
-			/*gtk_box_pack_start (GTK_BOX (hbox), sb, FALSE, FALSE, 1);*/
-			gtk_table_attach (GTK_TABLE (table), sb,
-					  delta * 2, delta * 2 + 1,
-					  chunk, chunk + 1,
-					  0, GTK_EXPAND | GTK_FILL,
-					  2, 4);
-			PRIV (fds)->spinbuttons[i] = sb;
-			
-			gtk_widget_show (GTK_WIDGET (sb));
-			
-			if (delta + 1 < timechunks[chunk])
-				text = g_strdup_printf ("%s, ", gettext (timespans[i].plural));
-			else
-				text = g_strdup_printf ("%s ago", gettext (timespans[i].plural));
-
-			label = gtk_label_new (text);
-			g_free (text);
-			
-			/*gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);*/
-			gtk_table_attach (GTK_TABLE (table), label,
-					  delta * 2 + 1, (delta + 1) * 2,
-					  chunk, chunk + 1,
-					  0, GTK_EXPAND | GTK_FILL,
-					  2, 4);
-			gtk_widget_show (label);
-			
-			gtk_signal_connect (adj, "value_changed",
-					    adj_value_changed, fds);
-		}
-	}
-	
-	PRIV (fds)->span_chooser = table;
-}
-
-static void
-adj_value_changed (GtkAdjustment *adj, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *) user_data;
-	int i;
-	
-	fds->value = 0;
-	
-	for (i = 0; i < N_TIMESPANS; i++)
-		fds->value += timespans[i].seconds * 
-			(gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PRIV (fds)->spinbuttons[i])));
-}
-
-static void
-set_adjustments (FilterDatespec *fds)
-{
-	time_t val;
-	int where;
-	
-	val = fds->value;
-	where = 0;
-	
-	while (val) {
-		int count;
-		
-		count = 0;
-		
-		while (timespans[where].seconds <= val) {
-			count++;
-			val -= timespans[where].seconds;
-		}
-			
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (PRIV (fds)->spinbuttons[where]),
-					   (gfloat) count);
-		where++;
-	}
-}
-
-static gchar *
-describe_button (FilterDatespec *fds)
-{
-	gchar *desc = NULL;
-	
-	switch (fds->type) {
-	case FDST_UNKNOWN:
-		desc = g_strdup (_("<click here to select a date>"));
-		break;
-	case FDST_NOW:
-		desc = g_strdup (_("now"));
-		break;
-	case FDST_SPECIFIED:
-		desc = g_strdup (ctime (&(fds->value)));
-		break;
-	case FDST_X_AGO:
-		desc = stringify_agoness (fds);
-		break;
-	}
-	
-	return desc;
-}
-
-static void
-cal_day_selected (GtkCalendar *cal, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *)user_data;
-	struct tm seltime;
-	
-	seltime.tm_sec = 0;
-	seltime.tm_min = 0;
-	seltime.tm_hour = 0;
-	seltime.tm_mday = cal->selected_day;
-	seltime.tm_mon = cal->month;
-	seltime.tm_year = cal->year - 1900;
-	seltime.tm_isdst = -1;
-	
-	fds->value = mktime (&seltime);
-}
-
-static void 
-cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *)user_data;
-	
-	cal_day_selected (cal, user_data);
-	PRIV (fds)->double_click = TRUE;
-	gnome_dialog_close (PRIV (fds)->gd);
-}
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
deleted file mode 100644
index 1292a94e36..0000000000
--- a/filter/filter-datespec.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_DATESPEC_H
-#define _FILTER_DATESPEC_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_DATESPEC(obj)	GTK_CHECK_CAST (obj, filter_datespec_get_type (), FilterDatespec)
-#define FILTER_DATESPEC_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_datespec_get_type (), FilterDatespecClass)
-#define IS_FILTER_DATESPEC(obj)      GTK_CHECK_TYPE (obj, filter_datespec_get_type ())
-
-typedef struct _FilterDatespec	FilterDatespec;
-typedef struct _FilterDatespecClass	FilterDatespecClass;
-
-typedef enum _FilterDatespec_type { FDST_NOW, FDST_SPECIFIED, FDST_X_AGO, FDST_UNKNOWN } FilterDatespec_type;
-
-struct _FilterDatespec {
-	FilterElement parent;
-	struct _FilterDatespecPrivate *priv;
-
-	FilterDatespec_type type;
-
-	/* either a timespan, an absolute time, or 0
-	 * depending on type -- the above mapping to
-	 * (X_AGO, SPECIFIED, NOW)
-	 */
-
-	time_t value;
-};
-
-struct _FilterDatespecClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_datespec_get_type	(void);
-FilterDatespec	*filter_datespec_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_DATESPEC_H */
-
diff --git a/filter/filter-driver.c b/filter/filter-driver.c
deleted file mode 100644
index bc941a9c01..0000000000
--- a/filter/filter-driver.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "filter-driver.h"
-#include "filter-message-search.h"
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include <time.h>
-
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-
-#include <camel/camel.h>
-#include "filter-context.h"
-#include "filter-filter.h"
-#include "e-util/e-sexp.h"
-#include "e-util/e-memory.h"
-
-#define d(x)
-
-/* type of status for a log report */
-enum filter_log_t {
-	FILTER_LOG_NONE,
-	FILTER_LOG_START,       /* start of new log entry */
-	FILTER_LOG_ACTION,      /* an action performed */
-	FILTER_LOG_END,	        /* end of log */
-};
-
-struct _FilterDriverPrivate {
-	GHashTable *globals;       /* global variables */
-
-	CamelFolder *defaultfolder;	/* defualt folder */
-	
-	FDStatusFunc *statusfunc; 	/* status callback */
-	void *statusdata;		/* status callback data */
-	
-	FilterContext *context;
-	
-	/* for callback */
-	FilterGetFolderFunc get_folder;
-	void *data;
-	
-	/* run-time data */
-	GHashTable *folders;       /* folders that message has been copied to */
-	GHashTable *forwards;      /* addresses that have been forwarded the message */
-	
-	gboolean terminated;       /* message processing was terminated */
-	gboolean deleted;          /* message was marked for deletion */
-	gboolean copied;           /* message was copied to some folder or another */
-	
-	CamelMimeMessage *message; /* input message */
-	CamelMessageInfo *info;    /* message summary info */
-	
-	FILE *logfile;             /* log file */
-	
-	CamelException *ex;
-	
-	/* evaluator */
-	ESExp *eval;
-};
-
-#define _PRIVATE(o) (((FilterDriver *)(o))->priv)
-
-static void filter_driver_class_init (FilterDriverClass *klass);
-static void filter_driver_init       (FilterDriver *obj);
-static void filter_driver_finalise   (GtkObject *obj);
-
-static void filter_driver_log (FilterDriver *driver, enum filter_log_t status, const char *desc, ...);
-
-static CamelFolder *open_folder (FilterDriver *d, const char *folder_url);
-static int close_folders (FilterDriver *d);
-
-static ESExpResult *do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-
-/* these are our filter actions - each must have a callback */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "delete",          (ESExpFunc *) do_delete,    0 },
-	{ "forward-to",      (ESExpFunc *) mark_forward, 0 },
-	{ "copy-to",         (ESExpFunc *) do_copy,      0 },
-	{ "move-to",         (ESExpFunc *) do_move,      0 },
-	{ "stop",            (ESExpFunc *) do_stop,      0 },
-	{ "set-colour",      (ESExpFunc *) do_colour,    0 },
-	{ "set-score",       (ESExpFunc *) do_score,     0 },
-	{ "set-system-flag", (ESExpFunc *) do_flag,      0 }
-};
-
-static GtkObjectClass *filter_driver_parent;
-
-enum SIGNALS {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_driver_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterDriver",
-			sizeof (FilterDriver),
-			sizeof (FilterDriverClass),
-			(GtkClassInitFunc) filter_driver_class_init,
-			(GtkObjectInitFunc) filter_driver_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_driver_class_init (FilterDriverClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	
-	filter_driver_parent = gtk_type_class (gtk_object_get_type ());
-	
-	object_class->finalize = filter_driver_finalise;
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_driver_init (FilterDriver *obj)
-{
-	struct _FilterDriverPrivate *p;
-	int i;
-	
-	p = _PRIVATE (obj) = g_malloc0 (sizeof (*p));
-	
-	p->eval = e_sexp_new ();
-	/* Load in builtin symbols */
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (p->eval, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, obj);
-		} else {
-			e_sexp_add_function (p->eval, 0, symbols[i].name, symbols[i].func, obj);
-		}
-	}
-	
-	p->globals = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void
-free_hash_strings (void *key, void *value, void *data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
-filter_driver_finalise (GtkObject *obj)
-{
-	FilterDriver *driver = (FilterDriver *) obj;
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	/* close all folders that were opened for appending */
-	close_folders (driver);
-	g_hash_table_destroy (p->folders);
-	
-	g_hash_table_foreach (p->globals, free_hash_strings, driver);
-	g_hash_table_destroy (p->globals);
-
-	e_sexp_unref(p->eval);
-	
-	if (p->defaultfolder)
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	
-	g_free (p);
-	
-	((GtkObjectClass *)(filter_driver_parent))->finalize (GTK_OBJECT (obj));
-}
-
-/**
- * filter_driver_new:
- * @system: path to system rules
- * @user: path to user rules
- * @get_folder: function to call to fetch folders
- *
- * Create a new FilterDriver object.
- * 
- * Return value: A new FilterDriver widget.
- **/
-FilterDriver *
-filter_driver_new (FilterContext *context, FilterGetFolderFunc get_folder, void *data)
-{
-	FilterDriver *new;
-	struct _FilterDriverPrivate *p;
-	
-	new = FILTER_DRIVER (gtk_type_new (filter_driver_get_type ()));
-	p = _PRIVATE (new);
-	
-	p->get_folder = get_folder;
-	p->data = data;
-	p->context = context;
-	gtk_object_ref (GTK_OBJECT (context));
-	
-	return new;
-}
-
-void
-filter_driver_set_logfile (FilterDriver *d, FILE *logfile)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->logfile = logfile;
-}
-
-void
-filter_driver_set_status_func (FilterDriver *d, FDStatusFunc *func, void *data)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->statusfunc = func;
-	p->statusdata = data;
-}
-
-void
-filter_driver_set_default_folder (FilterDriver *d, CamelFolder *def)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	if (p->defaultfolder)
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	
-	p->defaultfolder = def;
-	
-	if (p->defaultfolder)
-		camel_object_ref (CAMEL_OBJECT (p->defaultfolder));
-}
-
-static void
-report_status (FilterDriver *driver, enum filter_status_t status, const char *desc, ...)
-{
-	/* call user-defined status report function */
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	va_list ap;
-	char *str;
-	
-	if (p->statusfunc) {
-		va_start (ap, desc);
-		str = g_strdup_vprintf (desc, ap);
-		p->statusfunc (driver, status, str, p->statusdata);
-		g_free (str);
-	}
-}
-
-
-#if 0
-void
-filter_driver_set_global (FilterDriver *d, const char *name, const char *value)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	char *oldkey, *oldvalue;
-	
-	if (g_hash_table_lookup_extended (p->globals, name, (void *)&oldkey, (void *)&oldvalue)) {
-		g_free (oldvalue);
-		g_hash_table_insert (p->globals, oldkey, g_strdup (value));
-	} else {
-		g_hash_table_insert (p->globals, g_strdup (name), g_strdup (value));
-	}
-}
-#endif
-
-static ESExpResult *
-do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "doing delete\n"));
-	p->deleted = TRUE;
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Delete");
-	
-	return NULL;
-}
-
-static ESExpResult *
-mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	/*struct _FilterDriverPrivate *p = _PRIVATE (driver);*/
-	
-	d(fprintf (stderr, "marking message for forwarding\n"));
-	/* FIXME: do stuff here */
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Forward");
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "copying message...\n"));
-	
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to copy to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				continue;
-			
-			p->copied = TRUE;
-			camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s", service_url);
-			g_free (service_url);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "moving message...\n"));
-	
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to move to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				continue;
-			
-			p->copied = TRUE;
-			p->deleted = TRUE;  /* a 'move' is a copy & delete */
-			
-			camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s", service_url);
-			g_free (service_url);
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Stopped processing");
-	d(fprintf (stderr, "terminating message processing\n"));
-	p->terminated = TRUE;
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting colour tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_STRING) {
-		camel_tag_set (&p->info->user_tags, "colour", argv[0]->value.string);
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set colour to %s", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting score tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_INT) {
-		char *value;
-		
-		value = g_strdup_printf ("%d", argv[0]->value.number);
-		camel_tag_set (&p->info->user_tags, "score", value);
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set score to %d", argv[0]->value.number);
-		g_free (value);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting flag\n"));
-	if (argc == 1 && argv[0]->type == ESEXP_RES_STRING) {
-		p->info->flags |= camel_system_flag (argv[0]->value.string) | CAMEL_MESSAGE_FOLDER_FLAGGED;
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set %s flag", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static CamelFolder *
-open_folder (FilterDriver *driver, const char *folder_url)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	CamelFolder *camelfolder;
-	
-	/* we have a lookup table of currently open folders */
-	camelfolder = g_hash_table_lookup (p->folders, folder_url);
-	if (camelfolder)
-		return camelfolder;
-	
-	camelfolder = p->get_folder (driver, folder_url, p->data);
-	
-	if (camelfolder) {
-		g_hash_table_insert (p->folders, g_strdup (folder_url), camelfolder);
-		camel_folder_freeze (camelfolder);
-	}
-	
-	return camelfolder;
-}
-
-static void
-close_folder (void *key, void *value, void *data)
-{	
-	CamelFolder *folder = value;
-	FilterDriver *driver = data;
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	g_free (key);
-	camel_folder_sync (folder, FALSE, p->ex);
-	camel_folder_thaw (folder);
-	camel_object_unref (CAMEL_OBJECT (folder));
-}
-
-/* flush/close all folders */
-static int
-close_folders (FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	g_hash_table_foreach (p->folders, close_folder, driver);
-	g_hash_table_destroy (p->folders);
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	/* FIXME: status from driver */
-	return 0;
-}
-
-#if 0
-static void
-free_key (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-#endif
-
-
-static void
-filter_driver_log (FilterDriver *driver, enum filter_log_t status, const char *desc, ...)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	if (p->logfile) {
-		char *str = NULL;
-		
-		if (desc) {
-			va_list ap;
-			
-			va_start (ap, desc);
-			str = g_strdup_vprintf (desc, ap);
-		}
-		
-		switch (status) {
-		case FILTER_LOG_START: {
-			/* write log header */
-			const char *subject = NULL;
-			char *fromstr;
-			const CamelInternetAddress *from;
-			char date[50];
-			time_t t;
-
-			/* FIXME: does this need locking?  Probably */
-
-			from = camel_mime_message_get_from (p->message);
-			fromstr = camel_address_format((CamelAddress *)from);
-			subject = camel_mime_message_get_subject (p->message);
-			
-			time (&t);
-			strftime (date, 49, "%a, %d %b %Y %H:%M:%S", localtime (&t));
-			fprintf (p->logfile, "Applied filter \"%s\" to message from %s - \"%s\" at %s\n",
-				 str, fromstr ? fromstr : "unknown", subject ? subject : "", date);
-			g_free(fromstr);
-			break;
-		}
-		case FILTER_LOG_ACTION:
-			fprintf (p->logfile, "Action: %s\n", str);
-			break;
-		case FILTER_LOG_END:
-			fprintf (p->logfile, "\n");
-			break;
-		default:
-			/* nothing else is loggable */
-			break;
-		}
-		
-		g_free (str);
-	}
-}
-
-
-/* will filter only an mbox - is more efficient as it doesn't need to open the folder through camel directly */
-void
-filter_driver_filter_mbox (FilterDriver *driver, const char *mbox, const char *source, CamelException *ex)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	CamelMimeParser *mp = NULL;
-	char *source_url = NULL;
-	int fd = -1;
-	int i = 0;
-	struct stat st;
-	
-	fd = open (mbox, O_RDONLY);
-	if (fd == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to open spool folder");
-		goto fail;
-	}
-	/* to get the filesize */
-	fstat (fd, &st);
-	
-	mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mp, TRUE);
-	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to process spool folder");
-		goto fail;
-	}
-	fd = -1;
-	
-	source_url = g_strdup_printf ("file://%s", mbox);
-	
-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
-		CamelMimeMessage *msg;
-		int pc = 0;
-		
-		if (st.st_size > 0)
-			pc = (int)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));
-		
-		report_status (driver, FILTER_STATUS_START, "Getting message %d (%d%% of file)", i, pc);
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			report_status (driver, FILTER_STATUS_END, "Failed message %d", i);
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Cannot open message");
-			camel_object_unref (CAMEL_OBJECT (msg));
-			goto fail;
-		}
-		
-		filter_driver_filter_message (driver, msg, NULL, source_url, source, ex);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed message %d", i);
-			goto fail;
-		}
-		
-		report_status (driver, FILTER_STATUS_END, "Finished message %d", i);
-		i++;
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-	}
-	
-	if (p->defaultfolder)
-		camel_folder_sync (p->defaultfolder, FALSE, ex);
-	
-fail:
-	g_free (source_url);
-	if (fd != -1)
-		close (fd);
-	if (mp)
-		camel_object_unref (CAMEL_OBJECT (mp));
-}
-
-/* will filter a folder */
-void
-filter_driver_filter_folder (FilterDriver *driver, CamelFolder *folder, const char *source,
-			     GPtrArray *uids, gboolean remove, CamelException *ex)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	int freeuids = FALSE;
-	CamelMimeMessage *message;
-	const CamelMessageInfo *info;
-	char *source_url, *service_url;
-	
-	service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (folder)));
-	source_url = g_strdup_printf ("%s%s", service_url, camel_folder_get_full_name (folder));
-	g_free (service_url);
-	
-	if (uids == NULL) {
-		uids = camel_folder_get_uids (folder);
-		freeuids = TRUE;
-	}
-	
-	for (i = 0; i < uids->len; i++) {
-		report_status (driver, FILTER_STATUS_START, "Getting message %d of %d", i+1, uids->len);
-		
-		message = camel_folder_get_message (folder, uids->pdata[i], ex);
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed at message %d of %d", i+1, uids->len);
-			break;
-		}
-		
-		if (camel_folder_has_summary_capability (folder))
-			info = camel_folder_get_message_info (folder, uids->pdata[i]);
-		else
-			info = NULL;
-		
-		filter_driver_filter_message (driver, message, (CamelMessageInfo *)info, source_url, source, ex);
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed at message %d of %d", i+1, uids->len);
-			break;
-		}
-		
-		if (remove)
-			camel_folder_set_message_flags (folder, uids->pdata[i],
-							CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-		
-		camel_object_unref (CAMEL_OBJECT (message));
-	}
-	
-	if (freeuids)
-		camel_folder_free_uids (folder, uids);
-	
-	if (p->defaultfolder)
-		camel_folder_sync (p->defaultfolder, FALSE, ex);
-	
-	g_free (source_url);
-}
-
-void
-filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
-			      const char *source_url, const char *source, CamelException *ex)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	ESExpResult *r;
-	GString *fsearch, *faction;
-	FilterFilter *rule;
-	gboolean freeinfo = FALSE;
-	gboolean filtered = FALSE;
-	
-	if (info == NULL) {
-		struct _header_raw *h = CAMEL_MIME_PART (message)->headers;
-		
-		info = camel_message_info_new_from_header (h);
-		freeinfo = TRUE;
-	} else {
-		if (info->flags & CAMEL_MESSAGE_DELETED)
-			return;
-	}
-	
-	p->ex = ex;
-	p->terminated = FALSE;
-	p->deleted = FALSE;
-	p->copied = FALSE;
-	p->message = message;
-	p->info = info;
-	
-	fsearch = g_string_new ("");
-	faction = g_string_new ("");
-	
-	rule = NULL;
-	while ((rule = (FilterFilter *)rule_context_next_rule ((RuleContext *)p->context, (FilterRule *)rule, source))) {
-		gboolean matched;
-		
-		g_string_truncate (fsearch, 0);
-		g_string_truncate (faction, 0);
-		
-		filter_rule_build_code (FILTER_RULE (rule), fsearch);
-		filter_filter_build_action (rule, faction);
-		
-		d(fprintf (stderr, "applying rule %s\n action %s\n", fsearch->str, faction->str));
-		
-		matched = filter_message_search (p->message, p->info, source_url, fsearch->str, p->ex);
-		
-		if (matched) {
-			filtered = TRUE;
-			filter_driver_log (driver, FILTER_LOG_START, FILTER_RULE (rule)->name);
-#ifndef NO_WARNINGS
-#warning "Must check expression parsed and executed properly?"
-#endif			
-			/* perform necessary filtering actions */
-			e_sexp_input_text (p->eval, faction->str, strlen (faction->str));
-			e_sexp_parse (p->eval);
-			r = e_sexp_eval (p->eval);
-			e_sexp_result_free (r);
-			if (p->terminated)
-				break;
-		}
-	}
-	
-	g_string_free (fsearch, TRUE);
-	g_string_free (faction, TRUE);
-	
-	/* *Now* we can set the DELETED flag... */
-	if (p->deleted)
-		info->flags = info->flags | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	
-	/* Logic: if !Moved and there exists a default folder... */
-	if (!(p->copied && p->deleted) && p->defaultfolder) {
-		/* copy it to the default inbox */
-		filtered = TRUE;
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");
-		camel_folder_append_message (p->defaultfolder, p->message, p->info, p->ex);
-	}
-	
-	if (freeinfo)
-		camel_message_info_free (info);
-	
-	if (filtered)
-		filter_driver_log (driver, FILTER_LOG_END, NULL);
-}
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
deleted file mode 100644
index 5e06870fe4..0000000000
--- a/filter/filter-editor.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "filter-editor.h"
-#include "filter-context.h"
-#include "filter-filter.h"
-
-#define d(x)
-
-#if 0
-static void filter_editor_class_init (FilterEditorClass *class);
-static void filter_editor_init (FilterEditor *gspaper);
-static void filter_editor_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterEditor *)(x))->priv)
-
-struct _FilterEditorPrivate {
-};
-
-static GnomeDialogClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterEditor",
-			sizeof(FilterEditor),
-			sizeof(FilterEditorClass),
-			(GtkClassInitFunc)filter_editor_class_init,
-			(GtkObjectInitFunc)filter_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_editor_class_init (FilterEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = filter_editor_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_editor_init (FilterEditor *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_editor_finalise (GtkObject *obj)
-{
-	FilterEditor *o = (FilterEditor *)obj;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_editor_new:
- *
- * Create a new FilterEditor object.
- * 
- * Return value: A new #FilterEditor object.
- **/
-FilterEditor *
-filter_editor_new (void)
-{
-	FilterEditor *o = (FilterEditor *)gtk_type_new (filter_editor_get_type ());
-	return o;
-}
-
-#endif
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-	char *current_source;
-};
-
-static void set_sensitive (struct _editor_data *data);
-
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterFilter *rule;
-	int result;
-	GtkWidget *gd;
-	GtkWidget *w;
-	FilterPart *part;
-	gboolean done = FALSE;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = filter_filter_new ();
-	filter_rule_set_source ((FilterRule *)rule, data->current_source);
-	
-	part = rule_context_next_part (data->f, NULL);
-	filter_rule_add_part ((FilterRule *)rule, filter_part_clone (part));
-	part = filter_context_next_action ((FilterContext *)data->f, NULL);
-	filter_filter_add_action (rule, filter_part_clone (part));
-	
-	w = filter_rule_get_widget ((FilterRule *)rule, data->f);
-	gd = gnome_dialog_new (_("Add Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-	
-		if (result == 0) {
-			GtkWidget *item;
-			GList *parts, *l = NULL;
-			gchar *s;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = ((FilterRule *)rule)->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = rule->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), ((FilterRule *)rule)->name);
-				item = gtk_list_item_new_with_label (s);
-				g_free (s);
-				
-				gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-				gtk_widget_show (item);
-				
-				l = g_list_append (l, GTK_LIST_ITEM (item));
-				
-				gtk_list_append_items (data->list, l);
-				gtk_list_select_child (data->list, item);
-				
-				data->current = (FilterRule *)rule;
-				rule_context_add_rule (data->f, (FilterRule *)rule);
-				
-				set_sensitive (data);
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			gtk_object_unref (GTK_OBJECT (rule));
-			done = TRUE;
-		}
-	}
-}
-
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	gboolean done = FALSE;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-		
-		if (result == 0) {
-			GList *parts;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = rule->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = ((FilterFilter *)rule)->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-				if (pos != -1) {
-					GtkListItem *item = g_list_nth_data (data->list->children, pos);
-					gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
-					gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
-					g_free (s);
-				}
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			done = TRUE;
-		}
-	}
-}
-
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("delete rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
-	if (pos != -1) {
-		rule_context_remove_rule (data->f, data->current);
-		
-		item = g_list_nth_data (data->list->children, pos);
-		l = g_list_append (NULL, item);
-		gtk_list_remove_items (data->list, l);
-		g_list_free (l);
-		
-		gtk_object_unref (GTK_OBJECT (data->current));
-		data->current = NULL;
-	}
-	
-	set_sensitive (data);
-}
-
-static void
-rule_move (struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule (data->f, data->current, to);
-	
-	item = g_list_nth_data (data->list->children, from);
-	l = g_list_append (NULL, item);
-	gtk_list_remove_items_no_unref (data->list, l);
-	gtk_list_insert_items (data->list, l, to);			      
-	gtk_list_select_child (data->list, GTK_WIDGET (item));
-	set_sensitive (data);
-}
-
-static void
-rule_up (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
-}
-
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	rule_move (data, pos, pos + 1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive (struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index = -1, count = 0;
-	
-	while ((rule = rule_context_next_rule (data->f, rule, data->current_source))) {
-		if (rule == data->current)
-			index = count;
-		count++;
-	}
-	
-	d(printf ("index = %d count=%d\n", index, count));
-	
-	count--;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DOWN]), index >= 0 && index < count);
-}
-
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
-	
-	if (data->current)
-		d(printf ("selected rule: %s\n", data->current->name));
-	else
-		d(printf ("bad data?\n"));
-	
-	set_sensitive (data);
-}
-
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	if (event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, user_data);
-}
-
-/* FIXME: we need a way to change a rule from one source type
- * to a different type. Maybe keep the selected ones? 
- */
-
-static void
-select_source (GtkMenuItem *mi, struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	GList *newitems = NULL;
-	char *source;
-	
-	source = gtk_object_get_data (GTK_OBJECT (mi), "source");
-	
-	gtk_list_clear_items (GTK_LIST (data->list), 0, -1);
-	
-	d(printf ("Checking for rules that are of type %d\n", source));
-	while ((rule = rule_context_next_rule (data->f, rule, source)) != NULL) {
-		GtkWidget *item;
-		char *s;
-		
-		d(printf ("   hit %s (%d)\n", rule->name, source));
-		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (GTK_WIDGET (item));
-		newitems = g_list_append (newitems, item);
-	}
-	
-	gtk_list_append_items (data->list, newitems);
-	data->current_source = source;
-	data->current = NULL;
-	set_sensitive (data);
-}
-
-static char *source_names[] = {
-	N_("incoming"),
-	/*"demand",*/
-	N_("outgoing")
-};
-
-GtkWidget *
-filter_editor_construct (struct _FilterContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w, *b, *firstitem = NULL;
-	GList *l;
-	struct _editor_data *data;
-	int i;
-	
-	g_assert (IS_FILTER_CONTEXT (f));
-	
-	data = g_malloc0 (sizeof (*data));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_filter");
-        d = glade_xml_get_widget (gui, "edit_filter");
-	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
-	
-	gtk_window_set_title (GTK_WINDOW (d), _("Edit Filters"));
-	for (i = 0; i < BUTTON_LAST; i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
-	}
-	
-        w = glade_xml_get_widget (gui, "filter_source");
-	l = GTK_MENU_SHELL (GTK_OPTION_MENU (w)->menu)->children;
-	i = 0;
-	while (l) {
-		b = GTK_WIDGET (l->data);
-		
-		if (i == 0)
-			firstitem = b;
-		
-		/* make sure that the glade is in sync with the source list! */
-		if (i < sizeof (source_names) / sizeof (source_names[0])) {
-			gtk_object_set_data (GTK_OBJECT (b), "source", source_names[i]);
-		} else {
-			g_warning("Glade file " FILTER_GLADEDIR "/filter.glade out of sync with editor code");
-		}
-		gtk_signal_connect (GTK_OBJECT (b), "activate", select_source, data);
-		
-		i++;
-		l = l->next;
-	}
-	
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = GTK_LIST (w);
-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
-	select_source (GTK_MENU_ITEM (firstitem), data);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
-}
diff --git a/filter/filter-editor.h b/filter/filter-editor.h
deleted file mode 100644
index 20369a9536..0000000000
--- a/filter/filter-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_EDITOR_H
-#define _FILTER_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define FILTER_EDITOR(obj)	GTK_CHECK_CAST (obj, filter_editor_get_type (), FilterEditor)
-#define FILTER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_editor_get_type (), FilterEditorClass)
-#define IS_FILTER_EDITOR(obj)      GTK_CHECK_TYPE (obj, filter_editor_get_type ())
-
-typedef struct _FilterEditor	FilterEditor;
-typedef struct _FilterEditorClass	FilterEditorClass;
-
-struct _FilterEditor {
-	GnomeDialog parent;
-	struct _FilterEditorPrivate *priv;
-
-};
-
-struct _FilterEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_editor_get_type	(void);
-FilterEditor	*filter_editor_new	(void);
-#endif
-
-struct _FilterContext;
-
-/* methods */
-GtkWidget	*filter_editor_construct	(struct _FilterContext *f);
-
-#endif /* ! _FILTER_EDITOR_H */
-
diff --git a/filter/filter-element.c b/filter/filter-element.c
deleted file mode 100644
index 56f47a8161..0000000000
--- a/filter/filter-element.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-element.h"
-#include "filter-input.h"
-#include "filter-option.h"
-#include "filter-code.h"
-#include "filter-colour.h"
-#include "filter-datespec.h"
-#include "filter-score.h"
-#include "filter-system-flag.h"
-#include "filter-folder.h"
-#include "filter-url.h"
-
-static gboolean validate (FilterElement *fe);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static FilterElement *clone(FilterElement *fe);
-
-static void filter_element_class_init	(FilterElementClass *class);
-static void filter_element_init	(FilterElement *gspaper);
-static void filter_element_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterElement *)(x))->priv)
-struct _FilterElementPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_element_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterElement",
-			sizeof(FilterElement),
-			sizeof(FilterElementClass),
-			(GtkClassInitFunc)filter_element_class_init,
-			(GtkObjectInitFunc)filter_element_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_element_class_init (FilterElementClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->finalize = filter_element_finalise;
-
-	/* override methods */
-	class->validate = validate;
-	class->xml_create = xml_create;
-	class->clone = clone;
-
-	/* signals */
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_element_init (FilterElement *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_element_finalise (GtkObject *obj)
-{
-	FilterElement *o = (FilterElement *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_element_new:
- *
- * Create a new FilterElement object.
- * 
- * Return value: A new #FilterElement object.
- **/
-FilterElement *
-filter_element_new (void)
-{
-	FilterElement *o = (FilterElement *)gtk_type_new(filter_element_get_type ());
-	return o;
-}
-
-gboolean
-filter_element_validate (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->validate (fe);
-}
-
-/**
- * filter_element_xml_create:
- * @fe: filter element
- * @node: xml node
- * 
- * Create a new filter element based on an xml definition of
- * that element.
- **/
-void
-filter_element_xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_create(fe, node);
-}
-
-/**
- * filter_element_xml_encode:
- * @fe: filter element
- * 
- * Encode the values of a filter element into xml format.
- * 
- * Return value: 
- **/
-xmlNodePtr
-filter_element_xml_encode (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_encode(fe);
-}
-
-/**
- * filter_element_xml_decode:
- * @fe: filter element
- * @node: xml node
- * 
- * Decode the values of a fitler element from xml format.
- * 
- * Return value: 
- **/
-int
-filter_element_xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_decode(fe, node);
-}
-
-/**
- * filter_element_clone:
- * @fe: filter element
- * 
- * Clones the FilterElement @fe.
- * 
- * Return value: 
- **/
-FilterElement *
-filter_element_clone (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->clone(fe);
-}
-
-/**
- * filter_element_get_widget:
- * @fe: filter element
- * @node: xml node
- * 
- * Create a widget to represent this element.
- * 
- * Return value: 
- **/
-GtkWidget *
-filter_element_get_widget (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->get_widget(fe);
-}
-
-/**
- * filter_element_build_code:
- * @fe: filter element
- * @out: output buffer
- * @ff: 
- * 
- * Add the code representing this element to the output string @out.
- **/
-void
-filter_element_build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->build_code(fe, out, ff);
-}
-
-/**
- * filter_element_format_sexp:
- * @fe: filter element
- * @out: output buffer
- * 
- * Format the value(s) of this element in a method suitable for the context of
- * sexp where it is used.  Usually as space separated, double-quoted strings.
- **/
-void
-filter_element_format_sexp (FilterElement *fe, GString *out)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->format_sexp(fe, out);
-}
-
-/**
- * filter_element_new_type_name:
- * @type: filter element type
- * 
- * Create a new filter element based on its type name.
- * 
- * Return value: 
- **/
-FilterElement *
-filter_element_new_type_name (const char *type)
-{
-	if (type == NULL)
-		return NULL;
-
-	if (!strcmp (type, "string")) {
-		return (FilterElement *)filter_input_new ();
-	} else if (!strcmp (type, "folder")) {
-		return (FilterElement *)filter_folder_new ();
-	} else if (!strcmp (type, "address")) {
-		/* FIXME: temporary ... need real address type */
-		return (FilterElement *)filter_input_new_type_name (type);
-	} else if (!strcmp (type, "code")) {
-		return (FilterElement *)filter_code_new ();
-	} else if (!strcmp (type, "colour")) {
-		return (FilterElement *)filter_colour_new ();
-	} else if (!strcmp (type, "optionlist")) {
-		return (FilterElement *)filter_option_new ();
-	} else if (!strcmp (type, "datespec")) {
-		return (FilterElement *)filter_datespec_new ();
-	} else if (!strcmp (type, "score")) {
-		return (FilterElement *)filter_score_new ();
-	} else if (!strcmp (type, "url")) {
-		return (FilterElement *)filter_url_new ();
-	} else if (!strcmp (type, "regex")) {
-		return (FilterElement *)filter_input_new_type_name (type);
-	} else if (!strcmp (type, "system-flag")) {
-		return (FilterElement *)filter_system_flag_new ();
-	} else {
-		g_warning("Unknown filter type '%s'", type);
-		return 0;
-	}
-}
-
-void
-filter_element_set_data (FilterElement *fe, gpointer data)
-{
-	fe->data = data;
-}
-
-/* default implementations */
-static gboolean
-validate (FilterElement *fe)
-{
-	return TRUE;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	fe->name = xmlGetProp (node, "name");
-}
-
-static FilterElement *
-clone (FilterElement *fe)
-{
-	xmlNodePtr node;
-	FilterElement *new;
-
-	new = (FilterElement *)gtk_type_new (GTK_OBJECT (fe)->klass->type);
-	node = filter_element_xml_encode (fe);
-	filter_element_xml_decode (new, node);
-	xmlFreeNodeList (node);
-	
-	return new;
-}
diff --git a/filter/filter-element.h b/filter/filter-element.h
deleted file mode 100644
index 2f784dfa36..0000000000
--- a/filter/filter-element.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_ELEMENT_H
-#define _FILTER_ELEMENT_H
-
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-
-#define FILTER_ELEMENT(obj)	GTK_CHECK_CAST (obj, filter_element_get_type (), FilterElement)
-#define FILTER_ELEMENT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_element_get_type (), FilterElementClass)
-#define IS_FILTER_ELEMENT(obj)      GTK_CHECK_TYPE (obj, filter_element_get_type ())
-
-typedef struct _FilterElement	FilterElement;
-typedef struct _FilterElementClass	FilterElementClass;
-
-struct _FilterElement {
-	GtkObject parent;
-	struct _FilterElementPrivate *priv;
-
-	char *name;
-	gpointer data;
-};
-
-struct _FilterPart;
-
-struct _FilterElementClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-	gboolean (*validate)(FilterElement *fe);
-	
-	void (*xml_create)(FilterElement *, xmlNodePtr);
-	xmlNodePtr (*xml_encode)(FilterElement *);
-	int (*xml_decode)(FilterElement *, xmlNodePtr);
-
-	FilterElement *(*clone)(FilterElement *fe);
-
-	GtkWidget *(*get_widget)(FilterElement *);
-	void (*build_code)(FilterElement *, GString *, struct _FilterPart *ff);
-	void (*format_sexp)(FilterElement *, GString *);
-
-	/* signals */
-};
-
-guint		filter_element_get_type	(void);
-FilterElement	*filter_element_new	(void);
-
-FilterElement	*filter_element_new_type_name	(const char *type);
-
-void            filter_element_set_data (FilterElement *fe, gpointer data);
-
-/* methods */
-gboolean        filter_element_validate         (FilterElement *fe);
-
-void		filter_element_xml_create	(FilterElement *fe, xmlNodePtr node);
-
-xmlNodePtr	filter_element_xml_encode	(FilterElement *fe);
-int		filter_element_xml_decode	(FilterElement *fe, xmlNodePtr node);
-FilterElement	*filter_element_clone		(FilterElement *fe);
-
-GtkWidget	*filter_element_get_widget	(FilterElement *fe);
-void		filter_element_build_code	(FilterElement *fe, GString *out, struct _FilterPart *ff);
-void		filter_element_format_sexp	(FilterElement *fe, GString *out);
-
-#endif /* ! _FILTER_ELEMENT_H */
-
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
deleted file mode 100644
index bcd92d8534..0000000000
--- a/filter/filter-filter.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "filter-filter.h"
-#include "filter-context.h"
-
-#define d(x)
-
-static xmlNodePtr xml_encode (FilterRule *);
-static int xml_decode (FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget (FilterRule *fr, struct _RuleContext *f);
-
-static void filter_filter_class_init (FilterFilterClass *class);
-static void filter_filter_init (FilterFilter *gspaper);
-static void filter_filter_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterFilter *)(x))->priv)
-
-struct _FilterFilterPrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_filter_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterFilter",
-			sizeof(FilterFilter),
-			sizeof(FilterFilterClass),
-			(GtkClassInitFunc)filter_filter_class_init,
-			(GtkObjectInitFunc)filter_filter_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_filter_class_init (FilterFilterClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_rule_get_type ());
-	
-	object_class->finalize = filter_filter_finalise;
-	
-	/* override methods */
-	filter_rule->xml_encode = xml_encode;
-	filter_rule->xml_decode = xml_decode;
-	/*filter_rule->build_code = build_code;*/
-	filter_rule->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_filter_init (FilterFilter *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-unref_list (GList *l)
-{
-	while (l) {
-		gtk_object_unref (GTK_OBJECT (l->data));
-		l = g_list_next (l);
-	}
-}
-
-static void
-filter_filter_finalise (GtkObject *obj)
-{
-	FilterFilter *o = (FilterFilter *)obj;
-	
-	unref_list (o->actions);
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_filter_new:
- *
- * Create a new FilterFilter object.
- * 
- * Return value: A new #FilterFilter object.
- **/
-FilterFilter *
-filter_filter_new (void)
-{
-	FilterFilter *o = (FilterFilter *)gtk_type_new(filter_filter_get_type ());
-	return o;
-}
-
-void
-filter_filter_add_action (FilterFilter *fr, FilterPart *fp)
-{
-	fr->actions = g_list_append (fr->actions, fp);
-}
-
-void
-filter_filter_remove_action (FilterFilter *fr, FilterPart *fp)
-{
-	fr->actions = g_list_remove (fr->actions, fp);
-}
-
-void
-filter_filter_replace_action (FilterFilter *fr, FilterPart *fp, FilterPart *new)
-{
-	GList *l;
-	
-	l = g_list_find (fr->actions, fp);
-	if (l) {
-		l->data = new;
-	} else {
-		fr->actions = g_list_append (fr->actions, new);
-	}
-}
-
-void
-filter_filter_build_action (FilterFilter *fr, GString *out)
-{
-	g_string_append (out, "(begin\n");
-	filter_part_build_code_list (fr->actions, out);
-	g_string_append (out, ")\n");
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	FilterFilter *ff = (FilterFilter *)fr;
-	
-        node = ((FilterRuleClass *)(parent_class))->xml_encode (fr);
-	g_assert (node != NULL);
-	set = xmlNewNode (NULL, "actionset");
-	xmlAddChild (node, set);
-	l = ff->actions;
-	while (l) {
-		work = filter_part_xml_encode ((FilterPart *)l->data);
-		xmlAddChild (set, work);
-		l = g_list_next (l);
-	}
-	
-	return node;
-
-}
-
-static void
-load_set (xmlNodePtr node, FilterFilter *ff, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *rulename;
-	FilterPart *part;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "part")) {
-			rulename = xmlGetProp (work, "name");
-			part = filter_context_find_action ((FilterContext *)f, rulename);
-			if (part) {
-				part = filter_part_clone (part);
-				filter_part_xml_decode (part, work);
-				filter_filter_add_action (ff, part);
-			} else {
-				g_warning ("cannot find rule part '%s'\n", rulename);
-			}
-			xmlFree (rulename);
-		} else {
-			g_warning ("Unknwon xml node in part: %s", work->name);
-		}
-		work = work->next;
-	}
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	xmlNodePtr work;
-	FilterFilter *ff = (FilterFilter *)fr;
-	int result;
-	
-        result = ((FilterRuleClass *)(parent_class))->xml_decode (fr, node, f);
-	if (result != 0)
-		return result;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "actionset")) {
-			load_set (work, ff, f);
-		}
-		work = work->next;
-	}
-	
-	return 0;
-}
-
-/*static void build_code(FilterRule *fr, GString *out)
-{
-        return ((FilterRuleClass *)(parent_class))->build_code(fr, out);
-}*/
-
-struct _part_data {
-	FilterRule *fr;
-	FilterContext *f;
-	FilterPart *part;
-	GtkWidget *partwidget, *container;
-};
-
-static void
-option_activate (GtkMenuItem *item, struct _part_data *data)
-{
-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");
-	FilterPart *newpart;
-	
-	/* dont update if we haven't changed */
-	if (!strcmp (part->title, data->part->title))
-		return;
-	
-	/* here we do a widget shuffle, throw away the old widget/rulepart,
-	   and create another */
-	if (data->partwidget)
-		gtk_container_remove (GTK_CONTAINER (data->container), data->partwidget);
-	
-	newpart = filter_part_clone (part);
-	filter_filter_replace_action ((FilterFilter *)data->fr, data->part, newpart);
-	gtk_object_unref (GTK_OBJECT (data->part));
-	data->part = newpart;
-	data->partwidget = filter_part_get_widget (newpart);
-	if (data->partwidget)
-		gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, FALSE, FALSE, 0);
-}
-
-static GtkWidget *
-get_rule_part_widget (FilterContext *f, FilterPart *newpart, FilterRule *fr)
-{
-	FilterPart *part = NULL;
-	GtkWidget *menu;
-	GtkWidget *item;
-	GtkWidget *omenu;
-	GtkWidget *hbox;
-	GtkWidget *p;
-	int index = 0, current = 0;
-	struct _part_data *data;
-	
-	data = g_malloc0 (sizeof (*data));
-	data->fr = fr;
-	data->f = f;
-	data->part = newpart;
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	p = filter_part_get_widget (newpart);
-	
-	data->partwidget = p;
-	data->container = hbox;
-	
-	menu = gtk_menu_new ();
-	while ((part = filter_context_next_action (f, part))) {
-		item = gtk_menu_item_new_with_label (_(part->title));
-		
-		gtk_object_set_data (GTK_OBJECT (item), "part", part);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		
-		if (!strcmp (newpart->title, part->title)) {
-			current = index;
-		}
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	gtk_widget_show (omenu);
-	
-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	if (p) {
-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);
-	}
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-struct _rule_data {
-	FilterRule *fr;
-	FilterContext *f;
-	GtkWidget *parts;
-};
-
-static void
-less_parts (GtkWidget *button, struct _rule_data *data)
-{
-	GList *l;
-	FilterPart *part;
-	GtkWidget *w;
-	
-	l = ((FilterFilter *)data->fr)->actions;
-	if (g_list_length (l) < 2)
-		return;
-	
-	/* remove the last one from the list */
-	l = g_list_last (l);
-	part = l->data;
-	filter_filter_remove_action ((FilterFilter *)data->fr, part);
-	gtk_object_unref (GTK_OBJECT (part));
-	
-	/* and from the display */
-	l = g_list_last (GTK_BOX (data->parts)->children);
-	w = ((GtkBoxChild *) l->data)->widget;
-	gtk_container_remove (GTK_CONTAINER (data->parts), w);
-	
-	/* if there's only 1 action, we can't remove anymore so set insensitive */
-	if (g_list_length (((FilterFilter *)data->fr)->actions) <= 1)
-		gtk_widget_set_sensitive (button, FALSE);
-}
-
-static void
-more_parts (GtkWidget *button, struct _rule_data *data)
-{
-	FilterPart *new;
-	GtkWidget *w;
-	
-	/* create a new rule entry, use the first type of rule */
-	new = filter_context_next_action ((FilterContext *)data->f, NULL);
-	if (new) {
-		new = filter_part_clone (new);
-		filter_filter_add_action ((FilterFilter *)data->fr, new);
-		w = get_rule_part_widget (data->f, new, data->fr);
-		gtk_box_pack_start (GTK_BOX (data->parts), w, FALSE, FALSE, 0);
-	}
-	
-	/* set the "Remove action" button sensitive */
-	if (g_list_length (((FilterFilter *)data->fr)->actions) > 1) {
-		w = gtk_object_get_data (GTK_OBJECT (button), "remove");
-		gtk_widget_set_sensitive (w, TRUE);
-	}
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget;
-	GtkWidget *parts, *inframe;
-	GtkWidget *hbox;
-	GtkWidget *add, *remove, *pixmap;
-	GtkWidget *w;
-	GtkWidget *frame;
-	GtkWidget *scrolledwindow;
-	GtkObject *hadj, *vadj;
-	GList *l;
-	FilterPart *part;
-	struct _rule_data *data;
-	FilterFilter *ff = (FilterFilter *)fr;
-	
-        widget = ((FilterRuleClass *)(parent_class))->get_widget (fr, f);
-	
-	/* and now for the action area */
-	frame = gtk_frame_new (_("Then"));
-	inframe = gtk_vbox_new (FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), inframe);
-	
-	parts = gtk_vbox_new (FALSE, 3);
-	data = g_malloc0 (sizeof (*data));
-	data->f = (FilterContext *)f;
-	data->fr = fr;
-	data->parts = parts;
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);
-	add = gnome_pixmap_button (pixmap, _("Add action"));
-	gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);
-	remove = gnome_pixmap_button (pixmap, _("Remove action"));
-	gtk_object_set_data (GTK_OBJECT (add), "remove", remove);
-	gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), remove, FALSE, FALSE, 3);
-	
-	/* if we only have 1 action, then we can't remove any more so disable this */
-	if (g_list_length (ff->actions) <= 1)
-		gtk_widget_set_sensitive (remove, FALSE);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3);
-	
-	l = ff->actions;
-	while (l) {
-		part = l->data;
-		d(printf ("adding action %s\n", part->title));
-		w = get_rule_part_widget ((FilterContext *)f, part, fr);
-		gtk_box_pack_start (GTK_BOX (parts), w, FALSE, FALSE, 3);
-		l = g_list_next (l);
-	}
-	
-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
-	
-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3);*/
-	
-	gtk_widget_show_all (frame);
-	
-	gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);
-	
-	return widget;
-}
diff --git a/filter/filter-filter.h b/filter/filter-filter.h
deleted file mode 100644
index 944aba42ae..0000000000
--- a/filter/filter-filter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_FILTER_H
-#define _FILTER_FILTER_H
-
-#include <gtk/gtk.h>
-#include "filter-rule.h"
-
-#define FILTER_FILTER(obj)	GTK_CHECK_CAST (obj, filter_filter_get_type (), FilterFilter)
-#define FILTER_FILTER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_filter_get_type (), FilterFilterClass)
-#define IS_FILTER_FILTER(obj)      GTK_CHECK_TYPE (obj, filter_filter_get_type ())
-
-typedef struct _FilterFilter	FilterFilter;
-typedef struct _FilterFilterClass	FilterFilterClass;
-
-struct _FilterFilter {
-	FilterRule parent;
-	struct _FilterFilterPrivate *priv;
-
-	GList *actions;
-};
-
-struct _FilterFilterClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_filter_get_type	(void);
-FilterFilter	*filter_filter_new	(void);
-
-/* methods */
-void		filter_filter_add_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_remove_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_replace_action	(FilterFilter *fr, FilterPart *fp, FilterPart *new);
-
-void		filter_filter_build_action	(FilterFilter *fr, GString *out);
-
-#endif /* ! _FILTER_FILTER_H */
-
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
deleted file mode 100644
index e00e61484e..0000000000
--- a/filter/filter-folder.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#define SHELL
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-folder.h"
-#ifdef SHELL
-#include "shell/evolution-shell-client.h"
-#endif
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-#ifdef SHELL
-extern EvolutionShellClient *global_shell_client;
-#endif
-
-static void filter_folder_class_init	(FilterFolderClass *class);
-static void filter_folder_init	(FilterFolder *gspaper);
-static void filter_folder_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterFolder *)(x))->priv)
-
-struct _FilterFolderPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-guint
-filter_folder_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterFolder",
-			sizeof(FilterFolder),
-			sizeof(FilterFolderClass),
-			(GtkClassInitFunc)filter_folder_class_init,
-			(GtkObjectInitFunc)filter_folder_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_folder_class_init (FilterFolderClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-
-	object_class->finalize = filter_folder_finalise;
-
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-}
-
-static void
-filter_folder_init (FilterFolder *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_folder_finalise (GtkObject *obj)
-{
-	FilterFolder *o = (FilterFolder *)obj;
-	
-	g_free (o->uri);
-	g_free (o->name);
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_folder_new:
- *
- * Create a new FilterFolder object.
- * 
- * Return value: A new #FilterFolder object.
- **/
-FilterFolder *
-filter_folder_new (void)
-{
-	FilterFolder *o = (FilterFolder *)gtk_type_new (filter_folder_get_type ());
-	return o;
-}
-
-static gboolean
-validate (FilterElement *fe)
-{
-	FilterFolder *ff = (FilterFolder *) fe;
-	
-	if (ff->uri && *ff->uri) {
-		return TRUE;
-	} else {
-		GtkWidget *dialog;
-		
-		dialog = gnome_ok_dialog (_("Oops, you forgot to choose a folder.\n"
-					    "Please go back and specify a valid folder to deliver mail to."));
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		
-		return FALSE;
-	}
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value, work;
-	FilterFolder *ff = (FilterFolder *)fe;
-	
-	d(printf ("Encoding folder as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "folder");
-	
-	work = xmlNewChild (value, NULL, "folder", NULL);
-	xmlSetProp (work, "name", ff->name);
-	xmlSetProp (work, "uri", ff->uri);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	xmlNodePtr n;
-	
-	d(printf ("Decoding folder from xml %p\n", fe));
-	
-	fe->name = xmlGetProp (node, "name");
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "folder")) {
-			ff->name = xmlGetProp (n, "name");
-			ff->uri = xmlGetProp (n, "uri");
-			break;
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-static void
-button_clicked (GtkButton *button, FilterFolder *ff)
-{
-#ifdef SHELL
-	const char *allowed_types[] = { "mail", NULL };
-	char *def, *physical_uri, *evolution_uri;
-	static gboolean is_active = FALSE;
-	gchar *s;
-	
-	if (is_active)
-		return;
-	
-	is_active = TRUE;
-	
-	def = ff->uri ? ff->uri : "";
-	
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   _("Select Folder"),
-						   def, allowed_types,
-						   &evolution_uri,
-						   &physical_uri);
-	
-	if (physical_uri != NULL && physical_uri[0] != '\0') {
-		g_free (ff->uri);
-		ff->uri = physical_uri;
-		
-		g_free (ff->name);
-		ff->name = g_strdup (g_basename (evolution_uri));
-		s = e_utf8_to_gtk_string (GTK_WIDGET (button), ff->name);
-		gtk_label_set_text (GTK_LABEL (GTK_BIN (button)->child), s);
-		g_free (s);
-	} else {
-		g_free (physical_uri);
-	}
-	g_free (evolution_uri);
-	
-	is_active = FALSE;
-#else
-	GnomeDialog *gd;
-	GtkEntry *entry;
-	char *uri, *str;
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("Enter folder URI"),
-					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-					     NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	entry = (GtkEntry *)gtk_entry_new();
-	if (ff->uri) {
-		e_utf8_gtk_entry_set_text(entry, ff->uri);
-	}
-	gtk_box_pack_start((GtkBox *)gd->vbox, (GtkWidget *)entry, TRUE, TRUE, 3);
-	gtk_widget_show((GtkWidget *)entry);
-	switch (gnome_dialog_run(gd)) {
-	case 0:
-		g_free(ff->uri);
-		g_free(ff->name);
-		uri = e_utf8_gtk_entry_get_text(entry);
-		ff->uri = uri;
-		str = strstr(uri, "//");
-		if (str)
-			str = strchr(str+2, '/');
-		if (str)
-			str++;
-		else
-			str = uri;
-		ff->name = g_strdup(str);
-		s = e_utf8_to_gtk_string ((GtkWidget *) button, ff->name);
-		gtk_label_set_text((GtkLabel *)GTK_BIN(button)->child, s);
-		g_free (s);
-	case 1:
-		gnome_dialog_close(gd);
-	case -1:
-		/* nothing */
-	}
-
-#endif
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	GtkWidget *button;
-	GtkWidget *label;
-	
-	if (ff->name && ff->name[0])
-		label = gtk_label_new (g_basename (ff->name));
-	else
-		label = gtk_label_new (_("<click here to select a folder>"));
-	
-	button = gtk_button_new ();
-	gtk_container_add (GTK_CONTAINER (button), label);
-	gtk_widget_show (button);
-	gtk_widget_show (label);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, ff);
-	
-	return button;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	
-	e_sexp_encode_string (out, ff->uri);
-}
diff --git a/filter/filter-folder.h b/filter/filter-folder.h
deleted file mode 100644
index ee52d7037b..0000000000
--- a/filter/filter-folder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_FOLDER_H
-#define _FILTER_FOLDER_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_FOLDER(obj)	GTK_CHECK_CAST (obj, filter_folder_get_type (), FilterFolder)
-#define FILTER_FOLDER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_folder_get_type (), FilterFolderClass)
-#define IS_FILTER_FOLDER(obj)      GTK_CHECK_TYPE (obj, filter_folder_get_type ())
-
-typedef struct _FilterFolder	FilterFolder;
-typedef struct _FilterFolderClass	FilterFolderClass;
-
-struct _FilterFolder {
-	FilterElement parent;
-	struct _FilterFolderPrivate *priv;
-
-	char *uri;
-	char *name;		/* name of folder for display? */
-};
-
-struct _FilterFolderClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_folder_get_type	(void);
-FilterFolder	*filter_folder_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_FOLDER_H */
-
diff --git a/filter/filter-input.c b/filter/filter-input.c
deleted file mode 100644
index 2304b39635..0000000000
--- a/filter/filter-input.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <regex.h>
-
-#include <gnome-xml/xmlmemory.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-input.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_input_class_init	(FilterInputClass *class);
-static void filter_input_init	(FilterInput *gspaper);
-static void filter_input_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterInput *)(x))->priv)
-
-struct _FilterInputPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_input_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterInput",
-			sizeof(FilterInput),
-			sizeof(FilterInputClass),
-			(GtkClassInitFunc)filter_input_class_init,
-			(GtkObjectInitFunc)filter_input_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_input_class_init (FilterInputClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_input_finalise;
-
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_input_init (FilterInput *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_input_finalise (GtkObject *obj)
-{
-	FilterInput *o = (FilterInput *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_input_new:
- *
- * Create a new FilterInput object.
- * 
- * Return value: A new #FilterInput object.
- **/
-FilterInput *
-filter_input_new (void)
-{
-	FilterInput *o = (FilterInput *)gtk_type_new(filter_input_get_type ());
-	return o;
-}
-
-FilterInput *
-filter_input_new_type_name (const char *type)
-{
-	FilterInput *o = filter_input_new ();
-	o->type = g_strdup (type);
-	
-	d(printf("new type %s = %p\n", type, o));
-	return o;
-}
-
-void
-filter_input_set_value (FilterInput *fi, const char *value)
-{
-	GList *l;
-	
-	l = fi->values;
-	while (l) {
-		g_free (l->data);
-		l = g_list_next (l);
-	}
-	g_list_free (fi->values);
-	
-	fi->values = g_list_append (NULL, g_strdup (value));
-}
-
-static gboolean
-validate (FilterElement *fe)
-{
-	FilterInput *fi = (FilterInput *)fe;
-	gboolean valid = TRUE;
-	
-	if (!strcmp (fi->type, "regex")) {
-		regex_t regexpat;        /* regex patern */
-		gint regerr;
-		char *text;
-		
-		text = fi->values->data;
-		
-		regerr = regcomp (&regexpat, text, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			GtkWidget *dialog;
-			gchar *regmsg, *errmsg;
-			size_t reglen;
-			
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			
-			errmsg = g_strdup_printf (_("Error in regular expression '%s':\n%s"),
-						  text, regmsg);
-			g_free (regmsg);
-			
-			dialog = gnome_ok_dialog (errmsg);
-			
-			gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-			
-			g_free (errmsg);
-			valid = FALSE;
-		}
-		
-		regfree (&regexpat);
-	}
-	
-	return valid;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-	
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-	char *type;
-	
-	type = fi->type ? fi->type : "string";
-	
-	d(printf ("Encoding %s as xml\n", type));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", type);
-	l = fi->values;
-	while (l) {
-                xmlNodePtr cur;
-		char *str = l->data;
-		char *encstr;
-		
-                cur = xmlNewChild (value, NULL, type, NULL);
-		encstr = e_utf8_xml1_encode (str);
-		xmlNodeSetContent (cur, encstr);
-		g_free (encstr);
-                l = g_list_next (l);
-	}
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterInput *fi = (FilterInput *)fe;
-	char *name, *str, *type;
-	xmlNodePtr n;
-	
-	type = fi->type ? fi->type : "string";
-	
-	d(printf("Decoding %s from xml %p\n", type, fe));
-	
-	name = xmlGetProp (node, "name");
-	d(printf ("Name = %s\n", name));
-	fe->name = name;
-	fi->type = xmlGetProp (node, "type");
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, type)) {
-			gchar *decstr;
-			str = xmlNodeGetContent (n);
-			decstr = e_utf8_xml1_decode (str);
-			if (str) xmlFree (str);
-			d(printf ("  '%s'\n", decstr));
-			fi->values = g_list_append (fi->values, decstr);
-		} else {
-			g_warning ("Unknown node type '%s' encountered decoding a %s\n", n->name, type);
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-static void
-entry_changed (GtkEntry *entry, FilterElement *fe)
-{
-	char *new;
-	FilterInput *fi = (FilterInput *)fe;
-	GList *l;
-	
-	new = e_utf8_gtk_entry_get_text(entry);
-	
-	/* NOTE: entry only supports a single value ... */
-	l = fi->values;
-	while (l) {
-		g_free (l->data);
-		l = g_list_next (l);
-	}
-	
-	g_list_free (fi->values);
-	
-	fi->values = g_list_append (NULL, new);
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *entry;
-	FilterInput *fi = (FilterInput *)fe;
-	
-	entry = gtk_entry_new ();
-	if (fi->values && fi->values->data) {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), fi->values->data);
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe);
-	
-	return entry;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-	
-	l = fi->values;
-	while (l) {
-		e_sexp_encode_string (out, l->data);
-		l = g_list_next (l);
-	}
-}
diff --git a/filter/filter-input.h b/filter/filter-input.h
deleted file mode 100644
index 0ce43d980d..0000000000
--- a/filter/filter-input.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_INPUT_H
-#define _FILTER_INPUT_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_INPUT(obj)	GTK_CHECK_CAST (obj, filter_input_get_type (), FilterInput)
-#define FILTER_INPUT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_input_get_type (), FilterInputClass)
-#define IS_FILTER_INPUT(obj)      GTK_CHECK_TYPE (obj, filter_input_get_type ())
-
-typedef struct _FilterInput	FilterInput;
-typedef struct _FilterInputClass	FilterInputClass;
-
-struct _FilterInput {
-	FilterElement parent;
-	struct _FilterInputPrivate *priv;
-
-	char *type;		/* name of type */
-	GList *values;		/* strings */
-};
-
-struct _FilterInputClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_input_get_type	(void);
-FilterInput	*filter_input_new	(void);
-
-FilterInput	*filter_input_new_type_name	(const char *type);
-
-/* methods */
-void		filter_input_set_value(FilterInput *fi, const char *value);
-
-#endif /* ! _FILTER_INPUT_H */
-
diff --git a/filter/filter-message-search.c b/filter/filter-message-search.c
deleted file mode 100644
index 415bdb170c..0000000000
--- a/filter/filter-message-search.c
+++ /dev/null
@@ -1,806 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "filter-message-search.h"
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-sexp.h>
-#include <regex.h>
-#include <string.h>
-#include <ctype.h>
-
-typedef struct {
-	CamelMimeMessage *message;
-	CamelMessageInfo *info;
-	const char *source;
-	CamelException *ex;
-} FilterMessageSearch;
-
-/* ESExp callbacks */
-static ESExpResult *header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms);
-static ESExpResult *body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-
-/* builtin functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "match-all",          (ESExpFunc *) match_all,          0 },
-	{ "body-contains",      (ESExpFunc *) body_contains,      0 },
-	{ "body-regex",         (ESExpFunc *) body_regex,         0 },
-	{ "header-contains",    (ESExpFunc *) header_contains,    0 },
-	{ "header-matches",     (ESExpFunc *) header_matches,     0 },
-	{ "header-starts-with", (ESExpFunc *) header_starts_with, 0 },
-	{ "header-ends-with",   (ESExpFunc *) header_ends_with,   0 },
-	{ "header-exists",      (ESExpFunc *) header_exists,      0 },
-	{ "header-soundex",     (ESExpFunc *) header_soundex,     0 },
-	{ "header-regex",       (ESExpFunc *) header_regex,       0 },
-	{ "header-full-regex",  (ESExpFunc *) header_full_regex,  0 },
-	{ "user-tag",           (ESExpFunc *) user_tag,           0 },
-	{ "user-flag",          (ESExpFunc *) user_flag,          0 },
-	{ "system-flag",        (ESExpFunc *) system_flag,        0 },
-	{ "get-sent-date",      (ESExpFunc *) get_sent_date,      0 },
-	{ "get-received-date",  (ESExpFunc *) get_received_date,  0 },
-	{ "get-current-date",   (ESExpFunc *) get_current_date,   0 },
-	{ "get-score",          (ESExpFunc *) get_score,          0 },
-	{ "get-source",         (ESExpFunc *) get_source,         0 },
-};
-
-static ESExpResult *
-header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			if (e_utf8_strstrcase (contents, match))
-				matched = TRUE;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c;
-			
-			/* remove any leading white space... */
-			for ( ; *contents && isspace (*contents); contents++);
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			if (is_lowercase) {
-				if (!g_strcasecmp (contents, match))
-					matched = TRUE;
-			} else {
-				if (!strcmp (contents, match))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents && strlen (contents) >= strlen (match)) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c;
-			
-			/* remove any leading white space... */
-			for ( ; *contents && isspace (*contents); contents++);
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			if (is_lowercase) {
-				if (!g_strncasecmp (contents, match, strlen (match)))
-					matched = TRUE;
-			} else {
-				if (!strncmp (contents, match, strlen (match)))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents && strlen (contents) >= strlen (match)) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c, *end;
-			
-			/* remove any leading white space... */
-			for ( ; *contents && isspace (*contents); contents++);
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			end = (char *) contents + strlen (contents) - strlen (match);
-			
-			if (is_lowercase) {
-				if (!g_strcasecmp (end, match))
-					matched = TRUE;
-			} else {
-				if (!strcmp (end, match))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 1) {
-		char *header = (argv[0])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents)
-			matched = TRUE;
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static unsigned char soundex_table[256] = {
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-static void
-soundexify (const gchar *sound, gchar code[5])
-{
-	guchar *c, last = '\0';
-	gint n;
-	
-	for (c = (guchar *) sound; *c && !isalpha (*c); c++);
-	code[0] = toupper (*c);
-	memset (code + 1, '0', 3);
-	for (n = 1; *c && n < 5; c++) {
-		guchar ch = soundex_table[*c];
-		
-		if (ch && ch != last) {
-			code[n++] = ch;
-			last = ch;
-		}
-	}
-	code[4] = '\0';
-}
-
-static gint
-soundexcmp (const gchar *sound1, const gchar *sound2)
-{
-	gchar code1[5], code2[5];
-	
-	soundexify (sound1, code1);
-	soundexify (sound2, code2);
-	
-	return strcmp (code1, code2);
-}
-
-static ESExpResult *
-header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			/* remove any leading white space... */
-			for ( ; *contents && isspace (*contents); contents++);
-			
-			if (!soundexcmp (contents, match))
-				matched = TRUE;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		regex_t regexpat;        /* regex patern */
-		regmatch_t *fltmatch;
-		gint regerr = 0;
-		size_t reglen = 0;
-		gchar *regmsg;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		regerr = regcomp (&regexpat, match, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			camel_exception_setv (fms->ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to perform regex search on message header: %s"),
-					      regmsg);
-			g_free (regmsg);
-			regfree (&regexpat);
-		} else {
-			if (contents) {
-				fltmatch = g_new0 (regmatch_t, regexpat.re_nsub);
-				
-				if (!regexec (&regexpat, contents, regexpat.re_nsub, fltmatch, 0))
-					matched = TRUE;
-				
-				g_free (fltmatch);
-				regfree (&regexpat);
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static gchar *
-get_full_header (CamelMimeMessage *message)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART (message);
-	GString *str = g_string_new ("");
-	char   *ret;
-	struct _header_raw *h;
-	
-	for (h = mp->headers; h; h = h->next) {
-		if (h->value != NULL)
-			g_string_sprintfa (str, "%s%s%s\n", h->name,
-					   isspace (h->value[0]) ? ":" : ": ", h->value);
-	}
-	
-	ret = str->str;
-	g_string_free (str, FALSE);
-	
-	return ret;
-}
-
-static ESExpResult *
-header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 1) {
-		char *match = (argv[0])->value.string;
-		regex_t regexpat;        /* regex patern */
-		regmatch_t *fltmatch;
-		gint regerr = 0;
-		size_t reglen = 0;
-		gchar *regmsg;
-		char *contents;
-		
-		contents = get_full_header (fms->message);
-		
-		regerr = regcomp (&regexpat, match, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			camel_exception_setv (fms->ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to perform regex search on message header: %s"),
-					      regmsg);
-			g_free (regmsg);
-			regfree (&regexpat);
-		} else {
-			if (contents) {
-				fltmatch = g_new0 (regmatch_t, regexpat.re_nsub);
-				
-				if (!regexec (&regexpat, contents, regexpat.re_nsub, fltmatch, 0))
-					matched = TRUE;
-				
-				g_free (fltmatch);
-				regfree (&regexpat);
-			}
-		}
-		g_free (contents);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms)
-{
-	/* match-all: when dealing with single messages is a no-op */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	if (argv[0]->type == ESEXP_RES_BOOL)
-		r->value.bool = argv[0]->value.bool;
-	else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static gboolean
-mime_part_matches (CamelMimePart *mime_part, const char *match, gboolean regex, CamelException *ex)
-{
-	CamelStream *stream;
-	GByteArray *array;
-	char *text;
-	regex_t regexpat;        /* regex patern */
-	regmatch_t *fltmatch;
-	gint regerr = 0;
-	size_t reglen = 0;
-	gchar *regmsg;
-	gboolean matched = FALSE;
-	
-	array = g_byte_array_new ();
-	stream = camel_stream_mem_new_with_byte_array (array);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_part), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	g_byte_array_append (array, "", 1);
-	
-	text = array->data;
-	
-	if (regex) {
-		regerr = regcomp (&regexpat, match, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "Failed to perform regex search on message body: %s",
-					      regmsg);
-			g_free (regmsg);
-			regfree (&regexpat);
-		} else {
-			fltmatch = g_new0 (regmatch_t, regexpat.re_nsub);
-			
-			if (!regexec (&regexpat, text, regexpat.re_nsub, fltmatch, 0))
-				matched = TRUE;
-			
-			g_free (fltmatch);
-			regfree (&regexpat);
-		}
-	} else {
-		if (strstr (text, match))
-			matched = TRUE;
-	}
-	
-	g_byte_array_free (array, TRUE);
-	
-	return matched;
-}
-
-static gboolean
-handle_multipart (CamelMultipart *multipart, const char *match, gboolean regex, CamelException *ex)
-{
-	gboolean matched = FALSE;
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts && !matched; i++) {
-		CamelContentType *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content = camel_mime_part_get_content_type (mime_part);
-		
-		if (header_content_type_is (content, "text", "*")) {
-			/* we only want to match text parts */
-			matched = mime_part_matches (mime_part, match, regex, ex);
-			
-			if (camel_exception_is_set (ex))
-				break;
-		} else if (header_content_type_is (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (mpart, match, regex, ex);
-			
-			if (camel_exception_is_set (ex))
-				break;
-		}
-	}
-	
-	return matched;
-}
-
-static ESExpResult *
-body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		CamelContentType *content;
-		char *match;
-		
-		match = (*argv)->value.string;
-		
-		content = camel_mime_part_get_content_type (CAMEL_MIME_PART (fms->message));
-		
-		if (header_content_type_is (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *multipart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (fms->message)));
-			multipart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (multipart, match, FALSE, fms->ex);
-		} else {
-			/* single-part message so just search the entire message */
-			matched = mime_part_matches (CAMEL_MIME_PART (fms->message), match, FALSE, fms->ex);
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		CamelContentType *content;
-		char *match;
-		
-		match = (*argv)->value.string;
-		
-		content = camel_mime_part_get_content_type (CAMEL_MIME_PART (fms->message));
-		
-		if (header_content_type_is (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *multipart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (fms->message)));
-			multipart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (multipart, match, TRUE, fms->ex);
-		} else {
-			/* single-part message so just search the entire message */
-			matched = mime_part_matches (CAMEL_MIME_PART (fms->message), match, TRUE, fms->ex);
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	int i;
-	
-	/* performs an OR of all words */
-	for (i = 0; i < argc && !truth; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING
-		    && camel_flag_get (&fms->info->user_flags, argv[i]->value.string)) {
-			truth = TRUE;
-			break;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	
-	if (argc == 1)
-		truth = camel_system_flag_get (fms->info->flags, argv[0]->value.string);
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, argv[0]->value.string);
-	
-	r = e_sexp_result_new (ESEXP_RES_STRING);
-	r->value.string = g_strdup (tag ? tag : "");
-	
-	return r;
-}
-
-static ESExpResult *
-get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date(fms->message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new(ESEXP_RES_INT);
-	r->value.number = camel_mime_message_get_date_received(fms->message, NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, "score");
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	if (tag)
-		r->value.number = atoi (tag);
-	else
-		r->value.number = 0;
-	
-	return r;
-}
-
-static ESExpResult *
-get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_STRING);
-	r->value.string = g_strdup (fms->source);
-	
-	return r;
-}
-
-gboolean
-filter_message_search (CamelMimeMessage *message, CamelMessageInfo *info,
-		       const char *source, const char *expression, CamelException *ex)
-{
-	FilterMessageSearch *fms;
-	ESExp *sexp;
-	ESExpResult *result;
-	gboolean retval;
-	int i;
-	
-	fms = g_new (FilterMessageSearch, 1);
-	fms->message = message;
-	fms->info = info;
-	fms->source = source;
-	fms->ex = ex;
-	
-	sexp = e_sexp_new ();
-	
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (sexp, 0, symbols[i].name,
-					      (ESExpIFunc *)symbols[i].func, fms);
-		} else {
-			e_sexp_add_function (sexp, 0, symbols[i].name,
-					     symbols[i].func, fms);
-		}
-	}
-	
-	e_sexp_input_text (sexp, expression, strlen (expression));
-	e_sexp_parse (sexp);
-	result = e_sexp_eval (sexp);
-	
-	g_free (fms);
-	
-	if (result->type == ESEXP_RES_BOOL)
-		retval = result->value.bool;
-	else
-		retval = FALSE;
-	
-	e_sexp_unref(sexp);
-	e_sexp_result_free (result);
-	
-	return retval;
-}
diff --git a/filter/filter-option.c b/filter/filter-option.c
deleted file mode 100644
index 6a81c75f95..0000000000
--- a/filter/filter-option.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "filter-option.h"
-#include "filter-part.h"
-#include "e-util/e-sexp.h"
-#include <gal/widgets/e-unicode.h>
-
-#define d(x)
-
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static FilterElement *clone(FilterElement *fe);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_option_class_init	(FilterOptionClass *class);
-static void filter_option_init	(FilterOption *gspaper);
-static void filter_option_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterOption *)(x))->priv)
-
-struct _FilterOptionPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_option_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterOption",
-			sizeof(FilterOption),
-			sizeof(FilterOptionClass),
-			(GtkClassInitFunc)filter_option_class_init,
-			(GtkObjectInitFunc)filter_option_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_option_class_init (FilterOptionClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_option_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->clone = clone;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_option_init (FilterOption *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_option_finalise (GtkObject *obj)
-{
-	FilterOption *o = (FilterOption *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_option_new:
- *
- * Create a new FilterOption object.
- * 
- * Return value: A new #FilterOption object.
- **/
-FilterOption *
-filter_option_new (void)
-{
-	FilterOption *o = (FilterOption *)gtk_type_new (filter_option_get_type ());
-	return o;
-}
-
-static struct _filter_option *
-find_option (FilterOption *fo, const char *name)
-{
-	GList *l = fo->options;
-	struct _filter_option *op;
-	
-	while (l) {
-		op = l->data;
-		if (!strcmp (name, op->value)) {
-			return op;
-		}
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-void
-filter_option_set_current (FilterOption *option, const char *name)
-{
-	g_assert(IS_FILTER_OPTION(option));
-	
-	option->current = find_option (option, name);
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	xmlNodePtr n, work;
-	struct _filter_option *op;
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "option")) {
-			op = g_malloc0 (sizeof (*op));
-			op->value = xmlGetProp (n, "value");
-			work = n->childs;
-			while (work) {
-				if (!strcmp (work->name, "title")) {
-					if (!op->title) {
-						gchar *str, *decstr;
-						str = xmlNodeGetContent (work);
-						decstr = e_utf8_xml1_decode (str);
-						if (str) xmlFree (str);
-						op->title = decstr;
-					}
-				} else if (!strcmp (work->name, "code")) {
-					if (!op->code) {
-						gchar *str, *decstr;
-						str = xmlNodeGetContent (work);
-						decstr = e_utf8_xml1_decode (str);
-						if (str) xmlFree (str);
-						op->code = decstr;
-					}
-				}
-				work = work->next;
-			}
-			d(printf ("creating new option:\n title %s\n value %s\n code %s\n",
-				  op->title, op->value, op->code));
-			fo->options = g_list_append (fo->options, op);
-			if (fo->current == NULL)
-				fo->current = op;
-		} else {
-			g_warning ("Unknown xml node within optionlist: %s\n", n->name);
-		}
-		n = n->next;
-	}
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterOption *fo = (FilterOption *)fe;
-	
-	d(printf ("Encoding option as xml\n"));
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "option");
-	if (fo->current) {
-		xmlSetProp (value, "value", fo->current->value);
-	}
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	char *value;
-	
-	d(printf ("Decoding option from xml\n"));
-	fe->name = xmlGetProp (node, "name");
-	value = xmlGetProp (node, "value");
-	if (value) {
-		fo->current = find_option (fo, value);
-		xmlFree (value);
-	} else {
-		fo->current = NULL;
-	}
-	return 0;
-}
-
-static void
-option_changed (GtkWidget *widget, FilterElement *fe)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	
-	fo->current = gtk_object_get_data (GTK_OBJECT (widget), "option");
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	GtkWidget *menu;
-	GtkWidget *omenu;
-	GtkWidget *item;
-	GtkWidget *first = NULL;
-	GList *l = fo->options;
-	struct _filter_option *op;
-	int index = 0, current = 0;
-	
-	menu = gtk_menu_new ();
-	while (l) {
-		op = l->data;
-		item = gtk_menu_item_new_with_label (_(op->title));
-		gtk_object_set_data (GTK_OBJECT (item), "option", op);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, fe);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		if (op == fo->current) {
-			current = index;
-			first = item;
-		} else if (!first) {
-			first = item;
-		}
-		
-		l = g_list_next (l);
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	
-	if (first)
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe);
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	
-	return omenu;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	
-	d(printf ("building option code %p, current = %p\n", fo, fo->current));
-	
-	if (fo->current) {
-		filter_part_expand_code (ff, fo->current->code, out);
-	}
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	
-	if (fo->current) {
-		e_sexp_encode_string (out, fo->current->value);
-	}
-}
-
-static FilterElement *
-clone (FilterElement *fe)
-{
-	FilterOption *fo = (FilterOption *)fe, *new;
-	GList *l;
-	struct _filter_option *fn, *op;
-	
-	d(printf ("cloning option\n"));
-	
-        new = FILTER_OPTION (((FilterElementClass *)(parent_class))->clone(fe));
-	l = fo->options;
-	while (l) {
-		op = l->data;
-		fn = g_malloc (sizeof (*fn));
-		d(printf ("  option %s\n", op->title));
-		fn->title = g_strdup (op->title);
-		fn->value = g_strdup (op->value);
-		fn->code = g_strdup (op->code);
-		new->options = g_list_append (new->options, fn);
-		l = g_list_next (l);
-		
-		if (new->current == NULL)
-			new->current = fn;
-	}
-	
-	d(printf ("cloning option code %p, current = %p\n", new, new->current));
-	
-	return (FilterElement *)new;
-}
diff --git a/filter/filter-option.h b/filter/filter-option.h
deleted file mode 100644
index 1bbec79d84..0000000000
--- a/filter/filter-option.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_OPTION_H
-#define _FILTER_OPTION_H
-
-#include <gtk/gtk.h>
-
-#include "filter-element.h"
-
-#define FILTER_OPTION(obj)	GTK_CHECK_CAST (obj, filter_option_get_type (), FilterOption)
-#define FILTER_OPTION_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_option_get_type (), FilterOptionClass)
-#define IS_FILTER_OPTION(obj)      GTK_CHECK_TYPE (obj, filter_option_get_type ())
-
-typedef struct _FilterOption	FilterOption;
-typedef struct _FilterOptionClass	FilterOptionClass;
-
-struct _filter_option {
-	char *title;		/* button title */
-	char *value;		/* value, if it has one */
-	char *code;		/* used to string code segments together */
-};
-
-struct _FilterOption {
-	FilterElement parent;
-	struct _FilterOptionPrivate *priv;
-
-	GList *options;
-	struct _filter_option *current;
-};
-
-struct _FilterOptionClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_option_get_type	(void);
-FilterOption	*filter_option_new	(void);
-
-/* methods */
-void		filter_option_set_current(FilterOption *option, const char *name);
-
-#endif /* ! _FILTER_OPTION_H */
-
diff --git a/filter/filter-part.c b/filter/filter-part.c
deleted file mode 100644
index 5d9df3a617..0000000000
--- a/filter/filter-part.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include <gnome-xml/xmlmemory.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-part.h"
-#include "filter-element.h"
-
-#define d(x)
-
-static void filter_part_class_init	(FilterPartClass *class);
-static void filter_part_init	(FilterPart *gspaper);
-static void filter_part_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterPart *)(x))->priv)
-
-struct _FilterPartPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_part_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterPart",
-			sizeof(FilterPart),
-			sizeof(FilterPartClass),
-			(GtkClassInitFunc)filter_part_class_init,
-			(GtkObjectInitFunc)filter_part_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_part_class_init (FilterPartClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gtk_object_get_type ());
-	
-	object_class->finalize = filter_part_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_part_init (FilterPart *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_part_finalise(GtkObject *obj)
-{
-	FilterPart *o = (FilterPart *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_part_new:
- *
- * Create a new FilterPart object.
- * 
- * Return value: A new #FilterPart object.
- **/
-FilterPart *
-filter_part_new (void)
-{
-	FilterPart *o = (FilterPart *)gtk_type_new(filter_part_get_type ());
-	return o;
-}
-
-gboolean
-filter_part_validate (FilterPart *fp)
-{
-	gboolean correct = TRUE;
-	GList *l;
-	
-	l = fp->elements;
-	while (l && correct) {
-		FilterElement *fe = l->data;
-		
-	        correct = filter_element_validate (fe);
-		
-		l = l->next;
-	}
-	
-	return correct;
-}
-
-int
-filter_part_xml_create (FilterPart *ff, xmlNodePtr node)
-{
-	xmlNodePtr n;
-	char *type;
-	FilterElement *el;
-	
-	ff->name = xmlGetProp(node, "name");
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "input")) {
-			type = xmlGetProp (n, "type");
-			d(printf ("creating new element type input '%s'\n", type));
-			if (type != NULL
-			    && (el = filter_element_new_type_name (type)) != NULL) {
-				filter_element_xml_create (el, n);
-				xmlFree (type);
-				d(printf ("adding element part %p %s\n", el, el->name));
-				ff->elements = g_list_append (ff->elements, el);
-			} else {
-				g_warning ("Invalid xml format, missing/unknown input type");
-			}
-		} else if (!strcmp (n->name, "title")) {
-			if (!ff->title) {
-				gchar *str, *decstr;
-				str = xmlNodeGetContent (n);
-				decstr = e_utf8_xml1_decode (str);
-				if (str) xmlFree (str);
-				ff->title = decstr;
-			}
-		} else if (!strcmp (n->name, "code")) {
-			if (!ff->code) {
-				gchar *str, *decstr;
-				str = xmlNodeGetContent (n);
-				decstr = e_utf8_xml1_decode (str);
-				if (str) xmlFree (str);
-				ff->code = decstr;
-			}
-		} else {
-			g_warning ("Unknwon part element in xml: %s\n", n->name);
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-xmlNodePtr
-filter_part_xml_encode (FilterPart *fp)
-{
-	GList *l;
-	FilterElement *fe;
-	xmlNodePtr part, value;
-	
-	g_return_val_if_fail (fp != NULL, NULL);
-	
-	part = xmlNewNode (NULL, "part");
-	xmlSetProp (part, "name", fp->name);
-	l = fp->elements;
-	while (l) {
-		fe = l->data;
-		value = filter_element_xml_encode (fe);
-		xmlAddChild (part, value);
-		l = g_list_next (l);
-	}
-	
-	return part;
-}
-
-
-int
-filter_part_xml_decode (FilterPart *fp, xmlNodePtr node)
-{
-	FilterElement *fe;
-	xmlNodePtr n;
-	char *name;
-	
-	g_return_val_if_fail (fp != NULL, -1);
-	g_return_val_if_fail (node != NULL, -1);
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "value")) {
-			name = xmlGetProp (n, "name");
-			d(printf ("finding element part %p %s = %p\n", name, name, fe));
-			fe = filter_part_find_element (fp, name);
-			d(printf ("finding element part %p %s = %p\n", name, name, fe));
-			xmlFree (name);
-			if (fe) {
-				filter_element_xml_decode (fe, n);
-			}
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-FilterPart *
-filter_part_clone (FilterPart *fp)
-{
-	FilterPart *new;
-	GList *l;
-	FilterElement *fe, *ne;
-	
-	new = (FilterPart *)gtk_type_new ((GTK_OBJECT (fp))->klass->type);
-	new->name = g_strdup (fp->name);
-	new->title = g_strdup (fp->title);
-	new->code = g_strdup (fp->code);
-	l = fp->elements;
-	while (l) {
-		fe = l->data;
-		ne = filter_element_clone (fe);
-		new->elements = g_list_append (new->elements, ne);
-		l = g_list_next (l);
-	}
-	
-	return new;
-}
-
-FilterElement *
-filter_part_find_element (FilterPart *ff, const char *name)
-{
-	GList *l = ff->elements;
-	FilterElement *fe;
-	
-	if (name == NULL)
-		return NULL;
-	
-	while (l) {
-		fe = l->data;
-		if (fe->name && !strcmp (fe->name, name))
-			return fe;
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-
-GtkWidget *
-filter_part_get_widget (FilterPart *ff)
-{
-	GtkWidget *hbox;
-	GList *l = ff->elements;
-	FilterElement *fe;
-	GtkWidget *w;
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	
-	while (l) {
-		fe = l->data;
-		w = filter_element_get_widget (fe);
-		if (w) {
-			gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 3);
-		}
-		l = g_list_next (l);
-	}
-	
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-/**
- * filter_part_build_code:
- * @ff: 
- * @out: 
- * 
- * Outputs the code of a part.
- **/
-void
-filter_part_build_code (FilterPart *ff, GString *out)
-{
-	GList *l = ff->elements;
-	FilterElement *fe;
-	
-	if (ff->code) {
-		filter_part_expand_code (ff, ff->code, out);
-	}
-	while (l) {
-		fe = l->data;
-		filter_element_build_code (fe, out, ff);
-		l = g_list_next (l);
-	}	
-}
-
-/**
- * filter_part_build_code_list:
- * @l: 
- * @out: 
- * 
- * Construct a list of the filter parts code into
- * a single string.
- **/
-void
-filter_part_build_code_list (GList *l, GString *out)
-{
-	FilterPart *fp;
-	
-	while (l) {
-		fp = l->data;
-		filter_part_build_code (fp, out);
-		g_string_append (out, "\n  ");
-		l = g_list_next (l);
-	}
-}
-
-/**
- * filter_part_find_list:
- * @l: 
- * @name: 
- * 
- * Find a filter part stored in a list.
- * 
- * Return value: 
- **/
-FilterPart *
-filter_part_find_list (GList *l, const char *name)
-{
-	FilterPart *part;
-	
-	d(printf ("Find part named %s\n", name));
-	
-	while (l) {
-		part = l->data;
-		if (!strcmp (part->name, name)) {
-			d(printf ("Found!\n"));
-			return part;
-		}
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-/**
- * filter_part_next_list:
- * @l: 
- * @last: The last item retrieved, or NULL to start
- * from the beginning of the list.
- * 
- * Iterate through a filter part list.
- * 
- * Return value: The next value in the list, or NULL if the
- * list is expired.
- **/
-FilterPart *
-filter_part_next_list (GList *l, FilterPart *last)
-{
-	GList *node = l;
-	
-	if (last != NULL) {
-		node = g_list_find (node, last);
-		if (node == NULL)
-			node = l;
-		else
-			node = g_list_next (node);
-	}
-	if (node)
-		return node->data;
-	
-	return NULL;
-}
-
-/**
- * filter_part_expand_code:
- * @ff: 
- * @str: 
- * @out: 
- * 
- * Expands the variables in string @str based on the values of the part.
- **/
-void
-filter_part_expand_code (FilterPart *ff, const char *source, GString *out)
-{
-	const char *newstart, *start, *end;
-	char *name = alloca (32);
-	int len, namelen = 32;
-	FilterElement *fe;
-	
-	start = source;
-	while ( (newstart = strstr (start, "${"))
-		&& (end = strstr (newstart+2, "}")) ) {
-		len = end - newstart - 2;
-		if (len + 1 > namelen) {
-			namelen = (len + 1) * 2;
-			name = alloca (namelen);
-		}
-		memcpy (name, newstart+2, len);
-		name[len] = 0;
-		fe = filter_part_find_element (ff, name);
-		d(printf("expand code: looking up variab le '%s' = %p\n", name, fe));
-		if (fe) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
-			filter_element_format_sexp (fe, out);
-#if 0
-		} else if ( (val = g_hash_table_lookup (ff->globals, name)) ) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
-			e_sexp_encode_string (out, val);
-#endif
-		} else {
-			g_string_sprintfa (out, "%.*s", end-start+1, start);
-		}
-		start = end + 1;
-	}
-	g_string_append (out, start);
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	xmlDocPtr system;
-	FilterPart *ff;
-	GtkWidget *w;
-	GnomeDialog *gd;
-	xmlNodePtr node;
-	GString *code;
-
-	gnome_init("test", "0.0", argc, argv);
-
-	system = xmlParseFile("form.xml");
-	if (system==NULL) {
-		printf("i/o error\n");
-		return 1;
-	}
-
-	ff = filter_part_new();
-	filter_part_xml_create(ff, system->root);
-
-	w = filter_part_get_widget(ff);
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("Test"), GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-
-	gnome_dialog_run_and_close(gd);
-
-	code = g_string_new("");
-	filter_part_build_code(ff, code);
-	printf("code is:\n%s\n", code->str);
-
-	return 0;
-}
-#endif
diff --git a/filter/filter-part.h b/filter/filter-part.h
deleted file mode 100644
index bc9424486b..0000000000
--- a/filter/filter-part.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_PART_H
-#define _FILTER_PART_H
-
-#include <gtk/gtk.h>
-#include "filter-input.h"
-
-#define FILTER_PART(obj)	GTK_CHECK_CAST (obj, filter_part_get_type (), FilterPart)
-#define FILTER_PART_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_part_get_type (), FilterPartClass)
-#define IS_FILTER_PART(obj)      GTK_CHECK_TYPE (obj, filter_part_get_type ())
-
-typedef struct _FilterPart	FilterPart;
-typedef struct _FilterPartClass	FilterPartClass;
-
-struct _FilterPart {
-	GtkObject parent;
-	struct _FilterPartPrivate *priv;
-
-	char *name;
-	char *title;
-	char *code;
-	GList *elements;
-};
-
-struct _FilterPartClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_part_get_type	(void);
-FilterPart	*filter_part_new	(void);
-
-/* methods */
-gboolean        filter_part_validate    (FilterPart *fp);
-
-int		filter_part_xml_create	(FilterPart *ff, xmlNodePtr node);
-
-xmlNodePtr	filter_part_xml_encode	(FilterPart *fe);
-int		filter_part_xml_decode	(FilterPart *fe, xmlNodePtr node);
-
-FilterPart	*filter_part_clone	(FilterPart *fp);
-
-FilterElement	*filter_part_find_element(FilterPart *ff, const char *name);
-
-GtkWidget	*filter_part_get_widget		(FilterPart *ff);
-void		filter_part_build_code		(FilterPart *ff, GString *out);
-void		filter_part_expand_code		(FilterPart *ff, const char *str, GString *out);
-
-/* static functions */
-void		filter_part_build_code_list	(GList *l, GString *out);
-FilterPart	*filter_part_find_list		(GList *l, const char *name);
-FilterPart	*filter_part_next_list		(GList *l, FilterPart *last);
-
-#endif /* ! _FILTER_PART_H */
-
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
deleted file mode 100644
index c5d36d3496..0000000000
--- a/filter/filter-rule.c
+++ /dev/null
@@ -1,693 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-rule.h"
-#include "filter-context.h"
-
-#define d(x)
-
-static xmlNodePtr xml_encode (FilterRule *);
-static int xml_decode (FilterRule *, xmlNodePtr, RuleContext *);
-static void build_code (FilterRule *, GString * out);
-static GtkWidget *get_widget (FilterRule * fr, struct _RuleContext *f);
-
-static void filter_rule_class_init (FilterRuleClass * class);
-static void filter_rule_init (FilterRule * gspaper);
-static void filter_rule_finalise (GtkObject * obj);
-
-#define _PRIVATE(x) (((FilterRule *)(x))->priv)
-
-struct _FilterRulePrivate {
-	GtkWidget *parts;	/* where the parts are stored */
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_rule_get_type ()
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterRule",
-			sizeof (FilterRule),
-			sizeof (FilterRuleClass),
-			(GtkClassInitFunc) filter_rule_class_init,
-			(GtkObjectInitFunc) filter_rule_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type(), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_rule_class_init (FilterRuleClass * class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (gtk_object_get_type());
-	
-	object_class->finalize = filter_rule_finalise;
-	
-	/* override methods */
-	class->xml_encode = xml_encode;
-	class->xml_decode = xml_decode;
-	class->build_code = build_code;
-	class->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_rule_init (FilterRule * o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-unref_list (GList * l)
-{
-	while (l) {
-		gtk_object_unref (GTK_OBJECT (l->data));
-		l = g_list_next (l);
-	}
-}
-
-static void
-filter_rule_finalise (GtkObject * obj)
-{
-	FilterRule *o = (FilterRule *) obj;
-
-	g_free (o->name);
-	g_free (o->source);
-	unref_list (o->parts);
-	
-	((GtkObjectClass *) (parent_class))->finalize(obj);
-}
-
-/**
- * filter_rule_new:
- *
- * Create a new FilterRule object.
- * 
- * Return value: A new #FilterRule object.
- **/
-FilterRule *
-filter_rule_new ()
-{
-	FilterRule *o = (FilterRule *) gtk_type_new (filter_rule_get_type());
-	
-	return o;
-}
-
-FilterRule *
-filter_rule_clone(FilterRule *base, RuleContext *f)
-{
-	xmlNodePtr xml;
-	FilterRule *rule;
-
-	/* TODO: do this more directly/efficiently */
-	xml = filter_rule_xml_encode(base);
-	rule = gtk_type_new(((GtkObject *)base)->klass->type);
-	filter_rule_xml_decode(rule, xml, f);
-	xmlFreeNodeList(xml);
-
-	return rule;
-}
-
-void
-filter_rule_set_name (FilterRule *fr, const char *name)
-{
-	g_free (fr->name);
-	fr->name = g_strdup (name);
-}
-
-void
-filter_rule_set_source (FilterRule *fr, const char *source)
-{
-	g_free (fr->source);
-	fr->source = g_strdup (source);
-}
-
-xmlNodePtr
-filter_rule_xml_encode (FilterRule *fr)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->xml_encode(fr);
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	
-	node = xmlNewNode (NULL, "rule");
-	switch (fr->grouping) {
-	case FILTER_GROUP_ALL:
-		xmlSetProp (node, "grouping", "all");
-		break;
-	case FILTER_GROUP_ANY:
-		xmlSetProp (node, "grouping", "any");
-		break;
-	}
-	
-	if (fr->source) {
-		xmlSetProp (node, "source", fr->source);
-	} else {
-		/* set to the default filter type */
-		xmlSetProp (node, "source", "incoming");
-	}
-	
-	if (fr->name) {
-		gchar *encstr;
-		work = xmlNewNode (NULL, "title");
-		encstr = e_utf8_xml1_encode (fr->name);
-		xmlNodeSetContent (work, encstr);
-		g_free (encstr);
-		xmlAddChild (node, work);
-	}
-	
-	set = xmlNewNode (NULL, "partset");
-	xmlAddChild (node, set);
-	l = fr->parts;
-	while (l) {
-		work = filter_part_xml_encode ((FilterPart *) l->data);
-		xmlAddChild (set, work);
-		l = g_list_next (l);
-	}
-	
-	return node;
-}
-
-static void
-load_set (xmlNodePtr node, FilterRule *fr, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *rulename;
-	FilterPart *part;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "part")) {
-			rulename = xmlGetProp (work, "name");
-			part = rule_context_find_part (f, rulename);
-			if (part) {
-				part = filter_part_clone (part);
-				filter_part_xml_decode (part, work);
-				filter_rule_add_part (fr, part);
-			} else {
-				g_warning ("cannot find rule part '%s'\n", rulename);
-			}
-			xmlFree (rulename);
-		} else {
-			g_warning ("Unknwon xml node in part: %s", work->name);
-		}
-		work = work->next;
-	}
-}
-
-int
-filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->xml_decode(fr, node, f);
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *grouping;
-	char *source;
-	
-	if (fr->name) {
-		g_free (fr->name);
-		fr->name = NULL;
-	}
-	
-	grouping = xmlGetProp (node, "grouping");
-	if (!strcmp (grouping, "any"))
-		fr->grouping = FILTER_GROUP_ANY;
-	else
-		fr->grouping = FILTER_GROUP_ALL;
-	xmlFree (grouping);
-	
-	source = xmlGetProp (node, "source");
-	if (source) {
-		fr->source = source;
-	} else {
-		/* default filter type */
-		fr->source = g_strdup ("incoming");
-	}
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "partset")) {
-			load_set (work, fr, f);
-		} else if (!strcmp (work->name, "title")) {
-			if (!fr->name) {
-				gchar *str, *decstr;
-				str = xmlNodeGetContent (work);
-				decstr = e_utf8_xml1_decode (str);
-				if (str) xmlFree (str);
-				fr->name = decstr;
-			}
-		}
-		work = work->next;
-	}
-	
-	return 0;
-}
-
-void
-filter_rule_add_part (FilterRule *fr, FilterPart *fp)
-{
-	fr->parts = g_list_append (fr->parts, fp);
-}
-
-void
-filter_rule_remove_part (FilterRule *fr, FilterPart *fp)
-{
-	fr->parts = g_list_remove (fr->parts, fp);
-}
-
-void
-filter_rule_replace_part (FilterRule *fr, FilterPart *fp, FilterPart *new)
-{
-	GList *l;
-	
-	l = g_list_find (fr->parts, fp);
-	if (l) {
-		l->data = new;
-	} else {
-		fr->parts = g_list_append (fr->parts, new);
-	}
-}
-
-void
-filter_rule_build_code (FilterRule *fr, GString *out)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->build_code(fr, out);
-}
-
-static void
-build_code (FilterRule *fr, GString *out)
-{
-	switch (fr->grouping) {
-	case FILTER_GROUP_ALL:
-		g_string_append (out, " (and\n  ");
-		break;
-	case FILTER_GROUP_ANY:
-		g_string_append (out, " (or\n  ");
-		break;
-	default:
-		g_warning ("Invalid grouping");
-	}
-	
-	filter_part_build_code_list (fr->parts, out);
-	g_string_append (out, ")\n");
-}
-
-static void
-match_all (GtkWidget *widget, FilterRule *fr)
-{
-	fr->grouping = FILTER_GROUP_ALL;
-}
-
-static void
-match_any (GtkWidget *widget, FilterRule *fr)
-{
-	fr->grouping = FILTER_GROUP_ANY;
-}
-
-struct _part_data {
-	FilterRule *fr;
-	RuleContext *f;
-	FilterPart *part;
-	GtkWidget *partwidget, *container;
-};
-
-static void
-option_activate (GtkMenuItem *item, struct _part_data *data)
-{
-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");
-	FilterPart *newpart;
-	
-	/* dont update if we haven't changed */
-	if (!strcmp (part->title, data->part->title))
-		return;
-	
-	/* here we do a widget shuffle, throw away the old widget/rulepart,
-	   and create another */
-	if (data->partwidget)
-		gtk_container_remove (GTK_CONTAINER (data->container), data->partwidget);
-	
-	newpart = filter_part_clone (part);
-	filter_rule_replace_part (data->fr, data->part, newpart);
-	gtk_object_unref (GTK_OBJECT (data->part));
-	data->part = newpart;
-	data->partwidget = filter_part_get_widget (newpart);
-	if (data->partwidget)
-		gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, FALSE, FALSE, 0);
-}
-
-static GtkWidget *
-get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr)
-{
-	FilterPart *part = NULL;
-	GtkWidget *menu;
-	GtkWidget *item;
-	GtkWidget *omenu;
-	GtkWidget *hbox;
-	GtkWidget *p;
-	int index = 0, current = 0;
-	struct _part_data *data;
-	
-	data = g_malloc0 (sizeof (*data));
-	data->fr = fr;
-	data->f = f;
-	data->part = newpart;
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	/* only set to automatically clean up the memory */
-	gtk_object_set_data_full (GTK_OBJECT (hbox), "data", data, g_free);
-	
-	p = filter_part_get_widget (newpart);
-	
-	data->partwidget = p;
-	data->container = hbox;
-	
-	menu = gtk_menu_new ();
-	/* sigh, this is a little ugly */
-	while ((part = rule_context_next_part (f, part))) {
-		item = gtk_menu_item_new_with_label (_(part->title));
-		gtk_object_set_data (GTK_OBJECT (item), "part", part);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		if (!strcmp (newpart->title, part->title)) {
-			current = index;
-		}
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	gtk_widget_show (omenu);
-	
-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	if (p) {
-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);
-	}
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-struct _rule_data {
-	FilterRule *fr;
-	RuleContext *f;
-	GtkWidget *parts;
-};
-
-static void
-less_parts (GtkWidget *button, struct _rule_data *data)
-{
-	GList *l;
-	FilterPart *part;
-	GtkWidget *w;
-	
-	l = data->fr->parts;
-	if (g_list_length (l) < 2)
-		return;
-	
-	/* remove the last one from the list */
-	l = g_list_last (l);
-	part = l->data;
-	filter_rule_remove_part (data->fr, part);
-	gtk_object_unref (GTK_OBJECT (part));
-	
-	/* and from the display */
-	l = g_list_last (GTK_BOX (data->parts)->children);
-	w = ((GtkBoxChild *) l->data)->widget;
-	gtk_container_remove (GTK_CONTAINER (data->parts), w);
-	
-	/* if there's only 1 criterion, we can't remove anymore so set insensitive */
-	if (g_list_length (data->fr->parts) <= 1)
-		gtk_widget_set_sensitive (button, FALSE);
-}
-
-static void
-more_parts (GtkWidget *button, struct _rule_data *data)
-{
-	FilterPart *new;
-	GtkWidget *w;
-	
-	/* first make sure that the last part is ok */
-	if (data->fr->parts) {
-		FilterPart *part;
-		GList *l;
-		
-		l = g_list_last (data->fr->parts);
-		part = l->data;
-		if (!filter_part_validate (part))
-			return;
-	}
-	
-	/* create a new rule entry, use the first type of rule */
-	new = rule_context_next_part (data->f, NULL);
-	if (new) {
-		new = filter_part_clone (new);
-		filter_rule_add_part (data->fr, new);
-		w = get_rule_part_widget (data->f, new, data->fr);
-		gtk_box_pack_start (GTK_BOX (data->parts), w, FALSE, FALSE, 0);
-	}
-	
-	/* set the "Remove criterion" button sensitive */
-	if (g_list_length (data->fr->parts) > 1) {
-		w = gtk_object_get_data (GTK_OBJECT (button), "remove");
-		gtk_widget_set_sensitive (w, TRUE);
-	}
-}
-
-static void
-name_changed (GtkEntry *entry, FilterRule *fr)
-{
-	g_free (fr->name);
-	fr->name = e_utf8_gtk_entry_get_text (entry);
-}
-
-GtkWidget *
-filter_rule_get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->get_widget(fr, f);
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *vbox, *parts, *inframe;
-	GtkWidget *hbox;
-	GtkWidget *add, *remove, *pixmap;
-	GtkWidget *w;
-	GtkWidget *menu, *item, *omenu;
-	GtkWidget *frame;
-	GtkWidget *name;
-	GtkWidget *label;
-	GtkWidget *scrolledwindow;
-	GtkObject *hadj, *vadj;
-	GList *l;
-	FilterPart *part;
-	struct _rule_data *data;
-	
-	/* this stuff should probably be a table, but the
-	   rule parts need to be a vbox */
-	vbox = gtk_vbox_new (FALSE, 3);
-	
-	label = gtk_label_new (_("Rule name: "));
-	name = gtk_entry_new ();
-	
-	if (!fr->name) {
-		fr->name = g_strdup (_("Untitled"));
-		gtk_entry_set_text (GTK_ENTRY (name), fr->name);
-		/* FIXME: do we want the following code in the future? */
-		/*gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);*/
-		gtk_widget_grab_focus (GTK_WIDGET (name));
-		gtk_widget_grab_default (GTK_WIDGET (name));
-	} else {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (name), fr->name);
-	}
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (name), "changed", name_changed, fr);
-	
-	frame = gtk_frame_new (_("If"));
-	inframe = gtk_vbox_new (FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), inframe);
-	
-	/* this is the parts list, it should probably be inside a scrolling list */
-	parts = gtk_vbox_new (FALSE, 3);
-	
-	/* data for the parts part of the display */
-	data = g_malloc0 (sizeof (*data));
-	data->f = f;
-	data->fr = fr;
-	data->parts = parts;
-	
-	/* only set to automatically clean up the memory */
-	gtk_object_set_data_full (GTK_OBJECT (vbox), "data", data, g_free);
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	label = gtk_label_new (_("Execute actions"));
-	
-	menu = gtk_menu_new ();
-	
-	item = gtk_menu_item_new_with_label (_("if all criteria are met"));
-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_all, fr);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_widget_show (item);
-	
-	item = gtk_menu_item_new_with_label (_("if any criteria are met"));
-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_any, fr);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_widget_show (item);
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), fr->grouping == FILTER_GROUP_ALL ? 0 : 1);
-	gtk_widget_show (omenu);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);
-	add = gnome_pixmap_button (pixmap, _("Add criterion"));
-	gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);
-	remove = gnome_pixmap_button (pixmap, _("Remove criterion"));
-	gtk_object_set_data (GTK_OBJECT (add), "remove", remove);
-	gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), remove, FALSE, FALSE, 3);
-	
-	/* if we only have 1 criterion, then we can't remove any more so disable this */
-	if (g_list_length (fr->parts) <= 1)
-		gtk_widget_set_sensitive (remove, FALSE);
-	
-	gtk_box_pack_end (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 0);
-	
-	l = fr->parts;
-	while (l) {
-		part = l->data;
-		w = get_rule_part_widget (f, part, fr);
-		gtk_box_pack_start (GTK_BOX (parts), w, FALSE, FALSE, 3);
-		l = g_list_next (l);
-	}
-	
-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0);
-	
-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */
-	
-	gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-	
-	gtk_widget_show_all (vbox);
-	
-	return vbox;
-}
-
-FilterRule *
-filter_rule_next_list (GList * l, FilterRule * last, const char *source)
-{
-	GList *node = l;
-	
-	if (last != NULL) {
-		node = g_list_find (node, last);
-		if (node == NULL)
-			node = l;
-		else
-			node = g_list_next (node);
-	}
-	
-	if (source) {
-		while (node) {
-			FilterRule *rule = node->data;
-			
-			if (rule->source && strcmp (rule->source, source) == 0)
-				break;
-			node = g_list_next (node);
-		}
-	}
-	
-	if (node)
-		return node->data;
-	
-	return NULL;
-}
-
-FilterRule *
-filter_rule_find_list (GList * l, const char *name, const char *source)
-{
-	while (l) {
-		FilterRule *rule = l->data;
-		
-		if (strcmp (rule->name, name) == 0)
-			if (source == NULL || (rule->source != NULL && strcmp (rule->source, source) == 0))
-				return rule;
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
deleted file mode 100644
index 3fc00fe598..0000000000
--- a/filter/filter-rule.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_RULE_H
-#define _FILTER_RULE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-part.h"
-
-#define FILTER_RULE(obj)	GTK_CHECK_CAST (obj, filter_rule_get_type (), FilterRule)
-#define FILTER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_rule_get_type (), FilterRuleClass)
-#define IS_FILTER_RULE(obj)      GTK_CHECK_TYPE (obj, filter_rule_get_type ())
-
-typedef struct _FilterRule	FilterRule;
-typedef struct _FilterRuleClass	FilterRuleClass;
-
-struct _RuleContext;
-
-enum _filter_grouping_t {
-	FILTER_GROUP_ALL,	/* all rules must match */
-	FILTER_GROUP_ANY	/* any rule must match */
-};
-
-
-#define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
-#define FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder
-	 				   * when the user asks for it */
-#define	FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */
-
-struct _FilterRule {
-	GtkObject parent;
-	struct _FilterRulePrivate *priv;
-	
-	char *name;
-	char *source;
-	
-	enum _filter_grouping_t grouping;
-	GList *parts;
-};
-
-struct _FilterRuleClass {
-	GtkObjectClass parent_class;
-	
-	/* virtual methods */
-	xmlNodePtr (*xml_encode)(FilterRule *);
-	int (*xml_decode)(FilterRule *, xmlNodePtr, struct _RuleContext *);
-	
-	void (*build_code)(FilterRule *, GString *out);
-	
-	GtkWidget *(*get_widget)(FilterRule *fr, struct _RuleContext *f);
-	
-	/* signals */
-};
-
-guint		filter_rule_get_type	(void);
-FilterRule	*filter_rule_new	(void);
-
-FilterRule 	*filter_rule_clone	(FilterRule *base, struct _RuleContext *f);
-
-/* methods */
-void		filter_rule_set_name	(FilterRule *fr, const char *name);
-void		filter_rule_set_source	(FilterRule *fr, const char *source);
-
-xmlNodePtr	filter_rule_xml_encode	(FilterRule *fr);
-int		filter_rule_xml_decode	(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f);
-
-void		filter_rule_add_part	(FilterRule *fr, FilterPart *fp);
-void		filter_rule_remove_part	(FilterRule *fr, FilterPart *fp);
-void		filter_rule_replace_part(FilterRule *fr, FilterPart *fp, FilterPart *new);
-
-GtkWidget	*filter_rule_get_widget	(FilterRule *fr, struct _RuleContext *f);
-
-void		filter_rule_build_code	(FilterRule *fr, GString *out);
-/*
-void		filter_rule_build_action(FilterRule *fr, GString *out);
-*/
-
-/* static functions */
-FilterRule	*filter_rule_next_list		(GList *l, FilterRule *last, const char *source);
-FilterRule	*filter_rule_find_list		(GList *l, const char *name, const char *source);
-
-#endif /* ! _FILTER_RULE_H */
-
diff --git a/filter/filter-score.c b/filter/filter-score.c
deleted file mode 100644
index 722ac5bb65..0000000000
--- a/filter/filter-score.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-score.h"
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_score_class_init (FilterScoreClass *class);
-static void filter_score_init (FilterScore *gspaper);
-static void filter_score_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterScore *)(x))->priv)
-
-struct _FilterScorePrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_score_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterScore",
-			sizeof (FilterScore),
-			sizeof (FilterScoreClass),
-			(GtkClassInitFunc) filter_score_class_init,
-			(GtkObjectInitFunc) filter_score_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_score_class_init (FilterScoreClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_score_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_score_init (FilterScore *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_score_finalise(GtkObject *obj)
-{
-	FilterScore *o = (FilterScore *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_score_new:
- *
- * Create a new FilterScore object.
- * 
- * Return value: A new #FilterScore object.
- **/
-FilterScore *
-filter_score_new (void)
-{
-	FilterScore *o = (FilterScore *)gtk_type_new(filter_score_get_type ());
-	return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterScore *fs = (FilterScore *)fe;*/
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterScore *fs = (FilterScore *)fe;
-	char *score;
-	
-	d(printf("Encoding score as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "score");
-	
-	score = g_strdup_printf ("%d", fs->score);
-	xmlSetProp (value, "score", score);
-	g_free (score);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	char *name;
-	char *score;
-	
-	d(printf("Decoding score from xml %p\n", fe));
-	
-	name = xmlGetProp (node, "name");
-	d(printf ("Name = %s\n", name));
-	fe->name = name;
-	score = xmlGetProp (node, name);
-	if (score)
-		fs->score = atoi (score);
-	else
-		fs->score = 0;
-	
-	if (fs->score > 3)
-		fs->score = 3;
-	else if (fs->score < -3)
-		fs->score = -3;
-	
-	return 0;
-}
-
-static void
-spin_changed (GtkWidget *spin, FilterElement *fe)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	
-	fs->score = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *spin;
-	GtkObject *adjustment;
-	FilterScore *fs = (FilterScore *)fe;
-	
-	adjustment = gtk_adjustment_new (0.0, -3.0, 3.0, 1.0, 1.0, 1.0);
-	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
-	
-	if (fs->score) {
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs->score);
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (spin), "changed", spin_changed, fe);
-	
-	return spin;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	char *score;
-	
-	score = g_strdup_printf ("%d", fs->score);
-	e_sexp_encode_string (out, score);
-	g_free (score);
-}
diff --git a/filter/filter-score.h b/filter/filter-score.h
deleted file mode 100644
index 126a0fff0b..0000000000
--- a/filter/filter-score.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _FILTER_SCORE_H
-#define _FILTER_SCORE_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_SCORE(obj)           GTK_CHECK_CAST (obj, filter_score_get_type (), FilterScore)
-#define FILTER_SCORE_CLASS(klass)   GTK_CHECK_CLASS_CAST (klass, filter_score_get_type (), FilterScoreClass)
-#define IS_FILTER_SCORE(obj)        GTK_CHECK_TYPE (obj, filter_score_get_type ())
-
-typedef struct _FilterScore        FilterScore;
-typedef struct _FilterScoreClass   FilterScoreClass;
-
-struct _FilterScore {
-	FilterElement parent;
-	struct _FilterScorePrivate *priv;
-	
-	gint32 score;
-};
-
-struct _FilterScoreClass {
-	FilterElementClass parent_class;
-	
-	/* virtual methods */
-	
-	/* signals */
-};
-
-guint		filter_score_get_type	(void);
-FilterScore	*filter_score_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_SCORE_H */
-
diff --git a/filter/filter-system-flag.c b/filter/filter-system-flag.c
deleted file mode 100644
index a74850ded1..0000000000
--- a/filter/filter-system-flag.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-system-flag.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_system_flag_class_init (FilterSystemFlagClass *class);
-static void filter_system_flag_init       (FilterSystemFlag *gspaper);
-static void filter_system_flag_finalise   (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterSystemFlag *)(x))->priv)
-
-struct _FilterSystemFlagPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-struct _system_flag {
-	char *title;
-	char *value;
-} system_flags[] = {
-	{ N_("Replied to"), "Answered" },
-	/*{ _("Deleted"), "Deleted" },*/
-	/*{ _("Draft"), "Draft" },*/
-	{ N_("Important"), "Flagged" },
-	{ N_("Read"), "Seen" },
-	{ NULL, NULL }
-};
-
-static struct _system_flag *
-find_option (const char *value)
-{
-	struct _system_flag *flag;
-	
-	for (flag = system_flags; flag->title; flag++) {
-		if (!g_strcasecmp (value, flag->value))
-			return flag;
-	}
-	
-	return NULL;
-}
-
-GtkType
-filter_system_flag_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterSystemFlag",
-			sizeof (FilterSystemFlag),
-			sizeof (FilterSystemFlagClass),
-			(GtkClassInitFunc) filter_system_flag_class_init,
-			(GtkObjectInitFunc) filter_system_flag_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_system_flag_class_init (FilterSystemFlagClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-	
-	object_class->finalize = filter_system_flag_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_system_flag_init (FilterSystemFlag *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_system_flag_finalise (GtkObject *obj)
-{
-	FilterSystemFlag *o = (FilterSystemFlag *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_system_flag_new:
- *
- * Create a new FilterSystemFlag object.
- * 
- * Return value: A new #FilterSystemFlag object.
- **/
-FilterSystemFlag *
-filter_system_flag_new (void)
-{
-	FilterSystemFlag *o = (FilterSystemFlag *)gtk_type_new (filter_system_flag_get_type ());
-	return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create (fe, node);	
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	FilterSystemFlag *fsf = (FilterSystemFlag *) fe;
-	xmlNodePtr value;
-	
-	d(printf ("Encoding system-flag as xml\n"));
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "system-flag");
-	xmlSetProp (value, "value", fsf->value);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterSystemFlag *fsf = (FilterSystemFlag *) fe;
-	struct _system_flag *flag;
-	char *value;
-	
-	fe->name = xmlGetProp (node, "name");
-	
-	value = xmlGetProp (node, "value");
-	if (value) {
-		flag = find_option (value);
-		fsf->value = flag ? flag->value : NULL;
-		xmlFree (value);
-	} else {
-		fsf->value = NULL;
-	}
-	
-	return 0;
-}
-
-static void
-item_selected (GtkWidget *widget, FilterElement *fe)
-{
-	FilterSystemFlag *fsf = (FilterSystemFlag *) fe;
-	struct _system_flag *flag;
-	
-	flag = gtk_object_get_data (GTK_OBJECT (widget), "flag");
-	
-	fsf->value = flag->value;
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterSystemFlag *fsf = (FilterSystemFlag *) fe;
-	GtkWidget *omenu, *menu, *item, *first = NULL;
-	struct _system_flag *flag;
-	int index = 0, current = 0;
-	
-	menu = gtk_menu_new ();
-	for (flag = system_flags; flag->title; flag++) {
-		item = gtk_menu_item_new_with_label (flag->title);
-		gtk_object_set_data (GTK_OBJECT (item), "flag", flag);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", item_selected, fe);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-		
-		gtk_widget_show (item);
-		
-		if (fsf->value && !g_strcasecmp (fsf->value, flag->value)) {
-			current = index;
-			first = item;
-		} else if (!first) {
-			first = item;
-		}
-		
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	
-	if (first)
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe);
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	
-	return omenu;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterSystemFlag *fsf = (FilterSystemFlag *)fe;
-	
-	e_sexp_encode_string (out, fsf->value);
-}
diff --git a/filter/filter-system-flag.h b/filter/filter-system-flag.h
deleted file mode 100644
index eaf8e9172e..0000000000
--- a/filter/filter-system-flag.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _FILTER_SYSTEM_FLAG_H
-#define _FILTER_SYSTEM_FLAG_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_SYSTEM_FLAG(obj)	GTK_CHECK_CAST (obj, filter_system_flag_get_type (), Filtersystemflag)
-#define FILTER_SYSTEM_FLAG_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_system_flag_get_type (), FiltersystemflagClass)
-#define IS_FILTER_SYSTEM_FLAG(obj)      GTK_CHECK_TYPE (obj, filter_system_flag_get_type ())
-
-typedef struct _FilterSystemFlag        FilterSystemFlag;
-typedef struct _FilterSystemFlagClass   FilterSystemFlagClass;
-
-struct _FilterSystemFlag {
-	FilterElement parent;
-	struct _FilterSystemFlagPrivate *priv;
-	
-	char *value;
-};
-
-struct _FilterSystemFlagClass {
-	FilterElementClass parent_class;
-	
-	/* virtual methods */
-	
-	/* signals */
-};
-
-GtkType           filter_system_flag_get_type (void);
-FilterSystemFlag *filter_system_flag_new      (void);
-
-#endif /* ! _FILTER_SYSTEM_FLAG_H */
-
diff --git a/filter/filter-url.c b/filter/filter-url.c
deleted file mode 100644
index a983d81f78..0000000000
--- a/filter/filter-url.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-url.h"
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_url_class_init (FilterUrlClass *class);
-static void filter_url_init (FilterUrl *gspaper);
-static void filter_url_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterUrl *)(x))->priv)
-
-struct _FilterUrlPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_url_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterUrl",
-			sizeof (FilterUrl),
-			sizeof (FilterUrlClass),
-			(GtkClassInitFunc) filter_url_class_init,
-			(GtkObjectInitFunc) filter_url_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_url_class_init (FilterUrlClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_url_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_url_init (FilterUrl *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_url_finalise (GtkObject *obj)
-{
-	FilterUrl *o = (FilterUrl *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_url_new:
- *
- * Create a new FilterUrl object.
- * 
- * Return value: A new #FilterUrl object.
- **/
-FilterUrl *
-filter_url_new (void)
-{
-	FilterUrl *o = (FilterUrl *) gtk_type_new (filter_url_get_type ());
-	
-	return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterUrl *fu = (FilterUrl *)fe;*/
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create (fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	d(printf ("Encoding url as xml\n"));
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "url");
-	
-	xmlSetProp (value, "url", fu->url);
-	
-	return value;
-}
-
-static gchar *
-get_value (xmlNodePtr node, char *name)
-{
-	gchar *value;
-	
-	value = xmlGetProp (node, name);
-	
-	return value;
-}
-
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	fe->name = xmlGetProp (node, "name");
-	fu->url = get_value (node, "url");
-	
-	return 0;
-}
-
-static void
-set_url (GtkWidget *entry, FilterUrl *fu)
-{
-	fu->url = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *combo;
-	GList *sources = fe->data;  /* this needs to be a list of urls */
-	
-	combo = gtk_combo_new ();
-	gtk_combo_set_popdown_strings (GTK_COMBO (combo), sources);
-	
-	gtk_widget_show (combo);
-	gtk_signal_connect (GTK_OBJECT (GTK_EDITABLE (GTK_COMBO (combo)->entry)), "changed", set_url, fe);
-	
-	return combo;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	e_sexp_encode_string (out, fu->url);
-}
diff --git a/filter/filter-url.h b/filter/filter-url.h
deleted file mode 100644
index f526acc5bf..0000000000
--- a/filter/filter-url.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _FILTER_URL_H
-#define _FILTER_URL_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_URL(obj)	        GTK_CHECK_CAST (obj, filter_url_get_type (), FilterUrl)
-#define FILTER_URL_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_url_get_type (), FilterUrlClass)
-#define IS_FILTER_URL(obj)      GTK_CHECK_TYPE (obj, filter_url_get_type ())
-
-typedef struct _FilterUrl	FilterUrl;
-typedef struct _FilterUrlClass	FilterUrlClass;
-
-struct _FilterUrl {
-	FilterElement parent;
-	struct _FilterUrlPrivate *priv;
-	
-	GList *urls;  /* maybe use this? I dunno */
-	gchar *url;
-};
-
-struct _FilterUrlClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_url_get_type (void);
-FilterUrl       *filter_url_new     (void);
-
-/* methods */
-
-#endif /* ! _FILTER_URL_H */
-
diff --git a/filter/filter.glade b/filter/filter.glade
deleted file mode 100644
index 96eeb3dc63..0000000000
--- a/filter/filter.glade
+++ /dev/null
@@ -1,703 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Filter</name>
-  <program_name>filter</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_filter</name>
-  <title>Edit Filters</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkOptionMenu</class>
-      <name>filter_source</name>
-      <can_focus>True</can_focus>
-      <items>Incoming
-Outgoing
-</items>
-      <initial_choice>0</initial_choice>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame1</name>
-      <label>Filter Rules</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <width>256</width>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport1</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>rule_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox1</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_edit</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Edit</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Delete</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_up</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_down</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_vfolder</name>
-  <title>Edit VFolders</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button13</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button15</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame2</name>
-      <label>Virtual Folders</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <width>256</width>
-	  <height>167</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport2</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>rule_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox2</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_edit</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Edit</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Delete</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_up</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_down</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>vfolder_source</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button16</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button17</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button18</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>vfolder_source_frame</name>
-      <label>vFolder Sources</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <width>256</width>
-	  <height>125</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport3</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>source_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox3</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_remove</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Remove</label>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>vfolder_source</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button16</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button17</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button18</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>vfolder_source_frame</name>
-      <label>vFolder Sources</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <width>256</width>
-	  <height>125</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport3</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>source_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox3</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_remove</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Remove</label>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
deleted file mode 100644
index 370175785d..0000000000
--- a/filter/filtertypes.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="sender">
-   <title>Sender</title>
-   <input type="optionlist" name="sender-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-        (match-all (header-contains "From" ${sender}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-        (match-all (not (header-contains "From" ${sender})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-        (match-all (header-matches "From" ${sender}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-        (match-all (not (header-matches "From" ${sender})))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "From" ${sender})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "From" ${sender})))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex "From" ${sender}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex "From" ${sender})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="sender"/>
- </part>
-
- <part name="to">
-   <title>Recipients</title>
-   <input type="optionlist" name="recipient-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (or (header-contains "To" ${recipient})
-	    	       (header-contains "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (or
-               (header-contains "To" ${recipient})
-	       (header-contains "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (or (header-matches "To" ${recipient})
-	    	       (header-matches "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (or
-               (header-matches "To" ${recipient})
-	       (header-matches "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (or (header-starts-with "To" ${recipient})
-	    	       (header-starts-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (or
-               (header-starts-with "To" ${recipient})
-	       (header-starts-with "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (or (header-ends-with "To" ${recipient})
-	    	       (header-ends-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (or
-               (header-ends-with "To" ${recipient})
-	       (header-ends-with "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-	(match-all (or (header-soundex "To" ${recipient})
-	    	       (header-soundex "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-	(match-all (not (or
-               (header-soundex "To" ${recipient})
-	       (header-soundex "Cc" ${recipient}))))
-     </code>
-    </option>
-   </input>
-   <input type="address" name="recipient"/>
- </part>
-
- <part name="subject">
-   <title>Subject</title>
-   <input type="optionlist" name="subject-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains "Subject" ${subject})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-	(match-all (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-	(match-all (not (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-	(match-all (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-	(match-all (not (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex "Subject" ${subject})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="subject"/>
- </part>
-
- <part name="header">
-   <title>Specific header</title>
-   <input type="string" name="header-field"/>
-   <input type="optionlist" name="header-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains ${header-field} ${word})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (header-matches ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (header-matches ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-	(match-all (header-starts-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-	(match-all (not (header-starts-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-	(match-all (header-ends-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-	(match-all (not (header-ends-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="exists">
-     <title>exists</title>
-     <code>
-	(match-all (header-exists ${header-field}))
-     </code>
-    </option>
-    <option value="not exists">
-     <title>does not exist</title>
-     <code>
-	(match-all (not (header-exists ${header-field}))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex ${header-field} ${word})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
-
- <part name="body">
-   <title>Message Body</title>
-   <input type="optionlist" name="body-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(body-contains ${word})
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(not (body-contains ${word}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
-
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
- </part>
-
- <part name="sent-date">
-  <title>Date sent</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-sent-date) ${versus})))
-    </code>
-   </option>
-   <option value="before">
-    <title>was before</title>
-    <code>
-       (match-all (&lt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="after">
-    <title>was after</title>
-    <code>
-       (match-all (&gt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus"/>
- </part>
-
- <part name="recv-date">
-  <title>Date received</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-received-date) ${versus})))
-    </code>
-   </option>
-   <option value="before">
-    <title>was before</title>
-    <code>
-       (match-all (&lt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="after">
-    <title>was after</title>
-    <code>
-       (match-all (&gt; (get-received-date) ${versus}))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus"/>
- </part>
-
- <part name="score">
-  <title>Score</title>
-  <input type="optionlist" name="score-type">
-   <option value="less-than">
-    <title>is</title>
-    <code>
-       (match-all (= (get-score) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-score) ${versus})))
-    </code>
-   </option>
-   <option value="greater-than">
-    <title>is greater than</title>
-    <code>
-       (match-all (&gt; (get-score) ${versus}))
-    </code>
-   </option>
-   <option value="less-than">
-    <title>is less than</title>
-    <code>
-       (match-all (&lt; (get-score) ${versus}))
-    </code>
-   </option>
-  </input>
-  <input type="score" name="versus"/>
- </part>
-
- <part name="status">
-  <title>Status</title>
-  <input type="optionlist" name="match-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-     (match-all (system-flag ${flag}))
-    </code>
-   </option>
-   <option value="is not">
-    <title>is not</title>
-    <code>
-     (match-all (not (system-flag ${flag})))
-    </code>
-   </option>
-  </input>
-  <input type="system-flag" name="flag"/>
- </part>
-
- <part name="mlist">
-  <title>Mailing list</title>
-   <input type="optionlist" name="mlist-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-        <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="mlist"/>
- </part>
-
- <part name="regex">
-  <title>Regex Match</title>
-  <input type="optionlist" name="match-type">
-   <option value="header">
-    <title>Message Header</title>
-    <code>
-       (match-all (header-full-regex ${expression}))
-    </code>
-   </option>
-   <option value="body">
-    <title>Message Body</title>
-    <code>
-       (match-all (body-regex ${expression}))
-    </code>
-   </option>
-  </input>
-  <input type="regex" name="expression"/>
- </part>
-
- <part name="source">
-  <title>Source</title>
-  <input type="optionlist" name="url-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-source) ${source}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-source) ${source})))
-    </code>
-   </option>
-  </input>
-  <input type="url" name="source">
-  </input>
- </part>
-
-</partset>
-
-
-<actionset>
- <part name="copy-to-folder">
-  <title>Copy to Folder</title>
-  <code>(copy-to ${folder})</code>
-  <input type="folder" name="folder"/>
- </part>
- <part name="move-to-folder">
-  <title>Move to Folder</title>
-  <code>(move-to ${folder})</code>
-  <input type="folder" name="folder"/>
- </part>
- <part name="forward-to">
-  <title>Forward to Address</title>
-  <code>(forward-to ${address})</code>
-  <input type="address" name="address"/>
- </part>
- <part name="delete">
-  <title>Delete</title>
-  <code>(delete)</code>
- </part>
- <part name="stop">
-  <title>Stop Processing</title>
-  <code>(stop)</code>
- </part>
- <part name="colour">
-  <title>Assign Colour</title>
-  <code>(set-colour ${colour})</code>
-  <input type="colour" name="colour"/>
- </part>
- <part name="score">
-  <title>Assign Score</title>
-  <code>(set-score ${score})</code>
-  <input type="score" name="score"/>
- </part>
- <part name="set-status">
-  <title>Set Status</title>
-  <code>(set-system-flag ${flag})</code>
-  <input type="system-flag" name="flag"/>
- </part>
-</actionset>
-</filterdescription>
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
deleted file mode 100644
index 65e02870d6..0000000000
--- a/filter/libfilter-i18n.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Automatically generated. Do not edit. */
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-char *s = N_("after");
-=======
-char *s = N_("Answered");
->>>>>>> 1.7
-=======
-char *s = N_("after");
->>>>>>> 1.11
-=======
->>>>>>> 1.13
-char *s = N_("Assign Colour");
-char *s = N_("Assign Score");
-char *s = N_("Copy to Folder");
-char *s = N_("Date received");
-char *s = N_("Date sent");
-char *s = N_("Delete");
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Deleted");
-char *s = N_("Draft");
-=======
->>>>>>> 1.13
-char *s = N_("Expression");
-char *s = N_("Flagged");
-char *s = N_("Forward to Address");
-char *s = N_("Mailing list");
-char *s = N_("Message Body");
-char *s = N_("Message Header");
-char *s = N_("Message was received");
-char *s = N_("Message was sent");
-char *s = N_("Move to Folder");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Priority");
-=======
->>>>>>> 1.13
-char *s = N_("Recipients");
-char *s = N_("Regex Match");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Seen");
-=======
-char *s = N_("Score");
->>>>>>> 1.13
-char *s = N_("Sender");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Set Flag");
-=======
-char *s = N_("Set Status");
->>>>>>> 1.13
-char *s = N_("Source");
-char *s = N_("Specific header");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Status");
->>>>>>> 1.13
-char *s = N_("Stop Processing");
-char *s = N_("Subject");
-<<<<<<< libfilter-i18n.h
-char *s = N_("after");
-char *s = N_("before");
-char *s = N_("contains");
->>>>>>> 1.7
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
-char *s = N_("ends with");
-char *s = N_("exists");
-=======
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
-char *s = N_("ends with");
-char *s = N_("exists");
->>>>>>> 1.11
-char *s = N_("Expression");
-char *s = N_("Forward to Address");
-<<<<<<< libfilter-i18n.h
-char *s = N_("is");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-<<<<<<< libfilter-i18n.h
-char *s = N_("matches regex");
-=======
-char *s = N_("is");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
->>>>>>> 1.11
-char *s = N_("Message Body");
-char *s = N_("Message was received");
-char *s = N_("Message was sent");
-char *s = N_("Move to Folder");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("is");
->>>>>>> 1.8
-char *s = N_("on or after");
-char *s = N_("on or before");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("on or after");
-char *s = N_("on or before");
->>>>>>> 1.11
-char *s = N_("Priority");
-char *s = N_("Recipients");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Regex Match");
->>>>>>> 1.11
-char *s = N_("Sender");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Set Status");
-char *s = N_("sounds like");
->>>>>>> 1.11
-char *s = N_("Source");
-char *s = N_("Specific header");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("sounds like");
->>>>>>> 1.7
-char *s = N_("starts with");
-=======
-char *s = N_("starts with");
-char *s = N_("Status");
->>>>>>> 1.11
-char *s = N_("Stop Processing");
-char *s = N_("Subject");
-=======
-char *s = N_("after");
-char *s = N_("before");
-char *s = N_("contains");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
-char *s = N_("ends with");
-char *s = N_("exists");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is");
-char *s = N_("on or after");
-char *s = N_("on or before");
-char *s = N_("sounds like");
-char *s = N_("starts with");
->>>>>>> 1.13
-char *s = N_("was after");
-char *s = N_("was before");
diff --git a/filter/rule-context.c b/filter/rule-context.c
deleted file mode 100644
index 386e2cb7ab..0000000000
--- a/filter/rule-context.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "rule-context.h"
-
-#define d(x)
-
-static int load(RuleContext * f, const char *system, const char *user);
-static int save(RuleContext * f, const char *user);
-
-static void rule_context_class_init(RuleContextClass * class);
-static void rule_context_init(RuleContext * gspaper);
-static void rule_context_finalise(GtkObject * obj);
-
-#define _PRIVATE(x) (((RuleContext *)(x))->priv)
-
-struct _RuleContextPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-rule_context_get_type(void)
-{
-	static guint type = 0;
-
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"RuleContext",
-			sizeof(RuleContext),
-			sizeof(RuleContextClass),
-			(GtkClassInitFunc) rule_context_class_init,
-			(GtkObjectInitFunc) rule_context_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-
-		type = gtk_type_unique(gtk_object_get_type(), &type_info);
-	}
-
-	return type;
-}
-
-static void
-rule_context_class_init(RuleContextClass * class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class(gtk_object_get_type());
-
-	object_class->finalize = rule_context_finalise;
-
-	/* override methods */
-	class->load = load;
-	class->save = save;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-rule_context_init(RuleContext * o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	o->part_set_map = g_hash_table_new(g_str_hash, g_str_equal);
-	o->rule_set_map = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-static void
-rule_context_finalise(GtkObject * obj)
-{
-	RuleContext *o = (RuleContext *) obj;
-
-	o = o;
-
-	((GtkObjectClass *) (parent_class))->finalize(obj);
-}
-
-/**
- * rule_context_new:
- *
- * Create a new RuleContext object.
- * 
- * Return value: A new #RuleContext object.
- **/
-RuleContext *
-rule_context_new(void)
-{
-	RuleContext *o = (RuleContext *) gtk_type_new(rule_context_get_type());
-
-	return o;
-}
-
-void
-rule_context_add_part_set(RuleContext * f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)
-{
-	struct _part_set_map *map;
-
-	map = g_malloc0(sizeof(*map));
-	map->type = part_type;
-	map->append = append;
-	map->next = next;
-	map->name = g_strdup(setname);
-	g_hash_table_insert(f->part_set_map, map->name, map);
-	f->part_set_list = g_list_append(f->part_set_list, map);
-	d(printf("adding part set '%s'\n", setname));
-}
-
-void
-rule_context_add_rule_set(RuleContext * f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)
-{
-	struct _rule_set_map *map;
-
-	map = g_malloc0(sizeof(*map));
-	map->type = rule_type;
-	map->append = append;
-	map->next = next;
-	map->name = g_strdup(setname);
-	g_hash_table_insert(f->rule_set_map, map->name, map);
-	f->rule_set_list = g_list_append(f->rule_set_list, map);
-	d(printf("adding rule set '%s'\n", setname));
-}
-
-/**
- * rule_context_set_error:
- * @f: 
- * @error: 
- * 
- * Set the text error for the context, or NULL to clear it.
- **/
-static void
-rule_context_set_error(RuleContext * f, char *error)
-{
-	g_free(f->error);
-	f->error = error;
-}
-
-/**
- * rule_context_load:
- * @f: 
- * @system: 
- * @user: 
- *
- * Load a rule context from a system and user description file.
- * 
- * Return value: 
- **/
-int
-rule_context_load(RuleContext * f, const char *system, const char *user)
-{
-	d(printf("rule_context: loading %s %s\n", system, user));
-
-	return ((RuleContextClass *) ((GtkObject *) f)->klass)->load(f, system, user);
-}
-
-static int
-load(RuleContext * f, const char *system, const char *user)
-{
-	xmlNodePtr set, rule;
-	struct _part_set_map *part_map;
-	struct _rule_set_map *rule_map;
-
-	rule_context_set_error(f, NULL);
-
-	d(printf("loading rules %s %s\n", system, user));
-
-	f->system = xmlParseFile(system);
-	if (f->system == NULL) {
-		rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': %s",
-							  system, strerror(errno)));
-		return -1;
-	}
-	if (strcmp(f->system->root->name, "filterdescription")) {
-		rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': Invalid format", system));
-		xmlFreeDoc(f->system);
-		f->system = NULL;
-		return -1;
-	}
-	/* doesn't matter if this doens't exist */
-	f->user = xmlParseFile(user);
-
-	/* now parse structure */
-	/* get rule parts */
-	set = f->system->root->childs;
-	while (set) {
-		d(printf("set name = %s\n", set->name));
-		part_map = g_hash_table_lookup(f->part_set_map, set->name);
-		if (part_map) {
-			d(printf("loading parts ...\n"));
-			rule = set->childs;
-			while (rule) {
-				if (!strcmp(rule->name, "part")) {
-					FilterPart *part = FILTER_PART(gtk_type_new(part_map->type));
-
-					if (filter_part_xml_create(part, rule) == 0) {
-						part_map->append(f, part);
-					} else {
-						gtk_object_unref((GtkObject *) part);
-						g_warning("Cannot load filter part");
-					}
-				}
-				rule = rule->next;
-			}
-		}
-		set = set->next;
-	}
-
-	/* now load actual rules */
-	if (f->user) {
-		set = f->user->root->childs;
-		while (set) {
-			d(printf("set name = %s\n", set->name));
-			rule_map = g_hash_table_lookup(f->rule_set_map, set->name);
-			if (rule_map) {
-				d(printf("loading rules ...\n"));
-				rule = set->childs;
-				while (rule) {
-					d(printf("checking node: %s\n", rule->name));
-					if (!strcmp(rule->name, "rule")) {
-						FilterRule *part = FILTER_RULE(gtk_type_new(rule_map->type));
-
-						if (filter_rule_xml_decode(part, rule, f) == 0) {
-							rule_map->append(f, part);
-						} else {
-							gtk_object_unref((GtkObject *) part);
-							g_warning("Cannot load filter part");
-						}
-					}
-					rule = rule->next;
-				}
-			}
-			set = set->next;
-		}
-	}
-	return 0;
-}
-
-/**
- * rule_context_save:
- * @f: 
- * @user: 
- * 
- * Save a rule context to disk.
- * 
- * Return value: 
- **/
-int
-rule_context_save(RuleContext * f, const char *user)
-{
-	return ((RuleContextClass *) ((GtkObject *) f)->klass)->save(f, user);
-}
-
-static int
-save(RuleContext * f, const char *user)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, rules, work;
-	GList *l;
-	FilterRule *rule;
-	struct _rule_set_map *map;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewDocNode(doc, NULL, "filteroptions", NULL);
-	xmlDocSetRootElement(doc, root);
-	l = f->rule_set_list;
-	while (l) {
-		map = l->data;
-		rules = xmlNewDocNode(doc, NULL, map->name, NULL);
-		xmlAddChild(root, rules);
-		rule = NULL;
-		while ((rule = map->next(f, rule, NULL))) {
-			d(printf("processing rule %s\n", rule->name));
-			work = filter_rule_xml_encode(rule);
-			xmlAddChild(rules, work);
-		}
-		l = g_list_next(l);
-	}
-	xmlSaveFile(user, doc);
-	xmlFreeDoc(doc);
-	return 0;
-}
-
-FilterPart *
-rule_context_find_part(RuleContext * f, const char *name)
-{
-	d(printf("find part : "));
-	return filter_part_find_list(f->parts, name);
-}
-
-FilterPart *
-rule_context_create_part(RuleContext * f, const char *name)
-{
-	FilterPart *part;
-
-	part = rule_context_find_part(f, name);
-	if (part)
-		part = filter_part_clone(part);
-	return part;
-}
-
-FilterPart *
-rule_context_next_part(RuleContext * f, FilterPart * last)
-{
-	return filter_part_next_list(f->parts, last);
-}
-
-FilterRule *
-rule_context_next_rule(RuleContext * f, FilterRule * last, const char *source)
-{
-	return filter_rule_next_list(f->rules, last, source);
-}
-
-FilterRule *
-rule_context_find_rule(RuleContext * f, const char *name, const char *source)
-{
-	return filter_rule_find_list(f->rules, name, source);
-}
-
-void
-rule_context_add_part(RuleContext * f, FilterPart * part)
-{
-	f->parts = g_list_append(f->parts, part);
-}
-
-void
-rule_context_add_rule(RuleContext * f, FilterRule * new)
-{
-	f->rules = g_list_append(f->rules, new);
-}
-
-static void
-new_rule_clicked(GtkWidget * w, int button, RuleContext * context)
-{
-#ifndef NO_WARNINGS
-#warning "Need a changed signal for this to work best"
-#endif
-	if (button == 0) {
-		FilterRule *rule = gtk_object_get_data((GtkObject *) w, "rule");
-		char *user = gtk_object_get_data((GtkObject *) w, "path");
-
-		gtk_object_ref((GtkObject *) rule);
-		rule_context_add_rule(context, rule);
-		if (user) {
-			rule_context_save((RuleContext *) context, user);
-		}
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *) w);
-	}
-}
-
-/* add a rule, with a gui, asking for confirmation first ... optionally save to path */
-void
-rule_context_add_rule_gui(RuleContext * f, FilterRule * rule, const char *title, const char *path)
-{
-	GtkWidget *w;
-	GnomeDialog *gd;
-
-	w = filter_rule_get_widget(rule, f);
-	gd = (GnomeDialog *) gnome_dialog_new(title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *) gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *) gd);
-	gtk_object_set_data_full((GtkObject *) gd, "rule", rule, (GtkDestroyNotify) gtk_object_unref);
-	if (path)
-		gtk_object_set_data_full((GtkObject *) gd, "path", g_strdup(path), (GtkDestroyNotify) g_free);
-	gtk_signal_connect((GtkObject *) gd, "clicked", new_rule_clicked, f);
-	gtk_object_ref((GtkObject *) f);
-	gtk_object_set_data_full((GtkObject *) gd, "context", f, (GtkDestroyNotify) gtk_object_unref);
-	gtk_widget_show((GtkWidget *) gd);
-}
-
-void
-rule_context_remove_rule(RuleContext * f, FilterRule * rule)
-{
-	f->rules = g_list_remove(f->rules, rule);
-}
-
-void
-rule_context_rank_rule(RuleContext * f, FilterRule * rule, int rank)
-{
-	f->rules = g_list_remove(f->rules, rule);
-	f->rules = g_list_insert(f->rules, rule, rank);
-}
-
-int
-rule_context_get_rank_rule(RuleContext * f, FilterRule * rule, const char *source)
-{
-	GList *n = f->rules;
-	int i = 0;
-
-	while (n) {
-		FilterRule *r = n->data;
-
-		if (r == rule)
-			return i;
-		if (source == NULL || (r->source && strcmp(r->source, source) == 0))
-			i++;
-		n = g_list_next(n);
-	}
-	return i;
-}
diff --git a/filter/rule-context.h b/filter/rule-context.h
deleted file mode 100644
index e2338d5cb5..0000000000
--- a/filter/rule-context.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _RULE_CONTEXT_H
-#define _RULE_CONTEXT_H
-
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-
-#include "filter-part.h"
-#include "filter-rule.h"
-
-#define RULE_CONTEXT(obj)	GTK_CHECK_CAST (obj, rule_context_get_type (), RuleContext)
-#define RULE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, rule_context_get_type (), RuleContextClass)
-#define IS_RULE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, rule_context_get_type ())
-
-typedef struct _RuleContext	RuleContext;
-typedef struct _RuleContextClass	RuleContextClass;
-
-struct _RuleContext {
-	GtkObject parent;
-	struct _RuleContextPrivate *priv;
-
-	char *error;		/* string version of error */
-
-	xmlDocPtr system;	/* system rules source */
-	xmlDocPtr user;		/* user defined rules source */
-
-	GList *parts;
-	GList *rules;
-
-	GHashTable *part_set_map;/* map set types to part types */
-	GList *part_set_list;
-	GHashTable *rule_set_map;/* map set types to rule types */
-	GList *rule_set_list;
-};
-
-typedef void (*RCRegisterFunc)(RuleContext *f, FilterRule *rule, gpointer data);
-
-struct _RuleContextClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-	int (*load)(RuleContext *f, const char *system, const char *user);
-	int (*save)(RuleContext *f, const char *user);
-
-	/* signals */
-};
-
-typedef void (*RCPartFunc)(RuleContext *f, FilterPart *part);
-typedef void (*RCRuleFunc)(RuleContext *f, FilterRule *part);
-typedef FilterPart * (*RCNextPartFunc)(RuleContext *f, FilterPart *part);
-typedef FilterRule * (*RCNextRuleFunc)(RuleContext *f, FilterRule *rule, const char *source);
-
-struct _part_set_map {
-	char *name;
-	int type;
-	RCPartFunc append;
-	RCNextPartFunc next;
-};
-
-struct _rule_set_map {
-	char *name;
-	int type;
-	RCRuleFunc append;
-	RCNextRuleFunc next;
-};
-
-guint		rule_context_get_type	(void);
-RuleContext	*rule_context_new	(void);
-
-/* methods */
-int		rule_context_load(RuleContext *f, const char *system, const char *user);
-int		rule_context_save(RuleContext *f, const char *user);
-
-void		rule_context_add_part(RuleContext *f, FilterPart *new);
-FilterPart 	*rule_context_find_part(RuleContext *f, const char *name);
-FilterPart 	*rule_context_create_part(RuleContext *f, const char *name);
-FilterPart 	*rule_context_next_part(RuleContext *f, FilterPart *last);
-
-FilterRule 	*rule_context_next_rule(RuleContext *f, FilterRule *last, const char *source);
-FilterRule 	*rule_context_find_rule(RuleContext *f, const char *name, const char *source);
-void		rule_context_add_rule(RuleContext *f, FilterRule *new);
-void		rule_context_add_rule_gui(RuleContext *f, FilterRule *rule, const char *title, const char *path);
-void		rule_context_remove_rule(RuleContext *f, FilterRule *rule);
-
-/* get/set the rank (position) of a rule */
-void		rule_context_rank_rule(RuleContext *f, FilterRule *rule, int rank);
-int		rule_context_get_rank_rule(RuleContext *f, FilterRule *rule, const char *source);
-
-void		rule_context_delete_rule(RuleContext *f, FilterRule *rule);
-
-/* setup type for set parts */
-void		rule_context_add_part_set(RuleContext *f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next);
-void		rule_context_add_rule_set(RuleContext *f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next);
-
-#endif /* ! _RULE_CONTEXT_H */
-
diff --git a/filter/score-context.c b/filter/score-context.c
deleted file mode 100644
index b4c8654ff8..0000000000
--- a/filter/score-context.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "score-context.h"
-#include "score-rule.h"
-
-static void score_context_class_init	(ScoreContextClass *class);
-static void score_context_init	(ScoreContext *gspaper);
-static void score_context_finalise	(GtkObject *obj);
-
-static RuleContextClass *parent_class;
-
-guint
-score_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreContext",
-			sizeof(ScoreContext),
-			sizeof(ScoreContextClass),
-			(GtkClassInitFunc)score_context_class_init,
-			(GtkObjectInitFunc)score_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_context_class_init (ScoreContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = score_context_finalise;
-	/* override methods */
-
-}
-
-static void
-score_context_init (ScoreContext *o)
-{
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", score_rule_get_type(),
-				  rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-score_context_finalise(GtkObject *obj)
-{
-	ScoreContext *o = (ScoreContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * score_context_new:
- *
- * Create a new ScoreContext object.
- * 
- * Return value: A new #ScoreContext object.
- **/
-ScoreContext *
-score_context_new(void)
-{
-	ScoreContext *o = (ScoreContext *)gtk_type_new(score_context_get_type ());
-	return o;
-}
diff --git a/filter/score-context.h b/filter/score-context.h
deleted file mode 100644
index b89f70c1f8..0000000000
--- a/filter/score-context.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_CONTEXT_H
-#define _SCORE_CONTEXT_H
-
-#include <gtk/gtk.h>
-
-#include "rule-context.h"
-
-#define SCORE_CONTEXT(obj)	GTK_CHECK_CAST (obj, score_context_get_type (), ScoreContext)
-#define SCORE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_context_get_type (), ScoreContextClass)
-#define IS_SCORE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, score_context_get_type ())
-
-typedef struct _ScoreContext	ScoreContext;
-typedef struct _ScoreContextClass	ScoreContextClass;
-
-struct _ScoreContext {
-	RuleContext parent;
-};
-
-struct _ScoreContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_context_get_type	(void);
-ScoreContext	*score_context_new	(void);
-
-/* methods */
-
-#endif /* ! _SCORE_CONTEXT_H */
-
diff --git a/filter/score-editor.c b/filter/score-editor.c
deleted file mode 100644
index 57dbb434f3..0000000000
--- a/filter/score-editor.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "score-editor.h"
-#include "score-context.h"
-#include "score-rule.h"
-
-#define d(x)
-
-#if 0
-static void score_editor_class_init	(ScoreEditorClass *class);
-static void score_editor_init	(ScoreEditor *gspaper);
-
-static GnomeDialogClass *parent_class;
-
-guint
-score_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreEditor",
-			sizeof(ScoreEditor),
-			sizeof(ScoreEditorClass),
-			(GtkClassInitFunc)score_editor_class_init,
-			(GtkObjectInitFunc)score_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_editor_class_init (ScoreEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(gnome_dialog_get_type ());
-
-	/* override methods */
-
-}
-
-static void
-score_editor_init (ScoreEditor *o)
-{
-}
-
-/**
- * score_editor_new:
- *
- * Create a new ScoreEditor object.
- * 
- * Return value: A new #ScoreEditor object.
- **/
-ScoreEditor *
-score_editor_new(void)
-{
-	ScoreEditor *o = (ScoreEditor *)gtk_type_new(score_editor_get_type ());
-	return o;
-}
-#endif
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void set_sensitive(struct _editor_data *data);
-
-static void rule_add(GtkWidget *widget, struct _editor_data *data)
-{
-	ScoreRule *rule;
-	int result;
-	GnomeDialog *gd;
-	GtkWidget *w;
-	FilterPart *part;
-
-	d(printf("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = score_rule_new();
-
-	part = rule_context_next_part(data->f, NULL);
-	filter_rule_add_part((FilterRule *)rule, filter_part_clone(part));
-
-	w = filter_rule_get_widget((FilterRule *)rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
-					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-					     NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	result = gnome_dialog_run_and_close(gd);
-	if (result == 0) {
-		GtkListItem *item;
-		GList *l = NULL;
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, ((FilterRule *) rule)->name);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "rule", rule);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-		gtk_list_append_items(data->list, l);
-		gtk_list_select_child(data->list, (GtkWidget *)item);
-		data->current = (FilterRule *)rule;
-		rule_context_add_rule(data->f, (FilterRule *)rule);
-		set_sensitive(data);
-	} else {
-		gtk_object_unref((GtkObject *)rule);
-	}
-}
-
-static void rule_edit(GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GnomeDialog *gd;
-	FilterRule *rule;
-	int pos;
-
-	d(printf("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new(_("Edit Score Rule"), GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	result = gnome_dialog_run_and_close(gd);
-
-	if (result == 0) {
-		pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-		if (pos != -1) {
-			GtkListItem *item = g_list_nth_data(data->list->children, pos);
-			gchar *s = e_utf8_to_gtk_string ((GtkWidget *) data->list, data->current->name);
-			gtk_label_set_text((GtkLabel *)(((GtkBin *)item)->child), s);
-			g_free (s);
-		}
-	 }
-}
-
-static void rule_delete(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-
-	d(printf("ddelete rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	if (pos != -1) {
-		rule_context_remove_rule(data->f, data->current);
-
-		item = g_list_nth_data(data->list->children, pos);
-		l = g_list_append(NULL, item);
-		gtk_list_remove_items(data->list, l);
-		g_list_free(l);
-
-		gtk_object_unref((GtkObject *)data->current);
-		data->current = NULL;
-	}
-	set_sensitive(data);
-}
-
-static void rule_move(struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-
-	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule(data->f, data->current, to);
-	
-	item = g_list_nth_data(data->list->children, from);
-	l = g_list_append(NULL, item);
-	gtk_list_remove_items_no_unref(data->list, l);
-	gtk_list_insert_items(data->list, l, to);			      
-	gtk_list_select_child(data->list, (GtkWidget *)item);
-	set_sensitive(data);
-}
-
-static void rule_up(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-
-	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	if (pos>0) {
-		rule_move(data, pos, pos-1);
-	}
-}
-
-static void rule_down(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-
-	d(printf("down rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	rule_move(data, pos, pos+1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive(struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index=-1, count=0;
-
-	while ((rule = rule_context_next_rule(data->f, rule, NULL))) {
-		if (rule == data->current)
-			index=count;
-		count++;
-	}
-	d(printf("index = %d count=%d\n", index, count));
-	count--;
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_EDIT], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DELETE], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_UP], index > 0);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DOWN], index >=0 && index<count);
-}
-
-static void
-select_rule(GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data((GtkObject *)child, "rule");
-	if (data->current)
-		d(printf("seledct rule: %s\n", data->current->name));
-	else
-		d(printf("bad data?\n"));
-	set_sensitive(data);
-}
-
-GtkWidget	*score_editor_construct	(struct _ScoreContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w;
-	GList *l;
-	FilterRule *rule = NULL;
-	struct _editor_data *data;
-	int i;
-
-	g_assert(IS_SCORE_CONTEXT(f));
-
-	data = g_malloc0(sizeof(*data));
-	data->f = (RuleContext *)f;
-
-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "edit_vfolder");
-        d = glade_xml_get_widget (gui, "edit_vfolder");
-	gtk_object_set_data_full((GtkObject *)d, "data", data, g_free);
-
-	gtk_window_set_title((GtkWindow *)d, "Edit Score List");
-	for (i=0;i<BUTTON_LAST;i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect((GtkObject *)w, "clicked", edit_buttons[i].func, data);
-	}
-
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = (GtkList *)w;
-	l = NULL;
-	while ((rule = rule_context_next_rule((RuleContext *)f, rule, NULL))) {
-		GtkListItem *item;
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, rule->name);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "rule", rule);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-	}
-	gtk_list_append_items(data->list, l);
-	gtk_signal_connect((GtkObject *)w, "select_child", select_rule, data);
-
-	set_sensitive(data);
-	gtk_object_unref((GtkObject *)gui);
-
-	return d;
-}
diff --git a/filter/score-editor.h b/filter/score-editor.h
deleted file mode 100644
index cb78d465f0..0000000000
--- a/filter/score-editor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_EDITOR_H
-#define _SCORE_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define SCORE_EDITOR(obj)	GTK_CHECK_CAST (obj, score_editor_get_type (), ScoreEditor)
-#define SCORE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_editor_get_type (), ScoreEditorClass)
-#define IS_SCORE_EDITOR(obj)      GTK_CHECK_TYPE (obj, score_editor_get_type ())
-
-typedef struct _ScoreEditor	ScoreEditor;
-typedef struct _ScoreEditorClass	ScoreEditorClass;
-
-struct _ScoreEditor {
-	GnomeDialog parent;
-};
-
-struct _ScoreEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_editor_get_type	(void);
-ScoreEditor	*score_editor_new	(void);
-#endif
-
-struct _ScoreContext;
-
-/* methods */
-GtkWidget	*score_editor_construct	(struct _ScoreContext *f);
-
-#endif /* ! _SCORE_EDITOR_H */
-
diff --git a/filter/score-rule.c b/filter/score-rule.c
deleted file mode 100644
index f34f46081d..0000000000
--- a/filter/score-rule.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "score-rule.h"
-
-static xmlNodePtr xml_encode(FilterRule *);
-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);
-
-static void score_rule_class_init	(ScoreRuleClass *class);
-static void score_rule_init	(ScoreRule *gspaper);
-static void score_rule_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((ScoreRule *)(x))->priv)
-
-struct _ScoreRulePrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-score_rule_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreRule",
-			sizeof(ScoreRule),
-			sizeof(ScoreRuleClass),
-			(GtkClassInitFunc)score_rule_class_init,
-			(GtkObjectInitFunc)score_rule_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_rule_class_init (ScoreRuleClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *rule_class = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_rule_get_type ());
-	
-	object_class->finalize = score_rule_finalise;
-	
-	/* override methods */
-	rule_class->xml_encode = xml_encode;
-	rule_class->xml_decode = xml_decode;
-/*	rule_class->build_code = build_code;*/
-	rule_class->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-score_rule_init (ScoreRule *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-score_rule_finalise (GtkObject *obj)
-{
-	ScoreRule *o = (ScoreRule *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * score_rule_new:
- *
- * Create a new ScoreRule object.
- * 
- * Return value: A new #ScoreRule object.
- **/
-ScoreRule *
-score_rule_new (void)
-{
-	ScoreRule *o = (ScoreRule *)gtk_type_new (score_rule_get_type ());
-	return o;
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	ScoreRule *sr = (ScoreRule *)fr;
-	xmlNodePtr node, value;
-	char number[16];
-	
-	node = ((FilterRuleClass *)(parent_class))->xml_encode (fr);
-	sprintf (number, "%d", sr->score);
-	value = xmlNewNode (NULL, "score");
-	xmlSetProp (value, "value", number);
-	xmlAddChild (node, value);
-	
-	return node;
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	ScoreRule *sr = (ScoreRule *)fr;
-	xmlNodePtr value;
-	int result;
-	char *str;
-	
-	result = ((FilterRuleClass *)(parent_class))->xml_decode (fr, node, f);
-	if (result != 0)
-		return result;
-	
-	value = node->childs;
-	while (value) {
-		if (!strcmp (value->name, "score")) {
-			str = xmlGetProp (value, "value");
-			sscanf (str, "%d", &sr->score);
-			
-			/* score range is -3 to +3 */
-			if (sr->score > 3)
-				sr->score = 3;
-			else if (sr->score < -3)
-				sr->score = -3;
-		}
-		value = value->next;
-	}
-	
-	return 0;
-}
-
-/*static void build_code(FilterRule *fr, GString *out)
-{
-}*/
-
-static void
-spin_changed (GtkAdjustment *adj, ScoreRule *sr)
-{
-	sr->score = adj->value;
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget;
-	GtkWidget *frame;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkAdjustment *adj;
-	ScoreRule *sr = (ScoreRule *)fr;
-	GtkWidget *spin;
-	
-        widget = ((FilterRuleClass *)(parent_class))->get_widget (fr, f);
-	
-	frame = gtk_frame_new (_("Score"));
-	hbox = gtk_hbox_new (FALSE, 3);
-	label = gtk_label_new (_("Score"));
-	
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);
-	adj = (GtkAdjustment *)gtk_adjustment_new ((float) sr->score, -3.0, 3.0, 1.0, 1.0, 1.0);
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed", spin_changed, sr);
-	
-	spin = gtk_spin_button_new (adj, 1.0, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), hbox);
-	
-	gtk_widget_show_all (frame);
-	
-	gtk_box_pack_start (GTK_BOX (widget), frame, FALSE, FALSE, 3);
-	
-	return widget;
-}
diff --git a/filter/score-rule.h b/filter/score-rule.h
deleted file mode 100644
index 25607fd7c4..0000000000
--- a/filter/score-rule.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_RULE_H
-#define _SCORE_RULE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-rule.h"
-
-#define SCORE_RULE(obj)	GTK_CHECK_CAST (obj, score_rule_get_type (), ScoreRule)
-#define SCORE_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_rule_get_type (), ScoreRuleClass)
-#define IS_SCORE_RULE(obj)      GTK_CHECK_TYPE (obj, score_rule_get_type ())
-
-typedef struct _ScoreRule	ScoreRule;
-typedef struct _ScoreRuleClass	ScoreRuleClass;
-
-struct _ScoreRule {
-	FilterRule parent;
-	struct _ScoreRulePrivate *priv;
-
-	int score;
-};
-
-struct _ScoreRuleClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_rule_get_type	(void);
-ScoreRule	*score_rule_new	(void);
-
-/* methods */
-
-#endif /* ! _SCORE_RULE_H */
-
diff --git a/filter/vfolder-context.c b/filter/vfolder-context.c
deleted file mode 100644
index d895676404..0000000000
--- a/filter/vfolder-context.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-
-static void vfolder_context_class_init	(VfolderContextClass *class);
-static void vfolder_context_init	(VfolderContext *gspaper);
-static void vfolder_context_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderContext *)(x))->priv)
-
-struct _VfolderContextPrivate {
-};
-
-static RuleContextClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-vfolder_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderContext",
-			sizeof(VfolderContext),
-			sizeof(VfolderContextClass),
-			(GtkClassInitFunc)vfolder_context_class_init,
-			(GtkObjectInitFunc)vfolder_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_context_class_init (VfolderContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = vfolder_context_finalise;
-	/* override methods */
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-vfolder_context_init (VfolderContext *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", vfolder_rule_get_type(),
-				  rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-vfolder_context_finalise(GtkObject *obj)
-{
-	VfolderContext *o = (VfolderContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_context_new:
- *
- * Create a new VfolderContext object.
- * 
- * Return value: A new #VfolderContext object.
- **/
-VfolderContext *
-vfolder_context_new(void)
-{
-	VfolderContext *o = (VfolderContext *)gtk_type_new(vfolder_context_get_type ());
-	return o;
-}
diff --git a/filter/vfolder-context.h b/filter/vfolder-context.h
deleted file mode 100644
index 0bf1b5aaf2..0000000000
--- a/filter/vfolder-context.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_CONTEXT_H
-#define _VFOLDER_CONTEXT_H
-
-#include <gtk/gtk.h>
-
-#include "rule-context.h"
-
-#define VFOLDER_CONTEXT(obj)	GTK_CHECK_CAST (obj, vfolder_context_get_type (), VfolderContext)
-#define VFOLDER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_context_get_type (), VfolderContextClass)
-#define IS_VFOLDER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, vfolder_context_get_type ())
-
-typedef struct _VfolderContext	VfolderContext;
-typedef struct _VfolderContextClass	VfolderContextClass;
-
-struct _VfolderContext {
-	RuleContext parent;
-	struct _VfolderContextPrivate *priv;
-
-};
-
-struct _VfolderContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_context_get_type	(void);
-VfolderContext	*vfolder_context_new	(void);
-
-/* methods */
-
-#endif /* ! _VFOLDER_CONTEXT_H */
-
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
deleted file mode 100644
index 1b2022fecb..0000000000
--- a/filter/vfolder-editor.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "vfolder-editor.h"
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-
-#define d(x)
-
-#if 0
-static void vfolder_editor_class_init (VfolderEditorClass *class);
-static void vfolder_editor_init	(VfolderEditor *gspaper);
-static void vfolder_editor_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderEditor *)(x))->priv)
-
-struct _VfolderEditorPrivate {
-};
-
-static GnomeDialogClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-vfolder_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderEditor",
-			sizeof(VfolderEditor),
-			sizeof(VfolderEditorClass),
-			(GtkClassInitFunc)vfolder_editor_class_init,
-			(GtkObjectInitFunc)vfolder_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_editor_class_init (VfolderEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = vfolder_editor_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-vfolder_editor_init (VfolderEditor *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-vfolder_editor_finalise(GtkObject *obj)
-{
-	VfolderEditor *o = (VfolderEditor *)obj;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_editor_new:
- *
- * Create a new VfolderEditor object.
- * 
- * Return value: A new #VfolderEditor object.
- **/
-VfolderEditor *
-vfolder_editor_new(void)
-{
-	VfolderEditor *o = (VfolderEditor *)gtk_type_new (vfolder_editor_get_type ());
-	return o;
-}
-#endif
-
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void set_sensitive (struct _editor_data *data);
-
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterRule *rule;
-	int result;
-	GtkWidget *gd;
-	GtkWidget *w;
-	FilterPart *part;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = (FilterRule *) vfolder_rule_new ();
-	
-	part = rule_context_next_part (data->f, NULL);
-	filter_rule_add_part (rule, filter_part_clone (part));
-	
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Add VFolder Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		GtkWidget *item;
-		GList *l = NULL;
-		gchar *s;
-		
-		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (rule->name);
-		g_free (s);
-		
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (item);
-		
-		l = g_list_append (l, GTK_LIST_ITEM (item));
-		
-		gtk_list_append_items (data->list, l);
-		gtk_list_select_child (data->list, item);
-		
-		data->current = rule;
-		rule_context_add_rule (data->f, rule);
-		
-		set_sensitive (data);
-	} else {
-		gtk_object_unref (GTK_OBJECT (rule));
-	}
-}
-
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit VFolder Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-		if (pos != -1) {
-			GtkListItem *item = g_list_nth_data (data->list->children, pos);
-			gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
-			gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
-			g_free (s);
-		}
-	 }
-}
-
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos, len;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf ("delete rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	if (pos != -1) {
-		rule_context_remove_rule (data->f, data->current);
-		
-		item = g_list_nth_data (data->list->children, pos);
-		l = g_list_append (NULL, item);
-		gtk_list_remove_items (data->list, l);
-		g_list_free (l);
-		
-		gtk_object_unref (GTK_OBJECT (data->current));
-		data->current = NULL;
-		
-		/* select the item in the same position or 1-up */
-		len = g_list_length (data->list->children);
-		pos = pos >= len ? len - 1: pos;
-		gtk_list_select_item (data->list, pos);
-	}
-	
-	set_sensitive (data);
-}
-
-static void
-rule_move (struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf ("moving %d to %d\n", from, to));
-	rule_context_rank_rule (data->f, data->current, to);
-	
-	item = g_list_nth_data (data->list->children, from);
-	l = g_list_append (NULL, item);
-	gtk_list_remove_items_no_unref (data->list, l);
-	gtk_list_insert_items (data->list, l, to);			      
-	gtk_list_select_child (data->list, GTK_WIDGET (item));
-	set_sensitive (data);
-}
-
-static void
-rule_up (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
-}
-
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	rule_move (data, pos, pos + 1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive (struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index = -1, count = 0;
-	
-	while ((rule = rule_context_next_rule (data->f, rule, NULL))) {
-		if (rule == data->current)
-			index = count;
-		count++;
-	}
-	
-	d(printf ("index = %d count=%d\n", index, count));
-	
-	count--;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DOWN]), index >= 0 && index < count);
-}
-
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
-	
-	if (data->current)
-		d(printf ("selected rule: %s\n", data->current->name));
-	else
-		d(printf ("bad data?\n"));
-	
-	set_sensitive (data);
-}
-
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	if (event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, user_data);
-}
-
-GtkWidget *
-vfolder_editor_construct (struct _VfolderContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w;
-	GList *l;
-	FilterRule *rule = NULL;
-	struct _editor_data *data;
-	int i;
-	
-	g_assert (IS_VFOLDER_CONTEXT (f));
-	
-	data = g_malloc0 (sizeof (*data));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_vfolder");
-        d = glade_xml_get_widget (gui, "edit_vfolder");
-	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
-	
-	gtk_window_set_title (GTK_WINDOW (d), "Edit VFolders");
-	for (i = 0; i < BUTTON_LAST; i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
-	}
-	
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = GTK_LIST (w);
-	l = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *)f, rule, NULL))) {
-		GtkWidget *item;
-		
-		gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (GTK_WIDGET (item));
-		l = g_list_append (l, GTK_LIST_ITEM (item));
-	}
-	
-	gtk_list_append_items (data->list, l);
-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
-}
diff --git a/filter/vfolder-editor.h b/filter/vfolder-editor.h
deleted file mode 100644
index 2ff2b261dc..0000000000
--- a/filter/vfolder-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_EDITOR_H
-#define _VFOLDER_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define VFOLDER_EDITOR(obj)	GTK_CHECK_CAST (obj, vfolder_editor_get_type (), VfolderEditor)
-#define VFOLDER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_editor_get_type (), VfolderEditorClass)
-#define IS_VFOLDER_EDITOR(obj)      GTK_CHECK_TYPE (obj, vfolder_editor_get_type ())
-
-typedef struct _VfolderEditor	VfolderEditor;
-typedef struct _VfolderEditorClass	VfolderEditorClass;
-
-struct _VfolderEditor {
-	GnomeDialog parent;
-	struct _VfolderEditorPrivate *priv;
-
-};
-
-struct _VfolderEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_editor_get_type	(void);
-VfolderEditor	*vfolder_editor_new	(void);
-#endif
-
-struct _VfolderContext;
-
-/* methods */
-GtkWidget	*vfolder_editor_construct	(struct _VfolderContext *f);
-
-#endif /* ! _VFOLDER_EDITOR_H */
-
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
deleted file mode 100644
index 322e3eabb7..0000000000
--- a/filter/vfolder-rule.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-#include "shell/evolution-shell-client.h"
-
-#define d(x) x
-
-static xmlNodePtr xml_encode(FilterRule *);
-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);
-
-extern EvolutionShellClient *global_shell_client;
-
-static void vfolder_rule_class_init	(VfolderRuleClass *class);
-static void vfolder_rule_init	(VfolderRule *gspaper);
-static void vfolder_rule_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderRule *)(x))->priv)
-
-struct _VfolderRulePrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-guint
-vfolder_rule_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderRule",
-			sizeof(VfolderRule),
-			sizeof(VfolderRuleClass),
-			(GtkClassInitFunc)vfolder_rule_class_init,
-			(GtkObjectInitFunc)vfolder_rule_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_rule_class_init (VfolderRuleClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_rule_get_type ());
-
-	object_class->finalize = vfolder_rule_finalise;
-
-	/* override methods */
-	filter_rule->xml_encode = xml_encode;
-	filter_rule->xml_decode = xml_decode;
-	/*filter_rule->build_code = build_code;*/
-	filter_rule->get_widget = get_widget;
-}
-
-static void
-vfolder_rule_init (VfolderRule *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-}
-
-static void
-vfolder_rule_finalise(GtkObject *obj)
-{
-	VfolderRule *o = (VfolderRule *)obj;
-	o = o;
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_rule_new:
- *
- * Create a new VfolderRule object.
- * 
- * Return value: A new #VfolderRule object.
- **/
-VfolderRule *
-vfolder_rule_new(void)
-{
-	VfolderRule *o = (VfolderRule *)gtk_type_new(vfolder_rule_get_type ());
-	return o;
-}
-
-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri)
-{
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	vr->sources = g_list_append(vr->sources, g_strdup(uri));
-}
-
-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri)
-{
-	GList *l;
-
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	/* only does a simple string or address comparison, should
-	   probably do a decoded url comparison */
-	l = vr->sources;
-	while (l) {
-		if (l->data == uri || !strcmp(l->data, uri))
-			return l->data;
-		l = g_list_next(l);
-	}
-	return NULL;
-}
-
-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri)
-{
-	char *found;
-
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	found = (char *)vfolder_rule_find_source(vr, uri);
-	if (found) {
-		vr->sources = g_list_remove(vr->sources, found);
-		g_free(found);
-	}
-}
-
-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last)
-{
-	GList *node;
-
-	if (last == NULL) {
-		node = vr->sources;
-	} else {
-		node = g_list_find(vr->sources, (char *)last);
-		if (node == NULL)
-			node = vr->sources;
-		else
-			node = g_list_next(node);
-	}
-	if (node)
-		return (const char *)node->data;
-	return NULL;
-}
-
-static xmlNodePtr xml_encode(FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	VfolderRule *vr = (VfolderRule *)fr;
-
-        node = ((FilterRuleClass *)(parent_class))->xml_encode(fr);
-	g_assert(node != NULL);
-	set = xmlNewNode(NULL, "sources");
-	xmlAddChild(node, set);
-	l = vr->sources;
-	while (l) {
-		work = xmlNewNode(NULL, "folder");
-		xmlSetProp(work, "uri", l->data);
-		xmlAddChild(set, work);
-		l = g_list_next(l);
-	}
-	return node;
-}
-
-static int xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	xmlNodePtr set, work;
-	int result;
-	VfolderRule *vr = (VfolderRule *)fr;
-	char *uri;
-	
-        result = ((FilterRuleClass *)(parent_class))->xml_decode(fr, node, f);
-	if (result != 0)
-		return result;
-
-	set = node->childs;
-	while (set) {
-		if (!strcmp(set->name, "sources")) {
-			work = set->childs;
-			while (work) {
-				if (!strcmp(work->name, "folder")) {
-					uri = xmlGetProp(work, "uri");
-					if (uri)
-						vr->sources = g_list_append(vr->sources, uri);
-				}
-				work = work->next;
-			}
-		}
-		set = set->next;
-	}
-	return 0;
-}
-
-enum {
-	BUTTON_ADD,
-	BUTTON_REMOVE,
-	BUTTON_LAST,
-};
-
-struct _source_data {
-	RuleContext *f;
-	VfolderRule *vr;
-	const char *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void source_add(GtkWidget *widget, struct _source_data *data);
-static void source_remove(GtkWidget *widget, struct _source_data *data);
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "source_add", source_add },
-	{ "source_remove", source_remove },
-};
-
-static void
-set_sensitive(struct _source_data *data)
-{
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_ADD], TRUE);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_REMOVE], data->current != NULL);
-}
-
-static void
-select_source(GtkWidget *w, GtkWidget *child, struct _source_data *data)
-{
-	data->current = gtk_object_get_data((GtkObject *)child, "source");
-	set_sensitive(data);
-}
-
-static void source_add(GtkWidget *widget, struct _source_data *data)
-{
-	const char *allowed_types[] = { "mail", NULL };
-	char *def, *uri;
-	GtkListItem *item;
-	GList *l;
-	gchar *s;
-
-	def = "";
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   _("Select Folder"),
-						   def, allowed_types, NULL, &uri);
-
-	if (uri != NULL && uri[0] != '\0') {
-		data->vr->sources = g_list_append(data->vr->sources, uri);
-
-		l = NULL;
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, uri);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "source", uri);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(NULL, item);
-		gtk_list_append_items(data->list, l);
-		gtk_list_select_child(data->list, (GtkWidget *)item);
-		data->current = uri;
-	} else {
-		g_free(uri);
-	}
-	set_sensitive(data);
-}
-
-static void source_remove(GtkWidget *widget, struct _source_data *data)
-{
-	const char *source;
-	int index = 0;
-	GList *l;
-	GtkListItem *item;
-
-	source = NULL;
-	while ((source = vfolder_rule_next_source(data->vr, source))) {
-		if (data->current == source) {
-			vfolder_rule_remove_source(data->vr, source);
-			item = g_list_nth_data(data->list->children, index);
-			l = g_list_append(NULL, item);
-			gtk_list_remove_items(data->list, l);
-			g_list_free(l);
-			data->current = NULL;
-			break;
-		}
-		index++;
-	}
-	set_sensitive(data);
-}
-
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget, *frame, *w;
-	GladeXML *gui;
-	const char *source;
-	VfolderRule *vr = (VfolderRule *)fr;
-	struct _source_data *data;
-	int i;
-	GList *l;
-
-        widget = ((FilterRuleClass *)(parent_class))->get_widget(fr, f);
-
-	data = g_malloc0(sizeof(*data));
-	data->f = f;
-	data->vr = vr;
-
-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "vfolder_source_frame");
-        frame = glade_xml_get_widget (gui, "vfolder_source_frame");
-
-	gtk_object_set_data_full((GtkObject *)frame, "data", data, g_free);
-
-	for (i=0;i<BUTTON_LAST;i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect((GtkObject *)w, "clicked", edit_buttons[i].func, data);
-	}
-
-        w = glade_xml_get_widget (gui, "source_list");
-	data->list = (GtkList *)w;
-	l = NULL;
-	source = NULL;
-	while ((source = vfolder_rule_next_source(vr, source))) {
-		GtkListItem *item;
-		gchar *s = e_utf8_to_gtk_string ((GtkWidget *) data->list, source);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "source", (void *)source);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-	}
-	gtk_list_append_items(data->list, l);
-	gtk_signal_connect((GtkObject *)w, "select_child", select_source, data);
-	set_sensitive(data);
-
-	gtk_box_pack_start(GTK_BOX(widget), frame, TRUE, TRUE, 3);
-	return widget;
-}
diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h
deleted file mode 100644
index c3fa130c84..0000000000
--- a/filter/vfolder-rule.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_RULE_H
-#define _VFOLDER_RULE_H
-
-#include <gtk/gtk.h>
-#include "filter-rule.h"
-
-#define VFOLDER_RULE(obj)	GTK_CHECK_CAST (obj, vfolder_rule_get_type (), VfolderRule)
-#define VFOLDER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_rule_get_type (), VfolderRuleClass)
-#define IS_VFOLDER_RULE(obj)      GTK_CHECK_TYPE (obj, vfolder_rule_get_type ())
-
-typedef struct _VfolderRule	VfolderRule;
-typedef struct _VfolderRuleClass	VfolderRuleClass;
-
-struct _VfolderRule {
-	FilterRule parent;
-	struct _VfolderRulePrivate *priv;
-
-	GList *sources;		/* uri's of the source folders */
-};
-
-struct _VfolderRuleClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_rule_get_type	(void);
-VfolderRule	*vfolder_rule_new	(void);
-
-/* methods */
-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri);
-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last);
-
-#endif /* ! _VFOLDER_RULE_H */
-
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
deleted file mode 100644
index 2b500f83d9..0000000000
--- a/filter/vfoldertypes.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="sender">
-  <title>Sender</title>
-   <input type="optionlist" name="sender-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "From" ${sender}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "From" ${sender})))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(match-all (header-matches "From" ${sender}))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-        <code>(match-all (not (header-matches "From" ${sender})))</code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "From" ${sender})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "From" ${sender})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="sender"/>
- </part>
-
- <part name="to">
-   <title>Recipients</title>
-   <input type="optionlist" name="recipient-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (or (header-contains "To" ${recipient})
-	               (header-contains "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (or
-                          (header-contains "To" ${recipient})
-	                  (header-contains "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (or (header-matches "To" ${recipient})
-	    	       (header-matches "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (or
-               (header-matches "To" ${recipient})
-	       (header-matches "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (or (header-starts-with "To" ${recipient})
-	    	       (header-starts-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (or
-               (header-starts-with "To" ${recipient})
-	       (header-starts-with "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (or (header-ends-with "To" ${recipient})
-	    	       (header-ends-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (or
-               (header-ends-with "To" ${recipient})
-	       (header-ends-with "Cc" ${recipient}))))
-     </code>
-    </option>
-   </input>
-   <input type="address" name="recipient"/>
- </part>
-
- <part name="subject">
-   <title>Subject</title>
-   <input type="optionlist" name="subject-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains "Subject" ${subject})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-	(match-all (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-	(match-all (not (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-	(match-all (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-	(match-all (not (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="subject"/>
- </part>
- <part name="body">
-   <title>Message Body</title>
-   <input type="optionlist" name="body-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(body-contains ${word})
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(not (body-contains ${word}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-
- <part name="sent-date">
-  <title>Message was sent</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="before">
-    <title>before</title>
-    <code>
-       (match-all (&lt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-sent-date) ${versus})))
-    </code>
-   </option>
-   <option value="after">
-    <title>after</title>
-    <code>
-       (match-all (&gt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-sent-date) ${versus})))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus">
-  </input>
- </part>
-
- <part name="recv-date">
-  <title>Message was received</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="before">
-    <title>before</title>
-    <code>
-       (match-all (&lt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-received-date) ${versus})))
-    </code>
-   </option>
-   <option value="after">
-    <title>after</title>
-    <code>
-       (match-all (&gt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-received-date) ${versus})))
-    </code>
-   </option>
-  </input> 
-  <input type="datespec" name="versus">
-  </input>
- </part>
-
- <part name="status">
-  <title>Status</title>
-  <input type="optionlist" name="match-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-     (match-all (system-flag ${flag}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-     (match-all (not (system-flag ${flag})))
-    </code>
-   </option>
-  </input>
-  <input type="system-flag" name="flag"/>
- </part>
-
- <part name="mlist">
-  <title>Mailing list</title>
-   <input type="optionlist" name="mlist-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-        <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="mlist"/>
- </part>
-
-</partset>
-</filterdescription>
diff --git a/help/.cvsignore b/help/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/C/.cvsignore b/help/C/.cvsignore
deleted file mode 100644
index 2f4c48adbf..0000000000
--- a/help/C/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-evolution-guide
-evolution-guide.junk
-evolution-guide.log
-evolution-guide.ps
-evolution-guide.dvi
-evolution-guide.tex
-fig/*.eps
\ No newline at end of file
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
deleted file mode 100644
index 15f1e047b6..0000000000
--- a/help/C/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-SGML_FILES =			\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-fdl.sgml		\
-	apx-gloss.sgml		\
-	config-prefs.sgml	\
-	config-setupassist.sgml	\
-	config-sync.sgml	\
-	evolution-guide.sgml	\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-sync.sgml
-
-
-EXTRA_DIST = \
-	$(SGML_FILES)
-
-all: evolution-guide
-
-evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
-
-dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
-	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
-
-install-data-local: evolution-guide
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
deleted file mode 100644
index 89f0dd6bc5..0000000000
--- a/help/C/apx-authors.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@helixcode.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
-     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@helixcode.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@helixcode.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@helixcode.com</email></member>     
-     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@helixcode.com</email></member>
-     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
-</simplelist>
-and other dedicated GNOME programmers. 
-</para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.helixcode.com/apps/evolution.php3"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugs.gnome.org" type="http">GNOME bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
-      command <command>bug-buddy</command> for submitting bug reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@helixcode.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
-      application programmers and the GNOME Documentation Project.
-      Please send all comments and suggestions regarding the manual to
-      the GNOME Documentation Project at
-      <email>docs@gnome.org</email>. You can also add your comments
-      online by using <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
-    </para>
-    <!-- For translations: uncomment this: <para> Latin translation
-      was done by ME (<email>MYNAME@MYADDRESS</email>). Please send
-      all comments and suggestions regarding this translation to
-      SOMEWHERE.  </para> -->
-    </appendix>
-
-
-
-
-
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
deleted file mode 100644
index e4a96a8155..0000000000
--- a/help/C/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Known bugs and limitations</title>
-    <abstract>
-    <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
-    </para>
-  </appendix>
-
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
deleted file mode 100644
index 129020aa3d..0000000000
--- a/help/C/apx-gloss.sgml
+++ /dev/null
@@ -1,459 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glossary</title>
-
- <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
-  <glossdef>
-   <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Conduit</glossterm>
-  <glossdef>
-   <para>
-     A synchronization conduit is a small application which controls
-     the transfer of data between a handheld device and a desktop
-     computer.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Druid</glossterm>
-  <glossdef>
-   <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
-     account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward</glossterm>
-  <glossdef>
-   <para>
-       the user can send a third party a message
-    which was sent to the user originally.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
-    for describing page layout in electronic documents like web pages,
-    help files, and email messages.  HTML can be used in email and
-    news posts to insert images and apply text treatments.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
-  <glossdef>
-   <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, it allows access to email which is typically (although
-    not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP</glossterm>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Inline</glossterm>
-  <glossdef>
-   <para>
-     Displayed as part of a message or other document, rather than
-     attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly.*so[a|u]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
-  <glossdef>
-   <para>
-      As its name implies, <application>sendmail</application> is a
-      program which sends mail.  <application>Evolution</application>
-      can use it instead of <glossterm>SMTP</glossterm>; some people
-      prefer it because it offers more flexibility, but is more
-      difficult to set up.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
-  <glossdef>
-   <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signature</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unsolicited e-mail.  Spam normally comes in forms of
-    chain letters and advertisements for unscrupulous or clueless
-    companies.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="tooltip">
-  <glossterm>Tool-Tip</glossterm>
-  <glossdef>
-   <para>
-      A small box of explanatory text which appears when the mouse
-      pointer is held motionless over a button or other interface
-      element.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
-  <glossdef>
-   <para>
-    A file format for the exchange of contact information. When you
-    get an address card attached to an email, it's probably in vCard
-    format.  Not to be confused with <glossterm
-    linkend="vfolder">vFolder</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
-  <glossdef>
-   <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
deleted file mode 100644
index 157b61e1cc..0000000000
--- a/help/C/config-prefs.sgml
+++ /dev/null
@@ -1,646 +0,0 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Mail
-        configuration</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	<varlistentry>
-          <term><guilabel>Identities</guilabel></term>
-          <listitem>
-	    <para>
-               This allows you to create and alter one or more
-               identities for your email.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Sources</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> where to get the
-               mail sent to you, and how to get it.
-            </para>
-          </listitem>
-	</varlistentry>
-	<varlistentry>
-
-	  <term><guilabel>Mail Transport</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> how to send mail.
-            </para>
-          </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>News Servers</guilabel></term>
-	  <listitem>
-	    <para>
-              If you would like to use
-              <application>Evolution</application> to read newsgroups,
-              you can specify your news server preferences here.
-           </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>Other</guilabel></term>
-	  <listitem>
-	    <para>
-              Miscellaneous mail and news settings, such as HTML
-              handling preferences, and how long
-              <application>Evolution</application> should wait before
-              marking a message read.
-           </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
-      <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
-       </para>
-       <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
-      <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from <glossterm
-                  linkend="imap">IMAP</glossterm> or <glossterm
-                  linkend="pop">POP</glossterm> servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
-                  <glossterm linkend="smtp">SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server-- this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.
-          </para>
-      </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
-	<para>
-           The <interface>Mail Transports</interface> tab lets you set
-           how you will send mail.  Evolution currently supports two
-           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
-           uses a remote mail server, and
-           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <glossterm>SMTP</glossterm>.
-        </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-                <term> 
-                   <guilabel>Send messages in HTML format</guilabel>
-                </term>
-                <listitem><para>
-                    If you check this box, you will send
-                    messages as HTML by default.  If you leave it unchecked, your
-                    messages will be sent without HTML formatting unless you select 
-                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-                    </menuchoice> in the message composer.
-                    See <xref linkend="usage-mail-getnsend-send-html">
-                    for more information about HTML mail.
-                </para></listitem>
-              </varlistentry>
-             <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Weeks start on</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day range</term>
-	    <listitem>
-               <para>
-                 When does your work day start, and when does it end?
-                 In the day and week views,
-                 <application>Evolution</application> displays all the
-                 hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, you can
-                 still schedule an appointment outside of these hours,
-                 and if you do, the display will be extended to show
-                 it.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Calendar Colors</title>
-      <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements whose color you can set are:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
-       <variablelist>
-	 <varlistentry>
-	   <term>Show on To Do List</term>
-	    <listitem>
-	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Style Options</term>
-	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</title>
-	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
-	<para>
-          You can set the following options: <!--insert variable list
-          here-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
deleted file mode 100644
index b9b72b568a..0000000000
--- a/help/C/config-setupassist.sgml
+++ /dev/null
@@ -1,213 +0,0 @@
-    <chapter id="config-setupassist">
-      <title>Easy Setup with the Setup Assistant</title>
-      <para>
-        The first time you try to use email, the mail setup assistant
-        will ask you for some basic information, so
-        <application>Evolution</application> can let you use email. If
-        you prefer more detailed configuration, or if you want to make
-        changes to an existing email setup, see <xref
-        linkend="config-prefs">.
-      </para>
-
-   <sect1 id="config-setupassist-mail">
-      <title>Mail Setup</title>
-      <para>
-        The first time you try to send or receive mail with
-	<application>Evolution</application>, the <interface>mail
-	setup assistant</interface> will pop up to help you with your
-	email preferences.  If you don't plan to use email, or if
-	you'd rather deal with your email preferences later, click
-	<guibutton>Cancel</guibutton>.
-      </para>
-
-<!--  
-
-        Before you get it, though, you should decide where you want to
-	keep it.  Your options will vary a little depending on your
-	network setup, but they come down to storing the mail on your
-	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
-	storing it on the network (using <glossterm
-	linkend="imap">IMAP</glossterm>).  If you store your mail on
-	your local hard disk, you can read it whether you're online or
-	not, but you can only read it from one computer.  If you store
-	it on the network, you can only read it when you're online,
-	but you can access it from almost any computer with a network
-	connection, even if it doesn't have
-	<application>Evolution</application>.
-
-
-        If you choose POP, you'll be putting mail in the
-        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
-        folder.  If you choose IMAP, it's the
-        <guilabel>Inbox</guilabel> of a folder with the same name as
-        your mail server.  That's so you can maintain several distinct
-        IMAP servers if you want.  See <xref
-        linkend="config-prefs-mail"> for more information about mail
-        servers.
--->
-
-      <para>
-         The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
-	 network configuration process.  It will ask you for some
-	 basic information; your system administrator or ISP should
-	 have the answers you'll need.  The mail setup assistant is
-	 pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
-	<figure id="usage-setup-fig">
-	<title>Mail Setup Assistant</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
-	    </graphic>
-	</screenshot>
-	</figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
-  The assistant will ask you for the following information:
-        <variablelist>
-
-          <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term> <listitem>
-	  <para>Your full name. </para></listitem>
-         </varlistentry>
-
-       <varlistentry>
-          <term><guilabel>Email address:</guilabel></term>
-	  <listitem><para>
-                 Your complete email address.
-                 </para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-          <term> <guilabel>Organization:</guilabel></term>
-	  <listitem>
-	    <para>
-              Any organization you represent, or the company where you
-              work.  Leave this blank if you wish, or type "My own bad
-              self" so people know your opinions are yours alone.
-            </para>
-	  </listitem>
-      </varlistentry>
-
-      <varlistentry>
-	 <term><guilabel>Signature File:</guilabel></term>
-          <listitem>
-            <para>
-             A text file appended to any email you send.  A signature
-             file typically consists of your name and email address,
-             or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remember,
-             this is attached to every email you send.
-            </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-           <term> <guilabel>Mail source type:</guilabel></term>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> supports several
-              mail sources: <glossterm linkend="pop">POP</glossterm> and
-              <glossterm linkend="imap">IMAP</glossterm> servers, and UNIX-style
-              <systemitem><filename>mbox</filename></systemitem> and
-              <systemitem><filename>mh</filename></systemitem> files.
-              POP servers retrieve your mail and store it on your
-              local system so you can refer to it even when not
-              connected to a network; <glossterm>IMAP</glossterm>
-              servers store the mail on the server so you can access
-              it from multiple locations;
-              <systemitem><filename>mbox</filename>></systemitem>
-              files are used by your computer for internal mail, and
-              may be useful if you want to switch from another email
-              client such as <application>Spruce</application> or
-              <application>Netscape Communicator</application>.  Ask
-              your system administrator which you should use, or keep
-              guessing until one works.  You may use multiple sources
-              if you wish; see <xref
-              linkend="config-prefs-mail-network"> for more
-              information.
-            </para>
-            <para>
-              If you decide not to have
-              <application>Evolution</application> use any servers,
-              the remaining items are not relevant; you only need to
-              point to the location of the files you wish to access.
-            </para>
-	  </listitem>
-	  </varlistentry>
-          
-       <varlistentry>
-          <term> <guilabel>Server:</guilabel></term>
-	  <listitem>
-	    <para>
-              This should be the name of the server where you get
-              incoming mail.  It may (or may not) be the same as the
-              server where you send your outgoing mail.
-            </para>
-	  </listitem>
-	</varlistentry>
-
-     <varlistentry>
-	  <term><guilabel>Username:</guilabel></term>
-	<listitem>
-             <para>
-              Enter the username for your mail server account, if you
-              have one. In almost all cases, this is the part of your email
-              address before the @ character, and
-              <application>Evolution</application> has selected that
-              value as the default.  If you have a different username,
-              you can enter it here.
-            </para>
-	  </listitem>
-      </varlistentry>
-     
-       <varlistentry>
-            <term><guilabel>Authentication:</guilabel></term> 
-	    <listitem>
-	    <para>
-              Select the type of authentication you will use.  You can
-              click <guibutton>Detect supported types</guibutton> to
-              find out which authentication protocols your network
-              allows.
-            </para>
-	  </listitem>
-       </varlistentry>
-
-      <varlistentry> 
-         <term><guilabel>Mail Transport:</guilabel></term>
-	  <listitem>
-	    <para>
-              This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both
-              <glossterm linkend="smtp">SMTP</glossterm> and
-              <application>sendmail</application>; SMTP is by far the
-              more common.
-            </para>
-	  </listitem>
-      </varlistentry>
-     </variablelist>
-      </para>
-      <para>
-        To learn how to configure <application>Evolution</application>
-        in greater detail, or to change preferences once you have set
-        them, see <xref linkend="config-prefs">.
-      </para>
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
deleted file mode 100644
index 0445b474c4..0000000000
--- a/help/C/config-sync.sgml
+++ /dev/null
@@ -1,124 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        deal with. 
-        <simplelist>
-          <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, <application>Evolution</application> only
-            supports Palm-OS devices like the PalmPilot and the
-            Handspring Visor.
-          </member>
-          <member>
-           You should decide what sort of synchronization behavior you
-           want.
-          </member>
-        </simplelist>
-
-    </para>
-    <para>
-       If you haven't used a handheld device with your computer
-       before, you'll need to run the GNOME <application>Control
-       Center</application> and make sure that <application>Pilot
-       Link</application> is properly configured. Then, select the
-       <application>Evolution</application> <glossterm
-       linkend="conduit">conduits</glossterm> under the
-       <guilabel>Pilot Conduits</guilabel> section of the Control
-       Center.
-      </para>
-     <para>
-        Once your computer and your Palm-OS device are talking happily
-        to each other, you'll have to decide what exactly you want
-        them to do with the data they exchange.  Your options may vary
-        depending on the conduit, but typically they will be:
-
-        <variablelist>
-         <varlistentry>
-            <term>Disabled </term>
-            <listitem> 
-               <para>
-                  Do nothing.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Synchronize</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  from the handheld to the computer.  Remove items
-                  that were on both systems but have been deleted on
-                  one.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy From Pilot</term>
-            <listitem> 
-               <para>
-                  If there is any new data on the the handheld device,
-                  copy it to the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy To Pilot</term>
-            <listitem> 
-               <para>
-                 Copy new data from the computer to the handheld. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge From Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the handheld to the computer, and
-                  remove any information from the computer that has
-                  been deleted on the handheld.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge To Pilot</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  remove any information from the handheld that has
-                  been deleted on the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Select a behavior for each conduit available.  For the most
-      part, you'll want to stick with
-      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the synchronization button.
-    </para>
-
-
-      <para> 
-         <warning> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  To do that,
-	    make a copy of your <systemitem>
-	    <filename>~/evolution</filename> </systemitem> directory.
-          </para>
-	</warning>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
deleted file mode 100644
index 114f2e87d9..0000000000
--- a/help/C/evolution.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000</year>
-      <holder> Ximian, Inc., </holder>
-      <holder> Kevin Breit </holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation
-         License</citetitle></ulink>, Version 1.1 or any later version
-         published by the Free Software Foundation with no Invariant
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-         may obtain a copy of the <citetitle>GNU Free Documentation
-         License</citetitle> from the Free Software Foundation by
-         visiting <ulink type="http" url="http://www.fsf.org">their
-         Web site</ulink> or by writing to: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and those trademarks
-         are made aware to the members of the GNOME Documentation
-         Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-
-   <releaseinfo>
-      This is version 0.9 of the Evolution manual.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Using Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application> for
-        email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that there's more
-        than one way to do things, and you can pick whichever method
-        you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable" means
-        what it ought to.  It means that, while you can expect the
-        program to work perfectly well in its default settings, it's
-        also easy to alter its behavior in a wide variety of ways, so
-        that it fits your needs exactly.  This part of the book will
-        describe that process, from the quickest glimpse of the Setup
-        Assistant to an in-depth tour of the preferences dialogs.
-      </para>
-    </partintro>
-
-    &CONFIG-SETUPASSIST;
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
- 
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/fig/calendar.png b/help/C/fig/calendar.png
deleted file mode 100644
index c9703f4903..0000000000
--- a/help/C/fig/calendar.png
+++ /dev/null
diff --git a/help/C/fig/config-cal.png b/help/C/fig/config-cal.png
deleted file mode 100644
index 25b5b68621..0000000000
--- a/help/C/fig/config-cal.png
+++ /dev/null
diff --git a/help/C/fig/config-mail.png b/help/C/fig/config-mail.png
deleted file mode 100644
index cd8543d94e..0000000000
--- a/help/C/fig/config-mail.png
+++ /dev/null
diff --git a/help/C/fig/contact-editor.png b/help/C/fig/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/help/C/fig/contact-editor.png
+++ /dev/null
diff --git a/help/C/fig/contact.png b/help/C/fig/contact.png
deleted file mode 100644
index a9ed02251a..0000000000
--- a/help/C/fig/contact.png
+++ /dev/null
diff --git a/help/C/fig/filter-assist-fig.png b/help/C/fig/filter-assist-fig.png
deleted file mode 100644
index 5248e0effe..0000000000
--- a/help/C/fig/filter-assist-fig.png
+++ /dev/null
diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png
deleted file mode 100644
index a8b41ca678..0000000000
--- a/help/C/fig/filter-new-fig.png
+++ /dev/null
diff --git a/help/C/fig/mail-composer.png b/help/C/fig/mail-composer.png
deleted file mode 100644
index 22c16365b5..0000000000
--- a/help/C/fig/mail-composer.png
+++ /dev/null
diff --git a/help/C/fig/mail-druid-pic.png b/help/C/fig/mail-druid-pic.png
deleted file mode 100644
index f29f3e77be..0000000000
--- a/help/C/fig/mail-druid-pic.png
+++ /dev/null
diff --git a/help/C/fig/mail-inbox.png b/help/C/fig/mail-inbox.png
deleted file mode 100644
index b4f18640b4..0000000000
--- a/help/C/fig/mail-inbox.png
+++ /dev/null
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
deleted file mode 100644
index 28bf487bf9..0000000000
--- a/help/C/fig/mainwindow-pic.png
+++ /dev/null
diff --git a/help/C/fig/print-dest.png b/help/C/fig/print-dest.png
deleted file mode 100644
index 464705711e..0000000000
--- a/help/C/fig/print-dest.png
+++ /dev/null
diff --git a/help/C/fig/print-preview.png b/help/C/fig/print-preview.png
deleted file mode 100644
index 7f9a8d661a..0000000000
--- a/help/C/fig/print-preview.png
+++ /dev/null
diff --git a/help/C/fig/vfolder-createrule-fig.png b/help/C/fig/vfolder-createrule-fig.png
deleted file mode 100644
index 162bebf48c..0000000000
--- a/help/C/fig/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
deleted file mode 100644
index d82191cb17..0000000000
--- a/help/C/menuref.sgml
+++ /dev/null
@@ -1,1470 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Menu Reference</title>
-  <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-
-
-  <sect1 id="menuref-universal">
-    <title>Menus that are the same everywhere</title>
-    <para>
-      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in
-      the main <application>Evolution</application> window do not
-      change, because they refer to universal items.  Other menus have
-      contents that change depending on context.
-    </para>
-   
- <sect2 id="menuref-universal-file">
-      <title>File Menu</title>
-      <para>
-	<variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>New...</guisubmenu> Submenu</term>
-	    <listitem><para>
-		<itemizedlist>
-		  <listitem><para>
-		      <guimenuitem>Folder</guimenuitem> &mdash;
-		       Create a new folder. See <xref 
-		       linkend="usage-mainwindow-folderbar">
-		       for more information about folders.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Shortcut</guimenuitem> &mdash;
-		       Create a new Shortcut in the Shortcut Bar.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Mail Message</guimenuitem> &mdash;
-		       Compose a new mail message. Covered in
-		       <xref linkend="usage-mail-getnsend-send">.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Appointment</guimenuitem> &mdash;
-		       Enter a new appointment in your calendar. See <xref
-			linkend="usage-calendar-apts-basic"> for more information.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Task</guimenuitem> &mdash;
-		       Enter a new to-do item in your taskpad. Covered in 
-		       <xref linkend="usage-calendar-todo">.
-		    </para></listitem>
-		</itemizedlist>
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Go to Folder</guimenuitem></term>
-	    <listitem><para>
-               View the items in a particular folder.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Create New Folder</guimenuitem></term>
-	    <listitem><para>
-		 This item doesn't belong here any more.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-		 Print the current message.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Exit</guimenuitem></term>
-	    <listitem><para>
-		 Quit using <application>Evolution</application>.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-universal-help">
-      <title>The Help Menu</title>
-      <para>
-      <variablelist>
-	<varlistentry>
-	  <term><guimenuitem>Help Index</guimenuitem></term>
-	  <listitem><para>
-             Displays the table of contents for this document.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Getting Started</guimenuitem></term>
-	  <listitem><para>
-              A quick look around, and a summary of the things
-              <application>Evolution</application> can do for you.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Mailer</guimenuitem></term>
-	  <listitem><para>
-              An in-depth tour of <application>Evolution</application> Mail.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Calendar</guimenuitem></term>
-	  <listitem><para>
-             A step-by-step guide to using the Calendar.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>
-	  <listitem><para>
-            Find your way around the Contact Manager.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Submit Bug Report</guimenuitem></term>
-	  <listitem><para>
-             If you don't report them, they can't fix them.  Select this item to let the 
-             developers know what's wrong.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>About Evolution</guimenuitem></term>
-	  <listitem><para>
-              Displays a window with information about the application and its authors.
-              This has the same information as <xref linkend="authors">.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-exec">
-   <title>Executive Summary Menus</title>
-   <para>
-     We'll leave this section blank until the UI stabilizes a little
-     more.
-   </para>
-  </sect1>
-
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </para>
-   
-    <sect2 id="menuref-mail-edit">
-      <title>The Edit Menu</title>
-      <para>
-        This menu is currently empty.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-view">
-      <title>The Mail View Menu</title>
-      <para>
-        This menu lets you control the way
-        <application>Evolution</application> displays your information
-        for you.
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the shortcut bar on and off with this item.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Threaded Message List</guimenuitem></term>
-	    <listitem><para>
-               This item controls whether your message list is displayed by thread 
-               or by other criteria.  The default order is by date; see
-               <xref linkend="usage-mail-listorder"> for information about the
-               order of the message list.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-tools">
-      <title>The Mail Settings Menu</title>
-      <para>
-      <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mail Filters</guimenuitem></term>
-	    <listitem><para>
-             Edit your mail filters here.  
-             See <xref linkend="usage-mail-organize-filters">
-             for more information about mail filtering.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               with this tool. 
-              To learn about using vFolders with mail, see 
-              <xref linkend="usage-mail-organize-vfolders">.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Mail Configuration</guimenuitem></term>
-	    <listitem><para> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-   <sect2 id="menuref-mail-messagelistheader">
-      <title>The Message Heading Right-Click Menu</title>
-      <para>
-         At the top of the message list is the message list heading
-         bar; you can click on an individual heading &mdash;
-         <guilabel>Subject</guilabel>, for example, to have the
-         message list sorted by that attribute.  However, if you right
-         click on a heading, you'll get the following menu:
-      </para>
-
-      <para>
-          <variablelist>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list, in ascending order, by the attribute you clicked.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Sort Descending</guimenuitem></term>
-	      <listitem><para>
-		 Sort the list in descending order.
-	      </para></listitem>
-	    </varlistentry>
-  
-	  <varlistentry>
-	      <term><guimenuitem>Unsort</guimenuitem></term>
-	      <listitem><para>
-		 Undo any sorting by this attribute, and leave the message list sorted 
-                 by the previous one.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by this Field</guimenuitem></term>
-	      <listitem><para>
-		 Instead of sorting the messages, group them in boxes. 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Group by Box</guimenuitem></term>
-	      <listitem><para> If you have your messages grouped in
-	      boxes, you can arrange the boxes as well, by choosing
-	      this item.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Remove this column</guimenuitem></term>
-	      <listitem><para>
-		 Choose this to remove the column from the message list display.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Field Chooser</guimenuitem></term>
-	      <listitem><para>
-		 Opens a palette of columns. You can drag the columns
-		 you want from the palette into position in the
-		 message list heading bar; red arrows appear
-		 when you get close enough to a possibile position.</para>
-                 
-              <para>
-                 Your options are: 
-                 <itemizedlist>
-                     <listitem><para>
-                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>An Exclamation Point</guiicon> for priority
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
-                     </para></listitem>
-                     <listitem><para>
-                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Date</guilabel>, for the date and time a message was sent.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Received</guilabel>, for the date and time you got the message. 
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Size</guilabel>, for a message's size.
-                     </para></listitem>
-		  </itemizedlist>
-             </para>   
-
-	      </listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Alignment</guimenuitem></term>
-	      <listitem><para> Use this item to decide upon the
-	      alignment of the message attributes within their
-	      columns.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Best Fit</guimenuitem></term>
-	      <listitem><para>
-		 Alters the width of the message list columns to maximize the amount of information displayed.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Format Columns...</guimenuitem></term>
-	      <listitem><para>
-		 This item is not yet available.
-	      </para></listitem>
-	    </varlistentry>
-
-
-	  <varlistentry>
-	      <term><guimenuitem>Customize
-	      Views...</guimenuitem></term> <listitem><para> Opens a
-	      dialog box that lets you choose a complex set of
-	      arrangements for your message list, so you can combine
-	      sorting and grouping in as many ways as you like.
-	      </para></listitem>
-	    </varlistentry>
-
-          </variablelist>
-      </para>
-   </sect2>
-  </sect1>
-
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
-      <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
-      <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
deleted file mode 100644
index ddb6a0d2dd..0000000000
--- a/help/C/preface.sgml
+++ /dev/null
@@ -1,438 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.
-        <application>Evolution</application>'s goal is to make the
-        tasks of storing, organizing, and retrieving your personal
-        information easier, so you can work and communicate with
-        others.  That is, it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop. On the inside, it's a
-        powerful database; on the outside, it's a tool to help you get
-        your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>Evolution</application> is Free Software.  The
-        program and its source code are released under the terms of
-        the GNU <ulink type="help" url="gnome-help:gpl"><citetitle>General
-        Public License (GPL)</citetitle></ulink>, and the
-        documentation falls under the <ulink type="help"
-        url="gnome-help:fdl"><citetitle>Free Documentation
-        License</citetitle></ulink> (FDL). For more information about
-        the GPL and the FDL, visit the Free Software Foundation's
-        website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>This is a preview release</title>
-           <para>
-             <application>Evolution</application> is not complete, and
-             still has a lot of flaws.  Please help improve it by
-             letting us know about them.  You should do this by
-             submitting bug reports with the GNOME <application>Bug
-             Report Tool</application> (known as
-             <command>bug-buddy</command> at the command line).
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> can help you work in a
-        group by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-      </para>
-      <para>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. In other words, it needs a familiar
-             and intuitive interface that users can customize to their
-             liking, and users should have access to shortcuts for
-             complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Data must be safe: <application>Evolution</application>
-               must not lose mail, corrupt mailbox files or other
-               data, execute arbitrary <glossterm linkend="script">scripts</glossterm>,
-               or delete files from your hard disk.
-            </para>
-          </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        <application>Evolution</application> is designed to make most
-        daily tasks faster.  For example, it takes only one or two
-        clicks to enter an appointment or an address card sent to you
-        by email, or to send email to a contact or appointment.
-        <application>Evolution</application> makes displays faster and
-        more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate advanced
-        features like <link
-        linkend="usage-mail-organize-vFolders">Virtual Folders</link>,
-        which let you save searches as though they were ordinary mail
-        folders.
-      </para>
-
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>About This Book</title>
-    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
-      <para>
-        This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@ximian.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
-        url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
-      </para>
-    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
-
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this section is for you. The second section, covering
-        <link linkend="config">configuration</link>, is targeted at
-        more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
-        from reading it.  In addition, there is a comprehensive <link
-        linkend="menuref">menu reference</link> which describes nearly
-        every capability that <application>Evolution</application> has
-        to offer.
-      </para>
-      <formalpara>
-        <title>Typographical conventions</title>
-	<para>
-          Some kinds of words are marked off with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-        </para>
-      </formalpara>
-  </sect1>
-  <sect1 id="commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-        You might want to copy this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
-    </para>
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use:
-         
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>`
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-	  <varlistentry>
-	    <term>Check Mail</term>
-	    <listitem>
-	      <para>
-                Click <guibutton>Get Mail</guibutton> in the
-                toolbar. There is no keyboard shortcut for this task,
-                but you can ask <application>Evolution</application>
-                to check for new mail periodically. To do so, FIXME.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>J</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
-	    <listitem>
-	      <para>
-                You can create filters and Virtual Folders based on
-                specific message attributes from the message's
-                right-click menu.  Alternately, select a message, and
-                then choose <menuchoice> <guimenu>Settings</guimenu>
-                <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Settings</guimenu>
-                <guimenuitem>Virtual Folder Editor</guimenuitem>
-                </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and Virtual
-                Folders in <xref
-                linkend="usage-mail-organize-vfolders">.
-            </para>
-	    </listitem>
-	</varlistentry>
-	</variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-cal">
-        <title>Calendar</title>
-        <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-
-
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
deleted file mode 100644
index a2c14e99a6..0000000000
--- a/help/C/usage-calendar.sgml
+++ /dev/null
@@ -1,371 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>The Evolution Calendar</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a ruled background.  At the upper right, there's a
-    monthly calendar you can use to switch days.  Below that, there's
-    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
-    seperate from your calendar appointments.  The calendar's daily
-    view is shown in <xref linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-
-    <para>
-       The toolbar offers you four different views of your calendar:
-       one day, five days, a week, or a month at once. Press the
-       calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of
-       days&mdash; three days, ten days, a fortnight if you want
-       &mdash; in the small calendar at the upper right.
-    </para>
-    <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
-       buttons will move you forward and back in your calendar pages.
-       If you're looking at only one day, you'll see tomorrow's page,
-       or yesterday's.  If you're looking at your calendar by week,
-       month, fortnight, or anything else, you'll move around by just
-       that much. To come back to today's listing, click
-       <guibutton>Today</guibutton>.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      events, set alarms, and determine event recurrence.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
-      <para>
-	To create a new calendar event, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your event must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <note>
-       <title>Doing Two Things At Once</title>
-         <para>
-           If you create calendar events that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
-         <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your event.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like to run a program as a
-	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
-	        button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> is a little more
-         complicated, and only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and
-         implementations of this feature have yet to be
-         determined. <!-- FIXME -->
-      </para>
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        event will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        event will <emphasis>not</emphasis> recur. Make your
-        selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
-        or "Every month on the first Friday for 12 occurrences."
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event then
-	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization with a hand-held device.  You can use the list
-       in a larger format by choosing the <guibutton>Tasks</guibutton>
-       button in the shortcut bar or in the folder tree.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
-	  <listitem>
-	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of task
-       list.  To view or edit a detailed description of an item,
-       double-click on it, or select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Keelyn, the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
-      </menuchoice>.
-       You can place the calendar in any calendar folder and access it
-       from the folder view.  Alarms, configuration, and display for
-       each calendar are separate from each other.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
deleted file mode 100644
index 0c6b976e4d..0000000000
--- a/help/C/usage-contact.sgml
+++ /dev/null
@@ -1,617 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>The Evolution Address Book</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> address book can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>Evolution</application> supports the <glossterm
-      linkend="ldap">LDAP</glossterm> directory protocol, you can use
-      it with almost any type of existing directory server on your
-      network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of Evolution.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks. To
-      learn about configuring the address book, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Address Book</title>	
-    
-    <para>
-       To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the address book in all
-       its organizational glory.  By default, the address book
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-
-    <figure id="usage-contact-fig">
-      <title>Evolution Address Book</title>
-      <screenshot>
-	<screeninfo>Evolution Address Book Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-       The toolbar for the address book is quite simple:
-       <itemizedlist>
-	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar at the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is a quick search field. To use it, select
-    	   from the drop-down list which sort of search you'd like to
-    	   perform (the whole card, just the name, or just the email
-    	   address), then enter one or more words in the text entry
-    	   box, and press <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. You can refine searches by doing several in
-    	   succession, or start over by pressing the <guibutton>View
-    	   All</guibutton> button.
-	</para>
-      <para>
-	   If there are no matches, the card display will be
-	   blank. When you'd like to see all the cards again, press
-	   <guilabel>Show All</guilabel>.
-       </para>
-      <example id="contact-quicksearch-ex">
-	<title>Refining a Quick Search</title>
-	<para>
-	    Tom comes back from lunch and finds a note on his
-	    keyboard: "Curtis in sales called for you, but he didn't
-	    leave a number, and I forgot to write down the name of the
-	    company he works for. He said it was important, though."
-	    Tom is not at all annoyed.
-         </para>
-	 <para>
-	    He opens his contacts folder, and runs a quick search for
-	    "Curtis." There are eighteen different people with that name
-	    in the file. He then enters "Sales," and
-	    <application>Evolution</application> narrows it down to the
-	    right Curtis. He only becomes annoyed when he discovers that
-	    the call was not actually important.
-          </para>
-      </example>
-    
-      <para>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the
-        in-depth search window, which lets you use multiple search
-        criteria in the same way that email filters and <glossterm
-        linkend="vfolder">virtual folders</glossterm> do..  </para>
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a search within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select from
-        all the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
-  </sect1>
-  <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
-    <para>
-       To delete a card, click on it once to select it, then press the
-       <guibutton>Delete</guibutton> button.  If you have multiple
-       cards selected, you'll delete multiple cards.
-    </para>
-    <para>
-       If you want to add or change cards, you'll use the contact
-       editor.  To change a card that already exists, double click on
-       it to open the contact editor window with all the current
-       information already filled in.  If you want to create a new
-       one, clicking the <guibutton>New</guibutton> button in the
-       toolbar will open the same window, with blank entry boxes for
-       you to fill in.
-    </para>
-
-      <para>
-	The contact editor window has two tabs,
-    	<guilabel>General</guilabel>, for basic contact information,
-    	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, (see <xref
-    	linkend="menuref-contact-editor">) and a toolbar with three
-    	items: <guilabel>Save and Close</guilabel>,
-    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-      </para>
-      
-      <figure id="usage-contact-editor-fig">
-	  <title>Evolution Contact Editor</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor.png" format="png" srccredit="Aaron Weber">
-		</graphic>
-	</screenshot>
-      </figure>
-      
-      <para> The <guilabel>General</guilabel> tab has seven sections,
-         each with an icon: a face, for name and company; a telephone
-         for phone numbers; an envelope for email address; a globe for
-         web page address; a house for postal address; a file folder
-         for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Rupert T. Monkey</userinput>.  You'll
-                    notice that the <guilabel>File As</guilabel> field
-                    also fills up, but in reverse:
-                    <computeroutput>Monkey, Rupert</computeroutput>.
-                    You can pick <computeroutput>Rupert Monkey
-                    </computeroutput> from the drop-down, or type in
-                    your own, such as <userinput> T. Rupert Monkey
-                    </userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Rupert's information under "F" for
-                      "Fictitious Ximian Employee."
-                    </para>
-		  </tip>
-		</listitem>
-	      </itemizedlist>
-             </para>
-           </listitem>
-	</varlistentry>
-	<varlistentry>
-            <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                store them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is, fortunately, much more
-       simple: three sections, all of which are more or less obvious:
-       the briefcase next to the details about the contact's
-       professional life; the face next to the details about their
-       personal life; the globe next to a big blank space you can use
-       for anything and everything else you'd like to note about them.
-       If you ever wanted to have that uncanny knack for remembering
-       obscure details like the date of someone's anniversary (perhaps
-       your own) this is the way to develop it.
-     </para>
-
-
-
-
-<!--- ############# This section isn't implemented yet either:
-    <sect2>
-      <title></title>
-      <para>
-        <tip>
-	  <title>Contact Shortcuts</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-            right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change!  unimplemented!)
-          </para>
-	</tip>
-      </para>
-      <para>
-        You can move cards around just as you would move email
-        messages: dragging and dropping works, as does right-clicking
-        and choosing <guimenuitem>Move</guimenuitem> from the menu
-        that appears.
-      </para>
-    </sect2>
-############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
-    <para>
-       Organizing your address book is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow vFolders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!--
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your address book share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
-         different categories.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
-
-       <!-- FIXME: Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <para>
-       If you keep your cards on a network using an <glossterm
-       linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other address books, or maintain a shared set of
-       contact information for your company or your department.  This
-       is the sort of feature you'll want to use if your company has a
-       list of vendors and clients that needs constant updating.  If
-       share calendars as well as address books, people can avoid
-       duplicating work and keep up to date on developments within
-       their work-group or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X. 
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem>
-	  <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory and then synchronize your copy with
-              the networked version periodically.  <!-- FIXME: HOW? -->
-	  </para>
-	  </listitem>
-
-          <listitem>
-	  <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para>
-	  </listitem>
-	  <listitem>
-	  <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
-          </para>
-	  </listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Address Book Tools</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your address book's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group if you choose.
-      </para>
-
-<!-- FIXME this feature not yet implemented 
-
-      <para>
-         You can also use the address book to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
- -->
-
-    </sect2>
-<!---  FIXME this feature not yet implemented 
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-
-  </sect1>
-
-</chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
deleted file mode 100644
index 5ff67029d7..0000000000
--- a/help/C/usage-exec-summary.sgml
+++ /dev/null
@@ -1,91 +0,0 @@
-<chapter id="usage-exec-summary">
-   <title>The Executive Summary</title>
-    <para>
-       The Evolution Executive Summary is designed to show you a
-       summary of important information: the appointments for a given
-       day, important email, and so forth. To see your executive
-       summary, click on the <guibutton>Executive Summary</guibutton>
-       button in the shortcut bar, or select the
-       <guilabel>executive-summary</guilabel> folder in the folder
-       bar.
-    </para>
-
-    <sect1 id="exec-intro">
-      <title>Introducing the Executive Summary</title>
-      <para>
-        The first thing you'll want to do with the executive summary
-        is add a service. Click the <guibutton>Add Service</guibutton>
-        button in the toolbar, then select one of the available
-        services.  Services may vary depending upon your system, but
-        most installations will have at least the following options:
-
-        <variablelist>
-
-          <varlistentry>
-             <term>Calendar</term>
-             <listitem>
-               <para>
-                  Pending appointments and other events.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>Inbox</term>
-             <listitem>
-               <para>
-                 Information about your mail, such as the number of
-                 new messages you have waiting.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>To Do</term>
-             <listitem>
-               <para>
-                 A short summary of your task pad.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>RDF Summary</term>
-             <listitem>
-               <para>
-                  News headlines for any valid RDF file. The default
-                  is news about the GNOME project from <ulink
-                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
-               </para>
-             </listitem>
-           </varlistentry>
-
-        </variablelist>
-
-     </para>
-
-     <para>
-       Each service appears in a small box on the screen; you can
-       remove the service by clicking the <guibutton>x</guibutton>
-       button in the upper right, or bring up a settings dialog by
-       clicking the little wrench icon below that.
-     </para>
-   </sect1>
-   <sect1 id="exec-services-detail">
-     <title>Services in Detail</title>
-      <para>
-          This section will show you how to use several
-          <application>Evolution</application> services. 
-
-      </para>
-     
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
deleted file mode 100644
index 9ec12d9e5b..0000000000
--- a/help/C/usage-mail.sgml
+++ /dev/null
@@ -1,1539 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-mail"> 
-  <title>Evolution Mail</title>
-  <abstract>
-    <title> An Overview of the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   It can sort and organize your mail in a wide variety of ways with
-	   folders, searches, and filters.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	  It can send and receive mail in HTML or as plain text, and
-	  permits multiple file attachments.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   It supports multiple mail sources, including <glossterm
-	   linkend="imap">IMAP</glossterm>, <glossterm
-	   linkend="pop">POP3</glossterm>, local
-	   <systemitem><filename>mbox</filename></systemitem> and
-	   <systemitem><filename>mh</filename></systemitem> files, and
-	   even NNTP messages (newsgroups), which aren't technically
-	   email.
-	 </para>
-       </listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</link>, an advanced organizational feature not found in
-      other mail clients.  If you get a lot of mail, or if you keep
-      every message you get in case you need to refer to it later,
-      you'll find this feature especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
-      <para>
-	Your <application>Evolution</application>
-	<guilabel>Inbox</guilabel> will look something like the one in
-	<xref linkend="usage-mail-intro-fig">. Just below the toolbar
-	is the <interface>message list</interface>, showing message
-	header information like <guilabel>Subject</guilabel> and
-	<guilabel>Date</guilabel>.  The message itself appears below
-	that, in the <interface>view pane</interface>.  If you find
-	the <interface>view pane</interface> too small, you can resize
-	the pane, enlarge the whole window, or double-click on the
-	message in the <interface>message list</interface> to have it
-	open in a new window.  Just like with folders, you can
-	right-click on messages in the message list and get a menu of
-	possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="usage-mail-intro-fig">
-	  <title>Evolution Mail</title>
-	  <screenshot>
-	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-      <para>
-         Most of the mail-related actions you'll want to perform are
-         listed in the <guimenu>Message</guimenu> menu in the menu
-         bar.  The most frequently used ones, like
-         <guimenuitem>Reply</guimenuitem> and
-         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-         right-click menu and as keyboard shortcuts, which tend to be
-         faster once you get the hang of them.  You can choose
-         whichever way you like best; the idea is that the software
-         should work the way you want, rather than making you work the
-         way the it does.
-	 <tip id="view-headers">
-	 <title>Take a look at the headers</title>
-	 <para>
-	 To look at the entire source of your email message, including
-	 all the header information, select
-	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
-	 </para>
-	 </tip>
-       </para>
-
-      <sect3 id="usage-mail-listorder">
-	<title>Sorting the message list</title>
-	<para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list. The direction of the arrow next to the label indicates
-          the direction of the sort, and if you click again, you'll
-          sort them in reverse order. For example, click once on
-          <guilabel>Date</guilabel> to sort messages by date from
-          oldest to newest.  Click again, and
-          <application>Evolution</application> sorts the list from
-          newest to oldest. You can also right-click on the message
-          header bars to get a set of sorting options, and add or
-          remove columns from the message list.  You can find detailed
-          instructions on how to customize your message display
-          columns in <xref linkend="usage-mail-organize-columns">.
-        </para>
-	<para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  When you select this option,
-          <application>Evolution</application> groups the replies to a
-          message with the original, so you can follow the thread of a
-          conversation from one message to the next.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar. Or, right-click on a message and choose
-          <guimenuitem>Delete</guimenuitem> from the right-click
-          menu. The message will appear with a line through it, to
-          show that you've marked it for deletion.
-        </para>
-        <para>
-          If you change your mind and decide you want to keep it,
-          select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
-          really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently.
-        </para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-	Now that you've had a look around the
-	<interface>Inbox</interface>, it's time to check for new mail.
-	Click <guibutton>Get mail</guibutton> in the toolbar to check
-	your mail.  If it's the first time you've done so, the
-	<interface>mail setup assistant</interface> will ask you for
-	the information it needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). 
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        your password until until you select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Forget
-        Passwords</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-        Once it's validated the password,
-	<application>Evolution</application> will check your mail.
-	New mail will appear in the local <interface>Inbox</interface>
-	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
-	you have chosen to use IMAP, and you have multiple folders on
-	your IMAP server, you may need to subscribe to them.  To learn
-	how to use the subscription manager, read <xref
-	linkend="usage-mail-subscriptions">.
-      </para>
-   
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title> 
-     <para>
-	If you get an error message instead of mail, you probably need
-	to change your network settings.  To learn how to do that,
-	have a look at <xref linkend="config-prefs-mail-network">, or
-	ask your system administrator.
-      </para>
-    </note>
-
-      <sect3 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email that there's no reason not
-         to read them side by side.  If you want to do that, add a
-         news source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
-       </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Attachments and HTML Mail</title>
-	<para>
-	  If someone sends you an <glossterm>attachment</glossterm>, a
-	  file attached to an email,
-	  <application>Evolution</application> will display the file
-	  at the bottom of the message to which it's attached.  Text,
-	  HTML, and most images will be displayed within the message
-	  itself.  For other files,
-	  <application>Evolution</application> will show an icon at
-	  the end of the message.  Right-click on the icon to get a
-	  list of options which will vary depending on the type of
-	  attachment. You will have the option to display most files
-	  as part of the message, export them to a different
-	  application (images to Eye of GNOME, spreadsheets to
-	  Gnumeric, and so forth), or save them to disk.
-        </para>
-
-	<para>
-	   <application>Evolution</application> can also display
-	   HTML-formatted mail, complete with graphics.  HTML
-	   formatting will display automatically, although you can
-	   turn it off if you prefer.
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
-      <para>
-	 You can start writing a new email message by selecting
-	 <menuchoice> <guimenu>File</guimenu>
-	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail Message</guimenuitem></menuchoice>, or by pressing the
-	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
-	 When you do so, the <interface>New Message</interface> window
-	 will open, as shown in <xref
-	 linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-	<title>New Message Window</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
- <!-- Check the alignment of the following paragraph in the PS and
- HTML output: it's indented for no good reason -->
-      <para>
-	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 subject in the <guilabel>Subject:</guilabel> and a message in
-	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.
-       </para>
-
-      <sect3 id="usage-mail-getnsend-send-delay">
-	<title>Saving Messages for Later</title>
-	<para>
-	   Evolution will send mail immediately unless you tell it to
-	   do otherwise by selecting <menuchoice>
-	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  This will add your
-	   messages to the <guilabel>Outbox</guilabel> queue.  Then,
-	   when you press <guibutton>Send</guibutton> in another
-	   message, or <guibutton>Get Mail</guibutton> in the main
-	   mail window, all your unsent messages will go out at once.
-	   I like to use "Send Later" because it gives me a chance to
-	   change my mind about a message before it goes out.  That
-	   way, I don't send anything I'll regret the next day.
-	</para>
-	<para>
-	   To learn more about how you can specify message queue and
-	   filter behavior, see <xref linkend="config-prefs-mail">.
-	</para>
-
-	<para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
-	  </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>. 
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-	  You can probably guess the purpose of the buttons labelled
-	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton>, but there's a bit more to
-	  sending mail that's less obvious.  In the next few sections,
-	  you'll see how <application>Evolution</application> handles
-	  additional features, including large recipient lists,
-	  attachments, and forwarding.
-        </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
-	<title>Attachments</title>
-	<para>
-	    If you want to attach a file to your email message, you
-	    can drag it from your desktop into the message window, or
-	    click the button in the toolbar with a paper clip on it,
-	    labelled <guibutton>Attach</guibutton>.  If you click the
-	    <guibutton>Attach</guibutton> button,
-	    <application>Evolution</application> will open a file
-	    selection dialog box to ask you which file you want to
-	    send.  Select the file and click <guilabel>OK</guilabel>.
-        </para>
-	<para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-	<para>
-            When you send the message, a copy of the attached file
-	    will go with it.  Be aware that big attachments can take a
-	    long time to download.
-          </para>
-	</sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
-        <para>
-	    <application>Evolution</application>, like most email
-	    programs recognizes three types of addressee: primary
-	    recipients, secondary recipients, and hidden ("blind")
-	    recipients.
-         </para>
-         <para>
-	    The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the the
-            <guilabel>Cc:</guilabel> field.
-	  </para>
-	  <para>
-	    Hearkening back to the dark ages when people used
-	    typewriters and there were no copy machines, "Cc" stands
-	    for "Carbon Copy."  Use it whenever you want to share a
-	    message you've written to someone else.
-	    <example id="ex-mail-cc">
-	      <title>Using the Cc: field</title>
-	      <para>
-	         When Susan sends an email to a client, she puts her
-	         co-worker, Tim, in the in the
-	         <guilabel>Cc:</guilabel> field, so that he know
-	         what's going on.  The client can see that Tim also
-	         received the message, and knows that he can talk to
-	         Tim about the message as well.
-	      </para>
-	    </example>
-	  </para>
-	  <para>
-	    If you have a large number of recipients, or if you want
-	    to send mail to several people without sharing the
-	    recipient list, you should use
-	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and it sends messages discreetly.  In other words,
-	    the people in the <guilabel>Bcc:</guilabel> field get the
-	    message, but nobody sees that they got it.  Note that the
-	    contents of the <guilabel>To:</guilabel> and
-	    <guilabel>Cc:</guilabel> fields are visible to all
-	    recipients, even to people on the
-	    <guilabel>Bcc:</guilabel> list.
-
-	    <example id="ex-mail-bcc">
-	      <title>Using the Bcc: field</title>
-	      <para>
-	         Tim is sending an email announcement to all of his
-	         company's clients, some of whom are in competition
-	         with each other, and all of whom value their
-	         privacy. He needs to use the
-	         <guilabel>Bcc:</guilabel> field here.  If he puts
-	         every address from his address book's "Clients"
-	         category into the <guilabel>To:</guilabel> or
-	         <guilabel>Cc:</guilabel> fields, he'll make the
-	         company's <emphasis>entire</emphasis> client list
-	         public. It seems like a small difference, but it can
-	         make a huge difference in some situations.
-	     </para>
-	    </example>
-	  </para>
-	</sect4>
-
-        <sect4 id="usage-mail-getnsend-send-to">
-	<title>Choosing Recipients Quickly</title>
-	<para>
-	  If you have created address cards in the contact manager,
-	  you can also enter nicknames or other portions of address
-	  data, and <application>Evolution</application> will complete
-	  the address for you. <!-- (INSERT description of UI for this
-	  feature, once it is decided upon). --> If you enter a name
-	  or nickname that can go with more than one card, Evolution
-	  will open a dialog box to ask you which person you meant.
-	  <!-- (NOT YET) Also, <application>Evolution</application>
-	  will add a domain to any unqualified addresses.  By default,
-	  this is your domain, but you can choose which one mail
-	  preferences dialog. -->
-          </para>
-	  <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-	  <para>
-            For more information about using email together with the
-	    contact manager and the calendar, see <xref
-	    linkend="usage-contact-automate"> and <xref
-	    linkend="usage-calendar-apts">.
-	  </para>
-        </sect4>
-      </sect3>
-      
-      <sect3 id="usage-mail-getnsend-send-reply">
-	<title>Replying to Messages</title>
-	<para>
-	   To reply to a message, press the
-	   <guibutton>Reply</guibutton> button while it is selected,
-	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open the
-	   <interface>message composer</interface>.  The
-	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
-	   fields will already be filled, although you can alter them
-	   if you wish.  In addition, the full text of the old message
-	   is inserted into the new message, either in italics (for
-	   HTML display) or with the &gt; character before each line
-	   (in plain text mode), to indicate that it's part of the
-	   previous message.  People often intersperse their message
-	   with the quoted material as shown in <xref
-	   linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note that this figure should have a reply message ready to send,
-with quoted materials and the relevant replies interspersed-->
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-	 <title>Reply Message Window</title>
-	 <screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-	</para>
-
-	<para>
-	  If you're reading a message with several recipients, you may
-	   wish to use <guibutton>Reply to All</guibutton> instead of
-	   <guibutton>Reply</guibutton>.  If there are large numbers
-	   of people in the <guilabel>Cc:</guilabel> or
-	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time. 
-	  <example>
-	    <title>Using the Reply to All feature</title>
-	    <para>
-	      Susan sends an email to a client and sends copies to Tim
-	      and to an internal company mailing list of co-workers.
-	      If Tim wants to make a comment for all of them to read,
-	      he uses <guibutton>Reply to All</guibutton>, but if he
-	      just wants to tell Susan that he agrees with her, he
-	      uses <guibutton>Reply</guibutton>.  Note that his reply
-	      will not reach anyone that Susan put on her
-	      <guilabel>Bcc</guilabel> list, since that list is not
-	      shared with anyone.
-	    </para>
-	  </example>
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-	<para>
-           You're probably familiar with search and replace features,
-           and if you come from a Linux or Unix background, you
-           probably know what <guimenuitem>Find Regex</guimenuitem>
-           does.  If you aren't among the lucky who already know,
-           here's a quick rundown of an important section of the
-           <guimenu>Edit</guimenu> menu.
-        </para>
-	<para>
-           <variablelist>
-	    <varlistentry>
-	      <term><guimenuitem>Find</guimenuitem></term>
-	      <listitem><para> Enter a word or phrase, and
-	      <application>Evolution</application> will find it
-              in your message.
-	      </para></listitem>
-	    </varlistentry>
-	    
-	    <varlistentry>
-	      <term><guimenuitem>Find Regex</guimenuitem></term>
-	      <listitem>
-		<para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenuitem>Find Again</guimenuitem></term>
-	      <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	       <term><guimenuitem>Replace</guimenuitem></term>
-	       <listitem><para> 
-                 Find a word or phrase, and replace it with
-	         something else.  
-               </para></listitem>
-	    </varlistentry>
-
-	  </variablelist>
-        </para>  
-	<para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
-	<title>Embellish your email with HTML</title>
-	<para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis, or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to
-            convey their feelings.  However, most newer email programs
-            can display images and text styles as well as basic
-            alignment and paragraph formatting. They do this with
-            <glossterm linkend="html">HTML</glossterm>, just like web
-            pages do.
-        </para>
-	<note>
-	  <title>HTML Mail is not a Default Setting</title>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.  <emphasis>Some</emphasis>
-	    people refer to HTML mail as "the root of all evil" and
-	    get very angry if you send them HTML mail, which is why
-	    <application>Evolution</application> sends plain text
-	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <menuchoice>
-	    <guimenu>Format</guimenu> <guimenuitem>
-	    HTML</guimenuitem></menuchoice>.  Alternately, you can set
-	    your default mail format preferences in the mail
-	    configuration dialog.  See <xref
-	    linkend="config-prefs-mail-other"> for more information.
-          </para>
-	</note>
-	<para>
-           HTML formatting tools are located in the toolbar just above
-	   the space where you'll actually compose the message, and
-	   they also appear in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  
-	  </para>
-	  <para>
-            The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
-            you hold your mouse over the buttons.  The buttons fall
-            into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-	      <listitem>
-		<para>
-                  At the left edge of the toolbar, you can choose
-                  <guilabel>Normal</guilabel> for a default text style
-                  or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6). Other styles
-                  include <guilabel>pre</guilabel>, to use the HTML
-                  tag for preformatted blocks of text, and three types
-                  of <guilabel>List Item</guilabel> for the highly
-                  organized.
-                </para>
-	      </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-	      <listitem>
-		<para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">      
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
-                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                 </itemizedlist>
-               </para>               
-	      </listitem>    
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Alignment</term>
-	      <listitem>
-		<para>
-                   Located next to the text style buttons, these three
-                   paragraph icons should be familiar to users of most
-                   word processing software.  The leftmost button will
-                   make your text aligned to the left, the center
-                   button, centered, and the right hand button,
-                   aligned on the right side.
-                </para>
-	      </listitem>
-	      </varlistentry>
-
-	    <varlistentry>
-	      <term>Indentation rules</term>
-	      <listitem>
-		<para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	    <varlistentry>
-	      <term>Color Selection</term>
-	      <listitem>
-		<para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
-                  choose a new one, click the arrow button just to the
-                  right. If you have text selected, the color will
-                  apply to the selected text.  If you do not have text
-                  selected, the color will apply to whatever you type
-                  next.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  </variablelist>
-        </para>
-	<para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-	       <listitem>
-	        <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL). If you don't
-                  want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.
-               </para>
-	    </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-	    <listitem>
-	      <para>
-               Select this item to embed an image into your email, as
-               was done in the welcome message.  Images will appear at
-               the location of the cursor. This is different from
-               attaching them to a message, but not very different.
-              </para>
-	    </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-	</varlistentry>
-
-	  </variablelist>
-          </para>
-	  <note>
-	    <title>A Technical note on HTML Tags</title>
-	    <para>
-	      The composer is a WYSIWYG (What You See Is What You Get)
-	      editor for HTML. That means that if you enter HTML
-	      directly into the composer&mdash; say, <markup
-	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	      the composer will assume you meant exactly that string
-	      of characters, and not "make this text bold," as an HTML
-	      composition tool or text editor would.
-	    </para>
-	</note>
-      </sect3>
-   
-
-<!-- Function not implemented, 
-possibly never will be due to security evil. -->
-<!--
-	<sect3 id="usage-mail-getnsend-send-live">
-	  <title>Live Documents</title>
-	  <para>
-	    Later versions of <application>Evolution</application>
-	    will allow you to enliven your email with almost any
-	    sort of document, and even with entire
-	    applications. At this point, however, this feature has not 
-	    yet been implemented.
-	  </para>
-	</sect3>
--->
-
-      <sect3 id="usage-mail-getnsend-fwd">
-	<title>Forwarding Mail</title>      
-	<para>
-	  The post office forwards your mail for you when you change
-	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> button
-	  works in much the same way.  It's particularly useful if you
-	  have received a message and you think someone else would
-	  like to see it.  You can forward a message as an attachment
-	  to a new message (this is the default) or
-	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-	  portion of the message you are sending.  Attachment
-	  forwarding is best if you want to send the full, unaltered
-	  message on to someone else.  Inline forwarding is best if
-	  you want to send portions of a message, or if you have a
-	  large number of comments on different sections of the
-	  message you are forwarding.  Remember to note from whom the
-	  message came, and where, if at all, you have removed or
-	  altered content.
-	</para>
-	<para>
-	  To forward a message you are reading, press
-	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <menuchoice> <guimenu>Message</guimenu>
-	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-	  instead of attached, select <menuchoice>
-	  <guimenu>Message</guimenu> <guimenuitem>Forward
-	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-	  addressee as you would when sending a new message; the
-	  subject will already be entered, but you can alter it.
-	  Enter your comments on the message in the
-	  <interface>composition frame</interface>, and press
-	  <guibutton>Send</guibutton>.
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Courtesy</title>
-	<para>
-	  I started with ten, but four were "Don't send
-	  <glossterm linkend="spam">spam</glossterm>."
-	  <itemizedlist>
-
-	    <listitem>
-	      <para>
-		 Don't send spam or forward chain mail.  If you must,
-		 watch out for hoaxes and urban legends, and make sure
-		 the message doesn't have multiple layers of
-		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless in-line forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Always begin and close with a salutation. Say "please"
-		and "thank you," just like you do in real life. You
-		can keep your pleasantries short, but be pleasant!
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-		message in capital letters.  It hurts people's ears.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Never write anything in email you wouldn't say in
-		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	       Check your spelling and use complete sentences.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Don't send nasty emails (flames).  If you get one,
-		don't write back.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 When you reply or forward, include just enough of
-		 the previous message to provide context: not too
-		 much, not too little.
-	       </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-	<para> Happy mailing! </para>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-organize">
-    <title>Organizing Your Mail</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-    <sect2 id="usage-mail-organize-columns">
-      <title>Sorting Mail with Column Headers</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message (closed for unread, open for read,
-         and open with an arrow on it to indicate you've sent a
-         reply), an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  You can add
-         new ones with the <guimenuitem>Field Chooser</guimenuitem>
-         item in the right click menu for the column headings.
-      </para>
-      <para>
-         Right-click on one of the column headers to get a list of
-         options:
-             <variablelist>
-
-               <varlistentry>
-                  <term><guimenuitem>Sort Ascending</guimenuitem>,
-                  <guimenuitem>Sort Descending</guimenuitem>, and
-                  <guimenuitem>Unsort</guimenuitem></term>
-                  <listitem><para>Which should be pretty obvious. You
-                  can also set these sorts by just clicking on the
-                  column headers.</para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Group By this Field</guimenuitem></term>
-                  <listitem><para>
-                     Groups messages instead of sorting them. (FIXME: Explain further) 
-                  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Remove this
-                  Column</guimenuitem></term> <listitem><para> Remove
-                  this column from the display. You can also remove
-                  columns by dragging the header off the list and
-                  letting it drop.  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Field
-                  Chooser</guimenuitem></term> <listitem><para> A list
-                  of column headers; just drag and drop them into
-                  place between two existing headers. A red arrow will
-                  appear to show you where you're about to put the
-                  column.  </para></listitem>
-               </varlistentry>
-            </variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	moved to your folder automatically.
-      </para>
-        </sect2>    
-
-    <sect2 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains:</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains:</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
-      </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box. If you're
-         sneaky, just enter a blank search: since every message has at
-         least one space in it, you'll see every message in the
-         folder.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and virtual folders in the next few sections.
-     </para>
-
-    </sect2>
-
-    <sect2 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
-      <para>
-        I once worked in the mail room of a large company, where my
-        job was to bundle, sort, and distribute mail to the various
-        mail boxes and desks throughout the building.  Filters do that
-        same job with email, but they lose much less mail than I did.
-        In addition, you can have multiple filters performing multiple
-        actions that may effect the same message in several ways.  For
-        example, your filters could put copies of one message into
-        multiple folders, or keep a copy and send one to another
-        person as well, and it can do that in under a second. Which is
-        to say, it's faster and more flexible than an actual person
-        with a pile of envelopes.
-      </para>
-      <para>
-        Most often, you'll want to have
-        <application>Evolution</application> put mail into different
-        folders, but you can have it do almost anything you like.
-        People who get lots of mail, or who often need to refer to old
-        messages, find filters especially helpful, but they're good
-        for anybody who gets more than a few messages a day.  To
-        create a filter, open the <interface>filter
-        assistant</interface> by selecting
-	<menuchoice>
-	  <guimenu>Settings</guimenu> 
-          <guimenuitem>Mail Filters</guimenuitem>
-        </menuchoice>.
-      </para>
-            
-       <figure id="usage-mail-filters-fig-assist">
-	 <title>The Filter Assistant</title>
-	 <screenshot>
-	  <screeninfo>The Filter Assistant</screeninfo>
-	  <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-
-      <para>
-        The <interface>filter assistant</interface> window contains a
-        list of your current filters, sorted by the order in which
-        they are used.  From the drop-down box at the top of the
-        window, choose <guilabel>Incoming</guilabel> to display
-        filters for incoming mail, and <guilabel>Outgoing</guilabel>
-        for those which sort only outgoing mail.
-      </para>
-      <para>
-         The <interface>filter assistant</interface> also has a set of
-         buttons:
-        <itemizedlist>
-
-           <listitem><para>
-            <guibutton>Add</guibutton> &mdash; Create a new filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
-           </para></listitem>
-
-           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the
-            selected filter up in the list so it gets applied first.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list, so it comes into play later.
-           </para></listitem>
-        </itemizedlist>
-
-        If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>, which
-        will open a dialog to let you add a filter rule.  If you do
-        have filters, you can either add a new filter rule, or select
-        one from your list and click <guibutton>Edit</guibutton>.
-      </para>
-      <para>
-        The filter rule editor, shown in <xref
-        linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.
-
-       <figure id="usage-mail-filters-fig-new">
-	 <title>Creating a new Filter</title>
-	 <screenshot>
-	  <screeninfo>Creating a new Filter</screeninfo>
-	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-      <para>
-        Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing the criteria
-        you'd like to use as you sort your mail.  Choose how many
-        criteria you'd like by pressing <guibutton>Add
-        Criterion</guibutton> and <guibutton>Remove
-        Criterion</guibutton>.  If you have multiple criteria, you
-        should then decide whether to have the filter do its job only
-        <guilabel>if all criteria are met</guilabel>, or <guilabel>if
-        any criteria are met</guilabel>.
-     </para>
-     <para>
-        For each filter criterion, you must first select what
-        part of the message you want the filter to examine:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Sender</guilabel></term>
-	    <listitem><para>
-                The sender's address.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Recipients</guilabel></term>
-	    <listitem><para>
-               The recipients of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Subject</guilabel></term>
-	    <listitem><para>
-                The subject line of the message.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Specific Header</guilabel></term>
-	    <listitem><para>
-              The filter can look at any header you
-	      want, even obscure or custom ones. Enter the header name
-	      in the first text box, and put your search text in the
-	      second one.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Message Body</guilabel></term>
-	    <listitem><para>
-                Search in the actual text of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Expression</guilabel></term>
-	    <listitem>
-             <para>
-               Enter a <glossterm linkend="regular-expression">regular
-	       expression</glossterm>, and
-	       <application>Evolution</application> will search the
-	       entire message, including headers, to match it for you.
-	     </para>
-           </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para> Filter messages by when they were sent:
-	    First, choose the conditions you want a message to
-	    meet&mdash; <guilabel>before</guilabel> a given time,
-	    <guilabel>after</guilabel> it, and so forth.  Then, choose
-	    the time. The filter will compare the message's time-stamp
-	    to the system clock when the filter is run, or to a
-	    specific time and date you choose from a calendar.  You
-	    can even have it look for messages within a range of time
-	    relative to the filter&mdash perhaps you're looking for
-	    messages less than two days old.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Date Recieved</guilabel></term>
-	    <listitem><para>
-                This works the same way as the <guilabel>Date Sent</guilabel> 
-                option, except that it compares the time you got the message 
-                with the dates you specify.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Priority</guilabel></term>
-	    <listitem><para>
-               Emails have a standard priority range from -3 (least
-               important) to 3 (most important). You can have filters set the
-               priority of messages you recieve, and then have other filters 
-               applied only to those messages which have a certain priority.
-            </para></listitem>
-           </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Regex Match</guilabel></term>
-	    <listitem>
-              <para>
-                If you know your way around a <glossterm
-  	        linkend="regular-expression">regex</glossterm>, or
-  	        regular expression, put your knowledge to use here.
-  	       </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Source</guilabel></term>
-	    <listitem>
-               <para>
-               Filter messages according the server you got them from.
-               You can enter a URL or choose one from the drop-down
-               list.  This ability is only relevant if you use more
-               than one mail source.
-             </para>
-            </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-        <para>
-        Now, tell it what to do with those messages.  If you want more
-        actions, click <guibutton>Add Action</guibutton>; if you want
-        fewer, click <guibutton>Remove Action</guibutton>.  And choose
-        again:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guilabel>Copy to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Move to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Forward to Address</guilabel></term>
-	    <listitem><para>
-                Select this, enter an address, and the addressee will
-                get a copy of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Delete</guilabel></term>
-	    <listitem><para>
-                Marks the message for deletion.  You can still get the message
-                back, at least until you <guimenuitem>Expunge</guimenuitem> your
-                mail yourself.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para>
-              Select this if you want to tell all other filters to ignore 
-              this message, because whatever you've done with it so far
-              is plenty.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Color</guilabel></term>
-	    <listitem><para>
-                Select this item, and <application>Evolution</application>
-                will mark the message with whatever color you please.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Score</guilabel></term>
-	    <listitem><para> If you know that all mail with
-	    "important" somewhere in the message body line is
-	    important, you can give it a high priority score. In a subsequent filter you can 
-            then arrange your messages by their priority score.
-	  </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-      <para>
-        You're done.  Click <guibutton>OK</guibutton> to use this
-        filter, or <guibutton>Cancel</guibutton> to close the window
-        without saving any changes.
-      </para>
-
-
-
-   <!-- FIXME: This needs to be in there.  But the feature is temporarily
-         disabled and I don't know how it will be reimplemented.
-
-	  <itemizedlist>
-	    <listitem>
-	       <para>
-		 <guilabel>When mail arrives:</guilabel> Select
-		 this option to have messages filtered as they
-		 arrive.
-	       </para>
-	     </listitem>
-	     <listitem>
-	       <para>
-		 <guilabel>When mail is sent:</guilabel> Select
-		 this option to filter your outgoing mail.  You
-		 can use this feature to keep your
-		 <interface>Outbox</interface> as organized as
-		 your <interface>Inbox</interface>.
-	     </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-
-    -->
-
-      <note>
-	<title>Two Notable Filter Features</title>
-	<para>
-	  <itemizedlist>
-	    <listitem><para>
-              Incoming email that your filters don't move goes into the Inbox; 
-              outgoing mail that they don't move ends up in the Sent folder.
-             </para>
-	    </listitem>
-
-	    <listitem><para>If you move a folder, your filters
-	    will follow it.  </para></listitem>
-	  </itemizedlist>
-	</para>
-      </note>
-    </sect2>
-
-
-
-    <sect2 id="usage-mail-organize-vFolders">
-      <title>Getting Really Organized with Virtual Folders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A virtual folder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a virtual folder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and remove them from the
-	virtual folder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any virtual folders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  Virtual folders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-      <example id="usage-mail-organize-vFolders-ex">
-	<title>Using Folders, Searches, and Virtual Folders</title>
-	<para>
-	   To organize my mail box, I set up a virtual folder for
-	   emails from my friend and co-worker Anna.  I have another
-	   one for messages that have "ximian.com" in the address and
-	   "Evolution" in the subject line, so I can keep a record of
-	   what people from work send me about
-	   <application>Evolution</application>.  If Anna sends me a
-	   message about anything other than Evolution, it only shows
-	   up in the "Anna" folder. When Anna sends me mail about the
-	   user interface for <application>Evolution</application>, I
-	   can see that message both in the "Anna" virtual folder and
-	   in the "Internal Evolution Discussion" virtual folder.
-	</para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
-
-      <para>
-	 To create a virtual folder, select <menuchoice>
-	 <guimenu>Settings</guimenu> <guimenuitem>Virtual Folder
-	 Editor</guimenuitem> </menuchoice>.  This will bring up a
-	 dialog box that looks suspiciously like the filter window
-	 (for more information on filters, see <xref
-	 linkend="usage-mail-organize-filters">), and which
-	 presents you with a list of virtual folders you have previously
-	 created. If you have created any virtual folders, they are listed
-	 here, and you can select, edit or remove them if you wish.
-	 If you have not created any, there will be only one available
-	 option: click <guibutton>Add</guibutton> to add a new
-	 Virtual Folder.
-      </para>
-      <para>
-	 You can enter a name for your virtual folder in the
-	 <guilabel>Name</guilabel>.  Then, tell
-	 <application>Evolution</application> what messages to look
-	 for.  This process is exactly like filter creation: decide
-	 between <guilabel>Match all parts</guilabel> and
-	 <guilabel>Match any part</guilabel>, then choose what part of
-	 the message to look in, what sort of matching to perform, and
-	 specify exactly what it is that you want to find, be it a
-	 line of text, a score, a regular expression, or a particular date or
-	 range of dates.
-       </para>
-       <para>
-         The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>Virtual Folder Sources
-         </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the
-         contents of your vFolder.  Click <guibutton>Add</guibutton>
-         to add a folder, or <guibutton>Remove</guibutton> to remove
-         one.  That way, you can have your vFolder search in
-         newsgroups, or just in one of your mailboxes, or just in a
-         select few folders you've already screened with filters.
-       </para>
-       <para>
-        The vFolder creation window is shown in <xref
-	linkend="usage-mail-vfolder-fig-createrule">
-
-       <figure id="usage-mail-vfolder-fig-createrule">
-	 <title>Selecting a vFolder Rule</title>
-	 <screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-    <sect2 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-      </para>
-
-    </sect2>
-  </sect1>
-</chapter>
-
-
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
deleted file mode 100644
index bbcb2b5a39..0000000000
--- a/help/C/usage-mainwindow.sgml
+++ /dev/null
@@ -1,453 +0,0 @@
-<!--
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>The Main Window: Evolution Basics</title>
-  <para>
-     Start <application>Evolution</application> by selecting
-     <menuchoice><guimenu>Main Panel Menu</guimenu>
-     <guisubmenu>Applications</guisubmenu>
-     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing
-     <command>evolution</command> at the command line.  The first time
-     you run the program, it will create a directory called
-     <filename>evolution</filename> in your home directory, where it
-     will keep all your <application>Evolution</application>-related
-     files.
-   </para>
-   <para>
-     After <application>Evolution</application> starts
-     up, you will see the <interface>main window</interface>, with the
-     <interface>Inbox</interface> open.  It should look a lot like the
-     picture in <xref linkend="usage-mainwindow-fig">. On the left of
-     the <interface>main window</interface> is the <interface>shortcut
-     bar</interface>, with several buttons in it.  Just underneath the
-     title bar is a series of menus in the <interface>menu
-     bar</interface>, and below that, the <interface>tool
-     bar</interface> with buttons for different functions. The largest
-     part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, where messages are listed
-     and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Ximian.
-
-
-<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
-</para>
-
-   <para>
-    <note>
-      <title>The Way Evolution Looks</title>
-      <para>
-	The appearance of both <application>Evolution</application>
-	and <application>GNOME</application> is very easy to
-	customize, so your screen might not look like this picture.
-	You might decide to have <application>Evolution</application>
-	start with the calendar and a folder bar, or with the contact
-	manager occupying the entire window.
-      </para>
-    </note>
-  </para>
-  
-  <sect1 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       The shortcut group buttons are <guibutton>Evolution
-       Shortcuts</guibutton> and <guibutton>Internet
-       Directories</guibutton>.  When you click on them, they'll slide
-       up and down to give you access to different sorts of shortcuts.
-       When you first start <application>Evolution</application>, you
-       are looking at the <guilabel>Evolution Shortcuts</guilabel>
-       category.  If you click <guilabel>Internet
-       Directories</guilabel>, it will slide up and you'll see buttons
-       for the <guilabel>Bigfoot</guilabel> and
-       <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator may have added. You can
-       add more groups by right-clicking on the background of the
-       shortcut bar and selecting <guimenuitem>Menu
-       Group</guimenuitem>.  Internet directories behave a lot like
-       the local contact manager, which is covered in <xref
-       linkend="usage-contact">.
-       </para>
-    <para>
-       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
-       again.  The shortcut buttons in that category are:
-
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-
-
-	<varlistentry>
-	  <term> <guibutton>Executive Summary:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Start your day here.  The Executive summary gives you
-              lists of new or important messages, daily appointments
-              and urgent tasks.  You can customize its appearance and
-              content, and use it to access Evolution services.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-
-	<varlistentry>
-	  <term> <guibutton>Inbox:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks:</guibutton></term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate the main window. Press 
-            <keycombo action="simul">
-                 <keycap>Ctrl</keycap> 
-                 <keycap>O</keycap> 
-             </keycombo>
-      to choose from a list of folders you'd like to visit, or use the
-      drop-down folder bar.  You can hide and show the folder bar and
-      the shortcut bar by selecting those items in the
-      <guimenu>View</guimenu> menu.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>.
-      </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three or four
-      folders at the base.  First is the <guilabel>Local</guilabel>
-      folder, which holds all the <application>Evolution</application>
-      data that's stored on your computer.  After that come
-      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders">, followed by any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you may
-      have available to you over your network.  Lastly, there are
-      <guilabel>External Directories</guilabel>, <glossterm
-      linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network.
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, which is used to store
-	    messages you don't want, but keep around just in case you
-	    change your mind.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
-         to move about the folder tree.
-       </para>
-     </tip>
-
-    <para>
-       To create a new folder, select <menuchoice>
-       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
-       put it, and what kind of folder it should be.  You can choose
-       from three types: <guilabel>Mail</guilabel>, for storing mail,
-       <guilabel>Calendar</guilabel> for storing calendars, and
-       <guilabel>Contacts</guilabel> for storing contacts.
-    </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-      </itemizedlist>.
-    </para>
-
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 will support context-sensitive help, which means you
-	can almost always get help on an item by right-clicking it.
-	If you're not sure what something is, or don't know what you
-	can do with it, choosing <guimenuitem>Help</guimenuitem> from
-	the right-click menu is a good way to find out.
-      </para>
-    </tip>
-
-    <para>
-      Any time new information arrives in a folder, that folder label
-      is displayed in bold text.
-    </para>
-    <para>
-      To delete a folder, right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
-      To change the order of folders, or put one inside another, use
-      drag-and-drop.  To move individual
-      messages, appointments, and address cards between folders, you
-      can do the same thing: drag them where you want them, and
-      they'll go.
-    </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu> Menu</term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu> Menu </term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu> Menu </term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Settings</guimenu> Menu </term>
-          <listitem><para> Tools for configuring, changing, and
-          setting up go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration. </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu> Menu</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-   <para>
-     Other menus, like <guilabel>Folder</guilabel>,
-     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
-     appear only occasionally.  <guilabel>Message</guilabel> and
-     <guilabel>Folder</guilabel>, for example, have commands that only
-     relate to email, so they're only available when you're looking at
-     email.
-   </para>
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with your email inbox, since you've got a letter waiting
-      for you already.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/help/C/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
deleted file mode 100644
index cc1ac16357..0000000000
--- a/help/C/usage-print.sgml
+++ /dev/null
@@ -1,105 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  This is a very short chapter, because printing with
-  <application>Evolution</application> is not a complex task.  Like
-  most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
-      or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the things
-      look, click <guibutton>Print</guibutton> to send your document
-      on its way.  If you'd like to change it, just close the
-      <guilabel>Print Preview</guilabel> window and make the changes
-      you want from the Mail, Calendar, or Contact Manager.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; at this time, only <guilabel>Generic
-       Postscript</guilabel> is available&mdash; and whether to print
-       to a file or to an actual printer.  If you choose a printer,
-       you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
deleted file mode 100644
index a6b53e9526..0000000000
--- a/help/C/usage-sync.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Synchronizing with a Hand-held Device</title>
-      <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device on its cradle and press the
-          HotSync button.
-        </para>
-        <para>
-         No, really.  That's all there is to it.
-        </para>
-       </sect1>
-    </chapter>
\ No newline at end of file
diff --git a/help/COPYING-DOCS b/help/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/help/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/help/Camel-Classes b/help/Camel-Classes
deleted file mode 100644
index 93aec087dd..0000000000
--- a/help/Camel-Classes
+++ /dev/null
@@ -1,35 +0,0 @@
-CamelException
-CamelProvider
-CamelThreadProxy
-CamelURL
-GtkObject
- + CamelObject
-   + CamelAddress
-   |  + CamelInternetAddress
-   |  ` CamelNewsAddress
-   + CamelDataWrapper
-   | + CamelMedium
-   | |  ` CamelMimePart
-   | |     ` CamelMimeMessage
-   | ` CamelMultipart
-   + CamelFolder
-   |  ` CamelFolderPtProxy
-   + CamelFolderSearch
-   + CamelFolderSummary
-   + CamelMimeFilter
-   |  + CamelMimeFilterBasic
-   |  + CamelMimeFilterCharset
-   |  + CamelMimeFilterIndex
-   |  ` CamelMimeFilterSave
-   + CamelService
-   |  + CamelStore
-   |  ` CamelTransport
-   + CamelSession
-   + CamelStream
-   |  + CamelSeekableStream
-   |  |  + CamelSeekableSubstream
-   |  |  + CamelStreamFs
-   |  |  ` CamelStreamMem
-   |  + CamelStreamBuffer
-   |  ` CamelStreamFilter
-   ` CamelThreadProxy
\ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
deleted file mode 100644
index 407bbbdde6..0000000000
--- a/help/ChangeLog
+++ /dev/null
@@ -1,694 +0,0 @@
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: IMAP subscriptions stuff. 
-
-2001-02-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
-
-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for Nautilus Readiness.
-
-	* C/apx-gloss.sgml: glossterm conduit.
-
-	* C/config-sync.sgml: Glossterm conduit.
-
-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other truthfulness.
-
-2001-02-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
-	several individual files.
-
-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-2001-02-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and clear.
-
-	* C/usage-calendar.sgml: Minor Changes.
-
-2001-02-08  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Minor Changes.
-
-	* C/usage-mail.sgml: Minor Changes.
-
-2001-02-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
-
-	* C/usage-exec-summary.sgml: A little functionality described.
-
-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
-
-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
-
-2001-02-06 Aaron Weber <aaron@ximian.com>
-
-	* C/usage-contact.sgml: s/contact manager/address book/ and
-	revised text.
-
-	* C/usage-exec-summary.sgml: New file. Describes Executive Summary.
-	
-2001-01-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
-	functions in the Sort section.
-
-	* C/apx-gloss.sgml: added "ToolTip"
-
-2001-01-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
-
-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
-	comments.
-
-	* C/evolution-guide.sgml: s/Helix Code/Ximian/
-
-2000-12-13  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
-	filter dialogs... which still need some renaming, IMHO.
-
-	* C/usage-mainwindow.sgml: Revisions as suggested by
-	Dan. Especially to the Folder Limits thing, which still upsets me
-	somehow.
-
-	* C/preface.sgml: Revisions as suggested by Dan. 
-
-2000-11-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-setupassist.sgml: added some <glossterms>, added linkends to existing glossterms.
-
-2000-11-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Changed intro to Config section. Now
-	defines what, exactly, "configurable" means.
-
-	* C/usage-print.sgml: Stylistic revisions.
-
-	* C/usage-calendar.sgml: Stylistic revisions.
-
-	* C/usage-contact.sgml: Stylistic revisions.
-
-2000-11-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Message heading Right-Click Menu.
-
-2000-11-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to Sasha.
-
-2000-11-02  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Style and spelling.
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.	
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml:  Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml:  Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
-	bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-        description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml:  Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.	
-
-	* C/config-prefs.sgml: Revision to reflect current options labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-=======
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
->>>>>>> 1.26
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.	
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
-	but marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release. 
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/help/Design b/help/Design
deleted file mode 100644
index 7b7cf6f821..0000000000
--- a/help/Design
+++ /dev/null
@@ -1,201 +0,0 @@
-
-The Evolution Project specification
-Miguel de Icaza.
-
-
-* Introduction
-
-	Evolution is a project aiming at providing the free software
-	community with a professional, high-quality tool for managing
-	mail, appointments, tasks and other personal information
-	tools.  
-
-	We want to make Evolution a system that addresses our needs
-	(the free software development community) and we believe that
-	by addressing our needs, we will provide a system that will
-	scale in the years to come for other users that are just
-	starting to use computers and the internet.
-
-	The main objectives of Evolution are to provide these powerful
-	features, and to make the user interface as pretty and
-	polished as possible.
-
-	Evolution is a GNOME application and a number of auxiliary
-	CORBA servers that act as the storage backends. 
-
-	Evolution will copy the best user interface bits and the best
-	ideas and features found on contemporary groupware systems.
-
-* Evolution internals.
-
-	Evolution can store its information locally (files for mail,
-	calendar and address book) or on a remote server (imap/pop,
-	cap, ldap).  
-
-	Given the importance of syncing in this modern PDA world,
-	the Evolution GUI acts as a client to the data repository.
-	The data repository is a GUI-less CORBA server called Wombat.
-
-	Wombat provides a unified access system to the calendar and
-	addressbook data (doing mail is a bit hard, so we are leaving
-	this as a TODO item for now).
-
-	Wombat's CORBA interfaces are notifier-based.  This means that
-	CORBA requests sent to Wombat do not return values
-	inmediately, but rather than for Wombat requests the user has
-	to provide a CORBA object that will be notified of what
-	happened.
-
-	Yes, that sounds hairy.  It is actually pretty simple.  It
-	basically means that you submit requests to Wombat, and a
-	callback is invoked in your code when the request has been
-	carried away. 
-
-	This enables a Palm to sync to the repository without having
-	the GUI for Evolution running.  It also means that volunteers
-	will be able to write text-based and web-based versions of
-	Evolution (not me though :-).
-
-* Evolution as a platform
-
-	Evolution is more than a client for managing the above
-	information: Evolution is a platform for building groupware
-	applications that use the above components to get their work done.
-
-	To achieve this Evolution is designed to be scriptable, and it
-	exports its internals trough CORBA/Bonobo.  It is implemented
-	as a collection of Bonobo containers and Bonobo components.
-
-	There is a clean separation between the views (the user
-	interface) and the model (the view).  The views that we are
-	writing are GNOME based, and they talk to the Wombat CORBA
-	server.
-
-	Wombat takes care of notifications to the various clients for
-	the data. 
-
-* The overall organization
-
-	A bar similar to outlook provides shortcuts for accessing the
-	various resources managed by Evolution: mail folders,
-	contacts, tasks, journal entries, notes, messages and other
-	user-defined destinations. 
-
-* User interface widgets
-
-** The ETable package
-
-	This package provides a way of displaying and editing tables.
-
-	Tables are displayed based on a TableColumn definition that
-	defines the layout used for the display.  Table Columns can be
-	nested, and the package does grouping of information displayed
-	according to the criteria defined there.
-
-	This is used in multiple places troughout evolution: it is
-	used for the Mail summary display, for the TODO display and
-	TODO new data entry and for the address book.
-
-	Nesting in the address book can be performed on various
-	fields.  For example, a first level of nesting could be
-	"Company" and a second level would be "Country" the result is
-	a 2-level tree that can be collapsed expanded and contains the
-	information sorted/grouped by those two criteria.
-
-	The user interface for this will be copied from Outlook: the
-	possibility of adding and removing fields with drag and drop
-	as well as grouping using drag and drop.
-
-* The Mail system
-
-** The Mail sources
-
-	The mail system will support 4 sources of mail:
-
-		POP3 (transfer to a local file).
-		IMAP
-		Local mbox format in $MAIL.
-		Local mbox format that have other delivery points.
-
-	On top of that, it will be possible to browse existing mbox
-	archives (and possibly other formats in the future, like
-	Mailbox and Maildir).
-
-** Storing the mail
-
-	Mail that gets incorporated into the system is stored in mbox
-	format, and summary files are provided for quick access to the
-	files.  No modifications to the file on disk is performed (I
-	am not quite sure about this, perhaps we want to add the
-	status flags and some method for adding metadata to the mail).
-
-	Summary files are rebuilt on demand or rebuild if the mbox
-	file and the summary file have got out of sync.
-
-	A Metadata system that will enable us to attach information to
-	a message will have to be designed and implemented (enabling
-	users to add annotations to mails, and special keywords and
-	flags in a per-message fashion).
-
-** Folders
-
-	Michael Zucchi is working on a system that will let users
-	easily define rules for splitting their incoming mail into
-	physical folders.  
-
-	A further refinement to Folders are Virtual Folders.  This
-	basically provides a powerful search and viewing facility for
-	mail.  It works like this: when a mail is "incorporated" into
-	Evolution it is scanned and indexed.
-
-	Then users can enter queries into Evolution that will search
-	the entire database of messages.	
-
-** Virtual folders
-
-	Virtual folders will enable users to read/browse their mail in
-	new ways: by specifying search criterias, these folders will
-	contain messages that match the criteria given.  
-
-	There is more information about this in the libcamel
-	directory. 
-
-	We will index all headers from a message, and possible the
-	contents of messages and keep those on a separate file, to
-	enable users to query their mail database.
-
-** Mail summary display
-
-	The summary will be displayed using the ETable package, to
-	enable users to add a number of sorting criteria and various
-	display methods for the summary view.
-
-	The Outlook methods for displaying will be present on the
-	system.
-
-	Message threading will be supported in Evolution.
-
-** Message display engine
-
-	We are going to be using a combination of
-	libcamel/limime/libjamie to parse messages and render them
-	into an HTML buffer.
-
-* The HTML engine
-
-	The GtkHTML engine will be used to display messages, and will
-	be extended to support a number of features that we require:
-	internal handling of characters will be based on Unicode
-
-* The message composer
-
-	Regular features found in composers will be added: connecting
-	the composer to the address book, support for drag and drop
-	for including attachments, editing the message, archiving
-	drafts and archiving messages sent.
-
-	Ettore has been working on adding editing support to the
-	GtkHTML and he is working currently on a Bonobo component that
-	will provide a ready-to-use Bonobo control for embedding into
-	other applications.
-
diff --git a/help/Keybindings b/help/Keybindings
deleted file mode 100644
index f232802110..0000000000
--- a/help/Keybindings
+++ /dev/null
@@ -1,13 +0,0 @@
-* Keybindings for the mailer
-
-	Delete key: 	Deletes message, moves forward.
-	
-* Keybindings for the composer
-
-	Control-s:		Saves message to file.
-	Control-w:		Closes composer window.
-	Control-Return: 	Sends message now.
-
-	F6:			Opens find dialog.
-	F7:			Opens replace dialog.
-
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 7b5420fee8..0000000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = C devel
diff --git a/help/NAMESPACE b/help/NAMESPACE
deleted file mode 100644
index 4ca7c454d1..0000000000
--- a/help/NAMESPACE
+++ /dev/null
@@ -1,65 +0,0 @@
-
-	Here is how both the Evolution implementation and IDL namespacing
-is to be organized, NB. for implementations and oafinfo filenames we replace
-'/' with '_'
-
-Files:
-
-/GNOME/Evolution/
-
-	Addressbook/
-	Calendar/
-		Control
-		gnomecal
-	Composer/
-	Mail/
-	Notes/		
-	Shell/
-	Summary/
-		test
-		rdf
-	Wombat/
-
-Components:
-
-	Shell components end in _ShellComponent, controls in _Control,
-executive summary components in _ExecutiveSummaryComponent and
-factories append 'Factory'.
-
-GNOME/
-	Evolution/
-
-		Shell
-
-		Addressbook/
-			MiniCard/
-				Control, ControlFactory
-			SelectNames, SelectNamesFactory
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-		Calendar/		
-			iTip/
-				Control, ControlFactory
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory
-		Mail/
-			Control, ControlFactory
-			ShellComponent, ShellComponentFactory
-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory
-			Composer, ComposerFactory
-		Notes/
-			control, controlFactory
-			shellComponent, shellComponentFactory
-		Summary/
-			rdf/
-				SummaryComponent, SummaryComponentFactory
-			test/
-				Component, ComponentFactory
-
-			ShellComponent, ShellComponentFactory
-
-		Wombat/
-			ServerFactory
-			CalendarFactory
-
diff --git a/help/devel/.cvsignore b/help/devel/.cvsignore
deleted file mode 100644
index c24a54fbcc..0000000000
--- a/help/devel/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-html
-evolution-devel-guide.html
diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog
deleted file mode 100644
index d00a1df434..0000000000
--- a/help/devel/ChangeLog
+++ /dev/null
@@ -1,159 +0,0 @@
-2001-01-26  John R. Sheets  <dusk@ravendusk.org>
-
-	* importer/Makefile.am: Change (nonexistant) importer.sgml
-	references to evolution-importer.sgml to fix dependency problem.
-
-2001-01-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am (local_entities): Added the importer stuff.
-
-	* evolution-devel-guide.sgml: Added entities for the importer documents.
-
-	* reference.sgml: Added the public and private APIs for the importer.
-
-	* importer/*: New directory containing all the documenation for the
-	importer.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-devel-guide.sgml: Ximianified.
-
-	* calendar/evolution-calendar.sgml: Ditto.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-2001-01-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Make it work when gtk-doc is not installed.
-
-	* calendar/cal-client/Makefile.am: Likewise.
-
-	* calendar/cal-util/Makefile.am: Likewise.
-
-2000-12-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	Added proper dependency lists to the gtk-doc mess.
-
-	* calendar/cal-client/Makefile.am (TARGET_DIR): Removed unused
-	variable.
-	(SOURCE_FILES): New variable with the list of source files we
-	depend on.
-	(IGNORED_SOURCE_HEADERS): New variable with the headers we ignore
-	for the gtkdoc-scan phase.
-	(scan_generated):
-	(tmpl_dependencies):
-	(tmpl_sources):
-	(tmpl_generated);
-	(sgml_dependencies):
-	(sgml_generated): Lists of stuff that is generated and that other
-	stuff depends on.
-	(all): Added the $(sgml_generated) as the final target.
-	(install-data-local): Added an installation hook; gtk-doc seems to
-	want some of its generated files to be installed.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.
-
-	* calendar/cal-util/Makefile.am: Made the same changes as for
-	calendar/cal-client/Makefile.am.
-
-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.
-
-	* Makefile.am (local_entities): Added alarm-generation.sgml.
-	(all): Made the main target be the html/index.html.
-
-2000-12-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/alarm-generation.sgml: New file with a description of
-	the algorithm used to generate alarm instances.
-
-	* evolution-devel-guide.sgml: Added an entity for the above
-	chapter.
-
-	* calendar/evolution-calendar.sgml: Reference the entity here.
-
-	* calendar/Makefile.am (EXTRA_DIST): Added alarm-generation.sgml.
-
-2000-12-13  Larry Ewing  <lewing@helixcode.com>
-
-	* calendar/Makefile.am (EXTRA_DIST): make it public-reference.sgml
-	not referenc.sgml here.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/architecture.sgml: Finished the calendar architecture
-	chapter.
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Added an id for the API reference <part>.
-	Added the FDL <legalnotice>.
-	Added the preface and toplevel reference entities.
-	Added entities for Evolution, Wombat, and Camel.
-	Added an appendix for the GNU FDL.
-	
-	* preface.sgml: New file with the introduction to the Evolution
-	Developer's Guide.
-
-	* reference.sgml: Split the toplevel reference part into its own
-	file.
-
-	* fdl.sgml: Added the GNU Free Documentation License.
-
-	* calendar/evolution-calendar.sgml: Added an id for the <part>.
-
-	* calendar/public-reference.sgml: Added an id for the <reference>.
-	Moved this file over from calendar/reference.sgml.
-
-	* Makefile.am (local_entities): Added a list of the SGML files
-	that define entities for inclusion in the toplevel document.  This
-	way we can track documentation file dependencies down to all
-	levels.
-	(html/index.html): Made the toplevel document depend on
-	$(local_entities).  Also, removed the "html" target and put its
-	contents directly here; this way we avoid having .PHONY targets.
-	(EXTRA_DIST): Removed the evolution_devel_guideDATA; it made no
-	sense.
-	(content_files): Added preface.sgml and reference.sgml.
-
-2000-09-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Made the toplevel <book> id be
-	"index".
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-util/*: Integrated the cal-util library into the
-	documentation framework.
-
-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.
-
-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.
-	Added entity for libical.
-
-	* calendar/reference.sgml: Added the cal-util reference entries.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated
-	for new API.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (maintainer-clean-local): Don't depend
-	on 'clean'; this messes up maintainer-clean.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.
-
-	* evolution-devel-guide.sgml: New <book> toplevel for the
-	Evolution Developer's Guide.
-
-	* calendar/evolution-calendar.sgml: New <part> for the calendar
-	developer's documentation.
-
-	* calendar/architecture.sgml: New <chapter> for the calendar
-	architecture.
-
-	* calendar/reference.sgml: New <reference> for the calendar API
-	reference.
diff --git a/help/devel/Makefile.am b/help/devel/Makefile.am
deleted file mode 100644
index c5ee7a8e50..0000000000
--- a/help/devel/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-SUBDIRS = calendar importer executive-summary
-
-# The name of the module.
-DOC_MODULE=evolution-devel-guide
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-# Add your toplevel files here
-
-content_files =				\
-	evolution-devel-guide.sgml	\
-	fdl.sgml			\
-	preface.sgml			\
-	reference.sgml
-
-# Add your module's hand-written and auto-generated files here; these
-# are used for dependency tracking.
-
-local_entities =					\
-	calendar/alarm-generation.sgml			\
-	calendar/architecture.sgml			\
-	calendar/evolution-calendar.sgml		\
-	calendar/public-reference.sgml			\
-							\
-	calendar/cal-client/sgml/cal-client.sgml	\
-							\
-	calendar/cal-util/sgml/cal-component.sgml	\
-	calendar/cal-util/sgml/cal-recur.sgml		\
-	calendar/cal-util/sgml/cal-util.sgml		\
-	calendar/cal-util/sgml/timeutil.sgml		\
-							\
-	importer/sgml/evolution-importer.sgml		\
-	importer/sgml/evolution-importer-client.sgml	\
-							\
-	executive-summary/sgml/executive-summary-component.sgml	\
-	executive-summary/sgml/executive-summary-component-factory.sgml	\
-	executive-summary/sgml/executive-summary-component-factory-client.sgml	\
-	executive-summary/sgml/executive-summary-html-view.sgml
-
-EXTRA_DIST =			\
-	$(content_files)
-
-all: html/index.html
-
-if ENABLE_GTK_DOC
-html/index.html: $(content_files) $(local_entities)
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
-	-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-else
-html/index.html:
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local:
-	cd $(srcdir) && rm -rf html
-
-if ENABLE_GTK_DOC
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-endif
-
-dist-hook:
-	mkdir $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
diff --git a/help/devel/calendar/.cvsignore b/help/devel/calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/devel/calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/Makefile.am b/help/devel/calendar/Makefile.am
deleted file mode 100644
index 207672f303..0000000000
--- a/help/devel/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = cal-client cal-util
-
-EXTRA_DIST =				\
-	alarm-generation.sgml		\
-	architecture.sgml		\
-	evolution-calendar.sgml		\
-	public-reference.sgml
diff --git a/help/devel/calendar/alarm-generation.sgml b/help/devel/calendar/alarm-generation.sgml
deleted file mode 100644
index 77d35258da..0000000000
--- a/help/devel/calendar/alarm-generation.sgml
+++ /dev/null
@@ -1,139 +0,0 @@
-  <chapter id="calendar-alarm-generation">
-    <title>How the Wombat generates alarm instances</title>
-
-    <para>
-      This chapter describes the algorithm that the &Wombat; uses
-      internally to generate instances of a calendar component's
-      alarms.  You do not need to read this chapter if you are simply
-      using the client-side functions.
-    </para>
-
-    <sect1 id="what-makes-up-an-alarm-trigger">
-      <title>What makes up an alarm trigger</title>
-
-      <para>
-	VTODO and VEVENT calendar components can have any number of
-	alarms defined for them.  Each alarm has a trigger
-	specification, an alarm type (display, audio, email, or
-	procedure), and data corresponding to the alarm type.  The
-	Wombat side of things is interested only in the trigger
-	specification, since this is all that the Wombat needs to
-	produce alarm instances.
-      </para>
-
-      <para>
-	An alarm trigger can be relative or absolute.  Relative
-	triggers occur a certain time before or after the start or end
-	of a calendar component's occurrence.  For example, you could
-	configure a trigger to notify you 15 minutes before an
-	appointment starts, so that you can get to its location on
-	time; or another one to notify you 5 minutes after another
-	person's meeting has ended, so that you can call that person
-	on the phone after the meeting and not disturb him while
-	there.  Absolute triggers occur at a specific point in time;
-	you can configure an alarm to trigger exactly at a particular
-	date and time that has no relation to the component's
-	occurrences at all.
-      </para>
-    </sect1>
-
-    <sect1 id="generating-trigger-instances">
-      <title>Generating trigger instances</title>
-
-      <para>
-	Generating absolute triggers is trivial; you just use the date
-	and time they specify.  However, relative triggers are
-	associated to recurrence instances, so in order to generate
-	trigger instances we must generate the corresponding
-	recurrence instances and compute the trigger times based on
-	those.
-      </para>
-
-      <para>
-	Since relative triggers are specified as occurring a certain
-	amount of time before or after each of a calendar component's
-	recurrence instances, we can compute a trigger time by adding
-	or subtracting that amount of time to the corresponding
-	recurrence instance's time.
-      </para>
-
-      <para>
-	Recurrence instances are generated by specifying a range of
-	time and asking the Wombat to generate the instances that
-	occur within that range.  We shall see that the range of time
-	in which instances occur is not necessarily the same range of
-	time in which those instances' alarm triggers occur.
-      </para>
-
-      <para>
-	Consider an alarm that is set to trigger 10 minutes before the
-	start time of an event's occurrence, that is, the trigger has
-	an offset of -10 minutes.  Say this event recurs every hour at
-	5 minutes past the hour:  it would occur at 1:05, 2:05, 3:05,
-	etc.; the corresponding triggers would occur at 12:55, 1:55,
-	2:55, etc.  If we wish to compute the alarm triggers that
-	occur between 4:00 and 6:00 (which would be at 4:55 and 5:55),
-	then we cannot just generate recurrence instances between 4:00
-	and 6:00 because we will miss the 6:05 occurrence which
-	corresponds to the 5:55 trigger.
-      </para>
-
-      <para>
-	The solution is to expand the range of time on both sides to
-	fit the relative triggers that have the largest time periods.
-	If a trigger's offset is negative, like the -10 minutes in the
-	example above, then we must expand the
-	<emphasis>end</emphasis> of the time range: in the case above,
-	the range's ending time of 6:00 must be grown by 10 minutes to
-	6:10 so that the last recurrence instance will be that of
-	6:05; computing the trigger's offset we will get the 5:55
-	trigger, which is what we wanted.  For triggers with positive
-	offsets, like if an alarm were to trigger 20 minutes after an
-	event's occurrence, we must expand the
-	<emphasis>start</emphasis> of the time range in an analogous
-	way, by subtracting the time offset from it.
-      </para>
-
-      <para>
-	Again, absolute triggers need no special computation.  We can
-	just see if the trigger time is within the requested range of
-	time, and if so, we take that trigger occurrence into account
-	for the final result.
-      </para>
-    </sect1>
-
-    <sect1 id="alarm-trigger-generation-code">
-      <title>Alarm trigger generation code</title>
-
-      <para>
-	The main function to generate alarm trigger instances is
-	<function>generate_alarms_for_comp()</function> in
-	<filename>evolution/calendar/pcs/cal-backend-file.c</filename>.
-	This function calls <function>compute_alarm_range()</function>
-	to expand the specified range of time in the way described in
-	the previous section.  It then generates the instances for
-	relative alarm triggers inside the
-	<function>add_alarm_occurrences_cb()</function> callback,
-	which is used by
-	<function>cal_recur_generate_instances()</function> with the
-	expanded range of time.  The callback goes through all of the
-	calendar component's relative alarm triggers and adds the
-	trigger offsets to the occurrence's time; the results are
-	added as <structname>CalAlarmInstance</structname> structures
-	to the final list of trigger instances.  Finally,
-	<function>generate_alarms_for_comp()</function> calls
-	<function>generate_absolute_triggers()</function>, which
-	simply adds the instances for absolute alarm triggers; these
-	are the absolute times that are within the time range that was
-	requested originally.  In the very end, the list of instances
-	is sorted to produce nicer results.
-      </para>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/calendar/architecture.sgml b/help/devel/calendar/architecture.sgml
deleted file mode 100644
index d261f0a7f4..0000000000
--- a/help/devel/calendar/architecture.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-  <chapter id="calendar-architecture">
-    <title>Architecture of the Calendar</title>
-
-    <para>
-      This chapter gives an overview of the &Evolution; Calendar
-      architecture.  It describes the model/view split of the calendar
-      into a personal calendar server, or &PCS;, and the GUI clients
-      that appear inside the &Evolution; Shell.
-    </para>
-
-    <!-- Model/View Separation -->
-
-    <sect1 id="calendar-model-view">
-      <title>Model/View Separation</title>
-
-      <para>
-	Like other base components in &Evolution;, the calendar
-	separates the data model from the views or clients.  This is
-	done so that multiple clients can access the same calendar
-	data in an orderly fashion and without clashes.  For example,
-	the user may be running a graphical calendar client.  If he
-	then wants to synchronize his calendar with a handheld device,
-	then the corresponding synchronization program (e.g. a conduit
-	for the <application>gnome-pilot</application> package) will
-	also need to access the calendar storage.  It is important
-	that both the GUI client and the synchronization program keep
-	a consistent view of the calendar at all times, otherwise one
-	of them will be left in an inconsistent state if the
-	calendar's data changes unexpectedly.
-      </para>
-
-      <para>
-	&Evolution; puts the calendar storage in a daemon called the
-	&Wombat; and completely separates it from clients who wants to
-	access calendar data.  This part of the &Wombat; is called the
-	personal calendar server, or &PCS;.  Clients must contact the
-	&PCS; and ask it to open an existing calendar or create a new
-	one.  When a calendar component object (e.g. an appointment or
-	to-do item) changes in the &PCS; it will notify all the
-	clients that are using the component's parent calendar.
-      </para>
-    </sect1>
-
-    <!-- Personal Calendar Server -->
-
-    <sect1>
-      <title>Personal Calendar Server</title>
-
-      <para>
-	The personal calendar server, or &PCS;, provides centralized
-	management and storage of a user's personal calendar.
-	Multiple clients can connect to the &PCS; simultaneously to
-	query and modify the user's calendar in a synchronized
-	fashion.  The main features of the &PCS; are as follows:
-      </para>
-
-      <formalpara>
-	<title>Storage</title>
-
-	<para>
-	  The &PCS; is responsible for loading and saving calendars.
-	  Centralizing the loading and saving functionality allows
-	  multiple clients to use the same calendar at the same time
-	  without having to worry about each other.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Basic Queries</title>
-
-	<para>
-	  The &PCS; provides functions to do basic queries on a
-	  calendar, for example, a client can ask the server for a
-	  list of all the appointments in the calendar, or for all the
-	  data for a specific appointment.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Recurrence and Alarm Queries</title>
-
-	<para>
-	  Looking for the events that recur or have alarm triggers in
-	  a specific period of time involves scanning all the
-	  appointments in a calendar.  To keep clients from having to
-	  load whole calendars at once, the &PCS; can do these
-	  computations and send the results to clients.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Modification Log</title>
-
-	<para>
-	  To allow multiple handheld devices to be synchronized
-	  against a calendar, the &PCS; keeps a log of all the
-	  modifications that are done to the calendar.  When an
-	  appointment is updated or removed, the &PCS; logs this
-	  action in the modification log.  Synchronization conduit
-	  programs can then use this information to do their work.
-	</para>
-      </formalpara>
-    </sect1>
-
-    <!-- Data Views -->
-
-    <sect1>
-      <title>Data Views</title>
-
-      <para>
-	&Evolution; provides a graphical calendar client inside the
-	shell that is just a view onto the data stored in the personal
-	calendar server.  You can launch as many views of a calendar
-	as you like and they will all receive notification from the
-	&PCS; when changes occur.  The views are then responsible for
-	updating their respective displays.
-      </para>
-
-      <para>
-	Even within a single calendar view in the &Evolution; shell
-	there can be multiple clients of a single calendar.  For
-	example, in the day view of the &Evolution; calendar there are
-	three widgets that act as three different clients of the
-	&PCS;:  the multi-day view, the busy days calendar, and the
-	task list.
-      </para>
-    </sect1>
-
-    <!-- Non-graphical Clients -->
-
-    <sect1>
-      <title>Non-graphical Clients</title>
-
-      <para>
-	Clients of the personal calendar server can be non-graphical,
-	that is, they do not have to provide views of the data to the
-	user.  Examples of such clients are the synchronization
-	conduit programs for handheld devices.  These usually run with
-	no user interface as a result of being invoked by a daemon
-	that watches the connection to a handheld device.  For
-	example, the calendar synchronization conduit in &Evolution;
-	gets run when the <application>gpilotd</application> daemon
-	from the <application>gnome-pilot</application> package
-	detects that the HotSync button has been pressed on a Palm
-	Pilot device.
-      </para>
-
-      <para>
-	Such clients simply take advantage of the centralized storage
-	in the &PCS; without presenting any graphical display of the
-	data; they just act as middlemen between the &PCS; and other
-	applications.
-      </para>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/calendar/cal-client/.cvsignore b/help/devel/calendar/cal-client/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/help/devel/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
deleted file mode 100644
index f3a2b39ec6..0000000000
--- a/help/devel/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,131 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-cal-client
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-client
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-client/.libs/libcal-client.a	\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/.libs/libical.a		\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =				\
-	 evolution-cal-client.args		\
-	 evolution-cal-client.hierarchy		\
-	 evolution-cal-client.signals		\
-	 evolution-cal-client.types		\
-	 evolution-cal-client-decl.txt		\
-	 evolution-cal-client-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/calendar/cal-client/cal-client.c		\
-	$(top_srcdir)/calendar/cal-client/cal-client.h		\
-	$(top_srcdir)/calendar/cal-client/cal-client-types.c	\
-	$(top_srcdir)/calendar/cal-client/cal-client-types.h
-
-IGNORED_HEADER_FILES =		\
-	cal-listener.h		\
-	evolution-calendar.h
-
-scan_generated =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals		\
-	evolution-cal-client.types
-
-tmpl_dependencies =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt	\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals
-
-tmpl_sources =					\
-	tmpl/cal-client.sgml			\
-	tmpl/evolution-cal-client-unused.sgml
-
-tmpl_generated =				\
-	evolution-cal-client-unused.txt
-
-sgml_dependencies =				\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt	\
-	evolution-cal-client.args		\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.signals		\
-	tmpl/cal-client.sgml
-
-sgml_generated = 				\
-	sgml/cal-client.sgml			\
-	sgml/evolution-cal-client-doc.bottom	\
-	sgml/evolution-cal-client-doc.top	\
-	sgml/object_index.sgml			\
-	sgml/tree_index.sgml
-
-EXTRA_DIST = 					\
-	 evolution-cal-client.args		\
-	 evolution-cal-client.hierarchy		\
-	 evolution-cal-client.signals		\
-	 evolution-cal-client.types		\
-	 evolution-cal-client-decl.txt		\
-	 evolution-cal-client-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)									\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)					\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)					\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILES)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
deleted file mode 100644
index 0bc30e6462..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-<MACRO>
-<NAME>CAL_CLIENT_TYPE</NAME>
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT</NAME>
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT_CLASS</NAME>
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT</NAME>
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT_CLASS</NAME>
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>CalClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientPrivate</NAME>
-</STRUCT>
-<ENUM>
-<NAME>CalClientOpenStatus</NAME>
-typedef enum {
-	CAL_CLIENT_OPEN_SUCCESS,
-	CAL_CLIENT_OPEN_ERROR,
-	CAL_CLIENT_OPEN_NOT_FOUND,
-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED
-} CalClientOpenStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientGetStatus</NAME>
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientLoadState</NAME>
-typedef enum {
-	CAL_CLIENT_LOAD_NOT_LOADED,
-	CAL_CLIENT_LOAD_LOADING,
-	CAL_CLIENT_LOAD_LOADED
-} CalClientLoadState;
-</ENUM>
-<STRUCT>
-<NAME>CalClient</NAME>
-struct CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_construct</NAME>
-<RETURNS>CalClient  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_new</NAME>
-<RETURNS>CalClient  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_open_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri, gboolean only_if_exists
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_load_state</NAME>
-<RETURNS>CalClientLoadState  </RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uri</NAME>
-<RETURNS>const char  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_n_objects</NAME>
-<RETURNS>int  </RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_object</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,const char *uid,CalComponent **comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_changes</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type, const char *change_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_objects_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_generate_instances</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_in_range</NAME>
-<RETURNS>GSList  *</RETURNS>
-CalClient *client, time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_free_alarms</NAME>
-<RETURNS>void  </RETURNS>
-GSList *comp_alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_for_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms **alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_remove_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid
-</FUNCTION>
-<ENUM>
-<NAME>CalClientChangeType</NAME>
-typedef enum {
-	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
-	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
-	CAL_CLIENT_CHANGE_DELETED = 1 << 2
-} CalClientChangeType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_client_change_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt b/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
deleted file mode 100644
index 0ce8d9427d..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-<INCLUDE>cal-client/cal-client.h</INCLUDE>
-
-<SECTION>
-<FILE>cal-client</FILE>
-CAL_CLIENT
-<TITLE>CalClient</TITLE>
-
-CalClientOpenStatus
-CalClientGetStatus
-CalClientLoadState
-
-CalClientChangeType
-
-cal_client_new
-cal_client_open_calendar
-cal_client_get_load_state
-cal_client_get_uri
-cal_client_get_n_objects
-cal_client_get_uids
-cal_client_get_object
-cal_client_get_changes
-cal_client_change_list_free
-cal_client_get_objects_in_range
-cal_client_generate_instances
-cal_client_get_alarms_in_range
-cal_client_free_alarms
-cal_client_get_alarms_for_object
-cal_client_update_object
-cal_client_remove_object
-
-<SUBSECTION Standard>
-
-CAL_CLIENT_TYPE
-IS_CAL_CLIENT
-CAL_CLIENT_CLASS
-IS_CAL_CLIENT_CLASS
-cal_client_get_type
-cal_client_construct
-
-<SUBSECTION Private>
-CalClient
-CalClientPrivate
-
-</SECTION>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.args b/help/devel/calendar/cal-client/evolution-cal-client.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.args
+++ /dev/null
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy b/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
deleted file mode 100644
index 88efa3e673..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalClient
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.signals b/help/devel/calendar/cal-client/evolution-cal-client.signals
deleted file mode 100644
index 65d142777a..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.signals
+++ /dev/null
@@ -1,21 +0,0 @@
-<SIGNAL>
-<NAME>CalClient::cal-opened</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gint  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-updated</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gchar *arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-removed</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-gchar *arg1
-</SIGNAL>
-
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.types b/help/devel/calendar/cal-client/evolution-cal-client.types
deleted file mode 100644
index 84d65a6637..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-cal_client_get_type
diff --git a/help/devel/calendar/cal-client/tmpl/cal-client.sgml b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
deleted file mode 100644
index 06195ca454..0000000000
--- a/help/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ /dev/null
@@ -1,303 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GTK+ object for communication with personal calendar server.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalClient object provides a nice GTK+ wrapper for the CORBA
-    interfaces that are used to communicate between calendar clients
-    and the personal calendar server in the user's Wombat daemon.  The
-    CORBA interfaces transfer calendar components in RFC 2445 text
-    format; the #CalClient object automatically converts these into
-    #CalComponent structures that are easier to handle.
-  </para>
-
-  <para>
-    After a #CalClient object is created with cal_client_new(), it
-    should be asked to send a request to the personal calendar server
-    to load or create a calendar based on its URI.  The server will
-    asynchronously notify the client about completion of the request,
-    and will return an appropriate result code; this should be noted
-    by the client with the <link
-    linkend="CalClient--cal-loaded">cal_loaded</link> signal.
-  </para>
-
-  <para>
-    When a client asks the server to update or delete a calendar
-    component from the storage, the server will do so and then notify
-    all the clients about the update or removal.  This is the core of
-    the model/view split between calendar clients and the storage in
-    the personal calendar server.  Clients should watch the <link
-    linkend="calclient-obj-updated">obj_updated</link> and <link
-    linkend="calclient-obj-removed">obj_removed</link> signals on the
-    CalClient objects they create so that they can be notified about
-    changes in the storage.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #CalComponent
-  </para>
-
-<!-- ##### MACRO CAL_CLIENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalClient.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalClientOpenStatus ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_OPEN_SUCCESS: 
-@CAL_CLIENT_OPEN_ERROR: 
-@CAL_CLIENT_OPEN_NOT_FOUND: 
-@CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED: 
-
-<!-- ##### ENUM CalClientGetStatus ##### -->
-  <para>
-    These values describe the result of the cal_client_get_object()
-    function.
-  </para>
-
-@CAL_CLIENT_GET_SUCCESS: 
-@CAL_CLIENT_GET_NOT_FOUND: 
-@CAL_CLIENT_GET_SYNTAX_ERROR: 
-
-<!-- ##### ENUM CalClientLoadState ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_LOAD_NOT_LOADED: 
-@CAL_CLIENT_LOAD_LOADING: 
-@CAL_CLIENT_LOAD_LOADED: 
-
-<!-- ##### ENUM CalClientChangeType ##### -->
-<para>
-
-</para>
-
-@CAL_CLIENT_CHANGE_ADDED: 
-@CAL_CLIENT_CHANGE_MODIFIED: 
-@CAL_CLIENT_CHANGE_DELETED: 
-
-<!-- ##### FUNCTION cal_client_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_open_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@only_if_exists: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_load_state ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_uri ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_n_objects ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_uids ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_get_changes ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@change_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_change_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### FUNCTION cal_client_get_objects_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_generate_instances ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_free_alarms ##### -->
-<para>
-
-</para>
-
-@comp_alarms: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_for_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@start: 
-@end: 
-@alarms: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_remove_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### SIGNAL CalClient::cal-opened ##### -->
-<para>
-
-</para>
-
-@calclient: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
diff --git a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
deleted file mode 100644
index 56bcf3aff5..0000000000
--- a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
-
-<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
-
-<!-- ##### FUNCTION cal_client_is_loaded ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_client_create_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@pilot_id: 
-@uid: 
-@Returns: 
-
diff --git a/help/devel/calendar/cal-util/.cvsignore b/help/devel/calendar/cal-util/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/help/devel/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
deleted file mode 100644
index 7f567652ef..0000000000
--- a/help/devel/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-cal-util
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-util
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/.libs/libical.a		\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =				\
-	 evolution-cal-util.args		\
-	 evolution-cal-util.hierarchy		\
-	 evolution-cal-util.signals		\
-	 evolution-cal-util.types		\
-	 evolution-cal-util-decl.txt		\
-	 evolution-cal-util-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/calendar/cal-util/cal-component.c		\
-	$(top_srcdir)/calendar/cal-util/cal-component.h		\
-	$(top_srcdir)/calendar/cal-util/cal-recur.c		\
-	$(top_srcdir)/calendar/cal-util/cal-recur.h		\
-	$(top_srcdir)/calendar/cal-util/cal-util.c		\
-	$(top_srcdir)/calendar/cal-util/cal-util.h		\
-	$(top_srcdir)/calendar/cal-util/timeutil.c		\
-	$(top_srcdir)/calendar/cal-util/timeutil.h
-
-IGNORED_HEADER_FILES =	\
-	calobj.h
-
-scan_generated =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals		\
-	evolution-cal-util.types
-
-tmpl_dependencies =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals
-
-tmpl_sources =					\
-	tmpl/cal-component.sgml			\
-	tmpl/cal-recur.sgml			\
-	tmpl/cal-util.sgml			\
-	tmpl/evolution-cal-util-unused.sgml	\
-	tmpl/timeutil.sgml
-
-tmpl_generated =				\
-	evolution-cal-util-unused.txt
-
-sgml_dependencies =				\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt		\
-	evolution-cal-util.args			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.signals		\
-	tmpl/cal-component.sgml			\
-	tmpl/cal-recur.sgml			\
-	tmpl/cal-util.sgml			\
-	tmpl/timeutil.sgml
-
-sgml_generated = 				\
-	sgml/cal-component.sgml			\
-	sgml/cal-recur.sgml			\
-	sgml/cal-util.sgml			\
-	sgml/evolution-cal-util-doc.bottom	\
-	sgml/evolution-cal-util-doc.top		\
-	sgml/object_index.sgml			\
-	sgml/timeutil.sgml			\
-	sgml/tree_index.sgml
-
-EXTRA_DIST = 					\
-	 evolution-cal-util.args		\
-	 evolution-cal-util.hierarchy		\
-	 evolution-cal-util.signals		\
-	 evolution-cal-util.types		\
-	 evolution-cal-util-decl.txt		\
-	 evolution-cal-util-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)									\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)					\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)					\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILES)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
deleted file mode 100644
index b524235de2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ /dev/null
@@ -1,780 +0,0 @@
-<MACRO>
-<NAME>CAL_COMPONENT_TYPE</NAME>
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT</NAME>
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT_CLASS</NAME>
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT</NAME>
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT_CLASS</NAME>
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-</MACRO>
-<ENUM>
-<NAME>CalComponentVType</NAME>
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentField</NAME>
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-</ENUM>
-<ENUM>
-<NAME>CalComponentClassification</NAME>
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentDateTime</NAME>
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentPeriodType</NAME>
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentPeriod</NAME>
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentText</NAME>
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentTransparency</NAME>
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-</ENUM>
-<STRUCT>
-<NAME>CalComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-struct CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_gen_uid</NAME>
-<RETURNS>char  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_new</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_clone</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_new_vtype</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentVType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_icalcomponent</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp, icalcomponent *icalcomp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_icalcomponent</NAME>
-<RETURNS>icalcomponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_vtype</NAME>
-<RETURNS>CalComponentVType  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_as_string</NAME>
-<RETURNS>char  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_commit_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **categories
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *categories
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification *classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_property_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_exceptions</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype **geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_property_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_recurrences</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, icalproperty_status *status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, icalproperty_status status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency *transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_event_dates_match</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp1, CalComponent *comp2
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_datetime</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_geo</NAME>
-<RETURNS>void  </RETURNS>
-struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_icaltimetype</NAME>
-<RETURNS>void  </RETURNS>
-struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_percent</NAME>
-<RETURNS>void  </RETURNS>
-int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_priority</NAME>
-<RETURNS>void  </RETURNS>
-int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_period_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_recur_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_sequence</NAME>
-<RETURNS>void  </RETURNS>
-int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_text_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *text_list
-</FUNCTION>
-<STRUCT>
-<NAME>CalComponentAlarm</NAME>
-</STRUCT>
-<TYPEDEF>
-<NAME>CalAlarmInstance</NAME>
-typedef struct {
-	/* UID of the alarm that triggered */
-	const char *auid;
-
-	/* Trigger time, i.e. "5 minutes before the appointment" */
-	time_t trigger;
-
-	/* Actual event occurrence to which this trigger corresponds */
-	time_t occur;
-} CalAlarmInstance;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentAlarms</NAME>
-typedef struct {
-	/* The actual component */
-	CalComponent *comp;
-
-	/* List of CalAlarmInstance structures */
-	GSList *alarms;
-} CalComponentAlarms;
-</TYPEDEF>
-<ENUM>
-<NAME>CalAlarmAction</NAME>
-typedef enum {
-	CAL_ALARM_NONE,
-	CAL_ALARM_AUDIO,
-	CAL_ALARM_DISPLAY,
-	CAL_ALARM_EMAIL,
-	CAL_ALARM_PROCEDURE,
-	CAL_ALARM_UNKNOWN
-} CalAlarmAction;
-</ENUM>
-<ENUM>
-<NAME>CalAlarmTriggerType</NAME>
-typedef enum {
-	CAL_ALARM_TRIGGER_NONE,
-	CAL_ALARM_TRIGGER_RELATIVE_START,
-	CAL_ALARM_TRIGGER_RELATIVE_END,
-	CAL_ALARM_TRIGGER_ABSOLUTE
-} CalAlarmTriggerType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalAlarmTrigger</NAME>
-typedef struct {
-	CalAlarmTriggerType type;
-
-	union {
-		struct icaldurationtype rel_duration;
-		struct icaltimetype abs_time;
-	} u;
-} CalAlarmTrigger;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_component_has_alarms</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_add_alarm</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_remove_alarm</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *auid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_alarm_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp, const char *auid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarms_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarms *alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_new</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_uid</NAME>
-<RETURNS>const char  *</RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmAction *action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmAction action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmTrigger *trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalAlarmTrigger trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<USER_FUNCTION>
-<NAME>CalRecurInstanceFn</NAME>
-<RETURNS>gboolean </RETURNS>
-CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instance_end,
-					 gpointer      data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_generate_instances</NAME>
-<RETURNS>void 	</RETURNS>
-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalObjInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_obj_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<ENUM>
-<NAME>CalObjType</NAME>
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_obj_uid_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<FUNCTION>
-<NAME>isodate_from_time_t</NAME>
-<RETURNS>char    *</RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_day</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int days
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_week</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int weeks
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_month</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int months
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int years
-</FUNCTION>
-<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int  </RETURNS>
-int year, int month
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t  </RETURNS>
-int year, int month, int day
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void  </RETURNS>
-time_t t
-</FUNCTION>
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-sections.txt b/help/devel/calendar/cal-util/evolution-cal-util-sections.txt
deleted file mode 100644
index 1a03226591..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util-sections.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-<SECTION>
-<FILE>cal-component</FILE>
-CAL_COMPONENT
-<TITLE>CalComponent</TITLE>
-
-CalComponentVType
-CalComponentField
-CalComponentClassification
-CalComponentDateTime
-CalComponentPeriodType
-CalComponentPeriod
-CalComponentText
-CalComponentTransparency
-
-cal_component_gen_uid
-cal_component_new
-cal_component_clone
-cal_component_set_new_vtype
-cal_component_set_icalcomponent
-cal_component_get_icalcomponent
-cal_component_get_vtype
-cal_component_get_as_string
-cal_component_commit_sequence
-cal_component_get_uid
-cal_component_set_uid
-cal_component_get_categories
-cal_component_set_categories
-cal_component_get_categories_list
-cal_component_set_categories_list
-cal_component_get_classification
-cal_component_set_classification
-cal_component_get_comment_list
-cal_component_set_comment_list
-cal_component_get_completed
-cal_component_set_completed
-cal_component_get_created
-cal_component_set_created
-cal_component_get_description_list
-cal_component_set_description_list
-cal_component_get_dtend
-cal_component_set_dtend
-cal_component_get_dtstamp
-cal_component_set_dtstamp
-cal_component_get_dtstart
-cal_component_set_dtstart
-cal_component_get_due
-cal_component_set_due
-cal_component_get_exdate_list
-cal_component_set_exdate_list
-cal_component_has_exdates
-cal_component_get_exrule_list
-cal_component_get_exrule_property_list
-cal_component_set_exrule_list
-cal_component_has_exrules
-cal_component_has_exceptions
-cal_component_get_geo
-cal_component_set_geo
-cal_component_get_last_modified
-cal_component_set_last_modified
-cal_component_get_percent
-cal_component_set_percent
-cal_component_get_priority
-cal_component_set_priority
-cal_component_get_rdate_list
-cal_component_set_rdate_list
-cal_component_has_rdates
-cal_component_get_rrule_list
-cal_component_get_rrule_property_list
-cal_component_set_rrule_list
-cal_component_has_rrules
-cal_component_has_recurrences
-cal_component_get_sequence
-cal_component_set_sequence
-cal_component_get_status
-cal_component_set_status
-cal_component_get_summary
-cal_component_set_summary
-cal_component_get_transparency
-cal_component_set_transparency
-cal_component_get_url
-cal_component_set_url
-
-<SUBSECTION Functions to free returned values>
-cal_component_free_categories_list
-cal_component_free_datetime
-cal_component_free_exdate_list
-cal_component_free_geo
-cal_component_free_icaltimetype
-cal_component_free_percent
-cal_component_free_priority
-cal_component_free_period_list
-cal_component_free_recur_list
-cal_component_free_sequence
-cal_component_free_text_list
-
-<SUBSECTION Alarms>
-CalComponentAlarm
-CalAlarmInstance
-CalComponentAlarms
-CalAlarmAction
-CalAlarmTriggerType
-CalAlarmTrigger
-
-cal_component_has_alarms
-cal_component_get_alarm_uids
-cal_component_get_alarm
-cal_component_alarm_free
-cal_component_alarms_free
-cal_component_alarm_get_uid
-cal_component_alarm_get_action
-cal_component_alarm_set_action
-cal_component_alarm_get_trigger
-cal_component_alarm_set_trigger
-
-<SUBSECTION Standard>
-CAL_COMPONENT_TYPE
-CAL_COMPONENT_CLASS
-IS_CAL_COMPONENT
-IS_CAL_COMPONENT_CLASS
-cal_component_get_type
-
-<SUBSECTION Private>
-CalComponent
-CalComponentPrivate
-
-</SECTION>
-
-<SECTION>
-<FILE>cal-recur</FILE>
-CalRecurInstanceFn
-cal_recur_generate_instances
-</SECTION>
-
-<SECTION>
-<FILE>cal-util</FILE>
-CalObjInstance
-cal_obj_instance_list_free
-CalObjType
-cal_obj_uid_list_free
-</SECTION>
-
-<SECTION>
-<FILE>timeutil</FILE>
-isodate_from_time_t
-time_add_minutes
-time_add_day
-time_add_week
-time_add_month
-time_add_year
-time_days_in_month
-time_from_day
-time_year_begin
-time_year_end
-time_month_begin
-time_month_end
-time_week_begin
-time_week_end
-time_day_begin
-time_day_end
-print_time_t
-</SECTION>
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.args b/help/devel/calendar/cal-util/evolution-cal-util.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.args
+++ /dev/null
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.hierarchy b/help/devel/calendar/cal-util/evolution-cal-util.hierarchy
deleted file mode 100644
index cc235653f2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalComponent
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.signals b/help/devel/calendar/cal-util/evolution-cal-util.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.signals
+++ /dev/null
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.types b/help/devel/calendar/cal-util/evolution-cal-util.types
deleted file mode 100644
index 52b2d9bf90..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-util/cal-component.h>
-
-cal_component_get_type
diff --git a/help/devel/calendar/cal-util/tmpl/cal-component.sgml b/help/devel/calendar/cal-util/tmpl/cal-component.sgml
deleted file mode 100644
index 0cf6089d60..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ /dev/null
@@ -1,991 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-RFC 2445 iCalendar component object.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalComponent object provides a wrapper over the &libical;
-    functions for manipulating calendar components.  #CalComponent
-    presents a GTK+-like interface to calendar components according to
-    RFC 2445.
-  </para>
-
-  <para>
-    While &libical; supports almost all of the features of the
-    iCalendar RFCs, applications are normally not interested in all
-    the mindless gunk that is there.  Still, applications should do
-    their best not to drop extension fields from calendar components
-    or any other extra information they do not support (including
-    standard fields they are not interested in).  The #CalComponent
-    object provides a wrapper over
-    <structname>icalcomponent</structname> structures from &libical;
-    so that no information in them will be lost even if the
-    application is not designed to handle it.  Also, #CalComponent
-    provides a higher-level API to many of the &libical; operations so
-    as to make it less painful to deal with iCalendar components.
-  </para>
-
-  <para>
-    A #CalComponent object starts out empty.  It must be initialized
-    from an existing <structname>icalcomponent</structname> structure
-    by using the cal_component_set_icalcomponent() function, or from a
-    completely new data by specifying the desired component type to
-    the cal_component_set_new_vtype() function.
-  </para>
-
-  <para>
-    #CalComponent will create an internal map of the properties in the
-    <structname>icalcomponent</structname> structure and then allow
-    random access to them via the #CalComponent API functions;
-    normally the &libical; API would have to be used by creating many
-    iterators and other unpleasant constructs.  #CalComponent keeps
-    handles to the properties it scanned from the
-    <structname>icalcomponent</structname> and will let the parent
-    application modify them at any time without having to do any
-    iteration.
-  </para>
-
-  <para>
-    Eventually a #CalComponent may be turned into the RFC 2445 string
-    representation of an iCalendar component by using the
-    cal_component_get_as_string() function.  Applications can then
-    transfer this interoperable
-    <footnote>
-      <para>
-	&ldquo;Interoperable.&rdquo;  Heavens, I love that word.
-      </para>
-    </footnote>
-    string to other programs that deal with iCalendar.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-
-  </para>
-
-<!-- ##### MACRO CAL_COMPONENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalComponent.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalComponentVType ##### -->
-  <para>
-    Calendar component types as defined by RFC 2445.  These values can
-    be used to create a new calendar component by passing them to the
-    cal_component_set_new_vtype() function.  They are also the return
-    value of the cal_component_get_vtype() function.  The only time
-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the
-    vtype of an uninitialized #CalComponent.
-  </para>
-
-@CAL_COMPONENT_NO_TYPE: 
-@CAL_COMPONENT_EVENT: 
-@CAL_COMPONENT_TODO: 
-@CAL_COMPONENT_JOURNAL: 
-@CAL_COMPONENT_FREEBUSY: 
-@CAL_COMPONENT_TIMEZONE: 
-
-<!-- ##### ENUM CalComponentField ##### -->
-  <para>
-    These values are used as identifiers for #ETable columns.  These
-    are used by the calendar GUI code in &Evolution;.
-  </para>
-
-@CAL_COMPONENT_FIELD_CATEGORIES: 
-@CAL_COMPONENT_FIELD_CLASSIFICATION: 
-@CAL_COMPONENT_FIELD_COMPLETED: 
-@CAL_COMPONENT_FIELD_DTEND: 
-@CAL_COMPONENT_FIELD_DTSTART: 
-@CAL_COMPONENT_FIELD_DUE: 
-@CAL_COMPONENT_FIELD_GEO: 
-@CAL_COMPONENT_FIELD_PERCENT: 
-@CAL_COMPONENT_FIELD_PRIORITY: 
-@CAL_COMPONENT_FIELD_SUMMARY: 
-@CAL_COMPONENT_FIELD_TRANSPARENCY: 
-@CAL_COMPONENT_FIELD_URL: 
-@CAL_COMPONENT_FIELD_HAS_ALARMS: 
-@CAL_COMPONENT_FIELD_ICON: 
-@CAL_COMPONENT_FIELD_COMPLETE: 
-@CAL_COMPONENT_FIELD_RECURRING: 
-@CAL_COMPONENT_FIELD_OVERDUE: 
-@CAL_COMPONENT_FIELD_COLOR: 
-@CAL_COMPONENT_FIELD_NUM_FIELDS: 
-
-<!-- ##### ENUM CalComponentClassification ##### -->
-  <para>
-    Values for the access classification property of a calendar
-    component.
-  </para>
-
-@CAL_COMPONENT_CLASS_NONE: 
-@CAL_COMPONENT_CLASS_PUBLIC: 
-@CAL_COMPONENT_CLASS_PRIVATE: 
-@CAL_COMPONENT_CLASS_CONFIDENTIAL: 
-@CAL_COMPONENT_CLASS_UNKNOWN: 
-
-<!-- ##### TYPEDEF CalComponentDateTime ##### -->
-  <para>
-    This structure defines a date and time value.
-  </para>
-
-
-<!-- ##### ENUM CalComponentPeriodType ##### -->
-  <para>
-    Defines how a period of time is specified.
-  </para>
-
-@CAL_COMPONENT_PERIOD_DATETIME: 
-@CAL_COMPONENT_PERIOD_DURATION: 
-
-<!-- ##### TYPEDEF CalComponentPeriod ##### -->
-  <para>
-    This structure defines a period of time.
-  </para>
-
-
-<!-- ##### TYPEDEF CalComponentText ##### -->
-  <para>
-    This structure defines the value of a text property that may have
-    an alternate representation parameter.
-  </para>
-
-
-<!-- ##### ENUM CalComponentTransparency ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_TRANSP_NONE: 
-@CAL_COMPONENT_TRANSP_TRANSPARENT: 
-@CAL_COMPONENT_TRANSP_OPAQUE: 
-@CAL_COMPONENT_TRANSP_UNKNOWN: 
-
-<!-- ##### FUNCTION cal_component_gen_uid ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_clone ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_set_new_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@type: 
-
-
-<!-- ##### FUNCTION cal_component_set_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@icalcomp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_as_string ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_commit_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-
-
-<!-- ##### FUNCTION cal_component_get_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_set_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categories: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categories: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_set_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_get_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_exdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_property_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_exrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_has_exceptions ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_set_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_get_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_set_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_get_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_set_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_get_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_property_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_has_recurrences ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_set_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_get_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@status: 
-
-
-<!-- ##### FUNCTION cal_component_set_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@status: 
-
-
-<!-- ##### FUNCTION cal_component_get_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_set_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_get_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_set_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_get_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_set_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_free_categories_list ##### -->
-<para>
-
-</para>
-
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_datetime ##### -->
-<para>
-
-</para>
-
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_free_exdate_list ##### -->
-<para>
-
-</para>
-
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_geo ##### -->
-<para>
-
-</para>
-
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_free_icaltimetype ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_free_percent ##### -->
-<para>
-
-</para>
-
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_free_priority ##### -->
-<para>
-
-</para>
-
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_free_period_list ##### -->
-<para>
-
-</para>
-
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_recur_list ##### -->
-<para>
-
-</para>
-
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_sequence ##### -->
-<para>
-
-</para>
-
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_free_text_list ##### -->
-<para>
-
-</para>
-
-@text_list: 
-
-
-<!-- ##### STRUCT CalComponentAlarm ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF CalAlarmInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF CalComponentAlarms ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM CalAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_ALARM_NONE: 
-@CAL_ALARM_AUDIO: 
-@CAL_ALARM_DISPLAY: 
-@CAL_ALARM_EMAIL: 
-@CAL_ALARM_PROCEDURE: 
-@CAL_ALARM_UNKNOWN: 
-
-<!-- ##### ENUM CalAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_ALARM_TRIGGER_NONE: 
-@CAL_ALARM_TRIGGER_RELATIVE_START: 
-@CAL_ALARM_TRIGGER_RELATIVE_END: 
-@CAL_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### TYPEDEF CalAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_has_alarms ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_alarm_uids ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@auid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free ##### -->
-<para>
-
-</para>
-
-@alarm: 
-
-
-<!-- ##### FUNCTION cal_component_alarms_free ##### -->
-<para>
-
-</para>
-
-@alarms: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_uid ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
diff --git a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml b/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
deleted file mode 100644
index 092b547809..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-cal-recur
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION CalRecurInstanceFn ##### -->
-<para>
-
-</para>
-
-@comp: 
-@instance_start: 
-@instance_end: 
-@data: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@instace_end: 
-
-
-<!-- ##### FUNCTION cal_recur_generate_instances ##### -->
-<para>
-
-</para>
-
-@comp: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
diff --git a/help/devel/calendar/cal-util/tmpl/cal-util.sgml b/help/devel/calendar/cal-util/tmpl/cal-util.sgml
deleted file mode 100644
index ccd35fac2e..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Miscellaneous utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### TYPEDEF CalObjInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### ENUM CalObjType ##### -->
-<para>
-
-</para>
-
-@CALOBJ_TYPE_EVENT: 
-@CALOBJ_TYPE_TODO: 
-@CALOBJ_TYPE_JOURNAL: 
-@CALOBJ_TYPE_ANY: 
-
-<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
diff --git a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
deleted file mode 100644
index ff68fae99d..0000000000
--- a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
-<para>
-
-</para>
-
-@r: 
-
-<!-- ##### ENUM CalRecurType ##### -->
-<para>
-
-</para>
-
-@CAL_RECUR_YEARLY: 
-@CAL_RECUR_MONTHLY: 
-@CAL_RECUR_WEEKLY: 
-@CAL_RECUR_DAILY: 
-@CAL_RECUR_HOURLY: 
-@CAL_RECUR_MINUTELY: 
-@CAL_RECUR_SECONDLY: 
-
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-<!-- ##### FUNCTION get_time_t_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
-<para>
-
-</para>
-
-@trigger: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
-<!-- ##### FUNCTION time_day_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@hour: 
-@Returns: 
-
-<!-- ##### FUNCTION time_from_isodate ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-<!-- ##### STRUCT CalObjTime ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@hour: 
-@minute: 
-@second: 
-
-<!-- ##### STRUCT CalComponentPrivate ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
-<para>
-
-</para>
-
-@ir: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-<!-- ##### TYPEDEF CalRecurrence ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
-<para>
-
-</para>
-
-@itt: 
-@Returns: 
-
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_NONE: 
-@CAL_COMPONENT_ALARM_AUDIO: 
-@CAL_COMPONENT_ALARM_DISPLAY: 
-@CAL_COMPONENT_ALARM_EMAIL: 
-@CAL_COMPONENT_ALARM_PROCEDURE: 
-@CAL_COMPONENT_ALARM_UNKNOWN: 
-
-<!-- ##### FUNCTION time_from_start_duration ##### -->
-<para>
-
-</para>
-
-@start: 
-@duration: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
-<para>
-
-</para>
-
-@secs: 
-@Returns: 
-
-<!-- ##### FUNCTION format_simple_hour ##### -->
-<para>
-
-</para>
-
-@hour: 
-@use_am_pm: 
-@Returns: 
-
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-<!-- ##### FUNCTION parse_date ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
diff --git a/help/devel/calendar/cal-util/tmpl/timeutil.sgml b/help/devel/calendar/cal-util/tmpl/timeutil.sgml
deleted file mode 100644
index 2b197ad685..0000000000
--- a/help/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-timeutil
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION isodate_from_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time: 
-@minutes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_day ##### -->
-<para>
-
-</para>
-
-@time: 
-@days: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_week ##### -->
-<para>
-
-</para>
-
-@time: 
-@weeks: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_month ##### -->
-<para>
-
-</para>
-
-@time: 
-@months: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time: 
-@years: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_days_in_month ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
diff --git a/help/devel/calendar/evolution-calendar.sgml b/help/devel/calendar/evolution-calendar.sgml
deleted file mode 100644
index ea0d8c7127..0000000000
--- a/help/devel/calendar/evolution-calendar.sgml
+++ /dev/null
@@ -1,52 +0,0 @@
-  <part id="evolution-calendar">
-    <docinfo>
-      <authorgroup>
-	<author>
-	  <firstname>Federico</firstname>
-	  <surname>Mena Quintero</surname>
-	  <affiliation>
-	    <address>
-	      <email>federico@ximian.com</email>
-	    </address>
-	  </affiliation>
-	</author>
-      </authorgroup>
-    </docinfo>
-
-    <title>Developing Applications with the &Evolution; Calendar</title>
-
-    <partintro>
-      <para>
-	This part of the &Evolution; Developer's Guide describes how
-	to write applications for the &Evolution; Calendar by using
-	its public interfaces.  The &Evolution; Calendar exports its
-	functionality through a number of interfaces, including CORBA,
-	GTK+ wrappers for Bonobo objects, and other utility libraries.
-	This part also describes the internals of the calendar so that
-	it will be easy for you to make changes to &Evolution;'s core
-	code.
-      </para>
-
-      <para>
-	You should read this part of the &Evolution; Developer's guide
-	if you intend to write client applications that use the
-	functionality of the &Evolution; Calendar, such as its storage
-	interfaces and generic recurrence engine.  If you intend to
-	make changes to the calendar's core code, it will be useful to
-	read the sections on the calendar internals as well.  Even if
-	you do not intend to modify the core code of the calendar, it
-	may be useful to know a few things about the way it works so
-	that you can make better use of the public interfaces.
-      </para>
-    </partintro>
-
-    &calendar-architecture;
-    &calendar-alarm-generation;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/help/devel/calendar/public-reference.sgml b/help/devel/calendar/public-reference.sgml
deleted file mode 100644
index b880bd2972..0000000000
--- a/help/devel/calendar/public-reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference id="calendar-public-reference">
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the &Evolution;
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/evolution-devel-guide.sgml b/help/devel/evolution-devel-guide.sgml
deleted file mode 100644
index 4a88261da4..0000000000
--- a/help/devel/evolution-devel-guide.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE book PUBLIC "-//Davenport//DTD DocBook V3.0//EN"[
-<!ENTITY preface SYSTEM "preface.sgml">
-<!ENTITY evolution-reference SYSTEM "reference.sgml">
-<!ENTITY FDL SYSTEM "fdl.sgml">
-
-<!ENTITY evolution-calendar SYSTEM "calendar/evolution-calendar.sgml">
-<!ENTITY calendar-architecture SYSTEM "calendar/architecture.sgml">
-<!ENTITY calendar-alarm-generation SYSTEM "calendar/alarm-generation.sgml">
-<!ENTITY calendar-public-reference SYSTEM "calendar/public-reference.sgml">
-<!ENTITY CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml">
-<!ENTITY CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml">
-<!ENTITY cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml">
-<!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
-<!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
-
-<!ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
-<!ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
-<!ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
-<!ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
-<!ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
-
-<!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml">
-<!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml">
-<!ENTITY ExecutiveSummaryComponent SYSTEM "executive-summary/sgml/executive-summary-component.sgml">
-<!ENTITY ExecutiveSummaryComponentFactory SYSTEM "executive-summary/sgml/executive-summary-component-factory.sgml">
-<!ENTITY ExecutiveSummaryComponentFactoryClient SYSTEM "executive-summary/sgml/executive-summary-component-factory-client.sgml">
-<!ENTITY ExecutiveSummaryHtmlView SYSTEM "executive-summary/sgml/executive-summary-html-view.sgml">
-
-<!ENTITY Evolution "<application>Evolution</application>">
-<!ENTITY Wombat "<application>Wombat</application>">
-<!ENTITY Camel "<application>Camel</application>">
-<!ENTITY PCS "<acronym>PCS</acronym>">
-<!ENTITY libical "<application>libical</application>">
-<!ENTITY Executive-Summary "<application>Executive Summary</application>">
-]>
-
-<book id="index">
-  <bookinfo>
-    <title>&Evolution; Developer's Guide</title>
-
-    <authorgroup>
-      <corpauthor>
-	Ximian, Inc.
-      </corpauthor>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <copyright>
-      <year>2001</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-
-    <legalnotice id="legalnotice">
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the <ulink type="help"
-	url="gnome-help:fdl"><citetitle>GNU Free Documentation
-	License</citetitle></ulink>, Version 1.1 or any later version
-	published by the Free Software Foundation with no Invariant
-	Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-	may obtain a copy of the <citetitle>GNU Free Documentation
-	License</citetitle> from the Free Software Foundation by
-	visiting <ulink type="http" url="http://www.fsf.org">their Web
-	site</ulink> or by writing to: Free Software Foundation, Inc.,
-	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-      </para>
-
-      <para>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any GNOME documentation, and those trademarks
-	are made aware to the members of the GNOME Documentation
-	Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-  </bookinfo>
-
-  <!-- Introduction -->
-
-  &preface;
-
-  <!-- DocBook parts for each individual component -->
-
-  &evolution-calendar;
-
-  <!-- API Reference part -->
-
-  &evolution-reference;
-
-  <!-- Appendices -->
-
-  &FDL;
-</book>
diff --git a/help/devel/executive-summary/Makefile.am b/help/devel/executive-summary/Makefile.am
deleted file mode 100644
index 9aa53af4ec..0000000000
--- a/help/devel/executive-summary/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-services
-
-# The directory containing the source code
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/executive-summary/evolution-services
-
-CFLAGS ="						\
-	-I$(top_srcdir)/executive-summary/evolution-services	\
-	-I$(top_srcdir)/executive-summary			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/executive-summary/evolution-services/.libs/libevolution-services.a	\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =					\
-	evolution-services.args			\
-	evolution-services.hierarchy		\
-	evolution-services.signals		\
-	evolution-services.types			\
-	evolution-services-decl.txt		\
-	evolution-services-sections.txt
-
-SOURCE_FILES =							\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component.c	\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component-factory-client.c		\
-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-html-view.c
-
-IGNORED_HEADER_FILES =		\
-	Executive-Summary.h
-	
-scan_generated =						\
-	evolution-services-decl.txt			\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals			\
-	evolution-services.types
-
-tmpl_dependencies =						\
-	evolution-services-decl.txt			\
-	evolution-services-sections.txt			\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals
-
-tmpl_sources = 						\
-	tmpl/evolution-services.sgml		\
-	tmpl/evolution-services-unused.sgml
-
-tmpl_generated =					\
-	evolution-services-unused.txt
-
-sgml_dependencies =					\
-	evolution-services-decl.txt		\
-	evolution-services-sections.txt		\
-	evolution-services.args			\
-	evolution-services.hierarchy		\
-	evolution-services.signals		\
-	tmpl/evolution-services.sgml
-
-sgml_generated =						\
-	sgml/evolution-services.sgml					\
-	sgml/evolution-services-doc.bottom		\
-	sgml/evolution-services-doc.top			\
-	sgml/object_index.sgml					\
-	sgml/tree_index.sgml
-
-EXTRA_DIST =							\
-	evolution-services.args				\
-	evolution-services.hierarchy			\
-	evolution-services.signals			\
-	evolution-services.types				\
-	evolution-services-decl.txt			\
-	evolution-services-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)						\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)		\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)		\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILE)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/help/devel/executive-summary/evolution-services-decl.txt b/help/devel/executive-summary/evolution-services-decl.txt
deleted file mode 100644
index df84080700..0000000000
--- a/help/devel/executive-summary/evolution-services-decl.txt
+++ /dev/null
@@ -1,599 +0,0 @@
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClient</NAME>
-struct ExecutiveSummaryClient {
-	BonoboObjectClient parent;
-	
-	ExecutiveSummaryClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClientClass</NAME>
-struct ExecutiveSummaryClientClass {
-	BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,CORBA_Object object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_set_title</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *title
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_set_icon</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_flash</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_client_update</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryClient *client,int id,const char *html
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClient</NAME>
-struct ExecutiveSummaryComponentFactoryClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentFactoryClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClientClass</NAME>
-struct ExecutiveSummaryComponentFactoryClientClass {
-  BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentFactoryClient *client,CORBA_Object corba_object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_new</NAME>
-<RETURNS>ExecutiveSummaryComponentFactoryClient  *</RETURNS>
-const char *id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_client_create_view</NAME>
-<RETURNS>CORBA_Object  </RETURNS>
-ExecutiveSummaryComponentFactoryClient *client
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponent</NAME>
-struct ExecutiveSummaryComponent {
-  BonoboObject parent;
-
-  ExecutiveSummaryComponentPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClass</NAME>
-struct ExecutiveSummaryComponentClass {
-  BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE (executive_summary_component_factory_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactory))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactoryClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactory</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClass</NAME>
-</STRUCT>
-<USER_FUNCTION>
-<NAME>EvolutionServicesCreateViewFn</NAME>
-<RETURNS>BonoboObject *</RETURNS>
-ExecutiveSummaryComponentFactory *factory,
-							 void *closure
-</USER_FUNCTION>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactory</NAME>
-struct ExecutiveSummaryComponentFactory {
-	BonoboObject parent;
-
-	ExecutiveSummaryComponentFactoryPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentFactoryClass</NAME>
-struct ExecutiveSummaryComponentFactoryClass {
-	BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_factory_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_factory_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-EvolutionServicesCreateViewFn create_view,void *closure
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED "GNOME:Evolution:Summary:HTMLView:html_changed"
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_TYPE (executive_summary_html_view_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlView))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlViewClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_HTML_VIEW</NAME>
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlView</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlView</NAME>
-struct ExecutiveSummaryHtmlView {
-	BonoboObject parent;
-	
-	ExecutiveSummaryHtmlViewPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryHtmlViewClass</NAME>
-struct ExecutiveSummaryHtmlViewClass {
-	BonoboObjectClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_new_full</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-BonoboEventSource *event_source
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_set_html</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryHtmlView *view,const char *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_html</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryHtmlView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_html_view_get_event_source</NAME>
-<RETURNS>BonoboEventSource  *</RETURNS>
-ExecutiveSummaryHtmlView *view
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClient</NAME>
-struct ExecutiveSummaryComponentClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentClientPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentClientClass</NAME>
-struct ExecutiveSummaryComponentClientClass {
-  BonoboObjectClientClass parent_class;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_new</NAME>
-<RETURNS>ExecutiveSummaryComponentClient  *</RETURNS>
-const char *id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_set_owner</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummary *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_unset_owner</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_supports</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,gboolean *bonobo,gboolean *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_configure</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_client_destroy_view</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY</NAME>
-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY</NAME>
-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummary</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummary</NAME>
-struct ExecutiveSummary {
-	BonoboObject parent;
-	
-	ExecutiveSummaryPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryClass</NAME>
-struct ExecutiveSummaryClass {
-	BonoboObjectClass parent_class;
-
-	void (* update) (ExecutiveSummary *summary,
-			 const GNOME_Evolution_Summary_Component component,
-			 const char *html);
-	void (* set_title) (ExecutiveSummary *summary,
-			    const GNOME_Evolution_Summary_Component component,
-			    const char *title);
-	void (* set_icon) (ExecutiveSummary *summary,
-			   const GNOME_Evolution_Summary_Component component,
-			   const char *icon);
-	void (* flash) (ExecutiveSummary *summary,
-			const GNOME_Evolution_Summary_Component component);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_construct</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummary *es,GNOME_Evolution_Summary_ViewFrame corba_object
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_new</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))
-</MACRO>
-<MACRO>
-<NAME>EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS</NAME>
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS</NAME>
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentView</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentView</NAME>
-struct ExecutiveSummaryComponentView {
-	GtkObject object;
-	
-	ExecutiveSummaryComponentViewPrivate *private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>ExecutiveSummaryComponentViewClass</NAME>
-struct ExecutiveSummaryComponentViewClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void (* configure) (ExecutiveSummaryComponentView *view);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_construct</NAME>
-<RETURNS>void</RETURNS>
-ExecutiveSummaryComponentView *view,ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_new</NAME>
-<RETURNS>ExecutiveSummaryComponentView  *</RETURNS>
-ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_title</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *title
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_title</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_icon</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *icon
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_icon</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_flash</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_html</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,const char *html
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_html</NAME>
-<RETURNS>const char  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_control</NAME>
-<RETURNS>BonoboObject  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_id</NAME>
-<RETURNS>int  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_id</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,int id
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_configure</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_set_objref</NAME>
-<RETURNS>void  </RETURNS>
-ExecutiveSummaryComponentView *view,Bonobo_Control objref
-</FUNCTION>
-<FUNCTION>
-<NAME>executive_summary_component_view_get_widget</NAME>
-<RETURNS>GtkWidget  *</RETURNS>
-ExecutiveSummaryComponentView *view
-</FUNCTION>
diff --git a/help/devel/executive-summary/evolution-services-sections.txt b/help/devel/executive-summary/evolution-services-sections.txt
deleted file mode 100644
index 8ba2b42317..0000000000
--- a/help/devel/executive-summary/evolution-services-sections.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-<INCLUDE>executive-summary-component.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-component</FILE>
-EXECUTIVE_SUMMARY_COMPONENT
-<TITLE>ExecutiveSummaryComponent</TITLE>
-
-executive_summary_component_new
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_TYPE
-EXECUTIVE_SUMMARY_COMPONENT
-EXECUTIVE_SUMMARY_COMPONENT_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT
-IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS
-executive_summary_component_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponent
-ExecutiveSummaryComponentPrivate
-
-</SECTION>
-
-<SECTION>
-<FILE>executive-summary-component-factory</FILE>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-<TITLE>ExecutiveSummaryComponentFactory</TITLE>
-
-EvolutionServicesCreateViewFn
-
-executive_summary_component_factory_new
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS
-executive_summary_component_factory_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponentFactory
-ExecutiveSummaryComponentFactoryPrivate
-
-</SECTION>
-
-<INCLUDE>executive-summary-component-factory-client.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-component-factory-client</FILE>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-<TITLE>ExecutiveSummaryComponentFactoryClient</TITLE>
-
-executive_summary_component_factory_client_construct
-executive_summary_component_factory_client_new
-executive_summary_component_factory_client_create_view
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT
-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS
-executive_summary_component_factory_client_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryComponentFactoryClient
-ExecutiveSummaryComponentFactoryClientPrivate
-
-</SECTION>
-
-<INCLUDE>executive-summary-html-view.h</INCLUDE>
-<SECTION>
-<FILE>executive-summary-html-view</FILE>
-EXECUTIVE_SUMMARY_HTML_VIEW
-<TITLE>ExecutiveSummaryHtmlView</TITLE>
-
-EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED
-
-executive_summary_html_view_new_full
-executive_summary_html_view_new
-executive_summary_html_view_set_html
-executive_summary_html_view_get_html
-executive_summary_html_view_get_event_source
-
-<SUBSECTION Standard>
-EXECUTIVE_SUMMARY_HTML_VIEW_TYPE
-EXECUTIVE_SUMMARY_HTML_VIEW
-IS_EXECUTIVE_SUMMARY_HTML_VIEW
-EXECUTIVE_SUMMARY_HTML_VIEW_CLASS
-IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS
-executive_summary_html_view_get_type
-
-<SUBSECTION Private>
-ExecutiveSummaryHtmlView
-ExecutiveSummaryHtmlViewPrivate
-</SECTION>
diff --git a/help/devel/executive-summary/evolution-services.args b/help/devel/executive-summary/evolution-services.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/executive-summary/evolution-services.args
+++ /dev/null
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 07e7aad6ff..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,15 +0,0 @@
-GtkObject
-  GtkWidget
-    GtkRange
-      GtkScale
-    GtkContainer
-      GtkBin
-        GtkButton
-          GtkToggleButton
-            GtkCheckButton
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/executive-summary/evolution-services.signals b/help/devel/executive-summary/evolution-services.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/executive-summary/evolution-services.signals
+++ /dev/null
diff --git a/help/devel/executive-summary/evolution-services.types b/help/devel/executive-summary/evolution-services.types
deleted file mode 100644
index b7ac05b89c..0000000000
--- a/help/devel/executive-summary/evolution-services.types
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <gnome.h>
-#include <bonobo.h>
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-factory-client.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-executive_summary_component_get_type
-executive_summary_component_factory_get_type
-executive_summary_component_factory_client_get_type
-executive_summary_html_view_get_type
diff --git a/help/devel/executive-summary/private-reference.sgml b/help/devel/executive-summary/private-reference.sgml
deleted file mode 100644
index e06d7c1690..0000000000
--- a/help/devel/executive-summary/private-reference.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-  <reference id="evolution-services-private-reference">
-    <title>Evolution Services Private API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	private APIs of the different components of the &Evolution;
-	Executive Summary Services Framework.
-      </para>
-    </partintro>
-    
-    &ExecutiveSummaryComponentFactoryClient;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/executive-summary/public-reference.sgml b/help/devel/executive-summary/public-reference.sgml
deleted file mode 100644
index 7758a9a5c8..0000000000
--- a/help/devel/executive-summary/public-reference.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
- <reference id="evolution-services-public-reference">
-    <title>Evolution Services Public API Reference</title>
-
-    <partintro>
-      <para>
-        This part presents the class and function reference for the
-        public APIs of the different components of the &Evolution;
-        Executive Summary Services Framework.
-      </para>
-    </partintro>
-
-    &ExecutiveSummaryComponent;
-    &ExecutiveSummaryComponentFactory;
-    &ExecutiveSummaryHtmlView;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/executive-summary/tmpl/evolution-services-unused.sgml b/help/devel/executive-summary/tmpl/evolution-services-unused.sgml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/executive-summary/tmpl/evolution-services-unused.sgml
+++ /dev/null
diff --git a/help/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml b/help/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml
deleted file mode 100644
index ee8ef25689..0000000000
--- a/help/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponentFactoryClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GtkObject client to simplfy use of GNOME_Evolution_Summary_ComponentFactory
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This object provides an easy wrapper around the CORBA object that represents the
- GNOME_Evolution_Summary_ComponentFactory interface. It handles conversion from
-normal types to CORBA types and has error checking.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT ##### -->
-<para>
-Casts a #GtkObject into an #ExecutiveSummaryComponentFactoryClient
-</para>
-
-@obj: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_construct ##### -->
-<para>
-
-</para>
-
-@client: 
-@corba_object: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_new ##### -->
-<para>
-
-</para>
-
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_client_create_view ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
diff --git a/help/devel/executive-summary/tmpl/executive-summary-component-factory.sgml b/help/devel/executive-summary/tmpl/executive-summary-component-factory.sgml
deleted file mode 100644
index 7069eea9d0..0000000000
--- a/help/devel/executive-summary/tmpl/executive-summary-component-factory.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponentFactory
-
-<!-- ##### SECTION Short_Description ##### -->
-GtkObject wrapper for GNOME/Evolution/Summary/ComponentFactory.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-An ExecutiveSummaryComponentFactory simplifies the creation of a 
-GNOME_Evolution_Summary_ComponentFactory object. It also allows error checking
-and all the standard #GtkObject signals.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY ##### -->
-<para>
-Casts a #GtkObject to an #ExecutiveSummaryComponentFactory.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### USER_FUNCTION EvolutionServicesCreateViewFn ##### -->
-<para>
-The type of function that is called when the factory has to create a new view.
-</para>
-
-@factory: The #ExecutiveSummaryComponent that is creating the view.
-@closure: The data that was passed into executive_summary_factory_new ().
-@Returns: An #ExecutiveSummaryComponent.
-
-
-<!-- ##### FUNCTION executive_summary_component_factory_new ##### -->
-<para>
-
-</para>
-
-@create_view: 
-@closure: 
-@Returns: 
-
-
diff --git a/help/devel/executive-summary/tmpl/executive-summary-component.sgml b/help/devel/executive-summary/tmpl/executive-summary-component.sgml
deleted file mode 100644
index 04768b1b1c..0000000000
--- a/help/devel/executive-summary/tmpl/executive-summary-component.sgml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-The base #BonoboObject that implements GNOME/Evolution/Summary/Component.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This #GtkObject wrapper around the GNOME/Evolution/Summary/Component, is the
-base object that has all the other interfaces aggregated onto it. These
-interfaces are: GNOME/Evolution/HTMLView, Bonobo/Control, Bonobo/EventSource,
-Bonobo/PropertyBag, Bonobo/PropertyControl and Bonobo/PersistStream. Each of
-the aggregated interfaces performs a specific job in the creation of the service.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#ExecutiveSummaryHtmlView, #BonoboControl, #BonoboEventSource, #BonoboPropertyBag,
-#BonoboPropertyControl, #BonoboPersistStream.
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT ##### -->
-<para>
-Casts a #GtkObject to an #ExecutiveSummaryComponent.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### FUNCTION executive_summary_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
diff --git a/help/devel/executive-summary/tmpl/executive-summary-html-view.sgml b/help/devel/executive-summary/tmpl/executive-summary-html-view.sgml
deleted file mode 100644
index 2fb66a2035..0000000000
--- a/help/devel/executive-summary/tmpl/executive-summary-html-view.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ExecutiveSummaryHtmlView
-
-<!-- ##### SECTION Short_Description ##### -->
-A Bonobo component used to implement HTML based services.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-When writing HTML services, this component is aggregated onto an #ExecutiveSummaryComponent, to allow the Executive Summary to be able to find the HTML.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#ExecutiveSummaryComponent, #BonoboEventSource
-</para>
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW ##### -->
-<para>
-  Casts a #GtkObject into an #ExecutiveSummaryHtmlView
-</para>
-
-@obj: A #GtkObject
-
-
-<!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED ##### -->
-<para>
-This is the event that is emitted on the BonoboEventSource when the HTML is changed.
-</para>
-
-
-
-<!-- ##### FUNCTION executive_summary_html_view_new_full ##### -->
-<para>
-
-</para>
-
-@event_source: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_set_html ##### -->
-<para>
-
-</para>
-
-@view: 
-@html: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_get_html ##### -->
-<para>
-
-</para>
-
-@view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION executive_summary_html_view_get_event_source ##### -->
-<para>
-
-</para>
-
-@view: 
-@Returns: 
-
-
diff --git a/help/devel/fdl.sgml b/help/devel/fdl.sgml
deleted file mode 100644
index 817adbdbb7..0000000000
--- a/help/devel/fdl.sgml
+++ /dev/null
@@ -1,671 +0,0 @@
-<!--  
-     The GNU Free Documentation License 1.1 in DocBook
-     Markup by Eric Baudais <baudais@okstate.edu>
-     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
-     Version: 1.0.1
-     Last Modified: Nov 16, 2000
--->
-
-<appendix id="fdl">
-  <docinfo>
-    <releaseinfo>
-      Version 1.1, March 2000
-    </releaseinfo>
-    <copyright>
-      <year>2000</year><holder>Free Software Foundation, Inc.</holder>
-    </copyright>
-    <legalnotice id="fdl-legalnotice">
-      <para>
-	<address>Free Software Foundation, Inc. <street>59 Temple Place, 
-        Suite 330</street>, <city>Boston</city>, <state>MA</state>  
-        <postcode>02111-1307</postcode>  <country>USA</country></address> 
-	Everyone is permitted to copy and distribute verbatim copies of this 
-        license document, but changing it is not allowed.
-      </para>
-    </legalnotice>
-  </docinfo>
-  <title>GNU Free Documentation License</title>
-
-  <sect1 id="fdl-preamble">
-    <title>0. PREAMBLE</title>
-    <para>
-      The purpose of this License is to make a manual, textbook, or
-      other written document <quote>free</quote> 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.
-    </para>
-    
-    <para>
-      This License is a kind of <quote>copyleft</quote>, 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.
-    </para>
-    
-    <para>
-      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.
-    </para>
-  </sect1>
-  <sect1 id="fdl-section1">
-    <title>1. APPLICABILITY AND DEFINITIONS</title>
-    <para id="fdl-document">
-      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
-      <quote>Document</quote>, below, refers to any such manual or
-      work. Any member of the public is a licensee, and is addressed
-      as <quote>you</quote>.
-    </para>
-    
-    <para id="fdl-modified">
-      A <quote>Modified Version</quote> 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.
-    </para>
-	
-    <para id="fdl-secondary">
-      A <quote>Secondary Section</quote> is a named appendix or a
-      front-matter section of the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-
-    <para id="fdl-invariant">
-      The <quote>Invariant Sections</quote> are certain <link
-      linkend="fdl-secondary"> Secondary Sections</link> whose titles
-      are designated, as being those of Invariant Sections, in the
-      notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-    
-    <para id="fdl-cover-texts">
-      The <quote>Cover Texts</quote> are certain short passages of
-      text that are listed, as Front-Cover Texts or Back-Cover Texts,
-      in the notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-	
-    <para id="fdl-transparent">
-      A <quote>Transparent</quote> copy of the <link
-      linkend="fdl-document"> Document</link> 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 <quote>Transparent</quote> is called
-      <quote>Opaque</quote>.
-    </para>
-    
-    <para>
-      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.
-    </para>
-    
-    <para id="fdl-title-page">
-      The <quote>Title Page</quote> 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, <quote>Title Page</quote> means the text near the
-      most prominent appearance of the work's title, preceding the
-      beginning of the body of the text.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section2">
-    <title>2. VERBATIM COPYING</title>
-    <para>
-      You may copy and distribute the <link
-      linkend="fdl-document">Document</link> 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 <link
-      linkend="fdl-section3">section 3</link>.
-    </para>
-    
-    <para>
-      You may also lend copies, under the same conditions stated
-      above, and you may publicly display copies.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section3">
-    <title>3. COPYING IN QUANTITY</title>
-    <para>
-      If you publish printed copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      and the Document's license notice requires <link
-      linkend="fdl-cover-texts">Cover Texts</link>, 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
-      <link linkend="fdl-document">Document</link> and satisfy these
-      conditions, can be treated as verbatim copying in other
-      respects.
-    </para>
-    
-    <para>
-      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.
-    </para>
-    
-    <para>
-      If you publish or distribute <link
-      linkend="fdl-transparent">Opaque</link> copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      you must either include a machine-readable <link
-      linkend="fdl-transparent">Transparent</link> 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.
-    </para>
-    
-    <para>
-      It is requested, but not required, that you contact the authors
-      of the <link linkend="fdl-document">Document</link> well before
-      redistributing any large number of copies, to give them a chance
-      to provide you with an updated version of the Document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section4">
-    <title>4. MODIFICATIONS</title>
-    <para>
-      You may copy and distribute a <link
-      linkend="fdl-modified">Modified Version</link> of the <link
-      linkend="fdl-document">Document</link> under the conditions of
-      sections <link linkend="fdl-section2">2</link> and <link
-      linkend="fdl-section3">3</link> 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:
-    </para>
-    
-    <itemizedlist mark="opencircle">
-      <listitem>
-	<formalpara>
-	  <title>A</title>
-	  <para>
-	    Use in the <link linkend="fdl-title-page">Title
-	    Page</link> (and on the covers, if any) a title distinct
-	    from that of the <link
-	    linkend="fdl-document">Document</link>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>B</title>
-	  <para>
-	    List on the <link linkend="fdl-title-page">Title
-	    Page</link>, as authors, one or more persons or entities
-	    responsible for authorship of the modifications in the
-	    <link linkend="fdl-modified">Modified Version</link>,
-	    together with at least five of the principal authors of
-	    the <link linkend="fdl-document">Document</link> (all of
-	    its principal authors, if it has less than five).
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>C</title>
-	  <para>
-	    State on the <link linkend="fdl-title-page">Title
-	    Page</link> the name of the publisher of the <link
-	    linkend="fdl-modified">Modified Version</link>, as the
-	    publisher.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>D</title>
-	  <para>
-	    Preserve all the copyright notices of the <link
-	    linkend="fdl-document">Document</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>E</title>
-	  <para>
-	    Add an appropriate copyright notice for your modifications
-	    adjacent to the other copyright notices.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>F</title>
-	  <para>
-	    Include, immediately after the copyright notices, a
-	    license notice giving the public permission to use the
-	    <link linkend="fdl-modified">Modified Version</link> under
-	    the terms of this License, in the form shown in the
-	    Addendum below.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>G</title>
-	  <para>
-	    Preserve in that license notice the full lists of <link
-	    linkend="fdl-invariant"> Invariant Sections</link> and
-	    required <link linkend="fdl-cover-texts">Cover
-	    Texts</link> given in the <link
-	    linkend="fdl-document">Document's</link> license notice.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>H</title>
-	  <para>
-	    Include an unaltered copy of this License.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>I</title>
-	  <para>
-	    Preserve the section entitled <quote>History</quote>, and
-	    its title, and add to it an item stating at least the
-	    title, year, new authors, and publisher of the <link
-	    linkend="fdl-modified">Modified Version </link>as given on
-	    the <link linkend="fdl-title-page">Title Page</link>.  If
-	    there is no section entitled <quote>History</quote> in the
-	    <link linkend="fdl-document">Document</link>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>J</title>
-	  <para>
-	    Preserve the network location, if any, given in the <link
-	    linkend="fdl-document">Document</link> for public access
-	    to a <link linkend="fdl-transparent">Transparent</link>
-	    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 <quote>History</quote>
-	    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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>K</title>
-	  <para>
-	    In any section entitled <quote>Acknowledgements</quote> or
-	    <quote>Dedications</quote>, 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.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>L</title>
-	  <para>
-	    Preserve all the <link linkend="fdl-invariant">Invariant
-	    Sections</link> of the <link
-	    linkend="fdl-document">Document</link>, unaltered in their
-	    text and in their titles.  Section numbers or the
-	    equivalent are not considered part of the section titles.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>M</title>
-	  <para>
-	    Delete any section entitled
-	    <quote>Endorsements</quote>. Such a section may not be
-	    included in the <link linkend="fdl-modified">Modified
-	    Version</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>N</title>
-	  <para>
-	    Do not retitle any existing section as
-	    <quote>Endorsements</quote> or to conflict in title with
-	    any <link linkend="fdl-invariant">Invariant
-	    Section</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-    </itemizedlist>
-    
-    <para>
-      If the <link linkend="fdl-modified">Modified Version</link>
-      includes new front-matter sections or appendices that qualify as
-      <link linkend="fdl-secondary">Secondary Sections</link> 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 <link
-      linkend="fdl-invariant">Invariant Sections</link> in the
-      Modified Version's license notice.  These titles must be
-      distinct from any other section titles.
-    </para>
-    
-    <para>
-      You may add a section entitled <quote>Endorsements</quote>,
-      provided it contains nothing but endorsements of your <link
-      linkend="fdl-modified">Modified Version</link> 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.
-    </para>
-    
-    <para>
-      You may add a passage of up to five words as a <link
-      linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage
-      of up to 25 words as a <link
-      linkend="fdl-cover-texts">Back-Cover Text</link>, to the end of
-      the list of <link linkend="fdl-cover-texts">Cover Texts</link>
-      in the <link linkend="fdl-modified">Modified Version</link>.
-      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 <link linkend="fdl-document">Document</link>
-      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.
-    </para>
-    
-    <para>
-      The author(s) and publisher(s) of the <link
-      linkend="fdl-document">Document</link> do not by this License
-      give permission to use their names for publicity for or to
-      assert or imply endorsement of any <link
-      linkend="fdl-modified">Modified Version </link>.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section5">
-    <title>5. COMBINING DOCUMENTS</title>
-    <para>
-      You may combine the <link linkend="fdl-document">Document</link>
-      with other documents released under this License, under the
-      terms defined in <link linkend="fdl-section4">section 4</link>
-      above for modified versions, provided that you include in the
-      combination all of the <link linkend="fdl-invariant">Invariant
-      Sections</link> of all of the original documents, unmodified,
-      and list them all as Invariant Sections of your combined work in
-      its license notice.
-    </para>
-    
-    <para>
-      The combined work need only contain one copy of this License,
-      and multiple identical <link linkend="fdl-invariant">Invariant
-      Sections</link> 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.
-    </para>
-    
-    <para>
-      In the combination, you must combine any sections entitled
-      <quote>History</quote> in the various original documents,
-      forming one section entitled <quote>History</quote>; likewise
-      combine any sections entitled <quote>Acknowledgements</quote>,
-      and any sections entitled <quote>Dedications</quote>.  You must
-      delete all sections entitled <quote>Endorsements.</quote>
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section6">
-    <title>6. COLLECTIONS OF DOCUMENTS</title>
-    <para>
-      You may make a collection consisting of the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-    
-    <para>
-      You may extract a single document from such a collection, and
-      dispbibute 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section7">
-    <title>7. AGGREGATION WITH INDEPENDENT WORKS</title>
-    <para>
-      A compilation of the <link
-      linkend="fdl-document">Document</link> 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 <link linkend="fdl-modified">Modified Version</link>
-      of the Document, provided no compilation copyright is claimed
-      for the compilation.  Such a compilation is called an
-      <quote>aggregate</quote>, 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 <link
-      linkend="fdl-cover-texts">Cover Text</link> requirement of <link
-      linkend="fdl-section3">section 3</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section8">
-    <title>8. TRANSLATION</title>
-    <para>
-      Translation is considered a kind of modification, so you may
-      distribute translations of the <link
-      linkend="fdl-document">Document</link> under the terms of <link
-      linkend="fdl-section4">section 4</link>. Replacing <link
-      linkend="fdl-invariant"> Invariant Sections</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section9">
-    <title>9. TERMINATION</title>
-    <para>
-      You may not copy, modify, sublicense, or distribute the <link
-      linkend="fdl-document">Document</link> 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.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section10">
-    <title>10. FUTURE REVISIONS OF THIS LICENSE</title>
-    <para>
-      The <ulink type="http"
-      url="http://www.gnu.org/fsf/fsf.html">Free Software
-      Foundation</ulink> 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 <ulink
-      type="http"
-      url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
-    </para>
-    
-    <para>
-      Each version of the License is given a distinguishing version
-      number. If the <link linkend="fdl-document">Document</link>
-      specifies that a particular numbered version of this License
-      <quote>or any later version</quote> 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.
-    </para>
-  </sect1>
-
-  <sect1 id="fdl-using">
-    <title>Addendum</title>
-    <para>
-      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:
-    </para>
-    
-    <blockquote>
-      <para>
-	Copyright &copy; YEAR YOUR NAME.
-      </para>
-      <para>
-	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 <link
-	linkend="fdl-invariant">Invariant Sections</link> being LIST
-	THEIR TITLES, with the <link
-	linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
-	and with the <link linkend="fdl-cover-texts">Back-Cover
-	Texts</link> being LIST.  A copy of the license is included in
-	the section entitled <quote>GNU Free Documentation
-	License</quote>.
-      </para>
-    </blockquote>
-      
-    <para>
-      If you have no <link linkend="fdl-invariant">Invariant
-      Sections</link>, write <quote>with no Invariant Sections</quote>
-      instead of saying which ones are invariant.  If you have no
-      <link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
-      <quote>no Front-Cover Texts</quote> instead of
-      <quote>Front-Cover Texts being LIST</quote>; likewise for <link
-      linkend="fdl-cover-texts">Back-Cover Texts</link>.
-    </para>
-    
-    <para>
-      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 <ulink type="http"
-      url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
-      License</ulink>, to permit their use in free software.
-    </para>
-  </sect1>
-</appendix>  
-
-
-
-
-
-
diff --git a/help/devel/importer/.cvsignore b/help/devel/importer/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/help/devel/importer/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/help/devel/importer/Makefile.am b/help/devel/importer/Makefile.am
deleted file mode 100644
index ef3b2b98ee..0000000000
--- a/help/devel/importer/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-# The name of the module.
-DOC_MODULE=evolution-shell-importer
-
-# The directory containing the source code
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/shell/importer
-
-CFLAGS ="						\
-	-I$(top_srcdir)/shell/importer			\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/shell/importer/.libs/libevolution-importer.a	\
-	"
-
-DOC_DIR=$(datadir)/gnome/html
-
-DOC_DIR_INSTALL_FILES =					\
-	evolution-shell-importer.args			\
-	evolution-shell-importer.hierarchy		\
-	evolution-shell-importer.signals		\
-	evolution-shell-importer.types			\
-	evolution-shell-importer-decl.txt		\
-	evolution-shell-importer-sections.txt
-
-SOURCE_FILES =								\
-	$(top_srcdir)/shell/importer/evolution-importer.c		\
-	$(top_srcdir)/shell/importer/evolution-importer.h		\
-	$(top_srcdir)/shell/importer/evolution-importer-client.c	\
-	$(top_srcdir)/shell/importer/evolution-importer-client.h
-
-IGNORED_HEADER_FILES =			\
-	GNOME_Evolution_Importer.h	\
-	importer.h
-
-scan_generated =						\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals			\
-	evolution-shell-importer.types
-
-tmpl_dependencies =						\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer-sections.txt			\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals
-
-tmpl_sources = 						\
-	tmpl/evolution-importer.sgml			\
-	tmpl/evolution-shell-importer-unused.sgml
-
-tmpl_generated =					\
-	evolution-shell-importer-unused.txt
-
-sgml_dependencies =					\
-	evolution-shell-importer-decl.txt		\
-	evolution-shell-importer-sections.txt		\
-	evolution-shell-importer.args			\
-	evolution-shell-importer.hierarchy		\
-	evolution-shell-importer.signals		\
-	tmpl/evolution-importer.sgml
-
-sgml_generated =					\
-	sgml/evolution-importer.sgml			\
-	sgml/evolution-shell-importer-doc.bottom	\
-	sgml/evolution-shell-importer-doc.top		\
-	sgml/object_index.sgml				\
-	sgml/tree_index.sgml
-
-EXTRA_DIST =							\
-	evolution-shell-importer.args				\
-	evolution-shell-importer.hierarchy			\
-	evolution-shell-importer.signals			\
-	evolution-shell-importer.types				\
-	evolution-shell-importer-decl.txt			\
-	evolution-shell-importer-sections.txt
-
-all: $(sgml_generated)
-
-if ENABLE_GTK_DOC
-scan $(scan_generated): $(SOURCE_FILES)
-	-(cd $(srcdir)						\
-	  && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS)		\
-		 gtkdoc-scanobj --module=$(DOC_MODULE)		\
-	  && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)		\
-			 --ignore-headers="$(IGNORED_HEADER_FILES)" )
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-else
-scan $(scan_generated): $(SOURCE_FILE)
-
-templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
-
-sgml $(sgml_generated): $(sgml_dependencies)
-endif
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
-	done
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY: scan templates sgml
diff --git a/help/devel/importer/evolution-shell-importer-sections.txt b/help/devel/importer/evolution-shell-importer-sections.txt
deleted file mode 100644
index e2474f6375..0000000000
--- a/help/devel/importer/evolution-shell-importer-sections.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-<INCLUDE>evolution-importer.h</INCLUDE>
-
-<SECTION>
-<FILE>evolution-importer</FILE>
-EVOLUTION_IMPORTER
-<TITLE>EvolutionImporter</TITLE>
-
-EvolutionImporterSupportFormatFn
-EvolutionImporterLoadFileFn
-EvolutionImporterProcessItemFn
-EvolutionImporterGetErrorFn
-
-EvolutionImporterResult
-
-evolution_importer_new
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER
-EVOLUTION_IMPORTER
-EVOLUTION_IS_IMPORTER
-EVOLUTION_IMPORTER_CLASS
-EVOLUTION_IS_IMPORTER_CLASS
-evolution_importer_get_type
-
-<SUBSECTION Private>
-EvolutionImporter
-EvolutionImporterPrivate
-
-</SECTION>
-
-<INCLUDE>evolution-importer-listener.h</INCLUDE>
-<SECTION>
-<FILE>evolution-importer-listener</FILE>
-EVOLUTION_IMPORTER_LISTENER
-<TITLE>EvolutionImporterListener</TITLE>
-
-EvolutionImporterListenerCallback
-
-evolution_importer_listener_new
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER_LISTENER
-EVOLUTION_IMPORTER_LISTENER
-EVOLUTION_IMPORTER_LISTENER_CLASS
-EVOLUTION_IS_IMPORTER_LISTENER
-EVOLUTION_IS_IMPORTER_LISTENER_CLASS
-evolution_importer_listener_get_type
-
-<SUBSECTION Private>
-EvolutionImporterListener
-EvolutionImporterListenerPrivate
-
-</SECTION>
-
-<INCLUDE>evolution-importer-client.h</INCLUDE>
-<SECTION>
-<FILE>evolution-importer-client</FILE>
-EVOLUTION_IMPORTER_CLIENT
-<TITLE>EvolutionImporterClient</TITLE>
-
-evolution_importer_client_new
-evolution_importer_client_new_from_id
-evolution_importer_client_support_format
-evolution_importer_client_load_file
-evolution_importer_client_process_item
-evolution_importer_client_get_error
-
-<SUBSECTION Standard>
-EVOLUTION_TYPE_IMPORTER_CLIENT
-EVOLUTION_IMPORTER_CLIENT
-EVOLUTION_IMPORTER_CLIENT_CLASS
-EVOLUTION_IS_IMPORTER_CLIENT
-EVOLUTION_IS_IMPORTER_CLIENT_CLASS
-evolution_importer_client_get_type
-
-<SUBSECTION Private>
-EvolutionImporterClient
-
-</SECTION>
diff --git a/help/devel/importer/evolution-shell-importer.args b/help/devel/importer/evolution-shell-importer.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/importer/evolution-shell-importer.args
+++ /dev/null
diff --git a/help/devel/importer/evolution-shell-importer.heirarchy b/help/devel/importer/evolution-shell-importer.heirarchy
deleted file mode 100644
index 78e430d311..0000000000
--- a/help/devel/importer/evolution-shell-importer.heirarchy
+++ /dev/null
@@ -1,5 +0,0 @@
-GtkObject
-  BonoboObject
-    EvolutionImporter
-  BonoboObjectClient
-    EvolutionImporterClient
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index 5f1b55c709..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,14 +0,0 @@
-GtkObject
-  GtkWidget
-    GtkRange
-      GtkScale
-    GtkContainer
-      GtkBin
-        GtkButton
-          GtkToggleButton
-            GtkCheckButton
-  BonoboObject
-    EvolutionImporter
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
-    EvolutionImporterListener
diff --git a/help/devel/importer/evolution-shell-importer.types b/help/devel/importer/evolution-shell-importer.types
deleted file mode 100644
index 9dcdf5f0f1..0000000000
--- a/help/devel/importer/evolution-shell-importer.types
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <gnome.h>
-#include <bonobo.h>
-#include <evolution/importer/evolution-importer.h>
-#include <evolution/importer/evolution-importer-client.h>
-#include <evolution/importer/evolution-importer-listener.h>
-
-evolution_importer_get_type
-evolution_importer_client_get_type
-evolution_importer_listener_get_type
diff --git a/help/devel/importer/private-reference.sgml b/help/devel/importer/private-reference.sgml
deleted file mode 100644
index d28c7b8591..0000000000
--- a/help/devel/importer/private-reference.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
-  <reference id="importer-private-reference">
-    <title>Importer Private API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	private APIs of the different components of the &Evolution;
-	Import Framework.
-      </para>
-    </partintro>
-
-    &EvolutionImporterListener;
-    &EvolutionImporterClient;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/importer/public-reference.sgml b/help/devel/importer/public-reference.sgml
deleted file mode 100644
index ba99c9b309..0000000000
--- a/help/devel/importer/public-reference.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-  <reference id="importer-public-reference">
-    <title>Importer Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the &Evolution;
-	Import Framework.
-      </para>
-    </partintro>
-
-    &EvolutionImporter;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/importer/tmpl/evolution-importer-client.sgml b/help/devel/importer/tmpl/evolution-importer-client.sgml
deleted file mode 100644
index 8122e4fb2d..0000000000
--- a/help/devel/importer/tmpl/evolution-importer-client.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EvolutionImporterClient
-
-<!-- ##### SECTION Short_Description ##### -->
-A #GtkObject based client to simplify use of a GNOME_Evolution_Importer object.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-This #GtkObject provides a convience wrapper to the GNOME_Evolution_Importer object, providing error checking and hiding all the CORBA internals from the user.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EVOLUTION_IMPORTER_CLIENT ##### -->
-<para>
-Casts a #GtkObject into an #EvolutionImporterClient
-</para>
-
-@obj: A #GtkObject
-
-
-<!-- ##### FUNCTION evolution_importer_client_new ##### -->
-<para>
-
-</para>
-
-@objref: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_new_from_id ##### -->
-<para>
-
-</para>
-
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_support_format ##### -->
-<para>
-
-</para>
-
-@client: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_load_file ##### -->
-<para>
-
-</para>
-
-@client: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_process_item ##### -->
-<para>
-
-</para>
-
-@client: 
-@listener: 
-<!-- # Unused Parameters # -->
-@callback: 
-@closure: 
-
-
-<!-- ##### FUNCTION evolution_importer_client_get_error ##### -->
-<para>
-
-</para>
-
-@client: 
-@Returns: 
-
-
diff --git a/help/devel/importer/tmpl/evolution-importer.sgml b/help/devel/importer/tmpl/evolution-importer.sgml
deleted file mode 100644
index 8d8351aed2..0000000000
--- a/help/devel/importer/tmpl/evolution-importer.sgml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EvolutionImporter
-
-<!-- ##### SECTION Short_Description ##### -->
-A #BonoboObject that implements the GNOME/Evolution/Importer interface.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #BonoboObject wrapper around the GNOME/Evolution/Importer interface, providing error checking and reference counting, hiding the CORBA internals from the user and providing a simple way to create a GNOME_Evolution_Importer object.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO EVOLUTION_IMPORTER ##### -->
-<para>
-Casts a #GtkObject into an #EvolutionImporter.
-</para>
-
-@obj: A #GtkObject.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterSupportFormatFn ##### -->
-<para>
-The type of function that is called when the importer wishes to find out if the importing component can support the file given in @filename.
-</para>
-
-@importer: The #EvolutionImporter.
-@filename: The filename of the file to check.
-@closure: The data passed into evolution_importer_new ().
-@Returns: A #gboolean. TRUE if the importing component can import the file, FALSE otherwise.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterLoadFileFn ##### -->
-<para>
-The type of function that is called when the importer wishes the importing component to load the file given in @filename, and initialise itself.
-</para>
-
-@importer: The #EvolutionImporter.
-@filename: The filename of the file to load.
-@closure: The data passed into evolution_importer_new ().
-@Returns: A #gboolean. TRUE if the load and initialisation was successful, FALSE otherwise.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterProcessItemFn ##### -->
-<para>
-The type of function that is called when the importer wants the importing component to process the next item (or items) in a file.
-</para>
-
-@importer: The #EvolutionImporter
-@listener: A GNOME_Evolution_Importer_Listener CORBA object.
-@closure: The data passed into evolution_importer_new ().
-@ev: A #CORBA_Environment for returning any CORBA exceptions.
-
-
-<!-- ##### USER_FUNCTION EvolutionImporterGetErrorFn ##### -->
-<para>
-The type of function that is called when the importer wants to get a string version of an error. Not all importing components support this function.
-</para>
-
-@importer: The #EvolutionImporter.
-@closure: The data passed to evolution_importer_new ().
-@Returns: A string representation of the error, or NULL if there was no error, or the importing component does not support the getError method.
-
-
-<!-- ##### ENUM EvolutionImporterResult ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION evolution_importer_new ##### -->
-<para>
-
-</para>
-
-@support_format_fn: 
-@load_file_fn: 
-@process_item_fn: 
-@get_error_fn: 
-@closure: 
-@Returns: 
-
-
diff --git a/help/devel/importer/tmpl/evolution-shell-importer-unused.sgml b/help/devel/importer/tmpl/evolution-shell-importer-unused.sgml
deleted file mode 100644
index 7a9a98034b..0000000000
--- a/help/devel/importer/tmpl/evolution-shell-importer-unused.sgml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- ##### USER_FUNCTION EvolutionImporterClientCallback ##### -->
-<para>
-
-</para>
-
-@client: 
-@result: 
-@more_items: 
-@data: 
-
diff --git a/help/devel/preface.sgml b/help/devel/preface.sgml
deleted file mode 100644
index fdaa824a8b..0000000000
--- a/help/devel/preface.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-  <preface id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      This is the &Evolution; Developer's Guide or programming guide
-      for the &Evolution; groupware suite.  If you are a programmer
-      and you wish to use &Evolution;'s functionality from your own
-      applications or if you wish to modify the &Evolution; core code,
-      you should read this guide.
-    </para>
-
-    <para>
-      If you are an end-user of &Evolution; you do not need to read
-      this guide; please read the &Evolution; User's Guide instead.
-    </para>
-
-    <para>
-      This guide contains the information you need to know to do the
-      following:
-
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Write applications that use &Evolution;'s data
-	    repositories via the &Wombat; personal information server.
-	    Examples of this would be a <application>GNOME
-	    Panel</application> applet that displays today's
-	    appointments, or a telephone dialer application that uses
-	    the contents of the &Evolution; Addressbook.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write applications that use the &Camel; mail library.
-	    This includes extending &Evolution;'s own mail component
-	    to perform additional functions.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write new components for the &Evolution; Shell.  Instead
-	    of writing a stand-alone application, you can provide your
-	    users with the benefit of having integrated views of their
-	    data from within Evolution.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Write new modules for the &Evolution; Executive Summary.
-	    This allows you to present commonly-accessed information
-	    in a convenient fashion directly in the &Evolution; Shell.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Modify the core &Evolution; code to add new features or
-	    change its architecture.
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-
-    <sect1 id="organization">
-      <title>Organization of this Guide</title>
-
-      <para>
-	This guide is organized in two big sections.  The first is a
-	programming guide, which consists of one part for each one of
-	&Evolution;'s components:  there are separate parts for the
-	calendar, the addressbook, the mailer, the executive summary,
-	and the shell.  Each part gives a description of the
-	architecture of its corresponding component, and also gives
-	information about the component's internal architecture and
-	some implementation details.
-      </para>
-
-      <para>
-	The second section of this guide is a reference guide for
-	&Evolution;'s programming interfaces.  We have separated these
-	into public and private interfaces.  The public ones are those
-	that most people will need to use when writing extensions or
-	third-party components; the private interfaces are those used
-	internally in &Evolution;.  Even if you do not intend to
-	modify the &Evolution; core code, it may be useful to know a
-	bit about the way it is organized internally.
-      </para>
-
-      <para>
-	&Evolution; is free software, and we want you as a programmer
-	to make the most of it.  We have provided many useful
-	interfaces that you can use in your own applications.  Still,
-	we want you to view &Evolution; as a framework for building
-	groupware applications, and this may occasionally involve
-	making changes to its core code.  We want you to learn from
-	&Evolution;'s design because we think it marks an important
-	milestone in the development of large-scale free software
-	applications.  We want you to modify it as you see fit.  Free
-	software gives you this freedom, and we want the whole world
-	to benefit from it.
-      </para>
-    </sect1>
-  </preface>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/help/devel/reference.sgml b/help/devel/reference.sgml
deleted file mode 100644
index b0c81de77f..0000000000
--- a/help/devel/reference.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-  <part id="evolution-api-reference">
-    <title>&Evolution; API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	different libraries and interfaces that &Evolution; provides.
-	Classes are described together with their methods; individual
-	functions are grouped by functional group.
-      </para>
-
-      <para>
-	&Evolution; provides two kinds of interfaces, public and
-	private.  The public interfaces are those designed to be used
-	from third-party applications or components; if you wanted to
-	write an application that uses &Evolution;'s data repositories
-	to display data in a particular way, you would use the public
-	interfaces.  The private interfaces are those used inside
-	&Evolution; itself; these are generally not interesting unless
-	you intend to make modifications to the &Evolution; code base.
-      </para>
-
-      <para>
-	While the public and private interfaces are described in
-	separate reference sections, we have decided to put them
-	together in the same book, this guide, because we want to
-	encourage you to regard &Evolution; as something more than a
-	black box that stores and dispatches personal information.  We
-	want you to make modifications to the &Evolution; core if
-	these would allow you to present or store your data in better
-	ways.  &Evolution; is free software; we want you to learn from
-	its design and implementation details so that you can make it
-	even better for the whole world to use.
-      </para>
-    </partintro>
-
-    &calendar-public-reference;
-    &importer-public-reference;
-    &evolution-services-public-reference;
-    &importer-private-reference;
-    &evolution-services-private-reference;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/help/white-papers/calendar/calendar.sgml b/help/white-papers/calendar/calendar.sgml
deleted file mode 100644
index 2cb3132e2b..0000000000
--- a/help/white-papers/calendar/calendar.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity CUA "<acronym>CUA</acronym>">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity Bonobo "<application>Bonobo</application>">
-<!entity CORBA "<acronym>CORBA</acronym>">
-<!entity GTK "<acronym>GTK+</acronym>">
-]>
-
-<article class="whitepaper" id="calendar">
-
-  <artheader>
-    <title>&Evolution; Calendaring Framework</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Federico</firstname>
-	<surname>Mena Quintero</surname>
-	<affiliation>
-	  <address>
-	    <email>federico@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <abstract>
-      <para>
-	The &Evolution; groupware suite provides a framework for
-	developing calendaring applications, as well as a graphical
-	calendar client and a personal calendar server.  This white
-	paper describes the architecture of the &Evolution;
-	calendaring framework.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Introduction -->
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      Calendaring is an important part of a groupware suite.  A
-      calendaring framework will allow a user to keep a personal
-      calendar and have several applications use it.  Such
-      applications could be a graphical calendar client that the user
-      employs to schedule appointments and keep track of his time, a
-      <productname>Palm Pilot</productname> synchronization client, or
-      a simple alarm or reminder utility.  A comprehensive calendaring
-      framework will also allow multiple users to schedule
-      appointments between each other; for example, a project director
-      may want to schedule a weekly meeting with the rest of the
-      project members, or a person who owns a large house may want to
-      schedule a big party with his friends.  The attendees will then
-      want to reply with messages such as, &ldquo;I will
-      attend&rdquo;, or &ldquo;I will attend only if the proposed time
-      is changed&rdquo;.
-    </para>
-
-    <para>
-      The &Evolution; groupware suite provides a framework for
-      developing calendaring applications, as well as a graphical
-      calendar client or calendar user agent (&CUA;) and a personal
-      calendar server (&PCS;).
-    </para>
-
-    <para>
-      The following sections explain the basic calendaring framework,
-      the functions of the calendar user agent and the personal
-      calendar server, and the relationship between the two.
-    </para>
-  </sect1>
-
-  <!-- Personal Calendar Server -->
-
-  <sect1 id="pcs">
-    <title>Personal Calendar Server</title>
-
-    <para>
-      The personal calendar server (&PCS;) provides centralized
-      management and storage of a user's personal calendar.  Multiple
-      clients can connect to the &PCS; simultaneously to query and
-      modify the user's calendar in a synchronized fashion.  The main
-      features of the &PCS; are as follows:
-    </para>
-
-    <formalpara>
-      <title>Storage</title>
-
-      <para>
-	The &PCS; is responsible for loading and saving calendars.
-	Centralizing the loading and saving functionality allows
-	multiple clients to use the same calendar at the same time
-	without having to worry about each other.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Basic Queries</title>
-
-      <para>
-	The &PCS; provides functions to do basic queries on a
-	calendar, for example, a client can ask the server for a list
-	of all the appointments in the calendar, or for all the data
-	for a specific appointment.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Recurrence and Alarm Queries</title>
-
-      <para>
-	Clients can ask the &PCS; for a list of the appointments that
-	occur within a specified time range; for example a graphical
-	client that has a per-week view could ask the &PCS; for all
-	the appointments that occur in a particular week.  This
-	includes multiple occurrences of a single recurring event; for
-	example, the object for &ldquo;a 1-hour meeting that occurs on
-	every Tuesday and Thursday&rdquo; is represented inside the
-	&PCS; as a single event with a recurrence rule.  Similarly,
-	clients can ask the &PCS; for a list of events that have
-	alarms that trigger within a specified time range.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Notification of Changes</title>
-
-      <para>
-	This is the most important function of the &PCS;, as it allows
-	multiple calendar clients to maintain a unified view of the
-	calendar between the server and themselves.  When a client
-	asks the &PCS; to modify or remove an event, the &PCS;
-	notifies all the clients that are connected to it about the
-	change.  The policy is that &ldquo;the server is always
-	right&rdquo;; clients can act as dumb views onto the
-	calendar's data and they will be notified by the &PCS; when
-	something changes.
-      </para>
-    </formalpara>
-  </sect1>
-
-  <!-- Calenar User Agent -->
-
-  <sect1 id="cua">
-    <title>Calendar User Agent</title>
-
-    <para>
-      A calendar user agent (&CUA;) is a program that lets a user
-      manipulate a calendar.  &Evolution; provides an attractive,
-      graphical calendar client that communicates with the &Evolution;
-      personal calendar server.
-    </para>
-
-    <para>
-      The &Evolution; calendar client just provides a view onto the
-      data that is stored and managed by the personal calendar server.
-      The calendar client does not perform direct manipulations on a
-      calendar's data; instead it offloads those requests to the
-      calendar server, which takes care of making the appropriate
-      modifications in the calendar and then notifies all the clients
-      about the changes.
-    </para>
-  </sect1>
-
-  <!-- Calendar Client Library -->
-
-  <sect1 id="client-lib">
-    <title>Calendar Client Library</title>
-
-    <para>
-      Communication between the personal calendar server and calendar
-      clients is defined by a set of &Bonobo; &CORBA; interfaces.
-      Clients can be written by implementing the client-side
-      <classname>Listener</classname> interface, which defines the
-      notification callbacks that the PCS uses to inform clients about
-      changes to the calendar.
-    </para>
-
-    <para>
-      As a convenience for &GTK; programmers, &Evolution; also
-      includes a library which provides a
-      <classname>CalClient</classname> class which can be used for
-      communication with the personal calendar server.  Objects of
-      this class automatically contact the PCS when they are created.
-      <classname>CalClient</classname> provides functions to request
-      changes in the calendar, and it also emits signals when it gets
-      notification about changes from the PCS.  This makes it easy and
-      convenient to write calendar clients for &Evolution; using
-      &GTK;.
-    </para>
-
-    <para>
-      The implementation of the <classname>CalClient</classname> class
-      simply wraps the &Evolution; &CORBA; interfaces for calendaring
-      with a familiar-looking &GTK; object.  Calls to the
-      <classname>Listener</classname> interface get translated to
-      signal emissions from the <classname>CalClient</classname>, thus
-      shielding programmers from the details of the &CORBA;
-      interfaces.
-    </para>
-  </sect1>
-</article>
diff --git a/help/white-papers/mail/camel.sgml b/help/white-papers/mail/camel.sgml
deleted file mode 100644
index a339909f54..0000000000
--- a/help/white-papers/mail/camel.sgml
+++ /dev/null
@@ -1,339 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-]>
-
-<article class="whitepaper" id="camel">
-
-  <artheader>
-    <title>The &Camel; Messaging Library</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-
-      <author>
-	<firstname>Bertrand</firstname>
-	<surname>Guiheneuf</surname>
-	<affiliation>
-	  <address>
-	    <email>bertrand@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Camel; is a generic messaging library. It is being used as the
-      back end for the mail component of &Evolution;. The name
-      "&Camel;" is an acronym; it refers to the fact that the
-      library is capable of going several days without food or water.
-      It means : Camel's Acronym Makes Everyone Laugh.
-    </para>
-
-    <para>
-      &Camel;'s initial design is heavily based on Sun's
-      <trademark>JavaMail</trademark> API. It uses the Gtk+ object
-      system, and many of its classes are direct analags of JavaMail
-      classes. Its design has also been influenced by the features of
-      IMAP, and the limitations of the standard UNIX mbox mail store,
-      which set some of the boundaries on its requirements and
-      extensibility.
-    </para>
-
-    <para>
-      &Camel; sees all message repositories as stores containing
-      folders. These folders in turn contain the messages the client
-      actually accesses. The use of such a unified interface allows
-      the client applications to be very extensible. &Camel; includes
-      an external provider mechanism which allows applications to
-      dynamically load and use protocols which were not available when
-      the application was initially written.
-    </para>
-
-    <para>
-      The abstract store/folder mechanism is a powerful and versatile
-      way of accessing messages. No particular asumptions are made on
-      the client side, thus allowing new ways of managing the
-      messages. For example, the messages stored in the folders don't
-      necessarily have to share some common physical location. The
-      folder can be a purely virtual folder, containing only
-      references to the actual messages. This is used by the "vFolder"
-      provider, which allows you select messages meeting particular
-      criteria and deal with them as a group.
-    </para>
-
-    <para>
-      In addition to these possibilities, &Camel; has full MIME
-      support. &Camel; MIME messages are lightweight objects
-      representing the MIME skeleton of the actual message. The data
-      contained in the subparts are never stored in memory except when
-      they are actually needed. The application, when accessing the
-      various MIME objects contained in the message (text parts,
-      attachments, embedded binary objects ...) asks &Camel; for a
-      stream that it can read data from. This scheme is particularly
-      useful with the IMAP provider. IMAP has strong MIME support
-      built-in, which allows &Camel; to download only the parts of
-      messages that it actually needs: attachments need not be
-      downloaded until they are viewed, and unnecessary
-      "multipart/alternative" parts will never be read off the server.
-    </para>
-  </sect1>
-
-  <sect1 id="overview">
-    <title>Overview</title>
-
-    <graphic format="gif" fileref="camel"></graphic>
-
-    <para>
-      To begin using &Camel;, an application first creates a
-      <classname>CamelSession</classname> object. This object is used
-      to store application defaults, and to coordinate communication
-      between providers and the application.
-    </para>
-
-    <para>
-      A <classname>CamelProvider</classname> is a dynamically-loadable
-      module that provides functionality associated with a specific
-      service. Examples of providers are IMAP and SMTP. Providers
-      include subclasses of the various other &Camel; classes for
-      accessing and manipulating messages.
-    </para>
-
-    <para>
-      <classname>CamelService</classname> is an abstract class for
-      describing a connection to a local or remote service. It
-      currently has two subclasses: <classname>CamelStore</classname>,
-      for services that store messages (such as IMAP servers and mbox
-      files), and <classname>CamelTransport</classname>, for services
-      that deliver messages (such as SMTP, or a local MTA). A provider
-      could also be both a store and a transport, as in the case of
-      NNTP.
-    </para>
-
-    <para>
-      A <classname>CamelStore</classname> contains some number of
-      <classname>CamelFolder</classname> objects, which in turn
-      contain messages. A <classname>CamelFolder</classname> provides
-      a <classname>CamelFolderSummary</classname> object, which
-      includes details about the subject, date, and sender of each
-      message in the folder. The folder also includes the messages
-      themselves, as subclasses of <classname>CamelMedium</classname>.
-    </para>
-
-    <para>
-      Email messages are represented by the
-      <classname>CamelMimeMessage</classname> class, a subclass of
-      <classname>CamelMedium</classname>. This class includes
-      operations for accessing RFC822 and MIME headers, accessing
-      subparts of MIME messages, encoding and decoding Base64 and
-      Quoted-Printable, etc.
-    </para>
-
-    <para>
-      <classname>CamelTransport</classname> includes methods for
-      delivering messages. While the abstract
-      <function>CamelTransport::send</function> method takes a
-      <classname>CamelMedium</classname>, its subclasses may only be
-      able to deliver messages of specific
-      <classname>CamelMedium</classname> subclasses. For instance,
-      <classname>CamelSendmailTransport</classname> requires a
-      <classname>CamelMimeMessage</classname>, because it needs a
-      message that includes a "To:" header. A hypothetical
-      <classname>CamelNNTPTransport</classname> would need a
-      <classname>CamelNewsMessage</classname>, which would have a
-      "Newsgroups:" header.
-    </para>
-
-    <para>
-      The content of messages are referred to using
-      <classname>CamelStream</classname> and its subclasses. In the
-      case of an mbox-based store, the
-      <classname>CamelStream</classname> would abstract the operation
-      of reading the correct section of the mbox file. For IMAP,
-      reading off the <classname>CamelStream</classname> might result
-      in commands being issued to the remote IMAP server and data
-      being read off a socket.
-    </para>
-
-    <para>
-      The final major class in &Camel; is
-      <classname>CamelException</classname>, which is used to
-      propagate information about errors. Many methods take a
-      <classname>CamelException</classname> as an argument, which the
-      caller can then check if an error occurs. It includes both a
-      numeric error code which can be interpreted by the program, and
-      a text error message that can be displayed to the user.
-    </para>
-  </sect1>
-
-  <sect1 id="classes">
-    <title>Major Subcomponents</title>
-
-    <sect2 id="store">
-      <title>The Message Store</title>
-
-      <para>
-        A <classname>CamelStore</classname> inherits the ability to
-        connect and authenticate to a service from its parent class,
-        <classname>CamelService</classname>. It then adds the ability
-        to retrieve folders. A store must contain at least one folder,
-        which can be retrieved with
-        <function>CamelStore::get_default_folder</function>. There are
-        also methods to retrieve the "top-level" folder (for
-        hieararchical stores), and to retrieve an arbitrary folder by
-        name.
-      </para>
-
-      <para>
-        All <classname>CamelFolder</classname>s must implement certain
-        core operations, most notably generating a summary and
-        retrieving and deleting messages. A
-        <classname>CamelFolder</classname> must assign a permanently
-        unique identifier to each message it contains. Messages can
-        then be retrieved via
-        <function>CamelFolder::get_message_by_uid</function>. Alternately,
-        within a single mail-reading session, messages can be referred
-        to by their linear position within the store using
-        <function>CamelFolder::get_message_by_number</function>.
-      </para>
-
-      <para>
-        Folders must also implement the
-        <function>get_parent_folder</function> and
-        <function>list_subfolders</function> methods. For stores that
-        don't allow multiple folders, they would return NULL and an
-        empty list, respectively. Stores that do allow multiple
-        folders will also define methods for creating and deleting
-        folders, and for moving messages between them (assuming the
-        folders are writable).
-      </para>
-
-      <para>
-        Folders that support searching can define the
-        <function>search_by_expression</function> method. For mbox
-        folders, this is implemented by indexing the messages with the
-        ibex library and using that to search them later. For IMAP
-        folders, this uses the IMAP SEARCH command. Other folder types
-        might not be able to implement this functionality, in which
-        case users would not be able to do full-content searches on
-        them.
-      </para>
-    </sect2>
-
-    <sect2 id="messages">
-      <title>Messages</title>
-
-      <para>
-        As mentioned before, messages are represented by subclasses of
-        <classname>CamelMedium</classname>.
-        <classname>CamelMedium</classname> itself is a subclass of
-        <classname>CamelDataWrapper</classname>, a generic class for
-        connecting a typed data source to a data sink.
-        <classname>CamelMedium</classname> adds the concept of message
-        headers versus message body.
-        (<classname>CamelDataWrapper</classname> has one other
-        important subclass, <classname>CamelMultipart</classname>,
-        which is used to provide separate access to the multiple
-        independent parts of a multipart MIME type.)
-        <classname>CamelMedium</classname>'s subclasses provide more
-        specialized handling of various headers:
-        <classname>CamelMimePart</classname> adds special handling for
-        the &ldquot;Content-*&rdquot; headers in MIME messages, and
-        its subclass <classname>CamelMimeMessage</classname> adds
-        handling for the RFC822 headers.
-      </para>
-
-      <graphic format="gif" fileref="mimemessage"></graphic>
-
-      <para>
-        Consider a message with two parts: a text part (in both plain
-        text and HTML), and an attached image:
-
-	<programlisting>
-
-	  From: Dan Winship &lt;danw@helixcode.com&gt;
-	  To: Matt Loper &lt;matt@helixcode.com&gt;
-	  Subject: the Camel white paper
-	  MIME-Version: 1.0
-	  Content-Type: multipart/mixed;
-		boundary="jhTYrnsRrdhDFGa"
-
-	  This is a multi-part message in MIME format.
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: multipart/alternative;
-		boundary="sFSenbAFDSgDfg"
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/plain
-
-	  Hey, Matt
-
-	  Check out this graphic...
-
-	  -- Dan
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/html
-
-	  Hey, Matt&lt;br&gt;
-	  &lt;br&gt;
-	  Check out this graphic...&lt;br&gt;
-	  &lt;br&gt;
-	  -- Dan&lt;br&gt;
-	  &lt;br&gt;
-	  --sFSenbAFDSgDfg--
-
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: image/png
-	  Content-Transfer-Encoding: base64
-
-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...
-	  --jhTYrnsRrdhDFGa--
-	</programlisting>
-
-	<para>
-	  In &Camel;, this would be represented as follows:
-	</para>
-
-        <graphic fileref="samplemsg"></graphic>
-      </sect2>
-
-      <sect2 id="streams">
-        <title>Streams</title>
-
-	<para>
-	  Streams are a generic data transport layer. Two basic stream
-	  classes are <classname>CamelStreamFs</classname>, for
-	  reading and writing files, and
-	  <classname>CamelStreamMem</classname>, for reading from and
-	  writing to objects that are already in memory.
-	</para>
-
-	<para>
-	  Streams can also be chained together. So a CamelMimePart
-	  containing base64-encoded data can filter its output through
-	  a CamelStreamB64. Other parts of the application that want
-	  to read its data will never need to even realize that the
-	  original data was encoded.
-	</para>
-      </sect2>
-
-</article>
diff --git a/help/white-papers/mail/ibex.sgml b/help/white-papers/mail/ibex.sgml
deleted file mode 100644
index dcb8f5ca4b..0000000000
--- a/help/white-papers/mail/ibex.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-<!entity Ibex "Ibex">
-]>
-
-<article class="whitepaper" id="ibex">
-
-  <artheader>
-    <title>Ibex: an Indexing System</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Ibex; is a library for text indexing. It is being used by
-      &Camel; to allow it to quickly search locally-stored messages,
-      either because the user is looking for a specific piece of text,
-      or because the application is contructing a vFolder or filtering
-      incoming mail.
-    </para>
-  </sect1>
-
-  <sect1 id="goals">
-    <title>Design Goals and Requirements for Ibex</title>
-
-    <para>
-      The design of &Ibex; is based on a number of requirements.
-
-    <itemizedlist>
-      <listitem>
-        <para>
-	  First, obviously, it must be fast. In particular, searching
-	  the index must be appreciably faster than searching through
-	  the messages themselves, and constructing and maintaining
-	  the index must not take a noticeable amount of time.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexes must not take up too much space. Many users have
-	  limited filesystem quotas on the systems where they read
-	  their mail, and even users who read mail on private machines
-	  have to worry about running out of space on their disks. The
-	  indexes should be able to do their job without taking up so
-	  much space that the user decides he would be better off
-	  without them.
-	</para>
-
-	<para>
-	  Another aspect of this problem is that the system as a whole
-	  must be clever about what it does and does not index:
-	  accidentally indexing a "text" mail message containing
-	  uuencoded, BinHexed, or PGP-encrypted data will drastically
-	  affect the size of the index file. Either the caller or the
-	  indexer itself has to avoid trying to index these sorts of
-	  things.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexing system must allow data to be added to the index
-	  incrementally, so that new messages can be added to the
-	  index (and deleted messages can be removed from it) without
-	  having to re-scan all existing messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must allow the calling application to explain the
-	  structure of the data however it wants to, rather than
-	  requiring that the unit of indexing be individual files.
-	  This way, &Camel; can index a single mbox-format file and
-	  treat it as multiple messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must support non-ASCII text, given that many people send
-	  and receive non-English email, and even people who only
-	  speak English may receive email from people whose names
-	  cannot be written in the US-ASCII character set.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      While there are a number of existing indexing systems, none of
-      them met all (or even most) of our requirements.
-    </para>
-  </sect1>
-
-  <sect1 id="implementation">
-    <title>The Implementation</title>
-
-    <para>
-      &Ibex; is still young, and many of the details of the current
-      implementation are not yet finalized.
-    </para>
-
-    <para>
-      With the current index file format, 13 megabytes of Info files
-      can be indexed into a 371 kilobyte index file&mdash;a bit under
-      3% of the original size. This is reasonable, but making it
-      smaller would be nice. (The file format includes some simple
-      compression, but <application>gzip</application> can compress an
-      index file to about half its size, so we can clearly do better.)
-    </para>
-
-    <para>
-      The implementation has been profiled and optimized for speed to
-      some degree. But, it has so far only been run on a 500MHz
-      Pentium III system with very fast disks, so we have no solid
-      benchmarks.
-    </para>
-
-    <para>
-      Further optimization (of both the file format and the in-memory
-      data structures) awaits seeing how the library is most easily
-      used by &Evolution;: if the indexes are likely to be kept in
-      memory for long periods of time, the in-memory data structures
-      need to be kept small, but the reading and writing operations
-      can be slow. On the other hand, if the indexes will only be
-      opened when they are needed, reading and writing must be fast,
-      and memory usage is less critical.
-    </para>
-
-    <para>
-      Of course, to be useful for other applications that have
-      indexing needs, the library should provide several options, so
-      that each application can use the library in the way that is
-      most suited for its needs.
-    </para>
-  </sect1>
-</article>
diff --git a/help/white-papers/widgets/e-table.sgml b/help/white-papers/widgets/e-table.sgml
deleted file mode 100644
index 5ff4faf2ae..0000000000
--- a/help/white-papers/widgets/e-table.sgml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity ETable "<classname>ETable</classname>">
-<!entity ETableModel "<classname>ETableModel</classname>">
-<!entity ETableSimple "<classname>ETableSimple</classname>">
-<!entity ETableHeader "<classname>ETableHeader</classname>">
-<!entity ETableSpecification "<classname>ETableSpecification</classname>">
-<!entity ETableCol "<classname>ETableCol</classname>">
-]>
-
-<article class="whitepaper" id="e-table">
-
-  <artheader>
-    <title>The ETable Widget</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Chris</firstname>
-	<surname>Lahey</surname>
-	<affiliation>
-	  <address>
-	    <email>clahey@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Miguel</firstname>
-	<surname>de Icaza</surname>
-	<affiliation>
-	  <address>
-	    <email>miguel@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &ETable; is a table widget on steroids. It is intended to provide
-      all the table functionality needed throughout &Evolution;, and
-      hopefully be general purpose enough to be used in other projects.
-    </para>
-
-    <para>
-      &ETable; provides a lot of interactive control over the data in the
-      table.  Without any work from the programmer, &ETable; provides
-      rearrangeable columns and editable data.  When finished, &ETable; will
-      also provide, again with no programmer intervention, easy interactive
-      sorting and grouping.  
-    </para>
-
-    <para>
-      &ETable; gives you a great deal of functionality, flexibility, and
-      power. Most of this power is internal to the widget, but some of
-      the flexibility requires a bit of work by the programmer.
-      However, once you learn it, &ETable; is not very hard at all to
-      use.
-    </para>
-
-    <para>
-      &ETable;'s power comes from the fact that it is fully
-      model/view/controller based.  Various models are involved into
-      the process of rendering the information, and various views are
-      provided.  The programmer has a wide range of options: from the
-      most finely hand-tuned table to a generic all-encompasing widget
-      that takes over most of tasks.  It is up to the programmer: he
-      can use the simple to use &ETable; widget that takes care of
-      everything in a generic way, or he can use the various
-      components to roll his own tabular display.
-    </para>
-
-    <para>
-      &ETable; ships with a standard set of information renderers:
-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line
-      strings.  But the programmer can write and implement his own
-      renderer for his information.  This means that by default
-      &ETable; provides the basic display facilities that programmers
-      required, but they offer the programmer a complete freedom to
-      incorporate new cell renderers.
-    </para>
-    
-  </sect1>
-
-  <sect1 id="model">
-    <title>ETableModel</title>
-
-    <para>
-      The data back end for the &ETable; is an &ETableModel;. The
-      &ETableModel is an abstract interface that acts as the
-      information repository for the various &ETable components.
-    </para>
-    
-    <para>
-      To use &ETable; you have to create a subclass of the abstract
-      &ETableModel; class.  However, to save you the work of defining
-      a new <classname>GtkClass</classname> every time you use
-      &ETable, there is a predefined subclass of &ETableModel; called
-      &ETableSimple; which simply takes a list of function callbacks
-      to perform the various operations.
-    </para>
-
-  </sect1>
-    
-  <sect1 id="columns">
-    <title>Columns</title>
-
-    <para>
-      There are two different meanings to the word "column". The first
-      is the model column (defined by the &ETableCol: object). A model
-      column describes how it maps to the column in the &ETableModel;
-      as well as containing information about its properties (name,
-      resizability, resize dimensions, and a renderer for this
-      specific columns). 
-    </para>
-
-    <para>
-      &ETable; distinguishes between a model column index, and a view
-      column index.  The former reflects the column in which the data
-      is stored in the &ETableModel;  The later represents the actual
-      location at which the column is being displayed in the screen.
-    </para>
-
-    <para>
-      Each view column index corresponds to a specific model column,
-      though a model column may have any number of view columns
-      associated with it (including zero).  For example the same
-      column might be rendered twice, or the data from one column
-      could be used to display different bits of information
-    </para>
-
-    <para>
-      The view column does not necessarily depend on only one model
-      column. In some cases, the view column renderer can be given a
-      reference to another model column to get extra information about
-      its display. For example, a mail program could display deleted
-      messages with a line through them by creating a model column
-      with no corresponding view column that told whether or not the
-      message is deleted, and then having the text column
-      strikethrough the display if the invisible column had a value
-      corresponding to "deleted".
-    </para>
-
-    <para>
-      The view column also specifies a few other pieces of
-      information. One piece of information is the renderer. &ETable;
-      provides a number of renderers to choose from, or you can write
-      your own. Currently, there are renderers for text, image sets,
-      and checkboxes.
-    </para>
-
-    <para>
-      The view column also includes information about the header.
-      There are two types of headers: text, and pixbuf. The first
-      allows you to specify a string which is rendered in the header.
-      The second allows you to specify an image to copy into the
-      header.
-    </para>
-  </sect1>
-
-  <sect1 id="header">
-    <title>Header</title>
-
-    <para>
-      The &ETableHeader; represents the header information for the
-      table. The &ETableHeader; is used in two different ways. The
-      first is the in the <structfield>full_header</structfield>
-      element of an &ETable;. This is the list of possible columns in
-      the view. You add each of your columns to this &ETableHeader;
-      and then pass it into the &ETable;.
-    </para>
-
-    <para>
-      The second use is completely internal. &ETable; uses another
-      &ETableHeader; to store the actual displayed columns. Many of
-      the &ETableHeader; functions are for this purpose. The only
-      functions that users of the library should need to use are
-      <function>e_table_header_new</function> and
-      <function>e_table_header_add_col</function>.
-    </para>
-  </sect1>
-
-  <sect1 id="layout">
-    <title>Layout Specification</title>
-
-    <para>
-      &ETable; uses an &ETableSpecification; to layout the columns of
-      the widget. The &ETableSpecification; is specified as XML data
-      passed into the &ETable; as a string.
-    </para>
-
-    <para>
-      The most powerful part of the &ETableSpecification; is that when
-      finished, &ETable; will allow you to get a copy of an
-      &ETableSpecification; that describes the current view of the
-      tree. This allows the developer to save the current view so that
-      next time the user opens this table, they find it in exactly the
-      state that they left it.
-    </para>
-
-    <para>
-      The XML specification allows for a number of things. First, it
-      allows you to pick a set of default columns to be shown. Thus,
-      even if you had hundreds of pieces of data, you could choose to
-      only display a few that fit on the screen by default.
-    </para>
-
-    <para>
-      The second major thing that the &ETableSpecification; allows you
-      to specify is the column grouping and sorting. &ETable; has a
-      powerful mechanism for allowing the user to choose columns to
-      group by, thus allowing multiple columns of sorting, as well as
-      visual grouping of similar elements and interactive selection of
-      what data to display.
-    </para>
-
-    <para>
-      The grouping in &ETableSpecification; is specified as a
-      hierarchy of columns to group by. Each level of the hierarchy
-      lets you sort by a particular column, either ascending or
-      descending. All levels except the last cause the canvas to group
-      by the given column.
-    </para>
-
-    <para>
-      An example &ETableSpecification; follows.
-    </para>
-
-    <programlisting>
-      &lt;ETableSpecification&gt;
-        &lt;columns-shown frozen_columns="2"&gt;
-	  &lt;column&gt; 0 &lt;/column&gt;
-	  &lt;column&gt; 1 &lt;/column&gt;
-	  &lt;column&gt; 2 &lt;/column&gt;
-	  &lt;column&gt; 3 &lt;/column&gt;
-	  &lt;column&gt; 4 &lt;/column&gt;
-	&lt;/columns-shown&gt;
-	&lt;grouping&gt;
-	  &lt;group column="3" ascending="1"&gt;
-	    &lt;group column="4" ascending="0"&gt;
-	      &lt;leaf column="2" ascending="1"/&gt;
-	    &lt;/group&gt;
-	  &lt;/group&gt;
-	&lt;/grouping&gt;
-      &lt;/ETableSpecification&gt;
-    </programlisting>
-
-    <para>
-      This example has 5 columns which are initially in order. It has
-      2 levels of grouping. The first is grouped by the 4th column
-      (all indexes are 0 based) and sorts those groups in ascending
-      order. Inside those groups, the data is grouped by the fifth
-      column and sorted in descending order of the fifth column.
-      Finally, the data in those groups is sorted by the third column
-      in ascending order. Due to the "frozen_columns" attribute on the
-      columns-shown element, the user will not be
-      able to rearrange the first two columns. They will always be the
-      first two.
-    </para>
-  </sect1>
-
-  <sect1 id="conclusion">
-    <title>Conclusion</title>
-
-    <para>
-      All in all, &ETable; is a very powerful widget. Once you learn
-      to use it, you have access to a vast amount of power requiring a
-      comparatively small amount of work.
-    </para>
-  </sect1>
-</article>
diff --git a/libibex/.cvsignore b/libibex/.cvsignore
deleted file mode 100644
index b0d27ba734..0000000000
--- a/libibex/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-testindex
-dumpindex
diff --git a/libibex/COPYING.LIB b/libibex/COPYING.LIB
deleted file mode 100644
index eb685a5ec9..0000000000
--- a/libibex/COPYING.LIB
+++ /dev/null
@@ -1,481 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, 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 library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, 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 companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, 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 library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete 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 distribute a copy of this License along with the
-Library.
-
-  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 Library or any portion
-of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-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 Library, 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 Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you 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.
-
-  If distribution of 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 satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  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.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library 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.
-
-  9. 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 Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-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.
-
-  11. 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 Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library 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 Library.
-
-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.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library 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.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library 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 Library
-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 Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-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
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. 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 LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  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 library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/libibex/ChangeLog b/libibex/ChangeLog
deleted file mode 100644
index 2d3fe7bace..0000000000
--- a/libibex/ChangeLog
+++ /dev/null
@@ -1,390 +0,0 @@
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-18  Not Zed  <NotZed@HelixCode.com>
-
-	* dumpindex.c (main): Same here.
-
-	* testindex.c (main): Add a g_thread_init().  Sigh, glib's thread
-	stuff is snot.
-	(read_words): Setup another flat-out thread to test
-	multithreadedness at little bit.
-
-	* ibex_block.c (ibex_index_buffer): Add locking around internal
-	calls.
-	(ibex_open): Init the locking mutex.
-	(ibex_close): Free the locking mutex.
-	(ibex_unindex): 
-	(ibex_find): 
-	(ibex_find_name): 
-	(ibex_contains_name): Add locking around internal calls.
-
-	* ibex_internal.h (struct ibex): Add a lock.  Include config.h
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* disktail.c (tail_compress):
-	(tail_get): Added some casts to get rid of warnings.
-	(tail_dump): #if 0ed this out to get rid of a warning.
-	(ibex_diskarray_dump): Added a prototype.
-
-	* ibex_block.c (ibex_index_buffer): Assigned cat the value 0 to
-	start off with to avoid a warning.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* wordindex.c (cache_sanity): Made cache_sanity only be included
-	if d(x) is defined as x.
-
-	* wordindexmem.c: Made node_sanity and cache_sanity only be
-	included if d(x) is defined as x or if MALLOC_CHECK is defined.
-	Made sync_value only be included if d(x) is defined as x.
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* index.h: Turn off index stats by default.
-
-	* ibex_block.c (ibex_save): And here.
-	(ibex_close): Debug out printfs.
-
-	* wordindexmem.c (ibex_create_word_index_mem): And here.
-	(num): Made buf static.
-
-	* block.c (ibex_block_cache_open): Debug out some printfs.
-	(ibex_block_read): And here.
-
-2000-11-17  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindexmem.c (add_list): If we have the namecache active, and
-	there is no name there, we add it directly and dont look it up
-	first.
-
-	* testindex.c: Some performance testing & stat gathering stuff.
-
-2000-11-16  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindexmem.c (ibex_create_word_index_mem): Initialise nameinit
-	& namecache.
-	(contains_name): On first call, load all names into memory.  We
-	usually do a whole lot of lookups in a row, and this saves a lot
-	of penalties on a big list, for not too much a memory hit.
-	(find_name): If we have the namelist in memory do a quick
-	short-circuit check to see if we have to do further processing.
-	(unindex_name): Cross check the namecache, if it is active.
-	Remove it there too/or exit (no work to do).
-	(word_flush): If we have the namecache active, destroy it now, as
-	it is not needed anymore (for now).
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* hash.c: #include <stdlib.h> to remove warning.
-	* wordindex.c: #include <stdlib.h> and <string.h>.
-	
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_cache_open): Use IBEX_VERSION rather than
-	hardcoded version string.
-
-	* ibex_internal.h (IBEX_VERSION): Bumped version again.  This time
-	I did change the index format.
-	(IBEX_VERSION): moved into block.h
-
-	* hash.c (struct _hashroot): Add a linked list of keys to the table.
-	(struct _hashblock): Added a next pointer as a block number.
-	(hash_insert): Link new key blocks into the key block list.
-	(struct _HASHCursor): Renamed block to key and added a block item.
-	(hash_cursor_next): Changed to go through the linked list of all
-	hash items rather than through each hash chain separately.  >>
-	faster.
-	(ibex_hash_dump_rec): Remove a warning.
-
-2000-10-25    <jpr@helixcode.com>
-
-	* ibex_block.c: No longer include <db.h>
-
-2000-10-25  Not Zed  <NotZed@HelixCode.com>
-
-	* ibex_internal.h (IBEX_VERSION): Bumped to another version.  The
-	file format hasn't changed, but earlier bugs may create invalid
-	files.
-
-	* block.c (ibex_block_read): Use the root data directly.
-	(ibex_block_cache_open): As well.
-	(ibex_block_get): And here too.
-	(ibex_block_cache_sync): Sync the root block directly here.
-
-	* block.h: Pad root block out to 1024 bytes.
-	Added root block to struct _memcache.
-
-	* disktail.c (tail_get): Dirty the root block.
-	(tail_get): Fix for changes to root access.
-	(disk_remove): And here too.
-
-	* wordindexmem.c (sync_cache_entry): Handle the case of not having
-	any files in the list, which can happen now.
-	(word_index_pre): Make sure we set the wordid on the new cache
-	entry.
-
-	* ibex_block.c (ibex_save): Sigh.  Pass the right argument to
-	index_post.
-
-2000-10-24  JP Rosevear  <jpr@helixcode.com>
-
-	* .cvsignore: Shush
-
-2000-10-24  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_cache_open): Create a word_index_mem for
-	indexing the words, rather than a word_index.
-
-	* ibex_block.c (ibex_index_buffer): If we haven't called index_pre
-	yet, do it before indexing anything.
-	(ibex_save): If wehave called index_pre previously, call
-	index_post.
-	(ibex_close): And same for here.
-
-	* index.h: Added a cursor class, and cursor retrieval function for
-	iterating through an index's keys.
-
-	* wordindexmem.c (ibex_create_word_index_mem): New word class,
-	similar to wordindex, but meant to be faster for updates.
-	(word_index_pre): Implement.  We load all keys into memory.
-	(word_index_post): Implement.  We sync and free all keys.
-	(find): Remove lru code, its no longer a cache, but a lookup
-	table.
-	(add_index_cache): Remove lru code here too.
-	(find_name): And here.
-	(word_flush): Flush the hashtable direct.
-	(word_close): Call flush to flush, rather than doing it ourselves.
-	(add_index_cache): If we are in an index state, we can assume a
-	cache miss == a new word.
-	(word_index_post): Maintain whether or not we are in an index
-	state, and the depth of the state.
-	(word_index_pre): Likewise.  Dont reread the index if we have
-	already.
-	(cache_sanity): Fixed for struct changes.
-
-	* wordindex.h (IBEXWordClass): Added functions to prepare/cleanup
-	for lots of indexing.  i.e. can be used to optimise indexing speed
-	at the cost of extra memory usage during the indexing process.
-
-	* dumpindex.c: Dumps the contents of indexs.
-
-	* hash.c (ibex_hash_dump_rec): Also print the word count.
-	(hash_cursor_create): Create a new cursor for iterating through a
-	hashtable.
-	(hash_cursor_close): 'close' the cursor. It is upto the
-	application to close any cursors it creates.
-	(hash_cursor_next): Goto the next key id.
-	(hash_cursor_next_key): Goto the next key, reutrn the key.
-	(hash_get_cursor): Return a cursor object.
-
-	* wordindex.c (unindex_name): Cross-check the cache as well.
-	(word_index_post): 
-	(word_index_pre): Added (empty) callbacks for pre/post functions.
-
-2000-10-12  Not Zed  <NotZed@HelixCode.com>
-
-	* ibex_internal.h (struct ibex): Bumped ibex rev.
-
-	* block.c (ibex_block_cache_open): Bumped the ibex file revision
-	because of the hash table size change.
-
-	* index.h: Added some stat stuff.
-
-	* wordindex.c (struct _wordcache): Changed files[] to be a pointer
-	to an allocated block/or an individual item.
-	(find): Fix for changes to struct.
-	(find_name):  "
-	(sync_cache_entry): "
-	(add): "
-	(add_list): "
-	(add_index_cache): Free the cache file array if it was created.
-	(word_flush): And here.
-	(word_close): And here too.
-	(ibex_create_word_index): Double the size of the hashtables.
-	(word_flush): Make sure we reset the wordcount to 0 if we remove
-	the list items.  DOH.
-	(add_index_cache): Use a slightly more sohpisticated aging
-	algorithm to remove expired nodes.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* hash.c (hash_find):
-	(hash_remove): 
-	(hash_insert):  Truncate key if it is too big to fit in a
-	single block to MAX_KEYLEN bytes.
-
-2000-09-28  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_free): Make sure we map the 'free' block to
-	a block number when unlinking a block (fixes a lot of assertion
-	failures).
-	(ibex_block_cache_open): Initialise sync flag on root block.  If
-	it is not set on open then the index could be in an invalid state,
-	and should be rescanned.
-	(ibex_block_cache_sync): Sync root block last, and set the sync
-	flag.
-	(ibex_block_cache_open): Mirror root block flags in block_cache
-	struct.
-	(ibex_block_cache_sync): Likewise.
-	(ibex_block_read): If we write a dirty block, then we clear the
-	sync flag if its still set; we are no longer synced.
-
-2000-09-19  Not Zed  <NotZed@HelixCode.com>
-
-	** Merged from IBEX_DISK branch to head.
-	
-	* file.c:
-	* find.c:
-	* words.c:
-	* index.c: Removed unused files.
-
-	* block.h: Changed block to use only 24 bits for next and 8 for
-	used, and fixed all relevant code.  Some cleanup.
-	
-	* disktail.c (tail_get): If we use an empty tail node, then make
-	sure we make it dirty.
-
-2000-09-15  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (word_close): Free hashtable on exit too.
-
-	* disktail.c: Implemented tail-node storage for the end of long
-	lists, or for short lists.  Should save significant disk space
-	(5x?).
-	Implemented special case for 1-item lists, where the tailnode
-	pointer is used to store the index entry.
-
-2000-09-14  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (add_index_key): Keys also handle tails.
-
-	* hash.c (hash_set_data_block): Added new parameter to keys - a
-	tail block (a full 32 bit block pointer).
-	(hash_get_data_block): And same here.
-
-2000-09-12  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (word_close): Dont close namestore twice.
-
-2000-09-11  Not Zed  <NotZed@HelixCode.com>
-
-	** Redid almost everything, on-disk hash table to store an index
-	to index records, mroe on the way to modularisation (more to go),
-	now stores reverse indexes for deleting.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (add_key_mem): Initialise a memory based array for newly
-	added index entries.
-	(add_record): Changed to cache updates in memory until we hit a
-	limit, and then flush them to disk.
-	(get_record): Merge in-memory records with disk records.
-	(remove_record): Remove from memory first, and if that fails, goto
-	disk.
-	(find_record): Check memory first, then disk if that fails.
-	(add_datum_list): oops, copy size * sizeof(blockid_t)
-	(add_indexed): Make sure we link in the head node when we create a
-	new one.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* file.c, find.c: Fixed some warnings.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* index.c (ibex_unindex): Make sure we mark the ibex as dirty.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* file.c (ibex_save): New function, only write out the ibex if it
-	has changed.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* file.c (ibex_open): Also close the fd after we're done.
-
-	* find.c (ibex_contains_name): New function to find out if a file
-	is indexed.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-12  NotZed  <NotZed@HelixCode.com>
-
-	* find.c (ibex_dump_all): Debug function to dump the whole index
-	to stdout.
-
-	* words.c (get_ibex_file): Use g_strdup(), not strdup().
-
-2000-04-11  NotZed  <NotZed@HelixCode.com>
-
-	* file.c (write_word): Always write out all words we have (even if
-	its 0 ... the file expects it).  No longer check for removed files.	
-	(store_word): Check for removed files here, and only add to the
-	ordered tree if we have references left to this word.
-	(ibex_write): First insert into the tree, to determine the
-	wordcount to be saved in the output file, and then write that.
-	(ibex_open): Remove some debug.
-
-	* words.c (ibex_index_buffer): Always set 'unread', if it is a
-	valid pointer (dont rely on caller to initialise it).
-
-2000-03-26  NotZed  <NotZed@HelixCode.com>
-
-	* lookup.c (main): Fixed call to ibex_open.
-
-	* mkindex.c (main): Fixed call to ibex_open.
-
-	* file.c (ibex_open): Changed to accept flags and mode equivalent
-	to open(2).
-
-2000-02-25  Dan Winship  <danw@helixcode.com>
-
-	* *.c: add gtk-doc-style comments
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added mkindex.
-
-2000-02-21  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am: change noinst_LIBRARIES to noinst_LTLIBRARIES, and
-	supply -static to LDFLAGS.  Duh, and changed LDADD back to
-	libibex.la.
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: changed mkindex_LDADD to libibex.a instead of
-	libibex.la.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added lookup.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (lookup_LDADD): For now. make a libibex.a library so
-	we can link it with the camel provider.  I hate libtool
-
-2000-02-16  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: automakify
-
-2000-02-16  NotZed  <NotZed@HelixCode.com>
-
-	* find.[ch] (ibex_find_name): Finds if a word is indexed under a
-	given name.
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* Makefile: Hack together a build using libtool.  This should all
-	be auto*'d at some point I guess.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* Added ChangeLog file.
-
diff --git a/libibex/Makefile.am b/libibex/Makefile.am
deleted file mode 100644
index ab7c92206c..0000000000
--- a/libibex/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-noinst_LTLIBRARIES = libibex.la
-
-libibex_la_SOURCES = \
-	wordindex.c wordindexmem.c \
-	block.c ibex.h \
-	hash.c \
-	disktail.c \
-	ibex_block.c
-
-libibex_la_LDFLAGS = -static
-
-noinst_HEADERS = \
-	ibex_internal.h \
-	block.h \
-	wordindex.h \
-	index.h
-
-INCLUDES = -I$(srcdir) $(GLIB_CFLAGS) $(UNICODE_CFLAGS) \
-	$(THREADS_CFLAGS) \
-		-DG_LOG_DOMAIN=\"libibex\"
-
-
-noinst_PROGRAMS = dumpindex testindex
-
-dumpindex_SOURCES = dumpindex.c
-dumpindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS) $(THREADS_LIBS)
-
-testindex_SOURCES = testindex.c
-testindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS) $(THREADS_LIBS) -lm
-
-#noinst_PROGRAMS = mkindex lookup
-#
-#mkindex_SOURCES = mkindex.c
-#mkindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS)
-#
-#lookup_SOURCES = lookup.c
-#lookup_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS)
-
diff --git a/libibex/TODO b/libibex/TODO
deleted file mode 100644
index a087c8d1f3..0000000000
--- a/libibex/TODO
+++ /dev/null
@@ -1,61 +0,0 @@
-Stability
----------
-* ibex_open should never crash, and should never return NULL without
-errno being set. Should check for errors when reading.
-
-
-Performance
------------
-* Profiling, keep thinking about data structures, etc.
-
-* Check memory usage
-
-* See if writing the "inverse image" of long ref streams helps
-compression without hurting performance now. (ie, if a word appears in
-more than half of the files, write out the list of files it _doesn't_
-appear in). (I tried this before, and it wasn't working well, but the
-file format and data structures have changed a lot.)
-
-* We could save a noticeable chunk of time if normalize_word computed
-the hash of the word and then we could pass that into
-g_hash_table_insert somehow.
-
-* Make a copy of the buffer to be indexed (or provide interface for
-caller to say ibex can munge the provided data) and then use that
-rather than constantly copying things. ?
-
-
-Functionality
--------------
-* ibex file locking
-
-* specify file mode in ibex_open
-
-* ibex_find* need to normalize the search words... should this be done
-by the caller or by ibex_find?
-
-* Needs to be some way to do a secondary search after getting results
-back from ibex_find* (ie, for "foo near bar"). This either has to be
-done by ibex, or requires us to export the normalize interface.
-
-* Does there need to be an ibex_find_any, or is that easy enough for the
-caller to do?
-
-* utf8_trans needs to cover at least two more code pages. This is
-tricky because it's not clear whether some of the letters there should
-be translated to ASCII or left as UTF8. This requires some
-investigation.
-
-* ibex_index_* need to ignore HTML tags.
-  NAME = [A-Za-z][A-Za-z0-9.-]*
-  </?{NAME}(\s*{NAME}(\s*=\s*({NAME}|"[^"]*"|'[^']*')))*>
-  <!(--([^-]*|-[^-])--\s*)*>
-
-  ugh. ok, simplifying, we get:
-  <[^!](([^"'>]*("[^"]*"|'[^']*'))*> or
-  <!(--([^-]*|-[^-])--\s*)*>
-
-  which is still not simple. sigh.
-
-* ibex_index_* need to recognize and ignore "non-text". Particularly
-BinHex and uuencoding.
diff --git a/libibex/block.c b/libibex/block.c
deleted file mode 100644
index b9057bc109..0000000000
--- a/libibex/block.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
-  block file/cache/utility functions
-*/
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <glib.h>
-
-#include "block.h"
-
-/*#define MALLOC_CHECK*/
-
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-#define d(x)
-/*#define DEBUG*/
-
-int block_log;
-
-#ifdef IBEX_STATS
-static void
-init_stats(struct _memcache *index)
-{
-	index->stats = g_hash_table_new(g_direct_hash, g_direct_equal);
-}
-
-static void
-dump_1_stat(int id, struct _stat_info *info, struct _memcache *index)
-{
-	printf("%d %d %d %d %d\n", id, info->read, info->write, info->cache_hit, info->cache_miss);
-}
-
-static void
-dump_stats(struct _memcache *index)
-{
-	printf("Block reads writes hits misses\n");
-	g_hash_table_foreach(index->stats, dump_1_stat, index);
-}
-
-static void
-add_read(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->read++;
-}
-
-static void
-add_write(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->write++;
-}
-
-static void
-add_hit(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->cache_hit++;
-}
-
-static void
-add_miss(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->cache_miss++;
-}
-#endif /* IBEX_STATS */
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-/* simple list routines (for simplified memory management of cache/lists) */
-
-/**
- * ibex_list_new:
- * @v: 
- * 
- * Initialise a list header.  A list header must always be initialised
- * before use.
- **/
-void ibex_list_new(struct _list *v)
-{
-	v->head = (struct _listnode *)&v->tail;
-	v->tail = 0;
-	v->tailpred = (struct _listnode *)&v->head;
-}
-
-/**
- * ibex_list_addhead:
- * @l: List.
- * @n: Node to append.
- * 
- * Prepend a listnode to the head of the list @l.
- * 
- * Return value: Always @n.
- **/
-struct _listnode *ibex_list_addhead(struct _list *l, struct _listnode *n)
-{
-	n->next = l->head;
-	n->prev = (struct _listnode *)&l->head;
-	l->head->prev = n;
-	l->head = n;
-	return n;
-}
-
-/**
- * ibex_list_addtail:
- * @l: 
- * @n: 
- * 
- * Append a listnode to the end of the list @l.
- * 
- * Return value: Always the same as @n.
- **/
-struct _listnode *ibex_list_addtail(struct _list *l, struct _listnode *n)
-{
-	n->next = (struct _listnode *)&l->tail;
-	n->prev = l->tailpred;
-	l->tailpred->next = n;
-	l->tailpred = n;
-	return n;
-}
-
-/**
- * ibex_list_remove:
- * @n: The node to remove.
- * 
- * Remove a listnode from a list.
- * 
- * Return value: Always the same as @n.
- **/
-struct _listnode *ibex_list_remove(struct _listnode *n)
-{
-	n->next->prev = n->prev;
-	n->prev->next = n->next;
-	return n;
-}
-
-static struct _memblock *
-memblock_addr(struct _block *block)
-{
-	return (struct _memblock *)(((char *)block) - G_STRUCT_OFFSET(struct _memblock, data));
-}
-
-/* read/sync the rootblock into the block_cache structure */
-static int
-ibex_block_read_root(struct _memcache *block_cache)
-{
-	lseek(block_cache->fd, 0, SEEK_SET);
-	if (read(block_cache->fd, &block_cache->root, sizeof(block_cache->root)) != sizeof(block_cache->root)) {
-		
-		return -1;
-	}
-	return 0;
-}
-
-static int
-ibex_block_sync_root(struct _memcache *block_cache)
-{
-	lseek(block_cache->fd, 0, SEEK_SET);
-	if (write(block_cache->fd, &block_cache->root, sizeof(block_cache->root)) != sizeof(block_cache->root)) {
-		return -1;
-	}
-	return fsync(block_cache->fd);
-}
-
-
-/**
- * ibex_block_dirty:
- * @block: 
- * 
- * Dirty a block.  This will cause it to be written to disk on
- * a cache sync, or when the block is flushed from the cache.
- **/
-void
-ibex_block_dirty(struct _block *block)
-{
-	memblock_addr(block)->flags |= BLOCK_DIRTY;
-}
-
-static void
-sync_block(struct _memcache *block_cache, struct _memblock *memblock)
-{
-	if (block_log)
-		printf("writing block %d\n", memblock->block);
-
-	lseek(block_cache->fd, memblock->block, SEEK_SET);
-	if (write(block_cache->fd, &memblock->data, sizeof(memblock->data)) != -1) {
-		memblock->flags &= ~BLOCK_DIRTY;
-	}
-#ifdef IBEX_STATS
-	add_write(block_cache, memblock->block);
-#endif
-}
-
-/**
- * ibex_block_cache_sync:
- * @block_cache: 
- * 
- * Ensure the block cache is fully synced to disk.
- **/
-void
-ibex_block_cache_sync(struct _memcache *block_cache)
-{
-	struct _memblock *memblock;
-
-	memblock = (struct _memblock *)block_cache->nodes.head;
-	while (memblock->next) {
-#ifdef MALLOC_CHECK
-		checkmem(memblock);
-#endif
-		if (memblock->flags & BLOCK_DIRTY) {
-			sync_block(block_cache, memblock);
-		}
-		memblock = memblock->next;
-	}
-
-	block_cache->root.flags |= IBEX_ROOT_SYNCF;
-	if (ibex_block_sync_root(block_cache) != 0) {
-		block_cache->root.flags &= ~IBEX_ROOT_SYNCF;
-	}
-
-#ifdef IBEX_STATS
-	dump_stats(block_cache);
-#endif
-
-}
-
-#ifdef MALLOC_CHECK
-static void
-check_cache(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	checkmem(block_cache);
-	checkmem(block_cache->index);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		checkmem(mw);
-		mw = mn;
-		mn = mn->next;
-	}
-}
-#endif
-
-/**
- * ibex_block_cache_flush:
- * @block_cache: 
- * 
- * Ensure the block cache is fully synced to disk, and then flush
- * its contents from memory.
- **/
-void
-ibex_block_cache_flush(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	ibex_block_cache_sync(block_cache);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		g_hash_table_remove(block_cache->index, (void *)mw->block);
-		g_free(mw);
-		mw = mn;
-		mn = mn->next;
-	}
-	ibex_list_new(&block_cache->nodes);
-}
-
-/**
- * ibex_block_read:
- * @block_cache: 
- * @blockid: 
- * 
- * Read the data of a block by blockid.  The data contents is backed by
- * the block cache, and should be considered static.
- *
- * TODO; should this return a NULL block on error?
- *
- * Return value: The address of the block data (which may be cached).
- **/
-struct _block *
-ibex_block_read(struct _memcache *block_cache, blockid_t blockid)
-{
-	struct _memblock *memblock;
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-
-	/* nothing can read the root block directly */
-	g_assert(blockid != 0);
-	g_assert(blockid < block_cache->root.roof);
-
-	memblock = g_hash_table_lookup(block_cache->index, (void *)blockid);
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-
-	if (memblock) {
-		d(printf("foudn blockid in cache %d = %p\n", blockid, &memblock->data));
-
-		/* 'access' page */
-		ibex_list_remove((struct _listnode *)memblock);
-		ibex_list_addtail(&block_cache->nodes, (struct _listnode *)memblock);
-
-#ifdef MALLOC_CHECK
-		check_cache(block_cache);
-#endif
-
-#ifdef IBEX_STATS
-		add_hit(block_cache, memblock->block);
-#endif
-
-#ifdef MALLOC_CHECK
-		check_cache(block_cache);
-#endif
-
-		return &memblock->data;
-	}
-#ifdef IBEX_STATS
-	add_miss(block_cache, blockid);
-	add_read(block_cache, blockid);
-#endif
-	if (block_log)
-		printf("miss block %d\n", blockid);
-
-	d(printf("loading blockid from disk %d\n", blockid));
-	memblock = g_malloc(sizeof(*memblock));
-	memblock->block = blockid;
-	memblock->flags = 0;
-	lseek(block_cache->fd, blockid, SEEK_SET);
-	memset(&memblock->data, 0, sizeof(memblock->data));
-	read(block_cache->fd, &memblock->data, sizeof(memblock->data));
-
-	ibex_list_addtail(&block_cache->nodes, (struct _listnode *)memblock);
-	g_hash_table_insert(block_cache->index, (void *)blockid, memblock);
-	if (block_cache->count >= CACHE_SIZE) {
-		struct _memblock *old = (struct _memblock *)block_cache->nodes.head;
-		d(printf("discaring cache block %d\n", old->block));
-		g_hash_table_remove(block_cache->index, (void *)old->block);
-		ibex_list_remove((struct _listnode *)old);
-		if (old->flags & BLOCK_DIRTY) {
-			/* are we about to un-sync the file?  update root and sync it */
-			if (block_cache->root.flags & IBEX_ROOT_SYNCF) {
-				d(printf("Unsyncing root block\n"));
-
-				block_cache->root.flags &= ~IBEX_ROOT_SYNCF;
-				if (ibex_block_sync_root(block_cache) != 0) {
-					/* what do we do?  i dont know! */
-					g_warning("Could not sync root block of index: %s", strerror(errno));
-				}
-			}
-			sync_block(block_cache, old);
-		}
-		g_free(old);
-	} else {
-		block_cache->count++;
-	}
-
-	d(printf("  --- cached blocks : %d\n", block_cache->count));
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-	return &memblock->data;
-}
-
-/**
- * ibex_block_cache_open:
- * @name: 
- * @flags: Flags as to open(2), should use O_RDWR and optionally O_CREAT.
- * @mode: Mose as to open(2)
- * 
- * Open a block file.
- * 
- * FIXME; this currently also initialises the word and name indexes
- * because their pointers are stored in the root block.  Should be
- * upto the caller to manage these pointers/data.
- *
- * Return value: NULL if the backing file could not be opened.
- **/
-struct _memcache *
-ibex_block_cache_open(const char *name, int flags, int mode)
-{
-	struct _memcache *block_cache = g_malloc0(sizeof(*block_cache));
-
-	d(printf("opening ibex file: %s", name));
-
-	/* setup cache */
-	ibex_list_new(&block_cache->nodes);
-	block_cache->count = 0;
-	block_cache->index = g_hash_table_new(g_direct_hash, g_direct_equal);
-	block_cache->fd = open(name, flags, mode);
-
-	if (block_cache->fd == -1) {
-		g_hash_table_destroy(block_cache->index);
-		g_free(block_cache);
-		return NULL;
-	}
-
-	ibex_block_read_root(block_cache);
-	if (block_cache->root.roof == 0
-	    || memcmp(block_cache->root.version, IBEX_VERSION, 4)
-	    || ((block_cache->root.flags & IBEX_ROOT_SYNCF) == 0)) {
-		d(printf("Initialising superblock\n"));
-		/* reset root data */
-		memcpy(block_cache->root.version, IBEX_VERSION, 4);
-		block_cache->root.roof = 1024;
-		block_cache->root.free = 0;
-		block_cache->root.words = 0;
-		block_cache->root.names = 0;
-		block_cache->root.tail = 0;	/* list of tail blocks */
-		block_cache->root.flags = 0;
-		ibex_block_sync_root(block_cache);
-		/* reset the file contents */
-		ftruncate(block_cache->fd, 1024);
-	} else {
-		d(printf("superblock already initialised:\n"
-			 " roof = %d\n free = %d\n words = %d\n names = %d\n tail = %d\n",
-			 block_cache->root.roof, block_cache->root.free,
-			 block_cache->root.words, block_cache->root.names, block_cache->root.tail));
-	}
-	/* FIXME: this should be moved higher up in the object tree */
-	{
-		struct _IBEXWord *ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-		block_cache->words = ibex_create_word_index_mem(block_cache, &block_cache->root.words,&block_cache->root.names);
-	}
-
-#ifdef IBEX_STATS
-	init_stats(block_cache);
-#endif
-
-	return block_cache;
-}
-
-/**
- * ibex_block_cache_close:
- * @block_cache: 
- * 
- * Close the block file, sync any remaining cached data
- * to disk, and free all resources.
- **/
-void
-ibex_block_cache_close(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	ibex_block_cache_sync(block_cache);
-	close(block_cache->fd);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		g_free(mw);
-		mw = mn;
-		mn = mw->next;
-	}
-
-	g_hash_table_destroy(block_cache->index);
-
-	g_free(block_cache);
-}
-
-/**
- * ibex_block_free:
- * @block_cache: 
- * @blockid: 
- * 
- * Return a block to the free pool.
- **/
-void
-ibex_block_free(struct _memcache *block_cache, blockid_t blockid)
-{
-	struct _block *block = ibex_block_read(block_cache, blockid);
-
-	block->next = block_number(block_cache->root.free);
-	block_cache->root.free = blockid;
-	ibex_block_dirty((struct _block *)block);
-}
-
-/**
- * ibex_block_get:
- * @block_cache: 
- * 
- * Allocate a new block, or access a previously freed block and return
- * its block id.  The block will have zeroed contents.
- * 
- * Return value: 0 if there are no blocks left (disk full/read only
- * file, etc).
- **/
-blockid_t
-ibex_block_get(struct _memcache *block_cache)
-{
-	struct _block *block;
-	blockid_t head;
-
-	if (block_cache->root.free) {
-		head = block_cache->root.free;
-		block = ibex_block_read(block_cache, head);
-		block_cache->root.free = block_location(block->next);
-	} else {
-		/* TODO: check the block will fit first */
-		/* TODO: no need to read this block, can allocate it manually (saves a syscall/read) */
-		head = block_cache->root.roof;
-		block_cache->root.roof += BLOCK_SIZE;
-		block = ibex_block_read(block_cache, head);
-	}
-
-	g_assert(head != 0);
-
-	d(printf("new block = %d\n", head));
-	block->next = 0;
-	block->used = 0;
-	ibex_block_dirty(block);
-	return head;
-}
diff --git a/libibex/block.h b/libibex/block.h
deleted file mode 100644
index dbc8fd5ad8..0000000000
--- a/libibex/block.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-/* public interfaces for block io routines */
-
-#ifndef _BLOCK_H
-#define _BLOCK_H
-
-/*#define IBEX_STATS*/		/* define to get/dump block access stats */
-
-#include <glib.h>
-
-/* version of file format */
-#define IBEX_VERSION "ibx6"
-
-typedef guint32 nameid_t;
-typedef guint32 blockid_t;
-
-#define BLOCK_BITS (8)
-#define BLOCK_SIZE (1<<BLOCK_BITS)
-#define CACHE_SIZE 256		/* blocks in disk cache */
-
-/* root block */
-struct _root {
-	char version[4];
-
-	blockid_t free;		/* list of free blocks */
-	blockid_t roof;		/* top of allocated space, everything below is in a free or used list */
-	blockid_t tail;		/* list of 'tail' blocks */
-
-	blockid_t words;	/* root of words index */
-	blockid_t names;	/* root of names index */
-
-	char flags;		/* state flags */
-
-	/* makes structure fill up to 1024 bytes */
-	char dummy[1024 - (sizeof(char)*5) - (sizeof(blockid_t)*5)];
-};
-
-#define IBEX_ROOT_SYNCF (1<<0)	/* file is synced */
-
-/* basic disk structure for (data) blocks */
-struct _block {
-	unsigned int next:32-BLOCK_BITS;	/* next block */
-	unsigned int used:BLOCK_BITS;		/* number of elements used */
-
-	nameid_t bl_data[(BLOCK_SIZE-4)/4];	/* references */
-};
-
-/* custom list structure, for a simple/efficient cache */
-struct _listnode {
-	struct _listnode *next;
-	struct _listnode *prev;
-};
-struct _list {
-	struct _listnode *head;
-	struct _listnode *tail;
-	struct _listnode *tailpred;
-};
-
-void ibex_list_new(struct _list *v);
-struct _listnode *ibex_list_addhead(struct _list *l, struct _listnode *n);
-struct _listnode *ibex_list_addtail(struct _list *l, struct _listnode *n);
-struct _listnode *ibex_list_remove(struct _listnode *n);
-
-/* in-memory structure for block cache */
-struct _memblock {
-	struct _memblock *next;
-	struct _memblock *prev;
-
-	blockid_t block;
-	int flags;
-
-	struct _block data;
-};
-#define BLOCK_DIRTY (1<<0)
-
-struct _memcache {
-	struct _list nodes;
-	int count;		/* nodes in cache */
-
-	GHashTable *index;	/* blockid->memblock mapping */
-	int fd;			/* file fd */
-
-#ifdef IBEX_STATS
-	GHashTable *stats;
-#endif
-	struct _root root;	/* root block */
-
-	/* temporary here */
-	struct _IBEXWord *words; /* word index */
-};
-
-#ifdef IBEX_STATS
-struct _stat_info {
-	int read;
-	int write;
-	int cache_hit;
-	int cache_miss;
-};
-#endif /* IBEX_STATS */
-
-struct _memcache *ibex_block_cache_open(const char *name, int flags, int mode);
-void ibex_block_cache_close(struct _memcache *block_cache);
-void ibex_block_cache_sync(struct _memcache *block_cache);
-void ibex_block_cache_flush(struct _memcache *block_cache);
-
-blockid_t ibex_block_get(struct _memcache *block_cache);
-void ibex_block_free(struct _memcache *block_cache, blockid_t blockid);
-void ibex_block_dirty(struct _block *block);
-struct _block *ibex_block_read(struct _memcache *block_cache, blockid_t blockid);
-
-#define block_number(x) ((x)>>BLOCK_BITS)
-#define block_location(x) ((x)<<BLOCK_BITS)
-
-#endif /* ! _BLOCK_H */
diff --git a/libibex/diskarray.c b/libibex/diskarray.c
deleted file mode 100644
index 2664e0f6b5..0000000000
--- a/libibex/diskarray.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a disk based array storage class */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-/*#define DEBUG*/
-
-static struct _IBEXStore *disk_create(struct _memcache *bc);
-static int disk_sync(struct _IBEXStore *store);
-static int disk_close(struct _IBEXStore *store);
-
-static blockid_t disk_add(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static blockid_t disk_add_list(struct _IBEXStore *store, blockid_t head, GArray *data);
-static blockid_t disk_remove(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static void disk_free(struct _IBEXStore *store, blockid_t head);
-
-static gboolean disk_find(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static GArray *disk_get(struct _IBEXStore *store, blockid_t head);
-
-struct _IBEXStoreClass ibex_diskarray_class = {
-	disk_create, disk_sync, disk_close,
-	disk_add, disk_add_list,
-	disk_remove, disk_free,
-	disk_find, disk_get
-};
-
-static struct _IBEXStore *disk_create(struct _memcache *bc)
-{
-	struct _IBEXStore *store;
-
-	store = g_malloc0(sizeof(*store));
-	store->klass = &ibex_diskarray_class;
-	store->blocks = bc;
-
-	return store;
-}
-
-static int disk_sync(struct _IBEXStore *store)
-{
-	/* no cache, nop */
-	return 0;
-}
-
-static int disk_close(struct _IBEXStore *store)
-{
-	g_free(store);
-	return 0;
-}
-
-static blockid_t
-disk_add(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new;
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	d(printf("adding record %d to block %d (next = %d)\n", data, head, block->next));
-
-	if (block->used < sizeof(block->bl_data)/sizeof(block->bl_data[0])) {
-		d(printf("adding record into block %d  %d\n", head, data));
-		block->bl_data[block->used] = data;
-		block->used++;
-		ibex_block_dirty(block);
-		return head;
-	} else {
-		new = ibex_block_get(store->blocks);
-		newblock = ibex_block_read(store->blocks, new);
-		newblock->next = head;
-		newblock->bl_data[0] = data;
-		newblock->used = 1;
-		d(printf("adding record into new %d  %d, next =%d\n", new, data, newblock->next));
-		ibex_block_dirty(newblock);
-		return new;
-	}
-}
-
-static blockid_t
-disk_add_list(struct _IBEXStore *store, blockid_t head, GArray *data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new;
-	int copied = 0;
-	int left, space, tocopy;
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	while (copied < data->len) {
-		left = data->len - copied;
-		space = sizeof(block->bl_data)/sizeof(block->bl_data[0]) - block->used;
-		if (space) {
-			tocopy = MIN(left, space);
-			memcpy(block->bl_data+block->used, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			block->used += tocopy;
-			ibex_block_dirty(block);
-		} else {
-			new = ibex_block_get(store->blocks);
-			newblock = ibex_block_read(store->blocks, new);
-			newblock->next = head;
-			tocopy = MIN(left, sizeof(block->bl_data)/sizeof(block->bl_data[0]));
-			memcpy(newblock->bl_data, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			newblock->used = tocopy;
-			block = newblock;
-			head = new;
-			ibex_block_dirty(newblock);
-		}
-		copied += tocopy;
-	}
-	return head;
-}
-
-static blockid_t
-disk_remove(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	blockid_t node = head;
-
-	d(printf("removing %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-		int i;
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				struct _block *start = ibex_block_read(store->blocks, head);
-
-				start->used--;
-				block->bl_data[i] = start->bl_data[start->used];
-				if (start->used == 0) {
-					struct _root *root = (struct _root *)ibex_block_read(store->blocks, 0);
-					blockid_t new;
-
-					d(printf("dropping block %d, new head = %d\n", head, start->next));
-					new = start->next;
-					start->next = root->free;
-					root->free = head;
-					head = new;
-					ibex_block_dirty((struct _block *)root);
-				}
-				ibex_block_dirty(block);
-				ibex_block_dirty(start);
-				return head;
-			}
-		}
-		node = block->next;
-	}
-	return head;
-}
-
-static void disk_free(struct _IBEXStore *store, blockid_t head)
-{
-	blockid_t next;
-	struct _block *block;
-
-	while (head) {
-		block = ibex_block_read(store->blocks, head);
-		next = block->next;
-		ibex_block_free(store->blocks, head);
-		head = next;
-	}
-}
-
-static gboolean
-disk_find(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	blockid_t node = head;
-
-	d(printf("finding %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-		int i;
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				return TRUE;
-			}
-		}
-		node = block->next;
-	}
-	return FALSE;
-}
-
-static GArray *
-disk_get(struct _IBEXStore *store, blockid_t head)
-{
-	GArray *result = g_array_new(0, 0, sizeof(nameid_t));
-
-	while (head) {
-		struct _block *block = ibex_block_read(store->blocks, head);
-
-		d(printf("getting data from block %d\n", head));
-
-		g_array_append_vals(result, block->bl_data, block->used);
-		head = block->next;
-		d(printf("next = %d\n", head));
-	}
-	return result;
-}
-
-void
-ibex_diskarray_dump(struct _memcache *blocks, blockid_t head)
-{
-	blockid_t node = head;
-
-	printf("dumping list %d\n", node);
-	while (node) {
-		struct _block *block = ibex_block_read(blocks, node);
-		int i;
-
-		printf(" block %d used %d\n ", node, block->used);
-		for (i=0;i<block->used;i++) {
-			printf(" %d", block->bl_data[i]);
-		}
-		printf("\n");
-		node = block->next;
-	}
-}
diff --git a/libibex/disktail.c b/libibex/disktail.c
deleted file mode 100644
index 88f5ca6c55..0000000000
--- a/libibex/disktail.c
+++ /dev/null
@@ -1,818 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a disk based array storage class that stores the tails of data lists
-   in common blocks */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <string.h>
-
-#include <stdio.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-/*#define DEBUG*/
-
-/* marker to define which root keys indicate a single length key */
-#define BLOCK_ONE (1<<BLOCK_BITS)
-
-/* tail blocks only contain tail data ... */
-/* and we pack it in, similar to the key data, only more compact */
-struct _tailblock {
-	unsigned int next:32-BLOCK_BITS; /* only needs to point to block numbers */
-	unsigned int used:BLOCK_BITS; /* how many entries are used */
-	union {
-		unsigned char offset[BLOCK_SIZE-4]; /* works upto blocksize of 1024 bytes */
-		nameid_t data[(BLOCK_SIZE-4)/4];
-	} tailblock_u;
-};
-#define tb_offset tailblock_u.offset
-#define tb_data tailblock_u.data
-
-/* map a tail index to a block index */
-#define TAIL_INDEX(b) ((b) & (BLOCK_SIZE-1))
-/* map a tail index to a block number */
-#define TAIL_BLOCK(b) ((b) & ~(BLOCK_SIZE-1))
-/* map a block + index to a tailid */
-#define TAIL_KEY(b, i) (((b) & ~(BLOCK_SIZE-1)) | ((i) & (BLOCK_SIZE-1)))
-
-#define TAIL_THRESHOLD ((BLOCK_SIZE-8)/6)
-
-static struct _IBEXStore *disk_create(struct _memcache *bc);
-static int disk_sync(struct _IBEXStore *store);
-static int disk_close(struct _IBEXStore *store);
-
-static blockid_t disk_add(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-static blockid_t disk_add_list(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, GArray *data);
-static blockid_t disk_remove(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-static void disk_free(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-static gboolean disk_find(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data);
-static GArray *disk_get(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-struct _IBEXStoreClass ibex_diskarray_class = {
-	disk_create, disk_sync, disk_close,
-	disk_add, disk_add_list,
-	disk_remove, disk_free,
-	disk_find, disk_get
-};
-
-
-static int
-tail_info(struct _tailblock *bucket, nameid_t tailid, blockid_t **startptr)
-{
-	blockid_t *start, *end;
-	int index;
-
-	/* get start/end of area to zap */
-	index = TAIL_INDEX(tailid);
-	start = &bucket->tb_data[bucket->tb_offset[index]];
-	if (index == 0) {
-		end = &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])];
-	} else {
-		end = &bucket->tb_data[bucket->tb_offset[index-1]];
-	}
-	if (startptr)
-		*startptr = start;
-	return end-start;
-}
-
-/* compresses (or expand) the bucket entry, to the new size */
-static void
-tail_compress(struct _tailblock *bucket, int index, int newsize)
-{
-	int i;
-	blockid_t *start, *end, *newstart;
-
-	/* get start/end of area to zap */
-	start = &bucket->tb_data[bucket->tb_offset[index]];
-	if (index == 0) {
-		end = &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])];
-	} else {
-		end = &bucket->tb_data[bucket->tb_offset[index-1]];
-	}
-
-	if (end-start == newsize)
-		return;
-
-	/*
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyyyyy
-	     0                           20   25
-
-	     newsize = 0
-	     end = 25
-	     newstart = 0
-	     start = 20
-
-	     newstart+(end-start)-newsize = 5
-	     i = start-newstart
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyyyyy
-	     0                           20   25
-
-	     newsize = 2
-	     end = 25
-	     newstart = 0
-	     start = 20
-
-	     newstart+(end-start)-newsize = 3
-	     i = start-newstart + MIN(end-start, newsize)) = 22
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	     5 	                         25
-	     newsize = 5
-	     end = 25
-	     start = 25
-	     newstart = 5
-
-	     newstart+(end-start)-newsize = 0
-	     i = start-newstart = 20
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyy
-	     3 	                         23 25
-	     newsize = 5
-	     end = 25
-	     start = 23
-	     newstart = 3
-
-	     newstart+(end-start)-newsize = 0
-	     i = start-newstart + MIN(end-start, newsize) = 22
-
-	*/
-
-
-	/* fixup data */
-	newstart = &bucket->tb_data[bucket->tb_offset[bucket->used-1]];
-
-	g_assert(newstart+(end-start)-newsize <= &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])]);
-	g_assert(newstart + (start-newstart) + MIN(end-start, newsize) <= &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])]);
-	g_assert(newstart+(end-start)-newsize >= (blockid_t *) &bucket->tb_offset[bucket->used]);
-	g_assert(newstart + (start-newstart) + MIN(end-start, newsize) >= (blockid_t *) &bucket->tb_offset[bucket->used]);
-
-	memmove(newstart+(end-start)-newsize, newstart, ((start-newstart)+MIN(end-start, newsize)) * sizeof(blockid_t));
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->tb_offset[i] += (end-start)-newsize;
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-/*
-  returns the number of blockid's free
-*/
-static int
-tail_space(struct _tailblock *tail)
-{
-	if (tail->used == 0)
-		return sizeof(tail->tb_data)/sizeof(tail->tb_data[0])-1;
-
-	return  &tail->tb_data[tail->tb_offset[tail->used-1]]
-		- (blockid_t *)&tail->tb_offset[tail->used];
-}
-
-#if 0
-static void
-tail_dump(struct _memcache *blocks, blockid_t tailid)
-{
-	int i;
-	struct _tailblock *tail = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tailid));
-
-	printf("Block %d, used %d\n", tailid, tail->used);
-	for (i=0;i<sizeof(struct _tailblock)/sizeof(unsigned int);i++) {
-		printf(" %08x", ((unsigned int *)tail)[i]);
-	}
-	printf("\n");
-}
-#endif
-
-static blockid_t
-tail_get(struct _memcache *blocks, int size)
-{
-	blockid_t tailid;
-	struct _tailblock *tail;
-	int freeindex;
-	blockid_t *end;
-	int i, count = 0;
-
-	d(printf("looking for a tail node with %d items in it\n", size));
-
-	/* look for a node with enough space, if we dont find it fairly
-	   quickly, just quit.  needs a better free algorithm i think ... */
-	tailid = blocks->root.tail;
-	while (tailid && count<5) {
-		int space;
-
-		d(printf(" checking tail node %d\n", tailid));
-
-		tail = (struct _tailblock *)ibex_block_read(blocks, tailid);
-
-		if (tail->used == 0) {
-			/* assume its big enough ... */
-			tail->used = 1;
-			tail->tb_offset[0] = sizeof(tail->tb_data)/sizeof(tail->tb_data[0]) - size;
-			d(printf("allocated %d (%d), used %d\n", tailid, tailid, tail->used));
-			ibex_block_dirty((struct _block *)tail);
-
-			g_assert(&tail->tb_offset[tail->used-1]
-				 < (unsigned char *) &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-			return tailid;
-		}
-
-		g_assert(&tail->tb_offset[tail->used-1]
-			 < (unsigned char *) &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-		/* see if we have a free slot first */
-		freeindex = -1;
-		end = &tail->tb_data[sizeof(tail->tb_data)/sizeof(tail->tb_data[0])];
-		for (i=0;i<tail->used;i++) {
-			if (end == &tail->tb_data[tail->tb_offset[i]]) {
-				freeindex = i;
-				break;
-			}
-			end = &tail->tb_data[tail->tb_offset[i]];
-		}
-
-		/* determine how much space we have available - incl any extra header we might need */
-		space =  ((char *)&tail->tb_data[tail->tb_offset[tail->used-1]])
-			- ((char *)&tail->tb_offset[tail->used])
-			/* FIXMEL work out why this is out a little bit */
-			- 8;
-		if (freeindex == -1)
-			space -= sizeof(tail->tb_offset[0]);
-
-		/* if we have enough, set it up, creating a new entry if necessary */
-		/* for some really odd reason the compiler promotes this expression to unsigned, hence
-		   the requirement for the space>0 check ... */
-		if (space>0 && space > size*sizeof(blockid_t)) {
-			d(printf("space = %d, size = %d size*sizeof() = %d truth = %d\n", space, size, size*sizeof(blockid_t), space>size*sizeof(blockid_t)));
-			if (freeindex == -1) {
-				freeindex = tail->used;
-				tail->tb_offset[tail->used] = tail->tb_offset[tail->used-1];
-				tail->used++;
-			}
-			tail_compress(tail, freeindex, size);
-			ibex_block_dirty((struct _block *)tail);
-			d(printf("allocated %d (%d), used %d\n", tailid, TAIL_KEY(tailid, freeindex), tail->used));
-			return TAIL_KEY(tailid, freeindex);
-		}
-		count++;
-		tailid = block_location(tail->next);
-	}
-
-	d(printf("allocating new data node for tail data\n"));
-	tailid = ibex_block_get(blocks);
-	tail = (struct _tailblock *)ibex_block_read(blocks, tailid);
-	tail->next = block_number(blocks->root.tail);
-	blocks->root.tail = tailid;
-	tail->used = 1;
-	tail->tb_offset[0] = sizeof(tail->tb_data)/sizeof(tail->tb_data[0]) - size;
-	ibex_block_dirty((struct _block *)tail);
-	d(printf("allocated %d (%d), used %d\n", tailid, TAIL_KEY(tailid, 0), tail->used));
-
-	g_assert(&tail->tb_offset[tail->used-1]
-		 < (unsigned char *) &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-	return TAIL_KEY(tailid, 0);
-}
-
-static void
-tail_free(struct _memcache *blocks, blockid_t tailid)
-{
-	struct _tailblock *tail;
-
-	d(printf("freeing tail id %d\n", tailid));
-
-	if (tailid == 0)
-		return;
-
-	tail = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tailid));
-	d(printf("  tail %d used %d\n", tailid, tail->used));
-	g_assert(tail->used);
-	if (TAIL_INDEX(tailid)  == tail->used - 1) {
-		tail->used --;
-	} else {
-		tail_compress(tail, TAIL_INDEX(tailid), 0);
-	}
-	ibex_block_dirty((struct _block *)tail);
-}
-
-static struct _IBEXStore *disk_create(struct _memcache *bc)
-{
-	struct _IBEXStore *store;
-
-	store = g_malloc0(sizeof(*store));
-	store->klass = &ibex_diskarray_class;
-	store->blocks = bc;
-
-	return store;
-}
-
-static int disk_sync(struct _IBEXStore *store)
-{
-	/* no cache, nop */
-	return 0;
-}
-
-static int disk_close(struct _IBEXStore *store)
-{
-	g_free(store);
-	return 0;
-}
-
-static blockid_t
-disk_add(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, nameid_t data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new, head = *headptr /*, tail = *tailptr*/;
-
-	g_error("Inbimplemented");
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	d(printf("adding record %d to block %d (next = %d)\n", data, head, block->next));
-
-	if (block->used < sizeof(block->bl_data)/sizeof(block->bl_data[0])) {
-		(printf("adding record into block %d  %d\n", head, data));
-		block->bl_data[block->used] = data;
-		block->used++;
-		ibex_block_dirty(block);
-		return head;
-	} else {
-		new = ibex_block_get(store->blocks);
-		newblock = ibex_block_read(store->blocks, new);
-		newblock->next = block_number(head);
-		newblock->bl_data[0] = data;
-		newblock->used = 1;
-		d(printf("adding record into new %d  %d, next =%d\n", new, data, newblock->next));
-		ibex_block_dirty(newblock);
-		return new;
-	}
-}
-
-static blockid_t
-disk_add_blocks_internal(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, GArray *data)
-{
-	blockid_t head = *headptr, tail = *tailptr, new;
-	int tocopy;
-	struct _tailblock *tailblock;
-	struct _block *block, *newblock;
-	int space, copied = 0, left;
-
-	/* assumes this funciton is in control of any tail creation */ 
-	g_assert(tail == 0);
-
-	d(printf("Adding %d items to block list\n", data->len));
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-		d(printf("allocating new head %d\n", head));
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	/* ensure the first block is full before proceeding */
-	space = sizeof(block->bl_data)/sizeof(block->bl_data[0]) - block->used;
-	if (space) {
-		tocopy = MIN(data->len, space);
-		memcpy(block->bl_data+block->used, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-		block->used += tocopy;
-		ibex_block_dirty(block);
-		copied = tocopy;
-		d(printf("copied %d items to left over last node\n", tocopy));
-	}
-
-	while (copied < data->len) {
-		left = data->len - copied;
-		/* do we drop the rest in a tail? */
-		if (left < TAIL_THRESHOLD) {
-			d(printf("Storing remaining %d items in tail\n", left));
-			tocopy = left;
-			new = tail_get(store->blocks, tocopy);
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-			memcpy(&tailblock->tb_data[tailblock->tb_offset[TAIL_INDEX(new)]],
-			       &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			*tailptr = new;
-		} else {
-			new = ibex_block_get(store->blocks);
-			newblock = (struct _block *)ibex_block_read(store->blocks, new);
-			newblock->next = block_number(head);
-			tocopy = MIN(left, sizeof(block->bl_data)/sizeof(block->bl_data[0]));
-			d(printf("storing %d items in own block\n", tocopy));
-			memcpy(newblock->bl_data, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			newblock->used = tocopy;
-			block = newblock;
-			head = new;
-			ibex_block_dirty(newblock);
-		}
-		copied += tocopy;
-	}
-
-	*headptr = head;
-	return head;
-}
-/*
-  case 1:
-    no head, no tail, adding a lot of data
-      add blocks until the last, which goes in a tail node
-  case 2:
-    no head, no tail, adding a little data
-      just add a tail node
-  case 3:
-    no head, tail, total exceeds a block
-      merge as much as possible into new full blocks, then the remainder in the tail
-  case 4:
-    no head, tail, room in existing tail for data
-      add new data to tail node
-  case 5:
-    no head, tail, no room in existing tail for data
-      add a new tail node, copy data across, free old tail node
-*/
-
-static blockid_t
-disk_add_list(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, GArray *data)
-{
-	blockid_t new, head = *headptr, tail = *tailptr, *start;
-	struct _tailblock *tailblock, *tailnew;
-	int len;
-	GArray *tmpdata = NULL;
-
-	d(printf("adding %d items head=%d tail=%d\n", data->len, head, tail));
-	if (data->len == 0)
-		return head;
-
-	/* store length=1 data in the tail pointer */
-	if (head == 0 && tail == 0 && data->len == 1) {
-		*headptr = BLOCK_ONE;
-		*tailptr = g_array_index(data, blockid_t, 0);
-		return BLOCK_ONE;
-	}
-	/* if we got length=1 data to append to, upgrade it to a real block list */
-	if (head == BLOCK_ONE) {
-		tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-		g_array_append_vals(tmpdata, data->data, data->len);
-		g_array_append_val(tmpdata, tail);
-		head = *headptr = 0;
-		tail = *tailptr = 0;
-	}
-
-	/* if we have no head, then check the tail */
-	if (head == 0) {
-		if (tail == 0) {
-			if (data->len >= TAIL_THRESHOLD) {
-				/* add normally */
-				head = disk_add_blocks_internal(store, headptr, tailptr, data);
-			} else {
-				/* else add to a tail block */
-				new = tail_get(store->blocks, data->len);
-				d(printf("adding %d items to a tail block %d\n", data->len, new));
-				tailnew = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]],
-				       data->data, data->len*sizeof(blockid_t));
-				*tailptr = new;
-				ibex_block_dirty((struct _block *)tailnew);
-			}
-		} else {
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-			len = tail_info(tailblock, tail, &start);
-			/* case 3 */
-			if (len + data->len >= TAIL_THRESHOLD) {
-				/* this is suboptimal, but should work - merge the tail data with
-				   our new data, and write it out */
-				if (tmpdata == NULL) {
-					tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-					g_array_append_vals(tmpdata, data->data, data->len);
-				}
-				g_array_append_vals(tmpdata, start, len);
-				*tailptr = 0;
-				tail_free(store->blocks, tail);
-				head = disk_add_blocks_internal(store, headptr, tailptr, tmpdata);
-			} else if (tail_space(tailblock) >= data->len) {
-				/* can we just expand this in our node, or do we need a new one? */
-				tail_compress(tailblock, TAIL_INDEX(tail), data->len + len);
-				memcpy(&tailblock->tb_data[tailblock->tb_offset[TAIL_INDEX(tail)] + len],
-				       data->data, data->len * sizeof(blockid_t));
-				ibex_block_dirty((struct _block *)tailblock);
-			} else {
-				/* we need to allocate a new tail node */
-				new = tail_get(store->blocks, data->len + len);
-				/* and copy the data across */
-				tailnew = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]],
-				       start, len*sizeof(blockid_t));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]+len],
-				       data->data, data->len*sizeof(blockid_t));
-				tail_free(store->blocks, tail);
-				ibex_block_dirty((struct _block *)tailnew);
-				*tailptr = new;
-			}
-		}
-	} else {
-		if (tail) {
-			/* read/merge the tail with the new data, rewrite out.
-			   suboptimal, but it should be 'ok' ? */
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-			len = tail_info(tailblock, tail, &start);
-			tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-			g_array_append_vals(tmpdata, start, len);
-			g_array_append_vals(tmpdata, data->data, data->len);
-			*tailptr = 0;
-			tail_free(store->blocks, tail);
-			head = disk_add_blocks_internal(store, headptr, tailptr, tmpdata);
-		} else {
-			head = disk_add_blocks_internal(store, headptr, tailptr, data);
-		}
-	}
-	if (tmpdata)
-		g_array_free(tmpdata, TRUE);
-
-	return head;
-}
-
-static blockid_t
-disk_remove(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, nameid_t data)
-{
-	blockid_t head = *headptr, node = *headptr, tail = *tailptr;
-	int i;
-
-	/* special case for 1-item nodes */
-	if (head == BLOCK_ONE) {
-		if (tail == data) {
-			*tailptr = 0;
-			*headptr = 0;
-			head = 0;
-		}
-		return head;
-	}
-
-	d(printf("removing %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				struct _block *start = ibex_block_read(store->blocks, head);
-
-				d(printf("removing data from block %d\n ", head));
-
-				start->used--;
-				block->bl_data[i] = start->bl_data[start->used];
-				if (start->used == 0) {
-					blockid_t new;
-
-					d(printf("dropping block %d, new head = %d\n", head, start->next));
-					new = block_location(start->next);
-					start->next = block_number(store->blocks->root.free);
-					store->blocks->root.free = head;
-					head = new;
-				}
-				ibex_block_dirty(block);
-				ibex_block_dirty(start);
-				*headptr = head;
-				return head;
-			}
-		}
-		node = block_location(block->next);
-	}
-
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		int len;
-		blockid_t *start;
-
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++) {
-			if (start[i] == data) {
-				for (;i<len-1;i++)
-					start[i] = start[i+1];
-				if (len == 1)
-					*tailptr = 0;
-				if (len == 1 && (tailblock->used-1) == TAIL_INDEX(tail)) {
-					d(printf("dropping/unlinking tailblock %d (%d) used = %d\n",
-						 TAIL_BLOCK(tail), tail, tailblock->used));
-					tailblock->used--;
-					/* drop/unlink block? */
-					ibex_block_dirty((struct _block *)tailblock);
-					*tailptr = 0;
-				} else {
-					tail_compress(tailblock, TAIL_INDEX(tail), len-1);
-					ibex_block_dirty((struct _block *)tailblock);
-				}
-			}
-		}
-		
-	}
-
-	return head;
-}
-
-static void disk_free(struct _IBEXStore *store, blockid_t head, blockid_t tail)
-{
-	blockid_t next;
-	struct _block *block;
-
-	if (head == BLOCK_ONE)
-		return;
-
-	while (head) {
-		d(printf("freeing block %d\n", head));
-		block = ibex_block_read(store->blocks, head);
-		next = block_location(block->next);
-		ibex_block_free(store->blocks, head);
-		head = next;
-	}
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		d(printf("freeing tail block %d (%d)\n", TAIL_BLOCK(tail), tail));
-		tail_compress(tailblock, TAIL_INDEX(tail), 0);
-		ibex_block_dirty((struct _block *)tailblock);
-	}
-}
-
-static gboolean
-disk_find(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data)
-{
-	blockid_t node = head;
-	int i;
-
-	d(printf("finding %d from %d\n", data, head));
-
-	if (head == BLOCK_ONE)
-		return data == tail;
-
-	/* first check full blocks */
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				return TRUE;
-			}
-		}
-		node = block_location(block->next);
-	}
-
-	/* then check tail */
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		int len;
-		blockid_t *start;
-
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++) {
-			if (start[i] == data)
-				return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static GArray *
-disk_get(struct _IBEXStore *store, blockid_t head, blockid_t tail)
-{
-	GArray *result = g_array_new(0, 0, sizeof(nameid_t));
-
-	if (head == BLOCK_ONE) {
-		g_array_append_val(result, tail);
-		return result;
-	}
-
-	while (head) {
-		struct _block *block = ibex_block_read(store->blocks, head);
-
-		d(printf("getting data from block %d\n", head));
-
-		g_array_append_vals(result, block->bl_data, block->used);
-		head = block_location(block->next);
-		d(printf("next = %d\n", head));
-	}
-
-	/* chuck on any tail data as well */
-	if (tail) {
-		struct _tailblock *tailblock;
-		int len;
-		blockid_t *start;
-		
-		tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		len = tail_info(tailblock, tail, &start);
-		g_array_append_vals(result, start, len);
-	}
-	return result;
-}
-
-void ibex_diskarray_dump(struct _memcache *blocks, blockid_t head, blockid_t tail);
-
-void
-ibex_diskarray_dump(struct _memcache *blocks, blockid_t head, blockid_t tail)
-{
-	blockid_t node = head;
-
-	printf("dumping list %d tail %d\n", node, tail);
-	if (head == BLOCK_ONE) {
-		printf(" 1 length index: %d\n", tail);
-		return;
-	}
-       
-	while (node) {
-		struct _block *block = ibex_block_read(blocks, node);
-		int i;
-
-		printf(" block %d used %d\n ", node, block->used);
-		for (i=0;i<block->used;i++) {
-			printf(" %d", block->bl_data[i]);
-		}
-		printf("\n");
-		node = block_location(block->next);
-	}
-
-	printf("tail: ");
-	if (tail) {
-		struct _tailblock *tailblock;
-		int len;
-		blockid_t *start;
-		int i;
-
-		tailblock = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tail));
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++)
-			printf(" %d", start[i]);
-	}
-	printf("\n");
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	struct _memcache *bc;
-	struct _IBEXStore *disk;
-	int i;
-	blockid_t data[100];
-	GArray adata;
-	blockid_t head=0, tail=0;
-
-	for (i=0;i<100;i++) {
-		data[i] = i;
-	}
-
-	bc = ibex_block_cache_open("index.db", O_CREAT|O_RDWR, 0600);
-	disk = ibex_diskarray_class.create(bc);
-
-	head = 0;
-	tail = 0;
-	adata.data = data;
-	adata.len = 70;
-	for (i=0;i<100;i++) {
-		printf("Loop %d\n", i);
-		ibex_diskarray_class.add_list(disk, &head, &tail, &adata);
-		ibex_diskarray_dump(bc, head, tail);
-	}
-	
-#if 0
-	for (i=1;i<100;i++) {
-		printf("inserting %d items\n", i);
-		adata.data = data;
-		adata.len = i;
-		head=0;
-		tail=0;
-		ibex_diskarray_class.add_list(disk, &head, &tail, &adata);
-		ibex_diskarray_dump(bc, head, tail);
-	}
-#endif
-	ibex_diskarray_class.close(disk);
-	ibex_block_cache_close(bc);
-	return 0;
-}
-
-#endif
diff --git a/libibex/dumpindex.c b/libibex/dumpindex.c
deleted file mode 100644
index 410a7083d6..0000000000
--- a/libibex/dumpindex.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-  Dump the hash tables from an ibex file.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ibex_internal.h"
-
-extern void ibex_hash_dump(struct _IBEXIndex *index);
-
-static void
-index_iterate(struct _IBEXIndex *index)
-{
-	struct _IBEXCursor *idc;
-	int len;
-	char *key;
-	int total = 0, totallen = 0;
-
-	idc = index->klass->get_cursor(index);
-	key = idc->klass->next_key(idc, &len);
-	while (len) {
-		total++;
-		totallen += len;
-		printf("%s\n", key);
-		g_free(key);
-		key = idc->klass->next_key(idc, &len);
-	}
-	g_free(key);
-
-	idc->klass->close(idc);
-
-	printf("Iterate Totals: %d items, total bytes %d\n", total, totallen);
-}
-
-int main(int argc, char **argv)
-{
-	ibex *ib;
-
-#ifdef ENABLE_THREADS
-	g_thread_init(0);
-#endif
-
-	if (argc != 2) {
-		printf("Usage: %s ibexfile\n", argv[0]);
-		return 1;
-	}
-	ib = ibex_open(argv[1], O_RDONLY, 0);
-	if (ib == NULL) {
-		perror("Opening ibex file\n");
-		return 1;
-	}
-
-	ibex_hash_dump(ib->words->wordindex);
-	ibex_hash_dump(ib->words->nameindex);
-
-	index_iterate(ib->words->wordindex);
-	index_iterate(ib->words->nameindex);
-
-	ibex_close(ib);
-
-	return 0;
-}
diff --git a/libibex/hash.c b/libibex/hash.c
deleted file mode 100644
index f79ee8f55e..0000000000
--- a/libibex/hash.c
+++ /dev/null
@@ -1,859 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* hash based index mechanism */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-
-#define HASH_SIZE (1024)
-#define KEY_THRESHOLD (sizeof(struct _hashkey) + 4) /* minimum number of free bytes we worry about
-						      maintaining free blocks for */
-#define ARRAY_LEN(a) (sizeof(a)/sizeof(a[0]))
-
-typedef guint32 hashid_t;
-
-struct _HASHCursor {
-	struct _IBEXCursor cursor;
-
-	hashid_t key;
-	hashid_t block;
-	unsigned int index;
-	unsigned int size;
-};
-
-static struct _IBEXIndex *hash_create(struct _memcache *bc, int size);
-static struct _IBEXIndex *hash_open(struct _memcache *bc, blockid_t root);
-static int hash_sync(struct _IBEXIndex *index);
-static int hash_close(struct _IBEXIndex *index);
-
-static hashid_t hash_find(struct _IBEXIndex *index, const char *key, int keylen);
-static void hash_remove(struct _IBEXIndex *index, const char *key, int keylen);
-static hashid_t hash_insert(struct _IBEXIndex *index, const char *key, int keylen);
-static char *hash_get_key(struct _IBEXIndex *index, hashid_t hashbucket, int *len);
-static void hash_set_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t blockid, blockid_t tail);
-static blockid_t hash_get_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t *tail);
-static struct _IBEXCursor *hash_get_cursor(struct _IBEXIndex *index);
-
-static struct _IBEXCursor *hash_cursor_create(struct _IBEXIndex *);
-static void hash_cursor_close(struct _IBEXCursor *);
-static guint32 hash_cursor_next(struct _IBEXCursor *);
-static char *hash_cursor_next_key(struct _IBEXCursor *, int *keylenptr);
-
-struct _IBEXIndexClass ibex_hash_class = {
-	hash_create, hash_open,
-	hash_sync, hash_close,
-	hash_find,
-	hash_remove,
-	hash_insert,
-	hash_get_key,
-	hash_set_data_block,
-	hash_get_data_block,
-	hash_get_cursor,
-};
-
-struct _IBEXCursorClass ibex_hash_cursor_class = {
-	hash_cursor_close,
-	hash_cursor_next,
-	hash_cursor_next_key
-};
-
-/* the reason we have the tail here is that otherwise we need to
-   have a 32 bit blockid for the root node; which would make this
-   structure the same size anyway, with about 24 wasted bits */
-struct _hashkey {
-	blockid_t next;		/* next in hash chain */
-	blockid_t tail;
-	unsigned int root:32-BLOCK_BITS;
-	unsigned int keyoffset:BLOCK_BITS;
-};
-
-struct _hashblock {
-	unsigned int next:32-BLOCK_BITS;	/* next block, linked list of all key blocks: block number */
-	unsigned int used:BLOCK_BITS;		/* number of elements used */
-	union {
-		struct _hashkey keys[(BLOCK_SIZE-4)/sizeof(struct _hashkey)];
-		char keydata[BLOCK_SIZE-4];
-	} hashblock_u;
-};
-#define hb_keys hashblock_u.keys
-#define hb_keydata hashblock_u.keydata
-
-/* size of block overhead + 2 key block overhead */
-#define MAX_KEYLEN (BLOCK_SIZE - 4 - 12 - 12)
-
-/* root block for a hash index */
-struct _hashroot {
-	hashid_t free;		/* free list */
-	guint32 size;		/* how big the hash table is */
-	hashid_t keys;		/* linked list of blocks */
-	hashid_t table[(BLOCK_SIZE-8)/sizeof(hashid_t)]; /* pointers to blocks of pointers */
-};
-
-struct _hashtableblock {
-	hashid_t buckets[BLOCK_SIZE/sizeof(hashid_t)];
-};
-
-/* map a hash index to a block index */
-#define HASH_INDEX(b) ((b) & (BLOCK_SIZE-1))
-/* map a hash index to a block number */
-#define HASH_BLOCK(b) ((b) & ~(BLOCK_SIZE-1))
-/* map a block + index to a hash key */
-#define HASH_KEY(b, i) (((b) & ~(BLOCK_SIZE-1)) | ((i) & (BLOCK_SIZE-1)))
-
-/* taken from tdb/gdbm */
-static unsigned int hash_key(const unsigned char *key, int keylen)
-{
-	char *newkey;
-	newkey = alloca(keylen+1);
-	memcpy(newkey, key, keylen);
-	newkey[keylen]=0;
-	return g_str_hash(newkey);
-#if 0
-	unsigned int value;	/* Used to compute the hash value.  */
-	unsigned int  i;	/* Used to cycle through random values. */
-
-	/* Set the initial value from the key size. */
-	value = 0x238F13AF * keylen;
-	for (i=0; i < keylen; i++) {
-		value = (value + (key[i] << (i*5 % 24)));
-	}
-
-	value = (1103515243 * value + 12345);  
-
-	return value;
-#endif
-}
-
-/* create a new hash table, return a pointer to its root block */
-static struct _IBEXIndex *
-hash_create(struct _memcache *bc, int size)
-{
-	blockid_t root, block;
-	struct _hashroot *hashroot;
-	int i;
-	struct _hashtableblock *table;
-	struct _IBEXIndex *index;
-
-	g_assert(size<=10240);
-
-	d(printf("initialising hash table, size = %d\n", size));
-
-	index = g_malloc0(sizeof(*index));
-	index->blocks = bc;
-	index->klass = &ibex_hash_class;
-	root = ibex_block_get(bc);
-	index->root = root;
-	d(printf(" root = %d\n", root));
-	hashroot = (struct _hashroot *)ibex_block_read(bc, root);
-	hashroot->free = 0;
-	hashroot->size = size;
-	ibex_block_dirty((struct _block *)hashroot);
-	for (i=0;i<size/(BLOCK_SIZE/sizeof(blockid_t));i++) {
-		d(printf("initialising hash table index block %d\n", i));
-		block = hashroot->table[i] = ibex_block_get(bc);
-		table = (struct _hashtableblock *)ibex_block_read(bc, block);
-		memset(table, 0, sizeof(table));
-		ibex_block_dirty((struct _block *)table);
-	}
-
-	return index;
-}
-
-static struct _IBEXIndex *
-hash_open(struct _memcache *bc, blockid_t root)
-{
-	struct _IBEXIndex *index;
-
-	/* FIXME: check a 'magic', and the root for validity */
-
-	index = g_malloc0(sizeof(*index));
-	index->blocks = bc;
-	index->root = root;
-	index->klass = &ibex_hash_class;
-
-	return index;
-}
-
-
-static int hash_sync(struct _IBEXIndex *index)
-{
-	/* nop, index always synced on disk (at least, to blocks) */
-	return 0;
-}
-
-static int hash_close(struct _IBEXIndex *index)
-{
-#ifdef INDEX_STAT
-	printf("Performed %d lookups, average %f depth\n", index->lookups, (double)index->lookup_total/index->lookups);
-#endif
-	g_free(index);
-	return 0;
-}
-
-/* get an iterator class */
-static struct _IBEXCursor *hash_get_cursor(struct _IBEXIndex *index)
-{
-	return hash_cursor_create(index);
-}
-
-/* convert a hashbucket id into a name */
-static char *
-hash_get_key(struct _IBEXIndex *index, hashid_t hashbucket, int *len)
-{
-	struct _hashblock *bucket;
-	int ind;
-	char *ret, *start, *end;
-
-	if (hashbucket == 0) {
-		if (len)
-			*len = 0;
-		return g_strdup("");
-	}
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-	ind = HASH_INDEX(hashbucket);
-
-	g_assert(ind < bucket->used);
-
-	start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-	if (ind == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-	}
-	
-	ret = g_malloc(end-start+1);
-	memcpy(ret, start, end-start);
-	ret[end-start]=0;
-	if (len)
-		*len = end-start;
-	return ret;
-}
-
-/* sigh, this is fnugly code ... */
-static hashid_t
-hash_find(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket;
-	struct _hashtableblock *table;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	d(printf("finding hash %.*s\n", keylen, key));
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	g_assert(hashtable != 0);
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-#ifdef INDEX_STAT
-	index->lookups++;
-#endif
-	/* go down the bucket chain, reading each entry till we are done ... */
-	while (hashbucket != 0) {
-		struct _hashblock *bucket;
-		char *start, *end;
-		int ind;
-
-#ifdef INDEX_STAT
-		index->lookup_total++;
-#endif
-
-		d(printf(" checking bucket %d\n", hashbucket));
-
-		/* get the real bucket id from the hashbucket id */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		/* and get the key number within the block */
-		ind = HASH_INDEX(hashbucket);
-
-		g_assert(ind < bucket->used);
-
-		start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-		if (ind == 0) {
-			end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-		} else {
-			end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-		}
-		if ( (end-start) == keylen
-		     && memcmp(start, key, keylen) == 0) {
-			return hashbucket;
-		}
-		hashbucket = bucket->hb_keys[ind].next;
-	}
-	return 0;
-}
-
-static int
-hash_info(struct _hashblock *bucket, int index)
-{
-	char *start, *end;
-
-	g_assert(index < bucket->used);
-
-	start = &bucket->hb_keydata[bucket->hb_keys[index].keyoffset];
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	return end-start;
-}
-
-
-/* TODO: get rid of hash_compress/remove and just have one a-la the disktail code */
-
-/* compresses the bucket 'bucket', removing data
-   at index 'index' */
-static void
-hash_compress(struct _hashblock *bucket, int index)
-{
-	int i;
-	char *start, *end, *newstart;
-
-	/* get start/end of area to zap */
-	start = &bucket->hb_keydata[bucket->hb_keys[index].keyoffset];
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	if (start == end)
-		return;
-
-	/* fixup data */
-	newstart = &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset];
-	memmove(newstart+(end-start), newstart, start-newstart);
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->hb_keys[i].keyoffset += (end-start);
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-/* make room 'len' for the key 'index' */
-/* assumes key 'index' is already empty (0 length) */
-static void
-hash_expand(struct _hashblock *bucket, int index, int len)
-{
-	int i;
-	char *end, *newstart;
-
-	/* get start/end of area to zap */
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	/* fixup data */
-	newstart = &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset];
-	memmove(newstart-len, newstart, end-newstart);
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->hb_keys[i].keyoffset -= len;
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-static void
-hash_remove(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket, hashprev;
-	struct _hashtableblock *table;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	d(printf("removing hash %.*s\n", keylen, key));
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-	/* go down the bucket chain, reading each entry till we are done ... */
-	hashprev = 0;
-	while (hashbucket != 0) {
-		struct _hashblock *bucket;
-		char *start, *end;
-		int ind;
-
-		d(printf(" checking bucket %d\n", hashbucket));
-
-		/* get the real bucket id from the hashbucket id */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		/* and get the key number within the block */
-		ind = HASH_INDEX(hashbucket);
-
-		g_assert(ind < bucket->used);
-
-		start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-		if (ind == 0) {
-			end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-		} else {
-			end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-		}
-		if ( (end-start) == keylen
-		     && memcmp(start, key, keylen) == 0) {
-			struct _hashblock *prevbucket;
-
-			if (hashprev == 0) {
-				/* unlink from hash chain */
-				table->buckets[hashentry] = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-				/* link into free list */
-				bucket->hb_keys[HASH_INDEX(hashbucket)].next = hashroot->free;
-				hashroot->free = hashbucket;
-				/* compress away data */
-				hash_compress(bucket, HASH_INDEX(hashbucket));
-				ibex_block_dirty((struct _block *)bucket);
-				ibex_block_dirty((struct _block *)table);
-				ibex_block_dirty((struct _block *)hashroot);
-			} else {
-				prevbucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashprev));
-				prevbucket->hb_keys[HASH_INDEX(hashprev)].next =
-					bucket->hb_keys[ind].next;
-				/* link into free list */
-				bucket->hb_keys[ind].next = hashroot->free;
-				hashroot->free = hashbucket;
-				/* compress entry */
-				hash_compress(bucket, ind);
-				ibex_block_dirty((struct _block *)bucket);
-				ibex_block_dirty((struct _block *)prevbucket);
-				ibex_block_dirty((struct _block *)hashroot);
-			}
-			return;
-		}
-		hashprev = hashbucket;
-		hashbucket = bucket->hb_keys[ind].next;
-	}
-}
-
-/* set where the datablock is located */
-static void
-hash_set_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t blockid, blockid_t tail)
-{
-	struct _hashblock *bucket;
-
-	d(printf("setting data block hash %d to %d tail %d\n", keyid, blockid, tail));
-
-	/* map to a block number */
-	g_assert((blockid & (BLOCK_SIZE-1)) == 0);
-	blockid >>= BLOCK_BITS;
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyid));
-	if (bucket->hb_keys[HASH_INDEX(keyid)].root != blockid
-	    || bucket->hb_keys[HASH_INDEX(keyid)].tail != tail) {
-		bucket->hb_keys[HASH_INDEX(keyid)].tail = tail;
-		bucket->hb_keys[HASH_INDEX(keyid)].root = blockid;
-		ibex_block_dirty((struct _block *)bucket);
-	}
-}
-
-static blockid_t
-hash_get_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t *tail)
-{
-	struct _hashblock *bucket;
-
-	d(printf("getting data block hash %d\n", keyid));
-
-	if (keyid == 0) {
-		if (tail)
-			*tail = 0;
-		return 0;
-	}
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyid));
-	if (tail)
-		*tail = bucket->hb_keys[HASH_INDEX(keyid)].tail;
-	return bucket->hb_keys[HASH_INDEX(keyid)].root << BLOCK_BITS;
-}
-
-static hashid_t
-hash_insert(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket, keybucket, keyprev, keyfree;
-	struct _hashtableblock *table;
-	struct _hashblock *bucket;
-	int count;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	d(printf("inserting hash %.*s\n", keylen, key));
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-	/* now look for a free slot, first try the free list */
-	/* but dont try too hard if our key is just too long ... so just scan upto
-	   4 blocks, but if we dont find a space, tough ... */
-	keybucket = hashroot->free;
-	keyprev = 0;
-	count = 0;
-	while (keybucket && count<4) {
-		int space;
-		
-		d(printf(" checking free %d\n", keybucket));
-
-		/* read the bucket containing this free key */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keybucket));
-
-		/* check if there is enough space for the key */
-		space =  &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset]
-			- (char *)&bucket->hb_keys[bucket->used];
-		if (space >= keylen) {
-			hash_expand(bucket, HASH_INDEX(keybucket), keylen);
-			memcpy(&bucket->hb_keydata[bucket->hb_keys[HASH_INDEX(keybucket)].keyoffset],
-			       key, keylen);
-
-			/* check if there is free space still in this node, and there are no other empty blocks */
-			keyfree = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-			if ((space-keylen) >= KEY_THRESHOLD) {
-				int i;
-				int head = ARRAY_LEN(bucket->hb_keydata);
-				int found = FALSE;
-
-				for (i=0;i<bucket->used;i++) {
-					if (bucket->hb_keys[i].keyoffset == head) {
-						/* already have a free slot in this block, leave it */
-						found = TRUE;
-						break;
-					}
-					head = bucket->hb_keys[i].keyoffset;
-				}
-				if (!found) {
-					/* we should link in a new free slot for this node */
-					bucket->hb_keys[bucket->used].next = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-					bucket->hb_keys[bucket->used].keyoffset = bucket->hb_keys[bucket->used-1].keyoffset;
-					keyfree = HASH_KEY(HASH_BLOCK(keybucket), bucket->used);
-					bucket->used++;
-				}
-			}
-			/* link 'keyfree' back to the parent ... */
-			if (keyprev == 0) {
-				hashroot->free = keyfree;
-				ibex_block_dirty((struct _block *)hashroot);
-			} else {
-				struct _hashblock *prevbucket;
-				prevbucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyprev));
-				prevbucket->hb_keys[HASH_INDEX(keyprev)].next = keyfree;
-				ibex_block_dirty((struct _block *)prevbucket);
-			}
-
-			/* link into the hash chain */
-			bucket->hb_keys[HASH_INDEX(keybucket)].next = hashbucket;
-			bucket->hb_keys[HASH_INDEX(keybucket)].root = 0;
-			bucket->hb_keys[HASH_INDEX(keybucket)].tail = 0;
-			table->buckets[hashentry] = keybucket;
-			ibex_block_dirty((struct _block *)table);
-			ibex_block_dirty((struct _block *)bucket);
-
-			d(printf(" new key id %d\n", keybucket));
-			d(printf(" new free id %d\n", hashroot->free));
-
-			return keybucket;
-		}
-
-		count++;
-		keyprev = keybucket;
-		keybucket = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-	}
-
-	/* else create a new block ... */
-	keybucket = ibex_block_get(index->blocks);
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, keybucket);
-
-	d(printf("creating new key bucket %d\n", keybucket));
-
-	memset(bucket, 0, sizeof(*bucket));
-
-	bucket->used = 2;
-	/* first block, is the new key */
-	bucket->hb_keys[0].keyoffset = ARRAY_LEN(bucket->hb_keydata) - keylen;
-	memcpy(&bucket->hb_keydata[bucket->hb_keys[0].keyoffset], key, keylen);
-	bucket->hb_keys[0].next = hashbucket;
-	bucket->hb_keys[0].root = 0;
-	bucket->hb_keys[0].tail = 0;
-
-	table->buckets[hashentry] = HASH_KEY(keybucket, 0);
-
-	/* next block is a free block, link into free list */
-	bucket->hb_keys[1].keyoffset = bucket->hb_keys[0].keyoffset;
-	bucket->hb_keys[1].next = hashroot->free;
-	hashroot->free = HASH_KEY(keybucket, 1);
-
-	/* link new block into keys list */
-	bucket->next = block_number(hashroot->keys);
-	hashroot->keys = keybucket;
-
-	ibex_block_dirty((struct _block *)hashroot);
-	ibex_block_dirty((struct _block *)table);
-	ibex_block_dirty((struct _block *)bucket);
-
-	d(printf(" new key id %d\n", HASH_KEY(keybucket, 0)));
-	d(printf(" new free id %d\n", hashroot->free));
-
-	return HASH_KEY(keybucket, 0);
-}
-
-/* hash cursor functions */
-static struct _IBEXCursor *
-hash_cursor_create(struct _IBEXIndex *idx)
-{
-	struct _HASHCursor *idc;
-	struct _hashroot *hashroot;
-
-	idc = g_malloc(sizeof(*idc));
-	idc->cursor.klass = &ibex_hash_cursor_class;
-	idc->cursor.index = idx;
-	idc->key = 0;
-	idc->index = 0;
-
-	hashroot = (struct _hashroot *)ibex_block_read(idx->blocks, idx->root);
-	idc->size = hashroot->size;
-	idc->block = hashroot->keys;
-	
-	return &idc->cursor;
-}
-
-static void
-hash_cursor_close(struct _IBEXCursor *idc)
-{
-	g_free(idc);
-}
-
-static guint32
-hash_cursor_next(struct _IBEXCursor *idc)
-{
-	struct _HASHCursor *hc = (struct _HASHCursor *)idc;
-	struct _hashblock *bucket;
-
-	while (hc->block != 0) {
-		bucket = (struct _hashblock *)ibex_block_read(idc->index->blocks, hc->block);
-		while (hc->index < bucket->used) {
-			if (hash_info(bucket, hc->index) > 0) {
-				hc->key = HASH_KEY(hc->block, hc->index);
-				hc->index++;
-				if (hc->index == bucket->used) {
-					hc->index = 0;
-					hc->block = block_location(bucket->next);
-				}
-				return hc->key;
-			}
-			hc->index++;
-		}
-		hc->index = 0;
-		hc->block = block_location(bucket->next);
-	}
-
-	return hc->block;
-}
-
-static char *
-hash_cursor_next_key(struct _IBEXCursor *idc, int *keylenptr)
-{
-	/* TODO: this could be made slightly mroe efficient going to the structs direct.
-	   but i'm lazy today */
-	return idc->index->klass->get_key(idc->index, idc->klass->next(idc), keylenptr);
-}
-
-/* debug */
-void ibex_hash_dump(struct _IBEXIndex *index);
-static void ibex_hash_dump_rec(struct _IBEXIndex *index, int *words, int *wordslen);
-
-void ibex_hash_dump(struct _IBEXIndex *index)
-{
-	int words = 0, wordslen=0;
-
-	ibex_hash_dump_rec(index, &words, &wordslen);
-
-	printf("Total words = %d, bytes = %d, ave length = %f\n", words, wordslen, (double)wordslen/(double)words);
-}
-
-
-static void
-ibex_hash_dump_rec(struct _IBEXIndex *index, int *words, int *wordslen)
-{
-	int i;
-	struct _hashtableblock *table;
-	struct _hashblock *bucket;
-	struct _hashroot *hashroot;
-	blockid_t hashtable;
-	hashid_t hashbucket;
-	extern void ibex_diskarray_dump(struct _memcache *blocks, blockid_t head, blockid_t tail);
-
-
-	printf("Walking hash tree:\n");
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-	for (i=0;i<hashroot->size;i++) {
-		printf("Hash table chain: %d\n", i);
-		hashtable = hashroot->table[i / (BLOCK_SIZE/sizeof(blockid_t))];
-		table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-		hashbucket = table->buckets[i % (BLOCK_SIZE/sizeof(blockid_t))];
-		while (hashbucket) {
-			int len;
-
-			*words = *words + 1;
-
-			bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-			printf(" bucket %d: [used %d]", hashbucket, bucket->used);
-			if (HASH_INDEX(hashbucket) == 0) {
-				len = ARRAY_LEN(bucket->hb_keydata) -
-					bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset;
-			} else {
-				len = bucket->hb_keys[HASH_INDEX(hashbucket)-1].keyoffset -
-					bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset;
-			}
-			printf("'%.*s' = %d next=%d\n", len, &bucket->hb_keydata[bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset],
-			       bucket->hb_keys[HASH_INDEX(hashbucket)].root,
-			       bucket->hb_keys[HASH_INDEX(hashbucket)].next);
-
-			*wordslen = *wordslen + len;
-
-			ibex_diskarray_dump(index->blocks,
-					    bucket->hb_keys[HASH_INDEX(hashbucket)].root << BLOCK_BITS,
-					    bucket->hb_keys[HASH_INDEX(hashbucket)].tail);
-
-			hashbucket = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-		}
-		/* make sure its still in the cache */
-		hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-	}
-
-	hashbucket = hashroot->free;
-	printf("Dumping free lists ..\n");
-	while (hashbucket) {
-		printf(" %d", hashbucket);
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		hashbucket = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-	}
-	printf("\n");
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	struct _memcache *bc;
-	struct _IBEXIndex *hash;
-	int i;
-
-	bc = ibex_block_cache_open("index.db", O_CREAT|O_RDWR, 0600);
-	hash = ibex_hash_class.create(bc, 1024);
-	for (i=0;i<10000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.insert(hash, key, strlen(key));
-	}
-
-	for (i=500;i<1000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.remove(hash, key, strlen(key));
-	}
-
-	for (i=500;i<1000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.insert(hash, key, strlen(key));
-	}
-
-
-	ibex_hash_dump(hash);
-
-	for (i=0;i<2000;i++) {
-		char key[16], *lookup;
-		hashid_t keyid;
-		blockid_t root, tail;
-
-		sprintf(key, "key %d", i);
-		keyid = ibex_hash_class.find(hash, key, strlen(key));
-		lookup = ibex_hash_class.get_key(hash, keyid, 0);
-		root = ibex_hash_class.get_data(hash, keyid, &tail);
-		printf("key %s = %d = '%s' root:%d tail:%d \n", key, keyid, lookup, root, tail);
-		g_free(lookup);
-	}
-
-	ibex_hash_class.close(hash);
-	ibex_block_cache_close(bc);
-	return 0;
-}
-
-#endif
diff --git a/libibex/ibex.h b/libibex/ibex.h
deleted file mode 100644
index 03635e275d..0000000000
--- a/libibex/ibex.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef IBEX_H
-#define IBEX_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-struct ibex;
-typedef struct ibex ibex;
-
-/* All functions that can fail set errno and return NULL or -1 on
- * failure.
- */
-
-/* Open the named ibex index file. If CREATE is true, create the file
- * if it doesn't already exist.
- */
-ibex *ibex_open (char *file, int flags, int mode);
-
-/* Write the ibex to disk. */
-int ibex_write (ibex *ib);
-
-/* only save if ibex has changed. */
-int ibex_save (ibex *ib);
-
-/* Write the ibex to disk if it has changed, and free all memory
- * associated with it.
- */
-int ibex_close (ibex *ib);
-
-
-
-/* Index the named file. (If the FILENAME is already in the index,
- * remove the old copy.
- */
-int ibex_index_file (ibex *ib, char *filename);
-
-/* Index LEN bytes off FD, using NAME as the filename in the index.
- * (If NAME already exists in the index, this adds more data to it.)
- */
-int ibex_index_fd (ibex *ib, char *name, int fd, size_t len);
-
-/* Like ibex_index_fd, but with a buffer rather than a file descriptor.
- * The buffer does not need to be '\0'-terminated. If UNREAD is not
- * NULL, then the indexer won't assume that the buffer ends on a word
- * boundary, and will return (in UNREAD) the number of bytes from the
- * end of the buffer that it didn't use, if any.
- */
-int ibex_index_buffer (ibex *ib, char *name, char *buffer,
-		       size_t len, size_t *unread);
-
-/* Remove entries for a given file from the index. (Most of the removal
- * isn't actually done until the file is written out to disk, so this
- * is very fast.)
- */
-void ibex_unindex (ibex *ib, char *name);
-
-/* Rename a file in the index. (This is also fast.) */
-void ibex_rename (ibex *ib, char *oldfilename, char *newfilename);
-
-
-
-/* Find a word in the index. Returns an array of strings: the caller
- * should free the array, but should not free or modify the strings.
- */
-GPtrArray *ibex_find (ibex *ib, char *word);
-
-/* Find if a word is contained in a specific name reference.
- */
-gboolean ibex_find_name (ibex *ib, char *name, char *word);
-
-/* has a file been indexed?
- */
-gboolean ibex_contains_name(ibex *ib, char *name);
-
-/* Return all the files containing all of the words in the given
- * array. Returned data is like with ibex_find.
- */
-GPtrArray *ibex_find_all (ibex *ib, GPtrArray *words);
-
-/* Debug function, dumps the whole index tree, showing removed files as well */
-void ibex_dump_all (ibex *ib);
-
-#endif /* ! IBEX_H */
-
diff --git a/libibex/ibex_block.c b/libibex/ibex_block.c
deleted file mode 100644
index faeee232ac..0000000000
--- a/libibex/ibex_block.c
+++ /dev/null
@@ -1,345 +0,0 @@
-
-#include <glib.h>
-
-#include <stdio.h>
-#include <unicode.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-
-#include "ibex_internal.h"
-
-#define d(x)
-
-static signed char utf8_trans[] = {
-	'A', 'A', 'A', 'A', 'A', 'A', -1, 'C', 'E', 'E', 'E', 'E', 'I', 'I',
-	'I', 'I', -2, 'N', 'O', 'O', 'O', 'O', 'O', '*', 'O', 'U', 'U', 'U',
-	'U', 'Y', -3, -4, 'a', 'a', 'a', 'a', 'a', 'a', -5, 'c', 'e', 'e',
-	'e', 'e', 'i', 'i', 'i', 'i', -6, 'n', 'o', 'o', 'o', 'o', 'o', '/',
-	'o', 'u', 'u', 'u', 'u', 'y', -7, 'y', 'A', 'a', 'A', 'a', 'A', 'a',
-	'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd', 'D', 'd', 'E', 'e',
-	'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g', 'G', 'g',
-	'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
-	'I', 'i', -8, -9, 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L',
-	'l', 'L', 'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', 'n', -10, -11,
-	'O', 'o', 'O', 'o', 'O', 'o', -12, -13, 'R', 'r', 'R', 'r', 'R', 'r',
-	'S', 'r', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
-	'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'W', 'w',
-	'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's'
-};
-
-static char *utf8_long_trans[] = {
-	"AE", "TH", "TH", "ss", "ae", "th", "th", "IJ", "ij",
-	"NG", "ng", "OE", "oe"
-};
-
-/* This is a bit weird. It takes pointers to the start and end (actually
- * just past the end) of a UTF-8-encoded word, and a buffer at least 1
- * byte longer than the length of the word. It copies the word into the
- * buffer in all lowercase without accents, and splits up ligatures.
- * (Since any ligature would be a multi-byte character in UTF-8, splitting
- * them into two US-ASCII characters won't overrun the buffer.)
- *
- * It is not safe to call this routine with bad UTF-8.
- */
-static void
-ibex_normalise_word(char *start, char *end, char *buf)
-{
-	unsigned char *s, *d;
-	unicode_char_t uc;
-
-	s = (unsigned char *)start;
-	d = (unsigned char *)buf;
-	while (s < (unsigned char *)end) {
-		if (*s < 0x80) {
-			/* US-ASCII character: copy unless it's
-			 * an apostrophe.
-			 */
-			if (*s != '\'')
-				*d++ = tolower (*s);
-			s++;
-		} else {
-			char *next = unicode_get_utf8 (s, &uc);
-			if (uc >= 0xc0 && uc < 0xc0 + sizeof (utf8_trans)) {
-				signed char ch = utf8_trans[uc - 0xc0];
-				if (ch > 0)
-					*d++ = tolower (ch);
-				else {
-					*d++ = tolower (utf8_long_trans[-ch - 1][0]);
-					*d++ = tolower (utf8_long_trans[-ch - 1][1]);
-				}
-				s = next;
-			} else {
-				while (s < (unsigned char *)next)
-					*d++ = *s++;
-			}
-		}
-	}
-	*d = '\0';
-}
-
-enum { IBEX_ALPHA, IBEX_NONALPHA, IBEX_INVALID, IBEX_INCOMPLETE };
-
-/* This incorporates parts of libunicode, because there's no way to
- * force libunicode to not read past a certain point.
- */
-static int
-utf8_category (char *sp, char **snp, char *send)
-{
-	unsigned char *p = (unsigned char *)sp, **np = (unsigned char **)snp;
-	unsigned char *end = (unsigned char *)send;
-
-	if (isascii (*p)) {
-		*np = p + 1;
-		if (isalpha (*p) || *p == '\'')
-			return IBEX_ALPHA;
-		return IBEX_NONALPHA;
-	} else {
-		unicode_char_t uc;
-		int more;
-
-		if ((*p & 0xe0) == 0xc0) {
-			more = 1;
-			uc = *p & 0x1f;
-		} else if ((*p & 0xf0) == 0xe0) {
-			more = 2;
-			uc = *p & 0x0f;
-		} else if ((*p & 0xf8) == 0xf0) {
-			more = 3;
-			uc = *p & 0x07;
-		} else if ((*p & 0xfc) == 0xf8) {
-			more = 4;
-			uc = *p & 0x03;
-		} else if ((*p & 0xfe) == 0xfc) {
-			more = 5;
-			uc = *p & 0x01;
-		} else
-			return IBEX_INVALID;
-
-		if (p + more > end)
-			return IBEX_INCOMPLETE;
-
-		while (more--) {
-			if ((*++p & 0xc0) != 0x80)
-				return IBEX_INVALID;
-			uc <<= 6;
-			uc |= *p & 0x3f;
-		}
-
-		*np = p + 1;
-		if (unicode_isalpha (uc))
-			return IBEX_ALPHA;
-		else
-			return IBEX_NONALPHA;
-	}
-}
-
-/**
- * ibex_index_buffer: the lowest-level ibex indexing interface
- * @ib: an ibex
- * @name: the name of the file being indexed
- * @buffer: a buffer containing data from the file
- * @len: the length of @buffer
- * @unread: an output argument containing the number of unread bytes
- *
- * This routine indexes up to @len bytes from @buffer into @ib.
- * If @unread is NULL, the indexer assumes that the buffer ends on a
- * word boundary, and will index all the way to the end of the
- * buffer. If @unread is not NULL, and the buffer ends with an
- * alphabetic character, the indexer will assume that the buffer has
- * been cut off in the middle of a word, and return the number of
- * un-indexed bytes at the end of the buffer in *@unread. The caller
- * should then read in more data through whatever means it has
- * and pass in the unread bytes from the original buffer, followed
- * by the new data, on its next call.
- *
- * Return value: 0 on success, -1 on failure.
- **/
-int
-ibex_index_buffer (ibex *ib, char *name, char *buffer, size_t len, size_t *unread)
-{
-	char *p, *q, *nq, *end, *word;
-	int wordsiz, cat = 0;
-	GHashTable *words = g_hash_table_new(g_str_hash, g_str_equal);
-	GPtrArray *wordlist = g_ptr_array_new();
-	int i, ret=-1;
-
-	if (unread)
-		*unread = 0;
-
-	end = buffer + len;
-	wordsiz = 20;
-	word = g_malloc (wordsiz);
-
-	p = buffer;
-	while (p < end) {
-		while (p < end) {
-			cat = utf8_category (p, &q, end);
-			if (cat != IBEX_NONALPHA)
-				break;
-			p = q;
-		}
-		if (p == end) {
-			goto done;
-		} else if (cat == IBEX_INVALID) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE)
-			q = end;
-
-		while (q < end) {
-			cat = utf8_category (q, &nq, end);
-			if (cat != IBEX_ALPHA)
-				break;
-			q = nq;
-		}
-		if (cat == IBEX_INVALID ||
-		    (cat == IBEX_INCOMPLETE && !unread)) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE || (q == end && unread)) {
-			*unread = end - p;
-			goto done;
-		}
-
-		if (wordsiz < q - p + 1) {
-			wordsiz = q - p + 1;
-			word = g_realloc (word, wordsiz);
-		}
-		ibex_normalise_word (p, q, word);
-		if (word[0]) {
-			if (g_hash_table_lookup(words, word) == 0) {
-				char *newword = g_strdup(word);
-				g_ptr_array_add(wordlist, newword);
-				g_hash_table_insert(words, newword, name);
-			}
-		}
-		p = q;
-	}
-done:
-	IBEX_LOCK(ib);
-
-	d(printf("name %s count %d size %d\n", name, wordlist->len, len));
-	if (!ib->predone) {
-		ib->words->klass->index_pre(ib->words);
-		ib->predone = TRUE;
-	}
-	ib->words->klass->add_list(ib->words, name, wordlist);
-
-	IBEX_UNLOCK(ib);
-
-	ret = 0;
-error:
-	for (i=0;i<wordlist->len;i++)
-		g_free(wordlist->pdata[i]);
-	g_ptr_array_free(wordlist, TRUE);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return ret;
-}
-
-
-ibex *ibex_open (char *file, int flags, int mode)
-{
-	ibex *ib;
-
-	ib = g_malloc0(sizeof(*ib));
-	ib->blocks = ibex_block_cache_open(file, flags, mode);
-	if (ib->blocks == 0) {
-		g_warning("create: Error occured?: %s\n", strerror(errno));
-		g_free(ib);
-		return NULL;
-	}
-	/* FIXME: the blockcache or the wordindex needs to manage the other one */
-	ib->words = ib->blocks->words;
-
-#ifdef ENABLE_THREADS
-	ib->lock = g_mutex_new();
-#endif
-	return ib;
-}
-
-int ibex_save (ibex *ib)
-{
-	d(printf("syncing database\n"));
-
-	IBEX_LOCK(ib);
-
-	if (ib->predone) {
-		ib->words->klass->index_post(ib->words);
-		ib->predone = FALSE;
-	}
-	ib->words->klass->sync(ib->words);
-	/* FIXME: some return */
-	ibex_block_cache_sync(ib->blocks);
-
-	IBEX_UNLOCK(ib);
-
-	return 0;
-}
-
-int ibex_close (ibex *ib)
-{
-	int ret = 0;
-
-	d(printf("closing database\n"));
-
-	if (ib->predone) {
-		ib->words->klass->index_post(ib->words);
-		ib->predone = FALSE;
-	}
-
-	ib->words->klass->close(ib->words);
-	ibex_block_cache_close(ib->blocks);
-#ifdef ENABLE_THREADS
-	g_mutex_free(ib->lock);
-#endif
-	g_free(ib);
-	return ret;
-}
-
-void ibex_unindex (ibex *ib, char *name)
-{
-	d(printf("trying to unindex '%s'\n", name));
-	IBEX_LOCK(ib);
-	ib->words->klass->unindex_name(ib->words, name);
-	IBEX_UNLOCK(ib);
-}
-
-GPtrArray *ibex_find (ibex *ib, char *word)
-{
-	char *normal;
-	int len;
-	GPtrArray *ret;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	IBEX_LOCK(ib);
-	ret = ib->words->klass->find(ib->words, normal);
-	IBEX_UNLOCK(ib);
-	return ret;
-}
-
-gboolean ibex_find_name (ibex *ib, char *name, char *word)
-{
-	char *normal;
-	int len;
-	gboolean ret;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	IBEX_LOCK(ib);
-	ret = ib->words->klass->find_name(ib->words, name, normal);
-	IBEX_UNLOCK(ib);
-	return ret;
-}
-
-gboolean ibex_contains_name(ibex *ib, char *name)
-{
-	gboolean ret;
-
-	IBEX_LOCK(ib);
-	ret = ib->words->klass->contains_name(ib->words, name);
-	IBEX_UNLOCK(ib);
-	return ret;
-}
diff --git a/libibex/ibex_db.c b/libibex/ibex_db.c
deleted file mode 100644
index 1ef0b3d1bc..0000000000
--- a/libibex/ibex_db.c
+++ /dev/null
@@ -1,512 +0,0 @@
-
-#include <glib.h>
-
-#include <db.h>
-#include <stdio.h>
-#include <unicode.h>
-#include <ctype.h>
-
-#include "ibex_internal.h"
-
-#define d(x)
-
-/*
-  Uses 2 databases: 
-
-  names - HASH  - lists which files are stored
-  words - BTREE - index words to files
-
-*/
-
-static int
-db_delete_name(DB *db, const char *name)
-{
-	DBC *cursor;
-	int err, namelen;
-	DBT key, data;
-
-	printf("called to delete name %s\n", name);
-	return 0;
-
-	err = db->cursor(db, NULL, &cursor, 0);
-	if (err != 0) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		return err;
-	}
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	namelen = strlen(name);
-
-	err = cursor->c_get(cursor, &key, &data, DB_FIRST);
-	while (err == 0) {
-		if (data.size == namelen && memcmp(data.data, name, namelen) == 0) {
-			d(printf("Found match, removing it\n"));
-			cursor->c_del(cursor, 0);
-		} else {
-			data.size = namelen;
-			data.data = (void *)name;
-			if (cursor->c_get(cursor, &key, &data, DB_GET_BOTH) == 0) {
-				d(printf("seek to match, removing it\n"));
-				cursor->c_del(cursor, 0);
-			} else {
-				d(printf("seek to match, not found\n"));
-			}
-		}
-		err = cursor->c_get(cursor, &key, &data, DB_NEXT_NODUP);
-	}
-
-	cursor->c_close(cursor);
-
-	return 0;
-}
-
-static int
-db_index_words(DB *db, char *name, char **words)
-{
-	DBT key, data;
-	int err = 0;
-	char *word;
-	
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	data.data = name;
-	data.size = strlen(name);
-	for (;(word=*words);words++) {
-		/* normalise word first ... */
-		key.data = word;
-		key.size = strlen(word);
-
-		err = db->put(db, NULL, &key, &data, 0);
-		if (err != 0)
-			printf("Error occured?: %s\n", db_strerror(err));
-	}
-
-	return err;
-}
-
-static int
-db_index_word(DB *db, char *name, char *word)
-{
-	DBT key, data;
-	int err = 0;
-	
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	data.data = name;
-	data.size = strlen(name);
-	key.data = word;
-	key.size = strlen(word);
-
-	err = db->put(db, NULL, &key, &data, 0);
-	if (err != 0)
-		printf("Error occured?: %s\n", db_strerror(err));
-
-	return err;
-}
-
-static GPtrArray *
-db_find(DB *db, char *word)
-{
-	DBT key, data;
-	int err;
-	DBC *cursor;
-	GPtrArray *matches = g_ptr_array_new();
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	err = db->cursor(db, NULL, &cursor, 0);
-	if (err != 0) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		return matches;
-	}
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	key.size = strlen(word);
-	key.data = word;
-
-	err = cursor->c_get(cursor, &key, &data, DB_SET);
-	while (err == 0) {
-		char *name;
-		name = g_malloc(data.size+1);
-		memcpy(name, data.data, data.size);
-		name[data.size] = '\0';
-		g_ptr_array_add(matches, name);
-		err = cursor->c_get(cursor, &key, &data, DB_NEXT_DUP);
-	}
-	if (err != DB_NOTFOUND) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		/* what to do?  doesn't matter too much its just a search ... */
-	}
-
-	cursor->c_close(cursor);
-
-	return matches;
-}
-
-/* check that db contains key @word, optionally with contents @name */
-static gboolean
-db_contains_word(DB *db, char *name, char *word)
-{
-	DBT key, data;
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	if (name != NULL) {
-		data.size = strlen(name);
-		data.data = name;
-	}
-	key.size = strlen(word);
-	key.data = word;
-
-	return db->get(db, NULL, &key, &data, name?DB_GET_BOTH:DB_SET) == 0;
-}
-
-static int
-db_delete_word(DB *db, char *word)
-{
-	DBT key;
-
-	memset(&key, 0, sizeof(key));
-	key.size = strlen(word);
-	key.data = word;
-	return db->del(db, NULL, &key, 0);
-}
-
-
-static signed char utf8_trans[] = {
-	'A', 'A', 'A', 'A', 'A', 'A', -1, 'C', 'E', 'E', 'E', 'E', 'I', 'I',
-	'I', 'I', -2, 'N', 'O', 'O', 'O', 'O', 'O', '*', 'O', 'U', 'U', 'U',
-	'U', 'Y', -3, -4, 'a', 'a', 'a', 'a', 'a', 'a', -5, 'c', 'e', 'e',
-	'e', 'e', 'i', 'i', 'i', 'i', -6, 'n', 'o', 'o', 'o', 'o', 'o', '/',
-	'o', 'u', 'u', 'u', 'u', 'y', -7, 'y', 'A', 'a', 'A', 'a', 'A', 'a',
-	'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd', 'D', 'd', 'E', 'e',
-	'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g', 'G', 'g',
-	'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
-	'I', 'i', -8, -9, 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L',
-	'l', 'L', 'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', 'n', -10, -11,
-	'O', 'o', 'O', 'o', 'O', 'o', -12, -13, 'R', 'r', 'R', 'r', 'R', 'r',
-	'S', 'r', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
-	'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'W', 'w',
-	'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's'
-};
-
-static char *utf8_long_trans[] = {
-	"AE", "TH", "TH", "ss", "ae", "th", "th", "IJ", "ij",
-	"NG", "ng", "OE", "oe"
-};
-
-/* This is a bit weird. It takes pointers to the start and end (actually
- * just past the end) of a UTF-8-encoded word, and a buffer at least 1
- * byte longer than the length of the word. It copies the word into the
- * buffer in all lowercase without accents, and splits up ligatures.
- * (Since any ligature would be a multi-byte character in UTF-8, splitting
- * them into two US-ASCII characters won't overrun the buffer.)
- *
- * It is not safe to call this routine with bad UTF-8.
- */
-static void
-ibex_normalise_word(char *start, char *end, char *buf)
-{
-	unsigned char *s, *d;
-	unicode_char_t uc;
-
-	s = (unsigned char *)start;
-	d = (unsigned char *)buf;
-	while (s < (unsigned char *)end) {
-		if (*s < 0x80) {
-			/* US-ASCII character: copy unless it's
-			 * an apostrophe.
-			 */
-			if (*s != '\'')
-				*d++ = tolower (*s);
-			s++;
-		} else {
-			char *next = unicode_get_utf8 (s, &uc);
-			if (uc >= 0xc0 && uc < 0xc0 + sizeof (utf8_trans)) {
-				signed char ch = utf8_trans[uc - 0xc0];
-				if (ch > 0)
-					*d++ = tolower (ch);
-				else {
-					*d++ = tolower (utf8_long_trans[-ch - 1][0]);
-					*d++ = tolower (utf8_long_trans[-ch - 1][1]);
-				}
-				s = next;
-			} else {
-				while (s < (unsigned char *)next)
-					*d++ = *s++;
-			}
-		}
-	}
-	*d = '\0';
-}
-
-enum { IBEX_ALPHA, IBEX_NONALPHA, IBEX_INVALID, IBEX_INCOMPLETE };
-
-/* This incorporates parts of libunicode, because there's no way to
- * force libunicode to not read past a certain point.
- */
-static int
-utf8_category (char *sp, char **snp, char *send)
-{
-	unsigned char *p = (unsigned char *)sp, **np = (unsigned char **)snp;
-	unsigned char *end = (unsigned char *)send;
-
-	if (isascii (*p)) {
-		*np = p + 1;
-		if (isalpha (*p) || *p == '\'')
-			return IBEX_ALPHA;
-		return IBEX_NONALPHA;
-	} else {
-		unicode_char_t uc;
-		int more;
-
-		if ((*p & 0xe0) == 0xc0) {
-			more = 1;
-			uc = *p & 0x1f;
-		} else if ((*p & 0xf0) == 0xe0) {
-			more = 2;
-			uc = *p & 0x0f;
-		} else if ((*p & 0xf8) == 0xf0) {
-			more = 3;
-			uc = *p & 0x07;
-		} else if ((*p & 0xfc) == 0xf8) {
-			more = 4;
-			uc = *p & 0x03;
-		} else if ((*p & 0xfe) == 0xfc) {
-			more = 5;
-			uc = *p & 0x01;
-		} else
-			return IBEX_INVALID;
-
-		if (p + more > end)
-			return IBEX_INCOMPLETE;
-
-		while (more--) {
-			if ((*++p & 0xc0) != 0x80)
-				return IBEX_INVALID;
-			uc <<= 6;
-			uc |= *p & 0x3f;
-		}
-
-		*np = p + 1;
-		if (unicode_isalpha (uc))
-			return IBEX_ALPHA;
-		else
-			return IBEX_NONALPHA;
-	}
-}
-
-static void
-do_insert_words(char *key, char *name, ibex *ib)
-{
-	db_index_word(ib->words, name, key);
-	g_free(key);
-}
-
-static void
-do_free_words(char *key, char *name, void *data)
-{
-	g_free(key);
-}
-
-/**
- * ibex_index_buffer: the lowest-level ibex indexing interface
- * @ib: an ibex
- * @name: the name of the file being indexed
- * @buffer: a buffer containing data from the file
- * @len: the length of @buffer
- * @unread: an output argument containing the number of unread bytes
- *
- * This routine indexes up to @len bytes from @buffer into @ib.
- * If @unread is NULL, the indexer assumes that the buffer ends on a
- * word boundary, and will index all the way to the end of the
- * buffer. If @unread is not NULL, and the buffer ends with an
- * alphabetic character, the indexer will assume that the buffer has
- * been cut off in the middle of a word, and return the number of
- * un-indexed bytes at the end of the buffer in *@unread. The caller
- * should then read in more data through whatever means it has
- * and pass in the unread bytes from the original buffer, followed
- * by the new data, on its next call.
- *
- * Return value: 0 on success, -1 on failure.
- **/
-int
-ibex_index_buffer (ibex *ib, char *name, char *buffer, size_t len, size_t *unread)
-{
-	char *p, *q, *nq, *end, *word;
-	int wordsiz, cat;
-	GHashTable *words = g_hash_table_new(g_str_hash, g_str_equal);
-
-	if (unread)
-		*unread = 0;
-
-	end = buffer + len;
-	wordsiz = 20;
-	word = g_malloc (wordsiz);
-
-	p = buffer;
-	while (p < end) {
-		while (p < end) {
-			cat = utf8_category (p, &q, end);
-			if (cat != IBEX_NONALPHA)
-				break;
-			p = q;
-		}
-		if (p == end) {
-			goto done;
-		} else if (cat == IBEX_INVALID) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE)
-			q = end;
-
-		while (q < end) {
-			cat = utf8_category (q, &nq, end);
-			if (cat != IBEX_ALPHA)
-				break;
-			q = nq;
-		}
-		if (cat == IBEX_INVALID ||
-		    (cat == IBEX_INCOMPLETE && !unread)) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE || (q == end && unread)) {
-			*unread = end - p;
-			goto done;
-		}
-
-		if (wordsiz < q - p + 1) {
-			wordsiz = q - p + 1;
-			word = g_realloc (word, wordsiz);
-		}
-		ibex_normalise_word (p, q, word);
-		if (word[0]) {
-			if (g_hash_table_lookup(words, word) == 0) {
-				g_hash_table_insert(words, g_strdup(word), name);
-			}
-		}
-		p = q;
-	}
-done:
-	/* FIXME: do this and inserts within a transaction */
-	if (!db_contains_word(ib->names, NULL, name)) {
-		printf("adding '%s' to database\n", name);
-		db_index_word(ib->names, "", name);
-	}
-	g_hash_table_foreach(words, (GHFunc)do_insert_words, ib);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return 0;
-error:
-	g_hash_table_foreach(words, (GHFunc)do_free_words, NULL);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return -1;
-}
-
-
-ibex *ibex_open (char *file, int flags, int mode)
-{
-	ibex *ib;
-	u_int32_t dbflags = 0;
-	int err;
-
-	ib = g_malloc0(sizeof(*ib));
-	err = db_create(&ib->words, NULL, 0);
-	if (err != 0) {
-		g_warning("create: Error occured?: %s\n", db_strerror(err));
-		g_free(ib);
-		return NULL;
-	}
-
-	err = ib->words->set_flags(ib->words, DB_DUP);
-	if (err != 0) {
-		g_warning("set flags: Error occured?: %s\n", db_strerror(err));
-		ib->words->close(ib->words, 0);
-		g_free(ib);
-		return NULL;
-	}
-
-	if (flags & O_CREAT)
-		dbflags |= DB_CREATE;
-	if (flags & O_EXCL)
-		dbflags |= DB_EXCL;
-	if (flags & O_RDONLY)
-		dbflags |= DB_RDONLY;
-
-	/* 1MB cache size? */
-	ib->words->set_cachesize(ib->words, 0, 1000000, 0);
-
-	err = ib->words->open(ib->words, file, "words", DB_BTREE, dbflags, mode);
-	if (err != 0) {
-		printf("open: Error occured?: %s\n", db_strerror(err));
-		ib->words->close(ib->words, 0);
-		g_free(ib);		
-		return NULL;
-	}
-
-	/* FIXME: check returns */
-	err = db_create(&ib->names, NULL, 0);
-	err = ib->names->open(ib->names, file, "names", DB_HASH, dbflags, mode);
-
-	return ib;
-}
-
-int ibex_save (ibex *ib)
-{
-	printf("syncing database\n");
-	ib->names->sync(ib->names, 0);
-	return ib->words->sync(ib->words, 0);
-}
-
-int ibex_close (ibex *ib)
-{
-	int ret;
-
-	printf("closing database\n");
-
-	ret = ib->names->close(ib->names, 0);
-	ret = ib->words->close(ib->words, 0);
-	g_free(ib);
-	return ret;
-}
-
-void ibex_unindex (ibex *ib, char *name)
-{
-	printf("trying to unindex '%s'\n", name);
-	if (db_contains_word(ib->names, NULL, name)) {
-		/* FIXME: do within transaction? */
-		db_delete_name(ib->words, name);
-		db_delete_word(ib->names, name);
-	}
-}
-
-GPtrArray *ibex_find (ibex *ib, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return db_find(ib->words, normal);
-}
-
-gboolean ibex_find_name (ibex *ib, char *name, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return db_contains_word(ib->words, name, normal);
-}
-
-gboolean ibex_contains_name(ibex *ib, char *name)
-{
-	return db_contains_word(ib->names, NULL, name);
-}
diff --git a/libibex/ibex_internal.h b/libibex/ibex_internal.h
deleted file mode 100644
index f2212799c6..0000000000
--- a/libibex/ibex_internal.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <glib.h>
-
-#include "ibex.h"
-#include "block.h"
-#include "wordindex.h"
-
-struct ibex {
-	char *path;
-	struct _memcache *blocks;
-	struct _IBEXWord *words;
-	int predone;
-
-	/* sigh i hate glib's mutex stuff too */
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-	
-};
-
-#ifdef ENABLE_THREADS
-/*#define IBEX_LOCK(ib) (printf(__FILE__ "%d: %s: locking ibex\n", __LINE__, __FUNCTION__), g_mutex_lock(ib->lock))
-  #define IBEX_UNLOCK(ib) (printf(__FILE__ "%d: %s: unlocking ibex\n", __LINE__, __FUNCTION__), g_mutex_unlock(ib->lock))*/
-#define IBEX_LOCK(ib) (g_mutex_lock(ib->lock))
-#define IBEX_UNLOCK(ib) (g_mutex_unlock(ib->lock))
-#else
-#define IBEX_LOCK(ib) 
-#define IBEX_UNLOCK(ib) 
-#endif
-
diff --git a/libibex/index.h b/libibex/index.h
deleted file mode 100644
index 442cba8e25..0000000000
--- a/libibex/index.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _INDEX_H
-#define _INDEX_H
-
-/* an indexing 'class' maps a key to 1 piece of info */
-
-/*#define INDEX_STAT*/
-
-struct _IBEXCursor {
-	struct _IBEXCursorClass *klass;
-	struct _IBEXIndex *index;
-};
-
-struct _IBEXCursorClass {
-	void (*close)(struct _IBEXCursor *);
-
-	guint32 (*next)(struct _IBEXCursor *);
-	char *(*next_key)(struct _IBEXCursor *, int *keylenptr);
-};
-
-struct _IBEXIndex {
-	struct _IBEXIndexClass *klass;
-	struct _memcache *blocks;
-	blockid_t root;		/* root block of ondisk index data */
-#ifdef INDEX_STAT
-	int lookups;		/* how many lookups */
-	int lookup_total;	/* how many blocks loaded for all lookups (hash chain depth) */
-#endif
-};
-
-struct _IBEXIndexClass {
-
-	struct _IBEXIndex *(*create)(struct _memcache *bc, int size);
-	struct _IBEXIndex *(*open)(struct _memcache *bc, blockid_t root);
-
-	int (*sync)(struct _IBEXIndex *);
-	int (*close)(struct _IBEXIndex *);
-
-	/* lookup a key in the index, returns the keyid of this item, or 0 if not found */
-	guint32 (*find)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* remove a key from the index */
-	void (*remove)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* insert a new key into the index, the keyid is returned */
-	guint32 (*insert)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* get the key contents/key length from the keyid */
-	char *(*get_key)(struct _IBEXIndex *, guint32 keyid, int *keylenptr);
-
-	/* set the key contents based on the keyid */
-	void (*set_data)(struct _IBEXIndex *, guint32 keyid, blockid_t datablock, blockid_t tail);
-
-	/* get the key contents based on the keyid */
-	blockid_t (*get_data)(struct _IBEXIndex *, guint32 keyid, blockid_t *tail);
-
-	/* get a cursor for iterating over all contents */
-	struct _IBEXCursor *(*get_cursor)(struct _IBEXIndex *);
-};
-
-/* a storage class, stores lists of lists of id's */
-
-struct _IBEXStore {
-	struct _IBEXStoreClass *klass;
-	struct _memcache *blocks;
-};
-
-struct _IBEXStoreClass {
-	struct _IBEXStore *(*create)(struct _memcache *bc);
-	int (*sync)(struct _IBEXStore *store);
-	int (*close)(struct _IBEXStore *store);
-
-	blockid_t (*add)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-	blockid_t (*add_list)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, GArray *data);
-	blockid_t (*remove)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-	void (*free)(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-	gboolean (*find)(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data);
-	GArray *(*get)(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-};
-
-#endif
diff --git a/libibex/lookup.c b/libibex/lookup.c
deleted file mode 100644
index 2d01dbf850..0000000000
--- a/libibex/lookup.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* lookup.c: a simple client, part 2 */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ibex.h"
-
-extern int optind;
-extern char *optarg;
-
-static void
-usage (void)
-{
-	fprintf (stderr, "Usage: lookup [-f indexfile] word ...\n");
-	exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-	ibex *ib;
-	GPtrArray *ans, *words;
-	int opt, i;
-	char *file = "INDEX";
-
-	while ((opt = getopt (argc, argv, "f:")) != -1) {
-		switch (opt) {
-		case 'f':
-			file = optarg;
-			break;
-
-		default:
-			usage ();
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc == 0)
-		usage ();
-
-	ib = ibex_open (file, O_RDWR|O_CREAT, 0600);
-	if (!ib) {
-		printf ("Couldn't open %s: %s\n", file, strerror (errno));
-		exit (1);
-	}
-
-	words = g_ptr_array_new ();
-	while (argc--)
-		g_ptr_array_add (words, argv[argc]);
-
-	ans = ibex_find_all (ib, words);
-	if (ans) {
-		for (i = 0; i < ans->len; i++)
-			printf ("%s\n", (char *)g_ptr_array_index (ans, i));
-		exit (0);
-	} else {
-		printf ("Nope.\n");
-		exit (1);
-	}
-}
diff --git a/libibex/mkindex.c b/libibex/mkindex.c
deleted file mode 100644
index 151dcecb2d..0000000000
--- a/libibex/mkindex.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* mkindex.c: a simple client, part 1 */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ibex.h"
-
-extern int optind;
-extern char *optarg;
-
-static void
-usage (void)
-{
-	fprintf (stderr, "Usage: mkindex [-f indexfile] file ...\n");
-	exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-	ibex *ib;
-	int opt;
-	char *file = "INDEX";
-
-	while ((opt = getopt (argc, argv, "f:")) != -1) {
-		switch (opt) {
-		case 'f':
-			file = optarg;
-			break;
-
-		default:
-			usage ();
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc == 0)
-		usage ();
-
-	ib = ibex_open (file, O_CREAT|O_RDWR, 0600);
-	if (!ib) {
-		fprintf (stderr, "Couldn't open index file %s: %s\n",
-			 file, strerror (errno));
-		exit (1);
-	}
-
-	while (argc--) {
-		if (ibex_index_file (ib, argv[argc]) == -1) {
-			fprintf (stderr, "Couldn't index %s: %s\n",
-				 argv[argc], strerror (errno));
-			exit (1);
-		}
-	}
-
-	if (ibex_close (ib) != 0) {
-		fprintf (stderr, "Failed to write index file %s: %s\n",
-			 file, strerror (errno));
-		exit (1);
-	}
-	exit (0);
-}
diff --git a/libibex/testindex.c b/libibex/testindex.c
deleted file mode 100644
index a3b6a9ce03..0000000000
--- a/libibex/testindex.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Test code for libibex */
-
-#include <stdio.h>
-#include <glib.h>
-#include <errno.h>
-#include <string.h>
-#include "ibex_internal.h"
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-#endif
-
-void word_index_mem_dump_info(struct _IBEXWord *idx);
-
-/*
-  The following is a routine to generate a Gaussian distribution
-  of pseudo random numbers, to make the results a little more
-  meaningful
-*/
-
-/* boxmuller.c           Implements the Polar form of the Box-Muller
-                         Transformation
-
-                      (c) Copyright 1994, Everett F. Carter Jr.
-                          Permission is granted by the author to use
-                          this software for any application provided this
-                          copyright notice is preserved.
-
-*/
-
-#include <stdlib.h>
-#include <math.h>
-
-#define ranf() ((float)rand()/(float)RAND_MAX)
-
-static float box_muller(float m, float s)      /* normal random variate generator */
-{                                       /* mean m, standard deviation s */
-        float x1, x2, w, y1;
-        static float y2;
-        static int use_last = 0;
-
-        if (use_last)                   /* use value from previous call */
-        {
-                y1 = y2;
-                use_last = 0;
-        }
-        else
-        {
-                do {
-                        x1 = 2.0 * ranf() - 1.0;
-                        x2 = 2.0 * ranf() - 1.0;
-                        w = x1 * x1 + x2 * x2;
-                } while ( w >= 1.0 );
-
-                w = sqrt( (-2.0 * log( w ) ) / w );
-                y1 = x1 * w;
-                y2 = x2 * w;
-                use_last = 1;
-        }
-
-        return( m + y1 * s );
-}
-
-/* gets a word from words, using m and s as distribution values */
-static char *getword(GPtrArray *words, float m, float s)
-{
-	int index;
-
-	do {
-		index = (int)box_muller(m, s);
-	} while (index<0 || index>=words->len);
-
-	return words->pdata[index];
-}
-
-#ifdef ENABLE_THREADS
-int do_read_words;
-
-static void *
-read_words(void *in)
-{
-	ibex *ib = in;
-	GPtrArray *a;
-	int lastlen = 0;
-	int i;
-
-	while (do_read_words) {
-		a = ibex_find(ib, "joneses");
-		if (a->len != lastlen) {
-			printf("Found %d joneses!\n", a->len);
-			lastlen = a->len;
-		}
-		for (i=0;i<a->len;i++)
-			g_free(a->pdata[i]);
-		g_ptr_array_free(a, TRUE);
-	}
-}
-#endif
-
-int main(int argc, char **argv)
-{
-	int i, j;
-	GPtrArray *words = g_ptr_array_new();
-	char line[256];
-	int len;
-	FILE *file;
-	float m, s;
-	ibex *ib;
-	GString *buffer = g_string_new("");
-	int files;
-	char *dict;
-
-#ifdef ENABLE_THREADS
-	pthread_t id;
-
-	g_thread_init(0);
-#endif
-
-	srand(0xABADF00D);
-
-	files = 8000;
-	dict = "/usr/dict/words";
-
-	/* read words into an array */
-	file = fopen(dict, "r");
-	if (file == NULL) {
-		fprintf(stderr, "Cannot open word file: %s: %s\n", dict, strerror(errno));
-		return 1;
-	}
-	while (fgets(line, sizeof(line), file) != NULL) {
-		len = strlen(line);
-		if (len>0 && line[len-1]=='\n') {
-			line[len-1]=0;
-		}
-		g_ptr_array_add(words, g_strdup(line));
-	}
-	fclose(file);
-	
-	fprintf(stderr, "Read %d words\n", words->len);
-
-	/* *shrug* arbitrary values really */
-	m = words->len/2;
-	/* well, the average vocabulary of a mailbox is about 10K words */
-	s = 1000.0;
-
-	printf("mean is %f, s is %f\n", m, s);
-
-	/* open ibex file */
-	ib = ibex_open("test.ibex", O_RDWR|O_CREAT, 0600);
-	if (ib == NULL) {
-		perror("Creating ibex file\n");
-		return 1;
-	}
-
-#ifdef ENABLE_THREADS
-	do_read_words = 1;
-	pthread_create(&id, 0, read_words, ib);
-#endif
-	printf("Adding %d files\n", files);
-
-	/* simulate adding new words to a bunch of files */
-	for (j=0;j<files;j++) {
-		/* always new name */
-		char *name = words->pdata[j % words->len];
-		/* something like 60 words in a typical message, say */
-		int count = (int)box_muller(60.0, 20.0);
-
-		if (j%1000 == 0)
-			word_index_mem_dump_info(ib->words);
-
-		/* cache the name info */
-		ibex_contains_name(ib, name);
-
-		/*printf("Adding %d words to '%s'\n", count, name);*/
-
-		g_string_truncate(buffer, 0);
-
-		/* build up the word buffer */
-		for (i=0;i<count;i++) {
-			if (i>0)
-				g_string_append_c(buffer, ' ');
-			g_string_append(buffer, getword(words, m, s));
-		}
-
-		/* and index it */
-		ibex_index_buffer(ib, name, buffer->str, buffer->len, NULL);
-	}
-
-	word_index_mem_dump_info(ib->words);
-
-#ifdef ENABLE_THREADS
-	do_read_words = 0;
-	pthread_join(id, 0);
-#endif
-
-	ibex_close(ib);
-
-	return 0;
-}
-
diff --git a/libibex/wordindex.c b/libibex/wordindex.c
deleted file mode 100644
index a8592cbcef..0000000000
--- a/libibex/wordindex.c
+++ /dev/null
@@ -1,646 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* code to manage a word index */
-/* includes a cache for word index writes,
-   but not for name index writes (currently), or any reads.
-
-Note the word cache is only needed during indexing of lots
-of words, and could then be discarded (:flush()).
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-#include "wordindex.h"
-
-#define d(x)
-
-/*#define WORDCACHE_SIZE (256)*/
-#define WORDCACHE_SIZE (4096)
-
-extern struct _IBEXStoreClass ibex_diskarray_class;
-extern struct _IBEXIndexClass ibex_hash_class;
-
-/* need 2 types of hash key?
-   one that just stores the wordid / wordblock
-   and one that stores the filecount/files?
-*/
-
-
-#define CACHE_FILE_COUNT (62)
-
-struct _wordcache {
-	struct _wordcache *next;
-	struct _wordcache *prev;
-	nameid_t wordid;	/* disk wordid */
-	blockid_t wordblock;	/* head of disk list */
-	blockid_t wordtail;	/* and the tail data */
-	short filecount;	/* how many valid items in files[] */
-	short filealloc;	/* how much allocated space in files[] */
-	union {
-		nameid_t *files;	/* memory cache of files */
-		nameid_t file0;	/* if filecount == 1 && filealloc == 0, store directly */
-	} file;
-	char word[1];		/* actual word follows */
-};
-
-static void unindex_name(struct _IBEXWord *, const char *name); 	/* unindex all entries for name */
-static gboolean contains_name(struct _IBEXWord *, const char *name);	/* index contains data for name */
-static GPtrArray *find(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-static gboolean find_name(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-static void add(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name (slow) */
-static void add_list(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-static int word_sync(struct _IBEXWord *idx);
-static int word_flush(struct _IBEXWord *idx);
-static int word_close(struct _IBEXWord *idx);
-static void word_index_pre(struct _IBEXWord *idx);
-static void word_index_post(struct _IBEXWord *idx);
-
-struct _IBEXWordClass ibex_word_index_class = {
-	word_sync, word_flush, word_close,
-	word_index_pre, word_index_post,
-	unindex_name, contains_name,
-	find, find_name,
-	add, add_list
-};
-
-/* this interface isn't the best, but it'll do for now */
-struct _IBEXWord *
-ibex_create_word_index(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot)
-{
-	struct _IBEXWord *idx;
-
-	idx = g_malloc0(sizeof(*idx));
-	idx->wordcache = g_hash_table_new(g_str_hash, g_str_equal);
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	idx->klass = &ibex_word_index_class;
-
-	/* we use the same block array storage for both indexes at the moment */
-	idx->wordstore = ibex_diskarray_class.create(bc);
-	idx->namestore = idx->wordstore;
-
-	/* but not the same indexes! */
-	if (*wordroot) {
-		printf("opening wordindex root = %d\n", *wordroot);
-		idx->wordindex = ibex_hash_class.open(bc, *wordroot);
-	} else {
-		idx->wordindex = ibex_hash_class.create(bc, 2048);
-		*wordroot = idx->wordindex->root;
-		printf("creating wordindex root = %d\n", *wordroot);
-	}
-	if (*nameroot) {
-		printf("opening nameindex root = %d\n", *nameroot);
-		idx->nameindex = ibex_hash_class.open(bc, *nameroot);
-	} else {
-		idx->nameindex = ibex_hash_class.create(bc, 2048);
-		*nameroot = idx->nameindex->root;
-		printf("creating nameindex root = %d\n", *nameroot);
-	}
-	return idx;
-}
-
-#if d(!)0
-static void
-cache_sanity(struct _wordcache *head)
-{
-	while (head->next) {
-		g_assert(head->filecount <= head->filealloc);
-		g_assert(strlen(head->word) != 0);
-		head = head->next;
-	}
-}
-#endif
-
-static void word_index_pre(struct _IBEXWord *idx)
-{
-}
-
-static void word_index_post(struct _IBEXWord *idx)
-{
-}
-
-/* unindex all entries for name */
-static void unindex_name(struct _IBEXWord *idx, const char *name)
-{
-	GArray *words;
-	int i;
-	nameid_t nameid, wordid;
-	blockid_t nameblock, wordblock, newblock, nametail, wordtail, newtail;
-	char *word;
-	struct _wordcache *cache;
-
-	d(printf("unindexing %s\n", name));
-
-	/* lookup the hash key */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this key */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-	/* and the data for this block */
-	words = idx->namestore->klass->get(idx->namestore, nameblock, nametail);
-	/* walk it ... */
-	for (i=0;i<words->len;i++) {
-		/* get the word */
-		wordid = g_array_index(words, nameid_t, i);
-		d(printf(" word %d\n", wordid));
-		/* get the data block */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-		/* clear this name from it */
-		newblock = wordblock;
-		newtail = wordtail;
-		idx->wordstore->klass->remove(idx->wordstore, &newblock, &newtail, nameid);
-		if (newblock != wordblock || newtail != wordtail)
-			idx->wordindex->klass->set_data(idx->wordindex, wordid, newblock, newtail);
-
-		/* now check the cache as well */
-		word = idx->nameindex->klass->get_key(idx->wordindex, wordid, NULL);
-		if (word) {
-			cache = g_hash_table_lookup(idx->wordcache, word);
-			if (cache) {
-				/* its there, update our head/tail pointers */
-				cache->wordblock = newblock;
-				cache->wordtail = newtail;
-
-				/* now check that we have a data entry in it */
-				if (cache->filealloc == 0 && cache->filecount == 1) {
-					if (cache->file.file0 == nameid) {
-						cache->filecount = 0;
-					}
-				} else {
-					int j;
-
-					for (j=0;j<cache->filecount;j++) {
-						if (cache->file.files[j] == nameid) {
-							cache->file.files[j] = cache->file.files[cache->filecount-1];
-							cache->filecount--;
-							break;
-						}
-					}
-				}
-			}
-			g_free(word);
-		}
-	}
-	g_array_free(words, TRUE);
-
-	/* and remove name data and itself */
-	idx->namestore->klass->free(idx->namestore, nameblock, nametail);
-	idx->nameindex->klass->remove(idx->nameindex, name, strlen(name));
-}
-
-/* index contains (any) data for name */
-static gboolean contains_name(struct _IBEXWord *idx, const char *name)
-{
-	return idx->nameindex->klass->find(idx->nameindex, name, strlen(name)) != 0;
-}
-
-/* returns all matches for word */
-static GPtrArray *find(struct _IBEXWord *idx, const char *word)
-{
-	nameid_t wordid, nameid;
-	GPtrArray *res;
-	GArray *names;
-	int i;
-	char *new;
-	struct _wordcache *cache;
-	blockid_t wordblock, wordtail;
-
-	res = g_ptr_array_new();
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-		wordid = cache->wordid;
-		wordblock = cache->wordblock;
-		wordtail = cache->wordtail;
-	} else {
-		/* lookup the hash key */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-		/* get the block for this key */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-	}
-	/* and the data for this block */
-	names = idx->wordstore->klass->get(idx->wordstore, wordblock, wordtail);
-	/* .. including any memory-only data */
-	if (cache) {
-		if (cache->filealloc == 0 && cache->filecount == 1)
-			g_array_append_val(names, cache->file.file0);
-		else
-			g_array_append_vals(names, cache->file.files, cache->filecount);
-	}
-
-	/* walk it ... converting id's back to strings */
-	g_ptr_array_set_size(res, names->len);
-	for (i=0;i<names->len;i++) {
-		nameid = g_array_index(names, nameid_t, i);
-		new = idx->nameindex->klass->get_key(idx->nameindex, nameid, NULL);
-		res->pdata[i] = new;
-	}
-	g_array_free(names, TRUE);
-	return res;
-}
-
-/* find if name contains word */
-static gboolean find_name(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t wordid, nameid;
-	blockid_t nameblock, nametail;
-	struct _wordcache *cache;
-	int i;
-
-	/* lookup the hash key for the name */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this name */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-
-	/* check if there is an in-memory cache for this word, check its file there first */
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-		if (cache->filecount == 1 && cache->filealloc == 0) {
-			if (cache->file.file0 == nameid)
-				return TRUE;
-		} else {
-			for (i=0;i<cache->filecount;i++) {
-				if (cache->file.files[i] == nameid)
-					return TRUE;
-			}
-		}
-		/* not there?  well we can use the wordid anyway */
-		wordid = cache->wordid;
-	} else {
-		/* lookup the hash key for word */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-	}
-
-	/* see if wordid is in nameblock */
-	return idx->namestore->klass->find(idx->namestore, nameblock, nametail, wordid);
-}
-
-/* cache helper functions */
-/* flush a cache entry to disk, and empty it out */
-static void
-sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache)
-{
-	GArray array; /* just use this as a header */
-	blockid_t oldblock, oldtail;
-	
-	d(printf("syncing cache entry '%s' used %d\n", cache->word, cache->filecount));
-	if (cache->filecount == 1 && cache->filealloc == 0)
-		array.data = (char *)&cache->file.file0;
-	else
-		array.data = (char *)cache->file.files;
-	array.len = cache->filecount;
-	oldblock = cache->wordblock;
-	oldtail = cache->wordtail;
-	idx->wordstore->klass->add_list(idx->wordstore, &cache->wordblock, &cache->wordtail, &array);
-	if (oldblock != cache->wordblock || oldtail != cache->wordtail) {
-		idx->wordindex->klass->set_data(idx->wordindex, cache->wordid, cache->wordblock, cache->wordtail);
-	}
-	cache->filecount = 0;
-}
-
-/* create a new key in an index, returning its id and head block */
-static void
-add_index_key(struct _IBEXIndex *wordindex, const char *word, nameid_t *wordid, blockid_t *wordblock, blockid_t *wordtail)
-{
-	/* initialise cache entry - id of word entry and head block */
-	*wordid = wordindex->klass->find(wordindex, word, strlen(word));
-	if (*wordid == 0) {
-		*wordid = wordindex->klass->insert(wordindex, word, strlen(word));
-		*wordblock = 0;
-		*wordtail = 0;
-	} else {
-		*wordblock = wordindex->klass->get_data(wordindex, *wordid, wordtail);
-	}
-}
-
-/* create a new key in a cached index (only word cache so far), flushing old keys
-   if too much space is being used */
-static struct _wordcache *
-add_index_cache(struct _IBEXWord *idx, const char *word)
-{
-	struct _wordcache *cache;
-
-	d(printf("adding %s to cache\n", word));
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache == 0) {
-		/* see if we have to flush off the last entry */
-		if (idx->wordcount >= WORDCACHE_SIZE) {
-			struct _wordcache *mincache;
-			int min, count=0;
-			/* remove last entry, and flush it */
-			cache = (struct _wordcache *)idx->wordnodes.tailpred;
-			mincache = cache;
-			min = mincache->filecount;
-
-			d(printf("flushing word from cache %s\n", cache->word));
-			/* instead of just using the last entry, we try and find an entry with
-			   with only 1 item (failing that, the smallest in the range we look at) */
-			/* this could probably benefit greatly from a more sophisticated aging algorithm */
-			while (cache->next && count < 100) {
-				if (cache->filecount == 1) {
-					mincache = cache;
-					break;
-				}
-				if (cache->filecount > 0 && cache->filecount < min) {
-					mincache = cache;
-					min = cache->filecount;
-				}
-				cache = cache->next;
-				count++;
-			}
-			ibex_list_remove((struct _listnode *)mincache);
-			g_hash_table_remove(idx->wordcache, mincache->word);
-			sync_cache_entry(idx, mincache);
-			if (mincache->filealloc)
-				g_free(mincache->file.files);
-			g_free(mincache);
-			idx->wordcount--;
-		}
-		cache = g_malloc0(sizeof(*cache)+strlen(word));
-		/* initialise cache entry - id of word entry and head block */
-		add_index_key(idx->wordindex, word, &cache->wordid, &cache->wordblock, &cache->wordtail);
-		/* other fields */
-		strcpy(cache->word, word);
-		cache->filecount = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-		idx->wordcount++;
-	} else {
-		/* move cache bucket ot the head of the cache list */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-	}
-	return cache;
-}
-
-/* adds a single word to name (slow) */
-static void add(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t nameid;
-	blockid_t nameblock, newblock, nametail, newtail;
-	struct _wordcache *cache;
-
-	g_error("Dont use wordindex::add()");
-	abort();
-
-	cache = add_index_cache(idx, word);
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	/* check for repeats of the last name - dont add anything */
-	if (cache->filecount == 1 && cache->filealloc == 0) {
-		if (cache->file.file0 == nameid)
-			return;
-	} else {
-		if (cache->file.files[cache->filecount] == nameid)
-			return;
-	}
-
-	/* see if we are setting the first, drop it in the union */
-	if (cache->filecount == 0 && cache->filealloc == 0) {
-		cache->file.file0 = nameid;
-	} else if (cache->filecount == 1 && cache->filealloc == 0) {
-		nameid_t saveid;
-		/* we need to allocate space for words */
-		saveid = cache->file.file0;
-		cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-		/* this could possibly grow as needed, but i wont for now */
-		cache->filealloc = CACHE_FILE_COUNT;
-		cache->file.files[0] = saveid;
-		cache->file.files[1] = nameid;
-	} else {
-		cache->file.files[cache->filecount] = nameid;
-	}
-
-	cache->filecount++;
-
-	/* if we are full, force a flush now */
-	if (cache->filealloc && cache->filecount >= cache->filealloc) {
-		sync_cache_entry(idx, cache);
-	}
-
-	newtail = nametail;
-	newblock = nameblock;
-	idx->namestore->klass->add(idx->namestore, &newblock, &newtail, cache->wordid);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-}
-
-/* adds a bunch of words to a given name */
-static void add_list(struct _IBEXWord *idx, const char *name, GPtrArray *words)
-{
-	int i;
-	GArray *data = g_array_new(0, 0, sizeof(nameid_t));
-	blockid_t nameblock, newblock, nametail, newtail;
-	nameid_t nameid;
-	struct _wordcache *cache;
-
-	d(printf("Adding words to name %s\n", name));
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	for (i=0;i<words->len;i++) {
-		char *word = words->pdata[i];
-
-		cache = add_index_cache(idx, word);
-
-		/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-
-		/* check for duplicates; doesn't catch duplicates over an overflow boundary.  Watch me care. */
-		if (cache->filecount == 0
-		    /* the 1 item case */
-		    || (cache->filecount == 1 && cache->filealloc == 0 && cache->file.file0 != nameid)
-		    /* the normal case */
-		    || (cache->filealloc > 0 && cache->file.files[cache->filecount-1] != nameid)) {
-
-			/* see if we are setting the first, drop it in the union */
-			if (cache->filecount == 0 && cache->filealloc == 0) {
-				cache->file.file0 = nameid;
-			} else if (cache->filecount == 1 && cache->filealloc == 0) {
-				nameid_t saveid;
-				/* we need to allocate space for words */
-				saveid = cache->file.file0;
-				cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-				/* this could possibly grow as needed, but i wont for now */
-				cache->filealloc = CACHE_FILE_COUNT;
-				cache->file.files[0] = saveid;
-				cache->file.files[1] = nameid;
-			} else {
-				cache->file.files[cache->filecount] = nameid;
-			}
-
-			cache->filecount++;
-
-			/* if we are full, force a flush now */
-			if (cache->filealloc && cache->filecount >= cache->filealloc) {
-				sync_cache_entry(idx, cache);
-			}
-
-			/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-
-			/* and append this wordid for this name in memory */
-			g_array_append_val(data, cache->wordid);
-		}
-
-		/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-	}
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	/* and append these word id's in one go */
-	newblock = nameblock;
-	newtail = nametail;
-	idx->namestore->klass->add_list(idx->namestore, &newblock, &newtail, data);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	g_array_free(data, TRUE);
-}
-
-/* sync any in-memory data to disk */
-static int
-word_sync(struct _IBEXWord *idx)
-{
-	/* we just flush also, save memory */
-	word_flush(idx);
-
-#if 0
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head;
-
-	while (cache->next) {
-		sync_cache_entry(idx, cache);
-		cache = cache->next;
-	}
-
-	/*ibex_hash_dump(idx->wordindex);*/
-	/*ibex_hash_dump(idx->nameindex);*/
-#endif
-	return 0;
-}
-
-/* sync and flush any in-memory data to disk and free it */
-static int
-word_flush(struct _IBEXWord *idx)
-{
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head, *next;
-	extern int block_log;
-	int count= 0;
-	int used=0, wasted=0;
-
-	block_log = 0;
-
-	next = cache->next;
-	while (next) {
-		count++;
-		used += sizeof(struct _wordcache) + (cache->filealloc * sizeof(nameid_t));
-		if (cache->filealloc)
-			wasted += (cache->filealloc-cache->filecount)*sizeof(nameid_t);
-		else
-			wasted += (1-cache->filecount) * sizeof(nameid_t);
-
-		/*printf("syncing word %s\n", cache->word);*/
-		sync_cache_entry(idx, cache);
-		g_hash_table_remove(idx->wordcache, cache->word);
-		if (cache->filealloc)
-			g_free(cache->file.files);
-		g_free(cache);
-		cache = next;
-		next = cache->next;
-	}
-
-	printf("sync cache entries = %d\n used memory = %d\n wasted memory = %d\n", count, used, wasted);
-
-	block_log = 0;
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	return 0;
-}
-
-static int word_close(struct _IBEXWord *idx)
-{
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head, *next;
-	extern int block_log;
-	int count= 0;
-	int used=0, wasted=0;
-
-	block_log = 0;
-
-	next = cache->next;
-	while (next) {
-		count++;
-		used += sizeof(struct _wordcache) + (cache->filealloc * sizeof(nameid_t));
-		if (cache->filealloc)
-			wasted += (cache->filealloc-cache->filecount)*sizeof(nameid_t);
-		else
-			wasted += (1-cache->filecount) * sizeof(nameid_t);
-
-		/*printf("closing word %s\n", cache->word);*/
-		sync_cache_entry(idx, cache);
-		if (cache->filealloc)
-			g_free(cache->file.files);
-		g_free(cache);
-		cache = next;
-		next = cache->next;
-	}
-	block_log = 0;
-
-	printf("cache entries = %d\n used memory = %d\n wasted memory = %d\n", count, used, wasted);
-
-	idx->namestore->klass->close(idx->namestore);
-	idx->nameindex->klass->close(idx->nameindex);
-	/*same as namestore:
-	  idx->wordstore->klass->close(idx->wordstore);*/
-	idx->wordindex->klass->close(idx->wordindex);
-	g_hash_table_destroy(idx->wordcache);
-	g_free(idx);
-
-	return 0;
-}
diff --git a/libibex/wordindex.h b/libibex/wordindex.h
deleted file mode 100644
index 3a60accb70..0000000000
--- a/libibex/wordindex.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _WORDINDEX_H
-#define _WORDINDEX_H
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-
-struct _IBEXWord;
-
-/* not used yet */
-typedef void (*IBEXNormaliseFunc)(char *source, int len, char *dest);
-
-struct _IBEXWordClass {
-	int (*sync)(struct _IBEXWord *);
-	int (*flush)(struct _IBEXWord *);
-	int (*close)(struct _IBEXWord *);
-
-	void (*index_pre)(struct _IBEXWord *); /* get ready for doing a lot of indexing.  may be a nop */
-	void (*index_post)(struct _IBEXWord *);
-
-	void (*unindex_name)(struct _IBEXWord *, const char *name);		/* unindex all entries for name */
-	gboolean (*contains_name)(struct _IBEXWord *, const char *name);	/* index contains data for name */
-	GPtrArray *(*find)(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-	gboolean (*find_name)(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-	void (*add)(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name */
-	void (*add_list)(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-};
-
-struct _IBEXWord {
-	struct _IBEXWordClass *klass;
-	struct _IBEXStore *wordstore;
-	struct _IBEXIndex *wordindex;
-	struct _IBEXStore *namestore;
-	struct _IBEXIndex *nameindex;
-
-	/* word caching info (should probably be modularised) */
-	GHashTable *wordcache;	/* word->struct _wordcache mapping */
-	struct _list wordnodes;	/* LRU list of wordcache structures */
-	int wordcount;		/* how much space used in cache */
-	int precount;
-	GHashTable *namecache;	/* a list of names (only), cached for quick reference */
-	int nameinit;
-};
-
-
-struct _IBEXWord *ibex_create_word_index(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-/* alternate implemenation */
-struct _IBEXWord *ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-#endif /* !_WORDINDEX_H */
diff --git a/libibex/wordindexmem.c b/libibex/wordindexmem.c
deleted file mode 100644
index 479e5b0343..0000000000
--- a/libibex/wordindexmem.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* this is the same as wordindex.c, but it doesn't have an LRU cache
-   for word names.  it has a lookup tab le that is only loaded if
-   index-pre is called, otherwise it always hits disk */
-
-/* code to manage a word index */
-/* includes a cache for word index writes,
-   but not for name index writes (currently), or any reads.
-
-Note the word cache is only needed during indexing of lots
-of words, and could then be discarded (:flush()).
-
-*/
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-#include "wordindex.h"
-
-/*#define MALLOC_CHECK*/
-
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-#define d(x)
-
-/*#define WORDCACHE_SIZE (256)*/
-#define WORDCACHE_SIZE (4096)
-
-extern struct _IBEXStoreClass ibex_diskarray_class;
-extern struct _IBEXIndexClass ibex_hash_class;
-
-/* need 2 types of hash key?
-   one that just stores the wordid / wordblock
-   and one that stores the filecount/files?
-*/
-
-
-#define CACHE_FILE_COUNT (62)
-
-struct _wordcache {
-	nameid_t wordid;	/* disk wordid */
-	blockid_t wordblock;	/* head of disk list */
-	blockid_t wordtail;	/* and the tail data */
-	short filecount;	/* how many valid items in files[] */
-	short filealloc;	/* how much allocated space in files[] */
-	union {
-		nameid_t *files;	/* memory cache of files */
-		nameid_t file0;	/* if filecount == 1 && filealloc == 0, store directly */
-	} file;
-	char word[1];		/* actual word follows */
-};
-
-static void unindex_name(struct _IBEXWord *, const char *name); 	/* unindex all entries for name */
-static gboolean contains_name(struct _IBEXWord *, const char *name);	/* index contains data for name */
-static GPtrArray *find(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-static gboolean find_name(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-static void add(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name (slow) */
-static void add_list(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-static int word_sync(struct _IBEXWord *idx);
-static int word_flush(struct _IBEXWord *idx);
-static int word_close(struct _IBEXWord *idx);
-static void word_index_pre(struct _IBEXWord *idx);
-static void word_index_post(struct _IBEXWord *idx);
-
-static void sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache);
-
-struct _IBEXWordClass ibex_word_index_mem_class = {
-	word_sync, word_flush, word_close,
-	word_index_pre, word_index_post,
-	unindex_name, contains_name,
-	find, find_name,
-	add, add_list
-};
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-/* this interface isn't the best, but it'll do for now */
-struct _IBEXWord *
-ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot)
-{
-	struct _IBEXWord *idx;
-
-	idx = g_malloc0(sizeof(*idx));
-	idx->wordcache = g_hash_table_new(g_str_hash, g_str_equal);
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	idx->precount = 0;
-	idx->namecache = g_hash_table_new(g_str_hash, g_str_equal);
-	idx->nameinit = 0;
-	idx->klass = &ibex_word_index_mem_class;
-
-	/* we use the same block array storage for both indexes at the moment */
-	idx->wordstore = ibex_diskarray_class.create(bc);
-	idx->namestore = idx->wordstore;
-
-	/* but not the same indexes! */
-	if (*wordroot) {
-		d(printf("opening wordindex root = %d\n", *wordroot));
-		idx->wordindex = ibex_hash_class.open(bc, *wordroot);
-	} else {
-		idx->wordindex = ibex_hash_class.create(bc, 2048);
-		*wordroot = idx->wordindex->root;
-		d(printf("creating wordindex root = %d\n", *wordroot));
-	}
-	if (*nameroot) {
-		d(printf("opening nameindex root = %d\n", *nameroot));
-		idx->nameindex = ibex_hash_class.open(bc, *nameroot);
-	} else {
-		idx->nameindex = ibex_hash_class.create(bc, 2048);
-		*nameroot = idx->nameindex->root;
-		d(printf("creating nameindex root = %d\n", *nameroot));
-	}
-	return idx;
-}
-
-#if (d(!)0) || defined(MALLOC_CHECK)
-static void
-node_sanity(char *key, struct _wordcache *node, void *data)
-{
-	g_assert(node->filecount <= node->filealloc || (node->filecount == 1 && node->filealloc == 0));
-	g_assert(strlen(node->word) != 0);
-#ifdef MALLOC_CHECK
-	checkmem(node);
-	if (node->filealloc)
-		checkmem(node->file.files);
-#endif
-}
-
-static void
-cache_sanity(struct _IBEXWord *idx)
-{
-#ifdef MALLOC_CHECK
-	checkmem(idx);
-#endif
-	g_hash_table_foreach(idx->wordcache, (GHFunc)node_sanity, idx);
-}
-#endif
-
-static void word_index_pre(struct _IBEXWord *idx)
-{
-	struct _IBEXCursor *idc;
-	struct _wordcache *cache;
-	nameid_t wordid;
-	char *key;
-	int len;
-
-	idx->precount ++;
-	if (idx->precount > 1)
-		return;
-
-	/* want to load all words into the cache lookup table */
-	d(printf("pre-loading all word info into memory\n"));
-	idc = idx->wordindex->klass->get_cursor(idx->wordindex);
-	while ( (wordid = idc->klass->next(idc)) ) {
-		key = idc->index->klass->get_key(idc->index, wordid, &len);
-		/*d(printf("Adding word %s\n", key));*/
-		cache = g_malloc0(sizeof(*cache) + strlen(key));
-		strcpy(cache->word, key);
-		g_free(key);
-		cache->wordid = wordid;
-		cache->wordblock = idc->index->klass->get_data(idc->index, wordid, &cache->wordtail);
-		cache->filecount = 0;
-		cache->filealloc = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-		idx->wordcount++;
-	}
-
-#ifdef MALLOC_CHECK
-	cache_sanity(idx);
-#endif
-
-	idc->klass->close(idc);
-
-	d(printf("done\n"));
-}
-
-static gboolean
-sync_free_value(void *key, void *value, void *data)
-{
-	struct _wordcache *cache = (struct _wordcache *)value;
-	struct _IBEXWord *idx = (struct _IBEXWord *)data;
-
-	sync_cache_entry(idx, cache);
-	if (cache->filealloc)
-		g_free(cache->file.files);
-	g_free(cache);
-
-	return TRUE;
-}
-
-#if d(!)0
-static void
-sync_value(void *key, void *value, void *data)
-{
-	struct _wordcache *cache = (struct _wordcache *)value;
-	struct _IBEXWord *idx = (struct _IBEXWord *)data;
-
-	sync_cache_entry(idx, cache);
-}
-#endif
-
-static void word_index_post(struct _IBEXWord *idx)
-{
-	idx->precount--;
-	if (idx->precount > 0)
-		return;
-	idx->precount = 0;
-
-#ifdef MALLOC_CHECK
-	cache_sanity(idx);
-#endif
-
-	g_hash_table_foreach_remove(idx->wordcache, sync_free_value, idx);
-	idx->wordcount = 0;
-}
-
-/* unindex all entries for name */
-static void unindex_name(struct _IBEXWord *idx, const char *name)
-{
-	GArray *words;
-	int i;
-	nameid_t nameid, wordid;
-	blockid_t nameblock, wordblock, newblock, nametail, wordtail, newtail;
-	char *word;
-	struct _wordcache *cache;
-
-	d(printf("unindexing %s\n", name));
-
-	/* if we have a namecache, check that to see if we need to remove that item, or there is no work here */
-	if (idx->nameinit) {
-		char *oldkey;
-		gboolean oldval;
-
-		if (g_hash_table_lookup_extended(idx->namecache, name, (void *)&oldkey, (void *)&oldval)) {
-			g_hash_table_remove(idx->namecache, oldkey);
-			g_free(oldkey);
-		} else {
-			return;
-		}
-	}
-
-	/* lookup the hash key */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this key */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-	/* and the data for this block */
-	words = idx->namestore->klass->get(idx->namestore, nameblock, nametail);
-	/* walk it ... */
-	for (i=0;i<words->len;i++) {
-		/* get the word */
-		wordid = g_array_index(words, nameid_t, i);
-		d(printf(" word %d\n", wordid));
-		/* get the data block */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-		/* clear this name from it */
-		newblock = wordblock;
-		newtail = wordtail;
-		idx->wordstore->klass->remove(idx->wordstore, &newblock, &newtail, nameid);
-		if (newblock != wordblock || newtail != wordtail)
-			idx->wordindex->klass->set_data(idx->wordindex, wordid, newblock, newtail);
-
-		/* now check the cache as well */
-		word = idx->nameindex->klass->get_key(idx->wordindex, wordid, NULL);
-		if (word) {
-			cache = g_hash_table_lookup(idx->wordcache, word);
-			if (cache) {
-				/* its there, update our head/tail pointers */
-				cache->wordblock = newblock;
-				cache->wordtail = newtail;
-
-				/* now check that we have a data entry in it */
-				if (cache->filealloc == 0 && cache->filecount == 1) {
-					if (cache->file.file0 == nameid) {
-						cache->filecount = 0;
-					}
-				} else {
-					int j;
-
-					for (j=0;j<cache->filecount;j++) {
-						if (cache->file.files[j] == nameid) {
-							cache->file.files[j] = cache->file.files[cache->filecount-1];
-							cache->filecount--;
-							break;
-						}
-					}
-				}
-			}
-			g_free(word);
-		}
-	}
-	g_array_free(words, TRUE);
-
-	/* and remove name data and itself */
-	idx->namestore->klass->free(idx->namestore, nameblock, nametail);
-	idx->nameindex->klass->remove(idx->nameindex, name, strlen(name));
-}
-
-/* index contains (any) data for name */
-static gboolean contains_name(struct _IBEXWord *idx, const char *name)
-{
-	struct _IBEXCursor *idc;
-	nameid_t wordid;
-	char *key;
-	int len;
-
-	/* load all the names into memory, since we're *usually* about to do a lot of these */
-
-	/* Note that because of the (poor) hash algorithm, this is >> faster than
-	   looking up every key in turn.  Basically because all keys are stored packed
-	   in the same list, not in buckets of keys for the same hash (among other reasons) */
-
-	if (!idx->nameinit) {
-		d(printf("pre-loading all name info into memory\n"));
-		idc = idx->nameindex->klass->get_cursor(idx->nameindex);
-		while ( (wordid = idc->klass->next(idc)) ) {
-			key = idc->index->klass->get_key(idc->index, wordid, &len);
-			g_hash_table_insert(idx->namecache, key, (void *)TRUE);
-		}
-		idc->klass->close(idc);
-		idx->nameinit = TRUE;
-	}
-
-	return (gboolean)g_hash_table_lookup(idx->namecache, name);
-	/*return idx->nameindex->klass->find(idx->nameindex, name, strlen(name)) != 0;*/
-}
-
-/* returns all matches for word */
-static GPtrArray *find(struct _IBEXWord *idx, const char *word)
-{
-	nameid_t wordid, nameid;
-	GPtrArray *res;
-	GArray *names;
-	int i;
-	char *new;
-	struct _wordcache *cache;
-	blockid_t wordblock, wordtail;
-
-	res = g_ptr_array_new();
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-#if 0
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		wordid = cache->wordid;
-		wordblock = cache->wordblock;
-		wordtail = cache->wordtail;
-	} else {
-		/* lookup the hash key */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-		/* get the block for this key */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-	}
-	/* and the data for this block */
-	names = idx->wordstore->klass->get(idx->wordstore, wordblock, wordtail);
-	/* .. including any memory-only data */
-	if (cache) {
-		if (cache->filealloc == 0 && cache->filecount == 1)
-			g_array_append_val(names, cache->file.file0);
-		else
-			g_array_append_vals(names, cache->file.files, cache->filecount);
-	}
-
-	/* walk it ... converting id's back to strings */
-	g_ptr_array_set_size(res, names->len);
-	for (i=0;i<names->len;i++) {
-		nameid = g_array_index(names, nameid_t, i);
-		new = idx->nameindex->klass->get_key(idx->nameindex, nameid, NULL);
-		res->pdata[i] = new;
-	}
-	g_array_free(names, TRUE);
-	return res;
-}
-
-/* find if name contains word */
-static gboolean find_name(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t wordid, nameid;
-	blockid_t nameblock, nametail;
-	struct _wordcache *cache;
-	int i;
-
-	/* if we have the namelist in memory, quick-check that */
-	if (idx->nameinit && g_hash_table_lookup(idx->namecache, name) == NULL)
-		return FALSE;
-
-	/* lookup the hash key for the name */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this name */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-
-	/* check if there is an in-memory cache for this word, check its file there first */
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-#if 0
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		if (cache->filecount == 1 && cache->filealloc == 0) {
-			if (cache->file.file0 == nameid)
-				return TRUE;
-		} else {
-			for (i=0;i<cache->filecount;i++) {
-				if (cache->file.files[i] == nameid)
-					return TRUE;
-			}
-		}
-		/* not there?  well we can use the wordid anyway */
-		wordid = cache->wordid;
-	} else {
-		/* lookup the hash key for word */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-	}
-
-	/* see if wordid is in nameblock */
-	return idx->namestore->klass->find(idx->namestore, nameblock, nametail, wordid);
-}
-
-/* cache helper functions */
-/* flush a cache entry to disk, and empty it out */
-static void
-sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache)
-{
-	GArray array; /* just use this as a header */
-	blockid_t oldblock, oldtail;
-	
-	if (cache->filecount == 0)
-		return;
-
-	d(printf("syncing cache entry '%s' used %d\n", cache->word, cache->filecount));
-	if (cache->filecount == 1 && cache->filealloc == 0)
-		array.data = (char *)&cache->file.file0;
-	else
-		array.data = (char *)cache->file.files;
-	array.len = cache->filecount;
-	oldblock = cache->wordblock;
-	oldtail = cache->wordtail;
-	idx->wordstore->klass->add_list(idx->wordstore, &cache->wordblock, &cache->wordtail, &array);
-	if (oldblock != cache->wordblock || oldtail != cache->wordtail) {
-		idx->wordindex->klass->set_data(idx->wordindex, cache->wordid, cache->wordblock, cache->wordtail);
-	}
-	cache->filecount = 0;
-}
-
-/* create a new key in an index, returning its id and head block */
-static void
-add_index_key(struct _IBEXIndex *wordindex, const char *word, nameid_t *wordid, blockid_t *wordblock, blockid_t *wordtail)
-{
-	/* initialise cache entry - id of word entry and head block */
-	*wordid = wordindex->klass->find(wordindex, word, strlen(word));
-
-	if (*wordid == 0) {
-		*wordid = wordindex->klass->insert(wordindex, word, strlen(word));
-		*wordblock = 0;
-		*wordtail = 0;
-	} else {
-		*wordblock = wordindex->klass->get_data(wordindex, *wordid, wordtail);
-	}
-}
-
-/* create a new key in a cached index (only word cache so far), flushing old keys
-   if too much space is being used */
-static struct _wordcache *
-add_index_cache(struct _IBEXWord *idx, const char *word)
-{
-	struct _wordcache *cache;
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache == 0) {
-		/*d(printf("adding %s to cache\n", word));*/
-
-#if 0
-		/* see if we have to flush off the last entry */
-		if (idx->wordcount >= WORDCACHE_SIZE) {
-			struct _wordcache *mincache;
-			int min, count=0;
-			/* remove last entry, and flush it */
-			cache = (struct _wordcache *)idx->wordnodes.tailpred;
-			mincache = cache;
-			min = mincache->filecount;
-
-			d(printf("flushing word from cache %s\n", cache->word));
-			/* instead of just using the last entry, we try and find an entry with
-			   with only 1 item (failing that, the smallest in the range we look at) */
-			/* this could probably benefit greatly from a more sophisticated aging algorithm */
-			while (cache->next && count < 100) {
-				if (cache->filecount == 1) {
-					mincache = cache;
-					break;
-				}
-				if (cache->filecount > 0 && cache->filecount < min) {
-					mincache = cache;
-					min = cache->filecount;
-				}
-				cache = cache->next;
-				count++;
-			}
-			ibex_list_remove((struct _listnode *)mincache);
-			g_hash_table_remove(idx->wordcache, mincache->word);
-			sync_cache_entry(idx, mincache);
-			if (mincache->filealloc)
-				g_free(mincache->file.files);
-			g_free(mincache);
-			idx->wordcount--;
-		}
-#endif
-		cache = g_malloc0(sizeof(*cache)+strlen(word));
-		/* if we're in an index state, we can assume we dont have it if we dont have it in memory */
-		if (idx->precount == 0) {
-			/* initialise cache entry - id of word entry and head block */
-			add_index_key(idx->wordindex, word, &cache->wordid, &cache->wordblock, &cache->wordtail);
-		} else {
-			cache->wordid = idx->wordindex->klass->insert(idx->wordindex, word, strlen(word));
-		}
-		/* other fields */
-		strcpy(cache->word, word);
-		cache->filecount = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-#if 0
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		idx->wordcount++;
-	} else {
-		/*d(printf("already have %s in cache\n", word));*/
-#if 0
-		/* move cache bucket ot the head of the cache list */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-	}
-	return cache;
-}
-
-/* adds a single word to name (slow) */
-static void add(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t nameid;
-	blockid_t nameblock, newblock, nametail, newtail;
-	struct _wordcache *cache;
-
-	g_error("Dont use wordindex::add()");
-	abort();
-
-	cache = add_index_cache(idx, word);
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	/* check for repeats of the last name - dont add anything */
-	if (cache->filecount == 1 && cache->filealloc == 0) {
-		if (cache->file.file0 == nameid)
-			return;
-	} else {
-		if (cache->file.files[cache->filecount] == nameid)
-			return;
-	}
-
-	/* see if we are setting the first, drop it in the union */
-	if (cache->filecount == 0 && cache->filealloc == 0) {
-		cache->file.file0 = nameid;
-	} else if (cache->filecount == 1 && cache->filealloc == 0) {
-		nameid_t saveid;
-		/* we need to allocate space for words */
-		saveid = cache->file.file0;
-		cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-		/* this could possibly grow as needed, but i wont for now */
-		cache->filealloc = CACHE_FILE_COUNT;
-		cache->file.files[0] = saveid;
-		cache->file.files[1] = nameid;
-	} else {
-		cache->file.files[cache->filecount] = nameid;
-	}
-
-	cache->filecount++;
-
-	/* if we are full, force a flush now */
-	if (cache->filealloc && cache->filecount >= cache->filealloc) {
-		sync_cache_entry(idx, cache);
-	}
-
-	newtail = nametail;
-	newblock = nameblock;
-	idx->namestore->klass->add(idx->namestore, &newblock, &newtail, cache->wordid);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-}
-
-/* adds a bunch of words to a given name */
-static void add_list(struct _IBEXWord *idx, const char *name, GPtrArray *words)
-{
-	int i;
-	GArray *data = g_array_new(0, 0, sizeof(nameid_t));
-	blockid_t nameblock, newblock, nametail, newtail;
-	nameid_t nameid;
-	struct _wordcache *cache;
-
-	d(printf("Adding words to name %s\n", name));
-
-	d(cache_sanity(idx));
-
-	/* make sure we keep the namecache in sync, if it is active */
-	if (idx->nameinit && g_hash_table_lookup(idx->namecache, name) == NULL) {
-		g_hash_table_insert(idx->namecache, g_strdup(name), (void *)TRUE);
-		/* we know we dont have it in the disk hash either, so we insert anew (saves a lookup) */
-		nameid = idx->nameindex->klass->insert(idx->nameindex, name, strlen(name));
-		nameblock = 0;
-		nametail = 0;
-	} else {
-		/* get the nameid and block start for this name */
-		add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-	}
-
-	d(cache_sanity(idx));
-
-	for (i=0;i<words->len;i++) {
-		char *word = words->pdata[i];
-
-		cache = add_index_cache(idx, word);
-
-		/*d(cache_sanity(idx));*/
-
-		/* check for duplicates; doesn't catch duplicates over an overflow boundary.  Watch me care. */
-		if (cache->filecount == 0
-		    /* the 1 item case */
-		    || (cache->filecount == 1 && cache->filealloc == 0 && cache->file.file0 != nameid)
-		    /* the normal case */
-		    || (cache->filealloc > 0 && cache->file.files[cache->filecount-1] != nameid)) {
-
-			/* see if we are setting the first, drop it in the union */
-			if (cache->filecount == 0 && cache->filealloc == 0) {
-				cache->file.file0 = nameid;
-			} else if (cache->filecount == 1 && cache->filealloc == 0) {
-				nameid_t saveid;
-				/* we need to allocate space for words */
-				saveid = cache->file.file0;
-				cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-				/* this could possibly grow as needed, but i wont for now */
-				cache->filealloc = CACHE_FILE_COUNT;
-				cache->file.files[0] = saveid;
-				cache->file.files[1] = nameid;
-			} else {
-				cache->file.files[cache->filecount] = nameid;
-			}
-
-			cache->filecount++;
-
-			/* if we are full, force a flush now */
-			if (cache->filealloc && cache->filecount >= cache->filealloc) {
-				sync_cache_entry(idx, cache);
-			}
-
-			/*d(cache_sanity(idx));*/
-
-			/* and append this wordid for this name in memory */
-			g_array_append_val(data, cache->wordid);
-		}
-
-		/*d(cache_sanity(idx));*/
-	}
-
-	d(cache_sanity(idx));
-
-	/* and append these word id's in one go */
-	newblock = nameblock;
-	newtail = nametail;
-	idx->namestore->klass->add_list(idx->namestore, &newblock, &newtail, data);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-
-	d(cache_sanity(idx));
-
-	g_array_free(data, TRUE);
-}
-
-/* sync any in-memory data to disk */
-static int
-word_sync(struct _IBEXWord *idx)
-{
-	/* we just flush also, save memory */
-	word_flush(idx);
-
-#if 0
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head;
-
-	while (cache->next) {
-		sync_cache_entry(idx, cache);
-		cache = cache->next;
-	}
-
-	/*ibex_hash_dump(idx->wordindex);*/
-	/*ibex_hash_dump(idx->nameindex);*/
-#endif
-	return 0;
-}
-
-static gboolean
-free_key(void *key, void *value, void *data)
-{
-	g_free(key);
-
-	return TRUE;
-}
-
-/* sync and flush any in-memory data to disk and free it */
-static int
-word_flush(struct _IBEXWord *idx)
-{
-	d(cache_sanity(idx));
-
-	g_hash_table_foreach_remove(idx->wordcache, sync_free_value, idx);
-	idx->wordcount = 0;
-	if (idx->nameinit) {
-		g_hash_table_foreach_remove(idx->namecache, free_key, NULL);
-		idx->nameinit = FALSE;
-	}
-	return 0;
-}
-
-static int word_close(struct _IBEXWord *idx)
-{
-	idx->klass->flush(idx);
-
-	idx->namestore->klass->close(idx->namestore);
-	idx->nameindex->klass->close(idx->nameindex);
-	/*same as namestore:
-	  idx->wordstore->klass->close(idx->wordstore);*/
-	idx->wordindex->klass->close(idx->wordindex);
-	g_hash_table_destroy(idx->wordcache);
-	g_hash_table_destroy(idx->namecache);
-	g_free(idx);
-
-	return 0;
-}
-
-/* debugging/tuning function */
-
-struct _stats {
-	int memcache;		/* total memory used by cache entries */
-	int memfile;		/* total mem ysed by file data */
-	int memfileused;	/* actual memory used by file data */
-	int memword;		/* total mem used by words */
-	int file1;		/* total file entries with only 1 entry */
-	int total;
-};
-
-static void
-get_info(void *key, void *value, void *data)
-{
-	struct _wordcache *cache = (struct _wordcache *)value;
-	struct _stats *stats = (struct _stats *)data;
-
-	/* round up to probable alignment, + malloc overheads */
-	stats->memcache += ((sizeof(struct _wordcache) + strlen(cache->word) + 4 + 3) & ~3);
-	if (cache->filealloc > 0) {
-		/* size of file array data */
-		stats->memcache += sizeof(nameid_t) * cache->filealloc + 4;
-		/* actual used memory */
-		stats->memfile += sizeof(nameid_t) * cache->filealloc;
-		stats->memfileused += sizeof(nameid_t) * cache->filecount;
-	}
-	if (cache->filecount == 1 && cache->filealloc == 0)
-		stats->file1++;
-
-	stats->memword += strlen(cache->word);
-	stats->total++;
-}
-
-static char *
-num(int num)
-{
-	int n;
-	static char buf[256];
-	char *p = buf;
-	char type = 0;
-
-	n = num;
-	if (n>1000000) {
-		p+= sprintf(p, "%d ", n/1000000);
-		n -= (n/1000000)*1000000;
-		type = 'M';
-	}
-	if (n>1000) {
-		if (num>1000000)
-			p+= sprintf(p, "%03d ", n/1000);
-		else
-			p+= sprintf(p, "%d ", n/1000);
-		n -= (n/1000)*1000;
-		if (type == 0)
-			type = 'K';
-	}
-	if (num > 1000)
-		p += sprintf(p, "%03d", n);
-	else
-		p += sprintf(p, "%d", n);
-
-	n = num;
-	switch (type) {
-	case 'M':
-		p += sprintf(p, ", %d.%02dM", n/1024/1024, n*100/1024/1024);
-		break;
-	case 'K':
-		p += sprintf(p, ", %d.%02dK", n/1024, n*100/1024);
-		break;
-	case 0:
-		break;
-	}
-
-	return buf;
-}
-
-void word_index_mem_dump_info(struct _IBEXWord *idx);
-
-void word_index_mem_dump_info(struct _IBEXWord *idx)
-{
-	struct _stats stats = { 0 };
-	int useful;
-
-	g_hash_table_foreach(idx->wordcache, get_info, &stats);
-
-	useful = stats.total * sizeof(struct _wordcache) + stats.memword + stats.memfile;
-
-	printf("Word Index Stats:\n");
-	printf("Total word count: %d\n", stats.total);
-	printf("Total memory used: %s\n", num(stats.memcache));
-	printf("Total useful memory: %s\n", num(useful));
-	printf("Total malloc/alignment overhead: %s\n", num(stats.memcache - useful));
-	printf("Total buffer overhead: %s\n", num(stats.memfile - stats.memfileused));
-	printf("Space taken by words: %s\n", num(stats.memword + stats.total));
-	printf("Number of 1-word entries: %s\n", num(stats.file1));
-	if (stats.memcache > 0)
-		printf("%% unused space: %d %%\n", (stats.memfile - stats.memfileused) * 100 / stats.memcache);
-}
-
diff --git a/libical/.cvsignore b/libical/.cvsignore
deleted file mode 100644
index 41f3513f40..0000000000
--- a/libical/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.la
-*.lo
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-libtool
-ltconfig
-ltmain.sh
-stamp-h
-stamp-h.in
diff --git a/libical/AUTHORS b/libical/AUTHORS
deleted file mode 100644
index 659288c31d..0000000000
--- a/libical/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Eric Busboom  <eric@softwarestudio.org>
diff --git a/libical/COPYING b/libical/COPYING
deleted file mode 100644
index e69de29bb2..0000000000
--- a/libical/COPYING
+++ /dev/null
diff --git a/libical/ChangeLog b/libical/ChangeLog
deleted file mode 100644
index 5deefa813c..0000000000
--- a/libical/ChangeLog
+++ /dev/null
@@ -1,570 +0,0 @@
-2001-02-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* src/libical/Makefile.am (ical.h): Depend on `$(BUILT_SOURCES)',
-	not `$(COMBINEDHEADERS)'.
-
-2001-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* src/libical/Makefile.am: The built sources shouldn't be cleaned
-
-2001-02-09  JP Rosevear  <jpr@ximian.com>
-
-	* src/libical/icalparameter.c.in (icalparameter_new_from_string):
-	its NEEDS-ACTION rather than NEEDSACTION
-	(icalparameter_as_ical_string): ditto
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* src/libical/icallangbind.c: Added a missing #include here.
-
-	* src/libical/icalrecur.c (icalrecur_add_bydayrules): Copy the
-	passed in const vals since we change it.
-
-2001-02-05  JP Rosevear  <jpr@ximian.com>
-
-	* src/libical/icallangbind.c (icallangbind_get_property): Use the
-	renamed api call
-
-2001-02-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* src/libical/Makefile.am (COMBINEDHEADERS): `icalvalue.h',
-	`icalparameter.h', `icalproperty.h' and `icalrestriction.h' are
-	created in the builddir so they shouldn't be prefixed with
-	`$(top_builddir)/src/libical'.
-
-2001-01-26  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalproperty.c.in Improved icalproperty_as_ical_string() to
- 	eliminate the possibility of having a VALUE parameter that does
- 	not match the actual kind of value.
-
-	* icalvalue.c.in made icalvalue_*_trigger() and
- 	icalvalue_*_datetimeperiod non-autogenerated. These routines were
- 	for combined value type -- non standard values that can have more
- 	than on standard value type. These non-standard types now delegate
- 	to stadard types.
-	
-
-2001-01-24  Dan Winship  <danw@helixcode.com>
-
-	* src/libical/icaltime.c: Remove unused "extern long timezone".
-
-2001-01-24  Damon Chaplin  <damon@helixcode.com>
-
-	* src/libical/icaltime.c (set_tz): 
-	(unset_tz): rewrote to fix problems with freeing the environment
-	string after calling putenv() and to fix memory leaks. (We save a
-	pointer to the last TZ env var we set, so we free it after the next
-	time we set TZ.)
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Don't AC_INIT on an autogenerated file that does not
-	exist beforehand
-
-2001-01-24  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalfileset.c fixed icalfileset_read-from_file so it will handle
- 	lines longer than 80 char properly.
-
-2001-01-23  Eric Busboom  <eric@softwarestudio.org>
-
-	* icltime.c Removed all of the _local_ routines and simplified
- 	icaltime_utc_offset and icaltime_as_timet
-
-	* regression.c Added tests for triggers and improvements to icaltime.c
-
-	* icaltypes.c Addedd icaltriggertype_from_string and changed
- 	icaltriggertype to be a struct
-
-2001-01-22  Eric Busboom  <eric@softwarestudio.org>
-
-	* icaltime.c implemented icaldurationtype_from_string to parse the
- 	string it self, rather than use lex/yacc
-
-2001-01-15  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalfileset.c Many improvements. File locking now works, and so
- 	does searching with icalfileset_select()
-
-2001-01-08  Eric Busboom  <eric@softwarestudio.org>
-
-	* Makefile.am Remove spaces after -I in several 
-	Makefile.am routines. 
-
-	* icalset.c removed return statements from some void functions.
-
-	* icalparameter.c.in Added break to default: case that had no
- 	body. Compilers on Solaris and Tru64 UNIX complained.
-
-2001-01-02  Eric Busboom  <eric@softwarestudio.org>
-
-	* icaltime.c Changed icaldurationtype_from_time and _as_timet to
- 	_from_int and _as_int. This is a change interface that may break
- 	some code.
-
-	* icalgauge.c icalgaugeimpl.h, icalgauge.h., Rewrote gauge code to
- 	use pvl-lists directly, instead of trying to reuse icalcomponent.
-
-2000-12-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* src/libical/Makefile.am: Build `libical-static.la'.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* src/libical/Makefile.am (ical.h): 
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* src/libical/icaltime.c (icaltime_from_timet): Use gmtime()
-	unconditionally, since we want an UTC broken-down representation.
-	(icaltime_as_timet): Add the offset only if the time was supposed
-	to be in UTC; that way mktime() will get a proper localtime as
-	source data.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* src/libical/icaltime.c (icaltime_from_timet): time_t values
-	*are* in UTC by definition, so the is_utc argument is useless.
-	Removed the conversion to UTC and made the icaltimetype.is_utc be
-	TRUE always.  This breaks libical's owne internal use of this
-	function, but since we do not use any of the functions that use it
-	that way, we can ignore this.  This is basically a temporary
-	measure until libical does the right thing.
-
-2000-12-12  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalparser.c Addedd support for x-parameters. 
-
-	* icalenum.c Fixed icalenum_parameter_type_to_string and
- 	icalenum_property_type_to_string to property identify X- parameers
- 	and properties.
-
-	* icalparameter.c Fixed icalparameter_as_ical_string to property
- 	write out X-Parameters.
-
-	
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* src/libical/icalerror.h: Added a name to the parameter to
-	icalerror_set_errno.
-
-2000-12-12  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalparser.c Addedd support for x-parameters. 
-
-	* icalenum.c Fixed icalenum_parameter_type_to_string and
- 	icalenum_property_type_to_string to property identify X- parameers
- 	and properties.
-
-	* icalparameter.c Fixed icalparameter_as_ical_string to property
- 	write out X-Parameters.
-
-	
-2000-12-11  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalcstp.c added empty bodies to prep_* routines so that shared
- 	libraries would build.
-
-2000-12-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* src/libical/Makefile.am (COMBINEDHEADERS): Removed the explicit
-	paths.  Why it did *not* work on my original try when they were
-	not there, well, now I don't know.
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* src/libicalvcal/Makefile.am (INCLUDES): Add
-	`$(top_builddir)/src/libical' to the include directory list.
-
-	* src/libical/Makefile.am (icalparameter.h): Use `$(srcdir)'.
-	(icalparameter.c): Likewise.
-	(icalproperty.h): Likewise.
-	(icalproperty.c): Likewise.
-	(icalvalue.h): Likewise.
-	(icalvalue.c): Likewise.
-	(icalrestriction.c): Likewise.
-	(CLEANFILES): Add `icalparameter.h', `icalparameter.c',
-	`icalproperty.h', `icalproperty.c', `icalrestriction.c',
-	`icalvalue.h', `icalvalue.c'.
-	(COMBINEDHEADERS): `icalvalue.h', `icalparameter.h' and
-	`icalproperty.h' are in builddir, not srcdir, so fix the list to
-	use `$(top_builddir)' instead of `$(top_srcdir)'.
-	(all): Removed.
-	(BUILT_SOURCES): Move `ical.h' here instead.
-	(ical.h): Don't depend on `(BUILT_SOURCES)'; this a built source
-	itself.
-
-2000-12-12  Joe Shaw  <joe@helixcode.com>
-
-	* src/libical/icalrecur.c: #if 0ed out some #if 1ed test code that
-	was breaking my build by #including ical.h. No cookie!
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for "extern int timezone;" vs struct
-	tm tm_gmtoff, stolen from Evolution's configure.in.
-
-	* src/libical/icaltime.c (icaltime_utc_offset,
-	icaltime_local_utc_offset): Use HAVE_TIMEZONE, add tm_gmtoff
-	support.
-
-	* src/libical/icallexer.l: Remove ical_yy_scan_buffer, ..._string,
-	and ..._bytes prototypes, since it compiles fine without them on
-	Linux, and bombs out due to prototype mismatch on my NetBSD box.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am:
-	* configure.in: Disable compilation of the examples directory
-	until libicalss is fixed.
-
-	* configure.in: Make AC_INIT() check for a file that is not
-	autogenerated!
-
-	* configure.in: Added check for Perl.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Fixed order of generated files to make
-	"make distcheck" work.  Turn on AM_MAINTAINER_MODE.
-
-	* src/libical/Makefile.am (EXTRA_DIST): Add icalversion.h.in.
-	(COMBINEDHEADERS): Added paths to make "make distcheck" work.
-	(libical_la_SOURCES): Added headers for distribution in our weird
-	setup.
-
-2000-12-11  JP Rosevear  <jpr@helixcode.com>
-
-	* src/libical/icaltime.c (icaltime_compare_date_only): New
-	function that compares only the dates, not the times as well.
-
-	* src/libical/icaltime.h: Add prototype for the function above.
-
-	* src/libical/icalrecur.h (struct icalrecurrencetype): Correct
-	header documentation.
-
-	* src/libical/icaltypes.c: No longer include <limits.h>.
-
-	* src/libical/icalrecur.c: Likewise.
-
-	* src/libical/icalvalue.c.in: Likewise.
-
-	* src/libical/icalyacc.y: Likewise.
-
-2000-12-06  Eric Busboom  <eric@softwarestudio.org>
-
-	* icaltime.c added icaltime_as_local to convert a UTC time to a
- 	local time
-
-	* icaltime.h icaltime.c Removed is_utc argument from
- 	icaltime_from_timet
-
-	
-2000-11-29  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalrecur.c More testing and bug fixes. Many more of the rules
- 	in recur.txt work correctly.
-
-2000-11-28  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalrecur.c Several changes to extract icalrecur.c from
- 	libical. I'd like to make it into a reference impl for recurrence
- 	rules. CHanges include moving all of the recurrence type and
- 	recurrence enums from icalenum and icaltypes into icalrecur, and
- 	adding code to parse recurrence rule strings.
-
-	* icaltime.c Changed icaltime_from_string to parse the string
- 	directly. Now icaltime.c has no dependency on icalvalue.c
-
-2000-11-21  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalrecur.c Fixed a bug in the increment_* routines that made
- 	incrementing by more then 1 insensible. Thanks to Martin Neimeier
-
-2000-11-20  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalmessage.c Many routines to create new ical messages.
-
-	* icalspanlist.c Code to generate a list of the busy time f the
- 	VEVENTS in a set. Also includes routiens to generate free and busy
- 	lists from the spanlist, and to find the next free time after a
- 	given time.
-
-	* icalvalue.c The STATUS property now has its own value type,
- 	STATUS, which holds the enumeration icalproperty_status.
-
-	* icalrestriction.c Added more restrictions. Now handles mutual
- 	and exclusive consitions, and checks for the reight values in
- 	STATUS properties
-
-
-2000-11-10  Eric Busboom  <eric@softwarestudio.org>
-
-	* icaltypes.c Added routine to create durationtype from string:
- 	icaldurationtype_from_string
-
-2000-11-09  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalcomponet.c Add sever get/set convienience routines to access
- 	and manipulate common component propoerties from the component
- 	interface. This eliminates the need to create a lot of temporary
- 	variables if you just want to change the start time of and event.
-
-2000-11-06 Eric Busboom    <eric@softwarestudio.org>
-
-	* icalcomponent.c Added new routines to icalcomponent:
-	_get_span -- returns the start and end times of the event in UTC
-	_get_first_real_component -- return ref to VTODO, VEVENT or VJOURNAL
-
-	* icalspanlist.c Added new class, icalspanlist, that generates a
- 	list of alternating busy and free times from an icalset. The class
- 	includes routines to gnerate rfc2445 busy and free lists, and to
- 	get the next avaliable busy or free time after a given time.
-
-2000-11-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* src/libical/icalvalue.c (icalvalue_recur_as_ical_string): Handle
-        both the position and weekday in the by_day field.
-
-2000-10-20  Jesse Pavel	  	<jpavel@helixcode.com>
-
-	* src/libical/icalproperty.c: added support for the
-	icalproperty_remove_parameter() function.
-
-2000-10-20  Eric Busboom  <eric@agony.busboom.org>
-
-	* Const correctness. Added 'const' all over everywhere.
-
-2000-10-19  Eric Busboom  <eric@agony.busboom.org>
-
-	* icalproperty, icalparameter, icalvalue .c, .h Changed most
-	instances of char* to const char*
-
-	* icalclassify.h Added multiple include protection
-
-	* icalset.h and others, got rid of parameter named "new"
-
-2000-10-15 Eric Busboom   <eric@softwarestudio.org>
-
-	* icalcomponent Added convienience functions for constructing
- 	components: icalcomponent_new_vcalendar(), etc.
-
-	* Makefile.am Incorporated build system patch from Federico
- 	Quintero. Misc small fixes and cleanup
-
-	* scripts Incorporated auto-gen patch from Frederico. Generated
- 	code in libical now uses icalproperty.c.in (etc) instead of
- 	editing file icalparoperty.c in place.
-
-	* libical. Changed flex/bison to use the -P/-p options to set
- 	ical_yy as a prefix. Removed prefix redefinition from icalyacc.y
-
-2000-10-12 Eric Busboom    <eric@softwarestudio.org>
-
-	* icalproperty.c Fixed icalproperty_get_{first,next}_parameter to
- 	honor the parameter kind argument
-
-	* icalparameter.c Added, but did not complete, a new version of
- 	icalparameters_from_string that does not use the hairy nested
- 	case/switch statements of the previous version
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* src/libical/icalparameter.c (icalparameter_as_ical_string):
-	(icalparameter_new_from_string):
-	* src/libical/icalparser.c (icalparser_add_line): add support for
-	'X-' parameters.
-
-2000-10-07  Dan Winship  <danw@helixcode.com>
-
-	* src/libical/icalyacc.y (weekday_list): Fix the semicolons in
-	this rule. Noticed by x-virge.
-
-	* src/test/Makefile.in: While I'm here, remove this from CVS, as
-	it's a generated file.
-
-2000-10-02 Eric Busboom  <eric@softwarestudio.org>
-
-	* ical.h ical.h and icalss.h now are concatenations of all of the
- 	public headers for their respective libraries. Thus, only ical.h,
- 	icalss.h and icalvcal.h need to be installed.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: AC_OUTPUT the Makefile in `src' before the stuff
-	in its subdirs.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* test-data/stresstest.ics: Merge missing file for distcheck
-
-	* src/libicalss/icalcstp.h: ditto
-
-	* src/libicalss/icalcsdb.h: ditto
-
-2000-09-11  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalvcal.c Added more comments
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: We don't need AC_PROG_RANLIB and
-	AM_PROG_LIBTOOL
-
-	* src/libical/icalyacc.y (clear_recur): Explicitly
-	set the week_start to the Monday default in case the
-	recurrence rule does not.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* Kill off more old, dead files
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* MacOS: This dir is not in 0.19
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* src/libical/CHANGES: This file is not in 0.19
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* src/libical/.gdb_history: Kill file
-
-	* src/libical/.gdb_history: Kill file
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* src/pvl/Makefile: Kill old file
-
-	* src/test/usecases.c: Kill old file
-
-	* src/test/.cvsignore: Update
-
-	* src/libicalvcal/.cvsignore: Update
-
-	* examples/.cvsignore: Shut up
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Don't list config.h in AC_OUTPUT
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* examples/Makefile.am (INCLUDES): More `$(srcdir)' loving.
-
-	* src/libicalvcal/Makefile.am (INCLUDES): Add `-I
-	$(srcdir)/../libical' for builddir != srcdir loving.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* examples/access_properties_and_parameters.c,
-	src/libicalvcal/vcc.y: Got rid of some warnings.
-
-	* src/libicalvcal/vcc.c: Checking in generated C file.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* src/libical/icalcomponent.c: Fixed an incorrect struct name.
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* src/libical/icalcomponent.c (icalcomponent_end_component): Compile fix;
-	use icalerror_check_arg_re so we can return an valid icalcompiter.
-	(icalcomponent_begin_component): Same.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* src/libical/icalvcal.h: Remove this duplicate file to fix build
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* src/test/Makefile.am: Make it work.
-
-2000-08-04  Eric Busboom  <eric@softwarestudio.org>
-
-	* stow.c Changed stow to write data to a file ( icalfileset) not a
- 	calendar. Also added MIME parsing capability
-
-	* sspm.c Core of the mime processor. Now handles quoted-printable
- 	and base64 encodings
-
-	* icalmime.h New file that parses mime data and returns an
- 	icalcomponent that includes all of the parts.
-
-
-2000-07-26   Eric Busboom   <eric@softwarestudio.org>
-
-	* icaldirset.h misc bug fixes to get deleting components to work
-
-	* icalcomponent.h Eliminated internal use of _get_first_component
- 	and _get_next_component, since these will reset the interal
- 	iterators.
-
-2000-07-23   Eric Busboom   <eric@softwarestudio.org>
-
-	* icalcomponent.h Added external iterators to icalcomponent for
- 	subcomponents: icalcompiter. These are still experimental, but they
- 	seem to work OK and have a nice syntax
-
-2000-07-18   Eric Busboom   <eric@softwarestudio.org>
-
-	* icalset This is a new "superclass" for icalstore, icalcluster,
- 	and others. It merges the interfaces of the old icalstore and
- 	icalcluster
-
-	* icalstore.{c,h} CHanged name to icaldirset
-
-	* icalcluster.{c,h} Changed name to icalfileset
-
-
-2000-06-12  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalstow.c misc improvements and bug fixes to make it useful.
-
-2000-06-09  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalrecur.c More extensive code changes for recurrence rule.
-
-	* icalyacc.y Added support for integers in by day lists
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* src/test/Makefile.am (INCLUDES): Likewise.
-
-	* src/libicalss/Makefile.am (INCLUDES): Use $(srcdir) to allow
-	builddir != srcdir.
-
-2000-06-01  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalrecur.c moved recur code into new files
-
-2000-05-30  Eric Busboom  <eric@softwarestudio.org>
-
-	* icaltypes.c Extensive work on code to expand recurences
-
-	* icaltypes.h Changed signature icaltimetype_from_timet to include
- 	is_utc flag.
-
-
-2000-03-17  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalstore.c Vastly improved icalstore_test.
-
-2000-03-16  Eric Busboom  <eric@softwarestudio.org>
-
-	* icalcluster.c Added compile flag (ICAL_SAFESAVES) to switch how
- 	icalcluster saves files during commits. When the flag is define,
- 	it will write the data to a temorar file and rename the file to
- 	the target file.
-
-	* storage.c Added seterate test suite for sotage components
-
-	* icalparser.c Created parser object, implemented line-oriented
- 	parsering, and made message oriented parsing work in terms f line
- 	oriented parsing.
-
-	* icalparser.c Fixed icalparser_get_line to remove \r in input.
-
-
diff --git a/libical/INSTALL b/libical/INSTALL
deleted file mode 100644
index b3f195d679..0000000000
--- a/libical/INSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-Building the library
---------------------
-
-This distribution is developed on Red Hat Linux 6.0 and usually
-compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of
-previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I
-don't know about any other systems.
-
-The library is configured with automake. From the root directory, run 
-
-	./configure
-
-To build all of the Makefiles for your system. If you will be installing the library, you may want to use the --prefix flag to set the directory where the library and header files will be installed. 
-
-	./configure --prefix=/proj/local/
-
-If configure runs fine, run "make" to build the library and 
-"make install" to install it.
-
-The current version of libical focuses on creating and
-manipulating iCal objects. With it, you can parse text representations
-of iCal components, add and remove sub-components, properties,
-parameters and values, and print the components back out as strings. 
-
diff --git a/libical/Makefile.am b/libical/Makefile.am
deleted file mode 100644
index a71157bed4..0000000000
--- a/libical/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-EXTRA_DIST = \
-	ChangeLog \
-	README \
-	TEST \
-	TODO
-
-SUBDIRS = design-data doc scripts test-data src
-
-# Disabled examples until it builds
-#SUBDIRS = design-data doc scripts test-data src examples
-
diff --git a/libical/NEWS b/libical/NEWS
deleted file mode 100644
index c4bc3db38f..0000000000
--- a/libical/NEWS
+++ /dev/null
@@ -1,396 +0,0 @@
-Version 0.22, 15 Jan 01 ( cvs tag libical-0-22)
-----------------------------------------------
-
-Many improvements to the time routines in icaltime.c. I think that
-they actually make sense now. Note that there is an interface change
-with icaltime_from_timet() -- I removed the is_utc parameter, since
-all timet values are in UTC. Use icaltime_from_int() if you really
-want the old interface
-
-Major improvements to icalfileset. icalfileset_select now works and so
-does file locking.
-
-Minor revision to the documentation, but it does include a new section
-on file storage ( icalfileset ) and time ( icaltime.c)
-
-Lots of bug fixes and small patches. 
-
-I improved the regression test in src/test/regression.c. It now have
-command line switches to select specific tests ( undocumentated, of
-course ) and more of the tests include asserts, so you can just run it
-without looking at the output. If the test runs without crashing, it
-is mostly OK.
-
-
-
-Version 0.21, 20 Nov 00 ( cvs tag libical-0-21)
-----------------------------------------------
-
-        * icalmessage.c Many routines to create new ical messages. 
-
-	* icalspanlist.c Code to generate a list of the busy time f the
- 	VEVENTS in a set. Also includes routiens to generate free and busy
- 	lists from the spanlist, and to find the next free time after a
- 	given time.
-
-	* icalvalue.c The STATUS property now has its own value type,
- 	STATUS, which holds the enumeration icalproperty_status.
-
-	* icalrestriction.c Added more restrictions. Now handles mutual
- 	and exclusive consitions, and checks for the reight values in
- 	STATUS properties
-	
-	* icaltypes.c Added routine to create durationtype from string:
- 	icaldurationtype_from_string
-
-
-	* icalcomponet.c Add sever get/set convienience routines to access
- 	and manipulate common component propoerties from the component
- 	interface. This eliminates the need to create a lot of temporary
- 	variables if you just want to change the start time of and event.
-
-
-	* icalcomponent.c Added new routines to icalcomponent:
-	_get_span -- returns the start and end times of the event in UTC
-	_get_first_real_component -- return ref to VTODO, VEVENT or VJOURNAL
-
-	* icalspanlist.c Added new class, icalspanlist, that generates a
- 	list of alternating busy and free times from an icalset. The class
- 	includes routines to gnerate rfc2445 busy and free lists, and to
- 	get the next avaliable busy or free time after a given time.
-
-
-Version 0.20D 3 Nov 00
------------------------
-
-Many miscelaneous tweaks to the build system
-
-More work to icalclassify.
-
-Aded routines to icaltime.c to convert to and from specific timezones
-in Olsen format ("America/Los_Angeles")
-
-
-Version 0.20 7 Sept 00 (cvs tag libical-0-20 )
-----------------------------------------------
-
-Addedd icalclassify() which looks at a message and determine how to
-process it.
-
-Misc bug fixes and tweaks. 
-
-Version 0.19 6 August 00 (cvs tag libical-0-19)
------------------------------------------------
-
-Created a MIME parser in icalmime.c. This will take any complex MIME
-encapsulated message and return an icalcomponent with the same
-structure. Each MIME part is represented by a component of type
-X-LIC-MIMEPART.
-
-Added MIME partsing to stow.c
-
-Added external iterators to icalcomponent. See test_iterators() in
-test/regression.c
-
-Refactored icalcluster and icalstore into icalset, icalfileset and
-icaldirset, which have a pseudo inheritance relationship between them.
-
-Fixed more memory leaks. 
-
-Version 0.18a 10 June 00 ( cvs tag libical-0-18a )
------------------------------------------------
-
-Did the final tweaks to stow.c, a program to recieve and store iMIP
-messages.
-
-
-Version 0.18 10 June 00 ( cvs tag libical-0-18 )
------------------------------------------------
-
-Added libicalvcal, which includes the Versit code for parsing vCal
-files and a routine (icalvcal_convert() ) that converts a vCal object
-to an iCal object. The test program is src/test/testvcal.
-
-Added marginally functional recurrence code. The curent code does not
-handle all of the examples in rfc2445 ( which are extracted in
-test-data/recur.txt ) but it can do all of the obvious cases. See the
-test program in src/test/recur.c for an example. In particular, the
-code cannot handle the integer values in BYDAY, nor negative integers
-in BYMONTH or BYMONTHDAY. It also cannot handle BYSETPOS.
-
-Moved some code to the examples directory and improved the comments. 
-
-Did a little more work on the documentation in the doc directory. The
-documentation is in LyX source, but there is a text version in
-UsingLibical.txt
-
-
-Version 0.17 15 May 00  (cvs tag libical-0-17 ) 
----------------------------------------------
-
-Fixed two bugs that added extraneous '/' to test values
-
-Fixed type in internal string for the COUNTER method
-
-Eliminated a memory leak in icalparser.c
-
-
-Version 0.16a 29 April 00
-----------------------------------------------
-
-Fixed bug in icalvalue_new_from_string that caused METHOD value to
-choke on non standard input.
-
-Fixed a memory leak in icalparser_add_line -- failed to free 'line'
-
-
-Version 0.16 5 April 00 ( cvs tag libical-0-16)
-----------------------------------------------
-
-Now using automake. 
-
-Substantial changes to the parser. New interfaces let you parser
-multiple components from a single stream by feading the parser object
-one line at a time.
-
-Added a STRING value type. this type is like TEXT, but does not
-backslash magic characters. It is used in PRODID and REQUEST-STATUS,
-where the '/' and ';' are literal.
-
-Added several convience functions for REQUEST-STATUS to icalenums.c
-
-Addedd a routine to icalcomponent to convert X-LIC errors to
-REQUEST-STATUS return values.
-
-Version 0.15a  5 Mar 00 (cvs tag libical-0-15a)
----------------------
-
-Experimented with CVS
-
-Fixed icalvalue_set_text to convert escaped characters into the proper
-values.
-
-Other minor code tweaks. 
-
-
-Version 0.15 7 Feb 00
----------------------
-
-Split the storage classess ( icalstore, icalcluster, icalcalendar )
-into a seperate library, libicalss
-
-Implemented restriction checking in file icalrestrictions.c. The
-checking is not complete, but can handle the bulk of the restrictions
-described in RFC 2446.
-
-Created a new value type, METHOD. Changed METHOD property to use the
-new value. The METHOD value uses an enumeration.
-
-
-Version 0.14b 
--------------
-
-Implemented parsing of RECUR values, although it does not handle BYDAY
-specs with numbers.
-
-Fixed error in icalparser_next_line that mangled lines longer than the
-temp buffer (1024 chars.) The temp buffer is now 80 chars, and it can
-handle (apparently) arbitrary length lines
-
-Fixed severe brokenness in a value, but I forgot which one. 
-
-Cleaned cruft out of the distribution, so the tarfile is smaller. 
-
-
-Version 0.14a 14 Jan 00
------------------------
-
-Fixed bug in ROLE parameter -- missing '-' in the text of allowed values
-
-Fixed bug in X-parameters
-
-Version 0.14 11 Jan 00
-----------------------
-
-Fixed wrong value type for TRIGGER property
-
-Added Calendar object. Calendar is an aggregate of two stores and two
-clusters, and can store all of the inforamation associated with a
-calendar.
-
-icalcomponent_add_property and icalcomponent_add_component will
-complain if you try to add a component or property that is already
-part of an other component. The *_free routines wil complain if you try
-to free a linked component or property.
-
-More improvements to error handling. 
-
-Parser is much more robust. 
-
-Minor memory enhancements. 
-
-Regression test runs without memory leaks. 
-
-Version 0.13d 21Dec99
----------------------
-
-Seperated perl interface and library
-
-Added autoconf support
-
-Scripts that generate derived properties, values and parameters now
-change source and header files inline.
-
-Changed icalstore to cluster all components with DTSTART in a month
-into a single file. This should reduce number of file accesses by a
-factor of 60.
-
-Ran code through Purify and fixed memory leaks. 
-
-
-Version 0.13 16Nov99
----------------------
-
-Yet more bug fixes! Yeah!
-
-Added better error handling. The Parser inserts X-LIC-*ERROR
-properties to warn of parsing errors.
-
-The imip source/sink programs in /src/imip is demonstrably functional. 
-
-Version 0.12b 17Oct99
----------------------
-
-More bug fixes, particularily in parse from string routines
-
-ICal::Store is mostly functional
-
-This is version is a checkpoint, not a release. 
-
-Version 0.12a 10Oct99
----------------------
-
-Expanded perl interface: 
-	Added 1/2 of Store module
-	Fixed bugs
-	Implemeted get_{first,next}_property
-
-Extended C interface
-	Made get_{first,next}_property work properly
-	Fixed bugs
-
-
-This is version is a checkpoint, not a release. 
-
-Version 0.12 27Aug99
---------------------
-
-Added a rudimentatry perl interface
-
-This is version is a checkpoint, not a release. 
-
-
-Version 0.11 11Aug99
---------------------
-
-Eliminated most use of flex/bison -- all parsing, except for the
-values, is done in C.
-
-Cleaned up memory leaks. Purify claims that I got them all. 
-
-Moved all derived component/prop/param/value code ( in .inc / .h
-files) into main files ( icalcomponent.{c,h}, icalproperty.{c,h}, etc/
-) 
-
-Implemented *_clone routines. 
-
-Fixed a lot of bugs. 
-
-Implemented more value types. Still unimplemeneted are BINARY and RECUR
-
-Included MacOS/Code Warior files from Graham Davison
-
-
-Version 0.10 8Jul99
--------------------
-
-Eliminated shift/reduce and reduce/reduce conflicts in the parser.
-This version is almost feature complete -- it has the basic structure
-for all of the library's functionality, and it will only require
-implementing procedure shells and fixing bugs. I think that all of the
-hard work is done...
-
-Version 0.09a,b 3,7 Jul99
--------------------------
-
-Various improvements to the parser, added some functionality. The parser code
-is mostly complete, and should be fully functional, except for a horde of
-bugs. Also added support for X-Properties. 
-
-Version 0.09 25Jun99
---------------------
-
-Added a parser in files src/comp/icalitip.{y,l} The lexer is mostly 
-functional, but the parser is not. 
-
-
-Version 0.08 2Jun99
---------------------
-
-All files now have MPL licensing
-
-Implement enough of the code to perform some rudimentary testing
-
-
-Version 0.07 14May99
---------------------
-
-Remove all interfaces that construct object from a string
-
-Moved most code back into comp directory
-
-Implemented C files for most headers -- usecases.c now links. 
-
-Many improvements to generation scripts. 
-
-
-
-Version 0.06 25Apr99
---------------------
-
-Expanded distribution to include:
-	Directory structure that can accomodate future expansion
-	Several levels of Makefiles
-	This CHANGES file
-
-Added headers for irip and parse modules
-
-Added several files with design information
-
-Added scripts that I had used to generate much of the ical header code. 
-
-Split C headers from CC headers
-
-Added data for iTIP and iCAL component restrictions in restrictions.csv
-
-Version 0.05 11Apr99
-----------------------
-
-Changes to ical headers
-
-       Added derived Property classes.
-
-       Improved the interface to the derived property and parameter classes
-
-        Added derived component classes. 
-
-        Created usecases.c and ccusecases.cc to demonstrate use
-
-        C++ interface compile 
-
-
-Version 0.04 5Apr99
--------------------
-
-Version 0.02 30Mar99
---------------------
diff --git a/libical/README b/libical/README
deleted file mode 100644
index 92b2ff6e86..0000000000
--- a/libical/README
+++ /dev/null
@@ -1,100 +0,0 @@
-
-LIBICAL -- An implementation of basic iCAL protocols
-
-The code and datafiles in this distribution are licensed under the
-Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html
-for a copy of the license. Alternately, you may use libical under the
-terms of the GNU Library General Public License. See
-http://www.fsf.org/copyleft/lesser.html for a copy of the LGPL.
-
-This dual license ensures that the library can be incorporated into
-both proprietary code and GPL'd programs, and will benefit from
-improvements made by programmers in both realms. I will only accept
-changes into my version of the library if they are similarly
-dual-licensed.
-
-The code in this distribution implements the iCal protocols as
-described in RFC2445 and RFC2446. The code is in very early stages of
-development.
-
-Portions of this distribution are (C) Copyright 1996 Apple Computer,
-Inc., AT&T Corp., International Business Machines Corporation and
-Siemens Rolm Communications Inc. See src/libicalvcal/README.TXT for
-details.
-
-This code is under active development. If you would like to contribute
-to the project, you can contact me, Eric Busboom, at
-eric@softwarestudio.org. The project has a webpage at
-
-	http://softwarestudio.org/libical/index.html 
-
-and a mailing list that you can join by sending the following mail:
-
-	------------
-	To: minimalist@softwarestudio.org
-	Subject: subscribe libical
-	------------
-
-
-Building the library
---------------------
-
-This distribution is developed on Red Hat Linux 6.0 and usually
-compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of
-previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I
-don't know about any other systems.
-
-The library is configured with automake. From the root directory, run 
-
-	./configure
-
-To build all of the Makefiles for your system. If you will be installing the library, you may want to use the --prefix flag to set the directory where the library and header files will be installed. 
-
-	./configure --prefix=/proj/local/
-
-If configure runs fine, run "make" to build the library and 
-"make install" to install it.
-
-Although the distribution uses libtool to generate libraries, it has
-shared libraries turned off by default. To create and install shared
-libraries use:
-
-	./configure --enable-shared
-
-The current version of libical focuses on creating and
-manipulating iCal objects. With it, you can parse text representations
-of iCal components, add and remove sub-components, properties,
-parameters and values, and print the components back out as strings. 
-
-
-Notes for Libical Developers
--------------------
-
-If you don't want to use gcc as the compiler, and you got the sources
-from CVS, you should set the CC variable to the path to the compiler
-and run "automake --include-deps" to keep automake from using
-gcc-specific automatic dependancy tracking.
-
-        > CC=/pkg/SUNWspro/bin/cc; export CC
-        > automake --include-deps
-        > ./configure --prefix=/proj/local/
-        > make
-
-You will not need to re-run automake unless you got the sources from CVS. 
-
-Using the Library
------------------
-
-There is rudimentary, unfinished documentation in the /doc directory,
-and annotated examples in /examples.
-
-
-Perl Library
-------------
-
-There is a perl language binding of this library, LIBICAL. 
-It is  available from http://www.softwarestudio.org/libical
-
-
-Eric Busboom
-eric@softwarestudio.org
diff --git a/libical/TEST b/libical/TEST
deleted file mode 100644
index 90c3473b31..0000000000
--- a/libical/TEST
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Parser Tests
-------------
-Use iCAL keywords as first words of unquoted strings
\ No newline at end of file
diff --git a/libical/THANKS b/libical/THANKS
deleted file mode 100644
index 5d9e9185fb..0000000000
--- a/libical/THANKS
+++ /dev/null
@@ -1,48 +0,0 @@
-Thanks to: 
-
-Allan Clark <allanc@atlas.platypus.bc.ca> for testing libical against
-UnixWare.
-
-Graham Davison <g.m.davison@computer.org> for MacOS support and
-miscelaneous code bits
-
-Seth Alves <alves@hungry.com> for the first cut at the Makefile.am
-files and various utility functions.
-
-Russ Steinthal <rms39@columbia.edu> for several utility functions and
-comments.
-
-Ola Lundqvist <olalu526@student.liu.se> for the vCal test data file. 
-
-Colin DuPlantis <colin@cp.net> for new functions in icalparser.c
-
-Holger Schmidt <hschmidt@chronolabs.de> for all of icalcstp.c, The
-CSTP protocol implementation, and modifications to icalcstp.h
-
-Gisle Hannemyr <gisle@oslonett.no> The decode*() functions in sspm.c
-are based on the decode() routine in the mimelite program, Copyright
-(c) 1994 Gisle Hannemyr.
-
-The Evolution team at Helixcode ( Federico Mena Quintero
-<federico@helixcode.com>, JP Rosevear <jpr@helixcode.com>, Ettore
-Perazzoli <ettore@helixcode.com>, Christopher James Lahey
-<clahey@helixcode.com>, Peter Williams <peterw@helixcode.com>) for
-miscelaneous patches and adjustments to the build system.
-
-Cornelius Schumacher <schumacher@kde.org> for many insightful
-suggestions and a few patches.
-
-Mark D. Anderson <mda@discerning.com> for discussions and ideas. 
-
-Martin Neimeier <nei@ibn.de> for correcting bugs in icalrecur.c
-
-Tom Leitner <tom@radar.tu-graz.ac.at> For several bug fixes in
-compiling on Tru64 UNIX.
-
-Patrick Lewis <plewis@inetarena.com> for several bug reports. 
-
-Larry W. Virden <lvirden@cas.org> for several bug reports in compiling
-on Solaris.
-
-Bryan Bartone <bsb@mesasys.com> for code changes based on porting
-libical to Windows.
diff --git a/libical/TODO b/libical/TODO
deleted file mode 100644
index eb52fb7a25..0000000000
--- a/libical/TODO
+++ /dev/null
@@ -1,39 +0,0 @@
-
-TODOs for libical-0.16
----------------------
-
-libical treats properties with multiple values incorrecty -- it always
-seperates multiple values into multiple properties. This is not
-acceptable for CATEGORIES and RESOURCES.
-
-Some TEXT valued properties, like METHOD, have a limited set of valid
-values. The code should check that the values of these properites are
-valid. ( Although METHOD now uses enums, and is not really TEXT valued )
-
-Finish implementing values
-	ATTACH/BINARY
-	content_type
-	language
-
-Check for buffer overflow on external input. 
-
-Error Handling
-
-   Dates and times: the parser will accept many illegal date time
-   values
-
-RECUR values ignore integers in BYDAY clauses, ie 'FREQ=MONTHLY;BYDAY=-1SU'
-
-Restrictions code does not catch lack of DTEND or DURATION
-
-For some value types, if there illegal characters in the value ( like
-4.56 in an integer value), the parser will output the characters to
-stdout.
-
-Check all uses of strcpy and sprinf for buffer overflows
-
-Make the mime parsing code in sspm grow the list of parts as needed,
-rather than having a hard limit.
-
-in sspm.c, and unrecognized content-transfer-encoding values must
-force a content type of application/octet-stream.
diff --git a/libical/acconfig.h b/libical/acconfig.h
deleted file mode 100644
index 1d2bfa4060..0000000000
--- a/libical/acconfig.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Define to make icalerror_* calls abort instead of internally
-   signalling an error */
-#undef ICAL_ERRORS_ARE_FATAL
-
-/* Define to make icalcluster_commit() save to a temp file and mv to
-   the original file instead of writing to the orig file directly */
-#undef ICAL_SAFESAVES
-
-/* Define to terminate lines with "\n" instead of "\r\n" */
-#undef ICAL_UNIX_NEWLINE
-
-/* Define if your libc defines a "timezone" variable */
-#undef HAVE_TIMEZONE
- 
-/* Define if your libc defines a struct tm containing a "tm_gmtoff" member */  
-#undef HAVE_TM_GMTOFF
diff --git a/libical/autogen.sh b/libical/autogen.sh
deleted file mode 100755
index e15e4e33a8..0000000000
--- a/libical/autogen.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=libical
-TEST_TYPE=-d
-FILE=src
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to compile $PROJECT."
-	echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=1
-}
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-if test -z "$*"; then
-	echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-if test -z "$ACLOCAL_FLAGS"; then
-
-	acdir=`aclocal --print-ac-dir`
-        m4list="glib.m4"
-
-	for file in $m4list
-	do
-		if [ ! -f "$acdir/$file" ]; then
-			echo "WARNING: aclocal's directory is $acdir, but..."
-			echo "         no file $acdir/$file"
-			echo "         You may see fatal macro warnings below."
-			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
-			echo "         environment variable to \"-I /some/dir\", or install"
-			echo "         $acdir/$file."
-			echo ""
-		fi
-	done
-fi
-
-aclocal $ACLOCAL_FLAGS
-
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-automake -a $am_opt
-autoconf
-cd $ORIGDIR
-
-$srcdir/configure "$@"
-
-echo 
-echo "Now type 'make' to compile $PROJECT."
diff --git a/libical/configure.in b/libical/configure.in
deleted file mode 100644
index 80b35a660e..0000000000
--- a/libical/configure.in
+++ /dev/null
@@ -1,85 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src)
-AM_INIT_AUTOMAKE(libical,0.22c)
-
-AM_CONFIG_HEADER(config.h)
-
-dnl  Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_YACC
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_LN_S
-AC_PROG_INSTALL
-
-dnl Initialize libtool
-AM_PROG_LIBTOOL
-
-AC_SUBST(AR)
-
-AC_CHECK_PROGS(AR, ar aal, ar)
-AC_CHECK_PROGS(PERL, perl5 perl)  
-
-AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1)
-AC_DEFINE(ICAL_SAFESAVES,1)
-AC_DEFINE(ICAL_UNIX_NEWLINE,1)
-
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lical:
-dnl AC_CHECK_LIB(ical, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(time.h sys/types.h assert.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-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)
-else
-        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)
-        else
-                AC_ERROR(unable to find a way to determine timezone)
-        fi
-fi                
-
-
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(strdup)
-
-dnl Check for perl
-AC_CHECK_PROGS(PERL, perl5 perl)
-
-AC_OUTPUT([
-Makefile
-design-data/Makefile
-doc/Makefile
-scripts/Makefile
-src/Makefile
-src/libical/Makefile
-src/libical/icalversion.h
-src/libicalvcal/Makefile
-test-data/Makefile
-])
-
diff --git a/libical/configure.scan b/libical/configure.scan
deleted file mode 100644
index c07a9f6bf8..0000000000
--- a/libical/configure.scan
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/comp-cc/usecases.cc)
-
-dnl Checks for programs.
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lical:
-AC_CHECK_LIB(ical, main)
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h malloc.h unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(mkdir strdup uname)
-
-AC_OUTPUT(src/libicalss/Makefile src/test/Makefile src/libical/Makefile src/Makefile src/pvl/Makefile src/comp-cc/Makefile Makefile)
diff --git a/libical/design-data/.cvsignore b/libical/design-data/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/libical/design-data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/libical/design-data/Makefile.am b/libical/design-data/Makefile.am
deleted file mode 100644
index 0548974160..0000000000
--- a/libical/design-data/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRA_DIST =\
- components.txt \
- param-c-types.txt \
- params-in-prop.txt \
- prop-to-value.txt \
- property-tokens.txt \
- restrictions.csv \
- status.txt \
- value-c-types.txt \
- value-mem-semantics.txt \
diff --git a/libical/design-data/components.txt b/libical/design-data/components.txt
deleted file mode 100644
index ae5cc976ad..0000000000
--- a/libical/design-data/components.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-VCALENDAR
-VEVENT
-VTODO
-VJOURNAL
-VFREEBUSY
-VTIMEZONE
-XSTANDARDTIME
-XDAYLIGHTSAVINGSTIME
-VALARM
-XAUDIOALARM
-XDISPLAYALARM
-XEMAILALARM
-XPROCEDUREALARM
-X
-VSCHEDULE
-VQUERY
-VCAR
-VCOMMAND
-XLICINVALID
-XMIMEPART
-ANY
-
diff --git a/libical/design-data/param-c-types.txt b/libical/design-data/param-c-types.txt
deleted file mode 100644
index 3f690fa0dc..0000000000
--- a/libical/design-data/param-c-types.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ALTREP               const char*
-CN                   const char*
-CUTYPE               icalparameter_cutype
-DELEGATED-FROM       const char*
-DELEGATED-TO         const char*
-DIR                  const char*
-ENCODING             icalparameter_encoding
-FBTYPE               icalparameter_fbtype
-FMTTYPE              const char*
-LANGUAGE             const char*
-MEMBER               const char*
-PARTSTAT             icalparameter_partstat
-RANGE                icalparameter_range
-RELATED              icalparameter_related
-RELTYPE              icalparameter_reltype
-ROLE                 icalparameter_role
-RSVP                 int
-SENT-BY              const char*
-TZID                 const char*
-VALUE                icalparameter_value
-X                    const char*
-X-LIC-ERRORTYPE	     icalparameter_xlicerrortype
-X-LIC-COMPARETYPE    icalparameter_xliccomparetype
diff --git a/libical/design-data/params-in-prop.txt b/libical/design-data/params-in-prop.txt
deleted file mode 100644
index 4d4e133fc3..0000000000
--- a/libical/design-data/params-in-prop.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ACTION               VALUE X
-ATTACH               FMTTYPE ENCODING VALUE X
-ATTENDEE             CN CUTYPE DELEGATED-FROM DELEGATED-TO DIR LANGUAGE MEMBER PARTSTAT ROLE RSVP SENT-BY X
-CALSCALE             X
-CATEGORIES           LANGUAGE X
-CLASS                X
-COMMENT              ALTREP LANGUAGE X
-COMPLETED            X
-CONTACT              ALTREP LANGUAGE X
-CREATED              X
-DESCRIPTION          ALTREP LANGUAGE X
-DTEND                VALUE TZID X
-DTSTAMP              X
-DTSTART              VALUE TZID X
-DUE                  VALUE TZID X
-DURATION             X
-EXDATE               VALUE TZID X
-EXRULE               X
-FREEBUSY             FBTYPE X
-GEO                  X
-LAST-MODIFIED        X
-LOCATION             ALTREP LANGUAGE X
-METHOD               X
-ORGANIZER            CN DIR LANGUAGE SENT-BY X
-PERCENT-COMPLETE     X
-PRIORITY             X
-PRODID               X
-RDATE                VALUE TZID X
-RECURRENCE-ID        VALUE RANGE TZID X
-RELATED-TO           RELTYPE X
-REPEAT               X
-REQUEST-STATUS       LANGUAGE X
-RESOURCES            ALTREP LANGUAGE X
-RRULE                X
-SEQUENCE             X
-STATUS               X
-SUMMARY              ALTREP LANGUAGE X
-TRANSP               X
-TRIGGER              VALUE RELATED X
-TZID                 X
-TZNAME               LANGUAGE X
-TZOFFSETFROM         X
-TZOFFSETTO           X
-TZURL                X
-UID                  X
-URL                  X
-VERSION              X
-XPROP                LANGUAGE X
-X-LIC-ERROR	     XLICEERRORTYPE X
-SCOPE                X
-MAXRESULTS           X
-MAXRESULTSSIZE       X
-QUERY                X
-QUERYNAME            X
-TARGET               X
\ No newline at end of file
diff --git a/libical/design-data/prop-to-value.txt b/libical/design-data/prop-to-value.txt
deleted file mode 100644
index a7d0c1f772..0000000000
--- a/libical/design-data/prop-to-value.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-CALSCALE             TEXT
-METHOD               METHOD		# Non-std. RFC2445 specifies TEXT
-PRODID               TEXT
-VERSION              TEXT
-CATEGORIES           TEXT
-CLASS                TEXT
-COMMENT              TEXT
-DESCRIPTION          TEXT
-LOCATION             TEXT
-PERCENT-COMPLETE     INTEGER
-PRIORITY             INTEGER
-RESOURCES            TEXT
-STATUS               STATUS
-SUMMARY              TEXT
-COMPLETED            DATE-TIME
-FREEBUSY             PERIOD
-TRANSP               TEXT
-TZNAME               TEXT
-TZOFFSETFROM         UTC-OFFSET
-TZOFFSETTO           UTC-OFFSET
-TZURL                URI
-TZID                 TEXT
-ATTENDEE             CAL-ADDRESS
-CONTACT              TEXT
-ORGANIZER            CAL-ADDRESS
-RELATED-TO           TEXT
-URL                  URI
-UID                  TEXT
-EXRULE               RECUR
-RRULE                RECUR
-ACTION               TEXT
-REPEAT               INTEGER
-CREATED              DATE-TIME
-DTSTAMP              DATE-TIME
-LAST-MODIFIED        DATE-TIME
-SEQUENCE             INTEGER
-X         	     TEXT
-REQUEST-STATUS       STRING             
-ATTACH               ATTACH             # Non-std: URI or BINARY
-GEO                  GEO                # Non-std: Two FLOATS
-DTEND                DATE-TIME          # Non-std: DATE-TIME or DATE
-DUE                  DATE-TIME          # Non-std: DATE-TIME or DATE
-DTSTART              DATE-TIME          # Non-std: DATE-TIME or DATE
-RECURRENCE-ID        DATE-TIME          # Non-std: DATE-TIME or DATE
-EXDATE               DATE-TIME          # Non-std: DATE-TIME or DATE
-RDATE                DATE-TIME-PERIOD   # Non-std: DATE-TIME or DATE or PERIOD
-TRIGGER              TRIGGER            # Non-std: DURATION or DATE-TIME
-DURATION	     DURATION 
-QUERY                QUERY
-X-LIC-ERROR	     TEXT
-X-LIC-CLUSTERCOUNT   INTEGER
-X-LIC-MIMECONTENTTYPE STRING
-X-LIC-MIMECHARSET    STRING
-X-LIC-MIMEENCODING    STRING
-X-LIC-MIMEOPTINFO    STRING
-X-LIC-MIMECID	     STRING
-X-LIC-MIMEFILENAME   STRING
diff --git a/libical/design-data/property-tokens.txt b/libical/design-data/property-tokens.txt
deleted file mode 100644
index f8a95861c4..0000000000
--- a/libical/design-data/property-tokens.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-8BIT
-ACCEPTED
-ADD
-AUDIO
-BASE64
-BINARY
-BOOLEAN
-BUSY
-BUSY-TENTATIVE
-BUSY-UNAVAILABLE
-CAL-ADDRESS
-CANCEL
-CANCELLED
-CHAIR
-CHILD
-COMPLETED
-CONFIDENTIAL
-CONFIRMED
-COUNTER
-DATE
-DATE-TIME
-DECLINECOUNTER
-DECLINED
-DELEGATED
-DISPLAY
-DRAFT
-DURATION
-EMAIL
-END
-FINAL
-FLOAT
-FREE
-GREGORIAN
-GROUP
-INDIVIDUAL
-IN-PROCESS
-INTEGER
-NEEDS-ACTION
-NON-PARTICIPANT
-OPAQUE
-OPT-PARTICIPANT
-PARENT
-PERIOD
-PRIVATE
-PROCEDURE
-PUBLIC
-PUBLISH
-RECUR
-REFRESH
-REPLY
-REQ-PARTICIPANT
-REQUEST
-RESOURCE
-ROOM
-SIBLING
-START
-TENTATIVE
-TEXT
-THISANDFUTURE
-THISANDPRIOR
-TIME
-TRANSPAENT
-UNKNOWN
-UTCOFFSET
-XNAME
diff --git a/libical/design-data/restrictions.csv b/libical/design-data/restrictions.csv
deleted file mode 100644
index 1c62e2a8b4..0000000000
--- a/libical/design-data/restrictions.csv
+++ /dev/null
@@ -1,1348 +0,0 @@
-# Method, Target component, Property, Sub-component, Restriction
-PUBLISH,VEVENT,NONE,NONE,ONEPLUS
-PUBLISH,VEVENT,DTSTAMP,NONE,ONE
-PUBLISH,VEVENT,DTSTART,NONE,ONE
-PUBLISH,VEVENT,ORGANIZER,NONE,ONE
-PUBLISH,VEVENT,SUMMARY,NONE,ONE
-PUBLISH,VEVENT,UID,NONE,ONE
-PUBLISH,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-PUBLISH,VEVENT,SEQUENCE,NONE,ZEROORONE
-PUBLISH,VEVENT,ATTACH,NONE,ZEROPLUS
-PUBLISH,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-PUBLISH,VEVENT,CLASS,NONE,ZEROORONE
-PUBLISH,VEVENT,COMMENT,NONE,ZEROORONE
-PUBLISH,VEVENT,CONTACT,NONE,ZEROPLUS
-PUBLISH,VEVENT,CREATED,NONE,ZEROORONE
-PUBLISH,VEVENT,DESCRIPTION,NONE,ZEROORONE
-PUBLISH,VEVENT,DTEND,NONE,ZEROORONE
-PUBLISH,VEVENT,DURATION,NONE,ZEROORONE
-PUBLISH,VEVENT,EXDATE,NONE,ZEROPLUS
-PUBLISH,VEVENT,EXRULE,NONE,ZEROPLUS
-PUBLISH,VEVENT,GEO,NONE,ZEROORONE
-PUBLISH,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-PUBLISH,VEVENT,LOCATION,NONE,ZEROORONE
-PUBLISH,VEVENT,PRIORITY,NONE,ZEROORONE
-PUBLISH,VEVENT,RDATE,NONE,ZEROPLUS
-PUBLISH,VEVENT,RELATEDTO,NONE,ZEROPLUS
-PUBLISH,VEVENT,RESOURCES,NONE,ZEROORONE
-PUBLISH,VEVENT,RRULE,NONE,ZEROPLUS
-PUBLISH,VEVENT,STATUS,NONE,ZEROORONE,may_be_tent_conf_cancel
-PUBLISH,VEVENT,TRANSP,NONE,ZEROORONE
-PUBLISH,VEVENT,URL,NONE,ZEROORONE
-PUBLISH,VEVENT,X,NONE,ZEROPLUS
-PUBLISH,VEVENT,ATTENDEE,NONE,ZERO
-PUBLISH,VEVENT,REQUESTSTATUS,NONE,ZERO
-PUBLISH,VEVENT,NONE,VALARM,ZEROPLUS
-PUBLISH,VEVENT,NONE,VFREEBUSY,ZERO
-PUBLISH,VEVENT,NONE,VJOURNAL,ZERO
-PUBLISH,VEVENT,NONE,VTODO,ZERO
-PUBLISH,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
-PUBLISH,VEVENT,NONE,X,ZEROPLUS
-REQUEST,VEVENT,NONE,NONE,ONEPLUS
-REQUEST,VEVENT,ATTENDEE,NONE,ONEPLUS
-REQUEST,VEVENT,DTSTAMP,NONE,ONE
-REQUEST,VEVENT,DTSTART,NONE,ONE
-REQUEST,VEVENT,ORGANIZER,NONE,ONE
-REQUEST,VEVENT,SEQUENCE,NONE,ZEROORONE
-REQUEST,VEVENT,SUMMARY,NONE,ONE
-REQUEST,VEVENT,UID,NONE,ONE
-REQUEST,VEVENT,ATTACH,NONE,ZEROPLUS
-REQUEST,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-REQUEST,VEVENT,CLASS,NONE,ZEROORONE
-REQUEST,VEVENT,COMMENT,NONE,ZEROORONE
-REQUEST,VEVENT,CONTACT,NONE,ZEROPLUS
-REQUEST,VEVENT,CREATED,NONE,ZEROORONE
-REQUEST,VEVENT,DESCRIPTION,NONE,ZEROORONE
-REQUEST,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-REQUEST,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
-REQUEST,VEVENT,EXDATE,NONE,ZEROPLUS
-REQUEST,VEVENT,EXRULE,NONE,ZEROPLUS
-REQUEST,VEVENT,GEO,NONE,ZEROORONE
-REQUEST,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-REQUEST,VEVENT,LOCATION,NONE,ZEROORONE
-REQUEST,VEVENT,PRIORITY,NONE,ZEROORONE
-REQUEST,VEVENT,RDATE,NONE,ZEROPLUS
-REQUEST,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REQUEST,VEVENT,RELATEDTO,NONE,ZEROPLUS
-REQUEST,VEVENT,REQUESTSTATUS,NONE,ZEROPLUS
-REQUEST,VEVENT,RESOURCES,NONE,ZEROORONE
-REQUEST,VEVENT,RRULE,NONE,ZEROPLUS
-REQUEST,VEVENT,STATUS,NONE,ZEROORONE,may_be_tent_conf
-REQUEST,VEVENT,TRANSP,NONE,ZEROORONE
-REQUEST,VEVENT,URL,NONE,ZEROORONE
-REQUEST,VEVENT,X,NONE,ZEROPLUS
-REQUEST,VEVENT,NONE,VALARM,ZEROPLUS
-REQUEST,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
-REQUEST,VEVENT,NONE,X,ZEROPLUS
-REQUEST,VEVENT,NONE,VFREEBUSY,ZERO
-REQUEST,VEVENT,NONE,VJOURNAL,ZERO
-REQUEST,VEVENT,NONE,VTODO,ZERO
-REPLY,VEVENT,NONE,NONE,ONEPLUS
-REPLY,VEVENT,ATTENDEE,NONE,ONE
-REPLY,VEVENT,DTSTAMP,NONE,ONE
-REPLY,VEVENT,ORGANIZER,NONE,ONE
-REPLY,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REPLY,VEVENT,UID,NONE,ONE
-REPLY,VEVENT,SEQUENCE,NONE,ZEROORONE
-REPLY,VEVENT,ATTACH,NONE,ZEROPLUS
-REPLY,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-REPLY,VEVENT,CLASS,NONE,ZEROORONE
-REPLY,VEVENT,COMMENT,NONE,ZEROORONE
-REPLY,VEVENT,CONTACT,NONE,ZEROPLUS
-REPLY,VEVENT,CREATED,NONE,ZEROORONE
-REPLY,VEVENT,DESCRIPTION,NONE,ZEROORONE
-REPLY,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-REPLY,VEVENT,DTSTART,NONE,ZEROORONE
-REPLY,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
-REPLY,VEVENT,EXDATE,NONE,ZEROPLUS
-REPLY,VEVENT,EXRULE,NONE,ZEROPLUS
-REPLY,VEVENT,GEO,NONE,ZEROORONE
-REPLY,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-REPLY,VEVENT,LOCATION,NONE,ZEROORONE
-REPLY,VEVENT,PRIORITY,NONE,ZEROORONE
-REPLY,VEVENT,RDATE,NONE,ZEROPLUS
-REPLY,VEVENT,RELATEDTO,NONE,ZEROPLUS
-REPLY,VEVENT,RESOURCES,NONE,ZEROORONE
-REPLY,VEVENT,REQUESTSTATUS,NONE,ZEROPLUS
-REPLY,VEVENT,RRULE,NONE,ZEROPLUS
-REPLY,VEVENT,STATUS,NONE,ZEROORONE
-REPLY,VEVENT,SUMMARY,NONE,ZEROORONE
-REPLY,VEVENT,TRANSP,NONE,ZEROORONE
-REPLY,VEVENT,URL,NONE,ZEROORONE
-REPLY,VEVENT,X,NONE,ZEROPLUS
-REPLY,VEVENT,NONE,VTIMEZONE,ZEROORONE,must_if_tz_ref
-REPLY,VEVENT,NONE,X,ZEROPLUS
-REPLY,VEVENT,NONE,VALARM,ZERO
-REPLY,VEVENT,NONE,VFREEBUSY,ZERO
-REPLY,VEVENT,NONE,VJOURNAL,ZERO
-REPLY,VEVENT,NONE,VTODO,ZERO
-ADD,VEVENT,NONE,NONE,ONE
-ADD,VEVENT,DTSTAMP,NONE,ONE
-ADD,VEVENT,DTSTART,NONE,ONE
-ADD,VEVENT,ORGANIZER,NONE,ONE
-ADD,VEVENT,SEQUENCE,NONE,ONE
-ADD,VEVENT,SUMMARY,NONE,ONE
-ADD,VEVENT,UID,NONE,ONE
-ADD,VEVENT,ATTACH,NONE,ZEROPLUS
-ADD,VEVENT,ATTENDEE,NONE,ZEROPLUS
-ADD,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-ADD,VEVENT,CLASS,NONE,ZEROORONE
-ADD,VEVENT,COMMENT,NONE,ZEROORONE
-ADD,VEVENT,CONTACT,NONE,ZEROPLUS
-ADD,VEVENT,CREATED,NONE,ZEROORONE
-ADD,VEVENT,DESCRIPTION,NONE,ZEROORONE
-ADD,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-ADD,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
-ADD,VEVENT,EXDATE,NONE,ZEROPLUS
-ADD,VEVENT,EXRULE,NONE,ZEROPLUS
-ADD,VEVENT,GEO,NONE,ZEROORONE
-ADD,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-ADD,VEVENT,LOCATION,NONE,ZEROORONE
-ADD,VEVENT,PRIORITY,NONE,ZEROORONE
-ADD,VEVENT,RDATE,NONE,ZEROPLUS
-ADD,VEVENT,RELATEDTO,NONE,ZEROPLUS
-ADD,VEVENT,RESOURCES,NONE,ZEROORONE
-ADD,VEVENT,RRULE,NONE,ZEROPLUS
-ADD,VEVENT,STATUS,NONE,ZEROORONE,may_be_tent_conf
-ADD,VEVENT,TRANSP,NONE,ZEROORONE
-ADD,VEVENT,URL,NONE,ZEROORONE
-ADD,VEVENT,X,NONE,ZEROPLUS
-ADD,VEVENT,RECURRENCEID,NONE,ZERO,must_be_recurring
-ADD,VEVENT,REQUESTSTATUS,NONE,ZERO
-ADD,VEVENT,NONE,VALARM,ZEROPLUS
-ADD,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
-ADD,VEVENT,NONE,X,ZEROPLUS
-ADD,VEVENT,NONE,VFREEBUSY,ZERO
-ADD,VEVENT,NONE,VTODO,ZERO
-ADD,VEVENT,NONE,VJOURNAL,ZERO
-CANCEL,VEVENT,NONE,NONE,ONEPLUS
-CANCEL,VEVENT,ATTENDEE,NONE,ZEROPLUS
-CANCEL,VEVENT,DTSTAMP,NONE,ONE
-CANCEL,VEVENT,ORGANIZER,NONE,ONE
-CANCEL,VEVENT,SEQUENCE,NONE,ONE
-CANCEL,VEVENT,UID,NONE,ONE
-CANCEL,VEVENT,COMMENT,NONE,ZEROORONE
-CANCEL,VEVENT,ATTACH,NONE,ZEROPLUS
-CANCEL,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-CANCEL,VEVENT,CLASS,NONE,ZEROORONE
-CANCEL,VEVENT,CONTACT,NONE,ZEROPLUS
-CANCEL,VEVENT,CREATED,NONE,ZEROORONE
-CANCEL,VEVENT,DESCRIPTION,NONE,ZEROORONE
-CANCEL,VEVENT,DTEND,NONE,ONEEXCLUSIVE ,no_duration
-CANCEL,VEVENT,DTSTART,NONE,ZEROORONE
-CANCEL,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
-CANCEL,VEVENT,EXDATE,NONE,ZEROPLUS
-CANCEL,VEVENT,EXRULE,NONE,ZEROPLUS
-CANCEL,VEVENT,GEO,NONE,ZEROORONE
-CANCEL,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-CANCEL,VEVENT,LOCATION,NONE,ZEROORONE
-CANCEL,VEVENT,PRIORITY,NONE,ZEROORONE
-CANCEL,VEVENT,RDATE,NONE,ZEROPLUS
-CANCEL,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-CANCEL,VEVENT,RELATEDTO,NONE,ZEROPLUS
-CANCEL,VEVENT,RESOURCES,NONE,ZEROORONE
-CANCEL,VEVENT,RRULE,NONE,ZEROPLUS
-CANCEL,VEVENT,STATUS,NONE,ZEROORONE,must_be_canceled_no_attendee
-CANCEL,VEVENT,SUMMARY,NONE,ZEROORONE
-CANCEL,VEVENT,TRANSP,NONE,ZEROORONE
-CANCEL,VEVENT,URL,NONE,ZEROORONE
-CANCEL,VEVENT,X,NONE,ZEROPLUS
-CANCEL,VEVENT,REQUESTSTATUS,NONE,ZERO
-CANCEL,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
-CANCEL,VEVENT,NONE,X,ZEROPLUS
-CANCEL,VEVENT,NONE,VTODO,ZERO
-CANCEL,VEVENT,NONE,VJOURNAL,ZERO
-CANCEL,VEVENT,NONE,VFREEBUSY,ZERO
-CANCEL,VEVENT,NONE,VALARM,ZERO
-REFRESH,VEVENT,NONE,NONE,ONE
-REFRESH,VEVENT,ATTENDEE,NONE,ONE
-REFRESH,VEVENT,DTSTAMP,NONE,ONE
-REFRESH,VEVENT,ORGANIZER,NONE,ONE
-REFRESH,VEVENT,UID,NONE,ONE
-REFRESH,VEVENT,COMMENT,NONE,ZEROORONE
-REFRESH,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REFRESH,VEVENT,X,NONE,ZEROPLUS
-REFRESH,VEVENT,ATTACH,NONE,ZERO
-REFRESH,VEVENT,CATEGORIES,NONE,ZERO
-REFRESH,VEVENT,CLASS,NONE,ZERO
-REFRESH,VEVENT,CONTACT,NONE,ZERO
-REFRESH,VEVENT,CREATED,NONE,ZERO
-REFRESH,VEVENT,DESCRIPTION,NONE,ZERO
-REFRESH,VEVENT,DTEND,NONE,ZERO
-REFRESH,VEVENT,DTSTART,NONE,ZERO
-REFRESH,VEVENT,DURATION,NONE,ZERO
-REFRESH,VEVENT,EXDATE,NONE,ZERO
-REFRESH,VEVENT,EXRULE,NONE,ZERO
-REFRESH,VEVENT,GEO,NONE,ZERO
-REFRESH,VEVENT,LASTMODIFIED,NONE,ZERO
-REFRESH,VEVENT,LOCATION,NONE,ZERO
-REFRESH,VEVENT,PRIORITY,NONE,ZERO
-REFRESH,VEVENT,RDATE,NONE,ZERO
-REFRESH,VEVENT,RELATEDTO,NONE,ZERO
-REFRESH,VEVENT,REQUESTSTATUS,NONE,ZERO
-REFRESH,VEVENT,RESOURCES,NONE,ZERO
-REFRESH,VEVENT,RRULE,NONE,ZERO
-REFRESH,VEVENT,SEQUENCE,NONE,ZERO
-REFRESH,VEVENT,STATUS,NONE,ZERO
-REFRESH,VEVENT,SUMMARY,NONE,ZERO
-REFRESH,VEVENT,TRANSP,NONE,ZERO
-REFRESH,VEVENT,URL,NONE,ZERO
-REFRESH,VEVENT,NONE,X,ZEROPLUS
-REFRESH,VEVENT,NONE,VTODO,ZERO
-REFRESH,VEVENT,NONE,VJOURNAL,ZERO
-REFRESH,VEVENT,NONE,VFREEBUSY,ZERO
-REFRESH,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref
-REFRESH,VEVENT,NONE,VALARM,ZERO
-COUNTER,VEVENT,NONE,NONE,ONE
-COUNTER,VEVENT,DTSTAMP,NONE,ONE
-COUNTER,VEVENT,DTSTART,NONE,ONE
-COUNTER,VEVENT,ORGANIZER,NONE,ONE
-COUNTER,VEVENT,SEQUENCE,NONE,ONE
-COUNTER,VEVENT,SUMMARY,NONE,ONE
-COUNTER,VEVENT,UID,NONE,ONE
-COUNTER,VEVENT,ATTACH,NONE,ZEROPLUS
-COUNTER,VEVENT,ATTENDEE,NONE,ZEROPLUS
-COUNTER,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard
-COUNTER,VEVENT,CLASS,NONE,ZEROORONE
-COUNTER,VEVENT,COMMENT,NONE,ZEROORONE
-COUNTER,VEVENT,CONTACT,NONE,ZEROPLUS
-COUNTER,VEVENT,CREATED,NONE,ZEROORONE
-COUNTER,VEVENT,DESCRIPTION,NONE,ZEROORONE
-COUNTER,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-COUNTER,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
-COUNTER,VEVENT,EXDATE,NONE,ZEROPLUS
-COUNTER,VEVENT,EXRULE,NONE,ZEROPLUS
-COUNTER,VEVENT,GEO,NONE,ZEROORONE
-COUNTER,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-COUNTER,VEVENT,LOCATION,NONE,ZEROORONE
-COUNTER,VEVENT,PRIORITY,NONE,ZEROORONE
-COUNTER,VEVENT,RDATE,NONE,ZEROPLUS
-COUNTER,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-COUNTER,VEVENT,RELATEDTO,NONE,ZEROPLUS
-COUNTER,VEVENT,REQUESTSTATUS,NONE,ZEROPLUS
-COUNTER,VEVENT,RESOURCES,NONE,ZEROORONE
-COUNTER,VEVENT,RRULE,NONE,ZEROPLUS
-COUNTER,VEVENT,STATUS,NONE,ZEROORONE,may_be_tent_conf_cancel
-COUNTER,VEVENT,TRANSP,NONE,ZEROORONE
-COUNTER,VEVENT,URL,NONE,ZEROORONE
-COUNTER,VEVENT,X,NONE,ZEROPLUS
-COUNTER,VEVENT,NONE,VALARM,ZEROPLUS
-COUNTER,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
-COUNTER,VEVENT,NONE,X,ZEROPLUS
-COUNTER,VEVENT,NONE,VTODO,ZERO
-COUNTER,VEVENT,NONE,VJOURNAL,ZERO
-COUNTER,VEVENT,NONE,VFREEBUSY,ZERO
-DECLINECOUNTER,VEVENT,NONE,NONE,ONE
-DECLINECOUNTER,VEVENT,DTSTAMP,NONE,ONE
-DECLINECOUNTER,VEVENT,ORGANIZER,NONE,ONE
-DECLINECOUNTER,VEVENT,UID,NONE,ONE
-DECLINECOUNTER,VEVENT,COMMENT,NONE,ZEROORONE
-DECLINECOUNTER,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-DECLINECOUNTER,VEVENT,REQUESTSTATUS,NONE,ZEROPLUS
-DECLINECOUNTER,VEVENT,SEQUENCE,NONE,ZERO
-DECLINECOUNTER,VEVENT,X,NONE,ZEROPLUS
-DECLINECOUNTER,VEVENT,ATTACH,NONE,ZERO
-DECLINECOUNTER,VEVENT,ATTENDEE,NONE,ZERO
-DECLINECOUNTER,VEVENT,CATEGORIES,NONE,ZERO
-DECLINECOUNTER,VEVENT,CLASS,NONE,ZERO
-DECLINECOUNTER,VEVENT,CONTACT,NONE,ZERO
-DECLINECOUNTER,VEVENT,CREATED,NONE,ZERO
-DECLINECOUNTER,VEVENT,DESCRIPTION,NONE,ZERO
-DECLINECOUNTER,VEVENT,DTEND,NONE,ZERO
-DECLINECOUNTER,VEVENT,DTSTART,NONE,ZERO
-DECLINECOUNTER,VEVENT,DURATION,NONE,ZERO
-DECLINECOUNTER,VEVENT,EXDATE,NONE,ZERO
-DECLINECOUNTER,VEVENT,EXRULE,NONE,ZERO
-DECLINECOUNTER,VEVENT,GEO,NONE,ZERO
-DECLINECOUNTER,VEVENT,LASTMODIFIED,NONE,ZERO
-DECLINECOUNTER,VEVENT,LOCATION,NONE,ZERO
-DECLINECOUNTER,VEVENT,PRIORITY,NONE,ZERO
-DECLINECOUNTER,VEVENT,RDATE,NONE,ZERO
-DECLINECOUNTER,VEVENT,RELATEDTO,NONE,ZERO
-DECLINECOUNTER,VEVENT,RESOURCES,NONE,ZERO
-DECLINECOUNTER,VEVENT,RRULE,NONE,ZERO
-DECLINECOUNTER,VEVENT,STATUS,NONE,ZERO
-DECLINECOUNTER,VEVENT,SUMMARY,NONE,ZERO
-DECLINECOUNTER,VEVENT,TRANSP,NONE,ZERO
-DECLINECOUNTER,VEVENT,URL,NONE,ZERO
-DECLINECOUNTER,VEVENT,NONE,X,ZEROPLUS
-DECLINECOUNTER,VEVENT,NONE,VTODO,ZERO
-DECLINECOUNTER,VEVENT,NONE,VJOURNAL,ZERO
-DECLINECOUNTER,VEVENT,NONE,VFREEBUSY,ZERO
-DECLINECOUNTER,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref
-DECLINECOUNTER,VEVENT,NONE,VALARM,ZERO
-PUBLISH,VFREEBUSY,NONE,NONE,ONEPLUS
-PUBLISH,VFREEBUSY,DTSTAMP,NONE,ONE
-PUBLISH,VFREEBUSY,DTSTART,NONE,ONE
-PUBLISH,VFREEBUSY,DTEND,NONE,ONE
-PUBLISH,VFREEBUSY,FREEBUSY,NONE,ONEPLUS
-PUBLISH,VFREEBUSY,ORGANIZER,NONE,ONE
-PUBLISH,VFREEBUSY,COMMENT,NONE,ZEROORONE
-PUBLISH,VFREEBUSY,CONTACT,NONE,ZEROPLUS
-PUBLISH,VFREEBUSY,X,NONE,ZEROPLUS
-PUBLISH,VFREEBUSY,URL,NONE,ZEROORONE
-PUBLISH,VFREEBUSY,ATTENDEE,NONE,ZERO
-PUBLISH,VFREEBUSY,DURATION,NONE,ZERO
-PUBLISH,VFREEBUSY,REQUESTSTATUS,NONE,ZERO
-PUBLISH,VFREEBUSY,UID,NONE,ZERO
-PUBLISH,VFREEBUSY,NONE,X,ZEROPLUS
-PUBLISH,VFREEBUSY,NONE,VEVENT,ZERO
-PUBLISH,VFREEBUSY,NONE,VTODO,ZERO
-PUBLISH,VFREEBUSY,NONE,VJOURNAL,ZERO
-PUBLISH,VFREEBUSY,NONE,VTIMEZONE,ZERO,must_if_tz_ref
-PUBLISH,VFREEBUSY,NONE,VALARM,ZERO
-REQUEST,VFREEBUSY,NONE,NONE,ONE
-REQUEST,VFREEBUSY,ATTENDEE,NONE,ONEPLUS
-REQUEST,VFREEBUSY,DTEND,NONE,ONE
-REQUEST,VFREEBUSY,DTSTAMP,NONE,ONE
-REQUEST,VFREEBUSY,DTSTART,NONE,ONE
-REQUEST,VFREEBUSY,ORGANIZER,NONE,ONE
-REQUEST,VFREEBUSY,UID,NONE,ONE
-REQUEST,VFREEBUSY,COMMENT,NONE,ZEROORONE
-REQUEST,VFREEBUSY,CONTACT,NONE,ZEROPLUS
-REQUEST,VFREEBUSY,X,NONE,ZEROPLUS
-REQUEST,VFREEBUSY,FREEBUSY,NONE,ZERO
-REQUEST,VFREEBUSY,DURATION,NONE,ZERO
-REQUEST,VFREEBUSY,REQUESTSTATUS,NONE,ZERO
-REQUEST,VFREEBUSY,URL,NONE,ZERO
-REQUEST,VFREEBUSY,NONE,X,ZEROPLUS
-REQUEST,VFREEBUSY,NONE,VALARM,ZERO
-REQUEST,VFREEBUSY,NONE,VEVENT,ZERO
-REQUEST,VFREEBUSY,NONE,VTODO,ZERO
-REQUEST,VFREEBUSY,NONE,VJOURNAL,ZERO
-REQUEST,VFREEBUSY,NONE,VTIMEZONE,ZERO
-REPLY,VFREEBUSY,NONE,NONE,ONE
-REPLY,VFREEBUSY,ATTENDEE,NONE,ONE
-REPLY,VFREEBUSY,DTSTAMP,NONE,ONE
-REPLY,VFREEBUSY,DTEND,NONE,ONE
-REPLY,VFREEBUSY,DTSTART,NONE,ONE
-REPLY,VFREEBUSY,FREEBUSY,NONE,ONEPLUS
-REPLY,VFREEBUSY,ORGANIZER,NONE,ONE
-REPLY,VFREEBUSY,UID,NONE,ONE
-REPLY,VFREEBUSY,COMMENT,NONE,ZEROORONE
-REPLY,VFREEBUSY,CONTACT,NONE,ZEROPLUS
-REPLY,VFREEBUSY,REQUESTSTATUS,NONE,ZEROPLUS
-REPLY,VFREEBUSY,URL,NONE,ZEROORONE
-REPLY,VFREEBUSY,X,NONE,ZEROPLUS
-REPLY,VFREEBUSY,DURATION,NONE,ZERO
-REPLY,VFREEBUSY,SEQUENCE,NONE,ZERO
-REPLY,VFREEBUSY,NONE,X,ZEROPLUS
-REPLY,VFREEBUSY,NONE,VALARM,ZERO
-REPLY,VFREEBUSY,NONE,VEVENT,ZERO
-REPLY,VFREEBUSY,NONE,VTODO,ZERO
-REPLY,VFREEBUSY,NONE,VJOURNAL,ZERO
-REPLY,VFREEBUSY,NONE,VTIMEZONE,ZERO
-PUBLISH,VTODO,NONE,NONE,ONEPLUS
-PUBLISH,VTODO,DTSTAMP,NONE,ONE
-PUBLISH,VTODO,DTSTART,NONE,ONE
-PUBLISH,VTODO,ORGANIZER,NONE,ONE
-PUBLISH,VTODO,PRIORITY,NONE,ONE
-PUBLISH,VTODO,SEQUENCE,NONE,ZEROORONE
-PUBLISH,VTODO,SUMMARY,NONE,ONE
-PUBLISH,VTODO,UID,NONE,ONE
-PUBLISH,VTODO,ATTACH,NONE,ZEROPLUS
-PUBLISH,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
-PUBLISH,VTODO,CLASS,NONE,ZEROORONE
-PUBLISH,VTODO,COMMENT,NONE,ZEROORONE
-PUBLISH,VTODO,CONTACT,NONE,ZEROPLUS
-PUBLISH,VTODO,CREATED,NONE,ZEROORONE
-PUBLISH,VTODO,DESCRIPTION,NONE,ZEROORONE
-PUBLISH,VTODO,DUE,NONE,ZEROORONE
-PUBLISH,VTODO,DURATION,NONE,ZEROORONE
-PUBLISH,VTODO,EXDATE,NONE,ZEROPLUS
-PUBLISH,VTODO,EXRULE,NONE,ZEROPLUS
-PUBLISH,VTODO,GEO,NONE,ZEROORONE
-PUBLISH,VTODO,LASTMODIFIED,NONE,ZEROORONE
-PUBLISH,VTODO,LOCATION,NONE,ZEROORONE
-PUBLISH,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-PUBLISH,VTODO,RDATE,NONE,ZEROPLUS
-PUBLISH,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-PUBLISH,VTODO,RELATEDTO,NONE,ZEROPLUS
-PUBLISH,VTODO,RESOURCES,NONE,ZEROORONE
-PUBLISH,VTODO,RRULE,NONE,ZEROPLUS
-PUBLISH,VTODO,STATUS,NONE,ZEROORONE
-PUBLISH,VTODO,URL,NONE,ZEROORONE
-PUBLISH,VTODO,X,NONE,ZEROPLUS
-PUBLISH,VTODO,ATTENDEE,NONE,ZERO
-PUBLISH,VTODO,REQUESTSTATUS,NONE,ZERO
-PUBLISH,VTODO,NONE,VTIMEZONE,ZEROPLUS
-PUBLISH,VTODO,NONE,VALARM,ZEROPLUS
-PUBLISH,VTODO,NONE,X,ZEROPLUS
-PUBLISH,VTODO,NONE,VFREEBUSY,ZERO
-PUBLISH,VTODO,NONE,VEVENT,ZERO
-PUBLISH,VTODO,NONE,VJOURNAL,ZERO
-REQUEST,VTODO,NONE,NONE,ONEPLUS
-REQUEST,VTODO,ATTENDEE,NONE,ONEPLUS
-REQUEST,VTODO,DTSTAMP,NONE,ONE
-REQUEST,VTODO,DTSTART,NONE,ONE
-REQUEST,VTODO,ORGANIZER,NONE,ONE
-REQUEST,VTODO,PRIORITY,NONE,ONE
-REQUEST,VTODO,SEQUENCE,NONE,ZEROORONE
-REQUEST,VTODO,SUMMARY,NONE,ONE
-REQUEST,VTODO,UID,NONE,ONE
-REQUEST,VTODO,ATTACH,NONE,ZEROPLUS
-REQUEST,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
-REQUEST,VTODO,CLASS,NONE,ZEROORONE
-REQUEST,VTODO,COMMENT,NONE,ZEROORONE
-REQUEST,VTODO,CONTACT,NONE,ZEROPLUS
-REQUEST,VTODO,CREATED,NONE,ZEROORONE
-REQUEST,VTODO,DESCRIPTION,NONE,ZEROORONE
-REQUEST,VTODO,DUE,NONE,ZEROORONE
-REQUEST,VTODO,DURATION,NONE,ZEROORONE
-REQUEST,VTODO,EXDATE,NONE,ZEROPLUS
-REQUEST,VTODO,EXRULE,NONE,ZEROPLUS
-REQUEST,VTODO,GEO,NONE,ZEROORONE
-REQUEST,VTODO,LASTMODIFIED,NONE,ZEROORONE
-REQUEST,VTODO,LOCATION,NONE,ZEROORONE
-REQUEST,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-REQUEST,VTODO,RDATE,NONE,ZEROPLUS
-REQUEST,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REQUEST,VTODO,RELATEDTO,NONE,ZEROPLUS
-REQUEST,VTODO,RESOURCES,NONE,ZEROORONE
-REQUEST,VTODO,RRULE,NONE,ZEROPLUS
-REQUEST,VTODO,STATUS,NONE,ZEROORONE,may_be_comp_need_process
-REQUEST,VTODO,URL,NONE,ZEROORONE
-REQUEST,VTODO,X,NONE,ZEROPLUS
-REQUEST,VTODO,REQUESTSTATUS,NONE,ZERO
-REQUEST,VTODO,NONE,VALARM,ZEROPLUS
-REQUEST,VTODO,NONE,VTIMEZONE,ZEROPLUS
-REQUEST,VTODO,NONE,X,ZEROPLUS
-REQUEST,VTODO,NONE,VEVENT,ZERO
-REQUEST,VTODO,NONE,VFREEBUSY,ZERO
-REQUEST,VTODO,NONE,VJOURNAL,ZERO
-REPLY,VTODO,NONE,NONE,ONEPLUS
-REPLY,VTODO,ATTENDEE,NONE,ONEPLUS
-REPLY,VTODO,DTSTAMP,NONE,ONE
-REPLY,VTODO,ORGANIZER,NONE,ONE
-REPLY,VTODO,REQUESTSTATUS,NONE,ONEPLUS
-REPLY,VTODO,UID,NONE,ONE
-REPLY,VTODO,ATTACH,NONE,ZEROPLUS
-REPLY,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
-REPLY,VTODO,CLASS,NONE,ZEROORONE
-REPLY,VTODO,COMMENT,NONE,ZEROORONE
-REPLY,VTODO,CONTACT,NONE,ZEROPLUS
-REPLY,VTODO,CREATED,NONE,ZEROORONE
-REPLY,VTODO,DESCRIPTION,NONE,ZEROORONE
-REPLY,VTODO,DTSTART,NONE,ZEROORONE
-REPLY,VTODO,DUE,NONE,ZEROORONE
-REPLY,VTODO,DURATION,NONE,ZEROORONE
-REPLY,VTODO,EXDATE,NONE,ZEROPLUS
-REPLY,VTODO,EXRULE,NONE,ZEROPLUS
-REPLY,VTODO,GEO,NONE,ZEROORONE
-REPLY,VTODO,LASTMODIFIED,NONE,ZEROORONE
-REPLY,VTODO,LOCATION,NONE,ZEROORONE
-REPLY,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-REPLY,VTODO,PRIORITY,NONE,ZEROORONE
-REPLY,VTODO,RDATE,NONE,ZEROPLUS
-REPLY,VTODO,RELATEDTO,NONE,ZEROPLUS
-REPLY,VTODO,RESOURCES,NONE,ZEROORONE
-REPLY,VTODO,RRULE,NONE,ZEROPLUS
-REPLY,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REPLY,VTODO,SEQUENCE,NONE,ZEROORONE
-REPLY,VTODO,STATUS,NONE,ZEROORONE
-REPLY,VTODO,SUMMARY,NONE,ZEROORONE
-REPLY,VTODO,URL,NONE,ZEROORONE
-REPLY,VTODO,X,NONE,ZEROPLUS
-REPLY,VTODO,NONE,VTIMEZONE,ZEROORONE
-REPLY,VTODO,NONE,X,ZEROPLUS
-REPLY,VTODO,NONE,VALARM,ZERO
-REPLY,VTODO,NONE,VEVENT,ZERO
-REPLY,VTODO,NONE,VFREEBUSY,ZERO
-ADD,VTODO,NONE,NONE,ONE
-ADD,VTODO,DTSTAMP,NONE,ONE
-ADD,VTODO,ORGANIZER,NONE,ONE
-ADD,VTODO,PRIORITY,NONE,ONE
-ADD,VTODO,SEQUENCE,NONE,ONE
-ADD,VTODO,SUMMARY,NONE,ONE
-ADD,VTODO,UID,NONE,ONE
-ADD,VTODO,ATTACH,NONE,ZEROPLUS
-ADD,VTODO,ATTENDEE,NONE,ZEROPLUS
-ADD,VTODO,CATEGORIES,NONE,ZEROPLUS
-ADD,VTODO,CLASS,NONE,ZEROORONE
-ADD,VTODO,COMMENT,NONE,ZEROORONE
-ADD,VTODO,CONTACT,NONE,ZEROPLUS
-ADD,VTODO,CREATED,NONE,ZEROORONE
-ADD,VTODO,DESCRIPTION,NONE,ZEROORONE
-ADD,VTODO,DTSTART,NONE,ZEROORONE
-ADD,VTODO,DUE,NONE,ZEROORONE
-ADD,VTODO,DURATION,NONE,ZEROORONE
-ADD,VTODO,EXDATE,NONE,ZEROPLUS
-ADD,VTODO,EXRULE,NONE,ZEROPLUS
-ADD,VTODO,GEO,NONE,ZEROORONE
-ADD,VTODO,LASTMODIFIED,NONE,ZEROORONE
-ADD,VTODO,LOCATION,NONE,ZEROORONE
-ADD,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-ADD,VTODO,RDATE,NONE,ZEROPLUS
-ADD,VTODO,RELATEDTO,NONE,ZEROPLUS
-ADD,VTODO,RESOURCES,NONE,ZEROORONE
-ADD,VTODO,RRULE,NONE,ZEROPLUS
-ADD,VTODO,STATUS,NONE,ZEROORONE,may_be_comp_need_process
-ADD,VTODO,URL,NONE,ZEROORONE
-ADD,VTODO,X,NONE,ZEROPLUS
-ADD,VTODO,RECURRENCEID,NONE,ZERO,must_be_recurring
-ADD,VTODO,REQUESTSTATUS,NONE,ZERO
-ADD,VTODO,NONE,VALARM,ZEROPLUS
-ADD,VTODO,NONE,VTIMEZONE,ZEROPLUS
-ADD,VTODO,NONE,X,ZEROPLUS
-ADD,VTODO,NONE,VEVENT,ZERO
-ADD,VTODO,NONE,VJOURNAL,ZERO
-ADD,VTODO,NONE,VFREEBUSY,ZERO
-CANCEL,VTODO,NONE,NONE,ONE
-CANCEL,VTODO,ATTENDEE,NONE,ZEROPLUS
-CANCEL,VTODO,UID,NONE,ONE
-CANCEL,VTODO,DTSTAMP,NONE,ONE
-CANCEL,VTODO,ORGANIZER,NONE,ONE
-CANCEL,VTODO,SEQUENCE,NONE,ONE
-CANCEL,VTODO,ATTACH,NONE,ZEROPLUS
-CANCEL,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard
-CANCEL,VTODO,CLASS,NONE,ZEROORONE
-CANCEL,VTODO,COMMENT,NONE,ZEROORONE
-CANCEL,VTODO,CONTACT,NONE,ZEROPLUS
-CANCEL,VTODO,CREATED,NONE,ZEROORONE
-CANCEL,VTODO,DESCRIPTION,NONE,ZEROORONE
-CANCEL,VTODO,DTSTART,NONE,ZEROORONE
-CANCEL,VTODO,DUE,NONE,ZEROORONE
-CANCEL,VTODO,DURATION,NONE,ZEROORONE
-CANCEL,VTODO,EXDATE,NONE,ZEROPLUS
-CANCEL,VTODO,EXRULE,NONE,ZEROPLUS
-CANCEL,VTODO,GEO,NONE,ZEROORONE
-CANCEL,VTODO,LASTMODIFIED,NONE,ZEROORONE
-CANCEL,VTODO,LOCATION,NONE,ZEROORONE
-CANCEL,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-CANCEL,VTODO,RDATE,NONE,ZEROPLUS
-CANCEL,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-CANCEL,VTODO,RELATEDTO,NONE,ZEROPLUS
-CANCEL,VTODO,RESOURCES,NONE,ZEROORONE
-CANCEL,VTODO,RRULE,NONE,ZEROPLUS
-CANCEL,VTODO,PRIORITY,NONE,ZEROORONE
-CANCEL,VTODO,STATUS,NONE,ZEROORONE,must_be_canceled_no_attendee
-CANCEL,VTODO,URL,NONE,ZEROORONE
-CANCEL,VTODO,X,NONE,ZEROPLUS
-CANCEL,VTODO,REQUESTSTATUS,NONE,ZERO
-CANCEL,VTODO,NONE,VTIMEZONE,ZEROORONE
-CANCEL,VTODO,NONE,X,ZEROPLUS
-CANCEL,VTODO,NONE,VALARM,ZERO
-CANCEL,VTODO,NONE,VEVENT,ZERO
-CANCEL,VTODO,NONE,VFREEBUSY,ZERO
-REFRESH,VTODO,NONE,NONE,ONE
-REFRESH,VTODO,ATTENDEE,NONE,ONE
-REFRESH,VTODO,DTSTAMP,NONE,ONE
-REFRESH,VTODO,UID,NONE,ONE
-REFRESH,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-REFRESH,VTODO,X,NONE,ZEROPLUS
-REFRESH,VTODO,ATTACH,NONE,ZERO
-REFRESH,VTODO,CATEGORIES,NONE,ZERO
-REFRESH,VTODO,CLASS,NONE,ZERO
-REFRESH,VTODO,COMMENT,NONE,ZERO
-REFRESH,VTODO,CONTACT,NONE,ZERO
-REFRESH,VTODO,CREATED,NONE,ZERO
-REFRESH,VTODO,DESCRIPTION,NONE,ZERO
-REFRESH,VTODO,DTSTART,NONE,ZERO
-REFRESH,VTODO,DUE,NONE,ZERO
-REFRESH,VTODO,DURATION,NONE,ZERO
-REFRESH,VTODO,EXDATE,NONE,ZERO
-REFRESH,VTODO,EXRULE,NONE,ZERO
-REFRESH,VTODO,GEO,NONE,ZERO
-REFRESH,VTODO,LASTMODIFIED,NONE,ZERO
-REFRESH,VTODO,LOCATION,NONE,ZERO
-REFRESH,VTODO,ORGANIZER,NONE,ZERO
-REFRESH,VTODO,PERCENTCOMPLETE,NONE,ZERO
-REFRESH,VTODO,PRIORITY,NONE,ZERO
-REFRESH,VTODO,RDATE,NONE,ZERO
-REFRESH,VTODO,RELATEDTO,NONE,ZERO
-REFRESH,VTODO,REQUESTSTATUS,NONE,ZERO
-REFRESH,VTODO,RESOURCES,NONE,ZERO
-REFRESH,VTODO,RRULE,NONE,ZERO
-REFRESH,VTODO,SEQUENCE,NONE,ZERO
-REFRESH,VTODO,STATUS,NONE,ZERO
-REFRESH,VTODO,URL,NONE,ZERO
-REFRESH,VTODO,NONE,X,ZEROPLUS
-REFRESH,VTODO,NONE,VALARM,ZERO
-REFRESH,VTODO,NONE,VEVENT,ZERO
-REFRESH,VTODO,NONE,VFREEBUSY,ZERO
-REFRESH,VTODO,NONE,VTIMEZONE,ZERO
-COUNTER,VTODO,NONE,NONE,ONE
-COUNTER,VTODO,ATTENDEE,NONE,ONEPLUS
-COUNTER,VTODO,DTSTAMP,NONE,ONE
-COUNTER,VTODO,ORGANIZER,NONE,ONE
-COUNTER,VTODO,PRIORITY,NONE,ONE
-COUNTER,VTODO,SUMMARY,NONE,ONE
-COUNTER,VTODO,UID,NONE,ONE
-COUNTER,VTODO,ATTACH,NONE,ZEROPLUS
-COUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard
-COUNTER,VTODO,CLASS,NONE,ZEROORONE
-COUNTER,VTODO,COMMENT,NONE,ZEROORONE
-COUNTER,VTODO,CONTACT,NONE,ZEROPLUS
-COUNTER,VTODO,CREATED,NONE,ZEROORONE
-COUNTER,VTODO,DESCRIPTION,NONE,ZEROORONE
-COUNTER,VTODO,DTSTART,NONE,ZEROORONE
-COUNTER,VTODO,DUE,NONE,ZEROORONE
-COUNTER,VTODO,DURATION,NONE,ZEROORONE
-COUNTER,VTODO,EXDATE,NONE,ZEROPLUS
-COUNTER,VTODO,EXRULE,NONE,ZEROPLUS
-COUNTER,VTODO,GEO,NONE,ZEROORONE
-COUNTER,VTODO,LASTMODIFIED,NONE,ZEROORONE
-COUNTER,VTODO,LOCATION,NONE,ZEROORONE
-COUNTER,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-COUNTER,VTODO,RDATE,NONE,ZEROPLUS
-COUNTER,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-COUNTER,VTODO,RELATEDTO,NONE,ZEROPLUS
-COUNTER,VTODO,REQUESTSTATUS,NONE,ZEROPLUS
-COUNTER,VTODO,RESOURCES,NONE,ZEROORONE
-COUNTER,VTODO,RRULE,NONE,ZEROORONE
-COUNTER,VTODO,SEQUENCE,NONE,ZEROORONE
-COUNTER,VTODO,STATUS,NONE,ZEROORONE,may_be_comp_need_process
-COUNTER,VTODO,URL,NONE,ZEROORONE
-COUNTER,VTODO,X,NONE,ZEROPLUS
-COUNTER,VTODO,NONE,VALARM,ZEROPLUS
-COUNTER,VTODO,NONE,VTIMEZONE,ZEROORONE
-COUNTER,VTODO,NONE,X,ZEROPLUS
-COUNTER,VTODO,NONE,VEVENT,ZERO
-COUNTER,VTODO,NONE,VFREEBUSY,ZERO
-DECLINECOUNTER,VTODO,NONE,NONE,ONE
-DECLINECOUNTER,VTODO,ATTENDEE,NONE,ONEPLUS
-DECLINECOUNTER,VTODO,DTSTAMP,NONE,ONE
-DECLINECOUNTER,VTODO,ORGANIZER,NONE,ONE
-DECLINECOUNTER,VTODO,SEQUENCE,NONE,ONE
-DECLINECOUNTER,VTODO,UID,NONE,ONE
-DECLINECOUNTER,VTODO,ATTACH,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard
-DECLINECOUNTER,VTODO,CLASS,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,COMMENT,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,CONTACT,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,CREATED,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,DESCRIPTION,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,DTSTART,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,DUE,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,DURATION,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,EXDATE,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,EXRULE,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,GEO,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,LASTMODIFIED,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,LOCATION,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,PRIORITY,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,RDATE,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-DECLINECOUNTER,VTODO,RELATEDTO,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,REQUESTSTATUS,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,RESOURCES,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,RRULE,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,STATUS,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,URL,NONE,ZEROORONE
-DECLINECOUNTER,VTODO,X,NONE,ZEROPLUS
-DECLINECOUNTER,VTODO,NONE,VTIMEZONE,ZEROPLUS
-DECLINECOUNTER,VTODO,NONE,X,ZEROPLUS
-DECLINECOUNTER,VTODO,NONE,VALARM,ZERO
-DECLINECOUNTER,VTODO,NONE,VEVENT,ZERO
-DECLINECOUNTER,VTODO,NONE,VFREEBUSY,ZERO
-PUBLISH,VJOURNAL,NONE,NONE,ONEPLUS
-PUBLISH,VJOURNAL,DESCRIPTION,NONE,ONE
-PUBLISH,VJOURNAL,DTSTAMP,NONE,ONE
-PUBLISH,VJOURNAL,DTSTART,NONE,ONE
-PUBLISH,VJOURNAL,ORGANIZER,NONE,ONE
-PUBLISH,VJOURNAL,UID,NONE,ONE
-PUBLISH,VJOURNAL,ATTACH,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
-PUBLISH,VJOURNAL,CLASS,NONE,ZEROORONE
-PUBLISH,VJOURNAL,COMMENT,NONE,ZEROORONE
-PUBLISH,VJOURNAL,CONTACT,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,CREATED,NONE,ZEROORONE
-PUBLISH,VJOURNAL,EXDATE,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,EXRULE,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,LASTMODIFIED,NONE,ZEROORONE
-PUBLISH,VJOURNAL,RDATE,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-PUBLISH,VJOURNAL,RELATEDTO,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,RRULE,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,SEQUENCE,NONE,ZEROORONE
-PUBLISH,VJOURNAL,STATUS,NONE,ZEROORONE,may_be_draft_final_canceled
-PUBLISH,VJOURNAL,SUMMARY,NONE,ZEROORONE
-PUBLISH,VJOURNAL,URL,NONE,ZEROORONE
-PUBLISH,VJOURNAL,X,NONE,ZEROPLUS
-PUBLISH,VJOURNAL,ATTENDEE,NONE,ZERO
-PUBLISH,VJOURNAL,NONE,VALARM,ZEROPLUS
-PUBLISH,VJOURNAL,NONE,VTIMEZONE,ZEROPLUS
-PUBLISH,VJOURNAL,NONE,X,ZEROPLUS
-PUBLISH,VJOURNAL,NONE,VEVENT,ZERO
-PUBLISH,VJOURNAL,NONE,VFREEBUSY,ZERO
-PUBLISH,VJOURNAL,NONE,VTODO,ZERO
-ADD,VJOURNAL,NONE,NONE,ONE
-ADD,VJOURNAL,DESCRIPTION,NONE,ONE
-ADD,VJOURNAL,DTSTAMP,NONE,ONE
-ADD,VJOURNAL,DTSTART,NONE,ONE
-ADD,VJOURNAL,ORGANIZER,NONE,ONE
-ADD,VJOURNAL,SEQUENCE,NONE,ONE
-ADD,VJOURNAL,UID,NONE,ONE
-ADD,VJOURNAL,ATTACH,NONE,ZEROPLUS
-ADD,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
-ADD,VJOURNAL,CLASS,NONE,ZEROORONE
-ADD,VJOURNAL,COMMENT,NONE,ZEROORONE
-ADD,VJOURNAL,CONTACT,NONE,ZEROPLUS
-ADD,VJOURNAL,CREATED,NONE,ZEROORONE
-ADD,VJOURNAL,EXDATE,NONE,ZEROPLUS
-ADD,VJOURNAL,EXRULE,NONE,ZEROPLUS
-ADD,VJOURNAL,LASTMODIFIED,NONE,ZEROORONE
-ADD,VJOURNAL,RDATE,NONE,ZEROPLUS
-ADD,VJOURNAL,RELATEDTO,NONE,ZEROPLUS
-ADD,VJOURNAL,RRULE,NONE,ZEROPLUS
-ADD,VJOURNAL,STATUS,NONE,ZEROORONE
-ADD,VJOURNAL,SUMMARY,NONE,ZEROORONE
-ADD,VJOURNAL,URL,NONE,ZEROORONE
-ADD,VJOURNAL,X,NONE,ZEROPLUS
-ADD,VJOURNAL,ATTENDEE,NONE,ZERO
-ADD,VJOURNAL,RECURRENCEID,NONE,ZERO
-ADD,VJOURNAL,NONE,VALARM,ZEROPLUS
-ADD,VJOURNAL,NONE,VTIMEZONE,ZEROORONE
-ADD,VJOURNAL,NONE,X,ZEROPLUS
-ADD,VJOURNAL,NONE,VEVENT,ZERO
-ADD,VJOURNAL,NONE,VFREEBUSY,ZERO
-ADD,VJOURNAL,NONE,VTODO,ZERO
-CANCEL,VJOURNAL,NONE,NONE,ONEPLUS
-CANCEL,VJOURNAL,DTSTAMP,NONE,ONE
-CANCEL,VJOURNAL,ORGANIZER,NONE,ONE
-CANCEL,VJOURNAL,SEQUENCE,NONE,ONE
-CANCEL,VJOURNAL,UID,NONE,ONE
-CANCEL,VJOURNAL,ATTACH,NONE,ZEROPLUS
-CANCEL,VJOURNAL,ATTENDEE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard
-CANCEL,VJOURNAL,CLASS,NONE,ZEROORONE
-CANCEL,VJOURNAL,COMMENT,NONE,ZEROORONE
-CANCEL,VJOURNAL,CONTACT,NONE,ZEROPLUS
-CANCEL,VJOURNAL,CREATED,NONE,ZEROORONE
-CANCEL,VJOURNAL,DESCRIPTION,NONE,ZEROORONE
-CANCEL,VJOURNAL,DTSTART,NONE,ZEROORONE
-CANCEL,VJOURNAL,EXDATE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,EXRULE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,LASTMODIFIED,NONE,ZEROORONE
-CANCEL,VJOURNAL,RDATE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-CANCEL,VJOURNAL,RELATEDTO,NONE,ZEROPLUS
-CANCEL,VJOURNAL,RRULE,NONE,ZEROPLUS
-CANCEL,VJOURNAL,STATUS,NONE,ZEROORONE,must_be_cancel_if_present
-CANCEL,VJOURNAL,SUMMARY,NONE,ZEROORONE
-CANCEL,VJOURNAL,URL,NONE,ZEROORONE
-CANCEL,VJOURNAL,X,NONE,ZEROPLUS
-CANCEL,VJOURNAL,REQUESTSTATUS,NONE,ZERO
-CANCEL,VJOURNAL,NONE,VTIMEZONE,ZEROPLUS
-CANCEL,VJOURNAL,NONE,X,ZEROPLUS
-CANCEL,VJOURNAL,NONE,VALARM,ZERO
-CANCEL,VJOURNAL,NONE,VEVENT,ZERO
-CANCEL,VJOURNAL,NONE,VFREEBUSY,ZERO
-CANCEL,VJOURNAL,NONE,VTODO,ZERO
-NONE,VCALENDAR,ACTION,NONE,ZERO
-NONE,VCALENDAR,ATTACH,NONE,ZERO
-NONE,VCALENDAR,ATTENDEE,NONE,ZERO
-NONE,VCALENDAR,CALSCALE,NONE,ZEROORONE
-NONE,VCALENDAR,CATEGORIES,NONE,ZERO
-NONE,VCALENDAR,CLASS,NONE,ZERO
-NONE,VCALENDAR,COMMENT,NONE,ZERO
-NONE,VCALENDAR,COMPLETED,NONE,ZERO
-NONE,VCALENDAR,CONTACT,NONE,ZERO
-NONE,VCALENDAR,CREATED,NONE,ZERO
-NONE,VCALENDAR,DESCRIPTION,NONE,ZERO
-NONE,VCALENDAR,DTEND,NONE,ZERO
-NONE,VCALENDAR,DTSTAMP,NONE,ZERO
-NONE,VCALENDAR,DTSTART,NONE,ZERO
-NONE,VCALENDAR,DUE,NONE,ZERO
-NONE,VCALENDAR,DURATION,NONE,ZERO
-NONE,VCALENDAR,EXDATE,NONE,ZERO
-NONE,VCALENDAR,EXRULE,NONE,ZERO
-NONE,VCALENDAR,FREEBUSY,NONE,ZERO
-NONE,VCALENDAR,GEO,NONE,ZERO
-NONE,VCALENDAR,LASTMODIFIED,NONE,ZERO
-NONE,VCALENDAR,LOCATION,NONE,ZERO
-NONE,VCALENDAR,METHOD,NONE,ZEROORONE
-NONE,VCALENDAR,ORGANIZER,NONE,ZERO
-NONE,VCALENDAR,PERCENTCOMPLETE,NONE,ZERO
-NONE,VCALENDAR,PRIORITY,NONE,ZERO
-NONE,VCALENDAR,PRODID,NONE,ONE
-NONE,VCALENDAR,RDATE,NONE,ZERO
-NONE,VCALENDAR,RECURRENCEID,NONE,ZERO
-NONE,VCALENDAR,RELATEDTO,NONE,ZERO
-NONE,VCALENDAR,REPEAT,NONE,ZERO
-NONE,VCALENDAR,REQUESTSTATUS,NONE,ZERO
-NONE,VCALENDAR,RESOURCES,NONE,ZERO
-NONE,VCALENDAR,RRULE,NONE,ZERO
-NONE,VCALENDAR,SEQUENCE,NONE,ZERO
-NONE,VCALENDAR,STATUS,NONE,ZERO
-NONE,VCALENDAR,SUMMARY,NONE,ZERO
-NONE,VCALENDAR,TRANSP,NONE,ZERO
-NONE,VCALENDAR,TRIGGER,NONE,ZERO
-NONE,VCALENDAR,TZID,NONE,ZERO
-NONE,VCALENDAR,TZNAME,NONE,ZERO
-NONE,VCALENDAR,TZOFFSETFROM,NONE,ZERO
-NONE,VCALENDAR,TZOFFSETTO,NONE,ZERO
-NONE,VCALENDAR,TZURL,NONE,ZERO
-NONE,VCALENDAR,UID,NONE,ZERO
-NONE,VCALENDAR,URL,NONE,ZERO
-NONE,VCALENDAR,VERSION,NONE,ONE
-NONE,VCALENDAR,X,NONE,ZEROPLUS
-NONE,VEVENT,ACTION,NONE,ZERO
-NONE,VEVENT,ATTACH,NONE,ZEROPLUS
-NONE,VEVENT,ATTENDEE,NONE,ZEROPLUS
-NONE,VEVENT,CALSCALE,NONE,ZERO
-NONE,VEVENT,CATEGORIES,NONE,ZEROPLUS
-NONE,VEVENT,CLASS,NONE,ZEROORONE
-NONE,VEVENT,COMMENT,NONE,ZEROPLUS
-NONE,VEVENT,COMPLETED,NONE,ZERO
-NONE,VEVENT,CONTACT,NONE,ZEROPLUS
-NONE,VEVENT,CREATED,NONE,ZEROORONE
-NONE,VEVENT,DESCRIPTION,NONE,ZEROORONE
-NONE,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-NONE,VEVENT,DTSTAMP,NONE,ZEROORONE
-NONE,VEVENT,DTSTART,NONE,ZEROORONE
-NONE,VEVENT,DUE,NONE,ZERO
-NONE,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
-NONE,VEVENT,EXDATE,NONE,ZEROPLUS
-NONE,VEVENT,EXRULE,NONE,ZEROPLUS
-NONE,VEVENT,FREEBUSY,NONE,ZERO
-NONE,VEVENT,GEO,NONE,ZEROORONE
-NONE,VEVENT,LASTMODIFIED,NONE,ZEROORONE
-NONE,VEVENT,LOCATION,NONE,ZEROORONE
-NONE,VEVENT,METHOD,NONE,ZERO
-NONE,VEVENT,ORGANIZER,NONE,ZEROORONE
-NONE,VEVENT,PERCENTCOMPLETE,NONE,ZERO
-NONE,VEVENT,PRIORITY,NONE,ZEROORONE
-NONE,VEVENT,PRODID,NONE,ZERO
-NONE,VEVENT,RDATE,NONE,ZEROPLUS
-NONE,VEVENT,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-NONE,VEVENT,RELATEDTO,NONE,ZEROPLUS
-NONE,VEVENT,REPEAT,NONE,ZERO
-NONE,VEVENT,REQUESTSTATUS,NONE,ZEROPLUS
-NONE,VEVENT,RESOURCES,NONE,ZEROPLUS
-NONE,VEVENT,RRULE,NONE,ZEROPLUS
-NONE,VEVENT,SEQUENCE,NONE,ZEROORONE
-NONE,VEVENT,STATUS,NONE,ZEROORONE
-NONE,VEVENT,SUMMARY,NONE,ZEROORONE
-NONE,VEVENT,TRANSP,NONE,ZEROORONE
-NONE,VEVENT,TRIGGER,NONE,ZERO
-NONE,VEVENT,TZID,NONE,ZERO
-NONE,VEVENT,TZNAME,NONE,ZERO
-NONE,VEVENT,TZOFFSETFROM,NONE,ZERO
-NONE,VEVENT,TZOFFSETTO,NONE,ZERO
-NONE,VEVENT,TZURL,NONE,ZERO
-NONE,VEVENT,UID,NONE,ZEROORONE
-NONE,VEVENT,URL,NONE,ZEROORONE
-NONE,VEVENT,VERSION,NONE,ZERO
-NONE,VEVENT,X,NONE,ZEROPLUS
-NONE,VTODO,ACTION,NONE,ZERO
-NONE,VTODO,ATTACH,NONE,ZEROPLUS
-NONE,VTODO,ATTENDEE,NONE,ZEROPLUS
-NONE,VTODO,CALSCALE,NONE,ZERO
-NONE,VTODO,CATEGORIES,NONE,ZEROPLUS
-NONE,VTODO,CLASS,NONE,ZEROORONE
-NONE,VTODO,COMMENT,NONE,ZEROPLUS
-NONE,VTODO,COMPLETED,NONE,ZEROORONE
-NONE,VTODO,CONTACT,NONE,ZEROPLUS
-NONE,VTODO,CREATED,NONE,ZEROORONE
-NONE,VTODO,DESCRIPTION,NONE,ZEROORONE
-NONE,VTODO,DTEND,NONE,ZERO
-NONE,VTODO,DTSTAMP,NONE,ZEROORONE
-NONE,VTODO,DTSTART,NONE,ZEROORONE
-NONE,VTODO,DUE,NONE,ONEEXCLUSIVE
-NONE,VTODO,DURATION,NONE,ONEEXCLUSIVE
-NONE,VTODO,EXDATE,NONE,ZEROPLUS
-NONE,VTODO,EXRULE,NONE,ZEROPLUS
-NONE,VTODO,FREEBUSY,NONE,ZERO
-NONE,VTODO,GEO,NONE,ZEROORONE
-NONE,VTODO,LASTMODIFIED,NONE,ZEROORONE
-NONE,VTODO,LOCATION,NONE,ZEROORONE
-NONE,VTODO,METHOD,NONE,ZERO
-NONE,VTODO,ORGANIZER,NONE,ZEROORONE
-NONE,VTODO,PERCENTCOMPLETE,NONE,ZEROORONE
-NONE,VTODO,PRIORITY,NONE,ZEROORONE
-NONE,VTODO,PRODID,NONE,ZERO
-NONE,VTODO,RDATE,NONE,ZEROPLUS
-NONE,VTODO,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-NONE,VTODO,RELATEDTO,NONE,ZEROPLUS
-NONE,VTODO,REPEAT,NONE,ZERO
-NONE,VTODO,REQUESTSTATUS,NONE,ZEROPLUS
-NONE,VTODO,RESOURCES,NONE,ZEROPLUS
-NONE,VTODO,RRULE,NONE,ZEROPLUS
-NONE,VTODO,SEQUENCE,NONE,ZEROORONE
-NONE,VTODO,STATUS,NONE,ZEROORONE
-NONE,VTODO,SUMMARY,NONE,ZEROORONE
-NONE,VTODO,TRANSP,NONE,ZERO
-NONE,VTODO,TRIGGER,NONE,ZERO
-NONE,VTODO,TZID,NONE,ZERO
-NONE,VTODO,TZNAME,NONE,ZERO
-NONE,VTODO,TZOFFSETFROM,NONE,ZERO
-NONE,VTODO,TZOFFSETTO,NONE,ZERO
-NONE,VTODO,TZURL,NONE,ZERO
-NONE,VTODO,UID,NONE,ZEROORONE
-NONE,VTODO,URL,NONE,ZEROORONE
-NONE,VTODO,VERSION,NONE,ZERO
-NONE,VTODO,X,NONE,ZEROPLUS
-NONE,VJOURNAL,ACTION,NONE,ZERO
-NONE,VJOURNAL,ATTACH,NONE,ZEROPLUS
-NONE,VJOURNAL,ATTENDEE,NONE,ZEROPLUS
-NONE,VJOURNAL,CALSCALE,NONE,ZERO
-NONE,VJOURNAL,CATEGORIES,NONE,ZEROPLUS
-NONE,VJOURNAL,CLASS,NONE,ZEROORONE
-NONE,VJOURNAL,COMMENT,NONE,ZEROPLUS
-NONE,VJOURNAL,COMPLETED,NONE,ZERO
-NONE,VJOURNAL,CONTACT,NONE,ZEROPLUS
-NONE,VJOURNAL,CREATED,NONE,ZEROORONE
-NONE,VJOURNAL,DESCRIPTION,NONE,ZEROORONE
-NONE,VJOURNAL,DTEND,NONE,ZERO
-NONE,VJOURNAL,DTSTAMP,NONE,ZEROORONE
-NONE,VJOURNAL,DTSTART,NONE,ZEROORONE
-NONE,VJOURNAL,DUE,NONE,ONEEXCLUSIVE
-NONE,VJOURNAL,DURATION,NONE,ONEEXCLUSIVE
-NONE,VJOURNAL,EXDATE,NONE,ZEROPLUS
-NONE,VJOURNAL,EXRULE,NONE,ZEROPLUS
-NONE,VJOURNAL,FREEBUSY,NONE,ZERO
-NONE,VJOURNAL,GEO,NONE,ZERO
-NONE,VJOURNAL,LASTMODIFIED,NONE,ZEROORONE
-NONE,VJOURNAL,LOCATION,NONE,ZERO
-NONE,VJOURNAL,METHOD,NONE,ZERO
-NONE,VJOURNAL,ORGANIZER,NONE,ZEROORONE
-NONE,VJOURNAL,PERCENTCOMPLETE,NONE,ZERO
-NONE,VJOURNAL,PRIORITY,NONE,ZERO
-NONE,VJOURNAL,PRODID,NONE,ZERO
-NONE,VJOURNAL,RDATE,NONE,ZEROPLUS
-NONE,VJOURNAL,RECURRENCEID,NONE,ZEROORONE,must_be_recurring
-NONE,VJOURNAL,RELATEDTO,NONE,ZEROPLUS
-NONE,VJOURNAL,REPEAT,NONE,ZERO
-NONE,VJOURNAL,REQUESTSTATUS,NONE,ZEROPLUS
-NONE,VJOURNAL,RESOURCES,NONE,ZERO
-NONE,VJOURNAL,RRULE,NONE,ZEROPLUS
-NONE,VJOURNAL,SEQUENCE,NONE,ZEROORONE
-NONE,VJOURNAL,STATUS,NONE,ZEROORONE
-NONE,VJOURNAL,SUMMARY,NONE,ZEROORONE
-NONE,VJOURNAL,TRANSP,NONE,ZERO
-NONE,VJOURNAL,TRIGGER,NONE,ZERO
-NONE,VJOURNAL,TZID,NONE,ZERO
-NONE,VJOURNAL,TZNAME,NONE,ZERO
-NONE,VJOURNAL,TZOFFSETFROM,NONE,ZERO
-NONE,VJOURNAL,TZOFFSETTO,NONE,ZERO
-NONE,VJOURNAL,TZURL,NONE,ZERO
-NONE,VJOURNAL,UID,NONE,ZEROORONE
-NONE,VJOURNAL,URL,NONE,ZEROORONE
-NONE,VJOURNAL,VERSION,NONE,ZERO
-NONE,VJOURNAL,X,NONE,ZEROPLUS
-NONE,VFREEBUSY,ACTION,NONE,ZERO
-NONE,VFREEBUSY,ATTACH,NONE,ZERO
-NONE,VFREEBUSY,ATTENDEE,NONE,ZEROPLUS
-NONE,VFREEBUSY,CALSCALE,NONE,ZERO
-NONE,VFREEBUSY,CATEGORIES,NONE,ZERO
-NONE,VFREEBUSY,CLASS,NONE,ZERO
-NONE,VFREEBUSY,COMMENT,NONE,ZEROPLUS
-NONE,VFREEBUSY,COMPLETED,NONE,ZERO
-NONE,VFREEBUSY,CONTACT,NONE,ZEROORONE
-NONE,VFREEBUSY,CREATED,NONE,ZERO
-NONE,VFREEBUSY,DESCRIPTION,NONE,ZERO
-NONE,VFREEBUSY,DTEND,NONE,ZEROORONE
-NONE,VFREEBUSY,DTSTAMP,NONE,ZERO
-NONE,VFREEBUSY,DTSTART,NONE,ZEROORONE
-NONE,VFREEBUSY,DUE,NONE,ZERO
-NONE,VFREEBUSY,DURATION,NONE,ZEROORONE
-NONE,VFREEBUSY,EXDATE,NONE,ZERO
-NONE,VFREEBUSY,EXRULE,NONE,ZERO
-NONE,VFREEBUSY,FREEBUSY,NONE,ZEROPLUS
-NONE,VFREEBUSY,GEO,NONE,ZERO
-NONE,VFREEBUSY,LASTMODIFIED,NONE,ZERO
-NONE,VFREEBUSY,LOCATION,NONE,ZERO
-NONE,VFREEBUSY,METHOD,NONE,ZERO
-NONE,VFREEBUSY,ORGANIZER,NONE,ZEROORONE
-NONE,VFREEBUSY,PERCENTCOMPLETE,NONE,ZERO
-NONE,VFREEBUSY,PRIORITY,NONE,ZERO
-NONE,VFREEBUSY,PRODID,NONE,ZERO
-NONE,VFREEBUSY,RDATE,NONE,ZERO
-NONE,VFREEBUSY,RECURRENCEID,NONE,ZERO
-NONE,VFREEBUSY,RELATEDTO,NONE,ZERO
-NONE,VFREEBUSY,REPEAT,NONE,ZERO
-NONE,VFREEBUSY,REQUESTSTATUS,NONE,ZEROPLUS
-NONE,VFREEBUSY,RESOURCES,NONE,ZERO
-NONE,VFREEBUSY,RRULE,NONE,ZERO
-NONE,VFREEBUSY,SEQUENCE,NONE,ZERO
-NONE,VFREEBUSY,STATUS,NONE,ZERO
-NONE,VFREEBUSY,SUMMARY,NONE,ZERO
-NONE,VFREEBUSY,TRANSP,NONE,ZERO
-NONE,VFREEBUSY,TRIGGER,NONE,ZERO
-NONE,VFREEBUSY,TZID,NONE,ZERO
-NONE,VFREEBUSY,TZNAME,NONE,ZERO
-NONE,VFREEBUSY,TZOFFSETFROM,NONE,ZERO
-NONE,VFREEBUSY,TZOFFSETTO,NONE,ZERO
-NONE,VFREEBUSY,TZURL,NONE,ZERO
-NONE,VFREEBUSY,UID,NONE,ZEROORONE
-NONE,VFREEBUSY,URL,NONE,ZEROORONE
-NONE,VFREEBUSY,VERSION,NONE,ZERO
-NONE,VFREEBUSY,X,NONE,ZEROPLUS
-NONE,VTIMEZONE,ACTION,NONE,ZERO
-NONE,VTIMEZONE,ATTACH,NONE,ZERO
-NONE,VTIMEZONE,ATTENDEE,NONE,ZERO
-NONE,VTIMEZONE,CALSCALE,NONE,ZERO
-NONE,VTIMEZONE,CATEGORIES,NONE,ZERO
-NONE,VTIMEZONE,CLASS,NONE,ZERO
-NONE,VTIMEZONE,COMMENT,NONE,ZERO
-NONE,VTIMEZONE,COMPLETED,NONE,ZERO
-NONE,VTIMEZONE,CONTACT,NONE,ZERO
-NONE,VTIMEZONE,CREATED,NONE,ZERO
-NONE,VTIMEZONE,DESCRIPTION,NONE,ZERO
-NONE,VTIMEZONE,DTEND,NONE,ZERO
-NONE,VTIMEZONE,DTSTAMP,NONE,ZERO
-NONE,VTIMEZONE,DTSTART,NONE,ZERO
-NONE,VTIMEZONE,DUE,NONE,ZERO
-NONE,VTIMEZONE,DURATION,NONE,ZERO
-NONE,VTIMEZONE,EXDATE,NONE,ZERO
-NONE,VTIMEZONE,EXRULE,NONE,ZERO
-NONE,VTIMEZONE,FREEBUSY,NONE,ZERO
-NONE,VTIMEZONE,GEO,NONE,ZERO
-NONE,VTIMEZONE,LASTMODIFIED,NONE,ZEROORONE
-NONE,VTIMEZONE,LOCATION,NONE,ZERO
-NONE,VTIMEZONE,METHOD,NONE,ZERO
-NONE,VTIMEZONE,ORGANIZER,NONE,ZERO
-NONE,VTIMEZONE,PERCENTCOMPLETE,NONE,ZERO
-NONE,VTIMEZONE,PRIORITY,NONE,ZERO
-NONE,VTIMEZONE,PRODID,NONE,ZERO
-NONE,VTIMEZONE,RDATE,NONE,ZERO
-NONE,VTIMEZONE,RECURRENCEID,NONE,ZERO
-NONE,VTIMEZONE,RELATEDTO,NONE,ZERO
-NONE,VTIMEZONE,REPEAT,NONE,ZERO
-NONE,VTIMEZONE,REQUESTSTATUS,NONE,ZERO
-NONE,VTIMEZONE,RESOURCES,NONE,ZERO
-NONE,VTIMEZONE,RRULE,NONE,ZERO
-NONE,VTIMEZONE,SEQUENCE,NONE,ZERO
-NONE,VTIMEZONE,STATUS,NONE,ZERO
-NONE,VTIMEZONE,SUMMARY,NONE,ZERO
-NONE,VTIMEZONE,TRANSP,NONE,ZERO
-NONE,VTIMEZONE,TRIGGER,NONE,ZERO
-NONE,VTIMEZONE,TZID,NONE,ONE
-NONE,VTIMEZONE,TZNAME,NONE,ZERO
-NONE,VTIMEZONE,TZOFFSETFROM,NONE,ZERO
-NONE,VTIMEZONE,TZOFFSETTO,NONE,ZERO
-NONE,VTIMEZONE,TZURL,NONE,ZEROPLUS
-NONE,VTIMEZONE,UID,NONE,ZERO
-NONE,VTIMEZONE,URL,NONE,ZERO
-NONE,VTIMEZONE,VERSION,NONE,ZERO
-NONE,VTIMEZONE,X,NONE,ZEROORONE
-NONE,XSTANDARD,ACTION,NONE,ZERO
-NONE,XSTANDARD,ATTACH,NONE,ZERO
-NONE,XSTANDARD,ATTENDEE,NONE,ZERO
-NONE,XSTANDARD,CALSCALE,NONE,ZERO
-NONE,XSTANDARD,CATEGORIES,NONE,ZERO
-NONE,XSTANDARD,CLASS,NONE,ZERO
-NONE,XSTANDARD,COMMENT,NONE,ZEROPLUS
-NONE,XSTANDARD,COMPLETED,NONE,ZERO
-NONE,XSTANDARD,CONTACT,NONE,ZERO
-NONE,XSTANDARD,CREATED,NONE,ZERO
-NONE,XSTANDARD,DESCRIPTION,NONE,ZERO
-NONE,XSTANDARD,DTEND,NONE,ZERO
-NONE,XSTANDARD,DTSTAMP,NONE,ZERO
-NONE,XSTANDARD,DTSTART,NONE,ONE
-NONE,XSTANDARD,DUE,NONE,ZERO
-NONE,XSTANDARD,DURATION,NONE,ZERO
-NONE,XSTANDARD,EXDATE,NONE,ZERO
-NONE,XSTANDARD,EXRULE,NONE,ZERO
-NONE,XSTANDARD,FREEBUSY,NONE,ZERO
-NONE,XSTANDARD,GEO,NONE,ZERO
-NONE,XSTANDARD,LASTMODIFIED,NONE,ZERO
-NONE,XSTANDARD,LOCATION,NONE,ZERO
-NONE,XSTANDARD,METHOD,NONE,ZERO
-NONE,XSTANDARD,ORGANIZER,NONE,ZERO
-NONE,XSTANDARD,PERCENTCOMPLETE,NONE,ZERO
-NONE,XSTANDARD,PRIORITY,NONE,ZERO
-NONE,XSTANDARD,PRODID,NONE,ZERO
-NONE,XSTANDARD,RDATE,NONE,ZEROPLUS
-NONE,XSTANDARD,RECURRENCEID,NONE,ZERO
-NONE,XSTANDARD,RELATEDTO,NONE,ZERO
-NONE,XSTANDARD,REPEAT,NONE,ZERO
-NONE,XSTANDARD,REQUESTSTATUS,NONE,ZERO
-NONE,XSTANDARD,RESOURCES,NONE,ZERO
-NONE,XSTANDARD,RRULE,NONE,ZEROPLUS
-NONE,XSTANDARD,SEQUENCE,NONE,ZERO
-NONE,XSTANDARD,STATUS,NONE,ZERO
-NONE,XSTANDARD,SUMMARY,NONE,ZERO
-NONE,XSTANDARD,TRANSP,NONE,ZERO
-NONE,XSTANDARD,TRIGGER,NONE,ZERO
-NONE,XSTANDARD,TZID,NONE,ZERO
-NONE,XSTANDARD,TZNAME,NONE,ZEROPLUS
-NONE,XSTANDARD,TZOFFSETFROM,NONE,ONE
-NONE,XSTANDARD,TZOFFSETTO,NONE,ONE
-NONE,XSTANDARD,TZURL,NONE,ZERO
-NONE,XSTANDARD,UID,NONE,ZERO
-NONE,XSTANDARD,URL,NONE,ZERO
-NONE,XSTANDARD,VERSION,NONE,ZERO
-NONE,XSTANDARD,X,NONE,ZEROPLUS
-NONE,XDAYLIGHT,ACTION,NONE,ZERO
-NONE,XDAYLIGHT,ATTACH,NONE,ZERO
-NONE,XDAYLIGHT,ATTENDEE,NONE,ZERO
-NONE,XDAYLIGHT,CALSCALE,NONE,ZERO
-NONE,XDAYLIGHT,CATEGORIES,NONE,ZERO
-NONE,XDAYLIGHT,CLASS,NONE,ZERO
-NONE,XDAYLIGHT,COMMENT,NONE,ZEROPLUS
-NONE,XDAYLIGHT,COMPLETED,NONE,ZERO
-NONE,XDAYLIGHT,CONTACT,NONE,ZERO
-NONE,XDAYLIGHT,CREATED,NONE,ZERO
-NONE,XDAYLIGHT,DESCRIPTION,NONE,ZERO
-NONE,XDAYLIGHT,DTEND,NONE,ZERO
-NONE,XDAYLIGHT,DTSTAMP,NONE,ZERO
-NONE,XDAYLIGHT,DTSTART,NONE,ONE
-NONE,XDAYLIGHT,DUE,NONE,ZERO
-NONE,XDAYLIGHT,DURATION,NONE,ZERO
-NONE,XDAYLIGHT,EXDATE,NONE,ZERO
-NONE,XDAYLIGHT,EXRULE,NONE,ZERO
-NONE,XDAYLIGHT,FREEBUSY,NONE,ZERO
-NONE,XDAYLIGHT,GEO,NONE,ZERO
-NONE,XDAYLIGHT,LASTMODIFIED,NONE,ZERO
-NONE,XDAYLIGHT,LOCATION,NONE,ZERO
-NONE,XDAYLIGHT,METHOD,NONE,ZERO
-NONE,XDAYLIGHT,ORGANIZER,NONE,ZERO
-NONE,XDAYLIGHT,PERCENTCOMPLETE,NONE,ZERO
-NONE,XDAYLIGHT,PRIORITY,NONE,ZERO
-NONE,XDAYLIGHT,PRODID,NONE,ZERO
-NONE,XDAYLIGHT,RDATE,NONE,ZEROPLUS
-NONE,XDAYLIGHT,RECURRENCEID,NONE,ZERO
-NONE,XDAYLIGHT,RELATEDTO,NONE,ZERO
-NONE,XDAYLIGHT,REPEAT,NONE,ZERO
-NONE,XDAYLIGHT,REQUESTSTATUS,NONE,ZERO
-NONE,XDAYLIGHT,RESOURCES,NONE,ZERO
-NONE,XDAYLIGHT,RRULE,NONE,ZEROPLUS
-NONE,XDAYLIGHT,SEQUENCE,NONE,ZERO
-NONE,XDAYLIGHT,STATUS,NONE,ZERO
-NONE,XDAYLIGHT,SUMMARY,NONE,ZERO
-NONE,XDAYLIGHT,TRANSP,NONE,ZERO
-NONE,XDAYLIGHT,TRIGGER,NONE,ZERO
-NONE,XDAYLIGHT,TZID,NONE,ZERO
-NONE,XDAYLIGHT,TZNAME,NONE,ZEROPLUS
-NONE,XDAYLIGHT,TZOFFSETFROM,NONE,ONE
-NONE,XDAYLIGHT,TZOFFSETTO,NONE,ONE
-NONE,XDAYLIGHT,TZURL,NONE,ZERO
-NONE,XDAYLIGHT,UID,NONE,ZERO
-NONE,XDAYLIGHT,URL,NONE,ZERO
-NONE,XDAYLIGHT,VERSION,NONE,ZERO
-NONE,XDAYLIGHT,X,NONE,ZEROPLUS
-NONE,XAUDIOALARM,ACTION,NONE,ONE
-NONE,XAUDIOALARM,ATTACH,NONE,ZEROORONE
-NONE,XAUDIOALARM,ATTENDEE,NONE,ZERO
-NONE,XAUDIOALARM,CALSCALE,NONE,ZERO
-NONE,XAUDIOALARM,CATEGORIES,NONE,ZERO
-NONE,XAUDIOALARM,CLASS,NONE,ZERO
-NONE,XAUDIOALARM,COMMENT,NONE,ZERO
-NONE,XAUDIOALARM,COMPLETED,NONE,ZERO
-NONE,XAUDIOALARM,CONTACT,NONE,ZERO
-NONE,XAUDIOALARM,CREATED,NONE,ZERO
-NONE,XAUDIOALARM,DESCRIPTION,NONE,ZERO
-NONE,XAUDIOALARM,DTEND,NONE,ZERO
-NONE,XAUDIOALARM,DTSTAMP,NONE,ZERO
-NONE,XAUDIOALARM,DTSTART,NONE,ZERO
-NONE,XAUDIOALARM,DUE,NONE,ZERO
-NONE,XAUDIOALARM,DURATION,NONE,ONEMUTUAL,must_have_repeat
-NONE,XAUDIOALARM,REPEAT,NONE,ONEMUTUAL,must_have_duration
-NONE,XAUDIOALARM,EXDATE,NONE,ZERO
-NONE,XAUDIOALARM,EXRULE,NONE,ZERO
-NONE,XAUDIOALARM,FREEBUSY,NONE,ZERO
-NONE,XAUDIOALARM,GEO,NONE,ZERO
-NONE,XAUDIOALARM,LASTMODIFIED,NONE,ZERO
-NONE,XAUDIOALARM,LOCATION,NONE,ZERO
-NONE,XAUDIOALARM,METHOD,NONE,ZERO
-NONE,XAUDIOALARM,ORGANIZER,NONE,ZERO
-NONE,XAUDIOALARM,PERCENTCOMPLETE,NONE,ZERO
-NONE,XAUDIOALARM,PRIORITY,NONE,ZERO
-NONE,XAUDIOALARM,PRODID,NONE,ZERO
-NONE,XAUDIOALARM,RDATE,NONE,ZERO
-NONE,XAUDIOALARM,RECURRENCEID,NONE,ZERO
-NONE,XAUDIOALARM,RELATEDTO,NONE,ZERO
-NONE,XAUDIOALARM,REQUESTSTATUS,NONE,ZERO
-NONE,XAUDIOALARM,RESOURCES,NONE,ZERO
-NONE,XAUDIOALARM,RRULE,NONE,ZERO
-NONE,XAUDIOALARM,SEQUENCE,NONE,ZERO
-NONE,XAUDIOALARM,STATUS,NONE,ZERO
-NONE,XAUDIOALARM,SUMMARY,NONE,ZERO
-NONE,XAUDIOALARM,TRANSP,NONE,ZERO
-NONE,XAUDIOALARM,TRIGGER,NONE,ONE
-NONE,XAUDIOALARM,TZID,NONE,ZERO
-NONE,XAUDIOALARM,TZNAME,NONE,ZERO
-NONE,XAUDIOALARM,TZOFFSETFROM,NONE,ZERO
-NONE,XAUDIOALARM,TZOFFSETTO,NONE,ZERO
-NONE,XAUDIOALARM,TZURL,NONE,ZERO
-NONE,XAUDIOALARM,UID,NONE,ZERO
-NONE,XAUDIOALARM,URL,NONE,ZERO
-NONE,XAUDIOALARM,VERSION,NONE,ZERO
-NONE,XAUDIOALARM,X,NONE,ZEROPLUS
-NONE,XDISPLAYALARM,ACTION,NONE,ONE
-NONE,XDISPLAYALARM,ATTACH,NONE,ZERO
-NONE,XDISPLAYALARM,ATTENDEE,NONE,ZERO
-NONE,XDISPLAYALARM,CALSCALE,NONE,ZERO
-NONE,XDISPLAYALARM,CATEGORIES,NONE,ZERO
-NONE,XDISPLAYALARM,CLASS,NONE,ZERO
-NONE,XDISPLAYALARM,COMMENT,NONE,ZERO
-NONE,XDISPLAYALARM,COMPLETED,NONE,ZERO
-NONE,XDISPLAYALARM,CONTACT,NONE,ZERO
-NONE,XDISPLAYALARM,CREATED,NONE,ZERO
-NONE,XDISPLAYALARM,DESCRIPTION,NONE,ONE
-NONE,XDISPLAYALARM,DTEND,NONE,ZERO
-NONE,XDISPLAYALARM,DTSTAMP,NONE,ZERO
-NONE,XDISPLAYALARM,DTSTART,NONE,ZERO
-NONE,XDISPLAYALARM,DUE,NONE,ZERO
-NONE,XDISPLAYALARM,DURATION,NONE,ONEMUTUAL,must_have_repeat
-NONE,XDISPLAYALARM,REPEAT,NONE,ONEMUTUAL,must_have_duration
-NONE,XDISPLAYALARM,EXDATE,NONE,ZERO
-NONE,XDISPLAYALARM,EXRULE,NONE,ZERO
-NONE,XDISPLAYALARM,FREEBUSY,NONE,ZERO
-NONE,XDISPLAYALARM,GEO,NONE,ZERO
-NONE,XDISPLAYALARM,LASTMODIFIED,NONE,ZERO
-NONE,XDISPLAYALARM,LOCATION,NONE,ZERO
-NONE,XDISPLAYALARM,METHOD,NONE,ZERO
-NONE,XDISPLAYALARM,ORGANIZER,NONE,ZERO
-NONE,XDISPLAYALARM,PERCENTCOMPLETE,NONE,ZERO
-NONE,XDISPLAYALARM,PRIORITY,NONE,ZERO
-NONE,XDISPLAYALARM,PRODID,NONE,ZERO
-NONE,XDISPLAYALARM,RDATE,NONE,ZERO
-NONE,XDISPLAYALARM,RECURRENCEID,NONE,ZERO
-NONE,XDISPLAYALARM,RELATEDTO,NONE,ZERO
-NONE,XDISPLAYALARM,REQUESTSTATUS,NONE,ZERO
-NONE,XDISPLAYALARM,RESOURCES,NONE,ZERO
-NONE,XDISPLAYALARM,RRULE,NONE,ZERO
-NONE,XDISPLAYALARM,SEQUENCE,NONE,ZERO
-NONE,XDISPLAYALARM,STATUS,NONE,ZERO
-NONE,XDISPLAYALARM,SUMMARY,NONE,ZERO
-NONE,XDISPLAYALARM,TRANSP,NONE,ZERO
-NONE,XDISPLAYALARM,TRIGGER,NONE,ONE
-NONE,XDISPLAYALARM,TZID,NONE,ZERO
-NONE,XDISPLAYALARM,TZNAME,NONE,ZERO
-NONE,XDISPLAYALARM,TZOFFSETFROM,NONE,ZERO
-NONE,XDISPLAYALARM,TZOFFSETTO,NONE,ZERO
-NONE,XDISPLAYALARM,TZURL,NONE,ZERO
-NONE,XDISPLAYALARM,UID,NONE,ZERO
-NONE,XDISPLAYALARM,URL,NONE,ZERO
-NONE,XDISPLAYALARM,VERSION,NONE,ZERO
-NONE,XDISPLAYALARM,X,NONE,ZEROPLUS
-NONE,XEMAILALARM,ACTION,NONE,ONE
-NONE,XEMAILALARM,ATTACH,NONE,ZEROPLUS
-NONE,XEMAILALARM,ATTENDEE,NONE,ONEPLUS
-NONE,XEMAILALARM,CALSCALE,NONE,ZERO
-NONE,XEMAILALARM,CATEGORIES,NONE,ZERO
-NONE,XEMAILALARM,CLASS,NONE,ZERO
-NONE,XEMAILALARM,COMMENT,NONE,ZERO
-NONE,XEMAILALARM,COMPLETED,NONE,ZERO
-NONE,XEMAILALARM,CONTACT,NONE,ZERO
-NONE,XEMAILALARM,CREATED,NONE,ZERO
-NONE,XEMAILALARM,DESCRIPTION,NONE,ONE
-NONE,XEMAILALARM,DTEND,NONE,ZERO
-NONE,XEMAILALARM,DTSTAMP,NONE,ZERO
-NONE,XEMAILALARM,DTSTART,NONE,ZERO
-NONE,XEMAILALARM,DUE,NONE,ZERO
-NONE,XEMAILALARM,DURATION,NONE,ONEMUTUAL,must_have_repeat
-NONE,XEMAILALARM,REPEAT,NONE,ONEMUTUAL,must_have_duration
-NONE,XEMAILALARM,EXDATE,NONE,ZERO
-NONE,XEMAILALARM,EXRULE,NONE,ZERO
-NONE,XEMAILALARM,FREEBUSY,NONE,ZERO
-NONE,XEMAILALARM,GEO,NONE,ZERO
-NONE,XEMAILALARM,LASTMODIFIED,NONE,ZERO
-NONE,XEMAILALARM,LOCATION,NONE,ZERO
-NONE,XEMAILALARM,METHOD,NONE,ZERO
-NONE,XEMAILALARM,ORGANIZER,NONE,ZERO
-NONE,XEMAILALARM,PERCENTCOMPLETE,NONE,ZERO
-NONE,XEMAILALARM,PRIORITY,NONE,ZERO
-NONE,XEMAILALARM,PRODID,NONE,ZERO
-NONE,XEMAILALARM,RDATE,NONE,ZERO
-NONE,XEMAILALARM,RECURRENCEID,NONE,ZERO
-NONE,XEMAILALARM,RELATEDTO,NONE,ZERO
-NONE,XEMAILALARM,REQUESTSTATUS,NONE,ZERO
-NONE,XEMAILALARM,RESOURCES,NONE,ZERO
-NONE,XEMAILALARM,RRULE,NONE,ZERO
-NONE,XEMAILALARM,SEQUENCE,NONE,ZERO
-NONE,XEMAILALARM,STATUS,NONE,ZERO
-NONE,XEMAILALARM,SUMMARY,NONE,ONE
-NONE,XEMAILALARM,TRANSP,NONE,ZERO
-NONE,XEMAILALARM,TRIGGER,NONE,ONE
-NONE,XEMAILALARM,TZID,NONE,ZERO
-NONE,XEMAILALARM,TZNAME,NONE,ZERO
-NONE,XEMAILALARM,TZOFFSETFROM,NONE,ZERO
-NONE,XEMAILALARM,TZOFFSETTO,NONE,ZERO
-NONE,XEMAILALARM,TZURL,NONE,ZERO
-NONE,XEMAILALARM,UID,NONE,ZERO
-NONE,XEMAILALARM,URL,NONE,ZERO
-NONE,XEMAILALARM,VERSION,NONE,ZERO
-NONE,XEMAILALARM,X,NONE,ZEROPLUS
-NONE,XPROCEDUREALARM,ACTION,NONE,ONE
-NONE,XPROCEDUREALARM,ATTACH,NONE,ZEROORONE
-NONE,XPROCEDUREALARM,ATTENDEE,NONE,ZERO
-NONE,XPROCEDUREALARM,CALSCALE,NONE,ZERO
-NONE,XPROCEDUREALARM,CATEGORIES,NONE,ZERO
-NONE,XPROCEDUREALARM,CLASS,NONE,ZERO
-NONE,XPROCEDUREALARM,COMMENT,NONE,ZERO
-NONE,XPROCEDUREALARM,COMPLETED,NONE,ZERO
-NONE,XPROCEDUREALARM,CONTACT,NONE,ZERO
-NONE,XPROCEDUREALARM,CREATED,NONE,ZERO
-NONE,XPROCEDUREALARM,DESCRIPTION,NONE,ZEROORONE
-NONE,XPROCEDUREALARM,DTEND,NONE,ZERO
-NONE,XPROCEDUREALARM,DTSTAMP,NONE,ZERO
-NONE,XPROCEDUREALARM,DTSTART,NONE,ZERO
-NONE,XPROCEDUREALARM,DUE,NONE,ZERO
-NONE,XPROCEDUREALARM,DURATION,NONE,ONEMUTUAL,must_have_repeat
-NONE,XPROCEDUREALARM,REPEAT,NONE,ONEMUTUAL,must_have_duration
-NONE,XPROCEDUREALARM,EXDATE,NONE,ZERO
-NONE,XPROCEDUREALARM,EXRULE,NONE,ZERO
-NONE,XPROCEDUREALARM,FREEBUSY,NONE,ZERO
-NONE,XPROCEDUREALARM,GEO,NONE,ZERO
-NONE,XPROCEDUREALARM,LASTMODIFIED,NONE,ZERO
-NONE,XPROCEDUREALARM,LOCATION,NONE,ZERO
-NONE,XPROCEDUREALARM,METHOD,NONE,ZERO
-NONE,XPROCEDUREALARM,ORGANIZER,NONE,ZERO
-NONE,XPROCEDUREALARM,PERCENTCOMPLETE,NONE,ZERO
-NONE,XPROCEDUREALARM,PRIORITY,NONE,ZERO
-NONE,XPROCEDUREALARM,PRODID,NONE,ZERO
-NONE,XPROCEDUREALARM,RDATE,NONE,ZERO
-NONE,XPROCEDUREALARM,RECURRENCEID,NONE,ZERO
-NONE,XPROCEDUREALARM,RELATEDTO,NONE,ZERO
-NONE,XPROCEDUREALARM,REQUESTSTATUS,NONE,ZERO
-NONE,XPROCEDUREALARM,RESOURCES,NONE,ZERO
-NONE,XPROCEDUREALARM,RRULE,NONE,ZERO
-NONE,XPROCEDUREALARM,SEQUENCE,NONE,ZERO
-NONE,XPROCEDUREALARM,STATUS,NONE,ZERO
-NONE,XPROCEDUREALARM,SUMMARY,NONE,ZERO
-NONE,XPROCEDUREALARM,TRANSP,NONE,ZERO
-NONE,XPROCEDUREALARM,TRIGGER,NONE,ONE
-NONE,XPROCEDUREALARM,TZID,NONE,ZERO
-NONE,XPROCEDUREALARM,TZNAME,NONE,ZERO
-NONE,XPROCEDUREALARM,TZOFFSETFROM,NONE,ZERO
-NONE,XPROCEDUREALARM,TZOFFSETTO,NONE,ZERO
-NONE,XPROCEDUREALARM,TZURL,NONE,ZERO
-NONE,XPROCEDUREALARM,UID,NONE,ZERO
-NONE,XPROCEDUREALARM,URL,NONE,ZERO
-NONE,XPROCEDUREALARM,VERSION,NONE,ZERO
-NONE,XPROCEDUREALARM,X,NONE,ZEROPLUS
diff --git a/libical/design-data/status.txt b/libical/design-data/status.txt
deleted file mode 100644
index 9e7bbf83a7..0000000000
--- a/libical/design-data/status.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-2.0 STATOK Operation was successfully performed.
-2.0.1 STARTSENDATA Start ICAL input; end with <CRLF>.<CRLF>
-2.0.11 OKDATAFOLLOWS The request was processed successfully. Reply data follows on the next line and terminates with <CRLF>.<CRLF>
-2.0.2 REPLYPENDING A timeout has occurred. The server is still working on the reply. Use CONTINUE to continue waiting for the reply or ABORT to terminate the command.
-2.0.3 ABORTED The  command currently underway was successsfully aborted.
-2.0.4 WILLATTEMPT The specified Calendar is not here but an attempt will be made to deliver the request or reply to the Calendar anyway.
-2.0.5 TRUSTEDWILLQUEUE The request or reply will be queued and delivered to the target calendar when its iRIP server contacts this server and issues the SWITCH command. 
-2.0.6 WILLATTEMPT The specified Calendar is not here but an attempt will be made to deliver the request or reply to the Calendar anyway. 
-2.0.7 QUEUED The message has been queued for delivery.
-2.0.8 QUEUEEMPTY There are no more queued messages.
-2.1 FALLBACK Success. Fallback taken  on one or more property  values.
-2.2 NOCOMMANDINPROGRESS An ABORT or CONTINUE was received when no command was in progress
-2.2 IGPROP Success. Invalid property ignored.
-2.3 IGPARAM Success. invalid property parameter ignored.
-2.4 IGXPROP Success. Unknown non-standard property ignored.
-2.5 IGXPARAM Success. Unknown non standard property value  ignored.
-2.6 IGCOMP Success. Invalid calendar component ignored.
-2.7 FORWARD Success. Request forwarded to Calendar User.
-2.8 ONEEVENT Success. Repeating event ignored. Scheduled as a  single component.
-2.9 TRUNC Success. Truncated end date time to date boundary.
-2.10 ONETODO Success. Repeating VTODO ignored. Scheduled as a  single VTODO.
-2.11 TRUNCRRULE Success. Unbounded RRULE clipped at some finite  number of instances  
-3.0 INVPROPNAME Invalid property name.
-3.1 INVPROPVAL Invalid property value.
-3.2 INVPARAM Invalid property parameter.
-3.3 INVPARAMVAL Invalid property parameter value.
-3.4 INVCOMP Invalid calendar component sequence.
-3.5 INVTIME Invalid date or time.
-3.6 INVRULE Invalid rule.
-3.7 INVCU Invalid Calendar User.
-3.8 NOAUTH No authority.
-3.9 BADVERSION Unsupported version.
-3.10 TOOBIG Request entity too large.
-3.11 MISSREQCOMP Required component or property missing.
-3.12 UNKCOMP Unknown component or property found.
-3.13 BADCOMP Unsupported component or property found
-3.14 NOCAP Unsupported capability.
-4.0 BUSY Event conflict. Date/time  is busy.
-5.0 MAYBE Request MAY supported.
-5.1 UNAVAIL Service unavailable.
-5.2 NOSERVICE Invalid calendar service.
-5.3 NOSCHED No scheduling support for  user.
-6.1 AUTHENTICATEFAILURE Unsupported authentication mechanism, credentials rejected
-6.2 AUTHENTICATIONABORTED Sender aborted authentication, authentication exchange cancelled
-8.0 GENERALFAILURE A failure has occurred in the Receiver that prevents the operation from succeeding.
-8.1 SERVERTOOBUSY The iRIP Receiver is too busy.
-8.2 ICALOBJECTTOOBIG Object has exceeded the server's size limit.
-8.3 DATETOOLARGE A DATETIME value was too far in the future to be represented on this Calendar.
-8.4 DATETOOSMALL A DATETIME value was too far in the past to be represented on this Calendar.
-9.0 INVALIDIRIPCOMMAND An unrecongnized command was received.
-9.1 UNEXPECTEDCOMMAND The command is not allowed for the server's current state. 
-10.1 REFERRAL Accompanied by an alternate address. 
-10.2 SERVERSHUTDOWN The server is shutting down.
-10.3 SERVERSTOPPING FLOOD 2
-10.4 EXCEEDEDQUOTAS The operation would cause a resource to exceed the allocated quota
-10.5 QUEUEDTOOLONG The ITIP message has been queued too long. Delivery has been aborted.
diff --git a/libical/design-data/value-c-types.txt b/libical/design-data/value-c-types.txt
deleted file mode 100644
index a171b31171..0000000000
--- a/libical/design-data/value-c-types.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ATTACH			autogen		struct icalattachtype	# Non-std
-BINARY			autogen		const char*
-BOOLEAN			autogen		int
-CAL-ADDRESS		autogen		const char*
-DATE			autogen		struct icaltimetype
-DATE-TIME		autogen		struct icaltimetype
-DATE-TIME-DATE		autogen		struct icaltimetype	# Non-std
-DATE-TIME-PERIOD	nogen		struct icaldatetimeperiodtype	# Non-std
-DURATION		autogen		struct icaldurationtype
-FLOAT			autogen		float
-GEO			autogen		struct icalgeotype	# Non-std
-INTEGER			autogen		int
-METHOD			autogen		icalproperty_method	# Non-std
-PERIOD			autogen		struct icalperiodtype
-RECUR			nogen		struct icalrecurrencetype
-STRING			autogen		const char*			# Non-std
-TEXT			autogen		const char*
-TIME			autogen		struct icaltimetype
-TRIGGER			nogen		struct icaltriggertype	# Non-std
-URI			autogen		const char*
-UTC-OFFSET		autogen		int
-QUERY			autogen		const char*
-STATUS			autogen		icalproperty_status	#Non-std
diff --git a/libical/design-data/value-mem-semantics.txt b/libical/design-data/value-mem-semantics.txt
deleted file mode 100644
index 5948e244f6..0000000000
--- a/libical/design-data/value-mem-semantics.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ATTACH			struct icalattachtype
-BINARY			char*
-BOOLEAN			int
-CAL-ADDRESS		char*
-DATE			time_t
-DATE-TIME		time_t
-DATE-TIME-DATE		time_t			
-DATE-TIME-PERIOD	struct icalperiodtype	
-DURATION		struct icaldurationtype
-FLOAT			float
-GEO			struct icalgeotype	
-INTEGER			int
-PERIOD			struct icalperiodtype
-RECUR			struct icalrecurrencetype
-TEXT			char*
-TIME			time_t
-TRIGGER			struct icaltriggertimetype
-URI			char*
-UTC-OFFSET		int
diff --git a/libical/doc/.cvsignore b/libical/doc/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/libical/doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/libical/doc/Makefile.am b/libical/doc/Makefile.am
deleted file mode 100644
index 70b008a369..0000000000
--- a/libical/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = UsingLibical.lyx UsingLibical.ps  UsingLibical.txt
diff --git a/libical/doc/UsingLibical.lyx b/libical/doc/UsingLibical.lyx
deleted file mode 100644
index aa299de3c8..0000000000
--- a/libical/doc/UsingLibical.lyx
+++ /dev/null
@@ -1,2414 +0,0 @@
-#LyX 1.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 2.16
-\textclass linuxdoc
-\language default
-\inputencoding default
-\fontscheme default
-\graphics default
-\paperfontsize default
-\spacing single 
-\papersize Default
-\paperpackage a4
-\use_geometry 0
-\use_amsmath 0
-\paperorientation portrait
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\defskip medskip
-\quotes_language english
-\quotes_times 2
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-
-\layout Title
-
-Using Libical
-\layout Author
-
-Eric Busboom (eric@softwarestudio.org)
-\layout Date
-
-January 2001
-\layout Standard
-
-
-\begin_inset LatexCommand \tableofcontents{}
-
-\end_inset 
-
-
-\layout Section
-
-Introduction 
-\layout Standard
-
-Libical is an Open Source implementation of the iCalendar protocols and
- protocol data units.
- The iCalendar specification describes how calendar clients can communicate
- with calendar servers so users can store their calendar data and arrange
- meetings with other users.
- 
-\layout Standard
-
-Libical implements RFC2445, RFC2446 and some of RFC2447 and the CAP draft.
- 
-\layout Standard
-
-This documentation assumes that you are familiar with the iCalendar standards
- RFC2445 and RFC2446.
- these specifications are online on the CALSCH webpage at:
-\layout Verbatim
-
-http://www.imc.org/ietf-calendar/
-\layout Subsection
-
-The libical project
-\layout Standard
-
-This code is under active development.
- If you would like to contribute to the project, you can contact me, Eric
- Busboom, at eric@softwarestudio.org.
- The project has a webpage at
-\layout Verbatim
-
-http://softwarestudio.org/libical/index.html 
-\layout Standard
-
-and a mailing list that you can join by sending the following mail:
-\layout Verbatim
-
-To: minimalist@softwarestudio.org 
-\layout Verbatim
-
-Subject: subscribe libical 
-\layout Subsection
-
-License
-\layout Standard
-
-The code and datafiles in this distribution are licensed under the Mozilla
- Public License.
- See http://www.mozilla.org/NPL/MPL-1.0.html for a copy of the license.
- Alternately, you may use libical under the terms of the GNU Library General
- Public License.
- See http://www.fsf.org/copyleft/lesser.html for a copy of the LGPL.
-\layout Standard
-
-This dual license ensures that the library can be incorporated into both
- proprietary code and GPL'd programs, and will benefit from improvements
- made by programmers in both realms.
- I will only accept changes into my version of the library if they are similarly
- dual-licensed.
-\layout Subsection
-
-Example Code
-\layout Standard
-
-A lot of the documentation for this library is in the form of example code.
- These examples are in the 
-\begin_inset Quotes eld
-\end_inset 
-
-examples
-\begin_inset Quotes erd
-\end_inset 
-
- directory of the distribution.
- Also look in 
-\begin_inset Quotes eld
-\end_inset 
-
-src/test
-\begin_inset Quotes erd
-\end_inset 
-
- for additional annotated examples.
- 
-\layout Section
-
-Building the Library
-\layout Standard
-
-Libical uses autoconf to generate makefiles.
- It should built with no adjustments on Linux, FreeBSD and Solaris under
- gcc.
- Some version have been successfully been build on MacOS, Solaris, UnixWare,
- And Tru64 UNIX without gcc, but you may run into problems with a particular
- later version.
- 
-\layout Standard
-
-For a more complete guide to building the library, see the README file in
- the distribution.
- 
-\layout Section
-
-Structure 
-\layout Standard
-
-The iCal calendar model is based on four types of objects: components, propertie
-s, values and parameters.
- 
-\layout Standard
-
-Properties are the fundamental unit of information in iCal, and they work
- a bit like a hash entry, with a constant key and a variable value.
- Properties may also have modifiers, called parameters.
- In the iCal content line
-\layout Verbatim
-
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-\layout Standard
-
-The property name is 
-\begin_inset Quotes eld
-\end_inset 
-
-ORGANIZER,
-\begin_inset Quotes erd
-\end_inset 
-
- the value of the property is 
-\begin_inset Quotes eld
-\end_inset 
-
-mrbig@host.com
-\begin_inset Quotes erd
-\end_inset 
-
- and the 
-\begin_inset Quotes eld
-\end_inset 
-
-ROLE
-\begin_inset Quotes erd
-\end_inset 
-
- parameter specifies that Mr Big is the chair of the meetings associated
- with this property.
- 
-\layout Standard
-
-Components are groups of properties that represent the core objects of a
- calendar system, such as events or timezones.
- Components are delimited by 
-\begin_inset Quotes eld
-\end_inset 
-
-BEGIN
-\begin_inset Quotes erd
-\end_inset 
-
- and 
-\begin_inset Quotes eld
-\end_inset 
-
-END
-\begin_inset Quotes erd
-\end_inset 
-
- tags.
- 
-\layout Standard
-\added_space_bottom 0.3cm 
-When a component is sent across a network, if it is un-encrypted, it will
- look something like:
-\layout Verbatim
-
-BEGIN:VCALENDAR
-\layout Verbatim
-
-METHOD:REQUEST
-\layout Verbatim
-
-PRODID: -//hacksw/handcal//NONSGML v1.0//EN
-\layout Verbatim
-
-BEGIN:VEVENT 
-\layout Verbatim
-
-DTSTAMP:19980309T231000Z 
-\layout Verbatim
-
-UID:guid-1.host1.com 
-\layout Verbatim
-
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com 
-\layout Verbatim
-
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP: 
-\layout Verbatim
-
-  MAILTO:employee-A@host.com 
-\layout Verbatim
-
-DESCRIPTION:Project XYZ Review Meeting 
-\layout Verbatim
-
-CATEGORIES:MEETING 
-\layout Verbatim
-
-CLASS:PUBLIC 
-\layout Verbatim
-
-CREATED:19980309T130000Z 
-\layout Verbatim
-
-SUMMARY:XYZ Project Review 
-\layout Verbatim
-
-DTSTART;TZID=US-Eastern:19980312T083000 
-\layout Verbatim
-
-DTEND;TZID=US-Eastern:19980312T093000 
-\layout Verbatim
-
-LOCATION:1CP Conference Room 4350 
-\layout Verbatim
-
-END:VEVENT 
-\layout Verbatim
-
-END:VCALENDAR
-\layout Standard
-
-Note that components can be nested; this example has both a VCALENDAR and
- a VEVENT component, one nested inside the other.
- 
-\layout Subsection
-
-Core iCal classes
-\layout Standard
-
-Libical is an object-based, data-oriented library.
- Nearly all of the routines in the library are associated with an opaque
- data types and perform some operation on that data type.
- Although the library does not actually have classes, we will use those
- terms since the behavior of these associations of data and routines is
- very similar to a class.
- 
-\layout Subsubsection
-
-Properties
-\layout Standard
-
-Properties are represented with the icalproperty class and its many 
-\begin_inset Quotes eld
-\end_inset 
-
-derived
-\begin_inset Quotes erd
-\end_inset 
-
- classes with on 
-\begin_inset Quotes eld
-\end_inset 
-
-derived
-\begin_inset Quotes erd
-\end_inset 
-
- class per property type in RFC2445.
- Again, there is no actual inheritance relations, but there are clusters
- of routines that make this term useful.
- A property is a container for a single value and a set of parameters.
- 
-\layout Subsubsection
-
-Components 
-\layout Standard
-
-In libical, components are represented with the icalcomponent class.
- Icalcomponent is a container for a set of other components and properties.
-\layout Subsubsection
-
-Values 
-\layout Standard
-
-Values are represented in a similar way to properties; a base class and
- many 
-\begin_inset Quotes eld
-\end_inset 
-
-derived 
-\begin_inset Quotes eld
-\end_inset 
-
- classes.
- A value is essentially a abstract handle on a single fundamental type,
- a structure or a union.
- 
-\layout Subsubsection
-
-Parameters 
-\layout Standard
-
-Parameters are represetned in a similar way to properties, except that they
- contain only one value
-\layout Subsection
-
-Other elements of libical
-\layout Standard
-
-In addition to the core iCal classes, libical has many other types, structures,
- classes that aid in creating and using iCal components.
- 
-\layout Subsubsection
-
-Enumerations and types
-\layout Standard
-
-Libical is strongly typed, soo every component, property, parameter, and
- value type has an enumeration, and some have an associated structure or
- union.
- 
-\layout Subsubsection
-
-The parser
-\layout Standard
-
-The libical parser offers a variety of ways to convert RFC2445 text into
- a libical iinsteral component structure.
- the parser can parse blocks of text as a string, or it can parse lin-by-line.
-\layout Subsubsection
-
-Error objects
-\layout Standard
-
-Libical has a substantial error reporting system for both programming errors
- and component usage errors.
- 
-\layout Subsubsection
-
-Memory Management
-\layout Standard
-
-Since many of libicals interfaces return strings, the library has its own
- memory management system to elimiate the need to free every string returned
- from the libraru.
- 
-\layout Subsubsection
-
-Storage classes
-\layout Standard
-
-The library also offers several classes to store components to flies, memory
- or databases.
- 
-\layout Section
-
-Differences From RFCs 
-\layout Standard
-
-Libical has been designed to follow the standards as closely as possible,
- so that the key objects in the standards are also key objects in the library.
- However, there are a few areas where the specifications are (arguably)
- irregular, and following them exactly would result in an unfriendly interface.
- These deviations make libical easier to use by maintaining a self-similar
- interface.
- 
-\layout Subsection
-
-Pseudo Components 
-\layout Standard
-
-Libical defines components for groups of properties that look and act like
- components, but are not defined as components in the specification.
- XDAYLIGHT and XSTANDARD are notable examples.
- These pseudo components group properties within the VTIMEZONE components.
- For instanace, the timezone properties associated with daylight savings
- time starts with 
-\begin_inset Quotes eld
-\end_inset 
-
-BEGIN:DAYLIGHT
-\begin_inset Quotes erd
-\end_inset 
-
- and ends with 
-\begin_inset Quotes eld
-\end_inset 
-
-END:DAYLIGHT, just like other components, but is not defined as a component
- in RFC2445.
- ( See RFC2445, page 61 ) In Libical,this grouping is represented by the
- XDAYLIGHT component.
- Standard iCAL components all start with the letter 
-\begin_inset Quotes eld
-\end_inset 
-
-V,
-\begin_inset Quotes erd
-\end_inset 
-
- while pseudo components start with
-\begin_inset Quotes erd
-\end_inset 
-
-X.
-\begin_inset Quotes erd
-\end_inset 
-
-
-\layout Standard
-
-There are also pseudo components that are conceptually derived classes of
- VALARM.
- RFC2446 defines what properties may be included in each component, and
- for VALARM, the set of properties it may have depends on the value of the
- ACTION property.
- 
-\layout Standard
-
-For instance, if a VALARM component has an ACTION property with the value
- of 
-\begin_inset Quotes eld
-\end_inset 
-
-AUDIO,
-\begin_inset Quotes erd
-\end_inset 
-
- the component must also have an 
-\begin_inset Quotes eld
-\end_inset 
-
-ATTACH
-\begin_inset Quotes erd
-\end_inset 
-
- property.
- However, if the ACTION value is 
-\begin_inset Quotes eld
-\end_inset 
-
-DISPLAY,
-\begin_inset Quotes erd
-\end_inset 
-
- the component must have a DESCRIPTION property.
- 
-\layout Standard
-
-To handle these various, complex restrictions, libical has pseudo components
- for each type of alarm: XAUDIOALARM, XDISPLAYALARM, XEMAILALARM and XPROCEDUREA
-LARM.
- 
-\layout Subsection
-
-Combined Values 
-\layout Standard
-
-Many values can take more than one type.
- TRIGGER, for instance, can have a value type of with DURATION or of DATE-TIME.
- These multiple types make it difficult to create routines to return the
- value associated with a property.
- 
-\layout Standard
-
-It is natural to have interfaces that would return the value of a property,
- but it is cumbersome for a single routine to return multiple types.
- So, in libical, properties that can have multiple types are given a single
- type that is the union of their RFC2445 types.
- For instance, in libical, the value of the TRIGGER property resolves to
- 
-\noun on 
-struct icaltriggertype
-\noun default 
-.
- This type is a union of a DURATION and a DATE-TIME.
- 
-\layout Subsection
-
-Multi-Valued Properties
-\layout Standard
-
-Some properties, such as CATEGORIES have only one value type, but each CATEGORIE
-S property can have multiple value instances.
- This also results in a cumbersome interface -- CATEGORIES accessors would
- have to return a list while all other accessors returned a single value.
- In libical, all properties have a single value, and multi-valued properties
- are broken down into multiple single valued properties during parsing.
- That is, an input line like, 
-\layout Verbatim
-
-CATEGORIES: work, home
-\layout Standard
-
-becomes in libical's internal representation
-\layout Verbatim
-
-CATEGORIES: work
-\layout Verbatim
-
-CATEGORIES: home
-\layout Standard
-
-Oddly, RFC2445 allows some multi-valued properties ( like FREEBUSY ) to
- exist as both a multi-values property and as multiple single value properties,
- while others ( like CATEGORIES ) can only exist as single multi-valued
- properties.
- This makes the internal representation for CATEGORIES illegal.
- However when you convert a component to a string, the library will collect
- all of the CATEGORIES properties into one.
- 
-\layout Section
-
-Using libical
-\layout Subsection
-
-Creating Components 
-\layout Standard
-
-There are three ways to create components in Libical: creating individual
- objects and assembling them, building entire objects in massive vaargs
- calls, and parsing a text file containing iCalendar data.
- 
-\layout Subsubsection
-
-Constructor Interfaces 
-\layout Standard
-
-Using constructor interfaces, you create each of the objects separately
- and then assemble them in to components: 
-\layout Verbatim
-
-icalcomponent *event;
-\layout Verbatim
-
-icalproperty *prop;
-\layout Verbatim
-
-icalparameter *param;
-\layout Verbatim
-
-struct icaltimetype atime;
-\layout Verbatim
-
-event = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-\layout Verbatim
-
-prop = icalproperty_new_dtstamp(atime) ;
-\layout Verbatim
-
-icalcomponent_add_property(event, prop);
-\layout Verbatim
-
-prop = icalproperty_new_uid(''guid-1.host1.com'') );
-\layout Verbatim
-
-icalcomponent_add_property(event,prop);
-\layout Verbatim
-
-prop=icalproperty_new_organizer(''mrbig@host.com''); 
-\layout Verbatim
-
-param = icalparameter_new_role(ICAL_ROLE_CHAIR) 
-\layout Verbatim
-
-icalproperty_add_parameter(prop, param);
-\layout Verbatim
-
-icalcomponent_add_property(event,prop);
-\layout Standard
-
-Notice that libical uses a semi-object-oriented style of interface.
- Most things you work with are objects, that are instantiated with a constructor
- that has 
-\begin_inset Quotes eld
-\end_inset 
-
-new
-\begin_inset Quotes erd
-\end_inset 
-
- in the name.
- Also note that, other than the object reference, most structure data is
- passed in to libical routines by value.
- Libical has some complex but very regular memory handling rules.
- These are detailed in section 
-\begin_inset LatexCommand \ref{sec:memory}
-
-\end_inset 
-
-.
-\layout Standard
-
-If any of the constructors fail, they will return 0.
- If you try to insert 0 into a property or component, or use a zero-valued
- object reference, libical will either silently ignore the error or will
- abort with an error message.
- This behavior is controlled by a compile time flag (ICAL_ERRORS_ARE_FATAL),
- and will abort by default.
- 
-\layout Subsubsection
-
-vaargs Constructors 
-\layout Standard
-
-There is another way to create complex components, which is arguably more
- elegant, if you are not horrified by varargs.
- The varargs constructor interface allows you to create intricate components
- in a single block of code.
- Here is the previous examples in the vaargs style.
- 
-\layout Verbatim
-
-    calendar = 
-\layout Verbatim
-
-        icalcomponent_vanew(
-\layout Verbatim
-
-            ICAL_VCALENDAR_COMPONENT,
-\layout Verbatim
-
-            icalproperty_new_version(''2.0''),
-\layout Verbatim
-
-            icalproperty_new_prodid(
-\layout Verbatim
-
-                 ''-//RDU Software//NONSGML HandCal//EN''),
-\layout Verbatim
-
-            icalcomponent_vanew(
-\layout Verbatim
-
-                ICAL_VEVENT_COMPONENT,
-\layout Verbatim
-
-                icalproperty_new_dtstamp(atime),
-\layout Verbatim
-
-                icalproperty_new_uid(''guid-1.host1.com''),
-\layout Verbatim
-
-                icalproperty_vanew_organizer(
-\layout Verbatim
-
-                    ''mrbig@host.com''),
-\layout Verbatim
-
-                    icalparameter_new_role(ICAL_ROLE_CHAIR),
-\layout Verbatim
-
-                    0
-\layout Verbatim
-
-                    ),
-\layout Verbatim
-
-                icalproperty_vanew_attendee(
-\layout Verbatim
-
-                    ''employee-A@host.com'',
-\layout Verbatim
-
-                    icalparameter_new_role(
-\layout Verbatim
-
-                        ICAL_ROLE_REQPARTICIPANT),
-\layout Verbatim
-
-                    icalparameter_new_rsvp(1),
-\layout Verbatim
-
-                    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-\layout Verbatim
-
-                    0
-\layout Verbatim
-
-                    ),
-\layout Verbatim
-
-                icalproperty_new_location(
-\layout Verbatim
-
-                   "1CP Conference Room 4350"),
-\layout Verbatim
-
-                0
-\layout Verbatim
-
-                ),
-\layout Verbatim
-
-            0
-\layout Verbatim
-
-            );
-\layout Standard
-
-This form is similar to the constructor form , except that the constructors
- have 
-\begin_inset Quotes eld
-\end_inset 
-
-vanew
-\begin_inset Quotes erd
-\end_inset 
-
- instead of 
-\begin_inset Quotes eld
-\end_inset 
-
-new
-\begin_inset Quotes erd
-\end_inset 
-
- in the name.
- The arguments are similar too, except that the component constructor can
- have a list of properties, and the property constructor can have a list
- of parameters.
- Be sure to terminate every list with a '0', or your code will crash, if
- you are lucky.
- 
-\layout Subsubsection
-
-Parsing Text Files 
-\layout Standard
-
-The final way to create components will probably be the most common; you
- can create components from RFC2445 compliant text.
- If you have the string in memory, use
-\layout Verbatim
-
-icalcomponent* icalparser_parse_string(char* str);
-\layout Standard
-
-If the string contains only one component, the parser will return the component
- in libical form.
- If the string contains multiple components, the multiple components will
- be returned as the children of an ICAL_XROOT_COMPONENT component.
- 
-\layout Standard
-
-Parsing a whole string may seem wasteful if you want to pull a large component
- off of the network or from a file; you may prefer to parse the component
- line by line.
- This is possible too by using:
-\layout Verbatim
-
-icalparser* icalparser_new(); 
-\layout Verbatim
-
-void icalparser_free(icalparser* parser);
-\layout Verbatim
-
-icalparser_get_line(parser,read_stream);
-\layout Verbatim
-
-icalparser_add_line(parser,line);
-\layout Verbatim
-
-icalparser_set_gen_data(parser,stream)
-\layout Standard
-
-These routines will construct a parser object to which you can add lines
- of input and retrieve any components that the parser creates from the input.
- These routines work by specifing an adaptor routine to get string data
- from a source.
- For an example:
-\layout Verbatim
-
-char* read_stream(char *s, size_t size, void *d) 
-\layout Verbatim
-
-{ 
-\layout Verbatim
-
-  char *c = fgets(s,size, (FILE*)d);
-\layout Verbatim
-
-  return c;
-\layout Verbatim
-
-}
-\layout Verbatim
-
-main() {
-\layout Verbatim
-
-  char* line; 
-\layout Verbatim
-
-  icalcomponent *c; 
-\layout Verbatim
-
-  icalparser *parser = icalparser_new();
-\layout Verbatim
-
-  FILE* stream = fopen(argv[1],"r");
-\layout Verbatim
-
-  icalparser_set_gen_data(parser,stream);
-\layout Verbatim
-
-  do{ 
-\layout Verbatim
-
-    line = icalparser_get_line(parser,read_stream); 
-\layout Verbatim
-
-    c = icalparser_add_line(parser,line);
-\layout Verbatim
-
-    if (c != 0){ 
-\layout Verbatim
-
-     printf("%s",icalcomponent_as_ical_string(c));     
-\layout Verbatim
-
-     icalparser_claim(parser); 
-\layout Verbatim
-
-     printf("
-\backslash 
-n---------------
-\backslash 
-n"); 
-\layout Verbatim
-
-     icalcomponent_free(c); 
-\layout Verbatim
-
-   }
-\layout Verbatim
-
-  } while ( line != 0);
-\layout Verbatim
-
-}
-\layout Standard
-
-The parser object parameterizes the routine used to get input lines with
- icalparser_set_gen_data() and
-\emph on 
- 
-\emph default 
-icalparser_get_line().
- In this example, the routine read_stream() will fetch the next line from
- a stream, with the stream passed in as the void* parameter d.
- The parser calls read_stream() from icalparser_get_line(), but it also
- needs to know what stream to use.
- This is set by the call to icalparser_set_gen_data().
- By using a different routine for read_stream or passing in different data
- with icalparser_set_gen_data, you can connect to any data source.
- 
-\layout Standard
-
-Using the same mechanism, other implementations could read from memory buffers,
- sockets or other interfaces.
- 
-\layout Standard
-
-Since the example code is a very common way to use the parser, there is
- a convenience routine;
-\layout Verbatim
-
-icalcomponent* icalparser_parse(icalparser *parser, 
-\layout Verbatim
-
-               char* (*line_gen_func)(char *s, size_t size,  void* d))
-\layout Standard
-
-To use this routine, you still must construct the parser object and pass
- in a reference to a line reading routine.
- If the parser can create a single component from the input, it will return
- a pointer to the newly constructed component.
- If the parser can construct multiple components from the input, it will
- return a reference to an XROOT component ( of type ICAL_XROOT_COMPONENT.)
- This XROOT component will hold all of the components constructed from the
- input as children.
- 
-\layout Subsection
-
-Accessing Components 
-\layout Standard
-
-Given a reference to a component, you probably will want to access the propertie
-s, parameters and values inside.
- Libical interfaces let you find sub-component, add and remove sub-components,
- and do the same three operations on properties.
- 
-\layout Subsubsection
-
-Finding Components 
-\layout Standard
-
-To find a sub-component of a component, use: 
-\layout Verbatim
-
-icalcomponent* icalcomponent_get_first_component(
-\layout Verbatim
-
-                                   icalcomponent* component, 
-\layout Verbatim
-
-                                   icalcomponent_kind kind);
-\layout Standard
-
-This routine will return a reference to the first component of the type
- 'kind.' The key kind values, listed in icalenums.h are: 
-\layout Verbatim
-
-ICAL_ANY_COMPONENT
-\layout Verbatim
-
-ICAL_VEVENT_COMPONENT
-\layout Verbatim
-
-ICAL_VTODO_COMPONENT
-\layout Verbatim
-
-ICAL_VJOURNAL_COMPONENT
-\layout Verbatim
-
-ICAL_VCALENDAR_COMPONENT 
-\layout Verbatim
-
-ICAL_VFREEBUSY_COMPONENT
-\layout Verbatim
-
-ICAL_VALARM_COMPONENT
-\layout Standard
-
-These are only the most common components; there are many more listed in
- icalenums.h.
-\layout Standard
-
-As you might guess, if there is more than one subcomponent of the type you
- have chosen, this routine will return only the first.
- to get at the others, you need to iterate through the component.
- 
-\layout Subsubsection
-
-Iterating Through Components
-\layout Standard
-
-Iteration requires a second routine to get the next subcomponent after the
- first:
-\layout Verbatim
-
-icalcomponent* icalcomponent_get_next_component(
-\layout Verbatim
-
-               icalcomponent* component, 
-\layout Verbatim
-
-               icalcomponent_kind kind);
-\layout Standard
-
-With the 'first' and 'next' routines, you can create a for loop to iterate
- through all of a components subcomponents
-\layout Verbatim
-
-  for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT); 
-\layout Verbatim
-
-         c != 0; 
-\layout Verbatim
-
- c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT))
-\layout Verbatim
-
-{ 
-\layout Verbatim
-
-      do_something(c);
-\layout Verbatim
-
-}
-\layout Standard
-
-This code bit wil iterate through all of the subcomponents in 'comp' but
- you can select a specific type of component by changing ICAL_ANY_COMPONENT
- to another component type.
-\layout Subsubsection
-
-Using Component Iterators
-\layout Standard
-
-The iteration model in the previous section requires the component to keep
- the state of the iteration.
- So, you could not use this model to perform a sorting operations, since
- you'd need two iterators and there is only space for one.
- If you ever call icalcomponent_get_first_component() when an iteration
- is in progress, the pointer will be reset to the beginning.
- 
-\layout Standard
-
-To solve this problem, there are also external iterators for components.
- The routines associated with these external iterators are: 
-\layout Verbatim
-
-icalcompiter icalcomponent_begin_component(icalcomponent* component, icalcompone
-nt_kind kind);
-\layout Verbatim
-
-icalcompiter icalcomponent_end_component(icalcomponent* component, icalcomponent
-_kind kind);
-\layout Verbatim
-
-icalcomponent* icalcompiter_next(icalcompiter* i); 
-\layout Verbatim
-
-icalcomponent* icalcompiter_prior(icalcompiter* i); 
-\layout Verbatim
-
-icalcomponent* icalcompiter_deref(icalcompiter* i);
-\layout Standard
-
-The _begin_() and _end_() routines return a new iterator that points to
- the beginning and ending of the list of subcomponent for the given component,
- and the kind argument works like the kind argument for internal iterators.
- 
-\layout Standard
-
-After creating an iterators, use _next_() and _prior_() to step forward
- and backward through the list and get the component that the iterator points
- to, and use _deref() to return the component that the iterator points to
- without moving the iterator.
- All routines will return 0 when they move to point off the end of the list.
- 
-\layout Standard
-
-Here is an example of a loop using these routines: 
-\layout Verbatim
-
-for(
-\layout Verbatim
-
-   i = icalcomponent_begin_component(impl->cluster,ICAL_ANY_COMPONENT);
- 
-\layout Verbatim
-
-   icalcompiter_deref(&i)!= 0; 
-\layout Verbatim
-
-   icalcompiter_next(&i)
-\layout Verbatim
-
-) { 
-\layout Verbatim
-
-      icalcomponent *this = icalcompiter_deref(&i);
-\layout Verbatim
-
-}
-\layout Subsubsection
-
-Removing Components 
-\layout Standard
-
-Removing an element from a list while iterating through the list with the
- internal iterators can cause problems, since you will probably be removing
- the element that the internal iterator points to.
- The _remove() routine will keep the iterator valid by moving it to the
- next component, but in a normal loop, this will result in two advances
- per iteration, and you will remove only every other component.
-  To avoid the problem, you will need to step the iterator ahead of the
- element you are going to remove, like this:
-\layout Verbatim
-
-for(c = icalcomponent_get_first_component(parent_comp,ICAL_ANY_COMPONENT);
- 
-\layout Verbatim
-
-       c != 0; 
-\layout Verbatim
-
-       c = next
-\layout Verbatim
-
-{     
-\layout Verbatim
-
-    next = icalcomponent_get_next_component(parent_comp,ICAL_ANY_COMPONENT);
-\layout Verbatim
-
-    icalcomponent_remove_component(parent_comp,c); 
-\layout Verbatim
-
-}
-\layout Standard
-
-Another way to remove components is to rely on the side effect of icalcomponent_
-remove_component: if component iterator in the parent component is pointing
- to the child that will be removed, it will move the iterator to the component
- after the child.
- The following code will exploit this behavior: 
-\layout Verbatim
-
-icalcomponent_get_first_component(parent_comp,ICAL_VEVENT_COMPONENT);
-\layout Verbatim
-
-while((c=icalcomponent_get_current_component(c)) != 0 ){ 
-\layout Verbatim
-
-   if(icalcomponent_isa(c) == ICAL_VEVENT_COMPONENT){ 
-\layout Verbatim
-
-      icalcomponent_remove_component(parent_comp,inner);
-\layout Verbatim
-
-   } else { 
-\layout Verbatim
-
-      icalcomponent_get_next_component(parent_comp,ICAL_VEVENT_COMPONENT);
- 
-\layout Verbatim
-
-   } 
-\layout Verbatim
-
-}
-\layout Subsubsection
-
-Working with properties and parameters
-\layout Standard
-
-Finding, iterating and removing properties works the same as it does for
- components, using the property-specific or parameter-specific interfaces:
- 
-\layout Verbatim
-
-icalproperty* icalcomponent_get_first_property(
-\layout Verbatim
-
-     icalcomponent* component, 
-\layout Verbatim
-
-     icalproperty_kind kind); 
-\layout Verbatim
-
-icalproperty* icalcomponent_get_next_property(
-\layout Verbatim
-
-     icalcomponent* component, 
-\layout Verbatim
-
-     icalproperty_kind kind);
-\layout Verbatim
-
-void icalcomponent_add_property(
-\layout Verbatim
-
-     icalcomponent* component, 
-\layout Verbatim
-
-     icalproperty* property);
-\layout Verbatim
-
-void icalcomponent_remove_property(
-\layout Verbatim
-
-     icalcomponent* component, 
-\layout Verbatim
-
-     icalproperty* property);
-\layout Standard
-
-For parameters:
-\layout Verbatim
-
-icalparameter* icalproperty_get_first_parameter(
-\layout Verbatim
-
-     icalproperty* prop, 
-\layout Verbatim
-
-     icalparameter_kind kind); 
-\layout Verbatim
-
-icalparameter* icalproperty_get_next_parameter(
-\layout Verbatim
-
-     icalproperty* prop, 
-\layout Verbatim
-
-     icalparameter_kind kind);
-\layout Verbatim
-
-void icalproperty_add_parameter(
-\layout Verbatim
-
-     icalproperty* prop,
-\layout Verbatim
-
-     icalparameter* parameter);
-\layout Verbatim
-
-void icalproperty_remove_parameter(
-\layout Verbatim
-
-     icalproperty* prop, 
-\layout Verbatim
-
-     icalparameter_kind kind);
-\layout Standard
-
-Note that since there should be only one parameter of each type in a property,
- you will rarely need to use icalparameter_get_nect_paameter.
-\layout Subsubsection
-
-Working with values
-\layout Standard
-
-Values are typically part of a property, although they can exist on their
- own.
- You can manipulate them either as part of the property or independently.
-\layout Standard
-
-The most common way to work with values to is to manipulate them from they
- properties that contain them.
- This involves fewer routine calls and intermediate variables than working
- with them independently, and it is type-safe.
- 
-\layout Standard
-
-For each property, there are a _get_ and a _set_ routine that access the
- internal value.
- For instanace, for the UID property, the routines are: 
-\layout Verbatim
-
-void icalproperty_set_uid(icalproperty* prop, const char* v)
-\layout Verbatim
-
-const char* icalproperty_get_uid(icalproperty* prop)
-\layout Standard
-
-For multi-valued properties, like ATTACH, the value type is usually a struct
- or union that holds both possible types.
- 
-\layout Standard
-
-If you want to work with the underlying value object, you can get and set
- it with:
-\layout Verbatim
-
-icalvalue* icalproperty_get_value (icalproperty* prop)
-\layout Verbatim
-
-void icalproperty_set_value(icalproperty* prop, icalvalue* value);
-\layout Standard
-
-Icalproperty_get_value() will return a reference that you can manipulate
- with other icalvalue routines.
- Most of the time, you will have to know what the type of the value is.
- For instance, if you know that the value is a DATETIME type, you can manipulate
- it with: 
-\layout Verbatim
-
-struct icaltimetype icalvalue_get_datetime(icalvalue* value); 
-\layout Verbatim
-
-void icalvalue_set_datetime(icalvalue* value, struct icaltimetype v);
-\layout Standard
-
-When working with an extension property or value (and X-PROPERTY or a property
- that has the parameter VALUE=x-name ) the value type is always a string.
- To get and set the value, use: 
-\layout Verbatim
-
-void icalproperty_set_x(icalproperty* prop, char* v); 
-\layout Verbatim
-
-char* icalproperty_get_x(icalproperty* prop);
-\layout Standard
-
-All X properties have the type of ICAL_X_PROPERTY, so you will need these
- routines to get and set the name of the property:
-\layout Verbatim
-
-char* icalproperty_get_x_name(icalproperty* prop)
-\layout Verbatim
-
-void icalproperty_set_x_name(icalproperty* prop, char* name);
-\layout Subsubsection
-
-Checking Component Validity
-\layout Standard
-
-RFC 2446 defines rules for what properties must exist in a component to
- be used for transferring scheduling data.
- Most of these rules relate to the existence of properties relative to the
- METHOD property, which declares what operation a remote receiver should
- use to process a component.
- For instance, if the METHOD is REQUEST and the component is a VEVENT, the
- sender is probably asking the receiver to join in a meeting.
- In this case, RFC2446 says that the component must specify a start time
- (DTSTART) and list the receiver as an attendee (ATTENDEE).
- 
-\layout Standard
-
-Libical can check these restrictions with the routine:
-\layout Verbatim
-
-int icalrestriction_check(icalcomponent* comp);
-\layout Standard
-
-This routine returns 0 if the component does not pass RFC2446 restrictions,
- or if the component is malformed.
- The component you pass in 
-\emph on 
-must
-\emph default 
- be a VCALENDAR, with one or more children, like the examples in RFC2446.
- 
-\layout Standard
-
-When this routine runs, it will insert new properties into the component
- to indicate any errors it finds.
- See section 6.5.3, X-LIC-ERROR for more information about these error properties.
- 
-\layout Subsubsection
-
-Converting Components to Text
-\layout Standard
-
-To create an RFC2445 compliant text representation of an object, use one
- of the *_as_ical_string() routines:
-\layout Verbatim
-
-char* icalcomponent_as_ical_string (icalcomponent* component)
-\layout Verbatim
-
-char* icalproperty_as_ical_string (icalproperty* property)
-\layout Verbatim
-
-char* icalparameter_as_ical_string (icalparameter* parameter)
-\layout Verbatim
-
-char* icalvalue_as_ical_string (icalvalue* value)
-\layout Standard
-
-In most cases, you will only use icalcomponent_as_ical_string (), since
- it will cascade and convert all of the parameters, properties and values
- that are attached to the root component.
-\layout Standard
-
-Icalproperty_as_ical_string() will terminate each line with the RFC2445
- specified line terminator 
-\begin_inset Quotes eld
-\end_inset 
-
-
-\backslash 
-
-\backslash 
-n
-\begin_inset Quotes erd
-\end_inset 
-
- However, if you compile with the symbol ICAL_UNIX_NEWLINE undefined, (
- it is defined by default) it will terminate lines with 
-\begin_inset Quotes eld
-\end_inset 
-
-
-\backslash 
-
-\backslash 
-n
-\backslash 
-
-\backslash 
-r
-\begin_inset Quotes erd
-\end_inset 
-
-
-\layout Standard
-
-Remember that the string returned by these routines is owned by the library,
- and will eventually be re-written.
- You should copy it if you want to preserve it.
- 
-\layout Subsection
-
-Time
-\layout Subsubsection
-
-Time structure
-\layout Standard
-
-LIbical defines it's own time structure for storing all dates and times.
- It would have been nice to re-use the C library's 
-\emph on 
-struct tm, 
-\emph default 
-but that structure does not differentiate between dates and times, and between
- local time and UTC.
- The libical structure is:
-\layout Verbatim
-
-struct icaltimetype { 
-\layout Verbatim
-
-  int year; 
-\layout Verbatim
-
-  int month; 
-\layout Verbatim
-
-  int day; 
-\layout Verbatim
-
-  int hour; 
-\layout Verbatim
-
-  int minute; 
-\layout Verbatim
-
-  int second;
-\layout Verbatim
-
-  int is_utc; /* 1-> time is in UTC timezone */
-\layout Verbatim
-
-  int is_date; /* 1 -> interpret this as date.
- */ }; 
-\layout Standard
-
-The year, month, day, hour, minute and second fields hold the broken-out
- time values.
- The is_utc field distinguishes between times in UTC and a local time zone.
- The is_date field indicates if the time should be interpreted only as a
- date.
- If it is a date, the hour, minute and second fields are assumed to be zero,
- regardless of their actual vaules.
- 
-\layout Subsubsection
-
-Creating time structures
-\layout Standard
-
-There are several ways to create a new icaltimetype structure: 
-\layout Verbatim
-
-struct icaltimetype icaltime_from_string(const char* str);
-\layout Verbatim
-
-struct icaltimetype icaltime_from_timet(time_t v, int is_date);
-\layout Verbatim
-
-struct icaltimetype icaltime_from_int(int v, int is_date, int is_utc);
-\layout Standard
-
-Icaltime_from_string takes any RFC2445 compliant time string: 
-\layout Verbatim
-
-struct icaltimetype tt = icaltime_from_string("19970101T103000");
-\layout Standard
-
-Icaltime_from_timet takes a timet value, representing seconds past the POSIX
- epoch, and a flag to indicate if the time is a date.
- Dates have an identical structure to a time, but the time portion ( hours,
- minuts and seconds ) is always 00:00:00.
- Dates act differently in sorting an comparision, and they have a different
- string representation in RFC2445.
- 
-\layout Standard
-
-The icaltime_from_int is like icaltime_from_timet, but with an arbitrary
- epoch.
- This routine was a mistake and is deprecated.
- 
-\layout Subsubsection
-
-Time manipulating routines
-\layout Standard
-
-The null time value is used to indicate that the data in the structure is
- not a valid time.
-\layout Verbatim
-
-struct icaltimetype icaltime_null_time(void);
-\layout Verbatim
-
-int icaltime_is_null_time(struct icaltimetype t);
-\layout Standard
-
-It is sensible for the broken-out time fields to contain values that are
- not permitted in an ISO compliant time string.
- For instance, the seconds field can hold values greater than 59, and the
- hours field can hold values larger than 24.
- The excessive values will be rolled over into the next larger field when
- the structure is normalized.
- 
-\layout Verbatim
-
-struct icaltimetype icaltime_normalize(struct icaltimetype t);
-\layout Standard
-
-Normalizing allows you to do arithmetic operations on time values.
- 
-\layout Verbatim
-
-struct icaltimetype tt = icaltime_from_string(
-\begin_inset Quotes eld
-\end_inset 
-
-19970101T103000
-\begin_inset Quotes erd
-\end_inset 
-
-);
-\layout Verbatim
-
-tt.days +=3 
-\layout Verbatim
-
-tt.second += 70;
-\layout Verbatim
-
-tt = icaltime_normalize(tt);
-\layout Standard
-
-There are several routines to get the day of the week or month, etc, from
- a time structure.
-\layout Verbatim
-
-short icaltime_day_of_year(struct icaltimetype t); 
-\layout Verbatim
-
-struct icaltimetype icaltime_from_day_of_year(short doy, short year);
-\layout Verbatim
-
-short icaltime_day_of_week(struct icaltimetype t); 
-\layout Verbatim
-
-short icaltime_start_doy_of_week(struct icaltimetype t);
-\layout Verbatim
-
-short icaltime_week_number(short day_of_month, short month, short year);
-\layout Verbatim
-
-struct icaltimetype icaltime_from_week_number(short week_number, short year);
-\layout Verbatim
-
-short icaltime_days_in_month(short month,short year);
-\layout Standard
-
-Two routines convert time structures to and from the number of seconds since
- the POSIX epoch.
- The is_date field indicates whether or not the hour, minute and second
- fields should be used in the conversion.
-\layout Verbatim
-
-struct icaltimetype icaltime_from_timet(time_t v, int is_date); 
-\layout Verbatim
-
-time_t icaltime_as_timet(struct icaltimetype);
-\layout Standard
-
-The compare routine works exactly like strcmp, but on time structures.
- 
-\layout Verbatim
-
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
-\layout Standard
-
-The following routines convert between UTC and a named timezone.
- The tzid field must be a timezone name from the Olsen database, such as
- 
-\begin_inset Quotes eld
-\end_inset 
-
-America/Los_Angeles.
-\begin_inset Quotes erd
-\end_inset 
-
- 
-\layout Standard
-
-The utc_offset routine returns the offset of the named time zone from UTC,
- in seconds.
- 
-\layout Standard
-
-The tt parameter in the following routines indicates the date on which the
- conversion should be made.
- The tt parameter is necessary because timezones have many different rules
- for when daylight savings time is used, and these rules can change over
- time.
- So, for a single timezone one year may have daylight savings time on March
- 15, but for other years March 15 may be standard time, and some years may
- have standard time all year.
- 
-\layout Verbatim
-
-int icaltime_utc_offset(struct icaltimetype tt, char* tzid);
-\layout Verbatim
-
-int icaltime_local_utc_offset();
-\layout Verbatim
-
-struct icaltimetype icaltime_as_utc(struct icaltimetype tt,char* tzid);
-\layout Verbatim
-
-struct icaltimetype icaltime_as_zone(struct icaltimetype tt,char* tzid);
-\layout Verbatim
-
-struct icaltimetype icaltime_as_local(struct icaltimetype tt);
-\layout Subsection
-
-Storing Objects
-\layout Standard
-
-The libical distribution includes a separate library, libicalss, that allows
- you to store iCal component data to disk in a variety of ways.
- This library also includes code to implement the CSTP protocol of CAP and
- has some routines for deciphering incomming messages.
- 
-\layout Standard
-
-The file storage routines are organized in an inheritance heirarchy that
- is rooted in icalset, with the derived class icalfileset and icaldirset.
- Icalfileset stores components to a file, while icaldirset stores components
- to multiple files, one per month based on DTSTAMP.
- Other storages classess, for storage to a heap or a mysql database are
- planned for the future.
- 
-\layout Standard
-
-All of the icalset derived classes have the same interface: 
-\layout Verbatim
-
-\layout Verbatim
-
-icaldirset* icaldirset_new(const char* path);
-\layout Verbatim
-
-void icaldirset_free(icaldirset* store);
-\layout Verbatim
-
-const char* icaldirset_path(icaldirset* store);
-\layout Verbatim
-
-void icaldirset_mark(icaldirset* store);
-\layout Verbatim
-
-icalerrorenum icaldirset_commit(icaldirset* store); 
-\layout Verbatim
-
-icalerrorenum icaldirset_add_component(icaldirset* store, icalcomponent*
- comp);
-\layout Verbatim
-
-icalerrorenum icaldirset_remove_component(icaldirset* store, icalcomponent*
- comp);
-\layout Verbatim
-
-int icaldirset_count_components(icaldirset* store, icalcomponent_kind kind);
-\layout Verbatim
-
-icalerrorenum icaldirset_select(icaldirset* store, icalcomponent* gauge);
-\layout Verbatim
-
-void icaldirset_clear(icaldirset* store);
-\layout Verbatim
-
-icalcomponent* icaldirset_fetch(icaldirset* store, const char* uid);
-\layout Verbatim
-
-int icaldirset_has_uid(icaldirset* store, const char* uid);
-\layout Verbatim
-
-icalcomponent* icaldirset_fetch_match(icaldirset* set, icalcomponent *c);
-\layout Verbatim
-
-icalerrorenum icaldirset_modify(icaldirset* store, icalcomponent *oldc,
- icalcomponent *newc);
-\layout Verbatim
-
-icalcomponent* icaldirset_get_current_component(icaldirset* store);
-\layout Verbatim
-
-icalcomponent* icaldirset_get_first_component(icaldirset* store);
-\layout Verbatim
-
-icalcomponent* icaldirset_get_next_component(icaldirset* store);
-\layout Subsubsection
-
-Creating a new set
-\layout Standard
-
-You can create a new set from either the base class or the direved class.
- From the base class use one of:
-\layout Verbatim
-
-icalset* icalset_new_file(const char* path); 
-\layout Verbatim
-
-icalset* icalset_new_dir(const char* path); 
-\layout Verbatim
-
-icalset* icalset_new_heap(void); 
-\layout Verbatim
-
-icalset* icalset_new_mysql(const char* path);
-\layout Standard
-
-You can also create a new set based on the derived class, For instance,
- with icalfileset: 
-\layout Verbatim
-
-icalfileset* icalfileset_new(const char* path);
-\layout Verbatim
-
-icalfileset* icalfileset_new_open(const char* path, int flags, mode_t mode);
-\layout Standard
-
-Icaset_new_file is identical to icalfileset_new.
- BOth routines will open an existing file for readinga and writing, or create
- a new file if it does not exist.
- Icalfilset_new_open takes the same arguments as the open() system routine
- and behaves in the same way.
- 
-\layout Standard
-
-The icalset and icalfilset objects are somewhat interchangable -- you can
- use an icalfileset* as an argument to any of the icalset routines.
-\layout Standard
-
-The following examples will all use icalfileset routines; using the other
- icalset derived classess will be similar.
- 
-\layout Subsubsection
-
-Adding, Finding and Removing Components 
-\layout Standard
-
-To add components to a set, use: 
-\layout Verbatim
-
-icalerrorenum icalfileset_add_component(icalfileset* cluster, icalcomponent*
- child);
-\layout Standard
-
-The fileset keeps an inmemory copy of the components, and this set must
- be written back to the file ocassionally.
- There are two routines to manage this: 
-\layout Verbatim
-
-void icalfileset_mark(icalfileset* cluster); 
-\layout Verbatim
-
-icalerrorenum icalfileset_commit(icalfileset* cluster);
-\layout Standard
-
-Icalfileset_mark indicates that the in-memory components have changed.
- Calling the _add_component routine will call _mark automatically, but you
- may need to call it yourself if you have made a change to an existing component.
- The _commit routine writes the data base to disk, but only if it is marked.
- The _commit routine is called automatically when the icalfileset is freed.
- 
-\layout Standard
-
-To iterate through the components in a set, use: 
-\layout Verbatim
-
-icalcomponent* icalfileset_get_first_component(icalfileset* cluster); 
-\layout Verbatim
-
-icalcomponent* icalfileset_get_next_component(icalfileset* cluster);
-\layout Verbatim
-
-icalcomponent* icalfileset_get_current_component (icalfileset* cluster);
-  
-\layout Standard
-
-These routines work like the corresponding routines from icalcomponent,
- except that their output is filtered through a gauge.
- A gauge is a test for the properties within a components; only components
- that pass the test are returned.
- A gauge can be constructed from a MINSQL string with:
-\layout Verbatim
-
-icalgauge* icalgauge_new_from_sql(char* sql);
-\layout Standard
-
-Then, you can add the gauge to the set with : 
-\layout Verbatim
-
-icalerrorenum icalfileset_select(icalfileset* store, icalgauge* gauge);
-\layout Standard
-
-Here is an example that puts all of these routines together: 
-\layout Verbatim
-
-
-\latex no_latex 
-void test_fileset()
-\layout Verbatim
-
-
-\latex no_latex 
-{
-\layout Verbatim
-
-
-\latex no_latex 
-    icalfileset *fs;
-\layout Verbatim
-
-
-\latex no_latex 
-    icalcomponent *c;
-\layout Verbatim
-
-
-\latex no_latex 
-    int i;
-\layout Verbatim
-
-
-\latex no_latex 
-    char *path = "test_fileset.ics";
-\layout Verbatim
-
-
-\latex no_latex 
-    icalgauge  *g = icalgauge_new_from_sql(
-\layout Verbatim
-
-
-\latex no_latex 
-        "SELECT * FROM VEVENT WHERE DTSTART > '20000103T120000Z' AND DTSTART
- <= '20000106T120000Z'");
-\layout Verbatim
-
-
-\latex no_latex 
- 
-\layout Verbatim
-
-    
-\latex no_latex 
-fs = icalfileset_new(path);
-\layout Verbatim
-
-  
-\layout Verbatim
-
-    
-\latex no_latex 
-for (i = 0; i!= 10; i++){
-\layout Verbatim
-
-
-\latex no_latex 
-        c = make_component(i);
-\latex default 
- /* Make a new component where DTSTART has month of i */
-\layout Verbatim
-
-
-\latex no_latex 
-        icalfileset_add_component(fs,c);
-\layout Verbatim
-
-
-\latex no_latex 
-    }
-\layout Verbatim
-
-\layout Verbatim
-
-
-\latex no_latex 
-    icalfileset_commit(fs);
-\latex default 
- /* Write to disk */
-\layout Verbatim
-
-\layout Verbatim
-
-
-\latex no_latex 
-    icalfileset_select(fs,g);
-\latex default 
- /* Set the gauge to filter components */
-\layout Verbatim
-
-
-\latex no_latex 
- 
-\layout Verbatim
-
-
-\latex no_latex 
-    for (c = icalfileset_get_first_component(fs);
-\layout Verbatim
-
-
-\latex no_latex 
-         c != 0;
-\layout Verbatim
-
-
-\latex no_latex 
-         c = icalfileset_get_next_component(fs)){
-\layout Verbatim
-
-
-\latex no_latex 
-        struct icaltimetype t = icalcomponent_get_dtstart(c);
-\layout Verbatim
-
-
-\latex no_latex 
- 
-\layout Verbatim
-
-
-\latex no_latex 
-        printf("%s
-\backslash 
-n",icaltime_as_ctime(t));
-\layout Verbatim
-
-
-\latex no_latex 
-    }
-\layout Verbatim
-
-    
-\latex no_latex 
-icalfileset_free(fs);
-\layout Verbatim
-
-
-\latex no_latex 
-}
-\layout Subsubsection
-
-Other routines
-\layout Standard
-
-There are several other routines in the icalset interface, but they not
- fully implemented yet.
- 
-\layout Subsection
-
-
-\begin_inset LatexCommand \label{sec:memory}
-
-\end_inset 
-
-Memory Management 
-\layout Standard
-
-Libical relies heavily on dynamic allocation for both the core objects and
- for the strings used to hold values.
- Some of this memory the library caller owns and must free, and some of
- the memory is managed by the library.
- Here is a summary of the memory rules.
- 
-\layout Description
-
-1) If the function name has "new" in it, the caller gets control of the
- memory.
- ( such as icalcomponent_new(), or icalproperty_new_clone() ) 
-\layout Description
-
-2) If you got the memory from a routine with new in it, you must call the
- corresponding *_free routine to free the memory.
- ( Use icalcomponent_free() to free objects created with icalcomponent_new())
- 
-\layout Description
-
-3) If the function name has "add" in it, the caller is transferring control
- of the memory to the routine.
- ( icalproperty_add_parameter() )
-\layout Description
-
-4) If the function name has "remove" in it, the caller passes in a pointer
- to an object and after the call returns, the caller owns the object.
- So, before you call icalcomponent_remove_property(comp,foo), you do not
- own "foo" and after the call returns, you do.
- 
-\layout Description
-
-5) If the routine returns a string, libical owns the memory and will put
- it on a ring buffer to reclaim later.
- For example, icalcomponent_as_ical_string().
- You'd better strdup() it if you want to keep it, and you don't have to
- delete it.
- 
-\layout Subsection
-
-Error Handling
-\layout Standard
-
-Libical has several error handling mechanisms for the various types of programmi
-ng, semantic and syntactic errors you may encounter.
-\layout Subsubsection
-
-Return values
-\layout Standard
-
-Many library routines signal errors through their return values.
- All routines that return a pointer, such as icalcomponent_new(), will return
- 0 ( zero ) on a fatal error.
- Some routines will return a value of enum icalerrorenum.
- 
-\layout Subsubsection
-
-icalerrno
-\layout Standard
-
-Most routines will set the global error value icalerrno on errors.
- This variable is an enumeration; permissible values can be found in libical/ica
-lerror.h.
- If the routine returns an enum icalerrorenum, then the return value will
- be the same as icalerrno.
- You can use icalerror_strerror() to get a string that describes the error.
- The enumerations are:
-\layout Itemize
-
-ICAL_BADARG_ERROR -- One of the argument to a routine was bad.
- Typically for a null pointer.
- 
-\layout Itemize
-
-ICAL_NEWFAILED_ERROR -- A new() or malloc() failed
-\layout Itemize
-
-ICAL_MALFORMEDDATA_ERROR -- An input string was not in the correct format
-\layout Itemize
-
-ICAL_PARSE_ERROR -- The parser failed to parse an incomming component
-\layout Itemize
-
-ICAL_INTERNAL_ERROR -- Largely equivalent to an assert
-\layout Itemize
-
-ICAL_FILE_ERROR -- A file operation failed.
- Check errno for more detail.
-\layout Itemize
-
-ICAL_ALLOCATION_ERROR -- ?
-\layout Itemize
-
-ICAL_USAGE_ERROR -- ?
-\layout Itemize
-
-ICAL_NO_ERROR -- No error
-\layout Itemize
-
-ICAL_MULTIPLEINCLUSION_ERROR -- ?
-\layout Itemize
-
-ICAL_TIMEDOUT_ERROR -- For CSTP and acquiring locks
-\layout Itemize
-
-ICAL_UNKNOWN_ERROR -- ?
-\layout Subsubsection
-
-X-LIC-ERROR and X-LIC-INVALID-COMPONENT
-\layout Standard
-
-The library handles semantic and syntactic errors in components by inserting
- errors properties into the components.
- If the parser cannot parse incoming text ( a syntactic error ) or if the
- icalrestriction_check() routine indicates that the component does not meet
- the requirements of RFC2446 ( a semantic error) the library will insert
- properties of the type X-LIC-ERROR to describe the error.
- Here is an example of the error property: 
-\layout Verbatim
-
-X-LIC-ERROR;X-LIC-ERRORTYPE=INVALID_ITIP :Failed iTIP restrictions for property
- DTSTART.
- 
-\layout Verbatim
-
-Expected 1 instances of the property and got 0 
-\layout Standard
-
-This error resulted from a call to icalrestriction_check(), which discovered
- that the component does not have a DTSTART property, as required by RFC2445.
- 
-\layout Standard
-
-There are a few routines to manipulate error properties:
-\layout Standard
-
-[ The following data is supposed to be in a table.
- It looks OK in LyX, but does not format propertly in output.
- ]
-\layout Standard
-\LyXTable
-multicol5
-10 2 0 0 -1 -1 -1 -1
-1 1 0 0
-1 0 0 0
-0 1 1 0
-1 0 0 0
-0 1 1 0
-1 1 0 0
-0 1 1 0
-1 1 0 0
-0 1 1 0
-0 1 1 0
-2 1 0 "" ""
-2 1 1 "3in" ""
-0 2 1 1 0 0 0 "" ""
-0 8 1 0 0 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 1 0 1 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 0 0 1 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 1 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 1 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 1 1 0 1 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 1 1 0 1 "" ""
-0 2 1 0 0 0 0 "" ""
-0 2 1 1 0 0 1 "" ""
-
-Routine
-\newline 
-Purpose
-\newline 
-void icalrestriction_check()
-\newline 
-Check a component against RFC2446 and insert
-\newline 
-
-\newline 
-error properties to indicate non compliance
-\newline 
-int icalcomponent_count_errors()
-\newline 
-Return the number of error properties 
-\newline 
-
-\newline 
-in a component
-\newline 
-void icalcomponent_strip_errors()
-\newline 
-Remove all error properties in as
-\newline 
-
-\newline 
-component
-\newline 
-void icalcomponent_convert_errors()
-\newline 
-Convert some error properties into 
-\newline 
-
-\newline 
-REQUESTS-STATUS proprties to indicate the inability to 
-\newline 
-
-\newline 
-process the component as an iTIP request.
- 
-\layout Standard
-
-The types of errors are listed in icalerror.h.
- They are:
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_COMPONENTPARSEERROR
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR 
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_PROPERTYPARSEERROR
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_VALUEPARSEERROR
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_UNKVCALPROP
-\layout Verbatim
-
-ICAL_XLICERRORTYPE_INVALIDITIP
-\layout Standard
-
-The libical parser will generate the error that end in PARSEERROR when it
- encounters garbage in the input steam.
- ICAL_XLICERRORTYPE_INVALIDITIP is inserted by icalrestriction_check(),
- and ICAL_XLICERRORTYPE_UNKVCALPROP is generated by icalvcal_convert() when
- it encounters a vCal property that it cannot convert or does not know about.
- 
-\layout Standard
-
-Icalcomponent_convert_errors() converts some of the error properties in
- a component into REQUEST-STATUS properties that indicate a failure.
- As of libical version0.18, this routine only convert *PARSEERROR errors
- and it always generates a 3.x ( failure ) code.
- This makes it more of a good idea than a really useful bit of code.
- 
-\layout Subsubsection
-
-ICAL_ERRORS_ARE_FATAL and icalerror_errors_are_fatal
-\layout Standard
-
-If the global variable icalerror_errors_are_fatal is set to 1, then any
- error condition will cause the program to abort.
- The abort occurs in icalerror_set_errno(), and is done with an assert(0)
- if NDEBUG is undefined, and with icalerror_crash_here if NDEBUG is defined.
- The default value of icalerror_errors_are_fatal is 1 when ICAL_ERRORS_ARE_FATAL
- is defined, and 0 otherwise.
- Since ICAL_ERRORS_ARE_FATAL is defined by default, icalerror_errors_are_fatal
- is also defined by default.
- 
-\layout Subsection
-
-Naming Standard
-\layout Standard
-
-Structures that you access with the 
-\begin_inset Quotes eld
-\end_inset 
-
-struct
-\begin_inset Quotes erd
-\end_inset 
-
- keyword, such as 
-\begin_inset Quotes eld
-\end_inset 
-
-struct icaltimetype
-\begin_inset Quotes erd
-\end_inset 
-
- are things that you are allowed to see inside and poke at.
- 
-\layout Standard
-
-Structures that you access though a typedef, such as 
-\begin_inset Quotes eld
-\end_inset 
-
-icalcomponent
-\begin_inset Quotes erd
-\end_inset 
-
- are things where all of the data is hidden.
- 
-\layout Standard
-
-Component names that start with 
-\begin_inset Quotes eld
-\end_inset 
-
-V
-\begin_inset Quotes erd
-\end_inset 
-
- are part of RFC 2445 or another iCal standard.
- Component names that start with 
-\begin_inset Quotes eld
-\end_inset 
-
-X
-\begin_inset Quotes erd
-\end_inset 
-
- are also part of the spec, but they are not actually components in the
- spec.
- However, they look and act like components, so they are components in libical.
- Names that start with 
-\begin_inset Quotes eld
-\end_inset 
-
-XLIC
-\begin_inset Quotes erd
-\end_inset 
-
- or 
-\begin_inset Quotes eld
-\end_inset 
-
-X-LIC
-\begin_inset Quotes erd
-\end_inset 
-
- are not part of any iCal spec.
- They are used internally by libical.
- 
-\layout Standard
-
-Enums that identify a component, property, value or parameter end with 
-\begin_inset Quotes eld
-\end_inset 
-
-_COMPONENT,
-\begin_inset Quotes erd
-\end_inset 
-
- 
-\begin_inset Quotes eld
-\end_inset 
-
-_PROPERTY,
-\begin_inset Quotes erd
-\end_inset 
-
- 
-\begin_inset Quotes eld
-\end_inset 
-
-_VALUE,
-\begin_inset Quotes erd
-\end_inset 
-
- or 
-\begin_inset Quotes eld
-\end_inset 
-
-_PARAMETER
-\begin_inset Quotes erd
-\end_inset 
-
-s
-\layout Standard
-
-Enums that identify a parameter value have the name of the parameter as
- the second word.
- For instance: ICAL_ROLE_REQPARTICIPANT or ICAL_PARTSTAT_ACCEPTED.
-\layout Standard
-
-The enums for the parts of a recurarance rule and request statuses are irregular.
- 
-\layout Section
-
-Hacks and Bugs
-\layout Standard
-
-There are a lot of hacks in the library -- bits of code that I am not proud
- of and should probably be changed.
- These are marked with the comment string 
-\begin_inset Quotes eld
-\end_inset 
-
-HACK.
-\begin_inset Quotes erd
-\end_inset 
-
-
-\the_end
diff --git a/libical/doc/UsingLibical.ps b/libical/doc/UsingLibical.ps
deleted file mode 100644
index 6223144e3a..0000000000
--- a/libical/doc/UsingLibical.ps
+++ /dev/null
@@ -1,2327 +0,0 @@
-%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
-%%Title: UsingLibical.dvi
-%%Pages: 22
-%%PageOrder: Ascend
-%%BoundingBox: 0 0 612 792
-%%EndComments
-%DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -t letter -o
-%+ /usr/local/home/eric/proj/FreeAssociation/libical/doc/UsingLibical.ps
-%+ UsingLibical.dvi
-%DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2001.01.09:0928
-%%BeginProcSet: texc.pro
-%!
-/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
-N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72
-mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0
-0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{
-landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize
-mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[
-matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round
-exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{
-statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0]
-N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin
-/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array
-/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2
-array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N
-df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A
-definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get
-}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub}
-B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
-1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3
-1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
-0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
-sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
-gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
-/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
-/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
-A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy
-get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse}
-ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp
-fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17
-{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add
-chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{
-1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop}
-forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
-/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put
-}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{
-bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A
-mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{
-SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{
-userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
-1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
-index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
-/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
-/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
-(LaserWriter 16/600)]{A length product length le{A length product exch 0
-exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
-grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
-exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
-fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
-delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
-B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
-p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
-rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
-
-%%EndProcSet
-TeXDict begin 40258431 52099146 1000 600 600 (UsingLibical.dvi)
-@start
-%DVIPSBitmapFont: Fa ecti1000 10 7
-/Fa 7 118 df<EA03C0EA07F0120F121F13F8A313F0EA07B0EA003013701360A213E013
-C01201EA038013005A120E5A5A5A5A5A0D197A8819>44 D<147F903803FFC090380FC1E0
-90381F0070017E13784913383901F801F83803F003120713E0120FD81FC013F091C7FC48
-5AA2127F90C8FCA35A5AA45AA3153015381578007C14F0007EEB01E0003EEB03C0EC0F80
-6CEB3E00380F81F83803FFE0C690C7FC1D2677A426>99 D<D801E001FEEB07F03C07F803
-FF801FFC3C0E3C0F07C0783E3C1E3E3C03E1E01F261C1F78D9F3C013803C383FF001F780
-0F02E01400007801C013FE007018C002805B4A4848EB1F80EAF07FD8E07E5CA200000207
-143F01FE1700495CA2030F5C0001177E495C18FE031F5C120349DA8001131C18F8033F15
-3C00070403133849020013F0A24B1570000F17E049017E15F019E003FEECE1C0001FEE01
-E34949903800FF000007C70038143C3E2679A444>109 D<3903C003F0390FF01FFC391E
-783C0F381C7C703A3C3EE03F8038383FC0EB7F800078150000701300151CD8F07E90C7FC
-EAE0FE5BA2120012015BA312035BA312075BA3120F5BA3121F5BA3123F90C9FC120E2126
-79A423>114 D<14FE903807FF8090380F83C090383E00E04913F00178137001F813F000
-01130313F0A215E00003EB01C06DC7FC7FEBFFC06C13F814FE6C7F6D13807F010F13C013
-00143F141F140F123E127E00FE1480A348EB1F0012E06C133E00705B6C5B381E03E06CB4
-5AD801FEC7FC1C267AA422>I<EB0380EB07C0130FA4131F1480A3133F1400A35B137E00
-7FB5FCA2B6FC3800FC00A312015BA312035BA312075BA3120F5BA3121FEB801CA2143C00
-3F1338EB0078147014F014E0EB01C0EA3E03381F0780380F0F00EA07FCEA01F0183579B3
-1C>I<13F8D803FEEB01C0D8078FEB03E0390E0F8007121E121C0038140F131F007815C0
-1270013F131F00F0130000E015805BD8007E133FA201FE14005B5D120149137EA215FE12
-0349EBFC0EA20201131E161C15F813E0163CD9F003133814070001ECF07091381EF8F03A
-00F83C78E090393FF03FC090390FC00F00272679A42D>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fb ecbx1200 12 42
-/Fb 42 122 df<B612F8A91D097F9A25>45 D<EA07C0EA1FF0EA3FF8EA7FFCEAFFFEA7EA
-7FFCEA3FF8EA1FF0EA07C00F0F788E1F>I<EC03C01407141F147FEB03FF133FB6FCA413
-C3EA0003B3B3ADB712FCA5264177C038>49 D<ECFFE0010F13FE013F6D7E90B612E00003
-15F82607FC0313FE3A0FE0007FFFD81F806D138048C7000F13C0488001C015E001F07F00
-FF6E13F07F17F881A46C5A6C5A6C5AC9FC17F05DA217E05D17C04B13804B1300A2ED1FFC
-4B5A5E4B5A4B5A4A90C7FC4A5A4A5AEC0FF04A5AEC3F804AC7127814FE495A494814F8D9
-07E014F0495A495A49C8FC017C140149140348B7FC4816E05A5A5A5A5AB8FC17C0A42D41
-7BC038>I<ECFFF0010713FF011F14C0017F14F049C66C7ED803F8EB3FFED807E06D7E81
-D80FF86D138013FE001F16C07FA66C5A6C4815806C485BC814005D5E4B5A4B5A4B5A4A5B
-020F1380902607FFFEC7FC15F815FF16C090C713F0ED3FFCED0FFEEEFF80816F13C017E0
-A26F13F0A217F8A3EA0FC0EA3FF0487EA2487EA217F0A25D17E06C5A494913C05BD83F80
-491380D81FF0491300D80FFEEBFFFE6CB612F800015D6C6C14C0011F49C7FC010113E02D
-427BC038>I<163FA25E5E5D5DA25D5D5D5DA25D92B5FCEC01F7EC03E7140715C7EC0F87
-EC1F07143E147E147C14F8EB01F0EB03E0130714C0EB0F80EB1F00133E5BA25B485A485A
-485A120F5B48C7FC123E5A12FCB91280A5C8000F90C7FCAC027FB61280A531417DC038>
-I<0007150301E0143F01FFEB07FF91B6FC5E5E5E5E5E16804BC7FC5D15E092C8FC01C0C9
-FCAAEC3FF001C1B5FC01C714C001DF14F09039FFE03FFC9138000FFE01FC6D7E01F06D13
-804915C0497F6C4815E0C8FC6F13F0A317F8A4EA0F80EA3FE0487E12FF7FA317F05B5D6C
-4815E05B007EC74813C0123E003F4A1380D81FC0491300D80FF0495AD807FEEBFFFC6CB6
-12F0C65D013F1480010F01FCC7FC010113C02D427BC038>I<4AB47E021F13F0027F13FC
-49B6FC01079038807F8090390FFC001FD93FF014C04948137F4948EBFFE048495A5A1400
-485A120FA248486D13C0EE7F80EE1E00003F92C7FCA25B127FA2EC07FC91381FFF8000FF
-017F13E091B512F89039F9F01FFC9039FBC007FE9039FF8003FF17804A6C13C05B6F13E0
-A24915F0A317F85BA4127FA5123FA217F07F121FA2000F4A13E0A26C6C15C06D4913806C
-018014006C6D485A6C9038E01FFC6DB55A011F5C010714C0010191C7FC9038003FF02D42
-7BC038>I<121E121F13FC90B712FEA45A17FC17F817F017E017C0A2481680007EC8EA3F
-00007C157E5E00785D15014B5A00F84A5A484A5A5E151FC848C7FC157E5DA24A5A14035D
-14074A5AA2141F5D143FA2147F5D14FFA25BA35B92C8FCA35BA55BAA6D5A6D5A6D5A2F44
-7AC238>I<EE1F80A24C7EA24C7EA34C7EA24B7FA34B7FA24B7FA34B7F169F031F80161F
-82033F80ED3E07037E80157C8203FC804B7E02018115F0820203814B137F0207815D173F
-020F814B7F021F8292C77EA24A82023E80027E82027FB7FCA291B87EA2498302F0C8FCA2
-0103834A157F0107834A153FA249488284011F8491C97E4984133E017E82B6020FB612F0
-A54C457CC455>65 D<DCFFF01470031F01FF14F04AB6EAE0010207EDF803023FEDFE0791
-B539E001FF0F4949C7EA3F9F010701F0EC0FFF4901C0804990C87E494881494881494816
-7F4849163F4849161F5A4A160F485B19074890CAFC19035A5BA2007F1801A34994C7FC12
-FFAE127F7F1AF0A2123FA27F6C18011AE06C7F19036C6D17C06E16077E6C6DEE0F806C6D
-EE1F006D6C5E6D6C167E6D6C6C5D6D6D4A5A6D01F0EC07F0010101FEEC1FE06D903AFFF0
-01FF80023F90B6C7FC020715FC020115F0DA001F1480030001F8C8FC44467AC451>67
-D<BA12F8A485D8001F90C71201EF003F180F180318011800A2197E193EA3191EA21778A2
-85A405F890C7FCA316011603161F92B5FCA5ED001F160316011600A2F101E01778A2F103
-C0A494C7FC1907A21A80A2190FA2191FA2193FF17F0061601807181F4DB5FCBBFC61A443
-447DC34A>69 D<B7D88003B612FEA526003FFEC9EBF800B3A791B9FCA54AC9FCB3AAB7D8
-8003B612FEA54F447CC358>72 D<B712F0A526003FFECAFCB3B1F00780A4180F1900A460
-A360A2187EA218FE170117031707171F177FEE03FFB95AA539447CC343>76
-D<B500FE067FB512806E95B6FCA26F5EA2D8003F50C7FC013D6DEE03DFA2013C6DEE079F
-A26E6CEE0F1FA26E6C161EA26E6C163CA36E6C1678A26E6C16F0A26E6DEC01E0A26E6DEC
-03C0A36E6DEC0780A26F6CEC0F00A26F6C141EA26F6C5CA36F6C5CA26F6C5CA26F6D485A
-A26F6D485AA26F6D485AA3706C48C7FCA293383FF81EA2706C5AA2706C5AA3706C5AA270
-5BA2705BA2705BA2B6057FB6128071C7FCA2173E171C61447CC36A>I<B64BB512FE8181
-A281D8003F6D91C7EA780081013D7F81133C6E7E6E7F6E7F6E7F6E7F82806E7F6E7F6F7E
-6F7F83816F7F6F7F6F7F6F7F6F7F8382707F707F707F707F8482707F707F717E71138071
-13C019E0837113F07113F87113FC7113FE19FF847213F884848484A28484197F193F191F
-A2190F1907B61603190119001A78A24F447CC358>I<923807FFC092B512FE0207ECFFC0
-021F15F091267FFE0013FC902601FFF0EB1FFF01070180010313C04990C76C7FD91FFC6E
-6C7E49486F7E49486F7E01FF8348496F7E48496F1380A248496F13C0A24890C96C13E0A2
-4819F04982003F19F8A3007F19FC49177FA400FF19FEAD007F19FC6D17FFA3003F19F8A2
-6D5E6C19F0A26E5D6C19E0A26C6D4B13C06C19806E5D6C6D4B13006C6D4B5A6D6C4B5A6D
-6C4B5A6D6C4A5B6D01C001075B6D01F0011F5B010101FE90B5C7FC6D90B65A023F15F802
-0715C002004AC8FC030713C047467AC454>I<B9FC18F018FE727E19E0D8001F90C7000F
-7F05017F716C7E727E727E721380A21AC084A21AE0A91AC0A24E1380A21A00604E5A4E5A
-4D485A050F5B92B712C096C7FC18FC18C092CBFCB3A7B712E0A543447DC34D>I<DAFFE0
-131C010701FE133C013F9038FF807C90B6EAE0FC4815F9489038801FFF3907FC00014848
-EB007F4848143F4848140F491407007F15035B1601160012FF177CA27FA26D153C7F7F6D
-92C7FC6C7EEBFFE014FE6CEBFFF015FF6C15E016FC6C816C6F7E6C826C826C6C81011F81
-0107811300020F80140003077FED007F82040F1380828212F082A282A27EA218007EA26C
-5D6C5E6D14036D5D6D140701F84A5A01FFEC3FF002F8EBFFE0486CB65AD8FC1F92C7FCD8
-F80714FC48C614F0480107138031467AC43E>83 D<003FBA12E0A59026FE000FEB8003D8
-7FE09338003FF049171F90C71607A2007E1803007C1801A300781800A400F819F8481978
-A5C81700B3B3A20107B8FCA545437CC24E>I<B792B6FCA526003FFECAEAFC00806D606F
-15016D608119036D606F15076D606F150F6D6081191F6D6D93C7FC61027F163E6F157E02
-3F167C8119FC6E6D5C18016E5E7013036E5E8218076E6D5C180F6E5E70131F6E93C8FC70
-5B037F143E82187E033F147C7013FC6F5C17816F5C17C117C36F5C17E76F5C17FF6F5CA3
-6F91C9FCA2705AA2705AA3705AA2705AA2705AA250457EC355>86
-D<903801FFE0011F13FE017F6D7E48B612E03A03FE007FF84848EB1FFC6D6D7E486C6D7E
-A26F7FA36F7F6C5A6C5AEA00F090C7FCA40203B5FC91B6FC1307013F13F19038FFFC0100
-0313E0481380381FFE00485A5B127F5B12FF5BA35DA26D5B6C6C5B4B13F0D83FFE013EEB
-FFC03A1FFF80FC7F0007EBFFF86CECE01FC66CEB8007D90FFCC9FC322F7DAD36>97
-D<EB7FC0B5FCA512037EB1ED0FF892B57E02C314E002CF14F89139DFC03FFC9139FF000F
-FE02FCEB03FF4A6D13804A15C04A6D13E05CEF7FF0A218F8173FA318FCAC18F8A2177F18
-F0A3EFFFE06E15C06E5B6E491380027C491300496C495A903AFC1FC07FFC496CB512F0D9
-F00314C049C691C7FCC8EA1FF036467DC43E>I<EC3FFC49B512C0010F14F0013F14FC90
-397FF003FE9039FFC001FF0003495A48494813805B120F485AA2485A6F1300007F6E5AED
-00784991C7FCA212FFAC6C7EA3123F6DEC03C0A26C6C1407000F16806D140F6C6DEB1F00
-6C6D133E6C01F05B3A007FFC03F86DB55A010F14C0010391C7FC9038003FF82A2F7CAD32
->I<EE03FEED07FFA5ED001F160FB1EC3FE0903803FFFC010FEBFF8F013F14CF9039FFF8
-07FF48EBC00148903880007F4890C7123F4848141F49140F121F485AA3127F5BA212FFAC
-127FA37F123FA26C6C141FA26C6C143F0007157F6C6C91B5FC6CD9C00314FC6C9038F01F
-EF6DB5128F011FEBFE0F010713F89026007FC0EBF80036467CC43E>I<EC3FF80103B57E
-010F14E0013F8090397FF83FF89039FFC007FC48496C7E48496C7E48486D1380485A001F
-ED7FC05B003FED3FE0A2127F5B17F0161F12FFA290B7FCA401F0C9FCA5127FA27FA2123F
-17F06C7E16016C6C15E06C6C14036C6DEB07C06C6DEB0F806C01F0EB3F0090397FFE01FE
-011FB55A010714F0010114C09026001FFEC7FC2C2F7DAD33>I<EDFF80020F13E0027F13
-F049B512F849EB8FFC90390FFE0FFE90381FFC1F14F8133FEB7FF0A2ED0FFCEBFFE0ED03
-F0ED00C01600ABB612F8A5C601E0C7FCB3B0007FEBFFE0A527467DC522>I<DAFFE0137E
-010F9039FE03FF80013FEBFF8F90B812C048D9C07F133F489038001FF84848EB0FFC4848
-903907FE1F80001F9238FF0F00496D90C7FCA2003F82A8001F93C7FCA26D5B000F5D6C6C
-495A6C6C495A6C9038C07FF04890B55A1680D8078F49C8FC018013E0000F90CAFCA47F7F
-7F90B612C016FC6CEDFF8017E06C826C16FC7E000382000F82D81FF0C77ED83FC0140748
-48020113808248C9FC177FA46D15FF007F17006D5C6C6C4A5A6C6C4A5AD80FFEEC3FF83B
-07FFC001FFF0000190B612C06C6C92C7FC010F14F8D9007F90C8FC32427DAC38>I<EB7F
-C0B5FCA512037EB1ED07FE92383FFF8092B512E002C114F89139C7F03FFC9138CF801F91
-39DF000FFE14DE14FC4A6D7E5CA25CA35CB3A7B60083B512FEA537457CC43E>I<137C48
-B4FC4813804813C0A24813E0A56C13C0A26C13806C1300EA007C90C7FCAAEB7FC0EA7FFF
-A512037EB3AFB6FCA518467CC520>I<EC03E0EC0FF8EC1FFCEC3FFEA2EC7FFFA5EC3FFE
-A2EC1FFCEC0FF8EC03E091C7FCAAEC01FF0103B5FCA5EB000F80B3B3A7EA1F80EA3FC0EA
-7FE0EAFFF0EC0FFEA215FC141F01E013F8007FEB3FF0393FC0FFE06CB512806C14000003
-13FCC613C0205A86C522>I<EB7FC0B5FCA512037EB3B3B3A3B61280A519457CC420>108
-D<90277F8007FEEC0FFCB590263FFFC090387FFF8092B5D8F001B512E002816E4880913D
-87F01FFC0FE03FF8913D8FC00FFE1F801FFC0003D99F009026FF3E007F6C019E6D013C13
-0F02BC5D02F86D496D7EA24A5D4A5DA34A5DB3A7B60081B60003B512FEA5572D7CAC5E>
-I<90397F8007FEB590383FFF8092B512E0028114F8913987F03FFC91388F801F00039039
-9F000FFE6C139E14BC02F86D7E5CA25CA35CB3A7B60083B512FEA5372D7CAC3E>I<EC1F
-FC49B512C0010714F0011F14FC90397FF80FFF9026FFC0017F48496C7F4848C7EA3FE000
-078248486E7E49140F001F82A2003F82491407007F82A400FF1780AA007F1700A46C6C4A
-5AA2001F5E6D141F000F5E6C6C4A5AA26C6C6CEBFFE06C6D485B27007FF80F90C7FC6DB5
-5A010F14F8010114C09026001FFCC8FC312F7DAD38>I<90397FC00FF8B590B57E02C314
-E002CF14F89139DFC03FFC9139FF001FFE000301FCEB07FF6C496D13804A15C04A6D13E0
-5C7013F0A2EF7FF8A4EF3FFCACEF7FF8A318F017FFA24C13E06E15C06E5B6E4913806E49
-13006E495A9139DFC07FFC02CFB512F002C314C002C091C7FCED1FF092C9FCADB67EA536
-407DAC3E>I<90387F807FB53881FFE0028313F0028F13F8ED8FFC91389F1FFE000313BE
-6C13BC14F8A214F0ED0FFC9138E007F8ED01E092C7FCA35CB3A5B612E0A5272D7DAC2E>
-114 D<90391FFC038090B51287000314FF120F381FF003383FC00049133F48C7121F127E
-00FE140FA215077EA27F01E090C7FC13FE387FFFF014FF6C14C015F06C14FC6C80000380
-6C15806C7E010F14C0EB003F020313E0140000F0143FA26C141F150FA27EA26C15C06C14
-1FA26DEB3F8001E0EB7F009038F803FE90B55A00FC5CD8F03F13E026E007FEC7FC232F7C
-AD2C>I<EB01E0A51303A41307A2130FA2131FA2133F137F13FF1203000F90B51280B7FC
-A4C601E0C7FCB3A3ED01E0A9150302F013C0137F150790393FF80F8090391FFC1F006DB5
-FC6D13FC01015B9038003FE023407EBE2C>I<D97FC049B4FCB50103B5FCA50003EC000F
-6C81B3A85EA25EA25E7E6E491380017FD901F713FE9138F807E76DB512C7010F14070103
-13FE9026007FF0EBFC00372E7CAC3E>I<B500FE90383FFFF0A5C601F0903803E0006D6C
-495A6D6C495A011F4AC7FC6E5B6D6C137E6DEB807C6D6D5A6DEBC1F0EDE3E06DEBF7C06E
-B45A806E90C8FC5D6E7E6E7F6E7FA24A7F4A7F8291381F3FFCEC3E1F027C7F4A6C7E4948
-6C7F01036D7F49487E02C08049486C7F49C76C7E013E6E7E017E141FB500E090B512FCA5
-362C7EAB3B>120 D<B6903803FFFCA5000101E09038003E006C163C80017F5D8017F801
-3F5D6E1301011F5D6E1303010F5D6E13076D5DED800F6D92C7FC15C05E6DEBE01E163E6D
-143CEDF07C027F1378EDF8F8023F5B15FD021F5B15FF6E5BA36E5BA26E90C8FCA26E5AA2
-6E5AA21578A215F85D14015D001F1303D83F805B387FC007D8FFE05B140F92C9FC5C143E
-495A387FC1F8EB07F06CB45A6C5B000790CAFCEA01FC36407EAB3B>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc ectt1000 10 78
-/Fc 78 123 df<121FEA3F80EA7FC0EAFFE0B0EA7FC0AEEA1F00C7FCA7121FEA3F80EA7F
-C0EAFFE0A5EA7FC0EA3F80EA1F000B3470B32C>33 D<003C131E007F137F481480A66C14
-00A6007E7FA6003E133EA3003C131E001C131C191977B32C>I<EA0F80EA1FE0EA3FF012
-7F13F8A213FCA2123F121F120FEA007CA313FC13F8A2120113F01203EA07E0A2EA0FC0EA
-3F80127FEAFF005A12F812700E1D71B22C>39 D<143814FC13011303EB07F8EB0FF0EB1F
-C0EB3F80EB7F0013FE485A485A5B12075B120F5B485AA2123F90C7FCA25A127EA312FE5A
-AC7E127EA3127F7EA27F121FA26C7E7F12077F12037F6C7E6C7E137FEB3F80EB1FC0EB0F
-F0EB07F8EB03FC130113001438164272B92C>I<127012FC7E7E6C7E6C7EEA0FE06C7E6C
-7E6C7E6C7E137F7F1480131F14C0130FEB07E0A214F01303A214F81301A314FC1300AC13
-0114F8A3130314F0A2130714E0A2EB0FC0131F1480133F14005B13FE485A485A485A485A
-EA3FC0485A48C7FC5A5A1270164279B92C>I<EB0380497EA60020140800F8143E00FE14
-FE00FF13C1EBC7C7EBE7CF003FB512F8000F14E0000314806C140038007FFCA248B5FC48
-1480000F14E0003F14F839FFE7CFFEEBC7C7EB07C100FE13C000F8143E00201408000014
-00A66D5A1F247AAA2C>I<147014F8AF003FB612E0B712F8A4C700F8C7FCB0147025267D
-AB2C>I<EA0F80EA1FE0EA3FF0EA7FF8A213FCA3123F121F120F120013F8A21201EA03F0
-1207EA1FE0EA7FC0EAFF80130012FC12700E17718A2C>I<007FB512F0B612F8A36C14F0
-1D0579942C>I<121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B0B708A2C>I<1507
-ED0F80A2151F16005D153E157E157CA215FC5D14015D14035D14075D140F5D141F92C7FC
-5C143EA2147E147C14FC5C13015C13035C13075C130F5C131F91C8FC5B133EA2137E137C
-13FC5B12015B12035B12075B120F5B121F90C9FCA25A123E127E127C12FC5AA212702141
-7BB92C>I<EB03F8EB0FFE90383FFF80497F90B57E3901FE0FF03903F803F848486C7EEB
-E0004848137EA248487FA248C7EA1F80A2003E140F007E15C0A3007C140700FC15E0AC6C
-140F007E15C0A46CEC1F80A36C6CEB3F00A26C6C137E6D13FE00075CEBF0016C6C485A39
-01FE0FF06CB55A6D5B6D5BD90FFEC7FCEB03F823357CB32C>I<1307497EA2131FA2133F
-137F13FF5A1207127FB5FC13DF139FEA7C1F1200B3AE007FB512E0B612F0A36C14E01C34
-77B32C>I<EB0FF890387FFF8048B512E00007804814FC391FF80FFE393FE001FF903880
-007F48C7EA3F80007E141F00FE15C0150F6C15E01507A3127E123CC8FCA2150F16C0151F
-1680153F16005D15FE4A5A14034A5A4A5A4A5A4A5AECFF804948C7FC495A495A495AEB3F
-E0EB7F8049C8FC485A4848EB03C04848EB07E0EA1FE0485A48B6FCB7FCA36C15C023347C
-B32C>I<EB0FFC90387FFF8048B512E0000714F84880391FF807FEEBC0004848137F6D7F
-1680151FA26C5A6CC7FCC8FC153F16005D15FE14014A5AEC1FF890381FFFF0495BA215F8
-6D7F90380007FEEC00FF81ED3F80ED1FC0150FA216E01507A2123C127EB4FC150F16C0A2
-48141F007FEC3F806DEB7F006C6C5B391FF807FE6CB55A6C5C6C14E0C66C1380D90FFCC7
-FC23357CB32C>I<EC07F04A7E141F143FA2147EA214FCEB01F8A2EB03F0EB07E0A2EB0F
-C0EB1F80A2EB3F00137EA25B485AA2485A5B1207485AA2485A48C7FCA2127E5AB712FC16
-FEA36C15FCC8EAF800AA91387FFFF091B512F8A36E13F027347EB32C>I<000FB512FE48
-80A35D0180C8FCADEB83FE90389FFF8090B512E015F8819038FE03FE9038F000FF01C07F
-49EB3F8090C7121F6C15C0C8120FA2ED07E0A4123C127EB4FC150F16C0A248141F007EEC
-3F80007FEC7F006C6C5B6D485A391FF80FFC6CB55A6C5C000114C06C6C90C7FCEB0FF823
-347CB22C>I<EC3FC0903801FFF801077F011F7F497F90387FE07F9039FF003F80484813
-7FEA03F8485A5B000FEC3F004848131E4990C7FC123F90C9FCA25A127EEB03FE90381FFF
-80D8FC7F13E000FDB57EB67E9038FE07FC9038F001FE9038C0007F49EB3F8090C7121F16
-C048140F16E01507A3127EA47E150F6D14C0001F141F6D1480000F143F6DEB7F003907F8
-01FE3903FE07FC6CB55A6C5C6D5B011F1380D907FCC7FC23357CB32C>I<1278B712C016
-E0A316C000FCC7EA3F80ED7F0015FE00785CC712014A5A4A5A5D140F5D4A5A143F92C7FC
-5C147E14FE5C13015CA2495AA213075CA3495AA4495AA5133F91C8FCAA131E23357CB32C
->I<EB07FC90383FFF8090B512E0000314F84880390FFC07FE391FF001FF9038C0007F48
-48EB3F8090C7121F4815C0007E140FA56CEC1F80A26C6CEB3F006D5B390FF001FE3903FC
-07F86CB55A6C6C13C0D907FCC7FC90387FFFC048B512F03903FC07F8390FF001FE391FC0
-007F497F48C7EA1F80007EEC0FC0A248EC07E0A7007EEC0FC0A2007F141F6C6CEB3F806C
-6CEB7F009038F001FF390FFC07FE6CB55A6C5CC614E0013F1380D907FCC7FC23357CB32C
->I<EB07FCEB3FFF90B512C0488048803907FC07F8390FF001FC48486C7ED83F80137E15
-7F48C77E007EEC1F8012FE5AED0FC0A416E0A37E127E007F141F7E6D133F6C6C137F390F
-F001FF3807FC0F6CB6FC6C14F76C14C7013F130FD90FF813C090C7FCA2151F1680153F16
-00000F5C486C137E486C13FE4A5A4A5A14079038801FF0391FE07FE090B55A6C91C7FC6C
-5B000113F838007FC023357CB32C>I<121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F
-00C7FCAE121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B2470A32C>I<EA0F80EA
-1FC0EA3FE0EA7FF0A5EA3FE0EA1FC0EA0F80C7FCAEEA0F80EA1FE0EA3FF0EA7FF8A213FC
-A3123F121F120F120013F8A21201EA03F01207EA1FE0EA7FC0EAFF80130012FC12700E30
-71A32C>I<007FB612F0B712F8A36C15F0CAFCA8007FB612F0B712F8A36C15F025127DA1
-2C>61 D<EC7F80903803FFE0010F7F013F7F497F9038FFC0FE3901FE007FD803F87F4848
-EB1F809038E00FCF390FC03FFF48484813C091B5FCEA3F01393E03F87F903907F03FE000
-7EEBE01F397C0FC00FEC8007A2EAFC1F00F8EB0003A900FCEB8007D87C0F14C0A2ECC00F
-3A7E07E01F80003EEBF03F903903F87F00393F01FFFED81F805B6E5A6C6C6C5A3907E00F
-C09039F00007C06C6CEB0FE0D801FE131F3900FFC0FF6DB512C06D1480010FEBFE000103
-13F89038007FC023337CB22C>64 D<14FE497EA4497FA214EFA2130781A214C7A2010F7F
-A314C390381F83F0A590383F01F8A490387E00FCA549137E90B512FEA34880A29038F800
-3FA34848EB1F80A4000715C049130FD87FFEEBFFFC6D5AB514FE6C15FC497E27347EB32C
->I<007FB512E015F8B612FE6C8016C03903F0003FED0FE0ED07F01503A2ED01F8A6ED03
-F0A21507ED0FE0ED1FC0EDFF8090B612005D5D15FF16C09039F0001FE0ED07F0ED03F815
-01ED00FCA216FE167EA616FE16FC1501ED03F8150FED3FF0007FB612E016C0B712806CEC
-FE0015F027337FB22C>I<02FF13700107EBE0F84913F9013F13FD4913FFEBFF813901FE
-007F4848131FD807F0130F1507485A491303485A150148C7FCA25A007EEC00F01600A212
-FE5AAB7E127EA3007F15F06CEC01F8A26C7EA26C6C13036D14F06C6C130716E0D803FC13
-1F6C6CEB3FC03A00FF81FF806DB512006D5B010F5B6D13F00100138025357DB32C>I<00
-7FB5FCB612C015F0816C803907E003FEEC00FFED7F80153FED1FC0ED0FE0A2150716F015
-0316F81501A4ED00FCACED01F8A3150316F0A2150716E0150FED1FC0153FED7F80EDFF00
-EC03FE007FB55AB65A5D15C06C91C7FC26337EB22C>I<007FB612F0B712F8A37E3903F0
-0001A7ED00F01600A4EC01E04A7EA490B5FCA5EBF003A46E5A91C8FCA5163C167EA8007F
-B612FEB7FCA36C15FC27337EB22C>I<007FB612F8B712FCA37ED803F0C7FCA716781600
-A515F04A7EA490B5FCA5EBF001A46E5A92C7FCAD387FFFE0B5FC805C7E26337EB22C>I<
-903901FC038090390FFF87C04913EF017F13FF90B6FC4813073803FC01497E4848137F48
-48133F49131F121F5B003F140F90C7FCA2127EED078092C7FCA212FE5AA8913803FFF84A
-13FCA27E007E6D13F89138000FC0A36C141FA27F121F6D133F120F6D137F6C7E6C6C13FF
-6D5A3801FF076C90B5FC6D13EF011F13CF6DEB0780D901FCC7FC26357DB32C>I<D87FFE
-EBFFFCB54813FEA36C486C13FCD807E0EB0FC0B190B6FCA59038E0000FB3D87FFEEBFFFC
-B54813FEA36C486C13FC27337EB22C>I<007FB512F8B612FCA36C14F839000FC000B3B3
-A5007FB512F8B612FCA36C14F81E3379B22C>I<0107B512804914C0A36D148090390003
-F000B3AF1218127EA2B4FCA24A5A48130F007F131F9038C07FC06CB55A6C91C7FC6C5B00
-0313F838007FC022347BB22C>I<D87FFCEB7FF8486CEBFFFCA36C48EB7FF8D807C0EB1F
-80153FED7F00157E5D4A5A14034A5A5D4A5A4A5A143F4AC7FC147E5CEBC1F813C3EBC7FC
-A2EBCFFEEBDFBEEBFFBF141F01FE7F496C7E13F86E7EEBF00301E07FEBC001816E7EA215
-7E153E153F811680ED0FC0A2ED07E0D87FFCEB1FFC486CEB3FFEA36C48EB1FFC27337EB2
-2C>I<387FFFE0B57EA36C5BD803F0C8FCB3AE16F0ED01F8A8007FB6FCB7FCA36C15F025
-337DB22C>I<D87FE0EB0FFC486CEB1FFEA26D133F007F15FC000F15E001BC137BA4019E
-13F3A3EB9F01A2018F13E3A21483A2018713C314C7A201831383A214EFA201811303A214
-FFEB80FEA3147C14381400ACD87FF0EB1FFC486CEB3FFEA36C48EB1FFC27337EB22C>I<
-D87FF0EB7FFC486CEBFFFEA27F007FEC7FFCD807FEEB07C013DEA213DF13CFA2148013C7
-14C0A213C314E0A213C114F0A213C014F8A2147CA3143EA2141E141FA2140F1587A21407
-15C7A2140315E71401A215F71400A215FFD87FFC137F487E153FA26C48EB1F8027337EB2
-2C>I<EB7FFF0003B512E0000F14F848804880EBE003EB800048C7127FA2007E80A300FE
-158048141FB3A86C143FA2007E1500A3007F5CA26C6C13FEEBF00790B5FC6C5C6C5C0003
-14E0C66C90C7FC21357BB32C>I<007FB512C0B612F88115FF6C15802603F00013C0153F
-ED0FE0ED07F0A2150316F81501A6150316F01507A2ED0FE0ED3FC015FF90B61280160015
-FC5D15C001F0C8FCB0387FFF80B57EA36C5B25337EB22C>I<EB7FFF0003B512E0000F14
-F848804880EBF007EB800048C7127FA2007E80A300FE158048141FB3A7EB01F0EB03F800
-FE143F267E01FC1300A2EB00FE007F5C147FD83F8013FEEBF03F90B5FC6C5C6C5C000314
-E0C67E90380007F0A26E7EA26E7EA26E7EA2157FA2153E21407BB32C>I<387FFFFCB67E
-15E015F86C803907E007FE1401EC007F6F7E151FA26F7EA64B5AA2153F4BC7FCEC01FE14
-0790B55A5D15E081819038E007FCEC01FE1400157F81A8160FEE1F80A5D87FFEEB1FBFB5
-ECFF00815E6C486D5AC8EA01F029347EB22C>I<90381FF80790B5EA0F804814CF000714
-FF5A381FF01F383FC003497E48C7FC007E147F00FE143F5A151FA46CEC0F00007E91C7FC
-127F7FEA3FE0EA1FFCEBFFC06C13FC0003EBFFC06C14F06C6C7F01077F9038007FFEEC07
-FF02001380153FED1FC0A2ED0FE0A20078140712FCA56CEC0FC0A26CEC1F806D133F01E0
-EB7F009038FE01FF90B55A5D00F914F0D8F83F13C0D8700790C7FC23357CB32C>I<007F
-B612FCB712FEA43AFC007E007EA70078153CC71400B3AF90383FFFFCA2497F6D5BA22733
-7EB22C>I<3B7FFF803FFFC0B56C4813E0A36C496C13C03B03F00001F800B3AF6D130300
-015DA26D130700005D6D130F017F495A6D6C485AECE0FF6DB5C7FC6D5B010313F86D5B90
-38003F802B3480B22C>I<D87FFCEB7FFC486CEBFFFEA36C48EB7FFCD80FC0EB07E06D13
-0F000715C0A36D131F00031580A36D133F00011500A36D5B0000147EA4017E5BA46D485A
-A490381F83F0A4010F5B14C7A301075BA214EFA201035BA214FFA26D90C7FCA46D5A2734
-7EB22C>I<D87FF0EB07FF486C491380A36C486D1300001FC8127CA46C6C5CA76C6C495A
-A4143E147FA33A03E0FF83E0A214F7A201E113C3A3000101E35BA201F113C701F313E7A3
-14C1A200005DA201F713F71480A301FF13FF017F91C7FC4A7EA4013E133E29347FB22C>
-I<3A3FFF03FFE0484913F0148714076C6D13E03A01F800FE007F0000495A13FE017E5BEB
-7F03013F5B1487011F5B14CF010F5B14FF6D5BA26D90C7FCA26D5AA26D5AA2497EA2497E
-A2497F81EB0FCF81EB1FC7EC87F0EB3F83EC03F8EB7F01017E7FEBFE00497F0001147E49
-137F000380491480151FD87FFEEBFFFC6D5AB514FE6C15FC497E27337EB22C>I<D87FFC
-EB7FFC486CEBFFFEA36C48EB7FFCD807F0EB0FC0151F000315806D133F12016DEB7F0012
-006D137E017E13FE017F5BEB3F01EC81F8131FEC83F0EB0FC314C7903807E7E0A201035B
-14EF6DB45AA292C7FC7F5C147EB0903807FFE0497FA36D5B27337EB22C>I<003FB612C0
-4815E0A4007EC7EA1FC0ED3F80A2ED7F00157E15FE4A5A003C5CC712034A5AA24A5A4A5A
-A24A5A4AC7FCA214FE495AA2495A495AA2495A495AA2495A49C8FCA213FE485AA24848EB
-03C049EB07E01207485A5B121F485AA248C7FCB7FCA46C15C023337CB22C>I<007FB6FC
-B71280A46C150021067B7D2C>95 D<3801FFF0000713FE001F6D7E15E048809038C01FF8
-1407EC01FC381F80000006C77EC8127EA3ECFFFE131F90B5FC1203120F48EB807E383FF8
-00EA7FC090C7FC12FE5AA47E007F14FEEB8003383FE01F6CB612FC6C15FE6C14BF0001EB
-FE1F3A003FF007FC27247CA32C>97 D<EA7FF0487EA3127F1201AAEC1FE0ECFFF801FB13
-FE90B6FC16809138F07FC09138801FE091380007F049EB03F85BED01FC491300A216FE16
-7EA816FE6D14FCA2ED01F86D13036DEB07F0150F9138801FE09138E07FC091B512801600
-01FB5B01F813F83900F03FC027337FB22C>I<903803FFE0011F13F8017F13FE48B5FC48
-804848C6FCEA0FF0485A49137E4848131890C9FC5A127EA25AA8127EA2127F6C140F6DEB
-1F806C7E6D133F6C6CEB7F003907FE03FF6CB55A6C5C6C6C5B011F13E0010390C7FC2124
-7AA32C>I<EC0FFE4A7EA380EC003FAAEB07F8EB3FFE90B512BF4814FF5A3807FC0F380F
-F00348487E497E48487F90C7FC007E80A212FE5AA87E007E5CA2007F5C6C7E5C6C6C5A38
-0FF0073807FC1F6CB612FC6CECBFFE6C143FEB3FFC90390FF01FFC27337DB22C>I<EB03
-FE90381FFFC0017F13F048B57E48803907FE03FE390FF800FFD81FE0EB3F805B4848EB1F
-C090C7120F5A007E15E015075AB7FCA416C000FCC9FC7E127EA2127F6CEC03C06DEB07E0
-6C7ED80FF0130F6C6CEB3FC001FF13FF000190B512806C1500013F13FC010F13F0010113
-8023247CA32C>I<EC0FF8EC3FFE91B5FC4914805B903807FC7F14F090390FE03F0014C0
-92C7FCA6007FB512FEB7FCA36C5C26000FC0C7FCB3A8003FB512F04880A36C5C21337DB2
-2C>I<ED03F8903907F80FFC90391FFE3FFE017FB6FC48B7FC48ECFE7F9038FC0FF82607
-F003133E3A0FE001FC1CD9C0001300001F8049137EA66D13FE000F5CEBE0016C6C485A39
-03FC0FF048B5FC5D481480D99FFEC7FCEB87F80180C8FCA37F6C7E90B512F06C14FE48EC
-FF804815E04815F03A3FC0001FF848C7EA03FC007E1400007C157C00FC157E48153EA46C
-157E007E15FCD87F801303D83FE0EB0FF8D81FFCEB7FF06CB612E0000315806C1500D800
-3F13F8010713C028387EA42C>I<EA7FF0487EA3127F1201AAEC1FE0EC7FFC9038F9FFFE
-01FB7F90B6FC9138F03F80ECC01F02807FEC000F5B5BA25BB3267FFFE0B5FCB500F11480
-A36C01E0140029337FB22C>I<1307EB1FC0A2497EA36D5AA20107C7FC90C8FCA7387FFF
-C080B5FC7EA2EA0007B3A8007FB512FCB612FEA36C14FC1F3479B32C>I<140EEC3F80A2
-EC7FC0A3EC3F80A2EC0E0091C7FCA748B512804814C0A37EC7120FB3B3A2141F003C1480
-007E133FB414005CEB01FEEBFFFC6C5B5C001F5B000790C7FC1A467CB32C>I<EA7FE048
-7EA3127F1201AA91381FFFF04A13F8A36E13F0913800FE004A5A4A5A4A5A4A5A4A5A4A5A
-4AC7FC14FEEBF1FC13F3EBF7FE90B5FCA2EC9F80EC0FC001FE7FEBFC07496C7E496C7E81
-1400157E811680151F3A7FFFC0FFFCB500E113FEA36C01C013FC27337EB22C>I<387FFF
-E0B57EA37EEA0003B3B3A5007FB61280B712C0A36C158022337BB22C>I<3A7F83F007E0
-9039CFFC1FF83AFFDFFE3FFCD87FFF13FF91B57E3A07FE1FFC3E01FCEBF83F496C487E01
-F013E001E013C0A301C01380B33B7FFC3FF87FF0027F13FFD8FFFE6D13F8D87FFC4913F0
-023F137F2D2481A32C>I<397FF01FE039FFF87FFC9038F9FFFE01FB7F6CB6FC00019038
-F03F80ECC01F02807FEC000F5B5BA25BB3267FFFE0B5FCB500F11480A36C01E014002924
-7FA32C>I<EB07FCEB1FFF017F13C048B512F048803907FC07FC390FF001FE48486C7E01
-80133F003F158090C7121F007EEC0FC0A348EC07E0A76C140F007E15C0A2007F141F6C15
-806D133F6C6CEB7F006D5B6C6C485A3907FC07FC6CB55A6C5C6C6C13C0011F90C7FCEB07
-FC23247CA32C>I<397FF01FE039FFF8FFF801FB13FE90B6FC6C158000019038F07FC091
-38801FE091380007F049EB03F85BED01FC491300A216FE167EA816FE6D14FCA2ED01F86D
-13036DEB07F0150F9138801FE09138E07FC091B51280160001FB5B01F813F8EC3FC091C8
-FCAD387FFFE0B57EA36C5B27367FA32C>I<903903FC078090391FFF0FC0017F13CF48B5
-12EF4814FF3807FE07380FF00148487E49137F4848133F90C7FC48141F127E150F5AA87E
-007E141FA26C143F7F6C6C137F6D13FF380FF0033807FC0F6CB6FC6C14EF6C6C138F6D13
-0FEB07F890C7FCAD0203B5FC4A1480A36E140029367DA32C>I<D87FFEEB3FC0B53801FF
-F0020713F8021F13FC6C5B39003F7FE1ECFF019138FC00F84A13704A13005CA25C5CA391
-C8FCAF007FB512E0B67EA36C5C26247EA32C>I<90387FF8700003B512F8120F5A5A387F
-C00F387E00034813015AA36CEB00F0007F140013F0383FFFC06C13FE6CEBFF80000314E0
-C66C13F8010113FCEB0007EC00FE0078147F00FC143F151F7EA26C143F6D133E6D13FE90
-38F007FC90B5FC15F815E000F8148039701FFC0020247AA32C>I<131E133FA9007FB6FC
-B71280A36C1500D8003FC8FCB1ED03C0ED07E0A5EC800F011FEB1FC0ECE07F6DB5128016
-0001035B6D13F89038003FE0232E7EAD2C>I<3A7FF003FF80486C487FA3007F7F0001EB
-000FB3A3151FA2153F6D137F3900FE03FF90B7FC6D15807F6D13CF902603FE0713002924
-7FA32C>I<3A7FFF01FFFCB514FE148314016C15FC3A03E0000F80A26D131F00011500A2
-6D5B0000143EA26D137E017C137CA2017E13FC013E5BA2EB3F01011F5BA21483010F5BA2
-14C701075BA214EF01035BA214FF6D90C7FCA26D5A147C27247EA32C>I<D87FFFEB7FFF
-6EB5FCB515806C16004A7ED807C0EB01F0A66C6C495AA3143E147FA2D801F0495AECFF87
-A214F7A201F113C700005D9038F9E3CFA201FB13EFA3D97BC190C7FC017F13FFA21480A2
-013F5B90381F007C29247FA32C>I<3A3FFF03FFF048018713F8A36C010313F03A00FC00
-7E005D90387E01F8013F5BEB1F83EC87E090380FCFC0903807EF80EB03FF6D90C7FC5C6D
-5A147C14FE130180903803EF80903807CFC0EB0FC7EC83E090381F01F0013F7FEB7E0001
-7C137C49137E0001803A7FFF01FFFC1483B514FE6C15FC140127247EA32C>I<3A7FFF01
-FFFCB5008113FE148314816C010113FC3A03E0000F806C7E151F6D140012005D6D133E13
-7C017E137E013E137CA2013F13FC6D5BA2EB0F815DA2EB07C1ECC3E0A2EB03E3ECE7C013
-0114F75DEB00FFA292C7FC80A2143EA2147E147CA214FC5CA2EA0C01003F5BEA7F83EB87
-E0EA7E0F495A387FFF806C90C8FC6C5A6C5AEA07E027367EA32C>I<003FB612E04815F0
-A4007EC7EA1FE0ED3FC0ED7F80EDFF004A5A003C495AC7485A4A5A4A5A4A5A4A5A4AC7FC
-EB01FC495AEB0FF0495A495A495A49C8FC4848EB01E04848EB03F0485A485A485A485A48
-5AB7FCA46C15E024247DA32C>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd ecbx1000 10 57
-/Fd 57 122 df<913A03FF8007FE027F9039F07FFF800103B500FDB512E0010F903A00FF
-FE0FF0D93FF8ECF81F90267FE0019038F03FF849485A4816E014804816C00200ED1FF081
-F007C06F91C7FCA8B912E0A4000390C701C0C7FCB3ABB5D8FC3FEBFF80A43D3A7EB938>
-27 D<12E07E127C7E7E7F6C7E6C7E12037F6C7E7F12007F137E137FA2EB3F80A214C013
-1F14E0A2130F14F0A4EB07F8A514FCB114F8A5EB0FF0A414E0131FA214C0133F1480A2EB
-7F00A2137E13FE5B12015B485A5B1207485A485A90C7FC123E5A12F05A16537BBD25>41
-D<EA0F80EA3FE0EA7FF0A2EAFFF8A213FCA3127FA2123FEA0F9CEA001C133C1338A31378
-137013F0EA01E0A2EA03C0EA0780EA0F005A121C12180E1D798C1B>44
-D<B61280A819087F9620>I<EA0F80EA3FE0EA7FF0A2EAFFF8A5EA7FF0A2EA3FE0EA0F80
-0D0D798C1B>I<141E143E14FE1307137FB5FCA3138FEA000FB3B3A5007FB61280A42136
-79B530>49 D<EB0FFE90387FFFC048B512F0000714FC390FE03FFF261F800F1380263F00
-0313C0D87F8014E0EBE00100FF6D13F07FA2ED7FF8A46C5A6C5A0006C7FCC8FCEDFFF0A2
-16E05C16C04A138016004A5A4A5AEC1FF05D4A5A4AC7FC14FE495AD903F01378495A495A
-495A49C712F8017C14F05B49130148B6FC5A5A5A5A5A4815E0B7FCA425367BB530>I<EB
-03FF011F13F0017F13FC3901FC07FF2603F003138048486C13C0496C13E0EA0FF86D14F0
-487EA66C4814E06C5A6C485AC714C04A138016004A5A4A5AEC3FF090380FFFC05D15F090
-380007FE913801FF806E13C016E0ED7FF016F8ED3FFCA216FEEA1FC0487E487E487EA416
-FCA249137F007F15F801C0EBFFF06C5A6C6C4813E0260FFC0713806CB61200000114FC6C
-6C13F0010790C7FC27377CB530>I<ED07C0150FA2151F153F157F15FF5CA25C5C5C5C14
-3E143C5C5C1301495A5C495A495A5B133E5B13785B485A1203485A5B48C7FC121E5A127C
-5AB81280A4C70001EBC000AA0103B61280A429367DB530>I<001C15C0D81F80130701F8
-137F90B61280A216005D5D15F05D15804AC7FC14F090C9FCA7EB03FE90381FFFE0017F13
-F89038FE07FC9038F003FFD9C0011380496C13C090C7FC000E15E0C8127F16F0A216F8A3
-121FEA3FC0487E12FF7FA316F05B15FFD87F8014E0007EC713C0003E5B003F4913806C6C
-481300390FF01FFE6CB512F8000114E06C6C1380D90FF8C7FC25377BB530>I<EC0FF8EC
-FFFE0103EBFF8090390FF80FC090393FE003E090397F8001F09038FF000F48EC1FF84848
-133F485A120F5B121FA2003FEC1FF0ED0FE0484890C7FCA31408EC7FF039FFF1FFFC01F3
-13FFD9F78013809039FF007FC049EB3FE04914F0ED1FF85B16FCA34914FEA4127FA5123F
-16FCA26C7E16F8000F143F6D14F0000715E06C6CEB7FC03A01FF81FF806C90B51200013F
-13FC010F13F00101138027377CB530>I<123C123EEA3FE090B71280A41700485D5E5E5E
-5EA2007CC7EA0FC000784A5A4BC7FC00F8147E485C5D14014A5AC7485A4A5AA24A5A143F
-4AC8FCA214FEA213015C1303A21307A2130F5CA2131FA5133FA96D5A6D5A6D5A29397BB7
-30>I<49B47E010F13F0013F13FC9038FE01FF3A01F8007F804848EB3FC04848EB1FE015
-0F484814F01507121FA27F7F7F6D130F01FF14E014C09138E01FC06CEBF83F9138FE7F80
-6C9038FFFE005D6C14F06C14FC6C14FF6D14806D14C090B612E0D803FD14F02607F07F13
-F848487E261FC00F13FC383F8003007F010013FE90C7127F151F00FE140715031501A215
-00A216FC7E6C14016D14F86C6C13036DEB07F06C6CEB0FE0D80FFEEB7FC00003B61200C6
-14FC013F13F00103138027377CB530>I<ED03E04B7EA24B7EA34B7EA24B7EA34B7EA292
-B57EA34A8015F302038015E1A202078015C0020F80ED807FA2021F80ED003F4A80023E13
-1FA2027E80027C7F02FC814A7FA20101824A7F49B77EA3498202C0C7FC010F824A147FA2
-011F8291C8123F4982013E151FA2017E82017C8101FE83B500F80107B61280A4413A7DB9
-48>65 D<B812C017FC17FF18C028007FF000037F04007F717E717E171F84A2717EA74D5A
-A260173F4D5A4D5A4C13C0040F5B91B600FCC7FCA2EFFF8002F0C713F0EF3FF8717E717E
-717E19807113C0A319E0A719C0A25F4D138019005FEF7FFE4C485AB912F018C095C7FC17
-F03B397DB844>I<DB3FFCEB01C00203B5EAC003021FECF00791B6EAFC0F01039039FC00
-FF3F4901C0EB1FFFD91FFEC77E49481403D97FF080494880485B48177F4849153F4890C9
-FC181F485A180F123F5B1807127FA24993C7FC12FFAD127F7FF003C0123FA27F001F1707
-A26C6C1780180F6C6D16006C6D5D6C173E6C6D157ED97FF85D6D6C4A5A6DB44A5A010701
-C0EB0FE06D01FCEBFF80010090B548C7FC021F14F8020314E09126003FFEC8FC3A3B7BB9
-45>I<B87E17F817FF18C028007FF8000713F09338007FF8EF1FFE717E050313807113C0
-A27113E0F07FF0A2F03FF8A219FC181FA219FEA419FFAC19FEA419FC183FA219F8187F19
-F0F0FFE0A24D13C04D13804D1300EF1FFEEF7FFC933807FFF0B912C095C7FC17FC178040
-397DB849>I<B912F0A426007FF8C7FCEF1FF8170717031701A21700A21878A3043C137C
-183CA41800167CA216FC150391B5FCA4ECF8031500167CA2163C180FA3181EA293C7FCA2
-183EA2183C187CA218FCA2EF01F81703170F173FEE01FFB9FC18F0A338397DB83F>I<B9
-12C0A43A007FF800039338007FE0171F170F1707A21703A21701A318F0EE7800A41800A2
-16F8A21501150791B5FCA4ECF80715011500A21678A693C8FCADB7FCA434397DB83C>I<
-B6D8FC03B612F0A426007FF8C70001EBE000B3A391B8FCA402F8C71201B3A6B6D8FC03B6
-12F0A444397DB84B>72 D<B612FCA439007FF800B3B3ADB612FCA41E397DB824>I<B7FC
-A426007FF8C9FCB3ACEF0780A5170F1800A35FA25FA25F5F5E5EEE0FFE167FB8FCA43139
-7DB839>76 D<B500F80403B512F06E5EA26E5ED8007FF1E000A2D97BFF161EA201796D5D
-A201786D5DA26E6C5DA36E6C4A5AA26E6C4A5AA26E6C4A5AA26E6C4A5AA26E6C141EA36E
-6D5BA26E6D5BA26F6C5BA26F6C485AA36F6C485AA26F6C485AA26F6C48C7FCA2923803FF
-1EA36F13BCA26F13F8A2705AA2705AA213FCB500FC6D4848B612F0A2EE0F80EE07005439
-7DB85B>I<B500FC0203B512F0A28080C66C6D90390003F0006F6E5A81017B7F13798101
-787F6E7E6E7E6E7F6E7FA26E7F6E7F6E7F6E7F6F7E153F826F13806F13C06F13E06F13F0
-6F13F88117FCEE7FFEEE3FFF7013817013C17013E18218F17013F97013FDEF7FFF8383A2
-8383838383187FA2183F181F01FC160FB500FC150718031801A244397DB84B>I<EDFFF8
-020FEBFF80027F14F0903A01FFC01FFC010790380007FFD91FFC010113C0D93FF06D6C7E
-49486E7E49486E7E48496E7E48834890C86C7EA248486F1380A248486F13C0A2003F18E0
-A348486F13F0A400FF18F8AC007F18F06D5DA3003F18E0A26D5D001F18C0A26C6C4B1380
-6C18006E5C6C6D4A5A6C5F6C6D4A5A6D6C4A5AD93FFC49485A6DB401075B0107D9C01F90
-C7FC010190B512FC6D6C14F0020F1480020001F8C8FC3D3B7BB948>I<B8FC17F017FEEF
-FF8028007FF8000F13C0040113E07013F0EF7FF8EF3FFCA2EF1FFEA218FFA818FEA2EF3F
-FCA2EF7FF8EFFFF04C13E0040F13C091B7120017FC17E002F8C9FCB3A4B612FCA438397D
-B841>I<B712FCEEFFE017FC17FF28007FF8000F13C004017F707F717E717EA2717EA284
-A760A24D5A604D5A4D5A04035B041F90C8FC91B612FC17E0839139F8003FFCEE0FFF707F
-707F8284A2707FA584A51A601AF084177F1901DD3FFE13E0B600FC011F130394390FFF87
-C071EBFF8005011400CBEA1FFC443A7DB848>82 D<D907FF130E013FEBE01E90B5EAF83E
-0003ECFE7E3A07FC01FFFE390FF0001F4848130F48481303491301007F140090C8FC167E
-5A163EA27F161E7F7F6D91C7FC13FC387FFFE014FEECFFF06C14FE6F7E6C816C15F06C81
-6C81C681133F010F801301D9000F1480EC007F030F13C01503818100F0157FA3163FA27E
-17807E167F6C16007E6D14FE01E0495A01F813039039FF801FF800FC90B512E0D8F83F5C
-D8F00749C7FC39E0007FF02A3B7BB935>I<003FB91280A4D9F800EBF003D87FC0923800
-7FC049161F007EC7150FA2007C1707A200781703A400F818E0481701A4C892C7FCB3AE01
-0FB7FCA43B387DB742>I<B600FC011FB512C0A426007FF8C8381FC000725AB3B3181F01
-3F94C7FC8060011F163E6D6C157E187C6D6C15FC6D6D495A6D6DEB07F06D01F0EB1FE0DA
-7FFEEBFFC0021FB6C8FC02075C020014F0030F1380423A7DB849>I<B600F00103B512E0
-A4C601F0C83807F0006E5E017F5F6E150FA2013F5F6E151F011F94C7FC6E5D6D163E6F14
-7E6D167CA26F14FC6D5E6F13016D5E6F13036D5E811707027F5D6F130F023F5D6F131F02
-1F92C8FC815F6E143EEE807E6E147CEEC0FC6E5C16E016E16E5C16F36E5C16FF6F5BA36F
-5BA26F90C9FCA26F5AA36F5AA26F5AA26F5A433A7EB848>I<B6D8E01FB500FC90383FFF
-FCA4000101F0C7D83FFCC8EA7E006C71153C171F6E197C017F701578836E7014F8013F6F
-5E6E1801011F4B6D5CA26E18036D4B6D5CA26D6D496D495A173C6F170F6D037C6D91C7FC
-EF787F6F5F6D4B6C6C131E816D02016E5BEFE01F03F8177C027F01036E13784D7E03FCEE
-80F8023F49486C5C15FE021F010FEDC1E04D7E03FF16C36E49EDE3C0041E7F049E15F76E
-01BC6D5C04FC15FF6E95C8FC4C80A26E5F4C143F6E5F4C141FA2037F5E4C140FA26F486E
-5AA2031F5E93C812036F5E5E3A7EB863>I<007FB5D8F803B512F8A4C66C48C7D80FF0C7
-FC6D6C5D6D5E6F495A6D6D49C8FC7F6D6D137E6F5B6DEBF8016D5D6F485A6E6C485A023F
-130FDA1FFF5BEE9F806E01FFC9FC805E6E5B6E5B80826F7E153F826F7F5D4B7F92B57EA2
-DA01F97FDA03F17F03F07F913807E07FDA0FC07F021F6D7E4B7E4A486C7F027E8102FE6D
-7F4A7F49488149486D7F0107804A6E7E49488149486E7E013F81017F83B60107B61280A4
-41397DB848>I<EB3FFE0003B512E0000F14F8391FF00FFE003FEB03FF6D6C7F6E7FA26F
-7EA26C5A6C5AEA0380C8FCA2EC3FFF010FB5FC137F3901FFF87F00071380380FFE00EA3F
-F85B485A12FF5BA415FF6D5A127F263FF00713F83B1FFC1FBFFFC0390FFFFE1F0003EBF8
-0F39003FE0032A257DA42E>97 D<13FFB5FCA412077EAF4AB47E020F13F0023F13FC9138
-FE03FFDAF00013804AEB7FC00280EB3FE091C713F0EE1FF8A217FC160FA217FEAA17FCA3
-EE1FF8A217F06E133F6EEB7FE06E14C0903AFDF001FF80903AF8FC07FE009039F03FFFF8
-D9E00F13E0D9C00390C7FC2F3A7EB935>I<903801FFC0010F13FC017F13FFD9FF801380
-2603FE0013C048485AEA0FF8121F13F0123F6E13804848EB7F00151C92C7FC12FFA9127F
-A27F123FED01E06C7E15036C6CEB07C06C6C14806C6C131FC69038C07E006DB45A010F13
-F00101138023257DA42A>I<EE7F80ED7FFFA4150381AF903801FF81010F13F1013F13FD
-9038FFC07F0003EB001FD807FC1307000F8048487F5B123FA2485AA312FFAA127FA27F12
-3FA26C6C5B000F5C6C6C5B6C6C4913C02701FF80FD13FE39007FFFF9011F13E101011301
-2F3A7DB935>I<903803FF80011F13F0017F13FC3901FF83FE3A03FE007F804848133F48
-4814C0001FEC1FE05B003FEC0FF0A2485A16F8150712FFA290B6FCA301E0C8FCA4127FA3
-6C7E1678121F6C6C14F86D14F000071403D801FFEB0FE06C9038C07FC06DB51200010F13
-FC010113E025257DA42C>I<EC1FF0903801FFFC010713FF90391FF87F8090383FE0FFD9
-FFC113C0A2481381A24813016E1380A2ED3E0092C7FCA8B6FCA4000390C8FCB3ABB512FE
-A4223A7DB91D>I<161FD907FEEBFFC090387FFFE348B6EAEFE02607FE07138F260FF801
-131F48486C138F003F15CF4990387FC7C0EEC000007F81A6003F5DA26D13FF001F5D6C6C
-4890C7FC3907FE07FE48B512F86D13E0261E07FEC8FC90CAFCA2123E123F7F6C7E90B512
-F8EDFF8016E06C15F86C816C815A001F81393FC0000F48C8138048157F5A163FA36C157F
-6C16006D5C6C6C495AD81FF0EB07FCD807FEEB3FF00001B612C06C6C91C7FC010713F02B
-377DA530>I<13FFB5FCA412077EAFED7FC0913803FFF8020F13FE91381F03FFDA3C0113
-8014784A7E4A14C05CA25CA291C7FCB3A3B5D8FC3F13FFA4303A7DB935>I<EA01F0EA07
-FC487EA2487EA56C5AA26C5AEA01F0C8FCA913FF127FA412077EB3A9B512F8A4153B7DBA
-1B>I<141FEC7FC0ECFFE0A24913F0A56D13E0A2EC7FC0EC1F0091C7FCA9EC0FF0EB0FFF
-A4EB007F143FB3B0121FEA3F80EA7FC0EAFFE0EC7FE0A215C014FF6C481380903883FE00
-6CB45A000F13F0000113801C4B86BA1D>I<13FFB5FCA412077EAF92380FFFE0A4923803
-FC0016F0ED0FE0ED1F804BC7FC157E5DEC03F8EC07E04A5A141FEC7FE04A7E8181A2ECCF
-FEEC0FFF496C7F806E7F6E7F82157F6F7E6F7E82150F82B5D8F83F13F8A42D3A7EB932>
-I<13FFB5FCA412077EB3B3ACB512FCA4163A7DB91B>I<01FED97FE0EB0FFC00FF902601
-FFFC90383FFF80020701FF90B512E0DA1F81903983F03FF0DA3C00903887801F000749DA
-CF007F00034914DE6D48D97FFC6D7E4A5CA24A5CA291C75BB3A3B5D8FC1FB50083B512F0
-A44C257DA451>I<01FEEB7FC000FF903803FFF8020F13FE91381F03FFDA3C0113800007
-13780003497E6D4814C05CA25CA291C7FCB3A3B5D8FC3F13FFA430257DA435>I<903801
-FFC0010F13F8017F13FFD9FF807F3A03FE003FE048486D7E48486D7E48486D7EA2003F81
-491303007F81A300FF1680A9007F1600A3003F5D6D1307001F5DA26C6C495A6C6C495A6C
-6C495A6C6C6CB45A6C6CB5C7FC011F13FC010113C029257DA430>I<9039FF01FF80B500
-0F13F0023F13FC9138FE07FFDAF00113800003496C13C00280EB7FE091C713F0EE3FF8A2
-EE1FFCA3EE0FFEAA17FC161FA217F8163F17F06E137F6E14E06EEBFFC0DAF00313809139
-FC07FE0091383FFFF8020F13E0020390C7FC91C9FCACB512FCA42F357EA435>I<9038FE
-03F000FFEB0FFEEC3FFF91387C7F809138F8FFC000075B6C6C5A5CA29138807F80ED3F00
-150C92C7FC91C8FCB3A2B512FEA422257EA427>114 D<90383FF0383903FFFEF8000F13
-FF381FC00F383F0003007E1301007C130012FC15787E7E6D130013FCEBFFE06C13FCECFF
-806C14C06C14F06C14F81203C614FC131F9038007FFE140700F0130114007E157E7E157C
-6C14FC6C14F8EB80019038F007F090B512C000F8140038E01FF81F257DA426>I<130FA5
-5BA45BA25B5BA25A1207001FEBFFE0B6FCA3000390C7FCB21578A815F86CEB80F014816C
-EBC3E090383FFFC06D1380903803FE001D357EB425>I<01FFEC3FC0B5EB3FFFA4000714
-016C80B3A35DA25DA26C5C6E4813E06CD9C03E13FF90387FFFFC011F13F0010313803025
-7DA435>I<B539F001FFF8A4000390C7EA1F00161E6E133E6C153C6E137C6C15786E13F8
-017F5CECF001013F5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E5A6D131E15
-BE6D13BC15FC6D5BA36E5AA26E5AA26E5AA26E5AA22D257EA432>I<B500F1B538803FFF
-A43D07FE000FF80003E06C6C010715C082028015076C6E6C148015076C01C0ED0F00826E
-485C017FED801E5D90273FF01E7F5B17C0DAF83E147C011F90393C3FE078037C14F8903B
-0FFC781FF0F0A29139FEF00FF10107EDF9E002FF14FB6D496CB45AA24B7E6D5EA26D496C
-90C7FCA292C7FC6E5CA2023E147C023C143C40257EA445>I<B539F01FFFF0A400039039
-8003F8006C01C013E06C1407D97FE05B6D6C485A6E48C7FC90381FFC3E010F5B903807FE
-FC6D6C5A5D6D5B6D5B6E7E6E7E814A7EA24A7E903801F3FFD903E37FD907C17FEB0FC049
-486C7E4A6C7E013E80496D7E49130F00016E7EB590383FFFF8A42D257EA432>I<B539F0
-01FFF8A4000390C7EA1F00161E6E133E6C153C6E137C6C15786E13F8017F5CECF001013F
-5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E5A6D131E15BE6D13BC15FC6D5B
-A36E5AA26E5AA26E5AA26E5AA292C8FCA25C141E003F133E387F803C38FFC07C147814F8
-EBC1F0EBC3E06C485A387D1F80D83FFFC9FCEA1FFCEA07F02D357EA432>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fe ecbx1440 14.4 35
-/Fe 35 122 df<DC7FFEECFFC0031FB5D8801F13F092B6D8E07F13FC020703F9B57E021F
-D9C007B5EAC1FF91277FFE000102071380DAFFF8010713FC010301E049494813C0495B49
-494913F04990C7FC19E0495A741380017F17C04A6E6E130071EC00FC98C7FCAEBB12FEA5
-26007FFCC7000701C0C8FCB3B3A7007FB5D8FC07B612F0A552547DD34D>27
-D<151E153E15FE1403140F147FEB07FF0003B5FCB6FCA3EBF87FEAFC00C7FCB3B3B3A600
-7FB712FCA52E4E76CD42>49 D<EC1FFE49B512F0010F14FC013FECFF804915E02701FF80
-3F7F2703FC000713FCD807F001017F48486D7FD81F806E138048C87E7013C0D87FE016E0
-01F8806D16F000FF817F7013F8A56C5AA26C5A6C5AEA0380C914F05EA218E05E18C05E18
-804C13005F4C5A4C5A5F4B5B4B5B4B5B94C7FCED0FFC4B5A4B5AED7FC04B5A4A90C8FCEC
-03FC4A5A4A4814F84A5A4A5A4AC8FC02FEEC01F0495A495A495A5CD90F80140349C8FC01
-3E1507017FB7FC90B812E05A5A5A5A5A5A5AB9FC18C0A4354E7ACD42>I<913807FFC002
-7F13FC0103B67E010F15E090261FF80313F890267FC0007F01FEC7EA3FFE48488148486E
-138013FE486C6C6D13C0804817E080A66C5B18C06C5B6C90C75AD80038168090C8FC4C13
-00A24C5A5F4C5A4B5B4B13C0030F5BDB7FFEC7FC91387FFFF816C016FCEEFF80DA000313
-E09238007FF8EE3FFE707E70138018C07013E018F07013F8A218FC82A218FEA3EA03C0EA
-0FF0EA3FFC487EA2B5FCA218FCA25E18F8A26C4816F0495C4916E0D83FE04A13C06C485C
-D80FF04A1380D807FE91387FFE003B03FFE003FFFC6C90B65A6C6C15E0010F92C7FC0101
-14FCD9001F1380374F7BCD42>I<17FC1601A216031607160FA2161F163F167FA216FF5D
-5DA25D5D5D167F153E157E15FC15F8EC01F01403EC07E015C0EC0F80141FEC3F00143E5C
-14FC495A5C495A1307495A5C49C7FC5B137E137C5B1201485A5B485A120F485A90C8FC12
-3E127E5ABA1280A5C901FCC7FCAF021FB71280A5394F7CCE42>I<486C150601F0153E01
-FEEC01FED9FFF0133F91B65A5F5F5F5F5F94C7FC16FC5E16E093C8FC15FC01F0138091CA
-FCAC913807FF80023F13F891B512FE01F36E7E9026FFFC0113E09139E0007FF891C76C7E
-496E7E01F86E7E5B7013804916C0C9FC18E08218F0A418F8A31203EA0FE0EA3FF8487EA2
-12FF7FA218F0A25B5E6C4816E05B01C016C06CC85A18806C6C4A13007FD80FF04A5A6C6C
-ECFFFCD803FE4913F02701FFE00F5B6C6CB612806D92C7FC010F14F8010114C09026003F
-FCC8FC354F7ACD42>I<ED07FE92B512C0020314F0021F14FC91397FFC01FE9139FFE000
-7F01030180EB3F804990C7121F4948EC7FC0494814FF4948010313E0495A49485B5A485B
-A2485BA2486F13C091C7FC4803001300177E94C7FC5AA25B127FA2ED3FF04AB5FC020714
-C000FF4914F091391F807FF891393E001FFE02786D7E4A6D13807013C06D5A4A6D13E018
-F05C7013F8A291C813FCA44916FEA3127FA6123FA37F6C17FCA36C17F85E7E6E15F06C17
-E06C6D5B6E15C06C4B13806D6C491300D93FFC495A6DB4EBFFFC010790B512F06D5D0100
-1580021F01FCC7FC020313C0374F7BCD42>I<B912FEF0FFF019FE737E1AE0D8000F01C0
-C7001F7F06037F727F726C7E867313807313C0A27313E0A37313F0A94F13E0A34F13C01B
-80614F1300624F5A06035B4E13E0063F5B92B8C7FC19F8A2F1FF8003C0C7001F13E00601
-13F89538007FFE737E070F13C01BE07313F0851BF87313FCA27313FEA31BFFA91BFEA261
-1BFCA2614F13F81BF0614F13E0077F13C04EB51280060FEBFE00BB5A1AF01AC04FC7FC19
-C050527BD15D>66 D<932603FFF01407047F01FF140F0307B600E0131F033F03F8133F92
-B700FE137F02039126C003FF13FF020F01F8C7EA3FC1023F01C0EC0FE391B5C80003B5FC
-4901FC814949814901E082011F498249498292CA7E4948834948835A4A83485B4885A248
-49187FA2485B1B3FA2485B1B1FA25AA21B0091CDFCA2B5FCAE7EA280A36C1A1FA36C7FA2
-1B3F6C7F1B3E6C7F1B7E6C6D187C6C1AFC6E18F86C19016D6CEF03F06D7E6FEE07E06D6D
-EE0FC001076DEE1F806D01F8EE3F006D6D16FE6D01FF4B5A023F01C0EC07F8020F01FCEC
-3FF00203903AFFC001FFC0020091B6C7FC033F15FC030715F0DB007F1480040301F0C8FC
-505479D25F>I<BAFC19F819FF1AE01AF8D8000701F0C7001F13FE06017FDE003F13C007
-0F7F07037F737F737F747E747E747F86747F8886888688A2747FA3881B7FA288A51D80AF
-1D00A564A21BFF64A3505BA2505BA2505BA2505B505B99C7FC505A1A7F4F485A4F13F007
-0F5B073F5B4EB55A061F49C8FCBB12F81AE097C9FC19F896CAFC59527CD165>I<BB12FC
-A5D8000701F0C7000F7F1800191F190F19071903190119001A7E1A7F86A386A51B80DD03
-E0130FA497C7FCA31707A3170F171F173FEE01FF92B6FCA5EDF001EE003F171F170F1707
-A31703A794CAFCB3A2B812F0A549527CD153>70 D<B8D88007B712FCA5D8000701F0C900
-3FEB8000B3AE92BAFCA503F0C9123FB3B1B8D88007B712FCA55E527CD167>72
-D<B81280A5D8000701F0C7FCB3B3B3B2B81280A529527DD130>I<B812E0A5D8000F01E0
-CAFCB3B3A91AF8A419011AF0A51903A31907A2190F1AE0191FA2193F197F19FF60180760
-187F0503B5FCBB12C0A545527CD14F>76 D<B912E018FF19F019FE737ED8000701F0C714
-E0060F7F060313FC06007F737E737F8587737FA28785A287A863A261636361634F90C8FC
-4F5A4F5A06035B060F13E095B5128092B748C9FC19F019C019F09226F0000713FC050013
-FF063F7F727F727F727F727FA2727FA28486A886A71D707513F8A2851C017301C013F0A2
-73EBE003B86C6D9038F007E0739038FC1FC0070190B51280736C1400080F5BCE13F85D53
-7CD162>82 D<DA0FFE141C91B500F0133C010702FC137C011F02FF13FC017F15C19026FF
-F00113E148903980001FFB4890C7EA07FFD807FC14014848804848153F171F4848150FA2
-007F1607491503A2170112FFA217007FA26D167CA27F7F6D93C7FC6C7E14C014F8ECFF80
-6C14F8EDFFC06C15FC6CEDFF8017F06C16FC6C826C707E6C836D82011F8201078213016D
-6C81020781EC007F030380ED003F040314801600173F837113C0838312F883A3837EA319
-807EA26C5E19007F6D4B5A7F6D4B5A01FC4B5A6D151FD9FFC04A5AD97FF8ECFFE028FE1F
-FF80075B010790B6C7FCD8FC0115FC486C6C14F048010F14C0489026007FFCC8FC3A5479
-D249>I<B700FE4AB612F0A5D8000F01E0CA387FC000091FC7FCB3B3B26D611B3E811B7E
-6D197CA26D6D17FC636D6D1601027F4D5A6F4C5A023F170F6E6C4C5A6E6D4B5A6E01E003
-FFC8FC6E01F8EC03FE020001FEEC1FFC923B7FFFE001FFF8031F90B612E0030716800300
-4BC9FC041F14F0040091CAFC5C537CD165>85 D<EC3FFE0107B512E0011F14FC017F14FF
-2701FFC00F13C02703FE00037F486C01007F6E6D7E486D80707EA2707EA3707F6C5B6C90
-C7FC6C5AC9FCA60307B5FC0203B6FC147F0103B7FC011FEBF00F017F1300EBFFFC000313
-F04813C0485B4890C7FC5A5B485AF081F012FF5BA35EA26D5C127F6D5C003F03F713C36D
-D901E314E06CD9C00714FF00079026F01F8114C06C90B5C61480C602FC6D1300011F01F0
-EB3FFC01010180EB07F03C387CB642>97 D<EB3FF8B5FCA51203C6FCB3A4EE7FF00307B5
-FC031F14C0037F14F0913AF9FF007FFCDAFFF8EB1FFF03E001077F03806D7F92C76C7F4A
-6E7F5C4A6F7E85183F85A38584A31A80AD1A00A36061A261187F616E15FF616E4A5B6E4A
-5B6F495BDACFE04990C7FCDA87F0EB3FFE913A01FE01FFF8496CB65A49013F14C0490107
-49C8FC90C813E041547DD249>I<913803FFE0023F13FE91B67E010315E0010F9038003F
-F8D93FFCEB07FC4948497E4948131F4849497E485B485BA24890C7FC5A5B003F6F5A705A
-705A007F92C8FC5BA312FFAD127F7FA3123F7F6CEE0F80A26C6D141F18006C6D5C6C6D14
-3E6C6D147E6C6D5C6D6C495A6DB4EB07F0010F9038C01FE06D90B5128001014AC7FCD900
-3F13F80203138031387CB63A>I<943803FF80040FB5FCA5EE003F170FB3A4913803FF80
-023F13F849B512FE0107ECFF8F011F9038C03FEF90273FFE0007B5FCD97FF8130149487F
-484980484980484980488291C8FC5A5B123FA2127F5BA312FFAD127FA37F123FA3121F7F
-6C5E6C6D5C5F6C6D91B5FC6C6D5B6C6D4914E0D97FFCD90FEFEBFF80D91FFFEB7F8F0107
-90B5120F010114FC6D6C13E00207010049C7FC41547CD249>I<913807FF80027F13F849
-B512FE01076E7E011F010313E0903A3FFC007FF0D97FF06D7E49486D7E4849130F48496D
-7E48824890C77E1880485A82003F17C0A3485A18E082A212FFA290B8FCA401FCCAFCA612
-7FA37F123FA2EF03E06C7E17076C17C06C6D140F18806C6D141F6C6DEC3F006C6D147ED9
-7FFC495AD91FFFEB07F86D9038E03FF0010390B512C001005D023F01FCC7FC020113E033
-387CB63C>I<DA1FFE14FE49B539E007FF80010FDAFC1F13C0013FDAFF7F13E090267FF8
-07EBFF072701FFE001EBF07F48497E484990387FF83F91C7003F14C048EEFC1F489338FE
-070049021F90C7FCA2003F82A9001F5EA26D143F6C5E6C5E6E137F6C6D495A6C6D485B6C
-D9F80713804890B6C8FCD803EF14FC01C114E02707C01FFEC9FC49CBFCA2487EA37FA27F
-13FC90B612FE6CEDFFF017FCEFFF806C8318F06C836C837F48B87E1207D80FFCC700037F
-4848EC003F4848150F48486F138083485A83A56D5D007F18006D5D003F5F6C6C4B5A01FE
-153FD807FFED7FF06C01C049485AC601FC011F1380013FB648C7FC010F15F8010115C0D9
-000F01F8C8FC3B4F7CB542>103 D<EB3FF8B5FCA51203C6FCB3A4EE1FFC93B57E030314
-E0030F14F892391FC07FFC92397E003FFE03F86D7EECF9F04B6D7FECFBC0ECFF8092C76C
-7FA25CA25CA45CB3ACB6D8F807B612C0A542537CD249>I<133FEBFFC0487F487FA2487F
-A66C5BA26C5B6C5B013FC7FC90C8FCAEEB1FF8B5FCA512017EB3B3A6B612F0A51C547CD3
-24>I<EB3FF8B5FCA51203C6FCB3A50407B512F0A59339007FF000EF3FC04D5A4DC7FCEE
-01FC4C5AEE0FF04C5A4C5A4CC8FC16FEED03FC4B5A4B5A4B5A4B7E4B7EECF9FF02FB7F91
-B57EA28203BF7F031F7F14FE4A6C7FDAF0077F6F7FA26F7F6F7F167F83707F707FA2707F
-707F707FA2707F707F84B6D8F00F14FEA53F537DD245>107 D<EB3FF8B5FCA51203C6FC
-B3B3B3B1B612F8A51D537CD224>I<D93FF0D91FF84AB47EB591B56C010F13F8030302E0
-013F13FE030F6E90B6FCDB3F809027F803F80F7F922A7E007FFC07E0077F000302F89028
-3FFE0F80037FC6D9F1F0011F49487EDAF3E0DAFF3E814B153CDAF7805D92C76C496D7F14
-FF4A5EA24A5EA34A5EB3ADB6D8F80FB66CB612F8A565367BB56E>I<D93FF0EB1FFCB591
-B57E030314E0030F14F892391FC07FFC92397E003FFE000302F86D7EC6EBF1F04B6D7FEC
-F3C0ECF78092C76C7F14FF5CA25CA45CB3ACB6D8F807B612C0A542367CB549>I<913801
-FFC0023F13FE91B67E010315E0010F018013F8903A3FFC001FFED97FF0EB07FF49486D7F
-48496D7F48496D7F91C8127F4883488349153F001F83A2003F8349151FA2007F83A400FF
-1880AC007F1800A3003F5F6D153FA2001F5FA26C6C4B5AA26C6D4A5A6C5F6C6D495B6C6D
-495B6D6C4990C7FCD93FFCEB1FFE6DB46CB45A010790B512F0010115C0D9003F49C8FC02
-0313E039387CB642>I<90393FF001FCB590380FFF804B13E0037F13F09238FE1FF89138
-F1F83F00019138F07FFC6CEBF3E015C0ECF780A2ECFF00EE3FF84AEB1FF0EE0FE093C7FC
-5CA45CB3ABB612FEA52E367DB535>114 D<903903FFC00E011FEBFC1E90B6127E000315
-FE3907FE003FD80FF0130F4848130348481301491300127F90C8127EA248153EA27FA27F
-01F091C7FC13FCEBFF806C13FEECFFF06C14FE6F7E6C15E06C816C15FC6C81C681133F01
-0F15801301D9000F14C0EC003F030713E0150100F880167F6C153FA2161F7EA217C07E6D
-143F17807F6DEC7F0001F85C6DEB03FE9039FF801FFC486CB512F0D8F81F14C0D8F00791
-C7FC39E0007FF02B387CB634>I<147CA614FCA41301A31303A21307A2130F131F133F13
-7F13FF1203000F90B512FEB7FCA426007FFCC8FCB3A9EE0F80ABEE1F006D7EA2011F143E
-806D6D5A6DEBC1F86DEBFFF001005C023F1380DA03FEC7FC294D7ECB33>I<D93FF89138
-01FFC0B50207B5FCA50003ED001FC61607B3AE5FA35FA25F137F5F6D6C14F7DC01E713F0
-6D6CD907C7EBFFC0903A0FFF801F876D90B51207010114FC6D6C13F0020701C091C7FC42
-377CB549>I<B600E090381FFFFCA5000101F8C7000113006CEE007C6E15FC017F5E6E14
-01013F5E8017036D6D5C17076D5E6F130F6D5E6F131F6D93C7FC815F6D6D133E177E6D15
-7C6F13FC027F5C811601DA3FFF5B16036E5C16876E5C16CF6E5C16EF16FF6E91C8FCA26E
-5BA26E5BA26F5AA36F5AA26F5AA26F5AA35E151F93C9FC5D153E157ED81FC0137C487E48
-6C13FC486C5B14015D4A5A14074A5A6C48485A4948CAFC495A383F81FC6CB45A6C5B0003
-13C0C648CBFC3E4D7DB445>121 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Ff ecrm1000 10 81
-/Ff 81 123 df<B81280A2290280962A>21 D<DA0FF813FC91397FFF07FF903B01F807DF
-83C0903A07E001FF0F903B1F8007FE1FE090393F000FFC137E16F85B9338F00780484801
-0790C7FC1503ACB812F8A32801F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7F
-BA30>27 D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E
-497EA25BA2485A6F5AED018092C8FCA9ED03F0B7FCA33901F8000F1503B3AA486C497E26
-7FFFE0B512C0A32A3B7FBA2E>I<EC0FFC91387FFF70903901F803F0903807E00790381F
-800FEB3F00137EA25B150748481303ADB7FCA33901F80003B3AB486C497E267FFFE0B512
-C0A32A3B7FBA2E>I<DA0FF0EB1FF0DA7FFEEBFFFC903B01F80F83F00F903C07E001CFC0
-0380903C1F8000FF0001C090273F0007FE130F017E4948497EA2495CA248485C03076E5A
-03030203C7FC95C8FCA9F007E0BAFCA33C01F80003F0001F1807B3AA486C496C497E267F
-FFE0B500C1B51280A3413B7FBA45>I<007C137C00FE13FEEAFF01A3EAFE00A7007E13FC
-007C137CA8003C137800381338A700181330171E77BA2A>34 D<121C127FEAFF80A213C0
-A3127F121C1200A412011380A2120313005A1206120E5A5A5A12600A1979B917>39
-D<146014E0EB01C0EB0380EB0700130E131E5B5BA25B485AA2485AA212075B120F90C7FC
-A25A121EA2123EA35AA65AB2127CA67EA3121EA2121F7EA27F12077F1203A26C7EA26C7E
-1378A27F7F130E7FEB0380EB01C0EB00E01460135278BD20>I<12C07E12707E7E7E120F
-6C7E6C7EA26C7E6C7EA21378A2137C133C133E131EA2131F7FA21480A3EB07C0A6EB03E0
-B2EB07C0A6EB0F80A31400A25B131EA2133E133C137C1378A25BA2485A485AA2485A48C7
-FC120E5A5A5A5A5A13527CBD20>I<EB0380497EA7397803803C00FC147E00FE14FE397F
-8383FC393FC387F8390FE38FE03903FBBF803900FFFE00EB3FF8EB0FE0A2EB3FF8EBFFFE
-3903FBBF80390FE38FE0393FC387F8397F8383FC39FE0380FE00FC147E0078143C390007
-C000A76D5A1F247BBD2A>I<121C127FEAFF80A213C0A3127F121C1200A412011380A212
-0313005A1206120E5A5A5A12600A19798817>44 D<B512FCA516057F941C>I<121C127F
-EAFF80A5EA7F00121C0909798817>I<1506A2150E150CA2151C151815381530A2157015
-60A215E015C0A214011580A2140315005C1406A2140E140CA2141C1418A214381430A214
-70146014E05CA213015CA2130391C7FCA25B1306A2130E130C131C1318A213381330A213
-701360A213E05BA212015B120390C8FCA25A1206A2120E120CA2121C1218A21238123012
-701260A212E05AA21F537BBD2A>I<EB03F8EB1FFF90387E0FC09038F803E03901E000F0
-484813780007147C48487FA248C77EA2481580A3007EEC0FC0A500FE15E0B3007E15C0A4
-007F141F6C1580A36C1500A26C6C133EA26C6C5B6C6C5BEBF0013900F803E090387E0FC0
-D91FFFC7FCEB03F823397DB62A>I<EB01C013031307131F13FFB5FCA2131F1200B3B3A7
-497E007FB512F0A31C3779B62A>I<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0001E
-6D7E001C6D7E486D7E5A6E7E126012FE6CEC7F807FA56CC7FC121CC8FCEDFF00A25D1401
-5D14035D4A5A4A5A5D4A5A4AC7FC147E5C495A14E0495A495A49C8FC011EEB01805B5B49
-130348481400485A485A90C75A48B6FC5A5A485CB6FCA321377CB62A>I<EB07F8EB3FFF
-90B512C03901F80FF03903C007F848486C7E390E0001FEEA0F80391FE000FF7FA56C5A6C
-5AC7485AA25D14035D4A5A5DEC0F80027FC7FCEB1FFCECFF809038000FE06E7EEC01FC81
-6E7EED7F80A216C0A2153F16E0A2121EEA7F80A2487EA316C0157F491480007EC7FC0070
-ECFF006C495A121E390F8003F83907F00FF00001B512C06C6C90C7FCEB0FF823397DB62A
->I<1538A2157815F8A2140114031407A2140F141F141B14331473146314C313011483EB
-030313071306130C131C131813301370136013C01201EA038013005A120E120C5A123812
-305A12E0B712F8A3C73803F800AA4A7E0103B512F8A325387EB72A>I<0006140CD80780
-133C9038F003F890B5FC5D5D158092C7FC14FC38067FE090C9FCAAEB07F8EB1FFE903878
-0F809038E007E03907C003F0496C7E130000066D7E81C8FC8181A21680A4121C127F5A7F
-A390C713005D12FC00605C12704A5A6C5C6C1303001E495A6C6C485A3907E03F800001B5
-C7FC38007FFCEB1FE021397CB62A>I<EC3FC0903801FFF0010713FC90380FE03E90383F
-800790387E001F49EB3F804848137F485A12075B000FEC3F0049131E001F91C7FC5B123F
-A3127F90C9FCEB01FC903807FF8039FF1E07E090383801F0496C7E01607F01E0137E497F
-16805BED1FC0A390C713E0A57EA47F123F16C0A2001FEC3F807F000F15006D5B000714FE
-6C6C5B6C6C485A3900FE07F090387FFFC0011F90C7FCEB03FC23397DB62A>I<12301238
-123E003FB612E0A316C05A168016000070C712060060140E5D5D00E014304814705D5DC7
-12014A5A4AC7FC1406140E5CA25C1478147014F05C1301A213035C1307A2130FA3131F5C
-A2133FA5137FA96DC8FC131E233A7BB72A>I<EB03F8EB1FFF017F13C09038FC07F03901
-E001F83903C0007C4848133C90C7123E48141E000E141F001E80A3121FA26D5B6D131E7F
-D80FF85B6D137C01FF13786C6D5A6CEBE3E0ECF780C601FFC7FC6D5A6D6C7E010F13E001
-3F7F01F97F3901E07FFE48486C7E380F800F48486C1380001E010113C0487F007C143F00
-78EC1FE0150F00F81407481403A21501A36C15C0A200781403007C15806C14076CEC0F00
-6C6C131ED807E0137C3903F803F0C6B55A013F1380D907FCC7FC23397DB62A>I<EB03F8
-EB1FFF017F13C03901FC07E048486C7E3907E001F8000F6D7E4848137E5B003F80A248C7
-1380A25AED1FC0A516E0A56C143FA36C7E157F121F6C6C13FF6C6C13DF000313013901F0
-039F3900FC0F1FD93FFC13C0EB07F090C7FCA2153F1680A216005D120F486C137E486C5B
-A24A5A4A5A49485A381F000F001CEB1F80260F807FC7FC3807FFFE000113F838003FC023
-397DB62A>I<121C127FEAFF80A5EA7F00121CC7FCB2121C127FEAFF80A5EA7F00121C09
-2479A317>I<121C127FEAFF80A5EA7F00121CC7FCB2121C127FEAFF80A213C0A3127F12
-1C1200A412011380A2120313005A1206120E5A5A5A12600A3479A317>I<007FB812F8B9
-12FCCCFCB0B912FC6C17F836147B9E41>61 D<EC03FF021F13E09138FC00FCD901E0131E
-D90780EB0780011EC7EA01E00138EC00704981498148488148488190C97E48D901FC1480
-000ED907FFEB01C0000C90391F03C000001C90267E00E013E000184901701360263801F8
-6D13700030496D13300103EC0FE0267007E00107133800601718495AA200E0171C484848
-150CAA6C6C7E1260A26D6C151C00701718263003F0130F0101141F00386D013F13382618
-00FC01771330001C017E9038E3F070000C90261F03C113E0000E903A07FF00FFC06CD901
-FCEB3F006C90CAFC7F6C7E6C7E13706D167C011EED03FCD90780EC1FF0D901E0ECFF80D9
-00FC90383FFC00021FB51280020301E0C7FC363C7BBA41>64 D<1538A3157CA315FEA34A
-7EA34A6C7EA202077FEC063FA2020E7FEC0C1FA2021C7FEC180FA202387FEC3007A20270
-7FEC6003A202C07F1501A2D901807F81A249C77F167FA20106810107B6FCA24981010CC7
-121FA2496E7EA3496E7EA3496E7EA213E0707E1201486C81D80FFC02071380B56C90B512
-FEA3373C7DBB3E>I<B712E016FC16FF0001903980007FC06C90C7EA1FE0707E707E707E
-A2707EA283A75F16035F4C5A4C5A4C5A4C5AEEFF8091B500FCC7FCA291C7EA7F80EE1FE0
-EE07F0707E707E83707EA21880177F18C0A7188017FFA24C13005F16034C5AEE1FF8486D
-EB7FF0B812C094C7FC16F832397DB83B>I<913A01FF800180020FEBE003027F13F8903A
-01FF807E07903A03FC000F0FD90FF0EB039F4948EB01DFD93F80EB00FF49C8127F01FE15
-3F12014848151F4848150FA248481507A2485A1703123F5B007F1601A35B00FF93C7FCAD
-127F6DED0180A3123F7F001F160318006C7E5F6C7E17066C6C150E6C6C5D00001618017F
-15386D6C5CD91FE05C6D6CEB03C0D903FCEB0F80902701FF803FC7FC9039007FFFFC020F
-13F002011380313D7BBA3C>I<B712C016F816FE000190398001FF806C90C7EA3FE0EE0F
-F0EE03F8707E707E177FA2EF3F8018C0171F18E0170F18F0A3EF07F8A418FCAC18F8A4EF
-0FF0A218E0A2171F18C0EF3F80A2EF7F0017FE4C5A4C5AEE0FF0EE3FE0486DEBFF80B8C7
-FC16F816C036397DB83F>I<B812FEA3000190388000076C90C8FC173F838383A383A318
-80170116C0A394C7FCA31501A21503150F91B5FCA3EC000F15031501A21500A21860A318
-E093C712C0A41701A3EF0380A21707A2170F173F177F486D903807FF00B9FCA333397EB8
-38>I<B812F8A30001903880001F6C90C71201EE00FC177C173C171CA2170CA4170E1706
-A2ED0180A21700A41503A21507151F91B5FCA3EC001F15071503A21501A692C8FCAD4813
-C0B612C0A32F397DB836>I<DBFF8013C0020FEBF001023F13FC9139FF803F03903A03FC
-000787D90FF0EB03CF4948EB00EF4948147F4948143F49C8121F485A4848150F48481507
-A248481503A2485A1701123F5B007F1600A448481600AB93B6FCA26C7E9338007FE0EF3F
-C0A2123F7F121FA26C7EA26C7EA26C7E6C7E6C6C157F6D7E6D6C14FF6D6C14EFD90FF8EB
-03C7D903FEEB0783903A00FFC03F0191393FFFFC00020F01F0130002001380383D7CBA41
->I<B648B512FEA30001902680000313006C90C76C5AB3A491B6FCA391C71201B3A6486D
-497EB648B512FEA337397DB83E>I<B612C0A3C6EBC0006D5AB3B3AD497EB612C0A31A39
-7EB81E>I<013FB512E0A39039001FFC00EC07F8B3B3A3123FEA7F80EAFFC0A44A5A1380
-D87F005B0070131F6C5C6C495A6C49C7FC380781FC3801FFF038007F80233B7DB82B>I<
-B649B5FCA3000101809038007FF06C90C8EA3F80053EC7FC173C17385F5F4C5A4C5A4CC8
-FC160E5E5E5E5E4B5AED0780030EC9FC5D153E157E15FF5C4A7F4A6C7E140E4A6C7E4A6C
-7E14704A6C7E4A6C7E14804A6C7E6F7EA26F7F707EA2707E707EA2707EA2707E707EA270
-7E707F8484486D497FB6011FEBFF80A339397DB841>I<B612E0A3000101C0C8FC6C90C9
-FCB3AD1718A517381730A31770A317F0A216011603160FEE1FE0486D13FFB8FCA32D397D
-B834>I<B5933807FFF86E5DA20001F0FC002600DFC0ED1BF8A2D9CFE01533A3D9C7F015
-63A3D9C3F815C3A2D9C1FCEC0183A3D9C0FEEC0303A2027F1406A36E6C130CA36E6C1318
-A26E6C1330A36E6C1360A26E6C13C0A3913901FC0180A3913900FE0300A2ED7F06A3ED3F
-8CA2ED1FD8A3ED0FF0A3486C6D5A487ED80FFC6D48497EB500C00203B512F8A2ED018045
-397DB84C>I<B5913807FFFE8080C69238007FE06EEC1F80D9DFF0EC0F001706EBCFF8EB
-C7FCA2EBC3FEEBC1FFA201C07F6E7EA26E7E6E7E81140F6E7E8114036E7E168080ED7FC0
-16E0153FED1FF0ED0FF8A2ED07FCED03FEA2ED01FF6F1386A2EE7FC6EE3FE6A2EE1FF6EE
-0FFEA216071603A216011600A2177E486C153E487ED80FFC151EB500C0140EA217063739
-7DB83E>I<EC03FF021F13E09138FE01FC903901F8007ED907E0EB1F8049486D7ED93F80
-EB07F049C76C7E01FE6E7E48486E7E49157E0003167F4848ED3F80A24848ED1FC0A2001F
-17E049150F003F17F0A3007F17F8491507A300FF17FCAC007F17F86D150FA3003F17F0A2
-6C6CED1FE0A36C6CED3FC0000717806D157F000317006C6C15FEA26C6C4A5A017F4A5A6D
-6C495A6D6C495AD907E0EB1F80D903F8017FC7FC903900FE01FC91381FFFE0020390C8FC
-363D7BBA41>I<B712C016FC16FF0001D9800013C06C90C7EA1FE0707EEE03F883707EA2
-707EA21880A71800A24C5AA24C5A5FEE0FF04C5AEEFF8091B548C7FC16F091CAFCB3A548
-7FB6FCA331397EB838>I<EC03FF021F13E09138FE01FC903901F8007ED907E0EB1F8049
-486D7ED93F80EB07F049C76C7E01FE6E7E48486E7EA24848157F0007178049153F000F17
-C049151F001F17E0A24848ED0FF0A3007F17F8A2491507A200FF17FCAC007F17F8A26D15
-0FA2003F17F0A26C6CED1FE0A36C6CED3FC00007027C14804AB4FC3C03F80383807F003B
-01FC0701C0FEEC0E002600FE0CEBE1FC017FEC63F8D93F8CEB77F0D91FCCEB3FE0D907EE
-14806DB449C7FC0100D981FC130CEC1FFF0203131C91C7001E131C161F183CEF807CEFC0
-F8EE0FFFA318F08218E07013C07013809338007E00364B7BBA41>I<B612FEEDFFE016F8
-000190388007FE6C90C76C7EEE3FC0707E707E707EA2707EA283A65FA24C5AA24C5A4C5A
-EE3F8004FFC8FCED07FC91B512E05E9138000FF0ED03F8ED00FE82707E707EA2161F83A5
-83A6F00180A217F8160F1803486D01071400B66D6C5A04011306933800FE0ECAEA3FFCEF
-07F0393B7DB83D>I<D90FF813C090383FFE0190B512813903F807E33907E000F7484813
-7F4848133F48C7121F003E140F007E1407A2007C140312FC1501A36C1400A37E6D14006C
-7E7F13F86CB47E6C13F8ECFF806C14E06C14F86C14FEC680013F1480010714C0EB007F02
-0713E0EC007FED3FF0151F150FED07F8A200C01403A21501A37EA216F07E15036C15E06C
-14076C15C06C140F6DEB1F80D8FBF0EB3F00D8F0FE13FE39E03FFFF8010F13E0D8C00190
-C7FC253D7CBA2E>I<003FB812E0A3D9C003EB001F273E0001FE130348EE01F000781600
-00701770A300601730A400E01738481718A4C71600B3B0913807FF80011FB612E0A33539
-7DB83C>I<B6903807FFFEA3000101809038007FE06C90C8EA1F80EF0F001706B3B2170E
-6D150C80171C133F17186D6C14385F6D6C14F06D6C5C6D6C495A6D6CEB07806D6C49C7FC
-91387F807E91381FFFF8020713E09138007F80373B7DB83E>I<B500FC91387FFF80A300
-03018091380FFC006C90C8EA07E0715A6C705A6E1403017F93C7FCA280013F1506A26E14
-0E011F150C80010F5DA28001075DA26E147001031560A26D6C5CA2806D4A5AA2ED800302
-7F91C8FCA291383FC006A215E0021F5BA2EDF01C020F1318A26E6C5AA215FC02035BA2ED
-FEE002015BA26E6C5AA36FC9FCA3153EA2151CA3393B7EB83E>I<B5D8FC07B5D8F001B5
-FCA30007902780001FFEC7EA1FF86C48C7D80FF8EC07E000010307ED03C01B807F6C6F6C
-1500A26E5F017F6E6C1406A280013F4A6C5CA280011F4A6D5BEE067FA26D6C010E6D5BEE
-0C3FA26D6C011C6D5BEE181FA26D6C6F5BEE300FA26D6C6F485AEE6007A26D6C4CC7FC93
-38C003FCA203805D913B7F818001FE06A203C1150EDA3FC3C7EAFF0CA203E3151CDA1FE6
-EC7F98A215F6DA0FFCEC3FF0A302075E4B141FA202035E4B140FA202015E4B1407A20200
-93C8FC4B80503B7EB855>I<007FB590383FFFFCA3C601F801071380D97FE0D903FCC7FC
-013FEC01F06D6C5C5F6D6C5C6D6C13034CC8FC6D6C1306160E6D6C5B6DEB801816389138
-7FC0306E6C5A16E06E6C5A91380FF18015FB6EB4C9FC5D14036E7EA26E7F6F7EA24B7E15
-DF9138019FF09138038FF8150F91380607FC91380E03FE140C4A6C7EEC38000230804A6D
-7E14E04A6D7E49486D7E130391C76C7E01066E7E130E010C6E7E011C1401013C8101FE82
-2607FF80010713E0B500E0013FEBFF80A339397EB83E>I<B500FE91383FFFE0A3000301
-E0913807FE00C649EC03F0017F6F5A606D6C5D6D6C140395C7FC6D6C1406A26D6C5C6D6C
-141C17186D6C143817306D6D5B6E6C13E05F91383FE0015F91381FF003DA0FF890C8FC16
-06913807FC0E160C913803FE1C913801FF185E6E13B016E0157F6F5AB3A24B7E023FB512
-C0A33B397FB83E>I<003FB7FCA39039FC0001FE01C0130349495A003EC7FC003C4A5A5E
-0038141F00784A5A12704B5A5E006014FF4A90C7FCA24A5A5DC712074A5AA24A5A5D143F
-4A5AA24A5A92C8FC5B495AA2495A5C130F4948EB0180A2495A5C137F495A16034890C7FC
-5B1203485AEE0700485A495C001F5D48485C5E4848495A49130FB8FCA329397BB833>I<
-007FB81280B912C0A26C17803204797041>95 D<EB1FE0EBFFFC3803E03F3907000F8039
-0F8007E0486C6C7E13E06E7EA26E7E6C5A6C5AC8FCA4147FEB07FFEB3FE0EBFE00EA03F8
-EA0FF0EA1FC0123F485A90C7FC160C12FEA31401A26C13036CEB077C903980063E18383F
-C01E3A0FE0781FF03A03FFF00FE03A007F8007C026277DA52A>97
-D<EA03F012FFA3120F1203B0EC1FE0EC7FF89038F1E03E9039F3801F809039F7000FC001
-FEEB07E049EB03F049EB01F85BED00FCA216FEA2167E167FAA167E16FEA216FC15016D14
-F8ED03F07F01EEEB07E001C6EB0FC09039C7801F00903881E07E903800FFF8C7EA1FC028
-3B7EB92E>I<EB03FC90381FFF8090387E03E03901F80070484813F83907E001FC380FC0
-03A2EA1F80123F90380001F848EB00F01500A2127E12FEAA127E127FA26C14067F001F14
-0E6D130C000F141C6C6C13386C6C13706C6C13E039007C07C090381FFF00EB07F81F277D
-A525>I<ED0FC0EC03FFA3EC003F150FB0EB03F8EB1FFF90387E078F9038F801EF3903F0
-007F4848133F4848131FA24848130F123F90C7FC5AA2127E12FEAA127E127FA27EA26C6C
-131FA26C6C133F6C6C137F6C6CEBEFF03A01F801CFFF39007C078F90381FFE0FD907F813
-C0283B7DB92E>I<EB07F8EB1FFF90387C0FC03901F803E03903F001F0D807E013F8380F
-C0004848137CA248C7127E153E5A153F127E12FEA3B7FCA248C8FCA5127EA2127FA26C14
-037F001F14076C6C13060007140E6D131CD801F013386C6C137090387E03E090381FFF80
-903803FC0020277EA525>I<147E903803FF8090380FC1E0EB1F8790383F0FF0137EA213
-FCA23901F803C091C7FCADB512FCA3D801F8C7FCB3AB487E387FFFF8A31C3B7FBA19>I<
-ED03F090390FF00FF890393FFC3C3C9039F81F707C3901F00FE03903E007C03A07C003E0
-10000FECF000A248486C7EA86C6C485AA200075C6C6C485A6D485A6D48C7FC38073FFC38
-060FF0000EC9FCA4120FA213C06CB512C015F86C14FE6CECFF804815C03A0F80007FE048
-C7EA0FF0003E140348140116F8481400A56C1401007C15F06CEC03E0003F1407D80F80EB
-0F80D807E0EB3F003901FC01FC39007FFFF0010790C7FC26387EA52A>I<EA03F012FFA3
-120F1203B0EC0FF0EC3FFCECF03F9039F1C01F809039F3800FC0EBF70013FE496D7EA25B
-A35BB3A3486C497EB500C1B51280A3293A7EB92E>I<EA0380EA0FE0487EA56C5AEA0380
-C8FCAAEA03F012FFA312071203B3AA487EB512C0A312387EB717>I<EB01C0EB07F0EB0F
-F8A5EB07F0EB01C090C7FCAAEB01F813FFA313071301B3B3A2123C127E00FF13F01303A2
-14E038FE07C0127C383C0F00EA0FFEEA03F8154984B719>I<EA03F012FFA3120F1203B1
-913801FFFCA39138007FC01600157C15705D4A5A4A5A4AC7FC141E1438147814FC13F1EB
-F3FEEBF73F01FE7FEBF81F496C7E8114076E7E6E7E811400157E157F811680ED1FC0486C
-EB3FF0B500C0B5FCA3283A7EB92C>I<EA03F012FFA3120F1203B3B3AD487EB512C0A312
-3A7EB917>I<2703F00FF0EB1FE000FFD93FFCEB7FF8913AF03F01E07E903BF1C01F8380
-3F3D0FF3800FC7001F802603F70013CE01FE14DC49D907F8EB0FC0A2495CA3495CB3A348
-6C496CEB1FE0B500C1B50083B5FCA340257EA445>I<3903F00FF000FFEB3FFCECF03F90
-39F1C01F803A0FF3800FC03803F70013FE496D7EA25BA35BB3A3486C497EB500C1B51280
-A329257EA42E>I<EB03FE90380FFF8090383E03E09038F800F84848137C48487F48487F
-4848EB0F80001F15C090C712074815E0A2007EEC03F0A400FE15F8A9007E15F0A2007F14
-076C15E0A26C6CEB0FC0000F15806D131F6C6CEB3F006C6C137EC66C13F890387E03F090
-381FFFC0D903FEC7FC25277EA52A>I<3903F01FE000FFEB7FF89038F1E07E9039F3801F
-803A07F7000FC0D803FEEB07E049EB03F04914F849130116FC150016FEA3167FAA16FEA3
-ED01FCA26DEB03F816F06D13076DEB0FE001F614C09039F7803F009038F1E07E9038F0FF
-F8EC1FC091C8FCAB487EB512C0A328357EA42E>I<D903F813C090381FFE0190387E0781
-9038FC01C33903F000E3000714774848133749133F001F141F485A150F48C7FCA312FEAA
-127FA37E6D131F121F6D133F120F6C6C137F6C6C13EF3901F801CF39007E078F90381FFE
-0FEB07F890C7FCABED1FE00203B5FCA328357DA42C>I<3807E01F00FFEB7FC09038E1E3
-E09038E387F0380FE707EA03E613EE9038EC03E09038FC0080491300A45BB3A2487EB512
-F0A31C257EA421>I<EBFF03000313E7380F80FF381E003F487F487F00707F12F0A2807E
-A27EB490C7FCEA7FE013FF6C13E06C13F86C7F00037FC67F01071380EB007F141F00C0EB
-0FC01407A26C1303A37E15806C13077EEC0F00B4131E38F3C07C38E1FFF038C03F801A27
-7DA521>I<1318A51338A31378A313F8120112031207001FB5FCB6FCA2D801F8C7FCB215
-C0A93800FC011580EB7C03017E13006D5AEB0FFEEB01F81A347FB220>I<D803F0EB07E0
-00FFEB01FFA3000FEB001F00031407B3A4150FA3151F12016D133F0000EC77F86D9038E7
-FF8090383F03C790381FFF87903A03FC07E00029267EA42E>I<B538803FFEA33A0FF800
-0FF06C48EB07E00003EC03C06D148000011500A26C6C1306A26D130E017E130CA26D5BA2
-EC8038011F1330A26D6C5AA214E001075BA2903803F180A3D901FBC7FCA214FF6D5AA214
-7CA31438A227257EA32C>I<B53A1FFFE03FFEA3260FF8009038000FF86C48017EEB03E0
-18C00003023EEB0180A26C6C013FEB0300A36C6CEC8006156FA2017E9038EFC00C15C717
-1CD93F01EBE01815830281EBF038D91F831430150102C3EBF87090260FC6001360A2D907
-E66D5A02EC137CA2D903FCEB7F804A133FA2010192C7FC4A7FA20100141E4A130E026013
-0C37257EA33C>I<B538807FFFA33A03FE003FF00001EC1F80000092C7FC017E131C6D13
-186D6C5AECC070010F5B6D6C5AECF180EB03FB6DB4C8FC6D5AA2147F804A7E8114CF9038
-01C7E090380383F090380703F8EB0601496C7E011C137E49137F01787F496D7E486C8000
-0FEC3FF0D8FFFE90B51280A329247FA32C>I<B538803FFEA33A0FF8000FF06C48EB07C0
-0003EC03806C7E16007F00001406A2017E5BA2137F6D5BA26D6C5AA2ECC070010F1360A2
-6D6C5AA214F101035BA2D901FBC7FCA214FF6D5AA2147CA31438A21430A214701460A25C
-A2EA7C0100FE5B130391C8FC1306EAFC0EEA701C6C5AEA1FF0EA0FC027357EA32C>I<00
-3FB512FCA2EB8003D83E0013F8003CEB07F00038EB0FE012300070EB1FC0EC3F80006013
-7F150014FE495AA2C6485A495AA2495A495A495AA290387F000613FEA2485A485A000714
-0E5B4848130C4848131CA24848133C48C7127C48EB03FC90B5FCA21F247EA325>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fg ecss2074 20.74 10
-/Fg 10 116 df<EAFFC0B3B3B3B3B3B390B912FCA83E7570F456>76
-D<D8FFC0F03FF0B3B3B3B3AD6C6CF07FE0A46C6CF0FFC0A36D5F001F1A80A26C6C4D1300
-A26C6C4D5A6D170F6C616E161F6C6D4C5A6C6D4C5A6E16FF6D6C4B5B6D6C4B5B6D6C4B5B
-6D6C6C021F90C7FC6D01E0EC7FFE6D01F849485A6D9026FF801F5B6D91B65A6E5E021F16
-8002074BC8FC020115F86E6C14E0030F91C9FC030013F04C7770F46D>85
-D<91380FFF8049B512F0010F14FC017F14FF48B712C0000782001F824882DAE0007F49C7
-EA3FFE01F8140FD81FC06E7E90C86C1380121E00186F13C0001081CAFCEF7FE0A318F017
-3FAD93B5FC157F0207B6FC143F49B7FC1307011F153F017FEBF80090B512804801F8C7FC
-4813C04890C8FCEA0FFC485A485A5B485A5BA248C9FCA5177FA26D15FFA26C6C5C6D5C6D
-140F6C6C5C01FF91B5FC6CEBE00791B612BF6CEDFE3F16FC6C15F06C15C06CECFE006C6C
-13F0D91FFCC9FC344C77CA4C>97 D<EAFFC0B3B3ADED0FFC92B57E020714E0021F80027F
-14FC91B67E01C38101C7829026CFFE0080D9DFF0131FD9FFC001037F4A6D7F49C86C7E49
-153F496F7E170F496F7E5B717E4981A2711380A2187FA219C0183FA419E0181FAD183F19
-C0A3187FA2198018FFA24D1300A25F6D5E17076D4B5A6D151F4D5A6D4B5A6D15FF6D0203
-5B6E495BD9DFE0013F5B9026CFFC01B5C7FC01C7B65A01C35D01C15D01C05D023F14C002
-0F5C020301FCC8FCC8EA3FE03B7C72FA52>I<ED3FFF4AB512F8020F14FF023F15C04A15
-F049B712FC4916FF49178049EBE0004990C7120FD93FFC02011300D97FF06E7E4948151F
-0280814890C912034894C7FC5B485A5B120F5B121F5B123F5BA3485AA548CCFCAD6C7EA4
-7F123FA27F121F7FA26C7EA26C6C17806D1601000317036C6C160F6E151F6C01E0ED7FC0
-6D6CEC01FFD93FFC14076DB4143F6DD9E003B512806D90B6EAFE006D5E6D16F06D6C5D6E
-1580020F02FCC7FC020114E09126003FFCC8FC3A4C78CA47>I<DB1FE04AB4FC912601FF
-FE143F02079026FF8003B5FC4AECC01F023F02F0B6FC4A02FB158091BAFC49EBE01F49D9
-000302FCC7FC49486D01F8C8FC02F89038007F8049486E7E49486E7E4A140F013F824A14
-07A249C86C7EA401FE6F7EAA017F4B5AA46D6C4A5AA26E140F011F5E6E141F6D6C4A5A6D
-6C4A5A02FEEB01FF496C4990C9FC499038E01FFE92B55A495D02BF5C020F14C0496C5CD9
-7E0149CAFC9138001FE001FE90CCFCA67FA27F8080EB3FF091B612FE6DEDFFF818FF6D17
-C019F0013F17FC498390BA7E48854801E0C71203480180DA001F7F4848C900037F484816
-0049EF3FF84848171F49717E127F4917078648481703A76D1707007F616D170F003F616D
-171FD81FFCEF7FF06C6C4D5A6D5E6C01C003075B6C01F8033F5BC601FF4AB448C7FC6D01
-F0011F5B6D90B75A010F17E00103178001004CC8FC021F15F002031580DA000F01E0C9FC
-496D7CC950>103 D<EAFFE0ABC7FCB3A9EA7FE0B3B3B3B30B6F74EE25>105
-D<EAFFC0B3B3B3B3B3B3AF0A7B73FA25>108 D<ED1FF826FFC001B57E020714E0021F14
-F8027F8091B67E01C18101C316809038C7FE00D9CFF0011F13C0D9DFE0010713E0D9FF80
-130191C8FC18F049157F5B173F4916F8A249151FA35BA45BB3B3AC354A72C952>110
-D<91380FFFC091B512FE0107ECFFC0011F15F8017F15FE90B812804817C05A489038F000
-3F4890C70003138049EC007FD81FF8151F491507003F16014992C7FCA2485AA77FA26C7E
-7F7F6CB4FC6C13C014F86CEBFF806C14FC6CECFFE06C15FC6D14FF6D15C0010F81010315
-F8010081020F80DA007F7F03071480DB003F13C0160F040313E01600EF7FF0173FA2EF1F
-F8A2170FA7EF1FF0A20070163F127C007FEE7FE001C015FF01F0020313C0B5020F138002
-F0137F91B712006C5E001F5E000716F0C65E011F1580010302FCC7FCD9000F13C0354C7C
-CA3D>115 D E
-%EndDVIPSBitmapFont
-end
-%%EndProlog
-%%BeginSetup
-%%Feature: *Resolution 600dpi
-TeXDict begin
-%%BeginPaperSize: Letter
-letter
-%%EndPaperSize
-
-%%EndSetup
-%%Page: 1 1
-1 0 bop 0 201 a Fg(Using)54 b(Libical)p 0 315 3900 24
-v 0 428 a Ff(Eric)28 b(Busb)r(o)r(om)f(\(eric@soft)n(w)n
-(arestudio.org\))1948 b(Jan)n(uary)26 b(2001)0 1072 y
-Fe(Con)l(ten)l(ts)0 1312 y Fd(1)77 b(In)m(tro)s(duction)3201
-b(2)125 1468 y Ff(1.1)83 b(The)28 b(libical)f(pro)5 b(ject)67
-b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(3)125 1625 y(1.2)83
-b(License)22 b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)134 b(3)125 1781 y(1.3)83 b(Example)28 b(Co)r(de)78
-b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)
-f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(3)0 2021
-y Fd(2)77 b(Building)30 b(the)h(Library)2865 b(3)0 2260
-y(3)77 b(Structure)3330 b(3)125 2417 y Ff(3.1)83 b(Core)27
-b(iCal)g(classes)62 b(.)42 b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)
-h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134
-b(4)315 2573 y(3.1.1)94 b(Prop)r(erties)34 b(.)42 b(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)
-h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f
-(.)h(.)134 b(4)315 2730 y(3.1.2)94 b(Comp)r(onen)n(ts)84
-b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)
-h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g
-(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(5)315 2886 y(3.1.3)94
-b(V)-7 b(alues)108 b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f
-(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)
-h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134
-b(5)315 3043 y(3.1.4)94 b(P)n(arameters)61 b(.)41 b(.)h(.)g(.)f(.)h(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)134 b(5)125 3199 y(3.2)83 b(Other)27 b(elemen)n(ts)h(of)f(libical)42
-b(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)
-f(.)h(.)f(.)h(.)134 b(5)315 3356 y(3.2.1)94 b(En)n(umerations)27
-b(and)g(t)n(yp)r(es)42 b(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)134 b(5)315 3512 y(3.2.2)94 b(The)28
-b(parser)78 b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)
-h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f
-(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(5)315
-3669 y(3.2.3)94 b(Error)26 b(ob)5 b(jects)57 b(.)42 b(.)g(.)f(.)h(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)134 b(5)315 3825 y(3.2.4)94 b(Memory)27 b(Managemen)n(t)65
-b(.)42 b(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)
-h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f
-(.)h(.)134 b(5)315 3981 y(3.2.5)94 b(Storage)26 b(classes)64
-b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)134 b(5)0 4221 y Fd(4)77 b(Di\033erences)30
-b(F)-8 b(rom)31 b(RF)m(Cs)2750 b(6)125 4377 y Ff(4.1)83
-b(Pseudo)28 b(Comp)r(onen)n(ts)62 b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)
-f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134
-b(6)125 4534 y(4.2)83 b(Com)n(bined)28 b(V)-7 b(alues)108
-b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(6)125 4690 y(4.3)83
-b(Multi-V)-7 b(alued)28 b(Prop)r(erties)54 b(.)41 b(.)h(.)f(.)h(.)f(.)h
-(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)
-f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134
-b(6)0 4930 y Fd(5)77 b(Using)31 b(libical)3208 b(7)125
-5086 y Ff(5.1)83 b(Creating)27 b(Comp)r(onen)n(ts)73
-b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)134 b(7)315 5243 y(5.1.1)94 b(Constructor)26
-b(In)n(terfaces)48 b(.)42 b(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)
-f(.)h(.)f(.)h(.)f(.)h(.)134 b(7)315 5399 y(5.1.2)94 b(v)-5
-b(aargs)26 b(Constructors)70 b(.)41 b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)
-h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)134 b(8)p eop
-%%Page: 2 2
-2 1 bop 0 -167 3900 5 v 0 -200 a Fd(1.)73 b(In)m(tro)s(duction)3184
-b Ff(2)315 162 y(5.1.3)94 b(P)n(arsing)26 b(T)-7 b(ext)28
-b(Files)68 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)
-f(.)h(.)f(.)h(.)f(.)h(.)134 b(8)125 318 y(5.2)83 b(A)n(ccessing)27
-b(Comp)r(onen)n(ts)105 b(.)41 b(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)
-h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(10)315 475
-y(5.2.1)h(Finding)28 b(Comp)r(onen)n(ts)99 b(.)42 b(.)f(.)h(.)f(.)h(.)g
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)
-h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(10)315
-631 y(5.2.2)h(Iterating)27 b(Through)f(Comp)r(onen)n(ts)45
-b(.)d(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(10)315 788 y(5.2.3)h(Using)27 b(Comp)r(onen)n(t)h(Iterators)59
-b(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(11)315 944 y(5.2.4)h(Remo)n(ving)27 b(Comp)r(onen)n(ts)83
-b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)93 b(12)315 1101 y(5.2.5)h(W)-7 b(orking)27 b(with)h(prop)r(erties)e
-(and)i(parameters)e(.)41 b(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(12)315 1257 y(5.2.6)h(W)-7 b(orking)27 b(with)h(v)-5
-b(alues)52 b(.)41 b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)
-h(.)f(.)h(.)f(.)h(.)93 b(13)315 1413 y(5.2.7)h(Chec)n(king)27
-b(Comp)r(onen)n(t)g(V)-7 b(alidit)n(y)25 b(.)42 b(.)g(.)f(.)h(.)f(.)h
-(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)
-h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(14)315 1570 y(5.2.8)h(Con)n(v)n
-(erting)26 b(Comp)r(onen)n(ts)h(to)g(T)-7 b(ext)74 b(.)41
-b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h
-(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(14)125
-1726 y(5.3)83 b(Time)33 b(.)42 b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)
-f(.)h(.)f(.)h(.)93 b(15)315 1883 y(5.3.1)h(Time)28 b(structure)56
-b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)93 b(15)315 2039 y(5.3.2)h(Creating)26
-b(time)j(structures)j(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)93 b(15)315 2196 y(5.3.3)h(Time)28
-b(manipulating)f(routines)38 b(.)j(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g
-(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)
-h(.)f(.)h(.)f(.)h(.)93 b(15)125 2352 y(5.4)83 b(Storing)27
-b(Ob)5 b(jects)39 b(.)i(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)
-f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(17)315 2509 y(5.4.1)h(Creating)26 b(a)i(new)f(set)48
-b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)
-h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f
-(.)h(.)f(.)h(.)93 b(17)315 2665 y(5.4.2)h(A)n(dding,)28
-b(Finding)f(and)h(Remo)n(ving)e(Comp)r(onen)n(ts)76 b(.)41
-b(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h
-(.)f(.)h(.)f(.)h(.)93 b(18)315 2822 y(5.4.3)h(Other)27
-b(routines)70 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f
-(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)
-f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(19)125 2978
-y(5.5)83 b(Memory)27 b(Managemen)n(t)73 b(.)42 b(.)f(.)h(.)f(.)h(.)f(.)
-h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g
-(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(19)125 3135 y(5.6)83 b(Error)27 b(Handling)56 b(.)41
-b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h
-(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)
-h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(20)315 3291 y(5.6.1)h(Return)28
-b(v)-5 b(alues)34 b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(20)315
-3448 y(5.6.2)h(icalerrno)28 b(.)41 b(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h
-(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93
-b(20)315 3604 y(5.6.3)h(X-LIC-ERR)n(OR)27 b(and)g(X-LIC-INV)-9
-b(ALID-COMPONENT)70 b(.)42 b(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)
-f(.)h(.)f(.)h(.)f(.)h(.)93 b(20)125 3760 y(5.7)83 b(Naming)28
-b(Standard)h(.)42 b(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f
-(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)
-f(.)h(.)f(.)h(.)g(.)f(.)h(.)f(.)h(.)f(.)h(.)93 b(21)0
-4000 y Fd(6)77 b(Hac)m(ks)32 b(and)g(Bugs)3009 b(22)0
-4338 y Fe(1)131 b(In)l(tro)t(duction)0 4577 y Ff(Libical)23
-b(is)f(an)h(Op)r(en)g(Source)f(implemen)n(tation)h(of)g(the)g
-(iCalendar)f(proto)r(cols)f(and)i(proto)r(col)e(data)i(units.)35
-b(The)23 b(iCalendar)0 4691 y(sp)r(eci\034cation)29 b(describ)r(es)f
-(ho)n(w)h(calendar)f(clien)n(ts)h(can)f(comm)n(unicate)h(with)h
-(calendar)d(serv)n(ers)g(so)i(users)f(can)h(store)f(their)0
-4804 y(calendar)e(data)h(and)h(arrange)d(meetings)i(with)h(other)f
-(users.)0 4961 y(Libical)g(implemen)n(ts)h(RF)n(C2445,)e(RF)n(C2446)f
-(and)j(some)f(of)g(RF)n(C2447)f(and)h(the)h(CAP)g(draft.)0
-5117 y(This)k(do)r(cumen)n(tation)g(assumes)g(that)g(y)n(ou)g(are)f
-(familiar)h(with)h(the)f(iCalendar)f(standards)g(RF)n(C2445)g(and)h(RF)
-n(C2446.)0 5231 y(these)c(sp)r(eci\034cations)e(are)h(online)g(on)h
-(the)g(CALSCH)g(w)n(ebpage)e(at:)p eop
-%%Page: 3 3
-3 2 bop 0 -167 3900 5 v 0 -200 a Fd(2.)73 b(Building)31
-b(the)g(Library)2847 b Ff(3)0 162 y Fc(http://www.imc.o)o(rg)o(/ie)o
-(tf)o(-c)o(ale)o(nd)o(ar)o(/)0 453 y Fb(1.1)112 b(The)38
-b(libical)c(pro)6 b(ject)0 663 y Ff(This)29 b(co)r(de)g(is)g(under)g
-(activ)n(e)f(dev)n(elopmen)n(t.)40 b(If)30 b(y)n(ou)e(w)n(ould)h(lik)n
-(e)f(to)h(con)n(tribute)g(to)g(the)g(pro)5 b(ject,)29
-b(y)n(ou)f(can)h(con)n(tact)f(me,)0 777 y(Eric)g(Busb)r(o)r(om,)f(at)g
-(eric@soft)n(w)n(arestudio.org.)33 b(The)27 b(pro)5 b(ject)27
-b(has)g(a)g(w)n(ebpage)g(at)0 1016 y Fc(http://softwares)o(tu)o(dio)o
-(.o)o(rg)o(/li)o(bi)o(ca)o(l/i)o(nd)o(ex)o(.ht)o(ml)0
-1256 y Ff(and)g(a)h(mailing)f(list)g(that)h(y)n(ou)f(can)g(join)h(b)n
-(y)f(sending)g(the)h(follo)n(wing)f(mail:)0 1495 y Fc(To:)42
-b(minimalist@softwa)o(re)o(st)o(udi)o(o.)o(or)o(g)0 1609
-y(Subject:)e(subscribe)g(libical)0 1900 y Fb(1.2)112
-b(License)0 2111 y Ff(The)60 b(co)r(de)f(and)h(data\034les)f(in)h(this)
-g(distribution)g(are)e(licensed)i(under)g(the)g(Mozilla)f(Public)h
-(License.)133 b(See)0 2224 y(h)n(ttp://www.mozilla.org/NPL/MPL-1.0.h)n
-(tml)37 b(for)j(a)h(cop)n(y)f(of)g(the)i(license.)76
-b(Alternately)-7 b(,)44 b(y)n(ou)c(ma)n(y)g(use)g(libical)0
-2338 y(under)32 b(the)g(terms)g(of)g(the)g(GNU)h(Library)d(General)h
-(Public)i(License.)50 b(See)32 b(h)n(ttp://www.fsf.org/cop)n
-(yleft/lesser.h)n(tml)0 2451 y(for)27 b(a)g(cop)n(y)g(of)g(the)h(LGPL.)
-0 2608 y(This)j(dual)g(license)f(ensures)h(that)g(the)g(library)f(can)g
-(b)r(e)i(incorp)r(orated)d(in)n(to)i(b)r(oth)g(proprietary)e(co)r(de)i
-(and)f(GPL'd)i(pro-)0 2721 y(grams,)23 b(and)h(will)h(b)r(ene\034t)g
-(from)f(impro)n(v)n(emen)n(ts)e(made)i(b)n(y)g(programmers)e(in)i(b)r
-(oth)h(realms.)34 b(I)25 b(will)f(only)g(accept)g(c)n(hanges)0
-2835 y(in)n(to)j(m)n(y)h(v)n(ersion)e(of)h(the)h(library)e(if)i(they)g
-(are)f(similarly)f(dual-licensed.)0 3126 y Fb(1.3)112
-b(Example)37 b(Co)s(de)0 3336 y Ff(A)h(lot)f(of)h(the)g(do)r(cumen)n
-(tation)f(for)g(this)h(library)e(is)i(in)g(the)g(form)f(of)g(example)g
-(co)r(de.)67 b(These)37 b(examples)g(are)g(in)h(the)0
-3450 y("examples")26 b(directory)g(of)i(the)g(distribution.)36
-b(Also)28 b(lo)r(ok)e(in)i("src/test")e(for)h(additional)g(annotated)g
-(examples.)0 3788 y Fe(2)131 b(Building)46 b(the)e(Library)0
-4027 y Ff(Libical)33 b(uses)h(auto)r(conf)f(to)h(generate)e(mak)n
-(e\034les.)55 b(It)34 b(should)g(built)g(with)g(no)g(adjustmen)n(ts)g
-(on)f(Lin)n(ux,)j(F)-7 b(reeBSD)33 b(and)0 4141 y(Solaris)22
-b(under)i(gcc.)34 b(Some)24 b(v)n(ersion)e(ha)n(v)n(e)g(b)r(een)i
-(successfully)f(b)r(een)h(build)g(on)f(MacOS,)g(Solaris,)g(UnixW)-7
-b(are,)24 b(And)g(T)-7 b(ru64)0 4254 y(UNIX)28 b(without)g(gcc,)f(but)i
-(y)n(ou)d(ma)n(y)h(run)h(in)n(to)f(problems)g(with)h(a)f(particular)f
-(later)h(v)n(ersion.)0 4411 y(F)-7 b(or)27 b(a)g(more)g(complete)g
-(guide)h(to)f(building)h(the)g(library)-7 b(,)26 b(see)h(the)h(README)i
-(\034le)e(in)f(the)h(distribution.)0 4749 y Fe(3)131
-b(Structure)0 4988 y Ff(The)28 b(iCal)f(calendar)f(mo)r(del)i(is)f
-(based)g(on)h(four)f(t)n(yp)r(es)g(of)h(ob)5 b(jects:)36
-b(comp)r(onen)n(ts,)27 b(prop)r(erties,)g(v)-5 b(alues)27
-b(and)g(parameters.)0 5144 y(Prop)r(erties)32 b(are)f(the)i(fundamen)n
-(tal)f(unit)i(of)e(information)g(in)g(iCal,)i(and)e(they)g(w)n(ork)f(a)
-h(bit)h(lik)n(e)f(a)g(hash)g(en)n(try)-7 b(,)34 b(with)e(a)0
-5258 y(constan)n(t)21 b(k)n(ey)h(and)g(a)f(v)-5 b(ariable)21
-b(v)-5 b(alue.)35 b(Prop)r(erties)21 b(ma)n(y)h(also)f(ha)n(v)n(e)g(mo)
-r(di\034ers,)h(called)g(parameters.)33 b(In)22 b(the)h(iCal)f(con)n
-(ten)n(t)0 5371 y(line)p eop
-%%Page: 4 4
-4 3 bop 0 -167 3900 5 v 0 -200 a Fd(3.)73 b(Structure)3313
-b Ff(4)0 162 y Fc(ORGANIZER;ROLE=C)o(HA)o(IR:)o(MA)o(IL)o(TO:)o(mr)o
-(bi)o(g@h)o(os)o(t.)o(com)0 401 y Ff(The)34 b(prop)r(ert)n(y)f(name)h
-(is)g("OR)n(GANIZER,")g(the)g(v)-5 b(alue)34 b(of)h(the)f(prop)r(ert)n
-(y)f(is)h("mrbig@host.com")e(and)i(the)g("R)n(OLE")0
-515 y(parameter)26 b(sp)r(eci\034es)h(that)h(Mr)g(Big)f(is)g(the)h(c)n
-(hair)e(of)i(the)g(meetings)f(asso)r(ciated)f(with)i(this)g(prop)r(ert)
-n(y)-7 b(.)0 671 y(Comp)r(onen)n(ts)26 b(are)f(groups)g(of)h(prop)r
-(erties)f(that)i(represen)n(t)e(the)i(core)e(ob)5 b(jects)26
-b(of)g(a)g(calendar)f(system,)h(suc)n(h)g(as)g(ev)n(en)n(ts)f(or)0
-785 y(timezones.)36 b(Comp)r(onen)n(ts)27 b(are)g(delimited)h(b)n(y)g
-("BEGIN")f(and)g("END")h(tags.)0 941 y(When)g(a)f(comp)r(onen)n(t)g(is)
-h(sen)n(t)f(across)f(a)h(net)n(w)n(ork,)f(if)i(it)g(is)g(un-encrypted,)
-f(it)h(will)g(lo)r(ok)f(something)g(lik)n(e:)0 1181 y
-Fc(BEGIN:VCALENDAR)0 1294 y(METHOD:REQUEST)0 1408 y(PRODID:)41
-b(-//hacksw/handc)o(al)o(//N)o(ON)o(SG)o(ML)c(v1.0//EN)0
-1521 y(BEGIN:VEVENT)0 1635 y(DTSTAMP:19980309)o(T2)o(310)o(00)o(Z)0
-1749 y(UID:guid-1.host1)o(.c)o(om)0 1862 y(ORGANIZER;ROLE=C)o(HA)o(IR:)
-o(MA)o(IL)o(TO:)o(mr)o(bi)o(g@h)o(os)o(t.)o(com)0 1976
-y(ATTENDEE;RSVP=TR)o(UE)o(;RO)o(LE)o(=R)o(EQ-)o(PA)o(RT)o(ICI)o(PA)o
-(NT)o(;CU)o(TY)o(PE)o(=GR)o(OU)o(P:)87 2089 y(MAILTO:employee-)o(A@h)o
-(os)o(t.)o(com)0 2203 y(DESCRIPTION:Proj)o(ec)o(t)h(XYZ)k(Review)f
-(Meeting)0 2317 y(CATEGORIES:MEETI)o(NG)0 2430 y(CLASS:PUBLIC)0
-2544 y(CREATED:19980309)o(T1)o(300)o(00)o(Z)0 2657 y(SUMMARY:XYZ)e
-(Project)i(Review)0 2771 y(DTSTART;TZID=US-)o(Ea)o(ste)o(rn)o(:1)o(998)
-o(03)o(12)o(T08)o(30)o(00)0 2884 y(DTEND;TZID=US-Ea)o(st)o(ern)o(:1)o
-(99)o(803)o(12)o(T0)o(930)o(00)0 2998 y(LOCATION:1CP)d(Conference)i
-(Room)i(4350)0 3112 y(END:VEVENT)0 3225 y(END:VCALENDAR)0
-3465 y Ff(Note)28 b(that)h(comp)r(onen)n(ts)f(can)g(b)r(e)h(nested;)g
-(this)g(example)e(has)h(b)r(oth)h(a)f(V)n(CALEND)n(AR)i(and)e(a)g
-(VEVENT)i(comp)r(onen)n(t,)0 3578 y(one)d(nested)h(inside)f(the)h
-(other.)0 3870 y Fb(3.1)112 b(Core)37 b(iCal)f(classes)0
-4080 y Ff(Libical)25 b(is)h(an)g(ob)5 b(ject-based,)25
-b(data-orien)n(ted)f(library)-7 b(.)34 b(Nearly)25 b(all)h(of)g(the)g
-(routines)f(in)h(the)g(library)e(are)h(asso)r(ciated)g(with)0
-4193 y(an)e(opaque)g(data)f(t)n(yp)r(es)i(and)f(p)r(erform)g(some)g(op)
-r(eration)f(on)h(that)h(data)e(t)n(yp)r(e.)36 b(Although)24
-b(the)f(library)f(do)r(es)h(not)h(actually)0 4307 y(ha)n(v)n(e)32
-b(classes,)h(w)n(e)g(will)g(use)g(those)g(terms)f(since)h(the)h(b)r
-(eha)n(vior)d(of)i(these)g(asso)r(ciations)e(of)j(data)e(and)h
-(routines)f(is)h(v)n(ery)0 4420 y(similar)27 b(to)g(a)g(class.)0
-4693 y Fd(3.1.1)94 b(Prop)s(erties)0 4903 y Ff(Prop)r(erties)23
-b(are)g(represen)n(ted)f(with)j(the)f(icalprop)r(ert)n(y)e(class)h(and)
-g(its)h(man)n(y)f("deriv)n(ed")f(classes)g(with)j(on)e("deriv)n(ed")f
-(class)0 5017 y(p)r(er)35 b(prop)r(ert)n(y)g(t)n(yp)r(e)g(in)h(RF)n
-(C2445.)59 b(Again,)37 b(there)e(is)h(no)f(actual)g(inheritance)g
-(relations,)h(but)g(there)g(are)e(clusters)h(of)0 5130
-y(routines)27 b(that)h(mak)n(e)e(this)i(term)g(useful.)37
-b(A)28 b(prop)r(ert)n(y)e(is)i(a)f(con)n(tainer)f(for)h(a)g(single)g(v)
--5 b(alue)28 b(and)f(a)g(set)h(of)f(parameters.)p eop
-%%Page: 5 5
-5 4 bop 0 -167 3900 5 v 0 -200 a Fd(3.)73 b(Structure)3313
-b Ff(5)0 162 y Fd(3.1.2)94 b(Comp)s(onen)m(ts)0 372 y
-Ff(In)29 b(libical,)f(comp)r(onen)n(ts)g(are)g(represen)n(ted)f(with)i
-(the)g(icalcomp)r(onen)n(t)e(class.)39 b(Icalcomp)r(onen)n(t)27
-b(is)i(a)f(con)n(tainer)f(for)h(a)g(set)0 485 y(of)g(other)e(comp)r
-(onen)n(ts)h(and)h(prop)r(erties.)0 758 y Fd(3.1.3)94
-b(V)-8 b(alues)0 968 y Ff(V)h(alues)29 b(are)g(represen)n(ted)f(in)i(a)
-f(similar)f(w)n(a)n(y)g(to)i(prop)r(erties;)f(a)g(base)g(class)g(and)g
-(man)n(y)g("deriv)n(ed)f(")h(classes.)41 b(A)30 b(v)-5
-b(alue)29 b(is)0 1082 y(essen)n(tially)d(a)i(abstract)e(handle)i(on)f
-(a)g(single)g(fundamen)n(tal)h(t)n(yp)r(e,)f(a)h(structure)f(or)f(a)h
-(union.)0 1354 y Fd(3.1.4)94 b(P)m(arameters)0 1564 y
-Ff(P)n(arameters)26 b(are)g(represetned)h(in)h(a)f(similar)g(w)n(a)n(y)
-f(to)i(prop)r(erties,)e(except)i(that)g(they)f(con)n(tain)g(only)g(one)
-g(v)-5 b(alue)0 1856 y Fb(3.2)112 b(Other)37 b(elemen)m(ts)g(of)g
-(libical)0 2066 y Ff(In)26 b(addition)f(to)h(the)g(core)e(iCal)h
-(classes,)g(libical)g(has)g(man)n(y)g(other)g(t)n(yp)r(es,)h
-(structures,)g(classes)e(that)i(aid)f(in)h(creating)e(and)0
-2179 y(using)j(iCal)g(comp)r(onen)n(ts.)0 2452 y Fd(3.2.1)94
-b(En)m(umerations)30 b(and)i(t)m(yp)s(es)0 2662 y Ff(Libical)h(is)f
-(strongly)g(t)n(yp)r(ed,)i(so)r(o)e(ev)n(ery)g(comp)r(onen)n(t,)i(prop)
-r(ert)n(y)-7 b(,)33 b(parameter,)g(and)f(v)-5 b(alue)33
-b(t)n(yp)r(e)g(has)g(an)f(en)n(umeration,)0 2776 y(and)27
-b(some)g(ha)n(v)n(e)g(an)g(asso)r(ciated)f(structure)h(or)g(union.)0
-3048 y Fd(3.2.2)94 b(The)32 b(parser)0 3258 y Ff(The)20
-b(libical)f(parser)f(o\033ers)h(a)g(v)-5 b(ariet)n(y)19
-b(of)h(w)n(a)n(ys)e(to)h(con)n(v)n(ert)f(RF)n(C2445)g(text)i(in)n(to)g
-(a)f(libical)g(iinsteral)g(comp)r(onen)n(t)h(structure.)0
-3372 y(the)28 b(parser)e(can)h(parse)f(blo)r(c)n(ks)h(of)h(text)g(as)f
-(a)g(string,)g(or)f(it)i(can)g(parse)e(lin-b)n(y-line.)0
-3645 y Fd(3.2.3)94 b(Error)32 b(ob)5 b(jects)0 3855 y
-Ff(Libical)27 b(has)g(a)g(substan)n(tial)g(error)f(rep)r(orting)g
-(system)i(for)f(b)r(oth)h(programming)d(errors)g(and)j(comp)r(onen)n(t)
-f(usage)f(errors.)0 4127 y Fd(3.2.4)94 b(Memory)30 b(Managemen)m(t)0
-4337 y Ff(Since)38 b(man)n(y)g(of)h(libicals)e(in)n(terfaces)h(return)g
-(strings,)i(the)e(library)f(has)h(its)h(o)n(wn)e(memory)h(managemen)n
-(t)f(system)h(to)0 4451 y(elimiate)28 b(the)g(need)f(to)h(free)f(ev)n
-(ery)f(string)h(returned)g(from)g(the)h(libraru.)0 4724
-y Fd(3.2.5)94 b(Storage)32 b(classes)0 4934 y Ff(The)c(library)e(also)g
-(o\033ers)h(sev)n(eral)f(classes)g(to)h(store)g(comp)r(onen)n(ts)g(to)g
-(\035ies,)h(memory)f(or)f(databases.)p eop
-%%Page: 6 6
-6 5 bop 0 -167 3900 5 v 0 -200 a Fd(4.)73 b(Di\033erences)31
-b(F)-8 b(rom)31 b(RF)m(Cs)2732 b Ff(6)0 162 y Fe(4)131
-b(Di\033erences)44 b(F)-11 b(rom)43 b(RF)l(Cs)0 400 y
-Ff(Libical)c(has)f(b)r(een)h(designed)g(to)f(follo)n(w)h(the)g
-(standards)e(as)i(closely)f(as)g(p)r(ossible,)j(so)e(that)g(the)g(k)n
-(ey)f(ob)5 b(jects)39 b(in)g(the)0 514 y(standards)32
-b(are)g(also)g(k)n(ey)g(ob)5 b(jects)33 b(in)g(the)h(library)-7
-b(.)52 b(Ho)n(w)n(ev)n(er,)32 b(there)h(are)f(a)h(few)g(areas)f(where)g
-(the)i(sp)r(eci\034cations)e(are)0 628 y(\(arguably\))e(irregular,)h
-(and)g(follo)n(wing)g(them)h(exactly)f(w)n(ould)g(result)h(in)g(an)f
-(unfriendly)h(in)n(terface.)49 b(These)31 b(deviations)0
-741 y(mak)n(e)c(libical)g(easier)f(to)i(use)f(b)n(y)h(main)n(taining)e
-(a)h(self-similar)g(in)n(terface.)0 1033 y Fb(4.1)112
-b(Pseudo)38 b(Comp)s(onen)m(ts)0 1243 y Ff(Libical)29
-b(de\034nes)g(comp)r(onen)n(ts)g(for)g(groups)f(of)h(prop)r(erties)f
-(that)i(lo)r(ok)f(and)g(act)g(lik)n(e)g(comp)r(onen)n(ts,)g(but)h(are)e
-(not)i(de\034ned)0 1356 y(as)e(comp)r(onen)n(ts)h(in)g(the)g(sp)r
-(eci\034cation.)41 b(XD)n(A)-7 b(YLIGHT)30 b(and)f(XST)-7
-b(AND)n(ARD)30 b(are)e(notable)h(examples.)40 b(These)29
-b(pseudo)0 1470 y(comp)r(onen)n(ts)d(group)f(prop)r(erties)g(within)i
-(the)g(VTIMEZONE)g(comp)r(onen)n(ts.)36 b(F)-7 b(or)25
-b(instanace,)h(the)h(timezone)f(prop)r(erties)0 1583
-y(asso)r(ciated)f(with)i(da)n(yligh)n(t)e(sa)n(vings)g(time)i(starts)e
-(with)i("BEGIN:D)n(A)-7 b(YLIGHT")27 b(and)f(ends)h(with)f("END:D)n(A)
--7 b(YLIGHT,)0 1697 y(just)32 b(lik)n(e)g(other)f(comp)r(onen)n(ts,)h
-(but)g(is)g(not)g(de\034ned)g(as)f(a)g(comp)r(onen)n(t)g(in)h(RF)n
-(C2445.)48 b(\()32 b(See)f(RF)n(C2445,)g(page)g(61)g(\))h(In)0
-1811 y(Libical,this)d(grouping)e(is)i(represen)n(ted)e(b)n(y)i(the)g
-(XD)n(A)-7 b(YLIGHT)30 b(comp)r(onen)n(t.)41 b(Standard)28
-b(iCAL)h(comp)r(onen)n(ts)f(all)h(start)0 1924 y(with)f(the)g(letter)g
-("V,")f(while)g(pseudo)g(comp)r(onen)n(ts)g(start)g(with"X.")0
-2081 y(There)22 b(are)g(also)g(pseudo)h(comp)r(onen)n(ts)f(that)h(are)f
-(conceptually)g(deriv)n(ed)g(classes)g(of)h(V)-9 b(ALARM.)23
-b(RF)n(C2446)e(de\034nes)i(what)0 2194 y(prop)r(erties)g(ma)n(y)h(b)r
-(e)g(included)h(in)f(eac)n(h)g(comp)r(onen)n(t,)g(and)g(for)g(V)-9
-b(ALARM,)25 b(the)f(set)g(of)h(prop)r(erties)e(it)h(ma)n(y)g(ha)n(v)n
-(e)f(dep)r(ends)0 2308 y(on)k(the)h(v)-5 b(alue)28 b(of)f(the)h(A)n
-(CTION)f(prop)r(ert)n(y)-7 b(.)0 2464 y(F)g(or)19 b(instance,)j(if)e(a)
-g(V)-9 b(ALARM)20 b(comp)r(onen)n(t)g(has)f(an)h(A)n(CTION)g(prop)r
-(ert)n(y)e(with)j(the)f(v)-5 b(alue)20 b(of)g("A)n(UDIO,")f(the)h(comp)
-r(onen)n(t)0 2578 y(m)n(ust)h(also)g(ha)n(v)n(e)f(an)h("A)-7
-b(TT)g(A)n(CH")21 b(prop)r(ert)n(y)-7 b(.)34 b(Ho)n(w)n(ev)n(er,)20
-b(if)i(the)g(A)n(CTION)f(v)-5 b(alue)21 b(is)g("DISPLA)-7
-b(Y,")22 b(the)g(comp)r(onen)n(t)f(m)n(ust)0 2691 y(ha)n(v)n(e)26
-b(a)i(DESCRIPTION)g(prop)r(ert)n(y)-7 b(.)0 2848 y(T)g(o)28
-b(handle)g(these)g(v)-5 b(arious,)27 b(complex)h(restrictions,)f
-(libical)h(has)g(pseudo)g(comp)r(onen)n(ts)f(for)h(eac)n(h)f(t)n(yp)r
-(e)i(of)f(alarm:)37 b(XA)n(U-)0 2961 y(DIO)n(ALARM,)28
-b(XDISPLA)-7 b(Y)g(ALARM,)30 b(XEMAILALARM)f(and)f(XPR)n(OCEDUREALARM.)
-0 3253 y Fb(4.2)112 b(Com)m(bined)37 b(V)-9 b(alues)0
-3463 y Ff(Man)n(y)34 b(v)-5 b(alues)34 b(can)g(tak)n(e)g(more)g(than)g
-(one)h(t)n(yp)r(e.)58 b(TRIGGER,)35 b(for)f(instance,)i(can)e(ha)n(v)n
-(e)g(a)g(v)-5 b(alue)34 b(t)n(yp)r(e)h(of)g(with)g(DU-)0
-3577 y(RA)-7 b(TION)32 b(or)f(of)h(D)n(A)-7 b(TE-TIME.)33
-b(These)f(m)n(ultiple)g(t)n(yp)r(es)g(mak)n(e)f(it)i(di\036cult)g(to)e
-(create)g(routines)h(to)f(return)h(the)g(v)-5 b(alue)0
-3690 y(asso)r(ciated)26 b(with)i(a)f(prop)r(ert)n(y)-7
-b(.)0 3847 y(It)29 b(is)g(natural)f(to)h(ha)n(v)n(e)f(in)n(terfaces)g
-(that)h(w)n(ould)f(return)h(the)g(v)-5 b(alue)29 b(of)f(a)h(prop)r(ert)
-n(y)-7 b(,)28 b(but)i(it)f(is)g(cum)n(b)r(ersome)f(for)g(a)h(single)0
-3960 y(routine)j(to)g(return)g(m)n(ultiple)h(t)n(yp)r(es.)51
-b(So,)33 b(in)g(libical,)g(prop)r(erties)e(that)i(can)f(ha)n(v)n(e)f(m)
-n(ultiple)i(t)n(yp)r(es)f(are)f(giv)n(en)h(a)g(single)0
-4074 y(t)n(yp)r(e)26 b(that)g(is)g(the)g(union)g(of)g(their)g(RF)n
-(C2445)e(t)n(yp)r(es.)36 b(F)-7 b(or)26 b(instance,)g(in)g(libical,)g
-(the)g(v)-5 b(alue)26 b(of)g(the)g(TRIGGER)h(prop)r(ert)n(y)0
-4187 y(resolv)n(es)e(to)j(struct)f(icaltriggert)n(yp)r(e.)35
-b(This)28 b(t)n(yp)r(e)f(is)h(a)f(union)h(of)f(a)g(DURA)-7
-b(TION)29 b(and)e(a)g(D)n(A)-7 b(TE-TIME.)0 4479 y Fb(4.3)112
-b(Multi-V)-9 b(alued)36 b(Prop)s(erties)0 4689 y Ff(Some)31
-b(prop)r(erties,)h(suc)n(h)f(as)g(CA)-7 b(TEGORIES)33
-b(ha)n(v)n(e)d(only)h(one)g(v)-5 b(alue)32 b(t)n(yp)r(e,)h(but)f(eac)n
-(h)e(CA)-7 b(TEGORIES)33 b(prop)r(ert)n(y)d(can)0 4803
-y(ha)n(v)n(e)24 b(m)n(ultiple)h(v)-5 b(alue)25 b(instances.)35
-b(This)25 b(also)f(results)g(in)h(a)g(cum)n(b)r(ersome)f(in)n(terface)g
-(\025)g(CA)-7 b(TEGORIES)26 b(accessors)d(w)n(ould)0
-4916 y(ha)n(v)n(e)k(to)i(return)f(a)g(list)g(while)h(all)f(other)g
-(accessors)e(returned)i(a)g(single)g(v)-5 b(alue.)39
-b(In)29 b(libical,)g(all)f(prop)r(erties)f(ha)n(v)n(e)h(a)g(single)0
-5030 y(v)-5 b(alue,)35 b(and)e(m)n(ulti-v)-5 b(alued)33
-b(prop)r(erties)f(are)h(brok)n(en)f(do)n(wn)g(in)n(to)h(m)n(ultiple)h
-(single)f(v)-5 b(alued)33 b(prop)r(erties)g(during)f(parsing.)0
-5143 y(That)c(is,)f(an)g(input)i(line)e(lik)n(e,)0 5383
-y Fc(CATEGORIES:)39 b(work,)i(home)p eop
-%%Page: 7 7
-7 6 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3190 b Ff(7)0 162 y(b)r(ecomes)27 b(in)h(libical's)f(in)n
-(ternal)g(represen)n(tation)0 401 y Fc(CATEGORIES:)39
-b(work)0 515 y(CATEGORIES:)g(home)0 754 y Ff(Oddly)-7
-b(,)34 b(RF)n(C2445)d(allo)n(ws)g(some)h(m)n(ulti-v)-5
-b(alued)33 b(prop)r(erties)f(\()h(lik)n(e)g(FREEBUSY)h(\))f(to)g(exist)
-g(as)f(b)r(oth)h(a)f(m)n(ulti-v)-5 b(alues)0 868 y(prop)r(ert)n(y)24
-b(and)h(as)f(m)n(ultiple)h(single)g(v)-5 b(alue)24 b(prop)r(erties,)h
-(while)g(others)f(\()i(lik)n(e)e(CA)-7 b(TEGORIES)26
-b(\))f(can)g(only)g(exist)f(as)h(single)0 981 y(m)n(ulti-v)-5
-b(alued)32 b(prop)r(erties.)48 b(This)31 b(mak)n(es)g(the)h(in)n
-(ternal)f(represen)n(tation)e(for)i(CA)-7 b(TEGORIES)33
-b(illegal.)48 b(Ho)n(w)n(ev)n(er)30 b(when)0 1095 y(y)n(ou)d(con)n(v)n
-(ert)f(a)h(comp)r(onen)n(t)g(to)h(a)f(string,)g(the)h(library)e(will)i
-(collect)f(all)g(of)h(the)g(CA)-7 b(TEGORIES)28 b(prop)r(erties)f(in)n
-(to)g(one.)0 1433 y Fe(5)131 b(Using)44 b(libical)0 1691
-y Fb(5.1)112 b(Creating)37 b(Comp)s(onen)m(ts)0 1901
-y Ff(There)e(are)g(three)h(w)n(a)n(ys)e(to)i(create)e(comp)r(onen)n(ts)
-i(in)g(Libical:)53 b(creating)34 b(individual)i(ob)5
-b(jects)35 b(and)h(assem)n(bling)e(them,)0 2015 y(building)28
-b(en)n(tire)f(ob)5 b(jects)27 b(in)h(massiv)n(e)e(v)-5
-b(aargs)26 b(calls,)h(and)g(parsing)f(a)h(text)h(\034le)g(con)n
-(taining)e(iCalendar)h(data.)0 2287 y Fd(5.1.1)94 b(Constructor)32
-b(In)m(terfaces)0 2497 y Ff(Using)e(constructor)f(in)n(terfaces,)i(y)n
-(ou)f(create)f(eac)n(h)h(of)h(the)g(ob)5 b(jects)30 b(separately)f(and)
-i(then)g(assem)n(ble)e(them)i(in)g(to)g(com-)0 2611 y(p)r(onen)n(ts:)0
-2850 y Fc(icalcomponent)38 b(*event;)0 2964 y(icalproperty)g(*prop;)0
-3077 y(icalparameter)g(*param;)0 3191 y(struct)j(icaltimetype)e(atime;)
-0 3305 y(event)i(=)j(icalcomponent_n)o(ew)o(\(IC)o(AL)o(_V)o(EVE)o(NT)o
-(_C)o(OMP)o(ON)o(EN)o(T\);)0 3418 y(prop)e(=)h(icalproperty_new)o(_d)o
-(tst)o(am)o(p\()o(ati)o(me)o(\))37 b(;)0 3532 y(icalcomponent_ad)o(d_)o
-(pro)o(pe)o(rt)o(y\(e)o(ve)o(nt)o(,)h(prop\);)0 3645
-y(prop)k(=)h(icalproperty_new)o(_u)o(id\()o('')o(gu)o(id-)o(1.)o(ho)o
-(st1)o(.c)o(om)o(''\))37 b(\);)0 3759 y(icalcomponent_ad)o(d_)o(pro)o
-(pe)o(rt)o(y\(e)o(ve)o(nt)o(,pr)o(op)o(\);)0 3872 y(prop=icalpropert)o
-(y_)o(new)o(_o)o(rg)o(ani)o(ze)o(r\()o(''m)o(rb)o(ig)o(@ho)o(st)o(.c)o
-(om')o('\))o(;)0 3986 y(param)k(=)j(icalparameter_n)o(ew)o(_ro)o(le)o
-(\(I)o(CAL)o(_R)o(OL)o(E_C)o(HA)o(IR)o(\))0 4100 y(icalproperty_add)o
-(_p)o(ara)o(me)o(te)o(r\(p)o(ro)o(p,)37 b(param\);)0
-4213 y(icalcomponent_ad)o(d_)o(pro)o(pe)o(rt)o(y\(e)o(ve)o(nt)o(,pr)o
-(op)o(\);)0 4453 y Ff(Notice)e(that)g(libical)g(uses)f(a)h(semi-ob)5
-b(ject-orien)n(ted)32 b(st)n(yle)j(of)g(in)n(terface.)58
-b(Most)34 b(things)h(y)n(ou)f(w)n(ork)f(with)j(are)e(ob)5
-b(jects,)0 4566 y(that)28 b(are)e(instan)n(tiated)h(with)h(a)f
-(constructor)f(that)i(has)f("new")g(in)g(the)h(name.)37
-b(Also)27 b(note)g(that,)h(other)f(than)g(the)h(ob)5
-b(ject)0 4680 y(reference,)30 b(most)g(structure)f(data)h(is)g(passed)f
-(in)h(to)g(libical)g(routines)f(b)n(y)h(v)-5 b(alue.)44
-b(Libical)30 b(has)g(some)f(complex)h(but)g(v)n(ery)0
-4793 y(regular)c(memory)g(handling)i(rules.)36 b(These)27
-b(are)g(detailed)g(in)h(section)f(5.5)g(\(\).)0 4950
-y(If)33 b(an)n(y)e(of)h(the)h(constructors)d(fail,)k(they)f(will)f
-(return)g(0.)50 b(If)33 b(y)n(ou)f(try)g(to)g(insert)g(0)f(in)n(to)h(a)
-g(prop)r(ert)n(y)f(or)h(comp)r(onen)n(t,)h(or)0 5063
-y(use)j(a)g(zero-v)-5 b(alued)34 b(ob)5 b(ject)36 b(reference,)h
-(libical)f(will)h(either)f(silen)n(tly)f(ignore)g(the)i(error)d(or)h
-(will)h(ab)r(ort)g(with)g(an)g(error)0 5177 y(message.)61
-b(This)36 b(b)r(eha)n(vior)e(is)i(con)n(trolled)f(b)n(y)g(a)h(compile)g
-(time)g(\035ag)f(\(ICAL_ERR)n(ORS_ARE_F)-9 b(A)i(T)g(AL\),)37
-b(and)f(will)0 5291 y(ab)r(ort)27 b(b)n(y)g(default.)p
-eop
-%%Page: 8 8
-8 7 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3190 b Ff(8)0 162 y Fd(5.1.2)94 b(v)-5 b(aargs)32
-b(Constructors)0 372 y Ff(There)24 b(is)g(another)g(w)n(a)n(y)f(to)i
-(create)e(complex)h(comp)r(onen)n(ts,)h(whic)n(h)f(is)h(arguably)d
-(more)i(elegan)n(t,)g(if)h(y)n(ou)f(are)g(not)g(horri\034ed)0
-485 y(b)n(y)k(v)-5 b(arargs.)35 b(The)28 b(v)-5 b(arargs)26
-b(constructor)g(in)n(terface)i(allo)n(ws)e(y)n(ou)i(to)f(create)h(in)n
-(tricate)f(comp)r(onen)n(ts)g(in)i(a)e(single)h(blo)r(c)n(k)f(of)0
-599 y(co)r(de.)37 b(Here)27 b(is)g(the)h(previous)f(examples)f(in)i
-(the)g(v)-5 b(aargs)26 b(st)n(yle.)174 830 y Fc(calendar)40
-b(=)349 943 y(icalcomponent_v)o(an)o(ew\()523 1057 y(ICAL_VCALENDAR_C)o
-(OM)o(PO)o(NEN)o(T,)523 1171 y(icalproperty_new)o(_v)o(er)o(sio)o(n\()o
-('')o(2.0)o('')o(\),)523 1284 y(icalproperty_new)o(_p)o(ro)o(did)o(\()
-741 1398 y(''-//RDU)g(Software//NONSGM)o(L)d(HandCal//EN''\),)523
-1511 y(icalcomponent_va)o(ne)o(w\()697 1625 y(ICAL_VEVENT_COMP)o(ONE)o
-(NT)o(,)697 1738 y(icalproperty_new)o(_dt)o(st)o(am)o(p\(a)o(ti)o(me)o
-(\),)697 1852 y(icalproperty_new)o(_ui)o(d\()o('')o(gui)o(d-)o(1.)o
-(hos)o(t1)o(.co)o(m')o('\))o(,)697 1966 y(icalproperty_van)o(ew_)o(or)o
-(ga)o(niz)o(er)o(\()872 2079 y(''mrbig@host.co)o(m')o('\))o(,)872
-2193 y(icalparameter_n)o(ew)o(_r)o(ole)o(\(I)o(CA)o(L_R)o(OL)o(E_C)o
-(HA)o(IR)o(\),)872 2306 y(0)872 2420 y(\),)697 2533 y(icalproperty_van)
-o(ew_)o(at)o(te)o(nde)o(e\()872 2647 y(''employee-A@ho)o(st)o(.c)o(om')
-o(',)872 2761 y(icalparameter_n)o(ew)o(_r)o(ole)o(\()1046
-2874 y(ICAL_ROLE_REQPA)o(RTI)o(CI)o(PA)o(NT\))o(,)872
-2988 y(icalparameter_n)o(ew)o(_r)o(svp)o(\(1)o(\),)872
-3101 y(icalparameter_n)o(ew)o(_c)o(uty)o(pe)o(\(I)o(CAL)o(_C)o(UTY)o
-(PE)o(_G)o(ROU)o(P\))o(,)872 3215 y(0)872 3328 y(\),)697
-3442 y(icalproperty_new)o(_lo)o(ca)o(ti)o(on\()828 3556
-y(1CP)42 b(Conference)e(Room)h(4350\),)697 3669 y(0)697
-3783 y(\),)523 3896 y(0)523 4010 y(\);)0 4241 y Ff(This)30
-b(form)f(is)h(similar)f(to)h(the)g(constructor)f(form)g(,)i(except)f
-(that)g(the)g(constructors)e(ha)n(v)n(e)h("v)-5 b(anew")29
-b(instead)g(of)h("new")0 4354 y(in)38 b(the)f(name.)66
-b(The)37 b(argumen)n(ts)f(are)h(similar)f(to)r(o,)k(except)d(that)g
-(the)h(comp)r(onen)n(t)f(constructor)f(can)h(ha)n(v)n(e)f(a)h(list)g
-(of)0 4468 y(prop)r(erties,)26 b(and)i(the)f(prop)r(ert)n(y)g
-(constructor)e(can)i(ha)n(v)n(e)g(a)g(list)g(of)h(parameters.)35
-b(Be)27 b(sure)f(to)i(terminate)f(ev)n(ery)f(list)i(with)0
-4582 y(a)f('0',)h(or)e(y)n(our)g(co)r(de)i(will)g(crash,)e(if)i(y)n(ou)
-f(are)g(luc)n(ky)-7 b(.)0 4853 y Fd(5.1.3)94 b(P)m(arsing)32
-b(T)-8 b(ext)32 b(Files)0 5063 y Ff(The)g(\034nal)g(w)n(a)n(y)f(to)h
-(create)f(comp)r(onen)n(ts)h(will)g(probably)f(b)r(e)h(the)h(most)f
-(common;)i(y)n(ou)d(can)h(create)f(comp)r(onen)n(ts)g(from)0
-5176 y(RF)n(C2445)26 b(complian)n(t)h(text.)37 b(If)28
-b(y)n(ou)f(ha)n(v)n(e)f(the)i(string)f(in)h(memory)-7
-b(,)26 b(use)0 5407 y Fc(icalcomponent*)38 b(icalparser_pars)o(e_)o
-(str)o(in)o(g\()o(cha)o(r*)f(str\);)p eop
-%%Page: 9 9
-9 8 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3190 b Ff(9)0 162 y(If)38 b(the)g(string)f(con)n(tains)f
-(only)h(one)h(comp)r(onen)n(t,)h(the)f(parser)e(will)i(return)f(the)h
-(comp)r(onen)n(t)f(in)h(libical)f(form.)67 b(If)38 b(the)0
-275 y(string)45 b(con)n(tains)g(m)n(ultiple)h(comp)r(onen)n(ts,)k(the)c
-(m)n(ultiple)g(comp)r(onen)n(ts)f(will)h(b)r(e)g(returned)f(as)g(the)h
-(c)n(hildren)g(of)f(an)0 389 y(ICAL_XR)n(OOT_COMPONENT)26
-b(comp)r(onen)n(t.)0 545 y(P)n(arsing)h(a)h(whole)g(string)f(ma)n(y)h
-(seem)g(w)n(asteful)f(if)i(y)n(ou)f(w)n(an)n(t)f(to)h(pull)h(a)f(large)
-e(comp)r(onen)n(t)i(o\033)h(of)f(the)g(net)n(w)n(ork)f(or)g(from)0
-659 y(a)g(\034le;)h(y)n(ou)f(ma)n(y)g(prefer)g(to)g(parse)f(the)i(comp)
-r(onen)n(t)g(line)f(b)n(y)h(line.)37 b(This)27 b(is)h(p)r(ossible)f(to)
-r(o)g(b)n(y)g(using:)0 898 y Fc(icalparser*)39 b(icalparser_new\(\))o
-(;)0 1012 y(void)j(icalparser_free\()o(ic)o(al)o(par)o(se)o(r*)37
-b(parser\);)0 1125 y(icalparser_get_l)o(in)o(e\(p)o(ar)o(se)o(r,r)o(ea)
-o(d_)o(str)o(ea)o(m\))o(;)0 1239 y(icalparser_add_l)o(in)o(e\(p)o(ar)o
-(se)o(r,l)o(in)o(e\))o(;)0 1353 y(icalparser_set_g)o(en)o(_da)o(ta)o
-(\(p)o(ars)o(er)o(,s)o(tre)o(am)o(\))0 1592 y Ff(These)21
-b(routines)f(will)i(construct)f(a)f(parser)g(ob)5 b(ject)21
-b(to)g(whic)n(h)g(y)n(ou)g(can)g(add)g(lines)g(of)g(input)h(and)f
-(retriev)n(e)f(an)n(y)h(comp)r(onen)n(ts)0 1705 y(that)32
-b(the)g(parser)f(creates)f(from)i(the)g(input.)51 b(These)31
-b(routines)g(w)n(ork)g(b)n(y)g(sp)r(eci\034ng)h(an)g(adaptor)e(routine)
-h(to)h(get)g(string)0 1819 y(data)27 b(from)g(a)g(source.)36
-b(F)-7 b(or)27 b(an)g(example:)0 2058 y Fc(char*)41 b
-(read_stream\(char)c(*s,)43 b(size_t)e(size,)g(void)h(*d\))87
-2286 y(char)g(*c)h(=)g(fgets\(s,size,)38 b(\(FILE*\)d\);)87
-2399 y(return)j(c;)0 2626 y(main\(\))87 2740 y(char*)h(line;)87
-2853 y(icalcomponent)c(*c;)87 2967 y(icalparser)h(*parser)i(=)i
-(icalparser_new\(\))o(;)87 3081 y(FILE*)f(stream)f(=)i
-(fopen\(argv1,r\);)87 3194 y(icalparser_set_g)o(en_)o(da)o(ta)o(\(pa)o
-(rs)o(er)o(,st)o(re)o(am)o(\);)87 3308 y(do)174 3421
-y(line)f(=)h(icalparser_get_li)o(ne)o(\(p)o(ars)o(er)o(,r)o(ead)o(_s)o
-(tr)o(eam)o(\);)174 3535 y(c)g(=)h(icalparser_add_)o(li)o(ne\()o(pa)o
-(rs)o(er,)o(li)o(ne)o(\);)174 3648 y(if)f(\(c)g(!=)f(0\))218
-3762 y(printf\(s,icalcom)o(po)o(ne)o(nt_)o(as)o(_i)o(cal)o(_s)o(tr)o
-(ing)o(\(c)o(\)\))o(;)218 3876 y(icalparser_claim)o(\(p)o(ar)o(ser)o
-(\);)218 3989 y(printf\(n--------)o(--)o(--)o(---)o(n\))o(;)218
-4103 y(icalcomponent_fr)o(ee)o(\(c)o(\);)131 4330 y(while)f(\()i(line)f
-(!=)h(0\);)0 4569 y Ff(The)48 b(parser)f(ob)5 b(ject)48
-b(parameterizes)f(the)i(routine)f(used)g(to)g(get)h(input)g(lines)f
-(with)h(icalparser_set_gen_data\(\))0 4683 y
-(andicalparser_get_line\(\).)81 b(In)44 b(this)f(example,)k(the)d
-(routine)f(read_stream\(\))e(will)j(fetc)n(h)g(the)f(next)h(line)g
-(from)e(a)0 4796 y(stream,)51 b(with)d(the)f(stream)g(passed)f(in)h(as)
-g(the)g(v)n(oid*)f(parameter)f(d.)96 b(The)47 b(parser)f(calls)g
-(read_stream\(\))f(from)0 4910 y(icalparser_get_line\(\),)e(but)g(it)g
-(also)e(needs)h(to)h(kno)n(w)e(what)h(stream)g(to)g(use.)81
-b(This)42 b(is)h(set)f(b)n(y)g(the)h(call)f(to)g(ical-)0
-5024 y(parser_set_gen_data\(\).)64 b(By)37 b(using)g(a)h(di\033eren)n
-(t)f(routine)h(for)f(read_stream)e(or)i(passing)g(in)h(di\033eren)n(t)f
-(data)h(with)0 5137 y(icalparser_set_gen_data,)23 b(y)n(ou)k(can)g
-(connect)g(to)h(an)n(y)e(data)i(source.)0 5294 y(Using)g(the)h(same)e
-(mec)n(hanism,)h(other)g(implemen)n(tations)g(could)g(read)f(from)h
-(memory)g(bu\033ers,)g(so)r(c)n(k)n(ets)f(or)g(other)h(in)n(ter-)0
-5407 y(faces.)p eop
-%%Page: 10 10
-10 9 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(10)0 162 y(Since)28 b(the)g(example)f(co)r(de)g(is)
-h(a)f(v)n(ery)f(common)h(w)n(a)n(y)f(to)i(use)f(the)h(parser,)e(there)i
-(is)f(a)g(con)n(v)n(enience)f(routine;)0 401 y Fc(icalcomponent*)38
-b(icalparser_pars)o(e\()o(ica)o(lp)o(ar)o(ser)f(*parser,)654
-515 y(char*)k(\(*line_gen_func\))o(\(c)o(har)c(*s,)42
-b(size_t)f(size,)85 b(void*)42 b(d\)\))0 754 y Ff(T)-7
-b(o)36 b(use)h(this)g(routine,)i(y)n(ou)d(still)h(m)n(ust)g(construct)f
-(the)h(parser)f(ob)5 b(ject)36 b(and)h(pass)f(in)h(a)f(reference)g(to)h
-(a)f(line)h(reading)0 868 y(routine.)50 b(If)33 b(the)f(parser)f(can)h
-(create)f(a)h(single)f(comp)r(onen)n(t)h(from)g(the)g(input,)i(it)f
-(will)f(return)g(a)g(p)r(oin)n(ter)g(to)g(the)g(newly)0
-981 y(constructed)h(comp)r(onen)n(t.)54 b(If)34 b(the)g(parser)e(can)h
-(construct)f(m)n(ultiple)i(comp)r(onen)n(ts)f(from)g(the)h(input,)i(it)
-e(will)g(return)e(a)0 1095 y(reference)c(to)h(an)g(XR)n(OOT)g(comp)r
-(onen)n(t)g(\()h(of)f(t)n(yp)r(e)g(ICAL_XR)n(OOT_COMPONENT.\))g(This)g
-(XR)n(OOT)f(comp)r(onen)n(t)0 1209 y(will)g(hold)f(all)h(of)f(the)h
-(comp)r(onen)n(ts)f(constructed)g(from)g(the)h(input)g(as)f(c)n
-(hildren.)0 1500 y Fb(5.2)112 b(A)m(ccessing)37 b(Comp)s(onen)m(ts)0
-1710 y Ff(Giv)n(en)30 b(a)g(reference)f(to)i(a)e(comp)r(onen)n(t,)i(y)n
-(ou)f(probably)f(will)h(w)n(an)n(t)g(to)g(access)f(the)i(prop)r
-(erties,)f(parameters)e(and)j(v)-5 b(alues)0 1824 y(inside.)56
-b(Libical)34 b(in)n(terfaces)f(let)i(y)n(ou)e(\034nd)i(sub-comp)r(onen)
-n(t,)g(add)e(and)h(remo)n(v)n(e)f(sub-comp)r(onen)n(ts,)i(and)e(do)h
-(the)h(same)0 1937 y(three)27 b(op)r(erations)g(on)g(prop)r(erties.)0
-2210 y Fd(5.2.1)94 b(Finding)30 b(Comp)s(onen)m(ts)0
-2420 y Ff(T)-7 b(o)27 b(\034nd)h(a)f(sub-comp)r(onen)n(t)g(of)h(a)f
-(comp)r(onen)n(t,)g(use:)0 2659 y Fc(icalcomponent*)38
-b(icalcomponent_g)o(et)o(_fi)o(rs)o(t_)o(com)o(po)o(ne)o(nt\()1525
-2773 y(icalcomponent*)g(component,)1525 2887 y(icalcomponent_ki)o(nd)f
-(kind\);)0 3126 y Ff(This)27 b(routine)g(will)h(return)f(a)g(reference)
-g(to)g(the)h(\034rst)f(comp)r(onen)n(t)g(of)h(the)f(t)n(yp)r(e)h
-('kind.')37 b(The)28 b(k)n(ey)e(kind)i(v)-5 b(alues,)27
-b(listed)h(in)0 3240 y(icalen)n(ums.h)f(are:)0 3479 y
-Fc(ICAL_ANY_COMPONE)o(NT)0 3593 y(ICAL_VEVENT_COMP)o(ON)o(ENT)0
-3706 y(ICAL_VTODO_COMPO)o(NE)o(NT)0 3820 y(ICAL_VJOURNAL_CO)o(MP)o(ONE)
-o(NT)0 3933 y(ICAL_VCALENDAR_C)o(OM)o(PON)o(EN)o(T)0
-4047 y(ICAL_VFREEBUSY_C)o(OM)o(PON)o(EN)o(T)0 4161 y(ICAL_VALARM_COMP)o
-(ON)o(ENT)0 4400 y Ff(These)g(are)g(only)g(the)h(most)f(common)g(comp)r
-(onen)n(ts;)g(there)h(are)e(man)n(y)h(more)g(listed)h(in)g(icalen)n
-(ums.h.)0 4557 y(As)h(y)n(ou)f(migh)n(t)h(guess,)g(if)g(there)g(is)g
-(more)f(than)h(one)f(sub)r(comp)r(onen)n(t)h(of)g(the)h(t)n(yp)r(e)f(y)
-n(ou)f(ha)n(v)n(e)g(c)n(hosen,)g(this)h(routine)g(will)0
-4670 y(return)e(only)g(the)h(\034rst.)37 b(to)27 b(get)h(at)f(the)h
-(others,)f(y)n(ou)f(need)i(to)g(iterate)f(through)f(the)i(comp)r(onen)n
-(t.)0 4943 y Fd(5.2.2)94 b(Iterating)32 b(Through)g(Comp)s(onen)m(ts)0
-5153 y Ff(Iteration)27 b(requires)f(a)h(second)g(routine)g(to)h(get)f
-(the)h(next)g(sub)r(comp)r(onen)n(t)f(after)g(the)h(\034rst:)p
-eop
-%%Page: 11 11
-11 10 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(11)0 162 y Fc(icalcomponent*)38 b(icalcomponent_g)o
-(et)o(_ne)o(xt)o(_c)o(omp)o(on)o(en)o(t\()654 275 y(icalcomponent*)f
-(component,)654 389 y(icalcomponent_k)o(in)o(d)h(kind\);)0
-610 y Ff(With)25 b(the)g('\034rst')f(and)g('next')h(routines,)g(y)n(ou)
-e(can)h(create)g(a)g(for)f(lo)r(op)h(to)h(iterate)f(through)f(all)h(of)
-h(a)f(comp)r(onen)n(ts)g(sub)r(com-)0 723 y(p)r(onen)n(ts)87
-944 y Fc(for\(c)42 b(=)h(icalcomponent_g)o(et_)o(fi)o(rs)o(t_c)o(om)o
-(po)o(nen)o(t\()o(co)o(mp,)o(IC)o(AL_)o(AN)o(Y_)o(COM)o(PO)o(NE)o(NT\))
-o(;)392 1058 y(c)g(!=)g(0;)44 1171 y(c)g(=)g(icalcomponent_ge)o(t_)o
-(ne)o(xt_)o(co)o(mp)o(one)o(nt)o(\(c)o(omp)o(,I)o(CA)o(L_A)o(NY)o(_CO)o
-(MP)o(ON)o(ENT)o(\)\))261 1398 y(do_something\(c\);)0
-1619 y Ff(This)32 b(co)r(de)f(bit)h(wil)g(iterate)g(through)f(all)g(of)
-h(the)g(sub)r(comp)r(onen)n(ts)f(in)h('comp')g(but)g(y)n(ou)f(can)g
-(select)h(a)f(sp)r(eci\034c)h(t)n(yp)r(e)g(of)0 1733
-y(comp)r(onen)n(t)27 b(b)n(y)h(c)n(hanging)e(ICAL_ANY_COMPONENT)i(to)f
-(another)g(comp)r(onen)n(t)g(t)n(yp)r(e.)0 2002 y Fd(5.2.3)94
-b(Using)31 b(Comp)s(onen)m(t)f(Iterators)0 2212 y Ff(The)h(iteration)f
-(mo)r(del)h(in)h(the)f(previous)f(section)g(requires)g(the)h(comp)r
-(onen)n(t)g(to)g(k)n(eep)f(the)i(state)f(of)g(the)g(iteration.)46
-b(So,)0 2326 y(y)n(ou)32 b(could)g(not)h(use)f(this)h(mo)r(del)g(to)f
-(p)r(erform)g(a)g(sorting)f(op)r(erations,)i(since)f(y)n(ou'd)g(need)h
-(t)n(w)n(o)f(iterators)f(and)h(there)g(is)0 2440 y(only)26
-b(space)h(for)f(one.)36 b(If)27 b(y)n(ou)f(ev)n(er)g(call)h(icalcomp)r
-(onen)n(t_get_\034rst_comp)r(onen)n(t\(\))d(when)j(an)f(iteration)h(is)
-f(in)h(progress,)0 2553 y(the)h(p)r(oin)n(ter)f(will)h(b)r(e)g(reset)f
-(to)g(the)h(b)r(eginning.)0 2710 y(T)-7 b(o)28 b(solv)n(e)g(this)h
-(problem,)g(there)f(are)g(also)g(external)f(iterators)h(for)g(comp)r
-(onen)n(ts.)40 b(The)28 b(routines)g(asso)r(ciated)g(with)h(these)0
-2823 y(external)e(iterators)f(are:)0 3044 y Fc(icalcompiter)38
-b(icalcomponent_beg)o(in)o(_co)o(mp)o(on)o(ent)o(\(i)o(ca)o(lco)o(mp)o
-(one)o(nt)o(*)f(component,)j(icalcomponent_k)o(ind)d(kind\);)0
-3158 y(icalcompiter)h(icalcomponent_end)o(_c)o(omp)o(on)o(en)o(t\(i)o
-(ca)o(lc)o(omp)o(on)o(ent)o(*)f(component,)j(icalcomponent_k)o(in)o(d)e
-(kind\);)0 3271 y(icalcomponent*)g(icalcompiter_ne)o(xt)o(\(ic)o(al)o
-(co)o(mpi)o(te)o(r*)f(i\);)0 3385 y(icalcomponent*)h(icalcompiter_pr)o
-(io)o(r\(i)o(ca)o(lc)o(omp)o(it)o(er)o(*)g(i\);)0 3498
-y(icalcomponent*)g(icalcompiter_de)o(re)o(f\(i)o(ca)o(lc)o(omp)o(it)o
-(er)o(*)g(i\);)0 3719 y Ff(The)27 b(_b)r(egin_\(\))g(and)g(_end_\(\))g
-(routines)g(return)g(a)g(new)g(iterator)f(that)h(p)r(oin)n(ts)g(to)h
-(the)f(b)r(eginning)g(and)g(ending)h(of)f(the)0 3833
-y(list)36 b(of)f(sub)r(comp)r(onen)n(t)h(for)f(the)h(giv)n(en)f(comp)r
-(onen)n(t,)i(and)e(the)h(kind)g(argumen)n(t)e(w)n(orks)g(lik)n(e)h(the)
-h(kind)g(argumen)n(t)f(for)0 3946 y(in)n(ternal)27 b(iterators.)0
-4103 y(After)f(creating)e(an)h(iterators,)g(use)g(_next_\(\))g(and)h
-(_prior_\(\))e(to)h(step)h(forw)n(ard)d(and)j(bac)n(kw)n(ard)d(through)
-i(the)h(list)f(and)0 4216 y(get)30 b(the)g(comp)r(onen)n(t)g(that)g
-(the)g(iterator)e(p)r(oin)n(ts)i(to,)h(and)e(use)h(_deref\(\))g(to)g
-(return)f(the)h(comp)r(onen)n(t)g(that)g(the)g(iterator)0
-4330 y(p)r(oin)n(ts)c(to)g(without)h(mo)n(ving)e(the)i(iterator.)35
-b(All)27 b(routines)f(will)g(return)g(0)g(when)g(they)h(mo)n(v)n(e)e
-(to)h(p)r(oin)n(t)h(o\033)f(the)h(end)f(of)h(the)0 4444
-y(list.)0 4600 y(Here)g(is)h(an)f(example)g(of)h(a)f(lo)r(op)g(using)g
-(these)h(routines:)0 4821 y Fc(for\()131 4934 y(i)43
-b(=)g(icalcomponent_be)o(gi)o(n_c)o(om)o(po)o(nen)o(t\()o(im)o(pl-)o
-(cl)o(us)o(ter)o(,I)o(CAL)o(_A)o(NY)o(_CO)o(MP)o(ON)o(ENT)o(\);)131
-5048 y(icalcompiter_de)o(ref)o(\(i)o(\)!)o(=)38 b(0;)131
-5162 y(icalcompiter_ne)o(xt\()o(i\))0 5275 y(\))261 5389
-y(icalcomponent)h(*this)i(=)i(icalcompiter_der)o(ef)o(\(i\))o(;)p
-eop
-%%Page: 12 12
-12 11 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(12)0 162 y Fd(5.2.4)94 b(Remo)m(ving)29
-b(Comp)s(onen)m(ts)0 372 y Ff(Remo)n(ving)40 b(an)h(elemen)n(t)g(from)g
-(a)g(list)g(while)h(iterating)e(through)h(the)g(list)h(with)f(the)h(in)
-n(ternal)e(iterators)g(can)h(cause)0 485 y(problems,)20
-b(since)e(y)n(ou)g(will)h(probably)e(b)r(e)i(remo)n(ving)e(the)i
-(elemen)n(t)g(that)g(the)g(in)n(ternal)f(iterator)f(p)r(oin)n(ts)h(to.)
-34 b(The)19 b(_remo)n(v)n(e\(\))0 599 y(routine)24 b(will)g(k)n(eep)f
-(the)i(iterator)d(v)-5 b(alid)24 b(b)n(y)g(mo)n(ving)f(it)h(to)g(the)h
-(next)f(comp)r(onen)n(t,)g(but)h(in)f(a)g(normal)f(lo)r(op,)h(this)g
-(will)g(result)0 712 y(in)k(t)n(w)n(o)f(adv)-5 b(ances)26
-b(p)r(er)i(iteration,)e(and)i(y)n(ou)f(will)g(remo)n(v)n(e)f(only)h(ev)
-n(ery)f(other)h(comp)r(onen)n(t.)37 b(T)-7 b(o)27 b(a)n(v)n(oid)f(the)i
-(problem,)f(y)n(ou)0 826 y(will)h(need)f(to)h(step)g(the)g(iterator)e
-(ahead)h(of)g(the)h(elemen)n(t)g(y)n(ou)e(are)h(going)f(to)i(remo)n(v)n
-(e,)e(lik)n(e)h(this:)0 1066 y Fc(for\(c)41 b(=)j(icalcomponent_g)o(et)
-o(_fi)o(rs)o(t_)o(com)o(po)o(ne)o(nt\()o(pa)o(re)o(nt_)o(co)o(mp,)o(IC)
-o(AL)o(_AN)o(Y_)o(CO)o(MPO)o(NE)o(NT)o(\);)305 1179 y(c)f(!=)g(0;)305
-1293 y(c)g(=)g(next)174 1520 y(next)f(=)h(icalcomponent_get)o(_n)o(ex)o
-(t_c)o(om)o(po)o(nen)o(t\()o(pa)o(ren)o(t_)o(com)o(p,)o(IC)o(AL_)o(AN)o
-(Y_)o(COM)o(PO)o(NE)o(NT\))o(;)174 1633 y(icalcomponent_rem)o(ov)o(e_)o
-(com)o(po)o(ne)o(nt\()o(pa)o(re)o(nt_)o(co)o(mp)o(,c\))o(;)0
-1873 y Ff(Another)32 b(w)n(a)n(y)e(to)i(remo)n(v)n(e)e(comp)r(onen)n
-(ts)i(is)g(to)f(rely)h(on)f(the)i(side)f(e\033ect)g(of)g(icalcomp)r
-(onen)n(t_remo)n(v)n(e_comp)r(onen)n(t:)42 b(if)0 1986
-y(comp)r(onen)n(t)28 b(iterator)g(in)h(the)g(paren)n(t)f(comp)r(onen)n
-(t)h(is)f(p)r(oin)n(ting)h(to)g(the)g(c)n(hild)g(that)g(will)g(b)r(e)g
-(remo)n(v)n(ed,)f(it)h(will)g(mo)n(v)n(e)f(the)0 2100
-y(iterator)e(to)i(the)g(comp)r(onen)n(t)f(after)g(the)h(c)n(hild.)37
-b(The)27 b(follo)n(wing)g(co)r(de)g(will)h(exploit)f(this)h(b)r(eha)n
-(vior:)0 2340 y Fc(icalcomponent_ge)o(t_)o(fir)o(st)o(_c)o(omp)o(on)o
-(en)o(t\(p)o(ar)o(en)o(t_c)o(om)o(p,)o(ICA)o(L_)o(VEV)o(EN)o(T_)o(COM)o
-(PO)o(NE)o(NT\))o(;)0 2453 y(while\(\(c=icalcom)o(po)o(nen)o(t_)o(ge)o
-(t_c)o(ur)o(re)o(nt_)o(co)o(mp)o(one)o(nt)o(\(c)o(\)\))37
-b(!=)43 b(0)g(\))131 2567 y(if\(icalcomponen)o(t_i)o(sa)o(\(c)o(\))38
-b(==)k(ICAL_VEVENT_COMP)o(ONE)o(NT)o(\))261 2680 y(icalcomponent_rem)o
-(ov)o(e_c)o(om)o(po)o(nen)o(t\()o(pa)o(ren)o(t_)o(co)o(mp,)o(in)o(ner)o
-(\);)174 2794 y(else)261 2907 y(icalcomponent_get)o(_n)o(ext)o(_c)o(om)
-o(pon)o(en)o(t\()o(par)o(en)o(t_)o(com)o(p,)o(ICA)o(L_)o(VE)o(VEN)o(T_)
-o(CO)o(MPO)o(NE)o(NT)o(\);)0 3294 y Fd(5.2.5)94 b(W)-8
-b(orking)31 b(with)g(prop)s(erties)g(and)h(parameters)0
-3504 y Ff(Finding,)g(iterating)f(and)g(remo)n(ving)e(prop)r(erties)h(w)
-n(orks)g(the)h(same)g(as)f(it)i(do)r(es)e(for)h(comp)r(onen)n(ts,)g
-(using)g(the)h(prop)r(ert)n(y-)0 3617 y(sp)r(eci\034c)c(or)e
-(parameter-sp)r(eci\034c)g(in)n(terfaces:)0 3857 y Fc(icalproperty*)38
-b(icalcomponent_ge)o(t_)o(fir)o(st)o(_p)o(rop)o(er)o(ty)o(\()218
-3970 y(icalcomponent*)g(component,)218 4084 y(icalproperty_kin)o(d)f
-(kind\);)0 4197 y(icalproperty*)h(icalcomponent_ge)o(t_)o(nex)o(t_)o
-(pr)o(ope)o(rt)o(y\()218 4311 y(icalcomponent*)g(component,)218
-4425 y(icalproperty_kin)o(d)f(kind\);)0 4538 y(void)42
-b(icalcomponent_ad)o(d_)o(pr)o(ope)o(rt)o(y\()218 4652
-y(icalcomponent*)c(component,)218 4765 y(icalproperty*)g(property\);)0
-4879 y(void)k(icalcomponent_re)o(mo)o(ve)o(_pr)o(op)o(er)o(ty\()218
-4992 y(icalcomponent*)c(component,)218 5106 y(icalproperty*)g
-(property\);)0 5346 y Ff(F)-7 b(or)27 b(parameters:)p
-eop
-%%Page: 13 13
-13 12 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(13)0 162 y Fc(icalparameter*)38 b(icalproperty_ge)o
-(t_)o(fir)o(st)o(_p)o(ara)o(me)o(te)o(r\()218 275 y(icalproperty*)g
-(prop,)218 389 y(icalparameter_ki)o(nd)f(kind\);)0 502
-y(icalparameter*)h(icalproperty_ge)o(t_)o(nex)o(t_)o(pa)o(ram)o(et)o
-(er)o(\()218 616 y(icalproperty*)g(prop,)218 730 y(icalparameter_ki)o
-(nd)f(kind\);)0 843 y(void)42 b(icalproperty_add)o(_p)o(ar)o(ame)o(te)o
-(r\()218 957 y(icalproperty*)c(prop,)218 1070 y(icalparameter*)g
-(parameter\);)0 1184 y(void)k(icalproperty_rem)o(ov)o(e_)o(par)o(am)o
-(et)o(er\()218 1297 y(icalproperty*)c(prop,)218 1411
-y(icalparameter_ki)o(nd)f(kind\);)0 1650 y Ff(Note)30
-b(that)g(since)f(there)h(should)f(b)r(e)i(only)e(one)g(parameter)f(of)i
-(eac)n(h)f(t)n(yp)r(e)h(in)g(a)f(prop)r(ert)n(y)-7 b(,)30
-b(y)n(ou)f(will)h(rarely)e(need)i(to)f(use)0 1764 y
-(icalparameter_get_nect_paameter.)0 2037 y Fd(5.2.6)94
-b(W)-8 b(orking)31 b(with)g(v)-5 b(alues)0 2247 y Ff(V)e(alues)33
-b(are)g(t)n(ypically)g(part)h(of)f(a)h(prop)r(ert)n(y)-7
-b(,)34 b(although)f(they)h(can)f(exist)h(on)f(their)h(o)n(wn.)55
-b(Y)-7 b(ou)34 b(can)f(manipulate)h(them)0 2360 y(either)27
-b(as)g(part)g(of)h(the)g(prop)r(ert)n(y)e(or)h(indep)r(enden)n(tly)-7
-b(.)0 2517 y(The)36 b(most)f(common)g(w)n(a)n(y)f(to)h(w)n(ork)f(with)i
-(v)-5 b(alues)35 b(to)h(is)f(to)g(manipulate)h(them)g(from)f(they)h
-(prop)r(erties)e(that)i(con)n(tain)0 2630 y(them.)46
-b(This)31 b(in)n(v)n(olv)n(es)d(few)n(er)i(routine)g(calls)g(and)h(in)n
-(termediate)f(v)-5 b(ariables)29 b(than)h(w)n(orking)f(with)i(them)g
-(indep)r(enden)n(tly)-7 b(,)0 2744 y(and)27 b(it)h(is)g(t)n(yp)r
-(e-safe.)0 2900 y(F)-7 b(or)26 b(eac)n(h)g(prop)r(ert)n(y)-7
-b(,)26 b(there)h(are)f(a)g(_get_)g(and)h(a)f(_set_)g(routine)h(that)g
-(access)e(the)j(in)n(ternal)e(v)-5 b(alue.)36 b(F)-7
-b(or)26 b(instanace,)h(for)0 3014 y(the)h(UID)g(prop)r(ert)n(y)-7
-b(,)27 b(the)h(routines)f(are:)0 3253 y Fc(void)42 b(icalproperty_set)o
-(_u)o(id)o(\(ic)o(al)o(pr)o(ope)o(rt)o(y*)37 b(prop,)k(const)h(char*)f
-(v\))0 3367 y(const)g(char*)h(icalproperty_get)o(_u)o(id)o(\(ic)o(al)o
-(pr)o(ope)o(rt)o(y*)37 b(prop\))0 3607 y Ff(F)-7 b(or)19
-b(m)n(ulti-v)-5 b(alued)20 b(prop)r(erties,)h(lik)n(e)f(A)-7
-b(TT)g(A)n(CH,)20 b(the)h(v)-5 b(alue)20 b(t)n(yp)r(e)g(is)g(usually)f
-(a)h(struct)g(or)f(union)h(that)g(holds)g(b)r(oth)g(p)r(ossible)0
-3720 y(t)n(yp)r(es.)0 3877 y(If)28 b(y)n(ou)f(w)n(an)n(t)g(to)g(w)n
-(ork)f(with)i(the)g(underlying)f(v)-5 b(alue)28 b(ob)5
-b(ject,)27 b(y)n(ou)g(can)g(get)g(and)h(set)f(it)h(with:)0
-4116 y Fc(icalvalue*)39 b(icalproperty_get_)o(va)o(lu)o(e)f
-(\(icalproperty*)f(prop\))0 4230 y(void)42 b(icalproperty_set)o(_v)o
-(al)o(ue\()o(ic)o(al)o(pro)o(pe)o(rt)o(y*)37 b(prop,)42
-b(icalvalue*)d(value\);)0 4469 y Ff(Icalprop)r(ert)n(y_get_v)-5
-b(alue\(\))36 b(will)i(return)g(a)g(reference)f(that)h(y)n(ou)g(can)g
-(manipulate)g(with)h(other)e(icalv)-5 b(alue)38 b(routines.)0
-4583 y(Most)30 b(of)h(the)g(time,)g(y)n(ou)f(will)h(ha)n(v)n(e)e(to)i
-(kno)n(w)e(what)i(the)g(t)n(yp)r(e)f(of)h(the)g(v)-5
-b(alue)30 b(is.)46 b(F)-7 b(or)30 b(instance,)g(if)i(y)n(ou)d(kno)n(w)h
-(that)h(the)0 4696 y(v)-5 b(alue)27 b(is)h(a)f(D)n(A)-7
-b(TETIME)29 b(t)n(yp)r(e,)f(y)n(ou)f(can)g(manipulate)g(it)h(with:)0
-4936 y Fc(struct)41 b(icaltimetype)e(icalvalue_get_d)o(at)o(et)o(ime)o
-(\(i)o(ca)o(lva)o(lu)o(e*)e(value\);)0 5049 y(void)42
-b(icalvalue_set_da)o(te)o(ti)o(me\()o(ic)o(al)o(val)o(ue)o(*)37
-b(value,)k(struct)h(icaltimetype)c(v\);)0 5289 y Ff(When)21
-b(w)n(orking)e(with)i(an)f(extension)g(prop)r(ert)n(y)f(or)h(v)-5
-b(alue)20 b(\(and)h(X-PR)n(OPER)-7 b(TY)21 b(or)f(a)g(prop)r(ert)n(y)f
-(that)i(has)f(the)h(parameter)0 5402 y(V)-9 b(ALUE=x-name)27
-b(\))h(the)g(v)-5 b(alue)28 b(t)n(yp)r(e)f(is)h(alw)n(a)n(ys)d(a)j
-(string.)36 b(T)-7 b(o)27 b(get)g(and)h(set)f(the)h(v)-5
-b(alue,)28 b(use:)p eop
-%%Page: 14 14
-14 13 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(14)0 162 y Fc(void)42 b(icalproperty_set)o(_x)o
-(\(i)o(cal)o(pr)o(op)o(ert)o(y*)37 b(prop,)k(char*)h(v\);)0
-275 y(char*)f(icalproperty_get_)o(x\()o(ica)o(lp)o(ro)o(per)o(ty)o(*)c
-(prop\);)0 515 y Ff(All)26 b(X)g(prop)r(erties)f(ha)n(v)n(e)f(the)i(t)n
-(yp)r(e)g(of)g(ICAL_X_PR)n(OPER)-7 b(TY,)26 b(so)f(y)n(ou)g(will)h
-(need)g(these)g(routines)f(to)g(get)h(and)f(set)h(the)0
-628 y(name)h(of)h(the)g(prop)r(ert)n(y:)0 868 y Fc(char*)41
-b(icalproperty_get_)o(x_)o(nam)o(e\()o(ic)o(alp)o(ro)o(pe)o(rty)o(*)c
-(prop\))0 981 y(void)42 b(icalproperty_set)o(_x)o(_n)o(ame)o(\(i)o(ca)o
-(lpr)o(op)o(er)o(ty*)37 b(prop,)k(char*)h(name\);)0 1254
-y Fd(5.2.7)94 b(Chec)m(king)32 b(Comp)s(onen)m(t)d(V)-8
-b(alidit)m(y)0 1464 y Ff(RF)n(C)25 b(2446)e(de\034nes)j(rules)e(for)h
-(what)g(prop)r(erties)f(m)n(ust)h(exist)g(in)h(a)e(comp)r(onen)n(t)h
-(to)g(b)r(e)h(used)f(for)f(transferring)g(sc)n(heduling)0
-1578 y(data.)58 b(Most)35 b(of)g(these)g(rules)f(relate)g(to)h(the)g
-(existence)f(of)h(prop)r(erties)f(relativ)n(e)g(to)h(the)g(METHOD)h
-(prop)r(ert)n(y)-7 b(,)35 b(whic)n(h)0 1691 y(declares)22
-b(what)h(op)r(eration)f(a)h(remote)g(receiv)n(er)f(should)h(use)g(to)g
-(pro)r(cess)f(a)h(comp)r(onen)n(t.)35 b(F)-7 b(or)23
-b(instance,)h(if)g(the)f(METHOD)0 1805 y(is)36 b(REQUEST)h(and)e(the)i
-(comp)r(onen)n(t)e(is)h(a)f(VEVENT,)j(the)e(sender)f(is)h(probably)f
-(asking)f(the)j(receiv)n(er)d(to)h(join)h(in)g(a)0 1918
-y(meeting.)g(In)25 b(this)g(case,)g(RF)n(C2446)d(sa)n(ys)i(that)h(the)g
-(comp)r(onen)n(t)g(m)n(ust)g(sp)r(ecify)g(a)f(start)g(time)i(\(DTST)-7
-b(AR)g(T\))26 b(and)f(list)g(the)0 2032 y(receiv)n(er)h(as)h(an)g
-(attendee)h(\(A)-7 b(TTENDEE\).)0 2188 y(Libical)27 b(can)g(c)n(hec)n
-(k)g(these)h(restrictions)e(with)i(the)g(routine:)0 2428
-y Fc(int)42 b(icalrestriction_c)o(he)o(ck)o(\(ic)o(al)o(co)o(mpo)o(ne)o
-(nt)o(*)c(comp\);)0 2667 y Ff(This)19 b(routine)f(returns)g(0)h(if)g
-(the)g(comp)r(onen)n(t)g(do)r(es)f(not)h(pass)f(RF)n(C2446)f
-(restrictions,)i(or)f(if)h(the)g(comp)r(onen)n(t)g(is)g(malformed.)0
-2781 y(The)38 b(comp)r(onen)n(t)g(y)n(ou)f(pass)g(in)h
-Fa(must)45 b Ff(b)r(e)38 b(a)g(V)n(CALEND)n(AR,)h(with)g(one)e(or)g
-(more)h(c)n(hildren,)i(lik)n(e)d(the)i(examples)e(in)0
-2895 y(RF)n(C2446.)0 3051 y(When)28 b(this)f(routine)g(runs,)f(it)i
-(will)f(insert)g(new)g(prop)r(erties)f(in)n(to)h(the)h(comp)r(onen)n(t)
-e(to)h(indicate)h(an)n(y)e(errors)f(it)i(\034nds.)37
-b(See)0 3165 y(section)27 b(6.5.3,)f(X-LIC-ERR)n(OR)i(for)f(more)f
-(information)h(ab)r(out)h(these)f(error)f(prop)r(erties.)0
-3437 y Fd(5.2.8)94 b(Con)m(v)m(erting)32 b(Comp)s(onen)m(ts)d(to)j(T)-8
-b(ext)0 3647 y Ff(T)h(o)19 b(create)g(an)h(RF)n(C2445)e(complian)n(t)h
-(text)h(represen)n(tation)e(of)i(an)f(ob)5 b(ject,)21
-b(use)f(one)f(of)h(the)g(*_as_ical_string\(\))d(routines:)0
-3887 y Fc(char*)41 b(icalcomponent_as_)o(ic)o(al_)o(st)o(ri)o(ng)c
-(\(icalcomponent*)g(component\))0 4000 y(char*)k(icalproperty_as_i)o
-(ca)o(l_s)o(tr)o(in)o(g)d(\(icalproperty*)f(property\))0
-4114 y(char*)k(icalparameter_as_)o(ic)o(al_)o(st)o(ri)o(ng)c
-(\(icalparameter*)g(parameter\))0 4227 y(char*)k(icalvalue_as_ical)o
-(_s)o(tri)o(ng)c(\(icalvalue*)i(value\))0 4467 y Ff(In)32
-b(most)h(cases,)f(y)n(ou)f(will)i(only)f(use)g(icalcomp)r(onen)n
-(t_as_ical_string)c(\(\),)34 b(since)e(it)h(will)f(cascade)f(and)h(con)
-n(v)n(ert)f(all)h(of)0 4581 y(the)c(parameters,)e(prop)r(erties)g(and)i
-(v)-5 b(alues)27 b(that)h(are)e(attac)n(hed)h(to)h(the)g(ro)r(ot)e
-(comp)r(onen)n(t.)0 4737 y(Icalprop)r(ert)n(y_as_ical_string\(\))37
-b(will)k(terminate)g(eac)n(h)g(line)g(with)h(the)f(RF)n(C2445)f(sp)r
-(eci\034ed)h(line)h(terminator)e("n")0 4851 y(Ho)n(w)n(ev)n(er,)27
-b(if)h(y)n(ou)g(compile)g(with)h(the)f(sym)n(b)r(ol)g
-(ICAL_UNIX_NEWLINE)i(unde\034ned,)f(\()g(it)g(is)f(de\034ned)h(b)n(y)f
-(default\))h(it)0 4964 y(will)f(terminate)f(lines)h(with)g("nr")0
-5121 y(Remem)n(b)r(er)35 b(that)h(the)f(string)g(returned)f(b)n(y)h
-(these)h(routines)e(is)h(o)n(wned)g(b)n(y)g(the)h(library)-7
-b(,)36 b(and)f(will)g(ev)n(en)n(tually)f(b)r(e)i(re-)0
-5234 y(written.)h(Y)-7 b(ou)28 b(should)f(cop)n(y)g(it)h(if)g(y)n(ou)e
-(w)n(an)n(t)h(to)h(preserv)n(e)e(it.)p eop
-%%Page: 15 15
-15 14 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(15)0 162 y Fb(5.3)112 b(Time)0 372
-y Fd(5.3.1)94 b(Time)30 b(structure)0 582 y Ff(LIbical)d(de\034nes)g
-(it's)g(o)n(wn)f(time)i(structure)e(for)h(storing)f(all)h(dates)f(and)h
-(times.)37 b(It)28 b(w)n(ould)e(ha)n(v)n(e)g(b)r(een)i(nice)f(to)g
-(re-use)f(the)0 695 y(C)j(library's)e Fa(struct)j(tm,)h
-Ff(but)e(that)h(structure)e(do)r(es)g(not)h(di\033eren)n(tiate)g(b)r
-(et)n(w)n(een)g(dates)f(and)h(times,)g(and)g(b)r(et)n(w)n(een)g(lo)r
-(cal)0 809 y(time)f(and)f(UTC.)h(The)g(libical)f(structure)g(is:)0
-1031 y Fc(struct)41 b(icaltimetype)87 1144 y(int)h(year;)87
-1258 y(int)g(month;)87 1371 y(int)g(day;)87 1485 y(int)g(hour;)87
-1599 y(int)g(minute;)87 1712 y(int)g(second;)87 1826
-y(int)g(is_utc;)f(/*)i(1-)g(time)e(is)i(in)g(UTC)f(timezone)e(*/)87
-1939 y(int)i(is_date;)f(/*)h(1)i(-)f(interpret)c(this)j(as)h(date.)e
-(*/)i(;)0 2161 y Ff(The)35 b(y)n(ear,)h(mon)n(th,)g(da)n(y)-7
-b(,)37 b(hour,)f(min)n(ute)f(and)g(second)g(\034elds)g(ho)n(w)f(the)h
-(brok)n(en-out)f(time)h(v)-5 b(alues.)59 b(The)35 b(is_utc)g(\034eld)0
-2275 y(distinguishes)30 b(b)r(et)n(w)n(een)h(times)g(UTC)g(and)g(a)f
-(lo)r(cal)g(time)i(zone.)45 b(The)31 b(is_date)f(\034eld)h(indicates)g
-(if)g(the)g(in)n(tra-da)n(y)e(\034elds)0 2388 y(hold)e(v)-5
-b(alid)28 b(data.)0 2658 y Fd(5.3.2)94 b(Creating)31
-b(time)f(structures)0 2868 y Ff(There)d(are)g(sev)n(eral)e(w)n(a)n(ys)h
-(to)i(create)e(a)i(new)f(icaltimet)n(yp)r(e)h(structure:)0
-3089 y Fc(struct)41 b(icaltimetype)e(icaltime_from_s)o(tr)o(in)o(g\(c)o
-(on)o(st)e(char*)42 b(str\);)0 3203 y(struct)f(icaltimetype)e
-(icaltime_from_t)o(im)o(et)o(\(ti)o(me)o(_t)e(v,)43 b(int)f(is_date\);)
-0 3317 y(struct)f(icaltimetype)e(icaltime_from_i)o(nt)o(\(i)o(nt)e(v,)
-43 b(int)f(is_date,)e(int)j(is_utc\);)0 3538 y Ff(Icaltime_from_string)
-25 b(tak)n(es)i(an)n(y)g(RF)n(C2445)e(complian)n(t)i(time)h(string:)0
-3760 y Fc(struct)41 b(icaltimetype)e(tt)j(=)h(icaltime_from_str)o(in)o
-(g\()o(199)o(70)o(101)o(T1)o(03)o(000)o(\);)0 3982 y
-Ff(Icaltime_from_timet)22 b(tak)n(es)g(a)h(timet)g(v)-5
-b(alue,)24 b(represen)n(ting)e(seconds)g(past)g(the)i(POSIX)f(ep)r(o)r
-(c)n(h,)h(and)f(a)f(\035ag)g(to)h(indicate)0 4095 y(if)k(the)f(time)g
-(is)g(a)g(date.)36 b(Dates)26 b(ha)n(v)n(e)f(an)h(iden)n(tical)f
-(structure)h(to)g(a)f(time,)i(but)g(they)f(time)h(p)r(ortion)e(\()i
-(hours,)e(min)n(uts)h(and)0 4209 y(seconds)d(\))i(is)g(alw)n(a)n(ys)d
-(00:00:00.)33 b(Dates)24 b(act)h(di\033eren)n(tly)f(in)h(sorting)e(an)h
-(comparision,)f(and)i(they)f(ha)n(v)n(e)f(a)h(di\033eren)n(t)h(string)0
-4322 y(represen)n(tation)h(in)i(RF)n(C2445.)0 4479 y(The)20
-b(icaltime_from_in)n(t)e(is)h(lik)n(e)g(icaltime_from_timet,)i(but)f
-(with)g(an)f(arbitrary)f(ep)r(o)r(c)n(h.)34 b(This)19
-b(routine)g(w)n(as)g(a)g(mistak)n(e)0 4592 y(and)27 b(is)h(deprecated.)
-0 4862 y Fd(5.3.3)94 b(Time)30 b(manipulating)f(routines)0
-5072 y Ff(The)f(n)n(ull)f(time)h(v)-5 b(alue)28 b(is)f(used)h(to)f
-(indicate)h(that)g(the)g(data)f(in)g(the)h(structure)f(is)h(not)f(a)h
-(v)-5 b(alid)27 b(time.)0 5294 y Fc(struct)41 b(icaltimetype)e
-(icaltime_null_t)o(im)o(e\()o(voi)o(d\))o(;)0 5407 y(int)j
-(icaltime_is_null_)o(ti)o(me)o(\(st)o(ru)o(ct)37 b(icaltimetype)h(t\);)
-p eop
-%%Page: 16 16
-16 15 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(16)0 162 y(It)33 b(is)g(sensible)g(for)g(the)g
-(brok)n(en-out)f(time)h(\034elds)g(to)g(con)n(tain)g(v)-5
-b(alues)32 b(that)i(are)e(not)h(p)r(ermitted)h(in)f(an)g(ISO)g
-(complian)n(t)0 275 y(time)g(string.)53 b(F)-7 b(or)32
-b(instance,)i(the)g(seconds)e(\034eld)h(can)g(hold)g(v)-5
-b(alues)32 b(greater)f(than)j(59,)f(and)g(the)g(hours)f(\034eld)i(can)e
-(hold)0 389 y(v)-5 b(alues)29 b(larger)e(than)j(24.)41
-b(The)29 b(excessiv)n(e)f(v)-5 b(alues)29 b(will)g(b)r(e)h(rolled)e(o)n
-(v)n(er)g(in)n(to)h(the)g(next)h(larger)d(\034eld)j(when)f(the)h
-(structure)0 502 y(is)d(normalized.)0 712 y Fc(struct)41
-b(icaltimetype)e(icaltime_normal)o(iz)o(e\()o(str)o(uc)o(t)e
-(icaltimetype)i(t\);)0 921 y Ff(Normalizing)26 b(allo)n(ws)g(y)n(ou)h
-(to)h(do)f(arithmetic)g(op)r(erations)g(on)g(time)h(v)-5
-b(alues.)0 1130 y Fc(struct)41 b(icaltimetype)e(tt)j(=)h
-(icaltime_from_str)o(in)o(g\()o("19)o(97)o(010)o(1T)o(10)o(300)o(0")o
-(\);)0 1244 y(tt.days)e(+=3)0 1357 y(tt.second)f(+=)i(70;)0
-1471 y(tt)h(=)g(icaltime_normali)o(ze)o(\(t)o(t\);)0
-1680 y Ff(There)27 b(are)g(sev)n(eral)e(routines)i(to)h(get)f(the)h(da)
-n(y)f(of)g(the)h(w)n(eek)f(or)g(mon)n(th,)g(etc,)h(from)f(a)h(time)g
-(structure.)0 1889 y Fc(short)41 b(icaltime_day_of_y)o(ea)o(r\(s)o(tr)o
-(uc)o(t)d(icaltimetype)g(t\);)0 2003 y(struct)j(icaltimetype)e
-(icaltime_from_d)o(ay)o(_o)o(f_y)o(ea)o(r\()o(sho)o(rt)e(doy,)42
-b(short)f(year\);)0 2117 y(short)g(icaltime_day_of_w)o(ee)o(k\(s)o(tr)o
-(uc)o(t)d(icaltimetype)g(t\);)0 2230 y(short)j(icaltime_start_do)o(y_)o
-(of_)o(we)o(ek)o(\(st)o(ru)o(ct)c(icaltimetype)i(t\);)0
-2344 y(short)i(icaltime_week_num)o(be)o(r\(s)o(ho)o(rt)c(day_of_month,)
-h(short)k(month,)f(short)g(year\);)0 2457 y(struct)g(icaltimetype)e
-(icaltime_from_w)o(ee)o(k_)o(num)o(be)o(r\()o(sho)o(rt)e(week_number,)h
-(short)k(year\);)0 2571 y(short)f(icaltime_days_in_)o(mo)o(nth)o(\(s)o
-(ho)o(rt)c(month,short)i(year\);)0 2780 y Ff(T)-7 b(w)n(o)37
-b(routines)g(con)n(v)n(ert)g(time)h(structures)f(to)h(and)f(from)h(the)
-g(n)n(um)n(b)r(er)g(of)f(seconds)g(since)h(the)g(POSIX)g(ep)r(o)r(c)n
-(h.)68 b(The)0 2894 y(is_date)27 b(\034eld)h(indicates)f(whether)g(or)g
-(not)h(the)g(hour,)e(min)n(ute)i(and)g(second)f(\034elds)g(should)h(b)r
-(e)g(used)f(in)h(the)g(con)n(v)n(ersion.)0 3103 y Fc(struct)41
-b(icaltimetype)e(icaltime_from_t)o(im)o(et)o(\(ti)o(me)o(_t)e(v,)43
-b(int)f(is_date\);)0 3217 y(time_t)f(icaltime_as_time)o(t\()o(str)o(uc)
-o(t)c(icaltimetype\);)0 3426 y Ff(The)28 b(compare)e(routine)h(w)n
-(orks)f(exactly)h(lik)n(e)g(strcmp,)g(but)h(on)g(time)g(structures.)0
-3635 y Fc(int)42 b(icaltime_compare\()o(st)o(ru)o(ct)37
-b(icaltimetype)i(a,struct)h(icaltimetype)e(b\);)0 3844
-y Ff(The)d(follo)n(wing)e(routines)h(con)n(v)n(ert)g(b)r(et)n(w)n(een)g
-(UTC)h(and)g(a)f(named)h(timezone.)58 b(The)35 b(tzid)g(\034eld)g(m)n
-(ust)g(b)r(e)g(a)f(timezone)0 3958 y(name)27 b(from)h(the)f(Olsen)h
-(database,)e(suc)n(h)h(as)g("America/Los_Angeles.")0
-4114 y(The)h(utc_o\033set)f(routine)g(returns)g(the)h(o\033set)f(of)h
-(the)g(named)f(time)h(zone)f(from)h(UTC,)f(in)h(seconds.)0
-4271 y(The)f(tt)g(parameter)e(in)i(the)g(follo)n(wing)e(routines)h
-(indicates)h(the)g(date)f(on)h(whic)n(h)f(the)h(con)n(v)n(ersion)d
-(should)j(b)r(e)g(made.)36 b(The)0 4384 y(tt)23 b(parameter)e(is)h
-(necessary)f(b)r(ecause)h(timezones)g(ha)n(v)n(e)f(man)n(y)g
-(di\033eren)n(t)i(rules)f(for)g(when)g(da)n(yligh)n(t)f(sa)n(vings)g
-(time)i(is)f(used,)0 4498 y(and)27 b(these)h(rules)f(can)g(c)n(hange)f
-(o)n(v)n(er)g(time.)37 b(So,)27 b(for)g(a)g(single)g(timezone)g(one)g
-(y)n(ear)f(ma)n(y)h(ha)n(v)n(e)f(da)n(yligh)n(t)h(sa)n(vings)e(time)j
-(on)0 4612 y(Marc)n(h)f(15,)f(but)j(for)e(other)g(y)n(ears)f(Marc)n(h)g
-(15)h(ma)n(y)g(b)r(e)h(standard)f(time,)h(and)f(some)g(y)n(ears)f(ma)n
-(y)h(ha)n(v)n(e)g(standard)f(time)i(all)0 4725 y(y)n(ear.)0
-4934 y Fc(int)42 b(icaltime_utc_offs)o(et)o(\(s)o(tru)o(ct)37
-b(icaltimetype)h(tt,)43 b(char*)e(tzid\);)0 5048 y(int)h
-(icaltime_local_ut)o(c_)o(of)o(fse)o(t\()o(\);)0 5162
-y(struct)f(icaltimetype)e(icaltime_as_utc)o(\(s)o(tr)o(uct)e
-(icaltimetype)h(tt,char*)i(tzid\);)0 5275 y(struct)h(icaltimetype)e
-(icaltime_as_zon)o(e\()o(st)o(ruc)o(t)e(icaltimetype)i(tt,char*)h
-(tzid\);)0 5389 y(struct)h(icaltimetype)e(icaltime_as_loc)o(al)o(\(s)o
-(tru)o(ct)e(icaltimetype)h(tt\);)p eop
-%%Page: 17 17
-17 16 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(17)0 162 y Fb(5.4)112 b(Storing)37
-b(Ob)6 b(jects)0 372 y Ff(The)31 b(libical)f(distribution)h(includes)g
-(a)f(separate)f(library)-7 b(,)30 b(libicalss,)h(that)g(allo)n(ws)e(y)n
-(ou)h(to)g(store)g(iCal)g(comp)r(onen)n(t)h(data)0 485
-y(to)f(disk)g(in)h(a)f(v)-5 b(ariet)n(y)29 b(of)i(w)n(a)n(ys.)43
-b(This)30 b(library)f(also)h(includes)g(co)r(de)g(to)g(implemen)n(t)h
-(the)g(CSTP)g(proto)r(col)e(of)h(CAP)h(and)0 599 y(has)c(some)g
-(routines)g(for)g(deciphering)g(incomming)g(messages.)0
-755 y(The)f(\034le)h(storage)e(routines)g(are)h(organized)e(in)j(an)f
-(inheritance)g(heirarc)n(h)n(y)f(that)h(is)h(ro)r(oted)e(in)i(icalset,)
-f(with)h(the)g(deriv)n(ed)0 869 y(class)k(ical\034leset)g(and)h
-(icaldirset.)48 b(Ical\034leset)32 b(stores)e(comp)r(onen)n(ts)h(to)h
-(a)g(\034le,)h(while)f(icaldirset)e(stores)h(comp)r(onen)n(ts)g(to)0
-983 y(m)n(ultiple)c(\034les,)f(one)g(p)r(er)g(mon)n(th)g(based)g(on)g
-(DTST)-7 b(AMP)g(.)28 b(Other)e(storages)e(classess,)h(for)g(storage)g
-(to)h(a)g(heap)g(or)f(a)h(m)n(ysql)0 1096 y(database)g(are)h(planned)g
-(for)g(the)h(future.)0 1253 y(All)g(of)g(the)g(icalset)f(deriv)n(ed)f
-(classes)h(ha)n(v)n(e)f(the)i(same)f(in)n(terface:)0
-1579 y Fc(icaldirset*)39 b(icaldirset_new\(c)o(on)o(st)e(char*)k
-(path\);)0 1693 y(void)h(icaldirset_free\()o(ic)o(al)o(dir)o(se)o(t*)37
-b(store\);)0 1806 y(const)k(char*)h(icaldirset_path\()o(ic)o(al)o(dir)o
-(se)o(t*)37 b(store\);)0 1920 y(void)42 b(icaldirset_mark\()o(ic)o(al)o
-(dir)o(se)o(t*)37 b(store\);)0 2033 y(icalerrorenum)h(icaldirset_commi)
-o(t\()o(ica)o(ld)o(ir)o(set)o(*)f(store\);)0 2147 y(icalerrorenum)h
-(icaldirset_add_c)o(om)o(pon)o(en)o(t\()o(ica)o(ld)o(ir)o(set)o(*)f
-(store,)k(icalcomponent*)d(comp\);)0 2260 y(icalerrorenum)g
-(icaldirset_remov)o(e_)o(com)o(po)o(ne)o(nt\()o(ic)o(al)o(dir)o(se)o
-(t*)f(store,)k(icalcomponent*)d(comp\);)0 2374 y(int)k
-(icaldirset_count_)o(co)o(mp)o(one)o(nt)o(s\()o(ica)o(ld)o(ir)o(set)o
-(*)37 b(store,)k(icalcomponent_kin)o(d)c(kind\);)0 2488
-y(icalerrorenum)h(icaldirset_selec)o(t\()o(ica)o(ld)o(ir)o(set)o(*)f
-(store,)k(icalcomponent*)d(gauge\);)0 2601 y(void)k(icaldirset_clear)o
-(\(i)o(ca)o(ldi)o(rs)o(et)o(*)c(store\);)0 2715 y(icalcomponent*)g
-(icaldirset_fetc)o(h\()o(ica)o(ld)o(ir)o(set)o(*)f(store,)k(const)h
-(char*)f(uid\);)0 2828 y(int)h(icaldirset_has_ui)o(d\()o(ic)o(ald)o(ir)
-o(se)o(t*)37 b(store,)k(const)h(char*)f(uid\);)0 2942
-y(icalcomponent*)d(icaldirset_fetc)o(h_)o(mat)o(ch)o(\(i)o(cal)o(di)o
-(rs)o(et*)f(set,)42 b(icalcomponent)c(*c\);)0 3055 y(icalerrorenum)g
-(icaldirset_modif)o(y\()o(ica)o(ld)o(ir)o(set)o(*)f(store,)k
-(icalcomponent)d(*oldc,)j(icalcomponent)e(*newc\);)0
-3169 y(icalcomponent*)f(icaldirset_get_)o(cu)o(rre)o(nt)o(_c)o(omp)o
-(on)o(en)o(t\(i)o(ca)o(ldi)o(rs)o(et)o(*)g(store\);)0
-3283 y(icalcomponent*)g(icaldirset_get_)o(fi)o(rst)o(_c)o(om)o(pon)o
-(en)o(t\()o(ica)o(ld)o(irs)o(et)o(*)f(store\);)0 3396
-y(icalcomponent*)h(icaldirset_get_)o(ne)o(xt_)o(co)o(mp)o(one)o(nt)o
-(\(i)o(cal)o(di)o(rse)o(t*)f(store\);)0 3664 y Fd(5.4.1)94
-b(Creating)31 b(a)h(new)g(set)0 3874 y Ff(Y)-7 b(ou)28
-b(can)f(create)f(a)i(new)f(set)h(from)f(either)g(the)h(base)f(class)g
-(or)g(the)g(direv)n(ed)g(class.)36 b(F)-7 b(rom)27 b(the)h(base)f
-(class)g(use)g(one)g(of:)0 4087 y Fc(icalset*)40 b(icalset_new_file)o
-(\(co)o(ns)o(t)d(char*)42 b(path\);)0 4201 y(icalset*)e
-(icalset_new_dir\()o(con)o(st)d(char*)k(path\);)0 4314
-y(icalset*)f(icalset_new_heap)o(\(vo)o(id)o(\);)0 4428
-y(icalset*)g(icalset_new_mysq)o(l\(c)o(on)o(st)d(char*)k(path\);)0
-4641 y Ff(Y)-7 b(ou)28 b(can)f(also)f(create)h(a)g(new)h(set)f(based)g
-(on)h(the)f(deriv)n(ed)g(class,)g(F)-7 b(or)27 b(instance,)g(with)h
-(ical\034leset:)0 4854 y Fc(icalfileset*)38 b(icalfileset_new\(c)o(on)o
-(st)f(char*)42 b(path\);)0 4967 y(icalfileset*)c(icalfileset_new_o)o
-(pe)o(n\(c)o(on)o(st)f(char*)k(path,)h(int)g(flags,)f(mode_t)g(mode\);)
-0 5180 y Ff(Icaset_new_\034le)33 b(is)h(iden)n(tical)g(to)g
-(ical\034leset_new.)55 b(BOth)34 b(routines)g(will)g(op)r(en)g(an)g
-(existing)g(\034le)g(for)g(readinga)e(and)0 5294 y(writing,)24
-b(or)e(create)g(a)h(new)g(\034le)g(if)h(it)f(do)r(es)g(not)g(exist.)35
-b(Ical\034lset_new_op)r(en)22 b(tak)n(es)g(the)h(same)g(argumen)n(ts)f
-(as)g(the)i(op)r(en\(\))0 5407 y(system)j(routine)g(and)h(b)r(eha)n(v)n
-(es)e(in)i(the)g(same)f(w)n(a)n(y)-7 b(.)p eop
-%%Page: 18 18
-18 17 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(18)0 162 y(The)29 b(icalset)g(and)g(ical\034lset)g
-(ob)5 b(jects)29 b(are)f(somewhat)h(in)n(terc)n(hangable)e(\025)i(y)n
-(ou)f(can)h(use)g(an)g(ical\034leset*)g(as)f(an)h(argumen)n(t)0
-275 y(to)e(an)n(y)g(of)h(the)g(icalset)f(routines.)0
-432 y(The)d(follo)n(wing)f(examples)h(will)g(all)g(use)g(ical\034leset)
-g(routines;)g(using)g(the)h(other)e(icalset)h(deriv)n(ed)f(classess)g
-(will)h(b)r(e)h(similar.)0 704 y Fd(5.4.2)94 b(A)m(dding,)31
-b(Finding)g(and)h(Remo)m(ving)d(Comp)s(onen)m(ts)0 914
-y Ff(T)-7 b(o)27 b(add)h(comp)r(onen)n(ts)f(to)g(a)g(set,)h(use:)0
-1154 y Fc(icalerrorenum)38 b(icalfileset_add_)o(co)o(mpo)o(ne)o(nt)o
-(\(ic)o(al)o(fi)o(les)o(et)o(*)g(cluster,)i(icalcomponent*)d(child\);)0
-1393 y Ff(The)k(\034leset)h(k)n(eeps)e(an)h(inmemory)g(cop)n(y)f(of)h
-(the)h(comp)r(onen)n(ts,)i(and)d(this)g(set)h(m)n(ust)f(b)r(e)g
-(written)h(bac)n(k)e(to)h(the)h(\034le)0 1507 y(o)r(cassionally)-7
-b(.)35 b(There)27 b(are)f(t)n(w)n(o)h(routines)g(to)g(manage)g(this:)0
-1746 y Fc(void)42 b(icalfileset_mark)o(\(i)o(ca)o(lfi)o(le)o(se)o(t*)37
-b(cluster\);)0 1860 y(icalerrorenum)h(icalfileset_comm)o(it)o(\(ic)o
-(al)o(fi)o(les)o(et)o(*)f(cluster\);)0 2099 y Ff(Ical\034leset_mark)d
-(indicates)i(that)h(the)g(in-memory)e(comp)r(onen)n(ts)h(ha)n(v)n(e)f
-(c)n(hanged.)62 b(Calling)36 b(the)h(_add_comp)r(onen)n(t)0
-2212 y(routine)32 b(will)h(call)f(_mark)f(automatically)-7
-b(,)33 b(but)g(y)n(ou)f(ma)n(y)g(need)h(to)f(call)h(it)g(y)n(ourself)e
-(if)i(y)n(ou)f(ha)n(v)n(e)f(made)i(a)f(c)n(hange)f(to)0
-2326 y(an)g(existing)h(comp)r(onen)n(t.)49 b(The)32 b(_commit)f
-(routine)g(writes)h(the)g(data)f(base)g(to)h(disk,)g(but)h(only)e(if)h
-(it)g(is)g(mark)n(ed.)48 b(The)0 2440 y(_commit)27 b(routine)g(is)h
-(called)f(automatically)f(when)i(the)g(ical\034leset)f(is)h(freed.)0
-2596 y(T)-7 b(o)27 b(iterate)g(through)g(the)h(comp)r(onen)n(ts)f(in)h
-(a)f(set,)h(use:)0 2835 y Fc(icalcomponent*)38 b(icalfileset_get)o(_f)o
-(irs)o(t_)o(co)o(mpo)o(ne)o(nt)o(\(ic)o(al)o(fil)o(es)o(et)o(*)g
-(cluster\);)0 2949 y(icalcomponent*)g(icalfileset_get)o(_n)o(ext)o(_c)o
-(om)o(pon)o(en)o(t\()o(ica)o(lf)o(ile)o(se)o(t*)f(cluster\);)0
-3063 y(icalcomponent*)h(icalfileset_get)o(_c)o(urr)o(en)o(t_)o(com)o
-(po)o(ne)o(nt)f(\(icalfileset*)h(cluster\);)0 3302 y
-Ff(These)25 b(routines)g(w)n(ork)g(lik)n(e)g(the)h(corresp)r(onding)e
-(routines)h(from)g(icalcomp)r(onen)n(t,)g(except)h(that)g(their)f
-(output)i(is)e(\034ltered)0 3415 y(through)j(a)h(gauge.)39
-b(A)29 b(gauge)f(is)h(a)f(test)h(for)g(the)g(prop)r(erties)f(within)h
-(a)g(comp)r(onen)n(ts;)g(only)f(comp)r(onen)n(ts)g(that)i(pass)e(the)0
-3529 y(test)g(are)e(returned.)37 b(A)28 b(gauge)e(can)h(b)r(e)h
-(constructed)f(from)g(a)g(MINSQL)h(string)f(with:)0 3768
-y Fc(icalgauge*)39 b(icalgauge_new_fro)o(m_)o(sq)o(l\(c)o(ha)o(r*)e
-(sql\);)0 4008 y Ff(Then,)28 b(y)n(ou)f(can)g(add)g(the)h(gauge)e(to)i
-(the)g(set)f(with)h(:)0 4247 y Fc(icalerrorenum)38 b(icalfileset_sele)o
-(ct)o(\(ic)o(al)o(fi)o(les)o(et)o(*)f(store,)42 b(icalgauge*)d
-(gauge\);)0 4486 y Ff(Here)27 b(is)h(an)f(example)g(that)h(puts)g(all)f
-(of)h(these)f(routines)g(together:)0 4726 y Fc(void)42
-b(test_fileset\(\))174 4953 y(icalfileset)d(*fs;)174
-5066 y(icalcomponent)f(*c;)174 5180 y(int)43 b(i;)174
-5294 y(char)f(*path)g(=)h(test_fileset.ic)o(s;)174 5407
-y(icalgauge)84 b(*g)42 b(=)i(icalgauge_new_f)o(ro)o(m_)o(sql)o(\()p
-eop
-%%Page: 19 19
-19 18 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(19)349 162 y Fc(SELECT)41 b(*)i(FROM)f(VEVENT)f
-(WHERE)g(DTSTART)84 b('20000103T120000Z)o(')37 b(AND)43
-b(DTSTART)d(=)j('20000106T120000Z)o('\))o(;)174 389 y(fs)g(=)g
-(icalfileset_new\()o(pat)o(h\))o(;)174 616 y(for)g(\(i)f(=)h(0;)g(i!=)g
-(10;)f(i++\))349 730 y(c)h(=)g(make_component\(i)o(\);)37
-b(/*)43 b(Make)e(a)j(new)e(component)e(where)h(DTSTART)g(has)h(month)f
-(of)i(i)g(*/)349 843 y(icalfileset_add)o(_c)o(omp)o(on)o(en)o(t\(f)o
-(s,)o(c\))o(;)174 1184 y(icalfileset_commi)o(t\()o(fs)o(\);)37
-b(/*)43 b(Write)e(to)i(disk)f(*/)174 1411 y(icalfileset_selec)o(t\()o
-(fs)o(,g\))o(;)37 b(/*)43 b(Set)f(the)h(gauge)e(to)i(filter)e
-(components)e(*/)174 1638 y(for)k(\(c)f(=)h(icalfileset_get_f)o(ir)o
-(st_)o(co)o(mp)o(one)o(nt)o(\(f)o(s\);)392 1752 y(c)g(!=)g(0;)392
-1865 y(c)g(=)g(icalfileset_get_n)o(ex)o(t_c)o(om)o(po)o(nen)o(t\()o(fs)
-o(\)\))349 1979 y(struct)e(icaltimetype)d(t)43 b(=)g(icalcomponent_get)
-o(_d)o(tst)o(ar)o(t\()o(c\);)349 2206 y(printf\(sn,icalt)o(im)o(e_a)o
-(s_)o(ct)o(ime)o(\(t)o(\)\))o(;)174 2433 y(icalfileset_free\()o(fs)o
-(\);)0 2706 y Fd(5.4.3)94 b(Other)31 b(routines)0 2916
-y Ff(There)c(are)g(sev)n(eral)e(other)i(routines)g(in)h(the)g(icalset)f
-(in)n(terface,)g(but)h(they)g(not)f(fully)h(implemen)n(ted)h(y)n(et.)0
-3207 y Fb(5.5)112 b(Memory)37 b(Managemen)m(t)0 3417
-y Ff(Libical)25 b(relies)f(hea)n(vily)g(on)h(dynamic)g(allo)r(cation)f
-(for)h(b)r(oth)h(the)f(core)f(ob)5 b(jects)25 b(and)g(for)f(the)i
-(strings)e(used)h(to)g(hold)g(v)-5 b(alues.)0 3531 y(Some)34
-b(of)f(this)h(memory)f(the)h(library)f(caller)g(o)n(wns)g(and)g(m)n
-(ust)h(free,)h(and)f(some)f(of)h(the)g(memory)f(is)h(managed)e(b)n(y)i
-(the)0 3645 y(library)-7 b(.)36 b(Here)27 b(is)g(a)g(summary)g(of)h
-(the)g(memory)e(rules.)0 3884 y Fd(1\))208 4031 y Ff(If)40
-b(the)h(function)g(name)g(has)f(new)g(in)h(it,)j(the)d(caller)e(gets)h
-(con)n(trol)f(of)i(the)g(memory)-7 b(.)75 b(\()40 b(suc)n(h)h(as)e
-(icalcomp)r(o-)208 4144 y(nen)n(t_new\(\),)27 b(or)g(icalprop)r(ert)n
-(y_new_clone\(\))e(\))0 4324 y Fd(2\))208 4471 y Ff(If)j(y)n(ou)g(got)g
-(the)h(memory)f(from)g(a)g(routine)g(with)h(new)f(in)h(it,)g(y)n(ou)f
-(m)n(ust)h(call)f(the)h(corresp)r(onding)d(*_free)i(routine)208
-4585 y(to)f(free)g(the)h(memory)-7 b(.)36 b(\()28 b(Use)g(icalcomp)r
-(onen)n(t_free\(\))e(to)i(free)f(ob)5 b(jects)27 b(created)g(with)h
-(icalcomp)r(onen)n(t_new\(\)\))0 4765 y Fd(3\))208 4912
-y Ff(If)j(the)h(function)f(name)g(has)g(add)g(in)g(it,)i(the)f(caller)e
-(is)h(transferring)e(con)n(trol)h(of)h(the)h(memory)e(to)h(the)h
-(routine.)47 b(\()208 5025 y(icalprop)r(ert)n(y_add_parameter\(\))23
-b(\))0 5205 y Fd(4\))p eop
-%%Page: 20 20
-20 19 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(20)208 162 y(If)34 b(the)g(function)g(name)g(has)f
-(remo)n(v)n(e)f(in)i(it,)i(the)e(caller)f(passes)f(in)i(a)g(p)r(oin)n
-(ter)f(to)g(an)h(ob)5 b(ject)33 b(and)h(after)f(the)h(call)208
-275 y(returns,)e(the)h(caller)e(o)n(wns)g(the)h(ob)5
-b(ject.)50 b(So,)33 b(b)r(efore)f(y)n(ou)f(call)h(icalcomp)r(onen)n
-(t_remo)n(v)n(e_prop)r(ert)n(y\(comp,fo)r(o\),)208 389
-y(y)n(ou)26 b(do)i(not)f(o)n(wn)g(fo)r(o)g(and)h(after)f(the)h(call)f
-(returns,)g(y)n(ou)g(do.)0 561 y Fd(5\))208 703 y Ff(If)d(the)g
-(routine)f(returns)g(a)g(string,)h(libical)g(o)n(wns)f(the)h(memory)f
-(and)g(will)h(put)g(it)h(on)e(a)g(ring)g(bu\033er)h(to)g(reclaim)f
-(later.)208 817 y(F)-7 b(or)32 b(example,)i(icalcomp)r(onen)n
-(t_as_ical_string\(\).)50 b(Y)-7 b(ou'd)33 b(b)r(etter)g(strdup\(\))h
-(it)g(if)f(y)n(ou)f(w)n(an)n(t)h(to)g(k)n(eep)f(it,)j(and)208
-931 y(y)n(ou)26 b(don't)i(ha)n(v)n(e)e(to)i(delete)g(it.)0
-1219 y Fb(5.6)112 b(Error)36 b(Handling)0 1429 y Ff(Libical)25
-b(has)g(sev)n(eral)e(error)h(handling)h(mec)n(hanisms)f(for)h(the)h(v)
--5 b(arious)24 b(t)n(yp)r(es)h(of)g(programming,)f(seman)n(tic)h(and)g
-(syn)n(tactic)0 1542 y(errors)g(y)n(ou)i(ma)n(y)g(encoun)n(ter.)0
-1811 y Fd(5.6.1)94 b(Return)31 b(v)-5 b(alues)0 2022
-y Ff(Man)n(y)29 b(library)f(routines)g(signal)h(errors)e(through)h
-(their)h(return)g(v)-5 b(alues.)42 b(All)30 b(routines)e(that)i(return)
-f(a)f(p)r(oin)n(ter,)i(suc)n(h)f(as)0 2135 y(icalcomp)r(onen)n
-(t_new\(\),)36 b(will)f(return)f(0)g(\()h(zero)f(\))h(on)f(a)g(fatal)h
-(error.)56 b(Some)35 b(routines)f(will)g(return)h(a)f(v)-5
-b(alue)34 b(of)h(en)n(um)0 2249 y(icalerroren)n(um.)0
-2518 y Fd(5.6.2)94 b(icalerrno)0 2728 y Ff(Most)24 b(routines)f(will)i
-(set)f(the)g(global)f(error)f(v)-5 b(alue)24 b(icalerrno)f(on)h
-(errors.)33 b(This)24 b(v)-5 b(ariable)23 b(is)h(an)g(en)n(umeration;)g
-(p)r(ermissible)0 2841 y(v)-5 b(alues)35 b(can)f(b)r(e)h(found)h(in)f
-(libical/icalerror.h.)56 b(If)35 b(the)g(routine)g(returns)f(an)h(en)n
-(um)g(icalerroren)n(um,)f(then)h(the)h(return)0 2955
-y(v)-5 b(alue)27 b(will)h(b)r(e)f(the)h(same)f(as)f(icalerrno.)35
-b(Y)-7 b(ou)27 b(can)g(use)g(icalerror_strerror\(\))c(to)k(get)g(a)g
-(string)f(that)i(describ)r(es)e(the)i(error)0 3224 y
-Fd(5.6.3)94 b(X-LIC-ERR)m(OR)30 b(and)j(X-LIC-INV)-11
-b(ALID-COMPONENT)0 3434 y Ff(The)38 b(library)f(handles)g(seman)n(tic)g
-(and)h(syn)n(tactic)f(errors)f(in)i(comp)r(onen)n(ts)g(b)n(y)f
-(inserting)g(errors)f(prop)r(erties)h(in)n(to)h(the)0
-3548 y(comp)r(onen)n(ts.)k(If)30 b(the)g(parser)d(cannot)i(parse)g
-(incoming)g(text)g(\()h(a)f(syn)n(tactic)g(error)e(\))j(or)f(if)h(the)g
-(icalrestriction_c)n(hec)n(k\(\))0 3661 y(routine)h(indicates)g(that)h
-(the)f(comp)r(onen)n(t)g(do)r(es)g(not)h(meet)f(the)h(requiremen)n(ts)e
-(of)h(RF)n(C2446)f(\()h(a)g(seman)n(tic)g(error\))f(the)0
-3775 y(library)i(will)h(insert)g(prop)r(erties)f(of)h(the)h(t)n(yp)r(e)
-f(X-LIC-ERR)n(OR)g(to)g(describ)r(e)g(the)g(error.)52
-b(Here)33 b(is)g(an)g(example)g(of)g(the)0 3889 y(error)26
-b(prop)r(ert)n(y:)0 4108 y Fc(X-LIC-ERROR;X-LI)o(C-)o(ERR)o(OR)o(TY)o
-(PE=)o(IN)o(VA)o(LID)o(_I)o(TI)o(P)38 b(:Failed)i(iTIP)i(restrictions)d
-(for)j(property)e(DTSTART.)0 4221 y(Expected)g(1)j(instances)d(of)j
-(the)f(property)e(and)j(got)f(0)0 4441 y Ff(This)35 b(error)f(resulted)
-h(from)g(a)g(call)g(to)h(icalrestriction_c)n(hec)n(k\(\),)f(whic)n(h)g
-(disco)n(v)n(ered)e(that)j(the)g(comp)r(onen)n(t)f(do)r(es)g(not)0
-4554 y(ha)n(v)n(e)26 b(a)i(DTST)-7 b(AR)g(T)28 b(prop)r(ert)n(y)-7
-b(,)27 b(as)g(required)f(b)n(y)h(RF)n(C2445.)0 4711 y(There)g(are)g(a)g
-(few)h(routines)e(to)i(manipulate)f(error)f(prop)r(erties:)0
-4867 y(The)35 b(follo)n(wing)g(data)g(is)g(supp)r(osed)g(to)g(b)r(e)h
-(in)g(a)f(table.)60 b(It)36 b(lo)r(oks)e(OK)h(in)h(LyX,)f(but)h(do)r
-(es)f(not)g(format)g(prop)r(ertly)g(in)0 4981 y(output.)0
-5137 y(Routine)28 b(Purp)r(ose)f(v)n(oid)g(icalrestriction_c)n(hec)n
-(k\(\))e(Chec)n(k)i(a)g(comp)r(onen)n(t)g(against)g(RF)n(C2446)e(and)j
-(insert)0 5294 y(error)g(prop)r(erties)g(to)i(indicate)f(non)g
-(compliance)g(in)n(t)h(icalcomp)r(onen)n(t_coun)n(t_errors\(\))c
-(Return)j(the)h(n)n(um)n(b)r(er)g(of)f(error)0 5407 y(prop)r(erties)p
-eop
-%%Page: 21 21
-21 20 bop 0 -167 3900 5 v 0 -200 a Fd(5.)73 b(Using)32
-b(libical)3149 b Ff(21)0 162 y(in)28 b(a)f(comp)r(onen)n(t)g(v)n(oid)g
-(icalcomp)r(onen)n(t_strip_errors\(\))d(Remo)n(v)n(e)i(all)i(error)d
-(prop)r(erties)i(in)h(as)0 318 y(comp)r(onen)n(t)f(v)n(oid)g(icalcomp)r
-(onen)n(t_con)n(v)n(ert_errors\(\))c(Con)n(v)n(ert)j(some)h(error)e
-(prop)r(erties)i(in)n(to)0 475 y(REQUESTS-ST)-7 b(A)g(TUS)29
-b(proprties)e(to)g(indicate)h(the)g(inabilit)n(y)f(to)0
-631 y(pro)r(cess)f(the)i(comp)r(onen)n(t)g(as)e(an)i(iTIP)g(request.)0
-788 y(The)g(t)n(yp)r(es)f(of)h(errors)d(are)i(listed)g(in)h
-(icalerror.h.)35 b(They)27 b(are:)0 1027 y Fc(ICAL_XLICERRORTY)o(PE)o
-(_CO)o(MP)o(ON)o(ENT)o(PA)o(RS)o(EER)o(RO)o(R)0 1141
-y(ICAL_XLICERRORTY)o(PE)o(_PA)o(RA)o(ME)o(TER)o(VA)o(LU)o(EPA)o(RS)o
-(EE)o(RRO)o(R)0 1254 y(ICAL_XLICERRORTY)o(PE)o(_PA)o(RA)o(ME)o(TER)o
-(NA)o(ME)o(PAR)o(SE)o(ER)o(ROR)0 1368 y(ICAL_XLICERRORTY)o(PE)o(_PR)o
-(OP)o(ER)o(TYP)o(AR)o(SE)o(ERR)o(OR)0 1481 y(ICAL_XLICERRORTY)o(PE)o
-(_VA)o(LU)o(EP)o(ARS)o(EE)o(RR)o(OR)0 1595 y(ICAL_XLICERRORTY)o(PE)o
-(_UN)o(KV)o(CA)o(LPR)o(OP)0 1709 y(ICAL_XLICERRORTY)o(PE)o(_IN)o(VA)o
-(LI)o(DIT)o(IP)0 1948 y Ff(The)46 b(libical)f(parser)f(will)i(generate)
-e(the)i(error)d(that)j(end)g(in)g(P)-7 b(ARSEERR)n(OR)47
-b(when)e(it)h(encoun)n(ters)f(garbage)e(in)0 2062 y(the)d(input)g
-(steam.)72 b(ICAL_XLICERR)n(OR)-7 b(TYPE_INV)e(ALIDITIP)42
-b(is)d(inserted)g(b)n(y)g(icalrestriction_c)n(hec)n(k\(\),)h(and)0
-2175 y(ICAL_XLICERR)n(OR)-7 b(TYPE_UNKV)n(CALPR)n(OP)21
-b(is)e(generated)f(b)n(y)i(icalv)n(cal_con)n(v)n(ert\(\))c(when)k(it)g
-(encoun)n(ters)f(a)g(vCal)0 2289 y(prop)r(ert)n(y)26
-b(that)i(it)g(cannot)f(con)n(v)n(ert)f(or)h(do)r(es)g(not)h(kno)n(w)f
-(ab)r(out.)0 2445 y(Icalcomp)r(onen)n(t_con)n(v)n(ert_errors\(\))33
-b(con)n(v)n(erts)k(some)g(of)i(the)f(error)f(prop)r(erties)g(in)h(a)g
-(comp)r(onen)n(t)g(in)n(to)g(REQUEST-)0 2559 y(ST)-7
-b(A)g(TUS)29 b(prop)r(erties)e(that)h(indicate)g(a)g(failure.)38
-b(As)28 b(of)g(libical)g(v)n(ersion0.18,)e(this)i(routine)g(only)f(con)
-n(v)n(ert)g(*P)-7 b(ARSEER-)0 2672 y(R)n(OR)29 b(errors)d(and)j(it)h
-(alw)n(a)n(ys)d(generates)h(a)g(3.x)h(\()g(failure)g(\))g(co)r(de.)42
-b(This)29 b(mak)n(es)f(it)h(more)f(of)h(a)g(go)r(o)r(d)g(idea)f(than)h
-(a)g(really)0 2786 y(useful)f(bit)g(of)g(co)r(de.)0 3077
-y Fb(5.7)112 b(Naming)36 b(Standard)0 3288 y Ff(Structures)26
-b(that)i(y)n(ou)e(access)f(with)j(the)f("struct")f(k)n(eyw)n(ord,)f
-(suc)n(h)h(as)h("struct)f(icaltimet)n(yp)r(e")g(are)g(things)h(that)g
-(y)n(ou)f(are)0 3401 y(allo)n(w)n(ed)g(to)i(see)f(inside)g(and)h(p)r
-(ok)n(e)f(at.)0 3558 y(Structures)33 b(that)h(y)n(ou)e(access)g(though)
-i(a)f(t)n(yp)r(edef,)i(suc)n(h)e(as)g("icalcomp)r(onen)n(t")e(are)i
-(things)g(where)g(all)g(of)h(the)f(data)g(is)0 3671 y(hidden.)0
-3828 y(Comp)r(onen)n(t)28 b(names)g(that)h(start)f(with)h("V")f(are)f
-(part)h(of)h(RF)n(C)f(2445)f(or)g(another)h(iCal)g(standard.)38
-b(Comp)r(onen)n(t)29 b(names)0 3941 y(that)h(start)f(with)i("X")e(are)g
-(also)g(part)g(of)h(the)g(sp)r(ec,)g(but)h(they)f(are)f(not)h(actually)
-f(comp)r(onen)n(ts)g(in)h(the)g(sp)r(ec.)44 b(Ho)n(w)n(ev)n(er,)0
-4055 y(they)34 b(lo)r(ok)f(and)g(act)h(lik)n(e)f(comp)r(onen)n(ts,)h
-(so)f(they)h(are)f(comp)r(onen)n(ts)g(in)h(libical.)55
-b(Names)33 b(that)h(start)f(with)h("XLIC")f(or)0 4168
-y("X-LIC")26 b(are)h(not)h(part)f(of)g(an)n(y)g(iCal)g(sp)r(ec.)37
-b(They)27 b(are)g(used)h(in)n(ternally)e(b)n(y)i(libical.)0
-4325 y(En)n(ums)34 b(that)h(iden)n(tify)f(a)g(comp)r(onen)n(t,)h(prop)r
-(ert)n(y)-7 b(,)35 b(v)-5 b(alue)33 b(or)h(parameter)e(end)i(with)h
-("_COMPONENT,")e("_PR)n(OP-)0 4438 y(ER)-7 b(TY,")28
-b("_V)-9 b(ALUE,")27 b(or)g("_P)-7 b(ARAMETER"s)0 4595
-y(En)n(ums)31 b(that)f(iden)n(tify)h(a)f(parameter)f(v)-5
-b(alue)30 b(ha)n(v)n(e)f(the)i(name)f(of)h(the)f(parameter)f(as)h(the)h
-(second)e(w)n(ord.)45 b(F)-7 b(or)29 b(instance:)0 4708
-y(ICAL_R)n(OLE_REQP)-7 b(AR)g(TICIP)g(ANT)29 b(or)d(ICAL_P)-7
-b(AR)g(TST)g(A)g(T_A)n(CCEPTED.)0 4865 y(The)28 b(en)n(ums)f(for)g(the)
-h(parts)f(of)g(a)g(recurarance)e(rule)j(and)f(request)g(statuses)g(are)
-f(irregular.)p eop
-%%Page: 22 22
-22 21 bop 0 -167 3900 5 v 0 -200 a Fd(6.)73 b(Hac)m(ks)33
-b(and)f(Bugs)2997 b Ff(22)0 162 y Fe(6)131 b(Hac)l(ks)45
-b(and)e(Bugs)0 400 y Ff(There)24 b(are)f(a)g(lot)h(of)g(hac)n(ks)f(in)i
-(the)f(library)f(\025)h(bits)g(of)g(co)r(de)g(that)g(I)g(am)g(not)g
-(proud)g(of)g(and)g(should)g(probably)f(b)r(e)h(c)n(hanged.)0
-514 y(These)j(are)g(mark)n(ed)f(with)i(the)g(commen)n(t)g(string)e("HA)
-n(CK.")p eop
-%%Trailer
-end
-userdict /end-hook known{end-hook}if
-%%EOF
diff --git a/libical/doc/UsingLibical.txt b/libical/doc/UsingLibical.txt
deleted file mode 100644
index 6dc4958a74..0000000000
--- a/libical/doc/UsingLibical.txt
+++ /dev/null
@@ -1,1316 +0,0 @@
-
-
-Using Libical
-
-Eric Busboom (eric@softwarestudio.org)
-
-January 2001
-
-
-
-1 Introduction 
-
-Libical is an Open Source implementation of the iCalendar protocols
-and protocol data units. The iCalendar specification describes how
-calendar clients can communicate with calendar servers so users can
-store their calendar data and arrange meetings with other users. 
-
-Libical implements RFC2445, RFC2446 and some of RFC2447 and the CAP
-draft. 
-
-This documentation assumes that you are familiar with the iCalendar
-standards RFC2445 and RFC2446. these specifications are online on
-the CALSCH webpage at:
-
-http://www.imc.org/ietf-calendar/
-
-1.1 The libical project
-
-This code is under active development. If you would like to contribute
-to the project, you can contact me, Eric Busboom, at eric@softwarestudio.org.
-The project has a webpage at
-
-http://softwarestudio.org/libical/index.html 
-
-and a mailing list that you can join by sending the following mail:
-
-To: minimalist@softwarestudio.org 
-
-Subject: subscribe libical 
-
-1.2 License
-
-The code and datafiles in this distribution are licensed under the
-Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html
-for a copy of the license. Alternately, you may use libical under
-the terms of the GNU Library General Public License. See http://www.fsf.org/copyleft/lesser.html
-for a copy of the LGPL.
-
-This dual license ensures that the library can be incorporated into
-both proprietary code and GPL'd programs, and will benefit from improvements
-made by programmers in both realms. I will only accept changes into
-my version of the library if they are similarly dual-licensed.
-
-1.3 Example Code
-
-A lot of the documentation for this library is in the form of example
-code. These examples are in the "examples" directory of the distribution.
-Also look in "src/test" for additional annotated examples. 
-
-2 Building the Library
-
-Libical uses autoconf to generate makefiles. It should built with no
-adjustments on Linux, FreeBSD and Solaris under gcc. Some version
-have been successfully been build on MacOS, Solaris, UnixWare, And
-Tru64 UNIX without gcc, but you may run into problems with a particular
-later version. 
-
-For a more complete guide to building the library, see the README file
-in the distribution. 
-
-3 Structure 
-
-The iCal calendar model is based on four types of objects: components,
-properties, values and parameters. 
-
-Properties are the fundamental unit of information in iCal, and they
-work a bit like a hash entry, with a constant key and a variable value.
-Properties may also have modifiers, called parameters. In the iCal
-content line
-
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-
-The property name is "ORGANIZER," the value of the property is "mrbig@host.com"
-and the "ROLE" parameter specifies that Mr Big is the chair of the
-meetings associated with this property. 
-
-Components are groups of properties that represent the core objects
-of a calendar system, such as events or timezones. Components are
-delimited by "BEGIN" and "END" tags. 
-
-When a component is sent across a network, if it is un-encrypted, it
-will look something like:
-
-BEGIN:VCALENDAR
-
-METHOD:REQUEST
-
-PRODID: -//hacksw/handcal//NONSGML v1.0//EN
-
-BEGIN:VEVENT 
-
-DTSTAMP:19980309T231000Z 
-
-UID:guid-1.host1.com 
-
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com 
-
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP: 
-
-  MAILTO:employee-A@host.com 
-
-DESCRIPTION:Project XYZ Review Meeting 
-
-CATEGORIES:MEETING 
-
-CLASS:PUBLIC 
-
-CREATED:19980309T130000Z 
-
-SUMMARY:XYZ Project Review 
-
-DTSTART;TZID=US-Eastern:19980312T083000 
-
-DTEND;TZID=US-Eastern:19980312T093000 
-
-LOCATION:1CP Conference Room 4350 
-
-END:VEVENT 
-
-END:VCALENDAR
-
-Note that components can be nested; this example has both a VCALENDAR
-and a VEVENT component, one nested inside the other. 
-
-3.1 Core iCal classes
-
-Libical is an object-based, data-oriented library. Nearly all of the
-routines in the library are associated with an opaque data types and
-perform some operation on that data type. Although the library does
-not actually have classes, we will use those terms since the behavior
-of these associations of data and routines is very similar to a class. 
-
-3.1.1 Properties
-
-Properties are represented with the icalproperty class and its many
-"derived" classes with on "derived" class per property type in RFC2445.
-Again, there is no actual inheritance relations, but there are clusters
-of routines that make this term useful. A property is a container
-for a single value and a set of parameters. 
-
-3.1.2 Components 
-
-In libical, components are represented with the icalcomponent class.
-Icalcomponent is a container for a set of other components and properties.
-
-3.1.3 Values 
-
-Values are represented in a similar way to properties; a base class
-and many "derived " classes. A value is essentially a abstract handle
-on a single fundamental type, a structure or a union. 
-
-3.1.4 Parameters 
-
-Parameters are represetned in a similar way to properties, except that
-they contain only one value
-
-3.2 Other elements of libical
-
-In addition to the core iCal classes, libical has many other types,
-structures, classes that aid in creating and using iCal components. 
-
-3.2.1 Enumerations and types
-
-Libical is strongly typed, soo every component, property, parameter,
-and value type has an enumeration, and some have an associated structure
-or union. 
-
-3.2.2 The parser
-
-The libical parser offers a variety of ways to convert RFC2445 text
-into a libical iinsteral component structure. the parser can parse
-blocks of text as a string, or it can parse lin-by-line.
-
-3.2.3 Error objects
-
-Libical has a substantial error reporting system for both programming
-errors and component usage errors. 
-
-3.2.4 Memory Management
-
-Since many of libicals interfaces return strings, the library has its
-own memory management system to elimiate the need to free every string
-returned from the libraru. 
-
-3.2.5 Storage classes
-
-The library also offers several classes to store components to flies,
-memory or databases. 
-
-4 Differences From RFCs 
-
-Libical has been designed to follow the standards as closely as possible,
-so that the key objects in the standards are also key objects in the
-library. However, there are a few areas where the specifications are
-(arguably) irregular, and following them exactly would result in an
-unfriendly interface. These deviations make libical easier to use
-by maintaining a self-similar interface. 
-
-4.1 Pseudo Components 
-
-Libical defines components for groups of properties that look and act
-like components, but are not defined as components in the specification.
-XDAYLIGHT and XSTANDARD are notable examples. These pseudo components
-group properties within the VTIMEZONE components. For instanace, the
-timezone properties associated with daylight savings time starts with
-"BEGIN:DAYLIGHT" and ends with "END:DAYLIGHT, just like other components,
-but is not defined as a component in RFC2445. ( See RFC2445, page
-61 ) In Libical,this grouping is represented by the XDAYLIGHT component.
-Standard iCAL components all start with the letter "V," while pseudo
-components start with"X."
-
-There are also pseudo components that are conceptually derived classes
-of VALARM. RFC2446 defines what properties may be included in each
-component, and for VALARM, the set of properties it may have depends
-on the value of the ACTION property. 
-
-For instance, if a VALARM component has an ACTION property with the
-value of "AUDIO," the component must also have an "ATTACH" property.
-However, if the ACTION value is "DISPLAY," the component must have
-a DESCRIPTION property. 
-
-To handle these various, complex restrictions, libical has pseudo components
-for each type of alarm: XAUDIOALARM, XDISPLAYALARM, XEMAILALARM and
-XPROCEDUREALARM. 
-
-4.2 Combined Values 
-
-Many values can take more than one type. TRIGGER, for instance, can
-have a value type of with DURATION or of DATE-TIME. These multiple
-types make it difficult to create routines to return the value associated
-with a property. 
-
-It is natural to have interfaces that would return the value of a property,
-but it is cumbersome for a single routine to return multiple types.
-So, in libical, properties that can have multiple types are given
-a single type that is the union of their RFC2445 types. For instance,
-in libical, the value of the TRIGGER property resolves to struct icaltriggertype.
-This type is a union of a DURATION and a DATE-TIME. 
-
-4.3 Multi-Valued Properties
-
-Some properties, such as CATEGORIES have only one value type, but each
-CATEGORIES property can have multiple value instances. This also results
-in a cumbersome interface -- CATEGORIES accessors would have to return
-a list while all other accessors returned a single value. In libical,
-all properties have a single value, and multi-valued properties are
-broken down into multiple single valued properties during parsing.
-That is, an input line like, 
-
-CATEGORIES: work, home
-
-becomes in libical's internal representation
-
-CATEGORIES: work
-
-CATEGORIES: home
-
-Oddly, RFC2445 allows some multi-valued properties ( like FREEBUSY
-) to exist as both a multi-values property and as multiple single
-value properties, while others ( like CATEGORIES ) can only exist
-as single multi-valued properties. This makes the internal representation
-for CATEGORIES illegal. However when you convert a component to a
-string, the library will collect all of the CATEGORIES properties
-into one. 
-
-5 Using libical
-
-5.1 Creating Components 
-
-There are three ways to create components in Libical: creating individual
-objects and assembling them, building entire objects in massive vaargs
-calls, and parsing a text file containing iCalendar data. 
-
-5.1.1 Constructor Interfaces 
-
-Using constructor interfaces, you create each of the objects separately
-and then assemble them in to components: 
-
-icalcomponent *event;
-
-icalproperty *prop;
-
-icalparameter *param;
-
-struct icaltimetype atime;
-
-event = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-
-prop = icalproperty_new_dtstamp(atime) ;
-
-icalcomponent_add_property(event, prop);
-
-prop = icalproperty_new_uid(''guid-1.host1.com'') );
-
-icalcomponent_add_property(event,prop);
-
-prop=icalproperty_new_organizer(''mrbig@host.com''); 
-
-param = icalparameter_new_role(ICAL_ROLE_CHAIR) 
-
-icalproperty_add_parameter(prop, param);
-
-icalcomponent_add_property(event,prop);
-
-Notice that libical uses a semi-object-oriented style of interface.
-Most things you work with are objects, that are instantiated with
-a constructor that has "new" in the name. Also note that, other than
-the object reference, most structure data is passed in to libical
-routines by value. Libical has some complex but very regular memory
-handling rules. These are detailed in section [sec:memory].
-
-If any of the constructors fail, they will return 0. If you try to
-insert 0 into a property or component, or use a zero-valued object
-reference, libical will either silently ignore the error or will abort
-with an error message. This behavior is controlled by a compile time
-flag (ICAL_ERRORS_ARE_FATAL), and will abort by default. 
-
-5.1.2 vaargs Constructors 
-
-There is another way to create complex components, which is arguably
-more elegant, if you are not horrified by varargs. The varargs constructor
-interface allows you to create intricate components in a single block
-of code. Here is the previous examples in the vaargs style. 
-
-    calendar = 
-
-        icalcomponent_vanew(
-
-            ICAL_VCALENDAR_COMPONENT,
-
-            icalproperty_new_version(''2.0''),
-
-            icalproperty_new_prodid(
-
-                 ''-//RDU Software//NONSGML HandCal//EN''),
-
-            icalcomponent_vanew(
-
-                ICAL_VEVENT_COMPONENT,
-
-                icalproperty_new_dtstamp(atime),
-
-                icalproperty_new_uid(''guid-1.host1.com''),
-
-                icalproperty_vanew_organizer(
-
-                    ''mrbig@host.com''),
-
-                    icalparameter_new_role(ICAL_ROLE_CHAIR),
-
-                    0
-
-                    ),
-
-                icalproperty_vanew_attendee(
-
-                    ''employee-A@host.com'',
-
-                    icalparameter_new_role(
-
-                        ICAL_ROLE_REQPARTICIPANT),
-
-                    icalparameter_new_rsvp(1),
-
-                    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-
-                    0
-
-                    ),
-
-                icalproperty_new_location(
-
-                   "1CP Conference Room 4350"),
-
-                0
-
-                ),
-
-            0
-
-            );
-
-This form is similar to the constructor form , except that the constructors
-have "vanew" instead of "new" in the name. The arguments are similar
-too, except that the component constructor can have a list of properties,
-and the property constructor can have a list of parameters. Be sure
-to terminate every list with a '0', or your code will crash, if you
-are lucky. 
-
-5.1.3 Parsing Text Files 
-
-The final way to create components will probably be the most common;
-you can create components from RFC2445 compliant text. If you have
-the string in memory, use
-
-icalcomponent* icalparser_parse_string(char* str);
-
-If the string contains only one component, the parser will return the
-component in libical form. If the string contains multiple components,
-the multiple components will be returned as the children of an ICAL_XROOT_COMPONENT
-component. 
-
-Parsing a whole string may seem wasteful if you want to pull a large
-component off of the network or from a file; you may prefer to parse
-the component line by line. This is possible too by using:
-
-icalparser* icalparser_new(); 
-
-void icalparser_free(icalparser* parser);
-
-icalparser_get_line(parser,read_stream);
-
-icalparser_add_line(parser,line);
-
-icalparser_set_gen_data(parser,stream)
-
-These routines will construct a parser object to which you can add
-lines of input and retrieve any components that the parser creates
-from the input. These routines work by specifing an adaptor routine
-to get string data from a source. For an example:
-
-char* read_stream(char *s, size_t size, void *d) 
-
-{ 
-
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-
-}
-
-main() {
-
-  char* line; 
-
-  icalcomponent *c; 
-
-  icalparser *parser = icalparser_new();
-
-  FILE* stream = fopen(argv[1],"r");
-
-  icalparser_set_gen_data(parser,stream);
-
-  do{ 
-
-    line = icalparser_get_line(parser,read_stream); 
-
-    c = icalparser_add_line(parser,line);
-
-    if (c != 0){ 
-
-     printf("%s",icalcomponent_as_ical_string(c));     
-
-     icalparser_claim(parser); 
-
-     printf("\n---------------\n"); 
-
-     icalcomponent_free(c); 
-
-   }
-
-  } while ( line != 0);
-
-}
-
-The parser object parameterizes the routine used to get input lines
-with icalparser_set_gen_data() and icalparser_get_line(). In this
-example, the routine read_stream() will fetch the next line from a
-stream, with the stream passed in as the void* parameter d. The parser
-calls read_stream() from icalparser_get_line(), but it also needs
-to know what stream to use. This is set by the call to icalparser_set_gen_data().
-By using a different routine for read_stream or passing in different
-data with icalparser_set_gen_data, you can connect to any data source. 
-
-Using the same mechanism, other implementations could read from memory
-buffers, sockets or other interfaces. 
-
-Since the example code is a very common way to use the parser, there
-is a convenience routine;
-
-icalcomponent* icalparser_parse(icalparser *parser, 
-
-               char* (*line_gen_func)(char *s, size_t size,  void*
-d))
-
-To use this routine, you still must construct the parser object and
-pass in a reference to a line reading routine. If the parser can create
-a single component from the input, it will return a pointer to the
-newly constructed component. If the parser can construct multiple
-components from the input, it will return a reference to an XROOT
-component ( of type ICAL_XROOT_COMPONENT.) This XROOT component will
-hold all of the components constructed from the input as children. 
-
-5.2 Accessing Components 
-
-Given a reference to a component, you probably will want to access
-the properties, parameters and values inside. Libical interfaces let
-you find sub-component, add and remove sub-components, and do the
-same three operations on properties. 
-
-5.2.1 Finding Components 
-
-To find a sub-component of a component, use: 
-
-icalcomponent* icalcomponent_get_first_component(
-
-                                   icalcomponent* component, 
-
-                                   icalcomponent_kind kind);
-
-This routine will return a reference to the first component of the
-type 'kind.' The key kind values, listed in icalenums.h are: 
-
-ICAL_ANY_COMPONENT
-
-ICAL_VEVENT_COMPONENT
-
-ICAL_VTODO_COMPONENT
-
-ICAL_VJOURNAL_COMPONENT
-
-ICAL_VCALENDAR_COMPONENT 
-
-ICAL_VFREEBUSY_COMPONENT
-
-ICAL_VALARM_COMPONENT
-
-These are only the most common components; there are many more listed
-in icalenums.h.
-
-As you might guess, if there is more than one subcomponent of the type
-you have chosen, this routine will return only the first. to get at
-the others, you need to iterate through the component. 
-
-5.2.2 Iterating Through Components
-
-Iteration requires a second routine to get the next subcomponent after
-the first:
-
-icalcomponent* icalcomponent_get_next_component(
-
-               icalcomponent* component, 
-
-               icalcomponent_kind kind);
-
-With the 'first' and 'next' routines, you can create a for loop to
-iterate through all of a components subcomponents
-
-  for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT); 
-
-         c != 0; 
-
- c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT))
-
-{ 
-
-      do_something(c);
-
-}
-
-This code bit wil iterate through all of the subcomponents in 'comp'
-but you can select a specific type of component by changing ICAL_ANY_COMPONENT
-to another component type.
-
-5.2.3 Using Component Iterators
-
-The iteration model in the previous section requires the component
-to keep the state of the iteration. So, you could not use this model
-to perform a sorting operations, since you'd need two iterators and
-there is only space for one. If you ever call icalcomponent_get_first_component()
-when an iteration is in progress, the pointer will be reset to the
-beginning. 
-
-To solve this problem, there are also external iterators for components.
-The routines associated with these external iterators are: 
-
-icalcompiter icalcomponent_begin_component(icalcomponent* component,
-icalcomponent_kind kind);
-
-icalcompiter icalcomponent_end_component(icalcomponent* component,
-icalcomponent_kind kind);
-
-icalcomponent* icalcompiter_next(icalcompiter* i); 
-
-icalcomponent* icalcompiter_prior(icalcompiter* i); 
-
-icalcomponent* icalcompiter_deref(icalcompiter* i);
-
-The _begin_() and _end_() routines return a new iterator that points
-to the beginning and ending of the list of subcomponent for the given
-component, and the kind argument works like the kind argument for
-internal iterators. 
-
-After creating an iterators, use _next_() and _prior_() to step forward
-and backward through the list and get the component that the iterator
-points to, and use _deref() to return the component that the iterator
-points to without moving the iterator. All routines will return 0
-when they move to point off the end of the list. 
-
-Here is an example of a loop using these routines: 
-
-for(
-
-   i = icalcomponent_begin_component(impl->cluster,ICAL_ANY_COMPONENT); 
-
-   icalcompiter_deref(&i)!= 0; 
-
-   icalcompiter_next(&i)
-
-) { 
-
-      icalcomponent *this = icalcompiter_deref(&i);
-
-}
-
-5.2.4 Removing Components 
-
-Removing an element from a list while iterating through the list with
-the internal iterators can cause problems, since you will probably
-be removing the element that the internal iterator points to. The
-_remove() routine will keep the iterator valid by moving it to the
-next component, but in a normal loop, this will result in two advances
-per iteration, and you will remove only every other component.  To
-avoid the problem, you will need to step the iterator ahead of the
-element you are going to remove, like this:
-
-for(c = icalcomponent_get_first_component(parent_comp,ICAL_ANY_COMPONENT); 
-
-       c != 0; 
-
-       c = next
-
-{     
-
-    next = icalcomponent_get_next_component(parent_comp,ICAL_ANY_COMPONENT);
-
-    icalcomponent_remove_component(parent_comp,c); 
-
-}
-
-Another way to remove components is to rely on the side effect of icalcomponent_remove_component:
-if component iterator in the parent component is pointing to the child
-that will be removed, it will move the iterator to the component after
-the child. The following code will exploit this behavior: 
-
-icalcomponent_get_first_component(parent_comp,ICAL_VEVENT_COMPONENT);
-
-while((c=icalcomponent_get_current_component(c)) != 0 ){ 
-
-   if(icalcomponent_isa(c) == ICAL_VEVENT_COMPONENT){ 
-
-      icalcomponent_remove_component(parent_comp,inner);
-
-   } else { 
-
-      icalcomponent_get_next_component(parent_comp,ICAL_VEVENT_COMPONENT); 
-
-   } 
-
-}
-
-5.2.5 Working with properties and parameters
-
-Finding, iterating and removing properties works the same as it does
-for components, using the property-specific or parameter-specific
-interfaces: 
-
-icalproperty* icalcomponent_get_first_property(
-
-     icalcomponent* component, 
-
-     icalproperty_kind kind); 
-
-icalproperty* icalcomponent_get_next_property(
-
-     icalcomponent* component, 
-
-     icalproperty_kind kind);
-
-void icalcomponent_add_property(
-
-     icalcomponent* component, 
-
-     icalproperty* property);
-
-void icalcomponent_remove_property(
-
-     icalcomponent* component, 
-
-     icalproperty* property);
-
-For parameters:
-
-icalparameter* icalproperty_get_first_parameter(
-
-     icalproperty* prop, 
-
-     icalparameter_kind kind); 
-
-icalparameter* icalproperty_get_next_parameter(
-
-     icalproperty* prop, 
-
-     icalparameter_kind kind);
-
-void icalproperty_add_parameter(
-
-     icalproperty* prop,
-
-     icalparameter* parameter);
-
-void icalproperty_remove_parameter(
-
-     icalproperty* prop, 
-
-     icalparameter_kind kind);
-
-Note that since there should be only one parameter of each type in
-a property, you will rarely need to use icalparameter_get_nect_paameter.
-
-5.2.6 Working with values
-
-Values are typically part of a property, although they can exist on
-their own. You can manipulate them either as part of the property
-or independently.
-
-The most common way to work with values to is to manipulate them from
-they properties that contain them. This involves fewer routine calls
-and intermediate variables than working with them independently, and
-it is type-safe. 
-
-For each property, there are a _get_ and a _set_ routine that access
-the internal value. For instanace, for the UID property, the routines
-are: 
-
-void icalproperty_set_uid(icalproperty* prop, const char* v)
-
-const char* icalproperty_get_uid(icalproperty* prop)
-
-For multi-valued properties, like ATTACH, the value type is usually
-a struct or union that holds both possible types. 
-
-If you want to work with the underlying value object, you can get and
-set it with:
-
-icalvalue* icalproperty_get_value (icalproperty* prop)
-
-void icalproperty_set_value(icalproperty* prop, icalvalue* value);
-
-Icalproperty_get_value() will return a reference that you can manipulate
-with other icalvalue routines. Most of the time, you will have to
-know what the type of the value is. For instance, if you know that
-the value is a DATETIME type, you can manipulate it with: 
-
-struct icaltimetype icalvalue_get_datetime(icalvalue* value); 
-
-void icalvalue_set_datetime(icalvalue* value, struct icaltimetype v);
-
-When working with an extension property or value (and X-PROPERTY or
-a property that has the parameter VALUE=x-name ) the value type is
-always a string. To get and set the value, use: 
-
-void icalproperty_set_x(icalproperty* prop, char* v); 
-
-char* icalproperty_get_x(icalproperty* prop);
-
-All X properties have the type of ICAL_X_PROPERTY, so you will need
-these routines to get and set the name of the property:
-
-char* icalproperty_get_x_name(icalproperty* prop)
-
-void icalproperty_set_x_name(icalproperty* prop, char* name);
-
-5.2.7 Checking Component Validity
-
-RFC 2446 defines rules for what properties must exist in a component
-to be used for transferring scheduling data. Most of these rules relate
-to the existence of properties relative to the METHOD property, which
-declares what operation a remote receiver should use to process a
-component. For instance, if the METHOD is REQUEST and the component
-is a VEVENT, the sender is probably asking the receiver to join in
-a meeting. In this case, RFC2446 says that the component must specify
-a start time (DTSTART) and list the receiver as an attendee (ATTENDEE). 
-
-Libical can check these restrictions with the routine:
-
-int icalrestriction_check(icalcomponent* comp);
-
-This routine returns 0 if the component does not pass RFC2446 restrictions,
-or if the component is malformed. The component you pass in must be
-a VCALENDAR, with one or more children, like the examples in RFC2446. 
-
-When this routine runs, it will insert new properties into the component
-to indicate any errors it finds. See section 6.5.3, X-LIC-ERROR for
-more information about these error properties. 
-
-5.2.8 Converting Components to Text
-
-To create an RFC2445 compliant text representation of an object, use
-one of the *_as_ical_string() routines:
-
-char* icalcomponent_as_ical_string (icalcomponent* component)
-
-char* icalproperty_as_ical_string (icalproperty* property)
-
-char* icalparameter_as_ical_string (icalparameter* parameter)
-
-char* icalvalue_as_ical_string (icalvalue* value)
-
-In most cases, you will only use icalcomponent_as_ical_string (), since
-it will cascade and convert all of the parameters, properties and
-values that are attached to the root component.
-
-Icalproperty_as_ical_string() will terminate each line with the RFC2445
-specified line terminator "\\n" However, if you compile with the symbol
-ICAL_UNIX_NEWLINE undefined, ( it is defined by default) it will terminate
-lines with "\\n\\r"
-
-Remember that the string returned by these routines is owned by the
-library, and will eventually be re-written. You should copy it if
-you want to preserve it. 
-
-5.3 Time
-
-5.3.1 Time structure
-
-LIbical defines it's own time structure for storing all dates and times.
-It would have been nice to re-use the C library's struct tm, but that
-structure does not differentiate between dates and times, and between
-local time and UTC. The libical structure is:
-
-struct icaltimetype { 
-
-  int year; 
-
-  int month; 
-
-  int day; 
-
-  int hour; 
-
-  int minute; 
-
-  int second;
-
-  int is_utc; /* 1-> time is in UTC timezone */
-
-  int is_date; /* 1 -> interpret this as date. */ }; 
-
-The year, month, day, hour, minute and second fields how the broken-out
-time values. The is_utc field distinguishes between times UTC and
-a local time zone. The is_date field indicates if the intra-day fields
-hold valid data. 
-
-5.3.2 Creating time structures
-
-There are several ways to create a new icaltimetype structure: 
-
-struct icaltimetype icaltime_from_string(const char* str);
-
-struct icaltimetype icaltime_from_timet(time_t v, int is_date);
-
-struct icaltimetype icaltime_from_int(int v, int is_date, int is_utc);
-
-Icaltime_from_string takes any RFC2445 compliant time string: 
-
-struct icaltimetype tt = icaltime_from_string("19970101T103000");
-
-Icaltime_from_timet takes a timet value, representing seconds past
-the POSIX epoch, and a flag to indicate if the time is a date. Dates
-have an identical structure to a time, but they time portion ( hours,
-minuts and seconds ) is always 00:00:00. Dates act differently in
-sorting an comparision, and they have a different string representation
-in RFC2445. 
-
-The icaltime_from_int is like icaltime_from_timet, but with an arbitrary
-epoch. This routine was a mistake and is deprecated. 
-
-5.3.3 Time manipulating routines
-
-The null time value is used to indicate that the data in the structure
-is not a valid time.
-
-struct icaltimetype icaltime_null_time(void);
-
-int icaltime_is_null_time(struct icaltimetype t);
-
-It is sensible for the broken-out time fields to contain values that
-are not permitted in an ISO compliant time string. For instance, the
-seconds field can hold values greater than 59, and the hours field
-can hold values larger than 24. The excessive values will be rolled
-over into the next larger field when the structure is normalized. 
-
-struct icaltimetype icaltime_normalize(struct icaltimetype t);
-
-Normalizing allows you to do arithmetic operations on time values. 
-
-struct icaltimetype tt = icaltime_from_string("19970101T103000");
-
-tt.days +=3 
-
-tt.second += 70;
-
-tt = icaltime_normalize(tt);
-
-There are several routines to get the day of the week or month, etc,
-from a time structure.
-
-short icaltime_day_of_year(struct icaltimetype t); 
-
-struct icaltimetype icaltime_from_day_of_year(short doy, short year);
-
-short icaltime_day_of_week(struct icaltimetype t); 
-
-short icaltime_start_doy_of_week(struct icaltimetype t);
-
-short icaltime_week_number(short day_of_month, short month, short year);
-
-struct icaltimetype icaltime_from_week_number(short week_number, short
-year);
-
-short icaltime_days_in_month(short month,short year);
-
-Two routines convert time structures to and from the number of seconds
-since the POSIX epoch. The is_date field indicates whether or not
-the hour, minute and second fields should be used in the conversion.
-
-struct icaltimetype icaltime_from_timet(time_t v, int is_date); 
-
-time_t icaltime_as_timet(struct icaltimetype);
-
-The compare routine works exactly like strcmp, but on time structures. 
-
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
-
-The following routines convert between UTC and a named timezone. The
-tzid field must be a timezone name from the Olsen database, such as
-"America/Los_Angeles." 
-
-The utc_offset routine returns the offset of the named time zone from
-UTC, in seconds. 
-
-The tt parameter in the following routines indicates the date on which
-the conversion should be made. The tt parameter is necessary because
-timezones have many different rules for when daylight savings time
-is used, and these rules can change over time. So, for a single timezone
-one year may have daylight savings time on March 15, but for other
-years March 15 may be standard time, and some years may have standard
-time all year. 
-
-int icaltime_utc_offset(struct icaltimetype tt, char* tzid);
-
-int icaltime_local_utc_offset();
-
-struct icaltimetype icaltime_as_utc(struct icaltimetype tt,char* tzid);
-
-struct icaltimetype icaltime_as_zone(struct icaltimetype tt,char* tzid);
-
-struct icaltimetype icaltime_as_local(struct icaltimetype tt);
-
-5.4 Storing Objects
-
-The libical distribution includes a separate library, libicalss, that
-allows you to store iCal component data to disk in a variety of ways.
-This library also includes code to implement the CSTP protocol of
-CAP and has some routines for deciphering incomming messages. 
-
-The file storage routines are organized in an inheritance heirarchy
-that is rooted in icalset, with the derived class icalfileset and
-icaldirset. Icalfileset stores components to a file, while icaldirset
-stores components to multiple files, one per month based on DTSTAMP.
-Other storages classess, for storage to a heap or a mysql database
-are planned for the future. 
-
-All of the icalset derived classes have the same interface: 
-
-icaldirset* icaldirset_new(const char* path);
-
-void icaldirset_free(icaldirset* store);
-
-const char* icaldirset_path(icaldirset* store);
-
-void icaldirset_mark(icaldirset* store);
-
-icalerrorenum icaldirset_commit(icaldirset* store); 
-
-icalerrorenum icaldirset_add_component(icaldirset* store, icalcomponent*
-comp);
-
-icalerrorenum icaldirset_remove_component(icaldirset* store, icalcomponent*
-comp);
-
-int icaldirset_count_components(icaldirset* store, icalcomponent_kind
-kind);
-
-icalerrorenum icaldirset_select(icaldirset* store, icalcomponent* gauge);
-
-void icaldirset_clear(icaldirset* store);
-
-icalcomponent* icaldirset_fetch(icaldirset* store, const char* uid);
-
-int icaldirset_has_uid(icaldirset* store, const char* uid);
-
-icalcomponent* icaldirset_fetch_match(icaldirset* set, icalcomponent
-*c);
-
-icalerrorenum icaldirset_modify(icaldirset* store, icalcomponent *oldc,
-icalcomponent *newc);
-
-icalcomponent* icaldirset_get_current_component(icaldirset* store);
-
-icalcomponent* icaldirset_get_first_component(icaldirset* store);
-
-icalcomponent* icaldirset_get_next_component(icaldirset* store);
-
-5.4.1 Creating a new set
-
-You can create a new set from either the base class or the direved
-class. From the base class use one of:
-
-icalset* icalset_new_file(const char* path); 
-
-icalset* icalset_new_dir(const char* path); 
-
-icalset* icalset_new_heap(void); 
-
-icalset* icalset_new_mysql(const char* path);
-
-You can also create a new set based on the derived class, For instance,
-with icalfileset: 
-
-icalfileset* icalfileset_new(const char* path);
-
-icalfileset* icalfileset_new_open(const char* path, int flags, mode_t
-mode);
-
-Icaset_new_file is identical to icalfileset_new. BOth routines will
-open an existing file for readinga and writing, or create a new file
-if it does not exist. Icalfilset_new_open takes the same arguments
-as the open() system routine and behaves in the same way. 
-
-The icalset and icalfilset objects are somewhat interchangable -- you
-can use an icalfileset* as an argument to any of the icalset routines.
-
-The following examples will all use icalfileset routines; using the
-other icalset derived classess will be similar. 
-
-5.4.2 Adding, Finding and Removing Components 
-
-To add components to a set, use: 
-
-icalerrorenum icalfileset_add_component(icalfileset* cluster, icalcomponent*
-child);
-
-The fileset keeps an inmemory copy of the components, and this set
-must be written back to the file ocassionally. There are two routines
-to manage this: 
-
-void icalfileset_mark(icalfileset* cluster); 
-
-icalerrorenum icalfileset_commit(icalfileset* cluster);
-
-Icalfileset_mark indicates that the in-memory components have changed.
-Calling the _add_component routine will call _mark automatically,
-but you may need to call it yourself if you have made a change to
-an existing component. The _commit routine writes the data base to
-disk, but only if it is marked. The _commit routine is called automatically
-when the icalfileset is freed. 
-
-To iterate through the components in a set, use: 
-
-icalcomponent* icalfileset_get_first_component(icalfileset* cluster); 
-
-icalcomponent* icalfileset_get_next_component(icalfileset* cluster);
-
-icalcomponent* icalfileset_get_current_component (icalfileset* cluster);  
-
-These routines work like the corresponding routines from icalcomponent,
-except that their output is filtered through a gauge. A gauge is a
-test for the properties within a components; only components that
-pass the test are returned. A gauge can be constructed from a MINSQL
-string with:
-
-icalgauge* icalgauge_new_from_sql(char* sql);
-
-Then, you can add the gauge to the set with : 
-
-icalerrorenum icalfileset_select(icalfileset* store, icalgauge* gauge);
-
-Here is an example that puts all of these routines together: 
-
-void test_fileset()
-
-{
-
-    icalfileset *fs;
-
-    icalcomponent *c;
-
-    int i;
-
-    char *path = "test_fileset.ics";
-
-    icalgauge  *g = icalgauge_new_from_sql(
-
-        "SELECT * FROM VEVENT WHERE DTSTART > '20000103T120000Z' AND
-DTSTART <= '20000106T120000Z'");
-
- 
-
-    fs = icalfileset_new(path);
-
-  
-
-    for (i = 0; i!= 10; i++){
-
-        c = make_component(i); /* Make a new component where DTSTART
-has month of i */
-
-        icalfileset_add_component(fs,c);
-
-    }
-
-    icalfileset_commit(fs); /* Write to disk */
-
-    icalfileset_select(fs,g); /* Set the gauge to filter components
-*/
-
- 
-
-    for (c = icalfileset_get_first_component(fs);
-
-         c != 0;
-
-         c = icalfileset_get_next_component(fs)){
-
-        struct icaltimetype t = icalcomponent_get_dtstart(c);
-
- 
-
-        printf("%s\n",icaltime_as_ctime(t));
-
-    }
-
-    icalfileset_free(fs);
-
-}
-
-5.4.3 Other routines
-
-There are several other routines in the icalset interface, but they
-not fully implemented yet. 
-
-5.5 <sec:memory>Memory Management 
-
-Libical relies heavily on dynamic allocation for both the core objects
-and for the strings used to hold values. Some of this memory the library
-caller owns and must free, and some of the memory is managed by the
-library. Here is a summary of the memory rules. 
-
-1) If the function name has "new" in it, the caller gets control
-  of the memory. ( such as icalcomponent_new(), or icalproperty_new_clone()
-  ) 
-
-2) If you got the memory from a routine with new in it, you must
-  call the corresponding *_free routine to free the memory. ( Use
-  icalcomponent_free() to free objects created with icalcomponent_new()) 
-
-3) If the function name has "add" in it, the caller is transferring
-  control of the memory to the routine. ( icalproperty_add_parameter() )
-
-4) If the function name has "remove" in it, the caller passes in
-  a pointer to an object and after the call returns, the caller owns
-  the object. So, before you call icalcomponent_remove_property(comp,foo),
-  you do not own "foo" and after the call returns, you do. 
-
-5) If the routine returns a string, libical owns the memory and will
-  put it on a ring buffer to reclaim later. For example, icalcomponent_as_ical_string().
-  You'd better strdup() it if you want to keep it, and you don't have
-  to delete it. 
-
-5.6 Error Handling
-
-Libical has several error handling mechanisms for the various types
-of programming, semantic and syntactic errors you may encounter.
-
-5.6.1 Return values
-
-Many library routines signal errors through their return values. All
-routines that return a pointer, such as icalcomponent_new(), will
-return 0 ( zero ) on a fatal error. Some routines will return a value
-of enum icalerrorenum. 
-
-5.6.2 icalerrno
-
-Most routines will set the global error value icalerrno on errors.
-This variable is an enumeration; permissible values can be found in
-libical/icalerror.h. If the routine returns an enum icalerrorenum,
-then the return value will be the same as icalerrno. You can use icalerror_strerror()
-to get a string that describes the error
-
-5.6.3 X-LIC-ERROR and X-LIC-INVALID-COMPONENT
-
-The library handles semantic and syntactic errors in components by
-inserting errors properties into the components. If the parser cannot
-parse incoming text ( a syntactic error ) or if the icalrestriction_check()
-routine indicates that the component does not meet the requirements
-of RFC2446 ( a semantic error) the library will insert properties
-of the type X-LIC-ERROR to describe the error. Here is an example
-of the error property: 
-
-X-LIC-ERROR;X-LIC-ERRORTYPE=INVALID_ITIP :Failed iTIP restrictions
-for property DTSTART. 
-
-Expected 1 instances of the property and got 0 
-
-This error resulted from a call to icalrestriction_check(), which discovered
-that the component does not have a DTSTART property, as required by
-RFC2445. 
-
-There are a few routines to manipulate error properties:
-
-[ The following data is supposed to be in a table. It looks OK in LyX,
-but does not format propertly in output. ]
-
-+-------------------------------------+---------------------------------------------------------+
-| Routine                             | Purpose                                                 |
-+-------------------------------------+---------------------------------------------------------+
-| void icalrestriction_check()        | Check a component against RFC2446 and insert            |
-+-------------------------------------+---------------------------------------------------------+
-|                                     | error properties to indicate non compliance             |
-+-------------------------------------+---------------------------------------------------------+
-| int icalcomponent_count_errors()    | Return the number of error properties                   |
-+-------------------------------------+---------------------------------------------------------+
-|                                     | in a component                                          |
-+-------------------------------------+---------------------------------------------------------+
-| void icalcomponent_strip_errors()   | Remove all error properties in as                       |
-+-------------------------------------+---------------------------------------------------------+
-|                                     | component                                               |
-+-------------------------------------+---------------------------------------------------------+
-| void icalcomponent_convert_errors() | Convert some error properties into                      |
-+-------------------------------------+---------------------------------------------------------+
-|                                     | REQUESTS-STATUS proprties to indicate the inability to  |
-+-------------------------------------+---------------------------------------------------------+
-|                                     | process the component as an iTIP request.               |
-+-------------------------------------+---------------------------------------------------------+
-
-
-The types of errors are listed in icalerror.h. They are:
-
-ICAL_XLICERRORTYPE_COMPONENTPARSEERROR
-
-ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR
-
-ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR 
-
-ICAL_XLICERRORTYPE_PROPERTYPARSEERROR
-
-ICAL_XLICERRORTYPE_VALUEPARSEERROR
-
-ICAL_XLICERRORTYPE_UNKVCALPROP
-
-ICAL_XLICERRORTYPE_INVALIDITIP
-
-The libical parser will generate the error that end in PARSEERROR when
-it encounters garbage in the input steam. ICAL_XLICERRORTYPE_INVALIDITIP
-is inserted by icalrestriction_check(), and ICAL_XLICERRORTYPE_UNKVCALPROP
-is generated by icalvcal_convert() when it encounters a vCal property
-that it cannot convert or does not know about. 
-
-Icalcomponent_convert_errors() converts some of the error properties
-in a component into REQUEST-STATUS properties that indicate a failure.
-As of libical version0.18, this routine only convert *PARSEERROR errors
-and it always generates a 3.x ( failure ) code. This makes it more
-of a good idea than a really useful bit of code. 
-
-5.7 Naming Standard
-
-Structures that you access with the "struct" keyword, such as "struct
-icaltimetype" are things that you are allowed to see inside and poke
-at. 
-
-Structures that you access though a typedef, such as "icalcomponent"
-are things where all of the data is hidden. 
-
-Component names that start with "V" are part of RFC 2445 or another
-iCal standard. Component names that start with "X" are also part of
-the spec, but they are not actually components in the spec. However,
-they look and act like components, so they are components in libical.
-Names that start with "XLIC" or "X-LIC" are not part of any iCal spec.
-They are used internally by libical. 
-
-Enums that identify a component, property, value or parameter end with
-"_COMPONENT," "_PROPERTY," "_VALUE," or "_PARAMETER"s
-
-Enums that identify a parameter value have the name of the parameter
-as the second word. For instance: ICAL_ROLE_REQPARTICIPANT or ICAL_PARTSTAT_ACCEPTED.
-
-The enums for the parts of a recurarance rule and request statuses
-are irregular. 
-
-6 Hacks and Bugs
-
-There are a lot of hacks in the library -- bits of code that I am not
-proud of and should probably be changed. These are marked with the
-comment string "HACK."
diff --git a/libical/examples/.cvsignore b/libical/examples/.cvsignore
deleted file mode 100644
index 29ef3ef4c8..0000000000
--- a/libical/examples/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.libs
-.deps
-Makefile
-Makefile.in
-doesnothing
diff --git a/libical/examples/Makefile.am b/libical/examples/Makefile.am
deleted file mode 100644
index 99e33d3400..0000000000
--- a/libical/examples/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_PROGRAMS = doesnothing
-
-LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
-INCLUDES = -I . -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal
-
-INCLUDES = -I. -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal
-
-doesnothing_SOURCES = \
-	access_components.c \
-	access_properties_and_parameters.c \
-	errors.c \
-	main.c \
-	parse_text.c 
-
diff --git a/libical/examples/access_components.c b/libical/examples/access_components.c
deleted file mode 100644
index cc5a33d6d2..0000000000
--- a/libical/examples/access_components.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* Access_component.c */
-
-#include "ical.h"
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include "icalmemory.h"
-
-void do_something(icalcomponent *c);
-
-/* Creating iCal Components 
-
-   There are two ways to create new component in libical. You can
-   build the component from primitive parts, or you can create it
-   from a string.
-
-   There are two variations of the API for building the component from
-   primitive parts. In the first variation, you add each parameter and
-   value to a property, and then add each property to a
-   component. This results in a long series of function calls. This
-   style is show in create_new_component()
-
-   The second variation uses vargs lists to nest many primitive part
-   constructors, resulting in a compact, neatly formated way to create
-   components. This style is shown in create_new_component_with_va_args()
-
-  
-   
-*/
-   
-icalcomponent* create_new_component()
-{
-
-    /* variable definitions */
-    icalcomponent* calendar;
-    icalcomponent* event;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    struct icalperiodtype rtime;
-    icalproperty* property;
-
-    /* Define a time type that will use as data later. */
-    rtime.start = icaltime_from_timet( time(0),0);
-    rtime.end = icaltime_from_timet( time(0),0);
-    rtime.end.hour++;
-
-    /* Create calendar and add properties */
-
-    calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-    
-    /* Nearly every libical function call has the same general
-       form. The first part of the name defines the 'class' for the
-       function, and the first argument will be a pointer to a struct
-       of that class. So, icalcomponent_ functions will all take
-       icalcomponent* as their first argument. */
-
-    /* The next call creates a new proeprty and immediately adds it to the 
-       'calendar' component. */ 
-
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_version("2.0")
-	);
-
-    
-    /* Here is the short version of the memory rules: 
-
-         If the routine name has "new" in it: 
-	     Caller owns the returned memory. 
-             If you pass in a string, the routine takes the memory. 	 
-
-         If the routine name has "add" in it:
-	     The routine takes control of the component, property, 
-	     parameter or value memory.
-
-         If the routine returns a string ( "get" and "as_ical_string" )
-	     The library owns the returned memory. 
-
-	  There are more rules, so refer to the documentation for more 
-	  details. 
-
-    */
-
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN")
-	);
-    
-    /* Add an event */
-
-    event = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_dtstamp(atime)
-	);
-
-    /* In the previous call, atime is a struct, and it is passed in by value. 
-       This is how all compound types of values are handled. */
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_uid("guid-1.host1.com")
-	);
-
-    /* add a property that has parameters */
-    property = icalproperty_new_organizer("mailto:mrbig@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_CHAIR)
-	);
-
-    icalcomponent_add_property(event,property);
-
-    /* In this style of component creation, you need to use an extra
-       call to add parameters to properties, but the form of this
-       operation is the same as adding a property to a component */
-
-    /* add another property that has parameters */
-    property = icalproperty_new_attendee("mailto:employee-A@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_rsvp(1)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_cutype(ICAL_CUTYPE_GROUP)
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    /* more properties */
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_description("Project XYZ Review Meeting")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_categories("MEETING")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_class("PUBLIC")
-	);
-    
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_created(atime)
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_summary("XYZ Project Review")
-	);
-
-    property = icalproperty_new_dtstart(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("US-Eastern")
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    property = icalproperty_new_dtend(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("US-Eastern")
-	);
-
-    icalcomponent_add_property(event,property);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_location("1CP Conference Room 4350")
-	);
-
-    icalcomponent_add_component(calendar,event);
-
-    return calendar;
-}
-
-
-/* Now, create the same component as in the previous routine, but use
-the constructor style. */
-
-icalcomponent* create_new_component_with_va_args()
-{
-
-    /* This is a similar set up to the last routine */
-    icalcomponent* calendar;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    struct icalperiodtype rtime;
-    
-    rtime.start = icaltime_from_timet( time(0),0);
-    rtime.end = icaltime_from_timet( time(0),0);
-    rtime.end.hour++;
-
-    /* Some of these routines are the same as those in the previous
-       routine, but we've also added several 'vanew' routines. These
-       'vanew' routines take a list of properties, parameters or
-       values and add each of them to the parent property or
-       component. */
-
-    calendar = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstamp(atime),
-		icalproperty_new_uid("guid-1.host1.com"),
-		icalproperty_vanew_organizer(
-		    "mailto:mrbig@host.com",
-		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
-		    ),
-		icalproperty_vanew_attendee(
-		    "mailto:employee-A@host.com",
-		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
-		    icalparameter_new_rsvp(1),
-		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
-		    ),
-		icalproperty_new_description("Project XYZ Review Meeting"),
-
-		icalproperty_new_categories("MEETING"),
-		icalproperty_new_class("PUBLIC"),
-		icalproperty_new_created(atime),
-		icalproperty_new_summary("XYZ Project Review"),
-		icalproperty_vanew_dtstart(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),
-		icalproperty_vanew_dtend(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),
-		icalproperty_new_location("1CP Conference Room 4350"),
-		0
-		),
-	    0
-	    );
-
-   
-    /* Note that properties with no parameters can use the regular
-       'new' constructor, while those with parameters use the 'vanew'
-       constructor. And, be sure that the last argument in the 'vanew'
-       call is a zero. Without, your program will probably crash. */
-
-    return calendar;
-}
-
-
-void find_sub_components(icalcomponent* comp)
-{
-    icalcomponent *c;
-    
-    /* The second parameter to icalcomponent_get_first_component
-       indicates the type of component to search for. This will
-       iterate through all sub-components */
-    for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-
-	do_something(c);
-    }
-
-    /* This will iterate only though VEVENT sub-components */
-
-    for(c = icalcomponent_get_first_component(comp,ICAL_VEVENT_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_VEVENT_COMPONENT)){
-
-	do_something(c);
-    }
-
-}
-
-/* Ical components only have one internal iterator, so removing the
-   object that the iterator points to can cause problems. Here is the
-   right way to remove components */
-
-void remove_vevent_sub_components(icalcomponent* comp){
-    
-    icalcomponent *c, *next;
-
-    for( c = icalcomponent_get_first_component(comp,ICAL_VEVENT_COMPONENT);
-	 c != 0;
-	 c = next)
-    {
-	next  = icalcomponent_get_next_component(comp,ICAL_VEVENT_COMPONENT);
-
-	icalcomponent_remove_component(comp,c);
-
-	do_something(c);
-    }
-
-}
-
diff --git a/libical/examples/access_properties_and_parameters.c b/libical/examples/access_properties_and_parameters.c
deleted file mode 100644
index ba3d7fcc0b..0000000000
--- a/libical/examples/access_properties_and_parameters.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* access_properties_and_parameters.c */
-
-#include "ical.h"
-#include <string.h>
-
-/* Get a particular parameter out of a component. This routine will
-   return a list of strings of all attendees who are required. Note
-   that this routine assumes that the component that we pass in is a
-   VEVENT.  */
-   
-void get_required_attendees(icalcomponent* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-    
-    assert(event != 0);
-    assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT);
-    
-    /* This loop iterates over all of the ATTENDEE properties in the
-       event */
-    
-    /* The iteration routines save their state in the event
-       struct, so the are not thread safe unless you lock the whole
-       component. */
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	/* Get the first ROLE parameter in the property. There should
-           only be one, so we won't bother to iterate over them. But,
-           you can iterate over parameters just like with properties */
-
-	parameter = icalproperty_get_first_parameter(p,ICAL_ROLE_PARAMETER);
-
-	/* If the parameter indicates the participant is required, get
-           the attendees name and stick a copy of it into the output
-           array */
-
-	if ( icalparameter_get_role(parameter) == ICAL_ROLE_REQPARTICIPANT) 
-	{
-	    /* Remember, the caller does not own this string, so you
-               should strdup it if you want to change it. */
-	    const char *attendee = icalproperty_get_attendee(p);
-	}
-    }
-
-}
-
-/* Here is a similar example. If an attendee has a PARTSTAT of
-   NEEDSACTION or has no PARTSTAT parameter, change it to
-   TENTATIVE. */
-   
-void update_attendees(icalcomponent* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-
-    assert(event != 0);
-        assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT);
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	parameter = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
-
-	if (parameter == 0) {
-
-	    /* There was no PARTSTAT parameter, so add one.  */
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-
-	} else if (icalparameter_get_partstat(parameter) == ICAL_PARTSTAT_NEEDSACTION) {
-	    /* Remove the NEEDSACTION parameter and replace it with
-               TENTATIVE */
-	    
-	    icalproperty_remove_parameter(p,ICAL_PARTSTAT_PARAMETER);
-	    
-	    /* Don't forget to free it */
-	    icalparameter_free(parameter);
-
-	    /* Add a new one */
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-	}
-
-    }
-}
-
-/* Here are some examples of manipulating properties */
-
-void test_properties()
-{
-    icalproperty *prop;
-    icalparameter *param;
-    icalvalue *value;
-
-    icalproperty *clone;
-
-    /* Create a new property */
-    prop = icalproperty_vanew_comment(
-	"Another Comment",
-	icalparameter_new_cn("A Common Name 1"),
-	icalparameter_new_cn("A Common Name 2"),
-	icalparameter_new_cn("A Common Name 3"),
-       	icalparameter_new_cn("A Common Name 4"),
-	0); 
-
-    /* Iterate through all of the parameters in the property */
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-	param != 0; 
-	param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) {
-						
-	printf("Prop parameter: %s\n",icalparameter_get_cn(param));
-    }    
-
-    /* Get a string representation of the property's value */
-    printf("Prop value: %s\n",icalproperty_get_comment(prop));
-
-    /* Spit out the property in its RFC 2445 representation */
-    printf("As iCAL string:\n %s\n",icalproperty_as_ical_string(prop));
-    
-    /* Make a copy of the property. Caller owns the memory */
-    clone = icalproperty_new_clone(prop);
-
-    /* Get a reference to the value within the clone property */
-    value = icalproperty_get_value(clone);
-
-    printf("Value: %s",icalvalue_as_ical_string(value));
-
-    /* Free the original and the clone */
-    icalproperty_free(clone);
-    icalproperty_free(prop);
-
-}
diff --git a/libical/examples/errors.c b/libical/examples/errors.c
deleted file mode 100644
index 86d963bd75..0000000000
--- a/libical/examples/errors.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* errors.c */
-
-#include "ical.h"
-#include <stdio.h>
-
-void program_errors()
-{
-    /*Most routines will set icalerrno on errors. This is an
-      enumeration defined in icalerror.h */
-    
-    icalcomponent *c; 
-
-    icalerror_clear_errno();
-
-    c = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-
-    if (icalerrno != ICAL_NO_ERROR){
-
-	fprintf(stderr,"Horrible libical error: %s\n",
-		icalerror_strerror(icalerrno));
-		
-    }
-
-}
-
-void component_errors(icalcomponent *comp)
-{
-    int errors;
-    icalproperty *p;
-
-    /* presume that we just got this component from the parser */
-
-    errors = icalcomponent_count_errors(comp);
-
-    printf("This component has %d parsing errors\n", errors);
-
-    /* Print out all of the parsing errors. This is not strictly
-       correct, because it does not descend into any sub-components,
-       as icalcomponent_count_errors() does. */
-
-    for(p = icalcomponent_get_first_property(comp,ICAL_XLICERROR_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(comp,ICAL_XLICERROR_PROPERTY))
-    {
-	
-	printf("-- The error is %s:\n",icalproperty_get_xlicerror(p));
-    }
-
-
-
-    /* Check the component for iTIP compilance, and add more
-       X-LIC-ERROR properties if it is non-compilant. */
-    icalrestriction_check(comp);
-    
-
-    /* Count the new errors.  */
-    if(errors != icalcomponent_count_errors(comp)){
-       printf(" -- The component also has iTIP restriction errors \n");	
-    }
-
-    /* Since there are iTIP restriction errors, it may be impossible
-       to process this component as an iTIP request. In this case, the
-       X-LIC-ERROR proeprties should be expressed as REQUEST-STATUS
-       properties in the reply. This following routine makes this
-       conversion */
-
-
-    icalcomponent_convert_errors(comp);
-
-}
diff --git a/libical/examples/main.c b/libical/examples/main.c
deleted file mode 100644
index 1be2de5c9e..0000000000
--- a/libical/examples/main.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This is just to make the code in the example directory link properly. */
-#include "ical.h"
-
-int main()
-{
-
-    return 1;
-}
-
-
-void do_something(icalcomponent* comp){
-}
diff --git a/libical/examples/parse_text.c b/libical/examples/parse_text.c
deleted file mode 100644
index b7eba43b8a..0000000000
--- a/libical/examples/parse_text.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* parse_text.c
-   
- */
-#include <stdio.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "ical.h"
-
-#include <stdlib.h>
-
-/* The icalparser_get_line routine will create a single *content* line
-out of one or more input lines. The content line is all of the
-properties and values for a single property, and it can span several
-input lines. So, icalparser_get_line will need to be able to get more
-data on its own. Read_string is a routine that does this. You can
-write your own version of read stream to get data from other types of
-files, sockets, etc. */
-
-char* read_stream(char *s, size_t size, void *d)
-{
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-
-}
-
-void parse_text(int argc, char* argv[])
-{
-
-    char* line; 
-    FILE* stream;
-    icalcomponent *c; 
-
-    /* Create a new parser object */
-    icalparser *parser = icalparser_new();
-
-    stream = fopen(argv[1],"r");
-
-    assert(stream != 0);
-
-    /* Tell the parser what input routie it should use. */
-    icalparser_set_gen_data(parser,stream);
-
-    do{
-    
-	/* Get a single content line by making one or more calls to
-           read_stream()*/
-	line = icalparser_get_line(parser,read_stream);
-
-	/* Now, add that line into the parser object. If that line
-           completes a component, c will be non-zero */
-	c = icalparser_add_line(parser,line);
-
-
-	if (c != 0){
-	    printf("%s",icalcomponent_as_ical_string(c));
-
-	    printf("\n---------------\n");
-
-	    icalcomponent_free(c);
-	}
-
-    } while ( line != 0);
-
-
-    icalparser_free(parser);
-}
diff --git a/libical/install-sh b/libical/install-sh
deleted file mode 100755
index 0ff4b6a08e..0000000000
--- a/libical/install-sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0
diff --git a/libical/missing b/libical/missing
deleted file mode 100755
index 7789652e87..0000000000
--- a/libical/missing
+++ /dev/null
@@ -1,190 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/libical/scripts/.cvsignore b/libical/scripts/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/libical/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/libical/scripts/Makefile.am b/libical/scripts/Makefile.am
deleted file mode 100644
index fd1b053cb6..0000000000
--- a/libical/scripts/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST = \
-mkderivedcomponents.pl \
-mkderivedparameters.pl \
-mkderivedproperties.pl \
-mkderivedvalues.pl \
-mkparameterrestrictions.pl \
-mkrestrictionrecords.pl \
-mkrestrictiontable.pl
diff --git a/libical/scripts/mkderivedcomponents.pl b/libical/scripts/mkderivedcomponents.pl
deleted file mode 100755
index ac4e472250..0000000000
--- a/libical/scripts/mkderivedcomponents.pl
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/usr/local/bin/perl
-
-use Getopt::Std;
-getopts('chspi:');
-
-
-# ARG 0 is components.txt
-open(PV,"$ARGV[0]") || die "Can't open components  file $ARGV[0]:$!";
-
-my @components;
-
-while (<PV>){
-
-  s/#.*//;
-
-  chop;
-
-  push(@components,$_);
-
-}
-
-close PV;
-
-# Write the file inline by copying everything before a demarcation
-# line, and putting the generated data after the demarcation
-
-if ($opt_i) {
-
-  open(IN,$opt_i) || die "Can't open input file \"$opt_i\"";
-
-  while(<IN>){
-
-    if (/Do not edit/){
-      last;
-    }
-
-    print;
-
-  }    
-
-  if($opt_i){
-    print "# Everything below this line is machine generated. Do not edit. \n";
-  } else {
-    print "/* Everything below this line is machine generated. Do not edit. */\n";
-  }
-
-}
-
-if ($opt_c or $opt_h and !$opt_i){
-
-print <<EOM;
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedproperties.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  \044Id:\044
-    
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
- 
-
- ======================================================================*/
-
-/*
- * THIS FILE IS MACHINE GENERATED DO NOT EDIT
- */
-
-#include <stdarg.h> /* for va_arg functions */
-
-EOM
-
-}
-
-if ($opt_p and !$opt_i){
-
-print <<EOM;
-
-EOM
-
-}
-
-
-foreach $comp (@components) {
-
-  next if !$comp;
-
-  my $ucf = join("",map {ucfirst(lc($_));}  split(/-/,$comp));
-  my $lc = lc($ucf);
-  my $uc = uc($lc);
-
-  if($opt_c) { # Make C source
- print<<EOM;
-
-/* $comp */
-
-icalcomponent* icalcomponent_new_${lc}()
-{
-   return (icalcomponent*)icalcomponent_new_impl(ICAL_${uc}_COMPONENT);
-}
-
-icalcomponent* icalcomponent_vanew_${lc}(...)
-{
-   va_list args;
-   struct icalcomponent_impl *impl = icalcomponent_new_impl(ICAL_${uc}_component);  
-
-   va_start(args,v);
-   icalcomponent_add_properties(impl, args);
-   va_end(args);
-
-   return (icalcomponent*)impl;
-}
- 
-EOM
-
-
-  } elsif ($opt_h) { # Make a C header
- print<<EOM;
-
-/* $comp */
-icalcomponent* icalcomponent_new_${lc}();
-icalcomponent* icalcomponent_vanew_${lc}(...);
-EOM
-  
-} elsif ($opt_s) { # Make something for a switch statement
-
-print <<EOM;
-case ICAL_${uc}_PROPERTY:
-EOM
-
-} elsif ($opt_p) { # make perl source 
-
-print <<EOM;
-
-# $comp 
-package Net::ICal::Component::${ucf};
-\@ISA=qw(Net::ICal::Component);
-
-sub new
-{
-   my \$package = shift;
-   my \$c = Net::ICal::icalcomponent_new(\$Net::ICal::ICAL_${uc}_COMPONENT);
-
-   my \$self = Net::ICal::Component::new_from_ref(\$c);
-   Net::ICal::Component::_add_elements(\$self,\\\@_);
-
-   # Self is blessed in new_from_ref
-
-   return \$self; 
-
-}
-EOM
-
-}
-
-
-
-}
-
-   
diff --git a/libical/scripts/mkderivedparameters.pl b/libical/scripts/mkderivedparameters.pl
deleted file mode 100755
index 5715220ea3..0000000000
--- a/libical/scripts/mkderivedparameters.pl
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/usr/local/bin/perl
-
-use Getopt::Std;
-getopts('chspi:');
-
-%no_xname = (RELATED=>1,RANGE=>1,RSVP=>1,XLICERRORTYPE=>1,XLICCOMPARETYPE=>1);
-
-# Usually, open  param-c-types.txt
-open(F,"$ARGV[0]") || die "Can't open  C parameter types file $ARGV[0]:$!";
-
-# Write the file inline by copying everything before a demarcation
-# line, and putting the generated data after the demarcation
-
-if ($opt_i) {
-
-  open(IN,$opt_i) || die "Can't open input file $opt_i";
-
-  while(<IN>){
-
-    if (/Do not edit/){
-      last;
-    }
-
-    print;
-
-  }    
-
-  if($opt_p){
-    print "# Everything below this line is machine generated. Do not edit. \n";
-  } else {
-    print "/* Everything below this line is machine generated. Do not edit. */\n";
-  }
-
-}
-
-
-
-if (($opt_c or $opt_h) and !$opt_i) {
-
-print <<EOM;
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedparameters.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  \044Id: mkderivedparameters.pl,v 1.1 1999/05/14 07:04:31 eric Exp eric \044
-  \044Locker: eric \044
-    
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
- 
-
- ======================================================================*/
-
-/*
- * THIS FILE IS MACHINE GENERATED DO NOT EDIT
- */
-
-
-EOM
-
-}
-
-if ($opt_p and !$opt_i){
-
-print <<EOM;
-# -*- Mode: Perl -*-
-#  ======================================================================
-#  \044Id:\044
-#    
-#  (C) COPYRIGHT 1999 Eric Busboom 
-#  http://www.softwarestudio.org
-#
-#  The contents of this file are subject to the Mozilla Public License
-#  Version 1.0 (the "License"); you may not use this file except in
-#  compliance with the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS"
-#  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-#  the License for the specific language governing rights and
-#  limitations under the License. 
-#
-#  The original author is Eric Busboom
-#  The original code is derivedparams.h
-#
-#  ======================================================================*/
-
-EOM
-
-}
-
-
-while(<F>){
-  
-  chop;
-  my ($param,$type) = split(/\s{2,}/,$_);  
-  
-  my $ucf = join("",map {ucfirst(lc($_));}  split(/-/,$param));
-  
-  my $lc = lc($ucf);
-  my $uc = uc($lc);
-  
-  my $lctype = lc($type);
-  
-
-  my $charorenum;
-  my $set_code;
-  my $pointer_check;
-  my $new_pointer_check;
-  my $new_pointer_check_v;
-  my $xrange;
-
-  if ($type=~/char/){
-    $new_pointer_check = "icalerror_check_arg_rz( (v!=0),\"v\");"; 
-    $new_pointer_check_v = "icalerror_check_arg_rv( (v!=0),\"v\");"; 
-  }
-
-
-  if ($type=~/char/ ) {
-
-     $charorenum = "    icalerror_check_arg_rz( (param!=0), \"param\");\n    return ((struct icalparameter_impl*)param)->string;";
-    
-     $pointer_check = "icalerror_check_arg_rz( (v!=0),\"v\");";
-
-     $set_code = "((struct icalparameter_impl*)param)->string = strdup(v);"
-
-  } else {
-
-    $xrange ="     if ( ((struct icalparameter_impl*)param)->string != 0){\n        return ICAL_${uc}_XNAME;\n        }\n" if !exists $no_xname{$uc};
-
-    $charorenum=<<EOM;
-    icalerror_check_arg( (param!=0), \"param\");
-$xrange
-    return ((struct icalparameter_impl*)param)->data.v_${lc};
-EOM
-     
-     $pointer_check = "icalerror_check_arg( (v!=0),\"v\");";
-
-     $set_code = "((struct icalparameter_impl*)param)->data.v_${lc} = v;";
-
-    $print_code = "switch (impl->data.v_${lc}) {\ncase ICAL_${uc}_: {\n}\ncase ICAL_${uc}_XNAME: /* Fall Through */\n}\n";
-
-   }
-  
-  
-  
-  if ($opt_c) {
-    
-  print <<EOM;
-/* $param */
-icalparameter* icalparameter_new_${lc}($type v)
-{
-   struct icalparameter_impl *impl;
-   icalerror_clear_errno();
-   $new_pointer_check
-   impl = icalparameter_new_impl(ICAL_${uc}_PARAMETER);
-   if (impl == 0) {
-      return 0;
-   }
-
-   icalparameter_set_${lc}((icalparameter*) impl,v);
-   if (icalerrno != ICAL_NO_ERROR) {
-      icalparameter_free((icalparameter*) impl);
-      return 0;
-   }
-
-   return (icalparameter*) impl;
-}
-
-${type} icalparameter_get_${lc}(icalparameter* param)
-{
-   icalerror_clear_errno();
-$charorenum
-}
-
-void icalparameter_set_${lc}(icalparameter* param, ${type} v)
-{
-   $new_pointer_check_v
-   icalerror_check_arg_rv( (param!=0), "param");
-   icalerror_clear_errno();
-   
-   $set_code
-}
-
-EOM
-
-  } elsif( $opt_h) {
-
-  print <<EOM;
-/* $param */
-icalparameter* icalparameter_new_${lc}($type v);
-${type} icalparameter_get_${lc}(icalparameter* value);
-void icalparameter_set_${lc}(icalparameter* value, ${type} v);
-
-EOM
-
-} elsif ($opt_s) {
-
-next if $type =~ /char/;
-
-print<<EOM;
-case ICAL_${uc}_PARAMETER:
-{
-  $print_code
-}
-EOM
-
-}
-
-  if ($opt_p) {
-    
-  print <<EOM;
-
-# $param 
-
-package Net::ICal::Parameter::${ucf};
-\@ISA=qw(Net::ICal::Parameter);
-
-sub new
-{
-   my \$self = [];
-   my \$package = shift;
-   my \$value = shift;
-
-   bless \$self, \$package;
-
-   my \$p;
-
-   if (\$value) {
-      \$p = Net::ICal::icalparameter_new_from_string(\$Net::ICal::ICAL_${uc}_PARAMETER,\$value);
-   } else {
-      \$p = Net::ICal::icalparameter_new(\$Net::ICal::ICAL_${uc}_PARAMETER);
-   }
-
-   \$self->[0] = \$p;
-
-   return \$self;
-}
-
-sub get
-{
-   my \$self = shift;
-   my \$impl = \$self->_impl();
-
-   return Net::ICal::icalparameter_as_ical_string(\$impl);
-
-}
-
-sub set
-{
-   # This is hard to implement, so I've punted for now. 
-   die "Set is not implemented";
-}
-
-EOM
-
-}
-
-}
-
-if ($opt_h){
-
-print <<EOM;
-#endif /*ICALPARAMETER_H*/
-EOM
-}
diff --git a/libical/scripts/mkderivedproperties.pl b/libical/scripts/mkderivedproperties.pl
deleted file mode 100755
index 9778c30a77..0000000000
--- a/libical/scripts/mkderivedproperties.pl
+++ /dev/null
@@ -1,291 +0,0 @@
-#!/usr/local/bin/perl
-
-use Getopt::Std;
-getopts('chsypmi:');
-
-# ARG 0 is prop-to-value
-open(PV,"$ARGV[0]") || die "Can't open prop to value  file $ARGV[0]:$!";
-
-
-while (<PV>){
-
-  chop;
-  my @v = split(/\s+/,$_);  
-  
-  my $prop = shift @v;
-  my $value = shift @v;
-  my $comment = join(" ",@v);
-  
-  $propmap{$prop} = $value;
-}
-
-close PV;
-
-# ARG 1 is value-c-types.txt
-open(F,"$ARGV[1]") || die "Can't open  C parameter types file $ARGV[1 ]:$!";
-
-while (<F>){
-
-  chop;
-  my @v = split(/\t+/,$_);  
-  
-  my $value = shift @v;
-  my $mode = shift @v;
-  my $type = shift @v;
-  my $comment = join(" ",@v);
-
- $valuemap{$value} = $type;
-
-}
-
-close F;
-
-# Write the file inline by copying everything before a demarcation
-# line, and putting the generated data after the demarcation
-
-if ($opt_i) {
-
-  open(IN,$opt_i) || die "Can't open input file $opt_i";
-
-  while(<IN>){
-
-    if (/Do not edit/){
-      last;
-    }
-
-    print;
-
-  }    
-
-  if($opt_p){
-    print "# Everything below this line is machine generated. Do not edit. \n";
-  } else {
-    print "/* Everything below this line is machine generated. Do not edit. */\n";
-  }
-
-}
-
-  
-if ( ($opt_h or $opt_s) and !$opt_i ){
-
-print <<EOM;
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedproperties.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  \044Id:\044
-    
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
- 
-
- ======================================================================*/
-
-/*
- * THIS FILE IS MACHINE GENERATED. DO NOT EDIT
- */
-
-
-EOM
-
-}
-
-
-if ($opt_p and !$opt_i){
-
-print <<EOM;
-
-EOM
-
-}
-
-foreach $prop (keys %propmap) {
-
-  next if !$prop;
-
-  my $value = $propmap{$prop};
-
-  if (!$value){
-    die "Can't find value for property \"$prop\"\n";
-  }
-
-  my $ucf = join("",map {ucfirst(lc($_));}  split(/-/,$prop));
-  my $lc = lc($ucf);
-  my $uc = uc($lc);
-
-  my $ucfvalue = join("",map {ucfirst(lc($_));}  split(/-/,$value));
-  my $lcvalue = lc($ucfvalue);
-  my $ucvalue = uc($lcvalue);
-
-  my $type = $valuemap{$value};
-  
-  my $pointer_check;
-  if ($type =~ /\*/){
-    $pointer_check = "icalerror_check_arg_rz( (v!=0),\"v\");\n" if $type =~ /\*/;
-  } elsif ( $type eq "void" ){
-    $pointer_check = "icalerror_check_arg_rv( (v!=0),\"v\");\n" if $type =~ /\*/;
-
-  }    
-
-  my $set_pointer_check = "icalerror_check_arg_rv( (v!=0),\"v\");\n" if $type =~ /\*/;
-
-  if($opt_c) { # Generate C source
- print<<EOM;
-
-/* $prop */
-
-icalproperty* icalproperty_new_${lc}($type v)
-{
-   struct icalproperty_impl *impl = icalproperty_new_impl(ICAL_${uc}_PROPERTY);  
-   $pointer_check
-
-   icalproperty_set_${lc}((icalproperty*)impl,v);
-
-   return (icalproperty*)impl;
-}
-
-icalproperty* icalproperty_vanew_${lc}($type v, ...)
-{
-   va_list args;
-   struct icalproperty_impl *impl = icalproperty_new_impl(ICAL_${uc}_PROPERTY);  
-   $pointer_check
-
-   icalproperty_set_${lc}((icalproperty*)impl,v);
-
-   va_start(args,v);
-   icalproperty_add_parameters(impl, args);
-   va_end(args);
-
-   return (icalproperty*)impl;
-}
- 
-void icalproperty_set_${lc}(icalproperty* prop, $type v)
-{
-    icalvalue *value;
-   
-    $set_pointer_check
-    icalerror_check_arg_rv( (prop!=0),"prop");
-
-    value = icalvalue_new_${lcvalue}(v);
-
-    icalproperty_set_value(prop,value);
-
-}
-
-$type icalproperty_get_${lc}(icalproperty* prop)
-{
-    icalvalue *value;
-    icalerror_check_arg( (prop!=0),"prop");
-
-    value = icalproperty_get_value(prop);
-
-    return icalvalue_get_${lcvalue}(value);
-}
-EOM
-
-
-  } elsif ($opt_h) { # Generate C Header file
- print<<EOM;
-
-/* $prop */
-icalproperty* icalproperty_new_${lc}($type v);
-icalproperty* icalproperty_vanew_${lc}($type v, ...);
-void icalproperty_set_${lc}(icalproperty* prop, $type v);
-$type icalproperty_get_${lc}(icalproperty* prop);
-EOM
-  
-} elsif ($opt_s) { # Generate case in a switch statement
-
-print <<EOM;
-case ICAL_${uc}_PROPERTY:
-EOM
-
-
-} elsif ($opt_p) { # Generate perl code
-
-print <<EOM;
-
-package Net::ICal::Property::${ucf}; 
-use Net::ICal::Property;
-\@ISA=qw(Net::ICal::Property);
-sub new
-{
-   my \$package = shift;
-
-   my \$p = Net::ICal::icalproperty_new(\$Net::ICal::ICAL_${uc}_PROPERTY);
-   my \$self = Net::ICal::Property::new_from_ref(\$p);
-
-   \$self->_add_elements(\\\@_);
-
-   return bless \$self, \$package;
-}
-
-sub set_value
-{
-   my \$self = shift;
-   my \$v = shift;
-
-   my \$impl = \$self->_impl();
-
-
-   if ( ref \$v && Net::ICal::icalvalue_isa_value(\$v->_impl())){
-      Net::ICal::icalproperty_set_value(\$impl,\$v->_impl);
-   } else { 
-      my \$value = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${ucvalue}_VALUE,\$v);
-      die if !\$impl;
-      Net::ICal::icalproperty_set_value(\$impl,\$value) unless !\$value;
-   }
-
-}
-
-sub get_value
-{
-   my \$self = shift;
-   my \$impl = \$self->_impl();   
-
-   if (defined \$impl){
-     my \$value = Net::ICal::icalproperty_get_value(\$impl);
-     return "" if !\$value;
-     return  Net::ICal::icalvalue_as_ical_string(\$value);
-   } else {
-      return "";
-   }
-}
-
-EOM
-
-} elsif ($opt_m) { # Generate a map
-
-print "\'${uc}\' => \'Net::ICal::Property::${ucf},\'\n";
-
-}
-
-} # This brace terminates the main loop
-
-
-
-# Add things to the end of the output.
-
-if ($opt_p)
-{
-  print "1;\n";
-}
-
-if ($opt_h){
-
-print <<EOM;
-#endif /*ICALPROPERTY_H*/
-EOM
-}
-
diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl
deleted file mode 100755
index 10dac3a75f..0000000000
--- a/libical/scripts/mkderivedvalues.pl
+++ /dev/null
@@ -1,316 +0,0 @@
-#!/usr/bin/perl 
-
-
-use Getopt::Std;
-getopts('chspi:');
-
-#Options
-# c -> generate c code file
-# h-> generate header file   
-# s -> generate switch statement
-
-# Open with value-c-types.txt
-
-
-open(F,"$ARGV[0]") || die "Can't open values data file $ARGV[0]:$!";
-
-
-# Write the file inline by copying everything before a demarcation
-# line, and putting the generated data after the demarcation
-
-if ($opt_i) {
-
-  open(IN,$opt_i) || die "Can't open input file $opt_i";
-
-  while(<IN>){
-
-    if (/Do not edit/){
-      last;
-    }
-
-    print;
-
-  }    
-
-  if($opt_p){
-    print "# Everything below this line is machine generated. Do not edit. \n";
-  } else {
-    print "/* Everything below this line is machine generated. Do not edit. */\n";
-  }
-
-}
-
-
-if (($opt_c || $opt_h) and !$opt_i) {
-print <<EOM;
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedvalues.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  \044Id:\044
-    
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
- 
- ======================================================================*/
-
-/*
- * THIS FILE IS MACHINE GENERATED DO NOT EDIT
- */
-
-
-
-EOM
-}
-
-if ($opt_p and !$opt_i){
-
-print <<EOM;
-# -*- Mode: Perl -*-
-#  ======================================================================
-#  \044Id:\044
-#    
-#  (C) COPYRIGHT 1999 Eric Busboom 
-#  http://www.softwarestudio.org
-#
-#  The contents of this file are subject to the Mozilla Public License
-#  Version 1.0 (the "License"); you may not use this file except in
-#  compliance with the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS"
-#  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-#  the License for the specific language governing rights and
-#  limitations under the License. 
-#
-#  The original author is Eric Busboom
-#  The original code is derivedvalues.h
-#
-#  ======================================================================*/
-
-EOM
-
-}
-
-# Map type names to the value in the icalvalue_impl data union */
-
-%union_map = (
-	      BOOLEAN => 'int',
-	      CALADDRESS=>'string',
-	      DATE=>'time',
-	      DATETIME=>'time',
-	      DATETIMEDATE=>'time',
-	      DATETIMEPERIOD=>'period',
-	      DURATION=>'duration',
-	      INTEGER=>'int',
-	      TEXT=>'string',
-	      URI=>'string',
-	      UTCOFFSET=>'int',
-	      QUERY=>'string',
-	      BINARY=>'string'
-	     );
-
-while(<F>)
-{
-  
-  chop;
-  my @v = split(/\t+/,$_);  
-  
-  my $value = shift @v;
-  my $mode = shift @v;
-  my $type = shift @v;
-  my $comment = join(" ",@v);
-  
-  my $ucf = join("",map {ucfirst(lc($_));}  split(/-/,$value));
-  
-  my $lc = lc($ucf);
-  my $uc = uc($lc);
-
-  my $pointer_check = "icalerror_check_arg_rz( (v!=0),\"v\");\n" if $type =~ /\*/;
-  my $pointer_check_rv = "icalerror_check_arg_rv( (v!=0),\"v\");\n" if $type =~ /\*/;
-
-  my $assign;
-
-  if ($type =~ /char/){
-    $assign = "strdup(v);\n\n    if (impl->data.v_string == 0){\n      errno = ENOMEM;\n    }\n";
-  } else {
-    $assign = "v;";
-  }
-
-  my $union_data;
-  
-  if (exists $union_map{$uc} ){
-    $union_data=$union_map{$uc};
-  } else {
-    $union_data = $lc;
-  }
-
-  if ($opt_c && $mode eq "autogen") {
-print <<EOM;
-
-icalvalue*
-icalvalue_new_${lc} ($type v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_${uc}_VALUE);
- 
-   $pointer_check
-   icalvalue_set_${lc}((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_${lc}(icalvalue* value, $type v)
-{
-    struct icalvalue_impl* impl; 
-    
-    icalerror_check_arg_rv( (value!=0),"value");
-    $pointer_check_rv
-    icalerror_check_value_type(value, ICAL_${uc}_VALUE);
-
-    impl = (struct icalvalue_impl*)value;
-EOM
-
-if( ${union_data} eq 'string'){
-print"    if(impl->data.v_${union_data}!=0) {free((void*)impl->data.v_${union_data});}\n";
-}
-
-print <<EOM;
-
-    impl->data.v_${union_data} = $assign
-}
-
-$type
-icalvalue_get_${lc}(icalvalue* value)
-{
-    icalerror_check_arg( (value!=0),"value");
-    icalerror_check_value_type(value, ICAL_${uc}_VALUE);
-  
-    return ((struct icalvalue_impl*)value)->data.v_${union_data};
-}
-
-EOM
-
-} elsif($opt_h && $mode eq "autogen") {
-
-  print <<EOM;
-/* $value $comment */
-icalvalue* icalvalue_new_${lc}($type v);
-$type icalvalue_get_${lc}(icalvalue* value);
-void icalvalue_set_${lc}(icalvalue* value, ${type} v);
-
-EOM
-
-} elsif ($opt_s) {
-
-if ( $ud{$union_data}++ == 0) {
-
-print<<EOM;
-const char* icalvalue_${union_data}_as_ical_string(icalvalue* value) {
-
-    $type data;
-    char temp[1024];
-    char *str;
-    icalerror_check_airg( (value!=0),"value");
-    data = ((struct icalvalue_impl*)value)->data.v_${union_data}
-
-    str = icalmemory_strdup(temp);
-
-    return str;
-}
-
-EOM
-
-}
-}  elsif ($opt_p) { # Generate perl code
-
-print <<EOM;
-
-package Net::ICal::Value::${ucf}; 
-use Net::ICal::Value;
-\@ISA=qw(Net::ICal::Value);
-sub new
-{
-   my \$self = [];
-   my \$package = shift;
-   my \$value = shift;
-
-   bless \$self, \$package;
-
-   my \$p;
-
-   if (\$value){
-      \$p = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$value);
-   } else {
-      \$p = Net::ICal::icalvalue_new(\$Net::ICal::ICAL_${uc}_VALUE);
-   }
-
-   \$self->[0] = \$p;
-
-   return \$self;
-}
-
-sub set
-{
-   my \$self = shift;
-   my \$v = shift;
-
-   my \$impl = \$self->_impl();
-
-   if (\$v) {
-      my \$new_value = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$v);
-      if (\$new_value){
-         Net::ICal::icalvalue_free(\$self->[0]);
-          \$self->[0] = \$new_value;
-      }
-
-   }
-
-}
-
-sub get
-{
-   my \$self = shift;
-   my \$impl = \$self->[0];   
-
-   if (defined \$impl){
-
-     return  Net::ICal::icalvalue_as_ical_string(\$impl);
-
-   }
-}
-
-EOM
-}
-
-
-
-}
-
-if ($opt_p)
-{
-  print "1;\n";
-}
-
-
-if ($opt_h){
-
-print <<EOM;
-#endif /*ICALVALUE_H*/
-EOM
-}
-
-
-__END__
-
diff --git a/libical/scripts/mkparameterrestrictions.pl b/libical/scripts/mkparameterrestrictions.pl
deleted file mode 100755
index 2c57eb4ca5..0000000000
--- a/libical/scripts/mkparameterrestrictions.pl
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/perl 
-
-# Version: 1.0
-# Script last updated: 30May1999 GMD
-# Change log:
-# <none>
-
-
-# usually open params-in-prop.txt
-open(F,"$ARGV[0]") || die "Can't open restriction file $ARGV[0]:$!";
-
-print <<EOM;
-/*
-  ======================================================================
-  File: parameterrestrictions.c
-    
- (C) COPYRIGHT 1999 Graham Davison
- mailto:g.m.davison\@computer.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- ======================================================================*/
-
-/*
- * THIS FILE IS MACHINE GENERATED DO NOT EDIT
- */
-
-
-int icalrestriction_is_parameter_allowed(icalproperty_kind prop,icalparameter_kind param)
-{
-	switch (prop)
-	{
-EOM
-
-while(<F>)
-{
-	chop;
-	
-	# split line by whitespace
-	my @v = split(/\s+/,$_);
-	# property is first item on line
-	my $prop = shift @v;
-	my $prop_name = $prop;
-	if (substr($prop,0,1) eq "X") { $prop = "X"; }
-	$prop = join("",split(/-/,$prop));
-	
-print <<EOM;
-
-		/* ${prop_name} */
-		case ICAL_${prop}_PROPERTY:
-			switch (param)
-			{
-EOM
-
-	foreach $param (@v)
-	{
-		$param = join("",split(/-/,$param));
-		print "\t\t\t\tcase ICAL_${param}_PARAMETER:\n";
-	}
-	
-print <<EOM;
-					return 1;
-				default:
-					return 0;
-			}
-			
-EOM
-
-}
-
-print <<EOM;
-	}
-	
-	return 0;
-}	
-EOM
diff --git a/libical/scripts/mkrestrictionrecords.pl b/libical/scripts/mkrestrictionrecords.pl
deleted file mode 100755
index e2c62ae748..0000000000
--- a/libical/scripts/mkrestrictionrecords.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl 
-
-# Version: 1.0
-# Script last updated: 30May1999 GMD
-# Change log:
-# <none>
-
-# usually open restrictions.csv
-open(F,"$ARGV[0]") || die "Can't open restriction file $ARGV[0]:$!";
-
-print <<EOM;
-/*
-  ======================================================================
-  File: restrictionrecords.c
-    
- (C) COPYRIGHT 1999 Graham Davison
- mailto:g.m.davison\@computer.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- ======================================================================*/
-
-
-/*
- * THIS FILE IS MACHINE GENERATED DO NOT EDIT
- */
-
-
-typedef struct icalrestriction_record {
-	icalproperty_method method;
-	icalcomponent_kind component;
-	icalproperty_kind property;
-	icalcomponent_kind subcomponent;
-	icalrestriction_kind restriction;
-} icalrestriction_record;
-
-
-icalrestriction_record icalrestriction_records[] = 
-{
-EOM
-
-my $last_method = "";
-my $last_component = "";
-my $last_property = "";
-my $need_header = 0;
-
-while(<F>)
-{
-	chop;
-	
-	# split line at commas
-	my ($method,$component,$property,$subcomponent,$restriction)=split(/\,/,$_);
-	
-	#
-	#put in code to generate comments here!
-	#
-	if ($method ne $last_method)
-	{
-		$need_header = 1;
-		$last_method = $method;
-	}
-	if ($component ne $last_component)
-	{
-		$need_header = 1;
-		$last_component = $component;
-	}
-	
-	if ($need_header)
-	{
-		print "\n\t/* METHOD: ${method}, COMPONENT: ${component} */\n";
-		$need_header = 0;
-	}
-	
-	foreach $item ($component,$property,$subcomponent,$restriction)
-	{
-		# handle special cases.
-		if ($item eq "NONE")
-			{ $item = "NO"; }
-		else { if (substr($item,0,1) eq "X")
-			{ $item = "X"; }}
-		
-		# strip out dashes
-		$item = join("",split(/-/,$item));
-	}
-	# strip leading V from component names
-	$component =~ s/^(V?)(\w+?)((SAVINGS)?)((TIME)?)$/$2/;
-	$subcomponent =~ s/^V(\w+)/$1/;
-
-	print "\t\{ICAL_METHOD_${method},ICAL_${component}_COMPONENT,";
-	print "ICAL_${property}_PROPERTY,ICAL_${subcomponent}_COMPONENT,";
-	print "ICAL_RESTRICTION_${restriction}\},\n";
-	
-}
-
-print <<EOM;
-	
-	/* END */
-	{ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_NO_COMPONENT,ICAL_RESTRICTION_NONE}
-};
-EOM
diff --git a/libical/scripts/mkrestrictiontable.pl b/libical/scripts/mkrestrictiontable.pl
deleted file mode 100755
index e1e1a0ca53..0000000000
--- a/libical/scripts/mkrestrictiontable.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-
-use Getopt::Std;
-getopts('i:');
-
-# the argument should be the path to the restriction datafile, usually
-# design-data/restrictions.csv        
-open(F,"$ARGV[0]") || die "Can't open restriction data file $ARGV[0]:$!";
-
-# Write the file inline by copying everything before a demarcation
-# line, and putting the generated data after the demarcation
-
-if ($opt_i) {
-
-  open(IN,$opt_i) || die "Can't open input file $opt_i";
-
-  while(<IN>){
-
-    if (/Do not edit/){
-      last;
-    }
-
-    print;
-
-  }    
-
-  print "/* Everything below this line is machine generated. Do not edit. */\n";
-
-
-  close IN;
-}
-
-# First build the property restriction table 
-print "icalrestriction_property_record icalrestriction_property_records[] = {\n";
-
-while(<F>)
-{
-
-  chop;
-
-  s/\#.*$//;
-
-  my($method,$targetcomp,$prop,$subcomp,$restr,$sub) = split(/,/,$_);
-
-  next if !$method;
-  
-  if(!$sub) {
-    $sub = "0";
-  } else {
-    $sub = "icalrestriction_".$sub;
-  }
-
-  if($prop ne "NONE"){
-    print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${prop}_PROPERTY,ICAL_RESTRICTION_${restr},$sub},\n");
-  }
-
-}
-
-
-# Print the terminating line 
-print "    {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_NONE}\n";
-
-print "};\n";
-
-print "icalrestriction_component_record icalrestriction_component_records[] = {\n";
-
-
-# Go back through the entire file and build the component restriction table
-close(F);  
-open(F,"$ARGV[0]") || die "Can't open restriction data file $ARGV[0]:$!";
-
-while(<F>)
-{
-
-  chop;
-
-  s/\#.*$//;
-
-  my($method,$targetcomp,$prop,$subcomp,$restr,$sub) = split(/,/,$_);
-
-  next if !$method;
-  
-  if(!$sub) {
-    $sub = "0";
-  } else {
-    $sub = "icalrestriction_".$sub;
-  }
-
-
-    if($subcomp ne "NONE"){
-      print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${subcomp}_COMPONENT,ICAL_RESTRICTION_${restr},$sub\},\n");
-    }
-
-}
-
-# print the terminating line 
-print "    {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_NONE}\n";
-print "};\n";
diff --git a/libical/src/.cvsignore b/libical/src/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/libical/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
\ No newline at end of file
diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am
deleted file mode 100644
index bff5609c92..0000000000
--- a/libical/src/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = libical libicalvcal
-
-# disabled libicalss and test until they build
-#SUBDIRS = libical libicalss libicalvcal test
diff --git a/libical/src/libical/.cvsignore b/libical/src/libical/.cvsignore
deleted file mode 100644
index fd83172a6b..0000000000
--- a/libical/src/libical/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-Makefile
-Makefile.in
-icalitipy.c
-icalitipy.h
-icalitipl.c
-icallexer.c
-icalyacc.c
-icalyacc.h
-y.output
-*.lo
-*.la
-.libs
-.deps
-icalversion.h
-icalproperty.h
-icalvalue.h
-icalvalue.c
-ical.h
-icalparameter.h
-icalparameter.c
-icalproperty.c
-icalrestriction.c
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
deleted file mode 100644
index 186e705060..0000000000
--- a/libical/src/libical/Makefile.am
+++ /dev/null
@@ -1,183 +0,0 @@
-DESIGNDATA = $(top_srcdir)/design-data
-ICALSCRIPTS = $(top_srcdir)/scripts
-
-lib_LTLIBRARIES = libical.la
-
-noinst_LTLIBRARIES = libical-static.la
-libical_static_la_SOURCES = $(libical_la_SOURCES)
-libical_static_la_LDFLAGS = --all-static
-
-YFLAGS = -d -v -t -pical_yy
-LFLAGS = -Pical_yy
-LEX_OUTPUT_ROOT = lex.ical_yy
-
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
-	-I$(srcdir)
-
-libical_la_LDFLAGS = -version-info 0:0:0
-
-libical_la_SOURCES =		\
-	icalcomponent.c		\
-	icalcomponent.h		\
-	icalenums.c		\
-	icalenums.h		\
-	icalerror.c		\
-	icalerror.h		\
-	icallexer.l		\
-	icalmemory.c		\
-	icalmemory.h		\
-	icalmime.c		\
-	icalmime.h		\
-	icalparameter.c		\
-	icalparameter.h		\
-	icalparser.c		\
-	icalparser.h		\
-	icalproperty.c		\
-	icalproperty.h		\
-	icalrecur.c		\
-	icalrecur.h		\
-	icalrestriction.c	\
-	icalrestriction.h	\
-	icaltime.c		\
-	icaltime.h		\
-	icaltypes.c		\
-	icaltypes.h		\
-	icalvalue.c		\
-	icalvalue.h		\
-	icalyacc.h		\
-	icalyacc.y		\
-	pvl.c			\
-	pvl.h			\
-	sspm.c			\
-	sspm.h			\
-	vsnprintf.c		\
-	icallangbind.h		\
-	icallangbind.c
-
-libicalincludedir = $(includedir)
-
-libicalinclude_HEADERS =  ical.h 
-
-# ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
-# is required to make the combined header ical.h properly
-COMBINEDHEADERS =					\
-	$(top_builddir)/src/libical/icalversion.h	\
-	$(top_srcdir)/src/libical/icaltime.h		\
-	$(top_srcdir)/src/libical/icalenums.h		\
-	$(top_srcdir)/src/libical/icaltypes.h		\
-	$(top_srcdir)/src/libical/icalrecur.h		\
-	icalvalue.h					\
-	icalparameter.h					\
-	icalproperty.h					\
-	$(top_srcdir)/src/libical/pvl.h			\
-	$(top_srcdir)/src/libical/icalcomponent.h	\
-	$(top_srcdir)/src/libical/icalparser.h		\
-	$(top_srcdir)/src/libical/icalmemory.h		\
-	$(top_srcdir)/src/libical/icalerror.h		\
-	icalrestriction.h				\
-	$(top_srcdir)/src/libical/sspm.h		\
-	$(top_srcdir)/src/libical/icalmime.h 		\
-	$(top_srcdir)/src/libical/icallangbind.h
-
-BUILT_SOURCES =			\
-	ical.h			\
-	icalparameter.c		\
-	icalparameter.h		\
-	icalproperty.c		\
-	icalproperty.h		\
-	icalrestriction.c	\
-	icalvalue.c		\
-	icalvalue.h
-
-ical.h: $(BUILT_SOURCES)
-	cat $(COMBINEDHEADERS)				\
-	| egrep -v "#include.*\"ical"			\
-	| egrep -v "#include.*\"pvl\.h\"" > ical.h
-
-icallexer.c : icalyacc.h
-
-
-# parameters
-
-PARAMETERDEPS =	\
-	$(ICALSCRIPTS)/mkderivedparameters.pl \
-	$(DESIGNDATA)/param-c-types.txt	\
-	icalparameter.c.in \
-	icalparameter.h.in
-
-icalparameter.h: $(PARAMETERDEPS) 
-	$(PERL) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalparameter.h.in -h $(DESIGNDATA)/param-c-types.txt > icalparameter.newh \
-	&& mv icalparameter.newh icalparameter.h 
-
-icalparameter.c: $(PARAMETERDEPS) icalparameter.h
-	$(PERL) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalparameter.c.in -c $(DESIGNDATA)/param-c-types.txt > icalparameter.newc \
-	&& mv icalparameter.newc icalparameter.c
-
-# properties
-
-PROPERTYDEPS =					\
-	$(ICALSCRIPTS)/mkderivedproperties.pl	\
-	$(DESIGNDATA)/prop-to-value.txt		\
-	$(DESIGNDATA)/value-c-types.txt		\
-	icalproperty.c.in			\
-	icalproperty.h.in
-
-
-icalproperty.h: $(PROPERTYDEPS)
-	$(PERL) $(ICALSCRIPTS)/mkderivedproperties.pl -i $(srcdir)/icalproperty.h.in -h \
-		$(DESIGNDATA)/prop-to-value.txt \
-		${DESIGNDATA}/value-c-types.txt > icalproperty.h 
-
-icalproperty.c: $(PROPERTYDEPS) icalproperty.h 
-	$(PERL) $(ICALSCRIPTS)/mkderivedproperties.pl -i $(srcdir)/icalproperty.c.in -c \
-		$(DESIGNDATA)/prop-to-value.txt \
-		${DESIGNDATA}/value-c-types.txt > icalproperty.c
-
-# restrictions
-
-RESTRICTIONDEPS =				\
-	$(ICALSCRIPTS)/mkrestrictiontable.pl	\
-	$(DESIGNDATA)/restrictions.csv		\
-	icalrestriction.c.in
-
-icalrestriction.c: $(RESTRICTIONDEPS)
-	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
-		$(DESIGNDATA)/restrictions.csv > icalrestriction.c
-
-# values
-
-VALUEDEPS =					\
-	$(ICALSCRIPTS)/mkderivedvalues.pl  	\
-	$(DESIGNDATA)/value-c-types.txt		\
-	icalvalue.c.in				\
-	icalvalue.h.in
-
-icalvalue.h: $(VALUEDEPS)
-	$(PERL) $(ICALSCRIPTS)/mkderivedvalues.pl -i $(srcdir)/icalvalue.h.in -h \
-		$(DESIGNDATA)/value-c-types.txt > icalvalue.h
-
-icalvalue.c: $(VALUEDEPS) icalvalue.h
-	$(PERL) $(ICALSCRIPTS)/mkderivedvalues.pl  -i $(srcdir)/icalvalue.c.in -c \
-		$(DESIGNDATA)/value-c-types.txt > icalvalue.c
-
-
-
-# housekeeping
-CONFIG_CLEAN_FILES = y.output
-
-EXTRA_DIST =			\
-	icalparameter.c.in	\
-	icalparameter.h.in	\
-	icalproperty.c.in	\
-	icalproperty.h.in	\
-	icalrestriction.c.in	\
-	icalvalue.c.in		\
-	icalvalue.h.in		\
-	icalversion.h.in	\
-	$(BUILT_SOURCES)	\
-	icallexer.c		\
-	icalyacc.c
-
diff --git a/libical/src/libical/icalcomponent.c b/libical/src/libical/icalcomponent.c
deleted file mode 100644
index 3ac0ee0663..0000000000
--- a/libical/src/libical/icalcomponent.c
+++ /dev/null
@@ -1,1421 +0,0 @@
-/*======================================================================
-  FILE: icalcomponent.c
-  CREATOR: eric 28 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcomponent.c
-
-======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalcomponent.h"
-#include "pvl.h" /* "Pointer-to-void list" */
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalenums.h"
-#include "icaltime.h"
-
-#include <stdlib.h>  /* for malloc */
-#include <stdarg.h> /* for va_list, etc */
-#include <errno.h>
-#include <assert.h>
-#include <stdio.h> /* for fprintf */
-
-#define MAX_TMP 1024
-
-struct icalcomponent_impl 
-{
-	char id[5];
-	icalcomponent_kind kind;
-	char* x_name;
-	pvl_list properties;
-	pvl_elem property_iterator;
-	pvl_list components;
-	pvl_elem component_iterator;
-	icalcomponent* parent;
-};
-
-/* icalproperty functions that only components get to use */
-void icalproperty_set_parent(icalproperty* property,
-			     icalcomponent* component);
-icalcomponent* icalproperty_get_parent(icalproperty* property);
-void icalcomponent_add_children(struct icalcomponent_impl *impl,va_list args);
-icalcomponent* icalcomponent_new_impl (icalcomponent_kind kind);
-int icalcomponent_property_sorter(void *a, void *b);
-
-
-void icalcomponent_add_children(struct icalcomponent_impl *impl,va_list args)
-{
-    void* vp;
-    
-    while((vp = va_arg(args, void*)) != 0) {
-
-	assert (icalcomponent_isa_component(vp) != 0 ||
-		icalproperty_isa_property(vp) != 0 ) ;
-
-	if (icalcomponent_isa_component(vp) != 0 ){
-
-	    icalcomponent_add_component((icalcomponent*)impl,
-				       (icalcomponent*)vp);
-
-	} else if (icalproperty_isa_property(vp) != 0 ){
-
-	    icalcomponent_add_property((icalcomponent*)impl,
-				       (icalproperty*)vp);
-	}
-    }    
-}
-
-icalcomponent*
-icalcomponent_new_impl (icalcomponent_kind kind)
-{
-    struct icalcomponent_impl* comp;
-
-    if ( ( comp = (struct icalcomponent_impl*)
-	   malloc(sizeof(struct icalcomponent_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(comp->id,"comp");
-
-    comp->kind = kind;
-    comp->properties = pvl_newlist();
-    comp->property_iterator = 0;
-    comp->components = pvl_newlist();
-    comp->component_iterator = 0;
-    comp->x_name = 0;
-    comp->parent = 0;
-
-    return comp;
-}
-
-icalcomponent*
-icalcomponent_new (icalcomponent_kind kind)
-{
-   return (icalcomponent*)icalcomponent_new_impl(kind);
-}
-
-icalcomponent*
-icalcomponent_vanew (icalcomponent_kind kind, ...)
-{
-   va_list args;
-
-   struct icalcomponent_impl *impl = icalcomponent_new_impl(kind);
-
-    if (impl == 0){
-	return 0;
-    }
-
-   va_start(args,kind);
-   icalcomponent_add_children(impl, args);
-   va_end(args);
-
-   return (icalcomponent*) impl;
-}
-
-icalcomponent* icalcomponent_new_from_string(char* str)
-{
-    icalcomponent_kind kind;
-
-    icalerror_check_arg_rz( (str!=0), "str");
-
-    kind = icalenum_string_to_component_kind(str);
-
-    if (kind == ICAL_NO_COMPONENT){
-	return 0;
-    }
-    
-    return icalcomponent_new(kind);
-}
-
-icalcomponent* icalcomponent_new_clone(icalcomponent* component)
-{
-    struct icalcomponent_impl *old = (struct icalcomponent_impl*)component;
-    struct icalcomponent_impl *new;
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr;
-
-    icalerror_check_arg_rv( (component!=0), "component");
-
-    new = icalcomponent_new_impl(old->kind);
-
-    if (new == 0){
-	return 0;
-    }
-
-    
-    for( itr = pvl_head(old->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	icalcomponent_add_property(new,icalproperty_new_clone(p));
-    }
-   
-   
-    for( itr = pvl_head(old->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	icalcomponent_add_component(new,icalcomponent_new_clone(c));
-    }
-
-   return new;
-
-}
-
-
-void
-icalcomponent_free (icalcomponent* component)
-{
-    icalproperty* prop;
-    icalcomponent* comp;
-    struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-    icalerror_check_arg_rv( (component!=0), "component");
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (c->parent ==0),"Tried to free a component that is still attached to a parent component");
-#else
-    if(c->parent != 0){
-	return;
-    }
-#endif
-
-    if(component != 0 ){
-       
-       while( (prop=pvl_pop(c->properties)) != 0){
-	   assert(prop != 0);
-           icalproperty_set_parent(prop,0);
-	   icalproperty_free(prop);
-       }
-       
-       pvl_free(c->properties);
-
-       while( (comp=pvl_data(pvl_head(c->components))) != 0){
-	   assert(comp!=0);
-	   icalcomponent_remove_component(component,comp);
-	   icalcomponent_free(comp);
-       }
-       
-       pvl_free(c->components);
-
-	if (c->x_name != 0) {
-	    free(c->x_name);
-	}
-
-	c->kind = ICAL_NO_COMPONENT;
-	c->properties = 0;
-	c->property_iterator = 0;
-	c->components = 0;
-	c->component_iterator = 0;
-	c->x_name = 0;	
-	c->id[0] = 'X';
-
-	free(c);
-    }
-}
-
-char*
-icalcomponent_as_ical_string (icalcomponent* component)
-{
-   char* buf, *out_buf;
-   char* tmp_buf;
-   size_t buf_size = 1024;
-   char* buf_ptr = 0;
-    pvl_elem itr;
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-
-#ifdef ICAL_UNIX_NEWLINE    
-    char newline[] = "\n";
-#else
-    char newline[] = "\r\n";
-#endif
-   
-   icalcomponent *c;
-   icalproperty *p;
-   icalcomponent_kind kind = icalcomponent_isa(component);
-
-   const char* kind_string;
-
-   buf = icalmemory_new_buffer(buf_size);
-   buf_ptr = buf; 
-
-   icalerror_check_arg_rz( (component!=0), "component");
-   icalerror_check_arg_rz( (kind!=ICAL_NO_COMPONENT), "component kind is ICAL_NO_COMPONENT");
-   
-   kind_string  = icalenum_component_kind_to_string(kind);
-
-   icalerror_check_arg_rz( (kind_string!=0),"Unknown kind of component");
-
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:");
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-   
-
-
-   for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	
-	icalerror_assert((p!=0),"Got a null property");
-	tmp_buf = icalproperty_as_ical_string(p);
-	
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, tmp_buf);
-    }
-   
-   
-   for( itr = pvl_head(impl->components);
-	itr != 0;
-	itr = pvl_next(itr))
-   {	
-       c = (icalcomponent*)pvl_data(itr);
-       
-       tmp_buf = icalcomponent_as_ical_string(c);
-       
-       icalmemory_append_string(&buf, &buf_ptr, &buf_size, tmp_buf);
-       
-   }
-   
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, "END:");
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, 
-			    icalenum_component_kind_to_string(kind));
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-   out_buf = icalmemory_tmp_copy(buf);
-   free(buf);
-
-   return out_buf;
-}
-
-
-int
-icalcomponent_is_valid (icalcomponent* component)
-{
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl *)component;
-
-	
-    if ( (strcmp(impl->id,"comp") == 0) &&
-	 impl->kind != ICAL_NO_COMPONENT){
-	return 1;
-    } else {
-	return 0;
-    }
-
-}
-
-
-icalcomponent_kind
-icalcomponent_isa (icalcomponent* component)
-{
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl *)component;
-    icalerror_check_arg_rz( (component!=0), "component");
-
-   if(component != 0)
-   {
-       return impl->kind;
-   }
-
-   return ICAL_NO_COMPONENT;
-}
-
-
-int
-icalcomponent_isa_component (void* component)
-{
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl *)component;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    if (strcmp(impl->id,"comp") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-
-}
-
-int icalcomponent_property_sorter(void *a, void *b)
-{
-    icalproperty_kind kinda, kindb;
-    const char *ksa, *ksb;
-
-    kinda = icalproperty_isa((icalproperty*)a);
-    kindb = icalproperty_isa((icalproperty*)b);
-
-    ksa = icalenum_property_kind_to_string(kinda);
-    ksb = icalenum_property_kind_to_string(kindb);
-
-    return strcmp(ksa,ksb);
-}
-
-
-void
-icalcomponent_add_property (icalcomponent* component, icalproperty* property)
-{
-    struct icalcomponent_impl *impl;
-
-    icalerror_check_arg_rv( (component!=0), "component");
-    icalerror_check_arg_rv( (property!=0), "property");
-
-     impl = (struct icalcomponent_impl*)component;
-
-    icalerror_assert( (!icalproperty_get_parent(property)),"The property has already been added to a component. Remove the property with icalcomponent_remove_property before calling icalcomponent_add_property");
-
-    icalproperty_set_parent(property,component);
-
-#ifdef ICAL_INSERT_ORDERED
-    pvl_insert_ordered(impl->properties,
-		       icalcomponent_property_sorter,property);
-#else
-    pvl_push(impl->properties,property);
-#endif
-
-}
-
-
-void
-icalcomponent_remove_property (icalcomponent* component, icalproperty* property)
-{
-    struct icalcomponent_impl *impl;
-    pvl_elem itr, next_itr;
-    struct icalproperty_impl *pimpl;
-
-    icalerror_check_arg_rv( (component!=0), "component");
-    icalerror_check_arg_rv( (property!=0), "property");
-    
-    impl = (struct icalcomponent_impl*)component;
-
-    pimpl = (struct icalproperty_impl*)property;
-
-    icalerror_assert( (icalproperty_get_parent(property)),"The property is not a member of a component");
-
-    
-    for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = next_itr)
-    {
-	next_itr = pvl_next(itr);
-	
-	if( pvl_data(itr) == (void*)property ){
-
-	   if (impl->property_iterator == itr){
-	       impl->property_iterator = pvl_next(itr);
-	   }
-
-	   pvl_remove( impl->properties, itr); 
-	  icalproperty_set_parent(property,0);
-	}
-    }	
-}
-
-int
-icalcomponent_count_properties (icalcomponent* component, 
-				icalproperty_kind kind)
-{
-    int count=0;
-    pvl_elem itr;
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	if(kind == icalproperty_isa((icalproperty*)pvl_data(itr)) ||
-	    kind == ICAL_ANY_PROPERTY){
-	    count++;
-	}
-    }
-
-
-    return count;
-
-}
-
-icalproperty* icalcomponent_get_current_property (icalcomponent* component)
-{
-
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-   icalerror_check_arg_rz( (component!=0),"component");
-
-   if ((c->property_iterator==0)){
-       return 0;
-   }
-
-   return (icalproperty*) pvl_data(c->property_iterator);
-
-}
-
-icalproperty*
-icalcomponent_get_first_property (icalcomponent* component, icalproperty_kind kind)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-   icalerror_check_arg_rz( (component!=0),"component");
-  
-   for( c->property_iterator = pvl_head(c->properties);
-	c->property_iterator != 0;
-	c->property_iterator = pvl_next(c->property_iterator)) {
-	    
-       icalproperty *p =  (icalproperty*) pvl_data(c->property_iterator);
-	
-	   if (icalproperty_isa(p) == kind || kind == ICAL_ANY_PROPERTY) {
-	       
-	       return p;
-	   }
-   }
-   return 0;
-}
-
-icalproperty*
-icalcomponent_get_next_property (icalcomponent* component, icalproperty_kind kind)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-   icalerror_check_arg_rz( (component!=0),"component");
-
-   if (c->property_iterator == 0){
-       return 0;
-   }
-
-   for( c->property_iterator = pvl_next(c->property_iterator);
-	c->property_iterator != 0;
-	c->property_iterator = pvl_next(c->property_iterator)) {
-	    
-       icalproperty *p =  (icalproperty*) pvl_data(c->property_iterator);
-	   
-       if (icalproperty_isa(p) == kind || kind == ICAL_ANY_PROPERTY) {
-	   
-	   return p;
-       }
-   }
-
-   return 0;
-}
-
-
-icalproperty**
-icalcomponent_get_properties (icalcomponent* component, icalproperty_kind kind);
-
-
-void
-icalcomponent_add_component (icalcomponent* parent, icalcomponent* child)
-{
-    struct icalcomponent_impl *impl, *cimpl;
-
-    icalerror_check_arg_rv( (parent!=0), "parent");
-    icalerror_check_arg_rv( (child!=0), "child");
-    
-    impl = (struct icalcomponent_impl*)parent;
-    cimpl = (struct icalcomponent_impl*)child;
-
-    icalerror_assert( (cimpl->parent ==0),"The child component has already been added to a parent component. Remove the component with icalcomponent_remove_component before calling icalcomponent_add_component");
-
-    cimpl->parent = parent;
-
-    pvl_push(impl->components,child);
-}
-
-
-void
-icalcomponent_remove_component (icalcomponent* parent, icalcomponent* child)
-{
-   struct icalcomponent_impl *impl,*cimpl;
-   pvl_elem itr, next_itr;
-
-   icalerror_check_arg_rv( (parent!=0), "parent");
-   icalerror_check_arg_rv( (child!=0), "child");
-   
-   impl = (struct icalcomponent_impl*)parent;
-   cimpl = (struct icalcomponent_impl*)child;
-   
-   for( itr = pvl_head(impl->components);
-	itr != 0;
-	itr = next_itr)
-   {
-       next_itr = pvl_next(itr);
-       
-       if( pvl_data(itr) == (void*)child ){
-
-	   if (impl->component_iterator == itr){
-	       /* Don't let the current iterator become invalid */
-
-	       /* HACK. The semantics for this are troubling. */
-	       impl->component_iterator = 
-		   pvl_next(impl->component_iterator);
-	          
-	   }
-	   pvl_remove( impl->components, itr); 
-	   cimpl->parent = 0;
-	   break;
-       }
-   }	
-}
-
-
-int
-icalcomponent_count_components (icalcomponent* component, 
-				icalcomponent_kind kind)
-{
-    int count=0;
-    pvl_elem itr;
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    for( itr = pvl_head(impl->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	if(kind == icalcomponent_isa((icalcomponent*)pvl_data(itr)) ||
-	    kind == ICAL_ANY_COMPONENT){
-	    count++;
-	}
-    }
-
-    return count;
-}
-
-icalcomponent*
-icalcomponent_get_current_component(icalcomponent* component)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-   icalerror_check_arg_rz( (component!=0),"component");
-
-   if (c->component_iterator == 0){
-       return 0;
-   }
-
-   return (icalcomponent*) pvl_data(c->component_iterator);
-}
-
-icalcomponent*
-icalcomponent_get_first_component (icalcomponent* component, 
-				   icalcomponent_kind kind)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-   icalerror_check_arg_rz( (component!=0),"component");
-  
-   for( c->component_iterator = pvl_head(c->components);
-	c->component_iterator != 0;
-	c->component_iterator = pvl_next(c->component_iterator)) {
-	    
-       icalcomponent *p =  (icalcomponent*) pvl_data(c->component_iterator);
-	
-	   if (icalcomponent_isa(p) == kind || kind == ICAL_ANY_COMPONENT) {
-	       
-	       return p;
-	   }
-   }
-
-   return 0;
-}
-
-
-icalcomponent*
-icalcomponent_get_next_component (icalcomponent* component, icalcomponent_kind kind)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-   icalerror_check_arg_rz( (component!=0),"component");
-  
-   if (c->component_iterator == 0){
-       return 0;
-   }
-
-   for( c->component_iterator = pvl_next(c->component_iterator);
-	c->component_iterator != 0;
-	c->component_iterator = pvl_next(c->component_iterator)) {
-	    
-       icalcomponent *p =  (icalcomponent*) pvl_data(c->component_iterator);
-	
-	   if (icalcomponent_isa(p) == kind || kind == ICAL_ANY_COMPONENT) {
-	       
-	       return p;
-	   }
-   }
-
-   return 0;
-}
-
-icalcomponent* icalcomponent_get_first_real_component(icalcomponent *c)
-{
-    icalcomponent *comp;
-
-    for(comp = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT);
-	comp != 0;
-	comp = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-
-	icalcomponent_kind kind = icalcomponent_isa(comp);
-
-	if(kind == ICAL_VEVENT_COMPONENT ||
-	   kind == ICAL_VTODO_COMPONENT ||
-	   kind == ICAL_VJOURNAL_COMPONENT ){
-	    return comp;
-	}
-    }
-    return 0;
-}
-
-time_t icalcomponent_convert_time(icalproperty *p)
-{
-    struct icaltimetype sict;
-    time_t convt;
-    icalproperty *tzp;
-        
-
-    /* Though it says _dtstart, it will work for dtend too */
-    sict = icalproperty_get_dtstart(p);
-
-    tzp = icalproperty_get_first_parameter(p,ICAL_TZID_PARAMETER);
-
-    if (sict.is_utc == 1 && tzp != 0){
-	icalerror_warn("icalcomponent_get_span: component has a UTC DTSTART with a timezone specified ");
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0; 
-    }
-
-    if(sict.is_utc == 1){
-	/* _as_timet will use gmtime() to do the conversion */
-	convt = icaltime_as_timet(sict);
-
-#ifdef TEST_CONVERT_TIME
-	printf("convert time: use as_timet:\n %s\n %s",
-	       icalproperty_as_ical_string(p), ctime(&convt));
-#endif
-
-    } else if (sict.is_utc == 0 && tzp == 0 ) {
-	time_t offset;
-
-	/* _as_timet will use localtime() to do the conversion */
-	convt = icaltime_as_timet(sict);
-	offset = icaltime_utc_offset(sict,0);
-	convt += offset;
-
-#ifdef TEST_CONVERT_TIME
-	printf("convert time: use as_timet and adjust:\n %s\n %s",
-	       icalproperty_as_ical_string(p), ctime(&convt));
-#endif
-    } else {
-	/* Convert the time to UTC for the named timezone*/
-	const char* timezone = icalparameter_get_tzid(tzp);
-	convt = icaltime_as_timet(icaltime_as_utc(sict,timezone));
-
-#ifdef TEST_CONVERT_TIME
-	printf("convert time: use _as_utc:\n %s\n %s",
-	       icalproperty_as_ical_string(p), ctime(&convt));
-#endif
-    }	    
-
-    return convt;
-}
-struct icaltime_span icalcomponent_get_span(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalproperty *p, *duration;
-    icalcomponent_kind kind;
-    struct icaltime_span span;
-    struct icaltimetype start;
-
-    span.start = 0;
-    span.end = 0;
-    span.is_busy= 1;
-
-    /* initial Error checking */
-
-/*    icalerror_check_arg_rz( (comp!=0),"comp");*/
-
-    kind  = icalcomponent_isa(comp);
-
-    if(kind == ICAL_VCALENDAR_COMPONENT){
-	inner = icalcomponent_get_first_real_component(comp);
-
-	/* Maybe there is a VTIMEZONE in there */
-	if (inner == 0){
-	    inner = icalcomponent_get_first_component(comp,
-			       ICAL_VTIMEZONE_COMPONENT);
-	}
-
-    } else {
-	inner = comp;
-    }
-
-    if (inner == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: no component specified, or empty VCALENDAR component");*/
-	return span; 
-    }
-    
-    kind  = icalcomponent_isa(inner);
-
-    if( !( kind == ICAL_VEVENT_COMPONENT ||
-	   kind == ICAL_VJOURNAL_COMPONENT ||
-	   kind == ICAL_VTODO_COMPONENT ||	   
-	   kind == ICAL_VFREEBUSY_COMPONENT )) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: no component specified, or empty VCALENDAR component");*/
-	return span; 
-	
-    }
-
-
-
-    /* Get to work. starting with DTSTART */
-
-    p = icalcomponent_get_first_property(inner, ICAL_DTSTART_PROPERTY);
-
-    if (p ==0 ) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: component has no DTSTART time");*/
-	return span; 
-    }
-
-
-    start = icalproperty_get_dtstart(p);
-
-    icalerror_clear_errno();
-
-    span.start = icalcomponent_convert_time(p);
-
-#ifdef TEST_CONVERT_TIME
-    printf("convert time:\n %s %s",
-	   icalproperty_as_ical_string(p), ctime(&span.start));
-#endif
-
-    if(icalerrno != ICAL_NO_ERROR){
-	span.start = 0;
-	return span;
-    }
-
-    /* The end time could be specified as either a DTEND or a DURATION */
-    p = icalcomponent_get_first_property(inner, ICAL_DTEND_PROPERTY);
-    duration = icalcomponent_get_first_property(inner, ICAL_DURATION_PROPERTY);
-
-    if (p==0 && duration == 0 && start.is_date != 1) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: component has neither DTEND nor DURATION time");*/
-	span.start = 0;
-	return span; 
-    } 
-
-    if (p!=0){
-	span.end = icalcomponent_convert_time(p);
-    } else if (start.is_date == 1) {
-	/* Duration is all day */
-	span.end = span.start + 60*60*24;
-    } else {
-	/* Use the duration */
-	struct icaldurationtype dur;
-	time_t durt;
-	
-	
-	dur = icalproperty_get_duration(duration);
-
-	durt = icaldurationtype_as_int(dur);
-	span.end = span.start+durt;
-    }
-
-    return span;
-
-}
-
-
-int icalcomponent_count_errors(icalcomponent* component)
-{
-    int errors = 0;
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr;
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-
-    for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    errors++;
-	}
-    }
-
-
-    for( itr = pvl_head(impl->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	
-	errors += icalcomponent_count_errors(c);
-	
-    }
-
-    return errors;
-}
-
-
-void icalcomponent_strip_errors(icalcomponent* component)
-{
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr, next_itr;
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-
-   for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = next_itr)
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	next_itr = pvl_next(itr);
-
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    icalcomponent_remove_property(component,p);
-	}
-    }
-    
-    for( itr = pvl_head(impl->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	icalcomponent_strip_errors(c);
-    }
-}
-
-/* Hack. This will change the state of the iterators */
-void icalcomponent_convert_errors(icalcomponent* component)
-{
-    icalproperty *p, *next_p;
-    icalcomponent *c;
-
-    for(p = icalcomponent_get_first_property(component,ICAL_ANY_PROPERTY);
-	p != 0;
-	p = next_p){
-	
-	next_p = icalcomponent_get_next_property(component,ICAL_ANY_PROPERTY);
-
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    struct icalreqstattype rst;
-	    icalparameter *param  = icalproperty_get_first_parameter
-		(p,ICAL_XLICERRORTYPE_PARAMETER);
-
-	    rst.code = ICAL_UNKNOWN_STATUS;
-	    rst.desc = 0;
-
-	    switch(icalparameter_get_xlicerrortype(param)){
-
-		case  ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR: {
-		    rst.code = ICAL_3_2_INVPARAM_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR: {
-		    rst.code = ICAL_3_3_INVPARAMVAL_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_PROPERTYPARSEERROR: {		    
-		    rst.code = ICAL_3_0_INVPROPNAME_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_VALUEPARSEERROR: {
-		    rst.code = ICAL_3_1_INVPROPVAL_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_COMPONENTPARSEERROR: {
-		    rst.code = ICAL_3_4_INVCOMP_STATUS;
-		    break;
-		}
-
-		default: {
-		}
-	    }
-	    if (rst.code != ICAL_UNKNOWN_STATUS){
-		
-		rst.debug = icalproperty_get_xlicerror(p);
-		icalcomponent_add_property(component,
-					   icalproperty_new_requeststatus(
-					       icalreqstattype_as_string(rst)
-					       )
-		    );
-		
-		icalcomponent_remove_property(component,p);
-	    }
-	}
-    }
-
-    for(c = icalcomponent_get_first_component(component,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(component,ICAL_ANY_COMPONENT)){
-	
-	icalcomponent_convert_errors(c);
-    }
-}
-
-
-icalcomponent* icalcomponent_get_parent(icalcomponent* component)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-   return c->parent;
-}
-
-void icalcomponent_set_parent(icalcomponent* component, icalcomponent* parent)
-{
-   struct icalcomponent_impl *c = (struct icalcomponent_impl*)component;
-
-   c->parent = parent;
-}
-
-icalcompiter icalcompiter_null = {ICAL_NO_COMPONENT,0};
-
-icalcompiter 
-icalcomponent_begin_component(icalcomponent* component,icalcomponent_kind kind)
-{
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-    icalcompiter itr;
-    pvl_elem i;
-
-    itr.kind = kind;
-
-    icalerror_check_arg_re( (component!=0),"component",icalcompiter_null);
-
-    for( i = pvl_head(impl->components); i != 0; i = pvl_next(itr.iter)) {
-	
-	icalcomponent *c =  (icalcomponent*) pvl_data(i);
-	
-	if (icalcomponent_isa(c) == kind || kind == ICAL_ANY_COMPONENT) {
-	    
-	    itr.iter = i;
-
-	    return itr;
-	}
-    }
-
-    return icalcompiter_null;
-}
-
-icalcompiter
-icalcomponent_end_component(icalcomponent* component,icalcomponent_kind kind)
-{
-    struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
-    icalcompiter itr; 
-    pvl_elem i;
-
-    itr.kind = kind;
-
-    icalerror_check_arg_re( (component!=0),"component",icalcompiter_null);
-
-    for( i = pvl_tail(impl->components); i != 0; i = pvl_prior(i)) {
-	
-	icalcomponent *c =  (icalcomponent*) pvl_data(i);
-	
-	if (icalcomponent_isa(c) == kind || kind == ICAL_ANY_COMPONENT) {
-	    
-	    itr.iter = pvl_next(i);
-
-	    return itr;
-	}
-    }
-
-    return icalcompiter_null;;
-}
-
-
-icalcomponent* icalcompiter_next(icalcompiter* i)
-{
-   if (i->iter == 0){
-       return 0;
-   }
-
-   icalerror_check_arg_rz( (i!=0),"i");
-
-   for( i->iter = pvl_next(i->iter);
-	i->iter != 0;
-	i->iter = pvl_next(i->iter)) {
-	    
-       icalcomponent *c =  (icalcomponent*) pvl_data(i->iter);
-	
-	   if (icalcomponent_isa(c) == i->kind 
-	       || i->kind == ICAL_ANY_COMPONENT) {
-	       
-	       return icalcompiter_deref(i);;
-	   }
-   }
-
-   return 0;
-
-}
-
-icalcomponent* icalcompiter_prior(icalcompiter* i)
-{
-   if (i->iter == 0){
-       return 0;
-   }
-
-   for( i->iter = pvl_prior(i->iter);
-	i->iter != 0;
-	i->iter = pvl_prior(i->iter)) {
-	    
-       icalcomponent *c =  (icalcomponent*) pvl_data(i->iter);
-	
-	   if (icalcomponent_isa(c) == i->kind 
-	       || i->kind == ICAL_ANY_COMPONENT) {
-	       
-	       return icalcompiter_deref(i);;
-	   }
-   }
-
-   return 0;
-
-}
-icalcomponent* icalcompiter_deref(icalcompiter* i)
-{
-    if(i->iter ==0){
-	return 0;
-    }
-
-    return pvl_data(i->iter);
-}
-
-icalcomponent* icalcomponent_get_inner(icalcomponent* comp)
-{
-    if (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT){
-	return icalcomponent_get_first_real_component(comp);
-    } else {
-	return comp;
-    }
-}
-
-
-void icalcomponent_set_dtstart(icalcomponent* comp, struct icaltimetype v)
-{
-
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner, ICAL_DTSTART_PROPERTY);
-
-
-    if (prop == 0){
-	prop = icalproperty_new_dtstart(v);
-	icalcomponent_add_property(inner, prop);
-    }
-    
-    icalproperty_set_dtstart(prop,v);
-
-}
-
-
-struct icaltimetype icalcomponent_get_dtstart(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-
-    if (prop == 0){
-	return icaltime_null_time();
-    }
-    
-    return icalproperty_get_dtstart(prop);
-}
-
-
-struct icaltimetype icalcomponent_get_dtend(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner, ICAL_DURATION_PROPERTY);
-
-
-    if( end_prop == 0 && dur_prop == 0){
-	return icaltime_null_time();
-    } else if ( end_prop != 0) {
-	return icalproperty_get_dtend(end_prop);
-    } else if ( dur_prop != 0) { 
-	
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-	struct icaldurationtype duration = 
-	    icalproperty_get_duration(dur_prop);
-	
-	struct icaltimetype end = icaltime_add(start,duration);
-
-	return end;
-
-    } else {
-	/* Error, both duration and dtend have been specified */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return icaltime_null_time();
-
-    }
-    
-}
-
-
-void icalcomponent_set_dtend(icalcomponent* comp, struct icaltimetype v)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY);
-
-
-    if( end_prop == 0 && dur_prop == 0){
-	end_prop = icalproperty_new_dtend(v);
-	icalcomponent_add_property(inner,end_prop);
-    } else if ( end_prop != 0) {
-	icalproperty_set_dtend(end_prop,v);
-    } else if ( dur_prop != 0) { 
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-
-	struct icaltimetype end = 
-	    icalcomponent_get_dtend(inner);
-
-	struct icaldurationtype dur 
-	    = icaltime_subtract(end,start);
-
-	icalproperty_set_duration(dur_prop,dur);
-
-    } else {
-	/* Error, both duration and dtend have been specified */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    }
-}
-
-void icalcomponent_set_duration(icalcomponent* comp, 
-				struct icaldurationtype v)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY);
-
-
-    if( end_prop == 0 && dur_prop == 0){
-	dur_prop = icalproperty_new_duration(v);
-	icalcomponent_add_property(inner, dur_prop);
-    } else if ( end_prop != 0) {
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-	
-	struct icaltimetype new_end = icaltime_add(start,v);
-
-	icalproperty_set_dtend(end_prop,new_end);
-
-    } else if ( dur_prop != 0) { 
-	icalproperty_set_duration(dur_prop,v);
-    } else {
-	/* Error, both duration and dtend have been specified */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    }
-}
-
-struct icaldurationtype icalcomponent_get_duration(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY);
-
-    struct icaldurationtype null_duration;
-    memset(&null_duration,0,sizeof(struct icaldurationtype));
-
-
-    if( end_prop == 0 && dur_prop == 0){
-	return null_duration;
-    } else if ( end_prop != 0) {
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-	time_t startt = icaltime_as_timet(start);
-
-	struct icaltimetype end = 
-	    icalcomponent_get_dtend(inner);
-	time_t endt = icaltime_as_timet(end);
-	
-	return icaldurationtype_from_int(endt-startt);
-    } else if ( dur_prop != 0) { 
-	return icalproperty_get_duration(dur_prop);
-    } else {
-	/* Error, both duration and dtend have been specified */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return null_duration;
-    }
-}
-
-void icalcomponent_set_method(icalcomponent* comp, icalproperty_method method)
-{
-    icalproperty *prop 
-	= icalcomponent_get_first_property(comp, ICAL_METHOD_PROPERTY);
-
-
-    if (prop == 0){
-	prop = icalproperty_new_method(method);
-	icalcomponent_add_property(comp, prop);
-    }
-    
-    icalproperty_set_method(prop,method);
-
-}
-
-icalproperty_method icalcomponent_get_method(icalcomponent* comp)
-{
-    icalproperty *prop 
-	= icalcomponent_get_first_property(comp,ICAL_METHOD_PROPERTY);
-
-    if (prop == 0){
-	return ICAL_METHOD_NONE;
-    }
-    
-    return icalproperty_get_method(prop);
-}
-
-void icalcomponent_set_dtstamp(icalcomponent* comp, struct icaltimetype v)
-{
-
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner, ICAL_DTSTAMP_PROPERTY);
-
-
-    if (prop == 0){
-	prop = icalproperty_new_dtstamp(v);
-	icalcomponent_add_property(inner, prop);
-    }
-    
-    icalproperty_set_dtstamp(prop,v);
-
-}
-
-
-struct icaltimetype icalcomponent_get_dtstamp(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
-
-    if (prop == 0){
-	return icaltime_null_time();
-    }
-    
-    return icalproperty_get_dtstamp(prop);
-}
-
-
-void icalcomponent_set_summary(icalcomponent* comp, const char* v)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner, ICAL_SUMMARY_PROPERTY);
-
-    if (prop == 0){
-	prop = icalproperty_new_summary(v);
-	icalcomponent_add_property(inner, prop);
-    }
-    
-    icalproperty_set_summary(prop,v);
-}
-
-
-const char* icalcomponent_get_summary(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner,ICAL_SUMMARY_PROPERTY);
-
-    if (prop == 0){
-	return 0;
-    }
-    
-    return icalproperty_get_summary(prop);
-
-}
-
-void icalcomponent_set_comment(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_comment(icalcomponent* comp);
-
-void icalcomponent_set_organizer(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_organizer(icalcomponent* comp);
-
-void icalcomponent_set_uid(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_uid(icalcomponent* comp);
-
-void icalcomponent_set_recurrenceid(icalcomponent* comp, 
-				    struct icaltimetype v);
-struct icaltimetype icalcomponent_get_recurrenceid(icalcomponent* comp);
-
-
-
-
-icalcomponent* icalcomponent_new_vcalendar()
-{
-    return icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vevent()
-{
-    return icalcomponent_new(ICAL_VEVENT_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vtodo()
-{
-    return icalcomponent_new(ICAL_VTODO_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vjournal()
-{
-    return icalcomponent_new(ICAL_VJOURNAL_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vfreebusy()
-{
-    return icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vtimezone()
-{
-    return icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
-}
-icalcomponent* icalcomponent_new_xstandard()
-{
-    return icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-}
-icalcomponent* icalcomponent_new_xdaylight()
-{
-    return icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-}
diff --git a/libical/src/libical/icalcomponent.h b/libical/src/libical/icalcomponent.h
deleted file mode 100644
index 61f4bf0dbf..0000000000
--- a/libical/src/libical/icalcomponent.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcomponent.h
- CREATOR: eric 20 March 1999
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcomponent.h
-
-======================================================================*/
-
-#ifndef ICALCOMPONENT_H
-#define ICALCOMPONENT_H
-
-#include "icalproperty.h"
-#include "icalvalue.h"
-#include "icalenums.h" /* defines icalcomponent_kind */
-#include "pvl.h"
-
-typedef void icalcomponent;
-
-/* This is exposed so that callers will not have to allocate and
-   deallocate iterators. Pretend that you can't see it. */
-typedef struct icalcompiter
-{
-	icalcomponent_kind kind;
-	pvl_elem iter;
-
-} icalcompiter;
-
-icalcomponent* icalcomponent_new(icalcomponent_kind kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-icalcomponent* icalcomponent_vanew(icalcomponent_kind kind, ...);
-void icalcomponent_free(icalcomponent* component);
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-int icalcomponent_is_valid(icalcomponent* component);
-
-icalcomponent_kind icalcomponent_isa(icalcomponent* component);
-
-int icalcomponent_isa_component (void* component);
-
-/* 
- * Working with properties
- */
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-int icalcomponent_count_properties(icalcomponent* component,
-				   icalproperty_kind kind);
-
-/* Iterate through the properties */
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      icalproperty_kind kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      icalproperty_kind kind);
-
-/* Return a null-terminated array of icalproperties*/
-
-icalproperty** icalcomponent_get_properties(icalcomponent* component,
-					      icalproperty_kind kind);
-
-
-/* 
- * Working with components
- */ 
-
-
-/* Return the first VEVENT, VTODO or VJOURNAL sub-component of cop, or
-   comp if it is one of those types */
-
-icalcomponent* icalcomponent_get_inner(icalcomponent* comp);
-
-
-void icalcomponent_add_component(icalcomponent* parent,
-				icalcomponent* child);
-
-void icalcomponent_remove_component(icalcomponent* parent,
-				icalcomponent* child);
-
-int icalcomponent_count_components(icalcomponent* component,
-				   icalcomponent_kind kind);
-
-/* Iteration Routines. There are two forms of iterators, internal and
-external. The internal ones came first, and are almost completely
-sufficient, but they fail badly when you want to construct a loop that
-removes components from the container.
-
-The internal iterators are deprecated. */
-
-/* Using external iterators */
-icalcompiter icalcomponent_begin_component(icalcomponent* component,
-					   icalcomponent_kind kind);
-
-icalcompiter icalcomponent_end_component(icalcomponent* component,
-					 icalcomponent_kind kind);
-
-/* Iterate through components */
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-
-
-
-
-/* Working with embedded error properties */
-
-int icalcomponent_count_errors(icalcomponent* component);
-
-/* Remove all X-LIC-ERROR properties*/
-void icalcomponent_strip_errors(icalcomponent* component);
-
-/* Convert some X-LIC-ERROR properties into RETURN-STATUS properties*/
-void icalcomponent_convert_errors(icalcomponent* component);
-
-/* Internal operations. You don't see these... */
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-void icalcomponent_set_parent(icalcomponent* component, 
-			      icalcomponent* parent);
-/* External component iterator */
-icalcomponent* icalcompiter_next(icalcompiter* i);
-icalcomponent* icalcompiter_prior(icalcompiter* i);
-icalcomponent* icalcompiter_deref(icalcompiter* i);
-
-/************* Derived class methods.  ****************************
-
-If the code was in an OO language, the remaining routines would be
-members of classes derived from icalcomponent. Don't call them on the
-wrong component subtypes. */
-
-/* For VCOMPONENT: Return a reference to the first VEVENT, VTODO or
-   VJOURNAL */
-icalcomponent* icalcomponent_get_first_real_component(icalcomponent *c);
-
-/* For VEVENT, VTODO, VJOURNAL and VTIMEZONE: report the start and end
-   times of an event in UTC */
-struct icaltime_span icalcomponent_get_span(icalcomponent* comp);
-
-/******************** Convienience routines **********************/
-
-void icalcomponent_set_dtstart(icalcomponent* comp, struct icaltimetype v);
-struct icaltimetype icalcomponent_get_dtstart(icalcomponent* comp);
-
-/* For the icalcomponent routines only, dtend and duration are tied
-   together. If you call the set routine for one and the other exists,
-   the routine will calculate the change to the other. That is, if
-   there is a DTEND and you call set_duration, the routine will modify
-   DTEND to be the sum of DTSTART and the duration. If you call a get
-   routine for one and the other exists, the routine will calculate
-   the return value. If you call a set routine and neither exists, the
-   routine will create the apcompriate comperty */
-
-
-struct icaltimetype icalcomponent_get_dtend(icalcomponent* comp);
-void icalcomponent_set_dtend(icalcomponent* comp, struct icaltimetype v);
-
-void icalcomponent_set_duration(icalcomponent* comp, 
-				struct icaldurationtype v);
-struct icaldurationtype icalcomponent_get_duration(icalcomponent* comp);
-
-void icalcomponent_set_method(icalcomponent* comp, icalproperty_method method);
-icalproperty_method icalcomponent_get_method(icalcomponent* comp);
-
-struct icaltimetype icalcomponent_get_dtstamp(icalcomponent* comp);
-void icalcomponent_set_dtstamp(icalcomponent* comp, struct icaltimetype v);
-
-
-void icalcomponent_set_summary(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_summary(icalcomponent* comp);
-
-void icalcomponent_set_comment(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_comment(icalcomponent* comp);
-
-void icalcomponent_set_organizer(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_organizer(icalcomponent* comp);
-
-void icalcomponent_set_uid(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_uid(icalcomponent* comp);
-
-void icalcomponent_set_recurrenceid(icalcomponent* comp, 
-				    struct icaltimetype v);
-struct icaltimetype icalcomponent_get_recurrenceid(icalcomponent* comp);
-
-/*************** Type Specific routines ***************/
-
-icalcomponent* icalcomponent_new_vcalendar();
-icalcomponent* icalcomponent_new_vevent();
-icalcomponent* icalcomponent_new_vtodo();
-icalcomponent* icalcomponent_new_vjournal();
-icalcomponent* icalcomponent_new_vfreebusy();
-icalcomponent* icalcomponent_new_vtimezone();
-icalcomponent* icalcomponent_new_xstandard();
-icalcomponent* icalcomponent_new_xdaylight();
-
-
-
-#endif /* !ICALCOMPONENT_H */
-
-
-
diff --git a/libical/src/libical/icalenums.c b/libical/src/libical/icalenums.c
deleted file mode 100644
index 78ca5d7ebe..0000000000
--- a/libical/src/libical/icalenums.c
+++ /dev/null
@@ -1,631 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalenum.c
-  CREATOR: eric 29 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalenum.c
-
-  ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalenums.h"
-
-#include <stdio.h> /* For fprintf */
-#include <stdio.h> /* For stderr */
-#include <string.h> /* For strncmp */
-#include <assert.h>
-
-struct icalproperty_kind_map {
-	icalproperty_kind kind;
-	const char *name;
-};
-
-static struct icalproperty_kind_map property_map[] = 
-{
-    { ICAL_ANY_PROPERTY, "ANY"},
-    { ICAL_ACTION_PROPERTY, "ACTION"},
-    { ICAL_ATTACH_PROPERTY, "ATTACH"},
-    { ICAL_ATTENDEE_PROPERTY, "ATTENDEE"},
-    { ICAL_CALSCALE_PROPERTY, "CALSCALE"},
-    { ICAL_CATEGORIES_PROPERTY, "CATEGORIES"},
-    { ICAL_CLASS_PROPERTY, "CLASS"},
-    { ICAL_COMMENT_PROPERTY, "COMMENT"},
-    { ICAL_COMPLETED_PROPERTY, "COMPLETED"},
-    { ICAL_CONTACT_PROPERTY, "CONTACT"},
-    { ICAL_CREATED_PROPERTY, "CREATED"},
-    { ICAL_DESCRIPTION_PROPERTY, "DESCRIPTION"},
-    { ICAL_DTEND_PROPERTY, "DTEND"},
-    { ICAL_DTSTAMP_PROPERTY, "DTSTAMP"},
-    { ICAL_DTSTART_PROPERTY, "DTSTART"},
-    { ICAL_DUE_PROPERTY, "DUE"},
-    { ICAL_DURATION_PROPERTY, "DURATION"},
-    { ICAL_EXDATE_PROPERTY, "EXDATE"},
-    { ICAL_EXRULE_PROPERTY, "EXRULE"},
-    { ICAL_FREEBUSY_PROPERTY, "FREEBUSY"},
-    { ICAL_GEO_PROPERTY, "GEO"},
-    { ICAL_LASTMODIFIED_PROPERTY, "LAST-MODIFIED"},
-    { ICAL_LOCATION_PROPERTY, "LOCATION"},
-    { ICAL_METHOD_PROPERTY, "METHOD"},
-    { ICAL_ORGANIZER_PROPERTY, "ORGANIZER"},
-    { ICAL_PERCENTCOMPLETE_PROPERTY, "PERCENT-COMPLETE"},
-    { ICAL_PRIORITY_PROPERTY, "PRIORITY"},
-    { ICAL_PRODID_PROPERTY, "PRODID"},
-    { ICAL_RDATE_PROPERTY, "RDATE"},
-    { ICAL_RECURRENCEID_PROPERTY, "RECURRENCE-ID"},
-    { ICAL_RELATEDTO_PROPERTY, "RELATED-TO"},
-    { ICAL_REPEAT_PROPERTY, "REPEAT"},
-    { ICAL_REQUESTSTATUS_PROPERTY, "REQUEST-STATUS"},
-    { ICAL_RESOURCES_PROPERTY, "RESOURCES"},
-    { ICAL_RRULE_PROPERTY, "RRULE"},
-    { ICAL_SEQUENCE_PROPERTY, "SEQUENCE"},
-    { ICAL_STATUS_PROPERTY, "STATUS"},
-    { ICAL_SUMMARY_PROPERTY, "SUMMARY"},
-    { ICAL_TRANSP_PROPERTY, "TRANSP"},
-    { ICAL_TRIGGER_PROPERTY, "TRIGGER"},
-    { ICAL_TZID_PROPERTY, "TZID"},
-    { ICAL_TZNAME_PROPERTY, "TZNAME"},
-    { ICAL_TZOFFSETFROM_PROPERTY, "TZOFFSETFROM"},
-    { ICAL_TZOFFSETTO_PROPERTY, "TZOFFSETTO"},
-    { ICAL_TZURL_PROPERTY, "TZURL"},
-    { ICAL_UID_PROPERTY, "UID"},
-    { ICAL_URL_PROPERTY, "URL"},
-    { ICAL_VERSION_PROPERTY, "VERSION"},
-    { ICAL_X_PROPERTY,"X_PROPERTY"},
-
-    /* CAP Object Properties */
-
-    { ICAL_SCOPE_PROPERTY, "SCOPE"},
-    { ICAL_MAXRESULTS_PROPERTY, "MAXRESULTS"},
-    { ICAL_MAXRESULTSSIZE_PROPERTY, "MAXRESULTSSIZE"},
-    { ICAL_QUERY_PROPERTY, "QUERY" },
-    { ICAL_QUERYNAME_PROPERTY, "QUERYNAME" },
-    { ICAL_TARGET_PROPERTY, "TARGET"},
-
-    /* libical private properties */
-    { ICAL_XLICERROR_PROPERTY,"X-LIC-ERROR"},
-    { ICAL_XLICMIMECONTENTTYPE_PROPERTY,"X-LIC-MIME-CONTENT-TYPE"},
-    { ICAL_XLICMIMEENCODING_PROPERTY,"X-LIC-MIME-ENCODING"},
-    { ICAL_XLICMIMEOPTINFO_PROPERTY,"X-LIC-MIME-OPT-INFO"},
-    { ICAL_XLICMIMECHARSET_PROPERTY,"X-LIC-MIME-CHARSET"},
-    { ICAL_XLICCLUSTERCOUNT_PROPERTY,"X-LIC-CLUSTERCOUNT"},
-
-    /* End of the list */
-    { ICAL_NO_PROPERTY, ""}
-};
-
-
-const char* icalenum_property_kind_to_string(icalproperty_kind kind)
-{
-    int i;
-
-    for (i=0; property_map[i].kind != ICAL_NO_PROPERTY; i++) {
-	if (property_map[i].kind == kind) {
-	    return property_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalproperty_kind icalenum_string_to_property_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_PROPERTY;
-    }
-
-
-    for (i=0; property_map[i].kind  != ICAL_NO_PROPERTY; i++) {
-	if (strcmp(property_map[i].name, string) == 0) {
-	    return property_map[i].kind;
-	}
-    }
-
-    if(strncmp(string,"X-",2)==0){
-	return ICAL_X_PROPERTY;
-    }
-
-
-    return ICAL_NO_PROPERTY;
-}
-
-
-
-
-struct icalparameter_kind_map {
-	icalparameter_kind kind;
-	char name[20];
-};
-
-static struct icalparameter_kind_map parameter_map[] = 
-{
-    { ICAL_ALTREP_PARAMETER, "ALTREP"},
-    { ICAL_CN_PARAMETER, "CN"},
-    { ICAL_CUTYPE_PARAMETER, "CUTYPE"},
-    { ICAL_DELEGATEDFROM_PARAMETER, "DELEGATED-FROM"},
-    { ICAL_DELEGATEDTO_PARAMETER, "DELEGATED-TO"},
-    { ICAL_DIR_PARAMETER, "DIR"},
-    { ICAL_ENCODING_PARAMETER, "ENCODING"},
-    { ICAL_FBTYPE_PARAMETER, "FBTYPE"},
-    { ICAL_FMTTYPE_PARAMETER, "FMTTYPE"},
-    { ICAL_LANGUAGE_PARAMETER, "LANGUAGE"},
-    { ICAL_MEMBER_PARAMETER, "MEMBER"},
-    { ICAL_PARTSTAT_PARAMETER, "PARTSTAT"},
-    { ICAL_RANGE_PARAMETER, "RANGE"},
-    { ICAL_RELATED_PARAMETER, "RELATED"},
-    { ICAL_RELTYPE_PARAMETER, "RELTYPE"},
-    { ICAL_ROLE_PARAMETER, "ROLE"},
-    { ICAL_RSVP_PARAMETER, "RSVP"},
-    { ICAL_SENTBY_PARAMETER, "SENT-BY"},
-    { ICAL_TZID_PARAMETER, "TZID"},
-    { ICAL_VALUE_PARAMETER, "VALUE"},
-    { ICAL_X_PARAMETER, "X"},
-
-    /* CAP parameters */
-
-    /* libical private parameters */
-    { ICAL_XLICERRORTYPE_PARAMETER, "X-LIC-ERRORTYPE"},
-    { ICAL_XLICCOMPARETYPE_PARAMETER, "X-LIC-COMPARETYPE"},
-
-    /* End of list */
-    { ICAL_NO_PARAMETER, ""}
-};
-
-const char* icalenum_parameter_kind_to_string(icalparameter_kind kind)
-{
-    int i;
-
-    for (i=0; parameter_map[i].kind != ICAL_NO_PARAMETER; i++) {
-	if (parameter_map[i].kind == kind) {
-	    return parameter_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalparameter_kind icalenum_string_to_parameter_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_PARAMETER;
-    }
-
-    for (i=0; parameter_map[i].kind  != ICAL_NO_PARAMETER; i++) {
-	if (strcmp(parameter_map[i].name, string) == 0) {
-	    return parameter_map[i].kind;
-	}
-    }
-
-    if(strncmp(string,"X-",2)==0){
-	return ICAL_X_PARAMETER;
-    }
-
-    return ICAL_NO_PARAMETER;
-}
-
-struct icalvalue_kind_map {
-	icalvalue_kind kind;
-	char name[20];
-};
-
-static struct icalvalue_kind_map value_map[] = 
-{
-    { ICAL_BINARY_VALUE, "BINARY"},
-    { ICAL_BOOLEAN_VALUE, "BOOLEAN"},
-    { ICAL_CALADDRESS_VALUE, "CAL-ADDRESS"},
-    { ICAL_DATE_VALUE, "DATE"},
-    { ICAL_DATETIME_VALUE, "DATE-TIME"},
-    { ICAL_DURATION_VALUE, "DURATION"},
-    { ICAL_FLOAT_VALUE, "FLOAT"},
-    { ICAL_INTEGER_VALUE, "INTEGER"},
-    { ICAL_PERIOD_VALUE, "PERIOD"},
-    { ICAL_RECUR_VALUE, "RECUR"},
-    { ICAL_TEXT_VALUE, "TEXT"},
-    { ICAL_TIME_VALUE, "TIME"},
-    { ICAL_URI_VALUE, "URI"},
-    { ICAL_UTCOFFSET_VALUE, "UTC-OFFSET"},
-    { ICAL_METHOD_VALUE, "METHOD"}, /* Not an RFC2445 type */
-    { ICAL_STATUS_VALUE, "STATUS"}, /* Not an RFC2445 type */
-    { ICAL_GEO_VALUE, "FLOAT"}, /* Not an RFC2445 type */
-    { ICAL_ATTACH_VALUE, "ATTACH"}, /* Not an RFC2445 type */
-    { ICAL_DATETIMEDATE_VALUE, "DATETIMEDATE"}, /* Not an RFC2445 type */
-    { ICAL_DATETIMEPERIOD_VALUE, "DATETIMEPERIOD"}, /* Not an RFC2445 type */
-    { ICAL_TRIGGER_VALUE, "TRIGGER"}, /* Not an RFC2445 type */
-    { ICAL_QUERY_VALUE, "QUERY"},
-    { ICAL_NO_VALUE, ""},
-};
-
-const char* icalenum_value_kind_to_string(icalvalue_kind kind)
-{
-    int i;
-
-    for (i=0; value_map[i].kind != ICAL_NO_VALUE; i++) {
-	if (value_map[i].kind == kind) {
-	    return value_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalvalue_kind icalenum_value_kind_by_prop(icalproperty_kind kind)
-{
-    fprintf(stderr,"icalenum_value_kind_by_prop is not implemented\n");
-    assert(0) ;
-    kind = ICAL_NO_VALUE;
-    return ICAL_NO_VALUE;
-}
-
-
-struct icalcomponent_kind_map {
-	icalcomponent_kind kind;
-	char name[20];
-};
-
-  
-
-static struct icalcomponent_kind_map component_map[] = 
-{
-    { ICAL_VEVENT_COMPONENT, "VEVENT" },
-    { ICAL_VTODO_COMPONENT, "VTODO" },
-    { ICAL_VJOURNAL_COMPONENT, "VJOURNAL" },
-    { ICAL_VCALENDAR_COMPONENT, "VCALENDAR" },
-    { ICAL_VFREEBUSY_COMPONENT, "VFREEBUSY" },
-    { ICAL_VTIMEZONE_COMPONENT, "VTIMEZONE" },
-    { ICAL_VALARM_COMPONENT, "VALARM" },
-    { ICAL_XSTANDARD_COMPONENT, "STANDARD" }, /*These are part of RFC2445 */
-    { ICAL_XDAYLIGHT_COMPONENT, "DAYLIGHT" }, /*but are not really components*/
-    { ICAL_X_COMPONENT, "X" },
-    { ICAL_VSCHEDULE_COMPONENT, "SCHEDULE" },
-
-    /* CAP components */
-    { ICAL_VQUERY_COMPONENT, "VQUERY" },  
-    { ICAL_VCAR_COMPONENT, "VCAR" },  
-    { ICAL_VCOMMAND_COMPONENT, "VCOMMAND" },  
-
-    /* libical private components */
-    { ICAL_XLICINVALID_COMPONENT, "X-LIC-UNKNOWN" },  
-    { ICAL_XLICMIMEPART_COMPONENT, "X-LIC-MIME-PART" },  
-    { ICAL_ANY_COMPONENT, "ANY" },  
-    { ICAL_XROOT_COMPONENT, "XROOT" },  
-
-    /* End of list */
-    { ICAL_NO_COMPONENT, "" },
-};
-
-const char* icalenum_component_kind_to_string(icalcomponent_kind kind)
-{
-    int i;
-
-    for (i=0; component_map[i].kind != ICAL_NO_COMPONENT; i++) {
-	if (component_map[i].kind == kind) {
-	    return component_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalcomponent_kind icalenum_string_to_component_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_COMPONENT;
-    }
-
-    for (i=0; component_map[i].kind  != ICAL_NO_COMPONENT; i++) {
-	if (strcmp(component_map[i].name, string) == 0) {
-	    return component_map[i].kind;
-	}
-    }
-
-    return ICAL_NO_COMPONENT;
-}
-
-struct  icalproperty_kind_value_map {
-	icalproperty_kind prop;
-	icalvalue_kind value;
-};
-
-static struct icalproperty_kind_value_map propval_map[] = 
-{
-    { ICAL_CALSCALE_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_METHOD_PROPERTY, ICAL_METHOD_VALUE }, 
-    { ICAL_PRODID_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_VERSION_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_CATEGORIES_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_CLASS_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_COMMENT_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_DESCRIPTION_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_LOCATION_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_PERCENTCOMPLETE_PROPERTY, ICAL_INTEGER_VALUE }, 
-    { ICAL_PRIORITY_PROPERTY, ICAL_INTEGER_VALUE }, 
-    { ICAL_RESOURCES_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_STATUS_PROPERTY, ICAL_STATUS_VALUE }, 
-    { ICAL_SUMMARY_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_COMPLETED_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_FREEBUSY_PROPERTY, ICAL_PERIOD_VALUE }, 
-    { ICAL_TRANSP_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_TZNAME_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_TZOFFSETFROM_PROPERTY, ICAL_UTCOFFSET_VALUE }, 
-    { ICAL_TZOFFSETTO_PROPERTY, ICAL_UTCOFFSET_VALUE }, 
-    { ICAL_TZURL_PROPERTY, ICAL_URI_VALUE }, 
-    { ICAL_TZID_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_ATTENDEE_PROPERTY, ICAL_CALADDRESS_VALUE }, 
-    { ICAL_CONTACT_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_ORGANIZER_PROPERTY, ICAL_CALADDRESS_VALUE }, 
-    { ICAL_RELATEDTO_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_URL_PROPERTY, ICAL_URI_VALUE }, 
-    { ICAL_UID_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_EXRULE_PROPERTY, ICAL_RECUR_VALUE }, 
-    { ICAL_RRULE_PROPERTY, ICAL_RECUR_VALUE }, 
-    { ICAL_ACTION_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_REPEAT_PROPERTY, ICAL_INTEGER_VALUE }, 
-    { ICAL_CREATED_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_DTSTAMP_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_LASTMODIFIED_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_SEQUENCE_PROPERTY, ICAL_INTEGER_VALUE }, 
-    { ICAL_X_PROPERTY, ICAL_TEXT_VALUE }, 
-    { ICAL_REQUESTSTATUS_PROPERTY, ICAL_STRING_VALUE }, 
-    { ICAL_ATTACH_PROPERTY, ICAL_URI_VALUE }, 
-    { ICAL_GEO_PROPERTY, ICAL_GEO_VALUE }, 
-    { ICAL_DTEND_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_DUE_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_DTSTART_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_RECURRENCEID_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_EXDATE_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_RDATE_PROPERTY, ICAL_DATETIME_VALUE }, 
-    { ICAL_TRIGGER_PROPERTY, ICAL_DURATION_VALUE }, 
-    { ICAL_DURATION_PROPERTY, ICAL_DURATION_VALUE }, 
-
-    /* CAP properties */
-    { ICAL_SCOPE_PROPERTY, ICAL_TEXT_VALUE },
-    { ICAL_MAXRESULTS_PROPERTY,  ICAL_INTEGER_VALUE},
-    { ICAL_MAXRESULTSSIZE_PROPERTY,  ICAL_INTEGER_VALUE},
-    { ICAL_QUERY_PROPERTY, ICAL_QUERY_VALUE },
-    { ICAL_QUERYNAME_PROPERTY, ICAL_TEXT_VALUE },
-    { ICAL_TARGET_PROPERTY, ICAL_CALADDRESS_VALUE },
-
-
-    /* libical private properties */
-    { ICAL_XLICERROR_PROPERTY,ICAL_TEXT_VALUE},
-    { ICAL_XLICCLUSTERCOUNT_PROPERTY,ICAL_INTEGER_VALUE},
-
-
-    /* End of list */
-    { ICAL_NO_PROPERTY, ICAL_NO_PROPERTY}
-};
-
-
-icalvalue_kind icalenum_property_kind_to_value_kind(icalproperty_kind kind)
-{
-    int i;
-
-    for (i=0; propval_map[i].value  != ICAL_NO_VALUE; i++) {
-	if ( propval_map[i].prop == kind ) {
-	    return propval_map[i].value;
-	}
-    }
-
-    return ICAL_NO_VALUE;
-}
-
-
-struct {
-	 enum icalrequeststatus kind;
-	int major;
-	int minor;
-	const char* str;
-} request_status_map[] = {
-    {ICAL_2_0_SUCCESS_STATUS, 2,0,"Success."},
-    {ICAL_2_1_FALLBACK_STATUS, 2,1,"Success but fallback taken  on one or more property  values."},
-    {ICAL_2_2_IGPROP_STATUS, 2,2,"Success, invalid property ignored."},
-    {ICAL_2_3_IGPARAM_STATUS, 2,3,"Success, invalid property parameter ignored."},
-    {ICAL_2_4_IGXPROP_STATUS, 2,4,"Success, unknown non-standard property ignored."},
-    {ICAL_2_5_IGXPARAM_STATUS, 2,5,"Success, unknown non standard property value  ignored."},
-    {ICAL_2_6_IGCOMP_STATUS, 2,6,"Success, invalid calendar component ignored."},
-    {ICAL_2_7_FORWARD_STATUS, 2,7,"Success, request forwarded to Calendar User."},
-    {ICAL_2_8_ONEEVENT_STATUS, 2,8,"Success, repeating event ignored. Scheduled as a  single component."},
-    {ICAL_2_9_TRUNC_STATUS, 2,9,"Success, truncated end date time to date boundary."},
-    {ICAL_2_10_ONETODO_STATUS, 2,10,"Success, repeating VTODO ignored. Scheduled as a  single VTODO."},
-    {ICAL_2_11_TRUNCRRULE_STATUS, 2,11,"Success, unbounded RRULE clipped at some finite  number of instances  "},
-    {ICAL_3_0_INVPROPNAME_STATUS, 3,0,"Invalid property name."},
-    {ICAL_3_1_INVPROPVAL_STATUS, 3,1,"Invalid property value."},
-    {ICAL_3_2_INVPARAM_STATUS, 3,2,"Invalid property parameter."},
-    {ICAL_3_3_INVPARAMVAL_STATUS, 3,3,"Invalid property parameter  value."},
-    {ICAL_3_4_INVCOMP_STATUS, 3,4,"Invalid calendar component."},
-    {ICAL_3_5_INVTIME_STATUS, 3,5,"Invalid date or time."},
-    {ICAL_3_6_INVRULE_STATUS, 3,6,"Invalid rule."},
-    {ICAL_3_7_INVCU_STATUS, 3,7,"Invalid Calendar User."},
-    {ICAL_3_8_NOAUTH_STATUS, 3,8,"No authority."},
-    {ICAL_3_9_BADVERSION_STATUS, 3,9,"Unsupported version."},
-    {ICAL_3_10_TOOBIG_STATUS, 3,10,"Request entity too large."},
-    {ICAL_3_11_MISSREQCOMP_STATUS, 3,11,"Required component or property missing."},
-    {ICAL_3_12_UNKCOMP_STATUS, 3,12,"Unknown component or property found."},
-    {ICAL_3_13_BADCOMP_STATUS, 3,13,"Unsupported component or property found"},
-    {ICAL_3_14_NOCAP_STATUS, 3,14,"Unsupported capability."},
-    {ICAL_4_0_BUSY_STATUS, 4,0,"Event conflict. Date/time  is busy."},
-    {ICAL_5_0_MAYBE_STATUS, 5,0,"Request MAY supported."},
-    {ICAL_5_1_UNAVAIL_STATUS, 5,1,"Service unavailable."},
-    {ICAL_5_2_NOSERVICE_STATUS, 5,2,"Invalid calendar service."},
-    {ICAL_5_3_NOSCHED_STATUS, 5,3,"No scheduling support for  user."},
-    {ICAL_UNKNOWN_STATUS, 0,0,"Error: Unknown request status"}
-};
-
-
-const char* icalenum_reqstat_desc(icalrequeststatus stat)
-{
-
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].str;
-	}
-    }
-
-    return 0;
-}
-
-
-short icalenum_reqstat_major(icalrequeststatus stat)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].major;
-	}
-    }
-    return -1;
-}
-
-short icalenum_reqstat_minor(icalrequeststatus stat)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].minor;
-	}
-    }
-    return -1;
-}
-
-
-icalrequeststatus icalenum_num_to_reqstat(short major, short minor)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].major ==  major && request_status_map[i].minor ==  minor) {
-	    return request_status_map[i].kind;
-	}
-    }
-    return 0;
-}
-
-
-
-struct {icalproperty_method method; const char* str;} method_map[] = {
-    {ICAL_METHOD_PUBLISH,"PUBLISH"},
-    {ICAL_METHOD_REQUEST,"REQUEST"},
-    {ICAL_METHOD_REPLY,"REPLY"},
-    {ICAL_METHOD_ADD,"ADD"},
-    {ICAL_METHOD_CANCEL,"CANCEL"},
-    {ICAL_METHOD_REFRESH,"REFRESH"},
-    {ICAL_METHOD_COUNTER,"COUNTER"},
-    {ICAL_METHOD_DECLINECOUNTER,"DECLINECOUNTER"},
-    /* CAP Methods */
-    {ICAL_METHOD_CREATE,"CREATE"},
-    {ICAL_METHOD_READ,"READ"},
-    {ICAL_METHOD_RESPONSE,"RESPONSE"},
-    {ICAL_METHOD_MOVE,"MOVE"},
-    {ICAL_METHOD_MODIFY,"MODIFY"},
-    {ICAL_METHOD_GENERATEUID,"GENERATEUID"},
-    {ICAL_METHOD_DELETE,"DELETE"},
-    {ICAL_METHOD_NONE,"NONE"}
-};
-
-
-const char* icalenum_method_to_string(icalproperty_method method)
-{
-    int i;
-
-    for (i=0; method_map[i].method  != ICAL_METHOD_NONE; i++) {
-	if ( method_map[i].method ==  method) {
-	    return method_map[i].str;
-	}
-    }
-
-    return method_map[i].str; /* should be ICAL_METHOD_NONE */
-}
-
-icalproperty_method icalenum_string_to_method(const char* str)
-{
-    int i;
-
-    while(*str == ' '){
-	str++;
-    }
-
-
-    for (i=0; method_map[i].method  != ICAL_METHOD_NONE; i++) {
-	if ( strcmp(method_map[i].str, str) == 0) {
-	    return method_map[i].method;
-	}
-    }
-
-    return ICAL_METHOD_NONE;
-}
-
-
-struct {icalproperty_status status; const char* str;} status_map[] = {
-    {ICAL_STATUS_TENTATIVE,"TENTATIVE"},
-    {ICAL_STATUS_CONFIRMED,"CONFIRMED"},
-    {ICAL_STATUS_NEEDSACTION,"NEEDS-ACTION"},
-    {ICAL_STATUS_COMPLETED,"COMPLETED"},
-    {ICAL_STATUS_INPROCESS,"IN-PROCESS"},
-    {ICAL_STATUS_DRAFT,"DRAFT"},
-    {ICAL_STATUS_FINAL,"FINAL"},
-    {ICAL_STATUS_NONE,"NONE"}
-};
-
-const char* icalenum_status_to_string(icalproperty_status status)
-{
-    int i;
-
-    for (i=0; status_map[i].status  != ICAL_STATUS_NONE; i++) {
-	if ( status_map[i].status ==  status) {
-	    return status_map[i].str;
-	}
-    }
-
-    return status_map[i].str; /* should be ICAL_STATUS_NONE */
-}
-
-icalproperty_status icalenum_string_to_status(const char* str)
-{
-    int i;
-
-    while(*str == ' '){
-	str++;
-    }
-
-
-    for (i=0; status_map[i].status  != ICAL_STATUS_NONE; i++) {
-	if ( strcmp(status_map[i].str, str) == 0) {
-	    return status_map[i].status;
-	}
-    }
-
-    return ICAL_STATUS_NONE;
-}
diff --git a/libical/src/libical/icalenums.h b/libical/src/libical/icalenums.h
deleted file mode 100644
index d11547efad..0000000000
--- a/libical/src/libical/icalenums.h
+++ /dev/null
@@ -1,446 +0,0 @@
-
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalenums.h
-
- 
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalenums.h
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-======================================================================*/
-
-#ifndef ICALENUMS_H
-#define ICALENUMS_H
-
-
-
-/***********************************************************************
- * Component enumerations
-**********************************************************************/
-
-typedef enum icalcomponent_kind {
-    ICAL_NO_COMPONENT,
-    ICAL_ANY_COMPONENT,	/* Used to select all components*/
-    ICAL_XROOT_COMPONENT,
-    ICAL_XATTACH_COMPONENT, /* MIME attached data, returned by parser. */
-    ICAL_VEVENT_COMPONENT,
-    ICAL_VTODO_COMPONENT,
-    ICAL_VJOURNAL_COMPONENT,
-    ICAL_VCALENDAR_COMPONENT,
-    ICAL_VFREEBUSY_COMPONENT,
-    ICAL_VALARM_COMPONENT,
-    ICAL_XAUDIOALARM_COMPONENT,  
-    ICAL_XDISPLAYALARM_COMPONENT,
-    ICAL_XEMAILALARM_COMPONENT,
-    ICAL_XPROCEDUREALARM_COMPONENT,
-    ICAL_VTIMEZONE_COMPONENT,
-    ICAL_XSTANDARD_COMPONENT,
-    ICAL_XDAYLIGHT_COMPONENT,
-    ICAL_X_COMPONENT,
-    ICAL_VSCHEDULE_COMPONENT,
-    ICAL_VQUERY_COMPONENT,
-    ICAL_VCAR_COMPONENT,
-    ICAL_VCOMMAND_COMPONENT,
-    ICAL_XLICINVALID_COMPONENT,
-    ICAL_XLICMIMEPART_COMPONENT /* a non-stardard component that mirrors
-				structure of MIME data */
-
-} icalcomponent_kind;
-
-/***********************************************************************
- * Property Enumerations
-**********************************************************************/
-
-typedef enum icalproperty_kind {
-    ICAL_ANY_PROPERTY = 0, /* This must be the first enum, for iteration */
-    ICAL_CALSCALE_PROPERTY,
-    ICAL_METHOD_PROPERTY,
-    ICAL_PRODID_PROPERTY,
-    ICAL_VERSION_PROPERTY,
-    ICAL_ATTACH_PROPERTY,
-    ICAL_CATEGORIES_PROPERTY,
-    ICAL_CLASS_PROPERTY,
-    ICAL_COMMENT_PROPERTY,
-    ICAL_DESCRIPTION_PROPERTY,
-    ICAL_GEO_PROPERTY,
-    ICAL_LOCATION_PROPERTY,
-    ICAL_PERCENTCOMPLETE_PROPERTY,
-    ICAL_PRIORITY_PROPERTY,
-    ICAL_RESOURCES_PROPERTY,
-    ICAL_STATUS_PROPERTY,
-    ICAL_SUMMARY_PROPERTY,
-    ICAL_COMPLETED_PROPERTY,
-    ICAL_DTEND_PROPERTY,
-    ICAL_DUE_PROPERTY,
-    ICAL_DTSTART_PROPERTY,
-    ICAL_DURATION_PROPERTY,
-    ICAL_FREEBUSY_PROPERTY,
-    ICAL_TRANSP_PROPERTY,
-    ICAL_TZID_PROPERTY,
-    ICAL_TZNAME_PROPERTY,
-    ICAL_TZOFFSETFROM_PROPERTY,
-    ICAL_TZOFFSETTO_PROPERTY,
-    ICAL_TZURL_PROPERTY,
-    ICAL_ATTENDEE_PROPERTY,
-    ICAL_CONTACT_PROPERTY,
-    ICAL_ORGANIZER_PROPERTY,
-    ICAL_RECURRENCEID_PROPERTY,
-    ICAL_RELATEDTO_PROPERTY,
-    ICAL_URL_PROPERTY,
-    ICAL_UID_PROPERTY,
-    ICAL_EXDATE_PROPERTY,
-    ICAL_EXRULE_PROPERTY,
-    ICAL_RDATE_PROPERTY,
-    ICAL_RRULE_PROPERTY,
-    ICAL_ACTION_PROPERTY,
-    ICAL_REPEAT_PROPERTY,
-    ICAL_TRIGGER_PROPERTY,
-    ICAL_CREATED_PROPERTY,
-    ICAL_DTSTAMP_PROPERTY,
-    ICAL_LASTMODIFIED_PROPERTY,
-    ICAL_SEQUENCE_PROPERTY,
-    ICAL_REQUESTSTATUS_PROPERTY,
-    ICAL_X_PROPERTY,
-
-    /* CAP Properties */
-    ICAL_SCOPE_PROPERTY,
-    ICAL_MAXRESULTS_PROPERTY,
-    ICAL_MAXRESULTSSIZE_PROPERTY,
-    ICAL_QUERY_PROPERTY,
-    ICAL_QUERYNAME_PROPERTY, 
-    ICAL_TARGET_PROPERTY,
-
-    /* libical private properties */
-    ICAL_XLICERROR_PROPERTY,
-    ICAL_XLICCLUSTERCOUNT_PROPERTY,
-    ICAL_XLICMIMECONTENTTYPE_PROPERTY,
-    ICAL_XLICMIMEENCODING_PROPERTY,
-    ICAL_XLICMIMECID_PROPERTY,
-    ICAL_XLICMIMEFILENAME_PROPERTY,
-    ICAL_XLICMIMECHARSET_PROPERTY,
-    ICAL_XLICMIMEOPTINFO_PROPERTY,
-
-    ICAL_NO_PROPERTY /* This must be the last enum, for iteration */
-
-} icalproperty_kind;
-
-/***********************************************************************
- * Enumerations for the values of properties
- ***********************************************************************/
-
-typedef enum icalproperty_method {
-    ICAL_METHOD_PUBLISH,
-    ICAL_METHOD_REQUEST,
-    ICAL_METHOD_REPLY,
-    ICAL_METHOD_ADD,
-    ICAL_METHOD_CANCEL,
-    ICAL_METHOD_REFRESH,
-    ICAL_METHOD_COUNTER,
-    ICAL_METHOD_DECLINECOUNTER,
-    /* CAP Methods */
-    ICAL_METHOD_CREATE,
-    ICAL_METHOD_READ,
-    ICAL_METHOD_RESPONSE,
-    ICAL_METHOD_MOVE,
-    ICAL_METHOD_MODIFY,
-    ICAL_METHOD_GENERATEUID,
-    ICAL_METHOD_DELETE,
-    ICAL_METHOD_NONE
-} icalproperty_method ;
-
-typedef enum icalproperty_transp {
-    ICAL_TRANSP_OPAQUE,
-    ICAL_TRANS_TRANSPARENT
-}  icalproperty_trans;
-
-typedef enum icalproperty_calscale {
-    ICAL_CALSCALE_GREGORIAN
-} icalproperty_calscale ;
-
-
-typedef enum icalproperty_class {
-    ICAL_CLASS_PUBLIC,
-    ICAL_CLASS_PRIVATE,
-    ICAL_CLASS_CONFIDENTIAL,
-    ICAL_CLASS_XNAME
-} icalproperty_class;
-
-
-typedef enum icalproperty_status {
-    ICAL_STATUS_NONE,
-    ICAL_STATUS_TENTATIVE,
-    ICAL_STATUS_CONFIRMED,
-    ICAL_STATUS_CANCELLED, /* CANCELED? SIC from RFC*/
-    ICAL_STATUS_NEEDSACTION,
-    ICAL_STATUS_COMPLETED,
-    ICAL_STATUS_INPROCESS,
-    ICAL_STATUS_DRAFT,
-    ICAL_STATUS_FINAL
-}  icalproperty_status;
-
-typedef enum icalproperty_action {
-    ICAL_ACTION_AUDIO,
-    ICAL_ACTION_DISPLAY,
-    ICAL_ACTION_EMAIL,
-    ICAL_ACTION_PROCEDURE,
-    ICAL_ACTION_XNAME
-} icalproperty_action;
-
-/***********************************************************************
- * Value enumerations
-**********************************************************************/
-
-typedef enum icalvalue_kind {
-    ICAL_NO_VALUE,
-    ICAL_ATTACH_VALUE, /* Non-Standard*/
-    ICAL_BINARY_VALUE,
-    ICAL_BOOLEAN_VALUE,
-    ICAL_CALADDRESS_VALUE,
-    ICAL_DATE_VALUE,
-    ICAL_DATETIME_VALUE,
-    ICAL_DATETIMEDATE_VALUE, /* Non-Standard */
-    ICAL_DATETIMEPERIOD_VALUE, /* Non-Standard */
-    ICAL_DURATION_VALUE,
-    ICAL_FLOAT_VALUE,
-    ICAL_GEO_VALUE, /* Non-Standard */
-    ICAL_INTEGER_VALUE,
-    ICAL_METHOD_VALUE, /* Non-Standard */
-    ICAL_STATUS_VALUE, /* Non-Standard */
-    ICAL_PERIOD_VALUE,
-    ICAL_RECUR_VALUE,
-    ICAL_STRING_VALUE, /* Non-Standard */
-    ICAL_TEXT_VALUE,
-    ICAL_TIME_VALUE,
-    ICAL_TRIGGER_VALUE, /* Non-Standard */
-    ICAL_URI_VALUE,
-    ICAL_UTCOFFSET_VALUE,
-    ICAL_QUERY_VALUE,
-    ICAL_XNAME_VALUE
-} icalvalue_kind;
-
-
-/***********************************************************************
- * Parameter Enumerations
- **********************************************************************/
-
-
-typedef enum icalparameter_kind {
-    ICAL_NO_PARAMETER,
-    ICAL_ANY_PARAMETER,
-    ICAL_ALTREP_PARAMETER, /* DQUOTE uri DQUOTE */
-    ICAL_CN_PARAMETER, /* text */
-    ICAL_CUTYPE_PARAMETER, /*INDIVIDUAL, GROUP, RESOURCE,ROOM,UNKNOWN, x-name*/
-    ICAL_DELEGATEDFROM_PARAMETER, /* *("," DQUOTE cal-address DQUOTE) */
-    ICAL_DELEGATEDTO_PARAMETER, /*  *("," DQUOTE cal-address DQUOTE) */
-    ICAL_DIR_PARAMETER, /*  DQUOTE uri DQUOTE */
-    ICAL_ENCODING_PARAMETER, /* *BIT, BASE64, x-name */
-    ICAL_FMTTYPE_PARAMETER, /* registered MINE content type */
-    ICAL_FBTYPE_PARAMETER, /* FREE, BUSY, BUSY-UNAVAILABLE, BUSY-TENTATIVE,x-name */
-    ICAL_LANGUAGE_PARAMETER, /* text from RFC 1766 */
-    ICAL_MEMBER_PARAMETER, /*  DQUOTE cal-address DQUOTE */
-    ICAL_PARTSTAT_PARAMETER, /* NEEDS-ACTION, ACCEPTED, DECLINED, TENTATIVE, DELEGATED, x-name */
-    ICAL_RANGE_PARAMETER, /* THISANDPRIOR, THISANDFUTURE */
-    ICAL_RELATED_PARAMETER, /* START, END */
-    ICAL_RELTYPE_PARAMETER, /* PARENT, CHILD, SIBLING,x-name */
-    ICAL_ROLE_PARAMETER, /* CHAIR, REQ_PARTICIPANT, OPT_PARTICIPANT, NON_PARTICIPANT, x-name */
-    ICAL_RSVP_PARAMETER, /* TRUE. FALSE */
-    ICAL_SENTBY_PARAMETER, /*  DQUOTE uri DQUOTE */
-    ICAL_TZID_PARAMETER, /*  [tzidprefix] paramtext CRLF */
-    ICAL_VALUE_PARAMETER, /* BINARY, BOOLEAN, CAL_ADDRESS, DATE, DATE-TIME, DURATION, FLOAT, INTEGER, PERIOD, RECUR, TEXT, TIME, UTC_OFFSET, x-name */
-    ICAL_XLICERRORTYPE_PARAMETER, /*ICAL_XLICERROR_PARSE_ERROR,ICAL_XLICERROR_INVALID_ITIP*/
-    ICAL_XLICCOMPARETYPE_PARAMETER, /**/
-    ICAL_X_PARAMETER /* text */ 
-} icalparameter_kind;
-
-typedef enum icalparameter_cutype {
-    ICAL_CUTYPE_INDIVIDUAL, 
-    ICAL_CUTYPE_GROUP, 
-    ICAL_CUTYPE_RESOURCE, 
-    ICAL_CUTYPE_ROOM,
-    ICAL_CUTYPE_UNKNOWN,
-    ICAL_CUTYPE_XNAME
-} icalparameter_cutype;
-
-
-typedef enum icalparameter_encoding {
-    ICAL_ENCODING_8BIT, 
-    ICAL_ENCODING_BASE64,
-    ICAL_ENCODING_XNAME
-} icalparameter_encoding;
-
-typedef enum icalparameter_fbtype {
-    ICAL_FBTYPE_FREE, 
-    ICAL_FBTYPE_BUSY, 
-    ICAL_FBTYPE_BUSYUNAVAILABLE, 
-    ICAL_FBTYPE_BUSYTENTATIVE,
-    ICAL_FBTYPE_XNAME
-} icalparameter_fbtype;
-
-typedef enum icalparameter_partstat {
-    ICAL_PARTSTAT_NEEDSACTION, 
-    ICAL_PARTSTAT_ACCEPTED, 
-    ICAL_PARTSTAT_DECLINED, 
-    ICAL_PARTSTAT_TENTATIVE, 
-    ICAL_PARTSTAT_DELEGATED,
-    ICAL_PARTSTAT_COMPLETED,
-    ICAL_PARTSTAT_INPROCESS,
-    ICAL_PARTSTAT_XNAME,
-    ICAL_PARTSTAT_NONE
-} icalparameter_partstat;
-
-typedef enum icalparameter_range {
-    ICAL_RANGE_THISANDPRIOR, 
-    ICAL_RANGE_THISANDFUTURE
-} icalparameter_range;
-
-typedef enum icalparameter_related {
-    ICAL_RELATED_START, 
-    ICAL_RELATED_END
-} icalparameter_related;
-
-typedef enum icalparameter_reltype {
-    ICAL_RELTYPE_PARENT, 
-    ICAL_RELTYPE_CHILD,
-    ICAL_RELTYPE_SIBLING,
-    ICAL_RELTYPE_XNAME
-} icalparameter_reltype;
-
-typedef enum icalparameter_role {
-    ICAL_ROLE_CHAIR, 
-    ICAL_ROLE_REQPARTICIPANT, 
-    ICAL_ROLE_OPTPARTICIPANT, 
-    ICAL_ROLE_NONPARTICIPANT,
-    ICAL_ROLE_XNAME
-} icalparameter_role;
-
-typedef enum icalparameter_xlicerrortype {
-    ICAL_XLICERRORTYPE_COMPONENTPARSEERROR,
-    ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR,
-    ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR,
-    ICAL_XLICERRORTYPE_PROPERTYPARSEERROR,
-    ICAL_XLICERRORTYPE_VALUEPARSEERROR,
-    ICAL_XLICERRORTYPE_UNKVCALPROP,
-    ICAL_XLICERRORTYPE_INVALIDITIP,
-    ICAL_XLICERRORTYPE_MIMEPARSEERROR
-} icalparameter_xlicerrortype;
-
-typedef enum icalparameter_xliccomparetype {
-    ICAL_XLICCOMPARETYPE_EQUAL=0,
-    ICAL_XLICCOMPARETYPE_LESS=-1,
-    ICAL_XLICCOMPARETYPE_LESSEQUAL=2,
-    ICAL_XLICCOMPARETYPE_GREATER=1,
-    ICAL_XLICCOMPARETYPE_GREATEREQUAL=3,
-    ICAL_XLICCOMPARETYPE_NOTEQUAL=4,
-    ICAL_XLICCOMPARETYPE_REGEX=5
-} icalparameter_xliccomparetype;
-
-typedef enum icalparameter_value {
-    ICAL_VALUE_XNAME = ICAL_XNAME_VALUE,
-    ICAL_VALUE_BINARY = ICAL_BINARY_VALUE, 
-    ICAL_VALUE_BOOLEAN = ICAL_BOOLEAN_VALUE, 
-    ICAL_VALUE_CALADDRESS = ICAL_CALADDRESS_VALUE, 
-    ICAL_VALUE_DATE = ICAL_DATE_VALUE, 
-    ICAL_VALUE_DATETIME = ICAL_DATETIME_VALUE, 
-    ICAL_VALUE_DURATION = ICAL_DURATION_VALUE, 
-    ICAL_VALUE_FLOAT = ICAL_FLOAT_VALUE, 
-    ICAL_VALUE_INTEGER = ICAL_INTEGER_VALUE, 
-    ICAL_VALUE_PERIOD = ICAL_PERIOD_VALUE, 
-    ICAL_VALUE_RECUR = ICAL_RECUR_VALUE, 
-    ICAL_VALUE_TEXT = ICAL_TEXT_VALUE, 
-    ICAL_VALUE_TIME = ICAL_TIME_VALUE, 
-    ICAL_VALUE_UTCOFFSET = ICAL_UTCOFFSET_VALUE,
-    ICAL_VALUE_URI = ICAL_URI_VALUE,
-    ICAL_VALUE_ERROR = ICAL_NO_VALUE
-} icalparameter_value;
-
-
-/***********************************************************************
- * Request Status codes
- **********************************************************************/
-
-typedef enum icalrequeststatus {
-    ICAL_UNKNOWN_STATUS,
-    ICAL_2_0_SUCCESS_STATUS,
-    ICAL_2_1_FALLBACK_STATUS,
-    ICAL_2_2_IGPROP_STATUS,
-    ICAL_2_3_IGPARAM_STATUS,
-    ICAL_2_4_IGXPROP_STATUS,
-    ICAL_2_5_IGXPARAM_STATUS,
-    ICAL_2_6_IGCOMP_STATUS,
-    ICAL_2_7_FORWARD_STATUS,
-    ICAL_2_8_ONEEVENT_STATUS,
-    ICAL_2_9_TRUNC_STATUS,
-    ICAL_2_10_ONETODO_STATUS,
-    ICAL_2_11_TRUNCRRULE_STATUS,
-    ICAL_3_0_INVPROPNAME_STATUS,
-    ICAL_3_1_INVPROPVAL_STATUS,
-    ICAL_3_2_INVPARAM_STATUS,
-    ICAL_3_3_INVPARAMVAL_STATUS,
-    ICAL_3_4_INVCOMP_STATUS,
-    ICAL_3_5_INVTIME_STATUS,
-    ICAL_3_6_INVRULE_STATUS,
-    ICAL_3_7_INVCU_STATUS,
-    ICAL_3_8_NOAUTH_STATUS,
-    ICAL_3_9_BADVERSION_STATUS,
-    ICAL_3_10_TOOBIG_STATUS,
-    ICAL_3_11_MISSREQCOMP_STATUS,
-    ICAL_3_12_UNKCOMP_STATUS,
-    ICAL_3_13_BADCOMP_STATUS,
-    ICAL_3_14_NOCAP_STATUS,
-    ICAL_4_0_BUSY_STATUS,
-    ICAL_5_0_MAYBE_STATUS,
-    ICAL_5_1_UNAVAIL_STATUS,
-    ICAL_5_2_NOSERVICE_STATUS,
-    ICAL_5_3_NOSCHED_STATUS
-} icalrequeststatus;
-
-
-const char* icalenum_reqstat_desc(icalrequeststatus stat);
-short icalenum_reqstat_major(icalrequeststatus stat);
-short icalenum_reqstat_minor(icalrequeststatus stat);
-icalrequeststatus icalenum_num_to_reqstat(short major, short minor);
-
-/***********************************************************************
- * Conversion functions
-**********************************************************************/
-
-const char* icalenum_property_kind_to_string(icalproperty_kind kind);
-icalproperty_kind icalenum_string_to_property_kind(const char* string);
-
-const char* icalenum_value_kind_to_string(icalvalue_kind kind);
-icalvalue_kind icalenum_value_kind_by_prop(icalproperty_kind kind);
-
-const char* icalenum_parameter_kind_to_string(icalparameter_kind kind);
-icalparameter_kind icalenum_string_to_parameter_kind(const char* string);
-
-const char* icalenum_component_kind_to_string(icalcomponent_kind kind);
-icalcomponent_kind icalenum_string_to_component_kind(const char* string);
-
-icalvalue_kind icalenum_property_kind_to_value_kind(icalproperty_kind kind);
-
-const char* icalenum_method_to_string(icalproperty_method);
-icalproperty_method icalenum_string_to_method(const char* string);
-
-const char* icalenum_status_to_string(icalproperty_status);
-icalproperty_status icalenum_string_to_status(const char* string);
-
-#endif /* !ICALENUMS_H */
-
-
-
diff --git a/libical/src/libical/icalerror.c b/libical/src/libical/icalerror.c
deleted file mode 100644
index 13c39dadbc..0000000000
--- a/libical/src/libical/icalerror.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalerror.c
-  CREATOR: eric 16 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalerror.c
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalerror.h"
-
-icalerrorenum icalerrno;
-
-int foo;
-void icalerror_stop_here(void)
-{
-    foo++; /* Keep optimizers from removing routine */
-}
-
-void icalerror_crash_here(void)
-{
-    int *p=0;
-    *p = 1;
-
-    assert( *p);
-}
-
-
-void icalerror_clear_errno() {
-    
-    icalerrno = ICAL_NO_ERROR;
-}
-
-#ifdef ICAL_ERRORS_ARE_FATAL
-int icalerror_errors_are_fatal = 1;
-#else
-int icalerror_errors_are_fatal = 0;
-#endif
-
-struct icalerror_state { 
-    icalerrorenum error;
-    icalerrorstate state; 
-};
-
-struct icalerror_state error_state_map[] = 
-{ 
-    { ICAL_BADARG_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_NEWFAILED_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_DEFAULT}, 
-    { ICAL_PARSE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_INTERNAL_ERROR,ICAL_ERROR_DEFAULT}, 
-    { ICAL_FILE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_ALLOCATION_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_USAGE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_MULTIPLEINCLUSION_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_TIMEDOUT_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_UNKNOWN_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_NO_ERROR,ICAL_ERROR_DEFAULT}
-
-};
-
-void icalerror_set_error_state( icalerrorenum error, 
-				icalerrorstate state)
-{
-    int i;
-
-    for(i = ICAL_BADARG_ERROR; error_state_map[i].error!= ICAL_NO_ERROR;i++){
-	if(error_state_map[i].error == error){
-	    error_state_map[i].state = state; 	
-	}
-    }
-}
-
-icalerrorstate icalerror_get_error_state( icalerrorenum error)
-{
-    int i;
-
-    for(i = ICAL_BADARG_ERROR; error_state_map[i].error!= ICAL_NO_ERROR;i++){
-	if(error_state_map[i].error == error){
-	    return error_state_map[i].state; 	
-	}
-    }
-
-    return ICAL_ERROR_UNKNOWN;	
-}
-
-
-void icalerror_set_errno(icalerrorenum e) {
-
-    icalerrorstate es;
-
-    icalerrno = e;
-    es =  icalerror_get_error_state(e);
-
-    icalerror_stop_here();
-
-    if( (es == ICAL_ERROR_FATAL) ||
-	(es == ICAL_ERROR_DEFAULT && icalerror_errors_are_fatal == 1)){
-	
-	fprintf(stderr,"libical: icalerrno_set_error: %s\n",icalerror_strerror(e));
-#ifdef NDEBUG
-	icalerror_crash_here();
-#else
-	assert(0);
-#endif 
-    }
-}
-
-
-struct icalerror_string_map {
-	icalerrorenum error;
-	char name[160];
-};
-
-static struct icalerror_string_map string_map[] = 
-{
-    {ICAL_BADARG_ERROR,"Bad argument to function"},
-    {ICAL_NEWFAILED_ERROR,"Failed to create a new object via a *_new() routine"},
-    {ICAL_MALFORMEDDATA_ERROR,"An input string was not correctly formed or a component has missing or extra properties"},
-    {ICAL_PARSE_ERROR,"Failed to parse a part of an iCal component"},
-    {ICAL_INTERNAL_ERROR,"Random internal error. This indicates an error in the library code, not an error in use"}, 
-    {ICAL_FILE_ERROR,"An operation on a file failed. Check errno for more detail."},
-    {ICAL_ALLOCATION_ERROR,"Failed to allocate memory"},
-    {ICAL_USAGE_ERROR,"The caller failed to properly sequence called to an object's interface"},
-    {ICAL_NO_ERROR,"No error"},
-    {ICAL_UNKNOWN_ERROR,"Unknown error type -- icalerror_strerror() was probably given bad input"}
-};
-
-
-char* icalerror_strerror(icalerrorenum e) {
-
-    int i;
-
-    for (i=0; string_map[i].error != ICAL_UNKNOWN_ERROR; i++) {
-	if (string_map[i].error == e) {
-	    return string_map[i].name;
-	}
-    }
-
-    return string_map[i].name; /* Return string for ICAL_UNKNOWN_ERROR*/
-    
-}
-
-
-
diff --git a/libical/src/libical/icalerror.h b/libical/src/libical/icalerror.h
deleted file mode 100644
index df71110ecb..0000000000
--- a/libical/src/libical/icalerror.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalerror.h
-  CREATOR: eric 09 May 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalerror.h
-
-======================================================================*/
-
-
-#ifndef ICALERROR_H
-#define ICALERROR_H
-
-#include <assert.h>
-#include <stdio.h> /* For icalerror_warn() */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-/* This routine is called before any error is triggered. It is called
-   by icalerror_set_errno, so it does not appear in all of the macros
-   below */
-void icalerror_stop_here(void);
-
-void icalerror_crash_here(void);
-
-#ifdef ICAL_ERRORS_ARE_FATAL
-#undef NDEBUG
-#endif
-
-#define icalerror_check_value_type(value,type);
-#define icalerror_check_property_type(value,type);
-#define icalerror_check_parameter_type(value,type);
-#define icalerror_check_component_type(value,type);
-
-/* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
-
-#ifdef __GNUC__
-#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}
-#else /*__GNUC__*/
-#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message);icalerror_stop_here(); abort();}
-#endif /*__GNUC__*/
-#else
-#define icalerror_assert(test,message) 
-#endif 
-
-/* Check & abort if check fails */
-#define icalerror_check_arg(test,arg) if(!(test)) { icalerror_set_errno(ICAL_BADARG_ERROR); }
-
-/* Check & return void if check fails*/
-#define icalerror_check_arg_rv(test,arg) if(!(test)) { icalerror_set_errno(ICAL_BADARG_ERROR); return; }
-
-/* Check & return 0 if check fails*/
-#define icalerror_check_arg_rz(test,arg) if(!(test)) {icalerror_set_errno(ICAL_BADARG_ERROR); return 0;}
-
-/* Check & return an error if check fails*/
-#define icalerror_check_arg_re(test,arg,error) if(!(test)) {icalerror_stop_here(); return error;}
-
-
-
-/* Warning messages */
-
-#ifdef ICAL_ERRORS_ARE_FATAL 
-
-#ifdef __GNUC__
-#define icalerror_warn(message) {fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message); abort();}
-#else /* __GNU_C__ */
-#define icalerror_warn(message) {fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message); abort();}
-#endif /* __GNU_C__ */
-
-#else /*ICAL_ERRORS_ARE_FATAL */
-
-#ifdef __GNUC__
-#define icalerror_warn(message) {fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);}
-#else /* __GNU_C__ */
-#define icalerror_warn(message) {fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message);}
-#endif /* __GNU_C__ */
-
-#endif /*ICAL_ERRORS_ARE_FATAL*/
-
-typedef enum icalerrorenum {
-    
-    ICAL_BADARG_ERROR,
-    ICAL_NEWFAILED_ERROR,
-    ICAL_MALFORMEDDATA_ERROR, 
-    ICAL_PARSE_ERROR,
-    ICAL_INTERNAL_ERROR, /* Like assert --internal consist. prob */
-    ICAL_FILE_ERROR,
-    ICAL_ALLOCATION_ERROR,
-    ICAL_USAGE_ERROR,
-    ICAL_NO_ERROR,
-    ICAL_MULTIPLEINCLUSION_ERROR,
-    ICAL_TIMEDOUT_ERROR,
-    ICAL_UNKNOWN_ERROR /* Used for problems in input to icalerror_strerror()*/
-
-} icalerrorenum;
-
-/* The libical error enumeration, like errno*/
-extern icalerrorenum icalerrno;
-
-/* If true, libicl aborts after a call to icalerror_set_error*/
-extern int icalerror_errors_are_fatal;
-
-void icalerror_clear_errno(void);
-void icalerror_set_errno(icalerrorenum);
-
-/* Make an individual error fatal or non-fatal. */
-typedef enum icalerrorstate { 
-    ICAL_ERROR_FATAL,     /* Not fata */
-    ICAL_ERROR_NONFATAL,  /* Fatal */
-    ICAL_ERROR_DEFAULT,   /* Use the value of icalerror_errors_are_fatal*/
-    ICAL_ERROR_UNKNOWN    /* Asked state for an unknown error type */
-} icalerrorstate ;
-
-void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
-icalerrorstate icalerror_get_error_state( icalerrorenum error);
-
-char* icalerror_strerror(icalerrorenum e);
-
-
-#endif /* !ICALERROR_H */
-
-
-
diff --git a/libical/src/libical/icallangbind.c b/libical/src/libical/icallangbind.c
deleted file mode 100644
index d52f491b93..0000000000
--- a/libical/src/libical/icallangbind.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallangbind.c
-  CREATOR: eric 15 dec 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-  
-  This package is free software and is provided "as is" without
-  express or implied warranty.  It may be used, redistributed and/or
-  modified under the same terms as perl itself. ( Either the Artistic
-  License or the GPL. )
-
-  ======================================================================*/
-
-#include "ical.h"
-#include <malloc.h>
-
-
-
-int* icallangbind_new_array(int size){
-    int* p = malloc(size*sizeof(int));
-    return p; /* Caller handles failures */
-}
-
-void icallangbind_free_array(int* array){
-    free(array);
-}
-
-int icallangbind_access_array(int* array, int index) {
-    return array[index];
-}                    
-
-/* Return the nth occurrence of 'prop' in c */
-icalproperty* icallangbind_get_property(icalcomponent *c, int n, const char* prop)
-{
-    int count; 
-    icalproperty_kind kind;
-    icalproperty *p;
-    icalcomponent * comps[3];
-    int compno = 0;
-    int propno = 0;
-
-    if(c == 0 || prop == 0 || n < 0){
-	return 0;
-    }
-
-    kind = icalenum_string_to_property_kind(prop);
-
-    if (kind == ICAL_NO_PROPERTY){
-	return 0;
-    }
-
-    comps[0] = c;
-    comps[1] = icalcomponent_get_first_real_component(c);
-    comps[2] = 0;
-
-    if(kind == ICAL_X_PROPERTY){
-
-	for(compno ==0; comps[compno]!=0 ; compno++){
-
-	    for(p = icalcomponent_get_first_property(comps[compno],kind);
-		p !=0;
-		p = icalcomponent_get_next_property(comps[compno],kind)
-		){
-
-		if(strcmp(icalproperty_get_x_name(p),prop) == 0){
-
-		    if(propno == n ){
-			return p;
-		    }
-		    
-		    propno++;
-		}		
-	    }
-	}
-
-    } else {
-	for(compno ==0; comps[compno]!=0 ; compno++){
-
-	    for(propno=0,
-		    p = icalcomponent_get_first_property(comps[compno],kind);
-		propno != n && p !=0;
-		propno++,
-		    p = icalcomponent_get_next_property(comps[compno],kind)
-		)
-	    {
-	    }
-
-	    if(p != 0){
-		return p;
-	    }
-
-	}
-    }
-	
-    return 0;
-
-}
-
-const char* icallangbind_get_property_val(icalproperty* p)
-{
-    icalvalue *v;
-    if (p == 0){
-	return 0;
-    }
-
-    v = icalproperty_get_value(p);
-
-    if(v == 0){
-	return v;
-    }
-
-    return icalvalue_as_ical_string(v);
-    
-}
-
-const char* icallangbind_get_parameter(icalproperty *p, const char* parameter)
-{
-    icalparameter_kind kind;
-    icalparameter *param;
-
-    if(p == 0 || parameter == 0){
-	return 0;
-    }
-    
-    kind = icalenum_string_to_parameter_kind(parameter);
-
-    if(kind == ICAL_NO_PARAMETER){
-	return 0;
-    }
-
-    if(kind == ICAL_X_PARAMETER){
-	for(param = icalproperty_get_first_parameter(p,ICAL_X_PARAMETER);
-	    param != 0;
-	    param = icalproperty_get_next_parameter(p,ICAL_X_PARAMETER)){
-
-	    if(strcmp(icalparameter_get_xname(param),parameter) ==0){
-		return icalparameter_as_ical_string(param);
-	    }
-	}
-
-    } else {
-
-	param = icalproperty_get_first_parameter(p,kind);
-	
-	if (param !=0){
-	    return icalparameter_as_ical_string(param);
-	}
-	
-    }
-
-    return 0;
-}
-
-icalcomponent* icallangbind_get_component(icalcomponent *c, const char* comp)
-{
-    if(c == 0 || comp == 0){
-	return 0;
-    }
-
-
-}
-
-
-
diff --git a/libical/src/libical/icallangbind.h b/libical/src/libical/icallangbind.h
deleted file mode 100644
index 184233147f..0000000000
--- a/libical/src/libical/icallangbind.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallangbind.h
-  CREATOR: eric 25 jan 2001
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-  
-  This package is free software and is provided "as is" without
-  express or implied warranty.  It may be used, redistributed and/or
-  modified under the same terms as perl itself. ( Either the Artistic
-  License or the GPL. )
-
-  ======================================================================*/
-
-#ifndef __ICALLANGBIND_H__
-#define __ICALLANGBIND_H__
-
-int* icallangbind_new_array(int size);
-void icallangbind_free_array(int* array);
-int icallangbind_access_array(int* array, int index);
-icalproperty* icallangbind_get_property(icalcomponent *c, int n, const char* prop);
-const char* icallangbind_get_property_val(icalproperty* p);
-const char* icallangbind_get_parameter(icalproperty *p, const char* parameter);
-icalcomponent* icallangbind_get_component(icalcomponent *c, const char* comp);
-
-#endif /*__ICALLANGBIND_H__*/
diff --git a/libical/src/libical/icallexer.l b/libical/src/libical/icallexer.l
deleted file mode 100644
index d76a7938e3..0000000000
--- a/libical/src/libical/icallexer.l
+++ /dev/null
@@ -1,161 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallexer.l
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icallexer.l,v 1.8 2001/01/23 20:22:33 jpr Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  ======================================================================*/
-#include "icalparser.h"
-#include "icalenums.h"
-#include "icalmemory.h"
-#include "assert.h"
-#include "icalyacc.h"
-
-#include <string.h> /* For strdup() */
-
-int icalparser_flex_input(char* buf, int max_size);
-void icalparser_clear_flex_input(void);
-
-
-#define ICAL_MAX_STR_CONST 1024
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
-#undef yywrap
-
-#undef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) ical_yyerror(msg)
-
-icalvalue_kind value_kind=ICAL_NO_VALUE;
-void set_parser_value_state(icalvalue_kind kind);
-extern int yydebug; 
-
-void ical_yyerror(char *s);
-
-void init_str_buf(void);
-
-int last_state;
-
-char *str_buf;
-char *str_buf_p;
-size_t buf_sz; /* = ICAL_MAX_STR_CONST;*/
-
-%}
-
-crlf		\x0D?\x0A
-space		[ ]
-qsafechar	[^\x00-\x1F\"]
-safechar	[^\x00-\x1F\"\:\;\,]
-tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
-valuechar	[^\x00-\x08\x10-\x1F]
-xname		X-[a-zA-Z0-9\-]+
-xname2          [a-zA-Z0-9\-\ ]
-paramtext	{safechar}+
-value		{valuechar}+
-quotedstring	\"{qsafechar}+\"
-digit		[0-9]
-
-%array /* Make yytext an array. Slow, but handy. HACK */
-
-%option caseless
-
-%s quoted_string
-%s binary_value boolean_value uri_value time_value duration_value number_value period_value recur_value text_value utcoffset_value
-%s enum_param_value string_param_value stringlist_param_value keyword line_start component seperator parameter end_of_value paramtext
-
-
-
-%%
-
-%{
-%}
-
-
-<time_value>{
-{digit}+		 { ical_yylval.v_string =icalmemory_tmp_copy(yytext) ;
-                           return DIGITS; }
-T			 { return TIME_CHAR; }
-Z			 { return UTC_CHAR; }
-[\/\+\-PWHMSD]		 { return yytext[0]; }
-{crlf}                   { return EOL;}
-
-}
-
-<utcoffset_value>{
-{crlf}                   { return EOL;}
-\-|\+			 { return yytext[0]; }
-{digit}{digit}		 { ical_yylval.v_int=atoi(yytext); return INTNUMBER; }
-
-}
-
-<enum_param_value>{
-.			 { return CHARACTER; }
-{crlf}                   { return EOL;}
-
-}
-
-<seperator>{
-,       { BEGIN(last_state); return COMMA; } 
-}
-
-
-%% 
-
-int yywrap()
-{
-     return 1;
-}
-
-
-void set_parser_value_state(icalvalue_kind kind)
-{
-
-    switch (kind){
-
-	case ICAL_UTCOFFSET_VALUE:
-	    {BEGIN(utcoffset_value);break;}
-
-	case ICAL_DATETIMEPERIOD_VALUE:
-	case ICAL_DURATION_VALUE:
-	case ICAL_PERIOD_VALUE:
-	    {BEGIN(time_value);break;}
-
-	default:
-	{
-	   assert(1==0);
-	}
-    }
-}
-
-void init_str_buf(void)
-{
-   str_buf = icalmemory_tmp_buffer(ICAL_MAX_STR_CONST);
-   str_buf_p = str_buf;
-   buf_sz = ICAL_MAX_STR_CONST;
-
-
-}
-
diff --git a/libical/src/libical/icalmemory.c b/libical/src/libical/icalmemory.c
deleted file mode 100644
index 297ead8826..0000000000
--- a/libical/src/libical/icalmemory.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalmemory.c
-  CREATOR: eric 30 June 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is icalmemory.h
-
- ======================================================================*/
-
-/* libical often passes strings back to the caller. To make these
- * interfaces simple, I did not want the caller to have to pass in a
- * memory buffer, but having libical pass out newly allocated memory
- * makes it difficult to de-allocate the memory.
- * 
- * The ring buffer in this scheme makes it possible for libical to pass
- * out references to memory which the caller does not own, and be able
- * to de-allocate the memory later. The ring allows libical to have
- * several buffers active simultaneously, which is handy when creating
- * string representations of components. */
-
-#define ICALMEMORY_C
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#include "icalmemory.h"
-#include "icalerror.h"
-
-#include <stdio.h> /* for printf (debugging) */
-#include <stdlib.h> /* for malloc, realloc */
-#include <string.h> /* for memset(), strdup */
-
-#define BUFFER_RING_SIZE 25
-#define MIN_BUFFER_SIZE 200
-
-void icalmemory_free_tmp_buffer (void* buf);
-
-
-/* HACK. Not threadsafe */
-void* buffer_ring[BUFFER_RING_SIZE];
-int buffer_pos = -1;
-int initialized = 0;
-
-/* Add an existing buffer to the buffer ring */
-void  icalmemory_add_tmp_buffer(void* buf)
-{
-    /* I don't think I need this -- I think static arrays are
-       initialized to 0 as a standard part of C, but I am not sure. */
-    if (initialized == 0){
-	int i;
-	for(i=0; i<BUFFER_RING_SIZE; i++){
-	    buffer_ring[i]  = 0;
-	}
-	initialized = 1;
-    }
-
-    /* Wrap around the ring */
-    if(++buffer_pos == BUFFER_RING_SIZE){
-	buffer_pos = 0;
-    }
-
-    /* Free buffers as their slots are overwritten */
-    if ( buffer_ring[buffer_pos] != 0){
-	free( buffer_ring[buffer_pos]);
-	buffer_ring[buffer_pos] = 0;
-    }
-
-    /* Assign the buffer to a slot */
-    buffer_ring[buffer_pos] = buf; 
-}
-
-/* Create a new temporary buffer on the ring. Libical owns these and
-   wil deallocate them. */
-void*
-icalmemory_tmp_buffer (size_t size)
-{
-    char *buf;
-
-    if (size < MIN_BUFFER_SIZE){
-	size = MIN_BUFFER_SIZE;
-    }
-    
-    buf = (void*)malloc(size);
-
-    if( buf == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(buf,0,size); 
-
-    icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-}
-
-void icalmemory_free_ring()
-{
-	
-   int i;
-   for(i=0; i<BUFFER_RING_SIZE; i++){
-    if ( buffer_ring[i] != 0){
-       free( buffer_ring[i]);
-    }
-    buffer_ring[i]  = 0;
-   }
-
-   initialized = 1;
-
-}
-
-
-
-/* Like strdup, but the buffer is on the ring. */
-char*
-icalmemory_tmp_copy(const char* str)
-{
-    char* b = icalmemory_tmp_buffer(strlen(str)+1);
-
-    strcpy(b,str);
-
-    return b;
-}
-    
-
-char* icalmemory_strdup(const char *s)
-{
-    return strdup(s);
-}
-
-void
-icalmemory_free_tmp_buffer (void* buf)
-{
-   if(buf == 0)
-   {
-       return;
-   }
-
-   free(buf);
-}
-
-
-/* These buffer routines create memory the old fashioned way -- so the
-   caller will have to delocate the new memory */
-
-void* icalmemory_new_buffer(size_t size)
-{
-    void *b = malloc(size);
-
-    if( b == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(b,0,size); 
-
-    return b;
-}
-
-void* icalmemory_resize_buffer(void* buf, size_t size)
-{
-    void *b = realloc(buf, size);
-
-    if( b == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-   return b;
-}
-
-void icalmemory_free_buffer(void* buf)
-{
-    free(buf);
-}
-
-void 
-icalmemory_append_string(char** buf, char** pos, size_t* buf_size, 
-			      const char* string)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length, string_length;
-
-#ifndef ICAL_NO_INTERNAL_DEBUG
-    icalerror_check_arg_rv( (buf!=0),"buf");
-    icalerror_check_arg_rv( (*buf!=0),"*buf");
-    icalerror_check_arg_rv( (pos!=0),"pos");
-    icalerror_check_arg_rv( (*pos!=0),"*pos");
-    icalerror_check_arg_rv( (buf_size!=0),"buf_size");
-    icalerror_check_arg_rv( (*buf_size!=0),"*buf_size");
-    icalerror_check_arg_rv( (string!=0),"string");
-#endif 
-
-    string_length = strlen(string);
-    data_length = (size_t)*pos - (size_t)*buf;    
-    final_length = data_length + string_length; 
-
-    if ( final_length >= (size_t) *buf_size) {
-
-	
-	*buf_size  = (*buf_size) * 2  + final_length;
-
-	new_buf = realloc(*buf,*buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	*pos = new_pos;
-	*buf = new_buf;
-    }
-    
-    strcpy(*pos, string);
-
-    *pos += string_length;
-}
-
-
-void 
-icalmemory_append_char(char** buf, char** pos, size_t* buf_size, 
-			      char ch)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length;
-
-#ifndef ICAL_NO_INTERNAL_DEBUG
-    icalerror_check_arg_rv( (buf!=0),"buf");
-    icalerror_check_arg_rv( (*buf!=0),"*buf");
-    icalerror_check_arg_rv( (pos!=0),"pos");
-    icalerror_check_arg_rv( (*pos!=0),"*pos");
-    icalerror_check_arg_rv( (buf_size!=0),"buf_size");
-    icalerror_check_arg_rv( (*buf_size!=0),"*buf_size");
-#endif
-
-    data_length = (size_t)*pos - (size_t)*buf;
-
-    final_length = data_length + 2; 
-
-    if ( final_length > (size_t) *buf_size ) {
-
-	
-	*buf_size  = (*buf_size) * 2  + final_length +1;
-
-	new_buf = realloc(*buf,*buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	*pos = new_pos;
-	*buf = new_buf;
-    }
-
-    **pos = ch;
-    *pos += 1;
-    **pos = 0;
-}
diff --git a/libical/src/libical/icalmemory.h b/libical/src/libical/icalmemory.h
deleted file mode 100644
index 3ae77024c4..0000000000
--- a/libical/src/libical/icalmemory.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmemory.h
- CREATOR: eric 30 June 1999
-
-
- $Id$
-
- $Locker$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-#ifndef ICALMEMORY_H
-#define ICALMEMORY_H
-
-#include <sys/types.h> /* for size_t */
-
-
-/* Tmp buffers are managed by ical. References can be returned to the
-   caller, although the caller will not own the memory. */
-
-void* icalmemory_tmp_buffer(size_t size);
-char* icalmemory_tmp_copy(const char* str);
-
-/* Add an externally allocated buffer to the ring. */
-void  icalmemory_add_tmp_buffer(void*);
-
-
-/* Free all memory used in the ring */
-void icalmemory_free_ring(void);
-
-/* Non-tmp buffers must be freed. These are mostly wrappers around
- * malloc, etc, but are used so the caller can change the memory
- * allocators in a future version of the library */
-
-void* icalmemory_new_buffer(size_t size);
-void* icalmemory_resize_buffer(void* buf, size_t size);
-void icalmemory_free_buffer(void* buf);
-
-/* icalmemory_append_string will copy the string 'string' to the
-   buffer 'buf' starting at position 'pos', reallocing 'buf' if it is
-   too small. 'buf_size' is the size of 'buf' and will be changed if
-   'buf' is reallocated. 'pos' will point to the last byte of the new
-   string in 'buf', usually a '\0' */
-
-/* THESE ROUTINES CAN NOT BE USED ON TMP BUFFERS. Only use them on
-   normally allocated memory, or on buffers created from
-   icalmemory_new_buffer, never with buffers created by
-   icalmemory_tmp_buffer. If icalmemory_append_string has to resize a
-   buffer on the ring, the ring will loose track of it an you will
-   have memory problems. */
-
-void icalmemory_append_string(char** buf, char** pos, size_t* buf_size, 
-			      const char* string);
-
-/*  icalmemory_append_char is similar, but is appends a character instead of a string */
-void icalmemory_append_char(char** buf, char** pos, size_t* buf_size, 
-			      char ch);
-
-/* A wrapper around strdup */
-char* icalmemory_strdup(const char *s);
-
-#endif /* !ICALMEMORY_H */
-
-
-
diff --git a/libical/src/libical/icalmime.c b/libical/src/libical/icalmime.c
deleted file mode 100644
index 17db8cdee1..0000000000
--- a/libical/src/libical/icalmime.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalmime.c
- CREATOR: eric 26 July 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include "icalmime.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "sspm.h"
-#include "stdlib.h"
-#include <string.h> /* For strdup */
-#include <stdio.h> /* for snprintf*/
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-
-/* These *_part routines are called by the MIME parser via the
-   local_action_map */
-
-struct text_part
-{
-	char* buf;
-	char* buf_pos;
-	size_t buf_size;
-};
-
-void* icalmime_text_new_part()
-{
-
-#define BUF_SIZE 2048
-
-    struct text_part* impl;
-
-    if ( ( impl = (struct text_part*)
-	   malloc(sizeof(struct text_part))) == 0) {
-	return 0;
-    }
-
-    impl->buf =  icalmemory_new_buffer(BUF_SIZE);
-    impl->buf_pos = impl->buf;
-    impl->buf_size = BUF_SIZE;
-
-    return impl;    
-}
-void icalmime_text_add_line(void *part, 
-			    struct sspm_header *header, 
-			    char* line, size_t size)
-{
-    struct text_part* impl = (struct text_part*) part;
-
-    icalmemory_append_string(&(impl->buf),&(impl->buf_pos),
-			     &(impl->buf_size),line);
-    
-}
-
-void* icalmime_textcalendar_end_part(void* part)
-{
-
-    struct text_part* impl = (struct text_part*) part;
-    icalcomponent *c = icalparser_parse_string(impl->buf);
-
-    icalmemory_free_buffer(impl->buf);
-    free(impl);
-
-    return c;
-
-}
-
-void* icalmime_text_end_part(void* part)
-{
-    struct text_part* impl = ( struct text_part*) part;
-
-    icalmemory_add_tmp_buffer(impl->buf);
-    free(impl);
-
-    return impl->buf;
-}
-
-void icalmime_text_free_part(void *part)
-{
-    part = part;
-}
-
-
-/* Ignore Attachments for now */
-
-void* icalmime_attachment_new_part()
-{
-    return 0;
-}
-void icalmime_attachment_add_line(void *part, struct sspm_header *header, 
-				  char* line, size_t size)
-{
-    part = part;
-    header = header;
-    line = line;
-    size = size;
-}
-
-void* icalmime_attachment_end_part(void* part)
-{
-    return 0;
-}
-
-void icalmime_attachment_free_part(void *part)
-{
-}
-
-
-
-
-struct sspm_action_map icalmime_local_action_map[] = 
-{
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_textcalendar_end_part,icalmime_text_free_part},
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_ANY_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part},
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_PLAIN_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part},
-    {SSPM_APPLICATION_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_AUDIO_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-   {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE,0,0,0,0}
-};
-
-#define NUM_PARTS 100 /* HACK. Hard Limit */
-
-
-
-struct sspm_part* icalmime_make_part(icalcomponent* comp)
-{
-    comp = comp;
-    return 0;
-}
-
-char* icalmime_as_mime_string(char* icalcomponent);
-
-icalcomponent* icalmime_parse(char* (*get_string)(char *s, size_t size, 
-						       void *d),
-				void *data)
-{
-    struct sspm_part *parts;
-    int i, last_level=0;
-    icalcomponent *root=0, *parent=0, *comp=0, *last = 0;
-
-    if ( (parts = (struct sspm_part *)
-	  malloc(NUM_PARTS*sizeof(struct sspm_part)))==0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(parts,0,sizeof(parts));
-
-    sspm_parse_mime(parts, 
-		    NUM_PARTS, /* Max parts */
-		    icalmime_local_action_map, /* Actions */ 
-		    get_string,
-		    data, /* data for get_string*/
-		    0 /* First header */);
-
-
-
-    for(i = 0; i <NUM_PARTS && parts[i].header.major != SSPM_NO_MAJOR_TYPE ; i++){
-
-#define TMPSZ 1024
-	char mimetype[TMPSZ];			       
-	char* major = sspm_major_type_string(parts[i].header.major);
-	char* minor = sspm_minor_type_string(parts[i].header.minor);
-
-	if(parts[i].header.minor == SSPM_UNKNOWN_MINOR_TYPE ){
-	    assert(parts[i].header.minor_text !=0);
-	    minor = parts[i].header.minor_text;
-	}
-	
-	sprintf(mimetype,"%s/%s",major,minor);
-
-	comp = icalcomponent_new(ICAL_XLICMIMEPART_COMPONENT);
-
-	if(comp == 0){
-	    /* HACK Handle Error */
-	    assert(0);
-	}
-
-	if(parts[i].header.error!=SSPM_NO_ERROR){
-	    char *str;
-	    char* temp[256];
-
-	    if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
-		str = "Got an unexpected boundary, possibly due to a MIME header for a MULTIPART part that is missing the Content-Type line";
-	    }
-
-	    if(parts[i].header.error==SSPM_WRONG_BOUNDARY_ERROR){
-		str = "Got the wrong boundary for the opening of a MULTIPART part.";
-	    }
-
-	    if(parts[i].header.error==SSPM_NO_BOUNDARY_ERROR){
-		str = "Got a multipart header that did not specify a boundary";
-	    }
-
-	    if(parts[i].header.error==SSPM_NO_HEADER_ERROR){
-		str = "Did not get a header for the part. Is there a blank\
-line between the header and the previous boundary\?";
-
-	    }
-
-	    if(parts[i].header.error_text != 0){
-		snprintf((char*)temp,256,
-			 "%s: %s",str,parts[i].header.error_text);
-	    } else {
-		strcpy((char*)temp,str);
-	    }
-
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     (char*)temp,
-		     icalparameter_new_xlicerrortype(
-			 ICAL_XLICERRORTYPE_MIMEPARSEERROR),
-		     0));  
-	}
-
-	if(parts[i].header.major != SSPM_NO_MAJOR_TYPE &&
-	   parts[i].header.major != SSPM_UNKNOWN_MAJOR_TYPE){
-
-	    icalcomponent_add_property(comp,
-		icalproperty_new_xlicmimecontenttype((char*)
-				icalmemory_strdup(mimetype)));
-
-	}
-
-	if (parts[i].header.encoding != SSPM_NO_ENCODING){
-
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimeencoding(
-		   sspm_encoding_string(parts[i].header.encoding)));
-	}
-
-	if (parts[i].header.filename != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimefilename(parts[i].header.filename));
-	}
-
-	if (parts[i].header.content_id != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimecid(parts[i].header.content_id));
-	}
-
-	if (parts[i].header.charset != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimecharset(parts[i].header.charset));
-	}
-
-	/* Add iCal components as children of the component */
-	if(parts[i].header.major == SSPM_TEXT_MAJOR_TYPE &&
-	   parts[i].header.minor == SSPM_CALENDAR_MINOR_TYPE &&
-	   parts[i].data != 0){
-
-	    icalcomponent_add_component(comp,
-					(icalcomponent*)parts[i].data);
-	    parts[i].data = 0;
-
-	} else 	if(parts[i].header.major == SSPM_TEXT_MAJOR_TYPE &&
-	   parts[i].header.minor != SSPM_CALENDAR_MINOR_TYPE &&
-	   parts[i].data != 0){
-
-	    /* Add other text components as "DESCRIPTION" properties */
-
-	    icalcomponent_add_property(comp,
-               icalproperty_new_description(
-		   (char*)icalmemory_strdup((char*)parts[i].data)));
-
-	    parts[i].data = 0;
-	}
-	
-
-	if(root!= 0 && parts[i].level == 0){
-	    /* We've already assigned the root, but there is another
-               part at the root level. This is probably a parse
-               error*/
-	    icalcomponent_free(comp);
-	    continue;
-	}
-
-	if(parts[i].level == last_level && last_level != 0){
-	    icalerror_assert(parent!=0,"No parent for adding component");
-
-	    icalcomponent_add_component(parent,comp);
-
-	} else if (parts[i].level == last_level && last_level == 0 &&
-	    root == 0) {
-
-	    root = comp;
-	    parent = comp;
-
-	} else if (parts[i].level > last_level){	    
-
-	    parent = last;
-	    icalcomponent_add_component(parent,comp);
-
-	    last_level = parts[i].level;
-
-	} else if (parts[i].level < last_level){
-
-	    parent = icalcomponent_get_parent(parent);
-	    icalcomponent_add_component(parent,comp);
-
-	    last_level = parts[i].level;
-	} else { 
-	    assert(0);
-	}
-
-	last = comp;
-	last_level = parts[i].level;
-	assert(parts[i].data == 0);
-    }
-
-    sspm_free_parts(parts,NUM_PARTS);
-    free(parts);
-
-    return root;
-}
-
-
-
-int icalmime_test(char* (*get_string)(char *s, size_t size, void *d),
-		  void *data)
-{
-    char *out;
-    struct sspm_part *parts;
-    int i;
-
-    if ( (parts = (struct sspm_part *)
-	  malloc(NUM_PARTS*sizeof(struct sspm_part)))==0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(parts,0,sizeof(parts));
-
-    sspm_parse_mime(parts, 
-		    NUM_PARTS, /* Max parts */
-		    icalmime_local_action_map, /* Actions */ 
-		    get_string,
-		    data, /* data for get_string*/
-		    0 /* First header */);
-
-   for(i = 0; i <NUM_PARTS && parts[i].header.major != SSPM_NO_MAJOR_TYPE ; 
-       i++){
-       if(parts[i].header.minor == SSPM_CALENDAR_MINOR_TYPE){
-	   parts[i].data = strdup(
-	       icalcomponent_as_ical_string((icalcomponent*)parts[i].data));
-       }
-   }
-
-    sspm_write_mime(parts,NUM_PARTS,&out,"To: bob@bob.org");
-
-    printf("%s\n",out);
-
-    return 0;
-
-}
-
-
diff --git a/libical/src/libical/icalmime.h b/libical/src/libical/icalmime.h
deleted file mode 100644
index b22288842d..0000000000
--- a/libical/src/libical/icalmime.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmime.h
- CREATOR: eric 26 July 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-======================================================================*/
-
-#ifndef ICALMIME_H
-#define ICALMIME_H
-
-#include "icalcomponent.h"
-#include "icalparser.h"
-
-icalcomponent* icalmime_parse(	char* (*line_gen_func)(char *s, size_t size, 
-						       void *d),
-				void *data);
-
-/* The inverse of icalmime_parse, not implemented yet. Use sspm.h directly.  */
-char* icalmime_as_mime_string(char* component);
-
-
-
-#endif /* !ICALMIME_H */
-
-
-
diff --git a/libical/src/libical/icalparameter.c.in b/libical/src/libical/icalparameter.c.in
deleted file mode 100644
index 6ffb9b27eb..0000000000
--- a/libical/src/libical/icalparameter.c.in
+++ /dev/null
@@ -1,1246 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedparameters.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  $Id: icalparameter.c.in,v 1.4 2001/02/09 07:09:46 jpr Exp $
-  $Locker:  $
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalderivedparameters.{c,h}
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
- ======================================================================*/
-/*#line 29 "icalparameter.c.in"*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "icalparameter.h"
-#include "icalproperty.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-
-#include <stdlib.h> /* for malloc() */
-#include <errno.h>
-#include <string.h> /* for memset() */
-
-union icalparameter_impl_data {
-	int v_int;
-	int v_rsvp;
-	icalparameter_cutype v_cutype;
-	icalparameter_encoding v_encoding;
-	icalparameter_fbtype v_fbtype;
-	icalparameter_partstat v_partstat;
-	icalparameter_range v_range;
-	icalparameter_related v_related;
-	icalparameter_reltype v_reltype;
-	icalparameter_role v_role;
-	icalparameter_value v_value;
-	icalparameter_xlicerrortype v_xlicerrortype;
-	icalparameter_xliccomparetype v_xliccomparetype;
-} data;
-
-struct icalparameter_impl
-{
-	icalparameter_kind kind;
-	char id[5];
-	int size;
-	const char* string;
-	const char* x_name;
-	icalproperty* parent;
-
-	union icalparameter_impl_data data;
-};
-
-struct icalparameter_impl* icalparameter_new_impl(icalparameter_kind kind)
-{
-    struct icalparameter_impl* v;
-
-    if ( ( v = (struct icalparameter_impl*)
-	   malloc(sizeof(struct icalparameter_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(v->id,"para");
-
-    v->kind = kind;
-    v->size = 0;
-    v->string = 0;
-    v->x_name = 0;
-    v->parent = 0;
-    memset(&(v->data),0,sizeof(v->data));
-
-    return v;
-}
-
-icalparameter*
-icalparameter_new (icalparameter_kind kind)
-{
-    struct icalparameter_impl* v = icalparameter_new_impl(kind);
-
-    return (icalparameter*) v;
-
-}
-
-icalparameter* 
-icalparameter_new_clone(icalparameter* param)
-{
-    struct icalparameter_impl *old;
-    struct icalparameter_impl *new;
-
-    old = (struct icalparameter_impl *)param;
-    new = icalparameter_new_impl(old->kind);
-
-    icalerror_check_arg_rz((param!=0),"param");
-
-    if (new == 0){
-	return 0;
-    }
-
-    memcpy(new,old,sizeof(struct icalparameter_impl));
-
-    if (old->string != 0){
-	new->string = icalmemory_strdup(old->string);
-	if (new->string == 0){
-	    icalparameter_free(new);
-	    return 0;
-	}
-    }
-
-    if (old->x_name != 0){
-	new->x_name = icalmemory_strdup(old->x_name);
-	if (new->x_name == 0){
-	    icalparameter_free(new);
-	    return 0;
-	}
-    }
-
-    return new;
-}
-
-#if 1
-/* The following code is meant to replace most of the case-switch
-   statements, but it is still a work in progress */
-struct param_string_map {
-	icalparameter_kind kind;
-	int val; /* Actually, union of several types of enums */
-	const char* str;
-} param_string_map[] =
-{
-    {ICAL_CUTYPE_PARAMETER,ICAL_CUTYPE_INDIVIDUAL,"INDIVIDUAL"},
-    {ICAL_CUTYPE_PARAMETER,ICAL_CUTYPE_GROUP,"GROUP"},
-    {ICAL_CUTYPE_PARAMETER,ICAL_CUTYPE_RESOURCE,"RESOURCE"},
-    {ICAL_CUTYPE_PARAMETER,ICAL_CUTYPE_ROOM,"ROOM"},
-    {ICAL_CUTYPE_PARAMETER,ICAL_CUTYPE_UNKNOWN,"UNKNOWN"},
-    {ICAL_FBTYPE_PARAMETER,ICAL_FBTYPE_FREE,"FREE"},
-    {ICAL_FBTYPE_PARAMETER,ICAL_FBTYPE_BUSY,"BUSY"},
-    {ICAL_FBTYPE_PARAMETER,ICAL_FBTYPE_BUSYUNAVAILABLE,"BUSYUNAVAILABLE"},
-    {ICAL_FBTYPE_PARAMETER,ICAL_FBTYPE_BUSYTENTATIVE,"BUSYTENTATIVE"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_NEEDSACTION,"NEEDS-ACTION"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_ACCEPTED,"ACCEPTED"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_DECLINED,"DECLINED"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_TENTATIVE,"TENTATIVE"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_DELEGATED,"DELEGATED"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_COMPLETED,"COMPLETED"},
-    {ICAL_PARTSTAT_PARAMETER,ICAL_PARTSTAT_INPROCESS,"INPROCESS"},
-    {ICAL_RANGE_PARAMETER,ICAL_RANGE_THISANDPRIOR,"THISANDPRIOR"},
-    {ICAL_RANGE_PARAMETER,ICAL_RANGE_THISANDFUTURE,"THISANDFUTURE"},
-    {ICAL_RELATED_PARAMETER,ICAL_RELATED_START,"START"},
-    {ICAL_RELATED_PARAMETER,ICAL_RELATED_END,"END"},
-    {ICAL_RELTYPE_PARAMETER,ICAL_RELTYPE_PARENT,"PARENT"},
-    {ICAL_RELTYPE_PARAMETER,ICAL_RELTYPE_CHILD,"CHILD"},
-    {ICAL_RELTYPE_PARAMETER,ICAL_RELTYPE_SIBLING,"SIBLING"},
-    {ICAL_ROLE_PARAMETER,ICAL_ROLE_CHAIR,"CHAIR"},
-    {ICAL_ROLE_PARAMETER,ICAL_ROLE_REQPARTICIPANT,"REQ-PARTICIPANT"},
-    {ICAL_ROLE_PARAMETER,ICAL_ROLE_OPTPARTICIPANT,"OPT-PARTICIPANT"}, 
-    {ICAL_ROLE_PARAMETER,ICAL_ROLE_NONPARTICIPANT,"NON-PARTICIPANT"},
-    {ICAL_RSVP_PARAMETER,ICAL_RSVP_PARAMETER,"TRUE"},
-    {ICAL_RSVP_PARAMETER,ICAL_RSVP_PARAMETER,"FALSE"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_BINARY,"BINARY"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_BOOLEAN,"BOOLEAN"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_DATE,"DATE"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_DURATION,"DURATION"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_FLOAT,"FLOAT"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_INTEGER,"INTEGER"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_PERIOD,"PERIOD"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_RECUR,"RECUR"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_TEXT,"TEXT"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_TIME,"TIME"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_URI,"URI"},
-    {ICAL_VALUE_PARAMETER,ICAL_VALUE_XNAME,"ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_COMPONENTPARSEERROR,"COMPONENT_PARSE_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_PROPERTYPARSEERROR,"PROPERTY_PARSE_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR,"PARAMETER_NAME_PARSE_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR,"PARAMETER_VALUE_PARSE_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_VALUEPARSEERROR,"VALUE_PARSE_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_INVALIDITIP,"INVALID_ITIP"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_UNKVCALPROP,"UNKNOWN_VCAL_PROP_ERROR"},
-    {ICAL_XLICERRORTYPE_PARAMETER,ICAL_XLICERRORTYPE_MIMEPARSEERROR,"MIME_PARSE_ERROR"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_EQUAL,"EQUAL"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_NOTEQUAL,"NOTEQUAL"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_LESS,"LESS"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_GREATER,"GREATER"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_LESSEQUAL,"LESSEQUAL"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_GREATEREQUAL,"GREATEREQUAL"},
-    {ICAL_XLICCOMPARETYPE_PARAMETER,ICAL_XLICCOMPARETYPE_REGEX,"REGEX"},
-    {ICAL_NO_PARAMETER,0,""},
-
-};
-
-void icalparameter_set_impl_data(icalparameter_kind kind, 
-				 union icalparameter_impl_data *data,
-				 int value)
-{
-
-    switch (kind){
-	case ICAL_CUTYPE_PARAMETER:
-	    data->v_cutype=value; break;
-	case ICAL_FBTYPE_PARAMETER:
-	    data->v_fbtype=value; break;
-	case ICAL_PARTSTAT_PARAMETER:
-	    data->v_partstat=value; break;
-	case ICAL_RANGE_PARAMETER:
-	    data->v_range=value; break;
-	case ICAL_RELATED_PARAMETER:
-	    data->v_related=value; break;
-	case ICAL_RELTYPE_PARAMETER:
-	    data->v_reltype=value; break;
-	case ICAL_ROLE_PARAMETER:
-	    data->v_role=value; break;
-	case ICAL_RSVP_PARAMETER:
-	    data->v_rsvp=value; break;
-	case ICAL_VALUE_PARAMETER:
-	    data->v_value=value; break;
-	case ICAL_XLICERRORTYPE_PARAMETER:
-	   data->v_xlicerrortype=value; break;
-	case ICAL_XLICCOMPARETYPE_PARAMETER:
-	   data->v_xliccomparetype=value; break;
-	default: 
-	    break;
-    }
-}
-
-icalparameter* icalparameter_new_from_string_test(icalparameter_kind kind, char* val)
-{
-    int i =0;
-    icalparameter* param=0;
-
-    icalerror_check_arg_rz((val!=0),"val");
-
-    switch(kind){
-	
-	/* These are all string values parameters */
-	case ICAL_SENTBY_PARAMETER:
-	case ICAL_TZID_PARAMETER:
-	case ICAL_X_PARAMETER:
-	case ICAL_FMTTYPE_PARAMETER:
-	case ICAL_LANGUAGE_PARAMETER:
-	case ICAL_MEMBER_PARAMETER:
-	case ICAL_DELEGATEDFROM_PARAMETER:
-	case ICAL_DELEGATEDTO_PARAMETER:
-	case ICAL_DIR_PARAMETER:
-	case ICAL_ALTREP_PARAMETER:
-	case ICAL_CN_PARAMETER:
-	{
-	    struct icalparameter_impl *impl = icalparameter_new_impl(kind);
-	    if (impl == 0) {
-		return 0;
-	    }
-	    ((struct icalparameter_impl*)param)->string = 
-		icalmemory_strdup(val);
-	    
-	    return (icalparameter*) impl;
-	    
-	}
-
-	case ICAL_NO_PARAMETER:
-	case ICAL_ANY_PARAMETER:
-	{
-	}
-
-	default: {
-	    int found = 0;
-	    /* All other types are enumerated */
-	    for(i = 0; param_string_map[i].kind != ICAL_NO_PARAMETER; i++){
-
-		if(kind ==  param_string_map[i].kind &&
-		   strcmp(val,param_string_map[i].str) == 0){		    
-
-		    struct icalparameter_impl *impl = 
-			icalparameter_new_impl(kind);
-		    found = 1;
-
-		    icalparameter_set_impl_data(kind,&impl->data,
-				param_string_map[i].val);		
-
-		    return (icalparameter*)impl;
-		} 
-	    }
-	    
-	    /* Didn't find the standard enumerated type, so it must be
-               an X parameter */
-	    if (found ==0) {
-		icalparameter *param = icalparameter_new(kind);
-		
-		icalparameter_set_xvalue(param,val);
-		
-		return param;
-
-	    }	   
-	}	    
-    }
-
-    return 0;
-}
-
-#endif 
-
-
-icalparameter* icalparameter_new_from_string(icalparameter_kind kind, char* val)
-{
-
-    icalparameter* param=0;
-
-    icalerror_check_arg_rz((val!=0),"val");
-
-    switch (kind) {
-	case ICAL_ALTREP_PARAMETER:
-	{
-	    param = icalparameter_new_altrep(val);
-
-	    break;
-	}
-	case ICAL_CN_PARAMETER:
-	{
-	    param = icalparameter_new_cn(val);
-
-	    break;
-	}
-	case ICAL_CUTYPE_PARAMETER:
-	{
-	    if(strcmp(val,"INDIVIDUAL") == 0){ 
-		param = icalparameter_new_cutype(ICAL_CUTYPE_INDIVIDUAL);
-	    }
-	    else if(strcmp(val,"GROUP") == 0){ 
-		param = icalparameter_new_cutype(ICAL_CUTYPE_GROUP);
-	    }
-	    else if(strcmp(val,"RESOURCE") == 0){ 
-		param = icalparameter_new_cutype(ICAL_CUTYPE_RESOURCE);
-	    }
-	    else if(strcmp(val,"ROOM") == 0){ 
-		param = icalparameter_new_cutype(ICAL_CUTYPE_ROOM);
-	    }
-	    else if(strcmp(val,"UNKNOWN") == 0){ 
-		param = icalparameter_new_cutype(ICAL_CUTYPE_UNKNOWN);
-	    }
-	    else {
-		param = icalparameter_new_cutype(ICAL_CUTYPE_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-
-	case ICAL_DELEGATEDFROM_PARAMETER:
-	{
-	    param = icalparameter_new_delegatedfrom(val);
-
-	    break;
-	}
-	case ICAL_DELEGATEDTO_PARAMETER:
-	{
-	    param = icalparameter_new_delegatedto(val);
-
-	    break;
-	}
-	case ICAL_DIR_PARAMETER:
-	{
-	    param = icalparameter_new_dir(val);
-
-	    break;
-	}
-	case ICAL_ENCODING_PARAMETER:
-	{
-	    if(strcmp(val,"BIT8") == 0){ 
-		param = icalparameter_new_encoding(ICAL_ENCODING_8BIT);
-	    }
-	    else if(strcmp(val,"BASE64") == 0){ 
-		param = icalparameter_new_encoding(ICAL_ENCODING_BASE64);
-	    }
-	    else {
-		param = icalparameter_new_encoding(ICAL_ENCODING_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-	case ICAL_FBTYPE_PARAMETER:
-	{
-	    if(strcmp(val,"FREE") == 0){ 
-		param = icalparameter_new_fbtype(ICAL_FBTYPE_FREE);
-	    }
-	    else if(strcmp(val,"BUSY") == 0){ 
-		param = icalparameter_new_fbtype(ICAL_FBTYPE_BUSY);
-	    }
-	    else if(strcmp(val,"BUSYUNAVAILABLE") == 0){ 
-		param = icalparameter_new_fbtype(ICAL_FBTYPE_BUSYUNAVAILABLE);
-	    }
-	    else if(strcmp(val,"BUSYTENTATIVE") == 0){ 
-		param = icalparameter_new_fbtype(ICAL_FBTYPE_BUSYTENTATIVE);
-	    }
-	    else {
-		param = icalparameter_new_fbtype(ICAL_FBTYPE_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-	case ICAL_FMTTYPE_PARAMETER:
-	{
-	    param = icalparameter_new_fmttype(val);
-	    break;
-	}
-	case ICAL_LANGUAGE_PARAMETER:
-	{
-	    param = icalparameter_new_language(val);
-
-	    break;
-	}
-	case ICAL_MEMBER_PARAMETER:
-	{
-	    param = icalparameter_new_member(val);
-
-	    break;
-	}
-	case ICAL_PARTSTAT_PARAMETER:
-	{
-	    if(strcmp(val,"NEEDS-ACTION") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_NEEDSACTION);
-	    }
-	    else if(strcmp(val,"ACCEPTED") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_ACCEPTED);
-	    }
-	    else if(strcmp(val,"DECLINED") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_DECLINED);
-	    }
-	    else if(strcmp(val,"TENTATIVE") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE);
-	    }
-	    else if(strcmp(val,"DELEGATED") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_DELEGATED);
-	    }
-	    else if(strcmp(val,"COMPLETED") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_COMPLETED);
-	    }
-	    else if(strcmp(val,"INPROCESS") == 0){ 
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_INPROCESS);
-	    }
-	    else {
-		param = icalparameter_new_partstat(ICAL_PARTSTAT_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-	case ICAL_RANGE_PARAMETER:
-	{
-	    if(strcmp(val,"THISANDFUTURE") == 0){ 
-		param = icalparameter_new_range(ICAL_RANGE_THISANDFUTURE);
-	    }
-	    else if(strcmp(val,"THISANDPRIOR") == 0){ 
-		param = icalparameter_new_range(ICAL_RANGE_THISANDPRIOR);
-	    }
-
-	    break;
-	}
-	case ICAL_RELATED_PARAMETER:
-	{
-	    if(strcmp(val,"START") == 0){ 
-		param = icalparameter_new_related(ICAL_RELATED_START);
-	    }
-	    else if(strcmp(val,"END") == 0){ 
-		param = icalparameter_new_related(ICAL_RELATED_END);
-	    }
-
-	    break;
-	}
-	case ICAL_RELTYPE_PARAMETER:
-	{
-	    if(strcmp(val,"PARENT") == 0){ 
-		param = icalparameter_new_reltype(ICAL_RELTYPE_PARENT);
-	    }
-	    else if(strcmp(val,"CHILD") == 0){ 
-		param = icalparameter_new_reltype(ICAL_RELTYPE_CHILD);
-	    }
-	    else if(strcmp(val,"SIBLING") == 0){ 
-		param = icalparameter_new_reltype(ICAL_RELTYPE_SIBLING);
-	    }
-	    else {
-		param = icalparameter_new_reltype(ICAL_RELTYPE_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-	case ICAL_ROLE_PARAMETER:
-	{
-	    if(strcmp(val,"CHAIR") == 0){ 
-		param = icalparameter_new_role(ICAL_ROLE_CHAIR);
-	    }
-	    else if(strcmp(val,"REQ-PARTICIPANT") == 0){ 
-		param = icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT);
-	    }
-	    else if(strcmp(val,"OPT-PARTICIPANT") == 0){ 
-		param = icalparameter_new_role(ICAL_ROLE_OPTPARTICIPANT);
-	    }
-	    else if(strcmp(val,"NON-PARTICIPANT") == 0){ 
-		param = icalparameter_new_role(ICAL_ROLE_NONPARTICIPANT);
-	    }
-	    else {
-		param = icalparameter_new_role(ICAL_ROLE_XNAME);
-		icalparameter_set_xvalue(param,val);
-	    } 
-	    break;
-	}
-	case ICAL_RSVP_PARAMETER:
-	{
-	    if(strcmp(val,"TRUE") == 0){ 
-		param = icalparameter_new_rsvp(1);
-	    }
-	    else if(strcmp(val,"FALSE") == 0){ 
-		param = icalparameter_new_rsvp(0);
-	    }
-
-	    break;
-	}
-	case ICAL_SENTBY_PARAMETER:
-	{
-	    param = icalparameter_new_sentby(val);
-
-	    break;
-	}
-	case ICAL_TZID_PARAMETER:
-	{
-	    param = icalparameter_new_tzid(val);
-
-	    break;
-	}
-	case ICAL_VALUE_PARAMETER:
-	{
-	    if(strcmp(val,"BINARY") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_BINARY);
-	    }
-	    else if(strcmp(val,"BOOLEAN") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_BOOLEAN);
-	    }
-	    else if(strcmp(val,"CAL-ADDRESS") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_CALADDRESS);
-	    }
-	    else if(strcmp(val,"DATE") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_DATE);
-	    }
-	    else if(strcmp(val,"DATE-TIME") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_DATETIME);
-	    }
-	    else if(strcmp(val,"DURATION") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_DURATION);
-	    }
-	    else if(strcmp(val,"FLOAT") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_FLOAT);
-	    }
-	    else if(strcmp(val,"INTEGER") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_INTEGER);
-	    }
-	    else if(strcmp(val,"PERIOD") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_PERIOD);
-	    }
-	    else if(strcmp(val,"RECUR") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_RECUR);
-	    }
-	    else if(strcmp(val,"TEXT") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_TEXT);
-	    }
-	    else if(strcmp(val,"TIME") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_TIME);
-	    }
-	    else if(strcmp(val,"URI") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_URI);
-	    }
-	    else if(strcmp(val,"UTC-OFFSET") == 0){ 
-		param = icalparameter_new_value(ICAL_VALUE_UTCOFFSET);
-	    }
-	    else {
-		param = 0;
-	    } 
-	    break;
-	}
-	case ICAL_XLICERRORTYPE_PARAMETER:
-	{
-
-	    if(strcmp(val,"COMPONENT_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	    }
-	    else if(strcmp(val,"PROPERTY_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_PROPERTYPARSEERROR);
-	    }
-	    else if(strcmp(val,"PARAMETER_NAME_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
-	    }
-	    else if(strcmp(val,"PARAMETER_VALUE_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR);
-	    }
-	    else if(strcmp(val,"VALUE_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_VALUEPARSEERROR);
-	    }
-	    else if(strcmp(val,"INVALID_ITIP") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP);
-	    }
-	    else if(strcmp(val,"MIME_PARSE_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_MIMEPARSEERROR);
-	    }
-	    else if(strcmp(val,"UNKNOWN_VCAL_PROP_ERROR") == 0){ 
-		param = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_UNKVCALPROP);
-	    }
-	    break;
-	}
-
-	case ICAL_XLICCOMPARETYPE_PARAMETER:
-	{
-
-	    if(strcmp(val,"EQUAL") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL);
-	    }
-	    else if(strcmp(val,"NOTEQUAL") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_NOTEQUAL);
-	    }
-	    else if(strcmp(val,"LESS") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_LESS);
-	    }
-	    else if(strcmp(val,"GREATER") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_GREATER);
-	    }
-	    else if(strcmp(val,"LESSEQUAL") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_LESSEQUAL);
-	    }
-	    else if(strcmp(val,"GREATEREQUAL") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_GREATEREQUAL);
-	    }
-	    else if(strcmp(val,"REGEX") == 0){ 
-		param = icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_REGEX);
-	    } else {
-		param = 0;
-	    }
-	    break;
-	}
-	
-
-	case ICAL_X_PARAMETER:
-	{
-		param = icalparameter_new(ICAL_FBTYPE_PARAMETER);
-		icalparameter_set_xvalue(param,val);
-	    break;
-	}
-
-	case ICAL_NO_PARAMETER: 
-	default:
-	{
-	    return 0;
-	}
-	
-
-    }
-    
-    return param;
-}
-
-void
-icalparameter_free (icalparameter* parameter)
-{
-    struct icalparameter_impl * impl;
-
-    impl = (struct icalparameter_impl*)parameter;
-
-/*  HACK. This always triggers, even when parameter is non-zero
-    icalerror_check_arg_rv((parameter==0),"parameter");*/
-
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (impl->parent ==0),"Tried to free a parameter that is still attached to a component. ");
-    
-#else
-    if(impl->parent !=0){
-	return;
-    }
-#endif
-
-    
-    if (impl->string != 0){
-	free ((void*)impl->string);
-    }
-    
-    if (impl->x_name != 0){
-	free ((void*)impl->x_name);
-    }
-    
-    memset(impl,0,sizeof(impl));
-
-    impl->parent = 0;
-    impl->id[0] = 'X';
-    free(impl);
-}
-
-
-char no_parameter[]="Error: No Parameter";
-char*
-icalparameter_as_ical_string (icalparameter* parameter)
-{
-    struct icalparameter_impl* impl;
-    size_t buf_size = 1024;
-    char* buf; 
-    char* buf_ptr;
-    char *out_buf;
-    const char *kind_string;
-
-    char tend[1024]; /* HACK . Should be using memory buffer ring */
-
-    icalerror_check_arg_rz( (parameter!=0), "parameter");
-
-    /* Create new buffer that we can append names, parameters and a
-       value to, and reallocate as needed. Later, this buffer will be
-       copied to a icalmemory_tmp_buffer, which is managed internally
-       by libical, so it can be given to the caller without fear of
-       the caller forgetting to free it */
-
-    buf = icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-    impl = (struct icalparameter_impl*)parameter;
-
-    if(impl->kind == ICAL_X_PARAMETER) {
-
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, 
-				 icalparameter_get_xname(impl));
-
-    } else {
-
-	kind_string = icalenum_parameter_kind_to_string(impl->kind);
-	
-	if (impl->kind == ICAL_NO_PARAMETER || 
-	    impl->kind == ICAL_ANY_PARAMETER || 
-	    kind_string == 0)
-	{
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return 0;
-	}
-	
-	
-	/* Put the parameter name into the string */
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-
-    }
-
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, "=");
-    
-    switch (impl->kind) {
-	case ICAL_CUTYPE_PARAMETER:
-	{
-	    switch (impl->data.v_cutype) {
-		case ICAL_CUTYPE_INDIVIDUAL: {
-		    strcpy(tend,"INDIVIDUAL");break;
-		}
-		case ICAL_CUTYPE_GROUP:{
-		    strcpy(tend,"GROUP");break;
-		}
-		case ICAL_CUTYPE_RESOURCE: {
-		    strcpy(tend,"RESOURCE");break;
-		}
-		case ICAL_CUTYPE_ROOM:{
-		    strcpy(tend,"ROOM");break;
-		}
-		case ICAL_CUTYPE_UNKNOWN:{
-		    strcpy(tend,"UNKNOWN");break;
-		}
-		case ICAL_CUTYPE_XNAME:{
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}		
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-
-	}
-	case ICAL_ENCODING_PARAMETER:
-	{
-	    switch (impl->data.v_encoding) {
-		case ICAL_ENCODING_8BIT: {
-		    strcpy(tend,"8BIT");break;
-		}
-		case ICAL_ENCODING_BASE64:{
-		    strcpy(tend,"BASE64");break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-
-	case ICAL_FBTYPE_PARAMETER:
-	{
-	    switch (impl->data.v_fbtype) {
-		case ICAL_FBTYPE_FREE:{
-		    strcpy(tend,"FREE");break;
-		}
-		case ICAL_FBTYPE_BUSY: {
-		    strcpy(tend,"BUSY");break;
-		}
-		case ICAL_FBTYPE_BUSYUNAVAILABLE:{
-		    strcpy(tend,"BUSYUNAVAILABLE");break;
-		}
-		case ICAL_FBTYPE_BUSYTENTATIVE:{
-		    strcpy(tend,"BUSYTENTATIVE");break;
-		}
-		case ICAL_FBTYPE_XNAME:{
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-
-	}
-	case ICAL_PARTSTAT_PARAMETER:
-	{
-	    switch (impl->data.v_partstat) {
-		case ICAL_PARTSTAT_NEEDSACTION: {
-		    strcpy(tend,"NEEDS-ACTION");break;
-		}
-		case ICAL_PARTSTAT_ACCEPTED: {
-		    strcpy(tend,"ACCEPTED");break;
-		}
-		case ICAL_PARTSTAT_DECLINED:{
-		    strcpy(tend,"DECLINED");break;
-		}
-		case ICAL_PARTSTAT_TENTATIVE:{
-		    strcpy(tend,"TENTATIVE");break;
-		}
-		case ICAL_PARTSTAT_DELEGATED:{
-		    strcpy(tend,"DELEGATED");break;
-		}
-		case ICAL_PARTSTAT_COMPLETED:{
-		    strcpy(tend,"COMPLETED");break;
-		}
-		case ICAL_PARTSTAT_INPROCESS:{
-		    strcpy(tend,"INPROCESS");break;
-		}
-		case ICAL_PARTSTAT_XNAME:{
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-
-	}
-	case ICAL_RANGE_PARAMETER:
-	{
-	    switch (impl->data.v_range) {
-		case ICAL_RANGE_THISANDPRIOR: {
-		    strcpy(tend,"THISANDPRIOR");break;
-		}
-		case ICAL_RANGE_THISANDFUTURE: {
-		    strcpy(tend,"THISANDFUTURE");break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-	case ICAL_RELATED_PARAMETER:
-	{
-	    switch (impl->data.v_related) {
-		case ICAL_RELATED_START: {
-		    strcpy(tend,"START");break;
-		}
-		case ICAL_RELATED_END: {
-		    strcpy(tend,"END");break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-	case ICAL_RELTYPE_PARAMETER:
-	{
-	    switch (impl->data.v_reltype) {
-		case ICAL_RELTYPE_PARENT: {
-		    strcpy(tend,"PARENT");break;
-		}
-		case ICAL_RELTYPE_CHILD:{
-		    strcpy(tend,"CHILD");break;
-		}
-		case ICAL_RELTYPE_SIBLING:{
-		    strcpy(tend,"SIBLING");break;
-		}
-		case ICAL_RELTYPE_XNAME:{
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-	case ICAL_ROLE_PARAMETER:
-	{
-	    switch (impl->data.v_role) {
-		case ICAL_ROLE_CHAIR: {
-		    strcpy(tend,"CHAIR");break;
-		}
-		case ICAL_ROLE_REQPARTICIPANT: {
-		    strcpy(tend,"REQ-PARTICIPANT");break;
-		}
-		case ICAL_ROLE_OPTPARTICIPANT:  {
-		    strcpy(tend,"OPT-PARTICIPANT");break;
-		}
-		case ICAL_ROLE_NONPARTICIPANT: {
-		    strcpy(tend,"NON-PARTICIPANT");break;
-		}
-		case ICAL_ROLE_XNAME:{
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-	case ICAL_RSVP_PARAMETER:
-	{
-	    switch (impl->data.v_rsvp) {
-		case 1: {
-		    strcpy(tend,"TRUE");break;
-		}
-		case 0: {
-		    strcpy(tend,"FALSE");break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-	case ICAL_VALUE_PARAMETER:
-	{
-	    switch (impl->data.v_value) {
-		case ICAL_VALUE_BINARY:  {
-		    strcpy(tend,"BINARY");break;
-		}
-		case ICAL_VALUE_BOOLEAN:  {
-		    strcpy(tend,"BOOLEAN");break;
-		}
-		case ICAL_VALUE_CALADDRESS:  {
-		    strcpy(tend,"CAL-ADDRESS");break;
-		}
-		case ICAL_VALUE_DATE:  {
-		    strcpy(tend,"DATE");break;
-		}
-		case ICAL_VALUE_DATETIME:  {
-		    strcpy(tend,"DATE-TIME");break;
-		}
-		case ICAL_VALUE_DURATION:  {
-		    strcpy(tend,"DURATION");break;
-		}
-		case ICAL_VALUE_FLOAT:  {
-		    strcpy(tend,"FLOAT");break;
-		}
-		case ICAL_VALUE_INTEGER:  {
-		    strcpy(tend,"INTEGER");break;
-		}
-		case ICAL_VALUE_PERIOD:  {
-		    strcpy(tend,"PERIOD");break;
-		}
-		case ICAL_VALUE_RECUR:  {
-		    strcpy(tend,"RECUR");break;
-		}
-		case ICAL_VALUE_TEXT:  {
-		    strcpy(tend,"TEXT");break;
-		}
-		case ICAL_VALUE_TIME:  {
-		    strcpy(tend,"TIME");break;
-		}
-		case ICAL_VALUE_URI:  {
-		    strcpy(tend,"URI");break;
-		}
-		case ICAL_VALUE_UTCOFFSET: {
-		    strcpy(tend,"UTC-OFFSET");break;
-		}
-		case ICAL_VALUE_XNAME: {
-		    if (impl->string == 0){ return no_parameter;}
-		    strcpy(tend,impl->string);break;
-		}
-		default:{
-		    strcpy(tend,"ERROR");
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-	    }
-	    break;
-	}
-
-
-	case ICAL_XLICERRORTYPE_PARAMETER:
-	{
-	    switch (impl->data.v_xlicerrortype) {
-		case ICAL_XLICERRORTYPE_COMPONENTPARSEERROR:
-		{
-		    strcpy(tend,"COMPONENT_PARSE_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_PROPERTYPARSEERROR:
-		{
-		    strcpy(tend,"PROPERTY_PARSE_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR:
-		{
-		    strcpy(tend,"PARAMETER_NAME_PARSE_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR:
-		{
-		    strcpy(tend,"PARAMETER_VALUE_PARSE_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_VALUEPARSEERROR:
-		{
-		    strcpy(tend,"VALUE_PARSE_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_INVALIDITIP:
-		{
-		    strcpy(tend,"INVALID_ITIP");break;
-		}
-		case ICAL_XLICERRORTYPE_UNKVCALPROP:
-		{
-		    strcpy(tend,"UNKNOWN_VCAL_PROP_ERROR");break;
-		}
-		case ICAL_XLICERRORTYPE_MIMEPARSEERROR:
-		{
-		    strcpy(tend,"MIME_PARSE_ERROR");break;
-		}
-	    }
-	    break;
-	}
-	
-	case ICAL_XLICCOMPARETYPE_PARAMETER:
-	{
-	    switch (impl->data.v_xliccomparetype) {
-		case ICAL_XLICCOMPARETYPE_EQUAL:
-		{
-		    strcpy(tend,"EQUAL");break;
-		}
-		case ICAL_XLICCOMPARETYPE_NOTEQUAL:
-		{
-		    strcpy(tend,"NOTEQUAL");break;
-		}
-		case ICAL_XLICCOMPARETYPE_LESS:
-		{
-		    strcpy(tend,"LESS");break;
-		}
-		case ICAL_XLICCOMPARETYPE_GREATER:
-		{
-		    strcpy(tend,"GREATER");break;
-		}
-		case ICAL_XLICCOMPARETYPE_LESSEQUAL:
-		{
-		    strcpy(tend,"LESSEQUAL");break;
-		}
-		case ICAL_XLICCOMPARETYPE_GREATEREQUAL:
-		{
-		    strcpy(tend,"GREATEREQUAL");break;
-		}
-		case ICAL_XLICCOMPARETYPE_REGEX:
-		{
-		    strcpy(tend,"REGEX");break;
-		}
-		default:{
-		    icalerror_set_errno(ICAL_BADARG_ERROR);break;
-		}
-		break;
-	    }
-
-	    break;
-	}
-
-
-	case ICAL_SENTBY_PARAMETER:
-	case ICAL_TZID_PARAMETER:
-	case ICAL_X_PARAMETER:
-	case ICAL_FMTTYPE_PARAMETER:
-	case ICAL_LANGUAGE_PARAMETER:
-	case ICAL_MEMBER_PARAMETER:
-	case ICAL_DELEGATEDFROM_PARAMETER:
-	case ICAL_DELEGATEDTO_PARAMETER:
-	case ICAL_DIR_PARAMETER:
-	case ICAL_ALTREP_PARAMETER:
-	case ICAL_CN_PARAMETER:
-	{
-	    if (impl->string == 0){ return no_parameter;}
-	    strcpy(tend,impl->string);break;
-	    break;
-	}
-
-	case ICAL_NO_PARAMETER:
-	case ICAL_ANY_PARAMETER:
-	{
-	    /* These are actually handled before the case/switch
-               clause */
-	}
-
-    }
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, tend); 
-
-    /* Now, copy the buffer to a tmp_buffer, which is safe to give to
-       the caller without worring about de-allocating it. */
-
-    
-    out_buf = icalmemory_tmp_buffer(strlen(buf));
-    strcpy(out_buf, buf);
-
-    icalmemory_free_buffer(buf);
-
-    return out_buf;
-
-}
-
-
-int
-icalparameter_is_valid (icalparameter* parameter);
-
-
-icalparameter_kind
-icalparameter_isa (icalparameter* parameter)
-{
-    if(parameter == 0){
-	return ICAL_NO_PARAMETER;
-    }
-
-    return ((struct icalparameter_impl *)parameter)->kind;
-}
-
-
-int
-icalparameter_isa_parameter (void* parameter)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl *)parameter;
-
-    if (parameter == 0){
-	return 0;
-    }
-
-    if (strcmp(impl->id,"para") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-void
-icalparameter_set_xname (icalparameter* param, const char* v)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-    icalerror_check_arg_rv( (param!=0),"param");
-    icalerror_check_arg_rv( (v!=0),"v");
-
-    if (impl->x_name != 0){
-	free((void*)impl->x_name);
-    }
-
-    impl->x_name = icalmemory_strdup(v);
-
-    if (impl->x_name == 0){
-	errno = ENOMEM;
-    }
-
-}
-
-const char*
-icalparameter_get_xname (icalparameter* param)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return impl->x_name;
-}
-
-void
-icalparameter_set_xvalue (icalparameter* param, const char* v)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-
-    icalerror_check_arg_rv( (param!=0),"param");
-    icalerror_check_arg_rv( (v!=0),"v");
-
-    if (impl->string != 0){
-	free((void*)impl->string);
-    }
-
-    impl->string = icalmemory_strdup(v);
-
-    if (impl->string == 0){
-	errno = ENOMEM;
-    }
-
-}
-
-const char*
-icalparameter_get_xvalue (icalparameter* param)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return impl->string;
-
-}
-
-void icalparameter_set_parent(icalparameter* param,
-			     icalproperty* property)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-
-    icalerror_check_arg_rv( (param!=0),"param");
-
-    impl->parent = property;
-}
-
-icalproperty* icalparameter_get_parent(icalparameter* param)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl*)param;
-
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return impl->parent;
-}
-
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalparameter.h.in b/libical/src/libical/icalparameter.h.in
deleted file mode 100644
index c215fa0fdc..0000000000
--- a/libical/src/libical/icalparameter.h.in
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalparam.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id: icalparameter.h.in,v 1.1.1.2 2001/01/23 19:20:40 jpr Exp $
-  $Locker:  $
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparam.h
-
-  ======================================================================*/
-
-#ifndef ICALPARAM_H
-#define ICALPARAM_H
-
-#include "icalenums.h"
-
-typedef void icalparameter;
-
-icalparameter* icalparameter_new(icalparameter_kind kind);
-icalparameter* icalparameter_new_clone(icalparameter* p);
-icalparameter* icalparameter_new_from_string(icalparameter_kind kind, char* value);
-
-void icalparameter_free(icalparameter* parameter);
-
-char* icalparameter_as_ical_string(icalparameter* parameter);
-
-int icalparameter_is_valid(icalparameter* parameter);
-
-icalparameter_kind icalparameter_isa(icalparameter* parameter);
-
-int icalparameter_isa_parameter(void* param);
-
-/* Acess the name of an X parameer */
-void icalparameter_set_xname (icalparameter* param, const char* v);
-const char* icalparameter_get_xname(icalparameter* param);
-void icalparameter_set_xvalue (icalparameter* param, const char* v);
-const char* icalparameter_get_xvalue(icalparameter* param);
-
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalparser.c b/libical/src/libical/icalparser.c
deleted file mode 100644
index 462fd164af..0000000000
--- a/libical/src/libical/icalparser.c
+++ /dev/null
@@ -1,1036 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalparser.c
-  CREATOR: eric 04 August 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "icalparser.h"
-#include "pvl.h"
-#include "icalmemory.h"
-#include "icalerror.h"
-#include "icalvalue.h"
-#include "icalparameter.h"
-#include "icalproperty.h"
-#include "icalcomponent.h"
-
-#include <string.h> /* For strncpy & size_t */
-#include <stdio.h> /* For FILE and fgets and sprintf */
-#include <stdlib.h> /* for free */
-
-
-extern icalvalue* icalparser_yy_value;
-void set_parser_value_state(icalvalue_kind kind);
-int ical_yyparse(void);
-
-char* icalparser_get_next_char(char c, char *str);
-char* icalparser_get_next_parameter(char* line,char** end);
-char* icalparser_get_next_value(char* line, char **end, icalvalue_kind kind);
-char* icalparser_get_prop_name(char* line, char** end);
-char* icalparser_get_param_name(char* line, char **end);
-
-#define TMP_BUF_SIZE 80
-
-struct icalparser_impl 
-{
-	int buffer_full;
-	size_t tmp_buf_size; 
-	char temp[TMP_BUF_SIZE];
-	icalcomponent *root_component;
-	int version; 
-	int level;
-	int lineno;
-	icalparser_state state;
-	pvl_list components;
-
-	void *line_gen_data;
-    
-};
-
-
-icalparser* icalparser_new(void)
-{
-    struct icalparser_impl* impl = 0;
-    if ( ( impl = (struct icalparser_impl*)
-	   malloc(sizeof(struct icalparser_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    impl->root_component = 0;
-    impl->components  = pvl_newlist();  
-    impl->level = 0;
-    impl->state = ICALPARSER_SUCCESS;
-
-    impl->tmp_buf_size = TMP_BUF_SIZE;
-    impl->buffer_full = 0;
-    impl->lineno = 0;
-
-    memset(impl->temp,0, TMP_BUF_SIZE);
-
-    return (icalparser*)impl;
-}
-
-
-void icalparser_free(icalparser* parser)
-{
-    struct icalparser_impl* impl = (struct icalparser_impl*)parser;
-    icalcomponent *c;
-
-    if (impl->root_component != 0){
-	icalcomponent_free(impl->root_component);
-    }
-
-    while( (c=pvl_pop(impl->components)) != 0){
-	icalcomponent_free(c);
-    }
-    
-    pvl_free(impl->components);
-    
-    free(impl);
-}
-
-void icalparser_set_gen_data(icalparser* parser, void* data)
-{
-    struct icalparser_impl* impl = (struct icalparser_impl*)parser;
-
-    impl->line_gen_data  = data;
-}
-
-
-icalvalue* icalvalue_new_From_string_with_error(icalvalue_kind kind, 
-                                                char* str, 
-                                                icalproperty **error);
-
-
-
-char* icalparser_get_next_char(char c, char *str)
-{
-    int quote_mode = 0;
-    char* p;
-    
-
-    for(p=str; *p!=0; p++){
-	
-	if ( quote_mode == 0 && *p=='"' && *(p-1) != '\\' ){
-	    quote_mode =1;
-	    continue;
-	}
-
-	if ( quote_mode == 1 && *p=='"' && *(p-1) != '\\' ){
-	    quote_mode =0;
-	    continue;
-	}
-
-	if (quote_mode == 0 &&  *p== c  && *(p-1) != '\\' ){
-	    return p;
-	}
-
-    }
-
-    return 0;
-}
-
-/* make a new tmp buffer out of a substring */
-char* make_segment(char* start, char* end)
-{
-    char *buf;
-    size_t size = (size_t)end - (size_t)start;
-    
-    buf = icalmemory_tmp_buffer(size+1);
-    
-
-    strncpy(buf,start,size);
-    *(buf+size) = 0;
-    
-    return buf;
-    
-}
-
-const char* input_buffer;
-const char* input_buffer_p;
-#define min(a,b) ((a) < (b) ? (a) : (b))   
-
-int icalparser_flex_input(char* buf, int max_size)
-{
-    int n = min(max_size,strlen(input_buffer_p));
-
-    if (n > 0){
-	memcpy(buf, input_buffer_p, n);
-	input_buffer_p += n;
-	return n;
-    } else {
-	return 0;
-    }
-}
-
-void icalparser_clear_flex_input(void)
-{
-    input_buffer_p = input_buffer+strlen(input_buffer);
-}
-
-/* Call the flex/bison parser to parse a complex value */
-
-icalvalue*  icalparser_parse_value(icalvalue_kind kind,
-                                   const char* str, icalproperty** error)
-{
-    int r;
-    input_buffer_p = input_buffer = str;
-
-    set_parser_value_state(kind);
-    icalparser_yy_value = 0;
-
-    r = ical_yyparse();
-
-    /* Error. Parse failed */
-    if( icalparser_yy_value == 0 || r != 0){
-
-	if(icalparser_yy_value !=0){
-	    icalvalue_free(icalparser_yy_value);
-	    icalparser_yy_value = 0;
-	}
-
-	return 0;
-    }
-
-    if (error != 0){
-	*error = 0;
-    }
-
-    return icalparser_yy_value;
-}
-
-char* icalparser_get_prop_name(char* line, char** end)
-{
-    char* p;
-    char* v;
-    char *str;
-
-    p = icalparser_get_next_char(';',line); 
-    v = icalparser_get_next_char(':',line); 
-    if (p== 0 && v == 0) {
-	return 0;
-    }
-
-    /* There is no ';' or, it is after the ';' that marks the beginning of
-       the value */
-    if (v!=0 && ( p == 0 || p > v)){
-	str = make_segment(line,v);
-	*end = v+1;
-    } else {
-	str = make_segment(line,p);
-	*end = p+1;
-    }
-
-    return str;
-}
-
-char* icalparser_get_param_name(char* line, char **end)
-{
-    
-    char* next; 
-    char *str;
-
-    next = icalparser_get_next_char('=',line);
-
-    if (next == 0) {
-	return 0;
-    }
-
-    str = make_segment(line,next);
-    *end = next+1;
-    return str;
-   
-}
-
-char* icalparser_get_next_paramvalue(char* line, char **end)
-{
-    
-    char* next; 
-    char *str;
-
-    next = icalparser_get_next_char(',',line);
-
-    if (next == 0){
-	next = (char*)(size_t)line+(size_t)strlen(line);\
-    }
-
-    if (next == line){
-	return 0;
-    } else {
-	str = make_segment(line,next);
-	*end = next+1;
-	return str;
-    }
-   
-}
-
-/* A property may have multiple values, if the values are seperated by
-   commas in the content line. This routine will look for the next
-   comma after line and will set the next place to start searching in
-   end. */
-
-char* icalparser_get_next_value(char* line, char **end, icalvalue_kind kind)
-{
-    
-    char* next;
-    char *p;
-    char *str;
-    size_t length = strlen(line);
-
-    p = line;
-    while(1){
-
-	next = icalparser_get_next_char(',',p);
-
-	/* Unforunately, RFC2445 says that for the RECUR value, COMMA
-	   can both seperate digits in a list, and it can seperate
-	   multiple recurrence specifications. This is not a friendly
-	   part of the spec. This weirdness tries to
-	   distinguish the two uses. it is probably a HACK*/
-      
-	if( kind == ICAL_RECUR_VALUE ) {
-	    if ( next != 0 &&
-		 (*end+length) > next+5 &&
-		 strncmp(next,"FREQ",4) == 0
-		) {
-		/* The COMMA was followed by 'FREQ', is it a real seperator*/
-		/* Fall through */
-	    } else if (next != 0){
-		/* Not real, get the next COMMA */
-		p = next+1;
-		next = 0;
-		continue;
-	    } 
-	}
-
-	/* If the comma is preceeded by a '\', then it is a literal and
-	   not a value seperator*/  
-      
-	if ( (next!=0 && *(next-1) == '\\') ||
-	     (next!=0 && *(next-3) == '\\')
-	    ) 
-	    /*second clause for '/' is on prev line. HACK may be out of bounds */
-	{
-	    p = next+1;
-	} else {
-	    break;
-	}
-
-    }
-
-    if (next == 0){
-	next = (char*)(size_t)line+length;
-	*end = next;
-    } else {
-	*end = next+1;
-    }
-
-    if (next == line){
-	return 0;
-    } 
-	
-
-    str = make_segment(line,next);
-    return str;
-   
-}
-
-char* icalparser_get_next_parameter(char* line,char** end)
-{
-    char *next;
-    char *v;
-    char *str;
-
-    v = icalparser_get_next_char(':',line); 
-    next = icalparser_get_next_char(';', line);
-    
-    /* There is no ';' or, it is after the ':' that marks the beginning of
-       the value */
-
-    if (next == 0 || next > v) {
-	next = icalparser_get_next_char(':', line);
-    }
-
-    if (next != 0) {
-	str = make_segment(line,next);
-	*end = next+1;
-	return str;
-    } else {
-	*end = line;
-	return 0;
-    }
-}
-
-/* Get a single property line, from the property name through the
-   final new line, and include any continuation lines */
-
-char* icalparser_get_line(icalparser *parser,
-                          char* (*line_gen_func)(char *s, size_t size, void *d))
-{
-    char *line;
-    char *line_p;
-    struct icalparser_impl* impl = (struct icalparser_impl*)parser;
-    size_t buf_size = impl->tmp_buf_size;
-
-    
-    line_p = line = icalmemory_new_buffer(buf_size);
-    line[0] = '\0';
-   
-    while(1) {
-
-	/* The buffer is not clear, so transfer the data in it to the
-	   output. This may be left over from a previous call */
-	if (impl->temp[0] != '\0' ) {
-
-	    /* If the last position in the temp buffer is occupied,
-               mark the buffer as full. The means we will do another
-               read later, because the line is not finished */
-	    if (impl->temp[impl->tmp_buf_size-1] == 0 &&
-		impl->temp[impl->tmp_buf_size-2] != '\n'){
-		impl->buffer_full = 1;
-	    } else {
-		impl->buffer_full = 0;
-	    }
-
-	    /* Copy the temp to the output and clear the temp buffer. */
-	    icalmemory_append_string(&line,&line_p,&buf_size,impl->temp);     
-	    impl->temp[0] = '\0' ;
-	}
-	
-	impl->temp[impl->tmp_buf_size-1] = 1; /* Mark end of buffer */
-
-	if ((*line_gen_func)(impl->temp,impl->tmp_buf_size,impl->line_gen_data)
-	    ==0){/* Get more data */
-
-	    /* If the first position is clear, it means we didn't get
-               any more data from the last call to line_ge_func*/
-	    if (impl->temp[0] == '\0'){
-
-		if(line[0] != '\0'){
-		    /* There is data in the output, so fall trhough and process it*/
-		    break;
-		} else {
-		    /* No data in output; return and signal that there
-                       is no more input*/
-		    free(line);
-		    return 0;
-		}
-	    }
-	}
-	
- 
-	/* If the output line ends in a '\n' and the temp buffer
-	   begins with a ' ', then the buffer holds a continuation
-	   line, so keep reading.  */
-
-	if  ( line_p > line+1 && *(line_p-1) == '\n' && impl->temp[0] == ' ') {
-
-	    /* back up the pointer to erase the continuation characters */
-	    line_p--;
-
-	    if ( *(line_p-1) == '\r'){
-		line_p--;
-	    }
-
-	    /* shift the temp buffer down to eliminate the leading space*/
-	    memmove(&(impl->temp[0]),&(impl->temp[1]),impl->tmp_buf_size);
-
-	    impl->temp[impl->tmp_buf_size-1] = impl->temp[impl->tmp_buf_size-2];
-
-	} else if ( impl->buffer_full == 1 ) {
-	    
-	    /* The buffer was filled on the last read, so read again */
-
-	} else {
-
-	    /* Looks like the end of this content line, so break */
-	    break;
-	}
-
-	
-    }
-
-    /* Erase the final newline and/or carriage return*/
-    if ( line_p > line+1 && *(line_p-1) == '\n') {	
-	*(line_p-1) = '\0';
-	if ( *(line_p-2) == '\r'){
-	    *(line_p-2) = '\0';
-	}
-
-    } else {
-	*(line_p) = '\0';
-    }
-
-    return line;
-
-}
-
-void insert_error(icalcomponent* comp, char* text, 
-		  char* message, icalparameter_xlicerrortype type)
-{
-    char temp[1024];
-    
-    if (text == 0){
-	snprintf(temp,1024,"%s:",message);
-    } else {
-	snprintf(temp,1024,"%s: \'%s\'",message,text);
-    }	
-    
-    icalcomponent_add_property
-	(comp,
-	 icalproperty_vanew_xlicerror(
-	     temp,
-	     icalparameter_new_xlicerrortype(type),
-	     0));   
-}
-
-icalcomponent* icalparser_parse(icalparser *parser,
-				char* (*line_gen_func)(char *s, size_t size, 
-						       void* d))
-{
-
-    char* line; 
-    icalcomponent *c=0; 
-    icalcomponent *root=0;
-    struct icalparser_impl *impl = (struct icalparser_impl*)parser;
-
-    icalerror_check_arg_rz((parser !=0),"parser");
-
-    do{
-	line = icalparser_get_line(parser, line_gen_func);
-
-	if ((c = icalparser_add_line(parser,line)) != 0){
-
-	    if(icalcomponent_get_parent(c) !=0){
-		/* This is bad news... assert? */
-	    }	    
-	    
-	    assert(impl->root_component == 0);
-	    assert(pvl_count(impl->components) ==0);
-
-	    if (root == 0){
-		/* Just one component */
-		root = c;
-	    } else if(icalcomponent_isa(root) != ICAL_XROOT_COMPONENT) {
-		/*Got a second component, so move the two components under
-		  an XROOT container */
-		icalcomponent *tempc = icalcomponent_new(ICAL_XROOT_COMPONENT);
-		icalcomponent_add_component(tempc, root);
-		icalcomponent_add_component(tempc, c);
-		root = tempc;
-	    } else if(icalcomponent_isa(root) == ICAL_XROOT_COMPONENT) {
-		/* Already have an XROOT container, so add the component
-		   to it*/
-		icalcomponent_add_component(root, c);
-		
-	    } else {
-		/* Badness */
-		assert(0);
-	    }
-
-	    c = 0;
-
-        }
-	if(line != 0){
-	    free(line);
-	}
-    } while ( line != 0);
-
-    return root;
-
-}
-
-icalcomponent* icalparser_add_line(icalparser* parser,
-                                       char* line)
-{ 
-    char *p; 
-    char *str;
-    char *end;
-    int vcount = 0;
-    icalproperty *prop;
-    icalvalue *value;
-    icalvalue_kind value_kind = ICAL_NO_VALUE;
-
-
-    struct icalparser_impl *impl = (struct icalparser_impl*)parser;
-    icalerror_check_arg_rz((parser != 0),"parser");
-
-
-    if (line == 0)
-    {
-	impl->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-    /* Begin by getting the property name at the start of the line. The
-       property name may end up being "BEGIN" or "END" in which case it
-       is not really a property, but the marker for the start or end of
-       a component */
-
-    end = 0;
-    str = icalparser_get_prop_name(line, &end);
-
-    if (str == 0 || strlen(str) == 0 ){
-	/* Could not get a property name */
-	icalcomponent *tail = pvl_data(pvl_tail(impl->components));
-
-	if (tail){
-	    insert_error(tail,line,
-			 "Got a data line, but could not find a property name or component begin tag",
-			 ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	}
-	tail = 0;
-	impl->state = ICALPARSER_ERROR;
-	return 0; 
-    }
-
-    /**********************************************************************
-     * Handle begin and end of components
-     **********************************************************************/								       
-    /* If the property name is BEGIN or END, we are actually
-       starting or ending a new component */
-
-    if(strcmp(str,"BEGIN") == 0){
-	icalcomponent *c;
-
-	impl->level++;
-	str = icalparser_get_next_value(end,&end, value_kind);
-	    
-	c  = icalcomponent_new_from_string(str);
-
-	if (c == 0){
-	    c = icalcomponent_new(ICAL_XLICINVALID_COMPONENT);
-	    insert_error(c,str,"Parse error in component name",
-			 ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	}
-	    
-	pvl_push(impl->components,c);
-
-	impl->state = ICALPARSER_BEGIN_COMP;
-	return 0;
-
-    } else if (strcmp(str,"END") == 0 ) {
-	icalcomponent* tail;
-
-	impl->level--;
-	str = icalparser_get_next_value(end,&end, value_kind);
-
-	/* Pop last component off of list and add it to the second-to-last*/
-	impl->root_component = pvl_pop(impl->components);
-
-	tail = pvl_data(pvl_tail(impl->components));
-
-	if(tail != 0){
-	    icalcomponent_add_component(tail,impl->root_component);
-	} 
-
-	tail = 0;
-
-	/* Return the component if we are back to the 0th level */
-	if (impl->level == 0){
-	    icalcomponent *rtrn; 
-
-	    if(pvl_count(impl->components) != 0){
-	    /* There are still components on the stack -- this means
-               that one of them did not have a proper "END" */
-		pvl_push(impl->components,impl->root_component);
-		icalparser_clean(parser); /* may reset impl->root_component*/
-	    }
-
-	    assert(pvl_count(impl->components) == 0);
-
-	    impl->state = ICALPARSER_SUCCESS;
-	    rtrn = impl->root_component;
-	    impl->root_component = 0;
-	    return rtrn;
-
-	} else {
-	    impl->state = ICALPARSER_END_COMP;
-	    return 0;
-	}
-    }
-
-
-    /* There is no point in continuing if we have not seen a
-       component yet */
-
-    if(pvl_data(pvl_tail(impl->components)) == 0){
-	impl->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-
-    /**********************************************************************
-     * Handle property names
-     **********************************************************************/								       
-    /* At this point, the property name really is a property name,
-       (Not a component name) so make a new property and add it to
-       the component */
-
-    prop = icalproperty_new_from_string(str);
-
-    if (prop != 0){
-	icalcomponent *tail = pvl_data(pvl_tail(impl->components));
-
-	icalcomponent_add_property(tail, prop);
-
-	/* Set the value kind for the default for this type of
-	   property. This may be re-set by a VALUE parameter */
-	value_kind = 
-	    icalenum_property_kind_to_value_kind(
-		icalproperty_isa(prop));
-
-    } else {
-	icalcomponent* tail = pvl_data(pvl_tail(impl->components));
-
-	insert_error(tail,str,"Parse error in property name",
-		     ICAL_XLICERRORTYPE_PROPERTYPARSEERROR);
-	    
-	tail = 0;
-	impl->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-    /**********************************************************************
-     * Handle parameter values
-     **********************************************************************/								       
-
-    /* Now, add any parameters to the last property */
-
-    p = 0;
-    while(1) {
-
-	if (*(end-1) == ':'){
-	    /* if the last seperator was a ":" and the value is a
-	       URL, icalparser_get_next_parameter will find the
-	       ':' in the URL, so better break now. */
-	    break;
-	}
-
-	str = icalparser_get_next_parameter(end,&end);
-
-	if (str != 0){
-	    char* name;
-	    char* pvalue;
-        
-	    icalparameter *param = 0;
-	    icalparameter_kind kind;
-	    icalcomponent *tail = pvl_data(pvl_tail(impl->components));
-
-	    name = icalparser_get_param_name(str,&pvalue);
-
-	    if (name == 0){
-		/* 'tail' defined above */
-		insert_error(tail, str, "Can't parse parameter name",
-			     ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
-		tail = 0;
-		break;
-	    }
-
-	    kind = icalenum_string_to_parameter_kind(name);
-
-	    if(kind == ICAL_X_PARAMETER){
-		param = icalparameter_new(ICAL_X_PARAMETER);
-		
-		if(param != 0){
-		    icalparameter_set_xname(param,name);
-		    icalparameter_set_xvalue(param,pvalue);
-		}
-
-
-	    } else if (kind != ICAL_NO_PARAMETER){
-		param = icalparameter_new_from_string(kind,pvalue);
-	    } else {
-		/* Error. Failed to parse the parameter*/
-		/* 'tail' defined above */
-		insert_error(tail, str, "Can't parse parameter name",
-			     ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
-		tail = 0;
-		impl->state = ICALPARSER_ERROR;
-		return 0;
-	    }
-
-	    if (param == 0){
-		/* 'tail' defined above */
-		insert_error(tail,str,"Can't parse parameter value",
-			     ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR);
-		    
-		tail = 0;
-		impl->state = ICALPARSER_ERROR;
-		continue;
-	    }
-
-	    /* If it is a VALUE parameter, set the kind of value*/
-	    if (icalparameter_isa(param)==ICAL_VALUE_PARAMETER){
-
-		value_kind = (icalvalue_kind)
-		    icalparameter_get_value(param);
-
-		if (value_kind == ICAL_NO_VALUE){
-
-		    /* Ooops, could not parse the value of the
-		       parameter ( it was not one of the defined
-		       values ), so reset the value_kind */
-			
-		    insert_error(
-			tail, str, 
-			"Got a VALUE parameter with an unknown type",
-			ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR);
-		    icalparameter_free(param);
-			
-		    value_kind = 
-			icalenum_property_kind_to_value_kind(
-			    icalproperty_isa(prop));
-			
-		    icalparameter_free(param);
-		    tail = 0;
-		    impl->state = ICALPARSER_ERROR;
-		    return 0;
-		} 
-	    }
-
-	    /* Everything is OK, so add the parameter */
-	    icalproperty_add_parameter(prop,param);
-	    tail = 0;
-
-	} else { /* if ( str != 0)  */
-	    /* If we did not get a param string, go on to looking
-	       for a value */
-	    break;
-	} /* if ( str != 0)  */
-
-    } /* while(1) */	    
-	
-    /**********************************************************************
-     * Handle values
-     **********************************************************************/								       
-
-    /* Look for values. If there are ',' characters in the values,
-       then there are multiple values, so clone the current
-       parameter and add one part of the value to each clone */
-
-    vcount=0;
-    while(1) {
-	str = icalparser_get_next_value(end,&end, value_kind);
-
-	if (str != 0){
-		
-	    if (vcount > 0){
-		/* Actually, only clone after the second value */
-		icalproperty* clone = icalproperty_new_clone(prop);
-		icalcomponent* tail = pvl_data(pvl_tail(impl->components));
-		    
-		icalcomponent_add_property(tail, clone);
-		prop = clone;		    
-		tail = 0;
-	    }
-		
-	    value = icalvalue_new_from_string(value_kind, str);
-		
-	    /* Don't add properties without value */
-	    if (value == 0){
-		char temp[200]; /* HACK */
-
-		icalproperty_kind prop_kind = icalproperty_isa(prop);
-		icalcomponent* tail = pvl_data(pvl_tail(impl->components));
-
-		sprintf(temp,"Can't parse as %s value in %s property. Removing entire property",
-			icalenum_value_kind_to_string(value_kind),
-			icalenum_property_kind_to_string(prop_kind));
-
-		insert_error(tail, str, temp,
-			     ICAL_XLICERRORTYPE_VALUEPARSEERROR);
-
-		/* Remove the troublesome property */
-		icalcomponent_remove_property(tail,prop);
-		icalproperty_free(prop);
-		prop = 0;
-		tail = 0;
-		impl->state = ICALPARSER_ERROR;
-		return 0;
-		    
-	    } else {
-		vcount++;
-		icalproperty_set_value(prop, value);
-	    }
-
-
-	} else {
-	    if (vcount == 0){
-		char temp[200]; /* HACK */
-		
-		icalproperty_kind prop_kind = icalproperty_isa(prop);
-		icalcomponent *tail = pvl_data(pvl_tail(impl->components));
-		
-		sprintf(temp,"No value for %s property. Removing entire property",
-			icalenum_property_kind_to_string(prop_kind));
-
-		insert_error(tail, str, temp,
-			     ICAL_XLICERRORTYPE_VALUEPARSEERROR);
-
-		/* Remove the troublesome property */
-		icalcomponent_remove_property(tail,prop);
-		icalproperty_free(prop);
-		prop = 0;
-		tail = 0;
-		impl->state = ICALPARSER_ERROR;
-		return 0;
-	    } else {
-
-		break;
-	    }
-	}
-    }
-	
-    /****************************************************************
-     * End of component parsing. 
-     *****************************************************************/
-
-    if (pvl_data(pvl_tail(impl->components)) == 0 &&
-	impl->level == 0){
-	/* HACK. Does this clause ever get executed? */
-	impl->state = ICALPARSER_SUCCESS;
-	assert(0);
-	return impl->root_component;
-    } else {
-	impl->state = ICALPARSER_IN_PROGRESS;
-	return 0;
-    }
-
-}
-
-icalparser_state icalparser_get_state(icalparser* parser)
-{
-    struct icalparser_impl* impl = (struct icalparser_impl*) parser;
-    return impl->state;
-
-}
-
-icalcomponent* icalparser_clean(icalparser* parser)
-{
-    struct icalparser_impl* impl = (struct icalparser_impl*) parser;
-    icalcomponent *tail; 
-
-    icalerror_check_arg_rz((parser != 0 ),"parser");
-
-    /* We won't get a clean exit if some components did not have an
-       "END" tag. Clear off any component that may be left in the list */
-    
-    while((tail=pvl_data(pvl_tail(impl->components))) != 0){
-
-	insert_error(tail," ",
-		     "Missing END tag for this component. Closing component at end of input.",
-		     ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	
-
-	impl->root_component = pvl_pop(impl->components);
-	tail=pvl_data(pvl_tail(impl->components));
-
-	if(tail != 0){
-	    if(icalcomponent_get_parent(impl->root_component)!=0){
-		icalerror_warn("icalparser_clean is trying to attach a component for the second time");
-	    } else {
-		icalcomponent_add_component(tail,impl->root_component);
-	    }
-	}
-	    
-    }
-
-    return impl->root_component;
-
-}
-
-struct slg_data {
-	char* pos;
-	char* str;
-};
-
-char* string_line_generator(char *out, size_t buf_size, void *d)
-{
-    char *n;
-    size_t size;
-    struct slg_data* data = (struct slg_data*)d;
-
-    if(data->pos==0){
-	data->pos=data->str;
-    }
-
-    /* If the pointer is at the end of the string, we are done */
-    if (*(data->pos)==0){
-	return 0;
-    }
-
-    n = strchr(data->pos,'\n');
-    
-    if (n == 0){
-	size = strlen(data->pos);
-    } else {
-	n++; /* include newline in output */
-	size = (n-data->pos);	
-    }
-
-    if (size > buf_size-1){
-	size = buf_size-1;
-    }
-    
-
-    strncpy(out,data->pos,size);
-    
-    *(out+size) = '\0';
-    
-    data->pos += size;
-
-    return out;    
-}
-
-icalcomponent* icalparser_parse_string(char* str)
-{
-    icalcomponent *c;
-    struct slg_data d;
-    icalparser *p;
-
-    d.pos = 0;
-    d.str = str;
-
-    p = icalparser_new();
-    icalparser_set_gen_data(p,&d);
-    c = icalparser_parse(p,string_line_generator);
-    icalparser_free(p);
-
-    return c;
-
-}
diff --git a/libical/src/libical/icalparser.h b/libical/src/libical/icalparser.h
deleted file mode 100644
index efbe86eb21..0000000000
--- a/libical/src/libical/icalparser.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalparser.h
-  CREATOR: eric 20 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparser.h
-
-======================================================================*/
-
-
-#ifndef ICALPARSER_H
-#define ICALPARSER_H
-
-#include "icalenums.h"
-#include "icaltypes.h"
-#include"icalcomponent.h"
-
-#include <stdio.h> /* For FILE* */
-
-typedef void* icalparser;
-
-
-/***********************************************************************
- * Line-oriented parsing. 
- * 
- * Create a new parser via icalparse_new_parser, then add ines one at
- * a time with icalparse_add_line(). icalparser_add_line() will return
- * non-zero when it has finished with a component.
- ***********************************************************************/
-
-typedef enum icalparser_state {
-    ICALPARSER_ERROR,
-    ICALPARSER_SUCCESS,
-    ICALPARSER_BEGIN_COMP,
-    ICALPARSER_END_COMP,
-    ICALPARSER_IN_PROGRESS
-} icalparser_state;
-
-icalparser* icalparser_new(void);
-icalcomponent* icalparser_add_line(icalparser* parser, char* str );
-icalcomponent* icalparser_clean(icalparser* parser);
-icalparser_state icalparser_get_state(icalparser* parser);
-void icalparser_free(icalparser* parser);
-
-
-/***********************************************************************
- * Message oriented parsing.  icalparser_parse takes a string that
- * holds the text ( in RFC 2445 format ) and returns a pointer to an
- * icalcomponent. The caller owns the memory. line_gen_func is a
- * pointer to a function that returns one content line per invocation
- **********************************************************************/
-
-icalcomponent* icalparser_parse(icalparser *parser,
-				char* (*line_gen_func)(char *s, size_t size, void *d));
-
-/* Set the data that icalparser_parse will give to the line_gen_func
-   as the parameter 'd'*/
-void icalparser_set_gen_data(icalparser* parser, void* data);
-
-
-icalcomponent* icalparser_parse_string(char* str);
-
-
-/***********************************************************************
- * Parser support functions
- ***********************************************************************/
-
-/* Use the flex/bison parser to turn a string into a value type */
-icalvalue*  icalparser_parse_value(icalvalue_kind kind, 
-				   const char* str, icalcomponent** errors);
-
-/* Given a line generator function, return a single iCal content line.*/
-char* icalparser_get_line(icalparser* parser, char* (*line_gen_func)(char *s, size_t size, void *d));
-
-char* string_line_generator(char *out, size_t buf_size, void *d);
-
-#endif /* !ICALPARSE_H */
diff --git a/libical/src/libical/icalproperty.c.in b/libical/src/libical/icalproperty.c.in
deleted file mode 100644
index 936db3f728..0000000000
--- a/libical/src/libical/icalproperty.c.in
+++ /dev/null
@@ -1,616 +0,0 @@
-/* -*- Mode: C -*- */
-
-/*======================================================================
-  FILE: icalproperty.c
-  CREATOR: eric 28 April 1999
-  
-  $Id: icalproperty.c.in,v 1.4 2001/02/05 19:43:57 jpr Exp $
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalproperty.c
-
-======================================================================*/
-/*#line 27 "icalproperty.c.in"*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalproperty.h"
-#include "icalcomponent.h"
-#include "pvl.h"
-#include "icalenums.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-
-#include <string.h> /* For icalmemory_strdup, rindex */
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h> /* for printf */
-#include <stdarg.h> /* for va_list, va_start, etc. */
-                                               
-#define TMP_BUF_SIZE 1024
-
-/* Private routines for icalproperty */
-void icalvalue_set_parent(icalvalue* value,
-			     icalproperty* property);
-icalproperty* icalvalue_get_parent(icalvalue* value);
-
-void icalparameter_set_parent(icalparameter* param,
-			     icalproperty* property);
-icalproperty* icalparameter_get_parent(icalparameter* value);
-
-
-void icalproperty_set_x_name(icalproperty* prop, char* name);
-
-struct icalproperty_impl 
-{
-	char id[5];
-	icalproperty_kind kind;
-	char* x_name;
-	pvl_list parameters;
-	pvl_elem parameter_iterator;
-	icalvalue* value;
-	icalcomponent *parent;
-};
-
-void icalproperty_add_parameters(struct icalproperty_impl *impl,va_list args)
-{
-
-    void* vp;
-    
-    while((vp = va_arg(args, void*)) != 0) {
-
-	if (icalvalue_isa_value(vp) != 0 ){
-	} else if (icalparameter_isa_parameter(vp) != 0 ){
-
-	    icalproperty_add_parameter((icalproperty*)impl,
-				       (icalparameter*)vp);
-	} else {
-	    assert(0);
-	}
-
-    }
-    
-    
-}
-
-
-struct icalproperty_impl*
-icalproperty_new_impl (icalproperty_kind kind)
-{
-    struct icalproperty_impl* prop;
-
-    if ( ( prop = (struct icalproperty_impl*)
-	   malloc(sizeof(struct icalproperty_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(prop->id,"prop");
-
-    prop->kind = kind;
-    prop->parameters = pvl_newlist();
-    prop->parameter_iterator = 0;
-    prop->value = 0;
-    prop->x_name = 0;
-    prop->parent = 0;
-
-    return prop;
-}
-
-
-icalproperty*
-icalproperty_new (icalproperty_kind kind)
-{
-    icalproperty *prop = (icalproperty*)icalproperty_new_impl(kind);
-
-    return prop;
-}
-
-
-icalproperty*
-icalproperty_new_clone(icalproperty* prop)
-{
-    struct icalproperty_impl *old = (struct icalproperty_impl*)prop;
-    struct icalproperty_impl *new = icalproperty_new_impl(old->kind);
-    pvl_elem p;
-
-    icalerror_check_arg_rz((prop!=0),"Prop");
-    icalerror_check_arg_rz((old!=0),"old");
-    icalerror_check_arg_rz((new!=0),"new");
-
-    if (old->value !=0) {
-	new->value = icalvalue_new_clone(old->value);
-    }
-
-    if (old->x_name != 0) {
-
-	new->x_name = icalmemory_strdup(old->x_name);
-	
-	if (new->x_name == 0) {
-	    icalproperty_free(new);
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-    }
-
-    for(p=pvl_head(old->parameters);p != 0; p = pvl_next(p)){
-	icalparameter *param = icalparameter_new_clone(pvl_data(p));
-	
-	if (param == 0){
-	    icalproperty_free(new);
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-
-	pvl_push(new->parameters,param);
-    
-    } 
-
-    return new;
-
-}
-
-/* This one works a little differently from the other *_from_string
-   routines; the string input is the name of the property, not the
-   data associated with the property, as it is in
-   icalvalue_from_string. All of the parsing associated with
-   properties is driven by routines in icalparse.c */
-
-icalproperty* icalproperty_new_from_string(char* str)
-{
-    icalproperty_kind kind;
-
-    icalerror_check_arg_rz( (str!=0),"str");
-
-    kind = icalenum_string_to_property_kind(str);
-
-    if(kind == ICAL_X_PROPERTY){
-	    icalproperty *p = icalproperty_new(ICAL_X_PROPERTY);    
-	    icalproperty_set_x_name(p,str);
-	    return p;
-    } else if (kind == ICAL_NO_PROPERTY){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    } else {
-	return icalproperty_new(kind);
-    }
-}
-
-void
-icalproperty_free (icalproperty* prop)
-{
-    struct icalproperty_impl *p;
-
-    icalparameter* param;
-    
-    icalerror_check_arg_rv((prop!=0),"prop");
-
-    p = (struct icalproperty_impl*)prop;
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (p->parent ==0),"Tried to free a property that is still attached to a component. ");
-    
-#else
-    if(p->parent !=0){
-	return;
-    }
-#endif
-
-    if (p->value != 0){
-        icalvalue_set_parent(p->value,0);
-	icalvalue_free(p->value);
-    }
-    
-    while( (param = pvl_pop(p->parameters)) != 0){
-	icalparameter_free(param);
-    }
-    
-    pvl_free(p->parameters);
-    
-    if (p->x_name != 0) {
-	free(p->x_name);
-    }
-    
-    p->kind = ICAL_NO_PROPERTY;
-    p->parameters = 0;
-    p->parameter_iterator = 0;
-    p->value = 0;
-    p->x_name = 0;
-    p->id[0] = 'X';
-    
-    free(p);
-
-}
-
-
-char*
-icalproperty_as_ical_string (icalproperty* prop)
-{   
-    icalparameter *param;
-
-    /* Create new buffer that we can append names, parameters and a
-       value to, and reallocate as needed. Later, this buffer will be
-       copied to a icalmemory_tmp_buffer, which is managed internally
-       by libical, so it can be given to the caller without fear of
-       the caller forgetting to free it */
-
-    const char* property_name = 0; 
-    size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
-    icalvalue* value;
-    char *out_buf;
-
-    char newline[] = "\n";
-
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)prop;
-    
-    icalerror_check_arg_rz( (prop!=0),"prop");
-
-
-    /* Append property name */
-
-    if (impl->kind == ICAL_X_PROPERTY && impl->x_name != 0){
-	property_name = impl->x_name;
-    } else {
-	property_name = icalenum_property_kind_to_string(impl->kind);
-    }
-
-    if (property_name == 0 ) {
-	icalerror_warn("Got a property of an unknown kind.");
-	icalmemory_free_buffer(buf);
-	return 0;
-	
-    }
-
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, property_name);
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-
-
-    /* Determine what VALUE parameter to include. The VALUE parameters
-       are ignored in the normal parameter printing ( the block after
-       this one, so we need to do it here */
-    {
-	const char* kind_string = 0;
-
-	icalparameter *orig_val_param
-	    = icalproperty_get_first_parameter(prop,ICAL_VALUE_PARAMETER);
-
-	icalvalue *value = icalproperty_get_value(impl);
-
-	icalvalue_kind orig_kind = ICAL_NO_VALUE;
-
-	icalvalue_kind this_kind = ICAL_NO_VALUE;
-
-	icalvalue_kind default_kind 
-	    =  icalenum_property_kind_to_value_kind(impl->kind);
-
-	if(orig_val_param){
-	    orig_kind = (icalvalue_kind)icalparameter_get_value(orig_val_param);
-	}
-
-	if(value != 0){
-	    this_kind = icalvalue_isa(value);
-	}
-	
-	
-	if(this_kind == default_kind &&
-	   orig_kind != ICAL_NO_VALUE){
-	    /* The kind is the default, so it does not need to be
-               included, but do it anyway, since it was explicit in
-               the property. But, use the default, not the one
-               specified in the property */
-	    
-	    kind_string = icalenum_value_kind_to_string(default_kind);
-
-	} else if (this_kind != default_kind && this_kind !=  ICAL_NO_VALUE){
-	    /* Not the default, so it must be specified */
-	    kind_string = icalenum_value_kind_to_string(this_kind);
-	} else {
-	    /* Don'tinclude the VALUE parameter at all */
-	}
-
-	if(kind_string!=0){
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, " ;");
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "VALUE=");
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-	}
-	
-
-    }
-
-    /* Append parameters */
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-	param != 0; 
-	param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) {
-
-	char* kind_string = icalparameter_as_ical_string(param); 
-	icalparameter_kind kind = icalparameter_isa(param);
-
-	if(kind==ICAL_VALUE_PARAMETER){
-	    continue;
-	}
-
-	if (kind_string == 0 ) {
-	    char temp[TMP_BUF_SIZE];
-	    snprintf(temp, TMP_BUF_SIZE,"Got a parameter of unknown kind in %s property",property_name);
-	    icalerror_warn(temp);
-	    continue;
-	}
-
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, " ;");
-    	icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
- 	icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-    }    
-
-    /* Append value */
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, " :");
-
-    value = icalproperty_get_value(prop);
-
-    if (value != 0){
-	const char *str = icalvalue_as_ical_string(value);
-	icalerror_assert((str !=0),"Could not get string representation of a value");
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, str);
-    } else {
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size,"ERROR: No Value"); 
-	
-    }
-    
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-    /* Now, copy the buffer to a tmp_buffer, which is safe to give to
-       the caller without worring about de-allocating it. */
-
-    
-    out_buf = icalmemory_tmp_buffer(strlen(buf)+1);
-    strcpy(out_buf, buf);
-
-    icalmemory_free_buffer(buf);
-
-    return out_buf;
-}
-
-
-
-icalproperty_kind
-icalproperty_isa (icalproperty* property)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)property;
-
-   if(property != 0){
-       return p->kind;
-   }
-
-   return ICAL_NO_PROPERTY;
-}
-
-int
-icalproperty_isa_property (void* property)
-{
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)property;
-
-    icalerror_check_arg_rz( (property!=0), "property");
-
-    if (strcmp(impl->id,"prop") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-void
-icalproperty_add_parameter (icalproperty* prop,icalparameter* parameter)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-    
-   icalerror_check_arg_rv( (prop!=0),"prop");
-   icalerror_check_arg_rv( (parameter!=0),"parameter");
-    
-   pvl_push(p->parameters, parameter);
-
-}
-
-void
-icalproperty_set_parameter (icalproperty* prop,icalparameter* parameter)
-{
-    icalparameter_kind kind;
-
-    kind = icalparameter_isa(parameter);
-
-    icalproperty_remove_parameter(prop,kind);
-
-    icalproperty_add_parameter(prop,parameter);
-}
-
-
-void
-icalproperty_remove_parameter (icalproperty* prop, icalparameter_kind kind)
-{
-    pvl_elem p;     
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)prop;
-
-    icalerror_check_arg_rv((prop!=0),"prop");
-    
-    for(p=pvl_head(impl->parameters);p != 0; p = pvl_next(p)){
-	icalparameter* param = (icalparameter *)pvl_data (p);
-        if (icalparameter_isa(param) == kind) {
-            pvl_remove (impl->parameters, p);
-            icalparameter_free (param);
-            break;
-        }
-    }                       
-}
-
-
-int
-icalproperty_count_parameters (icalproperty* prop)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-
-    if(prop != 0){
-	return pvl_count(p->parameters);
-    }
-
-    icalerror_set_errno(ICAL_USAGE_ERROR);
-    return -1;
-}
-
-
-icalparameter*
-icalproperty_get_first_parameter (icalproperty* prop, icalparameter_kind kind)
-{
-   struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-
-   icalerror_check_arg_rz( (prop!=0),"prop");
-   
-   p->parameter_iterator = pvl_head(p->parameters);
-
-   if (p->parameter_iterator == 0) {
-       return 0;
-   }
-
-   for( p->parameter_iterator = pvl_head(p->parameters);
-	p->parameter_iterator !=0;
-	p->parameter_iterator = pvl_next(p->parameter_iterator)){
-
-       icalparameter *param = (icalparameter*)pvl_data(p->parameter_iterator);
-
-       if(icalparameter_isa(param) == kind || kind == ICAL_ANY_PARAMETER){
-	   return param;
-       }
-   }
-
-   return 0;
-}
-
-
-icalparameter*
-icalproperty_get_next_parameter (icalproperty* prop, icalparameter_kind kind)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-    
-    icalerror_check_arg_rz( (prop!=0),"prop");
-    
-    if (p->parameter_iterator == 0) {
-	return 0;
-    }
-    
-    for( p->parameter_iterator = pvl_next(p->parameter_iterator);
-	 p->parameter_iterator !=0;
-	 p->parameter_iterator = pvl_next(p->parameter_iterator)){
-	
-	icalparameter *param = (icalparameter*)pvl_data(p->parameter_iterator);
-	
-	if(icalparameter_isa(param) == kind || kind == ICAL_ANY_PARAMETER){
-	    return param;
-	}
-    }
-    
-    return 0;
-
-}
-
-void
-icalproperty_set_value (icalproperty* prop, icalvalue* value)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-
-    icalerror_check_arg_rv((prop !=0),"prop");
-    icalerror_check_arg_rv((value !=0),"value");
-    
-    if (p->value != 0){
-	icalvalue_set_parent(p->value,0);
-	icalvalue_free(p->value);
-	p->value = 0;
-    }
-
-    p->value = value;
-    
-    icalvalue_set_parent(value,prop);
-}
-
-
-icalvalue*
-icalproperty_get_value (icalproperty* prop)
-{
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-    
-    icalerror_check_arg_rz( (prop!=0),"prop");
-    
-    return p->value;
-}
-
-
-void icalproperty_set_x_name(icalproperty* prop, char* name)
-{
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)prop;
-
-    icalerror_check_arg_rv( (name!=0),"name");
-    icalerror_check_arg_rv( (prop!=0),"prop");
-
-    if (impl->x_name != 0) {
-        free(impl->x_name);
-    }
-
-    impl->x_name = icalmemory_strdup(name);
-
-    if(impl->x_name == 0){
-	icalerror_set_errno(ICAL_ALLOCATION_ERROR);
-    }
-
-}
-                              
-char* icalproperty_get_x_name(icalproperty* prop){
-
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)prop;
-
-    icalerror_check_arg_rz( (prop!=0),"prop");
-
-    return impl->x_name;
-}
-
-
-void icalproperty_set_parent(icalproperty* property,
-			     icalcomponent* component)
-{
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)property;
-
-    icalerror_check_arg_rv( (property!=0),"property");
-    
-    impl->parent = component;
-}
-
-icalcomponent* icalproperty_get_parent(icalproperty* property)
-{
-    struct icalproperty_impl *impl = (struct icalproperty_impl*)property;
- 
-    icalerror_check_arg_rv( (property!=0),"property");
-
-    return impl->parent;
-}
-
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalproperty.h.in b/libical/src/libical/icalproperty.h.in
deleted file mode 100644
index be74b38d43..0000000000
--- a/libical/src/libical/icalproperty.h.in
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedproperties.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  $Id: icalproperty.h.in,v 1.1.1.2 2001/01/23 19:20:40 jpr Exp $
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-
-#ifndef ICALPROPERTY_H
-#define ICALPROPERTY_H
-
-#include <time.h>
-#include "icalparameter.h"
-#include "icalvalue.h"  
-#include "icalrecur.h"
-
-typedef void icalproperty;
-
-icalproperty* icalproperty_new(icalproperty_kind kind);
-
-icalproperty* icalproperty_new_clone(icalproperty * prop);
-
-icalproperty* icalproperty_new_from_string(char* str);
-
-char* icalproperty_as_ical_string(icalproperty* prop);
-
-void  icalproperty_free(icalproperty* prop);
-
-icalproperty_kind icalproperty_isa(icalproperty* property);
-int icalproperty_isa_property(void* property);
-
-void icalproperty_add_parameter(icalproperty* prop,icalparameter* parameter);
-void icalproperty_set_parameter(icalproperty* prop,icalparameter* parameter);
-
-void icalproperty_remove_parameter(icalproperty* prop,
-				   icalparameter_kind kind);
-
-int icalproperty_count_parameters(icalproperty* prop);
-
-/* Iterate through the parameters */
-icalparameter* icalproperty_get_first_parameter(icalproperty* prop,
-						icalparameter_kind kind);
-icalparameter* icalproperty_get_next_parameter(icalproperty* prop,
-						icalparameter_kind kind);
-/* Access the value of the property */
-void icalproperty_set_value(icalproperty* prop, icalvalue* value);
-icalvalue* icalproperty_get_value(icalproperty* prop);
-
-/* Deal with X properties */
-
-void icalproperty_set_x_name(icalproperty* prop, char* name);
-char* icalproperty_get_x_name(icalproperty* prop);
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalrecur.c b/libical/src/libical/icalrecur.c
deleted file mode 100644
index d5c73e80dd..0000000000
--- a/libical/src/libical/icalrecur.c
+++ /dev/null
@@ -1,1968 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalrecur.c
-  CREATOR: eric 16 May 2000
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-  How this code works:
-
-  Processing starts when the caller generates a new recurrence
-  iterator via icalrecur_iterator_new(). This routine copies the
-  recurrence rule into the iterator and extracts things like start and
-  end dates. Then, it checks if the rule is legal, using some logic
-  from RFC2445 and some logic that probably should be in RFC2445.
-
-  Then, icalrecur_iterator_new() re-writes some of the BY*
-  arrays. This involves ( via a call to setup_defaults() ) :
-
-  1) For BY rule parts with no data ( ie BYSECOND was not specified )
-  copy the corresponding time part from DTSTART into the BY array. (
-  So impl->by_ptrs[BY_SECOND] will then have one element if is
-  originally had none ) This only happens if the BY* rule part data
-  would expand the number of occurrences in the occurrence set. This
-  lets the code ignore DTSTART later on and still use it to get the
-  time parts that were not specified in any other way.
-  
-  2) For the by rule part that are not the same interval as the
-  frequency -- for HOURLY anything but BYHOUR, for instance -- copy the
-  first data element from the rule part into the first occurrence. For
-  example, for "INTERVAL=MONTHLY and BYHOUR=10,30", initialize the
-  first time to be returned to have an hour of 10.
-
-  Finally, for INTERVAL=YEARLY, the routine expands the rule to get
-  all of the days specified in the rule. The code will do this for
-  each new year, and this is the first expansion. This is a special
-  case for the yearly interval; no other frequency gets expanded this
-  way. The yearly interval is the most complex, so some special
-  processing is required.
-
-  After creating a new iterator, the caller will make successive calls
-  to icalrecur_iterator_next() to get the next time specified by the
-  rule. The main part of this routine is a switch on the frequency of
-  the rule. Each different frequency is handled by a different
-  routine. 
-
-  For example, next_hour handles the case of INTERVAL=HOURLY, and it
-  is called by other routines to get the next hour. First, the routine
-  tries to get the next minute part of a time with a call to
-  next_minute(). If next_minute() returns 1, it has reached the end of
-  its data, usually the last element of the BYMINUTE array. Then, if
-  there is data in the BYHOUR array, the routine changes the hour to
-  the next one in the array. If INTERVAL=HOURLY, the routine advances
-  the hour by the interval.
-
-  If the routine used the last hour in the BYHOUR array, and the
-  INTERVAL=HOURLY, then the routine calls increment_monthday() to set
-  the next month day. The increment_* routines may call higher routine
-  to increment the month or year also.
-
-  The code for INTERVAL=DAILY is handled by next_day(). First, the
-  routine tries to get the next hour part of a time with a call to
-  next_hour. If next_hour() returns 1, it has reached the end of its
-  data, usually the last element of the BYHOUR array. This means that
-  next_day() should increment the time to the next day. If FREQUENCY==DAILY,
-  the routine increments the day by the interval; otherwise, it
-  increments the day by 1.
-
-  Next_day() differs from next_hour because it does not use the BYDAY
-  array to select an appropriate day. Instead, it returns every day (
-  incrementing by 1 if the frequency is not DAILY with INTERVAL!=1)
-  Any days that are not specified in an non-empty BYDAY array are
-  filtered out later.
-
-  Generally, the flow of these routine is for a next_* call a next_*
-  routine of a lower interval ( next_day calls next_hour) and then to
-  possibly call an increment_* routine of an equal or higher
-  interval. ( next_day calls increment_monthday() )
-
-  When the call to the original next_* routine returns,
-  icalrecur_iterator_next() will check the returned data against other
-  BYrule parts to determine if is should be excluded by calling
-  check_contracting_rules. Generally, a contracting rule is any with a
-  larger time span than the interval. For instance, if
-  INTERVAL=DAILY, BYMONTH is a contracting rule part. 
-
-  Check_contracting_rules() uses check_restriction() to do its
-  work. Check_restriction() uses expand_map[] to determine if a rule
-  is contracting, and if it is, and if the BY rule part has some data,
-  then the routine checks if the value of a component of the time is
-  part of the byrule part. For instance, for "INTERVAL=DAILY;
-  BYMONTH=6,10", check_restriction() would check that the time value
-  given to it has a month of either 6 or 10.
-  icalrecurrencetype_test()
-
-  Finally, icalrecur_iterator_next() does a few other checks on the
-  time value, and if it passes, it returns the time.
-
-  A note about the end_of_data flag. This flag is usually set early in
-  a next_* routine and returned in the end. The way it is used allows
-  the next_* routine to set the last time back to the first element in
-  a BYxx rule, and then signal to the higer level routine to increment
-  the next higher level. For instance. WITH FREQ=MONTHLY;BYDAY=TU,FR,
-  After next_weekday_by_month runs though both TU and FR, it sets the
-  week day back to TU and sets end_of_data. This signals next_month to
-  increment the month.
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalrecur.h"
-
-#ifdef ICAL_NO_LIBICAL
-#define icalerror_set_errno(x)
-#define  icalerror_check_arg_rv(x,y)
-#else
-#include "icalerror.h"
-#include "icalmemory.h"
-#endif
-
-#include <stdlib.h> /* for malloc */
-#include <errno.h> /* for errno */
-#include <string.h> /* for strdup and strchr*/
-#include <assert.h>
-#include <stddef.h> /* For offsetof() macro */
-
-#define TEMP_MAX 1024
-
-
-/*********************** Rule parsing routines ************************/
-
-struct icalrecur_parser {
-	const char* rule;
-        char* copy;
-	char* this_clause;
-	char* next_clause;
-
-	struct icalrecurrencetype rt;
-};
-
-const char* icalrecur_first_clause(struct icalrecur_parser *parser)
-{
-    char *idx;
-    parser->this_clause = parser->copy;
-    
-    idx = strchr(parser->this_clause,';');
-
-    if (idx == 0){
-	parser->next_clause = 0;
-	return 0;
-    }
-
-    *idx = 0;
-    idx++;
-    parser->next_clause = idx;
-
-    return parser->this_clause;
-
-}
-
-const char* icalrecur_next_clause(struct icalrecur_parser *parser)
-{
-    char* idx;
-
-    parser->this_clause = parser->next_clause;
-
-    if(parser->this_clause == 0){
-	return 0;
-    }
-
-    idx = strchr(parser->this_clause,';');
-
-    if (idx == 0){
-	parser->next_clause = 0;
-    } else {
-
-	*idx = 0;
-	idx++;
-	parser->next_clause = idx;
-    }
-	
-    return parser->this_clause;
-
-}
-
-void icalrecur_clause_name_and_value(struct icalrecur_parser *parser,
-				     char** name, char** value)
-{
-    char *idx;
-
-    *name = parser->this_clause;
-
-    idx = strchr(parser->this_clause,'=');
-
-    if (idx == 0){
-	*name = 0;
-	*value = 0;
-	return;
-    }
-    
-    *idx = 0;
-    idx++;
-    *value = idx;
-}
-
-void icalrecur_add_byrules(struct icalrecur_parser *parser, short *array,
-			   int size, char* vals)
-{
-    char *t, *n;
-    int i=0;
-    int sign = 1;
-    short v;
-
-    n = vals;
-
-    while(n != 0){
-
-	if(i == size){
-	    return;
-	}
-	
-	t = n;
-
-	n = strchr(t,',');
-
-	if(n != 0){
-	    *n = 0;
-	    n++;
-	}
-	
-	/* Get optional sign. HACK. sign is not allowed for all BYxxx
-           rule parts */
-	if( *t == '-'){
-	    sign = 1;
-	    t++;
-	} else if (*t == '+'){
-	    sign = -1;
-	    t++;
-	}
-
-	v = atoi(t) * sign ;
-
-
-	array[i++] = v;
-	array[i] =  ICAL_RECURRENCE_ARRAY_MAX;
-
-    }
-
-}
-
-void icalrecur_add_bydayrules(struct icalrecur_parser *parser, const char* vals)
-{
-
-    char *t, *n;
-    int i=0;
-    int sign = 1;
-    int weekno = 0;
-    icalrecurrencetype_weekday wd;
-    short *array = parser->rt.by_day;
-    char* end;
-    char* vals_copy;
-
-    vals_copy = strdup(vals);
-
-    end = (char*)vals_copy+strlen(vals_copy);
-    n = vals_copy;
-
-    while(n != 0){
-	
-
-	t = n;
-
-	n = strchr(t,',');
-
-	if(n != 0){
-	    *n = 0;
-	    n++;
-	}
-	
-	/* Get optional sign. */
-	if( *t == '-'){
-	    sign = -1;
-	    t++;
-	} else if (*t == '+'){
-	    sign = 1;
-	    t++;
-	} else {
-	    sign = 1;
-	}
-
-	weekno = 0;
-	/* Get Optional weekno */
-	if( sscanf(t,"%d",&weekno) != 0){
-	    if (n != 0){
-		int weeknolen = (n-t)-3; /* 3 -> one for \0, 2 for day name */
-		/* could use abs(log10(weekno))+1, but that needs libm */
-		t += weeknolen;
-	    } else {
-		t = end -2;
-	    }
-	}
-
-	wd = icalrecur_string_to_weekday(t);
-
-	array[i++] = sign* ((int)wd + 8*weekno);
-	array[i] =  ICAL_RECURRENCE_ARRAY_MAX;
-
-    }
-
-    free(vals_copy);
-
-}
-
-
-struct icalrecurrencetype icalrecurrencetype_from_string(const char* str)
-{
-    struct icalrecur_parser parser;
-
-    memset(&parser,0,sizeof(parser));
-    icalrecurrencetype_clear(&parser.rt);
-
-    icalerror_check_arg_re(str!=0,"str",parser.rt);
-
-
-    /* Set up the parser struct */
-    parser.rule = str;
-    parser.copy = strdup(parser.rule);
-    parser.this_clause = parser.copy;
-
-    if(parser.copy == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return parser.rt;
-    }
-
-    /* Loop through all of the clauses */
-    for(icalrecur_first_clause(&parser); 
-	parser.this_clause != 0;
-	icalrecur_next_clause(&parser))
-    {
-	char *name, *value;
-	icalrecur_clause_name_and_value(&parser,&name,&value);
-
-	if(name == 0){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    icalrecurrencetype_clear(&parser.rt);
-	    return parser.rt;
-	}
-
-	if (strcmp(name,"FREQ") == 0){
-	    parser.rt.freq = icalrecur_string_to_recurrence(value);
-	} else if (strcmp(name,"COUNT") == 0){
-	    parser.rt.count = atoi(value);
-	} else if (strcmp(name,"UNTIL") == 0){
-	    parser.rt.until = icaltime_from_string(value);
-	} else if (strcmp(name,"INTERVAL") == 0){
-	    parser.rt.interval = atoi(value);
-	} else if (strcmp(name,"WKST") == 0){
-	    parser.rt.week_start = icalrecur_string_to_weekday(value);
-	} else if (strcmp(name,"BYSECOND") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_second,
-				  ICAL_BY_SECOND_SIZE,value);
-	} else if (strcmp(name,"BYMINUTE") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_minute,
-				  ICAL_BY_MINUTE_SIZE,value);
-	} else if (strcmp(name,"BYHOUR") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_hour,
-				  ICAL_BY_HOUR_SIZE,value);
-	} else if (strcmp(name,"BYDAY") == 0){
-	    icalrecur_add_bydayrules(&parser,value);
-	} else if (strcmp(name,"BYMONTHDAY") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_month_day,
-				  ICAL_BY_MONTHDAY_SIZE,value);
-	} else if (strcmp(name,"BYYEARDAY") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_year_day,
-				  ICAL_BY_YEARDAY_SIZE,value);
-	} else if (strcmp(name,"BYWEEKNO") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_week_no,
-				  ICAL_BY_WEEKNO_SIZE,value);
-	} else if (strcmp(name,"BYMONTH") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_month,
-				  ICAL_BY_MONTH_SIZE,value);
-	} else if (strcmp(name,"BYSETPOS") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_set_pos,
-				  ICAL_BY_SETPOS_SIZE,value);
-	} else {
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    icalrecurrencetype_clear(&parser.rt);
-	    return parser.rt;
-	}
-	
-    }
-
-    free(parser.copy);
-
-    return parser.rt;
-
-}
-
-#ifndef ICAL_NO_LIBICAL
-
-struct { char* str;size_t offset; short limit;  } recurmap[] = 
-{
-    {";BYSECOND=",offsetof(struct icalrecurrencetype,by_second),60},
-    {";BYMINUTE=",offsetof(struct icalrecurrencetype,by_minute),60},
-    {";BYHOUR=",offsetof(struct icalrecurrencetype,by_hour),24},
-    {";BYDAY=",offsetof(struct icalrecurrencetype,by_day),7},
-    {";BYMONTHDAY=",offsetof(struct icalrecurrencetype,by_month_day),31},
-    {";BYYEARDAY=",offsetof(struct icalrecurrencetype,by_year_day),366},
-    {";BYWEEKNO=",offsetof(struct icalrecurrencetype,by_week_no),52},
-    {";BYMONTH=",offsetof(struct icalrecurrencetype,by_month),12},
-    {";BYSETPOS=",offsetof(struct icalrecurrencetype,by_set_pos),366},
-    {0,0,0},
-};
-
-/* A private routine in icalvalue.c */
-void print_datetime_to_string(char* str,  struct icaltimetype *data);
-
-char* icalrecurrencetype_as_string(struct icalrecurrencetype *recur)
-{
-    char* str;
-    char *str_p;
-    size_t buf_sz = 200;
-    char temp[20];
-    int i,j;
-
-    if(recur->freq == ICAL_NO_RECURRENCE){
-	return 0;
-    }
-
-    str = (char*)icalmemory_tmp_buffer(buf_sz);
-    str_p = str;
-
-    icalmemory_append_string(&str,&str_p,&buf_sz,"FREQ=");
-    icalmemory_append_string(&str,&str_p,&buf_sz,
-			     icalrecur_recurrence_to_string(recur->freq));
-
-    if(recur->until.year != 0){
-	
-	temp[0] = 0;
-	print_datetime_to_string(temp,&(recur->until));
-	
-	icalmemory_append_string(&str,&str_p,&buf_sz,";UNTIL=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-
-    if(recur->count != 0){
-	sprintf(temp,"%d",recur->count);
-	icalmemory_append_string(&str,&str_p,&buf_sz,";COUNT=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-
-    if(recur->interval != 0){
-	sprintf(temp,"%d",recur->interval);
-	icalmemory_append_string(&str,&str_p,&buf_sz,";INTERVAL=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-    
-    for(j =0; recurmap[j].str != 0; j++){
-	short* array = (short*)(recurmap[j].offset+ (size_t)recur);
-	short limit = recurmap[j].limit;
-
-	/* Skip unused arrays */
-	if( array[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
-
-	    icalmemory_append_string(&str,&str_p,&buf_sz,recurmap[j].str);
-	    
-	    for(i=0; 
-		i< limit  && array[i] != ICAL_RECURRENCE_ARRAY_MAX;
-		i++){
-		if (j == 3) { /* BYDAY */
-		    short dow = icalrecurrencetype_day_day_of_week(array[i]);
-		    const char *daystr = icalrecur_weekday_to_string(dow);
-		    short pos;
-
-		    pos = icalrecurrencetype_day_position(array[i]);  
-		    
-		    if (pos == 1)
-			icalmemory_append_string(&str,&str_p,&buf_sz,daystr);
-		    else {
-			sprintf(temp,"%d%s",pos,daystr);
-			icalmemory_append_string(&str,&str_p,&buf_sz,temp);
-		    }                  
-		    
-		} else {
-		    sprintf(temp,"%d",array[i]);
-		    icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-		}
-		
-		if( (i+1)<limit &&array[i+1] 
-		    != ICAL_RECURRENCE_ARRAY_MAX){
-		    icalmemory_append_char(&str,&str_p,&buf_sz,',');
-		}
-	    }	 
-	}   
-    }
-
-    return  str;
-}
-#endif
-
-
-
-/************************* occurrence iteration routiens ******************/
-
-enum byrule {
-    NO_CONTRACTION = -1,
-    BY_SECOND = 0,
-    BY_MINUTE = 1,
-    BY_HOUR = 2,
-    BY_DAY = 3,
-    BY_MONTH_DAY = 4,
-    BY_YEAR_DAY = 5,
-    BY_WEEK_NO = 6,
-    BY_MONTH = 7,
-    BY_SET_POS
-};
-
-
-
-struct icalrecur_iterator_impl {
-	
-	struct icaltimetype dtstart; /* Hack. Make into time_t */
-	struct icaltimetype last; /* last time return from _iterator_next*/
-	int occurrence_no; /* number of step made on t iterator */
-	struct icalrecurrencetype rule;
-
-	short days[366];
-	short days_index;
-
-	enum byrule byrule;
-	short by_indices[9];
-	short orig_data[9]; /* 1 if there was data in the byrule */
-
-
-	short *by_ptrs[9]; /* Pointers into the by_* array elements of the rule */
-};
-
-int icalrecur_iterator_sizeof_byarray(short* byarray)
-{
-    int array_itr;
-
-    for(array_itr = 0; 
-	byarray[array_itr] != ICAL_RECURRENCE_ARRAY_MAX;
-	array_itr++){
-    }
-
-    return array_itr;
-}
-
-enum expand_table {
-    UNKNOWN  = 0,
-    CONTRACT = 1,
-    EXPAND =2,
-    ILLEGAL=3
-};
-
-/* The split map indicates, for a particular interval, wether a BY_*
-   rule part expands the number of instances in the occcurrence set or
-   contracts it. 1=> contract, 2=>expand, and 3 means the pairing is
-   not allowed. */
-struct expand_split_map_struct 
-{ 
-	icalrecurrencetype_frequency frequency;
-
-	/* Elements of the 'map' array correspond to the BYxxx rules:
-           Second,Minute,Hour,Day,Month Day,Year Day,Week No,Month*/
-
-	short map[8];
-}; 
-
-struct expand_split_map_struct expand_map[] =
-{
-    {ICAL_SECONDLY_RECURRENCE,{1,1,1,1,1,1,1,1}},
-    {ICAL_MINUTELY_RECURRENCE,{2,1,1,1,1,1,1,1}},
-    {ICAL_HOURLY_RECURRENCE,  {2,2,1,1,1,1,1,1}},
-    {ICAL_DAILY_RECURRENCE,   {2,2,2,1,1,1,1,1}},
-    {ICAL_WEEKLY_RECURRENCE,  {2,2,2,2,3,3,1,1}},
-    {ICAL_MONTHLY_RECURRENCE, {2,2,2,2,2,3,3,1}},
-    {ICAL_YEARLY_RECURRENCE,  {2,2,2,2,2,2,2,2}},
-    {ICAL_NO_RECURRENCE,      {0,0,0,0,0,0,0,0}}
-
-};
-
-
-
-/* Check that the rule has only the two given interday byrule parts. */
-int icalrecur_two_byrule(struct icalrecur_iterator_impl* impl,
-			 enum byrule one,enum byrule two)
-{
-    short test_array[9];
-    enum byrule itr;
-    int passes = 0;
-
-    memset(test_array,0,9);
-
-    test_array[one] = 1;
-    test_array[two] = 1;
-
-    for(itr = BY_DAY; itr != BY_SET_POS; itr++){
-
-	if( (test_array[itr] == 0  &&
-	     impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX
-	    ) ||
-	    (test_array[itr] == 1  &&
-	     impl->by_ptrs[itr][0] == ICAL_RECURRENCE_ARRAY_MAX
-		) 
-	    ) {
-	    /* test failed */
-	    passes = 0;
-	}
-    }
-
-    return passes;
-
-} 
-
-/* Check that the rule has only the one given interdat byrule parts. */
-int icalrecur_one_byrule(struct icalrecur_iterator_impl* impl,enum byrule one)
-{
-    int passes = 1;
-    enum byrule itr;
-
-    for(itr = BY_DAY; itr != BY_SET_POS; itr++){
-	
-	if ((itr==one && impl->by_ptrs[itr][0] == ICAL_RECURRENCE_ARRAY_MAX) ||
-	    (itr!=one && impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX)) {
-	    passes = 0;
-	}
-    }
-
-    return passes;
-} 
-
-int count_byrules(struct icalrecur_iterator_impl* impl)
-{
-    int count = 0;
-    enum byrule itr;
-
-    for(itr = BY_DAY; itr <= BY_SET_POS; itr++){
-	if(impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX){
-	    count++;
-	}
-    }
-
-    return count;
-}
-
-
-void setup_defaults(struct icalrecur_iterator_impl* impl, 
-		    enum byrule byrule, icalrecurrencetype_frequency req,
-		    short deftime, int *timepart)
-{
-
-    icalrecurrencetype_frequency freq;
-    freq = impl->rule.freq;
-
-    /* Re-write the BY rule arrays with data from the DTSTART time so
-       we don't have to explicitly deal with DTSTART */
-
-    if(impl->by_ptrs[byrule][0] == ICAL_RECURRENCE_ARRAY_MAX &&
-	expand_map[freq].map[byrule] != CONTRACT){
-	impl->by_ptrs[byrule][0] = deftime;
-    }
-
-    /* Initialize the first occurence */
-    if( freq != req && expand_map[freq].map[byrule] != CONTRACT){
-	*timepart = impl->by_ptrs[byrule][0];
-    }
-
-
-}
-
-int expand_year_days(struct icalrecur_iterator_impl* impl,short year);
-
-int has_by_data(struct icalrecur_iterator_impl* impl, enum byrule byrule){
-
-    return (impl->orig_data[byrule] == 1);
-}
-
-
-icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule, 
-					   struct icaltimetype dtstart)
-{
-    struct icalrecur_iterator_impl* impl;
-    icalrecurrencetype_frequency freq;
-
-    if ( ( impl = (struct icalrecur_iterator_impl *)
-	   malloc(sizeof(struct icalrecur_iterator_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(impl,0,sizeof(struct icalrecur_iterator_impl));
-
-    impl->rule = rule;
-    impl->last = dtstart;
-    impl->dtstart = dtstart;
-    impl->days_index =0;
-    impl->occurrence_no = 0;
-    freq = impl->rule.freq;
-
-    /* Set up convienience pointers to make the code simpler. Allows
-       us to iterate through all of the BY* arrays in the rule. */
-
-    impl->by_ptrs[BY_MONTH]=impl->rule.by_month;
-    impl->by_ptrs[BY_WEEK_NO]=impl->rule.by_week_no;
-    impl->by_ptrs[BY_YEAR_DAY]=impl->rule.by_year_day;
-    impl->by_ptrs[BY_MONTH_DAY]=impl->rule.by_month_day;
-    impl->by_ptrs[BY_DAY]=impl->rule.by_day;
-    impl->by_ptrs[BY_HOUR]=impl->rule.by_hour;
-    impl->by_ptrs[BY_MINUTE]=impl->rule.by_minute;
-    impl->by_ptrs[BY_SECOND]=impl->rule.by_second;
-    impl->by_ptrs[BY_SET_POS]=impl->rule.by_set_pos;
-
-    memset(impl->orig_data,0,9);
-
-    impl->orig_data[BY_MONTH]
-	= (impl->rule.by_month[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_WEEK_NO]
-      =(impl->rule.by_week_no[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_YEAR_DAY]
-    =(impl->rule.by_year_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_MONTH_DAY]
-    =(impl->rule.by_month_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_DAY]
-	= (impl->rule.by_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_HOUR]
-	= (impl->rule.by_hour[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_MINUTE]
-     = (impl->rule.by_minute[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_SECOND]
-     = (impl->rule.by_second[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_SET_POS]
-     = (impl->rule.by_set_pos[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-
-    /* Check if the recurrence rule is legal */
-
-    /* If the BYYEARDAY appears, no other date rule part may appear.   */
-
-    if(icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_MONTH) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_WEEK_NO) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_MONTH_DAY) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_DAY) ){
-
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-
-	return 0;
-    }
-
-    /* BYWEEKNO and BYMONTH rule parts may not both appear.*/
-
-    if(icalrecur_two_byrule(impl,BY_WEEK_NO,BY_MONTH)){
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }
-
-    /* BYWEEKNO and BYMONTHDAY rule parts may not both appear.*/
-
-    if(icalrecur_two_byrule(impl,BY_WEEK_NO,BY_MONTH_DAY)){
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }
-
-
-    /*For MONTHLY recurrences (FREQ=MONTHLY) neither BYYEARDAY nor
-      BYWEEKNO may appear. */
-
-    if(freq == ICAL_MONTHLY_RECURRENCE && 
-       ( icalrecur_one_byrule(impl,BY_WEEK_NO) ||
-	 icalrecur_one_byrule(impl,BY_YEAR_DAY)) ) {
-
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }
-
-
-    /*For WEEKLY recurrences (FREQ=WEEKLY) neither BYMONTHDAY nor
-      BYYEARDAY may appear. */
-
-    if(freq == ICAL_WEEKLY_RECURRENCE && 
-       ( icalrecur_one_byrule(impl,BY_MONTH_DAY) ||
-	 icalrecur_one_byrule(impl,BY_YEAR_DAY)) ) {
-	
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }
-
-
-    /* Rewrite some of the rules and set up defaults to make later
-       processing easier. Primarily, t involves copying an element
-       from the start time into the coresponding BY_* array when the
-       BY_* array is empty */
-
-
-    setup_defaults(impl,BY_SECOND,ICAL_SECONDLY_RECURRENCE,impl->dtstart.second,
-		   &(impl->last.second));
-
-    setup_defaults(impl,BY_MINUTE,ICAL_MINUTELY_RECURRENCE,impl->dtstart.minute,
-		   &(impl->last.minute));
-
-    setup_defaults(impl,BY_HOUR,ICAL_HOURLY_RECURRENCE,impl->dtstart.hour,
-		   &(impl->last.hour));
-
-    setup_defaults(impl,BY_MONTH_DAY,ICAL_DAILY_RECURRENCE,impl->dtstart.day,
-		   &(impl->last.day));
-
-    setup_defaults(impl,BY_MONTH,ICAL_MONTHLY_RECURRENCE,impl->dtstart.month,
-		   &(impl->last.month));
-
-    if(impl->rule.freq == ICAL_WEEKLY_RECURRENCE ){
-
-       if(impl->by_ptrs[BY_DAY][0] == ICAL_RECURRENCE_ARRAY_MAX){
-
-	   /* Weekly recurrences with no BY_DAY data should occur on the
-	      same day of the week as the start time . */
-	   impl->by_ptrs[BY_DAY][0] = icaltime_day_of_week(impl->dtstart);
-
-       } else {
-	  /* If there is BY_DAY data, then we need to move the initial
-	     time to the start of the BY_DAY data. That if if the
-	     start time is on a Wednesday, and the rule has
-	     BYDAY=MO,WE,FR, move the initial time back to
-	     monday. Otherwise, jumping to the next week ( jumping 7
-	     days ahead ) will skip over some occurrences in the
-	     second week. */
-	  
-	  /* This is probably a HACK. There should be some more
-             general way to solve this problem */
-
-	  short dow = impl->by_ptrs[BY_DAY][0]-icaltime_day_of_week(impl->last);
-
-	  if(dow < 0) {
-	      /* initial time is after first day of BY_DAY data */
-
-	      impl->last.day += dow;
-	      impl->last = icaltime_normalize(impl->last);
-	  }
-      }
-      
-
-    }
-
-
-    if(impl->rule.freq == ICAL_YEARLY_RECURRENCE){
-	expand_year_days(impl,impl->dtstart.year);
-    }
-
-
-    /* If this is a monthly interval with by day data, then we need to
-       set the last value to the appropriate day of the month */
-
-    if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE &&
-       has_by_data(impl,BY_DAY)) {
-
-	short dow = icalrecurrencetype_day_day_of_week(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	short pos =  icalrecurrencetype_day_position(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	
-	short poscount = 0;
-	short days_in_month = 
-	    icaltime_days_in_month(impl->last.month, impl->last.year)  ; 
-	
-	for(impl->last.day = 1;
-	    impl->last.day <= days_in_month;
-	    impl->last.day++){
-	    
-	    if(icaltime_day_of_week(impl->last) == dow){
-		if(++poscount == pos){
-		    break;
-		}
-	    }
-	}
-
-	if(impl->last.day > days_in_month){
-	    icalerror_set_errno(ICAL_USAGE_ERROR);
-	    return 0;
-	}
-	
-    }
-
-
-    return impl;
-}
-
-
-void icalrecur_iterator_free(icalrecur_iterator* i)
-{
-    
-    struct icalrecur_iterator_impl* impl = 
-	(struct icalrecur_iterator_impl*)i;
-
-    icalerror_check_arg_rv((impl!=0),"impl");
-
-    free(impl);
-
-}
-
-
-
-
-void increment_year(struct icalrecur_iterator_impl* impl, int inc)
-{
-    impl->last.year+=inc;
-}
-
-
-
-
-void increment_month(struct icalrecur_iterator_impl* impl, int inc)
-{
-    int years;
-
-    impl->last.month+=inc;
-
-    /* Months are offset by one */
-    impl->last.month--;
-
-    years = impl->last.month / 12;
-
-    impl->last.month = impl->last.month % 12;
-
-    impl->last.month++;
-
-    if (years != 0){
-	increment_year(impl,years);
-    }
-}
-
-void increment_monthday(struct icalrecur_iterator_impl* impl, int inc)
-{
-    int i;
-
-    for(i=0; i<inc; i++){
-	
-	short days_in_month = 
-	    icaltime_days_in_month(impl->last.month,impl->last.year);
-
-	impl->last.day++;
-	
-	if (impl->last.day > days_in_month){
-	    impl->last.day = impl->last.day-days_in_month;
-	    increment_month(impl,1);
-	}
-    }
-}
-
-
-void increment_hour(struct icalrecur_iterator_impl* impl, int inc)
-{
-    short days;
-
-    impl->last.hour+=inc;
-
-    days = impl->last.hour / 24;
-    impl->last.hour = impl->last.hour % 24;
-
-    if (impl->days != 0){
-	increment_monthday(impl,days);
-    }
-}
-
-void increment_minute(struct icalrecur_iterator_impl* impl, int inc)
-{
-    short hours;
-
-    impl->last.minute+=inc;
-
-    hours = impl->last.minute / 60;
-     impl->last.minute =  impl->last.minute % 60;
-
-     if (hours != 0){
-	increment_hour(impl,hours);
-    }
-
-}
-
-void increment_second(struct icalrecur_iterator_impl* impl, int inc)
-{
-    short minutes;
-
-    impl->last.second+=inc;
-    
-    minutes = impl->last.second / 60;
-    impl->last.second = impl->last.second % 60;
-    
-    if (minutes != 0)
-    {
-	increment_minute(impl, minutes);
-    }                 
-}
-
-#if 0
-#include "ical.h"
-void test_increment()
-{
-    struct icalrecur_iterator_impl impl;
-
-    impl.last =  icaltime_from_string("20000101T000000Z");
-
-    printf("Orig: %s\n",icaltime_as_ctime(impl.last));
-    
-    increment_second(&impl,5);
-    printf("+ 5 sec    : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_second(&impl,355);
-    printf("+ 355 sec  : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_minute(&impl,5);
-    printf("+ 5 min    : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_minute(&impl,360);
-    printf("+ 360 min  : %s\n",icaltime_as_ctime(impl.last));
-    increment_hour(&impl,5);
-    printf("+ 5 hours  : %s\n",icaltime_as_ctime(impl.last));
-    increment_hour(&impl,43);
-    printf("+ 43 hours : %s\n",icaltime_as_ctime(impl.last));
-    increment_monthday(&impl,3);
-    printf("+ 3 days   : %s\n",icaltime_as_ctime(impl.last));
-    increment_monthday(&impl,600);
-    printf("+ 600 days  : %s\n",icaltime_as_ctime(impl.last));
-	
-}
-
-#endif 
-
-short next_second(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_SECOND][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short this_frequency = (impl->rule.freq == ICAL_SECONDLY_RECURRENCE);
-
-  short end_of_data = 0;
-
-  assert(has_by_data || this_frequency);
-
-  if(  has_by_data ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_SECOND]++;
-
-      if (impl->by_ptrs[BY_SECOND][impl->by_indices[BY_SECOND]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_SECOND] = 0;
-
-	  end_of_data = 1;
-      }
-
-
-      impl->last.second = 
-	  impl->by_ptrs[BY_SECOND][impl->by_indices[BY_SECOND]];
-      
-      
-  } else if( !has_by_data &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_second(impl, impl->rule.interval);
-
-  }
-
-  /* If we have gone through all of the seconds on the BY list, then we
-     need to move to the next minute */
-
-  if(has_by_data && end_of_data && this_frequency ){
-      increment_minute(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-int next_minute(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_MINUTE][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short this_frequency = (impl->rule.freq == ICAL_MINUTELY_RECURRENCE);
-
-  short end_of_data = 0;
-
-  assert(has_by_data || this_frequency);
-
-
-  if (next_second(impl) == 0){
-      return 0;
-  }
-
-  if(  has_by_data ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_MINUTE]++;
-      
-      if (impl->by_ptrs[BY_MINUTE][impl->by_indices[BY_MINUTE]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-
-	  impl->by_indices[BY_MINUTE] = 0;
-	  
-	  end_of_data = 1;
-      }
-
-      impl->last.minute = 
-	  impl->by_ptrs[BY_MINUTE][impl->by_indices[BY_MINUTE]];
-
-  } else if( !has_by_data &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_minute(impl,impl->rule.interval);
-  } 
-
-/* If we have gone through all of the minutes on the BY list, then we
-     need to move to the next hour */
-
-  if(has_by_data && end_of_data && this_frequency ){
-      increment_hour(impl,1);
-  }
-
-  return end_of_data;
-}
-
-int next_hour(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_HOUR][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short this_frequency = (impl->rule.freq == ICAL_HOURLY_RECURRENCE);
-
-  short end_of_data = 0;
-
-  assert(has_by_data || this_frequency);
-
-  if (next_minute(impl) == 0){
-      return 0;
-  }
-
-  if(  has_by_data ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_HOUR]++;
-      
-      if (impl->by_ptrs[BY_HOUR][impl->by_indices[BY_HOUR]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_HOUR] = 0;
-	  
-	  end_of_data = 1;
-      }
-
-      impl->last.hour = 
-	  impl->by_ptrs[BY_HOUR][impl->by_indices[BY_HOUR]];
-
-  } else if( !has_by_data &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_hour(impl,impl->rule.interval);
-
-  }
-
-  /* If we have gone through all of the hours on the BY list, then we
-     need to move to the next day */
-
-  if(has_by_data && end_of_data && this_frequency ){
-      increment_monthday(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-int next_day(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short this_frequency = (impl->rule.freq == ICAL_DAILY_RECURRENCE);
-
-  assert(has_by_data || this_frequency);
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  /* Always increment through the interval, since this routine is not
-     called by any other next_* routine, and the days that are
-     excluded will be taken care of by restriction filtering */
-
-  if(this_frequency){
-      increment_monthday(impl,impl->rule.interval);
-  } else {
-      increment_monthday(impl,1);
-  }
-
-
-  return 0;
-
-}
-
-/* This routine is only called by next_month and next_year, so it does
-   not have a clause for this_frequency */
-int next_monthday(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_MONTH_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short mday;
-  short end_of_data = 0;
-
-  assert(has_by_data );
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  impl->by_indices[BY_MONTH_DAY]++;
-  
-  mday = impl->by_ptrs[BY_MONTH_DAY][impl->by_indices[BY_MONTH_DAY]];
-
-  if ( mday ==ICAL_RECURRENCE_ARRAY_MAX){
-      impl->by_indices[BY_MONTH_DAY] = 0;
-      
-      end_of_data = 1;
-  }
-
-  if (mday > 0){
-      impl->last.day = mday;
-  } else {
-      short days_in_month = icaltime_days_in_month(impl->last.month,
-						   impl->last.year);
-      impl->last.day = days_in_month-mday+1;
-  }
-
-  if(has_by_data && end_of_data ){
-      increment_month(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-int next_yearday(struct icalrecur_iterator_impl* impl)
-{
-
-  short has_by_data = (impl->by_ptrs[BY_YEAR_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-  short end_of_data = 0;
-
-  assert(has_by_data );
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  impl->by_indices[BY_YEAR_DAY]++;
-  
-  if (impl->by_ptrs[BY_YEAR_DAY][impl->by_indices[BY_YEAR_DAY]]
-      ==ICAL_RECURRENCE_ARRAY_MAX){
-      impl->by_indices[BY_YEAR_DAY] = 0;
-      
-      end_of_data = 1;
-  }
-  
-  impl->last.day = 
-      impl->by_ptrs[BY_YEAR_DAY][impl->by_indices[BY_YEAR_DAY]];
-  
-  if(has_by_data && end_of_data){
-      increment_year(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-/* This routine is only called by next_week. It is certain that BY_DAY
-has data */
-
-int next_weekday_by_week(struct icalrecur_iterator_impl* impl)
-{
-
-  short end_of_data = 0;
-  short start_of_week, dow;
-  struct icaltimetype next;
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  assert( impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-  while(1) {
-
-      impl->by_indices[BY_DAY]++; /* Look at next elem in BYDAY array */
-      
-      /* Are we at the end of the BYDAY array? */
-      if (impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  
-	  impl->by_indices[BY_DAY] = 0; /* Reset to 0 */      
-	  end_of_data = 1; /* Signal that we're at the end */
-      }
-      
-      /* Add the day of week offset to to the start of this week, and use
-	 that to get the next day */
-      dow = impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]];  
-      start_of_week = icaltime_start_doy_of_week(impl->last);
-      
-      dow--; /*Sun is 1, not 0 */
-
-      if(dow+start_of_week <1 && !end_of_data){
-	  /* The selected date is in the previous year. */
-	  continue;
-      }
-
-      next = icaltime_from_day_of_year(start_of_week + dow,impl->last.year);
-
-      impl->last.day =  next.day;
-      impl->last.month =  next.month;
-      impl->last.year =  next.year;
-  
-      return end_of_data;
-  }
-
-}
-
-int next_weekday_by_month(struct icalrecur_iterator_impl* impl)
-{
-
-  short end_of_data = 0;
-  struct icaltimetype start_of_month; /* Start of month */
-  short pos, poscount, dow, days_in_month;
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  assert( impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-  while(1) {
-      impl->by_indices[BY_DAY]++; /* Look at next elem in BYDAY array */
-      
-      /* Are we at the end of the BYDAY array? */
-      if (impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  
-	  impl->by_indices[BY_DAY] = 0; /* Reset to 0 */      
-	  end_of_data = 1; /* Signal that we're at the end */
-      }
-
-      dow = icalrecurrencetype_day_day_of_week(
-	  impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-      pos =  icalrecurrencetype_day_position(
-	  impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-
-      start_of_month = impl->last;
-
-      /* Find right day in month. HACK. Find an arithmetic way to do
-         this */
-
-      poscount = 0;
-      days_in_month = 
-	  icaltime_days_in_month(impl->last.month, impl->last.year)  ; 
-
-      for(start_of_month.day = 1;
-	  start_of_month.day <= days_in_month;
-	  start_of_month.day++){
-
-	  if(icaltime_day_of_week(start_of_month) == dow){
-	      if(++poscount == pos){
-		  break;
-	      }
-	  }
-      }
-
-      if (!end_of_data == 1 && 
-	  (
-	      start_of_month.day > days_in_month ||
-	      icaltime_compare(start_of_month,impl->last) <= 0
-	      )
-	  ){
-	  continue;
-      }
-
-      impl->last.day =  start_of_month.day;
-      impl->last.month =  start_of_month.month;
-      impl->last.year =  start_of_month.year;
-  
-      return end_of_data;
-  }
-}
-
-int next_month(struct icalrecur_iterator_impl* impl)
-{
-
-  short this_frequency = (impl->rule.freq == ICAL_MONTHLY_RECURRENCE);
-
-  short end_of_data = 0;
-
-  assert( has_by_data(impl,BY_MONTH) || this_frequency);
-
-  /* Week day data overrides monthday data */
-  if(has_by_data(impl,BY_DAY)){
-      /* For this case, the weekdays are relative to the
-         month. BYDAY=FR -> First Friday in month, etc. */
-      if (next_weekday_by_month(impl) == 0){
-	  return 0;
-      }
-  } else {
-      if (next_monthday(impl) == 0){
-	  return 0;
-      }
-  }
-
-
-  if(has_by_data(impl,BY_MONTH) ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_MONTH]++;
-      
-      if (impl->by_ptrs[BY_MONTH][impl->by_indices[BY_MONTH]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_MONTH] = 0;
-	  
-	  end_of_data = 1;
-      }
-
-      impl->last.month = 
-	  impl->by_ptrs[BY_MONTH][impl->by_indices[BY_MONTH]];
-
-  } else if( !has_by_data(impl,BY_MONTH) &&  this_frequency ){
-
-      if(has_by_data(impl,BY_DAY)){
-
-	  short dayinc = 28;
-
-	  /* BY_DAY data specified a day of week, but incrementing the
-             month changes the day of the week -- Nov 2 is not the
-             same DOW as Oct 2. So, we need to fix the day of week by
-             incrementing in even weeks into the next month. . */
-
-	
-  if ( impl->last.day + dayinc 
-	       <= icaltime_days_in_month(impl->last.month, impl->last.year)){
-	      dayinc += 7;
-	  }
-
-	  increment_monthday(impl,dayinc);
-
-      } else {
-
-	  /* Compute the next value from the last time and the
-	     frequency interval*/
-	  increment_month(impl,impl->rule.interval);
-      }
-	  
-  }
-  
-  
-  if(has_by_data(impl,BY_MONTH) && end_of_data && this_frequency ){
-      increment_year(impl,1);
-  }
-  return end_of_data;
-
-}
-
-
-int next_week(struct icalrecur_iterator_impl* impl)
-{
-  short has_by_data = (impl->by_ptrs[BY_WEEK_NO][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  short this_frequency = (impl->rule.freq == ICAL_WEEKLY_RECURRENCE);
-  short end_of_data = 0;
-
-
-  if (next_weekday_by_week(impl) == 0){
-      return 0;
-  }
-
-  if( impl->by_ptrs[BY_WEEK_NO][0]!=ICAL_RECURRENCE_ARRAY_MAX){
-    /* Use the Week Number byrule data */
-      int week_no;
-      struct icaltimetype t;
-      
-      impl->by_indices[BY_WEEK_NO]++;
-      
-      if (impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_WEEK_NO] = 0;
-	  
-	  end_of_data = 1;
-      }
-      
-      t = impl->last;
-      t.month=1; /* HACK, should be setting to the date of the first week of year*/
-      t.day=1;
-      
-      week_no = impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]];
-      
-      impl->last.day += week_no*7;
-
-      impl->last = icaltime_normalize(impl->last);
-      
-  } else if( !has_by_data &&  this_frequency ){
-
-
-      increment_monthday(impl,7*impl->rule.interval);
-  }
-
-  if(has_by_data && end_of_data && this_frequency ){
-      increment_year(impl,1);
-  }
-
-  return end_of_data;
-  
-}
-
-
-
-/* For INTERVAL=YEARLY, set up the days[] array in the iterator to
-   list all of the days of the current year that are specified in this
-   rule. */
-
-int expand_year_days(struct icalrecur_iterator_impl* impl,short year)
-{
-    int j,k;
-    int days_index=0;
-    struct icaltimetype t;
-
-
-    t.is_date = 1; /* Needed to make day_of_year routines work property */
-
-    memset(&t,0,sizeof(t));
-    memset(impl->days,ICAL_RECURRENCE_ARRAY_MAX_BYTE,sizeof(impl->days));
-    
-    if(has_by_data(impl,BY_MONTH) && !has_by_data(impl,BY_MONTH_DAY)
-	&& !has_by_data(impl,BY_DAY)){
-	
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    struct icaltimetype t;
-	    short month = impl->by_ptrs[BY_MONTH][j];	    
-            short doy;
-
-	    t = impl->dtstart;
-	    t.year = year;
-	    t.month = month;
-	    t.is_date = 1;
-
-	    doy = icaltime_day_of_year(t);
-	    
-            impl->days[days_index++] = doy;
-
-        }
-
-
-    }
-    else if ( has_by_data(impl,BY_MONTH) && has_by_data(impl,BY_DAY)){
-
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    short month = impl->by_ptrs[BY_MONTH][j];
-	    short days_in_month = icaltime_days_in_month(month,year);
-		
-	    struct icaltimetype t;
-	    memset(&t,0,sizeof(struct icaltimetype));
-	    t.day = 1;
-	    t.year = year;
-	    t.month = month;
-	    t.is_date = 1;
-	    
-	    for(t.day = 1; t.day <=days_in_month; t.day++){
-		
-		short current_dow = icaltime_day_of_week(t);
-		
-		for(k=0;impl->by_ptrs[BY_DAY][k]!=ICAL_RECURRENCE_ARRAY_MAX;k++){
-		    
-		    enum icalrecurrencetype_weekday dow =
-			icalrecurrencetype_day_day_of_week(impl->by_ptrs[BY_DAY][k]);
-		    
-		    if(current_dow == dow){
-			short doy = icaltime_day_of_year(t);
-			/* HACK, incomplete Nth day of week handling */
-			impl->days[days_index++] = doy;
-			
-		    }
-		}
-            }
-        }
-    } else if (has_by_data(impl,BY_MONTH) && has_by_data(impl,BY_MONTH_DAY)){
-
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-            for(k=0;impl->by_ptrs[BY_MONTH_DAY][k]!=ICAL_RECURRENCE_ARRAY_MAX;k++)
-           {
-                short month = impl->by_ptrs[BY_MONTH][j];
-                short month_day = impl->by_ptrs[BY_MONTH_DAY][k];
-                short doy;
-
-		t.day = month_day;
-		t.month = month;
-		t.year = year;
-		t.is_date = 1;
-
-		doy = icaltime_day_of_year(t);
-
-		impl->days[days_index++] = doy;
-
-            }
-        }
-    } else if (has_by_data(impl,BY_WEEK_NO) && !has_by_data(impl,BY_DAY)){
-
-	struct icaltimetype t;
-	short dow;
-
-	t.day = impl->dtstart.day;
-	t.month = impl->dtstart.month;
-	t.year = year;
-	t.is_date = 1;
-
-        dow = icaltime_day_of_week(t);
-	/* HACK Not finished */ 
-	
-
-    } else if (has_by_data(impl,BY_WEEK_NO) && has_by_data(impl,BY_DAY)){
-	/* HACK Not finished */ 
-    } else if (has_by_data(impl,BY_YEAR_DAY)){
-	
-	for(j=0;impl->by_ptrs[BY_YEAR_DAY][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    short doy = impl->by_ptrs[BY_YEAR_DAY][j];
-	    impl->days[days_index++] = doy;
-	}
-	    
-    } else if (has_by_data(impl,BY_MONTH_DAY) ){
-	/* HACK Not finished */ 
-
-    } else if (has_by_data(impl,BY_DAY)){
-	/* HACK Not finished */ 
-
-    } else {
-	assert(0);
-	/* HACK Not finished */ 
-
-    }
-
-    return 0;
-}                                  
-
-
-int next_year(struct icalrecur_iterator_impl* impl)
-{
-    struct icaltimetype next;
-    short end_of_data=0;
-
-    if (next_hour(impl) == 0){
-	return 0;
-    }
-
-    impl->days_index++;
-
-    if (impl->days[impl->days_index] == ICAL_RECURRENCE_ARRAY_MAX){
-	impl->days_index = 0;
-	end_of_data = 1;
-    }
-
-    next = icaltime_from_day_of_year(impl->days[impl->days_index],impl->last.year);
-    
-    impl->last.day =  next.day;
-    impl->last.month =  next.month;
-  
-
-    if(end_of_data){
-	increment_year(impl,impl->rule.interval);
-	expand_year_days(impl,impl->last.year);
-    }
-    
-    return 1;
-}
-
-int check_restriction(struct icalrecur_iterator_impl* impl,
-		      enum byrule byrule, short v)
-{
-    int pass = 0;
-    int itr;
-    icalrecurrencetype_frequency freq = impl->rule.freq;
-
-    if(impl->by_ptrs[byrule][0]!=ICAL_RECURRENCE_ARRAY_MAX &&
-	expand_map[freq].map[byrule] == CONTRACT){
-	for(itr=0; impl->by_ptrs[byrule][itr]!=ICAL_RECURRENCE_ARRAY_MAX;itr++){
-	    if(impl->by_ptrs[byrule][itr] == v){
-		pass=1;
-		break;
-	    }
-	}
-
-	return pass;
-    } else {
-	/* This is not a contracting byrule, or it has no data, so the
-           test passes*/
-	return 1;
-    }
-}
-
-int check_contracting_rules(struct icalrecur_iterator_impl* impl)
-{
-
-    int day_of_week=0;
-    int week_no=0;
-    int year_day=0;
-
-    if (
-	check_restriction(impl,BY_SECOND,impl->last.second) &&
-	check_restriction(impl,BY_MINUTE,impl->last.minute) &&
-	check_restriction(impl,BY_HOUR,impl->last.hour) &&
-	check_restriction(impl,BY_DAY,day_of_week) &&
-	check_restriction(impl,BY_WEEK_NO,week_no) &&
-	check_restriction(impl,BY_MONTH_DAY,impl->last.day) &&
-	check_restriction(impl,BY_MONTH,impl->last.month) &&
-	check_restriction(impl,BY_YEAR_DAY,year_day) )
-    {
-
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-struct icaltimetype icalrecur_iterator_next(icalrecur_iterator *itr)
-{
-    struct icalrecur_iterator_impl* impl = 
-	(struct icalrecur_iterator_impl*)itr;
-    
-    if( (impl->rule.count!=0 &&impl->occurrence_no >= impl->rule.count) ||
-       (!icaltime_is_null_time(impl->rule.until) && 
-	icaltime_compare(impl->last,impl->rule.until) > 0)) {
-	return icaltime_null_time();
-    }
-
-    if(impl->occurrence_no == 0 
-       &&  icaltime_compare(impl->last,impl->dtstart) >= 0){
-
-	impl->occurrence_no++;
-	return impl->last;
-    }
-
-    do {
-	switch(impl->rule.freq){
-	    
-	    case ICAL_SECONDLY_RECURRENCE: {
-		next_second(impl);
-		break;
-	    }
-	    case ICAL_MINUTELY_RECURRENCE: {
-		next_minute(impl);
-		break;
-	    }
-	    case ICAL_HOURLY_RECURRENCE: {
-		next_hour(impl);
-		break;
-	    }
-	    case ICAL_DAILY_RECURRENCE: {
-		next_day(impl);
-		break;
-	    }
-	    case ICAL_WEEKLY_RECURRENCE: {
-		next_week(impl);
-		break;
-	    }
-	    case ICAL_MONTHLY_RECURRENCE: {
-		next_month(impl);
-		break;
-	    }
-	    case ICAL_YEARLY_RECURRENCE:{
-		next_year(impl);
-		break;
-	    }
-	    default:{
-		assert(0); /* HACK, need a better error */
-	    }
-	}    
-	
-	if(impl->last.year >= 2038){
-	    /* HACK */
-	    return icaltime_null_time();
-	}
-	
-    } while(!check_contracting_rules(impl) 
-	    || icaltime_compare(impl->last,impl->dtstart) < 0);
-    
-    
-/* Ignore null times and times that are after the until time */
-    if( !icaltime_is_null_time(impl->rule.until) && 
-	icaltime_compare(impl->last,impl->rule.until) > 0 ) {
-	return icaltime_null_time();
-    }
-
-    impl->occurrence_no++;
-
-    return impl->last;
-}
-
-
-/************************** Type Routines **********************/
-
-
-void icalrecurrencetype_clear(struct icalrecurrencetype *recur)
-{
-    memset(recur,ICAL_RECURRENCE_ARRAY_MAX_BYTE,
-	   sizeof(struct icalrecurrencetype));
-
-    recur->week_start = ICAL_MONDAY_WEEKDAY;
-    recur->freq = ICAL_NO_RECURRENCE;
-    recur->interval = 1;
-    memset(&(recur->until),0,sizeof(struct icaltimetype));
-    recur->count = 0;
-}
-
-/* The 'day' element of icalrecurrencetype_weekday is encoded to allow
-reporesentation of both the day of the week ( Monday, Tueday), but
-also the Nth day of the week ( First tuesday of the month, last
-thursday of the year) These routines decode the day values. 
-
-The day's position in the period ( Nth-ness) and the numerical value
-of the day are encoded together as: pos*7 + dow
- */
-
-enum icalrecurrencetype_weekday icalrecurrencetype_day_day_of_week(short day)
-{
-    return abs(day)%8;
-}
-
-short icalrecurrencetype_day_position(short day)
-{
-    short wd, pos;
-
-    wd = icalrecurrencetype_day_day_of_week(day);
-
-    pos = (abs(day)-wd)/8 * ((day<0)?-1:1);
-
-    if(pos == 0){
-	pos = 1;
-    }
-
-    return pos;
-}
-
-
-/****************** Enumeration Routines ******************/
-
-struct {icalrecurrencetype_weekday wd; const char * str; } 
-wd_map[] = {
-    {ICAL_SUNDAY_WEEKDAY,"SU"},
-    {ICAL_MONDAY_WEEKDAY,"MO"},
-    {ICAL_TUESDAY_WEEKDAY,"TU"},
-    {ICAL_WEDNESDAY_WEEKDAY,"WE"},
-    {ICAL_THURSDAY_WEEKDAY,"TH"},
-    {ICAL_FRIDAY_WEEKDAY,"FR"},
-    {ICAL_SATURDAY_WEEKDAY,"SA"},
-    {ICAL_NO_WEEKDAY,0}
-};
-
-const char* icalrecur_weekday_to_string(icalrecurrencetype_weekday kind)
-{
-    int i;
-
-    for (i=0; wd_map[i].wd  != ICAL_NO_WEEKDAY; i++) {
-	if ( wd_map[i].wd ==  kind) {
-	    return wd_map[i].str;
-	}
-    }
-
-    return 0;
-}
-
-icalrecurrencetype_weekday icalrecur_string_to_weekday(const char* str)
-{
-    int i;
-
-    for (i=0; wd_map[i].wd  != ICAL_NO_WEEKDAY; i++) {
-	if ( strcmp(str,wd_map[i].str) == 0){
-	    return wd_map[i].wd;
-	}
-    }
-
-    return ICAL_NO_WEEKDAY;
-}
-
-
-
-struct {
-	icalrecurrencetype_frequency kind;
-	const char* str;
-} freq_map[] = {
-    {ICAL_SECONDLY_RECURRENCE,"SECONDLY"},
-    {ICAL_MINUTELY_RECURRENCE,"MINUTELY"},
-    {ICAL_HOURLY_RECURRENCE,"HOURLY"},
-    {ICAL_DAILY_RECURRENCE,"DAILY"},
-    {ICAL_WEEKLY_RECURRENCE,"WEEKLY"},
-    {ICAL_MONTHLY_RECURRENCE,"MONTHLY"},
-    {ICAL_YEARLY_RECURRENCE,"YEARLY"},
-    {ICAL_NO_RECURRENCE,0}
-};
-
-const char* icalrecur_recurrence_to_string(icalrecurrencetype_frequency kind)
-{
-    int i;
-
-    for (i=0; freq_map[i].kind != ICAL_NO_RECURRENCE ; i++) {
-	if ( freq_map[i].kind == kind ) {
-	    return freq_map[i].str;
-	}
-    }
-    return 0;
-}
-
-icalrecurrencetype_frequency icalrecur_string_to_recurrence(const char* str)
-{
-    int i;
-
-    for (i=0; freq_map[i].kind != ICAL_NO_RECURRENCE ; i++) {
-	if ( strcmp(str,freq_map[i].str) == 0){
-	    return freq_map[i].kind;
-	}
-    }
-    return ICAL_NO_RECURRENCE;
-}
-
-
-int icalrecur_expand_recurrence(char* rule, time_t start,
-				int count, time_t* array)
-{
-    struct icalrecurrencetype recur;
-    icalrecur_iterator* ritr;
-    time_t tt;
-    struct icaltimetype icstart, next;
-    int i = 0;
-
-    memset(array, 0, count*sizeof(time_t));
-
-    icstart = icaltime_from_timet(start,0);
-
-    recur = icalrecurrencetype_from_string(rule);
-
-    for(ritr = icalrecur_iterator_new(recur,icstart),
-	next = icalrecur_iterator_next(ritr);
-	!icaltime_is_null_time(next) && i < count;
-	next = icalrecur_iterator_next(ritr)){
-	
-	tt = icaltime_as_timet(next);
-	
-	if (tt >= start ){
-	    array[i++] = tt;
-	}
-
-    }
-
-    icalrecur_iterator_free(ritr);
-
-    return 1;
-}
diff --git a/libical/src/libical/icalrecur.h b/libical/src/libical/icalrecur.h
deleted file mode 100644
index a4880d7de1..0000000000
--- a/libical/src/libical/icalrecur.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalrecur.h
- CREATOR: eric 20 March 2000
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-
-#ifndef ICALRECUR_H
-#define ICALRECUR_H
-
-#include <time.h>
-#include "icaltime.h"
-
-/***********************************************************************
- * Recurrance enumerations
-**********************************************************************/
-
-typedef enum icalrecurrencetype_frequency
-{
-    /* These enums are used to index an array, so don't change the
-       order or the integers */
-
-    ICAL_SECONDLY_RECURRENCE=0,
-    ICAL_MINUTELY_RECURRENCE=1,
-    ICAL_HOURLY_RECURRENCE=2,
-    ICAL_DAILY_RECURRENCE=3,
-    ICAL_WEEKLY_RECURRENCE=4,
-    ICAL_MONTHLY_RECURRENCE=5,
-    ICAL_YEARLY_RECURRENCE=6,
-    ICAL_NO_RECURRENCE=7
-
-} icalrecurrencetype_frequency;
-
-typedef enum icalrecurrencetype_weekday
-{
-    ICAL_NO_WEEKDAY,
-    ICAL_SUNDAY_WEEKDAY,
-    ICAL_MONDAY_WEEKDAY,
-    ICAL_TUESDAY_WEEKDAY,
-    ICAL_WEDNESDAY_WEEKDAY,
-    ICAL_THURSDAY_WEEKDAY,
-    ICAL_FRIDAY_WEEKDAY,
-    ICAL_SATURDAY_WEEKDAY
-} icalrecurrencetype_weekday;
-
-enum {
-    ICAL_RECURRENCE_ARRAY_MAX = 0x7f7f,
-    ICAL_RECURRENCE_ARRAY_MAX_BYTE = 0x7f
-};
-    
-const char* icalrecur_recurrence_to_string(icalrecurrencetype_frequency kind);
-icalrecurrencetype_frequency icalrecur_string_to_recurrence(const char* str);
-const char* icalrecur_weekday_to_string(icalrecurrencetype_weekday kind);
-icalrecurrencetype_weekday icalrecur_string_to_weekday(const char* str);
-
-
-/********************** Recurrence type routines **************/
-
-/* See RFC 2445 Section 4.3.10, RECUR Value, for an explaination of
-   the values and fields in struct icalrecurrencetype */
-
-#define ICAL_BY_SECOND_SIZE 61
-#define ICAL_BY_MINUTE_SIZE 61
-#define ICAL_BY_HOUR_SIZE 25
-#define ICAL_BY_DAY_SIZE 364 /* 7 days * 52 weeks */
-#define ICAL_BY_MONTHDAY_SIZE 32
-#define ICAL_BY_YEARDAY_SIZE 367
-#define ICAL_BY_WEEKNO_SIZE 54
-#define ICAL_BY_MONTH_SIZE 13
-#define ICAL_BY_SETPOS_SIZE 367
-
-struct icalrecurrencetype 
-{
-	icalrecurrencetype_frequency freq;
-
-
-	/* until and count are mutually exclusive. */
-       	struct icaltimetype until; 
-	int count;
-
-	short interval;
-	
-	icalrecurrencetype_weekday week_start;
-	
-	/* The BY* parameters can each take a list of values. Here I
-	 * assume that the list of values will not be larger than the
-	 * range of the value -- that is, the client will not name a
-	 * value more than once. 
-	 
-	 * Each of the lists is terminated with the value
-	 * ICAL_RECURRENCE_ARRAY_MAX unless the the list is full.
-	 */
-
-	short by_second[ICAL_BY_SECOND_SIZE];
-	short by_minute[ICAL_BY_MINUTE_SIZE];
-	short by_hour[ICAL_BY_HOUR_SIZE];
-	short by_day[ICAL_BY_DAY_SIZE]; /* Encoded value, see below */
-	short by_month_day[ICAL_BY_MONTHDAY_SIZE];
-	short by_year_day[ ICAL_BY_YEARDAY_SIZE];
-	short by_week_no[ICAL_BY_WEEKNO_SIZE];
-	short by_month[ICAL_BY_MONTH_SIZE];
-	short by_set_pos[ICAL_BY_SETPOS_SIZE];
-};
-
-
-void icalrecurrencetype_clear(struct icalrecurrencetype *r);
-
-/* The 'day' element of the by_day array is encoded to allow
-representation of both the day of the week ( Monday, Tueday), but also
-the Nth day of the week ( First tuesday of the month, last thursday of
-the year) These routines decode the day values */
-
-/* 1 == Monday, etc. */
-enum icalrecurrencetype_weekday icalrecurrencetype_day_day_of_week(short day);
-
-/* 0 == any of day of week. 1 == first, 2 = second, -2 == second to last, etc */
-short icalrecurrencetype_day_position(short day);
-
-/* Return the next occurance of 'r' after the time specified by 'after' */
-struct icaltimetype icalrecurrencetype_next_occurance(
-    struct icalrecurrencetype *r,
-    struct icaltimetype *after);
-
-
-
-typedef void icalrecur_iterator;
-void icalrecurrencetype_test();
-
-/***********************************************************************
- * Recurrance rule parser
-**********************************************************************/
-
-struct icalrecurrencetype icalrecurrencetype_from_string(const char* str);
-char* icalrecurrencetype_as_string(struct icalrecurrencetype *recur);
-
-
-/********** recurrence routines ********************/
-
-icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule, struct icaltimetype dtstart);
-
-struct icaltimetype icalrecur_iterator_next(icalrecur_iterator*);
-
-int icalrecur_iterator_count(icalrecur_iterator*);
-
-void icalrecur_iterator_free(icalrecur_iterator*);
-
-/* Fills array up with at most 'count' time_t values, each
-   representing an occurrence time in seconds past the POSIX epoch */
-int icalrecur_expand_recurrence(char* rule, time_t start, 
-				int count, time_t* array);
-
-
-#endif
diff --git a/libical/src/libical/icalrestriction.c.in b/libical/src/libical/icalrestriction.c.in
deleted file mode 100644
index 454442531f..0000000000
--- a/libical/src/libical/icalrestriction.c.in
+++ /dev/null
@@ -1,447 +0,0 @@
-/*  -*- Mode: C -*- */
-/*  ======================================================================
-  File: icalrestriction.c
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-/*#line 7 "icalrestriction.c.in"*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalrestriction.h"
-#include "icalenums.h"
-#include "icalerror.h"
-
-#include <assert.h>
-#include <stdio.h> /* For snprintf */   
-
-#define TMP_BUF_SIZE 1024
-
-
-/* Define the structs for the restrictions. these data are filled out
-in machine generated code below */
-
-struct icalrestriction_property_record;
-
-typedef char* (*restriction_func)(struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop);
-
-
-typedef struct icalrestriction_property_record {
-	icalproperty_method method;
-	icalcomponent_kind component;
-	icalproperty_kind property;
-	icalrestriction_kind restriction;
-	restriction_func function;
-} icalrestriction_property_record;
-
-
-typedef struct icalrestriction_component_record {
-	icalproperty_method method;
-	icalcomponent_kind component;
-	icalcomponent_kind subcomponent;
-	icalrestriction_kind restriction;
-	restriction_func function;
-} icalrestriction_component_record;
-
-icalrestriction_property_record*
-icalrestriction_get_property_restriction(icalproperty_method method,
-					 icalcomponent_kind component,
-					 icalproperty_kind property);
-icalrestriction_component_record*
-icalrestriction_get_component_restriction(icalproperty_method method,
-					  icalcomponent_kind component,
-					  icalcomponent_kind subcomponent);
-
-icalrestriction_component_record icalrestriction_component_records[];
-icalrestriction_property_record icalrestriction_property_records[]; 
-
-icalrestriction_property_record null_prop_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_UNKNOWN,0};
-icalrestriction_component_record null_comp_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_UNKNOWN,0};
-
-
-/* The each row gives the result of comparing a restriction against a
-   count. The columns in each row represent 0,1,2+. '-1' indicates
-   'invalid, 'don't care' or 'needs more analysis' So, for
-   ICAL_RESTRICTION_ONE, if there is 1 of a property with that
-   restriction, it passes, but if there are 0 or 2+, it fails. */
-
-char compare_map[ICAL_RESTRICTION_UNKNOWN+1][3] = {
-    { 1, 1, 1},/*ICAL_RESTRICTION_NONE*/
-    { 1, 0, 0},/*ICAL_RESTRICTION_ZERO*/
-    { 0, 1, 0},/*ICAL_RESTRICTION_ONE*/
-    { 1, 1, 1},/*ICAL_RESTRICTION_ZEROPLUS*/
-    { 0, 1, 1},/*ICAL_RESTRICTION_ONEPLUS*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ZEROORONE*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ONEEXCLUSIVE*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ONEMUTUAL*/
-    { 1, 1, 1} /*ICAL_RESTRICTION_UNKNOWN*/
-};
-
-char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = {
-    "unknown number",/*ICAL_RESTRICTION_NONE*/
-    "0",/*ICAL_RESTRICTION_ZERO*/
-    "1",/*ICAL_RESTRICTION_ONE*/
-    "zero or more",/*ICAL_RESTRICTION_ZEROPLUS*/
-    "one or more" ,/*ICAL_RESTRICTION_ONEPLUS*/
-    "zero or one",/*ICAL_RESTRICTION_ZEROORONE*/
-    "zero or one, exclusive with another property",/*ICAL_RESTRICTION_ONEEXCLUSIVE*/
-    "zero or one, mutual with another property",/*ICAL_RESTRICTION_ONEMUTUAL*/
-    "unknown number" /*ICAL_RESTRICTION_UNKNOWN*/
-};
-
-
-int
-icalrestriction_compare(icalrestriction_kind restr, int count){
-
-    if ( restr < ICAL_RESTRICTION_NONE || restr > ICAL_RESTRICTION_UNKNOWN
-	 || count < 0){
-	return -1;
-    }
-
-    if (count > 2) {
-	count = 2;
-    }
-
-    return compare_map[restr][count];
-
-}
-
-/* Special case routines */
-
-char* icalrestriction_may_be_draft_final_canceled(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_DRAFT ||
-	   stat == ICAL_STATUS_FINAL ||
-	   stat == ICAL_STATUS_CANCELLED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of DRAFT, FINAL, or CANCELED";
-
-    }
-
-    return 0;    
-}
-
-char* icalrestriction_may_be_comp_need_process(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_COMPLETED ||
-	   stat == ICAL_STATUS_NEEDSACTION ||
-	   stat == ICAL_STATUS_INPROCESS )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of COMPLETED, NEEDS-ACTION or IN-PROCESS";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_may_be_tent_conf(icalrestriction_property_record *rec,
-				       icalcomponent* comp, 
-				       icalproperty* prop){
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_TENTATIVE ||
-	   stat == ICAL_STATUS_CONFIRMED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of TENTATIVE or CONFIRMED";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_may_be_tent_conf_cancel(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_TENTATIVE ||
-	   stat == ICAL_STATUS_CONFIRMED ||
-	   stat == ICAL_STATUS_CANCELLED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of TENTATIVE, CONFIRMED or CANCELED";
-
-    }
-
-    return 0;    
-}
-
-char* icalrestriction_must_be_cancel_if_present(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    /* This routine will not be called if prop == 0 */
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( stat != ICAL_STATUS_CANCELLED)
-    {
-	return "Failed iTIP restrictions for STATUS property. Value must be CANCELLED";
-
-    }
- 
-
-    return 0;    
-}
-
-char* icalrestriction_must_be_canceled_no_attendee(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-
-    /* Hack. see rfc2446, 3.2.5 CANCEL for porperty STATUS. I don't
-       understand the note */
-
-    return 0;    
-}
-char* icalrestriction_must_be_recurring(icalrestriction_property_record *rec,
-					icalcomponent* comp, 
-					icalproperty* prop){
-    /* Hack */
-    return 0;    
-}
-char* icalrestriction_must_have_duration(icalrestriction_property_record *rec,
-					 icalcomponent* comp, 
-					 icalproperty* prop){
-    
-    if( !icalcomponent_get_first_property(comp,ICAL_DURATION_PROPERTY)){
-
-	return "Failed iTIP restrictions for STATUS property. This component must have a DURATION property";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_must_have_repeat(icalrestriction_property_record *rec,
-				       icalcomponent* comp, 
-				       icalproperty* prop){
-    if( !icalcomponent_get_first_property(comp,ICAL_REPEAT_PROPERTY)){
-
-	return "Failed iTIP restrictions for STATUS property. This component must have a REPEAT property";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_must_if_tz_ref(icalrestriction_property_record *rec,
-				     icalcomponent* comp, 
-				     icalproperty* prop){
-
-    /* Hack */
-    return 0;    
-}
-char* icalrestriction_no_dtend(icalrestriction_property_record *rec,
-			       icalcomponent* comp, 
-			       icalproperty* prop){
-
-    if( !icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
-
-	return "Failed iTIP restrictions for STATUS property. The component must not have both DURATION and DTEND";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_no_duration(icalrestriction_property_record *rec,
-				icalcomponent* comp, 
-				  icalproperty* prop){
-
-    /* _no_dtend takes care of this one */
-    return 0;    
-}                                     
-
-
-int icalrestriction_check_component(icalproperty_method method,
-				    icalcomponent* comp)
-{
-    icalproperty_kind kind;
-    icalcomponent_kind comp_kind;
-    icalrestriction_kind restr;
-    icalrestriction_property_record *prop_record;
-    icalrestriction_component_record *comp_record;
-    char* funcr = 0;
-    icalproperty *prop;
-
-    int count;
-    int compare;
-    int valid = 1;
-
-    comp_kind = icalcomponent_isa(comp);
-
-    /* Check all of the properties in this component */
-
-    for(kind = ICAL_ANY_PROPERTY+1; kind != ICAL_NO_PROPERTY; kind++){
-	count = icalcomponent_count_properties(comp, kind);
-	
-	prop_record = icalrestriction_get_property_restriction(method, 
-							 comp_kind,
-							 kind);
-
-	restr = prop_record->restriction;
-
-	if(restr == ICAL_RESTRICTION_ONEEXCLUSIVE ||
-	    restr == ICAL_RESTRICTION_ONEMUTUAL) {
-
-	    /* First treat is as a 0/1 restriction */
-	    restr = ICAL_RESTRICTION_ZEROORONE;
-	    compare = icalrestriction_compare(restr,count);
-
-	} else {
-
-	    compare = icalrestriction_compare(restr,count);
-	}
-
-	assert(compare != -1);
-
-	if (compare == 0){
-	    char temp[TMP_BUF_SIZE];
-	    
-	    snprintf(temp, TMP_BUF_SIZE,"Failed iTIP restrictions for %s property. Expected %s instances of the property and got %d",
-		    icalenum_property_kind_to_string(kind),
-		    restr_string_map[restr], count);
-	    
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     temp,
-		     icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP),
-		     0));   
-	} 
-
-
-	prop = icalcomponent_get_first_property(comp, kind);
-
-	if (prop != 0 && prop_record->function !=0  ){
-	    funcr =  prop_record->function(prop_record,comp,prop);
-	}
-
-	if(funcr !=0){
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     funcr,
-		     icalparameter_new_xlicerrortype(
-			 ICAL_XLICERRORTYPE_INVALIDITIP),
-		     0));   
-
-	    compare = 0;
-	}
-
-	valid = valid && compare;
-    }
-
-
-
-    return valid;
-
-
-}
-
-int icalrestriction_check(icalcomponent* outer_comp)
-{
-    icalcomponent_kind comp_kind;
-    icalproperty_method method;
-    icalcomponent* inner_comp;
-    icalproperty *method_prop;
-    int valid;
-    
-    icalerror_check_arg_rz( (outer_comp!=0), "outer comp");
-
-
-    /* Get the Method value from the outer component */
-
-    comp_kind = icalcomponent_isa(outer_comp);
-
-    if (comp_kind != ICAL_VCALENDAR_COMPONENT){
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return 0;
-    }
-
-    method_prop = icalcomponent_get_first_property(outer_comp,
-						   ICAL_METHOD_PROPERTY);
-
-    if (method_prop == 0){
-	method = ICAL_METHOD_NONE;
-    } else {
-	method = icalproperty_get_method(method_prop);
-    }
-   
-
-    /* Check the VCALENDAR wrapper */
-    valid = icalrestriction_check_component(ICAL_METHOD_NONE,outer_comp);
-
-
-    /* Now check the inner components */
-
-    for(inner_comp= icalcomponent_get_first_component(outer_comp,
-						      ICAL_ANY_COMPONENT);
-	inner_comp != 0;
-	inner_comp= icalcomponent_get_next_component(outer_comp,
-						     ICAL_ANY_COMPONENT)){
-
-	valid = valid && icalrestriction_check_component(method,inner_comp);
-
-    }
-
-
-    return valid;
-
-}
-
-icalrestriction_property_record*
-icalrestriction_get_property_restriction(icalproperty_method method,
-					 icalcomponent_kind component,
-					 icalproperty_kind property)
-{
-    int i;
-
-    for(i = 0;
-	icalrestriction_property_records[i].restriction != ICAL_RESTRICTION_NONE;
-	i++){
-
-	if (method == icalrestriction_property_records[i].method &&
-	    component == icalrestriction_property_records[i].component &&
-	    property ==  icalrestriction_property_records[i].property ){
-	    return  &icalrestriction_property_records[i];
-	}
-    }
-	
-    return &null_prop_record;
-}
-
-
-icalrestriction_component_record*
-icalrestriction_get_component_restriction(icalproperty_method method,
-					  icalcomponent_kind component,
-					  icalcomponent_kind subcomponent)
-{
-
-    int i;
-
-    for(i = 0;
-	icalrestriction_component_records[i].restriction != ICAL_RESTRICTION_NONE;
-	i++){
-
-	if (method == icalrestriction_component_records[i].method &&
-	    component == icalrestriction_component_records[i].component &&
-	    subcomponent ==  icalrestriction_component_records[i].subcomponent ){
-	    return  &icalrestriction_component_records[i];
-	}
-    }
-	
-    return &null_comp_record;
-}
-
diff --git a/libical/src/libical/icalrestriction.h b/libical/src/libical/icalrestriction.h
deleted file mode 100644
index 6d414db4af..0000000000
--- a/libical/src/libical/icalrestriction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalrestriction.h
-  CREATOR: eric 24 April 1999
-  
-  $Id$
-
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalrestriction.h
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#include "icalproperty.h"
-#include "icalcomponent.h"
-
-#ifndef ICALRESTRICTION_H
-#define ICALRESTRICTION_H
-
-/* These must stay in this order for icalrestriction_compare to work */
-typedef enum icalrestriction_kind {
-    ICAL_RESTRICTION_NONE=0,		/* 0 */
-    ICAL_RESTRICTION_ZERO,		/* 1 */
-    ICAL_RESTRICTION_ONE,		/* 2 */
-    ICAL_RESTRICTION_ZEROPLUS,		/* 3 */
-    ICAL_RESTRICTION_ONEPLUS,		/* 4 */
-    ICAL_RESTRICTION_ZEROORONE,		/* 5 */
-    ICAL_RESTRICTION_ONEEXCLUSIVE,	/* 6 */
-    ICAL_RESTRICTION_ONEMUTUAL,		/* 7 */
-    ICAL_RESTRICTION_UNKNOWN		/* 8 */
-} icalrestriction_kind;
-
-int 
-icalrestriction_compare(icalrestriction_kind restr, int count);
-
-
-int
-icalrestriction_is_parameter_allowed(icalproperty_kind property,
-                                       icalparameter_kind parameter);
-
-int icalrestriction_check(icalcomponent* comp);
-
-
-#endif /* !ICALRESTRICTION_H */
-
-
-
diff --git a/libical/src/libical/icaltime.c b/libical/src/libical/icaltime.c
deleted file mode 100644
index b3c94229bf..0000000000
--- a/libical/src/libical/icaltime.c
+++ /dev/null
@@ -1,915 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltime.c
-  CREATOR: eric 02 June 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icaltime.h"
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef ICAL_NO_LIBICAL
-#define icalerror_set_errno(x)
-#define  icalerror_check_arg_rv(x,y)
-#define  icalerror_check_arg_re(x,y,z)
-#else
-#include "icalerror.h"
-#include "icalmemory.h"
-#endif
-
-
-
-
-struct icaltimetype 
-icaltime_from_timet(time_t tm, int is_date)
-{
-    struct icaltimetype tt = icaltime_null_time();
-    struct tm t;
-
-    t = *(gmtime(&tm));
-     
-    if(is_date == 0){ 
-	tt.second = t.tm_sec;
-	tt.minute = t.tm_min;
-	tt.hour = t.tm_hour;
-    } else {
-	tt.second = tt.minute =tt.hour = 0 ;
-    }
-
-    tt.day = t.tm_mday;
-    tt.month = t.tm_mon + 1;
-    tt.year = t.tm_year+ 1900;
-    
-    tt.is_utc = 1;
-    tt.is_date = is_date; 
-
-    return tt;
-}
-
-/* This will hold the last "TZ=XXX" string we used with putenv(). After we
-   call putenv() again to set a new TZ string, we can free the previous one.
-   As far as I know, no libc implementations actually free the memory used in
-   the environment variables (how could they know if it is a static string or
-   a malloc'ed string?), so we have to free it ourselves. */
-static char* saved_tz = NULL;
-
-
-/* If you use set_tz(), you must call unset_tz() some time later to restore the
-   original TZ. Pass unset_tz() the string that set_tz() returns. */
-char* set_tz(const char* tzid)
-{
-    char *old_tz, *old_tz_copy = NULL, *new_tz;
-
-    /* Get the old TZ setting and save a copy of it to return. */
-    old_tz = getenv("TZ");
-    if(old_tz){
-	old_tz_copy = (char*)malloc(strlen (old_tz) + 4);
-
-	if(old_tz_copy == 0){
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-
-	strcpy (old_tz_copy, "TZ=");
-	strcpy (old_tz_copy + 3, old_tz);
-    }
-
-    /* Create the new TZ string. */
-    new_tz = (char*)malloc(strlen (tzid) + 4);
-
-    if(new_tz == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    strcpy (new_tz, "TZ=");
-    strcpy (new_tz + 3, tzid);
-
-    /* Add the new TZ to the environment. */
-    putenv(new_tz); 
-
-    /* Free any previous TZ environment string we have used. */
-    if (saved_tz)
-      free (saved_tz);
-
-    /* Save a pointer to the TZ string we just set, so we can free it later. */
-    saved_tz = new_tz;
-
-    return old_tz_copy; /* This will be zero if the TZ env var was not set */
-}
-
-void unset_tz(char *tzstr)
-{
-    /* restore the original environment */
-
-    if(tzstr!=0){
-	putenv(tzstr);
-    } else {
-	putenv("TZ"); /* Delete from environment */
-    } 
-
-    /* Free any previous TZ environment string we have used. */
-    if (saved_tz)
-      free (saved_tz);
-
-    /* Save a pointer to the TZ string we just set, so we can free it later.
-       (This can possibly be NULL if there was no TZ to restore.) */
-    saved_tz = tzstr;
-}
-
-
-time_t icaltime_as_timet(struct icaltimetype tt)
-{
-    struct tm stm;
-    time_t t;
-
-    memset(&stm,0,sizeof( struct tm));
-
-    if(icaltime_is_null_time(tt)) {
-	return 0;
-    }
-
-    stm.tm_sec = tt.second;
-    stm.tm_min = tt.minute;
-    stm.tm_hour = tt.hour;
-    stm.tm_mday = tt.day;
-    stm.tm_mon = tt.month-1;
-    stm.tm_year = tt.year-1900;
-    stm.tm_isdst = -1;
-
-    if(tt.is_utc == 1 || tt.is_date == 1){
-	char* old_tz = set_tz("UTC");
-	t = mktime(&stm);
-	unset_tz(old_tz);
-    } else {
-	t = mktime(&stm);
-    }
-
-    return t;
-
-}
-
-char* icaltime_as_ical_string(struct icaltimetype tt)
-{
-    size_t size = 17;
-    char* buf = icalmemory_new_buffer(size);
-
-    if(tt.is_date){
-	snprintf(buf, size,"%04d%02d%02d",tt.year,tt.month,tt.day);
-    } else {
-	char* fmt;
-	if(tt.is_utc){
-	    fmt = "%04d%02d%02dT%02d%02d%02dZ";
-	} else {
-	    fmt = "%04d%02d%02dT%02d%02d%02d";
-	}
-	snprintf(buf, size,fmt,tt.year,tt.month,tt.day,
-		 tt.hour,tt.minute,tt.second);
-    }
-    
-    icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-
-}
-
-
-/* convert tt, of timezone tzid, into a utc time */
-struct icaltimetype icaltime_as_utc(struct icaltimetype tt,const char* tzid)
-{
-    int tzid_offset;
-
-    if(tt.is_utc == 1 || tt.is_date == 1){
-	return tt;
-    }
-
-    tzid_offset = icaltime_utc_offset(tt,tzid);
-
-    tt.second -= tzid_offset;
-
-    tt.is_utc = 1;
-
-    return icaltime_normalize(tt);
-}
-
-/* convert tt, a time in UTC, into a time in timezone tzid */
-struct icaltimetype icaltime_as_zone(struct icaltimetype tt,const char* tzid)
-{
-    int tzid_offset;
-
-    tzid_offset = icaltime_utc_offset(tt,tzid);
-
-    tt.second += tzid_offset;
-
-    tt.is_utc = 0;
-
-    return icaltime_normalize(tt);
-
-}
-
-
-/* Return the offset of the named zone as seconds. tt is a time
-   indicating the date for which you want the offset */
-int icaltime_utc_offset(struct icaltimetype ictt, const char* tzid)
-{
-
-    time_t tt = icaltime_as_timet(ictt);
-    time_t offset_tt;
-    struct tm gtm;
-
-    char *tzstr = 0;
-
-    if(tzid != 0){
-	tzstr = set_tz(tzid);
-    }
- 
-    /* Mis-interpret a UTC broken out time as local time */
-    gtm = *(gmtime(&tt));
-    gtm.tm_isdst = localtime(&tt)->tm_isdst;    
-    offset_tt = mktime(&gtm);
-    
-    if(tzid != 0){
-	unset_tz(tzstr);
-    }
-
-    return tt-offset_tt;
-}
-
-
-
-/* Normalize by converting from localtime to utc and back to local
-   time. This uses localtime because localtime and mktime are inverses
-   of each other */
-
-struct icaltimetype icaltime_normalize(struct icaltimetype tt)
-{
-    struct tm stm;
-    time_t tut;
-
-    memset(&stm,0,sizeof( struct tm));
-
-    stm.tm_sec = tt.second;
-    stm.tm_min = tt.minute;
-    stm.tm_hour = tt.hour;
-    stm.tm_mday = tt.day;
-    stm.tm_mon = tt.month-1;
-    stm.tm_year = tt.year-1900;
-    stm.tm_isdst = -1; /* prevents mktime from changing hour based on
-			  daylight savings */
-
-    tut = mktime(&stm);
-
-    stm = *(localtime(&tut));
-
-    tt.second = stm.tm_sec;
-    tt.minute = stm.tm_min;
-    tt.hour = stm.tm_hour;
-    tt.day = stm.tm_mday;
-    tt.month = stm.tm_mon +1;
-    tt.year = stm.tm_year+1900;
-
-    return tt;
-}
-
-
-#ifndef ICAL_NO_LIBICAL
-#include "icalvalue.h"
-
-struct icaltimetype icaltime_from_string(const char* str)
-{
-    struct icaltimetype tt = icaltime_null_time();
-    int size;
-
-    icalerror_check_arg_re(str!=0,"str",icaltime_null_time());
-
-    size = strlen(str);
-    
-    if(size == 15) { /* floating time */
-	tt.is_utc = 0;
-	tt.is_date = 0;
-    } else if (size == 16) { /* UTC time, ends in 'Z'*/
-	tt.is_utc = 1;
-	tt.is_date = 0;
-
-	if(str[15] != 'Z'){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    return icaltime_null_time();
-	}
-	    
-    } else if (size == 8) { /* A DATE */
-	tt.is_utc = 0;
-	tt.is_date = 1;
-    } else { /* error */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return icaltime_null_time();
-    }
-
-    if(tt.is_date == 1){
-	sscanf(str,"%04d%02d%02d",&tt.year,&tt.month,&tt.day);
-    } else {
-	char tsep;
-	sscanf(str,"%04d%02d%02d%c%02d%02d%02d",&tt.year,&tt.month,&tt.day,
-	       &tsep,&tt.hour,&tt.minute,&tt.second);
-
-	if(tsep != 'T'){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    return icaltime_null_time();
-	}
-
-    }
-
-    return tt;    
-}
-#endif
-
-char ctime_str[20];
-char* icaltime_as_ctime(struct icaltimetype t)
-{
-    time_t tt = icaltime_as_timet(t);
-
-    sprintf(ctime_str,"%s",ctime(&tt));
-
-    ctime_str[strlen(ctime_str)-1] = 0;
-
-    return ctime_str;
-}
-
-
-short days_in_month[] = {0,31,28,31,30,31,30,31,31,30,31,30,31};
-
-short icaltime_days_in_month(short month,short year)
-{
-
-    int is_leap =0;
-    int days = days_in_month[month];
-
-    assert(month > 0);
-    assert(month <= 12);
-
-    if( (year % 4 == 0 && year % 100 != 0) ||
-	year % 400 == 0){
-	is_leap =1;
-    }
-
-    if( month == 2){
-	days += is_leap;
-    }
-
-    return days;
-}
-
-/* 1-> Sunday, 7->Saturday */
-short icaltime_day_of_week(struct icaltimetype t){
-
-    time_t tt = icaltime_as_timet(t);
-    struct tm *tm;
-
-    if(t.is_utc == 1){
-	tm = gmtime(&tt);
-    } else {
-	tm = localtime(&tt);
-    }
-
-    return tm->tm_wday+1;
-}
-
-short icaltime_start_doy_of_week(struct icaltimetype t){
-    time_t tt = icaltime_as_timet(t);
-    time_t start_tt;
-    struct tm *stm;
-    int syear;
-
-    stm = gmtime(&tt);
-    syear = stm->tm_year;
-
-    start_tt = tt - stm->tm_wday*(60*60*24);
-
-    stm = gmtime(&start_tt);
-    
-    if(syear == stm->tm_year){
-	return stm->tm_yday+1;
-    } else {
-	/* return negative to indicate that start of week is in
-           previous year. */
-	int is_leap = 0;
-	int year = stm->tm_year;
-
-	if( (year % 4 == 0 && year % 100 != 0) ||
-	    year % 400 == 0){
-	    is_leap =1;
-	}
-
-	return (stm->tm_yday+1)-(365+is_leap);
-    }
-    
-}
-
-
-
-short icaltime_day_of_year(struct icaltimetype t){
-    time_t tt = icaltime_as_timet(t);
-    struct tm *stm;
-
-    if(t.is_utc==1){
-	stm = gmtime(&tt);
-    } else {
-	stm = localtime(&tt);
-    }
-
-    return stm->tm_yday+1;
-    
-}
-
-/* Jan 1 is day #1, not 0 */
-struct icaltimetype icaltime_from_day_of_year(short doy,  short year)
-{
-    struct tm stm; 
-    time_t tt;
-
-    /* Get the time of january 1 of this year*/
-    memset(&stm,0,sizeof(struct tm)); 
-    stm.tm_year = year-1900;
-    stm.tm_mday = 1;
-
-    tt = mktime(&stm);
-
-    /* Now add in the days */
-
-    doy--;
-    tt += doy *60*60*24;
-
-    return icaltime_from_timet(tt, 1);
-}
-
-struct icaltimetype icaltime_null_time()
-{
-    struct icaltimetype t;
-    memset(&t,0,sizeof(struct icaltimetype));
-
-    return t;
-}
-
-
-int icaltime_is_valid_time(struct icaltimetype t){
-    if(t.is_utc > 1 || t.is_utc < 0 ||
-       t.year < 0 || t.year > 3000 ||
-       t.is_date > 1 || t.is_date < 0){
-	return 0;
-    } else {
-	return 1;
-    }
-
-}
-
-int icaltime_is_null_time(struct icaltimetype t)
-{
-    if (t.second +t.minute+t.hour+t.day+t.month+t.year == 0){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b)
-{
-    time_t t1 = icaltime_as_timet(a);
-    time_t t2 = icaltime_as_timet(b);
-
-    if (t1 > t2) { 
-	return 1; 
-    } else if (t1 < t2) { 
-	return -1;
-    } else { 
-	return 0; 
-    }
-
-}
-
-int
-icaltime_compare_date_only (struct icaltimetype a, struct icaltimetype b)
-{
-    time_t t1;
-    time_t t2;
-
-    if (a.year == b.year && a.month == b.month && a.day == b.day)
-        return 0;
-
-    t1 = icaltime_as_timet (a);
-    t2 = icaltime_as_timet (b);
-
-    if (t1 > t2) 
-	return 1; 
-    else if (t1 < t2)
-	return -1;
-    else {
-	/* not reached */
-	assert (0);
-	return 0;
-    }
-}
-
-struct icalperiodtype icalperiodtype_from_string (const char* str)
-{
-    
-    struct icalperiodtype p, null_p;
-    char *s = strdup(str);
-    char *start, *end = s;
-    int old_ieaf = icalerror_errors_are_fatal;
-
-    p.start = p.end = icaltime_null_time();
-    p.duration = icaldurationtype_from_int(0);
-
-    null_p = p;
-
-    if(s == 0) goto error;
-
-    start = s;
-    end = strchr(s, '/');
-
-    if(end == 0) goto error;
-
-    *end = 0;
-    end++;
-
-    p.start = icaltime_from_string(start);
-
-    if (icaltime_is_null_time(p.start)) goto error;
-	
-    icalerror_errors_are_fatal = 0;
-    p.end = icaltime_from_string(end);
-    icalerror_errors_are_fatal = old_ieaf;
-
-    if (icaltime_is_null_time(p.end)){
-
-	p.duration = icaldurationtype_from_string(end);
-
-	if(icaldurationtype_as_int(p.duration) == 0) goto error;
-    } 
-
-    return p;
-
- error:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return null_p;
-}
-
-
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p)
-{
-
-    const char* start;
-    const char* end;
-
-    char *buf;
-    size_t buf_size = 40;
-    char* buf_ptr = 0;
-
-    buf = (char*)icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-    
-
-    start = icaltime_as_ical_string(p.start);
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, start); 
-
-    if(!icaltime_is_null_time(p.end)){
-	end = icaltime_as_ical_string(p.end);
-    } else {
-	end = icaldurationtype_as_ical_string(p.duration);
-    }
-
-    icalmemory_append_char(&buf, &buf_ptr, &buf_size, '/'); 
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, end); 
-
-    return buf;
-}
-
-
-time_t
-icalperiodtype_duration (struct icalperiodtype period);
-
-
-time_t
-icalperiodtype_end (struct icalperiodtype period);
-
-
-struct icalperiodtype icalperiodtype_null_period() {
-    struct icalperiodtype p;
-    p.start = icaltime_null_time();
-    p.end = icaltime_null_time();
-    p.duration = icaldurationtype_null_duration();
-
-    return p;
-}
-int icalperiodtype_is_null_period(struct icalperiodtype p){
-    
-    if(icaltime_is_null_time(p.start) && 
-       icaltime_is_null_time(p.end) && 
-       icaldurationtype_is_null_duration(p.duration)){
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-int icalperiodtype_is_valid_period(struct icalperiodtype p){
-    if(icaltime_is_valid_time(p.start) && 
-       (icaltime_is_valid_time(p.end) || icaltime_is_null_time(p.end)) )
-	{
-	    return 1;
-	}
-
-    return 0;
-}
-
-/* From Russel Steinthal */
-int icaldurationtype_as_int(struct icaldurationtype dur)
-{
-    return (int)( (dur.seconds +
-		   (60 * dur.minutes) +
-		   (60 * 60 * dur.hours) +
-		   (60 * 60 * 24 * dur.days) +
-		   (60 * 60 * 24 * 7 * dur.weeks))
-		  * (dur.is_neg==1? -1 : 1) ) ;
-} 
-
-/* From Seth Alves,  <alves@hungry.com>   */
-struct icaldurationtype icaldurationtype_from_int(int t)
-{
-        struct icaldurationtype dur;
-        int used = 0;
- 
-        dur.weeks = (t - used) / (60 * 60 * 24 * 7);
-        used += dur.weeks * (60 * 60 * 24 * 7);
-        dur.days = (t - used) / (60 * 60 * 24);
-        used += dur.days * (60 * 60 * 24);
-        dur.hours = (t - used) / (60 * 60);
-        used += dur.hours * (60 * 60);
-        dur.minutes = (t - used) / (60);
-        used += dur.minutes * (60);
-        dur.seconds = (t - used);
- 
-	dur.is_neg = t<0? 1 : 0;
-
-        return dur;
-}
-
-#ifndef ICAL_NO_LIBICAL
-#include "icalvalue.h"
-struct icaldurationtype icaldurationtype_from_string(const char* str)
-{
-
-    int i;
-    int begin_flag = 0;
-    int time_flag = 0;
-    int date_flag = 0;
-    int week_flag = 0;
-    int digits=-1;
-    int scan_size = -1;
-    int size = strlen(str);
-    char p;
-    struct icaldurationtype d;
-
-    memset(&d, 0, sizeof(struct icaldurationtype));
-
-    for(i=0;i != size;i++){
-	p = str[i];
-	
-	switch(p) 
-	    {
-	    case '-': {
-		if(i != 0 || begin_flag == 1) goto error;
-
-		d.is_neg = 1;
-		break;
-	    }
-
-	    case 'P': {
-		if (i != 0 && i !=1 ) goto error;
-		begin_flag = 1;
-		break;
-	    }
-
-	    case 'T': {
-		time_flag = 1;
-		break;
-	    }
-
-	    case '0':
-	    case '1':
-	    case '2':
-	    case '3':
-	    case '4':
-	    case '5':
-	    case '6':
-	    case '7':
-	    case '8':
-	    case '9':
-		{ 
-		    
-		    /* HACK. Skip any more digits if the l;ast one
-                       read has not been assigned */
-		    if(digits != -1){
-			break;
-		    }
-
-		    if (begin_flag == 0) goto error;
-		    /* Get all of the digits, not one at a time */
-		    scan_size = sscanf((char*)(str+i),"%d",&digits);
-		    if(scan_size == 0) goto error;
-		    break;
-		}
-
-	    case 'H': {	
-		if (time_flag == 0||week_flag == 1||d.hours !=0||digits ==-1) 
-		    goto error;
-		d.hours = digits; digits = -1;
-		break;
-	    }
-	    case 'M': {
-		if (time_flag == 0||week_flag==1||d.minutes != 0||digits ==-1) 
-		    goto error;
-		d.minutes = digits; digits = -1;	    
-		break;
-	    }
-	    case 'S': {
-		if (time_flag == 0||week_flag==1||d.seconds!=0||digits ==-1) 
-		    goto error;
-		d.seconds = digits; digits = -1;	    
-		break;
-	    }
-	    case 'W': {
-		if (time_flag==1||date_flag==1||d.weeks!=0||digits ==-1) 
-		    goto error;
-		week_flag = 1;	
-		d.weeks = digits; digits = -1;	    
-		break;
-	    }
-	    case 'D': {
-		if (time_flag==1||week_flag==1||d.days!=0||digits ==-1) 
-		    goto error;
-		date_flag = 1;
-		d.days = digits; digits = -1;	    
-		break;
-	    }
-	    default: {
-		goto error;
-	    }
-
-	    }
-    }
-
-    return d;
-	
-
- error:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    memset(&d, 0, sizeof(struct icaldurationtype));
-    return d;
-
-}
-
-#define TMP_BUF_SIZE 1024
-void append_duration_segment(char** buf, char** buf_ptr, size_t* buf_size, 
-			     char* sep, unsigned int value) {
-
-    char temp[TMP_BUF_SIZE];
-
-    sprintf(temp,"%d",value);
-
-    icalmemory_append_string(buf, buf_ptr, buf_size, temp);
-    icalmemory_append_string(buf, buf_ptr, buf_size, sep);
-    
-}
-
-char* icaldurationtype_as_ical_string(struct icaldurationtype d) 
-{
-
-    char *buf, *output_line;
-    size_t buf_size = 256;
-    char* buf_ptr = 0;
-    int seconds;
-
-    buf = (char*)icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-    
-
-    seconds = icaldurationtype_as_int(d);
-
-    if(seconds !=0){
-	
-	if(d.is_neg == 1){
-	    icalmemory_append_char(&buf, &buf_ptr, &buf_size, '-'); 
-	}
-
-	icalmemory_append_char(&buf, &buf_ptr, &buf_size, 'P');
-    
-	if (d.weeks != 0 ) {
-	    append_duration_segment(&buf, &buf_ptr, &buf_size, "W", d.weeks);
-	}
-	
-	if (d.days != 0 ) {
-	    append_duration_segment(&buf, &buf_ptr, &buf_size, "D", d.days);
-	}
-	
-	if (d.hours != 0 || d.minutes != 0 || d.seconds != 0) {
-	    
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "T");
-	    
-	    if (d.hours != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "H", d.hours);
-	    }
-	    if (d.minutes != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "M", 
-					d.minutes);
-	    }
-	    if (d.seconds != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "S", 
-					d.seconds);
-	    }
-	    
-	}
-    } else {
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, "PTS0");
-    }
- 
-    output_line = icalmemory_tmp_copy(buf);
-    icalmemory_free_buffer(buf);
-
-    return output_line;
-    
-}
-
-#endif
-
-struct icaldurationtype icaldurationtype_null_duration()
-{
-    struct icaldurationtype d;
-    
-    memset(&d,0,sizeof(struct icaldurationtype));
-    
-    return d;
-}
-
-int icaldurationtype_is_null_duration(struct icaldurationtype d)
-{
-    if(icaldurationtype_as_int(d) == 0){
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d)
-{
-    int dt = icaldurationtype_as_int(d);
-    
-    t.second += dt;
-    
-    t = icaltime_normalize(t);
-    
-    return t;
-}
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2)
-{
-
-    time_t t1t = icaltime_as_timet(t1);
-    time_t t2t = icaltime_as_timet(t2);
-
-    return icaldurationtype_from_int(t1t-t2t);
-
-
-}
-
diff --git a/libical/src/libical/icaltime.h b/libical/src/libical/icaltime.h
deleted file mode 100644
index 165b88d943..0000000000
--- a/libical/src/libical/icaltime.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaltime.h
- CREATOR: eric 02 June 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALTIME_H
-#define ICALTIME_H
-
-#include <time.h>
-
-/* icaltime_span is returned by icalcomponent_get_span() */
-struct icaltime_span {
-	time_t start; /* in UTC */
-	time_t end; /* in UTC */
-	int is_busy; /* 1->busy time, 0-> free time */
-};
-
-struct icaltimetype
-{
-	int year;
-	int month;
-	int day;
-	int hour;
-	int minute;
-	int second;
-
-	int is_utc; /* 1-> time is in UTC timezone */
-
-	int is_date; /* 1 -> interpret this as date. */
-   
-	const char* zone; /*Ptr to Olsen placename. Libical does not own mem*/
-};	
-
-/* Convert seconds past UNIX epoch to a timetype*/
-struct icaltimetype icaltime_from_timet(time_t v, int is_date);
-time_t icaltime_as_timet(struct icaltimetype);
-char* icaltime_as_ical_string(struct icaltimetype tt);
-
-/* Like icaltime_from_timet(), except that the input may be in seconds
-   past the epoch in floating time */
-struct icaltimetype icaltime_from_int(int v, int is_date, int is_utc);
-int icaltime_as_int(struct icaltimetype);
-
-/* create a time from an ISO format string */
-struct icaltimetype icaltime_from_string(const char* str);
-
-/* Routines for handling timezones */
-/* Return the offset of the named zone as seconds. tt is a time
-   indicating the date for which you want the offset */
-int icaltime_utc_offset(struct icaltimetype tt, const char* tzid);
-
-/* convert tt, of timezone tzid, into a utc time. Does nothing if the
-   time is already UTC.  */
-struct icaltimetype icaltime_as_utc(struct icaltimetype tt,
-				    const char* tzid);
-
-/* convert tt, a time in UTC, into a time in timezone tzid */
-struct icaltimetype icaltime_as_zone(struct icaltimetype tt,
-				     const char* tzid);
-
-
-struct icaltimetype icaltime_null_time(void);
-
-int icaltime_is_null_time(struct icaltimetype t);
-int icaltime_is_valid_time(struct icaltimetype t);
-
-struct icaltimetype icaltime_normalize(struct icaltimetype t);
-
-short icaltime_day_of_year(struct icaltimetype t);
-struct icaltimetype icaltime_from_day_of_year(short doy,  short year);
-
-short icaltime_day_of_week(struct icaltimetype t);
-short icaltime_start_doy_of_week(struct icaltimetype t);
-
-char* icaltime_as_ctime(struct icaltimetype);
-
-short icaltime_week_number(short day_of_month, short month, short year);
-
-struct icaltimetype icaltime_from_week_number(short week_number, short year);
-
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
-
-int icaltime_compare_date_only(struct icaltimetype a, struct icaltimetype b);
-
-
-short icaltime_days_in_month(short month,short year);
-
-
-struct icaldurationtype
-{
-	int is_neg;
-	unsigned int days;
-	unsigned int weeks;
-	unsigned int hours;
-	unsigned int minutes;
-	unsigned int seconds;
-};
-
-struct icaldurationtype icaldurationtype_from_int(int t);
-struct icaldurationtype icaldurationtype_from_string(const char*);
-int icaldurationtype_as_int(struct icaldurationtype duration);
-char* icaldurationtype_as_ical_string(struct icaldurationtype d);
-struct icaldurationtype icaldurationtype_null_duration();
-int icaldurationtype_is_null_duration(struct icaldurationtype d);
-
-struct icalperiodtype 
-{
-	struct icaltimetype start; /* Must be absolute */	
-	struct icaltimetype end; /* Must be absolute */
-	struct icaldurationtype duration;
-};
-
-struct icalperiodtype icalperiodtype_from_string (const char* str);
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p);
-struct icalperiodtype icalperiodtype_null_period();
-int icalperiodtype_is_null_period(struct icalperiodtype p);
-int icalperiodtype_is_valid_period(struct icalperiodtype p);
-
-time_t icalperiodtype_duration(struct icalperiodtype period);
-time_t icalperiodtype_end(struct icalperiodtype period);
-
-
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d);
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2);
-
-
-#endif /* !ICALTIME_H */
-
-
-
diff --git a/libical/src/libical/icaltypes.c b/libical/src/libical/icaltypes.c
deleted file mode 100644
index c6c388a978..0000000000
--- a/libical/src/libical/icaltypes.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltypes.c
-  CREATOR: eric 16 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.c
-
- ======================================================================*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icaltypes.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include <stdlib.h> /* for malloc and abs() */
-#include <errno.h> /* for errno */
-#include <string.h> /* for icalmemory_strdup */
-#include <assert.h>
-
-#define TEMP_MAX 1024
-
-void*
-icalattachtype_get_data (struct icalattachtype* type);
-
-struct icalattachtype*
-icalattachtype_new()
-{
-    struct icalattachtype* v;
-
-    if ( ( v = (struct icalattachtype*)
-	   malloc(sizeof(struct icalattachtype))) == 0) {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    v->refcount = 1;
-
-    v->binary = 0;
-    v->owns_binary = 0;
-
-    v->base64 = 0;
-    v->owns_base64 = 0;
-
-    v->url = 0; 
-
-    return v;
-}
-
-
-void
-icalattachtype_free(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    
-    v->refcount--;
-
-    if (v->refcount <= 0){
-	
-	if (v->base64 != 0 && v->owns_base64 != 0){
-	    free(v->base64);
-	}
-
-	if (v->binary != 0 && v->owns_binary != 0){
-	    free(v->binary);
-	}
-	
-	if (v->url != 0){
-	    free(v->url);
-	}
-
-	free(v);
-    }
-}
-
-void  icalattachtype_add_reference(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    v->refcount++;
-}
-
-void icalattachtype_set_url(struct icalattachtype* v, char* url)
-{
-    icalerror_check_arg( (v!=0),"v");
-
-    if (v->url != 0){
-	free (v->url);
-    }
-
-    v->url = icalmemory_strdup(url);
-
-    /* HACK This routine should do something if icalmemory_strdup returns NULL */
-
-}
-
-char* icalattachtype_get_url(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    return v->url;
-}
-
-void icalattachtype_set_base64(struct icalattachtype* v, char* base64,
-				int owns)
-{
-    icalerror_check_arg( (v!=0),"v");
-
-    v->base64 = base64;
-    v->owns_base64 = !(owns != 0 );
-    
-}
-
-char* icalattachtype_get_base64(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    return v->base64;
-}
-
-void icalattachtype_set_binary(struct icalattachtype* v, char* binary,
-				int owns)
-{
-    icalerror_check_arg( (v!=0),"v");
-
-    v->binary = binary;
-    v->owns_binary = !(owns != 0 );
-
-}
-
-void* icalattachtype_get_binary(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    return v->binary;
-}
-
-
-struct icaltriggertype icaltriggertype_from_string(const char* str)
-{
-
-    
-    struct icaltriggertype tr, null_tr;
-    int old_ieaf = icalerror_errors_are_fatal;
-
-    tr.time= icaltime_null_time();
-    tr.duration = icaldurationtype_from_int(0);
-
-    null_tr = tr;
-
-    if(str == 0) goto error;
-
-
-    icalerror_errors_are_fatal = 0;
-
-    tr.time = icaltime_from_string(str);
-
-    icalerror_errors_are_fatal = old_ieaf;
-
-    if (icaltime_is_null_time(tr.time)){
-
-	tr.duration = icaldurationtype_from_string(str);
-
-	if(icaldurationtype_as_int(tr.duration) == 0) goto error;
-    } 
-
-    return tr;
-
- error:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return null_tr;
-
-}
-
-
-struct icalreqstattype icalreqstattype_from_string(char* str)
-{
-  char *p1,*p2;
-  struct icalreqstattype stat;
-  int major, minor;
-
-  icalerror_check_arg((str != 0),"str");
-
-  stat.code = ICAL_UNKNOWN_STATUS;
-  stat.debug = 0; 
-   stat.desc = 0;
-
-  /* Get the status numbers */
-
-  sscanf(str, "%d.%d",&major, &minor);
-
-  if (major <= 0 || minor < 0){
-    icalerror_set_errno(ICAL_BADARG_ERROR);
-    return stat;
-  }
-
-  stat.code = icalenum_num_to_reqstat(major, minor);
-
-  if (stat.code == ICAL_UNKNOWN_STATUS){
-    icalerror_set_errno(ICAL_BADARG_ERROR);
-    return stat;
-  }
-  
-
-  p1 = strchr(str,';');
-
-  if (p1 == 0){
-/*    icalerror_set_errno(ICAL_BADARG_ERROR);*/
-    return stat;
-  }
-
-  /* Just ignore the second clause; it will be taken from inside the library 
-   */
-
-
-
-  p2 = strchr(p1+1,';');
-  if (p2 != 0 && *p2 != 0){
-    stat.debug = p2+1;
-  } 
-
-  return stat;
-  
-}
-
-char* icalreqstattype_as_string(struct icalreqstattype stat)
-{
-  char *temp;
-
-  temp = (char*)icalmemory_tmp_buffer(TEMP_MAX);
-
-  icalerror_check_arg_rz((stat.code != ICAL_UNKNOWN_STATUS),"Status");
-  
-  if (stat.desc == 0){
-    stat.desc = icalenum_reqstat_desc(stat.code);
-  }
-  
-  if(stat.debug != 0){
-    snprintf(temp,TEMP_MAX,"%d.%d;%s;%s", icalenum_reqstat_major(stat.code),
-             icalenum_reqstat_minor(stat.code),
-             stat.desc, stat.debug);
-    
-  } else {
-    snprintf(temp,TEMP_MAX,"%d.%d;%s", icalenum_reqstat_major(stat.code),
-             icalenum_reqstat_minor(stat.code),
-             stat.desc);
-  }
-
-  return temp;
-}
diff --git a/libical/src/libical/icaltypes.h b/libical/src/libical/icaltypes.h
deleted file mode 100644
index 7c0d2dd617..0000000000
--- a/libical/src/libical/icaltypes.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaltypes.h
- CREATOR: eric 20 March 1999
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.h
-
-======================================================================*/
-
-#ifndef ICALTYPES_H
-#define ICALTYPES_H
-
-#include <time.h>
-#include "icalenums.h" /* for recurrence enums */
-#include "icaltime.h"
-
-/* This type type should probably be an opaque type... */
-struct icalattachtype
-{
-	void* binary;
-	int owns_binary; 
-
-	char* base64;
-	int owns_base64;
-
-	char* url;
-
-	int refcount; 
-
-};
-
-/* converts base64 to binary, fetches url and stores as binary, or
-   just returns data */
-
-struct icalattachtype* icalattachtype_new(void);
-void  icalattachtype_add_reference(struct icalattachtype* v);
-void icalattachtype_free(struct icalattachtype* v);
-
-void icalattachtype_set_url(struct icalattachtype* v, char* url);
-char* icalattachtype_get_url(struct icalattachtype* v);
-
-void icalattachtype_set_base64(struct icalattachtype* v, char* base64,
-				int owns);
-char* icalattachtype_get_base64(struct icalattachtype* v);
-
-void icalattachtype_set_binary(struct icalattachtype* v, char* binary,
-				int owns);
-void* icalattachtype_get_binary(struct icalattachtype* v);
-
-struct icalgeotype 
-{
-	float lat;
-	float lon;
-};
-
-
-struct icaldatetimeperiodtype 
-{
-	struct icaltimetype time;
-	struct icalperiodtype period;
-};
-
-
-struct icaltriggertype 
-{
-	struct icaltimetype time; 
-	struct icaldurationtype duration;
-};
-
-struct icaltriggertype icaltriggertype_from_string(const char* str);
-
-/* struct icalreqstattype. This struct contains two string pointers,
-but don't try to free either of them. The "desc" string is a pointer
-to a static table inside the library.  Don't try to free it. The
-"debug" string is a pointer into the string that the called passed
-into to icalreqstattype_from_string. Don't try to free it either, and
-don't use it after the original string has been freed.
-
-BTW, you would get that original string from
-*icalproperty_get_requeststatus() or icalvalue_get_text(), when
-operating on a the value of a request_status property. */
-
-struct icalreqstattype {
-
-	icalrequeststatus code;
-	const char* desc;
-	const char* debug;
-};
-
-struct icalreqstattype icalreqstattype_from_string(char* str);
-char* icalreqstattype_as_string(struct icalreqstattype);
-
-#endif /* !ICALTYPES_H */
diff --git a/libical/src/libical/icalvalue.c.in b/libical/src/libical/icalvalue.c.in
deleted file mode 100644
index 0bbf7cd934..0000000000
--- a/libical/src/libical/icalvalue.c.in
+++ /dev/null
@@ -1,1411 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.c
-  CREATOR: eric 02 May 1999
-  
-  $Id: icalvalue.c.in,v 1.4 2001/02/05 19:43:57 jpr Exp $
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.c
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparser.h"
-#include "icalenums.h"
-
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for sprintf */
-#include <string.h> /* For memset, others */
-#include <stddef.h> /* For offsetof() macro */
-#include <errno.h>
-#include <time.h> /* for mktime */
-#include <stdlib.h> /* for atoi and atof */
-#include <limits.h> /* for SHRT_MAX */         
-
-#if _MAC_OS_
-#include "icalmemory_strdup.h"
-#endif
-
-#define TMP_BUF_SIZE 1024
-
-void print_datetime_to_string(char* str,  struct icaltimetype *data);
-void print_date_to_string(char* str,  struct icaltimetype *data);
-void print_time_to_string(char* str,  struct icaltimetype *data);
-void print_recur_to_string(char* str,  struct icaltimetype *data);
-
-struct icalvalue_impl {
-    icalvalue_kind kind; /*this is the kind that is visible from the outside*/
-
-    char id[5];
-    int size;
-    icalproperty* parent;
-    
-    union data {
-	struct icalattachtype v_attach;		
-	/* void *v_binary; */ /* use v_attach */
-	const char *v_string;
-	/*char *v_text;*/
-	/*char *v_caladdress;*/
-	/*char *v_uri;*/
-	float v_float;
-	int v_int;
-	/*int v_boolean;*/
-	/*int v_integer;*/
-	struct icaldurationtype v_duration;
-	/*int v_utcoffset;*/
-	
-	struct icalperiodtype v_period;
-	/*struct icalperiodtype v_datetimeperiod;*/
-	struct icalgeotype v_geo;
-	/*time_t v_time;*/
-	struct icaltimetype v_time;
-	/*struct icaltimetype v_date;*/
-	/*struct icaltimetype v_datetime;*/
-	/*struct icaltimetype v_datetimedate;*/
-	
-	/* struct icalrecurrencetype was once included
-	   directly ( not referenced ) in this union, but it
-	   contributes 2000 bytes to every value, so now it is
-	   a reference*/
-	
-	struct icalrecurrencetype *v_recur;
-	struct icaltriggertype v_trigger;
-	icalproperty_method v_method;
-	icalproperty_status v_status;
-	
-    } data;
-};
-
-struct icalvalue_impl*  icalvalue_new_impl(icalvalue_kind kind){
-
-    struct icalvalue_impl* v;
-
-    if ( ( v = (struct icalvalue_impl*)
-	   malloc(sizeof(struct icalvalue_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(v->id,"val");
-    
-    v->kind = kind;
-    v->size = 0;
-    v->parent = 0;
-    memset(&(v->data),0,sizeof(v->data));
-    
-    return v;
-
-}
-
-
-
-icalvalue*
-icalvalue_new (icalvalue_kind kind)
-{
-    return (icalvalue*)icalvalue_new_impl(kind);
-}
-
-icalvalue* icalvalue_new_clone(icalvalue* value){
-
-    struct icalvalue_impl* new;
-    struct icalvalue_impl* old = (struct icalvalue_impl*)value;
-
-    new = icalvalue_new_impl(old->kind);
-
-    if (new == 0){
-	return 0;
-    }
-
-    
-    strcpy(new->id, old->id);
-    new->kind = old->kind;
-    new->size = old->size;
-
-    switch (new->kind){
-
-	/* The contents of the attach value may or may not be owned by the 
-	 * library. */
-	case ICAL_ATTACH_VALUE: 
-	case ICAL_BINARY_VALUE: 
-	{
-	    /* HACK ugh. I don't feel like impleenting this */
-	}
-
-	case ICAL_STRING_VALUE:
-	case ICAL_TEXT_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_URI_VALUE:
-	{
-	    if (old->data.v_string != 0) { 
-		new->data.v_string=icalmemory_strdup(old->data.v_string);
-
-		if ( new->data.v_string == 0 ) {
-		    return 0;
-		}		    
-
-	    }
-	    break;
-	}
-	case ICAL_RECUR_VALUE:
-	{
-	    if(old->data.v_recur != 0){
-		new->data.v_recur = malloc(sizeof(struct icalrecurrencetype));
-
-		if(new->data.v_recur == 0){
-		    return 0;
-		}
-
-		memcpy(	new->data.v_recur, old->data.v_recur,
-			sizeof(struct icalrecurrencetype));	
-	    }
-	    break;
-	}
-
-	default:
-	{
-	    /* all of the other types are stored as values, not
-               pointers, so we can just copy the whole structure. */
-
-	    new->data = old->data;
-	}
-    }
-
-    return new;
-}
-
-char* icalmemory_strdup_and_dequote(const char* str)
-{
-    const char* p;
-    char* out = (char*)malloc(sizeof(char) * strlen(str) +1);
-    char* pout;
-
-    if (out == 0){
-	return 0;
-    }
-
-    pout = out;
-
-    for (p = str; *p!=0; p++){
-	
-	if( *p == '\\')
-	{
-	    p++;
-	    switch(*p){
-		case 0:
-		{
-		    *pout = '\0';
-		    break;
-
-		}
-		case 'n':
-		{
-		    *pout = '\n';
-		    break;
-		}
-		case 'N':
-		{
-		    *pout = '\n';
-		    break;
-		}
-		case '\\':
-		case ',':
-		case ';':
-		{
-		    *pout = *p;
-		    break;
-		}
-		default:
-		{
-		    *pout = ' ';
-		}		
-	    }
-	} else {
-	    *pout = *p;
-	}
-
-	pout++;
-	
-    }
-
-    *pout = '\0';
-
-    return out;
-}
-
-icalvalue* icalvalue_new_from_string_with_error(icalvalue_kind kind,const char* str,icalproperty** error)
-{
-
-    icalvalue *value = 0;
-    
-    icalerror_check_arg_rz(str!=0,"str");
-
-    if (error != 0){
-	*error = 0;
-    }
-
-    switch (kind){
-	
-        case ICAL_ATTACH_VALUE:
-	{
-	    /* HACK */
-	    value = 0;
-
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"ATTACH Values are not implemented"); 
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    icalerror_warn("Parsing ATTACH properties is unimplmeneted");
-	    break;
-	}
-
-	case ICAL_BINARY_VALUE:
-	{
-	    /* HACK */
-	    value = 0;
-
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"BINARY Values are not implemented"); 
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    icalerror_warn("Parsing BINARY values is unimplmeneted");
-	    break;
-	}
-
-	case ICAL_BOOLEAN_VALUE:
-	{
-	    /* HACK */
-	    value = 0;
-
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"BOOLEAN Values are not implemented"); 
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    icalerror_warn("Parsing BOOLEAN values is unimplmeneted");
-	    break;
-	}
-
-	case ICAL_INTEGER_VALUE:
-	{
-	    value = icalvalue_new_integer(atoi(str));
-	    break;
-	}
-
-	case ICAL_FLOAT_VALUE:
-	{
-	    value = icalvalue_new_float(atof(str));
-	    break;
-	}
-
-	case ICAL_UTCOFFSET_VALUE:
-	{
-	    value = icalparser_parse_value(kind,str,(icalcomponent*)0);
-	    break;
-	}
-
-	case ICAL_TEXT_VALUE:
-	{
-	    char* dequoted_str = icalmemory_strdup_and_dequote(str);
-	    value = icalvalue_new_text(dequoted_str);
-	    free(dequoted_str);
-	    break;
-	}
-
-
-	case ICAL_STRING_VALUE:
-	{
-	    value = icalvalue_new_string(str);
-	    break;
-	}
-
-	case ICAL_CALADDRESS_VALUE:
-	{
-	    value = icalvalue_new_caladdress(str);
-	    break;
-	}
-
-	case ICAL_URI_VALUE:
-	{
-	    value = icalvalue_new_uri(str);
-	    break;
-	}
-
-	case ICAL_METHOD_VALUE:
-	{
-	    icalproperty_method method = icalenum_string_to_method(str);
-
-	    if(method == ICAL_METHOD_NONE){
-		value = 0;
-	    } else {
-		value = icalvalue_new_method(method);
-	    }
-
-	    break; 
-
-	}
-
-
-	case ICAL_STATUS_VALUE:
-	{
-	    icalproperty_status status = icalenum_string_to_status(str);
-
-	    if(status == ICAL_STATUS_NONE){
-		value = 0;
-	    } else {
-		value = icalvalue_new_status(status);
-	    }
-
-	    break; 
-
-	}
-	case ICAL_GEO_VALUE:
-	{
-	    value = 0;
-	    /* HACK */
-
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"GEO Values are not implemented"); 
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    /*icalerror_warn("Parsing GEO properties is unimplmeneted");*/
-
-	    break;
-	}
-
-	case ICAL_RECUR_VALUE:
-	{
-	    struct icalrecurrencetype rt;
-	    rt = icalrecurrencetype_from_string(str);
-	    value = icalvalue_new_recur(rt);
-	    break;
-	}
-
-	case ICAL_TIME_VALUE:
-	{
-	    struct icaltimetype tt;
-	    tt = icaltime_from_string(str);
-	    value = icalvalue_new_time(tt);
-	    break;
-	}
-	case ICAL_DATE_VALUE:
-	{
-	    struct icaltimetype tt;
-	    tt = icaltime_from_string(str);
-	    value = icalvalue_new_date(tt);
-	    break;
-	}
-	case ICAL_DATETIME_VALUE:
-	{
-	    struct icaltimetype tt;
-	    tt = icaltime_from_string(str);
-	    value = icalvalue_new_datetime(tt);
-	    break;
-	}
-	case ICAL_DATETIMEDATE_VALUE:
-	{
-	    struct icaltimetype tt;
-	    tt = icaltime_from_string(str);
-	    value = icalvalue_new_datetimedate(tt);
-	    break;
-	}
-
-	case ICAL_DATETIMEPERIOD_VALUE:
-        case ICAL_DURATION_VALUE:
-         case ICAL_PERIOD_VALUE:
-	{
-	    value = icalparser_parse_value(kind,str,error);
-	    break;
-	}
-	
-        case ICAL_TRIGGER_VALUE:
-	{
-	    struct icaltriggertype tr = icaltriggertype_from_string(str);
-	    value = icalvalue_new_trigger(tr);
-	    break;
-	}
-
-	default:
-	{
-
-	    if (error != 0 ){
-		char temp[TMP_BUF_SIZE];
-
-                snprintf(temp,TMP_BUF_SIZE,"Unknown type for \'%s\'",str);
-			    
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    icalerror_warn("icalvalue_new_from_string got an unknown value type");
-            value=0;
-	}
-    }
-
-
-    if (error != 0 && *error == 0 && value == 0){
-	char temp[TMP_BUF_SIZE];
-	
-        snprintf(temp,TMP_BUF_SIZE,"Failed to parse value: \'%s\'",str);
-	
-	*error = icalproperty_vanew_xlicerror( 
-	    temp, 
-	    icalparameter_new_xlicerrortype( 
-		ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-	    0); 
-    }
-
-
-    return value;
-
-}
-
-icalvalue* icalvalue_new_from_string(icalvalue_kind kind,const char* str)
-{
-    return icalvalue_new_from_string_with_error(kind,str,(icalproperty*)0);
-}
-
-
-
-void
-icalvalue_free (icalvalue* value)
-{
-    struct icalvalue_impl* v = (struct icalvalue_impl*)value;
-
-    icalerror_check_arg_rv((value != 0),"value");
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (v->parent ==0),"This value is still attached to a property");
-    
-#else
-    if(v->parent !=0){
-	return;
-    }
-#endif
-
-
-    switch (v->kind){
-	case ICAL_BINARY_VALUE: 
-	case ICAL_ATTACH_VALUE: {
-	    /* HACK ugh. This will be tough to implement */
-	}
-	case ICAL_TEXT_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_URI_VALUE:
-	{
-	    if (v->data.v_string != 0) { 
-		free((void*)v->data.v_string);
-		v->data.v_string = 0;
-	    }
-	    break;
-	}
-	case ICAL_RECUR_VALUE:
-	{
-	    if(v->data.v_recur != 0){
-		free((void*)v->data.v_recur);
-		v->data.v_recur = 0;
-	    }
-	    break;
-	}
-
-	default:
-	{
-	    /* Nothing to do */
-	}
-    }
-
-    v->kind = ICAL_NO_VALUE;
-    v->size = 0;
-    v->parent = 0;
-    memset(&(v->data),0,sizeof(v->data));
-    v->id[0] = 'X';
-    free(v);
-}
-
-int
-icalvalue_is_valid (icalvalue* value)
-{
-    /*struct icalvalue_impl* v = (struct icalvalue_impl*)value;*/
-    
-    if(value == 0){
-	return 0;
-    }
-    
-    return 1;
-}
-
-char* icalvalue_binary_as_ical_string(icalvalue* value) {
-
-    const char* data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_binary(value);
-
-    str = (char*)icalmemory_tmp_buffer(60);
-    sprintf(str,"icalvalue_binary_as_ical_string is not implemented yet");
-
-    return str;
-}
-
-
-#define MAX_INT_DIGITS 12 /* Enough for 2^32 + sign*/ 
-char* icalvalue_int_as_ical_string(icalvalue* value) {
-    
-    int data;
-    char* str = (char*)icalmemory_tmp_buffer(MAX_INT_DIGITS); 
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_integer(value);
-	
-    snprintf(str,MAX_INT_DIGITS,"%d",data);
-
-    return str;
-}
-
-char* icalvalue_utcoffset_as_ical_string(icalvalue* value)
-{    
-    int data,h,m,s;
-    char sign;
-    char* str = (char*)icalmemory_tmp_buffer(9);
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_utcoffset(value);
-
-    if (abs(data) == data){
-	sign = '+';
-    } else {
-	sign = '-';
-    }
-
-    h = data/3600;
-    m = (data - (h*3600))/ 60;
-    s = (data - (h*3600) - (m*60));
-
-    sprintf(str,"%c%02d%02d%02d",sign,abs(h),abs(m),abs(s));
-
-    return str;
-}
-
-char* icalvalue_string_as_ical_string(icalvalue* value) {
-
-    const char* data;
-    char* str = 0;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = ((struct icalvalue_impl*)value)->data.v_string;
-
-    str = (char*)icalmemory_tmp_buffer(strlen(data)+1);   
-
-    strcpy(str,data);
-
-    return str;
-}
-
-
-char* icalvalue_recur_as_ical_string(icalvalue* value) 
-{
-    struct icalvalue_impl *impl = (struct icalvalue_impl*)value;
-    struct icalrecurrencetype *recur = impl->data.v_recur;
-
-    return icalrecurrencetype_as_string(recur);
-}
-
-char* icalvalue_text_as_ical_string(icalvalue* value) {
-
-    char *str;
-    char *str_p;
-    char *rtrn;
-    const char *p;
-    size_t buf_sz;
-    int line_length;
-
-    line_length = 0;
-
-    buf_sz = strlen(((struct icalvalue_impl*)value)->data.v_string)+1;
-
-    str_p = str = (char*)icalmemory_new_buffer(buf_sz);
-
-    if (str_p == 0){
-      return 0;
-    }
-
-    for(p=((struct icalvalue_impl*)value)->data.v_string; *p!=0; p++){
-
-	switch(*p){
-	    case '\n': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\n");
-		line_length+=3;
-		break;
-	    }
-
-	    case '\t': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\t");
-		line_length+=3;
-		break;
-	    }
-	    case '\r': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\r");
-		line_length+=3;
-		break;
-	    }
-	    case '\b': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\b");
-		line_length+=3;
-		break;
-	    }
-	    case '\f': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\f");
-		line_length+=3;
-		break;
-	    }
-
-	    case ';':
-	    case ',':{
-		icalmemory_append_char(&str,&str_p,&buf_sz,'\\');
-		icalmemory_append_char(&str,&str_p,&buf_sz,*p);
-		line_length+=3;
-		break;
-	    }
-
-	    case '"':{
-		icalmemory_append_char(&str,&str_p,&buf_sz,'\\');
-		icalmemory_append_char(&str,&str_p,&buf_sz,*p);
-		line_length+=3;
-		break;
-	    }
-
-	    default: {
-		icalmemory_append_char(&str,&str_p,&buf_sz,*p);
-		line_length++;
-	    }
-	}
-
-	if (line_length > 65 && *p == ' '){
-	    icalmemory_append_string(&str,&str_p,&buf_sz,"\n ");
-	    line_length=0;
-	}
-
-
-	if (line_length > 75){
-	    icalmemory_append_string(&str,&str_p,&buf_sz,"\n ");
-	    line_length=0;
-	}
-
-    }
-
-    /* Assume the last character is not a '\0' and add one. We could
-       check *str_p != 0, but that would be an uninitialized memory
-       read. */
-
-
-    icalmemory_append_char(&str,&str_p,&buf_sz,'\0');
-
-    rtrn = icalmemory_tmp_copy(str);
-
-    icalmemory_free_buffer(str);
-
-    return rtrn;
-}
-
-
-char* icalvalue_attach_as_ical_string(icalvalue* value) {
-
-    struct icalattachtype a;
-    char * str;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    a = icalvalue_get_attach(value);
-
-    if (a.binary != 0) {
-	return  icalvalue_binary_as_ical_string(value);
-    } else if (a.base64 != 0) {
-	str = (char*)icalmemory_tmp_buffer(strlen(a.base64)+1);
-	strcpy(str,a.base64);
-	return str;
-    } else if (a.url != 0){
-	return icalvalue_string_as_ical_string(value);
-    } else {
-	icalerrno = ICAL_MALFORMEDDATA_ERROR;
-	return 0;
-    }
-}
-
-
-char* icalvalue_duration_as_ical_string(icalvalue* value) 
-{
-
-    struct icaldurationtype data;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_duration(value);
-
-    return icaldurationtype_as_ical_string(data);
-
-}
-
-void print_time_to_string(char* str,  struct icaltimetype *data)
-{
-    char temp[20];
-
-    if (data->is_utc == 1){
-	sprintf(temp,"%02d%02d%02dZ",data->hour,data->minute,data->second);
-    } else {
-	sprintf(temp,"%02d%02d%02d",data->hour,data->minute,data->second);
-    }   
-
-    strcat(str,temp);
-}
-
- 
-char* icalvalue_time_as_ical_string(icalvalue* value) {
-
-    struct icaltimetype data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_time(value);
-    
-    str = (char*)icalmemory_tmp_buffer(8);
-
-    str[0] = 0;
-    print_time_to_string(str,&data);
-
-    return str;
-}
-
-void print_date_to_string(char* str,  struct icaltimetype *data)
-{
-    char temp[20];
-
-    sprintf(temp,"%04d%02d%02d",data->year,data->month,data->day);
-
-    strcat(str,temp);
-}
-
-char* icalvalue_date_as_ical_string(icalvalue* value) {
-
-    struct icaltimetype data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_date(value);
-
-    str = (char*)icalmemory_tmp_buffer(9);
- 
-    str[0] = 0;
-    print_date_to_string(str,&data);
-   
-    return str;
-}
-
-void print_datetime_to_string(char* str,  struct icaltimetype *data)
-{
-    print_date_to_string(str,data);
-    strcat(str,"T");
-    print_time_to_string(str,data);
-
-}
-
-char* icalvalue_datetime_as_ical_string(icalvalue* value) {
-    
-    struct icaltimetype data;
-    char* str;
-    icalvalue_kind kind = icalvalue_isa(value);    
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-
-    if( !(kind == ICAL_DATETIMEDATE_VALUE ||
-	  kind == ICAL_DATE_VALUE ||
-	  kind == ICAL_DATETIME_VALUE ||
-	  kind == ICAL_TIME_VALUE))
-	{
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return 0;
-	}
-
-    data = icalvalue_get_datetime(value);
-
-    str = (char*)icalmemory_tmp_buffer(20);
- 
-    str[0] = 0;
-
-    print_datetime_to_string(str,&data);
-   
-    return str;
-
-}
-
-
-char* icalvalue_datetimedate_as_ical_string(icalvalue* value) {
-
-    struct icaltimetype data;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_datetime(value);
-
-    if (data.is_date == 1){
-	return icalvalue_date_as_ical_string(value);
-    } else {
-	return icalvalue_datetime_as_ical_string(value);
-    }
-}
-
-
-char* icalvalue_float_as_ical_string(icalvalue* value) {
-
-    float data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_float(value);
-
-    str = (char*)icalmemory_tmp_buffer(15);
-
-    sprintf(str,"%f",data);
-
-    return str;
-}
-
-char* icalvalue_geo_as_ical_string(icalvalue* value) {
-
-    struct icalgeotype data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_geo(value);
-
-    str = (char*)icalmemory_tmp_buffer(25);
-
-    sprintf(str,"%f;%f",data.lat,data.lon);
-
-    return str;
-}
-
-char* icalvalue_datetimeperiod_as_ical_string(icalvalue* value) {
-    struct icalvalue_impl* impl = (struct icalvalue_impl*)value;
-    struct icaldatetimeperiodtype dtp = icalvalue_get_datetimeperiod(value);
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    if(!icaltime_is_null_time(dtp.time)){
-	return icaltime_as_ical_string(dtp.time);
-    } else {
-	return icalperiodtype_as_ical_string(dtp.period);
-    }
-}
-
-char* icalvalue_period_as_ical_string(icalvalue* value) {
-    struct icalperiodtype data;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_period(value);
-
-    return icalperiodtype_as_ical_string(data);
-}
-
-char* icalvalue_trigger_as_ical_string(icalvalue* value) 
-{
-
-    struct icaltriggertype data;
-    char* str;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_trigger(value);
-    
-    str = (char*)icalmemory_tmp_buffer(60);
-
-    if(!icaltime_is_null_time(data.time)){
-	return icaltime_as_ical_string(data.time);
-    } else {
-	return icaldurationtype_as_ical_string(data.duration);
-    }   
-
-}
-
-const char*
-icalvalue_as_ical_string (icalvalue* value)
-{
-    struct icalvalue_impl* v = (struct icalvalue_impl*)value;
-
-    v=v;
-
-    if(value == 0){
-	return 0;
-    }
-
-    switch (v->kind){
-
-	case ICAL_ATTACH_VALUE:
-	    return icalvalue_attach_as_ical_string(value);
-
-	case ICAL_BINARY_VALUE:
-	    return icalvalue_binary_as_ical_string(value);
-
-	case ICAL_BOOLEAN_VALUE:
-	case ICAL_INTEGER_VALUE:
-	    return icalvalue_int_as_ical_string(value);                  
-
-	case ICAL_UTCOFFSET_VALUE:
-	    return icalvalue_utcoffset_as_ical_string(value);                  
-
-	case ICAL_TEXT_VALUE:
-	    return icalvalue_text_as_ical_string(value);
-
-	case ICAL_STRING_VALUE:
-	case ICAL_URI_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	    return icalvalue_string_as_ical_string(value);
-
-	case ICAL_DATE_VALUE:
-	    return icalvalue_date_as_ical_string(value);
-	case ICAL_DATETIME_VALUE:
-	    return icalvalue_datetime_as_ical_string(value);
-	case ICAL_DATETIMEDATE_VALUE:
-	    return icalvalue_datetimedate_as_ical_string(value);
-	case ICAL_DURATION_VALUE:
-	    return icalvalue_duration_as_ical_string(value);
-	case ICAL_TIME_VALUE:
-	    return icalvalue_time_as_ical_string(value);
-
-	case ICAL_PERIOD_VALUE:
-	    return icalvalue_period_as_ical_string(value);
-	case ICAL_DATETIMEPERIOD_VALUE:
-	    return icalvalue_datetimeperiod_as_ical_string(value);
-
-	case ICAL_FLOAT_VALUE:
-	    return icalvalue_float_as_ical_string(value);
-
-	case ICAL_GEO_VALUE:
-	    return icalvalue_geo_as_ical_string(value);
-
-	case ICAL_RECUR_VALUE:
-	    return icalvalue_recur_as_ical_string(value);
-
-	case ICAL_TRIGGER_VALUE:
-	    return icalvalue_trigger_as_ical_string(value);
-
-	case ICAL_METHOD_VALUE:
-	    return icalenum_method_to_string(v->data.v_method);
-
-	case ICAL_STATUS_VALUE:
-	    return icalenum_status_to_string(v->data.v_status);
-
-
-	case ICAL_NO_VALUE:
-	default:
-	{
-	    return 0;
-	}
-    }
-}
-
-
-icalvalue_kind
-icalvalue_isa (icalvalue* value)
-{
-    struct icalvalue_impl* v = (struct icalvalue_impl*)value;
-
-    if(value == 0){
-	return ICAL_NO_VALUE;
-    }
-
-    return v->kind;
-}
-
-
-int
-icalvalue_isa_value (void* value)
-{
-    struct icalvalue_impl *impl = (struct icalvalue_impl *)value;
-
-    icalerror_check_arg_rz( (value!=0), "value");
-
-    if (strcmp(impl->id,"val") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-int icalvalue_is_time(icalvalue* a) {
-    icalvalue_kind kind = icalvalue_isa(a);
-
-    if(kind == ICAL_DATETIMEDATE_VALUE ||
-       kind == ICAL_DATETIME_VALUE ||
-       kind == ICAL_DATE_VALUE ||
-       kind == ICAL_TIME_VALUE ){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-icalparameter_xliccomparetype
-icalvalue_compare(icalvalue* a, icalvalue *b)
-{
-    struct icalvalue_impl *impla = (struct icalvalue_impl *)a;
-    struct icalvalue_impl *implb = (struct icalvalue_impl *)b;
-
-    icalerror_check_arg_rz( (a!=0), "a");
-    icalerror_check_arg_rz( (b!=0), "b");
-
-    /* Not the same type; they can only be unequal */
-    if( ! (icalvalue_is_time(a) && icalvalue_is_time(b)) &&
-	icalvalue_isa(a) != icalvalue_isa(b)){
-	return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-    }
-
-    switch (icalvalue_isa(a)){
-
-	case ICAL_ATTACH_VALUE:
-	case ICAL_BINARY_VALUE:
-
-	case ICAL_BOOLEAN_VALUE:
-	{
-	    if (icalvalue_get_boolean(a) == icalvalue_get_boolean(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-	}
-
-	case ICAL_FLOAT_VALUE:
-	{
-	    if (impla->data.v_float > implb->data.v_float){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (impla->data.v_float < implb->data.v_float){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}
-
-	case ICAL_INTEGER_VALUE:
-	case ICAL_UTCOFFSET_VALUE:
-	{
-	    if (impla->data.v_int > implb->data.v_int){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (impla->data.v_int < implb->data.v_int){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}
-
-	case ICAL_DURATION_VALUE: 
-	{
-	    int a = icaldurationtype_as_int(impla->data.v_duration);
-	    int b = icaldurationtype_as_int(implb->data.v_duration);
-
-	    if (a > b){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (a < b){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}	    
-
-
-	case ICAL_TEXT_VALUE:
-	case ICAL_URI_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_TRIGGER_VALUE:
-	case ICAL_DATE_VALUE:
-	case ICAL_DATETIME_VALUE:
-	case ICAL_DATETIMEDATE_VALUE:
-	case ICAL_TIME_VALUE:
-	case ICAL_DATETIMEPERIOD_VALUE:
-	{
-	    int r;
-
-	    r =  strcmp(icalvalue_as_ical_string(a),
-			  icalvalue_as_ical_string(b));
-
-	    if (r > 0) { 	
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (r < 0){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-
-		
-	}
-
-	case ICAL_METHOD_VALUE:
-	{
-	    if (icalvalue_get_method(a) == icalvalue_get_method(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-
-	}
-
-	case ICAL_STATUS_VALUE:
-	{
-	    if (icalvalue_get_status(a) == icalvalue_get_status(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-
-	}
-
-	case ICAL_PERIOD_VALUE:
-	case ICAL_GEO_VALUE:
-	case ICAL_RECUR_VALUE:
-	case ICAL_NO_VALUE:
-	default:
-	{
-	    icalerror_warn("Comparison not implemented for value type");
-	    return ICAL_XLICCOMPARETYPE_REGEX+1; /* HACK */
-	}
-    }   
-
-}
-
-void icalvalue_set_parent(icalvalue* value,
-			     icalproperty* property)
-{
-    struct icalvalue_impl* v = (struct icalvalue_impl*)value;
-
-    v->parent = property;
-
-}
-
-icalproperty* icalvalue_get_parent(icalvalue* value)
-{
-    struct icalvalue_impl* v = (struct icalvalue_impl*)value;
-
-
-    return v->parent;
-}
-
-
-
-/* Recur is a special case, so it is not auto generated. */
-icalvalue*
-icalvalue_new_recur (struct icalrecurrencetype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_RECUR_VALUE);
-    
-   icalvalue_set_recur((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_recur(icalvalue* value, struct icalrecurrencetype v)
-{
-    struct icalvalue_impl* impl; 
-    
-    icalerror_check_arg_rv( (value!=0),"value");
-    icalerror_check_value_type(value, ICAL_RECUR_VALUE);
-
-    impl = (struct icalvalue_impl*)value;
-
-    if (impl->data.v_recur != 0){
-	free(impl->data.v_recur);
-	impl->data.v_recur = 0;
-    }
-
-    impl->data.v_recur = malloc(sizeof(struct icalrecurrencetype));
-
-    if (impl->data.v_recur == 0){
-	icalerror_set_errno(ICAL_ALLOCATION_ERROR);
-	return;
-    } else {
-	memcpy(impl->data.v_recur, &v, sizeof(struct icalrecurrencetype));
-    }
-	       
-}
-
-struct icalrecurrencetype
-icalvalue_get_recur(icalvalue* value)
-{
-    icalerror_check_arg( (value!=0),"value");
-    icalerror_check_value_type(value, ICAL_RECUR_VALUE);
-  
-    return *(((struct icalvalue_impl*)value)->data.v_recur);
-}
-
-
-
-
-icalvalue*
-icalvalue_new_trigger (struct icaltriggertype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_TRIGGER_VALUE);
- 
-   icalvalue_set_trigger((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v)
-{
-    struct icalvalue_impl* impl; 
-    
-    icalerror_check_arg_rv( (value!=0),"value");
-    
-    impl = (struct icalvalue_impl*)value;
-
-   if(!icaltime_is_null_time(v.time)){
-       icalvalue_set_datetime((icalvalue*)impl,v.time);
-       impl->kind = ICAL_DATETIME_VALUE;
-   } else {
-       icalvalue_set_duration((icalvalue*)impl,v.duration);
-       impl->kind = ICAL_DURATION_VALUE;
-   }
-
-}
-
-struct icaltriggertype
-icalvalue_get_trigger(icalvalue* value)
-{
-    struct icalvalue_impl *impl = (struct icalvalue_impl*)value;
-    struct icaltriggertype tr;
-
-    icalerror_check_arg( (value!=0),"value");
-    icalerror_check_arg( (value!=0),"value");
-
-    if(impl->kind == ICAL_DATETIME_VALUE){
-	 tr.duration = icaldurationtype_from_int(0);
-	 tr.time = impl->data.v_time;
-    } else if(impl->kind == ICAL_DURATION_VALUE){
-	tr.time = icaltime_null_time();
-	tr.duration = impl->data.v_duration;
-    } else {
-	tr.duration = icaldurationtype_from_int(0);
-	tr.time = icaltime_null_time();
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-    }
-
-    return tr;
-}
-
-/* DATE-TIME-PERIOD is a special case, and is not auto generated */
-
-icalvalue*
-icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_DATETIMEPERIOD_VALUE);
-
-   icalvalue_set_datetimeperiod((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_datetimeperiod(icalvalue* value, struct icaldatetimeperiodtype v)
-{
-    struct icalvalue_impl* impl = (struct icalvalue_impl*)value;
-    
-    icalerror_check_arg_rv( (value!=0),"value");
-    
-    icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE);
-
-    if(!icaltime_is_null_time(v.time)){
-	if(!icaltime_is_valid_time(v.time)){
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return;
-	}
-	impl->kind = ICAL_DATETIME_VALUE;
-	icalvalue_set_datetime(impl,v.time);
-    } else if (!icalperiodtype_is_null_period(v.period)) {
-	if(!icalperiodtype_is_valid_period(v.period)){
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return;
-	}
-	impl->kind = ICAL_PERIOD_VALUE;
-	icalvalue_set_period(impl,v.period);
-    } else {
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-    }
-}
-
-struct icaldatetimeperiodtype
-icalvalue_get_datetimeperiod(icalvalue* value)
-{
-  struct icaldatetimeperiodtype dtp;
-  
-  struct icalvalue_impl* impl = (struct icalvalue_impl*)value;
-  icalerror_check_arg( (value!=0),"value");
-  icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE);
-  
-  if(impl->kind == ICAL_DATETIME_VALUE){
-      dtp.period = icalperiodtype_null_period();
-      dtp.time = impl->data.v_time;
-  } else if(impl->kind == ICAL_PERIOD_VALUE) {
-      dtp.period = impl->data.v_period;
-      dtp.time = icaltime_null_time();
-  } else {
-      dtp.period = icalperiodtype_null_period();
-      dtp.time = icaltime_null_time();
-      icalerror_set_errno(ICAL_BADARG_ERROR);
-  }	
-
-  return dtp;
-}
-
-
-
-
-
-/* The remaining interfaces are 'new', 'set' and 'get' for each of the value
-   types */
-
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalvalue.h.in b/libical/src/libical/icalvalue.h.in
deleted file mode 100644
index 90daa49f79..0000000000
--- a/libical/src/libical/icalvalue.h.in
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id: icalvalue.h.in,v 1.1.1.3 2001/02/05 19:16:24 jpr Exp $
-  $Locker:  $
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.h
-
-  ======================================================================*/
-
-#ifndef ICALVALUE_H
-#define ICALVALUE_H
-
-#include <time.h>
-#include "icalenums.h"
-#include "icaltypes.h"
-#include "icalrecur.h"
-                          
-typedef void icalvalue;
-
-icalvalue* icalvalue_new(icalvalue_kind kind);
-
-icalvalue* icalvalue_new_clone(icalvalue* value);
-
-icalvalue* icalvalue_new_from_string(icalvalue_kind kind, const char* str);
-
-void icalvalue_free(icalvalue* value);
-
-int icalvalue_is_valid(icalvalue* value);
-
-const char* icalvalue_as_ical_string(icalvalue* value);
-
-icalvalue_kind icalvalue_isa(icalvalue* value);
-
-int icalvalue_isa_value(void*);
-
-icalparameter_xliccomparetype
-icalvalue_compare(icalvalue* a, icalvalue *b);
-
-
-/* Special, non autogenerated value accessors */
-
-icalvalue* icalvalue_new_recur (struct icalrecurrencetype v);
-void icalvalue_set_recur(icalvalue* value, struct icalrecurrencetype v);
-struct icalrecurrencetype icalvalue_get_recur(icalvalue* value);
-
-icalvalue* icalvalue_new_trigger (struct icaltriggertype v);
-void icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v);
-struct icaltriggertype icalvalue_get_trigger(icalvalue* value);
-
-icalvalue* icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v);
-void icalvalue_set_datetimeperiod(icalvalue* value, 
-				  struct icaldatetimeperiodtype v);
-struct icaldatetimeperiodtype icalvalue_get_datetimeperiod(icalvalue* value);
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalversion.h.in b/libical/src/libical/icalversion.h.in
deleted file mode 100644
index 5d213693e5..0000000000
--- a/libical/src/libical/icalversion.h.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef ICAL_VERSION_H
-#define ICAL_VERSION_H
-
-#define ICAL_PACKAGE "@PACKAGE@"
-#define ICAL_VERSION "@VERSION@"
-
-#endif
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
deleted file mode 100644
index 982682d331..0000000000
--- a/libical/src/libical/icalyacc.y
+++ /dev/null
@@ -1,404 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalitip.y
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icalyacc.y,v 1.11 2001/01/23 20:22:33 jpr Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  =======================================================================*/
-
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include "icalparser.h"
-#include "pvl.h"
-
-icalvalue *icalparser_yy_value; /* Current Value */
-
-void ical_yyerror(char* s);
-void icalparser_clear_flex_input();  
-int ical_yy_lex(void);
-
-/* Globals for UTCOFFSET values */
-int utc; 
-int utc_b; 
-int utcsign;
-
-/* Globals for DURATION values */
-struct icaldurationtype duration;
-
-/* Globals for TRIGGER values */
-struct icaltriggertype trigger;
-
-void copy_list(short* array, size_t size);
-void add_prop(icalproperty_kind);
-void icalparser_fill_date(struct tm* t, char* dstr);
-void icalparser_fill_time(struct tm* t, char* tstr);
-void set_value_type(icalvalue_kind kind);
-void set_parser_value_state();
-struct icaltimetype fill_datetime(char* d, char* t);
-void ical_yy_error(char *s); /* Don't know why I need this.... */
-int yylex(void); /* Or this. */
-
-
-
-/* Set the state of the lexer so it will interpret values ( iCAL
-   VALUEs, that is, ) correctly. */
-
-%}
-
-%union {
-	float v_float;
-	int   v_int;
-	char* v_string;
-}
-
-
-  /* Renaming hack */
-
-/*
-#define    yymaxdepth ical_yy_maxdepth
-#define    yyparse ical_yy_parse
-#define    yyerror ical_yy_error
-#define    yylval  ical_yy_lval
-#define    yychar  ical_yy_char
-#define    yydebug ical_yy_debug
-#define    yypact  ical_yy_pact
-#define    yyr1    ical_yy_r1
-#define    yyr2    ical_yy_r2
-#define    yydef   ical_yy_def
-#define    yychk   ical_yy_chk
-#define    yypgo   ical_yy_pgo
-#define    yyact   ical_yy_act
-#define    yyexca  ical_yy_exca
-#define yyerrflag ical_yy_errflag
-#define yynerrs    ical_yy_nerrs
-#define    yyps    ical_yy_ps
-#define    yypv    ical_yy_pv
-#define    yys     ical_yy_s
-#define    yy_yys  ical_yy_yys
-#define    yystate ical_yy_state
-#define    yytmp   ical_yy_tmp
-#define    yyv     ical_yy_v
-#define    yy_yyv  ical_yy_yyv
-#define    yyval   ical_yy_val
-#define    yylloc  ical_yy_lloc
-#define yyreds     ical_yy_reds
-#define yytoks     ical_yy_toks
-#define yylhs      ical_yy_yylhs
-#define yylen      ical_yy_yylen
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yysindex ical_yy_yysindex
-#define yyrindex ical_yy_yyrindex
-#define yygindex ical_yy_yygindex
-#define yytable     ical_yy_yytable
-#define yycheck     ical_yy_yycheck
-#define yyname   ical_yy_yyname
-#define yyrule   ical_yy_yyrule
-#define yy_scan_bytes ical_yy_scan_bytes
-#define yy_scan_string ical_yy_scan_string
-#define yy_scan_buffer ical_yy_scan_buffer
-*/
-
-/* These are redefined with the -P option to flex */
-/*
-#define yy_create_buffer  ical_yy_create_buffer 
-#define yy_delete_buffer ical_yy_delete_buffer
-#define yy_flex_debug ical_yy_flex_debug
-#define yy_init_buffer ical_yy_init_buffer
-#define yy_flush_buffer ical_yy_flush_buffer
-#define yy_load_buffer_state ical_yy_load_buffer_state
-#define yy_switch_to_buffer ical_yy_switch_to_buffer
-#define yyin ical_yyin
-#define yyleng ical_yyleng
-#define yylex ical_yylex
-#define yylineno ical_yylineno
-#define yyout ical_yyout
-#define yyrestart ical_yyrestart
-#define yytext ical_yytext
-#define yywrap ical_yywrap             
-*/
-
-
-%token <v_string> DIGITS
-%token <v_int> INTNUMBER
-%token <v_float> FLOATNUMBER
-%token <v_string> STRING   
-%token EOL EQUALS CHARACTER COLON COMMA SEMICOLON MINUS TIMESEPERATOR 
-
-%token TRUE FALSE
-
-%token FREQ BYDAY BYHOUR BYMINUTE BYMONTH BYMONTHDAY BYSECOND BYSETPOS BYWEEKNO
-%token BYYEARDAY DAILY MINUTELY MONTHLY SECONDLY WEEKLY HOURLY YEARLY
-%token INTERVAL COUNT UNTIL WKST MO SA SU TU WE TH FR 
-
-%token BIT8 ACCEPTED ADD AUDIO BASE64 BINARY BOOLEAN BUSY BUSYTENTATIVE
-%token BUSYUNAVAILABLE CALADDRESS CANCEL CANCELLED CHAIR CHILD COMPLETED
-%token CONFIDENTIAL CONFIRMED COUNTER DATE DATETIME DECLINECOUNTER DECLINED
-%token DELEGATED DISPLAY DRAFT DURATION EMAIL END FINAL FLOAT FREE GREGORIAN
-%token GROUP INDIVIDUAL INPROCESS INTEGER NEEDSACTION NONPARTICIPANT
-%token OPAQUE OPTPARTICIPANT PARENT PERIOD PRIVATE PROCEDURE PUBLIC PUBLISH
-%token RECUR REFRESH REPLY REQPARTICIPANT REQUEST RESOURCE ROOM SIBLING
-%token START TENTATIVE TEXT THISANDFUTURE THISANDPRIOR TIME TRANSPAENT
-%token UNKNOWN UTCOFFSET XNAME
-
-%token ALTREP CN CUTYPE DAYLIGHT DIR ENCODING EVENT FBTYPE FMTTYPE LANGUAGE 
-%token MEMBER PARTSTAT RANGE RELATED RELTYPE ROLE RSVP SENTBY STANDARD URI
-
-%token TIME_CHAR UTC_CHAR
-
-
-%%
-
-value:
-	date_value
-	| datetime_value
-	| duration_value
-	| period_value
-        | utcoffset_value
-        | error { 
-                  icalparser_yy_value = 0;
-		  icalparser_clear_flex_input();
-                  yyclearin;
-                  }
-
-
-date_value: DIGITS
-        {
-	    struct icaltimetype stm;
-
-	    stm = fill_datetime($1,0);
-
-	    stm.hour = -1;
-	    stm.minute = -1;
-	    stm.second = -1;
-	    stm.is_utc = 0;
-	    stm.is_date = 1;
-
-	    icalparser_yy_value = icalvalue_new_date(stm);
-	}
-
-utc_char: 
-	/*empty*/  {utc = 0;}
-	| UTC_CHAR {utc = 1;}
-
-/* This is used in the period_value, where there may be two utc characters per rule. */
-utc_char_b: 
-	/*empty*/  {utc_b = 0;}
-	| UTC_CHAR {utc_b = 1;}
-
-datetime_value: 
-	DIGITS TIME_CHAR DIGITS utc_char
-        {
-	    struct  icaltimetype stm;
-	    stm = fill_datetime($1, $3);
-	    stm.is_utc = utc;
-	    stm.is_date = 0;
-
-	    icalparser_yy_value = 
-		icalvalue_new_datetime(stm);
-	}
-
-
-/* Duration */
-
-
-dur_date: dur_day
-	| dur_day dur_time
-
-dur_week: DIGITS 'W'
-	{
-	    duration.weeks = atoi($1);
-	}
-
-dur_time: TIME_CHAR dur_hour 
-	{
-	}
-	| TIME_CHAR dur_minute
-	{
-	}
-	| TIME_CHAR dur_second
-	{
-	}
-
-dur_hour: DIGITS 'H'
-	{
-	    duration.hours = atoi($1);
-	}
-	| DIGITS 'H' dur_minute
-	{
-	    duration.hours = atoi($1);
-	}
-
-dur_minute: DIGITS 'M'
-	{
-	    duration.minutes = atoi($1);
-	}
-	| DIGITS 'M' dur_second
-	{
-	    duration.minutes = atoi($1);
-	}
-
-dur_second: DIGITS 'S'
-	{
-	    duration.seconds = atoi($1);
-	}
-
-dur_day: DIGITS 'D'
-	{
-	    duration.days = atoi($1);
-	}
-
-dur_prefix: /* empty */
-	{
-	    duration.is_neg = 0;
-	} 
-	| '+'
-	{
-	    duration.is_neg = 0;
-	}
-	| '-'
-	{ 
-	    duration.is_neg = 1;
-	}
-
-duration_value: dur_prefix 'P' dur_date
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_time
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_week
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-
-
-/* Period */
-
-period_value:  DIGITS TIME_CHAR DIGITS utc_char '/'  DIGITS TIME_CHAR DIGITS utc_char_b
-	{
-            struct icalperiodtype p;
-        
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-
-	    p.end = fill_datetime($6,$8);
-	    p.end.is_utc = utc_b;
-	    p.end.is_date = 0;
-		
-	    p.duration.days = -1;
-	    p.duration.weeks = -1;
-	    p.duration.hours = -1;
-	    p.duration.minutes = -1;
-	    p.duration.seconds = -1;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-	}
-	| DIGITS TIME_CHAR DIGITS utc_char '/'  duration_value
-	{
-            struct icalperiodtype p;
-	    
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-	    p.end.year = -1;
-	    p.end.month = -1;
-	    p.end.day = -1;
-	    p.end.hour = -1;
-	    p.end.minute = -1;
-	    p.end.second = -1;
-		   
-	    /* The duration_value rule setes the global 'duration'
-               variable, but it also creates a new value in
-               icalparser_yy_value. So, free that, then copy
-               'duration' into the icalperiodtype struct. */
-
-	    p.duration = icalvalue_get_duration(icalparser_yy_value);
-	    icalvalue_free(icalparser_yy_value);
-	    icalparser_yy_value = 0;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-
-	}
-
-
-trigger: 
-	
-
-
-/* UTC Offset */
-
-plusminus: '+' { utcsign = 1; }
-	| '-' { utcsign = -1; }
-
-utcoffset_value: 
-	plusminus INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset( utcsign * ($2*3600) + ($3*60) );
-  	}
-
-	| plusminus INTNUMBER INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset(utcsign * ($2*3600) + ($3*60) +($4));
-  	}
-
-%%
-
-struct icaltimetype fill_datetime(char* datestr, char* timestr)
-{
-	    struct icaltimetype stm;
-
-	    memset(&stm,0,sizeof(stm));
-
-	    if (datestr != 0){
-		sscanf(datestr,"%4d%2d%2d",&(stm.year), &(stm.month), 
-		       &(stm.day));
-	    }
-
-	    if (timestr != 0){
-		sscanf(timestr,"%2d%2d%2d", &(stm.hour), &(stm.minute), 
-		       &(stm.second));
-	    }
-
-	    return stm;
-
-}
-
-void ical_yyerror(char* s)
-{
-    /*fprintf(stderr,"Parse error \'%s\'\n", s);*/
-}
-
diff --git a/libical/src/libical/pvl.c b/libical/src/libical/pvl.c
deleted file mode 100644
index 2a733e8aa9..0000000000
--- a/libical/src/libical/pvl.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*======================================================================
- FILE: pvl.c
- CREATOR: eric November, 1995
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pvl.h"
-#include <errno.h>
-#include <assert.h>
-#include <stdlib.h>
-
-
-
-/*
-  struct pvl_list_t
-
-  The list structure. This is the hanlde for the entire list 
-
-  This type is also private. Use pvl_list instead 
-
-  */
-
-typedef struct pvl_list_t
-{
-	int MAGIC;		        /* Magic Identifier */
-	struct pvl_elem_t *head;	/* Head of list */
-	struct pvl_elem_t *tail;	/* Tail of list */
-	int count;			/* Number of items in the list */
-	struct pvl_elem_t *p;		/* Pointer used for iterators */
-} pvl_list_t;
-
-
-
-
-/* This global is incremented for each call to pvl_new_element(); it gives each
- * list a unique identifer */
-
-int pvl_elem_count = 0;
-int pvl_list_count = 0;
-
-
-/*----------------------------------------------------------------------
-  Function: pvl_list pvl_newlist()
- 
-  Purpose:
-
-  Creates a new list, clears the pointers and assigns a magic number
-
-  Returns:
-
-  Pointer to the new list
-  0 if there is no available memory. 
-  *----------------------------------------------------------------------*/
-
-pvl_list 
-pvl_newlist()
-{
-    struct pvl_list_t *L;
-
-    if ( ( L = (struct pvl_list_t*)malloc(sizeof(struct pvl_list_t))) == 0)
-    {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    L->MAGIC = pvl_list_count;
-    pvl_list_count++;
-    L->head = 0;
-    L->tail = 0;
-    L->count = 0;
-    L->p = 0;
-
-    return L;
-}
-
-void
-pvl_free(pvl_list l)
-{
-   struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-   pvl_clear(l);
-
-   free(L);
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_new_element(void *d, struct pvl_elem_t *next,struct pvl_elem_t *prior)
- 
-  Purpose:
-  Creates a new list element, assigns a magic number, and assigns 
-  the next and previous pointers. 
-
-  Passing in the next and previous points may seem odd, but it allos the user
-  to set them while keeping the internal data hidden. In nearly all cases, 
-  the user is the pvl library itself. 
-
-  Parameters:
-
-  d	The data item to be stored in the list
-  next  Pointer value to assign to the member "next"
-  prior Pointer value to assign to the member "prior"
-
-  Returns:
-  
-  A pointer to the new element.
-  0 if there is no memory available. 
-
-  *----------------------------------------------------------------------*/
-
-pvl_elem 
-pvl_new_element(void *d, pvl_elem next,pvl_elem prior)
-{
-    struct pvl_elem_t *E;
-
-    if ( ( E = (struct pvl_elem_t*)malloc(sizeof(struct pvl_elem_t))) == 0)
-    {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    E->MAGIC = pvl_elem_count++;
-    E->d = d;
-    E->next = next;
-    E->prior = prior;
-
-    return (pvl_elem)E;
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_unshift(pvl_list l,void *d)
- 
-  Purpose:
-
-  Add a new element to the from of the list
-
-  Parameters:
-
-  l	The list to add the item to 
-  d	Pointer to the item to add
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_unshift(pvl_list l,void *d)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    struct pvl_elem_t *E = pvl_new_element(d,L->head,0);
-
-    if (E->next != 0)
-    {
-	/* Link the head node to it */
-	E->next->prior = E;
-    }
-
-    /* move the head */
-    L->head = E;
-
-    /* maybe move the tail */
-  
-    if (L->tail == 0)
-    {
-	L->tail = E;
-    }
-
-    L->count++;
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_shift(pvl_list l)
- 
-  Purpose:
-
-  Remove an element from the front of the list 
-
-  Parameters:
-
-  l	The list to operate on
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void* 
-pvl_shift(pvl_list l)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-    if (L->head == 0)
-    {
-	return 0;
-    }
-
-    return pvl_remove(l,(void*)L->head);
-
-}
-
-/*----------------------------------------------------------------------
-  Function: void  pvl_push(pvl_list l,void *d)
-
-  Purpose:
-
-  Add a new item to the tail of the list
-
-  Paramters:
-
-  l	The list to operate on
-  d	Pointer to the item to add
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_push(pvl_list l,void *d)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    struct pvl_elem_t *E = pvl_new_element(d,0,L->tail);
-
-    /* These are done in pvl_new_element
-       E->next = 0;
-       E->prior = L->tail;
-    */
-
-    if (L->tail != 0) 
-    {
-	L->tail->next = E;
-    }
-
-    if (L->head == 0) 
-    {
-	L->head = E;
-    }
-  
-    L->tail = E;
-
-    L->count++;
-
-}
-
-/*----------------------------------------------------------------------
-  Function: void*  pvl_pop(pvl_list l)
-
-  Purpose:
-
-  Remove an element from the tail of the list 
-
-  Paramters:
-
-  l	The list to operate on
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void* 
-pvl_pop(pvl_list l)
-{
-
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-    if ( L->tail == 0)
-    {
-	return 0;
-    }
-
-    return pvl_remove(l,(void*) L->tail);;
-
-}
-
-
-/*----------------------------------------------------------------------
-  Function: void pvl_insert_ordered(pvl_list l,pvl_comparef f,void *d)
-
-  Purpose:
-  
-  Add a new item to a list that is ordered by a comparison function. 
-  This routine assumes that the list is properly ordered. 
-
-  l	The list to operate on
-  f	Pointer to a comparison function
-  d     Pointer to data to pass to the comparison function
-
-  Returns:
-
-  void
-
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_insert_ordered(pvl_list l,pvl_comparef f,void *d)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-    struct pvl_elem_t *P;
-
-    L->count++;
-
-    /* Empty list, add to head */
-
-    if(L->head == 0)
-    {
-	pvl_unshift(l,d);
-	return;
-    }
-
-    /* smaller than head, add to head */
-
-    if ( ((*f)(d,L->head->d)) <= 0)
-    { 
-	pvl_unshift(l,d);
-	return;
-    }
-
-    /* larger than tail, add to tail */
-    if ( (*f)(d,L->tail->d) >= 0)
-    { 
-	pvl_push(l,d);
-	return;
-    }
-
-
-    /* Search for the first element that is smaller, and add before it */
-    
-    for (P=L->head; P != 0; P = P->next)
-    {
-	if ( (*f)(P->d,d) >= 0)
-	{
-	    pvl_insert_before(l,P,d);
-	    return;
-	}
-    }
-
-    /* badness, choke */
-
-    assert(0);
-
-}
-
-/*----------------------------------------------------------------------
-  Function: void  pvl_insert_after(pvl_list l,pvl_elem p,void *d)
-
-  Purpose:
-
-  Add a new item after the referenced element. 
-
-  Parameters:
-
-  l	The list to operate on 
-  p	The list element to add the item after
-  d	Pointer to the item to add. 
-
-  Returns:
-
-  void
-
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_insert_after(pvl_list l,pvl_elem p,void *d)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    struct pvl_elem_t *P = (struct pvl_elem_t *)p;
-    struct pvl_elem_t *E = 0;
-
-    L->count++;
-
-    if (P == 0)
-    {
-	pvl_unshift(l,d);
-	return;
-    }
-
-    if ( P == L->tail)
-    {
-	E = pvl_new_element(d,0,P);
-	L->tail = E;
-	E->prior->next = E;
-    }
-    else
-    {
-	E = pvl_new_element(d,P->next,P);
-	E->next->prior  = E;
-	E->prior->next = E;
-    }
-}
-
-/*----------------------------------------------------------------------
-  Function: void pvl_insert_before(pvl_list l,pvl_elem p,void *d)
-
-  Purpose:
-
-  Add an item after a referenced item
-
-  Parameters:
-
-  l	The list to operate on
-  p	The list element to add the item before
-  d	Pointer to the data to be added. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_insert_before(pvl_list l,pvl_elem p,void *d)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    struct pvl_elem_t *P = (struct pvl_elem_t *)p;
-    struct pvl_elem_t *E = 0;
-
-    L->count++;
-
-    if (P == 0)
-    {
-	pvl_unshift(l,d);
-	return;
-    }
-
-    if ( P == L->head)
-    {
-	E = pvl_new_element(d,P,0);
-	E->next->prior = E;
-	L->head = E;
-    }
-    else
-    {
-	E = pvl_new_element(d,P,P->prior);
-	E->prior->next = E;
-	E->next->prior = E;
-    }
-}
-
-/*----------------------------------------------------------------------
-  Function: void pvl_remove(pvl_list l,pvl_elem e)
- 
-  Purpose:
-
-  Remove the referenced item from the list
-
-  This routine will free the element, but not the data item that the
-  element contains. 
-
-  Parameters:
-
-  l	The list to operate on
-  e	The element to remove. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void* 
-pvl_remove(pvl_list l,pvl_elem e)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    struct pvl_elem_t *E = (struct pvl_elem_t *)e;
-    void* data;
-
-    if (E == L->head)
-    {
-	if (E->next != 0)
-	{
-	    E->next->prior = 0;
-	    L->head = E->next;
-	} else {
-	    /* E Also points to tail -> only one element in list */
-	    L->tail = 0;
-	    L->head = 0;
-	}
-    }
-    else if (E == L->tail)
-    {
-	if (E->prior != 0)
-	{
-	    E->prior->next = 0;
-	    L->tail = E->prior;
-	} else {
-	    /* E points to the head, so it was the last element */
-	    /* This case should be taken care of in the previous clause */
-	    L->head = 0;
-	    L->tail = 0;
-	}
-    }
-    else
-    {
-	E->prior->next = E->next;
-	E->next->prior = E->prior;
-    }
-
-
-    L->count--;
-
-    data = E->d; 
-
-    E->prior = 0;
-    E->next = 0;
-    E->d = 0;
-
-    free(E);
-
-    return data;
-
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_elem pvl_find(pvl_list l,pvl_findf f,void* v)
-
-  Purpose:
-
-  Return a pointer to data that satisfies a function
-
-  This routine will interate through the entire list and call the
-  find function for each item. It will break and return a pointer to the
-  data that causes the find function to return 1.
-
-  Parameters:
-
-  l	The list to operate on
-  f	Pointer to the find function
-  v	Pointer to constant data to pass into the function
-
-  Returns:
-
-  Pointer to the element that the find function found. 
-
-  *----------------------------------------------------------------------*/
-
-pvl_elem
-pvl_find(pvl_list l,pvl_findf f,void* v)
-{
-    pvl_elem e;
-    
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	if ( (*f)(((struct pvl_elem_t *)e)->d,v) == 1)
-	{
-	    /* Save this elem for a call to find_next */
-	    ((struct pvl_list_t *)l)->p = e;
-	    return e;
-	}
-    }
-    
-    return 0;
-
-}
-/*----------------------------------------------------------------------
-  Function: void*  pvl_find_next(pvl_list l,pvl_findf f,void* v)
-
-  Purpose:
-
-  Like pvl_find(), but continues the search where the last find() or
-  find_next() left off
-
-  Parameters:
-
-  l	The list to operate on
-  f	Pointer to the find function
-  v	Pointer to constant data to pass into the function
-
-  Returns:
-
-  Pointer to the element that the find function found. 
-
-  *----------------------------------------------------------------------*/
-
-pvl_elem
-pvl_find_next(pvl_list l,pvl_findf f,void* v)
-{
-    
-    pvl_elem e;
-    
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	if ( (*f)(((struct pvl_elem_t *)e)->d,v) == 1)
-	{
-	    /* Save this elem for a call to find_next */
-	    ((struct pvl_list_t *)l)->p = e;
-	    return e;
-	}
-    }
-
-    return 0;
-
-}
-
-/*----------------------------------------------------------------------
-  Function: void pvl_clear(pvl_list l)
-
-  Purpose:
-  
-  Remove the all the elements in the list. The does not free the data items
-  the elements hold. 
-
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_clear(pvl_list l)
-{
-    pvl_elem e = pvl_head(l);
-    pvl_elem next;
-
-    if (e == 0) {
-	return;
-    }
-
-    while(e != 0)
-    {
-	next = pvl_next(e);
-	pvl_remove(l,e);
-	e = next;
-    }
-}
-
-/*----------------------------------------------------------------------
-  Function: int pvl_count(pvl_list l)
-
-  Purpose:
-
-  Returns the number of items in the list. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-int 
-pvl_count(pvl_list l)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-    return L->count;
-}
-
-
-/*----------------------------------------------------------------------
-  Function: pvl_elem  pvl_next(pvl_elem e)
- 
-  Purpose: 
-  Returns a pointer to the given element 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-pvl_elem 
-pvl_next(pvl_elem e)
-{
-    struct pvl_elem_t *E = (struct pvl_elem_t *)e;
-
-    if (E == 0){
-	return 0;
-    }
-
-    return (pvl_elem)E->next;
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_elem  pvl_prior(pvl_elem e)
-
-  Purpose:
-
-  Returns a pointer to the element previous to the element given. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-pvl_elem 
-pvl_prior(pvl_elem e)
-{
-    struct pvl_elem_t *E = (struct pvl_elem_t *)e;
-
-    return (pvl_elem)E->prior;
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_elem  pvl_head(pvl_list l )
- 
-  Purpose:
-  
-  Returns a pointer to the first item in the list. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-pvl_elem 
-pvl_head(pvl_list l )
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-    return (pvl_elem)L->head;
-}
-
-/*----------------------------------------------------------------------
-  Function: pvl_elem  pvl_tail(pvl_list l)
- 
-  Purpose:
-
-  Returns a pointer to the last item in the list. 
-
-  Returns:
-  *----------------------------------------------------------------------*/
-pvl_elem 
-pvl_tail(pvl_list l)
-{
-    struct pvl_list_t *L = (struct pvl_list_t *)l;
-    return (pvl_elem)L->tail;
-}
-
-/*----------------------------------------------------------------------
-  Function:
- 
-
-  Purpose:
-
-
-  Returns:
-  *----------------------------------------------------------------------*/
-
-#ifndef PVL_USE_MACROS
-void* 
-pvl_data(pvl_elem e)
-{
-    struct pvl_elem_t *E = (struct pvl_elem_t *)e;
-  
-    if ( e == 0){
-	return 0;
-    }
-
-    return E->d;
-}
-#endif
-
-/*----------------------------------------------------------------------
-  Function: void  pvl_apply(pvl_list l,pvl_applyf f, void *v)
- 
-  Purpose:
-
-  Call a function for every item in the list. 
-
-  Paramters: 
-
-  l	The list to operate on
-  f	Pointer to the function to call
-  v	Data to pass to the function on every iteration
-
-  Returns:
-
-  void
-  *----------------------------------------------------------------------*/
-
-void 
-pvl_apply(pvl_list l,pvl_applyf f, void *v)
-{
-    pvl_elem e;
-
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	(*f)(((struct pvl_elem_t *)e)->d,v);
-    }
-
-}
diff --git a/libical/src/libical/pvl.h b/libical/src/libical/pvl.h
deleted file mode 100644
index 14a15a15eb..0000000000
--- a/libical/src/libical/pvl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*======================================================================
- FILE: pvl.h
- CREATOR: eric November, 1995
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-
-#ifndef __PVL_H__
-#define __PVL_H__
-
-typedef void* pvl_list;
-typedef void* pvl_elem;
-
-/*
-  struct pvl_elem_t
-
-  This type is private. Always use pvl_elem instead. The struct would
-  not even appear in this header except to make code in the USE_MACROS
-  blocks work
-
-  */
-typedef struct pvl_elem_t
-{
-	int MAGIC;			/* Magic Identifier */
-	void *d;			/* Pointer to data user is storing */
-	struct pvl_elem_t *next;	/* Next element */
-	struct pvl_elem_t *prior;	/* prior element */
-} pvl_elem_t;
-
-
-
-/* This global is incremented for each call to pvl_new_element(); it gives each
- * list a unique identifer */
-
-extern int  pvl_elem_count;
-extern int  pvl_list_count;
-
-/* Create new lists or elements */
-pvl_elem pvl_new_element(void* d, pvl_elem next,pvl_elem prior);
-pvl_list pvl_newlist(void);
-void pvl_free(pvl_list);
-
-/* Add, remove, or get the head of the list */
-void pvl_unshift(pvl_list l,void *d);
-void* pvl_shift(pvl_list l);
-pvl_elem pvl_head(pvl_list);
-
-/* Add, remove or get the tail of the list */
-void pvl_push(pvl_list l,void *d);
-void* pvl_pop(pvl_list l);
-pvl_elem pvl_tail(pvl_list);
-
-/* Insert elements in random places */
-typedef int (*pvl_comparef)(void* a, void* b); /* a, b are of the data type*/
-void pvl_insert_ordered(pvl_list l,pvl_comparef f,void *d);
-void pvl_insert_after(pvl_list l,pvl_elem e,void *d);
-void pvl_insert_before(pvl_list l,pvl_elem e,void *d);
-
-/* Remove an element, or clear the entire list */
-void* pvl_remove(pvl_list,pvl_elem); /* Remove element, return data */
-void pvl_clear(pvl_list); /* Remove all elements, de-allocate all data */
-
-int pvl_count(pvl_list);
-
-/* Navagate the list */
-pvl_elem pvl_next(pvl_elem e);
-pvl_elem pvl_prior(pvl_elem e);
-
-/* get the data in the list */
-#ifndef PVL_USE_MACROS
-void* pvl_data(pvl_elem);
-#else
-#define pvl_data(x) x==0 ? 0 : ((struct pvl_elem_t *)x)->d;
-#endif
-
-
-/* Find an element for which a function returns true */
-typedef int (*pvl_findf)(void* a, void* b); /*a is list elem, b is other data*/
-pvl_elem pvl_find(pvl_list l,pvl_findf f,void* v);
-pvl_elem pvl_find_next(pvl_list l,pvl_findf f,void* v);
-
-/* Pass each element in the list to a function */
-typedef void (*pvl_applyf)(void* a, void* b); /*a is list elem, b is other data*/
-void pvl_apply(pvl_list l,pvl_applyf f, void *v);
-
-
-#endif /* __PVL_H__ */
-
-
-
-
-
diff --git a/libical/src/libical/sspm.c b/libical/src/libical/sspm.c
deleted file mode 100644
index faaacb5592..0000000000
--- a/libical/src/libical/sspm.c
+++ /dev/null
@@ -1,1613 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: sspm.c Parse Mime
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#include <stdio.h>
-#include <string.h>
-#include "sspm.h"
-#include <assert.h>
-#include <ctype.h> /* for tolower */
-#include <stdlib.h>   /* for malloc, free */
-
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#define TMP_BUF_SIZE 1024
-
-
-enum mime_state {
-    UNKNOWN_STATE,
-    IN_HEADER,
-    END_OF_HEADER,
-    IN_BODY,
-    OPENING_PART,
-    END_OF_PART,
-    TERMINAL_END_OF_PART,
-    END_OF_INPUT
-};
-
-struct mime_impl{
-	struct sspm_part *parts; 
-	size_t max_parts;
-	int part_no;
-	int level;
-	struct sspm_action_map *actions;
-	char* (*get_string)(char *s, size_t size, void* data);
-	void* get_string_data;
-	char temp[TMP_BUF_SIZE];
-	enum mime_state state;
-};
-
-void sspm_free_header(struct sspm_header *header);
-void* sspm_make_multipart_part(struct mime_impl *impl,struct sspm_header *header);
-void sspm_read_header(struct mime_impl *impl,struct sspm_header *header);
-
-char* sspm_strdup(char* str){
-
-    char* s;
-
-    s = strdup(str);
-
-    return s;
-}
-
-
-struct  major_content_type_map 
-{
-	enum sspm_major_type type;
-	char* str;
-	
-} major_content_type_map[]  = 
-{
-    {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
-    {SSPM_TEXT_MAJOR_TYPE,"text" },
-    {SSPM_TEXT_MAJOR_TYPE,"text" },
-    {SSPM_IMAGE_MAJOR_TYPE,"image" },
-    {SSPM_AUDIO_MAJOR_TYPE,"audio" },
-    {SSPM_VIDEO_MAJOR_TYPE,"video" },
-    {SSPM_APPLICATION_MAJOR_TYPE,"application" },
-    {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
-    {SSPM_MESSAGE_MAJOR_TYPE,"message" },
-    {SSPM_UNKNOWN_MAJOR_TYPE,"" },
-};
-
-struct  minor_content_type_map 
-{
-	enum sspm_minor_type type;
-	char* str;
-
-} minor_content_type_map[]  = 
-{
-    {SSPM_ANY_MINOR_TYPE,"*" },
-    {SSPM_PLAIN_MINOR_TYPE,"plain" },
-    {SSPM_RFC822_MINOR_TYPE,"rfc822" },
-    {SSPM_DIGEST_MINOR_TYPE,"digest" },
-    {SSPM_CALENDAR_MINOR_TYPE,"calendar" },
-    {SSPM_MIXED_MINOR_TYPE,"mixed" },
-    {SSPM_RELATED_MINOR_TYPE,"related" },
-    {SSPM_ALTERNATIVE_MINOR_TYPE,"alternative" },
-    {SSPM_PARALLEL_MINOR_TYPE,  "parallel" },  
-    {SSPM_UNKNOWN_MINOR_TYPE,"" } 
-};
-
-
-
-struct encoding_map {
-	enum sspm_encoding encoding;
-	char* str;
-} sspm_encoding_map[] = 
-{
-    {SSPM_NO_ENCODING,""},
-    {SSPM_QUOTED_PRINTABLE_ENCODING,"quoted-printable"},
-    {SSPM_8BIT_ENCODING,"8bit"},
-    {SSPM_7BIT_ENCODING,"7bit"},
-    {SSPM_BINARY_ENCODING,"binary"},
-    {SSPM_BASE64_ENCODING,"base64"},
-    {SSPM_UNKNOWN_ENCODING,""}
-
-};
-
-
-char* sspm_get_parameter(char* line, char* parameter)
-{
-    char *p,*s,*q;
-    static char name[1024];
-    
-    /* Find where the parameter name is in the line */
-    p = strstr(line,parameter);
-
-    if( p == 0){
-	return 0;
-    }
-
-    /* skip over the parameter name, the '=' and any blank spaces */
-
-    p+=strlen(parameter);
-
-    while(*p==' ' || *p == '='){
-	p++;
-    }
-
-    /*now find the next semicolon*/
-
-    s = strchr(p,';');
-
-    /* Strip of leading quote */
-    q = strchr(p,'\"');
-
-    if(q !=0){
-	p = q+1;
-    }
-
-    if(s != 0){
-	strncpy(name,p,(size_t)s-(size_t)p);
-    } else {
-	strcpy(name,p);
-    }
-
-    /* Strip off trailing quote, if it exists */
-
-    q = strrchr(name,'\"');
-
-    if (q != 0){
-	*q='\0';
-    }
-    
-    return name;
-}
-
-char* sspm_property_name(char* line)
-{
-    static char name[1024];
-    char *c = strchr(line,':');
-
-    if(c != 0){
-	strncpy(name,line,(size_t)c-(size_t)line);
-	name[(size_t)c-(size_t)line] = '\0';
-	return name;
-    } else {
-	return 0;
-    }
-}
-
-char* sspm_value(char* line)
-{
-    static char value[1024];
-
-    char *c,*s, *p;
-
-    /* Find the first colon and the next semicolon */
-
-    c = strchr(line,':');
-    s = strchr(c,';');
-
-    /* Skip the colon */
-    c++;
-
-    if (s == 0){
-	s = c+strlen(line);
-    }
-
-    for(p=value; c != s; c++){
-	if(*c!=' ' && *c!='\n'){
-	    *(p++) = *c;
-	}
-    }
-
-    *p='\0';
-
-    return value;
-
-}
-
-char *mime_headers[] = {
-    "Content-Type",
-    "Content-Transfer-Encoding",
-    "Content-Disposition",
-    "Content-Id",
-    "Mime-Version",
-    0 
-};
-
-
-void* sspm_default_new_part()
-{
-    return 0;
-}
-void sspm_default_add_line(void *part, struct sspm_header *header, 
-			   char* line, size_t size)
-{
-}
-
-void* sspm_default_end_part(void* part)
-{
-    return 0;
-}
-
-void sspm_default_free_part(void *part)
-{
-}
-
-
-
-struct sspm_action_map sspm_action_map[] = 
-{
-    {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE,sspm_default_new_part,sspm_default_add_line,sspm_default_end_part,sspm_default_free_part},
-};
-
-int sspm_is_mime_header(char *line)
-{
-    char *name = sspm_property_name(line);
-    int i;
-
-    if(name == 0){ 
-	return 0;
-    }
-
-    for(i = 0; mime_headers[i] != 0; i++){
-	if(strcasecmp(name, mime_headers[i]) == 0)
-	    return 1;
-    }
-    
-    return 0;
-}
-
-int sspm_is_mail_header(char* line)
-{
-    char *name = sspm_property_name(line);
-
-    if (name != 0){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-int sspm_is_blank(char* line)
-{
-    char *p;
-    char c =0;
-
-    for(p=line; *p!=0; p++){
-	if( ! (*p == ' '|| *p == '\t' || *p=='\n') ){
-	    c++;
-	}
-    }
-
-    if (c==0){
-	return 1;
-    }
-
-    return 0;
-    
-}
-
-int sspm_is_continuation_line(char* line)
-{
-    if (line[0] == ' '|| line[0] == '\t' ) {
-	return 1;
-    }
-
-    return 0;
-}
-
-int sspm_is_mime_boundary(char *line)
-{
-    if( line[0] == '-' && line[1] == '-') {
-	return 1;
-    } 
-
-    return 0;
-}
-
-int sspm_is_mime_terminating_boundary(char *line)
-{
-
-
-    if (sspm_is_mime_boundary(line) &&
-	strstr(line,"--\n")){
-	return 1;
-    } 
-
-    return 0;
-}
-
-enum line_type {
-    EMPTY,
-    BLANK,
-    MIME_HEADER,
-    MAIL_HEADER,
-    HEADER_CONTINUATION,
-    BOUNDARY,
-    TERMINATING_BOUNDARY,
-    UNKNOWN_TYPE
-};
-
-
-enum line_type get_line_type(char* line){
-
-    if (line == 0){
-	return EMPTY;
-    } else if(sspm_is_blank(line)){
-	return BLANK;
-    } else if (sspm_is_mime_header(line)){
-	return MIME_HEADER;
-    } else if (sspm_is_mail_header(line)){
-	return MAIL_HEADER;
-    } else if (sspm_is_continuation_line(line)){
-	return HEADER_CONTINUATION;
-    } else if (sspm_is_mime_terminating_boundary(line)){
-	return TERMINATING_BOUNDARY;
-    } else if (sspm_is_mime_boundary(line)) {
-	return BOUNDARY;
-    } else {
-	return UNKNOWN_TYPE;
-    }
-
-
-}
-
-
-struct sspm_action_map get_action(struct mime_impl *impl,
-				  enum sspm_major_type major,
-				  enum sspm_minor_type minor)
-{
-    int i;
-
-    /* Read caller suppled action map */
-
-    if (impl->actions != 0){
-	for(i=0; impl->actions[i].major != SSPM_UNKNOWN_MAJOR_TYPE; i++){
-	    if((major == impl->actions[i].major &&
-	       minor == impl->actions[i].minor) ||
-	       (major == impl->actions[i].major &&
-		minor == SSPM_ANY_MINOR_TYPE)){
-		return impl->actions[i];
-	    }
-	}
-    }
-
-    /* Else, read default action map */
-
-    for(i=0; sspm_action_map[i].major != SSPM_UNKNOWN_MAJOR_TYPE; i++){
-	    if((major == sspm_action_map[i].major &&
-	       minor == sspm_action_map[i].minor) ||
-	       (major == sspm_action_map[i].major &&
-		minor == SSPM_ANY_MINOR_TYPE)){
-	    break;
-	}
-    }
-    
-    return sspm_action_map[i];
-}
-
-
-char* sspm_lowercase(char* str)
-{
-    char* p = 0;
-    char* new = sspm_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-enum sspm_major_type sspm_find_major_content_type(char* type)
-{
-    int i;
-
-    char* ltype = sspm_lowercase(type);
-
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
-	if(strncmp(ltype, major_content_type_map[i].str,
-		   strlen(major_content_type_map[i].str))==0){
-	    free(ltype);
-	    return major_content_type_map[i].type;
-	}
-    }
-    free(ltype);
-    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-enum sspm_minor_type sspm_find_minor_content_type(char* type)
-{
-    int i;
-    char* ltype = sspm_lowercase(type);
-
-    char *p = strchr(ltype,'/');
-
-    if (p==0){
-	return SSPM_UNKNOWN_MINOR_TYPE; 
-    }
-
-    p++; /* Skip the '/' */
-
-    for (i=0; minor_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
-	if(strncmp(p, minor_content_type_map[i].str,
-		   strlen(minor_content_type_map[i].str))==0){
-	    free(ltype);
-	    return minor_content_type_map[i].type;
-	}
-    }
-    
-    free(ltype);
-    return minor_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-char* sspm_major_type_string(enum sspm_major_type type)
-{
-    int i;
-
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
-	 i++){
-
-	if(type == major_content_type_map[i].type){
-	    return major_content_type_map[i].str;
-	}
-    }
-    
-    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-char* sspm_minor_type_string(enum sspm_major_type type)
-{
-    int i;
-    for (i=0; minor_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
-	 i++){
-	if(type == minor_content_type_map[i].type){
-	    return minor_content_type_map[i].str;
-	}
-    }
-    
-    return minor_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-
-char* sspm_encoding_string(enum sspm_encoding type)
-{
-    int i;
-    for (i=0; sspm_encoding_map[i].encoding !=  SSPM_UNKNOWN_ENCODING; 
-	 i++){
-	if(type == sspm_encoding_map[i].encoding){
-	    return sspm_encoding_map[i].str;
-	}
-    }
-    
-    return sspm_encoding_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-/* Interpret a header line and add its data to the header
-   structure. */
-void sspm_build_header(struct sspm_header *header, char* line)
-{
-    char *prop;
-    char *val;
-    
-    val = sspm_strdup(sspm_value(line));
-    prop = sspm_strdup(sspm_property_name(line));
-
-    if(strcmp(prop,"Content-Type") == 0){
-	
-	/* Create a new mime_header, fill in content-type
-	   and possibly boundary */
-	
-	char* boundary= sspm_get_parameter(line,"boundary");
-	
-	header->def = 0;
-	header->major = sspm_find_major_content_type(val);
-	header->minor = sspm_find_minor_content_type(val);
-	
-	if(header->minor == SSPM_UNKNOWN_MINOR_TYPE){
-	    char *p = strchr(val,'/');
-	    
-	    if (p != 0){
-		p++; /* Skip the '/' */
-		
-		header->minor_text = sspm_strdup(p);
-	    } else {
-		/* Error, malformed content type */
-		header->minor_text = sspm_strdup("unknown");
-	    }
-	}
-	if (boundary != 0){
-	    header->boundary = sspm_strdup(boundary);
-	}
-	
-    } else if(strcmp(prop,"Content-Transfer-Encoding")==0){
-	char* encoding = sspm_value(line);
-	char* lencoding = sspm_lowercase(encoding);
-
-	if(strcmp(lencoding,"base64")==0){
-	    header->encoding = SSPM_BASE64_ENCODING;
-	} else 	if(strcmp(lencoding,"quoted-printable")==0){
-	    header->encoding = SSPM_QUOTED_PRINTABLE_ENCODING;
-	} else 	if(strcmp(lencoding,"binary")==0){
-	    header->encoding = SSPM_BINARY_ENCODING;
-	} else 	if(strcmp(lencoding,"7bit")==0){
-	    header->encoding = SSPM_7BIT_ENCODING;
-	} else 	if(strcmp(lencoding,"8bit")==0){
-	    header->encoding = SSPM_8BIT_ENCODING;
-	} else {
-	    header->encoding = SSPM_UNKNOWN_ENCODING;
-	}
-
-
-	free(lencoding);
-
-	header->def = 0;
-	
-    } else if(strcmp(prop,"Content-Id")==0){
-	char* cid = sspm_value(line);
-	header->content_id = sspm_strdup(cid);
-	header->def = 0;
-	
-    }
-    free(val);
-    free(prop);
-}
-
-char* sspm_get_next_line(struct mime_impl *impl)
-{
-    char* s;
-    s = impl->get_string(impl->temp,TMP_BUF_SIZE,impl->get_string_data);
-    
-    if(s == 0){
-	impl->state = END_OF_INPUT;
-    }
-    return s;
-}
-
-
-void sspm_store_part(struct mime_impl *impl, struct sspm_header header,
-		      int level, void *part, size_t size)
-{
-    
-    impl->parts[impl->part_no].header = header;
-    impl->parts[impl->part_no].level = level;
-    impl->parts[impl->part_no].data = part;  
-    impl->parts[impl->part_no].data_size = size;  
-    impl->part_no++;
-}
-
-void sspm_set_error(struct sspm_header* header, enum sspm_error error,
-		    char* message)
-{
-    header->error = error;
-
-    if(header->error_text!=0){
-	free(header->error_text);
-    }
-
-    header->def = 0;
-
-    if(message != 0){
-	header->error_text = sspm_strdup(message);  
-    } else {
-	header->error_text = 0;
-    }
-
-}
-
-void* sspm_make_part(struct mime_impl *impl,
-		     struct sspm_header *header, 
-		     struct sspm_header *parent_header,
-		     void **end_part,
-		     size_t *size)
-{
-
-    /* For a single part type, read to the boundary, if there is a
-   boundary. Otherwise, read until the end of input.  This routine
-   assumes that the caller has read the header and has left the input
-   at the first blank line */
-
-    char *line;
-    void *part;
-    int end = 0;
-
-    struct sspm_action_map action = get_action(
-	impl,
-	header->major,
-	header->minor);
-
-    *size = 0;
-    part =action.new_part();
-
-    impl->state = IN_BODY;
-
-    while(end == 0 && (line = sspm_get_next_line(impl)) != 0){
-	
-	if(sspm_is_mime_boundary(line)){
-	    
-	    /* If there is a boundary, then this must be a multipart
-               part, so there must be a parent_header. */
-	    if(parent_header == 0){
-		char* boundary;
-		end = 1;
-		*end_part = 0;
-
-		sspm_set_error(header,SSPM_UNEXPECTED_BOUNDARY_ERROR,line);
-
-		/* Read until the paired terminating boundary */
-		if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-		    fprintf(stderr,"Out of memory");
-		    abort();
-		}
-		strcpy(boundary,line);
-		strcat(boundary,"--");
-		while((line = sspm_get_next_line(impl)) != 0){
-		    /*printf("Error: %s\n",line);*/
-		    if(strcmp(boundary,line)==0){
-			break;
-		    }
-		}
-		free(boundary);
-
-		break;
-	    }
-	    
-	    if(strncmp((line+2),parent_header->boundary,
-		       sizeof(parent_header->boundary)) == 0){
-		*end_part = action.end_part(part);
-
-		if(sspm_is_mime_boundary(line)){
-		    impl->state = END_OF_PART;
-		} else if ( sspm_is_mime_terminating_boundary(line)){
-		    impl->state = TERMINAL_END_OF_PART;
-		}
-		end = 1;
-	    } else {
-		/* Error, this is not the correct terminating boundary*/
-
-		/* read and discard until we get the right boundary.  */
-		    char* boundary;
-		    char msg[256];
-
-		    snprintf(msg,256,
-			     "Expected: %s--. Got: %s",
-			     parent_header->boundary,line);
-
-		    sspm_set_error(parent_header,
-		      SSPM_WRONG_BOUNDARY_ERROR,msg);
-
-		    /* Read until the paired terminating boundary */
-		    if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-			fprintf(stderr,"Out of memory");
-			abort();
-		    }		 
-		    strcpy(boundary,line);
-		    strcat(boundary,"--");
-		    while((line = sspm_get_next_line(impl)) != 0){
-			if(strcmp(boundary,line)==0){
-			    break;
-			}
-		    }
-		    free(boundary);
-
-	    }	
-	} else {
-	    char* data=0;
-	    char* rtrn=0;
-	    *size = strlen(line);
-
-	    data = (char*)malloc(*size+2);
-	    assert(data != 0);
-	    if (header->encoding == SSPM_BASE64_ENCODING){
-		rtrn = decode_base64(data,line,size); 
-	    } else if(header->encoding == SSPM_QUOTED_PRINTABLE_ENCODING){
-		rtrn = decode_quoted_printable(data,line,size); 
-	    } 
-
-	    if(rtrn == 0){
-		strcpy(data,line);
-	    }
-
-	    /* add a end-of-string after the data, just in case binary
-               data from decode64 gets passed to a tring handling
-               routine in add_line  */
-	    data[*size+1]='\0';
-
-	    action.add_line(part,header,data,*size);
-
-	    free(data);
-	}
-    }
-
-    if (end == 0){
-	/* End the part if the input is exhausted */
-	*end_part = action.end_part(part);
-    }
-
-    return end_part;
-}
-
-
-void* sspm_make_multipart_subpart(struct mime_impl *impl,
-			    struct sspm_header *parent_header)
-{
-    struct sspm_header header;
-    char *line;
-    void* part;
-    size_t size;
-
-    if(parent_header->boundary == 0){
-	/* Error. Multipart headers must have a boundary*/
-	
-	sspm_set_error(parent_header,SSPM_NO_BOUNDARY_ERROR,0);
-	/* read all of the reamining lines */
-	while((line = sspm_get_next_line(impl)) != 0){
-	}  
-
-	return 0;
-    }
-
-
-    /* Step 1: Read the opening boundary */
-
-    if(get_line_type(impl->temp) != BOUNDARY){
-	while((line=sspm_get_next_line(impl)) != 0 ){
-	    if(sspm_is_mime_boundary(line)){
-
-		assert(parent_header != 0);
-
-		/* Check if it is the right boundary */
-		if(!sspm_is_mime_terminating_boundary(line) &&
-		   strncmp((line+2),parent_header->boundary, 
-			   sizeof(parent_header->boundary)) 
-		   == 0){
-		    /* The +2 in strncmp skips over the leading "--" */
-		    
-		    break;
-		} else {
-		    /* Got the wrong boundary, so read and discard
-                       until we get the right boundary.  */
-		    char* boundary;
-		    char msg[256];
-		    
-		    snprintf(msg,256,
-			     "Expected: %s. Got: %s",
-			     parent_header->boundary,line);
-
-		    sspm_set_error(parent_header,
-				   SSPM_WRONG_BOUNDARY_ERROR,msg);
-
-		    /* Read until the paired terminating boundary */
-		    if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-			fprintf(stderr,"Out of memory");
-			abort();
-		    }
-		    strcpy(boundary,line);
-		    strcat(boundary,"--");
-		    while((line = sspm_get_next_line(impl)) != 0){
-			if(strcmp(boundary,line)==0){
-			    break;
-			}
-		    }
-		    free(boundary);
-		    
-		    return 0;
-		}
-	    }
-	}
-    }
-
-    /* Step 2: Get the part header */
-    sspm_read_header(impl,&header);
-
-    /* If the header is still listed as default, there was probably an
-       error */
-    if(header.def == 1 && header.error != SSPM_NO_ERROR){
-	sspm_set_error(&header,SSPM_NO_HEADER_ERROR,0);
-	return 0;
-    }
-
-    if(header.error!= SSPM_NO_ERROR){
-	sspm_store_part(impl,header,impl->level,0,0);
-	return 0;
-    }	
-
-    /* Step 3: read the body */
-    
-    if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	struct sspm_header *child_header;
-	child_header = &(impl->parts[impl->part_no].header);
-
-	/* Store the multipart part */
-	sspm_store_part(impl,header,impl->level,0,0);
-
-	/* now get all of the sub-parts */
-	part = sspm_make_multipart_part(impl,child_header);
-
-	if(get_line_type(impl->temp) != TERMINATING_BOUNDARY){
-
-	    sspm_set_error(child_header,SSPM_NO_BOUNDARY_ERROR,impl->temp);
-	    return 0;
-	}
-	
-	sspm_get_next_line(impl); /* Step past the terminating boundary */
-
-    } else {
-	sspm_make_part(impl, &header,parent_header,&part,&size);
-
-	memset(&(impl->parts[impl->part_no]), 0, sizeof(struct sspm_part));
-
-	sspm_store_part(impl,header,impl->level,part,size);
-
-    }
-
-    return part;
-}
-
-void* sspm_make_multipart_part(struct mime_impl *impl,struct sspm_header *header)
-{
-    void *part=0;
-
-    /* Now descend a level into each of the children of this part */
-    impl->level++;
-
-    /* Now we are working on the CHILD */
-    memset(&(impl->parts[impl->part_no]), 0, sizeof(struct sspm_part));
-
-    do{
-	part = sspm_make_multipart_subpart(impl,header);
-
-	if (part==0){
-	    /* Clean up the part in progress */
-	    impl->parts[impl->part_no].header.major 
-		= SSPM_NO_MAJOR_TYPE;
-	    impl->parts[impl->part_no].header.minor 
-		= SSPM_NO_MINOR_TYPE;
-
-	}
-	
-
-    } while (get_line_type(impl->temp) != TERMINATING_BOUNDARY &&
-	impl->state != END_OF_INPUT);
-
-    impl->level--;
-
-    return 0;
-}
-
-
-void sspm_read_header(struct mime_impl *impl,struct sspm_header *header)
-{
-#define BUF_SIZE 1024
-#define MAX_HEADER_LINES 25
-
-    char *buf;
-    char header_lines[MAX_HEADER_LINES][BUF_SIZE]; /* HACK, hard limits */
-    int current_line = -1;
-    int end = 0;
-
-    memset(header_lines,0,sizeof(header_lines));
-    memset(header,0,sizeof(struct sspm_header));
-
-    /* Set up default header */
-    header->def = 1;
-    header->major = SSPM_TEXT_MAJOR_TYPE;
-    header->minor = SSPM_PLAIN_MINOR_TYPE;
-    header->error = SSPM_NO_ERROR;
-    header->error_text = 0;
-
-    /* Read all of the lines into memory */
-    while(end==0&& (buf=sspm_get_next_line(impl)) != 0){
-
-	enum line_type line_type = get_line_type(buf);
-	
-	switch(line_type){
-	    case BLANK: {
-		end = 1;
-		impl->state = END_OF_HEADER;
-		break;
-	    }
-
-	    case MAIL_HEADER:
-	    case MIME_HEADER: {	    
-		impl->state = IN_HEADER;
-		current_line++;
-		
-		assert(strlen(buf) < BUF_SIZE);
-		
-		strcpy(header_lines[current_line],buf);
-		
-		break;
-	    }
-	    
-	    case HEADER_CONTINUATION: {
-		char* last_line, *end;
-		char *buf_start;
-
-		if(current_line < 0){
-		    /* This is not really a continuation line, since
-                       we have not see any header line yet */
-		    sspm_set_error(header,SSPM_MALFORMED_HEADER_ERROR,buf);
-		    return;
-		}
-
-		last_line = header_lines[current_line];
-		end = (char*) ( (size_t)strlen(last_line)+
-				      (size_t)last_line);
-		
-		impl->state = IN_HEADER;
-
-		
-		/* skip over the spaces in buf start, and remove the new
-		   line at the end of the lat line */
-		if (last_line[strlen(last_line)-1] == '\n'){
-		    last_line[strlen(last_line)-1] = '\0';
-		}
-		buf_start = buf;
-		while(*buf_start == ' ' ||*buf_start == '\t' ){
-		    buf_start++;
-		}
-		
-		assert( strlen(buf_start) + strlen(last_line) < BUF_SIZE);
-		
-		strcat(last_line,buf_start);
-		
-		break;
-	    }
-	    
-	    default: {
-		sspm_set_error(header,SSPM_MALFORMED_HEADER_ERROR,buf);
-		return;
-	    }
-	}
-    }
-	
-
-    for(current_line = 0;
-	current_line < MAX_HEADER_LINES && header_lines[current_line][0] != 0;
-	current_line++){
-	
-	sspm_build_header(header,header_lines[current_line]);
-    }
-
-
-}
-
-/* Root routine for parsing mime entries*/
-int sspm_parse_mime(struct sspm_part *parts, 
-		    size_t max_parts,
-		    struct sspm_action_map *actions,
-		    char* (*get_string)(char *s, size_t size, void* data),
-		    void *get_string_data,
-		    struct sspm_header *first_header
-    )
-{
-    struct mime_impl impl;
-    struct sspm_header header;
-    void *part;
-    int i;
-
-    /* Initialize all of the data */
-    memset(&impl,0,sizeof(struct mime_impl));
-    memset(&header,0,sizeof(struct sspm_header));
-
-    for(i = 0; i<(int)max_parts; i++){
-	parts[i].header.major = SSPM_NO_MAJOR_TYPE;
-	parts[i].header.minor = SSPM_NO_MINOR_TYPE;
-    }
-	
-    impl.parts = parts;
-    impl.max_parts = max_parts;
-    impl.part_no = 0;
-    impl.actions = actions;
-    impl.get_string = get_string;
-    impl.get_string_data = get_string_data;
-
-    /* Read the header of the message. This will be the email header,
-       unless first_header is specified. But ( HACK) that var is not
-       currently being used */
-    sspm_read_header(&impl,&header);
-
-    if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	struct sspm_header *child_header;
-	child_header = &(impl.parts[impl.part_no].header);
-	
-	sspm_store_part(&impl,header,impl.level,0,0);
-
-	part = sspm_make_multipart_part(&impl,child_header);
-
-    } else {
-	void *part;
-	size_t size;
-	sspm_make_part(&impl, &header, 0,&part,&size);
-
-	memset(&(impl.parts[impl.part_no]), 0, sizeof(struct sspm_part));
-	
-	sspm_store_part(&impl,header,impl.level,part,size);
-    }
-
-    return 0;
-}
-
-void sspm_free_parts(struct sspm_part *parts, size_t max_parts)
-{
-     int i;
-    
-    for(i = 0; i<(int)max_parts && parts[i].header.major != SSPM_NO_MAJOR_TYPE;
-	i++){
-	sspm_free_header(&(parts[i].header));
-    }
-}
-
-void sspm_free_header(struct sspm_header *header)
-{
-    if(header->boundary!=0){
-	free(header->boundary);
-    }
-    if(header->minor_text!=0){
-	free(header->minor_text);
-    }
-    if(header->charset!=0){
-	free(header->charset);
-    }
-    if(header->filename!=0){
-	free(header->filename);
-    }
-    if(header->content_id!=0){
-	free(header->content_id);
-    }
-    if(header->error_text!=0){
-	free(header->error_text);
-    }
-}
-
-/***********************************************************************
-The remaining code is beased on code from the mimelite distribution,
-which has the following notice:
-
-| Authorship:
-|    Copyright (c) 1994 Gisle Hannemyr.
-|    Permission is granted to hack, make and distribute copies of this
-|    program as long as this copyright notice is not removed.
-|    Flames, bug reports, comments and improvements to:
-|       snail: Gisle Hannemyr, Brageveien 3A, 0452 Oslo, Norway
-|       email: Inet: gisle@oslonett.no
-
-The code is heavily modified by Eric Busboom. 
-
-***********************************************************************/
-
-char *decode_quoted_printable(char *dest, 
-				       char *src,
-				       size_t *size)
-{
-    int cc;
-    size_t i=0;
-
-    while (*src != 0 && i < *size) {
-	if (*src == '=') {
-
-	    src++; 
-	    if (!*src) {
-		break;
-	    }
-
-	    /* remove soft line breaks*/
-	    if ((*src == '\n') || (*src == '\r')){
-		src++;
-		if ((*src == '\n') || (*src == '\r')){
-		    src++;
-		}
-		continue;
-	    }
-
-	    cc  = isdigit(*src) ? (*src - '0') : (*src - 55);
-	    cc *= 0x10;
-	    src++; 
-	    if (!*src) {
-		break;
-	    }
-	    cc += isdigit(*src) ? (*src - '0') : (*src - 55);
-
-	    *dest = cc;
-
-	} else {
-	    *dest = *src;
-	}
-	
-	dest++;
-	src++;
-	i++;
-    }
-    
-    *dest = '\0';
-    
-    *size = i;
-    return(dest);
-}
-
-char *decode_base64(char *dest, 
-			     char *src,
-			     size_t *size)
-{
-    int cc;
-    char buf[4] = {0,0,0,0};  
-    int p = 0;
-    int valid_data = 0;
-    size_t size_out=0;
-    
-    while (*src && p<(int)*size && (cc!=  -1)) {
-	
-	/* convert a character into the Base64 alphabet */
-	cc = *src++;
-	
-	if	((cc >= 'A') && (cc <= 'Z')) cc = cc - 'A';
-	else if ((cc >= 'a') && (cc <= 'z')) cc = cc - 'a' + 26;
-	else if ((cc >= '0') && (cc <= '9')) cc = cc - '0' + 52;
-	else if  (cc == '/')		     cc = 63;
-	else if  (cc == '+')		     cc = 62;
-	else                                 cc = -1;
-	
-	assert(cc<64);
-
-	/* If we've reached the end, fill the remaining slots in
-	   the bucket and do a final conversion */
-	if(cc== -1){
-	    if(valid_data == 0){
-		return 0;
-	    }
-
-	    while(p%4!=3){
-		p++;
-		buf[p%4] = 0;
-	    }
-	} else {
-	    buf[p%4] = cc;
-	    size_out++;
-	    valid_data = 1;
-	}
-
-	
-	/* When we have 4 base64 letters, convert them into three
-	   bytes */
-	if (p%4 == 3) {
-	    *dest++ =(buf[0]<< 2)|((buf[1] & 0x30) >> 4);
-	    *dest++ =((buf[1] & 0x0F) << 4)|((buf[2] & 0x3C) >> 2);
-	    *dest++ =((buf[2] & 0x03) << 6)|(buf[3] & 0x3F);
-
-	    memset(buf,0,4);
-	}
-
-	p++;
-
-    }
-    /* Calculate the size of the converted data*/
-   *size = ((int)(size_out/4))*3;
-    if(size_out%4 == 2) *size+=1;
-    if(size_out%4 == 3) *size+=2;
-
-    return(dest);
-}
-
-
-/***********************************************************************
-								       
- Routines to output MIME
-
-**********************************************************************/
-
-
-struct sspm_buffer {
-	char* buffer;
-	char* pos;
-	size_t buf_size;
-	int line_pos;
-};
-
-void sspm_append_string(struct sspm_buffer* buf, char* string);
-void sspm_write_part(struct sspm_buffer *buf,struct sspm_part *part, int *part_num);
-
-void sspm_append_hex(struct sspm_buffer* buf, char ch)
-{
-    char tmp[3];
-
-    sprintf(tmp,"=%02X",ch);
-
-    sspm_append_string(buf,tmp);
-}
-
-/* a copy of icalmemory_append_char */
-void sspm_append_char(struct sspm_buffer* buf, char ch)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length;
-
-    data_length = (size_t)buf->pos - (size_t)buf->buffer;
-
-    final_length = data_length + 2; 
-
-    if ( final_length > (size_t) buf->buf_size ) {
-	
-	buf->buf_size  = (buf->buf_size) * 2  + final_length +1;
-
-	new_buf = realloc(buf->buffer,buf->buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	buf->pos = new_pos;
-	buf->buffer = new_buf;
-    }
-
-    *(buf->pos) = ch;
-    buf->pos += 1;
-    *(buf->pos) = 0;
-}
-/* A copy of icalmemory_append_string */
-void sspm_append_string(struct sspm_buffer* buf, char* string)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length, string_length;
-
-    string_length = strlen(string);
-    data_length = (size_t)buf->pos - (size_t)buf->buffer;    
-    final_length = data_length + string_length; 
-
-    if ( final_length >= (size_t) buf->buf_size) {
-
-	
-	buf->buf_size  = (buf->buf_size) * 2  + final_length;
-
-	new_buf = realloc(buf->buffer,buf->buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	buf->pos = new_pos;
-	buf->buffer = new_buf;
-    }
-    
-    strcpy(buf->pos, string);
-
-    buf->pos += string_length;
-}
-
-
-
-static int sspm_is_printable(char c)
-{
-    return (c >= 33) && (c <= 126) && (c != '=');
-
-} 
-                     
-
-void sspm_encode_quoted_printable(struct sspm_buffer *buf, char* data)
-{
-    char *p;
-    int lpos = 0;
-
-    for(p = data; *p != 0; p++){
-
-	if(sspm_is_printable(*p)){
-	    /* plain characters can represent themselves */
-	    /* RFC2045 Rule #2 */
-	       sspm_append_char(buf,*p);
-	       lpos++;
-	} else if ( *p == '\t' || *p == ' ' ) {
-
-	    /* For tabs and spaces, only encode if they appear at the
-               end of the line */
-	    /* RFC2045 Rule #3 */
-
-	   char n = *(p+1);
-
-	   if( n == '\n' || n == '\r'){
-	       sspm_append_hex(buf,*p);
-	       lpos += 3;
-	   } else {
-	       sspm_append_char(buf,*p);
-	       lpos++;
-	   }
-
-	} else if( *p == '\n' || *p == '\r'){
-	    sspm_append_char(buf,*p);
-
-	    lpos=0;
-
-	} else {
-	    /* All others need to be encoded */
-	    sspm_append_hex(buf,*p);
-	    lpos+=3;
-	}
-
-
-	/* Add line breaks */
-	if (lpos > 72){
-	    lpos = 0;
-	    sspm_append_string(buf,"=\n");
-	}
-    }
-}
-
-static char BaseTable[64] = {
-    'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-    'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',
-    'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-    'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/'
-};
-    
-void sspm_write_base64(struct sspm_buffer *buf, char* inbuf,int size )
-{
-    
-    char outbuf[4];
-    int i;
-
-    outbuf[0] = outbuf[1] = outbuf[2] = outbuf[3] = 65;
-
-    switch(size){
-	
-	case 4:
-	    outbuf[3] =   inbuf[2] & 0x3F;
-
-	case 3:
-	    outbuf[2] = ((inbuf[1] & 0x0F) << 2) | ((inbuf[2] & 0xC0) >> 6);
-
-	case 2:	
-	    outbuf[0] =  (inbuf[0] & 0xFC) >> 2;
-	    outbuf[1] = ((inbuf[0] & 0x03) << 4) | ((inbuf[1] & 0xF0) >> 4);
-	    break;
-
-	default:
-	    assert(0);
-    }
-
-    for(i = 0; i < 4; i++){
-
-	if(outbuf[i] == 65){
-	    sspm_append_char(buf,'=');
-	} else {
-	    sspm_append_char(buf,BaseTable[(int)outbuf[i]]);
-	}
-    }
-}
-             
-void sspm_encode_base64(struct sspm_buffer *buf, char* data, size_t size)
-{
-
-    char *p;
-    char inbuf[3];
-    int i = 0;
-    int first = 1;
-    int lpos = 0;
-
-    inbuf[0] = inbuf[1] = inbuf[2]  = 0;
-
-    for (p = data; *p !=0; p++){
-                         
-	if (i%3 == 0 && first == 0){
-
-	    sspm_write_base64(buf, inbuf, 4);
-	    lpos+=4;
-
-	    inbuf[0] = inbuf[1] = inbuf[2] = 0;
-	}
-
-	assert(lpos%4 == 0);
-
-	if (lpos == 72){
-	    sspm_append_string(buf,"\n");
-	    lpos = 0;
-	}
-
-	inbuf[i%3] = *p;
-
-	i++;
-	first = 0;
-
-    }
-
-    
-    /* If the inbuf was not exactly filled on the last byte, we need
-       to spit out the odd bytes that did get in -- either one or
-       two. This will result in an output of two bytes and '==' or
-       three bytes and '=', respectively */
-    
-    if (i%3 == 1 && first == 0){
-	    sspm_write_base64(buf, inbuf, 2);
-    } else if (i%3 == 2 && first == 0){
-	    sspm_write_base64(buf, inbuf, 3);
-    }
-
-}
-
-void sspm_write_header(struct sspm_buffer *buf,struct sspm_header *header)
-{
-    
-    int i;
-    char temp[TMP_BUF_SIZE];			       
-    char* major; 
-    char* minor; 
-    
-    /* Content-type */
-
-    major = sspm_major_type_string(header->major);
-    minor = sspm_minor_type_string(header->minor);
-
-    if(header->minor == SSPM_UNKNOWN_MINOR_TYPE ){
-	assert(header->minor_text !=0);
-	minor = header->minor_text;
-    }
-    
-    sprintf(temp,"Content-Type: %s/%s",major,minor);
-
-    sspm_append_string(buf,temp);
-
-    if(header->boundary != 0){
-	sprintf(temp,";boundary=\"%s\"",header->boundary);
-	sspm_append_string(buf,temp);
-    }
-    
-    /* Append any content type parameters */    
-    if(header->content_type_params != 0){
-	for(i=0; *(header->content_type_params[i])!= 0;i++){
-	    sprintf(temp,header->content_type_params[i]);
-	    sspm_append_char(buf,';');
-	    sspm_append_string(buf,temp);
-	}
-    }
-    
-    sspm_append_char(buf,'\n');
-
-    /*Content-Transfer-Encoding */
-
-    if(header->encoding != SSPM_UNKNOWN_ENCODING &&
-	header->encoding != SSPM_NO_ENCODING){
-	sprintf(temp,"Content-Transfer-Encoding: %s\n",
-		sspm_encoding_string(header->encoding));
-    }
-
-    sspm_append_char(buf,'\n');
-
-}
-
-void sspm_write_multipart_part(struct sspm_buffer *buf,
-			       struct sspm_part *parts,
-			       int* part_num)
-{
-
-    int parent_level, level;
-    struct sspm_header *header = &(parts[*part_num].header);
-    /* Write the header for the multipart part */
-    sspm_write_header(buf,header);
-
-    parent_level = parts[*part_num].level;
-
-    (*part_num)++;
-
-    level = parts[*part_num].level;
-
-    while(parts[*part_num].header.major != SSPM_NO_MAJOR_TYPE &&
-	  level == parent_level+1){
-
-	assert(header->boundary);
-	sspm_append_string(buf,header->boundary);
-	sspm_append_char(buf,'\n');
-	
-	if (parts[*part_num].header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	    sspm_write_multipart_part(buf,parts,part_num);
-	} else {
-	    sspm_write_part(buf, &(parts[*part_num]), part_num);
-	}	
-
-	(*part_num)++;
-	level =  parts[*part_num].level;
-    }
-   
-    sspm_append_string(buf,"\n\n--");
-    sspm_append_string(buf,header->boundary);
-    sspm_append_string(buf,"\n");
-
-    (*part_num)--; /* undo last, spurious, increment */
-}
-
-void sspm_write_part(struct sspm_buffer *buf,struct sspm_part *part,int *part_num)
-{
-
-    /* Write header */
-    sspm_write_header(buf,&(part->header));
-
-    /* Write part data */
-
-    if(part->data == 0){
-	return;
-    }
-
-    if(part->header.encoding == SSPM_BASE64_ENCODING) {
-	assert(part->data_size != 0);
-	sspm_encode_base64(buf,part->data,part->data_size);
-    } else if(part->header.encoding == SSPM_QUOTED_PRINTABLE_ENCODING) {
-	sspm_encode_quoted_printable(buf,part->data);
-    } else {
-	sspm_append_string(buf,part->data);
-    }
-
-    sspm_append_string(buf,"\n\n");
-}
-
-int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
-		    char **output_string, char* header)
-{
-    struct sspm_buffer buf;
-    int part_num =0;
-
-    buf.buffer = malloc(4096);
-    buf.pos = buf.buffer;
-    buf.buf_size = 10;
-    buf.line_pos = 0;
-
-    /* write caller's header */
-    if(header != 0){
-	sspm_append_string(&buf,header);
-    }
-
-    if(buf.buffer[strlen(buf.buffer)-1] != '\n'){
-	sspm_append_char(&buf,'\n');
-    }
-
-    /* write mime-version header */
-    sspm_append_string(&buf,"Mime-Version: 1.0\n");
-
-    /* End of header */
-
-    /* Write body parts */
-    while(parts[part_num].header.major != SSPM_NO_MAJOR_TYPE){
-	if (parts[part_num].header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	    sspm_write_multipart_part(&buf,parts,&part_num);
-	} else {
-	    sspm_write_part(&buf, &(parts[part_num]), &part_num);
-	}	
-
-	part_num++;
-    }
-
-
-    *output_string = buf.buffer;
-
-    return 0;
-}
-
diff --git a/libical/src/libical/sspm.h b/libical/src/libical/sspm.h
deleted file mode 100644
index 864a23a36f..0000000000
--- a/libical/src/libical/sspm.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: sspm.h Mime Parser
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#ifndef SSPM_H
-#define SSPM_H
-
-enum sspm_major_type {
-    SSPM_NO_MAJOR_TYPE,
-    SSPM_TEXT_MAJOR_TYPE,
-    SSPM_IMAGE_MAJOR_TYPE,
-    SSPM_AUDIO_MAJOR_TYPE,
-    SSPM_VIDEO_MAJOR_TYPE,
-    SSPM_APPLICATION_MAJOR_TYPE,
-    SSPM_MULTIPART_MAJOR_TYPE,
-    SSPM_MESSAGE_MAJOR_TYPE,
-    SSPM_UNKNOWN_MAJOR_TYPE
-};
-
-enum sspm_minor_type {
-    SSPM_NO_MINOR_TYPE,
-    SSPM_ANY_MINOR_TYPE,
-    SSPM_PLAIN_MINOR_TYPE,
-    SSPM_RFC822_MINOR_TYPE,
-    SSPM_DIGEST_MINOR_TYPE,
-    SSPM_CALENDAR_MINOR_TYPE,
-    SSPM_MIXED_MINOR_TYPE,
-    SSPM_RELATED_MINOR_TYPE,
-    SSPM_ALTERNATIVE_MINOR_TYPE,
-    SSPM_PARALLEL_MINOR_TYPE,
-    SSPM_UNKNOWN_MINOR_TYPE
-};
-
-enum sspm_encoding {
-    SSPM_NO_ENCODING,
-    SSPM_QUOTED_PRINTABLE_ENCODING,
-    SSPM_8BIT_ENCODING,
-    SSPM_7BIT_ENCODING,
-    SSPM_BINARY_ENCODING,
-    SSPM_BASE64_ENCODING,
-    SSPM_UNKNOWN_ENCODING
-};
-
-enum sspm_error{
-    SSPM_NO_ERROR,
-    SSPM_UNEXPECTED_BOUNDARY_ERROR,
-    SSPM_WRONG_BOUNDARY_ERROR,
-    SSPM_NO_BOUNDARY_ERROR,
-    SSPM_NO_HEADER_ERROR,
-    SSPM_MALFORMED_HEADER_ERROR
-};
-
-
-struct sspm_header
-{
-	int def;
-	char* boundary;
-	enum sspm_major_type major;
-	enum sspm_minor_type minor;
-	char *minor_text;
-	char ** content_type_params;
-	char* charset;
-	enum sspm_encoding encoding;
-	char* filename;
-	char* content_id;
-	enum sspm_error error;
-	char* error_text;
-};
-
-struct sspm_part {
-	struct sspm_header header;
-	int level;
-	size_t data_size;
-	void *data;
-};
-
-struct sspm_action_map {
-	enum sspm_major_type major;
-	enum sspm_minor_type minor;
-	void* (*new_part)();
-	void (*add_line)(void *part, struct sspm_header *header, 
-			 char* line, size_t size);
-	void* (*end_part)(void* part);
-	void (*free_part)(void *part);
-};
-
-char* sspm_major_type_string(enum sspm_major_type type);
-char* sspm_minor_type_string(enum sspm_minor_type type);
-char* sspm_encoding_string(enum sspm_encoding type);
-
-int sspm_parse_mime(struct sspm_part *parts, 
-		    size_t max_parts,
-		    struct sspm_action_map *actions,
-		    char* (*get_string)(char *s, size_t size, void* data),
-		    void *get_string_data,
-		    struct sspm_header *first_header
-    );
-
-void sspm_free_parts(struct sspm_part *parts, size_t max_parts);
-
-char *decode_quoted_printable(char *dest, 
-				       char *src,
-				       size_t *size);
-char *decode_base64(char *dest, 
-			     char *src,
-			     size_t *size);
-
-
-int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
-		    char **output_string, char* header);
-
-#endif /*SSPM_H*/
diff --git a/libical/src/libical/vsnprintf.c b/libical/src/libical/vsnprintf.c
deleted file mode 100644
index 6339183dd4..0000000000
--- a/libical/src/libical/vsnprintf.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifdef __osf__
-/*
- * Revision 12: http://theos.com/~deraadt/snprintf.c
- *
- * Copyright (c) 1997 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#include <setjmp.h>
-
-#ifndef roundup
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-#endif
-
-static int pgsize;
-static char *curobj;
-static sigjmp_buf bail;
-
-#define EXTRABYTES	2	/* XXX: why 2? you don't want to know */
-
-static char *
-msetup(str, n)
-	char *str;
-	size_t n;
-{
-	char *e;
-
-	if (n == 0)
-		return NULL;
-	if (pgsize == 0)
-		pgsize = getpagesize();
-	curobj = (char *)malloc(n + EXTRABYTES + pgsize * 2);
-	if (curobj == NULL)
-		return NULL;
-	e = curobj + n + EXTRABYTES;
-	e = (char *)roundup((unsigned long)e, pgsize);
-	if (mprotect(e, pgsize, PROT_NONE) == -1) {
-		free(curobj);
-		curobj = NULL;
-		return NULL;
-	}
-	e = e - n - EXTRABYTES;
-	*e = '\0';
-	return (e);
-}
-
-static void
-mcatch(int i)
-{
-	siglongjmp(bail, 1);
-}
-
-static void
-mcleanup(str, n, p)
-	char *str;
-	size_t n;
-	char *p;
-{
-	strncpy(str, p, n-1);
-	str[n-1] = '\0';
-	if (mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
-	    PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
-		mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
-		    PROT_READ|PROT_WRITE);
-	free(curobj);
-}
-
-int
-#if __STDC__
-vsnprintf(char *str, size_t n, char const *fmt, va_list ap)
-#else
-vsnprintf(str, n, fmt, ap)
-	char *str;
-	size_t n;
-	char *fmt;
-	char *ap;
-#endif
-{
-	struct sigaction osa, nsa;
-	char *p;
-	int ret = n + 1;	/* if we bail, indicated we overflowed */
-
-	memset(&nsa, 0, sizeof nsa);
-	nsa.sa_handler = mcatch;
-	sigemptyset(&nsa.sa_mask);
-
-	p = msetup(str, n);
-	if (p == NULL) {
-		*str = '\0';
-		return 0;
-	}
-	if (sigsetjmp(bail, 1) == 0) {
-		if (sigaction(SIGSEGV, &nsa, &osa) == -1) {
-			mcleanup(str, n, p);
-			return (0);
-		}
-		ret = vsprintf(p, fmt, ap);
-	}
-	mcleanup(str, n, p);
-	(void) sigaction(SIGSEGV, &osa, NULL);
-	return (ret);
-}
-
-int
-#if __STDC__
-snprintf(char *str, size_t n, char const *fmt, ...)
-#else
-snprintf(str, n, fmt, va_alist)
-	char *str;
-	size_t n;
-	char *fmt;
-	va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-
-	return (vsnprintf(str, n, fmt, ap));
-	va_end(ap);
-}
-
-
-#else
-
-/* ANSI C forbids an empty source file... */
-
-static void vsnprintf_dummy_func() {
-   vsnprintf_dummy_func();
-}
-
-#endif
diff --git a/libical/src/libicalss/.cvsignore b/libical/src/libicalss/.cvsignore
deleted file mode 100644
index 732c1577b6..0000000000
--- a/libical/src/libicalss/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-.deps
-Makefile.in
-*.lo
-*.la
-.libs
\ No newline at end of file
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
deleted file mode 100644
index 732d970738..0000000000
--- a/libical/src/libicalss/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-lib_LTLIBRARIES = libicalss.la
-
-YFLAGS =-d -v -p ss
-LFLAGS = -Pss 
-LEX_OUTPUT_ROOT = lex.ss
-
-all: icalss.h
-
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
-	-I$(top_srcdir)/src/libical	\
-	-I$(srcdir)/libical
-
-libicalss_la_LDFLAGS = -version-info 0:0:0
-
-libicalss_la_SOURCES =		\
-	icalclassify.c		\
-	icalgauge.c		\
-	icalgaugeimpl.h		\
-	icaldirset.c		\
-	icaldirsetimpl.h	\
-	icalfileset.c		\
-	icalfilesetimpl.h	\
-	icalset.c		\
-	icalsslexer.l		\
-	icalssutil.c		\
-	icalssyacc.h		\
-	icalssyacc.y		\
-	icalspanlist.c		\
-	icalmessage.c		\
-	icalcstp.c
-
-libicalssincludedir = $(includedir)
-
-COMBINEDHEADERS = \
-        icalgauge.h \
-        icalset.h \
-        icalfileset.h \
-        icaldirset.h \
-        icalcalendar.h  \
-        icalssutil.h \
-        icalclassify.h \
-	icalspanlist.h	\
-	icalmessage.h \
-	icalcstp.h
-
-icalss.h: $(COMBINEDHEADERS)
-	cat $(COMBINEDHEADERS) | egrep -v "#include.*\"ical" \
-	| egrep -v "#include.*\"pvl\.h\"" > icalss.h
-
-
-libicalssinclude_HEADERS = icalss.h
-
-CONFIG_CLEAN_FILES = y.output
-
-EXTRA_DIST =			\
-	$(COMBINEDHEADERS)	\
diff --git a/libical/src/libicalss/icalcalendar.c b/libical/src/libicalss/icalcalendar.c
deleted file mode 100644
index e63b5330ad..0000000000
--- a/libical/src/libicalss/icalcalendar.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*======================================================================
-  FILE: icalcalendar.c
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "icalcalendar.h"
-#include "icalset.h"
-#include "icalfileset.h"
-#include "icaldirset.h"
-#include <limits.h> 
-#include <sys/stat.h> /* For mkdir, stat */
-#include <sys/types.h> /* For mkdir */
-#include <fcntl.h> /* For mkdir */
-#include <unistd.h>  /* For mkdir, stat */    
-#include <stdlib.h> /* for malloc */
-#include <string.h> /* for strcat */
-#include <errno.h>
-
-#define BOOKED_DIR "booked"
-#define INCOMING_FILE "incoming.ics"
-#define PROP_FILE "properties.ics"
-#define FBLIST_FILE "freebusy.ics"
-
-struct icalcalendar_impl 
-{
-	char* dir;
-	icalcomponent* freebusy;
-	icalcomponent* properties;
-	icalset* booked;
-	icalset* incoming;
-};
-
-struct icalcalendar_impl* icalcalendar_new_impl()
-{
-    struct icalcalendar_impl* impl;
-
-    if ( ( impl = (struct icalcalendar_impl*)
-	   malloc(sizeof(struct icalcalendar_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    return impl;
-}
-
-
-icalerrorenum icalcalendar_create(struct icalcalendar_impl* impl)
-{
-    char path[PATH_MAX];
-    struct stat sbuf;
-    int r;
-    
-    icalerror_check_arg_re((impl != 0),"impl",ICAL_BADARG_ERROR);
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,BOOKED_DIR);
-
-    r = stat(path,&sbuf);
-
-    if( r != 0 && errno == ENOENT){
-
-	if(mkdir(path,0777)!=0){
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return ICAL_FILE_ERROR;
-	}
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-icalcalendar* icalcalendar_new(char* dir)
-{
-    struct icalcalendar_impl* impl;
-
-    icalerror_check_arg_rz((dir != 0),"dir");
-    
-    impl = icalcalendar_new_impl();
-
-    if (impl == 0){
-	return 0;
-    }
-
-    impl->dir = (char*)strdup(dir);
-    impl->freebusy = 0;
-    impl->properties = 0;
-    impl->booked = 0;
-    impl->incoming = 0;
-
-    if (icalcalendar_create(impl) != ICAL_NO_ERROR){
-	free(impl);
-	return 0;
-    }
-
-    return impl;
-}
-
-void icalcalendar_free(icalcalendar* calendar)
-{
-
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-        
-    if (impl->dir !=0){
-	free(impl->dir);
-    }
-
-    if (impl->freebusy !=0){
-	icalfileset_free(impl->freebusy);
-    }
-
-    if (impl->properties !=0){
-	icalfileset_free(impl->properties);
-    }
-
-    if (impl->booked !=0){
-	icaldirset_free(impl->booked);
-    }
-
-    if (impl->incoming !=0){
-	icaldirset_free(impl->incoming);
-    }
-
-    impl->dir = 0;
-    impl->freebusy = 0;
-    impl->properties = 0;
-    impl->booked = 0;
-    impl->incoming = 0;
-
-
-    free(impl);
-}
-
-
-int icalcalendar_lock(icalcalendar* calendar)
-{
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_unlock(icalcalendar* calendar)
-{
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_islocked(icalcalendar* calendar)
-{
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_ownlock(icalcalendar* calendar)
-{
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-icalset* icalcalendar_get_booked(icalcalendar* calendar)
-{
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    char dir[PATH_MAX];
-
-    icalerror_check_arg_rz((impl != 0),"impl");
-    
-    dir[0] = '\0';
-    strcpy(dir,impl->dir);
-    strcat(dir,"/");
-    strcat(dir,BOOKED_DIR);
-
-    if (impl->booked == 0){
-	icalerror_clear_errno();
-	impl->booked = icaldirset_new(dir);
-	assert(icalerrno == ICAL_NO_ERROR);
-    }
-
-    return impl->booked;
-
-}
-
-icalset* icalcalendar_get_incoming(icalcalendar* calendar)
-{
-    char path[PATH_MAX];
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,INCOMING_FILE);
-
-    if (impl->properties == 0){
-	impl->properties = icalfileset_new(path);
-    }
-
-    return impl->properties;
-}
-
-icalset* icalcalendar_get_properties(icalcalendar* calendar)
-{
-    char path[PATH_MAX];
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,PROP_FILE);
-
-    if (impl->properties == 0){
-	impl->properties = icalfileset_new(path);
-    }
-
-    return impl->properties;
-}
-
-icalset* icalcalendar_get_freebusy(icalcalendar* calendar)
-{
-    char path[PATH_MAX];
-    struct icalcalendar_impl *impl = (struct icalcalendar_impl*)calendar;
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,FBLIST_FILE);
-
-
-    if (impl->freebusy == 0){
-	impl->freebusy = icalfileset_new(path);
-    }
-
-    return impl->freebusy;
-}
-
-
-
-
diff --git a/libical/src/libicalss/icalcalendar.h b/libical/src/libicalss/icalcalendar.h
deleted file mode 100644
index f07457c60d..0000000000
--- a/libical/src/libicalss/icalcalendar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcalendar.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALCALENDAR_H
-#define ICALCALENDAR_H
-
-#include "ical.h"
-#include "icalset.h"
-
-/* icalcalendar
- * Routines for storing calendar data in a file system. The calendar 
- * has two icaldirsets, one for incoming components and one for booked
- * components. It also has interfaces to access the free/busy list
- * and a list of calendar properties */
-
-typedef  void icalcalendar;
-
-icalcalendar* icalcalendar_new(char* dir);
-
-void icalcalendar_free(icalcalendar* calendar);
-
-int icalcalendar_lock(icalcalendar* calendar);
-
-int icalcalendar_unlock(icalcalendar* calendar);
-
-int icalcalendar_islocked(icalcalendar* calendar);
-
-int icalcalendar_ownlock(icalcalendar* calendar);
-
-icalset* icalcalendar_get_booked(icalcalendar* calendar);
-
-icalset* icalcalendar_get_incoming(icalcalendar* calendar);
-
-icalset* icalcalendar_get_properties(icalcalendar* calendar);
-
-icalset* icalcalendar_get_freebusy(icalcalendar* calendar);
-
-
-#endif /* !ICALCALENDAR_H */
-
-
-
diff --git a/libical/src/libicalss/icalclassify.c b/libical/src/libicalss/icalclassify.c
deleted file mode 100644
index 89761d8120..0000000000
--- a/libical/src/libicalss/icalclassify.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalclassify.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ical.h"
-#include "icalclassify.h"
-#include "icalmemory.h"
-#include <ctype.h>   /* For tolower() */
-#include <string.h> /* for index() */
-#include <stdlib.h> /* for malloc and free */
-
-
-
-struct icalclassify_parts {
-	icalcomponent *c;
-	icalproperty_method method;
-	char* organizer;
-	icalparameter_partstat reply_partstat;
-	char* reply_attendee;
-	char* uid;
-	int sequence;
-	struct icaltimetype dtstamp;	
-	struct icaltimetype recurrence_id;
-}; 
-	
-
-char* icalclassify_lowercase(const char* str)
-{
-    char* p = 0;
-    char* new = icalmemory_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-/* Return a set of components that intersect in time with comp. For
-component X and Y to intersect:
-    X.DTSTART < Y.DTEND && X.DTEND > Y.DTSTART
-*/
-
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp)
-{
-    icalcomponent *return_set;
-    icalcomponent *c;
-    struct icaltime_span span,compspan;
-    
-    icalerror_clear_errno();
-    compspan = icalcomponent_get_span(comp);
-
-    if(icalerrno != ICAL_NO_ERROR){
-	return 0;
-    }
-
-
-    return_set = icalcomponent_new(ICAL_XROOT_COMPONENT);
-
-    for(c = icalset_get_first_component(set);
-	c != 0;
-	c = icalset_get_next_component(set)){
-
-	icalerror_clear_errno();
-
-	span = icalcomponent_get_span(c);
-
-	if(icalerrno != ICAL_NO_ERROR){
-	    continue;
-	}
-
-	if (compspan.start < span.end && 
-	    compspan.end > span.start){
-
-	    icalcomponent *clone = icalcomponent_new_clone(c);
-
-	    icalcomponent_add_component(return_set,clone);
-	}	
-    }
-
-    if(icalcomponent_count_components(return_set,ICAL_ANY_COMPONENT) !=0){
-	return return_set;
-    } else {
-	icalcomponent_free(return_set);
-	return 0;
-    }
-}
-
-
-
-icalparameter_partstat icalclassify_find_attendee(icalcomponent *c, 
-						  const char* attendee)
-{
-    icalproperty *p;
-    char* lattendee = icalclassify_lowercase(attendee);
-    char* upn =  strchr(lattendee,':');
-    icalcomponent *inner = icalcomponent_get_first_real_component(c);
-
-    for(p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p  = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY))
-    {
-	const char* this_attendee
-	    = icalclassify_lowercase(icalproperty_get_attendee(p));
-	char* this_upn = strchr(this_attendee,':');
-
-	if(strcmp(this_upn,upn)==0){
-
-	    icalparameter *param = icalproperty_get_first_parameter(p,
-					    ICAL_PARTSTAT_PARAMETER);
-	    if (param != 0){
-		free(lattendee);
-		free((void*)this_attendee);
-		return icalparameter_get_partstat(param);
-	    }
-
-	}
-
-    }
-
-    free(lattendee);
-    return ICAL_PARTSTAT_NONE;
-
-}
-
-void icalssutil_free_parts(struct icalclassify_parts *parts)
-{
-    if(parts == 0){
-	return;
-    }
-
-    if(parts->organizer != 0){
-	free(parts->organizer);
-    }
-
-    if(parts->uid != 0){
-	free(parts->uid);
-    }
-
-    if(parts->reply_attendee){
-	free(parts->reply_attendee);
-    }
-}
-
-void icalssutil_get_parts(icalcomponent* c,  
-			  struct icalclassify_parts* parts)
-{
-    icalproperty *p;
-    icalcomponent *inner;
-
-    memset(parts,0,sizeof(struct icalclassify_parts));
-
-    parts->method = ICAL_METHOD_NONE;
-    parts->sequence = 0;
-    parts->reply_partstat = ICAL_PARTSTAT_NONE;
-
-    if(c == 0){
-	return;
-    }
-
-    parts->c = c;
-
-    p = icalcomponent_get_first_property(c,ICAL_METHOD_PROPERTY);
-    if(p!=0){
-	parts->method = icalproperty_get_method(p);
-    }
-
-    inner = icalcomponent_get_first_real_component(c);
-
-    p = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-    if(p!=0){
-	parts->organizer = strdup(icalproperty_get_organizer(p));
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_SEQUENCE_PROPERTY);    
-    if(p!=0){
-	parts->sequence = icalproperty_get_sequence(p);
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-    if(p!=0){
-	parts->uid = strdup(icalproperty_get_uid(p));
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_RECURRENCEID_PROPERTY);
-    if(p!=0){
-	parts->recurrence_id = icalproperty_get_recurrenceid(p);
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
-    if(p!=0){
-	parts->dtstamp = icalproperty_get_dtstamp(p);
-    }
-
-    if(parts->method==ICAL_METHOD_REPLY){
-	icalparameter *param;
-	p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-
-	if(p!=0){
-
-	    param = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
-	    
-	    if(param != 0){
-		parts->reply_partstat = 
-		    icalparameter_get_partstat(param);
-	    }
-	    
-	    parts->reply_attendee = strdup(icalproperty_get_attendee(p));
-	}
-
-    }    
-
-
-}
-
-
-int icalssutil_is_rescheduled(icalcomponent* a,icalcomponent* b)
-{
-    icalproperty *p1,*p2;
-    icalcomponent *i1,*i2;
-    int i;
-
-    icalproperty_kind kind_array[] = {
-	ICAL_DTSTART_PROPERTY,
-	ICAL_DTEND_PROPERTY,
-	ICAL_DURATION_PROPERTY,
-	ICAL_DUE_PROPERTY,
-	ICAL_RRULE_PROPERTY,
-	ICAL_RDATE_PROPERTY,
-	ICAL_EXRULE_PROPERTY,
-	ICAL_EXDATE_PROPERTY,
-	ICAL_NO_PROPERTY
-    };
-
-    i1 = icalcomponent_get_first_real_component(a);
-    i2 = icalcomponent_get_first_real_component(b);
-
-    for(i =0; kind_array[i] != ICAL_NO_PROPERTY; i++){
-	p1 = icalcomponent_get_first_property(i1,kind_array[i]);
-	p2 = icalcomponent_get_first_property(i2,kind_array[i]);
-	
-	if( (p1!=0)^(p1!=0) ){
-	    /* Return true if the property exists in one component and not
-	       the other */
-	    return 1;
-	}
-	
-	if(p1 && strcmp(icalproperty_as_ical_string(p1),
-			icalproperty_as_ical_string(p2)) != 0){
-	    return 1;
-	}
-    }
-
-    return 0;
-    
-}
-
-#define icalclassify_pre \
-    int rtrn =0; 
-
-#define icalclassify_post \
-    return rtrn;
-
-
-int icalclassify_publish_new(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-	match == 0){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-int icalclassify_publish_update(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-	match !=0 ){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-int icalclassify_publish_freebusy(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-	match == 0){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-
-int icalclassify_request_new(struct icalclassify_parts *comp, 
-				    struct icalclassify_parts *match, 
-				    const char* user)
-{
-    /* Method is  REQUEST, and there is no match */
-
-    icalclassify_pre
-
-    if(match->c==0 && comp->method == ICAL_METHOD_REQUEST){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_update(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /* REQUEST method, Higher SEQUENCE than match, and all
-       time-related properties are unchanged */
-    
-    icalclassify_pre
-
-    if (match != 0 &&
-	comp->sequence >= match->sequence &&
-	!icalssutil_is_rescheduled(comp->c,match->c)){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_reschedule(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /* REQUEST method, Higher SEQUENCE than match, and one or more
-       time-related properties are changed */
-    icalclassify_pre
-
-    if (match->c != 0 &&
-	comp->sequence > match->sequence &&
-	icalssutil_is_rescheduled(comp->c,match->c)){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_delegate(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-
-    if (match->c != 0 &&
-	comp->sequence > match->sequence &&
-	icalssutil_is_rescheduled(comp->c,match->c)){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_new_organizer(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /*   Organizer has changed between match and component */
-    icalclassify_pre
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_status(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalclassify_post
-}
-
-int icalclassify_request_forward(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalclassify_post
-}
-
-int icalclassify_request_freebusy(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalclassify_post
-}
-
-int icalclassify_reply_accept(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalparameter_partstat partstat;
-    icalclassify_pre;
-
-    partstat = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(partstat != ICAL_PARTSTAT_NONE &&
-       comp->reply_partstat == ICAL_PARTSTAT_ACCEPTED){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-}
-int icalclassify_reply_decline(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalparameter_partstat partstat;
-    icalclassify_pre;
-
-
-    partstat = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(partstat != ICAL_PARTSTAT_NONE &&
-       comp->reply_partstat == ICAL_PARTSTAT_DECLINED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_reply_crasher_accept(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalparameter_partstat partstat;
-    icalclassify_pre;
-
-
-    partstat = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(partstat == ICAL_PARTSTAT_NONE &&
-       comp->reply_partstat == ICAL_PARTSTAT_ACCEPTED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_reply_crasher_decline(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalparameter_partstat partstat;
-    icalclassify_pre;
-
-
-    partstat = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(partstat == ICAL_PARTSTAT_NONE &&
-       comp->reply_partstat == ICAL_PARTSTAT_DECLINED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_add_instance(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_ADD){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_event(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_instance(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_all(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_refesh(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_REFRESH){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_counter(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_COUNTER){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_delinecounter(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-
-    if(comp->method == ICAL_METHOD_DECLINECOUNTER){
-	rtrn = 1;
-    }
-	
-    icalclassify_post
-}
-
-struct icalclassify_map {
-	icalproperty_method method;
-	int (*fn)(struct icalclassify_parts *comp,struct icalclassify_parts *match, const char* user);
-	ical_class class;
-} icalclassify_map[] = 
-{ {ICAL_METHOD_PUBLISH,icalclassify_publish_new,ICAL_PUBLISH_NEW_CLASS},
- {ICAL_METHOD_PUBLISH,icalclassify_publish_update,ICAL_PUBLISH_UPDATE_CLASS},
- {ICAL_METHOD_PUBLISH,icalclassify_publish_freebusy,ICAL_PUBLISH_FREEBUSY_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_new,ICAL_REQUEST_NEW_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_update,ICAL_REQUEST_UPDATE_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_reschedule,ICAL_REQUEST_RESCHEDULE_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_delegate,ICAL_REQUEST_DELEGATE_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_new_organizer,ICAL_REQUEST_NEW_ORGANIZER_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_forward,ICAL_REQUEST_FORWARD_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_status,ICAL_REQUEST_STATUS_CLASS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_freebusy,ICAL_REQUEST_FREEBUSY_CLASS},
-
-  {ICAL_METHOD_REPLY,icalclassify_reply_accept,ICAL_REPLY_ACCEPT_CLASS},
-  {ICAL_METHOD_REPLY,icalclassify_reply_decline,ICAL_REPLY_DECLINE_CLASS},
-  {ICAL_METHOD_REPLY,icalclassify_reply_crasher_accept,ICAL_REPLY_CRASHER_ACCEPT_CLASS},
-  {ICAL_METHOD_REPLY,icalclassify_reply_crasher_decline,ICAL_REPLY_CRASHER_DECLINE_CLASS},
-
-  {ICAL_METHOD_ADD,icalclassify_add_instance,ICAL_ADD_INSTANCE_CLASS},
-
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_event,ICAL_CANCEL_EVENT_CLASS},
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_instance,ICAL_CANCEL_INSTANCE_CLASS},
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_all,ICAL_CANCEL_ALL_CLASS},
-
-  {ICAL_METHOD_REFRESH,icalclassify_refesh,ICAL_REFRESH_CLASS},
-  {ICAL_METHOD_COUNTER,icalclassify_counter,ICAL_COUNTER_CLASS},
-  {ICAL_METHOD_DECLINECOUNTER,icalclassify_delinecounter,ICAL_DECLINECOUNTER_CLASS},
-  {ICAL_METHOD_NONE,0,ICAL_NO_CLASS}
-};
-
-
-ical_class icalclassify(icalcomponent* c,icalcomponent* match, 
-			      const char* user)
-{
-    icalcomponent *inner;
-    icalproperty *p;
-    icalproperty_method method;
-    ical_class class = ICAL_UNKNOWN_CLASS;
-
-    int i;
-
-    struct icalclassify_parts comp_parts;
-    struct icalclassify_parts match_parts;
-
-    inner = icalcomponent_get_first_real_component(c);
-    
-    if (inner == 0) {
-	return ICAL_NO_CLASS;
-    }
-
-    icalssutil_get_parts(c,&comp_parts);
-    icalssutil_get_parts(match,&match_parts);
-
-    /* Determine if the incoming component is obsoleted by the match */
-    if(match != 0 && (
-	comp_parts.method == ICAL_METHOD_REQUEST
-	)){
-	assert ( ! ((comp_parts.dtstamp.is_utc==1)^
-		    (match_parts.dtstamp.is_utc==1)));
-
-	if( comp_parts.sequence<match_parts.sequence &&
-	    icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)>0)
-	{
-	    /* comp has a smaller sequence and a later DTSTAMP */
-	    return ICAL_MISSEQUENCED_CLASS;
-	}
-
-	if( (comp_parts.sequence<match_parts.sequence )
-	     /*&&icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)<=0*/
-	     ||
-	   ( comp_parts.sequence == match_parts.sequence &&
-	     icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)<=0)){
-
-	    return ICAL_OBSOLETE_CLASS;
-	}
-
-    }
-
-    p = icalcomponent_get_first_property(c,ICAL_METHOD_PROPERTY);
-    if (p == 0) {
-	return ICAL_UNKNOWN_CLASS;
-    }
-    method = icalproperty_get_method(p);
-
-    for (i =0; icalclassify_map[i].method != ICAL_METHOD_NONE; i++){
-	if(icalclassify_map[i].method == method){
-	    if( (*(icalclassify_map[i].fn))(&comp_parts,&match_parts,user)==1){
-		class = icalclassify_map[i].class;
-		break;
-	    }
-	}
-    }
-
-    icalssutil_free_parts(&comp_parts); 
-    icalssutil_free_parts(&match_parts);
-
-    return class;
-
-}
diff --git a/libical/src/libicalss/icalclassify.h b/libical/src/libicalss/icalclassify.h
deleted file mode 100644
index ae76434378..0000000000
--- a/libical/src/libicalss/icalclassify.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalclassify.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#ifndef ICALCLASSIFY_H
-#define ICALCLASSIFY_H
-
-#include "ical.h"
-#include "icalset.h"
-
-
-typedef enum icalclass {
-    ICAL_NO_CLASS,
-    ICAL_PUBLISH_NEW_CLASS,
-    ICAL_PUBLISH_UPDATE_CLASS,
-    ICAL_PUBLISH_FREEBUSY_CLASS,
-    ICAL_REQUEST_NEW_CLASS,
-    ICAL_REQUEST_UPDATE_CLASS,
-    ICAL_REQUEST_RESCHEDULE_CLASS,
-    ICAL_REQUEST_DELEGATE_CLASS,
-    ICAL_REQUEST_NEW_ORGANIZER_CLASS,
-    ICAL_REQUEST_FORWARD_CLASS,
-    ICAL_REQUEST_STATUS_CLASS,
-    ICAL_REQUEST_FREEBUSY_CLASS,
-    ICAL_REPLY_ACCEPT_CLASS,
-    ICAL_REPLY_DECLINE_CLASS,
-    ICAL_REPLY_CRASHER_ACCEPT_CLASS,
-    ICAL_REPLY_CRASHER_DECLINE_CLASS,
-    ICAL_ADD_INSTANCE_CLASS,
-    ICAL_CANCEL_EVENT_CLASS,
-    ICAL_CANCEL_INSTANCE_CLASS,
-    ICAL_CANCEL_ALL_CLASS,
-    ICAL_REFRESH_CLASS,
-    ICAL_COUNTER_CLASS,
-    ICAL_DECLINECOUNTER_CLASS,
-    ICAL_MALFORMED_CLASS, 
-    ICAL_OBSOLETE_CLASS, /* 21 */
-    ICAL_MISSEQUENCED_CLASS, /* 22 */
-    ICAL_UNKNOWN_CLASS /* 23 */
-} ical_class;
-
-ical_class icalclassify(icalcomponent* c,icalcomponent* match, 
-			      const char* user);
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp);
-
-#endif /* ICALCLASSIFY_H*/
-
-
-				    
-
-
diff --git a/libical/src/libicalss/icalcomponent.h b/libical/src/libicalss/icalcomponent.h
deleted file mode 100644
index 9e0e9f5a9f..0000000000
--- a/libical/src/libicalss/icalcomponent.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcomponent.h
- CREATOR: eric 20 March 1999
-
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalcomponent.h
-
-======================================================================*/
-
-#ifndef ICALCOMPONENT_H
-#define ICALCOMPONENT_H
-
-#include "icalproperty.h"
-#include "icalvalue.h"
-#include "icalenums.h" /* defines icalcomponent_kind */
-
-typedef void icalcomponent;
-
-icalcomponent* icalcomponent_new(icalcomponent_kind kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-icalcomponent* icalcomponent_vanew(icalcomponent_kind kind, ...);
-void icalcomponent_free(icalcomponent* component);
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-int icalcomponent_is_valid(icalcomponent* component);
-
-icalcomponent_kind icalcomponent_isa(icalcomponent* component);
-
-int icalcomponent_isa_component (void* component);
-
-/* 
- * Working with properties
- */
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-int icalcomponent_count_properties(icalcomponent* component,
-				   icalproperty_kind kind);
-
-/* Iterate through the properties */
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      icalproperty_kind kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      icalproperty_kind kind);
-
-/* Return a null-terminated array of icalproperties*/
-
-icalproperty** icalcomponent_get_properties(icalcomponent* component,
-					      icalproperty_kind kind);
-
-
-/* 
- * Working with components
- */ 
-
-
-void icalcomponent_add_component(icalcomponent* parent,
-				icalcomponent* child);
-
-void icalcomponent_remove_component(icalcomponent* parent,
-				icalcomponent* child);
-
-int icalcomponent_count_components(icalcomponent* component,
-				   icalcomponent_kind kind);
-
-/* Iterate through components */
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-
-/* Return a null-terminated array of icalproperties*/
-icalproperty** icalcomponent_get_component(icalcomponent* component,
-					      icalproperty_kind kind);
-
-/* Working with embedded error properties */
-
-int icalcomponent_count_errors(icalcomponent* component);
-void icalcomponent_strip_errors(icalcomponent* component);
-
-
-/* Internal operations. You don't see these... */
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-void icalcomponent_set_parent(icalcomponent* component, 
-			      icalcomponent* parent);
-
-#endif /* !ICALCOMPONENT_H */
-
-
-
diff --git a/libical/src/libicalss/icalcsdb.h b/libical/src/libicalss/icalcsdb.h
deleted file mode 100644
index 4619b94fd0..0000000000
--- a/libical/src/libicalss/icalcsdb.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcsdb.h Calendar Server Database
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-
-#ifndef ICALCSDB_H
-#define ICALCSDB_H
-
-#include "ical.h"
-
-typedef void icalcsdb;
-
-icalcsdb* icalcsdb_new(char* path);
-
-void icalcsdb_free(icalcsdb* csdb);
-
-icalerrorenum icalcsdb_create(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsdb_delete(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsdb_move(icalcsdb* db, char* oldcalid, char* newcalid);
-
-icalerrorenum icalcsdb_noop(icalcsdb* db);
-
-char* icalcsdb_generateuid(icalcsdb* db);
-
-icalcomponent* icalcsdb_expand_upn(icalcsdb* db, char* upn);
-icalcomponent* icalcsdb_expand_calid(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsbd_senddata(icalcsdb* db, icalcomponent* comp);
-
-icalset* icalcsdb_get_calendar(icalcsdb* db, char* calid, 
-			       icalcomponent *gauge);
-
-icalset* icalcsdb_get_vcars(icalcsdb* db);
-
-icalset* icalcsdb_get_properties(icalcsdb* db);
-
-icalset* icalcsdb_get_capabilities(icalcsdb* db);
-
-icalset* icalcsdb_get_timezones(icalcsdb* db);
-
-
-#endif /* !ICALCSDB_H */
-
-
-
diff --git a/libical/src/libicalss/icalcstp.c b/libical/src/libicalss/icalcstp.c
deleted file mode 100644
index 53ee7bdeef..0000000000
--- a/libical/src/libicalss/icalcstp.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalcstps.c
-    CREATOR: ebusboom 23 Jun 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ical.h"
-#include "icalcstp.h"
-#include "pvl.h" 
-
-#include <sys/types.h> /* For send(), others */
-#include <sys/socket.h>  /* For send(), others. */
-#include <unistd.h> /* For alarm */
-#include <errno.h>
-#include <stdlib.h> /* for malloc */
-#include <string.h>
-
-enum cstps_state {
-    NO_STATE,
-    CONNECTED,
-    AUTHENTICATED,
-    IDENTIFIED,
-    DISCONNECTED,
-    RECEIVE,
-};
-
-struct icalcstps_impl {
-	int timeout;
-	icalparser *parser;
-	enum cstps_state major_state;
-	struct icalcstps_stubs stubs;
-};
-
-
-enum cstp_command {
-    ABORT,
-    AUTHENTICATE,
-    CAPABILITY,
-    CONTINUE,
-    EXPANDCALID,
-    IDENTIFY,
-    DISCONNECT,
-    SENDDATA,
-    STARTTLS,
-    EXPANDUPN,
-    COMMAND_COMPLETE,
-    UNKNOWN
-};
-
-struct command_map {
-	enum cstp_command command;
-	char *str;
-} command_map[] = 
-{
-    {ABORT,"ABORT"},
-    {AUTHENTICATE,"AUTHENTICATE"},
-    {CAPABILITY,"CAPABILITY"},
-    {CONTINUE,"CONTINUE"},
-    {EXPANDCALID,"EXPANDCALID"},
-    {IDENTIFY,"IDENTIFY"},
-    {DISCONNECT,"DISCONNECT"},
-    {SENDDATA,"SENDDATA"},
-    {STARTTLS,"STARTTLS"},
-    {EXPANDUPN,"EXPANDUPN"},
-    {UNKNOWN,"UNKNOWN"}
-};
-
-
-
-/* This state machine is a Mealy-type: actions occur on the
-   transitions, not in the states.
-   
-   Here is the state machine diagram from the CAP draft:
-
-
-        STARTTLS /
-        CAPABILITY
-       +-------+
-       |       |                       +---------------+
-       |   +-----------+ AUTHENTICATE  |               |
-       +-->| Connected |-------------->| Authenticated |
-           +-----------+               |               |
-             |                         +---------------+
-             |                              |
-             |                              |
-             |                              |
-             |                              |       +-----+ STARTTLS /
-             |                              V       |     | CAPABILITY /
-             |                         +---------------+  | IDENTIFY
-             |                         |               |<-+
-             |                         |   Identified  |<----+
-             |                +--------|               |     |
-             |                |        +---------------+     | command
-             |                |             |                | completes
-             V                |DISCONNECT   |                |
-           +--------------+   |             |SENDDATA        |
-           | Disconnected |<--+             |                |
-           +--------------+                 |                | ABORT
-                     A                      |                |
-                     |                      V                |
-                     |     DISCONNECT     +---------------+  |
-                     +--------------------|    Receive    |--+
-                                          |               |<--+
-                                          +---------------+   |
-                                                         |    | CONTINUTE
-                                                         +----+
-
-   In this implmenetation, the transition from CONNECTED to IDENTIFIED
-   is non-standard. The spec specifies that on the ATHENTICATE
-   command, the machine transitions from CONNECTED to AUTHENTICATED,
-   and then immediately goes to IDENTIFIED. This makes AUTHENTICATED a
-   useless state, so I removed it */
-
-struct state_table {
-	enum cstps_state major_state;
-	enum cstp_command command;
-	void (*action)();
-	enum cstps_state next_state;
-
-} server_state_table[] = 
-{
-    { CONNECTED, CAPABILITY , 0, CONNECTED},
-    { CONNECTED, AUTHENTICATE , 0,  IDENTIFIED}, /* Non-standard */
-    { IDENTIFIED, STARTTLS, 0, IDENTIFIED},
-    { IDENTIFIED, IDENTIFY, 0, IDENTIFIED},
-    { IDENTIFIED, CAPABILITY, 0, IDENTIFIED},
-    { IDENTIFIED, SENDDATA, 0, RECEIVE},
-    { IDENTIFIED, DISCONNECT, 0, DISCONNECTED},
-    { DISCONNECTED, 0, 0, 0},
-    { RECEIVE,  DISCONNECT, 0, DISCONNECTED},
-    { RECEIVE,  CONTINUE, 0, RECEIVE},
-    { RECEIVE,  ABORT , 0, IDENTIFIED},
-    { RECEIVE,  COMMAND_COMPLETE , 0, IDENTIFIED}
-};
-
-
-/**********************************************************************/
-
-
-
-icalcstps* icalcstps_new(struct icalcstps_stubs stubs)
-{
-    struct icalcstps_impl* impl;
-
-    if ( ( impl = (struct icalcstps_impl*)
-	   malloc(sizeof(struct icalcstps_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    impl->stubs = stubs;
-    impl->timeout = 10;
-
-    return (icalcstps*)impl;
-
-}
-
-void icalcstps_free(icalcstps* cstp);
-
-int icalcstps_set_timeout(icalcstps* cstp, int sec) 
-{
-    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
-
-    icalerror_check_arg_rz( (cstp!=0), "cstp");
-
-    impl->timeout = sec;
-
-    return sec;
-}
-
-typedef struct icalcstps_response {	
-	icalrequeststatus code;
-	char caluid[1024];
-	void* result;
-} icalcstps_response;
-
-int line_is_command(char* line);
-int line_is_response(char* line);
-int line_is_endofdata(char* line);
-int line_is_mime(char* line);
-
-icalerrorenum prep_abort(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_authenticate(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_capability(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_calidexpand(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_continue(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_disconnect(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_identify(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_starttls(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_upnexpand(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_sendata(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-
-char* icalcstps_process_incoming(icalcstps* cstp, char* input)
-{
-    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
-    char *i;
-    char *cmd_or_resp;
-    char *data;
-    char *input_cpy;
-    icalerrorenum error;
-
-    icalerror_check_arg_rz(cstp !=0,"cstp");
-    icalerror_check_arg_rz(input !=0,"input");
-
-    if ((input_cpy = (char*)strdup(input)) == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    i = (char*)strstr(" ",input_cpy);
-
-    cmd_or_resp = input_cpy;
-
-    if (i != 0){
-	*i = '\0';
-	data = ++i;
-    } else {
-	data = 0;
-    }
-
-    printf("cmd: %s\n",cmd_or_resp);
-    printf("data: %s\n",data);
-	
-    /* extract the command, look up in the state table, and dispatch
-       to the proper handler */    
-
-    if(strcmp(cmd_or_resp,"ABORT") == 0){
-	error = prep_abort(impl,data);	
-    } else if(strcmp(cmd_or_resp,"AUTHENTICATE") == 0){
-	error = prep_authenticate(impl,data);
-    } else if(strcmp(cmd_or_resp,"CAPABILITY") == 0){
-	error = prep_capability(impl,data);
-    } else if(strcmp(cmd_or_resp,"CALIDEXPAND") == 0){
-	error = prep_calidexpand(impl,data);
-    } else if(strcmp(cmd_or_resp,"CONTINUE") == 0){
-	error = prep_continue(impl,data);
-    } else if(strcmp(cmd_or_resp,"DISCONNECT") == 0){
-	error = prep_disconnect(impl,data);
-    } else if(strcmp(cmd_or_resp,"IDENTIFY") == 0){
-	error = prep_identify(impl,data);
-    } else if(strcmp(cmd_or_resp,"STARTTLS") == 0){
-	error = prep_starttls(impl,data);
-    } else if(strcmp(cmd_or_resp,"UPNEXPAND") == 0){
-	error = prep_upnexpand(impl,data);
-    } else if(strcmp(cmd_or_resp,"SENDDATA") == 0){
-	error = prep_sendata(impl,data);
-    }
-    
-    return 0;
-}
-
-    /* Read data until we get a end of data marker */
-
-
-
-struct icalcstps_server_stubs {
-  icalerrorenum (*abort)(icalcstps* cstp);
-  icalerrorenum (*authenticate)(icalcstps* cstp, char* mechanism, 
-                                    char* data);
-  icalerrorenum (*calidexpand)(icalcstps* cstp, char* calid);
-  icalerrorenum (*capability)(icalcstps* cstp);
-  icalerrorenum (*cont)(icalcstps* cstp, unsigned int time);
-  icalerrorenum (*identify)(icalcstps* cstp, char* id);
-  icalerrorenum (*disconnect)(icalcstps* cstp);
-  icalerrorenum (*sendata)(icalcstps* cstp, unsigned int time, 
-                               icalcomponent *comp);
-  icalerrorenum (*starttls)(icalcstps* cstp, char* command, 
-                                char* data);
-  icalerrorenum (*upnexpand)(icalcstps* cstp, char* upn);
-  icalerrorenum (*unknown)(icalcstps* cstp, char* command, char* data);
-};
-
-
-/********************** Client (Sender) Interfaces **************************/
-
-struct icalcstpc_impl {
-	int timeout;
-	icalparser *parser;
-	enum cstp_command command;
-	char* next_output;
-	char* next_input;	
-};
-
-icalcstps* icalcstpc_new();
-
-void* icalcstpc_free(icalcstpc* cstpc);
-
-/* Get the next string to send to the server */
-char* icalcstpc_next_output(icalcstpc* cstp)
-{
-    return 0;
-}
-
-/* process the next string to send to the server */ 
-int icalcstpc_next_input(icalcstpc* cstp)
-{
-    return 0;
-}
-
-/* After icalcstpc_next_input returns a 0, there are responses
-   ready. use these to get them */
-icalcstpc_response icalcstpc_first_response(icalcstpc* cstp);
-icalcstpc_response icalcstpc_next_response(icalcstpc* cstp);
-
-int icalcstpc_set_timeout(icalcstpc* cstp, int sec);
-
-icalerrorenum icalcstpc_abort(icalcstpc* cstp)
-{
-    struct icalcstpc_impl* impl = (struct icalcstpc_impl*)cstp;
-
-    icalerror_check_arg_re(cstp!=0,"cstp",ICAL_BADARG_ERROR);
-
-    impl->next_output = "ABORT";
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_authenticate(icalcstpc* cstp, char* mechanism, 
-                                        char* data, char* f(char*))
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_capability(icalcstpc* cstp)
-{
-    return ICAL_NO_ERROR;}
-
-icalerrorenum icalcstpc_calidexpand(icalcstpc* cstp,char* calid)
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_continue(icalcstpc* cstp, unsigned int time)
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_disconnect(icalcstpc* cstp)
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_identify(icalcstpc* cstp, char* id)
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_starttls(icalcstpc* cstp, char* command, 
-                                    char* data, char * f(char*))
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_upnexpand(icalcstpc* cstp,char* calid)
-{
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_sendata(icalcstpc* cstp, unsigned int time,
-                                   icalcomponent *comp)
-{
-    return ICAL_NO_ERROR;
-}
-
-
-
-
diff --git a/libical/src/libicalss/icalcstp.h b/libical/src/libicalss/icalcstp.h
deleted file mode 100644
index 2ebccd622a..0000000000
--- a/libical/src/libicalss/icalcstp.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalcstp.h
-  CREATOR: eric 20 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcstp.h
-
-======================================================================*/
-
-
-#ifndef ICALCSTP_H
-#define ICALCSTP_H
-
-#include "ical.h"
-
-
-/********************** Server (Reciever) Interfaces *************************/
-
-/* On the server side, the caller will recieve data from the incoming
-   socket and pass it to icalcstps_next_input. The caller then takes
-   the return from icalcstps_next_outpu and sends it out through the
-   socket. This gives the caller a point of control. If the cstp code
-   connected to the socket itself, it would be hard for the caller to
-   do anything else after the cstp code was started.
-
-   All of the server abd client command routines will generate
-   response codes. On the server side, these responses will be turned
-   into text and sent to the client. On the client side, the reponse
-   is the one sent from the server.
-
-   Since each command can return multiple responses, the responses are
-   stored in the icalcstps object and are accesses by
-   icalcstps_first_response() and icalcstps_next_response()
-
-   How to use: 
-
-   1) Construct a new icalcstps, bound to your code via stubs
-   2) Repeat forever:
-     2a) Get string from client & give to icalcstps_next_input()
-     2b) Repeat until icalcstp_next_output returns 0:
-       2b1) Call icalcstps_next_output. 
-       2b2) Send string to client.
-*/
-
-
-
-typedef void icalcstps;
-
-/* Er, they aren't really stubs, but pointers to the rountines that
-   icalcstps_process_incoming will call when it recognizes a CSTP
-   command in the data. BTW, the CONTINUE command is named 'cont'
-   because 'continue' is a C keyword */
-struct icalcstps_stubs {
-  icalerrorenum (*abort)(icalcstps* cstp);
-  icalerrorenum (*authenticate)(icalcstps* cstp, char* mechanism, 
-                                    char* data);
-  icalerrorenum (*calidexpand)(icalcstps* cstp, char* calid);
-  icalerrorenum (*capability)(icalcstps* cstp);
-  icalerrorenum (*cont)(icalcstps* cstp, unsigned int time);
-  icalerrorenum (*identify)(icalcstps* cstp, char* id);
-  icalerrorenum (*disconnect)(icalcstps* cstp);
-  icalerrorenum (*sendata)(icalcstps* cstp, unsigned int time, 
-                               icalcomponent *comp);
-  icalerrorenum (*starttls)(icalcstps* cstp, char* command, 
-                                char* data);
-  icalerrorenum (*upnexpand)(icalcstps* cstp, char* upn);
-  icalerrorenum (*unknown)(icalcstps* cstp, char* command, char* data);
-};
-
-
-icalcstps* icalcstps_new(struct icalcstps_stubs stubs);
-
-void icalcstps_free(icalcstps* cstp);
-
-int icalcstps_set_timeout(icalcstps* cstp, int sec);
-
-/* Get the next string to send to the client */
-char* icalcstps_next_output(icalcstps* cstp);
-
-/* process the next string from the client */ 
-int icalcstps_next_input(icalcstps* cstp);
-   
-
-/********************** Client (Sender) Interfaces **************************/
-
-/* How to use: 
-
-   1) Construct a new icalcstpc
-   2) Issue a command by calling one of the command routines. 
-   3) Repeat until both call icalcstpc_next_output and
-   icalcstpc_next_input return 0:
-     3a) Call icalcstpc_next_output. Send string to server. 
-     3b) Get string from server, & give to icalcstp_next_input()
-   4) Iterate with icalcstpc_first_response & icalcstp_next_response to 
-   get the servers responses
-   5) Repeat at #2
-*/
-
-typedef void* icalcstpc;
-
-/* Response code sent by the server. */
-typedef struct icalcstpc_response {	
-	icalrequeststatus code;
-	char *arg; /* These strings are owned by libical */
-	char *debug_text;
-	char *more_text;
-	void* result;
-} icalcstpc_response;
-
-icalcstps* icalcstpc_new();
-
-void* icalcstpc_free(icalcstpc* cstpc);
-
-int icalcstpc_set_timeout(icalcstpc* cstp, int sec);
-
-
-/* Get the next string to send to the server */
-char* icalcstpc_next_output(icalcstpc* cstp);
-
-/* process the next string from the server */ 
-int icalcstpc_next_input(icalcstpc* cstp);
-
-/* After icalcstpc_next_input returns a 0, there are responses
-   ready. use these to get them */
-icalcstpc_response icalcstpc_first_response(icalcstpc* cstp);
-icalcstpc_response icalcstpc_next_response(icalcstpc* cstp);
-
-/* Issue a command */
-icalerrorenum icalcstpc_abort(icalcstpc* cstp);
-icalerrorenum icalcstpc_authenticate(icalcstpc* cstp, char* mechanism, 
-                                        char* init_data, char* f(char*) );
-icalerrorenum icalcstpc_capability(icalcstpc* cstp);
-icalerrorenum icalcstpc_calidexpand(icalcstpc* cstp,char* calid);
-icalerrorenum icalcstpc_continue(icalcstpc* cstp, unsigned int time);
-icalerrorenum icalcstpc_disconnect(icalcstpc* cstp);
-icalerrorenum icalcstpc_identify(icalcstpc* cstp, char* id);
-icalerrorenum icalcstpc_starttls(icalcstpc* cstp, char* command, 
-                                    char* init_data, char* f(char*));
-icalerrorenum icalcstpc_senddata(icalcstpc* cstp, unsigned int time,
-				icalcomponent *comp);
-icalerrorenum icalcstpc_upnexpand(icalcstpc* cstp,char* calid);
-icalerrorenum icalcstpc_sendata(icalcstpc* cstp, unsigned int time,
-                                   icalcomponent *comp);
-
-
-#endif /* !ICALCSTP_H */
-
-
-
diff --git a/libical/src/libicalss/icaldirset.c b/libical/src/libicalss/icaldirset.c
deleted file mode 100644
index 78b2373219..0000000000
--- a/libical/src/libicalss/icaldirset.c
+++ /dev/null
@@ -1,753 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icaldirset.c
-    CREATOR: eric 28 November 1999
-  
-    $Id$
-    $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-    The Original Code is eric. The Initial Developer of the Original
-    Code is Eric Busboom
-
-
-    ======================================================================*/
-
-
-/*
- 
-  icaldirset manages a database of ical components and offers
-  interfaces for reading, writting and searching for components.
-
-  icaldirset groups components in to clusters based on their DTSTAMP
-  time -- all components that start in the same month are grouped
-  together in a single file. All files in a sotre are kept in a single
-  directory. 
-
-  The primary interfaces are icaldirset_first and icaldirset_next. These
-  routine iterate through all of the components in the store, subject
-  to the current gauge. A gauge is an icalcomponent that is tested
-  against other componets for a match. If a gauge has been set with
-  icaldirset_select, icaldirset_first and icaldirset_next will only
-  return componentes that match the gauge.
-
-  The Store generated UIDs for all objects that are stored if they do
-  not already have a UID. The UID is the name of the cluster (month &
-  year as MMYYYY) plus a unique serial number. The serial number is
-  stored as a property of the cluster.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "ical.h"
-#include "icaldirset.h"
-#include "pvl.h" 
-#include "icalerror.h"
-#include "icalparser.h"
-#include "icaldirset.h"
-#include "icalfileset.h"
-#include "icalfilesetimpl.h"
-#include "icalgauge.h"
-
-#include <limits.h>
-#include <dirent.h> /* for opendir() */
-#include <errno.h>
-#include <sys/types.h> /* for opendir() */
-#include <sys/stat.h> /* for stat */
-#include <unistd.h> /* for stat, getpid */
-#include <time.h> /* for clock() */
-#include <stdlib.h> /* for rand(), srand() */
-#include <sys/utsname.h> /* for uname */
-#include <string.h> /* for strdup */
-#include "icaldirsetimpl.h"
-
-
-struct icaldirset_impl* icaldirset_new_impl()
-{
-    struct icaldirset_impl* impl;
-
-    if ( ( impl = (struct icaldirset_impl*)
-	   malloc(sizeof(struct icaldirset_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    strcpy(impl->id,ICALDIRSET_ID);
-
-    return impl;
-}
-
-const char* icaldirset_path(icaldirset* cluster)
-{
-    struct icaldirset_impl *impl = icaldirset_new_impl();
-
-    return impl->dir;
-
-}
-
-void icaldirset_mark(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    icalfileset_mark(impl->cluster);
-}
-
-
-icalerrorenum icaldirset_commit(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    return icalfileset_commit(impl->cluster);
-
-}
-
-void icaldirset_lock(const char* dir)
-{
-}
-
-
-void icaldirset_unlock(const char* dir)
-{
-}
-
-/* Load the contents of the store directory into the store's internal directory list*/
-icalerrorenum icaldirset_read_directory(struct icaldirset_impl* impl)
-{
-    struct dirent *de;
-    DIR* dp;
-    char *str;
- 
-    dp = opendir(impl->dir);
-   
-    if ( dp == 0) {
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return ICAL_FILE_ERROR;
-    }
-
-    /* clear contents of directory list */
-    while((str = pvl_pop(impl->directory))){
-	free(str);
-    }
-    
-    /* load all of the cluster names in the directory list */
-    for(de = readdir(dp);
-	de != 0;
-	de = readdir(dp)){
-
-	/* Remove known directory names  '.' and '..'*/
-	if (strcmp(de->d_name,".") == 0 ||
-	    strcmp(de->d_name,"..") == 0 ){
-	    continue;
-	}
-
-	pvl_push(impl->directory, (void*)strdup(de->d_name));	
-    }
-
-    closedir(dp);
-
-    return ICAL_NO_ERROR;
-}
-
-icaldirset* icaldirset_new(const char* dir)
-{
-    struct icaldirset_impl *impl = icaldirset_new_impl();
-    struct stat sbuf;
-
-    if (impl == 0){
-	return 0;
-    }
-
-    icalerror_check_arg_rz( (dir!=0), "dir");
-
-    if (stat(dir,&sbuf) != 0){
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return 0;
-    }
-    
-    /* dir is not the name of a direectory*/
-    if (!S_ISDIR(sbuf.st_mode)){ 
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }	    
-
-    icaldirset_lock(dir);
-
-    impl = icaldirset_new_impl();
-
-    if (impl ==0){
-	icalerror_set_errno(ICAL_ALLOCATION_ERROR);
-	return 0;
-    }
-    
-    impl->directory = pvl_newlist();
-    impl->directory_iterator = 0;
-    impl->dir = (char*)strdup(dir);
-    impl->gauge = 0;
-    impl->first_component = 0;
-    impl->cluster = 0;
-
-    icaldirset_read_directory(impl);
-
-    return (icaldirset*) impl;
-}
-
-void icaldirset_free(icaldirset* s)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)s;
-    char* str;
-
-    icaldirset_unlock(impl->dir);
-
-    if(impl->dir !=0){
-	free(impl->dir);
-    }
-
-    if(impl->gauge !=0){
-	icalcomponent_free(impl->gauge);
-    }
-
-    if(impl->cluster !=0){
-	icalfileset_free(impl->cluster);
-    }
-
-    while(impl->directory !=0 &&  (str=pvl_pop(impl->directory)) != 0){
-	free(str);
-    }
-
-    if(impl->directory != 0){
-	pvl_free(impl->directory);
-    }
-
-    impl->directory = 0;
-    impl->directory_iterator = 0;
-    impl->dir = 0;
-    impl->gauge = 0;
-    impl->first_component = 0;
-
-    free(impl);
-
-}
-
-/* icaldirset_next_uid_number updates a serial number in the Store
-   directory in a file called SEQUENCE */
-
-int icaldirset_next_uid_number(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-    char sequence = 0;
-    char temp[128];
-    char filename[PATH_MAX];
-    char *r;
-    FILE *f;
-    struct stat sbuf;
-
-    icalerror_check_arg_rz( (store!=0), "store");
-
-    sprintf(filename,"%s/%s",impl->dir,"SEQUENCE");
-
-    /* Create the file if it does not exist.*/
-    if (stat(filename,&sbuf) == -1 || !S_ISREG(sbuf.st_mode)){
-
-	f = fopen(filename,"w");
-	if (f != 0){
-	    fprintf(f,"0");
-	    fclose(f);
-	} else {
-	    icalerror_warn("Can't create SEQUENCE file in icaldirset_next_uid_number");
-	    return 0;
-	}
-	
-    }
-    
-    if ( (f = fopen(filename,"r+")) != 0){
-
-	rewind(f);
-	r = fgets(temp,128,f);
-
-	if (r == 0){
-	    sequence = 1;
-	} else {
-	    sequence = atoi(temp)+1;
-	}
-
-	rewind(f);
-
-	fprintf(f,"%d",sequence);
-
-	fclose(f);
-
-	return sequence;
-	
-    } else {
-	icalerror_warn("Can't create SEQUENCE file in icaldirset_next_uid_number");
-	return 0;
-    }
-
-}
-
-icalerrorenum icaldirset_next_cluster(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-    char path[PATH_MAX];
-
-    if (impl->directory_iterator == 0){
-	icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	return ICAL_INTERNAL_ERROR;
-    }	    
-    impl->directory_iterator = pvl_next(impl->directory_iterator);
-
-    if (impl->directory_iterator == 0){
-	/* There are no more clusters */
-	if(impl->cluster != 0){
-	    icalfileset_free(impl->cluster);
-	    impl->cluster = 0;
-	}
-	return ICAL_NO_ERROR;
-    }
-	    
-    sprintf(path,"%s/%s",impl->dir,(char*)pvl_data(impl->directory_iterator));
-
-    icalfileset_free(impl->cluster);
-
-    impl->cluster = icalfileset_new(path);
-
-    return icalerrno;
-}
-
-void icaldirset_add_uid(icaldirset* store, icaldirset* comp)
-{
-    char uidstring[PATH_MAX];
-    icalproperty *uid;
-    struct utsname unamebuf;
-
-    icalerror_check_arg_rv( (store!=0), "store");
-    icalerror_check_arg_rv( (comp!=0), "comp");
-
-    uid = icalcomponent_get_first_property(comp,ICAL_UID_PROPERTY);
-    
-    if (uid == 0) {
-	
-	uname(&unamebuf);
-	
-	sprintf(uidstring,"%d-%s",(int)getpid(),unamebuf.nodename);
-	
-	uid = icalproperty_new_uid(uidstring);
-	icalcomponent_add_property(comp,uid);
-    } else {
-	
-	strcpy(uidstring,icalproperty_get_uid(uid));
-    }
-}
-
-
-/* This assumes that the top level component is a VCALENDAR, and there
-   is an inner component of type VEVENT, VTODO or VJOURNAL. The inner
-   component must have a DTAMP property */
-
-icalerrorenum icaldirset_add_component(icaldirset* store, icaldirset* comp)
-{
-    struct icaldirset_impl *impl;
-    char clustername[PATH_MAX];
-    icalproperty *dt;
-    icalvalue *v;
-    struct icaltimetype tm;
-    icalerrorenum error = ICAL_NO_ERROR;
-    icalcomponent *inner;
-
-    impl = (struct icaldirset_impl*)store;
-    icalerror_check_arg_rz( (store!=0), "store");
-    icalerror_check_arg_rz( (comp!=0), "comp");
-
-    errno = 0;
-    
-    icaldirset_add_uid(store,comp);
-
-    /* Determine which cluster this object belongs in. This is a HACK */
-
-    for(inner = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	inner != 0;
-	inner = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-  
-	dt = icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
- 	
-	if (dt != 0){
-	    break; 
-	}	
-    }
-
-    if (dt == 0){
-
-	for(inner = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	    inner != 0;
-	    inner = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-	    
-	    dt = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-	    
-	    if (dt != 0){
-		break; 
-	    }	
-	}
-
-    }
-
-    if (dt == 0){
-
-
-	icalerror_warn("The component does not have a DTSTAMP or DTSTART property, so it cannot be added to the store");
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return ICAL_BADARG_ERROR;
-    }
-
-    v = icalproperty_get_value(dt);
-
-    tm = icalvalue_get_datetime(v);
-
-    snprintf(clustername,PATH_MAX,"%s/%04d%02d",impl->dir,tm.year,tm.month);
-
-    /* Load the cluster and insert the object */
-
-    if(impl->cluster != 0 && 
-       strcmp(clustername,icalfileset_path(impl->cluster)) != 0 ){
-	icalfileset_free(impl->cluster);
-	impl->cluster = 0;
-    }
-
-    if (impl->cluster == 0){
-	impl->cluster = icalfileset_new(clustername);
-
-	if (impl->cluster == 0){
-	    error = icalerrno;
-	}
-    }
-    
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return error;
-    }
-
-    /* Add the component to the cluster */
-
-    icalfileset_add_component(impl->cluster,comp);
-    
-    icalfileset_mark(impl->cluster);
-
-    return ICAL_NO_ERROR;    
-}
-
-/* Remove a component in the current cluster. HACK. This routine is a
-   "friend" of icalfileset, and breaks its encapsulation. It was
-   either do it this way, or add several layers of interfaces that had
-   no other use.  */
-icalerrorenum icaldirset_remove_component(icaldirset* store, icaldirset* comp)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    struct icalfileset_impl *filesetimpl = 
-	(struct icalfileset_impl*)impl->cluster;
-
-    icalcomponent *filecomp = filesetimpl->cluster;
-
-    icalcompiter i;
-    int found = 0;
-
-    icalerror_check_arg_re((store!=0),"store",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((comp!=0),"comp",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((impl->cluster!=0),"Cluster pointer",ICAL_USAGE_ERROR);
-
-    for(i = icalcomponent_begin_component(filecomp,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-
-	if (this == comp){
-	    found = 1;
-	    break;
-	}
-    }
-
-    if (found != 1){
-	icalerror_warn("icaldirset_remove_component: component is not part of current cluster");
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return ICAL_USAGE_ERROR;
-    }
-
-    icalfileset_remove_component(impl->cluster,comp);
-
-    icalfileset_mark(impl->cluster);
-
-    /* If the removal emptied the fileset, get the next fileset */
-    if( icalfileset_count_components(impl->cluster,ICAL_ANY_COMPONENT)==0){
-	
-	icalerrorenum error = icaldirset_next_cluster(store);
-
-	if(impl->cluster != 0 && error == ICAL_NO_ERROR){
-	    icalfileset_get_first_component(impl->cluster);
-	} else {
-	    /* HACK. Not strictly correct for impl->cluster==0 */
-	    return error;
-	}
-    } else {
-	/* Do nothing */
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-
-
-int icaldirset_count_components(icaldirset* store,
-			       icalcomponent_kind kind)
-{
-    /* HACK, not implemented */
-    
-    assert(0);
-
-    return 0;
-}
-
-
-icalcomponent* icaldirset_fetch_match(icaldirset* set, icalcomponent *c)
-{
-    fprintf(stderr," icaldirset_fetch_match is not implemented\n");
-    assert(0);
-}
-
-
-icalcomponent* icaldirset_fetch(icaldirset* store, const char* uid)
-{
-    icalcomponent *gauge;
-    icalcomponent *old_gauge;
-    icalcomponent *c;
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    icalerror_check_arg_rz( (store!=0), "store");
-    icalerror_check_arg_rz( (uid!=0), "uid");
-
-    gauge = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_uid(
-		    uid,
-		    icalparameter_new_xliccomparetype(
-			ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    0);
-
-    old_gauge = impl->gauge;
-    impl->gauge = gauge;
-
-    c= icaldirset_get_first_component(store);
-
-    impl->gauge = old_gauge;
-
-    icalcomponent_free(gauge);
-
-    return c;
-}
-
-
-int icaldirset_has_uid(icaldirset* store, const char* uid)
-{
-    icalcomponent *c;
-
-    icalerror_check_arg_rz( (store!=0), "store");
-    icalerror_check_arg_rz( (uid!=0), "uid");
-    
-    /* HACK. This is a temporary implementation. _has_uid should use a
-       database, and _fetch should use _has_uid, not the other way
-       around */
-    c = icaldirset_fetch(store,uid);
-
-    return c!=0;
-
-}
-
-
-icalerrorenum icaldirset_select(icaldirset* store, icalcomponent* gauge)
- {
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    icalerror_check_arg_re( (store!=0), "store",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re( (gauge!=0), "gauge",ICAL_BADARG_ERROR);
-
-    if (!icalcomponent_is_valid(gauge)){
-	return ICAL_BADARG_ERROR;
-    }
-
-    impl->gauge = gauge;
-
-    return ICAL_NO_ERROR;
-}
-
-
-icalerrorenum icaldirset_modify(icaldirset* store, icalcomponent *old,
-			       icalcomponent *new)
-{
-    assert(0);
-    return ICAL_NO_ERROR; /* HACK, not implemented */
-
-}
-
-
-void icaldirset_clear(icaldirset* store)
-{
-
-    assert(0);
-    return;
-    /* HACK, not implemented */
-}
-
-icalcomponent* icaldirset_get_current_component(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-
-    if(impl->cluster == 0){
-	icaldirset_get_first_component(store);
-    }
-
-    return icalfileset_get_current_component(impl->cluster);
-
-}
-
-
-icalcomponent* icaldirset_get_first_component(icaldirset* store)
-{
-    struct icaldirset_impl *impl = (struct icaldirset_impl*)store;
-    icalerrorenum error;
-    char path[PATH_MAX];
-
-    error = icaldirset_read_directory(impl);
-
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return 0;
-    }
-
-    impl->directory_iterator = pvl_head(impl->directory);
-    
-    if (impl->directory_iterator == 0){
-	icalerror_set_errno(error);
-	return 0;
-    }
-    
-    snprintf(path,PATH_MAX,"%s/%s",impl->dir,(char*)pvl_data(impl->directory_iterator));
-
-    /* If the next cluster we need is different than the current cluster, 
-       delete the current one and get a new one */
-
-    if(impl->cluster != 0 && strcmp(path,icalfileset_path(impl->cluster)) != 0 ){
-	icalfileset_free(impl->cluster);
-	impl->cluster = 0;
-    }
-    
-    if (impl->cluster == 0){
-	impl->cluster = icalfileset_new(path);
-
-	if (impl->cluster == 0){
-	    error = icalerrno;
-	}
-    } 
-
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return 0;
-    }
-
-    impl->first_component = 1;
-
-    return icaldirset_get_next_component(store);
-}
-
-icalcomponent* icaldirset_get_next_component(icaldirset* store)
-{
-    struct icaldirset_impl *impl;
-    icalcomponent *c;
-    icalerrorenum error;
-
-    icalerror_check_arg_rz( (store!=0), "store");
-
-    impl = (struct icaldirset_impl*)store;
-
-    if(impl->cluster == 0){
-
-	icalerror_warn("icaldirset_get_next_component called with a NULL cluster (Caller must call icaldirset_get_first_component first");
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-
-    }
-
-    /* Set the component iterator for the following for loop */
-    if (impl->first_component == 1){
-	icalfileset_get_first_component(impl->cluster);
-	impl->first_component = 0;
-    } else {
-	icalfileset_get_next_component(impl->cluster);
-    }
-
-
-    while(1){
-	/* Iterate through all of the objects in the cluster*/
-	for( c = icalfileset_get_current_component(impl->cluster);
-	     c != 0;
-	     c = icalfileset_get_next_component(impl->cluster)){
-	    
-	    /* If there is a gauge defined and the component does not
-	       pass the gauge, skip the rest of the loop */
-
-#if 0 /* HACK */
-	    if (impl->gauge != 0 && icalgauge_test(c,impl->gauge) == 0){
-		continue;
-	    }
-#else
-	    assert(0); /* icalgauge_test needs to be fixed */
-#endif
-	    /* Either there is no gauge, or the component passed the
-	       gauge, so return it*/
-
-	    return c;
-	}
-
-	/* Fell through the loop, so the component we want is not
-	   in this cluster. Load a new cluster and try again.*/
-
-	error = icaldirset_next_cluster(store);
-
-	if(impl->cluster == 0 || error != ICAL_NO_ERROR){
-	    /* No more clusters */
-	    return 0;
-	} else {
-	    c = icalfileset_get_first_component(impl->cluster);
-
-	    return c;
-	}
-	
-    }
-
-    return 0; /* Should never get here */
-}
-
-   
-
-
-
-
-	
diff --git a/libical/src/libicalss/icaldirset.h b/libical/src/libicalss/icaldirset.h
deleted file mode 100644
index 7d205ecf0a..0000000000
--- a/libical/src/libicalss/icaldirset.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaldirset.h
- CREATOR: eric 28 November 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALDIRSET_H
-#define ICALDIRSET_H
-
-#include "ical.h"
-
-/* icaldirset Routines for storing, fetching, and searching for ical
- * objects in a database */
-
-typedef void icaldirset;
-
-
-icaldirset* icaldirset_new(const char* path);
-
-void icaldirset_free(icaldirset* store);
-
-const char* icaldirset_path(icaldirset* store);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately*/
-void icaldirset_mark(icaldirset* store);
-icalerrorenum icaldirset_commit(icaldirset* store); 
-
-icalerrorenum icaldirset_add_component(icaldirset* store, icalcomponent* comp);
-icalerrorenum icaldirset_remove_component(icaldirset* store, icalcomponent* comp);
-
-int icaldirset_count_components(icaldirset* store,
-			       icalcomponent_kind kind);
-
-/* Restrict the component returned by icaldirset_first, _next to those
-   that pass the gauge. _clear removes the gauge. */
-icalerrorenum icaldirset_select(icaldirset* store, icalcomponent* gauge);
-void icaldirset_clear(icaldirset* store);
-
-/* Get a component by uid */
-icalcomponent* icaldirset_fetch(icaldirset* store, const char* uid);
-int icaldirset_has_uid(icaldirset* store, const char* uid);
-icalcomponent* icaldirset_fetch_match(icaldirset* set, icalcomponent *c);
-
-/* Modify components according to the MODIFY method of CAP. Works on
-   the currently selected components. */
-icalerrorenum icaldirset_modify(icaldirset* store, icalcomponent *oldc,
-			       icalcomponent *newc);
-
-/* Iterate through the components. If a guage has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icaldirset_get_current_component(icaldirset* store);
-icalcomponent* icaldirset_get_first_component(icaldirset* store);
-icalcomponent* icaldirset_get_next_component(icaldirset* store);
-
-#endif /* !ICALDIRSET_H */
-
-
-
diff --git a/libical/src/libicalss/icaldirsetimpl.h b/libical/src/libicalss/icaldirsetimpl.h
deleted file mode 100644
index 0e69ba2f2e..0000000000
--- a/libical/src/libicalss/icaldirsetimpl.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaldirsetimpl.h
-  CREATOR: eric 21 Aug 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icalset*/
-
-#define ICALDIRSET_ID "dset"
-
-struct icaldirset_impl 
-{
-	char id[5]; /* "dset" */
-	char* dir;
-	icalcomponent* gauge;
-	icaldirset* cluster;
-	int first_component;
-	pvl_list directory;
-	pvl_elem directory_iterator;
-};
diff --git a/libical/src/libicalss/icalfileset.c b/libical/src/libicalss/icalfileset.c
deleted file mode 100644
index 2ef38ff876..0000000000
--- a/libical/src/libicalss/icalfileset.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalfileset.c
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalfileset.h"
-#include "icalgauge.h"
-#include <errno.h>
-#include <limits.h> /* For PATH_MAX */
-#include <sys/stat.h> /* for stat */
-#include <unistd.h> /* for stat, getpid */
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h> /* for fcntl */
-#include <unistd.h> /* for fcntl */
-#include "icalfilesetimpl.h"
-
-extern int errno;
-
-int icalfileset_lock(icalfileset *cluster);
-int icalfileset_unlock(icalfileset *cluster);
-icalerrorenum icalfileset_read_file(icalfileset* cluster, mode_t mode);
-int icalfileset_filesize(icalfileset* cluster);
-
-icalerrorenum icalfileset_create_cluster(const char *path);
-
-icalfileset* icalfileset_new_impl()
-{
-    struct icalfileset_impl* impl;
-  
-    if ( ( impl = (struct icalfileset_impl*)
-	   malloc(sizeof(struct icalfileset_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	errno = ENOMEM;
-	return 0;
-    }
-  
-    memset(impl,0,sizeof(struct icalfileset_impl));
-  
-    strcpy(impl->id,ICALFILESET_ID);
-  
-    return impl;
-}
-
-
-icalfileset* icalfileset_new(const char* path)
-{
-    return icalfileset_new_open(path, O_RDWR|O_CREAT, 0664);
-}
-
-icalfileset* icalfileset_new_open(const char* path, int flags, mode_t mode)
-{
-    struct icalfileset_impl *impl = icalfileset_new_impl(); 
-    struct icaltimetype tt;
-    off_t cluster_file_size;
-
-    memset(&tt,0,sizeof(struct icaltimetype));
-
-    icalerror_clear_errno();
-    icalerror_check_arg_rz( (path!=0), "path");
-
-    if (impl == 0){
-	return 0;
-    }
-
-    impl->path = strdup(path); 
-
-    cluster_file_size = icalfileset_filesize(impl);
-        
-    if(cluster_file_size < 0){
-	icalfileset_free(impl);
-	return 0;
-    } 
-
-    impl->fd = open(impl->path,flags, mode);
-    
-    if (impl->fd < 0){
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	icalfileset_free(impl);
-	return 0;
-    }
-
-    icalfileset_lock(impl);
-    
-    if(cluster_file_size > 0 ){
-	icalerrorenum error;
-	if((error = icalfileset_read_file(impl,mode))!= ICAL_NO_ERROR){
-	    icalfileset_free(impl);
-	    return 0;
-	}
-    }
- 
-    if(impl->cluster == 0){
-	impl->cluster = icalcomponent_new(ICAL_XROOT_COMPONENT);
-    }      
-    
-    return impl;
-}
-
-char* icalfileset_read_from_file(char *s, size_t size, void *d)
-{
-    
-    char* p = s;
-    int fd = (int)d;
-
-    /* Simulate fgets -- read single characters and stop at '\n' */
-
-    for(p=s; p<s+size-1;p++){
-	
-	if(read(fd,p,1) != 1 || *p=='\n'){
-	    p++;
-	    break;
-	} 
-    }
-
-    *p = '\0';
-    
-    if(*s == 0){
-	return 0;
-    } else {
-	return s;
-    }
-
-}
-
-
-icalerrorenum icalfileset_read_file(icalfileset* cluster,mode_t mode)
-{
-
-    icalparser *parser;
-    int fd;
-  
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    
-    parser = icalparser_new();
-    icalparser_set_gen_data(parser,(void*)impl->fd);
-    impl->cluster = icalparser_parse(parser,icalfileset_read_from_file);
-    icalparser_free(parser);
-
-    if (impl->cluster == 0 || icalerrno != ICAL_NO_ERROR){
-	icalerror_set_errno(ICAL_PARSE_ERROR);
-	return ICAL_PARSE_ERROR;
-    }
-  
-    if (icalcomponent_isa(impl->cluster) != ICAL_XROOT_COMPONENT){
-	/* The parser got a single component, so it did not put it in
-	   an XROOT. */
-	icalcomponent *cl = impl->cluster;
-	impl->cluster = icalcomponent_new(ICAL_XROOT_COMPONENT);
-	icalcomponent_add_component(impl->cluster,cl);
-    }
-
-    return ICAL_NO_ERROR;
-
-}
-
-int icalfileset_filesize(icalfileset* cluster)
-{
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    int cluster_file_size;
-    struct stat sbuf;
-
-    if (stat(impl->path,&sbuf) != 0){
-	
-	/* A file by the given name does not exist, or there was
-	   another error */
-	cluster_file_size = 0;
-	if (errno == ENOENT) {
-	    /* It was because the file does not exist */
-	    return 0;
-	} else {
-	    /* It was because of another error */
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return -1;
-	}
-    } else {
-	/* A file by the given name exists, but is it a regular file? */
-	
-	if (!S_ISREG(sbuf.st_mode)){ 
-	    /* Nope, not a regular file */
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return -1;
-	} else {
-	    /* Lets assume that it is a file of the right type */
-	    return sbuf.st_size;
-	}	
-    }
-
-    /*return -1; not reached*/
-}
-
-void icalfileset_free(icalfileset* cluster)
-{
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_rv((cluster!=0),"cluster");
-
-    if (impl->cluster != 0){
-	icalfileset_commit(cluster);
-	icalcomponent_free(impl->cluster);
-	impl->cluster=0;
-    }
-
-    if(impl->fd > 0){
-	icalfileset_unlock(impl);
-	close(impl->fd);
-	impl->fd = -1;
-    }
-
-    if(impl->path != 0){
-	free(impl->path);
-	impl->path = 0;
-    }
-
-    free(impl);
-}
-
-const char* icalfileset_path(icalfileset* cluster)
-{
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    icalerror_check_arg_rz((cluster!=0),"cluster");
-
-    return impl->path;
-}
-
-
-int icalfileset_lock(icalfileset *cluster)
-{
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    struct flock lock;
-    int rtrn;
-
-    icalerror_check_arg_rz((impl->fd>0),"impl->fd");
-    errno = 0;
-    lock.l_type = F_WRLCK;     /* F_RDLCK, F_WRLCK, F_UNLCK */
-    lock.l_start = 0;  /* byte offset relative to l_whence */
-    lock.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
-    lock.l_len = 0;       /* #bytes (0 means to EOF) */
-
-    rtrn = fcntl(impl->fd, F_SETLKW, &lock);
-
-    return rtrn;
-}
-
-int icalfileset_unlock(icalfileset *cluster)
-{
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    struct flock lock;
-    icalerror_check_arg_rz((impl->fd>0),"impl->fd");
-
-    lock.l_type = F_WRLCK;     /* F_RDLCK, F_WRLCK, F_UNLCK */
-    lock.l_start = 0;  /* byte offset relative to l_whence */
-    lock.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
-    lock.l_len = 0;       /* #bytes (0 means to EOF) */
-
-    return (fcntl(impl->fd, F_UNLCK, &lock)); 
-
-}
-
-#ifdef ICAL_SAFESAVES
-int icalfileset_safe_saves=1;
-#else
-int icalfileset_safe_saves=0;
-#endif
-
-icalerrorenum icalfileset_commit(icalfileset* cluster)
-{
-    char tmp[PATH_MAX]; 
-    char *str;
-    icalcomponent *c;
-    off_t write_size=0;
-    
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-    
-    icalerror_check_arg_re((impl!=0),"cluster",ICAL_BADARG_ERROR);  
-    
-    icalerror_check_arg_re((impl->fd>0),"impl->fd is invalid",
-			   ICAL_INTERNAL_ERROR) ;
-
-    if (impl->changed == 0 ){
-	return ICAL_NO_ERROR;
-    }
-    
-    if(icalfileset_safe_saves == 1){
-	snprintf(tmp,PATH_MAX,"cp %s %s.bak",impl->path,impl->path);
-	
-	if(system(tmp) < 0){
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return ICAL_FILE_ERROR;
-	}
-    }
-
-    if(lseek(impl->fd,SEEK_SET,0) < 0){
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return ICAL_FILE_ERROR;
-    }
-    
-    for(c = icalcomponent_get_first_component(impl->cluster,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(impl->cluster,ICAL_ANY_COMPONENT)){
-	int sz;
-
-	str = icalcomponent_as_ical_string(c);
-    
-	sz=write(impl->fd,str,strlen(str));
-
-	if ( sz != strlen(str)){
-	    perror("write");
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return ICAL_FILE_ERROR;
-	}
-
-	write_size += sz;
-    }
-    
-    impl->changed = 0;    
-
-    if(ftruncate(impl->fd,write_size) < 0){
-	return ICAL_FILE_ERROR;
-    }
-    
-    return ICAL_NO_ERROR;
-    
-} 
-
-void icalfileset_mark(icalfileset* cluster){
-
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_rv((impl!=0),"cluster");
-
-    impl->changed = 1;
-
-}
-
-icalcomponent* icalfileset_get_component(icalfileset* cluster){
-    struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_re((impl!=0),"cluster",ICAL_BADARG_ERROR);
-
-    return impl->cluster;
-}
-
-
-/* manipulate the components in the cluster */
-
-icalerrorenum icalfileset_add_component(icalfileset *cluster,
-					icalcomponent* child)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_rv((cluster!=0),"cluster");
-    icalerror_check_arg_rv((child!=0),"child");
-
-    icalcomponent_add_component(impl->cluster,child);
-
-    icalfileset_mark(cluster);
-
-    return ICAL_NO_ERROR;
-
-}
-
-icalerrorenum icalfileset_remove_component(icalfileset *cluster,
-					   icalcomponent* child)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_rv((cluster!=0),"cluster");
-    icalerror_check_arg_rv((child!=0),"child");
-
-    icalcomponent_remove_component(impl->cluster,child);
-
-    icalfileset_mark(cluster);
-
-    return ICAL_NO_ERROR;
-}
-
-int icalfileset_count_components(icalfileset *cluster,
-				 icalcomponent_kind kind)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-
-    if(cluster == 0){
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return -1;
-    }
-
-    return icalcomponent_count_components(impl->cluster,kind);
-}
-
-icalerrorenum icalfileset_select(icalfileset* set, icalgauge* gauge)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)set;
-
-    icalerror_check_arg_re(gauge!=0,"guage",ICAL_BADARG_ERROR);
-
-    impl->gauge = gauge;
-
-    return ICAL_NO_ERROR;
-}
-
-void icalfileset_clear(icalfileset* gauge)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)gauge;
-    
-    impl->gauge = 0;
-
-}
-
-icalcomponent* icalfileset_fetch(icalfileset* store,const char* uid)
-{
-    icalcompiter i;    
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)store;
-    
-    for(i = icalcomponent_begin_component(impl->cluster,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-	icalcomponent *inner = icalcomponent_get_first_real_component(this);
-	icalcomponent *p;
-	const char *this_uid;
-
-	if(inner != 0){
-	    p = icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-	    this_uid = icalproperty_get_uid(p);
-
-	    if(this_uid==0){
-		icalerror_warn("icalfileset_fetch found a component with no UID");
-		continue;
-	    }
-
-	    if (strcmp(uid,this_uid)==0){
-		return this;
-	    }
-	}
-    }
-
-    return 0;
-}
-
-int icalfileset_has_uid(icalfileset* store,const char* uid)
-{
-    assert(0); /* HACK, not implemented */
-    return 0;
-}
-
-/******* support routines for icalfileset_fetch_match *********/
-
-struct icalfileset_id{
-    char* uid;
-    char* recurrence_id;
-    int sequence;
-};
-
-void icalfileset_id_free(struct icalfileset_id *id)
-{
-    if(id->recurrence_id != 0){
-	free(id->recurrence_id);
-    }
-
-    if(id->uid != 0){
-	free(id->uid);
-    }
-
-}
-
-struct icalfileset_id icalfileset_get_id(icalcomponent* comp)
-{
-
-    icalcomponent *inner;
-    struct icalfileset_id id;
-    icalproperty *p;
-
-    inner = icalcomponent_get_first_real_component(comp);
-    
-    p = icalcomponent_get_first_property(inner, ICAL_UID_PROPERTY);
-
-    assert(p!= 0);
-
-    id.uid = strdup(icalproperty_get_uid(p));
-
-    p = icalcomponent_get_first_property(inner, ICAL_SEQUENCE_PROPERTY);
-
-    if(p == 0) {
-	id.sequence = 0;
-    } else { 
-	id.sequence = icalproperty_get_sequence(p);
-    }
-
-    p = icalcomponent_get_first_property(inner, ICAL_RECURRENCEID_PROPERTY);
-
-    if (p == 0){
-	id.recurrence_id = 0;
-    } else {
-	icalvalue *v;
-	v = icalproperty_get_value(p);
-	id.recurrence_id = strdup(icalvalue_as_ical_string(v));
-
-	assert(id.recurrence_id != 0);
-    }
-
-    return id;
-}
-
-/* Find the component that is related to the given
-   component. Currently, it just matches based on UID and
-   RECURRENCE-ID */
-icalcomponent* icalfileset_fetch_match(icalfileset* set, icalcomponent *comp)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)set;
-    icalcompiter i;    
-
-    struct icalfileset_id comp_id, match_id;
-    
-    comp_id = icalfileset_get_id(comp);
-
-    for(i = icalcomponent_begin_component(impl->cluster,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *match = icalcompiter_deref(&i);
-
-	match_id = icalfileset_get_id(match);
-
-	if(strcmp(comp_id.uid, match_id.uid) == 0 &&
-	   ( comp_id.recurrence_id ==0 || 
-	     strcmp(comp_id.recurrence_id, match_id.recurrence_id) ==0 )){
-
-	    /* HACK. What to do with SEQUENCE? */
-
-	    icalfileset_id_free(&match_id);
-	    icalfileset_id_free(&comp_id);
-	    return match;
-	    
-	}
-	
-	icalfileset_id_free(&match_id);
-    }
-
-    icalfileset_id_free(&comp_id);
-    return 0;
-
-}
-
-
-icalerrorenum icalfileset_modify(icalfileset* store, icalcomponent *old,
-				 icalcomponent *new)
-{
-    assert(0); /* HACK, not implemented */
-    return ICAL_NO_ERROR;
-}
-
-
-/* Iterate through components */
-icalcomponent* icalfileset_get_current_component (icalfileset* cluster)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-
-    icalerror_check_arg_rz((cluster!=0),"cluster");
-
-    return icalcomponent_get_current_component(impl->cluster);
-}
-
-
-icalcomponent* icalfileset_get_first_component(icalfileset* cluster)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-    icalcomponent *c=0;
-
-    icalerror_check_arg_rz((cluster!=0),"cluster");
-
-    do {
-	if (c == 0){
-	    c = icalcomponent_get_first_component(impl->cluster,
-						  ICAL_ANY_COMPONENT);
-	} else {
-	    c = icalcomponent_get_next_component(impl->cluster,
-						 ICAL_ANY_COMPONENT);
-	}
-
-	if(c != 0 && (impl->gauge == 0 ||
-		      icalgauge_compare(impl->gauge,c) == 1)){
-	    return c;
-	}
-
-    } while(c != 0);
-
-
-    return 0;
-}
-
-icalcomponent* icalfileset_get_next_component(icalfileset* cluster)
-{
-    struct icalfileset_impl* impl = (struct icalfileset_impl*)cluster;
-    icalcomponent *c;
-
-    icalerror_check_arg_rz((cluster!=0),"cluster");
-    
-    do {
-	c = icalcomponent_get_next_component(impl->cluster,
-					     ICAL_ANY_COMPONENT);
-
-	if(c != 0 && (impl->gauge == 0 ||
-		      icalgauge_compare(impl->gauge,c) == 1)){
-	    return c;
-	}
-	
-    } while(c != 0);
-    
-    
-    return 0;
-}
-
diff --git a/libical/src/libicalss/icalfileset.h b/libical/src/libicalss/icalfileset.h
deleted file mode 100644
index 3b4b87c34d..0000000000
--- a/libical/src/libicalss/icalfileset.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalfileset.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALFILESET_H
-#define ICALFILESET_H
-
-#include "ical.h"
-#include "icalgauge.h"
-#include <sys/types.h> /* For open() flags and mode */
-#include <sys/stat.h> /* For open() flags and mode */
-#include <fcntl.h> /* For open() flags and mode */
-
-extern int icalfileset_safe_saves;
-
-typedef void icalfileset;
-
-
-/* icalfileset
-   icalfilesetfile
-   icalfilesetdir
-*/
-
-
-icalfileset* icalfileset_new(const char* path);
-
-/* Like _new, but takes open() flags for opening the file */
-icalfileset* icalfileset_new_open(const char* path, 
-				  int flags, mode_t mode);
-
-void icalfileset_free(icalfileset* cluster);
-
-const char* icalfileset_path(icalfileset* cluster);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately. */
-void icalfileset_mark(icalfileset* cluster);
-icalerrorenum icalfileset_commit(icalfileset* cluster); 
-
-icalerrorenum icalfileset_add_component(icalfileset* cluster,
-					icalcomponent* child);
-
-icalerrorenum icalfileset_remove_component(icalfileset* cluster,
-					   icalcomponent* child);
-
-int icalfileset_count_components(icalfileset* cluster,
-				 icalcomponent_kind kind);
-
-/* Restrict the component returned by icalfileset_first, _next to those
-   that pass the gauge. _clear removes the gauge */
-icalerrorenum icalfileset_select(icalfileset* store, icalgauge* gauge);
-void icalfileset_clear(icalfileset* store);
-
-/* Get and search for a component by uid */
-icalcomponent* icalfileset_fetch(icalfileset* cluster, const char* uid);
-int icalfileset_has_uid(icalfileset* cluster, const char* uid);
-icalcomponent* icalfileset_fetch_match(icalfileset* set, icalcomponent *c);
-
-
-/* Modify components according to the MODIFY method of CAP. Works on
-   the currently selected components. */
-icalerrorenum icalfileset_modify(icalfileset* store, icalcomponent *oldcomp,
-			       icalcomponent *newcomp);
-
-/* Iterate through components. If a guage has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalfileset_get_current_component (icalfileset* cluster);
-icalcomponent* icalfileset_get_first_component(icalfileset* cluster);
-icalcomponent* icalfileset_get_next_component(icalfileset* cluster);
-/* Return a reference to the internal component. You probably should
-   not be using this. */
-
-icalcomponent* icalfileset_get_component(icalfileset* cluster);
-
-
-#endif /* !ICALFILESET_H */
-
-
-
diff --git a/libical/src/libicalss/icalfilesetimpl.h b/libical/src/libicalss/icalfilesetimpl.h
deleted file mode 100644
index fcd3415121..0000000000
--- a/libical/src/libicalss/icalfilesetimpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalfilesetimpl.h
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalgauge.h"
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icaldirset*/
-
-#define ICALFILESET_ID "fset"
-
-struct icalfileset_impl {
-
-  char id[5]; /*fset*/
-  char *path;
-  icalcomponent* cluster;
-  icalgauge* gauge;
-  int changed;
-  int fd; /* file descriptor */
-};
-
diff --git a/libical/src/libicalss/icalgauge.c b/libical/src/libicalss/icalgauge.c
deleted file mode 100644
index b958ecfc9d..0000000000
--- a/libical/src/libicalss/icalgauge.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgauge.c
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include "ical.h"
-#include "icalgauge.h"
-#include "icalgaugeimpl.h"
-#include <stdlib.h>
-
-extern char* input_buffer;
-extern char* input_buffer_p;
-int ssparse(void);
-
-struct icalgauge_impl *icalss_yy_gauge;
-
-icalgauge* icalgauge_new_from_sql(char* sql)
-{
-    struct icalgauge_impl *impl;
-
-    int r;
-    
-    if ( ( impl = (struct icalgauge_impl*)
-	   malloc(sizeof(struct icalgauge_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    impl->select = pvl_newlist();
-    impl->from = pvl_newlist();
-    impl->where = pvl_newlist();
-
-    icalss_yy_gauge = impl;
-
-    input_buffer_p = input_buffer = sql;
-    r = ssparse();
-
-    return impl;
-}
-
-
-void icalgauge_free(icalgauge* gauge)
-{
-      struct icalgauge_impl *impl =  (struct icalgauge_impl*)gauge;
-      struct icalgauge_where *w;
-
-      assert(impl->select != 0);
-      assert(impl->where != 0);
-      assert(impl->from != 0);
-
-      if(impl->select){
-	  while( (w=pvl_pop(impl->select)) != 0){
-	      if(w->value != 0){
-		  free(w->value);
-	      }
-	      free(w);
-	  }
-	  pvl_free(impl->select);
-      }
-
-      if(impl->where){
-	  while( (w=pvl_pop(impl->where)) != 0){
-	      
-	      if(w->value != 0){
-		  free(w->value);
-	      }
-	      free(w);
-	  }
-	  pvl_free(impl->where);
-      }
-
-      if(impl->from){
-	  pvl_free(impl->from);
-      }
-      
-}
-
-/* Convert a VQUERY component into a gauge */
-icalcomponent* icalgauge_make_gauge(icalcomponent* query);
-
-/* icaldirset_test compares a component against a gauge, and returns
-   true if the component passes the test 
-
-   The gauge is a VCALENDAR component that specifies how to test the
-   target components. The guage holds a collection of VEVENT, VTODO or
-   VJOURNAL sub-components. Each of the sub-components has a
-   collection of properties that are compared to corresponding
-   properties in the target component, according to the
-   X-LIC-COMPARETYPE parameters to the gauge's properties.
-
-   When a gauge has several sub-components, the results of testing the
-   target against each of them is ORed together - the target
-   component will pass if it matches any of the sub-components in the
-   gauge. However, the results of matching the properties in a
-   sub-component are ANDed -- the target must match every property in
-   a gauge sub-component to match the sub-component.
-
-   Here is an example:
-
-   BEGIN:XROOT
-   DTSTART;X-LIC-COMPARETYPE=LESS:19981025T020000
-   ORGANIZER;X-LIC-COMPARETYPE=EQUAL:mrbig@host.com 
-   END:XROOT
-   BEGIN:XROOT
-   LOCATION;X-LIC-COMPARETYPE=EQUAL:McNary's Pub
-   END:XROOT
-
-   This gauge has two sub-components; one which will match a VEVENT
-   based on start time, and organizer, and another that matches based
-   on LOCATION. A target component will pass the test if it matched
-   either of the sub-components.
-   
-  */
-
-
-int icalgauge_compare_recurse(icalcomponent* comp, icalcomponent* gauge)
-{
-    int pass = 1,localpass = 0;
-    icalproperty *p;
-    icalcomponent *child,*subgauge; 
-    icalcomponent_kind gaugekind, compkind;
-
-    icalerror_check_arg_rz( (comp!=0), "comp");
-    icalerror_check_arg_rz( (gauge!=0), "gauge");
-
-    gaugekind = icalcomponent_isa(gauge);
-    compkind = icalcomponent_isa(comp);
-
-    if( ! (gaugekind == compkind || gaugekind == ICAL_ANY_COMPONENT) ){
-	return 0;
-    }   
-
-    /* Test properties. For each property in the gauge, search through
-       the component for a similar property. If one is found, compare
-       the two properties value with the comparison specified in the
-       gauge with the X-LIC-COMPARETYPE parameter */
-    
-    for(p = icalcomponent_get_first_property(gauge,ICAL_ANY_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(gauge,ICAL_ANY_PROPERTY)){
-	
-	icalproperty* targetprop; 
-	icalparameter* compareparam;
-	icalparameter_xliccomparetype compare;
-	int rel; /* The relationship between the gauge and target values.*/
-	
-	/* Extract the comparison type from the gauge. If there is no
-	   comparison type, assume that it is "EQUAL" */
-	
-	compareparam = icalproperty_get_first_parameter(
-	    p,
-	    ICAL_XLICCOMPARETYPE_PARAMETER);
-	
-	if (compareparam!=0){
-	    compare = icalparameter_get_xliccomparetype(compareparam);
-	} else {
-	    compare = ICAL_XLICCOMPARETYPE_EQUAL;
-	}
-	
-	/* Find a property in the component that has the same type
-	   as the gauge property. HACK -- multiples of a single
-	   property type in the gauge will match only the first
-	   instance in the component */
-	
-	targetprop = icalcomponent_get_first_property(comp,
-						      icalproperty_isa(p));
-	
-	if(targetprop != 0){
-	
-	    /* Compare the values of the gauge property and the target
-	       property */
-	    
-	    rel = icalvalue_compare(icalproperty_get_value(p),
-				    icalproperty_get_value(targetprop));
-	    
-	    /* Now see if the comparison is equavalent to the comparison
-	       specified in the gauge */
-	    
-	    if (rel == compare){ 
-		localpass++; 
-	    } else if (compare == ICAL_XLICCOMPARETYPE_LESSEQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_LESS ||
-			 rel == ICAL_XLICCOMPARETYPE_EQUAL)) {
-		localpass++;
-	    } else if (compare == ICAL_XLICCOMPARETYPE_GREATEREQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_GREATER ||
-			 rel == ICAL_XLICCOMPARETYPE_EQUAL)) {
-		localpass++;
-	    } else if (compare == ICAL_XLICCOMPARETYPE_NOTEQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_GREATER ||
-			 rel == ICAL_XLICCOMPARETYPE_LESS)) {
-		localpass++;
-	    } else {
-		localpass = 0;
-	    }
-	    
-	    pass = pass && (localpass>0);
-	}
-    }
-    
-    /* Test subcomponents. Look for a child component that has a
-       counterpart in the gauge. If one is found, recursively call
-       icaldirset_test */
-    
-    for(subgauge = icalcomponent_get_first_component(gauge,ICAL_ANY_COMPONENT);
-	subgauge != 0;
-	subgauge = icalcomponent_get_next_component(gauge,ICAL_ANY_COMPONENT)){
-	
-	gaugekind = icalcomponent_isa(subgauge);
-
-	if (gaugekind == ICAL_ANY_COMPONENT){
-	    child = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	} else {
-	    child = icalcomponent_get_first_component(comp,gaugekind);
-	}
-	
-	if(child !=0){
-	    localpass = icalgauge_compare_recurse(child,subgauge);
-	    pass = pass && localpass;
-	} else {
-	    pass = 0;
-	}
-    }
-    
-    return pass;   
-}
-
-
-int icalgauge_compare(icalgauge* gauge,icalcomponent* comp)
-{
-
-    struct icalgauge_impl *impl = (struct icalgauge_impl*)gauge;
-    icalcomponent *inner; 
-    int local_pass = 0;
-    int last_clause = 1, this_clause = 1;
-    pvl_elem e;
-
-    icalerror_check_arg_rz( (comp!=0), "comp");
-    icalerror_check_arg_rz( (gauge!=0), "gauge");
-    
-    inner = icalcomponent_get_first_real_component(comp);
-
-    if(inner == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-
-    /* Check that this component is one of the FROM types */
-    local_pass = 0;
-    for(e = pvl_head(impl->from);e!=0;e=pvl_next(e)){
-	icalcomponent_kind k = (icalcomponent_kind)pvl_data(e);
-
-	if(k == icalcomponent_isa(inner)){
-	    local_pass=1;
-	}
-    }
-    
-    if(local_pass == 0){
-	return 0;
-    }
-
-    
-    /* Check each where clause against the component */
-    for(e = pvl_head(impl->where);e!=0;e=pvl_next(e)){
-	struct icalgauge_where *w = pvl_data(e);
-	icalcomponent *sub_comp;
-	icalvalue *v;
-	icalproperty *prop;
-	icalvalue_kind vk;
-
-	if(w->prop == ICAL_NO_PROPERTY || w->value == 0){
-	    icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	    return 0;
-	}
-
-	/* First, create a value from the gauge */
-	vk = icalenum_property_kind_to_value_kind(w->prop);
-
-	if(vk == ICAL_NO_VALUE){
-	    icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	    return 0;
-	}
-
-	v = icalvalue_new_from_string(vk,w->value);
-
-	if (v == 0){
-	    /* Keep error set by icalvalue_from-string*/
-	    return 0;
-	}
-	    
-	/* Now find the corresponding property in the component,
-	   descending into a sub-component if necessary */
-
-	if(w->comp == ICAL_NO_COMPONENT){
-	    sub_comp = inner;
-	} else {
-	    sub_comp = icalcomponent_get_first_component(inner,w->comp);
-	    if(sub_comp == 0){
-		return 0;
-	    }
-	}	   
-
-	this_clause = 0;
-	local_pass = 0;
-	for(prop = icalcomponent_get_first_property(sub_comp,w->prop);
-	    prop != 0;
-	    prop = icalcomponent_get_next_property(sub_comp,w->prop)){
-	    icalvalue* prop_value;
-	    icalgaugecompare relation;
-
-	    prop_value = icalproperty_get_value(prop);
-
-	    relation = (icalgaugecompare)icalvalue_compare(prop_value,v);
-	    
-	    if (relation  == w->compare){ 
-		local_pass++; 
-	    } else if (w->compare == ICALGAUGECOMPARE_LESSEQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_LESS ||
-			 relation  == ICALGAUGECOMPARE_EQUAL)) {
-		local_pass++;
-	    } else if (w->compare == ICALGAUGECOMPARE_GREATEREQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_GREATER ||
-			 relation  == ICALGAUGECOMPARE_EQUAL)) {
-		local_pass++;
-	    } else if (w->compare == ICALGAUGECOMPARE_NOTEQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_GREATER ||
-			 relation  == ICALGAUGECOMPARE_LESS)) {
-		local_pass++;
-	    } else {
-		local_pass = 0;
-	    }
-	}
-    
-	this_clause = local_pass > 0 ? 1 : 0;
-
-	/* Now look at the logic operator for this clause to see how
-           the value should be merge with the previous clause */
-
-	if(w->logic == ICALGAUGELOGIC_AND){
-	    last_clause = this_clause && last_clause;
-	} else if(w->logic == ICALGAUGELOGIC_AND) {
-	    last_clause = this_clause || last_clause;
-	} else {
-	    last_clause = this_clause;
-	}
-    }
-
-    return last_clause;
-
-}
-    
-
-void icalgauge_dump(icalcomponent* gauge)
-{
-
-    pvl_elem *p;
-    struct icalgauge_impl *impl = (struct icalgauge_impl*)gauge;
-  
-  
-    printf("--- Select ---\n");
-    for(p = pvl_head(impl->select);p!=0;p=pvl_next(p)){
-	struct icalgauge_where *w = pvl_data(p);
-
-	if(w->comp != ICAL_NO_COMPONENT){
-	    printf("%s ",icalenum_component_kind_to_string(w->comp));
-	}
-
-	if(w->prop != ICAL_NO_PROPERTY){
-	    printf("%s ",icalenum_property_kind_to_string(w->prop));
-	}
-	
-	if (w->compare != ICALGAUGECOMPARE_NONE){
-	    printf("%d ",w->compare);
-	}
-
-
-	if (w->value!=0){
-	    printf("%s",w->value);
-	}
-
-
-	printf("\n");
-    }
-
-    printf("--- From ---\n");
-    for(p = pvl_head(impl->from);p!=0;p=pvl_next(p)){
-	icalcomponent_kind k = (icalcomponent_kind)pvl_data(p);
-
-	printf("%s\n",icalenum_component_kind_to_string(k));
-    }
-
-    printf("--- Where ---\n");
-    for(p = pvl_head(impl->where);p!=0;p=pvl_next(p)){
-	struct icalgauge_where *w = pvl_data(p);
-
-	if(w->logic != ICALGAUGELOGIC_NONE){
-	    printf("%d ",w->logic);
-	}
-	
-	if(w->comp != ICAL_NO_COMPONENT){
-	    printf("%s ",icalenum_component_kind_to_string(w->comp));
-	}
-
-	if(w->prop != ICAL_NO_PROPERTY){
-	    printf("%s ",icalenum_property_kind_to_string(w->prop));
-	}
-	
-	if (w->compare != ICALGAUGECOMPARE_NONE){
-	    printf("%d ",w->compare);
-	}
-
-
-	if (w->value!=0){
-	    printf("%s",w->value);
-	}
-
-
-	printf("\n");
-    }
-
-    
-}
-
diff --git a/libical/src/libicalss/icalgauge.h b/libical/src/libicalss/icalgauge.h
deleted file mode 100644
index 1caf0ac7d1..0000000000
--- a/libical/src/libicalss/icalgauge.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgauge.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALGAUGE_H
-#define ICALGAUGE_H
-
-typedef void icalgauge;
-
-icalgauge* icalgauge_new_from_sql(char* sql);
-
-void icalgauge_free(icalgauge* gauge);
-
-char* icalgauge_as_sql(icalcomponent* gauge);
-
-void icalgauge_dump(icalcomponent* gauge);
-
-/* Return true is comp matches the gauge. The component must be in
-   cannonical form -- a VCALENDAR with one VEVENT, VTODO or VJOURNAL
-   sub component */
-int icalgauge_compare(icalgauge* g, icalcomponent* comp);
-
-/* Clone the component, but only return the properties specified in
-   the gauge */
-icalcomponent* icalgauge_new_clone(icalgauge* g, icalcomponent* comp);
-
-#endif /* ICALGAUGE_H*/
diff --git a/libical/src/libicalss/icalgaugeimpl.h b/libical/src/libicalss/icalgaugeimpl.h
deleted file mode 100644
index 73a2813242..0000000000
--- a/libical/src/libicalss/icalgaugeimpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgaugeimpl.h
- CREATOR: eric 09 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-======================================================================*/
-
-#include "ical.h"
-
-#include "pvl.h" 
-
-typedef enum icalgaugecompare {
-    ICALGAUGECOMPARE_EQUAL=ICAL_XLICCOMPARETYPE_EQUAL,
-    ICALGAUGECOMPARE_LESS=ICAL_XLICCOMPARETYPE_LESS,
-    ICALGAUGECOMPARE_LESSEQUAL=ICAL_XLICCOMPARETYPE_LESSEQUAL,
-    ICALGAUGECOMPARE_GREATER=ICAL_XLICCOMPARETYPE_GREATER,
-    ICALGAUGECOMPARE_GREATEREQUAL=ICAL_XLICCOMPARETYPE_GREATEREQUAL,
-    ICALGAUGECOMPARE_NOTEQUAL=ICAL_XLICCOMPARETYPE_NOTEQUAL,
-    ICALGAUGECOMPARE_REGEX=ICAL_XLICCOMPARETYPE_REGEX,
-    ICALGAUGECOMPARE_NONE=0
-} icalgaugecompare;
-
-typedef enum icalgaugelogic {
-    ICALGAUGELOGIC_NONE,
-    ICALGAUGELOGIC_AND,
-    ICALGAUGELOGIC_OR
-} icalgaugelogic;
-    
-
-struct icalgauge_where {
-	icalgaugelogic logic;
-	icalcomponent_kind comp;
-	icalproperty_kind prop;
-	icalgaugecompare compare;
-	char* value;
-};
-
-struct icalgauge_impl
-{
-
-	pvl_list select; /*Of icalgaugecompare, using only prop and comp fields*/
-	pvl_list from; /* List of component_kinds, as integers */
-	pvl_list where; /* List of icalgaugecompare */
-};
-
-
diff --git a/libical/src/libicalss/icalmessage.c b/libical/src/libicalss/icalmessage.c
deleted file mode 100644
index e1e8d8015c..0000000000
--- a/libical/src/libicalss/icalmessage.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalmessage.c
-    CREATOR: ebusboom 07 Nov 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalmessage.h"
-#include "icalenums.h"
-#include <ctype.h>  /* for tolower()*/
-#include <string.h> /* for strstr */
-#include <stdlib.h> /* for free(), malloc() */
-icalcomponent* icalmessage_get_inner(icalcomponent* comp)
-{
-    if (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT){
-	return icalcomponent_get_first_real_component(comp);
-    } else {
-	return comp;
-    }
-}
-
-char* lowercase(const char* str)
-{
-    char* p = 0;
-    char* n = icalmemory_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = n; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return n;
-}
-
-icalproperty* icalmessage_find_attendee(icalcomponent* comp, const char* user)
-{
-    icalcomponent *inner = icalmessage_get_inner(comp);
-    icalproperty *p,*attendee = 0;
-    char* luser = lowercase(user);
-
-    for(p = icalcomponent_get_first_property(inner, ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(inner, ICAL_ATTENDEE_PROPERTY)
-	){
-
-	char* lattendee;
-
-	lattendee = lowercase(icalproperty_get_attendee(p));
-
-	if (strstr(lattendee,user) != 0){
-	    attendee = p;
-	    break;
-	}
-
-	free(lattendee);
-
-    }
-    
-    free(luser);
-
-    return attendee;
-
-}
-
-void icalmessage_copy_properties(icalcomponent* to, icalcomponent* from, 
-		icalproperty_kind kind)
-{
-    icalcomponent *to_inner = icalmessage_get_inner(to);
-    icalcomponent *from_inner = icalmessage_get_inner(from);
-
-    if (to_inner == 0 && from_inner == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return;
-    }
-
-    if(!icalcomponent_get_first_property(from_inner,kind)){
-	return;
-    }
-
-    icalcomponent_add_property(to_inner,
-	       icalproperty_new_clone(
-		   icalcomponent_get_first_property(
-		       from_inner,
-		       kind)
-		   )
-	);
-}
-
-icalcomponent *icalmessage_new_reply_base(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-    icalproperty *attendee;
-    char tmp[45];
-
-    icalcomponent *reply = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REPLY),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
-	    0),
-	0);
-
-    icalcomponent *inner = icalmessage_get_inner(reply);
-
-    icalerror_check_arg_rz(c,"c");
-
-    icalmessage_copy_properties(reply,c,ICAL_UID_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_ORGANIZER_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_RECURRENCEID_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_SUMMARY_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_SEQUENCE_PROPERTY);
-
-    icalcomponent_set_dtstamp(reply,icaltime_from_timet(time(0),0));
-
-    if(msg != 0){
-	icalcomponent_add_property(inner,icalproperty_new_comment(msg));
-    }
-
-    /* Copy this user's attendee property */
-
-    attendee = icalmessage_find_attendee(c,user);
-
-    if (attendee == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	icalcomponent_free(reply);
-	return 0;
-    }
-
-    icalcomponent_add_property(inner,icalproperty_new_clone(attendee));
-
-    /* Add PRODID and VERSION */
-
-    icalcomponent_add_property(reply,icalproperty_new_version("2.0"));
-    
-    sprintf(tmp,
-           "-//SoftwareStudio//NONSGML %s %s //EN",PACKAGE,VERSION);
-    icalcomponent_add_property(reply,icalproperty_new_prodid(tmp));
-
-    return reply;
-
-}
-
-icalcomponent* icalmessage_new_accept_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-
-    if(reply == 0){
-	return 0;
-    }
-
-    inner  = icalmessage_get_inner(reply);
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_ACCEPTED));
-
-    return reply;
-}
-
-icalcomponent* icalmessage_new_decline_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    if(reply == 0){
-	return 0;
-    }
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DECLINED));
-
-    return reply;
-}
-
-/* New is modified version of old */
-icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc,
-						    icalcomponent* newc,
-						    const char* user,
-						    const char* msg)
-{
-    icalcomponent *reply;
-
-    icalerror_check_arg_rz(oldc,"oldc");
-    icalerror_check_arg_rz(newc,"newc");
-    
-    reply = icalcomponent_new_clone(newc);
-
-    icalcomponent_set_method(reply,ICAL_METHOD_COUNTER);
-
-    return newc;
-
-}
-
-
-icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-
-    reply =  icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    if(reply == 0){
-	return 0;
-    }
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DELEGATED));
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_delegatedto(delegatee));
-
-    return reply;
-
-}
-
-icalcomponent* icalmessage_new_delegate_request(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-
-    reply =  icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-
-    if(reply == 0){
-	return 0;
-    }
-
-    icalcomponent_set_method(reply,ICAL_METHOD_REQUEST);
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DELEGATED));
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_delegatedto(delegatee));
-
-    icalcomponent_add_property(
-	inner,
-	icalproperty_vanew_attendee(
-	    delegatee,
-	    icalparameter_new_delegatedfrom(
-		icalproperty_get_attendee(attendee)
-		),
-	    0
-	    )
-	);
-	     
-
-    return reply;
-
-}
-
-
-icalcomponent* icalmessage_new_cancel_event(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_instance(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_all(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-
-
-icalcomponent* icalmessage_new_error_reply(icalcomponent* c,
-					   const char* user,
-					   const char* msg,
-					   const char* debug,
-					   icalrequeststatus code)
-{
-    icalcomponent *reply;
-    icalcomponent *inner, *cinner;
-    struct icalreqstattype rs;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    cinner = icalmessage_get_inner(c);
-    if(reply == 0){
-	return 0;
-    }
-
-    if( code != ICAL_UNKNOWN_STATUS){
-	rs.code = code;
-	rs.debug = debug;
-	
-	icalcomponent_add_property(inner, 
-				   icalproperty_new_requeststatus(
-				       icalreqstattype_as_string(rs)
-				       ) 
-	    );
-    } else { /*  code == ICAL_UNKNOWN_STATUS */ 
-
-	/* Copy all of the request status properties */
-	icalproperty *p;
-	for(p = icalcomponent_get_first_property(cinner,
-						 ICAL_REQUESTSTATUS_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(cinner,
-						ICAL_REQUESTSTATUS_PROPERTY)){
-
-	    
-	    icalcomponent_add_property(inner,icalproperty_new_clone(p));
-	}
-    }
-
-    return reply;
-}
diff --git a/libical/src/libicalss/icalmessage.h b/libical/src/libicalss/icalmessage.h
deleted file mode 100644
index 24f1c9f243..0000000000
--- a/libical/src/libicalss/icalmessage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmessage.h
- CREATOR: eric 07 Nov 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#include "ical.h"
-
-#ifndef ICALMESSAGE_H
-#define ICALMESSAGE_H
-
-
-icalcomponent* icalmessage_new_accept_reply(icalcomponent* c, 
-					    const char* user,
-					    const char* msg);
-
-icalcomponent* icalmessage_new_decline_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-/* New is modified version of old */
-icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc,
-						    icalcomponent* newc,
-						    const char* user,
-						    const char* msg);
-
-
-icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg);
-
-
-icalcomponent* icalmessage_new_cancel_event(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_instance(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_all(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-
-icalcomponent* icalmessage_new_error_reply(icalcomponent* c,
-					   const char* user,
-					   const char* msg,
-					   const char* debug,
-					   icalrequeststatus rs);
-
-
-#endif /* ICALMESSAGE_H*/
diff --git a/libical/src/libicalss/icalset.c b/libical/src/libicalss/icalset.c
deleted file mode 100644
index 3edbe503c4..0000000000
--- a/libical/src/libicalss/icalset.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalset.c
- CREATOR: eric 17 Jul 2000
-
-
- Icalset is the "base class" for representations of a collection of
- iCal components. Derived classes (actually delegates) include:
- 
-    icalfileset   Store components in a single file
-    icaldirset    Store components in multiple files in a directory
-    icalheapset   Store components on the heap
-    icalmysqlset  Store components in a mysql database. 
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include "ical.h"
-#include "icalset.h"
-#include "icalfileset.h"
-#include "icalfilesetimpl.h"
-#include "icaldirset.h"
-#include "icaldirsetimpl.h"
-#include <stdlib.h>
-/*#include "icalheapset.h"*/
-/*#include "icalmysqlset.h"*/
-
-#define ICALSET_ID "set "
-
-struct icalset_fp {
-	void (*free)(icalset* set);
-	const char* (*path)(icalset* set);
-	void (*mark)(icalset* set);
-	icalerrorenum (*commit)(icalset* set); 
-	icalerrorenum (*add_component)(icalset* set, icalcomponent* comp);
-	icalerrorenum (*remove_component)(icalset* set, icalcomponent* comp);
-	int (*count_components)(icalset* set,
-			     icalcomponent_kind kind);
-	icalerrorenum (*select)(icalset* set, icalcomponent* gauge);
-	void (*clear)(icalset* set);
-	icalcomponent* (*fetch)(icalset* set, const char* uid);
-	icalcomponent* (*fetch_match)(icalset* set, icalcomponent *comp);
-	int (*has_uid)(icalset* set, const char* uid);
-	icalerrorenum (*modify)(icalset* set, icalcomponent *old,
-				     icalcomponent *new);
-	icalcomponent* (*get_current_component)(icalset* set);	
-	icalcomponent* (*get_first_component)(icalset* set);
-	icalcomponent* (*get_next_component)(icalset* set);
-};
-
-struct icalset_fp icalset_dirset_fp = {
-    icaldirset_free,
-    icaldirset_path,
-    icaldirset_mark,
-    icaldirset_commit,
-    icaldirset_add_component,
-    icaldirset_remove_component,
-    icaldirset_count_components,
-    icaldirset_select,
-    icaldirset_clear,
-    icaldirset_fetch,
-    icaldirset_fetch_match,
-    icaldirset_has_uid,
-    icaldirset_modify,
-    icaldirset_get_current_component,
-    icaldirset_get_first_component,
-    icaldirset_get_next_component
-};
-
-
-struct icalset_fp icalset_fileset_fp = {
-    icalfileset_free,
-    icalfileset_path,
-    icalfileset_mark,
-    icalfileset_commit,
-    icalfileset_add_component,
-    icalfileset_remove_component,
-    icalfileset_count_components,
-    icalfileset_select,
-    icalfileset_clear,
-    icalfileset_fetch,
-    icalfileset_fetch_match,
-    icalfileset_has_uid,
-    icalfileset_modify,
-    icalfileset_get_current_component,
-    icalfileset_get_first_component,
-    icalfileset_get_next_component
-};
-
-struct icalset_impl {
-
-	char id[5]; /* "set " */
-
-	void *derived_impl;
-	struct icalset_fp *fp;
-};
-
-/* Figure out what was actually passed in as the set. This could be a
-   set or and of the derived types such as dirset or fileset. Note
-   this routine returns a value, not a reference, to avoid memory
-   leaks in the methods */
-struct icalset_impl icalset_get_impl(icalset* set)
-{
-    struct icalset_impl  impl;
-
-    memset(&impl,0,sizeof(impl));
-    icalerror_check_arg_rv( (set!=0),"set");
-
-    if(strcmp((char*)set,ICALSET_ID)==0) {
-	/* It is actually a set, so just sent the reference back out. */
-	return *(struct icalset_impl*)set;
-    } else if(strcmp((char*)set,ICALFILESET_ID)==0) {
-	/* Make a new set from the fileset */
-	impl.fp = &icalset_fileset_fp;
-	impl.derived_impl = set;
-	strcpy(impl.id,ICALFILESET_ID);/* HACK. Is this necessary? */
-	return impl;
-    } else if(strcmp((char*)set,ICALDIRSET_ID)==0) {
-	/* Make a new set from the dirset */
-	impl.fp = &icalset_dirset_fp;
-	impl.derived_impl = set;
-	strcpy(impl.id,ICALDIRSET_ID);/* HACK. Is this necessary? */
-	return impl;
-    } else {
-	/* The type of set is unknown, so throw an error */
-	icalerror_assert((0),"Unknown set type");
-	return impl;
-    }
-}
-
-
-struct icalset_impl* icalset_new_impl()
-{
-    
-    struct icalset_impl* impl;
-
-    if ( ( impl = (struct icalset_impl*)
-	   malloc(sizeof(struct icalset_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    strcpy(impl->id,ICALSET_ID);
-
-    impl->derived_impl = 0;
-    impl->fp = 0;
-
-    return impl;
-}
-
-struct icalset_impl* icalset_new_file_from_ref(icalfileset *fset)
-{
-    struct icalset_impl *impl = icalset_new_impl();
-
-    icalerror_check_arg_rz( (fset!=0),"fset");
-
-    if(impl == 0){
-	free(impl);
-	return 0;
-    }
-
-    impl->derived_impl = fset;
-
-    if (impl->derived_impl == 0){
-	free(impl);
-	return 0;
-    }
-
-    impl->fp = &icalset_fileset_fp;
-
-    return (struct icalset_impl*)impl;
-}
-
-icalset* icalset_new_file(const char* path)
-{
-    icalfileset *fset = icalfileset_new(path);
-
-    if(fset == 0){
-	return 0;
-    }
-
-    return (icalset*)icalset_new_file_from_ref(fset);
-}
-
-icalset* icalset_new_dir_from_ref(icaldirset *dset)
-{
-
-    struct icalset_impl *impl = icalset_new_impl();
-
-    icalerror_check_arg_rz( (dset!=0),"dset");
-
-    if(impl == 0){
-	return 0;
-    }
-
-    impl->derived_impl = dset;
-
-    if (impl->derived_impl == 0){
-	free(impl);
-	return 0;
-    }
-
-    impl->fp = &icalset_dirset_fp;
-
-    return impl;
-}
-
-icalset* icalset_new_dir(const char* path)
-{
-    icaldirset *dset = icaldirset_new(path);
-
-    if(dset == 0){
-	return 0;
-    }
-
-    return icalset_new_dir_from_ref(dset);
-}
-
-icalset* icalset_new_heap(void)
-{
-    struct icalset_impl *impl = icalset_new_impl();
-
-
-    if(impl == 0){
-	free(impl);
-	return 0;
-    }
-
-    return 0;
-}
-
-icalset* icalset_new_mysql(const char* path)
-{
-    struct icalset_impl *impl = icalset_new_impl();
-
-    if(impl == 0){
-	free(impl);
-	return 0;
-    }
-
-    return 0;
-}
-
-void icalset_free(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    (*(impl.fp->free))(impl.derived_impl);
-
-   if(strcmp((char*)set,ICALSET_ID)) {    
-       free(set);
-   }
-}
-
-const char* icalset_path(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->path))(impl.derived_impl);
-}
-
-void icalset_mark(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    (*(impl.fp->mark))(impl.derived_impl);
-}
-
-icalerrorenum icalset_commit(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->commit))(impl.derived_impl);
-}
-
-icalerrorenum icalset_add_component(icalset* set, icalcomponent* comp)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->add_component))(impl.derived_impl,comp);
-}
-
-icalerrorenum icalset_remove_component(icalset* set, icalcomponent* comp)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->remove_component))(impl.derived_impl,comp);
-}
-
-int icalset_count_components(icalset* set,icalcomponent_kind kind)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->count_components))(impl.derived_impl,kind);
-}
-
-icalerrorenum icalset_select(icalset* set, icalcomponent* gauge)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->select))(impl.derived_impl,gauge);
-}
-
-void icalset_clear(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    (*(impl.fp->clear))(impl.derived_impl);
-}
-
-icalcomponent* icalset_fetch(icalset* set, const char* uid)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->fetch))(impl.derived_impl,uid);
-}
-
-icalcomponent* icalset_fetch_match(icalset* set, icalcomponent *comp)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->fetch_match))(impl.derived_impl,comp);
-}
-
-
-int icalset_has_uid(icalset* set, const char* uid)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->has_uid))(impl.derived_impl,uid);
-}
-
-icalerrorenum icalset_modify(icalset* set, icalcomponent *old,
-			       icalcomponent *new)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->modify))(impl.derived_impl,old,new);
-}
-
-icalcomponent* icalset_get_current_component(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->get_current_component))(impl.derived_impl);
-}
-
-icalcomponent* icalset_get_first_component(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->get_first_component))(impl.derived_impl);
-}
-
-icalcomponent* icalset_get_next_component(icalset* set)
-{
-    struct icalset_impl impl = icalset_get_impl(set);
-    return (*(impl.fp->get_next_component))(impl.derived_impl);
-}
-
-
-
-
diff --git a/libical/src/libicalss/icalset.h b/libical/src/libicalss/icalset.h
deleted file mode 100644
index d4678e3bed..0000000000
--- a/libical/src/libicalss/icalset.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalset.h
- CREATOR: eric 28 November 1999
-
-
- Icalset is the "base class" for representations of a collection of
- iCal components. Derived classes (actually delegatees) include:
- 
-    icalfileset   Store componetns in a single file
-    icaldirset    Store components in multiple files in a directory
-    icalheapset   Store components on the heap
-    icalmysqlset  Store components in a mysql database. 
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALSET_H
-#define ICALSET_H
-
-#include "ical.h"
-#include "icalerror.h"
-
-typedef void icalset;
-
-typedef enum icalset_kind {
-    ICAL_FILE_SET,
-    ICAL_DIR_SET,
-    ICAL_HEAP_SET,
-    ICAL_MYSQL_SET,
-    ICAL_CAP_SET
-} icalset_kind;
-
-
-/* Create a specific derived type of set */
-icalset* icalset_new_file(const char* path);
-icalset* icalset_new_dir(const char* path);
-icalset* icalset_new_heap(void);
-icalset* icalset_new_mysql(const char* path);
-/*icalset* icalset_new_cap(icalcstp* cstp);*/
-
-void icalset_free(icalset* set);
-
-const char* icalset_path(icalset* set);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately*/
-void icalset_mark(icalset* set);
-icalerrorenum icalset_commit(icalset* set); 
-
-icalerrorenum icalset_add_component(icalset* set, icalcomponent* comp);
-icalerrorenum icalset_remove_component(icalset* set, icalcomponent* comp);
-
-int icalset_count_components(icalset* set,
-			     icalcomponent_kind kind);
-
-/* Restrict the component returned by icalset_first, _next to those
-   that pass the gauge. _clear removes the gauge. */
-icalerrorenum icalset_select(icalset* set, icalcomponent* gauge);
-void icalset_clear_select(icalset* set);
-
-/* Get a component by uid */
-icalcomponent* icalset_fetch(icalset* set, const char* uid);
-int icalset_has_uid(icalset* set, const char* uid);
-icalcomponent* icalset_fetch_match(icalset* set, icalcomponent *c);
-
-/* Modify components according to the MODIFY method of CAP. Works on
-   the currently selected components. */
-icalerrorenum icalset_modify(icalset* set, icalcomponent *oldc,
-			       icalcomponent *newc);
-
-/* Iterate through the components. If a guage has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalset_get_current_component(icalset* set);
-icalcomponent* icalset_get_first_component(icalset* set);
-icalcomponent* icalset_get_next_component(icalset* set);
-
-#endif /* !ICALSET_H */
-
-
-
diff --git a/libical/src/libicalss/icalspanlist.c b/libical/src/libicalss/icalspanlist.c
deleted file mode 100644
index cab6a81c68..0000000000
--- a/libical/src/libicalss/icalspanlist.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalspanlist.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ical.h"
-#include "icalspanlist.h"
-#include "pvl.h" 
-#include <stdlib.h> /* for free and malloc */
-
-struct icalspanlist_impl {
-	pvl_list spans;
-};
-
-int compare_span(void* a, void* b)
-{
-    struct icaltime_span *span_a = (struct icaltime_span *)a ;
-    struct icaltime_span *span_b = (struct icaltime_span *)b ;
-    
-    if(span_a->start == span_b->start){
-	return 0;
-    } else if(span_a->start < span_b->start){
-	return -1;
-    }  else { /*if(span_a->start > span->b.start)*/
-	return 1;
-    }
-}
-
-icalcomponent* icalspanlist_get_inner(icalcomponent* comp)
-{
-    if (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT){
-	return icalcomponent_get_first_real_component(comp);
-    } else {
-	return comp;
-    }
-}
-
-
-void print_span(int c, struct icaltime_span span );
-
-    
-/* Make a free list from a set of component */
-icalspanlist* icalspanlist_new(icalset *set, 
-			       struct icaltimetype start,
-			       struct icaltimetype end)
-{
-    struct icaltime_span range;
-    pvl_elem itr;
-    icalcomponent *c,*inner;
-    icalcomponent_kind kind, inner_kind;
-    struct icalspanlist_impl *sl; 
-    struct icaltime_span *freetime;
-
-    if ( ( sl = (struct icalspanlist_impl*)
-	   malloc(sizeof(struct icalspanlist_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    sl->spans =  pvl_newlist();
-
-    range.start = icaltime_as_timet(start);
-    range.end = icaltime_as_timet(end);
-
-    printf("Range start: %s",ctime(&range.start));
-    printf("Range end  : %s",ctime(&range.end));
-
-
-    /* Get a list of spans of busy time from the events in the set
-       and order the spans based on the start time */
-
-   for(c = icalset_get_first_component(set);
-	c != 0;
-	c = icalset_get_next_component(set)){
-
-       struct icaltime_span span;
-
-       kind  = icalcomponent_isa(c);
-       inner = icalcomponent_get_inner(c);
-
-       if(!inner){
-	   continue;
-       }
-
-       inner_kind = icalcomponent_isa(inner);
-
-       if( kind != ICAL_VEVENT_COMPONENT &&
-	   inner_kind != ICAL_VEVENT_COMPONENT){
-	   continue;
-       }
-       
-       icalerror_clear_errno();
-
-	span = icalcomponent_get_span(c);
-	span.is_busy = 1;
-
-	if(icalerrno != ICAL_NO_ERROR){
-	    continue;
-	}
-
-	if ((range.start < span.end && icaltime_is_null_time(end)) ||
-	    (range.start < span.end && range.end > span.start )){
-	    
-	    struct icaltime_span *s;
-
-	    if ((s=(struct icaltime_span *)
-		 malloc(sizeof(struct icaltime_span))) == 0){
-		icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-		return 0;
-	    }
-
-	    memcpy(s,&span,sizeof(span));
-		
-	    pvl_insert_ordered(sl->spans,compare_span,(void*)s);
-
-	}
-    }
-    
-    /* Now Fill in the free time spans. loop through the spans. if the
-       start of the range is not within the span, create a free entry
-       that runs from the start of the range to the start of the
-       span. */
-
-     for( itr = pvl_head(sl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	struct icaltime_span *s = (icalproperty*)pvl_data(itr);
-
-	if ((freetime=(struct icaltime_span *)
-	     malloc(sizeof(struct icaltime_span))) == 0){
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	    }
-
-	if(range.start < s->start){
-	    freetime->start = range.start; 
-	    freetime->end = s->start;
-	    
-	    freetime->is_busy = 0;
-
-
-	    pvl_insert_ordered(sl->spans,compare_span,(void*)freetime);
-	} else {
-	    free(freetime);
-	}
-	
-	range.start = s->end;
-    }
-     
-     /* If the end of the range is null, then assume that everything
-        after the last item in the calendar is open and add a span
-        that indicates this */
-
-     if( icaltime_is_null_time(end)){
-	 struct icaltime_span* last_span;
-
-	 last_span = pvl_data(pvl_tail(sl->spans));
-
-	 if (last_span != 0){
-
-	     if ((freetime=(struct icaltime_span *)
-		  malloc(sizeof(struct icaltime_span))) == 0){
-		 icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-		 return 0;
-	     }	
-	
-	     freetime->is_busy = 0;
-	     freetime->start = last_span->end;
-	     freetime->end = freetime->start;
-	     pvl_insert_ordered(sl->spans,compare_span,(void*)freetime);
-	 }
-     }
-
-
-     return sl;
-
-}
-
-void icalspanlist_free(icalspanlist* s)
-{
-    struct icaltime_span *span;
-    struct icalspanlist_impl* impl = (struct icalspanlist_impl*)s;
-    
-    while( (span=pvl_pop(impl->spans)) != 0){
-	free(span);
-    }
-    
-    pvl_free(impl->spans);
-    
-    impl->spans = 0;
-}
-
-
-void icalspanlist_dump(icalspanlist* s){
-
-     int i = 0;
-     struct icalspanlist_impl* sl = (struct icalspanlist_impl*)s;
-     pvl_elem itr;
-
-     for( itr = pvl_head(sl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	struct icaltime_span *s = (icalproperty*)pvl_data(itr);
-	
-	printf("#%02d %d start: %s",++i,s->is_busy,ctime(&s->start));
-	printf("      end  : %s",ctime(&s->end));
-
-    }
-}
-
-icalcomponent* icalspanlist_make_free_list(icalspanlist* sl);
-icalcomponent* icalspanlist_make_busy_list(icalspanlist* sl);
-
-struct icalperiodtype icalspanlist_next_free_time(icalspanlist* sl,
-						struct icaltimetype t)
-{
-     struct icalspanlist_impl* impl = (struct icalspanlist_impl*)sl;
-     pvl_elem itr;
-     struct icalperiodtype period;
-     struct icaltime_span *s;
-
-     time_t rangett= icaltime_as_timet(t);
-
-     period.start = icaltime_null_time();
-     period.end = icaltime_null_time();
-
-     /* Is the reference time before the first span? If so, assume
-        that the reference time is free */
-     itr = pvl_head(impl->spans);
-     s = (icalproperty*)pvl_data(itr);
-
-     if (s == 0){
-	 /* No elements in span */
-	 return period;
-     }
-
-     if(rangett <s->start ){
-	 /* End of period is start of first span if span is busy, end
-            of the span if it is free */
-	 period.start =  t;
-
-	 if (s->is_busy == 0){
-	     period.end =  icaltime_from_timet(s->start,0);
-	 } else {
-	     period.end =  icaltime_from_timet(s->end,0);
-	 }
-
-	 return period;
-     }
-
-     /* Otherwise, find the first free span that contains the
-        reference time. */
-
-     for( itr = pvl_head(impl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	s = (icalproperty*)pvl_data(itr);
-
-	if(s->is_busy == 0 && s->start >= rangett && 
-	    ( rangett < s->end || s->end == s->start)){
-
-	    if (rangett < s->start){
-		period.start = icaltime_from_timet(s->start,0);
-	    } else {
-		period.start = icaltime_from_timet(rangett,0);
-	    }
-	    
-	    period.end = icaltime_from_timet(s->end,0);
-
-	    return period;
-	}
-			
-    }
-
-     period.start = icaltime_null_time();
-     period.end = icaltime_null_time();
-
-     return period;
-}
-
-struct icalperiodtype icalspanlist_next_busy_time(icalspanlist* sl,
-						struct icaltimetype t);
-
diff --git a/libical/src/libicalss/icalspanlist.h b/libical/src/libicalss/icalspanlist.h
deleted file mode 100644
index 83cb1c8a6d..0000000000
--- a/libical/src/libicalss/icalspanlist.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalspanlist.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-#ifndef ICALSPANLIST_H
-#define ICALSPANLIST_H
-
-#include "ical.h"
-#include "icalset.h"
-
-typedef void icalspanlist;
-
-/* Make a free list from a set of component. Start and end should be in UTC */
-icalspanlist* icalspanlist_new(icalset *set, 
-				struct icaltimetype start,
-				struct icaltimetype end);
-
-void icalspanlist_free(icalspanlist* spl);
-
-icalcomponent* icalspanlist_make_free_list(icalspanlist* sl);
-icalcomponent* icalspanlist_make_busy_list(icalspanlist* sl);
-
-/* Get first free or busy time after time t. all times are in UTC */
-struct icalperiodtype icalspanlist_next_free_time(icalspanlist* sl,
-						struct icaltimetype t);
-struct icalperiodtype icalspanlist_next_busy_time(icalspanlist* sl,
-						struct icaltimetype t);
-
-void icalspanlist_dump(icalspanlist* s);
-
-#endif
-				    
-
-
diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l
deleted file mode 100644
index 848a9bc74f..0000000000
--- a/libical/src/libicalss/icalsslexer.l
+++ /dev/null
@@ -1,113 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalsslexer.l
-  CREATOR: eric 8 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id: icalsslexer.l,v 1.1.1.2 2001/01/23 19:20:41 jpr Exp $
-  $Locker:  $
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-
-#include "icalssyacc.h"
-#include "icalgaugeimpl.h"
-#include "assert.h"
-
-#include <string.h> /* For strdup() */
-
-int icalparser_flex_input(char* buf, int max_size);
-void icalparser_clear_flex_input();
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
-
-#undef SS_FATAL_ERROR
-#define SS_FATAL_ERROR(msg) sserror(msg)
-
-
-%}
-
-crlf		\x0D?\x0A
-space		[ ]
-qsafechar	[^\x00-\x1F\"]
-safechar	[^\x00-\x1F\"\:\;\,]
-tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
-valuechar	[^\x00-\x08\x10-\x1F]
-xname		X-[a-zA-Z0-9\-]+
-xname2          [a-zA-Z0-9\-\ ]
-paramtext	{safechar}+
-value		{valuechar}+
-quotedstring	\"{qsafechar}+\"
-digit		[0-9]
-
-%array /* Make yytext an array. Slow, but handy. HACK */
-
-%option caseless
-
-%s sql string_value
-
-
-
-%%
-
-%{
-%}
-
-
-SELECT			{ return SELECT; }
-FROM			{ return FROM; }
-WHERE			{ return WHERE; }
-,			{ return COMMA; }
-"="  			{ return EQUALS; }
-"!=" 			{ return NOTEQUALS; }
-"<"  			{ return LESS; }
-">"  			{ return GREATER; }
-"<=" 			{ return LESSEQUALS; }
-">=" 			{ return GREATEREQUALS; }
-AND 			{ return AND; }
-OR			{ return OR; }
-\'                      { return QUOTE; }
-[ \t\n\r]+ ;			
-;			{ return EOL; }
-\'[\*A-Za-z0-9\-\.]+\' {
-	int c = input();
-	unput(c);
-	if(c!='\''){
-		sslval.v_string= icalmemory_tmp_copy(sstext);
-		return STRING;
-	} else {
-		/*ssmore();*/
-	}
-}
-
-[\*A-Za-z0-9\-\.]+		{ sslval.v_string= icalmemory_tmp_copy(sstext);
-			  return STRING; }
-
-
-.			{ return yytext[0]; }
-
-%% 
-
-int sswrap()
-{
-     return 1;
-}
-
diff --git a/libical/src/libicalss/icalssutil.c b/libical/src/libicalss/icalssutil.c
deleted file mode 100644
index 8db141d41d..0000000000
--- a/libical/src/libicalss/icalssutil.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalssutil.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
diff --git a/libical/src/libicalss/icalssutil.h b/libical/src/libicalss/icalssutil.h
deleted file mode 100644
index 3890da6a11..0000000000
--- a/libical/src/libicalss/icalssutil.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalssutil.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#include "ical.h"
-
diff --git a/libical/src/libicalss/icalssyacc.h b/libical/src/libicalss/icalssyacc.h
deleted file mode 100644
index 9a933dc735..0000000000
--- a/libical/src/libicalss/icalssyacc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-typedef union {
-	char* v_string;
-} YYSTYPE;
-#define	STRING	257
-#define	SELECT	258
-#define	FROM	259
-#define	WHERE	260
-#define	COMMA	261
-#define	QUOTE	262
-#define	EQUALS	263
-#define	NOTEQUALS	264
-#define	LESS	265
-#define	GREATER	266
-#define	LESSEQUALS	267
-#define	GREATEREQUALS	268
-#define	AND	269
-#define	OR	270
-#define	EOL	271
-#define	END	272
-
-
-extern YYSTYPE sslval;
diff --git a/libical/src/libicalss/icalssyacc.y b/libical/src/libicalss/icalssyacc.y
deleted file mode 100644
index 047b158e93..0000000000
--- a/libical/src/libicalss/icalssyacc.y
+++ /dev/null
@@ -1,245 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalssyacc.y
-  CREATOR: eric 08 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id: icalssyacc.y,v 1.1.1.2 2001/01/23 19:20:41 jpr Exp $
-  $Locker:  $
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include <limits.h> /* for SHRT_MAX*/
-#include "ical.h"
-#include "pvl.h"
-#include "icalgauge.h"
-#include "icalgaugeimpl.h"
-
-
-extern struct icalgauge_impl *icalss_yy_gauge;
-
-void ssyacc_add_where(struct icalgauge_impl* impl, char* prop, 
-	icalgaugecompare compare , char* value);
-void ssyacc_add_select(struct icalgauge_impl* impl, char* str1);
-void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
-void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
-void sserror(char *s); /* Don't know why I need this.... */
-
-
-
-%}
-
-%union {
-	char* v_string;
-}
-
-
-%token <v_string> STRING
-%token SELECT FROM WHERE COMMA QUOTE EQUALS NOTEQUALS  LESS GREATER LESSEQUALS
-%token GREATEREQUALS AND OR EOL END
-
-%%
-
-query_min: SELECT select_list FROM from_list WHERE where_list
-	   | error { 
-		 icalparser_clear_flex_input();
-                 yyclearin;
-           }	
-	   ;	
-
-select_list:
-	STRING {ssyacc_add_select(icalss_yy_gauge,$1);}
-	| select_list COMMA STRING {ssyacc_add_select(icalss_yy_gauge,$3);}
-	;
-
-
-from_list:
-	STRING {ssyacc_add_from(icalss_yy_gauge,$1);}
-	| from_list COMMA STRING {ssyacc_add_from(icalss_yy_gauge,$3);}
-	;
-
-where_clause:
-	/* Empty */
-	| STRING EQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_EQUAL,$3); }
-	
-	| STRING NOTEQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_NOTEQUAL,$3); }
-	| STRING LESS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_LESS,$3); }
-	| STRING GREATER STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_GREATER,$3); }
-	| STRING LESSEQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_LESSEQUAL,$3); }
-	| STRING GREATEREQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_GREATEREQUAL,$3); }
-	;
-
-where_list:
-	where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_NONE);}
-	| where_list AND where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_AND);} 
-	| where_list OR where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_OR);}
-	;
-
-
-%%
-
-void ssyacc_add_where(struct icalgauge_impl* impl, char* str1, 
-	icalgaugecompare compare , char* value_str)
-{
-
-    struct icalgauge_where *where;
-    char *compstr, *propstr, *c, *s,*l;
-    
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* remove enclosing quotes */
-    s = value_str;
-    if(*s == '\''){
-	s++;
-    }
-    l = s+strlen(s)-1;
-    if(*l == '\''){
-	*l=0;
-    }
-	
-    where->value = strdup(s);
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-    where->prop = icalenum_string_to_property_kind(propstr);    
-
-    where->compare = compare;
-
-    if(where->value == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	free(where->value);
-	return;
-    }
-
-    pvl_push(impl->where,where);
-}
-
-void set_logic(struct icalgauge_impl* impl,icalgaugelogic l)
-{
-    pvl_elem e = pvl_tail(impl->where);
-    struct icalgauge_where *where = pvl_data(e);
-
-    where->logic = l;
-   
-}
-
-
-
-void ssyacc_add_select(struct icalgauge_impl* impl, char* str1)
-{
-    char *c, *compstr, *propstr;
-    struct icalgauge_where *where;
-    
-    /* Uses only the prop and comp fields of the where structure */
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-
-    /* If the property was '*', then accept all properties */
-    if(strcmp("*",propstr) == 0) {
-	where->prop = ICAL_ANY_PROPERTY; 	    
-    } else {
-	where->prop = icalenum_string_to_property_kind(propstr);    
-    }
-    
-
-    if(where->prop == ICAL_NO_PROPERTY){
-	icalgauge_free(where);
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return;
-    }
-
-    pvl_push(impl->select,where);
-}
-
-void ssyacc_add_from(struct icalgauge_impl* impl, char* str1)
-{
-    icalcomponent_kind ckind;
-
-    ckind = icalenum_string_to_component_kind(str1);
-
-    if(ckind == ICAL_NO_COMPONENT){
-	assert(0);
-    }
-
-    pvl_push(impl->from,(void*)ckind);
-
-}
-
-
-void sserror(char *s){
-    fprintf(stderr,"Parse error \'%s\'\n", s);
-}
diff --git a/libical/src/libicalvcal/.cvsignore b/libical/src/libicalvcal/.cvsignore
deleted file mode 100644
index 533caa2f3d..0000000000
--- a/libical/src/libicalvcal/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.la
-*.lo
-.libs
-.deps
-Makefile
-Makefile.in
-libtool
-ltconfig
-ltmain.sh
-stamp-h
-stamp-h.in
-vcc.c
\ No newline at end of file
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
deleted file mode 100644
index 3c307e7f4c..0000000000
--- a/libical/src/libicalvcal/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-lib_LTLIBRARIES = libicalvcal.la
-
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src/libical	\
-	-I$(top_builddir)/src/libical	\
-	-I$(top_srcdir)/src/libicalss	\
-	-I$(srcdir)
-
-libicalvcal_la_LDFLAGS = -version-info 0:0:0
-
-libicalvcal_la_SOURCES =	\
-	icalvcal.c		\
-	vcc.y			\
-	vobject.c		\
-	vcaltmp.c
-
-libicalvcalincludedir = $(includedir)/libicalvcal
-
-libicalvcalinclude_HEADERS =	\
-	icalvcal.h		\
-	port.h			\
-	vcc.h			\
-	vobject.h		\
-	vcaltmp.h
-
-EXTRA_DIST =		\
-	README.TXT	\
-	vcaltest.c	\
-	vctest.c
diff --git a/libical/src/libicalvcal/README.TXT b/libical/src/libicalvcal/README.TXT
deleted file mode 100644
index c8ce8b0979..0000000000
--- a/libical/src/libicalvcal/README.TXT
+++ /dev/null
@@ -1,951 +0,0 @@
-NOTE: If you used the earlier APIs released by Versit

-then you will want to look at the document "migrate.doc"

-included with this package. It contains a discussion of

-the differences between the old API and this one.

-

-----------------------------------------------------------------

-

-The vCard/vCalendar C interface is implemented in the set 

-of files as follows:

-

-vcc.y, yacc source, and vcc.c, the yacc output you will use

-implements the core parser

-

-vobject.c implements an API that insulates the caller from

-the parser and changes in the vCard/vCalendar BNF

-

-port.h defines compilation environment dependent stuff

-

-vcc.h and vobject.h are header files for their .c counterparts

-

-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions

-which you may find useful.

-

-test.c is a standalone test driver that exercises some of

-the features of the APIs provided. Invoke test.exe on a

-VCARD/VCALENDAR input text file and you will see the pretty

-print output of the internal representation (this pretty print

-output should give you a good idea of how the internal 

-representation looks like -- there is one such output in the 

-following too). Also, a file with the .out suffix is generated 

-to show that the internal representation can be written back 

-in the original text format.

-

------------------------------------------------------------------

-			

-			  

-				VObject for VCard/VCalendar

-

-Table of Contents

-=================

-1. VObject

-2. Internal Representations of VCard/VCalendar

-3. Iterating Through VObject's Properties or Values

-4. Pretty Printing a VObject Tree

-5. Building A VObject Representation of A VCard/VCalendar

-6. Converting A VObject Representation Into Its Textual Representation

-7. Miscellaneous Notes On VObject APIs usages

-8. Brief descriptions of each APIs

-9. Additional Programming Notes.

-

-This document is mainly about the VObject and its APIs. The main

-use of a VObject is to represent a VCard or a VCalendar inside

-a program. However, its use is not limited to aforemention as it

-can represent an arbitrary information that makes up of a tree or

-forest of properties/values.

-

-1. VObject

-   =======

-A VObject can have a name (id) and a list of associated properties and

-a value. Each property is itself a VObject.

-

-2. Internal Representations of VCard/VCalendar

-   ===========================================

-A list of VCard or a VCalendar is represented by a list of VObjects.

-The name (id) of the VObjects in the list is either VCCardProp or

-VCCalProp. Each of these VObjects can have a list of properties.

-Since a property is represented as a VObject, each of these properties

-can have a name, a list of properties, and a value.

-

-For example, the input file "vobject.vcf":

-	

-BEGIN:VCARD

-N:Alden;Roland

-FN:Roland H. Alden

-ORG:AT&T;Versit Project Office

-TITLE:Consultant

-EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-EMAIL;INTERNET:ralden@sfgate.com

-EMAIL;MCIMail:242-2200

-LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111

-LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111=0A=

-U.S.A.

-TEL;WORK;PREF;MSG:+1 415 296 9106

-TEL;WORK;FAX:+1 415 296 9016

-TEL;MSG;CELL:+1 415 608 5981

-ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-SOUND:ROW-LAND H ALL-DIN

-LOGO;GIF;BASE64:

-    R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    QjExMSEhIRAQEO///87v9973/73n95zW71K13jGl1nvG50Kt3iGc1gCMzq3e94zO

-    7xCU1nO952O15wAAACwAAAAApgBOAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv

-    /8CgcEj8QTaeywWTyWCUno2kSK0KI5tLc8vtNi+WiHVMlj0mFK96nalsxOW4fPSw

-    cNj4tQc+7xcjGh4WExJTJYUTFkp3eU0eEH6RkpOUlTARhRoWm5ydFpCWoS0QEqAu

-    ARKaHRcVjV0borEoFl0cSre4Sq67FA+yvwAeTU8XHZ7HmxS6u2wVfMCVpAE3pJoW

-    ylrMptDcOqSF4OHg3eQ5pInInb7lcc86mNbLzBXsZbRfUOn6ucyNHvVWJHCpQFDf

-    MWwEEzLqx2YCQCqF3OnItClJNmYcJD7cSAKTuI/gtnEcOQKkyVIk6/+ds5CkFcMM

-    61LiENikwi1jBnNyuvUSjwWZOS5uIZarqNFcNl32XMMB6I06GgoJ+bZp1ZKeDl8E

-    +MC1K1cBIhZ4HUu2LAsCZdOWRQDt20lxIlccSHsgrNq7Xc/ixcsWmNu34WKyYJCW

-    gQjCe9XqTZy2L4pv04gg2sSKSc8OLgTcBSuWsdkVaD2TdXyiQxebFyjo1Gnx6tJm

-    LuaqrdtZtNfFtruSNmF5IKujwIsmJbjwtRqNJhrcNVw79wcRAgogmE4ArIjQzj/s

-    JvHAGCFDQR4UqigPK4sBe62XwO51OwADiMcqUG+iOdcFAL+hW20BfAoEexlwAnu6

-    mZDAXQ1EVh//WfhxJB5gIbHgwFgOTOiVAgOuVQKAfKFg3weGwSBYFZMp4hpDGKyA

-    3lgJKECWgiMQyBVpW+0V4oJjNfhCNkR1IgWEb21QlRK9GdfFCgeOZYBsXgm4noYj

-    GEBhAQHYh0J8XenoQnFGdrkUciJY6FUAK15ogozakcBhliKsyZWHDMZQ0wWC/Aim

-    DB6h01KRr/lXQgFxAqDcWDACgCZpUnrVQJtjwTnWjS6MWAYqqfDnSaEkJOlVXQBo

-    2pWTMUJ53WgAuPncCR9q6VQMAYjZlXWJmknCoSUM2p4BC+SaKwG88hoZlvfFMM4f

-    hQh5TXkv+RklWYtC91mopJIAKFkJlDAW/wF25ShnLbeo5gmQ+1FGkJdrKCuCi2OR

-    BuwHBcwqKgABrMtVAgpem61XkLbAJ7n8uiIpvGVhO4KpH1QLbbpqLheZvQCkGoNL

-    thSzSTg2UGVBBzbtaxwKsYrmgLvRAlCmWgwMAADD66rKAgR3XlGspcdkZYK8ibU7

-    asgEl+XAyB8I7PCqMWiWncGGimpfAgO4ypXSPpOVLwsRCDJxRD2AoyeRRv5kApO5

-    fXwzwvfOKLKtaTWtbQxccmGLTZy8xYlVSvXbhbk0M2YzrYfJJ0K8m+V9NgxpyC04

-    UycI/aiuiH9Y8NftDUwWp1Wm5UABnAUKwwRsPFGBt4Oc9PZvGvNLwf8JOZt8Arpe

-    eY23yDovwIDiBX74NAsPVLDJj3Hh4JEExsKcjrlKf9DsCVx3ZfLqAKBuG1s/A90C

-    z2KjYHjjyPOdG1spz6BBUr+BcUxUb1nDCTa/VZD2Uv+YkLPAKJC9dNEh7628WgqI

-    ybzlaA+ufxMa6bxC6ciLUQLcx5UGIAAsAkDA6wQkOxrcY39yo4cQMNWCAPTKV1R4

-    wPkgaBxzOc8FtMiF1NoGoXBRJjgoPApmPsjCFlbMdzCM4TFy50IXxI2DPcHAv2rY

-    gghsEIeu8CAPW6ABIPYEFkOsAeaMyIz0JfGJUExBBGRIRX0IMYovWCIT1eBELNpA

-    i1vcgta8iANPCIQOghzQABl30J0tXqBla4wjFLFQxZzAUY42CIAd5OYBCuKxB2c4

-    I0b28EcrQKADgmSKB9RYyDhA4BqCxIBqrtjIMTwoFeCjYSU3KZMQAAA7

-

-BEGIN:VCALENDAR

-DCREATED:19960523T100522

-PRODID:-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN

-VERSION:0.3

-BEGIN:VEVENT

-START:19960523T120000

-END:19960523T130000

-SUBTYPE:PHONE CALL

-SUMMARY:VERSIT PDI PR Teleconference/Interview

-DESCRIPTION:VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland

-END:VEVENT

-BEGIN:VEVENT

-START:19960523T113000

-END:19960523T115500

-SUBTYPE:LUNCH

-SUMMARY:Eat in the cafeteria today

-END:VEVENT

-END:VCALENDAR

-

-END:VCARD

-

-

-will conceptually be be represented as

-    vcard

-	VCNameProp

-	    VCFamilyNameProp=Alden

-	    VCGivenNameProp=Roland

-	VCFullNameProp=Roland H.Alden

-	....

-	

-note that

-    EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-will be represented as:

-	VCEmailAddress=sf!rincon!ralden@alden.attmail.com

-	    VCWork

-	    VCPreferred

-	    VCInternet

-where the lower level properties are properties of the property

-VCEmailAddress.

-

-Groupings are flattened out in the VObject representation such

-that:

-	a.b:blah

-	a.c:blahblah

-are represented as:

-	b=blah

-	    VCGrouping=a

-	c=blahblah

-	    VCGrouping=a

-i.e. one can read the above as:

-	 the property "b" has value "blah" and property "VCGrouping"

-		with the value "a".

-	 the property "c" has value "blahblah" and property "VCGrouping"

-		with the value "a".

-likewise, multi-level groupings are flatten similarly. e.g.

-	a.b.c:blah

-	a.b.e:blahblah

--->

-	c=blah

-	    VCGrouping=b

-		VCGrouping=a

-	e=blahblah

-	    VCGrouping=b

-		VCGrouping=a

-which read:

-	 the property "c" has value "blah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-	 the property "e" has value "blahblah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-

-3. Iterating Through VObject's Properties or Values

-   ================================================

-The following is a skeletal form of iterating through

-all properties of a vobject, o:

-

-    // assume the object of interest, o, is of type VObject

-    VObjectIterator i;

-    initPropIterator(&i,o);

-    while (moreIteration(&i)) {

-	VObject *each = nextVObject(&i);

-	// ... do something with "each" property 

-	}

-

-Use the API vObjectName() to access a VObject's name.

-Use the API vObjectValueType() to determine if a VObject has

-	a value. For VCard/VCalendar application, you

-	should not need this function as practically

-	all values are either of type VCVT_USTRINGZ or

-	VCVT_RAW (i.e set by setVObjectUStringZValue and

-	setVObjectAnyValue APIs respectively), and the

-	value returned by calls to vObjectUStringZValue

-	and vObjectAnyValue are 0 if a VObject has no

-	value. (There is a minor exception where VObject with

-	VCDataSizeProp has value that is set by

-	setVObjectLongValue).

-Use the APIs vObject???Value() to access a VObject's value.

-	where ??? is the expected type.

-Use the APIs setvObject???Value() to set or modify a VObject's value.

-	where ??? is the expected type.

-Use the API isAPropertyOf() to query if a name match the name of

-	a property of a VObject. Since isAPropertyOf() return

-	the matching property, we can use that to retrieve

-	a property and subsequently the value of the property.

-

-4. Pretty Printing a VObject Tree

-   ==============================

-VObject tree can be pretty printed with the printVObject() function.

-The output of pretty printing a VObject representation of the input

-test file "vobject.vcf" is shown below. Note that the indentation

-indicates the tree hirerarchy where the immediate children nodes

-of a parent node is all at the same indentation level and the

-immediate children nodes are the immediate properties of the

-associated parent nodes.  In the following, {N,FN,ORG,TITLE,...}

-are immediate properties of VCARD. {F and G} are properties of N

-with value {"Alden" and "Roland"} respectively; FN has no property

-but has the value "Roland H. Alden"; EMAIL has value and

-the properties WORK, PREF, and INTERNET.

-

-

-VCARD

-    N

-        F="Alden"

-        G="Roland"

-    FN="Roland H. Alden"

-    ORG

-        ORGNAME="AT&T"

-        OUN="Versit Project Office"

-    TITLE="Consultant"

-    EMAIL="sf!rincon!ralden@alden.attmail.com"

-        WORK

-        PREF

-        INTERNET

-    EMAIL="ralden@sfgate.com"

-        INTERNET

-    EMAIL="242-2200"

-        MCIMail

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111"

-        DOM

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111

-            U.S.A."

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    TEL="+1 415 296 9106"

-        WORK

-        PREF

-        MSG

-    TEL="+1 415 296 9016"

-        WORK

-        FAX

-    TEL="+1 415 608 5981"

-        MSG

-        CELL

-    ADR

-        EXT ADD="Suite 2208"

-        STREET="One Pine Street"

-        L="San Francisco"

-        R="CA"

-        PC="94111"

-        C="U.S.A."

-    SOUND="ROW-LAND H ALL-DIN"

-    LOGO=[raw data]

-        GIF

-        BASE64

-        DataSize=1482

-VCALENDAR

-    DCREATED="19960523T100522"

-    PRODID="-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN"

-    VERSION="0.3"

-    VEVENT

-        START="19960523T120000"

-        END="19960523T130000"

-        SUBTYPE="PHONE CALL"

-        SUMMARY="VERSIT PDI PR Teleconference/Interview"

-        DESCRIPTION="VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland"

-    VEVENT

-        START="19960523T113000"

-        END="19960523T115500"

-        SUBTYPE="LUNCH"

-        SUMMARY="Eat in the cafeteria today"

-

-5. Building A VObject Representation of A VCard/VCalendar

-   ======================================================

-The parser in vcc.y converts an input file with one or more

-VCard/VCalendar that is in their textual representation

-into their corresponding VObject representation.

-

-VObject representation of a VCard/VCalendar can also be built

-directly with calls to the VObject building APIs. e.g.

-

-	VObject *prop;

-	VObject *vcard = newVObject(VCCardProp);

-	prop = addProp(vcard,VCNameProp);

-		addPropValue(prop,VCFamilyNameProp,"Alden");

-		addPropValue(prop,VCGivenNameProp,"Roland");

-	addPropValue(vcard,VCFullNameProp,"Roland H. Alden");

-	....

-

-6. Converting A VObject Representation Into Its Textual Representation

-   ===================================================================

-The VObject representation can be converted back to its textual

-representation via the call to writeVObject() or writeMemVObject()

-API. e.g.

-   a. to write to a file:

-	// assume vcard is of type VObject

-	FILE *fp = fopen("alden.vcf","w");

-	writeVObject(fp,vcard);

-   a. to write to memory, and let the API allocate the required memory.

-	char* clipboard = writeVObject(0,0,vcard);

-	... do something to clipboard

-	free(clipboard);

-   b. to write to a user allocated buffer:

-	char clipboard[16384];

-	int len = 16384;

-	char *buf  = writeVObject(clipboard,&len,vcard);

-	... buf will be equal to clipboard if the write

-	is successful otherwise 0.

-

-In the case of writing to memory, the memory buffer can be either

-allocated by the API or the user. If the user allocate the

-memory for the buffer, then the length of the buffer needs to be

-communicated to the API via a variable. The variable passed as

-the length argument will be overwritten with the actual size

-of the text output. A 0 return value from writeMemVObject()

-indicates an error which could be caused by overflowing the

-size of the buffer or lack of heap memory.

-

-7. Miscellaneous Notes On VObject APIs usages

-   ==========================================

-a. vcc.h -- contains basic interfaces to the parser:

-    VObject* Parse_MIME(const char *input, unsigned long len);

-    VObject* Parse_MIME_FromFile(FILE *file);

-	-- both of this return a null-terminated list of

-	   VObject that is either a VCARD or VCALENDAR.

-	   To iterate through this list, do

-		VObject *t, *v;

-		v = Parse_Mime_FromFile(fp);

-		while (v) {

-		    // ... do something to v.

-		    t = v;

-		    v = nextVObjectInList(v);

-		    cleanVObject(t);

-		    }

-	    note that call to cleanVObject will release

-	    resource used to represent the VObject.

-

-b. vobject.h -- contains basic interfaces to the VObject APIs.

-	see the header for more details.

-	The structure of VObject is purposely (hiddened) not exposed

-	to the user. Every access has to be done via

-	the APIs. This way, if we need to change the

-	structure or implementation, the client need not

-	recompile as long as the interfaces remain the

-	same.

-

-c. values of a property is determined by the property definition

-	itself. The vobject APIs does not attempt to enforce

-	any of such definition. It is the consumer responsibility

-	to know what value is expected from a property. e.g

-	most properties have unicode string value, so to access

-	the value of these type of properties, you will use

-	the vObjectUStringZValue() to read the value and

-	setVObjectUStringZValue() to set or modify the value.

-	Refer to the VCard and VCalendar specifications for

-	the definition of each property.

-

-d. properties name (id) are case incensitive.

-

-8. Brief descriptions of each APIs

-   ===============================

-   * the predefined properties' names (id) are listed under vobject.h

-	each is of the form VC*Prop. e.g.

-		#define VC7bitProp		"7BIT"

-		#define VCAAlarmProp	"AALARM"

-		....

-

-   * consumer of a VObject can only define pointers to VObject.

-

-   * a variable of type VObjectIterator, say "i", can be used to iterate

-	through a VObject's properties, say "o". The APIs related to

-	VObjectIterator are:

-		void initPropIterator(VObjectIterator *i, VObject *o);

-			-- e.g. usage

-				initPropIterator(&i,o);

-		int moreIteration(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) { ... }

-		VObject* nextVObject(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) {

-				    VObject *each = nextVObject(&i);

-				    }

-

-    * VObject can be chained together to form a list. e.g. of such

-	use is in the parser where the return value of the parser is

-	a link list of VObject. A link list of VObject can be

-	built by:

-		void addList(VObject **o, VObject *p);

-	and iterated by

-		VObject* nextVObjectInList(VObject *o);

-			-- next VObjectInList return 0 if the list

-				is exhausted.

-

-    * the following APIs are mainly used to construct a VObject tree:

-	VObject* newVObject(const char *id);

-	    -- used extensively internally by VObject APIs but when

-		used externally, its use is mainly limited to the

-		construction of top level object (e.g. an object

-		with VCCardProp or VCCalendarProp id).

-	

-	void deleteVObject(VObject *p);

-	    -- to deallocate single VObject, for most user, use

-		cleanVObject(VObject *o) instead for freeing all

-		resources associated with the VObject.

-

-	char* dupStr(const char *s, unsigned int size);

-	    -- duplicate a string s. If size is 0, the string is

-		assume to be a null-terminated. 

-

-	void deleteStr(const char *p);

-	    -- used to deallocate a string allocated by dupStr();

-

-	void setVObjectName(VObject *o, const char* id);

-	    -- set the id of VObject o. This function is not

-		normally used by the user. The setting of id

-		is normally done as part of other APIs (e.g.

-		addProp()).

-

-	void setVObjectStringZValue(VObject *o, const char *s);

-	    -- set a string value of a VObject.

-

-	void setVObjectUStringZValue(VObject *o, const wchar_t *s);

-	    -- set a Unicode string value of a VObject.

-

-	void setVObjectIntegerValue(VObject *o, unsigned int i);

-	    -- set an integer value of a VObject.

-

-	void setVObjectLongValue(VObject *o, unsigned long l);

-	    -- set an long integer value of a VObject.

-

-	void setVObjectAnyValue(VObject *o, void *t);

-	    -- set any value of a VObject. The value type is

-		unspecified.

-

-	VObject* setValueWithSize(VObject *prop, void *val, unsigned int size);

-	    -- set a raw data (stream of bytes) value of a VObject

-		whose size is size. The internal VObject representation

-		is

-			this object = val

-			    VCDataSizeProp=size

-		i.e. the value val will be attached to the VObject prop

-		and a property of VCDataSize whose value is size

-		is also added to the object.

-		

-	void setVObjectVObjectValue(VObject *o, VObject *p);

-	    -- set a VObject as the value of another VObject.

-

-	const char* vObjectName(VObject *o);

-	    -- retrieve the VObject's Name (i.e. id).

-

-	const char* vObjectStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated string.

-

-	const wchar_t* vObjectUStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated unicode string.

-

-	unsigned int vObjectIntegerValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		integer.

-

-	unsigned long vObjectLongValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		long integer.

-

-	void* vObjectAnyValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		any value.

-

-	VObject* vObjectVObjectValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		a VObject.

-

-	VObject* addVObjectProp(VObject *o, VObject *p);

-	    -- add a VObject p as a property of VObject o.

-		(not normally used externally for building a

-		VObject).

-

-	VObject* addProp(VObject *o, const char *id);

-	    -- add a property whose name is id to VObject o.

-

-	VObject* addPropValue(VObject *o, const char *id, const char *v);

-	    -- add a property whose name is id and whose value

-		is a null-terminated string to VObject o.

-

-	VObject* addPropSizedValue(VObject *o, const char *id,

-			const char *v, unsigned int size);

-	    -- add a property whose name is id and whose value

-		is a stream of bytes of size size, to VObject o.

-

-	VObject* addGroup(VObject *o, const char *g);

-	    -- add a group g to VObject o.

-		e.g. if g is a.b.c, you will have

-		    o

-			c

-			   VCGroupingProp=b

-			       VCGroupingProp=a

-		and the object c is returned.

-		

-	VObject* isAPropertyOf(VObject *o, const char *id);

-	     -- query if a property by the name id is in o and

-		return the VObject that represent that property.

-

-	void printVObject(VObject *o);

-	     -- pretty print VObject o to stdout (for debugging use).

-

-	void writeVObject(FILE *fp, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to file.

-

-	char* writeMemVObject(char *s, int *len, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to memory. If s is 0, then memory required

-		to hold the textual representation will be allocated

-		by this API. If a variable len is passed, len will

-		be overwriten with the byte size of the textual

-		representation. If s is non-zero, then s has to

-		be a user allocated buffer whose size has be passed

-		in len as a variable. Memory allocated by the API

-		has to be freed with call to free. The return value

-		of this API is either the user supplied buffer,

-		the memory allocated by the API, or 0 (in case of

-		failure).

-

-	void cleanStrTbl();

-		-- this function has to be called when all

-		VObject has been destroyed.

-

-	void cleanVObject(VObject *o);

-		-- release all resources used by VObject o.

-

-	wchar_t* fakeUnicode(const char *ps, int *bytes);

-		-- convert char* to wchar_t*.

-

-	extern int uStrLen(const wchar_t *u);

-		-- length of unicode u.

-

-	char *fakeCString(const wchar_t *u);

-		-- convert wchar_t to CString (blindly assumes that

-		this could be done).

-

-9. Additional Programming Notes

-   ============================

-In the following notes, please refers to the listing

-of Example.vcf and its VObject Representation

-(shown at the end of this section).

-

-* Handling the Return Value of the VCard/VCalendar Parser

-    The example input text file contains two root VObjects

-    (a VCalendar and a VCard). The output of the VCard/VCalendar

-    parser is a null-terminated list of VObjects. For this

-    particular input file, the list will have two VObjects.

-    The following shows a template for iterating through the

-    output of the Parser:

-

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName("example.vcf");

-	while (v) {

-	    // currently, v will either be a VCard or a VCalendar

-	    //	do whatever your application need to do to

-	    //  v here ...

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-

-* Iterating Through a VCard/VCalendar VObject

-    From the VObject APIs point of view, a VCard VObject

-    is the same as a VCalendar VObject. However, the application

-    needs to know what are in a VCard or a VCalendar.

-    For example, A VCalendar VObject can have VCDCreatedProp,

-    a VCGEOLocationProp, etc, and one or more VCEventProp and

-    or VCTodoProp. The VCEventProp and VCTodoProp can have

-    many properties of their own, which in turn could have

-    more properties (e.g. VCDAlarmProp can be a VCEventProp

-    VObject's property, and VCRunTimeProp can be a

-    VCDAlarmProp VObject's property. Because a VObject tree

-    can be arbitrarily complex, in general, to process all

-    properties and values of a VObject tree, a recursive walk

-    is desirable. An example recursive VObject tree walk

-    can be found in the vobject.c source lines for printVObject*

-    and writeVObject* APIs. Depending on what the application need

-    to do with a VCard or a VCalendar, a recursive walk

-    of the VObject tree may or may not be desirable. An example

-    template of a non-recursive walk is shown below:

-	

-    void processVCardVCalendar(char *inputFile)

-    {

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName(inputFile);

-	while (v) {

-	    char *n = vObjectName(v);

-	    if (strcmp(n,VCCardProp) == 0) {

-		do_VCard(v);

-		}

-	    else if (strcmp(n,VCCalendarProp) == 0) {

-		do_VCalendar(v);

-		}

-	    else {

-		// don't know how to handle anything else!

-		}

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-    }

-

-    void  do_VCard(VObject *vcard)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCard VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCNameProp)==0) {

-		do_name(eachProp);

-		}

-	    else if (strcmp(n,VCEmailProp)==0) {

-		do_email(eachProp);

-		}

-	    else if (strcmp(n,VCLabelProp)==0) {

-		do_label(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void  do_VCalendar(VObject *vcal)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCalendar VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCDCreatedProp)==0) {

-		do_DCreated(eachProp);

-		}

-	    else if (strcmp(n,VCVersionProp)==0) {

-		do_Version(eachProp);

-		}

-	    else if (strcmp(n,VCTodoProp)==0) {

-		do_Todo(eachProp);

-		}

-	    else if (strcmp(n,VCEventProp)==0) {

-		do_Event(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void do_Todo(VObject *vtodo) { ... }

-

-    void do_Event(VObject *vevent) { ... }

-

-    ...

-    

-* Property's Values and Properties

-    The VObject APIs do not attempt to check for the

-    correctness of the values of a property. Nor do they

-    will prevent the user from attaching a non-VCard/VCalendar

-    standard property to a VCard/VCalendar property. Take

-    the example of line [11] of the example, "O.K" is not

-    a valid value of VCStatusProp.  It is up to the application

-    to accept or reject the value of a property.

-    

-* Output of printVObject

-    PrintVObject pretty prints a VObject tree in human

-    readable form. See the listing at the end of the file

-    for an example output of printVObject on the example

-    input file "Example.vcf".

-

-    Note that binary data are not shown in the output of

-    printVObject. Instead, a note is made ([raw data]) to

-    indicate that there exists such a binary data.

-

-* Note on Binary Data

-    When the value of a property is a binary data, it is only

-    useful to know the size of the binary data.

-

-    In the case of the VCard/VCalendar parser, it chooses

-    to represent the size information as a separate property

-    called VCDataSizeProp whose value is the size of the binary

-    data. The APIs sequence to construct the VObject subtree

-    of line [44] of Example.vcf is

-

-	    // VObject *vcard;

-	    VObject *p1 = addProp(vcard,VCLogoProp);

-	    (void) addProp(p1,VCGIFProp);

-	    (void) addProp(p1,VCBASE64Prop);

-	    VObject *p2 = addProp(p1,VCDataSizeProp);

-	    (void) setVObjectLongValue(p2,1482);

-	    setVObjectAnyValue(vcard,...pointer to binary data);

-	

-    Note the presence of VCBase64Prop will cause the

-    writeVObject API to output the binary data as BASE64 text.

-    For VCard/VCalendar application, having the VCBase64Prop

-    property is pratically always neccessary for property with

-    binary data as its value.

-	

-* Note on Quoted-Printable String

-    String value with embedded newline are written out as

-    quoted-prinatable string. It is therefore important

-    to mark a property with a string value that has

-    one or more embedded newlines, with the VCQutedPrintableProp

-    property. e.g.

-			

-	// VObject *root;

-	char *msg="To be\nor\nnot to be";

-	VObject *p = addPropValue(root,VCDescriptionProp,msg);

-	    // the following is how you mark a property with

-	    //	a property. In this case, the marker is

-	    //  VCQuotedPrintableProp

-	    addProp(p,VCQuotedPrintableProp);

-

-* Note on Unicode

-    Although, the current parser takes ASCII text file only,

-    string values are all stored as Unicode in the VObject tree.

-    For now, when using the VObject APIs to construct a

-    VObject tree, one should always convert ASCII string value

-    to a Unicode string value:

-

-	// VObject *root;

-	VObject *p = addProp(root,VCSomeProp);

-	setVObjectUStringZValue(p,fakeUnicode(someASCIIStringZvalue));

-

-    An API is provided to simplify the above process:

-

-	addPropValue(root,VCSomeProp,someASCIIStringZValue);

-

-    Note that someASCIISTringZValue is automatically converted to

-    Unicode by addPropValue API, where as, the former code

-    sequence do an explicit call to fakeUnicode.

-

-    To read back the value, one should use the vObjectUStringZValue

-    API not vObjectStringZValue API. The value returned by the

-    vObjectUStringZValue API is a Unicode string. If the application

-    do not know how to handle Unicode string, it can use the

-    fakeCString API to convert it back to ASCII string (as long

-    as the conversion is meaningful).

-

-    Note that fakeCString return a heap allocated memory. It is

-    important to call deleteStr on fakeCString return value if

-    it is not longer required (or there will be memory leak).

-

-    NOTE: Unfortunately, at the point when this document is written,

-    there is still no consensus on how Unicode is to be handled

-    in the textual representation of VCard/VCalendar. So, there

-    is no version of writeVObject and the parser to output and

-    input Unicode textual representation of VCard/VCalendar.

-   

-

-Example.vcf

------------

-line

-number Input Text (example.vcf)

------- ----------

-1      BEGIN:VCALENDAR

-2      DCREATED:19961102T100522

-3      GEO:0,0

-4      VERSION:1.0

-5      BEGIN:VEVENT

-6      DTSTART:19961103T000000

-7      DTEND:20000101T000000

-8      DESCRIPTION;QUOTED-PRINTABLE:To be =0A=

-9      or =0A=

-10     not to be

-11     STATUS:O.K.

-12     X-ACTION:No action required

-13     DALARM:19961103T114500;5;3;Enjoy

-14     MALARM:19970101T120000;;;johny@nowhere.com;Call Mom.

-15     END:VEVENT

-16

-17     BEGIN:VTODO

-18     DUE:19960614T0173000

-19     DESCRIPTION:Relex.

-20     END:VTODO

-21

-22     END:VCALENDAR

-23

-24     BEGIN:VCARD

-25     N:Alden;Roland

-26     FN:Roland H. Alden

-27     ORG:AT&T;Versit Project Office

-28     TITLE:Consultant

-29     EMAIL;WORK;PREF;INTERNET:ralden@ralden.com

-30     LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-31     Suite 2208=0A=

-32     One Pine Street=0A=

-33     San Francisco, CA 94111

-34     LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-35     Suite 2208=0A=

-36     One Pine Street=0A=

-37     San Francisco, CA 94111=0A=

-38     U.S.A.

-39     TEL;WORK;PREF;MSG:+1 415 296 9106

-40     TEL;WORK;FAX:+1 415 296 9016

-41     TEL;MSG;CELL:+1 415 608 5981

-42     ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-43     SOUND:ROW-LAND H ALL-DIN

-44     LOGO;GIF;BASE64:

-45         R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    ... 30 lines of BASE64 data not shown here.

-76     END:VCARD

-

-

-VObject Representation of Example.vcf:

--------------------------------------

-line

-in

-text

-file  VObject Tree as Printed by printVObject API

-----  -------------------------------------------

-1     VCALENDAR

-2         DCREATED="19961102T100522"

-3         GEO="0,0"

-4         VERSION="1.0"

-5         VEVENT

-6             DTSTART="19961103T000000"

-7             DTEND="20000101T000000"

-8             DESCRIPTION="To be

-9                     or

-10                    not to be"

-8                 QUOTED-PRINTABLE

-11            STATUS="O.K."

-12            X-ACTION="No action required"

-13            DALARM

-13                RUNTIME="19961103T114500"

-13                SNOOZETIME="5"

-13                REPEATCOUNT="3"

-13                DISPLAYSTRING="Enjoy"

-14            MALARM

-14                RUNTIME="19970101T120000"

-14                EMAIL="johny@nowhere.com"

-14                NOTE="Call Mom"

-17        VTODO

-18            DUE="19960614T0173000"

-19            DESCRIPTION="Relex."

-24    VCARD

-25        N

-25            F="Alden"

-25            G="Roland"

-26        FN="Roland H. Alden"

-27        ORG

-27            ORGNAME="AT&T"

-27            OUN="Versit Project Office"

-28        TITLE="Consultant"

-29        EMAIL="ralden@alden.com"

-29            WORK

-29            PREF

-29            INTERNET

-30        LABEL="Roland H. Alden

-31                Suite 2208

-32                One Pine Street

-33                San Francisco, CA 94111"

-30            DOM

-30            POSTAL

-30            PARCEL

-30            HOME

-30            WORK

-30            QUOTED-PRINTABLE

-34        LABEL="Roland H. Alden

-35                Suite 2208

-36                One Pine Street

-37                San Francisco, CA 94111

-38                U.S.A."

-34            POSTAL

-34            PARCEL

-34            HOME

-34            WORK

-34            QUOTED-PRINTABLE

-39        TEL="+1 415 296 9106"

-39            WORK

-39            PREF

-39            MSG

-40        TEL="+1 415 296 9016"

-40            WORK

-40            FAX

-41        TEL="+1 415 608 5981"

-41            MSG

-41            CELL

-42        ADR

-42            EXT ADD="Suite 2208"

-42            STREET="One Pine Street"

-42            L="San Francisco"

-42            R="CA"

-42            PC="94111"

-42            C="U.S.A."

-43        SOUND="ROW-LAND H ALL-DIN"

-44        LOGO=[raw data]

-44            GIF

-44            BASE64

-44            DATASIZE=1482

-

diff --git a/libical/src/libicalvcal/icalvcal.c b/libical/src/libicalvcal/icalvcal.c
deleted file mode 100644
index 9ae00a7d90..0000000000
--- a/libical/src/libicalvcal/icalvcal.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/*======================================================================
-  FILE: icalvcal.c
-  CREATOR: eric 25 May 00
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvcal.c
-
-
-
-  The icalvcal_convert routine calls icalvcal_traverse_objects to do
-  its work.s his routine steps through through all of the properties
-  and components of a VObject. For each name of a property or a
-  component, icalvcal_traverse_objects looks up the name in
-  conversion_table[]. This table indicates wether the name is of a
-  component or a property, lists a routine to handle conversion, and
-  has extra data for the conversion.
-
-  The conversion routine will create new iCal components or properties
-  and add them to the iCal component structure. 
-
-  The most common conversion routine is dc_prop. This routine converts
-  properties for which the text representation of the vCal component
-  is identical the iCal representation.
-
-  ======================================================================*/
-
-#include "icalvcal.h"
-#include <string.h>   
-
-enum datatype {
-    COMPONENT,
-    PROPERTY,
-    PARAMETER,
-    UNSUPPORTED
-};
-
-
-struct conversion_table_struct {
-	char* vcalname;
-	enum datatype type;
-	void* (*conversion_func)(int icaltype, VObject *o);
-	int icaltype;
-};
-
-struct conversion_table_struct conversion_table[];
-void* dc_prop(int icaltype, VObject *object);
-
-static void icalvcal_traverse_objects(VObject *object,icalcomponent* last_comp,
-			     icalproperty* last_prop)
-{
-    VObjectIterator iterator;
-    char* name = "[No Name]";
-    icalcomponent* subc = 0;
-    int i;
-    
-    if ( vObjectName(object)== 0){
-	printf("ERROR, object has no name");
-	assert(0);
-	return;
-    }
-
-    name = (char*)vObjectName(object);
-
-    /* Lookup this object in the conversion table */
-    for (i = 0; conversion_table[i].vcalname != 0; i++){
-	if(strcmp(conversion_table[i].vcalname, name) == 0){
-	    break;
-	}
-    }
-    
-    /* Did not find the object. It may be an X-property, or an unknown
-       property */
-    if (conversion_table[i].vcalname == 0){
-
-	/* Handle X properties */
-	if(strncmp(name, "X-",2) == 0){
-	   icalproperty* prop = (icalproperty*)dc_prop(ICAL_X_PROPERTY,object);
-	   icalproperty_set_x_name(prop,name);
-	   icalcomponent_add_property(last_comp,prop);
-	} else {
-	    assert(0);
-	    return;
-	}
-
-    } else {
-	
-	/* The vCal property is in the table, and it is not an X
-           property, so try to convert it to an iCal component,
-           property or parameter. */
-	
-	switch(conversion_table[i].type){
-	    
-	    
-	    case COMPONENT: {
-		subc = 
-		    (icalcomponent*)(conversion_table[i].conversion_func
-				     (conversion_table[i].icaltype,
-				      object));
-		
-		icalcomponent_add_component(last_comp,subc);
-		
-		assert(subc!=0);
-		
-		break;
-	    }
-	    
-	    case PROPERTY: {
-		
-		if (vObjectValueType(object) &&
-		    conversion_table[i].conversion_func != 0 ) {
-		    
-		    icalproperty* prop = 
-			(icalproperty*)(conversion_table[i].conversion_func
-					(conversion_table[i].icaltype,
-					 object));		
-		    
-		    icalcomponent_add_property(last_comp,prop);
-		    last_prop = prop;
-		    
-		}
-		break;
-	    }
-	    
-	    case PARAMETER: {
-		break;
-	    }
-	    
-	    case UNSUPPORTED: {
-
-		/* If the property is listed as UNSUPPORTED, insert a
-                   X_LIC_ERROR property to note this fact. */
-
-		char temp[1024];
-		char* message = "Unsupported vCal property";
-		icalparameter *error_param;
-		icalproperty *error_prop;
-
-		snprintf(temp,1024,"%s: %s",message,name);
-		
-		error_param = icalparameter_new_xlicerrortype(
-		    ICAL_XLICERRORTYPE_UNKVCALPROP
-		    );
-
-		error_prop = icalproperty_new_xlicerror(temp);
-		icalproperty_add_parameter(error_prop, error_param);
-
-		icalcomponent_add_property(last_comp,error_prop);
-
-		break;
-	    }
-	}
-    }
-
-
-    /* Now, step down into the next vCalproperty */
-
-    initPropIterator(&iterator,object);
-    while (moreIteration(&iterator)) {
-	VObject *eachProp = nextVObject(&iterator);
-
-	/* If 'object' is a component, then the next traversal down
-           should use it as the 'last_comp' */
-
-	if(subc!=0){
-	    icalvcal_traverse_objects(eachProp,subc,last_prop);
-	
-	} else {
-	    icalvcal_traverse_objects(eachProp,last_comp,last_prop);
-	}
-    }
-}
-
-icalcomponent* icalvcal_convert(VObject *object){
-
-   char* name =  (char*)vObjectName(object);
-   icalcomponent* container = icalcomponent_new(ICAL_XROOT_COMPONENT);
-   icalcomponent* root;
-
-   icalerror_check_arg_rz( (object!=0),"Object");
-
-   /* The root object must be a VCALENDAR */
-   if(*name==0 || strcmp(name,VCCalProp) != 0){
-       return 0; /* HACK. Should return an error */
-   }
-
-
-   icalvcal_traverse_objects(object,container,0);
-   
-   /* HACK. I am using the extra 'container' component because I am
-      lazy. I know there is a way to get rid of it, but I did not care
-      to find it. */
-
-   root = icalcomponent_get_first_component(container,ICAL_ANY_COMPONENT);
-
-   icalcomponent_remove_component(container, root);
-   icalcomponent_free(container);
-
-   return root;
-
-}
-
-/* comp() is useful for most components, but alarm, daylight and
- * timezone are different. In vcal, they are properties, and in ical,
- * they are components. Although because of the way that vcal treats
- * everything as a property, alarm_comp() daylight_comp() and
- * timezone_comp() may not really be necessary, I think it would be
- * easier to use them. */
-
-void* comp(int icaltype, VObject *o)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-
-    icalcomponent* c = icalcomponent_new(kind);
-
-    return (void* )c;
-}
-
-void* alarm_comp(int icaltype, VObject *o)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-
-    icalcomponent* c = icalcomponent_new(kind);
-
-    return (void*)c;
-}
-
-void* daylight_comp(int icaltype, VObject *o)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-
-    icalcomponent* c = icalcomponent_new(kind);
- 
-    return (void*)c;
-}
-
-void* timezone_comp(int icaltype, VObject *o)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-
-    icalcomponent* c = icalcomponent_new(kind);
-
-    return (void*)c;
-}
-
-
-/* These #defines indicate conversion routines that are not defined yet. */
-
-#define categories_prop 0
-#define transp_prop 0   
-#define status_prop 0   
-
-#define parameter 0   
-#define rsvp_parameter 0   
-
-
-
-/* directly convertable property. The string representation of vcal is
-   the same as ical */
-
-void* dc_prop(int icaltype, VObject *object)
-{
-    icalproperty_kind kind = (icalproperty_kind)icaltype;
-    icalproperty *prop; 
-    icalvalue *value;
-    icalvalue_kind value_kind;
-    char *s,*t=0;
-
-    prop = icalproperty_new(kind);
-
-    value_kind = 
-	icalenum_property_kind_to_value_kind(
-	    icalproperty_isa(prop));
-
-
-    switch (vObjectValueType(object)) {
-	case VCVT_USTRINGZ: {
-	    s = t = fakeCString(vObjectUStringZValue(object));
-	    break;
-	}
-	case VCVT_STRINGZ: {
-	    s = (char*)vObjectStringZValue(object);
-	    break;
-	}
-    }
-
-    value = icalvalue_new_from_string(value_kind,s);
-
-    if(t!=0){
-	deleteStr(t);
-    }
-
-    icalproperty_set_value(prop,value);
-
-    return (void*)prop;
-}
-
-
-/* My extraction program screwed up, so this table does not have all
-of the vcal properties in it. I didn't feel like re-doing the entire
-table, so you'll have to find the missing properties the hard way --
-the code will assert */
-
-struct conversion_table_struct conversion_table[] = 
-{
-{VCCalProp,            COMPONENT, comp,         ICAL_VCALENDAR_COMPONENT},
-{VCTodoProp,           COMPONENT, comp,         ICAL_VTODO_COMPONENT},
-{VCEventProp,          COMPONENT, comp,         ICAL_VEVENT_COMPONENT},
-{VCAAlarmProp,         COMPONENT, alarm_comp,   ICAL_XAUDIOALARM_COMPONENT},
-{VCDAlarmProp,         COMPONENT, alarm_comp,   ICAL_XDISPLAYALARM_COMPONENT},
-{VCMAlarmProp,         COMPONENT, alarm_comp,   ICAL_XEMAILALARM_COMPONENT},
-{VCPAlarmProp,         COMPONENT, alarm_comp,   ICAL_XPROCEDUREALARM_COMPONENT},
-{VCDayLightProp,       COMPONENT, daylight_comp,0},
-{VCTimeZoneProp,       COMPONENT, timezone_comp, ICAL_VTIMEZONE_COMPONENT},
-{VCProdIdProp,         PROPERTY,  dc_prop,       ICAL_PRODID_PROPERTY},
-{VCClassProp,          PROPERTY,  dc_prop,       ICAL_CLASS_PROPERTY},
-{VCDCreatedProp,       PROPERTY,  dc_prop,       ICAL_CREATED_PROPERTY},
-{VCDescriptionProp,    PROPERTY,  dc_prop,       ICAL_DESCRIPTION_PROPERTY},
-{VCAttendeeProp,       PROPERTY,  dc_prop,       ICAL_ATTENDEE_PROPERTY},
-{VCCategoriesProp,     PROPERTY,  categories_prop,ICAL_CATEGORIES_PROPERTY},
-{VCDTendProp,          PROPERTY,  dc_prop,       ICAL_DTEND_PROPERTY},
-{VCDTstartProp,        PROPERTY,  dc_prop,       ICAL_DTSTART_PROPERTY},
-{VCDueProp,            PROPERTY,  dc_prop,       ICAL_DUE_PROPERTY},
-{VCLocationProp,       PROPERTY,  dc_prop,       ICAL_LOCATION_PROPERTY},
-{VCSummaryProp,        PROPERTY,  dc_prop,       ICAL_SUMMARY_PROPERTY},
-{VCVersionProp,        PROPERTY,  dc_prop,       ICAL_VERSION_PROPERTY},
-{VCTranspProp,         PROPERTY,  transp_prop,   ICAL_TRANSP_PROPERTY},
-{VCUniqueStringProp,   PROPERTY,  dc_prop,       ICAL_UID_PROPERTY},
-{VCURLProp,            PROPERTY,  dc_prop,       ICAL_URL_PROPERTY},
-{VCLastModifiedProp,   PROPERTY,  dc_prop,       ICAL_LASTMODIFIED_PROPERTY},
-{VCSequenceProp,       PROPERTY,  dc_prop,       ICAL_SEQUENCE_PROPERTY},
-{VCPriorityProp,       PROPERTY,  dc_prop,       ICAL_PRIORITY_PROPERTY},
-{VCStatusProp,         PROPERTY,  status_prop,   ICAL_STATUS_PROPERTY},
-{VCRSVPProp,           UNSUPPORTED, rsvp_parameter,ICAL_RSVP_PARAMETER  },
-{VCEncodingProp,       UNSUPPORTED, parameter,     ICAL_ENCODING_PARAMETER},
-{VCRoleProp,           UNSUPPORTED, parameter,     ICAL_ROLE_PARAMETER},
-{VCStatusProp,         UNSUPPORTED, parameter,     ICAL_STATUS_PROPERTY},
-{VCQuotedPrintableProp,UNSUPPORTED,0,            0},
-{VC7bitProp,           UNSUPPORTED,0,            0},
-{VC8bitProp,           UNSUPPORTED,0,            0},
-{VCAdditionalNamesProp,UNSUPPORTED,0,            0},
-{VCAdrProp,            UNSUPPORTED,0,            0},
-{VCAgentProp,          UNSUPPORTED,0,            0},
-{VCAIFFProp,           UNSUPPORTED,0,            0},
-{VCAOLProp,            UNSUPPORTED,0,            0},
-{VCAppleLinkProp,      UNSUPPORTED,0,            0},
-{VCAttachProp,         UNSUPPORTED,0,            0},
-{VCATTMailProp,        UNSUPPORTED,0,            0},
-{VCAudioContentProp,   UNSUPPORTED,0,            0},
-{VCAVIProp,            UNSUPPORTED,0,            0},
-{VCBase64Prop,         UNSUPPORTED,0,            0},
-{VCBBSProp,            UNSUPPORTED,0,            0},
-{VCBirthDateProp,      UNSUPPORTED,0,            0},
-{VCBMPProp,            UNSUPPORTED,0,            0},
-{VCBodyProp,           UNSUPPORTED,0,            0},
-{VCCaptionProp,        UNSUPPORTED,0,            0},
-{VCCarProp,            UNSUPPORTED,0,            0},
-{VCCellularProp,       UNSUPPORTED,0,            0},
-{VCCGMProp,            UNSUPPORTED,0,            0},
-{VCCharSetProp,        UNSUPPORTED,0,            0},
-{VCCIDProp,            UNSUPPORTED,0,            0},
-{VCCISProp,            UNSUPPORTED,0,            0},
-{VCCityProp,           UNSUPPORTED,0,            0},
-{VCCommentProp,        UNSUPPORTED,0,            0},
-{VCCompletedProp,      UNSUPPORTED,0,            0},
-{VCCountryNameProp,    UNSUPPORTED,0,            0},
-{VCDataSizeProp,       UNSUPPORTED,0,            0},
-{VCDeliveryLabelProp,  UNSUPPORTED,0,            0},
-{VCDIBProp,            UNSUPPORTED,0,            0},
-{VCDisplayStringProp,  UNSUPPORTED,0,            0},
-{VCDomesticProp,       UNSUPPORTED,0,            0},
-{VCEmailAddressProp,   UNSUPPORTED,0,            0},
-{VCEndProp,            UNSUPPORTED,0,            0},
-{VCEWorldProp,         UNSUPPORTED,0,            0},
-{VCExNumProp,          UNSUPPORTED,0,            0},
-{VCExpDateProp,        UNSUPPORTED,0,            0},
-{VCExpectProp,         UNSUPPORTED,0,            0},
-{VCFamilyNameProp,     UNSUPPORTED,0,            0},
-{VCFaxProp,            UNSUPPORTED,0,            0},
-{VCFullNameProp,       UNSUPPORTED,0,            0},
-{VCGeoProp,            UNSUPPORTED,0,            0},
-{VCGeoLocationProp,    UNSUPPORTED,0,            0},
-{VCGIFProp,            UNSUPPORTED,0,            0},
-{VCGivenNameProp,      UNSUPPORTED,0,            0},
-{VCGroupingProp,       UNSUPPORTED,0,            0},
-{VCHomeProp,           UNSUPPORTED,0,            0},
-{VCIBMMailProp,        UNSUPPORTED,0,            0},
-{VCInlineProp,         UNSUPPORTED,0,            0},
-{VCInternationalProp,  UNSUPPORTED,0,            0},
-{VCInternetProp,       UNSUPPORTED,0,            0},
-{VCISDNProp,           UNSUPPORTED,0,            0},
-{VCJPEGProp,           UNSUPPORTED,0,            0},
-{VCLanguageProp,       UNSUPPORTED,0,            0},
-{VCLastRevisedProp,    UNSUPPORTED,0,            0},
-{VCLogoProp,           UNSUPPORTED,0,            0},
-{VCMailerProp,         UNSUPPORTED,0,            0},
-{VCMCIMailProp,        UNSUPPORTED,0,            0},
-{VCMessageProp,        UNSUPPORTED,0,            0},
-{VCMETProp,            UNSUPPORTED,0,            0},
-{VCModemProp,          UNSUPPORTED,0,            0},
-{VCMPEG2Prop,          UNSUPPORTED,0,            0},
-{VCMPEGProp,           UNSUPPORTED,0,            0},
-{VCMSNProp,            UNSUPPORTED,0,            0},
-{VCNamePrefixesProp,   UNSUPPORTED,0,            0},
-{VCNameProp,           UNSUPPORTED,0,            0},
-{VCNameSuffixesProp,   UNSUPPORTED,0,            0},
-{VCNoteProp,           UNSUPPORTED,0,            0},
-{VCOrgNameProp,        UNSUPPORTED,0,            0},
-{VCOrgProp,            UNSUPPORTED,0,            0},
-{VCOrgUnit2Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnit3Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnit4Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnitProp,        UNSUPPORTED,0,            0},
-{VCPagerProp,          UNSUPPORTED,0,            0},
-{VCParcelProp,         UNSUPPORTED,0,            0},
-{VCPartProp,           UNSUPPORTED,0,            0},
-{VCPCMProp,            UNSUPPORTED,0,            0},
-{VCPDFProp,            UNSUPPORTED,0,            0},
-{VCPGPProp,            UNSUPPORTED,0,            0},
-{VCPhotoProp,          UNSUPPORTED,0,            0},
-{VCPICTProp,           UNSUPPORTED,0,            0},
-{VCPMBProp,            UNSUPPORTED,0,            0},
-{VCPostalBoxProp,      UNSUPPORTED,0,            0},
-{VCPostalCodeProp,     UNSUPPORTED,0,            0},
-{VCPostalProp,         UNSUPPORTED,0,            0},
-{VCPowerShareProp,     UNSUPPORTED,0,            0},
-{VCPreferredProp,      UNSUPPORTED,0,            0},
-{VCProcedureNameProp,  UNSUPPORTED,0,            0},
-{VCProdigyProp,        UNSUPPORTED,0,            0},
-{VCPronunciationProp,  UNSUPPORTED,0,            0},
-{VCPSProp,             UNSUPPORTED,0,            0},
-{VCPublicKeyProp,      UNSUPPORTED,0,            0},
-{VCQPProp,             UNSUPPORTED,0,            0},
-{VCQuickTimeProp,      UNSUPPORTED,0,            0},
-{VCRDateProp,          UNSUPPORTED,0,            0},
-{VCRegionProp,         UNSUPPORTED,0,            0},
-{VCRepeatCountProp,    UNSUPPORTED,0,            0},
-{VCResourcesProp,      UNSUPPORTED,0,            0},
-{VCRNumProp,           UNSUPPORTED,0,            0},
-{VCRRuleProp,          UNSUPPORTED,0,            0},
-{VCRunTimeProp,        UNSUPPORTED,0,            0},
-{VCSnoozeTimeProp,     UNSUPPORTED,0,            0},
-{VCStartProp,          UNSUPPORTED,0,            0},
-{VCStreetAddressProp,  UNSUPPORTED,0,            0},
-{VCSubTypeProp,        UNSUPPORTED,0,            0},
-{VCTelephoneProp,      UNSUPPORTED,0,            0},
-{VCTIFFProp,           UNSUPPORTED,0,            0},
-{VCTitleProp,          UNSUPPORTED,0,            0},
-{VCTLXProp,            UNSUPPORTED,0,            0},
-{VCURLValueProp,       UNSUPPORTED,0,            0},
-{VCValueProp,          UNSUPPORTED,0,            0},
-{VCVideoProp,          UNSUPPORTED,0,            0},
-{VCVoiceProp,          UNSUPPORTED,0,            0},
-{VCWAVEProp,           UNSUPPORTED,0,            0},
-{VCWMFProp,            UNSUPPORTED,0,            0},
-{VCWorkProp,           UNSUPPORTED,0,            0},
-{VCX400Prop,           UNSUPPORTED,0,            0},
-{VCX509Prop,           UNSUPPORTED,0,            0},
-{VCXRuleProp,          UNSUPPORTED,0,            0},
-{0,0,0,0}
-};
-
-
-#if 0
-		switch (vObjectValueType(object)) {
-		    case VCVT_USTRINGZ: {
-			char c;
-			char *t,*s;
-			s = t = fakeCString(vObjectUStringZValue(object));
-			printf(" ustringzstring:%s\n",s);
-			deleteStr(s);
-			break;
-		    }
-		    case VCVT_STRINGZ: {
-			char c;
-			const char *s = vObjectStringZValue(object);
-			printf(" stringzstring:%s\n",s);
-			break;
-		    }
-		    case VCVT_UINT:
-		    {
-			int i = vObjectIntegerValue(object);
-			printf(" int:%d\n",i);
-			break;
-		    }
-		    case VCVT_ULONG:
-		    {
-			long l = vObjectLongValue(object); 
-			printf(" int:%d\n",l);
-			break;
-		    }
-		    case VCVT_VOBJECT:
-		    {
-			printf("ERROR, should not get here\n");
-			break;
-		    }
-		    case VCVT_RAW:
-		    case 0:
-		    default:
-			break;
-		}
-
-#endif
diff --git a/libical/src/libicalvcal/icalvcal.h b/libical/src/libicalvcal/icalvcal.h
deleted file mode 100644
index f2316c2d0f..0000000000
--- a/libical/src/libicalvcal/icalvcal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalvcal.h
- CREATOR: eric 25 May 00
-
- 
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvcal.h
-
-
-======================================================================*/
-
-#ifndef ICALVCAL_H
-#define ICALVCAL_H
-
-#include "ical.h"
-#include "vcc.h"
-
-/* Convert a vObject into an icalcomponent */
-
-icalcomponent* icalvcal_convert(VObject *object);
-
-#endif /* !ICALVCAL_H */
-
-
-
diff --git a/libical/src/libicalvcal/port.h b/libical/src/libicalvcal/port.h
deleted file mode 100644
index 1768beebd8..0000000000
--- a/libical/src/libicalvcal/port.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __PORT_H__
-#define __PORT_H__ 1
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-                     
-/* some of these #defines are commented out because */
-/* Visual C++ sets them on the compiler command line instead */
-
-/* #define _DEBUG */
-/* #define WIN32 */
-/* #define WIN16 */
-/* #define _WINDOWS */
-/* #define __MWERKS__ */
-/* #define INCLUDEMFC */
-
-#define	vCardClipboardFormat		"+//ISBN 1-887687-00-9::versit::PDI//vCard"
-#define	vCalendarClipboardFormat	"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
-
-/* The above strings vCardClipboardFormat and vCalendarClipboardFormat 
-are globally unique IDs which can be used to generate clipboard format 
-ID's as per the requirements of a specific platform. For example, in 
-Windows they are used as the parameter in a call to RegisterClipboardFormat. 
-For example:
-
-  CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
-
-*/
-
-#define vCardMimeType		"text/x-vCard"
-#define vCalendarMimeType	"text/x-vCalendar"
-
-#define DLLEXPORT(t) t
-
-#ifndef FALSE
-#define FALSE	0
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-#define stricmp strcasecmp
-	
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __PORT_H__ */
diff --git a/libical/src/libicalvcal/vcaltest.c b/libical/src/libicalvcal/vcaltest.c
deleted file mode 100644
index 5528aab1d1..0000000000
--- a/libical/src/libicalvcal/vcaltest.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-SUBTYPE:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-FILE *cfp;
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal, *vevent;
-#if _CONSOLE
-    cfp = stdout;
-#else
-    cfp = fopen("vcaltest.out","w");
-#endif
-    if (cfp == 0) return;
-    vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(cfp,vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	fprintf(cfp,"open output file '%s' failed\n", OUTFILE);
-	}
-    if (cfp != stdout) fclose(cfp);
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
diff --git a/libical/src/libicalvcal/vcaltmp.c b/libical/src/libicalvcal/vcaltmp.c
deleted file mode 100644
index ccb21a649a..0000000000
--- a/libical/src/libicalvcal/vcaltmp.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-This module provides some helper APIs for creating
-a VCalendar object.
-
-Note on APIs:
-	1.	The APIs does not attempt to verify if the arguments
-		passed are correct.
-	2.	Where the argument to an API is not applicable, pass
-		the value 0.
-	3.	See the test program at the bottom of this file as an
-		example of usage.
-	4.	This code calls APIs in vobject.c. 
-
-*/
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-	
-DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	)
-    {
-    VObject *vcal = newVObject(VCCalProp);
-#define Z(p,v) if (v) addPropValue(vcal,p,v);
-    Z(VCDCreatedProp, date_created);
-    Z(VCLocationProp, location)
-    Z(VCProdIdProp, product_id)
-    Z(VCTimeZoneProp, time_zone)
-    Z(VCVersionProp, version)
-#undef Z
-    return vcal;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vevent = addProp(vcal,VCEventProp);
-#define Z(p,v) if (v) addPropValue(vevent,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDTendProp,end_date_time);
-    if (description) {
-	VObject *p = addPropValue(vevent,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCCategoriesProp,categories);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCTranspProp,transparency);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vevent;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vtodo = addProp(vcal,VCTodoProp);
-#define Z(p,v) if (v) addPropValue(vtodo,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDueProp,due_date_time);
-    Z(VCCompletedProp,date_time_complete);
-    if (description) {
-	VObject *p = addPropValue(vtodo,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCPriorityProp,priority);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vtodo;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	)
-    {
-    VObject *aalarm= addProp(vevent,VCAAlarmProp);
-#define Z(p,v) if (v) addPropValue(aalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCAudioContentProp,audio_content);
-#undef Z
-    return aalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	)
-    {
-    VObject *malarm= addProp(vevent,VCMAlarmProp);
-#define Z(p,v) if (v) addPropValue(malarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCEmailAddressProp,email_address);
-    Z(VCNoteProp,note);
-#undef Z
-    return malarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	)
-    {
-    VObject *dalarm= addProp(vevent,VCDAlarmProp);
-#define Z(p,v) if (v) addPropValue(dalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCDisplayStringProp,display_string);
-#undef Z
-    return dalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	)
-    {
-    VObject *palarm= addProp(vevent,VCPAlarmProp);
-#define Z(p,v) if (v) addPropValue(palarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCProcedureNameProp,procedure_name);
-#undef Z
-    return palarm;
-    }
-
-    
-#ifdef _TEST
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-CATEGORIES:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    VObject *vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	printf("open output file '%s' failed\n", OUTFILE);
-	}
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
-#endif
-
-
-/* end of source file vcaltmp.c */
diff --git a/libical/src/libicalvcal/vcaltmp.h b/libical/src/libicalvcal/vcaltmp.h
deleted file mode 100644
index 4c4afde963..0000000000
--- a/libical/src/libicalvcal/vcaltmp.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#include "vcc.h"
-
-#ifndef __VCALTMP_H__
-#define __VCALTMP_H__
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-extern DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	);
-
-extern DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	);
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCALTMP_H__ */
-
-
diff --git a/libical/src/libicalvcal/vcc.h b/libical/src/libicalvcal/vcc.h
deleted file mode 100644
index 0e52034710..0000000000
--- a/libical/src/libicalvcal/vcc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __VCC_H__
-#define __VCC_H__ 1
-
-#include "vobject.h"
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef void (*MimeErrorHandler)(char *);
-
-extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
-
-extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
-extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
-
-
-/* NOTE regarding Parse_MIME_FromFile
-The function above, Parse_MIME_FromFile, comes in two flavors,
-neither of which is exported from the DLL. Each version takes
-a CFile or FILE* as a parameter, neither of which can be
-passed across a DLL interface (at least that is my experience).
-If you are linking this code into your build directly then
-you may find them a more convenient API that the other flavors
-that take a file name. If you use them with the DLL LIB you
-will get a link error.
-*/
-
-
-#if INCLUDEMFC
-extern VObject* Parse_MIME_FromFile(CFile *file);
-#else
-extern VObject* Parse_MIME_FromFile(FILE *file);
-#endif
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCC_H__ */
-
diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
deleted file mode 100644
index 70feefab57..0000000000
--- a/libical/src/libicalvcal/vcc.y
+++ /dev/null
@@ -1,1176 +0,0 @@
-%{
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,
-collectively, Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-The term Licensor shall mean any of the Licensors.
-
-Subject to acceptance of the following conditions, permission is hereby
-granted by Licensors without the need for written agreement and without
-license or royalty fees, to use, copy, modify and distribute this
-software for any purpose.
-
-The above copyright notice and the following four paragraphs must be
-reproduced in all copies of this software and any software including
-this software.
-
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
-MODIFICATIONS.
-
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
-disclosure by the government are subject to restrictions set forth in
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
-
-***************************************************************************/
-
-/*
- * src: vcc.c
- * doc: Parser for vCard and vCalendar. Note that this code is
- * generated by a yacc parser generator. Generally it should not
- * be edited by hand. The real source is vcc.y. The #line directives
- * can be commented out here to make it easier to trace through
- * in a debugger. However, if a bug is found it should
- * be fixed in vcc.y and this file regenerated.
- */
-
-
-/* debugging utilities */
-#if __DEBUG
-#define DBG_(x) printf x
-#else
-#define DBG_(x)
-#endif
-
-/****  External Functions  ****/
-
-/* assign local name to parser variables and functions so that
-   we can use more than one yacc based parser.
-*/
-
-#define yyparse mime_parse
-#define yylex mime_lex
-#define yyerror mime_error
-#define yychar mime_char
-/* #define p_yyval p_mime_val */
-#undef yyval
-#define yyval mime_yyval
-/* #define p_yylval p_mime_lval */
-#undef yylval
-#define yylval mime_yylval
-#define yydebug mime_debug
-#define yynerrs mime_nerrs
-#define yyerrflag mime_errflag
-#define yyss mime_ss
-#define yyssp mime_ssp
-#define yyvs mime_vs
-#define yyvsp mime_vsp
-#define yylhs mime_lhs
-#define yylen mime_len
-#define yydefred mime_defred
-#define yydgoto mime_dgoto
-#define yysindex mime_sindex
-#define yyrindex mime_rindex
-#define yygindex mime_gindex
-#define yytable mime_table
-#define yycheck mime_check
-#define yyname mime_name
-#define yyrule mime_rule
-#define YYPREFIX "mime_"
-
-
-#ifndef _NO_LINE_FOLDING
-#define _SUPPORT_LINE_FOLDING 1
-#endif
-
-/* undef below if compile with MFC */
-/* #define INCLUDEMFC 1 */
-
-#if defined(WIN32) || defined(_WIN32)
-#ifdef INCLUDEMFC
-#include <afx.h>
-#endif
-#endif
-
-#include <string.h>
-#ifndef __MWERKS__
-#include <malloc.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "vcc.h"
-
-/****  Types, Constants  ****/
-
-#define YYDEBUG		1	/* 1 to compile in some debugging code */
-#define MAXTOKEN	256	/* maximum token (line) length */
-#define YYSTACKSIZE 	50	/* ~unref ? */
-#define MAXLEVEL	10	/* max # of nested objects parseable */
-				/* (includes outermost) */
-
-
-/****  Global Variables  ****/
-int mime_lineNum, mime_numErrors; /* yyerror() can use these */
-static VObject* vObjList;
-static VObject *curProp;
-static VObject *curObj;
-static VObject* ObjStack[MAXLEVEL];
-static int ObjStackTop;
-
-
-/* A helpful utility for the rest of the app. */
-#if __CPLUSPLUS__
-extern "C" {
-#endif
-
-    extern void Parse_Debug(const char *s);
-    static void yyerror(char *s);
-
-#if __CPLUSPLUS__
-    };
-#endif
-
-int yyparse();
-
-enum LexMode {
-	L_NORMAL,
-	L_VCARD,
-	L_VCAL,
-	L_VEVENT,
-	L_VTODO,
-	L_VALUES,
-	L_BASE64,
-	L_QUOTED_PRINTABLE
-	};
-
-/****  Private Forward Declarations  ****/
-static int pushVObject(const char *prop);
-static VObject* popVObject();
-static void lexPopMode(int top);
-static int lexWithinMode(enum LexMode mode);
-static void lexPushMode(enum LexMode mode);
-static void enterProps(const char *s);
-static void enterAttr(const char *s1, const char *s2);
-static void enterValues(const char *value);
-static void mime_error_(char *s);
-
-%}
-
-/***************************************************************************/
-/***                           The grammar                              ****/
-/***************************************************************************/
-
-%union {
-    char *str;
-    VObject *vobj;
-    }
-
-%token
-	EQ COLON DOT SEMICOLON SPACE HTAB LINESEP NEWLINE
-	BEGIN_VCARD END_VCARD BEGIN_VCAL END_VCAL
-	BEGIN_VEVENT END_VEVENT BEGIN_VTODO END_VTODO
-	ID
-
-/*
- * NEWLINE is the token that would occur outside a vCard,
- * while LINESEP is the token that would occur inside a vCard.
- */
-
-%token <str>
-	STRING ID
-
-%type <str> name value
-
-%type <vobj> vcard vcal vobject
-
-%start mime
-
-%%
-
-
-mime: vobjects
-	;
-
-vobjects: vobject
-	{ addList(&vObjList, $1); curObj = 0; }
-	vobjects
-	| vobject
-		{ addList(&vObjList, $1); curObj = 0; }
-	;
-
-vobject: vcard
-	| vcal
-	;
-
-vcard:
-	BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	items END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	| BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	;
-
-items: item items
-	| item
-	;
-
-item: prop COLON
-	{
-	lexPushMode(L_VALUES);
-	}
-	values LINESEP
-	{
-	if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
-	   lexPopMode(0);
-	lexPopMode(0);
-	}
-	| error
-	;
-
-prop: name
-	{
-	enterProps($1);
-	}
-	attr_params
-	| name
-	{
-	enterProps($1);
-	}
-	;
-
-attr_params: attr_param attr_params
-	| attr_param
-	;
-
-attr_param: SEMICOLON attr
-	;
-
-attr: name
-	{
-	enterAttr($1,0);
-	}
-	| name EQ name
-	{
-	enterAttr($1,$3);
-
-	}
-	;
-
-name: ID
-	;
-
-values: value SEMICOLON { enterValues($1); } values
-	| value
-	{ enterValues($1); }
-	;
-
-value: STRING
-	| { $$ = 0; }
-	;
-
-vcal:
-	BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	calitems
-	END_VCAL
-	{ $$ = popVObject(); }
-	| BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	END_VCAL
-	{ $$ = popVObject(); }
-	;
-
-calitems: calitem calitems
-	| calitem
-	;
-
-calitem:
-	eventitem
-	| todoitem
-	| items
-	;
-
-eventitem:
-	BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	items
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-todoitem:
-	BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	items
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-%%
-static int pushVObject(const char *prop)
-    {
-    VObject *newObj;
-    if (ObjStackTop == MAXLEVEL)
-	return FALSE;
-
-    ObjStack[++ObjStackTop] = curObj;
-
-    if (curObj) {
-        newObj = addProp(curObj,prop);
-        curObj = newObj;
-	}
-    else
-	curObj = newVObject(prop);
-
-    return TRUE;
-    }
-
-
-/* This pops the recently built vCard off the stack and returns it. */
-static VObject* popVObject()
-    {
-    VObject *oldObj;
-    if (ObjStackTop < 0) {
-	yyerror("pop on empty Object Stack\n");
-	return 0;
-	}
-    oldObj = curObj;
-    curObj = ObjStack[ObjStackTop--];
-
-    return oldObj;
-    }
-
-
-static void enterValues(const char *value)
-    {
-    if (fieldedProp && *fieldedProp) {
-	if (value) {
-	    addPropValue(curProp,*fieldedProp,value);
-	    }
-	/* else this field is empty, advance to next field */
-	fieldedProp++;
-	}
-    else {
-	if (value) {
-	    setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
-	    }
-	}
-    deleteStr(value);
-    }
-
-static void enterProps(const char *s)
-    {
-    curProp = addGroup(curObj,s);
-    deleteStr(s);
-    }
-
-static void enterAttr(const char *s1, const char *s2)
-    {
-    const char *p1, *p2;
-    p1 = lookupProp_(s1);
-    if (s2) {
-	VObject *a;
-	p2 = lookupProp_(s2);
-	a = addProp(curProp,p1);
-	setVObjectStringZValue(a,p2);
-	}
-    else
-	addProp(curProp,p1);
-    if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
-	lexPushMode(L_BASE64);
-    else if (stricmp(p1,VCQuotedPrintableProp) == 0
-	    || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
-	lexPushMode(L_QUOTED_PRINTABLE);
-    deleteStr(s1); deleteStr(s2);
-    }
-
-
-#define MAX_LEX_LOOKAHEAD_0 32
-#define MAX_LEX_LOOKAHEAD 64
-#define MAX_LEX_MODE_STACK_SIZE 10
-#define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
-
-struct LexBuf {
-	/* input */
-#ifdef INCLUDEMFC
-    CFile *inputFile;
-#else
-    FILE *inputFile;
-#endif
-    char *inputString;
-    unsigned long curPos;
-    unsigned long inputLen;
-	/* lookahead buffer */
-	/*   -- lookahead buffer is short instead of char so that EOF
-	 /      can be represented correctly.
-	*/
-    unsigned long len;
-    short buf[MAX_LEX_LOOKAHEAD];
-    unsigned long getPtr;
-	/* context stack */
-    unsigned long lexModeStackTop;
-    enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
-	/* token buffer */
-    unsigned long maxToken;
-    char *strs;
-    unsigned long strsLen;
-    } lexBuf;
-
-static void lexPushMode(enum LexMode mode)
-    {
-    if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
-	yyerror("lexical context stack overflow");
-    else {
-	lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
-	}
-    }
-
-static void lexPopMode(int top)
-    {
-    /* special case of pop for ease of error recovery -- this
-	version will never underflow */
-    if (top)
-	lexBuf.lexModeStackTop = 0;
-    else
-	if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
-    }
-
-static int lexWithinMode(enum LexMode mode) {
-    unsigned long i;
-    for (i=0;i<lexBuf.lexModeStackTop;i++)
-	if (mode == lexBuf.lexModeStack[i]) return 1;
-    return 0;
-    }
-
-static char lexGetc_()
-    {
-    /* get next char from input, no buffering. */
-    if (lexBuf.curPos == lexBuf.inputLen)
-	return EOF;
-    else if (lexBuf.inputString)
-	return *(lexBuf.inputString + lexBuf.curPos++);
-    else {
-#ifdef INCLUDEMFC
-	char result;
-	return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
-#else
-	return fgetc(lexBuf.inputFile);
-#endif
-	}
-    }
-
-static int lexGeta()
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
-    }
-
-static int lexGeta_(int i)
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
-    }
-
-static void lexSkipLookahead() {
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* don't skip EOF. */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    }
-
-static int lexLookahead() {
-    int c = (lexBuf.len)?
-	lexBuf.buf[lexBuf.getPtr]:
-	lexGeta();
-    /* do the \r\n -> \n or \r -> \n translation here */
-    if (c == '\r') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
-	    lexGeta_(1);
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = c = '\n';
-	}
-    else if (c == '\n') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[lexBuf.getPtr+1]:
-	    lexGeta_(1);
-	if (a == '\r') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = '\n';
-	}
-    return c;
-    }
-
-static int lexGetc() {
-    int c = lexLookahead();
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* EOF will remain in lookahead buffer */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    return c;
-    }
-
-static void lexSkipLookaheadWord() {
-    if (lexBuf.strsLen <= lexBuf.len) {
-	lexBuf.len -= lexBuf.strsLen;
-	lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
-	}
-    }
-
-static void lexClearToken()
-    {
-    lexBuf.strsLen = 0;
-    }
-
-static void lexAppendc(int c)
-    {
-    lexBuf.strs[lexBuf.strsLen] = c;
-    /* append up to zero termination */
-    if (c == 0) return;
-    lexBuf.strsLen++;
-    if (lexBuf.strsLen > lexBuf.maxToken) {
-	/* double the token string size */
-	lexBuf.maxToken <<= 1;
-	lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
-	}
-    }
-
-static char* lexStr() {
-    return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
-    }
-
-static void lexSkipWhite() {
-    int c = lexLookahead();
-    while (c == ' ' || c == '\t') {
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    }
-
-static char* lexGetWord() {
-    int c;
-    lexSkipWhite();
-    lexClearToken();
-    c = lexLookahead();
-    while (c != EOF && !strchr("\t\n ;:=",c)) {
-	lexAppendc(c);
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    return lexStr();
-    }
-
-static void lexPushLookaheadc(int c) {
-    int putptr;
-    /* can't putback EOF, because it never leaves lookahead buffer */
-    if (c == EOF) return;
-    putptr = (int)lexBuf.getPtr - 1;
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    lexBuf.buf[putptr] = c;
-    lexBuf.len += 1;
-    }
-
-static char* lexLookaheadWord() {
-    /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
-     /  and thing bigger than that will stop the lookahead and return 0;
-     / leading white spaces are not recoverable.
-     */
-    int c;
-    int len = 0;
-    int curgetptr = 0;
-    lexSkipWhite();
-    lexClearToken();
-    curgetptr = (int)lexBuf.getPtr;	/* remember! */
-    while (len < (MAX_LEX_LOOKAHEAD_0)) {
-	c = lexGetc();
-	len++;
-	if (c == EOF || strchr("\t\n ;:=", c)) {
-	    lexAppendc(0);
-	    /* restore lookahead buf. */
-	    lexBuf.len += len;
-	    lexBuf.getPtr = curgetptr;
-	    return lexStr();
-	    }
-        else
-	    lexAppendc(c);
-	}
-    lexBuf.len += len;	/* char that has been moved to lookahead buffer */
-    lexBuf.getPtr = curgetptr;
-    return 0;
-    }
-
-#ifdef _SUPPORT_LINE_FOLDING
-static void handleMoreRFC822LineBreak(int c) {
-    /* suport RFC 822 line break in cases like
-     *	ADR: foo;
-     *    morefoo;
-     *    more foo;
-     */
-    if (c == ';') {
-	int a;
-	lexSkipLookahead();
-	/* skip white spaces */
-	a = lexLookahead();
-	while (a == ' ' || a == '\t') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    }
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		/* continuation, throw away all the \n and spaces read so
-		 * far
-		 */
-		lexSkipWhite();
-		lexPushLookaheadc(';');
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		lexPushLookaheadc(';');
-		}
-	    }
-	else {
-	    lexPushLookaheadc(';');
-	    }
-	}
-    }
-
-static char* lexGet1Value() {
-    int c;
-    lexSkipWhite();
-    c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && c != ';') {
-	if (c == '\n') {
-	    int a;
-	    lexSkipLookahead();
-	    a  = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		lexAppendc(' ');
-		lexSkipLookahead();
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		break;
-		}
-	    }
-	else {
-	    lexAppendc(c);
-	    lexSkipLookahead();
-	    }
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    handleMoreRFC822LineBreak(c);
-    return c==EOF?0:lexStr();
-    }
-#endif
-
-
-static int match_begin_name(int end) {
-    char *n = lexLookaheadWord();
-    int token = ID;
-    if (n) {
-	if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-	else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-	else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-	else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
-	deleteStr(n);
-	return token;
-	}
-    return 0;
-    }
-
-
-#ifdef INCLUDEMFC
-void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
-#else
-void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
-#endif
-    {
-    /* initialize lex mode stack */
-    lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
-
-    /* iniatialize lex buffer. */
-    lexBuf.inputString = (char*) inputstring;
-    lexBuf.inputLen = inputlen;
-    lexBuf.curPos = 0;
-    lexBuf.inputFile = inputfile;
-
-    lexBuf.len = 0;
-    lexBuf.getPtr = 0;
-
-    lexBuf.maxToken = MAXTOKEN;
-    lexBuf.strs = (char*)malloc(MAXTOKEN);
-    lexBuf.strsLen = 0;
-
-    }
-
-static void finiLex() {
-    free(lexBuf.strs);
-    }
-
-
-/* This parses and converts the base64 format for binary encoding into
- * a decoded buffer (allocated with new).  See RFC 1521.
- */
-static char * lexGetDataFromBase64()
-    {
-    unsigned long bytesLen = 0, bytesMax = 0;
-    int quadIx = 0, pad = 0;
-    unsigned long trip = 0;
-    unsigned char b;
-    int c;
-    unsigned char *bytes = NULL;
-    unsigned char *oldBytes = NULL;
-
-    DBG_(("db: lexGetDataFromBase64\n"));
-    while (1) {
-	c = lexGetc();
-	if (c == '\n') {
-	    ++mime_lineNum;
-	    if (lexLookahead() == '\n') {
-		/* a '\n' character by itself means end of data */
-		break;
-		}
-	    else continue; /* ignore '\n' */
-	    }
-	else {
-	    if ((c >= 'A') && (c <= 'Z'))
-		b = (unsigned char)(c - 'A');
-	    else if ((c >= 'a') && (c <= 'z'))
-		b = (unsigned char)(c - 'a') + 26;
-	    else if ((c >= '0') && (c <= '9'))
-		b = (unsigned char)(c - '0') + 52;
-	    else if (c == '+')
-		b = 62;
-	    else if (c == '/')
-		b = 63;
-	    else if (c == '=') {
-		b = 0;
-		pad++;
-	    } else if ((c == ' ') || (c == '\t')) {
-		continue;
-	    } else { /* error condition */
-		if (bytes) free(bytes);
-		else if (oldBytes) free(oldBytes);
-		/* error recovery: skip until 2 adjacent newlines. */
-		DBG_(("db: invalid character 0x%x '%c'\n", c,c));
-		if (c != EOF)  {
-		    c = lexGetc();
-		    while (c != EOF) {
-			if (c == '\n' && lexLookahead() == '\n') {
-			    ++mime_lineNum;
-			    break;
-			    }
-			c = lexGetc();
-			}
-		    }
-		return NULL;
-		}
-	    trip = (trip << 6) | b;
-	    if (++quadIx == 4) {
-		unsigned char outBytes[3];
-		int numOut;
-		int i;
-		for (i = 0; i < 3; i++) {
-		    outBytes[2-i] = (unsigned char)(trip & 0xFF);
-		    trip >>= 8;
-		    }
-		numOut = 3 - pad;
-		if (bytesLen + numOut > bytesMax) {
-		    if (!bytes) {
-			bytesMax = 1024;
-			bytes = (unsigned char*)malloc((size_t)bytesMax);
-			}
-		    else {
-			bytesMax <<= 2;
-			oldBytes = bytes;
-			bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);
-			}
-		    if (bytes == 0) {
-			mime_error("out of memory while processing BASE64 data\n");
-			}
-		    }
-		if (bytes) {
-		    memcpy(bytes + bytesLen, outBytes, numOut);
-		    bytesLen += numOut;
-		    }
-		trip = 0;
-		quadIx = 0;
-		}
-	    }
-	} /* while */
-    DBG_(("db: bytesLen = %d\n",  bytesLen));
-    /* kludge: all this won't be necessary if we have tree form
-	representation */
-    if (bytes) {
-	setValueWithSize(curProp,bytes,(unsigned int)bytesLen);
-	free(bytes);
-	}
-    else if (oldBytes) {
-	setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);
-	free(oldBytes);
-	}
-    return 0;
-    }
-
-static int match_begin_end_name(int end) {
-    int token;
-    lexSkipWhite();
-    if (lexLookahead() != ':') return ID;
-    lexSkipLookahead();
-    lexSkipWhite();
-    token = match_begin_name(end);
-    if (token == ID) {
-	lexPushLookaheadc(':');
-	DBG_(("db: ID '%s'\n", yylval.str));
-	return ID;
-	}
-    else if (token != 0) {
-	lexSkipLookaheadWord();
-	deleteStr(yylval.str);
-	DBG_(("db: begin/end %d\n", token));
-	return token;
-	}
-    return 0;
-    }
-
-static char* lexGetQuotedPrintable()
-    {
-    char cur;
-
-    lexClearToken();
-    do {
-	cur = lexGetc();
-	switch (cur) {
-	    case '=': {
-		int c = 0;
-		int next[2];
-		int i;
-		for (i = 0; i < 2; i++) {
-		    next[i] = lexGetc();
-		    if (next[i] >= '0' && next[i] <= '9')
-			c = c * 16 + next[i] - '0';
-		    else if (next[i] >= 'A' && next[i] <= 'F')
-			c = c * 16 + next[i] - 'A' + 10;
-		    else
-			break;
-		    }
-		if (i == 0) {
-		    /* single '=' follow by LINESEP is continuation sign? */
-		    if (next[0] == '\n') {
-			++mime_lineNum;
-			}
-		    else {
-			lexPushLookaheadc('=');
-			goto EndString;
-			}
-		    }
-		else if (i == 1) {
-		    lexPushLookaheadc(next[1]);
-		    lexPushLookaheadc(next[0]);
-		    lexAppendc('=');
-		} else {
-		    lexAppendc(c);
-		    }
-		break;
-		} /* '=' */
-	    case '\n': {
-		lexPushLookaheadc('\n');
-		goto EndString;
-		}
-	    case (char)EOF:
-		break;
-	    default:
-		lexAppendc(cur);
-		break;
-	    } /* switch */
-	} while (cur != (char)EOF);
-
-EndString:
-    lexAppendc(0);
-    return lexStr();
-    } /* LexQuotedPrintable */
-
-int yylex() {
-
-    int lexmode = LEXMODE();
-    if (lexmode == L_VALUES) {
-	int c = lexGetc();
-	if (c == ';') {
-	    DBG_(("db: SEMICOLON\n"));
-	    lexPushLookaheadc(c);
-#ifdef _SUPPORT_LINE_FOLDING
-	    handleMoreRFC822LineBreak(c);
-#endif
-	    lexSkipLookahead();
-	    return SEMICOLON;
-	    }
-	else if (strchr("\n",c)) {
-	    ++mime_lineNum;
-	    /* consume all line separator(s) adjacent to each other */
-	    c = lexLookahead();
-	    while (strchr("\n",c)) {
-		lexSkipLookahead();
-		c = lexLookahead();
-		++mime_lineNum;
-		}
-	    DBG_(("db: LINESEP\n"));
-	    return LINESEP;
-	    }
-	else {
-	    char *p = 0;
-	    lexPushLookaheadc(c);
-	    if (lexWithinMode(L_BASE64)) {
-		/* get each char and convert to bin on the fly... */
-		p = lexGetDataFromBase64();
-		yylval.str = p;
-		return STRING;
-		}
-	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
-		p = lexGetQuotedPrintable();
-		}
-	    else {
-#ifdef _SUPPORT_LINE_FOLDING
-		p = lexGet1Value();
-#else
-		p = lexGetStrUntil(";\n");
-#endif
-		}
-	    if (p) {
-		DBG_(("db: STRING: '%s'\n", p));
-		yylval.str = p;
-		return STRING;
-		}
-	    else return 0;
-	    }
-	}
-    else {
-	/* normal mode */
-	while (1) {
-	    int c = lexGetc();
-	    switch(c) {
-		case ':': {
-		    /* consume all line separator(s) adjacent to each other */
-		    /* ignoring linesep immediately after colon. */
-/*		    c = lexLookahead();
-		    while (strchr("\n",c)) {
-			lexSkipLookahead();
-			c = lexLookahead();
-			++mime_lineNum;
-			}*/
-		    DBG_(("db: COLON\n"));
-		    return COLON;
-		    }
-		case ';':
-		    DBG_(("db: SEMICOLON\n"));
-		    return SEMICOLON;
-		case '=':
-		    DBG_(("db: EQ\n"));
-		    return EQ;
-		/* ignore whitespace in this mode */
-		case '\t':
-		case ' ': continue;
-		case '\n': {
-		    ++mime_lineNum;
-		    continue;
-		    }
-		case EOF: return 0;
-		    break;
-		default: {
-		    lexPushLookaheadc(c);
-		    if (isalpha(c)) {
-			char *t = lexGetWord();
-			yylval.str = t;
-			if (!stricmp(t, "begin")) {
-			    return match_begin_end_name(0);
-			    }
-			else if (!stricmp(t,"end")) {
-			    return match_begin_end_name(1);
-			    }
-		        else {
-			    DBG_(("db: ID '%s'\n", t));
-			    return ID;
-			    }
-			}
-		    else {
-			/* unknow token */
-			return 0;
-			}
-		    break;
-		    }
-		}
-	    }
-	}
-    return 0;
-    }
-
-
-/***************************************************************************/
-/***							Public Functions						****/
-/***************************************************************************/
-
-static VObject* Parse_MIMEHelper()
-    {
-    ObjStackTop = -1;
-    mime_numErrors = 0;
-    mime_lineNum = 1;
-    vObjList = 0;
-    curObj = 0;
-
-    if (yyparse() != 0)
-	return 0;
-
-    finiLex();
-    return vObjList;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
-    {
-    initLex(input, len, 0);
-    return Parse_MIMEHelper();
-    }
-
-
-#if INCLUDEMFC
-
-DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)
-    {
-    unsigned long startPos;
-    VObject *result;
-
-    initLex(0,-1,file);
-    startPos = file->GetPosition();
-    if (!(result = Parse_MIMEHelper()))
-	file->Seek(startPos, CFile::begin);
-    return result;
-    }
-
-#else
-
-VObject* Parse_MIME_FromFile(FILE *file)
-    {
-    VObject *result;
-    long startPos;
-
-    initLex(0,(unsigned long)-1,file);
-    startPos = ftell(file);
-    if (!(result = Parse_MIMEHelper())) {
-	fseek(file,startPos,SEEK_SET);
-	}
-    return result;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
-    {
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-	VObject* o = Parse_MIME_FromFile(fp);
-	fclose(fp);
-	return o;
-	}
-    else {
-	char msg[256];
-	snprintf(msg, sizeof(msg), "can't open file '%s' for reading\n", fname);
-	mime_error_(msg);
-	return 0;
-	}
-    }
-
-#endif
-
-
-static MimeErrorHandler mimeErrorHandler;
-
-DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
-    {
-    mimeErrorHandler = me;
-    }
-
-static void mime_error(char *s)
-    {
-    char msg[256];
-    if (mimeErrorHandler) {
-	sprintf(msg,"%s at line %d", s, mime_lineNum);
-	mimeErrorHandler(msg);
-	}
-    }
-
-static void mime_error_(char *s)
-    {
-    if (mimeErrorHandler) {
-	mimeErrorHandler(s);
-	}
-    }
-
diff --git a/libical/src/libicalvcal/vctest.c b/libical/src/libicalvcal/vctest.c
deleted file mode 100644
index 7975d1e200..0000000000
--- a/libical/src/libicalvcal/vctest.c
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include "vcc.h"
-
-FILE *cfp;
-
-void myMimeErrorHandler(char *s)
-{
-    printf("%s\n", s);
-}
-
-void main(int argc, char **argv)
-{
-    int testmem = 0;
-
-	char * foo[2] = {"foo","alden.vcf"};
-
-argc = 2;
-argv = foo;
-
-#ifdef _CONSOLE
-    cfp = stdout;
-    registerMimeErrorHandler(myMimeErrorHandler);
-#else
-    cfp = fopen("vctest.out", "w");
-    if (!cfp) return;
-#endif
-    ++argv;
-    while (--argc) {
-	FILE *fp;
-	if (strcmp(*argv,"-testmem") == 0) {
-	    testmem = 1;
-	    argv++;
-	    continue;
-	    }
-	fprintf(cfp,"processing %s\n",*argv);
-	fp = fopen(*argv,"r");
-	if (!fp) {
-	    fprintf(cfp,"error opening file\n");
-	    }
-	else {
-	    VObject *v, *t;
-	    FILE *ofp;
-	    char buf[256];
-	    char *p;
-	    strcpy(buf,*argv);
-	    p = strchr(buf,'.');
-	    if (p) *p = 0;
-	    strcat(buf,".out");
-	    fprintf(cfp,"reading text input from '%s'...\n", *argv);
-	    /*v = Parse_MIME_FromFile(fp); */
-	    v = Parse_MIME_FromFileName(*argv);
-		writeVObjectToFile(buf,v);
-		cleanVObject(v);
-
-		/*
-	    fprintf(cfp,"pretty print internal format of '%s'...\n", *argv);
-	    ofp = fopen(buf,"w");
-	    while (v) {
-		printVObject(cfp,v);
-		if (testmem) {
-		    char *s, *p;
-		    fprintf(cfp,"test writing to mem...\n");
-		    p = s  = writeMemVObject(0,0,v);
-		    if (s) {
-			while (*s) {
-			    fputc(*s,ofp);
-			    s++;
-			    }
-			free(p);
-			}
-		    }
-		else {
-		    writeVObject(ofp,v);
-		    }
-		t = v;
-		v = nextVObjectInList(v);
-		cleanVObject(t);
-		}
-		
-	    fclose(ofp);
-	    fclose(fp);
-		*/
-	    }
-		
-	cleanStrTbl();
-	argv++;
-	
-	}
-	
-    if (cfp != stdout) fclose(cfp);
-
-}
-
diff --git a/libical/src/libicalvcal/vobject.c b/libical/src/libicalvcal/vobject.c
deleted file mode 100644
index d685b04278..0000000000
--- a/libical/src/libicalvcal/vobject.c
+++ /dev/null
@@ -1,1452 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- * src: vobject.c
- * doc: vobject and APIs to construct vobject, APIs pretty print 
- * vobject, and convert a vobject into its textual representation.
- */
-
-#ifndef	 MWERKS
-#include <malloc.h>
-#endif
-
-#include "vobject.h"
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-
-#define NAME_OF(o)				o->id
-#define VALUE_TYPE(o)			o->valType
-#define STRINGZ_VALUE_OF(o)		o->val.strs
-#define USTRINGZ_VALUE_OF(o)	o->val.ustrs
-#define INTEGER_VALUE_OF(o)		o->val.i
-#define LONG_VALUE_OF(o)		o->val.l
-#define ANY_VALUE_OF(o)			o->val.any
-#define VOBJECT_VALUE_OF(o)		o->val.vobj
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-    } ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-    };
-
-typedef struct StrItem StrItem;
-
-struct StrItem {
-    StrItem *next;
-    const char *s;
-    unsigned int refCnt;
-    };
-
-const char** fieldedProp;
-
-
-
-/*----------------------------------------------------------------------
-   The following functions involve with memory allocation:
-	newVObject
-	deleteVObject
-	dupStr
-	deleteStr
-	newStrItem
-	deleteStrItem
-   ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) newVObject_(const char *id)
-{
-    VObject *p = (VObject*)malloc(sizeof(VObject));
-    p->next = 0;
-    p->id = id;
-    p->prop = 0;
-    VALUE_TYPE(p) = 0;
-    ANY_VALUE_OF(p) = 0;
-    return p;
-}
-
-DLLEXPORT(VObject*) newVObject(const char *id)
-{
-    return newVObject_(lookupStr(id));
-}
-
-DLLEXPORT(void) deleteVObject(VObject *p)
-{
-    unUseStr(p->id);
-    free(p);
-}
-
-DLLEXPORT(char*) dupStr(const char *s, unsigned int size)
-{
-    char *t;
-    if  (size == 0) {
-	size = strlen(s);
-	}
-    t = (char*)malloc(size+1);
-    if (t) {
-	memcpy(t,s,size);
-	t[size] = 0;
-	return t;
-	}
-    else {
-	return (char*)0;
-	}
-}
-
-DLLEXPORT(void) deleteStr(const char *p)
-{
-    if (p) free((void*)p);
-}
-
-
-static StrItem* newStrItem(const char *s, StrItem *next)
-{
-    StrItem *p = (StrItem*)malloc(sizeof(StrItem));
-    p->next = next;
-    p->s = s;
-    p->refCnt = 1;
-    return p;
-}
-
-static void deleteStrItem(StrItem *p)
-{
-    free((void*)p);
-}
-
-
-/*----------------------------------------------------------------------
-  The following function provide accesses to VObject's value.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(const char*) vObjectName(VObject *o)
-{
-    return NAME_OF(o);
-}
-
-DLLEXPORT(void) setVObjectName(VObject *o, const char* id)
-{
-    NAME_OF(o) = id;
-}
-
-DLLEXPORT(const char*) vObjectStringZValue(VObject *o)
-{
-    return STRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = dupStr(s,0);
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o)
-{
-    return USTRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = (wchar_t*) dupStr((char*)s,(uStrLen(s)+1)*2);
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)
-{
-    return INTEGER_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)
-{
-    INTEGER_VALUE_OF(o) = i;
-    VALUE_TYPE(o) = VCVT_UINT;
-}
-
-DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)
-{
-    return LONG_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)
-{
-    LONG_VALUE_OF(o) = l;
-    VALUE_TYPE(o) = VCVT_ULONG;
-}
-
-DLLEXPORT(void*) vObjectAnyValue(VObject *o)
-{
-    return ANY_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)
-{
-    ANY_VALUE_OF(o) = t;
-    VALUE_TYPE(o) = VCVT_RAW;
-}
-
-DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)
-{
-    return VOBJECT_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)
-{
-    VOBJECT_VALUE_OF(o) = p;
-    VALUE_TYPE(o) = VCVT_VOBJECT;
-}
-
-DLLEXPORT(int) vObjectValueType(VObject *o)
-{
-    return VALUE_TYPE(o);
-}
-
-
-/*----------------------------------------------------------------------
-  The following functions can be used to build VObject.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
-{
-    /* circular link list pointed to tail */
-    /*
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    -->
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	p {next,id,prop,val}
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    */
-
-    VObject *tail = o->prop;
-    if (tail) {
-	p->next = tail->next;
-	o->prop = tail->next = p;
-	}
-    else {
-	o->prop = p->next = p;
-	}
-    return p;
-}
-
-DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject(id));
-}
-
-DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject_(id));
-}
-
-DLLEXPORT(void) addList(VObject **o, VObject *p)
-{
-    p->next = 0;
-    if (*o == 0) {
-	*o = p;
-	}
-    else {
-	VObject *t = *o;
-	while (t->next) {
-	   t = t->next;
-	   }
-	t->next = p;
-	}
-}
-
-DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
-{
-    return o->next;
-}
-
-DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
-{
-    VObject *sizeProp;
-    setVObjectAnyValue(prop, val);
-    sizeProp = addProp(prop,VCDataSizeProp);
-    setVObjectLongValue(sizeProp, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
-{
-    void *p = dupStr((const char *)val,size);
-    return setValueWithSize_(prop,p,p?size:0);
-}
-
-DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->prop; 
-    i->next = 0;
-}
-
-DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->next; 
-    i->next = 0;
-}
-
-DLLEXPORT(int) moreIteration(VObjectIterator *i)
-{ 
-    return (i->start && (i->next==0 || i->next!=i->start));
-}
-
-DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
-{
-    if (i->start && i->next != i->start) {
-	if (i->next == 0) {
-	    i->next = i->start->next;
-	    return i->next;
-	    }
-	else {
-	    i->next = i->next->next;
-	    return i->next;
-	    }
-	}
-    else return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
-{
-    VObjectIterator i;
-    initPropIterator(&i,o);
-    while (moreIteration(&i)) {
-	VObject *each = nextVObject(&i);
-	if (!stricmp(id,each->id))
-	    return each;
-	}
-    return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
-{
-    /*
-	a.b.c
-	-->
-	prop(c)
-	    prop(VCGrouping=b)
-		prop(VCGrouping=a)
-     */
-    char *dot = strrchr(g,'.');
-    if (dot) {
-	VObject *p, *t;
-	char *gs, *n = dot+1;
-	gs = dupStr(g,0);	/* so we can write to it. */
-	/* used to be
-	* t = p = addProp_(o,lookupProp_(n));
-	*/
-	t = p = addProp_(o,lookupProp(n));
-	dot = strrchr(gs,'.');
-	*dot = 0;
-	do {
-	    dot = strrchr(gs,'.');
-	    if (dot) {
-		n = dot+1;
-		*dot=0;
-		}
-	    else
-		n = gs;
-	    /* property(VCGroupingProp=n);
-	     *	and the value may have VCGrouping property
-	     */
-	    t = addProp(t,VCGroupingProp);
-	    setVObjectStringZValue(t,lookupProp_(n));
-	    } while (n != gs);
-	deleteStr(gs);	
-	return p;
-	}
-    else
-	return addProp_(o,lookupProp(g));
-}
-
-DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setVObjectUStringZValue_(prop, fakeUnicode(v,0));
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setValueWithSize_(prop, (void*)v, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    return addPropSizedValue_(o,p,dupStr(v,size),size);
-}
-
-
-
-/*----------------------------------------------------------------------
-  The following pretty print a VObject
-  ----------------------------------------------------------------------*/
-
-static void printVObject_(FILE *fp, VObject *o, int level);
-
-static void indent(FILE *fp, int level)
-{
-    int i;
-    for (i=0;i<level*4;i++) {
-	fputc(' ', fp);
-	}
-}
-
-static void printValue(FILE *fp, VObject *o, int level)
-{
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char c;
-            char *t,*s;
-	    s = t = fakeCString(USTRINGZ_VALUE_OF(o));
-	    fputc('"',fp);
-	    while (c=*t,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		t++;
-		}
-	    fputc('"',fp);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    char c;
-	    const char *s = STRINGZ_VALUE_OF(o);
-	    fputc('"',fp);
-	    while (c=*s,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		s++;
-		}
-	    fputc('"',fp);
-	    break;
-	    }
-	case VCVT_UINT:
-	    fprintf(fp,"%d", INTEGER_VALUE_OF(o)); break;
-	case VCVT_ULONG:
-	    fprintf(fp,"%ld", LONG_VALUE_OF(o)); break;
-	case VCVT_RAW:
-	    fprintf(fp,"[raw data]"); break;
-	case VCVT_VOBJECT:
-	    fprintf(fp,"[vobject]\n");
-	    printVObject_(fp,VOBJECT_VALUE_OF(o),level+1);
-	    break;
-	case 0:
-	    fprintf(fp,"[none]"); break;
-	default:
-	    fprintf(fp,"[unknown]"); break;
-	}
-}
-
-static void printNameValue(FILE *fp,VObject *o, int level)
-{
-    indent(fp,level);
-    if (NAME_OF(o)) {
-	fprintf(fp,"%s", NAME_OF(o));
-	}
-    if (VALUE_TYPE(o)) {
-	fputc('=',fp);
-	printValue(fp,o, level);
-	}
-    fprintf(fp,"\n");
-}
-
-static void printVObject_(FILE *fp, VObject *o, int level)
-    {
-    VObjectIterator t;
-    if (o == 0) {
-	fprintf(fp,"[NULL]\n");
-	return;
-	}
-    printNameValue(fp,o,level);
-    initPropIterator(&t,o);
-    while (moreIteration(&t)) {
-	VObject *eachProp = nextVObject(&t);
-	printVObject_(fp,eachProp,level+1);
-	}
-    }
-
-void printVObject(FILE *fp,VObject *o)
-{
-    printVObject_(fp,o,0);
-}
-
-DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	printVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    printVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) cleanVObject(VObject *o)
-{
-    if (o == 0) return;
-    if (o->prop) {
-	/* destroy time: cannot use the iterator here.
-	   Have to break the cycle in the circular link
-	   list and turns it into regular NULL-terminated
-	   list -- since at some point of destruction,
-	   the reference entry for the iterator to work
-	   will not longer be valid.
-	   */
-	VObject *p;
-	p = o->prop->next;
-	o->prop->next = 0;
-	do {
-	   VObject *t = p->next;
-	   cleanVObject(p);
-	   p = t;
-	   } while (p);
-	}
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ:
-	case VCVT_STRINGZ:
-	case VCVT_RAW:
-		/* assume they are all allocated by malloc. */
-	    free((char*)STRINGZ_VALUE_OF(o));
-	    break;
-	case VCVT_VOBJECT:
-	    cleanVObject(VOBJECT_VALUE_OF(o));
-	    break;
-	}
-    deleteVObject(o);
-}
-
-DLLEXPORT(void) cleanVObjects(VObject *list)
-{
-    while (list) {
-	VObject *t = list;
-	list = nextVObjectInList(list);
-	cleanVObject(t);
-	}
-}
-
-/*----------------------------------------------------------------------
-  The following is a String Table Facilities.
-  ----------------------------------------------------------------------*/
-
-#define STRTBLSIZE 255
-
-static StrItem *strTbl[STRTBLSIZE];
-
-static unsigned int hashStr(const char *s)
-{
-    unsigned int h = 0;
-    int i;
-    for (i=0;s[i];i++) {
-	h += s[i]*i;
-	}
-    return h % STRTBLSIZE;
-}
-
-DLLEXPORT(const char*) lookupStr(const char *s)
-{
-    StrItem *t;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt++;
-		return t->s;
-		}
-	    t = t->next;
-	    } while (t);
-	}
-    s = dupStr(s,0);
-    strTbl[h] = newStrItem(s,strTbl[h]);
-    return s;
-}
-
-DLLEXPORT(void) unUseStr(const char *s)
-{
-    StrItem *t, *p;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	p = t;
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt--;
-		if (t->refCnt == 0) {
-		    if (p == strTbl[h]) {
-			strTbl[h] = t->next;
-			}
-		    else {
-			p->next = t->next;
-			}
-		    deleteStr(t->s);
-		    deleteStrItem(t);
-		    return;
-		    }
-		}
-	    p = t;
-	    t = t->next;
-	    } while (t);
-	}
-}
-
-DLLEXPORT(void) cleanStrTbl()
-{
-    int i;
-    for (i=0; i<STRTBLSIZE;i++) {
-	StrItem *t = strTbl[i];
-	while (t) {
-	    StrItem *p;
-	    deleteStr(t->s);
-	    p = t;
-	    t = t->next;
-	    deleteStrItem(p);
-	    } while (t);
-	strTbl[i] = 0;
-	}
-}
-
-
-struct PreDefProp {
-    const char *name;
-    const char *alias;
-    const char** fields;
-    unsigned int flags;
-    };
-
-/* flags in PreDefProp */
-#define PD_BEGIN	0x1
-#define PD_INTERNAL	0x2
-
-static const char *adrFields[] = {
-    VCPostalBoxProp,
-    VCExtAddressProp,
-    VCStreetAddressProp,
-    VCCityProp,
-    VCRegionProp,
-    VCPostalCodeProp,
-    VCCountryNameProp,
-    0
-};
-
-static const char *nameFields[] = {
-    VCFamilyNameProp,
-    VCGivenNameProp,
-    VCAdditionalNamesProp,
-    VCNamePrefixesProp,
-    VCNameSuffixesProp,
-    NULL
-    };
-
-static const char *orgFields[] = {
-    VCOrgNameProp,
-    VCOrgUnitProp,
-    VCOrgUnit2Prop,
-    VCOrgUnit3Prop,
-    VCOrgUnit4Prop,
-    NULL
-    };
-
-static const char *AAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCAudioContentProp,
-    0
-    };
-
-/* ExDate -- has unamed fields */
-/* RDate -- has unamed fields */
-
-static const char *DAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCDisplayStringProp,
-    0
-    };
-
-static const char *MAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCEmailAddressProp,
-    VCNoteProp,
-    0
-    };
-
-static const char *PAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCProcedureNameProp,
-    0
-    };
-
-static struct PreDefProp propNames[] = {
-    { VC7bitProp, 0, 0, 0 },
-    { VC8bitProp, 0, 0, 0 },
-    { VCAAlarmProp, 0, AAlarmFields, 0 },
-    { VCAdditionalNamesProp, 0, 0, 0 },
-    { VCAdrProp, 0, adrFields, 0 },
-    { VCAgentProp, 0, 0, 0 },
-    { VCAIFFProp, 0, 0, 0 },
-    { VCAOLProp, 0, 0, 0 },
-    { VCAppleLinkProp, 0, 0, 0 },
-    { VCAttachProp, 0, 0, 0 },
-    { VCAttendeeProp, 0, 0, 0 },
-    { VCATTMailProp, 0, 0, 0 },
-    { VCAudioContentProp, 0, 0, 0 },
-    { VCAVIProp, 0, 0, 0 },
-    { VCBase64Prop, 0, 0, 0 },
-    { VCBBSProp, 0, 0, 0 },
-    { VCBirthDateProp, 0, 0, 0 },
-    { VCBMPProp, 0, 0, 0 },
-    { VCBodyProp, 0, 0, 0 },
-    { VCBusinessRoleProp, 0, 0, 0 },
-    { VCCalProp, 0, 0, PD_BEGIN },
-    { VCCaptionProp, 0, 0, 0 },
-    { VCCardProp, 0, 0, PD_BEGIN },
-    { VCCarProp, 0, 0, 0 },
-    { VCCategoriesProp, 0, 0, 0 },
-    { VCCellularProp, 0, 0, 0 },
-    { VCCGMProp, 0, 0, 0 },
-    { VCCharSetProp, 0, 0, 0 },
-    { VCCIDProp, VCContentIDProp, 0, 0 },
-    { VCCISProp, 0, 0, 0 },
-    { VCCityProp, 0, 0, 0 },
-    { VCClassProp, 0, 0, 0 },
-    { VCCommentProp, 0, 0, 0 },
-    { VCCompletedProp, 0, 0, 0 },
-    { VCContentIDProp, 0, 0, 0 },
-    { VCCountryNameProp, 0, 0, 0 },
-    { VCDAlarmProp, 0, DAlarmFields, 0 },
-    { VCDataSizeProp, 0, 0, PD_INTERNAL },
-    { VCDayLightProp, 0, 0, 0 },
-    { VCDCreatedProp, 0, 0, 0 },
-    { VCDeliveryLabelProp, 0, 0, 0 },
-    { VCDescriptionProp, 0, 0, 0 },
-    { VCDIBProp, 0, 0, 0 },
-    { VCDisplayStringProp, 0, 0, 0 },
-    { VCDomesticProp, 0, 0, 0 },
-    { VCDTendProp, 0, 0, 0 },
-    { VCDTstartProp, 0, 0, 0 },
-    { VCDueProp, 0, 0, 0 },
-    { VCEmailAddressProp, 0, 0, 0 },
-    { VCEncodingProp, 0, 0, 0 },
-    { VCEndProp, 0, 0, 0 },
-    { VCEventProp, 0, 0, PD_BEGIN },
-    { VCEWorldProp, 0, 0, 0 },
-    { VCExNumProp, 0, 0, 0 },
-    { VCExpDateProp, 0, 0, 0 },
-    { VCExpectProp, 0, 0, 0 },
-    { VCExtAddressProp, 0, 0, 0 },
-    { VCFamilyNameProp, 0, 0, 0 },
-    { VCFaxProp, 0, 0, 0 },
-    { VCFullNameProp, 0, 0, 0 },
-    { VCGeoLocationProp, 0, 0, 0 },
-    { VCGeoProp, 0, 0, 0 },
-    { VCGIFProp, 0, 0, 0 },
-    { VCGivenNameProp, 0, 0, 0 },
-    { VCGroupingProp, 0, 0, 0 },
-    { VCHomeProp, 0, 0, 0 },
-    { VCIBMMailProp, 0, 0, 0 },
-    { VCInlineProp, 0, 0, 0 },
-    { VCInternationalProp, 0, 0, 0 },
-    { VCInternetProp, 0, 0, 0 },
-    { VCISDNProp, 0, 0, 0 },
-    { VCJPEGProp, 0, 0, 0 },
-    { VCLanguageProp, 0, 0, 0 },
-    { VCLastModifiedProp, 0, 0, 0 },
-    { VCLastRevisedProp, 0, 0, 0 },
-    { VCLocationProp, 0, 0, 0 },
-    { VCLogoProp, 0, 0, 0 },
-    { VCMailerProp, 0, 0, 0 },
-    { VCMAlarmProp, 0, MAlarmFields, 0 },
-    { VCMCIMailProp, 0, 0, 0 },
-    { VCMessageProp, 0, 0, 0 },
-    { VCMETProp, 0, 0, 0 },
-    { VCModemProp, 0, 0, 0 },
-    { VCMPEG2Prop, 0, 0, 0 },
-    { VCMPEGProp, 0, 0, 0 },
-    { VCMSNProp, 0, 0, 0 },
-    { VCNamePrefixesProp, 0, 0, 0 },
-    { VCNameProp, 0, nameFields, 0 },
-    { VCNameSuffixesProp, 0, 0, 0 },
-    { VCNoteProp, 0, 0, 0 },
-    { VCOrgNameProp, 0, 0, 0 },
-    { VCOrgProp, 0, orgFields, 0 },
-    { VCOrgUnit2Prop, 0, 0, 0 },
-    { VCOrgUnit3Prop, 0, 0, 0 },
-    { VCOrgUnit4Prop, 0, 0, 0 },
-    { VCOrgUnitProp, 0, 0, 0 },
-    { VCPagerProp, 0, 0, 0 },
-    { VCPAlarmProp, 0, PAlarmFields, 0 },
-    { VCParcelProp, 0, 0, 0 },
-    { VCPartProp, 0, 0, 0 },
-    { VCPCMProp, 0, 0, 0 },
-    { VCPDFProp, 0, 0, 0 },
-    { VCPGPProp, 0, 0, 0 },
-    { VCPhotoProp, 0, 0, 0 },
-    { VCPICTProp, 0, 0, 0 },
-    { VCPMBProp, 0, 0, 0 },
-    { VCPostalBoxProp, 0, 0, 0 },
-    { VCPostalCodeProp, 0, 0, 0 },
-    { VCPostalProp, 0, 0, 0 },
-    { VCPowerShareProp, 0, 0, 0 },
-    { VCPreferredProp, 0, 0, 0 },
-    { VCPriorityProp, 0, 0, 0 },
-    { VCProcedureNameProp, 0, 0, 0 },
-    { VCProdIdProp, 0, 0, 0 },
-    { VCProdigyProp, 0, 0, 0 },
-    { VCPronunciationProp, 0, 0, 0 },
-    { VCPSProp, 0, 0, 0 },
-    { VCPublicKeyProp, 0, 0, 0 },
-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
-    { VCQuickTimeProp, 0, 0, 0 },
-    { VCQuotedPrintableProp, 0, 0, 0 },
-    { VCRDateProp, 0, 0, 0 },
-    { VCRegionProp, 0, 0, 0 },
-    { VCRelatedToProp, 0, 0, 0 },
-    { VCRepeatCountProp, 0, 0, 0 },
-    { VCResourcesProp, 0, 0, 0 },
-    { VCRNumProp, 0, 0, 0 },
-    { VCRoleProp, 0, 0, 0 },
-    { VCRRuleProp, 0, 0, 0 },
-    { VCRSVPProp, 0, 0, 0 },
-    { VCRunTimeProp, 0, 0, 0 },
-    { VCSequenceProp, 0, 0, 0 },
-    { VCSnoozeTimeProp, 0, 0, 0 },
-    { VCStartProp, 0, 0, 0 },
-    { VCStatusProp, 0, 0, 0 },
-    { VCStreetAddressProp, 0, 0, 0 },
-    { VCSubTypeProp, 0, 0, 0 },
-    { VCSummaryProp, 0, 0, 0 },
-    { VCTelephoneProp, 0, 0, 0 },
-    { VCTIFFProp, 0, 0, 0 },
-    { VCTimeZoneProp, 0, 0, 0 },
-    { VCTitleProp, 0, 0, 0 },
-    { VCTLXProp, 0, 0, 0 },
-    { VCTodoProp, 0, 0, PD_BEGIN },
-    { VCTranspProp, 0, 0, 0 },
-    { VCUniqueStringProp, 0, 0, 0 },
-    { VCURLProp, 0, 0, 0 },
-    { VCURLValueProp, 0, 0, 0 },
-    { VCValueProp, 0, 0, 0 },
-    { VCVersionProp, 0, 0, 0 },
-    { VCVideoProp, 0, 0, 0 },
-    { VCVoiceProp, 0, 0, 0 },
-    { VCWAVEProp, 0, 0, 0 },
-    { VCWMFProp, 0, 0, 0 },
-    { VCWorkProp, 0, 0, 0 },
-    { VCX400Prop, 0, 0, 0 },
-    { VCX509Prop, 0, 0, 0 },
-    { VCXRuleProp, 0, 0, 0 },
-    { 0,0,0,0 }
-    };
-
-
-static struct PreDefProp* lookupPropInfo(const char* str)
-{
-    /* brute force for now, could use a hash table here. */
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    return &propNames[i];
-	    }
-    
-    return 0;
-}
-
-
-DLLEXPORT(const char*) lookupProp_(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char* s;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    return lookupStr(str);
-}
-
-
-DLLEXPORT(const char*) lookupProp(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char *s;
-	    fieldedProp = propNames[i].fields;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    fieldedProp = 0;
-    return lookupStr(str);
-}
-
-
-/*----------------------------------------------------------------------
-  APIs to Output text form.
-  ----------------------------------------------------------------------*/
-#define OFILE_REALLOC_SIZE 256
-typedef struct OFile {
-    FILE *fp;
-    char *s;
-    int len;
-    int limit;
-    int alloc:1;
-    int fail:1;
-    } OFile;
-
-#if 0
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int slen;
-    if (fp->fail) return;
-    slen  = strlen(s);
-    if (fp->fp) {
-	fwrite(s,1,slen,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len + slen < fp->limit) {
-	    memcpy(fp->s+fp->len,s,slen);
-	    fp->len += slen;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-#else
-static void appendcOFile_(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (c == '\n') {
-	/* write out as <CR><LF> */
-	appendcOFile_(fp,0xd);
-	appendcOFile_(fp,0xa);
-	}
-    else
-	appendcOFile_(fp,c);
-}
-
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int i, slen;
-    slen  = strlen(s);
-    for (i=0; i<slen; i++) {
-	appendcOFile(fp,s[i]);
-	}
-}
-
-#endif
-
-static void initOFile(OFile *fp, FILE *ofp)
-{
-    fp->fp = ofp;
-    fp->s = 0;
-    fp->len = 0;
-    fp->limit = 0;
-    fp->alloc = 0;
-    fp->fail = 0;
-}
-
-static void initMemOFile(OFile *fp, char *s, int len)
-{
-    fp->fp = 0;
-    fp->s = s;
-    fp->len = 0;
-    fp->limit = s?len:0;
-    fp->alloc = s?0:1;
-    fp->fail = 0;
-}
-
-
-static int writeBase64(OFile *fp, unsigned char *s, long len)
-{
-    long cur = 0;
-    int i, numQuads = 0;
-    unsigned long trip;
-    unsigned char b;
-    char quad[5];
-#define MAXQUADS 16
-
-    quad[4] = 0;
-
-    while (cur < len) {
-	    /* collect the triplet of bytes into 'trip' */
-	trip = 0;
-	for (i = 0; i < 3; i++) {
-	    b = (cur < len) ? *(s + cur) : 0;
-	    cur++;
-	    trip = trip << 8 | b;
-	    }
-	/* fill in 'quad' with the appropriate four characters */
-	for (i = 3; i >= 0; i--) {
-	    b = (unsigned char)(trip & 0x3F);
-	    trip = trip >> 6;
-	    if ((3 - i) < (cur - len))
-		    quad[i] = '='; /* pad char */
-	    else if (b < 26) quad[i] = (char)b + 'A';
-	    else if (b < 52) quad[i] = (char)(b - 26) + 'a';
-	    else if (b < 62) quad[i] = (char)(b - 52) + '0';
-	    else if (b == 62) quad[i] = '+';
-	    else quad[i] = '/';
-	    }
-	/* now output 'quad' with appropriate whitespace and line ending */
-	appendsOFile(fp, (numQuads == 0 ? "    " : ""));
-	appendsOFile(fp, quad);
-	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
-	numQuads = (numQuads + 1) % MAXQUADS;
-	}
-    appendcOFile(fp,'\n');
-
-    return 1;
-}
-
-static void writeString(OFile *fp, const char *s)
-{
-    appendsOFile(fp,s);
-}
-
-static void writeQPString(OFile *fp, const char *s)
-{
-    char buf[4];
-    int count=0;
-    const char *p = s;
-
-    while (*p) {
-        /* break up lines biggger than 75 chars */
-        if(count >=74){
-		count=0;
-		appendsOFile(fp,"=\n");
-	}
-	
-	/* escape any non ASCII characters and '=' as per rfc1521 */
-	if (*p<= 0x1f || *p >=0x7f || *p == '=' ) {
-		sprintf(buf,"=%02X",(unsigned char)*p);
-		appendsOFile(fp,buf); 
-		count+=3; 
-	} else {
-		appendcOFile(fp,*p);	
-		count++; 
-	}
-	p++;
-    }
-}
-
-
-
-static void writeVObject_(OFile *fp, VObject *o);
-
-static void writeValue(OFile *fp, VObject *o, unsigned long size,int quote)
-{
-    if (o == 0) return;
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char *s = fakeCString(USTRINGZ_VALUE_OF(o));
-	    if(quote) writeQPString(fp, s);
-	    else writeString(fp,s);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    if(quote) writeQPString(fp, STRINGZ_VALUE_OF(o));
-	    else writeString(fp,STRINGZ_VALUE_OF(o));
-	    break;
-	    }
-	case VCVT_UINT: {
-	    char buf[16];
-	    sprintf(buf,"%u", INTEGER_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_ULONG: {
-	    char buf[16];
-	    sprintf(buf,"%lu", LONG_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_RAW: {
-	    appendcOFile(fp,'\n');
-	    writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
-	    break;
-	    }
-	case VCVT_VOBJECT:
-	    appendcOFile(fp,'\n');
-	    writeVObject_(fp,VOBJECT_VALUE_OF(o));
-	    break;
-	}
-}
-
-static void writeAttrValue(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
-	appendcOFile(fp,';');
-	appendsOFile(fp,NAME_OF(o));
-	}
-    else
-	appendcOFile(fp,';');
-    if (VALUE_TYPE(o)) {
-	appendcOFile(fp,'=');
-	writeValue(fp,o,0,0);
-	}
-}
-
-static void writeGroup(OFile *fp, VObject *o)
-{
-    char buf1[256];
-    char buf2[256];
-    strcpy(buf1,NAME_OF(o));
-    while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
-	strcpy(buf2,STRINGZ_VALUE_OF(o));
-	strcat(buf2,".");
-	strcat(buf2,buf1);
-	strcpy(buf1,buf2);
-	}
-    appendsOFile(fp,buf1);
-}
-
-static int inList(const char **list, const char *s)
-{
-    if (list == 0) return 0;
-    while (*list) {
-	if (stricmp(*list,s) == 0) return 1;
-	list++;
-	}
-    return 0;
-}
-
-static void writeProp(OFile *fp, VObject *o)
-{
-    int isQuoted=0;
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	VObjectIterator t;
-	const char **fields_ = 0;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    writeVObject_(fp,o);
-	    return;
-	    }
-	if (isAPropertyOf(o,VCGroupingProp))
-	    writeGroup(fp,o);
-	else
-	    appendsOFile(fp,NAME_OF(o));
-	if (pi) fields_ = pi->fields;
-	initPropIterator(&t,o);
-	while (moreIteration(&t)) {
-	    const char *s;
-	    VObject *eachProp = nextVObject(&t);
-	    s = NAME_OF(eachProp);
-	    if (stricmp(VCGroupingProp,s) && !inList(fields_,s))
-		writeAttrValue(fp,eachProp);
-	    if (stricmp(VCQPProp,s)==0 || stricmp(VCQuotedPrintableProp,s)==0)
-		 isQuoted=1;
-	    }
-	if (fields_) {
-	    int i = 0, n = 0;
-	    const char** fields = fields_;
-	    /* output prop as fields */
-	    appendcOFile(fp,':');
-	    while (*fields) {
-		VObject *t = isAPropertyOf(o,*fields);
-		i++;
-		if (t) n = i;
-		fields++;
-		}
-	    fields = fields_;
-	    for (i=0;i<n;i++) {
-		writeValue(fp,isAPropertyOf(o,*fields),0,isQuoted);
-		fields++;
-		if (i<(n-1)) appendcOFile(fp,';');
-		}
-	    }
-	}
-	
-    if (VALUE_TYPE(o)) {
-	unsigned long size = 0;
-        VObject *p = isAPropertyOf(o,VCDataSizeProp);
-	if (p) size = LONG_VALUE_OF(p);
-	appendcOFile(fp,':');
-	writeValue(fp,o,size,isQuoted);
-	}
-
-    appendcOFile(fp,'\n');
-}
-
-static void writeVObject_(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    VObjectIterator t;
-	    const char *begin = NAME_OF(o);
-	    appendsOFile(fp,"BEGIN:");
-	    appendsOFile(fp,begin);
-	    appendcOFile(fp,'\n');
-	    initPropIterator(&t,o);
-	    while (moreIteration(&t)) {
-		VObject *eachProp = nextVObject(&t);
-		writeProp(fp, eachProp);
-		}
-	    appendsOFile(fp,"END:");
-	    appendsOFile(fp,begin);
-	    appendsOFile(fp,"\n\n");
-	    }
-	}
-}
-
-void writeVObject(FILE *fp, VObject *o)
-{
-    OFile ofp;
-    initOFile(&ofp,fp);
-    writeVObject_(&ofp,o);
-}
-
-DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	writeVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    writeVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    writeVObject_(&ofp,o);
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    while (list) {
-	writeVObject_(&ofp,list);
-	list = nextVObjectInList(list);
-	}
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-/*----------------------------------------------------------------------
-  APIs to do fake Unicode stuff.
-  ----------------------------------------------------------------------*/
-DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes)
-{
-    wchar_t *r, *pw;
-    int len = strlen(ps)+1;
-
-    pw = r = (wchar_t*)malloc(sizeof(wchar_t)*len);
-    if (bytes)
-	*bytes = len * sizeof(wchar_t);
-
-    while (*ps) { 
-	if (*ps == '\n')
-	    *pw = (wchar_t)0x2028;
-	else if (*ps == '\r')
-	    *pw = (wchar_t)0x2029;
-	else
-	    *pw = (wchar_t)(unsigned char)*ps;
-	ps++; pw++;
-	}				 
-    *pw = (wchar_t)0;
-	
-    return r;
-}
-
-DLLEXPORT(int) uStrLen(const wchar_t *u)
-{
-    int i = 0;
-    while (*u != (wchar_t)0) { u++; i++; }
-    return i;
-}
-
-DLLEXPORT(char*) fakeCString(const wchar_t *u)
-{
-    char *s, *t;
-    int len = uStrLen(u) + 1;
-    t = s = (char*)malloc(len);
-    while (*u) {
-	if (*u == (wchar_t)0x2028)
-	    *t = '\n';
-	else if (*u == (wchar_t)0x2029)
-	    *t = '\r';
-	else
-	    *t = (char)*u;
-	u++; t++;
-	}
-    *t = 0;
-    return s;
-}
-
-/* end of source file vobject.c */
diff --git a/libical/src/libicalvcal/vobject.h b/libical/src/libicalvcal/vobject.h
deleted file mode 100644
index bc31dc8297..0000000000
--- a/libical/src/libicalvcal/vobject.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- 
-The vCard/vCalendar C interface is implemented in the set 
-of files as follows:
-
-vcc.y, yacc source, and vcc.c, the yacc output you will use
-implements the core parser
-
-vobject.c implements an API that insulates the caller from
-the parser and changes in the vCard/vCalendar BNF
-
-port.h defines compilation environment dependent stuff
-
-vcc.h and vobject.h are header files for their .c counterparts
-
-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions
-which you may find useful.
-
-test.c is a standalone test driver that exercises some of
-the features of the APIs provided. Invoke test.exe on a
-VCARD/VCALENDAR input text file and you will see the pretty
-print output of the internal representation (this pretty print
-output should give you a good idea of how the internal 
-representation looks like -- there is one such output in the 
-following too). Also, a file with the .out suffix is generated 
-to show that the internal representation can be written back 
-in the original text format.
-
-For more information on this API see the readme.txt file
-which accompanied this distribution.
-
-  Also visit:
-
-		http://www.versit.com
-		http://www.ralden.com
-
-*/
-
-
-#ifndef __VOBJECT_H__
-#define __VOBJECT_H__ 1
-
-
-#include "port.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-
-#define VC7bitProp				"7BIT"
-#define VC8bitProp				"8BIT"
-#define VCAAlarmProp			"AALARM"
-#define VCAdditionalNamesProp	"ADDN"
-#define VCAdrProp				"ADR"
-#define VCAgentProp				"AGENT"
-#define VCAIFFProp				"AIFF"
-#define VCAOLProp				"AOL"
-#define VCAppleLinkProp			"APPLELINK"
-#define VCAttachProp			"ATTACH"
-#define VCAttendeeProp			"ATTENDEE"
-#define VCATTMailProp			"ATTMAIL"
-#define VCAudioContentProp		"AUDIOCONTENT"
-#define VCAVIProp				"AVI"
-#define VCBase64Prop			"BASE64"
-#define VCBBSProp				"BBS"
-#define VCBirthDateProp			"BDAY"
-#define VCBMPProp				"BMP"
-#define VCBodyProp				"BODY"
-#define VCBusinessRoleProp		"ROLE"
-#define VCCalProp				"VCALENDAR"
-#define VCCaptionProp			"CAP"
-#define VCCardProp				"VCARD"
-#define VCCarProp				"CAR"
-#define VCCategoriesProp		"CATEGORIES"
-#define VCCellularProp			"CELL"
-#define VCCGMProp				"CGM"
-#define VCCharSetProp			"CS"
-#define VCCIDProp				"CID"
-#define VCCISProp				"CIS"
-#define VCCityProp				"L"
-#define VCClassProp				"CLASS"
-#define VCCommentProp			"NOTE"
-#define VCCompletedProp			"COMPLETED"
-#define VCContentIDProp			"CONTENT-ID"
-#define VCCountryNameProp		"C"
-#define VCDAlarmProp			"DALARM"
-#define VCDataSizeProp			"DATASIZE"
-#define VCDayLightProp			"DAYLIGHT"
-#define VCDCreatedProp			"DCREATED"
-#define VCDeliveryLabelProp     "LABEL"
-#define VCDescriptionProp		"DESCRIPTION"
-#define VCDIBProp				"DIB"
-#define VCDisplayStringProp		"DISPLAYSTRING"
-#define VCDomesticProp			"DOM"
-#define VCDTendProp				"DTEND"
-#define VCDTstartProp			"DTSTART"
-#define VCDueProp				"DUE"
-#define VCEmailAddressProp		"EMAIL"
-#define VCEncodingProp			"ENCODING"
-#define VCEndProp				"END"
-#define VCEventProp				"VEVENT"
-#define VCEWorldProp			"EWORLD"
-#define VCExNumProp				"EXNUM"
-#define VCExpDateProp			"EXDATE"
-#define VCExpectProp			"EXPECT"
-#define VCExtAddressProp		"EXT ADD"
-#define VCFamilyNameProp		"F"
-#define VCFaxProp				"FAX"
-#define VCFullNameProp			"FN"
-#define VCGeoProp				"GEO"
-#define VCGeoLocationProp		"GEO"
-#define VCGIFProp				"GIF"
-#define VCGivenNameProp			"G"
-#define VCGroupingProp			"Grouping"
-#define VCHomeProp				"HOME"
-#define VCIBMMailProp			"IBMMail"
-#define VCInlineProp			"INLINE"
-#define VCInternationalProp		"INTL"
-#define VCInternetProp			"INTERNET"
-#define VCISDNProp				"ISDN"
-#define VCJPEGProp				"JPEG"
-#define VCLanguageProp			"LANG"
-#define VCLastModifiedProp		"LAST-MODIFIED"
-#define VCLastRevisedProp		"REV"
-#define VCLocationProp			"LOCATION"
-#define VCLogoProp				"LOGO"
-#define VCMailerProp			"MAILER"
-#define VCMAlarmProp			"MALARM"
-#define VCMCIMailProp			"MCIMAIL"
-#define VCMessageProp			"MSG"
-#define VCMETProp				"MET"
-#define VCModemProp				"MODEM"
-#define VCMPEG2Prop				"MPEG2"
-#define VCMPEGProp				"MPEG"
-#define VCMSNProp				"MSN"
-#define VCNamePrefixesProp		"NPRE"
-#define VCNameProp				"N"
-#define VCNameSuffixesProp		"NSUF"
-#define VCNoteProp				"NOTE"
-#define VCOrgNameProp			"ORGNAME"
-#define VCOrgProp				"ORG"
-#define VCOrgUnit2Prop			"OUN2"
-#define VCOrgUnit3Prop			"OUN3"
-#define VCOrgUnit4Prop			"OUN4"
-#define VCOrgUnitProp			"OUN"
-#define VCPagerProp				"PAGER"
-#define VCPAlarmProp			"PALARM"
-#define VCParcelProp			"PARCEL"
-#define VCPartProp				"PART"
-#define VCPCMProp				"PCM"
-#define VCPDFProp				"PDF"
-#define VCPGPProp				"PGP"
-#define VCPhotoProp				"PHOTO"
-#define VCPICTProp				"PICT"
-#define VCPMBProp				"PMB"
-#define VCPostalBoxProp			"BOX"
-#define VCPostalCodeProp		"PC"
-#define VCPostalProp			"POSTAL"
-#define VCPowerShareProp		"POWERSHARE"
-#define VCPreferredProp			"PREF"
-#define VCPriorityProp			"PRIORITY"
-#define VCProcedureNameProp		"PROCEDURENAME"
-#define VCProdIdProp			"PRODID"
-#define VCProdigyProp			"PRODIGY"
-#define VCPronunciationProp		"SOUND"
-#define VCPSProp				"PS"
-#define VCPublicKeyProp			"KEY"
-#define VCQPProp				"QP"
-#define VCQuickTimeProp			"QTIME"
-#define VCQuotedPrintableProp	"QUOTED-PRINTABLE"
-#define VCRDateProp				"RDATE"
-#define VCRegionProp			"R"
-#define VCRelatedToProp			"RELATED-TO"
-#define VCRepeatCountProp		"REPEATCOUNT"
-#define VCResourcesProp			"RESOURCES"
-#define VCRNumProp				"RNUM"
-#define VCRoleProp				"ROLE"
-#define VCRRuleProp				"RRULE"
-#define VCRSVPProp				"RSVP"
-#define VCRunTimeProp			"RUNTIME"
-#define VCSequenceProp			"SEQUENCE"
-#define VCSnoozeTimeProp		"SNOOZETIME"
-#define VCStartProp				"START"
-#define VCStatusProp			"STATUS"
-#define VCStreetAddressProp		"STREET"
-#define VCSubTypeProp			"SUBTYPE"
-#define VCSummaryProp			"SUMMARY"
-#define VCTelephoneProp			"TEL"
-#define VCTIFFProp				"TIFF"
-#define VCTimeZoneProp			"TZ"
-#define VCTitleProp				"TITLE"
-#define VCTLXProp				"TLX"
-#define VCTodoProp				"VTODO"
-#define VCTranspProp			"TRANSP"
-#define VCUniqueStringProp		"UID"
-#define VCURLProp				"URL"
-#define VCURLValueProp			"URLVAL"
-#define VCValueProp				"VALUE"
-#define VCVersionProp			"VERSION"
-#define VCVideoProp				"VIDEO"
-#define VCVoiceProp				"VOICE"
-#define VCWAVEProp				"WAVE"
-#define VCWMFProp				"WMF"
-#define VCWorkProp				"WORK"
-#define VCX400Prop				"X400"
-#define VCX509Prop				"X509"
-#define VCXRuleProp				"XRULE"
-
-/* Extensions */
-
-#define XPilotIdProp                            "X-PILOTID"
-#define XPilotStatusProp                        "X-PILOTSTAT"
-
-typedef struct VObject VObject;
-
-typedef struct VObjectIterator {
-    VObject* start;
-    VObject* next;
-    } VObjectIterator;
-
-extern DLLEXPORT(VObject*) newVObject(const char *id);
-extern DLLEXPORT(void) deleteVObject(VObject *p);
-extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
-extern DLLEXPORT(void) deleteStr(const char *p);
-extern DLLEXPORT(void) unUseStr(const char *s);
-
-extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
-extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
-extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
-extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
-extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
-extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
-
-extern DLLEXPORT(const char*) vObjectName(VObject *o);
-extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
-extern DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o);
-extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
-extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
-extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
-extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
-extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
-
-extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
-extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
-extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
-extern DLLEXPORT(void) addList(VObject **o, VObject *p);
-
-extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
-
-extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
-extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
-extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
-extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
-
-extern DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o);
-extern DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list);
-
-extern DLLEXPORT(const char*) lookupStr(const char *s);
-extern DLLEXPORT(void) cleanStrTbl();
-
-extern DLLEXPORT(void) cleanVObject(VObject *o);
-extern DLLEXPORT(void) cleanVObjects(VObject *list);
-
-extern DLLEXPORT(const char*) lookupProp(const char* str);
-extern DLLEXPORT(const char*) lookupProp_(const char* str);
-
-extern DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes);
-extern DLLEXPORT(int) uStrLen(const wchar_t *u);
-extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
-
-extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
-extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
-extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
-extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
-
-extern DLLEXPORT(int) vObjectValueType(VObject *o);
-
-/* return type of vObjectValueType: */
-#define VCVT_NOVALUE	0
-	/* if the VObject has no value associated with it. */
-#define VCVT_STRINGZ	1
-	/* if the VObject has value set by setVObjectStringZValue. */
-#define VCVT_USTRINGZ	2
-	/* if the VObject has value set by setVObjectUStringZValue. */
-#define VCVT_UINT		3
-	/* if the VObject has value set by setVObjectIntegerValue. */
-#define VCVT_ULONG		4
-	/* if the VObject has value set by setVObjectLongValue. */
-#define VCVT_RAW		5
-	/* if the VObject has value set by setVObjectAnyValue. */
-#define VCVT_VOBJECT	6
-	/* if the VObject has value set by setVObjectVObjectValue. */
-
-extern const char** fieldedProp;
-
-/* NOTE regarding printVObject and writeVObject
-
-The functions below are not exported from the DLL because they
-take a FILE* as a parameter, which cannot be passed across a DLL 
-interface (at least that is my experience). Instead you can use
-their companion functions which take file names or pointers
-to memory. However, if you are linking this code into 
-your build directly then you may find them a more convenient API
-and you can go ahead and use them. If you try to use them with 
-the DLL LIB you will get a link error.
-*/
-extern void printVObject(FILE *fp,VObject *o);
-extern void writeVObject(FILE *fp, VObject *o);
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VOBJECT_H__ */
-
-
diff --git a/libical/src/test/.cvsignore b/libical/src/test/.cvsignore
deleted file mode 100644
index ed72bfe59f..0000000000
--- a/libical/src/test/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-*.la
-*.lo
-.libs
-Makefile
-Makefile.in
-.deps
-.libs
-copycluster 
-regression 
-parser 
-findobj 
-storage 
-stow 
-recur 
-testmime 
-testvcal
-
-
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
deleted file mode 100644
index 2830afdaa0..0000000000
--- a/libical/src/test/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-noinst_PROGRAMS = copycluster regression parser storage stow recur testmime testvcal process testclassify
-
-LDADD =  ../libicalss/libicalss.la ../libicalvcal/libicalvcal.la ../libical/libical.la 
-
-INCLUDES = \
-       -I. \
-       -I../libicalvcal \
-       -I$(srcdir)/../libicalvcal \
-       -I$(srcdir) \
-       -I../libical \
-       -I$(srcdir)/../libical \
-       -I../libicalss \
-       -I$(srcdir)/../libicalss           
-
-copycluster_SOURCES = copycluster.c
-regression_SOURCES = regression.c
-parser_SOURCES = icaltestparser.c
-storage_SOURCES = storage.c
-stow_SOURCES = stow.c
-testvcal_SOURCES = testvcal.c
-recur_SOURCES = recur.c 
-testmime_SOURCES = testmime.c
-process_SOURCES = process.c
-testclassify_SOURCES = testclassify.c
diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c
deleted file mode 100644
index fa87e25385..0000000000
--- a/libical/src/test/copycluster.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: copycluster.c
-  CREATOR: eric 15 January 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include "ical.h"
-#include "icalss.h"
-#include "icalfileset.h"
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include "icalrestriction.h"
-
-/* This program copies a file that holds iCal components to an other file. */
-
-
-void usage(char* arg0) {
-    printf("usage: %s cluster-file1 cluster-file2\n",arg0);
-}
-
-int main(int c, char *argv[]){
-
-    icalfileset *clusterin, *clusterout;
-    icalcomponent *itr;
-    int count=0;
-    int tostdout = 0;
-
-    if(c < 2 || c > 3){
-	usage(argv[0]);
-	exit(1);
-    }
-
-    if (c == 2){
-	tostdout = 1;
-    }
-
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
-    icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);
-
-    clusterin = icalfileset_new(argv[1]);
-
-    if (clusterin == 0){
-	printf("Could not open input cluster \"%s\"",argv[1]);
-	       
-	exit(1);
-    }
-
-    if (!tostdout){
-	clusterout = icalfileset_new(argv[2]);
-	if (clusterout == 0){
-	    printf("Could not open output cluster \"%s\"\n",argv[2]);
-	    exit(1);
-	}
-    }
-
-
-    for (itr = icalset_get_first_component(clusterin);
-	 itr != 0;
-	 itr = icalset_get_next_component(clusterin)){
-
-	icalrestriction_check(itr);
-
-	if (itr != 0){
-
-	    if(tostdout){
-
-		printf("--------------\n%s\n",icalcomponent_as_ical_string(itr));
-	    } else {
-
-		icalfileset_add_component(clusterout,
-					  icalcomponent_new_clone(itr));
-	    }
-	    
-	    count++;
-
-	} else {
-	    printf("Got NULL component");
-	}
-    }
-
-
-    printf("Transfered %d components\n",count);
-
-    icalfileset_free(clusterin);
-
-    if (!tostdout){
-	icalfileset_mark(clusterout);
-	icalfileset_free(clusterout);
-    }
-
-     return 0;
-}
-
-
diff --git a/libical/src/test/findobj.c b/libical/src/test/findobj.c
deleted file mode 100644
index c31101c33d..0000000000
--- a/libical/src/test/findobj.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: findobj.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include "ical.h"
-#include "icalcalendar.h"
-#include "icaldirset.h"
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include "icalrestriction.h"
-
-/* This program finds an object stored in a calendar */
-
-void usage(char* arg0) {
-    printf("usage: %s calendar-dir uid\n",arg0);
-}
-
-int main(int c, char *argv[]){
-
-    icalcalendar *cal;
-    icaldirset *booked;
-    icalcomponent *itr;
-
-    if(c < 2 || c > 3){
-	usage(argv[0]);
-	exit(1);
-    }
-
-    cal = icalcalendar_new(argv[1]);
-
-    if(cal == 0){
-	fprintf(stderr,"%s: error in opening calendar \"%s\": %s. errno is \"%s\"\n",
-		argv[0],argv[1],icalerror_strerror(icalerrno),
-		strerror(errno));
-    }
-
-    booked = icalcalendar_get_booked(cal);
-
-    itr = icaldirset_fetch(booked,argv[2]);
-
-
-    if(itr != 0){
-	printf("%s",icalcomponent_as_ical_string(itr));
-    }
-
-    return 0;
-}
-
diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c
deleted file mode 100644
index e5973e0d4a..0000000000
--- a/libical/src/test/icaltestparser.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltestparser.c
-  CREATOR: eric 20 June 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icaltestparser.c
-
- 
- (C) COPYRIGHT 1999 The Software Studio. 
- http://www.softwarestudio.org
-
- ======================================================================*/
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "ical.h"
-
-#include <stdlib.h>
-
-char str[] = "BEGIN:VCALENDAR\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\
-VERSION:2.0\
-BEGIN:VTIMEZONE\
-TZID:US-Eastern\
-BEGIN:STANDARD\
-DTSTART:19990404T020000\
-RDATE:19990u404xT020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-END:STANDARD\
-BEGIN:DAYLIGHT\
-DTSTART:19990404T020000\
-RDATE:19990404T020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-TZNAME:EDT\
-Dkjhgri:derhvnv;\
-BEGIN:dfkjh\
-END:dfdfkjh\
-END:DAYLIGHT\
-END:VTIMEZONE\
-BEGIN:VEVENT\
-GEO:Bongo\
-DTSTAMP:19980309T231000Z\
-UID:guid-1.host1.com\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP\
- :MAILTO:employee-A@host.com\
-DESCRIPTION:Project XYZ Review Meeting\
-CATEGORIES:MEETING\
-CLASS:PUBLIC\
-CREATED:19980309T130000Z\
-SUMMARY:XYZ Project Review\
-DTSTART;TZID=US-Eastern:19980312T083000\
-DTEND;TZID=US-Eastern:19980312T093000\
-LOCATION:1CP Conference Room 4350\
-END:VEVENT\
-END:VCALENDAR\
-";
-
-extern int yydebug;
-
-/* Have the parser fetch data from stdin */
-
-char* read_stream(char *s, size_t size, void *d)
-{
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-
-}
-
-
-
-int main(int argc, char* argv[])
-{
-
-    char* line; 
-    FILE* stream;
-    icalcomponent *c; 
-    icalparser *parser = icalparser_new();
-
-    stream = fopen(argv[1],"r");
-
-    assert(stream != 0);
-
-    icalparser_set_gen_data(parser,stream);
-
-    do{
-    
-	line = icalparser_get_line(parser,read_stream);
-
-	c = icalparser_add_line(parser,line);
-
-
-	if (c != 0){
-	    /*icalcomponent_convert_errors(c);*/
-	    printf("%s",icalcomponent_as_ical_string(c));
-	    printf("\n---------------\n");
-	    icalcomponent_free(c);
-	}
-
-    } while ( line != 0);
-
-    return 0;
- }
diff --git a/libical/src/test/process.c b/libical/src/test/process.c
deleted file mode 100644
index 56f1c65fb1..0000000000
--- a/libical/src/test/process.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: process.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include "ical.h"
-#include "icalss.h"
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include <stdlib.h> /* for free */
-
-struct class_map {
-	ical_class class;
-	char *str;
-} class_map[] = {
-    {ICAL_NO_CLASS,"No class"},
-    {ICAL_PUBLISH_NEW_CLASS,"New Publish"},
-    {ICAL_PUBLISH_UPDATE_CLASS,"New Publish"},
-    {ICAL_REQUEST_NEW_CLASS,"New request"},
-    {ICAL_REQUEST_UPDATE_CLASS,"Update"},
-    {ICAL_REQUEST_RESCHEDULE_CLASS,"Reschedule"},
-    {ICAL_REQUEST_DELEGATE_CLASS,"Delegate"},
-    {ICAL_REQUEST_NEW_ORGANIZER_CLASS,"New Organizer"},
-    {ICAL_REQUEST_FORWARD_CLASS,"Forward"},
-    {ICAL_REQUEST_STATUS_CLASS,"Status request"},
-    {ICAL_REPLY_ACCEPT_CLASS,"Accept reply"},
-    {ICAL_REPLY_DECLINE_CLASS,"Decline reply"},
-    {ICAL_REPLY_CRASHER_ACCEPT_CLASS,"Crasher's accept reply"},
-    {ICAL_REPLY_CRASHER_DECLINE_CLASS,"Crasher's decline reply"},
-    {ICAL_ADD_INSTANCE_CLASS,"Add instance"},
-    {ICAL_CANCEL_EVENT_CLASS,"Cancel event"},
-    {ICAL_CANCEL_INSTANCE_CLASS,"Cancel instance"},
-    {ICAL_CANCEL_ALL_CLASS,"Cancel all instances"},
-    {ICAL_REFRESH_CLASS,"Refresh"},
-    {ICAL_COUNTER_CLASS,"Counter"},
-    {ICAL_DECLINECOUNTER_CLASS,"Decline counter"},
-    {ICAL_MALFORMED_CLASS,"Malformed"}, 
-    {ICAL_OBSOLETE_CLASS,"Obsolete"},
-    {ICAL_MISSEQUENCED_CLASS,"Missequenced"},
-    {ICAL_UNKNOWN_CLASS,"Unknown"}
-};
-
-char* find_class_string(ical_class class)
-{
-    int i; 
-
-    for (i = 0;class_map[i].class != ICAL_UNKNOWN_CLASS;i++){
-	if (class_map[i].class == class){
-	    return class_map[i].str;
-	}
-    }
-
-    return "Unknown";
-}
-
-void send_message(icalcomponent *reply,const char* this_user)
-{
-    printf("From: %s\n\n%s\n",this_user,icalcomponent_as_ical_string(reply));
-    
-
-}
-
-
-int main(int argc, char* argv[])
-{
-    icalcomponent *c, *next_c;
-    int i=0;
-    char *class_string;
-    int dont_remove;
-    
-    icalset* f = icalset_new_file("../../test-data/process-incoming.ics");
-    icalset* trash = icalset_new_file("trash.ics");
-    icalset* cal = icalset_new_file("../../test-data/process-calendar.ics");
-    icalset* out = icalset_new_file("outgoing.ics");
-
-    const char* this_user = "alice@cal.softwarestudio.org";
-
-    assert(f!= 0);
-    assert(cal!=0);
-    assert(trash!=0);
-    assert(out!=0);
-
-
-    /* Foreach incoming message */
-    for(c=icalset_get_first_component(f);c!=0;c = next_c){
-	
-	ical_class class;
-	icalcomponent *match;
-	icalcomponent *inner; 
-	icalcomponent *reply = 0;
-
-	assert(c!=0);
-
-	inner = icalcomponent_get_first_real_component(c);
-
-	i++;
-	reply = 0;
-	dont_remove = 0;
-
-	if(inner == 0){
-	    printf("Bad component, no inner\n %s\n",
-		   icalcomponent_as_ical_string(c));
-	    continue;
-	}
-
-	/* Find a booked component that is matched to the incoming
-	   message, based on the incoming component's UID, SEQUENCE
-	   and RECURRENCE-ID*/
-
-	match = icalset_fetch_match(cal,c);
-
-	class = icalclassify(c,match,this_user);
-
-	class_string = find_class_string(class);
-
-	/* Print out the notes associated with the incoming component
-           and the matched component in the */
-	{
-	    const char *c_note=0;
-	    const char *m_note=0;
-	    icalproperty *p;
-
-	    for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-		p!= 0;
-		p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-
-		if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-		    c_note = icalproperty_get_x(p);
-		}
-	    }
-	   
-	    if (match != 0){
-		for(p = icalcomponent_get_first_property(match,
-							 ICAL_X_PROPERTY);
-		    p!= 0;
-		    p = icalcomponent_get_next_property(match,
-							ICAL_X_PROPERTY)){
-		    if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-			m_note = icalproperty_get_x(p);
-		    }
-		}
-	    }
-		
-	    if(c_note != 0){
-		printf("Incoming: %s\n",c_note);
-	    }
-	    if(m_note != 0){
-		printf("Match   : %s\n",m_note);
-	    }		
-	}
-
-	/* Main processing structure */
-
-	switch (class){
-	    case ICAL_NO_CLASS: { 
-		char temp[1024];
-		/* Huh? Return an error to sender */
-		icalrestriction_check(c);
-		icalcomponent_convert_errors(c);
-
-		snprintf(temp,1024,"I can't understand the component you sent. \n Here is the component you sent, possibly with error messages:\n %s",icalcomponent_as_ical_string(c));
-
-		reply = icalmessage_new_error_reply(
-		    c,
-		    this_user,
-		    temp,
-		    "",
-		    ICAL_UNKNOWN_STATUS
-		    );
-		    
-			   
-
-		break; 
-	    }
-	    case ICAL_PUBLISH_NEW_CLASS: { 
-		
-		/* Don't accept published events from anyone but
-		   self. If self, fall through to ICAL_REQUEST_NEW_CLASS */
-
-		
-
-	    }
-	    case ICAL_REQUEST_NEW_CLASS: { 
-		
-		/* Book the new component if it does not overlap
-		   anything. If the time is busy and the start time is
-		   an even modulo 4, delegate to
-		   bob@cal.softwarestudio.org. If the time is busy and
-		   is 1 modulo 4, counterpropose for the first
-		   available free time. Otherwise, deline the meeting */
-
-		icalcomponent *overlaps;
-		overlaps = icalclassify_find_overlaps(cal,c);
-
-		if(overlaps == 0){
-		    /* No overlaps, book the meeting */
-/*		    icalset_add_component(cal,icalcomponent_new_clone(c));*/
-
-		    /* Return a reply */
-		    reply = icalmessage_new_accept_reply(c,this_user,
-				  	 "I can make it to this meeting");
-
-		    icalset_add_component(out,reply);
-		  
-		} else {
-		    /* There was a conflict, so delegate, counterpropose
-		       or decline it */
-		    struct icaltimetype dtstart 
-			= icalcomponent_get_dtstart(c);
-		  
-		    if(dtstart.hour%4 == 0){  
-			/* Delegate the meeting */
-			reply = icalmessage_new_delegate_reply(c, 
-			  this_user,
-            		  "bob@cal.softwarestudio.org",
-			  "Unfortunately, I have another commitment that \
-conflicts with this meeting. I am delegating my attendance to Bob. ");
-
-			icalset_add_component(out,reply);
-		      
-		    } else if (dtstart.hour%4 == 1) {
-			/* Counter propose to next available time */
-			icalcomponent *newc;
-			struct icalperiodtype next_time;
-
-			icalspanlist *spanl = 
-			    icalspanlist_new(cal,dtstart,
-					     icaltime_null_time());
-
-			next_time = icalspanlist_next_free_time(
-			   spanl,icalcomponent_get_dtstart(c));
-
-			newc = icalcomponent_new_clone(c);
-			
-			icalcomponent_set_dtstart(newc,next_time.start);
-			
-
-			/* Hack, the duration of the counterproposed
-                           meeting may be longer than the free time
-                           available */
-			icalcomponent_set_duration(newc,
-			     icalcomponent_get_duration(c));
-			
-			reply = icalmessage_new_counterpropose_reply(c, 
-								     newc,
-								     this_user,
-			   "Unfortunately, I have another commitment that \
-conflicts with this meeting. I am proposing a time that works better for me.");
-		      
-			icalset_add_component(out,reply);
-
-		    } else {
-			/* Decline the meeting */
-		      
-			reply = icalmessage_new_decline_reply(c,
-							      this_user,
-					  "I can't make it to this meeting");
-
-			icalset_add_component(out,reply);
-
-		    }
-
-		  
-		}
-		break; 
-	    }
-	    case ICAL_PUBLISH_FREEBUSY_CLASS: {
-		/* Store the busy time information in a file named after
-		   the sender */
-		break;
-	    }
-	    
-	    case ICAL_PUBLISH_UPDATE_CLASS: { 
-		/* Only accept publish updates from self. If self, fall
-		   throught to ICAL_REQUEST_UPDATE_CLASS */
-	    }
-
-	    case ICAL_REQUEST_UPDATE_CLASS: { 
-		/* always accept the changes */
-		break; 
-	    }
-	  
-	    case ICAL_REQUEST_RESCHEDULE_CLASS: { 
-		/* Use same rules as REQUEST_NEW */
-		icalcomponent *overlaps;
-		overlaps = icalclassify_find_overlaps(cal,c);
-
-		break; 
-	    }
-	    case ICAL_REQUEST_DELEGATE_CLASS: { 
-	      
-		break; 
-	    }
-	    case ICAL_REQUEST_NEW_ORGANIZER_CLASS: { 
-		break; 
-	    }
-	    case ICAL_REQUEST_FORWARD_CLASS: { 
-		break; 
-	    }
-	    case ICAL_REQUEST_STATUS_CLASS: { 
-		break; 
-	    }
-
-	    case ICAL_REQUEST_FREEBUSY_CLASS: { 
-		break; 
-	    }
-	    case ICAL_REPLY_ACCEPT_CLASS: { 
-		/* Change the PARTSTAT of the sender */
-		break; 
-	    }
-	    case ICAL_REPLY_DECLINE_CLASS: { 
-		/* Change the PARTSTAT of the sender */
-		break; 
-	    }
-	    case ICAL_REPLY_CRASHER_ACCEPT_CLASS: { 
-		/* Add the crasher to the ATTENDEE list with the
-		   appropriate PARTSTAT */
-		break; 
-	    }
-	    case ICAL_REPLY_CRASHER_DECLINE_CLASS: { 
-		/* Add the crasher to the ATTENDEE list with the
-		   appropriate PARTSTAT */
-		break; 
-	    }
-	    case ICAL_ADD_INSTANCE_CLASS: { 
-		break; 
-	    }
-	    case ICAL_CANCEL_EVENT_CLASS: { 
-		/* Remove the component */
-		break; 
-	    }
-	    case ICAL_CANCEL_INSTANCE_CLASS: { 
-		break; 
-	    }
-	    case ICAL_CANCEL_ALL_CLASS: { 
-		/* Remove the component */	      
-		break; 
-	    }
-	    case ICAL_REFRESH_CLASS: { 
-		/* Resend the latest copy of the request */
-		break; 
-	    }
-	    case ICAL_COUNTER_CLASS: { 
-		break; 
-	    }
-	    case ICAL_DECLINECOUNTER_CLASS: { 
-		break; 
-	    }
-	    case ICAL_MALFORMED_CLASS: { 
-		/* Send back an error */
-		break; 
-	    } 
-	    case ICAL_OBSOLETE_CLASS: { 
-		printf(" ** Got an obsolete component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    } 
-	    case ICAL_MISSEQUENCED_CLASS: { 
-		printf(" ** Got a missequenced component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    }
-	    case ICAL_UNKNOWN_CLASS: { 
-		printf(" ** Don't know what to do with this component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    }
-	}
-
-#if(0)
-	if (reply != 0){	
-	    
-	    /* Don't send the reply if the RSVP parameter indicates not to*/
-	    icalcomponent *reply_inner;
-	    icalproperty *attendee;
-	    icalparameter *rsvp;
-	    
-	    reply_inner = icalcomponent_get_first_real_component(reply);
-	    attendee = icalcomponent_get_first_property(reply_inner,
-							ICAL_ATTENDEE_PROPERTY);
-	    rsvp = icalproperty_get_first_parameter(attendee,
-						    ICAL_RSVP_PARAMETER);
-	    
-	    if(rsvp == 0 || icalparameter_get_rsvp(rsvp) == 1){
-		icalrestriction_check(reply);
-		send_message(reply,this_user);
-	    }
-	    
-	    icalcomponent_free(reply);
-	}
-#endif 
-
-	if(reply !=0){
-	    printf("%s\n",icalcomponent_as_ical_string(reply));
-	}
-	
-	next_c =   icalset_get_next_component(f);
-	
-	if(dont_remove == 0){
-	    /*icalset_remove_component(f,c);
-	      icalset_add_component(trash,c);*/
-	}
-    }
-
-#if (0)
-        
-    for(c = icalset_get_first_component(out);
-	c!=0;
-	c = icalset_get_next_component(out)){
-	
-	printf("%s",icalcomponent_as_ical_string(c));
-
-    }
-#endif
-
-    icalset_free(f);
-    icalset_free(trash);
-    icalset_free(cal);
-    icalset_free(out);
-
-    return 0;
-}
-
-
diff --git a/libical/src/test/recur.c b/libical/src/test/recur.c
deleted file mode 100644
index 95dd3b08a3..0000000000
--- a/libical/src/test/recur.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: recur.c
-  CREATOR: ebusboom 8jun00
-  
-  DESCRIPTION:
-
-  Test program for expanding recurrences. Run as:
-
-     ./recur ../../test-data/recur.txt
-
-  
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  ======================================================================*/
-
-#include "ical.h"
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include "icalmemory.h"
-#include "icaldirset.h"
-#include "icalfileset.h"
-
-int main(int argc, char *argv[])
-{
-    icalfileset *cin;
-    struct icaltimetype start, next;
-    icalcomponent *itr;
-    icalproperty *desc, *dtstart, *rrule;
-    struct icalrecurrencetype recur;
-    icalrecur_iterator* ritr;
-    time_t tt;
-    char* file; 
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
-    icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);
-
-
-    if (argc <= 1){
-	file = "../../test-data/recur.txt";
-    } else if (argc == 2){
-	file = argv[1];
-    } else {
-	fprintf(stderr,"usage: recur [input file]\n");
-	exit(1);
-    }
-
-    cin = icalfileset_new(file);
-
-    if(cin == 0){
-	fprintf(stderr,"recur: can't open file %s\n",file);
-	exit(1);
-    }
-
-
-    for (itr = icalfileset_get_first_component(cin);
-         itr != 0;
-         itr = icalfileset_get_next_component(cin)){
-
-	desc = icalcomponent_get_first_property(itr,ICAL_DESCRIPTION_PROPERTY);
-	dtstart = icalcomponent_get_first_property(itr,ICAL_DTSTART_PROPERTY);
-	rrule = icalcomponent_get_first_property(itr,ICAL_RRULE_PROPERTY);
-
-	if (desc == 0 || dtstart == 0 || rrule == 0){
-	    printf("\n******** Error in input component ********\n");
-	    printf("The following component is malformed:\n %s\n",
-		   icalcomponent_as_ical_string(itr));
-	    continue;
-	}
-
-	recur = icalproperty_get_rrule(rrule);
-	start = icalproperty_get_dtstart(dtstart);
-	
-	ritr = icalrecur_iterator_new(recur,start);
-	
-	tt = icaltime_as_timet(start);
-
-	printf("\n\n#### %s\n",icalproperty_get_description(desc));
-	printf("#### %s\n",icalvalue_as_ical_string(icalproperty_get_value(rrule)));
-	printf("#### %s\n",ctime(&tt ));
-
-	for(ritr = icalrecur_iterator_new(recur,start),
-		next = icalrecur_iterator_next(ritr); 
-	    !icaltime_is_null_time(next);
-	    next = icalrecur_iterator_next(ritr)){
-	    
-	    tt = icaltime_as_timet(next);
-	    
-	    printf("  %s",ctime(&tt ));		
-	    
-	}
-
-    }
-
-    return 0;
-}
diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c
deleted file mode 100644
index 00c686d027..0000000000
--- a/libical/src/test/regression.c
+++ /dev/null
@@ -1,3291 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: regression.c
-  CREATOR: eric 03 April 1999
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is regression.c
-
-    
-  ======================================================================*/
-
-#include "ical.h"
-#include "icalss.h"
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include <unistd.h> /* for unlink, fork */
-#include <sys/wait.h> /* For waitpid */
-#include <sys/types.h> /* For wait pid */
-#include <sys/time.h> /* for select */
-
-
-/* This example creates and minipulates the ical object that appears
- * in rfc 2445, page 137 */
-
-char str[] = "BEGIN:VCALENDAR\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\
-VERSION:2.0\
-BEGIN:VTIMEZONE\
-TZID:US-Eastern\
-BEGIN:STANDARD\
-DTSTART:19981025T020000\
-RDATE:19981025T020000\
-TZOFFSETFROM:-0400\
-TZOFFSETTO:-0500\
-TZNAME:EST\
-END:STANDARD\
-BEGIN:DAYLIGHT\
-DTSTART:19990404T020000\
-RDATE:19990404T020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-TZNAME:EDT\
-END:DAYLIGHT\
-END:VTIMEZONE\
-BEGIN:VEVENT\
-DTSTAMP:19980309T231000Z\
-UID:guid-1.host1.com\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\
-DESCRIPTION:Project XYZ Review Meeting\
-CATEGORIES:MEETING\
-CLASS:PUBLIC\
-CREATED:19980309T130000Z\
-SUMMARY:XYZ Project Review\
-DTSTART;TZID=US-Eastern:19980312T083000\
-DTEND;TZID=US-Eastern:19980312T093000\
-LOCATION:1CP Conference Room 4350\
-END:VEVENT\
-BEGIN:BOOGA\
-DTSTAMP:19980309T231000Z\
-X-LIC-FOO:Booga\
-DTSTOMP:19980309T231000Z\
-UID:guid-1.host1.com\
-END:BOOGA\
-END:VCALENDAR";
-
-
-icalcomponent* create_simple_component()
-{
-
-    icalcomponent* calendar;
-    struct icalperiodtype rtime;
-
-    rtime.start = icaltime_from_timet( time(0),0);
-    rtime.end = icaltime_from_timet( time(0),0);
-
-    rtime.end.hour++;
-
-
-
-    /* Create calendar and add properties */
-    calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-
-    
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_version("2.0")
-	);
-
-    printf("%s\n",icalcomponent_as_ical_string(calendar));
- 
-    return calendar;
-	   
-}
-
-/* Create a new component */
-icalcomponent* create_new_component()
-{
-
-    icalcomponent* calendar;
-    icalcomponent* timezone;
-    icalcomponent* tzc;
-    icalcomponent* event;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    struct icaldatetimeperiodtype rtime;
-    icalproperty* property;
-
-    rtime.period.start = icaltime_from_timet( time(0),0);
-    rtime.period.end = icaltime_from_timet( time(0),0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-
-
-    /* Create calendar and add properties */
-    calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-
-    
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_version("2.0")
-	);
-    
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN")
-	);
-    
-    /* Create a timezone object and add it to the calendar */
-
-    timezone = icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
-
-    icalcomponent_add_property(
-	timezone,
-	icalproperty_new_tzid("US_Eastern")
-	);
-
-    /* Add a sub-component of the timezone */
-    tzc = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_dtstart(atime)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_rdate(rtime)
-	);
-	    
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetfrom(-4.0)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetto(-5.0)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzname("EST")
-	);
-
-    icalcomponent_add_component(timezone,tzc);
-
-    icalcomponent_add_component(calendar,timezone);
-
-    /* Add a second subcomponent */
-    tzc = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_dtstart(atime)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_rdate(rtime)
-	);
-	    
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetfrom(-4.0)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetto(-5.0)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzname("EST")
-	);
-
-    icalcomponent_add_component(timezone,tzc);
-
-    /* Add an event */
-
-    event = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_dtstamp(atime)
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_uid("guid-1.host1.com")
-	);
-
-    /* add a property that has parameters */
-    property = icalproperty_new_organizer("mrbig@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_CHAIR)
-	);
-
-    icalcomponent_add_property(event,property);
-
-    /* add another property that has parameters */
-    property = icalproperty_new_attendee("employee-A@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_rsvp(1)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_cutype(ICAL_CUTYPE_GROUP)
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    /* more properties */
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_description("Project XYZ Review Meeting")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_categories("MEETING")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_class("PUBLIC")
-	);
-    
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_created(atime)
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_summary("XYZ Project Review")
-	);
-
-
-    property = icalproperty_new_dtstart(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("US-Eastern")
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    property = icalproperty_new_dtend(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("US-Eastern")
-	);
-
-    icalcomponent_add_property(event,property);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_location("1CP Conference Room 4350")
-	);
-
-    icalcomponent_add_component(calendar,event);
-
-    printf("%s\n",icalcomponent_as_ical_string(calendar));
-
-    icalcomponent_free(calendar);
-
-    return 0;
-}
-
-
-/* Create a new component, using the va_args list */
-
-icalcomponent* create_new_component_with_va_args()
-{
-
-    icalcomponent* calendar;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    struct icaldatetimeperiodtype rtime;
-    
-    rtime.period.start = icaltime_from_timet( time(0),0);
-    rtime.period.end = icaltime_from_timet( time(0),0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-    calendar = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	    icalcomponent_vanew(
-		ICAL_VTIMEZONE_COMPONENT,
-		icalproperty_new_tzid("US_Eastern"),
-		icalcomponent_vanew(
-		    ICAL_XDAYLIGHT_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-4.0),
-		    icalproperty_new_tzoffsetto(-5.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		icalcomponent_vanew(
-		    ICAL_XSTANDARD_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-5.0),
-		    icalproperty_new_tzoffsetto(-4.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		0
-		),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstamp(atime),
-		icalproperty_new_uid("guid-1.host1.com"),
-		icalproperty_vanew_organizer(
-		    "mrbig@host.com",
-		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
-		    ),
-		icalproperty_vanew_attendee(
-		    "employee-A@host.com",
-		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
-		    icalparameter_new_rsvp(1),
-		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
-		    ),
-		icalproperty_new_description("Project XYZ Review Meeting"),
-		icalproperty_new_categories("MEETING"),
-		icalproperty_new_class("PUBLIC"),
-		icalproperty_new_created(atime),
-		icalproperty_new_summary("XYZ Project Review"),
-		icalproperty_vanew_dtstart(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),
-		icalproperty_vanew_dtend(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),
-		icalproperty_new_location("1CP Conference Room 4350"),
-		0
-		),
-	    0
-	    );
-	
-    printf("%s\n",icalcomponent_as_ical_string(calendar));
-    
-
-    icalcomponent_free(calendar);
-
-    return 0;
-}
-
-
-/* Return a list of all attendees who are required. */
-   
-char** get_required_attendees(icalproperty* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-
-    char **attendees;
-    int max = 10;
-    int c = 0;
-
-    attendees = malloc(max * (sizeof (char *)));
-
-    assert(event != 0);
-    assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT);
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	parameter = icalproperty_get_first_parameter(p,ICAL_ROLE_PARAMETER);
-
-	if ( icalparameter_get_role(parameter) == ICAL_ROLE_REQPARTICIPANT) 
-	{
-	    attendees[c++] = strdup(icalproperty_get_attendee(p));
-
-            if (c >= max) {
-                max *= 2; 
-                attendees = realloc(attendees, max * (sizeof (char *)));
-            }
-
-	}
-    }
-
-    return attendees;
-}
-
-/* If an attendee has a PARTSTAT of NEEDSACTION or has no PARTSTAT
-   parameter, change it to TENTATIVE. */
-   
-void update_attendees(icalproperty* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-
-
-    assert(event != 0);
-    assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT);
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	parameter = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
-
-	if (parameter == 0) {
-
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-
-	} else if (icalparameter_get_partstat(parameter) == ICAL_PARTSTAT_NEEDSACTION) {
-
-	    icalproperty_remove_parameter(p,ICAL_PARTSTAT_PARAMETER);
-	    
-	    icalparameter_free(parameter);
-
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-	}
-
-    }
-}
-
-
-void test_values()
-{
-    icalvalue *v; 
-    icalvalue *copy; 
-
-    v = icalvalue_new_caladdress("cap://value/1");
-    printf("caladdress 1: %s\n",icalvalue_get_caladdress(v));
-    icalvalue_set_caladdress(v,"cap://value/2");
-    printf("caladdress 2: %s\n",icalvalue_get_caladdress(v));
-    printf("String: %s\n",icalvalue_as_ical_string(v));
-    
-    copy = icalvalue_new_clone(v);
-    printf("Clone: %s\n",icalvalue_as_ical_string(v));
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new_boolean(1);
-    printf("caladdress 1: %d\n",icalvalue_get_boolean(v));
-    icalvalue_set_boolean(v,2);
-    printf("caladdress 2: %d\n",icalvalue_get_boolean(v));
-    printf("String: %s\n",icalvalue_as_ical_string(v));
-
-    copy = icalvalue_new_clone(v);
-    printf("Clone: %s\n",icalvalue_as_ical_string(v));
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new_date(icaltime_from_timet( time(0),0));
-    printf("date 1: %s\n",icalvalue_as_ical_string(v));
-    icalvalue_set_date(v,icaltime_from_timet( time(0)+3600,0));
-    printf("date 2: %s\n",icalvalue_as_ical_string(v));
-
-    copy = icalvalue_new_clone(v);
-    printf("Clone: %s\n",icalvalue_as_ical_string(v));
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new(-1);
-
-    printf("Invalid type: %p\n",v);
-
-    if (v!=0) icalvalue_free(v);
-
-
-    /*    v = icalvalue_new_caladdress(0);
-
-    printf("Bad string: %p\n",v);
-
-    if (v!=0) icalvalue_free(v); */
-
-}
-
-void test_properties()
-{
-    icalproperty *prop;
-    icalparameter *param;
-
-    icalproperty *clone;
-
-    prop = icalproperty_vanew_comment(
-	"Another Comment",
-	icalparameter_new_cn("A Common Name 1"),
-	icalparameter_new_cn("A Common Name 2"),
-	icalparameter_new_cn("A Common Name 3"),
-       	icalparameter_new_cn("A Common Name 4"),
-	0); 
-
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-	param != 0; 
-	param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) {
-						
-	printf("Prop parameter: %s\n",icalparameter_get_cn(param));
-    }    
-
-    printf("Prop value: %s\n",icalproperty_get_comment(prop));
-
-
-    printf("As iCAL string:\n %s\n",icalproperty_as_ical_string(prop));
-    
-    clone = icalproperty_new_clone(prop);
-
-    printf("Clone:\n %s\n",icalproperty_as_ical_string(prop));
-    
-    icalproperty_free(clone);
-    icalproperty_free(prop);
-
-    prop = icalproperty_new(-1);
-
-    printf("Invalid type: %p\n",prop);
-
-    if (prop!=0) icalproperty_free(prop);
-
-    /*
-    prop = icalproperty_new_method(0);
-
-    printf("Bad string: %p\n",prop);
-   
-
-    if (prop!=0) icalproperty_free(prop);
-    */
-}
-
-void test_parameters()
-{
-    icalparameter *p;
-
-    p = icalparameter_new_cn("A Common Name");
-
-    printf("Common Name: %s\n",icalparameter_get_cn(p));
-
-    printf("As String: %s\n",icalparameter_as_ical_string(p));
-
-    icalparameter_free(p);
-}
-
-
-void test_components()
-{
-
-    icalcomponent* c;
-    icalcomponent* child;
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	icalproperty_vanew_comment(
-	    "A Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    0),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_description("This is an event"),
-	    icalproperty_vanew_comment(
-		"Another Comment",
-		icalparameter_new_cn("A Common Name 1"),
-		icalparameter_new_cn("A Common Name 2"),
-		icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-		0),
-	    icalproperty_vanew_xlicerror(
-		"This is only a test",
-		icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-		0),
-	    
-	    0
-	    ),
-	0
-	);
-
-    printf("Original Component:\n%s\n\n",icalcomponent_as_ical_string(c));
-
-    child = icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT);
-
-    printf("Child Component:\n%s\n\n",icalcomponent_as_ical_string(child));
-    
-    icalcomponent_free(c);
-
-}
-
-void test_memory()
-{
-    size_t bufsize = 256;
-    int i;
-    char *p;
-
-    char S1[] = "1) When in the Course of human events, ";
-    char S2[] = "2) it becomes necessary for one people to dissolve the political bands which have connected them with another, ";
-    char S3[] = "3) and to assume among the powers of the earth, ";
-    char S4[] = "4) the separate and equal station to which the Laws of Nature and of Nature's God entitle them, ";
-    char S5[] = "5) a decent respect to the opinions of mankind requires that they ";
-    char S6[] = "6) should declare the causes which impel them to the separation. ";
-    char S7[] = "7) We hold these truths to be self-evident, ";
-    char S8[] = "8) that all men are created equal, ";
-
-/*    char S9[] = "9) that they are endowed by their Creator with certain unalienable Rights, ";
-    char S10[] = "10) that among these are Life, Liberty, and the pursuit of Happiness. ";
-    char S11[] = "11) That to secure these rights, Governments are instituted among Men, ";
-    char S12[] = "12) deriving their just powers from the consent of the governed. "; 
-*/
-
-
-    char *f, *b1, *b2, *b3, *b4, *b5, *b6, *b7, *b8;
-
-#define BUFSIZE 1024
-
-    f = icalmemory_new_buffer(bufsize);
-    p = f;
-    b1 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b1, S1);
-    icalmemory_append_string(&f, &p, &bufsize, b1);
-
-    b2 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b2, S2);
-    icalmemory_append_string(&f, &p, &bufsize, b2);
-
-    b3 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b3, S3);
-    icalmemory_append_string(&f, &p, &bufsize, b3);
-
-    b4 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b4, S4);
-    icalmemory_append_string(&f, &p, &bufsize, b4);
-
-    b5 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b5, S5);
-    icalmemory_append_string(&f, &p, &bufsize, b5);
-
-    b6 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b6, S6);
-    icalmemory_append_string(&f, &p, &bufsize, b6);
-
-    b7 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b7, S7);
-    icalmemory_append_string(&f, &p, &bufsize, b7);
-
-    b8 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b8, S8);
-    icalmemory_append_string(&f, &p, &bufsize, b8);
-
-
-    printf("1: %p %s \n",b1,b1);
-    printf("2: %p %s\n",b2,b2);
-    printf("3: %p %s\n",b3,b3);
-    printf("4: %p %s\n",b4,b4);
-    printf("5: %p %s\n",b5,b5);
-    printf("6: %p %s\n",b6,b6);
-    printf("7: %p %s\n",b7,b7);
-    printf("8: %p %s\n",b8,b8);
-
-    
-    printf("Final: %s\n", f);
-
-    printf("Final buffer size: %d\n",bufsize);
-
-    free(f);
-    
-    bufsize = 4;
-
-    f = icalmemory_new_buffer(bufsize);
-
-    memset(f,0,bufsize);
-    p = f;
-
-    icalmemory_append_char(&f, &p, &bufsize, 'a');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'b');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'c');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'd');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'e');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'f');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'g');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'h');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'i');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'j');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'a');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'b');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'c');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'd');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'e');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'f');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'g');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'h');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'i');
-    printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'j');
-    printf("Char-by-Char buffer: %s\n", f);
-   
-    for(i=0; i<100; i++){
-	f = icalmemory_tmp_buffer(bufsize);
-	
-	assert(f!=0);
-
-	memset(f,0,bufsize);
-	sprintf(f,"%d",i);
-    }
-}
-
-
-int test_store()
-{
-
-    icalcomponent *c, *gauge;
-    icalerrorenum error;
-    icalcomponent *next, *itr;
-    icalfileset* cluster;
-    struct icalperiodtype rtime;
-    icaldirset *s = icaldirset_new("store");
-    int i;
-
-    rtime.start = icaltime_from_timet( time(0),0);
-
-    cluster = icalfileset_new("clusterin.vcd");
-
-    if (cluster == 0){
-	printf("Failed to create cluster: %s\n",icalerror_strerror(icalerrno));
-	return 0;
-    }
-
-#define NUMCOMP 4
-
-    /* Duplicate every component in the cluster NUMCOMP times */
-
-    icalerror_clear_errno();
-
-    for (i = 1; i<NUMCOMP+1; i++){
-
-	/*rtime.start.month = i%12;*/
-	rtime.start.month = i;
-	rtime.end = rtime.start;
-	rtime.end.hour++;
-	
-	for (itr = icalfileset_get_first_component(cluster);
-	     itr != 0;
-	     itr = icalfileset_get_next_component(cluster)){
-	    icalcomponent *clone;
-	    icalproperty *p;
-
-	    
-	    if(icalcomponent_isa(itr) != ICAL_VEVENT_COMPONENT){
-		continue;
-	    }
-
-	    assert(itr != 0);
-	    
-	    /* Change the dtstart and dtend times in the component
-               pointed to by Itr*/
-
-	    clone = icalcomponent_new_clone(itr);
-	    assert(icalerrno == ICAL_NO_ERROR);
-	    assert(clone !=0);
-
-	    /* DTSTART*/
-	    p = icalcomponent_get_first_property(clone,ICAL_DTSTART_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.start);
-		icalcomponent_add_property(clone,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.start);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    /* DTEND*/
-	    p = icalcomponent_get_first_property(clone,ICAL_DTEND_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.end);
-		icalcomponent_add_property(clone,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.end);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	    
-	    printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(clone));
-
-	    error = icaldirset_add_component(s,clone);
-	    
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	}
-
-    }
-    
-    gauge = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Submit Income Taxes",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Bastille Day Party",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    0);
-
-#if 0
-
-
-    icaldirset_select(s,gauge);
-
-    for(c = icaldirset_first(s); c != 0; c = icaldirset_next(s)){
-	
-	printf("Got one! (%d)\n", count++);
-	
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	    if (icaldirset_store(s2,c) == 0){
-		printf("Failed to write!\n");
-	    }
-	    icalcomponent_free(c);
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-
-    icaldirset_free(s2);
-#endif
-
-
-    for(c = icaldirset_get_first_component(s); 
-	c != 0; 
-	c =  next){
-	
-	next = icaldirset_get_next_component(s);
-
-	if (c != 0){
-	    /*icaldirset_remove_component(s,c);*/
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	} else {
-	    printf("Failed to get component\n");
-	}
-
-
-    }
-
-    icaldirset_free(s);
-    return 0;
-}
-
-int test_compare()
-{
-    icalvalue *v1, *v2;
-
-    v1 = icalvalue_new_caladdress("cap://value/1");
-    v2 = icalvalue_new_clone(v1);
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    v1 = icalvalue_new_caladdress("A");
-    v2 = icalvalue_new_caladdress("B");
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    v1 = icalvalue_new_caladdress("B");
-    v2 = icalvalue_new_caladdress("A");
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    v1 = icalvalue_new_integer(5);
-    v2 = icalvalue_new_integer(5);
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    v1 = icalvalue_new_integer(5);
-    v2 = icalvalue_new_integer(10);
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    v1 = icalvalue_new_integer(10);
-    v2 = icalvalue_new_integer(5);
-
-    printf("%d\n",icalvalue_compare(v1,v2));
-
-    return 0;
-}
-
-void test_restriction()
-{
-    icalcomponent *comp;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    int valid; 
-
-    struct icaldatetimeperiodtype rtime;
-
-    rtime.period.start = icaltime_from_timet( time(0),0);
-    rtime.period.end = icaltime_from_timet( time(0),0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-    comp = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	    icalproperty_new_method(ICAL_METHOD_REQUEST),
-	    icalcomponent_vanew(
-		ICAL_VTIMEZONE_COMPONENT,
-		icalproperty_new_tzid("US_Eastern"),
-		icalcomponent_vanew(
-		    ICAL_XDAYLIGHT_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-4.0),
-		    icalproperty_new_tzoffsetto(-5.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		icalcomponent_vanew(
-		    ICAL_XSTANDARD_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-5.0),
-		    icalproperty_new_tzoffsetto(-4.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		0
-		),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstamp(atime),
-		icalproperty_new_uid("guid-1.host1.com"),
-		icalproperty_vanew_organizer(
-		    "mrbig@host.com",
-		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
-		    ),
-		icalproperty_vanew_attendee(
-		    "employee-A@host.com",
-		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
-		    icalparameter_new_rsvp(1),
-		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
-		    ),
-		icalproperty_new_description("Project XYZ Review Meeting"),
-		icalproperty_new_categories("MEETING"),
-		icalproperty_new_class("PUBLIC"),
-		icalproperty_new_created(atime),
-		icalproperty_new_summary("XYZ Project Review"),
-/*		icalproperty_vanew_dtstart(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),*/
-		icalproperty_vanew_dtend(
-		    atime,
-		    icalparameter_new_tzid("US-Eastern"),
-		    0
-		    ),
-		icalproperty_new_location("1CP Conference Room 4350"),
-		0
-		),
-	    0
-	    );
-
-    valid = icalrestriction_check(comp);
-
-    printf("#### %d ####\n%s\n",valid, icalcomponent_as_ical_string(comp));
-
-}
-
-#if 0
-void test_calendar()
-{
-    icalcomponent *comp;
-    icalfileset *c;
-    icaldirset *s;
-    icalcalendar* calendar = icalcalendar_new("calendar");
-    icalerrorenum error;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-
-    comp = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_description("This is an event"),
-	icalproperty_new_dtstart(atime),
-	icalproperty_vanew_comment(
-	    "Another Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    icalparameter_new_cn("A Common Name 2"),
-	    icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-	    0),
-	icalproperty_vanew_xlicerror(
-	    "This is only a test",
-	    icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-	    0),
-	
-	0);
-	
-	
-    s = icalcalendar_get_booked(calendar);
-
-    error = icaldirset_add_component(s,comp);
-    
-    assert(error == ICAL_NO_ERROR);
-
-    c = icalcalendar_get_properties(calendar);
-
-    error = icalfileset_add_component(c,icalcomponent_new_clone(comp));
-
-    assert(error == ICAL_NO_ERROR);
-
-    icalcalendar_free(calendar);
-
-}
-#endif
-
-void test_increment(void);
-
-void print_occur(struct icalrecurrencetype recur, struct icaltimetype start)
-{
-    struct icaltimetype next;
-    icalrecur_iterator* ritr;
-	
-    time_t tt = icaltime_as_timet(start);
-
-    printf("#### %s\n",icalrecurrencetype_as_string(&recur));
-    printf("#### %s\n",ctime(&tt ));
-    
-    for(ritr = icalrecur_iterator_new(recur,start),
-	    next = icalrecur_iterator_next(ritr); 
-	!icaltime_is_null_time(next);
-	next = icalrecur_iterator_next(ritr)){
-	
-	tt = icaltime_as_timet(next);
-	
-	printf("  %s",ctime(&tt ));		
-	
-    }
-
-    icalrecur_iterator_free(ritr);
-}
-
-void test_recur()
-{
-   struct icalrecurrencetype rt;
-   struct icaltimetype start;
-   time_t array[25];
-   int i;
-
-   rt = icalrecurrencetype_from_string("FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA");
-   start = icaltime_from_string("19970905T090000Z");
-
-   print_occur(rt,start);   
-
-   printf("\n  Using icalrecur_expand_recurrence\n");
-
-   icalrecur_expand_recurrence("FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA",
-			       icaltime_as_timet(start),
-			       25,
-			       array);
-
-   for(i =0; array[i] != 0 && i < 25 ; i++){
-       
-       printf("  %s",ctime(&(array[i])));
-   }
-
-   
-/*    test_increment();*/
-
-}
-
-
-enum byrule {
-    NO_CONTRACTION = -1,
-    BY_SECOND = 0,
-    BY_MINUTE = 1,
-    BY_HOUR = 2,
-    BY_DAY = 3,
-    BY_MONTH_DAY = 4,
-    BY_YEAR_DAY = 5,
-    BY_WEEK_NO = 6,
-    BY_MONTH = 7,
-    BY_SET_POS
-};
-
-struct icalrecur_iterator_impl {
-	
-	struct icaltimetype dtstart; 
-	struct icaltimetype last; /* last time return from _iterator_next*/
-	int occurrence_no; /* number of step made on this iterator */
-	struct icalrecurrencetype rule;
-
-	short days[366];
-	short days_index;
-
-	enum byrule byrule;
-	short by_indices[9];
-
-
-	short *by_ptrs[9]; /* Pointers into the by_* array elements of the rule */
-};
-
-void icalrecurrencetype_test()
-{
-    icalvalue *v = icalvalue_new_from_string(
-	ICAL_RECUR_VALUE,
-	"FREQ=YEARLY;UNTIL=20060101T000000;INTERVAL=2;BYDAY=SU,WE;BYSECOND=15,30; BYMONTH=1,6,11");
-
-    struct icalrecurrencetype r = icalvalue_get_recur(v);
-    struct icaltimetype t = icaltime_from_timet( time(0), 0);
-    struct icaltimetype next;
-    time_t tt;
-
-    struct icalrecur_iterator_impl* itr 
-	= (struct icalrecur_iterator_impl*) icalrecur_iterator_new(r,t);
-
-    do {
-
-	next = icalrecur_iterator_next(itr);
-	tt = icaltime_as_timet(next);
-
-	printf("%s",ctime(&tt ));		
-
-    } while( ! icaltime_is_null_time(next));
- 
-}
-
-/* From Federico Mena Quintero <federico@helixcode.com>    */
-void test_recur_parameter_bug(){
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ical.h>
- 
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\r\n"
-"RRULE\r\n"
-" ;X-EVOLUTION-ENDDATE=20030209T081500\r\n"
-" :FREQ=DAILY;COUNT=10;INTERVAL=6\r\n"
-"END:VEVENT\r\n";
-  
-    icalcomponent *icalcomp;
-    icalproperty *prop;
-    struct icalrecurrencetype recur;
-    int n_errors;
-    
-    icalcomp = icalparser_parse_string ((char *) test_icalcomp_str);
-    if (!icalcomp) {
-	fprintf (stderr, "main(): could not parse the component\n");
-	exit (EXIT_FAILURE);
-    }
-    
-    printf("%s\n\n",icalcomponent_as_ical_string(icalcomp));
-
-    n_errors = icalcomponent_count_errors (icalcomp);
-    if (n_errors) {
-	icalproperty *p;
-	
-	for (p = icalcomponent_get_first_property (icalcomp,
-						   ICAL_XLICERROR_PROPERTY);
-	     p;
-	     p = icalcomponent_get_next_property (icalcomp,
-						  ICAL_XLICERROR_PROPERTY)) {
-	    char *str;
-	    
-	    str = icalproperty_as_ical_string (p);
-	    fprintf (stderr, "error: %s\n", str);
-	}
-    }
-    
-    prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY);
-    if (!prop) {
-	fprintf (stderr, "main(): could not get the RRULE property");
-	exit (EXIT_FAILURE);
-    }
-    
-    recur = icalproperty_get_rrule (prop);
-    
-    printf("%s\n",icalrecurrencetype_as_string(&recur));
-
-}
-
-
-void test_duration()
-{
-
-
-    struct icaldurationtype d;
-
-    d = icaldurationtype_from_string("PT8H30M");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 30600);
-    
-    d = icaldurationtype_from_string("-PT8H30M");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == -30600);
-
-    d = icaldurationtype_from_string("PT10H10M10S");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 36610);
-
-    d = icaldurationtype_from_string("P7W");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 4233600);
-
-    d = icaldurationtype_from_string("P2DT8H30M");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 203400);
-
-    icalerror_errors_are_fatal = 0;
-
-    d = icaldurationtype_from_string("P-2DT8H30M");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 0);
-
-    d = icaldurationtype_from_string("P7W8H");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 0);
-
-    d = icaldurationtype_from_string("T10H");
-    printf("%s\n",icaldurationtype_as_ical_string(d));
-    assert(icaldurationtype_as_int(d) == 0);
-
-
-    icalerror_errors_are_fatal = 1;
-
-}
-
-void test_period()
-{
-
-    struct icalperiodtype p;
-
-    p = icalperiodtype_from_string("19971015T050000Z/PT8H30M");
-    printf("%s\n",icalperiodtype_as_ical_string(p));
-
-    p = icalperiodtype_from_string("19971015T050000Z/19971015T060000Z");
-    printf("%s\n",icalperiodtype_as_ical_string(p));
-
-}
-
-void test_strings(){
-
-    icalvalue *v;
-
-    v = icalvalue_new_text("foo;bar;bats");
-    
-    printf("%s\n",icalvalue_as_ical_string(v));
-
-    icalvalue_free(v);
-
-    v = icalvalue_new_text("foo\\;b\nar\\;ba\tts");
-    
-    printf("%s\n",icalvalue_as_ical_string(v));
-    
-    icalvalue_free(v);
-
-
-}
-
-void test_requeststat()
-{
-  icalrequeststatus s;
-  struct icalreqstattype st, st2;
-  char temp[1024];
-
-  s = icalenum_num_to_reqstat(2,1);
-
-  assert(s == ICAL_2_1_FALLBACK_STATUS);
-
-  assert(icalenum_reqstat_major(s) == 2);
-  assert(icalenum_reqstat_minor(s) == 1);
-
-  printf("2.1: %s\n",icalenum_reqstat_desc(s));
-
-  st.code = s;
-  st.debug = "booga";
-  st.desc = 0;
-
-  printf("%s\n",icalreqstattype_as_string(st));
-
-  st.desc = " A non-standard description";
-
-  printf("%s\n",icalreqstattype_as_string(st));
-
-
-  st.desc = 0;
-
-  sprintf(temp,"%s\n",icalreqstattype_as_string(st));
-  
-
-  st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;booga");
-
-  printf("%d --  %d --  %s -- %s\n",icalenum_reqstat_major(st2.code),
-         icalenum_reqstat_minor(st2.code),
-         icalenum_reqstat_desc(st2.code),
-         st2.debug);
-
-  st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;booga");
-  printf("%s\n",icalreqstattype_as_string(st2));
-
-  st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;");
-  printf("%s\n",icalreqstattype_as_string(st2));
-
-  st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.");
-  printf("%s\n",icalreqstattype_as_string(st2));
-
-  st2 = icalreqstattype_from_string("2.1;");
-  printf("%s\n",icalreqstattype_as_string(st2));
-
-  st2 = icalreqstattype_from_string("2.1");
-  printf("%s\n",icalreqstattype_as_string(st2));
-
-#ifndef ICAL_ERRORS_ARE_FATAL
-  st2 = icalreqstattype_from_string("16.4");
-  assert(st2.code == ICAL_UNKNOWN_STATUS);
-
-  st2 = icalreqstattype_from_string("1.");
-  assert(st2.code == ICAL_UNKNOWN_STATUS);
-#endif
-}
-
-char ictt_str[1024];
-char* ictt_as_string(struct icaltimetype t)
-{
-
-    sprintf(ictt_str,"%02d-%02d-%02d %02d:%02d:%02d%s",t.year,t.month,t.day,
-	    t.hour,t.minute,t.second,t.is_utc?" Z":"");
-
-    return ictt_str;
-}
-
-
-char* ical_timet_string(time_t t)
-{
-    struct tm stm = *(gmtime(&t));    
-
-    sprintf(ictt_str,"%02d-%02d-%02d %02d:%02d:%02d Z",stm.tm_year+1900,
-	    stm.tm_mon+1,stm.tm_mday,stm.tm_hour,stm.tm_min,stm.tm_sec);
-
-    return ictt_str;
-    
-}
-
-void do_test_time(char* zone)
-{
-    struct icaltimetype ictt, icttutc, icttutczone, icttdayl, 
-	icttla, icttny,icttphoenix, icttlocal, icttnorm;
-    time_t tt,tt2, tt_p200;
-    int offset_la, offset_tz;
-    icalvalue *v;
-    short day_of_week,start_day_of_week, day_of_year;
-
-    icalerror_errors_are_fatal = 0;
-
-    ictt = icaltime_from_string("20001103T183030Z");
-
-    tt = icaltime_as_timet(ictt);
-
-    assert(tt==973276230); /* Fri Nov  3 10:30:30 PST 2000 in PST 
-                               Fri Nov  3 18:30:30 PST 2000 in UTC */
-    
-    offset_la = icaltime_utc_offset(ictt,"America/Los_Angeles");
-    offset_tz = icaltime_utc_offset(ictt, zone);
-
-    printf(" Normalize \n");
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    icttnorm = ictt;
-    icttnorm.second -= 60 * 60 * 24 * 5;
-    icttnorm = icaltime_normalize(ictt);
-    printf("-5d in sec  : %s\n", ictt_as_string(icttnorm));
-    icttnorm.day += 60;
-    icttnorm = icaltime_normalize(ictt);
-    printf("+60 d       : %s\n", ictt_as_string(icttnorm));
-
-
-    printf("\n As time_t \n");
-
-    tt2 = icaltime_as_timet(ictt);
-    printf("20001103T183030Z (timet): %s\n",ical_timet_string(tt2));
-    printf("20001103T183030Z        : %s\n",ictt_as_string(ictt));
-    assert(tt2 == tt);
-
-    icttlocal = icaltime_from_string("20001103T183030");
-    tt2 = icaltime_as_timet(icttlocal);
-    printf("20001103T183030  (timet): %s\n",ical_timet_string(tt2));
-    printf("20001103T183030         : %s\n",ictt_as_string(icttlocal));
-    assert(tt-tt2 == offset_tz);
-
-    printf("\n From time_t \n");
-
-    printf("Orig        : %s\n",ical_timet_string(tt));
-    printf("As utc      : %s\n", ictt_as_string(ictt));
-
-    icttlocal = icaltime_as_zone(ictt,zone);
-    printf("As local    : %s\n", ictt_as_string(icttlocal));
-    
-
-    printf("\n Convert to and from lib c \n");
-
-    printf("System time is: %s\n",ical_timet_string(tt));
-
-    v = icalvalue_new_datetime(ictt);
-
-    printf("System time from libical: %s\n",icalvalue_as_ical_string(v));
-
-    tt2 = icaltime_as_timet(ictt);
-    printf("Converted back to libc: %s\n",ical_timet_string(tt2));
-    
-    printf("\n Incrementing time  \n");
-
-    icttnorm = ictt;
-
-    icttnorm.year++;
-    tt2 = icaltime_as_timet(icttnorm);
-    printf("Add a year: %s\n",ical_timet_string(tt2));
-
-    icttnorm.month+=13;
-    tt2 = icaltime_as_timet(icttnorm);
-    printf("Add 13 months: %s\n",ical_timet_string(tt2));
-
-    icttnorm.second+=90;
-    tt2 = icaltime_as_timet(icttnorm);
-    printf("Add 90 seconds: %s\n",ical_timet_string(tt2));
-
-    printf("\n Day Of week \n");
-
-    day_of_week = icaltime_day_of_week(ictt);
-    start_day_of_week = icaltime_start_doy_of_week(ictt);
-    day_of_year = icaltime_day_of_year(ictt);
-
-
-    printf("Today is day of week %d, day of year %d\n",day_of_week,day_of_year);
-    printf("Week started n doy of %d\n",start_day_of_week);
-    assert(day_of_week == 6);
-    assert(day_of_year == 308);
-    assert(start_day_of_week == 303 );
-
-    printf("\n TimeZone Conversions \n");
-
-    icttla = icaltime_as_zone(ictt,"America/Los_Angeles");
-    assert(icttla.hour == 10);
-
-    icttutc = icaltime_as_utc(icttla,"America/Los_Angeles");
-    assert(icaltime_compare(icttla,
-			 icaltime_from_string("20001103T103030"))==0);
-
-    icttutczone = icaltime_as_zone(ictt,"Etc/GMT0");
-    icttutczone.is_utc = 1;
-    assert(icaltime_compare(icttutc, icttutczone) == 0); 
-    assert(icaltime_compare(icttutc, ictt) == 0); 
-
-    icttny  = icaltime_as_zone(ictt,"America/New_York");
-
-    icttphoenix = icaltime_as_zone(ictt,"America/Phoenix");
-
-    printf("Orig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("UTC         : %s\n", ictt_as_string(icttutc));
-    printf("Los Angeles : %s\n", ictt_as_string(icttla));
-    printf("Phoenix     : %s\n", ictt_as_string(icttphoenix));
-    printf("New York    : %s\n", ictt_as_string(icttny));
-
-
-    /* Daylight savings test for New York */
-    printf("\n Daylight Savings \n");
-
-    printf("Orig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("NY          : %s\n", ictt_as_string(icttny));
-
-    assert(strcmp(ictt_as_string(icttny),"2000-11-03 13:30:30")==0);
-
-    tt_p200 = tt +  200 * 24 * 60 * 60 ; /* Add 200 days */
-
-    icttdayl = icaltime_from_timet(tt_p200,0);    
-    icttny = icaltime_as_zone(icttdayl,"America/New_York");
-    
-    printf("Orig +200d  : %s\n", ical_timet_string(tt_p200) );
-    printf("NY+200D     : %s\n", ictt_as_string(icttny));
-
-    assert(strcmp(ictt_as_string(icttny),"2001-05-22 14:30:30")==0);
-
-    /* Daylight savings test for Los Angeles */
-
-    icttla  = icaltime_as_zone(ictt,"America/Los_Angeles");
-
-    printf("\nOrig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("LA          : %s\n", ictt_as_string(icttla));
-
-    assert(strcmp(ictt_as_string(icttla),"2000-11-03 10:30:30")==0);
-    
-    icttla = icaltime_as_zone(icttdayl,"America/Los_Angeles");
-    
-    printf("Orig +200d  : %s\n", ical_timet_string(tt_p200) );
-    printf("LA+200D     : %s\n", ictt_as_string(icttla));
-
-    assert(strcmp(ictt_as_string(icttla),"2001-05-22 11:30:30")==0);
-
-    icalerror_errors_are_fatal = 1;
-}
-
-void test_iterators()
-{
-    icalcomponent *c,*inner,*next;
-    icalcompiter i;
-
-    c= icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_vanew_version("1"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_vanew_version("2"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_vanew_version("3"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_vanew_version("4"),0),
-	icalcomponent_vanew(ICAL_VTODO_COMPONENT,
-			    icalproperty_vanew_version("5"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_vanew_version("6"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_vanew_version("7"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_vanew_version("8"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_vanew_version("9"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_vanew_version("10"),0),
-	0);
-   
-    printf("1: ");
-
-    /* List all of the VEVENTS */
-    for(i = icalcomponent_begin_component(c,ICAL_VEVENT_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-
-	icalproperty *p = 
-	    icalcomponent_get_first_property(this,
-					     ICAL_VERSION_PROPERTY);
-	const char* s = icalproperty_get_version(p);
-
-	printf("%s ",s);
-	    
-    }
-
-    printf("\n2: ");
-
-#if 0
-    for(inner = icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT); 
-	inner != 0; 
-	inner = next){
-	
-	next = icalcomponent_get_next_component(c,ICAL_VEVENT_COMPONENT);
-
-	icalcomponent_remove_component(c,inner);
-
-	icalcomponent_free(inner);
-    }
-#endif
-
-    /* Delete all of the VEVENTS */
-    /* reset iterator */
-    icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT);
-
-    while((inner=icalcomponent_get_current_component(c)) != 0 ){
-	if(icalcomponent_isa(inner) == ICAL_VEVENT_COMPONENT){
-	    icalcomponent_remove_component(c,inner);
-	} else {
-	    icalcomponent_get_next_component(c,ICAL_VEVENT_COMPONENT);
-	}
-    }
-	
-
-
-    /* List all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-	
-
-	icalproperty *p = 
-	    icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-
-	const char* s = icalproperty_get_version(p);	
-
-	printf("%s ",s);
-    }
-
-    printf("\n3: ");
-
-    
-    /* Remove all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = next){
-
-	icalcomponent *this;
-	icalproperty *p;
-	const char* s;
-	next = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT);
-
-	p=icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-	s = icalproperty_get_version(p);	
-	printf("rem:%s ",s);
-
-	icalcomponent_remove_component(c,inner);
-
-	this = icalcomponent_get_current_component(c);
-
-	if(this != 0){
-	    p=icalcomponent_get_first_property(this,ICAL_VERSION_PROPERTY);
-	    s = icalproperty_get_version(p);	
-	    printf("next:%s; ",s);
-	}
-
-	icalcomponent_free(inner);
-    }
-
-    printf("\n4: ");
-
-
-    /* List all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-	
-	icalproperty *p = 
-	    icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-
-	const char* s = icalproperty_get_version(p);	
-
-	printf("%s ",s);
-    }
-
-    printf("\n");
-}
-
-
-
-char* test_set_tz(const char* tzid)
-{
-    char *tzstr = 0;
-    char *tmp;
-
-   /* Put the new time zone into the environment */
-    if(getenv("TZ") != 0){
-	tzstr = (char*)strdup(getenv("TZ"));
-
-	if(tzstr == 0){
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-    }
-
-    tmp = (char*)malloc(1024);
-
-    if(tmp == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    snprintf(tmp,1024,"TZ=%s",tzid);
-
-    /* HACK. In some libc versions, putenv gives the string to the
-       system and in some it gives a copy, so the following might be a
-       memory leak. THe linux man page says that glibc2.1.2 take
-       ownership ( no leak) while BSD4.4 uses a copy ( A leak ) */
-    putenv(tmp); 
-
-    return tzstr; /* This will be zero if the TZ env var was not set */
-}
-
-void test_unset_tz(char* tzstr)
-{
-    /* restore the original environment */
-
-    if(tzstr!=0){
-	char temp[1024];
-	snprintf(temp,1024,"TZ=%s",tzstr);
-	putenv(temp);
-	free(tzstr);
-    } else {
-	putenv("TZ"); /* Delete from environment */
-    } 
-}
-
-
-void test_time()
-{
-    char  zones[6][40] = { "America/Los_Angeles","America/New_York","Europe/London","Asia/Shanghai", ""};
-    int i;
-    char* old_tz;
-    int orig_month;
-    time_t tt;
-    struct tm stm;
-
-    tt = time(0);
-
-    stm = *(localtime(&tt));
-
-    orig_month = stm.tm_mon;
-
-    do_test_time(0);
-
-    old_tz = test_set_tz(zones[0]);
-
-    for(i = 0; zones[i][0] != 0; i++){
-
-	if(zones[i][0] != 0){
-	    test_set_tz(zones[i]);
-	}
-	
-	printf(" ######### Timezone: %s ############\n",zones[i]);
-	
-	do_test_time(zones[i]);
-
-    } 
-
-    test_unset_tz(old_tz);
-
-}
-
-
-void test_icalset()
-{
-    icalcomponent *c; 
-
-    icalset* f = icalset_new_file("2446.ics");
-    icalset* d = icalset_new_dir("outdir");
-
-    assert(f!=0);
-    assert(d!=0);
-
-    for(c = icalset_get_first_component(f);
-	c != 0;
-	c = icalset_get_next_component(f)){
-
-	icalcomponent *clone; 
-
-	clone = icalcomponent_new_clone(c);
-
-	icalset_add_component(d,clone);
-
-	printf(" class %d\n",icalclassify(c,0,"user"));
-
-    }
-}
-
-void test_classify()
-{
-    icalcomponent *c,*match; 
-
-    icalset* f = icalset_new_file("../../test-data/classify.ics");
-
-    assert(f!=0);
-
-    c = icalset_get_first_component(f);
-    match = icalset_get_next_component(f);
-    
-    printf("Class %d\n",icalclassify(c,match,"A@example.com"));
-
-   
-}
-
-void print_span(int c, struct icaltime_span span ){
-
-    printf("#%02d start: %s\n",c,ical_timet_string(span.start));
-    printf("    end  : %s\n",ical_timet_string(span.end));
-
-}
-
-struct icaltimetype icaltime_as_local(struct icaltimetype tt) {
-    return  icaltime_as_zone(tt,0);
-}
-
-void test_span()
-{
-    time_t tm1 = 973378800; /*Sat Nov  4 23:00:00 UTC 2000,
-			      Sat Nov  4 15:00:00 PST 2000 */
-    time_t tm2 = 973382400; /*Sat Nov  5 00:00:00 UTC 2000 
-			      Sat Nov  4 16:00:00 PST 2000 */
-    struct icaldurationtype dur;
-    struct icaltime_span span;
-    icalcomponent *c; 
-
-    memset(&dur,0,sizeof(dur));
-    dur.minutes = 30;
-
-    span.start = tm1;
-    span.end = tm2;
-    print_span(0,span);
-
-    /* Specify save timezone as in commend above */
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_as_local(icaltime_from_timet(tm1,0)),
-		    icalparameter_new_tzid("US/Pacific"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_as_local(icaltime_from_timet(tm2,0)),
-		    icalparameter_new_tzid("US/Pacific"),0),
-	    0
-	    );
-
-    printf("%s\n",icalcomponent_as_ical_string(c));
-
-    span = icalcomponent_get_span(c);
-
-    print_span(1,span);
-
-    icalcomponent_free(c);
-
-    /* Use machine's local timezone. Same as above if run in US/Pacific */
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_vanew_dtstart(icaltime_from_timet(tm1,0),0),
-	    icalproperty_vanew_dtend(icaltime_from_timet(tm2,0),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-
-    print_span(2,span);
-
-    icalcomponent_free(c);
-
-    /* Specify different timezone */
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_as_local(icaltime_from_timet(tm1,0)),
-		    icalparameter_new_tzid("US/Eastern"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_as_local(icaltime_from_timet(tm2,0)),
-		    icalparameter_new_tzid("US/Eastern"),0),
-	    0
-	    );
-    span = icalcomponent_get_span(c);
-    print_span(3,span);
-
-    icalcomponent_free(c);
-
-
-    /* Specify different timezone for start and end*/
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_as_local(icaltime_from_timet(tm1,0)),
-		    icalparameter_new_tzid("US/Eastern"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_as_local(icaltime_from_timet(tm2,0)),
-		    icalparameter_new_tzid("US/Pacific"),0),
-	    0
-	    );
-    span = icalcomponent_get_span(c);
-    print_span(4,span);
-
-    icalcomponent_free(c);
-
-    /* Use Duration */
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_as_local(icaltime_from_timet(tm1,0)),
-		    icalparameter_new_tzid("US/Pacific"),0),
-	    icalproperty_new_duration(dur),
-
-	    0
-	    );
-    span = icalcomponent_get_span(c);
-    print_span(5,span);
-
-    icalcomponent_free(c);
-
-
-#ifndef ICAL_ERRORS_ARE_FATAL
-    /* Both UTC and Timezone -- an error */
-    icalerror_clear_errno();
-    c = 
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(icaltime_from_timet(tm1,0),
-		    icalparameter_new_tzid("US/Eastern"),0),
-		icalproperty_vanew_dtend(icaltime_from_timet(tm2,0),
-		    icalparameter_new_tzid("US/Eastern"),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    assert(icalerrno != ICAL_NO_ERROR);
-
-    icalcomponent_free(c);
-
-#endif /*ICAL_ERRORS_ARE_FATAL*/
-
-}
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp);
-
-void test_overlaps()
-{
-
-#if 0 /* Hack, not working right now */
-    icalcomponent *cset,*c;
-    icalset *set;
-    time_t tm1 = 973378800; /*Sat Nov  4 23:00:00 UTC 2000,
-			      Sat Nov  4 15:00:00 PST 2000 */
-    time_t tm2 = 973382400; /*Sat Nov  5 00:00:00 UTC 2000 
-			      Sat Nov  4 16:00:00 PST 2000 */
-
-    time_t hh = 1800; /* one half hour */
-
-    set = icalset_new_file("../../test-data/overlaps.ics");
-
-    printf("-- 1 -- \n");
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1-hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2-hh,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-
-    printf("%s\n",icalcomponent_as_ical_string(cset));
-
-    printf("-- 2 -- \n");
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1-hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-
-    printf("%s\n",icalcomponent_as_ical_string(cset));
-
-    printf("-- 3 -- \n");
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1+5*hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2+5*hh,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-
-    printf("%s\n",icalcomponent_as_ical_string(cset));
-
-#endif 
-
-}
-
-void test_fblist()
-{
-    icalspanlist *sl;
-    icalset* set = icalset_new_file("../../test-data/spanlist.ics");
-    struct icalperiodtype period;
-
-    sl = icalspanlist_new(set,
-		     icaltime_from_string("19970324T120000Z"),
-		     icaltime_from_string("19990424T020000Z"));
-		
-    printf("Restricted spanlist\n");
-    icalspanlist_dump(sl);
-
-    period= icalspanlist_next_free_time(sl,
-				      icaltime_from_string("19970801T120000Z"));
-
-
-    printf("Next Free time: %s\n",icaltime_as_ctime(period.start));
-    printf("                %s\n",icaltime_as_ctime(period.end));
-
-
-    icalspanlist_free(sl);
-
-    printf("Unrestricted spanlist\n");
-
-    sl = icalspanlist_new(set,
-		     icaltime_from_string("19970324T120000Z"),
-			  icaltime_null_time());
-		
-    printf("Restricted spanlist\n");
-
-    icalspanlist_dump(sl);
-
-    period= icalspanlist_next_free_time(sl,
-				      icaltime_from_string("19970801T120000Z"));
-
-
-    printf("Next Free time: %s\n",icaltime_as_ctime(period.start));
-    printf("                %s\n",icaltime_as_ctime(period.end));
-
-
-    icalspanlist_free(sl);
-
-
-}
-
-void test_convenience(){
-    
-    icalcomponent *c;
-    int duration;
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000")),
-	    icalproperty_new_dtend(icaltime_from_string("19970801T130000")),
-	    0
-	    ),
-	0);
-
-    printf("** 1 DTSTART and DTEND **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000Z")),
-	    icalproperty_new_duration(icaldurationtype_from_string("PT1H30M")),
-	    0
-	    ),
-	0);
-
-    printf("\n** 2 DTSTART and DURATION **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000")),
-	    icalproperty_new_dtend(icaltime_from_string("19970801T130000")),
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_duration(c,icaldurationtype_from_string("PT1H30M"));
-
-    printf("** 3 DTSTART and DTEND, Set DURATION **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000Z")),
-	    icalproperty_new_duration(icaldurationtype_from_string("PT1H30M")),
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_dtend(c,icaltime_from_string("19970801T133000Z"));
-
-    printf("\n** 4 DTSTART and DURATION, set DTEND **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_dtstart(c,icaltime_from_string("19970801T120000Z"));
-    icalcomponent_set_dtend(c,icaltime_from_string("19970801T133000Z"));
-
-    printf("\n** 5 Set DTSTART and DTEND **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    0
-	    ),
-	0);
-
-
-    icalcomponent_set_dtstart(c,icaltime_from_string("19970801T120000Z"));
-    icalcomponent_set_duration(c,icaldurationtype_from_string("PT1H30M"));
-
-    printf("\n** 6 Set DTSTART and DURATION **\n%s\n\n",
-	   icalcomponent_as_ical_string(c));
-
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    printf("Start: %s\n",ictt_as_string(icalcomponent_get_dtstart(c)));
-    printf("End:   %s\n",ictt_as_string(icalcomponent_get_dtend(c)));
-    printf("Dur:   %d m\n",duration);
-
-    icalcomponent_free(c);
-
-}
-
-void test_time_parser()
-{
-    struct icaltimetype tt;
-
-    icalerror_errors_are_fatal = 0;
-
-    tt = icaltime_from_string("19970101T1000");
-    assert(icaltime_is_null_time(tt));
-
-    tt = icaltime_from_string("19970101X100000");
-    assert(icaltime_is_null_time(tt));
-
-    tt = icaltime_from_string("19970101T100000");
-    assert(!icaltime_is_null_time(tt));
-    printf("%s\n",icaltime_as_ctime(tt));
-
-    tt = icaltime_from_string("19970101T100000Z");
-    assert(!icaltime_is_null_time(tt));
-    printf("%s\n",icaltime_as_ctime(tt));
-
-    tt = icaltime_from_string("19970101");
-    assert(!icaltime_is_null_time(tt));
-    printf("%s\n",icaltime_as_ctime(tt));
-
-    icalerror_errors_are_fatal = 1;
-
-}
-
-void test_recur_parser()
-{
-    struct icalrecurrencetype rt; 
-
-    printf("FREQ=YEARLY;UNTIL=20000131T090000Z;BYMONTH=1,2,3,4,8;BYYEARDAY=34,65,76,78;BYDAY=-1TU,3WE,-4FR,SU,SA\n");
-
-    rt = icalrecurrencetype_from_string("FREQ=YEARLY;UNTIL=20000131T090000Z;BYMONTH=1,2,3,4,8;BYYEARDAY=34,65,76,78;BYDAY=-1TU,3WE,-4FR,SU,SA");
-
-    printf("%s\n\n",icalrecurrencetype_as_string(&rt));
-
-    printf("FREQ=DAILY;COUNT=3;BYMONTH=1,2,3,4,8;BYYEARDAY=34,65,76,78;BYDAY=-1TU,3WE,-4FR,SU,S\n");
-
-    rt = icalrecurrencetype_from_string("FREQ=DAILY;COUNT=3;BYMONTH=1,2,3,4,8;BYYEARDAY=34,65,76,78;BYDAY=-1TU,3WE,-4FR,SU,SA");
-
-    printf("%s\n",icalrecurrencetype_as_string(&rt));
-
-}
-
-void test_doy()
-{
-    struct icaltimetype tt1, tt2;
-    short doy;
-
-    tt1 = icaltime_from_string("19950301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1995);
-    printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-
-    tt1 = icaltime_from_string("19960301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1996);
-    printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-
-    tt1 = icaltime_from_string("19970301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1997);
-    printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-
-
-}
-
-
-void test_x(){
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ical.h>
- 
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\r\n"
-"RRULE\r\n"
-" ;X-EVOLUTION-ENDDATE=20030209T081500\r\n"
-" :FREQ=DAILY;COUNT=10;INTERVAL=6\r\n"
-"X-COMMENT;X-FOO=BAR: Booga\r\n"
-"END:VEVENT\r\n";
-  
-    icalcomponent *icalcomp;
-    icalproperty *prop;
-    struct icalrecurrencetype recur;
-    int n_errors;
-    
-    icalcomp = icalparser_parse_string ((char *) test_icalcomp_str);
-    if (!icalcomp) {
-	fprintf (stderr, "main(): could not parse the component\n");
-	exit (EXIT_FAILURE);
-    }
-    
-    printf("%s\n\n",icalcomponent_as_ical_string(icalcomp));
-
-    n_errors = icalcomponent_count_errors (icalcomp);
-    if (n_errors) {
-	icalproperty *p;
-	
-	for (p = icalcomponent_get_first_property (icalcomp,
-						   ICAL_XLICERROR_PROPERTY);
-	     p;
-	     p = icalcomponent_get_next_property (icalcomp,
-						  ICAL_XLICERROR_PROPERTY)) {
-	    char *str;
-	    
-	    str = icalproperty_as_ical_string (p);
-	    fprintf (stderr, "error: %s\n", str);
-	}
-    }
-    
-    prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY);
-    if (!prop) {
-	fprintf (stderr, "main(): could not get the RRULE property");
-	exit (EXIT_FAILURE);
-    }
-    
-    recur = icalproperty_get_rrule (prop);
-    
-    printf("%s\n",icalrecurrencetype_as_string(&recur));
-
-}
-
-void test_gauge_sql() {
-
-
-    icalgauge *g;
-    
-    printf("\nSELECT DTSTART,DTEND,COMMENT FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5\n");
-
-    g = icalgauge_new_from_sql("SELECT DTSTART,DTEND,COMMENT FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5");
-    
-    icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-    printf("\nSELECT * FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5 OR METHOD != 'CREATE'\n");
-
-    g = icalgauge_new_from_sql("SELECT * FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5 OR METHOD != 'CREATE'");
-    
-    icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-}
-
-void test_gauge_compare() {
-
-    icalgauge *g;
-    icalcomponent *c;
-
-    /* Equality */
-
-    c =  icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
-	      icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-		  icalproperty_new_dtstart(
-		      icaltime_from_string("20000101T000002")),0),0);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART = '20000101T000002'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART = '20000101T000002'\n");
-    assert(c!=0);
-    assert(g!=0);
-
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART = '20000101T000001'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART = '20000101T000001'\n");
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 0);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART != '20000101T000003'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART != '20000101T000003'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-
-    /* Less than */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART < '20000101T000003'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART < '20000101T000003'\n");
-
-    assert(icalgauge_compare(g,c) == 1);
-
-    assert(g!=0);
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART < '20000101T000002'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART < '20000101T000002'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 0);
-
-    icalgauge_free(g);
-
-    /* Greater than */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000101T000001'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART > '20000101T000001'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000101T000002'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART > '20000101T000002'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 0);
-
-    icalgauge_free(g);
-
-
-    /* Greater than or Equal to */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000002'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000002'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000003'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000003'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 0);
-
-    icalgauge_free(g);
-
-    /* Less than or Equal to */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000002'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000002'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000001'");
-
-    printf("SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000001'\n");
-
-
-    assert(g!=0);
-    assert(icalgauge_compare(g,c) == 0);
-
-    icalgauge_free(g);
-
-    icalcomponent_free(c);
-
-
-    /* Complex comparisions */
-
-    c =  icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REQUEST),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(
-		icaltime_from_string("20000101T000002")),
-	    icalproperty_new_comment("foo"),
-	    icalcomponent_vanew(
-		ICAL_VALARM_COMPONENT,
-		icalproperty_new_dtstart(
-		    icaltime_from_string("20000101T120000")),
-		
-		0),
-	    0),
-	0);
-    
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE VALARM.DTSTART = '20000101T120000'");
-
-    printf("SELECT * FROM VEVENT WHERE VALARM.DTSTART = '20000101T120000'\n");
-
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE COMMENT = 'foo'");
-
-    printf("SELECT * FROM VEVENT WHERE COMMENT = 'foo'\n");
-
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE COMMENT = 'foo' AND  VALARM.DTSTART = '20000101T120000'");
-
-    printf("SELECT * FROM VEVENT WHERE COMMENT = 'foo' AND  VALARM.DTSTART = '20000101T120000'\n");
-
-    assert(icalgauge_compare(g,c) == 1);
-
-    icalgauge_free(g);
-
-    icalcomponent_free(c);
-    
-}
-
-icalcomponent* make_component(int i){
-
-    icalcomponent *c;
-
-    struct icaltimetype t = icaltime_from_string("20000101T120000Z");
-
-    t.day += i;
-
-    icaltime_normalize(t);
-
-    c =  icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REQUEST),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(t),
-	    0),
-	0);
-
-    assert(c != 0);
-
-    return c;
-
-}
-void test_fileset()
-{
-    icalfileset *fs;
-    icalcomponent *c;
-    int i;
-    char *path = "test_fileset.ics";
-    icalgauge  *g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000103T120000Z' AND DTSTART <= '20000106T120000Z'");
-
-
-    unlink(path);
-
-    fs = icalfileset_new(path);
-    
-    assert(fs != 0);
-
-    for (i = 0; i!= 10; i++){
-	c = make_component(i);
-	icalfileset_add_component(fs,c);
-    }
-
-    icalfileset_commit(fs);
-
-    icalfileset_free(fs);
-    fs = icalfileset_new(path);
-
-
-    printf("== No Selections \n");
-
-    for (c = icalfileset_get_first_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaltimetype t = icalcomponent_get_dtstart(c);
-
-	printf("%s\n",icaltime_as_ctime(t));
-    }
-
-    icalfileset_select(fs,g);
-
-    printf("\n== DTSTART > '20000103T120000Z' AND DTSTART <= '20000106T120000Z' \n");
-
-    for (c = icalfileset_get_first_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaltimetype t = icalcomponent_get_dtstart(c);
-
-	printf("%s\n",icaltime_as_ctime(t));
-    }
-
-    icalfileset_free(fs);
-    
-}
-
-void microsleep(int us)
-{
-    struct timeval tv;
-
-    tv.tv_sec = 0;
-    tv.tv_usec = us;
-
-    select(0,0,0,0,&tv);
-
-}
-
-
-void test_file_locks()
-{
-    pid_t pid;
-    char *path = "test_fileset_locktest.ics";
-    icalfileset *fs;
-    icalcomponent *c, *c2;
-    struct icaldurationtype d;
-    int i;
-    int final,sec;
-
-    icalfileset_safe_saves = 1;
-
-    icalerror_clear_errno();
-
-    unlink(path);
-
-    fs = icalfileset_new(path);
-
-    if(icalfileset_get_first_component(fs)==0){
-	c = make_component(0);
-	
-	d = icaldurationtype_from_int(1);
-	
-	icalcomponent_set_duration(c,d);
-	
-	icalfileset_add_component(fs,c);
-	
-	c2 = icalcomponent_new_clone(c);
-	
-	icalfileset_add_component(fs,c2);
-	
-	icalfileset_commit(fs);
-    }
-    
-    icalfileset_free(fs);
-    
-    assert(icalerrno == ICAL_NO_ERROR);
-    
-    pid = fork();
-    
-    assert(pid >= 0);
-    
-    if(pid == 0){
-	/*child*/
-	int i;
-
-	microsleep(rand()/(RAND_MAX/100));
-
-	for(i = 0; i< 50; i++){
-	    fs = icalfileset_new(path);
-
-
-	    assert(fs != 0);
-
-	    c = icalfileset_get_first_component(fs);
-
-	    assert(c!=0);
-	   
-	    d = icalcomponent_get_duration(c);
-	    d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1);
-	    
-	    icalcomponent_set_duration(c,d);
-	    icalcomponent_set_summary(c,"Child");	  
-  
-	    c2 = icalcomponent_new_clone(c);
-	    icalcomponent_set_summary(c2,"Child");
-	    icalfileset_add_component(fs,c2);
-
-	    icalfileset_mark(fs);
-	    icalfileset_commit(fs);
-
-	    icalfileset_free(fs);
-
-	    microsleep(rand()/(RAND_MAX/20));
-
-
-	}
-
-	exit(0);
-
-    } else {
-	/* parent */
-	int i;
-	
-	for(i = 0; i< 50; i++){
-	    fs = icalfileset_new(path);
-
-	    assert(fs != 0);
-
-	    c = icalfileset_get_first_component(fs);
-	    
-	    assert(c!=0);
-
-	    d = icalcomponent_get_duration(c);
-	    d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1);
-	    
-	    icalcomponent_set_duration(c,d);
-	    icalcomponent_set_summary(c,"Parent");
-
-	    c2 = icalcomponent_new_clone(c);
-	    icalcomponent_set_summary(c2,"Parent");
-	    icalfileset_add_component(fs,c2);
-
-	    icalfileset_mark(fs);
-	    icalfileset_commit(fs);
-	    icalfileset_free(fs);
-
-	    putc('.',stdout);
-	    fflush(stdout);
-
-	}
-    }
-
-    assert(waitpid(pid,0,0)==pid);
-	
-
-    fs = icalfileset_new(path);
-    
-    i=1;
-
-    c = icalfileset_get_first_component(fs);
-    final = icaldurationtype_as_int(icalcomponent_get_duration(c));
-    for (c = icalfileset_get_next_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaldurationtype d = icalcomponent_get_duration(c);
-	sec = icaldurationtype_as_int(d);
-
-	/*printf("%d,%d ",i,sec);*/
-	assert(i == sec);
-	i++;
-    }
-
-    printf("\nFinal: %d\n",final);
-
-    
-    assert(sec == final);
-}
-
-/* For GNU libc, strcmp appears to be a macro, so using strcmp in assert results in incomprehansible assertion messages. This eliminates the problem */
-
-int ttstrcmp(const char* a, const char* b){
-    return strcmp(a,b);
-}
-
-void test_trigger()
-{
-
-    struct icaltriggertype tr;
-    struct icaldatetimeperiodtype dtp;
-    icalcomponent *c;
-    icalproperty *p;
-    char* str;
-    
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"TRIGGER;VALUE=DATE-TIME:19980403T120000\n"
-"TRIGGER:-PT15M\n"
-"TRIGGER:19980403T120000\n"
-"TRIGGER;VALUE=DURATION:-PT15M\n"
-"END:VEVENT\r\n";
-  
-    
-    c = icalparser_parse_string ((char *) test_icalcomp_str);
-    if (!c) {
-	fprintf (stderr, "main(): could not parse the component\n");
-	exit (EXIT_FAILURE);
-    }
-    
-    printf("%s\n\n",icalcomponent_as_ical_string(c));
-
-    for(p = icalcomponent_get_first_property(c,ICAL_TRIGGER_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(c,ICAL_TRIGGER_PROPERTY)){
-	tr = icalproperty_get_trigger(p);
-
-	if(!icaltime_is_null_time(tr.time)){
-	    printf("value=DATE-TIME:%s\n", icaltime_as_ical_string(tr.time));
-	} else {
-	    printf("value=DURATION:%s\n", icaldurationtype_as_ical_string(tr.duration));
-	}   
-    }
-
-    /* Trigger, as a DATETIME */
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    str = icalproperty_as_ical_string(p);
-
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DURATION */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    str = icalproperty_as_ical_string(p);
-    
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n :P3DT3H50M45S\n",str) == 0);
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DATETIME, VALUE=DATETIME*/
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=DATETIME */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DATETIME ));
-
-    str = icalproperty_as_ical_string(p);
-    
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DURATION\n :P3DT3H50M45S\n",str) == 0);
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DATETIME, VALUE=DURATION*/
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DURATION));
-    str = icalproperty_as_ical_string(p);
-
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=DURATION */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DURATION));
-
-    str = icalproperty_as_ical_string(p);
-    
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DURATION\n :P3DT3H50M45S\n",str) == 0);
-    icalproperty_free(p);
-
-
-   /* TRIGGER, as a DATETIME, VALUE=BINARY  */
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=BINARY   */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-
-    str = icalproperty_as_ical_string(p);
-    
-    printf("%s\n",str);
-    assert(ttstrcmp("TRIGGER\n ;VALUE=DURATION\n :P3DT3H50M45S\n",str) == 0);
-    icalproperty_free(p);
-
-
-
-}
-
-void test_rdate()
-{
-
-    struct icaldatetimeperiodtype dtp;
-    icalproperty *p;
-    char* str;
-    struct icaltimetype time = icaltime_from_string("19970101T120000");
-    struct icalperiodtype period;
-
-    period.start = icaltime_from_string("19970101T120000");
-    period.end = icaltime_null_time();
-    period.duration = icaldurationtype_from_string("PT3H10M15S");
-
-    /* RDATE, as DATE-TIME */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=PERIOD\n :19970101T120000/PT3H10M15S\n",str) == 0);
-    icalproperty_free(p); 
-
-    /* RDATE, as DATE-TIME, VALUE=DATE-TIME */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=DATE-TIME */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=PERIOD\n :19970101T120000/PT3H10M15S\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as DATE-TIME, VALUE=PERIOD */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_PERIOD));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=PERIOD */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_PERIOD));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=PERIOD\n :19970101T120000/PT3H10M15S\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as DATE-TIME, VALUE=BINARY */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=DATE-TIME\n :19970101T120000\n",str) == 0);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=BINARY */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-    printf("%s\n",str);
-    assert(ttstrcmp("RDATE\n ;VALUE=PERIOD\n :19970101T120000/PT3H10M15S\n",str) == 0);
-    icalproperty_free(p); 
-
-
-}
-
-
-int main(int argc, char *argv[])
-{
-    int c;
-    extern char *optarg;
-    extern int optind, optopt;
-    int errflg=0;
-    char* program_name = strrchr(argv[0],'/');
-    int ttime=0, trecur=0,tspan=0, tmisc=0, tgauge = 0, tfile = 0;
-
-    if(argc==1) {
-	ttime = trecur = tspan = tmisc = tgauge = tfile = 1;
-    }
-
-    while ((c = getopt(argc, argv, "t:s:r:m:g:f:")) != -1) {
-	switch (c) {
-
-	    case 't': {
-		ttime = atoi(optarg);
-		break;
-	    }
-
-	    case 's': {
-		tspan = atoi(optarg);
-		break;
-	    }
-
-	    case 'r': {
-		trecur = atoi(optarg);
-		break;
-	    }
-
-
-	    case 'm': {
-		tmisc = atoi(optarg);
-		break;
-	    }
-	    
-
-	    case 'g': {
-		tgauge = atoi(optarg);
-		break;
-	    }
-
-	    case 'f': {
-		tfile = atoi(optarg);
-		break;
-	    }
-	    
-	    case ':': {/* Option given without an operand */
-		fprintf(stderr,
-			"%s: Option -%c requires an operand\n", 
-			program_name,optopt);
-		errflg++;
-		break;
-	    }
-	    case '?': {
-		errflg++;
-	    }
-	    
-	}
-	
-    } 
-
-
-    if(ttime==1 || ttime==2){
-	printf("\n------------Test time parser ----------\n");
-	test_time_parser();
-	    
-    }
-
-    if(ttime==1 || ttime==3){
-	printf("\n------------Test time----------------\n");
-	test_time();
-    }
-	    
-    if(ttime==1 || ttime==4){
-	printf("\n------------Test day of year---------\n");
-	test_doy();
-    }
-	    
-    if(ttime==1 || ttime==5){
-	printf("\n------------Test duration---------------\n");
-	test_duration();
-    }	
-
-    if(ttime==1 || ttime==6){
-	printf("\n------------Test period ----------------\n");
-	test_period();
-    }	
-	
-
-	    
-    if(trecur==1 || trecur==2){
-	printf("\n------------Test recur parser ----------\n");
-	test_recur_parser();
-    }
-     
-    if(trecur==1 || trecur==3){
-	printf("\n------------Test recur---------------\n");
-	test_recur();
-    }
-
-    if(trecur==1 || trecur==4){
-	printf("\n------------Test parameter bug---------\n");
-	test_recur_parameter_bug();
-    }
-
-
-    if(tspan==1 || tspan==2){
-	printf("\n------------Test FBlist------------\n");
-	test_fblist();
-    }
-
-    if(tspan==1 || tspan==3){
-	printf("\n------------Test Overlaps------------\n");
-	test_overlaps();
-    }
-
-    if(tspan==1 || tspan==4){
-	printf("\n------------Test Span----------------\n");
-	test_span();
-    }
-
-    if(tgauge == 1 || tgauge == 2){
-	printf("\n------------Test Gauge SQL----------------\n");
-	test_gauge_sql();
-    }	
-
-    if(tgauge == 1 || tgauge == 3){
-	printf("\n------------Test Gauge Compare--------------\n");
-	test_gauge_compare();
-    }	
-
-    if(tfile ==1 || tfile == 2){
-	printf("\n------------Test File Set--------------\n");
-	test_fileset();
-    }
-
-    if(tfile ==1 || tfile == 3){
-	printf("\n------------Test File Locks--------------\n");
-	test_file_locks();
-    }
-
-
-
-    if(tmisc == 1 || tmisc  == 2){
-	printf("\n------------Test X Props and Params--------\n");
-	test_x();
-    }
-
-    if(tmisc == 1 || tmisc  == 3){
-	printf("\n------------Test Trigger ------------------\n");
-	test_trigger();
-    }
-
-    if(tmisc == 1 || tmisc  == 4){
-
-	printf("\n------------Test Restriction---------------\n");
-	test_restriction();
-    }
-
-    if(tmisc == 1 || tmisc  == 5){
-
-	printf("\n------------Test RDATE---------------\n");
-	test_rdate();
-    }
-
-    if(tmisc == 1){
-
-	printf("\n------------Test Convenience ------------\n");
-	test_convenience();
-	
-	
-	printf("\n------------Test classify ---------------\n");
-	test_classify();
-	
-	
-	printf("\n------------Test Iterators-----------\n");
-	test_iterators();
-	
-	
-	printf("\n-----------Test request status-------\n");
-	test_requeststat();
-	
-	printf("\n------------Test strings---------------\n");
-	test_strings();
-	
-	printf("\n------------Test Compare---------------\n");
-	test_compare();
-	
-	printf("\n------------Test Values---------------\n");
-	test_values();
-	
-	printf("\n------------Test Parameters-----------\n");
-	test_parameters();
-
-	printf("\n------------Test Properties-----------\n");
-	test_properties();
-	
-	printf("\n------------Test Components ----------\n");
-	test_components();
-	
-	printf("\n------------Create Components --------\n");
-	create_new_component();
-	
-	printf("\n----- Create Components with vaargs ---\n");
-	create_new_component_with_va_args();
-
-	printf("\n------------Test Memory---------------\n");
-	test_memory();
-    }
-
-    return 0;
-}
-
-
-
diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c
deleted file mode 100644
index 2d8bc586f4..0000000000
--- a/libical/src/test/storage.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: usecases.c
-  CREATOR: eric 03 April 1999
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is usecases.c
-
-    
-  ======================================================================*/
-
-#include "ical.h"
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include "icalmemory.h"
-#include "icaldirset.h"
-#include "icalfileset.h"
-#include "icalerror.h"
-#include "icalrestriction.h"
-#include "icalcalendar.h"
-
-#define OUTPUT_FILE "filesetout.ics"
-
-char str[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VTIMEZONE\n\
-TZID:US-Eastern\n\
-BEGIN:STANDARD\n\
-DTSTART:19981025T020000\n\
-RDATE:19981025T020000\n\
-TZOFFSETFROM:-0400\n\
-TZOFFSETTO:-0500\n\
-TZNAME:EST\n\
-END:STANDARD\n\
-BEGIN:DAYLIGHT\n\
-DTSTART:19990404T020000\n\
-RDATE:19990404T020000\n\
-TZOFFSETFROM:-0500\n\
-TZOFFSETTO:-0400\n\
-TZNAME:EDT\n\
-END:DAYLIGHT\n\
-END:VTIMEZONE\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-BEGIN:BOOGA\n\
-DTSTAMP:19980309T231000Z\n\
-X-LIC-FOO:Booga\n\
-DTSTOMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-END:BOOGA\n\
-END:VCALENDAR";
-
-char str2[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-END:VCALENDAR\n\
-";
-
-
-void test_fileset()
-{
-    icalfileset *cout;
-    int month = 0;
-    int count=0;
-    struct icaltimetype start, end;
-    icalcomponent *c,*clone, *itr;
-
-    start = icaltime_from_timet( time(0),0);
-    end = start;
-    end.hour++;
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-
-    c = icalparser_parse_string(str2);
-    assert(c != 0);
-
-    /* Add data to the file */
-
-    for(month = 1; month < 10; month++){
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-        cout = icalfileset_new(OUTPUT_FILE);
-        assert(cout != 0);
-
-	start.month = month; 
-	end.month = month;
-	
-	clone = icalcomponent_new_clone(c);
-	assert(clone !=0);
-	event = icalcomponent_get_first_component(clone,ICAL_VEVENT_COMPONENT);
-	assert(event != 0);
-
-	dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-	assert(dtstart!=0);
-	icalproperty_set_dtstart(dtstart,start);
-        
-	dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-	assert(dtend!=0);
-	icalproperty_set_dtend(dtend,end);
-	
-	icalfileset_add_component(cout,clone);
-	icalfileset_commit(cout);
-
-        icalfileset_free(cout);
-
-    }
-
-
-    /* Print them out */
-
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-    }
-
-    /* Remove all of them */
-
-    icalfileset_free(cout);
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-
-      icalfileset_remove_component(cout, itr);
-    }
-
-    icalfileset_free(cout);
-
-
-    /* Print them out again */
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    count =0;
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-    }
-
-    icalfileset_free(cout);
-
-
-}
-
-
-
-int test_dirset()
-{
-
-    icalcomponent *c, *gauge;
-    icalerrorenum error;
-    icalcomponent *itr;
-    icalfileset* cluster;
-    struct icalperiodtype rtime;
-    icaldirset *s = icaldirset_new("store");
-    int i;
-
-    assert(s != 0);
-
-    rtime.start = icaltime_from_timet( time(0),0);
-
-    cluster = icalfileset_new(OUTPUT_FILE);
-
-    assert(cluster != 0);
-
-#define NUMCOMP 4
-
-    /* Duplicate every component in the cluster NUMCOMP times */
-
-    icalerror_clear_errno();
-
-    for (i = 1; i<NUMCOMP+1; i++){
-
-	/*rtime.start.month = i%12;*/
-	rtime.start.month = i;
-	rtime.end = rtime.start;
-	rtime.end.hour++;
-	
-	for (itr = icalfileset_get_first_component(cluster);
-	     itr != 0;
-	     itr = icalfileset_get_next_component(cluster)){
-	    icalcomponent *clone, *inner;
-	    icalproperty *p;
-
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-            if (inner == 0){
-              continue;
-            }
-
-	    /* Change the dtstart and dtend times in the component
-               pointed to by Itr*/
-
-	    clone = icalcomponent_new_clone(itr);
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-	    assert(icalerrno == ICAL_NO_ERROR);
-	    assert(inner !=0);
-
-	    /* DTSTART*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.start);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.start);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    /* DTEND*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.end);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.end);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	    
-	    printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(inner));
-
-	    error = icaldirset_add_component(s,
-					     icalcomponent_new_clone(itr));
-	    
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	}
-
-    }
-    
-    gauge = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Submit Income Taxes",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Bastille Day Party",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    0);
-
-#if 0
-
-
-    icaldirset_select(s,gauge);
-
-    for(c = icaldirset_first(s); c != 0; c = icaldirset_next(s)){
-	
-	printf("Got one! (%d)\n", count++);
-	
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	    if (icaldirset_store(s2,c) == 0){
-		printf("Failed to write!\n");
-	    }
-	    icalcomponent_free(c);
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-
-    icaldirset_free(s2);
-#endif
-
-
-    for(c = icaldirset_get_first_component(s); 
-	c != 0; 
-	c = icaldirset_get_next_component(s)){
-
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	} else {
-	    printf("Failed to get component\n");
-	}
-
-    }
-
-    /* Remove all of the components */
-    i=0;
-    while((c=icaldirset_get_current_component(s)) != 0 ){
-	i++;
-
-	icaldirset_remove_component(s,c);
-    }
-	
-
-    icaldirset_free(s);
-    return 0;
-}
-
-#if 0
-void test_calendar()
-{
-    icalcomponent *comp;
-    icalfileset *c;
-    icaldirset *s;
-    icalcalendar* calendar = icalcalendar_new("calendar");
-    icalerrorenum error;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0,0);
-
-    comp = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_description("This is an event"),
-	icalproperty_new_dtstart(atime),
-	icalproperty_vanew_comment(
-	    "Another Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    icalparameter_new_cn("A Common Name 2"),
-	    icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-	    0),
-	icalproperty_vanew_xlicerror(
-	    "This is only a test",
-	    icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-	    0),
-	
-	0);
-	
-	
-    s = icalcalendar_get_booked(calendar);
-
-    error = icaldirset_add_component(s,comp);
-    
-    assert(error == ICAL_NO_ERROR);
-
-    c = icalcalendar_get_properties(calendar);
-
-    error = icalfileset_add_component(c,icalcomponent_new_clone(comp));
-
-    assert(error == ICAL_NO_ERROR);
-
-    icalcalendar_free(calendar);
-
-}
-#endif
-
-
-int main(int argc, char *argv[])
-{
-
-/*    printf("\n------------Test File Set---------------\n");
-      test_fileset(); */
-
-    printf("\n------------Test Dir Set---------------\n");
-    test_dirset();
-
-#if 0    
-
-
-    printf("\n------------Test Calendar---------------\n");
-    test_calendar();
-
-#endif
-
-    return 0;
-}
-
-
-
diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c
deleted file mode 100644
index 2570e3ad0c..0000000000
--- a/libical/src/test/stow.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: stow.c
-  CREATOR: eric 29 April 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Initial Developer of the Original Code is Eric Busboom
-
- ======================================================================*/
-
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h> /* for PATH_MAX */
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/utsname.h> /* for uname */
-#include <sys/stat.h> /* for stat */
-#include <unistd.h> /* for stat, getpid, getopt */
-#include <pwd.h> /* For getpwent */
-#include <sys/types.h> /* For getpwent */
-#include <ctype.h> /* for tolower */
-
-#include "ical.h"
-#include "icalcalendar.h"
-#include "icalfileset.h"
-#include "icalmime.h"
-
-char* program_name;
-#define TMPSIZE 2048
-#define SENDMAIL "/usr/lib/sendmail -t"
-
-void usage(char *message);
-
-
-enum options {
-    STORE_IN_FILE,
-    STORE_IN_DB,
-    INPUT_IS_MIME,
-    INPUT_IS_ICAL,
-    INPUT_FROM_STDIN,
-    INPUT_FROM_FILE,
-    ERRORS_TO_STDOUT,
-    ERRORS_TO_ORGANIZER
-};
-
-struct options_struct
-{
-	enum options storage;
-	enum options input_type;
-	enum options input_source;
-	enum options errors;
-	char* input_file;
-	char* calid;
-	char* output_file;
-};
-
-
-enum file_type
-{
-    ERROR,
-    NO_FILE,
-    DIRECTORY,
-    REGULAR,
-    OTHER
-};
-
-enum file_type test_file(char *path)
-{
-    struct stat sbuf;
-    enum file_type type;
-    
-    errno = 0;
-
-    /* Check if the path already exists and if it is a directory*/
-    if (stat(path,&sbuf) != 0){
-	
-	/* A file by the given name does not exist, or there was
-           another error */
-	if(errno == ENOENT)
-	{
-	    type = NO_FILE;
-	} else {
-	    type = ERROR;
-	}
-
-    } else {
-	/* A file by the given name exists, but is it a directory? */
-	
-	if (S_ISDIR(sbuf.st_mode)){ 
-	    type = DIRECTORY;
-	} else if(S_ISREG(sbuf.st_mode)){ 
-	    type = REGULAR;
-	} else {
-	    type = OTHER;
-	}
-    }
-
-    return type;
-}
-
-char* lowercase(const char* str)
-{
-    char* p = 0;
-    char* new = strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-#if 0
-char* get_local_attendee(struct options_struct *opt)
-{
-    char attendee[PATH_MAX];
-
-    if(opt->calid){
-
-	strncpy(attendee,opt->calid,PATH_MAX);
-
-    } else {
-	
-	char* user = getenv("USER");
-	struct utsname uts;
-	uname(&utget_option);
-	/* HACK nodename may not be a fully qualified domain name */
-	snprintf(attendee,PATH_MAX,"%s@%s",user,uts.nodename);
-   
-    }
-
-    return lowercase(attendee);
-}
-#endif
-
-
-icalcomponent* get_first_real_component(icalcomponent *comp)
-{
-    icalcomponent *c;
-
-    for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-	if (icalcomponent_isa(c) == ICAL_VEVENT_COMPONENT ||
-	    icalcomponent_isa(c) == ICAL_VTODO_COMPONENT ||
-	    icalcomponent_isa(c) == ICAL_VJOURNAL_COMPONENT )
-	{
-	    return c;
-	}
-    }
-
-    return 0;
-}
-
-
-
-char* make_mime(char* to, const char* from, const char* subject, 
-		const char* text_message, const char* method, 
-		const char* ical_message)
-{
-    size_t size = strlen(to)+strlen(from)+strlen(subject)+
-	strlen(text_message)+ strlen(ical_message)+TMPSIZE;
-
-    char mime_part_1[TMPSIZE];
-    char mime_part_2[TMPSIZE];
-    char content_id[TMPSIZE];
-    char boundary[TMPSIZE];
-    struct utsname uts;
-    char* m;
-
-
-    if ((m = malloc(sizeof(char)*size)) == 0){
-	fprintf(stderr,"%s: Can't allocate memory: %s\n",program_name,strerror(errno));
-	exit(1);
-    }
-
-    uname(&uts);
-
-    srand(time(0)<<getpid());
-    sprintf(content_id,"%d-%d@%s",(int)time(0),rand(),uts.nodename);
-    sprintf(boundary,"%d-%d-%s",(int)time(0),rand(),uts.nodename);
-
-    sprintf(mime_part_1,"Content-ID: %s\n\
-Content-type: text/plain\n\
-Content-Description: Text description of error message\n\n\
-%s\n\n--%s",
-	    content_id,text_message,boundary);
-
-    if(ical_message != 0 && method != 0){
-	sprintf(mime_part_2,"Content-ID: %s\n\
-Content-type: text/calendar; method=%s\n\
-Content-Description: iCal component reply\n\n\
-%s\n\n--%s--",
-		content_id,method,ical_message,boundary);
-    }
-
-    sprintf(m,"To: %s\n\
-From: %s\n\
-Subject: %s\n\
-MIME-Version: 1.0\n\
-Content-ID: %s\n\
-Content-Type:  multipart/mixed; boundary=\"%s\"\n\
-\n\
- This is a multimedia message in MIME format\n\
-\n\
---%s\n\
-%s\n\
-",
-	    to,from,subject,content_id,boundary,boundary,
-	    mime_part_1);
-
-    if(ical_message != 0 && method != 0){
-	strcat(m, mime_part_2);
-    } else {
-	strcat(m,"--\n");
-    }
-
-    return m;
-}
-
-/* The incoming component had fatal errors */
-void return_failure(icalcomponent* comp,  char* message, 
-		    struct options_struct *opt)
-{
-    char* local_attendee = opt->calid;
-    FILE* p;
-
-    icalcomponent  *inner = get_first_real_component(comp);
-
-    icalproperty *organizer_prop = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-    const char *organizer = icalproperty_get_organizer(organizer_prop);
-
-    organizer += 7;
-
-    if (opt->errors == ERRORS_TO_ORGANIZER){
-	p = popen(SENDMAIL,"w");
-    } else {
-	p = stdout;
-    }
-
-    if(p == 0){
-	fprintf(stderr,
-		"%s: fatal. Could not open pipe to sendmail (\"%s\") \n",
-		program_name,SENDMAIL);
-	exit(1);
-     }
-   
-    fputs(make_mime(organizer, local_attendee, "iMIP error", 
-		    message, "reply",
-		    icalcomponent_as_ical_string(comp)),p);
-    
-    if (opt->errors == ERRORS_TO_ORGANIZER){ 
-	pclose(p);
-    }   
-}
-
-/* The program had a fatal error and could not process the incoming component*/
-void return_error(icalcomponent* comp,  char* message, struct options_struct *opt)
-{
-    
-
-    fputs(make_mime("Dest", "Source", "iMIP system failure", 
-		    message, 0,0),stdout);
-
-}
-
-icalcomponent* make_reply(icalcomponent *comp, icalproperty *return_status, 
-			 struct options_struct *opt)
-
-{
-    icalcomponent *reply, *rinner;
-    icalcomponent  *inner = get_first_real_component(comp);
-    icalproperty *p=0;
-    char* local_attendee = opt->calid;
-    char attendee[TMPSIZE];
-
-    char prodid[TMPSIZE];
-
-    snprintf(attendee,TMPSIZE,"mailto:%s",local_attendee);
-
-    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",ICAL_PACKAGE,ICAL_VERSION);
-
-    /* Create the base component */
-    reply = icalcomponent_vanew( 
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_version(strdup("2.0")),
-	icalproperty_new_prodid(strdup(prodid)),
-	icalproperty_new_method(ICAL_METHOD_REPLY),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY)),
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY)),
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY)),
-	    icalproperty_new_attendee(attendee),
-	    0),
-	0);
-
-    
-    /* Convert errors into request-status properties and transfers
-       them to the reply component */
-
-    icalcomponent_convert_errors(comp);
-
-    rinner = get_first_real_component(reply);
-
-    for(p = icalcomponent_get_first_property(inner,
-					     ICAL_REQUESTSTATUS_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(inner,
-					    ICAL_REQUESTSTATUS_PROPERTY)){
-	
-	icalcomponent_add_property(rinner,icalproperty_new_clone(p));
-    }
-		
-    if(return_status != 0){
-	icalcomponent_add_property(rinner, return_status);
-    }
-        
-    return reply;
-	    
-}
-
-int check_attendee(icalproperty *p,  struct options_struct *opt){  
-    const char* s = icalproperty_get_attendee(p);
-    char* lower_attendee = lowercase(s);
-    char* local_attendee = opt->calid;
-    
-    /* Check that attendee begins with "mailto:" */
-    if (strncmp(lower_attendee,"mailto:",7) == 0){
-	/* skip over the mailto: part */
-	lower_attendee += 7;
-	
-	if(strcmp(lower_attendee,local_attendee) == 0){
-	    return 1;
-	}
-	
-	lower_attendee -= 7;
-	
-	free(lower_attendee);
-    } 
-
-    return 0;
-}
-
-char static_component_error_str[PATH_MAX];
-char* check_component(icalcomponent* comp,  icalproperty **return_status,
-		      struct options_struct *opt)
-{
-    char* component_error_str=0;
-    icalcomponent* inner;
-    int errors = 0;
-    icalproperty *p;
-    int found_attendee = 0;
-
-    *return_status = 0;
-
-    /* This do/while loop only executes once because it is being used
-       to fake exceptions */
-
-    do {
-
-	/* Check that we actually got a component */
-	if(comp == 0){
-	    strcpy(static_component_error_str,
-		   "Did not find a component");
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-
-	/* Check that the root component is a VCALENDAR */
-	if(icalcomponent_isa(comp) != ICAL_VCALENDAR_COMPONENT){
-	    strcpy(static_component_error_str,
-		   "Root component is not a VCALENDAR");
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-
-
-	/* Check that the component has a METHOD */
-
-	if (icalcomponent_get_first_property(comp,ICAL_METHOD_PROPERTY) == 0)
-	{
-	    strcpy(static_component_error_str,
-		   "Component does not have a METHOD property");
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-	
-	inner = get_first_real_component(comp);
-
-
-	/* Check that the compopnent has an organizer */
-	if(icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY) == 0){
-	    fprintf(stderr,"%s: fatal. Component does not have an ORGANIZER property\n",program_name);
-
-	    exit(1);
-	}
-
-
-	/* Check for this user as an attendee or organizer */
-
-	for(p = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY)){
-	  
-	    found_attendee += check_attendee(p,opt);
-	}
-
-	for(p = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(inner,ICAL_ORGANIZER_PROPERTY)){
-	  
-	    found_attendee += check_attendee(p,opt);
-	}
-		
-	if (found_attendee == 0){
-	    struct icalreqstattype rs;
-	    char* rs_string;
-	    memset(static_component_error_str,0,PATH_MAX);
-
-	    snprintf(static_component_error_str,PATH_MAX,
-		   "This target user (%s) is not listed as an attendee or organizer",
-		    opt->calid );
-	    component_error_str = static_component_error_str;
-
-	    rs.code = ICAL_3_7_INVCU_STATUS;
-	    rs.desc = 0;
-	    rs.debug  = component_error_str;    
-	    rs_string = icalreqstattype_as_string(rs);
-
-	    *return_status = icalproperty_new_requeststatus(rs_string);
-
-	    break;
-	}
-
-
-
-	/* Check that the component passes iTIP restrictions */
-	
-	errors = icalcomponent_count_errors(comp);
-	icalrestriction_check(comp);
-	
-	if(errors != icalcomponent_count_errors(comp)){
-	    snprintf(static_component_error_str,PATH_MAX,
-		   "The component does not conform to iTIP restrictions.\n Here is the original component; look at the X-LIC-ERROR properties\nfor details\n\n%s",icalcomponent_as_ical_string(comp));
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-
-
-
-    } while(0);
-
-    return component_error_str;
-}
-
-
-void usage(char *message)
-{
-    fprintf(stderr,"Usage: %s [-emdcn] [-i inputfile] [-o outputfile] [-u calid]\n",program_name);
-    fprintf(stderr,"-e\tInput data is encapsulated in a MIME Message \n\
--m\tInput is raw iCal \n\
--i\tSpecify input file. Otherwise, input comed from stdin\n\
--o\tSpecify file to save incoming message to\n\
--d\tSpecify database to send data to\n\
--u\tSet the calid to store the data to\n\
--n\tSend errors to stdout instead of organizer\n\
-");
-
-}
-
-
-void get_options(int argc, char* argv[], struct options_struct *opt)
-{
-    int c;
-    extern char *optarg;
-    extern int optind, optopt;
-    int errflg=0;
-
-    opt->storage = STORE_IN_FILE;
-    opt->input_source = INPUT_FROM_STDIN;
-    opt->input_type = INPUT_IS_ICAL;
-    opt->input_file = 0;
-    opt->errors = ERRORS_TO_ORGANIZER;
-    opt->calid = 0;
-    opt->output_file = 0;
-
-
-    while ((c = getopt(argc, argv, "nemu:o:d:b:c:i:")) != -1) {
-             switch (c) {
-		 case 'e': { /* Input data is MIME encapsulated */
-		     opt->input_type = INPUT_IS_MIME;
-		     break;
-		 }
-		 case 'm': { /* Input is iCal. Default*/
-		     opt->input_type = INPUT_IS_ICAL;
-		     break;
-		 }
-		 case 'i': { /* Input comes from named file */
-		     opt->input_source = INPUT_FROM_FILE;
-		     opt->input_file = strdup(optarg);
-		     break;
-		 }
-		 case 'o': { /* Output goes to named file. Default*/
-		     opt->output_file = strdup(optarg);
-		     opt->storage = STORE_IN_FILE;
-		     break;
-		 }
-		 case 'd': { /* Output goes to database */
-		     fprintf(stderr,"%s: option -d is unimplmented\n",program_name);
-		     opt->storage = STORE_IN_DB;
-		     errflg++;
-		     break;
-		 }
-		 case 'c': {
-
-		     break;
-		 }
-		 case 'u': { /* Set the calid for the output database or
-				file. Default is user name of user running
-				program */
-		     opt->calid = strdup(optarg);
-		     break;
-		 }
-
-		 case 'n': { /* Dump error to stdout. Default is to
-		                send error to the organizer specified
-		                in the iCal data */
-		     opt->errors = ERRORS_TO_STDOUT;
-		     break;
-		 }
-
-		 case ':': {/* Option given without an operand */
-		     fprintf(stderr,
-			     "%s: Option -%c requires an operand\n", 
-			     program_name,optopt);
-		     errflg++;
-		     break;
-		 }
-		 case '?': {
-		     errflg++;
-		 }
-
-             }
-
-	     if (errflg >0){
-		 usage("");
-		 exit(1);
-	     }
-    } 
-
-    if(opt->calid == 0){
-	/* If no calid specified, use username */
-	char attendee[PATH_MAX];
-	char* user = getenv("USER");
-	struct utsname uts;
-	uname(&uts);
-	/* HACK nodename may not be a fully qualified domain name */
-	snprintf(attendee,PATH_MAX,"%s@%s",user,uts.nodename);
-
-	opt->calid = lowercase(attendee);
-    }
-
-    if(opt->storage == STORE_IN_FILE &&
-	opt->output_file ==0){
-	char file[PATH_MAX];
-	char* user = getenv("USER");
-	struct passwd *pw;
-
-	if(!user){
-	    fprintf(stderr,"%s: Can't get username. Try explicitly specifing the output file with -o", program_name);
-	    exit(1);
-	}
-	
-	/* Find password entry for user */
-	while( (pw = getpwent())!=0){
-	    if(strcmp(user,pw->pw_name)==0){
-		break;
-	    }
-	}
-	    
-	if(pw==0){
-	    fprintf(stderr,"%s: Can't get get password entry for user \"%s\" Try explicitly specifing the output file with -o", 
-		    program_name,user);
-	    exit(1);
-	}
-
-	if(pw->pw_dir==0){
-	    fprintf(stderr,"%s: User \"%s\" has no home directory. Try explicitly specifing the output file with -o", 
-		    program_name, user);
-	    exit(1);
-	}
-
-	snprintf(file,PATH_MAX,"%s/.facs/%s",pw->pw_dir,opt->calid);
-
-	opt->output_file = strdup(file);
-    }
-
-
-    /* Now try to create the calendar directory if it does
-       not exist */
-
-     if(opt->storage == STORE_IN_FILE ) {
-	char * p;
-	char* facspath = strdup(opt->output_file);
-	enum file_type type;
-
-	/* Cut off the last slash to make it just a directoy */
-
-	p = strrchr(facspath,'/');
-
-	if (p == 0){
-	   fprintf(stderr,"%s: Invalid calendar filename \"%s\"", 
-		    program_name,facspath);
-	   exit(1);
-	}   
-	
-	*p='\0';
-
-	type = test_file(facspath);
-
-	errno = 0;
-	if (type == NO_FILE){
-	    
-	    if(mkdir(facspath,0775) != 0){
-		fprintf(stderr,
-			"%s: Failed to create calendar directory %s: %s\n",
-			program_name,facspath, strerror(errno));
-		exit(1);
-	    } else {
-		fprintf(stderr,"%s: Creating calendar directory %s\n",
-			program_name,facspath);
-	    }
-	    
-	} else if(type==REGULAR || type == ERROR){
-	    fprintf(stderr,"%s: Cannot create calendar directory %s\n",
-		    program_name,facspath);
-	    exit(1);
-	} 		    
-    }
-}
-
-char* check_options(struct options_struct *opt)
-{
-    return 0;
-}
-
-void store_component(icalcomponent *comp, struct options_struct *opt)
-{
-    icalerrorenum error; 
-
-
-    if(opt->storage == STORE_IN_FILE){
-	icalfileset *fs = icalfileset_new(opt->output_file);
-
-	if (fs == 0){
-	    fprintf(stderr,
-		    "%s: Failed to get incoming component directory: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-
-
-	error = icalfileset_add_component(fs,comp);
-    
-	if (error != ICAL_NO_ERROR){
-	    fprintf(stderr,"%s: Failed to write incoming component: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-	
-	error = icalfileset_commit(fs);
-    
-	if (error != ICAL_NO_ERROR){
-	    fprintf(stderr,"%s: Failed to commit incoming cluster: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-	
-	icalfileset_free(fs);
-
-	return;
-    } else {
-	assert(0);
-    }
-}
-
-char* read_stream(char *s, size_t size, void *d)
-{
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-}
-
-icalcomponent* read_nonmime_component(struct options_struct *opt)
-{
-    FILE *stream;
-    icalcomponent *comp;
-    icalparser* parser = icalparser_new();
-    char* line;
-
-    if(opt->input_source == INPUT_FROM_FILE){
- 	stream = fopen(opt->input_file,"r"); 	
-
-	if (stream == 0){
-	    perror("Can't open input file");
-	    exit(1);
-	}
-
-    } else {
- 	stream = stdin;  	 	
-    }
-
-    assert(stream != 0);
-    icalparser_set_gen_data(parser,stream);
-   
-    do {	
-	line = icalparser_get_line(parser,read_stream);
-	
-	comp = icalparser_add_line(parser,line);
-	
-	if (comp != 0){
-	    return comp;
-	}
-	
-    } while ( line != 0);
-
-    if(opt->input_source == INPUT_FROM_FILE){
-	fclose(stream);
-    }
-
-
-    return comp;
- }
-
-icalcomponent* find_vcalendar(icalcomponent* comp)
-{
-    icalcomponent *c,*rtrn;
-
-    for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-
-	if(icalcomponent_isa(c) == ICAL_VCALENDAR_COMPONENT){
-	    icalcomponent_remove_component(comp,c);
-	    return c;
-	}
-
-	if((rtrn=find_vcalendar(c)) != 0){
-	    return rtrn;
-	}
-    }
-
-    return 0;
-}
-
-icalcomponent* read_mime_component(struct options_struct *opt)
-{
-    icalcomponent *comp,*mimecomp;
-    FILE* stream;
-    
-    if(opt->input_source == INPUT_FROM_FILE){
- 	stream = fopen(opt->input_file,"r"); 	
-	
-	if (stream == 0){
-	    perror("Can't open input file");
-	    exit(1);
-	}
-	
-    } else {
- 	stream = stdin;  	 	
-    }
-    
-    assert(stream != 0);
-    
-    mimecomp = icalmime_parse(read_stream,(void*)stream);
-
-    /* now find the iCal component embedded within the mime component */
-    comp = find_vcalendar(mimecomp);
-
-
-    if(comp == 0){
-	return 0;
-    }
-
-    return comp;    
-}
-
-icalcomponent* read_component(struct options_struct *opt)
-{
-    if(opt->input_type == INPUT_IS_MIME){
-	return read_mime_component(opt);
-    } else if (opt->input_type == INPUT_IS_ICAL){
-	return read_nonmime_component(opt);
-    } else {
-	fprintf(stderr,"%s: Internal Error; unknown option for input_type\n",
-		program_name);
-	exit(1);
-    }
-}
-
-int main(int argc, char* argv[] )
-{
-    char* options_error_str;
-    char* component_error_str;
-    icalcomponent* comp, *reply;
-    struct options_struct opt;
-    icalproperty *return_status;
-
-    program_name = strrchr(argv[0],'/');
-
-    get_options(argc, argv, &opt);
-
-    if ( (options_error_str = check_options(&opt)) != 0 ){
-	usage(options_error_str);
-	exit(1);
-    }    
-
-    comp = read_component(&opt);
-
-    if ( (component_error_str = 
-	  check_component(comp,&return_status,&opt)) != 0){
-	reply = make_reply(comp,return_status,&opt);
-	return_failure(reply, component_error_str, &opt);
-	icalcomponent_free(reply);
-	exit(0);
-    }
-
-    store_component(comp,&opt);
-
-
-    /* Don't free the component comp, since it is now part of the
-       store, and will be freed there */
-
-    exit(0);
-}
-
diff --git a/libical/src/test/testclassify.c b/libical/src/test/testclassify.c
deleted file mode 100644
index 821baac251..0000000000
--- a/libical/src/test/testclassify.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: testclassify.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include "ical.h"
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include "icalset.h"
-#include "icalclassify.h"
-#include "icalssutil.h"
-
-
-struct class_map {
-	ical_class class;
-	char *str;
-} class_map[] = {
-    {ICAL_NO_CLASS,"No class"},
-    {ICAL_PUBLISH_NEW_CLASS,"New Publish"},
-    {ICAL_PUBLISH_UPDATE_CLASS,"Update Publish"},
-    {ICAL_REQUEST_NEW_CLASS,"New request"},
-    {ICAL_REQUEST_UPDATE_CLASS,"Update"},
-    {ICAL_REQUEST_RESCHEDULE_CLASS,"Reschedule"},
-    {ICAL_REQUEST_DELEGATE_CLASS,"Delegate"},
-    {ICAL_REQUEST_NEW_ORGANIZER_CLASS,"New Organizer"},
-    {ICAL_REQUEST_FORWARD_CLASS,"Forward"},
-    {ICAL_REQUEST_STATUS_CLASS,"Status request"},
-    {ICAL_REPLY_ACCEPT_CLASS,"Accept reply"},
-    {ICAL_REPLY_DECLINE_CLASS,"Decline reply"},
-    {ICAL_REPLY_CRASHER_ACCEPT_CLASS,"Crasher's accept reply"},
-    {ICAL_REPLY_CRASHER_DECLINE_CLASS,"Crasher's decline reply"},
-    {ICAL_ADD_INSTANCE_CLASS,"Add instance"},
-    {ICAL_CANCEL_EVENT_CLASS,"Cancel event"},
-    {ICAL_CANCEL_INSTANCE_CLASS,"Cancel instance"},
-    {ICAL_CANCEL_ALL_CLASS,"Cancel all instances"},
-    {ICAL_REFRESH_CLASS,"Refresh"},
-    {ICAL_COUNTER_CLASS,"Counter"},
-    {ICAL_DECLINECOUNTER_CLASS,"Decline counter"},
-    {ICAL_MALFORMED_CLASS,"Malformed"}, 
-    {ICAL_OBSOLETE_CLASS,"Obsolete"},
-    {ICAL_MISSEQUENCED_CLASS,"Missequenced"},
-    {ICAL_UNKNOWN_CLASS,"Unknown"}
-};
-
-char* find_class_string(ical_class class)
-{
-    int i; 
-
-    for (i = 0;class_map[i].class != ICAL_UNKNOWN_CLASS;i++){
-	if (class_map[i].class == class){
-	    return class_map[i].str;
-	}
-    }
-
-    return "Unknown";
-}
-
-
-int main(int argc, char* argv[])
-{
-    icalcomponent *c;
-    int i=0;
-
-    icalset* f = icalset_new_file("../../test-data/incoming.ics");
-    icalset* cal = icalset_new_file("../../test-data/calendar.ics");
-
-    assert(f!= 0);
-    assert(cal!=0);
-	
-
-    /* Foreach incoming message */
-    for(c=icalset_get_first_component(f);c!=0;
-	c=icalset_get_next_component(f)){
-	
-	ical_class class;
-	icalcomponent *match;
-	icalcomponent *inner = icalcomponent_get_first_real_component(c);
-	icalcomponent *p;
-	const char *this_uid;
-	const char *i_x_note=0;
-	const char *c_x_note=0;
-
-	i++;
-
-	if(inner == 0){
-	    continue;
-	}
-
-	p = icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-	this_uid = icalproperty_get_uid(p);
-
-	assert(this_uid != 0);
-
-	/* Find a booked component that is matched to the incoming
-	   message, based on the incoming component's UID, SEQUENCE
-	   and RECURRENCE-ID*/
-
-	match = icalset_fetch(cal,this_uid);
-
-	class = icalclassify(c,match,"A@example.com");
-
-	for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-	    p!= 0;
-	    p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-	    if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-		i_x_note = icalproperty_get_x(p);
-	    }
-	}
-
-
-	if(i_x_note == 0){
-	    i_x_note = "None";
-	}
-
-	for(p = icalcomponent_get_first_property(match,ICAL_X_PROPERTY);
-	    p!= 0;
-	    p = icalcomponent_get_next_property(match,ICAL_X_PROPERTY)){
-	    if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-		c_x_note = icalproperty_get_x(p);
-	    }
-	}
-
-	if(c_x_note == 0){
-	    c_x_note = "None";
-	}
-
-
-	printf("Test %d\nIncoming:      %s\nMatched:       %s\nClassification: %s\n\n",i,i_x_note,c_x_note,find_class_string(class));	
-    }
-
-    return 0;
-}
-
-
diff --git a/libical/src/test/testmime.c b/libical/src/test/testmime.c
deleted file mode 100644
index 5dfc3b7d31..0000000000
--- a/libical/src/test/testmime.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: 
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#include "ical.h"
-#include "sspm.h"
-#include "icalmime.h"
-#include <stdlib.h> /* For rand */
-#include <string.h> /* for strrchr, strdup*/
-#include <unistd.h>   /* for getopt */
-
-/*int sspm_parse_mime(struct sspm_part *parts, 
-	       size_t max_parts,
-	       struct sspm_action_map *actions,
-	       char* (*get_string)(char *s, size_t size, void* data),
-	       void *get_string_data,
-	       struct sspm_header *first_header
-    );
-*/
-
-
-
-char* major_type_string[] = {
-    "TEXT",
-    "IMAGE",
-    "AUDIO",
-    "VIDEO",
-    "APPLICATION",
-    "MULTIPART",
-    "MESSAGE",
-    "UNKNOWN",
-    "NO"
-};
-
-char* minor_type_string[] = {
-    "ANY",
-    "PLAIN",
-    "RFC822",
-    "DIGEST",
-    "CALENDAR",
-    "MIXED",
-    "RELATED",
-    "ALTERNATIVE",
-    "PARALLEL",
-    "UNKNOWN",
-    "NO"
-};
-
-
-char* read_stream(char *s, size_t size, void *d)
-{
-    char *c = fgets(s,size, (FILE*)d);
-
-    return c;
-
-}
-
-
-int main(int argc, char* argv[]) {
-
-    FILE *f;
-    int c;
-    extern char *optarg;
-    extern int optind, optopt;
-    int errflg=0;
-    char* program_name;
-
-    struct options{
-	    int normal;
-	    int stress;
-	    int base64;
-	    int qp;
-	    int sleep;
-	    int count;
-	    char* input_file;
-    } opt;
-
-    memset(&opt,0,sizeof(opt));
-    
-    program_name = (char*)strrchr((char*)argv[0],'/');
-    program_name++;
-
-    while ((c = getopt(argc, argv, "nsbqi:S:c:")) != -1) {
-	switch (c) {
-	    case 'i': { /* Input comes from named file */
-		opt.input_file = strdup(optarg);
-		break;
-	    }
-	    case 'n':{ /* Normal */
-
-		if(opt.stress+opt.base64+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.normal = 1;
-		break;
-	    }
-	    case 's':{ /* Stress-test*/
-		if(opt.base64+opt.normal+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.stress = 1;
-		break;
-	    }
-	    case 'b':{ /* test base64 decoding*/
-		if(opt.stress+opt.normal+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.base64 = 1;
-		break;
-	    }
-	    case 'q':{ /* test quoted-printable decoding*/
-		if(opt.stress+opt.base64+opt.normal != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.qp = 1;
-		break;
-	    }
-	    case 'S':{ /* sleep at end of run */
-		opt.sleep = atoi(optarg);
-		break;
-	    }
-
-	    case 'c':{ /* number of iterations of stress test */
-		opt.count = atoi(optarg);
-		break;
-	    }
-	    
-	    case ':': {/* Option given without an operand */
-		fprintf(stderr,
-			"%s: Option -%c requires an operand\n", 
-			program_name,optopt);
-		errflg++;
-		break;
-	    }
-	    case '?': {
-		errflg++;
-	    }
-	}
-    }
-    
-    if (errflg >0){
-	fprintf(stderr,"Usage: %s [-n|-s|-b|-q] [-i input_file]\n",
-		program_name);
-	exit(1);
-    }
-    
-    if(opt.stress+opt.base64+opt.normal+opt.qp == 0){
-	fprintf(stderr,
-		"%s: Must have one of n,s,b or q\n",
-		program_name);
-    }
-    
-    if(opt.input_file){
-	f = fopen(opt.input_file,"r");
-	if (f == 0){
-	    fprintf(stderr,"Could not open input file \"%s\"\n",
-		    opt.input_file);
-	    exit(1);
-	}
-    } else {
-	f = stdin;
-    }
-	
- 	
-
-    if(opt.normal == 1){
-	icalcomponent *c;
-
-	c = icalmime_parse(read_stream,f);
-	
-	printf("%s\n",icalcomponent_as_ical_string(c));
-
-	icalcomponent_free(c);
-
-    }  else if (opt.stress==1 ){
-	/* Read file in by lines, then randomize the lines into a
-           string buffer */
-
-	char *array[1024];
-	char temp[1024];
-       	char *buf;
-	int i,last;
-	int size;
-	int non_rand;
-	int rand_lines;
-	int r;
-	int j;
-	icalcomponent *c;
-	struct slg_data {
-		char* pos;
-		char* str;
-	} d;
-    
-	for(i=0; !feof(f); i++){
-	    fgets(temp,1024,f);
-	    array[i] = strdup(temp);
-	    size += strlen(temp);
-	}
-	last = i;
- 
-	buf = malloc(size*2);
-	assert(buf != 0);
-	
-
-	for(j=0; j<opt.count; j++){
-
-	    srand(j);
-	    memset(buf,0,size*2);
-	    /* First insert some non-randomized lines */
-	    non_rand = ((float)rand()/(float)RAND_MAX) * last;
-	    for(i=0;i<non_rand;i++){
-		strcat(buf,array[i]);
-	    }
-	    
-	    /* Then, insert some lines at random */
-	    
-	    rand_lines = last - non_rand;
-	    
-	    for(i=0;i<rand_lines;i++){
-		srand(i);
-		r = ((float)rand()/(float)RAND_MAX) * rand_lines;
-		strcat(buf,array[r+non_rand]);
-		
-	    }
-
-	    d.pos = 0;
-	    d.str = buf;
-
-	    c = icalmime_parse(string_line_generator,&d);
-
-	    printf("%s\n",icalcomponent_as_ical_string(c));
-
-	    icalcomponent_free(c);
-	    
-	}
-
-	free(buf);
-
-	for(i=0; i<last; i++){
-	    free(array[i]);
-	}
-
-    } else if(opt.qp == 1){	
-	char str[4096];
-	char conv[4096];
-	
-	memset(str,0,4096);
-	
-	while(!feof(f) && fgets(str,4096,f)!=0){
-	    size_t size;
-	    
-	    size = strlen(str);
-	    memset(conv,0,4096);
-	    decode_quoted_printable(conv,str,&size);
-	    
-	    conv[size] = '\0';
-	    printf("%s",conv);
-	    memset(str,0,4096);
-	    
-	}
-    } else if (opt.base64 == 1) {
-	char str[4096];
-	char conv[4096];
-	
-	memset(str,0,4096);
-	
-	while(!feof(f) && fgets(str,4096,f)!=0){
-	    size_t size;
-	    
-	    size = strlen(str);
-	    memset(conv,0,4096);
-	    decode_base64(conv,str,&size);
-	    
-	    conv[size] = '\0';
-	    printf("%s",conv);
-	    memset(str,0,4096);
-	    
-	}
-    }
-
-    if (opt.sleep != 0){
-	sleep(opt.sleep);
-    }
-
-    if(	opt.input_file != 0){
-	free(opt.input_file);
-    }
-
-    icalmemory_free_ring();
-
-    return 0;
-
-}
-
-
-
-
-
-	
-	
-       
diff --git a/libical/src/test/testvcal.c b/libical/src/test/testvcal.c
deleted file mode 100644
index 4777162623..0000000000
--- a/libical/src/test/testvcal.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: vcal.c
-  CREATOR: eric 26 May 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include "icalvcal.h"
-#include <stdio.h>
-
-/* Given a vCal data file as its first argument, this program will
-   print out an equivalent iCal component. 
-
-   For instance: 
-
-       ./testvcal ../../test-data/user-cal.vcf
-
-*/
-
-int main(int argc, char* argv[])
-{
-    VObject *vcal = 0;
-    icalcomponent *comp;
-
-    vcal = Parse_MIME_FromFileName(argv[1]);
-    
-    assert(vcal != 0);
-
-    comp = icalvcal_convert(vcal);
-
-    printf("%s\n",icalcomponent_as_ical_string(comp));
-    
-    return 0;
-}           
-
-
diff --git a/libical/test-data/.cvsignore b/libical/test-data/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/libical/test-data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/libical/test-data/0 b/libical/test-data/0
deleted file mode 100644
index 9328d854eb..0000000000
--- a/libical/test-data/0
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-SUMMARY:Bastille Day Party This option indicates that xauth should attempt to break any authority file locks before proceeding.
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/1 b/libical/test-data/1
deleted file mode 100644
index 3670e54141..0000000000
--- a/libical/test-data/1
+++ /dev/null
@@ -1,39 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:"-//RDU Software//NONSGML HandCal//EN"
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTAR:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTAR;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference 
-Room 4350
-END:VEVENT
-END:VCALENDAR
-
diff --git a/libical/test-data/1.1 b/libical/test-data/1.1
deleted file mode 100644
index a7c92c33bd..0000000000
--- a/libical/test-data/1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BEGIN:VCALENDAR
-DURATION:P15DT5H0M20S
-DURATION:P7W
-URL;CN=John Smith:http://example.com/urivalue.html
-X-SKI-TITLE;RSVP=TRUE: This is an extension property
-SUMMARY:"No Property"
-SUMMARY;RSVP=TRUE;RSVP=FALSE:Calendaring Interoperability Planning Meeting
-SUMMARY;ALTREP=This is an xname:altrep
-SUMMARY;CUTYPE=DESCRIPTION is a keyword:Xname parameter
-DTEND:19990605
-DTSTART:19990605T103012
-CATEGORIES;RSVP=TRUE;RSVP=FALSE:one,two
-END:VCALENDAR
diff --git a/libical/test-data/2 b/libical/test-data/2
deleted file mode 100644
index 50ba609ab3..0000000000
--- a/libical/test-data/2
+++ /dev/null
@@ -1,22 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:xyz
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML 
- My Product//EN
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-ATTENDEE;RSVP=TRUE:MAILTO:jsmith@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/conf/bkgrnd.ps
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/2445.ics b/libical/test-data/2445.ics
deleted file mode 100644
index ce94e62e9f..0000000000
--- a/libical/test-data/2445.ics
+++ /dev/null
@@ -1,331 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-END:VCALENDAR
-
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-END:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//RDU Software//NONSGML HandCal//EN
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/libical/test-data/2446.ics b/libical/test-data/2446.ics
deleted file mode 100644
index 032276c3a8..0000000000
--- a/libical/test-data/2446.ics
+++ /dev/null
@@ -1,1004 +0,0 @@
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTART:19970701T200000Z
-DTSTAMP:19970611T190000Z
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-METHOD:CANCEL
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-COMMENT:DUKES forfeit the game
-SEQUENCE:2
-UID:0981234-1234234-23@example.com
-DTSTAMP:19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America-Chicago
-TZURL:http://zones.stds_r_us.net/tz/America-Chicago
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-ATTACH:http://www.dukes.com/
-CATEGORIES:SPORTS EVENT,ENTERTAINMENT
-CLASS:PRIVATE
-DESCRIPTION:MIDWAY STADIUM\n
- Big time game. MUST see.\n
- Expected duration:2 hours\n
-DTEND;TZID=America-Chicago:19970701T180000
-DTSTART;TZID=America-Chicago:19970702T160000
-DTSTAMP:19970614T190000Z
-STATUS:CONFIRMED
-LOCATION;VALUE=URI:http://www.midwaystadium.com/
-PRIORITY:2
-RESOURCES:SCOREBOARD
-SEQUENCE:3
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-RELATED-TO:0981234-1234234-14@example.com
-BEGIN:VALARM
-TRIGGER:-PT2H
-ACTION:DISPLAY
-DESCRIPTION:You should be leaving for the game now.
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-ACTION:AUDIO
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTAMP:19970614T190000Z
-UID:0981234-1234234-23@example.com
-DTSTART;VALUE=DATE:19970714
-RRULE:FREQ=YEARLY;INTERVAL=1
-SUMMARY: Bastille Day
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T2000000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE;
- CUTYPE=ROOM:Mailto:Conf@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTART:19970701T180000Z
-DTEND:19970701T190000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-DTSTAMP:19970613T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTART:19970701T190000Z
-DTEND:19970701T200000Z
-SUMMARY:Discuss the Merits of the election results
-LOCATION:Green Conference Room
-UID:calsrv.example.com-873970198738777a@example.com
-SEQUENCE:0
-DTSTAMP:19970611T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:COUNTER
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTART:19970701T160000Z
-DTEND:19970701T190000Z
-DTSTAMP:19970612T190000Z
-SUMMARY:Discuss the Merits of the election results
-LOCATION:Green Conference Room
-COMMENT:This time works much better and I think the big conference
-  room is too big
-UID:calsrv.example.com-873970198738777a@example.com
-SEQUENCE:0
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTAMP:19970613T190000Z
-DTSTART:19970701T160000Z
-DTEND:19970701T190000Z
-SUMMARY:Discuss the Merits of the election results - changed to
-  meet B's schedule
-LOCATION:Green Conference Room
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:DECLINECOUNTER
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-COMMENT:Sorry\, I cannot change this meeting time
-UID:calsrv.example.com-873970198738777@example.com
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-
- TO="Mailto:E@example.com":Mailto:C@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-
- TO="Mailto:E@example.com":Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-DTSTART:19970701T180000Z
-DTEND:19970701T200000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-DTSTAMP:19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=ACCEPTED;DELEGATED-
- FROM="Mailto:C@example.com":Mailto:E@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DELEGATED;
- DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
-COMMENT:Sorry\, I will be out of town at that time.
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DECLINED;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-SUMMARY:Phone Conference
-DTSTART:19970701T180000Z
-DTEND:19970701T200000Z
-DTSTAMP:19970614T200000Z
-COMMENT:DELEGATE (ATTENDEE Mailto:E@example.com) DECLINED YOUR
- INVITATION
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CANCEL
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-COMMENT:Mr. B cannot attend. It's raining. Lets cancel.
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CANCELLED
-DTSTAMP:19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CANCEL
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:mailto:B@example.com
-COMMENT:You're off the hook for this meeting
-UID:calsrv.example.com-873970198738777@example.com
-DTSTAMP:19970613T193000Z
-SEQUENCE:1
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-ATTENDEE;CUTYPE=ROOM:CR_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;
- RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T203000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T203000Z
-RRULE:FREQ=WEEKLY
-SUMMARY:Phone Conference
-UID:123456@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VFREEBUSY
-DTSTAMP:19980101T124100Z
-ORGANIZER:MAILTO:A@Example.com
-DTSTART:19980101T124200Z
-DTEND:19980107T124200Z
-FREEBUSY:19980101T180000Z/19980101T190000Z
-FREEBUSY:19980103T020000Z/19980103T050000Z
-FREEBUSY:19980107T020000Z/19980107T050000Z
-FREEBUSY:19980113T000000Z/19980113T010000Z
-FREEBUSY:19980115T190000Z/19980115T200000Z
-FREEBUSY:19980115T220000Z/19980115T230000Z
-FREEBUSY:19980116T013000Z/19980116T043000Z
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VFREEBUSY
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-DTSTAMP:19970613T190000Z
-DTSTART:19970701T080000Z
-DTEND:19970701T200000
-UID:calsrv.example.com-873970198738777@example.com
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE:Mailto:B@example.com
-DTSTART:19970701T080000Z
-DTEND:19970701T200000Z
-UID:calsrv.example.com-873970198738777@example.com
-FREEBUSY:19970701T090000Z/PT1H,19970701T140000Z/PT30M
-DTSTAMP:19970613T190030Z
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America-SanJose
-TZURL:http://zones.stds_r_us.net/tz/America-SanJose
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL:A@example.COM
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:B@example.fr
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:c@example.jp
-DTSTAMP:19970613T190030Z
-DTSTART;TZID=America-SanJose:19970701T140000
-DTEND;TZID=America-SanJose:19970701T150000
-RRULE:FREQ=WEEKLY;INTERVAL=20;WKST=SU;BYDAY=TU
-RDATE;TZID=America-SanJose:19970910T140000
-EXDATE;TZID=America-SanJose:19970909T140000
-EXDATE;TZID=America-SanJose:19971028T140000
-SUMMARY:Weekly Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-SEQUENCE:0
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1;UNTIL=19980901T210000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970601T210000Z
-DTEND:19970601T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970526T083000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1com
-RECURRENCE-ID:19970701T210000Z
-SEQUENCE:1
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970703T210000Z
-DTEND:19970703T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970626T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:CANCEL
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-RECURRENCE-ID:19970801T210000Z
-SEQUENCE:2
-STATUS:CANCELLED
-DTSTAMP:19970721T093000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:CANCEL
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DTSTAMP:19970721T103000Z
-STATUS:CANCELLED
-SEQUENCE:3
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-RECURRENCE-ID;RANGE=THISANDFUTURE:19970901T210000Z
-SEQUENCE:3
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Discussion
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970901T210000Z
-DTEND:19970901T220000Z
-LOCATION:Building 32\, Microsoft\, Seattle\, WA
-DTSTAMP:19970526T083000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:4
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970715T210000Z
-DTEND:19970715T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970629T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:0
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-LOCATION:The White Room
-DTSTAMP:19980301T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:7
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TH
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-DTSTAMP:19980303T193000Z
-LOCATION:The Usual conference room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:7
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU,TH
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-DTSTAMP:19980303T193000Z
-LOCATION:The White Room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:0
-RDATE:19980304T180000Z
-RDATE:19980311T180000Z
-RDATE:19980318T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980304T180000Z
-DTEND:19980304T200000Z
-DTSTAMP:19980303T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:1
-RECURRENCE-ID:19980311T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980311T160000Z
-DTEND:19980311T180000Z
-DTSTAMP:19980306T193000Z
-LOCATION:The Small conference room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:2
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980315T180000Z
-DTEND:19980315T200000Z
-DTSTAMP:19980307T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:2
-RDATE:19980304T180000Z
-RDATE:19980311T160000Z
-RDATE:19980315T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980304T180000Z
-DTEND:19980304T200000Z
-DTSTAMP:19980303T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-RECURRENCE-ID:19980311T160000Z
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980311T160000Z
-DTEND:19980304T180000Z
-DTSTAMP:19980306T193000Z
-ORGANIZER:Mailto:A@example.com
-LOCATION:The Small conference room
-UID:guid-1@host1.com
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:COUNTER
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-RECURRENCE-ID:19970715T210000Z
-SEQUENCE:4
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;RSVP=TRUE:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970715T220000Z
-DTEND:19970715T230000Z
-LOCATION:Conference Call
-COMMENT:May we bump this by an hour? I have a conflict
-DTSTAMP:19970629T094000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-SEQUENCE:0
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970601T210000Z
-DTEND:19970601T220000Z
-DTSTAMP:19970602T094000Z
-LOCATION:Conference Call
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-REQUEST-STATUS:2.8;Repeating event ignored. Scheduled as a single
-  event;RRULE
-REQUEST-STATUS:3.0;Invalid Property Name;FOO
-UID:guid-1@host1.com
-SEQUENCE:0
-DTSTAMP:19970603T094000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DTSTART:19970701T170000Z
-DUE:19970722T170000Z
-PRIORITY:1
-SUMMARY:Create the requirements document
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:0
-DTSTAMP:19970717T200000Z
-STATUS:Needs Action
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-COMMENT:I'll send you my input by e-mail
-SEQUENCE:0
-DTSTAMP:19970717T203000Z
-REQUEST-STATUS:2.0;Success
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-SUMMARY:Create the requirements document
-PRIORITY:1
-SEQUENCE:0
-STATUS:IN-PROCESS
-DTSTART:19970701T170000Z
-DTSTAMP:19970717T230000Z
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
-PERCENT-COMPLETE:75
-REQUEST-STATUS:2.0
-UID:calsrv.example.com-873970198738777-00@example.com
-DTSTAMP:19970717T233000Z
-SEQUENCE:0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE;PARTSTAT=COMPLETED:Mailto:D@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-REQUEST-STATUS:2.0
-DTSTAMP:19970717T233000Z
-SEQUENCE:0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;PARTSTAT=IN-PROCESS;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-DTSTART:19970701T170000Z
-DUE:19970722T170000Z
-PRIORITY:1
-SUMMARY:Create the requirements document
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:1
-DTSTAMP:19970718T100000Z
-STATUS:IN-PROGRESS
-PERCENT-COMPLETE:40
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR
-DTSTART:19980101T100000
-DUE:19980103T100000
-SUMMARY:Send Status Reports to Area Managers
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:0
-DTSTAMP:19970717T200000Z
-STATUS:NEEDS-ACTION
-PRIORITY:1
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
-PERCENT-COMPLETE:75
-UID:calsrv.example.com-873970198738777-00@example.com
-DTSTAMP:19970717T233000Z
-RECURRENCE-ID:19980101T170000Z
-SEQUENCE:1
-ORGANIZER:MAILTO:A@Example.com
-REQUEST-STATUS:2.0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VJOURNAL
-DTSTART:19971002T200000Z
-DTSTAMP:19971002T200000Z
-ORGANIZER:MAILTO:A@Example.com
-SUMMARY:Phone conference minutes
-DESCRIPTION:The editors meeting was held on October 1\, 1997.
-  Details are in the attached document.
-UID:0981234-1234234-2410@example.com
-RELATED-TO:0981234-1234234-2402-35@example.com
-ATTACH:ftp://ftp.example.com/pub/ed/minutes100197.txt
-END:VJOURNAL
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REFRESH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-UID: guid-1-12345@host1.com
-DTSTAMP:19970603T094000
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:acme-12345@host1.com
-SEQUENCE:3
-RRULE:FREQ=WEEKLY
-RDATE;VALUE=PERIOD:19970819T210000Z/199700819T220000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-DESCRIPTION:IETF-C&S Conference Call
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970801T210000Z
-DTEND:19970801T220000Z
-RECURRENCE-ID:19970809T210000Z
-DTSTAMP:19970726T083000
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REFRESH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-UID:acme-12345@host1.com
-DTSTAMP:19970603T094000
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/3 b/libical/test-data/3
deleted file mode 100644
index 008373ebfa..0000000000
--- a/libical/test-data/3
+++ /dev/null
@@ -1,21 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;VALUE=DATE-TIME:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-END:VCALENDAR
diff --git a/libical/test-data/4 b/libical/test-data/4
deleted file mode 100644
index 59c3d6917b..0000000000
--- a/libical/test-data/4
+++ /dev/null
@@ -1,23 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ: Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was 
- decided that the requirements need to be signed off by 
- product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays 
- and employee vacation time. Check with HR for specific 
- dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-END:VCALENDAR
diff --git a/libical/test-data/5 b/libical/test-data/5
deleted file mode 100644
index ba1fd09f7f..0000000000
--- a/libical/test-data/5
+++ /dev/null
@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//RDU Software//NONSGML HandCal//EN
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000/19980318T040000,19980318T030000/19980318T040000
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
-
-
-
diff --git a/libical/test-data/6 b/libical/test-data/6
deleted file mode 100644
index 753bd2b66c..0000000000
--- a/libical/test-data/6
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTART:19970701T200000Z
-DTSTAMP:19970611T190000Z
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/7 b/libical/test-data/7
deleted file mode 100644
index 0a255fc514..0000000000
--- a/libical/test-data/7
+++ /dev/null
@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/Makefile.am b/libical/test-data/Makefile.am
deleted file mode 100644
index c3475a9c31..0000000000
--- a/libical/test-data/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-EXTRA_DIST = \
-0 \
-1 \
-1.1 \
-2 \
-2445.ics \
-2446.ics \
-3 \
-4 \
-5 \
-6 \
-7 \
-smallcluster.ics \
-recur.txt \
-user-cal.vcf \
-complex-mime.txt \
-simple-mime.txt \
-stresstest.ics \
-classify.ics \
-incoming.ics \
-process-incoming.ics \
-calendar.ics \
-restriction.ics \
-overlaps.ics
-
-
diff --git a/libical/test-data/calendar.ics b/libical/test-data/calendar.ics
deleted file mode 100644
index 63b0a93838..0000000000
--- a/libical/test-data/calendar.ics
+++ /dev/null
@@ -1,47 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CREATE
-X-LIC-NOTE: #C1. Rescheduled by #I1\ and updated by #I2
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T190000Z
-DTEND:19970701T1930000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE: #C2. The test user is the organizer. 
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE;
- CUTYPE=ROOM:Mailto:Conf@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTART:19970701T180000Z
-DTEND:19970701T190000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:0
-DTSTAMP:19970613T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
diff --git a/libical/test-data/classify.ics b/libical/test-data/classify.ics
deleted file mode 100644
index c7c5a1e438..0000000000
--- a/libical/test-data/classify.ics
+++ /dev/null
@@ -1,43 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19960701T200000Z
-DTEND:19970701T200000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19950611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T200000Z
-SUMMARY:Conference in the park
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/complex-mime.txt b/libical/test-data/complex-mime.txt
deleted file mode 100644
index 32cb106dfd..0000000000
--- a/libical/test-data/complex-mime.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-From: foo1@example.com
-MIME-Version: 1.0
-To: foo2@example.com,foo3@example.com
-Subject: REQUEST - Phone Conference
-Content-Type:multipart/related;boundary="--FEE3790DC7E35189CA67CE2C"
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: multipart/alternative;
-  boundary="--00FEE3790DC7E35189CA67CE2C00"
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-When: 7/1/1997 10:00PM PDT- 7/1/97 10:30 PM PDT
-Where:
-Organizer: foo1@example.com
-Summary: Let's discuss the attached document
-
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII;
-  Component=vevent
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VEVENT
-ORGANIZER:foo1@example.com
-ATTENDEE;RSVP=3DTRUE;ROLE=3DREQ-PARTICIPANT;CUTYPE=3DGROUP:MAILTO:employe=
-e-A@host.com
-ATTENDEE;RSVP=3DTRUE;ROLE=3DREQ-PARTICIPANT;CUTYPE=3DGROUP:mailto:Employe=
-e-B@HOST.com
-ATTENDEE;RSVP=3DTRUE;ROLE=3DREQ-PARTICIPANT;CUTYPE=3DGROUP:MailTo:Eric@Ag=
-ony.Busboom.org
-DTSTAMP:19970611T190000Z
-DTSTART:19970621T170000Z
-DTEND:199706211T173000Z
-SUMMARY:Let's discuss the attached document
-UID:calsvr.example.com-873970198738777-8aa
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR                         
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII;
-  Component=vevent
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="event.vcs"
-
-QkVHSU46VkNBTEVOREFSClBST0RJRDotLy9BQ01FL0Rlc2t0b3BDYWxlbmRhci8vRU4KVkVS
-U0lPTjoyLjAKQkVHSU46VkVWRU5UCk9SR0FOSVpFUjpmb28xQGV4YW1wbGUuY29tCkFUVEVO
-REVFO1JTVlA9VFJVRTtST0xFPVJFUS1QQVJUSUNJUEFOVDtDVVRZUEU9R1JPVVA6TUFJTFRP
-OmVtcGxveWVlLUFAaG9zdC5jb20KQVRURU5ERUU7UlNWUD1UUlVFO1JPTEU9UkVRLVBBUlRJ
-Q0lQQU5UO0NVVFlQRT1HUk9VUDptYWlsdG86RW1wbG95ZWUtQkBIT1NULmNvbQpBVFRFTkRF
-RTtSU1ZQPVRSVUU7Uk9MRT1SRVEtUEFSVElDSVBBTlQ7Q1VUWVBFPUdST1VQOk1haWxUbzpF
-cmljQEFnb255LlF1YWxjb21tLmNvbQpEVFNUQU1QOjE5OTcwNjExVDE5MDAwMFoKRFRTVEFS
-VDoxOTk3MDYyMVQxNzAwMDBaCkRURU5EOjE5OTcwNjIxMVQxNzMwMDBaClNVTU1BUlk6TGV0
-J3MgZGlzY3VzcyB0aGUgYXR0YWNoZWQgZG9jdW1lbnQKVUlEOmNhbHN2ci5leGFtcGxlLmNv
-bS04NzM5NzAxOTg3Mzg3NzctOGFhClNFUVVFTkNFOjAKU1RBVFVTOkNPTkZJUk1FRApFTkQ6
-VkVWRU5UCkVORDpWQ0FMRU5EQVIK    
-
-
-----00FEE3790DC7E35189CA67CE2C00--
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: application/msword; name="FieldReport.doc"
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="FieldReport.doc"
-Content-ID: <calsvr.example.com-12345aaa>
-
-
-R0lGODdhTAQZAJEAAFVVVd3d3e4AAP///ywAAAAATAQZAAAC/5yPOSLhD6OctNqLs94XqAG
-4kiW5omm6sq27gvH8kzX9o1y+s73/g8MCofEovGITCoxKMbyCR16cNSq9YrNarfcrvdriIH
-5LL5jE6rxc3G+v2cguf0uv2Oz+v38L7/DxgoOKjURnjIIbe3yNjo+AgZWYVIWWl5iZnJY6J.
-
-----FEE3790DC7E35189CA67CE2C--
diff --git a/libical/test-data/incoming.ics b/libical/test-data/incoming.ics
deleted file mode 100644
index c598dfa6bf..0000000000
--- a/libical/test-data/incoming.ics
+++ /dev/null
@@ -1,168 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE: #I1. Reschedules C1
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T2000000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE: #I2. Updates C1
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T193000Z
-DTSTART:19970701T190000Z
-DTEND:19970701T1930000Z
-SUMMARY: Pool party
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE: #I2: This is an obsolete request\, otherwise identical to #I1
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE;
- CUTYPE=ROOM:Mailto:Conf@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTART:19960701T180000Z
-DTEND:19970701T190000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-DTSTAMP:19960613T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-X-LIC-NOTE: #I3: User B is accepting A's request\, #C2
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:1
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-X-LIC-NOTE: #I4: User C is rejecting A's request\, #C2
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=DECLINED:Mailto:C@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:1
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-X-LIC-NOTE: #I5: Crasher X is accepting A's request\, #C2
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:X@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:1
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-X-LIC-NOTE: #I6: Crasher Y is declining  A's request\, #C2
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=DECLINED:Mailto:Y@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:1
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CANCEL
-X-LIC-NOTE: #I7: Cancel #c1
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-COMMENT:Mr. B cannot attend. It's raining. Lets cancel.
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-UID:calsrv.example.com-873970198738777@example.com
-STATUS:CANCELLED
-DTSTAMP:19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:COUNTER
-X-LIC-NOTE: #I8. Counter to #C1. Changed DTEND to DURATION.
-VERSION:2.0
-BEGIN:VEVENT
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T190000Z
-DURATION:PT2H
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-SUMMARY:Conference
-COMMENT: I think the conference should be 2 hours long
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-END:VEVENT
-END:VCALENDAR
-
diff --git a/libical/test-data/overlaps.ics b/libical/test-data/overlaps.ics
deleted file mode 100644
index 57a5c57cc3..0000000000
--- a/libical/test-data/overlaps.ics
+++ /dev/null
@@ -1,32 +0,0 @@
-BEGIN:VEVENT
-DTSTART
- :20001104T150000
-DTEND
- :20001104T160000
-END:VEVENT
-
-BEGIN:VEVENT
-DTSTART
- :20001104T153000
-DTEND
- :20001104T163000
-END:VEVENT
-BEGIN:VEVENT
-DTSTART
- :20001104T160000
-DTEND
- :20001104T170000
-END:VEVENT
-BEGIN:VEVENT
-DTSTART
- :20001104T163000
-DTEND
- :20001104T173000
-END:VEVENT
-BEGIN:VEVENT
-DTSTART
- :20001104T170000
-DTEND
- :20001104T180000
-END:VEVENT
-
diff --git a/libical/test-data/process-incoming.ics b/libical/test-data/process-incoming.ics
deleted file mode 100644
index 5f66fb69c7..0000000000
--- a/libical/test-data/process-incoming.ics
+++ /dev/null
@@ -1,107 +0,0 @@
-BEGIN:VCALENDAR
-X-LIC-NOTE: Overlap with Slot 1\, 1200 to 1300\, should be delegated
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T030000Z
-DTSTART
- :19970701T120000Z
-DTEND
- :19970701T1300Z
-SUMMARY
- : Overlap  1
-UID
- :calsrv.example.com-873970198738703@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-X-LIC-NOTE: Overlap with Slot 2\, 1300 to 1400\, should be counterproposed
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T040000Z
-DTSTART
- :19970701T13000Z
-DTEND
- :19970701T140000Z
-SUMMARY
- :Overlap  2
-UID
- :calsrv.example.com-873970198738704@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-X-LIC-NOTE: Overlap with Slot 3\, 1400 to 1500\, should be declined
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T050000Z
-DTSTART
- :19970701T140000Z
-DTEND
- :19970701T150000Z
-SUMMARY
- :Overlap  3
-UID
- :calsrv.example.com-873970198738705@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/recur.txt b/libical/test-data/recur.txt
deleted file mode 100644
index 2020331993..0000000000
--- a/libical/test-data/recur.txt
+++ /dev/null
@@ -1,398 +0,0 @@
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19971215T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every day in January\, for 3 years
-DTSTART
- ;TZID=US-Eastern
- :19980101T090000
-RRULE
- :FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYMONTH=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Everyday in January\, for 3 years:
-DTSTART
- ;TZID=US-Eastern
- :19980101T090000
-RRULE
- :FREQ=DAILY;UNTIL=20000131T090000Z;INTERVAL=1;BYMONTH=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Weekly for 10 occurrences
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;COUNT=10;INTERVAL=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Weekly until December 24\, 1997
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every other week - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;INTERVAL=2
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Weekly on Tuesday and Thursday for 5 weeks:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;UNTIL=19971007T000000Z;INTERVAL=1;BYDAY=TU,TH
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Weekly on Tuesday and Thursday for 5 weeks:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;COUNT=10;INTERVAL=1;BYDAY=TU,TH
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every other week on Monday\, Wednesday and Friday until December 
- 24\,1997\, but starting on Tuesday\, September 2\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;BYDAY=MO,WE,FR;WKST=SU
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every other week on Tuesday and Thursday\, for 8 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=WEEKLY;COUNT=8;INTERVAL=2;BYDAY=TU,TH
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the 1st Friday for ten occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970905T090000
-RRULE
- :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYDAY=FR
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the 1st Friday until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970905T090000
-RRULE
- :FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=FR
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other month on the 1st and last Sunday of the month for 10 occurrences
- :
-DTSTART
- ;TZID=US-Eastern
- :19970907T090000
-RULE
- :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU'
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the second to last Monday of the month for 6 months:
-DTSTART
- ;TZID=US-Eastern
- :19970922T090000
-RRULE
- :FREQ=MONTHLY;COUNT=6;INTERVAL=1;BYDAY=MO
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the third to the last day of the month\, forever:
-DTSTART
- ;TZID=US-Eastern
- :19970928T090000
-RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=-3
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the 2nd and 15th of the month for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYMONTHDAY=2,15
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monthly on the first and last day of the month for 10 occurrences:\n
-DTSTART
- ;TZID=US-Eastern
- :19970930T090000
-RRULE
- :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYMONTHDAY=1,-1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 18 months on the 10th thru 15th of the month for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970910T090000
-RRULE
- :FREQ=MONTHLY;COUNT=10;INTERVAL=18;BYMONTHDAY=10,11,12,13,14,15
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every Tuesday\, every other month:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MONTHLY;INTERVAL=2;BYDAY=TH
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Yearly in June and July for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970610T090000
-RRULE
- :FREQ=YEARLY;COUNT=10;INTERVAL=1;BYMONTH=6,7
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other year on January\, February\, and March for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970310T090000
-RRULE
- :FREQ=YEARLY;COUNT=10;INTERVAL=2;BYMONTH=1,2,3
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 3rd year on the 1st\, 100th and 200th day for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970101T090000
-RRULE
- :FREQ=YEARLY;COUNT=10;INTERVAL=3;BYYEARDAY=1,100,200
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 20th Monday of the year\, forever:
-DTSTART
- ;TZID=US-Eastern
- :19970519T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=MO
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Monday of week number 20 (where the default start of the week is Monday)\, 
- forever:
-DTSTART
- ;TZID=US-Eastern
- :19970512T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=MO;BYWEEKNO=20
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every Thursday in March\, forever:
-DTSTART
- ;TZID=US-Eastern
- :19970313T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=TH;BYMONTH=3
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every Thursday\, but only during June\, July\, and August\, forever:
-DTSTART
- ;TZID=US-Eastern
- :19970605T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=TH;BYMONTH=6,7,8
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every Friday the 13th\, forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=FR;BYMONTHDAY=13
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :The first Saturday that follows the first Sunday of the month\,
-DTSTART
- ;TZID=US-Eastern
- :19970913T090000
-RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every four years\, the first Tuesday after a Monday in November\, 
- forever (U.S. Presidential Election day):
-DTSTART
- ;TZID=US-Eastern
- :19961105T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=4;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :The 3rd instance into the month of one of Tuesday\, Wednesday or 
- Thursday\, for the next 3 months:
-DTSTART
- ;TZID=US-Eastern
- :19970904T090000
-RRULE
- :FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=TU,WE,TH;BYSETPOS=3
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :The 2nd to last weekday of the month:
-DTSTART
- ;TZID=US-Eastern
- :19970929T090000
-RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 3 hours from 9:00 AM to 5:00 PM on a specific day:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=HOURLY;UNTIL=19970902T170000Z;INTERVAL=3
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 15 minutes for 6 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MINUTELY;COUNT=6;INTERVAL=15
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every hour and a half for 4 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MINUTELY;COUNT=4;INTERVAL=90
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 20 minutes from 9:00 AM to 4:40 PM every day:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=20;INTERVAL=1;BYMINUTE=0,20,40;BYHOUR=9,10,11,12,13,14,15,16
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 20 minutes from 9:00 AM to 4:40 PM every day:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=MINUTELY;COUNT=20;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :An example where the days generated makes a difference because of 
- WKST:
-DTSTART
- ;TZID=US-Eastern
- :19970805T090000
-RRULE
- :FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :An example where the days generated makes a difference because of 
- WKST. Changing only WKST from MO to SU yields different results...  
-DTSTART
- ;TZID=US-Eastern
- :19970805T090000
-RRULE
- :FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU
-END:VEVENT
diff --git a/libical/test-data/restriction.ics b/libical/test-data/restriction.ics
deleted file mode 100644
index b06493bbb3..0000000000
--- a/libical/test-data/restriction.ics
+++ /dev/null
@@ -1,49 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-METHOD: REQUEST
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-DURATION:PT15M
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-STATUS:TENTATIVE
-END:VEVENT
-END:VCALENDAR
-
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-METHOD: PUBLISHca
-BEGIN:VEVENT
-RECURRENCE-ID:19970701T210000Z
-RECURRENCE-ID:19970701T210000Z
-SEQUENCE:0 
-SEQUENCE:1
-CATEGORIES: A
-CATEGORIES: B
-CLASS: A
-CLASS: B
-ATTENDEE: BOB
-REQUEST-STATUS: 3.0
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-
- TO="Mailto:E@example.com":Mailto:C@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-DTSTAMP:19970611T190000Z
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/simple-mime.txt b/libical/test-data/simple-mime.txt
deleted file mode 100644
index aa7113a82f..0000000000
--- a/libical/test-data/simple-mime.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-From: foo1@example.com
-MIME-Version: 1.0
-To: foo2@example.com,foo3@example.com
-Subject: REQUEST - Phone Conference
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII;
-  Component=vevent
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:foo1@example.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970621T170000Z
-DTEND:199706211T173000Z
-SUMMARY:Let's discuss the attached document
-UID:calsvr.example.com-873970198738777-8aa
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/smallcluster.ics b/libical/test-data/smallcluster.ics
deleted file mode 100644
index 2902136bab..0000000000
--- a/libical/test-data/smallcluster.ics
+++ /dev/null
@@ -1,13 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-DTSTART
- :19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-RRULE:FREQ=YEARLY;UNTIL=123456T123456;BYSETPOS=-1,2,-3,4,-5,6,-7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,4,25,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,52,53,54;BYSECOND=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,4,25,26
-END:VEVENT
-END:VCALENDAR
-END:VCALENDAR
diff --git a/libical/test-data/stresstest.ics b/libical/test-data/stresstest.ics
deleted file mode 100644
index f64cf6bbc9..0000000000
--- a/libical/test-data/stresstest.ics
+++ /dev/null
@@ -1,178 +0,0 @@
-BEGIN:VCALENDAR
-ACTION:AUDIO
-ACTION:
-ACTION:~!@#$%^&*()_+}{:"<>?/.,
-ATTACH:ftp://ftp.example.com/~pub%eof/ed/minutes100197.txt
-ATTACH:http://www.dukes.com/
-ATTENDEE:MAILTO:john_doe@host.com
-ATTENDEE:;john_public@host2.com
-ATTENDEE:MAILTO:john_public@host2.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE;PARTSTAT=ACCEPTED;PARTSTAT=DECLINED:Mailto:B@example.com
-ATTENDEE;PARTSTAT=*&^*&:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;ROLE=ATTENDEE:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;RSVP=TRUE:Mailto:A@example.com
-ATTENDEE;ROLE=NONPARTICIPANT;RSVP=NO:Mailto:E@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:Bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb@example.com
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION;ANNIVERSARY,PERSONAL,SPECIAL OCCASION;ANNIVERSARY,PERSONAL,SPECIAL OCCASION;
-CATEGORIES;RSVP=TRUE;RSVP=FALSE:one,two
-CLASS:PUBLIC
-COMMENT:DELEGATE (ATTENDEE Mailto:E@example.com) DECLINED YOUR 
- DUKES forfeit the game 
- I'll send you my input by e-mail 
- May we bump this by an hour? I have a conflict 
- Mr. B cannot attend. It's raining. Lets cancel. 
-Sorry, I cannot change this meeting time
-Sorry, I will be out of town at that time.
-This iCalendar file contains busy time information for
-COMMENT:This time works much better and I think the big conference
-COMMENT:You're off the hook for this meeting
-CREATED:19980309T130000Z
-CREATED:19980309T130000
-CREATED:19980309T13000
-CREATED:19980309T1300
-CREATED:19980309T130
-CREATED:19980309T13
-CREATED:19980309T1
-CREATED:19980309T
-CREATED:19980309
-CREATED:1998030
-CREATED:199803
-CREATED:19980
-CREATED:1998
-CREATED:199
-CREATED:19
-CREATED:1
-CREATED:
-DTSTAMP:9999999T9999999X
-DTSTART:T103012
-DTSTART;VALUE=DATE:19970317
-DTSTART;VALUE=TIME:19970714
-DUE:19980415T235959
-DUE:19980415T235959
-DURATION:P15DT5H0M20S
-DURATION:P7W7W8w
-DURATION:PT15M
-DURATION:PT1H
-FREEBUSY:19970701T090000Z/PT1H,19970701T140000Z/PT30M,19980101T180000Z/19980101T190000Z,19980103T020000Z/19980103T050000Z,19980107T020000Z/19980107T050000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-FREEBUSY:19980318T030000Z/19980318T040000
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
-LOCATION;VALUE=URI:http://www.midwaystadium.com/
-METHOD:ADD
-METHOD:DESTROY
-METHOD:xyz
-METHOD:X-LIC-METHOD
-PERCENT-COMPLETE:40
-PERCENT-COMPLETE:.75
-PERCENT-COMPLETE:0
-PRIORITY:1
-PRIORITY:2
-PRIORITY:134645983456666098345624598726459872445897345987
-PRODID:"-//RDU Software//NONSGML HandCal//EN"
-PRODID:'-//ABC Corporation//NONSGML '
-PRODID:-//ABC Corporation;foo//NONSGML My Product//EN
-RDATE:19970406T020000
-RDATE:19971026T020000
-RDATE:19980304T180000Z
-RDATE:19980304T180000Z
-RDATE:19980311T160000Z
-RDATE:19980311T180000Z
-RDATE:19980315T180000Z
-RDATE:19980318T180000Z
-RDATE:19981025T020000
-RDATE:19981025T020000
-RDATE:19990404T020000
-RDATE:19990404T020000
-RDATE;VALUE=PERIOD:19970819T210000Z/199700819T220000Z
-RECURRENCE-ID:19970701T210000Z
-RECURRENCE-ID:19970715T210000Z
-RECURRENCE-ID:19970801T210000Z
-RECURRENCE-ID:19970809T210000Z
-RECURRENCE-ID:19980101T170000Z
-RECURRENCE-ID:19980311T160000Z
-RECURRENCE-ID:19980311T180000Z
-RECURRENCE-ID;RANGE=THISANDFUTURE:19970901T210000Z
-RELATED-TO:0981234-1234234-14@example.com
-RELATED-TO:0981234-1234234-2402-35@example.com
-REPEAT:2
-REPEAT:23
-REPEAT:4
-REPEAT:4
-REPEAT:4
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:2.8;Repeating event ignored. Scheduled as a single
-REQUEST-STATUS:3.0;Invalid Property Name;FOO
-RESOURCES:SCOREBOARD
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1;UNTIL=19980901T210000Z
-RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR
-RRULE:FREQ=WEEKLY
-RRULE:FREQ=WEEKLY
-RRULE:FREQ=WEEKLY;INTERVAL=20;WKST=SU;BYDAY=TU
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU
-RRULE:FREQ=YEARLY
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-RRULE:FREQ=YEARLY;INTERVAL=1
-RRULE:WKST=SU;BYDAY=TH;FREQ=WEEKLY
-RRULE:WKST=SU;BYDAY=TU,TH;FREQ=WEEKLY
-SCALE:GREGORIAN
-SEQUENCE:0
-SEQUENCE:.03486
-SEQUENCE:dflkjhfg
-SEQUENCE:
-SEQUENCE:7
-STATUS:CANCELLED
-STATUS:NEEDS-ACTION
-STATUS:Needs Action
-SUMMARY: Bastille Day
-SUMMARY:"No Property"
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-SUMMARY:1996 Income Tax Preparation
-SUMMARY:Annual Employee Review
-SUMMARY:Bastille Day Party
-SUMMARY:Calendaring Interoperability Planning Meeting
-SUMMARY:Calendaring Interoperability Planning Meeting
-SUMMARY;RSVP=TRUE;RSVP=FALSE:Calendaring Interoperability Planning Meeting
-TRANSP:TRANSPARENT
-TRIGGER:-P2D
-TRIGGER:-PT2H
-TRIGGER:-PT30M
-TRIGGER:-PT30M
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-TRIGGER;VALUE=DATE-TIME:19980403T120000
-TRIGGER;VALUE=DATE-TIME:19980403T120000Z
-TZID:America-Chicago
-TZID:America-SanJose
-TZNAME:PST
-TZOFFSETFROM:-0600
-TZOFFSETFROM:0700
-TZOFFSETFROM:4.56
-TZURL:http://zones.stds_r_us.net/tz/America-Chicago
-TZURL:http://zones.stds_r_us.net/tz/America-SanJose
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-UID:uid5@host1.com
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-VERSION:2.0
-VERSION:.0
-VERSION:2.0.0.0
-X-SKI-TITLE;RSVP=TRUE: This is an extension property
-END:VCALENDAR
\ No newline at end of file
diff --git a/libical/test-data/user-cal.vcf b/libical/test-data/user-cal.vcf
deleted file mode 100644
index 3cf005fa21..0000000000
--- a/libical/test-data/user-cal.vcf
+++ /dev/null
@@ -1,76 +0,0 @@
-BEGIN:VCALENDAR
-X-COMMENT: This file was contributed by Ola Lundqvist <olalu526@student.liu.se> 
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:CEST
-VERSION:1.1.4
-BEGIN:VEVENT
-UID:20000511T125528-23888-500-1-494
-SEQUENCE:-1
-DTSTART:20000530T150000
-DTEND:20000530T170000
-DCREATED:20000524T125250
-LAST-MODIFIED:20000524T125250
-SUMMARY:Omphalic for ataraxia
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-ORGNAME:ola
-X-PILOTID:4441126
-X-PILOTSTAT:0
-END:VEVENT
-
-BEGIN:VEVENT
-UID:20000511T125528-23888-500-1-492
-SEQUENCE:-1
-DTSTART:20000529T130000
-DTEND:20000529T130000
-DCREATED:20000524T125250
-LAST-MODIFIED:20000524T125250
-SUMMARY:Eurphrates et filistu
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-ORGNAME:ola
-X-PILOTID:4441124
-X-PILOTSTAT:0
-END:VEVENT
-
-BEGIN:VEVENT
-UID:20000524T125250-1004-500-1-13
-SEQUENCE:-1
-DTSTART:20000528T000000
-DTEND:20000528T235900
-DCREATED:20000524T125250
-LAST-MODIFIED:20000524T125250
-SUMMARY:Calaphgyian, napiform malefactors
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-ORGNAME:ola
-X-PILOTID:4441156
-X-PILOTSTAT:0
-END:VEVENT
-
-BEGIN:VEVENT
-UID:20000524T125250-1004-500-1-12
-SEQUENCE:-1
-DTSTART:20000527T150000
-DTEND:20000527T160000
-DCREATED:20000524T125250
-LAST-MODIFIED:20000524T125250
-SUMMARY: aphasiac puntildictus
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-ORGNAME:ola
-X-PILOTID:4441155
-X-PILOTSTAT:0
-END:VEVENT
-
-
-END:VCALENDAR
-
diff --git a/libversit/.cvsignore b/libversit/.cvsignore
deleted file mode 100644
index 36a99050c8..0000000000
--- a/libversit/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-vcc.c
-vcc.lo
-vobject.lo
-vcaltmp.lo
-libversit.la
\ No newline at end of file
diff --git a/libversit/Makefile.am b/libversit/Makefile.am
deleted file mode 100644
index 5d42636c1c..0000000000
--- a/libversit/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LTLIBRARIES = libversit.la
-
-libversit_la_SOURCES =	\
-	vcc.y		\
-	vcc.h		\
-	vobject.c	\
-	vobject.h	\
-	port.h		\
-	vcaltmp.c	\
-	vcaltmp.h
-
-EXTRA_DIST = README.TXT vcaltest.c vctest.c
-
-YFLAGS=-pversit_
diff --git a/libversit/README.TXT b/libversit/README.TXT
deleted file mode 100644
index c8ce8b0979..0000000000
--- a/libversit/README.TXT
+++ /dev/null
@@ -1,951 +0,0 @@
-NOTE: If you used the earlier APIs released by Versit

-then you will want to look at the document "migrate.doc"

-included with this package. It contains a discussion of

-the differences between the old API and this one.

-

-----------------------------------------------------------------

-

-The vCard/vCalendar C interface is implemented in the set 

-of files as follows:

-

-vcc.y, yacc source, and vcc.c, the yacc output you will use

-implements the core parser

-

-vobject.c implements an API that insulates the caller from

-the parser and changes in the vCard/vCalendar BNF

-

-port.h defines compilation environment dependent stuff

-

-vcc.h and vobject.h are header files for their .c counterparts

-

-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions

-which you may find useful.

-

-test.c is a standalone test driver that exercises some of

-the features of the APIs provided. Invoke test.exe on a

-VCARD/VCALENDAR input text file and you will see the pretty

-print output of the internal representation (this pretty print

-output should give you a good idea of how the internal 

-representation looks like -- there is one such output in the 

-following too). Also, a file with the .out suffix is generated 

-to show that the internal representation can be written back 

-in the original text format.

-

------------------------------------------------------------------

-			

-			  

-				VObject for VCard/VCalendar

-

-Table of Contents

-=================

-1. VObject

-2. Internal Representations of VCard/VCalendar

-3. Iterating Through VObject's Properties or Values

-4. Pretty Printing a VObject Tree

-5. Building A VObject Representation of A VCard/VCalendar

-6. Converting A VObject Representation Into Its Textual Representation

-7. Miscellaneous Notes On VObject APIs usages

-8. Brief descriptions of each APIs

-9. Additional Programming Notes.

-

-This document is mainly about the VObject and its APIs. The main

-use of a VObject is to represent a VCard or a VCalendar inside

-a program. However, its use is not limited to aforemention as it

-can represent an arbitrary information that makes up of a tree or

-forest of properties/values.

-

-1. VObject

-   =======

-A VObject can have a name (id) and a list of associated properties and

-a value. Each property is itself a VObject.

-

-2. Internal Representations of VCard/VCalendar

-   ===========================================

-A list of VCard or a VCalendar is represented by a list of VObjects.

-The name (id) of the VObjects in the list is either VCCardProp or

-VCCalProp. Each of these VObjects can have a list of properties.

-Since a property is represented as a VObject, each of these properties

-can have a name, a list of properties, and a value.

-

-For example, the input file "vobject.vcf":

-	

-BEGIN:VCARD

-N:Alden;Roland

-FN:Roland H. Alden

-ORG:AT&T;Versit Project Office

-TITLE:Consultant

-EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-EMAIL;INTERNET:ralden@sfgate.com

-EMAIL;MCIMail:242-2200

-LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111

-LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111=0A=

-U.S.A.

-TEL;WORK;PREF;MSG:+1 415 296 9106

-TEL;WORK;FAX:+1 415 296 9016

-TEL;MSG;CELL:+1 415 608 5981

-ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-SOUND:ROW-LAND H ALL-DIN

-LOGO;GIF;BASE64:

-    R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    QjExMSEhIRAQEO///87v9973/73n95zW71K13jGl1nvG50Kt3iGc1gCMzq3e94zO

-    7xCU1nO952O15wAAACwAAAAApgBOAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv

-    /8CgcEj8QTaeywWTyWCUno2kSK0KI5tLc8vtNi+WiHVMlj0mFK96nalsxOW4fPSw

-    cNj4tQc+7xcjGh4WExJTJYUTFkp3eU0eEH6RkpOUlTARhRoWm5ydFpCWoS0QEqAu

-    ARKaHRcVjV0borEoFl0cSre4Sq67FA+yvwAeTU8XHZ7HmxS6u2wVfMCVpAE3pJoW

-    ylrMptDcOqSF4OHg3eQ5pInInb7lcc86mNbLzBXsZbRfUOn6ucyNHvVWJHCpQFDf

-    MWwEEzLqx2YCQCqF3OnItClJNmYcJD7cSAKTuI/gtnEcOQKkyVIk6/+ds5CkFcMM

-    61LiENikwi1jBnNyuvUSjwWZOS5uIZarqNFcNl32XMMB6I06GgoJ+bZp1ZKeDl8E

-    +MC1K1cBIhZ4HUu2LAsCZdOWRQDt20lxIlccSHsgrNq7Xc/ixcsWmNu34WKyYJCW

-    gQjCe9XqTZy2L4pv04gg2sSKSc8OLgTcBSuWsdkVaD2TdXyiQxebFyjo1Gnx6tJm

-    LuaqrdtZtNfFtruSNmF5IKujwIsmJbjwtRqNJhrcNVw79wcRAgogmE4ArIjQzj/s

-    JvHAGCFDQR4UqigPK4sBe62XwO51OwADiMcqUG+iOdcFAL+hW20BfAoEexlwAnu6

-    mZDAXQ1EVh//WfhxJB5gIbHgwFgOTOiVAgOuVQKAfKFg3weGwSBYFZMp4hpDGKyA

-    3lgJKECWgiMQyBVpW+0V4oJjNfhCNkR1IgWEb21QlRK9GdfFCgeOZYBsXgm4noYj

-    GEBhAQHYh0J8XenoQnFGdrkUciJY6FUAK15ogozakcBhliKsyZWHDMZQ0wWC/Aim

-    DB6h01KRr/lXQgFxAqDcWDACgCZpUnrVQJtjwTnWjS6MWAYqqfDnSaEkJOlVXQBo

-    2pWTMUJ53WgAuPncCR9q6VQMAYjZlXWJmknCoSUM2p4BC+SaKwG88hoZlvfFMM4f

-    hQh5TXkv+RklWYtC91mopJIAKFkJlDAW/wF25ShnLbeo5gmQ+1FGkJdrKCuCi2OR

-    BuwHBcwqKgABrMtVAgpem61XkLbAJ7n8uiIpvGVhO4KpH1QLbbpqLheZvQCkGoNL

-    thSzSTg2UGVBBzbtaxwKsYrmgLvRAlCmWgwMAADD66rKAgR3XlGspcdkZYK8ibU7

-    asgEl+XAyB8I7PCqMWiWncGGimpfAgO4ypXSPpOVLwsRCDJxRD2AoyeRRv5kApO5

-    fXwzwvfOKLKtaTWtbQxccmGLTZy8xYlVSvXbhbk0M2YzrYfJJ0K8m+V9NgxpyC04

-    UycI/aiuiH9Y8NftDUwWp1Wm5UABnAUKwwRsPFGBt4Oc9PZvGvNLwf8JOZt8Arpe

-    eY23yDovwIDiBX74NAsPVLDJj3Hh4JEExsKcjrlKf9DsCVx3ZfLqAKBuG1s/A90C

-    z2KjYHjjyPOdG1spz6BBUr+BcUxUb1nDCTa/VZD2Uv+YkLPAKJC9dNEh7628WgqI

-    ybzlaA+ufxMa6bxC6ciLUQLcx5UGIAAsAkDA6wQkOxrcY39yo4cQMNWCAPTKV1R4

-    wPkgaBxzOc8FtMiF1NoGoXBRJjgoPApmPsjCFlbMdzCM4TFy50IXxI2DPcHAv2rY

-    gghsEIeu8CAPW6ABIPYEFkOsAeaMyIz0JfGJUExBBGRIRX0IMYovWCIT1eBELNpA

-    i1vcgta8iANPCIQOghzQABl30J0tXqBla4wjFLFQxZzAUY42CIAd5OYBCuKxB2c4

-    I0b28EcrQKADgmSKB9RYyDhA4BqCxIBqrtjIMTwoFeCjYSU3KZMQAAA7

-

-BEGIN:VCALENDAR

-DCREATED:19960523T100522

-PRODID:-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN

-VERSION:0.3

-BEGIN:VEVENT

-START:19960523T120000

-END:19960523T130000

-SUBTYPE:PHONE CALL

-SUMMARY:VERSIT PDI PR Teleconference/Interview

-DESCRIPTION:VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland

-END:VEVENT

-BEGIN:VEVENT

-START:19960523T113000

-END:19960523T115500

-SUBTYPE:LUNCH

-SUMMARY:Eat in the cafeteria today

-END:VEVENT

-END:VCALENDAR

-

-END:VCARD

-

-

-will conceptually be be represented as

-    vcard

-	VCNameProp

-	    VCFamilyNameProp=Alden

-	    VCGivenNameProp=Roland

-	VCFullNameProp=Roland H.Alden

-	....

-	

-note that

-    EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-will be represented as:

-	VCEmailAddress=sf!rincon!ralden@alden.attmail.com

-	    VCWork

-	    VCPreferred

-	    VCInternet

-where the lower level properties are properties of the property

-VCEmailAddress.

-

-Groupings are flattened out in the VObject representation such

-that:

-	a.b:blah

-	a.c:blahblah

-are represented as:

-	b=blah

-	    VCGrouping=a

-	c=blahblah

-	    VCGrouping=a

-i.e. one can read the above as:

-	 the property "b" has value "blah" and property "VCGrouping"

-		with the value "a".

-	 the property "c" has value "blahblah" and property "VCGrouping"

-		with the value "a".

-likewise, multi-level groupings are flatten similarly. e.g.

-	a.b.c:blah

-	a.b.e:blahblah

--->

-	c=blah

-	    VCGrouping=b

-		VCGrouping=a

-	e=blahblah

-	    VCGrouping=b

-		VCGrouping=a

-which read:

-	 the property "c" has value "blah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-	 the property "e" has value "blahblah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-

-3. Iterating Through VObject's Properties or Values

-   ================================================

-The following is a skeletal form of iterating through

-all properties of a vobject, o:

-

-    // assume the object of interest, o, is of type VObject

-    VObjectIterator i;

-    initPropIterator(&i,o);

-    while (moreIteration(&i)) {

-	VObject *each = nextVObject(&i);

-	// ... do something with "each" property 

-	}

-

-Use the API vObjectName() to access a VObject's name.

-Use the API vObjectValueType() to determine if a VObject has

-	a value. For VCard/VCalendar application, you

-	should not need this function as practically

-	all values are either of type VCVT_USTRINGZ or

-	VCVT_RAW (i.e set by setVObjectUStringZValue and

-	setVObjectAnyValue APIs respectively), and the

-	value returned by calls to vObjectUStringZValue

-	and vObjectAnyValue are 0 if a VObject has no

-	value. (There is a minor exception where VObject with

-	VCDataSizeProp has value that is set by

-	setVObjectLongValue).

-Use the APIs vObject???Value() to access a VObject's value.

-	where ??? is the expected type.

-Use the APIs setvObject???Value() to set or modify a VObject's value.

-	where ??? is the expected type.

-Use the API isAPropertyOf() to query if a name match the name of

-	a property of a VObject. Since isAPropertyOf() return

-	the matching property, we can use that to retrieve

-	a property and subsequently the value of the property.

-

-4. Pretty Printing a VObject Tree

-   ==============================

-VObject tree can be pretty printed with the printVObject() function.

-The output of pretty printing a VObject representation of the input

-test file "vobject.vcf" is shown below. Note that the indentation

-indicates the tree hirerarchy where the immediate children nodes

-of a parent node is all at the same indentation level and the

-immediate children nodes are the immediate properties of the

-associated parent nodes.  In the following, {N,FN,ORG,TITLE,...}

-are immediate properties of VCARD. {F and G} are properties of N

-with value {"Alden" and "Roland"} respectively; FN has no property

-but has the value "Roland H. Alden"; EMAIL has value and

-the properties WORK, PREF, and INTERNET.

-

-

-VCARD

-    N

-        F="Alden"

-        G="Roland"

-    FN="Roland H. Alden"

-    ORG

-        ORGNAME="AT&T"

-        OUN="Versit Project Office"

-    TITLE="Consultant"

-    EMAIL="sf!rincon!ralden@alden.attmail.com"

-        WORK

-        PREF

-        INTERNET

-    EMAIL="ralden@sfgate.com"

-        INTERNET

-    EMAIL="242-2200"

-        MCIMail

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111"

-        DOM

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111

-            U.S.A."

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    TEL="+1 415 296 9106"

-        WORK

-        PREF

-        MSG

-    TEL="+1 415 296 9016"

-        WORK

-        FAX

-    TEL="+1 415 608 5981"

-        MSG

-        CELL

-    ADR

-        EXT ADD="Suite 2208"

-        STREET="One Pine Street"

-        L="San Francisco"

-        R="CA"

-        PC="94111"

-        C="U.S.A."

-    SOUND="ROW-LAND H ALL-DIN"

-    LOGO=[raw data]

-        GIF

-        BASE64

-        DataSize=1482

-VCALENDAR

-    DCREATED="19960523T100522"

-    PRODID="-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN"

-    VERSION="0.3"

-    VEVENT

-        START="19960523T120000"

-        END="19960523T130000"

-        SUBTYPE="PHONE CALL"

-        SUMMARY="VERSIT PDI PR Teleconference/Interview"

-        DESCRIPTION="VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland"

-    VEVENT

-        START="19960523T113000"

-        END="19960523T115500"

-        SUBTYPE="LUNCH"

-        SUMMARY="Eat in the cafeteria today"

-

-5. Building A VObject Representation of A VCard/VCalendar

-   ======================================================

-The parser in vcc.y converts an input file with one or more

-VCard/VCalendar that is in their textual representation

-into their corresponding VObject representation.

-

-VObject representation of a VCard/VCalendar can also be built

-directly with calls to the VObject building APIs. e.g.

-

-	VObject *prop;

-	VObject *vcard = newVObject(VCCardProp);

-	prop = addProp(vcard,VCNameProp);

-		addPropValue(prop,VCFamilyNameProp,"Alden");

-		addPropValue(prop,VCGivenNameProp,"Roland");

-	addPropValue(vcard,VCFullNameProp,"Roland H. Alden");

-	....

-

-6. Converting A VObject Representation Into Its Textual Representation

-   ===================================================================

-The VObject representation can be converted back to its textual

-representation via the call to writeVObject() or writeMemVObject()

-API. e.g.

-   a. to write to a file:

-	// assume vcard is of type VObject

-	FILE *fp = fopen("alden.vcf","w");

-	writeVObject(fp,vcard);

-   a. to write to memory, and let the API allocate the required memory.

-	char* clipboard = writeVObject(0,0,vcard);

-	... do something to clipboard

-	free(clipboard);

-   b. to write to a user allocated buffer:

-	char clipboard[16384];

-	int len = 16384;

-	char *buf  = writeVObject(clipboard,&len,vcard);

-	... buf will be equal to clipboard if the write

-	is successful otherwise 0.

-

-In the case of writing to memory, the memory buffer can be either

-allocated by the API or the user. If the user allocate the

-memory for the buffer, then the length of the buffer needs to be

-communicated to the API via a variable. The variable passed as

-the length argument will be overwritten with the actual size

-of the text output. A 0 return value from writeMemVObject()

-indicates an error which could be caused by overflowing the

-size of the buffer or lack of heap memory.

-

-7. Miscellaneous Notes On VObject APIs usages

-   ==========================================

-a. vcc.h -- contains basic interfaces to the parser:

-    VObject* Parse_MIME(const char *input, unsigned long len);

-    VObject* Parse_MIME_FromFile(FILE *file);

-	-- both of this return a null-terminated list of

-	   VObject that is either a VCARD or VCALENDAR.

-	   To iterate through this list, do

-		VObject *t, *v;

-		v = Parse_Mime_FromFile(fp);

-		while (v) {

-		    // ... do something to v.

-		    t = v;

-		    v = nextVObjectInList(v);

-		    cleanVObject(t);

-		    }

-	    note that call to cleanVObject will release

-	    resource used to represent the VObject.

-

-b. vobject.h -- contains basic interfaces to the VObject APIs.

-	see the header for more details.

-	The structure of VObject is purposely (hiddened) not exposed

-	to the user. Every access has to be done via

-	the APIs. This way, if we need to change the

-	structure or implementation, the client need not

-	recompile as long as the interfaces remain the

-	same.

-

-c. values of a property is determined by the property definition

-	itself. The vobject APIs does not attempt to enforce

-	any of such definition. It is the consumer responsibility

-	to know what value is expected from a property. e.g

-	most properties have unicode string value, so to access

-	the value of these type of properties, you will use

-	the vObjectUStringZValue() to read the value and

-	setVObjectUStringZValue() to set or modify the value.

-	Refer to the VCard and VCalendar specifications for

-	the definition of each property.

-

-d. properties name (id) are case incensitive.

-

-8. Brief descriptions of each APIs

-   ===============================

-   * the predefined properties' names (id) are listed under vobject.h

-	each is of the form VC*Prop. e.g.

-		#define VC7bitProp		"7BIT"

-		#define VCAAlarmProp	"AALARM"

-		....

-

-   * consumer of a VObject can only define pointers to VObject.

-

-   * a variable of type VObjectIterator, say "i", can be used to iterate

-	through a VObject's properties, say "o". The APIs related to

-	VObjectIterator are:

-		void initPropIterator(VObjectIterator *i, VObject *o);

-			-- e.g. usage

-				initPropIterator(&i,o);

-		int moreIteration(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) { ... }

-		VObject* nextVObject(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) {

-				    VObject *each = nextVObject(&i);

-				    }

-

-    * VObject can be chained together to form a list. e.g. of such

-	use is in the parser where the return value of the parser is

-	a link list of VObject. A link list of VObject can be

-	built by:

-		void addList(VObject **o, VObject *p);

-	and iterated by

-		VObject* nextVObjectInList(VObject *o);

-			-- next VObjectInList return 0 if the list

-				is exhausted.

-

-    * the following APIs are mainly used to construct a VObject tree:

-	VObject* newVObject(const char *id);

-	    -- used extensively internally by VObject APIs but when

-		used externally, its use is mainly limited to the

-		construction of top level object (e.g. an object

-		with VCCardProp or VCCalendarProp id).

-	

-	void deleteVObject(VObject *p);

-	    -- to deallocate single VObject, for most user, use

-		cleanVObject(VObject *o) instead for freeing all

-		resources associated with the VObject.

-

-	char* dupStr(const char *s, unsigned int size);

-	    -- duplicate a string s. If size is 0, the string is

-		assume to be a null-terminated. 

-

-	void deleteStr(const char *p);

-	    -- used to deallocate a string allocated by dupStr();

-

-	void setVObjectName(VObject *o, const char* id);

-	    -- set the id of VObject o. This function is not

-		normally used by the user. The setting of id

-		is normally done as part of other APIs (e.g.

-		addProp()).

-

-	void setVObjectStringZValue(VObject *o, const char *s);

-	    -- set a string value of a VObject.

-

-	void setVObjectUStringZValue(VObject *o, const wchar_t *s);

-	    -- set a Unicode string value of a VObject.

-

-	void setVObjectIntegerValue(VObject *o, unsigned int i);

-	    -- set an integer value of a VObject.

-

-	void setVObjectLongValue(VObject *o, unsigned long l);

-	    -- set an long integer value of a VObject.

-

-	void setVObjectAnyValue(VObject *o, void *t);

-	    -- set any value of a VObject. The value type is

-		unspecified.

-

-	VObject* setValueWithSize(VObject *prop, void *val, unsigned int size);

-	    -- set a raw data (stream of bytes) value of a VObject

-		whose size is size. The internal VObject representation

-		is

-			this object = val

-			    VCDataSizeProp=size

-		i.e. the value val will be attached to the VObject prop

-		and a property of VCDataSize whose value is size

-		is also added to the object.

-		

-	void setVObjectVObjectValue(VObject *o, VObject *p);

-	    -- set a VObject as the value of another VObject.

-

-	const char* vObjectName(VObject *o);

-	    -- retrieve the VObject's Name (i.e. id).

-

-	const char* vObjectStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated string.

-

-	const wchar_t* vObjectUStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated unicode string.

-

-	unsigned int vObjectIntegerValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		integer.

-

-	unsigned long vObjectLongValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		long integer.

-

-	void* vObjectAnyValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		any value.

-

-	VObject* vObjectVObjectValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		a VObject.

-

-	VObject* addVObjectProp(VObject *o, VObject *p);

-	    -- add a VObject p as a property of VObject o.

-		(not normally used externally for building a

-		VObject).

-

-	VObject* addProp(VObject *o, const char *id);

-	    -- add a property whose name is id to VObject o.

-

-	VObject* addPropValue(VObject *o, const char *id, const char *v);

-	    -- add a property whose name is id and whose value

-		is a null-terminated string to VObject o.

-

-	VObject* addPropSizedValue(VObject *o, const char *id,

-			const char *v, unsigned int size);

-	    -- add a property whose name is id and whose value

-		is a stream of bytes of size size, to VObject o.

-

-	VObject* addGroup(VObject *o, const char *g);

-	    -- add a group g to VObject o.

-		e.g. if g is a.b.c, you will have

-		    o

-			c

-			   VCGroupingProp=b

-			       VCGroupingProp=a

-		and the object c is returned.

-		

-	VObject* isAPropertyOf(VObject *o, const char *id);

-	     -- query if a property by the name id is in o and

-		return the VObject that represent that property.

-

-	void printVObject(VObject *o);

-	     -- pretty print VObject o to stdout (for debugging use).

-

-	void writeVObject(FILE *fp, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to file.

-

-	char* writeMemVObject(char *s, int *len, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to memory. If s is 0, then memory required

-		to hold the textual representation will be allocated

-		by this API. If a variable len is passed, len will

-		be overwriten with the byte size of the textual

-		representation. If s is non-zero, then s has to

-		be a user allocated buffer whose size has be passed

-		in len as a variable. Memory allocated by the API

-		has to be freed with call to free. The return value

-		of this API is either the user supplied buffer,

-		the memory allocated by the API, or 0 (in case of

-		failure).

-

-	void cleanStrTbl();

-		-- this function has to be called when all

-		VObject has been destroyed.

-

-	void cleanVObject(VObject *o);

-		-- release all resources used by VObject o.

-

-	wchar_t* fakeUnicode(const char *ps, int *bytes);

-		-- convert char* to wchar_t*.

-

-	extern int uStrLen(const wchar_t *u);

-		-- length of unicode u.

-

-	char *fakeCString(const wchar_t *u);

-		-- convert wchar_t to CString (blindly assumes that

-		this could be done).

-

-9. Additional Programming Notes

-   ============================

-In the following notes, please refers to the listing

-of Example.vcf and its VObject Representation

-(shown at the end of this section).

-

-* Handling the Return Value of the VCard/VCalendar Parser

-    The example input text file contains two root VObjects

-    (a VCalendar and a VCard). The output of the VCard/VCalendar

-    parser is a null-terminated list of VObjects. For this

-    particular input file, the list will have two VObjects.

-    The following shows a template for iterating through the

-    output of the Parser:

-

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName("example.vcf");

-	while (v) {

-	    // currently, v will either be a VCard or a VCalendar

-	    //	do whatever your application need to do to

-	    //  v here ...

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-

-* Iterating Through a VCard/VCalendar VObject

-    From the VObject APIs point of view, a VCard VObject

-    is the same as a VCalendar VObject. However, the application

-    needs to know what are in a VCard or a VCalendar.

-    For example, A VCalendar VObject can have VCDCreatedProp,

-    a VCGEOLocationProp, etc, and one or more VCEventProp and

-    or VCTodoProp. The VCEventProp and VCTodoProp can have

-    many properties of their own, which in turn could have

-    more properties (e.g. VCDAlarmProp can be a VCEventProp

-    VObject's property, and VCRunTimeProp can be a

-    VCDAlarmProp VObject's property. Because a VObject tree

-    can be arbitrarily complex, in general, to process all

-    properties and values of a VObject tree, a recursive walk

-    is desirable. An example recursive VObject tree walk

-    can be found in the vobject.c source lines for printVObject*

-    and writeVObject* APIs. Depending on what the application need

-    to do with a VCard or a VCalendar, a recursive walk

-    of the VObject tree may or may not be desirable. An example

-    template of a non-recursive walk is shown below:

-	

-    void processVCardVCalendar(char *inputFile)

-    {

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName(inputFile);

-	while (v) {

-	    char *n = vObjectName(v);

-	    if (strcmp(n,VCCardProp) == 0) {

-		do_VCard(v);

-		}

-	    else if (strcmp(n,VCCalendarProp) == 0) {

-		do_VCalendar(v);

-		}

-	    else {

-		// don't know how to handle anything else!

-		}

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-    }

-

-    void  do_VCard(VObject *vcard)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCard VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCNameProp)==0) {

-		do_name(eachProp);

-		}

-	    else if (strcmp(n,VCEmailProp)==0) {

-		do_email(eachProp);

-		}

-	    else if (strcmp(n,VCLabelProp)==0) {

-		do_label(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void  do_VCalendar(VObject *vcal)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCalendar VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCDCreatedProp)==0) {

-		do_DCreated(eachProp);

-		}

-	    else if (strcmp(n,VCVersionProp)==0) {

-		do_Version(eachProp);

-		}

-	    else if (strcmp(n,VCTodoProp)==0) {

-		do_Todo(eachProp);

-		}

-	    else if (strcmp(n,VCEventProp)==0) {

-		do_Event(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void do_Todo(VObject *vtodo) { ... }

-

-    void do_Event(VObject *vevent) { ... }

-

-    ...

-    

-* Property's Values and Properties

-    The VObject APIs do not attempt to check for the

-    correctness of the values of a property. Nor do they

-    will prevent the user from attaching a non-VCard/VCalendar

-    standard property to a VCard/VCalendar property. Take

-    the example of line [11] of the example, "O.K" is not

-    a valid value of VCStatusProp.  It is up to the application

-    to accept or reject the value of a property.

-    

-* Output of printVObject

-    PrintVObject pretty prints a VObject tree in human

-    readable form. See the listing at the end of the file

-    for an example output of printVObject on the example

-    input file "Example.vcf".

-

-    Note that binary data are not shown in the output of

-    printVObject. Instead, a note is made ([raw data]) to

-    indicate that there exists such a binary data.

-

-* Note on Binary Data

-    When the value of a property is a binary data, it is only

-    useful to know the size of the binary data.

-

-    In the case of the VCard/VCalendar parser, it chooses

-    to represent the size information as a separate property

-    called VCDataSizeProp whose value is the size of the binary

-    data. The APIs sequence to construct the VObject subtree

-    of line [44] of Example.vcf is

-

-	    // VObject *vcard;

-	    VObject *p1 = addProp(vcard,VCLogoProp);

-	    (void) addProp(p1,VCGIFProp);

-	    (void) addProp(p1,VCBASE64Prop);

-	    VObject *p2 = addProp(p1,VCDataSizeProp);

-	    (void) setVObjectLongValue(p2,1482);

-	    setVObjectAnyValue(vcard,...pointer to binary data);

-	

-    Note the presence of VCBase64Prop will cause the

-    writeVObject API to output the binary data as BASE64 text.

-    For VCard/VCalendar application, having the VCBase64Prop

-    property is pratically always neccessary for property with

-    binary data as its value.

-	

-* Note on Quoted-Printable String

-    String value with embedded newline are written out as

-    quoted-prinatable string. It is therefore important

-    to mark a property with a string value that has

-    one or more embedded newlines, with the VCQutedPrintableProp

-    property. e.g.

-			

-	// VObject *root;

-	char *msg="To be\nor\nnot to be";

-	VObject *p = addPropValue(root,VCDescriptionProp,msg);

-	    // the following is how you mark a property with

-	    //	a property. In this case, the marker is

-	    //  VCQuotedPrintableProp

-	    addProp(p,VCQuotedPrintableProp);

-

-* Note on Unicode

-    Although, the current parser takes ASCII text file only,

-    string values are all stored as Unicode in the VObject tree.

-    For now, when using the VObject APIs to construct a

-    VObject tree, one should always convert ASCII string value

-    to a Unicode string value:

-

-	// VObject *root;

-	VObject *p = addProp(root,VCSomeProp);

-	setVObjectUStringZValue(p,fakeUnicode(someASCIIStringZvalue));

-

-    An API is provided to simplify the above process:

-

-	addPropValue(root,VCSomeProp,someASCIIStringZValue);

-

-    Note that someASCIISTringZValue is automatically converted to

-    Unicode by addPropValue API, where as, the former code

-    sequence do an explicit call to fakeUnicode.

-

-    To read back the value, one should use the vObjectUStringZValue

-    API not vObjectStringZValue API. The value returned by the

-    vObjectUStringZValue API is a Unicode string. If the application

-    do not know how to handle Unicode string, it can use the

-    fakeCString API to convert it back to ASCII string (as long

-    as the conversion is meaningful).

-

-    Note that fakeCString return a heap allocated memory. It is

-    important to call deleteStr on fakeCString return value if

-    it is not longer required (or there will be memory leak).

-

-    NOTE: Unfortunately, at the point when this document is written,

-    there is still no consensus on how Unicode is to be handled

-    in the textual representation of VCard/VCalendar. So, there

-    is no version of writeVObject and the parser to output and

-    input Unicode textual representation of VCard/VCalendar.

-   

-

-Example.vcf

------------

-line

-number Input Text (example.vcf)

------- ----------

-1      BEGIN:VCALENDAR

-2      DCREATED:19961102T100522

-3      GEO:0,0

-4      VERSION:1.0

-5      BEGIN:VEVENT

-6      DTSTART:19961103T000000

-7      DTEND:20000101T000000

-8      DESCRIPTION;QUOTED-PRINTABLE:To be =0A=

-9      or =0A=

-10     not to be

-11     STATUS:O.K.

-12     X-ACTION:No action required

-13     DALARM:19961103T114500;5;3;Enjoy

-14     MALARM:19970101T120000;;;johny@nowhere.com;Call Mom.

-15     END:VEVENT

-16

-17     BEGIN:VTODO

-18     DUE:19960614T0173000

-19     DESCRIPTION:Relex.

-20     END:VTODO

-21

-22     END:VCALENDAR

-23

-24     BEGIN:VCARD

-25     N:Alden;Roland

-26     FN:Roland H. Alden

-27     ORG:AT&T;Versit Project Office

-28     TITLE:Consultant

-29     EMAIL;WORK;PREF;INTERNET:ralden@ralden.com

-30     LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-31     Suite 2208=0A=

-32     One Pine Street=0A=

-33     San Francisco, CA 94111

-34     LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-35     Suite 2208=0A=

-36     One Pine Street=0A=

-37     San Francisco, CA 94111=0A=

-38     U.S.A.

-39     TEL;WORK;PREF;MSG:+1 415 296 9106

-40     TEL;WORK;FAX:+1 415 296 9016

-41     TEL;MSG;CELL:+1 415 608 5981

-42     ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-43     SOUND:ROW-LAND H ALL-DIN

-44     LOGO;GIF;BASE64:

-45         R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    ... 30 lines of BASE64 data not shown here.

-76     END:VCARD

-

-

-VObject Representation of Example.vcf:

--------------------------------------

-line

-in

-text

-file  VObject Tree as Printed by printVObject API

-----  -------------------------------------------

-1     VCALENDAR

-2         DCREATED="19961102T100522"

-3         GEO="0,0"

-4         VERSION="1.0"

-5         VEVENT

-6             DTSTART="19961103T000000"

-7             DTEND="20000101T000000"

-8             DESCRIPTION="To be

-9                     or

-10                    not to be"

-8                 QUOTED-PRINTABLE

-11            STATUS="O.K."

-12            X-ACTION="No action required"

-13            DALARM

-13                RUNTIME="19961103T114500"

-13                SNOOZETIME="5"

-13                REPEATCOUNT="3"

-13                DISPLAYSTRING="Enjoy"

-14            MALARM

-14                RUNTIME="19970101T120000"

-14                EMAIL="johny@nowhere.com"

-14                NOTE="Call Mom"

-17        VTODO

-18            DUE="19960614T0173000"

-19            DESCRIPTION="Relex."

-24    VCARD

-25        N

-25            F="Alden"

-25            G="Roland"

-26        FN="Roland H. Alden"

-27        ORG

-27            ORGNAME="AT&T"

-27            OUN="Versit Project Office"

-28        TITLE="Consultant"

-29        EMAIL="ralden@alden.com"

-29            WORK

-29            PREF

-29            INTERNET

-30        LABEL="Roland H. Alden

-31                Suite 2208

-32                One Pine Street

-33                San Francisco, CA 94111"

-30            DOM

-30            POSTAL

-30            PARCEL

-30            HOME

-30            WORK

-30            QUOTED-PRINTABLE

-34        LABEL="Roland H. Alden

-35                Suite 2208

-36                One Pine Street

-37                San Francisco, CA 94111

-38                U.S.A."

-34            POSTAL

-34            PARCEL

-34            HOME

-34            WORK

-34            QUOTED-PRINTABLE

-39        TEL="+1 415 296 9106"

-39            WORK

-39            PREF

-39            MSG

-40        TEL="+1 415 296 9016"

-40            WORK

-40            FAX

-41        TEL="+1 415 608 5981"

-41            MSG

-41            CELL

-42        ADR

-42            EXT ADD="Suite 2208"

-42            STREET="One Pine Street"

-42            L="San Francisco"

-42            R="CA"

-42            PC="94111"

-42            C="U.S.A."

-43        SOUND="ROW-LAND H ALL-DIN"

-44        LOGO=[raw data]

-44            GIF

-44            BASE64

-44            DATASIZE=1482

-

diff --git a/libversit/port.h b/libversit/port.h
deleted file mode 100644
index 1768beebd8..0000000000
--- a/libversit/port.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __PORT_H__
-#define __PORT_H__ 1
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-                     
-/* some of these #defines are commented out because */
-/* Visual C++ sets them on the compiler command line instead */
-
-/* #define _DEBUG */
-/* #define WIN32 */
-/* #define WIN16 */
-/* #define _WINDOWS */
-/* #define __MWERKS__ */
-/* #define INCLUDEMFC */
-
-#define	vCardClipboardFormat		"+//ISBN 1-887687-00-9::versit::PDI//vCard"
-#define	vCalendarClipboardFormat	"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
-
-/* The above strings vCardClipboardFormat and vCalendarClipboardFormat 
-are globally unique IDs which can be used to generate clipboard format 
-ID's as per the requirements of a specific platform. For example, in 
-Windows they are used as the parameter in a call to RegisterClipboardFormat. 
-For example:
-
-  CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
-
-*/
-
-#define vCardMimeType		"text/x-vCard"
-#define vCalendarMimeType	"text/x-vCalendar"
-
-#define DLLEXPORT(t) t
-
-#ifndef FALSE
-#define FALSE	0
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-#define stricmp strcasecmp
-	
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __PORT_H__ */
diff --git a/libversit/vcaltest.c b/libversit/vcaltest.c
deleted file mode 100644
index 5528aab1d1..0000000000
--- a/libversit/vcaltest.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-SUBTYPE:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-FILE *cfp;
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal, *vevent;
-#if _CONSOLE
-    cfp = stdout;
-#else
-    cfp = fopen("vcaltest.out","w");
-#endif
-    if (cfp == 0) return;
-    vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(cfp,vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	fprintf(cfp,"open output file '%s' failed\n", OUTFILE);
-	}
-    if (cfp != stdout) fclose(cfp);
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
diff --git a/libversit/vcaltmp.c b/libversit/vcaltmp.c
deleted file mode 100644
index ccb21a649a..0000000000
--- a/libversit/vcaltmp.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-This module provides some helper APIs for creating
-a VCalendar object.
-
-Note on APIs:
-	1.	The APIs does not attempt to verify if the arguments
-		passed are correct.
-	2.	Where the argument to an API is not applicable, pass
-		the value 0.
-	3.	See the test program at the bottom of this file as an
-		example of usage.
-	4.	This code calls APIs in vobject.c. 
-
-*/
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-	
-DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	)
-    {
-    VObject *vcal = newVObject(VCCalProp);
-#define Z(p,v) if (v) addPropValue(vcal,p,v);
-    Z(VCDCreatedProp, date_created);
-    Z(VCLocationProp, location)
-    Z(VCProdIdProp, product_id)
-    Z(VCTimeZoneProp, time_zone)
-    Z(VCVersionProp, version)
-#undef Z
-    return vcal;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vevent = addProp(vcal,VCEventProp);
-#define Z(p,v) if (v) addPropValue(vevent,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDTendProp,end_date_time);
-    if (description) {
-	VObject *p = addPropValue(vevent,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCCategoriesProp,categories);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCTranspProp,transparency);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vevent;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vtodo = addProp(vcal,VCTodoProp);
-#define Z(p,v) if (v) addPropValue(vtodo,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDueProp,due_date_time);
-    Z(VCCompletedProp,date_time_complete);
-    if (description) {
-	VObject *p = addPropValue(vtodo,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCPriorityProp,priority);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vtodo;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	)
-    {
-    VObject *aalarm= addProp(vevent,VCAAlarmProp);
-#define Z(p,v) if (v) addPropValue(aalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCAudioContentProp,audio_content);
-#undef Z
-    return aalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	)
-    {
-    VObject *malarm= addProp(vevent,VCMAlarmProp);
-#define Z(p,v) if (v) addPropValue(malarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCEmailAddressProp,email_address);
-    Z(VCNoteProp,note);
-#undef Z
-    return malarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	)
-    {
-    VObject *dalarm= addProp(vevent,VCDAlarmProp);
-#define Z(p,v) if (v) addPropValue(dalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCDisplayStringProp,display_string);
-#undef Z
-    return dalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	)
-    {
-    VObject *palarm= addProp(vevent,VCPAlarmProp);
-#define Z(p,v) if (v) addPropValue(palarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCProcedureNameProp,procedure_name);
-#undef Z
-    return palarm;
-    }
-
-    
-#ifdef _TEST
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-CATEGORIES:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    VObject *vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	printf("open output file '%s' failed\n", OUTFILE);
-	}
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
-#endif
-
-
-/* end of source file vcaltmp.c */
diff --git a/libversit/vcaltmp.h b/libversit/vcaltmp.h
deleted file mode 100644
index 4c4afde963..0000000000
--- a/libversit/vcaltmp.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#include "vcc.h"
-
-#ifndef __VCALTMP_H__
-#define __VCALTMP_H__
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-extern DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	);
-
-extern DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	);
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCALTMP_H__ */
-
-
diff --git a/libversit/vcc.h b/libversit/vcc.h
deleted file mode 100644
index 0e52034710..0000000000
--- a/libversit/vcc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __VCC_H__
-#define __VCC_H__ 1
-
-#include "vobject.h"
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef void (*MimeErrorHandler)(char *);
-
-extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
-
-extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
-extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
-
-
-/* NOTE regarding Parse_MIME_FromFile
-The function above, Parse_MIME_FromFile, comes in two flavors,
-neither of which is exported from the DLL. Each version takes
-a CFile or FILE* as a parameter, neither of which can be
-passed across a DLL interface (at least that is my experience).
-If you are linking this code into your build directly then
-you may find them a more convenient API that the other flavors
-that take a file name. If you use them with the DLL LIB you
-will get a link error.
-*/
-
-
-#if INCLUDEMFC
-extern VObject* Parse_MIME_FromFile(CFile *file);
-#else
-extern VObject* Parse_MIME_FromFile(FILE *file);
-#endif
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCC_H__ */
-
diff --git a/libversit/vcc.y b/libversit/vcc.y
deleted file mode 100644
index a8c7f2883e..0000000000
--- a/libversit/vcc.y
+++ /dev/null
@@ -1,1262 +0,0 @@
-%{
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,
-collectively, Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-The term Licensor shall mean any of the Licensors.
-
-Subject to acceptance of the following conditions, permission is hereby
-granted by Licensors without the need for written agreement and without
-license or royalty fees, to use, copy, modify and distribute this
-software for any purpose.
-
-The above copyright notice and the following four paragraphs must be
-reproduced in all copies of this software and any software including
-this software.
-
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
-MODIFICATIONS.
-
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
-disclosure by the government are subject to restrictions set forth in
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
-
-***************************************************************************/
-
-/*
- * src: vcc.c
- * doc: Parser for vCard and vCalendar. Note that this code is
- * generated by a yacc parser generator. Generally it should not
- * be edited by hand. The real source is vcc.y. The #line directives
- * can be commented out here to make it easier to trace through
- * in a debugger. However, if a bug is found it should
- * be fixed in vcc.y and this file regenerated.
- */
-
-
-/* debugging utilities */
-#if __DEBUG
-#define DBG_(x) printf x
-#else
-#define DBG_(x)
-#endif
-
-/****  External Functions  ****/
-
-/* assign local name to parser variables and functions so that
-   we can use more than one yacc based parser.
-*/
-
-#define yyparse mime_parse
-#define yylex mime_lex
-#define yyerror mime_error
-#define yychar mime_char
-/* #define p_yyval p_mime_val */
-#undef yyval
-#define yyval mime_yyval
-/* #define p_yylval p_mime_lval */
-#undef yylval
-#define yylval mime_yylval
-#define yydebug mime_debug
-#define yynerrs mime_nerrs
-#define yyerrflag mime_errflag
-#define yyss mime_ss
-#define yyssp mime_ssp
-#define yyvs mime_vs
-#define yyvsp mime_vsp
-#define yylhs mime_lhs
-#define yylen mime_len
-#define yydefred mime_defred
-#define yydgoto mime_dgoto
-#define yysindex mime_sindex
-#define yyrindex mime_rindex
-#define yygindex mime_gindex
-#define yytable mime_table
-#define yycheck mime_check
-#define yyname mime_name
-#define yyrule mime_rule
-#define YYPREFIX "mime_"
-
-
-#ifndef _NO_LINE_FOLDING
-#define _SUPPORT_LINE_FOLDING 1
-#endif
-
-/* undef below if compile with MFC */
-/* #define INCLUDEMFC 1 */
-
-#if defined(WIN32) || defined(_WIN32)
-#ifdef INCLUDEMFC
-#include <afx.h>
-#endif
-#endif
-
-#include <string.h>
-#ifndef __MWERKS__
-#include <malloc.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "vcc.h"
-
-static int yylex(void);
-static void yyerror(char *s);
-
-/****  Types, Constants  ****/
-
-#define YYDEBUG		1	/* 1 to compile in some debugging code */
-#define MAXTOKEN	256	/* maximum token (line) length */
-#define YYSTACKSIZE 	50	/* ~unref ? */
-#define MAXLEVEL	10	/* max # of nested objects parseable */
-				/* (includes outermost) */
-
-
-/****  Global Variables  ****/
-int mime_lineNum, mime_numErrors; /* yyerror() can use these */
-static VObject* vObjList;
-static VObject *curProp;
-static VObject *curObj;
-static VObject* ObjStack[MAXLEVEL];
-static int ObjStackTop;
-
-
-/* A helpful utility for the rest of the app. */
-#if __CPLUSPLUS__
-extern "C" {
-#endif
-
-    extern void Parse_Debug(const char *s);
-    extern void yyerror(char *s);
-
-#if __CPLUSPLUS__
-    };
-#endif
-
-int yyparse(void);
-
-enum LexMode {
-	L_NORMAL,
-	L_VCARD,
-	L_VCAL,
-	L_VEVENT,
-	L_VTODO,
-	L_VALUES,
-	L_BASE64,
-	L_QUOTED_PRINTABLE
-	};
-
-/****  Private Forward Declarations  ****/
-static int pushVObject(const char *prop);
-static VObject* popVObject(void);
-#ifndef _SUPPORT_LINE_FOLDING
-static char* lexDataFromBase64(void);
-#endif
-static void lexPopMode(int top);
-static int lexWithinMode(enum LexMode mode);
-static void lexPushMode(enum LexMode mode);
-static void enterProps(const char *s);
-static void enterAttr(const char *s1, const char *s2);
-#if 0
-static void enterValues(const char *value);
-#endif
-static void mime_error_(char *s);
- static void appendValue(const char *value);
-
-%}
-
-/***************************************************************************/
-/***                           The grammar                              ****/
-/***************************************************************************/
-
-%union {
-    char *str;
-    VObject *vobj;
-    }
-
-%token
-	EQ COLON DOT SEMICOLON SPACE HTAB LINESEP NEWLINE
-	BEGIN_VCARD END_VCARD BEGIN_VCAL END_VCAL
-	BEGIN_VEVENT END_VEVENT BEGIN_VTODO END_VTODO
-	ID
-
-/*
- * NEWLINE is the token that would occur outside a vCard,
- * while LINESEP is the token that would occur inside a vCard.
- */
-
-%token <str>
-	STRING ID
-
-%type <str> name value
-
-%type <vobj> vcard vcal vobject
-
-%start mime
-
-%%
-
-
-mime: vobjects
-	;
-
-vobjects: vobject
-	{ addList(&vObjList, $1); curObj = 0; }
-	vobjects
-	| vobject
-		{ addList(&vObjList, $1); curObj = 0; }
-	;
-
-vobject: vcard
-	| vcal
-	;
-
-vcard:
-	BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	items END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	| BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	;
-
-items: item items
-	| item
-	;
-
-item: prop COLON
-	{
-	lexPushMode(L_VALUES);
-	}
-	values LINESEP
-	{
-	if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
-	   lexPopMode(0);
-	lexPopMode(0);
-	}
-	| error
-	;
-
-prop: name
-	{
-	enterProps($1);
-	}
-	attr_params
-	| name
-	{
-	enterProps($1);
-	}
-	;
-
-attr_params: attr_param attr_params
-	| attr_param
-	;
-
-attr_param: SEMICOLON attr
-	;
-
-attr: name
-	{
-	enterAttr($1,0);
-	}
-	| name EQ name
-	{
-	enterAttr($1,$3);
-
-	}
-	;
-
-name: ID
-	;
-
-values: value SEMICOLON { appendValue($1); } values
-	| value
-	{ appendValue($1); }
-	;
-
-value: STRING
-	| { $$ = 0; }
-	;
-
-vcal:
-	BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	calitems
-	END_VCAL
-	{ $$ = popVObject(); }
-	| BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	END_VCAL
-	{ $$ = popVObject(); }
-	;
-
-calitems: calitem calitems
-	| calitem
-	;
-
-calitem:
-	eventitem
-	| todoitem
-	| items
-	;
-
-eventitem:
-	BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	items
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-todoitem:
-	BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	items
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-%%
-/* ///////////////////////////////////////////////////////////////////////// */
-static int pushVObject(const char *prop)
-    {
-    VObject *newObj;
-    if (ObjStackTop == MAXLEVEL)
-	return FALSE;
-
-    ObjStack[++ObjStackTop] = curObj;
-
-    if (curObj) {
-        newObj = addProp(curObj,prop);
-        curObj = newObj;
-	}
-    else
-	curObj = newVObject(prop);
-
-    return TRUE;
-    }
-
-
-/* ///////////////////////////////////////////////////////////////////////// */
-/* This pops the recently built vCard off the stack and returns it. */
-static VObject* popVObject()
-    {
-    VObject *oldObj;
-    if (ObjStackTop < 0) {
-	yyerror("pop on empty Object Stack\n");
-	return 0;
-	}
-    oldObj = curObj;
-    curObj = ObjStack[ObjStackTop--];
-
-    return oldObj;
-    }
-
-static void appendValue(const char *value)
-{
-  char *p1, *p2;
-  wchar_t *p3;
-  int i;
-
-  if (fieldedProp && *fieldedProp) {
-    if (value) {
-      addPropValue(curProp, *fieldedProp, value);
-    }
-    /* else this field is empty, advance to next field */
-    fieldedProp++;
-  } else {
-    if (value) {
-      if (vObjectUStringZValue(curProp)) {
-	p1 = fakeCString(vObjectUStringZValue(curProp));
-	p2 = malloc(sizeof(char *) * (strlen(p1)+strlen(value)+1));
-	strcpy(p2, p1);
-	deleteStr(p1);
-
-	i = strlen(p2);
-	p2[i] = ';';
-	p2[i+1] = '\0';
-	p2 = strcat(p2, value);
-	p3 = (wchar_t *) vObjectUStringZValue(curProp);
-	free(p3);
-	setVObjectUStringZValue_(curProp,fakeUnicode(p2,0));
-	deleteStr(p2);
-      } else {
-	setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
-      }
-    }
-  }
-  deleteStr(value);
-}
-
-#if 0
-static void enterValues(const char *value)
-    {
-    if (fieldedProp && *fieldedProp) {
-	if (value) {
-	    addPropValue(curProp,*fieldedProp,value);
-	    }
-	/* else this field is empty, advance to next field */
-	fieldedProp++;
-	}
-    else {
-	if (value) {
-	    setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
-	    }
-	}
-    deleteStr(value);
-    }
-#endif
-
-static void enterProps(const char *s)
-    {
-    curProp = addGroup(curObj,s);
-    deleteStr(s);
-    }
-
-static void enterAttr(const char *s1, const char *s2)
-    {
-    const char *p1, *p2 = NULL;
-    p1 = lookupProp_(s1);
-    if (s2) {
-	VObject *a;
-	p2 = lookupProp_(s2);
-	a = addProp(curProp,p1);
-	setVObjectStringZValue(a,p2);
-	}
-    else
-	addProp(curProp,p1);
-    if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
-	lexPushMode(L_BASE64);
-    else if (stricmp(p1,VCQuotedPrintableProp) == 0
-	    || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
-	lexPushMode(L_QUOTED_PRINTABLE);
-    deleteStr(s1); deleteStr(s2);
-    }
-
-
-#define MAX_LEX_LOOKAHEAD_0 32
-#define MAX_LEX_LOOKAHEAD 64
-#define MAX_LEX_MODE_STACK_SIZE 10
-#define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
-
-struct LexBuf {
-	/* input */
-#ifdef INCLUDEMFC
-    CFile *inputFile;
-#else
-    FILE *inputFile;
-#endif
-    char *inputString;
-    unsigned long curPos;
-    unsigned long inputLen;
-	/* lookahead buffer */
-	/*   -- lookahead buffer is short instead of char so that EOF
-	 /      can be represented correctly.
-	*/
-    unsigned long len;
-    short buf[MAX_LEX_LOOKAHEAD];
-    unsigned long getPtr;
-	/* context stack */
-    unsigned long lexModeStackTop;
-    enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
-	/* token buffer */
-    unsigned long maxToken;
-    char *strs;
-    unsigned long strsLen;
-    } lexBuf;
-
-static void lexPushMode(enum LexMode mode)
-    {
-    if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
-	yyerror("lexical context stack overflow");
-    else {
-	lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
-	}
-    }
-
-static void lexPopMode(int top)
-    {
-    /* special case of pop for ease of error recovery -- this
-	version will never underflow */
-    if (top)
-	lexBuf.lexModeStackTop = 0;
-    else
-	if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
-    }
-
-static int lexWithinMode(enum LexMode mode) {
-    unsigned long i;
-    for (i=0;i<lexBuf.lexModeStackTop;i++)
-	if (mode == lexBuf.lexModeStack[i]) return 1;
-    return 0;
-    }
-
-static char lexGetc_()
-    {
-    /* get next char from input, no buffering. */
-    if (lexBuf.curPos == lexBuf.inputLen)
-	return EOF;
-    else if (lexBuf.inputString)
-	return *(lexBuf.inputString + lexBuf.curPos++);
-    else {
-#ifdef INCLUDEMFC
-	char result;
-	return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
-#else
-	return fgetc(lexBuf.inputFile);
-#endif
-	}
-    }
-
-static int lexGeta()
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
-    }
-
-static int lexGeta_(int i)
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
-    }
-
-static void lexSkipLookahead() {
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* don't skip EOF. */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    }
-
-static int lexLookahead() {
-    int c = (lexBuf.len)?
-	lexBuf.buf[lexBuf.getPtr]:
-	lexGeta();
-    /* do the \r\n -> \n or \r -> \n translation here */
-    if (c == '\r') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
-	    lexGeta_(1);
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = c = '\n';
-	}
-    else if (c == '\n') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[lexBuf.getPtr+1]:
-	    lexGeta_(1);
-	if (a == '\r') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = '\n';
-	}
-    return c;
-    }
-
-static int lexGetc() {
-    int c = lexLookahead();
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* EOF will remain in lookahead buffer */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    return c;
-    }
-
-static void lexSkipLookaheadWord() {
-    if (lexBuf.strsLen <= lexBuf.len) {
-	lexBuf.len -= lexBuf.strsLen;
-	lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
-	}
-    }
-
-static void lexClearToken()
-    {
-    lexBuf.strsLen = 0;
-    }
-
-static void lexAppendc(int c)
-    {
-    lexBuf.strs[lexBuf.strsLen] = c;
-    /* append up to zero termination */
-    if (c == 0) return;
-    lexBuf.strsLen++;
-    if (lexBuf.strsLen >= lexBuf.maxToken) {
-	/* double the token string size */
-	lexBuf.maxToken <<= 1;
-	lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
-	}
-    }
-
-static char* lexStr() {
-    return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
-    }
-
-static void lexSkipWhite() {
-    int c = lexLookahead();
-    while (c == ' ' || c == '\t') {
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    }
-
-static char* lexGetWord() {
-    int c;
-    lexSkipWhite();
-    lexClearToken();
-    c = lexLookahead();
-    while (c != EOF && !strchr("\t\n ;:=",c)) {
-	lexAppendc(c);
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    return lexStr();
-    }
-
-#if 0
-static void lexPushLookahead(char *s, int len) {
-    int putptr;
-    if (len == 0) len = strlen(s);
-    putptr = (int)lexBuf.getPtr - len;
-    /* this function assumes that length of word to push back
-     /  is not greater than MAX_LEX_LOOKAHEAD.
-     */
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    while (*s) {
-	lexBuf.buf[putptr] = *s++;
-	putptr = (putptr + 1) % MAX_LEX_LOOKAHEAD;
-	}
-    lexBuf.len += len;
-    }
-#endif
-
-static void lexPushLookaheadc(int c) {
-    int putptr;
-    /* can't putback EOF, because it never leaves lookahead buffer */
-    if (c == EOF) return;
-    putptr = (int)lexBuf.getPtr - 1;
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    lexBuf.buf[putptr] = c;
-    lexBuf.len += 1;
-    }
-
-static char* lexLookaheadWord() {
-    /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
-     /  and thing bigger than that will stop the lookahead and return 0;
-     / leading white spaces are not recoverable.
-     */
-    int c;
-    int len = 0;
-    int curgetptr = 0;
-    lexSkipWhite();
-    lexClearToken();
-    curgetptr = (int)lexBuf.getPtr;	/* remember! */
-    while (len < (MAX_LEX_LOOKAHEAD_0)) {
-	c = lexGetc();
-	len++;
-	if (c == EOF || strchr("\t\n ;:=", c)) {
-	    lexAppendc(0);
-	    /* restore lookahead buf. */
-	    lexBuf.len += len;
-	    lexBuf.getPtr = curgetptr;
-	    return lexStr();
-	    }
-        else
-	    lexAppendc(c);
-	}
-    lexBuf.len += len;	/* char that has been moved to lookahead buffer */
-    lexBuf.getPtr = curgetptr;
-    return 0;
-    }
-
-#ifdef _SUPPORT_LINE_FOLDING
-static void handleMoreRFC822LineBreak(int c) {
-    /* suport RFC 822 line break in cases like
-     *	ADR: foo;
-     *    morefoo;
-     *    more foo;
-     */
-    if (c == ';') {
-	int a;
-	lexSkipLookahead();
-	/* skip white spaces */
-	a = lexLookahead();
-	while (a == ' ' || a == '\t') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    }
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		/* continuation, throw away all the \n and spaces read so
-		 * far
-		 */
-		lexSkipWhite();
-		lexPushLookaheadc(';');
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		lexPushLookaheadc(';');
-		}
-	    }
-	else {
-	    lexPushLookaheadc(';');
-	    }
-	}
-    }
-
-static char* lexGet1Value() {
-    int c;
-    lexSkipWhite();
-    c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && c != ';') {
-	if (c == '\n') {
-	    int a;
-	    lexSkipLookahead();
-	    a  = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		lexAppendc(' ');
-		lexSkipLookahead();
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		break;
-		}
-	    }
-	else {
-	    lexAppendc(c);
-	    lexSkipLookahead();
-	    }
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    handleMoreRFC822LineBreak(c);
-    return c==EOF?0:lexStr();
-    }
-#endif
-
-#ifndef _SUPPORT_LINE_FOLDING
-static char* lexGetStrUntil(char *termset) {
-    int c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && !strchr(termset,c)) {
-	lexAppendc(c);
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    return c==EOF?0:lexStr();
-    }
-#endif
-
-static int match_begin_name(int end) {
-    char *n = lexLookaheadWord();
-    int token = ID;
-    if (n) {
-	if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-	else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-	else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-	else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
-	deleteStr(n);
-	return token;
-	}
-    return 0;
-    }
-
-
-#ifdef INCLUDEMFC
-static void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
-#else
-static void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
-#endif
-    {
-    /* initialize lex mode stack */
-    lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
-
-    /* iniatialize lex buffer. */
-    lexBuf.inputString = (char*) inputstring;
-    lexBuf.inputLen = inputlen;
-    lexBuf.curPos = 0;
-    lexBuf.inputFile = inputfile;
-
-    lexBuf.len = 0;
-    lexBuf.getPtr = 0;
-
-    lexBuf.maxToken = MAXTOKEN;
-    lexBuf.strs = (char*)malloc(MAXTOKEN);
-    lexBuf.strsLen = 0;
-
-    }
-
-static void finiLex() {
-    free(lexBuf.strs);
-    }
-
-
-/* ///////////////////////////////////////////////////////////////////////// */
-/* This parses and converts the base64 format for binary encoding into
- * a decoded buffer (allocated with new).  See RFC 1521.
- */
-static char * lexGetDataFromBase64()
-    {
-    unsigned long bytesLen = 0, bytesMax = 0;
-    int quadIx = 0, pad = 0;
-    unsigned long trip = 0;
-    unsigned char b;
-    int c;
-    unsigned char *bytes = NULL;
-    unsigned char *oldBytes = NULL;
-
-    DBG_(("db: lexGetDataFromBase64\n"));
-    while (1) {
-	c = lexGetc();
-	if (c == '\n') {
-	    ++mime_lineNum;
-	    if (lexLookahead() == '\n') {
-		/* a '\n' character by itself means end of data */
-		break;
-		}
-	    else continue; /* ignore '\n' */
-	    }
-	else {
-	    if ((c >= 'A') && (c <= 'Z'))
-		b = (unsigned char)(c - 'A');
-	    else if ((c >= 'a') && (c <= 'z'))
-		b = (unsigned char)(c - 'a') + 26;
-	    else if ((c >= '0') && (c <= '9'))
-		b = (unsigned char)(c - '0') + 52;
-	    else if (c == '+')
-		b = 62;
-	    else if (c == '/')
-		b = 63;
-	    else if (c == '=') {
-		b = 0;
-		pad++;
-	    } else if ((c == ' ') || (c == '\t')) {
-		continue;
-	    } else { /* error condition */
-		if (bytes) free(bytes);
-		else if (oldBytes) free(oldBytes);
-		/* error recovery: skip until 2 adjacent newlines. */
-		DBG_(("db: invalid character 0x%x '%c'\n", c,c));
-		if (c != EOF)  {
-		    c = lexGetc();
-		    while (c != EOF) {
-			if (c == '\n' && lexLookahead() == '\n') {
-			    ++mime_lineNum;
-			    break;
-			    }
-			c = lexGetc();
-			}
-		    }
-		return NULL;
-		}
-	    trip = (trip << 6) | b;
-	    if (++quadIx == 4) {
-		unsigned char outBytes[3];
-		int numOut;
-		int i;
-		for (i = 0; i < 3; i++) {
-		    outBytes[2-i] = (unsigned char)(trip & 0xFF);
-		    trip >>= 8;
-		    }
-		numOut = 3 - pad;
-		if (bytesLen + numOut > bytesMax) {
-		    if (!bytes) {
-			bytesMax = 1024;
-			bytes = (unsigned char*)malloc((size_t)bytesMax);
-			}
-		    else {
-			bytesMax <<= 2;
-			oldBytes = bytes;
-			bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);
-			}
-		    if (bytes == 0) {
-			mime_error("out of memory while processing BASE64 data\n");
-			}
-		    }
-		if (bytes) {
-		    memcpy(bytes + bytesLen, outBytes, numOut);
-		    bytesLen += numOut;
-		    }
-		trip = 0;
-		quadIx = 0;
-		}
-	    }
-	} /* while */
-    DBG_(("db: bytesLen = %d\n",  bytesLen));
-    /* kludge: all this won't be necessary if we have tree form
-	representation */
-    if (bytes) {
-	setValueWithSize(curProp,bytes,(unsigned int)bytesLen);
-	free(bytes);
-	}
-    else if (oldBytes) {
-	setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);
-	free(oldBytes);
-	}
-    return 0;
-    }
-
-static int match_begin_end_name(int end) {
-    int token;
-    lexSkipWhite();
-    if (lexLookahead() != ':') return ID;
-    lexSkipLookahead();
-    lexSkipWhite();
-    token = match_begin_name(end);
-    if (token == ID) {
-	lexPushLookaheadc(':');
-	DBG_(("db: ID '%s'\n", yylval.str));
-	return ID;
-	}
-    else if (token != 0) {
-	lexSkipLookaheadWord();
-	deleteStr(yylval.str);
-	DBG_(("db: begin/end %d\n", token));
-	return token;
-	}
-    return 0;
-    }
-
-static char* lexGetQuotedPrintable()
-    {
-    char cur;
-
-    lexClearToken();
-    do {
-	cur = lexGetc();
-	switch (cur) {
-	    case '=': {
-		int c = 0;
-		int next[2];
-		int i;
-		for (i = 0; i < 2; i++) {
-		    next[i] = lexGetc();
-		    if (next[i] >= '0' && next[i] <= '9')
-			c = c * 16 + next[i] - '0';
-		    else if (next[i] >= 'A' && next[i] <= 'F')
-			c = c * 16 + next[i] - 'A' + 10;
-		    else
-			break;
-		    }
-		if (i == 0) {
-		    /* single '=' follow by LINESEP is continuation sign? */
-		    if (next[0] == '\n') {
-			++mime_lineNum;
-			}
-		    else {
-			lexPushLookaheadc('=');
-			goto EndString;
-			}
-		    }
-		else if (i == 1) {
-		    lexPushLookaheadc(next[1]);
-		    lexPushLookaheadc(next[0]);
-		    lexAppendc('=');
-		} else {
-		    lexAppendc(c);
-		    }
-		break;
-		} /* '=' */
-	    case '\n':
-	    case ';':
-	      {
-		lexPushLookaheadc(cur);
-		goto EndString;
-		}
-	    case (char)EOF:
-		break;
-	    default:
-		lexAppendc(cur);
-		break;
-	    } /* switch */
-	} while (cur != (char)EOF);
-
-EndString:
-    lexAppendc(0);
-    return lexStr();
-    } /* LexQuotedPrintable */
-
-static int yylex() {
-    int lexmode = LEXMODE();
-    if (lexmode == L_VALUES) {
-	int c = lexGetc();
-	if (c == ';') {
-	    DBG_(("db: SEMICOLON\n"));
-	    lexPushLookaheadc(c);
-#ifdef _SUPPORT_LINE_FOLDING
-	    handleMoreRFC822LineBreak(c);
-#endif
-	    lexSkipLookahead();
-	    return SEMICOLON;
-	    }
-	else if (strchr("\n",c)) {
-	    ++mime_lineNum;
-	    /* consume all line separator(s) adjacent to each other */
-	    c = lexLookahead();
-	    while (strchr("\n",c)) {
-		lexSkipLookahead();
-		c = lexLookahead();
-		++mime_lineNum;
-		}
-	    DBG_(("db: LINESEP\n"));
-	    return LINESEP;
-	    }
-	else {
-	    char *p = 0;
-	    lexPushLookaheadc(c);
-	    if (lexWithinMode(L_BASE64)) {
-		/* get each char and convert to bin on the fly... */
-		p = lexGetDataFromBase64();
-		yylval.str = p;
-		return STRING;
-		}
-	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
-		p = lexGetQuotedPrintable();
-		}
-	    else {
-#ifdef _SUPPORT_LINE_FOLDING
-		p = lexGet1Value();
-#else
-		p = lexGetStrUntil(";\n");
-#endif
-		}
-	    if (p) {
-		DBG_(("db: STRING: '%s'\n", p));
-		yylval.str = p;
-		return STRING;
-		}
-	    else return 0;
-	    }
-	}
-    else {
-	/* normal mode */
-	while (1) {
-	    int c = lexGetc();
-	    switch(c) {
-		case ':': {
-		    /* consume all line separator(s) adjacent to each other */
-		    /* ignoring linesep immediately after colon. */
-/*		    c = lexLookahead();
-		    while (strchr("\n",c)) {
-			lexSkipLookahead();
-			c = lexLookahead();
-			++mime_lineNum;
-			}*/
-		    DBG_(("db: COLON\n"));
-		    return COLON;
-		    }
-		case ';':
-		    DBG_(("db: SEMICOLON\n"));
-		    return SEMICOLON;
-		case '=':
-		    DBG_(("db: EQ\n"));
-		    return EQ;
-		/* ignore whitespace in this mode */
-		case '\t':
-		case ' ': continue;
-		case '\n': {
-		    ++mime_lineNum;
-		    continue;
-		    }
-		case EOF: return 0;
-		    break;
-		default: {
-		    lexPushLookaheadc(c);
-		    if (isalpha(c)) {
-			char *t = lexGetWord();
-			yylval.str = t;
-			if (!stricmp(t, "begin")) {
-			    return match_begin_end_name(0);
-			    }
-			else if (!stricmp(t,"end")) {
-			    return match_begin_end_name(1);
-			    }
-		        else {
-			    DBG_(("db: ID '%s'\n", t));
-			    return ID;
-			    }
-			}
-		    else {
-			/* unknow token */
-			return 0;
-			}
-		    break;
-		    }
-		}
-	    }
-	}
-    return 0;
-    }
-
-
-/***************************************************************************/
-/***							Public Functions						****/
-/***************************************************************************/
-
-static VObject* Parse_MIMEHelper()
-    {
-    ObjStackTop = -1;
-    mime_numErrors = 0;
-    mime_lineNum = 1;
-    vObjList = 0;
-    curObj = 0;
-
-    if (yyparse() != 0) {
-	finiLex();
-	return 0;
-    }
-
-    finiLex();
-    return vObjList;
-    }
-
-/* ///////////////////////////////////////////////////////////////////////// */
-DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
-    {
-    initLex(input, len, 0);
-    return Parse_MIMEHelper();
-    }
-
-
-#if INCLUDEMFC
-
-DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)
-    {
-    unsigned long startPos;
-    VObject *result;
-
-    initLex(0,-1,file);
-    startPos = file->GetPosition();
-    if (!(result = Parse_MIMEHelper()))
-	file->Seek(startPos, CFile::begin);
-    return result;
-    }
-
-#else
-
-VObject* Parse_MIME_FromFile(FILE *file)
-    {
-    VObject *result;
-    long startPos;
-
-    initLex(0,(unsigned long)-1,file);
-    startPos = ftell(file);
-    if (!(result = Parse_MIMEHelper())) {
-	fseek(file,startPos,SEEK_SET);
-	}
-    return result;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
-    {
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-	VObject* o = Parse_MIME_FromFile(fp);
-	fclose(fp);
-	return o;
-	}
-    else {
-	char msg[256];
-	snprintf(msg, sizeof(msg), "can't open file '%s' for reading\n", fname);
-	mime_error_(msg);
-	return 0;
-	}
-    }
-
-#endif
-
-/* ///////////////////////////////////////////////////////////////////////// */
-
-static MimeErrorHandler mimeErrorHandler;
-
-DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
-    {
-    mimeErrorHandler = me;
-    }
-
-static void mime_error(char *s)
-    {
-    char msg[256];
-    if (mimeErrorHandler) {
-	sprintf(msg,"%s at line %d", s, mime_lineNum);
-	mimeErrorHandler(msg);
-	}
-    }
-
-static void mime_error_(char *s)
-    {
-    if (mimeErrorHandler) {
-	mimeErrorHandler(s);
-	}
-    }
-
-
diff --git a/libversit/vctest.c b/libversit/vctest.c
deleted file mode 100644
index 7975d1e200..0000000000
--- a/libversit/vctest.c
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include "vcc.h"
-
-FILE *cfp;
-
-void myMimeErrorHandler(char *s)
-{
-    printf("%s\n", s);
-}
-
-void main(int argc, char **argv)
-{
-    int testmem = 0;
-
-	char * foo[2] = {"foo","alden.vcf"};
-
-argc = 2;
-argv = foo;
-
-#ifdef _CONSOLE
-    cfp = stdout;
-    registerMimeErrorHandler(myMimeErrorHandler);
-#else
-    cfp = fopen("vctest.out", "w");
-    if (!cfp) return;
-#endif
-    ++argv;
-    while (--argc) {
-	FILE *fp;
-	if (strcmp(*argv,"-testmem") == 0) {
-	    testmem = 1;
-	    argv++;
-	    continue;
-	    }
-	fprintf(cfp,"processing %s\n",*argv);
-	fp = fopen(*argv,"r");
-	if (!fp) {
-	    fprintf(cfp,"error opening file\n");
-	    }
-	else {
-	    VObject *v, *t;
-	    FILE *ofp;
-	    char buf[256];
-	    char *p;
-	    strcpy(buf,*argv);
-	    p = strchr(buf,'.');
-	    if (p) *p = 0;
-	    strcat(buf,".out");
-	    fprintf(cfp,"reading text input from '%s'...\n", *argv);
-	    /*v = Parse_MIME_FromFile(fp); */
-	    v = Parse_MIME_FromFileName(*argv);
-		writeVObjectToFile(buf,v);
-		cleanVObject(v);
-
-		/*
-	    fprintf(cfp,"pretty print internal format of '%s'...\n", *argv);
-	    ofp = fopen(buf,"w");
-	    while (v) {
-		printVObject(cfp,v);
-		if (testmem) {
-		    char *s, *p;
-		    fprintf(cfp,"test writing to mem...\n");
-		    p = s  = writeMemVObject(0,0,v);
-		    if (s) {
-			while (*s) {
-			    fputc(*s,ofp);
-			    s++;
-			    }
-			free(p);
-			}
-		    }
-		else {
-		    writeVObject(ofp,v);
-		    }
-		t = v;
-		v = nextVObjectInList(v);
-		cleanVObject(t);
-		}
-		
-	    fclose(ofp);
-	    fclose(fp);
-		*/
-	    }
-		
-	cleanStrTbl();
-	argv++;
-	
-	}
-	
-    if (cfp != stdout) fclose(cfp);
-
-}
-
diff --git a/libversit/vobject.c b/libversit/vobject.c
deleted file mode 100644
index d685b04278..0000000000
--- a/libversit/vobject.c
+++ /dev/null
@@ -1,1452 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- * src: vobject.c
- * doc: vobject and APIs to construct vobject, APIs pretty print 
- * vobject, and convert a vobject into its textual representation.
- */
-
-#ifndef	 MWERKS
-#include <malloc.h>
-#endif
-
-#include "vobject.h"
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-
-#define NAME_OF(o)				o->id
-#define VALUE_TYPE(o)			o->valType
-#define STRINGZ_VALUE_OF(o)		o->val.strs
-#define USTRINGZ_VALUE_OF(o)	o->val.ustrs
-#define INTEGER_VALUE_OF(o)		o->val.i
-#define LONG_VALUE_OF(o)		o->val.l
-#define ANY_VALUE_OF(o)			o->val.any
-#define VOBJECT_VALUE_OF(o)		o->val.vobj
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-    } ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-    };
-
-typedef struct StrItem StrItem;
-
-struct StrItem {
-    StrItem *next;
-    const char *s;
-    unsigned int refCnt;
-    };
-
-const char** fieldedProp;
-
-
-
-/*----------------------------------------------------------------------
-   The following functions involve with memory allocation:
-	newVObject
-	deleteVObject
-	dupStr
-	deleteStr
-	newStrItem
-	deleteStrItem
-   ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) newVObject_(const char *id)
-{
-    VObject *p = (VObject*)malloc(sizeof(VObject));
-    p->next = 0;
-    p->id = id;
-    p->prop = 0;
-    VALUE_TYPE(p) = 0;
-    ANY_VALUE_OF(p) = 0;
-    return p;
-}
-
-DLLEXPORT(VObject*) newVObject(const char *id)
-{
-    return newVObject_(lookupStr(id));
-}
-
-DLLEXPORT(void) deleteVObject(VObject *p)
-{
-    unUseStr(p->id);
-    free(p);
-}
-
-DLLEXPORT(char*) dupStr(const char *s, unsigned int size)
-{
-    char *t;
-    if  (size == 0) {
-	size = strlen(s);
-	}
-    t = (char*)malloc(size+1);
-    if (t) {
-	memcpy(t,s,size);
-	t[size] = 0;
-	return t;
-	}
-    else {
-	return (char*)0;
-	}
-}
-
-DLLEXPORT(void) deleteStr(const char *p)
-{
-    if (p) free((void*)p);
-}
-
-
-static StrItem* newStrItem(const char *s, StrItem *next)
-{
-    StrItem *p = (StrItem*)malloc(sizeof(StrItem));
-    p->next = next;
-    p->s = s;
-    p->refCnt = 1;
-    return p;
-}
-
-static void deleteStrItem(StrItem *p)
-{
-    free((void*)p);
-}
-
-
-/*----------------------------------------------------------------------
-  The following function provide accesses to VObject's value.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(const char*) vObjectName(VObject *o)
-{
-    return NAME_OF(o);
-}
-
-DLLEXPORT(void) setVObjectName(VObject *o, const char* id)
-{
-    NAME_OF(o) = id;
-}
-
-DLLEXPORT(const char*) vObjectStringZValue(VObject *o)
-{
-    return STRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = dupStr(s,0);
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o)
-{
-    return USTRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = (wchar_t*) dupStr((char*)s,(uStrLen(s)+1)*2);
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)
-{
-    return INTEGER_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)
-{
-    INTEGER_VALUE_OF(o) = i;
-    VALUE_TYPE(o) = VCVT_UINT;
-}
-
-DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)
-{
-    return LONG_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)
-{
-    LONG_VALUE_OF(o) = l;
-    VALUE_TYPE(o) = VCVT_ULONG;
-}
-
-DLLEXPORT(void*) vObjectAnyValue(VObject *o)
-{
-    return ANY_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)
-{
-    ANY_VALUE_OF(o) = t;
-    VALUE_TYPE(o) = VCVT_RAW;
-}
-
-DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)
-{
-    return VOBJECT_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)
-{
-    VOBJECT_VALUE_OF(o) = p;
-    VALUE_TYPE(o) = VCVT_VOBJECT;
-}
-
-DLLEXPORT(int) vObjectValueType(VObject *o)
-{
-    return VALUE_TYPE(o);
-}
-
-
-/*----------------------------------------------------------------------
-  The following functions can be used to build VObject.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
-{
-    /* circular link list pointed to tail */
-    /*
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    -->
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	p {next,id,prop,val}
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    */
-
-    VObject *tail = o->prop;
-    if (tail) {
-	p->next = tail->next;
-	o->prop = tail->next = p;
-	}
-    else {
-	o->prop = p->next = p;
-	}
-    return p;
-}
-
-DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject(id));
-}
-
-DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject_(id));
-}
-
-DLLEXPORT(void) addList(VObject **o, VObject *p)
-{
-    p->next = 0;
-    if (*o == 0) {
-	*o = p;
-	}
-    else {
-	VObject *t = *o;
-	while (t->next) {
-	   t = t->next;
-	   }
-	t->next = p;
-	}
-}
-
-DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
-{
-    return o->next;
-}
-
-DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
-{
-    VObject *sizeProp;
-    setVObjectAnyValue(prop, val);
-    sizeProp = addProp(prop,VCDataSizeProp);
-    setVObjectLongValue(sizeProp, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
-{
-    void *p = dupStr((const char *)val,size);
-    return setValueWithSize_(prop,p,p?size:0);
-}
-
-DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->prop; 
-    i->next = 0;
-}
-
-DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->next; 
-    i->next = 0;
-}
-
-DLLEXPORT(int) moreIteration(VObjectIterator *i)
-{ 
-    return (i->start && (i->next==0 || i->next!=i->start));
-}
-
-DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
-{
-    if (i->start && i->next != i->start) {
-	if (i->next == 0) {
-	    i->next = i->start->next;
-	    return i->next;
-	    }
-	else {
-	    i->next = i->next->next;
-	    return i->next;
-	    }
-	}
-    else return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
-{
-    VObjectIterator i;
-    initPropIterator(&i,o);
-    while (moreIteration(&i)) {
-	VObject *each = nextVObject(&i);
-	if (!stricmp(id,each->id))
-	    return each;
-	}
-    return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
-{
-    /*
-	a.b.c
-	-->
-	prop(c)
-	    prop(VCGrouping=b)
-		prop(VCGrouping=a)
-     */
-    char *dot = strrchr(g,'.');
-    if (dot) {
-	VObject *p, *t;
-	char *gs, *n = dot+1;
-	gs = dupStr(g,0);	/* so we can write to it. */
-	/* used to be
-	* t = p = addProp_(o,lookupProp_(n));
-	*/
-	t = p = addProp_(o,lookupProp(n));
-	dot = strrchr(gs,'.');
-	*dot = 0;
-	do {
-	    dot = strrchr(gs,'.');
-	    if (dot) {
-		n = dot+1;
-		*dot=0;
-		}
-	    else
-		n = gs;
-	    /* property(VCGroupingProp=n);
-	     *	and the value may have VCGrouping property
-	     */
-	    t = addProp(t,VCGroupingProp);
-	    setVObjectStringZValue(t,lookupProp_(n));
-	    } while (n != gs);
-	deleteStr(gs);	
-	return p;
-	}
-    else
-	return addProp_(o,lookupProp(g));
-}
-
-DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setVObjectUStringZValue_(prop, fakeUnicode(v,0));
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setValueWithSize_(prop, (void*)v, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    return addPropSizedValue_(o,p,dupStr(v,size),size);
-}
-
-
-
-/*----------------------------------------------------------------------
-  The following pretty print a VObject
-  ----------------------------------------------------------------------*/
-
-static void printVObject_(FILE *fp, VObject *o, int level);
-
-static void indent(FILE *fp, int level)
-{
-    int i;
-    for (i=0;i<level*4;i++) {
-	fputc(' ', fp);
-	}
-}
-
-static void printValue(FILE *fp, VObject *o, int level)
-{
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char c;
-            char *t,*s;
-	    s = t = fakeCString(USTRINGZ_VALUE_OF(o));
-	    fputc('"',fp);
-	    while (c=*t,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		t++;
-		}
-	    fputc('"',fp);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    char c;
-	    const char *s = STRINGZ_VALUE_OF(o);
-	    fputc('"',fp);
-	    while (c=*s,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		s++;
-		}
-	    fputc('"',fp);
-	    break;
-	    }
-	case VCVT_UINT:
-	    fprintf(fp,"%d", INTEGER_VALUE_OF(o)); break;
-	case VCVT_ULONG:
-	    fprintf(fp,"%ld", LONG_VALUE_OF(o)); break;
-	case VCVT_RAW:
-	    fprintf(fp,"[raw data]"); break;
-	case VCVT_VOBJECT:
-	    fprintf(fp,"[vobject]\n");
-	    printVObject_(fp,VOBJECT_VALUE_OF(o),level+1);
-	    break;
-	case 0:
-	    fprintf(fp,"[none]"); break;
-	default:
-	    fprintf(fp,"[unknown]"); break;
-	}
-}
-
-static void printNameValue(FILE *fp,VObject *o, int level)
-{
-    indent(fp,level);
-    if (NAME_OF(o)) {
-	fprintf(fp,"%s", NAME_OF(o));
-	}
-    if (VALUE_TYPE(o)) {
-	fputc('=',fp);
-	printValue(fp,o, level);
-	}
-    fprintf(fp,"\n");
-}
-
-static void printVObject_(FILE *fp, VObject *o, int level)
-    {
-    VObjectIterator t;
-    if (o == 0) {
-	fprintf(fp,"[NULL]\n");
-	return;
-	}
-    printNameValue(fp,o,level);
-    initPropIterator(&t,o);
-    while (moreIteration(&t)) {
-	VObject *eachProp = nextVObject(&t);
-	printVObject_(fp,eachProp,level+1);
-	}
-    }
-
-void printVObject(FILE *fp,VObject *o)
-{
-    printVObject_(fp,o,0);
-}
-
-DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	printVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    printVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) cleanVObject(VObject *o)
-{
-    if (o == 0) return;
-    if (o->prop) {
-	/* destroy time: cannot use the iterator here.
-	   Have to break the cycle in the circular link
-	   list and turns it into regular NULL-terminated
-	   list -- since at some point of destruction,
-	   the reference entry for the iterator to work
-	   will not longer be valid.
-	   */
-	VObject *p;
-	p = o->prop->next;
-	o->prop->next = 0;
-	do {
-	   VObject *t = p->next;
-	   cleanVObject(p);
-	   p = t;
-	   } while (p);
-	}
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ:
-	case VCVT_STRINGZ:
-	case VCVT_RAW:
-		/* assume they are all allocated by malloc. */
-	    free((char*)STRINGZ_VALUE_OF(o));
-	    break;
-	case VCVT_VOBJECT:
-	    cleanVObject(VOBJECT_VALUE_OF(o));
-	    break;
-	}
-    deleteVObject(o);
-}
-
-DLLEXPORT(void) cleanVObjects(VObject *list)
-{
-    while (list) {
-	VObject *t = list;
-	list = nextVObjectInList(list);
-	cleanVObject(t);
-	}
-}
-
-/*----------------------------------------------------------------------
-  The following is a String Table Facilities.
-  ----------------------------------------------------------------------*/
-
-#define STRTBLSIZE 255
-
-static StrItem *strTbl[STRTBLSIZE];
-
-static unsigned int hashStr(const char *s)
-{
-    unsigned int h = 0;
-    int i;
-    for (i=0;s[i];i++) {
-	h += s[i]*i;
-	}
-    return h % STRTBLSIZE;
-}
-
-DLLEXPORT(const char*) lookupStr(const char *s)
-{
-    StrItem *t;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt++;
-		return t->s;
-		}
-	    t = t->next;
-	    } while (t);
-	}
-    s = dupStr(s,0);
-    strTbl[h] = newStrItem(s,strTbl[h]);
-    return s;
-}
-
-DLLEXPORT(void) unUseStr(const char *s)
-{
-    StrItem *t, *p;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	p = t;
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt--;
-		if (t->refCnt == 0) {
-		    if (p == strTbl[h]) {
-			strTbl[h] = t->next;
-			}
-		    else {
-			p->next = t->next;
-			}
-		    deleteStr(t->s);
-		    deleteStrItem(t);
-		    return;
-		    }
-		}
-	    p = t;
-	    t = t->next;
-	    } while (t);
-	}
-}
-
-DLLEXPORT(void) cleanStrTbl()
-{
-    int i;
-    for (i=0; i<STRTBLSIZE;i++) {
-	StrItem *t = strTbl[i];
-	while (t) {
-	    StrItem *p;
-	    deleteStr(t->s);
-	    p = t;
-	    t = t->next;
-	    deleteStrItem(p);
-	    } while (t);
-	strTbl[i] = 0;
-	}
-}
-
-
-struct PreDefProp {
-    const char *name;
-    const char *alias;
-    const char** fields;
-    unsigned int flags;
-    };
-
-/* flags in PreDefProp */
-#define PD_BEGIN	0x1
-#define PD_INTERNAL	0x2
-
-static const char *adrFields[] = {
-    VCPostalBoxProp,
-    VCExtAddressProp,
-    VCStreetAddressProp,
-    VCCityProp,
-    VCRegionProp,
-    VCPostalCodeProp,
-    VCCountryNameProp,
-    0
-};
-
-static const char *nameFields[] = {
-    VCFamilyNameProp,
-    VCGivenNameProp,
-    VCAdditionalNamesProp,
-    VCNamePrefixesProp,
-    VCNameSuffixesProp,
-    NULL
-    };
-
-static const char *orgFields[] = {
-    VCOrgNameProp,
-    VCOrgUnitProp,
-    VCOrgUnit2Prop,
-    VCOrgUnit3Prop,
-    VCOrgUnit4Prop,
-    NULL
-    };
-
-static const char *AAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCAudioContentProp,
-    0
-    };
-
-/* ExDate -- has unamed fields */
-/* RDate -- has unamed fields */
-
-static const char *DAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCDisplayStringProp,
-    0
-    };
-
-static const char *MAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCEmailAddressProp,
-    VCNoteProp,
-    0
-    };
-
-static const char *PAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCProcedureNameProp,
-    0
-    };
-
-static struct PreDefProp propNames[] = {
-    { VC7bitProp, 0, 0, 0 },
-    { VC8bitProp, 0, 0, 0 },
-    { VCAAlarmProp, 0, AAlarmFields, 0 },
-    { VCAdditionalNamesProp, 0, 0, 0 },
-    { VCAdrProp, 0, adrFields, 0 },
-    { VCAgentProp, 0, 0, 0 },
-    { VCAIFFProp, 0, 0, 0 },
-    { VCAOLProp, 0, 0, 0 },
-    { VCAppleLinkProp, 0, 0, 0 },
-    { VCAttachProp, 0, 0, 0 },
-    { VCAttendeeProp, 0, 0, 0 },
-    { VCATTMailProp, 0, 0, 0 },
-    { VCAudioContentProp, 0, 0, 0 },
-    { VCAVIProp, 0, 0, 0 },
-    { VCBase64Prop, 0, 0, 0 },
-    { VCBBSProp, 0, 0, 0 },
-    { VCBirthDateProp, 0, 0, 0 },
-    { VCBMPProp, 0, 0, 0 },
-    { VCBodyProp, 0, 0, 0 },
-    { VCBusinessRoleProp, 0, 0, 0 },
-    { VCCalProp, 0, 0, PD_BEGIN },
-    { VCCaptionProp, 0, 0, 0 },
-    { VCCardProp, 0, 0, PD_BEGIN },
-    { VCCarProp, 0, 0, 0 },
-    { VCCategoriesProp, 0, 0, 0 },
-    { VCCellularProp, 0, 0, 0 },
-    { VCCGMProp, 0, 0, 0 },
-    { VCCharSetProp, 0, 0, 0 },
-    { VCCIDProp, VCContentIDProp, 0, 0 },
-    { VCCISProp, 0, 0, 0 },
-    { VCCityProp, 0, 0, 0 },
-    { VCClassProp, 0, 0, 0 },
-    { VCCommentProp, 0, 0, 0 },
-    { VCCompletedProp, 0, 0, 0 },
-    { VCContentIDProp, 0, 0, 0 },
-    { VCCountryNameProp, 0, 0, 0 },
-    { VCDAlarmProp, 0, DAlarmFields, 0 },
-    { VCDataSizeProp, 0, 0, PD_INTERNAL },
-    { VCDayLightProp, 0, 0, 0 },
-    { VCDCreatedProp, 0, 0, 0 },
-    { VCDeliveryLabelProp, 0, 0, 0 },
-    { VCDescriptionProp, 0, 0, 0 },
-    { VCDIBProp, 0, 0, 0 },
-    { VCDisplayStringProp, 0, 0, 0 },
-    { VCDomesticProp, 0, 0, 0 },
-    { VCDTendProp, 0, 0, 0 },
-    { VCDTstartProp, 0, 0, 0 },
-    { VCDueProp, 0, 0, 0 },
-    { VCEmailAddressProp, 0, 0, 0 },
-    { VCEncodingProp, 0, 0, 0 },
-    { VCEndProp, 0, 0, 0 },
-    { VCEventProp, 0, 0, PD_BEGIN },
-    { VCEWorldProp, 0, 0, 0 },
-    { VCExNumProp, 0, 0, 0 },
-    { VCExpDateProp, 0, 0, 0 },
-    { VCExpectProp, 0, 0, 0 },
-    { VCExtAddressProp, 0, 0, 0 },
-    { VCFamilyNameProp, 0, 0, 0 },
-    { VCFaxProp, 0, 0, 0 },
-    { VCFullNameProp, 0, 0, 0 },
-    { VCGeoLocationProp, 0, 0, 0 },
-    { VCGeoProp, 0, 0, 0 },
-    { VCGIFProp, 0, 0, 0 },
-    { VCGivenNameProp, 0, 0, 0 },
-    { VCGroupingProp, 0, 0, 0 },
-    { VCHomeProp, 0, 0, 0 },
-    { VCIBMMailProp, 0, 0, 0 },
-    { VCInlineProp, 0, 0, 0 },
-    { VCInternationalProp, 0, 0, 0 },
-    { VCInternetProp, 0, 0, 0 },
-    { VCISDNProp, 0, 0, 0 },
-    { VCJPEGProp, 0, 0, 0 },
-    { VCLanguageProp, 0, 0, 0 },
-    { VCLastModifiedProp, 0, 0, 0 },
-    { VCLastRevisedProp, 0, 0, 0 },
-    { VCLocationProp, 0, 0, 0 },
-    { VCLogoProp, 0, 0, 0 },
-    { VCMailerProp, 0, 0, 0 },
-    { VCMAlarmProp, 0, MAlarmFields, 0 },
-    { VCMCIMailProp, 0, 0, 0 },
-    { VCMessageProp, 0, 0, 0 },
-    { VCMETProp, 0, 0, 0 },
-    { VCModemProp, 0, 0, 0 },
-    { VCMPEG2Prop, 0, 0, 0 },
-    { VCMPEGProp, 0, 0, 0 },
-    { VCMSNProp, 0, 0, 0 },
-    { VCNamePrefixesProp, 0, 0, 0 },
-    { VCNameProp, 0, nameFields, 0 },
-    { VCNameSuffixesProp, 0, 0, 0 },
-    { VCNoteProp, 0, 0, 0 },
-    { VCOrgNameProp, 0, 0, 0 },
-    { VCOrgProp, 0, orgFields, 0 },
-    { VCOrgUnit2Prop, 0, 0, 0 },
-    { VCOrgUnit3Prop, 0, 0, 0 },
-    { VCOrgUnit4Prop, 0, 0, 0 },
-    { VCOrgUnitProp, 0, 0, 0 },
-    { VCPagerProp, 0, 0, 0 },
-    { VCPAlarmProp, 0, PAlarmFields, 0 },
-    { VCParcelProp, 0, 0, 0 },
-    { VCPartProp, 0, 0, 0 },
-    { VCPCMProp, 0, 0, 0 },
-    { VCPDFProp, 0, 0, 0 },
-    { VCPGPProp, 0, 0, 0 },
-    { VCPhotoProp, 0, 0, 0 },
-    { VCPICTProp, 0, 0, 0 },
-    { VCPMBProp, 0, 0, 0 },
-    { VCPostalBoxProp, 0, 0, 0 },
-    { VCPostalCodeProp, 0, 0, 0 },
-    { VCPostalProp, 0, 0, 0 },
-    { VCPowerShareProp, 0, 0, 0 },
-    { VCPreferredProp, 0, 0, 0 },
-    { VCPriorityProp, 0, 0, 0 },
-    { VCProcedureNameProp, 0, 0, 0 },
-    { VCProdIdProp, 0, 0, 0 },
-    { VCProdigyProp, 0, 0, 0 },
-    { VCPronunciationProp, 0, 0, 0 },
-    { VCPSProp, 0, 0, 0 },
-    { VCPublicKeyProp, 0, 0, 0 },
-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
-    { VCQuickTimeProp, 0, 0, 0 },
-    { VCQuotedPrintableProp, 0, 0, 0 },
-    { VCRDateProp, 0, 0, 0 },
-    { VCRegionProp, 0, 0, 0 },
-    { VCRelatedToProp, 0, 0, 0 },
-    { VCRepeatCountProp, 0, 0, 0 },
-    { VCResourcesProp, 0, 0, 0 },
-    { VCRNumProp, 0, 0, 0 },
-    { VCRoleProp, 0, 0, 0 },
-    { VCRRuleProp, 0, 0, 0 },
-    { VCRSVPProp, 0, 0, 0 },
-    { VCRunTimeProp, 0, 0, 0 },
-    { VCSequenceProp, 0, 0, 0 },
-    { VCSnoozeTimeProp, 0, 0, 0 },
-    { VCStartProp, 0, 0, 0 },
-    { VCStatusProp, 0, 0, 0 },
-    { VCStreetAddressProp, 0, 0, 0 },
-    { VCSubTypeProp, 0, 0, 0 },
-    { VCSummaryProp, 0, 0, 0 },
-    { VCTelephoneProp, 0, 0, 0 },
-    { VCTIFFProp, 0, 0, 0 },
-    { VCTimeZoneProp, 0, 0, 0 },
-    { VCTitleProp, 0, 0, 0 },
-    { VCTLXProp, 0, 0, 0 },
-    { VCTodoProp, 0, 0, PD_BEGIN },
-    { VCTranspProp, 0, 0, 0 },
-    { VCUniqueStringProp, 0, 0, 0 },
-    { VCURLProp, 0, 0, 0 },
-    { VCURLValueProp, 0, 0, 0 },
-    { VCValueProp, 0, 0, 0 },
-    { VCVersionProp, 0, 0, 0 },
-    { VCVideoProp, 0, 0, 0 },
-    { VCVoiceProp, 0, 0, 0 },
-    { VCWAVEProp, 0, 0, 0 },
-    { VCWMFProp, 0, 0, 0 },
-    { VCWorkProp, 0, 0, 0 },
-    { VCX400Prop, 0, 0, 0 },
-    { VCX509Prop, 0, 0, 0 },
-    { VCXRuleProp, 0, 0, 0 },
-    { 0,0,0,0 }
-    };
-
-
-static struct PreDefProp* lookupPropInfo(const char* str)
-{
-    /* brute force for now, could use a hash table here. */
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    return &propNames[i];
-	    }
-    
-    return 0;
-}
-
-
-DLLEXPORT(const char*) lookupProp_(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char* s;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    return lookupStr(str);
-}
-
-
-DLLEXPORT(const char*) lookupProp(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char *s;
-	    fieldedProp = propNames[i].fields;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    fieldedProp = 0;
-    return lookupStr(str);
-}
-
-
-/*----------------------------------------------------------------------
-  APIs to Output text form.
-  ----------------------------------------------------------------------*/
-#define OFILE_REALLOC_SIZE 256
-typedef struct OFile {
-    FILE *fp;
-    char *s;
-    int len;
-    int limit;
-    int alloc:1;
-    int fail:1;
-    } OFile;
-
-#if 0
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int slen;
-    if (fp->fail) return;
-    slen  = strlen(s);
-    if (fp->fp) {
-	fwrite(s,1,slen,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len + slen < fp->limit) {
-	    memcpy(fp->s+fp->len,s,slen);
-	    fp->len += slen;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-#else
-static void appendcOFile_(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (c == '\n') {
-	/* write out as <CR><LF> */
-	appendcOFile_(fp,0xd);
-	appendcOFile_(fp,0xa);
-	}
-    else
-	appendcOFile_(fp,c);
-}
-
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int i, slen;
-    slen  = strlen(s);
-    for (i=0; i<slen; i++) {
-	appendcOFile(fp,s[i]);
-	}
-}
-
-#endif
-
-static void initOFile(OFile *fp, FILE *ofp)
-{
-    fp->fp = ofp;
-    fp->s = 0;
-    fp->len = 0;
-    fp->limit = 0;
-    fp->alloc = 0;
-    fp->fail = 0;
-}
-
-static void initMemOFile(OFile *fp, char *s, int len)
-{
-    fp->fp = 0;
-    fp->s = s;
-    fp->len = 0;
-    fp->limit = s?len:0;
-    fp->alloc = s?0:1;
-    fp->fail = 0;
-}
-
-
-static int writeBase64(OFile *fp, unsigned char *s, long len)
-{
-    long cur = 0;
-    int i, numQuads = 0;
-    unsigned long trip;
-    unsigned char b;
-    char quad[5];
-#define MAXQUADS 16
-
-    quad[4] = 0;
-
-    while (cur < len) {
-	    /* collect the triplet of bytes into 'trip' */
-	trip = 0;
-	for (i = 0; i < 3; i++) {
-	    b = (cur < len) ? *(s + cur) : 0;
-	    cur++;
-	    trip = trip << 8 | b;
-	    }
-	/* fill in 'quad' with the appropriate four characters */
-	for (i = 3; i >= 0; i--) {
-	    b = (unsigned char)(trip & 0x3F);
-	    trip = trip >> 6;
-	    if ((3 - i) < (cur - len))
-		    quad[i] = '='; /* pad char */
-	    else if (b < 26) quad[i] = (char)b + 'A';
-	    else if (b < 52) quad[i] = (char)(b - 26) + 'a';
-	    else if (b < 62) quad[i] = (char)(b - 52) + '0';
-	    else if (b == 62) quad[i] = '+';
-	    else quad[i] = '/';
-	    }
-	/* now output 'quad' with appropriate whitespace and line ending */
-	appendsOFile(fp, (numQuads == 0 ? "    " : ""));
-	appendsOFile(fp, quad);
-	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
-	numQuads = (numQuads + 1) % MAXQUADS;
-	}
-    appendcOFile(fp,'\n');
-
-    return 1;
-}
-
-static void writeString(OFile *fp, const char *s)
-{
-    appendsOFile(fp,s);
-}
-
-static void writeQPString(OFile *fp, const char *s)
-{
-    char buf[4];
-    int count=0;
-    const char *p = s;
-
-    while (*p) {
-        /* break up lines biggger than 75 chars */
-        if(count >=74){
-		count=0;
-		appendsOFile(fp,"=\n");
-	}
-	
-	/* escape any non ASCII characters and '=' as per rfc1521 */
-	if (*p<= 0x1f || *p >=0x7f || *p == '=' ) {
-		sprintf(buf,"=%02X",(unsigned char)*p);
-		appendsOFile(fp,buf); 
-		count+=3; 
-	} else {
-		appendcOFile(fp,*p);	
-		count++; 
-	}
-	p++;
-    }
-}
-
-
-
-static void writeVObject_(OFile *fp, VObject *o);
-
-static void writeValue(OFile *fp, VObject *o, unsigned long size,int quote)
-{
-    if (o == 0) return;
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char *s = fakeCString(USTRINGZ_VALUE_OF(o));
-	    if(quote) writeQPString(fp, s);
-	    else writeString(fp,s);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    if(quote) writeQPString(fp, STRINGZ_VALUE_OF(o));
-	    else writeString(fp,STRINGZ_VALUE_OF(o));
-	    break;
-	    }
-	case VCVT_UINT: {
-	    char buf[16];
-	    sprintf(buf,"%u", INTEGER_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_ULONG: {
-	    char buf[16];
-	    sprintf(buf,"%lu", LONG_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_RAW: {
-	    appendcOFile(fp,'\n');
-	    writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
-	    break;
-	    }
-	case VCVT_VOBJECT:
-	    appendcOFile(fp,'\n');
-	    writeVObject_(fp,VOBJECT_VALUE_OF(o));
-	    break;
-	}
-}
-
-static void writeAttrValue(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
-	appendcOFile(fp,';');
-	appendsOFile(fp,NAME_OF(o));
-	}
-    else
-	appendcOFile(fp,';');
-    if (VALUE_TYPE(o)) {
-	appendcOFile(fp,'=');
-	writeValue(fp,o,0,0);
-	}
-}
-
-static void writeGroup(OFile *fp, VObject *o)
-{
-    char buf1[256];
-    char buf2[256];
-    strcpy(buf1,NAME_OF(o));
-    while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
-	strcpy(buf2,STRINGZ_VALUE_OF(o));
-	strcat(buf2,".");
-	strcat(buf2,buf1);
-	strcpy(buf1,buf2);
-	}
-    appendsOFile(fp,buf1);
-}
-
-static int inList(const char **list, const char *s)
-{
-    if (list == 0) return 0;
-    while (*list) {
-	if (stricmp(*list,s) == 0) return 1;
-	list++;
-	}
-    return 0;
-}
-
-static void writeProp(OFile *fp, VObject *o)
-{
-    int isQuoted=0;
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	VObjectIterator t;
-	const char **fields_ = 0;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    writeVObject_(fp,o);
-	    return;
-	    }
-	if (isAPropertyOf(o,VCGroupingProp))
-	    writeGroup(fp,o);
-	else
-	    appendsOFile(fp,NAME_OF(o));
-	if (pi) fields_ = pi->fields;
-	initPropIterator(&t,o);
-	while (moreIteration(&t)) {
-	    const char *s;
-	    VObject *eachProp = nextVObject(&t);
-	    s = NAME_OF(eachProp);
-	    if (stricmp(VCGroupingProp,s) && !inList(fields_,s))
-		writeAttrValue(fp,eachProp);
-	    if (stricmp(VCQPProp,s)==0 || stricmp(VCQuotedPrintableProp,s)==0)
-		 isQuoted=1;
-	    }
-	if (fields_) {
-	    int i = 0, n = 0;
-	    const char** fields = fields_;
-	    /* output prop as fields */
-	    appendcOFile(fp,':');
-	    while (*fields) {
-		VObject *t = isAPropertyOf(o,*fields);
-		i++;
-		if (t) n = i;
-		fields++;
-		}
-	    fields = fields_;
-	    for (i=0;i<n;i++) {
-		writeValue(fp,isAPropertyOf(o,*fields),0,isQuoted);
-		fields++;
-		if (i<(n-1)) appendcOFile(fp,';');
-		}
-	    }
-	}
-	
-    if (VALUE_TYPE(o)) {
-	unsigned long size = 0;
-        VObject *p = isAPropertyOf(o,VCDataSizeProp);
-	if (p) size = LONG_VALUE_OF(p);
-	appendcOFile(fp,':');
-	writeValue(fp,o,size,isQuoted);
-	}
-
-    appendcOFile(fp,'\n');
-}
-
-static void writeVObject_(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    VObjectIterator t;
-	    const char *begin = NAME_OF(o);
-	    appendsOFile(fp,"BEGIN:");
-	    appendsOFile(fp,begin);
-	    appendcOFile(fp,'\n');
-	    initPropIterator(&t,o);
-	    while (moreIteration(&t)) {
-		VObject *eachProp = nextVObject(&t);
-		writeProp(fp, eachProp);
-		}
-	    appendsOFile(fp,"END:");
-	    appendsOFile(fp,begin);
-	    appendsOFile(fp,"\n\n");
-	    }
-	}
-}
-
-void writeVObject(FILE *fp, VObject *o)
-{
-    OFile ofp;
-    initOFile(&ofp,fp);
-    writeVObject_(&ofp,o);
-}
-
-DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	writeVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    writeVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    writeVObject_(&ofp,o);
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    while (list) {
-	writeVObject_(&ofp,list);
-	list = nextVObjectInList(list);
-	}
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-/*----------------------------------------------------------------------
-  APIs to do fake Unicode stuff.
-  ----------------------------------------------------------------------*/
-DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes)
-{
-    wchar_t *r, *pw;
-    int len = strlen(ps)+1;
-
-    pw = r = (wchar_t*)malloc(sizeof(wchar_t)*len);
-    if (bytes)
-	*bytes = len * sizeof(wchar_t);
-
-    while (*ps) { 
-	if (*ps == '\n')
-	    *pw = (wchar_t)0x2028;
-	else if (*ps == '\r')
-	    *pw = (wchar_t)0x2029;
-	else
-	    *pw = (wchar_t)(unsigned char)*ps;
-	ps++; pw++;
-	}				 
-    *pw = (wchar_t)0;
-	
-    return r;
-}
-
-DLLEXPORT(int) uStrLen(const wchar_t *u)
-{
-    int i = 0;
-    while (*u != (wchar_t)0) { u++; i++; }
-    return i;
-}
-
-DLLEXPORT(char*) fakeCString(const wchar_t *u)
-{
-    char *s, *t;
-    int len = uStrLen(u) + 1;
-    t = s = (char*)malloc(len);
-    while (*u) {
-	if (*u == (wchar_t)0x2028)
-	    *t = '\n';
-	else if (*u == (wchar_t)0x2029)
-	    *t = '\r';
-	else
-	    *t = (char)*u;
-	u++; t++;
-	}
-    *t = 0;
-    return s;
-}
-
-/* end of source file vobject.c */
diff --git a/libversit/vobject.h b/libversit/vobject.h
deleted file mode 100644
index bc31dc8297..0000000000
--- a/libversit/vobject.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- 
-The vCard/vCalendar C interface is implemented in the set 
-of files as follows:
-
-vcc.y, yacc source, and vcc.c, the yacc output you will use
-implements the core parser
-
-vobject.c implements an API that insulates the caller from
-the parser and changes in the vCard/vCalendar BNF
-
-port.h defines compilation environment dependent stuff
-
-vcc.h and vobject.h are header files for their .c counterparts
-
-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions
-which you may find useful.
-
-test.c is a standalone test driver that exercises some of
-the features of the APIs provided. Invoke test.exe on a
-VCARD/VCALENDAR input text file and you will see the pretty
-print output of the internal representation (this pretty print
-output should give you a good idea of how the internal 
-representation looks like -- there is one such output in the 
-following too). Also, a file with the .out suffix is generated 
-to show that the internal representation can be written back 
-in the original text format.
-
-For more information on this API see the readme.txt file
-which accompanied this distribution.
-
-  Also visit:
-
-		http://www.versit.com
-		http://www.ralden.com
-
-*/
-
-
-#ifndef __VOBJECT_H__
-#define __VOBJECT_H__ 1
-
-
-#include "port.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-
-#define VC7bitProp				"7BIT"
-#define VC8bitProp				"8BIT"
-#define VCAAlarmProp			"AALARM"
-#define VCAdditionalNamesProp	"ADDN"
-#define VCAdrProp				"ADR"
-#define VCAgentProp				"AGENT"
-#define VCAIFFProp				"AIFF"
-#define VCAOLProp				"AOL"
-#define VCAppleLinkProp			"APPLELINK"
-#define VCAttachProp			"ATTACH"
-#define VCAttendeeProp			"ATTENDEE"
-#define VCATTMailProp			"ATTMAIL"
-#define VCAudioContentProp		"AUDIOCONTENT"
-#define VCAVIProp				"AVI"
-#define VCBase64Prop			"BASE64"
-#define VCBBSProp				"BBS"
-#define VCBirthDateProp			"BDAY"
-#define VCBMPProp				"BMP"
-#define VCBodyProp				"BODY"
-#define VCBusinessRoleProp		"ROLE"
-#define VCCalProp				"VCALENDAR"
-#define VCCaptionProp			"CAP"
-#define VCCardProp				"VCARD"
-#define VCCarProp				"CAR"
-#define VCCategoriesProp		"CATEGORIES"
-#define VCCellularProp			"CELL"
-#define VCCGMProp				"CGM"
-#define VCCharSetProp			"CS"
-#define VCCIDProp				"CID"
-#define VCCISProp				"CIS"
-#define VCCityProp				"L"
-#define VCClassProp				"CLASS"
-#define VCCommentProp			"NOTE"
-#define VCCompletedProp			"COMPLETED"
-#define VCContentIDProp			"CONTENT-ID"
-#define VCCountryNameProp		"C"
-#define VCDAlarmProp			"DALARM"
-#define VCDataSizeProp			"DATASIZE"
-#define VCDayLightProp			"DAYLIGHT"
-#define VCDCreatedProp			"DCREATED"
-#define VCDeliveryLabelProp     "LABEL"
-#define VCDescriptionProp		"DESCRIPTION"
-#define VCDIBProp				"DIB"
-#define VCDisplayStringProp		"DISPLAYSTRING"
-#define VCDomesticProp			"DOM"
-#define VCDTendProp				"DTEND"
-#define VCDTstartProp			"DTSTART"
-#define VCDueProp				"DUE"
-#define VCEmailAddressProp		"EMAIL"
-#define VCEncodingProp			"ENCODING"
-#define VCEndProp				"END"
-#define VCEventProp				"VEVENT"
-#define VCEWorldProp			"EWORLD"
-#define VCExNumProp				"EXNUM"
-#define VCExpDateProp			"EXDATE"
-#define VCExpectProp			"EXPECT"
-#define VCExtAddressProp		"EXT ADD"
-#define VCFamilyNameProp		"F"
-#define VCFaxProp				"FAX"
-#define VCFullNameProp			"FN"
-#define VCGeoProp				"GEO"
-#define VCGeoLocationProp		"GEO"
-#define VCGIFProp				"GIF"
-#define VCGivenNameProp			"G"
-#define VCGroupingProp			"Grouping"
-#define VCHomeProp				"HOME"
-#define VCIBMMailProp			"IBMMail"
-#define VCInlineProp			"INLINE"
-#define VCInternationalProp		"INTL"
-#define VCInternetProp			"INTERNET"
-#define VCISDNProp				"ISDN"
-#define VCJPEGProp				"JPEG"
-#define VCLanguageProp			"LANG"
-#define VCLastModifiedProp		"LAST-MODIFIED"
-#define VCLastRevisedProp		"REV"
-#define VCLocationProp			"LOCATION"
-#define VCLogoProp				"LOGO"
-#define VCMailerProp			"MAILER"
-#define VCMAlarmProp			"MALARM"
-#define VCMCIMailProp			"MCIMAIL"
-#define VCMessageProp			"MSG"
-#define VCMETProp				"MET"
-#define VCModemProp				"MODEM"
-#define VCMPEG2Prop				"MPEG2"
-#define VCMPEGProp				"MPEG"
-#define VCMSNProp				"MSN"
-#define VCNamePrefixesProp		"NPRE"
-#define VCNameProp				"N"
-#define VCNameSuffixesProp		"NSUF"
-#define VCNoteProp				"NOTE"
-#define VCOrgNameProp			"ORGNAME"
-#define VCOrgProp				"ORG"
-#define VCOrgUnit2Prop			"OUN2"
-#define VCOrgUnit3Prop			"OUN3"
-#define VCOrgUnit4Prop			"OUN4"
-#define VCOrgUnitProp			"OUN"
-#define VCPagerProp				"PAGER"
-#define VCPAlarmProp			"PALARM"
-#define VCParcelProp			"PARCEL"
-#define VCPartProp				"PART"
-#define VCPCMProp				"PCM"
-#define VCPDFProp				"PDF"
-#define VCPGPProp				"PGP"
-#define VCPhotoProp				"PHOTO"
-#define VCPICTProp				"PICT"
-#define VCPMBProp				"PMB"
-#define VCPostalBoxProp			"BOX"
-#define VCPostalCodeProp		"PC"
-#define VCPostalProp			"POSTAL"
-#define VCPowerShareProp		"POWERSHARE"
-#define VCPreferredProp			"PREF"
-#define VCPriorityProp			"PRIORITY"
-#define VCProcedureNameProp		"PROCEDURENAME"
-#define VCProdIdProp			"PRODID"
-#define VCProdigyProp			"PRODIGY"
-#define VCPronunciationProp		"SOUND"
-#define VCPSProp				"PS"
-#define VCPublicKeyProp			"KEY"
-#define VCQPProp				"QP"
-#define VCQuickTimeProp			"QTIME"
-#define VCQuotedPrintableProp	"QUOTED-PRINTABLE"
-#define VCRDateProp				"RDATE"
-#define VCRegionProp			"R"
-#define VCRelatedToProp			"RELATED-TO"
-#define VCRepeatCountProp		"REPEATCOUNT"
-#define VCResourcesProp			"RESOURCES"
-#define VCRNumProp				"RNUM"
-#define VCRoleProp				"ROLE"
-#define VCRRuleProp				"RRULE"
-#define VCRSVPProp				"RSVP"
-#define VCRunTimeProp			"RUNTIME"
-#define VCSequenceProp			"SEQUENCE"
-#define VCSnoozeTimeProp		"SNOOZETIME"
-#define VCStartProp				"START"
-#define VCStatusProp			"STATUS"
-#define VCStreetAddressProp		"STREET"
-#define VCSubTypeProp			"SUBTYPE"
-#define VCSummaryProp			"SUMMARY"
-#define VCTelephoneProp			"TEL"
-#define VCTIFFProp				"TIFF"
-#define VCTimeZoneProp			"TZ"
-#define VCTitleProp				"TITLE"
-#define VCTLXProp				"TLX"
-#define VCTodoProp				"VTODO"
-#define VCTranspProp			"TRANSP"
-#define VCUniqueStringProp		"UID"
-#define VCURLProp				"URL"
-#define VCURLValueProp			"URLVAL"
-#define VCValueProp				"VALUE"
-#define VCVersionProp			"VERSION"
-#define VCVideoProp				"VIDEO"
-#define VCVoiceProp				"VOICE"
-#define VCWAVEProp				"WAVE"
-#define VCWMFProp				"WMF"
-#define VCWorkProp				"WORK"
-#define VCX400Prop				"X400"
-#define VCX509Prop				"X509"
-#define VCXRuleProp				"XRULE"
-
-/* Extensions */
-
-#define XPilotIdProp                            "X-PILOTID"
-#define XPilotStatusProp                        "X-PILOTSTAT"
-
-typedef struct VObject VObject;
-
-typedef struct VObjectIterator {
-    VObject* start;
-    VObject* next;
-    } VObjectIterator;
-
-extern DLLEXPORT(VObject*) newVObject(const char *id);
-extern DLLEXPORT(void) deleteVObject(VObject *p);
-extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
-extern DLLEXPORT(void) deleteStr(const char *p);
-extern DLLEXPORT(void) unUseStr(const char *s);
-
-extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
-extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
-extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
-extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
-extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
-extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
-
-extern DLLEXPORT(const char*) vObjectName(VObject *o);
-extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
-extern DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o);
-extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
-extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
-extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
-extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
-extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
-
-extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
-extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
-extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
-extern DLLEXPORT(void) addList(VObject **o, VObject *p);
-
-extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
-
-extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
-extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
-extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
-extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
-
-extern DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o);
-extern DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list);
-
-extern DLLEXPORT(const char*) lookupStr(const char *s);
-extern DLLEXPORT(void) cleanStrTbl();
-
-extern DLLEXPORT(void) cleanVObject(VObject *o);
-extern DLLEXPORT(void) cleanVObjects(VObject *list);
-
-extern DLLEXPORT(const char*) lookupProp(const char* str);
-extern DLLEXPORT(const char*) lookupProp_(const char* str);
-
-extern DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes);
-extern DLLEXPORT(int) uStrLen(const wchar_t *u);
-extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
-
-extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
-extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
-extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
-extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
-
-extern DLLEXPORT(int) vObjectValueType(VObject *o);
-
-/* return type of vObjectValueType: */
-#define VCVT_NOVALUE	0
-	/* if the VObject has no value associated with it. */
-#define VCVT_STRINGZ	1
-	/* if the VObject has value set by setVObjectStringZValue. */
-#define VCVT_USTRINGZ	2
-	/* if the VObject has value set by setVObjectUStringZValue. */
-#define VCVT_UINT		3
-	/* if the VObject has value set by setVObjectIntegerValue. */
-#define VCVT_ULONG		4
-	/* if the VObject has value set by setVObjectLongValue. */
-#define VCVT_RAW		5
-	/* if the VObject has value set by setVObjectAnyValue. */
-#define VCVT_VOBJECT	6
-	/* if the VObject has value set by setVObjectVObjectValue. */
-
-extern const char** fieldedProp;
-
-/* NOTE regarding printVObject and writeVObject
-
-The functions below are not exported from the DLL because they
-take a FILE* as a parameter, which cannot be passed across a DLL 
-interface (at least that is my experience). Instead you can use
-their companion functions which take file names or pointers
-to memory. However, if you are linking this code into 
-your build directly then you may find them a more convenient API
-and you can go ahead and use them. If you try to use them with 
-the DLL LIB you will get a link error.
-*/
-extern void printVObject(FILE *fp,VObject *o);
-extern void writeVObject(FILE *fp, VObject *o);
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VOBJECT_H__ */
-
-
diff --git a/mail/.cvsignore b/mail/.cvsignore
deleted file mode 100644
index dd1d902aa2..0000000000
--- a/mail/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-Mail-stubs.c
-Mail-skels.c
-Mail-common.c
-Mail.h
-evolution-mail
-evolution-mail.pure
-test-mail
-test-sources
-test-thread
-*.bb
-*.bbg
-*.da
-*.gcov
-GNOME_Evolution_Mail.oaf
diff --git a/mail/ChangeLog b/mail/ChangeLog
deleted file mode 100644
index 703f843a28..0000000000
--- a/mail/ChangeLog
+++ /dev/null
@@ -1,9418 +0,0 @@
-2001-03-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (set_stop): Check the container is not NIL before
-	trying to set thje prop.
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_search_menu_activated): Fixes
-	for changes to search bar.
-	(search_save): Removed.
-	(search_full): Removed.
-	(search_full_clicked): Removed.
-	(folder_browser_search_option_items[]): Removed.
-	(folder_browser_search_query_changed): Changed for search bar
-	changes.
-	(folder_browser_clear_search): Removed.
-
-	* mail-vfolder.c (vfolder_clone_rule): New function to clone a
-	filter/search rule into a matching vfolder rule.
-
-	* mail-send-recv.c (mail_receive_uri): Setup a timeout for status
-	updates.
-	(build_dialogue): Setup timeout id for status updates.
-	(operation_status_timeout): New function to set the status via a
-	timeout.
-	(receive_done): Remove the timeout handler if we need to.
-	(operation_status): 
-	(receive_status): Just update the info, and let the timeout
-	handler update the gui.
-	(do_free_status): 
-	(do_show_status): Removed gui thread status message processing.
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_config_search): New function to
-	configure the FilterRule for the search mechanism.
-
-2001-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (folder_browser_gui_init): Setup the search bar
-	as a filterbar.
-	(got_folder): Set the whole search bar sensitive or not based on
-	the search capability of the folder.
-
-	* folder-browser.h: Changed to use efilterbar instead of esearchbar.
-
-2001-02-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (configure_mail): Return TRUE if the user
-	configured his/her settings, else return FALSE.
-	(check_send_configuration): If configure_mail() returns TRUE, then
-	continue otherwise quit.
-	(send_receive_mail): Same.
-
-2001-02-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): Set a "References"
-	header no matter what if we are able to get a Message-Id. Fixes
-	bug #1583.
-
-	* mail-accounts.c (mail_delete): Confirm that the user REALLY
-	wants to delete this account.
-	(news_delete): Same.
-
-	* mail-ops.c (mail_send_message): Changed the product string -
-	will change it to use User-Agent once I get the RFC/DRUMS draft or
-	whatever. Until then I'll stick with User-Agent.
-
-2001-02-26  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.c (delete_msg): Mark deleted messages as "seen"
-	as well so they don't count towards the unread count.
-
-	* mail-view.c (view_delete_msg): ditto
-
-2001-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Re-add the
-	mail_vtrash_create() hack back in for LocalStores since there's no
-	better way to register a vTrash folder on the Local Storage yet.
-
-	* mail-local.c (register_folder_registered): Add folders to the
-	vTrash folder here since the LocalStore does not let the parent
-	CamelStore class keep it's own hash of the folders.
-
-2001-02-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* session.c (mail_session_forget_password): New function to force
-	the removal of a given password.
-
-	* openpgp-utils.c (openpgp_decrypt): On failure, forget the
-	passphrase.
-	(openpgp_encrypt): Here too. (cleaned this up a bit too)
-	(openpgp_clearsign): And here.
-	(openpgp_sign): Again...
-
-	* mail-callbacks.c (composer_postpone_cb): Abort if the message is
-	NULL (which is valid if an error occured).
-	(composer_send_cb): Same.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser.c: Toss the mail_tool_camel_lock* stuff.
-	* mail-ops.c: Same.
-	* mail-summary.c: Here too.
-	
-	* mail-tools.c (mail_tool_uri_to_folder_noex): Blown away!
-	(mail_tool_filter_get_folder_func): *kapoosh*
-	(mail_tool_camel_lock_up): Same.
-	(mail_tool_camel_lock_down): Same.
-	(mail_tool_set_uid_flags): Don't need this rubbish anymore either.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (mail_load_storages): No longer need to
-	construct the vTrash here.
-	(owner_set_cb): Don't make the vTrash for the local store here.
-
-	* mail-ops.c (add_vtrash_info): New function to add a vTrash
-	folder info to a pre-constructed CamelFolderInfo for use in the
-	get_folder_info async function.
-
-2001-02-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): No longer need to do a vtrash_cleanup() (it also
-	doesn't exist anymore).
-
-	* component-factory.c (mail_load_storages): Updated to use the new
-	vtrash code.
-	(owner_set_cb): Same.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Update to handle the
-	"vtrash:" url prefix so that we can extract the REAL uri and know
-	to get the trash folder.
-
-	* mail-vtrash.c (mail_vtrash_add): Add the vTrash folder to the
-	EvolutionStorage.
-	(mail_vtrash_create): Get the store based on the uri (async) and
-	then call mail_trash_add.
-	(vtrash_cleanup): Removed.
-	(vtrash_uri_to_folder): Removed.
-	(vtrash_create): Replaced by mail_vtrash_create()
-
-2001-02-23  Iain Holmes  <iain@ximian.com>
-
-	* component-factory.c (owner_set_cb): Init the importer here.
-
-	* mail-importer.[ch] (mail_importer_create_folder): Add a function
-	that creates new folders in the shell.
-	(mail_importer_init): Take in an EvolutionShellClient, and get the
-	local_storage corba_object from it.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vtrash.c (create_trash_vfolder): Come up with a unique
-	store uri for each vtrash (using %p and the CamelStore we're gonna
-	place it on).
-	(get_trash_get): Pass in the store so we can use it for %p.
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_from_mlist): Rule to add mlist
-	vfolder.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Removed.
-	(rule_from_mlist): Build a generic match rule from an mlist.
-	(vfolder_rule_from_mlist): Setup the vfolder rule for an mlist.
-	(filter_rule_from_mlist): Setup a filter rule fro an mlist.
-	(filter_gui_add_from_mlist): GUI thingy to do the work.
-
-	* folder-browser.c (on_right_click): Added vfolder on mailing list
-	to filter menu.
-	(on_right_click): Use header_raw_check_mailign_list instead of
-	mlist magic to get the mailing list name.
-	(filter_mlist): Changed to use new add_from_mlist() call.
-	(vfolder_mlist): New function for vfolder from mlist.
-
-	* mail-send-recv.c (build_dialogue): Only allow downloading if the
-	source is enabled at this time.
-	(mail_autoreceive_setup): Check for enabled sources before setting
-	up autodownload.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-accounts.c (construct): Construct the PGP Path
-	GnomeFileEntry widget.
-	(pgp_path_changed): Try to auto-detect which PGP type the binary
-	file is based on the basename (yuck).
-
-2001-02-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (create_folder_get): Make op cancellable/report
-	internals.
-	(get_folder_get): 
-	(sync_folder_sync): 
-	(get_folderinfo_get): Make op cancellable/report internals.
-
-	* mail-vtrash.c (get_trash_get): Setup the operation registration,
-	and create a pseudo "start/stop" operation.
-	(get_trash_free): Free store if we have it.
-	(get_trash_got): Move vtrash add into here, so we execute in the
-	right thread.
-
-	* component-factory.c (owner_set_cb): Make trash creation async.
-
-	* mail-local.c (register_folder_desc): A description of what we're
-	doing.
-
-	* mail-mt.c (mail_msg_new): Set status callback to operation_new.
-	(mail_operation_status): Operation status function, proxy messages
-	to main thread, and attempt to present a meaningful ui experience
-	for operations.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): Fixed memory corruption bug.
-
-	* mail-format.c (try_inline_pgp_sig): Check to make sure the
-	validity isn't NULL.
-	(handle_multipart_signed): Check for NULL validities.
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Protect against NULL
-	uri's.
-
-	* mail-vtrash.c: Do mutex locking on the global hash table - this
-	should clear up some segfaults ;-)
-
-	* mail-config-druid.c (druid_finish): Set the 'enabled' member of
-	the source to TRUE if the URL exists else set to FALSE.
-	(incoming_type_changed): If the provider chosen is "None" then
-	gray-out the auto-check widgets and the check-settings, otherwise
-	sensitize them.
-
-	* mail-account-editor.c (construct): Added a few more settings.
-	(apply_changes): Save the new settings.
-
-	* mail-config.c (service_copy): Updated.
-	(config_read): Read in whether or not the account is enabled.
-	(mail_config_write): Save if the account is enabled or not.
-
-2001-02-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (mail_send_message): Updated to reflect changes to
-	the filter-driver code.
-
-2001-02-22  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (CAMEL_OBJS_EXTRA): Removed, no longer link with
-	libcamelvee.
-	(evolution_mail_LDADD): Ditto.
-
-	* mail-vtrash.c: Moved camel-vee-store header ot camel levle.
-
-	* mail-tools.c: Moved camel-vee-folder header to camel.
-
-	* mail-local.c (local_storage_new_folder_cb): started hack for
-	progress reporting, which is currently to the console.
-
-	* mail-mt.c (set_stop): Set the stop button sensitivity.
-	(mail_msg_received): enable/disable stop button while we're
-	processing stuff in another thread.
-
-	* message-list.c (ml_tree_value_at): If our uid entry vanishes
-	before w'ere ready, then make a fake.
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_verify): Changed to use
-	PgpValidity.
-
-	* openpgp-utils.c (openpgp_verify): Return a PgpValidity and set
-	the description as UTF-8 for later use in mail-format.c when
-	writing to GtkHTML.
-
-	* mail-format.c (try_inline_pgp_sig): Updated to use the new
-	PgpValidity code.
-	(handle_multipart_signed): Updated.
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Fix for api changes to
-	append_mail.
-
-	* Makefile.am (evolution_mail_SOURCES): Removed mail-threads.[ch].
-
-	* mail-threads.[ch]: Removed.
-
-	* subscribe-dialog.c (subscribe_do_get_store): Chagned to use new
-	thread stuff.  This is really getting boring.
-	(subscribe_do_subscribe_folder): Changed to use new thread stuff.
-	Last one at last, phew.
-
-	* session.c (register_callback): Changed to use new thread stuff.
-	YUCK.  I dropped some functionality, now the timeout callback
-	return is ignored, so basically it keeps running till finished.
-
-	* mail-ops.c (mail_operation_run): Removed, no longer used/needed.
-	(mail_do_append_mail): Changed to use new thread stuff.
-	(mail_do_transfer_messages): ditto.
-
-	* mail-local.c (local_storage_new_folder_cb): Use new thread
-	stuff, also only run synchronous for this operation.
-	(mail_local_reconfigure_folder): 
-	(reconfigure_clicked): Changed to use new mail thread stuff.
-
-	* mail-config.c (mail_config_check_service): Changed to use new
-	thread stuff.
-
-2001-02-20  Dan Winship  <danw@ximian.com>
-
-	* mail-vtrash.c (get_trash_get): Pass NULL, not "/" for @top.
-
-	* mail-callbacks.c (create_folders): Make this work with
-	CamelStores where the separator character isn't /. folder_created
-	and folder_deleted are still broken.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vtrash.c: Include the camel-vee-store.h header from the
-	uninstalled copy.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (mail_load_storages): Create vTrash folders
-	for all remote stores as well.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-vtrash.c (create_trash_vfolder): Add the auto-update flag
-	to the folder open flags.
-
-2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-vfolder.c (mail_vfolder_get_vfolder_storage): New handy
-	dandy function to ref and return the vfolder storage (will
-	probably be disavowed once I figure out how to get the vTrash
-	folder to show up in the EvolutionLocalStorage).
-
-	* main.c (main): Call vtrash_cleanup().
-
-	* mail-vtrash.c: New file.
-	(vtrash_uri_to_folder): vtrash: URI handler
-	(vtrash_create): Replacement async vtrash function for the old one
-	in mail-ops.c
-	(vtrash_cleanup): Cleanup code - unrefs the cached vtrash folders
-	and free's the hashtable.
-
-	* Makefile.am: Added mail-vtrash.[c,h].
-
-	* mail-tools.c (mail_tool_uri_to_folder): If we have a vtrash:
-	URI, call the vtrash URI handler function rather than continuing
-	on. Yes, I know this is a hack and it needs to be fixed.
-
-	* mail-ops.c (mail_do_setup_trash): Removed.
-	(mail_trash_get): Removed.
-
-	* component-factory.c (owner_set_cb): Create the vTrash folder for
-	the LocalStore here.
-
-	* mail-local.c (get_folder_info): Implement.
-
-2001-02-20  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Unref the driver here, in the
-	subthread, so we dont block the gui while it sync's all the
-	folders.
-	(fetch_mail_fetched): Rewmoved above code from here.
-
-2001-02-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (receive_status): Dont do the thaw/freeze set here.
-	(update_folders): "
-
-	* mail-vfolder.c (vfolder_refresh): Setup the virtual
-	'unmatched' folder by default.
-	(vfolder_uri_to_folder): HAndle UNMATCHED folder specially, it has
-	no explicit sources.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (receive_get_folder): Not sure it makes any
-	difference, but lets ref the folder while the hash table is locked
-	rather than after we unlock it.
-
-2001-02-16  Jeffrey Stedfast  <fejj@ximian.com>
-	
-	* main.c: * component-factory.c: Reverse the changes I made
-	yesterday.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* main.c (main): Have the mail-config and openpgp initialize here
-	instead.
-
-	* component-factory.c (owner_set_cb): No need to have mail-config
-	and openpgp init here.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (do_scan_subfolders): Use mail_storage_create_folder
-
-	* mail-callbacks.c (mail_storage_create_folder): Convenience
-	function so we can keep all the evolution_storage_add_new_folder()
-	code in one place as much as possible.
-
-	* subscribe-dialog.c (recursive_add_folder): Use 'name' rather
-	than the no-description bs since that's what all the other places
-	do.
-
-	* mail-callbacks.c (folder_created): New callback to handle the
-	"folder_created" signal - handles CamelFolderInfo's recursively.
-	(folder_deleted): Same but for "folder_deleted".
-
-	* component-factory.c (storage_create_folder): Instead of doing
-	the evolution_storage_new_folder() stuff by hand, pass it off to
-	the new callback: folder_created(). At some point this will be
-	unecessary as we'll attach this callback to the "folder_created"
-	signal.
-
-2001-02-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c: Wrapped the address compare functions in a
-	#ifdef
-	(address_compare): #ifdef the use of the smart address sorting
-	code and provide a #else for using g_strcasecmp().
-
-2001-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* openpgp-utils.c (openpgp_verify): Add the --no-tty flag.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* mail-mlist-magic.c: Rewrite explanatory comments to use normal
-	regexps rather than procmail weirdness. 
-	(check_sender): match "foo-owner" as well as "owner-foo".
-	(check_list_post): (New) Check for "List-Post: <mailto:..."
-	(mail_mlist_magic_detect_list): Iterate through an array of
-	function pointers rather than calling each checker explicitly.
-
-	* component-factory.c (add_storage): Connect to the
-	"create_folder" signal on the storage.
-	(storage_create_folder): Do folder creation.
-
-2001-02-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Setup the Trash folder.
-
-	* mail-ops.c (create_trash_vfolder): Do better error handling.
-	(populate_folder_urls): Oops, helps to strdup the url into the
-	array if we plan on freeing the data.
-	(mail_get_trash): New async function that may eventually replace
-	mail_do_setup_trash().
-	(do_setup_trash): Do better error handling.
-
-	* mail-local.c (mail_local_store_class_init): Override
-	get_folder_info.
-	(get_folder_info): Implement.
-
-2001-02-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* mail-local.c (do_reconfigure_folder): Fix some uninitialized
-	variables.
-
-2001-02-12  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): if doing a full update, save the
-	cursor pos and restore it afterwards.
-	(on_cursor_activated_cmd): Copy the current_uid to a new string.
-	I dont know why this is required, but it is.
-	(message_list_destroy): Free the cursor_uid as we're done with it.
-	(build_flat): IF the current uid disappeared from the list, then
-	unset the message.
-	(build_tree): Likewise.
-
-2001-02-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write): Clean out the cruft in the
-	Accounts section before writing the current accounts out to the
-	config file.
-
-	* mail-account-editor.c (construct): Strip the leading "/" from
-	the Namespace/Path entry if the provider doesn't require absolute
-	pathnames.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Mail.oaf.in: Mark strings for translation.
-	
-2001-02-11  Dan Winship  <danw@ximian.com>
-
-	* mail-callbacks.[ch]: Re-add non-static forward_messages.
-	mail-view.c needs it.
-
-2001-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (forward_inlined): Don't leak memory.
-	(forward_messages): change doinline to be a gboolean argument.
-
-2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (list_add_addresses): Check the full list of
-	IDs instead of just the default id and if we find an address
-	matching one of the user's ids, then save it.
-	(mail_generate_reply): Try to guess which account to use based
-	upon the list of To and Cc addresses and pass that as the 'From'
-	address to e_msg_composer_set_headers().
-	(forward_get_composer): Updated to reflect changes to
-	e-msg-composer.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* mail-config.glade.h: removed, xml-i18n-extract's the strings itself.
-	* *.glade: do not output_translatable_strings 
-	* Makefile.am: removed *.glade.h from EXTRA_DIST. 
-
-2001-02-09  Dan Winship  <danw@ximian.com>
-
-	* mail-local.c: Updates for CamelStore changes, small memory leak
-	fixes.
-	(lookup_folder): Removed (and moved into the reconfigure code)
-	since this method no longer exists in CamelStore.
-	(do_reconfigure_folder, etc): Update the info in the
-	MailLocalStore after reconfiguring.
-	(mail_local_lookup_folder): Removed
-
-	* local-config.glade: fix padding of the label_format
-
-	* message-list.c (ml_tree_value_at): Don't keep message infos
-	reffed across calls, since this can cause badness after a
-	reconfigure. Instead, just strdup the needed values and free those
-	on the next call.
-
-	* mail-tools.c (mail_tool_get_root_of_store): Unused, remove.
-	(mail_tool_get_inbox): use camel_store_get_inbox.
-
-	* evolution-outlook-importer.c (load_file_fn): 
-	* evolution-mbox-importer.c (load_file_fn): Use
-	mail_tool_get_local_inbox() instead of mail_importer_get_folder()
-
-	* mail-importer.c (mail_importer_get_folder): Removed
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (mail_generate_reply): New location for this
-	function.
-
-	* mail-format.c: Removed mail_generate_reply as it's ONLY ever
-	used in mail-callbacks.c.
-
-	* mail-ops.c (fetch_mail_fetch): Reworked some keep-mail-on-server
-	logic so that we ALWAYS look for a cached array of UIDs that we
-	may have downloaded previously so as not to download them again
-	even if we will be deleting them off the server. This fixes bug
-	#1344.
-
-2001-02-09  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (filter_folder_free): only free driver, if set.
-	(fetch_mail_fetched): Unref the driver here, so it can cleanup
-	before we call the 'done' callback.
-
-	* component-factory.c (owner_set_cb): Add setup for mail
-	autoreceive stuff.
-
-	* mail-send-recv.c (free_info_data): Free the send info's from teh
-	active hash, not the running list.
-	(receive_done): As we finish downloads, remove them and clean them
-	up, and also close the window.
-	(mail_autoreceive_setup): New function to setup & maintain
-	automatic download stuff.
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (construct): Set the sensitivity of the spin
-	button based on the state of the checkbox.
-
-	* mail-config.c (config_read): Properly do defaults here.
-	(mail_config_write): Removed some of the settings being saved
-	here.
-	(mail_config_write_on_exit): Save those settings here instead.
-
-2001-02-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-display.c (on_object_requested): Cast the CamelMedium to a
-	CamelMimePart before performing actions on it as if it were a
-	CamelMimePart.
-
-	* mail-config-druid.c (druid_finish): Save the auto-check settings.
-	(construct): Initialize auto-check widgets.
-	(mail_config_druid_get_auto_check): New function
-	(mail_config_druid_get_auto_check_minutes): New functions
-
-	* mail-config.c (config_read): Read in whether or not to check
-	every x minutes.
-	(mail_config_write): Save auto-check config data and SSL.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-autofilter.c (rule_add_subject): Use "contains" because the
-	subject might be broken into subparts and using the "is" rule will
-	then fail ;-)
-
-2001-02-08  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_send_receive):
-	(mail_receive_uri):  Init active_downloads hash if it hasn't been yet.
-
-2001-02-07  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (operation_status): Handle internal camel status return.
-	(receive_done): Remove active download when done.
-	(mail_receive_uri): Initiate download of a single source, with no gui.
-	(build_dialogue): Mark any new items as real active downloads.
-	(do_show_status): Make the progress bar optional.
-
-2001-02-06  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c: camel_cancel->camel_operation.
-
-	* mail-ops.old.c: camel_cancel->camel_operation.
-
-	* mail-ops.c: camel_cancel->camel_operation.
-
-	* mail-mt.c: camel_cancel->camel_operation. 
-
-	* mail-callbacks.c (stop_threads): camel_cancel->camel_operation.
-
-	* mail-mt.h: CamelCancel->CamelOperation.
-
-2001-02-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-mt.c (set_view_data): Check current_message for NULL - this
-	fixes a bug running under SunOS (not a major deal tho as it's in a
-	debug printf).
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_write_on_exit): Oops, save the
-	seen_timeout variable.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (evolution_mail_LDADD): Added libmenus.la.
-
-	* folder-browser-factory.c (control_activate): Added GalView menus
-	here.
-
-	* message-list.c, message-list.h (message_list_get_layout): Made
-	message_list_get_layout export.
-
-2001-02-06  Iain Holmes  <iain@ximian.com>
-
-	* mail-display.c (pixbuf_gen_idle): Set the size of the icon to 24x24
-	always.
-	(button_press): Function to toggle the disposition of an attachment.
-	(on_object_requested): New way to indicate functions on attachments.
-	
-	* message-list.c (hide_load_state): Free the olduid.
-
-2001-02-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Updated to checkfor
-	"(none)".
-
-	* mail-account-editor.c (entry_changed): Make sure the email
-	address is valid.
-
-	* mail-config-druid.c (identity_check): Check to make sure we have
-	a valid email address.
-	(is_email): New function to check a string to see if it's a valid
-	email address.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mbox-importer.c: We are now going to use a file
-	descriptor and a CamelMimeParser rather than a FILE pointer.
-	(load_file_fn): Open the file descriptor and initialize the
-	CamelMimeParser.
-	(importer_destroy_cb): Unref the mime parser.
-	(support_format_fn): Use an fd and use a case-insensitive
-	comparison as well as elimate a buffer overrun.
-	(process_item_fn): Process 1 CamelMimeMessage per invocation so as
-	to not lock up Iain's GUI and to work similar to the way Iain
-	originally coded it.
-
-2001-02-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-mbox-importer.c, evolution-mbox-importer.h: Moved
-	bonobo includes from the .c to the .h.  Include
-	evolution-mbox-importer.h in evolution-mbox-importer.c.
-
-	* evolution-outlook-importer.c, evolution-outlook-importer.h:
-	Moved bonobo includes from the .c to the .h.  Include
-	evolution-outlook-importer.h in evolution-outlook-importer.c.
-
-	* mail-callbacks.c: Include mail-send-recv.h.
-
-	* mail-local.c (mail_local_lookup_folder): Cast local_store to
-	CAMEL_STORE.
-
-	* mail-mt.c (mail_msg_cleanup): Make this function static.
-
-	* mail-send-recv.c, mail-send-recv.h: Created mail_send_recv.h.
-	Included it in mail-send-recv.c.  Added a #include
-	<libgnomeui/gnome-window-icon.h>.
-	(mail_send_receive): Added a cast.
-
-	* mail-summary.c (new_folder_cb, removed_folder_cb,
-	create_summary_view): Cast the source func in calling g_idle_add.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (try_inline_pgp_sig): New function to handle
-	inline pgp-signatures.
-
-	* mail-config-druid.c (construct): Keep track of the CheckSettings
-	check boxes.
-	(transport_next): Connect if the user says so.
-	(incoming_next): Same. Also, don't jump to the next page if
-	test-settings fails.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (incoming_next): Updated to not connect when
-	getting a list of authtypes.
-	(transport_next): No longer connects - again, this is
-	useless. Read the apply_changes argument for the reason why.
-
-	* mail-account-editor.c (apply_changes): Updated. Set the
-	'connect' argument to FALSE for now, this basically means that the
-	call is worthless tho so it may be best to either get rid of the
-	checks altogether or else make it connect.
-	(source_auth_init): Don't connect here, it's just plain annoying.
-	(transport_construct_authmenu): Same here.
-
-	* mail-config.c (mail_config_check_service): Now takes a connect
-	argument.
-
-2001-02-03  Michael Meeks  <michael@helixcode.com>
-
-	* mail-local.c (load_metainfo): Fix dodgy libxml allocation
-	pollution, and potential faults on NULL attributes.
-
-2001-02-02  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Cleaned up so we dont add
-	an unecessary level of indenting.
-
-	* message-list.c (ml_tree_value_at): For collapsed tree nodes,
-	scan the collapses nodes for the unread and status information.
-	Since we dont really have fake nodes anymore.
-
-2001-01-30  Ian Campbell  <ijc25@cam.ac.uk>
- 
- 	* message-list.c: Add support for new icons for being
- 	read/unread for fake root messages on threads.
- 
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* mail-send-recv.c (mail_send_receive): Only allow one send and
-	receive to be running at once.
-	(build_dialogue): Set the icon for the window.
-
-	* evolution-mbox-importer.c (support_format_fn): Only compare the first
-	5 bytes of the signature.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* folder-browser.c: Fix typo.
-	
-2001-01-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-importer.c (mail_importer_add_line): Cast the
-	camel_stream_mem_new() to a CamelStreamMem.
-
-2001-01-29  JP Rosevear  <jpr@ximian.com>
-
-	* main.c: Return efence ifdefs to 0 for solaris build
-
-2001-01-29  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (tree_equal): Debug function to compare the tree
-	we think we have, after an incremental update.
-	(build_tree): Check the tree after we've built it.
-	(build_tree): Oops, turn on BROKEN_ETREE again.
-
-	* mail-mt.c (mail_get_password): If we are being called from the
-	main gui thread, then just call the dialogue directly.  Ideally we
-	dont want this anyway but lets handle the case nicely.
-	(mail_get_password): Try locking around the password request, to
-	single-queue any password requests.
-	(mail_msg_init): Push an exit handler to clean it up on completion.
-
-	* mail-send-recv.c (receive_update_got_store): New function called
-	when the store has been retrieved asynchronously.
-	(mail_send_receive): Get the store asynchronously.  This was
-	causing problems where the password dialogue would try and be
-	called from the main thread via a message.
-
-	* mail-ops.c (mail_get_store): New function to get a store
-	(a)synchronously.  More or less taken from subscribe-dialog, which
-	i will remove later.
-	(mail_scan_subfolders): Try running the scan subfolder thing
-	asynchronously, to help startup time.  Not sure if this will work,
-	but presumably the shell can handle the folders appearing later
-	ok.
-
-2001-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Turns out that I was wrong
-	about the g_get_real_name mem leak, god damn glib for not
-	following the const char* standard.
-
-2001-01-28  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (management_prepare): Use UTF-8.
-	(set_defaults): Use UTF-8 and also fixed a memory leak by freeing
-	the string returned by g_get_real_name().
-	(mail_config_druid_get_account_name): Use UTF-8.
-	(mail_config_druid_get_full_name): Same.
-	(mail_config_druid_get_email_address): Same.
-	(mail_config_druid_get_organization): Same.
-
-	* mail-account-editor.c (apply_changes): Save UTF-8 strings rather
-	than gtk strings.
-	(construct): Use the UTF-8 convenience functions to set the gtk
-	entries for the ID fields.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Make the OK button the
-	default one.
-
-	* mail-search-dialogue.c (mail_search_dialogue_init): Use stock
-	buttons for OK and Cancel.  Make the OK button the default one.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Set a default size for
-	the window so that more rules are visible.
-
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Set a
-	default size for the window so that more rules are visible.
-
-2001-01-28  Not Zed  <NotZed@Ximian.com>
-
-	* mail-display.c (write_data_to_file): Changed to use
-	mail_save_part to save the data in another thread.
-	(save_data_cb): Hide the fileselector once we have a button press,
-	and are saving stuff.
-
-	* mail-ops.c (mail_save_part): New function to save a part content
-	asynchronously.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c (etable_key): Don't handle home and end keys
-	since %ETable deals with them now.
-
-2001-01-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* message-list.c (address_compare): Protect against NULL address
-	pointers.
-	(subject_compare): Same but for subject pointers.
-
-2001-01-27  Iain Holmes  <iain@ximian.com>
-
-	* mail-summary.c (create_summary_view): Applied patch from John R Sheets
-	to fix some warnings.
-	(idle_check): Fixed the prototype to fix some warnngs as well.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-display.c (get_embedded_for_component): Try a control
-	first, instead of an embeddable.
-
-2001-01-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* subscribe-dialog.c (populate_store_foreach): Check for a NULL
-	service->url as we obviously can't subscribe to folders on a
-	non-existant mail source :-)
-	(subscribe_do_get_store): Check for a NULL url here too, not that
-	we should need it anymore (due to the above fix) but it doesn't
-	hurt. Also, should we wait on the thread? Probably doesn't matter.
-
-2001-01-26  Iain Holmes  <iain@ximian.com>
-
-	* evolution-outlook-importer.c (load_file_fn): Replace fsetpos with
-	fseek and use a long instead of fpos_t.
-	(process_item_fn): Same.
-
-	* mail-importer.h: Add a frozen item to tell when the folder is frozen.
-
-	* evolution-mbox-importer.c (process_item_fn): Fix the blank message.
-	Set the frozen element.
-	(importer_destroy_cb): Thaw the folder if frozen.
-
-2001-01-26  Dan Winship  <danw@ximian.com>
-
-	* mail-identify.c (mail_identify_mime_part): Fix an uninitialized
-	variable use.
-
-2001-01-26  Jason Leach  <jasonleach@usa.net>
-
-	(Fixing an old FIXME)
-	
-	* component-factory.c (create_vfolder_storage): removing
-	create_vfolder_storage, replacing call to it with
-	vfolder_create_storage.
-
-2001-01-26  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): Define BROKEN_ETREE again, till we
-	get this stuff fixed better.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c: Moved teh "sender contains" item to the end of
-	the list, so the gui doesn't suddenly change on everyone.  Fixed
-	the sender-contains search string to be a valid s-exp (ha, didn't
-	test it even once eh ettore?!)
-	(search_save): Dont have the sender contains as the default case
-	(which well, never gets called anyway), oops i guess i should've
-	reviewed the patch a little more.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser.c: Add a missing parenthesis to the "from
-	contains" rule.  Also make it the last item instead of the first
-	one.
-
-2001-01-25  Iain Holmes  <iain@ximian.com>
-
-	* component-factory.c (component_factory_init): Init the mail
-	mail importers.
-
-	* mail-local.[ch] (mail_local_lookup_folder): retrieve the local
-	folder given by the name.
-
-	* mail-importer.[ch]: Basic functions for all importers to use.
-
-	* evolution-mbox-importer.[ch]: Mbox importer.
-
-2001-01-25  Jeffrey Stedfast  <fejj@ximian.com>
-	The following fixes seem to clear up the problem of new mail not
-	being shown in the Inbox and/or other folders where mail had been
-	delivered.
-
-	* mail-send-recv.c (build_dialogue): Freeze the inbox.
-	(receive_get_folder): Freeze folders before dumping them into the
-	hash table.
-	(free_folder_info): Thaw the folder.
-	(free_info_data): Thaw the Inbox.
-
-2001-01-25  Jason Leach  <jasonleach@usa.net>
-
-	(Don't prompt about unsaved changes for replies/forwards that have
-	 not actually been modified)
-	
-	* mail-callbacks.c (do_forward_inline): Unset the has_changed for
-	the message composer.
-	(do_forward_attach): Same here.
-	(mail_reply): And here.
-
-2001-01-25  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (mail_content_loaded): Check if a message part's
-	content is available, and if it's not, queue a thread that will
-	load it and then queue an idle-handler redisplay of the message.
-	(call_handler_function): Call mail_content_loaded() on the part
-	and don't try to display it if it's currently offline.
-	(get_data_wrapper_text): Simplify a bit
-
-	* mail-display.c (mail_display_queue_redisplay): rename and make
-	non-static.
-	(mail_display_redisplay): Use a "new and improved" way of
-	preserving the GtkHTML scroll location. ("new and improved" is
-	code for "gross and hackish", but there should be a real interface
-	for this eventually.)
-	(on_url_requested): Use mail_content_loaded() and don't write out
-	offline cid: URLs
-
-	* mail-identify.c (mail_identify_mime_part): Use
-	mail_content_loaded and don't try to identify the data if it's
-	offline.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made the message list pay attention to the
-	"cursor_activated" signal instead of the "cursor_change" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (update_pixmaps): Set the print icon
-	for various other items.
-	(set_pixmap): Be a bit more verbose in the warning message if the
-	icon isn't found [i.e. report the name of the file too].
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* folder-browser-factory.c (update_pixmaps): Set the pixmaps for
-	the "/menu/Folder/FolderConfig" and "/menu/Settings/SetMailConfig"
-	items.
-	(set_pixmap): Don't prepend the "buttons" prefix.
-	(update_pixmaps): Update accordingly.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser.c (search_string[]): Fix the subject match
-	expression, which was missing a closing ).
-
-	* mail-send-recv.c (do_show_status): Escape any % signs in the
-	string before setting the format string.
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Added a 3rd page to the account editor to
-	allow users to set their HTML sending preference and also allow
-	them to change their message status timeout.
-
-	* mail-accounts.c (construct): Added handlers for the send-html
-	checkbox and for the mark-message-as timeout spinbutton.
-
-2001-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (apply_changes): Save the source and
-	transport changes whether the user can connect to the host or not.
-
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Applied patch from Tuomas Kuosmanen <tigert@ximian.com>]
-
-	* folder-browser.c: Added enum value `ESB_SENDER_CONTAINS' as well
-	as a "Sender contains" item to the search menu.  Also add a
-	corresponding "(match-all)" rule to the `search_string' array.
-	(search_save): Handle `ESB_SENDER_CONTAINS' here.
-
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_Mail.oafinfo: Fixed the repo_ids so that they
-	use the right syntax.
-
-2001-01-23  Dan Winship  <danw@ximian.com>
-
-	* folder-browser-factory.c: 
-	* mail-callbacks.c (send_receive_mail): Fix spelling.
-
-2001-01-24  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (fetch_mail_fetch): Set the default folder when
-	copying to mbox.  This is a quick fix, i might need to do a slight
-	redesign to clean it up.
-
-2001-01-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-send-recv.c (build_dialogue): Make sure the source->url is
-	not NULL (which is perfectly valid).
-	(mail_send_receive): Where oh where should my prototype be?
-	(receive_get_folder): Make sure to ref the folder before you add
-	it to the hash table.
-
-	* openpgp-utils.c:
-	* mail-crypto.c: A few minor tweaks.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* message-list.c (build_tree): Try turning off the BROKEN_ETREE
-	thing.  It seems to work ok (better?) now, but if its still broken
-	i'll remove it again for the next release.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (set_defaults): Automagically fill in the
-	user's default transport if he/she has setup previous accounts.
-
-	* mail-format.c (handle_multipart_signed): Just wrote a temp way
-	of reporting success/fail of PGP/MIME signature verification
-	status.
-
-2001-01-22  Iain Holmes  <iain@ximian.com>
-
-	* evolution-outlook-importer.c: Outlook Express 4 .mbx importer.
-
-	* component-factory.c (component_factory_init): initialise the
-	outlook importer.
-
-	* GNOME_Evolution_Mail.oafinfo: Add the details for the Outlook
-	importer.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-mt.[ch]: make mail_gui_thread non-static.
-
-	* main.c (main): Set up signal handler for SEGV, BUS, FPE
-	(segv_redirect): if a gnome-segv'ing signal is received in
-	a thread other than mail_gui_thread, re-deliver it to that
-	thread to work around a problem with the gnome segv handler.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (handle_multipart_signed): Fixed to display
-	subparts (other than the signature part) and started to write a
-	pretty way to show if the signature verified or not.
-
-2001-01-23  Not Zed  <NotZed@Ximian.com>
-
-	* mail-crypto.c (pgp_mime_part_verify): Fix a double-free problem.
-
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (incoming_type_changed): Oops, danw didn't
-	know 'provider' could be NULL :-)
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-config-druid.c (incoming_type_changed): Change "Path:"
-	label to "Namespace:" for IMAP. Use $MAILDIR rather than $MAIL for
-	Maildir. If $MAIL isn't set, guess.
-
-	* component-factory.c (mail_hash_storage): Function to add a
-	store/storage mapping.
-	(add_storage): Use it.
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Use the vfolder name
-	rather than the string "mbox" (which wasn't ever used for
-	anything) in the vfolder URL. (Combined with the CamelVeeFolder
-	change, this makes camel_folder_get_name() return a pretty name
-	for vfolders now.) Call mail_hash_storage() to record the
-	CamelVeeStore/vfolder_storage mapping. (Ideally, there'd only be a
-	single CamelVeeStore... this is just a quick hack.)
-
-	vfolders now display their unread count once you've looked at them
-	once.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* mail-tools.h: s/filter-driver.h/camel-filter-driver.h/ and
-	update first arg of mail_too_filter_get_folder_func
-
-	* mail-tools.c (mail_tool_filter_get_folder_func): Update first
-	arg to CamelFilterDriver *
-
-	* mail-send-recv.c (receive_status): 
-	* mail-ops.c (send_queue_send): s/FILTER/CAMEL_FILTER/
-
-	* mail-callbacks.c: Remove filter-driver.h include
-
-	* mail-accounts.c: Put the news functions inside #ifdef
-	ENABLE_NNTP to prevent warnings about unused statis functions.
-
-	* subscribe-dialog.c (subscribe_folders, unsubscribe_folders,
-	subscribe_refresh_list): Update prototype to match BONOBO_UI_VERB. 
-	(populate_store_list): add a de-constifying cast
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* .cvsignore: Added temp profiling files.
-
-	* component-factory.c (owner_set_cb): remove a warning with
-	conditional news compilation.
-
-	* mail-ops.h: Cleaned up the header list.
-	
-2001-01-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c (mail_crypto_is_rfc2015_signed): Helps if I spell
-	stuff correctly so it can pass the tests ;-)
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* folder-browser-factory.c: Replace the old get_send mail with the
-	new one (button).
-
-	* mail-ops.c (set_x_mailer): 
-	(mail_load_evolution_rule_context): 
-	(mail_do_fetch_mail): 
-	(mail_do_filter_ondemand): 
-	(mail_send_mail_old): 
-	(mail_do_send_queue): All removed, (for) now lives in mail-send-recv.c.
-	(load_context): 
-	(setup_filter_driver): 
-	(filter_get_folder): 
-	(mail_filter_folder): 
-	(mail_fetch_mail): 
-	(mail_update_subfolders): 
-	(mail_send_mail): 
-	(mail_send_queue): New equivalents of all these fundtions, moved
-	from mail-send-recv.c ...
-	(mail_filter_on_demand): Moved here too.
-	(mail_load_filter_context): Export this.
-
-	* mail-callbacks.c (apply_filters): Use the new
-	mail_filter_on_demand() call.
-	(send_receieve_mail): Use mail_send_receive to do the work.  Add a
-	little error handling here that used to be elsewhere.
-	(send_queued_mail): Removed.
-	(fetch_mail): Removed.
-	(select_first_unread): #ifdef'd this out.  Not sure if this still
-	makes sense, but it doesn't get run right now anyway.
-	(composer_postpone_cb): Fix the setting of message flags.  You
-	dont need to get them first, ever.
-
-	* mail-send-recv.c (mail_send_message): Dont use
-	mail_tool_send_via_transport anymore (it does nothing useful).
-
-	* mail-tools.c (mail_tool_camel_lock_up): Turned into a noop.
-	(mail_tool_camel_lock_down): And here too.
-	(mail_tool_move_folder_contents): Removed from the code (hasn't
-	bene used for ages).
-	(mail_tool_send_via_transport): Removed, it doesn't save anything.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* component-factory.c (owner_set_cb): Initialize OpenPGP.
-
-	* openpgp-utils.c (openpgp_init): No longer takes a passphrase
-	callback, we'll just use the mail-session one. Makes life simpler.
-	(pgp_get_passphrase): Use mail_session_request_dialog().
-
-	* mail-ops.c (do_send_queue): Remove the X-Evolution header before
-	we send.
-
-	* mail-crypto.c (pgp_mime_part_sign): Don't forget to unref the
-	filters.
-	(pgp_mime_part_verify): Same.
-	(pgp_mime_part_encrypt): Same.
-	(pgp_mime_part_decrypt): Take NotZed's advice and use
-	camel_stream_mem_new_with_buffer instead of writing to a new
-	stream_mem. Also use camel_data_wrapper_construct_from_stream
-	instead of creating a parser and using that.
-
-2001-01-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-crypto.c: Updated header comment and fixed some ref/unref
-	count problems in the various functions. Also fixed some other
-	little things.
-	(pgp_mime_part_encrypt): Do some canonical CRLF action before
-	encrypting.
-	(pgp_mime_part_sign): Make sure we are the owners of the byte
-	array.
-	(pgp_mime_part_verify): Same.
-	(pgp_mime_part_encrypt): Same.
-	(pgp_mime_part_decrypt): Same.
-
-2001-01-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Added
-	draw-focus="true" and selection-mode="browse" attributes to the
-	ETableSpecification.
-	(message_list_construct): Removed setting the "draw_focus"
-	argument since it doesn't exist any more.
-
-2001-01-21  Not Zed  <NotZed@Ximian.com>
-
-	* mail-mt.c (mail_msg_new): Init a cancel field in the message.
-	(mail_msg_free): Free it.
-	(mail_msg_cancel): New function to attempt to cancel an operation
-	by id.  Impelementation functions can still be uncancellable by
-	not registering for cancellation, etc, or do it themselves as
-	well.
-
-	* mail-send-recv.c (fetch_mail_filter_folder): set folder_uid's
-	properly, so we can save it later.
-	(filter_folder_filter): Renamed from fetch_mail_filter_folder,
-	since its going to be used for all filtering.
-	(mail_fetch_mail): Changed from mail_filter_mail.
-	(mail_filter_folder): New function, replaces
-	mail_do_filter_ondemand functionality.
-	(mail_filter_on_demand): New function, actually replaces
-	mail_do_filter_ondemand.
-	(receive_get_folder): Added an exception arg.
-	(mail_send_message): New function to just send a message.
-	(send_mail_send): Use mail_send_message.
-	(send_queue_send): New send qeue code, use mail_send_message, and
-	clean up some stuff.
-	(mail_send_receive): Changed from mail_receive.
-	(build_dialogue): Setup the sending data, as well.
-	(mail_update_subfolders): New function to update folder info.
-	(send_mail_send): hook into cancellation if we want.
-
-2001-01-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-ops.c (do_send_queue): Strip leading space from the
-	transport url gotten from the message.
-
-2001-01-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-format.c (mail_generate_reply): If the name is empty
-	string, use the address.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (pixmap_press): Update for e_popup_menu_run
-	change.
-
-	* folder-browser.c (etable_key): On GDK_Menu (the menu key on
-	105-key keyboards), pop up the right-click menu.
-	(on_right_click): update for e_popup_menu_run change.
-	
-	* subscribe-dialog.c (recursive_add_folder): New function to add a
-	folder and any parents of it that don't yet exist. Fixes bugzilla
-	#1028.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* mail-send-recv.c: New swanky send/recieve thingy, well it so far
-	only receives (pop/mbox).  Ignore all the warnings for now, and
-	the ugly 'button' to run it.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* folder-browser-factory.c: Added the next/previous toolbar
-	buttons.
-
-	* mail-callbacks.c (next_msg): New callback so we can have a next
-	toolbar button.
-	(previous_msg): Same but for previous.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Anna's dialog now supports
-	SSL so we can get rid of the ssl-support checks. Also work around
-	the fact that Anna's dialog doesn't have an optionmenu for the
-	transport type, it's a label instead.
-	(transport_type_init): Cast the transport_type widget to a
-	GtkOptionMenu where appropriate as the widget that stores it is
-	now generic.
-	(apply_changes): Modify code to work with anna's dialog...*sigh*
-	(ok_clicked): Alert the user that one or more servers failed to
-	validate and allow him to continue anyway.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_set_pgp_path): New config function to
-	set the path to the pgp binary.
-	(mail_config_get_pgp_path): Gee I wonder...
-	(mail_config_set_pgp_type): This one sets the type (ie PGP5, PGP2,
-	or GnuPG - see openpgp-utils.h for values)
-	(mail_config_get_pgp_type): Der.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Handle NULL source and, while
-	we're at it, transport URLs. Apparently camel_url_new() and/or
-	camel-url_free() don't handle NULL input well.
-
-	* mail-accounts.c (load_accounts): Handle NULL source URLs.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (construct): Oops. "url && url->host"
-	doesn't do much without the '?' and ':' ;-)
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* mail-ops.c (set_x_mailer): New function.
-	(send_mail_send): Use it.
-	(do_send_queue): Use it.
-
-2001-01-17  Martin Norbäck  <d95mback@dtek.chalmers.se>
-
-	* openpgp-utils.c (pgp_get_passphrase): Changed the word entry
-	to enter, which is the correct word to use.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (ask_confirm_for_empty_subject): Update to use
-	EMessageBox and to record if the user doesn't want to ever see
-	this dialog again.
-
-	* mail-config.c (mail_config_get_prompt_empty_subject): New config
-	function.
-	(mail_config_set_prompt_empty_subject): Another new one.
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (apply_changes): Modify to be able to
-	handle a NULL source_url.
-	(source_auth_init): Allow for a NULL source url.
-	(source_check): Same.
-
-	* mail-config.c (mail_config_write): Allow for NULL source
-	URLs. And while we're at it, NULL transport URLs as well. Might as
-	well save the use_ssl variable too.
-	(config_read): Same.
-
-	* mail-config-druid.c (druid_finish): Modify to allow a NULL
-	source url.
-	(incoming_next): Modify to check for a NULL source and jump to the
-	transport page if one is encountered (this means the user decided
-	not to config a source).
-	(incoming_type_changed): Modify to set all widgets insensitive if
-	the user selected the "None" source menu item (aka NULL provider).
-	(incoming_check): Modify to allow the user to go to the next page
-	when he/she has chosen "None" for their source type.
-	(mail_config_druid_get_source_url): Return NULL if the provider is
-	NULL.
-	(mail_config_druid_get_transport_url): Same.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* mail-display.c (on_object_requested): Don't do thumbnails for
-	offline images
-
-2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-callbacks.c (save_msg_ok): If the user hits "No", then
-	don't destroy the filesel window.
-
-	* mail-ops.c (save_messages_save): Open with mode 0666 as danw
-	suggests.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* component-factory.c (owner_set_cb): only load the news storage
-	if ENABLE_NNTP.
-
-	* mail-accounts.c (construct): if !ENABLE_NNTP, remove the news
-	page from the dialog.
-
-2001-01-16  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): use
-	e_msg_composer_mark_text_orig
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* mail-ops.c (send_mail_send, do_send_queue): Update the X-Mailer
-	header to use the string specified by configure.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* subscribe-dialog.c: removed unecessary #inlcude "e-title-bar.h"
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* openpgp-utils.c (pgp_get_passphrase): Fix a string causing
-	translation problems.  Bug #1147.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* mail-ops.c (mail_do_fetch_mail): Setup a cancellation handle.
-	(do_fetch_mail): REgister for cancellation here.
-	(cleanup_fetch_mail): And unregister for cancellation here.
-	(mail_get_message): Add a cancel handle.
-	(get_message_get): Register/deregister for cancel.
-	(get_message_free): & clean up.
-
-	* mail-mt.c (mail_msg_received): Removed debuggng.
-
-	* mail-callbacks.c (stop_threads): Callback for stopping.
-
-	* folder-browser-factory.c: Add a stop button verb thingy.
-	(control_activate): Disable the stop button by default.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* message-list.c, message-list.h: Change from using filters for
-	date and size to using e_cell_date and e_cell_size.  Moved a bunch
-	of includes from the message-list.h to the message-list.c.
-
-2001-01-15  Miguel de Icaza  <miguel@ximian.com>
-
-	* mail-callbacks.c (configure_mail): Set the default button to
-	`Yes' here. 
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-account-editor.c (source_auth_init): If the preferred
-	authmech isn't found, default to the first one in the list.
-	(transport_construct_authmenu): This function already did the
-	above but I made it simpler.
-	(apply_changes): A number of cleanups.
-
-2001-01-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config-druid.c (druid_finish): Fixed mail_load_storages to
-	make a mini GSList of the account, not the account->source. Oops.
-
-	* mail-accounts.c (news_delete): Updated to use the remove_news()
-	function.
-
-	* mail-config.c (mail_config_remove_news): New convenience
-	function for removing news accounts.
-	(mail_config_remove_account): Pretty much the same thing.
-
-	* mail-ops.c (do_send_queue): Get the X-Evolution-Transport URL
-	and use that if it exists, else fall back on the default
-	transport.
-
-	* mail-callbacks.c (composer_postpone_cb): Set an
-	X-Evolution-Transport header.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Removed GPG_* variables.
-
-	* component-factory.c (mail_load_storages): Now takes a
-	'is_account_data' variable to specify whether the sources is a
-	list of accounts of a list of services. Basically, the only time
-	you should pass in FALSE is when you are setting up NNTP storages.
-	(add_storage): Now takes a 'name' argument that specifies the name
-	to use in the storage.
-	(owner_set_cb): Updated to pass TRUE for accounts and FALSE for
-	news servers into mail_load_storages.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed filter_date and filter_size to match the
-	changes in gal.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.glade: Anna's dialogs.
-
-	* mail-config.c (mail_config_get_account_by_address):
-	Removed. Danw and I decided on setting a X-Evolution-Transport
-	header on messages going to the Outbox so we can later guess which
-	transport to use when sending it.
-
-	* mail-account-editor.c (apply_changes): Update to some day be
-	able to support SSL.
-	(construct): Update for Anna's dialogs...
-
-	* subscribe-dialog.c (populate_store_list): Updated to reflect
-	past changes to the mail-config API.
-
-2001-01-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Get the account by using
-	the new e_msg_composer_get_preferred_account() function. Also
-	check to make sure everything is configured (in case they deleted
-	their accounts while composing mail?).
-
-	* mail-config.c (mail_config_get_account_by_address): New
-	convenience function.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (component_fn): Pass NULL as the
-	@copy_folder_fn arg to `evolution_shell_component_new()'.
-
-	* folder-browser.c (on_right_click): Removed hide menu.  It
-	belongs to the view menu now.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* message-list.c: Add strings for localization
-
-	* folder-browser.c: Rename "Save" to "Store search as vFolder".
-
-2001-01-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* mail-display.c (on_object_requested): Unref the property bag
-	when we are done with it.
-	(get_embedded_for_component): Moved the code to request the
-	embeddable/control to a separate function.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* mail-config.c (mail_config_get_account_by_name): New convenience
-	function that I will need later when I redo the composer From
-	field.
-
-	* mail-display.c (on_object_requested): Update to reflect past
-	changes to the mail-config API.
-
-	* session.c (mail_session_set_password): strdup() the key.
-
-	* mail-config-druid.c (construct): We don't want to be able to set
-	the reply-to in the config druid.
-	(druid_finish): Don't set a reply-to anymore.
-	(mail_config_druid_finalise): Don't unref the providers.
-
-	* mail-config.glade: Took out the Reply-To field in the druid.
-
-2001-01-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* mail-config-druid.c (incoming_type_changed): Guess the default
-	MAIL value for MBOX and Maildir files.
-
-	* mail-callbacks.c (configure_mail): Force finalization of the
-	function before returning fixing the FIXME that was there.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (transport_next): If the service_check
-	fails, pop-up a warning dialog letting the user know he or she may
-	have problems and then let them continue on with their lives.
-	(incoming_next): Same (+ jump them over the auth page to the
-	transport page).
-
-	* mail-account-editor.c (apply_changes): Eek! Don't destroy the
-	account if the connection fails, duh. This is what is causing the
-	segfaults.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* folder-browser.c (got_folder): Connect to folder_changed as well
-	as message_changed for updating unread count
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* GNOME_Evolution_Mail.oafinfo: Add Bonobo/ItemContainer as the
-	set of supported interfaces in GNOME_Evolution_Mail_Composer
-	component.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* mail-format.c (write_field_to_stream): Translate the header name
-	to UTF8.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (configure_mail): New function that explains to
-	the user why he can't do the action he requested and then procedes
-	to ask if he'd like to configure his accounts now.
-	(check_send_configuration): If the user doesn't have configured
-	accounts, don't let him continue and call configure_mail().
-	(fetch_mail): Same.
-	(send_queued_mail): Same.
-	(send_receieve_mail): Same.
-
-	* mail-config.c (mail_config_write): Don't save a "is_configured"
-	variable. Instead we'll just check to see if we have accounts - if
-	yes, then configured == TRUE.
-	(mail_config_is_configured): return accounts != NULL.
-	(mail_config_get_default_account): Mark the first account as the
-	default if none are marked.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c (source_auth_type_changed): Set the
-	sensitivity of the Password label too.
-
-	* mail-config-druid.c (transport_back): New callback to handle
-	when the user hits the "back" button when on the transport
-	page. This is needed to handle the case where we don't want to
-	show the user the auth page (due to there being no auth choices).
-	(incoming_next): If we are going to skip over the auth page, set
-	the 'have_auth_page' variable to FALSE.
-	(construct): Initialize the have_auth_page to TRUE.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (incoming_type_changed): Grab the focus of
-	the first widget that is sensitive.
-	(transport_type_changed): Same.
-	(identity_prepare): Grab the focus of the name entry.
-
-	* mail-callbacks.c (send_queued_mail): Prevent Federico's segfault.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c (auth_type_changed): Clear the password
-	entry if it's not allowed.
-	(transport_type_changed): Clear the hostname if it is not allowed
-	by the provider type.
-
-	* mail-account-editor.c (transport_type_changed): If the hostname
-	is allowed, clear it.
-
-	* mail-config-druid.c (incoming_type_changed): Clear the contents
-	of the entry boxes that are not to be used.
-	(mail_config_druid_get_source_url): If the text in the entry is
-	emptry string, don't set it' contents in the url.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-callbacks.c (print_msg): Fix proto.
-	(print_preview_msg): Fix proto.
-
-	* subscribe-dialog.c: Remove more UNSAFE macros.
-
-2001-01-09  Jason Leach  <jasonleach@usa.net>
-
-	* mail-display.c (pixmap_press): Bugfix for #1077: scrollwheel
-	doesn't work while hovering over an attachment icon.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.glade: Moved to mail-config.glade
-
-	* mail-accounts.c (construct): Updated to use mail-config.glade.
-
-	* mail-account-editor.c (construct): Updated to use
-	mail-config.glade.
-
-	* mail-config-druid.c (construct): Updated to use
-	mail-config.glade.
-
-	* mail.h: Added the new mail config headers.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (local_folder_changed_proxy): Change
-	mail_op_forward_event to mail_proxy_event.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (save_messages_save): Let the system umask determine
-	the permissions of this file.
-
-	* mail-config-druid.c (incoming_type_changed): Gray out the
-	appropriate labels too.
-	(auth_type_changed): And here.
-	(transport_type_changed): Here too...
-
-	* mail-account-editor.c (source_check): Gray out the appropriate
-	labels too.
-	(transport_type_changed): And here too.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c: For all optionmenu's, set the appropriate
-	'history'.
-	(keep_mail_check): Set the keep-on-server checkbutton sensitivity
-	based on whether or not the store is a storage or not.
-	(construct): Call keep_mail_check().
-
-	* mail-config-druid.c (incoming_type_changed): Set the
-	keep-on-server checkbutton sensitivity based on whether or not the
-	store is a storage or not.
-
-	* mail-accounts.c (construct): Make sure the dialog isn't a
-	scrunched little thingy.
-
-2001-01-09  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDFLAGS): Add -export-dynamic, so
-	libglade can resolve evolution-mail symbols.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c: Updated.
-	(decode_pgp): Get rid of #ifdef PGP_PROGRAM's and handle
-	appropriately.
-	(handle_multipart_signed): Same.
-	(handle_multipart_encrypted): Same.
-
-	* Makefile.am: Added openpgp-utils.[c,h] to the build.
-	
-	* openpgp-utils.c: New source file containing all of the pgp
-	interface code.
-
-	* mail-crypto.c: Removed all of the openpgp funtions as they are
-	being moved to a new file.
-	(mail_crypto_is_rfc2015_signed): Renamed.
-	(mail_crypto_is_rfc2015_encrypted): Renamed.
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* session.c (mail_session_set_password): New function to set the
-	password for a given url.
-	
-	* mail-config-druid.c (druid_finish): Don't save the password in
-	the source url, instead insert it into the save-password hash.
-	(mail_config_druid_get_source_url): Check to make sure the
-	authmech isn't "", if it is then don't set the authmech.
-
-	* mail-account-editor.c (apply_changes): Don't save the password
-	in the source url, instead insert it into the save-password
-	hash. Also check to make sure we don't set an empty string as the
-	authmech for the source or transport.
-	
-	* mail-accounts.c (mail_default): After reloading the accounts,
-	reselect the previously selected account.
-	(mail_delete): Same.
-
-	* mail-config-druid.c (druid_cancel): Fixed segfault bug.
-
-2001-01-09  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (write_headers): remove </center><p>
-	(handle_text_plain): add <font size=\"-3\">&nbsp</font><br> before
-	msg text
-	(handle_text_plain_flowed): ditto
-
-2001-01-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-accounts.c (mail_default): Write the config data and reload
-	the accounts list so the "default" tag is relocated.
-	(mail_delete): Write the config data here too.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: 
-	* component-factory.c: 
-	* folder-browser-factory.c:
-	* folder-browser.c: 
-	* mail-accounts.[c,h]:
-	* mail-account-editor.[c,h]:
-	* mail-callbacks.c: 
-	* mail-config.[c,h]: 
-	* mail-config-druid.[c,h]:
-	* mail-config-druid.glade:
-	* mail-display.c: 
-	* mail-format.c: 
-	* mail-tools.c: Brand spankin' new config druid, editor, 
-	and manager.
-
-2001-01-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: Add an #include <errno.h>
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: 
-	* component-factory.c: 
-	* folder-browser-factory.c:
-	* folder-browser.c: 
-	* mail-callbacks.c: 
-	* mail-config.[c,h]: 
-	* mail-display.c: 
-	* mail-format.c: 
-	* mail-tools.c: Reverted mail-config changes temporarily until 
-	I get it working correctly.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: More lovely fixes...
-
-	* mail-callbacks.c: Don't segfault if a default account doesn't
-	exist.
-
-2001-01-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: A bunch of fixes.
-
-	* mail-accounts.c: More fixes...
-
-	* mail-account-editor.c (construct): Reparent the notebook to the
-	editor->vbox and set the resize policy.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (providers_config): Use a
-	gnome_dialog_run_and_close().
-
-	* mail-accounts.c (construct): Reparent the notebook to the
-	dialog->vbox not to the dialog itself. Also set the resize policy
-	to allow the user to stretch it.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-tools.c (mail_tool_quote_message): Updated to reflect
-	changes to the mail-config API.
-
-	* mail-display.c (redisplay): Updated to reflect changes to the
-	mail-config API.
-
-	* mail-callbacks.c (providers_config): Use the new account dialog.
-
-	* mail-config-druid.c (druid_finish): Load the new storage into
-	the shell.
-	(mail_config_druid_new): Take a shell argument.
-
-	* mail-format.c (mail_generate_reply): Updated to reflect changes
-	to the mail-config API.
-
-	* mail-config-druid.c: Fixed this to build.
-
-	* mail-callbacks.c (check_send_configuration): Updated to reflect
-	changes to the mail-config API.
-	(create_msg_composer): Same.
-	(forward_get_composer): Same.
-	(send_queued_mail): Same.
-	(composer_send_cb): Same.
-
-	* mail-account-editor.c: Updated to build cleanly.  *
-	mail-config-druid.c: Same.  * mail-accounts.c: Same.
-
-	* folder-browser-factory.c (control_activate): Updated for API
-	changes in mail-config.
-
-	* folder-browser.c (done_message_selected): Updated for API
-	changed in mail-config.
-	(folder_browser_gui_init): Same.
-	(got_folder): Same.
-
-	* component-factory.c (owner_set_cb): After using the sources
-	list, free it as it is no longer a const GSList as with the older
-	mail-config code.
-
-	* mail-config.c: Totally rewritten.
-
-2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* mail-accounts.c (mail_edit): Implemented.
-
-	* mail-account-editor.c (apply_clicked): Implemented.
-	(ok_clicked): Implemented.
-	(cancel_clicked): Implemented.
-	(source_auth_type_changed): Implemented.
-	(source_auth_init): Implemented.
-	(transport_construct_authmenu): Implemented.
-	(transport_type_changed): Updated to change regenerate the auth
-	option menu.
-	(construct): Attached callbacks to OK, Apply and Cancel buttons.
-
-	* mail-account-editor.c (source_auth_init): Use the new
-	mail_config_check_service().
-
-	* mail-config-druid.c: Remove check_service() as it will be moved
-	into mail-config.
-
-2001-01-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_select): Made it so that going to
-	the next or previous message in the list will at least move one
-	message, even if the current message matches the query.  This
-	makes 'n' go to the next unread message, even if the current
-	message is unread.
-
-2001-01-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.c: Coded a bunch of the methods.
-
-2001-01-04  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (idle_check): Check if the HTML for the current
-	summary has been created, and if not then keep trying until it
-	has.
-	(new_folder_cb)
-	(removed_folder_cb)
-	(create_summary_view): Use the idle_check function to generate the
-	summary.
-	(create_summary_view): Don't set the HTML here. Set it via the
-	pipe.
-
-2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-account-editor.[c,h]: New source files to provide an
-	account editor widget.
-
-	* mail-config-druid.c (auth_type_changed): Set the authproto on
-	the druid so we can look it up later.
-
-2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-accounts.c (mail_add): Since the druid now handles adding
-	the new account to the config, we'll just connect to the destroy
-	event and show the druid.
-	(mail_add_finished): Just reload the account list here.
-
-	* mail-config-druid.c (druid_finish): New callback to handle the
-	"finish" signal. On second thought, it seems it would be best for
-	the finish callback to be here rather than in mail-accounts.c.
-
-	* mail-accounts.[c,h]: Added. Contains source for the Account manager
-	window. And just like mail-config-druid.c, it's not yet complete.
-
-	* mail-config-druid.c (mail_config_druid_get_incoming_keep_mail):
-	Renamed from _delete_mail
-	(mail_config_druid_get_transport_url): New convenience function
-	that replaces the get_hostname, get_protocol, etc.
-	(mail_config_druid_get_source_url): Same.
-
-	* mail-config-druid.glade: Changed "Delete mail from server" to
-	"Keep mail on server" as this has a more positive ring to it. Both
-	I and Aaron agree this is the better phrase.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: Fixed a few 'Oops'es.
-
-	* mail-config-druid.glade: Added a "Default" button for marking an
-	account as the default.
-
-2001-01-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.glade: Updated. What else can I say?
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (got_folder): Connect to "message_changed" on
-	the folder if it's on a remote storage.
-	(update_unread_count): Update the folder unread count / highlight
-	in the shell when the unread message count changes
-
-2001-01-04  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (mail_do_send_mail): Removed old implementation.
-
-	* folder-browser.c (do_message_selected): If we haven't got a real
-	uid, then clear the display instead.
-
-	* message-list.c (message_list_drag_data_get): Use new save
-	message function, and also wait for it to finish before
-	continuing.
-	(folder_changed): 
-	(message_changed): Use mail_proxy_event instead of
-	mail_do_forward.
-	(mail_regen_list): New iplementation to replace the old.
-	: remove <gnome.h> from headers.  Dont define timeit by default.
-	(main_folder_changed): 
-	(message_list_set_folder): 
-	(message_list_set_threaded): 
-	(message_list_set_search): 
-	(message_list_hide_add): 
-	(message_list_hide_uids): 
-	(message_list_hide_clear): Use mail_regen_list instead of
-	mail_do_regenerate_messagelist.
-	(mail_do_regenerate_messagelist): Removed the old stuff.  No
-	functionality changed yet, just using different thread stuff.
-
-	* mail-callbacks.c (save_msg_ok): Use new save message function.
-
-	* component-factory.c (create_view):
-	(add_storage): Use mail_scan_subfolders to build the folder info.
-	(create_folder): Use new implementation with our own callback.
-	(owner_set_cb): Changed b ack to use mail_get_folder, but now wait
-	for it to finish.  This will let any gui still run, but also gives
-	us the required synchronous operation.
-	(got_folder): Callback for when the folder has been opened.
-
-	* mail-ops.c (mail_get_folderinfo): New function to just get the
-	folder info in another thread.
-	(mail_scan_subfolders): New scan subfolder implementation that
-	uses mail_get_folderinfo.
-	(mail_do_scan_subfolders): Removed old implementation.
-	(mail_create_folder): Nerw implementation to create a folder, only.
-	(mail_do_create_folder): Removed old implementation.
-	(mail_save_messages): New implementation, fixes a couple of minor
-	problems, and now provides a return so it can be waited on.  Also
-	check that the writes worked, etc.
-	(mail_do_save_messages): Remove previous implementation.
-	(mail_do_flag_messages): Removed, nothing uses it.
-	(mail_do_flag_messages): Removed, nothing uses it anymore.
-	(mail_get_folder): REturn the operation id, so callers can wait
-	for it.
-	(sync_folder_desc): 
-	(expunge_folder_desc): Add describe functions so we know what its
-	doing.
-	(mail_send_mail): More generic implementation of sending mail.
-
-	* mail-mt.c (mail_msg_new): Lock around seq increment.  And insert
-	each new message into a hash table of active messages.
-	(mail_msg_init): Init the active message table.
-	(mail_msg_free): Remove the message from the active message table.
-	(mail_msg_wait): New function, waits for a message to be
-	processed, by id.
-	(mail_msg_check_error): Dont display the error if it is a
-	user-cancelled operation.
-	(mail_proxy_event): new implementation of mail_op_forward_event.
-	Only real difference is it uses the new	thread stuff, and you can
-	wait for it to finish if you want.
-	(mail_proxy_event): If we're already in the main thread, just call
-	the function.
-
-2001-01-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config-druid.c: New source file that implements
-	mail-config-druid. Note: this is not yet complete.
-
-2001-01-03  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-view.c (view_forward_msg): Call
-	mail-callbacks.c:forward_messages(), so the behaviour is the same
-	as from the folder browser.
-
-	* mail-callbacks.c (forward_messages): New function to forward
-	messages, attached or not.
-	(forward_inlined): Changed to use new forward-messages
-	implementation.
-	(forward_attached): Likewise.
-	(do_forward_attach): Callback for forwarding as attachment, once
-	we have built it.
-	(do_forward_inline): Likewise, for inline, once we have retrieved
-	the message.
-	(forward_message): Removed.
-
-	* mail-ops.c (mail_build_attachment): New function to build an
-	attachment of messages.
-	(mail_do_attach_message): Removed, functionality superceeded by
-	above.
-	(mail_do_forward_message): Removed.  Likewise.
-	(mail_create_folder): Started work on an alternative
-	implementation of create_folder, but not sure about it yet.
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Remove locking.
-	(mail_tool_make_message_attachment): Free the description when done.
-
-2001-01-03  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (write_headers): add font color setting for table,
-	changed border behavior
-
-	* mail-display.c (redisplay): don't set body bg and text color
-
-2001-01-02  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (view_msg): Fix for mail_get_message change,
-	use queue thread.
-
-	* folder-browser.c (done_message_selected): Fix mail_Get_message
-	calls, use new thread.
-	(do_message_selected): "
-
-	* mail-ops.c (mail_get_message): Add a thread argument so callers
-	can specify which queue it executes on.
-
-	* mail-mt.c (mail_msg_free): Fix a free order problem.
-	(mail_msg_destroy): Call mail_msg_free to do the work.
-	(mail_msgport_replied): "
-	(mail_msgport_replied): Check/display errors if we get them.
-	(mail_msgport_received): If we have a describe function, say what
-	we're doing, also set busy/unbusy.
-	(mail_msgport_replied): Clear busy when we get a reply.
-	(mail_get_password): Unset busy.
-	(mail_msg_received): Set busy as we go.
-	(mail_msg_destroy): Unset busy when done.
-	(mail_status): Blah blah, new status interface, the other wans't
-	workable with the way the shell api works.
-
-2000-12-29  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (do_message_selected): If we are reconfiguring,
-	just keep polling till we are done (yeah kinda shitty, but easy).
-	(folder_browser_set_uri): Clear reconfigure flag here.  ick.
-	(got_folder): And here too.
-	(on_right_click): Remove locking.
-	(hide_sender): and here too.
-	(hide_subject): And here.
-	(on_right_click): If we are in reconfigure, then the whole menu is disabled.
-
-	* mail-mt.c (status_busy_timeout): Clear the status_busy_timeout_id.
-
-	* mail-local.c (local_storage_new_folder_cb): Made getting folders
-	completely synchronous.  The shell expects it, and it was only
-	synchronous before by a sideeffect.
-	(do_reconfigure_folder): Remove locking stuff.
-	(do_reconfigure_folder): Use our own much simpler copying routine
-	than that stupid move_folder_contents thing.
-	(update_progress): Use mail_status_message() instead.
-	(do_reconfigure_folder): Set the reconfigure flag during
-	reconfigure & set busy flag.
-	(cleanup_reconfigure_folder): clear busy flag.
-
-	* mail-tools.c (mail_tool_uri_to_folder): Remove the tool_lock
-	stuff.
-	(mail_tool_uri_to_folder_noex): Clear exception on exit.
-	(mail_tool_move_folder_contents): Get rid of this really stupid
-	function that is only used in one place.
-
-	* component-factory.c (owner_set_cb): Use direct calls to get the
-	folders, as this code must run synchronous.  Remove the event wait
-	stuff.
-
-	* mail-callbacks.c (edit_msg): Call mail_get_messages, and create
-	the composers ourself.
-	(do_edit_messages): get_messages callback, create the composers
-	and connect to signals we need.
-	(view_msg): Dont call do_view_messages, just call
-	mail_get_messge for each to get them in parallel.
-	(do_view_message): view a single message.
-
-	* mail-ops.c (mail_edit_messages): Just use mail_get_messages
-	for this operation.  Removed the other async operation stuff.
-	Changed my mind, just removed entirely.
-	(mail_do_view_messages): Removed.
-	(mail_do_setup_folder): Removed.
-	(mail_do_scan_subfolders): Make this run synchronously, as every
-	caller expects it to (even if they didn't realise).
-
-2000-12-28  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (send_queued_mail): Dont expunge the folder
-	here, but in send_queue, otherwise it might execute out of order.
-	(expunge_folder): Remove the talbe prechange stuff, and infact
-	references to the message_list folder, as we have our own folder.
-	Also, dont allow expunge if we're already expunging.
-	(expunged_folder): Clkear the expunging flag if we're finished.
-
-	* folder-browser-factory.c (control_deactivate): Likewise here.
-	Hrm, i thought this function required a callback, silly me.
-
-	* mail-tools.c (mail_tool_make_message_attachment): Remov e
-	locking.
-
-	* folder-browser.c (on_message_selected): Use a timeout handler so
-	we dont select immediately.
-	(folder_browser_set_uri): Changed to use mail_get_folder.
-	(got_folder): New callback called when get_folder is finished.
-	(folder_browser_destroy): Use new sync interface.
-
-	* mail-ops.c (mail_get_message): New function to asynchrounously
-	get a message.
-	: #define out mail_tool_camel_lock stuff entirely.
-	(mail_get_folder): New function to asynchrounously get a folder.
-	(mail_do_load_folder): Removed, replaced by more generic function
-	above.
-	(mail_do_display_message): Removed, replaced by the more generic
-	funciton get_message.
-	(mail_get_messages): New function to get a list of messages
-	asynchronously.
-	(mail_sync_folder): New interface to sync a folder async.
-	(mail_expunge_folder): New interface for expunging folder, with
-	callback.
-	(do_send_queue): Remove lock stuff, and expunge if (and only if)
-	successful, also sync the sent folder while we're at it.
-
-	* session.c (mail_session_request_dialog): Changed to use new
-	mail_get_password call.
-
-	* mail-mt.[ch]: New threading/interthread messaging framework.
-
-	* main.c (main): Init the message/thread system.
-
-2001-01-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_part_is_inline): 
-	(find_preferred_alternative): 
-	* mail-display.c (launch_cb): Use header_content_type_simple, not
-	header_content_type_format.
-
-2000-12-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_verify): Implemented.
-
-2000-12-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_do_setup_trash): New function similar to
-	mail_do_setup_folder() except that this creates the Trash VFolder
-	(special-case).
-
-2000-12-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Don't free info inside the last
-	if-statement, if sent_folder doesn't exist we'll have a memory
-	leak. Instead free it afterward.
-
-2000-12-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-crypto.c: Oops. Update this for CamelContentType stuff too.
-
-2000-12-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_part_is_inline, mail_get_message_body): Use
-	CamelContentType, and use header_content_type_is instead of doing
-	it by hand.
-	
-	(handle_text_plain): 
-	(handle_multipart_related): 
-	(find_preferred_alternative): 
-	(handle_message_external_body): Use CamelContentType and
-	header_content_type_* functions instead of GMimeContentField.
-
-	* mail-display.c (write_data_to_file, launch_cb): Use
-	CamelContentType and header_content_type_* functions instead of
-	GMimeContentField.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (mail_display_init): Initialise the thumbnail cache.
-	(mail_display_destroy): Free the cache.
-	(pixbuf_gen_idle): Check the cache for a pixbuf, add the pixbuf to the
-	cache if it's not there.
-
-2000-12-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (create_summary_view): Create a shared 
-	BonoboEventSource object and use it for all the objects that
-	aggregate Bonobo::EventSource.
-
-2000-12-27  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (setup_subscribe_folder): Use info->name, not
-	input->full_name. Fixes #1029 in bugzilla.helixcode.com.
-	({setup,do,cleanup}_subscribe_folder): Update previous fix: Jeff
-	had changed it to use ->full_name instead of ->name because that's
-	what camel_store_subscribe_folder needed. So we need to have
-	*both* names available, one for Camel, one for the shell.
-
-2000-12-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to format times in 12
-	hour time instead of 24 hour time.
-
-2000-12-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to do different
-	formatting of dates within the last week.
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* Merge from camel-mt-branch.
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (filter_date): Changed this to do different
-	formatting of dates based on the current time.
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Added titles to the
-	pixbuf columns.
-
-2000-12-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Added code to detect and regenerate the summary
-	when a new vfolder is created or removed.
-
-	* mail-vfolder.c: Export the vfolder_storage variable, so that
-	the summary can add a listener to it.
-
-2000-12-05  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c (factory_destroy): Wait till all views have
-	gone and then destroy both factories.
-
-2000-12-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (pixbuf_for_mime_type): Deal with the possibility
-	that we have an icon-filename listed for a MIME type, but the icon
-	file doesn't actually exist. Also, if gnome-unknown.png can't be
-	found, fall back. Might fix a crash people have been reporting...
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-format.c (handle_multipart_encrypted): for now #ifdef
-	PGP_PROGRAM falling back to handle_multipart_mixed.
-	(handle_multipart_signed): same.
-
-2000-12-18  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (hide_save_state): Unlock camel when done to
-	prevent a hang later.
-
-2000-12-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): Only update
-	display every 2 seconds.
-
-	* mail-ops.c (do_view_messages): Only update display every 2 seconds.
-
-2000-12-23  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.h (MessageList): Add a specific hide data lock.
-
-	* message-list.c (message_list_drag_data_get): Do not use
-	cursor_uid, but get all currentlys elected messages directly off
-	the message-list.
-	(message_list_destroy): Removed mail_tool_camel_lock stuff.
-	(on_click): "
-	(message_list_hide_add, message_list_hide_uids, hide_load_state,
-	hide_save_state, message_list_hide_clear): ", but use a specfic
-	lock for the hide data.
-	(do_regenerate_messagelist): remove mail_tool_camel_lock stuff,
-	add hide_lock where required.
-	(message_list_init): Setup the hide_lock.
-	(message_list_destroy): Free the hide_lock.
-
-2000-12-22  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (mail_do_sync_folder): Run sync in different thread
-	each time.  Just a quick litlte hack to check multithreading.
-	There are now few operations that single-queue.  Need to work out
-	a way to make the allocation of threads & resources easier, so we
-	dont get overwhelmed with threads, but we dont block when we dont
-	have to, either.
-
-	* message-list.c (main_folder_changed): If we have only changed
-	events, then process them directly.
-	(mail_do_regenerate_messagelist): Run regenerate in a new thread
-	each time, another quick hack to check mutlithreading.
-
-	* mail-view.c (view_delete_msg): Call camel folder set message
-	flags directly.  mail_do_set_message_flags() is now completely
-	unused.
-
-	* folder-browser.c (mark_msg_seen): Call camel folder
-	set_message_flags directly.
-
-	* mail-callbacks.c (flag_messages): New function, that just sets
-	flags of all selected messages, without all that messy thread
-	stuff (setting flags is	in-memory).
-	(mark_as_seen): Use flag_messages().
-	(mark_as_unseen): "
-	(undelete_msg): "
-	(delete_msg): "
-
-2000-12-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_select): Free messageinfo lookups.
-	(message_list_drag_data_get): "
-	(subtree_unread): "
-	(subtree_size): "
-	(subtree_earliest): "
-	(ml_tree_value_at): "  Also, keep the message info around in a
-	static variable, and ref'd, so that any internal references we
-	have to it dont vanish while we're not looking.  This has a couple
-	of problems ... esp since we never unref the last access, although
-	camel-folder-summary wont check this when its unref'd, so we're
-	'safe'.
-	(save_node_state): free messageinfo lookups.
-	(on_click): "
-	(get_message_info): deconstify return.
-
-	* mail-tools.c (mail_tool_move_folder_contents): Free messageinfo
-	lookups.
-
-	* mail-ops.c (do_filter_ondemand): Free messageinfo lookups.
-	(do_flag_messages): "
-	(do_fetch_mail): Remove mail_tool_lock stuff.
-	(mail_operation_run): Quick hack to run an operation
-	asynchrounously, in a brand-new thread.
-
-	* folder-browser.c (on_right_click): Free messageinfo lookups.
-
-2000-12-16  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (build_tree): Always use the slow (full-update)
-	version of the tree update code, to get around a bug(?) in etree.
-	(build_flat): Likewise.
-
-2000-12-15  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-display.c (write_data_to_file): Dont blindly convert all
-	parts to utf8, e.g. image/jpg.  We only convert text/* parts, and
-	only then if required.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* component-factory.c (create_view): cast over a warning.
-
-	* folder-browser-factory.c: Add verbs for hide functions.
-
-	* message-list.c (message_list_hide_clear):
-	(message_list_hide_uids): 
-	(message_list_hide_add): Some api renaming.
-	(message_list_hide_add): Allow ML_HIDE_SAME to be passed to mean
-	not to change the upper/lower range at all.
-	(hide_save_state): Save the state of the hide list to stable
-	storage.
-	(hide_load_state): Load the state of hte hide list.
-	(message_list_set_folder): Load/save the state of the folder if it
-	is changed/set.
-	(message_list_destroy): Save the state of the folder hide list
-	when done.
-	(save_tree_state): If we wrote out an empty state file, simply
-	remove it instead.
-
-	* folder-browser.c (on_right_click): Add some hide menus.
-	(hide_read): Hide read messages.
-	(hide_deleted): Hide deleted messages.
-	(hide_selected): Hide selected/current message.
-	(hide_none): Show all hidden messages.
-	(on_right_click): Lock around accesses to the message (inside
-	mlist_detect_magic).
-	(on_right_click): Free the mailing list name.
-
-2000-12-13  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (on_right_click): Add camel locking since we
-	call it directly.  Whoever heard of a lock you 'down' to unlock?
-
-	* message-list.c (mail_do_regenerate_messagelist): Added hide
-	expression, messages to hide.  Fixed all callers.
-	(do_regenerate_messagelist): IF we have a hide expression, search
-	and remove those from the uid list.  If we have a hide range,
-	apply that afterwards.
-	(cleanup_regenerate_messagelist): Handle freeing the hide uid
-	temporary data, if required.
-	(message_list_destroy): Free hide data, also lock around all camel
-	object stuff.
-	(message_list_length): New function to get the number of messages
-	avaialble to be hidden by range.
-	(message_list_set_hide): Set the hide expression and range.
-	Issue: Should hiding be remembered?
-	(message_list_unhide_all): Turn off all hiding.
-	(message_list_hide_uids): Hide a list of uid's.
-
-2000-12-15  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (folder_toggle_cb): Update this for the new
-	signal handler prototype. Fixes the crash on double-click.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (handle_multipart_signed): New callback to handle
-	multipart/signed parts.
-	(decode_pgp): Update to account for the cipherlen argument needed
-	for openpgp_decrypt.
-	(is_rfc2015): Removed as we now have a better version in
-	mail-crypto.
-	(handle_multipart_encrypted): Updated to use the PGP/MIME utility
-	functions.
-
-	* mail-crypto.c (mail_crypto_openpgp_decrypt): Don't check
-	(!*plaintext) as it could be a binary stream. Now also takes a
-	cipherlen argument.
-	(mail_crypto_openpgp_sign): New function.
-	(pgp_mime_part_sign): New function to replace a mime part with the
-	pgp signed equivalent.
-	(pgp_mime_part_encrypt): New function to replace a mime part with
-	the pgp encrypted equivalent.
-	(pgp_mime_part_decrypt): New function to decrypt a pgp encrypted
-	mime part (like from pgp_mime_part_encrypt) and replace it.
-	(is_rfc2015_signed): New function to determine if a mime part is
-	an rfc2015 signed part.
-	(is_rfc2015_encrypted): New function to determine if a mime part
-	is an rfc2015 encrypted part.
-	(mail_crypto_openpgp_verify): New openpgp function to verify a
-	signature.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-threads.c (update_active_views): Unref the iterator when
-	we're done with it.
-
-2000-12-14  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-display.c (mail_display_new): call
-	gtk_html_set_default_content_type to make gkthtml default to utf-8
-	when parsing.  This requires gtkhtml >= the released 0.8.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (read_msg): Call `ui_set_busy()' before
-	`ui_set_message()' so that we are sure that the
-	set_busy/unset_busy calls always happen in order.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c (my_folder_browser_init): Made the vertical
-	scrollbar always be there.
-
-	* message-list.c (message_list_get_layout): Changed the minimum
-	width of some of the pixmap column headers.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component-factory.c (create_view): Added a cast.
-
-	* mail-summary.c: Added #include "mail-summary.h".  Commented out
-	folder_free, summary_free, and view_destroy_cb since they're not
-	used.
-	(do_changed): Added a cast.
-	(create_summary_view): Changed some types so that casting would be
-	easier.
-
-	* session.c (mail_session_remember_password): Added a cast.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-summary.h: Fix to use the right .h instead of the
-	deprecated one.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (forward_message): Attach a signature when
-	forwarding, fixes bug #826.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* session.c (mail_session_enable_interaction): New function to
-	tell the code that it's ok (or not) to interact with the user when
-	trying to authenticate to a service. Starts out turned off.
-	(mail_session_request_dialog): If interaction is disabled, fail if
-	the password isn't in the cache.
-
-	* component-factory.c (owner_set_cb): Call
-	mail_session_enable_interaction() after everything else. (This
-	means that the IMAP password dialog will no longer pop up [under
-	the splash screen] at startup.)
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_view): Deal with "mailstorage" type
-	views (top-level mail storages) by trying to fill the storage's
-	folder tree again if we failed before.
-	(add_storage): Create new storages with a URI and type
-	"mailstorage".
-
-	* mail-ops.c (cleanup_scan_subfolders): On success, mark the
-	storage as having been loaded, so create_view won't try again.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (decode_pgp): Updated to reflect arguments to the
-	openpgp functions - now also takes an outlen argument.
-	(try_inline_pgp): Updated.
-	(handle_multipart_encrypted): Updated here too.
-
-	* mail-crypto.c (crypto_exec_with_passwd): Updated to handle
-	binary streams and such.
-	(mail_crypto_openpgp_encrypt): Always initialize the passwd_fds
-	even if we don't plan on signing. Added an 'inlen' to specify the
-	length of the input data (as it could be binary). Also added a
-	'userid' argument for cases when we want to sign as well as
-	encrypt.
-	(mail_crypto_openpgp_decrypt): Updated to take an outlen argument
-	in case the ciphertext is encrypted binary data.
-	(mail_crypto_openpgp_clearsign): Added a 'hash' and 'detach'
-	arguments. 'hash' allows the program to specify the preferred hash
-	function (which will come in handy when generating
-	PGP/MIME). 'detach' allows the program to specify whether it wants
-	a detached signature or the entire signed text.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Remove the never-once-used BonoboObject stuff
-	and make MessageList be a GtkWidget instead. Also, keep track of
-	the ETable directly rather than repeatedly calling
-	e_table_scrolled_get_table.
-
-	* folder-browser.c (folder_browser_destroy): Use gtk methods
-	rather than bonobo methods to destroy the message list.
-	(on_right_click, on_double_click): These are being attached to the
-	ETable directly now, so fix the first argument (which isn't being
-	used anyway, but...). Ignore double-clicks on "active" columns
-	(the ones where clicking does something beyond "select"), fixing
-	bug #811, which is what got me started on this to begin with...
-	(folder_browser_gui_init): simplify now that MessageList itself is
-	a widget. Also use message_list->table rather than
-	e_table_scrolled_get_table.
-
-	* mail-local.c (mail_local_reconfigure_folder): Add "mail_" to
-	the beginning of this function name to match its prototype and the
-	other vague namespace conventions in the mailer.
-
-	* mail-callbacks.c (select_all, invert_selection): Use ml->table.
-	(configure_folder): s/local_reconfigure_folder/mail_&/
-	
-	* mail-ops.c (do_flag_messages): clean up the cleanup a bit
-
-	* mail-tools.c (mail_tool_quote_message): Remove an unused
-	variable.
-
-2000-12-11  Not Zed  <NotZed@HelixCode.com>
-
-	* local-config.glade: reordered the options and added maildir,
-	mbox, maildir, mh, in that order.
-
-	* mail-local.c (reconfigure_clicked): Added maildir, re-ordered to
-	match the changed xml file too.
-	(do_reconfigure_folder): WHoever 'threaded' this code forgot to
-	check that folder_browser functions shouldn't be called here.
-	(cleanup_reconfigure_folder): Call it here instead.
-	(lookup_folder): Blah blah, we have to lookup the folder and
-	verify its still the same format, joy.  Becaause someone thought
-	it would be wise to make the code 5x more complicated for no
-	reason, and totally break 'mail reconfigure' in the process. i'm
-	really happy about that one.
-	(cleanup_register_folder): Uh, yeah, so like, the
-	local_store->folders hashtable is supposed to point to like,
-	LocalFolders, not CamelFolders.
-	(free_local_folder): Free the localfolder struct properly.
-	(free_folder): Call above to free data properly.
-	(get_folder): Fix for fixing folders hashtable.
-	(local_storage_removed_folder_cb): Same here.
-	(local_storage_new_folder_cb): Ref the local_store when putting it
-	in the local_folder.
-	(cleanup_register_folder): Properly free the local_folder if the
-	op failed.
-	(free_local_folder): Unhook events also.
-	(d): Oops, left debug turned on.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_init): Change the "drawfocus"
-	argument on e_table_scrolled_get_table(etable) instead of on
-	etable (etable is an ETableScrolled.)
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (save_msg_ok): Check to see if the file already
-	exists, if it does prompt the user to for permission to overwrite
-	the file.
-	(forward_message): g_strdup the cursor_uid if there is only a
-	single message to be forwarded or we'll segfault later.
-
-	* mail-ops.c (do_save_messages): Rewrote yet again. I'm back to
-	almost an identical implementation as the first time I wrote this
-	except now we write the From line which I had forgotten last
-	time. This means that we no longer have to unlink the .ev-summary
-	file created and we also use fewer resources (no need to create a
-	CamelMboxFolder object).
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* folder-browser.c (on_double_click): the e-table double-click
-	signal now has extra params
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (add_storage): Pass `NULL' as the
-	@toplevel_node_handler_id arg in `evolution_storage_new()'.
-	FIXME: We should be passing the ID of the mail component here.
-	* mail-vfolder.c (vfolder_create_storage): Likewise.
-
-2000-12-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_get_layout): Set the "Size" field
-	to sort using integer comparison instead of string.
-	(filter_size): New function to transform a integer size into a
-	more readable form.
-	(ml_value_to_string): Use filter_size.
-	(ml_value_is_empty): COL_SIZE is no longer a string, so handle
-	this as an integer.
-	(ml_initialize_value): Here too.
-	(ml_free_value): And here.
-	(ml_duplicate_value): And here too.
-	(message_list_create_extras): Setup the size etable cell.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Connect to signals on the ETable instead of
-	the ETableScrolled.
-
-	* subscribe-dialog.c: Used the e_table_scrolled_get_table function
-	instead of accessing the variable directly.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Connect to signals on the ETable instead of the
-	ETableScrolled.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Got rid of code referencing the ETableScrolled
-	proxy functions.  Changed the call to e_table_set_cursor_row to
-	send a model row instead of a view row.
-
-2000-12-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (forward_message): Only do a
-	message_list_foreach if we plan on attaching messages, otherwise
-	just use ml->cursor_uid.
-
-	* mail-ops.c (cleanup_forward_messages): If attaching multiple
-	forwarded message, wrap them in a multipart/digest otherwise just
-	attach the single message as a message/rfc822.
-
-2000-12-07  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_object_requested): Make the iTip hack spew a
-	g_warning and not crash if you have no identity configured. To be
-	revisited.
-
-	* mail-callbacks.c: (various)
-	* folder-browser.c (filter_mlist): 
-	* mail-autofilter.c (filter_gui_add_from_message): 
-	* mail-vfolder.c (vfolder_gui_add_from_message): Add some
-	g_return_if_fail()s to protect from crashes until the code to
-	enable/disable commands based on how many messages are selected is
-	done.
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Make the vfolder editor
-	resize correctly. Fixes bug #835.
-
-2000-12-06  Dan Winship  <danw@helixcode.com>
-
-	Fix up shutdown so that things that should be destroyed get
-	destroyed. Among other things, this fixes the bug where IMAP
-	stores weren't disconnected at shutdown.
-
-	* mail-threads.c (update_active_views): Update for
-	folder_browser_factory_get_control_list change to EList.
-
-	* folder-browser-factory.c: Turn control_list into an EList so
-	that we can safely remove items from it while it's being iterated
-	(which will happen as FolderBrowsers are destroyed at shutdown
-	while the thread code is trying to update the status bars).
-	(control_destroy_cb): Just destroy the folder_browser.
-	(browser_destroy_cb): New callback for FolderBrowser destroy.
-	Remove the control from control_list here instead of
-	control_destroy_cb, because the controls don't seem to get
-	destroyed reliably...
-
-	* component-factory.c: Clean up stuff.
-	(factory_destroy): Get rid of this.
-	(owner_unset_cb): Schedule an idle handler to quit.
-	(idle_quit): Wait for all of the FolderBrowsers to be destroyed
-	and then destroy the storages and quit.
-
-	* mail-summary.h (create_summary_view): Fix prototype
-
-2000-12-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_folder_to_cachename): Use
-	e_filename_make_safe (which used to be e_str_make_safe).
-
-	* mail-display.c (make_safe_filename): And here.
-
-	* message-list.c (message_list_drag_data_get): Here too.
-
-2000-12-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (cleanup_register_folder): Run the folder_changed
-	code on message_changed as well, so the unread message counts
-	update as messages are read.
-
-	* folder-browser.c: Remove bits of filter-on-demand and toolbar
-	bug workaround cruft that don't do anything useful any more.
-
-	* mail-ops.c (cleanup_load_folder): unref the ref we added in
-	setup_load_folder.
-
-2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c (write_data_to_file): Use a charset filter to
-	make sure the data is written out in the charset it was meant to
-	be in instead of UTF-8.
-
-	* mail-format.c (mail_format_raw_message): Don't use the raw
-	message body as the format argument, use "%s" instead. If the raw
-	message contains %'s then it will segfault otherwise.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Fix a typo so that
-	toggling the "remember password" checkbox will activate the "OK"
-	button if it was inactive.
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-vfolder.c (vfolder_create_storage): Updated the call to
-	`evolution_storage_new()': pass NULL for @toplevel_node_uri.
-
-	* component-factory.c (add_storage): Updated the call to
-	`evolution_storage_new()': pass NULL for @toplevel_node_uri.
-
-2000-12-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (setup_subscribe_folder): Use info->full_name
-	rather than info->name so that we get the namespace part of the
-	folder path as well.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: Updated to define verbs
-	"MessageForwardInlined" and "MessageForwardAttached" instead of
-	"MessageForwardInline" and "MessageForwardAttach".
-
-	* folder-browser.c (on_right_click): Make forwarding as an
-	attachment the default.
-
-	* mail-callbacks.c (forward_inlined): Renamed from `forward_msg'.
-	(forward_attached): Renamed from `forward_attach'.
-	* mail-callbacks.h: Updated accordingly.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* session.c (mail_session_remember_password): Writes out passwords
-	(to .gnome_private) in our patented proprietary "Best Awesome
-	Super Encryption 64" ("BASE64") format which could not possibly
-	ever be cracked by even the most cryptographically knowledgeable
-	five-year-olds.
-	(mail_session_init): Load remembered passwords at startup.
-	(mail_session_forget_passwords): Erase them from disk as well as
-	memory.
-
-	* mail-config.c: Add "remember_password" field to
-	MailConfigService.
-	(mail_config_write_on_exit): Call mail_session_remember_password
-	for services with "remember_password" set.
-	* mail-config-gui.c: Add "remember password" checkbox to the
-	dialogs, and make it appear and disappear as appropriate.
-
-	* component-factory.c (mail_load_storages): Unref the store
-	regardless of whether or not we're using it, so we don't leak
-	references to non-storage stores.
-
-2000-12-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (e_mail_address_new): Perform better
-	error-handling.
-
-2000-12-01  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-ops.c (mail_op_report_status): use mail_op_set_message_plain
-
-	* mail-threads.c (mail_op_set_message_plain): plain version of
-	mail_op_set_message, doesn't use printf, passes message untouched,
-	use set_message
-	(mail_op_set_message): set_message
-	(set_message): helper function
-	
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (cleanup_fetch_mail): Don't display a dialog, instead
-	inform the user that there was no new mail by setting a status
-	message.
-
-	* message-list.c (message_list_drag_data_get): Use the new
-	e_str_make_safe function.
-
-	* mail-display.c (make_safe_filename): And here.
-
-	* mail-config.c (mail_config_folder_to_cachename): Here too.
-
-2000-11-30  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (cleanup_load_folder): Set threaded view before
-	setting the folder (cleanup some flash ons tartup).
-
-	* message-list.c (message_list_init): Initialise a mempool for uid
-	string storage.
-	(new_id_from_uid): Added messagelist arg, allocate strings from
-	uid_pool.
-	(new_id_from_subject): Same.  Fixed all callers.
-	(remove_node_diff): Dont free uid here.
-	(build_flat_diff): Nor here.
-	(clear_tree): Flush the mempool, rather than freeing the id's
-	directly.
-	(free_tree_ids): Removed, no longer required.
-	(free_tree_ids): Likewise.
-	(message_list_init): Dont connect to the table destroy signal
-	anymore to free the uid table.
-	(message_list_destroy): Free the uid pool here.
-	(*): Use accessors for messageid stuff.
-	(content_is_attachment): Removed, no longer required.
-	(ml_tree_value_at): Get the attachment flag directly from the
-	summary.
-	(ml_tree_value_at): For 'fake' nodes, try and do something better
-	than "?" for from, to, and size.
-	(subtree_size): New function, add up the total size of a subtree.
-	(subtree_earliest): Get the earliest date from a subtree.
-	(ml_tree_value_at): Return earliest date sent/received for fake
-	nodes.
-	(ml_tree_value_at): Return something to mark a fake subject line
-	as a fake subject, although i dont know, i guess this buggers up
-	sorting ...
-	(subtree_size): Check the info node is still there.
-	(subtree_earliest): Same here.
-	(subtree_unread): And here.  The info node might vanish if the
-	folder has changed/is changing and we try and redraw stuff while
-	its doing it.
-	(message_list_drag_data_get): Use accessors.
-
-2000-11-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_drag_data_get): Implement.
-	(message_list_init): Connect the d&d signal.
-
-	* mail-ops.c (do_save_messages): Use camel a bit more to help us
-	out. Don't create the file ourselves, treat it as a CamelFolder so
-	we don't have to worry about formatting.
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Remove no-longer-needed e_unicode_init.
-
-	* mail-tools.c (mail_tool_quote_message): Fix the allocation here
-	(again) and put a comment explaining it. (Fixes a crash when
-	replying.)
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Wait until after setting up
-	the local storage to find the Drafts/Outbox/Sent folders.
-
-	* mail-ops.c (do_setup_folder): Use the file: store rather than
-	mbox:.
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added the SaveAs bonobo menu verb
-	thingy.
-
-	* mail-callbacks.c (save_msg): New callback for saving messages.
-	(save_msg_ok): 
-
-	* folder-browser.c (on_right_click): Add a Save Ass menu item.
-
-	* mail-ops.c (cleanup_save_messages): Save all emails to the path
-	given.
-
-2000-11-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (cleanup_register_folder): Fix the initial unread
-	counts after the last patch.
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (local_folder_changed): This needs to run from the
-	main thread, not the camel thread, so add a proxy signal handler
-	to call mail_op_forward_event. Fixes hangs (eg bugzilla #909).
-
-2000-11-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c: Removed some unecessary debugging printf's
-
-2000-11-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-druid.glade: Revert the new druid for now, until the
-	corresponding code is done, so that the druid will work again.
-
-2000-11-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (mail_config): Don't use the "delete-event"
-	signal.
-
-2000-11-21  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (pixbuf_for_mime_type): free fm_icon.
-
-	* component-factory (summary_fn): Remove the configure param.
-	(factory_destroy): Made into a generic function so that the
-	summary_factory can be ref-counted as well as the normal
-	factory.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: add GPGME_CFLAGS and GPGME_LIBS
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_view_source): New function to return
-	if user wants to view message source.
-	(mail_config_set_view_source): New function to set whether the
-	view wants to view source.
-
-	* mail-ops.c (mail_do_view_message_sources): Removed. We're not
-	gonna view-source this way anymore.
-
-	* folder-browser-factory.c: Removed the ViewSource bonobo verb
-	from the Message menu.
-	(control_activate): Added ViewSource.
-
-	* folder-browser.c (on_right_click): Removed Message menu item to
-	view message source.
-	(folder_browser_toggle_view_source): New callback to set whether
-	or not the MailDisplay shows the raw message or the pretty-ified
-	message.
-
-	* mail-callbacks.c: Removed view_source.
-
-	* mail-display.c (redisplay): If toggle_raw is set then display
-	the raw message else display the pretty formatted message.
-	(mail_display_redisplay): New function to force the redisplay of a
-	message.
-
-	* mail-format.c (mail_format_raw_message): New function to
-	write the raw message data.
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-vfolder.c (vfolder_uri_to_folder): IF we dont find a
-	source, clear the exception and ignore it silently.  for e.g. if
-	the user reconfigured their mailboxes and one of them no longer
-	exists.
-	
-2000-11-21  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-display.c: #include <gtkhtml/gtkhtml-embedded.h>
-
-2000-11-21  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.[ch]: Removed.  No longer serves a purpose.
-	
-	* Makefile.am (evolution_mail_SOURCES): Removed message-thread.[ch].
-
-	* message-list.c (build_subtree):
-	(node_equal): 
-	(add_node_diff): 
-	(build_subtree_diff): 
-	(do_regenerate_messagelist):
-	(cleanup_regenerate_messagelist): Changed to use camel-folder-thread.
-	(message_list_set_folder): If we get set a new folder, unhook any
-	events before unrefing the folder too (the folder is never reset
-	currently, but this would cause problems).
-	(subtree_unread): Check for uid null, wont crash, but its a bug.
-	(ml_tree_value_at): If the uid is null, then fake an obviously bad
-	line.
-	(build_subtree): Yeah well, we can't like freeze/thaw here,
-	because this is called recursive, and freeze/thaw isn't
-	recursive, like pre model and post model change was.
-	(build_tree): Maybe we can try it here, although i dont think
-	it'll help much.
-	(build_flat): And this is also a tree.  yes a tree.
-	(build_tree): Added changes arg.  If set, then try the 'diff'
-	approach, unless the tree is already empty.
-	(message_list_set_threaded): Dont clear the tree here.
-	(message_list_set_search): Or here.
-
-2000-11-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (save_node_state): Save out the md5 hash of the
-	messageid as hex, since thats all we have for those nodes.
-	(build_subtree): Expand the messageid to a hex string first, then
-	check it.
-	(add_node_diff): And the same here.
-
-	* message-thread.c (thread_messages): Changed for changes to
-	messageid/references items.
-	(id_hash, id_equal): New functions to hash on the binary message id hash.
-	(thread_messages): removed some more no longer used dead code.
-
-2000-11-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (e_mail_address_compare): New comparison function
-	that will replace address_compare if/when we ever go to save the
-	preparsed addresses in the ETable rather than parsing them each
-	time. Also fixed it so that we should get better sorting when
-	addresses don't contain name parts (I was checking for NULL but
-	not '\0').
-	(address_compare): Use e_mail_address_compare.
-
-2000-11-19  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (update_changed_folders): Instead of making the CORBA
-	call in the dispatch thread, store the new display names and have
-	cleanup_fetch_mail make the CORBA calls. Fixes deadlocks.
-	(cleanup_fech_mail): Loop through the update_infos and make the
-	CORBA calls.
-	(setup_fetch_mail): Clear some new data items.
-
-2000-11-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Use the new quote_message
-	function and make it start with "On %s, %s wrote:" since people
-	seem to want that.
-
-	* mail-ops.c (cleanup_forward_messages): Use the new quote_message
-	function.
-
-	* mail-tools.c (mail_tool_quote_message): New convenience function
-	to quote a message body (since both the reply and forward code do
-	similar quoting)
-
-2000-11-17  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_destroy): Before we destroy
-	ourselves, unhook ourselves from the folder update events.  Should
-	fix a common crash on exit case.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added the MessageViewSource bonobo
-	menu verb.
-
-	* mail-ops.c (mail_do_save_messages): New async function to save
-	messages as individual files in a given path.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added a new Forward as Attachment
-	bonobo menu item verb.
-
-	* mail-view.c (view_forward_msg): Updated to reflect changes to
-	mail_do_forward_message(). It now forwards the message without
-	attaching it - is this what we want?
-
-	* mail-ops.c (mail_do_view_message_sources): New async function to
-	display message source dialog windows.
-	(setup_forward_messages): If we were asked not to forward the
-	message(s) as attachment(s) and the user chose more than a single
-	message, then default to making each message an attachment.
-	(cleanup_forward_messages): If we aren't forwarding the message as
-	an attachment, then quote the text and set the composer's body
-	with it.
-
-	* mail-callbacks.c (view_source): New callback to view the message
-	source of all messages that are currently selected.
-	(forward_attach): New callback to forward a message as an
-	attachment (forward_msg is now for forwarding a message without it
-	being an attachment).
-	(forward_message): Convenience function for forwarding messages.
-
-2000-11-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_do_subscribe_folder): Take a
-	'subscribe' argument so that this can function as a subscribe AND
-	unsibscribe method.
-	(describe_subscribe_folder): Updated.
-	(do_subscribe_folder): Updated.
-	(cleanup_subscribe_folder): Updated.
-	(subscribe_folder_info): Pass along a TRUE as the 'subscribe'
-	param.
-	(unsubscribe_folder_info): Pass along a FALSE as the 'subscribe'
-	param.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Removed some e_table_model calls and replaced
-	them with e_tree_model calls.
-
-2000-11-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-local.c (mail_do_register_folder): Do this the normal way
-	rather than calling mail_operation_wait_for_finish. There was some
-	reason for it originally, but it no longer applies. This makes
-	adding new folders from the folder selection dialog no longer
-	hang.
-
-2000-11-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): Sync the source folder.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* evolution-mail.oafinfo:
-	* mail-threads.c: (retrieve_shell_view_interface_from_control):
-	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>
-
-	* Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order.
-
-2000-11-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.glade[.h]: New glade file for possibly using to
-	create the subscribe dialog.
-
-2000-11-08  Radek Doulik  <rodo@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): likewise
-
-	* mail-callbacks.c (create_msg_composer): added send_html arg to
-	e_msg_composer_new_with_sig_file call
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-search-dialogue.c (mail_search_dialogue_construct): Allow
-	rule part to expand when the user resizes the dialog.
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_save): Don't handle custom searching
-	anymore... we don't want this.
-	(search_full): Same.
-	(folder_browser_search_menu_activated): Set the search entry
-	widget sensitive.
-	(folder_browser_search_query_changed): Same.
-
-2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_full_clicked): Updated to use the
-	ESearchBar object rather than the previously used search widgets.
-	(search_full): Same.
-	(search_save): Same. Also use enums to make it a little easier to
-	read now that we have to have enums anyway.
-	(folder_browser_search_menu_activated): New ESearchBar menu
-	callback.
-	(folder_browser_search_query_changed): New ESearchBar query
-	callback. Replaces search_set()
-	(folder_browser_clear_search): Updated to use the ESearchBar
-	object rather than the previously used search widgets.
-	(folder_browser_gui_init): Don't hand construct a search widget,
-	use the new ESearchBar convenience widget.
-
-	* mail-ops.c (cleanup_load_folder): Updated to reflect changes to
-	FolderBrowser.
-
-2000-11-07	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c (pixmap_press): modified some of the EPopupMenu
-	structures to account for differences in the popup menu API (as
-	informed by Jeff. 
-	(on_object_requested): passed the user's default email address
-	to the iTip control.
-
-2000-11-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add the composer dirs.
-
-2000-11-07  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-display.c (on_object_requested): God, I sure wish people
-	would listen when i'm saying i'm changing and API. I mean
-	I even mailed everyone and everything.  Can't see any changelog
-	either.
-	
-2000-11-06  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c (rule_from_message): Updates for api changes.
-
-	* mail-tools.c (mail_tool_generate_forward_subject): Fixed for api
-	changes.  Sigh, whoever wrote the multithread code of the mailer,
-	had little idea.  You can't just lock for getting a const value,
-	until you are finished with it, cause the owner still owns it.
-	Fixed this too.  Yuck, what a horrid forwarding format, can we
-	change this, or make it configurable?  The mail headers show who
-	forwarded it, we dont need to duplicate it in that UGLY subject.
-
-	* mail-format.c (write_field_to_stream): Removed some jeffness.
-	dont g_strdup stuff we dont need to, and remove the
-	value_is_encoded thing since we can get the unencoded address
-	now.
-	(write_address): New function to write an address field.
-	(write_headers): Uses write_address to write addresses, cleaner,
-	fixed the god-awful unreadable indenting too.
-	(handle_text_plain): Use a 'smarter' printf format, so we dont
-	need to allocate and copy substrings unecessarily (esp since
-	they're about to be allocated any copied another few times
-	anyway *sigh*).
-	(write_field_to_stream): Commented out the isprint check, which
-	afaik serves no purpose.
-	(list_add_addresses): New function to build a list of
-	display-ready addresses.  Although I think the composer then uses
-	these as internet-ready addresses.  It should probably take a list
-	of CamelAddress's if thats what it wants.
-	(mail_generate_reply): Cleaned up the address list creation stuff
-	a heap, and fixes for camel api changes.  Also fixed a small
-	memory leak as a side effect (fulladdr wasn't freed if it was the
-	same as the sender).
-
-	* mail-display.c (on_object_requested): Changed for interface
-	changes to the from address.  I think passing the encoded
-	(internet version) of the address is right here.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (on_right_click): Move filter stuff into a
-	submenu of the popup menu.
-
-2000-11-06	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c: used Camel to parse the full address before
-	passing the email address to my iTip control.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	First draft of folder tree unread message indication for /local
-	mail folders.
-	
-	* mail-local.c: Add a new CamelStore subclass, MailLocalStore,
-	which attaches to an Evolution_LocalStorage on one side and
-	CamelSession on the other, and keeps track of local folders. Some
-	of this code was previously in mail-local-storage.c, which no
-	longer exists.
-	(local_reconfigure_folder, etc): Various mail_op-related cleanups,
-	and wrap d() around a bunch of printfs.
-
-	* mail-tools.c (mail_tool_get_local_inbox_url,
-	mail_tool_get_local_movemail_url): Removed
-	(mail_tool_get_local_inbox): Simplified.
-	(mail_tool_do_movemail): Remove unused dest_url variable.
-	(mail_tool_uri_to_folder): Simplify. Now down to two cases
-	(vfolder, and everything else).
-
-	* component-factory.c (owner_set_cb): Pass evolution_dir to
-	mail_local_storage_startup.
-
-	* Makefile.am (evolution_mail_SOURCES): Remove
-	mail-local-storage.[ch]
-
-	* mail-summary.c: Remove mail-local-storage.h include
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* mail-autofilter.c: Fix up #include <config.h>
-	* mail-crypto.c: Same here.
-	* mail-search-dialog.c: Here too.
-	* main.c: Fix indentation of #ifdef
-	* message-thread.c: Fix include.
-	
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (delete_msg): Don't invert the flag.
-	(undelete_msg): Same (when multiple messages are selected).
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Updated to have the same menu items as
-	the new right-click menu - eventually these 2 menus should be the
-	same.
-
-	* folder-browser.c (on_right_click): Now correctly handles the
-	case of multiple selection.
-
-	* mail-callbacks.c (enumerate_msg): Make public so it can be used
-	in other source files (it's a useful function!)
-
-2000-11-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (on_right_click): Added an "Undelete" option to
-	the right-click menu and also set a mask so it was only selectable
-	if the message is marked as deleted. Also set a mask for "Mark as
-	Read" and "Mark as Unread".
-
-	* mail-callbacks.c (undelete_msg): New callback to undelete
-	messages.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (cleanup_regenerate_messagelist): don't free the
-	MessageList search when it's being reused
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-local.c (mail_local_map_uri): Don't show the passwd in the
-	url string.
-	(mail_tool_local_uri_to_folder): Same.
-	(do_reconfigure_folder): Same.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added new header files.
-	
-	* component-factory.c (owner_set_cb):
-	s/session_init/mail_session_init
-
-	* session.c: Renamed public functions to mail_session_*.
-	FIXME: Rename session.c to mail-session.c
-
-	* folder-browser-factory.c: #include "mail-callbacks.h", #include
-	"mail-session.h" and replace forget_passwords with
-	mail_session_forget_passwords
-
-	* mail.h: Move session prototypes to mail-session.h, Move
-	mail-crypto prototypes to mail-crypto.h, Move mail-callback
-	prototypes to mail-callbacks.h
-
-	* mail-session.h: New header file containing public prototypes
-	for session.c
-
-	* mail-format.c: #include "mail-crypto.h"
-
-	* mail-view.c: 
-	* folder-browser.c: #include "mail-callbacks.h"
-
-	* mail-crypto.h: New header file containing public prototypes
-	for mail-crypto.c
-
-	* mail-callbacks.h: New header file containing public prototypes
-	for mail-callbacks.c
-
-	* message-list.c (message_list_get_layout): Set useful defaults.
-	(message_list_setup_etable): Don't set the Outbox defaults on a
-	folder just because it doesn't have a corresponding saved file.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): url_flags are now on
-	CamelProvider, not CamelService
-
-	* main.c: 
-	* subscribe-dialog.c: 
-	* mail-threads.c: Kill warnings
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Clean the idl-generated files properly.
-
-2000-11-03  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-view.c: Added mail-display.h.
-
-	* mail-autofilter.c: Removed unecessary headers.  Who ran indent
-	over this code?  Sigh.
-
-	* mail-ops.c (display_message_input_s): Added messagedisplay.
-	(mail_do_display_message): Added messagedisplay arg.
-	(mail_do_display_message): Dont bother doing another thread when
-	we know we dont have a uid.
-	(): Added folder-browser.h to headers.  Sigh.
-
-	* folder-browser-factory.c (control_activate): Setup the
-	viewthreaded callback to the folder_browser function.
-
-	* folder-browser.c (my_folder_browser_init): Connect to
-	right_click of etable of the messagelist here.
-	(on_right_click): Changed for argument changes.
-	(folder_browser_toggle_threads): Changed to take a fb, and to set
-	threaded mode on the messagelist.
-	(my_folder_browser_init): Connect also to the double_click signal.
-	(my_folder_browser_init): Connect to the message_selected signal
-	of the message_list.
-	(on_message_selected): Signal handler for message selected.
-	(my_folder_browser_init): Fix for change to message_list_new().
-
-	* message-list.h: Dont include folder-browser.h.
-	(message_list_toggle_threads): Moved into folder-browser.h.
-	(struct _MessageList): Removed folderbrowser.
-
-	* mail.h: Dont include folder-browser.h here either, but
-	mail-types.h instead.
-	Moved prototypes moved into folder-browser.c into
-	folder-browser.h. (vfolder_*, filter_*).
-
-	* mail-display.h: Dont include folder-browser.h here, but
-	mail-types.h and specific camel headers.
-
-	* message-thread.c (sort_node): Invert the sort order logic so the
-	list is sorted in mailbox order, not reverse mailbox order.
-
-	* message-list.c (free_tree_ids): Fix a merge foo.
-	(remove_node_diff): Removed unused row argument.  Fixed
-	callers/prototype.
-	(clear_tree): pre_change on the removal of the root node.
-	(build_flat): Only perform pre_change if we are rebuilding the
-	whole lot.  For incremental change let etable do its thing.
-	(build_tree): Likewise for building the tree view.  If making
-	incremental updates, do them as we build it.
-	(vfolder_subject):
-	(vfolder_sender):
-	(vfolder_recipient):
-	(filter_subject):
-	(filter_sender):
-	(filter_recipient):
-	(filter_mlist):
-	(on_right_click): Moved to folder-browser.c, where they belong.
-	(message_list_init): Dont connect to right_click anymore.
-	(message_list_toggle_threads): Moved to folder-browser.c, renamed.
-	(on_double_click): Moved to folder-browser.c
-	(on_click): Set the flags directly, rather than in anothre thread,
-	which is just not necessary.
-	(message_list_class_init): Added a new signal 'message_selected',
-	to indicate when a message was selected.
-	(on_cursor_change_idle): Emit a signal, rather than directly
-	triggering the display update.
-	(select_row): Removed, no longer used.
-	(idle_select_row): And this too.
-	(select_msg): Removed as well.
-	(message_list_select): Emit a signal, rather
-	thandisplaying/clearing the mail-display directly.
-	(mark_msg_seen): Moved to folder-browser.c
-	(message_list_new): Removed folderbrowser argument.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (on_right_click): Sync with message
-	menu. Addresses bugzilla bug #778.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Turn on draw grid for the main ETable (this may
-	not be working in ETable itself.)
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-threads.c (mail_op_set_message): fmt argument should be
-	const.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	Make "Get Mail" even more functional on IMAP (scans all folders),
-	and do a first cut at folder tree highlighting (for IMAP/news
-	only).
-
-	* mail-ops.c (do_fetch_mail): For imap (sigh, we *still* shouldn't
-	be hardcoding that), rescan the store's folder tree, rescan each
-	changed folder for new messages, and update the shell folder tree.
-	(do_scan_subfolders): Update for component-factory.c changes, and
-	set folder display names and highlights appropriately when
-	building the storage.
-
-	* component-factory.c (add_storage): Make this static (was
-	mail_add_new_storage). Use camel_service_get_name for the name
-	rather than url->host. (Among other things, this lets you use a
-	single machine as both an IMAP server and a news server.)
-	(mail_lookup_storage): Hash storages based on their CamelStore
-	rather than the URL.
-	(factory_destroy): Disconnect each of the CamelStores in the
-	storages_hash.
-
-	* subscribe-dialog.c (cleanup_subscribe_folder): 
-	* mail-vfolder.c (vfolder_refresh): Pass "highlighted" flag to
-	evolution_storage_new_folder 
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_op_report_status): Don't call the default
-	logging function.
-	(do_fetch_mail): Set the logfile and don't pass the logfile to
-	filter_driver_set_status_func - it's purpose has been altered.
-	(do_filter_ondemand): Same.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-        ** Merged in camel-incremental-branch.
-
-	* mail-format.c (mail_get_message_body): Jeff!  Sigh.
-	We should definetly not be strduping the
-	content, it has already been copied and duplicated.  Look at
-	get_data_wrapper_text.
-
-2000-11-01  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.h: add fields search_entry and search_top.
-
-	* subscribe-dialog.c: add mail-ops.c style async operations for
-	getting the store (to remove deadlock in the case where a auth
-	dialog is dismissed at startup and then the subscribe dialog is
-	brought up), and subscribing/unsubscribing to folders.  One case
-	remains, that is getting the list of all folders.
-	(subscribe_search): flesh out this function
-	(build_tree): use the search_top field so we can search for
-	groups/folders.
-	(subscribe_dialog_destroy): free search_top.
-	(subscribe_dialog_construct): init search_top.
-
-2000-10-30  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_folder_summaries): Fix spelling :)
-	Set folder->uri to NULL for the Inbox.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Add view:// uris to 
-	switch the display to that folder.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Hmmm, someone can't spell Filder,
-	er...I mean Filter ;-)
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (rule_from_message): If the name is NULL or
-	empty, then set the title to "Mail from <address>". Closes
-	bugzilla bug #777. Also when filtering on Subject, set the file
-	name to "Subject is <subject>" rather than just "<subject>" - I
-	think this is a bit more user-friendly.
-	(strip_re): Use unsigned char when passing to is<type>()
-	functions from ctype.h.
-	(rule_add_subject): Use the "is" rule instead of "contains".
-
-2000-11-01	Jesse Pavel   <jpavel@helixcode.com>
-
-	* mail-display.c: added property bag support for Bonobo
-	controls, support which helps only the iTip control, currently.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (pixbuf_gen_idle): Lots of fixes and
-	simplifications. Should get rid of the "missing icon" problem.
-	There is still a problem with some images failing to get
-	thumbnails, even though they display correctly.
-	(pixbuf_for_mime_type): New function to try really hard to get the
-	right icon for a MIME type, including looking in mc and nautilus's
-	pixmap directories.
-	(on_object_requested): Always use pixbuf_gen_idle, even for
-	non-image types, to prevent code duplication.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_get_message_body): Shouldn't we be
-	strdup'ing the content? This seems to fix the memory corruption
-	problems.
-	(mail_generate_reply): Make sure that the last char in the
-	generated reply text is '\0' (when body text doesn't end with a
-	\n, a random char will appear otherwise).
-
-2000-10-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (do_test_service): Update for
-	camel_service_disconnect change.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Match "is"
-	rather than "contains" now that we have the "is"-rule.
-
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (config_do_query_authtypes): Redo this so that
-	it works for all pages, not just the first page. (Now that this is
-	finally working again, I expect Anna to finish her redesign in the
-	next 15 minutes.)
-	(service_page_item_new): Fix up the sizing of the Auth line to
-	look more like everything else.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_uri_to_folder): Simplify this a lot by
-	making IMAP and NNTP use the same code, now that the IMAP
-	namespace doesn't need special magic handling.
-
-	* message-list.c (mail_do_regenerate_messagelist): Don't try to
-	regenerate the message list if there is no folder. (The Bonobo UI
-	code will call this as the callback for the "Threaded View"
-	command.)
-
-	* mail-ops.c (do_fetch_mail): Sync the folder before refreshing so
-	we don't lose flag settings.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Check to make sure that the
-	recipient list is neither NULL nor a 0-length list of addresses
-	and pop up a dialog letting the user know why we are not allowing
-	him/her to send the message.
-
-2000-10-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (write_data_to_file): Don't destroy a dialog
-	after run_and_close'ing it.
-
-2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Check for the TO recipient
-	list being NULL and don't send.
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Don't forget to unref the
-	FilterDriver.
-
-	* mail-callbacks.c (apply_filters): New callback for applying
-	on-demand filters. (removed the old on-demand filters callback).
-
-	* mail-ops.c (do_filter_ondemand): Rewrote to apply "incoming"
-	filters to all selected messages.
-	(mail_do_filter_ondemand): No longer takes a FilterContext
-	argument or a destination folder argument (why did we ever need
-	this last one??) but now takes a uids argument.
-
-	* folder-browser-factory.c: Add a MessageApplyFilters menu item.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.[ch]: Updated for the new ExecutiveSummary code.
-
-	* Makefile.am: Added the summary files and the evolution-services CFLAGS
-	and LIB stuff.
-
-	* component-factory.c: Re-enabled the summary stuff.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Pass send/postpone signal handler functions to
-	evolution_composer_factory_init.
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_select_all): Implemented.
-	(subscribe_invert_selection): (was unselect_all) Implemented.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Add a "flagged" column, based on the Camel
-	"flagged" flag, for assigning an arbitrary "hey, I care about
-	this" flag to a message.
-	(ml_tree_set_value_at): Remove
-	(ml_tree_is_cell_editable): No, it's not.
-	(on_click): Handle the read/unread and flagged fields via the
-	click handler. Among other things, this makes it not select
-	a message when you change its read status.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* subscribe-dialog.c (folder_info_subscribed,
-	subscribe_folder_info, unsubscribe_folder_info): Don't prepend "/"
-	to the folder's full_name. Deal with hierarchy in the
-	EvolutionStorage tree better.
-	(storage_tree_path): Helper function to build a storage path from
-	a CamelFolderInfo.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* *: Add some missing _()s and N_()s.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_mail): Apply outgoing filters to the
-	message.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Fixed a possible error in row numberings.  This
-	needs to be changed quite a bit anyway, but this should make
-	things slightly nicer in some cases.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Made the top of the folder browser a little
-	prettier.
-
-	* mail-display.c, mail-vfolder.c: Made more dialogs resizable.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-autofilter.c (filter_gui_add_from_message): Don't forget to
-	set the rule source! (eg "incoming", "demand", or "outgoing")
-
-2000-10-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (message_list_init): Always display the vertical
-	scrollbar.
-
-	* mail-display.c (mail_display_new): Always display the vertical
-	scrollbar.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.h: #include <camel/camel-folder.h>
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* mail.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* mail-callbacks.c (run_filter_ondemand): ditto.
-
-	* session.c (forget_passwords): ditto.
-
-2000-10-20  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.oafinfo: Declare composer factory.
-
-	* main.c (main): Initialize it
-
-2000-10-19  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (nuke_uids): e-tree-model is now opaque.  use the
-	accessor to get the root node.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c: #include "mail-vfolder.h"
-	(vfolder_edit_vfolders): Don't call the dummy vfolder_edit
-	function.
-
-	* folder-browser-factory.c: s/VFolderEdit/SetVFolder
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: (do_fetch_mail): For an imap store, just refresh the
-	INBOX.
-
-	* folder-browser-factory.c (control_deactivate): Don't sync
-	non-existent folders.
-	* message-list.c (nuke_uids): Don't traverse non-existent trees.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (glade_messages): New.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: Clean up some old #if 0 code.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Get the MailConfigIdentity
-	*before* we create a new composer object so that we can set the
-	signature file.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (register_ondemand): kill.
-	(create_ondemand_hooks): die.
-	(control_activate): remove hook.
-
-	* test-mail.c (create_container): kill old UI handler.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Fixed some column widths.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (get_message_info): Call get_message_uid to get
-	the uid, save some duplicated code.
-	(folder_changed): Handle the case of a NULL changes input.
-
-	* message-thread.c (thread_messages): Removed pointless
-	variable/assignment 'container'.
-	(thread_messages): Try and cope with duplicate message id's.
-
-2000-11-01  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-callbacks.c (main_select_first_unread): Changed to use 0 as
-	the first row to select a message.
-
-	* mail-ops.h (mail_do_regenerate_messagelist): Removed from
-	header.  This function is no longer public since it is really an
-	internal message-list function.
-
-	* folder-browser.c (search_full_clicked): Call the set_search()
-	function, rather than messagelist_rebuild, which is going private.
-	(search_set): Same here.
-	(folder_browser_clear_search): And here.
-	(etable_key): Call message_list_select() instead of
-	message_list_home and message_list_end.  Removing some odd code
-	duplication.
-
-	* message-thread.c (do_thread_messages): Moved the mail lock to
-	here, rather than locking for each message lookup (which is
-	useless anyway).  This is still not correct either, as the tree
-	references folder data ... but a bit better than it was.
-	(thread_messages): Removed the mail tool lock stuff, lock in
-	higher functions.
-
-	* message-list.h: Added a threaded indicator to the message list
-	itself.
-	(threaded_view): removed a mystery variable.
-
-	* message-list.c (do_regenerate_messagelist): Made the code a
-	little more readable.
-	(build_tree): Fixed argument to be a thread_messages struct, not a
-	container.
-	(cleanup_regenerate_messagelist): Free changeinfo.
-	(mail_do_regenerate_messagelist): If we are adding changes to a
-	flat view, we dont need to goto the other thread at all, so
-	process immediately.
-	(message_list_toggle_threads): Clear the tree if we're changing
-	the view mode.
-	(message_list_toggle_threads): And reset the rowmap, since it is no
-	longer valid.
-	(build_tree): If we are building into an already empty tree, just
-	build into that (probably irrelevant optimisation).
-	(build_subtree): Build hte subtree in the same order as we got it,
-	not inverted order.
-	(message_list_set_threaded): New function to select the threaded
-	view/flat view.
-	(mail_do_regenerate_messagelist): Removed references to
-	mail_config, get it from the ml->threaded var instead.
-	(message_list_destroy): No longer free the key data for the
-	uid_rowmap.
-	(new_id_from_uid): Convert a uid string into an id string.
-	(new_id_from_subject): Likewise for subject strings.
-	 'id' strings replace the 'uid:' and 'subject:' stuff with
-	 accessors and macros and use less memory and is more readable.
-	(id_is_uid): macro to check if an id string is a uid.
-	(id_uid): Returns the uid part of a uid id string.
-	(id_subject): Returns the uid part of a subject id string.
-	(build_subtree): Use the new id functions, and dont duplicate the
-	uid in the uid rowmap, but just reference it from the tree node.
-	(node_equal): Use new id functions.
-	(add_node_diff): And here too.
-	(remove_node_diff): And here.  Also remove the uid from the
-	rowmap, and dont free it anymore.
-	(get_message_info): And here.
-	(get_message_uid): And here.
-	(subtree_unread): And here.
-	(ml_tree_value_at):  "
-	(ml_tree_set_value_at): Noted a memory leak.  do_flag_messages()
-	doesn't free the contents of the uid array, just the uid array
-	(well that i can tell, teh code has more problems anyway).
-	(ml_tree_set_value_at): And fix the id accessors.
-	(save_node_state):  " 
-	(build_flat): Use id macros/functions.  Dont alloc memory for hash
-	key.
-	(build_flat_diff): Use id macros.
-	(build_flat_diff): Remove the hash table entry before freeing its
-	key data (in the node).
-	(free_key): Removed.  Keys are no longer alloc'd.
-	(clear_tree): When we clear the tree, also clear the uid_rowmap,
-	as it is no longer valid (or contains allocated keys!).
-	(free_tree_ids): Renamed from nuke_uids.
-	(free_ids_cb): Renamed from nuke_uids_cb.
-	(free_tree_ids): Changed arg to be a ETreeModel directly.
-	(ml_tree_value_at): Map id to subject using the right macro.
-	(free_tree_ids): Check we have any nodes to traverse first.
-	(build_flat): Insert to row -1 to append the nodes (faster).
-	(remove_node_diff): Only remove the uid rowmap entry if it is
-	referencing this node (i.e. the key string is the same key string,
-	not just a matching key string).
-	(add_node_diff): Remove the uid rowmap entry before inserting a
-	new one to force the key to be replaced.  This is required as the
-	tree may temporarily contain duplicate messages during the
-	rebuilding phase.
-	(message_list_set_search): New function, set the search string.
-	Only redo the search if it has changed, etc.
-	(mail_do_regenerate_messagelist): Made static.  There is no need
-	for external code to call this.
-	(message_list_set_folder): NOP if the new folder is the same.
-	(message_list_set_folder): Clear the tree before rebuilding it.
-	(message_list_select): Ok, this wins the award for 'most bizarre
-	interface'.  Changed the start row to mean the end of the list if
-	we supply -1, rather than the start of the list.  Also fixed the
-	endpoints (it would never select message 0 if searching
-	backwards).
-	(idle_select_row): Changed start row to 0 from -1.
-	(message_list_end): Removed.
-	(message_list_home): Removed.
-	(go_to_message): Removed.  message_list_select can do this.
-	(message_list_select): Check that direction is one of the valid
-	ones, otherwise we could be thrown for loops.
-
-2000-10-31  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (node_equal): Compares an etree node with a
-	message-thread node to see if they point to the same object.
-	(add_node_diff): Adds a new thread node to the etree.
-	(remove_node_diff): Removed an etree node, freeing any additional
-	data.
-	(build_subtree_diff): Takes an existing etree definition, and a
-	new thread definition and makes the etree match, using as few
-	operations as possible.
-	(do_regenerate_messagelist): No longer free/clear the uid/rowmap
-	here.
-	(regenerate_messagelist_input_t): Added a tree field - are we
-	building a tree view?
-	(regnerate_messagelist_data_t): Added a tree field, if we built a
-	tree result.  Added a changes parameter, for building diff's after
-	search/etc.
-	(mail_do_regenerate_messagelist): Setup the tree indicator.
-	(build_flat_diff): Apply a changeset to a message list.
-	(build_flat): Added a changes argument, if present, use
-	build_flat_diff() to build the list.
-	(do_regenerate_messagelist): If we are generating a threaded view,
-	build the threaded list here, rather in another separate
-	invocation.
-	(cleanup_regenerate_messagelist): Call build_tree directly on the
-	threaded list.
-	(message_list_init): Init the uid_rowmap hash table here instead
-	of somewhere odd.
-	(message_list_destroy): Assume uid_rowmap exists.
-	(do_regenerate_messagelist): Remove the code here that is messing
-	with the message list data (search/uid_rowmap).  We're in a
-	different thread boys ...
-
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (cleanup_regenerate_messagelist): Fixed some
-	logic to make more sense (gboolean)!pointer replaced with
-	(pointer != NULL).
-	(build_tree): Put the tree pre/post change stuff in here, where it
-	should be.
-	(build_flat): Same here.
-	(cleanup_regenerate_messagelist): Remove model_changed stuff here.
-	(setup_regenerate_messagelist): Remove pre_change stuff here.
-
-2000-10-20  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (main_folder_changed): Perform incremental update
-	of the display for flat view.
-	(ml_tree_value_at): Spit out a mroe meaningful warning when we
-	can't find the uid in our tree, in the folder.
-
-	* message-thread.c (thread_messages): Made public.
-	(thread_messages_free): Made public.
-	(thread_messages): Now we also return a struct _thread_messages,
-	which is passed to other functions.
-	(container_free): Renamed from thread_messages_free.
-	(thread_messages_free): Take a thread_messages argument.
-	(thread_messages_add): New function to add a list of uid's to the
-	thread list.
-	(thread_messages_remove): Likewise, for removing them.
-	(cleanup_thread_messages): Change for struct changes.
-	(do_thread_messages): Likewise.
-
-2000-10-19  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-tools.c (mail_tool_do_movemail): removed unused var
-
-	* folder-browser.c (search_full_clicked): Fix for api changes,
-	such as it can be called an api, its mroe an utter mess infact.
-	(search_set): Same.
-	(search_set): And here.
-	(folder_browser_clear_search): And here.
-
-	* message-list.c (folder_changed): Copy and forward the changeinfo
-	list to the mian thread.
-	(main_folder_changed): Free the changeinfo. Todo: something smart
-	with this information.
-	(struct regenerate_messagelist_input_s): Added a changes field.
-	(mail_do_regenerate_messagelist): Added a change list argument.
-	(message_list_set_folder): Fix for mail_do_regenreate_messagelist
-	api.
-	(message_list_toggle_threads): Same.
-
-2000-10-18  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (mail_config): Make all the CLists have passive
-	titles.
-	(identity_dialog): Make the default button the "OK" button, and set
-	the dialog to close on pressing return on the entryboxes.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Disable the optionmenu
-	because it is empty.
-	(service_page_item_auth_fill): Enable the optionmenu as there's stuff
-	in it now.
-
-	* mail-callbacks.c (reply_to_sender): Call check_send_configuration
-	when we have the FolderBrowser because if it is done in mail_reply
-	(with passing NULL) it will only be able to continue if the mailer
-	has already been configured.
-	(reply_to_all): Same.
-
-2000-10-18  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_gui_init): No, we REALLY dont
-	want to perform an immediate search as the keys are pressed.
-
-	* mail-display.c (on_object_requested): Kill a minor warning with
-	a cast.
-
-	* mail-config.c: Include mising ctype.h to kill a warning.
-
-	* message-thread.c (main): Fixed the test case for api changes.
-
-	* message-list.c (message_list_drag_data_get): Set some flags to
-	get_folder().  I dont even think this will work because
-	mail_tool_get_folder doesn't handle file url's.
-
-	* mail-vfolder.c (vfolder_uri_to_folder): Pass appropriate flags.
-
-	* mail-ops.c (do_setup_folder): Pass appropriate flags.  Hmm,
-	whats the difference between setup and create.  *shrug*
-	(do_create_folder): Pass appropriate flags to get_folder.  Needs a
-	way to specify the index flag.
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Changed create
-	to flags argument.
-	(mail_tool_get_local_inbox_url): Add an index argument.
-	(mail_tool_get_local_inbox): honour index flag.
-	(mail_tool_get_inbox): Changed for api change.
-	(mail_tool_uri_to_folder): Fixed calls to store_get_folder();
-
-	* mail-local.c (load_metainfo): Added an indexed field to the metainfo.
-	(save_metainfo): And save it too.
-	(do_reconfigure_folder): Honour index flag when creating the new
-	folder.  Do not open the old folder with an index at all.
-	(mail_local_map_uri): Add an index argument - tells if the mbox is
-	indexed.
-	(mail_tool_local_uri_to_folder): Create & pass flags properly.
-	(#include gnome.h): Dont include all of gnome, just what we use,
-	and explicity include xml-memory, so we get xmlFree().
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (search_full_clicked): Un #if 0'd out
-	(search_full): Same.
-	(folder_browser_gui_init): Connect search_full and search_activate.
-	(search_set): Uncomment search_full()
-
-	* Makefile.am: Re-add `mail-search-dialogue.h' and
-	`mail-search-dialogue.c'.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Decode recipient names so
-	that they display nicely in the To and Cc fields.
-	(write_field_to_stream): Now takes another argument
-	'value_is_encoded' so that we know if we should decode that string
-	before proceding onward. Since the message subject is already
-	decoded before it's passed in, we don't want to decode it again
-	(wasted cpu time and/or any 8bit chars will be assumed to be
-	latin1 encoded and thus the decoded value will be corrupt).
-
-2000-10-16  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config-gui.c (service_page_get_url): only set the url->user
-	field if the user string is non-NULL and not empty.
-
-2000-10-16  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): Uh, fixed jeff's
-	wrong fix for setting the speficiation (the function changed to
-	set_state(), as can be seen in the e_table-scrolled_load_state()
-	call only 2 lines above).
-
-2000-10-13  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): oops, chose the
-	wrong thing to cut out after a merge conflict.
-
-2000-10-15  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (subtree_unread): ETreePath != GNode now, use
-	accessors.
-	(ml_tree_value_at): same.
-	(save_node_state): same.
-	(save_tree_state): same.
-	(nuke_uids_cb): convert to e_tree_model_node_traverse required
-	type.
-	(nuke_uids): g_node_traverse -> e_tree_model_node_traverse.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.oafinfo: Add "evolution:shell-component-icon"
-	attribute.
-
-2000-10-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_setup_etable): Don't free the
-	service name.
-
-2000-10-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): sync & expunge the source folder
-	after filtering.
-
-2000-10-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_setup_etable): Create the 'spec'
-	and 'extras' arguments and call e_table_scrolled_new() rather than
-	set_specification as that function no longer (?) exists. 
-
-	Also started to add drag & drop functionality to something like
-	Nautilus (but #if 0'd it out until I had time to finish it and
-	till after 0.6).
-
-2000-10-12  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_setup_etable): Duh, fix the test
-	for the folder name, strstr != strcmp is it.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (folder_to_cachename): Removed, changed callers
-	to use mail_config_folder_to_cachename instead.
-
-	* mail-config.c (mail_config_folder_to_cachename): New utility
-	function to get a cache name for a folder.
-
-	* mail-tools.c (mail_tool_do_movemail): Changed to return the path
-	to the mbox, rather than opening a folder of it.
-
-	* mail-ops.c (mail_incorporate_messages): Dont bother making the
-	pseudo messageinfo, filder_driver_filter_message will do it for
-	us.
-	(report_status): Callback to report status of filtering operation.
-	(do_fetch_mail): Changed significantly - for the api changes to
-	the filtering system.  Also now incorporates a mailbox file
-	directly, without having to import it into a camel folder first.
-	(mail_incorporate_messages): Removed entirely, no longer needed.
-
-	* mail-vfolder.c (vfolder_refresh): Fix for context api changes.
-	(vfolder_uri_to_folder): Likewise.
-
-	* folder-browser-factory.c (create_ondemand_hooks): Changed for
-	api changes.  Also only adds demand filters to the menu (fixed a
-	small logic bug).
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (folder_etree_value_at): special case for
-	folders with NULL urls (which aren't selected/subscribeable).
-	(unsubscribe_folder_info): can't (un)subscribe from folders with
-	non-NULL urls.
-	(subscribe_folder_info): same.
-
-2000-10-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Replace To with From except in Drafts, Outbox,
-	or Sent boxes.  Make Subject column pay attention to text
-	attributes like bold and strikethrough.
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c: Disable the executive summary.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (FOLDER_ETABLE_SPEC): set expansion to 0.0,
-	minimum-width to 16, and resizable to false for the subscribed
-	column.
-	(folder_info_subscribed): new function so we can do the correct
-	path munging.
-	(subscribe_folder_info): only add the folder to the storage if
-	there wasn't an exception subscribing it.
-	(unsubscribe_folder_info): same, but unsubscribing.
-	(folder_etree_value_at): use folder_info_subscribed.
-	(folder_toggle_cb): same.
-	(unsubscribe_folder_foreach): same.
-	(subscribe_folder_foreach): same.
-	(subscribe_dialog_gui_init): set the bold column on the text cell,
-	and add the subscribed pixbuf.
-
-2000-10-11 Anna Marie Dirks   <anna@helixcode.com>
-	* mail-threads.c: Changed the password-getting dialog so that the
-	text entry has focus. 
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (STORE_ETABLE_SPEC): change cell type to
-	"string" since we're not including it in the extras.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h, subscribe-dialog.c: Changed
-	these to use the proper form for the column element.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h, subscribe-dialog.c: Updated
-	these to the new ETable style of specifications.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): convert to the
-	new gal e-table stuff.
-	(html_size_req):
-	(html_new):
-	(put_html): #if 0 out the html functions since description stuff
-	isn't used and we don't want the warnings.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): remove the html
-	description stuff for now.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (folder_toggle_cb): umm.. duh :) only
-	subscribe if it's not subscribed, and vice versa.
-	(subscribe_folder_foreach): make sure to call
-	e_tree_model_node_changed.
-	(unsubscribe_folder_foreach): make sure to call
-	e_tree_model_node_changed.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (setup_scan_subfolders): add a ref to input->storage
-	here so that the ref/unref pattern more closely matches other
-	mail-ops.  also, this keeps the storage from being freed when we
-	hit the unref in cleanup_scan_subfolders, which is important
-	because we maintain a reference to it in the storage_hash in
-	component-factory.c
-
-	* subscribe-dialog.h: add storage field.
-
-	* subscribe-dialog.c (subscribe_folder_info): new function,
-	subscribe to a folder given it's CamelFolderInfo, and add it to
-	the shell - we're generating a path from the name of the folder
-	which is bad.
-	(unsubscribe_folder_info): same (except we unsubscribe and remove
-	from the shell).
-	(storage_selected_cb): unref the currently selected storage.
-	(subscribe_dialog_destroy): unref the currently selected storage.
-	(subscribe_dialog_construct): sc->storage = NULL.
-
-	* component-factory.c (mail_lookup_storage): new function, to look
-	up a EvolutionStorage corresponding to a CamelService.  we ref the
-	EvolutionStorage before passing it back.
-	(mail_add_new_storage): insert the storage into storages_hash if
-	result is EVOLUTION_STORAGE_OK.
-
-	* mail.h: add prototype for mail_lookup_storage.
-
-2000-10-10  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): make sure we dup the return
-	value of get_reply_to or get_from when building the recipient list. 
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Removed the <li> from the
-	HTML.
- 
-2000-10-10  Cody Russell  <bratsche@gnome.org>
-
-	* mail-threads.c: Added #include <errno.h>
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Removed the extra arguments to rule_context_load.
-
-2000-10-09  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c, subscribe-dialog.h: use our own etable to
-	display the stores, and get them from the mail-config api.  put
-	#if 0'ed code in place to add/remove the folders from the shell
-	when they're subscribed/unsusbcribed.  also, react to double
-	clicks in the folder etable by toggling subscription status.
-
-2000-10-08  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (create_summary_view): Updated to use new icon code.
-
-2000-10-08  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c (generate_html_summary): Generic function to 
-	recreate the HTML of the summary. Checks all the folder summaries.
-	(generate_folder_summarys): Create a summary of all the vfolders
-	and the Inbox.
-	(create_summary_view): Generate the folder summarys before the
-	HTML.
-
-2000-10-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c: Don't #include "mail-search-dialogue.h" as
-	it's missing from the repository.
-	(search_full_clicked): Temporarily `#if 0'ed out.
-	(search_full): Likewise.
-	(folder_browser_gui_init): Don't connect `search_full'.
-	(create_option_menu): Don't connect `search_menu_deactivate'.
-	(folder_browser_gui_init): Don't connect `search_activate'.
-	(search_set): Don't do `search_full()'.
-	(folder_browser_gui_init): Likewise.
-
-	* Makefile.am (evolution_mail_SOURCES): Remove
-	`mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed
-	forgot to put them into CVS.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-search-dialogue.c: New widget, full search dialogue for
-	mail.
-
-	* folder-browser.c (search_set): If we click on custom search, run
-	the full search dialogue.
-	(folder_browser_gui_init): Add a button to perform a full search.
-	(search_full): Bring up the mail search dialogue asynchronously.
-	(search_full_clicked): Handle search options.
-	(folder_browser_destroy): Free the saved rule if there is one
-	there.
-	(search_options[]): Added a custom option option - brings up the
-	full search dialogue.
-	(search_set): Disable the search entry if we are doing a full
-	search.
-
-	* mail-vfolder.c (vfolder_create_storage): Yay, finally
-	depeterised this stuff.
-	(vfolder_uri_to_folder): Removed an irrelevant comment.
-
-	* mail-callbacks.c (filter_edit): And here.
-
-	* mail-ops.c (do_fetch_mail): And here too.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Fixed call to
-	context_load.
-	(filter_gui_add_for_mailing_list): And here too.
-
-	* folder-browser-factory.c (create_ondemand_hooks): Remove that
-	ondemand callback snot.
-
-2000-10-05  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_init_etable): Build the etable once
-	we know what folder we are going to use.
-	(save_header_state): Save the header spec to a cache file.
-	(message_list_destroy): Save the header spec.
-	(message_list_setup_etable): Setup the etable spec for this
-	folder, from a saved version if one exists, or to suit the folder
-	type (sent/received).
-	(message_list_set_folder): Setup the etable here once we have a folder.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* message-list.c (message_list_toggle_threads): re-write.
-
-	* folder-browser-factory.c (control_activate): update paths, need
-	CVS HEAD bonobo, use a listener not a verb.
-
-2000-10-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-ops.c (mail_incorporate_messages): Tag string for translation
-	(do_flag_messages): ditto.
-
-	* mail-threads.c (pipe_write): Repeates writes on EINTRS.
-	(pipe_read): Repeats reads on EINTRS.
-	(mail_operation_queue): Use pipe_write
-	(mail_op_set_percentage): ditto.
-	(mail_op_hide_progressbar): ditto.
-	(mail_op_show_progressbar): ditto.
-	(mail_op_set_message): ditto.
-	(mail_op_get_password): ditto.
-	(mail_op_error): ditto.
-	(mail_op_forward_event): ditto.
-	(mail_operations_terminate): ditto.
-	(dispatch): use pipe_read.
-	(dispatch): use pipe_write
-	(dispatch): ditto.
-
-	* mail-ops.c (mail_incorporate_messages): Only show message being
-	incorporated every 2 seconds, to avoid a bunch of CORBA round trips.
-	(do_transfer_messages): ditto.
-	(do_forward_messages): ditto.
-
-2000-10-07  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Move the functionality to
-	incorporate messages into mail_incorporate_messages.
-	(mail_load_evolution_rule_context): New function.  Move the
-	functionality for loading the context rules to its own function.
-
-2000-10-06  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Fix the locking up of the mail by only calling
-	camel functions from the camel thread, and ORBit functions from
-	the GTK thread. Watch for the message-changed signal again.
-
-	* component-factory.c (summary_fn, component_factory_init):
-	Re-enabled it, cos I think it works again.
-
-	* mail-display.h: Remove the pb_cache.
-
-	* Makefile.am: Readd the mail-summary.[ch] files and add the
-	evolution-services library to the link.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): set the @subscribed_only
-	parameter to TRUE, since the subscribe UI is the only interface
-	that should show unsubscribed groups.
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Add missing @subscribed_only
-	parameter in the call to `camel_store_get_folder_info()'.  [FALSE,
-	I hope that's right.]
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (write_field_to_stream): Decode the header before
-	writing it to the header box.
-
-	* mail-callbacks.c (send_receieve_mail): fetch mail before
-	sending, this is a temp fix for POP-before-SMTP authentication.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* component-factory.c (summary_fn, component_factory_init):
-	Disable summary stuff, it appears to be badly broken.
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch]
-
-	* subscribe-dialog.c (update_pixmaps): upd.
-	(set_pixmap): upd.
-	(subscribe_dialog_gui_init): upd.
-	remove redundant and annoying forward definitions.
-
-	* folder-browser-factory.c (control_deactivate): upd.
-	(control_activate_cb): upd.
-	(control_activate): upd.
-	(set_pixmap): upd.
-	(update_pixmaps): upd.
-	(register_ondemand): upd.
-	(create_ondemand_hooks): upd.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): Use CamelInternetAddress
-	instead of my quick hack (aka InternetAddress).
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* mail-summary.c: Don't watch for the message-changed signal.
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* component-factory.c (component_factory_init): Setup the summary
-	factory as well.
-	(summary_fn): New function to create the ExecutiveSummaryComponent.
-
-	* mail-summary.c: Create the view, and update it when something 
-	changes.
-
-2000-10-04  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (on_object_requested): Removed the pixbuf cache
-	as it would return the pixbufs in the reverse order every so often
-	and generally get all confused.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_deactivate): Add back the
-	"sync folder on leave" hack that got lost in the UIHandler merge.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Instead of UnSelectAll, we want
-	InvertSelection.
-
-	* mail-callbacks.c (select_all): Finished this function.
-	(invert_selection): Finished. (was unselect_all - but that's not
-	what we really wanted as it'd be pointless. invert_selection is a
-	much more useful callback :-)
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_root_of_store): remove news specific
-	check.
-	(mail_tool_uri_to_folder): news: -> nntp:
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* mail-ops.c (do_filter_ondemand): Don't expunge the source
-	mailbox on completion.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Don't try to add_folders if
-	get_folder_info returned NULL.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_init_header): Fix the attachment
-	icon width.
-	(content_is_attachment): Perform some simple tests to see if the
-	message contains an attachment.
-	(build_subtree): Kill a pointless warning.
-
-2000-10-04  Miguel de Icaza  <miguel@helixcode.com>
-
-	* mail-callbacks.c (delete_msg): Added a comment to a piece of
-	code that I was trying to "fix" just to find that the strange
-	behaviour here that was about to be fixed, was actually a fix to
-	the problem I was trying to fix.
-
-	So put the original comments from Dan, and will hope that someone
-	with more knowledge about this can figure why the delete key wont
-	delete messages and select the next unread message.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_destroy): destroy our
-	tree_model and remove the root node.  also, release_unref our
-	control and view, and unref the listener.
-
-	* mail-tools.c (mail_tool_uri_to_folder): news url's contain host
-	names too, now.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c, subscribe-dialog.h: add a
-	storage-set-view-listener, and add a little printf saying what
-	storage was selected.
-	
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): get
-	Evolution::StorageSetView interface on our storage set view
-	control, and set "show_folders" to FALSE.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (INCLUDES): add -I$(top_srcdir)/widgets/misc
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): change the
-	window title to Manage Subscriptions, bold subscribed folders, and
-	add a title bar ala the evolution shell (but without the close
-	button).
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-dialog.h: add fields for the storage set
-	Bonobo_Control and Evolution_StorageSetView interfaces.
-
-	* subscribe-dialog.c (subscribe_dialog_gui_init): create the uih
-	as early as possible, and add the storage set view to the left
-	side of the hpaned.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (set_pixmap): upd.
-	(control_activate): upd.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c: Remove "Port" entry from source dialog. We'll
-	use "host:port" like Netscape and other programs do.
-	(service_page_get_url): If host ends in ":###", use that as port.
-	(service_page_set_url): If URL contains a port, append it to the
-	hostname, separated by a colon.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (evolution_mail_SOURCES): subscribe-control.[ch] ->
-	subscribe_dialog.[ch]
-
-	* mail-callbacks.c (manage_subscriptions): subscribe_control ->
-	subscribe_dialog.  Also, pass the shell to subscribe_dialog_new.
-
-	* mail-types.h: SubscribeControl -> SubscribeDialog.
-
-	* subscribe-dialog.c, subscribe-dialog.h: rename from
-	subscribe-control.[ch].
-
-	* subscribe-dialog.c (subscribe_dialog_construct): pass
-	Evolution_Shell in.
-	(subscribe_dialog_new): takes Evolution_Shell argument now.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (message_list_init_renderers): remove the 2 tree
-	pixbufs, so adjust the offsets to the score pixbufs.  also, pass
-	NULL for the open/closed pixbufs to the tree cell renderer.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (mail_do_scan_subfolders, etc): Update for
-	CamelFolderInfo changes.
-
-	* message-list.c (message_list_destroy): Don't save_tree_state if
-	there's no folder associated with the MessageList.
-
-	* folder-browser.c (folder_browser_set_uri): Only call
-	mail_do_load_folder if the URI is not "".
-
-2000-10-02  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.[ch]: Add a cache for the pixbufs, hashed on CID,
-	so that we only have to make a thumbnail once.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c: Generate the thumbnails on an idle function so
-	that the user interface isn't locked. Checks in case the widget it
-	will use to display the image isn't destroyed.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* mail-display.c (on_object_requested): If the attachment is an
-	image display a thumbnail of it, instead of the generic image
-	icon.
-
-2000-09-29  Miguel de Icaza  <miguel@helixcode.com>
-
-	* folder-browser-factory.c: Add print preview verb here.
-
-	* mail-callbacks.c (do_mail_print): Handle printing here, the
-	complete engine.
-	(mail_print_preview_msg): new. does print previewing.
-	(mail_print_msg): does printing of the message.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control-factory.c, subscribe-control-factory.h: nuked.
-	
-	* subscribe-control.c, subscribe-control.h: lots of changes.  we
-	now pop up a dialog, and will have a storage set view on our left
-	side, like the shell does.
-
-	* mail.h: add prototype for manage_subscriptions.
-
-	* mail-callbacks.c (manage_subscriptions): new function, pops up
-	the subscribe dialog.
-
-	* folder-browser-factory.c: add the verb for managing
-	subscriptions.
-
-	* Makefile.am (evolution_mail_SOURCES): add subscribe-control.[ch]
-	again.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control.h (subscribe_search): added prototype.
-
-	* subscribe-control.c (subscribe_search): new function.
-
-	* subscribe-control-factory.c (make_folder_search_widget): new
-	function, to add search widget to toolbar.
-	(control_activate): create the search widget and add it to the
-	toolbar.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_send_queue): Messages should be appended to Sent
-	as Seen.
-	(do_send_mail): Same.
-
-2000-09-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Don't compile `subscribe-control' for now.  It
-	needs to be converted to the new UI handler code in Bonobo; it
-	doesn't compile right now.
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* subscribe-control.c (subscribe_refresh_list): new function.
-
-	* subscribe-control.h (subscribe_refresh_list): new prototype.
-
-	* subscribe-control-factory.c (update_pixmaps): add RefreshList
-	pixmap.  also, add it to the verbs list.
-	
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-types.h: add SubscribeControl typedef.
-
-	* Makefile.am (evolution_mail_SOURCES): add the subscribe stuff.
-
-	* subscribe-control-factory.h * subscribe-control-factory.c *
-	subscribe-control.c: * subscribe-control.h: Mostly mocked up
-	subscribe ui.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	Note: We need a configuration option to specify whether to log
-	filtering actions or not.
-
-	* mail-ops.c (do_filter_ondemand): Updated to pass a log file
-	pointer to filter_driver_run.
-	(do_fetch_mail): Same.
-	(mail_do_fetch_mail): Fixed a compiler warning.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_postpone_cb): Fix it so that "send
-	later" will still mark a message as being replied, forwarded,
-	whatever. Closes bug #568 on bugzilla.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): If the message has been
-	deleted, don't try filtering it - skip to the next message.  Fixes
-	bugzilla bug #639.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Shuffling (un)select all menu items to
-	the Edit menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Added new menu items
-	
-	* mail-callbacks.c (mark_as_seen): New callback to mark all
-	selected messages as Seen.
-	(mark_as_unseen): New callback to mark all selected messages as
-	Unseen.
-	(select_all): New callback to select all messages (not yet
-	finished)
-	(unselect_all): New callback to unselect all messages (not yet
-	finished)
-
-2000-09-25  Not Zed  <NotZed@HelixCode.com>
-
-	* message-list.c (folder_to_cachename): Function to convert a
-	folder name/path to a filename for per-folder data.
-	(save_tree_state):
-	(load_tree_state):
-	(free_tree_state): For loading/saving the state of the expansion
-	of nodes in the tree.
-	(message_list_destroy): Save the tree state when done.
-	(save_node_state): Changed logic, we save when the node should be
-	closed on startup.  i.e. any new nodes with children automatically
-	default to being open.
-	(subtree_unread): Check for unread messages in a subtree.  So
-	false messages (for tree roots) are properly displayed.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): Updated to use Nat's
-	ENameWestern parser.
-
-	* Makefile.am: link against e-util/ename/libename.la
-
-2000-09-25  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: CamelException is not for compile-time errors.
-	Replace lots of argument checks in setup_ functions with
-	g_return_if_fails in the public functions. Also remove some
-	prototypes that weren't needed because they were for static
-	functions that are defined before they're used.
-
-2000-09-23  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (set_pixmap): upd.
-	(control_activate): upd.
-
-2000-09-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (internet_address_new_from_string): Skip spaces
-	at the beginning of the string first before doing anything else.
-	The code that follows doesn't like the first character of the
-	string to be a space.
-
-2000-09-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (address_compare): New comparison function for
-	email addresses.
-	(subject_compare): New comparison function for message subjects.
-	(message_list_init_header): Updated to use the new compare funcs.
-
-2000-09-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Fixed some memory
-	leakage. Call free_recipients() so we don't leak memory.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Use the folder's full_name so
-	recursive directory structures display correctly ;-)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Update for CamelFolder changes
-	(subfolder_names -> subfolder_info).
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (create_msg_composer, compose_msg, send_to_url,
-	mail_reply, forward_msg): * mail-format.c (mail_generate_reply): *
-	mail-ops.c (cleanup_edit_messages):
-
-	* mail-view.c (view_forward_msg): Deal with NULL composer.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Call gnome_vfs_init() since the composer now does
-	file operations (to get the MIME type of attachments).
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c: Removed COL_ONLINE_STATUS because we don't want
-	that. Renamed COL_PRIORITY to COL_SCORE and set it up to sort-of
-	work, I'm not really sure which renderer I should use.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* component-factory.c, folder-browser-factory.c, folder-browser.c,
-	mail-callbacks.c, mail-config-gui.c, mail-display.c,
-	mail-display.h, main.c, message-list.c, message-list.h: Fixed the
-	#include lines to deal properly with gal.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (INCLUDES): add datadir
-
-	* folder-browser-factory.c (control_activate): use it.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (transfer_msg): Revert **Temp fix** from below
-	since the relevant shell bug has been fixed now.
-
-	* mail-ops.c (do_fetch_mail): Fix the sense of the "keep on
-	server" check so we're not doing this backwards. Don't
-	get_message_flags, because POP doesn't support it and it's
-	pointless anyway since we're setting deleted, not toggling it.
-	call camel_folder_sync with expunge=TRUE so that the deletions are
-	actually recorded.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	This bug was so much fun to fix the first time that I decided to
-	fix it again.
-
-	2000-07-11  Dan Winship  <danw@helixcode.com>
-
-		* mail-ops.c (real_send_mail): Set the post_send_data flag
-		rather than toggling it. (Maybe we'll need more control
-		over it later, but for now, the only flag we set is
-		"replied", and we want that set, not toggled.)
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (transfer_msg): **Temp fix** Send "" as the
-	default folder to select as anything else seems to cause a
-	segfault in shell's user_get_folder().
-	(check_configured): A spoon full of 'line wrapping' makes the
-	medicine go down, the medicine go dowwwwn...
-
-2000-09-14  Iain Holmes  <terrorist@gegl.org>
-
-	* mail-callbacks.c (check_configured): Ask if you want to 
-	configure the mail client if it isn't configured already.
-	(check_send_configuration): Remove the error box if mail isn't
-	configured.
-	(send_queued_mail): Same.
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (setup_append_mail): camel_folder_append is perfectly
-	happy to take a NULL info.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c: move fn to bonobo.
-	(set_pixmap): update.
-	(control_deactivate): add bonobo_ui_handler_unset_container
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-config-gui.h: Changed the include here because it caused
-	make distcheck to fail for me.  I changed it from <Evolution.h> to
-	"shell/Evolution.h".  This seems to have fixed things.
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Only use the cache if the user plans
-	to keep_on_server.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (control_deactivate): kill
-	warning. (control_activate): set threaded toggle state,
-	add freeze / thaw.
-	(set_pixmap, fill_toolbar, update_pixmaps): update.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c: Fixed a warning (Missing include
-	file.)
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	($(EVOLUTION_MAIL_CORBA_GENERATED)): Add space after `-I'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Remove `ui.xml' stuff.
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* mail-local-storage.c (mail_local_storage_startup): set
-	folder_tree before adding the listener, since that will eventually
-	invoke callbacks that will look at it.
-
-	* folder-browser-factory.c (control_deactivate): sync the folder
-	on deactivate.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (on_right_click): Also display the name of the
-	mailing list in the "Filter on Mailing List" item for additional
-	Coolness factor.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): Create the
-	rule with `filter_filter_new()' so that it also has an action
-	part.
-
-	* mail-mlist-magic.c (get_header): Use the right header name to
-	retrieve the header.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (on_right_click): Grey out the mailing list
-	filter item if `mail_mlist_magic_detect_list()' returns NULL on
-	this message [i.e., if we cannot figure out a mailing list for
-	this message].
-	(filter_mlist): Good boys don't use F words.
-
-	* mail-mlist-magic.c (check_sender): Work safely if
-	`header_name_return' or `header_value_return' are NULL.
-	(check_x_been_there): Likewise.
-	(check_delivered_to): Likewise.
-	(check_x_mailing_list): Likewise.
-	(check_x_loop): Likewise.
-	(get_header): Use the right header name to retrieve the header.
-
-	* message-list.c (on_right_click): Mark strings for translation.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: Use the latest, shiny, amazing TigerT
-	art for the toolbar.
-
-	* component-factory.c: #include "mail-local-storage.h".
-	(owner_set_cb): Removed unused variable.
-
-	* message-list.c (filter_sender): Made static.
-	(filter_recipient): Likewise.
-	(filter_subject): Likewise.
-	(vfolder_recipient): Likewise.
-	(vfolder_sender): Likewise.
-	(vfolder_subject): Likewise.
-
-	* mail.h (vfolder_subject): Removed prototype [WTF was this doing
-	here?!?!].
-	(vfolder_sender): Likewise.
-	(vfolder_recipient): Likewise.
-	(filter_subject): Likewise.
-	(filter_sender): Likewise.
-	(filter_recipient): Likewise.
-
-	* message-list.c: Added a new "Filter on mailing list" menu item.
-	(filter_mlist): Callback for this menu item.  Use
-	`filter_gui_add_for_mailing_list' to pop up the filter dialog with
-	the appropriate rule.
-
-	* mail-autofilter.c (filter_gui_add_for_mailing_list): New.
-
-	* message-thread.c (dump_tree): Removed unused variable.
-
-	* mail-mlist-magic.c: New.
-	* mail-mlist-magic.h: New.
-
-	* mail-autofilter.c (rule_match_recipients): Mark strings for
-	translation.
-	(rule_from_message): Likewise.
-	(filter_gui_add_from_message): Likewise.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Was trying to unhook an event from
-	the wrong folder - oops.
-
-2000-09-12  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.c: Reverted to version 1.15.
-	(remove_node): Ok, if a node has a parent, remove it from the
-	parent list, otherwise remove it from the (supplied) root list.
-	(group_root_set): When we merge children, free the lost node.
-	(thread_messages_free): Remove the return, run as is.
-	(prune_empty): Plugged another small leak.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (run_filter_ondemand): Updated to use the new
-	mail_do_filter_ondemand.
-
-	* mail-ops.c (do_fetch_mail): Update to use the new
-	filter_driver_run args.
-	(do_filter_ondemand): Updated to use the new filter_driver_run
-	args.
-	(mail_do_filter_ondemand): Take a FilterContext as a argument
-	instead of a driver as we need to destroy the filter inside the
-	do_filter_ondemand function and things'd get messy.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Don't have the filter driver
-	self_destruct.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): If we're fetching from an mbox
-	formatted file then we need to do some special-casing.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Call
-	`mail_local_storage_startup()' to set up handling of the local
-	storage.
-
-	* mail-local-storage.c: New.
-	* mail-local-storage.h: New.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-display.c: Fixed some warnings.
-
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Another big rewrite of this
-	stuff. Now all (well, most) attachments get a small icon with a
-	description and a (non-obvious) right-click pop-up menu with
-	options to save, open in an external program, or show/hide inline.
-
-	TODO: antialias the icon, add more options to the pop-up for
-	certain MIME types, add an icon to the headers, fix PGP to work
-	like everything else, fix message/external-body to work again,
-	add some icon caching action, etc, etc.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Use the CamelUIDCache so that we
-	only retrieve *new* messages and also send notes to the status bar
-	telling it which message we're downloading so that Ettore can
-	sleep at night ;-)
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to not send hook/unhook data
-	to filter_driver_run as it no longer takes those args.
-	(do_filter_ondemand): Same. Also wrap filtering in freeze/thaw to
-	prevent signals from being queued up
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Freeze the default folder before
-	filtering and thaw it afterward to prevent a ton of
-	"folder_changed" signals from being queued.
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c, mail-config-gui.c, mail-ops.c: Fixed some
-	warnings.
-
-	* message-list.c: Added base ETableModel functions.
-
-2000-09-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to pass a CamelMessageInfo
-	to filter_driver_run
-	(do_filter_ondemand): Same.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_filter_ondemand): Updated to check the boolean
-	return code from filter_driver_run to find out whether or not the
-	message was filtered so that it can decide whether or not to
-	delete the message from the source folder or not.
-
-2000-09-07 Jesse Pavel <jpavel@helixcode.com>
-
-	* mail-format.c (mail_generate_reply) Changed the behavior of
-	Reply-to-All so that the sender's address does not appear in
-	the cc: list.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Updated to pass an exception to
-	filter_driver_run and also check the exception before deleting the
-	message from the source folder.
-	(do_filter_ondemand): Updated to pass an exception to
-	filter_driver_run
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_init): Pass a storage dir to
-	camel_session_new now.
-
-	* main.c (main): Can't call session_init here now, because it
-	requires evolution_dir to be set.
-
-	* component-factory.c (owner_set_cb): call session_init here.
-
-	* mail-ops.c (do_fetch_mail): Fix previous fix. (Free the uids,
-	just do it correctly.)
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (do_fetch_mail): Don't free uids, let the camel
-	folder do that when it gets finalized
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (mail_do_filter_ondemand): New async function to
-	filter messages on demand.
-	(do_fetch_mail): Updated to filter 1 message at a time using the
-	new filter-driver code
-	
-	* mail-callbacks.c (composer_postpone_cb): Send NULL as the
-	message info.
-	(run_filter_ondemand): Use mail_do_filter_ondemand instead of
-	filter_driver_run
-	
-	* mail-tools.c: Removed mail_tool_filter_contents_into and
-	mail_tool_fetch_mail_into_searchable as they have now been
-	deprecated.
-
-2000-09-06  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (clear_tree): set the data to NULL for the tree
-	root, so nuke_uids won't try to free anything.
-
-2000-09-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): @shell made const.
-	`CORBA_Object_duplicate()' it before storing it.
-	(folder_browser_destroy): Free the shell object with
-	`CORBA_Object_release()', not `CORBA_free()'.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	@shell made const.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (make_safe_filename): 
-	* mail-format.c (handle_mystery): 
-	* mail-identify.c (mail_identify_mime_part):
-	camel_mime_part_get_filename now deals with both
-	Content-Disposition and Content-Type.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (cleanup_load_folder): Check for NULL folder.
-	(mail_do_setup_folder): Copy the 'name' parameter so that
-	we can free it.
-
-	* message-list.c (nuke_uids): Depth '-1' means "unlimited", not 0.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_set_cb): Re-rename "Sent".
-
-	* folder-browser.c (fb_resize_cb): Remove the "+ 90" here since it
-	seems to break things for me, and it's not commented anyway and
-	there's no excuse for adding 90 to a number with no explanation.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_destroy): Don't free the shell;
-	it's not ours.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): only call
-	camel_folder_get_message_info if the folder has
-	summary_capability. Don't hack up a fake CamelMessageInfo:
-	append_message will take NULL.
-
-	* mail-ops.c: Replace mail_do_setup_draftbox,
-	mail_do_setup_outbox, and mail_do_setup_sentbox with
-	mail_do_setup_folder.
-	(do_send_mail, do_send_queue): s/sentbox_folder/sent_folder/
-
-	* component-factory.c (owner_set_cb): Use mail_do_setup_folder,
-	rename sentbox_folder to sent_folder, and call
-	mail_operation_wait_for_finish after the setup_folder calls in
-	case anything needs to use the _folder variables.
-	
-2000-09-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Applied Jesse's patch that
-	will append a signature to the replied message text
-
-	* folder-browser-factory.c: Changed "Send & Receieve" back to "Get
-	Mail" temporarily so that the toolbar buttons don't all get
-	stretched to some weird proportion
-
-2000-09-03  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.c (mail_config_add_news): Copy the passed in item
-	before adding
-	(mail_config_add_source): ditto
-	(mail_config_add_identity): ditto
-
-	* mail-config-gui.c (mail_config): We don't actually need a notebook
-	pointer.
-	(identities_edit_clicked): Don't explicitly destroy, we are using
-	gtk_clist_set_data_full now
-	(sources_edit_clicked): ditto
-	(news_edit_clicked): ditto
-	(mail_config): Use gtk_clist_set_row_data_full to kill leaks
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Change the "Get Mail" toolbar button
-	to become "Send & Receieve"
-
-	* mail-callbacks.c (send_queued_mail): New callback function for
-	sending queued mail
-	(send_receieve_mail): New callback for Send & Receieve that
-	basically just calls send_queued_mail and then fetch_mail
-
-	* mail-ops.c (cleanup_send_mail): Mod to be able to handle a NULL
-	composer window
-	(setup_send_mail): Modified to handle a NULL composer widget
-	(mail_do_send_queue): New convenience async function to send all
-	messages in a folder (aka all messages in a queue)
-
-2000-09-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-tools.c (mail_tool_move_folder_contents): Since POP3
-	doesn't implement get_message_info, we need to check for info to
-	be NULL. In this case, we need to make our own info structure to
-	pass to append_message and then remember to free it
-	afterward. Should we even bother with get_message_info? And if so,
-	should we then implement get_message_info for POP3?
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (etable_key): Make the `Home' key to move to
-	the beginning of the list and `End' to the end of it, using
-	`message_list_home()' and `message_list_end()'.
-
-	* message-list.c (message_list_home): New.
-	(message_list_end): New.
-
-	* folder-browser.c (folder_browser_new): Don't ref the shell here.
-	(folder_browser_destroy): Don't unref the shell.  Instead,
-	`CORBA_free()' the object reference.
-
-	* folder-browser-factory.c (control_activate): Bind "Open in New
-	Window" to `Ctrl-O'.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* mail-config-gui.c: Use e_utf8 wrappers
-
-	* main.c (main): Do e_unicode_init, so we are not confusing
-	libunicode
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser.c: Removed a warning.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (compose_msg): Attach a callback to the
-	postpone signal
-	(send_to_url): Same
-	(mail_reply): Same
-	(forward_msg): Same
-	(composer_postpone_cb): Callback function for the postpone signal
-
-	* mail-ops.c (mail_do_setup_outbox): New convenience function to
-	load the Outbox folder
-	(mail_do_setup_sentbox): Same, but for Sentbox.
-	(do_send_mail): Now saves messages in Sentbox if sent successfully
-	(mail_do_append_mail): New convenience async function for
-	appending messages to a folder
-	
-	* component-factory.c: Added outbox_folder and sent_folder
-	(owner_set_cb): Call our new convenience functions to load Outbox
-	and Sentbox
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (cleanup_scan_subfolders): Update for the extra arg
-	needed by `evolution_storage_new_folder()'.
-	* mail-vfolder.c (vfolder_refresh): Likewise.
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Don't ref the shell:
-	causes a race upon exit.
-	(folder_browser_destroy): Don't unref it.
-
-	* mail-config-gui.c (service_page_item_new): Add a checkbutton
-	"use default port" to make life simple.
-	(service_page_get_url): Honor use_default_port.
-	(service_page_set_url): Set use_default_port based on the input
-	URL.
-	(toggle_port): New function, sets the sensitivity of the
-	port entry based on "use default port"
-
-	(config_do_query_authtypes): Make this asynchronous, as it
-	may involve connecting to a server.
-	(service_page_detect): Call the async auth querier.
-	(service_page_item_new): Put the authentication stuff in if
-	the url_flags have URL_ALLOW_AUTH. Call the async auth querier
-	to get the info.
-	
-2000-08-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Make the HTML widget grab the
-	focus.
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (do_test_service): Explicitly connect to
-	the service again.
-
-	* component-factory.c (mail_load_storages): Now that 
-	camel_service_get_provider exists, use it to make this function
-	much simpler.
-
-2000-08-29  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Ref the Evolution_Shell.
-	Is this correct, or is it a circular reference?
-	
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (mail_do_send_mail): Update this and related
-	functions to no longer take a From address. (The composer deals
-	with it itself now.)
-	(do_send_mail): Add the Evolution version back to the X-Mailer
-	header (this change got lost in the thread migration).
-
-	* mail-callbacks.c (composer_send_cb): Don't re-fetch the From
-	address. It's set by the composer now. Don't free the
-	post_send_data from here.
-	(mail_reply): Attach to the composer's destroy signal to free the
-	psd. (The current code would free it more than once if an error
-	occurred while trying to send the first time.)
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (mail_config_apply_clicked): Add new news sources,
-	not only stores.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Free the from address when
-	we're done with it. Also, e_msg_composer_hdrs_get_from returns
-	alloc'd memory so don't strdup it.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (do_transfer_messages): Add status messages.
-	(do_flag_messages): Same.
-	(do_scan_subfolders): Same.
-	(do_forward_messages): Same.
-	(do_view_messages): Same.
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Use `gnome_app_set_toolbar()'
-	the easy way instead of doing things manually with `GnomeDock' and
-	`gnome_app_add_toolbar()'.
-	(MINIMUM_WIDTH): New #define.
-	(MINIMUM_HEIGHT): New #define.
-	(view_size_allocate_cb): New, callback for the "size_allocate"
-	signal of the mail view.  It saves the last allocation in a static
-	`last_allocation' variable.
-	(mail_view_create): Connect it.
-	(set_default_size): New function.  Set the default width/height to
-	the last allocation width/height; if the width/height is less than
-	the `MINIUM_WIDTH' or `MINIMUM_HEIGHT', use that value instead.
-
-	* mail-tools.c (mail_tool_move_folder_contents): Show `i + 1', not
-	`i', so that we correctlly start counting from one instead of zero.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* *.c: s,mail_dialog_run,gnome_dialog_run,g.
-
-	* main.c (main): Since only the main thread is dealing with GTK+,
-	free the GDK threads mutex and never worry about locking again.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Fix to prevent
-	possible buffer overflows and a logic fix.
-
-2000-08-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_clearsign): New crypto
-	function to clearsign plaintext
-
-2000-08-27  Ariel Rios  <ariel@arcavia.com>
-
-	* folder-browser-factory.c (control_activate): Added bonobo menu
-	handler for mark_all_deleted function.
-
-	* mail.h: (mark_all_deleted): Added prototype.
-
-	* mail-callbacks.c (mark_all_deleted): Added callback for marking
-	all displayed messages in a folder as deleted.
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-view.c (mail_view_create): Use
-	`gtk_window_set_default_size' on the toplevel instead of
-	`gtk_widget_set_usize()', and make the default size smaller.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-crypto.c: Fixed an uninitialized variable.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-mail.gnorba: Kill
-
-	* Makefile.am: Remove gnorba related stuff
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): If the service wants
-	a host, also let the user specify a port.
-	(MailDialogServicePageItem): Add members for the port GtkEntry and
-	the default port.
-	(service_page_get_url): Translate the port in the entry back into
-	the CamelURL.
-	(service_page_set_url): Read in the port from the URL or use
-	the default.
-
-2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Implemented PGP 2.x
-	encryption. We only need to get the passphrase if we plan to sign
-	the text, otherwise we don't need to worry about getting the
-	passphrase.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* folder-browser.c: Use e_utf8 wrappers
-
-	* mail-config-gui.c: Use e_utf8 wrappers
-
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Add all the
-	functions from message-list.c's popup menu to the main
-	menu as well
-
-	* message-list.c (vfolder_subject): These functions become
-	public.
-
-	* mail-callbacks.c (mark_all_seen): Don't call camel_folder_get_uids
-	here. IMAP, for example, will try to communicate with the IMAP
-	server during that call.
-
-	* mail-ops.c (cleanup_fetch_mail): Tell the user
-	which URL has no new mail, as they may be checking
-	more than one source.
-	(mail_do_flag_all_messages): New function. Flags all of
-	the messages in a folder. Something of a hack. This merely
-	extends the flag_messages operation; it doesn't implement
-	a new one.
-	(do_flag_messages et al): Fetch the uids if we need to;
-	use camel_folder_free_uids if necessary, etc.
-	
-	* mail-tools.c (mail_tool_move_folder_contents): Add
-	messages to tell the user what's going on.
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c: Fixed some warnings in the uihandler
-	code.
-
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (mail_load_storages): New function.
-	Loads a list of URI's as mail storages, and inserts them
-	into the shell's folder tree if appropriate (really, only
-	puts them into the folder tree.)
-	(mail_add_new_storage): Insert a storage into the folder
-	tree. Not always appropriate (eg, /var/spool/mail/user is
-	a storage that shouldn't be in the folder tree.)
-	(create_view): Generate the Evolution_Shell and pass it
-	to folder_browser_factor_new_control so that its member
-	'shell' can be set.
-	(owner_set_cb): Instead of create_news_storage and
-	creating the imap storages, load the news storages and
-	mail storages via mail_load_storages().
-
-	* folder-browser-factory.c (control_activate): Change to
-	use providers_config again instead of mail_config. Pass
-	the folderbrowser so that the config code knows where
-	to insert the new storages if any are created. Pass
-	forget_passwords the folderbriwser, too, for good luck.
-	(folder_browser_factory_new_control): Take a new parameter,
-	the Evolution_Shell that we belong to. The field in
-	FolderBrowser has been there but was never getting set by
-	anything, and we need this to be able to insert new storages
-	into the shell's folder list.
-
-	* folder-browser.c (folder_browser_new): Accept the
-	new Evolution_Shell parameter. Set it. (Should we 
-	ref it or something?)
-
-	* mail-config-gui.c (struct MailDruidDialog): Store an
-	Evolution_Shell. With this we can insert the stores into 
-	the shell's folder list.
-	(struct MailDialog): Same.
-	(service_page_item_changed): Close a leak.
-	(identity_dialog): Unswitch the Add/Edit identity titles.
-	(news_dialog): Analogous to above.
-	(mail_druid_finish): Add the new mail source to the shell
-	view.
-	(mail_config_druid): Take a new Evolution_Shell parameter
-	for later use.
-	(mail_config_apply_clicked): Add all the mail sources to
-	the shell view.
-	(mail_config): Take a new Evolution_Shell parameter.
-
-	* mail-callbacks.c (check_configured): Accept a FolderBrowser
-	so that we know where to put the new storages if any are
-	created. Almost all the callbacks are passed a FB * anyway
-	so this isn't a big deal.
-	(check_send_configuration): Make sure that we're configured
-	enough to be able to send mail. composer_send_cb() used to
-	do this, but it would need a FolderBrowser *, and there are
-	too many entry points to composer_send_cb to make this
-	feasible.
-	(fetch_mail): Pass the extra parm to check_configured().
-	(free_psd): Move so that composer_send_cb can call this
-	directly.
-	(composer_send_cb): Don't check for proper configuration
-	here -- it is the caller's responsiblity to call
-	check_send_configuration(). Call free_psd() directly.
-	(compose_msg): Call check_send_configuration().
-	(send_to_url): Same. This is called from mail-display.c,
-	though, and cannot reasonably be passed a FB. So: we can't
-	start up the config dialog directly; the user must do it
-	manually. Oh well.
-	(mail_reply): Same as above.
-	(forward_msg): Same as compose_msg().
-	(edit_msg): Same as above.
-	(providers_config): Reenable so that we can pass mail_config
-	its FolderBrowser.
-	
-	* mail-display.c (write_data_to_file): Use the much more
-	straightforward run_and_close to retrieve the user's answer,
-	instead of the reply callback stuff.
-
-	* mail-threads.c (mail_dialog_run): New wrapper for 
-	gnome_dialog_run that will take care of the GDK lock correctly.
-	Far far more complicated than it should be.
-	(mail_dialog_run_and_close): Analogous to above.
-	(read_msg): Set inside_read_msg and unset it for the benefit
-	of the two above functions. Don't bracket ourselves in 
-	GDK_THREADS_ENTER/_LEAVE anymore.
-	(mail_operation_queue): Use mail_dialog_run_and_close.
-	(show_error): As above.
-	(get_password): As above.
-	
-	* mail-display.c (write_data_to_file): This has the only
-	exception to the rule that "use mail_dialog_run(_and_close)
-	instead of the gnome equivalent always." Not quite sure why
-	it doesn't work here (the file selection window?).
-
-	* mail-config-gui.c (identity_dialog): Change to
-	mail_dialog_run_and_close.
-	(source_dialog): Same as above.
-	(news_dialog): Same as above.
-	(cleanup_test_service): Same as above.
-	(mail_config): Change to mail_dialog_run().
-
-	* session.c (mail_request_dialog): Change to 
-	mail_dialog_run_and_close.
-
-	* mail-tools.c (mail_tool_uri_to_folder_noex): As above.
-
-	* mail-ops.c (cleanup_fetch_mail): As above.
-
-	* mail-local.c (local_reconfigure_folder): As above.
-
-	* mail-callbacks.c (check_send_configuration): As above.
-	(ask_confirm_for_empty_subject): As above.
-	(edit_msg): As above.
-	(filter_edit): As above.
-
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Reformat a bit,
-	make "Folder" appear before "Message", fill in the Message menu
-	more.
-
-2000-08-23  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (describe_fetch_mail): Don't use the camel calls
-	to describe the operation.
-
-2000-08-22  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Don't connect 
-	to the service explicitly.
-	(mail_tool_send_via_transport): Don't connect to the transport
-	explicitly.
-	(mail_tool_get_root_of_store): Same.
-
-	* mail-config-gui.c (do_test_service): Just try camel_session_get_service,
-	which will now connect for us.
-
-	* message-thread.h: Add a note about *next being the first member
-	of struct _container... if it isn't, everything goes Very Wrong.
-
-	* message-thread.c (free_container): Extra debug print.
-	(remove_node): Handle the case of empty containers holding the child
-	that we're interested in.
-	(thread_messages_free): Extra debug print.
-
-2000-08-20  Jeremy Wise  <jwise@pathwaynet.com>
-	* folder-browser.c: (fb_resize_cb) Added function to monitor resize
-	of the e_paned in the main view.
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_filter_contents_into): Fix a race. filter_driver_run is an
-	async operation so it won't even be started by the time we sync the folders and check
-	for the movemailbox to be emtpy. Thus the empty check for the movemail would fail
-	99% of the time.
-
-	* mail-callbacks.c (run_filter_ondemand): Pass he new argument to the ever-mushrooming
-	filter_driver_run.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Fix menu item names.
-	(register_ondemand): Put the ondemand hooks into the new folder menu.
-
-2000-08-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-vfolder.c (vfolder_gui_add_rule): Use stock OK/Cancel
-	buttons and add i18n support.
-
-	* folder-browser-factory.c (control_activate): Changed menu item
-	label from "Mark all messages seen" to "Mark All Messages as
-	Read".  Changed capitalization of some other menu items.
-	(control_activate): Put the message- and folder- related menu
-	items in new "Message" and "Folder" subtrees which are created in
-	the `<Component Placeholder>' item created by the shell.
-	(control_deactivate): Updated accordingly.
-	(control_activate): Put the filter and vfolder editors, the mail
-	configuration and the "forget password" command into the
-	"settings" menu.
-	(control_deactivate): Updated accordingly.
-
-	* mail-config-gui.c (transport_page_new): Add translation mark.
-	(service_page_new): Show the menu items before appending them.
-	(service_page_item_new): Use `GTK_FILL' for the "Detect supported
-	types..." button.
-
-	* local-config.glade: Change the apply button into an ok button.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	Implement filtering on demand.
-	
-	* folder-browser-factory.c (register_ondemand): New function. Callback
-	to put the filter-on-demand filters into the bonobo UIH;
-	(create_ondemand_hooks): New function. Read in our on-demand filters 
-	and hook them into the UI.
-	(remove_ondemand_hooks): New function. Remove the hooks when done with
-	them.
-	(control_activate): Call create_ondemand_hooks()
-	(control_deactivate): Call remove_ondemand_hooks();
-
-	* mail-callbacks.c (run_filter_ondemand): New function. Callback
-	for running a filter on demand.
-	(filter_edit): Pass NULLs as the new arguments to rule_context_load.
-	
-	* mail.h: Prototype run_filter_ondemand();
-
-	* folder-browser.c (oc_destroy): New function. Iterator to destroy
-	an fb_ondemand_closure.
-	(folder_browser_destroy): Free the data associated with the ondemand
-	menu items.
-	(my_folder_browser_init): Clear the filter_ variables.
-
-	* folder-browser.h: Two new members of FolderBrowser: filter_menu_paths,
-	a list of fb_ondemand_closures so that the menu items can be freed and
-	removed; and filter_context, a permanently loaded FilterContext for
-	running the ondemand filters. Prototype the new fb_ondemand_closure
-	structure.
-
-	* mail-autofilter.c (filter_gui_add_from_message): Pass NULLs as the
-	new parameters to rule_context_load (we don't need to hook up ondemand
-	menu items...)
-
-	* mail-tools.c (mail_tool_filter_get_folder_func): Rename from 
-	get_folder_func() and make public so mail-callbacks.c:run_filter_ondemand()
-	can use it too.
-	(mail_tool_filter_contents_into): Use the new name of get_folder_func.
-	Pass NULLs as the extra arguments to rule_context_load. Pass the
-	extra source type to filter_driver_run (only use INCOMING).
-
-	* mail-tools.h: Publicly prototype mail_tool_filter_get_folder_func()
-
-	* mail-vfolder.c (vfolder_create_storage): Pass NULLs as the extra 
-	arguments to rule_context_load.
-
-	* message-list.c (message_list_init): Free our strdup'd uids when
-	the table model gets destroyed.
-	(nuke_uids): New function. Walk the tree nodes to free the uids.
-	(nuke_uids_cb): New callback for nuke_uids();
-
-
-2000-08-16  Richard Hult  <rhult@hem.passagen.se>
- 
- 	* mail-ops.c (cleanup_display_message): Use a configurable timeout.
- 
- 	* mail-config.c (mail_config_set_mark_as_seen_timeout): New function
- 	for the settable mark-as-seen timeout.
- 	(mail_config_mark_as_seen_timeout): Likewise.
- 	(mail_config_write): Write the timeout setting.
- 	(config_read): Read timeout setting.
- 
- 	* mail-config-gui.c (mail_config): Add option for the settable
- 	mark-as-seen timeout.
- 	(mail_config_apply_clicked): Likewise.
- 	(timeout_changed): New function for the timeout setting.
-	
-2000-08-16  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (walk_containers): More (default disabled)
-	mem debugging here. Fix the big leaks.
-
-	* mail-format.c (get_url_for_icon): Copy the url_path so that
-	it can't get freed under us.
-
-	* mail-threads.c (mail_operation_queue): Fix a leak.
-
-	* mail-ops.c (mail_do_display_message): Fix another leak.
-
-	* message-list.c (message_list_destroy): Remove the seen_id timeout
-	if necessary.
-
-	* mail-local.c (mail_tool_local_uri_to_folder): Fix a leak.
-
-	* session.c (auth_callback): Fix a leak. Almost seems as if
-	I've been using Purify...
-
-
-2000-08-15  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (alloc_container): Add support for debugging
-	container allocations -- currently disabled. Make sure that
-	the g_strfreev works.
-
-	* message-list.c (main_message_changed): Address bug #496 --
-	possible race when forwading a message_changed event.
-
-	* mail-threads.c (dispatch): Close the dispatch thread's half of
-	pipes when about to exit.
-	(mail_operations_terminate): Close the main thread's half of the
-	pipes when about to exit.
-	(all): Add i18n support.
-	
-	* mail-tools.c (all): Add i18n support.
-
-	* mail-ops.c (transfer_messages): Generalize move_messages into
-	transfer_messages so that we can copy too.
-	(all): Add i18n supprt where appropriate.
-
-	* mail-ops.h: Prototype the new mail_do_transfer_messages.
-
-	* folder-browser-factory.c: Add a UI hook for copy_msg.
-
-	* mail-callbacks.c (transfer_msg): Generalize move so that it supports
-	copy as well, and add a callback 'copy_msg'.
-
-	* message-list.c (on_right_click): Add a right-click hook for Copy Message.
-
-	* session.c (mail_request_dialog): Don't deadlock when in main thread.
-	
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (show_error): Fix the error dialogs.
-	(read_msg): Re-enable them.
-
-	* mail-ops.c (do_scan_subfolders): Silence a compile warning.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for
-	encrypting via PGP 5.0
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (cleanup_create_folder): Release the listener object
-	with `CORBA_Object_release()', not `CORBA_free()'.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Set the signal handlers for `SIGSEGV' and
-	`SIGBUS' to the default ones.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (mail_config_write): Set config->configured to
-	TRUE
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-config-gui.c (mail_config_druid): Don't
-	`GDK_THREADS_ENTER()'/`GDK_THREADS_LEAVE()'.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (update_active_views): Just iterate through all
-	the controls, not just the active ones.
-
-	* folder-browser-factory.c: Don't keep track of active controls.
-	Rather, keep track of all of them.
-	(folder_browser_factory_get_active_control_list): Removed.
-	(folder_browser_factory_get_control_list): New.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-local.h
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (read_msg): For now, don't do anything about
-	errors.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (add_url): Fix some freed-memory references
-
-	* mail-threads.c (get_password): Don't free the prompt. It
-	doesn't belong to you.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (mail_do_create_folder): Duplicate the listener
-	object.
-	(cleanup_create_folder): Free the listener.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-threads.c (get_password): Don't wrap the gnome_dialog_run
-	in GDK_THREADS_ENTER/LEAVE
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_destroy_cb): Remove the
-	control from the active control list, if it's there.
-
-	* mail.h (folder_browser_factory_new_control): Removed prototype.
-	(folder_browser_factory_init): Removed prototype.
-
-	* folder-browser-factory.h: New.
-
-	* folder-browser-factory.c: New static variable `active_controls',
-	list of the currently active controls.
-	(control_activate): Add the control to it.
-	(control_deactivate): Remove the control from it.
-	(folder_browser_factory_get_active_control_list): New.
-
-	* mail-threads.c (mail_operations_get_status): New function.
-
-	* folder-browser.c (folder_browser_gui_init): Add i18n support for
-	the labels.
-
-	[The following is actually from a patch by Peter Williams
-	<peterw@helixcode.com>.]
-
-	* Removed types `PERCENTAGE', `HIDE_PBAR', `SHOW_PBAR'.  New
-	struct `block_info_s'.  Removed all the code to create and destroy
-	the progress window.
-
-2000-08-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_news_storage): Updated to reflect
-	changes to mail_do_scan_subfolders
-	(create_imap_storage): Same.
-
-	* mail-ops.c (mail_do_scan_subfolders): No longer takes an
-	add_INBOX argument
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (do_scan_subfolders): Lose a reference to the store
-	on purpose. To be fixed later.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Take the source as a
-	command-line argument rather than fetching it from mail-config.
-	(owner_set_cb): Call create_imap_storage on each configured IMAP
-	store.
-
-	* mail-format.c (decode_pgp): Redo this so that the lock icon
-	remains active after a failed decryption so you can click on it
-	and try again.
-	(try_inline_pgp, handle_multipart_encrypted): Put a border around
-	the decrypted data.
-
-	* message-list.c (cleanup_regenerate_messagelist): Don't clear the
-	tree here. If two "folder_changed"s arrive in close succession,
-	then one possible ordering of events is
-	cleanup_regenerate_messagelist, cleanup_regenerate_messagelist,
-	cleanup_thread_messages, cleanup_thread_messages. Which would
-	result in the message list being filled in twice without being
-	cleared in between. So don't clear it until the rebuilding
-	function itself is called.
-	(clear_tree): New function to empty out the ETreeModel in the
-	message list.
-	(build_tree): Change to simpler interface. Call clear_tree.
-	(build_subtree): Does most of the work of the old build_tree
-	(build_flat): Remove unused arg. Call clear_tree.
-
-	* message-thread.c (cleanup_thread_messages): Update for
-	build_tree interface change.
-
-	* mail-ops.c (do_send_mail): Don't leak the transport.
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Don't ref the
-	store returned from camel_session_get_store. It's already reffed.
-	(mail_tool_get_root_of_store): Ditto.
-	(mail_tool_send_via_transport): Remove some commented-out code and
-	fix it to not leave the transport connected if sending fails.
-
-	* mail-callbacks.c (delete_msg): Toggling a flag is an
-	"instantaneous" operation, so if we're only doing one, just do it
-	and return, rather than queueing it for the other thread. This
-	makes the "Delete" key work correctly (move to the next message)
-	again.
-
-	* mail-identify.c: Remove workaround for gnome-vfs 0.2 bug.
-
-	* mail-format.c (lookup_handler): Remove workaround for function
-	introduced between gnome-vfs 0.2 and 0.3, since we depend on 0.3
-	now.
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* main.c (main): kill using_oaf assertion.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am: Make it so that test-mail links
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Move menu items
-	that affect a single message together, ditto with ones that
-	affect multiple messages, put a separator in.
-
-2000-08-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-format.c, mail-tools.h, message-list.c: Fixed a warning.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Redo this again. Get rid of
-	struct mail_format_data and move most of that info into
-	MailDisplay itself, and pass the MailDisplay around. Add a GData**
-	to MailDisplay, and put the urls hash table into that. Also add
-	the ability to redisplay the currently-displayed message (with the
-	same GData**), and add a "show_pgp" datum to it that controls
-	whether or not to decrypt PGP messages, and redo the PGP stuff
-	(again) to take that into account. Now you don't get the annoying
-	PGP password dialog box without any warning.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config-gui.c (service_acceptable): Make verify-service
-	an asynchronous operation.
-
-	* Makefile.am (noinst_PROGRAMS): Don't build test-thread
-	while mail-threads.c is in flux.
-
-	* mail-threads.c (mail_operation_queue): Make the error
-	and query dialogs modal.
-
-	* mail-local.c (update_progress): Don't use the
-	temporarily-disabled mail_op_set_percentage().
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.c (mail_config_get_default_news): use config->news
-	instead of config->sources.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (destroy_part): Update this for CamelObject
-	(try_inline_pgp): Deal with decrypting here rather than trying to
-	pawn the data off to handle_multipart_encrypted, since it most
-	likely won't be correct (won't have the proper MIME headers inside
-	the encrypted part).
-	(handle_multipart_encrypted): Add code from Nathan Thompson-Amato
-	to re-MIME-parse the decrypted data after decrypting.
-
-	* mail-crypto.c (mail_crypto_openpgp_{de,en}crypt): Get the
-	password here rather than having it passed in. Remove some dead
-	code.
-
-	* session.c (mail_request_dialog): Allow this to work in either a
-	sync or an async context.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_fetch_mail_into_searchable): Don't
-	do the imap check here... it's a silly place.
-
-	* mail-ops.c (do_fetch_mail): Do the imap check here.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (service_page_new): Work around
-	gtk option menu bug.
-	(service_page_item_auth_fill): ditto
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (read_msg): Fix the new FORWARD_EVENT handler
-	(didn't free msg, didn't write newline in the debug)
-
-	* mail-local.c (local_reconfigure_folder): Make the dialog
-	modal.
-
-	* mail-callbacks.c (select_first_unread): Fix some warnings.
-
-	* mail-threads.c (mail_op_forward_event): New function that
-	writes a FORWARD_EVENT signal to the compipe, to allow Camel
-	events to be handled in the main thread.
-	(read_msg): Handle a FORWARD_EVENT.
-
-	* mail-callbacks.c (select_first_unread): Forward the
-	event into the main thread to prevent the GTK calls in the
-	dispatcher thread. 
-	(main_select_first_unread): New name of old select_first_unread.
-
-	* message-list.c (folder_changed): Same as above.
-	(main_folder_changed): Same as above.
-	(message_changed): Same as above.
-	(main_message_changed): Same as above.
-
-	* mail-format.c (free_byte_array): Note about using
-	mail_op_forward_event. (cmm_destroyed): Same.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_select): If the caller passes "-1"
-	for the model row, translate that to view row 0.
-
-	* message-list.c (idle_select_row): 
-	* mail-callbacks.c (select_first_unread): Use new
-	message_list_select kludge^H^H^H^H^H^Hfeature
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (source_dialog): Allow the window
-	to be growable
-
-	* mail-config.c: use void in empty declarations
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config.c (mail_config_get_news): Change () to (void)
-	if a function takes no arguments.
-	
-	* mail-config.h: Prototype mail_config_get_{sources,news}x
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (identity_dialog): iddialog, not sdialog
-	(news_edit_clicked): Kill leftover c-p crud
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (news_edit_clicked): Check nrow, not srow.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config-gui.c (service_acceptable): Use camel_object_unref
-	instead of gtk_object_unref
-	(mail_druid_finish): Use new config accessors
-	(mail_config_druid): No need to call config functions
-	(news_add_clicked): Increments maxnrow, not maxsrow
-	(mail_config_apply_clicked): Use new config accessors
-	(mail_config): ditto
-
-	* component-factory.c (create_imap_storage): Use new
-	config accessors
-	(create_news_storage): ditto
-
-	* mail-config.glade: Set news clist name correctly
-
-	* mail-config.c (config_read): Rename from mail_config_read and
-	made private - no one should need to do a read manually.
-	(mail_config_set_send_html): New accessor
-	(mail_config_add_identity): ditto
-	(mail_config_get_sources): ditto
-	(mail_config_add_source): ditto
-	(mail_config_get_default_news): ditto
-	(mail_config_get_news): ditto
-	(mail_config_add_news): ditto
-
-	* mail-config.h: Prototype new accessors.  Config struct is now
-	in mail-config.c and hidden from the world.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (describe_fetch_mail): Use camel_service_get_name
-	rather than showing the URL to the user.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (do_refile_messages): Freeze the folders while moving.
-	(do_flag_messages): Same.
-	
-	* mail-threads.c (get_password_clicked): Fix the case when the
-	user /doesn't/ use escape to cancel the dialog :-/
-	(show_error_clicked): Same.
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_name): Add a function to
-	return a useful name for a folder (not just "mbox" or "mh" for
-	any local folder.)
-
-	* mail-ops.c: Use mail_tool_get_folder_name rather than
-	folder->full_name when printing folder names.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-tools.c (mail_tool_get_local_inbox_url): Properly handle
-	different local file formats.  The folder isn't always mbox.
-	(mail_tool_do_movemail): Movemail always uses an mbox format
-	however.
-	(mail_tool_get_local_movemail_url): What is the mbox url, it is
-	always the same type, mbox.
-	(mail_tool_fetch_mail_into_searchable): Same here.
-
-	* mail-local.c (mail_local_map_uri): Map a local uri to the real uri.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c, message-list.c, message-thread.c,
-	session.c: Fixed some warnings.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_init): Don't call e_setup_base_dir. It was
-	wrong and it doesn't exist any more.
-
-	* component-factory.c (owner_set_cb): Update for changed
-	prototype, and record the evolution_homedir. Move call to
-	mail_config_init here from session.c so it happens after
-	evolution_dir is initialized.
-
-	* mail.h: define "extern char *evolution_dir;" (formerly in
-	e-util/e-setup.h)
-
-	* component-factory.c, mail-callbacks.c, mail-config-gui.c,
-	mail-config.c, mail-display.c, mail-format.c, mail-ops.c,
-	mail-tools.c, session.c: Remove "e-util/e-setup.h" include.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* test-thread.c (queue_ops): Use mail_operations_terminate() to
-	close the other thread nicely.
-
-	* mail-threads.c (get_password_deleted): Handle the "close" event
-	as a cancel.
-	(show_error): Same.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-tools.c (mail_tool_get_folder_from_urlname): Add a
-	"gboolean create" argument to pass to camel_store_get_folder.
-
-	* mail-ops.c (do_create_folder, do_setup_draftbox): 
-	* mail-local.c (mail_tool_local_uri_to_folder): 
-	* mail-vfolder.c (vfolder_uri_to_folder): Add create flag to
-	mail_tool_get_folder_from_urlname calls.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-callbacks.c (composer_send_cb): Fix compile warning by
-	casting the object to a CamelObject
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_filter_contents_into): Delete the source
-	folder if told to and if it's empty
-	(mail_tool_get_local_movemail_path): New function.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-callbacks.c (reply_to_all): Fix a bug in the async changes.
-	(This was identical to reply_to_sender.)
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-local.c (do_local_reconfigure_folder): Update for
-	append_message api change.
-
-	* message-list.c (message_list_regenerate): Change for search api
-	change.
-	(ml_tree_value_at): Add a colour column, based on the colour
-	assigned in the summary.
-	(message_list_init_renderers): Init colour column.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* mail-display.c (part_for_url): Remove a gtk_object_get_data
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* folder-browser-factory.c, mail-view.c: Make the toolbars
-	honor the user's gnomecc settings for detachable toolbars.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-  
-	* mail-ops.c (composer_send_cb): Get the from address set in the
-	composer, if that fails ONLY THEN get the default from mail config
-
-	* mail-config.c (mail_config_get_identities): New convenience
-	function for getting a list of the configured identities
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_object_requested): Support controls as well
-	as embeddables.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-view.c (mail_view_create): Changed to only take a
-	FolderBrowser argument
-
-	* mail-ops.c (real_view_msg): Create a new FolderBrowser for each
-	message being opened in a new window. Also set the
-	message_list->cursor_uid and mail_display->current_message to the
-	appropriate values.
-	(real_view_msg): Updated to reflect changes in the mail_view_create
-
-	* message-list.c (on_right_click): Nicify a little, add in a menu
-	separator between VFolder and Filter stuff.
-
-	* mail-ops.c (real_view_msg): Set the UID of the message that is
-  	being displayed
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Use
-	`GNOME_STOCK_MENU_*' things instead of `GNOME_STOCK_PIXMAP_*'
-	things, that are too big and look bad.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* mail-view.c (mail_view_create): Save the top window so that on_close
-	can find it [with set_data].
-	(on_close): Recover the top window.
-	
-	* mail-threads.c (read_msg): Destroy the window instead of hiding it.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c (filter_gui_add_from_message): Helper function
-	to add with confirm.
-	(rule_match_recipients): Dont set real name if its empty for the
-	filter name.
-	(rule_match_subject): was cutting ] off mailing list names.
-
-	* message-list.c (on_right_click): Added menu to install
-	vfolders/filters from message.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-autofilter.c: New file to hold auto filter/vfolder stuff.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings.
-
-	* message-list.c: Fix the call to e_popup_menu_run to match the
-	new signature.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Create a "print
-	message" menu item.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (message_list_init): Attached a double_click
-	signal handler
-	(on_double_click): Our lovely new double_click callback. Will
-	display the current selected message in a new window
-
-2000-08-08  Jeremy Wise  <jwise@pathwaynet.com>
-	* mail-config.[ch], folder-browser.c: Added configuration work to
-	save the size of the vpaned widget.  It will be functional when the
-	e_paned widget emits a "resized" signal
-
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.h: Added void as an argument to functions not
-	needing any parameters to avoid compile warnings.
-
-2000-08-08  Jeremy Wise  <jwise@pathwaynet.com>
-	* mail-config.[ch], main.c, folder-browser-factory.c: State of the
-	threaded list toggle is now saved via gnome_config
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c (service_page_item_new): Attach a signal
-	handler to call the "changed" function when the user clicks the
-	"keep on server" checkbox.
-	
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (view_msg): New convenience function with params of a
-	normal Gtk callback function. We also now create a new
-	FolderBrowser object so that the message-view window isn't tied to
-	the display in the main window
-	(view_message): Now calls view_msg (this function is a bonobo
-	callback and can't be used with gtk widgets)
-	(edit_msg): Same idea as view_msg()
-	(edit_message): Again, same as view_message()
-
-	* message-list.c (on_right_click): Callback for creating an
-	e-popup-menu
-	(message_list_init): Added a right_click event to trigger a pop-up
-	menu to be displayed
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-config-gui.c: Add "Don't delete messages from server"
-	button to remote SOURCEs that aren't STORAGEs (ie, POP).
-	(provider_list): Only list SOURCEs. (ie, not mh)
-
-	* mail-config.c: Save/load "keep_on_server" flag.
-
-	* mail-ops.c (fetch_remote_mail): New function, split out of
-	real_fetch_mail. Deals with copying mail from a remote server into
-	a temporary mbox, possibly using a CamelUIDCache to leave the
-	messages on the server.
-
-	* mail-crypto.c, mail-format.c, message-thread.c: Fix some
-	compiler warnings.
-
-	* mail-format.c (mail_generate_reply): Fix up format of addresses.
-	(write_headers): Use CamelAddress functions to simplify this.
-
-2000-08-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-view.c: Lets get rid of the last separator in the toolbar
-	until we add n/p
-
-2000-08-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-threads.c (queue_window_delete_event_cb): Callback for
-	"delete_event", just doing nothing.
-	(create_queue_window): Connect it to the "delete_event" signal of
-	the progress dialog.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (remove_next_pending): Sanity check for
-	job queue, which seems to have some issues.
-	(read_msg): Make sure that the next operation isn't started
-	before the last one is cleaned up.
-
-	* mail-callbacks.c (fetch_mail): Fix erroneous free.
-
-	* mail-config-gui.c (mail_config_druid): Wrap the gtk_main call.
-
-	* mail-ops.c (do_flag_messages): Allow specification of whether
-	to set the flags unconditionally or toggle their current state.
-
-	* message-list.c (ml_tree_set_value_at): Toggle the seen status;
-	don't set it unconditionally.
-
-	* mail-callbacks.c (delete_msg): Toggle the deletion status;
-	don't set it unconditionally.
-
-	* mail-tools.c (mail_tool_do_movemail): Fix for undeclared tmpfd.
-
-	* mail-local.c (local_reconfigure_folder): Big rewrite; make into
-	an asynchronous operation. Use some mail tools to make life easy.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Move mail_config_init after session_init, since
-	it depends on evolution_dir being set.
-
-2000-08-08  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-ops.c (check_configured): Use config accessors
-	(fetch_mail): ditto
-	(composer_send_cb): ditto
-	(create_msg_composer): ditto
-
-	* mail-config-gui.h: Update API
-
-	* mail-config.h: Update API
-
-	* mail-config.c: Add accessor functions
-	(mail_config_is_configured): accessor function
-	(mail_config_get_default_identity): ditto
-	(mail_config_get_default_source): ditto
-	(mail_config_get_transport): ditto
-	(mail_config_send_html): ditto
-	(identity_copy): Make public
-	(identity_destroy): ditto
-	(identity_destroy_each): ditto
-	(service_copy): ditto
-	(service_destroy): ditto
-	(service_destroy_each): ditto
-	(mail_config_init): Rename from init_config and make public
-	(mail_config_clear): Rename from clear_config and make public
-	(mail_config_read): Rename from read_config and make public
-	(mail_config_write): Reanme from write_config and make public
-
-	* main.c (main): Call mail_config_init.
-
-	* mail.h: Include mail-config-gui.h
-
-	* mail-config-gui.c: Move config gui stuff here.
-	(source_dialog): Kill memory leak from debug leftovers.
-	Make sure returned source is NULL by default
-
-2000-08-07  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-local.c (local_reconfigure_folder): Redone to show a
-	dialogue first, and show progress of whats happening as its done.
-
-	* Makefile.am (glade_DATA): Added local-config.glade, for mailbox
-	reconfig dialogue.
-
-2000-08-04  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (mail_uri_to_folder): Use local_uri_to_folder()
-	for local uri's (file://).
-
-	* mail-local.c (local_uri_to_folder): Handle looking up folder
-	storage type before opening the store/folder.
-	(local_reconfigure_folder): Function to reconfigure the format of
-	a local mailbox into another storage format.
-
-	* Makefile.am (evolution_mail_SOURCES): Added mail-local.c and
-	missing mail-vfolder.h.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added mail-view.c
-	
-	* folder-browser-factory.c (control_activate): Adda menu item for
-	viewing the message
-
-	* mail-view.c: New file containing methods for viewing messages in
-	separate windows
-
-	* mail-ops.c (view_message): New callback for viewing messages in
-	a new window.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (real_create_generic_storage): New function
-	to replace real_create_imap_storage and real_create_news_storage
-	(create_imap_storage): Updated.
-	(create_news_storage): Updated.
-
-2000-08-07  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (cleanup_edit_messages): New operation: edit_messages
-	For continuing draft messages.
-	(attach_messages): Fix accidental 0 datasize.
-	(do_setup_draftbox): New operation: setup_draftbox. Soooo hacky.
-
-	* mail-callbacks.c: Move fejj's edit message to the async home.
-
-	* component-factory.c (owner_set_cb): Use mail_do_setup_draftbox.
-
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-display.c:
-	* component-factory.c: s/strncasecmp/g_strncasecmp
-
-	* mail-format.c (write_headers): Get rid of kludge around subject
-	beginning with spaces.
-	(mail_generate_reply): Get rid of kludge around subject beginning
-	with spaces and also use g_strncasecmp instead of strncasecmp for
-	portability
-
-	* mail-ops.c (forward_msg): Get rid of kludges around subject
-	beginning with spaces.
-
-2000-08-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_select): Clarify that the input row
-	is a model row, and swap it to a view row when finding the
-	next/previous row.
-	(idle_select_row): Select view row 0, not model row 0.
-
-	* mail-ops.c (select_first_unread): Start from view row 0, not
-	model row 0.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-format.c (mail_get_message_body): Renamed from reply_body()
-	so other functions can use it
-	(mail_generate_reply): Updated to reflect function name changes
-
-	* mail-ops.c (real_edit_msg): Attach a callback to the send signal
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): New menu item under
-	Actions to allow editing of messages.
-
-	* mail-ops.c (edit_message): New function for editing messages.
-
-	* component-factory.c (owner_set_cb): Create a global reference to
-	the Drafts mbox folder for the Composer to use
-
-2000-08-06  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.c (ndialog_page_undone): Desensitize ok button
-	(sdialog_page_undone): ditto
-	(iddialog_page_undone): ditto
-	(news_page_new): Typo - news, not mail
-	(transport_page_new): Typo - transport, not source
-	(identity_dialog): Set undone callback
-	(source_dialog): ditto
-	(news_dialog): ditto
-	(mail_druid_identity_undone): Desensitize next button and
-	mark done flag as false
-	(mail_druid_source_undone): ditto
-	(mail_druid_transport_undone): ditto
-	(mail_druid_identity_done): Mark done flag as true
-	(mail_druid_source_done): ditto
-	(mail_druid_transport_done): ditto
-	(mail_druid_prepare): Use done flag to set next button 
-	sensitivity, fixes #467
-
-2000-08-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for
-	encrypting with GnuPG.  Support for PGP5 and PGP2 are still in
-	progress.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Remove bonobo 0.15
-	vs 0.15-and-a-half ifdef, since we require post-0.16 now.
-
-2000-08-04  Dan Winship  <danw@helixcode.com>
-
-	* mail-threads.c (mail_operation_wait_for_finish): Don't use
-	"while (gtk_events_pending ()) gtk_main_iteration ();" inside
-	another tight loop, because it makes the thread spin rather than
-	blocking and waiting like it should.
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (do_thread_messages): Uninitialized variable
-	fix.
-
-	* mail-threads.c (read_msg): Small leak fix.
-
-	* component-factory.c (owner_unset_cb): Use mail_operations_
-	terminate() instead of wait_for_finish().
-
-	* mail-threads.c (mail_operation_queue): Centralize the clur
-	handling functions; fix a race condition where the dispatcher
-	would overwrite the closure before the main thread could
-	free the old one.
-	(mail_operations_terminate): New function, wait for ops to
-	finished and kill the other thread.
-	(dispatch): changes to die when terminate is called (abort
-	on NULL spec).
-
-	* mail-ops.c (cleanup_display_message): Fix improper handling
-	of displaying a NULL message (which means clear the message
-	display).
-
-2000-08-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (message_list_regenerate): Free the GPtrArray
-	correctly instead of using `g_strfreev()'.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): release the ui_handler
-	after set_container.
-
-2000-08-03  Michael Meeks  <michael@helixcode.com>
-
-	* mail-config.c (identity_page_new): only whack the sig in if the
-	file exists.
-
-	* component-factory.c (factory_fn): count running instances,
-	attach destroy signal (factory_destroy): add. 
-
-	* main.c (main): pass orb around.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): Yay, no more compiler warnings
-
-	* mail-config.c: set config = NULL
-	(provider_list) Eek! Initialize news to NULL!  Also, use
-	g_slist_prepend() for "performance" gains ;-)
-	(init_config): Set the config member data to NULL just to be on
-	the safe side
-	(clear_config): Don't bother freeing slist data if the slist is
-	NULL
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (op_forward_messages): Use the new dynamic
-	operation naming.
-
-	* message-thread.c (describe_thread_messages): Ditto.
-
-	* message-list.c (describe_regenerate_messagelist): Ditto.
-
-	* mail-threads.c (get_password_clicked): Dynamic generation
-	of descriptive text for mail operations. "Opening a folder" ->
-	"Opening INBOX". Supported only so far, will be implemented
-	quickly.
-	g_strdup() the old_message when changing the queue_window_label's
-	text.
-
-	* main.c (main): One more gconf reference to take out...
-
-	* mail-ops.c (composer_send_cb): Check for an identity before
-	sending.
-	
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-config.glade: Increase window size slightly, rename
-	"Transport" to "Mail Transport"
-
-	* mail-config.c (init_config): Remove gconf references
-	(clear_config): ditto
-	(read_config): ditto
-	(write_config): ditto
-	(mail_config): Null provider lists before filling them
-	(mail_config_druid): ditto
-	(identity_page_new): Increase spacing of vbox
-	(service_page_new): ditto
-
-	* Makefile.am: Remove gconf references. 
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (service_page_item_new): Make the "test settings"
-	button FILL rather than SHRINK so it doesn't end up oddly-placed.
-
-	* mail-config-druid.glade: Make the icon background dark blue
-	like the surrounding area.
-
-2000-08-02  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (owner_unset_cb): Wait for async operations
-	to finish before exiting.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-ops.c, message-list.c: Emit "model_pre_change" where
-	appropriate.
-
-2000-08-02  Peter Williams  <peterw@helixcode.com>
-
-	* mail-config.h: #ifdef _MAIL_CONFIG_H protect the header.
-
-2000-08-01  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c: Implement Solaris threads. Attempt
-	to join to the thread upon exit -- hopefully prevents
-	all those nasty zombie processes from popping up :-(
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-crypto.c: New code to spawn off GPG/PGP to do stuff.
-	Currently only deals with decryption. From Nathan Thompson-Amato
-	<ndt@jps.net>, with bunches of changes from me.
-
-	* session.c (mail_request_dialog): Expose the password dialog to
-	the rest of the app (for use by the GPG/PGP code).
-
-	* mail-format.c (handle_text_plain): Handle special inline data
-	types. (Currently uuencoding, BinHex, and PGP encryption.) This is
-	not the best way to deal with it, but it works for now.
-	(try_inline_pgp): Convert an inline PGP-encrypted message into a
-	multipart/encrypted part.
-	(try_inline_binhex): Convert an inline BinHex attachment into an
-	application/mac-binhex40 part (which we currently don't deal
-	with...)
-	(try_uudecoding): Convert a uuencoded attachment to an
-	application/octet-stream part.
-	(handle_multipart_encrypted): Deal with RFC2015 MIME-encoded PGP
-	encrypted messages. (From ndt.)
-
-	* mail-display.c (mail_text_write, mail_error_write): New utility
-	functions.
-
-	* Makefile.am (evolution_mail_SOURCES): add mail-crypto.c
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* component-factory.c, folder-browser.c: Fixed some warnings.
-
-	* message-list.c: Made the icon column non sortable.
-
-2000-07-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (service_page_set_url): Fix a NULL-pointer strcmp
-	noticed by peterw.
-
-2000-07-31  Not Zed  <NotZed@HelixCode.com>
-
-	* mail-vfolder.h: Header for vfolder functions.
-
-	* folder-browser.c (mail_uri_to_folder): Use new scheme to open
-	vfolders.
-	(search_save): New button/function to save a search as a vfolder.
-
-	* mail-vfolder.c (vfolder_edit): Made asynchronous.
-	(vfolder_uri_to_folder): New function for loading vfolders and
-	setting up their source folders.
-	(vfolder_refresh): Change shell vfolder uri's to indirect
-	references rather than the real vfolder uri.
-	(vfolder_gui_add_rule): Add a rule with user confirmation.
-	(vfolder_create_part): Get a new part by name, for creating rules
-	in code.
-
-	* message-thread.c (thread_messages): Check for uid lookup
-	failure, which indicates an error in the folder or calling code.
-
-2000-07-29  Not Zed  <NotZed@HelixCode.com>
-
-	* component-factory.c (create_view): Remove hack to pass the
-	storage around.
-
-	* folder-browser-factory.c (control_activate): Changed to call
-	renamed vfolder editor.
-
-	* mail-ops.c (vfolder_edit_vfolders): renamed from vfolder_edit,
-	call new edit function.
-	(vfolder_editor_clicked): Removed.
-	(filter_druid_clicked):
-	(filter_edit): Updated for api change.
-	(real_fetch_mail): Fixed up for api change and fucked up indent.
-	(filter_get_folder): callback for filter driver.
-
-	* mail-vfolder.c: New file to manage virtual folders.
-
-2000-07-29  JP Rosevear  <jpr@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Use new mail config stuff
-
-	* component-factory.c (create_imap_storage): Use new mail config
-	stuff
-	(create_news_storage): ditto
-
-	* evolution-mail.schemas: Gconf schema for evolution mail
-
-	* mail-config-druid.glade: Gladification of config druid
-
-	* mail-config.h: New header with config structs.
-
-	* mail-config.c: Rewrite of GUI configuration tools to use 
-	new config structs.  Stores multiple identities and sources now.
-	Still only uses the first one found.
-	(mail_config_fetch): Returns MailConfig struct to caller
-	for configuration queries.
-	(mail_config): Renamed function to show mail config dialog.
-	(mail_config_druid): Renamed function to show mail config druid.
-
-	* mail-ops.c (create_msg_composer): Use 
-	e_msg_composer_new_with_sig_file and new config stuff
-	(check_configured): Use new config stuff
-	(fetch_mail): ditto
-	(composer_send_cb): ditto
-
-2000-07-28  Cody Russell  <bratsche@gnome.org>
-        * mail-ops.c, mail.h: Added mark_all_seen(), to mark every
-        message in the list with CAMEL_MESSAGE_SEEN.
-
-        * folder-browser-factory.c: Added "Actions/Mark all seen".
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Lets fix Dan's kludge the Right Way (tm)
-	(set_service_url): Only strip off the leading "/" from the 
-	url->path if url->host is NULL
-	(get_service_url): Only prepend a leading "/" to the path if the
-	host is NULL
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (get_service_url): toss in a kludge to deal with
-	the IMAP vs mbox path problem for now.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Removed counting of selected
-	messages.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Don't create the tmp_mbox before
-	calling movemail, because the external movemail requires it to not
-	exist. Contrariwise, delete it in the cleanup code if it's empty.
-	Update for camel_movemail interface change. Do the "No new
-	messages" dialog in the mbox case as well as the remote mail
-	issue.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c: s/struct refile_data/struct move_data
-	(real_move_msg): Renamed from real_refile_msg()
-	(move_msg): Renamed from refile_msg()
-
-	* folder-browser-factory.c: Changed Refile to Move.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (lookup_handler): Update for OAF and for external
-	apps as well as components.
-	(handle_via_external): Handler to set up for data that can be
-	displayed by an external application.
-
-	* mail-display.c (on_link_clicked, etc): Refactor the save_data()
-	code and add launch_external() as a handler for
-	x-evolution-external URLs.
-	(embeddable_destroy_cb): Remove this, since it seems like it's all
-	wrong.
-	(on_object_requested): Update for OAF, and fix some bugs.
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (get_service_url): Always prepend a leading "/" to
-	the url->path.
-	(set_service_url): Added more error checking and also strip the
-	leading '/' from the url->path
-	(create_identity_page): Set the signature file to the one specified in
-	the identity record, else set the default path to ~/.sugnature
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* mail-config.c (create_identity_page): set default signature to
-	~/.signature
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops.c (reply): Check for the case of fb->mail_display->
-	current_message = NULL, which shouldn't happen, but has happened
-	to me.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* message-thread.c (group_root_set): Don't group together messages
-	with the same non-Re: subject and no References/In-Reply-To. More
-	often than not, they're unrelated. (eg, "[No subject]".)
-	(thread_messages): Handle messages with no Message-Id. "This
-	shouldn't happen", but it does sometimes, and it's not much code
-	to make it just work.
-
-2000-07-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-config.c (create_service_page): Call
-	`gtk_option_menu_set_menu()' as the last thing, as `GtkOptionMenu'
-	is fscking broken.  Also, `gtk_widget_show()' the individual menu
-	items.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (mark_msg_seen, ml_tree_set_value_at,
-	message_list_regenerate): Update for CamelFolder API changes.
-	(Certain functions no longer take a CamelException.)
-
-	* mail-ops.c (real_fetch_mail, real_send_mail, real_delete_msg):
-	ditto
-
-	* component-factory.c (real_create_imap_storage,
-	real_create_news_storage): ditto
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c, folder-browser-factory.c, test-mail.c:
-	Remove GOAD support.
-
-	* main.c: Remove GOAD support.
-	(main): More "guess the build mistake" fun, this time for the
-	failure to initialize Bonobo case.
-
-2000-07-24  Peter Williams  <peterw@helixcode.com>
-
-	* mail-tools.c (mail_tool_set_uid_flags): Change
-	function to faithfully pass parameters to
-	camel_folder_set_message_flags; this function is
-	somewhat useless now. Other files synced with
-	API change.
-
-	* mail-ops.c (op_display_message): Change "display
-	a message" into "retrieve a messsage" in the
-	description of mail_op_display_message.
-
-	* mail-threads.c (display_timeout): New function.
-	Only display the progress dialog if the operation
-	takes more than a second to perform.
-	(hide_queue_window): New function. Hide the queue
-	window as an idle function... I'm thinking maybe
-	the problem with hiding it was due to us not
-	being in a GTK event sequence? Perhaps it's only
-	the timeout, which was not being cancelled, which
-	is now.
-	
-	* message-list.c (get_message_uid): New function,
-	copy of get_message_info, except gets only the
-	UID, as that's all that most functions want, and
-	we avoid a Camel call.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (create_message_composer): New.
-	(compose_msg): Use it.
-	(send_to_url): Likewise.
-	(forward_msg): Likewise.
-
-	* folder-browser-factory.c (control_activate): Use `_()' instead
-	of `N_()'.
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* message-thread.c (setup_thread_messages): New
-	operation: thread_messages, simple wrapper around
-	thread_messages () and thread_messages_free();
-
-	* message-list.c (cleanup_regenerate_messagelist): 
-	Use new thread_messages operation instead of just
-	calling ... thread_messages :-)
-
-	* folder-browser.c (folder_browser_destroy): Use new
-	sync_folder operation instead of calling camel_folder_sync
-	directly.
-
-	* component-factory.c (create_folder): Changed to use
-	new create_folder operation.
-
-	* mail-ops.c (mail_do_create_folder): New operation: create
-	folder. New operation: sync folder.
-
-	* mail-format.c (cmm_destroyed): Remove the url hashtable from
-	the larger hashtable when it gets destroyed.
-
-	* mail-callbacks.c (fetch_mail): Pass a hook function and data
-	down the chain to pick up the folder_changed and change the view.
-
-	* mail-ops.c: Rename from mail-ops-new.c now that it's a little more
-	solid. 
-	(fetch_mail): Add new options to hook and unhook an event while the
-	filter driver runs. A hack, but all of the operations are to some
-	extent.
-	(cleanup_fetch_mail): Unref the destination folder if not NULL.
-	* mail-tools.c (mail_tool_filter_contents_into): Intermediate the
-	event hook/unhook hack here.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* mail-ops-new.c (setup_send_mail): Fix silly forgetting-to-ref
-	problem on some sends (when not replying). Note the early exit
-	path with a big comment.
-	
-	* message-list.c (message_list_set_folder): Don't call
-	folder_changed, call mail_do_regenerate_messagelist, as
-	the GDK_THREADS_ENTER in the former can deadlock us!
-
-	* folder-browser.c (folder_browser_set_uri): Ah, screw it.
-	Make 'load folder' asynchronous and pretend that it always
-	succeeds.
-
-	* mail-ops-new.c (mail_do_load_folder): New operation, loads
-	a folder into a FolderBrowser.
-	
-	* mail-threads.c (read_msg): Check if the exception is
-	a user cancel; don't complain if it is.
-	(mail_operation_queue): Same.
-	(dispatch_func): Same.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-	
-	* mail-ops-new.c (cleanup_send_mail): Fix evil mistaken
-	unref.
-
-	* test-thread.c: Fit the new mail_operation_spec prototype.
-
-	* mail-callbacks.c (composer_send_cb): Hide the composer upon
-	start of send operation.
-
-	* folder-browser.c: #include "mail-ops-new.h"
-
-	* mail-threads.h: Change text fields of mail_operation_spec to
-	provide two forms of the name.
-
-	* mail-threads.c: Use appropriate new string fields.
-	(dispatch_func): Hide the progressbar by default.
-	
-	* message-list.c (op_regenerate_messagelist): Fix the datasize from
-	0 -> sizeof (regenerate_messagelist_data_t). Add the new gerund and
-	infinitive strings.
-	(do_regenerate_messagelist): Include some code that fell between the
-	cracks.
-
-	* mail-ops-new.c (op_scan_subfolders): Same datasize fix for 
-	scan_subfolders.
-	(op_forward_message): Same.	
-	(all): Add new gerund and inifinitive strings for mail_operation_spec.
-	(cleanup_send_mail): Destroy the composer on success; re-show it on
-	error. I'm so clever!
-	
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (factory_fn): Updated for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-thread.c (thread_messages): What if message info is NULL?
-
-2000-07-17  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c (real_create_{imap,news}_storage): Instead of
-	directly calling evolution_storage_new_folder, queue up a list of
-	folders to register so that we don't do our CORBA in The Other Thread.
-	(create_{imap,news}_storage): Changes ancillary to the above.
-	(add_new_mailbox): New function to queue up a folder
-	(cleanup_create_info): New function to dequeue the folders and free mem.
-
-	* test-thread.c: s,ENABLE_BROKEN_THREADS,USE_BROKEN_THREADS -- oops
-
-	* mail-format.c: (mail_lookup_url_table): New function to get the url
-	table associated with a CamelMimeMessage because we can no longer 
-	gtk_object_get_data on it.
-
-	* mail-display.c: replace 'gtk_object_get_data( message, "urls" )'
-	with 'mail_lookup_url_table( message )'
-
-2000-07-16  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* folder-browser.c, component-factory.c: Initial code to support
-	IMAP folders that don't use "/" as a directory separator.
-
-2000-07-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (set_x_mailer_header): New helper function to set the
-	`X-Mailer:' header to to `Evolution <version> [Developer
-	Preview]".
-	(real_send_mail): Call it.
-
-2000-07-14  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* message-list.c (message_list_set_folder): Ported to CamelObject:
-	GTK_OBJECT->CAMEL_OBJECT; gtk_signal_connect->camel_object_hook_event;
-	GDK_THREADS_ENTER/LEAVE around "changed" event hooks.
-
-	* folder-browser.c (folder_browser_destroy): likewise.
-	(mail_uri_to_folder): likewise.
-	(folder_browser_load_folder): likewise.
-	
-2000-07-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add `GCONF_LIBS'.
-
-2000-07-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_headers): put a <p> at the end of the
-	header table. (I think there used to be whitespace after it, but
-	then some gtkhtml change got rid of it...)
-	(handle_text_plain): Don't do this <PRE>. Instead, CONVERT_NL and
-	CONVERT_SPACES and wrap it in <TT>. Now if the sender didn't
-	include any newlines, it will be wrapped to the width of the
-	window instead of extending off into infinity.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_destroy): Only unref the folder if
-	it's been set.
-
-	* folder-browser.c (folder_browser_destroy): Only sync the folder
-	if it's been set.
-
-2000-07-13  Jonathan Blandford  <jrb@redhat.com>
-
-	* mail-config.c (create_transport):
-	s/CAMEL_SERVICE_NEED_HOST/CAMEL_SERVICE_URL_NEED_HOST.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (add_row): Add a "gboolean required" argument, and
-	set its value on the entry.
-	(create_source, create_transport): Create rows for URL elements if
-	the URL ALLOWs them. Mark them required if it NEEDs them.
-	(service_note_doneness): Only require the required fields to be
-	filled in.
-
-	Now the IMAP config page allows the user to enter a path, but
-	doesn't require it.
-	
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Back to the old way to avoid
-	g_warnings, yay. Also fix append to send a flags argument (0)
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.c (providers_config_new): fix some cut & paste bung.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-	
-	* mail-format.c (setup_function_table): add "message/news" to the
-	mime_function_table using the same handler as message/rfc822.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-config.glade*: add news server tab to dialog.
-
-	* mail-config.c (on_NewsServerConfigDialogButton_clicked): new function.
-	(on_clistNewsServers_select_row): new function.
-	(on_cmdNewsServersAdd_clicked): new function.
-	(on_cmdNewsServersEdit_clicked): new function.
-	(on_cmdNewsServersDelete_clicked): new function.
-	(providers_config_new): mirror the source tab's code to fill in
-	the news server tab.
-	(write_config): save out the news server.
-	(create_news_server_config_dialog): new function.
-	(create_news_server_page): new function.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* mail-display.c (save_data): Change from evolution_dir to
-	g_get_home_dir() for default location of save file.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Changed to use 
-	camel_folder_move_message_to () rather than get_message () and then
-	append_message (). This also makes it so we don't have to worry about
-	fetching message flags to pass to the new append_message () method.
-
-	* folder-browser.c (folder_browser_load_folder): Disable
-	Search capability menu/entry if folder doesn't support it.
-
-	* message-list.c (message_list_regenerate): Don't perform
-	a search if the folder doesn't support it.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_send_mail): Set the post_send_data flag rather
-	than toggling it. (Maybe we'll need more control over it later,
-	but for now, the only flag we set is "replied", and we want
-	that set, not toggled.)
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Work with both
-	current and 0.15 bonobo
-
-	* kill more debugging messages
-
-	* mail-ops.c (real_fetch_mail): Don't multiply free dest_url.
-
-	* message-list.c (message_list_select): Update
-	message_list_select_next to do either next or previous.
-
-	* folder-browser.c (etable_key): Make 'n' and 'p' do next and
-	previous unread message.
-
-	* mail-ops.c (select_first_unread): Update.
-	(real_fetch_mail): clean up a bit.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (forward_msg): Initialize `fwd_subj' to NULL if
-	`from' is NULL.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Fixed broken POP fetching
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Removed variable `browsers'.
-	(create_view): Don't update it.
-	(owner_unset_cb): Don't sync the folders here anymore, because at
-	this point the folder browser is dead already so we cannot get a
-	valid list of folders from it anymore.
-
-	* folder-browser.c (folder_browser_destroy): Sync the associated
-	mailbox first.
-
-2000-07-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Switched from ETable to
-	ETableScrolled.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Fixed movemail so that it too would
-	deliver to Inbox.
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Don't g_warn if the user
-	selects a fake tree parent.
-	(message_list_select_next): Ignore fake rows
-	(build_tree): Store the "root_subject" for fake rows
-	(ml_tree_value_at): Display the correct subject for fake rows.
-	(on_cursor_change_cmd): Update for the other changes and set
-	cursor_uid to NULL when the cursor is on a fake row.
-
-	* mail-ops.c (reply): Don't try to reply when no (real) message is
-	selected.
-	(forward_msg): Ditto.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Remove setting of dnd_code since that's handled
-	internally to ETable.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (etable_key): Fix up the pageup/pagedown
-	increment a bit.
-
-	* folder-browser-factory.c (control_activate): Add a "Threaded
-	Message List" item to the "View" menu.
-
-	* message-list.c (message_list_toggle_threads): Handler for that.
-	(build_flat): New function to build a "flat" message list using
-	the tree model.
-	(message_list_regenerate): Build tree or flat message list
-	depending on the global setting.
-
-	* message-thread.c (get_root_subject): fix a "Re:" parsing bug
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Always dump incoming messages to
-	Inbox (assuming not filtered to another location).
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Move the
-	"Expunge" item to the "Action" menu.
-	(control_deactivate): Accordingly.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (forward_msg): Deal with having multiple selected
-	messages.
-
-	* mail-format.c (mail_generate_forward): Removed. (Integrated into
-	forward_msg)
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (build_tree): Small fix to stop uid data from
-	being set on a message-list tree node when it didn't correspond
-	to an actual message.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Fix Jeff's FIXME: This does
-	get called with out-of-range data sometimes, so we do need the
-	check. Use e_table_model_row_count to get the actual right answer.
-
-2000-07-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (get_message_info): This wasn't quite right, it
-	will now work but still isn't perfect. See FIXME comment.
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* message-thread.c (remove_node): Add another argument "clast"
-	pointing to the container before the current one in the list,
-	which it can update if that turns out to be the one that it
-	removed.
-	(group_root_set): Update for remove_node change, and remove both
-	nodes in the "subjects are common" case. Fixes a bug that would
-	cause the message list to be truncated if this rule was invoked.
-
-	(sort_node): sort the tree by the original order of the messages
-	in the folder rather than by date.
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Lots of changes. Store uids as node data on the
-	tree nodes and use those rather than rows where possible. (The
-	concept of "row" is just getting too complicated.) Get rid of the
-	summary_table, because given a uid we can call
-	camel_folder_get_message_info, which makes more sense than keeping
-	a separate uid->row hash table ourselves.
-
-	(get_message_info): update
-	(get_message_row): removed
-	(ml_col_cound, ml_row_count, ml_value_at, ml_set_value_at,
-	ml_cell_is_editable, ml_duplicate_value, ml_free_value,
-	ml_initialize_value, ml_value_is_empty, ml_value_to_string):
-	Removed. We always use the tree model now.
-	(message_list_init): Remove the non-tree code.
-	(build_tree): store uids in the tree rather than row numbers,
-	and build the message_list->uid_rowmap to map from uids to rows
-	when needed.
-	(message_list_regenerate): Renamed from _set_search, since it's
-	used to redraw in non-search cases too.
-	(message_changed): Use the uid_rowmap to get a model row number.
-
-	* message-thread.c (thread_messages): Change the interface on this
-	to work with the new MessageList.
-
-	* folder-browser.c (search_set, folder_browser_clear_search): 
-	s/message_list_set_search/message_list_regenerate/
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (get_message_info): Handle a row number of -1
-	properly.
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_info): Map tree model row numbers to
-	summary row numbers.
-	(ml_tree_value_at, ml_tree_set_value_at,
-	ml_tree_is_cell_editable): So don't do that here.
-
-2000-07-06  JP Rosevear  <jpr@arcavia.com>
-
-	* mail-config.glade*: Glade files for the configuration dialog.
-	
-	* mail-config.c (providers_config_new): Build the dialog with
-	glade.
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c, folder-browser.c, mail-ops.c,
-	message-list.c: fix warnings.
-
-	* main.c (main): gtkhtmllib_init is no more. Call gconf_init
-	directly instead.
-
-	* message-list.c (message_list_select_next): New function to
-	select the first message on or after the given row that meets
-	certain flag criteria.
-
-	* mail-ops.c (real_fetch_mail): call message_list_select_next to
-	select first unread message in current folder if it changes.
-	(real_delete_msg): Remove the code to move the etable cursor. It
-	only makes sense really if you deleted the message with the
-	keyboard, so do it from etable_key.
-
-	* folder-browser.c (etable_key): call message_list_select_next to
-	select next non-deleted message after Delete.
-
-	* mail-identify.c: Add a workaround for a small gnome-vfs 0.2 bug
-	so we don't need to require CVS gnome-vfs.
-
-2000-07-06  Not Zed  <NotZed@HelixCode.com>
-
-	* message-thread.c (sort_thread): sort messages based on date for
-	the initial sort order.
-	(thread_messages_free): Implement.
-
-	* message-list.c (message_list_init_header): Setup the subject
-	renderer to a tree in tree mode.
-	(on_cursor_change_cmd): For a tree model, map the view row to the
-	data row.
-	(build_tree): Builds the tree data structure of all messages.
-	(message_list_set_search): For a tree model, build the tree here.
-	(ml_tree_icon_at): Icon callback, returns nothing.
-	(ml_tree_value_at):
-	(ml_tree_set_value_at): 
-	(ml_tree_is_cell_editable): Maps tree node to data row, and calls
-	the equivalent table callback
-	(message_list_init_renderers): Setup the tree renderer if needed.
-	(message_list_init): set the root node invisible afterall.
-	(message_list_set_search): Clear the old tree before putting in a
-	new one.
-
-	* message-list.h: Add a tree renderer to render list, and
-	tree_view indicator.
-
-	* message-thread.[ch]: Code for message threading. 
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-identify.c (mail_identify_mime_part): Oops. My gnome-vfs
-	was out-of-date. Update for changed function name.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-identify.c (mail_identify_mime_part): Use the gnomevfs
-	sniff buffer interface to try to identify the MIME type when
-	everything else fails.
-
-	* mail-display.c (on_object_requested):
-	* mail-format.c (lookup_handler, handle_undisplayable,
-	handle_audio): s/gnome_mime/gnome_vfs_mime/
-
-	* Makefile.am: Add gnomevfs stuff
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_folder): Get rid of a compiler
-	warning by making sure `folder' is always initialized to some
-	value for any code path.
-
-2000-07-03  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg): call mail_display_set_message with
-	NULL if the message we tried to select doesn't exist (probably
-	meaning we tried to selecte the first message and the folder is
-	empty.)
-
-	* mail-display.c (mail_display_set_message): deal with NULL as an
-	input (meaning "undisplay previous message and display nothing").
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (real_fetch_mail): Remove hack to redisplay the
-	inbox, since folder_changed signals will now be emitted
-	appropriately.
-
-	* component-factory.c (create_vfolder_storage): Fix
-	filter_driver_new invocation.
-
-	* Makefile.am (bin_PROGRAMS): test-mail and test-thread should be
-	noinst.
-
-	* mail-ops.c (real_fetch_mail): 
-	(vfolder_editor_clicked): 
-	* component-factory.c (create_vfolder_storage):
-	Pass mail_uri_to_folder and rules to filter_driver_new.
-
-2000-07-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser.c (mail_uri_to_folder): Fix double freeing of the
-	local exception `ex'.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (refile_msg): Only allow type "mail" in the folder
-	selection dialog.
-
-2000-07-01  Dan Winship  <danw@helixcode.com>
-
-	* pixmaps.h, pixmaps/*.xpm: Removed. These aren't being used any
-	more. (The real pixmaps are in ../art.)
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c (get_message_info):
-	(select_msg): Updated to reflect camel-folder changes.
-
-	* mail-ops.c (real_fetch_mail): Modified to reflect camel-folder
-	changes.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (print_msg): Use gnome-print to do a print preview.
-
-	* folder-browser-factory.c: Hook up "Print" button.
-
-	* message-list.c (message_list_foreach): New function, a wrapper
-	around e_table_selected_row_foreach, which calls the callback
-	function with UIDs rather than row numbers.
-
-	* folder-browser-factory.c: Remove never-used "Find" button from
-	the toolbar and replace it with "Refile". (We need a better icon
-	for this...). Hook up "Refile" to "refile_msg".
-
-	* mail-ops.c (refile_msg): Call the shell's user_select_folder
-	routine, and then use message_list_foreach and real_refile_msg to
-	do the work.
-	(delete_msg): Update to use message_list_foreach.
-
-	* folder-browser.c (mail_uri_to_folder): new function, extracted
-	from folder_browser_load_folder, to turn a URI into a folder.
-	(folder_browser_load_folder): Use it.
-
-2000-06-30  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* component-factory.c (create_news_storage, create_imap_storage):
-	Fixed to use new EvolutionShellClient proxy thingamajiggie.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (on_row_selection): use the ETable row_selection
-	signal to track how many rows are selected. Eventually we will use
-	this info to disable toolbar buttons when you have too few/too
-	many messages selected, but the current toolbar widget doesn't
-	allow that.
-
-	* message-list.h, message-list.c, mail-ops.c: Change selected_row
-	and selected_uid fields of MessageList to cursor_row and
-	cursor_uid to be more correct according to the new ETable
-	interfaces.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Eeek.  Fix typo: add missing star in the
-	declaration of `global_shell_client'.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c: Replace `global_shell_interface' with
-	`global_shell_client'.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-ops.c (delete_msg): Clean up compile warnings
-	(real_fetch_mail): Fetching from IMAP should do nothing
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-ops.c: Handle multiple deletes (change by Peter Williams.)
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser-factory.c: Changed "Send" to "Compose" to
-	avoid user confusion. Compose is a little more intuitive.
-	Also changed the pixmap to MAIL_NEW instead of MAIL_SND
-
-	* mail-ops.c (compose_msg): Renamed to avoid confusion
-
-2000-06-29  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (create_imap_storage, create_news_storage):
-	remove some code incorrectly copied and pasted from
-	create_vfolder_storage which caused vfolder creation to stop
-	working.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, mail-ops.c: Changed the name of
-	e_table_select_row to e_table_set_cursor_row.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* message-list.c (message_list_init): Set the dnd_code of the
-	ETableHeader to something so that Solaris sprintf doesn't die
-	on a NULL string.
-
-	* mail-config.c (providers_config_new): Check for a null "transport"
-	string (not all OS' handle NULL strings well *cough* Solaris)
-
-2000-06-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_generate_forward): add default subjects
-
-	* component-factory.c (create_folder): Refuse to create folders
-	not of type "mail", and correctly create an empty "mbox" folder
-	for new folders in /local.
-
-	* main.c (init_corba): Call od_assert_using_oaf() or
-	od_assert_using_goad() as appropriate to make sure people didn't
-	somehow trick the build system.
-
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* message-list.c: Added prototype for filter_date to make
-	it build cleanly
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made dates display grouping information
-	properly.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* message-list.c (mark_msg_seen): Need to return a value
-	on error.
-
-	* main.c (main): Don't start threads or enter threads if
-	there's no threading! Sigh.
-
-	* test-thread.c: Don't compile if no threads.
-
-	* session.c: Work without broken threads.
-
-	* message-list.c (filter_date): Solve the ctime_r problem the
-	correct way, with the magic of autoconf.
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Work around mismatched ctime_r functions.  This
-	will be fixed.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* mail-threads.c: Don't compile this if we don't have
-	threads enabled. This should maybe be on the Makefile.am
-	level.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* component-factory.c (owner_set_cb): Put in a gross hack to
-	export the shell reference elsewhere.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added a value_to_string handler.
-
-2000-06-26  Peter Williams  <peterw@helixcode.com>
-
-	* component-factory.c, mail-ops.c: #ifdef the threads stuff so
-	that if USE_BROKEN_THREADS is not defined we just call the functions
-	in the main thread.
-
-	* mail-threads.h: Don't declare funcs if USE_BROKEN_THREADS not
-	defined.
-
-	* mail-threads.c: Put the query and message boxes on top so that
-	you can see them.
-
-2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (error_dialog): va_start() returns void, don't
-	assign it's retval to a variable.
-
-2000-06-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Call `GDK_THREADS_ENTER()' and
-	`GDK_THREADS_LEAVE()' around the main loop as in the examples from
-	the GTK+ FAQ.
-
-	* mail-threads.c (DEBUG): New macro for debugging.
-	(read_msg): Use it.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am: Clean up the various _LIBS and _CFLAGS
-	to work with simpler THREADS_LIBS and THREADS_CFLAGS scheme.
-
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Improved the
-	code to separate the imap namespace from the folder name.
-
-2000-06-23  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* component-factory.c: Include e-util/e-setup.h for the
-	prototype of evolution_dir; prototype create_news_storage.
-	(real_create_imap_storage, real_create_news_storage): New
-	functions moving the camel stuff into the async callback.
-	(create_imap_storage, create_news_storage): Chopped in
-	half to move camel stuff as above.
-
-	* mail-ops.c: Include "mail-threads.h" for threading protos.
-	(real_fetch_mail, real_send_mail, real_expunge_folder): 
-	New functions moving the camel stuff into the async callback.
-	(async_mail_exception_dialog): A version of mail_exception_dialog
-	to be called from the async handlers (just calls mail_op_error())
-	(fetch_mail, expunge_folder, composer_send_cb): Cut in half to
-	move camel stuff as above.
-	(cleanup_send_mail): Clean up after the async real_send_mail
-	with the gtk_object_destroys et al.
-
-	* mail-threads.c: Instead of hiding the progress bar, make it
-	zip back and forth constantly.
-	(progress_timeout): New func. Timeout called to make the pbar
-	shimmy.
-	(timeout_toggle): New func. Turn on and off the shimmy effect.
-	(check_cond): New func. Make sure that the GCond for modal
-	operation is initialized before mail_op_{error,get_password}.
-	(show_error_clicked, read_msg, get_password_clicked): Move
-	over to timeout_toggle.
-	(mail_op_error,mail_op_get_password): Add check_cond() call.
-
-	* main.c: (main) Call g_thread_init.
-
-	* session.c: Change auth_callback stuff over to assume that it's
-	being called async. Note: no real good way to tell if this is
-	the case or not.
-	(request_callback): ifdef'ed out
-	(evolution_auth_callback): Use mail_op_get_password.
-	
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Now should
-	correctly get the selected folder from the given URL.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): add handling for
-	loading "news:" folders.
-
-	* component-factory.c (create_news_storage): add a root for news
-	source.
-	(owner_set_cb): call create_news_storage.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Updated to
-	prepend url-> path if it exists for that imap store.
-
-	* component-factory.c (create_imap_storage): Modified to not
-	prepend a hard-coded namespace.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* mail-ops.c (fetch_mail_cleanup): new function, passed as arg to
-	mail_operation_try.
-	(fetch_mail): add cleanup func arg.
-
-2000-06-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed ml_value_at to return "" instead of NULL
-	in some cases.
-
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-	* Makefile.am: Add GNOME_EXTRA_LIBS so that we get libgthread
-	in our LIBS for evolution-mail.
-	
-	* mail-threads.c: Make the dialog boxes for error and
-	question non-modal. They're modal relative to the dispatch
-	thread, but before they would also eg lock up the toolbar
-	buttons (while the menus, managed by another process, were
-	active -- a weird effect).
-	
-2000-06-22  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* mail-threads.[ch]: Extra argument to mail_operation_try:
-	'cleanup', a function to be called in the main thread after
-	the dispatcher thread exits. gtk_object_destroy's et al may
-	attempt to unmap windows so we can't do them in the dispatcher
-	thread :-(
-
-	* test-thread.c: Updated with demo of new argument working.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* test-thread.c (op_5): New tests for the get_password
-	hook.
-
-	* mail-threads.[ch]: New hook, mail_op_get_password, for
-	getting a user response from an async operation. The operation
-	blocks while waiting for the response. A big whole mutex 
-	condition threading blocking dealie to make sure that it 
-	works.
-
-	Also the error hook creates a dialog again, which also needs
-	to block its caller while we wait for the user to press ok.
-
-2000-06-22  Peter Williams  <peterw@helixcode.com>
-
-	* mail-threads.c (various functions): Prettify the UI
-	so that the progress bar doesn't become all huge 'n stuff.
-	(mail_operation_try): Now save the operation's description,
-	so that we can display it later as the default message.
-	(read_msg): When the operation starts set the label to its
-	UI-friendly name.
-	(dispatch_func): Free the saved prettyname.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Removed an erroneous comment.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (create_transport_page): Make this not crash if
-	you don't have a transport configured.
-	
-	* message-list.c: Update received date to work like sent date.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-thread.{c,h}: New files -- a simple API for executing
-	the major mail ops (fetch_mail etc) asynchronously, allowing
-	the operations to send messages and update a progress bar.
-
-	* test-thread.{c,h}: Tests the mail-thread API.
-
-	* Makefile.am: add mail-thread.[ch] to evolution_mail_SOURCES
-	and declare the test_thread noinst_PROGRAM.
-
-2000-06-21  Peter Williams  <peterw@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Include "e-setup.h" to
-	get the prototype for evolution_dir.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Oops. Should
-	have checked for a NULL sources.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (mark_msg_seen): Quick hack to prevent a NULL
-	pointer dereference. Things need to be cleaned up a bit more here
-	though.
-
-	* mail-sources.c: Oops. This should have been removed a long time
-	ago.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Working on getting 
-	this to work :)
-
-	* component-factory.c (create_imap_storage): Should now correctly
-	construct the folder path allowing the selection of a folder.
-
-2000-06-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-format.c (mail_generate_reply): Declare `evolution_dir'.
-	Ugly, ugly, ugly, but I am not sure where it should go instead.
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* mail-ops.c (ask_confirm_for_empty_subject): New function to ask
-	confirmation for an empty subject line.
-	(composer_send_cb): Use it if the subject is empty and only send
-	the message if the user confirms.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* component-factory.c (create_imap_storage): Now creates the IMAP
-	storage (listing subfolders and such)
-
-2000-06-19  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (find_preferred_alternative): add an option to
-	prefer text/plain.
-	(reply_body): add an option to prefer text/plain
-	(mail_generate_reply): Check the mail sending preferences, and
-	generate a text/plain reply if the user prefers to send plain text
-	(and we have a text/plain part to generate a reply from).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Should now correctly display
-	the Transport page (made it set the optionmenu correctly, before it
-	would only set SMTP).
-	(create_transport_page): Updated to set the page info to sendmail/smtp
-	based on the url.
-	(create_service_page): Had to add some code to set data on some objects
-	so I could grab the objects I needed to modify in the above function.
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): started to add
-	code to load an IMAP folder.
-	
-	* component-factory.c: Started to add a create_imap_storage 
-	method so that we can eventually have our IMAP store displayed 
-	in the tree view.
-	(create_vfolder_storage): Renamed from
-	create_test_storage().
-	(owner_set_cb): Updated.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Prevent double-freeing
-	action on summary_table and uid_rowmap.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (ml_set_value_at): Implement clicking on the
-	envelope icon to set read/unread. Based on a patch by clahey.
-	(select_msg): keep the timeout id for the "seen" flagging in the
-	message_list structure, so ml_set_value_at can clear it so it
-	doesn't re-mark a message seen after you click it unseen.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (get_message_row): new function to do a uid to
-	row mapping.
-	(mark_msg_seen, select_msg, message_changed,
-	message_list_set_folder): Update for Camel flag changes.
-	(on_cursor_change_cmd): Rename "row_to_select" to "selected_row",
-	and keep a "selected_uid" as well.
-
-	* mail-ops.c (composer_send_cb): Update for Camel flag changes,
-	and fix some memory-handling bugs. (Free the post_send_data when
-	the composer is destroyed, not when the user clicks "send", which
-	could happen never, or more than once.)
-	(delete_msg): Update for Camel flag changes, and fix the "holding
-	down the delete key skips some messages" bug.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* component-factory.c (owner_unset_cb): 
-	* message-list.c (message_list_set_folder): Update for CamelFolder
-	changes.
-
-	* folder-browser.c (folder_browser_clear_search): New function to
-	revert back to non-searching mode.
-
-	* mail-ops.c (fetch_mail): Use folder_browser_clear_search.
-
-	* mail-display.c (on_url_requested): if the document requests an
-	unknown URL, it's not an error; just ignore the URL.
-
-	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.
-
-2000-06-14  Radek Doulik  <rodo@helixcode.com>
-
-	* main.c (main): call gtkhtmllib_init here
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_SourceConfigDialogButton_clicked): Make sure source
-	is always pointing to something, so a blank is not written to the config file
-	on close.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (SHELL_OBJS): Removed.
-	(evolution_mail_LDADD): Use `libeshell.a'.  Also use
-	`top_builddir' consistently.
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Got rid of sources_max_row and identities_max_row
-	as they are not really needed (just use clist->rows)
-	(on_cmdSourcesEdit_clicked): Modified to make 'source'
-	point to the data being edited.
-	(on_cmdSourcesAdd_clicked): Adds a new clist item and selects it so the
-	editor knows where to stick the data when it's done.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* message-list.c: Removed the ETableModel thaw handler.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_set_uri): Return the result of
-	folder_browser_load_folder.
-	(get_prop, set_prop, folder_browser_properties_init): Remove. No
-	longer needed.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Add a "uri" argument, return NULL if setting it fails.
-	(folder_browser_factory_new_control): Remove property bag stuff.
-	(folder_browser_factory_init, folder_browser_factory): Remove
-	this, since we're using the component factory now.
-
-	* component-factory.c (create_view): Update for
-	folder_browser_factory_new_control change and return NOTFOUND as
-	appropriate.
-
-	* main.c (main): Don't call folder_browser_factory_init.
-
-	* mail-format.c (mail_generate_reply): Fix the subject generation
-	so we don't get "Re:  Re:". This is working around something that
-	may later be declared a misfeature in Camel.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_folder): New stub implementation for
-	the folder creation function in the EvolutionShellComponent we
-	expose [it simply returns success all the time].
-	(factory_fn): Pass this function to `evolution_shell_component_new'.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): Add a serial number to
-	FolderBrowser.
-
-	* folder-browser-factory.c (control_activate, control_deactivate):
-	Include fb serial number in the name of the Bonobo toolbar to
-	prevent problems with disappearing toolbars. This is a kludge and
-	should go away.
-
-
-	* mail-ops.c (expunge_folder): display error from
-	camel_folder_expunge if there is one.
-
-	* message-list.c (select_row): install an idle function to
-	select the row rather than doing it directly. Ugh. What a
-	kludge, but at least it works now.
-
-	* session.c (evolution_auth_callback): Update for
-	CamelAuthCallback changes. (Uncache passwords when asked to.)
-
-	* mail-ops.c (fetch_mail): close and expunge the source folder
-	after copying it to a local folder.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component-factory.c (create_view): Updated to match the changes
-	to the definition of `EvolutionShellComponentCreateFn'.  If @type
-	is not "mail", return an "unsupported type" error.
-	(factory_fn): Pass NULL for the `remove_folder' and
-	`create_folder' functions.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo things a bit so that whitespace-only
-	text parts aren't displayed. (In particular, so that
-	whitespace-only subparts of multipart/mixed aren't displayed as
-	separate (empty) parts.)
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): 
-	* folder-browser.c (folder_browser_load_folder): Update for folder
-	creation/existence changes.
-
-	* message-list.c (message_list_set_folder): Remove the code to
-	create the folder if it doesn't exist, since we don't want to do
-	that.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): Leave the composer window around
-	if the message doesn't get sent.
-
-2000-06-05  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (etable_key): Allow "GDK_KP_Delete", a keypad
-	delete key, to delete a message.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* session.c (evolution_auth_callback): Remember passwords between
-	calls.
-	(forget_passwords): Callback for "Forget Passwords" menu item.
-
-	* folder-browser-factory.c (control_activate): 
-	(control_deactivate): Add "Forget Passwords" menu item.
-
-	* mail.h, mail-ops.c: fix some function prototypes
-
-	* folder-browser.c (etable_key): Add "Delete" = delete message.
-
-	* mail-format.c (mail_generate_forward): Update for new composer
-	attachment interface.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (providers_config_new): Added a new notebook
-	page that allowed for mail format (text/plain or 
-	multipart/alternative)
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (filter_date): If the date in the summary is 0,
-	output "?".
-
-	* component-factory.c (create_view): keep a GList of folder
-	browsers created
-	(owner_unset_cb): Go through the list and close each folder before
-	exiting so they sync their summary state, etc to disk.
-
-	* mail-ops.c (fetch_mail): Use camel_service_connect, not
-	connect_with_url, since we already passed the URL into
-	camel_session_get_store.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use camel_folder_free_summary instead of
-	g_ptr_array_free.  Unref the folder when we're done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Revert removal of e_setup_base_dir.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (my_folder_browser_init): Connect to ETable's
-	key_press signal.
-	(etable_key): scroll mail on space/backspace.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Made sent column as wide as from column.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c (on_cmdSourcesAdd_clicked): Changed identity_row
-	to source_row as this is a Sources clist we are dealing with and
-	not an identity clist
-	(on_cmdSourcesEdit_clicked): same
-	(on_cmdSourcesDelete_clicked): again, same
-	(on_cmdSourcesEdit_clicked): Source editor now fills in data from
-	the clist
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c: Add a date column.	
-	(COL_SENT_WIDTH_MIN): Make this wider.
-	(ml_value_at): return the sent date (as a time_t) for COL_SENT.
-	(Fix COL_TO too while I'm here.) 
-	(ml_duplicate_value, ml_free_value, ml_initialize_value,
-	ml_value_is_empty): COL_SENT is numeric now.
-	(message_list_init_renderers): Create a date renderer (using
-	text_filter to translate the time_t into a string).
-	(message_list_init_header): Use render_date for COL_SENT.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* session.c: Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_generate_forward): Fix forwarding to work
-	for people other than me. :) [Although apparently it doesn't
-	really.]
-
-	* mail-ops.c (delete_msg): Add a quick hack to move the selection
-	down a row when you delete a message.
-
-	* mail-format.c (handle_message_rfc822): use <blockquote> rather
-	than <center><table border=1 width=95%> to frame the embedded
-	message. If <pre> text in the subtable won't fit in the 95% width,
-	GtkHTML will write past the border of the table (and
-	<blockquote><table border=1> causes creeping updates so it's not
-	usable for now).
-	
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c (message_list_init): Turn off the grid in our
-	ETable.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_headers): Oops. This needs to take a
-	message argument because we might be writing headers for an
-	embedded message/rfc822 subpart rather than the root document.
-
-2000-06-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Config dialogs are completed.
-	(service_acceptable): Fixed a segfault caused by duplicate 
-	camel_exception_free()
-	(providers_config_new): Identity and Source clists are now filled in
-	when the dialog is created as well as the Transport page
-
-	* folder-browser-factory.c: Renamed Tool/ menu items
-	Vfolder was changed to Virtual Folder and
-	Configure Camel Providers was changed to Mail Configuration
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`libemiscwidgets.a'.
-
-	* mail-display.c (mail_display_new): Use an EScrollFrame instead
-	of a GtkScrolledWindow.
-	(mail_display_set_message): Likewise.
-
-	* mail-display.h: Replace the GtkScrolledWindow with an
-	EScrollFrame.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* component-factory.c (owner_unset_cb): Quit when the shell exits.
-	This is a kludge, but a pretty necessary one until the refcounting
-	bugs that keep the component from exiting properly are fixed.
-
-2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Partially implemented the source
-	configuration, seems to segfault due to a destroyed
-	gnome dialog being destroyed again in the method
-	on_SourceConfigDialogButton_clicked()
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (free_url, handle_text_enriched,
-	get_url_for_icon): Fix up memory management of x-evolution-data
-	URLs so the URLs and/or their data don't get freed while there are
-	still references to them.
-
-	* message-list.c (message_list_init_header): redo the (unused)
-	online status column to no longer refer to pixmaps that no longer
-	exist.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.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-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail-config.c: Configuration dialog now allows 
-	adding/editing/deleting of Identities (which leaves
-	adding/editing/deleting of sources left to implement).
-	The data is also saved when the dialog is exited via 
-	the OK button.
-
-2000-05-31  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (mail_format_mime_message): Initialize the "urls"
-	hash table stored on the message and store cid and other URLs
-	there rather than as object data on the message.
-	(get_cid): rewrite this a bunch
-	(handle_text_enriched): move the code from write_iframe_string()
-	into here, since it's the only place that actually needs it.
-	(handle_text_html): simplify this a lot. We can use a cid: URL
-	here rather than x-evolution-data.
-	(get_url_for_icon): New routine to return URLs for icons, and
-	cache the results, so we don't have to keep re-reading the icon
-	files (and so we can't be spoofed into reading non-icon files).
-	(handle_mystery, handle_audio): use get_url_for_icon.
-
-	* mail-display.c (save_data): move the CamelMimePart filename
-	extracting code from get_cid to here.
-	(on_link_clicked, on_object_requested): Update for cid: changes.
-	(on_url_requested): Kill off the kludgy, exploitable x-gnome-icon
-	URL schema, update cid and x-evolution-data to match
-	mail-format.c.
-
-	It should now be easier to implement RFC 2557 (Content-Location,
-	etc), but that RFC still pretty much sucks.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Redo this back to the old way: a single GtkHTML
-	with various things inline in it. (Gets rid of flicker, simplifies
-	some scrolling, selecting, and printing issues.)
-	(handle_text_enriched, handle_text_html): Use <iframe>s for these,
-	to protect the rest of the document from their possibily invalid
-	HTML.
-	(handle_via_bonobo): Use (new-and-improved) <object> tags for
-	this, moving most of the work back into mail-display.c
-
-	* mail-display.c (on_object_requested): Move the Bonobo embedding
-	code back here again (reorganized a bit).
-	(on_url_requested): add x-evolution-data handler, for iframe
-	bodies.
-	(mail_html_new, mail_html_end): removed
-	(mail_display_set_message, mail_display_new): Update for NWO.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (search_set): Properly encode the search string.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config_new() which
-	is the constructor for the configuration dialog window
-
-	* mail-config.c: Added set_service_url() which is basically
-	the reverse of get_service_url().
-	Implemented on_cmdCamelServicesOK_clicked() - The configuration
-	window will now remember the Sendmail/SMTP data that the user
-	had entered in the previous session.
-	Removed on_cmdCamelServicesApply_clicked() - No need for this.
-
-2000-05-30  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_changed): call
-	e_table_model_row_changed, not e_table_model_changed so we do less
-	work, and don't lose the current selection.
-	(select_msg): Set up a timer to mark the displayed message as
-	"seen" if it's selected for longer than 1.5 seconds (a number
-	pulled out of Matt's butt).
-	(ml_value_at): Use the MESSAGE_STATUS column for read/unread as
-	well as deleted.
-
-	* message-list.c: use the "new" tigert pixmaps rather than the
-	older ones. Includes a "replied to" icon (which is used now), but
-	no "deleted" icon (although we have the strikeout renderer for
-	that now).
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added bold for unread messages.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* mail.h: Added a prototype for providers_config()
-	which is the callback for a new menu item that
-	will construct a configuration dialog for the camel
-	providers and identities and display it
-
-	* mail-config.c: Added some code to construct the 
-	new providers dialog and a bunch of callbacks (most 
-	of which are not yet useful)
-
-	* mail-ops.c: Added the code for the providers_confi()
-	callback
-
-	* folder-browser-factory.c: Added the 
-	"Tools/Camel Providers Configuration ..." menu item
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Switched to using "cursor_change" signal instead
-	of "row_selection" for switching messages.  Select the first row
-	(still doesn't work because of ETable.)  Adapt to some small
-	ETable changes.  Set drawfocus to FALSE.
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_load_folder): Hardcode the
-	vfolder source to just the inbox (so at least it returns
-	something).
-
-	* component-factory.c (create_test_storage): Create a vfolder dir
-	first, and put the folders in that.
-	(create_test_storage): Create the storage as VFolders, not
-	"storage_name" :)
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c (error_dialog): helper function since we need to
-	set "modal" on the dialogs returned by gnome_error_dialog to make
-	them work when popped up from the modal Druid.
-	(service_acceptable): New function to check if the info entered on
-	a store/transport page actually checks out.
-	(mail_config_druid): Connect to the "next" signal on the store and
-	transport pages and don't let the user continue if the data is
-	bad and "check this before continuing" is checked. Also, only
-	display sources/transports in the "mail" domain. (Ie, not
-	"vfolder".)
-
-	* mail-format.c (write_recipients_to_stream): Use `foo@bar' rather
-	than `<foo@bar>' for recipient with no name.
-
-	* mail-ops.c (fetch_mail): don't put up an error message if the
-	user cancels the password dialog.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* Makefile.am (SHELL_OBJS): Include mail storage so we can
-	initialise folders.
-
-	* component-factory.c (create_test_storage): Parses vfolder
-	defintions and adds them to the storage.  Definetly needs more
-	work.
-
-	* folder-browser-factory.c (control_activate): Add the VFolder
-	druid menu item.
-	(control_deactivate): And remove it.
-
-	* mail-ops.c (vfolder_editor_clicked): For editing vfolder
-	definitions (rather like filters, oddly enough :).  Tries to
-	update the shell but it doesn't seem to work properly - requires a
-	mail component restart to take effect.
-
-	* folder-browser.c (folder_browser_load_folder): Handle vfolder:
-	urls' appropriately and map to camel.  Still needs a way to tell
-	the vfolder what folders to search! (all vfolders come up empty!).
-
-2000-05-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c, message-list.h: Added a COL_DELETED and made it
-	the strikeout column for both text renderers.
-
-2000-05-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Various improvements:
-
-	(call_handler_function, etc): Add a "mime_type" argument to the
-	handlers, so that if a part is tagged as
-	"application/octet-stream", and we figure out that it's really
-	something else, the handler we call can know what that something
-	else is.
-
-	(handle_text_enriched): Small fixes to make this not do
-	text/enriched-specific syntax in text/richtext or vice versa.
-
-	(handle_mystery): Allow for mystery data that can't even be saved
-	to disk. (ie, unrecognized external-body). Let the caller specify
-	the URL to use.
-
-	(handle_message_external_body): New function to deal with
-	message/external-body parts. Generates URLs for anon-ftp,
-	local-file, and URL access-types, and a more-useful-than-before
-	descriptive message for other types.
-
-	(handle_audio, handle_undisplayable): Use gnome_mime_get_value to
-	try to get a description of the MIME type to display to the user
-	rather than the raw form. (This will only work if the user has
-	recent gnome-vfs installed. [If they don't, it works just like
-	it used to.])
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (handle_text_html): Fix a bug (security/stability)
-	in its usage of mail_html_write.
-
-	* mail-ops.c (composer_send_cb, reply): set CAMEL_MESSAGE_ANSWERED
-	on a message after a successful reply.
-
-	* message-list.c (folder_changed): free the summary with
-	camel_folder_free_summary rather than g_ptr_array_free.
-
-	* mail-format.c (handle_via_bonobo): Update for PersistStream
-	changes
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Initialize the component factory.
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* evolution-mail.oafinfo: Updated with the
-	Evolution::ShellComponent OAFIID.
-
-	* evolution-mail.gnorba: Updated with the
-	Evolution::ShellComponent GOAD ID.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	New function; code moved out from `folder_browser_factory'.
-	(folder_browser_factory): Use it.
-
-	* component-factory.c: New.
-	* component-factory.h: New.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (composer_send_cb): connect to and disconnect from
-	the transport.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libepaned.a.
-	
-	* folder-browser.c: Switched from GtkPaned to EPaned.
-
-2000-05-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Don't link to `evolution-service-repository.o'
-	anymore.
-
-	* folder-browser-factory.c: Don't use crufty service-repository
-	anymore.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* message-list.c (get_message_info): Made static.
-	(ml_initialize_value): Return NULL to placate compiler.
-
-	* folder-browser.c (folder_browser_gui_init): Add cast.
-
-	* mail-display.c (mail_html_new): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-config.c (put_html): Don't pass an empty URL to
-	`gtk_html_begin()' anymore.
-
-	* mail-display.h: Updated for the new GtkHTML API that uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* mail-display.c: Likewise.
-	* mail-config.c: Likewise.
-	* mail-format.c: Likewise.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* mail-format.c: Fixes for stream stuff.
-
-	* mail-display.c (save_data_cb): Remove exception stuff on streams.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added initialize_value and value_is_empty
-	callbacks.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Remove
-	development_warning (moved to shell)
-
-	* message-list.c (select_msg): Update for camel_folder_get_uids
-	(folder_changed, message_list_set_folder): Update for
-	camel_folder_get_summary
-
-	* mail-ops.c (fetch_mail): Update for camel_folder_get_uids
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* mail-component.c: This seems to be cruft. Nuke it.
-
-	* mail-display.c (save_data_cb, save_data, on_url_requested):
-	* mail-format.c (handle_text_plain_flowed, handle_text_html):
-	Use camel_data_wrapper_write_to_stream rather than
-	camel_data_wrapper_get_output_stream.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (filter_edit): Function to bring up the filter editor.
-	(filter_druid_clicked): Save/close dialogue.
-	(fetch_mail): Apply filters to incoming mail ... *hold breath*
-	If we are coming from a non-indexed/searchable/etc source, then
-	copy it to an mbox first.  When copying mail from an mbox source,
-	dont remove it aftewards, open it for append, so partially
-	filtered mail isn't lost.
-
-	* Makefile.am (evolution_mail_LDADD): Added libfilter.
-	(INCLUDES): Add EVOLUTION_DATADIR, and fix matt's brokeneditor(tm)
-	for putting spaces instead of tabs in.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* mail-format.c: Removed usage of bonobo_object_destroy.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Updated to work with new ETable resizing.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* mail-ops.c (fetch_mail): Use 6 X's to mkstemp, as required by
-	the man page, just a temp fix, this should probably change to a
-	known filename.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Now that we depend
-	on current gnome-libs we can make the toolbar detachable again.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Left-justify the
-	message.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Made this dialog
-	have fewer buttons.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): New development
-	warning text from Nat.
-
-2000-05-10  Larry Ewing  <lewing@helixcode.com>
-
-	* mail-config.c (html_new): only set the default background color
-	if style is not NULL.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed folder-browser-factory.h since it doesn't
-	exist.  Added mail-display.h, mail-types.h, pixmaps.h.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): Remove "File->mail"
-	menuitem.
-
-	* mail-config.c (mail_config_druid): Fill in "blah blah blah".
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser.c (folder_browser_load_folder): make this a
-	little less kludgy. Use gnome_error_dialog rather than printf on
-	errors.
-
-	* mail-ops.c (fetch_mail): Fix to work with the new shell stuff...
-	sorta. Will need more fixing later when the new shell framework is
-	more done.
-
-	* mail-config.c (finish): Call gnome_config_sync so the data
-	actually gets written.
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (save_data_cb):
-	(on_url_requested): Update for CamelStream CamelException changes.
-
-	* mail-format.c: Pass NULL for a CamelException in a bunch of
-	places... the user will see that the data is not being displayed,
-	and there's not a lot we can do, and none of these things should
-	be failing anyway. Maybe fix this later.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (ml_value_at): Size moved to message info, rather
-	than content info structure.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg): unref the message after displaying
-	it.
-
-	* mail-format.c (get_data_wrapper_text):
-	(handle_text_plain_flowed): 
-	(handle_via_bonobo): Replace camel_stream_close calls.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser-factory.c: Changed a toolbar button from saying
-	"New mail" (which suggests you might be composing new mail) to
-	"Get mail".
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory): Don't
-	hardcode "inbox" here.
-
-	* folder-browser.c (folder_browser_set_uri): Don't hardcode
-	"inbox" here either.
-	(folder_browser_load_folder): Create a new store according to the
-	folder browser's URI, and load the mbox file from that store.
-	Parts of this are temporary.
-
-	* session.c, mail.h: There is no longer a global store, just a
-	global session.
-
-	* mail-config.c, mail-ops.c: Update for default_session -> session
-	change. fetch_mail is currently broken.
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail-config.c: New code to configure identity, mail source, and
-	mail transport.
-	(mail_config_druid): A druid using the config widgets. (Only
-	allows configuration of a single identity, source, and transport.)
-
-	* mail-ops.c (check_configured): New function to make sure the
-	user has configured stuff, and call the	druid if not.
-	(fetch_mail, send_msg, send_to_url, reply, forward_msg): Call
-	check_configured
-	(composer_send_cb): Make this pass the message to a CamelTransport
-	rather than just printing it to stdout.
-
-	* folder-browser-factory.c (development_warning): Add a warning
-	about sending mail, since you can do that now.
-
-2000-05-06  Chris Toshok  <toshok@HelixCode.com>
-
-	* .cvsignore: ignore evolution-mail.pure
-
-	* Makefile.am: add support for building evolution-mail.pure
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* mail.h: consolidate mail-format.h, mail-identify.h, mail-ops.h,
-	main.h and session.h into this new file. There's no reason to have
-	a .h for every .c.
-
-2000-05-05  Anders Carlsson  <andersca@gnu.org>
-
-	* test-mail.c (create_container): Use the OAFIID when using an 
-	OAF-enabled build of bonobo.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* message-list.c (message_list_set_folder): Get the whole message
-	summary right away.
-	(folder_changed): And if we change too.
-	(ml_row_count): Use the match count or summary table length as the
-	row count.
-	(get_message_info): Use array references to lookup message summary
-	info.  For the search result list, use the summary_search_cache to
-	cache the info lookup.
-	(message_list_init): Allocate the summary search cache.
-	(message_list_destroy): Free the summary search cache and the
-	summary table, if there is one to free.
-	(message_list_set_search): Save the match count, and clear the
-	summary search cache for reuse.
-	(folder_changed): Re-retrieve the summary list if the folder has
-	changed.
-	(message_list_set_folder): Retrieve the summary list when opening
-	the folder.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (evolution_mail_LDADD): s/-lunicode/$(UNICODE_LIBS)/
-	in the LDADD section.
-
-2000-05-03  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers): Make
-	the "Cc:" field optional again. (Before, we could check if
-	camel_mime_message_get_recipients returned NULL, but now we need
-	to actually look into the returned CamelInternetAddress object.)
-
-2000-05-03  Larry Ewing  <lewing@helixcode.com>
-
-	* folder-browser.c (folder_browser_gui_init): comment out the
-	changed signal for now.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* message-list.c (message_list_set_search): only free search if it
-	is not NULL.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* folder-browser.c (folder_browser_gui_init): Connect the changed
-	signal to search, so it searched immediately?
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* pixmaps.h: Added envelope-deleted state.
-
-	* folder-browser-factory.c: Setup callback for actual delete op.
-	(control_activate): Setup a tool menu item to expnge deleted
-	messages.
-
-	* mail-ops.c (delete_msg): Toggle the delete flag on a message.
-	(expunge_folder): New function to expunge deleted messages from
-	the current folder.
-
-	* folder-browser.c (folder_browser_gui_init): A hackish little
-	quick-search entry.
-	(search_activate): Perform a quick-search on the folder subject
-	only.
-	(folder_browser_gui_init): Add an option meny to the search line.	
-	(create_option_menu): Build the option menu from a table.
-	(search_set): Build a search from another string whent he option
-	menu or text item is changed.  5 search options are defined so
-	far.
-
-	* message-list.c (get_message_info): If there is an active search,
-	then get the data from that ... use this instead of
-	_get_message_info().
-	(ml_row_count): If we have an active search, get the info from its
-	result.
-	(select_msg): Changed to use get_message_info, so searches work.
-	(ml_value_at): And same here.
-	(message_list_init_renderers): Added a 3rd state to message_status
-	= deleted.
-	(ml_value_at): Show the message state as deleted, if it is marked
-	for deletion.
-	(folder_changed): When the folder changes, update the display.
-	(message_list_set_folder): Connect to the folder_changed event
-	here.
-	(message_changed): Callback to update the display when the message
-	changes.
-	(select_msg): And connect to the message_changed signal so we know
-	when it cahgnes.
-	(message_list_set_search): Save the search string.
-	(folder_changed): If the folder changes, re-run the search,
-	otherwise we may end up with invalid entries in the display.
-
-	* mail-display.c: Include missing errno.h.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_providers_init): This is no longer necessary.
-
-	* mail-ops.c (fetch_mail): Remove kludge to load remote provider,
-	as camel can do it by itself now.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_link_clicked): Handle clicks on "cid" URLs by
-	popping up a "Save Attachment" dialog.
-
-	* mail-format.c (get_cid): if the part has a Content-Disposition
-	with a filename specified, record (a sanitized version of) that on
-	the wrapper when creating the cid reference, so the "save
-	attachment" code can use it later.
-	(handle_mystery): fix a bug in the cid generation here.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (lookup_handler, etc): Improve the builtin vs
-	bonobo selection code.
-	(handle_mystery): Include name and Content-Description in the
-	"mystery data" info, when available
-	(handle_unknown_type): Call mail_identify_mime_part before
-	giving up.
-	(handle_undisplayable): Split out of handle_unknown_type now
-	that handle_unknown_type can try alternate viewers.
-	(handle_via_bonobo): Fall back to handle_undisplayable if the
-	bonobo control fails.
-
-	* mail-identify.c (mail_identify_mime_part): New function to
-	attempt to identify a MIME part that we can't identify based on
-	Content-Type alone.
-
-	* mail-display.c (on_url_requested): redo the mystery data icon
-	display stuff less kludgily.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (write_recipients_to_stream, write_headers,
-	mail_generate_reply): Update (minimally) for Camel recipient
-	changes.
-
-2000-04-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (init_bonobo): Don't call `init_corba()' and don't get
-	any args.
-	(init_corba) [!USING_OAF]: Fix args.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* folder-browser-factory.c: New macro `CONTROL_FACTORY_ID', which
-	is #defined to a different value according to whether we are
-	`USING_OAF' or not.
-	(folder_browser_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* test-mail.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Use `init_corba()'.
-
-	* main.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(init_bonobo): Use `init_corba()'.
-
-	* Makefile.am: Install OAF stuff if `USING_OAF'.  Add
-	`-I$(datadir)/idl' to the `orbit-idl' command-line so that we can
-	use Bonobo IDL files installed under our prefix as well.  Also,
-	use `$(ORBIT_IDL)' instead of hardcoded `orbit-idl'.
-
-	* evolution-mail.oafinfo: New file.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c: Move text_to_html to e-util.
-
-	* mail-ops.c (send_to_url): New routine. Thin wrapper for
-	e_msg_composer_new_from_url.
-
-	* mail-display.c (on_link_clicked): print a warning for news or
-	nntp URLs (which we'll deal with some day), and call send_to_url
-	for mailto URLs.
-
-	* mail-format.c (text_to_html): Improve URL conversion code.
-	Recognize https, recognize "www\..*" without a prefixed "http://".
-	Properly escape &, <, >, etc in URL strings. Don't be fooled by
-	"mailto:", "http://", etc with no following data.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.c (text_to_html): Reorganize a bit and add a new
-	flag, TEXT_TO_HTML_CONVERT_URLS to recognize and wrap URLs
-	in text.
-
-	* mail-display.c (mail_html_new): Add link_clicked signal handler.
-	(on_link_clicked): Use gnome_url_show to launch a browser.
-
-	* mail-format.c: update for CamelStream changes. Update for
-	CamelMimeBodyPart -> CamelMimePart
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c, mail-format.c: Redo large chunks of this. The
-	mail display now consists of a vbox in a scrolled window, in which
-	we put multiple GtkHTML objects. This means broken HTML in one
-	part can't corrupt other parts. The headers now scroll with the
-	body. Unrecognized attachments look prettier, but still don't do
-	anything, and will probably be changed later. We can also now
-	display nested message/rfc822 parts and multipart/alternatives
-	with multipart subparts. Oh, and text/{richtext,enriched}, since
-	we had all these ancient sample messages that use it and the lack
-	of support annoyed me. :)
-
-	Bonobo embeddables are broken right now, but I don't think that's
-	my fault.
-
-	* mail-format.c (reply_body): Fix some bugs that crept into reply
-	generation. This needs a lot more work to deal correctly with
-	complicated bodies.
-	(setup_function_table): pass unknown text subtypes to
-	handle_text_plain.
-	(handle_multipart_appledouble): new handler. Just ignores the
-	first (application/applefile) part and tries to display the
-	second part. Since the second part is usually
-	application/octet-stream, this doesn't work very well still
-	usually.
-	(reply_body): Make this deal better with multiparts.
-
-	* mail-format.c, mail-display.c: Now that we're not limited to
-	a single GtkHTML for the display, there's no reason to embed
-	Bonobo objects for unrecognized content-types in GtkHTML rather
-	than embedded them into the vbox directly. So do that.
-
-	Meanwhile, fix up the handler-selection code so that we can
-	declare which built-in handlers are more desirable than external
-	handlers and which are less. (Of course, eventually we'll want
-	this to be customizable.) Add some cleverness to
-	handle_multipart_alternative as well so it doesn't accept an
-	alternative which we can display generically over one we can
-	display specifically.
-
-	* mail-format.c (text_to_html): add a convert_space_hack flag,
-	which turns N spaces into N-1 &nbsp;s and a space.
-	(handle_text_plain): Check for "format=flowed" in the
-	Content-Type.
-	(handle_text_plain_flowed): Spinoff of handle_text_plain to deal
-	with RFC 2646 flowed text. (All the examples I can find of it
-	are generated by Eudora, but it's a pretty cool idea that ought
-	to be used more widely.)
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c: rename "send" to "send_msg", to avoid
-	name clash with the tcp function. Connect the "forward" button.
-
-	* mail-ops.c: rename "send" to "send_msg", to avoid name clash
-	with the tcp function. Add forward_msg function.
-
-	* mail-format.c (mail_generate_forward): support function for
-	forward_msg. Pretty much a big kludge right now, pending the
-	attachment/attachment-bar changes.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): Change cid expectations to
-	match current camel reality.
-
-	* main.c (main): call glade_gnome_init, for composer.
-
-	* folder-browser-factory.c: move msg_composer_cb and
-	msg_composer_send_cb to mail-ops. Attach send, reply, and "reply
-	to all" buttons.
-
-	* mail-ops.c (composer_send_cb, send): moved from
-	folder-browser-factory.c.
-	(reply_to_sender, reply_to_all): new functions to do replies.
-
-	* mail-format.c (text_to_html): Add an "add_pre" flag, to make
-	it wrap the output in <pre></pre>.
-	(mail_generate_reply): New function to create a composer and build
-	a reply in it.
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c (on_url_requested): deal with cid: URLs.
-	(find_cid): helper routine for above. (This could be much better.)
-	(mail_display_init): connect url_requested signal
-
-	* mail-format.c (handle_multipart_related): Make this work.
-
-	* mail-display.c (mail_display_set_message): ref the message we
-	display, since we're going to unref it when we remove it. Fixes a
-	bug that showed up with the new camel code, but it's not obvious
-	if it's due to a bug or a feature in the new code.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Add libibex.la to link.
-
-	* message-list.h: Removed folder summary.
-
-	* message-list.c: Dont include folder-summary anymore.
-	(select_msg): Changed to use folder, not summary in
-	summary_get_message_info().  God this code is grotty.
-	(ml_value_at): Ditto.
-	(ml_value_at): Changed to use new interface.  Hmm, this returns a
-	static variable, that seems wrong.
-	(message_list_set_folder): Remove folder summary.
-	(ml_row_count): Oops, remove some debug i put there.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* mail-display.c: update for bonobo change, and remove a
-	now-unused variable.
-
-2000-04-17  Chris Toshok  <toshok@helixcode.com>
-
-	* message-list.c (on_row_selection_idle): new function, actually
-	calls select_msg.
-	(on_row_selection_cmd): register an idle instead of calling
-	select_msg directly.  this fixes the lag before the row is
-	selected - selection is instantaneous now, with message loading
-	happening afterward.
-
-	* message-list.h: add row_to_select and an idle_id to the message
-	list to make the select_msg call happen in an idle func.
-
-	* message-list.c (message_list_init_renderers): no more
-	e_cell_set_editable.  this info always comes from the model.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-format.[ch]: Moved from camel/camel-formatter, and changed
-	slightly. (More to come.)
-
-	* html-stream.[ch]: No longer necessary. mail-format uses
-	GtkHTMLStreamHandles directly.
-
-	* mail-display.[ch]: update for new message formatting code.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): use
-	gnome_app_fill_toolbar_with_data, so we get the beautiful gnome
-	toolbar.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): Fix up the
-	warning message a bit.
-	(folder_browser_factory): Make the warning bypassable.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* main.c (main): Call e_cursors_init.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c (fetch_mail): use camel_movemail when fetching mail
-	from an mbox store. This leaves behind temp files for now,
-	because CamelMboxFolder::delete is too confused to use, and NotZed
-	is rewriting CamelMboxFolder, so I'm not going to bother to try to
-	fix it.
-
-	* mail-ops.c: Add some #includes for the non-HAVE_MKSTEMP case
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_new): set folder_browser->uri
-	to NULL, so that we know when to free it.
-
-2000-04-07  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (states_pixmaps): Add more beautiful art from
-	Miggue, the Diego Rivera of the next millenium.
-	(message_list_init_header): Use the beautiful art.
-
-	* pixmaps: Miguel rediscovers the "transparent" concept.
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* folder-browser.c (folder_browser_destroy): Unref the shell
-	interface that we have a handle to.
-
-	* folder-browser-factory.c (control_destroy_cb): New function;
-	destroys a folder-browser when its control is destroyed.
-	(folder_browser_factory): Hook up to the above.
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* mail-ops.c: new file, for toolbar/menu callbacks
-	(fetch_mail): fetch mail. Doesn't do mbox locking. Many kludges.
-
-	* folder-browser-factory.c (control_activate): use new fetch_mail
-	function as the callback for the "New mail" icon. Rename check_cb
-	to random_cb.
-
-	* Makefile.am: don't build test-sources since the version in
-	CVS doesn't do much and once I've fixed it it won't be a separate
-	program. Add mail-ops.[ch].
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c: Stick pixmaps here.
-
-	* mail-display.c (embeddable_destroy_cb): Replaced C++ comments
-	with C comments.
-
-	* message-list.c (load_internal_images): New function, loads images.
-	(message_list_init_renderers): Load images, fix previous attempt
-	at loading images. 
-
-	* Makefile.am (dist-hook): Added distribution of pixmaps.
-
-	* pixmaps: New directory, used to hold the XPMs we ship with. 
-
-	* pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's
-	envelopes incorporated.
-
-2000-03-31  Miguel de Icaza  <miguel@gnu.org>
-
-	* message-list.c (ml_value_at): Fix miss-used variable. 
-
-2000-04-01  Michael Meeks  <michael@helixcode.com>
-
-	* folder-browser.c (folder_browser_properties_init): update to
-	new property  (folder_browser_property_changed): kill.
-	(get_prop, set_prop): do the donkey work + make properly RW.
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell):
-	* folder-browser.c (folder_browser_new):
-	* message-list.c (on_row_selection_cmd, select_msg,
-	message_list_init, message_list_set_folder):
-
-	remove debugging printf()s that no longer seem useful
-
-2000-03-29  Dan Winship  <danw@helixcode.com>
-
-	* folder-browser-factory.c (control_activate): build a toolbar.
-	(control_deactivate): and hide it.
-
-2000-03-27  Chris Toshok <toshok@helixcode.com>
-	* mail-display.c: quiet warnings when building in ../po
-
-2000-03-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser-factory.c (folder_browser_set_shell): Memory leak
-	fix. 
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (select_msg, ml_value_at): update for summary
-	changes. Hey, neat, it really does make it more efficient.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* .cvsignore: Updated .cvsignore.
-
-2000-03-21  Matt Loper  <matt@helixcode.com>
-
-	* mail-display.c: Minor cleanup & commenting.
-
-	* folder-browser-factory.c: Minor cleanup & warning elimination.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* message-list.c (ml_value_at): display message size
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Properly ref & sink the table and header models.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* mail-sources.c: First cut at a mail source selection wizard.
-	Basically a rigged demo at this point. Doesn't use camel to get
-	its information, and is not yet complete or integrated with the
-	mail component. Did I mention that the code is ugly?
-
-2000-03-13  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	for testing and demonstration purpose, immediately 
-	register a fake service.
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (folder_browser_factory_init): 
-	name change.
-	(control_activate_cb): when the control is activated, 
-	it merges its own UI with the remote UIHandler.
-	(control_add_menu): sample menu merging.
-	(folder_browser_factory): connect the control "activate" signal.
-
-	* evolution-mail.gnorba: 
-	name changes
-
-	* folder-browser.h: added a reference to an 
-	Evolution::Shell object. 
-
-	* folder-browser-factory.c (folder_browser_set_shell): 
-	(folder_browser_control_add_service_repository_interface): 
-	(folder_browser_factory): the folder-browser control now
-	implements the Evolution/ServiceRepository interface.
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* folder-browser-factory.c (development_warning): 
-	added a warning so that the user knows that this 
-	version may crash his mails.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* message-list.h: include a referrence to the parent 
-	folder browser.
-
-	* message-list.c (ml_value_at): use the message summary 
-	from the 
-
-	* html-stream.c (html_stream_close): when the stream 
-	is closed, set the html stream to NULL
-	(html_stream_write): don't write anything if the 
-	html handle does not exist. 
-	(html_stream_reset): implemented. close the current 
-	html handle and begins a new html parser. 
-
-	* session.c (session_store_new): use static exception
-	here. 
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Added a prototype message listing.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Set up the column headers properly.
-
-	* folder-browser.c: Show the folder_browser widget.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Define ml_duplicate_value and ml_free_value
-	correctly.
-	
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Use g_int_compare and g_str_compare as we should
-	be instead of g_int_equal and g_str_equal.
-	
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* test-mail.c (main): replace the bonobo-active/gtk-main
-	by bonobo-main.
-	Include Gnorba headers.
-	(main): don't call the container creation routine 
-	before we entered the main loop. Use idle for that.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Change this to use the ETable widget itself
-	instead of building it from all the parts.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Ref the table columns since we unref them at the
-	end.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `$(top_srcdir)'.  Also, the
-	`top_srcdir' includes must come first everything else to avoid
-	including installed headers instead of our fresh ones.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (evolution_mail_LDADD): Fixed references to eutil.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed to match new e_table_simple interface.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* message-list.c (message_list_set_folder): update for CamelFolder
-	changes
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* message-list.c: Changed this to not use the "x" and "y"
-	arguments to e-table-item.
-
-2000-02-23  Matt Loper  <matt@helixcode.com>
-
-	* message-list.c (message_list_set_folder): Check 'desc'riptions
-	of exceptions.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* message-list.c (message_list_set_folder): 
-	fix to show a sample correct implementation. 
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: added -lunicode to evolution_mail_LDADD.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Pass a CamelAuthCallback
-	(evolution_auth_callback) to camel_session_new.
-	
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* session.c (session_store_new): Update session_store_new to
-	deal with the fact that camel_session_get_store takes a
-	CamelException now. Doesn't actually do anything with the
-	exception yet, because nothing else does yet either.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added test-mail.
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* folder-browser.c (folder_browser_load_folder): New routine,
-	loads a camel folder.
-	(folder_browser_set_uri): redo.
-
-	* session.c: new file.  Implements SessionStores to keep track of
-	a Session/Store tuple.  
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* html-stream.c (html_stream_new): Second param of gtk_html_begin
-	should be "", not NULL.
-	(html_stream_new): gtk_html_parse() is deprecated, so the call was
-	removed.
-
-	* html-stream.h: HTMLStreamClass's parent changed to
-	CamelStreamClass, not CamelStream.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add the e-text directory to the includes list.
-
-	* message-list.c: Change the call to e_cell_text_new, since
-	there's an added argument.
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libetext as libetable depends on it.
-
-2000-02-08  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* Makefile.am: Changed the order of the compilation so the CORBA stuff
-	was made before it was needed.
-
-2000-01-19  Miguel de Icaza  <miguel@gnu.org>
-
-	* Started work on the mail display engine.
-
-	* html-stream.c, html-stream.h: New files, they are CamelStreams
-	used to write to the GtkHTML widget. 
-
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
deleted file mode 100644
index 5febb74724..0000000000
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ /dev/null
@@ -1,157 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling mail."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-inbox.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Mail Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Evolution mail executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Evolution composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Evolution mail composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import Outlook Express 4 mails into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="Outlook Express 4 (.mbx)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports Outlook Express 4 files into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import mbox into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="MBox (mbox)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports mbox files into Evolution"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
deleted file mode 100644
index b976e15a1c..0000000000
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ /dev/null
@@ -1,157 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-inbox.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution mail executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Evolution composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution mail composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory to import Outlook Express 4 mails into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="Outlook Express 4 (.mbx)"/>
-	<oaf_attribute name="description" type="string"
-		       value="Imports Outlook Express 4 files into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory to import mbox into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="MBox (mbox)"/>
-	<oaf_attribute name="description" type="string"
-		       value="Imports mbox files into Evolution"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/Mail.idl b/mail/Mail.idl
deleted file mode 100644
index 14e17b3993..0000000000
--- a/mail/Mail.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * mail.idl: Mail interfaces for Evolution
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- * 
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	
-	interface MessageList : Bonobo::Unknown {
-		
-		void selectMessage (in long message_number);
-		void openMessage   (in long message_number);
-	};
-	
-	/*
-	 * FolderBrowser object.
-	 *
-	 * configuration of this widget is done trough 
-	 * Bonobo Properties
-	 */
-	interface FolderBrowser : Bonobo::Unknown {
-		MessageList getMessageList ();
-	};
-};
-};
-
diff --git a/mail/Makefile.am b/mail/Makefile.am
deleted file mode 100644
index 28def11cd0..0000000000
--- a/mail/Makefile.am
+++ /dev/null
@@ -1,190 +0,0 @@
-bin_PROGRAMS =	evolution-mail
-
-noinst_PROGRAMS = test-mail #test-thread
-
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
-
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/composer			\
-	-I$(top_builddir)/composer			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/executive-summary		\
-	-I$(top_srcdir)/executive-summary		\
-	-I$(top_srcdir)/shell/importer			\
-	-I$(top_builddir)/shell/importer		\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	$(THREADS_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\
-	-DG_LOG_DOMAIN=\"evolution-mail\"
-
-EVOLUTION_MAIL_CORBA_GENERATED = \
-	Mail.h			\
-	Mail-common.c		\
-	Mail-skels.c		\
-	Mail-stubs.c
-
-evolution_mail_SOURCES =		\
-	$(EVOLUTION_MAIL_CORBA_GENERATED)	\
-	component-factory.c		\
-	component-factory.h		\
-	folder-browser.c		\
-	folder-browser.h		\
-	folder-browser-factory.c	\
-	folder-browser-factory.h	\
-	mail-accounts.c			\
-	mail-accounts.h			\
-	mail-account-editor.c		\
-	mail-account-editor.h		\
-	mail-autofilter.c		\
-	mail-autofilter.h		\
-	mail-callbacks.c		\
-	mail-callbacks.h		\
-	mail-config.c			\
-	mail-config.h			\
-	mail-config-druid.c		\
-	mail-config-druid.h		\
-	mail-crypto.c			\
-	mail-crypto.h			\
-	mail-display.c			\
-	mail-display.h			\
-	mail-format.c			\
-	mail-identify.c			\
-	mail-importer.c			\
-	mail-importer.h			\
-	mail-local.c			\
-	mail-local.h			\
-	mail-mlist-magic.c		\
-	mail-mlist-magic.h		\
-	mail-mt.c			\
-	mail-mt.h			\
-	mail-ops.c			\
-	mail-ops.h			\
-	mail-search-dialogue.c		\
-	mail-search-dialogue.h		\
-	mail-send-recv.c		\
-	mail-send-recv.h		\
-	mail-summary.c			\
-	mail-summary.h			\
-	mail-tools.c			\
-	mail-tools.h			\
-	mail-types.h			\
-	mail-vfolder.c			\
-	mail-vfolder.h			\
-	mail-view.c			\
-	mail-vtrash.c			\
-	mail-vtrash.h			\
-	main.c				\
-	message-list.c			\
-	message-list.h			\
-	openpgp-utils.c			\
-	openpgp-utils.h			\
-	session.c			\
-	mail-session.h			\
-	subscribe-dialog.c		\
-	subscribe-dialog.h		\
-	mail.h				\
-	evolution-outlook-importer.c	\
-	evolution-outlook-importer.h	\
-	evolution-mbox-importer.c	\
-	evolution-mbox-importer.h
-
-evolution_mail_LDADD = 					\
-	$(top_builddir)/shell/libeshell.a		\
-	$(top_builddir)/composer/libcomposer.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/filter/libfilter.la		\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(top_builddir)/shell/importer/libevolution-importer.la	\
-	$(top_builddir)/widgets/menus/libmenus.la	\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(THREADS_LIBS)					\
-	$(UNICODE_LIBS)
-
-evolution_mail_LDFLAGS =				\
-	-export-dynamic
-
-#evolution_outlook_importer_SOURCES =			\
-#	evolution-outlook-importer.c
-
-#evolution_outlook_importer_LDADD =			\
-#	$(BONOBO_GNOME_LIBS)				\
-#	$(EXTRA_GNOME_LIBS)				\
-#	$(top_builddir)/e-util/libeutil.la		\
-#	$(top_builddir)/shell/importer/libevolution-importer.la	\
-#	$(CAMEL_OBJS_EXTRA)				\
-#	$(top_builddir)/camel/libcamel.la
-
-test_mail_SOURCES = \
-	test-mail.c
-
-test_mail_LDADD = \
-	$(BONOBO_HTML_GNOME_LIBS)
-
-#test_thread_SOURCES =	\
-#	mail-threads.c	\
-#	mail-threads.h	\
-#	test-thread.c
-#
-#test_thread_LDADD = 				\
-#	$(top_builddir)/camel/libcamel.la	\
-#	$(top_builddir)/e-util/libeutil.la	\
-#	$(top_builddir)/libibex/libibex.la	\
-#	$(BONOBO_HTML_GNOME_LIBS)		\
-#	$(UNICODE_LIBS)				\
-#	$(THREADS_LIBS)
-#
-#test_thread_CFLAGS = -g $(THREADS_CFLAGS)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Mail.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = mail-config.glade local-config.glade
-
-iconsdir = $(datadir)/images/evolution
-
-$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
-	-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
-
-EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_in_files) $(oaf_DATA)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-mail.pure
-
-evolution-mail.pure: evolution-mail
-	@rm -f evolution-mail.pure
-	$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
-
-endif
-
-BUILT_SOURCES = $(EVOLUTION_MAIL_CORBA_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/mail/README.async b/mail/README.async
deleted file mode 100644
index 238fafcedb..0000000000
--- a/mail/README.async
+++ /dev/null
@@ -1,360 +0,0 @@
-Asynchronous Mailer Information
-Peter Williams <peterw@helixcode.com>
-8/4/2000
-
-1. INTRODUCTION
-
-It's pretty clear that the Evolution mailer needs to be asynchronous in
-some manner. Blocking the UI completely on IMAP calls or large disk reads
-is unnacceptable, and it's really nice to be able to thread the message
-view in the background, or do other things while a mailbox is downloading.
-
-The problem in making Evolution asynchronous is Camel. Camel is not 
-asynchronous for a few reasons. All of its interfaces are synchronous --
-calls like camel_store_get_folder, camel_folder_get_message, etc. can
-take a very long time if they're being performed over a network or with
-a large mbox mailbox file. However, these functions have no mechanism
-for specifying that the operation is in progress but not complete, and
-no mechanism for signaling when to operation does complete.
-
-2. WHY I DIDN'T MAKE CAMEL ASYNCHRONOUS
-
-It seems like it would be a good idea, then, to rewrite Camel to be
-asynchonous. This presents several problems:
-
-	* Many interfaces must be rewritten to support "completed"
-	  callbacks, etc. Some of these interfaces are connected to
-	  synchronous CORBA calls.
-	* Everything must be rewritten to be asynchonous. This includes
-	  the CamelStore, CamelFolder, CamelMimeMessage, CamelProvider,
-	  every subclass thereof, and all the code that touches these.
-	  These include the files in camel/, mail/, filter/, and
-	  composer/. The change would be a complete redesign for any
-	  provider implementation.
-	* All the work on providers (IMAP, mh, mbox, nntp) up to this
-	  point would be wasted. While they were being rewritten
-	  evolution-mail would be useless.
-
-However, it is worth noting that the solution I chose is not optimal,
-and I think that it would be worthwhile to write a libcamel2 or some
-such thing that was designed from the ground up to work asynchronously.
-Starting fresh from such a design would work, but trying to move the
-existing code over would be more trouble than it's worth.
-
-3. WHY I MADE CAMEL THREADED
-
-If Camel was not going to be made asynchronous, really the only other
-choice was to make it multithreaded. [1] No one has been particularly
-excited by this plan, as debugging and writing MT-safe code is hard.
-But there wasn't much of a choice, and I believed that a simple thread
-wrapper could be written around Camel.
-
-The important thing to know is that while Camel is multithreaded, we
-DO NOT and CANNOT share objects between threads. Instead,
-evolution-mail sends a request to a dispatching thread, which performs
-the action or queues it to be performed. (See section 4 for details)
-
-The goal that I was working towards is that there should be no calls
-to camel made, ever, in the main thread. I didn't expect to and
-didn't do this, but that was the intent.
-
-[1]. Well, we could fork off another process, but they share so much
-data that this would be pretty impractical.
-
-4. IMPLEMENTATION
-
-a. CamelObject
-
-Threading presented a major problem regarding Camel. Camel is based
-on the GTK Object system, and uses signals to communicate events. This
-is okay in a nonthreaded application, but the GTK Object system is
-not thread-safe.
-
-Particularly, signals and object allocations use static data. Using
-either one inside Camel would guarantee that we'd be stuck with 
-random crashes forevermore. That's Bad (TM).
-
-There were two choices: make sure to limit our usage of GTK, or stop
-using the GTK Object system. I decided to do the latter, as the
-former would lead to a mess of "what GTK calls can we make" and
-GDK_THREADS_ENTER and accidentally calling UI functions and upgrades
-to GTK breaking everything.
-
-So I wrote a very very simple CamelObject system. It had three goals:
-
-	* Be really straightforward, just encapsulate the type 
-	  heirarchy without all that GtkArg silliness or anything.
-	* Be as compatible as possible with the GTK Object system
-	  to make porting easy
-	* Be threadsafe
-
-It supports:
-
-	* Type inheritance
-	* Events (signals)
-	* Type checking
-	* Normal refcounting
-	* No unref/destroy messiness
-	* Threadsafety
-	* Class functions
-
-The entire code to the object system is in camel/camel-object.c. It's
-a naive implementation and not full of features, but intentionally that
-way. The main differences between GTK Objects and Camel Objects are:
-
-	* s,gtk,camel,i of course
-	* Finalize is no longer a GtkObjectClass function. You specify
-	  a finalize function along with an init function when declaring
-	  a type, and it is called automatically and chained automatically.
-	* Declaring a type is a slightly different API
-	* The signal system is replaced with a not-so-clever event system.
-	  Every event is equivalent to a NONE__POINTER signal. The syntax
-	  is slightly different: a class "declares" an event and specifies
-	  a name and a "prep func", that is called before the event is
-	  triggered and can cancel it.
-	* There is only one CamelXXXClass in existence for every type.
-	  All objects share it.
-
-There is a shell script, tools/make-camel-object.sh that will do all of
-the common substitutions to make a file CamelObject-compatible. Usually
-all that needs to be done is move the implementation of the finalize
-event out of the class init, modify the get_type function, and replace
-signals with events.
-
-Pitfalls in the transition that I ran into were:
-
-	* gtk_object_ref -> camel_object_ref or you coredump
-	* some files return 'guint' instead of GtkType and must be changed
-	* Remove the #include <gtk/gtk.h>
-	* gtk_object_set_datas must be changed (This happened once; I 
-	  added a static hashtable)
-	* signals have to be fudged a bit to match the gpointer input
-	* the BAST_CASTARD option is on, meaning failed typecasts will
-	  return NULL, almost guaranteeing a segfault -- gets those
-	  bugs fixed double-quick!
-
-b. API -- mail_operation_spec
-
-I worked by creating a very specific definition of a "mail operation"
-and wrote an engine to queue and dispatch them.
-
-A mail operation is defined by a structure mail_operation_spec
-prototyped in mail-threads.h. It comes in three logical parts -- a 
-"setup" phase, executed in the main thread; a "do" phase, executed
-in the dispatch thread; and a "cleanup" phase, executed in the main
-thread. These three phases are guaranteed to be performed in order
-and atomically with respect to other mail operations.
-
-Each of these phases is represented by a function pointer in the
-mail_operation_spec structure. The function mail_operation_queue() is
-called and passed a pointer to a mail_operation_spec and a user_data-style
-pointer that fills in the operation's parameters. The "setup" callback
-is called immediately, though that may change.
-
-Each callback is passed three parameters: a pointer to the user_data,
-a pointer to the "operation data", and a pointer to a CamelException.
-The "operation data" is allocated automatically and freed when the operation
-completes. Internal data that needs to be shared between phases should
-be stored here. The size allocated is specified in the mail_operation_spec
-structure.
-
-Because all of the callbacks use Camel calls at some point, the 
-CamelException is provided as utility. The dispatcher will catch exceptions
-and display error dialogs, unlike the synchronous code which lets
-exceptions fall through the cracks fairly easily.
-
-I tried to implement all the operations following this convention. Basically
-I used this skeleton code for all the operations, just filling in the 
-specifics:
-
-===================================
-
-typedef struct operation_name_input_s {
-	parameters to operation
-} operation_name_input_t;
-
-typedef struct operation_name_data_s {
-	internal data to operation, if any
-	(if none, omit the structure and set opdata_size to 0)
-} operation_name_data_t;
-
-static gchar *describe_operation_name (gpointer in_data, gboolean gerund);
-static void setup_operation_name   (gpointer in_data, gpointer op_data, CamelException *ex);
-static void do_operation_name      (gpointer in_data, gpointer op_data, CamelException *ex);
-static void cleanup_operation_name (gpointer in_data, gpointer op_data, CamelException *ex);
-
-static gchar *describe_operation_name (gpointer in_data, gboolean gerund)
-{
-	operation_name_input_t *input = (operation_name_input_t *) in_data;
-
-	if (gerund) {
-		return a g_strdup'ed string describing what we're doing
-	} else {
-		return a g_strdup'ed string describing what we're about to do
-	}
-}
-
-static void setup_operation_name (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	operation_name_input_t *input = (operation_name_input_t *) in_data;
-	operation_name_data_t *data = (operation_name_data_t *) op_data;
-
-	verify that parameters are valid
-
-	initialize op_data
-
-	reference objects
-}
-
-static void do_operation_name (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	operation_name_input_t *input = (operation_name_input_t *) in_data;
-	operation_name_data_t *data = (operation_name_data_t *) op_data;
-
-	perform camel operations
-}
-
-static void cleanup_operation_name (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	operation_name_input_t *input = (operation_name_input_t *) in_data;
-	operation_name_data_t *data = (operation_name_data_t *) op_data;
-
-	perform UI updates
-
-	free allocations
-
-	dereference objects
-}
-
-static const mail_operation_spec op_operation_name = {
-	describe_operation_name,
-	sizeof (operation_name_data_t),
-	setup_operation_name,
-	do_operation_name,
-	cleanup_operation_name
-};
-
-void
-mail_do_operation_name (parameters)
-{
-	operation_name_input_t *input;
-
-	input = g_new (operation_name_input_t, 1);
-
-	store parameters in input
-
-	mail_operation_queue (&op_operation_name, input, TRUE);
-}
-
-===========================================
-
-c. mail-ops.c
-
-Has been drawn and quartered. It has been split into:
-
-	* mail-callbacks.c: the UI callbacks
-	* mail-tools.c: useful sequences wrapping common Camel operations
-	* mail-ops.c: implementations of all the mail_operation_specs
-
-An important part of mail-ops.c are the global functions 
-mail_tool_camel_lock_{up,down}. These simulate a recursize mutex around
-camel. There are an extreme few, supposedly safe, calls to Camel made in
-the main thread. These functions should go around evey call to Camel or
-group thereof. I don't think they're necessary but it's nice to know
-they're there.
-
-If you look at mail-tools.c, you'll notice that all the Camel calls are
-protected with these functions. Remember that a mail tool is really 
-just another Camel call, so don't use them in the main thread either.
-
-All the mail operations are implemented in mail-ops.c EXCEPT:
-
-	* filter-driver.c: the filter_mail operation
-	* message-list.c: the regenerate_messagelist operation
-	* message-thread.c: the thread_messages operation
-
-d. Using the operations
-
-The mail operations as implemented are very specific to evolution-mail. I
-was thinking about leaving them mostly generic and then allowing extra
-callbacks to be added to perform the more specific UI touches, but this
-seemed kind of pointless.
-
-I basically looked through the code, found references to Camel, and split
-the code into three parts -- the bit before the Camel calls, the bit after,
-and the Camel calls. These were mapped onto the template, given a name,
-and added to mail-ops.c. Additionally, I simplified the common tasks that
-were taken care of in mail-tools.c, making some functions much simpler.
-
-Ninety-nine percent of the time, whatever operation is being done is being
-done in a callback, so all that has to be done is this:
-
-==================
-
-void my_callback (GtkObject *obj, gchar *uid)
-{
-	camel_do_something (uid);
-}
-
-==== becomes ====
-
-void my_callback (GtkObject *obj, gchar *uid)
-{
-	mail_do_do_something (uid);
-}
-
-=================
-
-There are, however, a few belligerents. Particularly, the function
-mail_uri_to_folder returns a CamelFolder and yet should really be
-asynchronous. This is called in a CORBA call that is sychronous, and
-additionally is used in the filter code.
-
-I changed the first usage to return the folder immediately but
-still fetch the CamelFolder asyncrhonously, and in the second case,
-made filtering asynchronous, so the fact that the call is synchronous
-doesn't matter.
-
-The function was renamed to mail_tool_uri_to_folder to emphasize that
-it's a synchronous Camel call.
-
-e. The dispatcher
-
-mail_operation_queue () takes its parameters and assembles them in a
-closure_t structure, which I abbreviate clur. It sets a timeout to
-display a progress window if an operation is still running one second
-later (we're not smart enough to check if it's the same operation,
-but the issue is not a big deal). The other thread and some communication
-pipes are created.
-
-The dispatcher thread sits in a loop reading from a pipe. Every time
-the main thread queues an operation, it writes the closure_t into the pipe.
-The dispatcher reads the closure, sends a STARTING message to the main
-thread (see below for explanation), calls the callback specified in the
-closure, and sends a FINISHED message. It then goes back to reading
-from its pipe; it will either block until another operation comes along,
-or find one right away and start it. This the pipe takes care of queueing
-operations.
-
-The dispatch thread communicates with the main thread with another pipe;
-however, the main thread has other things to do than read from the pipe,
-so it adds registers a GIOReader that checks for messages in the glib
-main loop. In addition to starting and finishing messages, the other
-thread can communicate to the user using messages and a progress bar.
-(This is currently implemented but unused.)
-
-5. ISSUES
-
-	* Operations are queued and dequeued stupidly. Like if you click
-	  on one message then click on another, the first will be retrieved
-	  and displayed then overwritten by the second. Operations that could
-	  be performed at the same time safely aren't.
-	* The CamelObject system is workable, but it'd be nice to work with
-	  something established like the GtkObject
-	* The whole threading idea is not great. Concensus is that an 
-	  asynchronous interface is the Right Thing, eventually.
-	* Care still needs to be taken when designing evolution-mail code to
-	  work with the asynchronous mail_do_ functions
-	* Some of the operations are extremely hacky.
-	* IMAP's timeout to send a NOOP had to be removed because we can't
-	  use GTK. We need an alternative for this.
\ No newline at end of file
diff --git a/mail/component-factory.c b/mail/component-factory.c
deleted file mode 100644
index d72df7281d..0000000000
--- a/mail/component-factory.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "camel.h"
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "folder-browser-factory.h"
-#include "evolution-shell-component.h"
-#include "folder-browser.h"
-#include "mail.h"		/* YUCK FIXME */
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-local.h"
-#include "mail-session.h"
-#include "mail-mt.h"
-#include "mail-importer.h"
-#include "mail-vfolder.h"             /* vfolder_create_storage */
-#include "mail-vtrash.h"
-#include "openpgp-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-
-#include "component-factory.h"
-
-#include "mail-summary.h"
-#include "mail-send-recv.h"
-
-CamelFolder *drafts_folder = NULL;
-CamelFolder *outbox_folder = NULL;
-CamelFolder *sent_folder = NULL;     /* this one should be configurable? */
-char *evolution_dir;
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
-#define SUMMARY_FACTORY_ID   "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-
-static BonoboGenericFactory *component_factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-static GHashTable *storages_hash;
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *folder_type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell corba_shell;
-	BonoboControl *control;
-
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-	if (g_strcasecmp (folder_type, "mail") == 0) {
-		control = folder_browser_factory_new_control (physical_uri,
-							      corba_shell);
-	} else if (g_strcasecmp (folder_type, "mailstorage") == 0) {
-		CamelService *store;
-		EvolutionStorage *storage;
-
-		store = camel_session_get_service (session, physical_uri,
-						   CAMEL_PROVIDER_STORE, NULL);
-		if (!store)
-			return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-		storage = g_hash_table_lookup (storages_hash, store);
-		if (!storage) {
-			camel_object_unref (CAMEL_OBJECT (store));
-			return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-		}
-
-		if (!gtk_object_get_data (GTK_OBJECT (storage), "connected"))
-			mail_scan_subfolders (CAMEL_STORE(store), storage);
-		camel_object_unref (CAMEL_OBJECT (store));
-
-		control = folder_browser_factory_new_control ("", corba_shell);
-	} else
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	if (!control)
-		return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-
-	*control_return = control;
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-do_create_folder (char *uri, CamelFolder *folder, void *data)
-{
-	GNOME_Evolution_ShellComponentListener listener = data;
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellComponentListener_Result result;
-
-	if (folder)
-		result = GNOME_Evolution_ShellComponentListener_OK;
-	else
-		result = GNOME_Evolution_ShellComponentListener_INVALID_URI;
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &ev);
-	CORBA_Object_release(listener, &ev);
-	CORBA_exception_free(&ev);
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	char *uri;
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-	if (!strcmp (type, "mail")) {
-		uri = g_strdup_printf ("mbox://%s", physical_uri);
-		mail_create_folder (uri, do_create_folder, CORBA_Object_duplicate (listener, &ev));
-	} else {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &ev);
-	}
-	CORBA_exception_free(&ev);
-}
-
-static struct {
-	char *name;
-	CamelFolder **folder;
-} standard_folders[] = {
-	{ "Drafts", &drafts_folder },
-	{ "Outbox", &outbox_folder },
-	{ "Sent", &sent_folder },
-};
-
-static void
-got_folder (char *uri, CamelFolder *folder, void *data)
-{
-	CamelFolder **fp = data;
-	
-	if (folder) {
-		*fp = folder;
-		camel_object_ref (CAMEL_OBJECT (folder));
-	}
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	GNOME_Evolution_Shell corba_shell;
-	const GSList *accounts;
-#ifdef ENABLE_NNTP
-	const GSList *news;
-#endif
-	int i;
-
-	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
-
-	evolution_dir = g_strdup (evolution_homedir);
-	mail_session_init ();
-	
-	mail_config_init ();
-	
-	openpgp_init (mail_config_get_pgp_path (), mail_config_get_pgp_type ());
-	
-	storages_hash = g_hash_table_new (NULL, NULL);
-	
-	vfolder_create_storage (shell_component);
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-	
-	accounts = mail_config_get_accounts ();
-	mail_load_storages (corba_shell, accounts, TRUE);
-	
-#ifdef ENABLE_NNTP
-	news = mail_config_get_news ();
-	mail_load_storages (corba_shell, news, FALSE);
-#endif
-
-	mail_local_storage_startup (shell_client, evolution_dir);
-	mail_importer_init (shell_client);
-	
-	for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) {
-		char *uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name);
-		mail_msg_wait (mail_get_folder (uri, got_folder, standard_folders[i].folder));
-		g_free (uri);
-	}
-	
-	mail_vtrash_create ("file:/", "vTrash");
-	
-	mail_session_enable_interaction (TRUE);
-	
-	mail_autoreceive_setup ();
-}
-
-static void
-free_storage (gpointer service, gpointer storage, gpointer data)
-{
-	camel_service_disconnect (service, TRUE, NULL);
-	camel_object_unref (service);
-	bonobo_object_unref (storage);
-}
-
-static gboolean
-idle_quit (gpointer user_data)
-{
-	if (e_list_length (folder_browser_factory_get_control_list ()))
-		return TRUE;
-
-	bonobo_object_unref (BONOBO_OBJECT (summary_factory));
-	bonobo_object_unref (BONOBO_OBJECT (component_factory));
-	g_hash_table_foreach (storages_hash, free_storage, NULL);
-	g_hash_table_destroy (storages_hash);
-
-	gtk_main_quit ();
-
-	return FALSE;
-}	
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data)
-{
-	g_idle_add_full (G_PRIORITY_LOW, idle_quit, NULL, NULL);
-}
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "mail", "evolution-inbox.png" },
-	{ "mailstorage", "evolution-inbox.png" },
-	{ NULL, NULL }
-};
-
-static BonoboObject *
-component_fn (BonoboGenericFactory *factory, void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types,
-							 create_view,
-							 create_folder,
-							 NULL, /* remove_folder_fn */
-							 NULL, /* copy_folder_fn */
-							 NULL, /* populate_folder_context_menu */
-							 NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-static BonoboObject *
-summary_fn (BonoboGenericFactory *factory, void *closure)
-{
-	return executive_summary_component_factory_new (create_summary_view, 
-							NULL);
-}
-
-void
-component_factory_init (void)
-{
-	component_factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID,
-							component_fn, NULL);
-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID,
-						      summary_fn, NULL);
-
-	if (component_factory == NULL || summary_factory == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's mail component."));
-		exit (1);
-	}
-}
-
-static int
-storage_create_folder (EvolutionStorage *storage, const char *path,
-		       const char *type, const char *description,
-		       const char *parent_physical_uri, gpointer user_data)
-{
-	CamelStore *store = user_data;
-	char *name;
-	CamelURL *url;
-	CamelException ex;
-	CamelFolderInfo *fi;
-
-	if (strcmp (type, "mail") != 0)
-		return EVOLUTION_STORAGE_ERROR_UNSUPPORTED_TYPE;
-	name = strrchr (path, '/');
-	if (!name++)
-		return EVOLUTION_STORAGE_ERROR_INVALID_URI;
-
-	camel_exception_init (&ex);
-	if (*parent_physical_uri) {
-		url = camel_url_new (parent_physical_uri, NULL);
-		if (!url)
-			return EVOLUTION_STORAGE_ERROR_INVALID_URI;
-
-		fi = camel_store_create_folder (store, url->path + 1, name, &ex);
-		camel_url_free (url);
-	} else
-		fi = camel_store_create_folder (store, NULL, name, &ex);
-
-	if (camel_exception_is_set (&ex)) {
-		/* FIXME: do better than this */
-		camel_exception_clear (&ex);
-		return EVOLUTION_STORAGE_ERROR_INVALID_URI;
-	}
-
-	if (camel_store_supports_subscriptions (store))
-		camel_store_subscribe_folder (store, fi->full_name, NULL);
-	
-	folder_created (store, fi);
-	
-	camel_store_free_folder_info (store, fi);
-	
-	return EVOLUTION_STORAGE_OK;
-}
-
-static void
-add_storage (const char *name, const char *uri, CamelService *store,
-	     GNOME_Evolution_Shell corba_shell, CamelException *ex)
-{
-	EvolutionStorage *storage;
-	EvolutionStorageResult res;
-	
-	storage = evolution_storage_new (name, uri, "mailstorage");
-	gtk_signal_connect (GTK_OBJECT (storage), "create_folder",
-			    GTK_SIGNAL_FUNC (storage_create_folder),
-			    store);
-	
-	res = evolution_storage_register_on_shell (storage, corba_shell);
-	
-	switch (res) {
-	case EVOLUTION_STORAGE_OK:
-		mail_hash_storage (store, storage);
-		mail_scan_subfolders (CAMEL_STORE (store), storage);
-		/* falllll */
-	case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED:
-	case EVOLUTION_STORAGE_ERROR_EXISTS:
-		return;
-	default:
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot register storage with shell"));
-		break;
-	}
-}
-
-
-/* FIXME: 'is_account_data' is an ugly hack, if we remove support for NNTP we can take it out -- fejj */
-void
-mail_load_storages (GNOME_Evolution_Shell shell, const GSList *sources, gboolean is_account_data)
-{
-	CamelException ex;
-	const GSList *iter;
-	
-	camel_exception_init (&ex);
-
-	/* Load each service (don't connect!). Check its provider and
-	 * see if this belongs in the shell's folder list. If so, add
-	 * it.
-	 */
-
-	for (iter = sources; iter; iter = iter->next) {
-		const MailConfigAccount *account = NULL;
-		const MailConfigService *service = NULL;
-		CamelService *store;
-		CamelProvider *prov;
-		
-		if (is_account_data) {
-			account = iter->data;
-			service = account->source;
-		} else {
-			service = iter->data;
-		}
-		
-		if (service->url == NULL || service->url[0] == '\0')
-			continue;
-
-		store = camel_session_get_service (session, service->url, 
-						   CAMEL_PROVIDER_STORE, &ex);
-		if (store == NULL) {
-			/* FIXME: real error dialog */
-			g_warning ("couldn't get service %s: %s\n", service->url,
-				   camel_exception_get_description (&ex));
-			camel_exception_clear (&ex);
-			continue;
-		}
-
-		prov = camel_service_get_provider (store);
-
-		/* FIXME: this case is ambiguous for things like the
-		 * mbox provider, which can really be a spool
-		 * (/var/spool/mail/user) or a storage (~/mail/, eg).
-		 * That issue can't be resolved on the provider level
-		 * -- it's a per-URL problem.
-		 */
-		if (prov->flags & CAMEL_PROVIDER_IS_STORAGE && prov->flags & CAMEL_PROVIDER_IS_REMOTE) {
-			char *name;
-			
-			if (is_account_data) {
-				name = g_strdup (account->name);
-			} else {
-				name = camel_service_get_name (store, TRUE);
-			}
-			add_storage (name, service->url, store, shell, &ex);
-			g_free (name);
-			
-			if (camel_exception_is_set (&ex)) {
-				/* FIXME: real error dialog */
-				g_warning ("Cannot load storage: %s",
-					   camel_exception_get_description (&ex));
-				camel_exception_clear (&ex);
-			}
-		}
-		
-		camel_object_unref (CAMEL_OBJECT (store));
-	}
-}
-
-void
-mail_hash_storage (CamelService *store, EvolutionStorage *storage)
-{
-	camel_object_ref (CAMEL_OBJECT (store));
-	g_hash_table_insert (storages_hash, store, storage);
-}
-
-EvolutionStorage*
-mail_lookup_storage (CamelStore *store)
-{
-	EvolutionStorage *storage;
-
-	/* Because the storages_hash holds a reference to each store
-	 * used as a key in it, none of them will ever be gc'ed, meaning
-	 * any call to camel_session_get_{service,store} with the same
-	 * URL will always return the same object. So this works.
-	 */
-
-	storage = g_hash_table_lookup (storages_hash, store);
-	if (storage)
-		gtk_object_ref (GTK_OBJECT (storage));
-
-	return storage;
-}
diff --git a/mail/component-factory.h b/mail/component-factory.h
deleted file mode 100644
index 1f5a33f407..0000000000
--- a/mail/component-factory.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
diff --git a/mail/e-attchmt.png b/mail/e-attchmt.png
deleted file mode 100644
index b4bac8db67..0000000000
--- a/mail/e-attchmt.png
+++ /dev/null
diff --git a/mail/evolution-mbox-importer.c b/mail/evolution-mbox-importer.c
deleted file mode 100644
index 0e18fb6732..0000000000
--- a/mail/evolution-mbox-importer.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-mbox-importer.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "evolution-mbox-importer.h"
-
-#include <stdio.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#include "mail-importer.h"
-#include "mail-tools.h"
-
-#include <camel/camel.h>
-
-typedef struct {
-	MailImporter importer; /* Parent */
-	
-	char *filename;
-	int num;
-	CamelMimeParser *mp;
-} MboxImporter;
-
-
-/* EvolutionImporter methods */
-
-static void
-process_item_fn (EvolutionImporter *eimporter,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	MboxImporter *mbi = (MboxImporter *) closure;
-	MailImporter *importer = (MailImporter *) mbi;
-	gboolean done = FALSE;
-	CamelException *ex;
-	
-	ex = camel_exception_new ();
-	
-	if (camel_mime_parser_step (mbi->mp, 0, 0) == HSCAN_FROM) {
-		/* Import the next message */
-		CamelMimeMessage *msg;
-		CamelMessageInfo *info;
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mbi->mp) == -1) {
-			g_warning ("Failed message %d", mbi->num);
-			camel_object_unref (CAMEL_OBJECT (msg));
-			done = TRUE;
-		}
-		
-		/* write the mesg */
-		info = g_new0 (CamelMessageInfo, 1);
-		camel_folder_append_message (importer->folder, msg, info, ex);
-		g_free (info);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		if (camel_exception_is_set (ex)) {
-			g_warning ("Failed message %d", mbi->num);
-			done = TRUE;
-		}
-		
-		if (!done) {
-			mbi->num++;
-			
-			/* skip over the FROM_END state */
-			camel_mime_parser_step (mbi->mp, 0, 0);
-		}
-	} else {
-		/* all messages have now been imported */
-		camel_folder_sync (importer->folder, FALSE, ex);
-		camel_folder_thaw (importer->folder);
-		importer->frozen = FALSE;
-		done = TRUE;
-	}
-	
-	camel_exception_free (ex);
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       !done, ev);
-	return;
-}
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char signature[6];
-	gboolean ret = FALSE;
-	int fd, n;
-	
-	fd = open (filename, O_RDONLY);
-	if (fd == -1)
-		return FALSE;
-	
-	n = read (fd, signature, 5);
-	if (n > 0) {
-		signature[n] = '\0';
-		if (!g_strncasecmp (signature, "From ", 5))
-			ret = TRUE;
-	}
-	
-	close (fd);
-	
-	return ret;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     MboxImporter *mbi)
-{
-	MailImporter *importer;
-	
-	importer = (MailImporter *) mbi;
-	if (importer->frozen) {
-		CamelException *ex;
-		
-		ex = camel_exception_new ();
-		camel_folder_sync (importer->folder, FALSE, ex);
-		camel_exception_free (ex);
-		
-		camel_folder_thaw (importer->folder);
-	}
-	
-	if (importer->folder)
-		camel_object_unref (CAMEL_OBJECT (importer->folder));
-	
-	g_free (mbi->filename);
-	if (mbi->mp)
-		camel_object_unref (CAMEL_OBJECT (mbi->mp));
-	
-	g_free (mbi);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *eimporter,
-	      const char *filename,
-	      void *closure)
-{
-	MboxImporter *mbi;
-	MailImporter *importer;
-	int fd;
-	
-	mbi = (MboxImporter *) closure;
-	importer = (MailImporter *) mbi;
-	
-	mbi->filename = g_strdup (filename);
-	
-	fd = open (filename, O_RDONLY);
-	if (fd == -1) {
-		g_warning ("Cannot open file");
-		return FALSE;
-	}
-	
-	mbi->mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mbi->mp, TRUE);
-	if (camel_mime_parser_init_with_fd (mbi->mp, fd) == -1) {
-		g_warning ("Unable to process spool folder");
-		goto fail;
-	}
-	
-	importer->mstream = NULL;
-	importer->folder = mail_tool_get_local_inbox (NULL);
-	
-	if (importer->folder == NULL) {
-		g_print ("Bad folder\n");
-		goto fail;
-	}
-	
-	camel_folder_freeze (importer->folder);
-	importer->frozen = TRUE;
-	
-	g_warning ("Okay, so everything is now ready to import that mbox file!");
-	
-	return TRUE;
-	
- fail:
-	camel_object_unref (CAMEL_OBJECT (mbi->mp));
-	mbi->mp = NULL;
-	
-	return FALSE;
-}
-
-BonoboObject *
-mbox_factory_fn (BonoboGenericFactory *_factory,
-		 void *closure)
-{
-	EvolutionImporter *importer;
-	MboxImporter *mbox;
-	
-	mbox = g_new0 (MboxImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn,
-					   process_item_fn, NULL, mbox);
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), mbox);
-	
-	return BONOBO_OBJECT (importer);
-}
diff --git a/mail/evolution-mbox-importer.h b/mail/evolution-mbox-importer.h
deleted file mode 100644
index 20b56b81eb..0000000000
--- a/mail/evolution-mbox-importer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-mbox-importer.h
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EVOLUTION_MBOX_IMPORTER_H_
-#define _EVOLUTION_MBOX_IMPORTER_H_
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-
-#define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-
-BonoboObject *mbox_factory_fn (BonoboGenericFactory *_factory,
-			       void *closure);
-
-#endif
diff --git a/mail/evolution-outlook-importer.c b/mail/evolution-outlook-importer.c
deleted file mode 100644
index d78f2ad7f8..0000000000
--- a/mail/evolution-outlook-importer.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-outlook-importer.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "evolution-outlook-importer.h"
-
-#include <stdio.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#include "mail-importer.h"
-#include "mail-tools.h"
-
-#include <camel/camel-exception.h>
-
-extern char *evolution_dir;
-typedef struct {
-	MailImporter importer;
-
-	char *filename;
-	gboolean oe4; /* Is file OE4 or not? */
-	FILE *handle;
-	long pos;
-	off_t size;
-
-	gboolean busy;
-} OutlookImporter;
-
-struct oe_msg_segmentheader {
-	int self;
-	int increase;
-	int include;
-	int next;
-	int usenet;
-};
-
-typedef struct oe_msg_segmentheader oe_msg_segmentheader;
-
-
-/* EvolutionImporter methods */
-
-/* Based on code from liboe 0.92 (STABLE)
-   Copyright (C) 2000 Stephan B. Nedregård (stephan@micropop.com)
-   Modified 2001 Iain Holmes  <iain@ximian.com>
-   Copyright (C) 2001 Ximian, Inc. */
-
-static void
-process_item_fn (EvolutionImporter *eimporter,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	OutlookImporter *oli = (OutlookImporter *) closure;
-	MailImporter *importer = (MailImporter *) oli;
-	oe_msg_segmentheader *header;
-	gboolean more = TRUE;
-	char *cb, *sfull, *s;
-	long end_pos = 0;
-	int i;
-
-	if (oli->busy == TRUE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener, 
-							       GNOME_Evolution_ImporterListener_BUSY,
-							       more, ev);
-		return;
-	}
-
-	oli->busy = TRUE;
-	header = g_new (oe_msg_segmentheader, 1);
-	fread (header, 16, 1, oli->handle);
-
-	/* Write a From line */
-	mail_importer_add_line (importer, 
-				"From evolution-outlook-importer", FALSE);
-	end_pos = oli->pos + header->include;
-	if (end_pos >= oli->size) {
-		end_pos = oli->size;
-		more = FALSE;
-	}
-
-	oli->pos += 4;
-
-	cb = g_new (char, 4);
-	sfull = g_new (char, 65536);
-	s = sfull;
-
-	while (oli->pos < end_pos) {
-		fread (cb, 1, 4, oli->handle);
-		for (i = 0; i < 4; i++, oli->pos++) {
-			if (*(cb + i ) != 0x0d) {
-				*s++ = *(cb + i);
-
-				if (*(cb + i) == 0x0a) {
-					*s = '\0';
-					mail_importer_add_line (importer, 
-								sfull, FALSE);
-					s = sfull;
-				}
-			}
-		}
-	}
-
-	if (s != sfull) {
-		*s = '\0';
-		mail_importer_add_line (importer, sfull, FALSE);
-		s = sfull;
-	}
-
-	mail_importer_add_line (importer, "\n", TRUE);
-
-	oli->pos = end_pos;
-	fseek (oli->handle, oli->pos, SEEK_SET);
-
-	g_free (header);
-	g_free (sfull);
-	g_free (cb);
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener, 
-						       GNOME_Evolution_ImporterListener_OK,
-						       more, ev);
-	if (more == FALSE) {
-		CamelException *ex;
-
-		ex = camel_exception_new ();
-		camel_folder_thaw (importer->folder);
-		camel_folder_sync (importer->folder, FALSE, ex);
-		camel_exception_free (ex);
-		fclose (oli->handle);
-		oli->handle = NULL;
-	}
-
-	oli->busy = FALSE;
-	return;
-}
-
-
-/* EvolutionImporterFactory methods */
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	FILE *handle;
-	int signature[4];
-
-	/* Outlook Express sniffer.
-	   Taken from liboe 0.92 (STABLE)
-	   Copyright (C) 2000 Stephan B. Nedregård (stephan@micropop.com) */
-
-	handle = fopen (filename, "rb");
-	if (handle == NULL)
-		return FALSE; /* Can't open file: Can't support it :) */
-
-	  /* SIGNATURE */
-	fread (&signature, 16, 1, handle); 
-	if ((signature[0]!=0xFE12ADCF) || /* OE 5 & OE 5 BETA SIGNATURE */
-	    (signature[1]!=0x6F74FDC5) ||
-	    (signature[2]!=0x11D1E366) ||
-	    (signature[3]!=0xC0004E9A)) {
-		if ((signature[0]==0x36464D4A) &&
-		    (signature[1]==0x00010003)) /* OE4 SIGNATURE */ {
-			fclose (handle);
-			return TRUE; /* OE 4 */
-		}
-		fclose (handle);
-		return FALSE; /* Not Outlook 4 or 5 */
-	}
-
-	fclose (handle);
-	return FALSE; /* Can't handle OE 5 yet */
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     OutlookImporter *oli)
-{
-	MailImporter *importer;
-
-	importer = (MailImporter *) oli;
-	if (importer->folder)
-		camel_object_unref (CAMEL_OBJECT (importer->folder));
-
-	g_free (oli->filename);
-	if (oli->handle)
-		fclose (oli->handle);
-
-	g_free (oli);
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *eimporter,
-	      const char *filename,
-	      void *closure)
-{
-	OutlookImporter *oli;
-	MailImporter *importer;
-	struct stat buf;
-	long pos = 0x54;
-
-	oli = (OutlookImporter *) closure;
-	importer = (MailImporter *) oli;
-
-	oli->filename = g_strdup (filename);
-	/* Will return TRUE if oe4 format */
-	oli->oe4 = support_format_fn (NULL, filename, NULL);
-	if (oli->oe4 == FALSE) {
-		g_warning ("Not OE4 format");
-		return FALSE;
-	}
-
-	oli->handle = fopen (filename, "rb");
-	if (oli->handle == NULL) {
-		g_warning ("Cannot open the file");
-		return FALSE;
-	}
-
-	/* Get size of file */
-	if (stat (filename, &buf) == -1) {
-		g_warning ("Cannot stat file");
-		return FALSE;
-	}
-	
-	oli->size = buf.st_size;
-
-	/* Set the fposition to the begining */
-	fseek (oli->handle, pos, SEEK_SET);
-	oli->pos = pos;
-
-	importer->mstream = NULL;
-
-	importer->folder = mail_tool_get_local_inbox (NULL);
-
-	if (importer->folder == NULL){
-		g_warning ("Bad folder");
-		return FALSE;
-	}
-
-	camel_folder_freeze (importer->folder);
-	oli->busy = FALSE;
-	return TRUE;
-}
-
-BonoboObject *
-outlook_factory_fn (BonoboGenericFactory *_factory,
-		    void *closure)
-{
-	EvolutionImporter *importer;
-	OutlookImporter *oli;
-
-	oli = g_new0 (OutlookImporter, 1);
-
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, oli);
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), oli);
-
-	return BONOBO_OBJECT (importer);
-}
-
-
-
diff --git a/mail/evolution-outlook-importer.h b/mail/evolution-outlook-importer.h
deleted file mode 100644
index 75515d2972..0000000000
--- a/mail/evolution-outlook-importer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-outlook-importer.h
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EVOLUTION_OUTLOOK_IMPORTER_H_
-#define _EVOLUTION_OUTLOOK_IMPORTER_H_
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-
-#define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-
-BonoboObject *outlook_factory_fn (BonoboGenericFactory *_factory,
-				  void *closure);
-
-#endif
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
deleted file mode 100644
index 197baf2f19..0000000000
--- a/mail/folder-browser-factory.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-ui-component.h>
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "widgets/menus/gal-view-menus.h"
-
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-
-#include "folder-browser-factory.h"
-
-#include "folder-browser.h"
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "shell/Evolution.h"
-#include "mail-config.h"
-#include "mail-ops.h"
-#include "mail-session.h"
-
-/* The FolderBrowser BonoboControls we have.  */
-static EList *control_list = NULL;
-
-/*
- * Add with 'folder_browser'
- */
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("PrintMessage", print_msg),
-	BONOBO_UI_UNSAFE_VERB ("PrintPreviewMessage", print_preview_msg),
-	
-	/* Edit Menu */
-	BONOBO_UI_UNSAFE_VERB ("EditSelectAll", select_all),
-	BONOBO_UI_UNSAFE_VERB ("EditInvertSelection", invert_selection),
-	
-	/* Settings Menu */
-	BONOBO_UI_UNSAFE_VERB ("SetMailFilter", filter_edit),
-	BONOBO_UI_UNSAFE_VERB ("SetVFolder", vfolder_edit_vfolders),
-	BONOBO_UI_UNSAFE_VERB ("SetMailConfig", providers_config),
-	BONOBO_UI_UNSAFE_VERB ("SetSubscribe", manage_subscriptions),
-	BONOBO_UI_UNSAFE_VERB ("SetForgetPwd", mail_session_forget_passwords),
-	
-	/* Message Menu */
-	BONOBO_UI_UNSAFE_VERB ("MessageOpenNewWnd", view_message),
-	BONOBO_UI_UNSAFE_VERB ("MessageEdit", edit_message),
-	BONOBO_UI_UNSAFE_VERB ("MessageSaveAs", save_msg),
-	BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg),
-	BONOBO_UI_UNSAFE_VERB ("MessageReplySndr", reply_to_sender),
-	BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all),
-	BONOBO_UI_UNSAFE_VERB ("MessageForwardInlined", forward_inlined),
-	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached),
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen),
-	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen),
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageMove", move_msg),
-	BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg),
-	BONOBO_UI_UNSAFE_VERB ("MessageDelete", delete_msg),
-	BONOBO_UI_UNSAFE_VERB ("MessageUndelete", undelete_msg),
-	
-	/*BONOBO_UI_UNSAFE_VERB ("MessageAddSenderToAddressBook", addrbook_sender),*/
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageApplyFilters", apply_filters),
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageVFolderSubj", vfolder_subject),
-	BONOBO_UI_UNSAFE_VERB ("MessageVFolderSndr", vfolder_sender),
-	BONOBO_UI_UNSAFE_VERB ("MessageVFolderRecip", vfolder_recipient),
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageFilterSubj", filter_subject),
-	BONOBO_UI_UNSAFE_VERB ("MessageFilterSndr", filter_sender),
-	BONOBO_UI_UNSAFE_VERB ("MessageFilterRecip", filter_recipient),
-	
-	BONOBO_UI_UNSAFE_VERB ("MessageHideClear", hide_none),
-	BONOBO_UI_UNSAFE_VERB ("MessageHideRead", hide_read),
-	BONOBO_UI_UNSAFE_VERB ("MessageHideDeleted", hide_deleted),
-	BONOBO_UI_UNSAFE_VERB ("MessageHideSelected", hide_selected),
-	
-	/* Folder Menu */
-	BONOBO_UI_UNSAFE_VERB ("FolderExpunge", expunge_folder),
-	BONOBO_UI_UNSAFE_VERB ("FolderConfig", configure_folder),
-	
-	/* Toolbar specific */
-	BONOBO_UI_UNSAFE_VERB ("MailGet", send_receive_mail),
-	BONOBO_UI_UNSAFE_VERB ("MailCompose", compose_msg),
-	BONOBO_UI_UNSAFE_VERB ("MailStop", stop_threads),
-	BONOBO_UI_UNSAFE_VERB ("MailPrevious", previous_msg),
-	BONOBO_UI_UNSAFE_VERB ("MailNext", next_msg),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *uic,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	if (pixbuf == NULL) {
-		g_warning ("Cannot load image -- %s", path);
-		g_free (path);
-		return;
-	}
-
-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-	set_pixmap (uic, "/menu/File/Print/Print", "16_print.xpm");
-	set_pixmap (uic, "/menu/File/Print/Print Preview", "16_print.xpm");
-
-	set_pixmap (uic, "/menu/Component/Message/MessageEdit", "16_edit.xpm");
-	set_pixmap (uic, "/menu/Component/Message/MessageSaveAs", "16_save.xpm");
-	set_pixmap (uic, "/menu/Component/Message/MessagePrint", "16_print.xpm");
-	set_pixmap (uic, "/menu/Component/Message/MessageMove", "16_move_message.xpm");
-	set_pixmap (uic, "/menu/Component/Message/MessageReplyAll", "16_reply_to_all.xpm");
-	set_pixmap (uic, "/menu/Component/Message/MessageReplySndr", "16_reply.xpm");
-
-	set_pixmap (uic, "/menu/Component/Folder/FolderConfig", "16_configure_folder.xpm");
-
-	set_pixmap (uic, "/menu/Settings/SetMailConfig", "16_configure_mail.xpm");
-
-	set_pixmap (uic, "/Toolbar/MailGet", "buttons/fetch-mail.png");
-	set_pixmap (uic, "/Toolbar/MailCompose", "buttons/compose-message.png");
-	set_pixmap (uic, "/Toolbar/Reply", "buttons/reply.png");
-	set_pixmap (uic, "/Toolbar/ReplyAll", "buttons/reply-to-all.png");
-	set_pixmap (uic, "/Toolbar/Forward", "buttons/forward.png");
-	set_pixmap (uic, "/Toolbar/Move", "buttons/move-message.png");
-	set_pixmap (uic, "/Toolbar/Copy", "buttons/copy-message.png");
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	FolderBrowser *fb = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		e_table_set_state_object(e_table_scrolled_get_table(E_TABLE_SCROLLED(fb->message_list)), GAL_VIEW_ETABLE(view)->state);
-	}
-}
-
-static void
-folder_browser_setup_menus (FolderBrowser *fb,
-			    BonoboUIComponent *uic)
-{
-	GalViewCollection *collection;
-	GalViewMenus *views;
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *spec_string;
-
-	collection = gal_view_collection_new();
-	/* FIXME: Memory leak. */
-	gal_view_collection_set_storage_directories(collection,
-						    EVOLUTION_DATADIR "/evolution/views/mail/",
-						    gnome_util_prepend_user_home("/evolution/views/mail/"));
-
-	spec_string = message_list_get_layout(fb->message_list);
-	spec = e_table_specification_new();
-	e_table_specification_load_from_string(spec, spec_string);
-	g_free(spec_string);
-
-	factory = gal_view_factory_etable_new(spec);
-	gal_view_collection_add_factory(collection, factory);
-	gtk_object_sink(GTK_OBJECT(factory));
-
-	gal_view_collection_load(collection);
-
-	views = gal_view_menus_new(collection);
-	gal_view_menus_apply(views, uic, NULL); /* This function probably needs to sink the views object. */
-	gtk_signal_connect(GTK_OBJECT(collection), "display_view",
-			   display_view, fb);
-	/*	gtk_object_sink(GTK_OBJECT(views)); */
-
-	gtk_object_sink(GTK_OBJECT(collection));
-}
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  FolderBrowser     *fb)
-{
-	GtkWidget         *folder_browser;
-	Bonobo_UIContainer container;
-
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, container);
-	bonobo_object_release_unref (container, NULL);
-
-	g_assert (container == bonobo_ui_component_get_container (uic));
-	g_return_if_fail (container != CORBA_OBJECT_NIL);
-		
-	folder_browser = bonobo_control_get_widget (control);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, folder_browser);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (
-		uic, EVOLUTION_DATADIR,
-		"evolution-mail.xml", "evolution-mail");
-
-	if (mail_config_get_thread_list ())
-		bonobo_ui_component_set_prop (
-			uic, "/commands/ViewThreaded", "state", "1", NULL);
-	else
-		bonobo_ui_component_set_prop (
-			uic, "/commands/ViewThreaded", "state", "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		uic, "ViewThreaded",
-		folder_browser_toggle_threads, folder_browser);
-	
-	if (mail_config_get_view_source ())
-		bonobo_ui_component_set_prop (uic, "/commands/ViewSource",
-					      "state", "1", NULL);
-	else
-		bonobo_ui_component_set_prop (uic, "/commands/ViewSource",
-					      "state", "0", NULL);
-	
-	bonobo_ui_component_add_listener (uic, "ViewSource",
-					  folder_browser_toggle_view_source,
-					  folder_browser);
-
-	folder_browser_setup_menus (fb, uic);
-	
-	update_pixmaps (uic);
-
-        bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", "0", NULL);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-static void
-control_deactivate (BonoboControl     *control,
-		    BonoboUIComponent *uic,
-		    FolderBrowser     *fb)
-{
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-
-	if (fb->folder)
-		mail_sync_folder (fb->folder, NULL, NULL);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	if (activate)
-		control_activate (control, uic, user_data);
-	else
-		control_deactivate (control, uic, user_data);
-}
-
-static void
-control_destroy_cb (BonoboControl *control,
-		    GtkObject     *folder_browser)
-{
-	gtk_object_destroy (folder_browser);
-}
-
-static void
-browser_destroy_cb (FolderBrowser *fb,
-		    BonoboControl *control)
-{
-	EIterator *it;
-
-	/* We do this from browser_destroy_cb rather than
-	 * control_destroy_cb because currently, the controls
-	 * don't seem to all get destroyed properly at quit
-	 * time (but the widgets get destroyed by X). FIXME.
-	 */
-
-	for (it = e_list_get_iterator (control_list); e_iterator_is_valid (it); e_iterator_next (it)) {
-		if (e_iterator_get (it) == control) {
-			e_iterator_delete (it);
-			break;
-		}
-	}
-	gtk_object_unref (GTK_OBJECT (it));
-}
-
-BonoboControl *
-folder_browser_factory_new_control (const char *uri,
-				    const GNOME_Evolution_Shell shell)
-{
-	BonoboControl *control;
-	GtkWidget *folder_browser;
-
-	folder_browser = folder_browser_new (shell);
-	if (folder_browser == NULL)
-		return NULL;
-
-	if (!folder_browser_set_uri (FOLDER_BROWSER (folder_browser), uri)) {
-		gtk_object_sink (GTK_OBJECT (folder_browser));
-		return NULL;
-	}
-
-	gtk_widget_show (folder_browser);
-	
-	control = bonobo_control_new (folder_browser);
-	
-	if (control == NULL) {
-		gtk_object_destroy (GTK_OBJECT (folder_browser));
-		return NULL;
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, folder_browser);
-
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    control_destroy_cb, folder_browser);
-	gtk_signal_connect (GTK_OBJECT (folder_browser), "destroy",
-			    browser_destroy_cb, control);
-
-	if (!control_list)
-		control_list = e_list_new (NULL, NULL, NULL);
-
-	e_list_append (control_list, control);
-
-	return control;
-}
-
-EList *
-folder_browser_factory_get_control_list (void)
-{
-	if (!control_list)
-		control_list = e_list_new (NULL, NULL, NULL);
-	return control_list;
-}
diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h
deleted file mode 100644
index f55a069ede..0000000000
--- a/mail/folder-browser-factory.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#ifndef _FOLDER_BROWSER_FACTORY_H
-#define _FOLDER_BROWSER_FACTORY_H
-
-#include <bonobo.h>
-#include "Evolution.h"
-#include "e-util/e-list.h"
-
-BonoboControl *folder_browser_factory_new_control       (const char            *uri,
-							 const GNOME_Evolution_Shell  shell);
-EList         *folder_browser_factory_get_control_list  (void);
-
-#endif /* _FOLDER_BROWSER_FACTORY_H */
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
deleted file mode 100644
index 324599a726..0000000000
--- a/mail/folder-browser.c
+++ /dev/null
@@ -1,946 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * folder-browser.c: Folder browser top level component
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <ctype.h>
-#include <gnome.h>
-#include "e-util/e-sexp.h"
-#include "folder-browser.h"
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "mail-tools.h"
-#include "message-list.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-#include "mail-mlist-magic.h"
-#include "mail-mt.h"
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-paned/e-vpaned.h>
-
-#include "filter/vfolder-rule.h"
-#include "filter/vfolder-context.h"
-#include "filter/filter-option.h"
-#include "filter/filter-input.h"
-
-#include "mail-search-dialogue.h"
-
-#include "mail-local.h"
-#include "mail-config.h"
-
-#include <gal/widgets/e-popup-menu.h>
-
-#define d(x) x
-
-#define PARENT_TYPE (gtk_table_get_type ())
-
-static void fb_resize_cb (GtkWidget *w, GtkAllocation *a);
-
-static GtkObjectClass *folder_browser_parent_class;
-
-static void
-folder_browser_destroy (GtkObject *object)
-{
-	FolderBrowser *folder_browser;
-	CORBA_Environment ev;
-	
-	folder_browser = FOLDER_BROWSER (object);
-	
-	CORBA_exception_init (&ev);
-	
-	if (folder_browser->search_full)
-		gtk_object_unref (GTK_OBJECT (folder_browser->search_full));
-	
-	if (folder_browser->shell != CORBA_OBJECT_NIL)
-		CORBA_Object_release (folder_browser->shell, &ev);
-	
-	g_free (folder_browser->uri);
-	
-	if (folder_browser->folder) {
-		mail_sync_folder (folder_browser->folder, NULL, NULL);
-		camel_object_unref (CAMEL_OBJECT (folder_browser->folder));
-	}
-	
-	if (folder_browser->message_list)
-		gtk_widget_destroy (GTK_WIDGET (folder_browser->message_list));
-	
-	if (folder_browser->mail_display)
-		gtk_widget_destroy (GTK_WIDGET (folder_browser->mail_display));
-	
-	CORBA_exception_free (&ev);
-	
-	folder_browser_parent_class->destroy (object);
-}
-
-static void
-folder_browser_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = folder_browser_destroy;
-	
-	folder_browser_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-/*
- * static gboolean
- * folder_browser_load_folder (FolderBrowser *fb, const char *name)
- * {
- * 	CamelFolder *new_folder;
- * 
- * 	new_folder = mail_tool_uri_to_folder_noex (name);
- * 
- * 	if (!new_folder)
- * 		return FALSE;
- * 
- * 	if (fb->folder)
- * 		camel_object_unref (CAMEL_OBJECT (fb->folder));
- * 	fb->folder = new_folder;
- * 	message_list_set_folder (fb->message_list, new_folder);
- * 	return TRUE;
- * }
- */
-
-static void
-update_unread_count_main(CamelObject *object, gpointer event_data, gpointer user_data)
-{
-	CamelFolder *folder = (CamelFolder *)object;
-	FolderBrowser *fb = user_data;
-	EvolutionStorage *storage;
-	char *name;
-
-	storage = mail_lookup_storage (folder->parent_store);
-
-	if (fb->unread_count == 0)
-		name = g_strdup (camel_folder_get_name (folder));
-	else
-		name = g_strdup_printf ("%s (%d)", camel_folder_get_name (folder), fb->unread_count);
-
-	evolution_storage_update_folder_by_uri (storage, fb->uri, name, fb->unread_count != 0);
-	g_free (name);
-	gtk_object_unref (GTK_OBJECT (storage));
-}
-
-static void
-update_unread_count(CamelObject *object, gpointer event_data, gpointer user_data)
-{
-	CamelFolder *folder = (CamelFolder *)object;
-	FolderBrowser *fb = user_data;
-	int unread;
-
-	unread = camel_folder_get_unread_message_count (folder);
-	if (unread == fb->unread_count)
-		return;
-	fb->unread_count = unread;
-	mail_proxy_event (update_unread_count_main, object, event_data, user_data);
-}
-
-static void
-got_folder(char *uri, CamelFolder *folder, void *data)
-{
-	FolderBrowser *fb = data;
-	EvolutionStorage *storage;
-
-	printf("got folder '%s' = %p\n", uri, folder);
-
-	if (fb->folder == folder)
-		goto done;
-
-	if (fb->folder)
-		camel_object_unref((CamelObject *)fb->folder);
-	g_free(fb->uri);
-	fb->uri = g_strdup(uri);
-	fb->folder = folder;
-
-	if (folder == NULL)
-		goto done;
-
-	camel_object_ref((CamelObject *)folder);
-
-	if ((storage = mail_lookup_storage (folder->parent_store))) {
-		gtk_object_unref (GTK_OBJECT (storage));
-		fb->unread_count = camel_folder_get_unread_message_count (folder);
-		update_unread_count_main ((CamelObject *)folder, NULL, fb);
-		camel_object_hook_event ((CamelObject *)folder, "message_changed",
-					 update_unread_count, fb);
-		camel_object_hook_event ((CamelObject *)folder, "folder_changed",
-					 update_unread_count, fb);
-	}
-
-	gtk_widget_set_sensitive(GTK_WIDGET(fb->search), camel_folder_has_search_capability(folder));
-	message_list_set_threaded(fb->message_list, mail_config_get_thread_list());
-	message_list_set_folder(fb->message_list, folder);
-done:
-	gtk_object_unref((GtkObject *)fb);
-
-	/* Sigh, i dont like this (it can be set in reconfigure folder),
-	   but its just easier right now to do it this way */
-	fb->reconfigure = FALSE;
-}
-
-gboolean
-folder_browser_set_uri (FolderBrowser *folder_browser, const char *uri)
-{
-	if (uri && *uri) {
-		gtk_object_ref((GtkObject *)folder_browser);
-		mail_get_folder(uri, got_folder, folder_browser);
-	} else {
-		/* Sigh, i dont like this (it can be set in reconfigure folder),
-		   but its just easier right now to do it this way */
-		folder_browser->reconfigure = FALSE;
-	}
-
-	return TRUE;
-}
-
-void
-folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show_message_preview)
-{
-	if (folder_browser->preview_shown == show_message_preview)
-		return;
-
-	g_warning ("FIXME: implement me");
-}
-
-enum {
-	ESB_SAVE,
-};
-
-static ESearchBarItem folder_browser_search_menu_items[] = {
-	E_FILTERBAR_RESET,
-	E_FILTERBAR_SAVE,
-	{ N_("Store search as vFolder"),  ESB_SAVE     },
-	{ NULL,                           -1           }
-};
-
-static void
-folder_browser_search_menu_activated (ESearchBar *esb, int id, FolderBrowser *fb)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-
-	printf("menyu activated\n");
-
-	switch (id) {
-	case ESB_SAVE:
-		printf("Save vfolder\n");
-		if (efb->current_query) {
-			FilterRule *rule = vfolder_clone_rule(efb->current_query);			
-
-			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
-			vfolder_rule_add_source((VfolderRule *)rule, fb->uri);
-			vfolder_gui_add_rule((VfolderRule *)rule);
-		}
-		break;
-	}
-}
-
-static void folder_browser_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data)
-{
-	GList *partl;
-
-	/* we scan the parts of a rule, and set all the types we know about to the query string */
-	partl = rule->parts;
-	while (partl) {
-		FilterPart *part = partl->data;
-
-		if (!strcmp(part->name, "subject")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "subject");
-			if (input)
-				filter_input_set_value(input, query);
-		} else if (!strcmp(part->name, "body")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "word");
-			if (input)
-				filter_input_set_value(input, query);
-		} else if(!strcmp(part->name, "sender")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "sender");
-			if (input)
-				filter_input_set_value(input, query);
-		}
-		
-		partl = partl->next;
-	}
-	printf("configuring search for search string '%s', rule is '%s'\n", query, rule->name);
-}
-
-static void
-folder_browser_search_query_changed (ESearchBar *esb, FolderBrowser *fb)
-{
-	char *search_word;
-
-	printf("query changed\n");
-
-	gtk_object_get (GTK_OBJECT (esb),
-			"query", &search_word,
-			NULL);
-
-	message_list_set_search (fb->message_list, search_word);
-
-	printf("query is %s\n", search_word);
-	g_free(search_word);
-	return;
-}
-
-void
-folder_browser_toggle_threads (BonoboUIComponent           *component,
-			       const char                  *path,
-			       Bonobo_UIComponent_EventType type,
-			       const char                  *state,
-			       gpointer                     user_data)
-{
-	FolderBrowser *fb = user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	mail_config_set_thread_list (atoi (state));
-	message_list_set_threaded (fb->message_list, atoi (state));
-}
-
-void
-folder_browser_toggle_view_source (BonoboUIComponent           *component,
-				   const char                  *path,
-				   Bonobo_UIComponent_EventType type,
-				   const char                  *state,
-				   gpointer                     user_data)
-{
-	FolderBrowser *fb = user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	mail_config_set_view_source (atoi (state));
-	mail_display_redisplay (fb->mail_display, TRUE);
-}
-
-void
-vfolder_subject (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_SUBJECT, fb->uri);
-}
-
-void
-vfolder_sender (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_FROM, fb->uri);
-}
-
-void
-vfolder_recipient (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_TO, fb->uri);
-}
-
-void
-vfolder_mlist (GtkWidget *w, FolderBrowser *fb)
-{
-	char *name;
-
-	g_return_if_fail (fb->mail_display->current_message != NULL);
-
-	name = header_raw_check_mailing_list(&((CamelMimePart *)fb->mail_display->current_message)->headers);
-	if (name) {
-		vfolder_gui_add_from_mlist(fb->mail_display->current_message, name, fb->uri);
-		g_free(name);
-	}
-}
-
-void
-filter_subject (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_SUBJECT);
-}
-
-void
-filter_sender (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_FROM);
-}
-
-void
-filter_recipient (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_TO);
-}
-
-void
-filter_mlist (GtkWidget *w, FolderBrowser *fb)
-{
-	char *name;
-
-	g_return_if_fail (fb->mail_display->current_message != NULL);
-
-	name = header_raw_check_mailing_list(&((CamelMimePart *)fb->mail_display->current_message)->headers);
-	if (name) {
-		filter_gui_add_from_mlist(name);
-		g_free(name);
-	}
-}
-
-void
-hide_none(GtkWidget *w, FolderBrowser *fb)
-{
-	message_list_hide_clear(fb->message_list);
-}
-
-void
-hide_selected(GtkWidget *w, FolderBrowser *fb)
-{
-	GPtrArray *uids;
-	int i;
-
-	uids = g_ptr_array_new();
-	message_list_foreach(fb->message_list, enumerate_msg, uids);
-	message_list_hide_uids(fb->message_list, uids);
-	for (i=0; i<uids->len; i++)
-		g_free(uids->pdata[i]);
-	g_ptr_array_free(uids, TRUE);
-}
-
-void
-hide_deleted(GtkWidget *w, FolderBrowser *fb)
-{
-	MessageList *ml = fb->message_list;
-
-	message_list_hide_add(ml, "(match-all (system-flag \"deleted\"))", ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-void
-hide_read(GtkWidget *w, FolderBrowser *fb)
-{
-	MessageList *ml = fb->message_list;
-
-	message_list_hide_add(ml, "(match-all (system-flag \"seen\"))", ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-/* dum de dum, about the 3rd copy of this function throughout the mailer/camel */
-static const char *
-strip_re(const char *subject)
-{
-	const unsigned char *s, *p;
-	
-	s = (unsigned char *) subject;
-	
-	while (*s) {
-		while(isspace (*s))
-			s++;
-		if (s[0] == 0)
-			break;
-		if ((s[0] == 'r' || s[0] == 'R')
-		    && (s[1] == 'e' || s[1] == 'E')) {
-			p = s+2;
-			while (isdigit(*p) || (ispunct(*p) && (*p != ':')))
-				p++;
-			if (*p == ':') {
-				s = p + 1;
-			} else
-				break;
-		} else
-			break;
-	}
-	return (char *) s;
-}
-
-void
-hide_subject(GtkWidget *w, FolderBrowser *fb)
-{
-	const char *subject;
-	GString *expr;
-
-	if (fb->mail_display->current_message) {
-		subject = camel_mime_message_get_subject(fb->mail_display->current_message);
-		if (subject) {
-			subject = strip_re(subject);
-			if (subject && subject[0]) {
-				expr = g_string_new("(match-all (header-contains \"subject\" ");
-				e_sexp_encode_string(expr, subject);
-				g_string_append(expr, "))");
-				message_list_hide_add(fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
-				g_string_free(expr, TRUE);
-				return;
-			}
-		}
-	}
-}
-
-void
-hide_sender(GtkWidget *w, FolderBrowser *fb)
-{
-	const CamelInternetAddress *from;
-	const char *real, *addr;
-	GString *expr;
-
-	if (fb->mail_display->current_message) {
-		from = camel_mime_message_get_from(fb->mail_display->current_message);
-		if (camel_internet_address_get(from, 0, &real, &addr)) {
-			expr = g_string_new("(match-all (header-contains \"from\" ");
-			e_sexp_encode_string(expr, addr);
-			g_string_append(expr, "))");
-			message_list_hide_add(fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
-			g_string_free(expr, TRUE);
-			return;
-		}
-	}
-}
-
-/* handle context menu over message-list */
-static gint
-on_right_click (ETable *table, gint row, gint col, GdkEvent *event, FolderBrowser *fb)
-{
-	extern CamelFolder *drafts_folder;
-	CamelMessageInfo *info;
-	GPtrArray *uids;
-	int enable_mask = 0;
-	int i;
-	char *mailing_list_name = NULL;
-	char *subject_match = NULL, *from_match = NULL;
-
-#define MLIST_VFOLDER (3)
-#define MLIST_FILTER (8)
-	EPopupMenu filter_menu[] = {
-		{ _("VFolder on Subject"),         NULL, GTK_SIGNAL_FUNC (vfolder_subject),   NULL,  2 },
-		{ _("VFolder on Sender"),          NULL, GTK_SIGNAL_FUNC (vfolder_sender),    NULL,  2 },
-		{ _("VFolder on Recipients"),      NULL, GTK_SIGNAL_FUNC (vfolder_recipient), NULL,  2 },
-		{ _("VFolder on Mailing List"),    NULL, GTK_SIGNAL_FUNC (vfolder_mlist),     NULL,  66 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		{ _("Filter on Subject"),          NULL, GTK_SIGNAL_FUNC (filter_subject),    NULL,  2 },
-		{ _("Filter on Sender"),           NULL, GTK_SIGNAL_FUNC (filter_sender),     NULL,  2 },
-		{ _("Filter on Recipients"),       NULL, GTK_SIGNAL_FUNC (filter_recipient),  NULL,  2 },
-		{ _("Filter on Mailing List"),     NULL, GTK_SIGNAL_FUNC (filter_mlist),      NULL, 66 },
-		{ NULL,                            NULL, NULL,                                NULL,  0 }
-	};
-
-
-	EPopupMenu menu[] = {
-		{ _("Open"),                       NULL, GTK_SIGNAL_FUNC (view_msg),          NULL,  0 },
-		{ _("Edit"),                       NULL, GTK_SIGNAL_FUNC (edit_msg),          NULL,  1 },
-		{ _("Save As..."),                 NULL, GTK_SIGNAL_FUNC (save_msg),          NULL,  0 },
-		{ _("Print"),                      NULL, GTK_SIGNAL_FUNC (print_msg),         NULL,  0 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		{ _("Reply to Sender"),            NULL, GTK_SIGNAL_FUNC (reply_to_sender),   NULL,  0 },
-		{ _("Reply to All"),               NULL, GTK_SIGNAL_FUNC (reply_to_all),      NULL,  0 },
-		{ _("Forward"),                    NULL, GTK_SIGNAL_FUNC (forward_attached),  NULL,  0 },
-		{ _("Forward inline"),             NULL, GTK_SIGNAL_FUNC (forward_inlined),   NULL,  0 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		{ _("Mark as Read"),               NULL, GTK_SIGNAL_FUNC (mark_as_seen),      NULL,  4 },
-		{ _("Mark as Unread"),             NULL, GTK_SIGNAL_FUNC (mark_as_unseen),    NULL,  8 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		{ _("Move to Folder..."),          NULL, GTK_SIGNAL_FUNC (move_msg),          NULL,  0 },
-		{ _("Copy to Folder..."),          NULL, GTK_SIGNAL_FUNC (copy_msg),          NULL,  0 },
-		{ _("Delete"),                     NULL, GTK_SIGNAL_FUNC (delete_msg),        NULL, 16 },
-		{ _("Undelete"),                   NULL, GTK_SIGNAL_FUNC (undelete_msg),      NULL, 32 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		/*{ _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-		  { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },*/
-		{ _("Apply Filters"),              NULL, GTK_SIGNAL_FUNC (apply_filters),     NULL,  0 },
-		{ "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-		{ _("Create Rule From Message"),   NULL, GTK_SIGNAL_FUNC (NULL),       filter_menu,  2 },
-		{ NULL,                            NULL, NULL,                                NULL,  0 }
-	};
-	
-	if (fb->reconfigure) {
-		enable_mask = 0;
-		goto display_menu;
-	}
-	
-	if (fb->folder != drafts_folder)
-		enable_mask |= 1;
-	
-	if (fb->mail_display->current_message == NULL) {
-		enable_mask |= 2;
-		mailing_list_name = NULL;
-	} else {
-		const char *subject, *real, *addr;
-		const CamelInternetAddress *from;
-
-		mailing_list_name = header_raw_check_mailing_list(&((CamelMimePart *)fb->mail_display->current_message)->headers);
-
-		if ((subject = camel_mime_message_get_subject(fb->mail_display->current_message))
-		    && (subject = strip_re(subject))
-		    && subject[0])
-			subject_match = g_strdup(subject);
-
-		if ((from = camel_mime_message_get_from(fb->mail_display->current_message))
-		    && camel_internet_address_get(from, 0, &real, &addr)
-		    && addr && addr[0])
-			from_match = g_strdup(addr);
-	}
-	
-	/* get a list of uids */
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	if (uids->len >= 1) {
-		/* gray-out any items we don't need */
-		gboolean have_deleted = FALSE;
-		gboolean have_undeleted = FALSE;
-		gboolean have_seen = FALSE;
-		gboolean have_unseen = FALSE;
-
-		for (i = 0; i < uids->len; i++) {
-			info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
-			if (info == NULL)
-				continue;
-
-			if (info->flags & CAMEL_MESSAGE_SEEN)
-				have_seen = TRUE;
-			else
-				have_unseen = TRUE;
-			
-			if (info->flags & CAMEL_MESSAGE_DELETED)
-				have_deleted = TRUE;
-			else
-				have_undeleted = TRUE;
-			
-			camel_folder_free_message_info(fb->folder, info);
-
-			if (have_seen && have_unseen && have_deleted && have_undeleted)
-				break;
-		}
-
-		if (!have_unseen)
-			enable_mask |= 4;
-		if (!have_seen)
-			enable_mask |= 8;
-		
-		if (!have_undeleted)
-			enable_mask |= 16;
-		if (!have_deleted)
-			enable_mask |= 32;
-	}
-
-	/* free uids */
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-
-display_menu:
-	
-	/* generate the "Filter on Mailing List menu item name */
-	if (mailing_list_name == NULL) {
-		enable_mask |= 64;
-		filter_menu[MLIST_FILTER].name = g_strdup (_("Filter on Mailing List"));
-		filter_menu[MLIST_VFOLDER].name = g_strdup (_("VFolder on Mailing List"));
-	} else {
-		filter_menu[MLIST_FILTER].name = g_strdup_printf (_("Filter on Mailing List (%s)"), mailing_list_name);
-		filter_menu[MLIST_VFOLDER].name = g_strdup_printf (_("VFolder on Mailing List (%s)"), mailing_list_name);
-		g_free(mailing_list_name);
-	}
-
-	e_popup_menu_run (menu, event, enable_mask, 0, fb);
-	
-	g_free(filter_menu[MLIST_FILTER].name);
-	g_free(filter_menu[MLIST_VFOLDER].name);
-
-	return TRUE;
-}
-
-static int
-etable_key (ETable *table, int row, int col, GdkEvent *ev, FolderBrowser *fb)
-{
-	if ((ev->key.state & !(GDK_SHIFT_MASK | GDK_LOCK_MASK)) != 0)
-		return FALSE;
-
-	switch (ev->key.keyval) {
-	case GDK_space:
-	case GDK_BackSpace:
-	{
-		GtkAdjustment *vadj;
-		gfloat page_size;
-
-		vadj = e_scroll_frame_get_vadjustment (fb->mail_display->scroll);
-		page_size = vadj->page_size - vadj->step_increment;
-
-		if (ev->key.keyval == GDK_BackSpace) {
-			if (vadj->value > vadj->lower + page_size)
-				vadj->value -= page_size;
-			else
-				vadj->value = vadj->lower;
-		} else {
-			if (vadj->value < vadj->upper - vadj->page_size - page_size)
-				vadj->value += page_size;
-			else
-				vadj->value = vadj->upper - vadj->page_size;
-		}
-
-		gtk_adjustment_value_changed (vadj);
-		return TRUE;
-	}
-	
-	case GDK_Delete:
-	case GDK_KP_Delete:
-		delete_msg (NULL, fb);
-		message_list_select (fb->message_list, row,
-				     MESSAGE_LIST_SELECT_NEXT,
-				     0, CAMEL_MESSAGE_DELETED);
-		return TRUE;
-
-	case 'n':
-	case 'N':
-		message_list_select (fb->message_list, row,
-				     MESSAGE_LIST_SELECT_NEXT,
-				     0, CAMEL_MESSAGE_SEEN);
-		return TRUE;
-
-	case 'p':
-	case 'P':
-		message_list_select (fb->message_list, row,
-				     MESSAGE_LIST_SELECT_PREVIOUS,
-				     0, CAMEL_MESSAGE_SEEN);
-		return TRUE;
-
-	case GDK_Menu:
-		on_right_click (table, row, col, ev, fb);
-		return TRUE;
-
-	default:
-		return FALSE;
-	}
-
-	return FALSE;
-}
-
-static void
-on_double_click (ETable *table, gint row, gint col, GdkEvent *event, FolderBrowser *fb)
-{
-	/* Ignore double-clicks on columns where single-click doesn't
-	 * just select.
-	 */
-	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
-		return;
-
-	view_msg (NULL, fb);
-}
-
-static void
-folder_browser_gui_init (FolderBrowser *fb)
-{
-	/* The panned container */
-	fb->vpaned = e_vpaned_new ();
-	gtk_widget_show (fb->vpaned);
-	
-	gtk_table_attach (GTK_TABLE (fb), fb->vpaned,
-			  0, 1, 1, 3,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-	
-	/* quick-search bar */
-	{
-		RuleContext *rc = (RuleContext *)rule_context_new ();
-		char *userrules = g_strdup_printf("%s/searches.xml", evolution_dir);
-		/* we reuse the vfolder types here, they should match */
-		char *systemrules = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-
-		rule_context_add_part_set((RuleContext *)rc, "partset", filter_part_get_type(),
-					  rule_context_add_part, rule_context_next_part);
-		
-		rule_context_add_rule_set((RuleContext *)rc, "ruleset", filter_rule_get_type(),
-					  rule_context_add_rule, rule_context_next_rule);
-	
-		fb->search = e_filter_bar_new(rc, systemrules, userrules, folder_browser_config_search, fb);
-		e_search_bar_set_menu((ESearchBar *)fb->search, folder_browser_search_menu_items);
-		/*e_search_bar_set_option((ESearchBar *)fb->search, folder_browser_search_option_items);*/
-		g_free(userrules);
-		g_free(systemrules);
-		gtk_object_unref((GtkObject *)rc);
-	}
-
-	gtk_widget_show (GTK_WIDGET (fb->search));
-	
-	gtk_signal_connect (GTK_OBJECT (fb->search), "query_changed",
-			    GTK_SIGNAL_FUNC (folder_browser_search_query_changed), fb);
-	gtk_signal_connect (GTK_OBJECT (fb->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (folder_browser_search_menu_activated), fb);
-	
-	gtk_table_attach (GTK_TABLE (fb), GTK_WIDGET (fb->search),
-			  0, 1, 0, 1,
-			  GTK_FILL | GTK_EXPAND,
-			  0,
-			  0, 0);
-	
-	e_paned_add1 (E_PANED (fb->vpaned), GTK_WIDGET (fb->message_list));
-	gtk_widget_show (GTK_WIDGET (fb->message_list));
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list), "size_allocate",
-	                    GTK_SIGNAL_FUNC (fb_resize_cb), NULL);
-	
-	e_paned_add2 (E_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display));
-	e_paned_set_position (E_PANED (fb->vpaned), mail_config_get_paned_size ());
-	gtk_widget_show (GTK_WIDGET (fb->mail_display));
-	gtk_widget_show (GTK_WIDGET (fb));
-}
-
-/* mark the message seen if the current message still matches */
-static gint 
-do_mark_seen (gpointer data)
-{
-	FolderBrowser *fb = data;
-
-	if (fb->new_uid && fb->loaded_uid
-	    && strcmp(fb->new_uid, fb->loaded_uid) == 0) {
-		camel_folder_set_message_flags(fb->folder, fb->new_uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-	}
-
-	return FALSE;
-}
-
-/* callback when we have the message to display, after async loading it (see below) */
-/* if we have pending uid's, it means another was selected before we finished displaying
-   the last one - so we cycle through and start loading the pending one immediately now */
-static void done_message_selected(CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data)
-{
-	FolderBrowser *fb = data;
-	int timeout = mail_config_get_mark_as_seen_timeout ();
-
-	if (folder != fb->folder)
-		return;
-
-	mail_display_set_message(fb->mail_display, (CamelMedium *)msg);
-
-	/* pain, if we have pending stuff, re-run */
-	if (fb->pending_uid) {	
-		g_free(fb->loading_uid);
-		fb->loading_uid = fb->pending_uid;
-		fb->pending_uid = NULL;
-
-		mail_get_message(fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
-		return;
-	}
-
-	g_free(fb->loaded_uid);
-	fb->loaded_uid = fb->loading_uid;
-	fb->loading_uid = NULL;
-
-	/* if we are still on the same message, do the 'idle read' thing */
-	if (fb->seen_id)
-		gtk_timeout_remove(fb->seen_id);
-
-	if (msg) {
-		if (timeout > 0)
-			fb->seen_id = gtk_timeout_add(timeout, do_mark_seen, fb);
-		else
-			do_mark_seen(fb);
-	}
-}
-
-/* ok we waited enough, display it anyway (see below) */
-static gboolean
-do_message_selected(FolderBrowser *fb)
-{
-	d(printf ("selecting uid %s (delayed)\n", fb->new_uid));
-
-	/* keep polling if we are busy */
-	if (fb->reconfigure)
-		return TRUE;
-
-	fb->loading_id = 0;
-
-	/* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */
-	if (fb->loading_uid) {
-		g_free(fb->pending_uid);
-		fb->pending_uid = g_strdup(fb->new_uid);
-	} else {
-		if (fb->new_uid) {
-			fb->loading_uid = g_strdup(fb->new_uid);
-			mail_get_message(fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
-		} else {
-			mail_display_set_message(fb->mail_display, NULL);
-		}
-	}
-
-	return FALSE;
-}
-
-/* when a message is selected, wait a while before trying to display it */
-static void
-on_message_selected (MessageList *ml, const char *uid, FolderBrowser *fb)
-{
-	d(printf ("selecting uid %s (direct)\n", uid));
-
-	if (fb->loading_id != 0)
-		gtk_timeout_remove(fb->loading_id);
-
-	g_free(fb->new_uid);
-	fb->new_uid = g_strdup(uid);
-	fb->loading_id = gtk_timeout_add(100, (GtkFunction)do_message_selected, fb);
-}
-
-static void
-folder_browser_init (GtkObject *object)
-{
-}
-
-static void
-my_folder_browser_init (GtkObject *object)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (object);
-
-	/*
-	 * Setup parent class fields.
-	 */ 
-	GTK_TABLE (fb)->homogeneous = FALSE;
-	gtk_table_resize (GTK_TABLE (fb), 1, 2);
-
-	/*
-	 * Our instance data
-	 */
-	fb->message_list = (MessageList *)message_list_new ();
-	fb->mail_display = (MailDisplay *)mail_display_new ();
-
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(fb->message_list),
-				  GTK_POLICY_NEVER,
-				  GTK_POLICY_ALWAYS);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->table),
-			    "key_press", GTK_SIGNAL_FUNC (etable_key), fb);
-
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->table),
-			    "right_click", GTK_SIGNAL_FUNC (on_right_click), fb);
-
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->table),
-			    "double_click", GTK_SIGNAL_FUNC (on_double_click), fb);
-
-	gtk_signal_connect (GTK_OBJECT(fb->message_list), "message_selected",
-			    on_message_selected, fb);
-
-	folder_browser_gui_init (fb);
-}
-
-GtkWidget *
-folder_browser_new (const GNOME_Evolution_Shell shell)
-{
-	CORBA_Environment ev;
-	FolderBrowser *folder_browser;
-
-	CORBA_exception_init (&ev);
-
-	folder_browser = gtk_type_new (folder_browser_get_type ());
-
-	my_folder_browser_init (GTK_OBJECT (folder_browser));
-	folder_browser->uri = NULL;
-
-	folder_browser->shell = CORBA_Object_duplicate (shell, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		folder_browser->shell = CORBA_OBJECT_NIL;
-		gtk_widget_destroy (GTK_WIDGET (folder_browser));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return GTK_WIDGET (folder_browser);
-}
-
-
-E_MAKE_TYPE (folder_browser, "FolderBrowser", FolderBrowser, folder_browser_class_init, folder_browser_init, PARENT_TYPE);
-
-static void fb_resize_cb (GtkWidget *w, GtkAllocation *a)
-{
-	mail_config_set_paned_size (a->height);
-}
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
deleted file mode 100644
index 0cf7feb1ee..0000000000
--- a/mail/folder-browser.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#ifndef _FOLDER_BROWSER_H_
-#define _FOLDER_BROWSER_H_
-
-#include "mail-types.h"
-#include <gtk/gtktable.h>
-#include "camel/camel-stream.h"
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <widgets/misc/e-filter-bar.h>
-#include "filter/filter-rule.h"
-#include "filter/filter-context.h" /*eek*/
-#include "message-list.h"
-#include "mail-display.h"
-#include "shell/Evolution.h"
-
-
-#define FOLDER_BROWSER_TYPE        (folder_browser_get_type ())
-#define FOLDER_BROWSER(o)          (GTK_CHECK_CAST ((o), FOLDER_BROWSER_TYPE, FolderBrowser))
-#define FOLDER_BROWSER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), FOLDER_BROWSER_TYPE, FolderBrowserClass))
-#define IS_FOLDER_BROWSER(o)       (GTK_CHECK_TYPE ((o), FOLDER_BROWSER_TYPE))
-#define IS_FOLDER_BROWSER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), FOLDER_BROWSER_TYPE))
-
-struct  _FolderBrowser {
-	GtkTable parent;
-	
-	BonoboPropertyBag *properties;
-	
-	GNOME_Evolution_Shell shell;
-	
-	/*
-	 * The current URI being displayed by the FolderBrowser
-	 */
-	char        *uri;
-	CamelFolder *folder;
-	int          unread_count; /* last known unread message count */
-
-	/* async loading stuff */
-	char	    *loading_uid;/* what uid am i loading now */
-	char	    *pending_uid; /* what uid should i load next */
-	char	    *new_uid;	/* place to save the next uid during idle timeout */
-	char	    *loaded_uid; /* what we have loaded */
-	guint	     loading_id, seen_id;
-
-	/* a folder we are expunging, dont use other than to compare the pointer value */
-	CamelFolder *expunging;
-
-	/* set to true when we are reconfiguring stuff == can't do much else */
-	int	     reconfigure;
-
-	MessageList *message_list;
-	MailDisplay *mail_display;
-	GtkWidget   *vpaned;
-	
-	EFilterBar  *search;
-	FilterRule  *search_full; /* if we have a full search active */
-
-	gboolean     preview_shown;
-};
-
-
-typedef struct {
-	GtkTableClass parent_class;
-} FolderBrowserClass;
-
-struct fb_ondemand_closure {
-	FilterRule *rule;
-	FolderBrowser *fb;
-	gchar *path;
-};
-
-GtkType    folder_browser_get_type             (void);
-GtkWidget *folder_browser_new                  (const GNOME_Evolution_Shell  shell);
-
-gboolean   folder_browser_set_uri              (FolderBrowser         *folder_browser,
-						const char            *uri);
-
-void       folder_browser_set_message_preview  (FolderBrowser         *folder_browser,
-						gboolean               show_message_preview);
-void       folder_browser_clear_search         (FolderBrowser         *fb);
-
-/* callbacks for functions on the folder-browser */
-void vfolder_subject   (GtkWidget *w, FolderBrowser *fb);
-void vfolder_sender    (GtkWidget *w, FolderBrowser *fb);
-void vfolder_recipient (GtkWidget *w, FolderBrowser *fb);
-void vfolder_mlist     (GtkWidget *w, FolderBrowser *fb);
-
-void filter_subject    (GtkWidget *w, FolderBrowser *fb);
-void filter_sender     (GtkWidget *w, FolderBrowser *fb);
-void filter_recipient  (GtkWidget *w, FolderBrowser *fb);
-void filter_mlist      (GtkWidget *w, FolderBrowser *fb);
-
-void hide_read(GtkWidget *w, FolderBrowser *fb);
-void hide_deleted(GtkWidget *w, FolderBrowser *fb);
-void hide_selected(GtkWidget *w, FolderBrowser *fb);
-void hide_none(GtkWidget *w, FolderBrowser *fb);
-void hide_subject(GtkWidget *w, FolderBrowser *fb);
-void hide_sender(GtkWidget *w, FolderBrowser *fb);
-
-void folder_browser_toggle_threads (BonoboUIComponent           *component,
-				    const char                  *path,
-				    Bonobo_UIComponent_EventType type,
-				    const char                  *state,
-				    gpointer                     user_data);
-
-void folder_browser_toggle_view_source (BonoboUIComponent           *component,
-					const char                  *path,
-					Bonobo_UIComponent_EventType type,
-					const char                  *state,
-					gpointer                     user_data);
-
-#endif /* _FOLDER_BROWSER_H_ */
diff --git a/mail/local-config.glade b/mail/local-config.glade
deleted file mode 100644
index 7a2dbc2862..0000000000
--- a/mail/local-config.glade
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Mail</name>
-  <program_name>mail</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog_format</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>apply_format</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cancel_format</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame_format</name>
-      <label>Mailbox Format</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table1</name>
-	<border_width>2</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>2</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label2</name>
-	  <label>New store format:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label1</name>
-	  <label>Current store format:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label_format</name>
-	  <label>mbox</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>8</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>option_format</name>
-	  <can_focus>True</can_focus>
-	  <items>mbox
-maildir
-mh
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label4</name>
-      <label>Note: When converting between mailbox formats, a failure
-(such as lack of disk space) may not be automatically
-recoverable.  Please use this feature with care.</label>
-      <justify>GTK_JUSTIFY_LEFT</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
deleted file mode 100644
index 526f0b57c2..0000000000
--- a/mail/mail-account-editor.c
+++ /dev/null
@@ -1,815 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "mail-account-editor.h"
-#include "mail-session.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <camel/camel-url.h>
-#include <gal/widgets/e-unicode.h>
-
-static void mail_account_editor_class_init (MailAccountEditorClass *class);
-static void mail_account_editor_init       (MailAccountEditor *editor);
-static void mail_account_editor_finalise   (GtkObject *obj);
-
-static GnomeDialogClass *parent_class;
-
-
-GtkType
-mail_account_editor_get_type ()
-{
-	static GtkType type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"MailAccountEditor",
-			sizeof (MailAccountEditor),
-			sizeof (MailAccountEditorClass),
-			(GtkClassInitFunc) mail_account_editor_class_init,
-			(GtkObjectInitFunc) mail_account_editor_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-mail_account_editor_class_init (MailAccountEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = mail_account_editor_finalise;
-	/* override methods */
-	
-}
-
-static void
-mail_account_editor_init (MailAccountEditor *o)
-{
-	;
-}
-
-static void
-mail_account_editor_finalise (GtkObject *obj)
-{
-	MailAccountEditor *editor = (MailAccountEditor *) obj;
-	
-	gtk_object_unref (GTK_OBJECT (editor->gui));
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-static gboolean
-is_email (const char *address)
-{
-	const char *at, *hname;
-	
-	g_return_val_if_fail (address != NULL, FALSE);
-	
-	at = strchr (address, '@');
-	/* make sure we have an '@' and that it's not the first or last char */
-	if (!at || at == address || *(at + 1) == '\0')
-		return FALSE;
-	
-	hname = at + 1;
-	/* make sure the first and last chars aren't '.' */
-	if (*hname == '.' || hname[strlen (hname) - 1] == '.')
-		return FALSE;
-	
-	return strchr (hname, '.') != NULL;
-}
-
-/* callbacks */
-static void
-entry_changed (GtkEntry *entry, gpointer data)
-{
-	MailAccountEditor *editor = data;
-	char *account_name, *name, *address;
-	gboolean sensitive;
-	
-	account_name = gtk_entry_get_text (editor->account_name);
-	name = gtk_entry_get_text (editor->name);
-	address = gtk_entry_get_text (editor->email);
-	
-	sensitive = account_name && *account_name && name && *name && is_email (address);
-	
-	gnome_dialog_set_sensitive (GNOME_DIALOG (editor), 0, sensitive);
-	gnome_dialog_set_sensitive (GNOME_DIALOG (editor), 1, sensitive);
-}
-
-static gboolean
-apply_changes (MailAccountEditor *editor)
-{
-	MailConfigAccount *account;
-	char *host, *pport, *str;
-	CamelURL *source_url = NULL, *transport_url;
-	gboolean retval = TRUE;
-	int port;
-	
-	account = (MailConfigAccount *) editor->account;
-	
-	/* account name */
-	if (editor->account_name) {
-		g_free (account->name);
-		account->name = e_utf8_gtk_entry_get_text (editor->account_name);
-	}
-	
-	/* identity info */
-	g_free (account->id->name);
-	account->id->name = e_utf8_gtk_entry_get_text (editor->name);
-	
-	g_free (account->id->address);
-	account->id->address = e_utf8_gtk_entry_get_text (editor->email);
-	
-	if (editor->reply_to) {
-		g_free (account->id->reply_to);
-		account->id->reply_to = e_utf8_gtk_entry_get_text (editor->reply_to);
-	}
-	
-	if (editor->organization) {
-		g_free (account->id->organization);
-		account->id->organization = e_utf8_gtk_entry_get_text (editor->organization);
-	}
-	
-	if (editor->signature) {
-		g_free (account->id->signature);
-		account->id->signature = gnome_file_entry_get_full_path (editor->signature, TRUE);
-	}
-	
-	/* source */
-	if (account->source->url) {
-		source_url = camel_url_new (account->source->url, NULL);
-		
-		g_free (source_url->user);
-		str = gtk_entry_get_text (editor->source_user);
-		source_url->user = str && *str ? g_strdup (str) : NULL;
-		
-		g_free (source_url->passwd);
-		str = gtk_entry_get_text (editor->source_passwd);
-		source_url->passwd = str && *str ? g_strdup (str) : NULL;
-		
-		g_free (source_url->authmech);
-		str = gtk_object_get_data (GTK_OBJECT (editor), "source_authmech");
-		source_url->authmech = str && *str ? g_strdup (str) : NULL;
-		
-		g_free (source_url->host);
-		host = g_strdup (gtk_entry_get_text (editor->source_host));
-		if (host && (pport = strchr (host, ':'))) {
-			*pport = '\0';
-			port = atoi (pport + 1);
-		} else {
-			port = 0;
-		}
-		source_url->host = host;
-		source_url->port = port;
-		
-		g_free (source_url->path);
-		str = gtk_entry_get_text (editor->source_path);
-		source_url->path = str && *str ? g_strdup (str) : NULL;
-		
-		account->source->save_passwd = GTK_TOGGLE_BUTTON (editor->save_passwd)->active;
-		account->source->keep_on_server = GTK_TOGGLE_BUTTON (editor->keep_on_server)->active;
-		
-		account->source->enabled = GTK_TOGGLE_BUTTON (editor->source_enabled)->active;
-		account->source->auto_check = GTK_TOGGLE_BUTTON (editor->source_auto_check)->active;
-		account->source->auto_check_time = gtk_spin_button_get_value_as_int (editor->source_auto_timeout);
-		
-		if (editor->source_ssl)
-			account->source->use_ssl = GTK_TOGGLE_BUTTON (editor->source_ssl)->active;
-		
-		/* set the new source url */
-		g_free (account->source->url);
-		account->source->url = camel_url_to_string (source_url, FALSE);
-	}
-	
-	/* transport */
-	transport_url = g_new0 (CamelURL, 1);
-	
-	if (editor->transport) {
-		transport_url->protocol = g_strdup (editor->transport->protocol);
-	} else {
-		/* workaround for anna's dialog */
-		CamelURL *url;
-		
-		url = camel_url_new (account->transport->url, NULL);
-		transport_url->protocol = g_strdup (url->protocol);
-		camel_url_free (url);
-	}
-	
-	str = gtk_object_get_data (GTK_OBJECT (editor), "transport_authmech");
-	transport_url->authmech = str && *str ? g_strdup (str) : NULL;
-	
-	host = g_strdup (gtk_entry_get_text (editor->transport_host));
-	if (host && (pport = strchr (host, ':'))) {
-		*pport = '\0';
-		port = atoi (pport + 1);
-	} else {
-		port = 0;
-	}
-	transport_url->host = host;
-	transport_url->port = port;
-	
-	if (editor->transport_ssl)
-		account->transport->use_ssl = GTK_TOGGLE_BUTTON (editor->transport_ssl)->active;
-	
-	/* set the new transport url */
-	g_free (account->transport->url);
-	account->transport->url = camel_url_to_string (transport_url, FALSE);
-	
-	/* check to make sure the source works */
-	if (source_url) {
-		if (mail_config_check_service (source_url, CAMEL_PROVIDER_STORE, FALSE, NULL)) {
-			/* save the password if we were requested to do so */
-			if (account->source->save_passwd && source_url->passwd) {
-				mail_session_set_password (account->source->url, source_url->passwd);
-				mail_session_remember_password (account->source->url);
-			}
-		} else {
-			retval = FALSE;
-		}
-		camel_url_free (source_url);
-	}
-	
-	/* check to make sure the transport works */
-	if (!mail_config_check_service (transport_url, CAMEL_PROVIDER_TRANSPORT, FALSE, NULL))
-		retval = FALSE;
-	
-	camel_url_free (transport_url);
-	
-	/* save any changes we may have */
-	mail_config_write ();
-	
-	return retval;
-}
-
-static void
-apply_clicked (GtkWidget *widget, gpointer data)
-{
-	MailAccountEditor *editor = data;
-	
-	apply_changes (editor);
-}
-
-static void
-ok_clicked (GtkWidget *widget, gpointer data)
-{
-	MailAccountEditor *editor = data;
-	
-	if (apply_changes (editor)) {
-		gtk_widget_destroy (GTK_WIDGET (editor));
-	} else {
-		GtkWidget *mbox;
-		
-		mbox = gnome_message_box_new (_("One or more of your servers are not configured correctly.\n"
-						"Do you wish to save anyway?"),
-					      GNOME_MESSAGE_BOX_WARNING,
-					      GNOME_STOCK_BUTTON_YES,
-					      GNOME_STOCK_BUTTON_NO, NULL);
-		
-		gnome_dialog_set_default (GNOME_DIALOG (mbox), 1);
-		gtk_widget_grab_focus (GTK_WIDGET (GNOME_DIALOG (mbox)->buttons->data));
-		
-		gnome_dialog_set_parent (GNOME_DIALOG (mbox), GTK_WINDOW (editor));
-		
-		if (gnome_dialog_run_and_close (GNOME_DIALOG (mbox)) == 0)
-			gtk_widget_destroy (GTK_WIDGET (editor));
-	}
-}
-
-static void
-cancel_clicked (GtkWidget *widget, gpointer data)
-{
-	MailAccountEditor *editor = data;
-	
-	gtk_widget_destroy (GTK_WIDGET (editor));
-}
-
-static void
-source_auth_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailAccountEditor *editor = user_data;
-	CamelServiceAuthType *authtype;
-	gboolean sensitive;
-	GtkWidget *label;
-	
-	authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype");
-	
-	gtk_object_set_data (GTK_OBJECT (editor), "source_authmech", authtype->authproto);
-	
-	if (authtype->need_password)
-		sensitive = TRUE;
-	else
-		sensitive = FALSE;
-	
-	label = glade_xml_get_widget (editor->gui, "lblSourcePasswd");
-	gtk_widget_set_sensitive (label, sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), sensitive);
-}
-
-static void
-source_auth_init (MailAccountEditor *editor, CamelURL *url)
-{
-	GtkWidget *menu, *item, *authmech = NULL;
-	CamelServiceAuthType *authtype;
-	GList *authtypes = NULL;
-	guint i = 0, history = 0;
-	
-	menu = gtk_menu_new ();
-	gtk_option_menu_remove_menu (editor->source_auth);
-	
-	if (!url || !mail_config_check_service (url, CAMEL_PROVIDER_STORE, FALSE, &authtypes)) {
-		gtk_option_menu_set_menu (editor->source_auth, menu);
-		
-		return;
-	}
-	
-	if (authtypes) {
-		GList *l;
-		
-		l = authtypes;
-		while (l) {
-			authtype = l->data;
-			
-			item = gtk_menu_item_new_with_label (authtype->name);
-			gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (source_auth_type_changed),
-					    editor);
-			
-			gtk_menu_append (GTK_MENU (menu), item);
-			
-			gtk_widget_show (item);
-			
-			if (!authmech || (url->authmech && !g_strcasecmp (authtype->authproto, url->authmech))) {
-				authmech = item;
-				history = i;
-			}
-			
-			l = l->next;
-			i++;
-		}
-		
-		if (authmech) {
-			gtk_signal_emit_by_name (GTK_OBJECT (authmech), "activate", editor);
-			gtk_option_menu_set_history (editor->source_auth, history);
-		}
-	}
-	
-	gtk_option_menu_set_menu (editor->source_auth, menu);
-}
-
-static void
-transport_auth_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailAccountEditor *editor = user_data;
-	CamelServiceAuthType *authtype;
-	
-	authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype");
-	
-	gtk_object_set_data (GTK_OBJECT (editor), "transport_authmech", authtype->authproto);
-}
-
-static void
-transport_construct_authmenu (MailAccountEditor *editor, CamelURL *url)
-{
-	GtkWidget *authmech = NULL;
-	GtkWidget *menu, *item;
-	CamelServiceAuthType *authtype;
-	GList *authtypes = NULL;
-	guint i = 0, history = 0;
-	
-	menu = gtk_menu_new ();
-	gtk_option_menu_remove_menu (editor->transport_auth);
-	
-	if (!url || !mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, FALSE, &authtypes)) {
-		gtk_option_menu_set_menu (editor->transport_auth, menu);
-		
-		return;
-	}
-	
-	menu = gtk_menu_new ();
-	
-	if (authtypes) {
-		GList *l;
-		
-		l = authtypes;
-		while (l) {
-			authtype = l->data;
-			
-			item = gtk_menu_item_new_with_label (authtype->name);
-			gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (transport_auth_type_changed),
-					    editor);
-			
-			gtk_menu_append (GTK_MENU (menu), item);
-			
-			gtk_widget_show (item);
-			
-			if (!authmech || (url->authmech && !g_strcasecmp (authtype->authproto, url->authmech))) {
-				authmech = item;
-				history = i;
-			}
-			
-			l = l->next;
-			i++;
-		}
-	}
-	
-	gtk_option_menu_set_menu (editor->transport_auth, menu);
-	
-	if (authmech) {
-		gtk_signal_emit_by_name (GTK_OBJECT (authmech), "activate", editor);
-		gtk_option_menu_set_history (editor->transport_auth, history);
-	}
-}
-
-static void
-transport_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailAccountEditor *editor = user_data;
-	CamelProvider *provider;
-	GtkWidget *label;
-	
-	provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
-	editor->transport = provider;
-	
-	/* hostname */
-	label = glade_xml_get_widget (editor->gui, "lblTransportHost");
-	if (provider->url_flags & CAMEL_URL_ALLOW_HOST) {
-		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_host), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (editor->transport_host, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_host), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* auth */
-	label = glade_xml_get_widget (editor->gui, "lblTransportAuth");
-	if (provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
-		CamelURL *url;
-		
-		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_auth), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-		
-		/* regen the auth list */
-		url = g_new0 (CamelURL, 1);
-		url->protocol = g_strdup (provider->protocol);
-		url->host = g_strdup (gtk_entry_get_text (editor->transport_host));
-		transport_construct_authmenu (editor, url);
-		camel_url_free (url);
-	} else {
-		gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_auth), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-}
-
-static void
-transport_type_init (MailAccountEditor *editor, CamelURL *url)
-{
-	GtkWidget *menu, *xport = NULL;
-	GList *providers, *l;
-	guint i = 0, history = 0;
-	
-	menu = gtk_menu_new ();
-	gtk_option_menu_remove_menu (GTK_OPTION_MENU (editor->transport_auth));
-	
-	providers = camel_session_list_providers (session, TRUE);
-	l = providers;
-	while (l) {
-		CamelProvider *provider = l->data;
-		
-		if (strcmp (provider->domain, "mail")) {
-			l = l->next;
-			continue;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			GtkWidget *item;
-			
-			item = gtk_menu_item_new_with_label (provider->name);
-			gtk_object_set_data (GTK_OBJECT (item), "provider", provider);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (transport_type_changed),
-					    editor);
-			
-			gtk_menu_append (GTK_MENU (menu), item);
-			
-			gtk_widget_show (item);
-			
-			if (!xport && !g_strcasecmp (provider->protocol, url->protocol)) {
-				xport = item;
-				history = i;
-			}
-			
-			i++;
-		}
-		
-		l = l->next;
-	}
-	
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (editor->transport_type), menu);
-	
-	if (xport) {
-		gtk_signal_emit_by_name (GTK_OBJECT (xport), "activate", editor);
-		gtk_option_menu_set_history (GTK_OPTION_MENU (editor->transport_type), history);
-	}
-}
-
-static void
-auto_check_toggled (GtkToggleButton *button, gpointer data)
-{
-	MailAccountEditor *editor = data;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (editor->source_auto_timeout), button->active);
-}
-
-static void
-source_check (MailAccountEditor *editor, CamelURL *url)
-{
-	GList *providers, *l;
-	
-	providers = camel_session_list_providers (session, TRUE);
-	l = providers;
-	while (l) {
-		CamelProvider *provider = l->data;
-		
-		if (strcmp (provider->domain, "mail")) {
-			l = l->next;
-			continue;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_STORE] && provider->flags & CAMEL_PROVIDER_IS_SOURCE) {
-			if (!url || !g_strcasecmp (provider->protocol, url->protocol)) {
-				GtkWidget *label;
-				
-				/* keep-on-server */
-				if (url && !(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->keep_on_server), TRUE);
-				else
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->keep_on_server), FALSE);
-				
-				/* host */
-				label = glade_xml_get_widget (editor->gui, "lblSourceHost");
-				if (url && provider->url_flags & CAMEL_URL_ALLOW_HOST) {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_host), TRUE);
-					gtk_widget_set_sensitive (label, TRUE);
-				} else {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_host), FALSE);
-					gtk_widget_set_sensitive (label, FALSE);
-				}
-				
-				/* user */
-				label = glade_xml_get_widget (editor->gui, "lblSourceUser");
-				if (url && provider->url_flags & CAMEL_URL_ALLOW_USER) {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_user), TRUE);
-					gtk_widget_set_sensitive (label, TRUE);
-				} else {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_user), FALSE);
-					gtk_widget_set_sensitive (label, FALSE);
-				}
-				
-				/* path */
-				label = glade_xml_get_widget (editor->gui, "lblSourcePath");
-				if (url && provider->url_flags & CAMEL_URL_ALLOW_PATH) {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_path), TRUE);
-					gtk_widget_set_sensitive (label, TRUE);
-				} else {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_path), FALSE);
-					gtk_widget_set_sensitive (label, FALSE);
-				}
-				
-				/* auth */
-				label = glade_xml_get_widget (editor->gui, "lblSourceAuth");
-				if (url && provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_auth), TRUE);
-					gtk_widget_set_sensitive (label, TRUE);
-				} else {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_auth), FALSE);
-					gtk_widget_set_sensitive (label, FALSE);
-				}
-				
-				/* passwd */
-				label = glade_xml_get_widget (editor->gui, "lblSourcePasswd");
-				if (url && provider->url_flags & CAMEL_URL_ALLOW_PASSWORD) {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), TRUE);
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), TRUE);
-					gtk_widget_set_sensitive (label, TRUE);
-				} else {
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->source_passwd), FALSE);
-					gtk_widget_set_sensitive (GTK_WIDGET (editor->save_passwd), FALSE);
-					gtk_widget_set_sensitive (label, FALSE);
-				}
-				
-				break;
-			}
-		}
-		
-		l = l->next;
-	}
-}
-
-static void
-construct (MailAccountEditor *editor, const MailConfigAccount *account)
-{
-	GtkWidget *toplevel, *entry;
-	GladeXML *gui;
-	CamelURL *url;
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "mail-account-editor");
-	editor->gui = gui;
-	
-	/* get our toplevel widget */
-	toplevel = glade_xml_get_widget (gui, "toplevel");
-	
-	/* reparent */
-	gtk_widget_reparent (toplevel, GNOME_DIALOG (editor)->vbox);
-	
-	/* give our dialog an OK button and title */
-	gtk_window_set_title (GTK_WINDOW (editor), _("Evolution Account Editor"));
-	gtk_window_set_policy (GTK_WINDOW (editor), FALSE, TRUE, TRUE);
-	gtk_window_set_modal (GTK_WINDOW (editor), TRUE);
-	gnome_dialog_append_buttons (GNOME_DIALOG (editor),
-				     GNOME_STOCK_BUTTON_OK,
-				     GNOME_STOCK_BUTTON_APPLY,
-				     GNOME_STOCK_BUTTON_CANCEL,
-				     NULL);
-	
-	gnome_dialog_button_connect (GNOME_DIALOG (editor), 0 /* OK */,
-				     GTK_SIGNAL_FUNC (ok_clicked),
-				     editor);
-	gnome_dialog_button_connect (GNOME_DIALOG (editor), 1 /* APPLY */,
-				     GTK_SIGNAL_FUNC (apply_clicked),
-				     editor);
-	gnome_dialog_button_connect (GNOME_DIALOG (editor), 2 /* CANCEL */,
-				     GTK_SIGNAL_FUNC (cancel_clicked),
-				     editor);
-	
-	/* General */
-	editor->account_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtAccountName"));
-	e_utf8_gtk_entry_set_text (editor->account_name, account->name);
-	gtk_signal_connect (GTK_OBJECT (editor->account_name), "changed", entry_changed, editor);
-	editor->name = GTK_ENTRY (glade_xml_get_widget (gui, "txtName"));
-	e_utf8_gtk_entry_set_text (editor->name, account->id->name);
-	gtk_signal_connect (GTK_OBJECT (editor->name), "changed", entry_changed, editor);
-	editor->email = GTK_ENTRY (glade_xml_get_widget (gui, "txtAddress"));
-	e_utf8_gtk_entry_set_text (editor->email, account->id->address);
-	gtk_signal_connect (GTK_OBJECT (editor->email), "changed", entry_changed, editor);
-	editor->reply_to = GTK_ENTRY (glade_xml_get_widget (gui, "txtReplyTo"));
-	if (editor->reply_to)
-		e_utf8_gtk_entry_set_text (editor->reply_to, account->id->reply_to ? account->id->reply_to : "");
-	editor->organization = GTK_ENTRY (glade_xml_get_widget (gui, "txtOrganization"));
-	if (editor->organization)
-		e_utf8_gtk_entry_set_text (editor->organization, account->id->organization);
-	editor->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileSignature"));
-	if (editor->signature) {
-		entry = gnome_file_entry_gtk_entry (editor->signature);
-		gtk_entry_set_text (GTK_ENTRY (entry), account->id->signature);
-	}
-	
-	/* Servers */
-	if (account->source->url)
-		url = camel_url_new (account->source->url, NULL);
-	else
-		url = NULL;
-	
-	editor->source_type = glade_xml_get_widget (gui, "txtSourceType");
-	if (GTK_IS_LABEL (editor->source_type))
-		gtk_label_set_text (GTK_LABEL (editor->source_type), url ? url->protocol : _("None"));
-	else
-		gtk_entry_set_text (GTK_ENTRY (editor->source_type), url ? url->protocol : _("None"));
-	editor->source_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourceHost"));
-	gtk_entry_set_text (editor->source_host, url && url->host ? url->host : "");
-	if (url && url->port) {
-		char port[10];
-		
-		g_snprintf (port, 9, ":%d", url->port);
-		gtk_entry_append_text (editor->source_host, port);
-	}
-	editor->source_user = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourceUser"));
-	gtk_entry_set_text (editor->source_user, url && url->user ? url->user : "");
-	editor->source_passwd = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourcePasswd"));
-	gtk_entry_set_text (editor->source_passwd, url && url->passwd ? url->passwd : "");
-	editor->source_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourcePath"));
-	if (url && url->path && *(url->path)) {
-		GList *providers;
-		CamelProvider *provider = NULL;
-		
-		providers = camel_session_list_providers (session, TRUE);
-		while (providers) {
-			provider = providers->data;
-			
-			if (strcmp (provider->domain, "mail")) {
-				provider = NULL;
-				providers = providers->next;
-				continue;
-			}
-			
-			if (provider->object_types[CAMEL_PROVIDER_STORE] && provider->flags & CAMEL_PROVIDER_IS_SOURCE)
-				if (!url || !g_strcasecmp (provider->protocol, url->protocol))
-					break;
-			
-			provider = NULL;
-			providers = providers->next;
-		}
-		
-		if (provider) {
-			if (provider->url_flags & CAMEL_URL_PATH_IS_ABSOLUTE)
-				gtk_entry_set_text (editor->source_path, url->path);
-			else
-				gtk_entry_set_text (editor->source_path, url->path + 1);
-		} else {
-			/* we've got a serious problem if we ever get to here */
-			g_assert_not_reached ();
-		}
-	}
-	editor->save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSavePasswd"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->save_passwd), account->source->save_passwd);
-	editor->source_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuSourceAuth"));
-	editor->source_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSSL"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_ssl), account->source->use_ssl);
-	editor->keep_on_server = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkKeepMailOnServer"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->keep_on_server), account->source->keep_on_server);
-	editor->source_auto_timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinAutoCheckTimeout"));
-	gtk_spin_button_set_value (editor->source_auto_timeout,
-				   (gfloat) (account->source->auto_check_time * 1.0));
-	editor->source_auto_check = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAutoCheckMail"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_auto_check), account->source->auto_check);
-	gtk_signal_connect (GTK_OBJECT (editor->source_auto_check), "toggled", auto_check_toggled, editor);
-	gtk_widget_set_sensitive (GTK_WIDGET (editor->source_auto_timeout), account->source->auto_check);
-	editor->source_enabled = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkEnabled"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_enabled), account->source->enabled);
-	source_check (editor, url);
-	source_auth_init (editor, url);
-	if (url)
-		camel_url_free (url);
-	
-	/* Transport */
-	if (account->transport->url)
-		url = camel_url_new (account->transport->url, NULL);
-	else
-		url = NULL;
-	
-	editor->transport_type = glade_xml_get_widget (gui, "omenuTransportType");
-	editor->transport_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportHost"));
-	gtk_entry_set_text (editor->transport_host, url && url->host ? url->host : "");
-	if (url && url->port) {
-		char port[10];
-		
-		g_snprintf (port, 9, ":%d", url->port);
-		gtk_entry_append_text (editor->transport_host, port);
-	}
-	editor->transport_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportAuth"));
-	editor->transport_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSSL"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl);
-	if (GTK_IS_OPTION_MENU (editor->transport_type))
-		transport_type_init (editor, url);
-	else
-		gtk_label_set_text (GTK_LABEL (editor->transport_type),
-				    url && url->protocol ? url->protocol : _("None"));
-	
-	if (url)
-		camel_url_free (url);
-	
-	editor->account = account;
-}
-
-MailAccountEditor *
-mail_account_editor_new (const MailConfigAccount *account)
-{
-	MailAccountEditor *new;
-	
-	new = (MailAccountEditor *) gtk_type_new (mail_account_editor_get_type ());
-	construct (new, account);
-	
-	return new;
-}
diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h
deleted file mode 100644
index a750bdedb6..0000000000
--- a/mail/mail-account-editor.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_ACCOUNT_EDITOR_H
-#define MAIL_ACCOUNT_EDITOR_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <camel.h>
-#include "mail-config.h"
-
-#define MAIL_ACCOUNT_EDITOR_TYPE        (mail_account_editor_get_type ())
-#define MAIL_ACCOUNT_EDITOR(o)          (GTK_CHECK_CAST ((o), MAIL_ACCOUNT_EDITOR_TYPE, MailAccountEditor))
-#define MAIL_ACCOUNT_EDITOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_ACCOUNT_EDITOR_TYPE, MailAccountEditorClass))
-#define IS_MAIL_ACCOUNT_EDITOR(o)       (GTK_CHECK_TYPE ((o), MAIL_ACCOUNT_EDITOR_TYPE))
-#define IS_MAIL_ACCOUNT_EDITOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_ACCOUNT_EDITOR_TYPE))
-
-struct _MailAccountEditor {
-	GnomeDialog parent;
-	
-	const MailConfigAccount *account;
-	
-	GladeXML *gui;
-	
-	/* Identity / General */
-	GtkEntry *account_name;
-	GtkEntry *name;
-	GtkEntry *email;
-	GtkEntry *reply_to;
-	GtkEntry *organization;
-	GnomeFileEntry *signature;
-	
-	/* Source */
-	GtkWidget *source_type;       /* this is generic because we don't know the widget-type */
-	GtkEntry *source_host;
-	GtkEntry *source_user;
-	GtkEntry *source_passwd;
-	GtkEntry *source_path;
-	GtkCheckButton *save_passwd;
-	GtkOptionMenu *source_auth;
-	GtkCheckButton *source_ssl;
-	
-	GtkCheckButton *keep_on_server;
-	
-	GtkCheckButton *source_auto_check;
-	GtkSpinButton *source_auto_timeout;
-	
-	GtkCheckButton *source_enabled;
-	
-	/* Transport */
-	GtkWidget *transport_type;    /* Same here... */
-	GtkEntry *transport_host;
-	GtkOptionMenu *transport_auth;
-	GtkCheckButton *transport_ssl;
-	
-	const CamelProvider *transport;
-};
-
-typedef struct _MailAccountEditor MailAccountEditor;
-
-typedef struct {
-	GnomeDialogClass parent_class;
-	
-	/* signals */
-	
-} MailAccountEditorClass;
-
-GtkType mail_account_editor_get_type (void);
-
-MailAccountEditor *mail_account_editor_new (const MailConfigAccount *account);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_ACCOUNT_EDITOR_H */
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
deleted file mode 100644
index c258c28167..0000000000
--- a/mail/mail-accounts.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include "mail-accounts.h"
-#include "mail-config.h"
-#include "mail-config-druid.h"
-#include "mail-account-editor.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <camel/camel-url.h>
-#include <openpgp-utils.h>
-
-static void mail_accounts_dialog_class_init (MailAccountsDialogClass *class);
-static void mail_accounts_dialog_init       (MailAccountsDialog *dialog);
-static void mail_accounts_dialog_finalise   (GtkObject *obj);
-
-static GnomeDialogClass *parent_class;
-
-GtkType
-mail_accounts_dialog_get_type ()
-{
-	static GtkType type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"MailAccountsDialog",
-			sizeof (MailAccountsDialog),
-			sizeof (MailAccountsDialogClass),
-			(GtkClassInitFunc) mail_accounts_dialog_class_init,
-			(GtkObjectInitFunc) mail_accounts_dialog_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-mail_accounts_dialog_class_init (MailAccountsDialogClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = mail_accounts_dialog_finalise;
-	/* override methods */
-	
-}
-
-static void
-mail_accounts_dialog_init (MailAccountsDialog *o)
-{
-	;
-}
-
-static void
-mail_accounts_dialog_finalise (GtkObject *obj)
-{
-	MailAccountsDialog *dialog = (MailAccountsDialog *) obj;
-	
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-static void
-load_accounts (MailAccountsDialog *dialog)
-{
-	const MailConfigAccount *account;
-	const GSList *node = dialog->accounts;
-	int i = 0;
-	
-	gtk_clist_freeze (dialog->mail_accounts);
-	
-	gtk_clist_clear (dialog->mail_accounts);
-	
-	while (node) {
-		CamelURL *url;
-		gchar *text[2];
-		
-		account = node->data;
-		
-		if (account->source->url)
-			url = camel_url_new (account->source->url, NULL);
-		else
-			url = NULL;
-		
-		text[0] = g_strdup (account->name);
-		text[1] = g_strdup_printf ("%s%s", url && url->protocol ? url->protocol : _("None"),
-					   account->default_account ? _(" (default)") : "");
-		
-		if (url)
-			camel_url_free (url);
-		
-		gtk_clist_append (dialog->mail_accounts, text);
-		g_free (text[0]);
-		g_free (text[1]);
-		
-		/* set the account on the row */
-		gtk_clist_set_row_data (dialog->mail_accounts, i, (gpointer) account);
-		
-		node = node->next;
-		i++;
-	}
-	
-	gtk_clist_thaw (dialog->mail_accounts);
-}
-
-static void
-load_news (MailAccountsDialog *dialog)
-{
-	/* FIXME: implement */
-	;
-}
-
-/* mail callbacks */
-static void
-mail_select (GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	
-	dialog->accounts_row = row;
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_edit), TRUE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_delete), TRUE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_default), TRUE);
-}
-
-static void
-mail_unselect (GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	
-	dialog->accounts_row = -1;
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_edit), FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_delete), FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_default), FALSE);
-}
-
-static void
-mail_add_finished (GtkWidget *widget, gpointer data)
-{
-	/* Either Cancel or Finished was clicked in the druid so reload the accounts */
-	MailAccountsDialog *dialog = data;
-	
-	dialog->accounts = mail_config_get_accounts ();
-	load_accounts (dialog);
-}
-
-static void
-mail_add (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	MailConfigDruid *druid;
-	
-	druid = mail_config_druid_new (dialog->shell);
-	gtk_signal_connect (GTK_OBJECT (druid), "destroy",
-			    GTK_SIGNAL_FUNC (mail_add_finished), dialog);
-	
-	gtk_widget_show (GTK_WIDGET (druid));
-}
-
-static void
-mail_editor_destroyed (GtkWidget *widget, gpointer data)
-{
-	load_accounts (MAIL_ACCOUNTS_DIALOG (data));
-}
-
-static void
-mail_edit (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	
-	if (dialog->accounts_row >= 0) {
-		const MailConfigAccount *account;
-		MailAccountEditor *editor;
-		
-		account = gtk_clist_get_row_data (dialog->mail_accounts, dialog->accounts_row);
-		editor = mail_account_editor_new (account);
-		gtk_signal_connect (GTK_OBJECT (editor), "destroy",
-				    GTK_SIGNAL_FUNC (mail_editor_destroyed),
-				    dialog);
-		gtk_widget_show (GTK_WIDGET (editor));
-	}
-}
-
-static void
-mail_delete (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	MailConfigAccount *account;
-	GnomeDialog *confirm;
-	GtkWidget *label;
-	int ans;
-	
-	if (dialog->accounts_row < 0)
-		return;
-	
-	confirm = GNOME_DIALOG (gnome_dialog_new (_("Are you sure you want to delete this account?"),
-						  GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO, NULL));
-	gtk_window_set_policy (GTK_WINDOW (confirm), TRUE, TRUE, TRUE);
-	gtk_window_set_modal (GTK_WINDOW (confirm), TRUE);
-	label = gtk_label_new (_("Are you sure you want to delete this account?"));
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_box_pack_start (GTK_BOX (confirm->vbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gnome_dialog_set_parent (confirm, GTK_WINDOW (dialog));
-	ans = gnome_dialog_run_and_close (confirm);
-	
-	if (ans == 0) {
-		int sel, row, len;
-		
-		sel = dialog->accounts_row;
-		
-		account = gtk_clist_get_row_data (dialog->mail_accounts, sel);
-		dialog->accounts = mail_config_remove_account (account);
-		mail_config_write ();
-		
-		gtk_clist_remove (dialog->mail_accounts, sel);
-		
-		len = dialog->accounts ? g_slist_length ((GSList *) dialog->accounts) : 0;
-		if (len > 0) {
-			row = sel >= len ? len - 1 : sel;
-			gtk_clist_select_row (dialog->mail_accounts, row, 0);
-		} else {
-			dialog->accounts_row = -1;
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_edit), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_delete), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_default), FALSE);
-		}
-	}
-}
-
-static void
-mail_default (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	const MailConfigAccount *account;
-	
-	if (dialog->accounts_row >= 0) {
-		int row;
-		
-		row = dialog->accounts_row;
-		account = gtk_clist_get_row_data (dialog->mail_accounts, row);
-		mail_config_set_default_account (account);
-		mail_config_write ();
-		load_accounts (dialog);
-		gtk_clist_select_row (dialog->mail_accounts, row, 0);
-	}
-}
-
-#ifdef ENABLE_NNTP
-/* news callbacks */
-static void
-news_select (GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	
-	dialog->news_row = row;
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_edit), TRUE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_delete), TRUE);
-}
-
-static void
-news_unselect (GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	
-	dialog->news_row = -1;
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_edit), FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_delete), FALSE);
-}
-
-static void
-news_add_finish_clicked ()
-{
-	/* FIXME: uhm, yea... */
-	;
-}
-
-static void
-news_add (GtkButton *button, gpointer data)
-{
-	/* FIXME: do stuff */
-	;
-}
-
-static void
-news_edit (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	MailConfigService *server;
-	
-	/* FIXME: open the editor and stuff */
-}
-
-static void
-news_delete (GtkButton *button, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	MailConfigService *server;
-	GnomeDialog *confirm;
-	GtkWidget *label;
-	int ans;
-	
-	if (dialog->news_row < 0)
-		return;
-	
-	confirm = GNOME_DIALOG (gnome_dialog_new (_("Are you sure you want to delete this news account?"),
-						  GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO, NULL));
-	gtk_window_set_policy (GTK_WINDOW (confirm), TRUE, TRUE, TRUE);
-	gtk_window_set_modal (GTK_WINDOW (confirm), TRUE);
-	label = gtk_label_new (_("Are you sure you want to delete this news account?"));
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_box_pack_start (GTK_BOX (confirm->vbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gnome_dialog_set_parent (confirm, GTK_WINDOW (dialog));
-	ans = gnome_dialog_run_and_close (confirm);
-	
-	if (ans == 0) {
-		int row, len;
-		
-		server = gtk_clist_get_row_data (dialog->news_accounts, dialog->news_row);
-		dialog->news = mail_config_remove_news (server);
-		mail_config_write ();
-		
-		gtk_clist_remove (dialog->news_accounts, dialog->news_row);
-		
-		len = dialog->news ? g_slist_length ((GSList *) dialog->news) : 0;
-		if (len > 0) {
-			row = dialog->news_row;
-			row = row >= len ? len - 1 : row;
-			gtk_clist_select_row (dialog->news_accounts, row, 0);
-		} else {
-			dialog->news_row = -1;
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_edit), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_delete), FALSE);
-		}
-	}
-}
-#endif /* ENABLE_NNTP */
-
-/* temp widget callbacks */
-static void
-send_html_toggled (GtkToggleButton *button, gpointer data)
-{
-	mail_config_set_send_html (button->active);
-}
-
-static void
-timeout_changed (GtkEntry *entry, gpointer data)
-{
-	MailAccountsDialog *dialog = data;
-	gint val;
-	
-	val = (gint) (gtk_spin_button_get_value_as_float (dialog->timeout) * 1000);
-	
-	mail_config_set_mark_as_seen_timeout (val);
-}
-
-static void
-pgp_path_changed (GtkEntry *entry, gpointer data)
-{
-	const char *path, *bin;
-	PgpType type = PGP_TYPE_NONE;
-	
-	path = gtk_entry_get_text (entry);
-	bin = g_basename (path);
-	
-	/* FIXME: This detection should be better */
-	if (!strcmp (bin, "pgp"))
-		type = PGP_TYPE_PGP2;
-	else if (!strcmp (bin, "pgpv") || !strcmp (bin, "pgpe") || !strcmp (bin, "pgpk") || !strcmp (bin, "pgps"))
-		type = PGP_TYPE_PGP5;
-	else if (!strcmp (bin, "gpg"))
-		type = PGP_TYPE_GPG;
-	
-	mail_config_set_pgp_path (path && *path ? path : NULL);
-	mail_config_set_pgp_type (type);
-}
-
-static void
-construct (MailAccountsDialog *dialog)
-{
-	GladeXML *gui;
-	GtkWidget *notebook;
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "mail-accounts-dialog");
-	dialog->gui = gui;
-	
-	/* get our toplevel widget */
-	notebook = glade_xml_get_widget (gui, "notebook");
-	
-	/* reparent */
-	gtk_widget_reparent (notebook, GNOME_DIALOG (dialog)->vbox);
-	
-	/* give our dialog an OK button and title */
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Account Manager"));
-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, TRUE);
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300);
-	gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_OK);
-	
-	dialog->mail_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts"));
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "select-row",
-			    GTK_SIGNAL_FUNC (mail_select), dialog);
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "unselect-row",
-			    GTK_SIGNAL_FUNC (mail_unselect), dialog);
-	dialog->mail_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdMailAdd"));
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_add), "clicked",
-			    GTK_SIGNAL_FUNC (mail_add), dialog);
-	dialog->mail_edit = GTK_BUTTON (glade_xml_get_widget (gui, "cmdMailEdit"));
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_edit), "clicked",
-			    GTK_SIGNAL_FUNC (mail_edit), dialog);
-	dialog->mail_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdMailDelete"));
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_delete), "clicked",
-			    GTK_SIGNAL_FUNC (mail_delete), dialog);
-	dialog->mail_default = GTK_BUTTON (glade_xml_get_widget (gui, "cmdMailDefault"));
-	gtk_signal_connect (GTK_OBJECT (dialog->mail_default), "clicked",
-			    GTK_SIGNAL_FUNC (mail_default), dialog);
-	
-#if defined (ENABLE_NNTP)
-	dialog->news_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts"));
-	gtk_signal_connect (GTK_OBJECT (dialog->news_accounts), "select-row",
-			    GTK_SIGNAL_FUNC (news_select), dialog);
-	gtk_signal_connect (GTK_OBJECT (dialog->news_accounts), "unselect-row",
-			    GTK_SIGNAL_FUNC (news_unselect), dialog);
-	dialog->news_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsAdd"));
-	gtk_signal_connect (GTK_OBJECT (dialog->news_add), "clicked",
-			    GTK_SIGNAL_FUNC (news_add), dialog);
-	dialog->news_edit = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsEdit"));
-	gtk_signal_connect (GTK_OBJECT (dialog->news_edit), "clicked",
-			    GTK_SIGNAL_FUNC (news_edit), dialog);
-	dialog->news_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsDelete"));
-	gtk_signal_connect (GTK_OBJECT (dialog->news_delete), "clicked",
-			    GTK_SIGNAL_FUNC (news_delete), dialog);
-#else
-	/* remove the news tab since we don't support nntp */
-	gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), 1);
-#endif
-	
-	/* get those temp widgets */
-	dialog->send_html = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSendHTML"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->send_html),
-				      mail_config_get_send_html ());
-	gtk_signal_connect (GTK_OBJECT (dialog->send_html), "toggled",
-			    GTK_SIGNAL_FUNC (send_html_toggled), dialog);
-	
-	dialog->timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinMarkTimeout"));
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->timeout),
-				   (1.0 * mail_config_get_mark_as_seen_timeout ()) / 1000.0);
-	gtk_signal_connect (GTK_OBJECT (dialog->timeout), "changed",
-			    GTK_SIGNAL_FUNC (timeout_changed), dialog);
-	
-	dialog->pgp_path = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "filePgpPath"));
-	gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (dialog->pgp_path)),
-			    mail_config_get_pgp_path ());
-	gnome_file_entry_set_default_path (dialog->pgp_path, mail_config_get_pgp_path ());
-	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->pgp_path)),
-			    "changed", GTK_SIGNAL_FUNC (pgp_path_changed), dialog);
-	
-	/* now to fill in the clists */
-	dialog->accounts_row = -1;
-	dialog->accounts = mail_config_get_accounts ();
-	if (dialog->accounts) {
-		load_accounts (dialog);
-		gtk_clist_select_row (dialog->mail_accounts, 0, 0);
-	} else {
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_edit), FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_delete), FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog->mail_default), FALSE);
-	}
-	
-	dialog->news_row = -1;
-	dialog->news = mail_config_get_news ();
-	if (dialog->news) {
-		load_news (dialog);
-		gtk_clist_select_row (dialog->news_accounts, 0, 0);
-	} else {
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_edit), FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET (dialog->news_delete), FALSE);
-	}
-}
-
-MailAccountsDialog *
-mail_accounts_dialog_new (GNOME_Evolution_Shell shell)
-{
-	MailAccountsDialog *new;
-	
-	new = (MailAccountsDialog *) gtk_type_new (mail_accounts_dialog_get_type ());
-	construct (new);
-	new->shell = shell;
-	
-	return new;
-}
diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
deleted file mode 100644
index dcee0528c6..0000000000
--- a/mail/mail-accounts.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_ACCOUNTS_H
-#define MAIL_ACCOUNTS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <camel.h>
-#include "shell/Evolution.h"
-
-#define MAIL_ACCOUNTS_DIALOG_TYPE        (mail_accounts_dialog_get_type ())
-#define MAIL_ACCOUNTS_DIALOG(o)          (GTK_CHECK_CAST ((o), MAIL_ACCOUNTS_DIALOG_TYPE, MailAccountsDialog))
-#define MAIL_ACCOUNTS_DIALOG_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_ACCOUNTS_DIALOG_TYPE, MailAccountsDialogClass))
-#define IS_MAIL_ACCOUNTS_DIALOG(o)       (GTK_CHECK_TYPE ((o), MAIL_ACCOUNTS_DIALOG_TYPE))
-#define IS_MAIL_ACCOUNTS_DIALOG_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_ACCOUNTS_DIALOG_TYPE))
-
-struct _MailAccountsDialog {
-	GnomeDialog parent;
-	
-	GNOME_Evolution_Shell shell;
-	
-	GladeXML *gui;
-	
-	const GSList *accounts;
-	gint accounts_row;
-	
-	GtkCList *mail_accounts;
-	GtkButton *mail_add;
-	GtkButton *mail_edit;
-	GtkButton *mail_delete;
-	GtkButton *mail_default;
-	
-	const GSList *news;
-	gint news_row;
-	
-	GtkCList *news_accounts;
-	GtkButton *news_add;
-	GtkButton *news_edit;
-	GtkButton *news_delete;
-	
-	/* "Other" widgets */
-	GtkCheckButton *send_html;
-	GtkSpinButton *timeout;
-	GnomeFileEntry *pgp_path;
-};
-
-typedef struct _MailAccountsDialog MailAccountsDialog;
-
-typedef struct {
-	GnomeDialogClass parent_class;
-	
-	/* signals */
-	
-} MailAccountsDialogClass;
-
-GtkType mail_accounts_dialog_get_type (void);
-
-MailAccountsDialog *mail_accounts_dialog_new (GNOME_Evolution_Shell shell);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_ACCOUNTS_H */
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
deleted file mode 100644
index ca38085ebf..0000000000
--- a/mail/mail-autofilter.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-autofilter.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Michael Zucchi <notzed@helixcode.com>
- *   Ettore Perazzoli <ettore@helixcode.com>
- */
-
-/* Code for autogenerating rules or filters from a message.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <ctype.h>
-
-#include <bonobo.h>
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-popup-menu.h>
-
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-
-#include "camel/camel.h"
-
-#include "filter/vfolder-context.h"
-#include "filter/vfolder-rule.h"
-#include "filter/vfolder-editor.h"
-
-#include "filter/filter-context.h"
-#include "filter/filter-filter.h"
-#include "filter/filter-editor.h"
-#include "filter/filter-option.h"
-
-static void
-rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddress *iaddr)
-{
-	FilterPart *part;
-	FilterElement *element;
-	int i;
-	const char *real, *addr;
-	char *namestr;
-	
-	/* address types etc should handle multiple values */
-	for (i = 0; camel_internet_address_get (iaddr, i, &real, &addr); i++) {
-		part = rule_context_create_part (context, "to");
-		filter_rule_add_part ((FilterRule *)rule, part);
-		element = filter_part_find_element (part, "recipient-type");
-		filter_option_set_current ((FilterOption *)element, "contains");
-		element = filter_part_find_element (part, "recipient");
-		filter_input_set_value ((FilterInput *)element, addr);
-		
-		namestr = g_strdup_printf (_("Mail to %s"), real && real[0] ? real : addr);
-		filter_rule_set_name (rule, namestr);
-		g_free (namestr);
-	}
-}
-
-
-/* remove 're' part of a subject */
-static const char *
-strip_re (const char *subject)
-{
-	const unsigned char *s, *p;
-	
-	s = (unsigned char *) subject;
-	
-	while (*s) {
-		while (isspace (*s))
-			s++;
-		if (s[0] == 0)
-			break;
-		if ((s[0] == 'r' || s[0] == 'R')
-		    && (s[1] == 'e' || s[1] == 'E')) {
-			p = s+2;
-			while (isdigit (*p) || (ispunct (*p) && (*p != ':')))
-				p++;
-			if (*p == ':') {
-				s = p + 1;
-			} else
-				break;
-		} else
-			break;
-	}
-	return (char *) s;
-}
-
-#if 0
-int
-reg_match (char *str, char *regstr)
-{
-	regex_t reg;
-	int error;
-	int ret;
-
-	error = regcomp(&reg, regstr, REG_EXTENDED|REG_ICASE|REG_NOSUB);
-	if (error != 0) {
-		return 0;
-	}
-	error = regexec(&reg, str, 0, NULL, 0);
-	regfree(&reg);
-	return (error == 0);
-}
-#endif
-
-static void
-rule_add_subject (RuleContext *context, FilterRule *rule, const char *text)
-{
-	FilterPart *part;
-	FilterElement *element;
-
-	/* dont match on empty strings ever */
-	if (*text == 0)
-		return;
-	part = rule_context_create_part (context, "subject");
-	filter_rule_add_part ((FilterRule *)rule, part);
-	element = filter_part_find_element (part, "subject-type");
-	filter_option_set_current ((FilterOption *)element, "contains");
-	element = filter_part_find_element (part, "subject");
-	filter_input_set_value ((FilterInput *)element, text);
-}
-
-static void
-rule_add_sender (RuleContext *context, FilterRule *rule, const char *text)
-{
-	FilterPart *part;
-	FilterElement *element;
-	
-	/* dont match on empty strings ever */
-	if (*text == 0)
-		return;
-	part = rule_context_create_part (context, "sender");
-	filter_rule_add_part ((FilterRule *)rule, part);
-	element = filter_part_find_element (part, "sender-type");
-	filter_option_set_current ((FilterOption *)element, "contains");
-	element = filter_part_find_element (part, "sender");
-	filter_input_set_value ((FilterInput *)element, text);
-}
-
-/* do a bunch of things on the subject to try and detect mailing lists, remove
-   unneeded stuff, etc */
-static void
-rule_match_subject (RuleContext *context, FilterRule *rule, const char *subject)
-{
-	const char *s;
-	const char *s1, *s2;
-	char *tmp;
-	
-	s = strip_re (subject);
-	/* dont match on empty subject */
-	if (*s == 0)
-		return;
-	
-	/* [blahblah] is probably a mailing list, match on it separately */
-	s1 = strchr (s, '[');
-	s2 = strchr (s, ']');
-	if (s1 && s2 && s1 < s2) {
-		/* probably a mailing list, match on the mailing list name */
-		tmp = alloca (s2 - s1 + 2);
-		memcpy (tmp, s1, s2 - s1 + 1);
-		tmp[s2 - s1 + 1] = 0;
-		g_strstrip (tmp);
-		rule_add_subject (context, rule, tmp);
-		s = s2 + 1;
-	}
-	/* Froblah: at the start is probably something important (e.g. bug number) */
-	s1 = strchr (s, ':');
-	if (s1) {
-		tmp = alloca (s1 - s + 1);
-		memcpy (tmp, s, s1-s);
-		tmp[s1 - s] = 0;
-		g_strstrip (tmp);
-		rule_add_subject (context, rule, tmp);
-		s = s1+1;
-	}
-	
-	/* just lump the rest together */
-	tmp = alloca (strlen (s) + 1);
-	strcpy (tmp, s);
-	g_strstrip (tmp);
-	rule_add_subject (context, rule, tmp);
-}
-
-static void
-rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg, int flags)
-{
-	CamelInternetAddress *addr;
-	
-	rule->grouping = FILTER_GROUP_ANY;
-	
-	if (flags & AUTO_SUBJECT) {
-		char *namestr;
-		
-		rule_match_subject (context, rule, msg->subject);
-		
-		namestr = g_strdup_printf (_("Subject is %s"), strip_re (msg->subject));
-		filter_rule_set_name (rule, namestr);
-		g_free (namestr);
-	}
-	/* should parse the from address into an internet address? */
-	if (flags & AUTO_FROM) {
-		const CamelInternetAddress *from;
-		int i;
-		const char *name, *addr;
-		char *namestr;
-
-		from = camel_mime_message_get_from(msg);
-		for (i=0;camel_internet_address_get(from, i, &name, &addr); i++) {
-			rule_add_sender(context, rule, addr);
-			if (name==NULL || name[0]==0)
-				name = addr;
-			namestr = g_strdup_printf(_("Mail from %s"), name);
-			filter_rule_set_name(rule, namestr);
-			g_free(namestr);
-		}
-	}
-	if (flags & AUTO_TO) {
-		addr = (CamelInternetAddress *)camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_TO);
-		rule_match_recipients (context, rule, addr);
-		addr = (CamelInternetAddress *)camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_CC);
-		rule_match_recipients (context, rule, addr);
-	}
-}
-
-FilterRule *
-vfolder_rule_from_message (VfolderContext *context, CamelMimeMessage *msg, int flags, const char *source)
-{
-	VfolderRule *rule;
-	
-	rule = vfolder_rule_new ();
-	vfolder_rule_add_source (rule, source);
-	rule_from_message ((FilterRule *)rule, (RuleContext *)context, msg, flags);
-	
-	return (FilterRule *)rule;
-}
-
-FilterRule *
-filter_rule_from_message(FilterContext *context, CamelMimeMessage *msg, int flags)
-{
-	FilterFilter *rule;
-	
-	rule = filter_filter_new ();
-	rule_from_message ((FilterRule *)rule, (RuleContext *)context, msg, flags);
-	
-	/* should we define the default action? */
-	
-	return (FilterRule *)rule;
-}
-
-static void
-rule_from_mlist(FilterRule *rule, RuleContext *context, const char *mlist)
-{
-	FilterPart *part;
-	FilterElement *element;
-	char *rule_name;
-
-	part = rule_context_create_part(context, "mlist");
-	filter_rule_add_part(rule, part);
-	
-	element = filter_part_find_element(part, "mlist-type");
-	filter_option_set_current((FilterOption *)element, "is");
-	
-	element = filter_part_find_element (part, "mlist");
-	filter_input_set_value((FilterInput *)element, mlist);
-	
-	rule_name = g_strdup_printf(_("%s mailing list"), mlist);
-	filter_rule_set_name((FilterRule *) rule, rule_name);
-	g_free (rule_name);
-}
-
-FilterRule *
-vfolder_rule_from_mlist(VfolderContext *context, const char *mlist, const char *source)
-{
-	VfolderRule *rule;
-	
-	rule = vfolder_rule_new ();
-	vfolder_rule_add_source (rule, source);
-	rule_from_mlist((FilterRule *)rule, (RuleContext *)context, mlist);
-
-	return (FilterRule *)rule;
-}
-
-FilterRule *
-filter_rule_from_mlist(FilterContext *context, const char *mlist)
-{
-	FilterFilter *rule;
-	
-	rule = filter_filter_new ();
-	rule_from_mlist((FilterRule *)rule, (RuleContext *)context, mlist);
-	
-	/* should we define the default action? */
-	
-	return (FilterRule *)rule;
-}
-
-void
-filter_gui_add_from_message (CamelMimeMessage *msg, int flags)
-{
-	FilterContext *fc;
-	char *userrules, *systemrules;
-	FilterRule *rule;
-	extern char *evolution_dir;
-
-	g_return_if_fail (msg != NULL);
-	
-	fc = filter_context_new ();
-	userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	systemrules = g_strdup_printf ("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	rule_context_load ((RuleContext *)fc, systemrules, userrules);
-	rule = filter_rule_from_message (fc, msg, flags);
-	
-	filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
-	
-	rule_context_add_rule_gui ((RuleContext *)fc, rule, _("Add Filter Rule"), userrules);
-	g_free (userrules);
-	g_free (systemrules);
-	gtk_object_unref (GTK_OBJECT (fc));
-}
-
-void
-filter_gui_add_from_mlist (const char *mlist)
-{
-	FilterContext *fc;
-	char *userrules, *systemrules;
-	FilterRule *rule;
-	extern char *evolution_dir;
-
-	fc = filter_context_new ();
-	userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	systemrules = g_strdup_printf ("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	rule_context_load ((RuleContext *)fc, systemrules, userrules);
-	rule = filter_rule_from_mlist(fc, mlist);
-	
-	filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
-	
-	rule_context_add_rule_gui ((RuleContext *)fc, rule, _("Add Filter Rule"), userrules);
-	g_free (userrules);
-	g_free (systemrules);
-	gtk_object_unref (GTK_OBJECT (fc));
-}
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
deleted file mode 100644
index ab36b68d33..0000000000
--- a/mail/mail-autofilter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-autofilter.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Michael Zucchi <notzed@helixcode.com>
- *   Ettore Perazzoli <ettore@helixcode.com>
- */
-
-#ifndef _MAIL_AUTOFILTER_H
-#define _MAIL_AUTOFILTER_H
-
-#include "filter/filter-rule.h"
-#include "filter/filter-context.h"
-#include "filter/vfolder-context.h"
-#include "camel/camel-mime-message.h"
-
-enum {
-	AUTO_SUBJECT = 1,
-	AUTO_FROM = 2,
-	AUTO_TO = 4
-};
-
-FilterRule *vfolder_rule_from_message(VfolderContext *context, CamelMimeMessage *msg, int flags, const char *source);
-FilterRule *filter_rule_from_message(FilterContext *context, CamelMimeMessage *msg, int flags);
-FilterRule *vfolder_rule_from_mlist(VfolderContext *context, const char *mlist, const char *source);
-FilterRule *filter_rule_from_mlist(FilterContext *context, const char *mlist);
-
-/* easiest place to put this */
-
-void  filter_gui_add_from_message      (CamelMimeMessage *msg,
-					int               flags);
-void filter_gui_add_from_mlist (const char *mlist);
-
-#endif
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
deleted file mode 100644
index 1bb6a15871..0000000000
--- a/mail/mail-callbacks.c
+++ /dev/null
@@ -1,1432 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Authors: 
- *  Dan Winship <danw@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <gnome.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "mail-config.h"
-#include "mail-accounts.h"
-#include "mail-config-druid.h"
-#include "mail-mt.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-local.h"
-#include "mail-send-recv.h"
-#include "mail-vfolder.h"
-#include "folder-browser.h"
-#include "subscribe-dialog.h"
-#include "filter/filter-editor.h"
-#include <gal/e-table/e-table.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "e-messagebox.h"
-
-/* FIXME: is there another way to do this? */
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-client.h"
-
-#ifndef HAVE_MKSTEMP
-#include <fcntl.h>
-#include <sys/stat.h>
-#endif
-
-struct post_send_data {
-	CamelFolder *folder;
-	gchar *uid;
-	guint32 flags;
-};
-
-static void
-druid_destroyed (void)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-configure_mail (FolderBrowser *fb)
-{
-	MailConfigDruid *druid;
-	
-	if (fb) {
-		GtkWidget *dialog;
-		
-		dialog = gnome_message_box_new (
-			_("You have not configured the mail client.\n"
-			  "You need to do this before you can send,\n"
-			  "receive or compose mail.\n"
-			  "Would you like to configure it now?"),
-			GNOME_MESSAGE_BOX_QUESTION,
-			GNOME_STOCK_BUTTON_YES,
-			GNOME_STOCK_BUTTON_NO, NULL);
-		
-		/*
-		 * Focus YES
-		 */
-		gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-		gtk_widget_grab_focus (GTK_WIDGET (GNOME_DIALOG (dialog)->buttons->data));
-		
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog),
-					 GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb), GTK_TYPE_WINDOW)));
-		
-		switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) {
-		case 0:
-			druid = mail_config_druid_new (fb->shell);
-			gtk_signal_connect (GTK_OBJECT (druid), "destroy",
-					    GTK_SIGNAL_FUNC (druid_destroyed), NULL);
-			gtk_widget_show (GTK_WIDGET (druid));
-			gtk_grab_add (GTK_WIDGET (druid));
-			gtk_main ();
-			break;
-		case 1:
-		default:
-			break;
-		}
-	}
-	
-	return mail_config_is_configured ();
-}
-
-static gboolean
-check_send_configuration (FolderBrowser *fb)
-{
-	const MailConfigAccount *account;
-	
-	/* Check general */
-	if (!mail_config_is_configured ()) {
-		if (!configure_mail (fb))
-			return FALSE;
-	}
-	
-	/* Get the default account */
-	account = mail_config_get_default_account ();
-	
-	/* Check for an identity */
-	if (!account) {
-		GtkWidget *message;
-		
-		message = gnome_warning_dialog_parented (_("You need to configure an identity\n"
-							   "before you can compose mail."),
-							 GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb),
-											      GTK_TYPE_WINDOW)));
-		gnome_dialog_run_and_close (GNOME_DIALOG (message));
-		return FALSE;
-	}
-	
-	/* Check for a transport */
-	if (!account->transport || !account->transport->url) {
-		GtkWidget *message;
-		
-		message = gnome_warning_dialog_parented (_("You need to configure a mail transport\n"
-							   "before you can compose mail."),
-							 GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb),
-											      GTK_TYPE_WINDOW)));
-		gnome_dialog_run_and_close (GNOME_DIALOG (message));
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-#if 0
-/* FIXME: is this still required when we send & receive email ?  I am not so sure ... */
-static void
-main_select_first_unread (CamelObject *object, gpointer event_data, gpointer data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (data);
-	/*ETable *table = E_TABLE_SCROLLED (fb->message_list->etable)->table;*/
-	
-	message_list_select (fb->message_list, 0, MESSAGE_LIST_SELECT_NEXT,
-  			     0, CAMEL_MESSAGE_SEEN);
-}
-
-static void
-select_first_unread (CamelObject *object, gpointer event_data, gpointer data)
-{
-	mail_op_forward_event (main_select_first_unread, object, event_data, data);
-}
-#endif
-
-void
-send_receive_mail (GtkWidget *widget, gpointer user_data)
-{
-	const MailConfigAccount *account;
-	
-	/* receive first then send, this is a temp fix for POP-before-SMTP */
-	if (!mail_config_is_configured ()) {
-		if (!configure_mail (FOLDER_BROWSER (user_data)))
-			return;
-	}
-	
-	account = mail_config_get_default_account ();
-	if (!account || !account->transport) {
-		GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data), GTK_TYPE_WINDOW);
-		gnome_error_dialog_parented (_("You have not set a mail transport method"), GTK_WINDOW (win));
-		return;
-	}
-	
-	mail_send_receive ();
-}
-
-static void
-empty_subject_destroyed (GtkWidget *widget, gpointer data)
-{
-	gboolean *show_again = data;
-	GtkWidget *checkbox;
-	
-	checkbox = e_message_box_get_checkbox (E_MESSAGE_BOX (widget));
-	*show_again = !GTK_TOGGLE_BUTTON (checkbox)->active;
-}
-
-static gboolean
-ask_confirm_for_empty_subject (EMsgComposer *composer)
-{
-	/* FIXME: EMessageBox should really handle this stuff
-           automagically. What Miguel thinks would be nice is to pass
-           in a message-id which could be used as a key in the config
-           file and the value would be an int. -1 for always show or
-           the button pressed otherwise. This probably means we'd have
-           to write e_messagebox_run () */
-	gboolean show_again = TRUE;
-	GtkWidget *mbox;
-	int button;
-	
-	if (!mail_config_get_prompt_empty_subject ())
-		return TRUE;
-	
-	mbox = e_message_box_new (_("This message has no subject.\nReally send?"),
-				  E_MESSAGE_BOX_QUESTION,
-				  GNOME_STOCK_BUTTON_YES,
-				  GNOME_STOCK_BUTTON_NO,
-				  NULL);
-	
-	gtk_signal_connect (GTK_OBJECT (mbox), "destroy",
-			    empty_subject_destroyed, &show_again);
-	
-	button = gnome_dialog_run_and_close (GNOME_DIALOG (mbox));
-	
-	mail_config_set_prompt_empty_subject (show_again);
-	
-	if (button == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static void
-free_psd (GtkWidget *composer, gpointer user_data)
-{
-	struct post_send_data *psd = user_data;
-	
-	if (psd->folder)
-		camel_object_unref (CAMEL_OBJECT (psd->folder));
-	if (psd->uid)
-		g_free (psd->uid);
-	g_free (psd);
-}
-
-struct _send_data {
-	EMsgComposer *composer;
-	struct post_send_data *psd;
-};
-
-static void
-composer_sent_cb(char *uri, CamelMimeMessage *message, gboolean sent, void *data)
-{
-	struct _send_data *send = data;
-	
-	if (sent) {
-		if (send->psd) {
-			camel_folder_set_message_flags (send->psd->folder, send->psd->uid,
-							send->psd->flags, send->psd->flags);
-		}
-		gtk_widget_destroy (GTK_WIDGET (send->composer));
-	} else {
-		gtk_widget_show (GTK_WIDGET (send->composer));
-		gtk_object_unref (GTK_OBJECT (send->composer));
-	}
-	g_free (send);
-}
-
-void
-composer_send_cb (EMsgComposer *composer, gpointer data)
-{
-	const MailConfigAccount *account = NULL;
-	CamelMimeMessage *message;
-	const CamelInternetAddress *iaddr;
-	const char *subject;
-	struct post_send_data *psd = data;
-	struct _send_data *send;
-	
-	if (!mail_config_is_configured ()) {
-		GtkWidget *dialog;
-		
-		dialog = gnome_ok_dialog_parented (_("You must configure an account before you "
-						     "can send this email."),
-						   GTK_WINDOW (composer));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		return;
-	}
-	
-	/* Use the preferred account */
-	account = e_msg_composer_get_preferred_account (composer);
-	if (!account)
-		account = mail_config_get_default_account ();
-	
-	/* Get the message */
-	message = e_msg_composer_get_message (composer);
-	if (message == NULL)
-		return;
-	
-	/* Check for no recipients */
-	iaddr = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	if (!iaddr || CAMEL_ADDRESS (iaddr)->addresses->len == 0) {
-		GtkWidget *message_box;
-		
-		message_box = gnome_message_box_new (_("You must specify recipients in order to "
-						       "send this message."),
-						     GNOME_MESSAGE_BOX_WARNING,
-						     GNOME_STOCK_BUTTON_OK,
-						     NULL);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (message_box));
-		
-		camel_object_unref (CAMEL_OBJECT (message));
-		return;
-	}
-	
-	/* Check for no subject */
-	subject = camel_mime_message_get_subject (message);
-	if (subject == NULL || subject[0] == '\0') {
-		if (!ask_confirm_for_empty_subject (composer)) {
-			camel_object_unref (CAMEL_OBJECT (message));
-			return;
-		}
-	}
-	
-	send = g_malloc (sizeof (*send));
-	send->psd = psd;
-	send->composer = composer;
-	gtk_object_ref (GTK_OBJECT (composer));
-	gtk_widget_hide (GTK_WIDGET (composer));
-	mail_send_mail (account->transport->url, message, composer_sent_cb, send);
-}
-
-void
-composer_postpone_cb (EMsgComposer *composer, gpointer data)
-{
-	const MailConfigAccount *account = NULL;
-	extern CamelFolder *outbox_folder;
-	CamelMimeMessage *message;
-	struct post_send_data *psd = data;
-	const char *subject;
-	
-	/* Get the message */
-	message = e_msg_composer_get_message (composer);
-	if (message == NULL)
-		return;
-	
-	/* Check for no subject */
-	subject = camel_mime_message_get_subject (message);
-	if (subject == NULL || subject[0] == '\0') {
-		if (!ask_confirm_for_empty_subject (composer)) {
-			camel_object_unref (CAMEL_OBJECT (message));
-			return;
-		}
-	}
-	
-	/* Attach a X-Evolution-Transport header so we know which account
-	   to use when it gets sent later. */
-	account = e_msg_composer_get_preferred_account (composer);
-	if (!account)
-		account = mail_config_get_default_account ();
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url);
-	
-	/* Save the message in Outbox */
-	mail_append_mail (outbox_folder, message, NULL, NULL, NULL);
-	
-	if (psd)
-		camel_folder_set_message_flags (psd->folder, psd->uid, psd->flags, psd->flags);
-	
-	gtk_widget_destroy (GTK_WIDGET (composer));
-}
-
-static GtkWidget *
-create_msg_composer (const char *url)
-{
-	const MailConfigAccount *account;
-	gboolean send_html;
-	gchar *sig_file = NULL;
-	EMsgComposer *composer;
-	
-	account = mail_config_get_default_account ();
-	send_html = mail_config_get_send_html ();
-	
-	if (account->id)
-		sig_file = account->id->signature;
-	
-	if (url != NULL) {
-		composer = e_msg_composer_new_from_url (url);
-		if (composer)
-			e_msg_composer_set_send_html (composer, send_html);
-	} else
-		composer = e_msg_composer_new_with_sig_file (sig_file, send_html);
-	
-	return (GtkWidget *)composer;
-}
-
-void
-compose_msg (GtkWidget *widget, gpointer user_data)
-{
-	GtkWidget *composer;
-
-	if (!check_send_configuration (FOLDER_BROWSER (user_data)))
-		return;
-	
-	composer = create_msg_composer (NULL);
-	if (!composer)
-		return;
-	
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (composer), "postpone",
-			    GTK_SIGNAL_FUNC (composer_postpone_cb), NULL);
-	
-	gtk_widget_show (composer);
-}
-
-/* Send according to a mailto (RFC 2368) URL. */
-void
-send_to_url (const char *url)
-{
-	GtkWidget *composer;
-	
-	/* FIXME: no way to get folder browser? Not without
-	 * big pain in the ass, as far as I can tell */
-	if (!check_send_configuration (NULL))
-		return;
-	
-	composer = create_msg_composer (url);
-	if (!composer)
-		return;
-	
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (composer), "postpone",
-			    GTK_SIGNAL_FUNC (composer_postpone_cb), NULL);
-	
-	gtk_widget_show (composer);
-}	
-
-static GList *
-list_add_addresses (GList *list, const CamelInternetAddress *cia, const GSList *accounts, const MailConfigAccount **me)
-{
-	const char *name, *addr;
-	const GSList *l;
-	gboolean notme;
-	char *full;
-	int i;
-	
-	for (i = 0; camel_internet_address_get (cia, i, &name, &addr); i++) {
-		/* now, we format this, as if for display, but does the composer
-		   then use it as a real address?  If so, very broken. */
-		/* we should probably pass around CamelAddresse's if thats what
-		   we mean */
-		full = camel_internet_address_format_address (name, addr);
-		
-		/* Here I'll check to see if the cc:'d address is the address
-		   of the sender, and if so, don't add it to the cc: list; this
-		   is to fix Bugzilla bug #455. */
-		notme = TRUE;
-		l = accounts;
-		while (l) {
-			const MailConfigAccount *acnt = l->data;
-			
-			if (!strcmp (acnt->id->address, addr)) {
-				notme = FALSE;
-				if (me && !*me)
-					*me = acnt;
-				break;
-			}
-			
-			l = l->next;
-		}
-		
-		if (notme)
-			list = g_list_append (list, full);
-		else
-			g_free (full);
-	}
-	
-	return list;
-}
-
-static const MailConfigAccount *
-guess_me (const CamelInternetAddress *to, const CamelInternetAddress *cc, const GSList *accounts)
-{
-	const char *name, *addr;
-	const GSList *l;
-	gboolean notme;
-	char *full;
-	int i;
-	
-	if (to) {
-		for (i = 0; camel_internet_address_get (to, i, &name, &addr); i++) {
-			full = camel_internet_address_format_address (name, addr);
-			l = accounts;
-			while (l) {
-				const MailConfigAccount *acnt = l->data;
-				
-				if (!strcmp (acnt->id->address, addr)) {
-					notme = FALSE;
-					return acnt;
-				}
-				
-				l = l->next;
-			}
-		}
-	}
-	
-	if (cc) {
-		for (i = 0; camel_internet_address_get (cc, i, &name, &addr); i++) {
-			full = camel_internet_address_format_address (name, addr);
-			l = accounts;
-			while (l) {
-				const MailConfigAccount *acnt = l->data;
-				
-				if (!strcmp (acnt->id->address, addr)) {
-					notme = FALSE;
-					return acnt;
-				}
-				
-				l = l->next;
-			}
-		}
-	}
-	
-	return NULL;
-}
-
-static void
-free_recipients (GList *list)
-{
-	GList *l;
-	
-	for (l = list; l; l = l->next)
-		g_free (l->data);
-	g_list_free (list);
-}
-
-static EMsgComposer *
-mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
-{
-	const CamelInternetAddress *reply_to, *sender, *to_addrs, *cc_addrs;
-	const char *name = NULL, *address = NULL;
-	const char *message_id, *references;
-	char *text, *subject, *date_str;
-	const MailConfigAccount *me = NULL;
-	const MailConfigIdentity *id;
-	const GSList *accounts = NULL;
-	GList *to = NULL, *cc = NULL;
-	EMsgComposer *composer;
-	gchar *sig_file = NULL;
-	time_t date;
-	int offset;
-	
-	id = mail_config_get_default_identity ();
-	if (id)
-	      sig_file = id->signature;
-	
-	composer = e_msg_composer_new_with_sig_file (sig_file, mail_config_get_send_html ());
-	if (!composer)
-		return NULL;
-	
-	/* FIXME: should probably use a shorter date string */
-	sender = camel_mime_message_get_from (message);
-	camel_internet_address_get (sender, 0, &name, &address);
-	date = camel_mime_message_get_date (message, &offset);
-	date_str = header_format_date (date, offset);
-	text = mail_tool_quote_message (message, _("On %s, %s wrote:\n"), date_str, name && *name ? name : address);
-	g_free (date_str);
-	
-	if (text) {
-		e_msg_composer_set_body_text (composer, text);
-		g_free (text);
-		e_msg_composer_mark_text_orig (composer);
-	}
-	
-	/* Set the recipients */
-	accounts = mail_config_get_accounts ();
-	
-	reply_to = camel_mime_message_get_reply_to (message);
-	if (!reply_to)
-		reply_to = camel_mime_message_get_from (message);
-	if (reply_to)
-		to = g_list_append (to, camel_address_format (CAMEL_ADDRESS (reply_to)));
-	
-	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-	
-	if (to_all) {
-		cc = list_add_addresses (cc, to_addrs, accounts, &me);
-		cc = list_add_addresses (cc, cc_addrs, accounts, me ? NULL : &me);
-	} else {
-		me = guess_me (to_addrs, cc_addrs, accounts);
-	}
-	
-	/* Set the subject of the new message. */
-	subject = (char *)camel_mime_message_get_subject (message);
-	if (!subject)
-		subject = g_strdup ("");
-	else {
-		if (!g_strncasecmp (subject, "Re: ", 4))
-			subject = g_strdup (subject);
-		else
-			subject = g_strdup_printf ("Re: %s", subject);
-	}
-	
-	e_msg_composer_set_headers (composer, me ? me->name : NULL, to, cc, NULL, subject);
-	free_recipients (to);
-	free_recipients (cc);
-	g_free (subject);
-	
-	/* Add In-Reply-To and References. */
-	message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id");
-	references = camel_medium_get_header (CAMEL_MEDIUM (message), "References");
-	if (message_id) {
-		char *reply_refs;
-		
-		e_msg_composer_add_header (composer, "In-Reply-To", message_id);
-		
-		if (references)
-			reply_refs = g_strdup_printf ("%s %s", references, message_id);
-		else
-			reply_refs = g_strdup (message_id);
-		
-		e_msg_composer_add_header (composer, "References", reply_refs);
-		g_free (reply_refs);
-	} else if (references) {
-		e_msg_composer_add_header (composer, "References", references);
-	}
-	
-	return composer;
-}
-
-void
-mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, gboolean to_all)
-{
-	EMsgComposer *composer;
-	struct post_send_data *psd;
-	
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (msg != NULL);
-	g_return_if_fail (uid != NULL);
-
-	psd = g_new (struct post_send_data, 1);
-	psd->folder = folder;
-	camel_object_ref (CAMEL_OBJECT (psd->folder));
-	psd->uid = g_strdup (uid);
-	psd->flags = CAMEL_MESSAGE_ANSWERED;
-	
-	composer = mail_generate_reply (msg, to_all);
-	if (!composer)
-		return;
-	
-	gtk_signal_connect (GTK_OBJECT (composer), "send",
-			    GTK_SIGNAL_FUNC (composer_send_cb), psd);
-	gtk_signal_connect (GTK_OBJECT (composer), "postpone",
-			    GTK_SIGNAL_FUNC (composer_postpone_cb), psd);
-	gtk_signal_connect (GTK_OBJECT (composer), "destroy",
-			    GTK_SIGNAL_FUNC (free_psd), psd);
-
-	gtk_widget_show (GTK_WIDGET (composer));	
-	e_msg_composer_unset_changed (composer);
-}
-
-void
-reply_to_sender (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	mail_reply (fb->folder, fb->mail_display->current_message, 
-		    fb->message_list->cursor_uid, FALSE);
-}
-
-void
-reply_to_all (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-
-	if (!check_send_configuration (fb))
-		return;
-
-	mail_reply (fb->folder, fb->mail_display->current_message, 
-	       fb->message_list->cursor_uid, TRUE);
-}
-
-void
-enumerate_msg (MessageList *ml, const char *uid, gpointer data)
-{
-	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
-}
-
-
-static EMsgComposer *
-forward_get_composer (const char *subject)
-{
-	const MailConfigAccount *account;
-	EMsgComposer *composer;
-	
-	account = mail_config_get_default_account ();
-	composer = e_msg_composer_new_with_sig_file (account && account->id ? account->id->signature : NULL,
-						     mail_config_get_send_html ());
-	if (composer) {
-		gtk_signal_connect (GTK_OBJECT (composer), "send",
-				    GTK_SIGNAL_FUNC (composer_send_cb), NULL);
-		gtk_signal_connect (GTK_OBJECT (composer), "postpone",
-				    GTK_SIGNAL_FUNC (composer_postpone_cb), NULL);
-		e_msg_composer_set_headers (composer, account->name, NULL, NULL, NULL, subject);
-	} else {
-		g_warning("Could not create composer");
-	}
-
-	return composer;
-}
-
-static void
-do_forward_inline(CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data)
-{
-	char *subject;
-	char *text;
-
-	if (message) {
-		subject = mail_tool_generate_forward_subject(message);
-		text = mail_tool_quote_message (message, _("Forwarded message:\n"));
-
-		if (text) {
-			EMsgComposer *composer = forward_get_composer(subject);
-			if (composer) {
-				e_msg_composer_set_body_text(composer, text);
-				gtk_widget_show(GTK_WIDGET(composer));
-				e_msg_composer_unset_changed(composer);
-			}
-			g_free(text);
-		}
-
-		g_free(subject);
-	}
-}
-
-static void
-do_forward_attach(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data)
-{
-	if (part) {
-		EMsgComposer *composer = forward_get_composer(subject);
-		if (composer) {
-			e_msg_composer_attach(composer, part);
-			gtk_widget_show(GTK_WIDGET(composer));
-			e_msg_composer_unset_changed(composer);
-		}
-	}
-}
-
-void
-forward_messages (CamelFolder *folder, GPtrArray *uids, gboolean doinline)
-{
-	if (doinline && uids->len == 1) {
-		mail_get_message(folder, uids->pdata[0], do_forward_inline, NULL, mail_thread_new);
-	} else {
-		mail_build_attachment(folder, uids, do_forward_attach, NULL);
-	}
-}
-
-void
-forward_inlined (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	g_ptr_array_add (uids, g_strdup (fb->message_list->cursor_uid));
-	forward_messages (fb->message_list->folder, uids, TRUE);
-	g_free (uids->pdata[0]);
-	g_ptr_array_free (uids, TRUE);
-}
-
-void
-forward_attached (GtkWidget *widget, gpointer user_data)
-{
-	GPtrArray *uids;
-	FolderBrowser *fb = (FolderBrowser *)user_data;
-
-	if (!check_send_configuration (fb))
-		return;
-
-	uids = g_ptr_array_new();
-	message_list_foreach(fb->message_list, enumerate_msg, uids);
-	forward_messages(fb->message_list->folder, uids, FALSE);
-}
-
-static void
-transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source)
-{
-	FolderBrowser *fb = user_data;
-	MessageList *ml = fb->message_list;
-	GPtrArray *uids;
-	char *uri, *physical, *path;
-	char *desc;
-	const char *allowed_types[] = { "mail", NULL };
-	extern EvolutionShellClient *global_shell_client;
-	static char *last = NULL;
-	
-	if (last == NULL)
-		last = g_strdup ("");
-	
-	if (delete_from_source)
-		desc = _("Move message(s) to");
-	else
-		desc = _("Copy message(s) to");
-	
-	evolution_shell_client_user_select_folder  (global_shell_client,
-						    desc,
-						    last, allowed_types, &uri, &physical);
-	if (!uri)
-		return;
-	
-	path = strchr (uri, '/');
-	if (path && strcmp (last, path) != 0) {
-		g_free (last);
-		last = g_strdup (path);
-	}
-	g_free (uri);
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (ml, enumerate_msg, uids);
-	mail_do_transfer_messages (ml->folder, uids, delete_from_source, physical);
-}
-
-void
-move_msg (GtkWidget *widget, gpointer user_data)
-{
-	transfer_msg (widget, user_data, TRUE);
-}
-
-void
-copy_msg (GtkWidget *widget, gpointer user_data)
-{
-	transfer_msg (widget, user_data, FALSE);
-}
-
-void
-apply_filters (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-        MessageList *ml = fb->message_list;
-	GPtrArray *uids;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (ml, enumerate_msg, uids);
-
-	mail_filter_on_demand(fb->folder, uids);
-}
-
-void
-select_all (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-        MessageList *ml = fb->message_list;
-
-	if (ml->folder == NULL)
-		return;
-
-	e_table_select_all (ml->table);
-}
-
-void
-invert_selection (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-        MessageList *ml = fb->message_list;
-
-	if (ml->folder == NULL)
-		return;
-
-	e_table_invert_selection (ml->table);
-}
-
-/* flag all selected messages */
-static void
-flag_messages(FolderBrowser *fb, guint32 mask, guint32 set)
-{
-        MessageList *ml = fb->message_list;
-	GPtrArray *uids;
-	int i;
-
-	if (ml->folder == NULL)
-		return;
-
-	/* could just use specific callback but i'm lazy */
-	uids = g_ptr_array_new ();
-	message_list_foreach (ml, enumerate_msg, uids);
-	camel_folder_freeze(ml->folder);
-	for (i=0;i<uids->len;i++) {
-		camel_folder_set_message_flags(ml->folder, uids->pdata[i], mask, set);
-		g_free(uids->pdata[i]);
-	}
-	camel_folder_thaw(ml->folder);
-
-	g_ptr_array_free(uids, TRUE);
-}
-
-void
-mark_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	flag_messages(FOLDER_BROWSER(user_data), CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-}
-
-void
-mark_as_unseen (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	flag_messages(FOLDER_BROWSER(user_data), CAMEL_MESSAGE_SEEN, 0);
-}
-
-static void
-do_edit_messages(CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	/*FolderBrowser *fb = data;*/
-	int i;
-
-	for (i=0; i<messages->len; i++) {
-		EMsgComposer *composer;
-
-		composer = e_msg_composer_new_with_message(messages->pdata[i]);
-		if (composer) {
-			gtk_signal_connect (GTK_OBJECT (composer), "send",
-					    composer_send_cb, NULL);
-			gtk_signal_connect (GTK_OBJECT (composer), "postpone",
-					    composer_postpone_cb, NULL);
-			gtk_widget_show (GTK_WIDGET (composer));
-		}
-	}
-}
-				   
-void
-edit_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids;
-	extern CamelFolder *drafts_folder;
-	
-	if (fb->folder != drafts_folder) {
-		GtkWidget *message;
-		
-		message = gnome_warning_dialog (_("You may only edit messages saved\n"
-						  "in the Drafts folder."));
-		gnome_dialog_run_and_close (GNOME_DIALOG (message));
-		return;
-	}
-	
-	if (!check_send_configuration (fb))
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	mail_get_messages(fb->folder, uids, do_edit_messages, fb);
-}
-
-static void
-save_msg_ok (GtkWidget *widget, gpointer user_data)
-{
-	CamelFolder *folder;
-	GPtrArray *uids;
-	char *path;
-	int fd, ret = 0;
-	
-	/* FIXME: is path an allocated string? */
-	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (user_data));
-	
-        fd = open (path, O_RDONLY);
-	if (fd != -1) {
-		GtkWidget *dlg;
-		GtkWidget *text;
-		
-		close (fd);
-		
-		dlg = gnome_dialog_new (_("Overwrite file?"),
-					GNOME_STOCK_BUTTON_YES, 
-					GNOME_STOCK_BUTTON_NO,
-					NULL);
-		text = gtk_label_new (_("A file by that name already exists.\nOverwrite it?"));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), text, TRUE, TRUE, 4);
-		gtk_window_set_policy (GTK_WINDOW (dlg), FALSE, TRUE, FALSE);
-		gtk_widget_show (text);
-		
-		ret = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-	}
-	
-	if (ret == 0) {
-		folder = gtk_object_get_data (GTK_OBJECT (user_data), "folder");
-		uids = gtk_object_get_data (GTK_OBJECT (user_data), "uids");
-		gtk_object_remove_no_notify (GTK_OBJECT (user_data), "uids");
-		mail_save_messages (folder, uids, path, NULL, NULL);
-		gtk_widget_destroy (GTK_WIDGET (user_data));
-	}
-}
-
-static void
-save_msg_destroy (gpointer user_data)
-{
-	GPtrArray *uids = user_data;
-	
-	if (uids) {
-		int i;
-		
-		for (i = 0; i < uids->len; i++)
-			g_free (uids->pdata[i]);
-		
-		g_ptr_array_free (uids, TRUE);
-	}
-}
-
-void
-save_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GtkFileSelection *filesel;
-	GPtrArray *uids;
-	char *title;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	
-	if (uids->len == 1)
-		title = _("Save Message As...");
-	else
-		title = _("Save Messages As...");
-	
-	filesel = GTK_FILE_SELECTION (gtk_file_selection_new (title));
-	gtk_object_set_data_full (GTK_OBJECT (filesel), "uids", uids, save_msg_destroy);
-	gtk_object_set_data (GTK_OBJECT (filesel), "folder", fb->folder);
-	gtk_signal_connect (GTK_OBJECT (filesel->ok_button),
-			    "clicked", GTK_SIGNAL_FUNC (save_msg_ok), filesel);
-	gtk_signal_connect_object (GTK_OBJECT (filesel->cancel_button),
-				   "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-				   GTK_OBJECT (filesel));
-	
-	gtk_widget_show (GTK_WIDGET (filesel));
-}
-
-void
-delete_msg (GtkWidget *button, gpointer user_data)
-{
-	flag_messages(FOLDER_BROWSER(user_data), CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-}
-
-void
-undelete_msg (GtkWidget *button, gpointer user_data)
-{
-	flag_messages(FOLDER_BROWSER(user_data), CAMEL_MESSAGE_DELETED, 0);
-}
-
-void
-next_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	int row;
-	
-	row = e_table_get_cursor_row (fb->message_list->table);
-	message_list_select (fb->message_list, row,
-			     MESSAGE_LIST_SELECT_NEXT,
-			     0, CAMEL_MESSAGE_SEEN);
-}
-
-void
-previous_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	int row;
-	
-	row = e_table_get_cursor_row (fb->message_list->table);
-	message_list_select (fb->message_list, row,
-			     MESSAGE_LIST_SELECT_PREVIOUS,
-			     0, CAMEL_MESSAGE_SEEN);
-}
-
-static void expunged_folder(CamelFolder *f, void *data)
-{
-	FolderBrowser *fb = data;
-
-	fb->expunging = NULL;
-}
-
-void
-expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-
-	if (fb->folder
-	    && (fb->expunging == NULL
-		|| fb->folder != fb->expunging)) {
-		fb->expunging = fb->folder;
-		mail_expunge_folder(fb->folder, expunged_folder, fb);
-	}
-}
-
-static void
-filter_druid_clicked (GtkWidget *w, int button, FolderBrowser *fb)
-{
-	FilterContext *fc;
-	
-	if (button == 0) {
-		char *user;
-		
-		fc = gtk_object_get_data (GTK_OBJECT (w), "context");
-		user = g_strdup_printf ("%s/filters.xml", evolution_dir);
-		rule_context_save ((RuleContext *)fc, user);
-		g_free (user);
-	}
-	
-	if (button != -1) {
-		gnome_dialog_close (GNOME_DIALOG (w));
-	}
-}
-
-void
-filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	FilterContext *fc;
-	char *user, *system;
-	GtkWidget *w;
-	
-	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	system = g_strdup_printf ("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	rule_context_load ((RuleContext *)fc, system, user);
-	g_free (user);
-	g_free (system);
-	
-	if (((RuleContext *)fc)->error) {
-		GtkWidget *dialog;
-		gchar *err;
-		
-		err = g_strdup_printf (_("Error loading filter information:\n%s"),
-				       ((RuleContext *)fc)->error);
-		dialog = gnome_warning_dialog (err);
-		g_free (err);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		return;
-	}
-	
-	w = filter_editor_construct (fc);
-	gtk_object_set_data_full (GTK_OBJECT (w), "context", fc, (GtkDestroyNotify)gtk_object_unref);
-	gtk_signal_connect (GTK_OBJECT (w), "clicked", filter_druid_clicked, fb);
-	gtk_widget_show (GTK_WIDGET (w));
-}
-
-void
-vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	vfolder_edit ();
-}
-
-void
-providers_config (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	/* FIXME: should we block until mail-config is done? */
-	MailAccountsDialog *dialog;
-	
-	dialog = mail_accounts_dialog_new ((FOLDER_BROWSER (user_data))->shell);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-/*
- * FIXME: This routine could be made generic, by having a closure
- * function plus data, and having the whole process be taken care
- * of for you
- */
-static void
-do_mail_print (MailDisplay *md, gboolean preview)
-{
-	GnomePrintContext *print_context;
-	GnomePrintMaster *print_master;
-	GnomePrintDialog *gpd;
-	GnomePrinter *printer = NULL;
-	int copies = 1;
-	int collate = FALSE;
-
-	if (!preview){
-
-		gpd = GNOME_PRINT_DIALOG (
-			gnome_print_dialog_new (_("Print Message"), GNOME_PRINT_DIALOG_COPIES));
-		gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);
-
-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))){
-		case GNOME_PRINT_PRINT:
-			break;
-			
-		case GNOME_PRINT_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gnome_dialog_close (GNOME_DIALOG (gpd));
-			return;
-		}
-
-		gnome_print_dialog_get_copies (gpd, &copies, &collate);
-		printer = gnome_print_dialog_get_printer (gpd);
-		gnome_dialog_close (GNOME_DIALOG (gpd));
-	}
-
-	print_master = gnome_print_master_new ();
-
-/*	FIXME: set paper size gnome_print_master_set_paper (print_master,  */
-
-	if (printer)
-		gnome_print_master_set_printer (print_master, printer);
-	gnome_print_master_set_copies (print_master, copies, collate);
-	print_context = gnome_print_master_get_context (print_master);
-	gtk_html_print (md->html, print_context);
-	gnome_print_master_close (print_master);
-
-	if (preview){
-		gboolean landscape = FALSE;
-		GnomePrintMasterPreview *preview;
-		
-		preview = gnome_print_master_preview_new_with_orientation (
-			print_master, _("Print Preview"), landscape);
-		gtk_widget_show (GTK_WIDGET (preview));
-	} else {
-		int result = gnome_print_master_print (print_master);
-
-		if (result == -1){
-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-				  _("Printing of message failed"));
-		}
-	}
-	gtk_object_unref (GTK_OBJECT (print_master));
-}
-
-void
-mail_print_preview_msg (MailDisplay *md)
-{
-	do_mail_print (md, TRUE);
-}
-
-void
-mail_print_msg (MailDisplay *md)
-{
-	do_mail_print (md, FALSE);
-}
-
-void
-print_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = user_data;
-
-	mail_print_msg (fb->mail_display);
-}
-
-void
-print_preview_msg (GtkWidget *button, gpointer user_data)
-{
-	FolderBrowser *fb = user_data;
-
-	mail_print_preview_msg (fb->mail_display);
-}
-
-void
-manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	/* XXX pass in the selected storage */
-	GtkWidget *subscribe = subscribe_dialog_new ((FOLDER_BROWSER (user_data))->shell);
-
-	gtk_widget_show (subscribe);
-}
-
-void
-configure_folder (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	FolderBrowser *fb = FOLDER_BROWSER(user_data);
-	
-	mail_local_reconfigure_folder(fb);
-}
-
-static void
-do_view_message(CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data)
-{
-	/*FolderBrowser *fb = data;*/
-	GtkWidget *view;
-
-	if (message) {
-		view = mail_view_create(folder, uid, message);
-		gtk_widget_show(view);
-	}
-}
-
-void
-view_msg (GtkWidget *widget, gpointer user_data)
-{
-	FolderBrowser *fb = user_data;
-	GPtrArray *uids;
-	int i;
-
-	if (!fb->folder)
-		return;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	for (i=0;i<uids->len;i++) {
-		mail_get_message(fb->folder, uids->pdata[i], do_view_message, fb, mail_thread_queued);
-		g_free(uids->pdata[i]);
-	}
-	g_ptr_array_free(uids, TRUE);
-}
-
-void
-view_message (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-        view_msg (NULL, user_data);
-}
-
-void
-edit_message (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-        edit_msg (NULL, user_data);
-}
-
-
-void
-stop_threads(BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	camel_operation_cancel(NULL);
-}
-
-
-static void
-create_folders (EvolutionStorage *storage, const char *prefix, CamelFolderInfo *fi)
-{
-	char *name, *path;
-	
-	if (fi->unread_message_count > 0)
-		name = g_strdup_printf ("%s (%d)", fi->name,
-					fi->unread_message_count);
-	else
-		name = g_strdup (fi->name);
-	
-	path = g_strdup_printf ("%s/%s", prefix, fi->name);
-	evolution_storage_new_folder (storage, path, name,
-				      "mail", fi->url ? fi->url : "",
-				      fi->name, /* description */
-				      fi->unread_message_count > 0);
-	g_free (name);
-	
-	if (fi->child)
-		create_folders (storage, path, fi->child);
-	g_free (path);
-	
-	if (fi->sibling)
-		create_folders (storage, prefix, fi->sibling);
-}
-
-void
-folder_created (CamelStore *store, CamelFolderInfo *fi)
-{
-	EvolutionStorage *storage;
-	
-	if ((storage = mail_lookup_storage (store))) {
-		if (fi)
-			/* FIXME: this won't work. (the "prefix" is wrong) */
-			create_folders (storage, "", fi);
-		
-		gtk_object_unref (GTK_OBJECT (storage));
-	}
-}
-
-void
-mail_storage_create_folder (EvolutionStorage *storage, CamelStore *store, CamelFolderInfo *fi)
-{
-	gboolean unref = FALSE;
-	
-	if (!storage && store) {
-		storage = mail_lookup_storage (store);
-		unref = TRUE;
-	}
-	
-	if (storage) {
-		if (fi)
-			create_folders (storage, "", fi);
-		
-		if (unref)
-			gtk_object_unref (GTK_OBJECT (storage));
-	}
-}
-
-static void
-delete_folders (EvolutionStorage *storage, CamelFolderInfo *fi)
-{
-	char *path;
-	
-	if (fi->child)
-		delete_folders (storage, fi->child);
-	
-	path = g_strdup_printf ("/%s", fi->full_name);
-	evolution_storage_removed_folder (storage, path);
-	g_free (path);
-	
-	if (fi->sibling)
-		delete_folders (storage, fi->sibling);
-}
-
-void
-folder_deleted (CamelStore *store, CamelFolderInfo *fi)
-{
-	EvolutionStorage *storage;
-	
-	if ((storage = mail_lookup_storage (store))) {
-		if (fi)
-			delete_folders (storage, fi);
-		
-		gtk_object_unref (GTK_OBJECT (storage));
-	}
-}
diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h
deleted file mode 100644
index e888d47899..0000000000
--- a/mail/mail-callbacks.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_CALLBACKS_H
-#define MAIL_CALLBACKS_H
-
-#include <gnome.h>
-#include <camel/camel.h>
-#include "composer/e-msg-composer.h"
-#include "mail-types.h"
-#include "evolution-storage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void enumerate_msg (MessageList *ml, const char *uid, gpointer data);
-
-void fetch_mail            (GtkWidget *widget, gpointer user_data);
-void send_queued_mail      (GtkWidget *widget, gpointer user_data);
-void send_receive_mail     (GtkWidget *widget, gpointer user_data);
-
-void compose_msg           (GtkWidget *widget, gpointer user_data);
-void send_to_url           (const char *url);
-void forward_messages      (CamelFolder *folder, GPtrArray *uids, gboolean doinline);
-void forward_inlined       (GtkWidget *widget, gpointer user_data);
-void forward_attached      (GtkWidget *widget, gpointer user_data);
-void reply_to_sender       (GtkWidget *widget, gpointer user_data);
-void reply_to_all          (GtkWidget *widget, gpointer user_data);
-void delete_msg            (GtkWidget *widget, gpointer user_data);
-void undelete_msg          (GtkWidget *widget, gpointer user_data);
-void move_msg              (GtkWidget *widget, gpointer user_data);
-void copy_msg              (GtkWidget *widget, gpointer user_data);
-void apply_filters         (GtkWidget *widget, gpointer user_data);
-void print_msg             (GtkWidget *widget, gpointer user_data);
-void print_preview_msg     (GtkWidget *widget, gpointer user_data);
-void edit_msg              (GtkWidget *widget, gpointer user_data);
-void save_msg              (GtkWidget *widget, gpointer user_data);
-void view_msg              (GtkWidget *widget, gpointer user_data);
-void view_source           (GtkWidget *widget, gpointer user_data);
-void next_msg              (GtkWidget *widget, gpointer user_data);
-void previous_msg          (GtkWidget *widget, gpointer user_data);
-
-void select_all            (BonoboUIComponent *uih, void *user_data, const char *path);
-void invert_selection      (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_seen          (BonoboUIComponent *uih, void *user_data, const char *path);
-void mark_as_unseen        (BonoboUIComponent *uih, void *user_data, const char *path);
-void edit_message          (BonoboUIComponent *uih, void *user_data, const char *path);
-void view_message          (BonoboUIComponent *uih, void *user_data, const char *path);
-void expunge_folder        (BonoboUIComponent *uih, void *user_data, const char *path);
-void filter_edit           (BonoboUIComponent *uih, void *user_data, const char *path);
-void vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path);
-void providers_config      (BonoboUIComponent *uih, void *user_data, const char *path);
-void manage_subscriptions  (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void configure_folder      (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void stop_threads          (BonoboUIComponent *uih, void *user_data, const char *path);
-
-void mail_reply            (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, gboolean to_all);
-void composer_send_cb      (EMsgComposer *composer, gpointer data);
-void composer_postpone_cb  (EMsgComposer *composer, gpointer data);
-
-void forward_messages	   (CamelFolder *folder, GPtrArray *uids, gboolean inline);
-
-void mail_print_preview_msg (MailDisplay *md);
-void mail_print_msg         (MailDisplay *md);
-
-
-/* CamelStore callbacks */
-void folder_created (CamelStore *store, CamelFolderInfo *fi);
-void folder_deleted (CamelStore *store, CamelFolderInfo *fi);
-
-void mail_storage_create_folder (EvolutionStorage *storage, CamelStore *store, CamelFolderInfo *fi);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_CALLBACKS_H */
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
deleted file mode 100644
index 58014c7430..0000000000
--- a/mail/mail-config-druid.c
+++ /dev/null
@@ -1,1303 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include <glade/glade.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gal/widgets/e-unicode.h>
-#include "mail-config-druid.h"
-#include "mail-config.h"
-#include "mail-ops.h"
-#include "mail.h"
-#include "mail-session.h"
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-
-#define d(x) x
-
-GtkWidget *mail_config_create_html (const char *name, const char *str1, const char *str2,
-				    int int1, int int2);
-
-static void mail_config_druid_class_init (MailConfigDruidClass *class);
-static void mail_config_druid_init       (MailConfigDruid *druid);
-static void mail_config_druid_finalise   (GtkObject *obj);
-
-static void construct_auth_menu (MailConfigDruid *druid, GList *authtypes);
-
-static GtkWindowClass *parent_class;
-
-GtkType
-mail_config_druid_get_type (void)
-{
-	static GtkType type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"MailConfigDruid",
-			sizeof (MailConfigDruid),
-			sizeof (MailConfigDruidClass),
-			(GtkClassInitFunc) mail_config_druid_class_init,
-			(GtkObjectInitFunc) mail_config_druid_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_window_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-mail_config_druid_class_init (MailConfigDruidClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (gtk_window_get_type ());
-	
-	object_class->finalize = mail_config_druid_finalise;
-	/* override methods */
-	
-}
-
-static void
-mail_config_druid_init (MailConfigDruid *o)
-{
-	;
-}
-
-static void
-mail_config_druid_finalise (GtkObject *obj)
-{
-	MailConfigDruid *druid = (MailConfigDruid *) obj;
-	
-	gtk_object_unref (GTK_OBJECT (druid->gui));
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-
-static struct {
-	char *name;
-	char *text;
-} info[] = {
-	{ "htmlIdentity",
-	  "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send." },
-	{ "htmlIncoming",
-	  "Please enter information about your incoming mail server below. If you don't know what kind of server you use, contact your system administrator or Internet Service Provider." },
-	{ "htmlAuthentication",
-	  "Your mail server supports the following types of authentication. Please select the type you want Evolution to use." },
-	{ "htmlTransport",
-	  "Please enter information about your outgoing mail protocol below. If you don't know which protocol you use, contact your system administrator or Internet Service Provider." },
-	{ "htmlAccountInfo",
-	  "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only." }
-};
-static int num_info = (sizeof (info) / sizeof (info[0]));
-
-static void
-html_size_req (GtkWidget *widget, GtkRequisition *requisition)
-{
-	 requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-GtkWidget *
-mail_config_create_html (const char *name, const char *str1, const char *str2,
-			 int int1, int int2)
-{
-	GtkWidget *scrolled, *html;
-	GtkHTMLStream *stream;
-	GtkStyle *style;
-	int i;
-	
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (!style)
-		style = gtk_widget_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       &style->bg[0]);
-	}
-	gtk_widget_show (html);
-	
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_show (scrolled);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	
-	for (i = 0; i < num_info; i++) {
-		if (!strcmp (name, info[i].name))
-			break;
-	}
-	g_return_val_if_fail (i != num_info, scrolled);
-	
-	stream = gtk_html_begin (GTK_HTML (html));
-	gtk_html_write (GTK_HTML (html), stream, "<html><p>", 9);
-	gtk_html_write (GTK_HTML (html), stream, info[i].text,
-			strlen (info[i].text));
-	gtk_html_write (GTK_HTML (html), stream, "</p></html>", 11);
-	gtk_html_end (GTK_HTML (html), stream, GTK_HTML_STREAM_OK);
-	
-	return scrolled;
-}
-
-static void
-druid_cancel (GnomeDruid *druid, gpointer user_data)
-{
-	/* Cancel the setup of the account */
-	MailConfigDruid *config = user_data;
-	
-	gtk_widget_destroy (GTK_WIDGET (config));
-}
-
-static void
-druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
-{
-	/* Cancel the setup of the account */
-	MailConfigDruid *druid = user_data;
-	MailConfigAccount *account;
-	MailConfigIdentity *id;
-	MailConfigService *source;
-	MailConfigService *transport;
-	CamelURL *url;
-	GSList *mini;
-	char *str;
-	
-	account = g_new0 (MailConfigAccount, 1);
-	account->name = mail_config_druid_get_account_name (druid);
-	account->default_account = mail_config_druid_get_default_account (druid);
-	
-	/* construct the identity */
-	id = g_new0 (MailConfigIdentity, 1);
-	id->name = mail_config_druid_get_full_name (druid);
-	id->address = mail_config_druid_get_email_address (druid);
-	id->organization = mail_config_druid_get_organization (druid);
-	id->signature = mail_config_druid_get_sigfile (druid);
-	
-	/* construct the source */
-	source = g_new0 (MailConfigService, 1);
-	source->keep_on_server = mail_config_druid_get_keep_mail_on_server (druid);
-	source->auto_check = mail_config_druid_get_auto_check (druid);
-	source->auto_check_time = mail_config_druid_get_auto_check_minutes (druid);
-	source->save_passwd = mail_config_druid_get_save_password (druid);
-	str = mail_config_druid_get_source_url (druid);
-	if (str) {
-		/* cache the password and rewrite the url without the password part */
-		url = camel_url_new (str, NULL);
-		g_free (str);
-		source->url = camel_url_to_string (url, FALSE);
-		if (source->save_passwd && url->passwd) {
-			mail_session_set_password (source->url, url->passwd);
-			mail_session_remember_password (source->url);
-		}
-		camel_url_free (url);
-		source->enabled = TRUE;
-	} else {
-		source->url = NULL;
-		source->enabled = FALSE;
-	}
-	
-	/* construct the transport */
-	transport = g_new0 (MailConfigService, 1);
-	transport->url = mail_config_druid_get_transport_url (druid);
-	
-	account->id = id;
-	account->source = source;
-	account->transport = transport;
-	
-	mail_config_add_account (account);
-	mail_config_write ();
-	
-	mini = g_slist_prepend (NULL, account);
-	mail_load_storages (druid->shell, mini, TRUE);
-	g_slist_free (mini);
-	
-	gtk_widget_destroy (GTK_WIDGET (druid));
-}
-
-static gboolean
-is_email (const char *address)
-{
-	const char *at, *hname;
-	
-	g_return_val_if_fail (address != NULL, FALSE);
-	
-	at = strchr (address, '@');
-	/* make sure we have an '@' and that it's not the first or last char */
-	if (!at || at == address || *(at + 1) == '\0')
-		return FALSE;
-	
-	hname = at + 1;
-	/* make sure the first and last chars aren't '.' */
-	if (*hname == '.' || hname[strlen (hname) - 1] == '.')
-		return FALSE;
-	
-	return strchr (hname, '.') != NULL;
-}
-
-/* Identity Page */
-static void
-identity_check (MailConfigDruid *druid)
-{
-	char *address;
-	
-	address = gtk_entry_get_text (druid->email_address);
-	if (gtk_entry_get_text (druid->full_name) && is_email (address))
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-	else
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, FALSE, TRUE);
-}
-
-static void
-identity_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	identity_check (druid);
-}
-
-static void
-identity_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	gtk_widget_grab_focus (GTK_WIDGET (config->full_name));
-	
-	identity_check (config);
-}
-
-static gboolean
-identity_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	/* go to the next page */
-	return FALSE;
-}
-
-/* Incoming mail Page */
-static void
-incoming_check (MailConfigDruid *druid)
-{
-	const CamelProvider *prov = druid->source_provider;
-	gboolean host = TRUE, user = TRUE, path = TRUE;
-	gboolean next_sensitive = TRUE;
-	
-	if (prov && prov->url_flags & CAMEL_URL_NEED_HOST)
-		host = gtk_entry_get_text (druid->incoming_hostname) != NULL;
-	
-	if (prov && prov->url_flags & CAMEL_URL_NEED_USER)
-		user = gtk_entry_get_text (druid->incoming_username) != NULL;
-	
-	if (prov && prov->url_flags & CAMEL_URL_NEED_PATH)
-		path = gtk_entry_get_text (druid->incoming_path) != NULL;
-	
-	next_sensitive = host && user && path;
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
-}
-
-static void
-auto_check_toggled (GtkToggleButton *button, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min), button->active);
-}
-
-static void
-incoming_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	incoming_check (druid);
-}
-
-static void
-incoming_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	if (!gtk_object_get_data (GTK_OBJECT (page), "initialized")) {
-		char *username;
-		
-		/* Copy the username part of the email address into
-		 * the Username field.
-		 */
-		username = gtk_entry_get_text (config->email_address);
-		username = g_strndup (username, strcspn (username, "@"));
-		gtk_entry_set_text (config->incoming_username, username);
-		g_free (username);
-		
-		gtk_object_set_data (GTK_OBJECT (page), "initialized",
-				     GINT_TO_POINTER (1));
-	}
-	
-	incoming_check (config);
-}
-
-static gboolean
-incoming_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	GtkWidget *transport_page;
-	GList *authtypes = NULL;
-	gchar *source_url;
-	gboolean connect;
-	CamelURL *url;
-	
-	config->have_auth_page = TRUE;
-	
-	source_url = mail_config_druid_get_source_url (config);
-	if (!source_url) {
-		/* User opted to not setup a source for this account,
-		 * so jump past the auth page */
-		
-		/* Skip to transport page. */
-		config->have_auth_page = FALSE;
-		transport_page = glade_xml_get_widget (config->gui, "druidTransportPage");
-		gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (transport_page));
-		
-		return TRUE;
-	}
-	
-	url = camel_url_new (source_url, NULL);
-	g_free (source_url);
-	
-	connect = GTK_TOGGLE_BUTTON (config->incoming_check_settings)->active;
-	
-	/* If we can't connect, warn them and continue on to the Transport page. */
-	if (!mail_config_check_service (url, CAMEL_PROVIDER_STORE, connect, &authtypes)) {
-		GtkWidget *dialog;
-		char *source, *warning;
-		
-		source = camel_url_to_string (url, FALSE);
-		camel_url_free (url);
-		
-		warning = g_strdup_printf (_("Failed to verify the incoming mail configuration.\n"
-					     "You may experience problems retrieving your mail from %s"),
-					   source);
-		g_free (source);
-		dialog = gnome_warning_dialog_parented (warning, GTK_WINDOW (config));
-		g_free (warning);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		
-		return TRUE;
-	}
-	camel_url_free (url);
-	
-	/* If this service offers authentication, go to the next page. */
-	if (authtypes) {
-		construct_auth_menu (config, authtypes);
-		return FALSE;
-	}
-	
-	/* Otherwise, skip to transport page. */
-	config->have_auth_page = FALSE;
-	transport_page = glade_xml_get_widget (config->gui, "druidTransportPage");
-	gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (transport_page));
-	
-	return TRUE;
-}
-
-static void
-incoming_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	GtkWidget *label, *dwidget = NULL;
-	CamelProvider *provider;
-	
-	provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
-	
-	druid->source_provider = provider;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check), provider ? TRUE : FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min), provider ? TRUE : FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_check_settings), provider ? TRUE : FALSE);
-	
-	/* hostname */
-	label = glade_xml_get_widget (druid->gui, "lblSourceHost");
-	if (provider && provider->url_flags & CAMEL_URL_ALLOW_HOST) {
-		dwidget = GTK_WIDGET (druid->incoming_hostname);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_hostname), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_hostname, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_hostname), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* username */
-	label = glade_xml_get_widget (druid->gui, "lblSourceUser");
-	if (provider && provider->url_flags & CAMEL_URL_ALLOW_USER) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->incoming_username);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_username), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_username, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_username), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* password */
-	label = glade_xml_get_widget (druid->gui, "lblSourcePasswd");
-	if (provider && provider->url_flags & CAMEL_URL_ALLOW_PASSWORD) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->password);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->password), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->password, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->password), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* auth */
-	label = glade_xml_get_widget (druid->gui, "lblSourceAuth");
-	if (provider && provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->auth_type), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->auth_type), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* path */
-	label = glade_xml_get_widget (druid->gui, "lblSourcePath");
-	/* FIXME */
-	if (provider && !strcmp (provider->protocol, "imap"))
-		gtk_label_set_text (GTK_LABEL (label), _("Namespace:"));
-	else
-		gtk_label_set_text (GTK_LABEL (label), _("Path:"));
-	if (provider && provider->url_flags & CAMEL_URL_ALLOW_PATH) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->incoming_path);
-		
-		if (!strcmp (provider->protocol, "mbox")) {
-			char *path;
-			
-			if (getenv ("MAIL"))
-				path = g_strdup (getenv ("MAIL"));
-			else
-				path = g_strdup_printf (SYSTEM_MAIL_DIR "/%s", g_get_user_name ());
-			gtk_entry_set_text (druid->incoming_path, path);
-			g_free (path);
-		} else if (!strcmp (provider->protocol, "maildir") &&
-			   getenv ("MAILDIR")) {
-			gtk_entry_set_text (druid->incoming_path, getenv ("MAILDIR"));
-		} else {
-			gtk_entry_set_text (druid->incoming_path, "");
-		}
-		
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_path), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_path, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_path), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* keep mail on server */
-	if (provider && !(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_keep_mail), TRUE);
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_keep_mail), FALSE);
-	
-	incoming_check (druid);
-	
-	if (dwidget)
-		gtk_widget_grab_focus (dwidget);
-}
-
-/* Authentication Page */
-static void
-authentication_check (MailConfigDruid *druid)
-{
-	if (mail_config_druid_get_save_password (druid)) {
-		char *passwd = gtk_entry_get_text (druid->password);
-		
-		if (passwd && *passwd)
-			gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-		else
-			gnome_druid_set_buttons_sensitive (druid->druid, TRUE, FALSE, TRUE);
-	} else {
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-	}
-}
-
-static void
-authentication_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	authentication_check (druid);
-}
-
-static void
-authentication_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	authentication_check (config);
-}
-
-static gboolean
-authentication_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	/* go to the next page */
-	return FALSE;
-}
-
-static void
-auth_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	CamelServiceAuthType *authtype;
-	GtkWidget *label;
-	gboolean sensitive;
-	
-	authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype");
-	
-	gtk_object_set_data (GTK_OBJECT (druid), "source_authmech", authtype->authproto);
-	
-	if (authtype->need_password)
-		sensitive = TRUE;
-	else
-		sensitive = FALSE;
-	
-	label = glade_xml_get_widget (druid->gui, "lblSourcePasswd");
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->password), sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->save_password), sensitive);
-	gtk_widget_set_sensitive (label, sensitive);
-	
-	if (!sensitive)
-		gtk_entry_set_text (druid->password, "");
-	
-	authentication_check (druid);
-}
-
-static void
-construct_auth_menu (MailConfigDruid *druid, GList *authtypes)
-{
-	GtkWidget *menu, *item, *first = NULL;
-	CamelServiceAuthType *authtype;
-	GList *l;
-	
-	menu = gtk_menu_new ();
-	
-	l = authtypes;
-	while (l) {
-		authtype = l->data;
-		
-		item = gtk_menu_item_new_with_label (authtype->name);
-		gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (auth_type_changed),
-				    druid);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-		
-		gtk_widget_show (item);
-		
-		if (!first)
-			first = item;
-		
-		l = l->next;
-	}
-	
-	if (first)
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", druid);
-	
-	gtk_option_menu_remove_menu (druid->auth_type);
-	gtk_option_menu_set_menu (druid->auth_type, menu);
-}
-
-/* Transport Page */
-static void
-transport_check (MailConfigDruid *druid)
-{
-	const CamelProvider *prov = druid->transport_provider;
-	gboolean next_sensitive = TRUE;
-	
-	if (prov && prov->url_flags & CAMEL_URL_NEED_HOST)
-		next_sensitive = gtk_entry_get_text (druid->outgoing_hostname) != NULL;
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
-}
-
-static void
-transport_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	transport_check (config);
-}
-
-static gboolean
-transport_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	gboolean connect;
-	gchar *xport_url;
-	CamelURL *url;
-	
-	xport_url = mail_config_druid_get_transport_url (config);
-	url = camel_url_new (xport_url, NULL);
-	g_free (xport_url);
-	
-	connect = GTK_TOGGLE_BUTTON (config->outgoing_check_settings)->active;
-	
-	/* If we can't connect, don't let them continue. */
-	if (!mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, connect, NULL)) {
-		GtkWidget *dialog;
-		char *transport, *warning;
-		
-		transport = camel_url_to_string (url, FALSE);
-		
-		warning = g_strdup_printf (_("Failed to verify the outgoing mail configuration.\n"
-					     "You may experience problems sending your mail using %s"),
-					   transport);
-		g_free (transport);
-		dialog = gnome_warning_dialog_parented (warning, GTK_WINDOW (config));
-		g_free (warning);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	}
-	
-	camel_url_free (url);
-	
-	return FALSE;
-}
-
-static gboolean
-transport_back (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	if (config->have_auth_page) {
-		return FALSE;
-	} else {
-		/* jump to the source page, skipping over the auth page */
-		GtkWidget *widget;
-		
-		widget = glade_xml_get_widget (config->gui, "druidSourcePage");
-		gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (widget));
-		
-		return TRUE;
-	}
-}
-
-static void
-transport_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	transport_check (druid);
-}
-
-static void
-transport_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	CamelProvider *provider;
-	GtkWidget *label;
-	
-	provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
-	druid->transport_provider = provider;
-	
-	/* hostname */
-	label = glade_xml_get_widget (druid->gui, "lblTransportHost");
-	if (provider->url_flags & CAMEL_URL_ALLOW_HOST) {
-		gtk_widget_grab_focus (GTK_WIDGET (druid->outgoing_hostname));
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_hostname), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->outgoing_hostname, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_hostname), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* auth */
-	if (provider->url_flags & CAMEL_URL_ALLOW_AUTH)
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_requires_auth), TRUE);
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_requires_auth), FALSE);
-	
-	transport_check (druid);
-}
-
-/* Management page */
-static void
-management_check (MailConfigDruid *druid)
-{
-	gboolean next_sensitive;
-	
-	next_sensitive = gtk_entry_get_text (druid->account_name) != NULL;
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
-}
-
-static void
-management_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	char *name;
-	
-	name = e_utf8_gtk_entry_get_text (config->email_address);
-	if (name) {
-		e_utf8_gtk_entry_set_text (config->account_name, name);
-		g_free (name);
-	}
-	
-	management_check (config);
-}
-
-static void
-management_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	management_check (druid);
-}
-
-static gboolean
-management_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	return FALSE;
-}
-
-static gint
-provider_compare (const CamelProvider *p1, const CamelProvider *p2)
-{
-	/* sort providers based on "location" (ie. local or remote) */	
-	if (p1->flags & CAMEL_PROVIDER_IS_REMOTE) {
-		if (p2->flags & CAMEL_PROVIDER_IS_REMOTE)
-			return 0;
-		return -1;
-	} else {
-		if (p2->flags & CAMEL_PROVIDER_IS_REMOTE)
-			return 1;
-		return 0;
-	}
-}
-
-static gboolean
-is_domain (const char *domain)
-{
-	/* domain && *domain should be enough but linux's
-           getdomainname() likes to return "(none)" */
-	return domain && *domain && strcmp (domain, "(none)");
-}
-
-static void
-set_defaults (MailConfigDruid *druid)
-{
-	const MailConfigService *default_xport;
-	GtkWidget *stores, *transports, *item;
-	GtkWidget *fstore = NULL, *ftransport = NULL;
-	int si = 0, hstore = 0, ti = 0, htransport = 0;
-	char *user, *realname;
-	char hostname[1024];
-	char domain[1024];
-	CamelURL *url;
-	GList *l;
-	
-	/* set the default Name field */
-	realname = g_get_real_name ();
-	if (realname)
-		e_utf8_gtk_entry_set_text (druid->full_name, realname);
-	
-	/* set the default E-Mail Address field */
-	user = getenv ("USER");
-	if (user && !gethostname (hostname, 1023)) {
-		char *address;
-		
-		memset (domain, 0, sizeof (domain));
-		getdomainname (domain, 1023);
-		
-		address = g_strdup_printf ("%s@%s%s%s", user, hostname, is_domain (domain) ? "." : "",
-					   is_domain (domain) ? domain : "");
-		
-		gtk_entry_set_text (druid->email_address, address);
-		g_free (address);
-	}
-	
-	/* construct incoming/outgoing option menus */
-	stores = gtk_menu_new ();
-	transports = gtk_menu_new ();
-	druid->providers = camel_session_list_providers (session, TRUE);
-	
-	/* get the default transport */
-	default_xport = mail_config_get_default_transport ();
-	if (default_xport && default_xport->url)
-		url = camel_url_new (default_xport->url, NULL);
-	else
-		url = NULL;
-	
-	/* sort the providers, remote first */
-	druid->providers = g_list_sort (druid->providers, (GCompareFunc) provider_compare);
-	
-	l = druid->providers;
-	while (l) {
-		CamelProvider *provider = l->data;
-		
-		if (strcmp (provider->domain, "mail")) {
-			l = l->next;
-			continue;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_STORE] && provider->flags & CAMEL_PROVIDER_IS_SOURCE) {
-			item = gtk_menu_item_new_with_label (provider->name);
-			gtk_object_set_data (GTK_OBJECT (item), "provider", provider);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (incoming_type_changed),
-					    druid);
-			
-			gtk_menu_append (GTK_MENU (stores), item);
-			
-			gtk_widget_show (item);
-			
-			if (!fstore) {
-				fstore = item;
-				hstore = si;
-			}
-			
-			si++;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			item = gtk_menu_item_new_with_label (provider->name);
-			gtk_object_set_data (GTK_OBJECT (item), "provider", provider);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (transport_type_changed),
-					    druid);
-			
-			gtk_menu_append (GTK_MENU (transports), item);
-			
-			gtk_widget_show (item);
-			
-			if (!ftransport) {
-				ftransport = item;
-				htransport = ti;
-			}
-			
-			if (url && !g_strcasecmp (provider->protocol, url->protocol)) {
-				ftransport = item;
-				htransport = ti;
-			}
-			
-			ti++;
-		}
-		
-		l = l->next;
-	}
-	
-	/* add a "None" option to the stores menu */
-	item = gtk_menu_item_new_with_label (_("None"));
-	gtk_object_set_data (GTK_OBJECT (item), "provider", NULL);
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (incoming_type_changed),
-			    druid);
-	
-	gtk_menu_append (GTK_MENU (stores), item);
-	
-	gtk_widget_show (item);
-	
-	if (!fstore) {
-		fstore = item;
-		hstore = si;
-	}
-	
-	/* set the menus on the optionmenus */
-	gtk_option_menu_remove_menu (druid->incoming_type);
-	gtk_option_menu_set_menu (druid->incoming_type, stores);
-	gtk_option_menu_set_history (druid->incoming_type, hstore);
-	
-	gtk_option_menu_remove_menu (druid->outgoing_type);
-	gtk_option_menu_set_menu (druid->outgoing_type, transports);
-	gtk_option_menu_set_history (druid->outgoing_type, htransport);
-	
-	if (fstore)
-		gtk_signal_emit_by_name (GTK_OBJECT (fstore), "activate", druid);
-	
-	if (ftransport)
-		gtk_signal_emit_by_name (GTK_OBJECT (ftransport), "activate", druid);
-	
-	if (url) {
-		if (url->host) {
-			char *hostname;
-			
-			if (url->port)
-				hostname = g_strdup_printf ("%s:%d", url->host, url->port);
-			else
-				hostname = g_strdup (url->host);
-			
-			gtk_entry_set_text (druid->outgoing_hostname, hostname);
-			g_free (hostname);
-		}
-		camel_url_free (url);
-	}
-}
-
-static gboolean
-start_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	return FALSE;
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc next_func;
-	GtkSignalFunc prepare_func;
-	GtkSignalFunc back_func;
-	GtkSignalFunc finish_func;
-} pages[] = {
-	{ "druidStartPage",
-	  GTK_SIGNAL_FUNC (start_next),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidIdentityPage",
-	  GTK_SIGNAL_FUNC (identity_next),
-	  GTK_SIGNAL_FUNC (identity_prepare),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidSourcePage",
-	  GTK_SIGNAL_FUNC (incoming_next),
-	  GTK_SIGNAL_FUNC (incoming_prepare),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidAuthPage",
-	  GTK_SIGNAL_FUNC (authentication_next),
-	  GTK_SIGNAL_FUNC (authentication_prepare),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidTransportPage",
-	  GTK_SIGNAL_FUNC (transport_next),
-	  GTK_SIGNAL_FUNC (transport_prepare),
-	  GTK_SIGNAL_FUNC (transport_back),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidManagementPage",
-	  GTK_SIGNAL_FUNC (management_next),
-	  GTK_SIGNAL_FUNC (management_prepare),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidFinishPage",
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (druid_finish) },
-	{ NULL,
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) }
-};
-
-static void
-construct (MailConfigDruid *druid)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	int i;
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "mail-config-druid");
-	druid->gui = gui;
-	
-	/* get our toplevel widget */
-	widget = glade_xml_get_widget (gui, "druid");
-	
-	/* reparent */
-	gtk_widget_reparent (widget, GTK_WIDGET (druid));
-	
-	druid->druid = GNOME_DRUID (widget);
-	
-	/* set window title */
-	gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Wizard"));
-	gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, TRUE);
-	gtk_window_set_modal (GTK_WINDOW (druid), TRUE);
-	gtk_object_set (GTK_OBJECT (druid), "type", GTK_WINDOW_DIALOG, NULL);
-	
-	/* attach to druid page signals */
-	i = 0;
-	while (pages[i].name) {
-		GnomeDruidPage *page;
-		
-		page = GNOME_DRUID_PAGE (glade_xml_get_widget (gui, pages[i].name));
-		
-		if (pages[i].next_func)
-			gtk_signal_connect (GTK_OBJECT (page), "next",
-					    pages[i].next_func, druid);
-		if (pages[i].prepare_func)
-			gtk_signal_connect (GTK_OBJECT (page), "prepare",
-					    pages[i].prepare_func, druid);
-		if (pages[i].back_func)
-			gtk_signal_connect (GTK_OBJECT (page), "back",
-					    pages[i].back_func, druid);
-		if (pages[i].finish_func)
-			gtk_signal_connect (GTK_OBJECT (page), "finish",
-					    pages[i].finish_func, druid);
-		
-		i++;
-	}
-	gtk_signal_connect (GTK_OBJECT (druid->druid), "cancel",
-			    druid_cancel, druid);
-	
-	/* get our cared-about widgets */
-	druid->account_text = glade_xml_get_widget (gui, "htmlAccountInfo");
-	druid->account_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtAccountName"));
-	gtk_signal_connect (GTK_OBJECT (druid->account_name), "changed", management_changed, druid);
-	druid->default_account = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAccountDefault"));
-	
-	druid->identity_text = glade_xml_get_widget (gui, "htmlIdentity");
-	druid->full_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtFullName"));
-	gtk_signal_connect (GTK_OBJECT (druid->full_name), "changed", identity_changed, druid);
-	druid->email_address = GTK_ENTRY (glade_xml_get_widget (gui, "txtAddress"));
-	gtk_signal_connect (GTK_OBJECT (druid->email_address), "changed", identity_changed, druid);
-	druid->organization = GTK_ENTRY (glade_xml_get_widget (gui, "txtOrganization"));
-	druid->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileSignature"));
-	
-	druid->incoming_text = glade_xml_get_widget (gui, "htmlIncoming");
-	druid->incoming_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuIncomingType"));
-	druid->incoming_hostname = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingHostname"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_hostname), "changed", incoming_changed, druid);
-	druid->incoming_username = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingUsername"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_username), "changed", incoming_changed, druid);
-	druid->incoming_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingPath"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_path), "changed", incoming_changed, druid);
-	druid->incoming_keep_mail = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingKeepMail"));
-	druid->incoming_auto_check = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAutoCheck"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_auto_check), "toggled", auto_check_toggled, druid);
-	druid->incoming_auto_check_min = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinAutoCheckMinutes"));
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min),
-				  GTK_TOGGLE_BUTTON (druid->incoming_auto_check)->active);
-	druid->incoming_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingCheckSettings"));
-	
-	druid->have_auth_page = TRUE;
-	druid->auth_text = glade_xml_get_widget (gui, "htmlAuthentication");
-	druid->auth_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuAuthType"));
-	druid->password = GTK_ENTRY (glade_xml_get_widget (gui, "txtAuthPasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->password), "changed", authentication_changed, druid);
-	druid->save_password = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAuthSavePasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->save_password), "toggled", authentication_changed, druid);
-	
-	druid->outgoing_text = glade_xml_get_widget (gui, "htmlTransport");
-	druid->outgoing_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportType"));
-	druid->outgoing_hostname = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportHostname"));
-	gtk_signal_connect (GTK_OBJECT (druid->outgoing_hostname), "changed", transport_changed, druid);
-	druid->outgoing_requires_auth = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportNeedsAuth"));
-	druid->outgoing_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkOutgoingCheckSettings"));
-	
-	set_defaults (druid);
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, FALSE, TRUE, TRUE);
-}
-
-MailConfigDruid *
-mail_config_druid_new (GNOME_Evolution_Shell shell)
-{
-	MailConfigDruid *new;
-	
-	new = (MailConfigDruid *) gtk_type_new (mail_config_druid_get_type ());
-	construct (new);
-	new->shell = shell;
-	
-	return new;
-}
-
-char *
-mail_config_druid_get_account_name (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->account_name);
-}
-
-
-gboolean
-mail_config_druid_get_default_account (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return GTK_TOGGLE_BUTTON (druid->default_account)->active;
-}
-
-
-char *
-mail_config_druid_get_full_name (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->full_name);
-}
-
-
-char *
-mail_config_druid_get_email_address (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->email_address);
-}
-
-
-char *
-mail_config_druid_get_organization (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->organization);
-}
-
-
-char *
-mail_config_druid_get_sigfile (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return gnome_file_entry_get_full_path (druid->signature, TRUE);
-}
-
-
-char *
-mail_config_druid_get_source_url (MailConfigDruid *druid)
-{
-	char *source_url, *host, *pport, *str;
-	const CamelProvider *provider;
-	CamelURL *url;
-	int port = 0;
-	
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	provider = druid->source_provider;
-	if (!provider)
-		return NULL;
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strdup (provider->protocol);
-	
-	str = gtk_entry_get_text (druid->incoming_username);
-	url->user = str && *str ? g_strdup (str) : NULL;
-	
-	str = gtk_object_get_data (GTK_OBJECT (druid), "source_authmech");
-	url->authmech = str && *str ? g_strdup (str) : NULL;
-	
-	str = gtk_entry_get_text (druid->password);
-	url->passwd = str && *str ? g_strdup (str) : NULL;
-	
-	host = g_strdup (gtk_entry_get_text (druid->incoming_hostname));
-	if (host && (pport = strchr (host, ':'))) {
-		port = atoi (pport + 1);
-		*pport = '\0';
-	}
-	url->host = host;
-	url->port = port;
-	url->path = g_strdup (gtk_entry_get_text (druid->incoming_path));
-	
-	/* only 'show password' if we intend to save it */
-	source_url = camel_url_to_string (url, GTK_TOGGLE_BUTTON (druid->save_password)->active);
-	camel_url_free (url);
-	
-	return source_url;
-}
-
-
-gboolean
-mail_config_druid_get_keep_mail_on_server (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return GTK_TOGGLE_BUTTON (druid->incoming_keep_mail)->active;
-}
-
-
-gboolean
-mail_config_druid_get_auto_check (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return GTK_TOGGLE_BUTTON (druid->incoming_auto_check)->active;
-}
-
-
-gint
-mail_config_druid_get_auto_check_minutes (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), 0);
-	
-	return gtk_spin_button_get_value_as_int (druid->incoming_auto_check_min);
-}
-
-gboolean
-mail_config_druid_get_save_password (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return GTK_TOGGLE_BUTTON (druid->save_password)->active;
-}
-
-
-char *
-mail_config_druid_get_transport_url (MailConfigDruid *druid)
-{
-	char *transport_url, *host, *pport;
-	const CamelProvider *provider;
-	CamelURL *url;
-	int port = 0;
-	
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	provider = druid->transport_provider;
-	if (!provider)
-		return NULL;
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strdup (provider->protocol);
-	host = g_strdup (gtk_entry_get_text (druid->outgoing_hostname));
-	if (host && (pport = strchr (host, ':'))) {
-		port = atoi (pport + 1);
-		*pport = '\0';
-	}
-	url->host = host;
-	url->port = port;
-	
-	transport_url = camel_url_to_string (url, FALSE);
-	camel_url_free (url);
-	
-	return transport_url;
-}
-
-
-gboolean
-mail_config_druid_get_transport_requires_auth (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return GTK_TOGGLE_BUTTON (druid->outgoing_requires_auth)->active;
-}
diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h
deleted file mode 100644
index 9f3fed8547..0000000000
--- a/mail/mail-config-druid.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_CONFIG_DRUID_H
-#define MAIL_CONFIG_DRUID_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <camel.h>
-#include "shell/Evolution.h"
-
-#define MAIL_CONFIG_DRUID_TYPE        (mail_config_druid_get_type ())
-#define MAIL_CONFIG_DRUID(o)          (GTK_CHECK_CAST ((o), MAIL_CONFIG_DRUID_TYPE, MailConfigDruid))
-#define MAIL_CONFIG_DRUID_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_CONFIG_DRUID_TYPE, MailConfigDruidClass))
-#define IS_MAIL_CONFIG_DRUID(o)       (GTK_CHECK_TYPE ((o), MAIL_CONFIG_DRUID_TYPE))
-#define IS_MAIL_CONFIG_DRUID_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_CONFIG_DRUID_TYPE))
-
-struct _MailConfigDruid {
-	GtkWindow parent;
-	
-	GNOME_Evolution_Shell shell;
-	
-	GladeXML *gui;
-	
-	GList *providers;
-	
-	GnomeDruid *druid;
-	
-	/* account management */
-	GtkWidget *account_text;
-	GtkEntry *account_name;
-	GtkCheckButton *default_account;
-	
-	/* identity */
-	GtkWidget *identity_text;
-	GtkEntry *full_name;
-	GtkEntry *email_address;
-	GtkEntry *organization;
-	GnomeFileEntry *signature;
-	
-	/* incoming mail */
-	GtkWidget *incoming_text;
-	GtkOptionMenu *incoming_type;
-	GtkEntry *incoming_hostname;
-	GtkEntry *incoming_username;
-	GtkEntry *incoming_path;
-	GtkCheckButton *incoming_keep_mail;
-	GtkCheckButton *incoming_auto_check;
-	GtkSpinButton  *incoming_auto_check_min;
-	GtkCheckButton *incoming_check_settings;
-	
-	/* authentication */
-	gboolean have_auth_page;
-	GtkWidget *auth_text;
-	GtkOptionMenu *auth_type;
-	GtkEntry *password;
-	GtkCheckButton *save_password;
-	
-	/* outgoing mail */
-	GtkWidget *outgoing_text;
-	GtkOptionMenu *outgoing_type;
-	GtkEntry *outgoing_hostname;
-	GtkCheckButton *outgoing_requires_auth;
-	GtkCheckButton *outgoing_check_settings;
-	
-	const CamelProvider *source_provider;
-	const CamelProvider *transport_provider;
-};
-
-typedef struct _MailConfigDruid MailConfigDruid;
-
-typedef struct {
-	GtkWindowClass parent_class;
-	
-	/* signals */
-	
-} MailConfigDruidClass;
-
-GtkType mail_config_druid_get_type (void);
-
-MailConfigDruid *mail_config_druid_new (GNOME_Evolution_Shell shell);
-
-char *mail_config_druid_get_account_name (MailConfigDruid *druid);
-
-gboolean mail_config_druid_get_default_account (MailConfigDruid *druid);
-
-char *mail_config_druid_get_full_name (MailConfigDruid *druid);
-
-char *mail_config_druid_get_email_address (MailConfigDruid *druid);
-
-char *mail_config_druid_get_reply_to (MailConfigDruid *druid);
-
-char *mail_config_druid_get_organization (MailConfigDruid *druid);
-
-char *mail_config_druid_get_sigfile (MailConfigDruid *druid);
-
-char *mail_config_druid_get_source_url (MailConfigDruid *druid);
-
-gboolean mail_config_druid_get_keep_mail_on_server (MailConfigDruid *druid);
-
-gboolean mail_config_druid_get_save_password (MailConfigDruid *druid);
-
-gboolean mail_config_druid_get_auto_check (MailConfigDruid *druid);
-
-gint mail_config_druid_get_auto_check_minutes (MailConfigDruid *druid);
-
-char *mail_config_druid_get_transport_url (MailConfigDruid *druid);
-
-gboolean mail_config_druid_get_transport_requires_auth (MailConfigDruid *druid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_CONFIG_DRUID_H */
diff --git a/mail/mail-config.c b/mail/mail-config.c
deleted file mode 100644
index 7817386cb7..0000000000
--- a/mail/mail-config.c
+++ /dev/null
@@ -1,912 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include <pwd.h>
-#include <ctype.h>
-
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
-#include <glade/glade.h>
-
-#include <gal/util/e-util.h>
-#include "e-util/e-html-utils.h"
-#include "mail.h"
-#include "mail-config.h"
-#include "mail-ops.h"
-#include "mail-mt.h"
-
-typedef struct {
-	gboolean thread_list;
-	gboolean view_source;
-	gint paned_size;
-	gboolean send_html;
-	gboolean prompt_empty_subject;
-	gint seen_timeout;
-	
-	GSList *accounts;
-	GSList *news;
-	
-	char *pgp_path;
-	int pgp_type;
-} MailConfig;
-
-static const char GCONFPATH[] = "/apps/Evolution/Mail";
-static MailConfig *config = NULL;
-
-/* Prototypes */
-static void config_read (void);
-
-/* Identity */
-MailConfigIdentity *
-identity_copy (const MailConfigIdentity *id)
-{
-	MailConfigIdentity *new;
-	
-	g_return_val_if_fail (id != NULL, NULL);
-	
-	new = g_new0 (MailConfigIdentity, 1);
-	new->name = g_strdup (id->name);
-	new->address = g_strdup (id->address);
-	new->reply_to = g_strdup (id->reply_to);
-	new->organization = g_strdup (id->organization);
-	new->signature = g_strdup (id->signature);
-	
-	return new;
-}
-
-void
-identity_destroy (MailConfigIdentity *id)
-{
-	if (!id)
-		return;
-	
-	g_free (id->name);
-	g_free (id->address);
-	g_free (id->reply_to);
-	g_free (id->organization);
-	g_free (id->signature);
-	
-	g_free (id);
-}
-
-/* Service */
-MailConfigService *
-service_copy (const MailConfigService *source) 
-{
-	MailConfigService *new;
-	
-	g_return_val_if_fail (source != NULL, NULL);
-	
-	new = g_new0 (MailConfigService, 1);
-	new->url = g_strdup (source->url);
-	new->keep_on_server = source->keep_on_server;
-	new->auto_check = source->auto_check;
-	new->auto_check_time = source->auto_check_time;
-	new->enabled = source->enabled;
-	new->save_passwd = source->save_passwd;
-	new->use_ssl = source->use_ssl;
-	
-	return new;
-}
-
-void
-service_destroy (MailConfigService *source)
-{
-	if (!source)
-		return;
-	
-	g_free (source->url);
-	
-	g_free (source);
-}
-
-void
-service_destroy_each (gpointer item, gpointer data)
-{
-	service_destroy ((MailConfigService *)item);
-}
-
-/* Account */
-MailConfigAccount *
-account_copy (const MailConfigAccount *account) 
-{
-	MailConfigAccount *new;
-	
-	g_return_val_if_fail (account != NULL, NULL);
-	
-	new = g_new0 (MailConfigAccount, 1);
-	new->name = g_strdup (account->name);
-	new->default_account = account->default_account;
-	
-	new->id = identity_copy (account->id);
-	new->source = service_copy (account->source);
-	new->transport = service_copy (account->transport);
-	
-	return new;
-}
-
-void
-account_destroy (MailConfigAccount *account)
-{
-	if (!account)
-		return;
-	
-	g_free (account->name);
-	
-	identity_destroy (account->id);
-	service_destroy (account->source);
-	service_destroy (account->transport);
-	
-	g_free (account);
-}
-
-void
-account_destroy_each (gpointer item, gpointer data)
-{
-	account_destroy ((MailConfigAccount *)item);
-}
-
-/* Config struct routines */
-void
-mail_config_init (void)
-{
-	if (config)
-		return;
-	
-	config = g_new0 (MailConfig, 1);
-	config_read ();
-}
-
-void
-mail_config_clear (void)
-{
-	if (!config)
-		return;
-	
-	if (config->accounts) {
-		g_slist_foreach (config->accounts, account_destroy_each, NULL);
-		g_slist_free (config->accounts);
-		config->accounts = NULL;
-	}
-	
-	if (config->news) {
-		g_slist_foreach (config->news, service_destroy_each, NULL);
-		g_slist_free (config->news);
-		config->news = NULL;
-	}
-	
-	/* overkill? */
-	memset (config, 0, sizeof (MailConfig));
-}
-
-static void
-config_read (void)
-{
-	gchar *str;
-	gint len, i;
-	gboolean have_default = FALSE;
-	gboolean def;
-	
-	mail_config_clear ();
-	
-	/* Accounts */
-	str = g_strdup_printf ("=%s/config/Mail=/Accounts/", evolution_dir);
-	gnome_config_push_prefix (str);
-	g_free (str);
-	
-	len = gnome_config_get_int ("num");
-	for (i = 0; i < len; i++) {
-		MailConfigAccount *account;
-		MailConfigIdentity *id;
-		MailConfigService *source;
-		MailConfigService *transport;
-		gchar *path;
-		
-		account = g_new0 (MailConfigAccount, 1);
-		path = g_strdup_printf ("account_name_%d", i);
-		account->name = gnome_config_get_string (path);
-		g_free (path);
-		path = g_strdup_printf ("account_is_default_%d", i);
-		account->default_account = gnome_config_get_bool (path) && !have_default;
-		if (account->default_account)
-			have_default = TRUE;
-		g_free (path);
-		
-		/* get the identity info */
-		id = g_new0 (MailConfigIdentity, 1);		
-		path = g_strdup_printf ("identity_name_%d", i);
-		id->name = gnome_config_get_string (path);
-		g_free (path);
-		path = g_strdup_printf ("identity_replyto_%d", i);
-		id->reply_to = gnome_config_get_string (path);
-		g_free (path);
-		path = g_strdup_printf ("identity_address_%d", i);
-		id->address = gnome_config_get_string (path);
-		g_free (path);
-		path = g_strdup_printf ("identity_organization_%d", i);
-		id->organization = gnome_config_get_string (path);
-		g_free (path);
-		path = g_strdup_printf ("identity_signature_%d", i);
-		id->signature = gnome_config_get_string (path);
-		g_free (path);
-		
-		/* get the source */
-		source = g_new0 (MailConfigService, 1);
-		path = g_strdup_printf ("source_url_%d", i);
-		source->url = gnome_config_get_string (path);
-		g_free (path);
-		
-		if (!*source->url) {
-			/* no source associated with this account */
-			g_free (source->url);
-			source->url = NULL;
-		}
-		
-		path = g_strdup_printf ("source_keep_on_server_%d", i);
-		source->keep_on_server = gnome_config_get_bool (path);
-		g_free (path);
-		path = g_strdup_printf ("source_auto_check_%d", i);
-		source->auto_check = gnome_config_get_bool_with_default (path, &def);
-		if (def)
-			source->auto_check = FALSE;
-		g_free (path);
-		path = g_strdup_printf ("source_auto_check_time_%d", i);
-		source->auto_check_time = gnome_config_get_int_with_default (path, &def);
-		if (source->auto_check && def)
-			source->auto_check = FALSE;
-		g_free (path);
-		path = g_strdup_printf ("source_enabled_%d", i);
-		source->enabled = gnome_config_get_bool_with_default (path, &def);
-		if (def)
-			source->enabled = TRUE;
-		g_free (path);
-		path = g_strdup_printf ("source_save_passwd_%d", i);
-		source->save_passwd = gnome_config_get_bool (path);
-		g_free (path);
-		path = g_strdup_printf ("source_use_ssl_%d", i);
-		source->use_ssl = gnome_config_get_bool (path);
-		g_free (path);
-		
-		/* get the transport */
-		transport = g_new0 (MailConfigService, 1);
-		path = g_strdup_printf ("transport_url_%d", i);
-		transport->url = gnome_config_get_string (path);
-		g_free (path);
-		
-		if (!*transport->url) {
-			/* no transport associated with this account */
-			g_free (transport->url);
-			transport->url = NULL;
-		}
-		
-		path = g_strdup_printf ("transport_use_ssl_%d", i);
-		transport->use_ssl = gnome_config_get_bool (path);
-		g_free (path);
-		
-		account->id = id;
-		account->source = source;
-		account->transport = transport;
-		
-		config->accounts = g_slist_append (config->accounts, account);
-	}
-	gnome_config_pop_prefix ();
-	
-	/* News */
-	str = g_strdup_printf ("=%s/config/News=/Sources/", evolution_dir);
-	gnome_config_push_prefix (str);
-	g_free (str);
-	
-	len = gnome_config_get_int ("num");
-	for (i = 0; i < len; i++) {
-		MailConfigService *n;
-		gchar *path;
-		
-		n = g_new0 (MailConfigService, 1);
-		
-		path = g_strdup_printf ("url_%d", i);
-		n->url = gnome_config_get_string (path);
-		g_free (path);
-		
-		config->news = g_slist_append (config->news, n);
-	}
-	gnome_config_pop_prefix ();
-	
-	/* Format */
-	str = g_strdup_printf ("=%s/config/Mail=/Format/send_html", 
-			       evolution_dir);
-	config->send_html = gnome_config_get_bool_with_default (str, &def);
-	if (def)
-		config->send_html = FALSE;
-	g_free (str);
-	
-	/* Mark as seen timeout */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/seen_timeout", 
-			       evolution_dir);
-	config->seen_timeout = gnome_config_get_int_with_default (str, &def);
-	if (def)
-		config->seen_timeout = 1500;
-	g_free (str);
-	
-	/* Show Messages Threaded */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/thread_list", 
-			       evolution_dir);
-	config->thread_list = gnome_config_get_bool_with_default (str, &def);
-	if (def)
-		config->thread_list = FALSE;
-	g_free (str);
-	
-	/* Size of vpaned in mail view */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/paned_size", 
-			       evolution_dir);
-	config->paned_size = gnome_config_get_int_with_default (str, &def);
-	if (def)
-		config->paned_size = 200;
-	g_free (str);
-	
-	/* Empty Subject */
-	str = g_strdup_printf ("=%s/config/Mail=/Prompts/empty_subject", 
-			       evolution_dir);
-	config->prompt_empty_subject = gnome_config_get_bool_with_default (str, &def);
-	if (def)
-		config->prompt_empty_subject = TRUE;
-	g_free (str);
-	
-	/* PGP/GPG */
-	str = g_strdup_printf ("=%s/config/Mail=/PGP/path", 
-			       evolution_dir);
-	config->pgp_path = gnome_config_get_string (str);
-	g_free (str);
-	str = g_strdup_printf ("=%s/config/Mail=/PGP/type", 
-			       evolution_dir);
-	config->pgp_type = gnome_config_get_int_with_default (str, &def);
-	if (def)
-		config->pgp_type = 0;
-	g_free (str);
-	
-	gnome_config_sync ();
-}
-
-void
-mail_config_write (void)
-{
-	gchar *str;
-	gint len, i;
-	
-	/* Accounts */
-	str = g_strdup_printf ("=%s/config/Mail=/Accounts/", evolution_dir);
-	gnome_config_clean_section (str);
-	gnome_config_sync ();
-	gnome_config_push_prefix (str);
-	g_free (str);
-	
-	len = g_slist_length (config->accounts);
-	gnome_config_set_int ("num", len);
-	for (i = 0; i < len; i++) {
-		MailConfigAccount *account;
-		gchar *path;
-		
-		account = g_slist_nth_data (config->accounts, i);
-		
-		/* account info */
-		path = g_strdup_printf ("account_name_%d", i);
-		gnome_config_set_string (path, account->name);
-		g_free (path);
-		path = g_strdup_printf ("account_is_default_%d", i);
-		gnome_config_set_bool (path, account->default_account);
-		g_free (path);
-		
-		/* identity info */
-		path = g_strdup_printf ("identity_name_%d", i);
-		gnome_config_set_string (path, account->id->name);
-		g_free (path);
-		path = g_strdup_printf ("identity_address_%d", i);
-		gnome_config_set_string (path, account->id->address);
-		g_free (path);
-		path = g_strdup_printf ("identity_organization_%d", i);
-		gnome_config_set_string (path, account->id->organization);
-		g_free (path);
-		path = g_strdup_printf ("identity_signature_%d", i);
-		gnome_config_set_string (path, account->id->signature);
-		g_free (path);
-		
-		/* source info */
-		path = g_strdup_printf ("source_url_%d", i);
-		gnome_config_set_string (path, account->source->url ? account->source->url : "");
-		g_free (path);
-		path = g_strdup_printf ("source_keep_on_server_%d", i);
-		gnome_config_set_bool (path, account->source->keep_on_server);
-		g_free (path);
-		path = g_strdup_printf ("source_auto_check_%d", i);
-		gnome_config_set_bool (path, account->source->auto_check);
-		g_free (path);
-		path = g_strdup_printf ("source_auto_check_time_%d", i);
-		gnome_config_set_int (path, account->source->auto_check_time);
-		g_free (path);
-		path = g_strdup_printf ("source_enabled_%d", i);
-		gnome_config_set_bool (path, account->source->enabled);
-		g_free (path);
-		path = g_strdup_printf ("source_save_passwd_%d", i);
-		gnome_config_set_bool (path, account->source->save_passwd);
-		g_free (path);
-		path = g_strdup_printf ("source_use_ssl_%d", i);
-		gnome_config_set_bool (path, account->source->use_ssl);
-		g_free (path);
-		
-		/* transport info */
-		path = g_strdup_printf ("transport_url_%d", i);
-		gnome_config_set_string (path, account->transport->url ? account->transport->url : "");
-		g_free (path);
-	}
-	gnome_config_pop_prefix ();
-	
-	/* News */
-	str = g_strdup_printf ("=%s/config/News=/Sources/", evolution_dir);
-	gnome_config_push_prefix (str);
-	g_free (str);
-	
-  	len = g_slist_length (config->news);
-	gnome_config_set_int ("num", len);
-	for (i = 0; i < len; i++) {
-		MailConfigService *n;
-		gchar *path;
-		
-		n = g_slist_nth_data (config->news, i);
-		
-		path = g_strdup_printf ("url_%d", i);
-		gnome_config_set_string (path, n->url);
-		g_free (path);
-	}
-	gnome_config_pop_prefix ();
-	
-	gnome_config_sync ();
-}
-
-void
-mail_config_write_on_exit (void)
-{
-	gchar *str;
-	GSList *sources;
-	MailConfigService *s;
-	
-	/* Show Messages Threaded */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/thread_list", 
-			       evolution_dir);
-	gnome_config_set_bool (str, config->thread_list);
-	g_free (str);
-	
-	/* Size of vpaned in mail view */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/paned_size", 
-			       evolution_dir);
-	gnome_config_set_int (str, config->paned_size);
-	g_free (str);
-	
-	/* Mark as seen timeout */
-	str = g_strdup_printf ("=%s/config/Mail=/Display/seen_timeout", 
-			       evolution_dir);
-	gnome_config_set_int (str, config->seen_timeout);
-	g_free (str);
-	
-	/* Format */
-	str = g_strdup_printf ("=%s/config/Mail=/Format/send_html", 
-			       evolution_dir);
-	gnome_config_set_bool (str, config->send_html);
-	g_free (str);
-	
-	/* Empty Subject */
-	str = g_strdup_printf ("=%s/config/Mail=/Prompts/empty_subject", 
-			       evolution_dir);
-	gnome_config_set_bool (str, config->prompt_empty_subject);
-	g_free (str);
-	
-	/* PGP/GPG */
-	str = g_strdup_printf ("=%s/config/Mail=/PGP/path", 
-			       evolution_dir);
-	gnome_config_set_string (str, config->pgp_path);
-	g_free (str);
-	str = g_strdup_printf ("=%s/config/Mail=/PGP/type", 
-			       evolution_dir);
-	gnome_config_set_int (str, config->pgp_type);
-	g_free (str);
-	
-	/* Passwords */
-	gnome_config_private_clean_section ("/Evolution/Passwords");
-	sources = mail_config_get_sources ();
-	for ( ; sources; sources = sources->next) {
-		s = sources->data;
-		if (s->save_passwd)
-			mail_session_remember_password (s->url);
-	}
-	g_slist_free (sources);
-	
-	gnome_config_sync ();
-}
-
-/* Accessor functions */
-gboolean
-mail_config_is_configured (void)
-{
-	return config->accounts != NULL;
-}
-
-gboolean
-mail_config_get_thread_list (void)
-{
-	return config->thread_list;
-}
-
-void
-mail_config_set_thread_list (gboolean value)
-{
-	config->thread_list = value;
-}
-
-gboolean
-mail_config_get_view_source (void)
-{
-	return config->view_source;
-}
-
-void
-mail_config_set_view_source (gboolean value)
-{
-	config->view_source = value;
-}
-
-gint
-mail_config_get_paned_size (void)
-{
-	return config->paned_size;
-}
-
-void
-mail_config_set_paned_size (gint value)
-{
-	config->paned_size = value;
-}
-
-gboolean
-mail_config_get_send_html (void)
-{
-	return config->send_html;
-}
-
-void
-mail_config_set_send_html (gboolean send_html)
-{
-	config->send_html = send_html;
-}
-
-gint
-mail_config_get_mark_as_seen_timeout (void)
-{
-	return config->seen_timeout;
-}
-
-void
-mail_config_set_mark_as_seen_timeout (gint timeout)
-{
-	config->seen_timeout = timeout;
-}
-
-gboolean
-mail_config_get_prompt_empty_subject (void)
-{
-	return config->prompt_empty_subject;
-}
-
-void
-mail_config_set_prompt_empty_subject (gboolean value)
-{
-	config->prompt_empty_subject = value;
-}
-
-gint
-mail_config_get_pgp_type (void)
-{
-	return config->pgp_type;
-}
-
-void
-mail_config_set_pgp_type (gint pgp_type)
-{
-	config->pgp_type = pgp_type;
-}
-
-const char *
-mail_config_get_pgp_path (void)
-{
-	return config->pgp_path;
-}
-
-void
-mail_config_set_pgp_path (const char *pgp_path)
-{
-	g_free (config->pgp_path);
-	
-	config->pgp_path = g_strdup (pgp_path);
-}
-
-const MailConfigAccount *
-mail_config_get_default_account (void)
-{
-	const MailConfigAccount *account;
-	GSList *l;
-	
-	if (!config->accounts)
-		return NULL;
-	
-	/* find the default account */
-	l = config->accounts;
-	while (l) {
-		account = l->data;
-		if (account->default_account)
-			return account;
-		
-		l = l->next;
-	}
-	
-	/* none are marked as default so mark the first one as the default */
-	account = config->accounts->data;
-	mail_config_set_default_account (account);
-	
-	return account;
-}
-
-const MailConfigAccount *
-mail_config_get_account_by_name (const char *account_name)
-{
-	/* FIXME: this should really use a hash */
-	const MailConfigAccount *account;
-	GSList *l;
-	
-	l = config->accounts;
-	while (l) {
-		account = l->data;
-		if (account && !strcmp (account->name, account_name))
-			return account;
-		
-		l = l->next;
-	}
-	
-	return NULL;
-}
-
-const GSList *
-mail_config_get_accounts (void)
-{
-	return config->accounts;
-}
-
-void
-mail_config_add_account (MailConfigAccount *account)
-{
-	if (account->default_account) {
-		/* Un-defaultify other accounts */
-		GSList *node = config->accounts;
-		
-		while (node) {
-			MailConfigAccount *acnt = node->data;
-			
-			acnt->default_account = FALSE;
-			
-			node = node->next;
-		}
-	}
-	
-	config->accounts = g_slist_append (config->accounts, account);
-}
-
-const GSList *
-mail_config_remove_account (MailConfigAccount *account)
-{
-	config->accounts = g_slist_remove (config->accounts, account);
-	account_destroy (account);
-	
-	return config->accounts;
-}
-
-void
-mail_config_set_default_account (const MailConfigAccount *account)
-{
-	GSList *node = config->accounts;
-	
-	while (node) {
-		MailConfigAccount *acnt = node->data;
-		
-		acnt->default_account = FALSE;
-		
-		node = node->next;
-	}
-	
-	((MailConfigAccount *) account)->default_account = TRUE;
-}
-
-const MailConfigIdentity *
-mail_config_get_default_identity (void)
-{
-	const MailConfigAccount *account;
-	
-	account = mail_config_get_default_account ();
-	if (account)
-		return account->id;
-	else
-		return NULL;
-}
-
-const MailConfigService *
-mail_config_get_default_transport (void)
-{
-	const MailConfigAccount *account;
-	
-	account = mail_config_get_default_account ();
-	if (account)
-		return account->transport;
-	else
-		return NULL;
-}
-
-const MailConfigService *
-mail_config_get_default_news (void)
-{
-	if (!config->news)
-		return NULL;
-	
-	return (MailConfigService *)config->news->data;
-}
-
-const GSList *
-mail_config_get_news (void)
-{
-	return config->news;
-}
-
-void
-mail_config_add_news (MailConfigService *news) 
-{
-	config->news = g_slist_append (config->news, news);
-}
-
-const GSList *
-mail_config_remove_news (MailConfigService *news)
-{
-	config->news = g_slist_remove (config->news, news);
-	service_destroy (news);
-	
-	return config->news;
-}
-
-GSList *
-mail_config_get_sources (void)
-{
-	const GSList *accounts;
-	GSList *sources = NULL;
-	
-	accounts = mail_config_get_accounts ();
-	while (accounts) {
-		const MailConfigAccount *account = accounts->data;
-		
-		if (account->source)
-			sources = g_slist_append (sources, account->source);
-		
-		accounts = accounts->next;
-	}
-	
-	return sources;
-}
-
-char *
-mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix)
-{
-	char *url, *filename;
-	
-	url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, FALSE);
-	e_filename_make_safe (url);
-	
-	filename = g_strdup_printf ("%s/config/%s%s", evolution_dir, prefix, url);
-	g_free (url);
-	
-	return filename;
-}
-
-
-/* Async service-checking/authtype-lookup code. */
-struct _check_msg {
-	struct _mail_msg msg;
-
-	char *url;
-	CamelProviderType type;
-	gboolean connect;
-	GList **authtypes;
-	gboolean *success;
-};
-
-static void check_service_check(struct _mail_msg *mm)
-{
-	struct _check_msg *m = (struct _check_msg *)mm;
-	CamelService *service = NULL;
-	
-	if (m->authtypes) {
-		service = camel_session_get_service (session, m->url, m->type, &mm->ex);
-		if (!service)
-			return;
-		*m->authtypes = camel_service_query_auth_types (service, m->connect, &mm->ex);
-	} else if (m->connect) {
-		service = camel_session_get_service_connected (session, m->url, m->type, &mm->ex);
-	}
-	if (service)
-		camel_object_unref (CAMEL_OBJECT (service));
-
-	*m->success = !camel_exception_is_set(&mm->ex);
-}
-
-static void check_service_free(struct _mail_msg *mm)
-{
-	struct _check_msg *m = (struct _check_msg *)mm;
-
-	g_free(m->url);
-}
-
-static struct _mail_msg_op check_service_op = {
-	NULL,
-	check_service_check,
-	NULL,
-	check_service_free
-};
-
-/**
- * mail_config_check_service:
- * @url: service url
- * @type: provider type
- * @connect: whether or not the check service should connect
- * @authtypes: list of auth types gathered by this method
- *
- * Checks the service for validity. If @connect is TRUE then a
- * connection with the server is attempted and if successful will fill
- * in the @authtypes list. If @connect is FALSE then @authtypes will
- * be generated without a connection and thus will not necessarily
- * reflect what the server supports.
- *
- * Returns TRUE on success or FALSE on error.
- *
- **/
-
-gboolean
-mail_config_check_service (CamelURL *url, CamelProviderType type, gboolean connect, GList **authtypes)
-{
-	gboolean ret = FALSE;
-	struct _check_msg *m;
-	int id;
-
-	m = mail_msg_new(&check_service_op, NULL, sizeof(*m));
-	m->url = camel_url_to_string(url, TRUE);
-	m->type = type;
-	m->connect = connect;
-	m->authtypes = authtypes;
-	m->success = &ret;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-	mail_msg_wait(id);
-	
-	return ret;
-}
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
deleted file mode 100644
index 5c7753cfb9..0000000000
--- a/mail/mail-config.glade
+++ /dev/null
@@ -1,3413 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>config</name>
-  <program_name>config</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>mail-config-druid</name>
-  <visible>False</visible>
-  <title>Mail Configuration Druid</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>True</modal>
-  <default_width>450</default_width>
-  <default_height>350</default_height>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>True</auto_shrink>
-
-  <widget>
-    <class>GnomeDruid</class>
-    <name>druid</name>
-    <signal>
-      <name>cancel</name>
-      <handler>druid_cancel</handler>
-      <last_modification_time>Thu, 09 Nov 2000 21:35:32 GMT</last_modification_time>
-    </signal>
-
-    <widget>
-      <class>GnomeDruidPageStart</class>
-      <name>druidStartPage</name>
-      <title>Mail Configuration</title>
-      <text>Welcome to the Evolution Mail Configuration Druid.
-
-Click &quot;Next&quot; to begin. </text>
-      <title_color>255,255,255</title_color>
-      <text_color>0,0,0</text_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-      <logo_image>fetch-mail.png</logo_image>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>druidIdentityPage</name>
-      <signal>
-	<name>prepare</name>
-	<handler>identity_prepare</handler>
-	<last_modification_time>Tue, 07 Nov 2000 21:08:00 GMT</last_modification_time>
-      </signal>
-      <signal>
-	<name>next</name>
-	<handler>identity_next</handler>
-	<last_modification_time>Tue, 07 Nov 2000 21:08:07 GMT</last_modification_time>
-      </signal>
-      <title>Identity</title>
-      <title_color>255,255,255</title_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <logo_image>malehead.png</logo_image>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox1</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>htmlIdentity</name>
-	    <creation_function>mail_config_create_html</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 02 Nov 2000 17:26:09 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>identity-required-frame</name>
-	    <border_width>3</border_width>
-	    <height>76</height>
-	    <label>Required</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>5</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkTable</class>
-	      <name>table1</name>
-	      <border_width>4</border_width>
-	      <rows>2</rows>
-	      <columns>2</columns>
-	      <homogeneous>False</homogeneous>
-	      <row_spacing>4</row_spacing>
-	      <column_spacing>4</column_spacing>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<name>txtFullName</name>
-		<width>80</width>
-		<height>20</height>
-		<can_focus>True</can_focus>
-		<has_focus>True</has_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>50</text_max_length>
-		<text></text>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<name>txtAddress</name>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>50</text_max_length>
-		<text></text>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>identity-address-label</name>
-		<label>Email Address:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>identity-name-label</name>
-		<label>Full Name:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox5</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>identity-optional-frame</name>
-	      <border_width>3</border_width>
-	      <height>102</height>
-	      <label>Optional</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table2</name>
-		<border_width>4</border_width>
-		<rows>2</rows>
-		<columns>2</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>4</row_spacing>
-		<column_spacing>4</column_spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>identity-organization-label</name>
-		  <label>Organization:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>identity-signature-label</name>
-		  <label>Signature file:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtOrganization</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GnomeFileEntry</class>
-		  <name>fileSignature</name>
-		  <max_saved>10</max_saved>
-		  <directory>False</directory>
-		  <modal>False</modal>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-
-		  <widget>
-		    <class>GtkEntry</class>
-		    <child_name>GnomeEntry:entry</child_name>
-		    <name>identity-signature-entry</name>
-		    <can_focus>True</can_focus>
-		    <editable>True</editable>
-		    <text_visible>True</text_visible>
-		    <text_max_length>0</text_max_length>
-		    <text></text>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>druidSourcePage</name>
-      <signal>
-	<name>prepare</name>
-	<handler>incoming_prepare</handler>
-	<last_modification_time>Wed, 03 Jan 2001 19:22:09 GMT</last_modification_time>
-      </signal>
-      <signal>
-	<name>next</name>
-	<handler>incoming_next</handler>
-	<last_modification_time>Wed, 03 Jan 2001 19:22:16 GMT</last_modification_time>
-      </signal>
-      <title>Receiving Email</title>
-      <title_color>255,255,255</title_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <logo_image>evolution-inbox.png</logo_image>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox6</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>htmlIncoming</name>
-	    <creation_function>mail_config_create_html</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 02 Nov 2000 17:27:42 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table3</name>
-	    <border_width>4</border_width>
-	    <rows>1</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>2</column_spacing>
-	    <child>
-	      <padding>4</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>source-type-label</name>
-	      <label>Server Type: </label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>omenuIncomingType</name>
-	      <can_focus>True</can_focus>
-	      <items></items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>source-frame</name>
-	    <label>Server Configuration</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table4</name>
-		<border_width>4</border_width>
-		<rows>3</rows>
-		<columns>2</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>4</row_spacing>
-		<column_spacing>4</column_spacing>
-		<child>
-		  <padding>4</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>lblSourceHost</name>
-		  <label>Host:</label>
-		  <justify>GTK_JUSTIFY_RIGHT</justify>
-		  <wrap>False</wrap>
-		  <xalign>1</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>lblSourceUser</name>
-		  <label>Username:</label>
-		  <justify>GTK_JUSTIFY_RIGHT</justify>
-		  <wrap>False</wrap>
-		  <xalign>1</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtIncomingHostname</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtIncomingUsername</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtIncomingPath</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>2</top_attach>
-		    <bottom_attach>3</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>lblSourcePath</name>
-		  <label>Path:</label>
-		  <justify>GTK_JUSTIFY_RIGHT</justify>
-		  <wrap>False</wrap>
-		  <xalign>1</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>2</top_attach>
-		    <bottom_attach>3</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>chkIncomingKeepMail</name>
-		<can_focus>True</can_focus>
-		<label>Keep mail on server</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox39</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>chkAutoCheck</name>
-		  <can_focus>True</can_focus>
-		  <label>Automatically check mail every</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>spinAutoCheckMinutes</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>True</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>10</value>
-		  <lower>0</lower>
-		  <upper>1440</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <padding>2</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>lblMinutes</name>
-		  <label>minutes.</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>chkIncomingCheckSettings</name>
-		<can_focus>True</can_focus>
-		<label>Check settings</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>druidAuthPage</name>
-      <signal>
-	<name>prepare</name>
-	<handler>authentication_prepare</handler>
-	<last_modification_time>Tue, 07 Nov 2000 22:31:02 GMT</last_modification_time>
-      </signal>
-      <signal>
-	<name>next</name>
-	<handler>authentication_next</handler>
-	<last_modification_time>Tue, 07 Nov 2000 22:31:08 GMT</last_modification_time>
-      </signal>
-      <title>Authentication</title>
-      <title_color>255,255,255</title_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <logo_image>registration.png</logo_image>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox8</name>
-	  <border_width>6</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>htmlAuthentication</name>
-	    <creation_function>mail_config_create_html</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 02 Nov 2000 17:31:34 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>authentication-frame</name>
-	    <label>Authentication</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox25</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>authentication-type-label</name>
-		  <label>Authentication Type:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>1</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>omenuAuthType</name>
-		  <can_focus>True</can_focus>
-		  <items></items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>authentication-password-table</name>
-		<border_width>4</border_width>
-		<rows>1</rows>
-		<columns>2</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>4</row_spacing>
-		<column_spacing>4</column_spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtAuthPasswd</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>False</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>lblSourcePasswd</name>
-		  <label>Password:</label>
-		  <justify>GTK_JUSTIFY_RIGHT</justify>
-		  <wrap>False</wrap>
-		  <xalign>1</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>chkAuthSavePasswd</name>
-		<border_width>4</border_width>
-		<can_focus>True</can_focus>
-		<label>Remember my password</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>druidTransportPage</name>
-      <signal>
-	<name>prepare</name>
-	<handler>transport_prepare</handler>
-	<last_modification_time>Thu, 09 Nov 2000 19:21:41 GMT</last_modification_time>
-      </signal>
-      <signal>
-	<name>next</name>
-	<handler>transport_next</handler>
-	<last_modification_time>Thu, 09 Nov 2000 19:21:51 GMT</last_modification_time>
-      </signal>
-      <title>Sending Email</title>
-      <title_color>255,255,255</title_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <logo_image>send.png</logo_image>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox4</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox10</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox11</name>
-	    <border_width>5</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>htmlTransport</name>
-	      <creation_function>mail_config_create_html</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Thu, 02 Nov 2000 17:37:47 GMT</last_modification_time>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkTable</class>
-	      <name>table5</name>
-	      <border_width>4</border_width>
-	      <rows>1</rows>
-	      <columns>2</columns>
-	      <homogeneous>False</homogeneous>
-	      <row_spacing>4</row_spacing>
-	      <column_spacing>2</column_spacing>
-	      <child>
-		<padding>4</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>transport-type-label</name>
-		<label>Server Type: </label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>2</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>omenuTransportType</name>
-		<can_focus>True</can_focus>
-		<items></items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>transport-frame</name>
-	      <label>Server Configuration</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox12</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table6</name>
-		  <border_width>4</border_width>
-		  <rows>1</rows>
-		  <columns>2</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>4</row_spacing>
-		  <column_spacing>4</column_spacing>
-		  <child>
-		    <padding>4</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>lblTransportHost</name>
-		    <label>Host:</label>
-		    <justify>GTK_JUSTIFY_RIGHT</justify>
-		    <wrap>False</wrap>
-		    <xalign>1</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>False</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkEntry</class>
-		    <name>txtTransportHostname</name>
-		    <can_focus>True</can_focus>
-		    <editable>True</editable>
-		    <text_visible>True</text_visible>
-		    <text_max_length>0</text_max_length>
-		    <text></text>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>False</yfill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>chkTransportNeedsAuth</name>
-		  <border_width>3</border_width>
-		  <can_focus>True</can_focus>
-		  <label>Server requires authentication</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>chkOutgoingCheckSettings</name>
-		  <border_width>3</border_width>
-		  <can_focus>True</can_focus>
-		  <label>Check settings</label>
-		  <active>True</active>
-		  <draw_indicator>True</draw_indicator>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>druidManagementPage</name>
-      <signal>
-	<name>prepare</name>
-	<handler>management_prepare</handler>
-	<last_modification_time>Thu, 09 Nov 2000 19:22:01 GMT</last_modification_time>
-      </signal>
-      <signal>
-	<name>next</name>
-	<handler>management_next</handler>
-	<last_modification_time>Thu, 09 Nov 2000 21:46:21 GMT</last_modification_time>
-      </signal>
-      <title>Account Management</title>
-      <title_color>255,255,255</title_color>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <logo_image>evolution-tasks.png</logo_image>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox5</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox29</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>htmlAccountInfo</name>
-	    <creation_function>mail_config_create_html</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 02 Nov 2000 17:38:22 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>management-frame</name>
-	    <label>Account Information</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox31</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox24</name>
-		<border_width>3</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>5</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>management-name-label</name>
-		  <label>Name:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>txtAccountName</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>chkAccountDefault</name>
-		  <can_focus>True</can_focus>
-		  <label>Make this my default account</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name></name>
-		<label></label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageFinish</class>
-      <name>druidFinishPage</name>
-      <title>Done</title>
-      <text>Congratulations, your mail configuration is complete.
-
-You are now ready to send and receive email 
-using Evolution. 
-
-Click &quot;Finish&quot; to save your settings.</text>
-      <background_color>25,25,112</background_color>
-      <logo_background_color>25,25,112</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-      <text_color>0,0,0</text_color>
-      <title_color>255,255,255</title_color>
-      <logo_image>house.png</logo_image>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>mail-account-editor</name>
-  <visible>False</visible>
-  <title>Account Properties</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>True</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cmdOK</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cmdApply</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cmdCancel</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>toplevel</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox32</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox33</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox26</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>5</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblMailAccount</name>
-	      <label>Mail Account</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblDirections</name>
-	    <label>Type the name by which you would like to refer to these servers. For example: &quot;Work&quot; or &quot;Home&quot;.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtAccountName</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>5</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableUserInfo</name>
-	  <rows>6</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>0</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox35</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblUserInfo</name>
-	      <label>User Information</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator8</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtName</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtAddress</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtReplyTo</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtOrganization</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>fileSignature</name>
-	    <max_saved>10</max_saved>
-	    <title>Select signature file</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>txtSignature</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblName</name>
-	    <label>Name:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblEMail</name>
-	    <label>E-Mail Address:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblReplyTo</name>
-	    <label>Reply-To:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblOrganization</name>
-	    <label>Organization:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSignature</name>
-	    <label>Signature:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblGeneral</name>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox34</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableIncomingServer</name>
-	  <rows>8</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox31</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblIncomingMailServer</name>
-	      <label>Incoming Mail Server</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator4</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkSavePasswd</name>
-	    <can_focus>True</can_focus>
-	    <label>Save password</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>5</top_attach>
-	      <bottom_attach>6</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceHost</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceUser</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourcePasswd</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>False</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkSourceSSL</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <label>This server requires a secure connection (SSL)</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>7</top_attach>
-	      <bottom_attach>8</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceUser</name>
-	    <label>Username:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourcePasswd</name>
-	    <label>Password:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceAuth</name>
-	    <label>Authentication:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourceHost</name>
-	    <label>Hostname:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblIncomingServerType</name>
-	    <label>Type:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourceType</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>False</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuSourceAuth</name>
-	    <can_focus>True</can_focus>
-	    <items>Plain Text
-Kerberos
-CRAM-MD5
-DIGEST-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableOutgoingServer</name>
-	  <rows>5</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox32</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblOutgoingMailServer</name>
-	      <label>Outgoing Mail Server</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator5</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtTransportHost</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkTransportSSL</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <label>This server requires a secure connection (SSL)</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblOutgoingServerType</name>
-	    <label>Type:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblTransportHost</name>
-	    <label>Hostname:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblTransportAuth</name>
-	    <label>Authentication:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportAuth</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-CRAM-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportType</name>
-	    <can_focus>True</can_focus>
-	    <items>Sendmail
-SMTP
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblServers</name>
-	<label>Servers</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox36</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableServerTimeouts</name>
-	  <rows>5</rows>
-	  <columns>10</columns>
-	  <homogeneous>True</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox34</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblMisc</name>
-	      <label>Miscellaneous</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>10</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHSeparator</class>
-	      <name>hseparator7</name>
-	      <child>
-		<padding>10</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSourcePath</name>
-	    <label>Path:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkKeepMailOnServer</name>
-	    <can_focus>True</can_focus>
-	    <label>Keep mail on server</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourcePath</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkEnabled</name>
-	    <can_focus>True</can_focus>
-	    <label>Include in &quot;Get Mail&quot; operations.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox40</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>chkAutoCheckMail</name>
-	      <can_focus>True</can_focus>
-	      <label>Automatically check mail every</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinAutoCheckTimeout</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>True</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>10</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>lblMinutes</name>
-	      <label>minutes.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblAdvanced</name>
-	<label>Advanced</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>mail-accounts-dialog</name>
-  <visible>False</visible>
-  <title>Evolution Mail Configuration</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <default_width>350</default_width>
-  <default_height>240</default_height>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>True</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox37</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cmdOK</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cmdCancel</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox36</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCList</class>
-	    <name>clistAccounts</name>
-	    <can_focus>True</can_focus>
-	    <columns>2</columns>
-	    <column_widths>150,80</column_widths>
-	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    <show_titles>True</show_titles>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblAccount</name>
-	      <label>Account</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblType</name>
-	      <label>Type</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox1</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Add</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailEdit</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Edit</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailDelete</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Delete</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdMailDefault</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Default</label>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblMail</name>
-	<label>Mail</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox37</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCList</class>
-	    <name>clistNews</name>
-	    <can_focus>True</can_focus>
-	    <columns>1</columns>
-	    <column_widths>80</column_widths>
-	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    <show_titles>True</show_titles>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblSources</name>
-	      <label>Sources</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox2</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Add</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsEdit</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Edit</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsDelete</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Delete</label>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblNews</name>
-	<label>News</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox38</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>chkSendHTML</name>
-	  <can_focus>True</can_focus>
-	  <label>Send mail in HTML format by default.</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox38</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblMarkAsRead</name>
-	    <label>Mark messages as &quot;Read&quot; after:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>spinMarkTimeout</name>
-	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>1</digits>
-	    <numeric>True</numeric>
-	    <update_policy>GTK_UPDATE_IF_VALID</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>1.5</value>
-	    <lower>0</lower>
-	    <upper>10</upper>
-	    <step>0.1</step>
-	    <page>1</page>
-	    <page_size>1</page_size>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSeconds</name>
-	    <label>seconds.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox41</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblPgpPath</name>
-	    <label>PGP binary path:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>4</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>filePgpPath</name>
-	    <max_saved>10</max_saved>
-	    <title>Select PGP binary</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <padding>4</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>combo-entry1</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblOther</name>
-	<label>Other</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>editor</name>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>True</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox4</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area4</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>toplevel</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblGeneral</name>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblSource</name>
-	<label>Source</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>Placeholder</class>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>lblTransport</name>
-	<label>Transport</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/mail/mail-config.h b/mail/mail-config.h
deleted file mode 100644
index 852049ccc0..0000000000
--- a/mail/mail-config.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_CONFIG_H
-#define MAIL_CONFIG_H
-
-#include <glib.h>
-#include <camel/camel.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct {
-	gchar *name;
-	gchar *address;
-	gchar *reply_to;
-	gchar *organization;
-	gchar *signature;
-} MailConfigIdentity;
-
-typedef struct {
-	gchar *url;
-	gboolean keep_on_server;
-	gboolean auto_check;
-	gint auto_check_time;
-	gboolean enabled;
-	
-	gboolean save_passwd;
-	gboolean use_ssl;
-} MailConfigService;
-
-typedef struct {
-	gchar *name;
-	gboolean default_account;
-	
-	MailConfigIdentity *id;
-	MailConfigService *source;
-	MailConfigService *transport;
-} MailConfigAccount;
-
-/* Identities */
-MailConfigIdentity *identity_copy (const MailConfigIdentity *id);
-void                identity_destroy (MailConfigIdentity *id);
-
-/* Services */
-MailConfigService *service_copy (const MailConfigService *source);
-void               service_destroy (MailConfigService *source);
-void               service_destroy_each (gpointer item, gpointer data);
-
-/* Accounts */
-MailConfigAccount *account_copy (const MailConfigAccount *account);
-void               account_destroy (MailConfigAccount *account);
-void               account_destroy_each (gpointer item, gpointer data);
-
-/* Configuration */
-void mail_config_init (void);
-void mail_config_clear (void);
-void mail_config_write (void);
-void mail_config_write_on_exit (void);
-
-/* General Accessor functions */
-gboolean mail_config_is_configured            (void);
-
-gboolean mail_config_get_thread_list          (void);
-void     mail_config_set_thread_list          (gboolean value);
-
-gboolean mail_config_get_view_source          (void);
-void     mail_config_set_view_source          (gboolean value);
-
-gint     mail_config_get_paned_size           (void);
-void     mail_config_set_paned_size           (gint size);
-
-gboolean mail_config_get_send_html            (void);
-void     mail_config_set_send_html            (gboolean send_html);
-
-gint     mail_config_get_mark_as_seen_timeout (void);
-void     mail_config_set_mark_as_seen_timeout (gint timeout);
-
-gboolean mail_config_get_prompt_empty_subject (void);
-void     mail_config_set_prompt_empty_subject (gboolean value);
-
-gint     mail_config_get_pgp_type (void);
-void     mail_config_set_pgp_type (gint pgp_type);
-
-const char *mail_config_get_pgp_path (void);
-void        mail_config_set_pgp_path (const char *pgp_path);
-
-const MailConfigAccount  *mail_config_get_default_account (void);
-const MailConfigAccount  *mail_config_get_account_by_name (const char *account_name);
-const GSList             *mail_config_get_accounts        (void);
-void                      mail_config_add_account         (MailConfigAccount *account);
-const GSList             *mail_config_remove_account      (MailConfigAccount *account);
-void                      mail_config_set_default_account (const MailConfigAccount *account);
-
-const MailConfigIdentity *mail_config_get_default_identity (void);
-const MailConfigService  *mail_config_get_default_transport (void);
-
-const MailConfigService  *mail_config_get_default_news    (void);
-const GSList             *mail_config_get_news            (void);
-void                      mail_config_add_news            (MailConfigService *news);
-const GSList             *mail_config_remove_news         (MailConfigService *news);
-
-/* convenience functions to help ease the transition over to the new codebase */
-GSList *mail_config_get_sources (void);
-
-/* static utility functions */
-char *mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix);
-
-gboolean  mail_config_check_service (CamelURL *url, CamelProviderType type, gboolean connect, GList **authtypes);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_CONFIG_H */
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
deleted file mode 100644
index efef0f09e1..0000000000
--- a/mail/mail-crypto.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "mail-crypto.h"
-#include "mail-session.h"
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <signal.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <camel/camel-mime-filter-from.h>
-
-/** rfc2015 stuff *******************************/
-
-gboolean
-mail_crypto_is_rfc2015_signed (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-	const gchar *param;
-	int nparts;
-	
-	/* check that we have a multipart/signed */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "signed"))
-		return FALSE;
-	
-	/* check that we have a protocol param with the value: "application/pgp-signed" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || g_strcasecmp (param, "application/pgp-signature"))
-		return FALSE;
-	
-	/* check that we have exactly 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts != 2)
-		return FALSE;
-	
-	/* The first part may be of any type except for 
-	 * application/pgp-signature - check it. */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	/* The second part should be application/pgp-signature. */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-signature"))
-		return FALSE;
-	
-	/* FIXME: Implement multisig stuff */	
-	
-	return TRUE;
-}
-
-gboolean
-mail_crypto_is_rfc2015_encrypted (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelMimePart *part;
-	CamelContentType *type;
-	const gchar *param;
-	int nparts;
-	
-	/* check that we have a multipart/encrypted */
-	type = camel_mime_part_get_content_type (mime_part);
-	if (!header_content_type_is (type, "multipart", "encrypted"))
-		return FALSE;
-	
-	/* check that we have a protocol param with the value: "application/pgp-encrypted" */
-	param = header_content_type_param (type, "protocol");
-	if (!param || g_strcasecmp (param, "application/pgp-encrypted"))
-		return FALSE;
-	
-	/* check that we have at least 2 subparts */
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);
-	if (nparts < 2)
-		return FALSE;
-	
-	/* The first part should be application/pgp-encrypted */
-	part = camel_multipart_get_part (mp, 0);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "pgp-encrypted"))
-		return FALSE;
-	
-	/* The second part should be application/octet-stream - this
-           is the one we care most about */
-	part = camel_multipart_get_part (mp, 1);
-	type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (type, "application", "octet-stream"))
-		return FALSE;
-	
-	return TRUE;
-}
-
-/**
- * pgp_mime_part_sign:
- * @mime_part: a MIME part that will be replaced by a pgp signed part
- * @userid: userid to sign with
- * @hash: one of PGP_HASH_TYPE_MD5 or PGP_HASH_TYPE_SHA1
- * @ex: exception which will be set if there are any errors.
- *
- * Constructs a PGP/MIME multipart in compliance with rfc2015 and
- * replaces #part with the generated multipart/signed. On failure,
- * #ex will be set and #part will remain untouched.
- **/
-void
-pgp_mime_part_sign (CamelMimePart **mime_part, const gchar *userid, PgpHashType hash, CamelException *ex)
-{
-	CamelMimePart *part, *signed_part;
-	CamelMultipart *multipart;
-	CamelMimePartEncodingType encoding;
-	CamelContentType *mime_type;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter, *from_filter;
-	CamelStream *stream;
-	GByteArray *content;
-	gchar *signature;
-	gchar *hash_type = NULL;
-	
-	g_return_if_fail (*mime_part != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));
-	g_return_if_fail (userid != NULL);
-	g_return_if_fail (hash != PGP_HASH_TYPE_NONE);
-	
-	part = *mime_part;
-	encoding = camel_mime_part_get_encoding (part);
-	
-	/* the encoding should really be QP or Base64 */
-	if (encoding != CAMEL_MIME_PART_ENCODING_BASE64)
-		camel_mime_part_set_encoding (part, CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE);
-	
-	/* get the cleartext */
-	content = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), content);
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	from_filter = CAMEL_MIME_FILTER (camel_mime_filter_from_new ());
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (from_filter));
-	camel_object_unref (CAMEL_OBJECT (from_filter));
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	/* get the signature */
-	signature = openpgp_sign (content->data, content->len, userid, hash, ex);
-	g_byte_array_free (content, TRUE);
-	if (camel_exception_is_set (ex)) {
-		/* restore the original encoding */
-		camel_mime_part_set_encoding (part, encoding);
-		return;
-	}
-	
-	/* construct the pgp-signature mime part */
-	fprintf (stderr, "signature:\n%s\n", signature);
-	signed_part = camel_mime_part_new ();
-	camel_mime_part_set_content (signed_part, signature, strlen (signature),
-				     "application/pgp-signature");
-	g_free (signature);
-	
-	/* construct the container multipart/signed */
-	multipart = camel_multipart_new ();
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-					  "multipart/signed");
-	switch (hash) {
-	case PGP_HASH_TYPE_MD5:
-		hash_type = "pgp-md5";
-		break;
-	case PGP_HASH_TYPE_SHA1:
-		hash_type = "pgp-sha1";
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-	
-	mime_type = camel_data_wrapper_get_mime_type_field (CAMEL_DATA_WRAPPER (multipart));
-	header_content_type_set_param (mime_type, "micalg", hash_type);
-	header_content_type_set_param (mime_type, "protocol", "application/pgp-signature");
-	camel_multipart_set_boundary (multipart, NULL);
-	
-	/* add the parts to the multipart */
-	camel_multipart_add_part (multipart, part);
-	camel_object_unref (CAMEL_OBJECT (part));
-	camel_multipart_add_part (multipart, signed_part);
-	camel_object_unref (CAMEL_OBJECT (signed_part));
-	
-	/* replace the input part with the output part */
-	*mime_part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),
-					 CAMEL_DATA_WRAPPER (multipart));
-	camel_object_unref (CAMEL_OBJECT (multipart));
-}
-
-
-/**
- * pgp_mime_part_verify:
- * @mime_part: a multipart/signed MIME Part
- * @ex: exception
- *
- * Returns a PgpValidity on success or NULL on fail.
- **/
-PgpValidity *
-pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *multipart;
-	CamelMimePart *part, *sigpart;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter;
-	CamelStream *stream;
-	GByteArray *content, *signature;
-	PgpValidity *valid;
-	
-	g_return_val_if_fail (mime_part != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);
-	
-	if (!mail_crypto_is_rfc2015_signed (mime_part))
-		return NULL;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	/* get the plain part */
-	part = camel_multipart_get_part (multipart, 0);
-	content = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), content);
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	/* get the signed part */
-	sigpart = camel_multipart_get_part (multipart, 1);
-	signature = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), signature);
-	camel_data_wrapper_write_to_stream (camel_medium_get_content_object (CAMEL_MEDIUM (sigpart)), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	/* verify */
-	valid = openpgp_verify (content->data, content->len,
-				signature->data, signature->len, ex);
-	
-	g_byte_array_free (content, TRUE);
-	g_byte_array_free (signature, TRUE);
-	
-	return valid;
-}
-
-
-/**
- * pgp_mime_part_encrypt:
- * @mime_part: a MIME part that will be replaced by a pgp encrypted part
- * @recipients: list of recipient PGP Key IDs
- * @ex: exception which will be set if there are any errors.
- *
- * Constructs a PGP/MIME multipart in compliance with rfc2015 and
- * replaces #mime_part with the generated multipart/signed. On failure,
- * #ex will be set and #part will remain untouched.
- **/
-void
-pgp_mime_part_encrypt (CamelMimePart **mime_part, const GPtrArray *recipients, CamelException *ex)
-{
-	CamelMultipart *multipart;
-	CamelMimePart *part, *version_part, *encrypted_part;
-	CamelContentType *mime_type;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlf_filter;
-	CamelStream *stream;
-	GByteArray *content;
-	gchar *ciphertext;
-	
-	g_return_if_fail (*mime_part != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));
-	g_return_if_fail (recipients != NULL);
-	
-	part = *mime_part;
-	
-	/* get the contents */
-        content = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), content);
-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,
-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	/* pgp encrypt */
-	ciphertext = openpgp_encrypt (content->data,
-				      content->len,
-				      recipients, FALSE, NULL, ex);
-	g_byte_array_free (content, TRUE);
-	if (camel_exception_is_set (ex))
-		return;
-	
-	/* construct the version part */
-	version_part = camel_mime_part_new ();
-	camel_mime_part_set_encoding (version_part, CAMEL_MIME_PART_ENCODING_7BIT);
-	camel_mime_part_set_content (version_part, "Version: 1", strlen ("Version: 1"),
-				     "application/pgp-encrypted");
-	
-	/* construct the pgp-encrypted mime part */
-	encrypted_part = camel_mime_part_new ();
-	camel_mime_part_set_encoding (encrypted_part, CAMEL_MIME_PART_ENCODING_7BIT);
-	camel_mime_part_set_content (encrypted_part, ciphertext, strlen (ciphertext),
-				     "application/octet-stream");
-	g_free (ciphertext);
-	
-	/* construct the container multipart/signed */
-	multipart = camel_multipart_new ();
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-					  "multipart/encrypted");
-	camel_multipart_set_boundary (multipart, NULL);
-	mime_type = camel_data_wrapper_get_mime_type_field (CAMEL_DATA_WRAPPER (multipart));
-	header_content_type_set_param (mime_type, "protocol", "application/pgp-encrypted");
-	
-	/* add the parts to the multipart */
-	camel_multipart_add_part (multipart, version_part);
-	camel_object_unref (CAMEL_OBJECT (version_part));
-	camel_multipart_add_part (multipart, encrypted_part);
-	camel_object_unref (CAMEL_OBJECT (encrypted_part));
-	
-	/* replace the input part with the output part */
-	camel_object_unref (CAMEL_OBJECT (*mime_part));
-	*mime_part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),
-					 CAMEL_DATA_WRAPPER (multipart));
-	camel_object_unref (CAMEL_OBJECT (multipart));
-}
-
-
-/**
- * pgp_mime_part_decrypt:
- * @mime_part: a multipart/encrypted MIME Part
- * @ex: exception
- *
- * Returns the decrypted MIME Part on success or NULL on fail.
- **/
-CamelMimePart *
-pgp_mime_part_decrypt (CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *multipart;
-	CamelMimePart *encrypted_part, *part;
-	CamelContentType *mime_type;
-	CamelStream *stream;
-	GByteArray *content;
-	gchar *cleartext;
-	int clearlen;
-	
-	g_return_val_if_fail (mime_part != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);
-	
-	/* make sure the mime part is a multipart/encrypted */
-	if (!mail_crypto_is_rfc2015_encrypted (mime_part))
-		return NULL;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	/* get the encrypted part (second part) */
-	encrypted_part = camel_multipart_get_part (multipart, 1 /* second part starting at 0 */);
-	mime_type = camel_mime_part_get_content_type (encrypted_part);
-	if (!header_content_type_is (mime_type, "application", "octet-stream"))
-		return NULL;
-	
-	/* get the ciphertext */
-	content = g_byte_array_new ();
-	stream = camel_stream_mem_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), content);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (encrypted_part), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	/* get the cleartext */
-	cleartext = openpgp_decrypt (content->data, content->len, &clearlen, ex);
-	g_byte_array_free (content, TRUE);
-	if (camel_exception_is_set (ex))
-		return NULL;
-	
-	/* create a stream based on the returned cleartext */
-	stream = camel_stream_mem_new_with_buffer (cleartext, clearlen);
-	g_free (cleartext);
-	
-	/* construct the new decrypted mime part from the stream */
-	part = camel_mime_part_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (part), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	return part;
-}
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
deleted file mode 100644
index 8a5c328c9c..0000000000
--- a/mail/mail-crypto.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_CRYPTO_H
-#define MAIL_CRYPTO_H
-
-#include <gnome.h>
-#include <camel/camel.h>
-#include "openpgp-utils.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-gboolean mail_crypto_is_rfc2015_signed (CamelMimePart *part);
-
-gboolean mail_crypto_is_rfc2015_encrypted (CamelMimePart *part);
-
-void pgp_mime_part_sign (CamelMimePart **mime_part,
-			 const gchar *userid,
-			 PgpHashType hash,
-			 CamelException *ex);
-
-PgpValidity *pgp_mime_part_verify (CamelMimePart *mime_part,
-				   CamelException *ex);
-
-void pgp_mime_part_encrypt (CamelMimePart **mime_part,
-			    const GPtrArray *recipients,
-			    CamelException *ex);
-
-CamelMimePart *pgp_mime_part_decrypt (CamelMimePart *mime_part,
-				      CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_CRYPTO_H */
diff --git a/mail/mail-display.c b/mail/mail-display.c
deleted file mode 100644
index 9f599bc797..0000000000
--- a/mail/mail-display.c
+++ /dev/null
@@ -1,1044 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * mail-display.c: Mail display widget
- *
- * Author:
- *   Miguel de Icaza
- *   Bertrand Guiheneuf (bg@aful.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <gnome.h>
-#include "e-util/e-html-utils.h"
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "mail-display.h"
-#include "mail-config.h"
-#include "mail.h"
-#include "art/empty.xpm"
-
-#include "mail-ops.h"
-#include "mail-mt.h"
-
-#include <bonobo.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-
-#include <bonobo/bonobo-ui-toolbar-icon.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gtkhtml/gtkhtml-embedded.h>
-#include <gtkhtml/htmlengine.h>	/* XXX */
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-static GtkObjectClass *mail_display_parent_class;
-
-struct _PixbufLoader {
-	MailDisplay *md;
-	CamelDataWrapper *wrapper; /* The data */
-	CamelStream *mstream;
-	GdkPixbufLoader *loader; 
-	GtkHTMLEmbedded *eb;
-	char *type; /* Type of data, in case the conversion fails */
-	char *cid; /* Strdupped on creation, but not freed until 
-		      the hashtable is destroyed */
-	GtkWidget *pixmap;
-	guint32 destroy_id;
-};
-
-/*----------------------------------------------------------------------*
- *                        Callbacks
- *----------------------------------------------------------------------*/
-
-static void
-write_data_written(CamelMimePart *part, char *name, int done, void *data)
-{
-	int *ret = data;
-
-	/* should we popup a dialogue to say its done too? */
-	*ret = done;
-}
-
-static gboolean
-write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
-{
-	int fd;
-	int ret = FALSE;
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), FALSE);
-	
-	fd = open (name, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	if (fd == -1 && errno == EEXIST && !unique) {
-		GtkWidget *dlg;
-		GtkWidget *text;
-
-		dlg = gnome_dialog_new (_("Overwrite file?"),
-					GNOME_STOCK_BUTTON_YES, 
-					GNOME_STOCK_BUTTON_NO,
-					NULL);
-		text = gtk_label_new (_("A file by that name already exists.\nOverwrite it?"));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), text, TRUE, TRUE, 4);
-		gtk_window_set_policy(GTK_WINDOW(dlg), FALSE, TRUE, FALSE);
-		gtk_widget_show (text);
-
-		if (gnome_dialog_run_and_close (GNOME_DIALOG (dlg)) != 0)
-			return FALSE;
-	}
-	if (fd != -1)
-		close(fd);
-
-	/* should this have progress of what its doing? */
-	mail_msg_wait(mail_save_part(part, name, write_data_written, &ret));
-
-	return ret;
-}
-
-static char *
-make_safe_filename (const char *prefix, CamelMimePart *part)
-{
-	const char *name = NULL;
-	char *safe, *p;
-
-	name = camel_mime_part_get_filename (part);
-	if (!name) {
-		/* This is a filename. Translators take note. */
-		name = _("attachment");
-	}
-
-	p = strrchr (name, '/');
-	if (p)
-		safe = g_strdup_printf ("%s%s", prefix, p);
-	else
-		safe = g_strdup_printf ("%s/%s", prefix, name);
-	
-	p = strrchr (safe, '/') + 1;
-	if (p)
-		e_filename_make_safe (p);
-	
-	return safe;
-}
-
-static void
-save_data_cb (GtkWidget *widget, gpointer user_data)
-{
-	GtkFileSelection *file_select = (GtkFileSelection *)
-		gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
-
-	/* uh, this doesn't really feel right, but i dont know what to do better */
-	gtk_widget_hide (GTK_WIDGET (file_select));
-	write_data_to_file (user_data,
-			    gtk_file_selection_get_filename (file_select),
-			    FALSE);
-	gtk_widget_destroy (GTK_WIDGET (file_select));
-}
-
-static gboolean
-idle_redisplay (gpointer data)
-{
-	MailDisplay *md = data;
-
-	md->idle_id = 0;
-	mail_display_redisplay (md, FALSE);
-	return FALSE;
-}
-
-void
-mail_display_queue_redisplay (MailDisplay *md)
-{
-	if (!md->idle_id) {
-		md->idle_id = g_idle_add_full (G_PRIORITY_LOW, idle_redisplay,
-					       md, NULL);
-	}
-}
-
-static void
-on_link_clicked (GtkHTML *html, const char *url, gpointer user_data)
-{
-	MailDisplay *md = user_data;
-
-	if (!g_strncasecmp (url, "news:", 5) ||
-	    !g_strncasecmp (url, "nntp:", 5))
-		g_warning ("Can't handle news URLs yet.");
-	else if (!g_strncasecmp (url, "mailto:", 7))
-		send_to_url (url);
-	else if (!strcmp (url, "x-evolution-decode-pgp:")) {
-		g_datalist_set_data (md->data, "show_pgp",
-				     GINT_TO_POINTER (1));
-		mail_display_queue_redisplay (md);
-	} else
-		gnome_url_show (url);
-}
-
-static void
-save_cb (GtkWidget *widget, gpointer user_data)
-{
-	CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart");
-	GtkFileSelection *file_select;
-	char *filename;
-
-	filename = make_safe_filename (g_get_home_dir (), part);
-	file_select = GTK_FILE_SELECTION (
-		gtk_file_selection_new (_("Save Attachment")));
-	gtk_file_selection_set_filename (file_select, filename);
-	g_free (filename);
-
-	gtk_signal_connect (GTK_OBJECT (file_select->ok_button), "clicked", 
-			    GTK_SIGNAL_FUNC (save_data_cb), part);
-	gtk_signal_connect_object (GTK_OBJECT (file_select->cancel_button),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (gtk_widget_destroy),
-				   GTK_OBJECT (file_select));
-
-	gtk_widget_show (GTK_WIDGET (file_select));
-}
-
-static void
-launch_cb (GtkWidget *widget, gpointer user_data)
-{
-	CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart");
-	GnomeVFSMimeApplication *app;
-	CamelContentType *content_type;
-	char *mime_type, *tmpl, *tmpdir, *filename, *argv[2];
-
-	content_type = camel_mime_part_get_content_type (part);
-	mime_type = header_content_type_simple (content_type);
-	app = gnome_vfs_mime_get_default_application (mime_type);
-	g_free (mime_type);
-
-	g_return_if_fail (app != NULL);
-
-	tmpl = g_strdup ("/tmp/evolution.XXXXXX");
-#ifdef HAVE_MKDTEMP
-	tmpdir = mkdtemp (tmpl);
-#else
-	tmpdir = mktemp (tmpl);
-	if (tmpdir) {
-		if (mkdir (tmpdir, S_IRWXU) == -1)
-			tmpdir = NULL;
-	}
-#endif
-	if (!tmpdir) {
-		char *msg = g_strdup_printf (_("Could not create temporary "
-					       "directory: %s"),
-					     g_strerror (errno));
-		gnome_error_dialog (msg);
-		g_free (msg);
-		return;
-	}
-
-	filename = make_safe_filename (tmpdir, part);
-
-	if (!write_data_to_file (part, filename, TRUE)) {
-		g_free (tmpl);
-		g_free (filename);
-		return;
-	}
-
-	argv[0] = app->command;
-	argv[1] = filename;
-
-	gnome_execute_async (tmpdir, 2, argv);
-	g_free (tmpdir);
-	g_free (filename);
-}
-
-static void
-inline_cb (GtkWidget *widget, gpointer user_data)
-{
-	MailDisplay *md = gtk_object_get_data (user_data, "MailDisplay");
-	CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart");
-
-	if (mail_part_is_inline (part))
-		camel_mime_part_set_disposition (part, "attachment");
-	else
-		camel_mime_part_set_disposition (part, "inline");
-
-	mail_display_queue_redisplay (md);
-}
-
-static void
-button_press (GtkWidget *widget, CamelMimePart *part)
-{
-	MailDisplay *md;
-
-	md = gtk_object_get_data (GTK_OBJECT (widget), "MailDisplay");
-	if (md == NULL) {
-		g_warning ("No MailDisplay on button!");
-		return;
-	}
-
-	if (mail_part_is_inline (part))
-		camel_mime_part_set_disposition (part, "attachment");
-	else
-		camel_mime_part_set_disposition (part, "inline");
-
-	mail_display_queue_redisplay (md);
-}
-
-static gboolean
-pixmap_press (GtkWidget *widget, GdkEventButton *event, EScrollFrame *user_data)
-{
-	EPopupMenu menu[] = {
-		{ N_("Save to Disk..."), NULL,
-		  GTK_SIGNAL_FUNC (save_cb), NULL, 0 },
-		{ N_("Open in %s..."), NULL,
-		  GTK_SIGNAL_FUNC (launch_cb), NULL, 1 },
-		{ N_("View Inline"), NULL,
-		  GTK_SIGNAL_FUNC (inline_cb), NULL, 2 },
-		{ NULL, NULL, NULL, 0 }
-	};
-	CamelMimePart *part;
-	MailMimeHandler *handler;
-	int mask = 0;
-
-#ifdef USE_OLD_DISPLAY_STYLE
-	if (event->button != 3) {
-		gtk_propagate_event (GTK_WIDGET (user_data),
-				     (GdkEvent *)event);
-		return TRUE;
-	}
-#endif
-
-	part = gtk_object_get_data (GTK_OBJECT (widget), "CamelMimePart");
-	handler = mail_lookup_handler (gtk_object_get_data (GTK_OBJECT (widget),
-							    "mime_type"));
-
-	/* Save item */
-	menu[0].name = _(menu[0].name);
-
-	/* External view item */
-	if (handler && handler->application) {
-		menu[1].name = g_strdup_printf (_(menu[1].name),
-						handler->application->name);
-	} else {
-		menu[1].name = g_strdup_printf (_(menu[1].name),
-						_("External Viewer"));
-		mask |= 1;
-	}
-
-	/* Inline view item */
-	if (handler && handler->builtin) {
-		if (!mail_part_is_inline (part)) {
-			if (handler->component) {
-				OAF_Property *prop;
-				char *name;
-
-				prop = oaf_server_info_prop_find (
-					handler->component, "name");
-				if (!prop) {
-					prop = oaf_server_info_prop_find (
-						handler->component,
-						"description");
-				}
-				if (prop && prop->v._d == OAF_P_STRING)
-					name = prop->v._u.value_string;
-				else
-					name = "bonobo";
-				menu[2].name = g_strdup_printf (
-					_("View Inline (via %s)"), name);
-			} else
-				menu[2].name = g_strdup (_(menu[2].name));
-		} else
-			menu[2].name = g_strdup (_("Hide"));
-	} else {
-		menu[2].name = g_strdup (_(menu[2].name));
-		mask |= 2;
-	}
-
-	e_popup_menu_run (menu, (GdkEvent *)event, mask, 0, widget);
-	g_free (menu[1].name);
-	g_free (menu[2].name);
-	return TRUE;
-}	
-
-static GdkPixbuf *
-pixbuf_for_mime_type (const char *mime_type)
-{
-	const char *icon_name;
-	char *filename = NULL;
-	GdkPixbuf *pixbuf = NULL;
-
-	icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
-	if (icon_name) {
-		if (*icon_name == '/') {
-			pixbuf = gdk_pixbuf_new_from_file (icon_name);
-			if (pixbuf)
-				return pixbuf;
-		}
-
-		filename = gnome_pixmap_file (icon_name);
-		if (!filename) {
-			char *fm_icon;
-
-			fm_icon = g_strdup_printf ("nautilus/%s", icon_name);
-			filename = gnome_pixmap_file (fm_icon);
-			if (!filename) {
-				fm_icon = g_strdup_printf ("mc/%s", icon_name);
-				filename = gnome_pixmap_file (fm_icon);
-			}
-			g_free (fm_icon);
-		}
-	}
-	
-	if (filename) {
-		pixbuf = gdk_pixbuf_new_from_file (filename);
-		g_free (filename);
-	}
-
-	if (!pixbuf) {
-		filename = gnome_pixmap_file ("gnome-unknown.png");
-		if (filename) {
-			pixbuf = gdk_pixbuf_new_from_file (filename);
-			g_free (filename);
-		} else {
-			g_warning ("Could not get any icon for %s!",mime_type);
-			pixbuf = gdk_pixbuf_new_from_xpm_data (
-				(const char **)empty_xpm);
-		}
-	}
-
-	return pixbuf;
-}
-
-static gint
-pixbuf_gen_idle (struct _PixbufLoader *pbl)
-{
-	GdkPixbuf *pixbuf, *mini;
-	gboolean error = FALSE;
-	char tmp[4096];
-	int len, width, height, ratio;
-
-	/* Get the pixbuf from the cache */
-	mini = g_hash_table_lookup (pbl->md->thumbnail_cache, pbl->cid);
-	if (mini) {
-		width = gdk_pixbuf_get_width (mini);
-		height = gdk_pixbuf_get_height (mini);
-
-		bonobo_ui_toolbar_icon_set_pixbuf (
-		        BONOBO_UI_TOOLBAR_ICON (pbl->pixmap), mini);
-		gtk_widget_set_usize (pbl->pixmap, width, height);
-		
-		if (pbl->loader) {
-			gdk_pixbuf_loader_close (pbl->loader);
-			gtk_object_destroy (GTK_OBJECT (pbl->loader));
-			camel_object_unref (CAMEL_OBJECT (pbl->mstream));
-		}
-		gtk_signal_disconnect (GTK_OBJECT (pbl->eb), pbl->destroy_id);
-		g_free (pbl->type);
-		g_free (pbl);
-
-		return FALSE;
-	}
-
-	/* Not in cache, so get a pixbuf from the wrapper */
-	if (!GTK_IS_WIDGET (pbl->pixmap)) {
-		/* Widget has died */
-		if (pbl->mstream)
-			camel_object_unref (CAMEL_OBJECT (pbl->mstream));
-
-		if (pbl->loader) {
-			gdk_pixbuf_loader_close (pbl->loader);
-			gtk_object_destroy (GTK_OBJECT (pbl->loader));
-		}
-	
-		g_free (pbl->type);
-		g_free (pbl);
-		return FALSE;
-	}
-
-	if (pbl->mstream) {
-		if (pbl->loader == NULL)
-			pbl->loader = gdk_pixbuf_loader_new ();
-
-		len = camel_stream_read (pbl->mstream, tmp, 4096);
-		if (len > 0) {
-			error = !gdk_pixbuf_loader_write (pbl->loader, tmp, len);
-			if (!error)
-				return TRUE;
-		} else if (!camel_stream_eos (pbl->mstream))
-			error = TRUE;
-	}
-
-	if (error || !pbl->mstream)
-		pixbuf = pixbuf_for_mime_type (pbl->type);
-	else
-		pixbuf = gdk_pixbuf_loader_get_pixbuf (pbl->loader);
-
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	
-	if (width >= height) {
-		if (width > 24) {
-			ratio = width / 24;
-			width = 24;
-			height /= ratio;
-		}
-	} else {
-		if (height > 24) {
-			ratio = height / 24;
-			height = 24;
-			width /= ratio;
-		}
-	}
-
-	mini = gdk_pixbuf_scale_simple (pixbuf, width, height,
-					GDK_INTERP_BILINEAR);
-	if (error || !pbl->mstream)
-		gdk_pixbuf_unref (pixbuf);
-	bonobo_ui_toolbar_icon_set_pixbuf (
-		BONOBO_UI_TOOLBAR_ICON (pbl->pixmap), mini);
-
-	/* Add the pixbuf to the cache */
-
-	g_hash_table_insert (pbl->md->thumbnail_cache, pbl->cid, mini);
-  	gtk_widget_set_usize (pbl->pixmap, 24, 24);
-
-	gtk_signal_disconnect (GTK_OBJECT (pbl->eb), pbl->destroy_id);
-	if (pbl->loader) {
-		gdk_pixbuf_loader_close (pbl->loader);
-		gtk_object_destroy (GTK_OBJECT (pbl->loader));
-		camel_object_unref (CAMEL_OBJECT (pbl->mstream));
-	}
-	g_free (pbl->type);
-	g_free (pbl);
-	return FALSE;
-}
-
-/* Stop the idle function and free the pbl structure
-   as the widget that the pixbuf was to be rendered to
-   has died on us. */
-static void
-embeddable_destroy_cb (GtkObject *embeddable,
-		       struct _PixbufLoader *pbl)
-{
-	g_idle_remove_by_data (pbl);
-	if (pbl->mstream)
-		camel_object_unref (CAMEL_OBJECT (pbl->mstream));
-	
-	if (pbl->loader) {
-		gdk_pixbuf_loader_close (pbl->loader);
-		gtk_object_destroy (GTK_OBJECT (pbl->loader));
-	}
-	
-	g_free (pbl->type);
-	g_free (pbl);
-};
-
-static GtkWidget *
-get_embedded_for_component (const char *iid, MailDisplay *md)
-{
-	GtkWidget *embedded;
-	BonoboControlFrame *control_frame;
-	Bonobo_PropertyBag prop_bag;
-	
-	/*
-	 * First try a control.
-	 */
-	embedded = bonobo_widget_new_control (iid, NULL);
-	if (embedded == NULL) {
-		/*
-		 * No control, try an embeddable instead.
-		 */
-		embedded = bonobo_widget_new_subdoc (iid, NULL);
-		if (embedded != NULL) {
-			/* FIXME: as of bonobo 0.18, there's an extra
-			 * client_site dereference in the BonoboWidget
-			 * destruction path that we have to balance out to
-			 * prevent problems.
-			 */
-			bonobo_object_ref (BONOBO_OBJECT(bonobo_widget_get_client_site (
-				BONOBO_WIDGET (embedded))));
-
-			return embedded;
-		}
-	}
-
-	if (embedded == NULL)
-		return NULL;
-
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (embedded));
-		
-	prop_bag = bonobo_control_frame_get_control_property_bag ( control_frame, NULL );
-		
-	if (prop_bag != CORBA_OBJECT_NIL){
-		CORBA_Environment ev;
-		/*
-		 * Now we can take care of business. Currently, the only control
-		 * that needs something passed to it through a property bag is
-		 * the iTip control, and it needs only the From email address,
-		 * but perhaps in the future we can generalize this section of code
-		 * to pass a bunch of useful things to all embedded controls.
-		 */
-		const CamelInternetAddress *from;
-		const MailConfigIdentity *id;
-		
-		id = mail_config_get_default_identity ();
-		CORBA_exception_init (&ev);
-		if (id){
-			char *from_address;
-			
-			
-			from = camel_mime_message_get_from (md->current_message);
-			from_address = camel_address_encode((CamelAddress *)from);
-			bonobo_property_bag_client_set_value_string (
-				prop_bag, "from_address", 
-				from_address, &ev);
-			bonobo_property_bag_client_set_value_string (
-				prop_bag, "my_address", 
-				id ? id->address : "", &ev);
-			g_free(from_address);
-		} 
-		Bonobo_Unknown_unref (prop_bag, &ev);
-		CORBA_exception_free (&ev);
-	}
-
-	return embedded;
-}
-
-static gboolean
-on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
-{
-	MailDisplay *md = data;
-	GHashTable *urls;
-	CamelMedium *medium;
-	CamelDataWrapper *wrapper;
-	OAF_ServerInfo *component;
-	GtkWidget *embedded;
-	BonoboObjectClient *server;
-	Bonobo_PersistStream persist;	
-	CORBA_Environment ev;
-	GByteArray *ba;
-	CamelStream *cstream;
-	BonoboStream *bstream;
-	char *cid;
-
-	cid = eb->classid;
-	if (!strncmp (cid, "popup:", 6))
-		cid += 6;
-	if (strncmp (cid, "cid:", 4) != 0)
-		return FALSE;
-
-	urls = g_datalist_get_data (md->data, "urls");
-	g_return_val_if_fail (urls != NULL, FALSE);
-
-	medium = g_hash_table_lookup (urls, cid);
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), FALSE);
-
-	if (cid != eb->classid) {
-		/* This is a part wrapper */
-#ifdef USE_OLD_DISPLAY_STYLE
-		GtkWidget *ebox;
-#else
-		GtkWidget *button, *mainbox, *hbox, *arrow, *popup;
-		MailMimeHandler *handler;
-#endif
-		struct _PixbufLoader *pbl;
-
-		pbl = g_new0 (struct _PixbufLoader, 1);
-		if (g_strncasecmp (eb->type, "image/", 6) == 0) {
-			CamelDataWrapper *content;
-
-			content = camel_medium_get_content_object (medium);
-			if (!camel_data_wrapper_is_offline (content)) {
-				pbl->mstream = camel_stream_mem_new ();
-				camel_data_wrapper_write_to_stream (content, pbl->mstream);
-				camel_stream_reset (pbl->mstream);
-			}
-		}
-		pbl->type = g_strdup (eb->type);
-		pbl->cid = g_strdup (cid);
-		pbl->pixmap = bonobo_ui_toolbar_icon_new ();
-		pbl->eb = eb;
-		pbl->md = md;
-		pbl->destroy_id = gtk_signal_connect (GTK_OBJECT (eb),
-						      "destroy",
-						      embeddable_destroy_cb,
-						      pbl);
-
-		g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc)pixbuf_gen_idle, 
-				 pbl, NULL);
-
-#ifdef USE_OLD_DISPLAY_STYLE
-		ebox = gtk_event_box_new ();
-		gtk_widget_set_sensitive (GTK_WIDGET (ebox), TRUE);
-		gtk_widget_add_events (GTK_WIDGET (ebox),
-				       GDK_BUTTON_PRESS_MASK);
-		gtk_object_set_data (GTK_OBJECT (ebox), "MailDisplay", md);
-		gtk_object_set_data (GTK_OBJECT (ebox), "CamelMimePart",
-				     medium);
-		gtk_object_set_data_full (GTK_OBJECT (ebox), "mime_type",
-					  g_strdup (eb->type),
-					  (GDestroyNotify)g_free);
-
-		gtk_signal_connect (GTK_OBJECT (ebox), "button_press_event",
-				    GTK_SIGNAL_FUNC (pixmap_press), md->scroll);
-
-		gtk_container_add (GTK_CONTAINER (ebox), pbl->pixmap);
-		gtk_widget_show_all (ebox);
-		gtk_container_add (GTK_CONTAINER (eb), ebox);
-#else
-		mainbox = gtk_hbox_new (FALSE, 0);
-
-		button = gtk_button_new ();
-		gtk_object_set_data (GTK_OBJECT (button), "MailDisplay", md);
-
-		gtk_signal_connect (GTK_OBJECT (button), "clicked",
-				    GTK_SIGNAL_FUNC (button_press), medium);
-
-		hbox = gtk_hbox_new (FALSE, 2);
-		gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
-
-		if (mail_part_is_inline (CAMEL_MIME_PART (medium))) {
-			arrow = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_DOWN);
-		} else {
-			arrow = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_FORWARD);
-		}
-		gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
-		gtk_box_pack_start (GTK_BOX (hbox), pbl->pixmap, TRUE, TRUE, 0);
-		gtk_container_add (GTK_CONTAINER (button), hbox);
-
-		popup = gtk_button_new ();
-		gtk_container_add (GTK_CONTAINER (popup),
-				   gtk_arrow_new (GTK_ARROW_DOWN,
-						  GTK_SHADOW_ETCHED_IN));
-
-		gtk_object_set_data (GTK_OBJECT (popup), "MailDisplay", md);
-		gtk_object_set_data (GTK_OBJECT (popup), "CamelMimePart",
-				     medium);
-		gtk_object_set_data_full (GTK_OBJECT (popup), "mime_type",
-					  g_strdup (eb->type),
-					  (GDestroyNotify)g_free);
-
-		gtk_signal_connect (GTK_OBJECT (popup), "button_press_event",
-				    GTK_SIGNAL_FUNC (pixmap_press), md->scroll);
-
-		gtk_box_pack_start (GTK_BOX (mainbox), button, TRUE, TRUE, 0);
-		gtk_box_pack_start (GTK_BOX (mainbox), popup, TRUE, TRUE, 0);
-		gtk_widget_show_all (mainbox);
-
-		handler = mail_lookup_handler (eb->type);
-		if (handler && handler->builtin) {
-			gtk_widget_set_sensitive (button, TRUE);
-		} else {
-			gtk_widget_set_sensitive (button, FALSE);
-		}
-
-		gtk_container_add (GTK_CONTAINER (eb), mainbox);
-#endif
-
-		return TRUE;
-	}
-
-	component = gnome_vfs_mime_get_default_component (eb->type);
-	if (!component)
-		return FALSE;
-
-	embedded = get_embedded_for_component (component->iid, md);
-	CORBA_free (component);
-	if (!embedded)
-		return FALSE;
-
-	server = bonobo_widget_get_server (BONOBO_WIDGET (embedded));
-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
-		server, "IDL:Bonobo/PersistStream:1.0", NULL);
-	if (persist == CORBA_OBJECT_NIL) {
-		gtk_object_sink (GTK_OBJECT (embedded));
-		return FALSE;
-	}
-
-	/* 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 (medium);
- 	camel_data_wrapper_write_to_stream (wrapper, cstream);
-
-	/* ...convert the CamelStreamMem to a BonoboStreamMem... */
-	bstream = bonobo_stream_mem_create (ba->data, ba->len, TRUE, FALSE);
-	camel_object_unref (CAMEL_OBJECT (cstream));
-
-	/* ...and hydrate the PersistStream from the BonoboStream. */
-	CORBA_exception_init (&ev);
-	Bonobo_PersistStream_load (persist,
-				   bonobo_object_corba_objref (
-					   BONOBO_OBJECT (bstream)),
-				   eb->type, &ev);
-	bonobo_object_unref (BONOBO_OBJECT (bstream));
-	Bonobo_Unknown_unref (persist, &ev);
-	CORBA_Object_release (persist, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		gtk_object_sink (GTK_OBJECT (embedded));
-		CORBA_exception_free (&ev);				
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	gtk_widget_show (embedded);
-	gtk_container_add (GTK_CONTAINER (eb), embedded);
-
-	return TRUE;
-}
-
-static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  gpointer user_data)
-{
-	MailDisplay *md = user_data;
-	GHashTable *urls;
-
-	urls = g_datalist_get_data (md->data, "urls");
-	g_return_if_fail (urls != NULL);
-
-	user_data = g_hash_table_lookup (urls, url);
-	if (user_data == NULL)
-		return;
-
-	if (strncmp (url, "cid:", 4) == 0) {
-		CamelMedium *medium = user_data;
-		CamelDataWrapper *data;
-		CamelStream *stream_mem;
-		GByteArray *ba;
-
-		g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-		data = camel_medium_get_content_object (medium);
-		if (!mail_content_loaded (data, md))
-			return;
-
-		ba = g_byte_array_new ();
-		stream_mem = camel_stream_mem_new_with_byte_array (ba);
-		camel_data_wrapper_write_to_stream (data, stream_mem);
-		gtk_html_write (html, handle, ba->data, ba->len);
-		camel_object_unref (CAMEL_OBJECT (stream_mem));
-	} else if (strncmp (url, "x-evolution-data:", 17) == 0) {
-		GByteArray *ba = user_data;
-
-		g_return_if_fail (ba != NULL);
-		gtk_html_write (html, handle, ba->data, ba->len);
-	}
-}
-
-void
-mail_html_write (GtkHTML *html, GtkHTMLStream *stream,
-		 const char *format, ...)
-{
-	char *buf;
-	va_list ap;
-
-	va_start (ap, format);
-	buf = g_strdup_vprintf (format, ap);
-	va_end (ap);
-	gtk_html_write (html, stream, buf, strlen (buf));
-	g_free (buf);
-}
-
-void
-mail_text_write (GtkHTML *html, GtkHTMLStream *stream,
-		 const char *format, ...)
-{
-	char *buf, *htmltext;
-	va_list ap;
-
-	va_start (ap, format);
-	buf = g_strdup_vprintf (format, ap);
-	va_end (ap);
-
-	htmltext = e_text_to_html (buf,
-				   E_TEXT_TO_HTML_CONVERT_URLS |
-				   E_TEXT_TO_HTML_CONVERT_NL |
-				   E_TEXT_TO_HTML_CONVERT_SPACES);
-	gtk_html_write (html, stream, "<tt>", 4);
-	gtk_html_write (html, stream, htmltext, strlen (htmltext));
-	gtk_html_write (html, stream, "</tt>", 5);
-	g_free (htmltext);
-	g_free (buf);
-}
-
-void
-mail_error_write (GtkHTML *html, GtkHTMLStream *stream,
-		  const char *format, ...)
-{
-	char *buf, *htmltext;
-	va_list ap;
-
-	va_start (ap, format);
-	buf = g_strdup_vprintf (format, ap);
-	va_end (ap);
-
-	htmltext = e_text_to_html (buf, E_TEXT_TO_HTML_CONVERT_NL);
-	gtk_html_write (html, stream, "<em><font color=red>", 20);
-	gtk_html_write (html, stream, htmltext, strlen (htmltext));
-	gtk_html_write (html, stream, "</font></em><br>", 16);
-	g_free (htmltext);
-	g_free (buf);
-}
-
-static void
-clear_data (CamelObject *object, gpointer event_data, gpointer user_data)
-{
-	GData *data = user_data;
-
-	g_datalist_clear (&data);
-}
-
-/**
- * mail_display_redisplay:
- * @mail_display: the mail display object
- * @unscroll: specifies whether or not to lose current scroll
- *
- * Force a redraw of the message display.
- **/
-void
-mail_display_redisplay (MailDisplay *md, gboolean unscroll)
-{
-	printf("redisplaying\n");
-
-	md->stream = gtk_html_begin (GTK_HTML (md->html));
-	if (!unscroll) {
-		/* This is a hack until there's a clean way to do this. */
-		GTK_HTML (md->html)->engine->newPage = FALSE;
-	}
-
-	mail_html_write (md->html, md->stream, "%s%s", HTML_HEADER, "<BODY>\n");
-
-	if (md->current_message) {
-		camel_object_ref (CAMEL_OBJECT (md->current_message));
-		if (mail_config_get_view_source ())
-			mail_format_raw_message (md->current_message, md);
-		else
-			mail_format_mime_message (md->current_message, md);
-	}
-
-	mail_html_write (md->html, md->stream, "</BODY></HTML>\n");
-	gtk_html_end (md->html, md->stream, GTK_HTML_STREAM_OK);
-	md->stream = NULL;
-}
-
-
-/**
- * mail_display_set_message:
- * @mail_display: the mail display object
- * @medium: the input camel medium, or %NULL
- *
- * Makes the mail_display object show the contents of the medium
- * param.
- **/
-void 
-mail_display_set_message (MailDisplay *md, CamelMedium *medium)
-{
-	/* For the moment, we deal only with CamelMimeMessage, but in
-	 * the future, we should be able to deal with any medium.
-	 */
-	if (medium && !CAMEL_IS_MIME_MESSAGE (medium))
-		return;
-
-	/* Clean up from previous message. */
-	if (md->current_message)
-		camel_object_unref (CAMEL_OBJECT (md->current_message));
-
-	md->current_message = (CamelMimeMessage*)medium;
-
-	g_datalist_init (md->data);
-	mail_display_redisplay (md, TRUE);
-	if (medium) {
-		camel_object_hook_event (CAMEL_OBJECT (medium), "finalize",
-					 clear_data, *(md->data));
-	}
-}
-
-
-/*----------------------------------------------------------------------*
- *                     Standard Gtk+ Class functions
- *----------------------------------------------------------------------*/
-
-static void
-mail_display_init (GtkObject *object)
-{
-	MailDisplay *mail_display = MAIL_DISPLAY (object);
-
-	/* various other initializations */
-	mail_display->current_message = NULL;
-	mail_display->thumbnail_cache = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void
-thumbnail_cache_free (gpointer key,
-		      gpointer value,
-		      gpointer user_data)
-{
-	g_free (key);
-	gdk_pixbuf_unref (value);
-}
-
-static void
-mail_display_destroy (GtkObject *object)
-{
-	MailDisplay *mail_display = MAIL_DISPLAY (object);
-
-	g_hash_table_foreach (mail_display->thumbnail_cache, 
-			      thumbnail_cache_free, NULL);
-	g_hash_table_destroy (mail_display->thumbnail_cache);
-	g_datalist_clear (mail_display->data);
-	g_free (mail_display->data);
-
-	mail_display_parent_class->destroy (object);
-}
-
-static void
-mail_display_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = mail_display_destroy;
-	mail_display_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-GtkWidget *
-mail_display_new (void)
-{
-	MailDisplay *mail_display = gtk_type_new (mail_display_get_type ());
-	GtkWidget *scroll, *html;
-
-	gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE);
-	gtk_widget_show (GTK_WIDGET (mail_display));
-
-	scroll = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll), GTK_SHADOW_IN);
-	gtk_box_pack_start_defaults (GTK_BOX (mail_display), GTK_WIDGET (scroll));
-	gtk_widget_show (GTK_WIDGET (scroll));
-
-	html = gtk_html_new ();
-	gtk_html_set_default_content_type (GTK_HTML (html),
-					   "text/html; charset=utf-8");
-
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	gtk_signal_connect (GTK_OBJECT (html), "url_requested",
-			    GTK_SIGNAL_FUNC (on_url_requested),
-			    mail_display);
-	gtk_signal_connect (GTK_OBJECT (html), "object_requested",
-			    GTK_SIGNAL_FUNC (on_object_requested),
-			    mail_display);
-	gtk_signal_connect (GTK_OBJECT (html), "link_clicked",
-			    GTK_SIGNAL_FUNC (on_link_clicked),
-			    mail_display);
-
-	gtk_container_add (GTK_CONTAINER (scroll), html);
-	gtk_widget_show (GTK_WIDGET (html));
-
-	mail_display->scroll = E_SCROLL_FRAME (scroll);
-	mail_display->html = GTK_HTML (html);
-	mail_display->stream = NULL;
-	mail_display->data = g_new0 (GData *, 1);
-	g_datalist_init (mail_display->data);
-
-	return GTK_WIDGET (mail_display);
-}
-
-E_MAKE_TYPE (mail_display, "MailDisplay", MailDisplay, mail_display_class_init, mail_display_init, PARENT_TYPE);
diff --git a/mail/mail-display.h b/mail/mail-display.h
deleted file mode 100644
index 4334d7dfad..0000000000
--- a/mail/mail-display.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _MAIL_DISPLAY_H_
-#define _MAIL_DISPLAY_H_
-
-#include <gtk/gtkvbox.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include <gal/widgets/e-scroll-frame.h>
-
-#include <camel/camel-stream.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-medium.h>
-
-#include "mail-types.h"
-
-#define MAIL_DISPLAY_TYPE        (mail_display_get_type ())
-#define MAIL_DISPLAY(o)          (GTK_CHECK_CAST ((o), MAIL_DISPLAY_TYPE, MailDisplay))
-#define MAIL_DISPLAY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_DISPLAY_TYPE, MailDisplayClass))
-#define IS_MAIL_DISPLAY(o)       (GTK_CHECK_TYPE ((o), MAIL_DISPLAY_TYPE))
-#define IS_MAIL_DISPLAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_DISPLAY_TYPE))
-
-struct _MailDisplay {
-	GtkVBox parent;
-
-	EScrollFrame *scroll;
-	GtkHTML *html;
-	GtkHTMLStream *stream;
-	guint idle_id;
-	
-	CamelMimeMessage *current_message;
-	GData **data;
-	GHashTable *thumbnail_cache;
-};
-
-typedef struct {
-	GtkVBoxClass parent_class;
-} MailDisplayClass;
-
-GtkType        mail_display_get_type    (void);
-GtkWidget *    mail_display_new         (void);
-
-void           mail_display_queue_redisplay (MailDisplay *mail_display);
-void           mail_display_redisplay (MailDisplay *mail_display, gboolean unscroll);
-
-void           mail_display_set_message (MailDisplay *mail_display, 
-					 CamelMedium *medium);
-
-void           mail_display_toggle_raw  (MailDisplay *mail_display,
-					 gboolean toggle);
-
-
-#define HTML_HEADER "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<HTML>\n<HEAD>\n<META NAME=\"GENERATOR\" CONTENT=\"Evolution Mail Component\">\n</HEAD>\n"
-
-void           mail_html_write          (GtkHTML *html,
-					 GtkHTMLStream *stream,
-					 const char *format, ...);
-void           mail_text_write          (GtkHTML *html,
-					 GtkHTMLStream *stream,
-					 const char *format, ...);
-void           mail_error_write         (GtkHTML *html,
-					 GtkHTMLStream *stream,
-					 const char *format, ...);
-
-#endif /* _MAIL_DISPLAY_H_ */
diff --git a/mail/mail-format.c b/mail/mail-format.c
deleted file mode 100644
index 27849d54b7..0000000000
--- a/mail/mail-format.c
+++ /dev/null
@@ -1,1787 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *  Matt Loper <matt@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-display.h"
-#include "mail-crypto.h"
-#include "mail-mt.h"
-#include "shell/e-setup.h"
-#include "e-util/e-html-utils.h"
-#include <gal/widgets/e-unicode.h>
-#include <camel/camel-mime-utils.h>
-#include <libgnome/libgnome.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <liboaf/liboaf.h>
-
-#include <ctype.h>    /* for isprint */
-#include <string.h>   /* for strstr  */
-#include <fcntl.h>
-
-static char *get_data_wrapper_text (CamelDataWrapper *data);
-
-static char *try_inline_pgp (char *start, MailDisplay *md);
-static char *try_inline_pgp_sig (char *start, MailDisplay *md);
-static char *try_uudecoding (char *start, MailDisplay *md);
-static char *try_inline_binhex (char *start, MailDisplay *md);
-
-static gboolean handle_text_plain            (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_text_plain_flowed     (char *text,
-					      MailDisplay *md);
-static gboolean handle_text_enriched         (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_text_html             (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_image                 (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_mixed       (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_related     (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_alternative (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_appledouble (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_encrypted   (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_multipart_signed      (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_message_rfc822        (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-static gboolean handle_message_external_body (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-
-static gboolean handle_via_bonobo            (CamelMimePart *part,
-					      const char *mime_type,
-					      MailDisplay *md);
-
-/* writes the header info for a mime message into an html stream */
-static void write_headers (CamelMimeMessage *message, MailDisplay *md);
-
-/* dispatch html printing via mimetype */
-static gboolean call_handler_function (CamelMimePart *part, MailDisplay *md);
-
-static void
-free_url (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-}
-
-static void
-free_urls (gpointer urls)
-{
-	g_hash_table_foreach (urls, free_url, NULL);
-	g_hash_table_destroy (urls);
-}
-
-static char *
-add_url (char *url, gpointer data, MailDisplay *md)
-{
-	GHashTable *urls;
-	gpointer old_key, old_value;
-
-	urls = g_datalist_get_data (md->data, "urls");
-	g_return_val_if_fail (urls != NULL, NULL);
-	
-	if (g_hash_table_lookup_extended (urls, url, &old_key, &old_value)) {
-		g_free (url);
-		url = old_key;
-	}
-	g_hash_table_insert (urls, url, data);
-	return url;
-}
-
-/**
- * mail_format_mime_message: 
- * @mime_message: the input mime message
- * @md: the MailDisplay to render into
- *
- * Writes a CamelMimeMessage out into a MailDisplay
- **/
-void
-mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md)
-{
-	GHashTable *urls;
-
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
-
-	urls = g_datalist_get_data (md->data, "urls");
-	if (!urls) {
-		urls = g_hash_table_new (g_str_hash, g_str_equal);
-		g_datalist_set_data_full (md->data, "urls", urls,
-					  free_urls);
-	}
-	
-	write_headers (mime_message, md);
-	call_handler_function (CAMEL_MIME_PART (mime_message), md);
-}
-
-
-/**
- * mail_format_raw_message: 
- * @mime_message: the input mime message
- * @md: the MailDisplay to render into
- *
- * Writes a CamelMimeMessage source out into a MailDisplay
- **/
-void
-mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md)
-{
-	gchar *text;
-	
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
-	
-	text = get_data_wrapper_text (CAMEL_DATA_WRAPPER (mime_message));
-	mail_text_write (md->html, md->stream, "%s", text ? text : "");
-	g_free (text);
-}
-
-static const char *
-get_cid (CamelMimePart *part, MailDisplay *md)
-{
-	GHashTable *urls;
-	char *cid;
-	gpointer orig_name, value;
-
-	urls = g_datalist_get_data (md->data, "urls");
-
-	/* If we have a real Content-ID, use it. If we don't,
-	 * make a (syntactically invalid) fake one.
-	 */
-	if (camel_mime_part_get_content_id (part)) {
-		cid = g_strdup_printf ("cid:%s",
-				       camel_mime_part_get_content_id (part));
-	} else
-		cid = g_strdup_printf ("cid:@@@%p", part);
-
-	if (g_hash_table_lookup_extended (urls, cid, &orig_name, &value)) {
-		g_free (cid);
-		return orig_name;
-	} else
-		g_hash_table_insert (urls, cid, part);
-
-	return cid;
-}
-
-static const char *
-get_url_for_icon (const char *icon_name, MailDisplay *md)
-{
-	static GHashTable *icons;
-	char *icon_path, buf[1024], *url;
-	GByteArray *ba;
-
-	if (!icons)
-		icons = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (*icon_name == '/')
-		icon_path = g_strdup (icon_name);
-	else {
-		icon_path = gnome_pixmap_file (icon_name);
-		if (!icon_path)
-			return "file:///dev/null";
-	}
-
-	ba = g_hash_table_lookup (icons, icon_path);
-	if (!ba) {
-		int fd, nread;
-
-		fd = open (icon_path, O_RDONLY);
-		if (fd == -1) {
-			g_free (icon_path);
-			return "file:///dev/null";
-		}
-
-		ba = g_byte_array_new ();
-
-		while (1) {
-			nread = read (fd, buf, sizeof (buf));
-			if (nread < 1)
-				break;
-			g_byte_array_append (ba, buf, nread);
-		}
-		close (fd);
-
-		/* FIXME: these aren't freed. */
-		g_hash_table_insert (icons, g_strdup (icon_path), ba);
-	}
-	g_free (icon_path);
-
-	url = g_strdup_printf ("x-evolution-data:%p", ba);
-	return add_url (url, ba, md);
-}
-
-
-static GHashTable *mime_handler_table, *mime_function_table;
-
-static void
-setup_mime_tables (void)
-{
-	mime_handler_table = g_hash_table_new (g_str_hash, g_str_equal);
-	mime_function_table = g_hash_table_new (g_str_hash, g_str_equal);
-
-	g_hash_table_insert (mime_function_table, "text/plain",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "text/richtext",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/enriched",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/html",
-			     handle_text_html);
-
-	g_hash_table_insert (mime_function_table, "image/gif",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/jpeg",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/png",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-png",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/tiff",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-bmp",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/bmp",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-cmu-raster",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-ico",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-anymap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-bitmap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-graymap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-pixmap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-xpixmap",
-			     handle_image);
-
-	g_hash_table_insert (mime_function_table, "message/rfc822",
-			     handle_message_rfc822);
-	g_hash_table_insert (mime_function_table, "message/news",
-			     handle_message_rfc822);
-	g_hash_table_insert (mime_function_table, "message/external-body",
-			     handle_message_external_body);
-
-	g_hash_table_insert (mime_function_table, "multipart/alternative",
-			     handle_multipart_alternative);
-	g_hash_table_insert (mime_function_table, "multipart/related",
-			     handle_multipart_related);
-	g_hash_table_insert (mime_function_table, "multipart/mixed",
-			     handle_multipart_mixed);
-	g_hash_table_insert (mime_function_table, "multipart/appledouble",
-			     handle_multipart_appledouble);
-	g_hash_table_insert (mime_function_table, "multipart/encrypted",
-			     handle_multipart_encrypted);
-	g_hash_table_insert (mime_function_table, "multipart/signed",
-			     handle_multipart_signed);
-
-	/* RFC 2046 says unrecognized text subtypes can be treated
-	 * as text/plain (as long as you recognize the character set),
-	 * and unrecognized multipart subtypes as multipart/mixed.
-	 */
-	g_hash_table_insert (mime_function_table, "text/*",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "multipart/*",
-			     handle_multipart_mixed);
-}
-
-static gboolean
-component_supports (OAF_ServerInfo *component, const char *mime_type)
-{
-	OAF_Property *prop;
-	CORBA_sequence_CORBA_string stringv;
-	int i;
-
-	prop = oaf_server_info_prop_find (component,
-					  "bonobo:supported_mime_types");
-	if (!prop || prop->v._d != OAF_P_STRINGV)
-		return FALSE;
-
-	stringv = prop->v._u.value_stringv;
-	for (i = 0; i < stringv._length; i++) {
-		if (!g_strcasecmp (mime_type, stringv._buffer[i]))
-			return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * mail_lookup_handler:
- * @mime_type: a MIME type
- *
- * Looks up the MIME type in its own tables and GNOME-VFS's and returns
- * a MailMimeHandler structure detailing the component, application,
- * and built-in handlers (if any) for that MIME type. (If the component
- * is non-%NULL, the built-in handler will always be handle_via_bonobo().)
- * The MailMimeHandler's @generic field is set if the match was for the
- * MIME supertype rather than the exact type.
- *
- * Return value: a MailMimeHandler (which should not be freed), or %NULL
- * if no handlers are available.
- **/
-MailMimeHandler *
-mail_lookup_handler (const char *mime_type)
-{
-	MailMimeHandler *handler;
-	char *mime_type_main;
-
-	if (mime_handler_table == NULL)
-		setup_mime_tables ();
-
-	/* See if we've already found it. */
-	handler = g_hash_table_lookup (mime_handler_table, mime_type);
-	if (handler)
-		return handler;
-
-	/* No. Create a new one and look up application and full type
-	 * handler. If we find a builtin, create the handler and
-	 * register it.
-	 */
-	handler = g_new0 (MailMimeHandler, 1);
-	handler->application =
-		gnome_vfs_mime_get_default_application (mime_type);
-	handler->builtin =
-		g_hash_table_lookup (mime_function_table, mime_type);
-
-	if (handler->builtin) {
-		handler->generic = FALSE;
-		goto reg;
-	}
-
-	/* Try for a exact component match. */
-	handler->component = gnome_vfs_mime_get_default_component (mime_type);
-	if (handler->component &&
-	    component_supports (handler->component, mime_type)) {
-		handler->generic = FALSE;
-		handler->builtin = handle_via_bonobo;
-		goto reg;
-	}
-
-	/* Try for a generic builtin match. */
-	mime_type_main = g_strdup_printf ("%.*s/*",
-					  (int)strcspn (mime_type, "/"),
-					  mime_type);
-	handler->builtin = g_hash_table_lookup (mime_function_table,
-						mime_type_main);
-	g_free (mime_type_main);
-
-	if (handler->builtin) {
-		handler->generic = TRUE;
-		if (handler->component) {
-			CORBA_free (handler->component);
-			handler->component = NULL;
-		}
-		goto reg;
-	}
-
-	/* Try for a generic component match. */
-	if (handler->component) {
-		handler->generic = TRUE;
-		handler->builtin = handle_via_bonobo;
-		goto reg;
-	}
-
-	/* If we at least got an application, use that. */
-	if (handler->application) {
-		handler->generic = TRUE;
-		goto reg;
-	}
-
-	/* Nada. */
-	g_free (handler);
-	return NULL;
-
- reg:
-	g_hash_table_insert (mime_handler_table, g_strdup (mime_type),
-			     handler);
-	return handler;
-}
-
-/* An "anonymous" MIME part is one that we shouldn't call attention
- * to the existence of, but simply display.
- */
-static gboolean
-is_anonymous (CamelMimePart *part, const char *mime_type)
-{
-	if (!g_strncasecmp (mime_type, "multipart/", 10) ||
-	    !g_strncasecmp (mime_type, "message/", 8))
-		return TRUE;
-
-	if (!g_strncasecmp (mime_type, "text/", 5) &&
-	    !camel_mime_part_get_filename (part))
-		return TRUE;
-
-	return FALSE;
-}
-
-/**
- * mail_part_is_inline:
- * @part: a CamelMimePart
- *
- * Return value: whether or not the part should/will be displayed inline.
- **/
-gboolean
-mail_part_is_inline (CamelMimePart *part)
-{
-	const char *disposition;
-	CamelContentType *content_type;
-
-	/* If it has an explicit disposition, return that. */
-	disposition = camel_mime_part_get_disposition (part);
-	if (disposition)
-		return g_strcasecmp (disposition, "inline") == 0;
-
-	/* Certain types should default to inline. FIXME: this should
-	 * be customizable.
-	 */
-	content_type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (content_type, "message", "*"))
-		return TRUE;
-
-	/* Otherwise, display it inline if it's "anonymous", and
-	 * as an attachment otherwise.
-	 */
-	return is_anonymous (part, header_content_type_simple (content_type));
-}
-
-static void
-attachment_header (CamelMimePart *part, const char *mime_type,
-		   gboolean is_inline, MailDisplay *md)
-{
-	const char *info;
-	char *htmlinfo;
-
-	/* No header for anonymous inline parts. */
-	if (is_inline && is_anonymous (part, mime_type))
-		return;
-
-	/* Start the table, create the pop-up object. */
-	mail_html_write (md->html, md->stream, "<table><tr><td>"
-			 "<object classid=\"popup:%s\" type=\"%s\">"
-			 "</object></td><td><font size=-1>",
-			 get_cid (part, md), mime_type);
-
-	/* Write the MIME type */
-	info = gnome_vfs_mime_get_value (mime_type, "description");
-	htmlinfo = e_text_to_html (info ? info : mime_type, 0);
-	mail_html_write (md->html, md->stream, _("%s attachment"), htmlinfo);
-	g_free (htmlinfo);
-
-	/* Write the name, if we have it. */
-	info = camel_mime_part_get_filename (part);
-	if (info) {
-		htmlinfo = e_text_to_html (info, 0);
-		mail_html_write (md->html, md->stream, " (%s)", htmlinfo);
-		g_free (htmlinfo);
-	}
-
-	/* Write a description, if we have one. */
-	info = camel_mime_part_get_description (part);
-	if (info) {
-		htmlinfo = e_text_to_html (info, E_TEXT_TO_HTML_CONVERT_URLS);
-		mail_html_write (md->html, md->stream, ", \"%s\"", htmlinfo);
-		g_free (htmlinfo);
-	}
-
-#if 0
-	/* Describe the click action, if any. */
-	if (action) {
-		mail_html_write (md->html, md->stream,
-				 "<br>Click on the icon to %s.", action);
-	}
-#endif
-
-	mail_html_write (md->html, md->stream, "</font></td></tr></table>");
-}
-
-static gboolean
-call_handler_function (CamelMimePart *part, MailDisplay *md)
-{
-	CamelDataWrapper *wrapper;
-	char *mime_type;
-	MailMimeHandler *handler;
-	gboolean output, is_inline;
-
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	mime_type = camel_data_wrapper_get_mime_type (wrapper);
-	g_strdown (mime_type);
-
-	handler = mail_lookup_handler (mime_type);
-	if (!handler) {
-		char *id_type;
-
-		id_type = mail_identify_mime_part (part, md);
-		if (id_type) {
-			g_free (mime_type);
-			mime_type = id_type;
-			handler = mail_lookup_handler (id_type);
-		}
-	}
-
-	is_inline = mail_part_is_inline (part);
-	attachment_header (part, mime_type, is_inline, md);
-	if (handler && handler->builtin && is_inline &&
-	    mail_content_loaded (wrapper, md))
-		output = (*handler->builtin) (part, mime_type, md);
-	else
-		output = TRUE;
-
-	g_free (mime_type);
-	return output;
-}
-
-/* flags for write_field_to_stream */
-enum {
-	WRITE_BOLD=1,
-};
-
-static void
-write_field_to_stream(const char *description, const char *value, int flags, GtkHTML *html, GtkHTMLStream *stream)
-{
-	char *encoded_desc, *encoded_value;
-	int bold = (flags&WRITE_BOLD) == WRITE_BOLD;
-
-	/* The description comes from gettext... */
-	encoded_desc = e_utf8_from_gtk_string (GTK_WIDGET (html), description);
-
-	if (value)
-		encoded_value = e_text_to_html (value, E_TEXT_TO_HTML_CONVERT_NL|E_TEXT_TO_HTML_CONVERT_URLS);
-	else
-		encoded_value = "";
-
-	mail_html_write(html, stream,
-			"<tr valign=top><%s align=right>%s</%s>"
-			"<td>%s</td></tr>", bold ? "th" : "td",
-			encoded_desc, bold ? "th" : "td", encoded_value);
-	g_free (encoded_desc);
-	if (value)
-		g_free(encoded_value);
-}
-
-static void
-write_address(MailDisplay *md, const CamelInternetAddress *addr, const char *name, int flags)
-{
-	char *string;
-
-	if (addr == NULL)
-		return;
-
-	string = camel_address_format((CamelAddress *)addr);
-	if (string && string[0]) {
-		write_field_to_stream(name, string, flags, md->html, md->stream);
-	}
-	g_free(string);
-}
-
-
-static void
-write_headers (CamelMimeMessage *message, MailDisplay *md)
-{
-	mail_html_write (md->html, md->stream,
-			 "<font color=\"#000000\">"
-			 "<table bgcolor=\"#000000\" width=\"100%%\" "
-			 "cellspacing=0 cellpadding=1><tr><td>"
-			 "<table bgcolor=\"#EEEEEE\" width=\"100%%\" cellpadding=0 cellspacing=0>"
-			 "<tr><td><table>\n");
-
-	write_address(md, camel_mime_message_get_from(message),
-		      _("From:"), WRITE_BOLD);
-	write_address(md, camel_mime_message_get_reply_to(message),
-		      _("Reply-To:"), 0);
-	write_address(md, camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_TO),
-		      _("To:"), WRITE_BOLD);
-	write_address(md, camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_CC),
-		      _("Cc:"), WRITE_BOLD);
-
-	write_field_to_stream (_("Subject:"),
-			       camel_mime_message_get_subject (message),
-			       TRUE, md->html, md->stream);
-	
-	mail_html_write (md->html, md->stream,
-			 "</table></td></tr></table></td></tr></table></font>");
-}
-
-struct _load_content_msg {
-	struct _mail_msg msg;
-
-	MailDisplay *display;
-	CamelMimeMessage *message;
-	CamelDataWrapper *wrapper;
-};
-
-static char *
-load_content_desc (struct _mail_msg *mm, int done)
-{
-	return g_strdup (_("Loading message content"));
-}
-
-static void
-load_content_load (struct _mail_msg *mm)
-{
-	struct _load_content_msg *m = (struct _load_content_msg *)mm;
-	CamelStream *memstream;
-
-	memstream = camel_stream_mem_new ();
-	camel_data_wrapper_write_to_stream (m->wrapper, memstream);
-	camel_object_unref (CAMEL_OBJECT (memstream));
-}
-
-static void
-load_content_loaded (struct _mail_msg *mm)
-{
-	struct _load_content_msg *m = (struct _load_content_msg *)mm;
-
-	if (m->display->current_message == m->message)
-		mail_display_queue_redisplay (m->display);
-}
-
-static void
-load_content_free (struct _mail_msg *mm)
-{
-	struct _load_content_msg *m = (struct _load_content_msg *)mm;
-
-	gtk_object_unref (GTK_OBJECT (m->display));
-	camel_object_unref (CAMEL_OBJECT (m->wrapper));
-	camel_object_unref (CAMEL_OBJECT (m->message));
-}
-
-static struct _mail_msg_op load_content_op = {
-	load_content_desc,
-	load_content_load,
-	load_content_loaded,
-	load_content_free,
-};
-
-gboolean
-mail_content_loaded (CamelDataWrapper *wrapper, MailDisplay *md)
-{
-	struct _load_content_msg *m;
-	GHashTable *loading;
-
-	if (!camel_data_wrapper_is_offline (wrapper))
-		return TRUE;
-
-	loading = g_datalist_get_data (md->data, "loading");
-	if (loading) {
-		if (g_hash_table_lookup (loading, wrapper))
-			return FALSE;
-	} else {
-		loading = g_hash_table_new (NULL, NULL);
-		g_datalist_set_data_full (md->data, "loading", loading,
-					  (GDestroyNotify)g_hash_table_destroy);
-	}
-	g_hash_table_insert (loading, wrapper, GINT_TO_POINTER (1));	
-
-	m = mail_msg_new (&load_content_op, NULL, sizeof (*m));
-	m->display = md;
-	gtk_object_ref (GTK_OBJECT (m->display));
-	m->message = md->current_message;
-	camel_object_ref (CAMEL_OBJECT (m->message));
-	m->wrapper = wrapper;
-	camel_object_ref (CAMEL_OBJECT (m->wrapper));
-
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-	return FALSE;
-}
-
-/* Return the contents of a data wrapper, or %NULL if it contains only
- * whitespace.
- */
-static char *
-get_data_wrapper_text (CamelDataWrapper *wrapper)
-{
-	CamelStream *memstream;
-	GByteArray *ba;
-	char *text, *end;
-
-	memstream = camel_stream_mem_new ();
-	ba = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);
-	camel_data_wrapper_write_to_stream (wrapper, memstream);
-	camel_object_unref (CAMEL_OBJECT (memstream));
-
-	for (text = ba->data, end = text + ba->len; text < end; text++) {
-		if (!isspace ((unsigned char)*text))
-			break;
-	}
-
-	if (text >= end) {
-		g_byte_array_free (ba, TRUE);
-		return NULL;
-	}
-
-	g_byte_array_append (ba, "", 1);
-	text = ba->data;
-	g_byte_array_free (ba, FALSE);
-	return text;
-}
-
-/*----------------------------------------------------------------------*
- *                     Mime handling functions
- *----------------------------------------------------------------------*/
-
-struct {
-	char *start;
-	char * (*handler) (char *start, MailDisplay *md);
-} text_specials[] = {
-	{ "-----BEGIN PGP MESSAGE-----\n", try_inline_pgp },
-	{ "-----BEGIN PGP SIGNED MESSAGE-----\n", try_inline_pgp_sig },
-	{ "begin ", try_uudecoding },
-	{ "(This file must be converted with BinHex 4.0)\n", try_inline_binhex }
-};
-#define NSPECIALS (sizeof (text_specials) / sizeof (*text_specials))
-
-static gboolean
-handle_text_plain (CamelMimePart *part, const char *mime_type,
-		   MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	char *text, *p, *start;
-	CamelContentType *type;
-	const char *format;
-	int i;
-
-	text = get_data_wrapper_text (wrapper);
-	if (!text)
-		return FALSE;
-
-	/* Check for RFC 2646 flowed text. */
-	type = camel_mime_part_get_content_type (part);
-	format = header_content_type_param (type, "format");
-	if (format && !g_strcasecmp (format, "flowed"))
-		return handle_text_plain_flowed (text, md);
-
-	mail_html_write (md->html, md->stream, "\n<!-- text/plain -->\n<font size=\"-3\">&nbsp</font><br>\n");
-
-	p = text;
-	while (p) {
-		/* Look for special cases. */
-		for (i = 0; i < NSPECIALS; i++) {
-			start = strstr (p, text_specials[i].start);
-			if (start && (start == p || start[-1] == '\n'))
-				break;
-		}
-		if (!start)
-			break;
-
-		/* Deal with special case */
-		if (start != p) {
-			/* the %.*s thing just grabs upto start-p chars; go read ANSI C */
-			mail_text_write (md->html, md->stream, "%.*s", start-p, p);
-		}
-		p = text_specials[i].handler (start, md);
-		if (p == start) {
-			/* Oops. That failed. Output this line normally and
-			 * skip over it.
-			 */
-			p = strchr (start, '\n');
-			if (!p++)
-				break;
-			mail_text_write (md->html, md->stream, "%.*s", p-start, start);
-		} else if (p)
-			mail_html_write (md->html, md->stream, "<hr>");
-	}
-	/* Finish up (or do the whole thing if there were no specials). */
-	if (p)
-		mail_text_write (md->html, md->stream, "%s", p);
-
-	g_free (text);
-	return TRUE;
-}
-
-static gboolean
-handle_text_plain_flowed (char *buf, MailDisplay *md)
-{
-	char *text, *line, *eol, *p;
-	int prevquoting = 0, quoting, len;
-	gboolean br_pending = FALSE;
-
-	mail_html_write (md->html, md->stream,
-			 "\n<!-- text/plain, flowed -->\n<font size=\"-3\">&nbsp</font><br>\n<tt>\n");
-
-	for (line = buf; *line; line = eol + 1) {
-		/* Process next line */
-		eol = strchr (line, '\n');
-		if (eol)
-			*eol = '\0';
-
-		quoting = 0;
-		for (p = line; *p == '>'; p++)
-			quoting++;
-		if (quoting != prevquoting) {
-			mail_html_write (md->html, md->stream, "%s\n",
-					 prevquoting == 0 ? "<i>\n" : "");
-			while (quoting > prevquoting) {
-				mail_html_write (md->html, md->stream,
-						 "<blockquote>");
-				prevquoting++;
-			}
-			while (quoting < prevquoting) {
-				mail_html_write (md->html, md->stream,
-						 "</blockquote>");
-				prevquoting--;
-			}
-			mail_html_write (md->html, md->stream, "%s\n",
-					 prevquoting == 0 ? "</i>\n" : "");
-		} else if (br_pending) {
-			mail_html_write (md->html, md->stream, "<br>\n");
-			br_pending = FALSE;
-		}
-
-		if (*p == ' ')
-			p++;
-
-		/* replace '<' with '&lt;', etc. */
-		text = e_text_to_html (p, E_TEXT_TO_HTML_CONVERT_SPACES |
-				       E_TEXT_TO_HTML_CONVERT_URLS);
-		if (text && *text)
-			mail_html_write (md->html, md->stream, "%s", text);
-		g_free (text);
-
-		len = strlen (p);
-		if (len == 0 || p[len - 1] != ' ' || !strcmp (p, "-- "))
-			br_pending = TRUE;
-
-		if (!eol)
-			break;
-	}
-	g_free (buf);
-
-	mail_html_write (md->html, md->stream, "</tt>\n");
-	return TRUE;
-}
-
-static CamelMimePart *
-fake_mime_part_from_data (const char *data, int len, const char *type)
-{
-	CamelStream *memstream;
-	CamelDataWrapper *wrapper;
-	CamelMimePart *part;
-
-	memstream = camel_stream_mem_new_with_buffer (data, len);
-	wrapper = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (wrapper, memstream);
-	camel_data_wrapper_set_mime_type (wrapper, type);
-	camel_object_unref (CAMEL_OBJECT (memstream));
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (CAMEL_OBJECT (wrapper));
-	camel_mime_part_set_disposition (part, "inline");
-	return part;
-}
-
-static void
-destroy_part (CamelObject *root, gpointer event_data, gpointer user_data)
-{
-	camel_object_unref (user_data);
-}
-
-static char *
-decode_pgp (const char *ciphertext, int *outlen, MailDisplay *md)
-{
-	CamelException ex;
-	char *plaintext;
-	
-	camel_exception_init (&ex);
-	
-	/* FIXME: multipart parts */
-	/* another FIXME: this doesn't have to return plaintext you realize... */
-	if (g_datalist_get_data (md->data, "show_pgp")) {
-		plaintext = openpgp_decrypt (ciphertext, strlen (ciphertext), outlen, &ex);
-		if (plaintext)
-			return plaintext;
-	}
-	
-	mail_html_write (md->html, md->stream,
-			 "<table><tr valign=top><td>"
-			 "<a href=\"x-evolution-decode-pgp:\">"
-			 "<img src=\"%s\"></a></td><td>",
-			 get_url_for_icon ("gnome-lockscreen.png", md));
-
-	if (camel_exception_is_set (&ex)) {
-		mail_html_write (md->html, md->stream, "%s<br><br>\n",
-				 _("Encrypted message not displayed"));
-		mail_error_write (md->html, md->stream,
-				  camel_exception_get_description (&ex));
-		camel_exception_clear (&ex);
-	} else {
-		mail_html_write (md->html, md->stream, "%s<br><br>\n%s",
-				 _("Encrypted message"),
-				 _("Click icon to decrypt."));
-	}
-
-	mail_html_write (md->html, md->stream, "</td></tr></table>");
-	return NULL;
-}
-
-static char *
-try_inline_pgp (char *start, MailDisplay *md)
-{
-	char *end, *ciphertext, *plaintext;
-	int outlen;
-	
-	end = strstr (start, "-----END PGP MESSAGE-----");
-	if (!end)
-		return start;
-	
-	end += strlen ("-----END PGP MESSAGE-----") - 1;
-	
-	mail_html_write (md->html, md->stream, "<hr>");
-	
-	/* FIXME: uhm, pgp decrypted data doesn't have to be plaintext
-	 * however, I suppose that since it was 'inline', it probably is */
-	ciphertext = g_strndup (start, end - start);
-	plaintext = decode_pgp (ciphertext, &outlen, md);
-	g_free (ciphertext);
-	if (plaintext && outlen > 0) {
-		mail_html_write (md->html, md->stream,
-				 "<table width=\"100%%\" border=2 "
-				 "cellpadding=4><tr><td>");
-		mail_text_write (md->html, md->stream, "%s", plaintext);
-		mail_html_write (md->html, md->stream, "</td></tr></table>");
-		g_free (plaintext);
-	}
-	
-	return end;
-}
-
-static char *
-try_inline_pgp_sig (char *start, MailDisplay *md)
-{
-	char *end, *ciphertext, *plaintext;
-	CamelException *ex;
-	PgpValidity *valid;
-	
-	end = strstr (start, "-----END PGP SIGNATURE-----");
-	if (!end)
-		return start;
-	
-	end += strlen ("-----END PGP SIGNATURE-----");
-	
-	mail_html_write (md->html, md->stream, "<hr>");
-	
-	ciphertext = g_strndup (start, end - start);
-	ex = camel_exception_new ();
-	valid = openpgp_verify (ciphertext, end - start, NULL, 0, ex);
-	g_free (ciphertext);
-	
-	plaintext = g_strndup (start, end - start);
-	mail_text_write (md->html, md->stream, "%s", plaintext);
-	g_free (plaintext);
-	
-	/* Now display the "seal-of-authenticity" or something... */
-	if (valid && openpgp_validity_get_valid (valid)) {
-		mail_html_write (md->html, md->stream,
-				 "<hr>\n<table><tr valign=top>"
-				 "<td><img src=\"%s\"></td>"
-				 "<td><font size=-1>%s<br><br>",
-				 get_url_for_icon ("wax-seal2.png", md),
-				 _("This message is digitally signed and "
-				   "has been found to be authentic."));
-	} else {
-		mail_html_write (md->html, md->stream,
-				 "<hr>\n<table><tr valign=top>"
-				 "<td><img src=\"%s\"></td>"
-				 "<td><font size=-1>%s<br><br>",
-				 get_url_for_icon ("wax-seal-broken.png", md),
-				 _("This message is digitally signed but can "
-				   "not be proven to be authentic."));
-	}
-	
-	if (valid && openpgp_validity_get_description (valid)) {
-		mail_error_write (md->html, md->stream,
-				  openpgp_validity_get_description (valid));
-		mail_html_write (md->html, md->stream, "<br><br>");
-	}
-	
-	mail_html_write (md->html, md->stream, "</font></td></table>");
-		
-	camel_exception_free (ex);
-	openpgp_validity_free (valid);
-	
-	return end;
-}
-
-static char *
-try_uudecoding (char *start, MailDisplay *md)
-{
-	int mode, len, state = 0;
-	char *filename, *estart, *p, *out, uulen = 0;
-	guint32 save = 0;
-	CamelMimePart *part;
-
-	/* Make sure it's a real uudecode begin line:
-	 * begin [0-7]+ .*
-	 */
-	mode = strtoul (start + 6, &p, 8);
-	if (p == start + 6 || *p != ' ')
-		return start;
-	estart = strchr (start, '\n');
-	if (!estart)
-		return start;
-
-	while (isspace ((unsigned char)*p))
-		p++;
-	filename = g_strndup (p, estart++ - p);
-
-	/* Make sure there's an end line. */
-	p = strstr (p, "\nend\n");
-	if (!p) {
-		g_free (filename);
-		return start;
-	}
-
-	out = g_malloc (p - estart);
-	len = uudecode_step (estart, p - estart, out, &state, &save, &uulen);
-
-	part = fake_mime_part_from_data (out, len, "application/octet-stream");
-	g_free (out);
-	camel_mime_part_set_filename (part, filename);
-	g_free (filename);
-	camel_object_hook_event (CAMEL_OBJECT (md->current_message),
-				 "finalize", destroy_part, part);
-
-	mail_html_write (md->html, md->stream, "<hr>");
-	call_handler_function (part, md);
-
-	return p + 4;
-}
-
-static char *
-try_inline_binhex (char *start, MailDisplay *md)
-{
-	char *p;
-	CamelMimePart *part;
-
-	/* Find data start. */
-	p = strstr (start, "\n:");
-	if (!p)
-		return start;
-
-	/* And data end. */
-	p = strchr (p + 2, ':');
-	if (!p || (*(p + 1) != '\n' && *(p + 1) != '\0'))
-		return start;
-	p += 2;
-
-	part = fake_mime_part_from_data (start, p - start,
-					 "application/mac-binhex40");
-	camel_object_hook_event (CAMEL_OBJECT (md->current_message),
-				 "finalize", destroy_part, part);
-
-	mail_html_write (md->html, md->stream, "<hr>");
-	call_handler_function (part, md);
-
-	return p;
-}
-
-static void
-free_byte_array (CamelObject *obj, gpointer event_data, gpointer user_data)
-{
-	/* We don't have to do a forward event here right now */
-	g_byte_array_free (user_data, TRUE);
-}
-
-/* text/enriched (RFC 1896) or text/richtext (included in RFC 1341) */
-static gboolean
-handle_text_enriched (CamelMimePart *part, const char *mime_type,
-		      MailDisplay *md)
-{
-	static GHashTable *translations = NULL;
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	GString *string;
-	GByteArray *ba;
-	char *text, *p, *xed;
-	int len, nofill = 0;
-	gboolean enriched;
-
-	if (!translations) {
-		translations = g_hash_table_new (g_strcase_hash,
-						 g_strcase_equal);
-		g_hash_table_insert (translations, "bold", "<b>");
-		g_hash_table_insert (translations, "/bold", "</b>");
-		g_hash_table_insert (translations, "italic", "<i>");
-		g_hash_table_insert (translations, "/italic", "</i>");
-		g_hash_table_insert (translations, "fixed", "<tt>");
-		g_hash_table_insert (translations, "/fixed", "</tt>");
-		g_hash_table_insert (translations, "smaller", "<font size=-1>");
-		g_hash_table_insert (translations, "/smaller", "</font>");
-		g_hash_table_insert (translations, "bigger", "<font size=+1>");
-		g_hash_table_insert (translations, "/bigger", "</font>");
-		g_hash_table_insert (translations, "underline", "<u>");
-		g_hash_table_insert (translations, "/underline", "</u>");
-		g_hash_table_insert (translations, "center", "<p align=center>");
-		g_hash_table_insert (translations, "/center", "</p>");
-		g_hash_table_insert (translations, "flushleft", "<p align=left>");
-		g_hash_table_insert (translations, "/flushleft", "</p>");
-		g_hash_table_insert (translations, "flushright", "<p align=right>");
-		g_hash_table_insert (translations, "/flushright", "</p>");
-		g_hash_table_insert (translations, "excerpt", "<blockquote>");
-		g_hash_table_insert (translations, "/excerpt", "</blockquote>");
-		g_hash_table_insert (translations, "paragraph", "<p>");
-		g_hash_table_insert (translations, "signature", "<address>");
-		g_hash_table_insert (translations, "/signature", "</address>");
-		g_hash_table_insert (translations, "comment", "<!-- ");
-		g_hash_table_insert (translations, "/comment", " -->");
-		g_hash_table_insert (translations, "param", "<!-- ");
-		g_hash_table_insert (translations, "/param", " -->");
-		g_hash_table_insert (translations, "np", "<hr>");
-	}
-
-	text = get_data_wrapper_text (wrapper);
-	if (!text)
-		return FALSE;
-
-	if (!g_strcasecmp (mime_type, "text/richtext")) {
-		enriched = FALSE;
-		mail_html_write (md->html, md->stream,
-				 "\n<!-- text/richtext -->\n");
-	} else {
-		enriched = TRUE;
-		mail_html_write (md->html, md->stream,
-				 "\n<!-- text/enriched -->\n");
-	}
-
-	/* This is not great code, but I don't feel like fixing it right
-	 * now. I mean, it's just text/enriched...
-	 */
-	p = text;
-	string = g_string_sized_new (2 * strlen (p));
-
-	while (p) {
-		len = strcspn (p, " <>&\n");
-		if (len)
-			g_string_sprintfa (string, "%.*s", len, p);
-
-		p += len;
-		if (!*p)
-			break;
-
-		switch (*p++) {
-		case ' ':
-			while (*p == ' ') {
-				g_string_append (string, "&nbsp;");
-				p++;
-			}
-			g_string_append (string, " ");
-			break;
-
-		case '\n':
-			g_string_append (string, " ");
-			if (enriched && nofill <= 0) {
-				while (*p == '\n') {
-					g_string_append (string, "<br>");
-					p++;
-				}
-			}
-			break;
-
-		case '>':
-			g_string_append (string, "&gt;");
-			break;
-
-		case '&':
-			g_string_append (string, "&amp;");
-			break;
-
-		case '<':
-			if (enriched) {
-				if (*p == '<') {
-					g_string_append (string, "&lt;");
-					p++;
-					break;
-				}
-			} else {
-				if (strncmp (p, "lt>", 3) == 0) {
-					g_string_append (string, "&lt;");
-					p += 3;
-					break;
-				} else if (strncmp (p, "nl>", 3) == 0) {
-					g_string_append (string, "<br>");
-					p += 3;
-					break;
-				}
-			}
-
-			if (strncmp (p, "nofill>", 7) == 0) {
-				nofill++;
-				g_string_append (string, "<pre>");
-			} else if (strncmp (p, "/nofill>", 8) == 0) {
-				nofill--;
-				g_string_append (string, "</pre>");
-			} else {
-				char *copy, *match;
-
-				len = strcspn (p, ">");
-				copy = g_strndup (p, len);
-				match = g_hash_table_lookup (translations,
-							     copy);
-				g_free (copy);
-				if (match)
-					g_string_append (string, match);
-			}
-
-			p = strchr (p, '>');
-			if (p)
-				p++;
-		}
-	}
-	g_free (text);
-
-	ba = g_byte_array_new ();
-	g_byte_array_append (ba, (const guint8 *)string->str,
-			     strlen (string->str));
-	g_string_free (string, TRUE);
-
-	xed = g_strdup_printf ("x-evolution-data:%p", part);
-	mail_html_write (md->html, md->stream,
-			 "<iframe src=\"%s\" frameborder=0 scrolling=no>"
-			 "</iframe>", xed);
-	add_url (xed, ba, md);
-	camel_object_hook_event (CAMEL_OBJECT (md->current_message),
-				 "finalize", free_byte_array, ba);
-
-	return TRUE;
-}
-
-static gboolean
-handle_text_html (CamelMimePart *part, const char *mime_type,
-		  MailDisplay *md)
-{
-	mail_html_write (md->html, md->stream, "\n<!-- text/html -->\n");
-	mail_html_write (md->html, md->stream,
-			 "<iframe src=\"%s\" frameborder=0 scrolling=no>"
-			 "</iframe>", get_cid (part, md));
-	return TRUE;
-}
-
-static gboolean
-handle_image (CamelMimePart *part, const char *mime_type, MailDisplay *md)
-{
-	mail_html_write (md->html, md->stream, "<img src=\"%s\">",
-			 get_cid (part, md));
-	return TRUE;
-}
-
-static gboolean
-handle_multipart_mixed (CamelMimePart *part, const char *mime_type,
-			MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	int i, nparts;
-	gboolean output = FALSE;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	mp = CAMEL_MULTIPART (wrapper);
-
-	nparts = camel_multipart_get_number (mp);	
-	for (i = 0; i < nparts; i++) {
-		if (i != 0 && output)
-			mail_html_write (md->html, md->stream, "<hr>\n");
-
-		part = camel_multipart_get_part (mp, i);
-
-		output = call_handler_function (part, md);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
-			    MailDisplay *md)
-{
-	CamelDataWrapper *wrapper;
-	CamelMimePart *mime_part;
-	CamelException ex;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	
-	/* Currently we only handle RFC2015-style PGP encryption. */
-	if (!mail_crypto_is_rfc2015_encrypted (part))
-		return handle_multipart_mixed (part, mime_type, md);
-	
-	camel_exception_init (&ex);
-	mime_part = pgp_mime_part_decrypt (part, &ex);
-	if (camel_exception_is_set (&ex)) {
-		/* I guess we just treat this as a multipart/mixed */
-		return handle_multipart_mixed (part, mime_type, md);
-	} else {
-		gboolean retcode;
-		
-		retcode = call_handler_function (mime_part, md);
-		camel_object_unref (CAMEL_OBJECT (mime_part));
-		
-		return retcode;
-	}
-}
-
-static gboolean
-handle_multipart_signed (CamelMimePart *part, const char *mime_type,
-			 MailDisplay *md)
-{
-	CamelDataWrapper *wrapper;
-	CamelMultipart *mp;
-	CamelException *ex;
-	gboolean output = FALSE;
-	PgpValidity *valid;
-	int nparts, i;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	
-	/* Currently we only handle RFC2015-style PGP signatures. */
-	if (!mail_crypto_is_rfc2015_signed (part))
-		return handle_multipart_mixed (part, mime_type, md);
-	
-	ex = camel_exception_new ();
-	valid = pgp_mime_part_verify (part, ex);
-	
-	/* now display all the subparts *except* the signature */
-	mp = CAMEL_MULTIPART (wrapper);
-	
-	nparts = camel_multipart_get_number (mp);	
-	for (i = 0; i < nparts - 1; i++) {
-		if (i != 0 && output)
-			mail_html_write (md->html, md->stream, "<hr>\n");
-		
-		part = camel_multipart_get_part (mp, i);
-		
-		output = call_handler_function (part, md);
-	}
-	
-	/* Now display the "seal-of-authenticity" or something... */
-	if (valid && openpgp_validity_get_valid (valid)) {
-		mail_html_write (md->html, md->stream,
-				 "<hr>\n<table><tr valign=top>"
-				 "<td><img src=\"%s\"></td>"
-				 "<td><font size=-1>%s<br><br>",
-				 get_url_for_icon ("wax-seal2.png", md),
-				 _("This message is digitally signed and "
-				   "has been found to be authentic."));
-	} else {
-		mail_html_write (md->html, md->stream,
-				 "<hr>\n<table><tr valign=top>"
-				 "<td><img src=\"%s\"></td>"
-				 "<td><font size=-1>%s<br><br>",
-				 get_url_for_icon ("wax-seal-broken.png", md),
-				 _("This message is digitally signed but can "
-				   "not be proven to be authentic."));
-	}
-
-	if (valid && openpgp_validity_get_description (valid)) {
-		mail_error_write (md->html, md->stream,
-				  openpgp_validity_get_description (valid));
-		mail_html_write (md->html, md->stream, "<br><br>");
-	}
-	
-	mail_html_write (md->html, md->stream, "</font></td></table>");
-	
-	camel_exception_free (ex);
-	openpgp_validity_free (valid);
-	
-	return TRUE;
-}
-
-/* As seen in RFC 2387! */
-static gboolean
-handle_multipart_related (CamelMimePart *part, const char *mime_type,
-			  MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	CamelMimePart *body_part, *display_part = NULL;
-	CamelContentType *content_type;
-	const char *start;
-	int i, nparts;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);	
-
-	content_type = camel_mime_part_get_content_type (part);
-	start = header_content_type_param (content_type, "start");
-	if (start) {
-		int len;
-
-		/* The "start" parameter includes <>s, which Content-Id
-		 * does not.
-		 */
-		len = strlen (start) - 2;
-
-		for (i = 0; i < nparts; i++) {
-			const char *cid;
-
-			body_part = camel_multipart_get_part (mp, i);
-			cid = camel_mime_part_get_content_id (body_part);
-
-			if (!strncmp (cid, start + 1, len) &&
-			    strlen (cid) == len) {
-				display_part = body_part;
-				break;
-			}
-		}
-
-		if (!display_part) {
-			/* Oops. Hrmph. */
-			return handle_multipart_mixed (part, mime_type, md);
-		}
-	} else {
-		/* No start parameter, so it defaults to the first part. */
-		display_part = camel_multipart_get_part (mp, 0);
-	}
-
-	/* Record the Content-IDs of any non-displayed parts. */
-	for (i = 0; i < nparts; i++) {
-		body_part = camel_multipart_get_part (mp, i);
-		if (body_part == display_part)
-			continue;
-
-		get_cid (body_part, md);
-	}
-
-	/* Now, display the displayed part. */
-	return call_handler_function (display_part, md);
-}
-
-/* RFC 2046 says "display the last part that you are able to display". */
-static CamelMimePart *
-find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain)
-{
-	int i, nparts;
-	CamelMimePart *preferred_part = NULL;
-	MailMimeHandler *handler;
-
-	nparts = camel_multipart_get_number (multipart);
-	for (i = 0; i < nparts; i++) {
-		CamelMimePart *part = camel_multipart_get_part (multipart, i);
-		CamelContentType *type = camel_mime_part_get_content_type (part);
-		char *mime_type = header_content_type_simple (type);
-
-		g_strdown (mime_type);
-		if (want_plain && !strcmp (mime_type, "text/plain"))
-			return part;
-		handler = mail_lookup_handler (mime_type);
-		if (handler && (!preferred_part || !handler->generic))
-			preferred_part = part;
-		g_free (mime_type);
-	}
-
-	return preferred_part;
-}
-
-static gboolean
-handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-	CamelMimePart *mime_part;
-	
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	mime_part = find_preferred_alternative (multipart, FALSE);
-	if (mime_part)
-		return call_handler_function (mime_part, md);
-	else
-		return handle_multipart_mixed (part, mime_type, md);
-}
-
-/* RFC 1740 */
-static gboolean
-handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-	
-	multipart = CAMEL_MULTIPART (wrapper);
-
-	/* The first part is application/applefile and is not useful
-	 * to us. The second part _may_ be displayable data. Most
-	 * likely it's application/octet-stream though.
-	 */
-	part = camel_multipart_get_part (multipart, 1);
-	return call_handler_function (part, md);
-}
-
-static gboolean
-handle_message_rfc822 (CamelMimePart *part, const char *mime_type,
-		       MailDisplay *md)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (wrapper), FALSE);
-	
-	mail_html_write (md->html, md->stream, "<blockquote>");
-	mail_format_mime_message (CAMEL_MIME_MESSAGE (wrapper), md);
-	mail_html_write (md->html, md->stream, "</blockquote>");
-
-	return TRUE;
-}
-
-static gboolean
-handle_message_external_body (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md)
-{
-	CamelContentType *type;
-	const char *access_type;
-	char *url = NULL, *desc = NULL;
-
-	type = camel_mime_part_get_content_type (part);
-	access_type = header_content_type_param (type, "access-type");
-	if (!access_type)
-		goto fallback;
-
-	if (!g_strcasecmp (access_type, "ftp") ||
-	    !g_strcasecmp (access_type, "anon-ftp")) {
-		const char *name, *site, *dir, *mode, *ftype;
-		char *path;
-
-		name = header_content_type_param (type, "name");
-		site = header_content_type_param (type, "site");
-		if (name == NULL || site == NULL)
-			goto fallback;
-		dir = header_content_type_param (type, "directory");
-		mode = header_content_type_param (type, "mode");
-
-		/* Generate the path. */
-		if (dir) {
-			const char *p = dir + strlen (dir);
-
-			path = g_strdup_printf ("%s%s%s%s",
-						*dir == '/' ? "" : "/",
-						dir,
-						*p == '/' ? "" : "/",
-						name);
-		} else {
-			path = g_strdup_printf ("%s%s",
-						*name == '/' ? "" : "/",
-						name);
-		}
-
-		if (mode && *mode == 'A')
-			ftype = ";type=A";
-		else if (mode && *mode == 'I')
-			ftype = ";type=I";
-		else
-			ftype = "";
-
-		url = g_strdup_printf ("ftp://%s%s%s", site, path, ftype);
-		g_free (path);
-		desc = g_strdup_printf (_("Pointer to FTP site (%s)"), url);
-	} else if (!g_strcasecmp (access_type, "local-file")) {
-		const char *name, *site;
-
-		name = header_content_type_param (type, "name");
-		if (name == NULL)
-			goto fallback;
-		site = header_content_type_param (type, "site");
-
-		url = g_strdup_printf ("file://%s%s", *name == '/' ? "" : "/",
-				       name);
-		if (site) {
-			desc = g_strdup_printf (_("Pointer to local file (%s) "
-						  "valid at site \"%s\""),
-						name, site);
-		} else {
-			desc = g_strdup_printf (_("Pointer to local file (%s)"),
-						name);
-		}
-	} else if (!g_strcasecmp (access_type, "URL")) {
-		const char *urlparam;
-		char *s, *d;
-
-		/* RFC 2017 */
-
-		urlparam = header_content_type_param (type, "url");
-		if (urlparam == NULL)
-			goto fallback;
-
-		/* For obscure MIMEy reasons, the URL may be split into
-		 * multiple words, and needs to be rejoined. (The URL
-		 * must have any real whitespace %-encoded, so we just
-		 * get rid of all of it.
-		 */
-		url = g_strdup (urlparam);
-		s = d = url;
-
-		while (*s) {
-			if (!isspace ((unsigned char)*s))
-				*d++ = *s;
-			s++;
-		}
-		*d = *s;
-
-		desc = g_strdup_printf ("Pointer to remote data (%s)", url);
-	}
-
- fallback:
-	if (!desc) {
-		if (access_type) {
-			desc = g_strdup_printf (_("Pointer to unknown "
-						  "external data "
-						  "(\"%s\" type)"),
-						access_type);
-		} else
-			desc = g_strdup (_("Malformed external-body part."));
-	}
-
-#if 0 /* FIXME */
-	handle_mystery (part, md, url, "gnome-globe.png", desc,
-			url ? "open it in a browser" : NULL);
-#endif
-
-	g_free (desc);
-	g_free (url);
-	return TRUE;
-}
-
-static gboolean
-handle_via_bonobo (CamelMimePart *part, const char *mime_type,
-		   MailDisplay *md)
-{
-	mail_html_write (md->html, md->stream,
-			 "<object classid=\"%s\" type=\"%s\"></object>",
-			 get_cid (part, md), mime_type);
-	return TRUE;
-}
-
-char *
-mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean *is_html)
-{
-	CamelMultipart *mp;
-	CamelMimePart *subpart;
-	int i, nparts;
-	char *subtext, *old;
-	const char *boundary;
-	char *text = NULL;
-	CamelContentType *mime_type;
-	
-	/* We only include text, message, and multipart bodies. */
-	mime_type = camel_data_wrapper_get_mime_type_field (data);
-	
-	/* FIXME: This is wrong. We don't want to include large
-	 * images. But if we don't do it this way, we don't get
-	 * the headers...
-	 */
-	if (header_content_type_is (mime_type, "message", "*")) {
-		*is_html = FALSE;
-		return get_data_wrapper_text (data);
-	}
-	
-	if (header_content_type_is (mime_type, "text", "*")) {
-		*is_html = header_content_type_is (mime_type, "text", "html");
-		return get_data_wrapper_text (data);
-	}
-	
-	/* If it's not message and it's not text, and it's not
-	 * multipart, we don't want to deal with it.
-	 */
-	if (!header_content_type_is (mime_type, "multipart", "*"))
-		return NULL;
-	
-	mp = CAMEL_MULTIPART (data);
-	
-	if (header_content_type_is (mime_type, "multipart", "alternative")) {
-		/* Pick our favorite alternative and reply to it. */
-		
-		subpart = find_preferred_alternative (mp, want_plain);
-		if (!subpart)
-			return NULL;
-		
-		data = camel_medium_get_content_object (
-			CAMEL_MEDIUM (subpart));
-		return mail_get_message_body (data, want_plain, is_html);
-	}
-	
-	nparts = camel_multipart_get_number (mp);
-	
-	/* Otherwise, concatenate all the parts that we can. If we find
-	 * an HTML part in there though, return just that: We don't want
-	 * to deal with merging HTML and non-HTML parts.
-	 */
-	boundary = camel_multipart_get_boundary (mp);
-	for (i = 0; i < nparts; i++) {
-		subpart = camel_multipart_get_part (mp, i);
-		
-		if (!mail_part_is_inline (subpart))
-			continue;
-		
-		data = camel_medium_get_content_object (
-			CAMEL_MEDIUM (subpart));
-		subtext = mail_get_message_body (data, want_plain, is_html);
-		if (!subtext)
-			continue;
-		if (*is_html) {
-			g_free (text);
-			return subtext;
-		}
-		
-		if (text) {
-			old = text;
-			text = g_strdup_printf ("%s\n--%s\n%s", old,
-						boundary, subtext);
-			g_free (subtext);
-			g_free (old);
-		} else
-			text = subtext;
-	}
-	
-	return text;
-}
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
deleted file mode 100644
index e8b5f96a48..0000000000
--- a/mail/mail-identify.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-sniff-buffer.h>
-#include "mail.h"
-
-/**
- * mail_identify_mime_part:
- * @part: a CamelMimePart
- * @md: the MailDisplay @part is being shown in
- *
- * Try to identify the MIME type of the data in @part (which presumably
- * doesn't have a useful Content-Type).
- **/
-char *
-mail_identify_mime_part (CamelMimePart *part, MailDisplay *md)
-{
-	const char *filename, *type;
-	GnomeVFSMimeSniffBuffer *sniffer;
-	CamelStream *memstream;
-	CamelDataWrapper *data;
-	GByteArray *ba;
-
-	/* Try identifying based on name in Content-Type or
-	 * filename in Content-Disposition.
-	 */
-	filename = camel_mime_part_get_filename (part);
-	if (filename) {
-		type = gnome_vfs_mime_type_from_name_or_default (filename,
-								 NULL);
-		if (type)
-			return g_strdup (type);
-	}
-
-
-	/* Try file magic. */
-	data = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	/* FIXME: In a perfect world, we would not load the content just
-	 * to identify the MIME type.
-	 */
-	if (mail_content_loaded (data, md)) {		
-		ba = g_byte_array_new ();
-		memstream = camel_stream_mem_new_with_byte_array (ba);
-		camel_data_wrapper_write_to_stream (data, memstream);
-		if (ba->len) {
-			sniffer = gnome_vfs_mime_sniff_buffer_new_from_memory (
-				ba->data, ba->len);
-			type = gnome_vfs_get_mime_type_for_buffer (sniffer);
-			gnome_vfs_mime_sniff_buffer_free (sniffer);
-		} else
-			type = NULL;
-		camel_object_unref (CAMEL_OBJECT (memstream));
-
-		if (type)
-			return g_strdup (type);
-	}
-
-	/* Another possibility to try is the x-mac-type / x-mac-creator
-	 * parameter to Content-Type used by some Mac email clients. That
-	 * would require a Mac type to mime type conversion table.
-	 */
-
-
-	/* We give up. */
-	return NULL;
-}
diff --git a/mail/mail-importer.c b/mail/mail-importer.c
deleted file mode 100644
index 03f2bd374b..0000000000
--- a/mail/mail-importer.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include "mail-importer.h"
-#include "mail-local.h"
-#include "mail.h"
-
-#include <evolution-storage.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-exception.h>
-
-#include "evolution-outlook-importer.h"
-#include "evolution-mbox-importer.h"
-
-static gboolean factory_initialised = FALSE;
-
-extern char *evolution_dir;
-
-static GNOME_Evolution_LocalStorage local_storage = NULL;
-
-void
-mail_importer_create_folder (const char *parent_path,
-			     const char *name,
-			     const char *type,
-			     const char *description)
-{
-	BonoboListener *listener;
-	Bonobo_Listener corba_listener;
-	CORBA_Environment ev;
-	char *path, *physical;
-
-	path = g_concat_dir_and_file (parent_path, name);
-	physical = g_strdup_printf ("file://%s/local/%s", evolution_dir,
-				    parent_path);
-
-	listener = bonobo_listener_new (NULL, NULL);
-	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
-	
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_asyncCreateFolder (local_storage, 
-						   path, "mail", name,
-						   physical,
-						   corba_listener, &ev);
-	CORBA_exception_free (&ev);
-	g_free (path);
-	g_free (physical);
-}
-
-/**
- * mail_importer_add_line:
- * importer: A MailImporter structure.
- * str: Next line of the mbox.
- * finished: TRUE if @str is the last line of the message.
- *
- * Adds lines to the message until it is finished, and then adds
- * the complete message to the folder.
- */
-void
-mail_importer_add_line (MailImporter *importer,
-			const char *str,
-			gboolean finished)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	CamelException *ex;
-	
-	if (importer->mstream == NULL) {
-		importer->mstream = CAMEL_STREAM_MEM (camel_stream_mem_new ());
-	}
-
-	camel_stream_write (CAMEL_STREAM (importer->mstream), str, 
-			    strlen (str));
-	
-	if (finished == FALSE)
-		return;
-
-	camel_stream_reset (CAMEL_STREAM (importer->mstream));
-	info = g_new0 (CamelMessageInfo, 1);
-	info->flags = CAMEL_MESSAGE_SEEN;
-
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
-						  CAMEL_STREAM (importer->mstream));
-	
-	camel_object_unref (CAMEL_OBJECT (importer->mstream));
-	importer->mstream = NULL;
-
-	ex = camel_exception_new ();
-	camel_folder_append_message (importer->folder, msg, info, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-
-	camel_exception_free (ex);
-	g_free (info);
-}
-
-/**
- * mail_importer_init:
- *
- * Initialises all the importers
- */
-void
-mail_importer_init (EvolutionShellClient *client)
-{
-	BonoboGenericFactory *factory;
-
-	if (factory_initialised == TRUE)
-		return;
-
-	/* FIXME: Need plugins */
-	factory = bonobo_generic_factory_new (OUTLOOK_FACTORY_IID,
-					      outlook_factory_fn, 
-					      NULL);
-	if (factory == NULL) {
-		g_error ("Unable to create outlook factory.");
-	}
-
-	factory = bonobo_generic_factory_new (MBOX_FACTORY_IID,
-					      mbox_factory_fn, NULL);
-	if (factory == NULL) {
-		g_error ("Unable to create mbox factory.");
-	}
-	
-	factory_initialised = TRUE;
-	local_storage = evolution_shell_client_get_local_storage (client);
-}
-
diff --git a/mail/mail-importer.h b/mail/mail-importer.h
deleted file mode 100644
index e50288c6c0..0000000000
--- a/mail/mail-importer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.h
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __MAIL_IMPORTER_H__
-#define __MAIL_IMPORTER_H__
-
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-exception.h>
-#include <evolution-shell-client.h>
-
-typedef struct _MailImporter MailImporter;
-struct _MailImporter {
-	CamelFolder *folder;
-	CamelStreamMem *mstream;
-
-	gboolean frozen; /* Is folder frozen? */
-};
-
-void mail_importer_init (EvolutionShellClient *client);
-void mail_importer_add_line (MailImporter *importer,
-			     const char *str,
-			     gboolean finished);
-void mail_importer_create_folder (const char *parent_path,
-				  const char *name,
-				  const char *type,
-				  const char *description);
-#endif
diff --git a/mail/mail-local.c b/mail/mail-local.c
deleted file mode 100644
index 4d2a7e0615..0000000000
--- a/mail/mail-local.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-local.c: Local mailbox support. */
-
-/* 
- * Authors: 
- *  Michael Zucchi <NotZed@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Ettore Perazzoli <ettore@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
-  TODO:
-
-  If we are going to have all this LocalStore stuff, then the LocalStore
-  should have a reconfigure_folder method on it, as, in reality, it is
-  the maintainer of this information.
-
-*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
-#include "evolution-storage-listener.h"
-
-#include "camel/camel.h"
-#include "camel/camel-vee-folder.h"
-
-#include "filter/vfolder-context.h"
-#include "filter/vfolder-rule.h"
-#include "filter/vfolder-editor.h"
-
-#include "mail.h"
-#include "mail-local.h"
-#include "mail-tools.h"
-#include "folder-browser.h"
-#include "mail-mt.h"
-
-#define d(x)
-
-
-/* Local folder metainfo */
-
-struct _local_meta {
-	char *path;		/* path of metainfo file */
-
-	char *format;		/* format of mailbox */
-	char *name;		/* name of mbox itself */
-	int indexed;		/* do we index the body? */
-};
-
-static struct _local_meta *
-load_metainfo(const char *path)
-{
-	xmlDocPtr doc;
-	xmlNodePtr node;
-	struct _local_meta *meta;
-
-	meta = g_malloc0(sizeof(*meta));
-	meta->path = g_strdup(path);
-
-	d(printf("Loading folder metainfo from : %s\n", meta->path));
-
-	doc = xmlParseFile(meta->path);
-	if (doc == NULL) {
-		goto dodefault;
-	}
-	node = doc->root;
-	if (strcmp(node->name, "folderinfo")) {
-		goto dodefault;
-	}
-	node = node->childs;
-	while (node) {
-		if (!strcmp(node->name, "folder")) {
-			char *index, *txt;
-
-			txt = xmlGetProp(node, "type");
-			meta->format = g_strdup (txt ? txt : "mbox");
-			xmlFree (txt);
-
-			txt = xmlGetProp(node, "name");
-			meta->name = g_strdup (txt ? txt : "mbox");
-			xmlFree (txt);
-
-			index = xmlGetProp(node, "index");
-			if (index) {
-				meta->indexed = atoi(index);
-				xmlFree(index);
-			} else
-				meta->indexed = TRUE;
-			
-		}
-		node = node->next;
-	}
-	xmlFreeDoc(doc);
-	return meta;
-
- dodefault:
-	meta->format = g_strdup("mbox"); /* defaults */
-	meta->name = g_strdup("mbox");
-	meta->indexed = TRUE;
-	if (doc)
-		xmlFreeDoc(doc);
-	return meta;
-}
-
-static void
-free_metainfo(struct _local_meta *meta)
-{
-	g_free(meta->path);
-	g_free(meta->format);
-	g_free(meta->name);
-	g_free(meta);
-}
-
-static int
-save_metainfo(struct _local_meta *meta)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, node;
-	int ret;
-
-	d(printf("Saving folder metainfo to : %s\n", meta->path));
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewDocNode(doc, NULL, "folderinfo", NULL);
-	xmlDocSetRootElement(doc, root);
-
-	node  = xmlNewChild(root, NULL, "folder", NULL);
-	xmlSetProp(node, "type", meta->format);
-	xmlSetProp(node, "name", meta->name);
-	xmlSetProp(node, "index", meta->indexed?"1":"0");
-
-	ret = xmlSaveFile(meta->path, doc);
-	xmlFreeDoc(doc);
-	return ret;
-}
-
-
-/* MailLocalStore implementation */
-#define MAIL_LOCAL_STORE_TYPE     (mail_local_store_get_type ())
-#define MAIL_LOCAL_STORE(obj)     (CAMEL_CHECK_CAST((obj), MAIL_LOCAL_STORE_TYPE, MailLocalStore))
-#define MAIL_LOCAL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_LOCAL_STORE_TYPE, MailLocalStoreClass))
-#define MAIL_IS_LOCAL_STORE(o)    (CAMEL_CHECK_TYPE((o), MAIL_LOCAL_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;	
-
-	GNOME_Evolution_LocalStorage corba_local_storage;
-	EvolutionStorageListener *local_storage_listener;
-
-	char *local_path;
-	int local_pathlen;
-	GHashTable *folders, /* points to MailLocalFolder */
-		*unread;
-} MailLocalStore;
-
-typedef struct {
-	CamelStoreClass parent_class;
-} MailLocalStoreClass;
-
-typedef struct {
-	CamelFolder *folder;
-	MailLocalStore *local_store;
-	char *path, *name, *uri;
-	int last_unread;
-} MailLocalFolder;
-
-static MailLocalStore *local_store;
-
-CamelType mail_local_store_get_type (void);
-
-static void local_folder_changed_proxy (CamelObject *folder, gpointer event_data, gpointer user_data);
-
-static char *get_name (CamelService *service, gboolean brief);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,
-				guint32 flags, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only, CamelException *ex);
-static void delete_folder (CamelStore *store, const char *folder_name,
-			   CamelException *ex);
-static void rename_folder (CamelStore *store, const char *old_name,
-			   const char *new_name, CamelException *ex);
-
-static CamelStoreClass *local_parent_class;
-
-static void
-mail_local_store_class_init (MailLocalStoreClass *mail_local_store_class)
-{
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (mail_local_store_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (mail_local_store_class);
-
-	/* virtual method overload */
-	camel_service_class->get_name = get_name;
-
-	/* Don't cache folders */
-	camel_store_class->hash_folder_name = NULL;
-	camel_store_class->compare_folder_name = NULL;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-
-	local_parent_class = (CamelStoreClass *)camel_type_get_global_classfuncs(camel_store_get_type ());
-}
-
-static void
-mail_local_store_init (gpointer object, gpointer klass)
-{
-	MailLocalStore *local_store = MAIL_LOCAL_STORE (object);
-
-	local_store->corba_local_storage = CORBA_OBJECT_NIL;
-}
-
-static void
-free_local_folder(MailLocalFolder *lf)
-{
-	if (lf->folder) {
-		camel_object_unhook_event((CamelObject *)lf->folder,
-					  "folder_changed", local_folder_changed_proxy,
-					  lf);
-		camel_object_unhook_event((CamelObject *)lf->folder,
-					  "message_changed", local_folder_changed_proxy,
-					  lf);
-		camel_object_unref((CamelObject *)lf->folder);
-	}
-	g_free(lf->path);
-	g_free(lf->name);
-	g_free(lf->uri);
-	camel_object_unref((CamelObject *)lf->local_store);
-}
-
-static void
-free_folder (gpointer key, gpointer data, gpointer user_data)
-{
-	MailLocalFolder *lf = data;
-
-	g_free(key);
-	free_local_folder(lf);
-}
-
-static void
-mail_local_store_finalize (gpointer object)
-{
-	MailLocalStore *local_store = MAIL_LOCAL_STORE (object);
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	if (!CORBA_Object_is_nil (local_store->corba_local_storage, &ev)) {
-		Bonobo_Unknown_unref (local_store->corba_local_storage, &ev);
-		CORBA_Object_release (local_store->corba_local_storage, &ev);
-	}
-	CORBA_exception_free (&ev);
-
-	if (local_store->local_storage_listener)
-		gtk_object_unref (GTK_OBJECT (local_store->local_storage_listener));
-
-	g_hash_table_foreach (local_store->folders, free_folder, NULL);
-	g_hash_table_destroy (local_store->folders);
-
-	g_free (local_store->local_path);
-}
-
-CamelType
-mail_local_store_get_type (void)
-{
-	static CamelType mail_local_store_type = CAMEL_INVALID_TYPE;
-
-	if (mail_local_store_type == CAMEL_INVALID_TYPE) {
-		mail_local_store_type = camel_type_register (
-			CAMEL_STORE_TYPE, "MailLocalStore",
-			sizeof (MailLocalStore),
-			sizeof (MailLocalStoreClass),
-			(CamelObjectClassInitFunc) mail_local_store_class_init,
-			NULL,
-			(CamelObjectInitFunc) mail_local_store_init,
-			(CamelObjectFinalizeFunc) mail_local_store_finalize);
-	}
-
-	return mail_local_store_type;
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name,
-	    guint32 flags, CamelException *ex)
-{
-	MailLocalStore *local_store = (MailLocalStore *)store;
-	CamelFolder *folder;
-	MailLocalFolder *local_folder;
-
-	local_folder = g_hash_table_lookup (local_store->folders, folder_name);
-	if (local_folder) {
-		folder = local_folder->folder;
-		camel_object_ref (CAMEL_OBJECT (folder));
-	} else {
-		folder = NULL;
-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      "No such folder %s", folder_name);
-	}
-	return folder;
-}
-
-static void
-populate_folders (gpointer key, gpointer data, gpointer user_data)
-{
-	GPtrArray *folders = user_data;
-	MailLocalFolder *folder;
-	CamelFolderInfo *fi;
-	
-	folder = data;
-	
-	fi = g_new0 (CamelFolderInfo, 1);
-	fi->full_name = g_strdup (folder->path);
-	fi->name = g_strdup (folder->name);
-	fi->url = g_strdup (folder->uri);
-	fi->unread_message_count = -1;
-	
-	g_ptr_array_add (folders, fi);
-}
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only, CamelException *ex)
-{
-	MailLocalStore *local_store = MAIL_LOCAL_STORE (store);
-	CamelFolderInfo *fi = NULL;
-	GPtrArray *folders;
-	
-	folders = g_ptr_array_new ();
-	g_hash_table_foreach (local_store->folders, populate_folders, folders);
-	
-	fi = camel_folder_info_build (folders, top, '/', TRUE);
-	g_ptr_array_free (folders, TRUE);
-	
-	return fi;
-}
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	/* No-op. The shell local storage deals with this. */
-}
-
-static void
-rename_folder (CamelStore *store, const char *old, const char *new,
-	       CamelException *ex)
-{
-	/* Probable no-op... */
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	return g_strdup ("Local mail folders");
-}
-
-
-/* Callbacks for the EvolutionStorageListner signals.  */
-
-static void
-local_storage_destroyed_cb (EvolutionStorageListener *storage_listener,
-			    void *data)
-{
-	/* FIXME: Dunno how to handle this yet.  */
-	g_warning ("%s -- The LocalStorage has gone?!", __FILE__);
-}
-
-
-static void
-local_folder_changed (CamelObject *object, gpointer event_data,
-		      gpointer user_data)
-{
-	MailLocalFolder *local_folder = user_data;
-	int unread = GPOINTER_TO_INT (event_data);
-	char *display;
-
-	if (unread != local_folder->last_unread) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		if (unread > 0) {
-			display = g_strdup_printf ("%s (%d)", local_folder->name, unread);
-			GNOME_Evolution_LocalStorage_updateFolder (
-				local_folder->local_store->corba_local_storage,
-				local_folder->path, display, TRUE, &ev);
-			g_free (display);
-		} else {
-			GNOME_Evolution_LocalStorage_updateFolder (
-				local_folder->local_store->corba_local_storage,
-				local_folder->path, local_folder->name,
-				FALSE, &ev);
-		}
-		CORBA_exception_free (&ev);
-
-		local_folder->last_unread = unread;
-	}
-}
-
-static void
-local_folder_changed_proxy (CamelObject *folder, gpointer event_data, gpointer user_data)
-{
-	int unread;
-
-	unread = camel_folder_get_unread_message_count (CAMEL_FOLDER (folder));
-	mail_proxy_event (local_folder_changed, folder,
-			  GINT_TO_POINTER (unread), user_data);
-}
-
-/* ********************************************************************** */
-/* Register folder */
-
-struct _register_msg {
-	struct _mail_msg msg;
-
-	MailLocalFolder *local_folder;
-};
-
-static char *register_folder_desc(struct _mail_msg *mm, int done)
-{
-	struct _register_msg *m = (struct _register_msg *)mm;
-
-	printf("returning description for %s\n", m->local_folder->uri);
-
-	return g_strdup_printf(_("Opening '%s'"), m->local_folder->uri);
-}
-
-static void
-register_folder_register(struct _mail_msg *mm)
-{
-	struct _register_msg *m = (struct _register_msg *)mm;
-	MailLocalFolder *local_folder = m->local_folder;
-	char *name, *path = local_folder->uri + 7;
-	struct _local_meta *meta;
-	CamelStore *store;
-	guint32 flags;
-
-	name = g_strdup_printf ("%s/local-metadata.xml", path);
-	meta = load_metainfo (name);
-	g_free (name);
-
-	camel_operation_register(mm->cancel);
-
-	name = g_strdup_printf ("%s:%s", meta->format, path);
-	store = camel_session_get_store (session, name, &mm->ex);
-	g_free (name);
-	if (!store) {
-		free_metainfo (meta);
-		camel_operation_unregister(mm->cancel);
-		return;
-	}
-
-	flags = CAMEL_STORE_FOLDER_CREATE;
-	if (meta->indexed)
-		flags |= CAMEL_STORE_FOLDER_BODY_INDEX;
-	local_folder->folder = camel_store_get_folder (store, meta->name, flags, &mm->ex);
-	if (local_folder->folder) {
-		camel_object_hook_event (CAMEL_OBJECT (local_folder->folder),
-					 "folder_changed", local_folder_changed_proxy,
-					 local_folder);
-		camel_object_hook_event (CAMEL_OBJECT (local_folder->folder),
-					 "message_changed", local_folder_changed_proxy,
-					 local_folder);
-		local_folder->last_unread = camel_folder_get_unread_message_count(local_folder->folder);
-	}
-
-	camel_object_unref (CAMEL_OBJECT (store));
-	free_metainfo (meta);
-
-	camel_operation_unregister(mm->cancel);
-}
-
-static void
-register_folder_registered(struct _mail_msg *mm)
-{
-	struct _register_msg *m = (struct _register_msg *)mm;
-	MailLocalFolder *local_folder = m->local_folder;
-	int unread;
-
-	if (local_folder->folder) {
-		CamelStore *store = CAMEL_STORE (local_folder->local_store);
-		
-		g_hash_table_insert (local_folder->local_store->folders, local_folder->uri + 8,
-				     local_folder);
-		
-		/* Add the folder to the vTrash folder */
-		if (store->vtrash)
-			camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store->vtrash),
-						     local_folder->folder);
-		
-		unread = local_folder->last_unread;
-		local_folder->last_unread = 0;
-		local_folder_changed (CAMEL_OBJECT (local_folder->folder), GINT_TO_POINTER (unread),
-				      local_folder);
-		m->local_folder = NULL;
-	}
-}
-
-static void 
-register_folder_free(struct _mail_msg *mm)
-{
-	struct _register_msg *m = (struct _register_msg *)mm;
-
-	if (m->local_folder)
-		free_local_folder(m->local_folder);
-}
-
-static struct _mail_msg_op register_folder_op = {
-	register_folder_desc,
-	register_folder_register,
-	register_folder_registered,
-	register_folder_free,
-};
-
-static void
-local_storage_new_folder_cb (EvolutionStorageListener *storage_listener,
-			     const char *path,
-			     const GNOME_Evolution_Folder *folder,
-			     void *data)
-{
-	MailLocalStore *local_store = data;
-	MailLocalFolder *local_folder;
-	struct _register_msg *m;
-	int id;
-
-	if (strcmp (folder->type, "mail") != 0 ||
-	    strncmp (folder->physical_uri, "file://", 7) != 0 ||
-	    strncmp (folder->physical_uri + 7, local_store->local_path,
-		     local_store->local_pathlen) != 0)
-		return;
-
-	local_folder = g_new0 (MailLocalFolder, 1);
-	local_folder->name = g_strdup (strrchr (path, '/') + 1);
-	local_folder->path = g_strdup (path);
-	local_folder->uri = g_strdup (folder->physical_uri);
-	local_folder->local_store = local_store;
-	camel_object_ref((CamelObject *)local_store);
-
-	m = mail_msg_new(&register_folder_op, NULL, sizeof(*m));
-
-	m->local_folder = local_folder;
-
-	/* run synchronous, the shell expects it (I think) */
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-	mail_msg_wait(id);
-}
-
-static void
-local_storage_removed_folder_cb (EvolutionStorageListener *storage_listener,
-				 const char *path,
-				 void *data)
-{
-	MailLocalStore *local_store = data;
-	MailLocalFolder *local_folder;
-
-	if (strncmp (path, "file://", 7) != 0 ||
-	    strncmp (path + 7, local_store->local_path,
-		     local_store->local_pathlen) != 0)
-		return;
-
-	local_folder = g_hash_table_lookup (local_store->folders, path + 8);
-	if (local_folder) {
-		g_hash_table_remove (local_store->folders, path);
-		free_local_folder(local_folder);
-	}
-}
-
-static CamelProvider local_provider = {
-	"file", "Local mail", NULL, "mail",
-	CAMEL_PROVIDER_IS_STORAGE, CAMEL_URL_NEED_PATH,
-	{ 0, 0 }, NULL
-};
-
-/* There's only one "file:" store. */
-static guint
-non_hash (gconstpointer key)
-{
-	return 0;
-}
-
-static gint
-non_equal (gconstpointer a, gconstpointer b)
-{
-	return TRUE;
-}
-
-void
-mail_local_storage_startup (EvolutionShellClient *shellclient,
-			    const char *evolution_path)
-{
-	GNOME_Evolution_StorageListener corba_local_storage_listener;
-	CORBA_Environment ev;
-
-	/* Register with Camel to handle file: URLs */
-	local_provider.object_types[CAMEL_PROVIDER_STORE] =
-		mail_local_store_get_type();
-
-	local_provider.service_cache = g_hash_table_new (non_hash, non_equal);
-	camel_session_register_provider (session, &local_provider);
-
-
-	/* Now build the storage. */
-	local_store = (MailLocalStore *)camel_session_get_service (
-		session, "file:/", CAMEL_PROVIDER_STORE, NULL);
-	if (!local_store) {
-		g_warning ("No local store!");
-		return;
-	}
-	local_store->corba_local_storage =
-		evolution_shell_client_get_local_storage (shellclient);
-	if (local_store->corba_local_storage == CORBA_OBJECT_NIL) {
-		g_warning ("No local storage!");
-		camel_object_unref (CAMEL_OBJECT (local_store));
-		return;
-	}
-	
-	local_store->local_storage_listener =
-		evolution_storage_listener_new ();
-	corba_local_storage_listener =
-		evolution_storage_listener_corba_objref (
-			local_store->local_storage_listener);
-
-	gtk_signal_connect (GTK_OBJECT (local_store->local_storage_listener),
-			    "destroyed",
-			    GTK_SIGNAL_FUNC (local_storage_destroyed_cb),
-			    local_store);
-	gtk_signal_connect (GTK_OBJECT (local_store->local_storage_listener),
-			    "new_folder",
-			    GTK_SIGNAL_FUNC (local_storage_new_folder_cb),
-			    local_store);
-	gtk_signal_connect (GTK_OBJECT (local_store->local_storage_listener),
-			    "removed_folder",
-			    GTK_SIGNAL_FUNC (local_storage_removed_folder_cb),
-			    local_store);
-
-	local_store->local_path = g_strdup_printf ("%s/local",
-						   evolution_path);
-	local_store->local_pathlen = strlen (local_store->local_path);
-
-	local_store->folders = g_hash_table_new (g_str_hash, g_str_equal);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_addListener (local_store->corba_local_storage,
-					corba_local_storage_listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Cannot add a listener to the Local Storage.");
-		camel_object_unref (CAMEL_OBJECT (local_store));
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-/* Local folder reconfiguration stuff */
-
-/*
-   open new
-   copy old->new
-   close old
-   rename old oldsave
-   rename new old
-   open oldsave
-   delete oldsave
-
-   close old
-   rename oldtmp
-   open new
-   open oldtmp
-   copy oldtmp new
-   close oldtmp
-   close oldnew
-
-*/
-
-static void
-update_progress(char *fmt, float percent)
-{
-	if (fmt)
-		mail_status(fmt);
-	/*mail_op_set_percentage (percent);*/
-}
-
-/* ******************** */
-
-/* we should have our own progress bar for this */
-
-struct _reconfigure_msg {
-	struct _mail_msg msg;
-
-	FolderBrowser *fb;
-	gchar *newtype;
-	GtkWidget *frame;
-	GtkWidget *apply;
-	GtkWidget *cancel;
-	GtkOptionMenu *optionlist;
-};
-
-#if 0
-static gchar *
-describe_reconfigure_folder (gpointer in_data, gboolean gerund)
-{
-	reconfigure_folder_input_t *input = (reconfigure_folder_input_t *) in_data;
-
-	if (gerund)
-		return g_strdup_printf (_("Changing folder \"%s\" to \"%s\" format"),
-					input->fb->uri,
-					input->newtype);
-	else
-		return g_strdup_printf (_("Change folder \"%s\" to \"%s\" format"),
-					input->fb->uri,
-					input->newtype);
-}
-#endif
-
-static void
-reconfigure_folder_reconfigure(struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-	MailLocalFolder *local_folder = NULL;
-	CamelStore *fromstore = NULL, *tostore = NULL;
-	char *fromurl = NULL, *tourl = NULL;
-	CamelFolder *fromfolder = NULL, *tofolder = NULL;
-	GPtrArray *uids;
-	int i;
-	char *metapath;
-	char *tmpname;
-	CamelURL *url = NULL;
-	struct _local_meta *meta = NULL;
-	guint32 flags;
-
-	d(printf("reconfiguring folder: %s to type %s\n", m->fb->uri, m->newtype));
-
-	mail_status_start(_("Reconfiguring folder"));
-
-	/* NOTE: This var is cleared by the folder_browser via the set_uri method */
-	m->fb->reconfigure = TRUE;
-
-	/* get the actual location of the mailbox */
-	url = camel_url_new(m->fb->uri, &mm->ex);
-	if (camel_exception_is_set(&mm->ex)) {
-		g_warning("%s is not a workable url!", m->fb->uri);
-		goto cleanup;
-	}
-
-	tmpname = strchr (m->fb->uri, '/');
-	if (tmpname) {
-		while (*tmpname == '/')
-			tmpname++;
-		local_folder = g_hash_table_lookup (local_store->folders, tmpname);
-	} else
-		local_folder = NULL;
-	if (!local_folder) {
-		g_warning("%s is not a registered local folder!", m->fb->uri);
-		goto cleanup;
-	}
-
-	metapath = g_strdup_printf("%s/local-metadata.xml", url->path);
-	meta = load_metainfo(metapath);
-	g_free(metapath);
-
-	/* first, 'close' the old folder */
-	update_progress(_("Closing current folder"), 0.0);
-	camel_folder_sync(local_folder->folder, FALSE, &mm->ex);
-	camel_object_unhook_event(CAMEL_OBJECT (local_folder->folder),
-				  "folder_changed", local_folder_changed_proxy,
-				  local_folder);
-	camel_object_unhook_event(CAMEL_OBJECT (local_folder->folder),
-				  "message_changed", local_folder_changed_proxy,
-				  local_folder);
-	/* Once for the FolderBrowser, once for the local store */
-	camel_object_unref(CAMEL_OBJECT(local_folder->folder));
-	camel_object_unref(CAMEL_OBJECT(local_folder->folder));
-	local_folder->folder = m->fb->folder = NULL;
-
-	camel_url_set_protocol (url, meta->format);
-	fromurl = camel_url_to_string (url, FALSE);
-	camel_url_set_protocol (url, m->newtype);
-	tourl = camel_url_to_string (url, FALSE);
-
-	d(printf("opening stores %s and %s\n", fromurl, tourl));
-
-	fromstore = camel_session_get_store(session, fromurl, &mm->ex);
-
-	if (camel_exception_is_set(&mm->ex))
-		goto cleanup;
-
-	tostore = camel_session_get_store(session, tourl, &mm->ex);
-	if (camel_exception_is_set(&mm->ex))
-		goto cleanup;
-
-	/* rename the old mbox and open it again, without indexing */
-	tmpname = g_strdup_printf("%s_reconfig", meta->name);
-	d(printf("renaming %s to %s, and opening it\n", meta->name, tmpname));
-	update_progress(_("Renaming old folder and opening"), 0.0);
-
-	camel_store_rename_folder(fromstore, meta->name, tmpname, &mm->ex);
-	if (camel_exception_is_set(&mm->ex)) {
-		goto cleanup;
-	}
-	
-	/* we dont need to set the create flag ... or need an index if it has one */
-	fromfolder = camel_store_get_folder(fromstore, tmpname, 0, &mm->ex);
-	if (fromfolder == NULL || camel_exception_is_set(&mm->ex)) {
-		/* try and recover ... */
-		camel_exception_clear (&mm->ex);
-		camel_store_rename_folder(fromstore, tmpname, meta->name, &mm->ex);
-		goto cleanup;
-	}
-
-	/* create a new mbox */
-	d(printf("Creating the destination mbox\n"));
-	update_progress(_("Creating new folder"), 0.0);
-
-	flags = CAMEL_STORE_FOLDER_CREATE;
-	if (meta->indexed)
-		flags |= CAMEL_STORE_FOLDER_BODY_INDEX;
-	tofolder = camel_store_get_folder(tostore, meta->name, flags, &mm->ex);
-	if (tofolder == NULL || camel_exception_is_set(&mm->ex)) {
-		d(printf("cannot open destination folder\n"));
-		/* try and recover ... */
-		camel_exception_clear (&mm->ex);
-		camel_store_rename_folder(fromstore, tmpname, meta->name, &mm->ex);
-		goto cleanup;
-	}
-
-	update_progress(_("Copying messages"), 0.0);
-	uids = camel_folder_get_uids(fromfolder);
-	for (i=0;i<uids->len;i++) {
-		mail_statusf("Copying message %d of %d", i, uids->len);
-		camel_folder_move_message_to(fromfolder, uids->pdata[i], tofolder, &mm->ex);
-		if (camel_exception_is_set(&mm->ex)) {
-			camel_folder_free_uids(fromfolder, uids);
-			goto cleanup;
-		}
-	}
-	camel_folder_free_uids(fromfolder, uids);
-	camel_folder_expunge(fromfolder, &mm->ex);
-
-	d(printf("delete old mbox ...\n"));
-	camel_store_delete_folder(fromstore, tmpname, &mm->ex);
-
-	/* switch format */
-	g_free(meta->format);
-	meta->format = g_strdup(m->newtype);
-	if (save_metainfo(meta) == -1) {
-		camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot save folder metainfo; "
-					"you'll probably find you can't\n"
-					"open this folder anymore: %s"),
-				      tourl);
-	}
-
- cleanup:
-	if (local_folder && !local_folder->folder) {
-		struct _register_msg *rm = mail_msg_new(&register_folder_op, NULL, sizeof(*m));
-
-		/* fake the internal part of this operation, nasty hackish thing */
-		rm->local_folder = local_folder;
-		register_folder_register((struct _mail_msg *)rm);
-		rm->local_folder = NULL;
-		mail_msg_free((struct _mail_msg *)rm);
-	}
-	if (tofolder)
-		camel_object_unref (CAMEL_OBJECT (tofolder));
-	if (fromfolder)
-		camel_object_unref (CAMEL_OBJECT (fromfolder));
-	if (fromstore)
-		camel_object_unref (CAMEL_OBJECT (fromstore));
-	if (tostore)
-		camel_object_unref (CAMEL_OBJECT (tostore));
-	if (meta)
-		free_metainfo(meta);
-	g_free(fromurl);
-	g_free(tourl);
-	if (url)
-		camel_url_free (url);
-}
-
-static void
-reconfigure_folder_reconfigured(struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-	char *uri;
-
-	if (camel_exception_is_set(&mm->ex)) {
-		gnome_error_dialog (_("If you can no longer open this mailbox, then\n"
-				      "you may need to repair it manually."));
-	}
-
-	/* force a reload of the newly formatted folder */
-	d(printf("opening new source\n"));
-	uri = g_strdup(m->fb->uri);
-	folder_browser_set_uri(m->fb, uri);
-	g_free(uri);
-}
-
-static void
-reconfigure_folder_free(struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-
-	gtk_object_unref (GTK_OBJECT (m->fb));
-	g_free (m->newtype);
-}
-
-static struct _mail_msg_op reconfigure_folder_op = {
-	NULL,
-	reconfigure_folder_reconfigure,
-	reconfigure_folder_reconfigured,
-	reconfigure_folder_free,
-};
-
-static void
-reconfigure_clicked(GnomeDialog *d, int button, struct _reconfigure_msg *m)
-{
-	if (button == 0) {
-		GtkMenu *menu;
-		int type;
-		char *types[] = { "mbox", "maildir", "mh" };
-
-		menu = (GtkMenu *)gtk_option_menu_get_menu(m->optionlist);
-		type = g_list_index(GTK_MENU_SHELL(menu)->children, gtk_menu_get_active(menu));
-		if (type < 0 || type > 2)
-			type = 0;
-
-		gtk_widget_set_sensitive(m->frame, FALSE);
-		gtk_widget_set_sensitive(m->apply, FALSE);
-		gtk_widget_set_sensitive(m->cancel, FALSE);
-
-		m->newtype = g_strdup (types[type]);
-		e_thread_put(mail_thread_queued, (EMsg *)m);
-	} else
-		mail_msg_free((struct _mail_msg *)m);
-
-	if (button != -1)
-		gnome_dialog_close(d);
-}
-
-void
-mail_local_reconfigure_folder(FolderBrowser *fb)
-{
-	CamelStore *store;
-	GladeXML *gui;
-	GnomeDialog *gd;
-	struct _reconfigure_msg *m;
-
-	if (fb->folder == NULL) {
-		g_warning("Trying to reconfigure nonexistant folder");
-		return;
-	}
-
-	m = mail_msg_new(&reconfigure_folder_op, NULL, sizeof(*m));
-	store = camel_folder_get_parent_store(fb->folder);
-
-	gui = glade_xml_new(EVOLUTION_GLADEDIR "/local-config.glade", "dialog_format");
-	gd = (GnomeDialog *)glade_xml_get_widget (gui, "dialog_format");
-
-	m->frame = glade_xml_get_widget (gui, "frame_format");
-	m->apply = glade_xml_get_widget (gui, "apply_format");
-	m->cancel = glade_xml_get_widget (gui, "cancel_format");
-	m->optionlist = (GtkOptionMenu *)glade_xml_get_widget (gui, "option_format");
-	m->newtype = NULL;
-	m->fb = fb;
-	gtk_object_ref((GtkObject *)fb);
-
-	gtk_label_set_text((GtkLabel *)glade_xml_get_widget (gui, "label_format"),
-			   ((CamelService *)store)->url->protocol);
-
-	gtk_signal_connect((GtkObject *)gd, "clicked", reconfigure_clicked, m);
-	gtk_object_unref((GtkObject *)gui);
-
-	gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-}
diff --git a/mail/mail-local.h b/mail/mail-local.h
deleted file mode 100644
index 254fcbe4f6..0000000000
--- a/mail/mail-local.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-local.h: Local mailbox support. */
-
-/* 
- * Authors: 
- *  Michael Zucchi <NotZed@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _MAIL_LOCAL_H
-#define _MAIL_LOCAL_H
-
-#include "evolution-shell-client.h"
-#include "folder-browser.h"
-
-void mail_local_storage_startup (EvolutionShellClient *shellclient,
-				 const char *evolution_path);
-
-void mail_local_reconfigure_folder (FolderBrowser *fb);
-
-#endif
diff --git a/mail/mail-mlist-magic.c b/mail/mail-mlist-magic.c
deleted file mode 100644
index 8fb588d701..0000000000
--- a/mail/mail-mlist-magic.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-mlist-magic.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <ctype.h>
-
-#include "camel.h"
-
-#include "mail-mlist-magic.h"
-
-/* FIXME: This really should just use regexps... */
-
-
-/* Utility functions.  */
-
-static char *
-extract_until_at_sign (const char *s)
-{
-	const char *at_sign;
-
-	at_sign = strchr (s, '@');
-	if (at_sign == NULL)
-		return g_strdup (s);
-
-	if (at_sign == s)
-		return NULL;
-
-	return g_strndup (s, at_sign - s);
-}
-
-static const char *
-get_header (CamelMimeMessage *message,
-	    const char *header_name)
-{
-	const char *value;
-
-	value = camel_medium_get_header (CAMEL_MEDIUM (message), header_name);
-	if (value == NULL)
-		return NULL;
-
-	/* FIXME: Correct?  */
-	while (isspace ((int) *value))
-		value++;
-
-	return value;
-}
-
-
-/* The checks.  */
-
-/* Sender: (owner-([^@]+)|([^@+]-owner)@ */
-static char *
-check_sender (CamelMimeMessage *message,
-	      const char **header_name_return,
-	      char **header_value_return)
-{
-	const char *value;
-	char *owner, *list_name;
-
-	value = get_header (message, "Sender");
-	if (value == NULL)
-		return NULL;
-
-	owner = strstr (value, "owner");
-	if (!owner)
-		return NULL;
-
-	if (owner == value && value[5] == '-' && value[6] && value[6] != '@')
-		list_name = extract_until_at_sign (value + 6);
-	else if (owner > value + 1 && *(owner - 1) == '-' && owner[5] == '@')
-		list_name = g_strndup (value, owner - 1 - value);
-	else
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "Sender";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-	return list_name;
-}
-   
-/* X-BeenThere: ([^@]+) */
-static char *
-check_x_been_there (CamelMimeMessage *message,
-		    const char **header_name_return,
-		    char **header_value_return)
-{
-	const char *value;
-
-	value = get_header (message, "X-BeenThere");
-	if (value == NULL || *value == '@')
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "X-BeenThere";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-
-	return extract_until_at_sign (value);
-}
-   
-/* Delivered-To: mailing list ([^@]+) */
-static char *
-check_delivered_to (CamelMimeMessage *message,
-		    const char **header_name_return,
-		    char **header_value_return)
-{
-	const char *value;
-
-	value = get_header (message, "Delivered-To");
-	if (value == NULL)
-		return NULL;
-
-	/* FIXME uh? */
-	if (strncmp (value, "mailing list ", 13) != 0)
-		return NULL;
-
-	if (value[13] == '\0' || value[13] == '@')
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "Delivered-To";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-	return extract_until_at_sign (value + 13);
-}
-   
-/* X-Mailing-List: <([^@]+) */
-static char *
-check_x_mailing_list (CamelMimeMessage *message,
-		      const char **header_name_return,
-		      char **header_value_return)
-{
-	const char *value;
-	int value_length;
-
-	value = get_header (message, "X-Mailing-List");
-	if (value == NULL)
-		return NULL;
-
-	if (value[0] != '<' || value[1] == '\0' || value[1] == '@')
-		return NULL;
-
-	value_length = strlen (value);
-	if (value[value_length - 1] != '>')
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "X-Mailing-List";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-	return extract_until_at_sign (value + 1);
-}
-   
-/* X-Loop: ([^@]+) */
-static char *
-check_x_loop (CamelMimeMessage *message,
-	      const char **header_name_return,
-	      char **header_value_return)
-{
-	const char *value;
-
-	value = get_header (message, "X-Loop");
-	if (value == NULL)
-		return NULL;
-
-	if (*value == '\0' || *value == '@')
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "X-Loop";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-
-	return extract_until_at_sign (value);
-}
-
-/* List-Post: <mailto:([^@]+) */
-static char *
-check_list_post (CamelMimeMessage *message,
-		 const char **header_name_return,
-		 char **header_value_return)
-{
-	const char *value;
-	int value_length;
-
-	value = get_header (message, "List-Post");
-	if (value == NULL)
-		return NULL;
-
-	if (strncmp (value, "<mailto:", 8) != 0 || value[8] == '@')
-		return NULL;
-
-	value_length = strlen (value);
-	if (value[value_length - 1] != '>')
-		return NULL;
-
-	if (header_name_return != NULL)
-		*header_name_return = "List-Post";
-	if (header_value_return != NULL)
-		*header_value_return = g_strdup (value);
-	return extract_until_at_sign (value + 8);
-}
-
-typedef char *(*MagicDetectorFunc) (CamelMimeMessage *, const char **, char **);
-
-MagicDetectorFunc magic_detector[] = {
-	check_sender,
-	check_x_been_there,
-	check_delivered_to,
-	check_x_mailing_list,
-	check_x_loop,
-	check_list_post
-};
-static const int num_detectors = sizeof (magic_detector) / sizeof (magic_detector[0]);
-
-
-/**
- * mail_mlist_magic_detect_list:
- * @message:
- * @header_name_return:
- * @header_value_return:
- * 
- * Detect if message was delivered by a mailing list.
- * 
- * Return value: The name of the mailing list, if the message appears to be
- * sent from a mailing list.  NULL otherwise.
- **/
-char *
-mail_mlist_magic_detect_list (CamelMimeMessage *message,
-			      const char **header_name_return,
-			      char **header_value_return)
-{
-	char *list_name;
-	int i;
-
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-
-	for (i = 0; i < num_detectors; i++) {
-		list_name = magic_detector[i] (message, header_name_return, header_value_return);
-		if (list_name != NULL)
-			return list_name;
-	}
-
-	return NULL;
-}
diff --git a/mail/mail-mlist-magic.h b/mail/mail-mlist-magic.h
deleted file mode 100644
index dcfe3f4bfc..0000000000
--- a/mail/mail-mlist-magic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-mlist-magic.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef MAIL_MLIST_MAGIC_H
-#define MAIL_MLIST_MAGIC_H
-
-#include "camel.h"
-
-char *mail_mlist_magic_detect_list  (CamelMimeMessage  *message,
-				     const char       **header_name_return,
-				     char             **header_value_return);
-
-#endif
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
deleted file mode 100644
index 73cec2126d..0000000000
--- a/mail/mail-mt.c
+++ /dev/null
@@ -1,993 +0,0 @@
-
-#include <stdio.h>
-#include <unistd.h>
-
-#include "e-util/e-msgport.h"
-#include "camel/camel-operation.h"
-#include <glib.h>
-#include <pthread.h>
-
-#include "mail-mt.h"
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "folder-browser-factory.h"
-
-#include <libgnomeui/gnome-dialog.h>
-#include <gtk/gtkprogress.h>
-
-/*#define MALLOC_CHECK*/
-#define d(x) 
-
-static void set_view_data(const char *current_message, int busy);
-static void set_stop(int sensitive);
-static void mail_enable_stop(void);
-static void mail_disable_stop(void);
-static void mail_operation_status(struct _CamelOperation *op, const char *what, int pc, void *data);
-
-#define MAIL_MT_LOCK(x) pthread_mutex_lock(&x)
-#define MAIL_MT_UNLOCK(x) pthread_mutex_unlock(&x)
-
-/* background operation status stuff */
-struct _mail_msg_priv {
-	GtkProgressBar *bar;
-	GtkLabel *label;
-
-	/* for pending requests, before timeout_id is activated (then bar will be ! NULL) */
-	char *what;
-	int pc;
-	int timeout_id;
-};
-
-static GtkWindow *progress_dialogue;
-static int progress_row;
-
-/* mail_msg stuff */
-static unsigned int mail_msg_seq; /* sequence number of each message */
-static GHashTable *mail_msg_active; /* table of active messages, must hold mail_msg_lock to access */
-static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER;
-
-pthread_t mail_gui_thread;
-
-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
-{
-	struct _mail_msg *msg;
-
-	MAIL_MT_LOCK(mail_msg_lock);
-
-	msg = g_malloc0(size);
-	msg->ops = ops;
-	msg->seq = mail_msg_seq++;
-	msg->msg.reply_port = reply_port;
-	msg->cancel = camel_operation_new(mail_operation_status, (void *)msg->seq);
-	camel_exception_init(&msg->ex);
-	msg->priv = g_malloc0(sizeof(*msg->priv));
-
-	g_hash_table_insert(mail_msg_active, (void *)msg->seq, msg);
-
-	d(printf("New message %p\n", msg));
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	return msg;
-}
-
-/* either destroy the progress (in event_data), or the whole dialogue (in data) */
-static void destroy_widgets(CamelObject *o, void *event_data, void *data)
-{
-	if (data)
-		gtk_widget_destroy((GtkWidget *)data);
-	if (event_data)
-		gtk_widget_destroy((GtkWidget *)event_data);
-}
-
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-void mail_msg_free(void *msg)
-{
-	struct _mail_msg *m = msg;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-	d(printf("Free message %p\n", msg));
-
-	if (m->ops->destroy_msg)
-		m->ops->destroy_msg(m);
-
-	MAIL_MT_LOCK(mail_msg_lock);
-
-	g_hash_table_remove(mail_msg_active, (void *)m->seq);
-	pthread_cond_broadcast(&mail_msg_cond);
-
-	/* this closes the bar, and/or the whole progress dialogue, once we're out of things to do */
-	if (g_hash_table_size(mail_msg_active) == 0) {
-		if (progress_dialogue != NULL) {
-			void *data = progress_dialogue;
-			progress_dialogue = NULL;
-			progress_row = 0;
-			mail_proxy_event(destroy_widgets, NULL, data, NULL);
-		}
-	} else if (m->priv->bar) {
-		mail_proxy_event(destroy_widgets, NULL, m->priv->bar, m->priv->label);
-	}
-
-	if (m->priv->timeout_id > 0)
-		gtk_timeout_remove(m->priv->timeout_id);
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	camel_operation_unref(m->cancel);
-	camel_exception_clear(&m->ex);
-	g_free(m->priv->what);
-	g_free(m->priv);
-	g_free(m);
-}
-
-void mail_msg_check_error(void *msg)
-{
-	struct _mail_msg *m = msg;
-	char *what = NULL;
-	char *text;
-	GnomeDialog *gd;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-
-	if (!camel_exception_is_set(&m->ex)
-	    || m->ex.id == CAMEL_EXCEPTION_USER_CANCEL)
-		return;
-
-	if (m->ops->describe_msg)
-		what = m->ops->describe_msg(m, FALSE);
-
-	if (what)
-		text = g_strdup_printf(_("Error while '%s':\n%s"), what, camel_exception_get_description(&m->ex));
-	else
-		text = g_strdup_printf(_("Error while performing operation:\n%s"), camel_exception_get_description(&m->ex));
-
-	gd = (GnomeDialog *)gnome_error_dialog(text);
-	gnome_dialog_run_and_close(gd);
-	g_free(text);
-}
-
-void mail_msg_cancel(unsigned int msgid)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(mail_msg_lock);
-	m = g_hash_table_lookup(mail_msg_active, (void *)msgid);
-
-	if (m)
-		camel_operation_cancel(m->cancel);
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-}
-
-
-/* waits for a message to be finished processing (freed)
-   the messageid is from struct _mail_msg->seq */
-void mail_msg_wait(unsigned int msgid)
-{
-	struct _mail_msg *m;
-	int ismain = pthread_self() == mail_gui_thread;
-
-	if (ismain) {
-		MAIL_MT_LOCK(mail_msg_lock);
-		m = g_hash_table_lookup(mail_msg_active, (void *)msgid);
-		while (m) {
-			MAIL_MT_UNLOCK(mail_msg_lock);
-			gtk_main_iteration();
-			MAIL_MT_LOCK(mail_msg_lock);
-			m = g_hash_table_lookup(mail_msg_active, (void *)msgid);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	} else {
-		MAIL_MT_LOCK(mail_msg_lock);
-		m = g_hash_table_lookup(mail_msg_active, (void *)msgid);
-		while (m) {
-			pthread_cond_wait(&mail_msg_cond, &mail_msg_lock);
-			m = g_hash_table_lookup(mail_msg_active, (void *)msgid);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	}
-}
-
-EMsgPort		*mail_gui_port;
-static GIOChannel	*mail_gui_channel;
-EMsgPort		*mail_gui_reply_port;
-static GIOChannel	*mail_gui_reply_channel;
-
-/* a couple of global threads available */
-EThread *mail_thread_queued;	/* for operations that can (or should) be queued */
-EThread *mail_thread_new;	/* for operations that should run in a new thread each time */
-
-static gboolean
-mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d)
-{
-	EMsgPort *port = (EMsgPort *)d;
-	mail_msg_t *m;
-
-	while (( m = (mail_msg_t *)e_msgport_get(port))) {
-
-#ifdef MALLOC_CHECK
-		checkmem(m);
-		checkmem(m->cancel);
-		checkmem(m->priv);
-#endif
-
-		if (m->ops->reply_msg)
-			m->ops->reply_msg(m);
-		mail_msg_check_error(m);
-		if (m->ops->describe_msg)
-			mail_status_end();
-		mail_msg_free(m);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d)
-{
-	EMsgPort *port = (EMsgPort *)d;
-	mail_msg_t *m;
-
-	while (( m = (mail_msg_t *)e_msgport_get(port))) {
-#ifdef MALLOC_CHECK
-		checkmem(m);
-		checkmem(m->cancel);
-		checkmem(m->priv);
-#endif
-		if (m->ops->describe_msg) {
-			char *text = m->ops->describe_msg(m, FALSE);
-			mail_status_start(text);
-			g_free(text);
-		}
-		if (m->ops->receive_msg)
-			m->ops->receive_msg(m);
-		if (m->msg.reply_port)
-			e_msgport_reply((EMsg *)m);
-		else {
-			if (m->ops->reply_msg)
-				m->ops->reply_msg(m);
-			if (m->ops->describe_msg)
-				mail_status_end();
-			mail_msg_free(m);
-		}
-	}
-
-	return TRUE;
-}
-
-static void
-mail_msg_destroy(EThread *e, EMsg *msg, void *data)
-{
-	mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif	
-
-	if (m->ops->describe_msg)
-		mail_status_end();
-	mail_msg_free(m);
-}
-
-static void
-mail_msg_received(EThread *e, EMsg *msg, void *data)
-{
-	mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-
-	if (m->ops->describe_msg) {
-		char *text = m->ops->describe_msg(m, FALSE);
-		d(printf("message received at thread\n"));
-		mail_status_start(text);
-		g_free(text);
-	}
-
-	if (m->ops->receive_msg) {
-		mail_enable_stop();
-		m->ops->receive_msg(m);
-		mail_disable_stop();
-	}
-}
-
-static void mail_msg_cleanup(void)
-{
-	e_thread_destroy(mail_thread_queued);
-	e_thread_destroy(mail_thread_new);
-
-	e_msgport_destroy(mail_gui_port);
-	e_msgport_destroy(mail_gui_reply_port);
-
-	/* FIXME: channels too, etc */
-}
-
-void mail_msg_init(void)
-{
-	mail_gui_reply_port = e_msgport_new();
-	mail_gui_reply_channel = g_io_channel_unix_new(e_msgport_fd(mail_gui_reply_port));
-	g_io_add_watch(mail_gui_reply_channel, G_IO_IN, mail_msgport_replied, mail_gui_reply_port);
-
-	mail_gui_port = e_msgport_new();
-	mail_gui_channel = g_io_channel_unix_new(e_msgport_fd(mail_gui_port));
-	g_io_add_watch(mail_gui_channel, G_IO_IN, mail_msgport_received, mail_gui_port);
-
-	mail_thread_queued = e_thread_new(E_THREAD_QUEUE);
-	e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0);
-	e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0);
-	e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port);
-
-	mail_thread_new = e_thread_new(E_THREAD_NEW);
-	e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0);
-	e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0);
-	e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port);
-
-	mail_msg_active = g_hash_table_new(NULL, NULL);
-	mail_gui_thread = pthread_self();
-
-	atexit(mail_msg_cleanup);
-}
-
-/* ********************************************************************** */
-
-struct _set_msg {
-	struct _mail_msg msg;
-	char *text;
-};
-
-/* locks */
-static pthread_mutex_t status_lock = PTHREAD_MUTEX_INITIALIZER;
-#define STATUS_BUSY_PENDING (2)
-
-/* blah blah */
-
-#define STATUS_DELAY (5)
-
-static int status_depth;
-static int status_showing;
-static int status_shown;
-static char *status_message_next;
-static int status_message_clear;
-static int status_timeout_id;
-/*static int status_busy;*/
-
-struct _status_msg {
-	struct _mail_msg msg;
-	char *text;
-	int busy;
-};
-
-static gboolean
-status_timeout(void *data)
-{
-	char *msg;
-	int busy = 0;
-
-	d(printf("got status timeout\n"));
-
-	MAIL_MT_LOCK(status_lock);
-	if (status_message_next) {
-		d(printf("setting message to '%s' busy %d\n", status_message_next, status_busy));
-		msg = status_message_next;
-		status_message_next = NULL;
-		busy = status_depth > 0;
-		status_message_clear = 0;
-		MAIL_MT_UNLOCK(status_lock);
-
-		/* copy msg so we can set it outside the lock */
-		/* unset first is a hack to avoid the stack stuff that doesn't and can't work anyway */
-		if (status_shown)
-			set_view_data(NULL, FALSE);
-		status_shown = TRUE;
-		set_view_data(msg, busy);
-		g_free(msg);
-		return TRUE;
-	}
-
-	/* the delay-clear stuff doesn't work yet.  Dont care ... */
-
-	status_showing = FALSE;
-	status_message_clear++;
-	if (status_message_clear >= STATUS_DELAY && status_depth==0) {
-		d(printf("clearing message, busy = %d\n", status_depth));
-	} else {
-		d(printf("delaying clear\n"));
-		MAIL_MT_UNLOCK(status_lock);
-		return TRUE;
-	}
-
-	status_timeout_id = 0;
-
-	MAIL_MT_UNLOCK(status_lock);
-
-	if (status_shown)
-		set_view_data(NULL, FALSE);
-	status_shown = FALSE;
-
-	return FALSE;
-}
-
-static void do_set_status(struct _mail_msg *mm)
-{
-	struct _status_msg *m = (struct _status_msg *)mm;
-
-	MAIL_MT_LOCK(status_lock);
-
-	if (status_timeout_id != 0)
-		gtk_timeout_remove(status_timeout_id);
-
-	status_timeout_id = gtk_timeout_add(500, status_timeout, 0);
-	status_message_clear = 0;
-
-	MAIL_MT_UNLOCK(status_lock);
-
-	/* the 'clear' stuff doesn't really work yet, but oh well,
-	   this stuff here needs a little changing for it to work */
-	if (status_shown)
-		set_view_data(NULL, status_depth != 0);
-	status_shown = 0;
-
-	if (m->text) {
-		status_shown = 1;
-		set_view_data(m->text, status_depth != 0);
-	}
-}
-
-static void do_del_status(struct _mail_msg *mm)
-{
-	struct _status_msg *m = (struct _status_msg *)mm;
-
-	g_free(m->text);
-}
-
-struct _mail_msg_op set_status_op = {
-	NULL,
-	do_set_status,
-	NULL,
-	do_del_status,
-};
-
-/* start a new operation */
-void mail_status_start(const char *msg)
-{
-	struct _status_msg *m = NULL;
-
-	MAIL_MT_LOCK(status_lock);
-	status_depth++;
-	MAIL_MT_UNLOCK(status_lock);
-
-	if (msg == NULL || msg[0] == 0)
-		msg = _("Working");
-
-	m = mail_msg_new(&set_status_op, NULL, sizeof(*m));
-	m->text = g_strdup(msg);
-	m->busy = TRUE;
-
-	e_msgport_put(mail_gui_port, &m->msg.msg);
-}
-
-/* end it */
-void mail_status_end(void)
-{
-	struct _status_msg *m = NULL;
-
-	m = mail_msg_new(&set_status_op, NULL, sizeof(*m));
-	m->text = NULL;
-
-	MAIL_MT_LOCK(status_lock);
-	status_depth--;
-	m->busy = status_depth = 0;
-	MAIL_MT_UNLOCK(status_lock);
-
-	e_msgport_put(mail_gui_port, &m->msg.msg);
-}
-
-/* message during it */
-void mail_status(const char *msg)
-{
-	if (msg == NULL || msg[0] == 0)
-		msg = _("Working");
-
-	MAIL_MT_LOCK(status_lock);
-
-	g_free(status_message_next);
-	status_message_next = g_strdup(msg);
-
-	MAIL_MT_UNLOCK(status_lock);
-}
-
-void mail_statusf(const char *fmt, ...)
-{
-	va_list ap;
-	char *text;
-
-	va_start(ap, fmt);
-	text = g_strdup_vprintf(fmt, ap);
-	va_end(ap);
-	mail_status(text);
-	g_free(text);
-}
-
-/* ********************************************************************** */
-
-struct _pass_msg {
-	struct _mail_msg msg;
-	char *prompt;
-	int secret;
-	char *result;
-};
-
-/* libgnomeui's idea of an api/gui is very weird ... hence this dumb hack */
-static void focus_on_entry(GtkWidget *widget, void *user_data)
-{
-	if (GTK_IS_ENTRY(widget))
-		gtk_widget_grab_focus(widget);
-}
-
-static void pass_got(char *string, void *data)
-{
-	struct _pass_msg *m = data;
-
-	if (string)
-		m->result = g_strdup (string);
-}
-
-static void
-do_get_pass(struct _mail_msg *mm)
-{
-	struct _pass_msg *m = (struct _pass_msg *)mm;
-	GtkWidget *dialogue;
-
-	/* this api is just awful ... hence the hacks */
-	dialogue = gnome_request_dialog(m->secret, m->prompt, NULL,
-					0, pass_got, m, NULL);
-	e_container_foreach_leaf((GtkContainer *)dialogue, focus_on_entry, NULL);
-
-	/* hrm, we can't run this async since the gui_port from which we're called
-	   will reply to our message for us */
-	gnome_dialog_run_and_close((GnomeDialog *)dialogue);
-
-	/*gtk_widget_show(dialogue);*/
-}
-
-static void
-do_free_pass(struct _mail_msg *mm)
-{
-	/*struct _pass_msg *m = (struct _pass_msg *)mm;*/
-
-	/* the string is passed out so we dont need to free it */
-}
-
-struct _mail_msg_op get_pass_op = {
-	NULL,
-	do_get_pass,
-	NULL,
-	do_free_pass,
-};
-
-/* returns the password, or NULL if cancelled */
-char *
-mail_get_password(char *prompt, gboolean secret)
-{
-	char *ret;
-	struct _pass_msg *m, *r;
-	EMsgPort *pass_reply;
-
-	pass_reply = e_msgport_new();
-
-	m = mail_msg_new(&get_pass_op, pass_reply, sizeof(*m));
-
-	m->prompt = prompt;
-	m->secret = secret;
-
-	if (pthread_self() == mail_gui_thread) {
-		do_get_pass((struct _mail_msg *)m);
-		r = m;
-	} else {
-		static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-
-		/* we want this single-threaded, this is the easiest way to do it without blocking ? */
-		pthread_mutex_lock(&lock);
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-		e_msgport_wait(pass_reply);
-		r = (struct _pass_msg *)e_msgport_get(pass_reply);
-		pthread_mutex_unlock(&lock);
-	}
-
-	g_assert(r == m);
-
-	ret = m->result;
-	
-	mail_msg_free(m);
-	e_msgport_destroy(pass_reply);
-
-	return ret;
-}
-
-/* ******************** */
-
-struct _proxy_msg {
-	struct _mail_msg msg;
-	CamelObjectEventHookFunc func;
-	CamelObject *o;
-	void *event_data;
-	void *data;
-};
-
-static void
-do_proxy_event(struct _mail_msg *mm)
-{
-	struct _proxy_msg *m = (struct _proxy_msg *)mm;
-
-	m->func(m->o, m->event_data, m->data);
-}
-
-struct _mail_msg_op proxy_event_op = {
-	NULL,
-	do_proxy_event,
-	NULL,
-	NULL,
-};
-
-int mail_proxy_event(CamelObjectEventHookFunc func, CamelObject *o, void *event_data, void *data)
-{
-	struct _proxy_msg *m;
-	int id;
-	int ismain = pthread_self() == mail_gui_thread;
-
-	if (ismain) {
-		func(o, event_data, data);
-		/* id of -1 is 'always finished' */
-		return -1;
-	} else {
-		/* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */
-		m = mail_msg_new(&proxy_event_op, NULL, sizeof(*m));
-		m->func = func;
-		m->o = o;
-		m->event_data = event_data;
-		m->data = data;
-		
-		id = m->msg.seq;
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-		return id;
-	}
-}
-
-/* ********************************************************************** */
-/* locked via status_lock */
-static int busy_state;
-
-static void do_set_busy(struct _mail_msg *mm)
-{
-	set_stop(busy_state > 0);
-}
-
-struct _mail_msg_op set_busy_op = {
-	NULL,
-	do_set_busy,
-	NULL,
-	NULL,
-};
-
-static void mail_enable_stop(void)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(status_lock);
-	busy_state++;
-	if (busy_state == 1) {
-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-	}
-	MAIL_MT_UNLOCK(status_lock);
-}
-
-static void mail_disable_stop(void)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(status_lock);
-	busy_state--;
-	if (busy_state == 0) {
-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-	}
-	MAIL_MT_UNLOCK(status_lock);
-}
-
-/* ******************************************************************************** */
-
-struct _op_status_msg {
-	struct _mail_msg msg;
-
-	struct _CamelOperation *op;
-	char *what;
-	int pc;
-	void *data;
-};
-
-GtkTable *progress_table;
-
-static int op_status_timeout(void *d)
-{
-	int id = (int)d;
-	struct _mail_msg *msg;
-	struct _mail_msg_priv *data;
-	
-	MAIL_MT_LOCK(mail_msg_lock);
-
-	msg = g_hash_table_lookup(mail_msg_active, (void *)id);
-	if (msg == NULL) {
-		MAIL_MT_UNLOCK(mail_msg_lock);
-		return FALSE;
-	}
-
-	data = msg->priv;
-
-	if (progress_dialogue == NULL) {
-		progress_dialogue = (GtkWindow *)gtk_window_new(GTK_WINDOW_DIALOG);
-		gtk_window_set_title(progress_dialogue, _("Evolution progress"));
-		gtk_window_set_policy(progress_dialogue, 0, 0, 1);
-		gtk_window_set_position(progress_dialogue, GTK_WIN_POS_CENTER);
-		progress_table = (GtkTable *)gtk_table_new(1, 2, FALSE);
-		gtk_container_add((GtkContainer *)progress_dialogue, (GtkWidget *)progress_table);
-	}
-
-	data->bar = (GtkProgressBar *)gtk_progress_bar_new();
-	gtk_progress_set_show_text((GtkProgress *)data->bar, TRUE);
-
-	gtk_progress_set_percentage((GtkProgress *)data->bar, (gfloat)(data->pc/100.0));
-	gtk_progress_set_format_string((GtkProgress *)data->bar, data->what);
-
-	if (msg->ops->describe_msg) {
-		char *desc = msg->ops->describe_msg(msg, FALSE);
-		data->label = (GtkLabel *)gtk_label_new(desc);
-		g_free(desc);
-	} else {
-		data->label = (GtkLabel *)gtk_label_new(_("Working"));
-	}
-
-	gtk_table_attach(progress_table, (GtkWidget *)data->label, 0, 1, progress_row, progress_row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-	gtk_table_attach(progress_table, (GtkWidget *)data->bar, 1, 2, progress_row, progress_row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-	progress_row++;
-	
-	gtk_widget_show_all((GtkWidget *)progress_table);
-	gtk_widget_show((GtkWidget *)progress_dialogue);
-
-	data->timeout_id = -1;
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	return FALSE;
-}
-
-static void do_op_status(struct _mail_msg *mm)
-{
-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
-	struct _mail_msg *msg;
-	struct _mail_msg_priv *data;
-	char *out, *p, *o, c;
-
-	g_assert(mail_gui_thread == pthread_self());
-
-	MAIL_MT_LOCK(mail_msg_lock);
-
-	msg = g_hash_table_lookup(mail_msg_active, m->data);
-	if (msg == NULL) {
-		MAIL_MT_UNLOCK(mail_msg_lock);
-		return;
-	}
-
-	data = msg->priv;
-
-	out = alloca(strlen(m->what)*2+1);
-	o = out;
-	p = m->what;
-	while ((c = *p++)) {
-		if (c=='%')
-			*o++ = '%';
-		*o++ = c;
-	}
-	*o = 0;
-
-	if (data->timeout_id == 0) {
-		data->what = g_strdup(out);
-		data->pc = m->pc;
-		data->timeout_id = gtk_timeout_add(2000, op_status_timeout, m->data);
-		MAIL_MT_UNLOCK(mail_msg_lock);
-		return;
-	}
-
-	if (data->bar == NULL) {
-		g_free(data->what);
-		data->what = g_strdup(out);
-		data->pc = m->pc;
-		MAIL_MT_UNLOCK(mail_msg_lock);
-		return;
-	}
-
-	gtk_progress_set_percentage((GtkProgress *)data->bar, (gfloat)(m->pc/100.0));
-	gtk_progress_set_format_string((GtkProgress *)data->bar, out);
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-}
-
-static void do_op_status_free(struct _mail_msg *mm)
-{
-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
-
-	g_free(m->what);
-}
-
-struct _mail_msg_op op_status_op = {
-	NULL,
-	do_op_status,
-	NULL,
-	do_op_status_free,
-};
-
-static void
-mail_operation_status(struct _CamelOperation *op, const char *what, int pc, void *data)
-{
-	struct _op_status_msg *m;
-
-	d(printf("got operation statys: %s %d%%\n", what, pc));
-
-	m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
-	m->op = op;
-	m->what = g_strdup(what);
-	switch (pc) {
-	case CAMEL_OPERATION_START:
-		pc = 0;
-		break;
-	case CAMEL_OPERATION_END:
-		pc = 100;
-		break;
-	}
-	m->pc = pc;
-	m->data = data;
-	e_msgport_put(mail_gui_port, (EMsg *)m);
-}
-
-/* ******************** */
-
-/* FIXME FIXME FIXME This is a totally evil hack.  */
-
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	control_frame = bonobo_control_get_control_frame (control);
-
-	if (control_frame == NULL)
-		return CORBA_OBJECT_NIL;
-
-	CORBA_exception_init (&ev);
-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							       "IDL:GNOME/Evolution/ShellView:1.0",
-							       &ev);
-	CORBA_exception_free (&ev);
-
-	if (shell_view_interface != CORBA_OBJECT_NIL)
-		gtk_object_set_data (GTK_OBJECT (control),
-				     "mail_threads_shell_view_interface",
-				     shell_view_interface);
-	else
-		g_warning ("Control frame doesn't have Evolution/ShellView.");
-
-	return shell_view_interface;
-}
-
-static void
-set_view_data(const char *current_message, int busy)
-{
-	EList *controls;
-	EIterator *it;
-
-	controls = folder_browser_factory_get_control_list ();
-	for (it = e_list_get_iterator (controls); e_iterator_is_valid (it); e_iterator_next (it)) {
-		BonoboControl *control;
-		GNOME_Evolution_ShellView shell_view_interface;
-		CORBA_Environment ev;
-
-		control = BONOBO_CONTROL (e_iterator_get (it));
-
-		shell_view_interface = gtk_object_get_data (GTK_OBJECT (control), "mail_threads_shell_view_interface");
-
-		if (shell_view_interface == CORBA_OBJECT_NIL)
-			shell_view_interface = retrieve_shell_view_interface_from_control (control);
-
-		CORBA_exception_init (&ev);
-
-		if (shell_view_interface != CORBA_OBJECT_NIL) {
-			if ((current_message == NULL || current_message[0] == 0) && ! busy) {
-				d(printf("clearing msg\n"));
-				GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
-			} else {
-				d(printf("setting msg %s\n", current_message ? current_message : "(null)"));
-				GNOME_Evolution_ShellView_setMessage (shell_view_interface,
-								      current_message?current_message:"",
-								      busy,
-								      &ev);
-			}
-		}
-
-		CORBA_exception_free (&ev);
-
-		/* yeah we only set the first one.  Why?  Because it seems to leave
-		   random ones lying around otherwise.  Shrug. */
-		break;
-	}
-	gtk_object_unref(GTK_OBJECT(it));
-}
-
-static void
-set_stop(int sensitive)
-{
-	EList *controls;
-	EIterator *it;
-	static int last = FALSE;
-
-	if (last == sensitive)
-		return;
-
-	controls = folder_browser_factory_get_control_list ();
-	for (it = e_list_get_iterator (controls); e_iterator_is_valid (it); e_iterator_next (it)) {
-		BonoboControl *control;
-		BonoboUIComponent *uic;
-
-		control = BONOBO_CONTROL (e_iterator_get (it));
-		uic = bonobo_control_get_ui_component (control);
-		if (uic == CORBA_OBJECT_NIL || bonobo_ui_component_get_container(uic) == CORBA_OBJECT_NIL)
-			continue;
-
-		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", sensitive?"1":"0", NULL);
-	}
-	gtk_object_unref(GTK_OBJECT(it));
-	last = sensitive;
-}
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
deleted file mode 100644
index cc9f1be756..0000000000
--- a/mail/mail-mt.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _MAIL_MT
-#define _MAIL_MT
-
-#include <pthread.h>
-#include "camel/camel-exception.h"
-#include "e-util/e-msgport.h"
-#include "camel/camel-object.h"
-#include "camel/camel-operation.h"
-
-typedef struct _mail_msg {
-	EMsg msg;		/* parent type */
-	struct _mail_msg_op *ops; /* operation functions */
-	unsigned int seq;	/* seq number for synchronisation */
-	CamelOperation *cancel;	/* a cancellation/status handle */
-	CamelException ex;	/* an initialised camel exception, upto the caller to use this */
-	struct _mail_msg_priv *priv; /* private for internal use */
-} mail_msg_t;
-
-/* callback functions for thread message */
-typedef struct _mail_msg_op {
-	char *(*describe_msg)(struct _mail_msg *msg, int complete);
-
-	void (*receive_msg)(struct _mail_msg *msg);	/* message received */
-	void (*reply_msg)(struct _mail_msg *msg);	/* message replied */
-	void (*destroy_msg)(struct _mail_msg *msg);	/* finalise message */
-} mail_msg_op_t;
-
-/* setup ports */
-void mail_msg_init(void);
-
-/* allocate a new message */
-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size);
-void mail_msg_free(void *msg);
-void mail_msg_check_error(void *msg);
-void mail_msg_cancel(unsigned int msgid);
-void mail_msg_wait(unsigned int msgid);
-
-/* set the status-bar message */
-/* start/end a new op */
-void mail_status_start(const char *msg);
-void mail_status_end(void);
-/* set a status during an op */
-void mail_statusf(const char *fmt, ...);
-void mail_status(const char *msg);
-
-/* request a string/password */
-char *mail_get_password(char *prompt, gboolean secret);
-
-/* forward a camel event (or other call) to the gui thread */
-int mail_proxy_event(CamelObjectEventHookFunc func, CamelObject *o, void *event_data, void *data);
-
-/* a message port that receives messages in the gui thread, used for sending port */
-extern EMsgPort *mail_gui_port;
-/* a message port that receives messages in the gui thread, used for the reply port */
-extern EMsgPort *mail_gui_reply_port;
-
-/* some globally available threads */
-extern EThread *mail_thread_queued;	/* for operations that can (or should) be queued */
-extern EThread *mail_thread_new;	/* for operations that should run in a new thread each time */
-
-/* The main thread. */
-extern pthread_t mail_gui_thread;
-
-
-#endif /* ! _MAIL_MT */
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
deleted file mode 100644
index 1d2516272a..0000000000
--- a/mail/mail-ops.c
+++ /dev/null
@@ -1,1833 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Authors: Dan Winship <danw@helixcode.com>
- *  	    Jeffrey Stedfast <fejj@helixcode.com>
- *          Peter Williams <peterw@helixcode.com>
- *          Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2000,2001 Ximian, Inc. (http://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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <ctype.h>
-#include <errno.h>
-#include <camel/camel-mime-filter-from.h>
-#include <camel/camel-operation.h>
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "composer/e-msg-composer.h"
-#include "folder-browser.h"
-#include "e-util/e-html-utils.h"
-
-#include "filter/filter-filter.h"
-
-#include "mail-mt.h"
-
-#define d(x) x
-
-FilterContext *
-mail_load_filter_context(void)
-{
-	char *userrules;
-	char *systemrules;
-	FilterContext *fc;
-	
-	userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	systemrules = g_strdup_printf ("%s/evolution/filtertypes.xml", EVOLUTION_DATADIR);
-	fc = filter_context_new ();
-	rule_context_load ((RuleContext *)fc, systemrules, userrules);
-	g_free (userrules);
-	g_free (systemrules);
-	
-	return fc;
-}
-
-static void
-setup_filter_driver(CamelFilterDriver *driver, FilterContext *fc, const char *source)
-{
-	GString *fsearch, *faction;
-	FilterFilter *rule = NULL;
-
-	if (TRUE /* perform_logging */) {
-		char *filename = g_strdup_printf("%s/evolution-filter-log", evolution_dir);
-		/* FIXME: This is a nasty little thing to stop leaking file handles.
-		   Needs to be setup elsewhere. */
-		static FILE *logfile = NULL;
-
-		if (logfile == NULL)
-			logfile = fopen(filename, "a+");
-		g_free(filename);
-		if (logfile)
-			camel_filter_driver_set_logfile(driver, logfile);
-	}
-
-	fsearch = g_string_new ("");
-	faction = g_string_new ("");
-	
-	while ((rule = (FilterFilter *)rule_context_next_rule((RuleContext *)fc, (FilterRule *)rule, source))) {
-		g_string_truncate (fsearch, 0);
-		g_string_truncate (faction, 0);
-		
-		filter_rule_build_code ((FilterRule *)rule, fsearch);
-		filter_filter_build_action (rule, faction);
-
-		camel_filter_driver_add_rule(driver, ((FilterRule *)rule)->name, fsearch->str, faction->str);
-	}
-	
-	g_string_free (fsearch, TRUE);
-	g_string_free (faction, TRUE);
-}
-
-static CamelFolder *
-filter_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	folder = mail_tool_uri_to_folder(uri, ex);
-
-	return folder;
-}
-
-/* used for both just filtering a folder + uid's, and for filtering a whole folder */
-/* used both for fetching mail, and for filtering mail */
-struct _filter_mail_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *source_folder; /* where they come from */
-	GPtrArray *source_uids;	/* uids to copy, or NULL == copy all */
-	CamelOperation *cancel;
-	CamelFilterDriver *driver;
-	int delete;		/* delete messages after filtering them? */
-	CamelFolder *destination; /* default destination for any messages, NULL for none */
-};
-
-/* since fetching also filters, we subclass the data here */
-struct _fetch_mail_msg {
-	struct _filter_mail_msg fmsg;
-
-	CamelOperation *cancel;	/* we have our own cancellation struct, the other should be empty */
-	int keep;		/* keep on server? */
-
-	char *source_uri;
-
-	void (*done)(char *source, void *data);
-	void *data;
-};
-
-/* filter a folder, or a subset thereof, uses source_folder/source_uids */
-/* this is shared with fetch_mail */
-static void
-filter_folder_filter(struct _mail_msg *mm)
-{
-	struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
-	CamelFolder *folder;
-	GPtrArray *uids, *folder_uids = NULL;
-
-	if (m->cancel)
-		camel_operation_register(m->cancel);
-
-	folder = m->source_folder;
-
-	if (folder == NULL || camel_folder_get_message_count (folder) == 0) {
-		if (m->cancel)
-			camel_operation_unregister(m->cancel);
-		return;
-	}
-
-	if (m->destination) {
-		camel_folder_freeze(m->destination);
-		camel_filter_driver_set_default_folder(m->driver, m->destination);
-	}
-
-	camel_folder_freeze(folder);
-
-	if (m->source_uids)
-		uids = m->source_uids;
-	else
-		folder_uids = uids = camel_folder_get_uids (folder);
-
-	camel_filter_driver_filter_folder(m->driver, folder, uids, m->delete, &mm->ex);
-
-	if (folder_uids)
-		camel_folder_free_uids(folder, folder_uids);
-
-	/* sync and expunge */
-	camel_folder_sync (folder, TRUE, &mm->ex);
-	camel_folder_thaw(folder);
-
-	if (m->destination)
-		camel_folder_thaw(m->destination);
-
-	if (m->cancel)
-		camel_operation_unregister(m->cancel);
-}
-
-static void
-filter_folder_filtered(struct _mail_msg *mm)
-{
-}
-
-static void
-filter_folder_free(struct _mail_msg *mm)
-{
-	struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
-	int i;
-
-	if (m->source_folder)
-		camel_object_unref((CamelObject *)m->source_folder);
-	if (m->source_uids) {
-		for (i=0;i<m->source_uids->len;i++)
-			g_free(m->source_uids->pdata[i]);
-		g_ptr_array_free(m->source_uids, TRUE);
-	}
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-	if (m->destination)
-		camel_object_unref((CamelObject *)m->destination);
-	if (m->driver)
-		camel_object_unref((CamelObject *)m->driver);
-}
-
-static struct _mail_msg_op filter_folder_op = {
-	NULL,			/* we do our own progress reporting? */
-	filter_folder_filter,
-	filter_folder_filtered,
-	filter_folder_free,
-};
-
-void
-mail_filter_folder(CamelFolder *source_folder, GPtrArray *uids,
-		   FilterContext *fc, const char *type,
-		   CamelOperation *cancel)
-{
-	struct _filter_mail_msg *m;
-
-	m = mail_msg_new(&filter_folder_op, NULL, sizeof(*m));
-	m->source_folder = source_folder;
-	camel_object_ref((CamelObject *)source_folder);
-	m->source_uids = uids;
-	m->delete = FALSE;
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref(cancel);
-	}
-
-	m->driver = camel_filter_driver_new(filter_get_folder, NULL);
-	setup_filter_driver(m->driver, fc, type);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* convenience function for it */
-void mail_filter_on_demand(CamelFolder *folder, GPtrArray *uids)
-{
-	FilterContext *fc;
-
-	fc = mail_load_filter_context();
-	mail_filter_folder(folder, uids, fc, FILTER_SOURCE_INCOMING, NULL);
-	gtk_object_unref((GtkObject *)fc);
-}
-
-/* ********************************************************************** */
-
-static void
-fetch_mail_fetch(struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-	struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm;
-	int i;
-
-	if (m->cancel)
-		camel_operation_register(m->cancel);
-
-	if ( (fm->destination = mail_tool_get_local_inbox(&mm->ex)) == NULL) {
-		if (m->cancel)
-			camel_operation_unregister(m->cancel);
-		return;
-	}
-
-	/* FIXME: this should support keep_on_server too, which would then perform a spool
-	   access thingy, right?  problem is matching raw messages to uid's etc. */
-	if (!strncmp (m->source_uri, "mbox:", 5)) {
-		char *path = mail_tool_do_movemail (m->source_uri, &mm->ex);
-		
-		if (path && !camel_exception_is_set (&mm->ex)) {
-			camel_folder_freeze(fm->destination);
-			camel_filter_driver_set_default_folder(fm->driver, fm->destination);
-			camel_filter_driver_filter_mbox(fm->driver, path, &mm->ex);
-			camel_folder_thaw(fm->destination);
-			
-			if (!camel_exception_is_set (&mm->ex))
-				unlink (path);
-		}
-		g_free (path);
-	} else {
-		CamelFolder *folder = fm->source_folder = mail_tool_get_inbox(m->source_uri, &mm->ex);
-		
-		if (folder) {
-			/* this handles 'keep on server' stuff, if we have any new uid's to copy
-			   across, we need to copy them to a new array 'cause of the way fetch_mail_free works */
-			CamelUIDCache *cache = NULL;
-			char *cachename;
-			
-			cachename = mail_config_folder_to_cachename (folder, "cache-");
-			cache = camel_uid_cache_new (cachename);
-			g_free (cachename);
-			
-			if (cache) {
-				GPtrArray *folder_uids, *cache_uids, *uids;
-				
-				folder_uids = camel_folder_get_uids (folder);
-				cache_uids = camel_uid_cache_get_new_uids (cache, folder_uids);
-				if (cache_uids) {
-					/* need to copy this, sigh */
-					fm->source_uids = uids = g_ptr_array_new ();
-					g_ptr_array_set_size (uids, cache_uids->len);
-					for (i = 0; i < cache_uids->len; i++)
-						uids->pdata[i] = g_strdup (cache_uids->pdata[i]);
-					camel_uid_cache_free_uids (cache_uids);
-					
-					filter_folder_filter (mm);
-					
-					/* if we are not to delete the messages, save the UID cache */
-					if (!fm->delete && !camel_exception_is_set (&mm->ex))
-						camel_uid_cache_save (cache);
-					
-					camel_uid_cache_destroy (cache);
-				}
-				camel_folder_free_uids (folder, folder_uids);
-			} else {
-				filter_folder_filter (mm);
-			}
-		}
-	}
-
-	if (m->cancel)
-		camel_operation_unregister(m->cancel);
-
-	/* we unref this here as it may have more work to do (syncing
-	   folders and whatnot) before we are really done */
-	/* should this be cancellable too? (i.e. above unregister above) */
-	camel_object_unref((CamelObject *)m->fmsg.driver);
-	m->fmsg.driver = NULL;
-}
-
-static void
-fetch_mail_fetched(struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-
-	if (m->done)
-		m->done(m->source_uri, m->data);
-}
-
-static void
-fetch_mail_free(struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-
-	g_free(m->source_uri);
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-
-	filter_folder_free(mm);
-}
-
-static struct _mail_msg_op fetch_mail_op = {
-	NULL,			/* we do our own progress reporting */
-	fetch_mail_fetch,
-	fetch_mail_fetched,
-	fetch_mail_free,
-};
-
-/* ouch, a 'do everything' interface ... */
-void mail_fetch_mail(const char *source, int keep,
-		     FilterContext *fc, const char *type,
-		     CamelOperation *cancel,
-		     CamelFilterGetFolderFunc get_folder, void *get_data,
-		     CamelFilterStatusFunc *status, void *status_data,
-		     void (*done)(char *source, void *data), void *data)
-{
-	struct _fetch_mail_msg *m;
-	struct _filter_mail_msg *fm;
-
-	m = mail_msg_new(&fetch_mail_op, NULL, sizeof(*m));
-	fm = (struct _filter_mail_msg *)m;
-	m->source_uri = g_strdup(source);
-	fm->delete = !keep;
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref(cancel);
-	}
-	m->done = done;
-	m->data = data;
-
-	fm->driver = camel_filter_driver_new(get_folder, get_data);
-	setup_filter_driver(fm->driver, fc, type);
-	if (status)
-		camel_filter_driver_set_status_func(fm->driver, status, status_data);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-
-/* updating of imap folders etc */
-struct _update_info {
-	EvolutionStorage *storage;
-
-	void (*done)(CamelStore *, void *data);
-	void *data;
-};
-
-static void do_update_subfolders_rec(CamelStore *store, CamelFolderInfo *info, EvolutionStorage *storage, const char *prefix)
-{
-	char *path, *name;
-	
-	path = g_strdup_printf("%s/%s", prefix, info->name);
-	if (info->unread_message_count > 0)
-		name = g_strdup_printf("%s (%d)", info->name, info->unread_message_count);
-	else
-		name = g_strdup(info->name);
-	
-	evolution_storage_update_folder(storage, path, name, info->unread_message_count > 0);
-	g_free(name);
-	if (info->child)
-		do_update_subfolders_rec(store, info->child, storage, path);
-	if (info->sibling)
-		do_update_subfolders_rec(store, info->sibling, storage, prefix);
-	g_free(path);
-}
-
-static void do_update_subfolders(CamelStore *store, CamelFolderInfo *info, void *data)
-{
-	struct _update_info *uinfo = data;
-	
-	if (uinfo) {
-		do_update_subfolders_rec(store, info, uinfo->storage, "");
-	}
-
-	if (uinfo->done)
-		uinfo->done(store, uinfo->data);
-
-	gtk_object_unref((GtkObject *)uinfo->storage);
-	g_free(uinfo);
-}
-
-/* this interface is a little icky */
-int mail_update_subfolders(CamelStore *store, EvolutionStorage *storage,
-			   void (*done)(CamelStore *, void *data), void *data)
-{
-	struct _update_info *info;
-
-	/* FIXME: This wont actually work entirely right, as a failure may lose this data */
-	/* however, this isn't a big problem ... */
-	info = g_malloc0(sizeof(*info));
-	info->storage = storage;
-	gtk_object_ref((GtkObject *)storage);
-	info->done = done;
-	info->data = data;
-
-	return mail_get_folderinfo(store, do_update_subfolders, info);
-}
-
-/* ********************************************************************** */
-/* sending stuff */
-/* ** SEND MAIL *********************************************************** */
-
-/* send 1 message to a specific transport */
-static void
-mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilterDriver *driver, CamelException *ex)
-{
-	extern CamelFolder *sent_folder; /* FIXME */
-	CamelMessageInfo *info;
-	CamelTransport *xport;
-	const char *version;
-
-	if (SUB_VERSION[0] == '\0')
-		version = "Evolution/" VERSION " (Preview Release)";
-	else
-		version = "Evolution/" VERSION SUB_VERSION " (Preview Release)";
-	camel_medium_add_header(CAMEL_MEDIUM (message), "X-Mailer", version);
-	camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-
-	xport = camel_session_get_transport(session, destination, ex);
-	if (camel_exception_is_set(ex))
-		return;
-	
-	camel_transport_send(xport, (CamelMedium *)message, ex);
-	camel_object_unref((CamelObject *)xport);
-	if (camel_exception_is_set(ex))
-		return;
-	
-	/* post-process */
-	info = camel_message_info_new();
-	info->flags = CAMEL_MESSAGE_SEEN;
-
-	if (driver)
-		camel_filter_driver_filter_message (driver, message, info,
-						    NULL, NULL, "", ex);
-	
-	if (sent_folder)
-		camel_folder_append_message(sent_folder, message, info, ex);
-	
-	camel_message_info_free(info);
-}
-
-/* ********************************************************************** */
-
-struct _send_mail_msg {
-	struct _mail_msg msg;
-
-	CamelFilterDriver *driver;
-	char *destination;
-	CamelMimeMessage *message;
-
-	void (*done)(char *uri, CamelMimeMessage *message, gboolean sent, void *data);
-	void *data;
-};
-
-static char *send_mail_desc(struct _mail_msg *mm, int done)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	const char *subject;
-
-	subject = camel_mime_message_get_subject(m->message);
-	if (subject && subject[0])
-		return g_strdup_printf (_("Sending \"%s\""), subject);
-	else
-		return g_strdup(_("Sending message"));
-}
-
-static void send_mail_send(struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-
-	camel_operation_register(mm->cancel);
-	mail_send_message(m->message, m->destination, m->driver, &mm->ex);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void send_mail_sent(struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-
-	if (m->done)
-		m->done(m->destination, m->message, !camel_exception_is_set(&mm->ex), m->data);
-}
-
-static void send_mail_free(struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-
-	camel_object_unref((CamelObject *)m->message);
-	g_free(m->destination);
-}
-
-static struct _mail_msg_op send_mail_op = {
-	send_mail_desc,
-	send_mail_send,
-	send_mail_sent,
-	send_mail_free,
-};
-
-int
-mail_send_mail(const char *uri, CamelMimeMessage *message, void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data), void *data)
-{
-	struct _send_mail_msg *m;
-	int id;
-	FilterContext *fc;
-
-	m = mail_msg_new(&send_mail_op, NULL, sizeof(*m));
-	m->destination = g_strdup(uri);
-	m->message = message;
-	camel_object_ref((CamelObject *)message);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-
-	m->driver = camel_filter_driver_new(filter_get_folder, NULL);
-	fc = mail_load_filter_context();
-	setup_filter_driver(m->driver, fc, FILTER_SOURCE_OUTGOING);
-	gtk_object_unref((GtkObject *)fc);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-	return id;
-}
-
-/* ** SEND MAIL QUEUE ***************************************************** */
-
-struct _send_queue_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *queue;
-	char *destination;
-
-	CamelFilterDriver *driver;
-	CamelOperation *cancel;
-
-	/* we use camelfilterstatusfunc, even though its not the filter doing it */
-	CamelFilterStatusFunc *status;
-	void *status_data;
-
-	void (*done)(char *destination, void *data);
-	void *data;
-};
-
-static void
-report_status(struct _send_queue_msg *m, enum camel_filter_status_t status, int pc, const char *desc, ...)
-{
-	va_list ap;
-	char *str;
-	
-	if (m->status) {
-		va_start(ap, desc);
-		str = g_strdup_vprintf(desc, ap);
-		m->status(m->driver, status, pc, str, m->status_data);
-		g_free(str);
-	}
-}
-
-static void
-send_queue_send(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-	GPtrArray *uids;
-	int i;
-	extern CamelFolder *sent_folder; /* FIXME */
-
-	printf("sending queue\n");
-
-	uids = camel_folder_get_uids(m->queue);
-	if (uids == NULL || uids->len == 0)
-		return;
-
-	if (m->cancel)
-		camel_operation_register(m->cancel);
-	
-	for (i=0; i<uids->len; i++) {
-		CamelMimeMessage *message;
-		char *destination;
-		int pc = (100 * i)/uids->len;
-
-		report_status(m, CAMEL_FILTER_STATUS_START, pc, "Sending message %d of %d", i+1, uids->len);
-		
-		message = camel_folder_get_message(m->queue, uids->pdata[i], &mm->ex);
-		if (camel_exception_is_set(&mm->ex))
-			break;
-
-		/* Get the preferred transport URI */
-		destination = (char *)camel_medium_get_header(CAMEL_MEDIUM(message), "X-Evolution-Transport");
-		if (destination) {
-			destination = g_strdup(destination);
-			camel_medium_remove_header(CAMEL_MEDIUM(message), "X-Evolution-Transport");
-			mail_send_message(message, g_strstrip(destination), m->driver, &mm->ex);
-			g_free(destination);
-		} else
-			mail_send_message(message, m->destination, m->driver, &mm->ex);
-
-		if (camel_exception_is_set(&mm->ex))
-			break;
-
-		camel_folder_set_message_flags(m->queue, uids->pdata[i], CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-	}
-
-	if (camel_exception_is_set(&mm->ex))
-		report_status(m, CAMEL_FILTER_STATUS_END, 100, "Failed on message %d of %d", i+1, uids->len);
-	else
-		report_status(m, CAMEL_FILTER_STATUS_END, 100, "Complete.");
-
-	camel_folder_free_uids(m->queue, uids);
-
-	if (!camel_exception_is_set(&mm->ex))
-		camel_folder_expunge(m->queue, &mm->ex);
-	
-	if (sent_folder)
-		camel_folder_sync(sent_folder, FALSE, &mm->ex);
-
-	if (m->cancel)
-		camel_operation_unregister(m->cancel);
-}
-
-static void
-send_queue_sent(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-
-	if (m->done)
-		m->done(m->destination, m->data);
-}
-
-static void
-send_queue_free(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-	
-	camel_object_unref((CamelObject *)m->queue);
-	g_free(m->destination);
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-}
-
-static struct _mail_msg_op send_queue_op = {
-	NULL,			/* do our own reporting, as with fetch mail */
-	send_queue_send,
-	send_queue_sent,
-	send_queue_free,
-};
-
-/* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */
-void
-mail_send_queue(CamelFolder *queue, const char *destination,
-		FilterContext *fc, const char *type,
-		CamelOperation *cancel,
-		CamelFilterGetFolderFunc get_folder, void *get_data,
-		CamelFilterStatusFunc *status, void *status_data,
-		void (*done)(char *destination, void *data), void *data)
-{
-	struct _send_queue_msg *m;
-
-	m = mail_msg_new(&send_queue_op, NULL, sizeof(*m));
-	m->queue = queue;
-	camel_object_ref((CamelObject *)queue);
-	m->destination = g_strdup(destination);
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref(cancel);
-	}
-	m->status = status;
-	m->status_data = status_data;
-	m->done = done;
-	m->data = data;
-
-	m->driver = camel_filter_driver_new(get_folder, get_data);
-	setup_filter_driver(m->driver, fc, type);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** APPEND MESSAGE TO FOLDER ******************************************** */
-
-struct _append_msg {
-	struct _mail_msg msg;
-
-        CamelFolder *folder;
-	CamelMimeMessage *message;
-        CamelMessageInfo *info;
-
-	void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data);
-	void *data;
-};
-
-static char *append_mail_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Saving message to folder"));
-}
-
-static void append_mail_append(struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-	
-	camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	camel_folder_append_message(m->folder, m->message, m->info, &mm->ex);
-}
-
-static void append_mail_appended(struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->data);
-}
-
-static void append_mail_free(struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-
-	camel_object_unref((CamelObject *)m->message);
-	camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op append_mail_op = {
-	append_mail_desc,
-	append_mail_append,
-	append_mail_appended,
-	append_mail_free
-};
-
-void
-mail_append_mail (CamelFolder *folder,
-		  CamelMimeMessage *message,
-		  CamelMessageInfo *info,
-		  void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data), void *data)
-{
-	struct _append_msg *m;
-
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
-
-	m = mail_msg_new(&append_mail_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->message = message;
-	camel_object_ref((CamelObject *)message);
-	m->info = info;
-
-	m->done = done;
-	m->data = data;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** TRANSFER MESSAGES **************************************************** */
-
-struct _transfer_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *source;
-	GPtrArray *uids;
-	gboolean delete;
-	char *dest_uri;
-};
-
-static char *transfer_messages_desc(struct _mail_msg *mm, int done)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-
-	return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"),
-			       m->dest_uri);
-			       
-}
-
-static void transfer_messages_transfer(struct _mail_msg *mm)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-	CamelFolder *dest;
-	int i;
-	char *desc;
-	void (*func) (CamelFolder *, const char *, 
-		      CamelFolder *, 
-		      CamelException *);
-
-	if (m->delete) {
-		func = camel_folder_move_message_to;
-		desc = _("Moving");
-	} else {
-		func = camel_folder_copy_message_to;
-		desc = _("Copying");
-	}
-
-	dest = mail_tool_uri_to_folder (m->dest_uri, &mm->ex);
-	if (camel_exception_is_set (&mm->ex))
-		return;
-
-	camel_folder_freeze (m->source);
-	camel_folder_freeze (dest);
-
-	for (i = 0; i < m->uids->len; i++) {
-		mail_statusf(_("%s message %d of %d (uid \"%s\")"), desc,
-			     i + 1, m->uids->len, (char *)m->uids->pdata[i]);
-
-		(func) (m->source, m->uids->pdata[i], dest, &mm->ex);
-		if (camel_exception_is_set (&mm->ex))
-			break;
-	}
-
-	camel_folder_thaw(m->source);
-	camel_folder_thaw(dest);
-	camel_object_unref((CamelObject *)dest);
-}
-
-static void transfer_messages_free(struct _mail_msg *mm)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-	int i;
-
-	camel_object_unref((CamelObject *)m->source);
-	g_free(m->dest_uri);
-	for (i=0;i<m->uids->len;i++)
-		g_free(m->uids->pdata[i]);
-	g_ptr_array_free(m->uids, TRUE);
-
-}
-
-static struct _mail_msg_op transfer_messages_op = {
-	transfer_messages_desc,
-	transfer_messages_transfer,
-	NULL,
-	transfer_messages_free,
-};
-
-void
-mail_do_transfer_messages (CamelFolder *source, GPtrArray *uids,
-			   gboolean delete_from_source,
-			   gchar *dest_uri)
-{
-	struct _transfer_msg *m;
-
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (uids != NULL);
-	g_return_if_fail (dest_uri != NULL);
-
-	m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m));
-	m->source = source;
-	camel_object_ref((CamelObject *)source);
-	m->uids = uids;
-	m->delete = delete_from_source;
-	m->dest_uri = g_strdup (dest_uri);
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ** SCAN SUBFOLDERS ***************************************************** */
-
-struct _get_folderinfo_msg {
-	struct _mail_msg msg;
-
-	CamelStore *store;
-	CamelFolderInfo *info;
-	void (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
-	void *data;
-};
-
-static char *get_folderinfo_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-	char *ret, *name;
-
-	name = camel_service_get_name((CamelService *)m->store, TRUE);
-	ret = g_strdup_printf(_("Scanning folders in \"%s\""), name);
-	g_free(name);
-	return ret;
-}
-
-static void
-add_vtrash_info (CamelFolderInfo *info)
-{
-	CamelFolderInfo *fi, *vtrash;
-	CamelURL *url;
-	char *uri;
-	
-	if (!info)
-		return;
-	
-	for (fi = info; fi->sibling; fi = fi->sibling) {
-		if (!strcmp (fi->name, "vTrash"))
-			return;
-	}
-	
-	/* create our vTrash URL */
-	url = camel_url_new (info->url, NULL);
-	g_free (url->path);
-	url->path = g_strdup ("vTrash");
-	uri = camel_url_to_string (url, FALSE);
-	camel_url_free (url);
-	
-	vtrash = g_new0 (CamelFolderInfo, 1);
-	vtrash->full_name = g_strdup ("vTrash");
-	vtrash->name = g_strdup ("vTrash");
-	vtrash->url = g_strdup_printf ("vtrash:%s", uri);
-	vtrash->unread_message_count = -1;
-	g_free (uri);
-	
-	vtrash->parent = fi;
-	
-	fi->sibling = vtrash;
-}
-
-static void get_folderinfo_get(struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-	
-	camel_operation_register(mm->cancel);
-	m->info = camel_store_get_folder_info(m->store, NULL, FALSE, TRUE, TRUE, &mm->ex);
-	add_vtrash_info (m->info);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void get_folderinfo_got(struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-
-	if (m->done)
-		m->done(m->store, m->info, m->data);
-}
-
-static void get_folderinfo_free(struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-
-	if (m->info)
-		camel_store_free_folder_info(m->store, m->info);
-	camel_object_unref((CamelObject *)m->store);
-}
-
-static struct _mail_msg_op get_folderinfo_op = {
-	get_folderinfo_desc,
-	get_folderinfo_get,
-	get_folderinfo_got,
-	get_folderinfo_free,
-};
-
-int mail_get_folderinfo(CamelStore *store, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
-{
-	struct _get_folderinfo_msg *m;
-	int id;
-
-	m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m));
-	m->store = store;
-	camel_object_ref((CamelObject *)store);
-	m->done = done;
-	m->data = data;
-	id = m->msg.seq;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-
-	return id;
-}
-
-/* ********************************************************************** */
-
-static void
-do_scan_subfolders (CamelStore *store, CamelFolderInfo *info, void *data)
-{
-	EvolutionStorage *storage = data;
-
-	if (info) {
-		gtk_object_set_data((GtkObject *)storage, "connected", (void *)1);
-		mail_storage_create_folder (storage, store, info);
-	}
-}
-
-/* synchronous function to scan the & and add folders in a store */
-void mail_scan_subfolders(CamelStore *store, EvolutionStorage *storage)
-{
-	int id;
-
-	id = mail_get_folderinfo(store, do_scan_subfolders, storage);
-	/*mail_msg_wait(id);*/
-}
-
-/* ** ATTACH MESSAGES ****************************************************** */
-
-struct _build_data {
-	void (*done)(CamelFolder *folder, GPtrArray *uids, CamelMimePart *part, char *subject, void *data);
-	void *data;
-};
-
-static void do_build_attachment(CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	struct _build_data *d = data;
-	CamelMultipart *multipart;
-	CamelMimePart *part;
-	char *subject;
-	int i;
-
-	if (messages->len == 0) {
-		d->done(folder, messages, NULL, NULL, d->data);
-		g_free(d);
-		return;
-	}
-
-	if (messages->len == 1) {
-		part = mail_tool_make_message_attachment(messages->pdata[0]);
-	} else {
-		multipart = camel_multipart_new();
-		camel_data_wrapper_set_mime_type(CAMEL_DATA_WRAPPER (multipart), "multipart/digest");
-		camel_multipart_set_boundary(multipart, NULL);
-
-		for (i=0;i<messages->len;i++) {
-			part = mail_tool_make_message_attachment(messages->pdata[i]);
-			camel_multipart_add_part(multipart, part);
-			camel_object_unref((CamelObject *)part);
-		}
-		part = camel_mime_part_new();
-		camel_medium_set_content_object(CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart));
-		camel_object_unref((CamelObject *)multipart);
-
-		camel_mime_part_set_description(part, _("Forwarded messages"));
-	}
-
-	subject = mail_tool_generate_forward_subject(messages->pdata[0]);
-	d->done(folder, messages, part, subject, d->data);
-	g_free(subject);
-	camel_object_unref((CamelObject *)part);
-
-	g_free(d);
-}
-
-void
-mail_build_attachment(CamelFolder *folder, GPtrArray *uids,
-		      void (*done)(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data), void *data)
-{
-	struct _build_data *d;
-
-	d = g_malloc(sizeof(*d));
-	d->done = done;
-	d->data = data;
-	mail_get_messages(folder, uids, do_build_attachment, d);
-}
-
-/* ** LOAD FOLDER ********************************************************* */
-
-/* there hsould be some way to merge this and create folder, since both can
-   presumably create a folder ... */
-
-struct _get_folder_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	CamelFolder *folder;
-	void (*done) (char *uri, CamelFolder *folder, void *data);
-	void *data;
-};
-
-static char *get_folder_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-	
-	return g_strdup_printf(_("Opening folder %s"), m->uri);
-}
-
-static void get_folder_get(struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-
-	camel_operation_register(mm->cancel);
-	m->folder = mail_tool_uri_to_folder(m->uri, &mm->ex);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void get_folder_got(struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-
-	if (m->done)
-		m->done (m->uri, m->folder, m->data);
-}
-
-static void get_folder_free(struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-
-	g_free(m->uri);
-	if (m->folder)
-		camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op get_folder_op = {
-	get_folder_desc,
-	get_folder_get,
-	get_folder_got,
-	get_folder_free,
-};
-
-int
-mail_get_folder(const char *uri, void (*done) (char *uri, CamelFolder *folder, void *data), void *data)
-{
-	struct _get_folder_msg *m;
-	int id;
-
-	m = mail_msg_new(&get_folder_op, NULL, sizeof(*m));
-	m->uri = g_strdup(uri);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_new, (EMsg *)m);
-	return id;
-}
-
-/* ** GET STORE ******************************************************* */
-
-struct _get_store_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	CamelStore *store;
-	void (*done) (char *uri, CamelStore *store, void *data);
-	void *data;
-};
-
-static char *get_store_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-	
-	return g_strdup_printf(_("Opening store %s"), m->uri);
-}
-
-static void get_store_get(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	camel_operation_register(mm->cancel);
-	m->store = camel_session_get_store(session, m->uri, &mm->ex);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void get_store_got(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	if (m->done)
-		m->done(m->uri, m->store, m->data);
-}
-
-static void get_store_free(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	g_free(m->uri);
-	if (m->store)
-		camel_object_unref((CamelObject *)m->store);
-}
-
-static struct _mail_msg_op get_store_op = {
-	get_store_desc,
-	get_store_get,
-	get_store_got,
-	get_store_free,
-};
-
-int
-mail_get_store(const char *uri, void (*done) (char *uri, CamelStore *store, void *data), void *data)
-{
-	struct _get_store_msg *m;
-	int id;
-	
-	m = mail_msg_new(&get_store_op, NULL, sizeof(*m));
-	m->uri = g_strdup(uri);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_new, (EMsg *)m);
-	return id;
-}
-
-/* ** CREATE FOLDER ******************************************************* */
-
-/* trying to find a way to remove this entirely and just use get_folder()
-   to do the same thing.  But i dont think it can be done, because one works on
-   shell uri's (get folder), and the other only works for mail uri's ? */
-
-struct _create_folder_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	CamelFolder *folder;
-	void (*done) (char *uri, CamelFolder *folder, void *data);
-	void *data;
-};
-
-static char *create_folder_desc(struct _mail_msg *mm, int done)
-{
-	struct _create_folder_msg *m = (struct _create_folder_msg *)mm;
-	
-	return g_strdup_printf(_("Opening folder %s"), m->uri);
-}
-
-static void create_folder_get(struct _mail_msg *mm)
-{
-	struct _create_folder_msg *m = (struct _create_folder_msg *)mm;
-
-	/* FIXME: supply a way to make indexes optional */
-	camel_operation_register(mm->cancel);
-	m->folder = mail_tool_get_folder_from_urlname(m->uri, "mbox",
-						      CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX,
-						      &mm->ex);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void create_folder_got(struct _mail_msg *mm)
-{
-	struct _create_folder_msg *m = (struct _create_folder_msg *)mm;
-
-	if (m->done)
-		m->done(m->uri, m->folder, m->data);
-}
-
-static void create_folder_free(struct _mail_msg *mm)
-{
-	struct _create_folder_msg *m = (struct _create_folder_msg *)mm;
-
-	g_free(m->uri);
-	if (m->folder)
-		camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op create_folder_op = {
-	create_folder_desc,
-	create_folder_get,
-	create_folder_got,
-	create_folder_free,
-};
-
-void
-mail_create_folder(const char *uri, void (*done) (char *uri, CamelFolder *folder, void *data), void *data)
-{
-	struct _create_folder_msg *m;
-
-	m = mail_msg_new(&create_folder_op, NULL, sizeof(*m));
-	m->uri = g_strdup(uri);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** SYNC FOLDER ********************************************************* */
-
-struct _sync_folder_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	void (*done) (CamelFolder *folder, void *data);
-	void *data;
-};
-
-static char *sync_folder_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Synchronising folder"));
-}
-
-static void sync_folder_sync(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_operation_register(mm->cancel);
-	camel_folder_sync(m->folder, FALSE, &mm->ex);
-	camel_operation_unregister(mm->cancel);
-}
-
-static void sync_folder_synced(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->data);
-}
-
-static void sync_folder_free(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op sync_folder_op = {
-	sync_folder_desc,
-	sync_folder_sync,
-	sync_folder_synced,
-	sync_folder_free,
-};
-
-void
-mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data)
-{
-	struct _sync_folder_msg *m;
-
-	m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ******************************************************************************** */
-
-static char *expunge_folder_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Expunging folder"));
-}
-
-static void expunge_folder_expunge(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_folder_expunge(m->folder, &mm->ex);
-}
-
-/* we just use the sync stuff where we can, since it would be the same */
-static struct _mail_msg_op expunge_folder_op = {
-	expunge_folder_desc,
-	expunge_folder_expunge,
-	sync_folder_synced,
-	sync_folder_free,
-};
-
-void
-mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data)
-{
-	struct _sync_folder_msg *m;
-
-	m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** GET MESSAGE(s) ***************************************************** */
-
-struct _get_message_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	char *uid;
-	void (*done) (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data);
-	void *data;
-	CamelMimeMessage *message;
-	CamelOperation *cancel;
-};
-
-static char *get_message_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	return g_strdup_printf(_("Retrieving message %s"), m->uid);
-}
-
-static void get_message_get(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	camel_operation_register(m->cancel);
-	m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex);
-	camel_operation_unregister(m->cancel);
-}
-
-static void get_message_got(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uid, m->message, m->data);
-}
-
-static void get_message_free(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	g_free(m->uid);
-	camel_object_unref((CamelObject *)m->folder);
-	camel_operation_unref(m->cancel);
-}
-
-static struct _mail_msg_op get_message_op = {
-	get_message_desc,
-	get_message_get,
-	get_message_got,
-	get_message_free,
-};
-
-void
-mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data), void *data, EThread *thread)
-{
-	struct _get_message_msg *m;
-
-	m = mail_msg_new(&get_message_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->uid = g_strdup(uid);
-	m->data = data;
-	m->done = done;
-	m->cancel = camel_operation_new(NULL, NULL);
-
-	e_thread_put(thread, (EMsg *)m);
-}
-
-/* ********************************************************************** */
-
-struct _get_messages_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	GPtrArray *uids;
-	GPtrArray *messages;
-
-	void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data);
-	void *data;
-};
-
-static char * get_messages_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup_printf(_("Retrieving messages"));
-}
-
-static void get_messages_get(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-	int i;
-	CamelMimeMessage *message;
-
-	for (i=0; i<m->uids->len; i++) {
-		mail_statusf(_("Retrieving message number %d of %d (uid \"%s\")"),
-			     i+1, m->uids->len, (char *) m->uids->pdata[i]);
-
-		message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex);
-		if (message == NULL)
-			break;
-
-		g_ptr_array_add(m->messages, message);
-	}
-}
-
-static void get_messages_got(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uids, m->messages, m->data);
-}
-
-static void get_messages_free(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-	int i;
-
-	for (i=0;i<m->uids->len;i++)
-		g_free(m->uids->pdata[i]);
-	g_ptr_array_free(m->uids, TRUE);
-	for (i=0;i<m->messages->len;i++) {
-		if (m->messages->pdata[i])
-			camel_object_unref((CamelObject *)m->messages->pdata[i]);
-	}
-	g_ptr_array_free(m->messages, TRUE);
-	camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op get_messages_op = {
-	get_messages_desc,
-	get_messages_get,
-	get_messages_got,
-	get_messages_free,
-};
-
-void
-mail_get_messages(CamelFolder *folder, GPtrArray *uids,
-		  void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data),
-		  void *data)
-{
-	struct _get_messages_msg *m;
-
-	m = mail_msg_new(&get_messages_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->uids = uids;
-	m->messages = g_ptr_array_new();
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** SAVE MESSAGES ******************************************************* */
-
-struct _save_messages_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	GPtrArray *uids;
-	char *path;
-	void (*done)(CamelFolder *folder, GPtrArray *uids, char *path, void *data);
-	void *data;
-};
-
-static char *save_messages_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Saving messages"));
-}
-
-/* tries to build a From line, based on message headers */
-/* this is a copy directly from camel-mbox-summary.c */
-
-static char *tz_months[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *tz_days[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-static char *
-build_from(struct _header_raw *header)
-{
-	GString *out = g_string_new("From ");
-	char *ret;
-	const char *tmp;
-	time_t thetime;
-	int offset;
-	struct tm tm;
-
-	tmp = header_raw_find(&header, "Sender", NULL);
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "From", NULL);
-	if (tmp != NULL) {
-		struct _header_address *addr = header_address_decode(tmp);
-
-		tmp = NULL;
-		if (addr) {
-			if (addr->type == HEADER_ADDRESS_NAME) {
-				g_string_append(out, addr->v.addr);
-				tmp = "";
-			}
-			header_address_unref(addr);
-		}
-	}
-	if (tmp == NULL)
-		g_string_append(out, "unknown@nodomain.now.au");
-
-	/* try use the received header to get the date */
-	tmp = header_raw_find(&header, "Received", NULL);
-	if (tmp) {
-		tmp = strrchr(tmp, ';');
-		if (tmp)
-			tmp++;
-	}
-
-	/* if there isn't one, try the Date field */
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "Date", NULL);
-
-	thetime = header_decode_date(tmp, &offset);
-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;
-	gmtime_r(&thetime, &tm);
-	g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n",
-			  tz_days[tm.tm_wday],
-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void save_messages_save(struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilterFrom *from_filter;
-	CamelStream *stream;
-	int fd, i;
-	char *from;
-
-	fd = open(m->path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	if (fd == -1) {
-		camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Unable to create output file: %s\n %s"), m->path, strerror(errno));
-		return;
-	}
-	
-	stream = camel_stream_fs_new_with_fd(fd);
-	from_filter = camel_mime_filter_from_new();
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
-	camel_object_unref((CamelObject *)from_filter);
-	
-	for (i=0; i<m->uids->len; i++) {
-		CamelMimeMessage *message;
-
-		mail_statusf(_("Saving message %d of %d (uid \"%s\")"),
-			     i+1, m->uids->len, (char *)m->uids->pdata[i]);
-		
-		message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex);
-		if (!message)
-			break;
-
-		/* we need to flush after each stream write since we are writing to the same fd */
-		from = build_from(((CamelMimePart *)message)->headers);
-		if (camel_stream_write_string(stream, from) == -1
-		    || camel_stream_flush(stream) == -1
-		    || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1
-		    || camel_stream_flush((CamelStream *)filtered_stream) == -1) {
-			camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Error saving messages to: %s:\n %s"), m->path, strerror(errno));
-			g_free(from);
-			camel_object_unref((CamelObject *)message);
-			break;
-		}
-		g_free(from);
-		camel_object_unref((CamelObject *)message);
-	}
-
-	camel_object_unref((CamelObject *)filtered_stream);
-	camel_object_unref((CamelObject *)stream);
-}
-
-static void save_messages_saved(struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uids, m->path, m->data);
-}
-
-static void save_messages_free(struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-	int i;
-
-	for (i=0;i<m->uids->len;i++)
-		g_free(m->uids->pdata[i]);
-	g_ptr_array_free(m->uids, TRUE);
-	camel_object_unref((CamelObject *)m->folder);
-	g_free(m->path);
-}
-
-static struct _mail_msg_op save_messages_op = {
-	save_messages_desc,
-	save_messages_save,
-	save_messages_saved,
-	save_messages_free,
-};
-
-int
-mail_save_messages(CamelFolder *folder, GPtrArray *uids, const char *path,
-		   void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), void *data)
-{
-	struct _save_messages_msg *m;
-	int id;
-
-	m = mail_msg_new(&save_messages_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref((CamelObject *)folder);
-	m->uids = uids;
-	m->path = g_strdup(path);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_new, (EMsg *)m);
-
-	return id;
-}
-
-/* ** SAVE PART ******************************************************* */
-
-struct _save_part_msg {
-	struct _mail_msg msg;
-
-	CamelMimePart *part;
-	char *path;
-	void (*done)(CamelMimePart *part, char *path, int saved, void *data);
-	void *data;
-};
-
-static char *save_part_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Saving attachment"));
-}
-
-static void save_part_save(struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-	CamelMimeFilterCharset *charsetfilter;
-	CamelContentType *content_type;
-	CamelStreamFilter *filtered_stream;
-	CamelStream *stream_fs;
-	CamelDataWrapper *data;
-	const char *charset;
-
-	stream_fs = camel_stream_fs_new_with_name(m->path, O_WRONLY|O_CREAT, 0600);
-	if (stream_fs == NULL) {
-		camel_exception_setv(&mm->ex, 1, _("Cannot create output file: %s:\n %s"), m->path, strerror(errno));
-		return;
-	}
-
-	/* we only convert text/ parts, and we only convert if we have to
-	   null charset param == us-ascii == utf8 always, and utf8 == utf8 obviously */
-	/* this will also let "us-ascii that isn't really" parts pass out in
-	   proper format, without us trying to treat it as what it isn't, which is
-	   the same algorithm camel uses */
-	
-	data = camel_medium_get_content_object((CamelMedium *)m->part);
-	content_type = camel_mime_part_get_content_type(m->part);
-	if (header_content_type_is(content_type, "text", "*")
-	    && (charset = header_content_type_param(content_type, "charset"))
-	    && strcasecmp(charset, "utf-8") != 0) {
-		charsetfilter = camel_mime_filter_charset_new_convert("utf-8", charset);
-		filtered_stream = camel_stream_filter_new_with_stream(stream_fs);
-		camel_stream_filter_add(filtered_stream, CAMEL_MIME_FILTER(charsetfilter));
-		camel_object_unref(CAMEL_OBJECT(charsetfilter));
-	} else {
-		/* no we can't use a CAMEL_BLAH() cast here, since its not true, HOWEVER
-		   we only treat it as a normal stream from here on, so it is OK */
-		filtered_stream = (CamelStreamFilter *)stream_fs;
-		camel_object_ref(CAMEL_OBJECT(stream_fs));
-	}
-	
-	if (camel_data_wrapper_write_to_stream(data, CAMEL_STREAM(filtered_stream)) == -1
-	    || camel_stream_flush (CAMEL_STREAM(filtered_stream)) == -1)
-		camel_exception_setv(&mm->ex, 1, _("Could not write data: %s"), strerror(errno));
-
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (stream_fs));
-}
-
-static void save_part_saved(struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-
-	if (m->done)
-		m->done(m->part, m->path, !camel_exception_is_set(&mm->ex), m->data);
-}
-
-static void save_part_free(struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-
-	camel_object_unref((CamelObject *)m->part);
-	g_free(m->path);
-}
-
-static struct _mail_msg_op save_part_op = {
-	save_part_desc,
-	save_part_save,
-	save_part_saved,
-	save_part_free,
-};
-
-int
-mail_save_part(CamelMimePart *part, const char *path,
-	       void (*done)(CamelMimePart *part, char *path, int saved, void *data), void *data)
-{
-	struct _save_part_msg *m;
-	int id;
-
-	m = mail_msg_new(&save_part_op, NULL, sizeof(*m));
-	m->part = part;
-	camel_object_ref((CamelObject *)part);
-	m->path = g_strdup(path);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-
-	return id;
-}
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
deleted file mode 100644
index 74a197cb56..0000000000
--- a/mail/mail-ops.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors: 
- *  Peter Williams <peterw@helixcode.com>
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 2000, 2001 Ximian, Inc. (http://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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel/camel-folder.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-
-#include "filter/filter-context.h"
-
-#include "evolution-storage.h"	/*EvolutionStorage */
-#include "e-util/e-msgport.h"
-
-/* utility functions */
-FilterContext *mail_load_filter_context(void);
-
-void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
-		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data), void *data);
-
-void mail_do_transfer_messages (CamelFolder *source, GPtrArray *uids,
-				gboolean delete_from_source,
-				gchar *dest_uri);
-
-/* get a single message, asynchronously */
-void mail_get_message(CamelFolder *folder, const char *uid,
-		      void (*done) (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data), void *data,
-		      EThread *thread);
-
-/* get several messages */
-void mail_get_messages(CamelFolder *folder, GPtrArray *uids,
-		       void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data), void *data);
-
-/* same for a folder */
-int mail_get_folder(const char *uri,
-		    void (*done) (char *uri, CamelFolder *folder, void *data), void *data);
-
-/* and for a store */
-int mail_get_store(const char *uri,
-		   void (*done) (char *uri, CamelStore *store, void *data), void *data);
-
-/* build an attachment */
-void mail_build_attachment(CamelFolder *folder, GPtrArray *uids,
-			   void (*done)(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data), void *data);
-
-void mail_sync_folder(CamelFolder *folder,
-		      void (*done) (CamelFolder *folder, void *data), void *data);
-void mail_expunge_folder(CamelFolder *folder,
-			 void (*done) (CamelFolder *folder, void *data), void *data);
-
-/* get folder info asynchronously */
-int mail_get_folderinfo(CamelStore *store,
-			void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data);
-
-/* create a new mail folder */
-void mail_create_folder(const char *uri,
-			void (*done) (char *uri, CamelFolder *folder, void *data), void *data);
-
-/* save messages */
-int mail_save_messages(CamelFolder *folder, GPtrArray *uids, const char *path,
-		       void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), void *data);
-int mail_save_part(CamelMimePart *part, const char *path,
-		   void (*done)(CamelMimePart *part, char *path, int saved, void *data), void *data);
-
-int mail_send_mail(const char *uri, CamelMimeMessage *message,
-		   void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data), void *data);
-
-/* scan subfolders and add them to the storage, synchronous */
-/* FIXME: Move this to component-factory.c */
-void mail_scan_subfolders(CamelStore *store, EvolutionStorage *storage);
-/* not sure about this one though */
-int mail_update_subfolders(CamelStore *store, EvolutionStorage *storage,
-			   void (*done)(CamelStore *, void *data), void *data);
-
-/* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
-void mail_send_queue(CamelFolder *queue, const char *destination,
-		     FilterContext *fc, const char *type,
-		     CamelOperation *cancel,
-		     CamelFilterGetFolderFunc get_folder, void *get_data,
-		     CamelFilterStatusFunc *status, void *status_data,
-		     void (*done)(char *destination, void *data), void *data);
-
-void mail_fetch_mail(const char *source, int keep,
-		     FilterContext *fc, const char *type,
-		     CamelOperation *cancel,
-		     CamelFilterGetFolderFunc get_folder, void *get_data,
-		     CamelFilterStatusFunc *status, void *status_data,
-		     void (*done)(char *source, void *data), void *data);
-
-void mail_filter_folder(CamelFolder *source_folder, GPtrArray *uids,
-			FilterContext *fc, const char *type,
-			CamelOperation *cancel);
-
-/* convenience function for above */
-void mail_filter_on_demand(CamelFolder *folder, GPtrArray *uids);
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
deleted file mode 100644
index c89148f4ba..0000000000
--- a/mail/mail-search-dialogue.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- *  Copyright (C) 2000, 2001 Ximian, Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "mail-search-dialogue.h"
-
-static void mail_search_dialogue_class_init	(MailSearchDialogueClass *class);
-static void mail_search_dialogue_init	(MailSearchDialogue *gspaper);
-static void mail_search_dialogue_finalise	(GtkObject *obj);
-
-static GnomeDialogClass *parent_class;
-
-guint
-mail_search_dialogue_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"MailSearchDialogue",
-			sizeof(MailSearchDialogue),
-			sizeof(MailSearchDialogueClass),
-			(GtkClassInitFunc)mail_search_dialogue_class_init,
-			(GtkObjectInitFunc)mail_search_dialogue_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-mail_search_dialogue_class_init (MailSearchDialogueClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	object_class->finalize = mail_search_dialogue_finalise;
-	/* override methods */
-
-}
-
-static void
-mail_search_dialogue_construct (MailSearchDialogue *o, FilterRule *rule)
-{
-	FilterPart *part;
-	GnomeDialog *dialogue = GNOME_DIALOG (o);
-	
-	gtk_window_set_policy (GTK_WINDOW (dialogue), FALSE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (dialogue), 500, 400);
-	
-	o->context = rule_context_new ();
-	rule_context_add_part_set (o->context, "partset", filter_part_get_type (),
-				   rule_context_add_part, rule_context_next_part);
-	rule_context_load (o->context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", "");
-	if (rule) {
-		o->rule = rule;
-		o->guts = filter_rule_get_widget (o->rule, o->context);
-	} else {
-		o->rule = filter_rule_new ();
-		part = rule_context_next_part (o->context, NULL);
-		if (part == NULL) {
-			g_warning ("Problem loading search: no parts to load");
-			o->guts = gtk_entry_new ();
-		} else {
-			filter_rule_add_part (o->rule, filter_part_clone (part));
-			o->guts = filter_rule_get_widget (o->rule, o->context);
-		}
-	}
-	
-	gtk_widget_show (o->guts);
-	gtk_box_pack_start (GTK_BOX (dialogue->vbox), o->guts, TRUE, TRUE, 0);
-}
-
-static void
-mail_search_dialogue_init (MailSearchDialogue *o)
-{
-	GnomeDialog *dialogue = GNOME_DIALOG (o);
-	
-	gnome_dialog_append_buttons (dialogue,
-				     GNOME_STOCK_BUTTON_OK,
-				     _("_Search"),
-				     GNOME_STOCK_BUTTON_CANCEL,
-				     NULL);
-	gnome_dialog_set_default (dialogue, 0);
-}
-
-
-static void
-mail_search_dialogue_finalise (GtkObject *obj)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)obj;
-	
-	if (o->context)
-		gtk_object_unref (GTK_OBJECT (o->context));
-	if (o->rule)
-		gtk_object_unref (GTK_OBJECT (o->rule));
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * mail_search_dialogue_new:
- *
- * Create a new MailSearchDialogue object.
- * 
- * Return value: A new #MailSearchDialogue object.
- **/
-MailSearchDialogue *
-mail_search_dialogue_new ()
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)gtk_type_new (mail_search_dialogue_get_type ());
-	mail_search_dialogue_construct (o, NULL);
-	return o;
-}
-
-MailSearchDialogue *
-mail_search_dialogue_new_with_rule (FilterRule *rule)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)gtk_type_new (mail_search_dialogue_get_type ());
-	if (rule)
-		gtk_object_ref (GTK_OBJECT (rule));
-	mail_search_dialogue_construct (o, rule);
-	return o;
-}
-
-/**
- * mail_search_dialogue_get_query:
- * @msd: 
- * 
- * Get the query string represting the current search criterea.
- * 
- * Return value: 
- **/
-char *
-mail_search_dialogue_get_query (MailSearchDialogue *msd)
-{
-	GString *out = g_string_new ("");
-	char *ret;
-	
-	filter_rule_build_code (msd->rule, out);
-	ret = out->str;
-	g_string_free (out, FALSE);
-	return ret;
-}
diff --git a/mail/mail-search-dialogue.h b/mail/mail-search-dialogue.h
deleted file mode 100644
index f952bebaf6..0000000000
--- a/mail/mail-search-dialogue.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _MAIL_SEARCH_DIALOGUE_H
-#define _MAIL_SEARCH_DIALOGUE_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#define MAIL_SEARCH_DIALOGUE(obj)	GTK_CHECK_CAST (obj, mail_search_dialogue_get_type (), MailSearchDialogue)
-#define MAIL_SEARCH_DIALOGUE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, mail_search_dialogue_get_type (), MailSearchDialogueClass)
-#define IS_MAIL_SEARCH_DIALOGUE(obj)      GTK_CHECK_TYPE (obj, mail_search_dialogue_get_type ())
-
-typedef struct _MailSearchDialogue	MailSearchDialogue;
-typedef struct _MailSearchDialogueClass	MailSearchDialogueClass;
-
-struct _MailSearchDialogue {
-	GnomeDialog parent;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *guts;
-};
-
-struct _MailSearchDialogueClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		mail_search_dialogue_get_type	(void);
-MailSearchDialogue	*mail_search_dialogue_new	(void);
-MailSearchDialogue	*mail_search_dialogue_new_with_rule(FilterRule *rule);
-
-/* methods */
-char *mail_search_dialogue_get_query(MailSearchDialogue *msd);
-
-#endif /* ! _MAIL_SEARCH_DIALOGUE_H */
-
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
deleted file mode 100644
index b9f51b65ac..0000000000
--- a/mail/mail-send-recv.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <NotZed@ximian.com>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-#include "mail-send-recv.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "filter/filter-context.h"
-#include "filter/filter-filter.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-operation.h"
-
-#include "evolution-storage.h"
-
-#include "mail.h"
-#include "mail-mt.h"
-#include "mail-config.h"
-#include "mail-session.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-
-/* for the dialogue stuff */
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-window-icon.h>
-
-#define d(x)
-
-/* ms between status updates to the gui */
-#define STATUS_TIMEOUT (250)
-
-/* send/receive email */
-
-/* ********************************************************************** */
-/*  This stuff below is independent of the stuff above */
-
-/* this stuff is used to keep track of which folders filters have accessed, and
-   what not. the thaw/refreeze thing doesn't really seem to work though */
-struct _folder_info {
-	char *uri;
-	CamelFolder *folder;
-	time_t update;
-	int count;		/* how many times updated, to slow it down as we go, if we have lots */
-};
-
-struct _send_data {
-	GList *infos;
-
-	GnomeDialog *gd;
-	int cancelled;
-
-	CamelFolder *inbox;	/* since we're never asked to update this one, do it ourselves */
-	time_t inbox_update;
-
-	GMutex *lock;
-	GHashTable *folders;
-
-	GHashTable *active;	/* send_info's by uri */
-};
-
-typedef enum {
-	SEND_RECEIVE,		/* receiver */
-	SEND_SEND,		/* sender */
-	SEND_UPDATE,		/* imap-like 'just update folder info' */
-} send_info_t ;
-
-typedef enum {
-	SEND_ACTIVE,
-	SEND_CANCELLED,
-	SEND_COMPLETE
-} send_state_t;
-
-struct _send_info {
-	send_info_t type;		/* 0 = fetch, 1 = send */
-	CamelOperation *cancel;
-	char *uri;
-	int keep;
-	send_state_t state;
-	GtkProgressBar *bar;
-	GtkButton *stop;
-
-	int timeout_id;
-	char *what;
-	int pc;
-
-	/*time_t update;*/
-	struct _send_data *data;
-};
-
-static struct _send_data *send_data = NULL;
-
-static struct _send_data *setup_send_data(void)
-{
-	struct _send_data *data;
-	
-	if (send_data == NULL) {
-		send_data = data = g_malloc0(sizeof(*data));
-		data->lock = g_mutex_new();
-		data->folders = g_hash_table_new(g_str_hash, g_str_equal);
-		data->inbox = mail_tool_get_local_inbox(NULL);
-		data->active = g_hash_table_new(g_str_hash, g_str_equal);
-	}
-	return send_data;
-}
-
-static void
-receive_cancel(GtkButton *button, struct _send_info *info)
-{
-	if (info->state == SEND_ACTIVE) {
-		camel_operation_cancel(info->cancel);
-		if (info->bar)
-			gtk_progress_set_format_string((GtkProgress *)info->bar, _("Cancelling ..."));
-		info->state = SEND_CANCELLED;
-	}
-	if (info->stop)
-		gtk_widget_set_sensitive((GtkWidget *)info->stop, FALSE);
-}
-
-static void
-free_folder_info(void *key, struct _folder_info *info, void *data)
-{
-	/*camel_folder_thaw (info->folder);	*/
-	camel_object_unref((CamelObject *)info->folder);
-	g_free(info->uri);
-}
-
-static void free_send_info(void *key, struct _send_info *info, void *data)
-{
-	d(printf("Freeing send info %p\n", info));
-	g_free(info->uri);
-	camel_operation_unref(info->cancel);
-	if (info->timeout_id != 0)
-		gtk_timeout_remove(info->timeout_id);
-	g_free(info);
-}
-
-static void
-free_send_data(void)
-{
-	struct _send_data *data = send_data;
-
-	g_assert(g_hash_table_size(data->active) == 0);
-
-	g_list_free(data->infos);
-	g_hash_table_foreach(data->active, (GHFunc)free_send_info, NULL);
-	g_hash_table_destroy(data->active);
-	g_hash_table_foreach(data->folders, (GHFunc)free_folder_info, NULL);
-	g_hash_table_destroy(data->folders);
-	g_mutex_free(data->lock);
-	if (data->inbox) {
-		/*camel_folder_thaw (data->inbox);		*/
-		camel_object_unref((CamelObject *)data->inbox);
-	}
-	g_free(data);
-	send_data = NULL;
-}
-
-
-static void cancel_send_info(void *key, struct _send_info *info, void *data)
-{
-	receive_cancel(info->stop, info);
-}
-
-static void hide_send_info(void *key, struct _send_info *info, void *data)
-{
-	info->stop = NULL;
-	info->bar = NULL;
-}
-
-static void
-dialogue_clicked(GnomeDialog *gd, int button, struct _send_data *data)
-{
-	switch(button) {
-	case 0:
-		d(printf("cancelled whole thing\n"));
-		if (!data->cancelled) {
-			data->cancelled = TRUE;
-			g_hash_table_foreach(data->active, (GHFunc)cancel_send_info, NULL);
-		}
-		gnome_dialog_set_sensitive(gd, 0, FALSE);
-		break;
-	case -1:		/* dialogue vanished, so make out its just hidden */
-		d(printf("hiding dialogue\n"));
-		g_hash_table_foreach(data->active, (GHFunc)hide_send_info, NULL);
-		break;
-	}
-}
-
-static void operation_status(CamelOperation *op, const char *what, int pc, void *data);
-static int operation_status_timeout(void *data);
-
-static struct _send_data *build_dialogue(GSList *sources, CamelFolder *outbox, const char *destination)
-{
-	GnomeDialog *gd;
-	GtkFrame *frame;
-	GtkTable *table;
-	int row;
-	GList *list = NULL;
-	struct _send_data *data;
-	GtkLabel *label;
-	GtkProgressBar *bar;
-	GtkButton *stop;
-	struct _send_info *info;
-
-	data = setup_send_data();
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("Send & Receive mail"), GNOME_STOCK_BUTTON_CANCEL, NULL);
-	gnome_window_icon_set_from_file((GtkWindow *)gd, EVOLUTION_DATADIR "images/evolution/evolution-inbox.png");
-
-	frame= (GtkFrame *)gtk_frame_new(_("Receiving"));
-	gtk_box_pack_start((GtkBox *)gd->vbox, (GtkWidget *)frame, TRUE, TRUE, 0);
-	table = (GtkTable *)gtk_table_new(g_slist_length(sources), 3, FALSE);
-	gtk_container_add((GtkContainer *)frame, (GtkWidget *)table);
-	gtk_widget_show((GtkWidget *)frame);
-
-	row = 0;
-	while (sources) {
-		MailConfigService *source = sources->data;
-		
-		if (!source->url
-		    || !source->enabled) {
-			sources = sources->next;
-			continue;
-		}
-
-		/* see if we have an outstanding download active */
-		info = g_hash_table_lookup(data->active, source->url);
-		if (info == NULL) {
-			info = g_malloc0(sizeof(*info));
-			/* imap is handled differently */
-			if (!strncmp(source->url, "imap:", 5))
-				info->type = SEND_UPDATE;
-			else
-				info->type = SEND_RECEIVE;
-			d(printf("adding source %s\n", source->url));
-
-			info->uri = g_strdup(source->url);
-			info->keep = source->keep_on_server;
-			info->cancel = camel_operation_new(operation_status, info);
-			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add(STATUS_TIMEOUT, operation_status_timeout, info);
-
-			g_hash_table_insert(data->active, info->uri, info);
-			list = g_list_prepend(list, info);
-		} else if (info->bar != NULL) {
-			/* incase we get the same source pop up again */
-			sources = sources->next;
-			continue;
-		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add(STATUS_TIMEOUT, operation_status_timeout, info);
-
-		label = (GtkLabel *)gtk_label_new(source->url);
-		bar = (GtkProgressBar *)gtk_progress_bar_new();
-		stop = (GtkButton *)gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL);
-
-		gtk_progress_set_show_text((GtkProgress *)bar, TRUE);
-
-		if (info->type == SEND_UPDATE) {
-			gtk_progress_set_format_string((GtkProgress *)bar, _("Updating ..."));
-		} else {
-			gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting ..."));
-		}
-
-		gtk_table_attach(table, (GtkWidget *)label, 0, 1, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-		gtk_table_attach(table, (GtkWidget *)bar, 1, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-		gtk_table_attach(table, (GtkWidget *)stop, 2, 3, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-
-		info->bar = bar;
-		info->stop = stop;
-		info->data = data;
-
-		gtk_signal_connect((GtkObject *)stop, "clicked", receive_cancel, info);
-		sources = sources->next;
-		row++;
-	}
-
-	gtk_widget_show_all((GtkWidget *)table);
-
-	if (outbox) {
-		frame= (GtkFrame *)gtk_frame_new(_("Sending"));
-		gtk_box_pack_start((GtkBox *)gd->vbox, (GtkWidget *)frame, TRUE, TRUE, 0);
-		table = (GtkTable *)gtk_table_new(1, 3, FALSE);
-		gtk_container_add((GtkContainer *)frame, (GtkWidget *)table);
-		gtk_widget_show((GtkWidget *)frame);
-
-		info = g_hash_table_lookup(data->active, destination);
-		if (info == NULL) {
-			info = g_malloc0(sizeof(*info));
-			info->type = SEND_SEND;
-			d(printf("adding dest %s\n", destination));
-
-			info->uri = g_strdup(destination);
-			info->keep = FALSE;
-			info->cancel = camel_operation_new(operation_status, info);
-			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add(STATUS_TIMEOUT, operation_status_timeout, info);
-
-			g_hash_table_insert(data->active, info->uri, info);
-			list = g_list_prepend(list, info);
-		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add(STATUS_TIMEOUT, operation_status_timeout, info);
-
-		label = (GtkLabel *)gtk_label_new(destination);
-		bar = (GtkProgressBar *)gtk_progress_bar_new();
-		stop = (GtkButton *)gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL);
-		
-		gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting ..."));
-		gtk_progress_set_show_text((GtkProgress *)bar, TRUE);
-		
-		gtk_table_attach(table, (GtkWidget *)label, 0, 1, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-		gtk_table_attach(table, (GtkWidget *)bar, 1, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-		gtk_table_attach(table, (GtkWidget *)stop, 2, 3, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
-	
-		info->bar = bar;
-		info->stop = stop;
-		info->data = data;
-		
-		gtk_signal_connect((GtkObject *)stop, "clicked", receive_cancel, info);
-		gtk_widget_show_all((GtkWidget *)table);
-	}
-
-	gtk_widget_show((GtkWidget *)gd);
-
-	gtk_signal_connect((GtkObject *)gd, "clicked", dialogue_clicked, data);
-
-	data->infos = list;
-	data->gd = gd;
-
-	return data;
-}
-
-static void
-update_folders(char *uri, struct _folder_info *info, void *data)
-{
-	time_t now = *((time_t *)data);
-
-	d(printf("checking update for folder: %s\n", info->uri));
-
-	/* let it flow through to the folders every 10 seconds */
-	/* we back off slowly as we progress */
-	if (now > info->update+10+info->count*5) {
-		d(printf("upating a folder: %s\n", info->uri));
-		/*camel_folder_thaw(info->folder);
-		  camel_folder_freeze(info->folder);*/
-		info->update = now;
-		info->count++;
-	}
-}
-
-static void set_send_status(struct _send_info *info, const char *desc, int pc)
-{
-	const char *p;
-	char *out, *o, c;
-
-	out = alloca(strlen(desc)*2+1);
-	o = out;
-	p = desc;
-	while ((c = *p++)) {
-		if (c=='%')
-			*o++ = '%';
-		*o++ = c;
-	}
-	*o = 0;
-	
-	/* FIXME: LOCK */
-	g_free(info->what);
-	info->what = g_strdup(out);
-	info->pc = pc;
-}
-
-static void
-receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, void *data)
-{
-	struct _send_info *info = data;
-	time_t now;
-
-	/* let it flow through to the folder, every now and then too? */
-	g_hash_table_foreach(info->data->folders, (GHFunc)update_folders, &now);
-
-	if (info->data->inbox && now > info->data->inbox_update+20) {
-		d(printf("updating inbox too\n"));
-		/* this doesn't seem to work right :( */
-		/*camel_folder_thaw(info->data->inbox);
-		  camel_folder_freeze(info->data->inbox);*/
-		info->data->inbox_update = now;
-	}
-
-	/* we just pile them onto the port, assuming it can handle it.
-	   We could also have a receiver port and see if they've been processed
-	   yet, so if this is necessary its not too hard to add */
-	/* the mail_gui_port receiver will free everything for us */
-	switch (status) {
-	case CAMEL_FILTER_STATUS_START:
-	case CAMEL_FILTER_STATUS_END:
-		set_send_status(info, desc, pc);
-		break;
-	default:
-		break;
-	}
-}
-
-static int operation_status_timeout(void *data)
-{
-	struct _send_info *info = data;
-
-	if (info->bar) {
-		gtk_progress_set_percentage((GtkProgress *)info->bar, (gfloat)(info->pc/100.0));
-		gtk_progress_set_format_string((GtkProgress *)info->bar, info->what);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* for camel operation status */
-static void operation_status(CamelOperation *op, const char *what, int pc, void *data)
-{
-	struct _send_info *info = data;
-
-	/*printf("Operation '%s', percent %d\n");*/
-	switch (pc) {
-	case CAMEL_OPERATION_START:
-		pc = 0;
-		break;
-	case CAMEL_OPERATION_END:
-		pc = 100;
-		break;
-	}
-
-	set_send_status(info, what, pc);
-}
-
-/* when receive/send is complete */
-static void
-receive_done (char *uri, void *data)
-{
-	struct _send_info *info = data;
-
-	if (info->bar) {
-		gtk_progress_set_percentage((GtkProgress *)info->bar, (gfloat)1.0);
-
-		switch(info->state) {
-		case SEND_CANCELLED:
-			gtk_progress_set_format_string((GtkProgress *)info->bar, _("Cancelled."));
-			break;
-		default:
-			info->state = SEND_COMPLETE;
-			gtk_progress_set_format_string((GtkProgress *)info->bar, _("Complete."));
-		}
-	}
-
-	if (info->stop)
-		gtk_widget_set_sensitive((GtkWidget *)info->stop, FALSE);
-
-	/* remove/free this active download */
-	d(printf("%s: freeing info %p\n", __FUNCTION__, info));
-	g_hash_table_remove(info->data->active, info->uri);
-	info->data->infos = g_list_remove(info->data->infos, info);
-	g_free(info->uri);
-	camel_operation_unref(info->cancel);
-	if (info->timeout_id)
-		gtk_timeout_remove(info->timeout_id);
-
-	if (g_hash_table_size(info->data->active) == 0) {
-		if (info->data->gd)
-			gtk_object_unref((GtkObject *)info->data->gd);
-		free_send_data();
-	}
-
-	g_free(info);
-}
-
-/* same for updating */
-static void
-receive_update_done(CamelStore *store, void *data)
-{
-	receive_done("", data);
-}
-
-/* although we dont do anythign smart here yet, there is no need for this interface to
-   be available to anyone else.
-   This can also be used to hook into which folders are being updated, and occasionally
-   let them refresh */
-static CamelFolder *
-receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)
-{
-	struct _send_info *info = data;
-	CamelFolder *folder;
-	struct _folder_info *oldinfo;
-	char *oldkey;
-
-	g_mutex_lock(info->data->lock);
-	folder = g_hash_table_lookup(info->data->folders, uri);
-	g_mutex_unlock(info->data->lock);
-	if (folder) {
-		camel_object_ref((CamelObject *)folder);
-		return folder;
-	}
-	folder = mail_tool_uri_to_folder(uri, ex);
-	if (!folder)
-		return NULL;
-
-	/* we recheck that the folder hasn't snuck in while we were loading it ... */
-	/* and we assume the newer one is the same, but unref the old one anyway */
-	g_mutex_lock(info->data->lock);
-	
-	if (g_hash_table_lookup_extended(info->data->folders, uri, (void **)&oldkey, (void **)&oldinfo)) {
-		camel_object_unref((CamelObject *)oldinfo->folder);
-		oldinfo->folder = folder;
-	} else {
-		/*camel_folder_freeze (folder);		*/
-		oldinfo = g_malloc0(sizeof(*oldinfo));
-		oldinfo->folder = folder;
-		oldinfo->uri = g_strdup(uri);
-		g_hash_table_insert(info->data->folders, oldinfo->uri, oldinfo);
-	}
-	
-	camel_object_ref (CAMEL_OBJECT (folder));
-	
-	g_mutex_unlock(info->data->lock);
-	
-	return folder;
-}
-
-static void
-receive_update_got_store(char *uri, CamelStore *store, void *data)
-{
-	struct _send_info *info = data;
-
-	if (store) {
-		EvolutionStorage *storage = mail_lookup_storage(store);
-		if (storage) {
-			mail_update_subfolders(store, storage, receive_update_done, info);
-			gtk_object_unref((GtkObject *)storage);
-		} else {
-			receive_done("", info);
-		}
-	} else {
-		receive_done("", info);
-	}
-}
-
-void mail_send_receive(void)
-{
-	GSList *sources;
-	GList *scan;
-	FilterContext *fc;
-	static GtkWidget *gd = NULL;
-	struct _send_data *data;
-	extern CamelFolder *outbox_folder;
-	const MailConfigAccount *account;
-
-	if (gd != NULL) {
-		g_assert(GTK_WIDGET_REALIZED(gd));
-		gdk_window_show(gd->window);
-		gdk_window_raise(gd->window);
-		return;
-	}
-
-	sources = mail_config_get_sources();
-	if (!sources)
-		return;
-	account = mail_config_get_default_account();
-	if (!account || !account->transport)
-		return;
-	
-	fc = mail_load_filter_context();
-		
-	/* what to do about pop before smtp ?
-	   Well, probably hook into receive_done or receive_status on
-	   the right pop account, and when it is, then kick off the
-	   smtp one. */
-	data = build_dialogue(sources, outbox_folder, account->transport->url);
-	scan = data->infos;
-	gd = GTK_WIDGET(data->gd);
-	gtk_signal_connect((GtkObject *)gd, "destroy", gtk_widget_destroyed, &gd);
-	while (scan) {
-		struct _send_info *info = scan->data;
-		
-		switch(info->type) {
-		case SEND_RECEIVE:
-			mail_fetch_mail(info->uri, info->keep,
-					fc, FILTER_SOURCE_INCOMING,
-					info->cancel,
-					receive_get_folder, info,
-					receive_status, info,
-					receive_done, info);
-			break;
-		case SEND_SEND:
-			/* todo, store the folder in info? */
-			mail_send_queue(outbox_folder, info->uri,
-					fc, FILTER_SOURCE_OUTGOING,
-					info->cancel,
-					receive_get_folder, info,
-					receive_status, info,
-					receive_done, info);
-			break;
-		case SEND_UPDATE:
-			/* FIXME: error reporting? */
-			mail_get_store(info->uri, receive_update_got_store, info);
-			break;
-		}
-		scan = scan->next;
-	}
-	
-	gtk_object_unref((GtkObject *)fc);
-}
-
-struct _auto_data {
-	char *uri;
-	int keep;		/* keep on server flag */
-	int period;		/* in seconds */
-	int timeout_id;
-};
-
-static GHashTable *auto_active;
-
-static gboolean
-auto_timeout(void *data)
-{
-	struct _auto_data *info = data;
-
-	mail_receive_uri(info->uri, info->keep);
-
-	return TRUE;
-}
-
-static void auto_setup_set(void *key, struct _auto_data *info, GHashTable *set)
-{
-	g_hash_table_insert(set, info->uri, info);
-}
-
-static void auto_clean_set(void *key, struct _auto_data *info, GHashTable *set)
-{
-	d(printf("removing auto-check for %s %p\n", info->uri, info));
-	g_hash_table_remove(set, info->uri);
-	gtk_timeout_remove(info->timeout_id);
-	g_free(info->uri);
-	g_free(info);
-}
-
-/* call to setup initial, and after changes are made to the config */
-/* FIXME: Need a cleanup funciton for when object is deactivated */
-void
-mail_autoreceive_setup(void)
-{
-	GSList *sources;
-	GHashTable *set_hash;
-
-	sources = mail_config_get_sources();
-	if (!sources)
-		return;
-
-	if (auto_active == NULL)
-		auto_active = g_hash_table_new(g_str_hash, g_str_equal);
-
-	set_hash = g_hash_table_new(g_str_hash, g_str_equal);
-	g_hash_table_foreach(auto_active, (GHFunc)auto_setup_set, set_hash);
-
-	while (sources) {
-		MailConfigService *source = sources->data;
-		if (source->url && source->auto_check && source->enabled) {
-			struct _auto_data *info;
-
-			d(printf("setting up auto-receive mail for : %s\n", source->url));
-
-			g_hash_table_remove(set_hash, source->url);
-			info = g_hash_table_lookup(auto_active, source->url);
-			if (info) {
-				info->keep = source->keep_on_server;
-				if (info->period != source->auto_check_time*60) {
-					info->period = source->auto_check_time*60;
-					gtk_timeout_remove(info->timeout_id);
-					info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
-				}
-			} else {
-				info = g_malloc0(sizeof(*info));
-				info->uri = g_strdup(source->url);
-				info->keep = source->keep_on_server;
-				info->period = source->auto_check_time*60;
-				info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
-				g_hash_table_insert(auto_active, info->uri, info);
-				/* If we do this at startup, it can cause the logon dialogue to be hidden,
-				   so lets not */
-				/*mail_receive_uri(source->url, source->keep_on_server);*/
-			}
-		}
-
-		sources = sources->next;
-	}
-
-	g_hash_table_foreach(set_hash, (GHFunc)auto_clean_set, auto_active);
-	g_hash_table_destroy(set_hash);
-}
-
-/* we setup the download info's in a hashtable, if we later need to build the gui, we insert
-   them in to add them. */
-void mail_receive_uri(const char *uri, int keep)
-{
-	FilterContext *fc;
-	struct _send_info *info;
-	struct _send_data *data;
-	extern CamelFolder *outbox_folder;
-
-	data = setup_send_data();
-	info = g_hash_table_lookup(data->active, uri);
-	if (info != NULL) {
-		d(printf("download of %s still in progress\n", uri));
-		return;
-	}
-
-	d(printf("starting non-interactive download of '%s'\n", uri));
-
-	info = g_malloc0(sizeof(*info));
-	/* imap is handled differently */
-	if (!strncmp(uri, "imap:", 5))
-		info->type = SEND_UPDATE;
-	else
-		info->type = SEND_RECEIVE;
-
-	info->bar = NULL;
-	info->uri = g_strdup(uri);
-	info->keep = keep;
-	info->cancel = camel_operation_new(operation_status, info);
-	info->stop = NULL;
-	info->data = data;
-	info->state = SEND_ACTIVE;
-	info->timeout_id = 0;
-
-	d(printf("Adding new info %p\n", info));
-
-	g_hash_table_insert(data->active, info->uri, info);
-
-	fc = mail_load_filter_context();
-	switch(info->type) {
-	case SEND_RECEIVE:
-		mail_fetch_mail(info->uri, info->keep,
-				fc, FILTER_SOURCE_INCOMING,
-				info->cancel,
-				receive_get_folder, info,
-				receive_status, info,
-				receive_done, info);
-		break;
-	case SEND_SEND:
-		/* todo, store the folder in info? */
-		mail_send_queue(outbox_folder, info->uri,
-				fc, FILTER_SOURCE_OUTGOING,
-				info->cancel,
-				receive_get_folder, info,
-				receive_status, info,
-				receive_done, info);
-		break;
-	case SEND_UPDATE:
-		/* FIXME: error reporting? */
-		mail_get_store(info->uri, receive_update_got_store, info);
-		break;
-	}
-	gtk_object_unref((GtkObject *)fc);
-}
-
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
deleted file mode 100644
index ef3a502b4c..0000000000
--- a/mail/mail-send-recv.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi <NotZed@ximian.com>
- *
- *  Copyright 2001 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 MAIL_SEND_RECV_H
-#define MAIL_SEND_RECV_H
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-/* send/receive all uri's */
-void mail_send_receive(void);
-/* receive a single uri */
-void mail_receive_uri(const char *uri, int keep);
-/* setup auto receive stuff */
-void mail_autoreceive_setup(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_SEND_RECV_H */
diff --git a/mail/mail-session.h b/mail/mail-session.h
deleted file mode 100644
index bde6c8d186..0000000000
--- a/mail/mail-session.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_SESSION_H
-#define MAIL_SESSION_H
-
-#include <gnome.h>
-#include <bonobo.h>
-#include <camel/camel-session.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void mail_session_init (void);
-void mail_session_enable_interaction (gboolean enable);
-char *mail_session_request_dialog (const char *prompt, gboolean secret,
-				   const char *key, gboolean async);
-void mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
-				    const char *path);
-void mail_session_remember_password (const char *url);
-
-void mail_session_forget_password (const char *key);
-
-void mail_session_set_password (const char *url, const char *password);
-
-extern CamelSession *session;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_SESSION_H */
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
deleted file mode 100644
index fb7b88ce8b..0000000000
--- a/mail/mail-summary.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <bonobo/bonobo-property-bag.h>
-
-#include "camel.h"
-#include <gnome.h>
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-summary.h"
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-storage-listener.h"
-
-#include "filter/vfolder-context.h"
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-html-view.h>
-
-typedef struct {
-	CamelFolder *folder;
-
-	char *name;
-	char *uri;
-	int total, unread;
-} FolderSummary;
-
-typedef struct {
-	BonoboObject *component;
-	BonoboObject *view;
-	EvolutionStorageListener *listener;
-
-	GHashTable *folder_to_summary;
-	FolderSummary **folders;
-	int numfolders;
-
-	char *title;
-	char *icon;
-
-	guint idle;
-	gboolean in_summary;
-} MailSummary;
-
-#define SUMMARY_IN() g_print ("IN: %s: %d\n", __FUNCTION__, __LINE__);
-#define SUMMARY_OUT() g_print ("OUT: %s: %d\n", __FUNCTION__, __LINE__);
-
-static int queue_len = 0;
-
-extern char *evolution_dir;
-extern EvolutionStorage *vfolder_storage;
-
-#define MAIN_READER main_compipe[0]
-#define MAIN_WRITER main_compipe[1]
-#define DISPATCH_READER dispatch_compipe[0]
-#define DISPATCH_WRITER dispatch_compipe[1]
-
-static int main_compipe[2] = {-1, -1};
-static int dispatch_compipe[2] = {-1, -1};
-
-GIOChannel *summary_chan_reader = NULL;
-
-static gboolean do_changed (MailSummary *summary);
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-/* Read a message from the pipe */
-static gboolean
-read_msg (GIOChannel *source,
-	  GIOCondition condition,
-	  gpointer user_data)
-{
-	MailSummary *summary;
-	int size;
-
-	summary = g_new0 (MailSummary, 1);
-	g_io_channel_read (source, (gchar *) summary,
-			   sizeof (MailSummary) / sizeof (gchar), &size);
-
-	if (size != sizeof (MailSummary)) {
-		g_warning (_("Incomplete message written on pipe!"));
-		return TRUE;
-	}
-
-	do_changed (summary);
-	g_free (summary);
-
-	return TRUE;
-}
-
-/* check_compipes: */
-static void
-check_compipes (void)
-{
-	if (MAIN_READER < 0) {
-		if (pipe (main_compipe) < 0) {
-			g_warning ("Call to pipe failed");
-			return;
-		}
-
-		summary_chan_reader = g_io_channel_unix_new (MAIN_READER);
-		g_io_add_watch (summary_chan_reader, G_IO_IN, read_msg, NULL);
-	}
-
-	if (DISPATCH_READER < 0) {
-		if (pipe (dispatch_compipe) < 0) {
-			g_warning ("Call to pipe failed");
-			return;
-		}
-	}
-}
-
-static void
-folder_free (FolderSummary *folder)
-{
-	g_free (folder->name);
-	g_free (folder->uri);
-}
-
-static void
-summary_free (MailSummary *summary)
-{
-	int i;
-
-	for (i = 0; i < summary->numfolders; i++){
-		folder_free (summary->folders[i]);
-	}
-
-	g_free (summary->folders);
-	g_free (summary->title);
-	g_free (summary->icon);
-
-	g_hash_table_destroy (summary->folder_to_summary);
-}
-
-static void
-view_destroy_cb (GtkObject *object,
-		 MailSummary *summary)
-{
-	summary_free (summary);
-	g_free (summary);
-}
-
-static char *
-generate_html_summary (MailSummary *summary)
-{
-	char *ret_html = NULL, *tmp;
-	FolderSummary *fs;
-	int i;
-
-	summary->in_summary = TRUE;
-	/* Inbox first */
-	fs = summary->folders[0];
-
-	g_print ("%p: %p\n", fs, fs->name);
-	g_print ("unread: %d\n", fs->unread);
-	g_print ("total: %d\n", fs->total);
-
-	tmp = g_strdup_printf ("<table><tr><td><b><a href=\"view://evolution:/local/Inbox\">%s</a>:</b>"
-			       "<td align=\"right\">%d/%d</td></tr>",
-			       fs->name, fs->unread, fs->total);
-
-	ret_html = g_strdup (tmp);
-	for (i = 1; i < summary->numfolders; i++) {
-		char *tmp2; 
-
-		fs = summary->folders[i];
-		tmp2 = g_strdup_printf ("<tr><td><a href=\"view://%s\">%s</a>:</td>"
-					"<td align=\"right\">%d/%d</td></tr>",
-					fs->uri, fs->name, fs->unread, fs->total);
-
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, tmp2, NULL);
-		g_free (tmp);
-		g_free (tmp2);
-	}
-
-	tmp = ret_html;
-	ret_html = g_strconcat (ret_html, "</table>", NULL);
-	g_free (tmp);
-
-	summary->in_summary = FALSE;
-	return ret_html;
-}
-	
-static gboolean
-do_changed (MailSummary *summary)
-{
-	char *ret_html;
-
-	ret_html = generate_html_summary (summary);
-	executive_summary_html_view_set_html(EXECUTIVE_SUMMARY_HTML_VIEW(summary->view), (const char *) ret_html);
-	g_free (ret_html);
-
-	summary->idle = 0;
-	return TRUE;
-}
-
-/* These two callbacks are called from the Camel thread,
-   which can't make any CORBA calls, or else ORBit locks up,
-   and likewise the thread that can call ORBit, cannot call
-   camel.
-
-   So, when the callbacks are triggered, they generate a MailSummary
-   structure and write this onto a pipe. The ORBit calling thread
-   detects when something is written to the pipe and creates its own
-   MailSummary structure, and calls the appropriate CORBA calls.
-
-   Same theory as mail-threads.c, but a lot less complicated
-   as there is only one way communication, and only one type of message
-*/
-static void
-folder_changed_cb (CamelObject *folder,
-		   gpointer event_data,
-		   gpointer user_data)
-{
-	MailSummary *summary;
-	FolderSummary *fs;
-
-	summary = (MailSummary *) user_data;
-	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
-	if (fs == NULL) {
-		g_warning ("%s: Unknown folder", __FUNCTION__);
-		return;
-	}
-
-	fs->total = camel_folder_get_message_count (fs->folder);
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-
-	return;
-}
-
-static void
-message_changed_cb (CamelObject *folder,
-		    gpointer event_data,
-		    gpointer user_data)
-{
-	MailSummary *summary;
-	FolderSummary *fs;
-
-	summary = (MailSummary *)user_data;
-	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
-	if (fs == NULL) {
-		g_warning ("%s: Unknown folder.", __FUNCTION__);
-		return;
-	}
-
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-	fs->total = camel_folder_get_message_count (fs->folder);
-
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-	
-	return;
-}
-
-static void
-generate_folder_summaries (MailSummary *summary)
-{
-	int numfolders = 1; /* Always at least the Inbox */
-	char *user, *system;
-	FilterRule *rule;
-	VfolderContext *context;
-	FolderSummary *fs;
-	CamelException *ex;
-	int i;
-
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-	system = g_strdup_printf ("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-
-	context = vfolder_context_new ();
-	rule_context_load ((RuleContext *)context, system, user);
-	g_free (user);
-	g_free (system);
-
-	rule = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *)context, rule, NULL))){
-		g_print ("rule->name: %s\n", rule->name);
-		numfolders++;
-	}
-
-	if (summary->folders != NULL) {
-		int i;
-		
-		for (i = 0; i < summary->numfolders; i++){
-			folder_free (summary->folders[i]);
-		}
-		
-		g_free (summary->folders);
-	}
-
-	summary->folders = g_new (FolderSummary *, numfolders);
-
-	/* Inbox */
-	fs = summary->folders[0] = g_new (FolderSummary, 1);
-	fs->name = g_strdup ("Inbox");
-	g_print ("%p: %s(%p)\n", fs, fs->name, fs->name);
-	fs->uri = NULL;
-	ex = camel_exception_new ();
-	fs->folder = mail_tool_get_local_inbox (ex);
-
-	fs->total = camel_folder_get_message_count (fs->folder);
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-	camel_exception_free (ex);
-	camel_object_hook_event (CAMEL_OBJECT (fs->folder), "folder_changed",
-				 (CamelObjectEventHookFunc) folder_changed_cb,
-				 summary);
-	camel_object_hook_event (CAMEL_OBJECT (fs->folder), "message_changed",
-				 (CamelObjectEventHookFunc) message_changed_cb,
-				 summary);
-	g_hash_table_insert (summary->folder_to_summary, fs->folder, fs);
-	
-
-	summary->numfolders = 1;
-
-	for (i = 1, rule = NULL; i < numfolders; i++) {
-		char *uri;
-
-		ex = camel_exception_new ();
-		fs = summary->folders[i] = g_new (FolderSummary, 1);
-		rule = rule_context_next_rule ((RuleContext *)context, rule, NULL);
-		fs->name = g_strdup (rule->name);
-
-		uri = g_strconcat ("vfolder:", rule->name, NULL);
-		fs->folder = vfolder_uri_to_folder (uri, ex);
-		fs->uri = g_strconcat ("evolution:/VFolders/", rule->name, NULL);
-		g_free (uri);
-
-		fs->total = camel_folder_get_message_count (fs->folder);
-		fs->unread = camel_folder_get_unread_message_count (fs->folder);
-
-		/* Connect to each folder */
-		camel_object_hook_event (CAMEL_OBJECT (fs->folder), 
-					 "folder_changed",
-					 (CamelObjectEventHookFunc) folder_changed_cb,
-					 summary);
-		camel_object_hook_event (CAMEL_OBJECT (fs->folder), 
-					 "message_changed",
-					 (CamelObjectEventHookFunc) message_changed_cb,
-					 summary);
-		g_hash_table_insert (summary->folder_to_summary, fs->folder, fs);
-		summary->numfolders++;
-
-		camel_exception_free (ex);
-	}
-
-	gtk_object_destroy (GTK_OBJECT (context));
-}
-
-static void
-get_property (BonoboPropertyBag *bag,
-	      BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	MailSummary *summary = (MailSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		BONOBO_ARG_SET_STRING (arg, summary->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, summary->icon);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* This code may play with the threads wrongly...
-   if the mail component locks when you use the summary
-   remove this define */
-#define DETECT_NEW_VFOLDERS
-#ifdef DETECT_NEW_VFOLDERS
-
-/* Check that we can generate a new summary
-   and keep coming back until we can. */
-static gboolean
-idle_check (gpointer data)
-{
-	MailSummary *summary = (MailSummary *) data;
-
-	if (summary->in_summary == TRUE)
-		return TRUE;
-
-	generate_folder_summaries (summary);
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-	summary->idle = 0;
-	
-	return FALSE;
-}
-
-static void
-new_folder_cb (EvolutionStorageListener *listener,
-	       const char *path,
-	       const GNOME_Evolution_Folder *folder,
-	       MailSummary *summary)
-{
-	g_print ("New folder: %s\n", path);
-
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-}
-
-static void
-removed_folder_cb (EvolutionStorageListener *listener,
-		   const char *path,
-		   MailSummary *summary)
-{
-	g_print ("Removed folder: %s\n", path);
-
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-}
-#endif
-
-BonoboObject *
-create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-		     void *closure)
-{
-	GNOME_Evolution_Storage corba_local_objref;
-	GNOME_Evolution_StorageListener corba_object;
-	CORBA_Environment ev;
-	BonoboObject *component, *view;
-	BonoboPropertyBag *bag;
-	BonoboEventSource *event_source;
-	MailSummary *summary;
-
-	summary = g_new (MailSummary, 1);
-	summary->folders = 0;
-	summary->in_summary = FALSE;
-	summary->folder_to_summary = g_hash_table_new (NULL, NULL);
-	summary->title = g_strdup ("Mail Summary");
-	summary->icon = g_strdup ("envelope.png");
-	summary->idle = 0;
-
-	check_compipes ();
-
-	component = executive_summary_component_new ();
-	summary->component = component;
-
-	event_source = bonobo_event_source_new ();
-
-	view = executive_summary_html_view_new_full (event_source);
-	bonobo_object_add_interface (component, view);
-	summary->view = view;
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroy_cb), summary);
-
-	bag = bonobo_property_bag_new_full (get_property, NULL, 
-					    event_source, summary);
-	bonobo_property_bag_add (bag,
-				 "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING, NULL,
-				 "The title of this component's window", 
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_property_bag_add (bag,
-				 "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING, NULL,
-				 "The icon for this component's window", 
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
-
-#ifdef DETECT_NEW_VFOLDERS 
-	summary->listener = evolution_storage_listener_new ();
-	gtk_signal_connect (GTK_OBJECT (summary->listener), "new_folder",
-			    GTK_SIGNAL_FUNC (new_folder_cb), summary);
-	gtk_signal_connect (GTK_OBJECT (summary->listener), "removed_folder",
-			    GTK_SIGNAL_FUNC (removed_folder_cb), summary);
-
-	corba_object = evolution_storage_listener_corba_objref (summary->listener);
-
-	CORBA_exception_init (&ev);
-	corba_local_objref = bonobo_object_corba_objref (BONOBO_OBJECT (vfolder_storage));
-
-	GNOME_Evolution_Storage_addListener (corba_local_objref,
-					     corba_object, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Cannot add a listener to the vfolder storage.");
-	}
-	CORBA_exception_free (&ev);
-#endif
-	
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-
-	return component;
-}
diff --git a/mail/mail-summary.h b/mail/mail-summary.h
deleted file mode 100644
index 8c706a1787..0000000000
--- a/mail/mail-summary.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __MAIL_SUMMARY_H__
-#define __MAIL_SUMMARY_H__
-
-#include <evolution-services/executive-summary-component.h>
-
-BonoboObject *create_summary_view (ExecutiveSummaryComponentFactory *factory,
-				   void *closure);
-
-#endif
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
deleted file mode 100644
index 73d024f8ff..0000000000
--- a/mail/mail-tools.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Authors: 
- *  Dan Winship <danw@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <errno.h>
-#include "camel/camel.h"
-#include "camel/camel-vee-folder.h"
-#include "mail-vfolder.h"
-#include "filter/vfolder-rule.h"
-#include "filter/vfolder-context.h"
-#include "filter/filter-option.h"
-#include "filter/filter-input.h"
-#include "mail.h" /*session*/
-#include "mail-tools.h"
-#include "mail-local.h"
-#include "e-util/e-html-utils.h"
-
-/* **************************************** */
-
-G_LOCK_DEFINE_STATIC (camel);
-G_LOCK_DEFINE_STATIC (camel_locklevel);
-static GPrivate *camel_locklevel = NULL;
-
-#define LOCK_VAL (GPOINTER_TO_INT (g_private_get (camel_locklevel)))
-#define LOCK_SET(val) g_private_set (camel_locklevel, (GINT_TO_POINTER (val)))
-
-
-CamelFolder *
-mail_tool_get_folder_from_urlname (const gchar *url, const gchar *name,
-				   guint32 flags, CamelException *ex)
-{
-	CamelStore *store;
-	CamelFolder *folder;
-
-	store = camel_session_get_store (session, url, ex);
-	if (!store)
-		return NULL;
-
-	folder = camel_store_get_folder (store, name, flags, ex);
-	camel_object_unref (CAMEL_OBJECT (store));
-
-	return folder;
-}
-
-const gchar *
-mail_tool_get_folder_name (CamelFolder *folder)
-{
-	const char *name = camel_folder_get_full_name (folder);
-	char *path;
-
-	/* This is a kludge. */
-
-	if (strcmp (name, "//mbox") && strcmp (name, "//mh"))
-		return name;
-
-	/* For mbox/mh, return the parent store's final path component. */
-	path = CAMEL_SERVICE (folder->parent_store)->url->path;
-	if (strchr (path, '/'))
-		return strrchr (path, '/') + 1;
-	else
-		return path;
-}
-
-gchar *
-mail_tool_get_local_movemail_path (void)
-{
-	return g_strdup_printf ("%s/local/Inbox/movemail", evolution_dir);
-}
-
-CamelFolder *
-mail_tool_get_local_inbox (CamelException *ex)
-{
-	gchar *url;
-	CamelFolder *folder;
-
-	url = g_strdup_printf("file://%s/local/Inbox", evolution_dir);
-	folder = mail_tool_uri_to_folder (url, ex);
-	g_free (url);
-	return folder;
-}
-
-CamelFolder *
-mail_tool_get_inbox (const gchar *url, CamelException *ex)
-{
-	CamelStore *store;
-	CamelFolder *folder;
-
-	store = camel_session_get_store (session, url, ex);
-	if (!store)
-		return NULL;
-
-	folder = camel_store_get_inbox (store, ex);
-	camel_object_unref (CAMEL_OBJECT (store));
-
-	return folder;
-}
-
-/* why is this function so stupidly complex when allthe work is done elsehwere? */
-char *
-mail_tool_do_movemail (const gchar *source_url, CamelException *ex)
-{
-	gchar *dest_path;
-	const gchar *source;
-	struct stat sb;
-#ifndef MOVEMAIL_PATH
-	int tmpfd;
-#endif
-	g_return_val_if_fail (strncmp (source_url, "mbox:", 5) == 0, NULL);
-
-	/* Set up our destination. */
-
-	dest_path = mail_tool_get_local_movemail_path();
-
-	/* Create a new movemail mailbox file of 0 size */
-
-#ifndef MOVEMAIL_PATH
-	tmpfd = open (dest_path, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-
-	if (tmpfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create temporary "
-				      "mbox `%s': %s"), dest_path, g_strerror (errno));
-		g_free (dest_path);
-		return NULL;
-	}
-
-	close (tmpfd);
-#endif
-
-	/* Skip over "mbox:" plus host part (if any) of url. */
-
-	source = source_url + 5;
-	if (!strncmp (source, "//", 2))
-		source = strchr (source + 2, '/');
-
-
-	/* Movemail from source (source_url) to dest_path */
-	camel_movemail (source, dest_path, ex);
-
-	if (stat (dest_path, &sb) < 0 || sb.st_size == 0) {
-		g_free (dest_path);
-		return NULL;
-	}
-
-	if (camel_exception_is_set (ex)) {
-		g_free (dest_path);
-		return NULL;
-	}
-
-	return dest_path;
-}
-
-void
-mail_tool_set_uid_flags (CamelFolder *folder, const char *uid, guint32 mask, guint32 set)
-{
-	camel_folder_set_message_flags (folder, uid, mask, set);
-}
-
-char *
-mail_tool_generate_forward_subject (CamelMimeMessage *msg)
-{
-	const char *subject;
-	char *fwd_subj, *fromstr;
-	const CamelInternetAddress *from;
-
-	from = camel_mime_message_get_from(msg);
-	subject = camel_mime_message_get_subject(msg);
-
-	if (from) {
-		fromstr = camel_address_format((CamelAddress *)from);
-		if (subject && *subject) {
-			fwd_subj = g_strdup_printf ("[%s] %s", fromstr, subject);
-		} else {
-			fwd_subj = g_strdup_printf (_("[%s] (forwarded message)"),
-						    fromstr);
-		}
-		g_free(fromstr);
-	} else {
-		if (subject && *subject) {
-			if (strncmp (subject, "Fwd: ", 5) == 0)
-				subject += 4;
-			fwd_subj = g_strdup_printf ("Fwd: %s", subject);
-		} else
-			fwd_subj = g_strdup (_("Fwd: (no subject)"));
-	}
-
-	return fwd_subj;
-}
-
-CamelMimePart *
-mail_tool_make_message_attachment (CamelMimeMessage *message)
-{
-	CamelMimePart *part;
-	const char *subject;
-	gchar *desc;
-
-	/*camel_object_ref (CAMEL_OBJECT (message));*/
-
-	subject = camel_mime_message_get_subject (message);
-	if (subject)
-		desc = g_strdup_printf (_("Forwarded message - %s"), subject);
-	else
-		desc = g_strdup (_("Forwarded message (no subject)"));
-
-	part = camel_mime_part_new ();
-	camel_mime_part_set_disposition (part, "inline");
-	camel_mime_part_set_description (part, desc);
-	camel_medium_set_content_object (CAMEL_MEDIUM (part),
-					 CAMEL_DATA_WRAPPER (message));
-	camel_mime_part_set_content_type (part, "message/rfc822");
-	g_free(desc);
-	/*camel_object_unref (CAMEL_OBJECT (message));*/
-	return part;
-}
-
-CamelFolder *
-mail_tool_uri_to_folder (const char *uri, CamelException *ex)
-{
-	CamelURL *url;
-	CamelStore *store = NULL;
-	CamelFolder *folder = NULL;
-	int offset = 0;
-	
-	g_return_val_if_fail (uri != NULL, NULL);
-	
-	if (!strncmp (uri, "vtrash:", 7))
-		offset = 7;
-	
-	url = camel_url_new (uri + offset, ex);
-	if (!url)
-		return NULL;
-	
-	if (!strcmp (url->protocol, "vfolder")) {
-		folder = vfolder_uri_to_folder (uri, ex);
-	} else {
-		store = camel_session_get_store (session, uri + offset, ex);
-		if (store) {
-			char *name;
-			
-			if (url->path && *url->path)
-				name = url->path + 1;
-			else
-				name = "";
-
-			if (offset)
-				folder = camel_store_get_trash (store, ex);
-			else
-				folder = camel_store_get_folder (store, name,
-								 CAMEL_STORE_FOLDER_CREATE, ex);
-		}
-	}
-
-	if (camel_exception_is_set (ex)) {
-		if (folder) {
-			camel_object_unref (CAMEL_OBJECT (folder));
-			folder = NULL;
-		}
-	}
-	if (store)
-		camel_object_unref (CAMEL_OBJECT (store));
-	camel_url_free (url);
-
-	return folder;
-}
-
-/**
- * mail_tool_quote_message:
- * @message: mime message to quote
- * @fmt: credits format - example: "On %s, %s wrote:\n"
- * @Varargs: arguments
- *
- * Returns an allocated buffer containing the quoted message.
- */
-gchar *
-mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
-{
-	CamelDataWrapper *contents;
-	gboolean want_plain, is_html;
-	gchar *text;
-	
-	want_plain = !mail_config_get_send_html ();
-	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	text = mail_get_message_body (contents, want_plain, &is_html);
-	
-	/* Set the quoted reply text. */
-	if (text) {
-		gchar *ret_text, *credits = NULL;
-		
-		/* create credits */
-		if (fmt) {
-			va_list ap;
-			
-			va_start (ap, fmt);
-			credits = g_strdup_vprintf (fmt, ap);
-			va_end (ap);
-		}
-		
-		if (is_html) {
-			if (credits) {
-				ret_text = g_strdup_printf ("<blockquote><i>\n%s\n%s\n"
-							    "</i></blockquote>\n",
-							    credits, text);
-			} else {
-				ret_text = g_strdup_printf ("<blockquote><i>\n%s\n"
-							    "</i></blockquote>\n",
-							    text);
-			}
-		} else {
-			gchar *s, *d, *quoted_text;
-			gint lines, len, offset = 0;
-			
-			/* Count the number of lines in the body. If
-			 * the text ends with a \n, this will be one
-			 * too high, but that's ok. Allocate enough
-			 * space for the text and the "> "s.
-			 */
-			for (s = text, lines = 0; s; s = strchr (s + 1, '\n'))
-				lines++;
-			
-			offset = credits ? strlen (credits) : 0;
-
-			/* offset is the size of the credits, strlen (text)
-			 * covers the body, lines * 2 does the "> "s, and
-			 * the last +2 covers the final "\0", plus an extra
-			 * "\n" in case text doesn't end with one.
-			 */
-			quoted_text = g_malloc (offset + strlen (text) +
-						lines * 2 + 2);
-			
-			if (credits)
-				memcpy (quoted_text, credits, offset);
-			
-			s = text;
-			d = quoted_text + offset;
-			
-			/* Copy text to quoted_text line by line,
-			 * prepending "> ".
-			 */
-			while (1) {
-				len = strcspn (s, "\n");
-				if (len == 0 && !*s)
-					break;
-				sprintf (d, "> %.*s\n", len, s);
-				s += len;
-				if (!*s++)
-					break;
-				d += len + 3;
-			}
-			*d = '\0';
-			
-			/* Now convert that to HTML. */
-			ret_text = e_text_to_html (quoted_text, E_TEXT_TO_HTML_PRE);
-			g_free (quoted_text);
-		}
-		
-		g_free (text);
-		return ret_text;
-	}
-	
-	return NULL;
-}
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
deleted file mode 100644
index 7f6aa647f3..0000000000
--- a/mail/mail-tools.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Peter Williams <peterw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_TOOLS_H
-#define MAIL_TOOLS_H
-
-#include <camel/camel.h>
-#include <camel/camel-filter-driver.h> /*eek*/
-
-/* Get a CamelFolder from a root url and a foldername (uses the global session)*/
-CamelFolder *
-mail_tool_get_folder_from_urlname (const gchar *url, const gchar *name,
-				   guint32 flags, CamelException *ex);
-
-/* Get a useful name for a given CamelFolder (ie, not "mbox") */
-const gchar *mail_tool_get_folder_name (CamelFolder *folder);
-
-/* Get the url for the local inbox, index returns if the mailbox is indexed */
-gchar *mail_tool_get_local_inbox_url (int *index);
-
-/* Get the filename for our movemail folder or storage */
-gchar *mail_tool_get_local_movemail_path (void);
-gchar *mail_tool_get_local_movemail_url (void);
-
-/* Get the CamelFolder for the local inbox */
-CamelFolder *mail_tool_get_local_inbox (CamelException *ex);
-
-/* Get the "inbox" for a url (uses global session) */
-CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex);
-
-/* Does a camel_movemail into the local movemail folder
- * and returns the path to the new movemail folder that was created. which shoudl be freed later */
-char *
-mail_tool_do_movemail (const gchar *source_url, CamelException *ex);
-
-/* Transfers all the messages from source into dest;
- * source is emptied and synced. */
-void
-mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean use_cache, CamelException *ex);
-
-/* Generates the subject for a message forwarding @msg */
-gchar *
-mail_tool_generate_forward_subject (CamelMimeMessage *msg);
-
-/* Make a message into an attachment */
-CamelMimePart *
-mail_tool_make_message_attachment (CamelMimeMessage *message);
-
-/* Parse the ui into a real CamelFolder any way we know how. */
-CamelFolder *
-mail_tool_uri_to_folder (const char *uri, CamelException *ex);
-
-GHashTable *
-mail_lookup_url_table (CamelMimeMessage *mime_message);
-
-gchar *mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...);
-
-#endif
diff --git a/mail/mail-types.h b/mail/mail-types.h
deleted file mode 100644
index 74e650fd4f..0000000000
--- a/mail/mail-types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_TYPES_H
-#define MAIL_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-
-typedef struct  _FolderBrowser     FolderBrowser;
-typedef struct  _SubscribeDialog   SubscribeDialog;
-typedef struct  _MessageList       MessageList;
-typedef struct  _MailDisplay       MailDisplay;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_TYPES_H */
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
deleted file mode 100644
index 706f259b85..0000000000
--- a/mail/mail-vfolder.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
-  Copyright 2000, 2001 Helix Code Inc.
-
-  Author: Michael Zucchi <notzed@helixcode.com>
-
-  code for managing vfolders
-
-  NOTE: dont run this through fucking indent.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <bonobo.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include "folder-browser.h"
-#include "mail-vfolder.h"
-#include "mail-tools.h"
-#include "mail-autofilter.h"
-#include "mail.h"
-
-#include "camel/camel.h"
-
-#include "filter/vfolder-context.h"
-#include "filter/vfolder-editor.h"
-
-#define d(x) x
-
-struct _vfolder_info {
-	char *name;
-	char *query;
-};
-
-/* list of vfolders available */
-static GList *available_vfolders = NULL;
-static VfolderContext *context;
-
-/* Ditto below */
-EvolutionStorage *vfolder_storage;
-
-/* GROSS HACK: for passing to other parts of the program */
-EvolutionShellClient *global_shell_client = NULL;
-
-/* more globals ... */
-extern char *evolution_dir;
-extern CamelSession *session;
-
-static struct _vfolder_info *
-vfolder_find(const char *name)
-{
-	GList *l = available_vfolders;
-	struct _vfolder_info *info;
-
-	while (l) {
-		info = l->data;
-		if (!strcmp(info->name, name))
-			return info;
-		l = g_list_next(l);
-	}
-	return NULL;
-}
-
-/* go through the list of what we have, what we want, and make
-   them match, deleting/reconfiguring as required */
-static void
-vfolder_refresh(void)
-{
-	GList *l;
-	GList *head = NULL;	/* processed list */
-	struct _vfolder_info *info;
-	FilterRule *rule;
-	GString *expr = g_string_new("");
-	char *uri, *path;
-
-	rule = NULL;
-	while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
-		info = vfolder_find(rule->name);
-		g_string_truncate(expr, 0);
-		filter_rule_build_code(rule, expr);
-		if (info) {
-			available_vfolders = g_list_remove(available_vfolders, info);
-
-			/* check if the rule has changed ... otherwise, leave it */
-			if (strcmp(expr->str, info->query)) {
-				d(printf("Must reconfigure vfolder with new rule?\n"));
-				g_free(info->query);
-				info->query = g_strdup(expr->str);
-
-				uri = g_strdup_printf("vfolder:%s", info->name);
-				path = g_strdup_printf("/%s", info->name);
-				evolution_storage_removed_folder(vfolder_storage, path);
-				evolution_storage_new_folder(vfolder_storage, path, g_basename(path),
-							     "mail", uri, info->name, FALSE);
-				g_free(uri);
-				g_free(path);
-			}
-		} else {
-			info = g_malloc(sizeof(*info));
-			info->name = g_strdup(rule->name);
-			info->query = g_strdup(expr->str);
-			d(printf("Adding new vfolder: %s %s\n", rule->name, expr->str));
-			
-			uri = g_strdup_printf("vfolder:%s", info->name);
-			path = g_strdup_printf("/%s", info->name);
-			evolution_storage_new_folder(vfolder_storage, path, g_basename(path),
-						     "mail", uri, info->name, FALSE);
-			g_free(uri);
-			g_free(path);
-		}
-		head = g_list_append(head, info);
-	}
-	/* everything in available_vfolders are to be removed ... */
-	l = available_vfolders;
-	while (l) {
-		info = l->data;
-		d(printf("removing vfolders %s %s\n", info->name, info->query));
-		path = g_strdup_printf("/%s", info->name);
-		evolution_storage_removed_folder(vfolder_storage, path);
-		g_free(path);
-		g_free(info->name);
-		g_free(info->query);
-		l = g_list_next(l);
-	}
-
-	/* setup the virtual unmatched folder */
-	info = vfolder_find("UNMATCHED");
-	if (info == NULL) {
-		char *uri, *path;
-
-		info = g_malloc(sizeof(*info));
-		info->name = g_strdup("UNMATCHED");
-		info->query = g_strdup("UNMATCHED");
-		d(printf("Adding new vfolder: %s %s\n", info->name, info->query));
-		
-		uri = g_strdup_printf("vfolder:%s", info->name);
-		path = g_strdup_printf("/%s", info->name);
-		evolution_storage_new_folder(vfolder_storage, path, g_basename(path),
-					     "mail", uri, info->name, FALSE);
-		g_free(uri);
-		g_free(path);
-	}
-	head = g_list_append(head, info);
-
-	g_list_free(available_vfolders);
-	available_vfolders = head;
-	g_string_free(expr, TRUE);
-}
-
-void
-vfolder_create_storage(EvolutionShellComponent *shell_component)
-{
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell corba_shell;
-	EvolutionStorage *storage;
-	char *user, *system;
-
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	if (shell_client == NULL) {
-		g_warning ("We have no shell!?");
-		return;
-	}
-	global_shell_client = shell_client;
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-    
-	storage = evolution_storage_new (_("VFolders"), NULL, NULL);
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		return;
-	}
-
-	vfolder_storage = storage;
-
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-	system = g_strdup_printf("%s/evolution/vfoldertypes.xml", EVOLUTION_DATADIR);
-	
-	context = vfolder_context_new();
-	printf("loading rules %s %s\n", system, user);
-	if (rule_context_load((RuleContext *)context, system, user) != 0) {
-		g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error);
-	}
-	g_free(user);
-	g_free(system);
-	vfolder_refresh();
-}
-
-/* maps the shell's uri to the real vfolder uri and open the folder */
-CamelFolder *
-vfolder_uri_to_folder(const char *uri, CamelException *ex)
-{
-	void camel_vee_folder_add_folder(CamelFolder *, CamelFolder *);
-
-	struct _vfolder_info *info;
-	char *storeuri, *foldername;
-	VfolderRule *rule;
-	CamelFolder *folder = NULL, *sourcefolder;
-	const char *sourceuri;
-	int sources;
-
-	if (strncmp (uri, "vfolder:", 8))
-		return NULL;
-
-	info = vfolder_find(uri+8);
-	if (info == NULL) {
-		g_warning("Shell trying to open unknown vFolder: %s", uri);
-		return NULL;
-	}
-
-	d(printf("Opening vfolder: %s\n", uri));
-
-	rule = (VfolderRule *)rule_context_find_rule((RuleContext *)context, info->name, NULL);
-
-	storeuri = g_strdup_printf("vfolder:%s/vfolder/%s", evolution_dir, info->name);
-	foldername = g_strdup_printf("%s?%s", info->name, info->query);
-
-	/* we dont have indexing on vfolders */
-	folder = mail_tool_get_folder_from_urlname (storeuri, foldername, CAMEL_STORE_FOLDER_CREATE, ex);
-
-	bonobo_object_ref (BONOBO_OBJECT (vfolder_storage));
-	mail_hash_storage ((CamelService *)folder->parent_store, vfolder_storage);
-
-	if (strcmp(uri+8, "UNMATCHED") != 0) {
-		sourceuri = NULL;
-		sources = 0;
-		while ( (sourceuri = vfolder_rule_next_source(rule, sourceuri)) ) {
-			d(printf("adding vfolder source: %s\n", sourceuri));
-			sourcefolder = mail_tool_uri_to_folder (sourceuri, ex);
-			printf("source folder = %p\n", sourcefolder);
-			if (sourcefolder) {
-				sources++;
-				camel_vee_folder_add_folder(folder, sourcefolder);
-			} else {
-				/* we'll just silently ignore now-missing sources */
-				camel_exception_clear(ex);
-			}
-		}
-		/* if we didn't have any sources, just use Inbox as the default */
-		if (sources == 0) {
-			char *defaulturi;
-			
-			defaulturi = g_strdup_printf("file://%s/local/Inbox", evolution_dir);
-			d(printf("No sources configured/found, using default: %s\n", defaulturi));
-			sourcefolder = mail_tool_uri_to_folder (defaulturi, ex);
-			g_free(defaulturi);
-			if (sourcefolder) {
-				camel_vee_folder_add_folder(folder, sourcefolder);
-			}
-		}
-	}
-
-	g_free(foldername);
-	g_free(storeuri);
-
-	return folder;
-}
-
-static void
-vfolder_editor_clicked(GtkWidget *w, int button, void *data)
-{
-	if (button == 0) {
-		char *user;
-
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-		vfolder_refresh();
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *)w);
-	}
-}
-
-void
-vfolder_edit(void)
-{
-	GtkWidget *w;
-
-	w = vfolder_editor_construct(context);
-	gtk_signal_connect((GtkObject *)w, "clicked", vfolder_editor_clicked, NULL);
-	gtk_widget_show(w);
-}
-
-static void
-new_rule_clicked(GtkWidget *w, int button, void *data)
-{
-	if (button == 0) {
-		char *user;
-		FilterRule *rule = gtk_object_get_data((GtkObject *)w, "rule");
-
-		gtk_object_ref((GtkObject *)rule);
-		rule_context_add_rule((RuleContext *)context, rule);
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-		vfolder_refresh();
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *)w);
-	}
-}
-
-FilterPart *
-vfolder_create_part(const char *name)
-{
-	return rule_context_create_part((RuleContext *)context, name);
-}
-
-/* clones a filter/search rule into a matching vfolder rule (assuming the same system definitions) */
-FilterRule *
-vfolder_clone_rule(FilterRule *in)
-{
-	FilterRule *rule = vfolder_rule_new();
-	xmlNodePtr xml;
-
-	xml = filter_rule_xml_encode(in);
-	filter_rule_xml_decode(rule, xml, (RuleContext *)context);
-	xmlFreeNodeList(xml);
-
-	return rule;
-}
-
-/* adds a rule with a gui */
-void
-vfolder_gui_add_rule(VfolderRule *rule)
-{
-	GtkWidget *w;
-	GnomeDialog *gd;
-
-	w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context);
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("New VFolder"),
-					     GNOME_STOCK_BUTTON_OK,
-					     GNOME_STOCK_BUTTON_CANCEL,
-					     NULL);
-	gnome_dialog_set_default (gd, 0);
-
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	gtk_object_set_data_full((GtkObject *)gd, "rule", rule, (GtkDestroyNotify)gtk_object_unref);
-	gtk_signal_connect((GtkObject *)gd, "clicked", new_rule_clicked, NULL);
-	gtk_widget_show((GtkWidget *)gd);
-}
-
-void
-vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *source)
-{
-	VfolderRule *rule;
-
-	g_return_if_fail (msg != NULL);
-
-	rule = (VfolderRule*)vfolder_rule_from_message(context, msg, flags, source);
-	vfolder_gui_add_rule(rule);
-}
-
-void
-vfolder_gui_add_from_mlist(CamelMimeMessage *msg, const char *mlist, const char *source)
-{
-	VfolderRule *rule;
-
-	g_return_if_fail (msg != NULL);
-
-	rule = (VfolderRule*)vfolder_rule_from_mlist(context, mlist, source);
-	vfolder_gui_add_rule(rule);
-}
-
-EvolutionStorage *
-mail_vfolder_get_vfolder_storage (void)
-{
-	gtk_object_ref (GTK_OBJECT (vfolder_storage));
-	return vfolder_storage;
-}
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
deleted file mode 100644
index b8b409b1e7..0000000000
--- a/mail/mail-vfolder.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#ifndef _MAIL_VFOLDER_H
-#define _MAIL_VFOLDER_H
-
-#include <bonobo.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
-
-#include "camel/camel-folder.h"
-#include "camel/camel-mime-message.h"
-#include "filter/vfolder-rule.h"
-#include "filter/filter-part.h"
-
-void vfolder_create_storage(EvolutionShellComponent *shell_component);
-
-CamelFolder *vfolder_uri_to_folder(const char *uri, CamelException *ex);
-void vfolder_edit(void);
-FilterPart *vfolder_create_part(const char *name);
-FilterRule *vfolder_clone_rule(FilterRule *in);
-void vfolder_gui_add_rule(VfolderRule *rule);
-void vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *source);
-void vfolder_gui_add_from_mlist(CamelMimeMessage *msg, const char *mlist, const char *source);
-
-EvolutionStorage *mail_vfolder_get_vfolder_storage (void);
-
-#endif
diff --git a/mail/mail-view.c b/mail/mail-view.c
deleted file mode 100644
index 320ad9510d..0000000000
--- a/mail/mail-view.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include "mail.h"
-#include "mail-ops.h"
-#include "camel/camel.h"
-#include "mail-display.h"
-#include "mail-callbacks.h"
-
-typedef struct mail_view_data_s {
-	CamelFolder *source;
-	gchar *uid;
-	CamelMimeMessage *msg;
-	MailDisplay *md;
-} mail_view_data;
-
-#define MINIMUM_WIDTH  600
-#define MINIMUM_HEIGHT 400
-
-/* Size of the window last time it was changed.  */
-static GtkAllocation last_allocation = { 0, 0 };
-
-static void
-mail_view_data_free (gpointer mvd)
-{
-	mail_view_data *data = (mail_view_data *) mvd;
-
-	if (data->uid)
-		g_free (data->uid);
-	if (data->msg)
-		camel_object_unref (CAMEL_OBJECT (data->msg));
-	if (data->source)
-		camel_object_unref (CAMEL_OBJECT (data->source));
-
-	g_free (data);
-}
-
-static mail_view_data *
-mail_view_data_new (CamelFolder *source, const gchar *uid, CamelMimeMessage *msg)
-{
-	mail_view_data *data;
-
-	data = g_new (mail_view_data, 1);
-	data->source = source;
-	camel_object_ref (CAMEL_OBJECT (data->source));
-	data->msg = msg;
-	camel_object_ref (CAMEL_OBJECT (data->msg));
-	data->uid = g_strdup (uid);
-
-	return data;
-}
-
-static void
-on_close (GtkWidget *menuitem, gpointer user_data)
-{
-	GtkWidget *view_window;
-
-	view_window = gtk_object_get_data (GTK_OBJECT (menuitem), "view-window");
-	g_return_if_fail (view_window);
-	gtk_widget_destroy (GTK_WIDGET (view_window));
-}
-
-static void
-view_reply_to_sender (GtkWidget *widget, gpointer user_data)
-{
-	mail_view_data *data = (mail_view_data *) user_data;
-
-	mail_reply (data->source, data->msg, data->uid, FALSE);
-}
-
-static void
-view_reply_to_all (GtkWidget *widget, gpointer user_data)
-{
-	mail_view_data *data = (mail_view_data *) user_data;
-
-	mail_reply (data->source, data->msg, data->uid, TRUE);
-}
-
-static void
-view_forward_msg (GtkWidget *widget, gpointer user_data)
-{
-	mail_view_data *data = (mail_view_data *) user_data;
-	GPtrArray *uids;
-
-	uids = g_ptr_array_new();
-	g_ptr_array_add(uids, g_strdup (data->uid));
-	forward_messages(data->source, uids, FALSE);
-}
-
-static void
-view_print_msg (GtkWidget *widget, gpointer user_data)
-{
-	mail_view_data *data = (mail_view_data *) user_data;
-
-	mail_print_msg (data->md);
-}
-
-static void
-view_delete_msg (GtkWidget *button, gpointer user_data)
-{
-	mail_view_data *data = (mail_view_data *) user_data;
-
-	camel_folder_set_message_flags(data->source, data->uid, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
-}
-
-static void
-view_size_allocate_cb (GtkWidget *widget,
-		       GtkAllocation *allocation)
-{
-	last_allocation = *allocation;
-}
-
-static GnomeUIInfo mail_view_toolbar [] = {
-	
-	/*GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-	  save_msg, GNOME_STOCK_PIXMAP_SAVE),*/
-	
-	GNOMEUIINFO_ITEM_STOCK (N_("Reply"), N_("Reply to the sender of this message"),
-				view_reply_to_sender, GNOME_STOCK_PIXMAP_MAIL_RPL),
-	
-	GNOMEUIINFO_ITEM_STOCK (N_("Reply to All"), N_("Reply to all recipients of this message"),
-				view_reply_to_all, GNOME_STOCK_PIXMAP_MAIL_RPL),
-	
-	GNOMEUIINFO_ITEM_STOCK (N_("Forward"), N_("Forward this message"), view_forward_msg, GNOME_STOCK_PIXMAP_MAIL_FWD),
-	
-	GNOMEUIINFO_SEPARATOR,
-	
-	GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print the selected message"), view_print_msg, GNOME_STOCK_PIXMAP_PRINT),
-	
-	GNOMEUIINFO_ITEM_STOCK (N_("Delete"), N_("Delete this message"), view_delete_msg, GNOME_STOCK_PIXMAP_TRASH),
-	
-	/*GNOMEUIINFO_SEPARATOR,*/
-	
-	/*GNOMEUIINFO_ITEM_STOCK (N_("Next"), N_("Next message"), mail_view_next_msg, GNOME_STOCK_PIXMAP_NEXT),
-	
-	  GNOMEUIINFO_ITEM_STOCK (N_("Previous"), N_("Previous message"), mail_view_prev_msg, GNOME_STOCK_PIXMAP_PREVIOUS),*/
-	
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_menu[] = {
-	/*GNOMEUIINFO_MENU_SAVE_ITEM (save, NULL),*/
-	/*GNOMEUIINFO_MENU_SAVE_AS_ITEM (save_as, NULL),*/
-	/*GNOMEUIINFO_SEPARATOR,*/
-	GNOMEUIINFO_MENU_CLOSE_ITEM (on_close, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_menu[] =
-{
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo mail_view_menubar[] =
-{
-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),
-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),
-	GNOMEUIINFO_END
-};
-
-static void
-set_default_size (GtkWidget *widget)
-{
-	int width, height;
-
-	width  = MAX (MINIMUM_WIDTH, last_allocation.width);
-	height = MAX (MINIMUM_HEIGHT, last_allocation.height);
-
-	gtk_window_set_default_size (GTK_WINDOW (widget), width, height);
-}
-
-GtkWidget *
-mail_view_create (CamelFolder *source, const char *uid, CamelMimeMessage *msg)
-{
-	GtkWidget *window;
-	GtkWidget *toolbar;
-	GtkWidget *mail_display;
-	char *subject;
-	mail_view_data *data;
-
-	data = mail_view_data_new (source, uid, msg);
-
-	subject = (char *) camel_mime_message_get_subject (msg);
-	if (!subject)
-		subject = "";
-	
-	window = gnome_app_new ("Evolution", subject);
-	
-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-	
-	gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (toolbar),
-					  mail_view_toolbar,
-					  NULL, data);
-
-	gnome_app_set_toolbar (GNOME_APP (window), GTK_TOOLBAR (toolbar));
-	gnome_app_create_menus (GNOME_APP (window), mail_view_menubar);
-
-	gtk_object_set_data_full (GTK_OBJECT (window), "mvd", data,
-				  mail_view_data_free);
-
-	gtk_widget_ref (mail_view_menubar[0].widget);
-	gtk_object_set_data_full (GTK_OBJECT (window), "file",
-				  mail_view_menubar[0].widget,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	
-	gtk_widget_ref (file_menu[0].widget);
-	gtk_object_set_data (GTK_OBJECT (file_menu[0].widget), "view-window", window);
-	gtk_object_set_data_full (GTK_OBJECT (window), "close",
-				  file_menu[0].widget,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	
-	gtk_widget_ref (mail_view_menubar[1].widget);
-	gtk_object_set_data_full (GTK_OBJECT (window), "view",
-				  mail_view_menubar[1].widget,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	
-	mail_display = mail_display_new ();
-	mail_display_set_message (MAIL_DISPLAY (mail_display), CAMEL_MEDIUM (msg));
-	data->md = MAIL_DISPLAY (mail_display);
-	gnome_app_set_contents (GNOME_APP (window), mail_display);
-	gtk_widget_grab_focus (GTK_WIDGET (MAIL_DISPLAY (mail_display)->html));
-
-	gtk_signal_connect (GTK_OBJECT (window), "size_allocate",
-			    GTK_SIGNAL_FUNC (view_size_allocate_cb), NULL);
-
-	set_default_size (window);
-	
-	return window;
-}
-
diff --git a/mail/mail-vtrash.c b/mail/mail-vtrash.c
deleted file mode 100644
index 565f60dd98..0000000000
--- a/mail/mail-vtrash.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
-
-#include "mail.h"
-#include "mail-vfolder.h"
-#include "mail-vtrash.h"
-#include "mail-tools.h"
-#include "mail-mt.h"
-
-#include "camel/camel.h"
-
-#define d(x)
-
-extern char *evolution_dir;
-extern CamelSession *session;
-
-
-/**
- * mail_vtrash_add: add a "vTrash" folder on the EvolutionStorage
- * @store: the CamelStore that the vTrash exists on
- * @store_uri: the URL of the store
- * @name: the name to give the vTrash folder
- *
- * Creates the vTrash folder for the provided store in the folder view
- * (EvolutionStorage) and creates the URL for that vTrash folder.
- **/
-void
-mail_vtrash_add (CamelStore *store, const char *store_uri, const char *name)
-{
-	EvolutionStorage *storage;
-	char *uri, *path;
-	
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	
-	uri = g_strdup_printf ("vtrash:%s", store_uri);
-	
-	if (!strcmp (store_uri, "file:/")) {
-		storage = mail_vfolder_get_vfolder_storage ();
-	} else {
-		storage = mail_lookup_storage (store);
-	}
-	
-	if (!storage) {
-		g_free (uri);
-		return;
-	}
-	
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_new_folder (storage, path, g_basename (path),
-				      "mail", uri, name, FALSE);
-	gtk_object_unref (GTK_OBJECT (storage));
-	
-	g_free (path);
-}
-
-struct _get_trash_msg {
-	struct _mail_msg msg;
-	
-	CamelStore *store;
-	char *store_uri;
-	char *name;
-};
-
-static char *
-get_trash_desc (struct _mail_msg *mm, int done)
-{
-	struct _get_trash_msg *m = (struct _get_trash_msg *)mm;
-	
-	return g_strdup_printf (_("Opening Trash folder for %s"), m->store_uri);
-}
-
-static void
-get_trash_get (struct _mail_msg *mm)
-{
-	struct _get_trash_msg *m = (struct _get_trash_msg *)mm;
-	
-	camel_operation_register (mm->cancel);
-	camel_operation_start (mm->cancel, _("Getting matches"));
-	
-	/* we don't want to connect */
-	m->store = (CamelStore *) camel_session_get_service (session, m->store_uri,
-							     CAMEL_PROVIDER_STORE, &mm->ex);
-	if (m->store == NULL) {
-		g_warning ("Couldn't get service %s: %s\n", m->store_uri,
-			   camel_exception_get_description (&mm->ex));
-		camel_exception_clear (&mm->ex);
-	}
-	
-	camel_operation_end (mm->cancel);
-	camel_operation_unregister (mm->cancel);
-}
-
-static void
-get_trash_got (struct _mail_msg *mm)
-{
-	struct _get_trash_msg *m = (struct _get_trash_msg *)mm;
-	
-	if (m->store)
-		mail_vtrash_add (m->store, m->store_uri, m->name);
-}
-
-static void
-get_trash_free (struct _mail_msg *mm)
-{
-	struct _get_trash_msg *m = (struct _get_trash_msg *)mm;
-	
-	if (m->store)
-		camel_object_unref (CAMEL_OBJECT (m->store));
-	
-	g_free (m->store_uri);
-	g_free (m->name);
-}
-
-static struct _mail_msg_op get_trash_op = {
-	get_trash_desc,
-	get_trash_get,
-	get_trash_got,
-	get_trash_free,
-};
-
-
-/**
- * mail_vtrash_create: Create a vTrash folder
- * @store_uri: URL of the CamelStore
- * @name: name to give the vTrash folder
- *
- * Async function to lookup the CamelStore corresponding to @store_uri
- * and then calls mail_vtrash_add() to create the vTrash folder/URL on
- * the EvolutionStorage.
- **/
-int
-mail_vtrash_create (const char *store_uri, const char *name)
-{
-	struct _get_trash_msg *m;
-	int id;
-	
-	m = mail_msg_new (&get_trash_op, NULL, sizeof (*m));
-	m->store_uri = g_strdup (store_uri);
-	m->name = g_strdup (name);
-	
-	id = m->msg.seq;
-	e_thread_put (mail_thread_new, (EMsg *)m);
-	
-	return id;
-}
diff --git a/mail/mail-vtrash.h b/mail/mail-vtrash.h
deleted file mode 100644
index 1aac0c1e9f..0000000000
--- a/mail/mail-vtrash.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2001 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 MAIL_VTRASH_H
-#define MAIL_VTRASH_H
-
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void mail_vtrash_add (CamelStore *store, const char *store_uri, const char *name);
-
-int mail_vtrash_create (const char *store_uri, const char *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_VTRASH_H */
diff --git a/mail/mail.h b/mail/mail.h
deleted file mode 100644
index ed90d4024e..0000000000
--- a/mail/mail.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- */
-
-/* This file is a F*CKING MESS.  Shame to us!  */
-
-#include <gtkhtml/gtkhtml.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include "camel/camel.h"
-#include "composer/e-msg-composer.h"
-#include "mail-accounts.h"
-#include "mail-account-editor.h"
-#include "mail-callbacks.h"
-#include "mail-config.h"
-#include "mail-config-druid.h"
-/*#include "folder-browser.h"*/
-#include "mail-session.h"
-#include "mail-types.h"
-#include "shell/evolution-storage.h"
-
-extern char *evolution_dir;
-
-/* mail-format */
-void mail_format_mime_message (CamelMimeMessage *mime_message,
-			       MailDisplay *md);
-void mail_format_raw_message (CamelMimeMessage *mime_message,
-			      MailDisplay *md);
-gboolean mail_content_loaded (CamelDataWrapper *wrapper, MailDisplay *display);
-
-typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part,
-				       const char *mime_type,
-				       MailDisplay *md);
-typedef struct {
-	gboolean generic;
-	OAF_ServerInfo *component;
-	GnomeVFSMimeApplication *application;
-	MailMimeHandlerFn builtin;
-} MailMimeHandler;
-MailMimeHandler *mail_lookup_handler (const char *mime_type);
-
-gboolean mail_part_is_inline (CamelMimePart *part);
-
-char *mail_get_message_body (CamelDataWrapper *data, gboolean want_plain,
-			     gboolean *is_html);
-
-/* mail-identify */
-char *mail_identify_mime_part (CamelMimePart *part, MailDisplay *md);
-
-/* mail view */
-GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMessage *msg);
-
-/* component factory for lack of a better place */
-/*takes a GSList of MailConfigServices */
-void mail_load_storages (GNOME_Evolution_Shell shell, const GSList *sources, gboolean is_account_data);
-
-void mail_hash_storage (CamelService *store, EvolutionStorage *storage);
-EvolutionStorage *mail_lookup_storage (CamelStore *store);
diff --git a/mail/main.c b/mail/main.c
deleted file mode 100644
index 5900ee5625..0000000000
--- a/mail/main.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * main.c: The core of the mail component
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <signal.h>
-
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object-directory.h>
-#include <glade/glade.h>
-#include <liboaf/liboaf.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-cursors.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "component-factory.h"
-#include "composer/evolution-composer.h"
-#include "mail.h"
-#include "mail-mt.h"
-#include "mail-vtrash.h"
-
-/*#define DO_MCHECK*/
-
-#ifdef DO_MCHECK
-static int blowup(int status)
-{
-	switch(status) {
-	case 1:
-		printf("Double free failure\n");
-		break;
-	case 2:
-		printf("Memory clobbered before block\n");
-		break;
-	case 3:
-		printf("Memory clobbered after block\n");
-		break;
-	}
-	abort();
-	return status;
-}
-#endif
-
-/* The GNOME SEGV handler will lose if it's not run from the main Gtk
- * thread. So if we crash in another thread, redirect the signal.
- */
-static void (*gnome_segv_handler) (int);
-
-static void
-segv_redirect (int sig)
-{
-	if (pthread_self () == mail_gui_thread)
-		gnome_segv_handler (sig);
-	else {
-		pthread_kill (mail_gui_thread, sig);
-		pthread_exit (NULL);
-	}
-}
-
-int
-main (int argc, char *argv [])
-{
-	CORBA_ORB orb;
-	struct sigaction sa, osa;
-
-#ifdef DO_MCHECK
-	/* used to make elfence work */
-#if 0
-	free (malloc (10));
-#else
-	/*mtrace();*/
-	mcheck(blowup);
-#endif
-#endif
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	g_thread_init( NULL );
-
-	gnome_init_with_popt_table ("evolution-mail-component", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-
-	sa.sa_flags = 0;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_handler = segv_redirect;
-	sigaction (SIGSEGV, &sa, &osa);
-	sigaction (SIGBUS, &sa, NULL);
-	sigaction (SIGFPE, &sa, NULL);
-	gnome_segv_handler = osa.sa_handler;
-
-	orb = oaf_init (argc, argv);
-
-	if (bonobo_init (orb, CORBA_OBJECT_NIL,
-			 CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Mail component could not initialize Bonobo.\n"
-			 "If there was a warning message about the "
-			 "RootPOA, it probably means\nyou compiled "
-			 "Bonobo against GOAD instead of OAF.");
-	}
-
-#ifdef GTKHTML_HAVE_GCONF
-	gconf_init (argc, argv, NULL);
-#endif
-
-	glade_gnome_init ();
-
-	gnome_vfs_init ();
-
-	e_cursors_init ();
-
-	mail_msg_init();
-	
-	component_factory_init ();
-	evolution_composer_factory_init (composer_send_cb,
-					 composer_postpone_cb);
-
-	if (gdk_threads_mutex) {
-		g_mutex_free (gdk_threads_mutex);
-		gdk_threads_mutex = NULL;
-	}
-
-	GDK_THREADS_ENTER ();
-	bonobo_main ();
-	GDK_THREADS_LEAVE ();
-	
-	mail_config_write_on_exit ();
-
-	return 0;
-}
diff --git a/mail/message-list.c b/mail/message-list.c
deleted file mode 100644
index c1e180a8bf..0000000000
--- a/mail/message-list.c
+++ /dev/null
@@ -1,2705 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * message-list.c: Displays the messages.
- *                 Implements CORBA's Evolution::MessageList
- *
- * Author:
- *     Miguel de Icaza (miguel@helixcode.com)
- *     Bertrand Guiheneuf (bg@aful.org)
- *     And just about everyone else in evolution ...
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <e-util/ename/e-name-western.h>
-#include <camel/camel-folder-thread.h>
-#include <e-util/e-memory.h>
-
-#include <string.h>
-#include <ctype.h>
-
-#include "mail-config.h"
-#include "message-list.h"
-#include "mail-mt.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "Mail.h"
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-table-header-item.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-tree.h>
-#include <gal/e-table/e-cell-date.h>
-#include <gal/e-table/e-cell-size.h>
-
-#include "art/mail-new.xpm"
-#include "art/mail-read.xpm"
-#include "art/mail-replied.xpm"
-#include "art/attachment.xpm"
-#include "art/priority-high.xpm"
-#include "art/empty.xpm"
-#include "art/score-lowest.xpm"
-#include "art/score-lower.xpm"
-#include "art/score-low.xpm"
-#include "art/score-normal.xpm"
-#include "art/score-high.xpm"
-#include "art/score-higher.xpm"
-#include "art/score-highest.xpm"
-
-/*#define TIMEIT */
-
-#ifdef TIMEIT
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#define d(x)
-#define t(x)
-
-/*
- * Default sizes for the ETable display
- *
- */
-#define N_CHARS(x) (CHAR_WIDTH * (x))
-
-#define COL_ICON_WIDTH         (16)
-#define COL_ATTACH_WIDTH       (16)
-#define COL_CHECK_BOX_WIDTH    (16)
-#define COL_FROM_EXPANSION     (24.0)
-#define COL_FROM_WIDTH_MIN     (32)
-#define COL_SUBJECT_EXPANSION  (30.0)
-#define COL_SUBJECT_WIDTH_MIN  (32)
-#define COL_SENT_EXPANSION     (24.0)
-#define COL_SENT_WIDTH_MIN     (32)
-#define COL_RECEIVED_EXPANSION (20.0)
-#define COL_RECEIVED_WIDTH_MIN (32)
-#define COL_TO_EXPANSION       (24.0)
-#define COL_TO_WIDTH_MIN       (32)
-#define COL_SIZE_EXPANSION     (6.0)
-#define COL_SIZE_WIDTH_MIN     (32)
-
-#define PARENT_TYPE (e_table_scrolled_get_type ())
-
-#ifdef SMART_ADDRESS_COMPARE
-struct _EMailAddress {
-	ENameWestern *wname;
-	gchar *address;
-};
-
-typedef struct _EMailAddress EMailAddress;
-#endif /* SMART_ADDRESS_COMPARE */
-
-static ETableScrolledClass *message_list_parent_class;
-
-static void on_cursor_activated_cmd (ETableScrolled *table, int row, gpointer user_data);
-static gint on_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, MessageList *list);
-static char *filter_date (time_t date);
-static char *filter_size (int size);
-
-static void save_tree_state(MessageList *ml);
-
-static void folder_changed (CamelObject *o, gpointer event_data, gpointer user_data);
-static void message_changed (CamelObject *o, gpointer event_data, gpointer user_data);
-
-static void hide_save_state(MessageList *ml);
-static void hide_load_state(MessageList *ml);
-
-/* note: @changes is owned/freed by the caller */
-/*static void mail_do_regenerate_messagelist (MessageList *list, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);*/
-static void mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);
-
-/* macros for working with id's (stored in the tree nodes) */
-#define id_is_uid(id) (id[0] == 'u')/* is this a uid id? */
-#define id_is_subject(id) (id[0] == 's') /* is this a subject id? */
-#define id_uid(id) (&id[1])	/* get the uid part of the id */
-#define id_subject(id) (&id[1])	/* get the subject part of the id */
-
-enum {
-	MESSAGE_SELECTED,
-	LAST_SIGNAL
-};
-
-static guint message_list_signals [LAST_SIGNAL] = {0, };
-
-static struct {
-	char **image_base;
-	GdkPixbuf  *pixbuf;
-} states_pixmaps [] = {
-	{ mail_new_xpm,		NULL },
-	{ mail_read_xpm,	NULL },
-	{ mail_replied_xpm,	NULL },
-/* FIXME: Replace these with pixmaps for multiple_read and multiple_unread */
-    	{ mail_new_xpm,		NULL },
-    	{ mail_read_xpm,	NULL },
-	{ empty_xpm,		NULL },
-	{ attachment_xpm,	NULL },
-	{ priority_high_xpm,	NULL },
-	{ score_lowest_xpm,     NULL },
-	{ score_lower_xpm,      NULL },
-	{ score_low_xpm,        NULL },
-	{ score_normal_xpm,     NULL },
-	{ score_high_xpm,       NULL },
-	{ score_higher_xpm,     NULL },
-	{ score_highest_xpm,    NULL },
-	{ NULL,			NULL }
-};
-
-enum DndTargetTyhpe {
-	DND_TARGET_LIST_TYPE_URI,
-};
-#define URI_LIST_TYPE "text/uri-list"
-static GtkTargetEntry drag_types[] = {
-	{ URI_LIST_TYPE, 0, DND_TARGET_LIST_TYPE_URI },
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-#ifdef SMART_ADDRESS_SORT
-static EMailAddress *
-e_mail_address_new (const char *address)
-{
-	CamelInternetAddress *cia;
-	EMailAddress *new;
-	const char *name = NULL, *addr = NULL;
-	
-	cia = camel_internet_address_new ();
-	if (camel_address_unformat (CAMEL_ADDRESS (cia), address) == -1) {
-		camel_object_unref (CAMEL_OBJECT (cia));
-		return NULL;
-	}
-	camel_internet_address_get (cia, 0, &name, &addr);
-	
-	new = g_new (EMailAddress, 1);
-	new->address = g_strdup (addr);
-	if (name && *name) {
-		new->wname = e_name_western_parse (name);
-	} else {
-		new->wname = NULL;
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (cia));
-	
-	return new;
-}
-
-static void
-e_mail_address_free (EMailAddress *addr)
-{
-	g_return_if_fail (addr != NULL);
-	
-	g_free (addr->address);
-	if (addr->wname)
-		e_name_western_free (addr->wname);
-	g_free (addr);
-}
-
-static gint
-e_mail_address_compare (gconstpointer address1, gconstpointer address2)
-{
-	const EMailAddress *addr1 = address1;
-	const EMailAddress *addr2 = address2;
-	gint retval;
-	
-	g_return_val_if_fail (addr1 != NULL, 1);
-	g_return_val_if_fail (addr2 != NULL, -1);
-	
-	if (!addr1->wname || !addr2->wname) {
-		/* have to compare addresses, one or both don't have names */
-		g_return_val_if_fail (addr1->address != NULL, 1);
-		g_return_val_if_fail (addr2->address != NULL, -1);
-		
-		retval = g_strcasecmp (addr1->address, addr2->address);
-	} else {
-		if (!addr1->wname->last && !addr2->wname->last) {
-			/* neither has a last name - default to address? */
-			/* FIXME: what do we compare next? */
-			g_return_val_if_fail (addr1->address != NULL, 1);
-			g_return_val_if_fail (addr2->address != NULL, -1);
-			
-			retval = g_strcasecmp (addr1->address, addr2->address);
-		} else {
-			/* compare last names */
-			if (!addr1->wname->last)
-				retval = -1;
-			else if (!addr2->wname->last)
-				retval = 1;
-			else {
-				retval = g_strcasecmp (addr1->wname->last, addr2->wname->last);
-				if (!retval) {
-					/* last names are identical - compare first names */
-					if (!addr1->wname->first)
-						retval = -1;
-					else if (!addr2->wname->first)
-						retval = 1;
-					else {
-						retval = g_strcasecmp (addr1->wname->first, addr2->wname->first);
-						if (!retval) {
-							/* first names are identical - compare addresses */
-							g_return_val_if_fail (addr1->address != NULL, 1);
-							g_return_val_if_fail (addr2->address != NULL, -1);
-							
-							retval = g_strcasecmp (addr1->address, addr2->address);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	return retval;
-}
-#endif /* SMART_ADDRESS_COMPARE */
-
-static gint
-address_compare (gconstpointer address1, gconstpointer address2)
-{
-#ifdef SMART_ADDRESS_COMPARE
-	EMailAddress *addr1, *addr2;
-#endif /* SMART_ADDRESS_COMPARE */
-	gint retval;
-	
-	g_return_val_if_fail (address1 != NULL, 1);
-	g_return_val_if_fail (address2 != NULL, -1);
-	
-#ifdef SMART_ADDRESS_COMPARE
-	addr1 = e_mail_address_new (address1);
-	addr2 = e_mail_address_new (address2);
-	retval = e_mail_address_compare (addr1, addr2);
-	e_mail_address_free (addr1);
-	e_mail_address_free (addr2);
-#else
-	retval = g_strcasecmp ((const char *) address1, (const char *) address2);
-#endif /* SMART_ADDRESS_COMPARE */
-	
-	return retval;
-}
-
-static gint
-subject_compare (gconstpointer subject1, gconstpointer subject2)
-{
-	char *sub1;
-	char *sub2;
-	
-	g_return_val_if_fail (subject1 != NULL, 1);
-	g_return_val_if_fail (subject2 != NULL, -1);
-	
-	/* trim off any "Re:"'s at the beginning of subject1 */
-	sub1 = (char *) subject1;
-	while (!g_strncasecmp (sub1, "Re:", 3)) {
-		sub1 += 3;
-		/* jump over any spaces */
-		for ( ; *sub1 && isspace (*sub1); sub1++);
-	}
-	
-	/* trim off any "Re:"'s at the beginning of subject2 */
-	sub2 = (char *) subject2;
-	while (!g_strncasecmp (sub2, "Re:", 3)) {
-		sub2 += 3;
-		/* jump over any spaces */
-		for ( ; *sub2 && isspace (*sub2); sub2++);
-	}
-	
-	/* jump over any spaces */
-	for ( ; *sub1 && isspace (*sub1); sub1++);
-	for ( ; *sub2 && isspace (*sub2); sub2++);
-	
-	return g_strcasecmp (sub1, sub2);
-}
-
-static gchar *
-filter_size (gint size)
-{
-	gfloat fsize;
-	
-	if (size < 1024) {
-		return g_strdup_printf ("%d", size);
-	} else {
-		fsize = ((gfloat) size) / 1024.0;
-		if (fsize < 1024.0) {
-			return g_strdup_printf ("%.2f K", fsize);
-		} else {
-			fsize /= 1024.0;
-			return g_strdup_printf ("%.2f M", fsize);
-		}
-	}
-}
-
-/* Gets the uid of the message displayed at a given view row */
-static const char *
-get_message_uid (MessageList *message_list, int row)
-{
-	ETreeModel *model = (ETreeModel *)message_list->table_model;
-	ETreePath *node;
-	const char *uid;
-
-	if (row >= e_table_model_row_count (message_list->table_model))
-		return NULL;
-
-	node = e_tree_model_node_at_row (model, row);
-	g_return_val_if_fail (node != NULL, NULL);
-	uid = e_tree_model_node_get_data (model, node);
-
-	if (!id_is_uid(uid))
-		return NULL;
-
-	return id_uid(uid);
-}
-
-/* Gets the CamelMessageInfo for the message displayed at the given
- * view row.
- */
-static CamelMessageInfo *
-get_message_info (MessageList *message_list, int row)
-{
-	const char *uid;
-	
-	uid = get_message_uid(message_list, row);
-	if (uid)
-		return camel_folder_get_message_info(message_list->folder, uid);
-
-	return NULL;
-}
-
-/**
- * message_list_select:
- * @message_list: a MessageList
- * @base_row: the (model) row to start from
- * @direction: the direction to search in
- * @flags: a set of flag values
- * @mask: a mask for comparing against @flags
- *
- * This moves the message list selection to a suitable row. @base_row
- * lists the first (model) row to try, but as a special case, model
- * row -1 is mapped to the last row. @flags and @mask combine to specify
- * what constitutes a suitable row. @direction is
- * %MESSAGE_LIST_SELECT_NEXT if it should find the next matching
- * message, or %MESSAGE_LIST_SELECT_PREVIOUS if it should find the
- * previous. If no suitable row is found, the selection will be
- * unchanged but the message display will be cleared.
- **/
-void
-message_list_select (MessageList *message_list, int base_row,
-		     MessageListSelectDirection direction,
-		     guint32 flags, guint32 mask)
-{
-	CamelMessageInfo *info;
-	int vrow, mrow, last;
-	ETable *et = message_list->table;
-
-	switch (direction) {
-	case MESSAGE_LIST_SELECT_PREVIOUS:
-		last = -1;
-		break;
-	case MESSAGE_LIST_SELECT_NEXT:
-		last = e_table_model_row_count (message_list->table_model);
-		break;
-	default:
-		g_warning("Invalid argument to message_list_select");
-		return;
-	}
-
-	if (base_row == -1)
-		base_row = e_table_model_row_count(message_list->table_model) - 1;
-
-	/* model_to_view_row etc simply dont work for sorted views.  Sigh. */
-	vrow = e_table_model_to_view_row (et, base_row);
-
-	/* This means that we'll move at least one message in 'direction'. */
-	if (vrow != last)
-		vrow += direction;
-
-	/* We don't know whether to use < or > due to "direction" */
-	while (vrow != last) {
-		mrow = e_table_view_to_model_row (et, vrow);
-		info = get_message_info (message_list, mrow);
-		if (info && (info->flags & mask) == flags) {
-			e_table_set_cursor_row (et, mrow);
-			gtk_signal_emit(GTK_OBJECT (message_list), message_list_signals [MESSAGE_SELECTED], camel_message_info_uid(info));
-			camel_folder_free_message_info(message_list->folder, info);
-			return;
-		}
-		camel_folder_free_message_info(message_list->folder, info);
-		vrow += direction;
-	}
-
-	gtk_signal_emit(GTK_OBJECT (message_list), message_list_signals [MESSAGE_SELECTED], NULL);
-}
-
-static void
-add_uid (MessageList *ml, const char *uid, gpointer data)
-{
-	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
-}
-
-static void
-message_list_drag_data_get (ETable             *table,
-			    int                 row,
-			    int                 col,
-			    GdkDragContext     *context,
-			    GtkSelectionData   *selection_data,
-			    guint               info,
-			    guint               time,
-			    gpointer            user_data)
-{
-	MessageList *mlist = (MessageList *) user_data;
-	CamelMessageInfo *minfo;
-	GPtrArray *uids = NULL;
-	char *tmpl, *tmpdir, *filename, *subject;
-	
-	switch (info) {
-	case DND_TARGET_LIST_TYPE_URI:
-		/* drag & drop into nautilus */
-		tmpl = g_strdup ("/tmp/evolution.XXXXXX");
-#ifdef HAVE_MKDTEMP
-		tmpdir = mkdtemp (tmpl);
-#else
-		tmpdir = mktemp (tmpl);
-		if (tmpdir) {
-			if (mkdir (tmpdir, S_IRWXU) == -1)
-				tmpdir = NULL;
-		}
-#endif
-		if (!tmpdir) {
-			g_free (tmpl);
-			return;
-		}
-
-		minfo = get_message_info (mlist, row);
-		if (minfo == NULL) {
-			g_warning("Row %d is invalid", row);
-			g_free(tmpl);
-			return;
-		}
-		subject = g_strdup (camel_message_info_subject (minfo));
-		camel_folder_free_message_info(mlist->folder, minfo);
-		e_filename_make_safe (subject);
-		filename = g_strdup_printf ("%s/%s.eml", tmpdir, subject);
-		g_free (subject);
-		
-		uids = g_ptr_array_new ();
-		message_list_foreach (mlist, add_uid, uids);
-		
-		mail_msg_wait(mail_save_messages(mlist->folder, uids, filename, NULL, NULL));
-		
-		gtk_selection_data_set (selection_data, selection_data->target, 8,
-					(guchar *) filename, strlen (filename));
-		
-		g_free (tmpl);
-		g_free (filename);
-		break;
-	default:
-		break;
-	}
-}
-
-/*
- * SimpleTableModel::col_count
- */
-static int
-ml_col_count (ETableModel *etm, void *data)
-{
-	return COL_LAST;
-}
-
-static void *
-ml_duplicate_value (ETableModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-		return (void *) value;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-		return g_strdup (value);
-	default:
-		g_assert_not_reached ();
-	}
-	return NULL;
-}
-
-static void
-ml_free_value (ETableModel *etm, int col, void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-		break;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-		g_free (value);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void *
-ml_initialize_value (ETableModel *etm, int col, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-		return NULL;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-		return g_strdup("");
-	default:
-		g_assert_not_reached ();
-	}
-
-	return NULL;
-}
-
-static gboolean
-ml_value_is_empty (ETableModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-		return value == NULL;
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-		return !(value && *(char *)value);
-	default:
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-static char *
-ml_value_to_string (ETableModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-		switch ((int) value) {
-		case 0:
-			return g_strdup (_("Unseen"));
-			break;
-		case 1:
-			return g_strdup (_("Seen"));
-			break;
-		case 2:
-			return g_strdup (_("Answered"));
-			break;
-		case 3:
-			return g_strdup (_("Multiple Unseen Messages"));
-			break;
-		case 4:
-			return g_strdup (_("Multiple Messages"));
-			break;
-		default:
-			return g_strdup ("");
-			break;
-		}
-		break;
-		
-	case COL_SCORE:
-		switch ((int) value) {
-		case -3:
-			return g_strdup ("Lowest");
-			break;
-		case -2:
-			return g_strdup ("Lower");
-			break;
-		case -1:
-			return g_strdup ("Low");
-			break;
-		case 1:
-			return g_strdup ("High");
-			break;
-		case 2:
-			return g_strdup ("Higher");
-			break;
-		case 3:
-			return g_strdup ("Highest");
-			break;
-		default:
-			return g_strdup ("Normal");
-			break;
-		}
-		break;
-		
-	case COL_ATTACHMENT:
-	case COL_FLAGGED:
-	case COL_DELETED:
-	case COL_UNREAD:
-		return g_strdup_printf("%d", (int) value);
-		
-	case COL_SENT:
-	case COL_RECEIVED:
-		return filter_date (GPOINTER_TO_INT(value));
-		
-	case COL_SIZE:
-		return filter_size (GPOINTER_TO_INT(value));
-
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-		return g_strdup (value);
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static GdkPixbuf *
-ml_tree_icon_at (ETreeModel *etm, ETreePath *path, void *model_data)
-{
-	/* we dont really need an icon ... */
-	return NULL;
-}
-
-/* return true if there are any unread messages in the subtree */
-static int
-subtree_unread(MessageList *ml, ETreePath *node)
-{
-	CamelMessageInfo *info;
-	char *uid;
-
-	while (node) {
-		ETreePath *child;
-		uid = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-		if (uid == NULL) {
-			g_warning("I got a NULL uid at node %p", node);
-		} else if (id_is_uid(uid)
-			   && (info = camel_folder_get_message_info(ml->folder, id_uid(uid)))) {
-			if (!(info->flags & CAMEL_MESSAGE_SEEN)) {
-				camel_folder_free_message_info(ml->folder, info);
-				return TRUE;
-			}
-			camel_folder_free_message_info(ml->folder, info);
-		}
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->table_model), node)))
-			if (subtree_unread(ml, child))
-				return TRUE;
-		node = e_tree_model_node_get_next (E_TREE_MODEL (ml->table_model), node);
-	}
-	return FALSE;
-}
-
-static int
-subtree_size(MessageList *ml, ETreePath *node)
-{
-	CamelMessageInfo *info;
-	char *uid;
-	int size = 0;
-
-	while (node) {
-		ETreePath *child;
-		uid = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-		if (uid == NULL) {
-			g_warning("I got a NULL uid at node %p", node);
-		} else if (id_is_uid(uid)
-			   && (info = camel_folder_get_message_info(ml->folder, id_uid(uid)))) {
-			size += info->size;
-			camel_folder_free_message_info(ml->folder, info);
-		}
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->table_model), node)))
-			size += subtree_size(ml, child);
-
-		node = e_tree_model_node_get_next (E_TREE_MODEL (ml->table_model), node);
-	}
-	return size;
-}
-
-static time_t
-subtree_earliest(MessageList *ml, ETreePath *node, int sent)
-{
-	CamelMessageInfo *info;
-	char *uid;
-	time_t earliest = 0, date;
-
-	while (node) {
-		ETreePath *child;
-		uid = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-		if (uid == NULL) {
-			g_warning("I got a NULL uid at node %p", node);
-		} else if (id_is_uid(uid)
-			   && (info = camel_folder_get_message_info(ml->folder, id_uid(uid)))) {
-			if (sent)
-				date = info->date_sent;
-			else
-				date = info->date_received;
-			if (earliest == 0 || date < earliest)
-				earliest = date;
-			camel_folder_free_message_info(ml->folder, info);
-		}
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->table_model), node))) {
-			date = subtree_earliest(ml, child, sent);
-			if (earliest == 0 || (date != 0 && date < earliest))
-				earliest = date;
-		}
-
-		node = e_tree_model_node_get_next (E_TREE_MODEL (ml->table_model), node);
-	}
-
-	return earliest;
-}
-
-static void *
-ml_tree_value_at (ETreeModel *etm, ETreePath *path, int col, void *model_data)
-{
-	MessageList *message_list = model_data;
-	char *uid;
-	static char *saved;
-	CamelMessageInfo *msg_info;
-	void *value;
-
-	/* simlated(tm) static dynamic memory (sigh) */
-	if (saved) {
-		g_free(saved);
-		saved = 0;
-	}
-
-	/* retrieve the message information array */
-	uid = e_tree_model_node_get_data (etm, path);
-	if (uid == NULL) {
-		uid="s ERROR ERROR - UNKNOWN ROW IN TREE";
-		goto fake;
-	}
-	if (!id_is_uid(uid)) {
-		g_warning("Invalid node encountered: %s", uid);
-		goto fake;
-	}
-	uid = id_uid(uid);
-
-	msg_info = camel_folder_get_message_info (message_list->folder, uid);
-	if (msg_info == NULL) {
-		g_warning("Invalid node encountered: %s", uid);
-		goto fake;
-	}
-
-	switch (col){
-	case COL_MESSAGE_STATUS: {
-		ETreePath *child;
-
-		/* if a tree is collapsed, then scan its insides for details */
-		child = e_tree_model_node_get_first_child(etm, path);
-		if (child && !e_tree_model_node_is_expanded(etm, path)) {
-			if (subtree_unread(message_list, child))
-				return (void *)3;
-			else
-				return (void *)4;
-		}
-
-		if (msg_info->flags & CAMEL_MESSAGE_ANSWERED)
-			value = GINT_TO_POINTER (2);
-		else if (msg_info->flags & CAMEL_MESSAGE_SEEN)
-			value = GINT_TO_POINTER (1);
-		else
-			value = GINT_TO_POINTER (0);
-		break;
-	}
-
-	case COL_FLAGGED:
-		value = GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_FLAGGED) != 0);
-		break;
-
-	case COL_SCORE:
-	{
-		const char *tag;
-		int score = 0;
-		
-		tag = camel_tag_get ((CamelTag **) &msg_info->user_tags, "score");
-		if (tag)
-			score = atoi (tag);
-		
-		value = GINT_TO_POINTER (score);
-		break;
-	}
-		
-	case COL_ATTACHMENT:
-		value = GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_ATTACHMENTS) != 0);
-		break;
-
-	case COL_FROM:
-		saved = g_strdup (camel_message_info_from(msg_info));
-		value = saved;
-		break;
-
-	case COL_SUBJECT:
-		saved = g_strdup (camel_message_info_subject(msg_info));
-		value = saved;
-		break;
-		
-	case COL_SENT:
-		value = GINT_TO_POINTER (msg_info->date_sent);
-		break;
-		
-	case COL_RECEIVED:
-		value = GINT_TO_POINTER (msg_info->date_received);
-		break;
-		
-	case COL_TO:
-		saved = g_strdup (camel_message_info_to(msg_info));
-		value = saved;
-		break;
-
-	case COL_SIZE:
-		value = GINT_TO_POINTER (msg_info->size);
-		break;
-		
-	case COL_DELETED:
-		value = GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_DELETED) != 0);
-		break;
-		
-	case COL_UNREAD: {
-		ETreePath *child;
-
-		child = e_tree_model_node_get_first_child(etm, path);
-		if (child && !e_tree_model_node_is_expanded(etm, path)
-		    && (msg_info->flags & CAMEL_MESSAGE_SEEN)) {
-			return (void *)subtree_unread(message_list, child);
-		}
-
-		value = GINT_TO_POINTER (!(msg_info->flags & CAMEL_MESSAGE_SEEN));
-		break;
-	}
-	case COL_COLOUR:
-	{
-		const char *colour;
-
-		colour = camel_tag_get ((CamelTag **) &msg_info->user_tags,
-					"colour");
-		if (colour) {
-			saved = g_strdup (colour);
-			value = saved;
-		} else if (msg_info->flags & CAMEL_MESSAGE_FLAGGED)
-			/* FIXME: extract from the xpm somehow. */
-			value = "#A7453E";
-		else
-			value = NULL;
-		break;
-	}
-	}
-
-	camel_folder_free_message_info(message_list->folder, msg_info);
-	return value;
-
-	g_assert_not_reached ();
-	
- fake:
-	/* This is a fake tree parent */
-	switch (col){
-	case COL_UNREAD:
-		/* this value should probably be cached, as it could take a bit
-		   of processing to evaluate all the time */
-		return (void *)subtree_unread(message_list, e_tree_model_node_get_first_child(etm, path));
-
-	case COL_MESSAGE_STATUS:
-		/* The same applies as for COL_UNREAD just above */
-		if (subtree_unread(message_list, e_tree_model_node_get_first_child(etm,path)))
-			return (void *)3;
-		else
-			return (void *)4;
-		
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_COLOUR:
-		return (void *) 0;
-
-	case COL_SENT:
-		return (void *)subtree_earliest(message_list, e_tree_model_node_get_first_child(etm, path), TRUE);
-
-	case COL_RECEIVED:
-		return (void *)subtree_earliest(message_list, e_tree_model_node_get_first_child(etm, path), FALSE);
-
-	case COL_SUBJECT:
-		saved = g_strdup_printf(_("[ %s ]"), id_subject(uid));
-		return saved;
-		
-	case COL_FROM: {
-		ETreePath *child;
-		
-		/* the first child should always exist/etc */
-		if ( (child = e_tree_model_node_get_first_child(etm, path))
-		     && (uid = e_tree_model_node_get_data (etm, child))
-		     && id_is_uid(uid)	
-		     && (msg_info = camel_folder_get_message_info (message_list->folder, id_uid(uid))) ) {
-			/* well, we could scan more children, build up a (more accurate) list, but this should do ok */
-			saved = g_strdup_printf(_("%s, et al."), camel_message_info_from(msg_info));
-			camel_folder_free_message_info(message_list->folder, msg_info);
-		} else {
-			return _("<unknown>");
-		}
-		return saved;
-	}
-	case COL_TO: {
-		ETreePath *child;
-		
-		/* the first child should always exist/etc */
-		if ( (child = e_tree_model_node_get_first_child(etm, path))
-		     && (uid = e_tree_model_node_get_data (etm, child))
-		     && id_is_uid(uid)	
-		     && (msg_info = camel_folder_get_message_info (message_list->folder, id_uid(uid))) ) {
-			/* well, we could scan more children, build up a (more accurate) list, but this should do ok */
-			saved = g_strdup_printf(_("%s, et al."), camel_message_info_to(msg_info));
-			camel_folder_free_message_info(message_list->folder, msg_info);
-		} else {
-			return _("<unknown>");
-		}
-		return saved;
-	}
-	case COL_SIZE:
-		return GINT_TO_POINTER (subtree_size(message_list, e_tree_model_node_get_first_child(etm, path)));
-	}
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-static void
-ml_tree_set_value_at (ETreeModel *etm, ETreePath *path, int col,
-		      const void *val, void *model_data)
-{
-	g_assert_not_reached ();
-}
-
-static gboolean
-ml_tree_is_cell_editable (ETreeModel *etm, ETreePath *path, int col, void *model_data)
-{
-	return FALSE;
-}
-
-static void
-message_list_init_images (void)
-{
-	int i;
-	
-	/*
-	 * Only load once, and share
-	 */
-	if (states_pixmaps [0].pixbuf)
-		return;
-	
-	for (i = 0; states_pixmaps [i].image_base; i++){
-		states_pixmaps [i].pixbuf = gdk_pixbuf_new_from_xpm_data (
-			(const char **) states_pixmaps [i].image_base);
-	}
-}
-
-static char *
-filter_date (time_t date)
-{
-	time_t nowdate = time(NULL);
-	time_t yesdate;
-	struct tm then, now, yesterday;
-	char buf[26];
-	gboolean done = FALSE;
-
-	if (date == 0)
-		return g_strdup (_("?"));
-
-	localtime_r (&date, &then);
-	localtime_r (&nowdate, &now);
-	if (then.tm_mday == now.tm_mday &&
-	    then.tm_mon == now.tm_mon &&
-	    then.tm_year == now.tm_year) {
-		strftime (buf, 26, _("Today %l:%M %p"), &then);
-		done = TRUE;
-	}
-	if (!done) {
-		yesdate = nowdate - 60 * 60 * 24;
-		localtime_r (&yesdate, &yesterday);
-		if (then.tm_mday == yesterday.tm_mday &&
-		    then.tm_mon == yesterday.tm_mon &&
-		    then.tm_year == yesterday.tm_year) {
-			strftime (buf, 26, _("Yesterday %l:%M %p"), &then);
-			done = TRUE;
-		}
-	}
-	if (!done) {
-		int i;
-		for (i = 2; i < 7; i++) {
-			yesdate = nowdate - 60 * 60 * 24 * i;
-			localtime_r (&yesdate, &yesterday);
-			if (then.tm_mday == yesterday.tm_mday &&
-			    then.tm_mon == yesterday.tm_mon &&
-			    then.tm_year == yesterday.tm_year) {
-				strftime (buf, 26, _("%a %l:%M %p"), &then);
-				done = TRUE;
-				break;
-			}
-		}
-	}
-	if (!done) {
-		if (then.tm_year == now.tm_year) {
-			strftime (buf, 26, _("%b %d %l:%M %p"), &then);
-		} else {
-			strftime (buf, 26, _("%b %d %Y"), &then);
-		}
-	}
-#if 0
-#ifdef CTIME_R_THREE_ARGS
-	ctime_r (&date, buf, 26);
-#else
-	ctime_r (&date, buf);
-#endif
-#endif
-
-	return g_strdup (buf);
-}
-
-static ETableExtras *
-message_list_create_extras (void)
-{
-	int i;
-	GdkPixbuf *images [7];
-	ETableExtras *extras;
-	ECell *cell;
-
-	extras = e_table_extras_new();
-	e_table_extras_add_pixbuf(extras, "status", states_pixmaps [0].pixbuf);
-	e_table_extras_add_pixbuf(extras, "score", states_pixmaps [13].pixbuf);
-	e_table_extras_add_pixbuf(extras, "attachment", states_pixmaps [6].pixbuf);
-	e_table_extras_add_pixbuf(extras, "flagged", states_pixmaps [7].pixbuf);
-	
-	e_table_extras_add_compare(extras, "address_compare", address_compare);
-	e_table_extras_add_compare(extras, "subject_compare", subject_compare);
-	
-	for (i = 0; i < 5; i++)
-		images [i] = states_pixmaps [i].pixbuf;
-
-	e_table_extras_add_cell(extras, "render_message_status", e_cell_toggle_new (0, 5, images));
-
-	for (i = 0; i < 2; i++)
-		images [i] = states_pixmaps [i + 5].pixbuf;
-	
-	e_table_extras_add_cell(extras, "render_attachment", e_cell_toggle_new (0, 2, images));
-	
-	images [1] = states_pixmaps [7].pixbuf;
-	e_table_extras_add_cell(extras, "render_flagged", e_cell_toggle_new (0, 2, images));
-
-	for (i = 0; i < 7; i++)
-		images[i] = states_pixmaps [i + 7].pixbuf;
-	
-	e_table_extras_add_cell(extras, "render_score", e_cell_toggle_new (0, 7, images));
-	
-	/* date cell */
-	cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", COL_DELETED,
-			"bold_column", COL_UNREAD,
-			"color_column", COL_COLOUR,
-			NULL);
-	e_table_extras_add_cell(extras, "render_date", cell);
-	
-	/* text cell */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", COL_DELETED,
-			"bold_column", COL_UNREAD,
-			"color_column", COL_COLOUR,
-			NULL);
-	e_table_extras_add_cell(extras, "render_text", cell);
-	
-	e_table_extras_add_cell(extras, "render_tree", 
-				e_cell_tree_new (NULL, NULL, /* let the tree renderer default the pixmaps */
-						 TRUE, cell));
-
-	/* size cell */
-	cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", COL_DELETED,
-			"bold_column", COL_UNREAD,
-			"color_column", COL_COLOUR,
-			NULL);
-	e_table_extras_add_cell(extras, "render_size", cell);
-
-	return extras;
-}
-
-static void
-save_header_state(MessageList *ml)
-{
-	char *filename;
-
-	if (ml->folder == NULL || ml->table == NULL)
-		return;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "et-header-");
-	e_table_save_state(ml->table, filename);
-	g_free(filename);
-}
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("Status"), N_("Flagged"), N_("Score"), N_("Attachment"),
-	N_("From"),   N_("Subject"), N_("Date"),  N_("Received"),
-	N_("To"),     N_("Size")
-};
-#endif
-
-char *
-message_list_get_layout (MessageList *message_list)
-{
-	/* Default: Status, Attachments, Priority, From, Subject, Date */
-	return g_strdup ("<ETableSpecification cursor-mode=\"line\" draw-grid=\"true\" draw-focus=\"true\" selection-mode=\"browse\">"
-			 "<ETableColumn model_col= \"0\" _title=\"Status\" pixbuf=\"status\" expansion=\"0.0\" minimum_width=\"18\" resizable=\"false\" cell=\"render_message_status\" compare=\"integer\" sortable=\"false\"/>"
-			 "<ETableColumn model_col= \"1\" _title=\"Flagged\" pixbuf=\"flagged\" expansion=\"0.0\" minimum_width=\"18\" resizable=\"false\" cell=\"render_flagged\" compare=\"integer\"/>"
-			 "<ETableColumn model_col= \"2\" _title=\"Score\" pixbuf=\"score\" expansion=\"0.0\" minimum_width=\"18\" resizable=\"false\" cell=\"render_score\" compare=\"integer\"/>"
-			 "<ETableColumn model_col= \"3\" _title=\"Attachment\" pixbuf=\"attachment\" expansion=\"0.0\" minimum_width=\"18\" resizable=\"false\" cell=\"render_attachment\" compare=\"integer\" sortable=\"false\"/>"
-			 "<ETableColumn model_col= \"4\" _title=\"From\" expansion=\"24.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_text\" compare=\"address_compare\"/>"
-			 "<ETableColumn model_col= \"5\" _title=\"Subject\" expansion=\"30.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_tree\" compare=\"subject_compare\"/>"
-			 "<ETableColumn model_col= \"6\" _title=\"Date\" expansion=\"24.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_date\" compare=\"integer\"/>"
-			 "<ETableColumn model_col= \"7\" _title=\"Received\" expansion=\"20.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_date\" compare=\"integer\"/>"
-			 "<ETableColumn model_col= \"8\" _title=\"To\" expansion=\"24.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_text\" compare=\"address_compare\"/>"
-			 "<ETableColumn model_col= \"9\" _title=\"Size\" expansion=\"6.0\" minimum_width=\"32\" resizable=\"true\" cell=\"render_size\" compare=\"integer\"/>"
-			 "<ETableState> <column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>"
-			 "<column source=\"4\"/> <column source=\"5\"/> <column source=\"6\"/>"
-			 "<grouping> </grouping> </ETableState>"
-			 "</ETableSpecification>");
-}
-
-static void
-message_list_setup_etable(MessageList *message_list)
-{
-	/* build the spec based on the folder, and possibly from a saved file */
-	/* otherwise, leave default */
-	if (message_list->folder) {
-		char *path;
-		char *name;
-		struct stat st;
-		
-		name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
-		printf ("folder name is '%s'\n", name);
-		path = mail_config_folder_to_cachename (message_list->folder, "et-header-");
-		
-		if (path && stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
-			/* build based on saved file */
-			e_table_load_state (message_list->table, path);
-		} else if (strstr (name, "/Drafts") || strstr (name, "/Outbox") || strstr (name, "/Sent")) {
-			/* these folders have special defaults */
-			char *state = "<ETableState>"
-				"<column source=\"0\"/> <column source=\"1\"/> "
-				"<column source=\"8\"/> <column source=\"5\"/> "
-				"<column source=\"6\"/> <grouping> </grouping> </ETableState>";
-			
-			e_table_set_state (message_list->table, state);
-		}
-		
-		g_free (path);
-		g_free (name);
-	}
-}
-
-/*
- * GtkObject::init
- */
-static void
-message_list_init (GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (message_list),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-
-	message_list->uid_rowmap = g_hash_table_new (g_str_hash, g_str_equal);
-	message_list->uid_pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
-	message_list->hidden = NULL;
-	message_list->hidden_pool = NULL;
-	message_list->hide_before = ML_HIDE_NONE_START;
-	message_list->hide_after = ML_HIDE_NONE_END;
-
-	message_list->hide_lock = g_mutex_new();
-}
-
-static void
-message_list_destroy (GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-
-	if (message_list->folder) {
-		save_tree_state(message_list);
-		save_header_state(message_list);
-		hide_save_state(message_list);
-	}
-	
-	gtk_object_unref (GTK_OBJECT (message_list->table_model));
-	
-	g_hash_table_destroy (message_list->uid_rowmap);
-	e_mempool_destroy(message_list->uid_pool);
-
-	if (message_list->idle_id != 0)
-		g_source_remove(message_list->idle_id);
-	
-	if (message_list->seen_id)
-		gtk_timeout_remove (message_list->seen_id);
-	
-	if (message_list->folder) {
-		camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
-					  folder_changed, message_list);
-		camel_object_unhook_event((CamelObject *)message_list->folder, "message_changed",
-					  message_changed, message_list);
-		camel_object_unref (CAMEL_OBJECT (message_list->folder));
-	}
-
-	if (message_list->hidden) {
-		g_hash_table_destroy(message_list->hidden);
-		e_mempool_destroy(message_list->hidden_pool);
-		message_list->hidden = NULL;
-		message_list->hidden_pool = NULL;
-	}
-
-	g_free(message_list->cursor_uid);
-
-	g_mutex_free(message_list->hide_lock);
-
-	GTK_OBJECT_CLASS (message_list_parent_class)->destroy (object);
-}
-
-/*
- * GtkObjectClass::init
- */
-static void
-message_list_class_init (GtkObjectClass *object_class)
-{
-	message_list_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = message_list_destroy;
-
-	message_list_signals[MESSAGE_SELECTED] =
-		gtk_signal_new ("message_selected",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (MessageListClass, message_selected),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals(object_class, message_list_signals, LAST_SIGNAL);
-
-	message_list_init_images ();
-}
-
-static void
-message_list_construct (MessageList *message_list)
-{
-	ETableExtras *extras;
-	char *spec;
-
-	message_list->table_model = (ETableModel *)
-		e_tree_simple_new (ml_col_count,
-				   ml_duplicate_value,
-				   ml_free_value,
-				   ml_initialize_value,
-				   ml_value_is_empty,
-				   ml_value_to_string,
-				   ml_tree_icon_at, ml_tree_value_at,
-				   ml_tree_set_value_at,
-				   ml_tree_is_cell_editable,
-				   message_list);
-	gtk_object_ref (GTK_OBJECT (message_list->table_model));
-	gtk_object_sink (GTK_OBJECT (message_list->table_model));
-	
-	e_tree_model_root_node_set_visible ((ETreeModel *)message_list->table_model, FALSE);
-
-	/*
-	 * The etable
-	 */
-	spec = message_list_get_layout (message_list);
-	extras = message_list_create_extras ();
-	e_table_scrolled_construct (E_TABLE_SCROLLED (message_list),
-				    message_list->table_model,
-				    extras, spec, NULL);
-	message_list->table =
-		e_table_scrolled_get_table (E_TABLE_SCROLLED (message_list));
-	g_free (spec);
-	gtk_object_sink (GTK_OBJECT (extras));
-
-	gtk_signal_connect (GTK_OBJECT (message_list->table), "cursor_activated",
-			    GTK_SIGNAL_FUNC (on_cursor_activated_cmd),
-			    message_list);
-
-	gtk_signal_connect (GTK_OBJECT (message_list->table), "click",
-			    GTK_SIGNAL_FUNC (on_click), message_list);
-	
-	/* drag & drop */
-	e_table_drag_source_set (message_list->table, GDK_BUTTON1_MASK,
-				 drag_types, num_drag_types, GDK_ACTION_MOVE);
-	
-	gtk_signal_connect (GTK_OBJECT (message_list->table), "drag_data_get",
-			    GTK_SIGNAL_FUNC (message_list_drag_data_get),
-			    message_list);
-}
-
-GtkWidget *
-message_list_new (void)
-{
-	MessageList *message_list;
-
-	message_list = MESSAGE_LIST (gtk_widget_new (message_list_get_type (),
-						     "hadjustment", NULL,
-						     "vadjustment", NULL,
-						     NULL));
-	message_list_construct (message_list);
-
-	return GTK_WIDGET (message_list);
-}
-
-static void
-clear_tree (MessageList *ml)
-{
-	ETreeModel *etm = E_TREE_MODEL (ml->table_model);
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Clearing tree\n");
-	gettimeofday(&start, NULL);
-#endif
-
-	/* we also reset the uid_rowmap since it is no longer useful/valid anyway */
-	g_hash_table_destroy (ml->uid_rowmap);
-	ml->uid_rowmap = g_hash_table_new(g_str_hash, g_str_equal);
-	e_mempool_flush(ml->uid_pool, TRUE);
-	
-	if (ml->tree_root) {
-		/* we should be frozen already */
-		e_tree_model_node_remove (etm, ml->tree_root);
-	}
-
-	ml->tree_root = e_tree_model_node_insert (etm, NULL, 0, NULL);
-	e_tree_model_node_set_expanded (etm, ml->tree_root, TRUE);
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Clearing tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-
-/* we save the node id to the file if the node should be closed when
-   we start up.  We only save nodeid's for messages with children */
-static void
-save_node_state(MessageList *ml, FILE *out, ETreePath *node)
-{
-	char *data;
-	CamelMessageInfo *info;
-
-	while (node) {
-		ETreePath *child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->table_model), node);
-		if (child
-		    && !e_tree_model_node_is_expanded((ETreeModel *)ml->table_model, node)) {
-			data = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-			if (data) {
-				if (id_is_uid(data)) {
-					info = camel_folder_get_message_info(ml->folder, id_uid(data));
-					if (info) {
-						fprintf(out, "%08x%08x\n", info->message_id.id.part.hi, info->message_id.id.part.lo);
-						camel_folder_free_message_info(ml->folder, info);
-					}
-				} else {
-					fprintf(out, "%s\n", data);
-				}
-			}
-		}
-		if (child) {
-			save_node_state(ml, out, child);
-		}
-		node = e_tree_model_node_get_next (E_TREE_MODEL (ml->table_model), node);
-	}
-}
-
-static GHashTable *
-load_tree_state(MessageList *ml)
-{
-	char *filename, linebuf[10240];
-	GHashTable *result;
-	FILE *in;
-	int len;
-
-	result = g_hash_table_new(g_str_hash, g_str_equal);
-	filename = mail_config_folder_to_cachename(ml->folder, "treestate-");
-	in = fopen(filename, "r");
-	if (in) {
-		while (fgets(linebuf, sizeof(linebuf), in) != NULL) {
-			len = strlen(linebuf);
-			if (len) {
-				linebuf[len-1] = 0;
-				g_hash_table_insert(result, g_strdup(linebuf), (void *)1);
-			}
-		}
-		fclose(in);
-	}
-	g_free(filename);
-	return result;
-}
-
-/* save tree info */
-static void
-save_tree_state(MessageList *ml)
-{
-	char *filename;
-	ETreePath *node;
-	ETreePath *child;
-	FILE *out;
-	int rem;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "treestate-");
-	out = fopen(filename, "w");
-	if (out) {
-		node = e_tree_model_get_root((ETreeModel *)ml->table_model);
-		child = e_tree_model_node_get_first_child ((ETreeModel *)ml->table_model, node);
-		if (node && child) {
-			save_node_state(ml, out, child);
-		}
-		rem = ftell(out) == 0;
-		fclose(out);
-		/* remove the file if it was empty, should probably check first, but this is easier */
-		if (rem)
-			unlink(filename);
-	}
-	g_free(filename);
-}
-
-static void
-free_node_state(void *key, void *value, void *data)
-{
-	g_free(key);
-}
-
-static void
-free_tree_state(GHashTable *expanded_nodes)
-{
-	g_hash_table_foreach(expanded_nodes, free_node_state, 0);
-	g_hash_table_destroy(expanded_nodes);
-}
-
-/* only call if we have a tree model */
-/* builds the tree structure */
-static void build_subtree (MessageList *ml, ETreePath *parent, CamelFolderThreadNode *c, int *row, GHashTable *);
-
-static void build_subtree_diff (MessageList *ml, ETreePath *parent, ETreePath *path, CamelFolderThreadNode *c, int *row, GHashTable *expanded_nodes);
-
-static void
-build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *changes)
-{
-	int row = 0;
-	GHashTable *expanded_nodes;
-	ETreeModel *etm = (ETreeModel *)ml->table_model;
-	ETreePath *top;
-	char *uid = NULL;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Building tree\n");
-	gettimeofday(&start, NULL);
-#endif
-	expanded_nodes = load_tree_state(ml);
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Loading tree state took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-	if (ml->tree_root == NULL) {
-		ml->tree_root =	e_tree_model_node_insert(etm, NULL, 0, NULL);
-		e_tree_model_node_set_expanded(etm, ml->tree_root, TRUE);
-	}
-
-#define BROKEN_ETREE	/* avoid some broken code in etree(?) by not using the incremental update */
-
-	top = e_tree_model_node_get_first_child(etm, ml->tree_root);
-#ifndef BROKEN_ETREE
-	if (top == NULL || changes == NULL) {
-#endif
-		if (ml->cursor_uid) {
-			uid = g_strdup(ml->cursor_uid);
-			printf("current uid = %s\n", uid);
-		}
-
-		e_tree_model_freeze(etm);
-		clear_tree (ml);
-
-		build_subtree(ml, ml->tree_root, thread->tree, &row, expanded_nodes);
-
-		e_tree_model_thaw(etm);
-
-		if (uid) {
-			int row;
-			char *dummy;
-
-			if (g_hash_table_lookup_extended(ml->uid_rowmap, uid, (void **)&dummy, (void **)&row)) {
-				printf("selecting uid %s row %d\n", uid, row);
-				e_table_set_cursor_row(ml->table, row);
-			} else {
-				printf("cannot find uid %s\n", uid);
-				g_free(ml->cursor_uid);
-				ml->cursor_uid = NULL;
-				gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL);
-			}
-			g_free(uid);
-		}
-
-#ifndef BROKEN_ETREE
-	} else {
-		static int tree_equal(ETreeModel *etm, ETreePath *ap, CamelFolderThreadNode *bp);
-
-		build_subtree_diff(ml, ml->tree_root, top,  thread->tree, &row, expanded_nodes);
-		top = e_tree_model_node_get_first_child(etm, ml->tree_root);
-		tree_equal(ml->table_model, top, thread->tree);
-	}
-#endif
-	free_tree_state(expanded_nodes);
-	
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Building tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-
-static char *
-new_id_from_uid(MessageList *ml, const char *uid)
-{
-	char *res;
-	int len;
-
-	len = strlen(uid)+2;
-	res = e_mempool_alloc(ml->uid_pool, len);
-	res[0] = 'u';
-	strcpy(res+1, uid);
-	return res;
-}
-
-static char *
-new_id_from_subject(MessageList *ml, const char *subject)
-{
-	char *res;
-	int len;
-
-	len = strlen(subject)+2;
-	res = e_mempool_alloc(ml->uid_pool, len);
-	res[0] = 's';
-	strcpy(res+1, subject);
-	return res;
-}
-
-/* this is about 20% faster than build_subtree_diff,
-   entirely because e_tree_model_node_insert(xx, -1 xx)
-   is faster than inserting to the right row :( */
-/* Otherwise, this code would probably go as it does the same thing essentially */
-static void
-build_subtree (MessageList *ml, ETreePath *parent, CamelFolderThreadNode *c, int *row, GHashTable *expanded_nodes)
-{
-	ETreeModel *tree = E_TREE_MODEL (ml->table_model);
-	ETreePath *node;
-	char *id;
-	int expanded = FALSE;
-
-	while (c) {
-		if (c->message) {
-			id = new_id_from_uid(ml, camel_message_info_uid(c->message));
-			g_hash_table_insert(ml->uid_rowmap, id_uid(id), GINT_TO_POINTER ((*row)++));
-			if (c->child) {
-				if (c->message) {
-					char key[17];
-					sprintf(key, "%08x%08x", c->message->message_id.id.part.hi, c->message->message_id.id.part.lo);
-					expanded = !g_hash_table_lookup(expanded_nodes, key) != 0;
-				} else
-					expanded = TRUE;
-			}
-		} else {
-			id = new_id_from_subject(ml, c->root_subject);
-			if (c->child) {
-				expanded = !g_hash_table_lookup(expanded_nodes, id) != 0;
-			}
-		}
-		node = e_tree_model_node_insert(tree, parent, -1, id);
-		if (c->child) {
-			/* by default, open all trees */
-			if (expanded)
-				e_tree_model_node_set_expanded(tree, node, expanded);
-			build_subtree(ml, node, c->child, row, expanded_nodes);
-		}
-		c = c->next;
-	}
-}
-
-/* compares a thread tree node with the etable tree node to see if they point to
-   the same object */
-static int
-node_equal(ETreeModel *etm, ETreePath *ap, CamelFolderThreadNode *bp)
-{
-	char *uid;
-
-	uid = e_tree_model_node_get_data(etm, ap);
-
-	if (id_is_uid(uid)) {
-		if (bp->message && strcmp(id_uid(uid), camel_message_info_uid(bp->message))==0)
-			return 1;
-	} else if (id_is_subject(uid)) {
-		if (bp->message == NULL && strcmp(id_subject(uid), bp->root_subject) == 0)
-			return 1;
-	}
-	return 0;
-}
-
-#ifndef BROKEN_ETREE
-/* debug function - compare the two trees to see if they are the same */
-static int
-tree_equal(ETreeModel *etm, ETreePath *ap, CamelFolderThreadNode *bp)
-{
-	char *uid;
-
-	while (ap && bp) {
-		if (!node_equal(etm, ap, bp)) {
-			g_warning("Nodes in tree differ");
-			uid = e_tree_model_node_get_data(etm, ap);
-			if (id_is_uid(uid))
-				printf("table uid = %s\n", id_uid(uid));
-			else
-				printf("table subject = %s\n", id_subject(uid));
-			if (bp->message)
-				printf("camel uid = %s\n", camel_message_info_uid(bp->message));
-			else
-				printf("camel subject = %s\n", bp->root_subject);
-			return FALSE;
-		} else {
-			if (!tree_equal(etm, e_tree_model_node_get_first_child(etm, ap), bp->child))
-				return FALSE;
-		}
-		bp = bp->next;
-		ap = e_tree_model_node_get_next(etm, ap);
-	}
-
-	if (ap || bp) {
-		g_warning("Tree differs, out of nodes in one branch");
-		if (ap) {
-			uid = e_tree_model_node_get_data(etm, ap);
-			if (uid) {
-				if (id_is_uid(uid))
-					printf("table uid = %s\n", id_uid(uid));
-				else
-					printf("table subject = %s\n", id_subject(uid));
-			} else
-				printf("uid is empty?\n");
-		}
-		if (bp) {
-			if (bp->message)
-				printf("camel uid = %s\n", camel_message_info_uid(bp->message));
-			else
-				printf("camel subject = %s\n", bp->root_subject);
-			return FALSE;
-		}
-		return FALSE;
-	}
-	return TRUE;
-}
-#endif
-
-/* adds a single node, retains save state, and handles adding children if required */
-static void
-add_node_diff(MessageList *ml, ETreePath *parent, ETreePath *path, CamelFolderThreadNode *c, int *row, int myrow, GHashTable *expanded_nodes)
-{
-	ETreeModel *etm = E_TREE_MODEL (ml->table_model);
-	ETreePath *node;
-	char *id;
-	int expanded = FALSE;
-
-	if (c->message) {
-		id = new_id_from_uid(ml, camel_message_info_uid(c->message));
-		/* need to remove the id first, as GHashTable' wont replace the key pointer for us */
-		g_hash_table_remove(ml->uid_rowmap, id_uid(id));
-		g_hash_table_insert(ml->uid_rowmap, id_uid(id), GINT_TO_POINTER (*row));
-		if (c->child) {
-			if (c->message) {
-				char key[17];
-				sprintf(key, "%08x%08x", c->message->message_id.id.part.hi, c->message->message_id.id.part.lo);
-				expanded = !g_hash_table_lookup(expanded_nodes, key) != 0;
-			} else
-				expanded = TRUE;
-		}
-	} else {
-		id = new_id_from_subject(ml, c->root_subject);
-		if (c->child) {
-			expanded = !g_hash_table_lookup(expanded_nodes, id) != 0;
-		}
-	}
-
-	t(printf("Adding node: %s row %d\n", id, myrow));
-
-	node = e_tree_model_node_insert(etm, parent, myrow, id);
-	(*row)++;
-	if (c->child) {
-		e_tree_model_node_set_expanded(etm, node, expanded);
-		t(printf("Building subtree ...\n"));
-		build_subtree_diff(ml, node, NULL, c->child, row, expanded_nodes);
-	}
-}
-
-/* removes node, children recursively and all associated data */
-static void
-remove_node_diff(MessageList *ml, ETreePath *node, int depth)
-{
-	ETreeModel *etm = E_TREE_MODEL (ml->table_model);
-	ETreePath *cp, *cn;
-	char *uid, *olduid;
-	int oldrow;
-
-	t(printf("Removing node: %s\n", (char *)e_tree_model_node_get_data(etm, node)));
-
-	/* we depth-first remove all node data's ... */
-	cp = e_tree_model_node_get_first_child(etm, node);
-	while (cp) {
-		cn = e_tree_model_node_get_next(etm, cp);
-		remove_node_diff(ml, cp, depth+1);
-		cp = cn;
-	}
-
-	/* and the rowid entry - if and only if it is referencing this node */
-	uid = e_tree_model_node_get_data(etm, node);
-	if (id_is_uid(uid)
-	    && g_hash_table_lookup_extended(ml->uid_rowmap, id_uid(uid), (void *)&olduid, (void *)&oldrow)
-	    && olduid == id_uid(uid)) {
-		t(printf("removing rowid map entry: %s\n", id_uid(uid)));
-		g_hash_table_remove(ml->uid_rowmap, id_uid(uid));
-	}
-	e_tree_model_node_set_data(etm, node, NULL);
-
-	/* and only at the toplevel, remove the node (etree should optimise this remove somewhat) */
-	if (depth == 0)
-		e_tree_model_node_remove(etm, node);
-}
-
-/* applies a new tree structure to an existing tree, but only by changing things
-   that have changed */
-static void
-build_subtree_diff(MessageList *ml, ETreePath *parent, ETreePath *path, CamelFolderThreadNode *c, int *row, GHashTable *expanded_nodes)
-{
-	ETreeModel *etm = E_TREE_MODEL (ml->table_model);
-	ETreePath *ap, *ai, *at, *tmp;
-	CamelFolderThreadNode *bp, *bi, *bt;
-	int i, j, myrow = 0;
-
-	ap = path;
-	bp = c;
-
-	while (ap || bp) {
-		t(printf("Processing row: %d (subtree row %d)\n", *row, myrow));
-		if (ap == NULL) {
-			t(printf("out of old nodes\n"));
-			/* ran out of old nodes - remaining nodes are added */
-			add_node_diff(ml, parent, ap, bp, row, myrow, expanded_nodes);
-			myrow++;
-			bp = bp->next;
-		} else if (bp == NULL) {
-			t(printf("out of new nodes\n"));
-			/* ran out of new nodes - remaining nodes are removed */
-			tmp = e_tree_model_node_get_next(etm, ap);
-			remove_node_diff(ml, ap, 0);
-			ap = tmp;
-		} else if (node_equal(etm, ap, bp)) {
-			/*t(printf("nodes match, verify\n"));*/
-			/* matching nodes, verify details/children */
-			if (bp->message) {
-				char *olduid;
-				int oldrow;
-
-				/* if this is a message row, check/update the row id map */
-				if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), (void *)&olduid, (void *)&oldrow)) {
-					if (oldrow != (*row)) {
-						g_hash_table_insert(ml->uid_rowmap, olduid, (void *)(*row));
-					}
-				} else {
-					g_warning("Cannot find uid %s in table?", camel_message_info_uid(bp->message));
-					/*g_assert_not_reached();*/
-				}
-			}
-			*row = (*row)+1;
-			myrow++;
-			tmp = e_tree_model_node_get_first_child(etm, ap);
-			/* make child lists match (if either has one) */
-			if (bp->child || tmp) {
-				build_subtree_diff(ml, ap, tmp, bp->child, row, expanded_nodes);
-			}
-			ap = e_tree_model_node_get_next(etm, ap);
-			bp = bp->next;
-		} else {
-			t(printf("searching for matches\n"));
-			/* we have to scan each side for a match */
-			bi = bp->next;
-			ai = e_tree_model_node_get_next(etm, ap);
-			for (i=1;bi!=NULL;i++,bi=bi->next) {
-				if (node_equal(etm, ap, bi))
-					break;
-			}
-			for (j=1;ai!=NULL;j++,ai=e_tree_model_node_get_next(etm, ai)) {
-				if (node_equal(etm, ai, bp))
-					break;
-			}
-			if (i<j) {
-				/* smaller run of new nodes - must be nodes to add */
-				if (bi) {
-					bt = bp;
-					while (bt != bi) {
-						t(printf("adding new node 0\n"));
-						add_node_diff(ml, parent, NULL, bt, row, myrow, expanded_nodes);
-						myrow++;
-						bt = bt->next;
-					}
-					bp = bi;
-				} else {
-					t(printf("adding new node 1\n"));
-					/* no match in new nodes, add one, try next */
-					add_node_diff(ml, parent, NULL, bp, row, myrow, expanded_nodes);
-					myrow++;
-					bp = bp->next;
-				}
-			} else {
-				/* bigger run of old nodes - must be nodes to remove */
-				if (ai) {
-					at = ap;
-					while (at != ai) {
-						t(printf("removing old node 0\n"));
-						tmp = e_tree_model_node_get_next(etm, at);
-						remove_node_diff(ml, at, 0);
-						at = tmp;
-					}
-					ap = ai;
-				} else {
-					t(printf("adding new node 2\n"));
-					/* didn't find match in old nodes, must be new node? */
-					add_node_diff(ml, parent, NULL, bp, row, myrow, expanded_nodes);
-					myrow++;
-					bp = bp->next;
-#if 0
-					tmp = e_tree_model_node_get_next(etm, ap);
-					remove_node_diff(etm, ap, 0);
-					ap = tmp;
-#endif
-				}
-			}
-		}
-	}
-}
-
-#ifndef BROKEN_ETREE
-static void build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes);
-#endif
-
-static void
-build_flat (MessageList *ml, GPtrArray *uids, CamelFolderChangeInfo *changes)
-{
-	ETreeModel *tree = E_TREE_MODEL (ml->table_model);
-	ETreePath *node;
-	char *saveuid = NULL;
-	int i;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Building flat\n");
-	gettimeofday(&start, NULL);
-#endif
-
-#ifndef BROKEN_ETREE
-	if (changes) {
-		build_flat_diff(ml, changes);
-	} else {
-#endif
-		if (ml->cursor_uid)
-			saveuid = g_strdup(ml->cursor_uid);
-
-		e_tree_model_freeze(tree);
-		clear_tree (ml);
-		for (i = 0; i < uids->len; i++) {
-			char *uid = new_id_from_uid(ml, uids->pdata[i]);
-			node = e_tree_model_node_insert (tree, ml->tree_root, -1, uid);
-			g_hash_table_insert (ml->uid_rowmap, id_uid(uid), GINT_TO_POINTER (i));
-		}
-		e_tree_model_thaw(tree);
-
-		if (saveuid) {
-			int row;
-			char *dummy;
-
-			if (g_hash_table_lookup_extended(ml->uid_rowmap, saveuid, (void **)&dummy, (void **)&row)) {
-				printf("re-selecting %s rwo %d\n", saveuid, row);
-				e_table_set_cursor_row(ml->table, row);
-			} else {
-				printf("can't find uid %s anymore\n", saveuid);
-				g_free(ml->cursor_uid);
-				ml->cursor_uid = NULL;
-				gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL);
-			}
-
-			g_free(saveuid);
-		}
-#ifndef BROKEN_ETREE
-	}
-#endif
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Building flat took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-
-#ifndef BROKEN_ETREE
-
-/* used to sort the rows to match list order */
-struct _uidsort {
-	int row;
-	char *uid;
-};
-
-static int
-sort_uid_cmp(const void *ap, const void *bp)
-{
-	const struct _uidsort *a = (struct _uidsort *)ap;
-	const struct _uidsort *b = (struct _uidsort *)bp;
-
-	if (a->row < b->row)
-		return -1;
-	else if (a->row > b->row)
-		return 1;
-	return 0;
-}
-
-static void
-sort_uid_to_rows(MessageList *ml, GPtrArray *uids)
-{
-	struct _uidsort *uidlist;
-	int i;
-
-	uidlist = g_malloc(sizeof(struct _uidsort) * uids->len);
-	for (i=0;i<uids->len;i++) {
-		uidlist[i].row = (int)g_hash_table_lookup(ml->uid_rowmap, uids->pdata[i]);
-		uidlist[i].uid = uids->pdata[i];
-	}
-	qsort(uidlist, uids->len, sizeof(struct _uidsort), sort_uid_cmp);
-	for (i=0;i<uids->len;i++) {
-		uids->pdata[i] = uidlist[i].uid;
-	}
-	g_free(uidlist);
-}
-
-static void
-build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes)
-{
-	int row, i;
-	ETreePath *node;
-	char *uid;
-	int oldrow;
-	char *olduid;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-		
-	gettimeofday(&start, NULL);
-#endif
-
-	printf("updating changes to display\n");
-
-	/* remove individual nodes? */
-	if (changes->uid_removed->len > 0) {
-		/* first, we need to sort the row id's to match the summary order */
-		sort_uid_to_rows(ml, changes->uid_removed);
-
-		/* we remove from the end, so that the rowmap remains valid as we go */
-		d(printf("Removing messages from view:\n"));
-		for (i=changes->uid_removed->len-1;i>=0;i--) {
-			d(printf(" %s\n", (char *)changes->uid_removed->pdata[i]));
-			if (g_hash_table_lookup_extended(ml->uid_rowmap, changes->uid_removed->pdata[i], (void *)&olduid, (void *)&row)) {
-				node = e_tree_model_node_at_row((ETreeModel *)ml->table_model, row);
-				uid = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-				if (uid && id_is_uid(uid) && !strcmp(id_uid(uid), changes->uid_removed->pdata[i])) {
-					g_hash_table_remove(ml->uid_rowmap, olduid);
-					e_tree_model_node_remove((ETreeModel *)ml->table_model, node);
-					d(printf("  - removed\n"));
-				} else {
-					d(printf("  - is this the right uid, it doesn't match my map?\n"));
-				}
-			}
-		}
-	}
-
-	/* add new nodes? - just append to the end */
-	if (changes->uid_added->len > 0) {
-		node = e_tree_model_node_get_last_child((ETreeModel *)ml->table_model, ml->tree_root);
-		row = e_tree_model_row_of_node((ETreeModel *)ml->table_model, node) + 1;
-		d(printf("Adding messages to view:\n"));
-		for (i=0;i<changes->uid_added->len;i++) {
-			d(printf(" %s\n", (char *)changes->uid_added->pdata[i]));
-			uid = new_id_from_uid(ml, changes->uid_added->pdata[i]);
-			node = e_tree_model_node_insert((ETreeModel *)ml->table_model, ml->tree_root, row, uid);
-			g_hash_table_insert(ml->uid_rowmap, id_uid(uid), GINT_TO_POINTER (row));
-			row++;
-		}
-	}
-
-	/* now, check the rowmap, some rows might've changed (with removes) */
-	if (changes->uid_removed->len) {
-		d(printf("checking uid mappings\n"));
-		row = 0;
-		node = e_tree_model_node_get_first_child ((ETreeModel *)ml->table_model, ml->tree_root);
-		while (node) {
-			uid = e_tree_model_node_get_data((ETreeModel *)ml->table_model, node);
-			if (id_is_uid(uid)) {
-				if (g_hash_table_lookup_extended(ml->uid_rowmap, id_uid(uid), (void *)&olduid, (void *)&oldrow)) {
-					if (oldrow != row) {
-						d(printf("row %d moved to new row %d\n", oldrow, row));
-						g_hash_table_insert(ml->uid_rowmap, olduid, (void *)row);
-					}
-				} else { /* missing?  shouldn't happen */
-					g_warning("Uid vanished from rowmap?: %s\n", uid);
-				}
-			}
-			row++;
-			node = e_tree_model_node_get_next((ETreeModel *)ml->table_model, node);
-		}
-	}
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Inserting changes took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-#endif /* ! BROKEN_ETREE */
-
-static void
-main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	MessageList *ml = MESSAGE_LIST (user_data);
-	CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data;
-
-	printf("folder changed event, changes = %p\n", changes);
-	if (changes) {
-		printf("changed = %d added = %d removed = %d\n",
-		       changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len);
-		if (changes->uid_added->len == 0 && changes->uid_removed->len == 0) {
-			int i;
-
-			for (i=0;i<changes->uid_changed->len;i++) {
-				int row = GPOINTER_TO_INT (g_hash_table_lookup (ml->uid_rowmap, changes->uid_changed->pdata[i]));
-				if (row != -1)
-					e_table_model_row_changed(ml->table_model, row);
-			}
-
-			camel_folder_change_info_free(changes);
-			return;
-		}
-	}
-
-	
-	mail_regen_list(ml, ml->search, NULL, changes);
-}
-
-static void
-folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	/* similarly to message_changed, copy the change list and propagate it to
-	   the main thread and free it */
-	CamelFolderChangeInfo *changes;
-
-	if (event_data) {
-		changes = camel_folder_change_info_new();
-		camel_folder_change_info_cat(changes, (CamelFolderChangeInfo *)event_data);
-	} else {
-		changes = NULL;
-	}
-	mail_proxy_event (main_folder_changed, o, changes, user_data);
-}
-
-static void
-main_message_changed (CamelObject *o, gpointer uid, gpointer user_data)
-{
-	MessageList *message_list = MESSAGE_LIST (user_data);
-	int row;
-
-	row = GPOINTER_TO_INT (g_hash_table_lookup (message_list->uid_rowmap,
-						    uid));
-	if (row != -1)
-		e_table_model_row_changed (message_list->table_model, row);
-
-	g_free (uid);
-}
-
-static void
-message_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	/* Here we copy the data because our thread may free the copy that we would reference.
-	 * The other thread would be passed a uid parameter that pointed to freed data.
-	 * We copy it and free it in the handler. 
-	 */
-	mail_proxy_event (main_message_changed, o, g_strdup ((gchar *)event_data), user_data);
-}
-
-void
-message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder)
-{
-	CamelException ex;
-
-	g_return_if_fail (message_list != NULL);
-	g_return_if_fail (camel_folder != NULL);
-	g_return_if_fail (IS_MESSAGE_LIST (message_list));
-	g_return_if_fail (CAMEL_IS_FOLDER (camel_folder));
-	g_return_if_fail (camel_folder_has_summary_capability (camel_folder));
-
-	if (message_list->folder == camel_folder)
-		return;
-
-	camel_exception_init (&ex);
-
-	if (message_list->folder) {
-		hide_save_state(message_list);
-		camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
-					  folder_changed, message_list);
-		camel_object_unhook_event((CamelObject *)message_list->folder, "message_changed",
-					  message_changed, message_list);
-		camel_object_unref (CAMEL_OBJECT (message_list->folder));
-	}
-
-	message_list->folder = camel_folder;
-
-	/* build the etable suitable for this folder */
-	message_list_setup_etable(message_list);
-
-	camel_object_hook_event(CAMEL_OBJECT (camel_folder), "folder_changed",
-			   folder_changed, message_list);
-	camel_object_hook_event(CAMEL_OBJECT (camel_folder), "message_changed",
-			   message_changed, message_list);
-
-	camel_object_ref (CAMEL_OBJECT (camel_folder));
-
-	hide_load_state(message_list);
-
-	clear_tree(message_list);
-	mail_regen_list(message_list, message_list->search, NULL, NULL);
-}
-
-E_MAKE_TYPE (message_list, "MessageList", MessageList, message_list_class_init, message_list_init, PARENT_TYPE);
-
-static gboolean
-on_cursor_activated_idle (gpointer data)
-{
-	MessageList *message_list = data;
-
-	printf("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid);
-	gtk_signal_emit(GTK_OBJECT (message_list), message_list_signals [MESSAGE_SELECTED], message_list->cursor_uid);
-
-	message_list->idle_id = 0;
-	return FALSE;
-}
-
-static void
-on_cursor_activated_cmd (ETableScrolled *table, int row, gpointer user_data)
-{
-	MessageList *message_list;
-	
-	message_list = MESSAGE_LIST (user_data);
-	
-	message_list->cursor_row = row;
-	g_free(message_list->cursor_uid);
-	message_list->cursor_uid = g_strdup(get_message_uid(message_list, row));
-
-	if (!message_list->idle_id) {
-		message_list->idle_id =
-			g_idle_add_full (G_PRIORITY_LOW, on_cursor_activated_idle,
-					 message_list, NULL);
-	}
-}
-
-static gint
-on_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, MessageList *list)
-{
-	int flag;
-	CamelMessageInfo *info;
-
-	if (col == COL_MESSAGE_STATUS)
-		flag = CAMEL_MESSAGE_SEEN;
-	else if (col == COL_FLAGGED)
-		flag = CAMEL_MESSAGE_FLAGGED;
-	else
-		return FALSE;
-
-	info = get_message_info(list, row);
-	if (info == NULL) {
-		return FALSE;
-	}
-	
-	camel_folder_set_message_flags(list->folder, camel_message_info_uid(info), flag, ~info->flags);
-	camel_folder_free_message_info(list->folder, info);
-
-	if (flag == CAMEL_MESSAGE_SEEN && list->seen_id) {
-		gtk_timeout_remove (list->seen_id);
-		list->seen_id = 0;
-	}
-
-	return TRUE;
-}
-
-struct message_list_foreach_data {
-	MessageList *message_list;
-	MessageListForeachFunc callback;
-	gpointer user_data;
-};
-
-static void
-mlfe_callback (int row, gpointer user_data)
-{
-	struct message_list_foreach_data *mlfe_data = user_data;
-	const char *uid;
-
-	uid = get_message_uid (mlfe_data->message_list, row);
-	if (uid) {
-		mlfe_data->callback (mlfe_data->message_list,
-				     uid,
-				     mlfe_data->user_data);
-	}
-}
-
-void
-message_list_foreach (MessageList *message_list,
-		      MessageListForeachFunc callback,
-		      gpointer user_data)
-{
-	struct message_list_foreach_data mlfe_data;
-
-	mlfe_data.message_list = message_list;
-	mlfe_data.callback = callback;
-	mlfe_data.user_data = user_data;
-	e_table_selected_row_foreach (message_list->table,
-				      mlfe_callback, &mlfe_data);
-}
-
-/* set whether we are in threaded view or flat view */
-void
-message_list_set_threaded(MessageList *ml, gboolean threaded)
-{
-	if (ml->threaded ^ threaded) {
-		ml->threaded = threaded;
-
-		mail_regen_list(ml, ml->search, NULL, NULL);
-	}
-}
-
-void
-message_list_set_search(MessageList *ml, const char *search)
-{
-	if (search == NULL || search[0] == '\0')
-		if (ml->search == NULL || ml->search[0]=='\0')
-			return;
-
-	if (search != NULL && ml->search !=NULL && strcmp(search, ml->search)==0)
-		return;
-
-	mail_regen_list(ml, search, NULL, NULL);
-}
-
-/* returns the number of messages displayable *after* expression hiding has taken place */
-unsigned int   message_list_length(MessageList *ml)
-{
-	return ml->hide_unhidden;
-}
-
-/* add a new expression to hide, or set the range.
-   @expr: A new search expression - all matching messages will be hidden.  May be %NULL.
-   @lower: Use ML_HIDE_NONE_START to specify no messages hidden from the start of the list.
-   @upper: Use ML_HIDE_NONE_END to specify no message hidden from the end of the list.
-
-   For either @upper or @lower, use ML_HIDE_SAME, to keep the previously set hide range.
-   If either range is negative, then the range is taken from the end of the available list
-   of messages, once other hiding has been performed.  Use message_list_length() to find out
-   how many messages are available for hiding.
-
-   Example: hide_add(ml, NULL, -100, ML_HIDE_NONE_END) -> hide all but the last (most recent)
-   100 messages.
-*/
-void	       message_list_hide_add(MessageList *ml, const char *expr, unsigned int lower, unsigned int upper)
-{
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-
-	if (lower != ML_HIDE_SAME)
-		ml->hide_before = lower;
-	if (upper != ML_HIDE_SAME)
-		ml->hide_after = upper;
-
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-
-	mail_regen_list(ml, ml->search, expr, NULL);
-}
-
-/* hide specific uid's */
-void	       message_list_hide_uids(MessageList *ml, GPtrArray *uids)
-{
-	int i;
-	char *uid;
-
-	/* first see if we need to do any work, if so, then do it all at once */
-	for (i=0;i<uids->len;i++) {
-		if (g_hash_table_lookup(ml->uid_rowmap, uids->pdata[i])) {
-			MESSAGE_LIST_LOCK(ml, hide_lock);
-			if (ml->hidden == NULL) {
-				ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
-				ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-	
-			uid =  e_mempool_strdup(ml->hidden_pool, uids->pdata[i]);
-			g_hash_table_insert(ml->hidden, uid, uid);
-			for (;i<uids->len;i++) {
-				if (g_hash_table_lookup(ml->uid_rowmap, uids->pdata[i])) {
-					uid =  e_mempool_strdup(ml->hidden_pool, uids->pdata[i]);
-					g_hash_table_insert(ml->hidden, uid, uid);
-				}
-			}
-			MESSAGE_LIST_UNLOCK(ml, hide_lock);
-			mail_regen_list(ml, ml->search, NULL, NULL);
-			break;
-		}
-	}
-}
-
-/* no longer hide any messages */
-void	       message_list_hide_clear(MessageList *ml)
-{
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-	if (ml->hidden) {
-		g_hash_table_destroy(ml->hidden);
-		e_mempool_destroy(ml->hidden_pool);
-		ml->hidden = NULL;
-		ml->hidden_pool = NULL;
-	}
-	ml->hide_before = ML_HIDE_NONE_START;
-	ml->hide_after = ML_HIDE_NONE_END;
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-
-	mail_regen_list(ml, ml->search, NULL, NULL);
-}
-
-#define HIDE_STATE_VERSION (1)
-
-/* version 1 file is:
-   uintf	1
-   uintf	hide_before
-   uintf       	hide_after
-   string*	uids
-*/
-
-static void hide_load_state(MessageList *ml)
-{
-	char *filename;
-	FILE *in;
-	guint32 version, lower, upper;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	in = fopen(filename, "r");
-	if (in) {
-		camel_folder_summary_decode_fixed_int32(in, &version);
-		if (version == HIDE_STATE_VERSION) {
-			MESSAGE_LIST_LOCK(ml, hide_lock);
-			if (ml->hidden == NULL) {
-				ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
-				ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-			camel_folder_summary_decode_fixed_int32(in, &lower);
-			ml->hide_before = lower;
-			camel_folder_summary_decode_fixed_int32(in, &upper);
-			ml->hide_after = upper;
-			while (!feof(in)) {
-				char *olduid, *uid;
-
-				if (camel_folder_summary_decode_string(in, &olduid) != -1) {
-					uid =  e_mempool_strdup(ml->hidden_pool, olduid);
-					g_free (olduid);
-					g_hash_table_insert(ml->hidden, uid, uid);
-				}
-			}
-			MESSAGE_LIST_UNLOCK(ml, hide_lock);
-		}
-		fclose(in);
-	}
-	g_free(filename);
-}
-
-static void hide_save_1(char *uid, char *keydata, FILE *out)
-{
-	camel_folder_summary_encode_string(out, uid);
-}
-
-/* save the hide state.  Note that messages are hidden by uid, if the uid's change, then
-   this will become invalid, but is easy to reset in the ui */
-static void hide_save_state(MessageList *ml)
-{
-	char *filename;
-	FILE *out;
-
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	if (ml->hidden == NULL && ml->hide_before == ML_HIDE_NONE_START && ml->hide_after == ML_HIDE_NONE_END) {
-		unlink(filename);
-	} else if ( (out = fopen(filename, "w")) ) {
-		camel_folder_summary_encode_fixed_int32(out, HIDE_STATE_VERSION);
-		camel_folder_summary_encode_fixed_int32(out, ml->hide_before);
-		camel_folder_summary_encode_fixed_int32(out, ml->hide_after);
-		if (ml->hidden)
-			g_hash_table_foreach(ml->hidden, (GHFunc)hide_save_1, out);
-		fclose(out);
-	}
-
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-}
-
-/* ** REGENERATE MESSAGELIST ********************************************** */
-struct _regen_list_msg {
-	struct _mail_msg msg;
-
-	MessageList *ml;
-	char *search;
-	char *hideexpr;
-	CamelFolderChangeInfo *changes;
-	gboolean dotree;	/* we are building a tree */
-
-	GPtrArray *uids,	/* list of uid's to use, if realuids is NULL, this is the actual uid's from search, else a simple ptrarray */
-		*realuids;	/* actual uid's from search/get_uid's, or NULL */
-	CamelFolderThread *tree;
-};
-
-static void regen_list_regen(struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-	int i;
-	GPtrArray *uids, *uidnew;
-
-	if (m->search) {
-		m->uids = camel_folder_search_by_expression(m->ml->folder, m->search, &mm->ex);
-	} else {
-		m->uids = camel_folder_get_uids(m->ml->folder);
-	}
-
-	if (camel_exception_is_set(&mm->ex))
-		return;
-
-	/* see if we have a new expression to hide on */
-	if (m->hideexpr) {
-		uidnew = camel_folder_search_by_expression(m->ml->folder, m->hideexpr, &mm->ex);
-		/* well, lets not abort just because this faileld ... */
-		camel_exception_clear(&mm->ex);
-
-		if (uidnew) {
-			MESSAGE_LIST_LOCK(m->ml, hide_lock);
-
-			if (m->ml->hidden == NULL) {
-				m->ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
-				m->ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-			
-			for (i=0;i<uidnew->len;i++) {
-				if (g_hash_table_lookup(m->ml->hidden, uidnew->pdata[i]) == 0) {
-					char *uid = e_mempool_strdup(m->ml->hidden_pool, uidnew->pdata[i]);
-					g_hash_table_insert(m->ml->hidden, uid, uid);
-				}
-			}
-
-			MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-
-			camel_folder_search_free(m->ml->folder, uidnew);
-		}
-	}
-
-	MESSAGE_LIST_LOCK(m->ml, hide_lock);
-
-	m->ml->hide_unhidden = m->uids->len;
-
-	/* what semantics do we want from hide_before, hide_after?
-	   probably <0 means measure from the end of the list */
-
-	/* perform uid hiding */
-	if (m->ml->hidden || m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-		int start, end;
-		uidnew = g_ptr_array_new();
-		uids = m->uids;
-
-		/* first, hide matches */
-		if (m->ml->hidden) {
-			for (i=0;i<uids->len;i++) {
-				if (g_hash_table_lookup(m->ml->hidden, uids->pdata[i]) == 0)
-					g_ptr_array_add(uidnew, uids->pdata[i]);
-			}
-		}
-
-		/* then calculate the subrange visible and chop it out */
-		m->ml->hide_unhidden = uidnew->len;
-
-		if (m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-			GPtrArray *uid2 = g_ptr_array_new();
-
-			start = m->ml->hide_before;
-			if (start < 0)
-				start += m->ml->hide_unhidden;
-			end = m->ml->hide_after;
-			if (end < 0)
-				end += m->ml->hide_unhidden;
-
-			start = MAX(start, 0);
-			end = MIN(end, uidnew->len);
-			for (i=start;i<end;i++) {
-				g_ptr_array_add(uid2, uidnew->pdata[i]);
-			}
-
-			g_ptr_array_free(uidnew, TRUE);
-			uidnew = uid2;
-		}
-		m->realuids = uids;
-		m->uids = uidnew;
-	} else {
-		m->realuids = NULL;
-	}
-
-	MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-
-	if (m->dotree && m->uids)
-		m->tree = camel_folder_thread_messages_new(m->ml->folder, m->uids);
-	else
-		m->tree = NULL;
-}
-
-static void regen_list_regened(struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-
-	if (m->uids == NULL)
-		return;
-
-	if (m->dotree)
-		build_tree(m->ml, m->tree, m->changes);
-	else
-		build_flat(m->ml, m->uids, m->changes);
-}
-
-static void regen_list_free(struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-	GPtrArray *uids;
-
-	/* work out if we have aux uid's to free, otherwise free the real ones */
-	uids = m->realuids;
-	if (uids) {
-		if (m->uids)
-			g_ptr_array_free(m->uids, TRUE);
-	} else
-		uids = m->uids;
-
-	if (uids) {
-		if (m->search)
-			camel_folder_search_free(m->ml->folder, uids);
-		else
-			camel_folder_free_uids(m->ml->folder, uids);
-	}
-
-	/* update what we have as our search string */
-        if (m->ml->search && m->ml->search != m->search)
-                g_free(m->ml->search);
-	m->ml->search = m->search;
-
-	if (m->tree)
-		camel_folder_thread_messages_destroy(m->tree);
-
-	g_free(m->hideexpr);
-
-	if (m->changes)
-		camel_folder_change_info_free(m->changes);
-
-	gtk_object_unref((GtkObject *)m->ml);
-}
-
-static struct _mail_msg_op regen_list_op = {
-	NULL,
-	regen_list_regen,
-	regen_list_regened,
-	regen_list_free,
-};
-
-static void
-mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes)
-{
-	struct _regen_list_msg *m;
-
-	if (ml->folder == NULL)
-		return;
-
-#ifndef BROKEN_ETREE
-	/* this can sometimes crash,so ... */
-
-	/* see if we need to goto the child thread at all anyway */
-	/* currently the only case is the flat view with updates and no search */
-	if (hideexpr == NULL && search == NULL && changes != NULL && !ml->threaded) {
-		build_flat_diff(ml, changes);
-		camel_folder_change_info_free(changes);
-		return;
-	}
-#endif
-
-	m = mail_msg_new(&regen_list_op, NULL, sizeof(*m));
-	m->ml = ml;
-	m->search = g_strdup(search);
-	m->hideexpr = g_strdup(hideexpr);
-	m->changes = changes;
-	m->dotree = ml->threaded;
-	gtk_object_ref((GtkObject *)ml);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
diff --git a/mail/message-list.h b/mail/message-list.h
deleted file mode 100644
index dbbb3421be..0000000000
--- a/mail/message-list.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _MESSAGE_LIST_H_
-#define _MESSAGE_LIST_H_
-
-/*#include <gnome.h>*/
-#include <gtk/gtk.h>
-
-#include "mail-types.h"
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-tree-simple.h>
-
-#define MESSAGE_LIST_TYPE        (message_list_get_type ())
-#define MESSAGE_LIST(o)          (GTK_CHECK_CAST ((o), MESSAGE_LIST_TYPE, MessageList))
-#define MESSAGE_LIST_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MESSAGE_LIST_TYPE, MessageListClass))
-#define IS_MESSAGE_LIST(o)       (GTK_CHECK_TYPE ((o), MESSAGE_LIST_TYPE))
-#define IS_MESSAGE_LIST_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MESSAGE_LIST_TYPE))
-
-enum {
-	COL_MESSAGE_STATUS,
-	COL_FLAGGED,
-	COL_SCORE,
-	COL_ATTACHMENT,
-	COL_FROM,
-	COL_SUBJECT,
-	COL_SENT,
-	COL_RECEIVED,
-	COL_TO,
-	COL_SIZE,
-	
-	COL_LAST,
-	
-	/* Invisible columns */
-	COL_DELETED,
-	COL_UNREAD,
-	COL_COLOUR,
-};
-
-#define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \
-					    col == COL_FLAGGED)
-
-#define ML_HIDE_NONE_START (0)
-#define ML_HIDE_NONE_END (2147483647)
-/* dont change */
-#define ML_HIDE_SAME (2147483646)
-
-struct _MessageList {
-	ETableScrolled parent;
-
-	/* The table */
-	ETableModel  *table_model;
-	ETable       *table;
-	ETreePath    *tree_root;
-
-	/* The folder */
-	CamelFolder  *folder;
-
-	/* UID to model row hash table. Keys owned by the mempool. */
-	GHashTable       *uid_rowmap;
-	struct _EMemPool *uid_pool;
-
-	/* UID's to hide.  Keys in the mempool */
-	/* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */
-	GHashTable	 *hidden;
-	struct _EMemPool *hidden_pool;
-	int hide_unhidden, /* total length, before hiding */
-		hide_before, hide_after; /* hide ranges of messages */
-
-	/* Current search string, or %NULL */
-	char *search;
-
-	/* Are we displaying threaded view? */
-	gboolean threaded;
-
-	/* Where the ETable cursor is. */
-	int cursor_row;
-	char *cursor_uid;
-
-	/* Row-selection and seen-marking timers */
-	guint idle_id, seen_id;
-
-	/* locks */
-	GMutex *hide_lock;	/* for any 'hide' info above */
-};
-
-typedef struct {
-	ETableScrolledClass parent_class;
-
-	/* signals - select a message */
-	void (*message_selected) (MessageList *ml, const char *uid);
-} MessageListClass;
-
-typedef void (*MessageListForeachFunc) (MessageList *message_list,
-					const char *uid,
-					gpointer user_data);
-
-typedef enum {
-	MESSAGE_LIST_SELECT_NEXT = 1,
-	MESSAGE_LIST_SELECT_PREVIOUS = -1
-} MessageListSelectDirection;
-
-GtkType        message_list_get_type   (void);
-GtkWidget     *message_list_new        (void);
-void           message_list_set_folder (MessageList *message_list,
-					CamelFolder *camel_folder);
-
-void           message_list_foreach    (MessageList *message_list,
-					MessageListForeachFunc callback,
-					gpointer user_data);
-
-void           message_list_select     (MessageList *message_list,
-					int base_row,
-					MessageListSelectDirection direction,
-					guint32 flags, guint32 mask);
-
-/* info */
-unsigned int   message_list_length(MessageList *ml);
-
-/* hide specific messages */
-void	       message_list_hide_add(MessageList *ml, const char *expr, unsigned int lower, unsigned int upper);
-void	       message_list_hide_uids(MessageList *ml, GPtrArray *uids);
-void	       message_list_hide_clear(MessageList *ml);
-
-void	       message_list_set_threaded(MessageList *ml, gboolean threaded);
-void	       message_list_set_search(MessageList *ml, const char *search);
-
-char          *message_list_get_layout (MessageList *message_list);
-
-#define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l)
-#define MESSAGE_LIST_UNLOCK(m, l) g_mutex_unlock(((MessageList *)m)->l)
-
-#endif /* _MESSAGE_LIST_H_ */
diff --git a/mail/netscape-importer.c b/mail/netscape-importer.c
deleted file mode 100644
index a505c9300f..0000000000
--- a/mail/netscape-importer.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* netscape-importer.c
- *
- * 
- * Authors: 
- *    Iain Holmes  <iain@ximian.com>
- *
- * Copyright 2001 Ximian, Inc. (http://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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-
-#include <glib.h>
-#include <gnome.h>
-
-#include "mail-importer.h"
-static char *nsmail_dir = NULL;
-
-/*#define SUPER_IMPORTER_DEBUG*/
-#ifdef SUPER_IMPORTER_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
-#if 0
-typedef struct {
-	MailImporter importer;
-
-	int num;
-	CamelMimeParser *mp;
-} NetscapeImporter;
-
-static void
-netscape_clean_up (void)
-{
-	g_free (nsmail_dir);
-	nsmail_dir = NULL;
-}
-
-static gboolean
-netscape_can_import (void)
-{
-	char *nsprefs;
-	FILE *prefs_handle;
-
-	nsprefs = gnome_util_prepend_user_home (".netscape/preferences.js");
-	prefs_handle = fopen (nsprefs, "r");
-	g_free (nsprefs);
-
-	if (prefs_handle == NULL) {
-		d(g_warning ("No .netscape/preferences.js"));
-		return FALSE;
-	}
-
-	/* Find the user mail dir */
-	while (1) {
-		char line[4096];
-
-		fgets (line, 4096, prefs_handle);
-		if (line == NULL) {
-			d(g_warning ("No mail.directory entry"));
-			fclose (prefs_handle);
-			return FALSE;
-		}
-
-		if (strstr (line, "mail.directory") != NULL) {
-			char *sep, *start, *end;
-			/* Found the line */
-			
-			sep = strchr (line, ',');
-			if (sep == NULL) {
-				d(g_warning ("Bad line %s", line));
-				fclose (prefs_handle);
-				return FALSE;
-			}
-
-			start = strchr (sep, '\"') + 1;
-			if (start == NULL) {
-				d(g_warning ("Bad line %s", line));
-				fclose (prefs_handle);
-				return FALSE;
-			}
-
-			end = strrchr (sep, '\"');
-			if (end == NULL) {
-				d(g_warning ("Bad line %s", line));
-				fclose (prefs_handle);
-				return FALSE;
-			}
-			
-			nsmail_dir = g_strndup (start, end - start);
-			d(g_warning ("Got nsmail_dir: %s", nsmail_dir));
-			fclose (prefs_handle);
-			return TRUE;
-		}
-	}
-}
-
-static void
-netscape_import_file (const char *parent,
-		      const char *dirname,
-		      const char *filename)
-{
-	char *summary, *summarypath;
-	
-	/* Check that the file is a netscape mbox. 
-	   It should have an associated .summary file */
-	summary = g_strdup_printf (".%s.summary", filename);
-	summarypath = g_concat_dir_and_file (dirname, summary);
-	if (!g_file_exists (summarypath)) {
-		d(g_warning ("%s does not exist.\nIgnoring %s", summary,
-			     filename));
-		g_free (summary);
-		g_free (summarypath);
-		return;
-	}
-
-	g_free (summary);
-	g_free (summarypath);
-
-	/* Do import */
-	mail_importer_create_folder (parent, filename, "mail", NULL);
-	g_print ("Importing %s as %s\n", parent, filename);
-}
-
-static void
-scan_dir (NetscapeImporter *importer,
-	  char *parent,
-	  const char *dirname)
-{
-	DIR *nsmail;
-	struct stat buf;
-	struct dirent *current;
-
-	nsmail = opendir (dirname);
-	if (nsmail == NULL) {
-		d(g_warning ("Could not open %s\nopendir returned: %s", 
-			     dirname, g_strerror (errno)));
-		return;
-	}
-
-	current = readdir (nsmail);
-	while (current) {
-		char *fullname;
-
-		/* Ignore things which start with . 
-		   which should be ., .., and the summaries. */
-		if (current->d_name[0] =='.') {
-			current = readdir (nsmail);
-			continue;
-		}
-
-		fullname = g_concat_dir_and_file (dirname, current->d_name);
-		if (stat (fullname, &buf) == -1) {
-			d(g_warning ("Could not stat %s\nstat returned:%s",
-				     fullname, g_strerror (errno)));
-			current = readdir (nsmail);
-			g_free (fullname);
-			continue;
-		}
-
-		if (S_ISREG (buf.st_mode)) {
-			d(g_print ("File: %s\n", fullname));
-			netscape_import_file (importer, parent, dirname, 
-					      current->d_name);
-		} else if (S_ISDIR (buf.st_mode)) {
-			char *ext;
-			d(g_print ("Directory: %s\n", fullname));
-			
-			ext = strrchr (current->d_name, '.');
-			if (ext && strcmp (ext + 1, "sbd") == 0) {
-				/* Strip the .sbd */
-				if (parent == NULL) {
-					parent = g_strndup (current->d_name, 
-							    ext - current->d_name);
-				} else {
-					char *part;
-					char *tmp;
-
-					part = g_strndup (current->d_name,
-							  ext - current->d_name);
-					tmp = parent;
-					parent = g_concat_dir_and_file (parent,
-									part);
-					g_free (tmp);
-					g_free (part);
-				}
-				
-				scan_dir (importer, parent, fullname);
-			}
-		}
-		
-		g_free (fullname);
-		current = readdir (nsmail);
-	}
-}
-
-static void
-netscape_create_structure (void)
-{
-	DIR *nsmail;
-	struct dirent *current;
-	NetscapeImporter *importer;
-
-	g_return_if_fail (nsmail_dir != NULL);
-
-	importer = g_new0 (NetscapeImporter, 1);
-
-	g_print ("Creating structure\n"
-		 "------------------\n");
-	scan_dir (importer, g_strdup ("/"), nsmail_dir);
-	g_print ("------------------\n");
-}
-
-
-#ifdef STANDALONE	
-int
-main (int argc,
-      char **argv)
-#else
-int 
-netscape_importer(void)
-#endif
-{
-	gboolean found;
-
-	g_print ("ISI - Iain's Super Importer\n");
-	g_print ("Checking for Netscape mail:\t");
-	found = netscape_can_import ();
-	g_print ("%s", found ? "Found" : "Not found");
-	
-	if (found)
-		g_print (" (%s)\n", nsmail_dir);
-	else
-		g_print ("\n");
-
-	netscape_create_structure ();
-}
-
-BonoboObject *
-mbox_factory_fn (BonoboGenericFactory *_factory,
-		 void *closure)
-{
-	EvolutionImporter *importer;
-	NetscapeImporter *netscape;
-
-	netscape = g_new0 (NetscapeImporter, 1);
-	importer = evolution_importer_new (support_format_fn,
-					   load_file_fn,
-					   process_item_fn, NULL, netscape);
-}
-#endif
diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c
deleted file mode 100644
index d5ab123e09..0000000000
--- a/mail/openpgp-utils.c
+++ /dev/null
@@ -1,1274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Nathan Thompson-Amato <ndt@jps.net>
- *           Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright (C) Helix Code, Inc. (www.helixcode.com)
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include <gnome.h> /* for _() macro */
-#include "openpgp-utils.h"
-#include "mail-session.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <termios.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <iconv.h>
-
-#define d(x)
-
-struct _PgpValidity {
-	gboolean valid;
-	gchar *description;
-};
-
-static const gchar *pgp_path = NULL;
-static PgpType pgp_type = PGP_TYPE_NONE;
-
-
-static const gchar *
-pgp_get_type_as_string (PgpType type)
-{
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		return "GnuPG";
-	case PGP_TYPE_PGP5:
-		return "PGP5";
-	case PGP_TYPE_PGP2:
-		return "PGP2.x";
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static gchar *
-pgp_get_passphrase (const gchar *userid)
-{
-	gchar *passphrase, *prompt;
-	const char *type;
-	
-	type = pgp_get_type_as_string (pgp_type);
-	
-	if (userid)
-		prompt = g_strdup_printf (_("Please enter your %s passphrase for %s"),
-					  type, userid);
-	else
-		prompt = g_strdup_printf (_("Please enter your %s passphrase"),
-					  type);
-	
-	/* Use the userid as a key if possible, else be generic and use the type */
-	passphrase = mail_session_request_dialog (prompt, TRUE, userid ? userid : type, FALSE);
-	g_free (prompt);
-	
-	return passphrase;
-}
-
-static void
-pgp_forget_passphrase (const char *key)
-{
-	if (!key)
-		key = pgp_get_type_as_string (pgp_type);
-	
-	mail_session_forget_password (key);
-}
-
-
-/**
- * openpgp_init:
- * @path: path to pgp
- * @type: pgp program type
- *
- * Initializes pgp variables
- **/
-void
-openpgp_init (const gchar *path, PgpType type)
-{
-	pgp_path = path;
-	pgp_type = type;
-}
-
-
-/**
- * openpgp_detect:
- * @text: input text
- *
- * Returns TRUE if it is found that the text contains a PGP encrypted
- * block otherwise returns FALSE.
- **/
-gboolean
-openpgp_detect (const gchar *text)
-{
-	if (strstr (text, "-----BEGIN PGP MESSAGE-----"))
-		return TRUE;
-	return FALSE;
-}
-
-
-/**
- * openpgp_sign_detect:
- * @text: input text
- *
- * Returns TRUE if it is found that the text contains a PGP signed
- * block otherwise returns FALSE.
- **/
-gboolean
-openpgp_sign_detect (const gchar *text)
-{
-	if (strstr (text, "-----BEGIN PGP SIGNED MESSAGE-----"))
-		return TRUE;
-	return FALSE;
-}
-
-static int
-cleanup_child (pid_t child)
-{
-	int status;
-	pid_t wait_result;
-	sigset_t mask, omask;
-	
-	/* PGP5 closes fds before exiting, meaning this might be called
-	 * too early. So wait a bit for the result.
-	 */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGALRM);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-	alarm (1);
-	wait_result = waitpid (child, &status, 0);
-	alarm (0);
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-	
-	if (wait_result == -1 && errno == EINTR) {
-		/* The child is hanging: send a friendly reminder. */
-		kill (child, SIGTERM);
-		sleep (1);
-		wait_result = waitpid (child, &status, WNOHANG);
-		if (wait_result == 0) {
-			/* Still hanging; use brute force. */
-			kill (child, SIGKILL);
-			sleep (1);
-			wait_result = waitpid (child, &status, WNOHANG);
-		}
-	}
-	
-	if (wait_result != -1 && WIFEXITED (status))
-		return WEXITSTATUS (status);
-	else
-		return -1;
-}
-
-static void
-cleanup_before_exec (int fd)
-{
-	int maxfd, i;
-	
-	maxfd = sysconf (_SC_OPEN_MAX);
-	if (maxfd < 0)
-		return;
-	
-	/* Loop over all fds. */
-	for (i = 0; i < maxfd; i++) {
-		if ((STDIN_FILENO != i) &&
-		    (STDOUT_FILENO != i) &&
-		    (STDERR_FILENO != i) &&
-		    (fd != i))
-			close (i);
-	}
-}
-
-static int
-crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int inlen,
-			 int passwd_fds[], const char *passphrase,
-			 char **output, int *outlen, char **diagnostics)
-{
-	fd_set fdset, write_fdset;
-	int ip_fds[2], op_fds[2], diag_fds[2];
-	int select_result, read_len, write_len;
-	size_t tmp_len;
-	pid_t child;
-	char *buf, *diag_buf;
-	const char *passwd_next, *input_next;
-	size_t size, alloc_size, diag_size, diag_alloc_size;
-	gboolean eof_seen, diag_eof_seen, passwd_eof_seen, input_eof_seen;
-	size_t passwd_remaining, passwd_incr, input_remaining, input_incr;
-	struct timeval timeout;
-	
-	
-	if ((pipe (ip_fds) < 0 ) ||
-	    (pipe (op_fds) < 0 ) ||
-	    (pipe (diag_fds) < 0 )) {
-		*diagnostics = g_strdup_printf ("Couldn't create pipe to %s: "
-						"%s", pgp_path,
-						g_strerror (errno));
-		return 0;
-	}
-	
-	if (!(child = fork ())) {
-		/* In child */
-		
-		if ((dup2 (ip_fds[0], STDIN_FILENO) < 0 ) ||
-		    (dup2 (op_fds[1], STDOUT_FILENO) < 0 ) ||
-		    (dup2 (diag_fds[1], STDERR_FILENO) < 0 )) {
-			_exit (255);
-		}
-		
-		/* Dissociate from evolution-mail's controlling
-		 * terminal so that pgp/gpg won't be able to read from
-		 * it: PGP 2 will fall back to asking for the password
-		 * on /dev/tty if the passed-in password is incorrect.
-		 * This will make that fail rather than hanging.
-		 */
-		setsid ();
-		
-		/* Close excess fds */
-		cleanup_before_exec (passwd_fds[0]);
-		
-		execvp (path, argv);
-		fprintf (stderr, "Could not execute %s: %s\n", argv[0],
-			 g_strerror (errno));
-		_exit (255);
-	} else if (child < 0) {
-		*diagnostics = g_strdup_printf ("Cannot fork %s: %s",
-						argv[0], g_strerror (errno));
-		return 0;
-	}
-	
-	/* Parent */
-	close (ip_fds[0]);
-	close (op_fds[1]);
-	close (diag_fds[1]);
-	close (passwd_fds[0]);
-	
-	timeout.tv_sec = 10; /* timeout in seconds */
-	timeout.tv_usec = 0;
-	
-	size = diag_size = 0;
-	alloc_size = 4096;
-	diag_alloc_size = 1024;
-	eof_seen = diag_eof_seen = FALSE;
-	
-	buf = g_malloc (alloc_size);
-	diag_buf = g_malloc (diag_alloc_size);
-	
-	passwd_next = passphrase;
-	passwd_remaining = passphrase ? strlen (passphrase) : 0;
-	passwd_incr = fpathconf (passwd_fds[1], _PC_PIPE_BUF);
-	/* Use a reasonable default value on error. */
-	if (passwd_incr <= 0)
-		passwd_incr = 1024;
-	passwd_eof_seen = FALSE;
-	
-	input_next = input;
-	input_remaining = inlen;
-	input_incr = fpathconf (ip_fds[1], _PC_PIPE_BUF);
-	if (input_incr <= 0)
-		input_incr = 1024;
-	input_eof_seen = FALSE;
-	
-	while (!(eof_seen && diag_eof_seen)) {
-		FD_ZERO (&fdset);
-		if (!eof_seen)
-			FD_SET (op_fds[0], &fdset);
-		if (!diag_eof_seen)
-			FD_SET (diag_fds[0], &fdset);
-		
-		FD_ZERO (&write_fdset);
-		if (!passwd_eof_seen)
-			FD_SET (passwd_fds[1], &write_fdset);
-		if (!input_eof_seen)
-			FD_SET (ip_fds[1], &write_fdset);
-		
-		select_result = select (FD_SETSIZE, &fdset, &write_fdset,
-					NULL, &timeout);
-		if (select_result < 0) {
-			if (errno == EINTR)
-				continue;
-			break;
-		}
-		if (select_result == 0) {
-			/* timeout */
-			break;
-		}
-		
-		if (FD_ISSET (op_fds[0], &fdset)) {
-			/* More output is available. */
-			
-			if (size + 4096 > alloc_size) {
-				alloc_size += 4096;
-				buf = g_realloc (buf , alloc_size);
-			}
-			read_len = read (op_fds[0], &buf[size],
-					 alloc_size - size - 1);
-			if (read_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			if (read_len == 0)
-				eof_seen = TRUE;
-			size += read_len;
-		}
-		
-		if (FD_ISSET(diag_fds[0], &fdset) ) {
-			/* More stderr is available. */
-			
-			if (diag_size + 1024 > diag_alloc_size) {
-				diag_alloc_size += 1024;
-				diag_buf = g_realloc (diag_buf,
-						      diag_alloc_size);
-			}
-			
-			read_len = read (diag_fds[0], &diag_buf[diag_size],
-					 diag_alloc_size - diag_size - 1);
-			if (read_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			if (read_len == 0)
-				diag_eof_seen = TRUE;
-			diag_size += read_len;
-		}
-		
-		if (FD_ISSET(passwd_fds[1], &write_fdset)) {
-			/* Ready for more password input. */
-			
-			tmp_len = passwd_incr;
-			if (tmp_len > passwd_remaining)
-				tmp_len = passwd_remaining;
-			write_len = write (passwd_fds[1], passwd_next,
-					   tmp_len);
-			if (write_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			passwd_next += write_len;
-			passwd_remaining -= write_len;
-			if (passwd_remaining == 0) {
-				close (passwd_fds[1]);
-				passwd_eof_seen = TRUE;
-			}
-		}
-		
-		if (FD_ISSET(ip_fds[1], &write_fdset)) {
-			/* Ready for more ciphertext input. */
-			
-			tmp_len = input_incr;
-			if (tmp_len > input_remaining)
-				tmp_len = input_remaining;
-			write_len = write (ip_fds[1], input_next, tmp_len);
-			if (write_len < 0) {
-				if (errno == EINTR)
-					continue;
-				break;
-			}
-			input_next += write_len;
-			input_remaining -= write_len;
-			if (input_remaining == 0 ) {
-				close (ip_fds[1]);
-				input_eof_seen = TRUE;
-			}
-		}
-	}
-	
-	buf[size] = 0;
-	diag_buf[diag_size] = 0;
-	close (op_fds[0]);
-	close (diag_fds[0]);
-	
-	*output = buf;
-	if (outlen)
-		*outlen = size;
-	*diagnostics = diag_buf;
-	
-	return cleanup_child (child);
-}
-
-/*----------------------------------------------------------------------*
- *                     Public crypto functions
- *----------------------------------------------------------------------*/
-
-/**
- * openpgp_decrypt:
- * @ciphertext: ciphertext to decrypt
- * @cipherlen: ciphertext length
- * @outlen: output length of the decrypted data (to be set by #openpgp_decrypt)
- * @ex: exception
- *
- * Returns an allocated buffer containing the decrypted ciphertext. If
- * the cleartext is plain text then you may treat it like a normal
- * string as it will be NUL terminated, however #outlen is also set in
- * the case that the cleartext is a binary stream.
- **/
-gchar *
-openpgp_decrypt (const gchar *ciphertext, gint cipherlen, gint *outlen, CamelException *ex)
-{
-	char *argv[15];
-	char *plaintext = NULL;
-	char *diagnostics = NULL;
-	char *passphrase;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	if (pgp_type == PGP_TYPE_NONE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No GPG/PGP program available."));
-		return NULL;
-	}
-	
-	passphrase = pgp_get_passphrase (NULL);
-	if (!passphrase) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No password provided."));
-		return NULL;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		g_free (passphrase);
-		pgp_forget_passphrase (NULL);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		return NULL;
-	}
-	
-	i = 0;
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		argv[i++] = "--verbose";
-		argv[i++] = "--yes";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--decrypt";
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case PGP_TYPE_PGP5:
-		argv[i++] = "pgpv";
-		argv[i++] = "-f";
-		argv[i++] = "+batchmode=1";
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case PGP_TYPE_PGP2:
-		argv[i++] = "pgp";
-		argv[i++] = "-f";
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (pgp_path, argv,
-					  ciphertext, cipherlen,
-					  passwd_fds, passphrase,
-					  &plaintext, outlen,
-					  &diagnostics);
-	g_free (passphrase);
-	
-	if (retval != 0 || !*plaintext) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "%s", diagnostics);
-		g_free (plaintext);
-		g_free (diagnostics);
-		pgp_forget_passphrase (NULL);
-		return NULL;
-	}
-	
-	g_free (diagnostics);
-	
-	return plaintext;
-}
-
-
-/**
- * openpgp_encrypt:
- * @in: data to encrypt
- * @inlen: input length of input data
- * @recipients: An array of recipient ids
- * @sign: TRUE if you want to sign as well as encrypt
- * @userid: userid to use when signing (assuming #sign is TRUE)
- * @ex: exception
- *
- * Returns an allocated string containing the ciphertext.
- **/
-gchar *
-openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
-		 gboolean sign, const gchar *userid, CamelException *ex)
-{
-	GPtrArray *recipient_list = NULL;
-	GPtrArray *argv = NULL;
-	int retval, r;
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	char *passphrase = NULL;
-	
-	if (pgp_type == PGP_TYPE_NONE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No GPG/PGP program available."));
-		return NULL;
-	}
-	
-	if (sign) {
-		/* we only need a passphrase if we intend on signing */
-		passphrase = pgp_get_passphrase (NULL);
-		if (!passphrase) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("No password provided."));
-			return NULL;
-		}
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		
-		if (sign) {
-			g_free (passphrase);
-			pgp_forget_passphrase (NULL);
-		}
-		
-		return NULL;
-	}
-	
-	/* check to make sure we have recipients */
-	if (recipients->len == 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No recipients specified"));
-		
-		if (sign) {
-			g_free (passphrase);
-			pgp_forget_passphrase (NULL);
-		}
-		
-		return NULL;
-	}
-	
-	argv = g_ptr_array_new ();
-	recipient_list = g_ptr_array_new ();
-	
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		for (r = 0; r < recipients->len; r++) {
-			char *buf, *recipient;
-			
-			recipient = recipients->pdata[r];
-			buf = g_strdup_printf ("-r %s", recipient);
-			g_ptr_array_add (recipient_list, buf);
-			g_free (recipient);
-		}
-		
-		g_ptr_array_add (argv, "gpg");
-		
-		g_ptr_array_add (argv, "--verbose");
-		g_ptr_array_add (argv, "--yes");
-		g_ptr_array_add (argv, "--batch");
-		
-		g_ptr_array_add (argv, "--armor");
-		
-		for (r = 0; r < recipient_list->len; r++)
-			g_ptr_array_add (argv, recipient_list->pdata[r]);
-		
-		g_ptr_array_add (argv, "--output");
-		g_ptr_array_add (argv, "-");            /* output to stdout */
-		
-		g_ptr_array_add (argv, "--encrypt");
-		
-		if (sign) {
-			g_ptr_array_add (argv, "--sign");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (gchar *) userid);
-			
-			g_ptr_array_add (argv, "--passphrase-fd");
-			sprintf (passwd_fd, "%d", passwd_fds[0]);
-			g_ptr_array_add (argv, passwd_fd);
-		}
-		break;
-	case PGP_TYPE_PGP5:
-		for (r = 0; r < recipients->len; r++) {
-			char *buf, *recipient;
-			
-			recipient = recipients->pdata[r];
-			buf = g_strdup_printf ("-r %s", recipient);
-			g_ptr_array_add (recipient_list, buf);
-			g_free (recipient);
-		}
-		
-		g_ptr_array_add (argv, "pgpe");
-		
-		for (r = 0; r < recipient_list->len; r++)
-			g_ptr_array_add (argv, recipient_list->pdata[r]);
-		
-		g_ptr_array_add (argv, "-f");
-		g_ptr_array_add (argv, "-z");
-		g_ptr_array_add (argv, "-a");
-		g_ptr_array_add (argv, "-o");
-		g_ptr_array_add (argv, "-");        /* output to stdout */
-		
-		if (sign) {
-			g_ptr_array_add (argv, "-s");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (gchar *) userid);
-			
-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-			putenv (passwd_fd);
-		}
-		break;
-	case PGP_TYPE_PGP2:
-		for (r = 0; r < recipients->len; r++) {
-			char *buf, *recipient;
-			
-			recipient = recipients->pdata[r];
-			buf = g_strdup (recipient);
-			g_ptr_array_add (recipient_list, buf);
-			g_free (recipient);
-		}
-		
-		g_ptr_array_add (argv, "pgp");
-		g_ptr_array_add (argv, "-f");
-		g_ptr_array_add (argv, "-e");
-		g_ptr_array_add (argv, "-a");
-		g_ptr_array_add (argv, "-o");
-		g_ptr_array_add (argv, "-");
-		
-		for (r = 0; r < recipient_list->len; r++)
-			g_ptr_array_add (argv, recipient_list->pdata[r]);
-		
-		if (sign) {
-			g_ptr_array_add (argv, "-s");
-			
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (gchar *) userid);
-			
-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-			putenv (passwd_fd);
-		}
-		break;
-	default:
-		break;
-	}
-	
-	g_ptr_array_add (argv, NULL);
-	
-	retval = crypto_exec_with_passwd (pgp_path, (char **) argv->pdata,
-					  in, inlen, passwd_fds,
-					  passphrase, &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_free (passphrase);
-	g_ptr_array_free (argv, TRUE);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "%s", diagnostics);
-		g_free (ciphertext);
-		ciphertext = NULL;
-		if (sign)
-			pgp_forget_passphrase (NULL);
-	}
-	
-	if (recipient_list) {
-		for (r = 0; r < recipient_list->len; r++)
-			g_free (recipient_list->pdata[r]);
-		g_ptr_array_free (recipient_list, TRUE);
-	}
-	
-	g_free (diagnostics);
-	
-	return ciphertext;
-}
-
-
-/**
- * openpgp_clearsign:
- * @plaintext: plain readable text to clearsign
- * @userid: userid to sign with
- * @hash: Preferred hash function (md5 or sha1)
- * @ex: exception
- *
- * Returns an allocated string containing the clearsigned plaintext
- * using the preferred hash.
- **/
-gchar *
-openpgp_clearsign (const gchar *plaintext, const gchar *userid,
-		   PgpHashType hash, CamelException *ex)
-{
-	char *argv[15];
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	char *passphrase = NULL;
-	char *hash_str = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	if (pgp_type == PGP_TYPE_NONE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No GPG/PGP program available."));
-		return NULL;
-	}
-	
-	passphrase = pgp_get_passphrase (userid);
-	if (!passphrase) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("No password provided."));
-		return NULL;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		
-		g_free (passphrase);
-		pgp_forget_passphrase (userid);
-		
-		return NULL;
-	}
-	
-	switch (hash) {
-	case PGP_HASH_TYPE_MD5:
-		hash_str = "MD5";
-		break;
-	case PGP_HASH_TYPE_SHA1:
-		hash_str = "SHA1";
-		break;
-	default:
-		break;
-	}
-	
-	i = 0;
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--clearsign";
-		
-		if (hash_str) {
-			argv[i++] = "--digest-algo";
-			argv[i++] = hash_str;
-		}
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--yes";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--armor";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case PGP_TYPE_PGP5:
-		/* FIXME: modify to respect hash */
-		argv[i++] = "pgps";
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";
-		argv[i++] = "-z";
-		argv[i++] = "-a";
-		argv[i++] = "-o";
-		argv[i++] = "-";        /* output to stdout */
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case PGP_TYPE_PGP2:
-		/* FIXME: modify to respect hash */
-		argv[i++] = "pgp";
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";
-		argv[i++] = "-a";
-		argv[i++] = "-o";
-		argv[i++] = "-";
-		
-		argv[i++] = "-st";
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (pgp_path, argv,
-					  plaintext, strlen (plaintext),
-					  passwd_fds, passphrase,
-					  &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_free (passphrase);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "%s", diagnostics);
-		g_free (ciphertext);
-		ciphertext = NULL;
-		pgp_forget_passphrase (userid);
-	}
-	
-	g_free (diagnostics);
-	
-	return ciphertext;
-}
-
-
-/**
- * openpgp_sign:
- * @in: input data to sign
- * @inlen: length of input data
- * @userid: userid to sign with
- * @hash: preferred hash type (md5 or sha1)
- * @ex: exception
- *
- * Returns an allocated string containing the detached signature using
- * the preferred hash.
- **/
-gchar *
-openpgp_sign (const gchar *in, gint inlen, const gchar *userid,
-	      PgpHashType hash, CamelException *ex)
-{
-	char *argv[20];
-	char *ciphertext = NULL;
-	char *diagnostics = NULL;
-	char *passphrase = NULL;
-	char *hash_str = NULL;
-	int passwd_fds[2];
-	char passwd_fd[32];
-	int retval, i;
-	
-	if (pgp_type == PGP_TYPE_NONE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No GPG/PGP program available."));
-		return NULL;
-	}
-	
-	passphrase = pgp_get_passphrase (userid);
-	if (!passphrase) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("No password provided."));
-		return NULL;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		g_free (passphrase);
-		pgp_forget_passphrase (userid);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		return NULL;
-	}
-	
-	switch (hash) {
-	case PGP_HASH_TYPE_MD5:
-		hash_str = "MD5";
-		break;
-	case PGP_HASH_TYPE_SHA1:
-		hash_str = "SHA1";
-		break;
-	default:
-		break;
-	}
-	
-	i = 0;
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--sign";
-		argv[i++] = "-b";
-		if (hash_str) {
-			argv[i++] = "--digest-algo";
-			argv[i++] = hash_str;
-		}
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "--verbose";
-		argv[i++] = "--yes";
-		argv[i++] = "--batch";
-		
-		argv[i++] = "--armor";
-		
-		argv[i++] = "--output";
-		argv[i++] = "-";            /* output to stdout */
-		
-		argv[i++] = "--passphrase-fd";
-		sprintf (passwd_fd, "%d", passwd_fds[0]);
-		argv[i++] = passwd_fd;
-		break;
-	case PGP_TYPE_PGP5:
-		/* FIXME: respect hash */
-		argv[i++] = "pgps";
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-b";
-		argv[i++] = "-f";
-		argv[i++] = "-z";
-		argv[i++] = "-a";
-		argv[i++] = "-o";
-		argv[i++] = "-";        /* output to stdout */
-		
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	case PGP_TYPE_PGP2:
-		/* FIXME: respect hash */
-		argv[i++] = "pgp";
-		
-		if (userid) {
-			argv[i++] = "-u";
-			argv[i++] = (char *) userid;
-		}
-		
-		argv[i++] = "-f";
-		argv[i++] = "-a";
-		argv[i++] = "-o";
-		argv[i++] = "-";
-		
-		argv[i++] = "-sb"; /* create a detached signature */
-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);
-		putenv (passwd_fd);
-		break;
-	default:
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	retval = crypto_exec_with_passwd (pgp_path, argv,
-					  in, inlen,
-					  passwd_fds, passphrase,
-					  &ciphertext, NULL,
-					  &diagnostics);
-	
-	g_free (passphrase);
-	
-	if (retval != 0 || !*ciphertext) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "%s", diagnostics);
-		g_free (ciphertext);
-		ciphertext = NULL;
-		pgp_forget_passphrase (userid);
-	}
-	
-	g_free (diagnostics);
-	
-	return ciphertext;
-}
-
-static char *
-swrite (const char *data, int len)
-{
-	char *template;
-	int fd;
-	
-	template = g_strdup ("/tmp/evolution-pgp.XXXXXX");
-	fd = mkstemp (template);
-	if (fd == -1) {
-		g_free (template);
-		return NULL;
-	}
-	
-	write (fd, data, len);
-	close (fd);
-	
-	return template;
-}
-
-PgpValidity *
-openpgp_verify (const gchar *in, gint inlen, const gchar *sigin, gint siglen, CamelException *ex)
-{
-	char *argv[20];
-	char *cleartext = NULL;
-	char *diagnostics = NULL;
-	int passwd_fds[2];
-	char *sigfile = NULL;
-	int retval, i, clearlen;
-	PgpValidity *valid = NULL;
-	
-	
-	if (pgp_type == PGP_TYPE_NONE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("No GPG/PGP program available."));
-		return NULL;
-	}
-	
-	if (pipe (passwd_fds) < 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Couldn't create pipe to GPG/PGP: %s"),
-				      g_strerror (errno));
-		return NULL;
-	}
-	
-	if (sigin != NULL && siglen) {
-		/* We are going to verify a detached signature so save
-		   the signature to a temp file. */
-		sigfile = swrite (sigin, siglen);
-		if (!sigfile) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Couldn't create temp file: %s"),
-					      g_strerror (errno));
-			return NULL;
-		}
-	}
-	
-	i = 0;
-	switch (pgp_type) {
-	case PGP_TYPE_GPG:
-		argv[i++] = "gpg";
-		
-		argv[i++] = "--verify";
-		
-		argv[i++] = "--no-tty";
-		/*argv[i++] = "--verbose";*/
-		/*argv[i++] = "--yes";*/
-		/*argv[i++] = "--batch";*/
-		
-		if (sigin != NULL && siglen)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-";
-		break;
-	case PGP_TYPE_PGP5:
-		argv[i++] = "pgpv";
-		
-		argv[i++] = "-z";
-		
-		if (sigin != NULL && siglen)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-f";
-		
-		break;
-	case PGP_TYPE_PGP2:
-		argv[i++] = "pgp";
-		
-		if (sigin != NULL && siglen)
-			argv[i++] = sigfile;
-		
-		argv[i++] = "-f";
-		
-		break;
-	default:
-		break;
-	}
-	
-	argv[i++] = NULL;
-	
-	clearlen = 0;
-	retval = crypto_exec_with_passwd (pgp_path, argv,
-					  in, inlen,
-					  passwd_fds, NULL,
-					  &cleartext, &clearlen,
-					  &diagnostics);
-	
-	/* cleanup */
-	if (sigfile) {
-		unlink (sigfile);
-		g_free (sigfile);
-	}
-	
-	valid = openpgp_validity_new ();
-	
-	if (retval != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "%s", diagnostics);
-		
-		openpgp_validity_set_valid (valid, FALSE);
-	} else {
-		openpgp_validity_set_valid (valid, TRUE);
-	}
-	
-	if (diagnostics) {
-		char *charset;
-		const char *buf;
-		char *desc, *outbuf;
-		iconv_t cd;
-		size_t len, outlen;
-		
-		charset = getenv ("CHARSET");
-		if (!charset)
-			charset = "US-ASCII";
-		
-		cd = iconv_open ("UTF-8", charset);
-		
-		len = strlen (diagnostics);
-		outlen = 2 * len;
-		
-		outbuf = desc = g_malloc0 (outlen + 1);
-		buf = diagnostics;
-		if (cd == (iconv_t) -1 || iconv (cd, &buf, &len, &outbuf, &outlen) == -1) {
-			g_free (desc);
-			desc = g_strdup (diagnostics);
-		}
-		
-		if (cd != (iconv_t) -1)
-			iconv_close (cd);
-		
-		openpgp_validity_set_description (valid, desc);
-		g_free (desc);
-	}
-	
-	g_free (diagnostics);
-	g_free (cleartext);
-	
-	return valid;
-}
-
-
-/* PGP Validity */
-
-PgpValidity *
-openpgp_validity_new (void)
-{
-	PgpValidity *validity;
-	
-	validity = g_new (PgpValidity, 1);
-	validity->valid = FALSE;
-	validity->description = NULL;
-	
-	return validity;
-}
-
-void
-openpgp_validity_init (PgpValidity *validity)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = FALSE;
-	validity->description = NULL;
-}
-
-gboolean
-openpgp_validity_get_valid (PgpValidity *validity)
-{
-	if (validity == NULL)
-		return FALSE;
-	
-	return validity->valid;
-}
-
-void
-openpgp_validity_set_valid (PgpValidity *validity, gboolean valid)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = valid;
-}
-
-gchar *
-openpgp_validity_get_description (PgpValidity *validity)
-{
-	if (validity == NULL)
-		return NULL;
-	
-	return validity->description;
-}
-
-void
-openpgp_validity_set_description (PgpValidity *validity, const gchar *description)
-{
-	g_assert (validity != NULL);
-	
-	g_free (validity->description);
-	validity->description = g_strdup (description);
-}
-
-void
-openpgp_validity_clear (PgpValidity *validity)
-{
-	g_assert (validity != NULL);
-	
-	validity->valid = FALSE;
-	g_free (validity->description);
-	validity->description = NULL;
-}
-
-void
-openpgp_validity_free (PgpValidity *validity)
-{
-	if (validity == NULL)
-		return;
-	
-	g_free (validity->description);
-	g_free (validity);
-}
diff --git a/mail/openpgp-utils.h b/mail/openpgp-utils.h
deleted file mode 100644
index 66dee836b0..0000000000
--- a/mail/openpgp-utils.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __OPENPGP_UTILS_H__
-#define __OPENPGP_UTILS_H__
-
-#include <glib.h>
-#include <camel/camel-exception.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef enum {
-	PGP_TYPE_NONE,
-	PGP_TYPE_PGP2,
-	PGP_TYPE_PGP5,
-	PGP_TYPE_GPG
-} PgpType;
-
-typedef enum {
-	PGP_HASH_TYPE_NONE,
-	PGP_HASH_TYPE_MD5,
-	PGP_HASH_TYPE_SHA1
-} PgpHashType;
-
-typedef struct _PgpValidity PgpValidity;
-
-void openpgp_init (const gchar *path, PgpType type);
-
-gboolean openpgp_detect (const gchar *text);
-
-gboolean openpgp_sign_detect (const gchar *text);
-
-gchar *openpgp_decrypt (const gchar *ciphertext, gint cipherlen, gint *outlen, CamelException *ex);
-
-gchar *openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
-			gboolean sign, const gchar *userid, CamelException *ex);
-
-gchar *openpgp_clearsign (const gchar *plaintext, const gchar *userid,
-			  PgpHashType hash, CamelException *ex);
-
-gchar *openpgp_sign (const gchar *in, gint inlen, const gchar *userid,
-		     PgpHashType hash, CamelException *ex);
-
-PgpValidity *openpgp_verify (const gchar *in, gint inlen, const gchar *sigin,
-			     gint siglen, CamelException *ex);
-
-PgpValidity *openpgp_validity_new (void);
-
-void openpgp_validity_init (PgpValidity *validity);
-
-gboolean openpgp_validity_get_valid (PgpValidity *validity);
-
-void openpgp_validity_set_valid (PgpValidity *validity, gboolean valid);
-
-gchar *openpgp_validity_get_description (PgpValidity *validity);
-
-void openpgp_validity_set_description (PgpValidity *validity, const gchar *description);
-
-void openpgp_validity_clear (PgpValidity *validity);
-
-void openpgp_validity_free (PgpValidity *validity);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __OPENPGP_UTILS_H__ */
diff --git a/mail/session.c b/mail/session.c
deleted file mode 100644
index d8aeaa30ba..0000000000
--- a/mail/session.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-session.c: handles the session information and resource manipulation */
-/*
- *  Authors: Miguel de Icaza <miguel@gnu.org>
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "mail.h"
-#include "mail-session.h"
-#include "mail-mt.h"
-
-CamelSession *session;
-
-static GHashTable *passwords;
-static gboolean interaction_enabled;
-
-static void
-request_callback (gchar *string, gpointer data)
-{
-	char **ans = data;
-
-	if (string)
-		*ans = g_strdup(string);
-	else
-		*ans = NULL;
-}
-
-char *
-mail_session_request_dialog (const char *prompt, gboolean secret, const char *key,
-			     gboolean async)
-{
-	GtkWidget *dialog;
-	char *ans;
-
-	if (!passwords)
-		passwords = g_hash_table_new (g_str_hash, g_str_equal);
-
-	ans = g_hash_table_lookup (passwords, key);
-	if (ans)
-		return g_strdup (ans);
-
-	if (!interaction_enabled)
-		return NULL;
-
-	if (!async) {
-		dialog = gnome_request_dialog (secret, prompt, NULL, 0,
-					       request_callback, &ans, NULL);
-		if (!dialog)
-			return NULL;
-		if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == -1 ||
-		    ans == NULL)
-			return NULL;
-	} else {
-		if ((ans = mail_get_password ((char *) prompt, secret)) == NULL)
-			return NULL;
-	}
-
-	g_hash_table_insert (passwords, g_strdup (key), g_strdup (ans));
-	return ans;
-}
-
-static char *
-auth_callback (CamelAuthCallbackMode mode, char *data, gboolean secret,
-	       CamelService *service, char *item, CamelException *ex)
-{
-	char *key, *ans, *url;
-
-	url = camel_url_to_string (service->url, FALSE);
-	key = g_strdup_printf ("%s:%s", url, item);
-	g_free (url);
-
-	if (mode == CAMEL_AUTHENTICATOR_TELL) {
-		if (!data) {
-			g_hash_table_remove (passwords, key);
-			g_free (key);
-		} else {
-			gpointer old_key, old_data;
-
-			if (g_hash_table_lookup_extended (passwords, key,
-							  &old_key,
-							  &old_data)) {
-				g_hash_table_insert (passwords, old_key, data);
-				g_free (old_data);
-				g_free (key);
-			} else
-				g_hash_table_insert (passwords, key, data);
-		}
-
-		return NULL;
-	}
-
-	ans = mail_session_request_dialog (data, secret, key, TRUE);
-	g_free (key);
-
-	if (!ans) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     "User canceled operation.");
-	}
-
-	return ans;
-}
-
-static char *
-decode_base64 (char *base64)
-{
-	char *plain, *pad = "==";
-	int len, out, state, save;
-
-	len = strlen (base64);
-	plain = g_malloc0 (len);
-	state = save = 0;
-	out = base64_decode_step (base64, len, plain, &state, &save);
-	if (len % 4) {
-		base64_decode_step (pad, 4 - len % 4, plain + out,
-				    &state, &save);
-	}
-
-	return plain;
-}
-
-static void
-maybe_remember_password (gpointer key, gpointer password, gpointer url)
-{
-	char *path, *key64, *pass64;
-	int len, state, save;
-
-	len = strlen (url);
-	if (strncmp (key, url, len) != 0)
-		return;
-
-	len = strlen (key);
-	key64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
-	state = save = 0;
-	base64_encode_close (key, len, FALSE, key64, &state, &save);
-	path = g_strdup_printf ("/Evolution/Passwords/%s", key64);
-	g_free (key64);
-
-	len = strlen (password);
-	pass64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
-	state = save = 0;
-	base64_encode_close (password, len, FALSE, pass64, &state, &save);
-
-	gnome_config_private_set_string (path, pass64);
-	g_free (path);
-	g_free (pass64);
-}
-
-void
-mail_session_remember_password (const char *url)
-{
-	g_hash_table_foreach (passwords, maybe_remember_password, (void *) url);
-}
-
-void
-mail_session_forget_password (const char *key)
-{
-	gpointer okey, value;
-	
-	if (g_hash_table_lookup_extended (passwords, key, &okey, &value)) {
-		g_hash_table_remove (passwords, key);
-		g_free (okey);
-		g_free (value);
-	}
-}
-
-/* ******************** */
-
-struct _timeout_data {
-	CamelTimeoutCallback cb;
-	gpointer camel_data;
-	gboolean result;
-};
-
-struct _timeout_msg {
-	struct _mail_msg msg;
-
-	CamelTimeoutCallback cb;
-	gpointer camel_data;
-};
-
-static void timeout_timeout(struct _mail_msg *mm)
-{
-	struct _timeout_msg *m = (struct _timeout_msg *)mm;
-
-	/* we ignore the callback result, do we care?? no. */
-	m->cb(m->camel_data);
-}
-
-static struct _mail_msg_op timeout_op = {
-	NULL,
-	timeout_timeout,
-	NULL,
-	NULL,
-};
-
-static gboolean 
-camel_timeout (gpointer data)
-{
-	struct _timeout_data *td = data;
-	struct _timeout_msg *m;
-
-	m = mail_msg_new(&timeout_op, NULL, sizeof(*m));
-
-	m->cb = td->cb;
-	m->camel_data = td->camel_data;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-
-	return TRUE;
-}
-
-static guint
-register_callback (guint32 interval, CamelTimeoutCallback cb, gpointer camel_data)
-{
-	struct _timeout_data *td;
-
-	/* We do this because otherwise the timeout can get called
-	 * more often than the dispatch thread can get rid of it,
-	 * leading to timeout calls piling up, and we don't have a
-	 * good way to watch the return values. It's not cool.
-	 */
-	g_return_val_if_fail (interval > 1000, 0);
-
-	td = g_malloc(sizeof(*td));
-	td->result = TRUE;
-	td->cb = cb;
-	td->camel_data = camel_data;
-
-	return gtk_timeout_add_full(interval, camel_timeout, NULL, td, g_free);
-}
-
-static gboolean
-remove_callback (guint handle)
-{
-	gtk_timeout_remove (handle);
-	return TRUE;
-}
-
-/* ******************** */
-
-void
-mail_session_init (void)
-{
-	char *camel_dir, *key, *value;
-	void *iter;
-
-	camel_init ();
-	camel_dir = g_strdup_printf ("%s/mail", evolution_dir);
-	session = camel_session_new (camel_dir, auth_callback,
-				     register_callback, remove_callback);
-	g_free (camel_dir);
-
-	passwords = g_hash_table_new (g_str_hash, g_str_equal);
-	iter = gnome_config_private_init_iterator ("/Evolution/Passwords");
-	if (iter) {
-		while (gnome_config_iterator_next (iter, &key, &value)) {
-			g_hash_table_insert (passwords, decode_base64 (key),
-					     decode_base64 (value));
-			g_free (key);
-			g_free (value);
-		}
-	}
-}
-
-void
-mail_session_enable_interaction (gboolean enable)
-{
-	interaction_enabled = enable;
-}
-
-static gboolean
-free_entry (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	memset (value, 0, strlen (value));
-	g_free (value);
-	return TRUE;
-}
-
-void
-mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
-			       const char *path)
-{
-	g_hash_table_foreach_remove (passwords, free_entry, NULL);
-	gnome_config_private_clean_section ("/Evolution/Passwords");
-	gnome_config_sync ();
-}
-
-void
-mail_session_set_password (const char *url, const char *password)
-{
-	g_hash_table_insert (passwords, g_strdup (url), g_strdup (password));
-}
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
deleted file mode 100644
index 4a6b773fb8..0000000000
--- a/mail/subscribe-dialog.c
+++ /dev/null
@@ -1,1102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* subscribe-dialog.c: Subscribe dialog */
-/*
- *  Authors: Chris Toshok <toshok@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include "subscribe-dialog.h"
-#include "e-util/e-html-utils.h"
-#include <gtkhtml/gtkhtml.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-tree.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-tree-simple.h>
-#include <gal/e-paned/e-hpaned.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h> 
-#include <bonobo/bonobo-ui-component.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
-
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-mt.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-store.h"
-#include "camel/camel-session.h"
-
-#include "art/empty.xpm"
-#include "art/mark.xpm"
-
-
-#define DEFAULT_STORE_TABLE_WIDTH         200
-#define DEFAULT_WIDTH                     500
-#define DEFAULT_HEIGHT                    300
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("Folder"),
-	N_("Store"),
-};
-#endif
-
-#define FOLDER_ETABLE_SPEC "<ETableSpecification cursor-mode=\"line\"> \
-        <ETableColumn model_col=\"0\" pixbuf=\"subscribed-image\" expansion=\"0.0\" minimum_width=\"16\" resizable=\"false\" cell=\"cell_toggle\" compare=\"integer\"/> \
-        <ETableColumn model_col=\"1\" _title=\"Folder\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"cell_tree\" compare=\"string\"/> \
-	<ETableState>                   			        \
-		<column source=\"0\"/>                                  \
-		<column source=\"1\"/>                                  \
-	        <grouping></grouping>                                   \
-	</ETableState>                  			        \
-</ETableSpecification>"
-
-#define STORE_ETABLE_SPEC "<ETableSpecification cursor-mode=\"line\"> \
-        <ETableColumn model_col=\"0\" _title=\"Store\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-	<ETableState>                   			        \
-		<column source=\"0\"/>                                  \
-	        <grouping></grouping>                                   \
-	</ETableState>                  			        \
-</ETableSpecification>"
-
-enum {
-	FOLDER_COL_SUBSCRIBED,
-	FOLDER_COL_NAME,
-	FOLDER_COL_LAST
-};
-
-enum {
-	STORE_COL_NAME,
-	STORE_COL_LAST
-};
-
-static GtkObjectClass *subscribe_dialog_parent_class;
-
-static void build_tree (SubscribeDialog *sc, CamelStore *store);
-
-static void
-set_pixmap (BonoboUIComponent *component,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *component)
-{
-	set_pixmap (component, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */
-	set_pixmap (component, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */
-	set_pixmap (component, "/Toolbar/RefreshList", "forward.png"); /* XXX */
-}
-
-static GtkWidget*
-make_folder_search_widget (GtkSignalFunc start_search_func,
-			   gpointer user_data_for_search)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data_for_search);
-	GtkWidget *search_hbox = gtk_hbox_new (FALSE, 0);
-
-	sc->search_entry = gtk_entry_new ();
-
-	if (start_search_func) {
-		gtk_signal_connect (GTK_OBJECT (sc->search_entry), "activate",
-				    start_search_func,
-				    user_data_for_search);
-	}
-	
-	/* add the search entry to the our search_vbox */
-	gtk_box_pack_start (GTK_BOX (search_hbox),
-			    gtk_label_new(_("Display folders starting with:")),
-			    FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (search_hbox), sc->search_entry,
-			    FALSE, TRUE, 3);
-
-	return search_hbox;
-}
-
-
-/* Our async operations */
-
-typedef void (*SubscribeGetStoreCallback)(SubscribeDialog *sc, CamelStore *store, gpointer cb_data);
-typedef void (*SubscribeFolderCallback)(SubscribeDialog *sc, gboolean success, gpointer cb_data);
-
-/* ** GET STORE ******************************************************* */
-
-struct _get_store_msg {
-	struct _mail_msg msg;
-
-	SubscribeDialog *sc;
-	char *url;
-	SubscribeGetStoreCallback cb;
-	gpointer cb_data;
-	CamelStore *store;
-};
-
-static char *get_store_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	return g_strdup_printf(_("Getting store for \"%s\""), m->url);
-}
-
-static void get_store_get(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	m->store = camel_session_get_store (session, m->url, &mm->ex);
-}
-
-static void get_store_got(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	m->cb(m->sc, m->store, m->cb_data);
-}
-
-static void get_store_free(struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	if (m->store)
-		camel_object_unref((CamelObject *)m->store);
-	g_free(m->url);
-}
-
-static struct _mail_msg_op get_store_op = {
-	get_store_desc,
-	get_store_get,
-	get_store_got,
-	get_store_free,
-};
-
-static void
-subscribe_do_get_store (SubscribeDialog *sc, const char *url, SubscribeGetStoreCallback cb, gpointer cb_data)
-{
-	struct _get_store_msg *m;
-	int id;
-
-	g_return_if_fail (url != NULL);
-
-	m = mail_msg_new(&get_store_op, NULL, sizeof(*m));
-	m->sc = sc;
-	m->url = g_strdup(url);
-	m->cb = cb;
-	m->cb_data = cb_data;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-	mail_msg_wait(id);
-}
-
-/* ** SUBSCRIBE FOLDER ******************************************************* */
-/* Given a CamelFolderInfo, construct the corresponding
- * EvolutionStorage path to it.
- */
-static char *
-storage_tree_path (CamelFolderInfo *info)
-{
-	int len;
-	CamelFolderInfo *i;
-	char *path, *p;
-
-	for (len = 0, i = info; i; i = i->parent)
-		len += strlen (i->name) + 1;
-
-	/* We do this backwards because that's the way the pointers point. */
-	path = g_malloc (len + 1);
-	p = path + len;
-	*p = '\0';
-	for (i = info; i; i = i->parent) {
-		len = strlen (i->name);
-		p -= len;
-		memcpy (p, i->name, len);
-		*--p = '/';
-	}
-
-	return path;
-}
-
-/* ********************************************************************** */
-/* Subscribe folder */
-
-struct _subscribe_msg {
-	struct _mail_msg msg;
-
-	SubscribeDialog *sc;
-	CamelStore *store;
-	gboolean subscribe;
-	SubscribeFolderCallback cb;
-	gpointer cb_data;
-
-	char *path;
-	char *name;
-	char *full_name;
-	char *url;
-};
-
-static char *subscribe_folder_desc(struct _mail_msg *mm, int done)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *)mm;
-
-	if (m->subscribe)
-		return g_strdup_printf(_("Subscribing to folder \"%s\""), m->name);
-	else
-		return g_strdup_printf(_("Unsubscribing to folder \"%s\""), m->name);
-}
-
-static void subscribe_folder_subscribe(struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *)mm;
-	
-	if (m->subscribe)
-		camel_store_subscribe_folder(m->store, m->full_name, &mm->ex);
-	else
-		camel_store_unsubscribe_folder(m->store, m->full_name, &mm->ex);
-}
-
-static void
-recursive_add_folder (EvolutionStorage *storage, const char *path, const char *name, const char *url)
-{
-	char *parent, *pname, *p;
-
-	p = strrchr (path, '/');
-	if (p && p != path) {
-		parent = g_strndup (path, p - path);
-		if (!evolution_storage_folder_exists (storage, parent)) {
-			p = strrchr (parent, '/');
-			if (p)
-				pname = g_strdup (p + 1);
-			else
-				pname = g_strdup ("");
-			recursive_add_folder (storage, parent, pname, "");
-			g_free (pname);
-		}
-		g_free (parent);
-	}
-
-	evolution_storage_new_folder (storage, path, name, "mail", url, name, FALSE);
-}
-
-static void subscribe_folder_subscribed(struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *)mm;
-	
-	if (!camel_exception_is_set (&mm->ex)) {
-		if (m->subscribe)
-			recursive_add_folder(m->sc->storage, m->path, m->name, m->url);
-		else
-			evolution_storage_removed_folder(m->sc->storage, m->path);
-	}
-	
-	if (m->cb)
-		m->cb(m->sc, !camel_exception_is_set(&mm->ex), m->cb_data);
-}
-
-static void subscribe_folder_free(struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *)mm;
-
-	g_free(m->path);
-	g_free(m->name);
-	g_free(m->full_name);
-	g_free(m->url);
-	
-	camel_object_unref((CamelObject *)m->store);
-	/* in wrong thread to do this?
-	   gtk_object_unref (GTK_OBJECT (input->sc));*/
-}
-
-static struct _mail_msg_op subscribe_folder_op = {
-	subscribe_folder_desc,
-	subscribe_folder_subscribe,
-	subscribe_folder_subscribed,
-	subscribe_folder_free,
-};
-
-static void
-subscribe_do_subscribe_folder (SubscribeDialog *sc, CamelStore *store, CamelFolderInfo *info,
-			       gboolean subscribe, SubscribeFolderCallback cb, gpointer cb_data)
-{
-	struct _subscribe_msg *m;
-	
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (info);
-
-	m = mail_msg_new(&subscribe_folder_op, NULL, sizeof(*m));
-	m->sc = sc;
-	m->store = store;
-	camel_object_ref((CamelObject *)store);
-	m->subscribe = subscribe;
-	m->cb = cb;
-	m->cb_data = cb_data;
-
-	m->path = storage_tree_path (info);
-	m->name = g_strdup (info->name);
-	m->full_name = g_strdup (info->full_name);
-	m->url = g_strdup (info->url);
-
-	/*
-	  gtk_object_ref (GTK_OBJECT (sc));*/
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-
-
-static gboolean
-folder_info_subscribed (SubscribeDialog *sc, CamelFolderInfo *info)
-{
-	return camel_store_folder_subscribed (sc->store, info->full_name);
-}
-
-static void
-node_changed_cb (SubscribeDialog *sc, gboolean changed, gpointer data)
-{
-	ETreePath *node = data;
-
-	if (changed)
-		e_tree_model_node_changed (sc->folder_model, node);
-}
-
-static void
-subscribe_folder_info (SubscribeDialog *sc, CamelFolderInfo *info, ETreePath *node)
-{
-	/* folders without urls cannot be subscribed to */
-	if (info->url == NULL)
-		return;
-	
-	subscribe_do_subscribe_folder (sc, sc->store, info, TRUE, node_changed_cb, node);
-}
-
-static void
-unsubscribe_folder_info (SubscribeDialog *sc, CamelFolderInfo *info, ETreePath *node)
-{
-	/* folders without urls cannot be subscribed to */
-	if (info->url == NULL)
-		return;
-	
-	subscribe_do_subscribe_folder (sc, sc->store, info, FALSE, node_changed_cb, node);
-}
-
-static void
-subscribe_close (BonoboUIComponent *uic,
-		 void *user_data, const char *path)
-{
-	SubscribeDialog *sc = (SubscribeDialog*)user_data;
-
-	gtk_widget_destroy (sc->app);
-}
-
-static void
-subscribe_select_all (BonoboUIComponent *uic,
-		      void *user_data, const char *path)
-{
-	SubscribeDialog *sc = (SubscribeDialog*)user_data;
-	ETableScrolled *scrolled = E_TABLE_SCROLLED (sc->folder_etable);
-	
-	e_table_select_all (scrolled->table);
-}
-
-static void
-subscribe_invert_selection (BonoboUIComponent *uic,
-			    void *user_data, const char *path)
-{
-	SubscribeDialog *sc = (SubscribeDialog*)user_data;
-	ETableScrolled *scrolled = E_TABLE_SCROLLED (sc->folder_etable);
-	
-	e_table_invert_selection (scrolled->table);
-}
-
-static void
-subscribe_folder_foreach (int model_row, gpointer closure)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (closure);
-	ETreePath *node = e_tree_model_node_at_row (sc->folder_model, model_row);
-	CamelFolderInfo *info = e_tree_model_node_get_data (sc->folder_model, node);
-
-	if (!folder_info_subscribed (sc, info))
-		subscribe_folder_info (sc, info, node);
-}
-
-static void
-subscribe_folders (BonoboUIComponent *componet, gpointer user_data, const char *cname)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	e_table_selected_row_foreach (E_TABLE_SCROLLED(sc->folder_etable)->table,
-				      subscribe_folder_foreach, sc);
-}
-
-static void
-unsubscribe_folder_foreach (int model_row, gpointer closure)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (closure);
-	ETreePath *node = e_tree_model_node_at_row (sc->folder_model, model_row);
-	CamelFolderInfo *info = e_tree_model_node_get_data (sc->folder_model, node);
-
-	if (folder_info_subscribed(sc, info))
-		unsubscribe_folder_info (sc, info, node);
-}
-
-
-static void
-unsubscribe_folders (BonoboUIComponent *component, gpointer user_data, const char *cname)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	e_table_selected_row_foreach (E_TABLE_SCROLLED(sc->folder_etable)->table,
-				      unsubscribe_folder_foreach, sc);
-}
-
-static void
-subscribe_refresh_list (BonoboUIComponent *component, gpointer user_data, const char *cname)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (sc->search_entry), "");
-	if (sc->search_top) {
-		g_free (sc->search_top);
-		sc->search_top = NULL;
-	}
-	if (sc->store)
-		build_tree (sc, sc->store);
-}
-
-static void
-subscribe_search (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	char* search_pattern = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-
-	if (sc->search_top) {
-		g_free (sc->search_top);
-		sc->search_top = NULL;
-	}
-
-	if (search_pattern && *search_pattern)
-		sc->search_top = search_pattern;
-
-	if (sc->store)
-		build_tree (sc, sc->store);
-}
-
-
-#if 0
-/* HTML Helpers */
-static void
-html_size_req (GtkWidget *widget, GtkRequisition *requisition)
-{
-	if (GTK_LAYOUT (widget)->height > 90)
-		requisition->height = 90;
-	else
-		requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-	
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white :
-						       &style->bg[0]);
-	}
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else
-		gtk_widget_show_all (scrolled);
-	
-	return html;
-}
-
-static void
-put_html (GtkHTML *html, char *text)
-{
-	GtkHTMLStream *handle;
-	
-	text = e_text_to_html (text, (E_TEXT_TO_HTML_CONVERT_NL |
-				      E_TEXT_TO_HTML_CONVERT_SPACES |
-				      E_TEXT_TO_HTML_CONVERT_URLS));
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (text);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-#endif
-
-
-/* etable stuff for the subscribe ui */
-
-static int
-folder_etable_col_count (ETableModel *etm, void *data)
-{
-	return FOLDER_COL_LAST;
-}
-
-static void*
-folder_etable_duplicate_value (ETableModel *etm, int col, const void *val, void *data)
-{
-	return g_strdup (val);
-}
-
-static void
-folder_etable_free_value (ETableModel *etm, int col, void *val, void *data)
-{
-	g_free (val);
-}
-
-static void*
-folder_etable_init_value (ETableModel *etm, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-folder_etable_value_is_empty (ETableModel *etm, int col, const void *val, void *data)
-{
-	return !(val && *(char *)val);
-}
-
-static char*
-folder_etable_value_to_string (ETableModel *etm, int col, const void *val, void *data)
-{
-	return g_strdup(val);
-}
-
-static GdkPixbuf*
-folder_etree_icon_at (ETreeModel *etree, ETreePath *path, void *model_data)
-{
-	return NULL; /* XXX no icons for now */
-}
-
-static void*
-folder_etree_value_at (ETreeModel *etree, ETreePath *path, int col, void *model_data)
-{
-	SubscribeDialog *dialog = SUBSCRIBE_DIALOG (model_data);
-	CamelFolderInfo *info = e_tree_model_node_get_data (etree, path);
-
-	if (col == FOLDER_COL_NAME) {
-		return info->name;
-	}
-	else /* FOLDER_COL_SUBSCRIBED */ {
-		/* folders without urls cannot be subscribed to */
-		if (info->url == NULL)
-			return GINT_TO_POINTER(0); /* empty */
-		else if (!folder_info_subscribed(dialog, info))
-			return GINT_TO_POINTER(0); /* XXX unchecked */
-		else
-			return GUINT_TO_POINTER (1); /* checked */
-	}
-}
-
-static void
-folder_etree_set_value_at (ETreeModel *etree, ETreePath *path, int col, const void *val, void *model_data)
-{
-	/* nothing */
-}
-
-static gboolean
-folder_etree_is_editable (ETreeModel *etree, ETreePath *path, int col, void *model_data)
-{
-	return FALSE;
-}
-
-
-
-static int
-store_etable_col_count (ETableModel *etm, void *data)
-{
-	return STORE_COL_LAST;
-}
-
-static int
-store_etable_row_count (ETableModel *etm, void *data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (data);
-
-	return g_list_length (sc->store_list);
-}
-
-static void*
-store_etable_value_at (ETableModel *etm, int col, int row, void *data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (data);
-	CamelStore *store = (CamelStore*)g_list_nth_data (sc->store_list, row);
-
-	return camel_service_get_name (CAMEL_SERVICE (store), TRUE);
-}
-
-static void
-store_etable_set_value_at (ETableModel *etm, int col, int row, const void *val, void *data)
-{
-	/* nada */
-}
-
-static gboolean
-store_etable_is_editable (ETableModel *etm, int col, int row, void *data)
-{
-	return FALSE;
-}
-
-static void*
-store_etable_duplicate_value (ETableModel *etm, int col, const void *val, void *data)
-{
-	return g_strdup (val);
-}
-
-static void
-store_etable_free_value (ETableModel *etm, int col, void *val, void *data)
-{
-	g_free (val);
-}
-
-static void*
-store_etable_initialize_value (ETableModel *etm, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-store_etable_value_is_empty (ETableModel *etm, int col, const void *val, void *data)
-{
-	return !(val && *(char *)val);
-}
-
-static char*
-store_etable_value_to_string (ETableModel *etm, int col, const void *val, void *data)
-{
-	return g_strdup(val);
-}
-
-
-
-static void
-build_etree_from_folder_info (SubscribeDialog *sc, ETreePath *parent, CamelFolderInfo *info)
-{
-	CamelFolderInfo *i;
-
-	if (info == NULL)
-		return;
-
-	for (i = info; i; i = i->sibling) {
-		ETreePath *node = e_tree_model_node_insert (sc->folder_model, parent, -1, i);
-		build_etree_from_folder_info (sc, node, i->child);
-	}
-}
-
-static void
-build_tree (SubscribeDialog *sc, CamelStore *store)
-{
-	CamelException *ex = camel_exception_new();
-
-	/* free up the existing CamelFolderInfo* if there is any */
-	if (sc->folder_info)
-		camel_store_free_folder_info (sc->store, sc->folder_info);
-	if (sc->storage)
-		gtk_object_unref (GTK_OBJECT (sc->storage));
-
-	sc->store = store;
-	sc->storage = mail_lookup_storage (sc->store);
-	sc->folder_info = camel_store_get_folder_info (sc->store, sc->search_top, TRUE, TRUE, FALSE, ex);
-
-	if (camel_exception_is_set (ex)) {
-		printf ("camel_store_get_folder_info failed\n");
-		camel_exception_free (ex);
-		return;
-	}
-
-	e_tree_model_node_remove (sc->folder_model, sc->folder_root);
-	sc->folder_root = e_tree_model_node_insert (sc->folder_model, NULL,
-						    0, NULL);
-
-
-	build_etree_from_folder_info (sc, sc->folder_root, sc->folder_info);
-
-	camel_exception_free (ex);
-}
-
-static void
-storage_selected_cb (ETable *table, int row, gpointer data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (data);
-	CamelStore *store = (CamelStore*)g_list_nth_data (sc->store_list, row);
-
-	build_tree (sc, store);
-}
-
-
-
-static void
-folder_toggle_cb (ETable *table, int row, int col, GdkEvent *event, gpointer data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (data);
-	ETreePath *node = e_tree_model_node_at_row (sc->folder_model, row);
-	CamelFolderInfo *info = e_tree_model_node_get_data (sc->folder_model, node);
-
-	if (folder_info_subscribed(sc, info))
-		unsubscribe_folder_info (sc, info, node);
-	else
-		subscribe_folder_info (sc, info, node);
-
-	e_tree_model_node_changed (sc->folder_model, node);
-}
-
-
-
-#define EXAMPLE_DESCR "And the beast shall come forth surrounded by a roiling cloud of vengeance.\n" \
-"  The house of the unbelievers shall be razed and they shall be scorched to the\n" \
-"          earth. Their tags shall blink until the end of days. \n" \
-"                 from The Book of Mozilla, 12:10"
-
-static BonoboUIVerb verbs [] = {
-	/* File Menu */
-	BONOBO_UI_VERB ("FileCloseWin", subscribe_close),
-
-	/* Edit Menu */
-	BONOBO_UI_VERB ("EditSelectAll", subscribe_select_all),
-	BONOBO_UI_VERB ("EditInvertSelection", subscribe_invert_selection),
-	
-	/* Folder Menu / Toolbar */
-	BONOBO_UI_VERB ("SubscribeFolder", subscribe_folders),
-	BONOBO_UI_VERB ("UnsubscribeFolder", unsubscribe_folders),
-
-	/* Toolbar Specific */
-	BONOBO_UI_VERB ("RefreshList", subscribe_refresh_list),
-
-	BONOBO_UI_VERB_END
-};
-
-static void
-store_cb (SubscribeDialog *sc, CamelStore *store, gpointer data)
-{
-	if (!store)
-		return;
-
-	if (camel_store_supports_subscriptions (store)) {
-		camel_object_ref((CamelObject *)store);
-		sc->store_list = g_list_prepend (sc->store_list, store);
-		e_table_model_row_inserted (sc->store_model, 0);
-	}
-}
-
-static void
-populate_store_foreach (MailConfigService *service, SubscribeDialog *sc)
-{
-	g_return_if_fail (service->url != NULL);
-	
-	subscribe_do_get_store (sc, service->url, store_cb, NULL);
-}
-
-static void
-populate_store_list (SubscribeDialog *sc)
-{
-	const GSList *news;
-	GSList *sources;
-	
-	sources = mail_config_get_sources ();
-	g_slist_foreach (sources, (GFunc)populate_store_foreach, sc);
-	g_slist_free (sources);
-	
-	news = mail_config_get_news ();
-	g_slist_foreach ((GSList *)news, (GFunc)populate_store_foreach, sc);
-	
-	e_table_model_changed (sc->store_model);
-}
-
-static void
-subscribe_dialog_gui_init (SubscribeDialog *sc)
-{
-	ETableExtras *extras;
-	ECell *cell;
-	GdkPixbuf *toggles[2];
-	BonoboUIComponent *component;
-	BonoboUIContainer *container;
-	GtkWidget         *folder_search_widget;
-	BonoboControl     *search_control;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	/* Construct the app */
-	sc->app = bonobo_window_new ("subscribe-dialog", "Manage Subscriptions");
-
-	/* Build the menu and toolbar */
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (sc->app));
-
-	/* set up the bonobo stuff */
-	component = bonobo_ui_component_new_default ();
-	bonobo_ui_component_set_container (
-		component, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		component, verbs, sc);
-
-	bonobo_ui_component_freeze (component, NULL);
-
-	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR,
-			       "evolution-subscribe.xml",
-			       "evolution-subscribe");
-
-	update_pixmaps (component);
-
-	bonobo_ui_component_thaw (component, NULL);
-
-	sc->table = gtk_table_new (1, 2, FALSE);
-
-	sc->hpaned = e_hpaned_new ();
-
-	folder_search_widget = make_folder_search_widget (subscribe_search, sc);
-	gtk_widget_show_all (folder_search_widget);
-	search_control = bonobo_control_new (folder_search_widget);
-
-	bonobo_ui_component_object_set (component, "/Toolbar/FolderSearch",
-					bonobo_object_corba_objref (BONOBO_OBJECT (search_control)),
-					NULL);
-					
-	/* set our our contents */
-#if 0
-	sc->description = html_new (TRUE);
-	put_html (GTK_HTML (sc->description), EXAMPLE_DESCR);
-
-	gtk_table_attach (GTK_TABLE (sc->table), sc->description->parent->parent,
-			  0, 1, 0, 1,
-			  GTK_FILL | GTK_EXPAND,
-			  0,
-			  0, 0);
-#endif
-
-	/* set up the store etable */
-	sc->store_model = e_table_simple_new (store_etable_col_count,
-					      store_etable_row_count,
-					      store_etable_value_at,
-					      store_etable_set_value_at,
-					      store_etable_is_editable,
-					      store_etable_duplicate_value,
-					      store_etable_free_value,
-					      store_etable_initialize_value,
-					      store_etable_value_is_empty,
-					      store_etable_value_to_string,
-					      sc);
-
-	extras = e_table_extras_new ();
-
-	sc->store_etable = e_table_scrolled_new (E_TABLE_MODEL(sc->store_model),
-						 extras, STORE_ETABLE_SPEC, NULL);
-
-	gtk_object_sink (GTK_OBJECT (extras));
-
-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table(E_TABLE_SCROLLED (sc->store_etable))),
-			    "cursor_change", GTK_SIGNAL_FUNC (storage_selected_cb),
-			    sc);
-
-	/* set up the folder etable */
-	sc->folder_model = e_tree_simple_new (folder_etable_col_count,
-					      folder_etable_duplicate_value,
-					      folder_etable_free_value,
-					      folder_etable_init_value,
-					      folder_etable_value_is_empty,
-					      folder_etable_value_to_string,
-					      folder_etree_icon_at,
-					      folder_etree_value_at,
-					      folder_etree_set_value_at,
-					      folder_etree_is_editable,
-					      sc);
-
-	sc->folder_root = e_tree_model_node_insert (sc->folder_model, NULL,
-						    0, NULL);
-
-	e_tree_model_root_node_set_visible (sc->folder_model, FALSE);
-	e_tree_model_set_expanded_default (sc->folder_model, TRUE);
-
-	toggles[0] = gdk_pixbuf_new_from_xpm_data ((const char **)empty_xpm);
-	toggles[1] = gdk_pixbuf_new_from_xpm_data ((const char **)mark_xpm);
-
-	extras = e_table_extras_new ();
-
-	cell = e_cell_text_new(NULL, GTK_JUSTIFY_LEFT);
-
-	e_table_extras_add_cell (extras, "cell_text", cell);
-	e_table_extras_add_cell (extras, "cell_toggle", e_cell_toggle_new (0, 2, toggles));
-	e_table_extras_add_cell (extras, "cell_tree", e_cell_tree_new(NULL, NULL, TRUE, cell));
-
-	gtk_object_set (GTK_OBJECT (cell),
-			"bold_column", FOLDER_COL_SUBSCRIBED,
-			NULL);
-
-	e_table_extras_add_pixbuf (extras, "subscribed-image", toggles[1]);
-
-	sc->folder_etable = e_table_scrolled_new (E_TABLE_MODEL(sc->folder_model),
-						  extras, FOLDER_ETABLE_SPEC, NULL);
-
-	gtk_object_sink (GTK_OBJECT (extras));
-	gdk_pixbuf_unref(toggles[0]);
-	gdk_pixbuf_unref(toggles[1]);
-
-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table(E_TABLE_SCROLLED (sc->folder_etable))),
-			    "double_click", GTK_SIGNAL_FUNC (folder_toggle_cb),
-			    sc);
-	gtk_table_attach (
-		GTK_TABLE (sc->table), sc->folder_etable,
-		0, 1, 1, 3,
-		GTK_FILL | GTK_EXPAND,
-		GTK_FILL | GTK_EXPAND,
-		0, 0);
-
-	e_paned_add1 (E_PANED (sc->hpaned), sc->store_etable);
-	e_paned_add2 (E_PANED (sc->hpaned), sc->table);
-	e_paned_set_position (E_PANED (sc->hpaned), DEFAULT_STORE_TABLE_WIDTH);
-
-	bonobo_window_set_contents (BONOBO_WINDOW (sc->app), sc->hpaned);
-
-#if 0
-	gtk_widget_show (sc->description);
-#endif
-
-	gtk_widget_show (sc->folder_etable);
-	gtk_widget_show (sc->table);
-	gtk_widget_show (sc->store_etable);
-	gtk_widget_show (sc->hpaned);
-
-	/* FIXME: Session management and stuff?  */
-	gtk_window_set_default_size (GTK_WINDOW (sc->app),
-				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
-
-	populate_store_list (sc);
-}
-
-static void
-subscribe_dialog_destroy (GtkObject *object)
-{
-	SubscribeDialog *sc;
-
-	sc = SUBSCRIBE_DIALOG (object);
-
-	/* free our folder information */
-	e_tree_model_node_remove (sc->folder_model, sc->folder_root);
-	gtk_object_unref (GTK_OBJECT (sc->folder_model));
-	if (sc->folder_info)
-		camel_store_free_folder_info (sc->store, sc->folder_info);
-
-	/* free our store information */
-	gtk_object_unref (GTK_OBJECT (sc->store_model));
-	g_list_foreach (sc->store_list, (GFunc)gtk_object_unref, NULL);
-
-	/* free our storage */
-	if (sc->storage)
-		gtk_object_unref (GTK_OBJECT (sc->storage));
-
-	/* free our search */
-	if (sc->search_top)
-		g_free (sc->search_top);
-
-	subscribe_dialog_parent_class->destroy (object);
-}
-
-static void
-subscribe_dialog_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = subscribe_dialog_destroy;
-
-	subscribe_dialog_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-subscribe_dialog_init (GtkObject *object)
-{
-}
-
-static void
-subscribe_dialog_construct (GtkObject *object, GNOME_Evolution_Shell shell)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
-
-	/*
-	 * Our instance data
-	 */
-	sc->shell = shell;
-	sc->store = NULL;
-	sc->storage = NULL;
-	sc->folder_info = NULL;
-	sc->store_list = NULL;
-	sc->search_top = NULL;
-
-	subscribe_dialog_gui_init (sc);
-}
-
-GtkWidget *
-subscribe_dialog_new (GNOME_Evolution_Shell shell)
-{
-	SubscribeDialog *subscribe_dialog;
-
-	subscribe_dialog = gtk_type_new (subscribe_dialog_get_type ());
-
-	subscribe_dialog_construct (GTK_OBJECT (subscribe_dialog), shell);
-
-	return GTK_WIDGET (subscribe_dialog->app);
-}
-
-E_MAKE_TYPE (subscribe_dialog, "SubscribeDialog", SubscribeDialog, subscribe_dialog_class_init, subscribe_dialog_init, PARENT_TYPE);
-
diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade
deleted file mode 100644
index 5169f450c3..0000000000
--- a/mail/subscribe-dialog.glade
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution</name>
-  <program_name>evolution</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <translatable_strings_file>subscribe-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>subscriptions</name>
-  <visible>False</visible>
-  <title></title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table</name>
-	<rows>3</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>3</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>lblDisplay</name>
-	  <label>Display folders whose name contain:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>txtSearch``</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkNotebook</class>
-	  <name>notebook</name>
-	  <can_focus>True</can_focus>
-	  <show_tabs>True</show_tabs>
-	  <show_border>True</show_border>
-	  <tab_pos>GTK_POS_BOTTOM</tab_pos>
-	  <scrollable>False</scrollable>
-	  <tab_hborder>2</tab_hborder>
-	  <tab_vborder>2</tab_vborder>
-	  <popup_enable>False</popup_enable>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>etableAll</name>
-	    <creation_function>create_folderlist</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 09 Nov 2000 23:31:36 GMT</last_modification_time>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>lblAll</name>
-	    <label>All Folders</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>etableSubscribed</name>
-	    <creation_function>create_folderlist</creation_function>
-	    <int1>1</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 09 Nov 2000 23:30:19 GMT</last_modification_time>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>lblSubscribed</name>
-	    <label>Subscribed</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdQuery</name>
-	  <can_focus>True</can_focus>
-	  <label>Query</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox1</name>
-	  <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdSubscribe</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Subscribe</label>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdUnsubscribe</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>Unsubscribe</label>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
deleted file mode 100644
index 68cd8a4876..0000000000
--- a/mail/subscribe-dialog.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _SUBSCRIBE_DIALOG_H_
-#define _SUBSCRIBE_DIALOG_H_
-
-#include "mail-types.h"
-#include "camel/camel-store.h"
-#include <gtk/gtktable.h>
-#include <gal/e-table/e-tree-model.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include "shell/evolution-storage.h"
-
-#define SUBSCRIBE_DIALOG_TYPE        (subscribe_dialog_get_type ())
-#define SUBSCRIBE_DIALOG(o)          (GTK_CHECK_CAST ((o), SUBSCRIBE_DIALOG_TYPE, SubscribeDialog))
-#define SUBSCRIBE_DIALOG_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), SUBSCRIBE_DIALOG_TYPE, SubscribeDialogClass))
-#define IS_SUBSCRIBE_DIALOG(o)       (GTK_CHECK_TYPE ((o), SUBSCRIBE_DIALOG_TYPE))
-#define IS_SUBSCRIBE_DIALOG_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), SUBSCRIBE_DIALOG_TYPE))
-
-struct  _SubscribeDialog {
-	GtkObject parent;
-
-	GNOME_Evolution_Shell           shell;
-
-	GtkWidget                *app;
-
-	GtkWidget         	 *hpaned;
-	GtkWidget         	 *table;
-	GtkWidget         	 *description;
-
-	GtkWidget                *store_etable;
-	ETableModel              *store_model;
-
-	GtkWidget         	 *folder_etable;
-	ETreeModel        	 *folder_model;
-	ETreePath         	 *folder_root;
-
-	CamelStore               *store;
-	EvolutionStorage         *storage;
-	CamelFolderInfo          *folder_info;
-
-	GList                    *store_list;
-
-	GtkWidget                *search_entry;
-	char                     *search_top;
-};
-
-
-typedef struct {
-	GtkObjectClass parent_class;
-} SubscribeDialogClass;
-
-GtkType    subscribe_dialog_get_type             (void);
-GtkWidget *subscribe_dialog_new                  (GNOME_Evolution_Shell shell);
-
-#endif /* _SUBSCRIBE_DIALOG_H_ */
diff --git a/mail/test-mail.c b/mail/test-mail.c
deleted file mode 100644
index 6e240199cd..0000000000
--- a/mail/test-mail.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Tests the mail summary display bonobo component
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-
-static guint
-create_container (void)
-{
-	GtkWidget *window, *control;
-	BonoboUIContainer *container;
-
-	gdk_rgb_init ();
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-
-	window = bonobo_window_new ("Test", "test");
-	gtk_widget_set_usize (GTK_WIDGET (window), 640, 480);
-	gtk_widget_show (GTK_WIDGET (window));
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (window));
-
-	control = bonobo_widget_new_control (
-		"OAFIID:GNOME_Evolution_Mail_Control",
-		bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	
-	if (control == NULL){
-		printf ("Could not launch mail control\n");
-		exit (1);
-	}
-	gtk_container_add (GTK_CONTAINER (window), control);
-
-	gtk_widget_show (window);
-	gtk_widget_show (control);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("sample-control-container", "1.0", argc, argv);
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error ("Could not initialize Bonobo\n");
-	
-	gtk_idle_add ((GtkFunction) create_container, NULL);
-
-	/*
-	 * Main loop
-	 */
-	bonobo_main ();
-	
-	return 0;
-}
-
-
-
-
-
diff --git a/mail/test-thread.c b/mail/test-thread.c
deleted file mode 100644
index eddf9dd7c8..0000000000
--- a/mail/test-thread.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Tests the multithreaded UI code */
-
-#include "config.h"
-#include <unistd.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
-#include <stdio.h>
-#include "mail-threads.h"
-
-static gchar *desc_1 (gpointer in, gboolean gerund);
-static void op_1( gpointer in, gpointer op, CamelException *ex );
-static gchar *desc_2 (gpointer in, gboolean gerund);
-static void op_2( gpointer in, gpointer op, CamelException *ex );
-static gchar *desc_3 (gpointer in, gboolean gerund);
-static void op_3( gpointer in, gpointer op, CamelException *ex );
-static gchar *desc_4 (gpointer in, gboolean gerund);
-static void op_4( gpointer in, gpointer op, CamelException *ex );
-static gchar *desc_5 (gpointer in, gboolean gerund);
-static void op_5( gpointer in, gpointer op, CamelException *ex );
-static gchar *desc_6 (gpointer in, gboolean gerund);
-static gchar *desc_7 (gpointer in, gboolean gerund);
-static gchar *desc_8 (gpointer in, gboolean gerund);
-static void done( gpointer in, gpointer op, CamelException *ex );
-static void exception( gpointer in, gpointer op, CamelException *ex );
-static gboolean queue_ops( void );
-
-const mail_operation_spec spec1 = { desc_1, 0, NULL, op_1, done };
-const mail_operation_spec spec2 = { desc_2, 0, NULL, op_2, done };
-const mail_operation_spec spec3 = { desc_3, 0, NULL, op_3, done };
-const mail_operation_spec spec4 = { desc_4, 0, NULL, op_4, NULL };
-const mail_operation_spec spec5 = { desc_5, 0, NULL, op_5, done };
-const mail_operation_spec spec6 = { desc_6, 0, exception, op_4, NULL };
-const mail_operation_spec spec7 = { desc_7, 0, NULL, exception, NULL };
-const mail_operation_spec spec8 = { desc_8, 0, NULL, op_4, exception };
-
-static gboolean queue_ops( void )
-{
-	int i;
-
-	g_message( "Top of queue_ops" );
-
-	mail_operation_queue( &spec1, "op1 finished", FALSE );
-	mail_operation_queue( &spec2, "op2 finished", FALSE );
-	mail_operation_queue( &spec3, "op3 finished", FALSE );
-
-	for( i = 0; i < 3; i++ ) {
-		mail_operation_queue( &spec4, GINT_TO_POINTER( i ), FALSE );
-	}
-
-	g_message( "Waiting for finish..." );
-	mail_operation_wait_for_finish();
-
-	g_message( "Ops done -- queue some more!" );
-
-	mail_operation_queue( &spec1, "done a second time", FALSE );
-
-	g_message( "Waiting for finish again..." );
-	mail_operation_wait_for_finish();
-
-	g_message( "Ops done -- more, more!" );
-
-	mail_operation_queue( &spec5, "passwords stolen", FALSE );
-
-	for( i = 0; i < 3; i++ ) {
-		mail_operation_queue( &spec4, GINT_TO_POINTER( i ), FALSE );
-	}
-
-	mail_operation_queue( &spec6, NULL, FALSE );
-	mail_operation_queue( &spec7, NULL, FALSE );
-	mail_operation_queue( &spec8, NULL, FALSE );
-
-	g_message( "Waiting for finish for the last time..." );
-	mail_operations_terminate();
-	g_message( "Ops done again. Exiting 0" );
-	gtk_exit( 0 );
-	return FALSE;
-}
-
-static void exception( gpointer in, gpointer op, CamelException *ex )
-{
-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "I don't feel like it.");
-}
-
-static void op_1( gpointer in, gpointer op, CamelException *ex )
-{
-	gfloat pct;
-
-	mail_op_show_progressbar();
-	mail_op_set_message( "Watch the progress bar!" );
-
-	for( pct = 0.0; pct < 1.0; pct += 0.2 ) {
-		sleep( 1 );
-		mail_op_set_percentage( pct );
-	}
-}
-
-static void op_2( gpointer in, gpointer op, CamelException *ex )
-{
-	int i;
-
-	mail_op_hide_progressbar();
-	for( i = 5; i > 0; i-- ) {
-		mail_op_set_message( "%d", i );
-		sleep( 1 );
-	}
-
-	mail_op_set_message( "BOOOM!" );
-	sleep( 1 );
-}
-
-static void op_3( gpointer in, gpointer op, CamelException *ex )
-{
-	gfloat pct;
-
-	mail_op_show_progressbar();
-	mail_op_set_message( "Frobulating the foosamatic" );
-
-	for( pct = 0.0; pct < 0.3; pct += 0.1 ) {
-		mail_op_set_percentage( pct );
-		sleep( 1 );
-	}
-
-	mail_op_error( "Oh no! The foosamatic was booby-trapped!" );
-	sleep( 1 );
-}
-
-static void op_4( gpointer in, gpointer op, CamelException *ex )
-{
-	mail_op_hide_progressbar();
-	mail_op_set_message( "Filler # %d", GPOINTER_TO_INT( in ) );
-	sleep( 1 );
-}
-
-static void op_5( gpointer in, gpointer op, CamelException *ex )
-{
-	gchar *pass;
-	gboolean ret;
-
-	mail_op_show_progressbar();
-	mail_op_set_percentage( 0.5 );
-
-	ret = mail_op_get_password( "What is your super-secret password?", TRUE, &pass );
-
-	if( ret == FALSE )
-		mail_op_set_message( "Oh no, you cancelled! : %s", pass );
-	else
-		mail_op_set_message( "\"%s\", you said?", pass );
-
-	sleep( 1 );
-}
-
-static void done( gpointer in, gpointer op, CamelException *ex )
-{
-	g_message( "Operation done: %s", (gchar *) in );
-}
-
-static gchar *desc_1 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Showing the Crawling Progress Bar of Doom");
-	else
-		return g_strdup ("Progress Bar");
-}
-
-static gchar *desc_2 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Exploring the Mysterious Message Setter");
-	else
-		return g_strdup ("Explore");
-}
-
-static gchar *desc_3 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Dare the Error Dialog of No Return");
-	else
-		return g_strdup ("Dare");
-}
-
-static gchar *desc_4 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup_printf ("Filling Queue Space -- %d", GPOINTER_TO_INT (in));
-	else
-		return g_strdup_printf ("Filler -- %d", GPOINTER_TO_INT (in));
-}
-
-static gchar *desc_5 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Stealing your Password");
-	else
-		return g_strdup ("The Dastardly Password Stealer");
-}
-
-static gchar *desc_6 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Setting exception on setup");
-	else
-		return g_strdup ("Exception on setup");
-}
-
-static gchar *desc_7 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Setting exception in process");
-	else
-		return g_strdup ("Exception coming soon");
-}
-
-static gchar *desc_8 (gpointer in, gboolean gerund)
-{
-	if (gerund)
-		return g_strdup ("Setting exception in cleanup");
-	else
-		return g_strdup ("Exception in cleanup");
-}
-
-
-int main( int argc, char **argv )
-{
-	g_thread_init( NULL );
-	gnome_init( "test-thread", "0.0", argc, argv );
-	gtk_idle_add( (GtkFunction) queue_ops, NULL );
-	gtk_main();
-	return 0;
-}
diff --git a/notes/.cvsignore b/notes/.cvsignore
deleted file mode 100644
index 02b0523973..0000000000
--- a/notes/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
diff --git a/notes/GNOME_Evolution_Notes.oaf.in b/notes/GNOME_Evolution_Notes.oaf.in
deleted file mode 100644
index d65cb45412..0000000000
--- a/notes/GNOME_Evolution_Notes.oaf.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
-            type="exe"
-            location="evolution-notes">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Notes control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
-	type="exe"
-	location="evolution-notes">
-	
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Factory for the Evolution notes component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/notes/GNOME_Evolution_Notes.oafinfo b/notes/GNOME_Evolution_Notes.oafinfo
deleted file mode 100644
index 8bf763e546..0000000000
--- a/notes/GNOME_Evolution_Notes.oafinfo
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
-            type="exe"
-            location="evolution-notes">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Notes control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
-	type="exe"
-	location="evolution-notes">
-	
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution notes component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/notes/Makefile.am b/notes/Makefile.am
deleted file mode 100644
index 42b06c241a..0000000000
--- a/notes/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-noinst_PROGRAMS = notes-test
-
-INCLUDES = \
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-notes\"
-
-notes_test_SOURCES = 			\
-	e-bevel-button.c		\
-	e-bevel-button.h		\
-	e-bevel-button-util.c		\
-	e-bevel-button-util.h		\
-	e-note.c			\
-	e-note.h			\
-	test-notes.c
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Notes.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-notes_test_LDADD =					\
-	$(BONOBO_HTML_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)
-
-EXTRA_DIST= $(oaf_in_files) $(oaf_DATA)
diff --git a/notes/component-factory.c b/notes/component-factory.c
deleted file mode 100644
index 48b81f4071..0000000000
--- a/notes/component-factory.c
+++ /dev/null
@@ -1,155 +0,0 @@
-#include <config.h>
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-
-#include "e-util/e-gui-utils.h"
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "notes", "evolution-notes.png" },
-	{ NULL, NULL }
-};
-
-static void
-new_note_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	g_print ("new note!\n");
-}
-
-static GnomeUIInfo gnome_toolbar [] = {
-	GNOMEUIINFO_ITEM_STOCK (N_("New"), N_("Create a new note"), new_note_cb, GNOME_STOCK_PIXMAP_NEW),
-	GNOMEUIINFO_END
-};
-
-#ifdef THIS_NEEDS_UPDATING_FOR_NEW_BONOBOS
-
-static void
-control_deactivate (BonoboControl *control, BonoboUIComponent *uih)
-{
-	bonobo_ui_handler_dock_remove (uih, "/Toolbar");
-}
-
-static void
-control_activate (BonoboControl *control, BonoboUIComponent *uih)
-{
-	Bonobo_UIContainer remote_uih;
-	GtkWidget *toolbar, *toolbar_frame;
-	BonoboControl *toolbar_control ;
-
-	remote_uih = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
-				   GTK_TOOLBAR_BOTH);
-
-	gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (toolbar),
-					  gnome_toolbar, 
-					  NULL, NULL);
-
-	toolbar_frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (toolbar_frame), toolbar);
-	gtk_widget_show (toolbar_frame);
-
-	gtk_widget_show_all (toolbar_frame);
-
-	toolbar_control = bonobo_control_new (toolbar_frame);
-	bonobo_ui_handler_dock_add (
-				    uih, "/Toolbar",
-				    bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),
-				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE,
-				    GNOME_DOCK_TOP,
-				    1, 1, 0);
-}
-
-		  
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate)
-{
-	BonoboUIComponent *uih;
-
-	uih = bonobo_control_get_ui_handler (control);
-	g_assert (uih);
-
-	if (activate)
-		control_activate (control, uih);
-	else
-		control_deactivate (control, uih);
-}
-#endif
-
-static BonoboControl *
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     void *closure)
-{
-	BonoboControl * control;
-
-	control = notes_factory_new_control ();
-
-#ifdef THIS_CODE_IS_TOTALY_DEAD
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, NULL);
-#endif
-	
-
-	return control;
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient shell_client,
-	      gpointer user_data)
-{
-	g_print ("evolution-notes: Yeeeh! We have an owner!\n");	/* FIXME */
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data)
-{
-	g_print ("No owner anymore\n");
-}
-
-/* The factory function */
-static BonoboObject *
-notes_component_factory (BonoboGenericFactory *factory,
-			 void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-	
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-component_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, notes_component_factory, NULL);
-
-	if (factory == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's notes component."));
-		exit (1);
-	}
-}
diff --git a/notes/component-factory.h b/notes/component-factory.h
deleted file mode 100644
index 9535ccc4ae..0000000000
--- a/notes/component-factory.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
diff --git a/notes/e-bevel-button-util.c b/notes/e-bevel-button-util.c
deleted file mode 100644
index cfa01f71a2..0000000000
--- a/notes/e-bevel-button-util.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include <gtk/gtk.h>
-#include "e-bevel-button-util.h"
-
-static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
-static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
-
-void
-e_bevel_button_util_shade (GdkColor *a,
-			   GdkColor *b,
-			   gdouble   k)
-{
-  gdouble red;
-  gdouble green;
-  gdouble blue;
-  
-  red = (gdouble) a->red / 65535.0;
-  green = (gdouble) a->green / 65535.0;
-  blue = (gdouble) a->blue / 65535.0;
-  
-  rgb_to_hls (&red, &green, &blue);
-  
-  green *= k;
-  if (green > 1.0)
-    green = 1.0;
-  else if (green < 0.0)
-    green = 0.0;
-  
-  blue *= k;
-  if (blue > 1.0)
-    blue = 1.0;
-  else if (blue < 0.0)
-    blue = 0.0;
-  
-  hls_to_rgb (&red, &green, &blue);
-  
-  b->red = red * 65535.0;
-  b->green = green * 65535.0;
-  b->blue = blue * 65535.0;
-}
-
-static void
-rgb_to_hls (gdouble *r,
-            gdouble *g,
-            gdouble *b)
-{
-  gdouble min;
-  gdouble max;
-  gdouble red;
-  gdouble green;
-  gdouble blue;
-  gdouble h, l, s;
-  gdouble delta;
-  
-  red = *r;
-  green = *g;
-  blue = *b;
-  
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-      
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-      
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-  
-  l = (max + min) / 2;
-  s = 0;
-  h = 0;
-  
-  if (max != min)
-    {
-      if (l <= 0.5)
-        s = (max - min) / (max + min);
-      else
-        s = (max - min) / (2 - max - min);
-      
-      delta = max -min;
-      if (red == max)
-        h = (green - blue) / delta;
-      else if (green == max)
-        h = 2 + (blue - red) / delta;
-      else if (blue == max)
-        h = 4 + (red - green) / delta;
-      
-      h *= 60;
-      if (h < 0.0)
-        h += 360;
-    }
-  
-  *r = h;
-  *g = l;
-  *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-            gdouble *l,
-            gdouble *s)
-{
-  gdouble hue;
-  gdouble lightness;
-  gdouble saturation;
-  gdouble m1, m2;
-  gdouble r, g, b;
-  
-  lightness = *l;
-  saturation = *s;
-  
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-  
-  if (saturation == 0)
-    {
-      *h = lightness;
-      *l = lightness;
-      *s = lightness;
-    }
-  else
-    {
-      hue = *h + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        r = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        r = m2;
-      else if (hue < 240)
-        r = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        r = m1;
-      
-      hue = *h;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        g = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        g = m2;
-      else if (hue < 240)
-        g = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        g = m1;
-      
-      hue = *h - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        b = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        b = m2;
-      else if (hue < 240)
-        b = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        b = m1;
-      
-      *h = r;
-      *l = g;
-      *s = b;
-    }
-}
diff --git a/notes/e-bevel-button-util.h b/notes/e-bevel-button-util.h
deleted file mode 100644
index 759a9025cc..0000000000
--- a/notes/e-bevel-button-util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __E_BEVEL_BUTTON_UTIL_H__ 
-#define __E_BEVEL_BUTTON_UTIL_H__
-
-#define LIGHTNESS_MULT  1.3
-#define DARKNESS_MULT   0.7
-
-void
-e_bevel_button_util_shade (GdkColor *a,
-			   GdkColor *b,
-			   gdouble   k);
-
-#endif /* __E_BEVEL_BUTTON_UTIL_H__ */
diff --git a/notes/e-bevel-button.c b/notes/e-bevel-button.c
deleted file mode 100644
index 1d96d88531..0000000000
--- a/notes/e-bevel-button.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-#include <config.h>
-#include <gtk/gtkbutton.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-bevel-button.h"
-#include "e-bevel-button-util.h"
-
-#define PARENT_TYPE GTK_TYPE_BUTTON
-
-static GtkButtonClass *parent_class = NULL;
-
-struct _EBevelButtonPrivate {
-	GdkColor base_color;
-	GdkColor dark_color;
-	GdkColor light_color;
-	GdkGC *gc;
-};
-
-static void
-e_bevel_button_paint (GtkWidget *widget, GdkRectangle *area)
-{
-	EBevelButton *button;
-
-	button = E_BEVEL_BUTTON (widget);
-	
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-		gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height);
-
-		gdk_gc_set_foreground (button->priv->gc, &button->priv->base_color);
-		gdk_draw_rectangle (widget->window,
-				    button->priv->gc,
-				    TRUE,
-				    0, 0,
-				    widget->allocation.width, widget->allocation.height);
-
-		if (GTK_BUTTON (button)->in_button) {
-			gdk_gc_set_foreground (button->priv->gc,
-					       GTK_BUTTON (button)->button_down ?
-					       &button->priv->dark_color :
-					       &button->priv->light_color);
-			gdk_draw_line (widget->window, button->priv->gc,
-				       0, 0, 0, widget->allocation.height - 2);
-			gdk_draw_line (widget->window, button->priv->gc,
-				       0, 0, widget->allocation.width - 2, 0);
-
-			gdk_gc_set_foreground (button->priv->gc,
-					       GTK_BUTTON (button)->button_down ?
-					       &button->priv->light_color :
-					       &button->priv->dark_color);
-			gdk_draw_line (widget->window, button->priv->gc,
-				       widget->allocation.width - 1 , 1,
-				       widget->allocation.width - 1, widget->allocation.height - 1);
-			gdk_draw_line (widget->window, button->priv->gc,
-				       1, widget->allocation.height - 1,
-				       widget->allocation.width - 1, widget->allocation.height - 1);
-		}
-	}
-}
-
-static gint
-e_bevel_button_expose (GtkWidget *widget, GdkEventExpose *event)
-{
-	  GtkBin *bin;
-	  GdkEventExpose child_event;
-	  
-	  if (GTK_WIDGET_DRAWABLE (widget)) {
-		  bin = GTK_BIN (widget);
-		  
-		  e_bevel_button_paint (widget, &event->area);
-		  
-		  child_event = *event;
-		  if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child) &&
-		      gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-			  gtk_widget_event (bin->child, (GdkEvent*) &child_event);
-	  }
-
-	  return FALSE;
-}
-
-static void
-e_bevel_button_draw (GtkWidget *widget, GdkRectangle *area)
-{
-	GdkRectangle child_area;
-	GdkRectangle tmp_area;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_BEVEL_BUTTON (widget));
-	g_return_if_fail (area != NULL);
-
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		tmp_area = *area;
-		tmp_area.x -= GTK_CONTAINER (widget)->border_width;
-		tmp_area.y -= GTK_CONTAINER (widget)->border_width;
-
-		e_bevel_button_paint (widget, &tmp_area);
-
-		if (GTK_BIN (widget)->child && gtk_widget_intersect (GTK_BIN (widget)->child, &tmp_area, &child_area))
-			gtk_widget_draw (GTK_BIN (widget)->child, &child_area);
-	}
-}
-
-static void
-e_bevel_button_realize (GtkWidget *widget)
-{
-	EBevelButton *button = E_BEVEL_BUTTON (widget);
-
-	GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-	button->priv->gc = gdk_gc_new (widget->window);
-
-	gdk_color_parse ("#d0d888", &button->priv->base_color);
-	e_bevel_button_util_shade (&button->priv->base_color,
-				   &button->priv->light_color,
-				   LIGHTNESS_MULT);
-	e_bevel_button_util_shade (&button->priv->base_color,
-				   &button->priv->dark_color,
-				   DARKNESS_MULT);
-	gdk_colormap_alloc_color (gdk_rgb_get_cmap (), &button->priv->base_color, FALSE, TRUE);
-	gdk_colormap_alloc_color (gdk_rgb_get_cmap (), &button->priv->light_color, FALSE, TRUE);
-	gdk_colormap_alloc_color (gdk_rgb_get_cmap (), &button->priv->dark_color, FALSE, TRUE);
-}
-
-static void
-e_bevel_button_class_init (EBevelButtonClass *klass)
-{
-	GtkWidgetClass *widget_class;
-
-	widget_class = (GtkWidgetClass *)klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	widget_class->draw = e_bevel_button_draw;
-	widget_class->expose_event = e_bevel_button_expose;
-	widget_class->realize = e_bevel_button_realize;
-}
-
-static void
-e_bevel_button_init (EBevelButton *button)
-{
-	EBevelButtonPrivate *priv;
-
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
-
-	priv = g_new (EBevelButtonPrivate, 1);
-
-	button->priv = priv;
-}
-
-GtkWidget *
-e_bevel_button_new (void)
-{
-	EBevelButton *button;
-
-	button = gtk_type_new (E_TYPE_BEVEL_BUTTON);
-
-	return GTK_WIDGET (button);
-}
-
-E_MAKE_TYPE (e_bevel_button, "EBevelButton", EBevelButton, e_bevel_button_class_init, e_bevel_button_init, PARENT_TYPE);
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/notes/e-bevel-button.h b/notes/e-bevel-button.h
deleted file mode 100644
index 333c317b43..0000000000
--- a/notes/e-bevel-button.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-#ifndef __E_BEVEL_BUTTON_H__
-#define __E_BEVEL_BUTTON_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbutton.h>
-
-#define E_TYPE_BEVEL_BUTTON            (e_bevel_button_get_type ())
-#define E_BEVEL_BUTTON(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_BEVEL_BUTTON, EBevelButton))
-#define E_BEVEL_BUTTON_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_BEVEL_BUTTON, EBevelButtonClass))
-#define E_IS_BEVEL_BUTTON(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_BEVEL_BUTTON))
-#define E_IS_BEVEL_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_BEVEL_BUTTON))
-
-typedef struct _EBevelButton        EBevelButton;
-typedef struct _EBevelButtonPrivate EBevelButtonPrivate;
-typedef struct _EBevelButtonClass   EBevelButtonClass;
-
-struct _EBevelButton {
-	GtkButton parent;
-
-	EBevelButtonPrivate *priv;
-};
-
-struct _EBevelButtonClass {
-	GtkButtonClass parent_class;
-};
-
-GtkType e_bevel_button_get_type (void);
-
-GtkWidget *e_bevel_button_new (void);
-void e_bevel_button_set_base_color (EBevelButton *button, GdkColor *color);
-
-#endif /* __E_BEVEL_BUTTON_H__ */
-				  
diff --git a/notes/e-note.c b/notes/e-note.c
deleted file mode 100644
index 642fd1178a..0000000000
--- a/notes/e-note.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gdk/gdkx.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-
-#include "e-note.h"
-#include "e-bevel-button.h"
-#include "e-bevel-button-util.h"
-
-#define PARENT_TYPE GTK_TYPE_WINDOW
-
-enum {
-	E_NOTE_TEXT_CHANGED,
-	E_NOTE_LAST_SIGNAL
-};
-
-static guint e_note_signals [E_NOTE_LAST_SIGNAL] = { 0 };
-
-static GtkWindowClass *parent_class = NULL;
-
-struct _ENotePrivate {
-	GtkWidget *canvas;
-	
-	GnomeCanvasItem *frame;
-	GnomeCanvasItem *rect;
-
-	GnomeCanvasItem *text_item;
-	
-	GnomeCanvasItem *move_button;
-	GnomeCanvasItem *close_button;
-	GnomeCanvasItem *resize_button;
-	
-	/* Used for moving and resizing */
-	gint press_x, press_y;
-	gint resize_width, resize_height;
-	gboolean in_drag;
-};
-
-static void
-e_note_text_changed (ETextModel *model, gpointer data)
-{
-	gtk_signal_emit (GTK_OBJECT (data),
-			 e_note_signals [E_NOTE_TEXT_CHANGED]);
-}
-
-static gint
-e_note_resize_button_changed (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	ENote *note = E_NOTE (data);
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		note->priv->press_x = event->x_root;
-		note->priv->press_y = event->y_root;
-
-		gdk_window_get_geometry (GTK_WIDGET (note)->window, NULL, NULL,
-					 &note->priv->resize_width, &note->priv->resize_height, NULL);
-		
-		gdk_pointer_grab (widget->window,
-				  FALSE,
-				  (GDK_BUTTON1_MOTION_MASK |
-				   GDK_POINTER_MOTION_HINT_MASK |
-				   GDK_BUTTON_RELEASE_MASK),
-				  NULL,
-				  NULL,
-				  GDK_CURRENT_TIME);
-		note->priv->in_drag = TRUE;
-		
-	}
-	else {
-		if (note->priv->in_drag) {
-			if (event->window != widget->window)
-				return FALSE;
-			
-			gdk_pointer_ungrab (GDK_CURRENT_TIME);
-			note->priv->in_drag = FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-static gint
-e_note_resize_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer data)
-{
-	GtkWidget *window = GTK_WIDGET (data);
-	ENote *note = E_NOTE (data);
-	gint new_x, new_y;
-	gint width, height;
-
-	if (note->priv->in_drag) {
-		gdk_window_get_pointer (GDK_ROOT_PARENT (), &new_x, &new_y, NULL);
-
-		width = note->priv->resize_width + new_x - note->priv->press_x;
-		if (width < 60)
-			width = 60;
-		
-		height = note->priv->resize_height + new_y - note->priv->press_y;
-		if (height < 60)
-			height = 60;
-
-		gdk_window_resize (window->window, width, height);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gint
-e_note_move_button_changed (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	ENote *note = E_NOTE (data);
-	
-	if (event->button != 1)
-		return FALSE;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		gint root_x, root_y;
-
-		gdk_window_get_origin (widget->window, &root_x, &root_y);
-		note->priv->press_x = root_x - event->x_root;
-		note->priv->press_y = root_y - event->y_root;
-		
-		gdk_pointer_grab (widget->window,
-				  FALSE,
-				  (GDK_BUTTON1_MOTION_MASK |
-				   GDK_POINTER_MOTION_HINT_MASK |
-				   GDK_BUTTON_RELEASE_MASK),
-				  NULL,
-				  NULL,
-				  GDK_CURRENT_TIME);
-
-		note->priv->in_drag = TRUE;
-	}
-	else {
-		if (note->priv->in_drag) {
-			if (event->window != widget->window)
-				return FALSE;
-
-			gdk_pointer_ungrab (GDK_CURRENT_TIME);
-			note->priv->in_drag = FALSE;
-		}
-	}
-	
-	return TRUE;
-}
-
-static gint
-e_note_move_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer data)
-{
-	gint new_x, new_y;
-	ENote *note = E_NOTE (data);
-	GtkWidget *window = GTK_WIDGET (data);
-
-	if (note->priv->in_drag) {
-		gdk_window_get_pointer (GDK_ROOT_PARENT (), &new_x, &new_y, NULL);
-
-		new_x += note->priv->press_x;
-		new_y += note->priv->press_y;
-
-		gdk_window_move (window->window, new_x, new_y);
-	}
-
-	return TRUE;
-}
-
-static void
-e_note_canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
-{
-	ENote *note;
-	gdouble height;
-	
-	note = E_NOTE (data);
-
-	gnome_canvas_item_set (note->priv->text_item,
-			       "width", (gdouble) allocation->width - 10,
-			       NULL);
-	gtk_object_get (GTK_OBJECT (note->priv->text_item),
-			"height", &height,
-			NULL);
-	height = MAX (height, allocation->height);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (note->priv->canvas), 0, 0,
-					allocation->width, height);
-	gnome_canvas_item_set (note->priv->frame,
-			       "x2", (gdouble) allocation->width - 1,
-			       "y2", (gdouble) allocation->height - 1,
-			       NULL);
-	gnome_canvas_item_set (note->priv->rect,
-			       "x2", (gdouble) allocation->width - 1,
-			       "y2", (gdouble) allocation->height - 1,
-			       NULL);
-	gnome_canvas_item_set (note->priv->move_button,
-			       "width", (gdouble) allocation->width - 29,
-			       NULL);
-	gnome_canvas_item_set (note->priv->resize_button,
-			       "x", (gdouble) allocation->width - 23,
-			       "y", (gdouble) allocation->height - 23,
-			       NULL);
-	gnome_canvas_item_set (note->priv->close_button,
-			       "x", (gdouble) allocation->width - 23,
-			       NULL);
-}
-
-static void
-e_note_realize (GtkWidget *widget)
-{
-	GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-	gdk_window_set_decorations (widget->window, 0);
-}
-
-static void
-e_note_class_init (ENoteClass *klass)
-{
-	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)klass;
-	widget_class = (GtkWidgetClass *)klass;
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	widget_class->realize = e_note_realize;
-
-	e_note_signals [E_NOTE_TEXT_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ENoteClass, text_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_note_signals, E_NOTE_LAST_SIGNAL);
-}
-
-static void
-e_note_init (ENote *note)
-{
-	ENotePrivate *priv;
-	GtkWidget *button;
-
-	priv = g_new (ENotePrivate, 1);
-
-	note->priv = priv;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	
-	priv->canvas = e_canvas_new ();
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	
-	gtk_signal_connect (GTK_OBJECT (priv->canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_note_canvas_size_allocate), note);
-	gtk_widget_show (priv->canvas);
-	gtk_container_add (GTK_CONTAINER (note), priv->canvas);
-
-	priv->rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)),
-					    gnome_canvas_rect_get_type (),
-					    "x1", 0.0,
-					    "y1", 0.0,
-					    "x2", 100.0,
-					    "y2", 100.0,
-					    "fill_color_rgba", 0xf5ffa0ff,
-					    NULL);
-	priv->frame = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)),
-					     gnome_canvas_rect_get_type (),
-					     "x1", 0.0,
-					     "y1", 0.0,
-					     "x2", 100.0,
-					     "y2", 100.0,
-					     "outline_color", "black",
-					     NULL);
-
-	priv->text_item = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)),
-						 e_text_get_type (),
-						 "text", "",
-						 "font_gdk", priv->canvas->style->font,
-						 "fill_color", "black",
-						 "anchor", GTK_ANCHOR_NW,
-						 "clip", TRUE,
-						 "editable", TRUE,
-						 "line_wrap", TRUE,
-						 "width", 150.0,
-						 NULL);
-	e_canvas_item_move_absolute(priv->text_item,
-				    5.0, 25.0);
-
-	gtk_signal_connect (GTK_OBJECT (E_TEXT (priv->text_item)->model), "changed",
-			    GTK_SIGNAL_FUNC (e_note_text_changed), note);
-					
-	button = e_bevel_button_new ();
-	gtk_signal_connect (GTK_OBJECT (button), "button_press_event",
-			    GTK_SIGNAL_FUNC (e_note_move_button_changed), note);
-	gtk_signal_connect (GTK_OBJECT (button), "button_release_event",
-			    GTK_SIGNAL_FUNC (e_note_move_button_changed), note);
-	gtk_signal_connect (GTK_OBJECT (button), "motion_notify_event",
-			    GTK_SIGNAL_FUNC (e_note_move_motion_event), note);
-	gtk_widget_show (button);
-	priv->move_button = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)), 
-  						   gnome_canvas_widget_get_type (), 
-  						   "widget", button, 
-  						   "x", 3.0, 
-  						   "y", 3.0, 
-  						   "width", 20.0, 
-  						   "height", 20.0, 
-  						   NULL); 
-	button = e_bevel_button_new ();
-	gtk_widget_show (button);
-	priv->close_button = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)),
-						    gnome_canvas_widget_get_type (),
-						    "widget", button,
-						    "x", 3.0,
-						    "y", 3.0,
-						    "width", 20.0,
-						    "height", 20.0,
-						    NULL);
-
-	button = e_bevel_button_new ();
-	gtk_signal_connect (GTK_OBJECT (button), "button_press_event",
-			    GTK_SIGNAL_FUNC (e_note_resize_button_changed), note);
-	gtk_signal_connect (GTK_OBJECT (button), "button_release_event",
-			    GTK_SIGNAL_FUNC (e_note_resize_button_changed), note);
-	gtk_signal_connect (GTK_OBJECT (button), "motion_notify_event",
-			    GTK_SIGNAL_FUNC (e_note_resize_motion_event), note);	
-	gtk_widget_show (button);
-	priv->resize_button = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (priv->canvas)),
-						     gnome_canvas_widget_get_type (),
-						     "widget", button,
-						     "x", 3.0,
-						     "y", 3.0,
-						     "width", 20.0,
-						     "height", 20.0,
-						     NULL);
-}
-
-void
-e_note_set_text (ENote *note, gchar *text)
-{
-	g_return_if_fail (note != NULL);
-	g_return_if_fail (E_IS_NOTE (note));
-	g_return_if_fail (text != NULL);
-
-	gnome_canvas_item_set (note->priv->text_item,
-			       "text", text,
-			       NULL);
-}
-
-gchar *
-e_note_get_text (ENote *note)
-{
-	gchar *text;
-	
-	g_return_val_if_fail (note != NULL, NULL);
-	g_return_val_if_fail (E_IS_NOTE (note), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-
-	gtk_object_get (GTK_OBJECT (note->priv->text_item),
-			"text", &text,
-			NULL);
-
-	return text;
-}
-
-
-GtkWidget *
-e_note_new (void)
-{
-	ENote *note;
-
-	note = gtk_type_new (E_TYPE_NOTE);
-
-	return GTK_WIDGET (note);
-}
-
-E_MAKE_TYPE (e_note, "ENote", ENote, e_note_class_init, e_note_init, PARENT_TYPE);
diff --git a/notes/e-note.h b/notes/e-note.h
deleted file mode 100644
index d7d4c63b95..0000000000
--- a/notes/e-note.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-#ifndef __E_NOTE_H__
-#define __E_NOTE_H__
-
-#include <config.h>
-#include <gnome.h>
-#include "e-bevel-button.h"
-
-#define E_TYPE_NOTE            (e_note_get_type ())
-#define E_NOTE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_NOTE, ENote))
-#define E_NOTE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_NOTE, ENoteClass))
-#define E_IS_NOTE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_NOTE))
-#define E_IS_NOTE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_NOTE))
-
-typedef struct _ENote ENote;
-typedef struct _ENotePrivate ENotePrivate;
-typedef struct _ENoteClass ENoteClass;
-
-struct _ENote {
-	GtkWindow parent;
-
-	ENotePrivate *priv;
-};
-
-struct _ENoteClass {
-	GtkWindowClass parent_class;
-
-	void (* text_changed) (ENote *note);
-};
-
-GtkType e_note_get_type (void);
-GtkWidget *e_note_new (void);
-void e_note_set_text (ENote *note, gchar *text);
-gchar *e_note_get_text (ENote *note);
-
-#endif /* __E_NOTE_H__ */
diff --git a/notes/main.c b/notes/main.c
deleted file mode 100644
index f3198c0d63..0000000000
--- a/notes/main.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Author:
- *   Anders Carlsson (andersca@gnu.org)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-
-#include "e-util/e-gui-utils.h"
-#include "component-factory.h"
-
-static void
-init_corba (gint argc, gchar **argv)
-{
-	gnome_init_with_popt_table ("evolution-notes-component", VERSION, argc, argv,
-				    oaf_popt_options, 0, NULL);
-	oaf_init (argc, argv);
-}
-
-static void
-init_bonobo (void)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Notes Component: Could not initialize bonobo"));
-		exit (1);
-	}
-}
-
-gint
-main (gint argc, gchar **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	init_corba (argc, argv);
-	init_bonobo ();
-	
-	e_setup_base_dir ();
-	
-	notes_factory_init ();
-	component_factory_init ();
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/notes/test-notes.c b/notes/test-notes.c
deleted file mode 100644
index 41def58a24..0000000000
--- a/notes/test-notes.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gdk/gdkx.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-
-#include "e-note.h"
-
-void
-text_changed (GtkWidget *widget, gpointer data)
-{
-	g_print ("Text changed!\n");
-}
-
-gint
-main (gint argc, gchar **argv)
-{
-	GtkWidget *note;
-	
-	gnome_init ("NotesTest", "0.0.1", argc, argv);
-
-	note = e_note_new ();
-	e_note_set_text (E_NOTE (note), "This is a text note widget");
-	gtk_signal_connect (GTK_OBJECT (note), "changed",
-			    GTK_SIGNAL_FUNC (text_changed), NULL);
-	
-	gtk_widget_show (note);
-	gtk_main ();
-	
-	return 0;
-}
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index c7ba4e1165..0000000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*.gmo
-*.mo
-Makefile
-Makefile.in
-Makefile.in.in
-POTFILES
-cat-id-tbl.c
-gnome-objc.pot
-gnome.pot
-stamp-cat-id
-evolution.pot
-messages
-.headerlock
-tmp
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index b9fd0ba83f..0000000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,1549 +0,0 @@
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: remove camel-imap-auth.c, add sasl stuff
-
-2001-02-27  JP Rosevear  <jpr@ximian.com>
-
-	* da.po: Correct a couple errors
-
-2001-02-25  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2001-02-24  Almer S. Tigelaar  <almer@gnome.org>
-
-	* nl.po: Updated Dutch translation.
-
-2001-02-24  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-02-24  Michael Meeks  <michael@ximian.com>
-
-	* POTFILES.in: remove stale calender oaf.in file
-
-2001-02-21  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-02-22  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-22  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* POTFILES.in: Removed references to camel-vee-*.c
-
-2001-02-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: Removed references to mail-threads.c
-
-2001-02-19  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-16  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-02-16  Matthias Warkus  <mawarkus@gnome.org>
-
-	* de.po: Update.
-
-2001-02-16  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-16  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from  Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-13  Christophe Merlet  <redfox@eikonex.org>
-
-	* fr.po: Updated French translation.
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* POTFILES.in: Remove dead glade file that was not being disted
-
-2001-02-13  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: Added *.oaf.in files.
-	
-2001-02-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* POTFILES.in: removed e-contact-editor-strings.h
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* *.po: added strings from .desktop files, they are translated here
-	because we use xml-i18n-tools.
-	* POTFILES.in: added these *.desktop files, missing *.glade files,
-	removed *.glade.h and similar files.
-	* POTFILES.skip: removed all *.glade.h entries - they do not exist
-	anymore.
-
-2001-02-10  Fatih Demir	<kabalak@gtranslator.org>
-
-	* tr.po: Took over the stable tr.po also to HEAD.
-
-2001-02-09  Anders Carlsson  <andersca@codefactory.se>
-
-	* sl.po: Add \n to fix a compile error.
-
-2001-02-09  Christophe Merlet  <redfox@eikonex.org>
-
-	* fr.po: Updated French translation.
-
-2001-02-09  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Updated Slovak translation.
-
-2001-02-09  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-02-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-02-07  Fatih Demir	<kabalak@kabalak.net>
-	
-	* tr.po: Committed updated Turkish translation by
-		Görkem Cetin.
-
-2001-02-07  Christopher R. Gabriel  <cgabriel@bug.rulez.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-02-06  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-02-02  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-31  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Terminology fixes by Andras Timar <timar@gnome.hu>
-
-2001-01-30  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* sk.po: Added initial Slovak translation.
-
-2001-01-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-27  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-27  Julian Missig <julian@jabber.org>
-
-	* POTFILES.in: Someone forgot to update this when removing a file it
-	uses. This was preventing evolution from compiling...
-	
-2001-01-26  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* pt_BR.po: Updated brazilian portuguese translation
-
-2001-01-26  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-26  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-24  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-24  Szabolcs Ban  <shooby@gnome.hu>
-
-        * hu.po: Tons of fixes by Andras and Emese (spelling,
-          terminology, headers)
-
-2001-01-23  Martin Norbäck  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-23  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-22  Dan Winship  <danw@ximian.com>
-
-	* POTFILES.in: Update for filter code moves
-
-2001-01-19  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-01-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-18  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	* update.sh: Removed old script.
-	
-2001-01-17  Dave Camp <dave@ximian.com>
-
-	* POTFILES.in: Removed addressbook/gui/widgets/test-minicard-view.c,
-	camel/providers/local/camel-mbox-provider.c, 
-	notes/component-factory.c, notes/main.c, and 
-	calendar/gui/gnome-month-item.c, and calendar/gui/alarm-notify.c.
-
-2001-01-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-16  Martin Norbäck  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation, using xml-i18n-update.
-
-2001-01.16  Kenneth Christiansen <kenneth@gnu.org>
-
-	* POTFILES.(in|skip): Updated after consulting Michael.
-
-2001-01-16  Martin Norbäck  <d95mback@dtek.chalmers.se>
-
-	* sv.po: Updated Swedish translation, using xml-i18n-update.
-
-2001-01-16  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-01-15  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-15  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it> 
-
-2001-01-15  Richard Hult  <rhult@codefactory.se>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-11  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-11  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2001-01-10  Christophe Merlet  <redfox@eikonex.org>
-
-	* fr.po: Updated French translation.
-
-2001-01-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: Added all the new source files and removed the old
-	ones, yadda yadda.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed .oaf.in files until the whole of Evolution
-	uses the xml-i18n-tools framework.
-
-2001-01-09  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2001-01-09  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2001-01-07  Benedikt Roth  <Benedikt.Roth@gmx.net>
-
-	* de.po: Updated German translation
-
-2001-01-07  Christophe Merlet  <redfox@eikonex.org>
-
-	* fr.po: Updated French translation.
-
-2001-01-06  Fatih Demir	<kabalak@gmx.net>
-
-	* ko.po: Committed updated Korean translation.
-
-2001-01-06  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* POTFILES.in: Remove non-existent file
-
-2001-01-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2001-01-03  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2001-01-02  Chris Toshok  <toshok@helixcode.com>
-
-	* POTFILES.in: add addressbook-config.c, addressbook-storage.c,
-	and addressbook-config.glade.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: remove all the stale addressbook entries.
-
-2000-12-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-25  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-23  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-12-23  JP Rosevear  <jpr@helixcode.com>
-
-	* POTFILES.in: Remove deleted file
-
-2000-12-22  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-22  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-21  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-
-2000-12-18  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-12-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-18  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-18  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-12-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed getdate.y.
-
-	* POTFILES.ignore: Ditto.
-
-2000-12-15  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	* POTFILES.in: This too.
-	* .potignore: Adjust to fit the new tools.
-	
-2000-12-14  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Added Id tag to easier trace changes.
-
-2000-12-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Update for reality. (Mostly from campd.)
-
-2000-12-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-12-11  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-12-06  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: updated italian translation from 
-	Clara Tattoni <clara.tattoni@libero.it>
-
-2000-12-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-05  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2000-12-04  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-12-03  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-12-03  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-12-02  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-12-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-30  Zbigniew Chyla  <chyla@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-11-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2000-11-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-29  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-26  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-11-26  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-11-24  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed gncal-todo.c.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: Removed mail/message-thread.c and added
-	camel/camel-folder-thread.c
-
-2000-11-20  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-19  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-11-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-17  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-	
-2000-11-17  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-16  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Major update.
-
-2000-11-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-11-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-06  Michael Meeks  <michael@helixcode.com>
-
-	* update.pl (GenHeaders, GeneratePot): Kill abortive
-	glade file translation code. It can't cope with line
-	breaks in the node content!
-
-2000-11-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-08  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-08  Akira Tagoh <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-11-07  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-06  Héctor García Álvarez <hector@scouts-es.org>
-
-        * es.po: Updated Spanish translation.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Remove mail-local-storage.c
-
-2000-11-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-05  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-11-05  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-05  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: update all of ui/*.h to ui/*.xml
-
-	* Makefile.i18npatch: sort out the xml bits.
-
-	* ui-extract.pl: add from Kenneth.
-
-	* update.pl: Update to the version in bonobo.
-
-2000-11-04  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-11-04  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* fi.po: Fixed a missing ".
-
-2000-11-02  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-11-02  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-11-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2000-11-01  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* ca.po: Updated Catalan file
-
-2000-10-31  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>
-
-2000-10-31  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-31  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-10-31  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: updated this.
-	* no.po: Updated this too.
-	
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2000-10-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-30  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: more updates from Clara Tattoni <clara.tattoni@libero.it>
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pl.po: Removed spurious character that kept it from building.
-
-2000-10-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-10-29  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated Italian translation from Clara Tattoni 
-	<clara.tattoni@libero.it>
-
-2000-10-29  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation.
-
-2000-10-29  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Update.
-
-2000-10-28  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* ca.po: Added Catalan file
-
-2000-10-26  Joaquim Fellmann <joaquim@mail.dotcom.fr>
-
-	* fr.po: Updated French translation.
-
-2000-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2000-10-26  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Huge update. Still not all of the "Could/Cannot" stuff
-	fixed to correct "...konnte nicht...werden" translation.
-
-2000-10-26  Joaquim Fellmann <joaquim@mail.dotcom.fr>
-
-	* fr.po: Updated French translation.
-
-2000-10-25  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
-
-	* it.po: Updated Italian translation from Clara Tattoni 
-	<clara.tattoni@libero.it>
-
-2000-10-25  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-25  Akira TAGOH  <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Add lots of camel and filter files.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* POTFILES.in: Remove removed composer files
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* en_GB.po: Added British translation.
-	
-2000-10-20  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-10-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-19  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-19  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Updated for the upcoming release.
-	* no.po: Same here.
-	
-2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nn.po: Added Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokmål) translation.
-	
-2000-10-14  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Updated Dutch translation.
-
-2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added ui/*.h
-	
-2000-10-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-13  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-13  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* lt.po: Added Lithuanian translation.
-
-2000-10-10  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-
-2000-10-10  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-08  Héctor García Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-	
-2000-10-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-10-08  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: Minors french translation updates.
-
-2000-10-06  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-05  Héctor García Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-
-2000-10-04  Héctor García Alvarez  <hector@scouts-es.org>
-
-        * es.po: updated Spanish translation.
-
-2000-10-04  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-10-03  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-10-03  Héctor García Álvarez  <hector@scouts-es.org>
-
-	* es.po: updated Spanish translation.
-
-2000-10-02  Christophe Merlet  <christophe@merlet.net>
-
-	* fr.po: updated French translation.
-
-2000-10-02  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-10-01  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-29  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-28  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-27  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-26  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Completed the Swedish translation.
-
-2000-09-25  Christophe Merlet <christophe@merlet.net>
-
-	* POTFILES.in: Reverted somes changes. Oups :(
-
-2000-09-25  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2000-09-25  Christophe Merlet <christophe@merlet.net>
-
-	* fr.po: Updated French translation.
-	* POTFILES.in: Updated files list
-	
-2000-09-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-20  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Removed files that have been moved to gal.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: `alphabet.glade.h' is now in
-	`addressbook/gui/widgets'.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* POTFILES.in: s/minicard/widgets/
-
-2000-09-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: corrected some mistakes
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed some files that are not there anymore.
-
-2000-09-12  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-12  Richard Hult  <rhult@codefactory.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-09-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
-
-	* fi.po: Added Finnish translation.
-
-2000-09-12  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-10  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Made a small correction to dutch translation.
-
-2000-09-10  Almer S. Tigelaar  <almer1@dds.nl>
-
-	* nl.po: Update Dutch translation.
-
-2000-09-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-09  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-09-09  Kai Lahmann <kl@linuxfaqs.de>
-
-	* nl.po: Updated dutch translation from Dennis Smit <synap@area101.penguin.nl>
-
-2000-09-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-04  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-09-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-09-29  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-08-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-29  Akira TAGOH <tagoh@gnome.gr.jp>
-
-	* ja.po: Updated Japanese translation.
-
-2000-08-27  Joaquim Fellmann <joaquim@hrnet.fr>
-
-	* fr.po: Updated French translation.
-
-2000-08-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-26  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Remove add addressbook/demo files from this.
-
-2000-08-25  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-23  Richard Hult  <rhult@hem.passagen.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-08-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-08-19  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated.
-
-2000-08-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build.
-
-2000-08-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-17  Kai Lahmann <kl@linuxfaqs.de>
-
-	* de.po: Updated German translation
-
-2000-08-16  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build.
-
-2000-08-12  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-	* POTFILES.in: Added missing files that are in the build. Sorted in alphabet order
-
-
-2000-08-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-10  Akira TAGOH  <at@ue-spacy.com>
-
-	* ja.po: Updated Japanese translation.
-
-2000-08-08  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added missing files that are in the build.
-	* no.po: Updated Norwegian translation.
-	
-2000-08-07  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-08-05  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-08-04  Szabolcs BAN <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translations.
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* ga.po: Add Irish translation.
-
-2000-08-02  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* es.po,hu.po,it.po,sl.po: various syntax checkings (missing %s, %S
-	instead of %s etc)
-
-2000-07-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-28  Szabolcs BAN <shooby@gnome.hu>
-
-	* hu.po: Updated Hungarian translations.
-
-2000-07-27  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-27  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-26  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-24  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated German translation.
-
-2000-07-24  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Updated the Turkish translation.
-	
-2000-07-24  Szabolcs BAN  <shooby@gnome.hu>
-
-	* hu.po: updated Hungarian translations...
-
-2000-07-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* it.po: Added missing \n.
-
-2000-07-23  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: Updated Italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2000-07-21  Szabolcs BAN  <shooby@gnome.hu>
-
-	* hu.po: updated Hungarian translations...
-
-2000-07-21  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Fixed an error.
-
-2000-07-19  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-07-16  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-07-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-07-16  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-07-15  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Updated. Should be complete and pretty usable.
-
-2000-07-13  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-07-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-07-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed several calendar/gui files that are no
-	longer there.
-
-2000-07-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed calendar/gui/evolution-calendar-control.c
-
-2000-07-09  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-07-09  Matthias Warkus  <mawa@iname.com>
-
-	* de.po: Rough cut at a complete German translation. Still needs a
-	lot of love.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `e-select-names.c' and
-	`select-name.glade.h' which were removed by Chris' commit.
-
-2000-06-30  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-29  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-28  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Added a load of missing files.
-	* no.po: Updated Norwegian translation.
-	
-2000-06-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-24  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-20  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* pt.po: Updated Portuguese translation from
-	Tiago Antao <tiagoantao@bigfoot.com>
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: Italian translation from Clara Tattoni
-	<clara.tattoni@libero.it>.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* POTFILES.in: why the heck was 
-	camel/providers/imap/imap.c listed? Oh well, 'tis
-	removed now...
-
-2000-06-17  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-13  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-11  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-11  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* pl.po: Added Polish translation.
-
-2000-06-10  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-06-09  Fatih Demir  <kabalak@gmx.net> 
-
-        * tr.po: Updated the Turkish translation.
-
-2000-06-08  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-06  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Finished it [ what about the caveat message?
-		Translating it is much fun ;) ].
-
-2000-06-05  Kenneth Christiansen <kenneth@gnu.org>
-
-	* README.tools: Added readme file, which explains the
-	use of the newly checked in po tools.
-
-	hmm, looking forward to tomorrow...viva los compleaños!
-	:)
-
-2000-06-05  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: A quick-update ( not fully finished ).
-
-2000-06-04  Valek Filippov  <frob@df.ru>                                        
-                                                                                
-        * ru.po: updated russian translation.
-	
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* it.po: New.  Just a skeleton.
-
-	* de.po: New, from Kai Lahmann <kl@linuxfaqs.de>.
-
-	* POTFILES.in: Updated.
-
-2000-06-04  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-06-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* pt.po: Added Portuguese translation from
-	Tiago Antao <tiagoantao@bigfoot.com>
-
-2000-06-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-28  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po: Updated the Turkish translation.
-
-2000-05-28  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-27  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-26  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-23  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-23  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-22  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update from Akira TAGOH.
-
-2000-05-18  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-18  Yukihiro Nakai  <nakai@gnome.gr.jp>
-
-	* ja.po: Update from Akira TAGOH.
-
-2000-05-14  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated russian translation.
-
-2000-05-14  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-13  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-13  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* POTFILES.in: added *.glade.h and *-strings.h files.
-	* ru.po: updated russian translation.
-
-2000-05-12  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-12  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* POTFILES.in: Removed mail/mail-component.c.
-
-2000-05-09  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-	* update.sh: Updated.
-
-2000-05-08  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* New update.sh script from Kenneth.
-
-2000-05-08  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-08  Héctor García Álvarez <hector@scouts-es.org>
-
-	* es.po: added translation to spanish.
-
-2000-05-07  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Remove `shell/e-shell-shortcut.c'.
-
-2000-05-05  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Updated Galician translation.
-
-2000-05-04  Fatih Demir	<kabalak@gmx.net>
-	
-	* tr.po : Updated the Turkish translation .
-
-2000-05-03  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-05-03  Valek Filippov  <frob@df.ru>
-
-	* ru.po: updated.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `shell/e-service.c'.
-
-2000-05-02  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-05-01  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-04-30  Arjan Scherpenisse  <acscherp@wins.uva.nl>
-
-	* nl.po: Added Dutch translation
-
-2000-04-25  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-21  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-20  Fatih Demir	<kabalak@gmx.net>
-
-	* tr.po : Added the Turkish translation .
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* ja.po: Initial Japanese translation from Akira Tagoh
-
-2000-04-19  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* da.po: Updated Danish file
-
-2000-04-19  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-18  Vincent Renardias  <vincent@redhat.com>
-
-	* fr.po: creation.
-
-2000-04-18  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-15  Valek Filippov  <frob@df.ru>
-
-	* ru.po: Updated russian translation.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* POTFILES.in: Removed `libversit/vcc.c' as its auto-generated and
-	breaks.
-
-2000-04-12  Pablo Saratxaga <pablo@mandrakesoft.com>
-
-	* da.po: Updated Danish file
-
-2000-04-10  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Updated Norwegian translation.
-	
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* gl.po: Added Galician translation.
-
-2000-04-07  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* uk.po: Updated Ukrainian translation.
-
-2000-04-06  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-04  Spiros Papadimitriou  <spapadim+@cs.cmu.edu>
-
-	* el.po: Added Greek translation.
-
-2000-04-04  Kjartan Maraas  <kmaraas@online.no>
-
-	* da.po: Added Danish translation from Kenneth Christiansen
-	<kenneth@ripen.dk>.
-	* no.po: Updated Norwegian translation.
-	* ru.po: Added Russian translation from Valek Filippov
-	<frob@df.ru>.
-	
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* uk.po: Added Ukrainian translation.
-
-2000-04-03  Richard Hult  <rhult@hem.passagen.se>
-
-	* sv.po: Updated Swedish translation.
-
-2000-04-03  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* sv.po: Added Swedish translation.
-
-2000-04-01  Kjartan Maraas  <kmaraas@online.no>
-
-	* no.po: Added Norwegian translation.
-	
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added evolution.pot.
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* POTFILES.in: Removed the calendar files for now.
-
-1998-07-23  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* pt.po: Added Portuguese translation.
-
-1996-06-12  Tristan Tarrant <ttarrant@suntlc.etnoteam.it>
-
-	* it.po : Italian translations added
diff --git a/po/Makefile.i18npatch b/po/Makefile.i18npatch
deleted file mode 100644
index 98837e85c2..0000000000
--- a/po/Makefile.i18npatch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.in.in.clean	Sat Oct 28 15:31:52 2000
-+++ Makefile.in.in	Sat Oct 28 16:11:18 2000
-@@ -33,7 +33,9 @@
- GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
- MSGFMT = @MSGFMT@
- XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
--MSGMERGE = PATH=../src:$$PATH msgmerge
-+MSGMERGE = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --dist
-+GENPOT   = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --pot
-+GENHEAD  = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --headers
- 
- DEFS = @DEFS@
- CFLAGS = @CFLAGS@
-@@ -47,7 +49,7 @@
- POFILES = @POFILES@
- GMOFILES = @GMOFILES@
- DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
--stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) update.pl ui-extract.pl
- 
- POTFILES = \
- 
-@@ -83,12 +85,7 @@
- all-no:
- 
- $(srcdir)/$(PACKAGE).pot: $(POTFILES)
--	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--	  --add-comments --keyword=_ --keyword=N_ \
--	  --files-from=$(srcdir)/POTFILES.in \
--	&& test ! -f $(PACKAGE).po \
--	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
--		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-+	$(GENPOT)
- 
- $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
- $(srcdir)/stamp-cat-id: $(PACKAGE).pot
-@@ -214,18 +211,21 @@
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  mv $$lang.po $$lang.old.po; \
-+	  cp $$lang.po $$lang.old.po; \
- 	  echo "$$lang:"; \
--	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
--	    rm -f $$lang.old.po; \
-+	  if $(MSGMERGE) $$lang; then \
-+	  rm -f $$lang.old.po; \
- 	  else \
- 	    echo "msgmerge for $$cat failed!"; \
--	    rm -f $$lang.po; \
- 	    mv $$lang.old.po $$lang.po; \
- 	  fi; \
- 	done
- 
--POTFILES: POTFILES.in
-+.headerlock:
-+	$(GENHEAD)
-+	touch .headerlock
-+
-+POTFILES: POTFILES.in .headerlock
- 	( if test 'x$(srcdir)' != 'x.'; then \
- 	    posrcprefix='$(top_srcdir)/'; \
- 	  else \
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 3e43cb3fd4..0000000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,207 +0,0 @@
-addressbook/backend/ebook/e-card-simple.c
-addressbook/backend/ebook/e-card.c
-addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
-addressbook/backend/ebook/load-gnomecard-addressbook.c
-addressbook/backend/ebook/load-pine-addressbook.c
-addressbook/backend/ebook/test-client-list.c
-addressbook/backend/ebook/test-client.c
-addressbook/conduit/address-conduit-control-applet.c
-addressbook/conduit/address-conduit.c
-addressbook/conduit/e-address-conduit-control-applet.desktop.in
-addressbook/contact-editor/contact-editor.glade
-addressbook/contact-editor/e-contact-editor-confirm-delete.glade
-addressbook/contact-editor/e-contact-editor.c
-addressbook/contact-editor/fulladdr.glade
-addressbook/contact-editor/fullname.glade
-addressbook/gui/component/addressbook-factory.c
-addressbook/gui/component/addressbook.c
-addressbook/gui/component/addressbook-storage.c
-addressbook/gui/component/addressbook-config.c
-addressbook/gui/component/addressbook-config.glade
-addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
-addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
-addressbook/gui/component/select-names/select-names.glade
-addressbook/gui/search/e-addressbook-search-dialog.c
-addressbook/gui/widgets/alphabet.glade
-addressbook/gui/widgets/e-addressbook-view.c
-addressbook/gui/widgets/e-minicard-control.c
-addressbook/gui/widgets/e-minicard-view.c
-addressbook/gui/widgets/e-minicard.c
-addressbook/printing/e-contact-print.glade
-calendar/cal-util/timeutil.c
-calendar/conduits/calendar/calendar-conduit-control-applet.c
-calendar/conduits/calendar/calendar-conduit.c
-calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
-calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
-calendar/conduits/todo/todo-conduit-control-applet.c
-calendar/conduits/todo/todo-conduit.c
-calendar/gui/alarm-notify.c
-calendar/gui/calendar-commands.c
-calendar/gui/calendar-model.c
-calendar/gui/calendar-summary.c
-calendar/gui/control-factory.c
-calendar/gui/dialogs/alarm-notify-dialog.c
-calendar/gui/dialogs/alarm-notify.glade
-calendar/gui/dialogs/cal-prefs-dialog.glade
-calendar/gui/dialogs/delete-comp.c
-calendar/gui/dialogs/save-comp.c
-calendar/gui/dialogs/task-editor-dialog.glade
-calendar/gui/dialogs/task-editor.c
-calendar/gui/e-calendar-table.c
-calendar/gui/e-day-view-time-item.c
-calendar/gui/e-day-view-top-item.c
-calendar/gui/e-day-view.c
-calendar/gui/e-itip-control.c
-calendar/gui/e-itip-control.glade
-calendar/gui/e-meeting-dialog.glade
-calendar/gui/e-tasks.c
-calendar/gui/e-week-view-main-item.c
-calendar/gui/e-week-view.c
-calendar/gui/event-editor-dialog.glade
-calendar/gui/event-editor.c
-calendar/gui/GNOME_Evolution_Calendar.oaf.in
-calendar/gui/gnome-cal.c
-calendar/gui/goto.c
-calendar/gui/goto-dialog.glade
-calendar/gui/main.c
-calendar/gui/popup-menu.c
-calendar/gui/print.c
-calendar/gui/tasks-control.c
-calendar/gui/weekday-picker.c
-camel/camel-filter-driver.c
-camel/camel-filter-search.c
-camel/camel-folder-search.c
-camel/camel-lock.c
-camel/camel-movemail.c
-camel/camel-provider.c
-camel/camel-remote-store.c
-camel/camel-sasl-anonymous.c
-camel/camel-sasl-cram-md5.c
-camel/camel-sasl-kerberos4.c
-camel/camel-sasl-plain.c
-camel/camel-search-private.c
-camel/camel-service.c
-camel/camel-session.c
-camel/camel-url.c
-camel/providers/imap/camel-imap-command.c
-camel/providers/imap/camel-imap-folder.c
-camel/providers/imap/camel-imap-provider.c
-camel/providers/imap/camel-imap-store.c
-camel/providers/local/camel-local-provider.c
-camel/providers/local/camel-local-store.c
-camel/providers/local/camel-maildir-folder.c
-camel/providers/local/camel-maildir-store.c
-camel/providers/local/camel-mbox-folder.c
-camel/providers/local/camel-mbox-store.c
-camel/providers/local/camel-mbox-summary.c
-camel/providers/local/camel-mh-folder.c
-camel/providers/local/camel-mh-store.c
-camel/providers/nntp/camel-nntp-auth.c
-camel/providers/nntp/camel-nntp-folder.c
-camel/providers/nntp/camel-nntp-grouplist.c
-camel/providers/nntp/camel-nntp-provider.c
-camel/providers/nntp/camel-nntp-store.c
-camel/providers/pop3/camel-pop3-folder.c
-camel/providers/pop3/camel-pop3-provider.c
-camel/providers/pop3/camel-pop3-store.c
-camel/providers/sendmail/camel-sendmail-provider.c
-camel/providers/sendmail/camel-sendmail-transport.c
-camel/providers/smtp/camel-smtp-provider.c
-camel/providers/smtp/camel-smtp-transport.c
-composer/e-msg-composer-attachment-bar.c
-composer/e-msg-composer-attachment.c
-composer/e-msg-composer-attachment.glade
-composer/e-msg-composer-hdrs.c
-composer/e-msg-composer.c
-composer/evolution-composer.c
-data/evolution.keys.in
-executive-summary/GNOME_Evolution_Summary.oaf.in
-executive-summary/component/component-factory.c
-executive-summary/component/e-summary-callbacks.c
-executive-summary/component/e-summary-url.c
-executive-summary/component/e-summary.c
-executive-summary/component/executive-summary-config.glade
-executive-summary/component/main.c
-executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
-executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
-executive-summary/test-service/rdf-summary.c
-filter/filter-datespec.c
-filter/filter-editor.c
-filter/filter-filter.c
-filter/filter-folder.c
-filter/filter-input.c
-filter/filter-option.c
-filter/filter-part.c
-filter/filter-rule.c
-filter/filter-system-flag.c
-filter/filter.glade
-filter/libfilter-i18n.h
-filter/score-editor.c
-filter/score-rule.c
-filter/vfolder-editor.c
-filter/vfolder-rule.c
-mail/component-factory.c
-mail/folder-browser-factory.c
-mail/folder-browser.c
-mail/GNOME_Evolution_Mail.oaf.in
-mail/local-config.glade
-mail/mail-accounts.c
-mail/mail-account-editor.c
-mail/mail-autofilter.c
-mail/mail-callbacks.c
-mail/mail-config.c
-mail/mail-config.glade
-mail/mail-config-druid.c
-mail/mail-crypto.c
-mail/mail-display.c
-mail/mail-format.c
-mail/mail-local.c
-mail/mail-mt.c
-mail/mail-ops.c
-mail/mail-search-dialogue.c
-mail/mail-send-recv.c
-mail/mail-summary.c
-mail/mail-tools.c
-mail/mail-vfolder.c
-mail/mail-view.c
-mail/message-list.c
-mail/openpgp-utils.c
-mail/subscribe-dialog.c
-shell/glade/e-shell-folder-creation-dialog.glade
-shell/importer/importer.c
-shell/importer/import.glade
-shell/e-setup.c
-shell/e-shell-folder-creation-dialog.c
-shell/e-shell-folder-selection-dialog.c
-shell/e-shell-folder-title-bar.c
-shell/e-shell-view-menu.c
-shell/e-shell-view.c
-shell/e-shell.c
-shell/e-shortcuts-view.c
-shell/e-shortcuts.c
-shell/e-storage-set-view.c
-shell/e-storage.c
-shell/GNOME_Evolution_Shell.oaf.in
-shell/main.c
-ui/evolution-addressbook.xml
-ui/evolution-calendar.xml
-ui/evolution-contact-editor.xml
-ui/evolution-event-editor.xml
-ui/evolution-executive-summary.xml
-ui/evolution-mail.xml
-ui/evolution-message-composer.xml
-ui/evolution-subscribe.xml
-ui/evolution-task-editor-dialog.xml
-ui/evolution-tasks.xml
-ui/evolution.xml
-widgets/meeting-time-sel/e-meeting-time-sel-item.c
-widgets/meeting-time-sel/e-meeting-time-sel.c
-widgets/misc/e-calendar-item.c
-widgets/misc/e-calendar.c
-widgets/misc/e-clipped-label.c
-widgets/misc/e-dateedit.c
-widgets/misc/e-messagebox.c
-widgets/misc/e-search-bar.c
-wombat/GNOME_Evolution_Wombat.oaf.in
-wombat/wombat.c
-evolution.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
deleted file mode 100644
index cedd793894..0000000000
--- a/po/POTFILES.skip
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/ui-tests/store_listing.glade
-addressbook/gui/component/select-names/recipient.glade
-addressbook/gui/widgets/test-minicard-view.c
-calendar/gui/alarm-notify.c
-calendar/gui/getdate.c
-calendar/gui/alarm-notify/alarm-queue.c
-calendar/gui/alarm-notify/notify-main.c
-camel/providers/local/camel-mbox-provider.c
-cmdline/compose.c
-notes/component-factory.c
-notes/main.c
-tests/ui-tests/message-browser.c
diff --git a/po/ca.po b/po/ca.po
deleted file mode 100644
index f838bae090..0000000000
--- a/po/ca.po
+++ /dev/null
@@ -1,7539 +0,0 @@
-# evolution translation to Catalan.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Softcatalà <info@softcatala.org>, 2000.
-#
-# Traducció per Softcatalà <linux@softcatala.org>
-# Traductor original: Víctor Nieto <vnie2025@alu-etsetb.upc.es>
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-11-01 00:40+0100\n"
-"Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
-"Language-Team: Catalan <linux@softcatala.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-#, fuzzy
-msgid "UNIX mbox-format mail files"
-msgstr "Fitxers de correu en format mbox d'UNIX"
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-"Per llegir el correu lliurat al sistema local i per emmagatzemar correu en "
-"el disc local."
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "L'ordinador central %s no existeix."
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "S'està recollint el correu des de %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Tanca"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mou a la carpeta"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Vés a l'element anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Vés a l'element següent"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configura la carpeta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Cap error"
-
-#: mail/mail-config.c:799
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Connexió de prova a \"%s\""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Nou"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Crea un nou contacte"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-#, fuzzy
-msgid "Card: "
-msgstr "Cotxe"
-
-#: addressbook/backend/ebook/e-card.c:3051
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Nom:"
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-#, fuzzy
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "_Sufix:"
-
-#: addressbook/backend/ebook/e-card.c:3070
-#, fuzzy
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "Data d'ini_ci:"
-
-#: addressbook/backend/ebook/e-card.c:3081
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "_Adreça:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-#, fuzzy
-msgid ""
-"\n"
-"  Country:     "
-msgstr "Paí_s:"
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "Adreça electrònica 2"
-
-#: addressbook/backend/ebook/e-card.c:3144
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "Adreça electrònica 2"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-#, fuzzy
-msgid ""
-"\n"
-"Business Role: "
-msgstr "Feina 2"
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-#, fuzzy
-msgid ""
-"\n"
-"  Name:  "
-msgstr "Nom:"
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-#, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "categories"
-
-#: addressbook/backend/ebook/e-card.c:3203
-#, fuzzy
-msgid ""
-"\n"
-"Comment: "
-msgstr "Comentaris sobre l'element:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-#, fuzzy
-msgid ""
-"\n"
-"Public Key: "
-msgstr "Públic"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Inhabilitat"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronitza"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copia des del Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copia al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Fusiona des del Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Fusiona cap al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 la Free Software Foundation i Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-"Utilitat de configuració per al conducte de la llibreta d'adreces de "
-"l'Evolution\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sincronitza l'acció"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estat del conducte"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"No s'ha configurat cap Pilot, escolliu primer el\n"
-"capplet 'Pilot Link Properties'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Sense connexió al dimoni gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"S'ha produït un error en intentar recollir\n"
-"la llista del Pilot del dimoni gnome-pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "No s'ha pogut iniciar el servidor wombat"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "No s'ha pogut iniciar el wombat"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Afegeix"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Suprimeix"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipus de telèfon"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Nou tipus de telèfon"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Afegeix"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Contacta l'editor"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nom _complet..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Arxiva com:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Adreça de pàgina web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Vol rebre correu _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Feina"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Particular"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Fax de la feina"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Mòbil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Adreça electrònica principal"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "F_eina"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Aquesta és l'adreça de correu"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactes..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Càrrec:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Empresa:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adreça..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "General"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departament:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Oficina"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Professió:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Sobrenom:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_Cònjuge:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Data de naixement:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Nom de l'assistent:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "_Nom del gestor:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versari:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tes:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detalls"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Feina"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Feina 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Fax de la feina"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Crida de retorn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Cotxe"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Empresa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Fax particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "XDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Mòbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Altres"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Un altre fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Busca"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "Primari"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Ràdio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Tèlex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "Adreça electrònica 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Adreça electrònica 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Comprova el nom complet"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Dr.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Primer:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Títol:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Mig:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Últim:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Sufix:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Com a _Minicards"
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Com a _taula"
-
-#: addressbook/gui/component/addressbook.c:374
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:407
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Ha estat impossible obrir aquesta llibreta d'adreces.\n"
-"Això pot ser perquè, o bé heu introduït un URI incorrecte,\n"
-"o bé heu intentat accedir a un servidor LDAP sense tenir\n"
-"compilat el suport per a LDAP. Si heu introduït un URI,\n"
-"comproveu que sigui correcte i torneu-lo a introduir. Altrament,\n"
-"segurament heu intentat accedir a un servidor LDAP. Si\n"
-"voleu poder utilitzar LDAP, necessitareu descarregar i instal·lar\n"
-"l'OpenLDAP i recompilar i instal·lar l'Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-#, fuzzy
-msgid "Show All"
-msgstr "Mostra"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-#, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
-#: addressbook/gui/component/addressbook.c:562
-#, fuzzy
-msgid "Any field contains"
-msgstr "El cos conté"
-
-#: addressbook/gui/component/addressbook.c:563
-#, fuzzy
-msgid "Name contains"
-msgstr "conté"
-
-#: addressbook/gui/component/addressbook.c:564
-#, fuzzy
-msgid "Email contains"
-msgstr "conté"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrarà el navegador de carpetes"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Fitxer"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Contrasenya"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Error desconegut"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Enganxa"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Subscriu-me"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "Hores"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Prioritat:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "DN arrel:"
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Cerca"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Autenticació:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Camí:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Aquest fitxer no existeix."
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Nom:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Descripció:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Cerca"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Desa com a VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "Adreça electrònica 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organització"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "_Departament:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "_Oficina"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Títol:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "_Professió:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Busca"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "_Sobrenom:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "_Cònjuge:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Cap"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"No hi ha elements per mostrar en aquesta vista\n"
-"\n"
-"Feu doble clic aquí per crear un nou contacte."
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "Error en comunicar-se amb el servidor d'agenda"
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-"Utilitat de configuració per al conducte de les coses per fer de "
-"l'Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr "No s'ha pogut llegir el bloc d'aplicació de coses per fer del Pilot"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Recordatori de la vostra cita a "
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "'Snooze'"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "D'acord"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "No s'ha trobat el fitxer"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Obre l'agenda"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Desa l'agenda"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr "Públic"
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr "Transparent"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr "Opac"
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La data s'ha d'introduir amb el format: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posició geogràfica s'ha d'introduir amb el format: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdós inclosos"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "La prioritat ha d'estar entre 1 i 9, ambdós inclosos"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "Error en carregar el fitxer: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "_Visualització"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Mostra les hores d'acabament de les cites"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "Mostra les _adjuncions"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimeix l'agenda"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrarà l'agenda"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificació sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "No hi ha cap resum disponible."
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-#, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-#, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "Edita la tasca"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Sense resum"
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "Tasca - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada al diari - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Classificació"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "Completat"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _finalització:"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Data d'ini_ci:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Data de venciment"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Marca la tasca com a completa"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritat"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "R_esum"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "Transparent"
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "_Obre..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Obre la tasca"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Marca com a completa"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Marca la tasca com a completa"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Suprimeix la tasca"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minut"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Nova cita..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Edita aquesta cita..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "Suprimeix aquesta cita"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Fes aquesta cita movible"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr "Suprimeix-ne aquesta aparició"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr "categories"
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No s'ha pogut carregar l'agenda en `%s'"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "El mètode necessari per carregar `%s' no està suportat"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Edita una cita"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr "el"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Dilluns"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Dijous"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Divendres"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "mes"
-
-#: calendar/gui/event-editor.c:568
-#, fuzzy
-msgid "th"
-msgstr "4"
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "aparicions"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"No s'ha pogut obrir la carpeta `%s':\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, fuzzy, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "El mètode necessari per carregar `%s' no està suportat"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "dg."
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "dl."
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "dm."
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "dc."
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "dj."
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "dv."
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "ds."
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "Dg"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "Dl"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "Dm"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "Dc"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "Dj"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "Dv"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "Ds"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Tasques"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "Avui (%a, %d de %b de %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Aquesta setmana (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr "Aquest mes (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Enguany (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Imprimeix l'agenda"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Previsualització d'impressió"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "La URI que mostrarà l'agenda"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-#, fuzzy
-msgid "SMTWTFS"
-msgstr "DDDDDDD"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"S'ha excedit el temps màxim en intentar recuperar el fitxer de blocatge en "
-"%s. Torneu-ho a provar més tard."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error en escriure el fitxer temporal de correu: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "No s'ha pogut bifurcar: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "El programa Movemail ha fallat: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Error desconegut)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "No s'ha pogut carregar %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-"No s'ha pogut carregar %s: el mòdul no conté cap codi d'inicialització."
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "Servidor %s %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "Servei %s per a %s en %s"
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Cancel·lat"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "No s'ha pogut connectar a %s (port %d): %s"
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(ordinador central desconegut)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Obre l'agenda"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "L'URL '%s' necessita un component de nom d'usuari"
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "L'URL '%s' necessita un component d'ordinador central"
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "L'URL '%s' necessita un component de camí"
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr "L'ordinador central %s no existeix."
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "No hi ha cap proveïdor disponible per al protocol `%s'"
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el directori %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La cadena d'URL `%s' no conté cap protocol"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La cadena d'URL `%s' conté un protocol incorrecte"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "El número de port de l'URL `%s' no és numèric"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "L'ordre IMAP ha fallat: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Error desconegut"
-
-#: camel/providers/imap/camel-imap-command.c:297
-#, fuzzy
-msgid "Server response ended too soon."
-msgstr "La resposta del servidor IMAP no contenia la informació %s"
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "La resposta del servidor IMAP no contenia la informació %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "No s'ha pogut carregar el resum per a %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
-"text net."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-#, fuzzy
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
-"autenticar-vos-hi."
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "No s'ha pogut crear el directori %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "Directoris de correu en format MH d'UNIX"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-#, fuzzy
-msgid "For storing local mail in standard mbox format"
-msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-#, fuzzy
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "`%s' no és un fitxer habitual."
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-#, fuzzy
-msgid "Local folders may not be nested."
-msgstr "Les carpetes Mbox no es poden imbricar."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Fitxer de correu local %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "L'ordinador central %s no existeix."
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "La carpeta `%s' no existeix."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, fuzzy, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' no és un directori."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-#, fuzzy
-msgid "not a maildir directory"
-msgstr "Directori de correu local %s"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "No es pot obrir la bústia de correu temporal: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, fuzzy, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "No es pot afegir el missatge al fitxer mbox: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el fitxer `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' no és un fitxer habitual."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut suprimir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "La carpeta `%s' no és buida. No s'ha suprimit."
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"No s'ha pogut obrir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "No es pot obrir la bústia de correu temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-#, fuzzy
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Incongruència del resum, s'està interrompent la sincronització"
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error en escriure a la bústia de correu temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, fuzzy, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Error en escriure a la bústia de correu temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "No s'ha pogut tancar la carpeta font %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "No es pot tancar la carpeta temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Error desconegut: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' no és un directori."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "El servidor ha rebutjat el nom d'usuari"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "No s'ha trobat el missatge %s."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "Notícies d'USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Proveïdor per llegir i publicar als grups de notícies d'USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "No s'ha pogut obrir el directori per al servidor de notícies: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "Notícies d'USENET mitjançant %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Aquesta opció us autentica al servidor NNTP mitjançant una contrasenya en "
-"text net"
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "No hi ha cap missatge amb l'uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Per connectar als servidors POP. El protocol POP també es pot utilitzar per "
-"recuperar correu des de determinats proveïdors de correu web i sistemes "
-"propietaris de correu."
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Aquesta opció us connectarà al sevidor POP mitjançant una contrasenya en "
-"text net. És l'única suportada per molts servidors POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Aquesta opció us connectarà al servidor POP utilitzant una contrasenya "
-"xifrada mitjançant el protocol APOP. Això no funcionarà per a tots els "
-"usuaris, fins i tot en servidors que diuen que ho suporten."
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
-"autenticar-vos-hi."
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sSi us plau, introduïu la contrasenya POP3 per a %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"No es pot connectar al servidor POP.\n"
-"Error en enviar el nom d'usuari: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(Desconegut)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"No es pot connectar al servidor POP.\n"
-"No hi ha suport per al mecanisme d'autenticació sol·licitat."
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"No es pot connectar al servidor POP.\n"
-"Error en enviar la contrasenya: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "La carpeta `%s' no existeix."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Per lliurar correu transferint-lo al programa \"sendmail\" en el sistema "
-"local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "No s'ha pogut enviar el missatge: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Lliurament de correu mitjançant el programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-#, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-"Per al lliurament de correu mitjançant la connexió a un concentrador de "
-"correu utilitzant SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticació:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Aquesta opció us connectarà al sevidor POP mitjançant una contrasenya en "
-"text net. És l'única suportada per molts servidors POP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
-"autenticar-vos-hi."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, fuzzy, c-format
-msgid "SMTP server %s"
-msgstr "Servidor %s %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, fuzzy, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Lliurament de correu mitjançant el programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-"No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, fuzzy, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, fuzzy, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Error desconegut: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Proveïdor de correu de la carpeta virtual"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 octet"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u octets"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "adjunció"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Adjunta un fitxer"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Elimina"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Afegeix una adjunció..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Adjunta un fitxer al missatge"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "De:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Feu clic aquí per a la llibreta d'adreces"
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduïu la identitat amb la qual voleu enviar aquest missatge"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Per a:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "Introduïu els destinataris del missatge"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Întroduïu les adreces que rebran una còpia del missatge"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
-"llista de destinataris del missatge."
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduïu l'assumpte del correu"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer de signatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Anomena i desa..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Error en desar el fitxer: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Error en carregar el fitxer: %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "S'estan desant els canvis al missatge..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Desa els canvis al missatge..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Error en desar la redacció a 'Esborranys': %s"
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Aquest missatge no s'ha enviat.\n"
-"\n"
-"Voleu desar-ne els canvis?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Obre un fitxer"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "Aquest fitxer no existeix."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "Aquest fitxer no és habitual."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr "Aquest fitxer existeix però no es pot llegir."
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Aquest fitxer sembla accessible però n'ha fallat l'obertura(2)."
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"El fitxer és molt gran (més de 100 kB).\n"
-"Segur que voleu inserir-lo?"
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "S'ha produït un error en llegir el fitxer."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Redacta un missatge"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr "No s'ha pogut crear la finestra del redactor."
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "any"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "anys"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mesos"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "setmana"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "setmanes"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dies"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "hores"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minut"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuts"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "segon"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "segons"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La data del missatge es compararà amb l'hora,\n"
-"sigui quina sigui, en què s'executi el filtre\n"
-"o s'obri la vfolder."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La data del missatge es compararà amb l'hora\n"
-"que indiqueu aquí."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La data del missatge es compararà amb una hora\n"
-"relativa a quan s'executi el filtre;\n"
-"\"fa una setmana\", per exemple."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "l'hora actual"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "una hora que indiqueu"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "una hora relativa a l'actual"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Compara-la amb"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "ara"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<feu clic aquí per seleccionar una data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Afegeix una regla de filtre"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Edita una regla de filtre"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-#, fuzzy
-msgid "outgoing"
-msgstr "Agrupament"
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Filtres d'edició"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "Aleshores"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Afegeix una acció"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "Elimina una acció"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Seleccioneu una carpeta"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Introduïu l'URI de la carpeta"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<feu clic aquí per seleccionar una carpeta>"
-
-#: filter/filter-input.c:185
-#, fuzzy, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Comprova"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nom de la regla: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Sense títol"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Executa les accions"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "si es compleixen tots els criteris"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "si es compleix qualsevol criteri"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Afegeix un criteri"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Elimina un criteri"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Respon a tots"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Ràdio"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Assigna un color"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Assigna una puntuació"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copia a la carpeta"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recepció"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data d'enviament"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expressió"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adreça"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Cos del missatge"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Cos del missatge"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "S'ha rebut el missatge"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "S'ha enviat el missatge"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mou a la carpeta"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinataris"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Puntuació"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remitent"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "Estat de la connexió"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Font"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Especifiqueu la capçalera"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Atura el processament"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assumpte"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "després de"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "abans de"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "conté"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "no conté"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "no comença per"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "acaba amb"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "és més petit que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "no és"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "és"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "el o després del"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "el o abans del"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "comença per"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "ha estat després de"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "ha estat abans de"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Afegeix una regla"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Edita la regla de puntuació"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Afegeix una regla de la VFolder"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Edita una regla de la VFolder"
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Seleccioneu una carpeta"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "El cos o l'assumpte contenen"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "El cos conté"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "L'assumpte conté"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "El cos no conté"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "L'assumpte no conté"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr "VFolder sobre l'assumpte"
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr "VFolder sobre el remitent"
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr "VFolder sobre els destinataris"
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr "Filtre sobre l'assumpte"
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr "Filtre sobre el remitent"
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr "Filtre sobre els destinataris"
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr "Filtre sobre la llista de correu"
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Obre"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Edita"
-
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Save As..."
-msgstr "Anomena i desa..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Imprimeix"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "Respon al remitent"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Respon a tots"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Reenvia"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Vés endavant en el temps"
-
-#: mail/folder-browser.c:668
-#, fuzzy
-msgid "Mark as Read"
-msgstr "Mar_ca'l com a llegit"
-
-#: mail/folder-browser.c:669
-#, fuzzy
-msgid "Mark as Unread"
-msgstr "Marca'l com a per _llegir"
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "Mou a la carpeta"
-
-#: mail/folder-browser.c:672
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "Copia a la carpeta"
-
-#: mail/folder-browser.c:674
-#, fuzzy
-msgid "Undelete"
-msgstr "Suprimeix"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-#, fuzzy
-msgid "Apply Filters"
-msgstr "_Aplica els filtres"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Cap"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Valors predeterminats"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Correu per a %s"
-
-#: mail/mail-autofilter.c:214
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Assumpte"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Correu de %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "Llista de correu %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"No heu configurat el client de correu.\n"
-"Cal que ho feu abans de poder enviar,\n"
-"rebre o redactar correu.\n"
-"El voleu configurar ara?"
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Cal que configureu un transport de correu\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr "No heu definit cap mètode de transport de correu"
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "No teniu configurada cap bústia de sortida"
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Aquest missatge no té cap assumpte.\n"
-"Voleu que l'enviï igualment?"
-
-#: mail/mail-callbacks.c:345
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Missatge reenviat - %s"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr "Mou el(s) missatge(s) cap a"
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr "Copia el(s) missatge(s) a"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Només podeu editar els missatges que s'hagin desat\n"
-"a la carpeta Esborranys."
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
-
-#: mail/mail-callbacks.c:893
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-callbacks.c:895
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Error en carregar la informació del filtre:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "Imprimeix el missatge"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "Ha fallat la impressió del missatge"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "No s'han pogut escriure les dades: %s"
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "Desa l'adjunció"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr "Desa al disc..."
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr "Obre a %s..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr "Visualitza en línia"
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr "Visualitzador extern"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Visualitza en línia (mitjançant %s)"
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Amaga"
-
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "adjunció"
-
-#: mail/mail-format.c:626
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
-
-#: mail/mail-format.c:856
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Esborra la visualització del missatge"
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Edita el missatge"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, fuzzy, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "S'està convertint la carpeta \"%s\" al format \"%s\""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Canvia la carpeta \"%s\" al format \"%s\""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Configura la carpeta"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "S'està tancant la carpeta actual"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "S'està canviant el nom de la carpeta antiga i obrint-la"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Creació d'una nova carpeta"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Còpia de missatges"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"No es pot desar la informació meta de la carpeta; probablement\n"
-"no la podreu tornar a obrir: %s"
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Si ja no podeu obrir aquesta bústia de correu\n"
-"potser us caldrà reparar-la manualment."
-
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "Creació d'una nova carpeta"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Crea una carpeta nova"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
-#: mail/mail-mt.c:85
-#, fuzzy, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Error en `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "S'està movent"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "S'està recollint el correu des de %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Recull el correu des de %s"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr "No hi ha nou correu a %s."
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr "S'està filtrant el correu sota demanda"
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr "Filtra el correu sota demanda"
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "S'està enviant \"%s\""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Envia aquest missatge"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "S'està enviant la cua"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr "Envia la cua"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr "S'està afegint \"%s\""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr "S'està afegint un missatge sense cap assumpte"
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "S'estan movent els missatges des de \"%s\" cap a \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "S'estan copiant els missatges des de \"%s\" cap a \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mou els missatges des de \"%s\" cap a \"%s\""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "S'està movent"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "S'està copiant"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Sense descripció)"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Missatge reenviat - %s"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "S'està sincronitzant \"%s\""
-
-#: mail/mail-ops.c:1401
-#, fuzzy
-msgid "Expunging folder"
-msgstr "S'està esborrant \"%s\""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "S'estan recuperant els missatges : %s"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "S'estan recuperant els missatges : %s"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "S'està recuperant el missatge número %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "S'està carregant la carpeta %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Carrega la carpeta %s"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Còpia de missatges"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "S'està recuperant el missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "Error en desar el fitxer: %s"
-
-#: mail/mail-search-dialogue.c:104
-#, fuzzy
-msgid "Cancel"
-msgstr "Cancel·lat"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "S'ha escrit un missatge incomplet al conducte!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Error en `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "S'ha produït un error en llegir les ordres de la cadena cursada."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Missatge malmés de la cadena cursada?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "Consulta cancel·lada per l'usuari."
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "S'està examinant %s"
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-"No s'ha pogut llegir el fitxer de la memòria cau UID \"%s\". És possible que "
-"rebeu missatges duplicats."
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "S'està recuperant el missatge %d de %d"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "S'està escrivint el missatge %d de %d"
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "S'estan desant els canvis a %s"
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (missatge reenviat)"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr "Re: (sense assumpte)"
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Missatge reenviat - %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "Missatge reenviat (sense assumpte)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"No es pot obrir la ubicació `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr "VFolders"
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "Nova VFolder"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Respon"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "Respon al remitent d'aquest missatge"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Respon a tots els destinataris d'aquest missatge"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "Reenvia aquest missatge"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "Imprimeix el missatge seleccionat"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "Suprimeix aquest missatge"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr "No vist"
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr "Vist"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr "Respost"
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "Desconegut"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%a %d %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "adjunció"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "De:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Data de venciment"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Data de recepció"
-
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Per a"
-
-#: mail/message-list.c:1111
-msgid "Size"
-msgstr "Mida"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
-
-#: mail/openpgp-utils.c:81
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr "No s'ha indicat cap contrasenya."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Carpetes"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Puntuació"
-
-#: mail/subscribe-dialog.c:145
-#, fuzzy
-msgid "Display folders starting with:"
-msgstr "Visualitza les carpetes que continguin:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, fuzzy, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/subscribe-dialog.c:293
-#, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:297
-#, fuzzy, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Escaneja les carpetes de \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instal·lació de l'Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Aquesta nova versió de l'Evolution necessita instal·lar fitxers addicionals\n"
-"al directori personal on teniu l'Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Si us plau, feu clic a \"D'acord\" per instal·lar els fitxers, o a "
-"\"Cancel·la\" per sortir."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "No s'han pogut actualitzar correctament els fitxers"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Els fitxers de l'Evolution s'han instal·lat amb èxit."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Sembla que aquesta és la primera vegada que executeu l'Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Si us plau, feu clic a \"D'acord\" per instal·lar els fitxers d'usuari\n"
-"de l''Evolution a"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"No es pot crear el directori\n"
-"%s\n"
-"Error: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"No es poden copiar els fitxers a\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"El fitxer `%s' no és un directori.\n"
-"Si us plau, moveu-lo per permetre la instal·lació\n"
-"dels fitxers d'usuari de l'Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"El directori `%s' existeix, però no és el directori\n"
-"de l'Evolution. Si us plau, moveu-lo per permetre\n"
-"la instal·lació dels fitxers d'usuari de l'Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"No es pot crear la carpeta indicada:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "El nom de carpeta indicat no és vàlid."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crea una nova carpeta"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"El tipus de la carpeta seleccionada no és vàlid per a\n"
-"l'operació sol·licitada."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Nou..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sense títol)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "No es pot executar el Bug Buddy."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"L'Evolution és un conjunt d'aplicacions de treball en grup\n"
-"per a correu, agenda i gestió de contactes\n"
-"dins de l'entorn d'escriptori GNOME."
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr "Vés a la carpeta..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr "(Cap carpeta mostrada)"
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Carpetes"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No es pot configurar l'emmagatzemament local -- %s"
-
-#: shell/e-shell.c:1212
-#, fuzzy, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ep!  La visualització de `%s' s'ha mort inesperadament.  :-(\n"
-"Això segurament vol dir que el component %s ha petat."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Crea un nou grup de dreceres"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nom del grup:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Esteu segur que voleu eliminar el grup\n"
-"`%s' de la barra de dreceres?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "No l'eliminis"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Icones _petites"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Mostra les dreceres com a icones petites"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Icones _grans"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Mostra les dreceres com a icones grans"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nou grup..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Crea un nou grup de dreceres"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Elimina aquest grup..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Elimina aquest grup de dreceres"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Mostra la barra de _dreceres"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Mostra la barra de _dreceres"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activa"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activa aquesta drecera"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Elimina aquesta drecera de la barra de dreceres"
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr "Error en desar les dreceres."
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Visualitza"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Visualitza la carpeta seleccionada"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(Sense nom)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "Cap error"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "Error genèric"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr "Ja existeix una carpeta amb el mateix nom"
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr "El tipus de carpeta especificat no és vàlid"
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "Error d'E/S"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "No hi ha espai suficient per crear la carpeta"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "No s'ha trobat la carpeta indicada"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr "Funció no implementada en aquest emmagatzemament"
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Permís denegat"
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr "Operació no suportada"
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
-
-#: shell/main.c:74
-#, fuzzy
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hola! Gràcies per prendre-us la molèstia de baixar-vos aquesta versió\n"
-"provisional del conjunt de programes de grup de treball Evolution.\n"
-"Més o menys durant el darrer mes i mig ens hem concentrat en fer que\n"
-"l'Evolution es pugui utilitzar. Molts dels seus desenvolupadors ja estan\n"
-"utilitzant-lo per llegir sempre el seu correu, així que també ho podeu fer\n"
-"(però feu còpies de seguretat per si un cas!).\n"
-"\n"
-"Però, encara que hem solucionat molts problemes que afectaven a "
-"l'estabilitat\n"
-"de l'Evolution, aquí teniu encara el descàrrec. L'Evolution pot: deixar de\n"
-"funcionar, perdre el correu que no voleu perdre, negar-se a suprimir el "
-"correu\n"
-"que voleu suprimir, deixar processos en marxa per tot arreu, consumir el "
-"100%\n"
-"de la CPU, anar massa de pressa, blocar-se, enviar correu HTML a llistes de\n"
-"correu a l'atzar, i deixar-vos en ridícul davant dels vostres amics i "
-"companys\n"
-"de feina. Utilitzeu-lo només sota un control estricte.\n"
-"\n"
-"Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
-"ansiosament les vostres contribucions!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Gràcies\n"
-"L'equip de l'Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
-
-#: shell/main.c:178
-#, fuzzy
-msgid "Disable."
-msgstr "Inhabilitat"
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "No es pot inicialitzar el sistema de components del Bonobo."
-
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Cita"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Pe_tició de cita"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Missatge de _correu"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacte"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tasca"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _Petició de tasca"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada al _diari"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Tr_ia el formulari..."
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estil _memo"
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Defineix els e_stils d'impressió..."
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: E_nvia"
-
-#: ui/evolution-contact-editor.xml:35
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Invita els assistents..."
-
-#: ui/evolution-contact-editor.xml:38
-#, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "_Mou a la carpeta"
-
-#: ui/evolution-contact-editor.xml:39
-#, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Tr_ia el formulari..."
-
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Con_figuració de la pàgina"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualització de la impressió"
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Enganxa e_special..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Marca'l com a per _llegir"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objecte"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Element"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Element per _llegir"
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pr_imer element de la carpeta"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Últim element de la carpeta"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: E_stàndard"
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: S'està __formatant"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalitza..."
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "Ant_erior"
-
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr "Se_güent"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Barres d'eines"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _Fitxer..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: El_ement..."
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objecte..."
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Lletra..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Paràgraf..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Diss_enya aquest formulari"
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: D_issenya un formulari..."
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publica el _formulari..."
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blica el formulari com a..."
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de seqüències"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Formularis"
-
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "FIXME: Contacte _nou"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: Nou _contacte de la mateixa empresa"
-
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Nova _carta per contactar"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Nova _carta per contactar"
-
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Nova cit_a amb contacte"
-
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Prepara una cita..."
-
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: Nova _tasca per contactar"
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Nova entrada al _diari per contactar"
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _Assenyala per al seguiment..."
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: _Mostra el mapa de l'adreça"
-
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: _Obre la pàgina web"
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Reenvia com a _vCard"
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: Reen_via"
-
-#: ui/evolution-contact-editor.xml:169
-#, fuzzy
-msgid "_Insert"
-msgstr "_Índex"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Eines"
-
-#: ui/evolution-contact-editor.xml:172
-#, fuzzy
-msgid "Actio_ns"
-msgstr "_Accions"
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr "FIXME: Anterior"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Vés a l'element anterior"
-
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
-msgstr "FIXME: Següent"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Vés a l'element següent"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentatiu"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupat"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora de l'oficina"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Cap informació"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invita a altres..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcions"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostra _només les hores de treball"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Mostra-ho reduint el zoom"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Actualitza lliure/ocupat"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "Tria automàtica"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Totes les persones i recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Totes les persones i un recurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persones _requerides"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persones requerides i _un recurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora d'_inici de la reunió:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _finalització de la reunió:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tots els assistents"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "DDDDDDD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Ara"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Avui"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "Cerca"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grup %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Voleu suprimir el contacte?"
-
-#~ msgid "Address _2:"
-#~ msgstr "Adreça _2:"
-
-#~ msgid "Canada"
-#~ msgstr "Canadà"
-
-#~ msgid "Check Address"
-#~ msgstr "Comprova l'adreça"
-
-#~ msgid "Countr_y:"
-#~ msgstr "Paí_s:"
-
-#~ msgid "Finland"
-#~ msgstr "Finlàndia"
-
-#~ msgid "USA"
-#~ msgstr "EUA"
-
-#~ msgid "_Address:"
-#~ msgstr "_Adreça:"
-
-#~ msgid "_City:"
-#~ msgstr "_Població:"
-
-#~ msgid "_PO Box:"
-#~ msgstr "_Apartat de correus:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "_Comarca:"
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Codi postal:"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Afegeix una font"
-
-#~ msgid "Find..."
-#~ msgstr "Cerca..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "Destinataris del missatge"
-
-#~ msgid "Select Names"
-#~ msgstr "Seleccioneu els noms"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Seleccioneu un nom de la llista:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "n"
-#~ msgstr "n"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "r"
-#~ msgstr "r"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
-
-#~ msgid "Blank forms at end:"
-#~ msgstr "Formularis en blanc al final:"
-
-#~ msgid "Body"
-#~ msgstr "Cos"
-
-#~ msgid "Bottom:"
-#~ msgstr "Inferior:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensions:"
-
-#~ msgid "Font..."
-#~ msgstr "Lletra..."
-
-#~ msgid "Fonts"
-#~ msgstr "Lletres"
-
-#~ msgid "Footer:"
-#~ msgstr "Peu de pàgina:"
-
-#~ msgid "Format"
-#~ msgstr "Format"
-
-#~ msgid "Header"
-#~ msgstr "Capçalera"
-
-#~ msgid "Header/Footer"
-#~ msgstr "Capçalera/Peu de pàgina"
-
-#~ msgid "Headings"
-#~ msgstr "Encapçalaments"
-
-#~ msgid "Headings for each letter"
-#~ msgstr "Encapçalaments per a cada carta"
-
-#~ msgid "Height:"
-#~ msgstr "Alçada:"
-
-#~ msgid "Immediately follow each other"
-#~ msgstr "Un segueix immediatament l'altre"
-
-#~ msgid "Include:"
-#~ msgstr "Inclou:"
-
-#~ msgid "Landscape"
-#~ msgstr "Horitzontal"
-
-#~ msgid "Left:"
-#~ msgstr "Esquerra:"
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "Tabuladors de carta al costat"
-
-#~ msgid "Margins"
-#~ msgstr "Marges"
-
-#~ msgid "Number of columns:"
-#~ msgstr "Nombre de columnes:"
-
-#~ msgid "Options"
-#~ msgstr "Opcions"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientació"
-
-#~ msgid "Page"
-#~ msgstr "Pàgina"
-
-#~ msgid "Page Setup:"
-#~ msgstr "Configuració de la pàgina:"
-
-#~ msgid "Paper"
-#~ msgstr "Paper"
-
-#~ msgid "Paper source:"
-#~ msgstr "Font del paper:"
-
-#~ msgid "Portrait"
-#~ msgstr "Vertical"
-
-#~ msgid "Preview:"
-#~ msgstr "Previsualització:"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "Imprimeix usant ombrejat de grisos"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "Inverteix-ho per a les pàgines senars"
-
-#~ msgid "Right:"
-#~ msgstr "Dreta:"
-
-#~ msgid "Sections:"
-#~ msgstr "Seccions:"
-
-#~ msgid "Shading"
-#~ msgstr "Ombrejat"
-
-#~ msgid "Size:"
-#~ msgstr "Mida:"
-
-#~ msgid "Start on a new page"
-#~ msgstr "Comença en una nova pàgina"
-
-#~ msgid "Style name:"
-#~ msgstr "Nom de l'estil:"
-
-#~ msgid "Top:"
-#~ msgstr "Superior:"
-
-#~ msgid "Type:"
-#~ msgstr "Tipus:"
-
-#~ msgid "Width:"
-#~ msgstr "Amplada:"
-
-#~ msgid "label26"
-#~ msgstr "etiqueta26"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr ""
-#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Conducte de l'agenda de l'Evolution"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
-#~ "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#~ msgid "Edit appointment"
-#~ msgstr "Edita una cita"
-
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Durada de l'snooze (minuts)"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 minuts"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 minuts"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 hores (am/pm)"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 minuts"
-
-#~ msgid "24 hour"
-#~ msgstr "24 hores"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 minuts"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 minuts"
-
-#~ msgid "Alarms timeout after"
-#~ msgstr "Les alarmes es desactiven després de"
-
-#~ msgid "Audio Alarms"
-#~ msgstr "Alarmes acústiques"
-
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Fes un so quan aparegui una finestra d'alarma."
-
-#~ msgid "Calendar"
-#~ msgstr "Agenda"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferències de l'agenda"
-
-#~ msgid "Colors"
-#~ msgstr "Colors"
-
-#~ msgid "Compress weekends"
-#~ msgstr "Comprimeix els caps de setmana"
-
-#~ msgid "Date navigator options"
-#~ msgstr "Opcions del navegador de dates"
-
-#~ msgid "Defaults"
-#~ msgstr "Valors predeterminats"
-
-#~ msgid "Display options"
-#~ msgstr "Opcions de visualització"
-
-#~ msgid "Enable snoozing for"
-#~ msgstr "Habilita l'snoozing per a"
-
-#~ msgid "End of day:"
-#~ msgstr "Final del dia:"
-
-#~ msgid "First day of week:"
-#~ msgstr "primer dia de la setmana:"
-
-#~ msgid "Highlight"
-#~ msgstr "Ressalta"
-
-#~ msgid "Items Due Today"
-#~ msgstr "Elemts que vencen avui"
-
-#~ msgid "Items Due Today:"
-#~ msgstr "Elements que vencen avui:"
-
-#~ msgid "Items Not Yet Due"
-#~ msgstr "Elements que encara no han vençut"
-
-#~ msgid "Items Not Yet Due:"
-#~ msgstr "Elements que encara no han vençut:"
-
-#~ msgid "Overdue Items"
-#~ msgstr "Elements vençuts"
-
-#~ msgid "Overdue Items:"
-#~ msgstr "Elements que ja han vençut:"
-
-#~ msgid "Pick a color"
-#~ msgstr "Agafa un color"
-
-#~ msgid "Remind me of all appointments"
-#~ msgstr "Recorda'm totes les cites"
-
-#~ msgid "Reminders"
-#~ msgstr "Recordatoris"
-
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
-#~ msgid "Show week numbers"
-#~ msgstr "Mostra els números de les setmanes"
-
-#~ msgid "Start of day:"
-#~ msgstr "Inici del dia:"
-
-#~ msgid "TaskPad"
-#~ msgstr "TaskPad"
-
-#~ msgid "Time Until Due"
-#~ msgstr "Temps fins al venciment"
-
-#~ msgid "Time divisions:"
-#~ msgstr "Divisions de temps:"
-
-#~ msgid "Time format:"
-#~ msgstr "Format de l'hora:"
-
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes visuals"
-
-#~ msgid "Work week"
-#~ msgstr "Setmana de treball"
-
-#~ msgid "minutes before they occur."
-#~ msgstr "minuts abans que es produeixin."
-
-#~ msgid "seconds."
-#~ msgstr "segons."
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% comp_let:"
-
-#~ msgid "C_lassification:"
-#~ msgstr "C_lassificació:"
-
-#~ msgid "Date Completed:"
-#~ msgstr "Data completa:"
-
-#~ msgid "High"
-#~ msgstr "Alta"
-
-#~ msgid "In Progress"
-#~ msgstr "En procés"
-
-#~ msgid "Low"
-#~ msgstr "Baixa"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Not Started"
-#~ msgstr "No iniciat"
-
-#~ msgid "Task"
-#~ msgstr "Tasca"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactes..."
-
-#~ msgid "_Due Date:"
-#~ msgstr "_Data de venciment:"
-
-#~ msgid "_Priority:"
-#~ msgstr "_Prioritat:"
-
-#~ msgid "_Status:"
-#~ msgstr "_Estat:"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
-
-#~ msgid "A_ll day event"
-#~ msgstr "Esdeveniment per a _tot el dia"
-
-#~ msgid "Appointment Basics"
-#~ msgstr "Temes fonamentals sobre les cites"
-
-#~ msgid "Custom recurrence"
-#~ msgstr "Recurrència personalitzada"
-
-#~ msgid "Days"
-#~ msgstr "Dies"
-
-#~ msgid "Every"
-#~ msgstr "Cada"
-
-#~ msgid "Exceptions"
-#~ msgstr "Excepcions"
-
-#~ msgid "Hours"
-#~ msgstr "Hores"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Envia per correu _a:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuts"
-
-#~ msgid "Modify"
-#~ msgstr "Modifica"
-
-#~ msgid "No recurrence"
-#~ msgstr "Sense recurrència"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Previsualització:"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vat"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Pú_blic"
-
-#~ msgid "Recurrence"
-#~ msgstr "Recurrència"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regla de recurrència"
-
-#~ msgid "Reminder"
-#~ msgstr "Recordatori"
-
-#~ msgid "Simple recurrence"
-#~ msgstr "Recurrència simple"
-
-#~ msgid "Su_mmary:"
-#~ msgstr "Resu_m:"
-
-#~ msgid "Time"
-#~ msgstr "Temps"
-
-#~ msgid "_Audio"
-#~ msgstr "_Àudio"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Confidencial"
-
-#~ msgid "_Mail"
-#~ msgstr "_Correu"
-
-#~ msgid "_Program"
-#~ msgstr "_Programa"
-
-#~ msgid "_Run program:"
-#~ msgstr "_Executa el programa:"
-
-#~ msgid "_Start time:"
-#~ msgstr "Hora d'_inici:"
-
-#~ msgid "_Starting date:"
-#~ msgstr "Data d'_inici:"
-
-#~ msgid "day(s)"
-#~ msgstr "dia(es)"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "for"
-#~ msgstr "per a"
-
-#~ msgid "forever"
-#~ msgstr "per sempre"
-
-#~ msgid "label21"
-#~ msgstr "etiqueta21"
-
-#~ msgid "month(s)"
-#~ msgstr "mes(os)"
-
-#~ msgid "until"
-#~ msgstr "fins a"
-
-#~ msgid "week(s)"
-#~ msgstr "setmana(es)"
-
-#~ msgid "year(s)"
-#~ msgstr "any(s)"
-
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "No s'ha pogut crear una agenda a `%s'"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "abril"
-
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "agost"
-
-#, fuzzy
-#~ msgid "December"
-#~ msgstr "desembre"
-
-#, fuzzy
-#~ msgid "February"
-#~ msgstr "febrer"
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Vés a una data"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Vés a avui"
-
-#, fuzzy
-#~ msgid "January"
-#~ msgstr "gener"
-
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "juliol"
-
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "juny"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "març"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "Dilluns"
-
-#, fuzzy
-#~ msgid "November"
-#~ msgstr "novembre"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "octubre"
-
-#, fuzzy
-#~ msgid "September"
-#~ msgstr "setembre"
-
-#~ msgid "Attachment properties"
-#~ msgstr "Propietats de l'adjunció"
-
-#~ msgid "File name:"
-#~ msgstr "Nom del fitxer:"
-
-#~ msgid "MIME type:"
-#~ msgstr "Tipus de MIME:"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "Edita les VFolders"
-
-#~ msgid "Filter Rules"
-#~ msgstr "Regles del filtre"
-
-#, fuzzy
-#~ msgid "Incoming"
-#~ msgstr ""
-#~ "Entrant\n"
-#~ "Sortint\n"
-
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Contorn:"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "Carpetes virtuals"
-
-#~ msgid "vFolder Sources"
-#~ msgstr "Fonts de la vFolder"
-
-#~ msgid "Save"
-#~ msgstr "Desa"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mostra"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Amaga"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Assumpte"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Filtre sobre el remitent"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Mou el missatge"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assumpte"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "No s'ha pogut iniciar el wombat"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Format"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Tipus de font de notícies:"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "No teniu configurada cap font de correu"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Cap informació"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propietats de l'adjunció"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Afegeix..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autenticació:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticació:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "No suprimeixis els missatges del servidor"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Cap"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adreça electrònica:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Adreça electrònica:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Nom complet:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'usuari:"
-
-#, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAPv4"
-
-#~ msgid "Identity"
-#~ msgstr "Identitat"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correu"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "conté"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "Nou"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Opcions"
-
-#~ msgid "Organization:"
-#~ msgstr "Organització:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Contrasenya"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Respon"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "Persones _requerides"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Desa com a VCard"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Sendmail"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Servidor:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
-
-#~ msgid "Signature file:"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Fitxer de signatura:"
-
-#~ msgid "Sources"
-#~ msgstr "Fonts"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "Tipus:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Cap informació"
-
-#~ msgid "Username:"
-#~ msgstr "Nom d'usuari:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minuts"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Introduïu el vostre nom i adreça electrònica que es farà servir al correu "
-#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra organització, "
-#~ "iel nom d'un fitxer d'on llegir la vostra signatura."
-
-#~ msgid "Full name:"
-#~ msgstr "Nom complet:"
-
-#~ msgid "Email address:"
-#~ msgstr "Adreça electrònica:"
-
-#~ msgid "Signature File"
-#~ msgstr "Fitxer de signatura"
-
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Detecta els tipus suportats..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "No suprimeixis els missatges del servidor"
-
-#~ msgid "Test Settings"
-#~ msgstr "Paràmetres de prova"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Tipus de font del correu:"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Seleccioneu el tipus de servidor de correu que teniu, i introduïu-ne la "
-#~ "informació corresponent.\n"
-#~ "\n"
-#~ "Si el servidor demana autenticació, podeu fer clic al botó \"Detecta els "
-#~ "tipus suportats...\" després d'introduir l'altra informació."
-
-#~ msgid "News source type:"
-#~ msgstr "Tipus de font de notícies:"
-
-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Seleccioneu el tipus del vostre servidor de notícies, i introduïu-ne la "
-#~ "informació corresponent.\n"
-#~ "Si el servidor demana autenticació, podeu fer clic al botó \"Detecta els "
-#~ "tipus suportats...\" després d'introduir l'altra informació."
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Tipus de transport de correu:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Seleccioneu el tipus de servidor de correu que teniu, i introduïu-ne la "
-#~ "informació corresponent.\n"
-#~ "\n"
-#~ "Si el servidor demana autenticació, podeu fer clic al botó \"Detecta els "
-#~ "tipus suportats...\" després d'introduir l'altra informació."
-
-#~ msgid "Add Identity"
-#~ msgstr "Afegeix una identitat"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Edita la identitat"
-
-#~ msgid "Add Source"
-#~ msgstr "Afegeix una font"
-
-#~ msgid "Edit Source"
-#~ msgstr "Edita la font"
-
-#~ msgid "Add News Server"
-#~ msgstr "Afegeix un servidor de notícies"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Edita el servidor de notícies"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "S'està comprovant \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "La connexió ha tingut èxit!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Possibilitats d'autorització de consultes de \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Autorització de consultes a \"%s\""
-
-#~ msgid "Address"
-#~ msgstr "Adreça"
-
-#~ msgid "Identities"
-#~ msgstr "Identitats"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Fonts del correu"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Transport de correu"
-
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Marca el missatge com a vist [ms]: "
-
-#~ msgid "News Servers"
-#~ msgstr "Servidors de notícies"
-
-#~ msgid "News Sources"
-#~ msgstr "Fonts de notícies"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envia els missatges en format HTML"
-
-#~ msgid "Delete a contact"
-#~ msgstr "Suprimeix un contacte"
-
-#~ msgid "Find"
-#~ msgstr "Cerca"
-
-#~ msgid "Find a contact"
-#~ msgstr "Cerca un contacte"
-
-#~ msgid "Print contacts"
-#~ msgstr "Imprimeix els contactes"
-
-#~ msgid "Stop"
-#~ msgstr "Atura"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Atura la càrrega"
-
-#~ msgid "View All"
-#~ msgstr "Visualitza'ls tots"
-
-#~ msgid "View all contacts"
-#~ msgstr "Visualitza tots els contactes"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuració del _correu..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Imprimeix els contactes..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_Cerca contactes"
-
-#~ msgid "5 Days"
-#~ msgstr "5 dies"
-
-#~ msgid "Alter preferences"
-#~ msgstr "Modifica les preferències"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Agenda"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Preferències de l'agenda..."
-
-#~ msgid "Create a new appointment"
-#~ msgstr "Crea una nova cita"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Crea una nova agenda"
-
-#~ msgid "Day"
-#~ msgstr "Dia"
-
-#~ msgid "Go back in time"
-#~ msgstr "Vés enrera en el temps"
-
-#~ msgid "Go forward in time"
-#~ msgstr "Vés endavant en el temps"
-
-#~ msgid "Go to"
-#~ msgstr "Vés a"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "Vés a una data concreta"
-
-#~ msgid "Go to present time"
-#~ msgstr "Vés al present"
-
-#~ msgid "Month"
-#~ msgstr "Mes"
-
-#~ msgid "Next"
-#~ msgstr "Següent"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Obre una agenda"
-
-#~ msgid "Prev"
-#~ msgstr "Anterior"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimeix aquest agenda"
-
-#, fuzzy
-#~ msgid "Save calendar as something else"
-#~ msgstr "Deixa l'agenda com a alguna altra cosa"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Mostra 1 dia"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Mostra 1 mes"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Mostra 1 setmana"
-
-#~ msgid "Show the working week"
-#~ msgstr "Mostra la setmana de treball"
-
-#~ msgid "Week"
-#~ msgstr "Setmana"
-
-#~ msgid "_New"
-#~ msgstr "_Nou"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_Obre una agenda"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimeix aquest agenda"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Anomena i desa..."
-
-#~ msgid "Delete this item"
-#~ msgstr "Suprimeix aquest element"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "Help"
-#~ msgstr "_Ajuda"
-
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Imprimeix el missatge..."
-
-#~ msgid "Print this item"
-#~ msgstr "Imprimeix aquest element"
-
-#~ msgid "Print..."
-#~ msgstr "Imprimeix..."
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Anomena i desa..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Desa i tanca"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Desa el contacte i tanca el quadre de diàleg"
-
-#~ msgid "See online help"
-#~ msgstr "Consulta l'ajuda en línia"
-
-#, fuzzy
-#~ msgid "Send _message to contact..."
-#~ msgstr "FIXME: Nou _missatge per contactar"
-
-#~ msgid "_File"
-#~ msgstr "_Fitxer"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimeix..."
-
-#~ msgid "_Save"
-#~ msgstr "_Desa"
-
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Lletra..."
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Personalitzat"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "_Inverteix la selecció"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Suprimeix aquesta cita"
-
-#~ msgid "Copy"
-#~ msgstr "Copia"
-
-#, fuzzy
-#~ msgid "Cut"
-#~ msgstr "Personalitzat"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Llibreta d'adreces..."
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Comp_rova els noms"
-
-#~ msgid "FIXME: Forward as v_Calendar"
-#~ msgstr "FIXME: Reenvia com a v_Calendar"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Ajuda"
-
-#, fuzzy
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: _Tasca"
-
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Insereix el fitxer..."
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "FIXME: Rec_urrència..."
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nova cita"
-
-#, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propietats de la llista de coses per fer"
-
-#, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "Següent"
-
-#~ msgid "Paste"
-#~ msgstr "Enganxa"
-
-#, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Enganxa l'element del porta-retalls"
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "Ant_erior"
-
-#, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Imprimeix..."
-
-#, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Configuració de la pàgina:"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propietats..."
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Ràdio"
-
-#, fuzzy
-#~ msgid "Redo the undone action"
-#~ msgstr "Elimina una acció"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Respon"
-
-#, fuzzy
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Desa el contacte i tanca el quadre de diàleg"
-
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "l'hora actual"
-
-#, fuzzy
-#~ msgid "Search for a string"
-#~ msgstr "_Cerca contactes"
-
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Selecciona'ls _tots"
-
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Seleccioneu una carpeta"
-
-#, fuzzy
-#~ msgid "_About..."
-#~ msgstr "_Quant a l'Evolution..."
-
-#, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Tanca"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Copia"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edita"
-
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Cerca..."
-
-#~ msgid "_Help"
-#~ msgstr "_Ajuda"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Enganxa"
-
-#~ msgid "_Print"
-#~ msgstr "_Imprimeix"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Propietats..."
-
-#, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "Ràdio"
-
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "_Tanca..."
-
-#, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "_Envia"
-
-#~ msgid "Compose"
-#~ msgstr "Redacta"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Redacta un nou missatge"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copia el missatge a una nova carpeta"
-
-#~ msgid "F_older"
-#~ msgstr "C_arpeta"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Fi_ltre sobre el remitent"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Filtre sobre els dest_inataris"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "Oblida les _contrasenyes"
-
-#~ msgid "Get Mail"
-#~ msgstr "Recupera el correu"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Suprimeix el missatge"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Missatge reenviat - %s"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimeix el missatge seleccionat"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtres de correu ..."
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Gestiona les subscripcions..."
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "Mar_ca'l com a llegit"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Marca'l com a per _llegir"
-
-#~ msgid "Move"
-#~ msgstr "Mou"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Mou un missatge a una nova carpeta"
-
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Previsualitza el missatge que s'ha d'imprimir"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualització d'impressió del missatge..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "Imprimeix el missatge a la impressora"
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimeix el missatge..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "Respon a _tots"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Respon al _remitent"
-
-#~ msgid "Select _All"
-#~ msgstr "Selecciona'ls _tots"
-
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Envia el correu de la cua i recupera'n el nou"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Mostra"
-
-#~ msgid "Threaded Message list"
-#~ msgstr "Llista de missatges en cadena"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VFolder sobre el remite_nt"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VFolder sobre els destinata_ris"
-
-#~ msgid "_Apply Filters"
-#~ msgstr "_Aplica els filtres"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Copia a la carpeta"
-
-#~ msgid "_Edit Message"
-#~ msgstr "_Edita el missatge"
-
-#~ msgid "_Expunge"
-#~ msgstr "_Esborra"
-
-#~ msgid "_Filter on Subject"
-#~ msgstr "_Filtre sobre l'assumpte"
-
-#~ msgid "_Forward"
-#~ msgstr "_Reenvia"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverteix la selecció"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuració del _correu..."
-
-#~ msgid "_Message"
-#~ msgstr "_Missatge"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Mou a la carpeta"
-
-#~ msgid "_Open in New Window"
-#~ msgstr "_Obre'l en una nova finestra"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Imprimeix el missatge"
-
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "_Anomena i desa..."
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Font"
-
-#~ msgid "_Threaded"
-#~ msgstr "_En cadena"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "_Suprimeix"
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "_VFolder sobre l'assumpte"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Editor de carpetes _virtuals..."
-
-#~ msgid "Attach"
-#~ msgstr "Adjunta"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "l'hora actual"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Edita el missatge"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Insereix un fitxer com a text dins del missatge"
-
-#, fuzzy
-#~ msgid "Insert text file..."
-#~ msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Obre un fitxer"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "_Anomena i desa"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Desa a la _carpeta..."
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Desa a la _carpeta..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Desa el missatge a una carpeta determinada"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Envia"
-
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Remitent"
-
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Remitent"
-
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Envia els missatges en format HTML"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Mostra/amaga les adjuncions"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Mostra les _adjuncions"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "S'està enviant el missatge sense cap asuumpte"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Obre..."
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Afegeix una carpeta a la llista de carpetes a què estic subscrit"
-
-#~ msgid "Refresh List"
-#~ msgstr "Refresca la llista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Refresca la llista de carpetes"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Elimina la carpeta de la llista de carpetes a què estic subscrit"
-
-#~ msgid "Subscribe"
-#~ msgstr "Subscriu-me"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Cancel·la la subscripció"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Mostra una altra carpeta"
-
-#~ msgid "E_xit"
-#~ msgstr "S_urt"
-
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Barra de _dreceres de l'Evolution"
-
-#~ msgid "Exit the program"
-#~ msgstr "Surt del programa"
-
-#~ msgid "Getting _Started"
-#~ msgstr "Per _començar"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "Mostra informació referent a l'Evolution"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Mostra la barra de _carpetes"
-
-#, fuzzy
-#~ msgid "Submit _Bug Report"
-#~ msgstr "_Envia un informe d'error"
-
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Envia un informe d'error mitjançant el Bug Buddy"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Commuta la visualització o no de la barra de carpetes"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Commuta la visualització o no de la barra de dreceres"
-
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Utilització del gestor de c_ontactes"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Utilització de l'_agenda"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Utilització del _gestor de correu"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Quant a l'Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Cita (FIXME)"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacte (FIXME)"
-
-#~ msgid "_Folder"
-#~ msgstr "_Carpeta"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Vés a la carpeta..."
-
-#~ msgid "_Index"
-#~ msgstr "_Índex"
-
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Missatge de _correu (FIXME)"
-
-#~ msgid "_Settings"
-#~ msgstr "_Paràmetres"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Tasca (FIXME)"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "El(s) element(s) pertanyen a aquestes categories:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Categories disponibles:"
-
-#~ msgid "External Directories"
-#~ msgstr "Directoris externs"
-
-#~ msgid "Port Number:"
-#~ msgstr "Número de port:"
-
-#~ msgid "Outline:"
-#~ msgstr "Contorn:"
-
-#~ msgid "Headings:"
-#~ msgstr "Encapçalaments:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Dies buits:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Cites:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Dia ressaltat:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Números de dia:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Número del dia d'avui:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Element per fer que encara no ha vençut:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Element per fer que venç avui:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Element endarrerit encara per fer:"
-
-#~ msgid "may"
-#~ msgstr "maig"
-
-#~ msgid "sept"
-#~ msgstr "set"
-
-#~ msgid "sunday"
-#~ msgstr "diumenge"
-
-#~ msgid "monday"
-#~ msgstr "dilluns"
-
-#~ msgid "tuesday"
-#~ msgstr "dimarts"
-
-#~ msgid "tues"
-#~ msgstr "dm."
-
-#~ msgid "wednesday"
-#~ msgstr "dimecres"
-
-#~ msgid "wednes"
-#~ msgstr "dc."
-
-#~ msgid "thursday"
-#~ msgstr "dijous"
-
-#~ msgid "thur"
-#~ msgstr "dj."
-
-#~ msgid "thurs"
-#~ msgstr "dj."
-
-#~ msgid "friday"
-#~ msgstr "divendres"
-
-#~ msgid "saturday"
-#~ msgstr "dissabte"
-
-#~ msgid "fortnight"
-#~ msgstr "quinzena"
-
-#~ msgid "min"
-#~ msgstr "min."
-
-#~ msgid "sec"
-#~ msgstr "s"
-
-#~ msgid "tomorrow"
-#~ msgstr "demà"
-
-#~ msgid "yesterday"
-#~ msgstr "ahir"
-
-#~ msgid "today"
-#~ msgstr "avui"
-
-#~ msgid "last"
-#~ msgstr "últim"
-
-#~ msgid "this"
-#~ msgstr "aquest"
-
-#~ msgid "next"
-#~ msgstr "següent"
-
-#~ msgid "first"
-#~ msgstr "primer"
-
-#~ msgid "third"
-#~ msgstr "tercer"
-
-#~ msgid "fourth"
-#~ msgstr "quart"
-
-#~ msgid "fifth"
-#~ msgstr "cinquè"
-
-#~ msgid "sixth"
-#~ msgstr "sisè"
-
-#~ msgid "seventh"
-#~ msgstr "setè"
-
-#~ msgid "eighth"
-#~ msgstr "vuitè"
-
-#~ msgid "ninth"
-#~ msgstr "novè"
-
-#~ msgid "tenth"
-#~ msgstr "desè"
-
-#~ msgid "eleventh"
-#~ msgstr "onzè"
-
-#~ msgid "twelfth"
-#~ msgstr "dotzè"
-
-#~ msgid "ago"
-#~ msgstr "fa"
-
-#~ msgid "Year:"
-#~ msgstr "Any:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Si us plau, seleccioneu la data a què voleu anar.\n"
-#~ "Quan feu clic sobre un dia, anireu a parar\n"
-#~ "a aquella data."
-
-#~ msgid "Mail Source"
-#~ msgstr "Font del correu"
-
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "Ja teniu enllestida la configuració del correu.\n"
-#~ "Feu clic a \"Finalitza\" per desar els nous paràmetres"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "Envia \"%s\""
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envia un missatge sense assumpte"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Esborra \"%s\""
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "S'estan marcant els missatges de la carpeta \"%s\""
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Marca els missatges de la carpeta \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "S'està marcant el missatge %d de %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Escaneja les carpetes de \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Adjunta els missatges des de \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "S'estan reenviant els missatges \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "S'està reenviant un missatge sense cap assumpte"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Reenvia el missatge \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Reenvia un missatge sense cap assumpte"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "No s'ha pogut generar la part mime del missatge en generar el missatge "
-#~ "reenviat."
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "S'està carregant \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Carrega \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "S'està creant \"%s\""
-
-#~ msgid "Create \"%s\""
-#~ msgstr "Crea \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr ""
-#~ "Excepció en informar del resultat a l'escoltador de components de "
-#~ "l'intèrpret d'ordres."
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Sincronitza \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "S'està visualitzant l'UID del missatge \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "S'està esborrant la visualització del missatge"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Visualitza l'UID del missatge \"%s\""
-
-#~ msgid "Clear message display"
-#~ msgstr "Esborra la visualització del missatge"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Obre els missatges des de \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "S'estan visualitzant els missatges des de la carpeta \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Visualitza els missatges des de \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "S'està recuperant el missatge %d de %d (uid \"%s\")"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "S'està reconstruint la visualització del missatge"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Reconstrueix la visualització del missatge"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ou servidor de directori"
-
-#~ msgid "_Actions"
-#~ msgstr "_Accions"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Anomena i desa l'agenda"
-
-#, fuzzy
-#~ msgid "_Mail Configuration"
-#~ msgstr "Configuració del correu"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-#~ msgid "window2"
-#~ msgstr "finestra2"
-
-#~ msgid "Recur on the"
-#~ msgstr "Repeteix-ho el dia"
-
-#~ msgid "th day of the month"
-#~ msgstr "del mes"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Aquesta cita té regles de recurrència personalitzades que l'Evolution no pot "
-#~ "editar.\n"
-#~ "\n"
-#~ "No obstant això, la cita recurrirà en el moment oportú i es visualitzarà "
-#~ "correctament en les vistes de l'agenda."
-
-#~ msgid "Create to-do item"
-#~ msgstr "Crea un element per fer"
-
-#~ msgid "Edit to-do item"
-#~ msgstr "Edita un element per fer"
-
-#~ msgid "Summary:"
-#~ msgstr "Resum:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Data de venciment:"
-
-#~ msgid "Time display"
-#~ msgstr "Visualització de l'hora"
-
-#~ msgid "Time format"
-#~ msgstr "Format de l'hora"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 hores (AM/PM)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 hores"
-
-#~ msgid "Weeks start on"
-#~ msgstr "La setmana comença el"
-
-#~ msgid "Day range"
-#~ msgstr "Abast de dies"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Si us plau, seleccioneu les hores d'inici i\n"
-#~ "finalització que voleu que es mostrin en les\n"
-#~ "vistes de dia i de setmana. Per defecte, les\n"
-#~ "hores fora d'aquest abast no es mostraran."
-
-#~ msgid "Day start:"
-#~ msgstr "Inici del dia:"
-
-#~ msgid "Day end:"
-#~ msgstr "Final del dia:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Colors per a la visualització"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Mostra-ho a la llista de coses per fer:"
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Opcions d'estil de la llista de coses per fer:"
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Ressalta els elements endarrerits"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Ressalta els elements que encara no han vençut"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "Ressalta els elemts que vencen avui"
-
-#~ msgid "To Do List"
-#~ msgstr "Llista de coses per fer"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferències"
-
-#~ msgid "Alarm Properties"
-#~ msgstr "Propietats de l'alarma"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Fes un so en visualitzar les alarmes"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Les alarmes acústiques s'apaguen després de"
-
-#~ msgid " seconds"
-#~ msgstr " segons"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Habilita l'snoozing per a "
-
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "No s'ha pogut connectar al servidor IMAP en %s."
-
-#~ msgid "Could not create summary"
-#~ msgstr "No s'ha pogut crear el resum"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "No es pot recuperar el missatge: %s"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr ""
-#~ "No s'ha pogut canviar el nom de la carpeta %s a %s: el nom de destí ja "
-#~ "existeix"
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "No s'ha pogut obrir el resum %s"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Incongruència del resum, manca la capçalera de l'X-Evolution"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "No es poden copiar les dades al fitxer de sortida: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "No s'ha pogut carregar o crear el resum"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s existeix"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "Les carpetes MH no es poden imbricar."
-
-#~ msgid "does not match regex"
-#~ msgstr "no coincideix amb la regex"
-
-#~ msgid "matches regex"
-#~ msgstr "coincideix amb la regex"
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr ""
-#~ "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "URL d'emmagatzemament incorrecte (cap servidor): %s"
-
-#~ msgid "Custom search"
-#~ msgstr "Cerca personalitzada"
-
-#~ msgid "Full Search"
-#~ msgstr "Cerca completa"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Benvingut a l'assistent de configuració de l'Evolution!\n"
-#~ "Faciliteu certes informacions sobre els vostres paràmetres\n"
-#~ "de correu electrònic i podreu començar immediatament a enviar\n"
-#~ "i rebre correu. Feu clic a Següent per continuar."
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "No s'ha pogut crear el conducte a %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "No es pot executar %s: %s\n"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX no llegits)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "No es coneix cap protocol per obrir l'URI '%s'"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Obre'l en una nova finestra"
-
-#~ msgid "Forward Message"
-#~ msgstr "Reenvia el missatge"
-
-#~ msgid "Copy Message"
-#~ msgstr "Copia el missatge"
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova a_genda"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Nova cita..."
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Crea una carpeta nova..."
-
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Insereix un fitxer com a adjunció"
-
-#~ msgid "Gnome Calendar"
-#~ msgstr "Agenda del Gnome"
-
-#~ msgid "The GNOME personal calendar and schedule manager."
-#~ msgstr "L'agenda personal del GNOME i el gestor de planificació."
-
-#~ msgid "Year"
-#~ msgstr "Any"
-
-#~ msgid "Show 1 year"
-#~ msgstr "Mostra 1 any"
-
-#~ msgid "New appointment for _today..."
-#~ msgstr "Nova cita per a _avui..."
-
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Crea una nova cita per a avui"
-
-#~ msgid "About Calendar"
-#~ msgstr "Sobre l'agenda"
-
-#~ msgid "%s%s"
-#~ msgstr "%2$s%1$s"
-
-#~ msgid "'s calendar"
-#~ msgstr "seva agenda"
-
-#~ msgid "FIXME: _Delete"
-#~ msgstr "FIXME: _Suprimeix"
-
-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "FIXME: A_genda..."
-
-#~ msgid "FIXME: Invite _Attendees..."
-#~ msgstr "FIXME: Invita els _assistents..."
-
-#~ msgid "FIXME: C_ancel Invitation..."
-#~ msgstr "FIXME: C_ancel·la una invitació..."
-
-#~ msgid "FIXME: Save and Close"
-#~ msgstr "FIXME: Desa i tanca"
-
-#~ msgid "FIXME: Print..."
-#~ msgstr "FIXME: Imprimeix..."
-
-#~ msgid "Invite attendees to a meeting"
-#~ msgstr "Invita als assistents a una reunió"
-
-#~ msgid "FIXME: Delete"
-#~ msgstr "FIXME: Suprimeix"
-
-#~ msgid "Add to-do item..."
-#~ msgstr "Afegeix un element per fer..."
-
-#~ msgid "Edit this item..."
-#~ msgstr "Edita aquest element..."
-
-#~ msgid "To-do list"
-#~ msgstr "Llista de coses per fer"
-
-#~ msgid "Edit..."
-#~ msgstr "Edita..."
-
-#~ msgid "Weeks"
-#~ msgstr "Setmanes"
-
-#~ msgid "Hour"
-#~ msgstr "Hora"
-
-#~ msgid "Minute"
-#~ msgstr "Minut"
-
-#~ msgid "Second"
-#~ msgstr "Segon"
-
-#~ msgid "TODO Items"
-#~ msgstr "Elements per fer"
-
-#~ msgid "%a"
-#~ msgstr "%a"
-
-#~ msgid "%b"
-#~ msgstr "%b"
-
-#~ msgid "Current week (%s %s %d - %s %s %d %d)"
-#~ msgstr "Setmana actual (%s %s %d - %s %s %d %d)"
-
-#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
-#~ msgstr "Setmana actual (%s %s %d %d - %s %s %d %d)"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Retalla l'element seleccionat i posa'l al porta-retalls"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Copia l'element seleccionat al porta-retalls"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "Selecciona les adreces dels destinataris"
-
-#~ msgid "To: >>"
-#~ msgstr "Per a: >>"
-
-#~ msgid "Cc: >>"
-#~ msgstr "Cc: >>"
-
-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc: >>"
-
-#~ msgid "label9"
-#~ msgstr "etiqueta9"
-
-#~ msgid "label7"
-#~ msgstr "etiqueta7"
-
-#~ msgid "label8"
-#~ msgstr "etiqueta8"
-
-#~ msgid "Discard this message?"
-#~ msgstr "Voleu descartar aquest missatge?"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Carrega un missatge desat anteriorment"
-
-#~ msgid "_Format"
-#~ msgstr "_Formata"
-
-#~ msgid "Check for new mail"
-#~ msgstr "Comprova si hi ha nou correu"
-
-#~ msgid "Currently pending operations:"
-#~ msgstr "Operacions encara pendents:"
-
-#~ msgid "Show _folder bar"
-#~ msgstr "Mostra la barra de _carpetes"
-
-#~ msgid "Help _index"
-#~ msgstr "_Índex de l'ajuda"
-
-#~ msgid "Cannot initialize the configuration system."
-#~ msgstr "No es pot inicialitzar el sistema de configuració."
-
-#~ msgid "Fields"
-#~ msgstr "Camps"
-
-#~ msgid "Field Chooser"
-#~ msgstr "Selector de camps"
-
-#~ msgid ""
-#~ "To add a column to your table, drag it into\n"
-#~ "the location in which you want it to appear."
-#~ msgstr ""
-#~ "Per afegir una columna a la vostra taula, arrosegue-la\n"
-#~ "a la ubicació on voleu que aparegui."
-
-#~ msgid "window1"
-#~ msgstr "finestra1"
-
-#~ msgid "Available fields"
-#~ msgstr "Camps disponibles"
-
-#~ msgid "Show in this order"
-#~ msgstr "Mostra en aquest ordre"
-
-#~ msgid "label2"
-#~ msgstr "etiqueta2"
-
-#~ msgid "Add >>"
-#~ msgstr "Afegeix >>"
-
-#~ msgid "<< Remove"
-#~ msgstr "<< Elimina"
diff --git a/po/da.po b/po/da.po
deleted file mode 100644
index 44ade9dcd4..0000000000
--- a/po/da.po
+++ /dev/null
@@ -1,7889 +0,0 @@
-# Danish translation of evolution
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Kenneth Christiansen <kenneth@gnome.dk>, 2000.
-# Keld Simonsen <keld@dkuug.dk>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-02-08 00:19+0100\n"
-"PO-Revision-Date: 2001-02-27 10:38+0100\n"
-"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Navn:"
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"Prefiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"Opgivet:     "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"Tillæg: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"Familie:    "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"Suffiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Fødselsdato: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"Postboks:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"Linje:         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"Vej:     "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"By:          "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"Region:     "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"Postnummer: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"Land:    "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveringsmærke: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoner:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"E-post program: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidszone: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografisk lokation: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Stilling: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"Navn:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"Enhed:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"Enhed2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"Enhed3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"Enhed4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorier: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik streng: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Offentlig nøgle: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Fabrik vil importere GnomeCard-filer ind i Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importerer GnomeCard-filer ind i Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initiere Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deaktiveret"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronisér"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiér fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiér til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flet fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flet til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevar <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Oprindelig forfatter:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <eskil@eazel.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution adressebogs-komponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurationsværktøj for evolutions adressebogskomponent.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkroniseringshandling"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Komponent-tilstand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen pilot er konfigureret, vælg venligst\n"
-"kappleten 'Egenskaber for pilot link' først."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ikke tilkoblet gnome-pilot dæmon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"En fejl opstod under forsøg på at hente\n"
-"pilot-listen fra gnome-pilot dæmonen"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Markøren kunne ikke indlæses\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook ikke indlæst\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Kunne ikke starte wombat-tjener"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Kunne ikke starte wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Konfigurér Udstående"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Udstående"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Tilføj"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Br_yllupsdag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "A_rbejde"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Fax på arbejde"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegorier..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontaktredigering"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detaljer"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Gem som:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Generel"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Ny telefontype"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "_Notater:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefontyper"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Primær epost"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Vil modtage epost af formatet _HTML"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Hjemmeside-adresse:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Tilføj"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresse..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Sekretærs navn:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "_Fødselsdag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Arbejde"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Slet"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "_Afdeling:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Fulde navn..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Hjemme"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Job titel:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "_Leders navn:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Kalde_navn:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "_Kontor:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Profession:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "Ægte_fælle:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "_Dette er postadressen"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slet kontakt?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Denne kontakt tilhører disse kategorier:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Sekretær"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Arbejde"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Arbejde 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Firma fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Tilbagering"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Hjem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Hjem 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Hjemme fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "Isdn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
-msgid "Other"
-msgstr "Andet"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Anden fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Kalder"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Primær epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "Sekundær epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "Tertiær epost"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Tjek adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Land:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Tjek fulde navn"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Frøken"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Hr."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Fornavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Efternavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Mellemnavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Suffiks:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titel:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Som _tabel"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Indtast adgangskode for %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åbne adressebogen"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Vi kunne ikke åbne denne adressebog. Dette betyder enten\n"
-"at du har angivet en forkert URI, eller ar du har forsøgt\n"
-"at bruge en LDAP-tjeneste men ikke har LDAP-understøttelse\n"
-"kompileret ind. Hvis du har angivet en URI, tjek om URI-en \n"
-"er korrekt og genindtast. Hvis ikke, så har du nok prøvet\n"
-"at nå en LDAP tjeneste. Hvis du ønsker at kunne bruge LDAP,\n"
-"er det nødvendigt at hente og installere OpenLDAP og\n"
-"rekompilere og installere Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Vis alt"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avanceret..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Hvilkensomhelst felt indeholder"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Navn indeholder"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "Epost indeholder"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "Uri'en som mappebladreren vil vise"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Ukendt addressebogstype"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonym modus)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Ukendt auth type"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Én"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Undertræ"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Ukendt område-type"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Husk denne adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Vært:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Rod-DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Søgeopråde:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Opret sti hvis den ikke eksisterer."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Redigér adressebog"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Tilføj adressebog"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Vælg den type adressebog som du har, og indtast den relvante information om "
-"den."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Kilder til adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:694
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Slet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:680 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Redigér"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "En simpel Bonobo kontrol som viser en adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrol der viser et minikort for Evolutions adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebogs minikort-viser"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for behandling af kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabrik for kontrol af adressebog minikort"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Konfigurationsværktøj for evolutions adressebogskomponent.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Klik her for adressebogen"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adressebogs-komponent"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabrik for adressebogens grænseflade for navneudvælgelse"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Find..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Modtagerliste:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Vælg mappe"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Vælg navn fra:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Søg"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Gem som vCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Klik her for at tilføje en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "Epost"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Netsted"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Afdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Profession"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Foresatte"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Kaldenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Samlever"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Bemærkning"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Ledig-optaget URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Kunne ikke åbne adressebogen"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Der er ingen punkter at vise i denne visning\n"
-"\n"
-"Dobbelt-klik her for at oprette en ny kontakt."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blanke skemaer ved slutningen:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Krop"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bund:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Skrifttype..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Bundtekst:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Toptekst"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Top-/bundtekst"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Overskrifter"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Toptekst for hvert bogstav"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Højde:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Lige efter hinanden"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inkludér:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landskab"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Bogstavfaner på siden"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marginer"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Antal kolonner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativer"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papirkilde:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portræt"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Smugkig:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Udskriv med gråtoner"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Modsat på lige sider"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Højre:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sektioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Skyggelægning"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start på en ny side"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilnavn:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Top:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredde:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etiket26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurationsværktøj for evolutions kalenderkomponent.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Fejl under kommunikation med kalendertjeneren"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunne ikke læse pilotens kalenderapplikationsblok"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Konfigurér GnomeCal-komponent"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Gnome kalender"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Konfigurér Udstående"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Udstående"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution opgaveliste-komponent"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurationsværktøj for evolutions opgavelistekomponent.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Kunne ikke læse pilotens applikationsblok for opgaveliste"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Påmindelse om din aftale "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Udsæt"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Fil ikke fundet"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Åbn kalender"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Gem kalender"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Kunne ikke oprette kalender-visning. Tjek venligst din opsætning af ORBit og "
-"OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y-%m-%d %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y-%m-%d %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Of_fentlig"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "_Fortrolig"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Ukendt fejl"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Gennemsigtig"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Uigennemsigtig"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datoen skal skrives ind på formatet: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr " "
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr " "
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske position skal skrives ind på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Procentværdien skal være mellem 0 og 100, inklusive"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten skal være mellem 0 og 9, inklusive"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Gentages"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Nej"
-
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A den %e. %B %Y"
-
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%H:%M"
-
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fejl ved indlæsning af kalender</b>"
-
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fejl ved indlæsning af kalender:<br>Metode ikke understøttet"
-
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Vis"
-
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Vis aftaler"
-
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Vis opgaver"
-
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Indlæser kalender"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm på %A %d %b %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Besked om din aftale på %A %d %b %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Intet sammendrag."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Luk"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Redigér aftale"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Udsæt-tid (minutter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmer afbrydes efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip når alarmvinduet kommer til syne."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Opsætning af kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Sammenpres weekender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis valgmuligheder"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Færdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Slå udsættelse til for"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Ugens første dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Fremhæv:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Punkter som skal afsluttes idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Punkter som skal afsluttes idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Punkter som ikke skal afsluttes endnu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Punkter som ikke skal afsluttes endnu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "man"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "mandag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Overskredne opgaver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Overskredne opgaver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Vælg en farve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Påmind mig om alle aftaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Påmindelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "lør"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "lørdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Vis sluttider for aftaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Vis ugenumre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagens starter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "søn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "søndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Opgaveblok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid til afslutning"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Tidsopdeling:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidsformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "tir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "tirsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbejdsuge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutter før de skal ske."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
-msgid "seconds."
-msgstr "sekunder."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil slette aftalen '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil slette denne unavngivne aftale?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil slette opgaven '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil slette denne unavngivne opgave?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil slette journalindgangen '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil slette denne unavngivne journalindgang?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ønsker du at gemme ændringer?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% færdi_g:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Afbrudt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Klassificering"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Fuldført"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Dato & tidspunkt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Fuldført dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Høj"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Under udarbejdelse"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Lav"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fremskridt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Of_fentlig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Opgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Udefineret"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Fortrolig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Slut-_dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Redigér opgave"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Aftale - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Opgave - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journalpunkt - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategorier"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Færdiggørelsesdato"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Slutdato"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Startdato"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografisk position"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Procent færdig"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Gennemsigtighed"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URI"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmer"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Markér som fuldført"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Markér opgaven som fuldført"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Slet denne opgave"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Slet opgaven"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr " "
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Ny aftale..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Planlæg møde"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Redigér denne aftale..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Slet denne aftale"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Gør denne aftale flytbar"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Slet denne opføring"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Slet alle opføringer"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Tilføj til Kalender"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Accept"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Annullér møde"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--til--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Kalenderbesked"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Dato:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Indlæser kalender..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Arrangør:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
-msgid "Sender"
-msgstr "Afsender"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sammendrag:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "dagen begynder"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "dagen slutter"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Deltagers adresse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Deltagere:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annullér\n"
-"møde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Formand"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Invitationer til møde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ikke-deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Mulig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Arrangør:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Offentliggør\n"
-"arrangement"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "S.U."
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Anmod\n"
-"om møde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Nødvendig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rolle"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "Planlæg møde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Alle"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikke indlæse opgaverne i '%s'"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden der kræves for at indlæse '%s' er ikke understøttet"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %b"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Grundlæggende om aftaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Egendefineret genindtræffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Undtagelser"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Ændr"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ingen genindtræffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Afspil lyd/sang"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Smugkig"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Gentagelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regel for genindtræffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Påmindelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Kø_r program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Send besked"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Vis dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Simpel genindtræffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lut-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
-msgid "after"
-msgstr "efter"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
-msgid "before"
-msgstr "før"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "for"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "for evigt"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etiket21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minut(ter)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "måned(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "til"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "uge(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "år"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Redigér aftale"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "på"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "hændelser"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekunder"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " før begyndelse på aftale"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " efter begyndelse på aftale"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " før slutning på aftale"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " efter slutning på aftale"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "En simpel Bonobo kontrol som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender eksekutivoversigt-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender ITip/iMip fremviser"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-komponent for behandling af kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik for kalenderoversigts-komponenten."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabrik for evolutions kalenderkomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "april"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "august"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Gå til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Gå til i dag"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "januar"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "juli"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "juni"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "marts"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "maj"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "november"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "oktober"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "september"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikke initiere Gnome"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "søn"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "man"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "tir"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "ons"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "tor"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "fre"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "lør"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Opgaver"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "I dag (%a %d %b %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %d %b"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Denne uge (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Denne måned (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Dette år (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Udskriv kalender"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1237
-msgid "Print Preview"
-msgstr "Forhåndsvisning af udskrift"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URI for opgavemappen der skal vises"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SMTOTFL"
-
-#: camel/camel-filter-driver.c:790
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr ""
-
-#: camel/camel-filter-driver.c:795
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr ""
-
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr ""
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:551
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikke oprette låsefil for %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Tidsafbrud ved ventning på låsefil for %s. Prøv igen senere."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Kunne ikke få fat på lås ved brug af fcntl(2): %s "
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Kunne ikke få fat på lås ved brug af flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Kunne ikke tjekke e-post fil %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Kunne ikke åbne postfil %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Kunne ikke åbne midlertidig postfil %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunne ikke tjekke låsefil for %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fejl ved læsning af postfil: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fejl ved skriving af midlertidig fil: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Kunne ikke oprette rør: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Kunne ikke udføre fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail-programmet mislykkedes: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Ukendt fejl)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Kunne ikke indlæse %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Kunne ikke indlæse %s: Ingen initieringskode i modulet."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s-tjener %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-tjeneste for %s på %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Forbindelse annuleret"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(ukendt vært)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Handling annuleret"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr ""
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' skal indeholde et brugernavn"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' skal indeholde et vertsnavn"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' skal indeholde en sti"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Ingen vært %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Midlertidig ude af stand til at slå værtsnavn %s op."
-
-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "E-post-udbyder for virtuelle mapper"
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr "For læsning af e-post som en anmodning på et andet sæt af mapper"
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Ingen udbyder tilgængelig for protokol `%s'"
-
-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Kan ikke oprette katalog %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-streng `%s' indeholder ikke protokol"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-streng `%s' indeholder en ugyldig protokol"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnummer i URL `%s' er ikke-numerisk"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kunne ikke få fat på Kerberos billet:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Forkert autoriseringsbesked fra server."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-kommando mislykkedes: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
-msgid "Unknown error"
-msgstr "Ukendt fejl"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Serversvar afsluttet for tidligt."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Svar fra IMAP-tjener indeholdt ikke %s-information"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:199
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Kunne ikke indlæse sammendrag for %s"
-
-#: camel/providers/imap/camel-imap-folder.c:329
-msgid "Scanning IMAP folder"
-msgstr "Skanner IMAP-mapper"
-
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
-msgid "Could not find message body in FETCH response."
-msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "For læsning og gemning af e-post på IMAP-tjenere."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
-"klartekst-adgangskode."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Dette lader dig koble til IMAP-tjeneren ved at bruge Kerberos 4 som "
-"autenticering."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Kunne ikke autenticere mod IMAP-tjener.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kan ikke oprette katalog %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "MH-formaterede postkataloger"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "For gemning af lokal e-post i MH-lignende beskedskataloger "
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standard UNIX postkassefil"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "For gemning af lokal e-post i standard mbox format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir-formaterede postfiler"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "For gemning af lokal e-post i qmail beskedskataloger"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Gemme-rod %s er ikke en absolut sti"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Gemme-rod %s er ikke et almindeligt katalog"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan ikke få fat på mappe: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Lokale gemmesteder har ikke en indbakke"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokal e-post-fil %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunne ikke slette oversigtsfil `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunne ikke slette indeksfil `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan ikke tilføje besked i maildir-mappe: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente besked: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ingen sådan besked"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Ugyldigt indhold af meddelelse"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke åbne mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Mappen `%s' eksisterer ikke."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' er ikke et maildir katalog."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunne ikke slette mappe `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "ikke et maildir katalog"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan ikke åbne postboks: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan ikke tilføje besked i mbox-filen: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen set ud til at være uigenkaldeligt ødelagt."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fremstilling af besked mislykkedes: Er postkassen ødelagt?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke åbne fil `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette fil `%s'\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' er ikke en almindelig fil."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappen `%s'\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Mappen `%s' er ikke tom. Ikke slettet."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Synkroniserer mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunne ikke åbne mappe: %s: summerer fra position %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Uoprettelig fejl ved fortolkning af post nær position %ld i mappe %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan ikke lave oversigt over folder: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
-msgid "Synchronising folder"
-msgstr "Synkroniserer mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kunne ikke åbne folder der skal laves oversigt for: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Kan ikke åbne midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fejl under skriving til midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fejl under skriving til midlertidig postboks: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kunne ikke lukke kildemappe %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Kunne ikke lukke midlertidig mappe: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kunne ikke ændre navn på mappe: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Ukendt fejl: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' er ikke et katalog."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Venligst indtast NNTP-adgangskode for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Tjeneren godtog ikke brugernavn"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Fejl ved sending af brugernavn til tjener"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Tjeneren godtog ikke brugernavn/adgangskode"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Besked %s ikke fundet"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppeliste fra tjeneren."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Kunne ikke indlæse gruppelistefil for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET-nyheder"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Dette er en udbyder for læsning af og postning af indlæg til USENET "
-"nyhedsgrupper."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Kunne ikke åbne katalog for news-tjener: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET-nyheder via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Dette alternativ vil autenticere mod NNTP-tjeneren ved brug af klartekst "
-"adgangskode."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Kunne ikke åbne eller oprette .newsrc-fil for %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Modtager POP-oversigt"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kunne ikke åbne mappe: beskedslisten var ikke komplet."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Ingen besked med uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Modtager POP-meddelelse %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"For tilkobling til POP-tjenere. POP-protokollen kan også bruges for at hente "
-"e-post fra visse e-postudbydere via web, samt fra proprietære e-postsystemer."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Dette alternativ lader dig koble til POP-tjeneren ved brug af adgangskode i "
-"klartekst. Dette er det eneste alternativ som er understøttet af mange "
-"POP-tjenere."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Dette alternativ lader dig koble til POP-tjenere ved brug af krypteret "
-"adgangskode via APOP-protokollen. Dette vil muligvis ikke virke for alle "
-"brugere selv på tjenere som hævder at understøtte det."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Dette lader dig koble til POP-tjeneren ved at bruge Kerberos 4 som "
-"autenticering."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikke autenticere mod KPOP-tjener: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kunne ikke koble til POP-tjener på %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Kunne ikke koble til POP-tjener.\n"
-"Fejl under oversending af brugernavn: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Ukendt)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Kunne ikke koble til POP-tjeneren.\n"
-"Ingen støtte for forespurgt autenticeringsmekanisme."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Kunne ikke koble til POP-tjener.\n"
-"Fejl ved oversending af adgangskode: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Ingen sådan mappe `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"For levering af e-post ved at videresende den til \"sendmail\"-programmet på "
-"det lokale system."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Kunne ikke oprette rør til sendmail: %s: besked ikke sendt"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Kunne ikke udføre fork på sendmail: %s: besked ikke sendt"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Kunne ikke sende beskeden: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail afsluttede med signal %s: besked ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Kunne ikke udføre %s: besked ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail afsluttede med status %d: besked ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Levering af e-post via sendmail programmet"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Kommando ikke implimenteret"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Hjælpebesked"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Tjeneste parat"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Velkomst fejl ved svar: %s: formentlig ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Ingen autentisering krævet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Dette alternativ lader dig koble til SMTP-tjeneren uden brug af nogen form "
-"for autentificering. Dette burde virke for opkobling til de fleste "
-"SMTP-servere."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Dette lader dig koble til SMTP-serveren ved at bruge CRAM-MD5autenticering."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-tjener %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP-levering af e-post via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Kan ikke sende besked: ingen modtagere defineret."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO anmodning overskred tid: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO fejl ved svar: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM anmodning overskred tid: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL FROM fejl ved svar: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO anmodning overskred tid: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA anmodning overskred tid: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA fejl ved svar: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA sending overskred tid: Besked afbrudt: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA fejl ved svar: Besked afbrudt: %s: besked ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET-anmodning overskred tid: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "RSET fejl ved svar: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT-anmodning overskred tid: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT fejl ved svar: %s: ikke-fatal"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fk"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "bilag"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Vedhæft en fil"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Fjern"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Fjern valgte punkter fra bilagslisten"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Vedhæft bilag..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Vedhæft bilag til meddelelsen"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Egenskaber for bilag"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Fra:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klik her for adressebogen"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Indtast identiteten du ønsker at bruge ved sending af denne besked"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Indtast modtagerne for meddelelsen"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Indtast adresserne som skal modtage en kopi af meddelelsen"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Indtast adresserne som skal modtage en kopi af meddelelsen uden at komme til "
-"syne i meddelelsens modtagerliste."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Indtast emnet for meddelelsen"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kunne ikke åbne signaturfilen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "Gem som..."
-
-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fejl ved gemning af fil: %s"
-
-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fejl ved indlæsning af fil: %s"
-
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne meddelelse er ikke sendt.\n"
-"\n"
-"Vil du gemme ændringene?"
-
-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "Åbn fil"
-
-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "Den fil eksisterer ikke."
-
-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "Dette er ikke en almindelig fil."
-
-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "Den fil eksisterer men kan ikke læses."
-
-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Den fil så ud til at være tilgængelig, men open(2) fejlede."
-
-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Filen er meget stor (mere end 100 k).\n"
-"Er du sikker på at du ønsker at indsætte den?"
-
-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "En fejl skete ved læsning af filen."
-
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "Skriv en meddelelse"
-
-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr "Kan ikke oprette komponeringsvinduet."
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan ikke initiere Evolutions composer."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "Adressekort"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "Kalenderinformation"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Ændr visningen til %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Kør %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Luk %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flyt %s til venstre"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flyt %s til højre"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigurér %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan ikke åbne HTML-fil:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Markér opgaven som fuldført"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testtjeneste"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Fejl"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "_Opdatér hver"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutter"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "år"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "år"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "måned"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "måneder"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "uge"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "uger"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dage"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "time"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "timer"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minut"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekunder"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Du har glemt at vælge en dato."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Du har valgt en ugyldig dato."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med tiden\n"
-"når filteret køres eller tiden når VMappen\n"
-"åbnes."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med\n"
-"tiden du angive her."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med\n"
-"en tid relativ til når filteret bliver kørt;\n"
-"for eksempel \"for en uge siden\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "den aktuelle tid"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "et tidspunkt du angiver"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "et tidspunkt relativt til den aktuelle tid"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Sammenlign med"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "nu"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<klik her for at vælge en mappe>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Tilføj filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redigér filterregel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "indkommende"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "udgående"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redigér filtre"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Så"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Tilføj handling"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Fjern handling"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Du glemte at vælge en mappe.\n"
-"Venligst gå tilbage og specificér en gyldig mappe for levering af e-post."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Vælg mappe"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Indtast URI for mappen"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<klik her for at vælge en mappe>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fejl i regulært udtryk '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Regelnavn: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Uden navn"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Hvis"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Udfør handlinger"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er mødt"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "hvis et kriterie er mødt"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Tilføj kriterie"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Fjern kriterie"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Svaret til"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Vigtig"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Læst"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redigér VMapper"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Indkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Udgående"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Visuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "VMappe-kilder"
-
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Besvaret"
-
-#: filter/libfilter-i18n.h:14
-msgid "Assign Colour"
-msgstr "Giv farve"
-
-#: filter/libfilter-i18n.h:15
-msgid "Assign Score"
-msgstr "Giv point"
-
-#: filter/libfilter-i18n.h:16
-msgid "Copy to Folder"
-msgstr "Kopiér til mappe"
-
-#: filter/libfilter-i18n.h:17
-msgid "Date received"
-msgstr "Dato modtaget"
-
-#: filter/libfilter-i18n.h:18
-msgid "Date sent"
-msgstr "Dato sendt"
-
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Udkast"
-
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "Udtryk"
-
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Mærket"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
-msgstr "Diskussionsliste"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
-msgstr "Beskedskrop"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "Beskedshoved"
-
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "Beskeden blev modtaget"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "Beskeden blev sendt"
-
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "Flyt til folder"
-
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "Modtagere"
-
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
-msgstr "Passer på regulært udtryk"
-
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Læst"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Point"
-
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Sæt flag"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "_Sæt Status"
-
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Kilde"
-
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
-msgstr "Specifik header"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
-msgstr "Stop behandling"
-
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "indeholder ikke"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "lyder ikke som"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "er større end"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "er mindre end"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "på eller efter"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "på eller før"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:158
-msgid "was after"
-msgstr "var efter"
-
-#: filter/libfilter-i18n.h:159
-msgid "was before"
-msgstr "var før"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Tilføj regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Redigér skoringsregel"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Tilføj regel for VMapper"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redigér VMappe-regel"
-
-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr "Kan ikke registrere gemning i skallen"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Gem søgning som vFolder"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Krop eller emne indeholder"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Kroppen indeholder"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Emnet indeholder"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Krop indeholder ikke"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Emne indeholder ikke"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr ""
-
-#: mail/folder-browser.c:665
-msgid "VFolder on Subject"
-msgstr "VMappe for emne"
-
-#: mail/folder-browser.c:666
-msgid "VFolder on Sender"
-msgstr "VMappe for afsender"
-
-#: mail/folder-browser.c:667
-msgid "VFolder on Recipients"
-msgstr "VMappe for modtagere"
-
-#: mail/folder-browser.c:668 mail/folder-browser.c:786
-#, fuzzy
-msgid "VFolder on Mailing List"
-msgstr "Filtrér efter epostliste"
-
-#: mail/folder-browser.c:670
-msgid "Filter on Subject"
-msgstr "Filtrér efter emne"
-
-#: mail/folder-browser.c:671
-msgid "Filter on Sender"
-msgstr "Filtrér efter afsender"
-
-#: mail/folder-browser.c:672
-msgid "Filter on Recipients"
-msgstr "Filtrér efter modtager"
-
-#: mail/folder-browser.c:673 mail/folder-browser.c:785
-msgid "Filter on Mailing List"
-msgstr "Filtrér efter epostliste"
-
-#: mail/folder-browser.c:679 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Åbn"
-
-#: mail/folder-browser.c:681
-msgid "Save As..."
-msgstr "Gem som..."
-
-#: mail/folder-browser.c:682 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Udskriv"
-
-#: mail/folder-browser.c:684
-msgid "Reply to Sender"
-msgstr "Svar til afsender"
-
-#: mail/folder-browser.c:685 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: mail/folder-browser.c:686 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Videresend"
-
-#: mail/folder-browser.c:687 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Videresend mellem linjerne"
-
-#: mail/folder-browser.c:689
-msgid "Mark as Read"
-msgstr "Mærkér som _læst"
-
-#: mail/folder-browser.c:690
-msgid "Mark as Unread"
-msgstr "Mærkér som ulæst"
-
-#: mail/folder-browser.c:692
-msgid "Move to Folder..."
-msgstr "Flyt til mappe..."
-
-#: mail/folder-browser.c:693
-msgid "Copy to Folder..."
-msgstr "Kopiér til mappe..."
-
-#: mail/folder-browser.c:695
-msgid "Undelete"
-msgstr "Fortryd sletning"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:699
-msgid "Apply Filters"
-msgstr "Anvend filtre"
-
-#: mail/folder-browser.c:701
-msgid "Create Rule From Message"
-msgstr "Skab regel fra besked"
-
-#: mail/folder-browser.c:788
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtrér efter epostliste (%s)"
-
-#: mail/folder-browser.c:789
-#, fuzzy, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr "Filtrér efter epostliste (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Gnome kalender"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Gnome kalender"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Kan ikke initiere Evolutions composer."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Nuværende gemningsformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Postkasseformat"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nyt gemningsformat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: mail/mail-accounts.c:116
-msgid " (default)"
-msgstr ""
-
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne konto?"
-
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
-msgid "Are you sure you want to delete this news account?"
-msgstr "Er du sikker på at du vil slette denne nyhedskonto?"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
-msgid "Evolution Account Manager"
-msgstr "Evolution kontobehandler"
-
-#: mail/mail-account-editor.c:290
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
-msgid "Evolution Account Editor"
-msgstr "Evolution kontoredigering"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Send til %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Epost fra %s"
-
-#: mail/mail-autofilter.c:284
-#, c-format
-msgid "%s mailing list"
-msgstr "%s diskussionsliste"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Du har ikke konfigureret epostklienten.\n"
-"Du skal gøre dette før du kan sende,\n"
-"modtage eller skrive beskeder.\n"
-"Vil du konfigurere den nu?"
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Du skal konfigurere en identitet\n"
-"før du kan sende epost."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Du skal konfigurere en epost-transport\n"
-"før du kan sende epost."
-
-#: mail/mail-callbacks.c:192
-msgid "You have not set a mail transport method"
-msgstr "Du har ikke sat en transportmetode for e-post"
-
-#: mail/mail-callbacks.c:225
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Denne meddelse har intet emne.\n"
-"Skal den sendes alligevel?"
-
-#: mail/mail-callbacks.c:292
-msgid "You must configure an account before you can send this email."
-msgstr "Du skal konfigurere en konto før du kan sende dette brev."
-
-#: mail/mail-callbacks.c:314
-msgid "You must specify recipients in order to send this message."
-msgstr "Du skal specificere modtagere for at kunne sende denne besked."
-
-#: mail/mail-callbacks.c:577
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Den %s skrev %s:\n"
-
-#: mail/mail-callbacks.c:735
-msgid "Forwarded message:\n"
-msgstr "Videresendt meddelelse:\n"
-
-#: mail/mail-callbacks.c:820
-msgid "Move message(s) to"
-msgstr "Flyt meddelelse(r) til"
-
-#: mail/mail-callbacks.c:822
-msgid "Copy message(s) to"
-msgstr "Kopiér meddelelse(r) til"
-
-#: mail/mail-callbacks.c:957
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Du kan kun redigere beskeder lagret\n"
-"i Skitser-kataloget."
-
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-callbacks.c:1038
-msgid "Save Message As..."
-msgstr "Gem besked som..."
-
-#: mail/mail-callbacks.c:1040
-msgid "Save Messages As..."
-msgstr "Gem beskeder som..."
-
-#: mail/mail-callbacks.c:1148
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fejl ved indlæsning af filter information:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1197
-msgid "Print Message"
-msgstr "Udskriv besked"
-
-#: mail/mail-callbacks.c:1244
-msgid "Printing of message failed"
-msgstr "Udskrivning af besked mislykkedes"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "kontoinformation"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Kontoadministration"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaber for konto"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringtype:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Automatisk tjek post hver"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Tjek indstillinger"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Din epost-konfiguration er nu komplet.\n"
-"Klik \"Fuldfør\" for at gemme dine nye indstillinger"
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Standard"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Gjort"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-postadresse:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "Epostadresse:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Konfiguration af Evolution epost"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Fulde navn:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Værtsnavn:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Server for indkommende post"
-
-#: mail/mail-config.glade.h:34
-msgid "Keep mail on server"
-msgstr "Behold post på tjener"
-
-#: mail/mail-config.glade.h:35
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Account"
-msgstr "Epostkonto"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration"
-msgstr "Konfiguration af epost"
-
-#: mail/mail-config.glade.h:39
-msgid "Mail Configuration Druid"
-msgstr "Konfigurationguide for epost"
-
-#: mail/mail-config.glade.h:40
-msgid "Make this my default account"
-msgstr "Gør dette til min standardkonto"
-
-#: mail/mail-config.glade.h:41
-msgid "Mark messages as \"Read\" after:"
-msgstr ""
-
-#: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Forskelligt"
-
-#: mail/mail-config.glade.h:44
-msgid "News"
-msgstr "Nyheder"
-
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Alternativ"
-
-#: mail/mail-config.glade.h:47
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Tjener for udgående post"
-
-#: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "PGP binary path:"
-msgstr "PGP-kryptering"
-
-#: mail/mail-config.glade.h:51
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "Almindelig tekst"
-
-#: mail/mail-config.glade.h:54
-msgid "Receiving Email"
-msgstr "Modtager post"
-
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Husk min adgangskode"
-
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Nødvendigt"
-
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Gem adgangskode"
-
-#: mail/mail-config.glade.h:60
-msgid "Select PGP binary"
-msgstr "Vælg PGP binær"
-
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Vælg signaturfil"
-
-#: mail/mail-config.glade.h:62
-msgid "Send mail in HTML format by default."
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Sending Email"
-msgstr "Sender post"
-
-#: mail/mail-config.glade.h:65
-msgid "Server Configuration"
-msgstr "Konfiguration af tjener"
-
-#: mail/mail-config.glade.h:66
-msgid "Server Type: "
-msgstr "Tjenertype:"
-
-#: mail/mail-config.glade.h:67
-msgid "Server requires authentication"
-msgstr "Server kræver autentificering"
-
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Tjenere"
-
-#: mail/mail-config.glade.h:69
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Denne server krøver en sikker forbindelse (SSL)"
-
-#: mail/mail-config.glade.h:74
-msgid "Transport"
-msgstr "Transport"
-
-#: mail/mail-config.glade.h:75
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Indtast navnet som du ønsker at bruge for disse servere. For eksempel: 'job' "
-"eller 'hjemme'."
-
-#: mail/mail-config.glade.h:78
-msgid "User Information"
-msgstr "Brugerinformation"
-
-#: mail/mail-config.glade.h:79
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: mail/mail-config.glade.h:80
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "minutter."
-
-#: mail/mail-config-druid.c:401
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:495
-msgid "Namespace:"
-msgstr ""
-
-#: mail/mail-config-druid.c:683
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:1042
-msgid "Evolution Account Wizard"
-msgstr "Evolution konto-troldmand"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Gem bilag"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke oprette midlertidig katalog: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Gem på disk..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Åbn i %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Vis i brev"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Ekstern visning"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Vis i brev (via %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Skjul"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilag"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Indlæser indholdet af beskeden"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Krypteret besked ikke vist"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Krypteret besked"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Klik på ikonen for at dekryptere."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peger til FTP-tjener (%s)"
-
-#: mail/mail-format.c:1639
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
-
-#: mail/mail-format.c:1643
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peger til lokal fil (%s)"
-
-#: mail/mail-format.c:1677
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
-
-#: mail/mail-format.c:1682
-msgid "Malformed external-body part."
-msgstr "Fejludformet del for ekstern-krop."
-
-#: mail/mail-local.c:456
-#, c-format
-msgid "Opening '%s'"
-msgstr "Åbner '%s'"
-
-#: mail/mail-local.c:738
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Ændrer mappe \"%s\" til \"%s\" format"
-
-#: mail/mail-local.c:742
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Ændr mappe \"%s\" til \"%s\" format"
-
-#: mail/mail-local.c:766
-msgid "Reconfiguring folder"
-msgstr "_Rekonfigurér mappe"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:795
-msgid "Closing current folder"
-msgstr "Lukker aktiv mappe"
-
-#: mail/mail-local.c:827
-msgid "Renaming old folder and opening"
-msgstr "Ændrer navn på gammel mappe og genåbner"
-
-#: mail/mail-local.c:845
-msgid "Creating new folder"
-msgstr "Opretter en ny mappe"
-
-#: mail/mail-local.c:859
-msgid "Copying messages"
-msgstr "Kopierer beskeder"
-
-#: mail/mail-local.c:880
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
-"ikke kunne åbne denne mappe igen: %s"
-
-#: mail/mail-local.c:919
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Hvis du ikke kan åbne denne postboks igen skal\n"
-"du reparere den manuelt."
-
-#: mail/mail-mt.c:137
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:139
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
-msgid "Working"
-msgstr "Arbejder"
-
-#: mail/mail-mt.c:707
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:516
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sender '%s'"
-
-#: mail/mail-ops.c:518
-msgid "Sending message"
-msgstr "Sender meddelelse"
-
-#: mail/mail-ops.c:744
-msgid "Saving message to folder"
-msgstr "Gemmer besked i mappe"
-
-#: mail/mail-ops.c:817
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Flytter meddelelser til %s"
-
-#: mail/mail-ops.c:817
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Kopierer beskeder til %s"
-
-#: mail/mail-ops.c:834
-msgid "Moving"
-msgstr "Flytter"
-
-#: mail/mail-ops.c:837
-msgid "Copying"
-msgstr "Kopiérer"
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s besked %d af %d (bruger-id \"%s\")"
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Skanner mapper i '%s'"
-
-#: mail/mail-ops.c:1068
-msgid "Forwarded messages"
-msgstr "Videresendte meddelelser"
-
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
-#, c-format
-msgid "Opening folder %s"
-msgstr "Åbner mappe %s"
-
-#: mail/mail-ops.c:1176
-#, c-format
-msgid "Opening store %s"
-msgstr ""
-
-#: mail/mail-ops.c:1363
-msgid "Expunging folder"
-msgstr "Tømmer mappe for slettede beskeder"
-
-#: mail/mail-ops.c:1412
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Modtager meddelelse %s"
-
-#: mail/mail-ops.c:1479
-msgid "Retrieving messages"
-msgstr "Modtager meddelelser"
-
-#: mail/mail-ops.c:1489
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter besked nummer %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1563
-msgid "Saving messages"
-msgstr "Gemmer beskeder"
-
-#: mail/mail-ops.c:1642
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Kunne ikke oprette uddatafil:  %s\n"
-" %s"
-
-#: mail/mail-ops.c:1655
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gemmer besked %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1669
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Fejl ved gemning af beskeder til: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1743
-msgid "Saving attachment"
-msgstr "Gemmer bilag"
-
-#: mail/mail-ops.c:1758
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:1786
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kan ikke skrive data: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr ""
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr ""
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr ""
-
-#: mail/mail-send-recv.c:268
-msgid "Updating ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
-msgid "Waiting ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:289
-msgid "Sending"
-msgstr ""
-
-#: mail/mail-send-recv.c:484
-msgid "Cancelled."
-msgstr ""
-
-#: mail/mail-send-recv.c:488
-msgid "Complete."
-msgstr ""
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "Ufuldstændig meddelse skrevet til rør!"
-
-#: mail/mail-tools.c:146
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Kunne ikke oprette midlertidig mbox '%s': %s"
-
-#: mail/mail-tools.c:199
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (videresendt meddelelse)"
-
-#: mail/mail-tools.c:209
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (uden emne)"
-
-#: mail/mail-tools.c:226
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Videresendt meddelelse - %s"
-
-#: mail/mail-tools.c:228
-msgid "Forwarded message (no subject)"
-msgstr "Videresendt meddelelse (intet emne)"
-
-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "VMapper"
-
-#: mail/mail-vfolder.c:321
-msgid "New VFolder"
-msgstr "Ny VMappe"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Svar til afsenderen af denne meddelelse"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Svar til alle modtagere af denne meddelelse"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Videresend denne meddelelse"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Udskriv den valgte meddelelse"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Slet denne meddelelse"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Ulæst"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr ""
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Flere beskeder"
-
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s m.fl."
-
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<ukendt>"
-
-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "Idag %h:%M"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "Igår %h:%M"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%a %Y-%m-%d %H:%M:%S"
-
-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%a %d %Y"
-
-#: mail/message-list.c:1172
-msgid "From"
-msgstr "Afsender"
-
-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "Modtaget"
-
-#: mail/message-list.c:1173
-msgid "To"
-msgstr "Modtager"
-
-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "Størrelse"
-
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Indtast venligst din %s adgangskode for %s"
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Indtast venligst din %s adgangskode"
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-program ikke tilgængelig."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "Ingen adgangskode oplyst."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikke oprette rør til GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Ingen modtagere specificeret"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikke oprette midlertidig fil: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Mappe"
-
-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "Gem"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "Vis mapper som som starter med:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Henter lager for \"%s\""
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Abonnerer på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:282
-#, fuzzy, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Sletter abonnement på mappe \"%s\""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Mappetype:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "Ikke nok plads til at oprette mappen"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "Importerer"
-
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr ""
-
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "Vælg fil"
-
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "Filtype:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "Importér"
-
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution importeringsprogram"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution importørprogram"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution installation"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Denne nye version af Evolution skal installere flere filer i\n"
-"dit personlige Evolution-katalog"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Klik venligst \"Ok\" for at installere filerne, eller 'annullér' for at "
-"afslutte."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Kunne ikke opdatere filer korrekt"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolutions filer blev installeret."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Dette ser ud til at være første gang du kører Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Venligst klik \"OK\" for at installere Evolutions brugerfiler under"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kan ikke oprette kataloget\n"
-"%s\n"
-"Fejl: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan ikke kopiere filer til\n"
-"'%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Filen '%s' er ikke et katalog.\n"
-"Venligst fjern denne for at tillade installation\n"
-"af Evolution's brugerfiler."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Filen '%s' er ikke et katalog.\n"
-"Venligst fjern denne for at tillade installation\n"
-"af Evolution's brugerfiler."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikke oprette specificeret katalog:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Det angivne katalognavn er ikke gyldigt."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - opret ny mappe"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typen på den valgte mappe er ikke gyldig til\n"
-"den ønskede operation."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Ny..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Unavngivet)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Fejl-Frede fandtes ikke i din $PATH"
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Fejl-Frede kunne ikke køres"
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Ophavsret tilhørende Ximian, Inc. 1999-2001."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution er en samling af gruppeorienterede anvendelser\n"
-"til administrering af post, kalender og aftaler\n"
-"indenfor Gnomes skrivebordsmiljø."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Gå til mappe..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mapper"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke opsætte lokal gemning -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ups! Visningen for `%s' døde uventet. :-(\n"
-"Dette betyder sandsynligvis at %s komponenten er brudt ned."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Opret en ny kontakt"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Gruppenavn:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Ønsker du virkelig at fjerne gruppe %s\n"
-"fra genvejsbjælken?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Fjern ikke"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Vis genveje som små ikoner"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Store i_koner"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Vis genveje som store ikoner"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Ny gruppe..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Opret en ny genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Fjern denne gruppe..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Fjern denne genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "Skjul genvejsbjælken"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Skjul genvejsbjælken"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktivér"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Aktivér denne genvej"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne genvej fra genvejsbjælken"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Fejl under gemning af genveje."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Vis den valgte mappe"
-
-#: shell/e-storage.c:178
-msgid "(No name)"
-msgstr "(Uden navn)"
-
-#: shell/e-storage.c:429
-msgid "No error"
-msgstr "Ingen fejl"
-
-#: shell/e-storage.c:431
-msgid "Generic error"
-msgstr "Almindelig fejl"
-
-#: shell/e-storage.c:433
-msgid "A folder with the same name already exists"
-msgstr "En mappe med samme navn eksisterer allerede"
-
-#: shell/e-storage.c:435
-msgid "The specified folder type is not valid"
-msgstr "Specificeret mappetype er ikke gyldig"
-
-#: shell/e-storage.c:437
-msgid "I/O error"
-msgstr "I/U-fejl"
-
-#: shell/e-storage.c:439
-msgid "Not enough space to create the folder"
-msgstr "Ikke nok plads til at oprette mappen"
-
-#: shell/e-storage.c:441
-msgid "The specified folder was not found"
-msgstr "Angivet mappe blev ikke fundet"
-
-#: shell/e-storage.c:443
-msgid "Function not implemented in this storage"
-msgstr "Funktionen ikke implementeret i denne gemning"
-
-#: shell/e-storage.c:445
-msgid "Permission denied"
-msgstr "Adgang nægtet"
-
-#: shell/e-storage.c:447
-msgid "Operation not supported"
-msgstr "Operationen er ikke understøttet"
-
-#: shell/e-storage.c:449
-msgid "The specified type is not supported in this storage"
-msgstr "Den angivne type er ikke understøttet i denne gemning"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution-skallen."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hejsa. Tak for at du har taget tid til at hente denne smugkigsudgave \n"
-"af gruppevare-samlingen Evolution.\n"
-"\n"
-"I løbet af tiden siden sidste udgivelse har vores fokus været på at gøre\n"
-"Evolution brugbar. Mange af Evolutions udviklere bruger nu Evolution\n"
-"til altid at læse deres post. Det kunne du også gøre. (Blot husk\n"
-"at have en sikkerhedskopi.)\n"
-"\n"
-"Men selvom vi har ordnet mange fejl omkring stabilitet og sikkerhed,\n"
-"er der stadig en ansvarsfraskrivelse. Evolution vil: gå ned,\n"
-"tabe din post selv om du ikke ønsker det, nægte at slette din post når\n"
-"du ønsker det, efterlade vildfarne kørende processer, bruge 100 % Cpu,\n"
-"fastlåse, sende Html til tilfældige postlister, og ydmyge dig overfor dine\n"
-"venner og kolleger. Benyt det på eget ansvar.\n"
-"\n"
-"Vi håber du vil nyde resultaterne af vores hårde arbejde, og vi\n"
-"venter ivrigt på dine bidrag!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Tak\n"
-"Holdet bag Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan ikke initialisere Evolution-skallen."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Deaktiveret."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Opret ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slet kontakt"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Find"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Find kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Udskriv kontakt"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stop"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stop indlæsning"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Vis alle"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfiguration af _adressebog..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Udskriv kontakter..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Søg efter kontakter"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Værktøj"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "Fem dage"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Ændr opsætning"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "_Kalender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Opsætning af kalender"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Opret en ny aftale"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Opret en ny kalender"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Dag"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Gå tilbage i tiden"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Gå fremad i tid"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Gå til"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Gå til specifik dato"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Gå til nutiden"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Måned"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Næste"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Smugkig"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gem som"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Gem kalender som noget andet"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Vis én dag"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Vis én måned"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Vis én uge"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Vis arbejdsugen"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "I dag"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Uge"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Ny"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Åbn kalender"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Udskriv denne kalender"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Gem som..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Slet dette punkt"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Slet..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hjælp"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv kuvert..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Udskriv denne ting"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Udskriv..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "_Gem som..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gem og luk"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Gem kontakten og luk dialogboksen"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Send _kontaktperson til andre..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Se hjælpetekster"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Ny _meddelelse til kontaktperson"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Fil"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Udskriv..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Gem"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikation"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "T_øm"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Klip _ud"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Tøm"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Tøm det valgte"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Luk denne aftale"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kopiér til mappe... (RET)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopiér"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopiér valget"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Klip ud"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Klip valget ud"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse af grænsefladen som XML"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Fø_rste opføring i mappe (RET)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Videresend (RET)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Videresend som v_Calendar (RET)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Gå til næste opføring"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Gå til forrige opføring"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Ændr filens egenskaber"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "N_æste"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Indsæt"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Indsæt fra klippebordet"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Forri_ge"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Forri_ge"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Vis udskrift"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Skriverops_ætning..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Skriveropsætning"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Gem"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gem aftalen og luk dialogboksen"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gem aktiv fil"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Planlæg møde"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Planlæg møde"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Opsæt et eller andet møde"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Vælg alle"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Vælg alt"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Redigér sideindstillinger for aktiv skriver"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Om..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "L_uk"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (RET)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopiér"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Fejlsøg"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Hjælp"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Opføring (RET)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journalopføring (RET)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Postmeddelelse (RET)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Flyt til mappe... (RET)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note (RET)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Indsæt"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Udskriv"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Egenska_ber..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Vælg alle"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "Opgave (RET)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Tilføj tjeneste"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Tilføj ny tjeneste til ledelsesresumé"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Opret en nyt brev"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Indstillinger for Ledelsesresumé..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nyt post"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Skriv en ny meddelelse"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopiér meddelelse til en ny mappe"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Mapper"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtrér _efter afsender"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtrér efter mod_tager"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Glem _adgangskoder"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent post"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgte beskeder"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slettede beskeder"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul _læste beskeder"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Brev_filtre..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Behandl abonnementer..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Mærk som _læst"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Mærk som _ulæst"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flyt"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flyt meddelelsen til en ny mappe"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Viser forhåndsvisning af beskeden som skal udskrives"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vis udskrift af besked..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Udskriv besked til printeren"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Udskriv besked..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svar til _afsender"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "Kilde"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Vælg _alle"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Afsend køet post og modtag ny post"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Vis _alle beskeder"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Trådet meddelelsesliste"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VMappe for _afsender"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VMappe for _modtagere"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Vis rå beskedskildetekst"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Anvend filtre"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigurér folder..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopiér til mappe..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Redigér besked"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Tøm skrældespand"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrér efter emne"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_versér udvalg"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Konfiguration af epost..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Besked"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Flyt til mappe..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Åbn i nyt vindue"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Udskriv besked"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Gem besked som..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Trådet"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Fortryd sletning"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMappe for emne"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering af _virtuelle mapper..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Vedhæft"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Luk aktiv fil"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Kryptér denne besked med PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Indsæt en fil som tekst i meddelelsen"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Indsæt tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Åbn en fil"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP-kryptering"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP-underskrift"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gem _kladde"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gem i _mappe..."
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Gem i mappe..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Gem den aktive fil med et andet navn"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Gem meddelelsen i en angivet mappe"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Send"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Send _senere"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Send meddelser i HTML-format"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Send beskeden senere"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send meddelelsen nu"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Send denne meddelelse nu"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Vis/skjul bilag"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Vis _bilag"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Vis bilag"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Underskriver denne besked med din PGP-nøgle"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Indsæt tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Åbn..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sikkerhed"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Tilføj mappe på listen over abonnerede mapper"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Læs listen igen"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Læs mappelisten igen"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abonnerede mapper"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Abonnér"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Tilegn opgave (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Find igen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Genopret"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Genopret fortrudt handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Erstat"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Erstat en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Svar til a_lle (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Søg efter samme streng igen"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Søg efter en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Fortryd"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Fortryd sidste handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Svar (RET)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Opret ny opgave"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Ny"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Opsætning af opgaver..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Om Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Personificér..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personificér"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personificér værktøjslinjer"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Vis en anden mappe"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Afslut"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution bjælke_genvej"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Afslut"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Afslut programmet"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Kom _i gang"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr ""
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Den centrale værktøjslinje"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Vis oplysninger om Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Vis mappe_bjælken"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Vis genvejsbjælken"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Indsend fejlrapport"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Indsend _fejlrapport"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Indsend fejlrapport med Fejl-Frede."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Slå visning af mappelinjen til/fra"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Slå visning af genvejslinjen til/fra"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Bruger behandleren af kontakter"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Brug af kalenderen"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Brug af postdelen"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Mapper"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Gå til mappe..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importér fil..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indeks"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Afsend besked"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Opsætning"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d. %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Optaget"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ude"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invitér andre..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbejdstid"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ud"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Opdater fri/optaget"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovælg"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og resurser"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en resurse"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Nødvendige mennesker"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Nødvendige mennesker _og en resurse"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for mødets _start:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for mødets slutning:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltagere"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "mtotfls"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nu"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr " "
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Advarsel"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Spørgsmål"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Besked"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "_Søg"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-#, fuzzy
-msgid "The Personal Addressbook Server"
-msgstr "Kilder til adressebog"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-
-#: wombat/wombat.c:153
-#, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Kunne ikke initiere Gnome"
-
-#: wombat/wombat.c:165
-#, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Kunne ikke initiere Gnome"
-
-#: wombat/wombat.c:178
-#, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Kunne ikke initiere Bonobo"
-
-#: evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution bjælke_genvej"
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index 01ab0c3749..0000000000
--- a/po/de.po
+++ /dev/null
@@ -1,8017 +0,0 @@
-# German po for Evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Kai Lahmann <kl@linuxfaqs.de>, 2000.
-# Matthias Warkus <mawa@iname.com>, 2000.
-#
-# Sprachregelungen:
-# task = Aufgabe (Auftrag klingt nach Buchhaltung)
-# mailbox = Postfach (dt. Mailbox ist die Übersetzung von "BBS")
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-02-16 17:46+0100\n"
-"PO-Revision-Date: 2001-02-16 17:56+01:00\n"
-"Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Karte: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Name: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Präfix:     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Vorname:     "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Zusätzlich: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familienname:     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffix:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Geburtsdatum: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postfach:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Suffix:        "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Straße:     "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ort:     "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:     "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postleitzahl: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:     "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Postvermerk: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefone:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-Mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-Mail:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Mailer: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zeitzone: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geographischer Ort: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Berufsbezeichnung: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Firma: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Name:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Einheit:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Einheit2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Einheit3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Einheit4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorien: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Eindeutige Zeichenkette: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Öffentlicher Schlüssel: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Factory, um GnomeCard-Dateien in Evolution zu importieren."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importiert GnomeCard-Dateien in Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Konnte Bonobo nicht initialisieren"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Inaktiv"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronisieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Aus Pilot kopieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "In Pilot kopieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Aus Pilot einfließen lassen"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "In Pilot einfließen lassen"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Ursprünglicher Autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution-Adressbuch-Verbindung"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-Adressbuch-Verbindung.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronisationsaktion"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Conduit-Zustand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Kein Pilot konfiguriert, bitte wählen Sie zunächst\n"
-"das Capplet \"Pilot-Verbindungseigenschaften\"."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nicht mit dem gnome-pilot-Dämon verbunden"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ein Fehler trat beim dem Versuch auf, die Pilot-\n"
-"Liste vom gnome-pilot-Dämon zu lesen"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Cursor konnte nicht geladen werden\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook nicht geladen\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Konnte den wombat-Server nicht starten"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Konnte wombat nicht starten"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Die Adress-Verbindung konfigurieren"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution-Adress-Verbindung"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Jahrestag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "Geschäftlich"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "Geschäftliches Fax"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "Kontakte..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Kategorien..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontakteditor"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Details"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Einsortieren unter:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Allgemein"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Neuer Telefon-Typ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "Notizen:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefon-Typen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Primäre E-Mail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Will HTML-Mail erhalten"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Adresse der Webseite:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "Hinzufügen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "Adresse..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Name des Assistenten:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Geburtstag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "Geschäftlich"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Firma:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "Löschen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "Abteilung:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "Voller Name..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "Zu Hause"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "Stellenbezeichnung:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "Name des Vorgesetzten:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Spitzname:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Büro:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "Beruf:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "Partner:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "Dies ist die Postadresse"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Kontakt löschen?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Dieser Kontakt gehört in folgende Kategorien:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Geschäftlich"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Geschäftlich 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Geschäftliches Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Rückruf"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Zu Hause"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Zu Hause 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax zu Hause"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Andere"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Anderes Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Primär"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-Mail 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Adresse prüfen"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Land:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finnland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "Ort:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postfach:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Staat/Bundesland:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "Postleitzahl/_ZIP:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Vollen Namen prüfen"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Fräulein"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Herr"
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Frau"
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Frl."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "Vorname:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "Nachname:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "Mittelname:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "Suffix:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "Titel:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Als _Minikarten"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Als Tabelle"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Bitte geben Sie das Passwort für %s ein"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Kann das Adressbuch nicht öffnen"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Wir haben dieses Adressbuch nicht öffnen können. Dies\n"
-"heißt entweder, dass Sie einen ungültigen URI eingegeben\n"
-"haben, oder versucht haben, auf einen LDAP-Server\n"
-"zuzugreifen, ohne LDAP-Unterstützung eincompiliert zu\n"
-"haben. Wenn Sie einen URI eingegeben haben, prüfen Sie\n"
-"ihn auf Richtigkeit und geben Sie ihn noch einmal ein.\n"
-"Wenn nicht, haben Sie wahrscheinlich versucht, auf einen\n"
-"LDAP-Server zuzugreifen. Wenn Sie LDAP verwenden wollen,\n"
-"müssen Sie OpenLDAP herunterladen, installieren, \n"
-"und Evolution neu compilieren und installieren.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Alle anzeigen"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Komplex..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Irgend ein Feld enthält"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Name enthält"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "E-Mail enthält"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "Die URI, die der Suchdienst anzeigen wird"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP-Server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Datei"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Unbekannter Adressbuch-Typ"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Kein (Anonymer Modus)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Passwort"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Unbekannter Legitimationstyp"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Ein"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Unterbaum"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Unbekannter Gültigkeitsbereichstyp"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "DN binden:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME DN-Bindungs-Hilfetext hier"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Dieses Passwort speichern"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Host-Rechner:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Host-Rechner-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Port-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Root-DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root-DN-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Suche-Bereich:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Legitimation:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Pfad:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pfad-Hilfetext hier"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Pfad erstellen wenn er noch nicht existiert."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Adressbuch bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Adressbuch hinzufügen"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Wählen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
-"Informationen ein."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Name:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Hilfetext zum Namen hier"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beschreibung:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Hilfetext zur Beschreibung hier"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adressbuch-Quellen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Löschen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Name"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Eine beispielhafte Bonobo-Komponente, die ein Adressbuch anzeigt."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control, die eine Evolution-Adressbuch-Minikarte anzeigt."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Evolution-Komponente für Kontaktverwaltung."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory für die Adressbuch-Minikarten-Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Factory für die Evolution-Adressbuch-Komponente."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Suchen..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Nachrichtenempfänger"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Namen wählen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Name wählen aus:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Suchen"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Als VCard speichern"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-Mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Website"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Abteilung"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Beruf"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Lebenspartner"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Notiz"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Frei/beschäftigt-URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Hier klicken, um einen Kontakt hinzuzufügen"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "In Adressbuch speichern"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"In dieser Ansicht gibt es keine Einträge zum Anzeigen.\n"
-"\n"
-"Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 Punkt Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 Punkt Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Leere Formulare am Ende:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Textkörper"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Unten:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Ausmaße:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Schrifart..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Schrifarten"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Fußzeile:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Kopfzeile"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Kopf-/Fußzeile"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Überschriften"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Überschriften für jeden Buchstaben"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Höhe:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Folgen einander unmittelbar"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Dazunehmen:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Querformat"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Links:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Buchstabenreiter an der Seite"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Ränder"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Anzahl Spalten:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Optionen"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Ausrichtung"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Seite"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Seite einrichten:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papier"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papierquelle:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Hochformat"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Vorschau:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Mit grauer Schattierung drucken"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Auf geraden Seiten umkehren"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Rechts:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Abschnitte:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Schattierung"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Größe:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Auf einer neuen Seite beginnen"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilname:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Oben:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Typ:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Breite:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution-Kalender-Verbindung"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-Kalender-Verbindung.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Die GnomeCal-Verbindung konfigurieren"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution-Kalender-Verbindung"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Die To-Do-Verbindung konfigurieren"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution-To-Do-Verbindung"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution-ToDo-Verbindung"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-ToDo-Verbindung.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Erinnerung für Ihren Termin um "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Weiterschlafen"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "OK"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Datei nicht gefunden"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Kalender öffnen"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Kalender speichern"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
-"ORBit und OAF Einstellungen. "
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Transparent"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Opak"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Das Datum muss in diesem Format eingegeben werden: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H.%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Die Priorität muss zwischen 1 und 9 (einschließlich) sein"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Wiederkehrend"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Zugewiesen"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Nein"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%H.%M"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fehler beim Laden des Kalenders</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fehler beim Laden des Kalenders:<br>Methode wird nicht unterstützt"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Anzeige"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Termine anzeigen"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Aufgaben zeigen"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Kalender laden"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "Der URI, den der Kalender anzeigen wird"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm am %A, %d. %b %Y um %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Hinweis auf Ihren Termin am %A, %d. %b %Y um %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Keine Zusammenfassung verfügbar."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Schließen"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Termin bearbeiten"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Weiterschlaf-Zeit (Minuten)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 Minuten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 Minuten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 Stunden (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 Minuten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 Stunden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 Minuten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 Minuten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarme schweigen nach"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Audio-Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Piepsen, wenn Alarmfenster erscheinen."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Kalender-Einstellungen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farben"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Wochenenden komprimieren"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Optionen zum Datumsnavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Voreinstellungen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Anzeigeoptionen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Fällig am"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Weiterschlafen aktivieren für "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Ende des Tages:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Erster Tag der Woche:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Fr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Freitag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markieren"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Heute fällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Heute fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Noch nicht fällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Noch nicht fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Mo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Montag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Überfällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Überfällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Eine Farbe auswählen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Priorität"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Mich an alle Termine erinnern,"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Erinnerungen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Sa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Samstag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Anzeigen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Endzeiten von Terminen anzeigen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Wochennummern zeigen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Anfang des Tages:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "So"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Aufgabenblock"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Do"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Zeit bis Fälligkeit"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Zeit-Unterteilungen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Zeitformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Di"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Mi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbeitswoche"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "Minuten bevor sie auftreten."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "Sekunden."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sind Sie sicher, dass Sie den Journaleintrag `%s' löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% abgeschlossen:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Storniert"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Datum & Zeit"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Abgeschlossen am:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Hoch"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Niedrig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Nicht gestartet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Privat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fortschritt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Öffentlich"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Anfangsdatum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Zusammenfassung:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Aufgabe"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Undefiniert"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "Kontakte..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Fällig am:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorität:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "Status:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Aufgabe bearbeiten"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Keine Zusammenfassung"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Aufgabe - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journal-Eintrag  - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategorien"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Abschlussdatum"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Enddatum"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Anfangsdatum"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geographische Lage"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Fertigstellungsgrad"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Transparenz"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarme"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Als abgeschlossen markieren"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Die Aufgabe als abgeschlossen markieren"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Diese Aufgabe bearbeiten..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Die Aufgabe bearbeiten"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Diese Aufgabe löschen"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Diese Aufgabe löschen"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A, %d. %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a, %d. %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d. %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "AM"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "PM"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Neuer Termin..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Besprechung ansetzen"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Diesen Termin bearbeiten..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Diesen Termin löschen"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Diesen Termin beweglich machen"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Dieses Auftreten löschen"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Jedes Auftreten löschen"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Komponente erfolgreich aktualisiert."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Beim Laden der Kalenderdatei ist ein Fehler aufgetreten."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht geöffnet werden!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht geladen werden!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht gelesen werden!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dies ist eine Antwort von einem Uneingeladenen!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Ihr Kalenderspeicher konnte nicht aktualisiert werden."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Die Kalenderkomponente konnte nicht gelöscht werden!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Komponente erfolgreich gelöscht."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Dieser Typ Kalenderkomponente ist unbekannt."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Annehmen"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Ablehnen"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Vorläufig"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Kalender aktualisieren"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Besprechung absagen"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--an--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Kalendermitteilung"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Datum:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Kalender wird geladen..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Absender"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zusammenfassung:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "datum-ende"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "datum-anfang"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Anwesender"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adresse des Anwesenden"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Anwesende:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Besprechung\n"
-"absagen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Vorsitzender"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Besprechungseinladungen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Nicht-Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Eventueller Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organisator:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Ereignis\n"
-"bekanntmachen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "UAwg"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Besprechung\n"
-"beantragen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Benötigter Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Funktion"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Termin\n"
-"ansetzen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:24
-#: mail/message-list.c:1167
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Alle"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Kategorie:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-"Die Methode, die zum Laden von `%s' benötigt wird, ist nicht unterstützt"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d. %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Ganztägiges Ereignis"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Termin"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Termin-Grundeinstellungen"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Alle"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Ausnahmen"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Ändern"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Einen Klang abspielen"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Vorschau"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Wiederholungsregel"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Ein Programm ausführen"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Eine E-Mail senden"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Einstellungen..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Ein Dialogfenster anzeigen"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Endzeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Anfangszeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Anfangsdatum:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:27
-msgid "after"
-msgstr "nach"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:28
-msgid "before"
-msgstr "vor"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "Tag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "Ende des Termins"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "für"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "für immer"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "Stunde(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "Minute(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "Monat(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "Beginn des Termins"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "bis"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "Woche(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "Jahr(e)"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "bei"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "Tag"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "am"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "Auftreten"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
-"kann."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d Tage"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 Tag"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d Wochen"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 Woche"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d Stunden"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 Stunde"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d Minuten"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 Minute"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d Sekunden"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 Sekunde"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " vor Terminbeginn"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " nach Terminbeginn"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " vor Terminende"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " nach Terminende"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a, %d. %b %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutions Chefsesselansichts-Komponente für den Kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "iTip-/iMip-Betrachter für den Evolution-Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-Komponente für die Verwaltung des Kalenders."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory für die Kalenderzusammenfassungs-Komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory für die Evolution-Kalender-Komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory für die Kalender-iTip-Ansichts-Control"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Factory für die beispielhafte Kalender-Control"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Der Ordner in `%s' konnte nicht geöffnet werden"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-"Die Methode, die zum Öffnen von `%s' benötigt wird, wird nicht unterstützt"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Dezember"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Zu Datum gehen"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Zum heutigen Tag"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Januar"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juli"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juni"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "März"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mai"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Oktober"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME Konnte nicht initialisiert werden"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "So"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Mo"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Di"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Mi"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Do"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Fr"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Sa"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Aufträge"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Aktueller Tag (%a, %d. %b %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a, %d. %b"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a, %d. %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Aktuelle Woche (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Aktueller Monat (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Aktuelles Jahr (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Kalender drucken"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Druckvorschau"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "Der URI, den der Aufgabenordner anzeigen wird"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SMDMDFS"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Fehler beim Ausführen des Filters: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Suchausdruck kann nicht verarbeitet werden: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Ausführen eines Suchausdrucks: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ungültiger Typ in body-contains, Zeichenkette wurde erwartet"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Lockdatei für %s konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Zeitüberschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
-"Versuchen Sie es später noch einmal."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Maildatei %s konnte nicht überprüft werden: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Temporäre Maildatei %s konnte nicht geöffnet werden: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Lockdatei für %s konnte nicht getestet werden: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fehler beim Lesen der Maildatei: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Pipe konnte nicht angelegt werden: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "forK() konnte nicht durchgeführt werden: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail-Programm fehlgeschlagen: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Unbekannter Fehler)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "%s konnte nicht geladen werden: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s-Server %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-Dienst für %s auf %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Verbindung abgebrochen"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(unbekannter Rechner)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Vorgang abgebrochen"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Fehler beim Compilieren eines regulären Ausdrucks: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' benötigt einen Benutzernamen-Teil"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' braucht einen Rechnernamen-Teil"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%ss' braucht einen Pfad-Teil"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Rechner %s gibt es nicht."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Momentan ist es nicht möglich, Rechername %s aufzulösen."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Keine Quelle für Protokoll `%s' verfügbar"
-
-#: camel/camel-session.c:394
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Verzeichnis %s konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-Zeichenkette `%s' enthält kein Protokoll"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-Zeichenkette `%s' enthält ein ungültiges Protokoll"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnummer in URL `%s' ist nicht numerisch"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos-Ticket konnte nicht erhalten werden:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Ungültige Legitimationsantwort vom Server."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Unerwartete Antwort von IMAP-Server: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-Befehl fehlgeschlagen: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Antwort des Servers endete zu früh."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Zusammenfassung für %s konnte nicht geladen werden"
-
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
-msgid "Could not find message body in FETCH response."
-msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
-"Passwortes."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Dies verbindet mit dem IMAP-Server und benutzt Kerberos 4, um sich zu "
-"legitimieren."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Legitimation beim IMAP-Server konnte nicht erreicht werden.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Mailverzeichnisse im MH-Format"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standard-Unix-Postfachdatei"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Zum Speichern lokaler Mail im Standard-mbox-Format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Maildateien im Qmail-maildir-Format"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-"Zum Speichern lokaler Mail in Mailverzeichnissen im qmail-maildir-Format"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Speicherwurzel `%s' ist kein reguläres Verzeichnis."
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Ordner kann nicht abgerufen werden: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Lokale Speicher haben keinen Posteingangsordner"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokale Maildatei %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gelöscht werden: %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Ordner-Indexdatei `%s' konnte nicht gelöscht werden: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nachricht kann nicht an maildir-Ordner angehängt werden: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nachricht kann nicht erhalten werden: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Keine solche Nachricht"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Ungültiger Inhalt der Nachricht"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht geöffnet werden:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Ordner `%s' existiert nicht."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' ist kein maildir-Verzeichnis."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "kein maildir-Verzeichnis"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Postfach kann nicht geöffnet werden: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Datei `%s' konnte nicht geöffnet werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Datei `%s' konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ist keine reguläre Datei."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht gelöscht werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Ordner `%s' ist nicht leer. Nicht gelöscht."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Zusammenfassen des Ordners"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Ordner konnte nicht geöffnet werden: %s: Zusammenfassung wird begonnen bei "
-"Position %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kann Zusammenfassung von Ordner nicht erstellen: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
-msgid "Synchronising folder"
-msgstr "Ordner Synchronisieren"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Ordner konnte nicht zum Zusammenfassen geöffnet werden: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Zusammenfassungs- und Order-Prüffehler, sogar nach einer Synchronisation"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fehler beim Schreiben auf temporäres Postfach: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fehler beim Schreiben auf temporäres Postfach %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Ordner konnte nicht umbenannt werden: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Unbekannter Fehler: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ist kein Verzeichnis."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Bitte geben Sie das NNTP-Passwort für %s@%s ein"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Server lehnte Benutzername ab"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Benutzername konnte nicht an Server gesendet werden"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Server lehnte Benutzername/Passwort ab"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Nachricht %s nicht gefunden."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "grouplist-Datei für %s konnte nicht geladen werden: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "grouplist-Datei für %s konnte nicht gespeichert werden: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET-News"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Dies ist eine Quelle zum Lesen von und zum Posten in USENET-Newsgroups."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Verzeichnis für Newsserver konnte nicht geöffnet werden: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET-News über %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Diese Option führt die Legitimation am NNTP-Server mit einem "
-"unverschlüsselten Passwort durch."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ".newsrc-Datei für %s konnte nicht geöffnet oder erstellt werden: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Abrufen der POP-Zusammenfassung"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"Ordner konnte nicht geöffnet werden: Nachrichtenliste war unvollständig."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Keine Nachricht mit UID %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Abrufen der POP-Nachricht %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Zum Verbinden mit POP-Servern. Das PO-Protokoll kann auch verwendet werden, "
-"om Mail von manchen Web-Mailprovidern und proprietären E-Mail-Systemen "
-"abzurufen."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Diese Option wird mit dem POP-Server unter einem unverschlüsselten Passwort "
-"verbinden. Viele POP-Server unterstützen nur dies."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Diese Option wird mit dem POP-Server unter einem verschlüsselten Passwort "
-"über das APO-Protokoll verbinden. Dies funktioniert evtl. nicht für alle "
-"Benutzer, sogar auf Servern, die behaupten, es zu unterstützen."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
-"legitimieren."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sBitte geben Sie das POP3-Passwort für %s@%s ein"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
-"Fehler beim Senden des Benutzernamens: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
-"Keine Unterstützung für den verlangten Legitimationsmechanismus."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
-"Fehler beim Senden des Passworts: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Ordner `%s' gibt es nicht."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Zum Ausliefern von Mail durch Übergabe an das Programm \"sendmail\" auf dem "
-"lokalen System."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht gesendet"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht gesendet"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Nachricht konnte nicht gesendet werden: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail brach mit Signal %s ab: Mail nicht gesendet."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "%s konnte nicht ausgeführt werden: Mail nicht gesendet."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail gab Status %d zurück: Mail nicht gesendet."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Mailauslieferung über das Programm sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Zum Ausliefern von Mail über einen Mailknotenpunkt im Netz per SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Syntaxfehler, Befehl nicht erkannt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntaxfehler in Parametern oder Argumenten"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Befehl nicht implementiert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Befehlsparameter nicht implementiert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Systemstatus- oder Systemhilfe-Antwort"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Hilfemeldung"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Dienst ist bereit"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Dienst schließt Übertragungskanal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Angeforderte Aktion nicht ausgeführt: Speicherzuteilung überschritten"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transaktion fehlgeschlagen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Keine Legitimation benötigt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Diese Option wird mit dem SMTP-Server ohne jede Art von Legitimation "
-"verbinden. Dies sollte für die meisten SMTP-Server völlig in Ordnung sein."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Dies verbindet mit dem SMTP-Server und benutzt CRAM-MD5, um sich zu "
-"legitimieren."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-Server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP-Mailauslieferung über %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Nachricht konnte nicht gesendet werden: Sender-Adresse nicht angegeben."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Nachricht konnte nicht gesendet werden: Sender-Adresse nicht gültig."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Nachricht konnte nicht gesendet werden: Keine Empfänger angegeben."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zeitüberschreitung bei HELO-Anfrage: %s: nicht fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO-Antwortfehler: %s: nicht fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht gesendet."
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht gesendet."
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA-Antwortfehler: %s: Mail nicht gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Zeitüberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
-"gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht gesendet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "RSET-Antwort-Fehler: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s: nicht fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT-Antwortfehler: %s: nicht fatal"
-
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "Nachricht existiert nicht: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "E-Mail-Quelle: Virtueller Ordner"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 Byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u Bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1f kB"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1f MB"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1f GB"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "anlage"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Entfernen"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Entferne das gewählte Element aus der Anlagenliste"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Anlage hinzufügen..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Eine Datei zu der Nachricht hinzufügen"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
-msgid "Attachment"
-msgstr "Anlage"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Anlagen-Eigenschaften"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Dateiname:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Eingebettete Anlage"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME-Typ:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Senden als:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Von:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Für das Adressbuch hier klicken"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Geben Sie die Identität ein, mit der Sie diese Nachricht senden wollen"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Gebe die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
-"Empfängerliste auftaucht."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Gebe den Betreff der Nachricht an"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Signaturdatei %s konnte nicht geöffnet werden:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Speichern unter..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fehler beim Speichern der Datei: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fehler beim Laden der Datei: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Speichere Änderungen an Nachricht..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Änderungen an Nachricht speichern..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Fehler beim Speichern des Erstellen in 'Entwürfe': %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Diese Nachricht wurde nicht versandt.\n"
-"\n"
-"Wollen Sie Ihre Änderungen speichern?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Datei öffnen"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Diese Datei existiert nicht."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Diese Datei ist keine normale Datei."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Diese Datei existiert, ist aber nicht lesbar."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Diese Datei scheint lesbar zu sein, aber open(2) schlug fehl."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Diese Datei ist sehr groß (mehr als 100 kB).\n"
-"Sind Sie sicher, dass Sie sie einfügen wollen?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Ein Fehler trat beim Lesen der Datei auf."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Eine Nachricht erstellen"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Konnte Erstellungsfenster nicht erzeugen."
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Evolutions Maileditor kann nicht initialisiert werden."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "Adresskarte"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "Kalender-Information"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-Komponente für die Chefsesselansicht"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory für Evolutions Chefsesselansichts-Komponente."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Sie können eine andere HTML-Seite als Hintergrund für die Chefsesselansicht auswählen.\n"
-"\n"
-"Um die Vorgabe einzustellen, lassen Sie den Eintrag einfach frei."
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s mit der in GNOME voreingestellten Anwendung öffnen"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s mit dem in GNOME voreingestellten Web-Browser öffnen"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "E-Mail wird an %s gesendet"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Die Ansicht auf %s ändern"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s ausführen"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s schließen"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s nach links verschieben"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s nach rechts verschieben"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s in die vorige Zeile verschieben"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s in die nächste Zeile verschieben"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s konfigurieren"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML-Datei kann nicht geöffnet werden:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fehler beim Lesen von Daten:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Datei hat keinen Platz für die Dienste.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aussehen"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Hintergrund:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
-"Falls es eine Warnungsmeldung über den RootPOA gegeben hat, bedeutet das\n"
-"wahrscheinlich, dass Sie Bonobo gegen GOAD statt gegen OAF compiliert\n"
-"haben."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Factory für die RDF-Zusammenfassung."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-Zusammenfassung"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Factory für die Test-Bonobo-Komponente."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Factory für die Test-Komponente."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test-Bonobo-Dienst"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test-Dienst"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Fehler"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Automatisch aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Aktualisieren alle "
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "Minuten"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "Jahr"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "Jahre"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "Monat"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "Monate"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "Woche"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "Wochen"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "Tage"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "Stunde"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "Stunden"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "Minute"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "Sekunde"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "Sekunden"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Hoppla. Sie haben vergessen, ein Datum zu wählen."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Hoppla. Sie haben ein ungültiges Datum gewählt."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Das Datum der Nachricht wird mit der Zeit\n"
-"verglichen, zu der der Filter ausgeführt oder\n"
-"der VFolder geöfnet wird."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Das Datum der Nachricht wird mit der hier\n"
-"von Ihnen angegebenen Zeit verglichen."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Das Datum der Nachricht wird verglichen mit\n"
-"einer zur Zeit der Filterausführung relativen\n"
-"Zeit, z.B. \"vor einer Woche\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "der aktuellen Zeit"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "einer von Ihnen angegebene Zeit"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "einer zur momentanen Zeit relativen Zeit"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Vergleichen mit"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "jetzt"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<hier klicken, um ein Datum zu wählen>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Filterregel hinzufügen"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Filterregel bearbeiten"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "eingehend"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "ausgehend"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filter bearbeiten"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Dann"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Aktion hinzufügen"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Aktion entfernen"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Hoppla, Sie haben vergessen, einen Ordner zu wählen.\n"
-"Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
-"der Mail."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Ordner wählen"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Ordner-URI eingeben"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<hier klicken, um einen Ordner zu wählen>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fehler im regulären Ausdruck '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Wenn"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "wenn alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "wenn irgendwelche Kriterien zutreffen"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Kriterium hinzufügen"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Kriterium entfernen"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Beantwortet an"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Wichtig"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Gelesen"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VOrdner bearbeiten"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregeln"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Eingang"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Ausgang"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuelle Ordner"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "vOrdner-Quellen"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Farbe zuweisen"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Bewertung zuweisen"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "In Ordner kopieren"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Empfangsdatum"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Sendedatum"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Ausdruck"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Weiterleiten an Adresse"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Nachricht wurde empfangen"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Nachricht wurde gesendet"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Empfänger"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Regex-Treffer"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
-msgid "Score"
-msgstr "Bewertung"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Flag"
-msgstr "Marke setzen"
-
-#: filter/libfilter-i18n.h:20
-msgid "Set Status"
-msgstr "Status setzen:"
-
-#: filter/libfilter-i18n.h:21 filter/libfilter-i18n.h:43
-msgid "sounds like"
-msgstr "klingt wie"
-
-#: filter/libfilter-i18n.h:22
-msgid "Source"
-msgstr "Quelle"
-
-#: filter/libfilter-i18n.h:23
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
-
-#: filter/libfilter-i18n.h:25
-msgid "Stop Processing"
-msgstr "Verarbeitung abbrechen"
-
-#: filter/libfilter-i18n.h:26 mail/message-list.c:1168
-msgid "Subject"
-msgstr "Betreff"
-
-#: filter/libfilter-i18n.h:29
-msgid "contains"
-msgstr "enthält"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not contain"
-msgstr "enthält nicht"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not end with"
-msgstr "endet nicht mit"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not exist"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:33
-msgid "does not sound like"
-msgstr "klingt nicht wie"
-
-#: filter/libfilter-i18n.h:34
-msgid "does not start with"
-msgstr "beginnt nicht mit"
-
-#: filter/libfilter-i18n.h:35
-msgid "ends with"
-msgstr "endet mit"
-
-#: filter/libfilter-i18n.h:36
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:37
-msgid "is greater than"
-msgstr "ist größer als"
-
-#: filter/libfilter-i18n.h:38
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: filter/libfilter-i18n.h:39
-msgid "is not"
-msgstr "ist nicht"
-
-#: filter/libfilter-i18n.h:40
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:41
-msgid "on or after"
-msgstr "am oder nach"
-
-#: filter/libfilter-i18n.h:42
-msgid "on or before"
-msgstr "am oder vor"
-
-#: filter/libfilter-i18n.h:44
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:45
-msgid "was after"
-msgstr "war nach"
-
-#: filter/libfilter-i18n.h:46
-msgid "was before"
-msgstr "war vor"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Regel hinzufügen"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Bewertungsregel bearbeiten"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VOrdner-Regel hinzufügen"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "VFolder-Regel bearbeiten"
-
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:215 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "Müll"
-
-#: mail/component-factory.c:301
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
-
-#: mail/component-factory.c:374
-msgid "Cannot register storage with shell"
-msgstr "Speicher kann nicht bei der Shell registriert werden"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Suche als VOrdner speichern"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Rumpf oder Betreff enthält"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Rumpf enthält"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Betreff enthält"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Rumpf enthält nicht"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Betreff enthält nicht"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Absender enthält"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "VOrdner über Betreffzeile"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "VOrdner über Absender"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "VOrdner über Empfänger"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filter über Betreffzeile"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filter über Absender"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filter über Empfänger"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filter über Mailingliste"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Öffnen"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Speichern unter..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Drucken"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Antwort an Absender"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Allen antworten"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Weiterleiten"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Im Rumpf weiterleiten"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Als gelesen markieren"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Als ungelesen markieren"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "In Ordner verschieben..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "In Ordner kopieren..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Löschen rückgängig"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Filter anwenden"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Regel aus Nachricht erzeugen"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter über Mailingliste (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution-Komponente für den Umgang mit Mail."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution-Mailersteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolutions Mail-Chefsesselansicht-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution-Komponente zur Mailordneranzeige."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution-Mailordner-Factory-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Factory für den Evolution-Maileditor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Factory für die Evolution-Mail-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Factory für die Mailzusammenfassungs-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factory, um Outlook-Express-4-Mails in Evolution zu importieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Factory, um mbox in Evolution zu importieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importiert mbox-Dateien in Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktuelles Speicherformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Postfach-Format"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Neues Speicherformat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Hinweis: Beim Konvertieren zwischen Postfach-Formaten\n"
-"kann ein Fehler (wie z.B. fehlender Plattenplatz)\n"
-"eventuell nicht automatisch behoben werden. Bitte\n"
-"verwenden Sie diese Funktion mit Vorsicht."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Keine"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (voreingestellt)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Evolution-Accountverwaltung"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Ein oder mehrere Ihrer Server sind nicht korrekt konfiguriert.\n"
-"Möchten Sie trotzdem speichern?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Evolution-Accounteditor"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail an %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Betreff ist %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "E-Mail von %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "Mailingliste %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Sie haben den Mailclient nicht konfiguriert.\n"
-"Sie müssen dies tun, bevor Sie Mail senden,\n"
-"empfangen oder erstellen können.\n"
-"Möchten Sie ihn jetzt konfigurieren?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Sie müssen eine Identität einrichten,\n"
-"bevor Sie Mail erstellen können."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Sie müssen einen Mailtransport einrichten,\n"
-"bevor Sie Mail erstellen können."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Sie haben keine Mailtransport-Methode eingestellt"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Diese Nachricht hat keine Betreffzeile.\n"
-"Wirklich senden?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Sie müssen einen Account einrichten, bevor Sie diese Mail senden können."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu senden."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Am %s schrieb %s:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Weitergeleitete Nachricht:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Machricht(en) verschieben in"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Machricht(en) kopieren in"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Sie können nur im Entwürfe-Ordner\n"
-"abgespeicherte Nachrichten bearbeiten."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Datei überschreiben?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
-"Überschreiben?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Nachricht speichern unter..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Nachrichten speichern unter..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fehler beim Laden von Filterinformation:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Nachricht drucken"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Drucken der Nachricht fehlgeschlagen"
-
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "Verbindung mit Server"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "Mit Server verbinden"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Account"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Account-Information"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Accountverwaltung"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Account-Eigenschaften"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Komplex"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Legitimation"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Legitimations-Typ:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Automatisch nach Mail sehen alle"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Einstellungen prüfen"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Herzlichen Glückwunsch! Ihre Mailkonfiguration ist \n"
-"abgeschlossen.\n"
-"\n"
-"Sie können jetzt mit Evolution Mail senden und\n"
-"empfangen.\n"
-"\n"
-"Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
-"speichern."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Fertig"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-Mail Adresse:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "E-Mail Adresse:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution-Mailkonfiguration"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Voller Name:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Hostname:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identität"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Server für eingehende Mail"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Mail auf Server belassen"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Mail-Account"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "Mailkonfiguration"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Mailkonfigurations-Druide"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "Dies zu meinem Standardaccount machen"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr "Nachrichten als \"Gelesen\" markieren nach:"
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Diverses"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "Nachrichten"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Optional"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Server für ausgehende Mail"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Passwort:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Einfacher Text"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Mail erhalten"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Passwort speichern"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Benötigt"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Passwort speichern"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Signaturdatei wählen"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Mail normalerweise im HTML-Format senden."
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Sende E-Mail"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Server-Konfiguration"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Servertyp: "
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Server benötigt Legitimation"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Server"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Signaturdatei:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Quellen"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Dieser Server benötigt eine sichere Verbindung (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Typ"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Geben Sie den Namen ein, unter dem Sie diese Server führen wollen, zum "
-"Beispiel \"Büro\" oder \"Privat\"."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Benutzer-Information"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Willkommen zum Evolution-Mailkonfigurations-Druiden!\n"
-"\n"
-"Klicken Sie \"Weiter\" zum Beginnen."
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "Minuten."
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Konfiguration für eingehende Mail konnte nicht bestätigt werden.\n"
-"Sie werden vielleicht Probleme beim Abrufen von Mail von %s erleben."
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Namensraum:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Die Konfiguration für ausgehende Mail konnte nicht bestätigt werden.\n"
-"Sie werden vielleicht Probleme beim Senden von Mail über %s erleben."
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Evolution-Account-Druide"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Anlage speichern"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Auf Platte speichern..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Öffnen in %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "An Ort und Stelle betrachten"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Externer Betrachter"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "An Ort und Stelle betrachten (über %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Verbergen"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s-Anlage"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Laden des Nachrichteninhalts"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Verschlüsselte Nachricht nicht angezeigt"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Verschlüsselte Nachricht"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Zum Entschlüsseln Icon klicken."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
-"nachgewiesen werden."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Zeiger auf FTP-Site (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Zeiger auf lokale Datei (%s) gültig auf Site \"%s\""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Zeiger auf lokale Datei (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Ungültiger external-body-Teil."
-
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "Lokaler Ordner wird registriert"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "Lokalen Ordner registrieren"
-
-#: mail/mail-local.c:553
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Ordner '%s' kann nicht registriert werden:\n"
-"%s"
-
-#: mail/mail-local.c:717
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
-
-#: mail/mail-local.c:721
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
-
-#: mail/mail-local.c:752
-msgid "Reconfiguring folder"
-msgstr "Ordner re-konfigurieren"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:781
-msgid "Closing current folder"
-msgstr "Schließe aktuellen Ordner"
-
-#: mail/mail-local.c:813
-msgid "Renaming old folder and opening"
-msgstr "Benenne alten Ordner um und öffne"
-
-#: mail/mail-local.c:831
-msgid "Creating new folder"
-msgstr "Lege einen neuen Ordner an"
-
-#: mail/mail-local.c:845
-msgid "Copying messages"
-msgstr "Kopiere Nachrichten"
-
-#: mail/mail-local.c:866
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Metainformationen zu Ordner können nicht gespeichert werden; Sie\n"
-"werden ihn wahrscheinlich nie mehr öffnen können: %s"
-
-#: mail/mail-local.c:898
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr "Datei %s konnte nicht geladen werden"
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Fehler beim `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Fehler beim Ausführen eines Vorgangs:\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "In Arbeit"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sende \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Nachricht senden"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Hänge \"%s\" an"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Hänge eine Nachricht ohne eine Betreffzeile an"
-
-#: mail/mail-ops.c:841
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
-
-#: mail/mail-ops.c:843
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
-
-#: mail/mail-ops.c:846
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
-
-#: mail/mail-ops.c:879
-msgid "Moving"
-msgstr "Verschiebe"
-
-#: mail/mail-ops.c:882
-msgid "Copying"
-msgstr "Kopiere"
-
-#: mail/mail-ops.c:902
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s Nachricht %d von %d (UID \"%s\")"
-
-#: mail/mail-ops.c:977
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Taste Ordner in \"%s\" ab"
-
-#: mail/mail-ops.c:1089
-msgid "Forwarded messages"
-msgstr "Weitergeleitete Nachrichten"
-
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
-#, c-format
-msgid "Opening folder %s"
-msgstr "Ordner %s öffnen"
-
-#: mail/mail-ops.c:1195
-#, c-format
-msgid "Opening store %s"
-msgstr "Öffnen des Speichers %s"
-
-#: mail/mail-ops.c:1376
-msgid "Expunging folder"
-msgstr "Säubere Ordner"
-
-#: mail/mail-ops.c:1425
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Nachricht %s abrufen"
-
-#: mail/mail-ops.c:1492
-msgid "Retrieving messages"
-msgstr "Nachrichten abrufen"
-
-#: mail/mail-ops.c:1502
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Rufe Nachricht Nummer %d von %d ab (UID \"%s\")"
-
-#: mail/mail-ops.c:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "Müllordner für %s wird geöffnet"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Ordner %s für %s laden"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Ordner %s für %s laden"
-
-#: mail/mail-ops.c:1969
-msgid "Saving messages"
-msgstr "Nachrichten speichern"
-
-#: mail/mail-ops.c:2048
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Ausgabedatei konnte nicht erstellt werden: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2061
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Nachricht %d von %d (UID \"%s\") speichern"
-
-#: mail/mail-ops.c:2075
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Fehler beim Speichern der Nachrichten in: %s\n"
-"%s"
-
-#: mail/mail-ops.c:2149
-msgid "Saving attachment"
-msgstr "Speichern der Anlage"
-
-#: mail/mail-ops.c:2164
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Ausgabedatei kann nicht erstellt werden: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2192
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Daten konnten nicht geschrieben werden: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Suchen"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Stornieren..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Mail erhalten & senden"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Erhalten"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "Aktualisieren..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "Warten..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Senden"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Storniert"
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Abgeschlossen."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
-msgid "Incomplete message written on pipe!"
-msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Vorbereiten auf %s:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Fehler beim `%s'_\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Fehler beim Lesen von Befehlen vom verwaltenden Thread."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Schadhafte Nachricht von verwaltendem Thread?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Konnte Dialogfenster nicht erzeugen."
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "Benutzer hat Anfrage abgebrochen."
-
-#: mail/mail-tools.c:198
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Konnte temporäre Mbox `%s' nicht anlegen: %s"
-
-#: mail/mail-tools.c:256
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (weitergeleitete Nachricht)"
-
-#: mail/mail-tools.c:266
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (keine Betreffzeile)"
-
-#: mail/mail-tools.c:283
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Weitergeleitete Nachricht - %s"
-
-#: mail/mail-tools.c:285
-msgid "Forwarded message (no subject)"
-msgstr "Weitergeleitete Nachricht (keine Betreffzeile)"
-
-#: mail/mail-tools.c:357
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kann Ort `%s' nicht öffnen:\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "VOrdner"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Neuer VFolder"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Antworten"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "An den Sender der Nachricht antworten"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "allen Empfängern der Nachricht antworten"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Die Nachricht weiterleiten"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Die gewählte Nachricht drucken"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Die Nachricht löschen"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Ungelesen"
-
-#: mail/message-list.c:621
-msgid "Seen"
-msgstr "Gelesen"
-
-#: mail/message-list.c:624
-msgid "Answered"
-msgstr "Beantwortet"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Mehrere ungelesene Nachrichten"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Mehrere Nachrichten"
-
-#: mail/message-list.c:948
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:960 mail/message-list.c:976
-#, c-format
-msgid "%s, et al."
-msgstr "%s u.a."
-
-#: mail/message-list.c:963 mail/message-list.c:979
-msgid "<unknown>"
-msgstr "<Unbekannt>"
-
-#: mail/message-list.c:1031
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1038
-msgid "Today %l:%M %p"
-msgstr "Heute %I:%M %p"
-
-#: mail/message-list.c:1047
-msgid "Yesterday %l:%M %p"
-msgstr "Gestern %l:%M %p"
-
-#: mail/message-list.c:1059
-msgid "%a %l:%M %p"
-msgstr "%a %I:%M %p"
-
-#: mail/message-list.c:1067
-msgid "%b %d %l:%M %p"
-msgstr "%a %d %l:%M %p"
-
-#: mail/message-list.c:1069
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1167
-msgid "Flagged"
-msgstr "Markiert"
-
-#: mail/message-list.c:1168
-msgid "From"
-msgstr "Von"
-
-#: mail/message-list.c:1168
-msgid "Date"
-msgstr "Datum"
-
-#: mail/message-list.c:1168
-msgid "Received"
-msgstr "Empfangen"
-
-#: mail/message-list.c:1169
-msgid "To"
-msgstr "An"
-
-#: mail/message-list.c:1169
-msgid "Size"
-msgstr "Größe"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Bitte geben Sie Ihre %s-Passphrase für %s ein."
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Kein GPG/PGP-Programm verfügbar."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Kein Passwort angegeben."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Keine Empfänger angegeben"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Ordner"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Speicher"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Ordner anzeigen, die beginnen mit:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Erhalte Speicher für \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Speicher für \"%s\" erhalten"
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Ordner \"%s\" wird abonniert"
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Ordner \"%s\" abonnieren"
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Ordner \"%s\" abbestellen"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ordnername:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Ordnertyp:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Angeben, wo der Ordner erstellt werden soll:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importieren von %s\n"
-"Importeur nicht bereit.\n"
-"Es wird 5 Sekunden bis zum nächsten Versuch gewartet"
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importieren von %s\n"
-"Importiert wird Objekt %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Es gibt keinen Importeur, der mit\n"
-"%s\n"
-"umgehen kann"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importieren"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importieren von %s.\n"
-"Starten von %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Fehler beim Laden von %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importieren von %s.\n"
-"Erstes Objekt wird importiert."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automatisch"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Dateiname:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Eine Datei wählen"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Dateityp:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
-msgid "Import"
-msgstr "Importieren"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Wählen Sie die Datei, die Sie in Evolution importieren wollen, und wählen "
-"Sie aus der Liste, welchen Typ die Datei hat.\n"
-"\n"
-"Sie können \"Automatisch\" wählen, wenn Sie ihn nicht wissen, und Evolution "
-"wird versuchen, ihn selber zu bestimmen."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Klicken Sie \"Importieren\", um den Import der Datei in Evolution zu "
-"beginnen."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution-Importwerkzeug"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution-Importeur-Werkzeug"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Willkommen zum Evolution-Importwerkzeug.\n"
-"Dieser Druide führt Sie durch das Importieren interner\n"
-"Dateien in Evolution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Installation von Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
-"persönliches Evolution-Verzeichnis installieren"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
-"zum Beenden."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Dateien konnte nicht korrekt aktualisiert werden"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolutions Dateien erfolgreich installiert."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Dies scheint das erste Mal zu sein, dass Sie Evolution ausführen."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Bitte klicken Sie \"OK\", um Evolutions Benutzerdateien zu installieren "
-"unter:"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kann das Verzeichnis\n"
-"%s\n"
-"nicht anlegen.\n"
-"Fehler: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kann Dateien nicht in\n"
-"`%s'\n"
-"kopieren."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Die Datei `%s' ist kein Verzeichnis.\n"
-"Bitte verschieben Sie es, damit Evolution seine\n"
-"Benutzerdateien installieren kann."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Das Verzeichnis `%s' existiert, ist aber nicht\n"
-"das Evolution-Verzeichnis. Bitte verschieben Sie\n"
-"es, damit Evolution seine Benutzerdateien\n"
-"installieren kann."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kann den angegebenen Ordner nicht erstellen:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Der angegebene Ordnername ist nicht gültig"
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Neuen Ordner anlegen"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Der Typ des ausgewählten Ordners ist für die \n"
-"gewählte Operation nicht gültig."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Neu..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Namenlos)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Der Fehlermelder kann nicht gefunden werden"
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Der Fehlermelder kann nicht starten"
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution ist eine Mail-, Kalender-\n"
-"und Kontakt-Management Anwendung\n"
-"innerhalt der GNOME-Desktops."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Gehe zu Ordner..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Ordner"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kann lokalen Speicher nicht einstellen -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Hoppla! Die Ansicht für `%s' ist unerwartet gestorben.  :-(\n"
-"Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Neue Verknüpfungsgruppe anlegen"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Gruppenname:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Wollen Sie wirklich Gruppe `%s' aus\n"
-"der Verknüpfungsleiste entfernen?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Nicht entfernen"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Kleine Icons"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Die Verknüpfungen als kleine Icons anzeigen"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Große Icons"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Die Verknüpfungen als große Icons zeigen"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "Neue Gruppe..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Eine neue Verknüpfungsgruppe anlegen"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "Diese Gruppe entfernen..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Diese Verknüpfungsgruppe entfernen"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "Die Verknüpfungsleiste verbergen"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Die Verknüpfungsleiste verbergen"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktivieren"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Diese Verknüpfung aktivieren"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Ansicht"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Den gewählten Ordner betrachten"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Kein Name)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Kein Fehler"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Der angegebene Ordnertyp ist ungültig"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "E-/A-Fehler"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Der angegebene Ordner wurde nicht gefunden"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Funktion für diese Speicherweise nicht implementiert"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Erlaubnis verweigert"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Operation nicht unterstützt"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Die Evolution-Shell."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hallo. Viele Dank dafür, dass Sie sich die Zeit genommen haben, diese\n"
-"Vorschauversion der Evolution-Groupware-Suite herunterzuladen.\n"
-"\n"
-"Über die letzten anderthalb Monate haben wir uns darauf konzentriert,\n"
-"Evolution benutzbar zu machen. Viele der Evolution-Entwickler\n"
-"verwenden inzwischen Evolution, um all ihre Mail zu lesen. Auch Sie\n"
-"könnten das tun. (Machen Sie aber Sicherheitskopien.)\n"
-"\n"
-"Doch obwohl wir viele Fehler ausgemerzt haben, die die Stabilität und\n"
-"Sicherheit beeinträchtigt haben, kriegen Sie trotzdem einen\n"
-"Disclaimer: Evolution wird: abstürzen, Ihre Mail verlieren wenn Sie\n"
-"das nicht wollen, sich weigern, Ihre Mail zu löschen, wenn Sie es\n"
-"wollen, freilaufende Prozesse zurücklassen, 100% CPU verbrauchen, sich\n"
-"verklemmen, sich aufhängen, HTML-Mail an zufällig ausgewählte\n"
-"Mailinglisten verschicken und Sie vor Ihren Freunden und Mitarbeitern\n"
-"lächerlich machen. Zu Risiken und Nebenwirkungen fragen Sie Ihren Arzt\n"
-"oder Apotheker.\n"
-"\n"
-"Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
-"werden, und wir hoffen auf Ihre Mitarbeit!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Danke.\n"
-"das Evolution-Team\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kann die Evolution-Shell nicht initialisieren."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Deaktivieren."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kann das Bonobo-System nicht initialisieren."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Einen neuen Kontakt anlegen"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Einen Kontakt löschen"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Suchen"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Einen Kontakt suchen"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Neuer Kontakte"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Kontakte drucken"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stopp"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Laden abbrechen"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Alle betrachten"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Alle Kontakte betrachten"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Addressbuckkonfiguration..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "Kontakte drucken..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "Nach Kontakten _suchen"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "Werkzeuge"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Tage"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Einstellungen ändern"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Kalender-Einstellungen..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Einen neuen Termin anlegen"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Einen neuen Kalender anlegen"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Tag"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "In der Zeit zurückgehen"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "In der Zeit vorangehen"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Gehe zu"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Zu bestimmtem Datum gehen"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Zur aktuellen Zeit gehen"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Monat"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Neuer Termin"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Weiter"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Kalender öffnen"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Zurück"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Diesen Kalender drucken"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Speichern _unter"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Kalender als etwas anderes speichern"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Einen Tag zeigen"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "1 Monat zeigen"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "1 Woche zeigen"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Die Arbeitswoche zeigen"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Heute"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Woche"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Neu"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "Kalender öffnen"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "Diesen Kalender drucken"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Speichern _unter..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Diesen Eintrag löschen"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Löschen..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hilfe"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Umschlag drucken..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Diesen Eintrag drucken"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Drucken..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Speichern _unter..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Speichern und schließen"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Den Kontakt speichern und das Dialogfenster schließen"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Kontakt an anderen senden..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Online-Hilfe einsehen"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "_Nachricht an Kontakt senden..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Datei"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Drucken..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Speichern"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Über diese Anwendung"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Info..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Aktio_nen"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Adress_buch... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Löschen"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Ausschneiden"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Namen prüfen (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Löschen"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Die Auswahl löschen"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Diesen Termin abschließen"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "In Ordner kopieren... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopieren"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Die Auswahl kopieren"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Die Auswahl ausschneiden"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML auswerfen"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Die XML-UI-Beschreibung auswerfen"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Erster Eintrag im Ordner (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Weiterleiten (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Als vCalendar weiterleiten (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Zum nächsten Eintrag gehen"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Zum vorigen Eintrag gehen"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Unvollständige Aufgabe (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Eigenschaften der Datei ändern"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Weiter"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Einfügen"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Inhalt der Zwischenablage einfügen"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Zurück"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Zurück"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Druckvorschau"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Druckeinstellungen..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Druckeinstellungen"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Speichern"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Den Termin speichern und das Dialogfenster schließen"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Die aktuelle Datei speichern"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Besprechung ansetzen"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Besprechung ansetzen"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Eine Besprechung ansetzen"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Alle auswählen"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Alles auswählen"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Aufgabenanfrage (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "Info..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Schließen"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "Kontakt (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "Kopieren"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Diagnose"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Eintrag (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journaleintrag (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Letzter Eintrag im Ordner (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Mailnachricht (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "In Ordner verschieben... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Notiz (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Einfügen"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Drucken"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Eigenschaften..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Alle auswählen"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "Aufgabe (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Ungelesener Eintrag (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Dienst hinzufügen"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Einen neuen Dienst zur Chefsesselansicht hinzufügen"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Einen neue E-Mail erzeugen"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Einstellungen der Chefsesselansicht..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Neue Mail"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Erstellen"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Eine neue Nachricht erstellen"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Die Nachricht in einen neuen Ordner kopieren"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Regel erstellen"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "Ordner"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filter über Absender"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filter über Empfänger"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Passwörter vergessen"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Mail abrufen"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Gewählte Nachrichten _verbergen"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Ge_löschte Nachrichten verbergen"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "_Gelesene Nachrichten verbergen"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Mail-_Filter..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Abonnements verwalten..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Als gelesen markieren"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Als ungelesen markieren"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Verschieben"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Die Nachricht in einen neuen Ordner verschieben"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Druckvorschau der Nachricht..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Nachricht auf dem Drucker drucken"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Nachricht drucken..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "_Allen antworten"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Antwort an Absender"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "Quelle"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Alle auswählen"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Mail in der Warteschlange senden und neue Mail abholen"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "_Alle Nachrichten anzeigen"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Nachrichtenliste in Stränge geordnet"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VOrdner über Absender"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VOrdner über Empfänger"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Nachrichtenquellcode anzeigen"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "Filter _anwenden"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "Ordner konfigurieren..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "In Ordner kopieren..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "Nachricht bearbeiten"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "Säubern"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "Filter über Betreffzeile"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "Weiterleiten"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Auswahl umkehren"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Mailkonfiguration..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "Nachricht"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "In Ordner verschieben..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "In neuem Fenster öffnen"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Nachricht drucken"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Nachricht _Speichern unter..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "In S_trängen"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Löschen rückgängig"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "VOrdner über Betreffzeile"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor für _virtuelle Ordner..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Beilegen"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Die aktuelle Datei schließen"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Diese Nachricht mit PGP verschlüsseln"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "Format"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Eine Datei als Text in die Nachricht einfügen"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Textdatei einfügen..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Eine Datei öffnen"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Mit PGP verschlüsseln"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Mit PGP signieren"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Entwurf speichern"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "In Ordner speichern... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "In Ordner speichern..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Die aktuelle Datei unter anderem Namen speichern"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Die Nachricht in einem bestimmten Ordner speichern"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Senden"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Später senden"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Später senden"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Die Mail im HTML-Format senden"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Die Nachricht später senden"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Die Nachricht jetzt senden"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Diese Nachricht jetzt senden"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Anlagen anzeigen / verbergen"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Anlagen anzeigen"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Anlagen anzeigen"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Diese Nachricht mit PGP signieren"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Textdatei e_infügen... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Öffnen..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sicherheit"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Liste aktualisieren"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Liste von Ordnern aktualisieren"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Abonnement kündigen"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Aufgabe zuweisen (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Weitersuchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Besprechungsanfrage (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Wiederherstellen"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Die rückgängig gemachte Aktion wiederherstellen"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Eine Zeichenkette ersetzen"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Allen antworten (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Statusbericht senden (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Auftreten überspringen (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Die Aufgabe speichern und das Dialogfenster schließen"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Noch einmal nach derselben Zeichenkette suchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Eine Zeichenkette suchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Rückgängig"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Die letzte Aktion rückgängig machen"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "Termin (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Als abgeschlossen markieren (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Antworten (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Eine neue Aufgabe anlegen"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Neu"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Aufgabe als etwas anderes speichern"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Aufgaben-Einstellungen..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Über Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Anpassen..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Anpassen"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Werkzeugleisten anpassen"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Einen anderen Ordner anzeigen"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "Beenden"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-Leistenverknüpfung"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Beenden"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Das Programm verlassen"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Erste Schritte"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Ein externes Dateiformat importieren"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Hauptwerkzeugleiste"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Information über Evolution anzeigen"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Die Ordnerleiste anzeigen"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Die Verknüpfungsleiste anzeigen"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Fehlerbericht einschicken"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Fehlerbericht einschicken"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Anzeige der Ordnerleiste an/aus"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Anzeige der Verknüpfungsleiste an/aus"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Die Kontaktverwaltung benutzen"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Den Kalender benutzen"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Den _Mailer benutzen"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "Über Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "Ordner"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Gehe zu Ordner..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "Datei _importieren..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Mailnachricht"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Einstellungen"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Außer Haus"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Keine Information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Andere einladen..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "Optionen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Nur Arbeitszeit anzeigen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Weggezoomt anzeigen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "Frei/beschäftigt aktualisieren"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "AutoWahl"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "Alle Leute und Ressourcen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle Leute und eine Ressource"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Benötigte Leute"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Benötigte Leute und eine Ressource"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Anfang der Besprechung:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Ende der Besprechung:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle Anwesenden"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MDMDFSS"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Jetzt"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H.%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Warnung"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Frage"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Meldung"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Diese Meldung nicht mehr anzeigen."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "Succhen"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Der persönliche Adressbuchserver"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Der persönliche Kalenderserver; Kalender-Factory"
-
-#: wombat/wombat.c:182
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
-
-#: wombat/wombat.c:194
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
-
-#: wombat/wombat.c:207
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Die Groupware-Suite Evolution"
diff --git a/po/el.po b/po/el.po
deleted file mode 100644
index da96440530..0000000000
--- a/po/el.po
+++ /dev/null
@@ -1,5919 +0,0 @@
-# Greek translation of evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Spiros Papadimitriou <spapadim+@cs.cmu.edu>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-04-04 19:42-0500\n"
-"Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
-"Language-Team: Greek <nls@tux.hellug.gr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-7\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-#, fuzzy
-msgid "Could not initialize Bonobo"
-msgstr "ÌïíÜäá Ôá÷/ìåßïõ: Áñ÷éêïðïßçóç ôïõ Bonobo áäýíáôç"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "ÁðïóôïëÞ"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_ÍÝïò ÖÜêåëëïò"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "New"
-msgstr "_ÍÝï"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "ÌïíÜäá Ôá÷/ìåßïõ: Áñ÷éêïðïßçóç ôïõ Bonobo áäýíáôç"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-#, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"ÐñïÝêõøå åîáßñåóç êáôÜ ôçí áðüðåéñá áíÜãíùóçò äåäïìÝíùí ìå PersistStream áðü "
-"ôç ìïíÜäá"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-#, fuzzy
-msgid "Could not start wombat"
-msgstr "ÌïíÜäá Ôá÷/ìåßïõ: Áñ÷éêïðïßçóç ôïõ Bonobo áäýíáôç"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-#, fuzzy
-msgid "Contact Editor"
-msgstr "_Ãíùñéìßá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-#, fuzzy
-msgid "_Home"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-#, fuzzy
-msgid "_Mobile"
-msgstr "_ÌÞíõìá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_Ãíùñéìßá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#, fuzzy
-msgid "_Job title:"
-msgstr "_ÌÞíõìá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-#, fuzzy
-msgid "_Company:"
-msgstr "ÁíôéãñáöÞ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-#, fuzzy
-msgid "No_tes:"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#, fuzzy
-msgid "Company"
-msgstr "ÁíôéãñáöÞ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-#, fuzzy
-msgid "Home"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#, fuzzy
-msgid "Home 2"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#, fuzzy
-msgid "Home Fax"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-#, fuzzy
-msgid "Mobile"
-msgstr "_ÌÞíõìá"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-#, fuzzy
-msgid "Pager"
-msgstr "Åðéêüëëçóç"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-#, fuzzy
-msgid "Primary"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:25
-#, fuzzy
-msgid "_Middle:"
-msgstr "_ÌÞíõìá"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-#, fuzzy
-msgid "Unable to open addressbook"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-#, fuzzy
-msgid "Advanced..."
-msgstr "ÁíáæÞôçóç ãéá Ðñï÷ùñçìÝíïõò"
-
-#: addressbook/gui/component/addressbook.c:562
-#, fuzzy
-msgid "Any field contains"
-msgstr "ÖÜêåëïò ðïõ ðåñéÝ÷åé åêêñåìüôçôåò"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-#, fuzzy
-msgid "Email contains"
-msgstr "ÌéêñÜ Åéêïíßäéá"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Ôï URI ðïõ èá åìöáíßóåé ï ÅîåñåõíçôÞò ÖáêÝëëùí"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "ËïéðÝò Óõíôïìåýóåéò"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "ÍÝá ÏìÜäá"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_ÖÜêåëëïò"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Åðéêüëëçóç"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "ÍÝá Óõíôüìåõóç"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-msgid "Host:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:455
-#, fuzzy
-msgid "Path:"
-msgstr "Åðéêüëëçóç"
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr ""
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "_ÌÞíõìá"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "Åðéêüëëçóç"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_ÖÜêåëëïò"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "Å_íÝñãåéåò"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Åðéêüëëçóç"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "ÍÝá Óõíôüìåõóç"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Óçìåßù_ìá"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-#, fuzzy
-msgid "Save in addressbook"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution ToDo Conduit"
-msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-#, fuzzy
-msgid "Snooze"
-msgstr "ÌÝãåèïò"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:269
-#, fuzzy
-msgid "Open calendar"
-msgstr "Ôï çìåñïëüãéü óáò"
-
-#: calendar/gui/calendar-commands.c:311
-#, fuzzy
-msgid "Save calendar"
-msgstr "Ôï çìåñïëüãéü óáò"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-#, fuzzy
-msgid "Private"
-msgstr "Åðéêüëëçóç"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Ñ_áíôåâïý"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "ÅìöÜíéóç åðéóõíÜ_øåùí"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Çìåñïëüãéï"
-
-#: calendar/gui/control-factory.c:127
-#, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "Ôï URI ðïõ èá åìöáíßóåé ï ÅîåñåõíçôÞò ÖáêÝëëùí"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Ñ_áíôåâïý"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "Åêêñåìüôçôåò"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "Êáôá÷þñçóç Çìåñï_ëïãßïõ"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Áß_ôçóç ÓõíÜíôçóçò"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Áß_ôçóç ÓõíÜíôçóçò"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "ÁðïóôïëÞ"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Alarms"
-msgstr "Åðéêüëëçóç"
-
-#: calendar/gui/e-calendar-table.c:397
-#, fuzzy
-msgid "Open..."
-msgstr "¶íïé_ãìá"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:404
-#, fuzzy
-msgid "Delete the task"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-#, fuzzy
-msgid "New appointment..."
-msgstr "Ñ_áíôåâïý"
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-#, fuzzy
-msgid "Delete this occurrence"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "ÓõããñáöÞ íÝïõ ìçíýìáôïò"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "Ñ_áíôåâïý"
-
-#: calendar/gui/event-editor.c:409
-#, fuzzy
-msgid "on"
-msgstr "Ðñïò"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:435
-#, fuzzy
-msgid "Monday"
-msgstr "ÓÞìåñá"
-
-#: calendar/gui/event-editor.c:436
-#, fuzzy
-msgid "Tuesday"
-msgstr "ÓÞìåñá"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:438
-#, fuzzy
-msgid "Thursday"
-msgstr "ÓÞìåñá"
-
-#: calendar/gui/event-editor.c:439
-#, fuzzy
-msgid "Friday"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: calendar/gui/event-editor.c:440
-#, fuzzy
-msgid "Saturday"
-msgstr "ÁðïóôïëÞ"
-
-#: calendar/gui/event-editor.c:441
-#, fuzzy
-msgid "Sunday"
-msgstr "ÁðïóôïëÞ"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "Ãíùñéìßåò"
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "ÌïíÜäá Ôá÷/ìåßïõ: Áñ÷éêïðïßçóç ôïõ Bonobo áäýíáôç"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr ""
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Fr"
-msgstr "Áðü"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr ""
-
-#: calendar/gui/print.c:941
-#, fuzzy
-msgid "Tasks"
-msgstr "Åêêñåìü_ôçôá"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr ""
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1149
-#, fuzzy
-msgid "Print Calendar"
-msgstr "Çìåñïëüãéï"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "Ôï URI ðïõ èá åìöáíßóåé ï ÅîåñåõíçôÞò ÖáêÝëëùí"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr ""
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Ôï çìåñïëüãéü óáò"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, fuzzy, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, fuzzy, c-format
-msgid "Could not close temp folder: %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, fuzzy, c-format
-msgid "Message %s not found."
-msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#, fuzzy
-msgid "Sendmail"
-msgstr "ÁðïóôïëÞ"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, fuzzy, c-format
-msgid "Could not send message: %s"
-msgstr "ÓõããñáöÞ íÝïõ ìçíýìáôïò"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-#, fuzzy
-msgid "attachment"
-msgstr "Íåá åðéóýíáøç"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Åðéóýíáøç áñ÷åßïõ"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "ÄéáãñáöÞ"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "ÄéáãñáöÞ åðéëåãìÝíùí áíôéêåéìÝíùí áðü ôïí êáôÜëïãï åðéóõíÜøåùí"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "ÍÝá åðéóýíáøç..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Åðéóýíáøç áñ÷åßïõ óôï ìÞíõìá"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-#, fuzzy
-msgid "From:"
-msgstr "Áðü"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Êëßê åäþ ãéá ôï äéåõèõíóéïëüãéï"
-
-#: composer/e-msg-composer-hdrs.c:313
-#, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Ðñïò:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Áíôßãñáöï:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "ÅéóÜãåôå ôéò äéåõèýíóåéò üðïõ èá óôáëåß áíôßãñáöï ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Êñõöü áíôßãñáöï:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"ÅéóÜãåôå ôéò äéåõèýíóåéò üðïõ èá óôáëåß áíôßãñáöï ôïõ ìçíýìáôïò ÷ùñßò áõôÝò "
-"íá åìöáíéóôïýí óôïí êáôÜëïãï ðáñáëçðôþí ôïõ ìçíýìáôïò."
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "ÈÝìá:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "ÅéóÜãåôå ôï èÝìá ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr ""
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr ""
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-#, fuzzy
-msgid "Open file"
-msgstr "¶íïéãìá ÖáêÝëëïõ"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr ""
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr ""
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr ""
-
-#: composer/e-msg-composer.c:1362
-#, fuzzy
-msgid "Compose a message"
-msgstr "ÓõããñáöÞ íÝïõ ìçíýìáôïò"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "Ãíùñéìßåò"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "months"
-msgstr "Ãíùñéìßåò"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr ""
-
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr "Ðñü÷åéñá"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "ÁðïóôïëÞ"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "seconds"
-msgstr "ÁðïóôïëÞ"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "_ÖÜêåëëïò"
-
-#: filter/filter-editor.c:233
-#, fuzzy
-msgid "Edit Filter Rule"
-msgstr "_ÖÜêåëëïò"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-#, fuzzy
-msgid "Edit Filters"
-msgstr "_ÖÜêåëëïò"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr ""
-
-#: filter/filter-filter.c:414
-#, fuzzy
-msgid "Add action"
-msgstr "Å_íÝñãåéåò"
-
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "ÄéáãñáöÞ ÏìÜäáò"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-#, fuzzy
-msgid "Select Folder"
-msgstr "_ÍÝïò ÖÜêåëëïò"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-#, fuzzy
-msgid "Rule name: "
-msgstr "Ìåôïíïìáóßá ÏìÜäáò"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:567
-#, fuzzy
-msgid "Execute actions"
-msgstr "Å_íÝñãåéåò"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-#, fuzzy
-msgid "Remove criterion"
-msgstr "ÄéáãñáöÞ ÏìÜäáò"
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "ÄéáãñáöÞ"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: filter/libfilter-i18n.h:5
-#, fuzzy
-msgid "Date received"
-msgstr "ÅëÞöèç"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Date sent"
-msgstr "Åðéêüëëçóç"
-
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "Å_íÝñãåéåò"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "ÁðïóôïëÞ"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "ÊáôÜóôáóç óýíäåóçò"
-
-#: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "ÍÝá Óõíôüìåõóç"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "ÊáôÜóôáóç óýíäåóçò"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "ÈÝìá"
-
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Åðéêüëëçóç"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "Å_íÝñãåéåò"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-#, fuzzy
-msgid "Add Rule"
-msgstr "ÍÝá Óõíôüìåõóç"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-#, fuzzy
-msgid "Edit VFolder Rule"
-msgstr "_ÖÜêåëëïò"
-
-#: mail/component-factory.c:284
-#, fuzzy
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "_ÍÝïò ÖÜêåëëïò"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-#, fuzzy
-msgid "Subject contains"
-msgstr "ÈÝìá"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "¶íïé_ãìá"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-#, fuzzy
-msgid "Print"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr ""
-
-#: mail/folder-browser.c:666
-msgid "Forward inline"
-msgstr ""
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr ""
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr ""
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: mail/folder-browser.c:672
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr ""
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-#, fuzzy
-msgid "Apply Filters"
-msgstr "_ÖÜêåëëïò"
-
-#: mail/folder-browser.c:680
-#, fuzzy
-msgid "Create Rule From Message"
-msgstr "Ðñü÷åéñá ìçíýìáôá"
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-#, fuzzy
-msgid "None"
-msgstr "Óçìåßù_ìá"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "ÈÝìá"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-callbacks.c:675
-#, fuzzy
-msgid "Move message(s) to"
-msgstr "ÍÝá ìçíýìáôá"
-
-#: mail/mail-callbacks.c:677
-#, fuzzy
-msgid "Copy message(s) to"
-msgstr "ÍÝá ìçíýìáôá"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-#, fuzzy
-msgid "Print Message"
-msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-#, fuzzy
-msgid "Save Attachment"
-msgstr "ÍÝá åðéóýíáøç..."
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr ""
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "Íåá åðéóýíáøç"
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_ÍÝïò ÖÜêåëëïò"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-#, fuzzy
-msgid "Creating new folder"
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: mail/mail-local.c:327
-#, fuzzy
-msgid "Copying messages"
-msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:953
-#, fuzzy
-msgid "Copying"
-msgstr "ÁíôéãñáöÞ"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
-msgstr ""
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "ÍÝá ìçíýìáôá"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, fuzzy, c-format
-msgid "Forwarded message - %s"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-tools.c:429
-#, fuzzy
-msgid "Forwarded message (no subject)"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-#, fuzzy
-msgid "VFolders"
-msgstr "_ÖÜêåëëïò"
-
-#: mail/mail-vfolder.c:298
-#, fuzzy
-msgid "New VFolder"
-msgstr "_ÍÝïò ÖÜêåëëïò"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr ""
-
-#: mail/mail-view.c:138
-#, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: mail/mail-view.c:141
-#, fuzzy
-msgid "Reply to all recipients of this message"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: mail/mail-view.c:144
-#, fuzzy
-msgid "Forward this message"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/mail-view.c:148
-#, fuzzy
-msgid "Print the selected message"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: mail/mail-view.c:150
-#, fuzzy
-msgid "Delete this message"
-msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-#, fuzzy
-msgid "Seen"
-msgstr "ÁðïóôïëÞ"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr ""
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "Íåá åðéóýíáøç"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "Áðü"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Åðéêüëëçóç"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "ÅëÞöèç"
-
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Ðñïò"
-
-#: mail/message-list.c:1111
-msgid "Size"
-msgstr "ÌÝãåèïò"
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "_ÖÜêåëëïò"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "ÍÝá Óõíôüìåõóç"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, fuzzy, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-#, fuzzy
-msgid "Evolution - Create new folder"
-msgstr "Ôï Evolution äå ìðïñåß íá äçìéïõñãÞóåé ôïõò ôïðéêïýò öáêÝëëïõò"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-#, fuzzy
-msgid "New..."
-msgstr "_ÍÝï"
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:172
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-#, fuzzy
-msgid "Go to folder..."
-msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-#, fuzzy
-msgid "Folders"
-msgstr "_ÖÜêåëëïò"
-
-#: shell/e-shell-view.c:1098
-#, c-format
-msgid "%s - Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1100
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-#, fuzzy
-msgid "_Small Icons"
-msgstr "ÌéêñÜ Åéêïíßäéá"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-#, fuzzy
-msgid "_Large Icons"
-msgstr "ÌåãÜëá Åéêïíßäéá"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-#, fuzzy
-msgid "_New Group..."
-msgstr "ÍÝá ÏìÜäá"
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-#, fuzzy
-msgid "_Remove This Group..."
-msgstr "ÄéáãñáöÞ ÏìÜäáò"
-
-#: shell/e-shortcuts-view.c:284
-#, fuzzy
-msgid "Remove this shortcut group"
-msgstr "ÄéáãñáöÞ áðü ÃñáììÞ Óõíôïìåýóåùí"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "ÄéáãñáöÞ áðü ÃñáììÞ Óõíôïìåýóåùí"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "ÄéáãñáöÞ áðü ÃñáììÞ Óõíôïìåýóåùí"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-#, fuzzy
-msgid "Error saving shortcuts."
-msgstr "Êõñßùò Óõíôïìåýóåéò"
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "_View"
-msgstr "_ÍÝï"
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "View the selected folder"
-msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr ""
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-#, fuzzy
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "Ñ_áíôåâïý"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "Áßôç_óç Åêêñåìüôçôáò"
-
-#: ui/evolution-contact-editor.xml:10
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_ÌÞíõìá"
-
-#: ui/evolution-contact-editor.xml:11
-#, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-#, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "Áßôç_óç Åêêñåìüôçôáò"
-
-#: ui/evolution-contact-editor.xml:14
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "Êáôá÷þñçóç Çìåñï_ëïãßïõ"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "Áß_ôçóç ÓõíÜíôçóçò"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "ÍÝá åðéóýíáøç..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Ðñïôåñáéüôçôá"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:72
-#, fuzzy
-msgid "_Object"
-msgstr "ÈÝìá"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:104
-#, fuzzy
-msgid "_Toolbars"
-msgstr "Å_ñãáëåßá"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:137
-#, fuzzy
-msgid "_Forms"
-msgstr "Áðü"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:150
-#, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "Êáôá÷þñçóç Çìåñï_ëïãßïõ"
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "_ÌÞíõìá"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_ÌÞíõìá"
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:170
-#, fuzzy
-msgid "F_ormat"
-msgstr "Áðü"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "Å_ñãáëåßá"
-
-#: ui/evolution-contact-editor.xml:172
-#, fuzzy
-msgid "Actio_ns"
-msgstr "Å_íÝñãåéåò"
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "_Ãíùñéìßá"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-#, fuzzy
-msgid "_Options"
-msgstr "Å_íÝñãåéåò"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-#, fuzzy
-msgid "Meeting _start time:"
-msgstr "Áß_ôçóç ÓõíÜíôçóçò"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-#, fuzzy
-msgid "Meeting _end time:"
-msgstr "Áß_ôçóç ÓõíÜíôçóçò"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:407
-#, fuzzy
-msgid "Now"
-msgstr "_ÍÝï"
-
-#: widgets/misc/e-dateedit.c:413
-#, fuzzy
-msgid "Today"
-msgstr "ÓÞìåñá"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "ÅðéëÝîôå åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "Find..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "Åðéëå_ãìÝíá Áíôéêåßìåíá"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Åðéëå_ãìÝíá Áíôéêåßìåíá"
-
-#, fuzzy
-#~ msgid "o"
-#~ msgstr "Ðñïò"
-
-#, fuzzy
-#~ msgid "Body"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "Ãíùñéìßåò"
-
-#, fuzzy
-#~ msgid "Format"
-#~ msgstr "Áðü"
-
-#, fuzzy
-#~ msgid "Options"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Page"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "Paper"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Size:"
-#~ msgstr "ÌÝãåèïò"
-
-#, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Ðñïò:"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "Ñ_áíôåâïý"
-
-#, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "Åêêñåìü_ôçôá"
-
-#, fuzzy
-#~ msgid "seconds."
-#~ msgstr "ÁðïóôïëÞ"
-
-#, fuzzy
-#~ msgid "Normal"
-#~ msgstr "Áðü"
-
-#, fuzzy
-#~ msgid "Task"
-#~ msgstr "Åêêñåìü_ôçôá"
-
-#, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "_Ãíùñéìßá"
-
-#, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Ñ_áíôåâïý"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Ðñü÷åéñá"
-
-#, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_ÌÞíõìá"
-
-#, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "Ãíùñéìßåò"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "Filter Rules"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "ÈÝìá"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "ÈÝìá"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "ÌïíÜäá Ôá÷/ìåßïõ: Áñ÷éêïðïßçóç ôïõ Bonobo áäýíáôç"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Áðü"
-
-#, fuzzy
-#~ msgid "mbox"
-#~ msgstr "Åéóåñ÷üìåíá"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "ÁíáæÞôçóç ãéá Ðñï÷ùñçìÝíïõò"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Óçìåßù_ìá"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Ìåôïíïìáóßá ÏìÜäáò"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Óçìåßù_ìá"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "ÌéêñÜ Åéêïíßäéá"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "_ÍÝï"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "ÁðïóôïëÞ"
-
-#, fuzzy
-#~ msgid "Sources"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "Ãíùñéìßåò"
-
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "Êõñßùò Óõíôïìåýóåéò"
-
-#, fuzzy
-#~ msgid "Add Source"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "ÍÝá ÏìÜäá"
-
-#, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "Êõñßùò Óõíôïìåýóåéò"
-
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "ÅðéëÝîôå åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "Print contacts"
-#~ msgstr "Ï êáôÜëïãïò ãíùñéìéþí óáò"
-
-#, fuzzy
-#~ msgid "View all contacts"
-#~ msgstr "ÅðéëÝîôå åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "Ï êáôÜëïãïò ãíùñéìéþí óáò"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "Month"
-#~ msgstr "Ãíùñéìßåò"
-
-#, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "Ôï çìåñïëüãéü óáò"
-
-#, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "Ôï çìåñïëüãéü óáò"
-
-#~ msgid "_New"
-#~ msgstr "_ÍÝï"
-
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Ôï çìåñïëüãéü óáò"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "ÊïðÞ"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#~ msgid "Copy"
-#~ msgstr "ÁíôéãñáöÞ"
-
-#~ msgid "Cut"
-#~ msgstr "ÊïðÞ"
-
-#, fuzzy
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "Ñ_áíôåâïý"
-
-#~ msgid "Paste"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Åðéêüëëçóç áíôéêåéìÝíïõ áðï ôï ðñü÷åéñï"
-
-#, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Éäéüôçôåò"
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "ÄéáãñáöÞ"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "ÅëÞöèç"
-
-#~ msgid "Undo"
-#~ msgstr "Áêýñùóç"
-
-#, fuzzy
-#~ msgid "Undo the last action"
-#~ msgstr "Áêýñùóç ôåëåõôáßáò ëåéôïõñãßáò"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "ÁíôéãñáöÞ"
-
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "_Help"
-#~ msgstr "Óçìåßù_ìá"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Éäéüôçôåò"
-
-#, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Áêýñùóç"
-
-#, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "ÓõããñáöÞ íÝïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_ÌÞíõìá"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "_ÌÞíõìá"
-
-#, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "ÅéóÜãåôå ôïí ðáñáëÞðôç ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#, fuzzy
-#~ msgid "_Apply Filters"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "ÊáôÜóôáóç ìçíõìÜôùí"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "¶íïéãìá óå ÍÝï ÐáñÜèõñï"
-
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "ÁðåóôáëìÝíá ìçíýìáôá"
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "ÍÝá Óõíôüìåõóç"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "_ÖÜêåëëïò"
-
-#~ msgid "Attach"
-#~ msgstr "Åðéóýíáøç"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Êëåßóéìï üëùí ôùí áíïé÷ôþí áíôéêåéìÝíùí"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Åðéóýíáøç áñ÷åßïõ óôï ìÞíõìá"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "¶íïéãìá ÖáêÝëëïõ"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#~ msgid "Send"
-#~ msgstr "ÁðïóôïëÞ"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "ÁðïóôïëÞ ôïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "ÅìöÜíéóç/áðüêñõøç åðéóõíÜøåùí"
-
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "ÅìöÜíéóç åðéóõíÜ_øåùí"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "¶íïé_ãìá"
-
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Ã_ñáììÞ Óõíôïìåýóåùí ôïõ Evolution"
-
-#, fuzzy
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "ÄéáãñáöÞ áðü ÃñáììÞ Óõíôïìåýóåùí"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "ÄéáãñáöÞ áðü ÃñáììÞ Óõíôïìåýóåùí"
-
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Ñ_áíôåâïý"
-
-#, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Ãíùñéìßá"
-
-#~ msgid "_Folder"
-#~ msgstr "_ÖÜêåëëïò"
-
-#, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "ÁðïèÞêåõóç óôï öÜêåëëï..."
-
-#, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "_ÌÞíõìá"
-
-#, fuzzy
-#~ msgid "_Settings"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "Ñ_áíôåâïý"
-
-#, fuzzy
-#~ msgid "monday"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "tues"
-#~ msgstr "Óçìåßù_ìá"
-
-#, fuzzy
-#~ msgid "today"
-#~ msgstr "ÓÞìåñá"
-
-#, fuzzy
-#~ msgid "ninth"
-#~ msgstr "Ðñïôåñáéüôçôá"
-
-#, fuzzy
-#~ msgid "tenth"
-#~ msgstr "ÅóôÜëç"
-
-#, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "Êõñßùò Óõíôïìåýóåéò"
-
-#, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "Forward message \"%s\""
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "View messages from \"%s\""
-#~ msgstr "ÍÝá ìçíýìáôá"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "ÁðïèÞêåõóç ôïõ ìçíýìáôïò óôïí êáèïñéóìÝíï öÜêåëëï"
-
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "ÍÝá ìçíýìáôá"
-
-#~ msgid "_Actions"
-#~ msgstr "Å_íÝñãåéåò"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "_New Contact"
-#~ msgstr "_Ãíùñéìßá"
-
-#, fuzzy
-#~ msgid "Gnome Calendar"
-#~ msgstr "Çìåñïëüãéï"
-
-#, fuzzy
-#~ msgid "_New appointment..."
-#~ msgstr "Ñ_áíôåâïý"
-
-#, fuzzy
-#~ msgid "About Calendar"
-#~ msgstr "Ôï çìåñïëüãéü óáò"
-
-#, fuzzy
-#~ msgid "'s calendar"
-#~ msgstr "Ôï çìåñïëüãéü óáò"
-
-#, fuzzy
-#~ msgid "Change"
-#~ msgstr "Åðéêüëëçóç"
-
-#, fuzzy
-#~ msgid "To-do list"
-#~ msgstr "Å_ñãáëåßá"
-
-#, fuzzy
-#~ msgid "Second"
-#~ msgstr "ÁðïóôïëÞ"
-
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "Åðéóýíáøç"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "ÊïðÞ åðéëåãìÝíïõ áíôéêåéìÝíïõ óôï ðñü÷åéñï"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "ÁíôéãñáöÞ åðéëåãìÝíïõ áíôéêåéìÝíïõ óôï ðñü÷åéñï"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "ÅðéëÝîôå ôç äéåýèõíóç ôïõ ðáñáëÞðôç"
-
-#, fuzzy
-#~ msgid "To: >>"
-#~ msgstr "Ðñïò:"
-
-#, fuzzy
-#~ msgid "Cc: >>"
-#~ msgstr "Áíôßãñáöï:"
-
-#, fuzzy
-#~ msgid "Bcc: >>"
-#~ msgstr "Êñõöü áíôßãñáöï:"
-
-#, fuzzy
-#~ msgid "Discard this message?"
-#~ msgstr "ÁðïóôïëÞ ðáñüíôïò ìçíýìáôïò"
-
-#~ msgid "Cut selected region into the clipboard"
-#~ msgstr "ÊïðÞ åðéëåãìÝíçò ðåñéï÷Þò óôï ðñü÷åéñï"
-
-#~ msgid "Copy selected region into the clipboard"
-#~ msgstr "ÁíôéãñáöÞ åðéëåãìÝíçò ðåñéï÷Þò óôï ðñü÷åéñï"
-
-#~ msgid "Paste selected region into the clipboard"
-#~ msgstr "Åðéêüëëçóç åðéëåãìÝíçò ðåñéï÷Þò áðü ôï ðñü÷åéñï"
-
-#~ msgid "Evolution can not create its local folders"
-#~ msgstr "Ôï Evolution äå ìðïñåß íá äçìéïõñãÞóåé ôïõò ôïðéêïýò öáêÝëëïõò"
-
-#~ msgid "Composes a new mail message"
-#~ msgstr "ÓõããñáöÞ íÝïõ ìçíýìáôïò"
-
-#, fuzzy
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Áßôç_óç Åêêñåìüôçôáò"
-
-#, fuzzy
-#~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "Êáôá÷þñçóç Çìåñï_ëïãßïõ"
-
-#, fuzzy
-#~ msgid "Cannot initialize the configuration system."
-#~ msgstr "Áñ÷éêïðïßçóçò ôïõ óõóôÞìáôïò ìïíÜäùí Bonobo áíåðéôõ÷Þò"
-
-#, fuzzy
-#~ msgid "<< Remove"
-#~ msgstr "ÄéáãñáöÞ"
-
-#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
-#~ msgstr ""
-#~ "Ìáò óõã÷øñåßôå, ç áñ÷éêïðïßçóç ôïõ åîåñåõíçôÞ öáêÝëëùí ôïõ Evolution áðÝôõ÷å."
-
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "¸áí èÝëåôå Þ ï÷é ðñïåðéóêüðéóç ìçíõìÜôùí"
-
-#~ msgid "Clos_e All Items"
-#~ msgstr "Êë_åßóéìï ¼ëùí"
-
-#~ msgid ""
-#~ "Evolution detected that the file `%s' is a not a directory.\n"
-#~ "\n"
-#~ "Evolution can rename the file, delete the file or shutdown and\n"
-#~ "let you fix the problem."
-#~ msgstr ""
-#~ "Ôï Evolution âñÞêå üôé ôï áñ÷åßï \"%s\" äåí åßíáé êáôÜëïãïò.\n"
-#~ "\n"
-#~ "Ôï Evolution ìðïñåß íá ìåôïíïìÜóåé ôï áñ÷åßï, íá ôï äéáãñÜøåé Þ íá\n"
-#~ "ôåñìáôßóåé þóôå íá äéïñèþóåôå ôï ðñüâëçìá."
-
-#~ msgid ""
-#~ "This is a development version of Evolution.\n"
-#~ " Using the mail component on your mail files\n"
-#~ " is extremely hazardous.\n"
-#~ "Please backup all your mails before trying\n"
-#~ " this program. \n"
-#~ "     You have been warned\n"
-#~ msgstr ""
-#~ "ÁõôÞ åßíáé ðåéñáìáôéêÞ Ýêäïóç ôïõ Evolution.\n"
-#~ " Ç ÷ñÞóç ôïõ ôìÞìáôïò çë. ôá÷õäñïìåßïõ ãéá ôá áñ÷åßá\n"
-#~ " ìçíõìÜôùí åßíáé éäéáßôåñá åðéêßíäõíç.\n"
-#~ "Ðáñáêáëïýìå êÜíôå áíôßãñáöá ôùí ìçíõìÜôùí óáò ðñßí\n"
-#~ " äïêéìÜóåôå ôï ðáñüí ðñüãñáììá. \n"
-#~ "     ¸÷åôå ðñïåéäïðïéçèåß!\n"
-
-#~ msgid "The %s component doesn't support PersistStream!\n"
-#~ msgstr "Ç ìïíÜäá %s äåí õðïóôçñßæåé ôá PersistStream!\n"
-
-#~ msgid "A folder containing mail items"
-#~ msgstr "ÖÜêåëëïò ðïõ ðåñéÝ÷åé ìçíýìáôá"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "ÖÜêåëëïò ðïõ ðåñéÝ÷åé ãíùñéìßåò"
-
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "ÖÜêåëëïò ðïõ ðåñéÝ÷åé óôïé÷åßá çìåñïëïãßïõ"
-
-#~ msgid "A service containing mail items"
-#~ msgstr "Õðçñåóßá ðïõ ðåñéÝ÷åé ìçíýìáôá"
-
-#~ msgid "A service containing contacts"
-#~ msgstr "Õðçñåóßá ðïõ ðåñéÝ÷åé ãíùñéìßåò"
-
-#~ msgid "A service containing calendar entries"
-#~ msgstr "Õðçñåóßá ðïõ ðåñéÝ÷åé óôïé÷åßá çìåñïëïãßïõ"
-
-#~ msgid "A service containing tasks"
-#~ msgstr "Õðçñåóßá ðïõ ðåñéÝ÷åé åêêñåìüôçôåò"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Ìåôïíïìáóßá Óõíôüìåõóçò"
-
-#~ msgid "Executive Summary"
-#~ msgstr "Ðåñßëçøç"
-
-#~ msgid "Tasks list"
-#~ msgstr "ÊáôÜëïãïò åêêñåìïôÞôùí"
-
-#~ msgid "Enables some debugging functions"
-#~ msgstr "Åíåñãïðïßçóç ìåñéêþí ëåéôïõñãéþí áðïóöáëìÜôùóçò"
-
-#~ msgid "LEVEL"
-#~ msgstr "ÅÐÉÐÅÄÏ"
diff --git a/po/en_GB.po b/po/en_GB.po
deleted file mode 100644
index 7be1b22d4d..0000000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,4926 +0,0 @@
-# English (Commonwealth) translation
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Robert Brady <rwb197@zepler.org> 2000
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-10-22 16:19+0100\n"
-"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Colours"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:933
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr ""
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronise"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronise Action"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Mr\n"
-"Ms\n"
-"Miss\n"
-"Mrs\n"
-"Dr\n"
-"Prof\n"
-"Rev\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-msgid "Host:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr ""
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Title"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Manager"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:489
-msgid "Show appointments"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr ""
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr ""
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:285
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr ""
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr ""
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr ""
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr ""
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr ""
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr ""
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr ""
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr ""
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr ""
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr ""
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr ""
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr ""
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr ""
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr ""
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr ""
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr ""
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr ""
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr ""
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr ""
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr ""
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr ""
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr ""
-
-#: mail/folder-browser.c:666
-msgid "Forward inline"
-msgstr ""
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr ""
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr ""
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr ""
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr ""
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-msgid "Evolution Account Editor"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr ""
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr ""
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr ""
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr ""
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr ""
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr ""
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:565
-msgid "Sending message"
-msgstr ""
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr ""
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
-msgid "Forwarded messages"
-msgstr ""
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, c-format
-msgid "Opening folder %s"
-msgstr ""
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, c-format
-msgid "Retrieving message %s"
-msgstr ""
-
-#: mail/mail-ops.c:1517
-msgid "Retrieving messages"
-msgstr ""
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-msgid "Saving messages"
-msgstr ""
-
-#: mail/mail-ops.c:1922
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr ""
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr ""
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr ""
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr ""
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr ""
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr ""
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr ""
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr ""
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr ""
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr ""
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Attachment"
-msgstr ""
-
-#: mail/message-list.c:1110
-msgid "From"
-msgstr ""
-
-#: mail/message-list.c:1110
-msgid "Date"
-msgstr ""
-
-#: mail/message-list.c:1110
-msgid "Received"
-msgstr ""
-
-#: mail/message-list.c:1111
-msgid "To"
-msgstr ""
-
-#: mail/message-list.c:1111
-msgid "Size"
-msgstr ""
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr ""
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr ""
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr ""
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr ""
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:172
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr ""
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr ""
-
-#: shell/e-shell-view.c:1098
-#, c-format
-msgid "%s - Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1100
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr ""
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Cannot initialise the Bonobo component system."
-
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-msgid "FIXME: __Formatting"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:146
-msgid "FIXME: New _Message to Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr ""
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Post Code:"
-
-#, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#~ msgid "Colors"
-#~ msgstr "Colours"
-
-#~ msgid "Pick a color"
-#~ msgstr "Pick a colour"
-
-#~ msgid "Organization:"
-#~ msgstr "Organisation:"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organisation, and the name of a file to "
-#~ "read your signature from."
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Querying authorisation capabilities of \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Query authorisation at \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synchronise \"%s\""
-
-#~ msgid "Colors for display"
-#~ msgstr "Colours for display"
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Cannot initialise Evolution's mail storage hash."
diff --git a/po/es.po b/po/es.po
deleted file mode 100644
index a4dfe7a1b7..0000000000
--- a/po/es.po
+++ /dev/null
@@ -1,7582 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000-2001.
-# Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-02-09 13:51+0100\n"
-"PO-Revision-Date: 2001-01-23 16:58-04:00\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Tarjeta: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nombre:"
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefijo:    "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dado:       "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Adicional:  "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familia:    "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufijo:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Fecha de nacimiento: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Dirección:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Dirección postal: "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Calle:       "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ciudad:      "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Región:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Código postal: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  País:        "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Etiqueta de envío: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Teléfonos:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Teléfono:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"Correo electrónico:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"Correo electrónico:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Programa de correo: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zona horaria: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Localización geográfica: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Cargo: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Organización: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nombre: "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Unidad: "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Unidad2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Unidad3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Unidad4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"categorías: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Comentarios: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Cadena única: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Llave pública: "
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "No se puede inicializar Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar desde Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mezclar desde Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mezclar al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor Original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Enlace con el libro de direcciones de Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Utilidad de configuración del enlace del calendario de evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Acción de sincronización"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado del enlace"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"No hay ningún pilot configurado, por favor seleccione primero\n"
-"el capplet 'Propiedades del enlace con Pilot'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "No hay conexión con el demonio gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Se ha producido un error cuando se intentaba\n"
-"obtener del demonio gnome-pilot la lista del pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "No pude cargar el cursor\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook no esta cargado\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "No se ha podido iniciar el servidor wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "No se puede inicializar wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "No pude leer información de la aplicación de direcciones del pilot"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "¿Borrar contacto?"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Añadir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Borrar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de teléfono"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Nuevo tipo de teléfono"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Añadir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Editor de contactos"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Nombre completo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Archivar como:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Dirección de la página web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Prefiere recibir el correo como _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Trabajo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Casa"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax del trabajo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Móvil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Correo electrónico principal"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "T_rabajo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "Es_tá es la dirección de correo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Puesto:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Compañía:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Dirección..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "General"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departamento:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Oficina:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Profesión:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "Nick:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_Cónyuge:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Fecha de _nacimiento:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Nombre del _asistente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "Nombre del _manager:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tas:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detalles"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Trabajo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Trabajo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Fax del trabajo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Rellamada"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Coche"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Compañía"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Casa 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax de casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Móvil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Otro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Otro fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Papel"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "Correo electrónico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "Correo electrónico 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Dirección _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canadá"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Comprobar Dirección"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "P_aís:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finlandia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Dirección:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Ciudad:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Dirección:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "Código _Postal"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Comprobar nombre completo"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Sta.\n"
-"Señorita\n"
-"Dr.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Nombre:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Título:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Apellido:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Sufijo:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Como _mini tarjetas"
-
-#: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como _Tabla"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduzca la contraseña para %s"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la agenda de direcciones"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"No podemos abrir esta agenda de direcciones. Esto puede\n"
-"significar que, o bien ha introducido un URI incorrecto,\n"
-"o que ha intentado acceder a un servidor LDAP y no ha\n"
-"compilado el soporte para LDAP. Si ha introducido un URI,\n"
-"compruébelo y reinténtelo. De no ser así, posiblemente a\n"
-"intentado acceder a un servidor LDAP. Si desea poder emplear\n"
-"LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
-"e instalar evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Mostrar todo"
-
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "El nombre contiene"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "El mensaje contiene"
-
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI que mostrará el visor de carpetas"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Otros contactos"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Archivo"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Tipo de agenda de direcciones desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Ninguno (modo anónimo)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Clave"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Tipo de autentificación desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Sub-arbol"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Tipo de rango desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Asociar DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Recuerda esta contraseña"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Puerto:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "DN raíz:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Rango de búsqueda:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autentificación:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Ruta:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Crear ruta si no existe."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Editar agenda de direcciones"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Añadir agenda de direcciones"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
-"información relevante acerca de ella."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Nombre:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descripción:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Fuentes de la agenda de direcciones"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Borrar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:670
-#: mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Nombre"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Buscar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Lista de destinatarios"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleccionar nombre de:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Buscar"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Guardar como vCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Pulse aquí para añadir un contacto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Sitio Web"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Título"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Encargado"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Nick"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Cónyuge"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Guardar en la agenda de direcciones"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"No hay elementos para mostrar en esta vista\n"
-"\n"
-"Pulse dos veces aquí para crear un nuevo contacto."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Formularios vacíos al final:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Cuerpo"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Pie:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensiones:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Fuente..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Fuentes"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Pie:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formatear"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Cabecera"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Cabecera/Pie"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Títulos"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Títulos para cada carta"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Alto:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Uno inmediatamente detrás del otro"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Incluye:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Horizontal"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Izquierda:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Las pestañas con las letras a la derecha"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margenes"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Número de columnas:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opciónes"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientación"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Pagina"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Configuración de la página:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papel"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Fuente del papel:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Vertical"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Vista previa:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Imprimir usando un oscurecimiento gris"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Reverso en páginas impares"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Derecha:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Secciones:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Oscureciendo"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Tamaño:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Comenzar en una nueva página"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nombre del estilo:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Encabezado:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Tipo:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Ancho:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Enlace con el Calendario de Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-"Utilidad de configuración para el enlace <<calendario>> de evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Error mientras me comunicaba con el servidor de calendario"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "No pude leer información de la aplicación de calendario del pilot"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Enlace Por Hacer de Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilidad de configuración para el enlace \"todo\" de evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "No pude leer los datos de la aplicación ToDo de la pilot"
-
-#: calendar/gui/calendar-commands.c:248
-msgid "File not found"
-msgstr "Archivo no encontrado"
-
-#: calendar/gui/calendar-commands.c:272
-msgid "Open calendar"
-msgstr "Abrir calendario"
-
-#: calendar/gui/calendar-commands.c:314
-msgid "Save calendar"
-msgstr "Guardar calendario"
-
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m %d %Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/calendar-model.c:385
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: calendar/gui/calendar-model.c:476
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:476
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:478
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:478
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Transparent"
-msgstr "Transparente"
-
-#: calendar/gui/calendar-model.c:553
-msgid "Opaque"
-msgstr "Opaco"
-
-#: calendar/gui/calendar-model.c:779
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La fecha debe ser escrita en la forma: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:898
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:901
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:905
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1028
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posición geográfica debe ser escrita en la forma: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1068
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "El valor del porcentaje debe estar entre 0 y 100"
-
-#: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "La prioridad debe estar entre 1 y 9"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Error cargando el calendario</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Error cargando el calendario:<br>Método no soportado"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Mostrar"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Mostrar citas"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Mostrar tareas"
-
-#: calendar/gui/calendar-summary.c:719
-msgid "Loading Calendar"
-msgstr "Cargando calendario"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrará el calendario"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma en %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificación sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "No hay un sumario disponible."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Cerrar"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editas una cita"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Recordatorio"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tiempo de recordatorio (minutos)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Las alarmas cesan tras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmas auditivas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pitar cuando aparezca la ventana de la alarma."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Calendario"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Preferencias del calendario"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Comprimir fines de semana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Opciónes de la fecha del navegador"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Valores predeterminados"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Mostrar opciónes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Fecha de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Habilitar recordatorio para"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Fin del día:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Primer día de la semana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Vier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Viernes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Elementos de plazo hoy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Elementos con plazo para hoy:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Elementos dentro de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Elementos dentro del plazo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Lunes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Elementos fuera de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Elementos fuera de plazo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Elije un color"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridad"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Recuerdame todas las citas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Sab"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Sábado"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostrar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Mostrar la hora del final de las citas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Mostrar los números de las semanas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Comienzo del día:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Tabla de tares"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Jue"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Jueves"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tiempo hasta el plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Divisiónes de tiempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Formato del tiempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Martes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmas visuales"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Mier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semana laboral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocurra."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "segundos."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "¿Esta seguro que quiere borrar la cita `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "¿Esta seguro que quiere borrar esta cita sin título?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "¿Esta seguro que quiere borrar la tarea `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "¿Esta seguro que quiere borrar esta tarea sin título?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "¿Esta seguro que quiere borrar la entrada del diario `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "¿Desea guardar los cambios?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leto:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Cancelar"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Clasificación"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Completado"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Fecha y Hora"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Fecha Completada:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "En proceso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Baja"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Sin comenzando"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vado"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Fecha de Ini_cio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Resu_men:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarea"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Sin definir"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Fecha _de Fin:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioridad:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "E_stado:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Editar Tarea"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Sin resumen"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Tarea - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada del diario - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Categorías"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Fecha de vencimiento"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Fecha fin"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Fecha de Inicio"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Posición geográfica"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Porcentaje completado"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Transparencia"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Pulse aquí para añadir una tarea"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Marcar como completa"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Marcar la tarea como completa"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Editar esta tarea..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Editar la tarea"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Borrar esta tarea"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Borrar la tarea"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiónes por minuto"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %b de %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a, %d de %b de %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d de %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nueva cita..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Concertar encuentro"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Editar esta cita..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Hacer esta cita movible"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Borrar esta ocurrencia"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Borrar todas las ocurrencias"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "¡No pude actualizar el archivo de su calendario!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Componente actualizado satisfactoriamente."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Hubo un error cargando al archivo del calendario."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "¡No pude abrir el archivo de su calendario!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "¡No pude cargar el archivo de su calendario!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "¡No pude leer el archivo de su calendario!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "¡Esta es una respuesta de alguien que no estaba invitado!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "No pude actualizar el alamacen de su calendario."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "¡No pude borrar el componente del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Componente borrado satisfactoriamente."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "No reconozco este tipo de componente de calendario."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Añadir al calendario"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Aceptar"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Declinar"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativa"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Actualizar calendario"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Cancelar encuentro"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Todo"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Categorías:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No puedo cargar las tareas en `%s'"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "El método necesario para cargar `%s' no esta soportado"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d de %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Evento para todo e_l día"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Bases de la citas"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepciones"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sin recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Tocar un sonido"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Vista previa"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regla de recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Ejecutar un programa"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Enviar un correo"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Configuración..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Mostrar un diálogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _fin:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora de _inicio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Fecha de Ini_cio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "después de"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "antes"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "día(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "fin de la cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "para"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "siempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mes(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "comienzo de cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "hasta"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "año(s)"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "en"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "día"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "en el"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr "%d días"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 día"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d semanas"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 semana"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d horas"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 hora"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutos"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr "1 minuto"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d segundos"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 segundo"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr "antes del inicio de la cita"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr "tras el inicio de la cita"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr "antes del fin de la cita"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr "tras el fin de la cita"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "No puedo abrir la carpeta en `%s'"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "El método necesario para abrir `%s' no esta soportado"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Abril"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Agosto"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Diciembre"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Febrero"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ir a una fecha"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoy"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Enero"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Julio"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Junio"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Marzo"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mayo"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "Noviembre"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Octubre"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "Septiembre"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "No se puede inicializar GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1º"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2º"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3º"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4º"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5º"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6º"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7º"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8º"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9º"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10º"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11º"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12º"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13º"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14º"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15º"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16º"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17º"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18º"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19º"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20º"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21º"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22º"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23º"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24º"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25º"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26º"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27º"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28º"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29º"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30º"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31º"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Do"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Lun"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Mar"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Mier"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Jue"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Vier"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Sab"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Tareas"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Día actual (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Semana actual (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Mes actual (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Año actual (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Imprimir calendario"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1161
-msgid "Print Preview"
-msgstr "Vista previa"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "La URI que mostrará la carpeta de tareas"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "DLMMJVS"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Error parseando filtro: %s: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Error ejecutando filtro: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Error ejecutando la búsqueda del filtro: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"No puedo parsear la expresión de búsqueda %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Error ejecutando la búsqueda según la expresión %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(concordar todas) requiere un único resultado booleano"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Realizando búsqueda en cabezera desconocida: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No pude bloquear el archivo para %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Dio un timeout tratando de cerrar el archivo %s. Inténtelo más tarde."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Fallo al hacer un lock usando fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Fallo al hacer un lock usando flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "No pude comprobar el archivo de correo %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "No pude abrir el archivo de correo %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "No pude abrir el archivo de correo temporal %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "No puedo probar el fichero de lock para %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error leyendo el archivo de correo: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error escribiendo en el archivo temporal de correo: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "No pude crear un conducto(pipe): %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "No se puede hacer un fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "El programa Movemail ha fallado: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Error desconocido)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "No puedo cargar %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "No pude cagar %s: No hay código de inicialización en el módulo."
-
-#: camel/camel-remote-store.c:183
-#, c-format
-msgid "%s server %s"
-msgstr "%s servidor %s"
-
-#: camel/camel-remote-store.c:187
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s servicio para %s en %s"
-
-#: camel/camel-remote-store.c:313
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/camel-remote-store.c:316 camel/camel-remote-store.c:329
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "No pude conectar con %s (puerto %d): %s"
-
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:330
-msgid "(unknown host)"
-msgstr "(servidor desconocido)"
-
-#: camel/camel-remote-store.c:421 camel/camel-remote-store.c:483
-#: camel/camel-remote-store.c:551
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operación cancelada"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Falló la compilación de la expresión regular: %s: %s"
-
-#: camel/camel-service.c:138
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "La URL '%s' necesita un componente de usuario"
-
-#: camel/camel-service.c:147
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "La URL '%s' necesita un componente de servidor"
-
-#: camel/camel-service.c:156
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "La URL '%s' necesita un componente de ruta"
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "No such host %s."
-msgstr "No existe el servidor %s."
-
-#: camel/camel-service.c:526
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "No se puede obtener la dirección del servidor %s."
-
-#: camel/camel-session.c:298
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "No hay proveedor para el protocolo `%s'"
-
-#: camel/camel-session.c:389
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"No puedo crear el directorio %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La URL `%s' no contiene protocolo"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La URL `%s' contiene un protocolo no válido"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "El número del puerto en la URL `%s' no es numérico"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"No pude obtener la entrada Kerberos:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Respuesta de autentificación errónea desde el servidor."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Respuesta inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "El comando IMAP ha fallado: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "La respuesta del servidor terminó demasiado pronto."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "La respuesta del servidor IMAP no contenía información de %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "No puedo cargar el resumen de %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Para leer y guardar correo en los servidores IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Esta opción conectará con el servidor IMAP usando autentificación Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:368
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sPor favor escriba la contraseña IMAP para %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:396
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"No pude autentificarme en el servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:652
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "No puedo crear el directorio %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Directorios de correo en formato MH"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Para guardar el correo local en directorios del tipo MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Archivos de correo en formato Unix estándar"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Para guardar el correo local en archivos del tipo mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Archivos de correo en formato maildir de Qmail"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Para guardar el correo local en directorios del tipo maildir de qmail"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "La dirección %s no es absoluta"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "%s no es un directorio normal"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "No pude acceder a la carpeta: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Los almacenadores locales no tienen una carpeta raíz"
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Los almacenadores locales no tienen una carpeta por defecto"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Las carpetas locales no pueden ser anidadas."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Archivo de correo local %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "No pude borrar el resumen la carpeta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "No pude borrar el índice de la carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "No pude añadir el mensaje a la carpeta tipo maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No puedo obtener el mensaje; %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "No existe ese mensaje"
-
-#
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Contenido inválido en el mensaje"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"No pude abrir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "La carpeta `%s' no existe."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"No pude crear la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' no es un directorio tipo maildir."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "No pude borrar la carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "no es un directorio tipo maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "No puedo abrir el buzón: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "No puedo añadir el mensaje al archivo mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No puedo obtener el mensaje; %s de la carpeta %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "La carpeta parece estar corrompida e irrecuperable."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fallo la construcción del mensaje: ¿Buzón corrompido?"
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"No puedo abrir el archivo `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"No pude crear el archivo `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' no es un archivo normal."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"No pude borrar la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "La carpeta `%s' no esta vacía. No fue borrada."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Resumiendo carpeta"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "No pude abrir la carpeta: %s: resumiendo desda la posición %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Parseado erróneo del correo cerca de la posición %ld en la carpeta %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "No puedo resumir la carpeta: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1346
-msgid "Synchronising folder"
-msgstr "Sincronizando carpeta"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "No pude abrir la carpeta para resumirla: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "No puedo abrir el archivo de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error la escribir al archivo de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Error la escribir al archivo temporal: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "No pude cerrar la carpeta origen %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "No pude cerrar la carpeta temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "No pude cambiar el nombre a la carpeta: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Error desconocido: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "No pude añadir el mensaje a la carpeta mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' no es un directorio."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Por favor introduzca la contraseña NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "El servidor rechazo el nombre de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Fallo al enviar el nombre de usuario al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "El servidor rechazo el nombre de usuario ó la contraseña"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Mensaje %s no encontrado."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No pude obtener la lista de grupos del servidor."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "noticias USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "No puedo abrir el directorio para el servidor de noticias: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "Noticias USENET vía %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Esta opción es para autentificarse con el servidor NNTP usando una "
-"contraseña de texto."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "No pude abrir o crear el archivo .newsrc para %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Recogiendo resumen POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "No pude abrir la carpeta: listados de los mensajes incompletos."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "No hay mensajes con uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Recogiendo mensaje POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "No pude obtener los mensajes del servidor POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Para conectar con servidores POP. El protocolo POP también puede usarse para "
-"recoger correo de algunos web-mail y sistemas de correo propietarios."
-
-#: camel/providers/pop3/camel-pop3-store.c:150
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña en "
-"texto plano. Esta es la única opción soportada por muchos servidores POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:160
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña "
-"encriptada por medio del protocolo APOP. Esto no funcionará para todos los "
-"usuarios ni siquiera en servidores que dicen soportarlo."
-
-#: camel/providers/pop3/camel-pop3-store.c:172
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Esta opción es para conectar con POP y usando autentificación Kerberos 4."
-
-#: camel/providers/pop3/camel-pop3-store.c:217
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "No pude autentificarme con el servidor KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:334
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "No pude conectar con el servidor POP en: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:381
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPor favor escriba la contraseña POP3 para %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:400
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"No pude conectar con el servidor POP.\n"
-"Error mandando nombre de usuario: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:403
-#: camel/providers/pop3/camel-pop3-store.c:440
-msgid "(Unknown)"
-msgstr "(Desconocido)"
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"No pude conectar con el servidor POP.\n"
-"No hay soporte para el sistema de autentificación definido."
-
-#: camel/providers/pop3/camel-pop3-store.c:438
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"No pude conectar con el servidor POP.\n"
-"Error al enviar la contraseña: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:547
-#, c-format
-msgid "No such folder `%s'."
-msgstr "No existe la carpeta `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Para enviar correo pasándoselo al programa \"sendmail\" en el sistema local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "No pude comunicar con sendmail: %s: correo no enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "No pude hacer un fork a sendmail: %s: correo no enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "No pude enviar mensaje: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail finalizo con %s: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "No pude ejecutar %s: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail finalizo con estado %d: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Envío de correo vía el programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Error de sintaxis, comando no reconocido"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Error de sintaxis en los parámetros o los argumentos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Comando no implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Parámetro del comando no implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Mensaje de ayuda"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Servicio preparado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Servicio cerrando los canales de transmisión"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Servicio no disponible, cerrando los canales de transmisión"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Acción de correo requerida en orden, completada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "El usuario no es local: lo reenviaré a <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Acción solicitada del correo no realizada: el mailbox no está disponible"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Acción solicitada no realizada: el mailbox no está disponible"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Acción solicitada abortada: error en procesamiento"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "El usuario no es local: por favor pruebe con <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Fallo en la transacción"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "No se requiere autentificación:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Esta opción es para conectar con servidores SMTP sin usar autentificación. "
-"Esto debería ser suficiente para la mayoría de los servidores SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Esta opción conectará con el servidor SMTP usando autentificación CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "Servidor SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Envío de correo SMTP vía %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "No puedo enviar el mensaje: no hay destinatarios."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Expiró el tiempo para HELO: %s: no es fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Respuesta de error al HELO: %s: no es fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Respuesta de error a DATA: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
-"no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"Respuesta de error a DATA: terminación del mensaje: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Expiró el tiempo para RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Respuesta de error a RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Respuesta de error a QUIT: %s: no es fatal"
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "No existe el mensaje: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Proveedor de correo de la carpeta virtual"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para leer correo como una búsqueda de otras carpetas"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "adjunto"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjuntar un fichero"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Quitar"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Incluir adjunto..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Adjuntar un fichero al mensaje"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1152
-msgid "Attachment"
-msgstr "Adjunto"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Propiedades del adjunto"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nombre del fichero:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Adjunto en línea"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "De:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Presione aquí para acceder a la agenda"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Elija la identidad desde la que quiere enviar el mensaje"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Escriba los destinatarios del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Escriba las direcciones que recibirán una copia del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
-"la lista de destinatarios del mensaje."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Escriba el asunto del mensaje"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"No pude abrir el archivo de firma %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Guardar como..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Error guardando el archivo: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Error cargando el archivo: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Guardando cambios en el mensaje..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Guardar cambios en el mensaje..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Error guardando el mensaje en 'Borradores': %s"
-
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Este mensaje no ha sido enviado.\n"
-"\n"
-"¿Quiere guardar los cambios?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Abrir archivo"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Ese archivo no existe."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Ese no es un archivo normal."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Ese archivo no es legible."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ese archivo parece accesible pero open(2) ha fallado."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"El archivo es muy largo (más de 100K).\n"
-"¿Esta seguro que quiere añadirlo?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Ha ocurrido un error mientras se leía el archivo."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Nuevo mensaje"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "No pude crear una ventana para escribir el mensaje"
-
-#: composer/evolution-composer.c:360
-msgid "Cannot initialize Evolution's composer."
-msgstr "No puedo inicializar el componente de escritura correo de Evolution."
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No puedo inicializar el componente de resumen de trabajo de Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Puede elegir una página HTML distinta como fondo del Resumen de Trabajo.\n"
-"\n"
-"Déjelo vacío para la elección por defecto"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s con la aplicación por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s con el navegador web por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar un correo a %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Cambiar la vista a %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Ejecutar %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Cerrar %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s a la izquierda"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s a la derecha"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s a la fila anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Ir al siguiente elemento"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No pude abrir el archivo HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Error leyendo los datos\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "El archivo no tiene un lugar para el servicio.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"El componente Resumen de Trabajo no pudo inicializar Bonobo.\n"
-"Si hubo un mensaje de advertencia sobre el RootPOA, probablemente significa\n"
-"que compiló Bonobo con GOAD en lugar de con OAF."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Error"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "año"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "años"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "meses"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "semanas"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "días"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oops. Te has olvidado de elegir una fecha."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oops. Has elegido una fecha incorrecta."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La fecha del mensaje será comparada con la\n"
-"fecha del momento de ejecutar el filtro o\n"
-"cuando se abra el vfolder."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La fecha del mensaje será comparada con la\n"
-"fecha que especifique aquí."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La fecha del mensaje será comparada con una\n"
-"fecha relativa al momento de ejecutar el\n"
-"filtro. Por ejemplo: \"Hace una semana\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "la fecha actual"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "Una fecha a especificar"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "una fecha relativa al momento actual"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "ahora"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<pinche aquí para añadir una fecha>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Añadir Regla de Filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar regla de filtro"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "entrante"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "saliente"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Entonces"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Añadir acción"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Quitar acción"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, te has olvidado de elegir una carpeta.\n"
-"Por favor vuelve y especifica una carpeta válida donde entregar el correo."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Seleccionar carpeta"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Escribir URI de la carpeta"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<pinche aquí para seleccionar una carpeta>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en la expresión regular '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Prueba"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nombre de la regla:"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Sin título"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "si se cumplen todos los criterios"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "si se cumple algún criterio"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Añadir criterio"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Quitar criterio"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Respondido a"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Importante"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Leído"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar carpeta virtual"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Reglas para los filtro"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrando"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Saliente"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Carpetas virtuales"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Fuentes de la carpeta virtual"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Asignar color"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Asignar puntuación"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar a la carpeta"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Fecha de recepción"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Fecha de envío"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expresión"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar a dirección"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Se recibió el mensaje"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Se envió el mensaje"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatarios"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Expresión regular"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1152
-msgid "Score"
-msgstr "Puntuación"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remitente"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Poner estado"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Fuente"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Cabecera específica"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
-msgid "Status"
-msgstr "Estado"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Parar el proceso"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
-msgid "Subject"
-msgstr "Asunto"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "en ó después de"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "en ó antes de"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "estaba después de"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "estaba antes de"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Añadir regla"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Editar regla de puntuación"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Añadir regla para carpeta virtual"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Editar regla de VFolder"
-
-#: mail/component-factory.c:297
-msgid "Cannot initialize Evolution's mail component."
-msgstr "No puedo inicializar el componente de correo de Evolution."
-
-#: mail/component-factory.c:323
-msgid "Cannot register storage with shell"
-msgstr "No puedo registrar un sistema de guardado con la shell"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Guardar la búsqueda como una carpeta virtual"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "El cuerpo y el asunto contienen"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "El cuerpo contiene"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "El asunto contiene"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "El cuerpo no contiene"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "El asunto no contiene"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Remitente contiene"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "VFolder según el asunto"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "VFolder según el remitente"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "VFolder según los destinatarios"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtrar según el asunto"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtrar según el remitente"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtrar según los destinatarios"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtrar según la lista de correo"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Guardar como..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Resp. Remitente"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Re: Todos"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Reenviar"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Reenviar dentro del mensaje"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Marcar como leído"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Marcar como no leído"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Mover a la carpeta..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copiar a la carpeta..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Recuperar"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Aplicar filtro"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Crear una regla con el mensaje"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtrar según la lista de correo (%s)"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato de almacenamiento actual:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Formato Mailbox"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nuevo formato de almacenamiento:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buzón de correo, "
-"puede\n"
-"que un fallo (como la falta de disco) no sea recuperable automaticamente.\n"
-"Por favor use esta opción con cuidado."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:746 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ninguno"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr "(valores predeterminados)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Administrador de cuentas de Evolution"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Uno o más de sus servidores no está correctamente configurado.\n"
-"¿Desea guardar de todos modos?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Editor de cuentas de Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Enviar a %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Asunto es %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Correo de %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "lista de correo %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"No ha configurado el cliente de correo.\n"
-"Necesita hacerlo para poder enviar,\n"
-"recibir o escribir mensajes.\n"
-"¿Querría configurarlo ahora?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar una identidad para\n"
-"poder escribir mensajes de correo."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar un transporte de\n"
-"correo para poder enviarlo."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "No has definido un sistema para enviar el correo"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Este mensaje no tiene asunto.\n"
-"¿Quiere enviarlo?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Debes especificar destinatarios para poder enviar el mensaje."
-
-#: mail/mail-callbacks.c:507
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "El %s, %s escribió:\n"
-
-#: mail/mail-callbacks.c:661
-msgid "Forwarded message:\n"
-msgstr "Mensaje reenviado:\n"
-
-#: mail/mail-callbacks.c:744
-msgid "Move message(s) to"
-msgstr "Mover Mensaje(s) a"
-
-#: mail/mail-callbacks.c:746
-msgid "Copy message(s) to"
-msgstr "Copiar mensaje(s) a"
-
-#: mail/mail-callbacks.c:881
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Solo puede editar mensajes guardados\n"
-"en la carpeta Borradores."
-
-#: mail/mail-callbacks.c:914 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "¿Sobreescribir archivo?"
-
-#: mail/mail-callbacks.c:918 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ya existe una archivo con ese nombre.\n"
-"¿Sobreescribirlo?"
-
-#: mail/mail-callbacks.c:962
-msgid "Save Message As..."
-msgstr "Guardar mensaje como..."
-
-#: mail/mail-callbacks.c:964
-msgid "Save Messages As..."
-msgstr "Guardar mensajes como..."
-
-#: mail/mail-callbacks.c:1072
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Error cargando la información del filtro:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1121
-msgid "Print Message"
-msgstr "Imprimir mensaje"
-
-#: mail/mail-callbacks.c:1168
-msgid "Printing of message failed"
-msgstr "Ha fallado la impresión del mensaje"
-
-#: mail/mail-config.c:834
-msgid "Connecting to server"
-msgstr "Conectando al servidor"
-
-#: mail/mail-config.c:836
-msgid "Connect to server"
-msgstr "Conectar al servidor"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Cuenta"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Información de la cuenta"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Gestión de la cuenta"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propiedades de la cuenta"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentificación"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Tipo de autentificación:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Comprobar el correo automaticamente cada"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Comprobar configuración"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Enhorabueba, la configuración de su correo esta completa.\n"
-"\n"
-"Ahora está listo para mandar y recivir correo \n"
-"usando Evolution. \n"
-"\n"
-"Pulse \"Finalizar\" para guardar su configuración."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Valores predeterminados"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Hecho"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "Dirección de correo:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "Dirección de correo:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Configuración del correo de Evolution"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Nombre del servidor:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identidad"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Servidor del correo de entrada"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Dejar mensajes en el servidor"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Cuenta de correo"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "Configuración del correo"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Ayudante para la configuración del correo"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "Hacer de esta mi cuenta predeterminada"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr "Marcar mensajes como \"Leídos\" tras:"
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Miscelánea"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "Noticias"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Opcional"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organización:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Servidor de correo de salida"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Clave:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Texto plano"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Recibiendo mensajes"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Recuerda mi contraseña"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Requerido"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Guardar clave"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Elegir archivo de firma"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Enviar por defecto el mensaje en formato HTML"
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Enviando correo"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Configuración del servidor"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Tipo de servidor:"
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "El servidor requiere autentificación"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Servidores"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Archivo de firma:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Firma:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Fuentes"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Este servidor requiere una conexión segura (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Escriba el nombre por el cual le gustaría referirse a estos servidores. Por "
-"ejemplo: \"Trabajo\" o \"Casa\"."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Información del usuario"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Nombre:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Bienvenido al ayudante de configuración de correo de Evolution.\n"
-"\n"
-"Pulse \"Siguiente\" para comenzar. "
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "minutos."
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Fallo al verificar la configuración del correo entrante.\n"
-"Puede que tenga problemas obteniendo su correo de %s"
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Espacio de nombres:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Fallo al verificar la configuración del correo saliente.\n"
-"Puede que tenga problemas para enviar sus mensajes usando %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Configurador de cuentas de Evolution"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Guardar adjunto"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No puedo crear el directorio temporal: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Guardar en disco..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Ver incluido"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Visores externos"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Ver incluido (vía %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Ocultar"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Cargando el contenido del mensaje"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Mensaje encriptado no mostrado"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Mensaje encriptado"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Pulse el icono para desencriptar."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Este mensaje está firmado digitalmente y es auténtico."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Este mensaje está firmado digitalmente pero no se puede verificar su "
-"autenticidad."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntero a archivo local (%s) valido en \"%s\""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
-#: mail/mail-local.c:211
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
-
-#: mail/mail-local.c:215
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
-
-#: mail/mail-local.c:258
-msgid "Reconfiguring folder"
-msgstr "Reconfigurar carpeta"
-
-#: mail/mail-local.c:276
-msgid "Closing current folder"
-msgstr "Cerrando carpeta actual"
-
-#: mail/mail-local.c:302
-msgid "Renaming old folder and opening"
-msgstr "Renombrando carpeta antigua y abriéndola"
-
-#: mail/mail-local.c:320
-msgid "Creating new folder"
-msgstr "Creando una nueva carpeta"
-
-#: mail/mail-local.c:334
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
-#: mail/mail-local.c:355
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"No puedo guardar la metainformación de la carpeta: probablemente\n"
-"volver a abrir esta carpeta: %s"
-
-#: mail/mail-local.c:386
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Si no puede volver a abrir este buzón, entonces\n"
-"puede que tenga que arreglarlo a mano."
-
-#: mail/mail-local.c:794
-msgid "Registering local folder"
-msgstr "Registrando carpeta local"
-
-#: mail/mail-local.c:796
-msgid "Register local folder"
-msgstr "Registrar carpeta local"
-
-#: mail/mail-local.c:900
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"No pude registrar la carpeta '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Error mientras `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Error mientras hacia:\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "Trabajando"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Enviando \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Enviando mensaje"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Añadiendo \"%s\""
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Añadiendo un mensaje sin asunto"
-
-#: mail/mail-ops.c:842
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Moviendo mensajes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:844
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensajes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:847
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensajes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:849
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensajes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:880
-msgid "Moving"
-msgstr "Moviendo"
-
-#: mail/mail-ops.c:883
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:903
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensaje %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:978
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Escaneando carpetas en \"%s\""
-
-#: mail/mail-ops.c:1044 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Sin descripción)"
-
-#: mail/mail-ops.c:1109
-msgid "Forwarded messages"
-msgstr "Mensaje reenviados"
-
-#: mail/mail-ops.c:1150 mail/mail-ops.c:1284
-#, c-format
-msgid "Opening folder %s"
-msgstr "Abriendo carpeta %s"
-
-#: mail/mail-ops.c:1215
-#, c-format
-msgid "Opening store %s"
-msgstr "Abriendo sitio %s"
-
-#: mail/mail-ops.c:1396
-msgid "Expunging folder"
-msgstr "Comprimiendo carpeta"
-
-#: mail/mail-ops.c:1445
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Recogiendo mensaje %s"
-
-#: mail/mail-ops.c:1512
-msgid "Retrieving messages"
-msgstr "Recogiendo mensajes"
-
-#: mail/mail-ops.c:1522
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recogiendo mensaje número %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1670
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Cargando carpeta %s para %s"
-
-#: mail/mail-ops.c:1672
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Cargar carpeta %s para %s"
-
-#: mail/mail-ops.c:1838
-msgid "Saving messages"
-msgstr "Guardando mensajes"
-
-#: mail/mail-ops.c:1917
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"No pude crear el archivo de salida: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1930
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Guardando mensaje %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1944
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Error guardando mensajes en: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2018
-msgid "Saving attachment"
-msgstr "Guardando adjunto"
-
-#: mail/mail-ops.c:2033
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"No pude crear el archivo de salida: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2061
-#, c-format
-msgid "Could not write data: %s"
-msgstr "No pude escribir datos: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Buscar"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Cancelando ..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Enviar & Recibir mensajes"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Recibiendo"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "Actualizando..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "Esperando..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Enviando"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Cancelado"
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Completado."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "¡Mensaje escrito incompleto en la tubería!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Error mientras me preparaba para %s:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Error mientras `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Error leyendo comandos del hilo de reparto"
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "¿Mensajes corrompidos en el hilo de reparto?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "No pude crear la ventana de diálogo"
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "El usuario cancelo la consulta."
-
-#: mail/mail-tools.c:192
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "No puedo crear el mbox temporal `%s': %s"
-
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaje reenviado)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sin asunto)"
-
-#: mail/mail-tools.c:277
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Reenviado mensaje - %s"
-
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Mensaje reenviado (sin asunto)"
-
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"No puedo acceder a `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Nueva carpeta virtual"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Responder al remitente de este mensaje"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Responder a todos los destinatarios de este mensaje"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Reenviar este mensaje"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Imprimir el mensaje seleccionado"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Borrar este mensaje"
-
-#: mail/message-list.c:608
-msgid "Unseen"
-msgstr "Sin leer"
-
-#: mail/message-list.c:611
-msgid "Seen"
-msgstr "Visto"
-
-#: mail/message-list.c:614
-msgid "Answered"
-msgstr "Contestado"
-
-#: mail/message-list.c:617
-msgid "Multiple Unseen Messages"
-msgstr "Multiples mensajes sin leer"
-
-#: mail/message-list.c:620
-msgid "Multiple Messages"
-msgstr "Multiples mensajes"
-
-#: mail/message-list.c:933
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:945 mail/message-list.c:961
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
-
-#: mail/message-list.c:948 mail/message-list.c:964
-msgid "<unknown>"
-msgstr "<desconocido>"
-
-#: mail/message-list.c:1016
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1023
-msgid "Today %l:%M %p"
-msgstr "Hoy %l:%M %p"
-
-#: mail/message-list.c:1032
-msgid "Yesterday %l:%M %p"
-msgstr "Ayer %l:%M %p"
-
-#: mail/message-list.c:1044
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1052
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1054
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1152
-msgid "Flagged"
-msgstr "Marcado"
-
-#: mail/message-list.c:1153
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1153
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/message-list.c:1153
-msgid "Received"
-msgstr "Recibido"
-
-#: mail/message-list.c:1154
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1154
-msgid "Size"
-msgstr "Tamaño"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor introduzca su frase de paso%s %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor introduzca su frase de paso %s"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "No hay programas disponibles de GPG/PGP."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "No se dio contraseña"
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "No pude comunicar con GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "No ha especificado destinatarios"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No pude crear archivo temporal: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Carpeta"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Almacenar"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Mostrar carpetas que comiencen por:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Obteniendo sitio para \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Obtiene sitio para \"%s\""
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Suscribiendo a carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Dessuscribiendo de carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Suscribir a carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Dessuscribir de carpeta \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instalación de Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Esta nueva versión de Evolution necesita instalar archivos adicionales\n"
-"en su carpeta personal de Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Por favor, pulse en <<Aceptar>> para instalar los archivos, o <<Cancelar>> "
-"para salir."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "No pude actualizar correctamente los archivos"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Los archivos de Evolution han sido instalados."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Parece que esta es la primera vez que ejecuta Evolution"
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Por favor, pulse en <<Aceptar>> para instalar los archivos de usuario de "
-"Evolution en"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"No puedo crear el directorio\n"
-"%s\n"
-"Error: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"No puedo copiar archivos en\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"El archivo `%s' no es un directorio.\n"
-"Por favor, renombre lo para permitir la instalación\n"
-"de los archivos de usuario de Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"El directorio `%s' existe pero no es el directorio\n"
-"de Evolution. Por favor, renombre lo para permitir la\n"
-"instalación de los archivos de usuario de Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"No puedo crear la carpeta especificada:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "El nombre de carpeta especificado no es valido."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crear nuevas carpetas"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"El tipo de carpeta seleccionada no es valido para\n"
-"la operación requerida."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nuevo..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sin título)"
-
-#: shell/e-shell-view-menu.c:127
-msgid "Bug buddy was not found in your $PATH."
-msgstr "No se ha encontrado a bug buddy en su $PATH."
-
-#: shell/e-shell-view-menu.c:133
-msgid "Bug buddy could not be run."
-msgstr "No se ha podido ejecutar bug buddy"
-
-#: shell/e-shell-view-menu.c:185
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:187
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution es un conjunto de aplicaciones de\n"
-"trabajo en grupo para manejar el correo, el calendario y\n"
-"la lista de contactos en el entorno del escritorio GNOME."
-
-#: shell/e-shell-view-menu.c:349
-msgid "Go to folder..."
-msgstr "Ir a la carpeta..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(No hay carpetas mostrándose)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Carpetas"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No puedo configurar una carpeta local -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
-"Esto probablemente significa que el componente %s se ha roto."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Crear un nuevo grupo de atajos"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nombre del grupo:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"¿Realmente quiere quitar el grupo\n"
-"`%s' del menú de atajos?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "No quitar"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Icono_s pequeños"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Mostrar los atajos como iconos pequeños"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Iconos _grandes"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Mostrar los atajos como iconos grandes"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nuevo grupo..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Crear un nuevo grupo de atajos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Quitar este grupo..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Quitar este grupo de atajos"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Ocultar la barra de atajos"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Ocultar la barra de atajos"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activar"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activar este atajo"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Quitar este atajo de la lista de atajos"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Error guardando atajos."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Ver"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Ver la carpeta seleccionada"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Sin nombre)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Sin errores"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Error genérico"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Ya existe una carpeta con ese nombre"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Es tipo de fichero especificado no es válido"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "Error de I/O"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "No hay suficiente espacio para crear la carpeta"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "No se encontró la carpeta especificada"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Función sin implementar en este manejador"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Operación no soportada"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "El tipo especificado no esta soportado por este manejador"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hola. Gracias por tomarse la molestia de descargar esta liberación de "
-"prueba\n"
-"de las herramientas de trabajo en grupo Evolution.\n"
-"\n"
-"Desde la última liberación, nuestro objetivo a sido hacer Evolution usable.\n"
-"Muchos de los desarrolladores de Evolution están ya usando Evolution\n"
-"para leer su correo de forma habitual. Usted también podría. (Asegúrese\n"
-"de tener una copia de seguridad.)\n"
-"\n"
-"Pero aunque hemos arreglado muchos fallos que afectaban a su estabilidad\n"
-"su seguridad, todavía tiene la denegación de responsabilidad:\n"
-"Evolution: se romperá, perderá su correo cuando usted no quiera, se negará\n"
-"a borrar su correo cuando usted quiera, dejará procesos corriendo, "
-"consumirá\n"
-"el 100% de la CPU, se bloqueará, enviará correo en formato HTML a listas de\n"
-"correo al azar, y le pondrá en situaciones embarazosas delante de sus \n"
-"amigos y compañeros de trabajo.  Úselo asumiendo usted las consecuencias.\n"
-"\n"
-"Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
-"esperamos sus contribuciónes\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Gracias\n"
-"El equipo de Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "No puedo inicializar la shell de Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Deshabilitado."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "No puedo inicializar el sistema de componentes Bonobo."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importando %s\n"
-"El importador no esta listo.\n"
-"Esperando 5 segundos antes de reintentar."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando elemento %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importando"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comenzando %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Error cargando %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando elemento 1."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automático"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Nombre de fichero:"
-
-#: shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Elega un archivo"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Tipo de archivo:"
-
-#: shell/importer/importer.c:572
-msgid "Import"
-msgstr "Importar"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Eliga el archivo que quiere importar a Evolution, y seleccione de la lista "
-"el tipo de archivo que es.\n"
-"\n"
-"Si no lo sabe, puede elegir \"Automático\" y Evolution tratará de encargarse."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Crear nuevo contacto"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Buscar"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Buscar un contacto"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nuevo contacto"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Imprimir contactos"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Parar"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Parar la carga"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Ver todo"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Ver todos los contactos"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Configuración de la agenda de direcciones..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "Im_primir contactos..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "Bu_scar contactos"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Herramientas"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Días"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Alterar preferencias"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ca_lendario"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Preferencias del calendario..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Creando un nuevo calendario"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Día"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Volver en el tiempo"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Avanzar en el tiempo"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Ir a"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Ir a una fecha específica"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Ir al momento actual"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nueva cita"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Siguiente"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Previo"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Imprimir este calendario"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Guardar como"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Guardar el calendario como otra cosa"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Mostrar 1 día"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Mostrar un mes"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Mostrar 1 semana"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Mostrar un semana laboral"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoy"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nuevo"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "Im_primir este calendario"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Borrar este elemento"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Borrar..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ayuda"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Imprimir ca_becera..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimir este elemento"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Guardar _como..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Guardar y cerrar"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Guardar el contacto y cerrar la ventana de diálogo"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "E_nviar el contacto a otro..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Ver la ayuda en línea"
-
-#
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Enviar un _mensaje al contacto..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Archivo"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "Im_primir..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Guardar"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Acerca de esta aplicación"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Acerca de..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Accio_nes"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Agenda de Direcciones...(FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Limpiar"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "C_ortar"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Chec_k Names (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Limpiar"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Quitar la seleccionada"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Cerrar esta cita"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_y to Folder... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiar"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiar la selección"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Cortar"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Cortar la selección"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Volcar XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Volcar la descripción XML de la IU"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Fi_rst Item in Folder (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "For_ward (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Forward as v_Calendar (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Ir al siguiente elemento"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Ir al elemento anterior"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "In_complete Task (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Propiedades las propiedades del archivo"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Sigui_ente"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Pegar"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Pegar el contenido del porta papeles"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Pre_vio"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Previo"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Vista pre_via"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Configurar impr_esión..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configurar impresión"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propiedades"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Guardar"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Guardar la cita y cerrar la ventana de diálogo"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Guardar archivo actual"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Concertar encuentro"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Concertar un _encuentro"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Programas algún tipo de encuentro"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleccionar todo"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar los datos de la página para la impresora actual"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Task _Request (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Acerca de..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "A_yuda"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Item (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journal Entry (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Last Item in Folder (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Mail Message (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Move to Folder... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Im_primir"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleccionar todo"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Task (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Unread Item (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Añadir Servicio"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Añadir un nuevo servicio al Resumen de Trabajo"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crear un nuevo mensaje electrónico"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Configuración del Resumen de Trabajo..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nuevo"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Nuevo"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Escribir un nuevo mensaje"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copiar mensaje a una nueva carpeta"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Crear una regla"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Carpetas"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrar según el remitente"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtrar según los dest_inatarios"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Olvidar _contraseña"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Obtener"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Ocultar los mensajes _seleccionados"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensajes _borrados"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Ocultar mensajes _leídos"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtros de correo..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Administrar suscripciones..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Mar_car como leído"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marcar como _no leído"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Mover"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Mover mensaje a una nueva carpeta"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Ver el mensaje que va a ser impreso"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vista previa del mensaje..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprimir el mensaje en la impresora"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Imprimir mensaje..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Re: _Todos"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Resp. _Remitente"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "F_uente"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Mostrar _todos los mensajes"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Lista de Mensajes Encadenados"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VFolder según el _remitente"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VFolder según los _destinatarios"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Ver las fuentes del mensaje"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Aplicar filtro"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configurar carpeta..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Editar mensaje"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Comprimir"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrar según el asunto"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Reenviar"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertir selección"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Configuración del correo..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Mensaje"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Mover a la carpeta..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Abrir en una nueva ventana"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Im_primir mensaje"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Guardar mensaje como..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Encadenados"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Recuperar"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VFolder según el asunto"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de carpetas _virtuales..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Adjuntar"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Cerrar el archivo actual"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Encriptar este mensaje con PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormatear"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Insertar un archivo como texto en el mensaje"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Insertar un archivo de texto..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Abrir un archivo"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Encriptar con PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Firmar con PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Guardar _Borrador"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Save in _folder... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Guardar en carpeta..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Guardar el archivo actual con un nombre diferente"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Guardara el mensaje a una carpeta específica"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Enviar"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Enviar _mas tarde"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Enviar _mas tarde"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Enviar el mensaje en formato HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Enviar el mensaje más tarde"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar el mensaje ahora"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Enviar este mensaje ahora"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Mostrar / ocultar adjuntos"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Mostrar _adjuntos"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Mostrar adjuntos"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Firmar este mensaje con tu clave PGP"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insert text file... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Abrir..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Seguridad"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Añadir carpeta a tu lista de carpeta suscritas"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Regenerar la lista"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Regenerar la lista de carpetas"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Quitar carpetas de tu lista de carpetas suscritas"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Dessuscribir"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Assig_n Task (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Buscar de nuevo"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Meeting Re_quest (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Rehacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Rehacer la acción deshecha"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Remplazar"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Remplazar una cadena"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Reply to A_ll (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "S_end Status Report (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_kip Occurrence (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Guardar la tarea y cerrar la ventana de diálogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Buscar de nuevo la misma cadena"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Buscar una cadena"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Deshacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Deshacer la última acción"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Appointment (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Mark Complete (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Reply (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nuevo"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Guardar la tarea como otra cosa"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferencias de las tareas..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Acerca de Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Personali_zar..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de herramientas"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Mostrar una carpeta distinta"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Salir"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atajos de Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Salir"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Salir del programa"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Comenzando"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importar un formato de archivo externo"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de herramientas principal"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Mostrar información acerca de Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Mostrar la barra de _carpetas"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Mostrar la barra de _atajos"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Enviar reporte de fallo"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Enviar reporte de _fallo"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Enviar un reporte de fallo usando Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Activar si se muestra la barra de carpetas"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Activar si se muestra la barra de atajos"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Usando el administrador de c_ontactos"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Usando el _calendario"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Usando el _correo"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Acerca de Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Carpeta"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Ir a la carpeta..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importar archivo..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Índice"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Enviar mensaje"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Configuración"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fuera de la oficina"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sin información"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invitar a otros..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opciónes"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostrar _solo las horas de trabajo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Mostrar quitando _Zoom"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Actualizar Libre/Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Auto seleccionar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Todas las personas y los recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Todas las _personas y un recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personas _requeridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personas requeridas y _un recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de _inicio de la reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fin de la reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Todos los participantes"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Ahora"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Información"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Aviso"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Pregunta"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Mensaje"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "No mostrar otra vez este mensaje."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "Bus_car"
-
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "El programa de trabajo en grupo Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
-msgid "Evolution Address conduit "
-msgstr "Enlace del libro de direcciones de Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
-msgid "Configure the address conduit"
-msgstr "Configura el enlace del libro de direcciones"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
-msgid "Evolution Calendar conduit"
-msgstr "Enlace con el calendario de Evolution"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
-msgid "Configure the GnomeCal conduit"
-msgstr "Configurar el enlace con GnomeCal"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
-msgid "Evolution ToDo conduit "
-msgstr "Enlace con el componente `Por Hacer' de Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
-msgid "Configure the todo conduit"
-msgstr "Configurar el enlace con el componente `Por Hacer'"
diff --git a/po/fi.po b/po/fi.po
deleted file mode 100644
index c45c0d4cdd..0000000000
--- a/po/fi.po
+++ /dev/null
@@ -1,5857 +0,0 @@
-# Finnish messages for evolution
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Jarkko Ranta <jjranta@cc.joensuu.fi> 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-11-14 15:00+0300\n"
-"Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Viestin lähettäminen epäonnistui: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Lähetetään sähköpostia"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "_Sulje"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Siirrä kansioon"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Siirry edelliseen kohtaan"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Siirry seuraavaan kohtaan"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "VIrhe luettaessa viestitiedostoa: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Ei virhettä"
-
-#: mail/mail-config.c:799
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Koeyhteys epäonnistui: \"%s\""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Uusi"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Luo uusi kontakti"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nimi: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Syntymäpäivä: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Osoite:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Katu:        "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Kaupunki:    "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postinumero: "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Maa:         "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"Sähköposti:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"Sähköposti:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Aikavyöhyke: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Työn kuvaus:   "
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nimi:  "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategoriat: "
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Julkinen avain: "
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronoi"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopioi Pilotista"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopioi Pilotiin"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkronoi toiminto"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ei yhteyttä gnome-pilot -demoniin"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Lisää"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Poista"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Puhelintyypit"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Uusi puhelintyyppi"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Lisää"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Kontaktinhallinta"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Koko nimi..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Kotisivun osoite:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Haluaa sähköpostit HTML-muodossa"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Koti"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Matkapuhelin"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Ensisijainen sähköposti"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriat"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Tehtävänimike:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Yritys:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Osoite..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Osasto:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Kutsumanimi:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Syntymäpäivä:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Yksityiskohdat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Työ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Työ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Yritys"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Koti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Koti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Muu"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Muu faksi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "Sähköposti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Sähköposti 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Tarkasta kokonimi"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Etunimi:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Toinen nimi:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Sukunimi:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Näytä kaikki"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Muut kontaktit"
-
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
-
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr "Tiedosto"
-
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr "Tuntematon osoitekirjatyyppi"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Salasana"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-msgid "Host:"
-msgstr "Isäntä:"
-
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr "Portti:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Todentaminen:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Polku:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr "Luo polku mikäli sitä ei ole olemassa."
-
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
-
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr "Lisää osoitekirja"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Valitse osoitekirjan tyyppi, ja anna sen jälkeen tarpeelliset tiedot siitä."
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Nimi:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Etsi"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nimi"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "Sähköposti 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organisaatio"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "_Osasto:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "Tiedosto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Manager"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "_Kutsumanimi:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "Lähde"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Tallenna osoitekirjaan"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-#, fuzzy
-msgid "Reminder of your appointment at "
-msgstr "Muistuta kaikista tapaamisista"
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Avaa kalenteri"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Tallenna kalenteri"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "VIrhe avattaessa tiedostoa: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "Päivä"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Näytä tapaamisten lopetusajat"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "Näytä liitteet"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Tulosta kalenteri"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Haluatko todella poistaa tapaamisen '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr ""
-"\n"
-"Kategoriat: "
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "_Loppumisaika:"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "_Alkamisaika:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioriteetti"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "_Yhteenveto:"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Poista"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr ""
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Uusi tapaaminen..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Muokkaa tätä tapaamista..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "Poista tämä tapaaminen"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Tee tästä tapaamisesta siirrettävä"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr ""
-"\n"
-"Kategoriat: "
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Viestin lähettäminen epäonnistui: %s"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "päivä"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Maanantai"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Keskiviikko"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Torstai"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Perjantai"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Lauantai"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Sunnuntai"
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Su"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Ma"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ti"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ke"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "To"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pe"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "La"
-
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "GNOMEn alustus ei onnistunut"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "Su"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "Ma"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "Ti"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "Ke"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "To"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "Pe"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "La"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr ""
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Tulosta kalenteri"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Tulostuksen esikatselu"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "VIrhe luettaessa viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(tuntematon virhe)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Peruutettu"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Avaa kalenteri"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Hakemistoa %s ei voitu luoda:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-komento epäonnistui: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Ota yhteys IMAP-palvelimeen Kerberos 4 -todentamista käyttäen."
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Hakemistoa %s ei voitu luoda: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Paikallinen viestitiedosto %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Kansiota `%s' ei ole olemassa."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Viestin %s hakeminen kansiosta %s epäonnistui\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ei ole tavallinen tiedosto."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Tuntematon virhe: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ei saatu ryhmäluetteloa palvelimelta."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(tuntematon)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Viestin lähettäminen epäonnistui: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr "Todentamista ei vaadita"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Tämä valinta yhdistää SMTP-palvelimeen käyttäen CRAM-MD5 -todentamista."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-palvelin %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty"
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty"
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "liite"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Liitä tiedosto"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Poista"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Lisää liite..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Lisää viestiin liitetiedoston"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "Lähettäjä:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Aihe:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Anna sähköpostin aihe"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Tallenna nimellä..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Virhe tallennettaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "VIrhe avattaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Tallennetaan muutokset..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Tätä viestiä ei ole lähetetty.\n"
-"\n"
-"Haluatko tallentaa muutokset?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Avaa tiedosto"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "Tiedostoa ei ole olemassa."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "Se ei ole tavallinen tiedosto."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Tiedosto on hyvin suuri (yli 100K).\n"
-"Haluatko varmasti liittää sen?"
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "Virhe luettaessa tiedostoa."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Kirjoita viesti"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "vuosi"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "vuotta"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "kuukausi"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "kuukautta"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "viikko"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "viikkoa"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "päivää"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "tunti"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "tuntia"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuutti"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuuttia"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunti"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekuntia"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "nyt"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr ""
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "Sitten"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Lisää toiminto"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "Poista toiminto"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr ""
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Säännön nimi: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Nimetön"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Jos"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Suorita toiminnot"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "mikään ehdoista täyttyy"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Lisää ehto"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Poista ehto"
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "Lue"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Kopioi kansioon"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Otettu vastaan"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Lähetetty"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Viestin otsikko"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Viesti vastaanotettu"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Viesti lähetetty"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Siirrä kansioon"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Vastaanottajat"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Lähettäjä"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Lähde"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "Tila"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Aihe"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "jälkeen"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "ennen"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ei sisällä"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "on suurempi kuin"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "on pienempi kuin"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Lisää sääntö"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr ""
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "Aihe sisältää"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "Aihe ei sisällä"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "Avaa"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Tulosta"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "Vastaa lähettäjälle"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr ""
-
-#: mail/folder-browser.c:666
-msgid "Forward inline"
-msgstr ""
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr "Merkitse luetuksi"
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr "Merkitse lukemattomaksi"
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr "Siirrä kansioon..."
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr "Kopioi kansioon..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr "Palauta"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr ""
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Oletus"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-msgid "Evolution Account Editor"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Aihe on %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Viestillä ei ole aihetta.\n"
-"Lähetetäänkö toedella?"
-
-#: mail/mail-callbacks.c:345
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr "Lähettääksesi tämän viestin sinuun tulee määrittää vastaanottajat"
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr "Lähettääksesi tämän viestin sinuun tulee määrittää vastaanottajat"
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr "Siirrä viesti(t) kansioon"
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr "Kopioi viesti(t) kansioon"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Voit muokata vain Luonnokset\n"
-"-kansiossa olevia viestejä."
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr "Tallenna viesti nimellä..."
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr "Tallenna viestit nimellä..."
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "Tulosta viesti"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "Viestin tulostus epäonnistui"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "Tallenna liite"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr ""
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr "Ulkoinen katselin"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Piilota"
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr "Salattu viesti"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr ""
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Luodaan uutta kansiota"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Kopioidaan viestejä"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Siirretään"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Lähetetään \"%s\""
-
-#: mail/mail-ops.c:565
-msgid "Sending message"
-msgstr "Lähetetään viestiä"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Siirretään viestejä \"%s\" -> \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopioidaan viestejä \"%s\" -> \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Siirrä viestejä kansiosta \"%s\" kansioon \"%s\""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopioi viestejä kansiosta \"%s\" kansioon \"%s\""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "Siirretään"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "Kopioidaan"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(ei kuvausta)"
-
-#: mail/mail-ops.c:1179
-msgid "Forwarded messages"
-msgstr ""
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, c-format
-msgid "Opening folder %s"
-msgstr ""
-
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
-msgstr "Synkronoidaan kansiota"
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Haetaan viestiä %s"
-
-#: mail/mail-ops.c:1517
-msgid "Retrieving messages"
-msgstr "Haetaan viestejä"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-msgid "Saving messages"
-msgstr "Tallennetaan viestejä"
-
-#: mail/mail-ops.c:1922
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr ""
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr ""
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr ""
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Vastaa"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr ""
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr ""
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr ""
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "Tulosta valittu viesti"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "Poista tämä viesti"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr "<tuntematon>"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "liite"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "Lähettäjä:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "jälkeen"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Otettu vastaan"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "Vastaanottaja:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Koko:"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Anna PGP/GPG-salasanasi"
-
-#: mail/openpgp-utils.c:81
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Anna PGP/GPG-salasanasi"
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-ohjelmaa ei ole."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr "Ei salasanaa."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "_Kansio"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Lähde"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Tämä näyttäisi olevan ensimmäinen kerta kun käytät Evolutionia."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Paina \"OK\" asentaaksesi Evolutionin käyttäjäkohtaiset tiedostot kohteeseen"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Ei voitu luoda hakemistoa\n"
-"%s\n"
-"Virhe: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Uusi..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Nimetön)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "Bug buddya ei voitu ajaa."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr ""
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr ""
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1100
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Ryhmän nimi:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Pienet kuvakkeet"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Suuret kuvakkeet"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Uusi ryhmä..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktivoi"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Näytä"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(Ei nimeä)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "Ei virhettä"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "Yleinen virhe"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "I/O-virhe"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Kiitos\n"
-"The Evolution Team\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Uusi tapaaminen"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "_Lähetä"
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "Tallenna L_iitteet..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "_Siirrä kansioon..."
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "_Kopioi kansioon..."
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Sivun asetukset:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "Tulostuksen _esikatselu"
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "_Tiedosto..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Merkitse lukemattomaksi"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "_Edellinen"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "_Seuraava"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Työkalupalkit"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "_Tiedosto..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "_Kirjasin..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Lähetä _viesti kontaktille..."
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Tiedosto..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "_Kopioi kansioon..."
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_Lähetä"
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "Li_sää"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Työkalut"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "T_oiminnot"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Edellinen"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Siirry edelliseen kohtaan"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "Apua"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Siirry seuraavaan kohtaan"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Asetukset"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nyt"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Ryhmä %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Poista kontakti?"
-
-#~ msgid "Address _2:"
-#~ msgstr "Osoite _2:"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Check Address"
-#~ msgstr "Tarkista osoite"
-
-#~ msgid "Countr_y:"
-#~ msgstr "M_aa:"
-
-#~ msgid "Finland"
-#~ msgstr "Suomi"
-
-#~ msgid "USA"
-#~ msgstr "Yhdysvallat"
-
-#~ msgid "_Address:"
-#~ msgstr "_Osoite:"
-
-#~ msgid "_City:"
-#~ msgstr "_Kaupunki:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "_Osavaltio/Provinssi:"
-
-#~ msgid "URI"
-#~ msgstr "URI"
-
-#~ msgid "Find..."
-#~ msgstr "Etsi..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "Vastaanottajat"
-
-#~ msgid "Select Names"
-#~ msgstr "Valitse nimet"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "n"
-#~ msgstr "n"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "r"
-#~ msgstr "r"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
-
-#~ msgid "Bottom:"
-#~ msgstr "Ala:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Mitat:"
-
-#~ msgid "Font..."
-#~ msgstr "Kirjasin..."
-
-#~ msgid "Fonts"
-#~ msgstr "Kirjasinlajit"
-
-#~ msgid "Footer:"
-#~ msgstr "Alatunniste:"
-
-#~ msgid "Header"
-#~ msgstr "Ylätunniste:"
-
-#~ msgid "Header/Footer"
-#~ msgstr "Ylä-/Alatunniste"
-
-#~ msgid "Height:"
-#~ msgstr "Korkeus:"
-
-#~ msgid "Landscape"
-#~ msgstr "Vaaka"
-
-#~ msgid "Left:"
-#~ msgstr "Vasen:"
-
-#~ msgid "Margins"
-#~ msgstr "Reunukset"
-
-#~ msgid "Number of columns:"
-#~ msgstr "Sarakkeiden määrä:"
-
-#~ msgid "Options"
-#~ msgstr "Asetukset"
-
-#~ msgid "Orientation"
-#~ msgstr "Suunta"
-
-#~ msgid "Page"
-#~ msgstr "Sivu"
-
-#~ msgid "Paper"
-#~ msgstr "Paperi"
-
-#~ msgid "Paper source:"
-#~ msgstr "Paperilähde:"
-
-#~ msgid "Portrait"
-#~ msgstr "Pysty"
-
-#~ msgid "Preview:"
-#~ msgstr "Esikatselu:"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "Peilikuvareunukset"
-
-#~ msgid "Right:"
-#~ msgstr "Oikea:"
-
-#~ msgid "Shading"
-#~ msgstr "Varjostus"
-
-#~ msgid "Style name:"
-#~ msgstr "Tyylin nimi:"
-
-#~ msgid "Top:"
-#~ msgstr "Ylä:"
-
-#~ msgid "Type:"
-#~ msgstr "Tyyppi:"
-
-#~ msgid "Width:"
-#~ msgstr "Leveys:"
-
-#~ msgid "Edit appointment"
-#~ msgstr "Muokkaa tapaamista"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 minuuttia"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 minuuttia"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 tuntia (am/pm)"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 minuuttia"
-
-#~ msgid "24 hour"
-#~ msgstr "24 tuntia"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 minuuttia"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 minuuttia"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalenteri"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Kalenterin asetukset"
-
-#~ msgid "Colors"
-#~ msgstr "Värit"
-
-#~ msgid "Compress weekends"
-#~ msgstr "Tiivistä viikonloput"
-
-#~ msgid "Defaults"
-#~ msgstr "Oletukset"
-
-#~ msgid "End of day:"
-#~ msgstr "Päivän loppu:"
-
-#~ msgid "Pick a color"
-#~ msgstr "Valitse väri"
-
-#~ msgid "Show"
-#~ msgstr "Näytä"
-
-#~ msgid "Show week numbers"
-#~ msgstr "Näytä viikkonumerot"
-
-#~ msgid "Start of day:"
-#~ msgstr "Päivän alku:"
-
-#~ msgid "Work week"
-#~ msgstr "Työviikko"
-
-#~ msgid "minutes before they occur."
-#~ msgstr "minuuttia niitä ennen."
-
-#~ msgid "seconds."
-#~ msgstr "sekuntia."
-
-#~ msgid "C_lassification:"
-#~ msgstr "_Luokitus"
-
-#~ msgid "High"
-#~ msgstr "Korkea"
-
-#~ msgid "Low"
-#~ msgstr "Matala"
-
-#~ msgid "Normal"
-#~ msgstr "Tavallinen"
-
-#~ msgid "Task"
-#~ msgstr "Tehtävä"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontaktit..."
-
-#~ msgid "_Priority:"
-#~ msgstr "_Prioriteetti:"
-
-#~ msgid "A_ll day event"
-#~ msgstr "_Koko päivän kestävä tapahtuma"
-
-#~ msgid "Days"
-#~ msgstr "Päivää"
-
-#~ msgid "Every"
-#~ msgstr "Joka"
-
-#~ msgid "Exceptions"
-#~ msgstr "Poikkeukset"
-
-#~ msgid "Hours"
-#~ msgstr "Tuntia"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuuttia"
-
-#~ msgid "Modify"
-#~ msgstr "Muuta"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Y_ksityinen"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Y_leinen"
-
-#~ msgid "Time"
-#~ msgstr "Aika"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Luottamuksellinen"
-
-#~ msgid "_Contacts"
-#~ msgstr "_Kontaktit"
-
-#~ msgid "_Starting date:"
-#~ msgstr "_Alkamispäivä:"
-
-#~ msgid "File name:"
-#~ msgstr "Tiedostonimi:"
-
-#~ msgid "Incoming"
-#~ msgstr "Tulevat"
-
-#~ msgid "Outgoing"
-#~ msgstr "Lähtevät"
-
-#~ msgid "Save"
-#~ msgstr "Tallenna"
-
-#~ msgid "Show all hidden"
-#~ msgstr "Näytä kaikki piilotetut"
-
-#~ msgid "Hide selected"
-#~ msgstr "Piilota valitut"
-
-#~ msgid "Hide read"
-#~ msgstr "Piilota luetut"
-
-#~ msgid "Hide deleted"
-#~ msgstr "Piilota poistetut"
-
-#~ msgid "Hide Subject"
-#~ msgstr "Piilota aihe"
-
-#~ msgid "Hide Messages"
-#~ msgstr "Piilota viestit"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Piilota aihe \"%s\""
-
-#~ msgid "Authentication"
-#~ msgstr "Todentaminen"
-
-#~ msgid "Authentication Type:"
-#~ msgstr "Todentamistyyppi:"
-
-#~ msgid "E-Mail Address:"
-#~ msgstr "Sähköpostiosoite:"
-
-#~ msgid "Email Address:"
-#~ msgstr "Sähköpostiosoite:"
-
-#~ msgid "Full Name:"
-#~ msgstr "Koko nimi:"
-
-#~ msgid "Hostname:"
-#~ msgstr "Isännän nimi:"
-
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos"
-
-#~ msgid "Organization:"
-#~ msgstr "Organisaatio:"
-
-#~ msgid "Password:"
-#~ msgstr "Salasana:"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "Save password"
-#~ msgstr "Tallenna salasana"
-
-#~ msgid "Select signature file"
-#~ msgstr "Valitse allekirjoitustiedosto"
-
-#~ msgid "Server Configuration"
-#~ msgstr "Palvelimen asetukset"
-
-#~ msgid "Server Type: "
-#~ msgstr "Palvelintyyppi: "
-
-#~ msgid "Server requires authentication"
-#~ msgstr "Palvelin vaati todennuksen"
-
-#~ msgid "Servers"
-#~ msgstr "Palvelimet"
-
-#~ msgid "Signature file:"
-#~ msgstr "Allekirjoitustiedosto:"
-
-#~ msgid "Sources"
-#~ msgstr "Lähteet"
-
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "Tämä palvelin vaatii turvatun yhteyden (SSL)"
-
-#~ msgid "Type"
-#~ msgstr "Tyyppi"
-
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr ""
-#~ "Anna nimi jolla haluat viitata näihin palvelimiin. Esimerkiksi \"Työ\" tai "
-#~ "\"Koti\"."
-
-#~ msgid "User Information"
-#~ msgstr "Käyttäjätiedot"
-
-#~ msgid "Username:"
-#~ msgstr "Käyttäjänimi:"
-
-#~ msgid "minute(s)"
-#~ msgstr "minuutti(a)"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Anna nimi ja sähköpostiosoite, joita käytetään lähtevässä postissa. Voit "
-#~ "myös halutessasi antaa organisaatiosi nimen, sekä tiedostonimen, josta "
-#~ "allekirjoituksesi luetaan."
-
-#~ msgid "Full name:"
-#~ msgstr "Koko nimi:"
-
-#~ msgid "Email address:"
-#~ msgstr "Sähköpostiosoite:"
-
-#~ msgid "Signature File"
-#~ msgstr "Allekirjoitustiedosto"
-
-#~ msgid "Server:"
-#~ msgstr "Palvelin:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Etsi tuettuja tyyppejä..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Älä poista viestejä palvelimelta"
-
-#~ msgid "Test Settings"
-#~ msgstr "Kokeile asetuksia"
-
-#~ msgid "Add Source"
-#~ msgstr "Lisää lähde"
-
-#~ msgid "Edit Source"
-#~ msgstr "Muokkaa lähdettä"
-
-#~ msgid "Add News Server"
-#~ msgstr "Lisää uutispalvelin"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Muokkaa uutispalvelinta"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Kokeillaan: \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Yhdistäminen onnistui!"
-
-#~ msgid "Address"
-#~ msgstr "Osoite"
-
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Merkitse viesti nähdyksi [ms]: "
-
-#~ msgid "News Servers"
-#~ msgstr "Uutispalvelimet"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Lähetä viestit HTML-muodossa"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Tässä Evolutionin versiossa ei ole GPG/PGP-tukea."
-
-#~ msgid "Delete a contact"
-#~ msgstr "Poista kontakti"
-
-#~ msgid "Find"
-#~ msgstr "Etsi"
-
-#~ msgid "Find a contact"
-#~ msgstr "Etsi kontakti"
-
-#~ msgid "Print contacts"
-#~ msgstr "Tulosta kontaktit"
-
-#~ msgid "Stop"
-#~ msgstr "Pysäytä"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Pysäytä lataaminen"
-
-#~ msgid "View All"
-#~ msgstr "Näytä kaikki"
-
-#~ msgid "View all contacts"
-#~ msgstr "Näytä kaikki kontaktit"
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Tulosta kontaktit..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_Etsi kontakteja"
-
-#~ msgid "5 Days"
-#~ msgstr "5 päivää"
-
-#~ msgid "Alter preferences"
-#~ msgstr "Muuta asetuksia"
-
-#~ msgid "Ca_lendar"
-#~ msgstr "_Kalenteri"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Kalenterin asetukset..."
-
-#~ msgid "Create a new appointment"
-#~ msgstr "Luo uusi tapaaminen"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Luo uusi kalenteri"
-
-#~ msgid "Month"
-#~ msgstr "Kuukausi"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Avaa kalenteri"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Tulosta tämä kalenteri"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Näytä 1 päivä"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Näytä 1 kuukausi"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Näytä 1 viikko"
-
-#~ msgid "Show the working week"
-#~ msgstr "Näytä työviikko"
-
-#~ msgid "Week"
-#~ msgstr "Viikko"
-
-#~ msgid "_New"
-#~ msgstr "_Uusi"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_Avaa kalenteri"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Tulosta tämä kalenteri"
-
-#~ msgid "_Save As..."
-#~ msgstr "Tallenna _nimellä..."
-
-#~ msgid "Delete..."
-#~ msgstr "Poista..."
-
-#~ msgid "Help"
-#~ msgstr "Apua"
-
-#~ msgid "Print..."
-#~ msgstr "Tulosta..."
-
-#~ msgid "Save _As..."
-#~ msgstr "Tallenna _nimellä..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Tallenna ja sulje"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Tallenna kontakti ja sulje ikkuna"
-
-#~ msgid "_File"
-#~ msgstr "_Tiedosto"
-
-#~ msgid "_Print..."
-#~ msgstr "T_ulosta..."
-
-#~ msgid "_Save"
-#~ msgstr "_Tallenna"
-
-#~ msgid "About..."
-#~ msgstr "Tietoja..."
-
-#~ msgid "C_ut"
-#~ msgstr "L_eikkaa"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Sulje tämä tapaaminen"
-
-#~ msgid "Copy"
-#~ msgstr "Kopioi"
-
-#~ msgid "Copy the selection"
-#~ msgstr "Kopioi valinta"
-
-#~ msgid "Cut"
-#~ msgstr "Leikkaa"
-
-#~ msgid "Cut the selection"
-#~ msgstr "Leikkaa valinta"
-
-#~ msgid "Find Again"
-#~ msgstr "Etsi uudelleen"
-
-#~ msgid "Find _Again"
-#~ msgstr "Etsi uude_lleen"
-
-#~ msgid "Paste"
-#~ msgstr "Liitä"
-
-#~ msgid "Paste the clipboard"
-#~ msgstr "Liitä leikepöytä"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "Tulost_usasetukset"
-
-#~ msgid "Print Setup"
-#~ msgstr "Tulostusasetukset"
-
-#~ msgid "Redo"
-#~ msgstr "Tee uudelleen"
-
-#~ msgid "Redo the undone action"
-#~ msgstr "Tee kumottu toiminto uudelleen"
-
-#~ msgid "Replace"
-#~ msgstr "Korvaa"
-
-#~ msgid "Replace a string"
-#~ msgstr "Korvaa merkkijono"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
-
-#~ msgid "Save the current file"
-#~ msgstr "Tallenna nykyinen tiedosto"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Etsi uudelleen samaa merkkijonoa"
-
-#~ msgid "Search for a string"
-#~ msgstr "Etsi merkkijonoa"
-
-#~ msgid "Select All"
-#~ msgstr "Valitse kaikki"
-
-#~ msgid "Select everything"
-#~ msgstr "Merkitsee kaikki valituksi"
-
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
-
-#~ msgid "Undo"
-#~ msgstr "Kumoa"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Kumoa edellinen toiminto"
-
-#~ msgid "_About..."
-#~ msgstr "_Tietoja..."
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopioi"
-
-#~ msgid "_Edit"
-#~ msgstr "_Muokkaa"
-
-#~ msgid "_Find..."
-#~ msgstr "_Etsi..."
-
-#~ msgid "_Help"
-#~ msgstr "_Apua"
-
-#~ msgid "_Paste"
-#~ msgstr "L_iitä"
-
-#~ msgid "_Print"
-#~ msgstr "_Tulosta"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Korvaa..."
-
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Piilota _poistetut viestit"
-
-#~ msgid "Hide _Read messages"
-#~ msgstr "Piilota _luetut viestit"
-
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Piilota _valitut viestit"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Merkitse _lukemattomaksi"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Esikatsele tulostettavaa viestiä"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Viestin tulostuksen esikatselu..."
-
-#~ msgid "Print message..."
-#~ msgstr "Tulosta viesti..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "Vastaa _Kaikille"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Vastaa _Lähettäjälle"
-
-#~ msgid "Select _All"
-#~ msgstr "Valitse _kaikki"
-
-#~ msgid "Show _All messages"
-#~ msgstr "Näytä _kaikki viestit"
-
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Kopioi kansioon..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "_Muokkaa viestiä"
-
-#~ msgid "_Message"
-#~ msgstr "_Viesti"
-
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Siirrä kansioon..."
-
-#~ msgid "_Print Message"
-#~ msgstr "_Tulosta viesti"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "Tallenna _viesti nimellä..."
-
-#~ msgid "_Undelete"
-#~ msgstr "_Palauta"
-
-#~ msgid "Attach"
-#~ msgstr "Liitä"
-
-#~ msgid "Close the current file"
-#~ msgstr "Sulje nykyinen tiedosto"
-
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Salaa tämä viesti PGP:llä"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Liitä tiedosto viestiin tekstinä"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Liitä tekstitiedosto..."
-
-#~ msgid "Open a file"
-#~ msgstr "Avaa tiedosto"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP-salaus"
-
-#~ msgid "PGP Sign"
-#~ msgstr "PGP-allekirjoitus"
-
-#~ msgid "Save As"
-#~ msgstr "Tallenna nimellä..."
-
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Tallenna _kansioon..."
-
-#~ msgid "Save in folder..."
-#~ msgstr "Tallenna kansioon..."
-
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Tallenna tiedosto uudella nimellä"
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Tallenna viesti johonkin tiettyyn kansioon"
-
-#~ msgid "Send"
-#~ msgstr "Lähetä"
-
-#~ msgid "Send _Later"
-#~ msgstr "Lähetä _myöhemmin"
-
-#~ msgid "Send _later"
-#~ msgstr "Lähetä _myöhemmin"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Lähetä viesti HTML-muodossa"
-
-#~ msgid "Send the message later"
-#~ msgstr "Lähetä viesti myöhemmin"
-
-#~ msgid "Send the message now"
-#~ msgstr "Lähetä viesti heti"
-
-#~ msgid "Send this message now"
-#~ msgstr "Lähetä viesti heti"
-
-#~ msgid "Show / hide attachments"
-#~ msgstr "Näytä / piilota liitetiedostot"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Näytä _liitteet"
-
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Allekirjoita viesti PGP-avaimellasi"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Liitä tekstitiedosto..."
-
-#~ msgid "_Open..."
-#~ msgstr "_Avaa..."
-
-#~ msgid "_Security"
-#~ msgstr "_Turvallisuus"
-
-#~ msgid "Subscribe"
-#~ msgstr "Tilaa"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Poista tilaus"
-
-#~ msgid "E_xit"
-#~ msgstr "_Poistu"
-
-#~ msgid "Exit the program"
-#~ msgstr "Poistu ohjelmasta"
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Tapaaminen"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Kontakti"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Siirry kansioon..."
-
-#~ msgid "_Settings"
-#~ msgstr "_Asetukset"
diff --git a/po/flu-danish b/po/flu-danish
deleted file mode 100644
index 51953e5980..0000000000
--- a/po/flu-danish
+++ /dev/null
@@ -1,114 +0,0 @@
-#~ msgid "A folder containing mail items"
-#~ msgstr "En mappe som indeholder e-post ting"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "En mappe med kontakter"
-
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "En mappe med kalenderting"
-
-#~ msgid "A folder containing tasks"
-#~ msgstr "En mappe med opgaver"
-
-#~ msgid "Evolution can not create its local folders"
-#~ msgstr "Evolution kan ikke oprette sine lokale mapper"
-
-#~ msgid "Large Icons"
-#~ msgstr "Store ikoner"
-
-#~ msgid "Small Icons"
-#~ msgstr "Små ikoner"
-
-#~ msgid "Add New Group"
-#~ msgstr "Tilføj ny gruppe"
-
-#~ msgid "Remove Group"
-#~ msgstr "Fjern gruppe"
-
-#~ msgid "Rename Group"
-#~ msgstr "Omdøb gruppe"
-
-#~ msgid "Add Shortcut"
-#~ msgstr "Tilføj genvej"
-
-#~ msgid "Open Folder"
-#~ msgstr "Åbn mappe"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Åbn i et nyt vindue"
-
-#~ msgid "Advanced Find"
-#~ msgstr "Avanceret søgning"
-
-#~ msgid "Remove From Shortcut Bar"
-#~ msgstr "Fjern fra genvejslinjen"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Omdøb genvej"
-
-#~ msgid "Properties"
-#~ msgstr "Egenskaber"
-
-#~ msgid "Today"
-#~ msgstr "I dag"
-
-#~ msgid "Executive Summary"
-#~ msgstr "Oversigt"
-
-#~ msgid "Inbox"
-#~ msgstr "Indboks"
-
-#~ msgid "New mail messages"
-#~ msgstr "Nye e-post meddelelser"
-
-#~ msgid "Sent messages"
-#~ msgstr "Sendte meddelelser"
-
-#~ msgid "Sent mail messages"
-#~ msgstr "Sendte e-post meddelelser"
-
-#~ msgid "Drafts"
-#~ msgstr "Kladder"
-
-#~ msgid "Draft mail messages"
-#~ msgstr "E-post-kladder"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "Your calendar"
-#~ msgstr "Din kalender"
-
-#~ msgid "Contacts"
-#~ msgstr "Kontakter"
-
-#~ msgid "Your contacts list"
-#~ msgstr "Din kontaktliste"
-
-#~ msgid "Tasks"
-#~ msgstr "Opgaver"
-
-#~ msgid "Tasks list"
-#~ msgstr "Opgaveliste"
-
-#~ msgid "Main Shortcuts"
-#~ msgstr "Hovedgenveje"
-
-#~ msgid "Other Shortcuts"
-#~ msgstr "Andre genveje"
-
-#~ msgid "New group"
-#~ msgstr "Ny gruppe"
-
-#~ msgid "Enables some debugging functions"
-#~ msgstr "Aktivér fejlsøgningsfunktioner"
-
-#~ msgid "LEVEL"
-#~ msgstr "LEVEL"
-
-#~ msgid ""
-#~ "It was not possible to setup the Evolution startup files.  Please\n"
-#~ "fix the problem, and restart Evolution"
-#~ msgstr ""
-#~ "Det var ikke muligt at sætte Evolutions opstartsfiler op. Venligst\n"
-#~ "ret problemet, og genstart Evolution"
diff --git a/po/fr.po b/po/fr.po
deleted file mode 100644
index dd8d1de42e..0000000000
--- a/po/fr.po
+++ /dev/null
@@ -1,8987 +0,0 @@
-# evolution fr.po
-# Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# Vincent Renardias <vincent@debian.org>, 2000.
-# Christophe Merlet (RedFox) <redfox@eikonex.org>, 2000-2001.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-02-13 13:04+0100\n"
-"PO-Revision-Date: 2001-02-13 13:03+0100\n"
-"Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
-"Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Carte : "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nom : "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Préfixe :     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Donné :      "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Additionnel : "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Famille :     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffixe :     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Date de naissance : "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Addresse :"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Boite postale :  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext :         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Rue :      "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ville :        "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Région :      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Code postal : "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Pays :     "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Dénomination : "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Téléphones :\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Téléphone :"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"Adresse électronique :\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"Adresse électronique 2 :"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Messager : "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Fuseau horaire : "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Situation géographique : "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Profession : "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org : "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nom :  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Unité :  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Unité 2 : "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Unité 3 : "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Unité 4 : "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Catégories : "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Commentaire : "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Chaîne unique : "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Clé publique : "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Ne peut initialiser Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Désactivé"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchroniser"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copier depuis le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copier vers le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Fusionner depuis le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Fusionner vers le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Auteur originel : "
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conduit 'Contact' d'Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 la Free Software Foundation et Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronise l'action"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "État du conduit"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Aucun Pilot configuré, choisissez la capplet\n"
-"'Propriétés du lien Pilot' en premier."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Non connecté au démon gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Une erreur est survenue durant la récupération de\n"
-"la liste des Pilot depuis le démon gnome-pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Le curseur ne peut être chargé\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook non chargé\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Ne peut démarrer le serveur wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Ne peut démarrer wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configuration du conduit Adresses"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Conduit Adresses"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Ajouter"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Anni_verssaire :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "T_ravail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Fax travail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacts..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tégories..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Éditeur de contacts"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Détails"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Classer comme :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Général"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Nouveau type de téléphone"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "No_tes :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Types de téléphones"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "E-mail principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Veut recevoir des messages _HTML"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Page Web :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresse..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Nom de l'_assistant :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "_Date de naissance :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Travail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "So_ciété :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Supprimer"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "_Département :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Nom complet..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Maison"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Profession :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "No_m du directeur :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobile"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Sur_nom :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "_Bureau :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Profession :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "_Conjoint(e) :"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "_C'est l'adresse de la liste de diffusion"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Supprimer le contact ?"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistant"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Travail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Travail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Fax travail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Répondeur"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Voiture"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Société"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Maison"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Maison 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax maison"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "RNIS"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobile"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Autre"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Fax autre"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2 :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Verifier l'adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Pa_ys :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finlande"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Ville :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "Boîte _postale :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "État/_Province :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Code postal :"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Vérifier le nom complet"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:4
-#, fuzzy
-msgid "I"
-msgstr "Si"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:8
-#, fuzzy
-msgid "Miss"
-msgstr "est"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Prénom :"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Nom :"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "Second préno_m :"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Suffixe :"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titre :"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Comme _minicartes"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Comme _tableau"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entrer le mot de passe pour %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Impossible d'ouvrir le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
-"parce que vous avez entrez une URI incorrecte, soit\n"
-"parce que vous avez essayer d'accéder à un serveur LDAP\n"
-"et que le support LDAP n'a pas été compilé. Si vous avez\n"
-"entré une URI, vérifiez sa validité et réentrez la. Sinon\n"
-"vous essayer probablement d'accéder à un serveur LDAP,\n"
-"vous devriez télécharger et installer OpenLDAP, puis\n"
-"recompiler et installer Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Afficher tout"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avancée..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "N'importe quel champ contient"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Le nom contient"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "L'e-mail contient"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que le navigateur de dossier affichera"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Autres contacts"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "Serveur LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fichier"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Type de carnet d'adresses inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Aucun (mode anonyme)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:248
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Type d'identification inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Un"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Sous-arborescence"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Type de domaine inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Se souvenir de ce mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Hôte :"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port :"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Racine DN :"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Domaine de recherche :"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Identification :"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Chemin :"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Créer le chemin si il n'existe pas."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Éditer le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Ajouter un carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Sélectionnez le type de carnet d'adresse que vous avez, et entrez les "
-"informations le concernant."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Nom :"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Description :"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Supprimer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Éditer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conduit 'Contact' d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Cliquez ici pour le carnet d'adresses"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Conduit 'Contact' d'Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rechercher..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinataires du message"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Sélectionnez des noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Sélectionnez un nom depuis :"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Rechercher"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Enregistrer comme VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Cliquez ici pour ajouter un contact *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "Adresse élec."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Site Web"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Département"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Bureau"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titre"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Profession"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Gestionnaire"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Surnom"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Conjoint(e)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "* Cliquez ici pour ajouter un contact *"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Enregistrer dans le carnet d'adresses"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Il n'y a aucun éléments à afficher dans cette vue.\n"
-"\n"
-"Double-cliquez ici pour créer un nouveau contact."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Formulaires blancs à la fin :"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corps"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bas :"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensions :"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Police..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Polices"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Pied de page :"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "En-tête"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "En-tête/Pied de page"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "En-têtes"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "En-têtes pour chaque lettre"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Hauteur :"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Se suivre immédiatement l'un l'autre"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inclure :"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Paysage"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Gauche :"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Sélecteurs de lettre sur le coté"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marges"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Nombre de colonnes :"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Options"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientation"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Page"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Configuration de la page :"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papier"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Source de papier :"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portrait"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Aperçu :"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Imprimer en utilisant un ombrage gris"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Retourner sur les pages paires"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Droite :"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sections :"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Ombrage"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Taille :"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Démarrer sur une nouvelle page"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nom du style :"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Haut :"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Type :"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Largeur :"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conduite « Calendrier » d'Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-"Utilitaire de configuration pour la conduite « Calendrier » d'Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Erreur lors de la communication avec le serveur de calendrier"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configuration du conduit calendrier"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Conduit Calendrier"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configuration du conduit `A Faire'"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Conduit Evolution `A Faire'"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Conduite « À faire » d'Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-"Utilitaire de configuration pour la conduite « À faire » d'Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Ne peut lire le bloc d'application « À faire » du Pilot"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Rappel de votre rendez-vous à "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sieste"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Valider"
-
-#: calendar/gui/calendar-commands.c:248
-msgid "File not found"
-msgstr "Fichier introuvable"
-
-#: calendar/gui/calendar-commands.c:272
-msgid "Open calendar"
-msgstr "Ouvrir le calendrier"
-
-#: calendar/gui/calendar-commands.c:314
-msgid "Save calendar"
-msgstr "Enregistrer le calendrier"
-
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Ne peut créer la vue du calendrier. Veuillez vérifier votre configuration "
-"d'ORBit et d'OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Public"
-msgstr "Public"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Private"
-msgstr "Privé"
-
-#: calendar/gui/calendar-model.c:385
-msgid "Confidential"
-msgstr "Confidentiel"
-
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: calendar/gui/calendar-model.c:476
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:476
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:478
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:478
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Transparent"
-msgstr "Transparent"
-
-#: calendar/gui/calendar-model.c:553
-msgid "Opaque"
-msgstr "Opaque"
-
-#: calendar/gui/calendar-model.c:779
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La date doit être entrée dans ce format :\n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:898
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:901
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:905
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1028
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La situation géographique doit être entrée dans ce format :\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1068
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "La valeur de pourcentage doit être comprise entre 0 et 100 inclus"
-
-#: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "La priorité doit être comprise entre 1 et 9 inclus"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erreur de chargement du calendrier</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erreur de chargement du calendrier :<br>Méthode non supportée"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Affichage"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Afficher les rendez-vous"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Afficher les tâches"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Chargement du calendrier"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "L'URI que le calendrier affichera"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme le %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notification à propos de votre rendez-vous le %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Aucun résumé disponible."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fermer"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Éditer le rendez-vous"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Durée de la sieste (minutes)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 heures (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 heures"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Expiration des alarmes après"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes auditives"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Biper quand les fenêtres d'alarme apparaissent."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Préférences du calendrier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Couleurs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Compresser les week-ends"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Options du navigateur de date"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Défauts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Options d'affichage"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Date d'échéance"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Activer la sonnerie pour"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Fin de la journée :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Premier jour de la semaine :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Vendredi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Mettre en évidence"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Éléments s'achevant aujourd'hui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Éléments expirant aujourd'hui : "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Éléments pas encore expirés"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Éléments pas encore expirés :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Lundi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Éléments en retard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Éléments en retard :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Priorité"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Alarmes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Sam"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Samedi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Afficher"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Afficher l'heure de fin des rendez-vous"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Afficher les numéros de semaine"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Début de la journée :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Dim"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TâchePad"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Jeu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Durée avant échéance"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Divisions du temps :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Format de date :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuelles"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semaine de travail"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutes avant leur début."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "secondes."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Êtes-vous sûr de vouloir supprimer le rendez-vous « %s » ?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Êtes-vous sûr de vouloir supprimer la tâche « %s » ?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Êtes-vous sûr de vouloir supprimer cette tâche sans titre %s ?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Êtes-vous sûr de vouloir supprimer l'entrée de journal « %s » ?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Êtes-vous sûr de vouloir supprimer cet entrée de journal sans titre ?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Voulez-vous enregistrer les changements ?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_lété :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Annulé"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Classification"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Complété"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Date & Time"
-msgstr "Date &amp; heure"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Date d'achèvement :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Haute"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "En cours"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Basse"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Non démarrée"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vé"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En cours"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Date de _début :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Résu_mé :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tâche"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Indéfini"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Confidentiel"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contacts..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Date d'expiration :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorité :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_État :"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Éditer la tâche"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Aucun résumé"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Tâche - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrée de journal - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Catégories"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "Complétée"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Date de fin"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Date de début"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Emplacement géographique"
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Marque la tâche comme complétée"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Résumé"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Transparence"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Cliquez ici pour ajouter une tâche"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Marquer comme terminée"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Marque la tâche comme complétée"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Éditer cette tâche..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Édite la tâche"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Supprimer la tâche"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Supprime la tâche"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minute"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nouveau rendez-vous..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-#, fuzzy
-msgid "Schedule meeting"
-msgstr "Sélectionnez un Dossier"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Éditer ce rendez-vous..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Supprimer ce rendez-vous"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Rendre ce rendez-vous déplaçable"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Supprimer cette occurence"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Supprimer toutes les occurences"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Je ne peut mettre à jour votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-#, fuzzy
-msgid "Component successfully updated."
-msgstr "Les fichiers d'Evolution sont correctement installés."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Je ne peut ouvrir votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Je ne peut charger votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Je ne peut lire votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:491
-#, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Ne peut créer un calendrier dans `%s'"
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:542
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "Les fichiers d'Evolution sont correctement installés."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Ajouter au calendrier"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Accepter"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Refuser"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Essai"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Mettre à jour le calendrier"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Annuler la réunion"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, fuzzy, no-c-format
-msgid "%P %%"
-msgstr "%A %d %B"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr ""
-
-#: calendar/gui/e-itip-control.glade.h:4
-#, fuzzy
-msgid "Calendar Message"
-msgstr "Calendrier"
-
-#: calendar/gui/e-itip-control.glade.h:5
-#, fuzzy
-msgid "Date:"
-msgstr "Date"
-
-#: calendar/gui/e-itip-control.glade.h:8
-#, fuzzy
-msgid "Loading calendar..."
-msgstr "Chargement du calendrier"
-
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation :"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Expéditeur"
-
-#: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
-msgid "Summary:"
-msgstr "Résu_mé :"
-
-#: calendar/gui/e-itip-control.glade.h:12
-#, fuzzy
-msgid "date-end"
-msgstr "Mettre à jour le calendrier"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Tout les invités"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Tout les invités"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Tout les invités"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-#, fuzzy
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Annuler la réunion"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Voiture"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "Heure de _début de la réunion :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "Sélectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "Personnes _nécessaires"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "Sélectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1157
-msgid "Status"
-msgstr "État"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Tous"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Catégorie :"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Ne peut charger la tâche dans « %s »"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "La méthode requise pour charger « %s » n'est pas supportée"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Toute la journée"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Rendez-vous élémentaires"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Récurrence personnalisée"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Tou(te)s les"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifier"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Aucune récurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Aperçu"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Récurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Règle de récurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Alarme"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Lancer un programme"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-#, fuzzy
-msgid "Send an email"
-msgstr "Récupération du courrier depuis %s"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Réglages..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Afficher un dialogue"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Récurrence simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Heure de _fin :"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Heure de _début :"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Date de _début :"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "aprés"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "avant"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "jour(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "pour"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "toujours"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "heure(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minute(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mois"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-#, fuzzy
-msgid "start of appointment"
-msgstr "Éditer le rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "jusqu'à"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "semaine(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "année(s)"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Éditer le rendez-vous"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "le"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "jour"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "dans le"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "ième"
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "occurences"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ce rendez-vons contient des récurrences qu'Evolution ne peut éditer."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d jours"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 jour"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d semaines"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 semaine"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d heures"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 heure"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutes"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minute"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondes"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 seconde"
-
-#: calendar/gui/event-editor.c:1590
-#, fuzzy
-msgid " before start of appointment"
-msgstr "Crée un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1592
-#, fuzzy
-msgid " after start of appointment"
-msgstr "Crée un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1600
-#, fuzzy
-msgid " before end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor.c:1602
-#, fuzzy
-msgid " after end of appointment"
-msgstr "Crée un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Ne peut initialiser le composant de résumé de messages d'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conduite « Calendrier » d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-"Utilitaire de configuration pour la conduite « Calendrier » d'Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Ne peut ouvrir le dossier dans « %s »"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "La méthode requise pour charger « %s » n'est pas supportée"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Avril"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Aout"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Décembre"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Février"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Aller à la date"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Aller à aujourd'hui"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Janvier"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juillet"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juin"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Mars"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mai"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "Novembre"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Octobre"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "Septembre"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1er"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2ème"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3ème"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4ème"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5ème"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6ème"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7ème"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8ème"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9ème"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10ème"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11ème"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12ème"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13ème"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14ème"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15ème"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16ème"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17ème"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18ème"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19ème"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20ème"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21ème"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22ème"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23ème"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24ème"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25ème"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26ème"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27ème"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28ème"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29ème"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30ème"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31ème"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Di"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Lu"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Ma"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Me"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Je"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Ve"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Sa"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Tâches"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Jour en cours (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Semaine en cours (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Mois en cours (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Année en cours (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Imprimer le Calendrier"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Aperçu Avant Impression"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "L'URI que le calendrier affichera"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "DLMMJVS"
-
-#: camel/camel-filter-driver.c:767
-#, fuzzy, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Erreur d'enregistrement du fichier : %s"
-
-#: camel/camel-filter-driver.c:772
-#, fuzzy, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Erreur d'enregistrement du fichier : %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, fuzzy, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Erreur d'enregistrement du fichier : %s"
-
-#: camel/camel-folder-search.c:320
-#, fuzzy, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Erreur durant le préparation vers %s :\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, fuzzy, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Erreur durant le préparation vers %s :\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Ne peut créer le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez de "
-"nouveau plus tard."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Ne peut vérifier le fichier de courrier %s : %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Échec du stockage du courrier dans le fichier temporaire %s : %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Ne peut créer le tube : %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Ne peut cloner : %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Échec du programme movemail : %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Erreur inconnue)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Ne peut charger %s : %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s serveur %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s service pour %s sur %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Connexion annulée"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ne peut se connecter à %s (port %d) : %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(hôte inconnu)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Opération annulée"
-
-#: camel/camel-search-private.c:105
-#, fuzzy, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Echec d'écriture dans la boite à lettres temporaire : %s : %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "L'URL « %s » a besoin du composant « nom d'utilisateur »"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "L'URL « %s » a besoin du composant « hôte »"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "L'URL « %s » a besoin du composant « chemin »"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Aucun hôte %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporairement impossible de résoudre le nom d'hôte %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Aucun fournisseur disponible pour le protocole « %s »"
-
-#: camel/camel-session.c:394
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Ne peut créer le répertoire %s :\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La chaîne d'URL « %s » ne contient pas de protocole"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La chaîne d'URL « %s » contient un protocole invalide"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Le numéro de port dans l'URL « %s » n'est pas numérique"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ne peut obtenir le ticket Kerberos :\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Mauvaise réponse d'identification du serveur."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Réponse innatendue du serveur IMAP : %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Échec de la commande IMAP : %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "La réponse du serveur s'est terminée trop tot."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Réponse OK innatendue du serveur IMAP : %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Ne peut charger le résumé pour %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:250
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
-"en clair."
-
-#: camel/providers/imap/camel-imap-store.c:259
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Cette option vous connectera au serveur IMAP en utilisant Kerberos 4 pour "
-"vous identifier."
-
-#: camel/providers/imap/camel-imap-store.c:367
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:395
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Impossible de vous identifier sur le serveur IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:672
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Ne peut créer le répertoire %s : %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "Répertoires de courrier au format UNIX MH (version CamelLocal)"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-"Pour stocker le courrier local dans des répertoires de courrier au format MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Pour stocker le courrier local au format standard mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-#, fuzzy
-msgid "Qmail maildir-format mail files"
-msgstr "Fichiers de courrier au format UNIX qmail maildir"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-"Pour stocker le courrier local dans des répertoires de courrier au format "
-"qmail"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "La racine de stockage %s n'est pas un chemin absolu"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "La racine de stockage %s n'est pas un répertoire normal"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Ne peut obtenir le répertoire : %s : %s"
-
-#: camel/providers/local/camel-local-store.c:174
-#, fuzzy
-msgid "Local stores do not have an inbox"
-msgstr "Le stockage local n'a pas de répertoire racine"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Fichier de courrier local %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Impossible de renommer le dossier %s vers %s : %s"
-
-#: camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Impossible de supprimer le fichier de résumé de dossier « %s » : %s"
-
-#: camel/providers/local/camel-local-store.c:290
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Impossible de concaténer le message au dossier maildir : %s : %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Impossible d'obtenir le message : %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Aucun message correspondant"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Contenu de message invalide"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le dossier « %s » :\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Le dossier « %s » n'existe pas."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ne peut créer le dossier « %s » :\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "« %s » n'est pas un répertoire maildir."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Impossible de supprimer le dossier « %s » : %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "n'est pas un répertoire maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ne peut ouvrir la boîte à lettres : %s : %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Impossible de concaténer le message au fichier mbox : %s : %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Le dossier semble irrémédiablement corrompu"
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Impossible d'ouvrir le fichier « %s » :\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Ne peut créer le fichier « %s » :\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "« %s » n'est pas un fichier normal."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Ne peut supprimer le dossier « %s » :\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Le dossier « %s » n'est pas vide. Non supprimé."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Synchronisation du dossier"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Impossible d'ouvrir le dossier : %s : résume depuis la position %ld : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Erreur fatale d'analyse du courrier prés de la position %ld dans le dossier "
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Ne peut résumer le dossier : %s :%s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1346
-msgid "Synchronising folder"
-msgstr "Synchronisation du dossier"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Ne peut ouvrir le dossier à résumer : %s : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Ne peut ouvrir la boîte à lettres temporaire : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Le résumé et le dossier ne correspondent pas, meme aprés une synchronisation"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erreur d'écriture dans la boite à lettres temporaire : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Echec d'écriture dans la boite à lettres temporaire : %s : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Impossible de fermer le dossier source %s : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Impossible de fermer le dossier temporaire : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Impossible de renommer le dossier : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Erreur inconnue : %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Impossible de concaténer le message au dossier mh : %s : %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "« %s » n'est pas un répertoire."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Veuillez entrer le mot de passe NNTP pour %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Le serveur a rejeté le nom d'utilisateur"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Échec d'envoi du nom d'utilisateur au serveur"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Le serveur a rejeté le nom d'utilisateur / mot de passe"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Message %s non trouvé."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ne peut obtenir la liste des grouges du serveur."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Inpossible de charger la liste des groupes du serveur pour %s : %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Inpossible de sauvegarder le fichier de la liste des groupes pour %s : %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "Nouvelles USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"C'est un fournisseur pour la lecture et la publication dans les groupes de "
-"nouvelles USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Ne peut ouvrir le répertoire pour le serveur de nouvelles : %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "Nouvelles USENET via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Cette option vous identifiera auprés du serveur NNTP en utilisant un mot de "
-"passe en clair."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Incapable d'ouvrir ou de créer un fichier .newsrc pour %s : %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-#, fuzzy
-msgid "Retrieving POP summary"
-msgstr "Récupération des messages"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"Impossible d'ouvrir le dossier : la liste des messages était incomplete."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Aucun message avec l'uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, fuzzy, c-format
-msgid "Retrieving POP message %d"
-msgstr "Récupération du message %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Ne pas récupérer le message du serveur POP %s : %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Pour la connexion aux serveurs POP. Le protocole POP peut aussi être utilisé "
-"pour récupérer les courriers depuis certains fournisseurs de courriers Web "
-"et de systèmes de courriers propriétaires."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Cette option vous connectera au serveur POP en utilisant un mot de passe en "
-"clair. C'est la seul option supporté par la plupart des serveurs POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Cette option vous connectera au serveur POP en utilisant un mot de passe "
-"chiffré via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
-"utilisateurs même si le serveur prétend pouvoir le supporter."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
-"identifier."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Ne peut vous identifier sur le serveur KPOP : %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Ne peut se connecter au serveur POP sur %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sVeuillez entrer le mot de passe POP3 pour %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Impossible de se connecter au serveur POP.\n"
-"Erreur lors de l'envoi du nom d'utilisateur : %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Inconnu)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Impossible de se connecter au serveur POP.\n"
-"Aucun support pour le mécanisme d'identification demandé."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Impossible de se connecter au serveur POP.\n"
-"Erreur lors de l'envoi du mot de passe : %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Aucun dossier « %s »."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Pour délivrer le courrier en passant par le programme « sendmail » sur le "
-"système local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Ne peut créer de tube vers sendmail : %s : courrier non envoyé"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Ne peut cloner sendmail : %s : courrier non envoyé"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Impossible d'envoyer le message : %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail s'est terminé avec le signal %s : courrier non envoyé."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Ne peut exécuter %s : courrier non envoyé."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail s'est terrminé avec l'état %d : courrier non envoyé."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Livraison du courrier via le programme sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-#, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Pour livrer le courrier en vous connectant à un distributeur distant "
-"utilisant SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Commande non implémentée"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Message d'aide"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Service pret"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Échec de la transaction"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erreur du message de bienvenur : %s : sûrement pas grave"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Aucune identification requise"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
-"Cela devrait être suffisant pour se connecter à la plupart des serveurs SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Cela vous connectera au serveur SMTP en utilisant une identification "
-"CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "Serveur SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Livraison du courrier SMTP via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Ne peut envoyer le message : l'adresse de l'expéditeur n'est pas défini"
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-"Ne peut envoyer le message : l'adresse de l'expéditeur n'est pas valide"
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Ne peut créer de tube vers sendmail : %s : courrier non envoyé"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Ne peut exécuter %s : courrier non envoyé."
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Ne peut exécuter %s : courrier non envoyé."
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, fuzzy, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "sendmail s'est terminé avec le signal %s : courrier non envoyé."
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Aucun message correspondant"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Founisseur de dossier de courrier virtuel"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-"Pour la lecture de courrier comme requête a un autre ensemble de dossiers"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 octet"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u octets"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fko"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fMo"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fGo"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "pièce-jointe"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Enlever"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Supprimer les éléments sélectionnés de la liste des pièces-jointes"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Ajouter une pièce-jointe..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Joindre un fichier au message"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1157
-msgid "Attachment"
-msgstr "Pièce-jointe"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Propriétés de la pièce-jointe"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nom du fichier : "
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "pièce-jointe incorporée"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Type MIME :"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Envoyer comme :"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "De :"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Cliquez ici pour le carnet d'adresses"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Entrez l'identité sous laquelle vous désirez envoyer ce message"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "À :"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Entrez les destinataires du message"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc :"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Entrez les adresses qui recevront une copie carbone de ce message"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc :"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Entrez les adresses qui recevront une copie carbone du message sans "
-"apparaitre dans la liste des destinataires du messages."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Sujet :"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Entrez le sujet du message"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le fichier de signature %s :\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Enregistrer sous..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erreur d'enregistrement du fichier : %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erreur de chargement du fichier : %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Enregistrement des changements dans le message..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Enregistrer les changements dans le message..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Erreur de l'enregistrement de la composition dans « Brouillons » : %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Ce message n'a pas été envoyé.\n"
-"\n"
-"Voulez-vous enregistrer vos changements ?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Ouvrir un fichier"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Ce fichier n'existe pas."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Ce n'est pas un fichier normal."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Ce fichier existe mais n'est pas lisible."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a échoué."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Ce fichier est trés gros (plus de 100 ko).\n"
-"Êtes-vous sûr de vouloir l'insérer ?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Une erreur est survenue durant la lecture du fichier."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Composer un message"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Ne peut créer la fenêtre de composition."
-
-#: composer/evolution-composer.c:360
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#: data/evolution.keys.in.h:1
-#, fuzzy
-msgid "address card"
-msgstr "Adresse"
-
-#: data/evolution.keys.in.h:2
-#, fuzzy
-msgid "calendar information"
-msgstr "Information utilisateur"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Ne peut initialiser le composant de résumé de messages d'Evolution."
-
-#: executive-summary/component/component-factory.c:159
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne peut initialiser le composant de résumé de messages d'Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Récupération du courrier depuis %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Fermer %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Déplacer vers le dossier"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Va à la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Va à la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configuration du dossier..."
-
-#: executive-summary/component/e-summary.c:916
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le fichier %s :\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Résumé"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Marque la tâche comme complétée"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Ajouter un service"
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Erreur"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "an"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "années"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mois"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mois"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "semaine"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "semaines"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "jours"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "heure"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "heures"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minute"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutes"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "seconde"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "secondes"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oups. Vous avez oublié de choisir une date."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oups. Vous avez choisi une date invalide."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La date du message sera comparé à la date d'execution\n"
-"du filtre ou lorsque le dossier virtuel est ouvert."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La date du message sera comparé à la date\n"
-"que vous spécifiez ici."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La date du message sera comparé à une date\n"
-"relative au moment où le filtre est exécuté;\n"
-"« il y a une semaine », par exemple."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "la date actuelle"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "une date que vous spécifiez"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "une date relative à la date en cours"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Comparer avec"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "maintenant"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<cliquez ici pour sélectionner une date>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Ajouter une Règle de Filtre"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Éditer la Règle du Filtre"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "entrant"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "sortant"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Éditer les Filtres"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Alors"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Ajouter l'action"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Supprimer l'action"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Sélectionnez un Dossier"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Entrez l'URI du dossier"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<cliquez ici pour sélectionner un dossier>"
-
-#: filter/filter-input.c:189
-#, fuzzy, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Erreur durant le préparation vers %s :\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nom de la règle : "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "SansTitre"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Exécuter les actions"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "si tous les critères sont remplis"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "si un des critères est rempli"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Ajouter un critère"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Supprimer le critère"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Répondu à"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Important"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Lu"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Éditer les dossiers virtuels"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Règles de Filtrage"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrant"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Sortant"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Dossiers Virtuels"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Sources de Dossier Virtuel"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Assigner une couleur"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Assigner un score"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copier vers le dossier"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Date de réception"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Date d'envoi"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expression"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Fait suivre à l'adresse"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corps du message"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "En-tête du message"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Le message a été reçu"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Le message a été envoyé"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Déplacer vers le dossier"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinataires"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1157
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Définir l'état"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Source"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "En-tête spécifique"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Arrête le traitement"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1158
-msgid "Subject"
-msgstr "Sujet"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contient"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ne contient pas"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "ne fini pas avec"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "n'existe pas"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ne ressemble pas"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "ne commence pas par"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "fini avec"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "est plus que"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "est moins que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "n'est pas"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "est"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "sur ou aprés"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "sur ou avant"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "ressemble à"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "Débute avec"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "était aprés"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "était avant"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Ajouter une règle"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Éditer la règle de score"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Ajouter une règle de dossier virtuel"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Éditez la règle du dossier virtuel"
-
-#: mail/component-factory.c:297
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#: mail/component-factory.c:323
-msgid "Cannot register storage with shell"
-msgstr "Ne peut enregistrer le stockage avec le shell"
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Sélectionnez un Dossier"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Le corps ou le sujet contient"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Le corps contient"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Le sujet contient"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Le corps ne contient pas"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Le sujet ne contient pas"
-
-#: mail/folder-browser.c:244
-#, fuzzy
-msgid "Sender contains"
-msgstr "Le nom contient"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Dossier virtuel sur le sujet"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Dossier virtuel sur l'expéditeur"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Dossier virtuel sur les destinataires"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtre sur le sujet"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtre sur l'expéditeur"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtre sur les destinataires"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtre sur la liste de diffusion"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ouvrir"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Enregistrer sous..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimer"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Répondre à l'expéditeur"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Répondre à tous"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Faire suivre"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Faire suire incorporé"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Marquer comme lu"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Marquer comme non lu"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Déplacer vers le dossier..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copier vers le dossier..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Récupérer"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Appliquer les filtres"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Créer une règle à partir du message"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtre sur la liste de diffusion (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Ne peut initialiser le composant de résumé de messages d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
-#: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Current store format:"
-msgstr "Ne peut démarrer wombat"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-#, fuzzy
-msgid "New store format:"
-msgstr "Type de sources de nouvelles :"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Aucune"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (défaut)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Gestionnaire de comptes Evolution"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conduit 'À faire' d'Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Courrier à %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Sujet est %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Courrier de %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "liste de diffusion %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Vous n'avez pas configuré le client de messagerie.\n"
-"Vous avez besoin de le faire avant d'envoyer,\n"
-"recevoir ou composer des courriers.\n"
-"Voulez-vous le configurer maintenant ?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Vous devez configurer une identité\n"
-"avant de pouvoir composer un message."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Vous devez configurez un transport de messagerie\n"
-"avant de pouvoir composer un message."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Vous n'avez pas défini de méthode de transport de courrier"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Ce message n'a pas de sujet.\n"
-"Voulez-vous vraiment l'envoyer ?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Vous devez configurer un compte avant de pouvoir envoyer ce message."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-"Vous devez spécifier des destinataires afin de pouvoir envoyer ce message."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Le %s, %s a écrit :\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Message suivi :\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Déplacez le(s) message(s) vers"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Copiez le(s) message(s) vers"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Vous ne pouvez éditer des messages que\n"
-"lorsqu'ils sont dans le dossier Brouillons."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Écraser le fichier ?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Un fichier avec le même nom existe.\n"
-"L'écraser ?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Enregistrer le message sous..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Enregistrer les messages sous..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Erreur de chargement des information du filtre :\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Imprimer le message"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Échec de l'impression du message"
-
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "Connexion au serveur"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "Connecter au serveur"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Compte"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Information du compte"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Gestionnaire de comptes"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propriétés du compte"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avancée"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Identification"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Type d'identification :"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Vérifier les réglages"
-
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Votre configuration de la messagerie est maintenant complétée.\n"
-"Cliquez sur \"Terminer\" pour enregistrer vos nouveaux paramètres."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Défaut"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Fait"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "Adresse électronique :"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "Adresse électronique :"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Configuration de la messagerie Evolution"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Nom complet :"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Nom d'hôte :"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identité"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Serveur de courrier entrant"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Garder les courriers sur le serveur"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Courrier"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Compte de messagerie"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "Configuration de la messagerie"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Assistant de configuration de messagerie"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config.glade.h:40
-#, fuzzy
-msgid "Mark messages as \"Read\" after:"
-msgstr "Marque les messages comme vus [ms] : "
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "Nouvelles"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Optionnel"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organisation :"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Serveur de courrier sortant"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Texte plein"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Réception des messages"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Se souvenir de mon mot de passe"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Répondre-à :"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Requis"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Enregistrer le mot de passe"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Sélectionner un fichier de signature"
-
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Envoie le message au format HTML"
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Envoie du message"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Configuration du serveur"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Type de serveur : "
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Le serveur nécessite une identification"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Serveurs"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Fichier de signature :"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Signature :"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Sources"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Ce serveur nécessite une connexion sécurisé (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
-"« Travail » ou « Maison »."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Information utilisateur"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr "Configuration de la messagerie Evolution"
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "minutes."
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Espace de nom :"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Enregistrer la pièce-jointe"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ne peut créer de répertoire temporaire : %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Enregistrer sur le disque..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Ouvrir dans %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Voir en ligne"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Visualiseur externe"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Voir en ligne (via %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Cacher"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "pièce-jointe %s"
-
-#: mail/mail-format.c:654
-#, fuzzy
-msgid "Loading message content"
-msgstr "Contenu de message invalide"
-
-#: mail/mail-format.c:943
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Nettoyer l'affichage des messages"
-
-#: mail/mail-format.c:949
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Éditer le message"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1627
-#, fuzzy, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Filtre sur la liste de diffusion (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-local.c:399
-msgid "Registering local folder"
-msgstr "Enregistrement du dossier local"
-
-#: mail/mail-local.c:401
-msgid "Register local folder"
-msgstr "Enregistre le dossier local"
-
-#: mail/mail-local.c:508
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Ne peut enregistrer le dossier « %s » :\n"
-"%s"
-
-#: mail/mail-local.c:672
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Changement du dossier « %s » vers le format « %s »"
-
-#: mail/mail-local.c:676
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Change de dossier « %s » vers le format « %s »"
-
-#: mail/mail-local.c:707
-msgid "Reconfiguring folder"
-msgstr "Reconfiguration du dossier"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:736
-msgid "Closing current folder"
-msgstr "Fermeture du dossier en cours"
-
-#: mail/mail-local.c:768
-msgid "Renaming old folder and opening"
-msgstr "Renommage du vieus dossier et ouverture"
-
-#: mail/mail-local.c:786
-msgid "Creating new folder"
-msgstr "Création d'un nouveau dossier"
-
-#: mail/mail-local.c:800
-msgid "Copying messages"
-msgstr "Copie du message"
-
-#: mail/mail-local.c:821
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
-"pouvoir ouvrir ce dossier : %s"
-
-#: mail/mail-local.c:852
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Si vous ne pouvez plus ouvrir cette boîte aux lettres, alors\n"
-"vous aurez besoin de la réparer manuellement."
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Erreur durant « %s » :\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Erreur durant l'exécution de l'opération :\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "Travail en cours"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Expédition de « %s »"
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Envoie du message"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Adjation de « %s »"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Adjoint un message sans sujet"
-
-#: mail/mail-ops.c:842
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Déplacement des messages de « %s » vers « %s »"
-
-#: mail/mail-ops.c:844
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Duplication des messages de « %s » vers « %s »"
-
-#: mail/mail-ops.c:847
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Déplace les messages de « %s » vers « %s »"
-
-#: mail/mail-ops.c:849
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copie les messages de « %s » vers « %s »"
-
-#: mail/mail-ops.c:880
-msgid "Moving"
-msgstr "Déplacement"
-
-#: mail/mail-ops.c:883
-msgid "Copying"
-msgstr "Duplication"
-
-#: mail/mail-ops.c:903
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s message %d de %d (uid « %s »)"
-
-#: mail/mail-ops.c:978
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Scrutation des dossiers dans « %s »"
-
-#: mail/mail-ops.c:1044 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Aucune description)"
-
-#: mail/mail-ops.c:1109
-msgid "Forwarded messages"
-msgstr "Messages suivis"
-
-#: mail/mail-ops.c:1150 mail/mail-ops.c:1284
-#, c-format
-msgid "Opening folder %s"
-msgstr "Ouverture du dossier %s"
-
-#: mail/mail-ops.c:1215
-#, fuzzy, c-format
-msgid "Opening store %s"
-msgstr "Ouverture du dossier %s"
-
-#: mail/mail-ops.c:1396
-msgid "Expunging folder"
-msgstr "Nettoyage du dossier"
-
-#: mail/mail-ops.c:1445
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Récupération du message %s"
-
-#: mail/mail-ops.c:1512
-msgid "Retrieving messages"
-msgstr "Récupération des messages"
-
-#: mail/mail-ops.c:1522
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Récupération du message numéro %d de %d (uid « %s »)"
-
-#: mail/mail-ops.c:1672
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Chargement de %s dossier pour %s"
-
-#: mail/mail-ops.c:1674
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Charge %s dossier pour %s"
-
-#: mail/mail-ops.c:1840
-msgid "Saving messages"
-msgstr "Enregistre les messages"
-
-#: mail/mail-ops.c:1919
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Ne peut créer le fichier de sortie : %s\n"
-" %s"
-
-#: mail/mail-ops.c:1932
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Enregistrement du message %d sur %d (uid « %s »)"
-
-#: mail/mail-ops.c:1946
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Erreur lors de l'enregistrement des messages vers : %s :\n"
-" %s"
-
-#: mail/mail-ops.c:2020
-#, fuzzy
-msgid "Saving attachment"
-msgstr "Enregistrer la pièce-jointe"
-
-#: mail/mail-ops.c:2035
-#, fuzzy, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Ne peut créer le fichier de sortie : %s\n"
-" %s"
-
-#: mail/mail-ops.c:2063
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Ne peut écrire les données : %s"
-
-#: mail/mail-search-dialogue.c:107
-#, fuzzy
-msgid "_Search"
-msgstr "Rechercher"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:218
-#, fuzzy
-msgid "Send & Receive mail"
-msgstr "Réception des messages"
-
-#: mail/mail-send-recv.c:221
-#, fuzzy
-msgid "Receiving"
-msgstr "Réception des messages"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr ""
-
-#: mail/mail-send-recv.c:288
-#, fuzzy
-msgid "Sending"
-msgstr "Expédition de « %s »"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Annulé."
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Complété."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
-msgid "Incomplete message written on pipe!"
-msgstr "Message incomplé écrit dans le conduit !"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Erreur durant le préparation vers %s :\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Erreur durant « %s » :\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Erreur de lecture des commandes de l'enfilade envoyé."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Message corrompu de l'enfilade envoyée ?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Ne peut créer la boîte de dialogue"
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "L'utilisateur a annulé la requête"
-
-#: mail/mail-tools.c:198
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Ne peut créer de mbox temporaire « %s » : %s"
-
-#: mail/mail-tools.c:256
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (message suivi)"
-
-#: mail/mail-tools.c:266
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (pas de sujet)"
-
-#: mail/mail-tools.c:283
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Message suivi - %s"
-
-#: mail/mail-tools.c:285
-msgid "Forwarded message (no subject)"
-msgstr "Message suivi (pas de sujet)"
-
-#: mail/mail-tools.c:357
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir l'emplacement « %s » :\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "Dossiers virtuels"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Nouveau dossier virtuel"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Répondre"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Répond à l'expéditeur du message"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Répond à l'expéditeur et à tous les destinataires du message"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Fait suivre le message"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Imprime le message sélectionné"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Supprime le message"
-
-#: mail/message-list.c:608
-msgid "Unseen"
-msgstr "Non vu"
-
-#: mail/message-list.c:611
-msgid "Seen"
-msgstr "Vu"
-
-#: mail/message-list.c:614
-msgid "Answered"
-msgstr "Répondu"
-
-#: mail/message-list.c:617
-msgid "Multiple Unseen Messages"
-msgstr ""
-
-#: mail/message-list.c:620
-msgid "Multiple Messages"
-msgstr "Messages multiple"
-
-#: mail/message-list.c:938
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:950 mail/message-list.c:966
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et tous"
-
-#: mail/message-list.c:953 mail/message-list.c:969
-msgid "<unknown>"
-msgstr "<inconnu>"
-
-#: mail/message-list.c:1021
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1028
-msgid "Today %l:%M %p"
-msgstr "Aujourd'hui %l:%M %p"
-
-#: mail/message-list.c:1037
-msgid "Yesterday %l:%M %p"
-msgstr "Hier %l:%M %p"
-
-#: mail/message-list.c:1049
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1057
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1059
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1157
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1158
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1158
-msgid "Date"
-msgstr "Date"
-
-#: mail/message-list.c:1158
-msgid "Received"
-msgstr "Réçu"
-
-#: mail/message-list.c:1159
-msgid "To"
-msgstr "À"
-
-#: mail/message-list.c:1159
-msgid "Size"
-msgstr "Taille"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Veuillez saisir votre %s phrase de passe pour %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Veuillez saisir votre %s phrase de passe"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Aucun programme GPG/PGP disponible."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Aucun mot de passe fournit."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Ne peut créer le tube vers GPG/PGP : %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Aucun destinataires spécifiés"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Ne peut créer de fichier temporaire : %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Dossier"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Score"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Afficher les dossiers commençant avec :"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Abonnement au dossier « %s »"
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Désabonnement au dossier « %s »"
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "S'abonne au dossier « %s »"
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Se désabonne du dossier « %s »"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
-msgid "Folder name:"
-msgstr "Nom du fichier : "
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder type:"
-msgstr "Type de fichier :"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "Pas suffisemment d'espace pour créer le dossier"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:307
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "Il n'y a pas de nouveaux messages sur %s."
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importation"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Erreur de chargement %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automatique"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Nom du fichier :"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Sélectionner un fichier"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Type de fichier :"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
-msgid "Import"
-msgstr "Importer"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-
-#: shell/importer/import.glade.h:2
-#, fuzzy
-msgid "Evolution Import Utility"
-msgstr "Conduit 'À faire' d'Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr ""
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Installation d'Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
-"supplémentaires dans votre répertoire personnel d'Evolution."
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Veuillez cliquez sur « Valider » pour installer les fichiers, ou « Annuler » "
-"pour quitter."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Ne peut mettre à jour les fichiers correctement"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Les fichiers d'Evolution sont correctement installés."
-
-#: shell/e-setup.c:189
-#, fuzzy
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Il semble que c'est la première fois que vous utilisez Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Cliquez sur « Valider » pour installer les fichiers utilisateur d'Evolution "
-"sous"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Ne peut créer le répertoire\n"
-"%s\n"
-"Erreur : %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Ne peut copier les fichiers dans\n"
-"« %s »."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Le fichier « %s » n'est pas un répertoire.\n"
-"Déplacez le afin de permettre l'installation\n"
-"des fichiers utilisateur d'Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Le répertoire « %s » existe mais n'est pas le répertoire\n"
-"d'Evolution. Déplacez le afin de permettre\n"
-"l'installation des fichiers utilisateur d'Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Ne peut créer le dossier spécifié :\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Le nom de dossier spécifié n'est pas valide."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Créez un nouveau dossier"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Le type du dossier sélectionné n'est pas valide pour\n"
-"l'opération demandée."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nouveau..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sans titre)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy n'a pas été trouvé dans votre $PATH."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy ne peut être exécuté."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution est une suite d'applications de travail collaboratif\n"
-"pour la messagerie, l'agenda, et la gestion de contacts\n"
-"à l'intérieur de l'environnement de bureau Gnome."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Aller au dossier..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Aucun dossier affiché)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Dossiers"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne peut activer l'entrepôt local -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ouups !  La vue pour « %s » est morte de manière inattendue.  :-(\n"
-"Cela signifie probablement que le composant %s a planté."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Créer un nouveau groupe de raccourcis"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nom du groupe :"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Voulez-vous vraiment enlever le groupe\n"
-"« %s » de la barre de raccourcis ?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Ne pas enlever"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Petites icones"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Affiche les raccourcis sous forme de petites icones"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Grandes icones"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Affiche les raccourcis sous forme de grandes icones"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nouveau groupe..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Créer un nouveau groupe de raccourcis"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Supprimer ce groupe..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Supprime ce groupe de raccourcis"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Afficher la barre de _raccourcis"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Afficher la barre de _raccourcis"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activer"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Active ce raccourci"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Supprime ce raccourci de la barre de raccourcis"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Erreur d'enregistrement des raccourcis."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Vue"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Voir le sélecteur de dossier"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Pas de nom)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Pas d'erreur"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Erreur générique"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Un dossier avec le même nom existe"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Le type de dossier spécifié n'est pas valide"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "Erreur d'E/S"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Pas suffisemment d'espace pour créer le dossier"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Le dossier spécifié n'a pas été trouvé"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "La fonction n'est pas implémenté dans cet entrepot"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Permission refusée"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Opération non supportée"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Le type spécifié n'est pas supporté dans cet entrepot"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Ne peut initialiser le shell Evolution."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Bonjour.\n"
-"Merci d'avoir pris le temps de télécharger cette version d'aperçu\n"
-"de la suite de travail collaboratif Evolution.\n"
-"\n"
-"Depuis la dernière version, notre effort a été de rendre Evolution\n"
-"utilisable.  Beaucoup des programmeurs d'Evolution l'utilise pour\n"
-"lire leurs messages. Vous aussi vous pouvez. (Par précaution,\n"
-"faites une sauvegarde.)\n"
-"\n"
-"Mais tant que nous n'aurons pas fixé toutes les anomalies affectant\n"
-"la stabilité et la sécurité, vous aurez cet avertissement :\n"
-"Evolution peut planter, perdre vos courriers quand vous ne le souhaitez\n"
-"pas, refuser de supprimer vos courriers lorsque vous le souhaitez,\n"
-"laisser des processus égarés en exécution, consommer 100% du CPU,\n"
-"se geler, se verrouiller, envoyer des message HTML à diverses\n"
-"listes de diffusions, et vous embarrasser vis à vis de vos amis et\n"
-"collègues de travail.\n"
-"Utilisez la en connaissance de cause.\n"
-"\n"
-"Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
-"et nous attendons avec impatience vos contributions !\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Merci\n"
-"L'équipe d'Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Ne peut initialiser le shell Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Désactiver."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Ne peut initialiser le composant Bonobo"
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Créer un nouveau contact"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Supprimer le contact"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rechercher"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rechercher un contact"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nouveau contact"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Imprimer les contacts"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Arrêter"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Arrête le chargement"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Tout voir"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Configuration du carnet d'_adresses..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Imprimer les contacts..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Rechercher des contacts"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Outils"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 jours"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modifier les préférences"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ca_lendrier"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Préférences du calendrier..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Crée un nouveau rendez-vous"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Crée un nouveau calendrier"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Jour"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Recule dans le temps"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Avance dans le temps"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Aller à"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Va à une date précise"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Va à la date actuelle"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mois"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nouveau rendez-vous"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Suivant"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Ouvrir un calendrier"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Préc"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Imprimer ce calendrier"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Enregistrer sous"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Enregistrer le calendrier comme quelquechose d'autre"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Affiche une journée"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Affiche un mois"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Affiche une semaine"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Affiche une semaine de travail"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Semaine"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nouveau"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Ouvrir un calendrier"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Imprimer ce calendrier"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Enregistrer _sous..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Supprimer cet élément"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Supprimer..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Aide"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Imprimer une en_veloppe..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprime cet élément"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Enregistrer _sous..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Enregistrer et Quitter"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boîte de dialogue"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Voir l'aide en ligne"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Envoie un _message au contact..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Fichier"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Imprimer..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Enregistrer"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "À propos de cette application"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "À propos..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Actio_ns"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Vider"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_uper"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-#, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Vider"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Vide la sélection"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Ferme ce rendez-vous"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ier vers le dossier... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copier"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copie la sélection"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Couper"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Coupe la sélection"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-#, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-#, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-#, fuzzy
-msgid "Go to the next item"
-msgstr "Va à la date actuelle"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-#, fuzzy
-msgid "Go to the previous item"
-msgstr "Va à la date actuelle"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-#, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-#, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propriétés de la Liste 'À Faire'"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Suivant"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Coller"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Colle le contenu du presse-papiers"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Précédent"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Précédent"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-#, fuzzy
-msgid "Print Pre_view"
-msgstr "Aperçu Avant Impression"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Configuration de l'impr_ession..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configuration de l'impression"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propriétés"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Enregistrer"
-
-#: ui/evolution-event-editor.xml.h:43
-#, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boîte de dialogue"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-#, fuzzy
-msgid "Save the current file"
-msgstr "la date actuelle"
-
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "Sélectionnez un Dossier"
-
-#: ui/evolution-event-editor.xml.h:46
-#, fuzzy
-msgid "Schedule _Meeting"
-msgstr "Sélectionnez un Dossier"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Sélectionner tout"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-#, fuzzy
-msgid "Select everything"
-msgstr "Sélectionnez un Dossier"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-#, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "À _propos..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fermer"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copier"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Débog"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Édition"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Aide"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-#, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-#, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-#, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Message électronique (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-#, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Déplacer vers le dossier..."
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-#, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Coller"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimer"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propriétés..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Sélectionner tout"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-#, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Ajouter un service"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:3
-#, fuzzy
-msgid "Create a new email"
-msgstr "Crée une nouveau contact"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nouveau courrier"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Composer"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Compose un nouveau message"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copie le message vers un nouveau dossier"
-
-#: ui/evolution-mail.xml.h:5
-#, fuzzy
-msgid "Create Rule"
-msgstr "Crée \"%s\""
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "D_ossier"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrer sur l'expéditeur"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtrer sur les _destinataires"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Oublier les _mots de passe"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Récupérer"
-
-#: ui/evolution-mail.xml.h:16
-#, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "Imprime le message sélectionné"
-
-#: ui/evolution-mail.xml.h:17
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Supprimer le message"
-
-#: ui/evolution-mail.xml.h:18
-#, fuzzy
-msgid "Hide _Read messages"
-msgstr "Message suivi - %s"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtres de message..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Gérer les abonnements..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "_Marquer comme lus"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marquer comme _non lu"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Déplacer"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Déplace le message vers un nouveau dossier"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Visualise le message a imprimer"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Aperçu avant impression du message..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprime le message vers l'imprimante"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Imprimer le message..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Répondre à _tous"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Répondre à l'_expéditeur"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "S_ource"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Sélectionnez _tout"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envoie les messages en attente et récupère les nouveaux messages"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Afficher _tous les messages"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Liste des messages par enfilade"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Dossier virtuel sur l'e_xpéditeur"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "Dossier virtuel sur les de_stinataires"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Voir la source brut du message"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Appliquer les filtres"
-
-#: ui/evolution-mail.xml.h:47
-#, fuzzy
-msgid "_Configure Folder..."
-msgstr "_Copier vers le dossier..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copier vers le dossier..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Éditer le message"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Nettoyer"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrer sur le sujet"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Faire suivre"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverser la sélection"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Configuration de la _messagerie..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Message"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Déplacer vers le dossier..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Ouvrir dans une nouvelle fenêtre"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Imprimer le message"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Enregistrer le message sous..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Enfiler"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Récupérer"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Dossier Virtuel sur le sujet"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Éditeur de dossier _virtuel..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Joindre"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Ferme le fichier en cours"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Encrypter le message avec PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Insère un fichier comme texte dans le message"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Ensérer un fichier texte..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Ouvrir un fichier"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Encrypter avec PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Signer avec PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Enregistrer le _brouillon"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Enregistrer dans le dossier..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Enregistrer le fichier en cours avec un nom différent"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Enregistrer le message dans un dossier spécifié"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Envoyer"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Envoyer plus _tard"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Envoyer plus _tard"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Envoie le message au format HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Envoie le message plus tard"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Envoie le message maintenant"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Envoyer ce message maintenant"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Afficher / Cacher les pièces-jointes"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Afficher les _pièces-jointes"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Afficher les pièces-jointes"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Signer ce message avec votre clé PGP"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insérer un fichier texte... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Ouvrir..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sécurité"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ajouter le dossier à votre liste de dossier abonnés"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Rafraîchir la liste"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Rafraîchi la liste de dossiers"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Supprimer le dossier de votre liste de dossier abonnés"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Se désabonner"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tâche (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refaire"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Remplace une chaîne"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-#, fuzzy
-msgid "Reply to A_ll (FIXME)"
-msgstr "Répondre à tous"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-#, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-#, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boîte de dialogue"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-#, fuzzy
-msgid "Search again for the same string"
-msgstr "_Rechercher des contacts"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-#, fuzzy
-msgid "Search for a string"
-msgstr "_Rechercher des contacts"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Défaire"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-#, fuzzy
-msgid "Undo the last action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Rendez-vous (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-#, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "Marquer comme terminée"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Répondre (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Crée une nouvelle tache"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nouveau"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Enregistrer la tache comme quelquechose d'autre"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Préférences des taches..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "À propos d'Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Ferme cette fenetre"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Personnaliser..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personnaliser"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personnaliser la barre d'outils"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Afficher un dossier différent"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Quitter"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barre de _raccourcis d'Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Quitter"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Quitte le programme"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Prêt à _démarrer"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importer un format de fichier externe"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barre d'outils principale"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Afficher les informations concernant Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Afficher la barre de _dossiers"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Afficher la barre de raccourci_s"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Transmettre un rapport d'anomalies"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "_Transmettre un rapport d'anomalies"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Commute l'affichage de la barre de dossiers"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Commute l'affichage de la barre de raccourcis"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Utilisation du gestionnaire de c_ontact"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Utilisation du _calendrier"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Utilisation de la _messagerie"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "À _propos d'Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Dossier"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Aller au dossier..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importer un fichier..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:37
-#, fuzzy
-msgid "_Mail message"
-msgstr "_Message électronique (FIXME)"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Réglages"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Occupé"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Hors du bureau"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Pas d'information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Inviter d'autres personnes..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Options"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Afficher _seulement les heures de travail"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Afficher _Zommé arrière"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Mettre à jour Libre/Occupé"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Choix automatique"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Toutes les personnes et ressources"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Toute les _personnes et une ressource"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personnes _nécessaires"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personnes nécessaires et _une ressource"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Heure de _début de la réunion :"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Heure de _fin de la réunion :"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tout les invités"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Maintenant"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Avertissement"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Question"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Message"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Ne plus afficher ce message."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "Recher_cher"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr ""
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-
-#: wombat/wombat.c:182
-#, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Ne peut initialiser GNOME"
-
-#: wombat/wombat.c:194
-#, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
-
-#: wombat/wombat.c:207
-#, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Ne peut initialiser Bonobo"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "La suite de travail collaboratif Evolution"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Mme.\n"
-#~ "Mlle\n"
-#~ "Dr.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "La stockage local n'a pas de répertoire par défaut"
-
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Les dossiers locaux ne peuvent être encapsulés."
-
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Félicitations, votre configuration de messagerie est effectué.\n"
-
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#, fuzzy
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "Pour la lecture de courrier délivré par le système local, et pour le "
-#~ "stockage de courrier sur le disque local."
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
-#~ msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
-
-#, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Ne peut initialiser Bonobo"
-
-#~ msgid "Open..."
-#~ msgstr "Ouvrir..."
-
-#~ msgid "Open the task"
-#~ msgstr "Ouvrir la tâche"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Vous n'avez pas de boîte de sortie configuré"
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne peut ouvrir le fichier %s :\n"
-#~ "%s"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "Récupération du courrier depuis %s"
-
-#~ msgid "Fetch email from %s"
-#~ msgstr "Récupère le courrier depuis %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Filtrage d'e-mail à la demande"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Filtre d'e-mail à la demande"
-
-#~ msgid "Sending queue"
-#~ msgstr "Expédition de la queue"
-
-#~ msgid "Send queue"
-#~ msgstr "Expédie la queue"
-
-#~ msgid "Examining %s"
-#~ msgstr "Examine %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Ne peut lire le fichier de cache UID \"%s\". Vous pouvez recevoir des "
-#~ "messages dupliqués."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Récupération du message %d sur %d"
-
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Écriture du message %d du %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Enregistrement des changements vers %s"
-
-#, fuzzy
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Nouveau rendez-vous..."
-
-#, fuzzy
-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "Éditer le message"
-
-#, fuzzy
-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "Entrée de journal - %s"
-
-#, fuzzy
-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "Enregistrer la pièce-jointe"
-
-#, fuzzy
-#~ msgid "FIXME: _Move to Folder..."
-#~ msgstr "_Aller au dossier"
-
-#, fuzzy
-#~ msgid "FIXME: Cop_y to Folder..."
-#~ msgstr "Copier vers le dossier"
-
-#, fuzzy
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "Aperçu Avant Impression"
-
-#, fuzzy
-#~ msgid "FIXME: Paste _Special..."
-#~ msgstr "_Filtres de message..."
-
-#, fuzzy
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Marquer comme non lu"
-
-#~ msgid "_Object"
-#~ msgstr "_Sujet"
-
-#, fuzzy
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "Faire suivre"
-
-#~ msgid "_Toolbars"
-#~ msgstr "Barres d'_outils"
-
-#, fuzzy
-#~ msgid "FIXME: _File..."
-#~ msgstr "_Filtres de message..."
-
-#, fuzzy
-#~ msgid "FIXME: _Font..."
-#~ msgstr "Police..."
-
-#~ msgid "_Forms"
-#~ msgstr "_Formulaires"
-
-#, fuzzy
-#~ msgid "FIXME: _New Contact"
-#~ msgstr "_Nouveau rendez-vous..."
-
-#, fuzzy
-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "_Filtres de message..."
-
-#, fuzzy
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "Entrée de journal - %s"
-
-#, fuzzy
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "Copier vers le dossier"
-
-#, fuzzy
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "Éditer le message"
-
-#, fuzzy
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "Éditer le message"
-
-#, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "Faire suivre"
-
-#, fuzzy
-#~ msgid "FIXME: For_ward"
-#~ msgstr "Faire suivre"
-
-#~ msgid "_Insert"
-#~ msgstr "_Insertion"
-
-#, fuzzy
-#~ msgid "FIXME: Previous"
-#~ msgstr "Préc"
-
-#, fuzzy
-#~ msgid "FIXME: Next"
-#~ msgstr "_Filtres de message..."
-
-#~ msgid "Group %i"
-#~ msgstr "Groupe %i"
-
-#~ msgid "<b>Error loading calendar:<br>Calendar in use."
-#~ msgstr ""
-#~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
-
-#~ msgid "C_lassification:"
-#~ msgstr "C_lassification :"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
-
-#, fuzzy
-#~ msgid "Could not create a tasks file in `%s'"
-#~ msgstr "Ne peut créer un calendrier dans « %s »"
-
-#~ msgid "Days"
-#~ msgstr "Jours"
-
-#~ msgid "Hours"
-#~ msgstr "Heures"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Cou_rrier à :"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutes"
-
-#~ msgid "Time"
-#~ msgstr "Horaire"
-
-#~ msgid "_Audio"
-#~ msgstr "_Audio"
-
-#~ msgid "_Contacts"
-#~ msgstr "_Contacts"
-
-#~ msgid "_Display"
-#~ msgstr "_Affichage"
-
-#~ msgid "_Mail"
-#~ msgstr "_Courrier"
-
-#~ msgid "_Program"
-#~ msgstr "_Programme"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "Server disconnected."
-#~ msgstr "Serveur déconnecté."
-
-#~ msgid "Show all hidden"
-#~ msgstr "Afficher tous les cachés"
-
-#~ msgid "Hide selected"
-#~ msgstr "Cacher sélectionné"
-
-#~ msgid "Hide deleted"
-#~ msgstr "Cacher supprimé"
-
-#~ msgid "Hide Subject"
-#~ msgstr "Cacher Sujet"
-
-#~ msgid "Hide from Sender"
-#~ msgstr "Cacher de l'expéditeur"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Cacher le sujet \"%s\""
-
-#~ msgid "Hide from Sender <%s>"
-#~ msgstr "Cacher depuis l'expéditeur <%s>"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Vous n'avez pas de source de courrier configuré"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Répondre-à :"
-
-#~ msgid " for "
-#~ msgstr " pour "
-
-#~ msgid "Open a calendar"
-#~ msgstr "Ouvre un calendrier"
-
-#, fuzzy
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Récurrence"
-
-#~ msgid "_Find..."
-#~ msgstr "_Rechercher..."
-
-#, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "Radio"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Remplacer..."
-
-#~ msgid "_Source"
-#~ msgstr "_Source"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Entrez votre nom et adresse e-mail à utiliser dans les messages sortant. "
-#~ "Vous pouvez aussi, optionellement, entrez le nom de votre organisation, et "
-#~ "le nom du fichier dans lequel lire votre signature."
-
-#~ msgid "Full name:"
-#~ msgstr "Nom complet :"
-
-#~ msgid "Email address:"
-#~ msgstr "Adresse électronique :"
-
-#~ msgid "Signature File"
-#~ msgstr "Fichier de signature"
-
-#~ msgid "Server:"
-#~ msgstr "Serveur :"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Détecter les types supportés..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ne pas effacer les messages du serveur"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Type de source de courrier :"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Sélectionner le type de serveur de messagerie que vous avez, et entrez les "
-#~ "informations correspondantes.\n"
-#~ "\n"
-#~ "Si le serveur nécessite une identification, vous pouvez cliquez sur le "
-#~ "bouton \"Détecter les types supportés...\" aprés avoir entré les autres "
-#~ "informations."
-
-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Sélectionnez le type de serveur de forums de discussions que vous avez, et "
-#~ "entrez les informations correspondantes.\n"
-#~ "\n"
-#~ "Si le serveur nécessite une identification, vous pouvez cliquez sur le "
-#~ "bouton \"Détecter les types supportés...\" aprés avoir entré les autres "
-#~ "informations."
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Type de transport de courrier :"
-
-#~ msgid "Add Identity"
-#~ msgstr "Ajouter une identité"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Éditer l'identité"
-
-#~ msgid "Edit Source"
-#~ msgstr "Éditer source"
-
-#~ msgid "Add News Server"
-#~ msgstr "Ajouter un serveur de news"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Éditer le serveur de news"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Test de \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "La connexion est concluante !"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Interroge les capacités d'autorisation de \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Interroge l'autorisation à \"%s\""
-
-#~ msgid "Identities"
-#~ msgstr "Identités"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Sources de messages"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Transport de courrier"
-
-#~ msgid "News Servers"
-#~ msgstr "Serveur de forums"
-
-#~ msgid "News Sources"
-#~ msgstr "Sources de forums"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envoie les messages au format HTML"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Élement(s) appartenant à ces catégories : "
-
-#~ msgid "Available Categories:"
-#~ msgstr "Catégories disponibles : "
-
-#~ msgid "External Directories"
-#~ msgstr "Annuaires externes"
-
-#~ msgid "Port Number:"
-#~ msgstr "Numéro de port :"
-
-#~ msgid "Outline:"
-#~ msgstr "Bordure :"
-
-#~ msgid "Headings:"
-#~ msgstr "En-têtes :"
-
-#~ msgid "Empty days:"
-#~ msgstr "Jours vides :"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Jour mis en évidence :"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Numéros de jour :"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Numéro du jour en cours :"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Élément 'À faire' qui n'est pas encore terminé :"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Élément 'À faire' qui finit aujourd'hui :"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Élément 'À faire' en retard : "
-
-#~ msgid "appointment"
-#~ msgstr "rendez-vous"
-
-#~ msgid "task"
-#~ msgstr "tâche"
-
-#~ msgid "journal entry"
-#~ msgstr "entrée de journal"
-
-#~ msgid "Year:"
-#~ msgstr "Année :"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Sélectionnez la date à laquelle vous voulez\n"
-#~ "aller. Quand vous cliquez sur un jour, vous\n"
-#~ "y serez automatiquement amené."
-
-#~ msgid "Deleted"
-#~ msgstr "Supprimé"
-
-#~ msgid "Mail Source"
-#~ msgstr "Source de courrier"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "Expédition d'un message sans sujet"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envoie un message sans sujet"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Nettoie \"%s\""
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Marquage des messages du dossier \"%s\""
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Marque les messages du dossier \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Marque le message %d du %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Scrute les dossiers dans \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Joints les messages du dossier \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Joindre les messages de \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Fait suivre les messages \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Fait suivre un message sans sujet"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Faire suivre le message \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Faire suivre un message sans sujet"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Échec de génération de la partie MIME du message lors de la génération du "
-#~ "message suivi."
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Chargement de \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Charge \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Création de \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr ""
-#~ "Exception lors du retour du résultat vers le composant shell écouteur."
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synchronise \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Affichage du message UID \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "Nettoie l'affichage des messages"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Affiche le message UID \"%s\""
-
-#~ msgid "Clear message display"
-#~ msgstr "Nettoyer l'affichage des messages"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Ouverture des messages du dossier \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Ouvre les messages de \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Visualisation des messages du dossier \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Visualise les messages du dossier \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Récupération du message %d sur %d (uid \"%s\")"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Joints les messages du dossier \"%s\""
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Ouverture des messages du dossier \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Reconstruction de la vue de messages"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Reconstruit la vue de messages"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ouveau serveur d'annuaire"
-
-#~ msgid "_Actions"
-#~ msgstr "_Actions"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "Enregistrer le calendrier _sous"
-
-#, fuzzy
-#~ msgid "_Mail Configuration"
-#~ msgstr "Configuration de la messagerie"
-
-#~ msgid "may"
-#~ msgstr "mai"
-
-#~ msgid "sept"
-#~ msgstr "sept"
-
-#~ msgid "sunday"
-#~ msgstr "dimanche"
-
-#~ msgid "monday"
-#~ msgstr "lundi"
-
-#~ msgid "tuesday"
-#~ msgstr "mardi"
-
-#~ msgid "tues"
-#~ msgstr "mar"
-
-#~ msgid "wednesday"
-#~ msgstr "mercredi"
-
-#~ msgid "wednes"
-#~ msgstr "mer"
-
-#~ msgid "thursday"
-#~ msgstr "jeudi"
-
-#~ msgid "thur"
-#~ msgstr "jeu"
-
-#~ msgid "thurs"
-#~ msgstr "jeud"
-
-#~ msgid "friday"
-#~ msgstr "vendredi"
-
-#~ msgid "saturday"
-#~ msgstr "samedi"
-
-#~ msgid "fortnight"
-#~ msgstr "quinzaine"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sec"
-
-#~ msgid "tomorrow"
-#~ msgstr "demain"
-
-#~ msgid "yesterday"
-#~ msgstr "hier"
-
-#~ msgid "today"
-#~ msgstr "aujourd'hui"
-
-#~ msgid "last"
-#~ msgstr "dernier"
-
-#~ msgid "this"
-#~ msgstr "ce"
-
-#~ msgid "next"
-#~ msgstr "suivant"
-
-#~ msgid "first"
-#~ msgstr "premier"
-
-#~ msgid "third"
-#~ msgstr "troisième"
-
-#~ msgid "fourth"
-#~ msgstr "quatrième"
-
-#~ msgid "fifth"
-#~ msgstr "cinquième"
-
-#~ msgid "sixth"
-#~ msgstr "sixième"
-
-#~ msgid "seventh"
-#~ msgstr "septième"
-
-#~ msgid "eighth"
-#~ msgstr "huitième"
-
-#~ msgid "ninth"
-#~ msgstr "neuvième"
-
-#~ msgid "tenth"
-#~ msgstr "dixième"
-
-#~ msgid "eleventh"
-#~ msgstr "onzième"
-
-#~ msgid "twelfth"
-#~ msgstr "douzième"
-
-#~ msgid "ago"
-#~ msgstr "passé"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-#~ msgid "window2"
-#~ msgstr "fenêtre2"
-
-#~ msgid "_Summary:"
-#~ msgstr "Rés_umé : "
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days\n"
-#~ msgstr ""
-#~ "Minutes\n"
-#~ "Heures\n"
-#~ "Jours\n"
-
-#~ msgid "Daily"
-#~ msgstr "Journalière"
-
-#~ msgid "Weekly"
-#~ msgstr "Hebdomadaire"
-
-#~ msgid "Monthly"
-#~ msgstr "Mensuelle"
-
-#~ msgid "Yearly"
-#~ msgstr "Annuelle"
-
-#~ msgid "label23"
-#~ msgstr "label23"
-
-#~ msgid "Every "
-#~ msgstr "Tou(te)s les "
-
-#~ msgid "label24"
-#~ msgstr "label24"
-
-#~ msgid "Recur on the"
-#~ msgstr "Récurrence le"
-
-#~ msgid "th day of the month"
-#~ msgstr "ème jour du mois"
-
-#~ msgid ""
-#~ "1st\n"
-#~ "2nd\n"
-#~ "3rd\n"
-#~ "4th\n"
-#~ "5th\n"
-#~ msgstr ""
-#~ "1er\n"
-#~ "2ème\n"
-#~ "3ème\n"
-#~ "4ème\n"
-#~ "5ème\n"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday\n"
-#~ msgstr ""
-#~ "Lundi\n"
-#~ "Mardi\n"
-#~ "Mercredi\n"
-#~ "Jeudi\n"
-#~ "Vendredi\n"
-#~ "Samedi\n"
-#~ "Dimanche\n"
-
-#~ msgid "label27"
-#~ msgstr "label27"
-
-#~ msgid "Ending date"
-#~ msgstr "Date de fin"
-
-#~ msgid "End on "
-#~ msgstr "Fin le "
-
-#~ msgid "Change"
-#~ msgstr "Changer"
-
-#~ msgid "Create to-do item"
-#~ msgstr "Créer un élément 'à faire'"
-
-#~ msgid "Edit to-do item"
-#~ msgstr "Éditer l'élément 'à faire'"
-
-#~ msgid "Due Date:"
-#~ msgstr "Date d'échéance : "
-
-#~ msgid "Time display"
-#~ msgstr "Affichage de l'heure"
-
-#~ msgid "Time format"
-#~ msgstr "Format de l'heure"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 heures (AM/PM)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 heures"
-
-#~ msgid "Weeks start on"
-#~ msgstr "Les semaines débutent un"
-
-#~ msgid "Day range"
-#~ msgstr "Horaires de travail"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Sélectionnez les heures de début et de fin que\n"
-#~ "vous voulez afficher dans la vue par jour et par\n"
-#~ "semaine. Les heures en dehors de cet intervalle\n"
-#~ "ne seront pas affichées par défaut."
-
-#~ msgid "Day start:"
-#~ msgstr "Heure de début : "
-
-#~ msgid "Day end:"
-#~ msgstr "Heure de fin : "
-
-#~ msgid "Colors for display"
-#~ msgstr "Couleurs pour l'affichage"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Afficher dans la liste 'À Faire' : "
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Options de style de la liste 'À Faire' : "
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Mettre en evidence les éléments en retard"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Mettre en évidence les éléments non encore achevé"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "Mettre en évidence les éléments s'achevant aujourd'hui"
-
-#~ msgid "To Do List"
-#~ msgstr "Liste 'À Faire'"
-
-#~ msgid "Preferences"
-#~ msgstr "Préférences"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Biper lors de l'affichage des alarmes"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Expiration des alarmes audios après"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Activer la sonnerie pour"
-
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "Ne peut se connecter au serveur IMAP sur %s."
-
-#~ msgid "Could not create summary"
-#~ msgstr "Ne peut créer le résumé"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Ne peut obtenir le message : %s"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Ne peut renommer le dossier %s vers %s : la destination existe"
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Ne peut ouvrir le résumé %s"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Le résumé ne correspond pas, en-tête X-Evolution manquant"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Impossible de copier les données dans le fichier de sortie : %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Impossible de charger ou créer le résumé"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Impossible de renommer le dossier « %s » : %s existe"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "Les dossiers MH ne peuvent être encapsulés."
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Ne peut initialiser le hachage du stockage de courrier d'Evolution."
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Mauvaise URL de stockage (aucun serveur) : %s"
-
-#~ msgid "Full Search"
-#~ msgstr "Rechercher complète"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Bienvenue sur l'assistant de configuration de messagerie d'Evolution !\n"
-#~ "En y remplissant les informations concernant les paramètres de votre\n"
-#~ "messagerie, vous pourrez commencer à envoyer et recevoir des mails.\n"
-#~ "Cliquez sur \"Suivant\" pour continuer."
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Ne peut créer le tube vers %s : %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Ne peut exécuter %s : %s\n"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX non lu)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Ne connait pas le protocole pour ouvrir l'URI « %s »"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Ouvrir dans une nouvelle fenêtre"
-
-#~ msgid "Forward Message"
-#~ msgstr "Faire suivre le message"
-
-#~ msgid "Copy Message"
-#~ msgstr "Copier le message"
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nouveau Ca_lendrier"
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Créer un nouveau dossier..."
-
-#~ msgid "_Unselect All"
-#~ msgstr "_Déselectionner tout"
diff --git a/po/ga.po b/po/ga.po
deleted file mode 100755
index c63667fcf6..0000000000
--- a/po/ga.po
+++ /dev/null
@@ -1,5230 +0,0 @@
-# Irish language translation of evolution
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Alastair McKinstry, <mckinstry@computer.org>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
-"Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
-"Language-Team: Irish <ga@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Post an sceál seo"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Post"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Fillteán _Nua"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Fillteán _Nua"
-
-#: executive-summary/component/e-summary.c:919
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:933
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "New"
-msgstr "_Nua"
-
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr ""
-
-#: notes/component-factory.c:152
-msgid "Cannot initialize Evolution's notes component."
-msgstr ""
-
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-#, fuzzy
-msgid "_Delete"
-msgstr "Scríos"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-#, fuzzy
-msgid "_Home"
-msgstr "_Nota"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-#, fuzzy
-msgid "_Company:"
-msgstr "Greamaigh"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-#, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#, fuzzy
-msgid "Company"
-msgstr "Greamaigh"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-#, fuzzy
-msgid "Primary"
-msgstr "Tosaíocht"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Fillteán"
-
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-msgid "Host:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Tosaíocht"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr ""
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "Post"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Fillteán"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Manager"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "_Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-#, fuzzy
-msgid "Snooze"
-msgstr "Méid"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-#, fuzzy
-msgid "Private"
-msgstr "Priontáil"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "_Coinne"
-
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr ""
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "_Coinne"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Tosaíocht"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "Post"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:397
-#, fuzzy
-msgid "Open..."
-msgstr "_Oscáil"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Scríos"
-
-#: calendar/gui/e-calendar-table.c:404
-#, fuzzy
-msgid "Delete the task"
-msgstr "Scríos an sceal seo"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-#, fuzzy
-msgid "New appointment..."
-msgstr "_Coinne"
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "Scríos an sceal seo"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-#, fuzzy
-msgid "Delete this occurrence"
-msgstr "Scríos an sceal seo"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:285
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "_Coinne"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:441
-#, fuzzy
-msgid "Sunday"
-msgstr "Post"
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr ""
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Fr"
-msgstr "Ó:"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr ""
-
-#: calendar/gui/print.c:941
-#, fuzzy
-msgid "Tasks"
-msgstr "_Teacs"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr ""
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr ""
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "Post an sceál seo"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#, fuzzy
-msgid "Sendmail"
-msgstr "Post"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytanna"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Scríos"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-#, fuzzy
-msgid "From:"
-msgstr "Ó:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Do:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Abair:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr ""
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr ""
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Post an sceál seo"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr ""
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr ""
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr ""
-
-#: composer/e-msg-composer.c:1362
-#, fuzzy
-msgid "Compose a message"
-msgstr "Post an sceál seo"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr ""
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "Post"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr ""
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr ""
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr ""
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr ""
-
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "Scríos"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-#, fuzzy
-msgid "Select Folder"
-msgstr "Fillteán _Nua"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Scríos"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Fillteán _Nua"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Post"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Abair"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr ""
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Fillteán _Nua"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-#, fuzzy
-msgid "Subject contains"
-msgstr "Abair"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Oscáil"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Priontáil"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Sheoladh Chuig duine"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Sheoladh Chuig duine"
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr ""
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr ""
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "Sábháil 'san _fillteán"
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:674
-#, fuzzy
-msgid "Undelete"
-msgstr "Scríos"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-#, fuzzy
-msgid "None"
-msgstr "_Nota"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Scríos"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-msgid "Evolution Account Editor"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Abair"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-#, fuzzy
-msgid "Print Message"
-msgstr "Post an sceál seo"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr ""
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr ""
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:626
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Freagrair"
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Post an sceál seo"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "Fillteán _Nua"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:327
-#, fuzzy
-msgid "Copying messages"
-msgstr "_Post sceál"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Post an sceál seo"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:953
-#, fuzzy
-msgid "Copying"
-msgstr "Greamaigh"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
-msgid "Forwarded messages"
-msgstr ""
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, c-format
-msgid "Opening folder %s"
-msgstr ""
-
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
-msgstr ""
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "_Post sceál"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "_Post sceál"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "_Post sceál"
-
-#: mail/mail-ops.c:1922
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr ""
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-#, fuzzy
-msgid "VFolders"
-msgstr "_Fillteán"
-
-#: mail/mail-vfolder.c:298
-#, fuzzy
-msgid "New VFolder"
-msgstr "Fillteán _Nua"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Freagrair"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr ""
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr ""
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr ""
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr ""
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "Scríos an sceal seo"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-#, fuzzy
-msgid "Seen"
-msgstr "Post"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr ""
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Attachment"
-msgstr ""
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "Ó:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Scríos"
-
-#: mail/message-list.c:1110
-msgid "Received"
-msgstr ""
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "Do:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Méid"
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr ""
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "_Fillteán"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr ""
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-#, fuzzy
-msgid "New..."
-msgstr "_Nua"
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:172
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-#, fuzzy
-msgid "Go to folder..."
-msgstr "Sábháil 'san _fillteán"
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-#, fuzzy
-msgid "Folders"
-msgstr "_Fillteán"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "_View"
-msgstr "_Nua"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr ""
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Coinne"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:10
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_Post sceál"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Priontáil"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:72
-#, fuzzy
-msgid "_Object"
-msgstr "Abair"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "Sheoladh Chuig duine"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:104
-#, fuzzy
-msgid "_Toolbars"
-msgstr "_Uirlisí"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:137
-#, fuzzy
-msgid "_Forms"
-msgstr "_Fillteán"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Coinne"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "_Post sceál"
-
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "_Post sceál"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_Post sceál"
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "Sheoladh Chuig duine"
-
-#: ui/evolution-contact-editor.xml:157
-#, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Sheoladh Chuig duine"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Uirlisí"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-#, fuzzy
-msgid "_Options"
-msgstr "_Oscáil"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Fillteán _Nua"
-
-#, fuzzy
-#~ msgid "o"
-#~ msgstr "Do"
-
-#, fuzzy
-#~ msgid "Format"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Tosaíocht"
-
-#, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Do:"
-
-#, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "_Coinne"
-
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Teacs"
-
-#, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Teacs"
-
-#, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Tosaíocht"
-
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "_Coinne"
-
-#, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Priontáil"
-
-#, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Abair"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Abair"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "_Nota"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "_Nua"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_Oscáil"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Freagrair"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Post"
-
-#~ msgid "_New"
-#~ msgstr "_Nua"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Sábháil 'san _fillteán"
-
-#, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "Scríos an sceal seo"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Priontáil"
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Sábháil 'san _fillteán"
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Priontáil"
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Gearr"
-
-#~ msgid "Copy"
-#~ msgstr "Greamaigh"
-
-#~ msgid "Cut"
-#~ msgstr "Gearr"
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Freagrair"
-
-#~ msgid "Undo"
-#~ msgstr "Leasú"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Greamaigh"
-
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Priontáil"
-
-#, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Leasú"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Scríos an sceal seo"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Scríos an sceal seo"
-
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Sábháil 'san _fillteán"
-
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Sábháil 'san _fillteán"
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Sábháil 'san _fillteán"
-
-#~ msgid "Send"
-#~ msgstr "Post"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Oscáil"
-
-#, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution"
-
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Coinne"
-
-#~ msgid "_Folder"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "_Coinne"
-
-#, fuzzy
-#~ msgid "ninth"
-#~ msgstr "Priontáil"
-
-#, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Post"
-
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "_Post sceál"
-
-#~ msgid "Clos_e All Items"
-#~ msgstr "_Dún gach rud"
diff --git a/po/gl.po b/po/gl.po
deleted file mode 100644
index 0f0b916bc1..0000000000
--- a/po/gl.po
+++ /dev/null
@@ -1,6856 +0,0 @@
-# Galician translation of Evolution.
-# Copyright (C) 2000 Jesús Bravo Álvarez.
-# Jesús Bravo Álvarez <jba@pobox.com>, 2000.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en http://trasno.gpul.org
-#
-# First Version: 2000-04-07 22:14+0200
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-08-26 00:59+0200\n"
-"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
-"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Non se pode inicializar o compoñente de correo de Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Non foi posible inicializar Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Re-enviar esta mensaxe"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Recibindo correo de %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Pechar"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mover para a Carpeta"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Ir ó elemento anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ir ó elemento seguinte"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configurar Carpeta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Sen erro"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "Non foi posible conectarse ó servidor POP en %s."
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Novo"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Crear un novo contacto"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Non se pode inicializar o compoñente de correo de Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Non foi posible inicializar Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nome: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefixo:    "
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufixo:     "
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data de Nacemento: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Enderezo:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Apdo. de Correos: "
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Rúa:         "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cidade:      "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Rexión:      "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Código Postal: "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  País:        "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Teléfonos:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Teléfono:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"Correo Electrónico:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"Correo Electrónico:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zona Horaria: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nome:  "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categorías: "
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Comentario: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Clave Pública: "
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar do Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar ó Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mesturar do Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mesturar ó Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor Orixinal:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conducto de Libro de Enderezos de Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-"Utilidade de configuración para o conducto de libro de enderezos de "
-"evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sincronizar Acción"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado do conducto"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Non hai ningún pilot configurado, escolla\n"
-"primeiro a capplet 'Propiedades da Ligazón co Pilot'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Non conectado ó demo gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ocorreu un erro ó obter a lista de\n"
-"pilots do demo gnome-pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Non foi posible cargar o cursor\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook non cargado\n"
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "Non foi posible iniciar o servidor wombat"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "Non foi posible iniciar wombat"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Engadir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Borrar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de Teléfono"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de teléfono"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Engadir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Editor de Contactos"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _Completo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Arquivar Como:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Enderezo da páxina Web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Quere recibir correo _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Traballo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Particular"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax do Traballo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Móbil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Correo Electrónico Principal"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "T_raballo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Este é o enderezo da lista de correo"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Posto:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Compañía:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Enderezo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Xeral"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departamento:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Oficina:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Profesión:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_Cónxuxe:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Cu_mpreanos:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Nome do _Asistente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tas:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detalles"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Traballo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Traballo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Fax do Traballo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Automóbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Compañía"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Fax Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Móbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Outro Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Localizador (Pager)"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"D.\n"
-"Dª.\n"
-"Dr.\n"
-"Dra.\n"
-"Prof.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Nome:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Outros nomes:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Apelidos:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Sufixo:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Como unha _Táboa"
-
-#: addressbook/gui/component/addressbook.c:374
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Introduza o contrasinal NNTP para %s@%s"
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-#, fuzzy
-msgid "Show All"
-msgstr "Ver Todos"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:562
-#, fuzzy
-msgid "Any field contains"
-msgstr "O corpo contén"
-
-#: addressbook/gui/component/addressbook.c:563
-#, fuzzy
-msgid "Name contains"
-msgstr "contén"
-
-#: addressbook/gui/component/addressbook.c:564
-#, fuzzy
-msgid "Email contains"
-msgstr "contén"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que amosará o navegador de carpetas"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "_Novo Contacto"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Ficheiro"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Erro descoñecido"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Pegar"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Subscribir"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "Horas"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Prioridade:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "DN Raíz:"
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Buscar"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Autenticación:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Camiño:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "O ficheiro non existe."
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Gardar no libro de enderezos"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Gardar no libro de enderezos"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Descrición:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Buscar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gardar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#, fuzzy
-msgid "Name"
-msgstr "Nome:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "_Departamento:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "_Oficina:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Tratamento:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "_Profesión:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Localizador (Pager)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "_Sobrenome:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "_Cónxuxe:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "No_tas:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Gardar no libro de enderezos"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Non hai elementos para mostrar nesta vista\n"
-"\n"
-"Faga dobre clic aquí para crear un novo Contacto."
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conducto de Axenda de Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "Erro comunicando co servidor de axenda"
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilidade de configuración para o conducto a-facer de evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "Adiar"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Aceptar"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Ficheiro non atopado"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir axenda"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Gardar axenda"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr "Transparente"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr "Opaco"
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"A data ten que ser introducida no formato: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posición xeográfica ten que ser introducida no formato: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "Erro cargando o ficheiro: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "_Visualizar"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Nova cita..."
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "anexo"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimir axenda"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "O URI que amosará a axenda"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-#, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-#, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "Editar Tarefa"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Sen resume"
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "categorías"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Clasificación"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "Completada"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _finalización:"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Data de _Inicio:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Marcar a tarefa como completa"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "_Resume"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "Transparente"
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abrir a tarefa"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Marcar como Completa"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Eliminar"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Borrar a tarefa"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d de %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d de %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Nova cita..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Editar esta cita..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr ""
-"\n"
-"Categorías: "
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Non foi posible cargar a axenda en `%s'"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O método requirido para cargar `%s' non está soportado"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d de %b"
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "día"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Luns"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Martes"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Mércores"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Xoves"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Venres"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Sábado"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "mes"
-
-#: calendar/gui/event-editor.c:568
-#, fuzzy
-msgid "th"
-msgstr "4"
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "Fontes"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"Non é posible abrir a carpeta `%s':\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, fuzzy, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "O método requirido para cargar `%s' non está soportado"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mér"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sáb"
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Non foi posible inicializar Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "Do"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "Lu"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "Ma"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "Me"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "Xo"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "Ve"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "Sa"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "Día actual (%a, %d de %b de %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d de %Y"
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Semana actual (%s - %s)"
-
-# Isto está mal, o %a é o nome de semana
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr "Mes actual (%b de %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Ano actual (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Imprimir axenda"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Previsualizar da Impresión"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "O URI que amosará a axenda"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr "DLMMXVS"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro escribindo o ficheiro temporal de correo: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Erro ó almacenar o correo no ficheiro temporal %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Non foi posible crear unha canalización: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Non foi posible facer fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "O programa movemail fallou: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Erro descoñecido)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Non foi posible cargar %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Cancelada"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Non foi posible conectarse a %s (porto %d): %s"
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(máquina descoñecida)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Abrir axenda"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "O URL '%s' necesita unha parte co nome do usuario"
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "O URL '%s' necesita unha parte co nome de máquina"
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "O URL '%s' necesita unha parte co camiño"
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Non foi posible crear o directorio %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "O URL `%s' non contén ningún protocolo"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "O URL `%s' contén un protocolo non válido"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "O número de porto no URL `%s' non é numérico"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "Non foi posible crear unha canalización: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta non agardada do servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Resposta non agardada do servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "O comando IMAP fallou: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Non foi posible crear o directorio %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "`%s' non é un directorio."
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "`%s' non é un ficheiro regular."
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Non é posible facer un fork a %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Non foi posible renomear a carpeta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Non foi posible borrar a carpeta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Non foi posible borrar a carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Non é posible obter a mensaxe: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "Re-enviar esta mensaxe"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Non é posible abrir a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "A carpeta `%s' non existe."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, fuzzy, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' non é un directorio."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Non foi posible borrar a carpeta `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-#, fuzzy
-msgid "not a maildir directory"
-msgstr "`%s' non é un directorio."
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Non é posible abrir a caixa de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, fuzzy, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Non é posible obter a mensaxe: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear o ficheiro `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' non é un ficheiro regular."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible borrar a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "A carpeta `%s' non está baleira. Non borrada."
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Non é posible abrir a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Non é posible facer un fork a %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"Non é posible abrir a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Non é posible abrir a caixa de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erro escribindo á caixa de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, fuzzy, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Erro escribindo á caixa de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Non foi posible pechar a carpeta orixe %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Non foi posible pechar a carpeta temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Non foi posible renomear a carpeta: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' non é un directorio."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Introduza o contrasinal NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "O servidor rexeitou o nome de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "O servidor rexeitou o nome de usuario/contrasinal"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Mensaxe %s non atopada."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Non foi posible recibir a lista de grupos do servidor."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Esta opción autenticarase co servidor NNTP usando un contrasinal sen cifrar."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
-"recibir correo de certos provedores de correo web, e de sistemas de email "
-"propietarios."
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
-"Esta é a única opción que soportan moitos servidores POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Esta opción conectarase ó servidor POP usando un contrasinal cifrado a "
-"través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
-"mesmo naqueles que indican que o soportan."
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Isto conectarase ó servidor POP e usará Kerberos 4 para autenticarse con el."
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Non foi posible autenticarse co servidor KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Non foi posible conectarse ó servidor POP en %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Erro enviando o nome de usuario: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(Descoñecido)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Non se soporta o mecanismo de autenticación solicitado."
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Erro enviando o contrasinal: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Non existe a carpeta `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Para entregar o correo pasándollo ó programa \"sendmail\" no sistema local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Non foi posible crear unha canalización para o sendmail: %s: correo non "
-"enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Non foi posible enviar a mensaxe: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "o sendmail saíu co sinal %s: correo non enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Non foi posible executar %s: correo non enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "o sendmail saíu con estado %d: correo non enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Entrega de correo a través do programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticación"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
-"Esta é a única opción que soportan moitos servidores POP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, fuzzy, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Entrega de correo a través do programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-"Non foi posible crear unha canalización para o sendmail: %s: correo non "
-"enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr "Non foi posible executar %s: correo non enviado."
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Non foi posible executar %s: correo non enviado."
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, fuzzy, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, fuzzy, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "o sendmail saíu co sinal %s: correo non enviado."
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "anexo"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Incluír un ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Quitar"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Quitar os elementos seleccionados da lista de anexos"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Engadir anexo..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Incluír un ficheiro como anexo na mensaxe"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "De:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Prema aquí para o libro de enderezos"
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "Introduza os destinatarios da mensaxe"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
-"lista de destinatarios."
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o asunto da mensaxe"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro gardando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro cargando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Gardando as modificacións da mensaxe..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Gardar as modificacións da mensaxe..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensaxe non foi enviada.\n"
-"\n"
-"¿Desexa gardar os cambios?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "O ficheiro non existe."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "Non é un ficheiro normal."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O ficheiro é moi longo (máis de 100K).\n"
-"¿Está seguro de querer inserilo?"
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "Ocorreu un erro lendo o ficheiro."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Compoñer unha mensaxe"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "ano"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "anos"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "meses"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "semanas"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "días"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oops. Esqueceu escoller unha data."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oops. Escolleu unha data non válida."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "a hora actual"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "unha hora que especifique"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "unha relativa ó momento actual"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "agora"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<prema aquí para seleccionar unha data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Engadir Regra de Filtrado"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar Regra de Filtrado"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-#, fuzzy
-msgid "outgoing"
-msgstr ""
-"Entrante\n"
-"Saínte\n"
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Editar Filtros"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "Entón"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Engadir acción"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "Eliminar acción"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Seleccionar Carpeta"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Introduza o URI da carpeta"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<prema aquí para seleccionar unha carpeta>"
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Erro na expresión regular '%s':\n"
-"%s"
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nome da regra: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Sen_título"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Se"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Executar accións"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "se se cumpren tódolos criterios"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "se se cumpre algún criterio"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Engadir criterio"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Eliminar criterio"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Responder a Todos"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Refacer"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Asignar Cor"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Asignar Puntuación"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar á Carpeta"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recepción"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de envío"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expresión"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar ó Enderezo"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatarios"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Puntuación"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Autor"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Asunto"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contén"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contén"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non termina en"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non empeza por"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina en"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non é"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "foi posterior a"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "foi anterior a"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Engadir Regra"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Non se pode inicializar o compoñente de correo de Evolution."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Seleccionar Carpeta"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "O corpo ou o asunto conteñen"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "O corpo contén"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "O asunto contén"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "O corpo non contén"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "O asunto non contén"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Editar"
-
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Save As..."
-msgstr "Gardar _Como..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "Responder ó Autor"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Responder a Todos"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Re-enviar"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Ir para diante no tempo"
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr ""
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr ""
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "Mover para a Carpeta"
-
-#: mail/folder-browser.c:672
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "Copiar á Carpeta"
-
-#: mail/folder-browser.c:674
-#, fuzzy
-msgid "Undelete"
-msgstr "Eliminar"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr "Aplicar Filtros"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr ""
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Eliminar"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-#, fuzzy
-msgid "Evolution Account Manager"
-msgstr "Xestión e Contas"
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Instalación de Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Enviar por correo a %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "O asunto é %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Enviar dende %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "lista de correo %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Ten que configurar unha identidade\n"
-"antes de poder escribir correo."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr "Non definiu ningún método de envío de correo"
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Esta mensaxe non ten asunto.\n"
-"¿Enviar realmente?"
-
-#: mail/mail-callbacks.c:345
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Ten que configurar unha identidade\n"
-"antes de poder escribir correo."
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Mensaxe reenviada - %s"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr "Mover mensaxe(s) a"
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr "Copiar mensaxe(s) a"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Só pode editar mensaxes gardados\n"
-"na carpeta de Borrador."
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr "¿Sobrescribir ficheiro?"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"¿Sobrescribilo?"
-
-#: mail/mail-callbacks.c:893
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Gardar como..."
-
-#: mail/mail-callbacks.c:895
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Gardar como..."
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Erro cargando a información do filtro:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "Imprimir Mensaxe"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "A impresión da mensaxe fallou"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Non foi posible escribir os datos: %s"
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "Gardar Anexo"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr "Gardar ó Disco..."
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr "Visualizador Externo"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Agochar"
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Responder-A:"
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr "Mensaxe cifrada non visualizada"
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr "Mensaxe cifrada"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Configurar Carpeta"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "Pechando a carpeta actual"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "Renomeando a carpeta antiga e abrindo"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Creando unha nova carpeta"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "Creando unha nova carpeta"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Crear unha nova carpeta"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear a carpeta `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:85
-#, fuzzy, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Erro na expresión regular '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Erro cargando a información do filtro:\n"
-"%s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "Recibindo correo de %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Recibir correo de %s"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr "Non hai novo correo en %s."
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Enviando \"%s\""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Borrar esta mensaxe"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Movendo mensaxes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensaxes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensaxes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensaxes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Examinando as carpetas en \"%s\""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Sen descrición)"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Mensaxe reenviada - %s"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Examinando as carpetas en \"%s\""
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizando \"%s\""
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Recibindo a mensaxe %d de %d"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Recibindo a mensaxe %d de %d"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Copiando as mensaxes"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "Erro gardando o ficheiro: %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Non foi posible crear a caixa de diálogo."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "O usuario cancelou a consulta."
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "Examinando %s"
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "Escribindo a mensaxe %d de %d"
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "Gardando as modificacións de %s"
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe reenviada)"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sen asunto)"
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Mensaxe reenviada - %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe reenviada (sen asunto)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Non se pode abrir a localizaión `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr ""
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "Nova VFolder"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "Responder ó autor desta mensaxe"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Responder a tódolos destinatarios desta mensaxe"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "Re-enviar esta mensaxe"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "Descoñecido"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%a %d de %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "anexo"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "De:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Pegar"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Data de recepción"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "A:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Tamaño:"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/openpgp-utils.c:81
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "O programa GPG/PGP non está dispoñible."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Non foi posible crear unha canalización: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Carpetas"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Puntuación"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instalación de Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Esta nova versión do Evolution necesita instalar ficheiros\n"
-"adicionais no seu directorio persoal do Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para saír."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Non foi posible actualizar os ficheiros correctamente"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con éxito."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Semella que é a primeira vez que executa Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Non se pode crear o directorio\n"
-"%s\n"
-"Erro: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Non se poden copiar os ficheiros a\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"O ficheiro `%s' non é un directorio.\n"
-"Móvao para poder instalar os ficheiros de\n"
-"usuario de Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"O directorio `%s' existe pero non é o\n"
-"directorio de Evolution. Móvao para poder\n"
-"instalar os ficheiros de usuario de Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Non se pode crear a carpeta indicada:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "O nome de carpeta indicado non é válido."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crear unha nova carpeta"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"O tipo da carpeta seleccionada non é válido para\n"
-"a operación solicitada."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Nova..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sen_título)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy non foi atopado no seu $PATH."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "Non se puido executar Bug buddy."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution é unha suite de aplicacións de traballo\n"
-"en grupo para xestión de correo, axenda e contactos\n"
-"dentro do ambiente de escritorio GNOME."
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr "Ir á carpeta..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr "(Ningunha carpeta visualizada)"
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Carpetas"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Non se pode activar o almacenamento local -- %s"
-
-#: shell/e-shell.c:1212
-#, fuzzy, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
-"Isto significa probablemente que o compoñente %s se estragou."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Crear novo grupo de atallos"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nome do grupo:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"¿Realmente desexa eliminar o grupo\n"
-"`%s' da barra de atallos?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Non eliminar"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Iconas _Pequenas"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Amosar os atallos como iconas pequenas"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Iconas _Grandes"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Amosar os atallos como iconas grandes"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Novo Grupo..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Crear un novo grupo de atallos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Eliminar este Grupo..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Eliminar este grupo de atallos"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Amosar a Barra de _Atallos"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Amosar a Barra de _Atallos"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activar"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Eliminar este atallo da barra de atallos"
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr "Erro gardando atallos."
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Vista"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Ver carpeta seleccionada"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(Sen nome)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "Sen erro"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "Erro xenérico"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr "Xa existe unha carpeta co mesmo nome"
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr "O tipo da carpeta especificada non é válido"
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "Non hai espacio dabondo para crear a carpeta"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "Non se atopou a carpeta especificada"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr "Función non implementada neste almacenamento"
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr "Operación non soportada"
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr "O tipo especificado non está soportado neste almacenamento"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Graciñas\n"
-"O Equipo de Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Non se pode inicializar a shell de Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Desactivar."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Nova Cita"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada de _Xornal"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Es_colla un Formulario..."
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Definir E_stilos de Impresión"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: _Enviar"
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Gardar Ane_xos..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para a Carpeta..."
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_iar á Carpeta..."
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Configuración da Páxina:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualización da Impresión"
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Pegar _Especial..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Marcar como _non Lida"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Obxecto"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elemento"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Elemento _non Lido"
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pri_meiro elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Derradeiro Elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Estándar"
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: Fo_rmato"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Seguinte"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _Ficheiro..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: _Elemento..."
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Obxecto..."
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Parágrafo..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Deseñar este _Formulario"
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Deseñar un Formulario..."
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _Formulario..."
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar Formulario Como..."
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de Script"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografía..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Formularios"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar unha mensaxe sen asunto"
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Ortografía..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:150
-#, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Entrada de _Xornal"
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: Cop_iar á Carpeta..."
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Reenviar como v_Calendar"
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Reenviar"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "_Formatar"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "Acció_ns"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Anterior"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir ó elemento anterior"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "FIXME: _Nota"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir ó elemento seguinte"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fóra da Oficina"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sen Información"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcións"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Amosar _Só as Horas de Traballo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Tódalas Persoas e Recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Tódalas _Persoas e Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B de %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoxe"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "Buscar"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "¿Borrar Contacto?"
-
-#~ msgid "Address _2:"
-#~ msgstr "Enderezo _2:"
-
-#~ msgid "Canada"
-#~ msgstr "Canadá"
-
-#~ msgid "Countr_y:"
-#~ msgstr "_País:"
-
-#~ msgid "Finland"
-#~ msgstr "Finlandia"
-
-#~ msgid "USA"
-#~ msgstr "Estados Unidos"
-
-#~ msgid "_Address:"
-#~ msgstr "_Enderezo:"
-
-#~ msgid "_City:"
-#~ msgstr "_Cidade:"
-
-#~ msgid "_PO Box:"
-#~ msgstr "_Apdo. de Correos:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "E_stado/Provincia:"
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "Código _Postal:"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Engadir Fonte"
-
-#~ msgid "Find..."
-#~ msgstr "Buscar..."
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Seleccionar un nome da Lista:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "n"
-#~ msgstr "n"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "r"
-#~ msgstr "r"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 ptos. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 ptos. Tahoma"
-
-#~ msgid "Body"
-#~ msgstr "Corpo"
-
-#~ msgid "Bottom:"
-#~ msgstr "Inferior:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensións:"
-
-#~ msgid "Font..."
-#~ msgstr "Fonte..."
-
-#~ msgid "Fonts"
-#~ msgstr "Fontes"
-
-#~ msgid "Format"
-#~ msgstr "Formato"
-
-#~ msgid "Headings"
-#~ msgstr "Cabeceiras"
-
-#~ msgid "Height:"
-#~ msgstr "Altura:"
-
-#~ msgid "Landscape"
-#~ msgstr "Horizontal"
-
-#~ msgid "Left:"
-#~ msgstr "Esquerda:"
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "Pestanas coas letras no lateral"
-
-#~ msgid "Margins"
-#~ msgstr "Marxes"
-
-#~ msgid "Number of columns:"
-#~ msgstr "Número de columnas:"
-
-#~ msgid "Options"
-#~ msgstr "Opcións"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientación"
-
-#~ msgid "Page"
-#~ msgstr "Páxina"
-
-#~ msgid "Paper"
-#~ msgstr "Papel"
-
-#~ msgid "Paper source:"
-#~ msgstr "Orixe do papel:"
-
-#~ msgid "Portrait"
-#~ msgstr "Vertical"
-
-#~ msgid "Preview:"
-#~ msgstr "Previsualización:"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "Imprimir usando sombreado gris"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "Invertir nas páxinas pares"
-
-#~ msgid "Right:"
-#~ msgstr "Dereita:"
-
-#~ msgid "Sections:"
-#~ msgstr "Seccións:"
-
-#~ msgid "Shading"
-#~ msgstr "Sombreado"
-
-#~ msgid "Start on a new page"
-#~ msgstr "Iniciar nunha nova páxina"
-
-#~ msgid "Style name:"
-#~ msgstr "Nome do estilo:"
-
-#~ msgid "Top:"
-#~ msgstr "Superior:"
-
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
-
-#~ msgid "Width:"
-#~ msgstr "Largura:"
-
-#~ msgid "label26"
-#~ msgstr "label26"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Axenda"
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Conducto de Axenda de Evolution"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
-#~ "Utilidade de configuración para o conducto de axenda de evolution.\n"
-
-#~ msgid "Edit appointment"
-#~ msgstr "Editar cita"
-
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Tempo de adiamento (minutos)"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 minutos"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 minutos"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (am/pm)"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 minutos"
-
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 minutos"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 minutos"
-
-#~ msgid "Audio Alarms"
-#~ msgstr "Alarmas Sonoras"
-
-#~ msgid "Calendar"
-#~ msgstr "Axenda"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferencias da Axenda"
-
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
-#~ msgid "End of day:"
-#~ msgstr "Final do día:"
-
-#~ msgid "First day of week:"
-#~ msgstr "Primeiro día da semana:"
-
-#~ msgid "Show week numbers"
-#~ msgstr "Amosar números de semana"
-
-#~ msgid "Start of day:"
-#~ msgstr "Inicio do día:"
-
-#~ msgid "Time format:"
-#~ msgstr "Formato da hora:"
-
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmas Visuais"
-
-#~ msgid "seconds."
-#~ msgstr "segundos."
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% Comp_leta:"
-
-#~ msgid "C_lassification:"
-#~ msgstr "C_lasificación:"
-
-#~ msgid "High"
-#~ msgstr "Alta"
-
-#~ msgid "In Progress"
-#~ msgstr "En Progreso"
-
-#~ msgid "Low"
-#~ msgstr "Baixa"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Not Started"
-#~ msgstr "Non Iniciada"
-
-#~ msgid "Task"
-#~ msgstr "Tarefa"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactos..."
-
-#~ msgid "_Priority:"
-#~ msgstr "_Prioridade:"
-
-#~ msgid "_Status:"
-#~ msgstr "_Estado:"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "diálogo-editor-tarefas"
-
-#~ msgid "A_ll day event"
-#~ msgstr "Evento de día _completo"
-
-#~ msgid "Days"
-#~ msgstr "Días"
-
-#~ msgid "Every"
-#~ msgstr "Cada"
-
-#~ msgid "Exceptions"
-#~ msgstr "Excepcións"
-
-#~ msgid "Hours"
-#~ msgstr "Horas"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Enviar _a:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Previsualización:"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vado"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Pú_blico"
-
-#~ msgid "Su_mmary:"
-#~ msgstr "_Resume:"
-
-#~ msgid "Time"
-#~ msgstr "Hora"
-
-#~ msgid "_Audio"
-#~ msgstr "_Audio"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Confidencial"
-
-#~ msgid "_Mail"
-#~ msgstr "_Correo"
-
-#~ msgid "_Program"
-#~ msgstr "_Programa"
-
-#~ msgid "_Run program:"
-#~ msgstr "_Executar programa:"
-
-#~ msgid "_Start time:"
-#~ msgstr "Hora de _comezo:"
-
-#~ msgid "_Starting date:"
-#~ msgstr "Data de _comezo:"
-
-#~ msgid "day(s)"
-#~ msgstr "día(s)"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "diálogo-editor-eventos"
-
-#~ msgid "label21"
-#~ msgstr "label21"
-
-#~ msgid "month(s)"
-#~ msgstr "mes(es)"
-
-#~ msgid "week(s)"
-#~ msgstr "semana(s)"
-
-#~ msgid "year(s)"
-#~ msgstr "ano(s)"
-
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Non foi posible crear un calendario en `%s'"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "abril"
-
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "agosto"
-
-#, fuzzy
-#~ msgid "December"
-#~ msgstr "decembro"
-
-#, fuzzy
-#~ msgid "February"
-#~ msgstr "febreiro"
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Ir á data"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Ir a hoxe"
-
-#, fuzzy
-#~ msgid "January"
-#~ msgstr "xaneiro"
-
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "xullo"
-
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "xuño"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "marzo"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "Luns"
-
-#, fuzzy
-#~ msgid "November"
-#~ msgstr "novembro"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "outubro"
-
-#, fuzzy
-#~ msgid "September"
-#~ msgstr "setembro"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "Attachment properties"
-#~ msgstr "Propiedades do anexo"
-
-#~ msgid "File name:"
-#~ msgstr "Nome de ficheiro:"
-
-#~ msgid "MIME type:"
-#~ msgstr "Tipo MIME:"
-
-#~ msgid "Filter Rules"
-#~ msgstr "Reglas de Filtrado"
-
-#, fuzzy
-#~ msgid "Incoming"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Saínte\n"
-
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Saínte\n"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "Carpetas Virtuais"
-
-#~ msgid "Save"
-#~ msgstr "Gardar"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Ver Todos"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Agochar"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Eliminar"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Asunto"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Responder ó Autor"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Editar Mensaxe"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "O asunto é %s"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Non foi posible iniciar wombat"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Formato"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Tipo de fonte de Novas:"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Non ten ningunha fonte de correo configurada"
-
-#, fuzzy
-#~ msgid "Account"
-#~ msgstr "Contas"
-
-#~ msgid "Account Information"
-#~ msgstr "Información de Contas"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propiedades do anexo"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticación:"
-
-#, fuzzy
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Noraboa, a configuración do correo está completa."
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "mes"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Enderezo de Email:"
-
-#~ msgid "Email Address:"
-#~ msgstr "Enderezo de Email:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuración de Correo do Evolution"
-
-#~ msgid "Full Name:"
-#~ msgstr "Nome Completo:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nome de usuario:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Identity"
-#~ msgstr "Identidade"
-
-#, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
-
-#~ msgid "Mail"
-#~ msgstr "Correo"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Contas"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuración do Correo"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Axudante da Configuración do Correo"
-
-#~ msgid "News"
-#~ msgstr "Novas"
-
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
-#~ msgid "Organization:"
-#~ msgstr "Organización:"
-
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Responder-a:"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "Persoas _Requiridas"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gardar como VCard"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro de sinatura:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Enviando Correo"
-
-#~ msgid "Server Configuration"
-#~ msgstr "Configuración do Servidor"
-
-#, fuzzy
-#~ msgid "Server Timeouts"
-#~ msgstr "Tipo de Servidor: "
-
-#~ msgid "Server Type: "
-#~ msgstr "Tipo de Servidor: "
-
-#, fuzzy
-#~ msgid "Server requires authentication"
-#~ msgstr "O servidor SMTP require autenticación"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
-
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro de sinatura:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro de sinatura:"
-
-#~ msgid "Sources"
-#~ msgstr "Fontes"
-
-#, fuzzy
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "O servidor SMTP require autenticación"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "Tipo:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Sen Información"
-
-#~ msgid "Username:"
-#~ msgstr "Nome de usuario:"
-
-#, fuzzy
-#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-#~ msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minutos"
-
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
-
-#~ msgid "Email address:"
-#~ msgstr "Enderezo de email:"
-
-#~ msgid "Signature File"
-#~ msgstr "Ficheiro de Sinatura"
-
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Detectar tipos soportados..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
-
-#~ msgid "Test Settings"
-#~ msgstr "Probar Configuración"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Tipo de fonte de correo:"
-
-#~ msgid "News source type:"
-#~ msgstr "Tipo de fonte de Novas:"
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Tipo de transporte de correo:"
-
-#~ msgid "Add Identity"
-#~ msgstr "Engadir Identidade"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Editar Identidade"
-
-#~ msgid "Add Source"
-#~ msgstr "Engadir Fonte"
-
-#~ msgid "Edit Source"
-#~ msgstr "Editar Fonte"
-
-#~ msgid "Add News Server"
-#~ msgstr "Engadir Servidor de News"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Editar Servidor de News"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Probando \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "¡A conexión foi correcta!"
-
-#~ msgid "Address"
-#~ msgstr "Enderezo"
-
-#~ msgid "Identities"
-#~ msgstr "Identidades"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Fontes de Correo"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte do Correo"
-
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Marcar mensaxe como lida [ms]: "
-
-#~ msgid "News Servers"
-#~ msgstr "Servidores de News"
-
-#~ msgid "News Sources"
-#~ msgstr "Fontes de Novas"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Non hai soporte de GPG/PGP dispoñible nesta copia do Evolution."
-
-#~ msgid "Delete a contact"
-#~ msgstr "Borrar un contacto"
-
-#~ msgid "Find"
-#~ msgstr "Buscar"
-
-#~ msgid "Find a contact"
-#~ msgstr "Buscar un contacto"
-
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
-
-#~ msgid "Stop"
-#~ msgstr "Parar"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Parar a Carga"
-
-#~ msgid "View All"
-#~ msgstr "Ver Todos"
-
-#~ msgid "View all contacts"
-#~ msgstr "Ver tódolos contactos"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuración do _Correo..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Imprimir Contactos..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_Buscar contactos"
-
-#~ msgid "5 Days"
-#~ msgstr "5 Días"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Axenda"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Preferencias da Axenda..."
-
-#~ msgid "Create a new appointment"
-#~ msgstr "Crear unha nova cita"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Crear unha nova axenda"
-
-#~ msgid "Day"
-#~ msgstr "Día"
-
-#~ msgid "Go back in time"
-#~ msgstr "Ir para atrás no tempo"
-
-#~ msgid "Go forward in time"
-#~ msgstr "Ir para diante no tempo"
-
-#~ msgid "Go to"
-#~ msgstr "Ir para"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para a data especificada"
-
-#~ msgid "Month"
-#~ msgstr "Mes"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir unha axenda"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir esta axenda"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Amosar un día"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Amosar un mes"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Amosar unha semana"
-
-#~ msgid "Show the working week"
-#~ msgstr "Amosar a semana laboral"
-
-#~ msgid "Week"
-#~ msgstr "Semana"
-
-#~ msgid "_New"
-#~ msgstr "_Novo"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_Abrir axenda"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimir esta axenda"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gardar _Como..."
-
-#~ msgid "Delete this item"
-#~ msgstr "Borrar este elemento"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Eliminar"
-
-#~ msgid "Help"
-#~ msgstr "Axuda"
-
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "_Configuración da Impresión..."
-
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este elemento"
-
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
-
-#~ msgid "Save _As..."
-#~ msgstr "Gardar _Como..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Gardar e Pechar"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Gardar o contacto e pechar a caixa de diálogo"
-
-#~ msgid "See online help"
-#~ msgstr "Ver a axuda online"
-
-#~ msgid "_File"
-#~ msgstr "_Ficheiro"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
-
-#~ msgid "_Save"
-#~ msgstr "_Gardar"
-
-#~ msgid "About this application"
-#~ msgstr "Acerca desta aplicación"
-
-#~ msgid "About..."
-#~ msgstr "Acerca de..."
-
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
-
-#~ msgid "C_ut"
-#~ msgstr "Co_rtar"
-
-#~ msgid "Clear"
-#~ msgstr "Limpar"
-
-#~ msgid "Clear the selection"
-#~ msgstr "Limpar a selección"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Pechar esta cita"
-
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
-#~ msgid "Copy the selection"
-#~ msgstr "Copiar a selección"
-
-#~ msgid "Cut"
-#~ msgstr "Cortar"
-
-#~ msgid "Cut the selection"
-#~ msgstr "Cortar a selección"
-
-#~ msgid "Dump XML"
-#~ msgstr "Envorcar XML"
-
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Envorcar a descrición Xml da Interface"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Libro de enderezos..."
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Veri_ficar Nomes"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Axuda"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Tarefa in_completa"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Inserir Ficheiro"
-
-#~ msgid "Find Again"
-#~ msgstr "Buscar Novamente"
-
-#~ msgid "Find _Again"
-#~ msgstr "Buscar _Novamente"
-
-#~ msgid "Modify the file's properties"
-#~ msgstr "Modificar as propiedades do ficheiro"
-
-#~ msgid "N_ext"
-#~ msgstr "Se_guinte"
-
-#~ msgid "Paste the clipboard"
-#~ msgstr "Pegar o contido do cartafol"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "_Configuración da Impresión..."
-
-#~ msgid "Print Setup"
-#~ msgstr "Configuración da Impresión"
-
-#~ msgid "Properties"
-#~ msgstr "Propiedades"
-
-#~ msgid "Redo"
-#~ msgstr "Refacer"
-
-#~ msgid "Redo the undone action"
-#~ msgstr "Refacer a acción desfeita"
-
-#~ msgid "Replace"
-#~ msgstr "Substituír"
-
-#~ msgid "Replace a string"
-#~ msgstr "Substituír unha cadea"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Gardar a cita e pechar a caixa de diálogo"
-
-#~ msgid "Save the current file"
-#~ msgstr "Gardar o ficheiro actual"
-
-#, fuzzy
-#~ msgid "Schedule Meeting"
-#~ msgstr "FIXME: Programar Reunión"
-
-#, fuzzy
-#~ msgid "Schedule _Meeting"
-#~ msgstr "FIXME: _Programar Reunión"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Buscar novamente a mesma cadea"
-
-#~ msgid "Search for a string"
-#~ msgstr "Buscar unha cadea"
-
-#~ msgid "Select everything"
-#~ msgstr "Seleccionar todo"
-
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Configurar as opcións de páxina para a impresora actual"
-
-#~ msgid "Undo"
-#~ msgstr "Desfacer"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Desfacer a última acción"
-
-#~ msgid "_About..."
-#~ msgstr "_Acerca de..."
-
-#~ msgid "_Close"
-#~ msgstr "_Pechar"
-
-#~ msgid "_Copy"
-#~ msgstr "_Copiar"
-
-#~ msgid "_Debug"
-#~ msgstr "_Depuración"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_Find..."
-#~ msgstr "_Buscar..."
-
-#~ msgid "_Help"
-#~ msgstr "A_xuda"
-
-#~ msgid "_Paste"
-#~ msgstr "_Pegar"
-
-#~ msgid "_Print"
-#~ msgstr "_Imprimir"
-
-#~ msgid "_Properties..."
-#~ msgstr "_Propiedades..."
-
-#~ msgid "_Redo"
-#~ msgstr "_Refacer"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Substituír..."
-
-#~ msgid "_Undo"
-#~ msgstr "_Desfacer"
-
-#~ msgid "Compose"
-#~ msgstr "Redactar"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Redactar unha nova mensaxe"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copiar a mensaxe nunha nova carpeta"
-
-#~ msgid "F_older"
-#~ msgstr "_Carpeta"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Contrasinais"
-
-#~ msgid "Get Mail"
-#~ msgstr "Recibir Correo"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Borrar Mensaxe"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Mensaxe reenviada - %s"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensaxe seleccionada"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtros de Correo..."
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Descrición:"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "Marcar como _Lida"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
-
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualización da Impresión da mensaxe..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "Imprimir mensaxe na impresora"
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "Responder a _Todos"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Responder ó _Autor"
-
-#~ msgid "Select _All"
-#~ msgstr "Seleccionar _Todo"
-
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Enviar o correo na cola e recibir o correo novo"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Ver Todos"
-
-#~ msgid "_Apply Filters"
-#~ msgstr "_Aplicar Filtros"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Copiar á Carpeta"
-
-#~ msgid "_Edit Message"
-#~ msgstr "_Editar Mensaxe"
-
-#~ msgid "_Forward"
-#~ msgstr "_Reenviar"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverter Selección"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuración do _Correo..."
-
-#~ msgid "_Message"
-#~ msgstr "_Mensaxe"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Mover para a Carpeta"
-
-#~ msgid "_Open in New Window"
-#~ msgstr "_Abrir nunha Nova Fiestra"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Imprimir Mensaxe"
-
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Gardar como..."
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "_Borrar"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Carpetas Virtuais"
-
-#, fuzzy
-#~ msgid "Attach"
-#~ msgstr "Incluír un ficheiro"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Gardar o ficheiro actual"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Mensaxe cifrada"
-
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Incluír un ficheiro como anexo na mensaxe"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Gardar _Como"
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Ir á carpeta..."
-
-#, fuzzy
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Gardar o ficheiro actual"
-
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Autor"
-
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Autor"
-
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Autor"
-
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar mensaxes en formato HTML"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Borrar esta mensaxe"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Gardar Anexo"
-
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "anexo"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviando unha mensaxe sen asunto"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Abrir..."
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Engadir a carpeta á súa lista de carpetas subscritas"
-
-#~ msgid "Refresh List"
-#~ msgstr "Actualizar Lista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Actualizar Lista de Carpetas"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Eliminar a carpeta da súa lista de carpetas subscritas"
-
-#~ msgid "Subscribe"
-#~ msgstr "Subscribir"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Desubscribir"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Visualizar unha carpeta diferente"
-
-#~ msgid "E_xit"
-#~ msgstr "_Saír"
-
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "_Atallo da barra do Evolution"
-
-#~ msgid "Exit the program"
-#~ msgstr "Saír do programa"
-
-#~ msgid "Getting _Started"
-#~ msgstr "_Iniciación"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "Amosar información sobre o Evolution"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Amosar a Barra de _Carpetas"
-
-#, fuzzy
-#~ msgid "Submit _Bug Report"
-#~ msgstr "_Enviar un Informe de Erro"
-
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Enviar un informe de erro usando o Bug Buddy"
-
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Uso do Xestor de Co_ntactos"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Uso da _Axenda"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Uso do Cliente de _Correo"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Acerca do Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Cita (FIXME)"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto (FIXME)"
-
-#~ msgid "_Folder"
-#~ msgstr "_Carpeta"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Ir para a Carpeta..."
-
-#~ msgid "_Index"
-#~ msgstr "Í_ndice"
-
-#~ msgid "_Settings"
-#~ msgstr "_Configuración"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Tarefa (FIXME)"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Elemento(s) pertencentes a estas categorías:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Categorías Dispoñibles:"
-
-#~ msgid "External Directories"
-#~ msgstr "Directorios Externos"
-
-#~ msgid "Port Number:"
-#~ msgstr "Número de Porto:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Días baleiros:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Citas:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Día salientado:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Números dos días:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Número do día actual:"
-
-#~ msgid "may"
-#~ msgstr "maio"
-
-#~ msgid "sept"
-#~ msgstr "setem"
-
-#~ msgid "sunday"
-#~ msgstr "domingo"
-
-#~ msgid "monday"
-#~ msgstr "luns"
-
-#~ msgid "tuesday"
-#~ msgstr "martes"
-
-#~ msgid "tues"
-#~ msgstr "mart"
-
-#~ msgid "wednesday"
-#~ msgstr "mércores"
-
-#~ msgid "wednes"
-#~ msgstr "mércor"
-
-#~ msgid "thursday"
-#~ msgstr "xoves"
-
-#~ msgid "thur"
-#~ msgstr "xov"
-
-#~ msgid "thurs"
-#~ msgstr "xoves"
-
-#~ msgid "friday"
-#~ msgstr "venres"
-
-#~ msgid "saturday"
-#~ msgstr "sábado"
-
-#~ msgid "fortnight"
-#~ msgstr "quincena"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "seg"
-
-#~ msgid "tomorrow"
-#~ msgstr "mañá"
-
-#~ msgid "yesterday"
-#~ msgstr "onte"
-
-#~ msgid "today"
-#~ msgstr "hoxe"
-
-#~ msgid "first"
-#~ msgstr "primeiro"
-
-#~ msgid "third"
-#~ msgstr "terceiro"
-
-#~ msgid "fourth"
-#~ msgstr "cuarto"
-
-#~ msgid "fifth"
-#~ msgstr "quinto"
-
-#~ msgid "sixth"
-#~ msgstr "sexto"
-
-#~ msgid "seventh"
-#~ msgstr "sétimo"
-
-#~ msgid "eighth"
-#~ msgstr "oitavo"
-
-#~ msgid "ninth"
-#~ msgstr "noveno"
-
-#~ msgid "tenth"
-#~ msgstr "décimo"
-
-#~ msgid "eleventh"
-#~ msgstr "décimo primeiro"
-
-#~ msgid "twelfth"
-#~ msgstr "décimo segundo"
-
-#~ msgid "Year:"
-#~ msgstr "Ano:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Seleccione a data á que quere ir.\n"
-#~ "Cando prema nun día, será levado a esa data."
-
-#~ msgid "Mail Source"
-#~ msgstr "Fonte de Correo"
-
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "A configuración do correo electrónico está completa.\n"
-#~ "Prema \"Finalizar\" para gardar a nova configuración"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Enviar unha mensaxe sen asunto"
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Marcando mensaxes na carpeta \"%s\""
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Marcar mensaxes na carpeta \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Marcando a mensaxe %d de %d"
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Reenviando mensaxes \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Reenviando unha mensaxe sen asunto"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Reenviar mensaxe \"%s\""
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Cargando \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Creando \"%s\""
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Amosar a mensaxe co UID \"%s\""
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Vendo as mensaxes da carpeta \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Novo Servidor de _Directorio"
-
-#~ msgid "_Actions"
-#~ msgstr "_Accións"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Gardar Axenda Como"
-
-#, fuzzy
-#~ msgid "_Mail Configuration"
-#~ msgstr "Configuración do Correo"
-
-#~ msgid "window2"
-#~ msgstr "window2"
-
-#~ msgid "Time format"
-#~ msgstr "Formato da hora"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 horas (AM/PM)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 horas"
-
-#~ msgid "Weeks start on"
-#~ msgstr "A semana comeza o"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferencias"
-
-#~ msgid "Alarm Properties"
-#~ msgstr "Propiedades da Alarma"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "As alarmas sonoras expiran tras"
-
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Non é posible copiar os datos ó ficheiro de saída: %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Non foi posible renomear a carpeta `%s': %s existe"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Abrir nunha Nova Fiestra"
-
-#~ msgid "Forward Message"
-#~ msgstr "Reenviar esta mensaxe"
-
-#~ msgid "Move Message"
-#~ msgstr "Mover Mensaxe"
-
-#~ msgid "Copy Message"
-#~ msgstr "Copiar Mensaxe"
-
-#~ msgid "Add Optional Fields..."
-#~ msgstr "Engadir Campos Opcionais..."
-
-#~ msgid "Browse..."
-#~ msgstr "Explorar..."
-
-#~ msgid "Optional Information"
-#~ msgstr "Información Opcional"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Non foi posible crear unha canalización con %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Non foi posible executar %s: %s\n"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX sen ler)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "O protocolo para abrir o URI `%s' é descoñecido"
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova A_xenda"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Nova cita..."
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Crear unha Nova Carpeta..."
diff --git a/po/hu.po b/po/hu.po
deleted file mode 100644
index b12933f2f6..0000000000
--- a/po/hu.po
+++ /dev/null
@@ -1,7028 +0,0 @@
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2001-01-24 15:15+0100\n"
-"Last-Translator: Szabolcs BAN <shooby@gnome.hu>\n"
-"Language-Team: Hungarian <hu@gnome.hu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090

-#: addressbook/gui/component/addressbook-factory.c:38

-#: addressbook/gui/widgets/test-minicard-view.c:45

-#: calendar/conduits/calendar/calendar-conduit.c:1150

-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55

-msgid "Could not initialize Bonobo"

-msgstr "A Bonobo inicializálása nem sikerült"

-

-#: addressbook/gui/widgets/test-minicard-view.c:100

-msgid "Reflow Test"

-msgstr ""

-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-#, fuzzy
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox formátumú fájlok"
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "A levél továbbítása"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Levelek letöltése"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Bezár"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mappába mozgat"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Az elõzõ elemre ugrás"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Következõ elemre ugrás"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Mappa beállítása"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nem tudom másolni a fájlokat\n"
-"'%s'-be."
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Fájl betöltési hiba: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Nincs hiba"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "Nem tudom elindítani a wombat kiszolgálót"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "New"
-msgstr "Új..."
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Egy új névjegy készítése"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."

-msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."

-

-#: notes/main.c:30

-msgid "Notes Component: Could not initialize bonobo"

-msgstr "Notes komponens: A Bonobo inicializálása nem sikerült"

-

-#: addressbook/backend/ebook/e-card.c:3049

-msgid "Card: "

-msgstr "Kártya:"

-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Név:  "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-" Elõtag:      "
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Adott:      "
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Egyéb:      "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Családi:    "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Utótag:     "
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Születési dátum: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Cím:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postafiók:   "
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-" Kül:"
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Út:          "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Város:       "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Régió:       "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-" Irányítószám: "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Ország:      "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonok:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Levelezõ: "
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Idõzóna: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Hely: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Üzleti szabály:"
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Cég:"
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-" Név:"
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-" Egység:"
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-" 2. egység:"
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-" 3. egység:"
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-" 4. egység:"
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategóriák:"
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Megjegyzés:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Egyedi szöveg:"
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Nyilvános kulcs:"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Tiltva"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Szinkronizálás"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr " Másolás a pilotról"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Másolás a pilotra"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Összevetés a pilotról"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Összevetés a pilotra"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Eredeti tulajdonos:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolúció címlista csatorna"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 a Free Software Foundation és a Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurációs eszköz az Evolúció címjegyzék csatornájához.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Szinkronizációs eljárás"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Csatorna állapot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nincs pilot beállítva, kérlek válaszd ki a\n"
-"'Pilot Link Properties' cappletet elõször."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nincs a gnome-pilot daemonra kapcsolódva"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Hiba lépett fel a pilotok listájának\n"
-"a gnome-pilot daemontól való lekérésekor "
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "A kurzort nem tudom betölteni\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "Az EBook nincs betöltve\n"
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "Nem tudom elindítani a wombat kiszolgálót"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "Nem tudom a wombat-ot elindítani"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr "Nem tudom a pilot Address application blokkját olvasni"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "Hozzá_ad"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Töröl"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Telefon típusok"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Új telefon típus"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Hozzáad"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Névjegy szerkesztõ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Teljes név..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Fájl mint:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Weblap cím:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "_HTML levelet kér"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "Ü_zleti"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Otthoni"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Üzleti _fax"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Elsõdleges email"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "Üz_leti"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "Ez a _levelezési cím"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_Névjegyek..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ka_tegóriák..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Beosztás"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Vállalat:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Cím..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Alap"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Osztály:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Hivatal:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Foglalkozás:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "Be_cenév:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "Háza_stárs:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Születésna_p:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Asszisztens neve:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "_Fõnök neve:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "É_vforduló:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "Felje_gyzések:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Részletek"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Asszisztens"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Üzleti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "2. Üzleti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Üzleti fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Visszahívás"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Autó"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Vállalat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Otthoni"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "2. Otthoni"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Otthoni fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Más"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Egyéb fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Személyhívó"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "Elsõdleges"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Rádió"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "2. email"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "3. email"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "A teljes név ellenõrzése"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Dr.\n"
-"Prof.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Ifj.\n"
-"Özv.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Keresztnév:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Beosztás:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Utónév:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Vezetéknév:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Elõtag:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "_Kártyákként"
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "_Táblázatként"
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Nem tudom megnyitni a címjegyzéket"
-
-#: addressbook/gui/component/addressbook.c:407
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Nem tudom a címjegyzéket megnyitni. Ez azt jelenti,\n"
-"hogy hibás URI-t írtál be, vagy egy LDAP kiszolgálót\n"
-"szeretnél elérni, és nincs LDAP támogatás befordítva.\n"
-"Ha URI-t írtál be, ellenõrizd az URI-t elírás vagy\n"
-"helytelen szintaktika szempontjából. Ha nem,\n"
-"lehet, hogy egy LDAP kiszolgálót kéne elérned. Ha szeretnél\n"
-"használni egy LDAP kiszolgálót, le kell töltened és\n"
-"telepítened az OpenLDAP csomagot, és újrafordítani az Evolúciót.\n"
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Mutasd mind"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Haladó..."
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr "Bármely mezõ tartalmazza"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr "A név tartalmaz"
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr "Email tartalmaz"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Az URI amit a Mappa Böngészõ meg fog nyitni"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Névjegy törlése?"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "LDAP kiszolgáló:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Mobil"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Nem tudom megnyitni a címjegyzéket"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Jelszó"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Ismeretlen hiba"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Lap"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Forrás"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "Órák"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Prioritás:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "Root DN:"
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Keresés"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Authentikáció:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Útvonal:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "A fájl nem létezik."
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Címjegyzékbe mentés"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Címjegyzékbe mentés"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Név:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Leírás:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Keresés"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard-ként mentés"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#, fuzzy
-msgid "Name"
-msgstr "Név:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "2. email"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Szervezet"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "_Osztály:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "_Hivatal:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Beosztás:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "_Foglalkozás:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Személyhívó"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "Be_cenév:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "Háza_stárs:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Semmi"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Címjegyzékbe mentés"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Nincsenek elemek, amiket meg lehetne mutatni\n"
-"\n"
-"Új névjegy készítéséhez kattints kettõt ide."
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolúció naptár csatorna"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Az Evolúció naptár csatorna beállító eszköze.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "Hibás kommunikáció a naptár kiszolgálóval"
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr "Nem tudom a pilot Calendar application blokkját olvasni"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolúció tennivaló csatorna"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Az Evolúció tennivaló csatorna beállító eszköze.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr "Nem tudom a pilot Calendar ToDo blokkját olvasni"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "A találkozód figyelmeztetõ üzenete:"
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "Szundi"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Nem találom a fájlt"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Naptár megnyitása"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Naptár mentése"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr "Nyilvános"
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr "Személyes"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr "Bizalmas"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "É"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "D"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "K"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "Ny"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr "Áttetszõ"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"A dátumot a következõ formában tudod beírni: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A földrajzi pozíció megadása a következõ formátumban lehetséges: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "A százalékos érték 0 és 100 között lehet, bezárólag"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioritás 1 és 9 között lehet, bezárólag"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %B %d, %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "Fájl betöltési hiba: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "_Megjelenít"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Mutasd az események végpontját"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "csatolás"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Naptár nyomtatása"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "Az URI amit a naptár megjelenít"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Riasztás idõpontja: %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Találkozó figyelmeztetés: %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Nincs elérhetõ összegzés."
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-#, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-#, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Tényleg törölni akarod\n"
-"ezt a névjegyet?"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "Feladat vége"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Nincs összegzés"
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Idõpont - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "Feladat - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Napló bejegyzés - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "kategóriák"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Besorolás"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "Elvégezve"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "_Vég idõpont:"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Ke_zdési dátum:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Lejárat"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Megjelölés mint kész feladat"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritás"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "Ö_sszegzés"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "Áttetszõ"
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Ébresztõk"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Megnyit..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "A feladat megnyitása"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Késznek jelöl"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Megjelölés mint kész feladat"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Töröl"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "A feladat törlése"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i perces osztás"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "de"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "du"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Új _idõpont"
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "A megbeszélés szerkesztése..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "A megbeszélés törlése"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "A megbeszélés mozgathatóvá tétele"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr "A megjelenés törlése"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr "Az összes megjelenés törlése"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr ""
-"\n"
-"Kategóriák:"
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Megbeszélés szerkesztése"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr "ekkor:"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "nap"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Hétfõ"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Kedd"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Szerda"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Csütörtök"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Péntek"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Szombat"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Vasárnap"
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr "ezen:"
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "elõfordulások"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"Nem tudom elkészíteni a megadott mappát:\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Va"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Hé"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ke"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Sze"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Csü"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pé"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Szo"
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Nem tudom a bonobo-t elindítani"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "V"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "H"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "K"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "Sze"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "Cs"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "P"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "Szo"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Feladatok"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "Mai nap (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1097
-#, fuzzy, c-format
-msgid "Current week (%s - %s)"
-msgstr "Aktuális hét (%s %s %d - %s %d %d)"
-
-#. Month
-#: calendar/gui/print.c:1105
-#, fuzzy
-msgid "Current month (%b %Y)"
-msgstr "Aktuális hónap (%a %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Ezév (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Naptár nyomtatása"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Nyomtatási elõnézet"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "Az URI amit a naptár megjelenít"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr "VHKSCPS"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, fuzzy, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fájl betöltési hiba: %s"
-
-#: camel/camel-movemail.c:254
-#, fuzzy, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fájl mentési hiba: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, fuzzy, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Ismeretlen hiba)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "%s kiszolgáló %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Törölve"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(ismeretlen kiszolgáló)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Naptár megnyitása"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, fuzzy, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Nem tudom létrehozni a könyvtárat\n"
-"%s\n"
-"Hiba: %s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Az IMAP parancs sikertelen: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Ismeretlen hiba"
-
-#: camel/providers/imap/camel-imap-command.c:297
-#, fuzzy
-msgid "Server response ended too soon."
-msgstr "Az IMAP kiszolgáló válasza nem tartalmaz %s információt"
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Az IMAP kiszolgáló válasza nem tartalmaz %s információt"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, fuzzy, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-"Nem tudom létrehozni a könyvtárat\n"
-"%s\n"
-"Hiba: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "%s helyi levélkönyvtár"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Nem sima fájl."
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "%s helyi levél fájl"
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Levél mozgatása más mappába"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "A levél továbbítása"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, fuzzy, c-format
-msgid "Folder `%s' does not exist."
-msgstr "A fájl nem létezik."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, fuzzy, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, fuzzy, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "'%s' nem könyvtár."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-#, fuzzy
-msgid "not a maildir directory"
-msgstr "%s helyi levélkönyvtár"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, fuzzy, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Levél mozgatása más mappába"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, fuzzy, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nem tudom másolni a fájlokat\n"
-"'%s'-be."
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, fuzzy, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, fuzzy, c-format
-msgid "`%s' is not a regular file."
-msgstr "Nem sima fájl."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"Nem tudom másolni a fájlokat\n"
-"'%s'-be."
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, fuzzy, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
-"Nem tudom elkészíteni a megadott mappát:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, fuzzy, c-format
-msgid "Could not rename folder: %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Ismeretlen hiba: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Levél mozgatása más mappába"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "'%s' nem könyvtár."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "A kiszolgáló a felhasználói nevet visszadobta"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, fuzzy, c-format
-msgid "Message %s not found."
-msgstr "Nem találom a fájlt"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET news"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET News %s-rõl"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "Nincs %s azonosítójú levél"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, fuzzy, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(Ismeretlen)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Nincs '%s' mappa."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, fuzzy, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, fuzzy, c-format
-msgid "Could not send message: %s"
-msgstr "Levél írása"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Authentikáció:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, fuzzy, c-format
-msgid "SMTP server %s"
-msgstr "%s kiszolgáló %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Ismeretlen hiba: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Virtuális mappa email szolgáltató"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 bájt"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bájt"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "csatolás"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Fájl csatolása"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Törlés"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Törli a kiválasztott elemeket a csatolási listáról"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Csatol..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Csatolj egy fájlt a levélhez"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "Feladó:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Címjegyzékben való kereséshez kattints ide"
-
-#: composer/e-msg-composer-hdrs.c:313
-#, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "Írd be a leveleid feladóját, amilyen címrõl levelezel"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "To:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "Írd be a levél címzettjét"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Írd be, kik kapjanak másolatot a levélrõl"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Írd be azokat a címeket, akik rejtett másolatot kapnak a levélrõl, azaz a "
-"címzettnél nem jelenik meg a címük"
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Téma:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Írd be a levél címét (subject)"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Ment mint..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fájl mentési hiba: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fájl betöltési hiba: %s"
-
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Levél mentése"
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Levél mentése"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolúció"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"A levél nem lett elküldve.\n"
-"\n"
-"Menteni akarod a változásaidat?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Fájl megnyitás"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "A fájl nem létezik."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "Nem sima fájl."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr "Az a fájl létezik, de nem olvasható."
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr "A fájl elérhetõnek látszik, de open(2) hiba történt."
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"A fájl túl nagy (100K fölötti).\n"
-"Tényleg be szeretnéd szúrni?"
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "Hiba történt megnyitás közben."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Levél írása"
-
-#: composer/e-msg-composer.c:1439
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "év"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "évek"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "hónap"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "hónapok"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "hét"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "hetek"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "napok"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "óra"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "órák"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "perc"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "percek"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "másodperc"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " másodpercek"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-#, fuzzy
-msgid "the current time"
-msgstr "Jelenidõre ugrás"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "most"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<kattints ide a dátum kiválasztásához>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Szûrõ szabály hozzáadása"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Szûrõ szabály szerkesztése"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Szûrõk szerkesztése"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "Akkor"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Mûvelet hozzáadása"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr ""
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Válassz mappát"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Írj be egy mappa URI-t"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<kattints ide a mappa kiválasztásához>"
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Teszt"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Szabály neve:"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Névtelen"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Ha"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Mindenkinek"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Rádió"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Szín hozzárendelése"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Pontszám hozzárendelése"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Mappába másolás"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Fogadás dátuma"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Küldés dátuma"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Kifejezés"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "A levél továbbítása címre"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Levéltörzs"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Levéltörzs"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "A levél el lett küldve"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mappába mozgat"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Címzettek"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Pontszám"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Feladó"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Státusz:"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Forrás"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Státusz:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Téma"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "utána"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "elõtte"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "tartalmaz"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nem tartalmaz"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nincs a végén"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nem létezik"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "nem úgy hangzik mint"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nincs az elején"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "a végén van"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "létezik"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "nagyobb mint"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "kisebb mint"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nem egy"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "egy"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "akkor vagy után volt"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "akkor vagy elõbb"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "úgy hangzik, mint"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "így kezdõdik:"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "után volt"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "elõtte volt"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Szabály hozzáadása"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Pontszám szabály szerkesztése"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VMappa szabály hozzáadása"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "VMappa szabály szerkesztése"
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Válassz mappát"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "A szövegtörzs vagy a téma tartalmaz"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "A szövegtörzs tartalmaz"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "Téma tartalmaz"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "A szövegtörzs nem tartalmaz"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "A téma nem tartalmaz"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr "VMappa a témára"
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr "VMappa a feladóra"
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr "VMappa a címzettekre"
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr "Szûrõ a témára"
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr "Szûrõ a feladón"
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr "Szûrõ a címzettekre"
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr "Szûrõ a levelezési listára"
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "Megnyitás"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Szerkeszt"
-
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Save As..."
-msgstr "Ment mint..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Nyomtat"
-
-#: mail/folder-browser.c:663
-#, fuzzy
-msgid "Reply to Sender"
-msgstr "Mindenkinek"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Mindenkinek"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Továbbít"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Továbbít"
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr "Jelölés olvasottnak"
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr "Jelölés nem olvasottnak"
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr "Mappába mozgatás..."
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr "Mappába másolás..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr "Visszaállít"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr "Szûrõk alkalmazása"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr "A levélbõl gyárts szabályt"
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Szûrõ a levelezõ listára (%s)"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Semmi"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Alapértelmezett"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Evolúció tennivaló csatorna"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Levél %s-nek"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "A téma %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Levél %s-tól"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s levelezõlista"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-#, fuzzy
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Egy azonosítót be kell állítanod\n"
-"mielõtt levelet küldessz."
-
-#: mail/mail-callbacks.c:148
-#, fuzzy
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Egy azonosítót be kell állítanod\n"
-"mielõtt levelet küldessz."
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "Nincs kimenõ mappád beállítva"
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Nincs tárgya a levélnek.\n"
-"Tényleg elküldjem?"
-
-#: mail/mail-callbacks.c:345
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Egy azonosítót be kell állítanod\n"
-"mielõtt levelet küldessz."
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Forwarded message - %s"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr "Levél(levelek) mozgatása más mappába"
-
-#: mail/mail-callbacks.c:677
-#, fuzzy
-msgid "Copy message(s) to"
-msgstr "Levél(levelek) mozgatása más mappába"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr "Felülírod a fájlt?"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-#, fuzzy
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr "A megadott néven már létezik mappa"
-
-#: mail/mail-callbacks.c:893
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Ment mint..."
-
-#: mail/mail-callbacks.c:895
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Ment mint..."
-
-#: mail/mail-callbacks.c:979
-#, fuzzy, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr "Fájl betöltési hiba: %s"
-
-#: mail/mail-callbacks.c:1028
-#, fuzzy
-msgid "Print Message"
-msgstr "Levél _nyomtatása"
-
-#: mail/mail-callbacks.c:1075
-#, fuzzy
-msgid "Printing of message failed"
-msgstr "Levél _nyomtatása"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, fuzzy, c-format
-msgid "Could not write data: %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: mail/mail-display.c:229
-#, fuzzy
-msgid "Save Attachment"
-msgstr "FIXME: Csatolások me_ntése..."
-
-#: mail/mail-display.c:269
-#, fuzzy, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-"Nem tudom létrehozni a könyvtárat\n"
-"%s\n"
-"Hiba: %s"
-
-#: mail/mail-display.c:311
-#, fuzzy
-msgid "Save to Disk..."
-msgstr "Ment mint..."
-
-#: mail/mail-display.c:313
-#, fuzzy, c-format
-msgid "Open in %s..."
-msgstr "Megnyit..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-#, fuzzy
-msgid "External Viewer"
-msgstr "Külsõ könyvtárak"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Rejtés"
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr "%s csatolás"
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Reply-To:"
-
-#: mail/mail-format.c:856
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Hibás üzenet az feladó threadtõl?"
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Levél elküldése"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Mappa beállítása"
-
-#: mail/mail-local.c:269
-#, fuzzy
-msgid "Closing current folder"
-msgstr "_Mappa beállítása"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Új mappa készítése"
-
-#: mail/mail-local.c:327
-#, fuzzy
-msgid "Copying messages"
-msgstr "Levél írása"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Új mappa készítése"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr "Fájl betöltési hiba: %s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Mozgatás alatt"
-
-#: mail/mail-ops.c:107
-#, fuzzy, c-format
-msgid "Fetching email from %s"
-msgstr "Levelek letöltése"
-
-#: mail/mail-ops.c:109
-#, fuzzy, c-format
-msgid "Fetch email from %s"
-msgstr "Levelek letöltése"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "'%s' küldés alatt"
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "A levél törlése"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, fuzzy, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Levél(levelek) mozgatása más mappába"
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "Mozgatás alatt"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "Másolás alatt"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Nincs leírás)"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Forwarded message - %s"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Szinkronizálás"
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Levél lista rendezése téma szerint"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Levél írása"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s mappa töltõdik"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s mappa betöltése"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Levél írása"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Levél mozgatása más mappába"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "Fájl mentési hiba: %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Nem teljes üzenet lett a csõbe írva!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Parancsok olvasásánál hiba történt egy feladó threadtõl."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Hibás üzenet az feladó threadtõl?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "A lekérdezést megszakítottad."
-
-#: mail/mail-tools.c:189
-#, fuzzy, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (forwarded message)"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (no subject)"
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Forwarded message - %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "Forwarded message (no subject)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr "VMappák"
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "Új VMappa"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Válasz"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "Válasz küldése a feladónak erre a levélre"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Válasz a feladónak és az összes címzettnek"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "A levél továbbítása"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "A levél nyomtatása"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "A levél törlése"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr "Nem nézett"
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr "Nézett"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr "Megválaszolt"
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "Ismeretlen"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%a %d %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "csatolás"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "Feladó:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Lejárat"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Fogadás dátuma"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "To:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Méret:"
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "Nincs elérhetõ GPG/PGP program."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-

-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756

-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054

-#, c-format

-msgid "Couldn't create pipe to GPG/PGP: %s"

-msgstr "Nem sikerült csõvezetéket létrehozni a GPG/PGP-hez: %s"

-

-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650

-msgid "No recipients specified"

-msgstr ""

-

-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr ""
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Mappák"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Pontszám"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, fuzzy, c-format
-msgid "Getting store for \"%s\""
-msgstr "_Induláshoz"
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolúció telepítés"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-#, fuzzy
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Kérlek nyomd meg az 'OK' gombot az Evolúció felhasználói fájljainak "
-"telepítéséhez"
-
-#: shell/e-setup.c:157
-#, fuzzy
-msgid "Could not update files correctly"
-msgstr "Nem tudom a dialógust elkészíteni."
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Az Evolúció fájljai sikeresen települtek."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Úgy látszik, elsõ alkalommal futtatod az Evolúciót."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Kérlek nyomd meg az 'OK' gombot az Evolúció felhasználói fájljainak "
-"telepítéséhez"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Nem tudom létrehozni a könyvtárat\n"
-"%s\n"
-"Hiba: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Nem tudom másolni a fájlokat\n"
-"'%s'-be."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Az '%s' fájl nem egy könyvtár.\n"
-"Kérlek mozgasd el a fájlt hogy az Evolúció\n"
-"települni tudjon."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Az '%s' könyvtár létezik.\n"
-"Kérlek töröld a fájlt hogy az Evolúció\n"
-"települni tudjon."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nem tudom elkészíteni a megadott mappát:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "A megadott mappa név nem jó."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolúció - Új mappa készítése"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"A kiválasztott mappa típusa nem jó a megadott\n"
-"mûvelethez."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Új..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Névtelen)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nem található a $PATH-odban."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "A Bug buddy-t nem tudom futtatni."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Az Evolúció egy munkacsoport program \n"
-"levelezéshez, naptár és címjegyzék funkciókkal\n"
-"a GNOME grafikus környezethez."
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr "Mappába menj..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr "(Nincs mappa mutatva)"
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Mappák"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolúció - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolúció - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-#, fuzzy
-msgid "Create new shortcut group"
-msgstr "Egy új névjegy készítése"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Csoport neve:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Kis ikonok"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Kis ikonok mutatása az elemeken"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Nagy ikonok"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Nagy ikonok mutatása az elemeken"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "Ú_j csoport..."
-
-#: shell/e-shortcuts-view.c:281
-#, fuzzy
-msgid "Create a new shortcut group"
-msgstr "Egy új névjegy készítése"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-#, fuzzy
-msgid "Remove this shortcut group"
-msgstr "Vedd le ezt az elemet az indítósávról"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Nagy ikonok mutatása az elemeken"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Nagy ikonok mutatása az elemeken"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktivál"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Az elem aktiválása"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Vedd le ezt az elemet az indítósávról"
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr "Nem sikerül elmenteni az elemeket."
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Nézet"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "A kijelölt mappák megtekintése"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(névtelen)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "Nincs hiba"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "Alapvetõ hiba"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr "A megadott néven már létezik mappa"
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr "A megadott mappatípus nem jó"
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "I/O hiba"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "Nincs elég hely a mappa elkészítéséhez"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "A megadott mappát nem találom"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr "A funkció nincs még ebben a tárolóban megírva"
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Jogosultsági hiba"
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr "A mûvelet nem támogatott"
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr "A megadott típus nem támogatott ebben a tárolóban."
-
-#: shell/main.c:74
-#, fuzzy
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Helló, köszönjük, hogy letöltötted az Evolution csomag fejlesztõi \n"
-"verzióját.\n"
-"\n"
-"Az Evolúció csapat sokat és keményen dolgozott hogy az Evolúciót \n"
-"robusztussá, széppé, jól használhatóvá, gyorssá és jól tervezetté \n"
-"tegye, ahogy csak lehetett. Nagyon fáradtak vagyunk. Még nem vagyunk \n"
-"kész, még nem.\n"
-"\n"
-"Mikor elindítod az Evolúciót, kérlek értsd meg, hogy a munkánk nagy\n"
-"része a backend (háttér) írására irányult, amely az egész rendszert\n"

-"hajtja, és nem a felhasználói felületre. Ez csak a hegycsúcs teteje,\n"

-"és még sok szeretetet fogunk beleölni az UI fejlesztérébe. Tudnod kell\n"

-"viszont, hogy amit használsz, nem demoware.\n"

-"Tehát, itt az idõ a mentegetõzésre. Az Evolúció fog: crash-elni, \n"

-"elveszti a leveleid, kósza folyamatokat hagy futni, megeszi a teljes\n"

-"CPU idõdet, HTML leveleket küld véletlenszerû levlistáknak, és lejárat\n"

-"a kollegáid és a barátaid elõtt. Használd a saját felelõsségedre.\n"

-"Azért reméljük, élvezni fogod a kemény munkánk eredményét, és várjuk\n"

-"hozzájárulásod! \n"

-

-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Köszönettel\n"
-"Az Evolúció Csapat\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Nem tudom elindítani az Evolúció shell-t."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Tiltás."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Nem tudom elindítani a Bonobo komponens rendszert."
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Idõpont"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Találkozó _felhívás"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Levél"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Címjegyzék"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Feladat"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Feladat f_elhívás"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Napló bejegyzés"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Feljegyzés"
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Válassz f_ormát..."
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo stílus"
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Nyomtatási stílusok definiálása..."
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: _Elküld"
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Csatolások me_ntése..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mappába mozgat..."
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Mappába máso_l..."
-
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Oldal _beállítás:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Nyomtatás né_zet"
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: _Speciális beillesztés"
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Ne_m olvasottnak jelöl"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objektum"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elem"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Nem olvasott elem"
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Elsõ e_lem a mappában"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Utolsó elem a mappában"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: Á_ltalános"
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: __Formázás"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Beállít..."
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "E_lõzõ"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Kö_vetkezõ"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Eszközök"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _Fájl..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: Elem..."
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objektum..."
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Betûtípus..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: B_ekezdés..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Aktuális kérdõív _tervezése"
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Kérdõív t_ervezése"
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Kérdõív _publikálása"
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Kérdõív publikálása _mint..."
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Szkript _hibakeresõ"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Helyesírás..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Kérdõívek"
-
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "FIXME: Ú_j névjegy"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: Új névjegy ugyanannál a _cégnél"
-
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Levél ennek a _személynek"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Levél ennek a _személynek"
-
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Ta_lálkozó ezzel a személlyel"
-
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Találkozó tervezése"
-
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: Új feladat a névjegyhez"
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Új napló bejegyzés a névjegyhez"
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _Zászló folytatáshoz..."
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: _Térkép vagy cím megjelenítése"
-
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: _Weblap megnyitása"
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: _vCard-ként továbbküld"
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Továbbít"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Beilleszt"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormátum"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Eszközök"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_Mûveletek"
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr "FIXME: Elõzõ"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Az elõzõ elemre ugrás"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "FIXME: _Feljegyzés"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Következõ elemre ugrás"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Kísérleti"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Foglalt"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Üzemen kívül"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nincs információ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Mások meghívása..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Beállítások"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Csak a _munkaórák mutatása"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "_Nagyított mutatása"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Szabad/foglalt frissítése"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Automatikus kiszedés"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Minden ember és erõforrás"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Minden _ember és egy erõforrás"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_A kért emberek"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "A kért emberek és egy e_rõforrás"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Megbeszélés _kezdõdik:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Megbeszélés _vége:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Minden meghívott"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "HKSCPsV"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Most"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Ma"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "Keresés"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Csoportosítás %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Névjegy törlése?"
-
-#~ msgid "Address _2:"
-#~ msgstr "2.cím:"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Check Address"
-#~ msgstr "A cím ellenõrzése"
-
-#~ msgid "Countr_y:"
-#~ msgstr "Ors_zág:"
-
-#~ msgid "Finland"
-#~ msgstr "Finnország"
-
-#~ msgid "USA"
-#~ msgstr "USA"
-
-#~ msgid "_Address:"
-#~ msgstr "_Cím:"
-
-#~ msgid "_City:"
-#~ msgstr "_Város:"
-
-#~ msgid "_PO Box:"
-#~ msgstr "_Postafiók:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "Á_llam/Helytartóság:"
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Irányítószám:"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Forrás hozzáadása"
-
-#~ msgid "Find..."
-#~ msgstr "Keresés..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "Levél címzettek"
-
-#~ msgid "Select Names"
-#~ msgstr "Válassz neveket"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Válassz egy nevet a listából:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "n"
-#~ msgstr "n"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "r"
-#~ msgstr "r"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
-
-#~ msgid "Blank forms at end:"
-#~ msgstr "A végén a formok ürítése:"
-
-#~ msgid "Body"
-#~ msgstr "Törzs"
-
-#~ msgid "Bottom:"
-#~ msgstr "Alsó:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Dimenziók:"
-
-#~ msgid "Font..."
-#~ msgstr "Betûtípus..."
-
-#~ msgid "Fonts"
-#~ msgstr "Betûtípusok"
-
-#~ msgid "Footer:"
-#~ msgstr "Lábléc:"
-
-#~ msgid "Format"
-#~ msgstr "Formátum"
-
-#~ msgid "Header"
-#~ msgstr "Fejléc"
-
-#~ msgid "Header/Footer"
-#~ msgstr "Fejléc/lábléc"
-
-#~ msgid "Headings"
-#~ msgstr "Fejlécek"
-
-#~ msgid "Headings for each letter"
-#~ msgstr "Fejléc minden levélnek"
-
-#~ msgid "Height:"
-#~ msgstr "Magasság:"
-
-#~ msgid "Immediately follow each other"
-#~ msgstr "Rögtön egymás után következnek"
-
-#~ msgid "Include:"
-#~ msgstr "Beleértve:"
-
-#~ msgid "Landscape"
-#~ msgstr "Fekvõ"
-
-#~ msgid "Left:"
-#~ msgstr "Bal:"
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "Levél címkék minden lapon"
-
-#~ msgid "Margins"
-#~ msgstr "Margók"
-
-#~ msgid "Number of columns:"
-#~ msgstr "Oszlopok száma:"
-
-#~ msgid "Options"
-#~ msgstr "Beállítások"
-
-#~ msgid "Orientation"
-#~ msgstr "Elhelyezkedés"
-
-#~ msgid "Page"
-#~ msgstr "Lap"
-
-#~ msgid "Page Setup:"
-#~ msgstr "Oldal beállítás:"
-
-#~ msgid "Paper"
-#~ msgstr "Papír"
-
-#~ msgid "Paper source:"
-#~ msgstr "Papír forrás:"
-
-#~ msgid "Portrait"
-#~ msgstr "Álló"
-
-#~ msgid "Preview:"
-#~ msgstr "Elõnézet:"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "Nyomatás szürkeskálás árnyalással"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "Páros lapokon fordított"
-
-#~ msgid "Right:"
-#~ msgstr "Jobb:"
-
-#~ msgid "Sections:"
-#~ msgstr "Szekciók:"
-
-#~ msgid "Shading"
-#~ msgstr "Árnyalás"
-
-#~ msgid "Start on a new page"
-#~ msgstr "Új lapon kezdd"
-
-#~ msgid "Style name:"
-#~ msgstr "Stílus neve:"
-
-#~ msgid "Top:"
-#~ msgstr "Felsõ:"
-
-#~ msgid "Type:"
-#~ msgstr "Típus"
-
-#~ msgid "Width:"
-#~ msgstr "Szélesség:"
-
-#~ msgid "label26"
-#~ msgstr "label26"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Naptár"
-
-#, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Evolúció naptár csatorna"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Az Evolúció naptár csatorna beállító eszköze.\n"
-
-#~ msgid "Edit appointment"
-#~ msgstr "_Idõpont szerkesztése"
-
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Szundi idõ (percek)"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 perc"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 perc"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 órás (de/du)"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 perc"
-
-#~ msgid "24 hour"
-#~ msgstr "24 órás"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 perc"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 perc"
-
-#~ msgid "Audio Alarms"
-#~ msgstr "Hang figyelmeztetés"
-
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Sípolj a figyelmeztetõ ablak megjelenésekor."
-
-#~ msgid "Calendar"
-#~ msgstr "Naptár"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Naptár beállítások"
-
-#~ msgid "Colors"
-#~ msgstr "Színek"
-
-#~ msgid "Compress weekends"
-#~ msgstr "A hétvégék összenyomása"
-
-#~ msgid "Date navigator options"
-#~ msgstr "Dátum navigátor beállítások"
-
-#~ msgid "Defaults"
-#~ msgstr "Alapértelmezett"
-
-#~ msgid "Display options"
-#~ msgstr "Megjelenítési beállítások"
-
-#, fuzzy
-#~ msgid "Enable snoozing for"
-#~ msgstr "Szundi engedése"
-
-#~ msgid "End of day:"
-#~ msgstr "Nap vége:"
-
-#~ msgid "First day of week:"
-#~ msgstr "A hét elsõ napja:"
-
-#~ msgid "Highlight"
-#~ msgstr "Kiemelés"
-
-#~ msgid "Items Due Today"
-#~ msgstr "A ma lejáró elemek"
-
-#~ msgid "Items Due Today:"
-#~ msgstr "A ma lejáró elemek:"
-
-#~ msgid "Items Not Yet Due"
-#~ msgstr "Még nem lejárt elemek"
-
-#~ msgid "Items Not Yet Due:"
-#~ msgstr "Még nem lejárt elemek:"
-
-#~ msgid "Overdue Items"
-#~ msgstr "Lejárt elemek"
-
-#~ msgid "Overdue Items:"
-#~ msgstr "Lejárt elemek:"
-
-#~ msgid "Pick a color"
-#~ msgstr "Válassz egy színt"
-
-#~ msgid "Remind me of all appointments"
-#~ msgstr "Minden találkozóra figyelmeztess"
-
-#~ msgid "Reminders"
-#~ msgstr "Emlékeztetõk"
-
-#~ msgid "Show"
-#~ msgstr "Mutasd"
-
-#~ msgid "Show week numbers"
-#~ msgstr "Hét számának mutatása"
-
-#~ msgid "Start of day:"
-#~ msgstr "Nap kezdete:"
-
-#~ msgid "TaskPad"
-#~ msgstr "FeladatTábla"
-
-#~ msgid "Time Until Due"
-#~ msgstr "Lejáratig hátralévõ idõ"
-
-#~ msgid "Time divisions:"
-#~ msgstr "Idõosztások:"
-
-#~ msgid "Time format:"
-#~ msgstr "Idõ formátum:"
-
-#~ msgid "Visual Alarms"
-#~ msgstr "Vizuális figyelmeztetés"
-
-#~ msgid "Work week"
-#~ msgstr "Munkahét"
-
-#~ msgid "minutes before they occur."
-#~ msgstr "perc bekövetkezésükig."
-
-#~ msgid "seconds."
-#~ msgstr "másodperc."
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% kész:"
-
-#~ msgid "C_lassification:"
-#~ msgstr "B_esorolás"
-
-#~ msgid "Date Completed:"
-#~ msgstr "Teljesítés dátuma:"
-
-#~ msgid "High"
-#~ msgstr "Magas"
-
-#~ msgid "In Progress"
-#~ msgstr "Folyamatban"
-
-#~ msgid "Low"
-#~ msgstr "Alacsony"
-
-#~ msgid "Normal"
-#~ msgstr "Normális"
-
-#~ msgid "Not Started"
-#~ msgstr "Nem indult még el"
-
-#~ msgid "Task"
-#~ msgstr "Feladat"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Névjegyek..."
-
-#~ msgid "_Due Date:"
-#~ msgstr "Le_járat:"
-
-#~ msgid "_Priority:"
-#~ msgstr "_Prioritás:"
-
-#~ msgid "_Status:"
-#~ msgstr "_Státusz:"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
-
-#~ msgid "A_ll day event"
-#~ msgstr "Minden napos esemény"
-
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Megbeszélések:"
-
-#~ msgid "Custom recurrence"
-#~ msgstr "Megadott ismétlõdés"
-
-#~ msgid "Days"
-#~ msgstr "Napok"
-
-#~ msgid "Every"
-#~ msgstr "Minden"
-
-#~ msgid "Exceptions"
-#~ msgstr "Kivételek"
-
-#~ msgid "Hours"
-#~ msgstr "Órák"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Levél _valakinek:"
-
-#~ msgid "Minutes"
-#~ msgstr "Percek"
-
-#~ msgid "Modify"
-#~ msgstr "Módosítás"
-
-#~ msgid "No recurrence"
-#~ msgstr "Nincs ismétlõdés"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Elõnézet:"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Szemé_lyes"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Nyil_vános"
-
-#~ msgid "Recurrence"
-#~ msgstr "Ismétlõdés"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "Ismétlõdési szabály"
-
-#~ msgid "Reminder"
-#~ msgstr "Emlékeztetõ"
-
-#~ msgid "Simple recurrence"
-#~ msgstr "Egyszerû ismétlõdés"
-
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "Összegzés:"
-
-#~ msgid "Time"
-#~ msgstr "Idõ"
-
-#~ msgid "_Audio"
-#~ msgstr "_Hang"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Bizalmas"
-
-#~ msgid "_Mail"
-#~ msgstr "_Levél"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid "_Run program:"
-#~ msgstr "_Program indítása:"
-
-#~ msgid "_Start time:"
-#~ msgstr "_Kezdési idõ:"
-
-#~ msgid "_Starting date:"
-#~ msgstr "Ke_zdési dátum:"
-
-#~ msgid "day(s)"
-#~ msgstr "nap"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "for"
-#~ msgstr "ezért:"
-
-#~ msgid "forever"
-#~ msgstr "örökké"
-
-#~ msgid "label21"
-#~ msgstr "label21"
-
-#~ msgid "month(s)"
-#~ msgstr "hónapban"
-
-#~ msgid "until"
-#~ msgstr "amíg"
-
-#~ msgid "week(s)"
-#~ msgstr "héten"
-
-#~ msgid "year(s)"
-#~ msgstr "évben"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "április"
-
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "augusztus"
-
-#, fuzzy
-#~ msgid "December"
-#~ msgstr "december"
-
-#, fuzzy
-#~ msgid "February"
-#~ msgstr "február"
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Dátumra ugrás"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Ugorj mára"
-
-#, fuzzy
-#~ msgid "January"
-#~ msgstr "január"
-
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "július"
-
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "június"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "március"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "Hétfõ"
-
-#, fuzzy
-#~ msgid "November"
-#~ msgstr "november"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "október"
-
-#, fuzzy
-#~ msgid "September"
-#~ msgstr "szeptember"
-
-#~ msgid "Attachment properties"
-#~ msgstr "Csatolás beállítások"
-
-#~ msgid "File name:"
-#~ msgstr "Fájlnév:"
-
-#~ msgid "MIME type:"
-#~ msgstr "MIME típus:"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "VMappák szerkesztése"
-
-#~ msgid "Filter Rules"
-#~ msgstr "Szûrõ szabályok"
-
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Körvonal:"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "Virtuális Mappák"
-
-#~ msgid "vFolder Sources"
-#~ msgstr "VMappa források"
-
-#~ msgid "Save"
-#~ msgstr "Mentés"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mutasd mind"
-
-#, fuzzy
-#~ msgid "Hide selected"
-#~ msgstr "Törölt"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Rejtés"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Törölt"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Téma"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Szûrõ a feladón"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Levél _nyomtatása"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "A téma %s"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Nem tudom a wombat-ot elindítani"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr " összegzés"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Új telefon típus"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Nincs információ"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Csatolás beállítások"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Haladó..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Authentikáció:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Authentikáció:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Kilépés a levélszerkesztõbõl"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Semmi"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Email cím:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Email cím:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Teljes név:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Felhasználólnév:"
-
-#, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAPv4"
-
-#~ msgid "Identity"
-#~ msgstr "Azonosító"
-
-#, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Levél"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Email tartalmaz"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "Új..."
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Beállítások"
-
-#~ msgid "Organization:"
-#~ msgstr "Szervezet:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Jelszó"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Reply-To:"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "_A kért emberek"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "VCard-ként mentés"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Aláírás fájl:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Sendmail"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Szerver:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Szerver:"
-
-#~ msgid "Signature file:"
-#~ msgstr "Aláírás fájl:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Aláírás fájl:"
-
-#~ msgid "Sources"
-#~ msgstr "Források"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "Típus"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Nincs információ"
-
-#~ msgid "Username:"
-#~ msgstr "Felhasználólnév:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "percek"
-
-#~ msgid "Full name:"
-#~ msgstr "Teljes név:"
-
-#~ msgid "Email address:"
-#~ msgstr "Email cím:"
-
-#~ msgid "Signature File"
-#~ msgstr "Aláírás fájl"
-
-#~ msgid "Server:"
-#~ msgstr "Szerver:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Támogatott típusok detektálása..."
-
-#, fuzzy
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Kilépés a levélszerkesztõbõl"
-
-#~ msgid "Test Settings"
-#~ msgstr "Beállítások tesztelése"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Levél forrás típusa:"
-
-#, fuzzy
-#~ msgid "News source type:"
-#~ msgstr "Új telefon típus"
-
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Levél küldés"
-
-#, fuzzy
-#~ msgid "Add Identity"
-#~ msgstr "Azonosító"
-
-#, fuzzy
-#~ msgid "Edit Identity"
-#~ msgstr "Azonosító"
-
-#~ msgid "Add Source"
-#~ msgstr "Forrás hozzáadása"
-
-#~ msgid "Edit Source"
-#~ msgstr "Forrás szerkesztése"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Hírcsoport-szerverek"
-
-#, fuzzy
-#~ msgid "Edit News Server"
-#~ msgstr "Hírcsoport-szerverek"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "'%s' tesztelése"
-
-#~ msgid "Address"
-#~ msgstr "Cím"
-
-#~ msgid "Identities"
-#~ msgstr "Azonosítók"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Levél források"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Levél küldés"
-
-#, fuzzy
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "_Minden olvasott levél kijelölése"
-
-#~ msgid "News Servers"
-#~ msgstr "Hírcsoport-szerverek"
-
-#~ msgid "News Sources"
-#~ msgstr "Hírcsoport források"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "A levelet HTML formátumban küldd"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Nincs az Evolúciónak ebben a példányában GPG/PGP támogatás."
-
-#, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "Névjegy törlése?"
-
-#, fuzzy
-#~ msgid "Find"
-#~ msgstr "Finnország"
-
-#, fuzzy
-#~ msgid "Stop Loading"
-#~ msgstr "Árnyalás"
-
-#, fuzzy
-#~ msgid "View All"
-#~ msgstr "Mutasd mind"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Névjegyek..."
-
-#, fuzzy
-#~ msgid "5 Days"
-#~ msgstr "Napok"
-
-#, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Naptár beállítások"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Naptár"
-
-#, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Naptár beállítások"
-
-#, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "A megbeszélés törlése"
-
-#, fuzzy
-#~ msgid "Create a new calendar"
-#~ msgstr "Új mappa készítése"
-
-#, fuzzy
-#~ msgid "Day"
-#~ msgstr "Napok"
-
-#, fuzzy
-#~ msgid "Go to"
-#~ msgstr "Dátumra ugrás"
-
-#, fuzzy
-#~ msgid "Go to a specific date"
-#~ msgstr "Dátumra ugrás"
-
-#, fuzzy
-#~ msgid "Go to present time"
-#~ msgstr "Következõ elemre ugrás"
-
-#, fuzzy
-#~ msgid "Month"
-#~ msgstr "hónap"
-
-#, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "Naptár megnyitása"
-
-#, fuzzy
-#~ msgid "Prev"
-#~ msgstr "Elõnézet:"
-
-#, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "Naptár nyomtatása"
-
-#, fuzzy
-#~ msgid "Show 1 week"
-#~ msgstr "Hét számának mutatása"
-
-#, fuzzy
-#~ msgid "Week"
-#~ msgstr "hét"
-
-#, fuzzy
-#~ msgid "_New"
-#~ msgstr "_Nézet"
-
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Naptár megnyitása"
-
-#, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Naptár nyomtatása"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Ment mint..."
-
-#, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "A megbeszélés törlése"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Töröl"
-
-#, fuzzy
-#~ msgid "Print this item"
-#~ msgstr "Tennivaló szerkesztése"
-
-#, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Nyomtat"
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Ment mint..."
-
-#, fuzzy
-#~ msgid "Send _message to contact..."
-#~ msgstr "FIXME: Üze_net ennek a személynek"
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Mobil"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Nyomtat"
-
-#, fuzzy
-#~ msgid "_Save"
-#~ msgstr "Mentés"
-
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Betûtípus..."
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Naptár"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Naptár"
-
-#, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "A kijelölt mappák megtekintése"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "A megbeszélés törlése"
-
-#, fuzzy
-#~ msgid "Copy"
-#~ msgstr "Vállalat"
-
-#, fuzzy
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Betûtípus..."
-
-#, fuzzy
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: _Feladat"
-
-#, fuzzy
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Következõ"
-
-#, fuzzy
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: _Feladat"
-
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: _Elem"
-
-#, fuzzy
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "FIXME: _Objektum..."
-
-#, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Tennivaló lista beállításai"
-
-#, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "Kö_vetkezõ"
-
-#, fuzzy
-#~ msgid "Paste"
-#~ msgstr "Lap"
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "E_lõzõ"
-
-#, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Oldal beállítás:"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Ébresztõ beállítások"
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Rádió"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Válasz"
-
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "Jelenidõre ugrás"
-
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Válassz mappát"
-
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Válassz mappát"
-
-#, fuzzy
-#~ msgid "_About..."
-#~ msgstr "Betûtípus..."
-
-#, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Bezár"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "_Vállalat:"
-
-#, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Szerkeszt"
-
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Keresés..."
-
-#, fuzzy
-#~ msgid "_Help"
-#~ msgstr "_Otthoni"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "_Vezetéknév:"
-
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Nyomtat"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Ébresztõ beállítások"
-
-#, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "Rádió"
-
-#, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Bezár"
-
-#, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Levél írása"
-
-#, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Levél mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "Mappák"
-
-#, fuzzy
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Szûrõ a feladón"
-
-#, fuzzy
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Szûrõ a címzettekre"
-
-#, fuzzy
-#~ msgid "Forget _Passwords"
-#~ msgstr "Jelszó"
-
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "Részletek"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "A levél nyomtatása"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Forwarded message - %s"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "A levél nyomtatása"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "Szûrõk szerkesztése"
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Leírás:"
-
-#, fuzzy
-#~ msgid "Mar_k As Read"
-#~ msgstr "Jelölés olvasottnak"
-
-#, fuzzy
-#~ msgid "Mark As U_nread"
-#~ msgstr "Jelölés nem olvasottnak"
-
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "H"
-
-#, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Levél(levelek) mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Nyomtatási elõnézet"
-
-#, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Levél _nyomtatása"
-
-#, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Mindenkinek"
-
-#, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Mindenkinek"
-
-#, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Válassz mappát"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Mutasd mind"
-
-#, fuzzy
-#~ msgid "Threaded Message list"
-#~ msgstr "Témaszerinti levél lista"
-
-#, fuzzy
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VMappa a feladóra"
-
-#, fuzzy
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VMappa a címzettekre"
-
-#, fuzzy
-#~ msgid "_Apply Filters"
-#~ msgstr "Szûrõk alkalmazása"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Mappába másolás..."
-
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Levél _nyomtatása"
-
-#, fuzzy
-#~ msgid "_Expunge"
-#~ msgstr "_Tisztít"
-
-#, fuzzy
-#~ msgid "_Filter on Subject"
-#~ msgstr "Szûrõ a témára"
-
-#, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Továbbít"
-
-#, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Levéltörzs"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Mappába mozgatás..."
-
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Levél _nyomtatása"
-
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Ment mint..."
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Forrás"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Visszaállít"
-
-#, fuzzy
-#~ msgid "_VFolder on Subject"
-#~ msgstr "VMappa a témára"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Virtuális Mappák"
-
-#, fuzzy
-#~ msgid "Attach"
-#~ msgstr "Fájl csatolása"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Jelenidõre ugrás"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Levél elküldése"
-
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Csatolj egy fájlt a levélhez"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Fájl megnyitás"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Mentés"
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Mappába mozgatás..."
-
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr ""
-#~ "Nem tudom elkészíteni a megadott mappát:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Feladó"
-
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Feladó"
-
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Feladó"
-
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "A levelet HTML formátumban küldd"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Témaszerinti levél lista"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "A levelet HTML formátumban küldd"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "A levél törlése"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "FIXME: Csatolások me_ntése..."
-
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "csatolás"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "A levél elmentése másik néven"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Megnyit..."
-
-#, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Szerkeszt"
-
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evolúció naptár csatorna"
-
-#, fuzzy
-#~ msgid "Getting _Started"
-#~ msgstr "Nem indult még el"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Vedd le ezt az elemet az indítósávról"
-
-#, fuzzy
-#~ msgid "Using the _Calendar"
-#~ msgstr "Naptár nyomtatása"
-
-#, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolúció"
-
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Megbeszélések:"
-
-#, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "Névjegy szerkesztõ"
-
-#, fuzzy
-#~ msgid "_Folder"
-#~ msgstr "Mappák"
-
-#, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Mappába menj..."
-
-#, fuzzy
-#~ msgid "_Index"
-#~ msgstr "_Beilleszt"
-
-#, fuzzy
-#~ msgid "_Settings"
-#~ msgstr "Beállítások tesztelése"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Az elemek az alábbi kategóriákhoz tartoznak:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Meglévõ mezõk"
-
-#~ msgid "External Directories"
-#~ msgstr "Külsõ könyvtárak"
-
-#~ msgid "Port Number:"
-#~ msgstr "Portszám:"
-
-#~ msgid "Outline:"
-#~ msgstr "Körvonal:"
-
-#~ msgid "Headings:"
-#~ msgstr "Fejlécek:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Üres napok:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Megbeszélések:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Kiemelt nap:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Nap számozás:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Jelenlegi nap száma:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Tennivaló, ami még nem járt le:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Tennivaló, ami ma jár le:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Tennivaló, ami lejárt:"
-
-#~ msgid "may"
-#~ msgstr "május"
-
-#~ msgid "sept"
-#~ msgstr "szept"
-
-#~ msgid "sunday"
-#~ msgstr "vasárnap"
-
-#~ msgid "monday"
-#~ msgstr "hétfõ"
-
-#~ msgid "tuesday"
-#~ msgstr "kedd"
-
-#~ msgid "tues"
-#~ msgstr "kedd"
-
-#~ msgid "wednesday"
-#~ msgstr "szerda"
-
-#~ msgid "wednes"
-#~ msgstr "szerda"
-
-#~ msgid "thursday"
-#~ msgstr "csütörtök"
-
-#~ msgid "thur"
-#~ msgstr "csüt"
-
-#~ msgid "thurs"
-#~ msgstr "csüt"
-
-#~ msgid "friday"
-#~ msgstr "péntek"
-
-#~ msgid "saturday"
-#~ msgstr "szombat"
-
-#~ msgid "fortnight"
-#~ msgstr "két hét"
-
-#~ msgid "min"
-#~ msgstr "perc"
-
-#~ msgid "sec"
-#~ msgstr "mp"
-
-#~ msgid "tomorrow"
-#~ msgstr "holnap"
-
-#~ msgid "yesterday"
-#~ msgstr "tegnap"
-
-#~ msgid "today"
-#~ msgstr "ma"
-
-#~ msgid "last"
-#~ msgstr "utolsó"
-
-#~ msgid "this"
-#~ msgstr "ez"
-
-#~ msgid "next"
-#~ msgstr "következõ"
-
-#~ msgid "first"
-#~ msgstr "elsõ"
-
-#~ msgid "third"
-#~ msgstr "harmadik"
-
-#~ msgid "fourth"
-#~ msgstr "negyedik"
-
-#~ msgid "fifth"
-#~ msgstr "ötödik"
-
-#~ msgid "sixth"
-#~ msgstr "hatodik"
-
-#~ msgid "seventh"
-#~ msgstr "hetedik"
-
-#~ msgid "eighth"
-#~ msgstr "nyolcadik"
-
-#~ msgid "ninth"
-#~ msgstr "kilencedik"
-
-#~ msgid "tenth"
-#~ msgstr "tizedik"
-
-#~ msgid "eleventh"
-#~ msgstr "tizenegyedik"
-
-#~ msgid "twelfth"
-#~ msgstr "tizenkettedik"
-
-#~ msgid "ago"
-#~ msgstr "óta"
-
-#~ msgid "Year:"
-#~ msgstr "Év:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Kérlek válassz egy dátumot amire lépni akarsz.\n"
-#~ "Ha egy napra kattintassz, arra a dátumra leszel\n"
-#~ "téve."
-
-#~ msgid "Mail Source"
-#~ msgstr "Levél forrás"
-
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "A levelezési beállításod most teljes.\n"
-#~ "Kattints a 'Befejez' gombra a mentéshez"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "'%s' küldése"
-
-#, fuzzy
-#~ msgid "Expunge \"%s\""
-#~ msgstr "_Tisztít"
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Levél mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Levél mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Kilépés a levélszerkesztõbõl"
-
-#, fuzzy
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "A levél továbbítása"
-
-#, fuzzy
-#~ msgid "Forward message \"%s\""
-#~ msgstr "A levél továbbítása"
-
-#, fuzzy
-#~ msgid "Loading \"%s\""
-#~ msgstr "Fejlécek"
-
-#, fuzzy
-#~ msgid "Create \"%s\""
-#~ msgstr "Létrehozva"
-
-#, fuzzy
-#~ msgid "Clearing message display"
-#~ msgstr "Idõ mutatása"
-
-#, fuzzy
-#~ msgid "Clear message display"
-#~ msgstr "Megjelenítés színei"
-
-#, fuzzy
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Levél meg_tekintése"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Levél mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Levél mozgatása más mappába"
-
-#, fuzzy
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Hírcsoport-szerverek"
-
-#, fuzzy
-#~ msgid "_Actions"
-#~ msgstr "_Mûveletek"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "Naptár mentése"
-
-#~ msgid "window2"
-#~ msgstr "2.ablak"
-
-#~ msgid "Create to-do item"
-#~ msgstr "Tennivaló készítése"
-
-#~ msgid "Summary:"
-#~ msgstr "Összegzés:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Lejárat:"
-
-#~ msgid "Item Comments:"
-#~ msgstr "Megjegyzések:"
-
-#~ msgid "Time display"
-#~ msgstr "Idõ mutatása"
-
-#~ msgid "Time format"
-#~ msgstr "Idõ formátum"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 órás (de/du)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 órás"
-
-#~ msgid "Weeks start on"
-#~ msgstr "A hetek kezdete"
-
-#~ msgid "Day range"
-#~ msgstr "Nap tartomány"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Kérlek add meg, hogy mikor kezdõdjön és mikor\n"
-#~ "fejezõdjön be a nap és a hét.\n"
-#~ "Az ezen kívülesõ idõpontok nem lesznek\n"
-#~ "megjelenítve."
-
-#~ msgid "Day start:"
-#~ msgstr "Nap kezdete:"
-
-#~ msgid "Day end:"
-#~ msgstr "Nap vége:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Megjelenítés színei"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Tennivaló lista mutatása:"
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Tennivaló lista stílus beállításai:"
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Lejárt elemek kivilágítása"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Világísd ki a még nem lejárt elemeket"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "A ma lejáró elemek kivilágítása"
-
-#~ msgid "To Do List"
-#~ msgstr "Tennivaló lista"
-
-#~ msgid "Preferences"
-#~ msgstr "Beállítások"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Ébresztõ kiírásánál csipogj"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Hang ébreszés idõzítése"
-
-#~ msgid " seconds"
-#~ msgstr " másodperc után"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Szundi engedése"
-
-#, fuzzy
-#~ msgid "Could not create summary"
-#~ msgstr "Nem tudom a dialógust elkészíteni."
-
-#, fuzzy
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Nem tudom beállítani a helyi tárterületet -- %s"
-
-#, fuzzy
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr ""
-#~ "Nem tudom másolni a fájlokat\n"
-#~ "'%s'-be."
-
-#, fuzzy
-#~ msgid "Could not load or create summary"
-#~ msgstr "Nem tudom a dialógust elkészíteni."
-
-#~ msgid "does not match regex"
-#~ msgstr "nem egyezik a regex-el:"
-
-#~ msgid "matches regex"
-#~ msgstr "megegyezik a regex-el:"
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Nem tudom az Evolúció levelezõ komponensét elindítani."
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Üdvözöllek az Evolúció levelezési varázslóban!\n"
-#~ "A levelezési beállításaiddal kapcsolatos információk\n"
-#~ "kitöltésével leveleket tudsz majd fogadni és küldeni.\n"
-#~ "Kattints a 'Következõ' gombra a folytatáshoz."
-
-#, fuzzy
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr ""
diff --git a/po/it.po b/po/it.po
deleted file mode 100644
index 65384ffe06..0000000000
--- a/po/it.po
+++ /dev/null
@@ -1,7871 +0,0 @@
-# Traduzione Italiana del po di Evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Clara Tattoni <clara.tattoni@libero.it>, 2000
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: Evolution 0.8\n"
-"POT-Creation-Date: 2001-02-22 15:48+0100\n"
-"PO-Revision-Date: 2001-02-17 12:13-01:00\n"
-"Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
-"Language-Team: Italiano <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Tessera:"
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nome:"
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-" Prefisso:"
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-" Dato:"
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-" Addizionale:"
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Famigila:"
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-" Suffisso:"
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data di nascita:"
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Indirizzo:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-" Casella Postale: "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-" Via:   "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-" Città:     "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-" Regione:       "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-" Codice di avviamento postale:  "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-" Stato:    "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Etichetta di spedizione: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-" Telefoni:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefono:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Programma di posta: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Fuso orario: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Posizione Geografica: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Occupazione:"
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-" Nome:"
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-" Unità:"
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-" Unità2:"
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-" Unità3:"
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-" Unità4:"
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categorie:"
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Commento:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Stringa Unica: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Chiave Pubblica: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Impossibile inizializzare Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizza"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copia dal Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copia sul Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Unisci dal Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Unisci verso il Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autore Originale:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conduit della rubrica di Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Utilità di configurazione per il conduit della rubrica di Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sincronizzazione"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stato del conduit"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nessun Pilot configurato, scegliere  prima\n"
-"le 'Proprietà di collegamento del Pilot'.  "
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Non connesso al demone gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Si è verificato un errore \n"
-"nel tentativo di scaricare\n"
-"la lista del Pilot dal \n"
-"demone gnome-pilot. "
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Il cursore non può essere caricato\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook non caricato\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Impossibile avviare il server wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Impossibile avviare wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configura l'indirizzo per il conduit"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr ""
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Aggiungi"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Anni_versario:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "_Ufficio"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Fax Ufficio"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontatti..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tegorie..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Editor dei Contatti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Dettagli"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Memorizza Come:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Generale"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Nuovo tipo di telefono"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "No_te:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Tipi di Telefono"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Email principale"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Vuole ricevere messaggi in _HTML"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Indirizzo pagina web:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Aggiungi"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Indirizzo..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Nome dell'_Assistente:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Co_mpleanno:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Ufficio"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compagnia:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Elimina"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "_Dipartimento:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Nome e Cognome..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Casa"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Titolo:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "Nome del _Manager:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "C_ellulare"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "_Nickname:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "_Ufficio:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Professione:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "_Coniuge:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "Indirizzo a cui _spedire"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Cancellare il Contatto?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Questo contatto appartiene a queste categorie:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistente"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Ufficio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Ufficio2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Fax Ufficio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Richiamare"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Ditta"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Casa 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Cellulare"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Altro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Altro fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Impaginatore"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Principale"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Indirizzo _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Controlla Indirizzo"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Stato:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finlandia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Indirizzo:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Città:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Casella Postale:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stato/Provincia:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/CAP:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Verifiare Nome e Cognome"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dott."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Egr."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Sig.na"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Sig."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Sig.ra"
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Sig.ra"
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Nome:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Cognome:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Secondo nome:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "S_uffisso:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titolo:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Come _Minicards"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Come _Tabella"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Inserire la password per %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Impossibile aprire la rubruca"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Impossibile aprire questa rubruca.  Questo significa che \n"
-"è stata inserita una URI non corretta, oppure che si è\n"
-"cercato di accedere a un server LDAP senza avere il supporto \n"
-"LDAP compilato.  Se si è inserita una URI, controllarne \n"
-"la correttezza ed inserirla nuovamente.  Altrimenti, è \n"
-"probabile che si sia cercato di accedere ad un server LDAP. \n"
-"Se si desidera usare LDAP, è necessario scaricare e \n"
-"installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Mostra Tutto"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avanzato..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Qualunque campo contiene"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Il nome contiene"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "Email contiene"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI visualizzata dal Browser delle cartelle"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Altri Contatti"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "File"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Tipo di rubrica sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Nessuno (modo anonimo)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Password"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Tipo di auth sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Tipo di ambito sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Ricorda questa password"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Host:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Porta:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Root DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Ambito della Ricerca:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autenticazione:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Percorso:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Crea il path se non esiste"
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Modifica Rubrica"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Aggiungi rubrica"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Elimina"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Modifica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Componente di Evolution per gestire i contatti."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Trova..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatari del messaggio:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleziona Nomi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleziona un nome da:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Cerca"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Salva come VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Cliccare qui per aggiungere un contatto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organizzazione"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Sito Internet"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Dipartimento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Ufficio"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Posizione"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Professione"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Manager"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Nickname"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Coniuge"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Fare clic qui per aggiungere un contatto"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Salva nella rubrica"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Non c'è niente da mostrare in questa vista\n"
-"\n"
-"Fare doppio click qui per creare un nuovo contatto."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Moduli bianchi alla fine:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corpo"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Inferiore:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensioni:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Carattere..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Caratteri"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Note a piè di pagina:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formato"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Intestazione"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Intestazione/Note a piè di pagina"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Titoli"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Titolo per ogni lettera"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Altezza:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Concatenati l'un l'altro"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Includi:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Orizzontale"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Sinistra:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Lettere sul bordo"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margini"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Numero di colonne:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opzioni"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientazione"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Pagina"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Impostazione pagina:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Carta"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Alimentazione della carta:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Verticale"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Anteprima:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Stampa usando ombreggiatura grigia"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Inverti le pagine pari"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Destra:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sezioni:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Ombreggiatura"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Dimensione:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Inizia su una nuova pagina"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nome dello stile:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Superiore:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Tipo:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Larghezza:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conduit per il Calendario di Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-"Utilità di configurazione per il conduit del calendario di Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Errore durante la comunicazione con il server del calendario"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Impossibile leggere il blocco di applicazione del Calendario"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configura il conduit di GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Conduit per il Calendario di Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configura il todo conduit"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo conduit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo Conduit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilità di configurazione per il conduit di Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Promemoria appuntamento alle "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Suoneria"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "File non trovato"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Apri calendario"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Salva calendario"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Impossibile creare la vista del calendario.  Controllare le impostazioni di "
-"ORBit e di OAF"
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Pubblico"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Privato"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Confidenziale"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Trasparente"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Opaco"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La data deve essere inserita nel formato:\n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posizione geografica deve essere inserita nel formato:\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "La priorità dev'essere compresa tra 1 e 9, inclusi"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normale"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Ricorre"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Assegnato"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Sì"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "No"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Errore nel caricare il calendario</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Visualizza"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Mostra appuntamenti"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Mostra obiettivi"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Caricamento del Calendario"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI che il calendario visualizzerà"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Avviso alle %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Indice non disponibile."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Chiudi"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Modifica appuntamenti"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Suoneria (minuti)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minuti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minuti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 ore (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 ore"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minuti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minuti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Interruzione avviso sonoro dopo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Avviso Sonoro"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Emette un suono quondo appare la finestra di avviso"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Calendario"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Preferenze del Calendario"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colori"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Comprimi i fine settimana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Opzioni del navigatore delle date"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Predefinito"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Visualizza opzioni"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Scadenza"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Attiva la suoneria per "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Fine della giornata: "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Primo giorno della settimana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Venerdì"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Evidenzia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Scadenze per oggi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Scadenze per oggi:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Non ancora scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Non ancora scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Lunedì"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Compiti scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Compiti scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Prendi un colore"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Priorità"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Ricordami tutti gli appuntamenti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Promemoria"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Sab"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Sabato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Mostra i termini dell'appuntamento"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Mostra i numeri delle settimane"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Inizio della giornata:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Domenica"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaskPad"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Gio"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Giovedì"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Cronometra fino al termine"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Suddivisione del tempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Formato del tempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Martedì"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Avviso visivo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Mercoledì"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Settimana lavorativa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minuti prima che inizino."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "secondi."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sei sicuro di voler cancellare questo appuntamento senza nome?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sei sicuro di voler cancellare quest'obiettivo senxa nome?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Sei sicuro di voler cancellare questa voce dell'agenda senza nome?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Salvare le modifiche?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Annullato"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Classificazione"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Completato"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Data  e Ora"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Completato in data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Altezza"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In corso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Basso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Da cominciare"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vato"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "In corso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Pub_blico"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data di _inizio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "_Indice:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Obiettivo"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Non definito"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Confidenziale"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contatti..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Sca_denza:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorità:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Modifica Obiettivo"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Niente indice"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamento - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Obiettivo - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Voce nell'agenda - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Categorie"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Ultimato il"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Termine"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Inizio"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Posizione Geografica"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Percentuale completata"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Indice"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Trasparenza"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Avvisi Sonoro"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Fare clic qui per aggiungere un obiettivo"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Segna come Completato"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Segna l'obiettivo come raggiunto"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Modifica questo obiettivo..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Modifica obiettivo"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Elimina questo obiettivo"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Elimina questo obiettivo"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisioni per minuto"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nuovo appuntamento..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Pianifica una Riunione"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Modifica questo appuntamento..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Elimina questo appuntamento"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Rendi rimandabile questo appuntamento"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Elimina questa ricorrenza"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Elimina tutte le ricorrenze"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Impossibile aggiornare il file del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Compnente aggiornata con successo."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Si é verificato un errore nel caricare il file del calendario."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Impossibile aprire il file del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Impossibile caricare il file del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Impossibile leggere il file del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Questa é la risposta di qualcuno che non era stato invitato!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Impossibile aggiornare l'archivio del calendario."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Impossibile cancellare il componente del calendario!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Componente aggiornato con successo."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Tipo di componente del calendario non riconosciuto."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Aggiungi al Calendario"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Accetta"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Annulla"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativo"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Aggiorna Calendario"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Annulla Riunione"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%p %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--a--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Messaggio del Calendario"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Data:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Caricamento del calendario..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizzatore:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Mittente"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Indice:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "termine"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "inizio"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Indirizzo del partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Partecipanti:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annulla \n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Inviti alla riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Partecipante Opzionale"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizzatore: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Pubblica\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Richiesta\n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Partecipante Richiesto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Ruolo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1171
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Tutti"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Impossibile caricare l'obiettivo in `%s'"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Il metodo richiesto per caricare `%s' non è supportato"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Eventi della giornata"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Appuntamenti di Base:"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Ricorrenza personalizzata"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Ogni"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Eccezioni"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifica"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Nessuna Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Emetti un suono"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Anteprima"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regole di ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Esegui programma"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Invia un email"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Impostazioni..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Mostra un dialogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Semplice ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ora di _fine:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Ora di inizio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data di _inizio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "dopo"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "prima"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "giorno(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "termine dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "per"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "Ora (e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minuto(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mese(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "inizio dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "fino a"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "Settimana(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "anno(i)"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Modifica Appuntamenti"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "giorno"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "ricorrenze"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Questo appuntamento contiene ricorrenze che Evolution non può modificare."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d giorni"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 giorno"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d settimane"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 settimana"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d ore"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 ora"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuti"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minuto"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondi"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 secondo"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " prima dell'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " dopo l'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " prima della fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " dopo la fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visore iTip/iMip del calendario di Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Componente di Evolution per gestire il calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Impossibile aprire la cartella in `%s'"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Il metodo richiesto per aprire `%s' non è supportato"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Aprile"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Agosto"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Dicembre"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Febbraio"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Vai alla data"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Vai a oggi"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Gennaio"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Luglio"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Giugno"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Marzo"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Maggio"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "Novembre"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Ottobre"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "Settembre"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Impossibile inizializzare GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Do"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Lu"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Ma"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Me"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Gi"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Ve"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Sa"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Obiettivi"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Data odierna (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Settimana corrente (%s  - %s) "
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Mese corrente (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Anno corrente (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Stampa Calendario"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Anteprima di stampa"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "La URI della cartella degli obiettivi da visualizzare"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "DLMMGVS"
-
-#: camel/camel-filter-driver.c:773
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Errore nel filtro di smistamento: %s: %s"
-
-#: camel/camel-filter-driver.c:778
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Errore nell'esecuzione del filtro: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Impossibile filtrare l'espressione di ricerca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Errore nell'esecuzione della ricerca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) richiede un singolo risultato booleano"
-
-#: camel/camel-folder-search.c:549
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "É stata effettuata una ricerca su un header sconosciuto: %s"
-
-#: camel/camel-folder-search.c:658 camel/camel-folder-search.c:695
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Impossibile creare il file di blocco per %s; %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Tempo scaduto nel tentativo di prendere il file di lock %s.  Riprovare più "
-"tardi."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Rimozione del lock usando fcntl(2) non riuscita: %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Rimozione del lock usando flock(2) non riuscita: %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Impossibile controllare il file di posta %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Impossibile aprire il file di posta %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Impossibile aprire il file di posta temporaneo %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Impossibile verificare il file di blocco per %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Errore nella lettura del file di posta: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Errore nella scrittura del file temp di posta: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Fallita l'archiviazione della posta nel file temporaneo %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Impossibile ridirigere: %s  "
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Impossibile fare un fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Fallito lo spostamento della posta: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Errore sconosciuto)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Impossibile caricare %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s servizio per %s su  %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Connessione annullata"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Impossibile connettersi a %s (porta %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(host sconosciuto)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operazione annullata"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' necessita di un componente per lo username "
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' necessita di un componente per l'host"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' necessita di un componente per il percorso"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "NOn c'è l'host %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporaneamente incapace di cercare il nome dell'host %s."
-
-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "Fornitore di cartelle email virtuali "
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nessun fornitore disponibile per il protocollo `%s'"
-
-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Impossibile creare la directory %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La stringa URL `%s' non contiene protocolli "
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La stringa URL `%s' contiene un protocollo non valido"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "IL numero della porta nella stringa URL `%s' non è numerico"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Impossibile avere il ticket di Kerberos:\n"
-" %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Cattiva risposta di autenticazione dal server."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Risposta inaspettata dal server IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Comando IMAP fallito: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
-msgid "Unknown error"
-msgstr "Errore sconosciuto"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "La risposta del server è terminata troppo presto."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "La risposta del server IMAP non contiene informazione %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Risposta OK inattesa dal server IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Impossibile caricare l'indice per %s"
-
-#: camel/providers/imap/camel-imap-folder.c:708
-#: camel/providers/imap/camel-imap-folder.c:870
-msgid "Could not find message body in FETCH response."
-msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Per leggere e archiviare la posta sui server IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Questa opizone si connette al server IMAP usando una password di testo "
-"semplice."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Con questa ci si connette al server IMAP usando Kerberos 4 per "
-"l'autenticazione."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sInserire la password IMAP per %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Non in grado di autenticare al server IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Impossibile creare la directory %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Formato MH di UNIX delle directory della posta"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "File di mailbox standard per Unix"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Per archiviare la posta locale in formato mbox standard"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "File di posta UNIX qmail maildir-format"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Per archiviare la posta locale nelle directory qmail maildir"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Impossibile avere la cartella %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-#, fuzzy
-msgid "Local stores do not have an inbox"
-msgstr "Gli archivi locali non hanno una cartella-radice"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "File di posta locale: %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Impossibile rinominare la cartella %s con %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Impossibile prendere il messaggio: %s\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Messaggio assente"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Contenuto del messaggio non valido"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile aprire la cartella `%s':\n"
-"%s "
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "La cartella `%s' non esiste."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile creare la cartella `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' non è una directory maildir."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Impossibile cancellare la cartella `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "non è una directory maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Impossibile aprire la casella di posta: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Impossibile prendere il messaggio: %s dalla cartella: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "La cartella appare irrimediabilmente corrotta."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Impossibile il file %s:\n"
-"%s "
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Impossibile creare il file `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' non è un file regolare."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile cancellare la cartella `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "La Cartella `%s' non è vuota.  Non cancellata."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Creazione indice della cartella"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Impossibile aprire la cartella: %s: indice creato a partire dalla posizione "
-"%ld: %s "
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Errore fatale di simistamento della posta vicino alla posizione %ld nella "
-"cartella %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Impossibile creare indice per la cartella: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1270
-msgid "Synchronising folder"
-msgstr "Sincronizzazione cartella"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Impossibile creare una mbox temporanea: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Indice e cartella non corrispondono, nemmeno dopo una sincronizzazione"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Errore di scrittura nella mbox temporanea: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Impossibile chiudere la cartella sorgente %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Impossibile chiudere la cartella temporanea: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Impossibile rinominare la cartella: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Errore sconosciuto: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' non è una directory."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Inserire la passwoed NNTP di %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Username rifiutato dal server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Fallito l'invio dello username al server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Il server ha rifiutato username/password"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Messaggio %s non trovato."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Impossibile prendere la lista dei gruppi dal server."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Impossibile caricare il file con la lista dei gruppi di %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET news"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Questo è un fornitore per la lettura e l'invio a newsgroups USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Impossibile aprire la directory per il news server: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET News via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Con questa opzione l'autenticazione con il server NNTP avviene usando una "
-"password in testo semplice."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Ricezione indice POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Nessun messaggio con uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Ricezione messaggio POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Per la connessione ai server POP.  Il protocollo POP può anche essere usato "
-"per scaricare la posta da fornitori di servizi di posta via web e sistemi di "
-"posta proprietari."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Con questa opzione ci si connette al server POP usando una password in testo "
-"semplice. Questa è la sola opzione supportata da molti server POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Con questa opzione ci si connette al server POP usando una password cifrata "
-"attraverso il protocollo APOP.  Potrebbe non funzionare per tutti gli utenti "
-"anche su server che affermano di supportarlo. "
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Con questa ci si connette al server POP usando Kerberos 4 per "
-"l'autenticazione."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Impossibile autenticare il KPOP server: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Impossibile connettersi al server POP su %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPrego inserire la password del POP3 di %s@%s "
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Impossibile connettersi al server POP.\\n\n"
-"Errore nell'invio dello username: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Sconosciuto)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Impossibile connettersi al server POP.\\n\n"
-"Non è presente il supporto per il meccaniscmo di autenticazione richiesto."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Impossibile connettersi al server POP.\\n\n"
-"Errore nell'invio della password: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Cartella `%s' non presente."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Per consegnare la posta passandola al programma \"sendmail\" sul sistema "
-"locale."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Impossibile creare una ridirezione verso sendmail: %s: posta non inviata"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Impossibile effettuare fork di sendmail: %s: posta non inviata"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Impossibile inviare il messaggio: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail terminato con il segnale %s: posta non inviata."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Impossibile eseguire %s: posta non inviata."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail terminato con lo status %d: posta non inviata."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Posta consegnata attraverso il programma sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Errore di sintassi, comando non riconosciuto"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Errore di sintassi nei parametri o negli argomenti"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Comando non implementato"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Parametro del comando non implementato"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Stato del sistema, o risposta di aiuto del sistema"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Messaggio di Aiuto"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Servizio pronto"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Il servizio sta chiudendo il canale di trasmissione"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "L'azione di posta richiesta è corretta, completata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"L'azione di posta richiesta non è stata effettuata: casella non disponibile"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Azione richiesta non effettuata: casella non disponibile"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Azione richiesta interrotta: errore di processo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Utente non locale; tentare <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Azione richiesta non effettuata: archivio di sistema insufficiente"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"L'azione di posta richiesta è stata interrotta: si è ecceduta l'allocazione "
-"per l'archivio"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"L'azione di posta richiesta non è stata effettuata: il nome della casella "
-"non è permesso"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Inizio dell'imput della posta, termin con <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transazione fallita"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Non è richiesta autenticazione"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Con questa opzione ci si connette al server SMTP senza alcun tipo di "
-"autenticazione. Questa opzione dovrebbe andare bene per connettersi alla "
-"maggior parte dei server SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Con questa ci si connette al server SMTP usando l'autenticazione CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Posta SMTP consegnata attraverso il programma %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Impossibile inviare il messaggio: l'indirizzo del mittente non è stato "
-"definito."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-"Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Impossibile inviare il messaggio: senza destinatari."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Richiesta di HELO scaduta: %s: non fatale"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Richiesta MAIL FROM scaduta: %s: posta non inviata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Errore nella risposta MAIL FROM: %s: posta non inviata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "La richiesta di RCPT TO: %s: posta non inviata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Errore nella risposta di RCPT TO: %s: posta non inviata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Errore nella risposta di DATA: %s: posta non inviata."
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
-"posta non inviata."
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"Errore nella risposta di DATA: terminazione del messaggio: %s posta non "
-"inviata."
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Richiesta RSET scaduta: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Errore nella risposta di RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Richiesta QUIT scaduta: %s: non fatale"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Errore nella risposta di QUIT: %s: non fatale<"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "allegato"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Allega un file"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Rimuovere"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Aggiungere allegato..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Allegare un file al messaggio"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr "Allegato"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Proprietà dell'allegato"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nome del file:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "allegato inlinea"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Invia come :"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Da:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Cliccare qui per la rubrica"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Inserire l'identità dalla quale si vuole inviare questo messaggio"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Inserire i destinatari del messaggio"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
-"senza apparire nell'elenco dei destinatari del messaggio."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Inserire l'oggetto dell'email"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Impossibile aprire il file firma: %s\n"
-"%s "
-
-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "Salva come..."
-
-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Errore nel salvare il file: %s"
-
-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Errore nel caricare il file: %s"
-
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Questo messaggio non è stato inviato\n"
-"\n"
-"Salvare le modifiche?"
-
-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "Apri file"
-
-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "Il file noon esiste."
-
-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "Non è un file regolare."
-
-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "File esistente ma illeggibile."
-
-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
-
-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Questo file è molto grande (più di 100K).\n"
-"Inserire ugualmente?"
-
-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "Si è verificato un errore durante le lettura del file."
-
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "Componi un nuovo messaggio"
-
-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr "Impossibile creare la finestra di composizione."
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Impossibile inizializzare il composer di Evolution."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "biglietto da visita"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "informazioni sul calendario"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componente di Evolution per il sommario esecutivo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"É possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
-"Esecutivo.\n"
-"\n"
-"Lasciare in bianco per la pagina predefinita. "
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Apre %s con l'applicazione di GNOME predefinita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Apre %s con il browser di GNOME predefinito"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Invia un email a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Cambia la vista con %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Esegui %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Chiudi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Sposta %s a sinistra"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Sposta %s a destra"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Sposta %s alla riga precedente"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Sposta %s alla riga successiva"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configura %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Impossibile aprire il file HTML:\n"
-"%s "
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Errore nella lettura dei dati: \n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Il file non ha un posto per i servizi.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aspetto"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Il componente del sommario esecutivo non riesce a inizializzare Bonobo.\n"
-"Nel caso ci sia un messaggio circa il RootPOA, probabilmente significa che\n"
-"Bonobo é stato compilato con GOAD invece che con OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Indice RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Prova servizio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Prova servizio"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Errore"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Aggiorna automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Aggiorna adesso"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Aggiorna ogni "
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuti"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "anno"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "anni"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mese"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mesi"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "settimana"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "settimane"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "giorni"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "Ora"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "Ore"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "Minuto"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "secondo"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " secondi"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oops. Ti sei dimenticato di scegliere una data."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oops. Hai scelto un adata non valida"
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La data del messaggio verrà confrontata\n"
-"con la data di avvio del filtro o di apertura\n"
-"del vfolder, qualunque essa sia"
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La data del messaggio verrà confrontata\n"
-"con quella specificata qui."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La data del messaggio verrà confrontata\n"
-"con una data relativa all'avvio del filtro;\n"
-"\"una settimana fa\", ad esempio."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "L'ora corrente"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "una data specifica"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "una data relativa a quellla corrente"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Confronta con"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "adesso"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<clicca qui per selezionare una data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Aggiungi una regola di Filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Modifica le Regole per il Filtro"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "In entrata"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "In uscita"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Modifica Filtri"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Di"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Aggiungi Azione"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Rimuovi azione"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, ti sei dimenticato di scegliere una cartella.\n"
-"Tornare indietro e specificare una cartella valida per consegnarvi la posta."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Scegli Cartella"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Inserire la URI della Cartella"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<clicca qui per selezionare una cartella>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Errore nell'espressione regolare `%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nome della Regola:"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Senza nome"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Se"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Esegui le azioni"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "se tutti i criteri sonon soddisfatti"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "se qualche criterio è soddisfatto"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Aggiungi criterio"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Rimuovi criterio"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Risposto a"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Importante"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Leggi"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Modifica VFolder"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Regole dei Filtri"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "In entrata:"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "In uscita:"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Cartelle Virtuali"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Sorgenti delle cartelle virtuali"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Assegna Colore"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Assegna un punteggio"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copia nella Cartella"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data di Ricezione"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data di spedizione"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Espressione"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Inoltra all'Indirizzo"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo del messaggio"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Header del messaggio"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Il messaggio è stato ricevuto"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Il messaggio è stato inviato"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Sposta nella Cartella..."
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatari"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Corrispindenza con l'espressione regolare"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Punteggio"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Imposta _Status"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Sorgente"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Specifica header"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Arresta processo in corso"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1172
-msgid "Subject"
-msgstr "Oggetto"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contiene"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non finisce con"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non esiste"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "non assomiglia a"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non comincia per"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "finisce per"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "esiste"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "è maggiore di"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "è minore di"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non è"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "è"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "alle o dopo"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "Alle o prima"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "Assomiglia a"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "comincia per"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "era dopo"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "era prima"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Aggiungi Regola"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Modifica le Regole di punteggio"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Aggiungi regola per Cartella Virtuale"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Modifica le regole per VFolder"
-
-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Impossibile inizializzare il componente della posta di Evolution."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Archivia la ricerca come Cartella Virtuale"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Corpo o oggetto contengono"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Il corpo contiene"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "L'Oggetto contiene"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Il Corpo non contiene"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "L'Oggetto non contiene"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Il Mittente contiene"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Cartella Virtuale per Oggetto"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Cartella Virtuale per Mittente"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Cartella Virtuale per Destinatari"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtra sull'Oggetto"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtro sul Mittente"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtro sui Destinatari:"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtra sulla Mailng List"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Apri"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Salva con nome..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Stampa"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Rispondi al Mittente"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Rispondi a Tutti"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Inoltra"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Vai avanti"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Segna come Letto"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Segna come Non Letto"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Sposta nella Cartella..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copia nella Cartella..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Ripristina"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Applica Filtri"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Crea Regola dal Messaggio"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtra sulla Mailng List (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Componente di Evolution per gestire la posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compositore della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componente dell'indice esecutivo della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componente di Evolution per visualizzare le cartelle di posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importa file di Outlook Express 4 in Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importa mbox file in Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato corrente di archiviazione:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Formato della Mailbox"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nuovo formato di archiviazione:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Avvertenza: durante la conversione di formati di mailbox,\n"
-"un errore (come una mancanza di spazio su disco) può non essere\n"
-"recuperabile automaticamente.  Usare con cautela."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nessuno "
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr "(predefinito)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Gestione degli Account di Evolution"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Uno o più server non sono stati correttamente configurati.\n"
-"Si desidera salvare comunque?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Editor degli Account di Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail a %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Oggetto è %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail da %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailing list"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Non è stato configurato il client di posta.\n"
-"È necessario farlo prima di poter inviare,\n"
-"ricevere o scrivere posta.\n"
-"Si desidera configurarlo subito?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"È necessario configurare un' identità\n"
-"prima di poter comporre una email."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"È necessario configurare un trasporto\n"
-"della posta prima di comporla."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Non è stato impostato un sistema di trasporto per la posta"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Questo messaggio non ha l'oggetto.\n"
-"Inviare lo stesso?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"È necessario configurare un' identità prima di poter inviare questa email."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "È necessario specificare dei destinatari per inviare questo messaggio."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Su %s, %s ha scritto:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Messaggio inoltrato:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Sposta messaggio(i) in"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Copia messaggio(i) in"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"È possibile modificare solo i messaggi\n"
-"salvati nella cartella Bozze."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Sovrascrivere il file?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Esiste già un file con questo nome.\n"
-"Sovrascriverlo?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Salva Messaggio con nome..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Salva messaggi con nome..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Errore nel caricare le informazioni dei filtri:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Stampa Messaggio"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Stampa Messaggio non riuscita"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Account"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Informazioni sull'Account"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Gestione degli Account"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Proprietà dell'Account"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Tipo di Autenticazione:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Controlla la posta automaticamente ogni"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Verifica Impostazioni"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Complimenti, la configurazione della posta é completa.\n"
-"\n"
-"Siete pronti a mandare e ricevere email\n"
-"usando Evolution.\n"
-"\n"
-"Cliccare su \"Fine\" per salvare le impostazioni."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Predefinito"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Completato"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "Indirizzo Email:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "Indirizzo Email:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Configurazione della Posta di Evolution"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Nome e cognome:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Hostname:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identità"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Server della Posta in entrata"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Non cancellare i messaggi dal server"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Posta"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Account di Posta"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "Configurazione della Posta"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Configurazione guidata della Posta"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "Imposta come mio account predefinito"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr "Segna i messaggi come \"Letti\" dopo:"
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Varie"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "News"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Opzionale"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organizzazione:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Server della Posta in Uscita"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Password:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Testo semplice"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Ricezione Email"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Ricorda la mia password"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Rispondi-a:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Richiesto"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Salva password"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Scegliere il file con la firma"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Invia la posta in formato HTML come predefinito."
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Invio Email"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Configurazione del Server"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Tipo di Server:"
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Il Server richiede l'autenticazione"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Server"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "File con la firma:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Firma:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Sorgenti"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Questo server richiede una connessione sicura (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Inserire il nome con il quale si desidera riferirsi a questi server. Per "
-"esempio: \"Lavoro\" o \"Casa\"."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Informazioni Utente"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Username:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Configurazione guidata della Posta, benvenuti.\n"
-"\n"
-"Cliccare \"successivo\" per cominciare."
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "minuti"
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Verifica della configurazione per la posta in entrata non riuscita.\n"
-"Si potranno verificare dei problemi scaricando la posta da %s"
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Spazio per il Nome:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Verifica della configurazione per la posta in uscita non riuscita.\n"
-"Si potranno verificare dei problemi inviando la posta con %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Guida agli Account di Evolution"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Salva Allegati"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Impossibile creare una directory temporanea: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Salva su Disco..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Apri in %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Visualizza In linea"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Visualizzatore Esterno"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "View Inline (via %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Nascondi"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s allegato"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Caricamento del contenuto del messaggio"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Messaggi cifrati non visualizzati"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Messaggio cifrato"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Cliccare l'icona per decifrare."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1404
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1412
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Questo messaggio ha una firma digitale di cui non è possibile provare "
-"l'autenticità."
-
-#: mail/mail-format.c:1622
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntatore al sito FTP (%s)"
-
-#: mail/mail-format.c:1634
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
-
-#: mail/mail-format.c:1638
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntatore a un file locale (%s)"
-
-#: mail/mail-format.c:1672
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
-
-#: mail/mail-format.c:1677
-msgid "Malformed external-body part."
-msgstr "Parte esterna del messaggio malformata."
-
-#: mail/mail-local.c:728
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
-
-#: mail/mail-local.c:732
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
-
-#: mail/mail-local.c:756
-msgid "Reconfiguring folder"
-msgstr "Riconfigura Cartella"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:785
-msgid "Closing current folder"
-msgstr "Chiusura cartella corrente"
-
-#: mail/mail-local.c:817
-msgid "Renaming old folder and opening"
-msgstr "Rinomina vecchia cartella e apertura in corso"
-
-#: mail/mail-local.c:835
-msgid "Creating new folder"
-msgstr "Creazione nuova cartella"
-
-#: mail/mail-local.c:849
-msgid "Copying messages"
-msgstr "Copia messaggi"
-
-#: mail/mail-local.c:870
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Impossibile salvare le metainfo della cartella; probabilmente non \n"
-"sarà più possibile riaprire questa cartella: %s"
-
-#: mail/mail-local.c:909
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Se non si riesce più ad aprire questa mailbox, può essere necessario\n"
-"ripararla manualmente."
-
-#: mail/mail-mt.c:92
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Errore durante '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:94
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Errore durante l'operazione:\n"
-"%s"
-
-#: mail/mail-mt.c:393 mail/mail-mt.c:422
-msgid "Working"
-msgstr "Sto lavorando"
-
-#: mail/mail-ops.c:518
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Invio di \"%s\" in corso"
-
-#: mail/mail-ops.c:520
-msgid "Sending message"
-msgstr "Invio messaggio"
-
-#: mail/mail-ops.c:746
-msgid "Saving message to folder"
-msgstr "Sposta il messaggio in una nuova cartella"
-
-#: mail/mail-ops.c:819
-#, fuzzy, c-format
-msgid "Moving messages to %s"
-msgstr "Sposta messaggio(i) in"
-
-#: mail/mail-ops.c:819
-#, fuzzy, c-format
-msgid "Copying messages to %s"
-msgstr "Copia messaggi"
-
-#: mail/mail-ops.c:836
-msgid "Moving"
-msgstr "Spostamento in corso"
-
-#: mail/mail-ops.c:839
-msgid "Copying"
-msgstr "Copia in corso"
-
-#: mail/mail-ops.c:850
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s messaggio %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:921
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Scansione delle cartelle in \"%s\" in corso"
-
-#: mail/mail-ops.c:1033
-msgid "Forwarded messages"
-msgstr "Messaggio inoltrato"
-
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1208
-#, c-format
-msgid "Opening folder %s"
-msgstr "Apertura cartella %s"
-
-#: mail/mail-ops.c:1139
-#, c-format
-msgid "Opening store %s"
-msgstr "Apertura archivio %s"
-
-#: mail/mail-ops.c:1320
-msgid "Expunging folder"
-msgstr "Eliminazione cartella"
-
-#: mail/mail-ops.c:1369
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Scaricamento del messaggio %s"
-
-#: mail/mail-ops.c:1436
-msgid "Retrieving messages"
-msgstr "Scaricamento messaggi"
-
-#: mail/mail-ops.c:1446
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1520
-msgid "Saving messages"
-msgstr "Salvataggio messaggi"
-
-#: mail/mail-ops.c:1599
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Impossibile creare il file di output: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1612
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvare messaggio %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1626
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Errore nel salvare i messaggi in: %s\n"
-"%s"
-
-#: mail/mail-ops.c:1700
-msgid "Saving attachment"
-msgstr "Salvataggio Allegati"
-
-#: mail/mail-ops.c:1715
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Impossibile creare il file di output: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1743
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Impossibile srivere i dati: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Cerca"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Annullamento..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Invia e Ricevi la posta"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Ricezione"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "Aggiornamento in corso..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "In Attesa..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Invio"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Annullato."
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Completato."
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "E` stato scritto un messaggio incompleto nella pipe!"
-
-#: mail/mail-tools.c:199
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Impossibile creare una mbox temporanea `%s': %s"
-
-#: mail/mail-tools.c:257
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (messagio inoltrato)"
-
-#: mail/mail-tools.c:267
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (nessun oggetto)"
-
-#: mail/mail-tools.c:284
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Messaggio inoltrato - %s"
-
-#: mail/mail-tools.c:286
-msgid "Forwarded message (no subject)"
-msgstr "Messaggio inoltrato (senza oggetto)"
-
-#: mail/mail-tools.c:365
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Impossibile aprire la location`%s':\n"
-"%s "
-
-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "Cartelle virtuali"
-
-#: mail/mail-vfolder.c:321
-msgid "New VFolder"
-msgstr "Nuova Cartella Virtuale"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Rispondi"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Rispondi all'autore di questo messaggio"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Rispondi a tutti i destinatari di questo messaggio"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Inoltra questo messaggio"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Stampa il messaggio selezionato"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Elimina questo messaggio"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Non visto"
-
-#: mail/message-list.c:621
-msgid "Seen"
-msgstr "Visto"
-
-#: mail/message-list.c:624
-msgid "Answered"
-msgstr "Risposto"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Messaggi Multipli Non Visti"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Messaggi Multipli"
-
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
-
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<Sconosciuto>"
-
-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "Oggi %I:%M %p"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "Ieri %l %M %p"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %I:%M %p"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1171
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1172
-msgid "From"
-msgstr "Da"
-
-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "Ricevuto"
-
-#: mail/message-list.c:1173
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "Dimensione"
-
-#: mail/openpgp-utils.c:84
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Digitare la %s passphrase per %s"
-
-#: mail/openpgp-utils.c:87
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Digitare la %s passphrase"
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
-msgid "No GPG/PGP program available."
-msgstr "Programma GPG/PGP non disponibile."
-
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
-msgid "No password provided."
-msgstr "Non è stata fornita alcuna password."
-
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
-
-#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
-msgid "No recipients specified"
-msgstr "Nessun destinatario specificato"
-
-#: mail/openpgp-utils.c:1067
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Impossibile creare file temporaneo: %s  "
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Cartella"
-
-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "Archivio"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "Visualizza le cartelle a partire da:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Sottoscrivere cartella \"%s\" "
-
-#: mail/subscribe-dialog.c:282
-#, fuzzy, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Annullare sottoscrizione cartella \"%s\""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome della cartella:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Tipo di cartella:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Specificare dove creare la cartella:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:156
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importazione di %s\n"
-"Importatore non pronto.\n"
-"Attendere 5 secondi per riprovare."
-
-#: shell/importer/importer.c:174 shell/importer/importer.c:201
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto %d."
-
-#: shell/importer/importer.c:308
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Non c'é un importatore adatto a gestire\n"
-"%s"
-
-#: shell/importer/importer.c:318
-msgid "Importing"
-msgstr "Importazione"
-
-#: shell/importer/importer.c:326
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importazione di %s.\n"
-"Avvio di %s"
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid "Error loading %s"
-msgstr "Errore nel caricare: %s"
-
-#: shell/importer/importer.c:356
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto 1."
-
-#: shell/importer/importer.c:427
-msgid "Automatic"
-msgstr "Automatico"
-
-#: shell/importer/importer.c:477
-msgid "Filename:"
-msgstr "Nome del file:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:482
-msgid "Select a file"
-msgstr "Scegliere un file"
-
-#: shell/importer/importer.c:492
-msgid "File type:"
-msgstr "Tipo di file:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:573
-msgid "Import"
-msgstr "Importa"
-
-#: shell/importer/importer.c:606
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Scegliere il file che si vuole importare in Evolution, e selezionare che "
-"tipo di file sia dalla lista.\n"
-"\n"
-"Si può selezionare \"Automatico\" se non si conosce, Evolution tenterà di "
-"arrangiarsi."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Utilità Inportazione di Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Utilità Importatore di Evolution"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Utilità di Importazione di Evolution, benvenuti.\n"
-"Questa guida vi accompagnerà attraverso il processo \n"
-"di importazione di file esterni in Evoution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Installazione di Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Questa nuova versione di Evolution richiede l'installazione di file \n"
-"addizionali nella directory personale di Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Cliccare \"OK\" per installare i files, o \"Annulla\" per uscire."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Impossibile aggiornare i file correttamente"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "File di Evolution installati con successo."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Sembra che si stia usando Evolution per la prima volta. "
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Cliccare \"OK\" per installare i files di utente di Evolution sotto"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Impossibile creare la directory\n"
-"%s\n"
-"Errore: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Impossibile copiare i file in\n"
-"`%s'"
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Il file `%s' non è una directory.\n"
-"Spostarla per permettere l'installazione\n"
-"dei file utente di Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"La directory `%s'  esiste ma non è la \n"
-"directorydi Evolution. Spostarla per permettere \n"
-"l'installazione dei file utente di Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Impossibile creare la cartella specificata:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Il nome specificato della cartella non è valido."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crea nuova cartella"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Il tipo di cartella selezionata non è valido\n"
-"per l'operazione richiesta. "
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nuovo..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Senza nome)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy non può essere eseguito."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution è una suite di applicazioni groupware\n"
-"per posta, calendario e gestione dei contatti\n"
-"nell'ambito dell'ambiente GNOME desktop.  "
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Vai alla cartella..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Nessuna cartella mostrata)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Cartelle"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s -Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Impossibile impostare il local storage --%s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ooops! La visualizzazione di `%s' è morta inaspettatamente. :-(\\n\n"
-"Il che significa che probabilmente il componente %s si è impallato"
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Crea un nuovo gruppo di collegamento "
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nome del Gruppo:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Si desidera veramente rimuovere il gruppo\n"
-"`%s' dalla barra dei collegamenti?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Non rimuovere"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Icone _Piccole"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Mostra i collegamenti come icone piccole "
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Icone _Grandi"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Mostra i collegamenti come icone grandi"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nuovo Gruppo..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Crea un nuovo gruppo di collegamento"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Rimuovi Questo Gruppo..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Rimuovi questo gruppo di collegamento"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Nascondi la Barra di Collegamento"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Nasconde la barra di collegamento"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Attiva"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Attiva questo collegamento"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Errore di salvataggio dei collegamenti."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Visualizza"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Mostra la cartella selezionata"
-
-#: shell/e-storage.c:176
-msgid "(No name)"
-msgstr "(Senza nome)"
-
-#: shell/e-storage.c:427
-msgid "No error"
-msgstr "Nessun errore"
-
-#: shell/e-storage.c:429
-msgid "Generic error"
-msgstr "Errore generico"
-
-#: shell/e-storage.c:431
-msgid "A folder with the same name already exists"
-msgstr "Esiste già una cartella con questo nome"
-
-#: shell/e-storage.c:433
-msgid "The specified folder type is not valid"
-msgstr "Il tipo di cartella specificato non è valido"
-
-#: shell/e-storage.c:435
-msgid "I/O error"
-msgstr "Errore I/O"
-
-#: shell/e-storage.c:437
-msgid "Not enough space to create the folder"
-msgstr "Spazio insufficiente per creare la cartella"
-
-#: shell/e-storage.c:439
-msgid "The specified folder was not found"
-msgstr "Cartella non trovata"
-
-#: shell/e-storage.c:441
-msgid "Function not implemented in this storage"
-msgstr "Funzione non implementata"
-
-#: shell/e-storage.c:443
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: shell/e-storage.c:445
-msgid "Operation not supported"
-msgstr "Operazione non supportata"
-
-#: shell/e-storage.c:447
-msgid "The specified type is not supported in this storage"
-msgstr "Tipo on supportato"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "La shell di Evolution."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Ciao.  Grazie per aver trovato il tempo di scaricare quest'anteprima\n"
-"della groupware suite Evolution.\n"
-"\n"
-"Nel tempo trascorso dall'ultima versione, il nostro obiettivo è stato\n"
-"rendere Evolution usabile.  Molti degli sviluppatori di Evolution ora\n"
-"usano sempre Evolution per leggere la loro posta.  Potete farlo anche\n"
-"voi.  (Assicuratevi di fare un backup.)\n"
-"\n"
-"Nonostante siano stati eliminati molti dei bachi che minavano la\n"
-"stabilità e la sicurezza, la liberatoria rimane: Evolution farà\n"
-"impallare il vostro computer, perderà la vostra posta, lascerà\n"
-"processi attivi, consumerà il 100% del tempo di CPU, si bloccherà,\n"
-"manderà posta in HTML a liste di indirizzi scelti a caso mettendovi in\n"
-"imbarazzo di fronte ad amici e colleghi.   \n"
-"Usatelo secondo le indicazioni.\n"
-"\n"
-"Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
-"aspettiamo ansiosamente i vostri contributi!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Grazie\n"
-"il Team di Evolution.\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Impossibile inizializzare la shell di Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Disabilita."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Crea un nuovo contatto"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Cancella un contatto"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Trova"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Trova un contatto"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nuovo contatto"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Stampa contatti"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stop"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Arresta caricamento"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Visualizza Tutto"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Visualizza tutti i contatti"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Configurazione della _Rubrica..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "Stampa _Contatti..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Ceca Contatti"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "S_trumenti"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Giorni"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Cambia preferenze"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ca_lendario"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Preferenze del Calendario..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Crea un nuovo appuntamento"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Crea un nuovo calendario"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Giorno"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Torna indietro nel tempo"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Vai avanti nel tempo"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Vai al"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Vai ad una data specifica"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Vai al presente"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mese"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nuovo appuntamento"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Successivo"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Apri calendario"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Prec"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Stampa questo calendario"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Salva con Nome"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Salva calendario con altro nome"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Mostra 1 giorno"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Mostra 1 mese"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Mostra 1 settimana"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Mostra la settimana lavorativa"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Oggi"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Settimana"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nuovo"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Apri calendario"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Stampa questo calendario"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Salva con nome..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Elimina quest'oggetto"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Elimina..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Aiuto"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Stampa _Busta..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Stampa questo articolo"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Stampa..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Salva _come..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Salva ed Esci"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Salva il contatto e chiudi la finestra di dialogo"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "_Invia contatto a altri..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Vedere aiuto in linea"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Invia un _messaggio al contatto..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_File"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_tampa..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Salva"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Informazioni su questa applicazione"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Informazioni su..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Azio_ni"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "FIXME: Address _Book..."
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Annulla"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Taglia"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Controlla i Nomi"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Annulla"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Annulla la Selezione"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Chiudi questo appuntamento"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ia nella Cartella..."
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copia"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copia selezionato"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Taglia"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Taglia selezionato"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Fa un Dump della descrizione UI Xml"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimo oggetto della cartella"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Editor dei Contatti"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Inoltra come v_Calendar"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Vai al successivo"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Vai al precedente"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Obiettivo incompleto"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modifica le proprietà del file"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "S_uccessivo"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Incolla"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Incolla agli appunti"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Precedente"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Precedente"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "_Anteprima di stampa"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_Impostazioni Stampa..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Impostazione pagina"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Proprietà"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Salva"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Salva il file corrente"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Pianifica una Riunione"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Pianifica una _Riunione"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Pianifica un tipo di riunione"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleziona Tutto"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleziona ogni cosa"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Imposta i parametri della pagina per la stampante corrente"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Richiesta _obiettivo"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Informazioni su"
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Chiudi"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contatto"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copia"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Aiuto"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Oggetto"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Voce dell'agenda"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Ultimo oggetto della Cartella"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Invia messaggio"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Sposta nella Cartella..."
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Incolla"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_tampa"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Proprietà"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleziona Tutto"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Obiettivo"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Non letto"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Aggiungi Servizio"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Aggiungi un servizio al Sommario Esecutivo"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crea una nuova email"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Impostazioni Sommario Esecutivo..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nuovi Messaggi"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Scrivi"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Scrivi un nuovo messaggio"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copia messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Crea Regola"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "C_artelle"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltra sul Mittente"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtro sui _Destinatari"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Dimantica _Password"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Ricevi Posta"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Nascondi i Messaggi _Selezionati"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Nascondi i Messaggi _Cancellati"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Nascondi i messaggi _Letti"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtri Posta..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Gestione sottoscrizioni..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "S_egna come Letto"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Segna come _Non Letto"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Sposta"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Sposta il messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Anteprime del messaggio da stampare"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Anteprima di stampa del messaggio..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Stampa messaggio con la stampante"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Stampa messaggio..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Rispondi a _Tutti"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Rispondi al _Mittente"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "S_orgente"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleziona _Tutto"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Mostra _Tutti i messaggi"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "LIsta di Messaggi a Thread"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Cartella virtuale sul _Mittente"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "Cartella virtuale sui _Destinatari"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Vedi la sorgente grezza del messaggio"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Applica Filtri"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configura Cartella..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copia nella cartella..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "M_odifica Messaggio"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Elimina per sempre"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtro sull'Oggetto"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Inoltra"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverti Selezione"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Configurazione della _Posta..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Messaggio"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Sposta nella Cartella..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Apri in una Nuova Finestra"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Stampa Messaggio"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Salva con Nome..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "A _Thread"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Ripristina"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Cartella Virtuale sull'Oggetto"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor delle Cartelle _Virtuali..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Allega"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Chiudi il file corrente"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Cifra Messaggio con PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Inserici un file come testo nel messaggio"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Inserici un file di testo..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Apri un file"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Cifra con PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Firma con PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salva _Bozza"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salva nella cartella..."
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Salva nella cartella..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Salva il file corrente con un nome diverso"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Salva il messaggio in una cartella specificata"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Invia"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Invia più _Tardi"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Invia più _tardi"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Invia la posta in formato HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Invia il messaggio più tardi"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Invia il messaggio adesso"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Invia questo messaggio adesso"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Mostra / nascondi allegati"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Mostra _allegati"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Mostra allegati"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Frima questo messaggio con la chiave PGP"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Inserisci un file di testo..."
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Apri..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sicurezza"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Aggiorna Lista"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Aggiorna la Lista delle Cartelle"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Iscrizione"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Annulla iscrizione"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asseg_na obiettivo"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Cerca ancora"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Richiesta _appuntamento"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Rifai"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Rifai l'azione annullata"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Sostituisci una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Rispondi a _Tutti"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Invia un report"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "_Salta ricorrenza"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Salva l'obiettivo e chiudi la finestra di dialogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Cerca ancora la stessa stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Cerca una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Annulla"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Appuntamento"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Segna come Completato"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Rispondi"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Crea un nuovo obiettivo"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nuovo"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Salva obiettivo come qualcos'altro"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferenze degli Obiettivi..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Informazioni su Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Personali_zza..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizza"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizza barre degli strumenti"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Visualizza un'altra cartella"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "E_sci"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "_Barra del Collegamenti di Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Esci"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Esci dal Programma"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Primi _Passi"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importa un formato di file esterno"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra dagli strimenti principale"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Mostra informazioni su Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Mostra la _Barra delle Cartelle"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Mostra la _Barra di Collegamento"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Invia un Bug Report"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Invia un _Bug Report"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Inoltra un Bug Report usando Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Mostra/nasconde la barra delle cartelle"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Mostra/nasconde la barra dei collegamenti"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Uso del manger dei C_ontatti"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Uso del _Calendario"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Uso del programma di _Posta"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Informazioni su Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartelle"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Vai alla cartella..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importa un file..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indice"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Invia messaggio"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Impostazioni"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Occupato"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Assente"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nessuna informazione"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invita altri..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opzioni"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostra s_olo le ore lavorative"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vista _allargata"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "A_ggiorna libero/Occupato"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autopick"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Tutto il Personale e le Risorse"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Tutto il _Personale e una Risorsa"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personale _Richiesto"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personale Richiesto e _una risorsa"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "_Inizio appuntamento ore:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "T_ermine dell' appuntamento ore:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tutti i partecipanti"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMGVSD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Adesso"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Informazione"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Avviso"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Domanda"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Messaggio"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Non mostrare questo messagio in futuro."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "_Cerca"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Server Personale della Rubrica"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-
-#: wombat/wombat.c:153
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
-
-#: wombat/wombat.c:165
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): impossibile inizializzare GNOME"
-
-#: wombat/wombat.c:178
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): impossibile inizializzare Bonobo"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "The Evolution groupware suite"
-
diff --git a/po/ja.po b/po/ja.po
deleted file mode 100644
index 79fe86d2e0..0000000000
--- a/po/ja.po
+++ /dev/null
@@ -1,7947 +0,0 @@
-# evolution ja.po
-# Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution CVS-20010216\n"
-"POT-Creation-Date: 2001-02-16 18:32-0500\n"
-"PO-Revision-Date: 2001-02-16 19:48-0500\n"
-"Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
-"Language-Team: Japanese <translation@gnome.gr.jp>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "̾»É: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"̾Á°: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  ·É¾Î(Á°¤Ä¤±):     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  ¥Õ¥¡¥ß¥ê¡¼Ì¾:     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  ·É¾Î(¸å¤Ä¤±):     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"ÃÂÀ¸Æü: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"½»½ê:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"͹ÊØÈÖ¹æ:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ͹ÊØÈÖ¹æ: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ¹ñ:       "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"ÅÅÏÃÈÖ¹æ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"ÅÅÏÃÈÖ¹æ:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"¥á¡¼¥ë:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"¥á¡¼¥ë:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"¥á¡¼¥é: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"¥¿¥¤¥à¥¾¡¼¥ó: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"·Ð°Þ: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"»Å»ö¤Î¿¦Ì³: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"ÁÈ¿¥: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  ¼Ò̾:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Éô½ð:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Éô½ð2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Éô½ð3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Éô½ð4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"¶È̳ʬÌî: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Ãí¼á: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"¸ø³«¸°: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Evolution ¤Ø GnomeCard ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¥Õ¥¡¥¯¥È¥ê"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Evolution ¤Ø GnomeCard ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo ¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "̵¸ú"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Ʊ´ü"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "¥Ñ¥¤¥í¥Ã¥È¤«¤é¥³¥Ô¡¼"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "¥Ñ¥¤¥í¥Ã¥È¤Ø¥³¥Ô¡¼"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "¥Ñ¥¤¥í¥Ã¥È¤«¤é¥Þ¡¼¥¸"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "¥Ñ¥¤¥í¥Ã¥È¤Ø¥Þ¡¼¥¸"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "¥ª¥ê¥¸¥Ê¥ëºîÀ®¼Ô:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥³¥ó¥¸¥Ã¥È"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥³¥ó¥¸¥Ã¥È¤Î¤¿¤á¤ÎÀßÄê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Ʊ´üÆ°ºî"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "¥³¥ó¥¸¥Ã¥È¤Î¾õ¶·"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"¥Ñ¥¤¥í¥Ã¥È¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡¤½é¤á¤Ë\n"
-"'¥Ñ¥¤¥í¥Ã¥È¥ê¥ó¥¯¥×¥í¥Ñ¥Æ¥£' ¥­¥ã¥×¥ì¥Ã¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot ¥Ç¡¼¥â¥ó¤ËÀܳ¤·¤Æ¤¤¤Þ¤»¤ó"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"gnome-pilot ¥Ç¡¼¥â¥ó¤«¤é¥Ñ¥¤¥í¥Ã¥È¥ê¥¹¥È¤ò\n"
-"¼èÆÀ¤·¤è¤¦¤È¤·¤¿»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "¥«¡¼¥½¥ë¤ÏÆɤ߹þ¤Þ¤ì¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook ¤Ï¥í¡¼¥É¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "wombat ¥µ¡¼¥Ð¤ò³«»Ï¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "wombat ¤ò³«»Ï¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr ""
-"¥Ñ¥¤¥í¥Ã¥È¤Î¥¢¥É¥ì¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "¥¢¥É¥ì¥¹Ä¢¥³¥ó¥¸¥Ã¥È¤ÎÀßÄê"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥³¥ó¥¸¥Ã¥È "
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "ÄɲÃ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "µ­Ç°Æü(_v):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "ȁȚ(_u)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "»Å»ö¤Î FAX(_F)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "¥³¥ó¥¿¥¯¥È(_o)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "¥«¥Æ¥´¥ê(_t)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "¥³¥ó¥¿¥¯¥È¥¨¥Ç¥£¥¿"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "¾ÜºÙ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "ÊÌ̾:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "°ìÈÌ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "¿·µ¬ÅÅÏüïÊÌ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "¥Î¡¼¥È(_t):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "ÅÅÏüïÊÌ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "¼çÍפʥ᡼¥ë"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "HTML ¥á¡¼¥ë¤ò¼õ¿®µö²Ä(_H)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "¥¦¥§¥Ö¥Ú¡¼¥¸¤Î URL:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "ÄɲÃ(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "½»½ê(_A)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "¥¢¥·¥¹¥¿¥ó¥È¤Î̾Á°(_A):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "ÃÂÀ¸Æü(_B):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "ȁȚ(_B)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "²ñ¼Ò(_C):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "ºï½ü(_D)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "ôÅöÉô½ð(_D):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "¥Õ¥ë¥Í¡¼¥à(_F)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "²È(_H)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "¿¦¼ï(_J):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "¥Þ¥Í¡¼¥¸¥ã¤Î̾Á°(_M):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "¥â¥Ð¥¤¥ë(_M)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à(_N):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "»ö̳½ê(_O):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "ÀìÌ翦(_P):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "ÇÛ¶ö¼Ô(_S):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "¤³¤ì¤Ï͹ÊØʪ¤Î½»½ê¤Ç¤¹"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "¥³¥ó¥¿¥¯¥È¤òºï½ü¤·¤Þ¤¹¤«?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "¤³¤Î¥³¥ó¥¿¥¯¥È¤Ï¤³¤ì¤é¤Î¥«¥Æ¥´¥ê¤Ë½ê°¤·¤Æ¤¤¤Þ¤¹:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "¥¢¥·¥¹¥¿¥ó¥È"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "ȁȚ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "ȁȚ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "»Å»ö¤Î FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "¸Æ¤ÓÌᤷ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "¼Ö"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "²ñ¼Ò"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "²È"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "²È 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "²È¤Î FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "¥â¥Ð¥¤¥ë"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "¤½¤Î¾"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "¤½¤Î¾¤Î FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "¥Ý¥±¥Ù¥ë"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "¥×¥é¥¤¥Þ¥ê"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "¥é¥¸¥ª"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "¥Æ¥ì¥Ã¥¯¥¹"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "¥á¡¼¥ë2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "¥á¡¼¥ë3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "½»½ê 2(_2):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "¥«¥Ê¥À"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "½»½ê¥Á¥§¥Ã¥¯"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "¹ñ(_y):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "¥Õ¥£¥ó¥é¥ó¥É"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "¥¢¥á¥ê¥«"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "½»½ê(_A):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "»Ô(_C):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "»ä½ñÈ¢(_P):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "͹ÊØÈÖ¹æ(_Z):"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "¥Õ¥ë¥Í¡¼¥à¤Î¥Á¥§¥Ã¥¯"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "̾(_F):"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "À«(_L):"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "¥ß¥É¥ë¥Í¡¼¥à(_M):"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "·É¾Î(¸å¤Ä¤±)(_S):"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "·É¾Î(Á°¤Ä¤±)(_T):"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "¥ß¥Ë¥«¡¼¥É"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "¥Æ¡¼¥Ö¥ë(_T)"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"¤³¤Î¥¢¥É¥ì¥¹Ä¢¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó. ¤³¤ì¤Ï¤¢¤Ê¤¿¤¬\n"
-"´Ö°ã¤Ã¤¿ URI ¤òÆþÎϤ·¤¿¤«, LDAP ¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤·¤Æ\n"
-"¥³¥ó¥Ñ¥¤¥ë¤·, LDAP¥µ¡¼¥Ð¤Ø¥¢¥¯¥»¥¹¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤³\n"
-"¤È¤ò°ÕÌ£¤·¤Þ¤¹¡¥¤â¤· URI ¤òÆþÎϤ·¤¿¤Ê¤é, Àµ³Î¤Ê URI \n"
-"¤ò¥Á¥§¥Ã¥¯¤·¤ÆºÆÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤. ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð, \n"
-"¤¿¤Ö¤ó LDAP ¥µ¡¼¥Ð¤Ë¥¢¥¯¥»¥¹¤ò»î¤ß¤ë¤Ç¤·¤ç¤¦. ¤¢¤Ê¤¿\n"
-"¤¬ LDAP ¤ò»È¤¦¤³¤È¤¬½ÐÍè¤ë¤³¤È¤ò˾¤à¤Ê¤é, OpenLDAP ¤ò\n"
-"¥À¥¦¥ó¥í¡¼¥É¡¤¤½¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ, ¥³¥ó¥Ñ¥¤¥ë»Åľ¤·\n"
-"¤Æ Evolution ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "¤¹¤Ù¤Æɽ¼¨"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "¾ÜºÙ..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "¥Õ¥£¡¼¥ë¥É¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "̾Á°¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "¥á¡¼¥ë¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "¥Õ¥©¥ë¥À¥Ö¥é¥¦¥¶¤¬É½¼¨¤¹¤ë URI"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "¤½¤Î¾¤Î¥³¥ó¥¿¥¯¥È"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP ¥µ¡¼¥Ð"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "¥Õ¥¡¥¤¥ë"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "̤ÃΤΥ¢¥É¥ì¥¹Ä¢¼ïÊÌ"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "¤Ê¤· (ƿ̾¥â¡¼¥É)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "¥Ñ¥¹¥ï¡¼¥É"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "̤ÃΤÎǧ¾Ú¼ïÊÌ"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "¥Ù¡¼¥¹"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "̤ÃΤΥ¹¥³¡¼¥×¼ïÊÌ"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME ¥Ð¥¤¥ó¥É DN ¤Î¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "¤³¤Î¥Ñ¥¹¥ï¡¼¥É¤òµ­²±"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "¥Û¥¹¥È:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME ¥Û¥¹¥È¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "¥Ý¡¼¥È:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME ¥Ý¡¼¥È¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "¥ë¡¼¥È DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ¥ë¡¼¥È DN ¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "¸¡º÷ÈÏ°Ï:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "ǧ¾ÚÊý¼°:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "¥Ñ¥¹:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME ¥Ñ¥¹¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "¸ºß¤·¤Ê¤¤¾ì¹ç¥Ñ¥¹¤òºîÀ®¤¹¤ë"
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤òÊÔ½¸"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤ËÄɲÃ"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"¤¢¤Ê¤¿¤Î»ý¤Ä¥¢¥É¥ì¥¹Ä¢¤òÁªÂò¤·, ¤½¤ì¤Ë¤Ä¤¤¤Æ¤Î´ØÏ¢¤·¤¿¾ðÊó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "̾Á°:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME ̾Á°¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "ÀâÌÀ:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME ÀâÌÀ¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ç¤¹"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤Î¥½¡¼¥¹"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "ºï½ü"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "ÊÔ½¸"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "̾Á°"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "¥¢¥É¥ì¥¹Ä¢¤òɽ¼¨¤¹¤ë Bonobo ¥³¥ó¥È¥í¡¼¥ë¤Î¥µ¥ó¥×¥ë¤Ç¤¹"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥ß¥Ë¥«¡¼¥É¤òɽ¼¨¤¹¤ë¥³¥ó¥È¥í¡¼¥ë"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥ß¥Ë¥«¡¼¥É¥Ó¥å¡¼¥¢"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "¥³¥ó¥¿¥¯¥È¤ò°·¤¦¤¿¤á¤Î Evolution ¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "¥¢¥É¥ì¥¹Ä¢¥ß¥Ë¥«¡¼¥É¥³¥ó¥È¥í¡¼¥ë¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution ¥¢¥É¥ì¥¹Ä¢¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "¥µ¥ó¥×¥ë¥¢¥É¥ì¥¹Ä¢¥³¥ó¥È¥í¡¼¥ë¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution ¤Î¥¢¥É¥ì¥¹Ä¢¤Î̾Á°ÁªÂò¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤Î̾Á°ÁªÂò¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "¸¡º÷..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î¼õ¼è¿Í"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "̾Á°¤òÁªÂò"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "¼¡¤«¤é̾Á°¤òÁªÂò:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "¸¡º÷"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "VCard ¤ÇÊݸ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* ¥³¥ó¥¿¥¯¥È¤òÄɲ乤뤿¤á¤Ë¤³¤³¤ò¥¯¥ê¥Ã¥¯ *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "¥á¡¼¥ë"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "ÁÈ¿¥"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "¥¦¥§¥Ö¥µ¥¤¥È"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "ôÅöÉô½ð"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "»ö̳½ê"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "·É¾Î(Á°¤Ä¤±)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "ÀìÌ翦"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "¥Þ¥Í¡¼¥¸¥ã"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "ÇÛ¶ö¼Ô"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "¥Î¡¼¥È"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "¥³¥ó¥¿¥¯¥È¤òÄɲ乤뤿¤á¤Ë¤³¤³¤ò¥¯¥ê¥Ã¥¯"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤ËÊݸ"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"¤³¤Î¥Ó¥å¡¼¤ÎÃæ¤Ëɽ¼¨¤Ç¤­¤ë¥¢¥¤¥Æ¥à¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-"\n"
-"¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤ò¤·¤Æ¿·µ¬¥³¥ó¥¿¥¯¥È¤òºîÀ®¤·¤Æ²¼¤µ¤¤"
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "ËÜÂÎ"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "²¼:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "À£Ë¡:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "¥Õ¥©¥ó¥È..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "¥Õ¥©¥ó¥È"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "¥Õ¥Ã¥¿:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "½ñ¼°"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "¥Ø¥Ã¥À"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "¥Ø¥Ã¥À/¥Õ¥Ã¥¿"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "¸«½Ð¤·"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "³Æʸ½ñ¤Î¸«½Ð¤·"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "¹â¤µ:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "²£Ä¹"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "º¸:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "¥Þ¡¼¥¸¥ó"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Îó¿ô:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "¥ª¥×¥·¥ç¥ó"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Êý¸þ"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "¥Ú¡¼¥¸"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "¥Ú¡¼¥¸ÀßÄê:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "ÍÑ»æ"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "½ÄĹ"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "¥×¥ì¥Ó¥å¡¼:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "¥°¥ì¥¤¥·¥§¡¼¥Ç¥£¥ó¥°¤ò»È¤Ã¤¿°õºþ"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "¶ö¿ô¥Ú¡¼¥¸¤òȿž"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "±¦:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "¥»¥¯¥·¥ç¥ó:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "¥·¥§¡¼¥Ç¥£¥ó¥°"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "¥µ¥¤¥º:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "¿·µ¬¥Ú¡¼¥¸¤Ç³«»Ï"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "¥¹¥¿¥¤¥ë̾:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "¾å:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "¼ïÊÌ:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Éý:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution ¥«¥ì¥ó¥À¥³¥ó¥¸¥Ã¥È"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution ¥«¥ì¥ó¥À¥³¥ó¥¸¥Ã¥È¤Î¤¿¤á¤ÎÀßÄê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "¥«¥ì¥ó¥À¥µ¡¼¥Ð¤ÇÄÌ¿®Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"¥Ñ¥¤¥í¥Ã¥È¤Î¥«¥ì¥ó¥À¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "GnomeCal ÀßÄꥳ¥ó¥¸¥Ã¥È"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution ¥«¥ì¥ó¥À¥³¥ó¥¸¥Ã¥È"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "todo ¥³¥ó¥¸¥Ã¥È¤ÎÀßÄê"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo ¥³¥ó¥¸¥Ã¥È "
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo ¥³¥ó¥¸¥Ã¥È"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolutiuon ToDo ¥³¥ó¥¸¥Ã¥È¤Î¤¿¤á¤ÎÀßÄê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-"¥Ñ¥¤¥í¥Ã¥È¤Î ToDo ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Ìó«¤ÎºÅÂ¥"
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "¥¢¥é¡¼¥àÄä»ß"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "¥«¥ì¥ó¥À¤ò³«¤¯"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "¥«¥ì¥ó¥À¤òÊݸ"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"¥«¥ì¥ó¥À¥Ó¥å¡¼¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿. ORBit¤ÈOAF¤ÎÀßÄê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤"
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%Y/%m/%d (%a)"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d (%a) %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "¸øŪ"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "»äŪ"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "µ¡Ì©"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "̤ÃÎ"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "ËÌ"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "Æî"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "Åì"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "À¾"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Æ©ÌÀ"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "ÉÔÆ©ÌÀ"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"ÆüÉդϥե©¡¼¥Þ¥Ã¥È¤ËÆþ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"ÃÏÍýŪ¤Ê°ÌÃ֤ϥե©¡¼¥Þ¥Ã¥È¤ËÆþ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "¥Ñ¡¼¥»¥ó¥ÈÃÍ¤Ï 0 ¤È 100 ¤Î´Ö¤Ç´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Í¥Àè½ç°Ì¤Ï 1 ¤È 9 ¤Î´Ö¤Ç´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "ÉáÄÌ"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "ºÆȯ"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "³äÅö¤ÆºÑ¤ß"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "¤Ï¤¤"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "¤¤¤¤¤¨"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%Y/%B/%e %A"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%p %I:%M"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>¥«¥ì¥ó¥À¤ò¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>¥«¥ì¥ó¥À¤ò¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼:<br>¥á¥½¥Ã¥É¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "ɽ¼¨"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Ìó«¤Îɽ¼¨"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "¥¿¥¹¥¯¤Îɽ¼¨"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "¥«¥ì¥ó¥À¤ò¥í¡¼¥ÉÃæ"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "¥«¥ì¥ó¥À¤¬É½¼¨¤¹¤ë URI"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M ¤Ë¥¢¥é¡¼¥à"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M ¤Î¤¢¤Ê¤¿¤ÎÌó«¤Ë¤Ä¤¤¤ÆÄÌÃÎ"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "ÍøÍѤǤ­¤ë¥µ¥Þ¥ê¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "ÊĤ¸¤ë"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Ìó«¤ÎÊÔ½¸"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "¥¢¥é¡¼¥àÄä»ß»þ´Ö (ʬ)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 ʬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 ʬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 »þ´Ö (¸áÁ°/¸á¸å)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 ʬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 »þ´Ö"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 ʬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 ʬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "»ØÄê»þ´Ö¸å¤Ë¥¢¥é¡¼¥à¤¬¥¿¥¤¥à¥¢¥¦¥È"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "¥ª¡¼¥Ç¥£¥ª¥¢¥é¡¼¥à"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "¥¢¥é¡¼¥à¥¦¥£¥ó¥É¥¦¤¬¸½¤ì¤¿»þ BEEP ²»¤òÌĤ餹"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "¥«¥ì¥ó¥À"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "¥«¥ì¥ó¥À¤ÎÀßÄê"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "¥«¥é¡¼"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "½µËö¤òɽ¼¨¤·¤Ê¤¤"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "ÆüÉÕÁàºî¥ª¥×¥·¥ç¥ó"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "¥Ç¥Õ¥©¥ë¥È"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "ɽ¼¨¥ª¥×¥·¥ç¥ó"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "´üÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "¥¢¥é¡¼¥àÄä»ß¤òÍ­¸ú"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "½ªÎ»Æü:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "½µ¤Î»Ï¤á:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "¶â"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "¶âÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "¶¯Ä´"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "¥¢¥¤¥Æ¥à¤Ïº£Æü¤¬´ü¸Â"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "¥¢¥¤¥Æ¥à¤Ïº£Æü¤¬´ü¸Â:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "¥¢¥¤¥Æ¥à¤Ï¤Þ¤À´ü¸Â¤Ç¤Ï¤Ê¤¤"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "¥¢¥¤¥Æ¥à¤Ï¤Þ¤À´ü¸Â¤Ç¤Ï¤Ê¤¤:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "·î"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "·îÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "´ü¸Â¤ò²á¤®¤¿¥¢¥¤¥Æ¥à"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "´ü¸Â¤ò²á¤®¤¿¥¢¥¤¥Æ¥à:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "¥«¥é¡¼¤òÁªÂò"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Í¥ÀèÅÙ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "¤¹¤Ù¤Æ¤ÎÌó«¤òºÅÂ¥¤¹¤ë"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "ºÅÂ¥¾õ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "ÅÚ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "ÅÚÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "ɽ¼¨"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Ìó«¤Î½ªÎ»»þ´Ö¤òɽ¼¨"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "½µÈÖ¹æ¤òɽ¼¨"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "³«»ÏÆü:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Æü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "ÆüÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "¥¿¥¹¥¯¥Ñ¥Ã¥É"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "ÌÚ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "ÌÚÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "´ü¸Â¤Þ¤Ç¤Î»þ´Ö"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "»þʬ³ä:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "»þ´Ö¤Î½ñ¼°:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "²Ð"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "²ÐÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "»ë³Ð¥¢¥é¡¼¥à"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "¿å"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "¿åÍËÆü"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "»Å»ö¤Î½µ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "ʬÁ°"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr " ÉÃ"
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "ËÜÅö¤ËÌó« `%s' ¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "ËÜÅö¤Ë̵¥¿¥¤¥È¥ë¤ÎÌó«¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "ËÜÅö¤Ë¥¿¥¹¥¯ `%s' ¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "ËÜÅö¤Ë̵¥¿¥¤¥È¥ë¤Î¥¿¥¹¥¯¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "ËÜÅö¤Ë»ÅÌõµ­Æþ `%s' ¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "ËÜÅö¤Ë̵¥¿¥¤¥È¥ë¤Î»ÅÌõµ­Æþ¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Êѹ¹¤òÊݸ¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ´°Î»(_l):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "¥­¥ã¥ó¥»¥ë¤·¤Þ¤·¤¿"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "ʬÎà"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "´°Î»¤·¤Þ¤·¤¿"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "ÆüÉդȻþ´Ö"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "´°Î»Æü:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "¹â¤¤"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "½èÍýÃæ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Ä㤤"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "³«»Ï¤·¤Æ¤¤¤Ê¤¤"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "»äŪ(_v)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "½èÍýÃæ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "¸øŪ(_b)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "³«»ÏÆü(_r):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "¥µ¥Þ¥ê¡¼(_m):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "¥¿¥¹¥¯"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "̤ÄêµÁ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "µ¡Ì©(_C)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "¥³¥ó¥¿¥¯¥È(_C)..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "´üÆü(_D):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "Í¥ÀèÅÙ(_P):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "¥¹¥Æ¡¼¥¿¥¹(_S):"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "¥¿¥¹¥¯¤ÎÊÔ½¸"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "¥µ¥Þ¥ê¡¼¤Ê¤·"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Ìó« - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "¥¿¥¹¥¯ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "»ÅÌõµ­Æþ - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "¥«¥Æ¥´¥ê"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "´°Î»Æü"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "½ªÎ»Æü"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "³«»ÏÆü"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "°ÞÅÙ·ÐÅÙ"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "¥µ¥Þ¥ê¡¼"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "¥¢¥é¡¼¥à"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "¥¿¥¹¥¯¤òÄɲ乤뤿¤á¤Ë¤³¤³¤ò¥¯¥ê¥Ã¥¯"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "´°Î»¤ò¥Þ¡¼¥¯"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "´°Î»¤·¤¿¥¿¥¹¥¯¤ò¥Þ¡¼¥¯¤·¤Þ¤¹"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "¤³¤Î¥¿¥¹¥¯¤òÊÔ½¸..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "¥¿¥¹¥¯¤òÊÔ½¸¤·¤Þ¤¹"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "¤³¤Î¥¿¥¹¥¯¤òºï½ü¤·¤Þ¤¹"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "¥¿¥¹¥¯¤òºï½ü¤·¤Þ¤¹"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i ʬʬ³ä"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%B %d %A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%b/%d (%a)"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%b/%d"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "¸áÁ°"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "¸á¸å"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "¿·µ¬Ìó«..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Âǹ礻¤Î¥¹¥±¥¸¥å¡¼¥ë"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "¤³¤ÎÌó«¤òÊÔ½¸..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "¤³¤ÎÌó«¤òºï½ü"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "¤³¤ÎÌó«¤ò²ÄÆ°¤Ë¤¹¤ë"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "¤³¤Î½ÐÍè»ö¤òºï½ü"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "¤¹¤Ù¤Æ¤Î½ÐÍè»ö¤òºï½ü"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "¥«¥ì¥ó¥À¥Õ¥¡¥¤¥ë¤ò¹¹¿·½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÏÀµ¤·¤¯¹¹¿·¤µ¤ì¤Þ¤·¤¿"
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "¥«¥ì¥ó¥À¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "¥«¥ì¥ó¥À¥Õ¥¡¥¤¥ë¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "¥«¥ì¥ó¥À¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "¥«¥ì¥ó¥À¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "¤³¤ì¤Ï¾·¤«¤¶¤ë狼¤«¤é¤ÎÊÖ»ö¤Ç¤¹!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Êݸ¤·¤¿¥«¥ì¥ó¥À¤ò¹¹¿·½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "¥«¥ì¥ó¥À¥³¥ó¥Ý¡¼¥Í¥ó¥È¤òºï½ü½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÏÀµ¤·¤¯ºï½ü¤µ¤ì¤Þ¤·¤¿"
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "¤³¤Î¥«¥ì¥ó¥À¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¼ïÊ̤Ïǧ¼±¤·¤Þ¤»¤ó"
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "¥«¥ì¥ó¥À¤ÎÄɲÃ"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "¼õÂú"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "¼­Âà"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "»ÃÄê"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "¥«¥ì¥ó¥À¤ò¹¹¿·"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Âǹ礻¤ò¥­¥ã¥ó¥»¥ë"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr ""
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "¥«¥ì¥ó¥À¥á¥Ã¥»¡¼¥¸"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "ÆüÉÕ:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "¥«¥ì¥ó¥À¤ò¥í¡¼¥ÉÃæ..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "¼çºÅ¼Ô:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Á÷¿®¼Ô"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "¥µ¥Þ¥ê:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "½ªÎ»Æü"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "³«»ÏÆü"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "½ÐÀʼÔ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "½ÐÀʼԤν»½ê"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "½ÐÀʼÔ: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"¥­¥ã¥ó¥»¥ë\n"
-"Âǹ礻"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "µÄĹ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Âǹ礻¤Î°ÆÆâ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "ÉÔ»²²Ã¼Ô"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Ǥ°Õ»²²Ã¼Ô"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "¼çºÅ¼Ô:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"ȯɽ\n"
-"¥¤¥Ù¥ó¥È"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Í×µá\n"
-"Âǹ礻"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "»²²Ã¼Ô¤¬É¬Í×"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Ìò³ä"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"¥¹¥±¥¸¥å¡¼¥ë\n"
-"»þ´Ö"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1167
-msgid "Status"
-msgstr "¥¹¥Æ¡¼¥¿¥¹"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "¤¹¤Ù¤Æ"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "¥«¥Æ¥´¥ê:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "'%s' ¤Î¥¿¥¹¥¯¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "'%s' ¤òÆɤ߹þ¤à¤³¤È¤òÍ׵ᤵ¤ì¤ë¥á¥½¥Ã¥É¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%B %d"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "ËèÆü¤Î¥¤¥Ù¥ó¥È(_l)"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Ìó«"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "ÉáÄ̤ÎÌó«"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "ºÆȯ¤Î¥«¥¹¥¿¥Þ¥¤¥º"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Ëè"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Îã³°"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "½¤Àµ"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "ºÆȯ¤Ê¤·"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "²»³Ú¤òºÆÀ¸"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "¥×¥ì¥Ó¥å¡¼"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "ºÆȯ"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "ºÆȯ¥ë¡¼¥ë"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "ºÅÂ¥¾õ"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "ÀßÄê..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "¥À¥¤¥¢¥í¥°¤òɽ¼¨¤¹¤ë"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "¥·¥ó¥×¥ë¤ÊºÆȯ"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "½ªÎ»»þ´Ö(_E):"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "³«»Ï»þ´Ö(_S):"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "³«»ÏÆü(_S):"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "¸å"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "Á°"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "Æü"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "Ìó«¤ÎºÇ¸å"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "»þ"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "ʬ"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "·î"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "Ìó«¤ÎºÇ½é"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "¤Þ¤Ç"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "½µ"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "ǯ"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Ìó«¤ÎÊÔ½¸"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "Æü"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "½ÐÍè»ö"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "¤³¤ÎÌó«¤Ï Evolution ¤¬ÊÔ½¸½ÐÍè¤Ê¤¤ºÆȯ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr "%d Æü"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr "1 Æü"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr "%d ½µ´Ö"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr "1 ½µ´Ö"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr "%d »þ´Ö"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr "1 »þ´Ö"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr "%d ʬ"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr "1 ʬ"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr "%d ÉÃ"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr "1 ÉÃ"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr "ºÇ½é¤ÎÌó«¤ÎÁ°"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr "ºÇ½é¤ÎÌó«¤Î¸å"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr "ºÇ¸å¤ÎÌó«¤ÎÁ°"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr "ºÇ¸å¤ÎÌó«¤Î¸å"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution ¥«¥ì¥ó¥À¼Â¹Ô¥µ¥Þ¥ê¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution ¥«¥ì¥ó¥À iTip/iMip ¥Ó¥å¡¼¥¢"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "¥«¥ì¥ó¥À¤ò°·¤¦¤¿¤á¤Î Evolution ¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "¥«¥ì¥ó¥À¥µ¥Þ¥ê¡¼¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution ¥«¥ì¥ó¥À¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "¥«¥ì¥ó¥À iTip ¥Ó¥å¡¼¥³¥ó¥È¥í¡¼¥ë¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "¥«¥ì¥ó¥À¤òɽ¼¨¤¹¤ë Bonobo ¥³¥ó¥È¥í¡¼¥ë¤Î¥µ¥ó¥×¥ë"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "¥µ¥ó¥×¥ë¥«¥ì¥ó¥À¥³¥ó¥È¥í¡¼¥ë¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' ¤Î¥Õ¥©¥ë¥À¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "'%s' ¤ò³«¤¯¤³¤È¤òÍ׵ᤵ¤ì¤ë¥á¥½¥Ã¥É¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "4 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "8 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "12 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "2 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Æü¤Ë¤Á¤Ë°ÜÆ°"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "º£Æü¤Ø°ÜÆ°"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "1 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "7 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "6 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "3 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "5 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "11 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "10 ·î"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "9 ·î"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME ¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1 Æü"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2 Æü"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3 Æü"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4 Æü"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5 Æü"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6 Æü"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7 Æü"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8 Æü"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9 Æü"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10 Æü"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11 Æü"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12 Æü"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13 Æü"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14 Æü"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15 Æü"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16 Æü"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17 Æü"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18 Æü"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19 Æü"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20 Æü"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21 Æü"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22 Æü"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23 Æü"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24 Æü"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25 Æü"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26 Æü"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27 Æü"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28 Æü"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29 Æü"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30 Æü"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31 Æü"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Æü"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "·î"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "²Ð"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "¿å"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "ÌÚ"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "¶â"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "ÅÚ"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "¥¿¥¹¥¯"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "º£Æü¤ÎÆüÉÕ [%Y/%b/%d (%a)]"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%b/%d (%a)"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%Y/%d (%a)"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "º£½µ (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "º£·î (%Y/%b)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "º£Ç¯ (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "¥«¥ì¥ó¥À¤Î°õºþ"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "°õºþ¥×¥ì¥Ó¥å¡¼"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "¥¿¥¹¥¯¥Õ¥©¥ë¥À¤¬É½¼¨¤¹¤ë URI"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "¥Õ¥£¥ë¥¿¤Î¹½Ê¸²òÀÏÃæ¤Ë¥¨¥é¡¼: %s: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "¥Õ¥£¥ë¥¿¼Â¹ÔÃæ¤Ë¥¨¥é¡¼: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "¥Õ¥£¥ë¥¿¸¡º÷¼Â¹ÔÃæ¤Ë¥¨¥é¡¼: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Àµµ¬É½¸½¤Î¹½Ê¸¤ò²òÀϽÐÍè¤Þ¤»¤ó: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Àµµ¬É½¸½¤Ç¤Î¸¡º÷¤ò¼Â¹ÔÃæ¤Ë¥¨¥é¡¼: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s ¤Î¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s ¤Î¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ò¼èÆÀÃæ¤Ë¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿. ¸å¤Ç¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2)¤ò»È¤Ã¤¿¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2)¤ò»È¤Ã¤¿¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "¥á¡¼¥ë¥Õ¥¡¥¤¥ë %s ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "¥á¡¼¥ë¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "¥á¡¼¥ë¥Õ¥¡¥¤¥ë %s ¤Î¥Æ¥ó¥Ý¥é¥ê¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s ¤Î¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ò¥Æ¥¹¥È½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "¥á¡¼¥ë¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "¥á¡¼¥ëºî¶È¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "ºî¶È¥Õ¥¡¥¤¥ë %s ¤Ø¥á¡¼¥ë¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "¥Ñ¥¤¥×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "fork ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail ¥×¥í¥°¥é¥à¤Ï¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(̤ÃΤΥ¨¥é¡¼)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "%s ¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "%s ¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: ¥â¥¸¥å¡¼¥ë¤Î¥³¡¼¥É¤¬½é´ü²½¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s ¥µ¡¼¥Ð %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Àܳ¤Ï¥­¥ã¥ó¥»¥ë¤·¤Þ¤·¤¿"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s (¥Ý¡¼¥È %d) ¤ØÀܳ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(̤ÃΤΥۥ¹¥È)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Áàºî¤Ï¥­¥ã¥ó¥»¥ë¤·¤Þ¤·¤¿"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Àµµ¬É½¸½¤ÎÊÔ½¸¤Ë¼ºÇÔ: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' ¤Ï¥æ¡¼¥¶Ì¾¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬É¬ÍפǤ¹"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' ¤Ï¥Û¥¹¥È¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬É¬ÍפǤ¹"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' ¤Ï¥Ñ¥¹¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬É¬ÍפǤ¹"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "¤½¤Î¤è¤¦¤Ê¥Û¥¹¥È %s ¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "°ì»þŪ¤Ë¥Û¥¹¥È̾ %s ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "¥×¥í¥È¥³¥ë `%s' ¤òÍøÍѤǤ­¤ë¥×¥í¥Ð¥¤¥À¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/camel-session.c:394
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®½ÐÍè¤Þ¤»¤ó:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL ʸ»úÎó `%s' ¤Ï¥×¥í¥È¥³¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL ʸ»úÎó `%s' ¤Ï̵¸ú¤Ê¥×¥í¥È¥³¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "URL `%s' ¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos ¥Á¥±¥Ã¥È¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "¥µ¡¼¥Ð¤«¤é´Ö°ã¤Ã¤¿Ç§¾Ú±þÅú¤¬¤¢¤ê¤Þ¤·¤¿"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP ¥µ¡¼¥Ð¤«¤éͽ´ü¤·¤Ê¤¤±þÅú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP ¥³¥Þ¥ó¥É¤Ï¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "̤ÃΤΥ¨¥é¡¼"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "¥µ¡¼¥Ð¥ì¥¹¥Ý¥ó¥¹¤Ï¤¢¤Ã¤±¤Ê¤¯½ª¤ï¤ê¤Þ¤·¤¿"
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP ¥µ¡¼¥Ð¤Î±þÅú¤Ï %s ¾ðÊó¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP ¥µ¡¼¥Ð¤«¤éͽ´ü¤·¤Ê¤¤ OK ±þÅú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s ¤Î¥µ¥Þ¥ê¡¼¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH ±þÅú¤Ë¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«ÉÕ¤±¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP ¥µ¡¼¥Ð¤Ç¥á¡¼¥ë¤òÆɤó¤À¤êÃßÀѤ¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹"
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ IMAP ¥µ¡¼¥Ð¤ËÀܳ¤·¤Þ¤¹"
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï Kerberos 4 ǧ¾Ú¤ò»È¤Ã¤Æ IMAP ¥µ¡¼¥Ð¤ËÀܳ¤·¤Þ¤¹"
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%s %s@%s ¤Î IMAP ¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP ¥µ¡¼¥Ð¤Øǧ¾Ú½ÐÍè¤Þ¤»¤ó\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "MH ·Á¼°¤Î¥á¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "MH¥é¥¤¥¯¤Ê¥á¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥í¡¼¥«¥ë¥á¡¼¥ë¤òÊݸ¤·¤Þ¤¹"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "ɸ½àŪ¤Ê UNIX ¤Î mailbox ¥Õ¥¡¥¤¥ë"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "ɸ½à mbox ·¿¼°¤Ç¥í¡¼¥«¥ë¥á¡¼¥ë¤òÊݸ¤·¤Þ¤¹"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir·¿¼°¤Î¥á¡¼¥ë¥Õ¥¡¥¤¥ë"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "qmail maildir¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥í¡¼¥«¥ë¥á¡¼¥ë¤òÊݸ¤·¤Þ¤¹"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Êݸ¤µ¤ì¤¿¥ë¡¼¥È %s ¤ÏÀäÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Êݸ¤µ¤ì¤¿¥ë¡¼¥È %s ¤ÏÄ̾ï¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "¥í¡¼¥«¥ë¤Ø¤ÎÊݸ¤Ï inbox ¤ò»ý¤Æ¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "¥í¡¼¥«¥ë¥á¡¼¥ë¥Õ¥¡¥¤¥ë %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò %s ¤«¤é %s ¤Ø̾Á°Êѹ¹¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "¥Õ¥©¥ë¥À¤«¤é¥µ¥Þ¥ê¡¼¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-"¥Õ¥©¥ë¥À¤«¤é¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir ·Á¼°¤Î¥Õ¥©¥ë¥À¤Ø¥á¥Ã¥»¡¼¥¸¤òÄɲýÐÍè¤Þ¤»¤ó: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "¤½¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÆâÍƤÏ̵¸ú¤Ç¤¹"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥©¥ë¥À `%s' ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "¥Õ¥©¥ë¥À `%s' ¤Ï¸ºß¤·¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥©¥ë¥À `%s' ¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' ¤Ï maildir ·Á¼°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "¥Õ¥©¥ë¥À `%s' ¤òºï½ü¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "maildir ·Á¼°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "mailbox¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox ¥Õ¥¡¥¤¥ë¤Ë¥á¥Ã¥»¡¼¥¸¤òÄɲýÐÍè¤Þ¤»¤ó: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸ %s ¤ò¥Õ¥©¥ë¥À %s ¤«¤é¼èÆÀ½ÐÍè¤Þ¤»¤ó\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "¥Õ¥©¥ë¥À¤Ç²óÉüÉÔǽ¤Ê¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤è¤¦¤Ç¤¹"
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î²ò¼á¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ´Ö°ã¤Ã¤¿¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤¹¤«?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥¡¥¤¥ë `%s' ¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ¤ÏÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥©¥ë¥À `%s' ¤òºï½ü¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "¥Õ¥©¥ë¥À `%s' ¤Ï¶õ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. ºï½ü¤·¤Þ¤»¤ó"
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "¥Õ¥©¥ë¥À¤ò¥µ¥Þ¥é¥¤¥ºÃæ"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s: ¥Ý¥¸¥·¥ç¥ó %ld ¤«¤é¥µ¥Þ¥é¥¤¥ºÃæ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "¥Ý¥¸¥·¥ç¥ó %ld ÉÕ¶á ¥Õ¥©¥ë¥À %s ¤ÇÃ×̿Ū¤Ê¥á¡¼¥ë¹½Ê¸²òÀÏ¥¨¥é¡¼¤Ç¤¹"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò¥µ¥Þ¥é¥¤¥º¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
-msgid "Synchronising folder"
-msgstr "¥Õ¥©¥ë¥À¤òƱ´üÃæ"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò¥µ¥Þ¥é¥¤¥º¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "¥Æ¥ó¥Ý¥é¥ê mailbox ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Ʊ´ü¤·¤Þ¤·¤¿¤¬, ¥µ¥Þ¥ê¡¼¤È¥Õ¥©¥ë¥À¤¬ÉÔ°ìÃפǤ¹"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "ºî¶È mailbox ¤Ø½ñ¤­½Ð¤·Ãæ¤Ë¥¨¥é¡¼: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "ºî¶È mailbox ¤Ø½ñ¤­½Ð¤·Ãæ¤Ë¥¨¥é¡¼: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "¸µ¤Î¥Õ¥©¥ë¥À %s ¤òÊĤ¸¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "ºî¶È¥Õ¥©¥ë¥À¤òÊĤ¸¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "¥Õ¥©¥ë¥À¤ò¥ê¥Í¡¼¥à½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "̤ÃΤΥ¨¥é¡¼: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh ¥Õ¥©¥ë¥À¤Ø¥á¥Ã¥»¡¼¥¸¤òÄɲýÐÍè¤Þ¤»¤ó: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s@%s ¤Î NNTP ¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "¥µ¡¼¥Ð¤Ï¥æ¡¼¥¶Ì¾¤òµñÈݤ·¤Þ¤·¤¿"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "¥µ¡¼¥Ð¤Ø¥æ¡¼¥¶Ì¾¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "¥µ¡¼¥Ð¤Ï¥æ¡¼¥¶Ì¾/¥Ñ¥¹¥ï¡¼¥É¤òµñÈݤ·¤Þ¤·¤¿"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "¥á¥Ã¥»¡¼¥¸ %s ¤Ï¸«ÉÕ¤«¤ê¤Þ¤»¤ó"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "¥µ¡¼¥Ð¤«¤é¥°¥ë¡¼¥×¥ê¥¹¥È¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "%s ¤Î¥°¥ë¡¼¥×¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s ¤Î¥°¥ë¡¼¥×¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤òÊݸ½ÐÍè¤Þ¤»¤ó: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET news"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "¤³¤ì¤Ï USENET ¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤ØÁ÷¼õ¿®¤¹¤ë¤¿¤á¤Î¥×¥í¥Ð¥¤¥À¤Ç¤¹"
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "¥Ë¥å¡¼¥¹¥µ¡¼¥Ð¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "%s ·Ðͳ¤Î USENET News"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ NNTP ¥µ¡¼¥Ð¤Çǧ¾Ú¤·¤Þ¤¹"
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "%s ¤Î .newsrc ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Þ¤¿¤Ï³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "POP ¥µ¥Þ¥ê¤ò¼èÆÀÃæ"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "¥Õ¥©¥ë¥À¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: ¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤Ï̤´°À®¤Ç¤¹"
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "uid %s ¤Î¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "POP ¥á¥Ã¥»¡¼¥¸ %d ¤ò¼èÆÀÃæ"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "POP ¥µ¡¼¥Ð %s ¤«¤é¥á¥Ã¥»¡¼¥¸¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"POP ¥µ¡¼¥Ð¤ØÀܳ¤¹¤ë¤¿¤á¤Ë, POP ¥×¥í¥È¥³¥ë¤ÏÆÃÄê¤Î web "
-"¥á¡¼¥ë¥×¥í¥Ð¥¤¥À¤äÆȼ«¤Î¥á¡¼¥ë¥·¥¹¥Æ¥à¤«¤é E "
-"¥á¡¼¥ë¤ò¼õ¿®¤¹¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬½ÐÍè¤Þ¤¹"
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ POP ¥µ¡¼¥Ð¤ØÀܳ¤·¤Þ¤¹. "
-"¤³¤ì¤Ï¿¤¯¤Î POP ¥µ¡¼¥Ð¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹"
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï APOP ¥×¥í¥È¥³¥ë·Ðͳ¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ POP "
-"¥µ¡¼¥Ð¤ØÀܳ¤·¤Þ¤¹. ¤³¤ì¤Ï¸øÊ¿¤Ê¥µ¥Ý¡¼¥È¤òÍ׵᤹¤ë¥µ¡¼¥Ð¤Ç, "
-"¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬Àµ¾ï¤ËÆ°ºî¤¹¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr "¤³¤ì¤Ï POP ¥µ¡¼¥Ð¤ØÀܳ¤·, Kerberos 4 ǧ¾Ú¤ò»È¤¤¤Þ¤¹."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "KPOP ¥µ¡¼¥Ð¤Øǧ¾Ú½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "%s ¤Î POP ¥µ¡¼¥Ð¤ØÀܳ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%s %s@%s ¤Î POP3 ¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"POP ¥µ¡¼¥Ð¤ØÀܳ½ÐÍè¤Þ¤»¤ó\n"
-"¥æ¡¼¥¶Ì¾¤ÎÁ÷¿®Ãæ¤Ë¥¨¥é¡¼: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(̤ÃÎ)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"POP ¥µ¡¼¥Ð¤ØÀܳ½ÐÍè¤Þ¤»¤ó\n"
-"Í׵ᤷ¤¿Ç§¾Ú¼êÃʤϥµ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"POP ¥µ¡¼¥Ð¤ØÀܳ¤Ç¤­¤Þ¤»¤ó\n"
-"¥Ñ¥¹¥ï¡¼¥É¤ÎÁ÷¿®Ãæ¤Ë¥¨¥é¡¼: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "¤½¤Î¤è¤¦¤Ê¥Õ¥©¥ë¥À `%s' ¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"¥á¡¼¥ë¤òÇÛÁ÷¤¹¤ë¤¿¤á¤Ë¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Î \"sendmail\" ¥×¥í¥°¥é¥à¤ØÅϤ·¤Þ¤¹"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"sendmail ¤Ø¥Ñ¥¤¥×¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail ¤ò fork ½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail ¤Ï¥·¥°¥Ê¥ë %s ¤Ç½ªÎ»¤·¤Þ¤·¤¿: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "%s ¤ò¼Â¹Ô½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail ¤Ï¥¹¥Æ¡¼¥¿¥¹ %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "sendmail ·Ðͳ¤Ç¥á¡¼¥ë¤òÇÛ¿®"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "SMTP¤ò»È¤Ã¤Æ¥ê¥â¡¼¥È¥á¡¼¥ë¥Ï¥Ö¤ËÀܳ¤¹¤ë¤³¤È¤Ç¥á¡¼¥ë¤òÇÛ¿®¤·¤Þ¤¹\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "¹½Ê¸²òÀÏ¥¨¥é¡¼, ¥³¥Þ¥ó¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "¥Ñ¥é¥á¡¼¥¿¤¢¤ë¤¤¤Ï°ú¿ô¤Ë¹½Ê¸²òÀÏ¥¨¥é¡¼"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "¥³¥Þ¥ó¥É¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "¥³¥Þ¥ó¥É¥Ñ¥é¥á¡¼¥¿¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "¥·¥¹¥Æ¥à¥¹¥Æ¡¼¥¿¥¹¤¢¤ë¤¤¤Ï¥·¥¹¥Æ¥à¥Ø¥ë¥×±þÅú"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "¥µ¡¼¥Ó¥¹¤ÏÍøÍѤǤ­¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "¥µ¡¼¥Ó¥¹¤ÏÁ÷¿®¥Á¥ã¥ó¥Í¥ë¤òÊĤ¸¤Æ¤¤¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "¥µ¡¼¥Ó¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó, Á÷¿®¥Á¥ã¥ó¥Í¥ë¤òÊĤ¸¤Æ¤¤¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Í׵ᤵ¤ì¤¿¥á¡¼¥ë¤ÎÆ°ºî¤ÏOK, ´°Î»¤·¤Þ¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "¥æ¡¼¥¶¤Ï¥í¡¼¥«¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó; <forward-path> ¤ØžÁ÷¤·¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Í׵ᤵ¤ì¤¿¥á¡¼¥ë¤ÎÆ°ºî¤Ï´°Î»¤·¤Þ¤»¤ó: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Í׵ᤵ¤ì¤¿Æ°ºî¤Ï´°Î»¤·¤Þ¤»¤ó: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Í׵ᤵ¤ì¤¿Æ°ºî¤òÃæÃǤ·¤Þ¤·¤¿: ½èÍýÃæ¤Ë¥¨¥é¡¼"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "¥æ¡¼¥¶¤Ï¥í¡¼¥«¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó; <forward-path> ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Í׵ᤵ¤ì¤¿Æ°ºî¤Ï´°Î»¤·¤Þ¤»¤ó: ¥·¥¹¥Æ¥à¤ÎÊݸÎΰ褬­¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Í׵ᤵ¤ì¤¿¥á¡¼¥ë¤ÎÆ°ºî¤òÃæÃǤ·¤Þ¤·¤¿: Îΰè³ä¤êÅö¤Æ¤ò±Û¤¨¤Þ¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Í׵ᤵ¤ì¤¿Æ°ºî¤Ï´°Î»¤·¤Þ¤»¤ó: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ì¾¤Ïǧ¤á¤é¤ì¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "¥á¡¼¥ë¤ÎÆþÎϤò³«»Ï¤·¤Þ¤¹; <CRLF>.<CRLF> ¤Ç½ªÎ»¤·¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "½èÍý¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "½é´ü±þÅú¥¨¥é¡¼: %s: ¤¿¤Ö¤óÃ×̿Ū¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "ǧ¾Ú¤ÎɬÍפʤ·"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï°ì¼ï¤Îǧ¾Ú¤ò»È¤ï¤º¤Ë SMTP ¥µ¡¼¥Ð¤òÀܳ¤·¤Þ¤¹. "
-"¤³¤ì¤Ï¤¿¤¤¤Æ¤¤¤Î SMTP ¥µ¡¼¥Ð¤ØÀܳ¤·¤Æ¤â¹½¤ï¤Ê¤¤¤Ï¤º¤Ç¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï CRAM-MD5 ǧ¾Ú¤ò»È¤Ã¤Æ SMTP ¥µ¡¼¥Ð¤ØÀܳ¤·¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ¥µ¡¼¥Ð %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s ·Ðͳ¤Ç SMTP ¥á¡¼¥ë¤òÇÛ¿®¤·¤Þ¤¹"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó: Á÷¿®¼Ô¤Î¥¢¥É¥ì¥¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó: Á÷¿®¼Ô¤Î¥¢¥É¥ì¥¹¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó: ¼õ¿®¼Ô¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s: Ã×̿Ū¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s: Ã×̿Ū¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL FROM ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"DATA Á÷¿®¤Î¥¿¥¤¥à¥¢¥¦¥È: ¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: ¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»: %s: ¥á¡¼¥ë¤ÏÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "RSET ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT Í×µá¤Î¥¿¥¤¥à¥¢¥¦¥È: %s: Ã×̿Ū¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT ¥ì¥¹¥Ý¥ó¥¹¥¨¥é¡¼: %s: Ã×̿Ū¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "¤½¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¥á¡¼¥ë¥×¥í¥Ð¥¤¥À"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 ¥Ð¥¤¥È"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u ¥Ð¥¤¥È"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "źÉÕ"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "¥Õ¥¡¥¤¥ë¤òźÉÕ¤·¤Þ¤¹"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "ºï½ü"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "źÉÕʪ¥ê¥¹¥È¤«¤éÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤òºï½ü¤·¤Þ¤¹"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "źÉÕ¤ÎÄɲÃ..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ø¥Õ¥¡¥¤¥ë¤òźÉÕ¤·¤Þ¤¹"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
-msgid "Attachment"
-msgstr "źÉÕ"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "źÉդΥץí¥Ñ¥Æ¥£"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "¥Õ¥¡¥¤¥ë̾:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "¥¤¥ó¥é¥¤¥ó¤ÇźÉÕ"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME ¥¿¥¤¥×:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "º¹½Ð¿Í:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤Î¤¿¤á¤Ë¤³¤³¤Ç¥¯¥ê¥Ã¥¯"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤¿¤¤¿È¸µ¤òÆþÎϤ·¤Þ¤¹"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "°¸Àè:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î¼õ¼è¿Í¤òÆþÎϤ·¤Þ¤¹"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥«¡¼¥Ü¥ó¥³¥Ô¡¼¤ò¼õ¿®¤¹¤ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Þ¤¹"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¤Î¼õ¼è¿Í¥ê¥¹¥È¤ÎÃæ¤Ë¸½¤ì¤Ê¤¤¤Ç, "
-"¥á¥Ã¥»¡¼¥¸¤Î¥«¡¼¥Ü¥ó¥³¥Ô¡¼¤ò¼õ¿®¤¹¤ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Þ¤¹"
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "·ï̾:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "¥á¡¼¥ë¤Î·ï̾¤òÆþÎϤ·¤Þ¤¹"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"½ð̾¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "ÊÌ̾¤ÇÊݸ..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸÃæ¤Ë¥¨¥é¡¼: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÊѹ¹¤òÊݸÃæ..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÊѹ¹¤òÊݸ..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "'Áð°ÆÈ¢' ¤ØÁð°Æ¤òÊݸÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿: %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÁ÷¿®¤·¤Æ¤¤¤Þ¤»¤ó\n"
-"\n"
-"Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "¤½¤Î¥Õ¥¡¥¤¥ë¤Ï¸ºß¤·¤Þ¤»¤ó"
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "¤½¤ì¤ÏÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "¤½¤Î¥Õ¥¡¥¤¥ë¤Ï¸ºß¤·¤Þ¤¹¤¬¡¤Æɤ߼è¤ê²Äǽ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "¤½¤Î¥Õ¥¡¥¤¥ë¤Ï¥¢¥¯¥»¥¹²Äǽ¤Î¤è¤¦¤Ë¸«¤¨¤Þ¤¹¤¬¡¤open(2) ¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"¥Õ¥¡¥¤¥ë¤Ï¤È¤Æ¤âÂ礭¤¤ (100K °Ê¾å) ¤Ç¤¹\n"
-"ËÜÅö¤Ë¤½¤ì¤òÁÞÆþ¤¹¤ë¤³¤È¤ò˾¤ß¤Þ¤¹¤«?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "¥Õ¥¡¥¤¥ëÆɹþÃæ¤Î´Ö¤Ë¥¨¥é¡¼¤ÏȯÀ¸¤·¤Þ¤·¤¿"
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òºîÀ®¤·¤Þ¤¹"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "¥á¡¼¥ëºîÀ®¥¦¥£¥ó¥É¥¦¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Evolution ¥á¡¼¥ëºîÀ®¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "¥¢¥É¥ì¥¹¥«¡¼¥É"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "¥«¥ì¥ó¥À¾ðÊó"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "¼Â¹Ô¥µ¥Þ¥ê¤Î¤¿¤á¤Î Evolution ¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution ¼Â¹Ô¥µ¥Þ¥ê¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution ¼Â¹Ô¥µ¥Þ¥ê¡¼¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"¼Â¹Ô¥µ¥Þ¥ê¡¼¤ÎÇØ·ÊËè¤ËÊÌ¡¹¤ÎHTML¥Ú¡¼¥¸¤òÁªÂò¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹\n"
-"\n"
-"¥Ç¥Õ¥©¥ë¥È¤Ï¶õÇò¤Ç¤¹"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎGNOME¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç %s ¤ò³«¤¯"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎGNOME¥¦¥§¥Ö¥Ö¥é¥¦¥¶¤Ç %s ¤ò³«¤¯"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s ¤«¤é¥á¡¼¥ë¤òÁ÷¿®"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "%s ¤Ø¥Ó¥å¡¼¤òÊѹ¹"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s ¤ò¼Â¹Ô"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s ¤òÊĤ¸¤ë"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "º¸¤Ø %s ¤ò°ÜÆ°"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "±¦¤Ø %s ¤ò°ÜÆ°"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Á°¤ÎÎó¤ÎÃæ¤Ø %s ¤ò°ÜÆ°"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "¼¡¤ÎÎó¤ÎÃæ¤Ø %s ¤ò°ÜÆ°"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s ¤ÎÀßÄê"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML ¥Õ¥¡¥¤¥ë¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"¥Ç¡¼¥¿±Ó¤ß¹þ¤ßÃæ¤Ë¥¨¥é¡¼:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "¥Õ¥¡¥¤¥ë¤Ï¥µ¡¼¥Ó¥¹¤Î¾ì½ê¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "³°´Ñ"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "ÇØ·Ê:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"¼Â¹Ô¥µ¥Þ¥ê¡¼¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Ï Bonobo ¤ò½é´ü²½½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
-"¤â¤· RootPOA ¤Ë¤Ä¤¤¤Æ¤Î·Ù¹ð¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¤Ê¤é¡¤¤¿¤Ö¤ó OAF ¤ÎÂå¤ï¤ê¤Ë\n"
-"GOAD ¤ò»È¤Ã¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF ¥µ¥Þ¥ê¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ¥µ¥Þ¥ê"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "¥Æ¥¹¥È Bonobo ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "¥Æ¥¹¥È¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "¥Æ¥¹¥È Bonobo ¥µ¡¼¥Ó¥¹"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "¥Æ¥¹¥È¥µ¡¼¥Ó¥¹"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "¥¨¥é¡¼"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "¼«Æ°Åª¤Ë¹¹¿·"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "º£¤¹¤°¹¹¿·"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "¤¹¤Ù¤Æ¹¹¿· "
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "ʬ"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "ǯ"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "ǯ"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "·î"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "·î"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "½µ"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "½µ"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "Æü"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "»þ"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "»þ"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "ʬ"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr " ÉÃ"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " ÉÃ"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "ÆüÉÕ¤ÎÁªÂò¤ò˺¤ì¤Æ¤¤¤Þ¤¹"
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "̵¸ú¤ÊÆüÉÕ¤òÁªÂò¤·¤Æ¤¤¤Þ¤¹"
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"¥Õ¥£¥ë¥¿¤¬¼Â¹Ô¤µ¤ì¤ë¡¤¤Þ¤¿¤Ï²¾ÁÛ¥Õ¥©¥ë¥À¤¬\n"
-"³«¤«¤ì¤ë»þ¡¤¥á¥Ã¥»¡¼¥¸¤ÎÆüÉդϤɤó¤Ê»þ´Ö¤Ë\n"
-"ÂФ·¤Æ¤Ç¤âÈæ³Ó¤µ¤ì¤ë¤Ç¤·¤ç¤¦"
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¤ÎÆüÉդϤ³¤³¤Ç»ØÄꤹ¤ë»þ´Ö¤ËÂФ·¤Æ\n"
-"Èæ³Ó¤µ¤ì¤ë¤Ç¤·¤ç¤¦"
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¤ÎÆüÉդϥե£¥ë¥¿¤¬¼Â¹Ô¤µ¤ì¤ë»þ¤È\n"
-"´ØÏ¢¤·¤Æ¤¤¤ë»þ´Ö¤ËÂФ·¤ÆÈæ³Ó¤µ¤ì¤ë¤Ç¤·¤ç¤¦;\n"
-"Î㤨¤Ð¡¤\"°ì½µ´ÖÁ°\""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "¸½ºß»þ¹ï"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "»ØÄꤹ¤ë»þ´Ö"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "¸½ºß»þ¹ï¤Ø¤ÎÁêÂлþ´Ö"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "µÕÈæ³Ó"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "º£"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<ÆüÉÕ¤òÁªÂò¤¹¤ë¤¿¤á¤Ë¤³¤³¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "¥Õ¥£¥ë¥¿¥ë¡¼¥ë¤òÄɲÃ"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "¥Õ¥£¥ë¥¿¥ë¡¼¥ë¤òÊÔ½¸"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "ÆþÎÏ"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "½ÐÎÏ"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "¥Õ¥£¥ë¥¿¤òÊÔ½¸"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "¤½¤Î·ë²Ì"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Æ°ºî¤òÄɲÃ"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Æ°ºî¤òºï½ü"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"¥Õ¥©¥ë¥À¤ÎÁªÂò¤ò˺¤ì¤Æ¤¤¤Þ¤¹\n"
-"Ìá¤Ã¤Æ¥á¡¼¥ë¤òÇÛÁ÷¤¹¤ëÍ­¸ú¤Ê¥Õ¥©¥ë¥À¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "¥Õ¥©¥ë¥À¤òÁªÂò"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "¥Õ¥©¥ë¥À URI ¤ÎÆþÎÏ"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<¥Õ¥©¥ë¥À¤òÁªÂò¤¹¤ë¤¿¤á¤Ë¤³¤³¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Àµµ¬É½¸½ '%s' ¤Ç¥¨¥é¡¼¤Ç¤¹:\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "¥Æ¥¹¥È"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "¥ë¡¼¥ë̾: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "¥¿¥¤¥È¥ë¤Ê¤·"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "¤â¤·"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "¼¡¤Î¾ò·ï¤ÇÆ°ºî¤ò¼Â¹Ô:"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "¤¹¤Ù¤Æ¤Î´ð½à¤¬¹ç¤Ã¤¿»þ"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "¤¤¤¯¤Ä¤«¤Î´ð½à¤¬¹ç¤Ã¤¿»þ"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "´ð½à¤òÄɲÃ"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "´ð½à¤òºï½ü"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "½ÅÍ×"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "´ûÆÉ"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¤ÎÊÔ½¸"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "¥Õ¥£¥ë¥¿¥ë¡¼¥ë"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "ÆþÎÏ"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "½ÐÎÏ"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¤Î¥½¡¼¥¹"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "¥Õ¥©¥ë¥À¤Ø¥³¥Ô¡¼"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "¼õ¿®Æü"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Á÷¿®Æü"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "ɽ¸½"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "¥¢¥É¥ì¥¹¤ØžÁ÷"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "¥á¥Ã¥»¡¼¥¸ËÜÂÎ"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "¼õ¿®¤·¤¿¥á¥Ã¥»¡¼¥¸"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Á÷¿®¤·¤¿¥á¥Ã¥»¡¼¥¸"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "¼õ¿®¼Ô"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Àµµ¬É½¸½¤È°ìÃ×"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
-msgid "Score"
-msgstr "µ­Ï¿"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "¥¹¥Æ¡¼¥¿¥¹ÀßÄê"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "¥½¡¼¥¹"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "»ØÄê¤Î¥Ø¥Ã¥À"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "½èÍýÄä»ß"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1168
-msgid "Subject"
-msgstr "·ï̾"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "¤¬¼¡¤Î¤â¤Î¤ò´Þ¤Þ¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç½ª¤é¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "¤¬Â¸ºß¤·¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Î¤è¤¦¤Ç¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç»Ï¤Þ¤é¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç½ª¤ï¤ë"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "¤¬Â¸ºß¤¹¤ë"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "¤¬¼¡¤Î¤â¤Î¤è¤êÂ礭¤¤"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "¤¬¼¡¤Î¤â¤Î¤è¤ê¾®¤µ¤¤"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç¤Ï¤Ê¤¤"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "¤¬¼¡¤Î¤â¤Î¤È°ìÃפ¹¤ë"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Î¤è¤¦¤Ë¸«¤¨¤ë"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç³«»Ï¤¹¤ë"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "¤¬¼¡¤Î¤â¤Î¤è¤ê¸å"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "¤¬¼¡¤Î¤â¤Î¤è¤êÁ°"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "¥ë¡¼¥ë¤òÄɲÃ"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "¥¹¥³¥¢¥ë¡¼¥ë¤ÎÊÔ½¸"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¥ë¡¼¥ë¤ÎÄɲÃ"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¥ë¡¼¥ë¤ÎÊÔ½¸"
-
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:219 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "¤´¤ßÈ¢"
-
-#: mail/component-factory.c:305
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Evolution ¥á¡¼¥ë¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: mail/component-factory.c:378
-msgid "Cannot register storage with shell"
-msgstr "¥·¥§¥ë¤Ç¥¹¥È¥ì¡¼¥¸¤òÅÐÏ¿½ÐÍè¤Þ¤»¤ó"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "ËÜÂΤޤ¿¤Ï·ï̾¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "ËÜÂΤ¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "·ï̾¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "ËÜÂΤ¬¼¡¤Î¤â¤Î¤ò´Þ¤Þ¤Ê¤¤"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "·ï̾¤¬¼¡¤Î¤â¤Î¤ò´Þ¤Þ¤Ê¤¤"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Á÷¿®¼Ô¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "·ï̾¤Î²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Á÷¿®¼Ô¤Î²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "¼õ¿®¼Ô¤Î²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "·ï̾¤Î¥Õ¥£¥ë¥¿"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Á÷¿®¼Ô¤Î¥Õ¥£¥ë¥¿"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "¼õ¿®¼Ô¤Î¥Õ¥£¥ë¥¿"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥Õ¥£¥ë¥¿"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "³«¤¯"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "ÊÌ̾¤ÇÊݸ..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "°õºþ"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Á÷¿®¼Ô¤ØÊÖ¿®"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Á´°÷¤ØÊÖ¿®"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "žÁ÷"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "¥¤¥ó¥é¥¤¥ó¤ÇžÁ÷"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "´ûÆɤȤ·¤Æ¥Þ¡¼¥¯"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "̤ÆɤȤ·¤Æ¥Þ¡¼¥¯"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø¥³¥Ô¡¼..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "ºï½ü¼è¾Ã"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "¥Õ¥£¥ë¥¿Å¬ÍÑ"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤«¤é¥ë¡¼¥ë¤òºîÀ®"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥Õ¥£¥ë¥¿ (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "¥á¡¼¥ë¤ò°·¤¦¤¿¤á¤Î Evolution ¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution ¥á¡¼¥ë¥³¥ó¥Ý¡¼¥¶"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution ¥á¡¼¥ë¼Â¹Ô¥µ¥Þ¥ê¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution ¥á¡¼¥ë¥Õ¥©¥ë¥À¥Ç¥£¥¹¥×¥ì¥¤¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolutgion ¥á¡¼¥ë¥Õ¥©¥ë¥À¥Õ¥¡¥¯¥È¥ê¥³¥ó¥Ý¡¼¥Í¥ó¥È"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution ¥³¥ó¥Ý¡¼¥¶¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution ¥á¡¼¥ë¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "¥á¡¼¥ë¥µ¥Þ¥ê¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Outlook Express 4 ¤Î¥á¡¼¥ë¤ò Evolution ¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¥Õ¥¡¥¯¥È¥ê"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "mbox ¤ò Evolution ¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¥Õ¥¡¥¯¥È¥ê"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express 4 ¤Î¥Õ¥¡¥¤¥ë¤ò Evolution ¤Ë¥¤¥ó¥Ý¡¼¥È"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "mbox ¥Õ¥¡¥¤¥ë¤ò Evolution ¤Ë¥¤¥ó¥Ý¡¼¥È"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "¸½ºß¤ÎÊݸ·Á¼°:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î·Á¼°"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "¿·µ¬Êݸ·Á¼°:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "¥Î¡¼¥È"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (¥Ç¥Õ¥©¥ë¥È)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Evolution ¥¢¥«¥¦¥ó¥È¥Þ¥Í¡¼¥¸¥ã"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"¿¤¯¤Î¥µ¡¼¥Ð¤ÏÀµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-"¤É¤¦¤·¤Æ¤âÊݸ¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Evolution ¥¢¥«¥¦¥ó¥È¥¨¥Ç¥£¥¿"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "%s ¤Ø¥á¡¼¥ë"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "·ï̾¤Ï %s ¤Ç¤¹"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "%s ¤«¤é¥á¡¼¥ë"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
-"Á÷¼õ¿®¡¤¥á¡¼¥ë¤ÎºîÀ®¤ò¤¹¤ëÁ°¤ËÀßÄꤹ¤ë\n"
-"ɬÍפ¬¤¢¤ê¤Þ¤¹\n"
-"º£ÀßÄꤷ¤Þ¤¹¤«?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"¤¢¤Ê¤¿¤Ï¥á¡¼¥ë¤òºîÀ®¤¹¤ëÁ°¤Ë¿È¸µ¤Î\n"
-"ÀßÄê¤ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"¤¢¤Ê¤¿¤Ï¥á¡¼¥ë¤òºîÀ®¤¹¤ëÁ°¤Ë¥á¡¼¥ë\n"
-"ÇÛÁ÷¤ÎÀßÄê¤ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "¥á¡¼¥ëžÁ÷¥á¥½¥Ã¥É¤ÎÀßÄ꤬¤¢¤ê¤Þ¤»¤ó"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï·ï̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
-"ËÜÅö¤ËÁ÷¿®¤·¤Þ¤¹¤«?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "¤³¤Î¥á¡¼¥ë¤òÁ÷¿®¤¹¤ëÁ°¤Ë¥¢¥«¥¦¥ó¥È¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤¹¤ëŬÀڤʼõ¿®¼Ô¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "On %s, %s wrote:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òžÁ÷:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°¤·¤Þ¤¹: "
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤·¤Þ¤¹: "
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"¥É¥é¥Õ¥È¥Õ¥©¥ë¥ÀÆâ¤ËÊݸ¤µ¤ì¤¿\n"
-"¥á¥Ã¥»¡¼¥¸¤À¤±¤òÊÔ½¸¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹"
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Þ¤¹¤«?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"¤½¤Î̾Á°¤Î¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹\n"
-"¾å½ñ¤­¤·¤Þ¤¹¤«?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÊÌ̾¤ÇÊݸ..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÊÌ̾¤ÇÊݸ..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"¥Õ¥£¥ë¥¿¾ðÊó¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î°õºþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "¥µ¡¼¥Ð¤ØÀܳÃæ"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "¥µ¡¼¥Ð¤ØÀܳ"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "¥¢¥«¥¦¥ó¥È"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "¥¢¥«¥¦¥ó¥È¾ðÊó"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "¥¢¥«¥¦¥ó¥È´ÉÍý"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "¥¢¥«¥¦¥ó¥È¤Î¥×¥í¥Ñ¥Æ¥£"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "¾åµé"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "ǧ¾Ú"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "ǧ¾Ú¼ïÊÌ:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "¤¹¤Ù¤Æ¤Î¥á¡¼¥ë¤ò¼«Æ°Åª¤Ë¥Á¥§¥Ã¥¯¤¹¤ë"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "¥Á¥§¥Ã¥¯¤ÎÀßÄê"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"¤ª¤á¤Ç¤È¤¦¤´¤¶¤¤¤Þ¤¹, ¤¢¤Ê¤¿¤Î¥á¡¼¥ë¤ÎÀßÄê¤Ï´°Î»¤·¤Þ¤·¤¿\n"
-"\n"
-"º£¤¹¤° Evolution ¤ò»È¤Ã¤Æ¥á¡¼¥ë¤ÎÁ÷¼õ¿®¤ò¤¹¤ë\n"
-"½àÈ÷¤¬À°¤¤¤Þ¤·¤¿\n"
-"\n"
-"\"´°Î»\" ¤ò¥¯¥ê¥Ã¥¯¤·¤ÆÀßÄê¤òÊݸ¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "¥Ç¥Õ¥©¥ë¥È"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "´°Î»"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "¥á¡¼¥ë¥¢¥É¥ì¥¹:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "¥á¡¼¥ë¥¢¥É¥ì¥¹:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution ¥á¡¼¥ëÀßÄê"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "¥Õ¥ë¥Í¡¼¥à:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "¥Û¥¹¥È̾:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "¿È¸µ"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "¼õ¿®¥á¡¼¥ë¥µ¡¼¥Ð"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "¥µ¡¼¥Ð¤Ë¥á¡¼¥ë¤ò»Ä¤·¤Þ¤¹"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "¥á¡¼¥ë"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "¥á¡¼¥ë¥¢¥«¥¦¥ó¥È"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "¥á¡¼¥ë¤ÎÀßÄê"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "¥á¡¼¥ëÀßÄê¥É¥ë¥¤¥É"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "¥Ç¥Õ¥©¥ë¥È¥¢¥«¥¦¥ó¥È¤òºî¤ë"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr ""
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "¤½¤Î¾"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "¥Ë¥å¡¼¥¹"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "¥ª¥×¥·¥ç¥ó"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "ÁÈ¿¥:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Á÷¿®¥á¡¼¥ë¥µ¡¼¥Ð"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "¥Ñ¥¹¥ï¡¼¥É:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "¥á¡¼¥ë¤ò¼õ¿®Ãæ"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "¤³¤Î¥Ñ¥¹¥ï¡¼¥É¤òµ­²±"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "ÊÖ¿®Àè:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "ɬÍ×"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÊݸ"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "½ð̾¥Õ¥¡¥¤¥ë¤òÁªÂò"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç HTML ·Á¼°¤Î¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë"
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "¥á¡¼¥ë¤òÁ÷¿®Ãæ"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "¥µ¡¼¥Ð¤ÎÀßÄê"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "¥µ¡¼¥Ð¼ïÊÌ:"
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "¥µ¡¼¥Ð¤Ïǧ¾Ú¤¬É¬Í×"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "¥µ¡¼¥Ð"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "½ð̾¥Õ¥¡¥¤¥ë:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "½ð̾:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "¥½¡¼¥¹"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "¤³¤Î¥µ¡¼¥Ð¤Ï°ÂÁ´¤ÊÀܳ (SSL) ¤¬É¬ÍפǤ¹"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "¼ïÊÌ"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"¤½¤ì¤é¤Î¥µ¡¼¥Ð¤ò»²¾È¤·¤¿¤¤Ì¾Á°¤Î¼ïÊ̤Ǥ¹. Î㤨¤Ð: \"»Å»ö\" ¤¢¤ë¤¤¤Ï \"²È\""
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "¥æ¡¼¥¶¾ðÊó"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "¥æ¡¼¥¶Ì¾:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Evolution ¥á¡¼¥ëÀßÄê¥É¥ë¥¤¥É¤Ø¤è¤¦¤³¤½\n"
-"\n"
-"\"¼¡\" ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ»Ï¤á¤Æ¤¯¤À¤µ¤¤"
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "ʬ"
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"ÆþÎϤΥ᡼¥ëÀßÄê¤Î³Îǧ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-"%s ¤«¤é¤¢¤Ê¤¿¤Î¥á¡¼¥ë¤ò¼èÆÀÃæ¤ËÌäÂê¤òȯ¸«¤·¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "̾Á°¶õ´Ö:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"½ÐÎϤΥ᡼¥ëÀßÄê¤Î³Îǧ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-"%s ¤ò»È¤Ã¤Æ¤¢¤Ê¤¿¤Î¥á¡¼¥ë¤òÁ÷¿®Ãæ¤ËÌäÂê¤òȯ¸«¤·¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Evolution ¥¢¥«¥¦¥ó¥È¥¦¥£¥¶¡¼¥É"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "źÉÕ¤ÎÊݸ"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "¥Ç¥£¥¹¥¯¤ØÊݸ..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ¤Ë³«¤¯..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "¥¤¥ó¥é¥¤¥óɽ¼¨"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "³°Éô¥Ó¥å¡¼¥¢"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "¥¤¥ó¥é¥¤¥óɽ¼¨ (%s·Ðͳ)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "±£¤¹"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s ¤òźÉÕ"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÆâÍƤòÆɤ߹þ¤ßÃæ"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "°Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ïɽ¼¨¤·¤Þ¤»¤ó"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "°Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤ÆÉü¹æ²½¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¥Ç¥¸¥¿¥ë½ð̾¤µ¤ì¿®Íê¤Ç¤­¤ë¤â¤Î¤Ç¤¹"
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¥Ç¥¸¥¿¥ë½ð̾¤µ¤ì¤¿¤â¤Î¤Ç¤¹¤¬, ¿®Íê¤ò¾ÚÌÀ½ÐÍè¤Þ¤»¤ó"
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP ¥µ¥¤¥È (%s) ¤ò»Ø¤·¤Æ¤¤¤Þ¤¹"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë (%s) ¤ò»Ø¤·¤Æ¤¤¤Þ¤¹"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "̤ÃΤγ°Éô¥Ç¡¼¥¿ (\"%s\" ¥¿¥¤¥×) ¤ò»Ø¤·¤Æ¤¤¤Þ¤¹"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "¥í¡¼¥«¥ë¥Õ¥©¥ë¥À¤òÅÐÏ¿Ãæ"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "¥í¡¼¥«¥ë¥Õ¥©¥ë¥À¤òÅÐÏ¿¤·¤Þ¤¹"
-
-#: mail/mail-local.c:553
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"¥Õ¥©¥ë¥À '%s' ¤òÅÐÏ¿¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó:\n"
-"%s"
-
-#: mail/mail-local.c:717
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "¥Õ¥©¥ë¥À \"%s\" ¤ò \"%s\" ·Á¼°¤ØÊѹ¹¤·¤Æ¤¤¤Þ¤¹"
-
-#: mail/mail-local.c:721
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "¥Õ¥©¥ë¥À \"%s\" ¤ò \"%s\" ·Á¼°¤ØÊѹ¹¤·¤Þ¤¹"
-
-#: mail/mail-local.c:752
-msgid "Reconfiguring folder"
-msgstr "¥Õ¥©¥ë¥À¤ÎºÆ¹½À®Ãæ"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:781
-msgid "Closing current folder"
-msgstr "¸½ºß¤Î¥Õ¥©¥ë¥À¤ò¥¯¥í¡¼¥ºÃæ"
-
-#: mail/mail-local.c:813
-msgid "Renaming old folder and opening"
-msgstr "¸Å¤¤¥Õ¥©¥ë¥À¤ò¥ê¥Í¡¼¥à¤·¤Æ¥ª¡¼¥×¥óÃæ"
-
-#: mail/mail-local.c:831
-msgid "Creating new folder"
-msgstr "¿·µ¬¥Õ¥©¥ë¥À¤òºîÀ®Ãæ"
-
-#: mail/mail-local.c:845
-msgid "Copying messages"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼Ãæ"
-
-#: mail/mail-local.c:866
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"¥Õ¥©¥ë¥À¤Î¥á¥¿¾ðÊó¤òÊݸ½ÐÍè¤Þ¤»¤ó; ¤â¤Ï¤ä¤³¤Î¥Õ¥©¥ë¥À¤ò³«¤¯\n"
-"¤³¤È¤¬½ÐÍè¤Ê¤¤¤È¤¿¤Ö¤óµ¤¤Å¤¤¤¿¤Î¤Ç¤·¤ç¤¦: %s"
-
-#: mail/mail-local.c:898
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"'%s' ¤ÎºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Áàºî¤Î½àÈ÷¤·¤Æ¤¤¤ë´Ö¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "ºî¶ÈÃæ"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" ¤òÁ÷¿®Ãæ"
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®Ãæ"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "\"%s\" ¤òÄɲÃÃæ"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "·ï̾¤Ê¤·¤Î¥á¥Ã¥»¡¼¥¸¤òÉÕ²Ã"
-
-#: mail/mail-ops.c:841
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "\"%s\" ¤«¤é \"%s\" ¤ÎÃæ¤Ø¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°Ãæ"
-
-#: mail/mail-ops.c:843
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "\"%s\" ¤«¤é \"%s\" ¤ÎÃæ¤Ø¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼Ãæ"
-
-#: mail/mail-ops.c:846
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "\"%s\" ¤«¤é \"%s\" ¤ÎÃæ¤Ø¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°"
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "\"%s\" ¤«¤é \"%s\" ¤ÎÃæ¤Ø¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼"
-
-#: mail/mail-ops.c:879
-msgid "Moving"
-msgstr "°ÜÆ°Ãæ"
-
-#: mail/mail-ops.c:882
-msgid "Copying"
-msgstr "¥³¥Ô¡¼Ãæ"
-
-#: mail/mail-ops.c:902
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s %d / %d (uid \"%s\")"
-
-#: mail/mail-ops.c:977
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" ¤ÎÃæ¤Î¥Õ¥©¥ë¥À¤òÁöººÃæ"
-
-#: mail/mail-ops.c:1089
-msgid "Forwarded messages"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òžÁ÷"
-
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
-#, c-format
-msgid "Opening folder %s"
-msgstr "\"%s\" ¤ÎÃæ¤Î¥Õ¥©¥ë¥À¤ò¥ª¡¼¥×¥óÃæ"
-
-#: mail/mail-ops.c:1195
-#, c-format
-msgid "Opening store %s"
-msgstr ""
-
-#: mail/mail-ops.c:1376
-msgid "Expunging folder"
-msgstr "¥Õ¥©¥ë¥À¤òºï½üÃæ"
-
-#: mail/mail-ops.c:1425
-#, c-format
-msgid "Retrieving message %s"
-msgstr "¥á¥Ã¥»¡¼¥¸ %s ¤ò¼èÆÀÃæ"
-
-#: mail/mail-ops.c:1492
-msgid "Retrieving messages"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¼èÆÀÃæ"
-
-#: mail/mail-ops.c:1502
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "¥á¥Ã¥»¡¼¥¸ÈÖ¹æ %d / %d (uid \"%s\") ¤ò¼èÆÀÃæ"
-
-#: mail/mail-ops.c:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "%s ¤Î¤´¤ßÈ¢¥Õ¥©¥ë¥À¤ò¥ª¡¼¥×¥óÃæ"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s ¥Õ¥©¥ë¥À (%s ÍÑ) ¤ò¥í¡¼¥ÉÃæ"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s ¥Õ¥©¥ë¥À (%s ÍÑ) ¤ò¥í¡¼¥É"
-
-#: mail/mail-ops.c:1969
-msgid "Saving messages"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÊݸÃæ"
-
-#: mail/mail-ops.c:2048
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"½ÐÎÏ¥Õ¥¡¥¤¥ë¤òºîÀ®½ÐÍè¤Þ¤»¤ó: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2061
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "¥á¥Ã¥»¡¼¥¸ %d / %d (uid \"%s\") ¤òÊݸÃæ"
-
-#: mail/mail-ops.c:2075
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"¥Õ¥¡¥¤¥ë¤ÎÊݸÃæ¤Ë¥¨¥é¡¼: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2149
-msgid "Saving attachment"
-msgstr "źÉÕ¤òÊݸÃæ"
-
-#: mail/mail-ops.c:2164
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"½ÐÎÏ¥Õ¥¡¥¤¥ë¤òºîÀ®½ÐÍè¤Þ¤»¤ó: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2192
-#, c-format
-msgid "Could not write data: %s"
-msgstr "¥Ç¡¼¥¿¤ò½ñ¤­½Ð¤¹¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "¸¡º÷(_S)"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "¥­¥ã¥ó¥»¥ëÃæ ..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "¥á¡¼¥ë¤ÎÁ÷¼õ¿®"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "¼õ¿®Ãæ"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "¹¹¿·Ãæ ..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "ÂÔµ¡Ãæ ..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Á÷¿®Ãæ"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "¥­¥ã¥ó¥»¥ë¤·¤Þ¤·¤¿"
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "´°Î»¤·¤Þ¤·¤¿"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
-msgid "Incomplete message written on pipe!"
-msgstr "¥Ñ¥¤¥×¾å¤ËÉÔ´°Á´¤Ê¥á¥Ã¥»¡¼¥¸¤¬½ñ¤«¤ì¤Þ¤·¤¿!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"%s ¤Ø½àÈ÷¤·¤Æ¤¤¤ë´Ö¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"`%s' ¤ÎºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Çɸ¯¤µ¤ì¤¿¥¹¥ì¥Ã¥É¤«¤é¥³¥Þ¥ó¥ÉÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Çɸ¯¤µ¤ì¤¿¥¹¥ì¥Ã¥É¤«¤éÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "¥æ¡¼¥¶¤Ï¥¯¥¨¥ê¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤·¤¿"
-
-#: mail/mail-tools.c:198
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "¥Æ¥ó¥Ý¥é¥ê mbox '%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: mail/mail-tools.c:256
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (¥á¥Ã¥»¡¼¥¸¤òžÁ÷)"
-
-#: mail/mail-tools.c:266
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (·ï̾¤Ê¤·)"
-
-#: mail/mail-tools.c:283
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òžÁ÷¤·¤Þ¤·¤¿ - %s"
-
-#: mail/mail-tools.c:285
-msgid "Forwarded message (no subject)"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òžÁ÷¤·¤Þ¤·¤¿ (·ï̾¤Ê¤·)"
-
-#: mail/mail-tools.c:357
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"`%s' ¤Î¾ì½ê¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó:\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "¿·µ¬²¾ÁÛ¥Õ¥©¥ë¥À"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "ÊÖ¿®"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Îº¹½Ð¿Í¤ØÊÖ¿®¤·¤Þ¤¹"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Î¼õ¼è¿ÍÁ´°÷¤ØÊÖ¿®¤·¤Þ¤¹"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òžÁ÷¤·¤Þ¤¹"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "ÁªÂò¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò°õºþ¤·¤Þ¤¹"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Þ¤¹"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "̤ÆÉ"
-
-#: mail/message-list.c:621
-msgid "Seen"
-msgstr "´ûÆÉ"
-
-#: mail/message-list.c:624
-msgid "Answered"
-msgstr "ÊÖÅúºÑ¤ß"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Ê£¿ô¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Ê£¿ô¤Î¥á¥Ã¥»¡¼¥¸"
-
-#: mail/message-list.c:948
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:960 mail/message-list.c:976
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:963 mail/message-list.c:979
-msgid "<unknown>"
-msgstr "<̤ÃÎ>"
-
-#: mail/message-list.c:1031
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1038
-msgid "Today %l:%M %p"
-msgstr "º£Æü¤Î %p %l:%M"
-
-#: mail/message-list.c:1047
-msgid "Yesterday %l:%M %p"
-msgstr "ºòÆü¤Î %p %l:%M"
-
-#: mail/message-list.c:1059
-msgid "%a %l:%M %p"
-msgstr "%p %l:%M (%a)"
-
-#: mail/message-list.c:1067
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %p %l:%M"
-
-#: mail/message-list.c:1069
-msgid "%b %d %Y"
-msgstr "%Y %b %d"
-
-#: mail/message-list.c:1167
-msgid "Flagged"
-msgstr "¥Õ¥é¥°"
-
-#: mail/message-list.c:1168
-msgid "From"
-msgstr "º¹½Ð¿Í"
-
-#: mail/message-list.c:1168
-msgid "Date"
-msgstr "ÆüÉÕ"
-
-#: mail/message-list.c:1168
-msgid "Received"
-msgstr ""
-
-#: mail/message-list.c:1169
-msgid "To"
-msgstr "°¸Àè"
-
-#: mail/message-list.c:1169
-msgid "Size"
-msgstr "¥µ¥¤¥º"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "¤¢¤Ê¤¿¤Î %s ¥Ñ¥¹¥Õ¥ì¡¼¥º ( %s ÍÑ) ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "¤¢¤Ê¤¿¤Î %s ¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP ¥×¥í¥°¥é¥à¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Ä󶡤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "GPG/PGP ¤Ø¤Î¥Ñ¥¤¥×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "ºî¶È¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "¥Õ¥©¥ë¥À"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "µ­Ï¿"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "ɽ¼¨¤¹¤ë¥Õ¥©¥ë¥À¤ò³«»Ï¤¹¤ë:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" ¤Îµ­Ï¿¤ò¼èÆÀÃæ"
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "\"%s\" ¤Îµ­Ï¿¤ò¼èÆÀ"
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "¥Õ¥©¥ë¥À̾:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "¥Õ¥©¥ë¥À¼ïÊÌ:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "¥Õ¥©¥ë¥À¤òºîÀ®¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ\n"
-"¥¤¥ó¥Ý¡¼¥¿¤Î½àÈ÷¤¬½ÐÍè¤Æ¤¤¤Þ¤»¤ó\n"
-"5ÉÃÂԤäƺÆÅٻ¤Æ¤¯¤À¤µ¤¤"
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ\n"
-"¥¢¥¤¥Æ¥à %d ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ"
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"°·¤¦¤³¤È¤¬½ÐÍè¤ë¥¤¥ó¥Ý¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "¥¤¥ó¥Ý¡¼¥ÈÃæ"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ\n"
-"%s ¤ò³«»Ï¤·¤Þ¤¹"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "%s ¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ\n"
-"¥¢¥¤¥Æ¥à 1 ¤ò¥¤¥ó¥Ý¡¼¥ÈÃæ"
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "¼«Æ¯"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "¥Õ¥¡¥¤¥ë̾:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "¥Õ¥¡¥¤¥ë¤òÁªÂò"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "¥Õ¥¡¥¤¥ë¼ïÊÌ:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
-msgid "Import"
-msgstr "¥¤¥ó¥Ý¡¼¥È"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"\"¥¤¥ó¥Ý¡¼¥È\" ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ Evolution "
-"¤Ø¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ý¡¼¥È¤ò³«»Ï¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution ¥¤¥ó¥Ý¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution ¥¤¥ó¥Ý¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution ¤Î¥¤¥ó¥¹¥È¡¼¥ë"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"¤³¤Î Evolution ¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ï¤¢¤Ê¤¿¤Î¥Ñ¡¼¥½¥Ê¥ë Evolution\n"
-"¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤ËÉղåե¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "\"OK\" ¤Ç¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë, ¤Þ¤¿¤Ï \"¥­¥ã¥ó¥»¥ë\" ¤Ç½ªÎ»¤·¤Þ¤¹"
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Àµ¤·¤¯¥Õ¥¡¥¤¥ë¤ò¹¹¿·½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution ¤Î¥Õ¥¡¥¤¥ë¤ÏÀµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤·¤¿"
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "¤³¤ì¤Ï Evolution ¤ò¼Â¹Ô¤·¤¿ºÇ½é¤Î¤è¤¦¤Ë»×¤ï¤ì¤Þ¤¹"
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Evolution ¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤Î¤Ç \"OK\" ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®½ÐÍè¤Þ¤»¤ó\n"
-"\n"
-"¥¨¥é¡¼: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"'%s' ¤ÎÃæ¤Ë¥Õ¥¡¥¤¥ë¤ò\n"
-"¥³¥Ô¡¼½ÐÍè¤Þ¤»¤ó"
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"¥Õ¥¡¥¤¥ë '%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-"Evolution ¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò\n"
-"µöÍƤ¹¤ë¤¿¤á¤Ë°ÜÆ°¤·¤Æ²¼¤µ¤¤"
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤Ï¸ºß¤·¤Æ¤Þ¤¹¤¬¡¤Evolution\n"
-"¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥Evolution ¥æ¡¼¥¶\n"
-"¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥¹¥È¡¼¥ë¤òµöÍƤ¹¤ë¤¿¤á¤Ë°ÜÆ°¤·¤Æ²¼¤µ¤¤"
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"»ØÄꤵ¤ì¤¿¥Õ¥©¥ë¥À¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "»ØÄꤵ¤ì¤¿¥Õ¥©¥ë¥À̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - ¿·µ¬¥Õ¥©¥ë¥À¤ÎºîÀ®"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"ÁªÂò¤·¤¿¥Õ¥©¥ë¥À¤Î¼ïÊ̤ÏÍ׵ᤵ¤ì¤¿Áàºî¤Î¤¿¤á¤Ë\n"
-"Í­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "¿·µ¬..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(¥¿¥¤¥È¥ë¤Ê¤·)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy ¤Ï¤¢¤Ê¤¿¤Î $PATH ¤Ë¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy ¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution ¤Ï GNOME ¥Ç¥¹¥¯¥È¥Ã¥×\n"
-"´Ä¶­¤Ç¤Î¥á¡¼¥ë¡¤¥«¥ì¥ó¥À¡¤¤½¤·¤Æ\n"
-"¥³¥ó¥¿¥¯¥È¥Þ¥Í¡¼¥¸¥á¥ó¥È¤Î¤¿¤á¤Î\n"
-"¥°¥ë¡¼¥×¥¦¥§¥¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î\n"
-"¥Ñ¥Ã¥±¡¼¥¸¥½¥Õ¥È¤Ç¤¹"
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(ɽ¼¨¤·¤¿¥Õ¥©¥ë¥À¤Ï¤¢¤ê¤Þ¤»¤ó)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "¥Õ¥©¥ë¥À"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "¶ÉÉôµ­²±ÁõÃ֤Υ»¥Ã¥È¥¢¥Ã¥×¤¬½ÐÍè¤Þ¤»¤ó -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"`%s' ¥Ó¥å¡¼¤ÏÆÍÁ³»àË´¤·¤Þ¤·¤¿ :-(\n"
-"¤³¤ì¤Ï¤¿¤Ö¤ó %s ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬¥¯¥é¥Ã¥·¥å¤·¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "¿·µ¬¥·¥ç¡¼¥È¥«¥Ã¥È¥°¥ë¡¼¥×¤òºîÀ®¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "¥°¥ë¡¼¥×̾:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"ËÜÅö¤Ë¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤«¤é¥°¥ë¡¼¥×\n"
-"`%s' ¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "ºï½ü¤·¤Þ¤»¤ó"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "¾®¤µ¤¤¥¢¥¤¥³¥ó(_S)"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "¾®¤µ¤¤¥¢¥¤¥³¥ó¤Ç¥·¥ç¡¼¥È¥«¥Ã¥È¤òɽ¼¨¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Â礭¤¤¥¢¥¤¥³¥ó(_L)"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Â礭¤¤¥¢¥¤¥³¥ó¤Ç¥·¥ç¡¼¥È¥«¥Ã¥È¤òɽ¼¨¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "¿·µ¬¥°¥ë¡¼¥×(_N)..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "¿·µ¬¥·¥ç¡¼¥È¥«¥Ã¥È¥°¥ë¡¼¥×¤òºîÀ®¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "¤³¤Î¥°¥ë¡¼¥×¤òºï½ü(_R)..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "¤³¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¥°¥ë¡¼¥×¤òºï½ü¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤ò±£¤¹(_H)"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤ò±£¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "¥¢¥¯¥Æ¥£¥Ö"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "¤³¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¤ò¥¢¥¯¥Æ¥£¥Ö¤Ë¤·¤Þ¤¹"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤«¤é¤³¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¤òºï½ü¤·¤Þ¤¹"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¤ÎÊݸÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "ɽ¼¨(_V)"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥©¥ë¥À¤òɽ¼¨¤·¤Þ¤¹"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(̾Á°¤Ê¤·)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "°ìÈÌŪ¤Ê¥¨¥é¡¼"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Ʊ¤¸Ì¾Á°¤Î¥Õ¥©¥ë¥À¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "»ØÄꤵ¤ì¤¿¥Õ¥©¥ë¥À¼ïÊ̤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "I/O ¥¨¥é¡¼"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "¥Õ¥©¥ë¥À¤òºîÀ®¤¹¤ë½½Ê¬¤Ê¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "»ØÄꤵ¤ì¤¿¥Õ¥©¥ë¥À¤Ï¸«ÉÕ¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "µ¡Ç½¤Ï¤³¤Îµ­²±ÁõÃ֤ǤϼÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Áàºî¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "»ØÄꤵ¤ì¤¿¼ïÊ̤Ϥ³¤Îµ­²±ÁõÃ֤Ǥϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution ¥·¥§¥ë"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"¤ä¤¢¡¤Evolution ¥°¥ë¡¼¥×¥¦¥§¥¢¥¹¥¤¡¼¥È¤Î¤³¤Î preview release ¤Î\n"
-"¥À¥¦¥ó¥í¡¼¥É¤Ë»þ´Ö¤ò³ä¤¤¤Æ¤¯¤ì¤Æ¤¢¤ê¤¬¤È¤¦\n"
-"\n"
-"²áµî¤Î¥ê¥ê¡¼¥¹¤«¤é¤Î´Ö¡¤²æ¡¹¤Î¾ÇÅÀ¤Ï Evolution ¤òÍ­ÍѤˤ¹¤ë¤³¤È¤Ë\n"
-"¤Ä¤¤¤Æ¤Ç¤·¤¿¡¥Evolution ³«È¯¼Ô¤Î¿¤¯¤Ï¥Õ¥ë¥¿¥¤¥à¤ÇÈà¤é¤Î¥á¡¼¥ë\n"
-"¤òÆɤि¤á¤Ëº£ Evolution ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡¥¤¢¤Ê¤¿¤â½ÐÍè¤Þ¤·¤¿¡¥\n"
-"(ɬ¤º¥Ð¥Ã¥¯¥¢¥Ã¥×¤òÊÝ»ý¤·¤Æ¤¯¤À¤µ¤¤)\n"
-"\n"
-"¤·¤«¤·²æ¡¹¤¬¤½¤Î°ÂÄêÀ­¤È¥»¥­¥å¥ê¥Æ¥£¤Ë±Æ¶Á¤òÍ¿¤¨¤Æ¤¤¤ë¿¤¯¤Î¥Ð¥°\n"
-"¤ò½¤Àµ¤·¤¿´Ö¤Ë¡¤¤¢¤Ê¤¿¤Ï¤Þ¤ÀÃǤê½ñ¤­¤ò¼õ¤±¼è¤ê¤Þ¤¹: Evolution ¤Ï:\n"
-"¥¯¥é¥Ã¥·¥å¤·¤¿¤ê¡¤¤¢¤Ê¤¿¤¬¤½¤¦Ë¾¤Þ¤Ê¤¯¤È¤â¥á¡¼¥ë¤òʶ¼º¤·¤¿¤ê¡¤\n"
-"¤¢¤Ê¤¿¤¬Ë¾¤ó¤Ç¤â¥á¡¼¥ë¤Îºï½ü¤òµñÈݤ·¤¿¤ê¡¤»þÀÞ¥×¥í¥»¥¹¤¬Æ°ºî¤·¤¿\n"
-"¤Þ¤Þ¤Î¾õÂ֤ˤʤ俤ꡤ100% ¤Î CPU ¥Ñ¥ï¡¼¤ò¾ÃÈñ¤·¤¿¤ê¡¤¤È¤Æ¤â®¤¯\n"
-"Æ°¤¤¤¿¤ê¡¤¥í¥Ã¥¯¤·¤¿¤ê¡¤Ç¤°Õ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë HTML ¥á¡¼¥ë¤ò\n"
-"Á÷¤Ã¤¿¤ê¡¤¤½¤·¤Æ¤¢¤Ê¤¿¤Îͧ¿Í¤È»Å»öÃç´Ö¤ÎÁ°¤Ç¤¢¤Ê¤¿¤òº¤¤é¤»¤ë\n"
-"¤Ç¤·¤ç¤¦¡¥\n"
-"¤¢¤¯¤Þ¤ÇÀâÌÀ½ñ¤Ë½¾¤Ã¤Æ¤ª»È¤¤¤¯¤À¤µ¤¤¡¥\n"
-"\n"
-"²æ¡¹¤Ï¤¢¤Ê¤¿¤¬²æ¡¹¤ÎÀ®²Ì¤ò³Ú¤·¤à¤³¤È¤ò˾¤ó¤Ç¤¤¤Þ¤¹¡¥¤½¤·¤Æ²æ¡¹¤Ï\n"
-"Ç®¿´¤Ë¤¢¤Ê¤¿¤Î¹×¸¥¤òÂÔ¤Á¼õ¤±¤Æ¤¤¤Þ¤¹!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"¤¢¤ê¤¬¤È¤¦\n"
-"Evolution ¥Á¡¼¥à\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Evolution ¥·¥§¥ë¤Î½é´ü²½¤¬½ÐÍè¤Þ¤»¤ó"
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "̵¸ú"
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo ¥³¥ó¥Ý¡¼¥Í¥ó¥È¥·¥¹¥Æ¥à¤ò½é´ü²½½ÐÍè¤Þ¤»¤ó"
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "¿·µ¬¥³¥ó¥¿¥¯¥È¤òºîÀ®¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "¥³¥ó¥¿¥¯¥È¤òºï½ü¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "¸¡º÷"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "¥³¥ó¥¿¥¯¥È¤ò¸¡º÷¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "¿·µ¬¥³¥ó¥¿¥¯¥È"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "¥³¥ó¥¿¥¯¥È¤ò°õºþ¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Ää»ß"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "±Ó¤ß¹þ¤ß¤òÄä»ß¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "¤¹¤Ù¤Æɽ¼¨"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "¤¹¤Ù¤Æ¤Î¥³¥ó¥¿¥¯¥È¤òɽ¼¨¤·¤Þ¤¹"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "¥¢¥É¥ì¥¹Ä¢¤ÎÀßÄê(_A)..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "¥³¥ó¥¿¥¯¥È¤Î°õºþ(_P)..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "¥³¥ó¥¿¥¯¥È¤Î¸¡º÷(_S)"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "¥Ä¡¼¥ë(_T)"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Æü"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "¥«¥ì¥ó¥À(_l)"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "¥«¥ì¥ó¥À¤ÎÀßÄê..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "¿·µ¬Ìó«¤òºîÀ®¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "¿·µ¬¥«¥ì¥ó¥À¤òºîÀ®¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Æü"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "»þ´Ö¤òÌᤷ¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "»þ´Ö¤ò¿Ê¤á¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "°ÜÆ°"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "»ØÄêÆü¤Ë°ÜÆ°¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "¸½ºß¤Î»þ´Ö¤Ø°ÜÆ°¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "·î"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "¿·µ¬Ìó«"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "¼¡"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "¥«¥ì¥ó¥À¤ò³«¤¯"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Á°"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "¤³¤Î¥«¥ì¥ó¥À¤Î°õºþ¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "ÊÌ̾¤ÇÊݸ"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Ê̤Τâ¤Î¤È¤·¤Æ¥«¥ì¥ó¥À¤òÊݸ¤·¤Þ¤¹"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "1 Æü¤òɽ¼¨"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "1 ¥ö·î¤òɽ¼¨"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "1 ½µ´Ö¤òɽ¼¨"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "½µÏ«Æ¯»þ´Ö¤òɽ¼¨"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "º£Æü"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "½µ"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "¿·µ¬(_N)"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "¥«¥ì¥ó¥À¤ò³«¤¯(_O)"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "¤³¤Î¥«¥ì¥ó¥À¤Î°õºþ(_P)"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "ÊÌ̾¤ÇÊݸ(_S)..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "¤³¤Î¥¢¥¤¥Æ¥à¤òºï½ü¤·¤Þ¤¹"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "ºï½ü..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "¥Ø¥ë¥×"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "¤³¤Î¥¢¥¤¥Æ¥à¤ò°õºþ"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "°õºþ..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "ÊÌ̾¤ÇÊݸ(_A)..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Êݸ¤ÈÊĤ¸¤ë"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "¥³¥ó¥¿¥¯¥È¤òÊݸ¤·¤Æ¤³¤Î¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "¥Õ¥¡¥¤¥ë(_F)"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "°õºþ(_P)..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "Êݸ(_S)"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "¾ðÊó..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Æ°ºî(_n)"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "¥¢¥É¥ì¥¹Ä¢(_B)... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "¥¯¥ê¥¢(_l)"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "ÀÚ¤ê¼è¤ê(_u)"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "̾Á°¤Î¥Á¥§¥Ã¥¯ (_k) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "¥¯¥ê¥¢"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "ÁªÂò¤µ¤ì¤¿¤â¤Î¤ò¥¯¥ê¥¢¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "¤³¤ÎÌó«¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "¥Õ¥©¥ë¥À¤Ø¥³¥Ô¡¼(_y)... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "¥³¥Ô¡¼"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "ÁªÂò¤µ¤ì¤¿¤â¤Î¤ò¥³¥Ô¡¼¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "ÀÚ¤ê¼è¤ê"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "ÁªÂò¤µ¤ì¤¿¤â¤Î¤òÀÚ¤ê¼è¤ê¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML¤Î¥À¥ó¥×"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI XML ¤Îµ­½Ò¤ò¥À¥ó¥×¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "¥Õ¥©¥ë¥À¤ÎºÇ½é¤Î¥¢¥¤¥Æ¥à(_r) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "žÁ÷(_w) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "vCalender¤È¤·¤ÆžÁ÷(_C) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "¼¡¤Î¥¢¥¤¥Æ¥à¤Ø°ÜÆ°¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Á°¤Î¥¢¥¤¥Æ¥à¤Ø°ÜÆ°¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "̤´°Î»¥¿¥¹¥¯(_c) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥×¥í¥Ñ¥Æ¥£¤ò½¤Àµ¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "¼¡(_e)"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Ž¤êÉÕ¤±"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØŽ¤êÉÕ¤±¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Á°(_v)"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Á°"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "°õºþ¥×¥ì¥Ó¥å¡¼(_v)"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê(_e)..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "¥×¥í¥Ñ¥Æ¥£"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Êݸ"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Ìó«¤òÊݸ¤·¤Æ¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Âǹ礻¤Î¥¹¥±¥¸¥å¡¼¥ë"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Âǹ礻¤Î¥¹¥±¥¸¥å¡¼¥ë(_M)"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "¤¹¤Ù¤ÆÁªÂò"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "¤¹¤Ù¤Æ¤Î¤â¤Î¤òÁªÂò¤·¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "¸½ºß¤Î¥×¥ê¥ó¥¿¤Î¥Ú¡¼¥¸ÀßÄê¤ò¹Ô¤¤¤Þ¤¹"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "¥¿¥¹¥¯Í×µá(_R) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "¾ðÊó(_A)..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "ÊĤ¸¤ë(_C)"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "¥³¥ó¥¿¥¯¥È(_C) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "¥³¥Ô¡¼(_C)"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "¥Ç¥Ð¥Ã¥°(_D)"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "ÊÔ½¸(_E)"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "¥Ø¥ë¥×(_H)"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "¥¢¥¤¥Æ¥à(_I) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "»ÅÌõµ­Æþ(_J) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "¥Õ¥©¥ë¥À¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à(_L) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë(_M) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°(_M)... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "¥Î¡¼¥È(_N) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Ž¤êÉÕ¤±(_P)"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "°õºþ(_P)"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "¥×¥í¥Ñ¥Æ¥£(_P)..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "¤¹¤Ù¤ÆÁªÂò(_A)"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "¥¿¥¹¥¯(_T) (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "̤ÆÉ¥¢¥¤¥Æ¥à(_U) (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "¥µ¡¼¥Ó¥¹¤ÎÄɲÃ"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "¼Â¹Ô¥µ¥Þ¥ê¡¼¤Ø¿·µ¬¥µ¡¼¥Ó¥¹¤òÄɲä·¤Þ¤¹"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "¿·µ¬¥á¡¼¥ë¤ÎºîÀ®"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "¼Â¹Ô¥µ¥Þ¥ê¡¼¤ÎÀßÄê..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "¿·µ¬¥á¡¼¥ë"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "ºîÀ®"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "¿·µ¬¥á¥Ã¥»¡¼¥¸¤òºîÀ®¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¿·µ¬¥Õ¥©¥ë¥À¤Ø¥³¥Ô¡¼¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "¥ë¡¼¥ë¤òºîÀ®"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "¥Õ¥©¥ë¥À(_o)"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Á÷¿®¼Ô¤Î¥Õ¥£¥ë¥¿(_l)"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "¼õ¿®¼Ô¤Î¥Õ¥£¥ë¥¿(_i)"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤Îʶ¼º(_P)"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "¥á¡¼¥ë¼èÆÀ"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "ÁªÂò¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò±£¤¹(_e)"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "ºï½ü¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò±£¤¹(_D)"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "´ûÆÉ¥á¥Ã¥»¡¼¥¸¤ò±£¤¹(_R)"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "¥á¡¼¥ë¥Õ¥£¥ë¥¿(_F)..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Äê´ü¹ØÆÉ´ÉÍý..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "´ûÆɤȤ·¤Æ¥Þ¡¼¥¯(_k)"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "̤ÆɤȤ·¤Æ¥Þ¡¼¥¯(_n)"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "°ÜÆ°"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¿·µ¬¥Õ¥©¥ë¥À¤Ø°ÜÆ°¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "°õºþ¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Î¥×¥ì¥Ó¥å¡¼¤òɽ¼¨¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î°õºþ¥×¥ì¥Ó¥å¡¼..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥×¥ê¥ó¥¿¤Ø°õºþ¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Á´°÷¤ØÊÖ¿®(_A)"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Á÷¿®¼Ô¤ØÊÖ¿®(_S)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "¥½¡¼¥¹(_o)"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "¤¹¤Ù¤ÆÁªÂò(_A)"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "¥­¥å¡¼¤Ë¤¢¤ë¥á¡¼¥ë¤òÁ÷¿®¤·¤Æ¿·µ¬¥á¡¼¥ë¤ò¼èÆÀ¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨(_A)"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤ò¥¹¥ì¥Ã¥É²½¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Á÷¿®¼Ô¤Î²¾ÁÛ¥Õ¥©¥ë¥À(_n)"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "¼õ¿®¼Ô¤Î²¾ÁÛ¥Õ¥©¥ë¥À(_R)"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "̤²Ã¹©¥á¥Ã¥»¡¼¥¸¤Î¥½¡¼¥¹¤òɽ¼¨¤·¤Þ¤¹"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "¥Õ¥£¥ë¥¿Å¬ÍÑ(_A)"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "¥Õ¥©¥ë¥À¤ÎÀßÄê(_C)..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø¥³¥Ô¡¼(_C)..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸(_E)"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "Ëõ¾Ã(_E)"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "·ï̾¤Î¥Õ¥£¥ë¥¿(_F)"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "žÁ÷(_F)"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "ÁªÂò¤òȿž(_I)"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "¥á¡¼¥ë¤ÎÀßÄê(_M)..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "¥á¥Ã¥»¡¼¥¸(_M)"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°(_M)..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë³«¤¯(_O)"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ(_P)"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÊÌ̾¤ÇÊݸ(_S)..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "¥¹¥ì¥Ã¥É(_T)"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "ºï½ü¼è¾Ã(_U)"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "·ï̾¤Î²¾ÁÛ¥Õ¥©¥ë¥À(_V)"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "²¾ÁÛ¥Õ¥©¥ë¥À¥¨¥Ç¥£¥¿(_V)..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "źÉÕ"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "PGP ¤Ç¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò°Å¹æ²½¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "¥Õ¥©¡¼¥Þ¥Ã¥È(_o)"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ø¥Æ¥­¥¹¥È¤È¤·¤Æ¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ÎÁÞÆþ..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP ¤Ë¤è¤ë°Å¹æ²½"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP ¥µ¥¤¥ó"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Áð°Æ¤òÊݸ(_D)"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "¥Õ¥©¥ë¥À¤ØÊݸ... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "¥Õ¥©¥ë¥À¤ØÊݸ..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊÌ̾¤ÇÊݸ¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "»ØÄê¤Î¥Õ¥©¥ë¥À¤Ø¥á¥Ã¥»¡¼¥¸¤òÊݸ¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Á÷¿®"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "¸å¤ÇÁ÷¿®(_L)"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "¸å¤ÇÁ÷¿®(_l)"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "HTML·Á¼°¤Ç¥á¡¼¥ë¤òÁ÷¿®¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "¸å¤Ç¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "º£¤¹¤°¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "º£¤¹¤°¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "źÉÕ¤Îɽ¼¨/Èóɽ¼¨"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "źÉÕ¤òɽ¼¨(_a)"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "źÉÕ¤òɽ¼¨"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "PGP¸°¤Ç¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ë¥µ¥¤¥ó¤·¤Þ¤¹"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ÎÁÞÆþ(_I)... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "³«¤¯(_O)..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "¥»¥­¥å¥ê¥Æ¥£(_S)"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "¥ê¥¹¥È¤ò¹¹¿·"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "¥Õ¥©¥ë¥À¥ê¥¹¥È¤ò¹¹¿·"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "¹ØÆÉ"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "¹ØÆɲò½ü"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "¥¿¥¹¥¯¤Î³äÅö¤Æ(_n) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "ºÆ¸¡º÷"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Âǹ礻Í×µá(_q) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "¤ä¤êľ¤·"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "̤´°Î»¤ÎÆ°ºî¤ò¤ä¤êľ¤·¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "ÃÖ´¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "ʸ»ú¤òÃÖ´¹¤·¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Á´°÷¤ØÊÖ¿®(_l) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Á÷¿®¥¹¥Æ¡¼¥¿¥¹¥ì¥Ý¡¼¥È(_e) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "½ÐÍè»ö¤ò¥¹¥­¥Ã¥×(_k) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "¥¿¥¹¥¯¤òÊݸ¤·¤Æ¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Ʊ¤¸Ê¸»úÎó¤ÇºÆ¸¡º÷¤ò¹Ô¤¤¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "ʸ»úÎó¤Ç¸¡º÷¤·¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "¸µ¤ËÌ᤹"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "ºÇ¸å¤ÎÆ°ºî¤ò¸µ¤ËÌᤷ¤Þ¤¹"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "Ìó«(_A) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "´°Î»¤ò¥Þ¡¼¥¯ (_M) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "ÊÖ¿®(_R) (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "¿·µ¬¥¿¥¹¥¯¤òºîÀ®¤·¤Þ¤¹"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "¿·µ¬"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Ê̤Τâ¤Î¤È¤·¤Æ¥¿¥¹¥¯¤òÊݸ¤·¤Þ¤¹"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "¥¿¥¹¥¯¤ÎÀßÄê..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Evolution ¤Ë¤Ä¤¤¤Æ..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤Þ¤¹"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "¥«¥¹¥¿¥Þ¥¤¥º(_z)..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "¥«¥¹¥¿¥Þ¥¤¥º"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "¥Ä¡¼¥ë¥Ð¡¼¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Ê̤Υե©¥ë¥À¤òɽ¼¨¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "½ªÎ»(_x)"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ¥Ð¡¼¥·¥ç¡¼¥È¥«¥Ã¥È(_s)"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "½ªÎ»"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "¥×¥í¥°¥é¥à¤ò½ªÎ»¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "»Ï¤á¤Ë(_S)"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "³°Éô¥Õ¥¡¥¤¥ë·Á¼°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "¥á¥¤¥ó¥Ä¡¼¥ë¥Ð¡¼"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Evolution ¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "¥Õ¥©¥ë¥À¥Ð¡¼¤òɽ¼¨(_F)"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤òɽ¼¨(_S)"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "ÉÔ¶ñ¹çÊó¹ð¤ÎÄó½Ð"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "ÉÔ¶ñ¹çÊó¹ð¤ÎÄó½Ð(_B)"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Bug Buddy¤ò»È¤Ã¤ÆÉÔ¶ñ¹çÊó¹ð¤òÄó½Ð¤·¤Þ¤¹"
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "¥Õ¥©¥ë¥À¥Ð¡¼¤òɽ¼¨¤¹¤ë¤«¤É¤¦¤«ÀÚÂؤ¨¤Þ¤¹"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È¥Ð¡¼¤òɽ¼¨¤¹¤ë¤«¤É¤¦¤«ÀÚÂؤ¨¤Þ¤¹"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "¥³¥ó¥¿¥¯¥È¥Þ¥Í¡¼¥¸¥ã¤ò»È¤¦(_o)"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "¥«¥ì¥ó¥À¤ò»È¤¦(_C)"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "¥á¡¼¥é¤ò»È¤¦(_M)"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "Evolution ¤Ë¤Ä¤¤¤Æ(_A)..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "¥Õ¥©¥ë¥À(_F)"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "¥Õ¥©¥ë¥À¤Ø°ÜÆ°(_G)..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È(_I)..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹(_I)"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë(_M)"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "ÀßÄê(_S)"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%Y %B %d %A"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "¥Ó¥¸¡¼"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "¥ª¥Õ¥£¥¹¤Î³°"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "¾ðÊó¤Ê¤·"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "¾¤Î¾·ÂÔ(_I)..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "¥ª¥×¥·¥ç¥ó(_O)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "»Å»öÃæ¤Î»þ´Ö¤À¤±É½¼¨(_O)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "½Ì¾®¤·¤Æɽ¼¨(_Z)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "¥Õ¥ê¡¼/¥Ó¥¸¡¼ ¤Î¹¹¿·(_U)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "<<(_<)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "¼«Æ°¥Ô¥Ã¥¯¥¢¥Ã¥×(_A)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">>(_>)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "¤¹¤Ù¤Æ¤Î¿Í¡¹¤È¥ê¥½¡¼¥¹(_A)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "¤¹¤Ù¤Æ¤Î¿Í¡¹¤È¤Ò¤È¤Ä¤Î¥ê¥½¡¼¥¹(_P)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "¿Í¡¹¤¬É¬Í×(_R)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "¿Í¡¹¤È¤Ò¤È¤Ä¤Î¥ê¥½¡¼¥¹¤¬É¬Í×(_O)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "²ñµÄ³«»Ï»þ´Ö(_s):"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "²ñµÄ½ªÎ»»þ´Ö(_e):"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "¤¹¤Ù¤Æ¤ÎÉÕ¤­Åº¤¤"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "º£"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%p %I:%M"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "¾ðÊó"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "·Ù¹ð"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "¼ÁÌä"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "¥á¥Ã¥»¡¼¥¸"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÆóÅÙ¤Èɽ¼¨¤·¤Ê¤¤"
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "¸¡º÷(_c)"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "¥Ñ¡¼¥½¥Ê¥ë¥¢¥É¥ì¥¹Ä¢¥µ¡¼¥Ð"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "¥Ñ¡¼¥½¥Ê¥ë¥«¥ì¥ó¥À¥µ¡¼¥Ð; ¥«¥ì¥ó¥À¥Õ¥¡¥¯¥È¥ê"
-
-#: wombat/wombat.c:182
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS¤ò½é´ü²½¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: wombat/wombat.c:194
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME ¤ò½é´ü²½¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: wombat/wombat.c:207
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo ¤ò½é´ü²½¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution ¥°¥ë¡¼¥×¥¦¥§¥¢¥¹¥¤¡¼¥È"
diff --git a/po/ko.po b/po/ko.po
deleted file mode 100644
index 3de5e059af..0000000000
--- a/po/ko.po
+++ /dev/null
@@ -1,5879 +0,0 @@
-# evolution ko.po
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Young-Ho, Cha <ganadist@dacome.co.kr>, 2000.
-# update by Sung-Hyun Nam 2000/09/08
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2001-01-06 15:31+0900\n"
-"Last-Translator: Young-Ho, Cha <ganadist@chollian.net\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-kr\n"
-"Content-Transfer-Encoding: 8bit\n"
-">Language-Team: korean <ko@li.org>\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "´Ý±â"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Æú´õ·Î À̵¿"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "ÀÌÀü Ç׸ñÀ¸·Î À̵¿"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "´ÙÀ½ Ç׸ñÀ¸·Î À̵¿"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Æú´õ ¼³Á¤(_C)"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "¸ÞÀÏÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "¿¡·¯ ¾øÀ½"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "wombat ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr ""
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr "Ä«µå: "
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"À̸§: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"»ýÀÏ: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"ÁÖ¼Ò:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  ½Ã:          "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Áö¿ª:        "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ¿ìÆí ¹øÈ£:   "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ±¹°¡:        "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"ÀüÈ­¹øÈ£:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"ÀüÈ­¹øÈ£:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"ÀüÀÚ¿ìÆí:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"ÀüÀÚ¿ìÆí:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"½Ã°£´ë: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-#, fuzzy
-msgid ""
-"\n"
-"Geo Location: "
-msgstr "À§Ä¡:"
-
-#: addressbook/backend/ebook/e-card.c:3181
-#, fuzzy
-msgid ""
-"\n"
-"Business Role: "
-msgstr "Á÷Àå 2"
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"±â°ü: "
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  À̸§:  "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-#, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "¸ñ·Ï"
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"ÁÖ¼®:    "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"°ø¿ë Å°: "
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "µ¿±âÈ­"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "PilotÀ¸·ÎºÎÅÍ º¹»ç"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Pilot·Î º¹»ç"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "¿ø ÀúÀÛÀÚ:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution ÁÖ¼Ò·Ï ºÎÇ°"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution¿ë ÁÖ¼Ò·Ï ºÎÇ° ¼³Á¤ µµ±¸.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "µ¿±âÈ­ ½ÇÇà"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "ºÎÇ° »óÅÂ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"¼³Á¤µÈ ÆÄÀÏ·µÀÌ ¾ø½À´Ï´Ù, ¸ÕÀú 'ÆÄÀÏ·µ\n"
-"¿¬°á ¼³Á¤'ijÇø´À» ¼±ÅÃÇϽʽÿÀ."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot µ¥¸ó¿¡ ¿¬°áµÇ¾îÀÖÁö¾ÊÀ½"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "wombat ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "wombatÀ» ½ÃÀÛÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "Ãß°¡(_A)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "»èÁ¦(_D)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "ÀüÈ­ ÇüÅÂ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "»õ ÀüÈ­ ÇüÅÂ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Ãß°¡"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "¿¬¶ôó ÆíÁý±â"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Àüü À̸§(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "ÆÄÀÏ·Î ÀúÀå:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "ȨÆäÀÌÁö ÁÖ¼Ò:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "HTMLÇü½Ä ÆíÁö »ç¿ë(_H)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "Á÷Àå(_B)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "Áý(_H)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Á÷Àå Æѽº(_F)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "ÈÞ´ëÀüÈ­(_M)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "À̸ÞÀÏ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "Á÷Àå(_u)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "¿¬¶ôó(_C)..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "¸ñ·Ï(_t)..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "Á÷ÇÔ(_J):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "ȸ»ç(_C):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "ÁÖ¼Ò(_A)..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "ÀÏ¹Ý Á¤º¸"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "ºÎ¼­(_D):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "»ç¹«½Ç(_O):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "Á÷¾÷(_P):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "º°¸í(_N):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "¹è¿ìÀÚ(_S):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "»ýÀÏ(_B):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Á¶¼ö À̸§(_A):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "¸Å´ÏÀú À̸§(_M):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "±â³äÀÏ(_v):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "³ëÆ®(_t):"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "ÀÚ¼¼È÷"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Á¶¼ö"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Á÷Àå"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Á÷Àå 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Á÷Àå Æѽº"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "ÀÚµ¿Â÷"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "ȸ»ç"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Áý"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Áý 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Áý Æѽº"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "ÈÞ´ëÀüÈ­"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "±âŸ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "±âŸ Æѽº"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "ȧȧ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "À̸ÞÀÏ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "À̸ÞÀÏ 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Àüü À̸§ È®ÀÎ"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "¼º(_F):"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "Á¦¸ñ(_T):"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "À̸§(_L):"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "¸ðµÎ º¸±â"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "°í±Þ..."
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Æú´õ Ž»ö±â°¡ Ç¥½ÃÇÒ URI"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "´Ù¸¥ ¿¬¶ôó"
-
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr "LDAP ¼­¹ö"
-
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr "ÆÄÀÏ"
-
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr "¾Ë¼ö¾ø´Â ÁÖ¼Ò·Ï Çü½Ä"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "ºñ¹Ð¹øÈ£"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "ºÙÀ̱â"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
-
-#: addressbook/gui/component/addressbook-config.c:360
-msgid "Host:"
-msgstr "È£½ºÆ®:"
-
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr "Æ÷Æ®:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "·çÆ® DN:"
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "°Ë»ö"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "ÀÎÁõ:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "°æ·Î:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr "°æ·Î°¡ Á¸ÀçÇÏÁö ¾ÊÀ¸¸é ¸¸µì´Ï´Ù."
-
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr "ÁÖ¼Ò·Ï ÆíÁý"
-
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr "ÁÖ¼Ò·Ï Ãß°¡"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "À̸§:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "¼³¸í:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "°Ë»ö"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard·Î ÀúÀå"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "À̸§"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "À̸ÞÀÏ 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Á¶Á÷"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "ºÎ¼­(_D):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "»ç¹«½Ç(_O):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "Á¦¸ñ(_T):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "Á÷¾÷(_P):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "ȧȧ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "º°¸í(_N):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "¹è¿ìÀÚ(_S):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "³ëÆ®(_t):"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "ÁÖ¼Ò·Ï¿¡ ÀúÀå"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution ´Þ·Â ºÎÇ°"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution ´Þ·Â ºÎÇ°¿ë ¼³Á¤ µµ±¸.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ°"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ° ¼³Á¤ µµ±¸.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "È®ÀÎ"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "´Þ·Â ¿­±â"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "´Þ·Â ÀúÀå"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "ºÏ"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "³²"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "µ¿"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "¼­"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "¾à¼Ó ³¡½Ã°£ º¸±â"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "÷ºÎ¹° º¸±â(_a)"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "´Þ·Â »ç¿ëÇϱâ(_C)"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "´Þ·ÂÀÌ Ç¥½ÃÇÒ URI"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Á¤¸»·Î ¾à¼Ó `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¾à¼ÓÀ» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ÀÛ¾÷À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Á¤¸»·Î ¿©ÇàÀÏÁ¤ `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¿©ÇàÀÏÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "ÀÛ¾÷ ÆíÁý"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "¾à¼Ó - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr "¿©Çà ÀÏÁ¤ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr "º¯°æµÈ°ÍÀ» ÀúÀå ÇÏ±æ ¿øÇϽʴϱî?"
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "¸ñ·Ï"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "ºÐ·ù"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "¿Ï·áµÊ"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "³ªÁß¿¡ º¸³¿(_L)"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "½ÃÀÛ ³¯Â¥(_r):"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "ÀÛ¾÷ÀÌ ¿Ï·áµÇ¾úÀ½À» Ç¥½Ã"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "¿ì¼±¼øÀ§"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "¿ä¾à(_u)"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "¿­±â..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "¿Ï·á Ç¥½Ã"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "ÀÛ¾÷ÀÌ ¿Ï·áµÇ¾úÀ½À» Ç¥½Ã"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "»èÁ¦"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "¿ÀÀü"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "¿ÀÈÄ"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "»õ ¾à¼Ó"
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "ÇöÀç ¾à¼ÓÀ» ¼öÁ¤ÇÕ´Ï´Ù..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr "¸ñ·Ï"
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "`%s'¿¡¼­ ´Þ·ÂÀ» ¸¸µé¼ö ¾ø½À´Ï´Ù"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "¾à¼ÓÀ» ¼öÁ¤ÇÑ´Ù"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "¿ù¿äÀÏ"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "È­¿äÀÏ"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "¼ö¿äÀÏ"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "¸ñ¿äÀÏ"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "±Ý¿äÀÏ"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Åä¿äÀÏ"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "ÀÏ¿äÀÏ"
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "ÀÏ"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "¿ù"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "È­"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "¼ö"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "¸ñ"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "±Ý"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Åä"
-
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "±×³ðÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr ""
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr ""
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr ""
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "ÀÛ¾÷"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr ""
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Àμ⠹̸®º¸±â"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "´Þ·ÂÀÌ Ç¥½ÃÇÒ URI"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "`%s'¿ë Àá±ÝÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "¸ÞÀÏÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(¾Ë¼ö¾ø´Â ¿À·ù)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "%s ´º½º ¼­¹ö %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Ãë¼ÒµÊ"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "´Þ·Â ¿­±â"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "¸ÞÀÏÆú´õ¿¡ ¸Þ¼¼Áö¸¦ µ¡ºÙÀϼö ¾ø½À´Ï´Ù: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Æú´õ `%s'¸¦ ¸¸µé¼ö ¾øÀ½:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %2$s Æú´õ¿¡¼­ %1$s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "¸Þ¼¼Áö %s¸¦ ãÀ»¼ö ¾øÀ½."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "¼­¹ö¿¡¼­ ±×·ì¸ñ·ÏÀ» ¾òÀ»¼ö ¾øÀ½."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr "ÀÎÁõÀÌ ÇÊ¿äÇÏÁö ¾ÊÀ½"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ¼­¹ö %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 ¹ÙÀÌÆ®"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u ¹ÙÀÌÆ®"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "÷ºÎ"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Á¦°Å"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "÷ºÎÆÄÀÏ ¸ñ·Ï¿¡¼­ ¼±ÅÃÇÑ Ç׸ñÀ» Á¦°ÅÇÕ´Ï´Ù"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "÷ºÎÆÄÀÏ Ãß°¡..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "º¸³½ÀÌ:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "ÁÖ¼Ò·Ï"
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "¹Þ´Â»ç¶÷:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "¸Þ¼¼Áö¸¦ ¹ÞÀ»»ç¶÷À» ÀÔ·ÂÇϼ¼¿ä"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "ÂüÁ¶:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷ÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "ÂüÁ¶ ¸ñ·Ï¿¡´Â ¾øÁö¸¸ ¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷µéÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Á¦¸ñ:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "ÆíÁöÀÇ Á¦¸ñÀ» ÀÔ·ÂÇϼ¼¿ä"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "ÀúÀå..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "¸Þ¼¼Áö·Î º¯°æ»çÇ×À» ÀúÁ¤Áß..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr ""
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "±× ÆÄÀÏÀº Á¸ÀçÇÏÁö¾Ê½À´Ï´Ù"
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr ""
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr ""
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "¸ÞÀÏ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-msgid "Cannot initialize Evolution's composer."
-msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "¿¬µµ"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr ""
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr ""
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "Áö±Ý"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "°Å¸£°Ô ÆíÁý"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr ""
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Çൿ Ãß°¡"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "Çൿ Á¦°Å"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Æú´õ ¼±ÅÃ"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "±ÔÄ¢ À̸§: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Á¦¸ñ¾øÀ½"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr ""
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr "´äÀå"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr "Áß¿ä"
-
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "ÀÐÀ½"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Æú´õ·Î º¹»ç"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "³¯Â¥ ¹Þ¾ÒÀ½"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "³¯Â¥ º¸³ÂÀ½"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Ç¥Çö"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Àü´ÞÇÒ ÁÖ¼Ò"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "¸Þ¼¼Áö¸¦ º¸³Â½À´Ï´Ù"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Æú´õ·Î À̵¿"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "ÂüÁ¶ÀÎ"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "º¸³½ÀÌ"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "»óÅ ¼³Á¤"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "»óÅÂ"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Á¦¸ñ"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "Æ÷ÇÔ"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr ""
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Æú´õ ¼±ÅÃ"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "º»¹®À̳ª Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔ"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "º»¹®¿¡ ´ÙÀ½À» Æ÷ÇÔ"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔ"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "º»¹®¿¡ ´ÙÀ½À» Æ÷ÇÔÇÏÁö ¾ÊÀ½"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔÇÏÁö ¾ÊÀ½"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "¿­±â"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "ÆíÁý"
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr "»õ À̸§À¸·Î ÀúÀå..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Àμâ"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "¸ðµÎ ´äÀå"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Àü´Þ"
-
-#: mail/folder-browser.c:666
-msgid "Forward inline"
-msgstr ""
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã"
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr "Æú´õ·Î À̵¿..."
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr "Æú´õ·Î º¹»ç..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr "µÇ»ì¸²"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr "°Å¸£°³ Àû¿ë"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr ""
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "»èÁ¦"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ°"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö:\n"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "¸Þ¼¼Áö Àμâ"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "÷ºÎ ÀúÀå"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr "µð½ºÅ©·Î ÀúÀå..."
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr "%s¿¡¼­ ¿­±â..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "¼û±è"
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr "%s ÷ºÎ"
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr "¾ÏȣȭµÈ ¸Þ¼¼Áö"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "Æú´õ ¼³Á¤(_C)"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "ÇöÀç Æú´õ ´Ý´ÂÁß"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "»õ Æú´õ¸¦ »ý¼º"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "¸Þ¼¼Áö º¹»ç"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Æú´õ `%s'¸¦ ¸¸µé¼ö ¾øÀ½:\n"
-"%s"
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "À̵¿Áß"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" º¸³»´Â Áß"
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³¿"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "´ë±â¿­·Î º¸³»´ÂÁß"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr "\"%s\"¿¡ µ¡ºÙÀÌ´ÂÁß"
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "À̵¿Áß"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "º¹»çÁß"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(¼³¸í ¾øÀ½)"
-
-#: mail/mail-ops.c:1179
-msgid "Forwarded messages"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "µ¿±âÈ­"
-
-#: mail/mail-ops.c:1401
-#, fuzzy
-msgid "Expunging folder"
-msgstr "\"%s\" Á¦°Å Áß"
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´ÞÇÕ´Ï´Ù"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "¸Þ¼¼Áö º¹»ç"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s Æú´õ¿¡ ÀûÀçÁß"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s Æú´õ¿¡ ÀûÀç"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "¸Þ¼¼Áö º¹»ç"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "%s·Î º¯°æ ÀúÀåÁß"
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö (Á¦¸ñ ¾øÀ½)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr "°¡»ó Æú´õ"
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "»õ °¡»óÆú´õ"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "´äÀå"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ º¸³½»ç¶÷¿¡°Ô ´äÀåÀ» ÇÕ´Ï´Ù"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ¹ÞÀº ¸ðµç »ç¶÷¿¡°Ô ´äÀåÀ» ÇÕ´Ï´Ù"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù¸¥»ç¶÷¿¡°Ô Àü´ÞÇÕ´Ï´Ù"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÕ´Ï´Ù"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr ""
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "÷ºÎ"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "º¸³½ÀÌ:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "ºÙÀ̱â"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "³¯Â¥ ¹Þ¾ÒÀ½"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "¹Þ´Â»ç¶÷:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Å©±â:"
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Æú´õ"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "ÁßÁö"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr ""
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "»õ·Î¿î..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Á¦¸ñ¾øÀ½)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "½Ã½ºÅÛÀÇ °æ·Î¿¡ Bug buddy¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy¸¦ ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù."
-
-#: shell/e-shell-view-menu.c:172
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution Àº ±×³ð µ¥½ºÅ©Å¾ ȯ°æ¿¡¼­ ÀüÀÚ¿ìÆí, \n"
-"ÀÏÁ¤, ¿¬¶ôó °ü¸®¸¦ ÇÏ´Â ±×·ì¿þ¾î ÀÀ¿ëÇÁ·Î±×·¥\n"
-"¸ðÀ½ ÀÔ´Ï´Ù."
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr ""
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Æú´õ"
-
-#: shell/e-shell-view.c:1098
-#, c-format
-msgid "%s - Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1100
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "½Ã½ºÅÛ ÀúÀåÀåÄ¡¸¦ ÁöÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù -- %s"
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "±×·ì À̸§:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "ÀÛÀº ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Å« ¾ÆÀÌÄÜ(_L)"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Å« ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "»õ ±×·ì(_N)..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "´ÜÃà ¸·´ë º¸±â(_S)"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "´ÜÃà ¸·´ë º¸±â(_S)"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "È°¼º"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "º¸±â(_V)"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "¼±ÅÃµÈ Æú´õ º¸±â"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(À̸§ ¾øÀ½)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "¿¡·¯ ¾øÀ½"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "ÀÏ¹Ý ¿À·ù"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr "°°Àº À̸§ÀÇ Æú´õ°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù"
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr "ÁöÁ¤µÈ ÆúÅÍ Çü½ÄÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "ÀÔÃâ·Â ¿À·ù"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "Æú´õ¸¦ ¸¸µé±â¿¡ ÃæºÐÇÑ °ø°£ÀÌ ¾øÀ½"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Çã°¡±Ç °ÅºÎ"
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr "ÀÌ ÀúÀå¸Åü¿¡ ÁöÁ¤µÈ Çü½ÄÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"¾È³çÇϼ¼¿ä. Evolution ±×·ì¿þ¾î ½´Æ®ÀÇ ¹Ì¸®º¸±â ¸±¸®Á ³»·Á¹Þ´Âµ¥\n"
-"½Ã°£À» ÇÒ¾ÖÇØÁּż­ °¨»çÇÕ´Ï´Ù.\n"
-"\n"
-"Áö³­ ¸±¸®Á ÅëÇؼ­, ¿ì¸®ÀÇ ÃÊÁ¡Àº EvolutionÀ» »ç¿ëÇÒ¸¸ÇÏ°Ô Çϴµ¥\n"
-"ÀÖ½À´Ï´Ù. ¸¹Àº Evolution°³¹ßÀÚµéÀÌ EvolutionÀ» »ç¿ëÇÏ¿©¼­ ¸ÅÀÏ ±×µé\n"
-"ÀÇ ¸ÞÀÏÀ» ¹Þ¾Æº¸°í ÀÖ½À´Ï´Ù. ¿©·¯ºÐµµ ¸¶Âù°¡Áö±¸¿ä. (Ç×»ó ¹é¾÷À»\n"
-"ÇصνʽÿÀ.)\n"
-"\n"
-"ÇÏÁö¸¸ ¾ÈÁ¤¼º°ú º¸¾È¿¡ ¿µÇâÀ» ³¢Ä¡´Â ¸¹Àº ¹ö±×¸¦ ¼öÁ¤ÇÏ°í ÀÖÁö¸¸\n"
-"¿©·¯ºÐÀº ±Ç¸®Æ÷±â¸¦ ÇÏ¿©¾ß ÇÕ´Ï´Ù: EvolutionÀº ¿©·¯ºÐÀÌ ¿øÇÏÁö \n"
-"¾Ê´õ¶óµµ ¸ÞÀÏÀ» Æı«Çϰųª ÀÒ¾î ¹ö¸±¼ö ÀÖÀ¸¸ç, ½ÇÇàµÇ´Â ÇÁ·Î¼¼½º\n"
-"¸¦ ³õÄ¥¼öµµ ÀÖ°í, CPU¸¦ 100%¼Ò¸ð, °æÀï, ¸ØÃã, ÀÓÀÇÀÇ ¸ÞÀϸµ ¸®½ºÆ®\n"
-"·Î HTML¸ÞÀÏ º¸³»¹ö¸², ´ç½Å¾ÕÀÇ Ä£±¸³ª Á÷À嵿·á¿¡°Ô ¹æÇØ°¡ µÉ¼ö\n"
-"ÀÖ½À´Ï´Ù.\n"
-"Áö½Ã´ë·Î »ç¿ëÇϽʽÿÀ.\n"
-"\n"
-"¿ì¸®ÀÇ Èûµç °á°ú¹°ÀÌ ¿©·¯ºÐÀ» Áñ°Ì°Ô Çϱ⸦ ¹Ù¶ø´Ï´Ù, ±×¸®°í \n"
-"¿©·¯ºÐµéÀÇ °øÇåÀ» ¸÷½Ã ¹Ù¶ó°í ÀÖ½À´Ï´Ù!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"°¨»çÇÕ´Ï´Ù\n"
-"Evolution ÆÀ\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Evolution ½©À» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "º¸³ëº¸ ÄÄÆ÷³ÍÆ® ½Ã½ºÅÛÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "°íÄ¥¿¹Á¤: »õ ¾à¼Ó(_N)"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "°íÄ¥¿¹Á¤: ÀÛ¾÷ ¿äû(_R)"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "°íÄ¥¿¹Á¤: ÆíÁö ¸Þ¼¼Áö(_M)"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "°íÄ¥¿¹Á¤: ÀÛ¾÷(_T)"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "°íÄ¥¿¹Á¤: ÀÛ¾÷ ¿äû(_R)"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "°íÄ¥¿¹Á¤: ÀâÁö Ç׸ñ(_J)"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "°íÄ¥¿¹Á¤: ³ëÆ®(_N)"
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "°íÄ¥¿¹Á¤: ¼±ÅÃ..."
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "°íÄ¥¿¹Á¤: ¸Þ¸ð Çü½Ä(_M)"
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "°íÄ¥¿¹Á¤: Àμâ Çü½Ä Á¤ÀÇ(_S)"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "°íÄ¥¿¹Á¤: ¼Û½Å(_e)"
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "°íÄ¥¿¹Á¤: ÷ºÎÆÄÀÏ ÀúÀå..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î º¹»ç(_y)..."
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "ÂÊ ¼³Á¤:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "°íÄ¥¿¹Á¤: öÀÚ(_S)..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "°íÄ¥¿¹Á¤: Ç׸ñ(_I)"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "°íÄ¥¿¹Á¤: Æú´õÀÇ Ã¹Â°Ç׸ñ(_r)"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "°íÄ¥¿¹Á¤: Çü½Ä(_F)"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "ÀÌÀü(_v)"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "´ÙÀ½"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "µµ±¸(_T)"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "°íÄ¥¿¹Á¤: ÆÄÀÏ(_F)..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "°íÄ¥¿¹Á¤: ±Û²Ã(_F)..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "°íÄ¥¿¹Á¤: µµÇ¥(_P)..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "°íÄ¥¿¹Á¤: È¥ÀÚ¸» µð¹ö°Å(_D)"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "°íÄ¥¿¹Á¤: öÀÚ(_S)..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "Çü½Ä(_F)"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "°íÄ¥¿¹Á¤: öÀÚ(_S)..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
-
-#: ui/evolution-contact-editor.xml:150
-#, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "°íÄ¥¿¹Á¤: ÀâÁö Ç׸ñ(_J)"
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î º¹»ç(_y)..."
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "°íÄ¥¿¹Á¤: ÆíÁö ¸Þ¼¼Áö(_M)"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "°íÄ¥¿¹Á¤: ÆíÁö ¸Þ¼¼Áö(_M)"
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "°íÄ¥¿¹Á¤: Àü´Þ(_w)"
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "°íÄ¥¿¹Á¤: Àü´Þ(_w)"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "»ðÀÔ(_I)"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "Çü½Ä(_o)"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "µµ±¸(_T)"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "Çൿ(_n)"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "ÀÌÀü"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "ÀÌÀü Ç׸ñÀ¸·Î À̵¿"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "°íÄ¥¿¹Á¤: ³ëÆ®(_N)"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "´ÙÀ½ Ç׸ñÀ¸·Î À̵¿"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "¹Ù»Ý"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "»ç¹«½Ç ¶°³²"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Á¤º¸ ¾øÀ½"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "´Ù¸¥ À̵éÀ» ÃÊ´ë(_I)..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "¼³Á¤(_O)"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "ȸÀÇ ½ÃÀÛ ½Ã°£(_s):"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "¸ðµç Âü¼®ÀÚ"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr ""
-
-#: widgets/misc/e-dateedit.c:407
-#, fuzzy
-msgid "Now"
-msgstr "»õ ¿¬¶ôó"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "¿À´Ã"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "°Ë»ö(_c)"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "±×·ì %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "¿¬¶ôó¸¦ »èÁ¦ÇÒ±î¿ä?"
-
-#~ msgid "Address _2:"
-#~ msgstr "ÁÖ¼Ò _2:"
-
-#~ msgid "Canada"
-#~ msgstr "ij³ª´Ù"
-
-#~ msgid "Check Address"
-#~ msgstr "ÁÖ¼Ò È®ÀÎ"
-
-#~ msgid "Countr_y:"
-#~ msgstr "±¹°¡(_y):"
-
-#~ msgid "Finland"
-#~ msgstr "Çɶõµå"
-
-#~ msgid "USA"
-#~ msgstr "¹Ì±¹"
-
-#~ msgid "_Address:"
-#~ msgstr "ÁÖ¼Ò(_A):"
-
-#~ msgid "_City:"
-#~ msgstr "½Ã(_C):"
-
-#~ msgid "Find..."
-#~ msgstr "ã±â..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
-
-#~ msgid "Select Names"
-#~ msgstr "¼±ÅÃÇÑ À̸§"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "¸ñ·ÏÀ¸·ÎºÎÅÍ À̸§À» ¼±ÅÃ:"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 Æ÷ÀÎÆ® Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 Æ÷ÀÎÆ® Tahoma"
-
-#~ msgid "Blank forms at end:"
-#~ msgstr "³¡´Ü ºñ¿ì±â:"
-
-#~ msgid "Body"
-#~ msgstr "º»¹®"
-
-#~ msgid "Bottom:"
-#~ msgstr "¾Æ·¡:"
-
-#~ msgid "Font..."
-#~ msgstr "±Û²Ã..."
-
-#~ msgid "Fonts"
-#~ msgstr "±Û²Ã"
-
-#~ msgid "Footer:"
-#~ msgstr "²¿¸®¸»:"
-
-#~ msgid "Format"
-#~ msgstr "Çü½Ä"
-
-#~ msgid "Header"
-#~ msgstr "¸Ó¸®¸»:"
-
-#~ msgid "Header/Footer"
-#~ msgstr "¸Ó¸®¸»/²¿¸®¸»"
-
-#~ msgid "Headings"
-#~ msgstr "¸Ó¸´¸»"
-
-#~ msgid "Headings for each letter"
-#~ msgstr "°¢ À帶´Ù Ç¥Á¦´Þ±â"
-
-#~ msgid "Height:"
-#~ msgstr "³ôÀÌ:"
-
-#~ msgid "Include:"
-#~ msgstr "Æ÷ÇÔ:"
-
-#~ msgid "Landscape"
-#~ msgstr "°¡·Î"
-
-#~ msgid "Left:"
-#~ msgstr "¿ÞÂÊ:"
-
-#~ msgid "Margins"
-#~ msgstr "¿©¹é"
-
-#~ msgid "Number of columns:"
-#~ msgstr "¿­ ¼ö:"
-
-#~ msgid "Options"
-#~ msgstr "¼³Á¤"
-
-#~ msgid "Orientation"
-#~ msgstr "¹æÇâ"
-
-#~ msgid "Page"
-#~ msgstr "ÂÊ"
-
-#~ msgid "Paper"
-#~ msgstr "Á¾ÀÌ"
-
-#~ msgid "Paper source:"
-#~ msgstr "±ÞÁö¹æ¹ý:"
-
-#~ msgid "Portrait"
-#~ msgstr "¼¼·Î"
-
-#~ msgid "Preview:"
-#~ msgstr "¹Ì¸®º¸±â:"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "ȸ»ö ¸í¾ÏÀ¸·Î Àμâ"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "¦¼ö ÂÊ µÚÁý±â"
-
-#~ msgid "Right:"
-#~ msgstr "¿À¸¥ÂÊ:"
-
-#~ msgid "Sections:"
-#~ msgstr "¼½¼Ç:"
-
-#~ msgid "Shading"
-#~ msgstr "¸í¾Ï"
-
-#~ msgid "Start on a new page"
-#~ msgstr "»õ ÂÊÀ» ½ÃÀÛÇÕ´Ï´Ù"
-
-#~ msgid "Style name:"
-#~ msgstr "Çü½Ä À̸§:"
-
-#~ msgid "Top:"
-#~ msgstr "ˤ:"
-
-#~ msgid "Type:"
-#~ msgstr "ÇüÅÂ:"
-
-#~ msgid "Width:"
-#~ msgstr "Æø:"
-
-#~ msgid "Edit appointment"
-#~ msgstr "¾à¼ÓÀ» ¼öÁ¤Çϱâ"
-
-#~ msgid "Calendar"
-#~ msgstr "´Þ·Â"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "´Þ·Â ¼³Á¤"
-
-#~ msgid "Highlight"
-#~ msgstr "°­Á¶"
-
-#~ msgid "Show"
-#~ msgstr "º¸±â"
-
-#~ msgid "Start of day:"
-#~ msgstr "½ÃÀÛ ³¯Â¥:"
-
-#~ msgid "TaskPad"
-#~ msgstr "ÀÛ¾÷Æеå"
-
-#~ msgid "seconds."
-#~ msgstr "ÃÊ."
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% ¿Ï·á(_p):"
-
-#~ msgid "C_lassification:"
-#~ msgstr "ºÐ·ù(_l):"
-
-#~ msgid "In Progress"
-#~ msgstr "ÁøÇàÁß"
-
-#~ msgid "Normal"
-#~ msgstr "º¸Åë"
-
-#~ msgid "Task"
-#~ msgstr "ÀÛ¾÷"
-
-#~ msgid "_Contacts..."
-#~ msgstr "¿¬¶ôó(_C)..."
-
-#~ msgid "_Priority:"
-#~ msgstr "¿ì¼±¼øÀ§(_P):"
-
-#~ msgid "_Status:"
-#~ msgstr "»óÅÂ(_S):"
-
-#~ msgid "Modify"
-#~ msgstr "¼öÁ¤"
-
-#~ msgid "Preview"
-#~ msgstr "¹Ì¸®º¸±â"
-
-#~ msgid "_Start time:"
-#~ msgstr "½ÃÀÛ ½Ã°£(_S):"
-
-#~ msgid "_Starting date:"
-#~ msgstr "½ÃÀÛ ³¯Â¥(_S):"
-
-#~ msgid "Attachment properties"
-#~ msgstr "÷ºÎ ¼Ó¼º"
-
-#~ msgid "File name:"
-#~ msgstr "ÆÄÀÏ À̸§:"
-
-#~ msgid "MIME type:"
-#~ msgstr "MIME Çü½Ä:"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "°¡»óÆú´õ ÆíÁý"
-
-#~ msgid "Filter Rules"
-#~ msgstr "°Å¸£°³ ±ÔÄ¢"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "°¡»ó Æú´õ"
-
-#~ msgid "vFolder Sources"
-#~ msgstr "°¡»ó Æú´õ ¼Ò½º"
-
-#~ msgid "Save"
-#~ msgstr "ÀúÀå"
-
-#~ msgid "Show all hidden"
-#~ msgstr "¼û±ä°Í ¸ðµÎ º¸±â"
-
-#~ msgid "Hide Messages"
-#~ msgstr "¸Þ¼¼Áö ¼û±è"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Á¦¸ñ \"%s\" ¼û±è"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Á¤º¸ ¾øÀ½"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "÷ºÎ ¼Ó¼º"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "°í±Þ..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "ÀÎÁõ:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "ÀÎÁõ:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "ÀüüÀ̸§:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "È£½ºÆ®:"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "ÆíÁö ¹Þ±â"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "»õ·Î¿î(_N)"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "¼³Á¤"
-
-#~ msgid "Organization:"
-#~ msgstr "Á¶Á÷:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "ºñ¹Ð¹øÈ£"
-
-#, fuzzy
-#~ msgid "Remember my password"
-#~ msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "´äÀå"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "VCard·Î ÀúÀå"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "¼­¸í ÆÄÀÏ:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³¿"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "¼­¹ö:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "¼­¹ö:"
-
-#~ msgid "Signature file:"
-#~ msgstr "¼­¸í ÆÄÀÏ:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "¼­¸í ÆÄÀÏ:"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "ÇüÅÂ:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Á¤º¸ ¾øÀ½"
-
-#~ msgid "Username:"
-#~ msgstr "»ç¿ëÀÚÀ̸§:"
-
-#~ msgid "Full name:"
-#~ msgstr "ÀüüÀ̸§:"
-
-#~ msgid "Email address:"
-#~ msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-
-#~ msgid "Signature File"
-#~ msgstr "¼­¸í ÆÄÀÏ"
-
-#~ msgid "Server:"
-#~ msgstr "¼­¹ö:"
-
-#~ msgid "Mail source type:"
-#~ msgstr "¸ÞÀÏ ¼Ò½º Çü½Ä:"
-
-#~ msgid "News source type:"
-#~ msgstr "´º½º ¼Ò½º Çü½Ä:"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "\"%s\" ½ÃÇèÁß"
-
-#~ msgid "Address"
-#~ msgstr "ÁÖ¼Ò"
-
-#~ msgid "News Servers"
-#~ msgstr "´º½º ¼­¹ö"
-
-#~ msgid "Delete a contact"
-#~ msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
-
-#~ msgid "Find"
-#~ msgstr "ã±â"
-
-#~ msgid "Find a contact"
-#~ msgstr "¿¬¶ôó ã¾Æº»´Ù"
-
-#~ msgid "Print contacts"
-#~ msgstr "¿¬¶ôó¸¦ ÀμâÇÕ´Ï´Ù"
-
-#~ msgid "View all contacts"
-#~ msgstr "¸ðµç ¿¬¶ôó º¸±â"
-
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "ÁÖ¼Ò·Ï ¼³Á¤(_A)..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "¿¬¶ôó¸¦ Àμâ(_P)..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "¿¬¶ôó ã±â(_S)"
-
-#~ msgid "5 Days"
-#~ msgstr "´å»õ¾¿"
-
-#~ msgid "Ca_lendar"
-#~ msgstr "´Þ·Â(_l)"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "»õ ´Þ·ÂÀ» ¸¸µì´Ï´Ù"
-
-#~ msgid "Go to"
-#~ msgstr "°¡±â"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "ÁöÁ¤ÇÑ ³¯·Î °¡±â"
-
-#~ msgid "Month"
-#~ msgstr "´Þ"
-
-#~ msgid "Open a calendar"
-#~ msgstr "´Þ·ÂÀ» ¿±´Ï´Ù"
-
-#~ msgid "Prev"
-#~ msgstr "ÀÌÀü"
-
-#~ msgid "Print this calendar"
-#~ msgstr "ÀÌ ´Þ·Â ÀμâÇϱâ"
-
-#~ msgid "Show 1 day"
-#~ msgstr "ÇϷ羿 º¸±â"
-
-#~ msgid "Show 1 month"
-#~ msgstr "ÇÑ´Þ¾¿ º¸±â"
-
-#~ msgid "Show 1 week"
-#~ msgstr "ÇÑÁÖ¾¿ º¸±â"
-
-#~ msgid "Week"
-#~ msgstr "ÁÖ"
-
-#~ msgid "_New"
-#~ msgstr "»õ·Î¿î(_N)"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "´Þ·Â ¿­±â(_O)"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "ÀÌ ´Þ·Â Àμâ(_P)"
-
-#~ msgid "_Save As..."
-#~ msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_S)..."
-
-#~ msgid "Delete this item"
-#~ msgstr "ÀÌ Ç׸ñ¸¦ »èÁ¦ÇÕ´Ï´Ù"
-
-#~ msgid "Delete..."
-#~ msgstr "»èÁ¦..."
-
-#~ msgid "Help"
-#~ msgstr "µµ¿ò¸»"
-
-#~ msgid "Print En_velope..."
-#~ msgstr "ºÀÅõ Àμâ(_v)..."
-
-#~ msgid "Print this item"
-#~ msgstr "ÀÌ Ç׸ñÀ» Àμâ"
-
-#~ msgid "Print..."
-#~ msgstr "Àμâ..."
-
-#~ msgid "Save _As..."
-#~ msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_A)..."
-
-#~ msgid "Save and Close"
-#~ msgstr "ÀúÀåÈÄ ¸¶Ä§"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "¾à¼ÓÀ» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
-
-#~ msgid "See online help"
-#~ msgstr "¿Â¶óÀÎ µµ¿ò¸»À» º¸¿©ÁØ´Ù"
-
-#~ msgid "_File"
-#~ msgstr "ÆÄÀÏ(_F)"
-
-#~ msgid "_Print..."
-#~ msgstr "Àμâ(_P)..."
-
-#~ msgid "_Save"
-#~ msgstr "ÀúÀå(_S)"
-
-#~ msgid "About this application"
-#~ msgstr "ÀÌ ÀÀ¿ëÇÁ·Î±×·¥¿¡ ´ëÇÏ¿©"
-
-#~ msgid "About..."
-#~ msgstr "ÀÌ ÇÁ·Î±×·¥Àº..."
-
-#~ msgid "C_lear"
-#~ msgstr "ºñ¿ò(_l)"
-
-#~ msgid "C_ut"
-#~ msgstr "ÀÚ¸£±â(_u)"
-
-#~ msgid "Clear"
-#~ msgstr "ºñ¿ò"
-
-#~ msgid "Clear the selection"
-#~ msgstr "¼±ÅÃÇÑ ºÎºÐ ºñ¿ò"
-
-#~ msgid "Close this appointment"
-#~ msgstr "ÀÌ ¾à¼ÓÀ» ´Ý½À´Ï´Ù"
-
-#~ msgid "Copy"
-#~ msgstr "º¹»ç"
-
-#~ msgid "Copy the selection"
-#~ msgstr "¼±ÅÃÇÑ°Í º¹»ç"
-
-#~ msgid "Cut"
-#~ msgstr "ÀÚ¸£±â"
-
-#~ msgid "Cut the selection"
-#~ msgstr "¼±ÅÃÇÑ°Í ÀÚ¸§"
-
-#~ msgid "Dump XML"
-#~ msgstr "XML·Î ´ýÇÁ"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "°íÄ¥¿¹Á¤: ÁÖ¼Ò·Ï(_B)..."
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "°íÄ¥¿¹Á¤: À̸§ È®ÀÎ(_k)"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "°íÄ¥¿¹Á¤: µµ¿ò¸»"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "°íÄ¥¿¹Á¤: ºÒ¿ÏÀüÇÑ Å½ºÅ©(_c)"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "°íÄ¥¿¹Á¤: ÆÄÀÏ »ðÀÔ"
-
-#~ msgid "Find Again"
-#~ msgstr "´Ù½Ã ã±â"
-
-#~ msgid "Find _Again"
-#~ msgstr "´Ù½Ã ã±â(_A)"
-
-#~ msgid "N_ext"
-#~ msgstr "´ÙÀ½(_e)"
-
-#~ msgid "Paste the clipboard"
-#~ msgstr "Ŭ¸³º¸µå¿¡¼­ ºÙ¿©³Ö±â"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "Àμ⠼³Á¤(_e)..."
-
-#~ msgid "Print Setup"
-#~ msgstr "Àμ⠼³Á¤"
-
-#~ msgid "Properties"
-#~ msgstr "¼³Á¤"
-
-#~ msgid "Replace"
-#~ msgstr "¹Ù²Ù±â"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "¾à¼ÓÀ» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
-
-#~ msgid "Save the current file"
-#~ msgstr "ÇöÀç ÆÄÀÏÀ» ÀúÀå"
-
-#~ msgid "Select All"
-#~ msgstr "ÀüºÎ ¼±ÅÃ"
-
-#~ msgid "Select everything"
-#~ msgstr "Àüü¸¦ ¼±ÅÃÇÕ´Ï´Ù"
-
-#~ msgid "Undo"
-#~ msgstr "½ÇÇàÃë¼Ò"
-
-#~ msgid "_About..."
-#~ msgstr "ÀÌ ÇÁ·Î±×·¥Àº(_A)..."
-
-#~ msgid "_Close"
-#~ msgstr "´Ý±â(_C)"
-
-#~ msgid "_Copy"
-#~ msgstr "º¹»ç(_C)"
-
-#~ msgid "_Edit"
-#~ msgstr "¼öÁ¤(_E)"
-
-#~ msgid "_Find..."
-#~ msgstr "ã±â(_F)..."
-
-#~ msgid "_Help"
-#~ msgstr "µµ¿ò¸»(_H)"
-
-#~ msgid "_Paste"
-#~ msgstr "ºÙÀ̱â(_P)"
-
-#~ msgid "_Print"
-#~ msgstr "Àμâ(_P)"
-
-#~ msgid "_Properties..."
-#~ msgstr "¼³Á¤(_P)..."
-
-#~ msgid "_Redo"
-#~ msgstr "Àç½ÇÇà(_R)"
-
-#~ msgid "_Replace..."
-#~ msgstr "¹Ù²Ù±â(_R)..."
-
-#~ msgid "_Undo"
-#~ msgstr "½ÇÇàÃë¼Ò(_U)"
-
-#~ msgid "Compose a new message"
-#~ msgstr "»õ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
-
-#~ msgid "F_older"
-#~ msgstr "Æú´õ(_o)"
-
-#~ msgid "Get Mail"
-#~ msgstr "ÆíÁö ¹Þ±â"
-
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "»èÁ¦µÈ ¸Þ¼¼Áö ¼û±è(_D)"
-
-#~ msgid "Hide _Read messages"
-#~ msgstr "ÀÐÀº ¸Þ¼¼Áö ¼û±è(_R)"
-
-#~ msgid "Hide _Selected messages"
-#~ msgstr "¼±ÅÃµÈ ¸Þ¼¼Áö ¼û±è(_S)"
-
-#~ msgid "Mail _Filters..."
-#~ msgstr "ÆíÁö °Å¸£°³(_F)..."
-
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "±¸µ¶ °ü¸®..."
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "ÀÐÀº°ÍÀ¸·Î Ç¥½Ã(_k)"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "ÀÐÁö ¾ÊÀº°ÍÀ¸·Î Ç¥½Ã(_n)"
-
-#~ msgid "Move"
-#~ msgstr "À̵¿"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î À̵¿ÇÕ´Ï´Ù"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "¸Þ¼¼Áö Àμ⠹̸®º¸±â..."
-
-#~ msgid "Print message..."
-#~ msgstr "¸Þ¼¼Áö Àμâ..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "¸ðµÎ ´äÀå(_A)"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå(_S)"
-
-#~ msgid "Select _All"
-#~ msgstr "ÀüºÎ ¼±ÅÃ(_A)"
-
-#~ msgid "Show _All messages"
-#~ msgstr "¸ðµç ¸Þ¼¼Áö º¸±â(_A)"
-
-#~ msgid "Threaded Message list"
-#~ msgstr "¿¬°üµÈ ¸Þ¼¼Áö ¸ñ·Ï"
-
-#~ msgid "_Apply Filters"
-#~ msgstr "°Å¸£°³ Àû¿ë(_A)"
-
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Æú´õ·Î º¹»ç(_C)..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "¸Þ¼¼Áö ÆíÁý(_E)"
-
-#~ msgid "_Expunge"
-#~ msgstr "Á¦°Å(_E)"
-
-#~ msgid "_Forward"
-#~ msgstr "Àü´Þ(_F)"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "¼±Åà ¹ÝÀü(_I)"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
-
-#~ msgid "_Message"
-#~ msgstr "¸Þ¼¼Áö(_M)"
-
-#~ msgid "_Move to Folder..."
-#~ msgstr "Æú´õ·Î À̵¿(_M)..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "»õ â¿¡¼­ ¿­±â(_O)"
-
-#~ msgid "_Print Message"
-#~ msgstr "¸Þ¼¼Áö Àμâ(_P)"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "´Ù¸¥ À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå(_S)..."
-
-#~ msgid "_Undelete"
-#~ msgstr "µÇ»ì¸²(_U)"
-
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "°¡»ó Æú´õ ÆíÁý±â(_V)..."
-
-#~ msgid "Attach"
-#~ msgstr "÷ºÎ"
-
-#~ msgid "Close the current file"
-#~ msgstr "ÇöÀç ÆÄÀÏ ´ÝÀ½"
-
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "ÀÌ ¸Þ¼¼Áö¸¦ PGP·Î ¾ÏȣȭÇÕ´Ï´Ù"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "¸Þ¼¼Áö¿¡ ÅؽºÆ®·Î ÆÄÀÏÀ» »ðÀÔÇÕ´Ï´Ù"
-
-#~ msgid "Insert text file..."
-#~ msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
-
-#~ msgid "Open a file"
-#~ msgstr "ÆÄÀÏÀ» ¿±´Ï´Ù"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP ¾Ïȣȭ"
-
-#~ msgid "PGP Sign"
-#~ msgstr "PGP ¼­¸í"
-
-#~ msgid "Save As"
-#~ msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå"
-
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Æú´õ·Î ÀúÀå(_f)... (°íÄ¥¿¹Á¤)"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Æú´õ·Î ÀúÀå..."
-
-#~ msgid "Save the current file with a different name"
-#~ msgstr "ÇöÀç ÆÄÀÏÀ» ´Ù¸¥À̸§À¸·Î ÀúÀåÇÕ´Ï´Ù"
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "¸Þ¼¼Áö¸¦ ÁöÁ¤ÇÑ Æú´õ·Î ÀúÀåÇÕ´Ï´Ù"
-
-#~ msgid "Send"
-#~ msgstr "º¸³¿"
-
-#~ msgid "Send _later"
-#~ msgstr "³ªÁß¿¡ º¸³¿(_l)"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "ÆíÁö¸¦ HTMLÇü½ÄÀ¸·Î º¸³¿"
-
-#~ msgid "Send the message later"
-#~ msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
-
-#~ msgid "Send the message now"
-#~ msgstr "Áö±Ý ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
-
-#~ msgid "Send this message now"
-#~ msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³À´Ï´Ù"
-
-#~ msgid "Show / hide attachments"
-#~ msgstr "÷ºÎ¹° º¸ÀÓ/¼û±è"
-
-#~ msgid "Show _attachments"
-#~ msgstr "÷ºÎ¹° º¸±â(_a)"
-
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "À̸޼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
-
-#~ msgid "_Open..."
-#~ msgstr "¿­±â(_O)..."
-
-#~ msgid "_Security"
-#~ msgstr "º¸¾È(_S)"
-
-#~ msgid "Subscribe"
-#~ msgstr "±¸µ¶"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "±¸µ¶ ÁßÁö"
-
-#~ msgid "Display a different folder"
-#~ msgstr "´Ù¸¥ Æú´õ¸¦ Ç¥½Ã"
-
-#~ msgid "E_xit"
-#~ msgstr "Á¾·á(_x)"
-
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
-
-#~ msgid "Exit the program"
-#~ msgstr "ÇÁ·Î±×·¥À» ¸¶Ä¨´Ï´Ù"
-
-#~ msgid "Getting _Started"
-#~ msgstr "½ÃÀÛÇϱâ"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "EvolutionÀÇ Á¤º¸ º¸±â"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Æú´õ ¸·´ë º¸±â(_F)"
-
-#~ msgid "Submit _Bug Report"
-#~ msgstr "¹ö±× Á¦º¸(_B)"
-
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Bug Buddy·Î ¹ö±×Á¦º¸¸¦ ÇÕ´Ï´Ù"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Æú´õ ¸·´ë º¸±â"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "´ÜÃà ¸·´ë º¸±â"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution˼(_A)..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "¾à¼Ó(_A) (°íÄ¥¿¹Á¤)"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "¿¬°á(_C) (°íÄ¥¿¹Á¤)"
-
-#~ msgid "_Folder"
-#~ msgstr "Æú´õ(_F)"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "Æú´õ·Î °¡±â(_G)..."
-
-#~ msgid "_Index"
-#~ msgstr "»öÀÎ(_I)"
-
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "ÆíÁö ¸Þ¼¼Áö(_M) (°íÄ¥¿¹Á¤)"
-
-#~ msgid "_Settings"
-#~ msgstr "¼³Á¤(_S)"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "ÀÛ¾÷(_T) (°íÄ¥¿¹Á¤)"
diff --git a/po/lt.po b/po/lt.po
deleted file mode 100644
index bc54fc0f6c..0000000000
--- a/po/lt.po
+++ /dev/null
@@ -1,7913 +0,0 @@
-# Lithuanian translation of Evolution
-# Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# Gediminas Paulauskas <menesis@delfi.lt>, 2000-2001.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-02-24 22:29+0200\n"
-"PO-Revision-Date: 2001-02-25 01:31+0200\n"
-"Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
-"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-13\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kortelë: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Vardas: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prieðdëlis: "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Vardas:     "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Papildomas: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Pavardë:    "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Galûnë:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Gimimo data:"
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresas:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Paðto dëþë:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gatvë:       "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Miestas:     "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regionas:    "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Paðto kodas: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Valstybë:    "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonai:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefonas:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"El. paðtas:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"El. paðtas:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Paðto programa: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Laiko juosta: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geogr. vietovë: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Verslo padëtis: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Organizacija: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Vardas: "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorijos: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentaras: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unikali eilutë: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Vieðas raktas: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importuoja GnomeCard bylas á Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Negalëjau inicializuoti Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Iðjungtas"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sinchronizuoti"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopijuoti ið Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopijuoti á Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Sulieti ið Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Sulieti á Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Originalo autorius:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution adresø knygelës konduitas"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution adresø knygelës konduito konfigûravimo árankis\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sinchronizuoti veiksmà"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Konduito bûsena"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nëra sukonfigûruoto Piloto, praðau pirmiausia\n"
-"Pasirinkti ¥Ryðio su Pilotu savybës´ capplet'à."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Neprisijungta prie gnome-pilot demono"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ávyko klaida, bandant gauti pilotø\n"
-"sàraðà ið gnome-pilot demono"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Negalëjau ákelti þymeklio\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook neákelta\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Negalëjau paleisti wombat serverio"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Negalëjau paleisti wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Nepavyko perskaityti piloto Address programos bloko"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Konfigûruoti adresø konduità"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution Adresø konduitas "
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Pridëti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "_Jubiliejus:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "V_erslo"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "Verslo _faksas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontaktai..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegorijos..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontaktø tvarkyklë"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detalës"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Byloje kaip:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Paprastas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Naujas telefono tipas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "Pas_tabos:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefonø tipai"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Pagrindinis el. paðtas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Nori gauti _HTML laiðkus"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Tinklapio adresas:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Pridëti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresas..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "_Asistento vardas:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "_Gimtadienis:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Verslo"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Kompanija:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Iðtrinti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "_Departamentas:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Pilnas vardas..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Namø"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Pareigos:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "_Vadybininko vardas:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobilus"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "_Slapyvardis:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "_Ofisas:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Profesija:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "S_utuoktinis:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "_Tai yra paðto adresas"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Iðtrinti kontaktà?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Asistento"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Verslo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Verslo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Verslo faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Atsakiklis"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Automobilio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Kompanijos"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Namø"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Namø 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Namø faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobilus"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
-msgid "Other"
-msgstr "Kitas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Kitas faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Ieðkas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Pagrindinis"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Teleksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "El. paðtas 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "El. paðtas 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresas _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Patikrinti adresà"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Valst_ybë:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Suomija"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "JAV"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresas:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Miestas:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_PO Box:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Valstija/Provincija:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Paðto kodas:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Tikrinti pilnà vardà"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr ""
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Vardas:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Pavardë:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "Vi_durinis:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Galûnë:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titulas:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Rodyti _maþas korteles"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Rodyti _lentelæ"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Ávesk %s slaptaþodá"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adresø knygelës"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Mes negalëjome atidaryti ðios adresø knygelës. Tai\n"
-"reiðkia arba tai, kad tu ávedei neteisingà URI, arba \n"
-"bandei prieiti prie LDAP serverio, bet neturi \n"
-"ákompiliuoto LDAP palaikymo. Jei tu ávedei URI, \n"
-"pasitikrink URI teisingumà ir ávesk ið naujo. Jei ne, \n"
-"tikriausiai bandei prieiti prie LDAP serverio. Jei nori\n"
-"naudoti LDAP, tu turi parsisiøsti ir ádiegti OpenLDAP,\n"
-"o tada perkompiliuoti ir ádiegti Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Rodyti visus"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Bet kuriame lauke yra"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Varde yra"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "El. paðte yra"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, kurá rodys Aplankø narðyklë"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Kiti kontaktai"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP serveris"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Byla"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Neþinomas adresø knygelës tipas"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Jokio (anoniminis reþimas)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Slaptaþodis"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Neþinomas auth tipas"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Pagrindas"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Vienas"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Submedis"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Prisiminti ðá slaptaþodá"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Hostas:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Prievadas:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Paieðkos sritis:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autentikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
-msgid "Path:"
-msgstr "Kelias:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Sukurti kelià jei jis neegzistuoja."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Redaguoti adresø knygelæ"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Pridëti adresø knygelæ"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Pasirink tavo turimos adresø knygelës tipà, ir ávesk reikiamà informacijà "
-"apie jà."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Vardas:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Apraðymas:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adresø knygelës ðaltinis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:696
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Iðtrinti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:682 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Taisyti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Vardas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adresø knygelës konduito konfigûravimo árankis\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adresø knygelës maþø korteliø þiûrëklë"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution adresø knygelës konduito konfigûravimo árankis\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Paspausk èia, jei reikia adresø knygelës"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adresø knygelës vardø pasirinkimo sàsaja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rasti..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Laiðko gavëjai"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Pasirink vardà ið:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Paieðka"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Iðsaugoti kaip VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Spausk èia, kad pridëtum kontaktà *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "El. paðtas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Tinklapis"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Departamentas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Ofisas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titulas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Profesija"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Vadybininkas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Slapyvardis"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Sutuoktinis"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Pastaba"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Spausk èia, kad pridëtum kontaktà"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Áðsaugoti á adresø knygelæ"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ðiame vaizde nëra nieko, kà bûtø galima parodyti.\n"
-"\n"
-"Dukart spragtelk, kad sukurtum naujà Kontaktà."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-#, fuzzy
-msgid "Blank forms at end:"
-msgstr "Tuðèios formos gale:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Tekstas"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Apaèioje:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Matavimo vienetai:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Ðriftas..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Ðriftai"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Poraðtë:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formatas"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Antraðtë"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Antraðtë/Poraðtë"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Antraðtës"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Antraðtës kiekvienam laiðkui"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Aukðtis:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Seka iðkart vienas po kito"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Átraukti:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Gulsèias lapas"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Kairëje:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Laiðkø kortelës ðone"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Paraðtës"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Stulpeliø skaièius:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Parinktys"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientacija"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Puslapis"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Puslapio nuostatos:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Popierius"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Popieriaus ðaltinis:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Staèias lapas"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Perþiûra:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Spausdinti naudojant pilkus ðeðëlius"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Apversti lyginiuose puslapiuose"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Deðinëje:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sekcijos:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Ðeðëliai"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Dydis:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Prasideda naujame puslapyje"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stiliaus vardas:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Virðuje:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
-msgid "Type:"
-msgstr "Tipas:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Plotis:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution Kalendoriaus konduitas"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution kalendoriaus konduito konfigûravimo árankis.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Ávyko klaida, bendraujant su kalendoriaus serveriu"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the Evolution Calendar conduit"
-msgstr "Konfigûruoti Evolution Kalendoriaus konduità"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the Evolution ToDo conduit"
-msgstr "Konfigûruoti Evolution ToDo konduità"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo konduitas"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolution ToDo konduito konfigûravimo árankis.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Negalëjau perskaityti piloto ToDo programos bloko"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Priminti man apie ávyká "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Uþtildyti"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Gerai"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Byla nerasta"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Atidaryti kalendoriø"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Iðsaugoti kalendoriø"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y-%m-%d %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y-%m-%d %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Vieðas"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Asmeniðkas"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Slaptas"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Neþinomas"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "Ð"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "P"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "R"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Skaidrus"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Neskaidrus"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data turi bûti ávesta formatu:\n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografinë vietovë turi bûti ávesta formatu:\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Procentinë reikðmë turi bûti tarp 0 ir 100 imtinai"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Svarbumas turi bûti tarp 1 ir 9 imtinai"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normalus"
-
-#: calendar/gui/calendar-model.c:1550
-#, fuzzy
-msgid "Recurring"
-msgstr "Pasikartojimas"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Priskirtas"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Taip"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %Y m. %B %d d."
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%H:%M"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Klaida ákeliant kalendoriø</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Klaida ákeliant kalendoriø:</b>Metodas nepalaikomas"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Rodymas"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Rodyti ávykius"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Rodyti uþduotis"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Ákeliamas kalendorius"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, kurá rodys kalendorius"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Paþadinti %A, %Y %b %d, %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Praneðimas apie tavo ávyká %A, %Y %b %d, %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Nëra jokios santraukos."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Uþdaryti"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Keisti ávyká"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Uþtildymo laikas (minutëmis)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutës"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minuèiø"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 valandø (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuèiø"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 valandø"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minuèiø"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minuèiø"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Perspëjimai baigiasi po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Perspëjimai garsu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pyptelëti, kai atsiranda aliarmo langai."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalendorius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Kalendoriaus nuostatos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Spalvos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Suspausti savaitgalius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Datø navigatoriaus parinktys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Áprasta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Rodymo parinktys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Kada reikia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Leisti uþtildymà"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dienos pabaiga:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Pirma savaitës diena:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Pen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Penktadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Paryðkinti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Ðiandienos ávykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Ðiandienos ávykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Ávykius, kurie dar ne ðiandien"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Ávykiai, kurie dar ne ðiandien:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Pir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Pirmadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Praëjusius ávykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Praëjæ ávykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Pasirink spalvà"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
-msgid "Priority"
-msgstr "Svarbumas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Priminti man apie visus ávykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Priminimas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Ðeð"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Ðeðtadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Rodyti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Rodyti ávykiø pabaigos laikus"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Rodyti savaièiø numerius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dienos pradþia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Sek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Sekmadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Uþduotys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Ket"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Ketvirtadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Likæs laikas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Laiko dalijimas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Laiko formatas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Ant"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Antradienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Perspëjimai vaizdu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Tre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Treèiadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Darbo savaitë"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutes prieð jiems ávykstant."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
-msgid "seconds."
-msgstr "sekundþiø."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ar tu tikrai nori iðtrinti ávyká ¥%s´?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ar tu tikrai nori iðtrinti ðá bevardá ávyká?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ar tu tikrai nori iðtrinti uþduotá ¥%s´?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ar tu tikrai nori iðtrinti ðià bevardæ uþduotá?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ar tu tikrai nori iðtrinti þurnalo áraðà ¥%s´?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ar tu tikrai nori iðtrinti ðá bevardá þurnalo áraðà?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ar nori iðsaugoti pakeitimus?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% uþ_baigta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Nutraukta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Klasifikacija"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Uþbaigta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Data ir laikas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Uþbaigimo data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Aukðtas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Vykdoma"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Þemas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Nepradëta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "As_meniðkas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Paþanga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "_Vieðas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "P_radþios data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Sa_ntrauka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Uþduotis"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Neapibrëþta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Slaptas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Kada reikia:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Svarbumas:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Bûsena:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Taisyti uþduotá"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Nëra santraukos"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Ávykis -- %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Uþduotis -- %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Þurnalo áraðas -- %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategorijos"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Uþbaigimo data"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Pabaigos data"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Pradþios data"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografinë vietovë"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Procentø uþbaigta"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Santrauka"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Skaidrumas"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Perspëjimai"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Spausk èia, kad pridëtum uþduotá"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Paþymëti uþbaigta"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Paþymëti, jog uþduotis uþbaigta"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Taisyti ðià uþduotá..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Taisyti ðià uþduotá"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Iðtrinti ðià uþduotá"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Iðtrinti uþduotá"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuèiø padalos"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Naujas ávykis..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-#, fuzzy
-msgid "Schedule meeting"
-msgstr "Áraðyti susitikimà á dienotvarkæ"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Taisyti ðá ávyká..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Iðtrinti ðá ávyká"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Padaryti ðá ávyká judamu"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Iðtrinti ðá pasitaikymà"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Iðtrinti visus pasitaikymus"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Að negalëjau atnaujinti tavo kalendoriaus bylos!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Komponentas sëkmingai atnaujintas."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Buvo klaida ákeliant kalendoriaus bylà."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Að negalëjau atidaryti tavo kalendoriaus bylos!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Að negalëjau ákelti tavo kalendoriaus bylos!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Að negalëjau skaityti tavo kalendoriaus bylos!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:491
-#, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Nepavyko sukurti kalendoriaus èia: ¥%s´"
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Að negalëjau iðtrinti kalendoriaus komponento!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Komponentas sëkmingai iðtrintas."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Að nepaþástu tokio kalendoriaus komponento tipo."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Pridëti kalendoriø"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Priimti"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Atnaujinti kalendoriø"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Atðaukti susitikimà"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, fuzzy, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--kam--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Kalendoriaus þinutë"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Data:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Ákeliamas kalendorius..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizatorius:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
-msgid "Sender"
-msgstr "Siuntëjas"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Santrauka:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr ""
-
-#: calendar/gui/e-itip-control.glade.h:13
-#, fuzzy
-msgid "date-start"
-msgstr "Dienos pradþia:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Dalyvio adresas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Dalyviai: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Atðaukti susitikimà"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Automobilio"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Susitikimo pakvietimai"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizatorius: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "Áraðyti susitikimà á dienotvarkæ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "_Reikalingi þmonës"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rolë"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "Áraðyti susitikimà á dienotvarkæ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
-msgid "Status"
-msgstr "Bûsena"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Visi"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Kategorija:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Negalëjau ákelti uþduoèiø á ¥%s´"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metodas, reikalingas ákelti ¥%s´, nepalaikomas"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Vis_os dienos ávykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Ávykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Ávykio pagrindai"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Kitoks pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Kas"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Iðimtys"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Keisti"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Jokio pakartojimo"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Groti garsà"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Perþiûra"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Pasikartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisyklë"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Paleisti programà"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Pasiøsti laiðkà"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Nuostatos..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Rodyti dialogà"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Paprastas pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "P_abaigos laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Pradþios laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Pradþios data:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
-msgid "before"
-msgstr "prieð"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dienà(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "ávykio pabaigà"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "kol"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "amþinai"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "valandà(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minutæ(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mënesá(ius)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "ávykio pradþià"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "iki"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "savaitæ(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "metus"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Taisyti ávyká"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "lygiai"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "diena"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "-à"
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "kartà(us) pasitaikys"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d dienø"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 diena"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d savaièiø"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 savaitë"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d valandø"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 valanda"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuèiø"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minutë"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekundþiø"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 sekundë"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " prieð ávykio pradþià"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " po ávykio pradþios"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " prieð ávykio pabaigà"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " po ávykio pabaigos"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Negaliu inicializuoti Evolution paðto komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalendoriaus iTip/iMip þiûrëklë"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Konfigûruoti Evolution Kalendoriaus konduità"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Negalëjau atidaryti aplanko su ¥%s´"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metodas, reikalingas atidaryti ¥%s´, nepalaikomas"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Balandis"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Rugpjûtis"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Gruodis"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Vasaris"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Eiti á datà"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Eiti á ðiandienà"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Sausis"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Liepa"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Birþelis"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Kovas"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Geguþë"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "Lapkritis"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Spalis"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "Rugsëjis"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Negalëjau inicializuoti GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1-a"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2-a"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3-a"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4-a"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5-a"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6-ta"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7-ta"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8-ta"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9-ta"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10-ta"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11-ta"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12-ta"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13-ta"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14-ta"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15-ta"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16-ta"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17-ta"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18-ta"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19-ta"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20-ta"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21-a"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22-a"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23-a"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24-ta"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25-ta"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26-ta"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27-ta"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28-ta"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29-ta"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30-ta"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31-a"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Sk"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Pr"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "An"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Tr"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Kt"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Pn"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Ðt"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Uþduotys"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Esama diena (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Esama savaitë (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Esamas mënuo (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Esami metai (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Spausdinti kalendoriø"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Spaudino perþiûra"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "Uþduoèiø aplanko URI rodymui"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SPATKPÐ"
-
-#: camel/camel-filter-driver.c:790
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Klaida nagrinëjant filtrà: %s: %s"
-
-#: camel/camel-filter-driver.c:795
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Klaida vykdant filtrà: %s: %s"
-
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
-#, fuzzy, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Klaida vykdant filtro paieðkà: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Negaliu iðnagrinëti paieðkos iðraiðkos: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, fuzzy, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Klaida reguliarioje iðraiðkoje ¥%s´:\n"
-"%s"
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) reikalauja vienintelio loginio rezultato"
-
-#: camel/camel-folder-search.c:551
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Vykdoma uþklausa neþinomai antraðtei: %s"
-
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Negalëjau sukurti %s uþrakto bylos: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Baigësi laikas, belaukiant %s uþrakto bylos. Bandyk vëliau."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Negalëjau patikrinti paðto bylos %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Negalëjau atidaryti paðto bylos %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Negalëjau atidaryti laikinos paðto bylos %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Negalëjau atikrinti %s uþrakto bylos: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Klaida skaitant paðto bylà: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Klaida áraðant laikinà paðto bylà: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nepavyko áraðyti laiðkø á laikinà bylà %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Negalëjau sukurti pipe: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Nepavyko programa Movemail: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Neþinoma klaida)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Nepavyko ákelti %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Nepavyko ákelti %s: Modulyje nëra inicializacijos kodo."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s serveris %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Jungtis nutraukta"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Negalëjau prisijungti prie %s (prievadas %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(neþinomas hostas)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Veiksmas nutrauktas"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Nepavyko sukompiliuoti reguliarios iðraiðkos: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL ¥%s´ turi bûti su vartotojo vardu"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL ¥%s´ turi bûti su hostu"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL ¥%s´ turi bûti su keliu"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Nëra tokio hosto %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Laikinai negaliu paieðkoti %s hosto vardo."
-
-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "Virtualiø aplankø paðto tiekëjas."
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr "Paðto skaitymui, kaip uþklausa ið kitos aplankø aibës."
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Protokolui ¥%s´ nëra tiekëjo."
-
-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Negalëjau sukurti katalogo %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL eilutëje ¥%s´ nëra protokolo"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL eilutëje ¥%s´ yra blogas protokolas"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Prievado numeris URL ¥%s´ nëra skaèius."
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "Negalëjau sukurti pipe: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Netikëtas atsakymas ið IMAP serverio: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Netikëtas atsakymas ið IMAP serverio: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Nepavyko IMAP komanda: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
-msgid "Unknown error"
-msgstr "Neþinoma klaida"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Serverio atsakymas baigësi per anksti"
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Netikëtas atsakymas OK ið IMAP serverio: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:199
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Nepavyko ákelti %s santraukos"
-
-#: camel/providers/imap/camel-imap-folder.c:329
-#, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Skaitomas aplankas ið ¥%s´"
-
-#: camel/providers/imap/camel-imap-folder.c:457
-#, fuzzy
-msgid "Synchronising IMAP folder"
-msgstr "Sinchronizuojamas aplankas"
-
-#: camel/providers/imap/camel-imap-folder.c:726
-#: camel/providers/imap/camel-imap-folder.c:888
-msgid "Could not find message body in FETCH response."
-msgstr "Negalëjau rasti laiðko teksto FETCH atsakyme"
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Paðto skaitymui ir raðymui IMAP serveriuose."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Ði parinktis jungsis prie IMAP serverio, naudojant paprasto teksto "
-"slaptaþodá."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Ði parinktis jungsis prie IMAP serverio, naudojant Kerberos 4 autentikacijà."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sPraðau, ávesk IMAP slaptaþodá %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Negalëjau autentikuotis á IMAP serverá.\n"
-"%s\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Negalëjau sukurti katalogo %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "MH formato paðto katalogai"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Paðto laikymui MH tipo paðto kataloguose"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standartinë Unix mailbox byla"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Vietinio paðto laikymui standartiniu mbox formatu"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir formato paðto bylose"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Vietinio paðto laikymui qmail maildir kataloguose"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:135
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "¥%s´ nëra paprasta byla."
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Negalëjau gauti aplanko ¥%s´: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Vietinë paðto byla %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Negalëjau pervadinti aplanko ¥%s´ á %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Negalëjau iðtrinti aplanko santraukos bylos ¥%s´: %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Negalëjau iðtrinti aplanko indekso bylos ¥%s´: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Negalëjau pridurti laiðko prie maildir aplanko: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Negaliu gauti laiðko: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Nëra tokio laiðko"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Negalëjau atidaryti aplanko ¥%s´:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Nëra tokio aplanko ¥%s´."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Negalëjau sukurti aplanko: ¥%s´:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "¥%s´ nëra maildir katalogas."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Negalëjau iðtrinti aplanko ¥%s´: %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "ne maildir katalogas"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Negaliu atidaryti paðto dëþutës: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Negalëjau pridurti laiðko prie mbox bylos: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Negaliu gauti laiðko: %s ið aplanko %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Negalëjau atidaryti bylos ¥%s´: \n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Negalëjau sukurti bylos ¥%s´:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "¥%s´ nëra paprasta byla."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Negalëjau iðtrinti aplanko ¥%s´:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Aplankas ¥%s´ nëra tuðèias. Neiðtryniau."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Daroma aplanko santrauka"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Negalëjau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Negalëjau padaryti aplanko santraukos: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1279
-msgid "Synchronising folder"
-msgstr "Sinchronizuojamas aplankas"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Negalëjau atidaryti aplanko santraukos darymui: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Negalëjau atidaryti laikinos paðto bylos: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-#, fuzzy
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Santraukos nesutampa, nutraukiu sync"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Klaida raðant á laikinà paðto dëþutæ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Nepavyko raðyti á laikinà paðto dëþutæ: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Negalëjau uþdaryti ðaltinio aplanko %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Negalëjau uþdaryti laikino aplanko:  %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Negalëjau pervadinti aplanko: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Neþinoma klaida: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Negalëjau pridurti laiðko prie mh aplanko: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "¥%s´ nëra katalogas."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Praðom ávesti NNTP slaptaþodá vartotojui %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Serveris atmetë vartotojo vardà"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Nepavyko serveriui nusiøsti vartotojo vardo"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Serveris atmetë vartotojo vardà/slaptaþodá"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Laiðkas %s nerastas"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Negalëjau gauti grupiø sàraðo ið serverio."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Negaliu ákelti grupø sàraðo bylos dël %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Negaliu iðsaugoti grupø sàraðo bylos dël %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET naujienos"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Tai tiekëjas, naudojamas skaitant ir raðant á USENET naujienø grupes."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Negalëjau atidaryti katalogo naujienø serveriui: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET naujienos per %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Ði parinktis autentikuosis NNTP serveryje paprasto teksto slaptaþodþiu."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Negalëjau atidaryti ar sukurti .newsrc bylos, skirtos %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Parsiunèiama POP santrauka"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Negalëjau atidaryti aplanko: laiðkø sàraðas buvo nepilnas."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Nëra laiðko su uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Parsiunèiamas POP laiðkas %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Negalëjau parsiøsti laiðko ið POP serverio %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Jungimuisi ið prie POP serveriø. POP protokolas taip pat gali bûti naudojamas "
-"parsiøsti paðtui ið kai kuriø web paðto tiekëjø."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Ði parinktis jungsis prie POP serverio, naudojant paprasto teksto slaptaþodá. "
-"Tai vienintelë parinktis, palaikoma daugelio POP serveriø."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
-msgstr ""
-"Ði parinktis jungsis prie POP serverio, naudojant uþðifruotà slaptaþodá APOP "
-"protokolu. Tai gali veikti nevisiems vartotojams netgi serveriuose, kurie "
-"tikina, jog ðitai palaiko."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuotøsi á "
-"já."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Negalëjau autentikuotis á KPOP serverá: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Negalëjau prisijungti prie POP serverio %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPraðau, ávesk POP3 slaptaþodá, skirtà %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Negalëjau prisijungti prie POP serverio.\n"
-"Klaida siunèiant vartotojo vardà: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Neþinoma)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Negaliu prisijungti prie POP serverio.\n"
-"Jis nepalaiko norimo autentikacijos mechanizmo."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Negalëjau prisijungti prie POP serverio.\n"
-"Klaida siunèiant slaptaþodá: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Nëra tokio aplanko ¥%s´."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Paðto siuntimui, perleidþiant já vietinës sistemos ¥sendmail´ programai."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Negalëjau sukurti pipe á sendmail: %s: paðtas neiðiøstas"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Negalëjau iðsiøsti laiðko: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail'as baigë darbà su signalu %s: paðtas neiðiøstas."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Negalëjau paleisti %s: paðtas neiðiøstas."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail'as baigë darbà bûsena %d: paðtas neiðiøstas."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Paðto siuntimas, naudojant sendmail programà"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Paðto siuntimui prisijungiant prie nutolusio paðto serverio naudojant SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Sintaksës klaida, komanda neatpaþinta"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "SIntaksës klaida parametruose arba argumentuose"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Komanda neágyvendinta"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Komandos parametras neágyvendintas"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Sistemos bûsena, arba sistemos pagalbos atsakymas"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Pagalbos þinutë"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Paslauga pasiruoðusi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-#, fuzzy
-msgid "Service closing transmission channel"
-msgstr "Paslauga uþdaro"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Autentikacija nereikalinga"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Ði parinktis jungsis prie SMTP serverio nenaudojant jokios rûðies "
-"autentikacijos. Tai turëtø bûti gerai jungiantis á daugumà SMTP serveriø."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Ði parinktis jungsis prie SMTP serverio, naudojant CRAM-MD5 autentikacijà."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP serveris %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP paðto siuntimas per %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Negaliu siøsti laiðko: siuntëjo adresas neapibrëþtas."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Negaliu siøsti laiðko: siuntëjo adresas negalioja."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Negaliu siøsti laiðko: neapibrëþti jokie gavëjai."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Negalëjau sukurti pipe á sendmail: %s: paðtas neiðiøstas"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Negalëjau paleisti %s: paðtas neiðiøstas."
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Negalëjau paleisti %s: paðtas neiðiøstas."
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, fuzzy, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "sendmail'as baigë darbà su signalu %s: paðtas neiðiøstas."
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Neþinoma klaida: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 baitas"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u baitø"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "priedas"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prisegti bylà"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Paðalinti"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Paðalinti paþymëtus priedus ið priedø sàraðo"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Prisegti priedà..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Prisegti bylà prie ðio laiðko"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr "Priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Priedo savybës"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Bylos vardas:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Vidinis priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME tipas:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Siøsti kaip:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Nuo:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Paspausk èia, jei reikia adresø knygelës"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Ávesk asmenybæ, ið kurios nori iðsiøsti ðá laiðkà"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Kam:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Ávesk laiðko gavëjus"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Ávesk adresus, kurie gaus ðio laiðko carbon copy"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Ávesk adresus, kurie gaus ðio laiðko carbon copy, bet jø nesimatys laiðko "
-"gavëjø sàraðe."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Tema:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Ávesk laiðko temà"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Negalëjau atidaryti paraðo bylos %s: \n"
-"%s"
-
-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "Iðsaugoti kaip..."
-
-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Klaida iðsaugant bylà: %s"
-
-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Klaida ákeliant bylà: %s"
-
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Ðis laiðkas nebuvo iðsiøstas.\n"
-"\n"
-"Ar norëtum iðsaugoti jo pakeitimus?"
-
-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "Atidaryti bylà"
-
-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "Tokios bylos nëra."
-
-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "Tai nëra paprasta byla."
-
-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "Byla yra, bet jos neámanoma perskaityti."
-
-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ta byla atrodë pasiekiama, bet open(2) nepavyko."
-
-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Byla yra labai didelë (virð 100K).\n"
-"Ar tu tikrai nori jà áterpti?"
-
-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "Ávyko klaida, beskaitant bylà."
-
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "Sukurti laiðkà"
-
-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr "Negaliu sukurti raðyklës lango"
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Negalëjau inicializuoti Evolution kûryklos."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "adreso kortelë"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "kalendoriaus informacija"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Negaliu inicializuoti Evolution paðto komponento."
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Negaliu inicializuoti Evolution paðto komponento."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Tu gali pasirinkti kità HTML puslapá ðio Executive Summary fonui.\n"
-"\n"
-"Tiesiog palik tuðèià áprastam fonui"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Atidaryti %s su áprasta GNOME programa"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Atidaryti %s su áprasta GNOME narðykle"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Siøsti laiðkà á %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Pakeisti rodiná á %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Paleisti %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Uþdaryti %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Perkelti %s kairën"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Perkelti %s deðinën"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Perkelti %s á praeità eilutæ"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Perkelti %s á kità eilutæ"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigûruoti %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Negalëjau atidaryti HTML bylos:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Klaida skaitant duomenis:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Iðvaizda"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fonas:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Santrauka"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Paþymëti, jog uþduotis uþbaigta"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Bandomoji paslauga"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Klaida"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Atnaujinti automatiðkai"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Atnaujinti dabar"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Atnaujinti kas "
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuèiø"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "metai"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "metø"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mënesis"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mënesiø"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "savaitë"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "savaièiø"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dienø"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "valanda"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "valandø"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minutë"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekundë"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekundþiø"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Ei, tu uþmirðai pasirinkti datà."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Vaje. Tu pasirinkai blogà datà."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Laiðko data bus palyginta su esamu laiku, kai\n"
-"paleidþiamas filtras ar atidaromas vAplankas."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Laiðko data bus palyginta su laiku,\n"
-"kurá tu nurodai èia."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Laiðko data bus palyginta su laiku, santykiniu\n"
-"filtro paleidimo laikui;\n"
-"pavyzdþiui, ¥prieð savaitæ´."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "esamas laikas"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "tavo nurodytas laikas"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "laikas, santykinis esamam laikui"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Palyginti su"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "dabar"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<spausk èia, kad pasirinktum datà>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Pridëti filtro taisyklæ"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Keisti filtro taisyklæ"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "gaunamas"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "siunèiamas"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Keisti filtrus"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Tada"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Pridëti veiksmà"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Paðalinti veiksmà"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Uoj, tu pamirðai pasirinkti aplankà.\n"
-"Praðau, gráþk atgal ir nurodyk tikrà aplankà, á kurá perkelti laiðkus."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Parink aplankà"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Ávesk aplanko URI"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<spausk èia, kad pasirinktum aplankà>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Klaida reguliarioje iðraiðkoje ¥%s´:\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Testuoti"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Taisyklës pavadinimas:"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Bevardë"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Jei"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Ávykdyti veiksmus"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "jei visos sàlygos tenkinamos"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "jei kuri nors sàlyga tenkinama"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Pridëti sàlygà"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Paðalinti sàlygà"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Atsakytas kam"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Svarbus"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Skaitytas"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Taisyti vAplankus"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filtro taisyklës"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gaunamas"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Siunèiamas"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtualûs aplankai"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "vAplankø ðaltiniai"
-
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Atsakytas"
-
-#: filter/libfilter-i18n.h:14
-msgid "Assign Colour"
-msgstr "Priskirti spalvà"
-
-#: filter/libfilter-i18n.h:15
-msgid "Assign Score"
-msgstr "Priskirti ávertá"
-
-#: filter/libfilter-i18n.h:16
-msgid "Copy to Folder"
-msgstr "Kopijuoti á aplankà"
-
-#: filter/libfilter-i18n.h:17
-msgid "Date received"
-msgstr "Gavimo data"
-
-#: filter/libfilter-i18n.h:18
-msgid "Date sent"
-msgstr "Siuntimo data"
-
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Iðtrintas"
-
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Juodraðtis"
-
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "Iðraiðka"
-
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "Persiøsti adresu"
-
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
-msgstr "Konferencija"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
-msgstr "Laiðko tekstas"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "Laiðko·antraðtë"
-
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "Laiðkas buvo gautas"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "Laiðkas buvo iðsiøstas"
-
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "Perkelti á aplankà"
-
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "Gavëjai"
-
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Matytas"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Ávertis"
-
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "Priskirti bûsenà"
-
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Ðaltinis"
-
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
-msgstr "Savita antraðtë"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
-msgstr "Sustabdyti vykdymà"
-
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "Tema"
-
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "turi savyje"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "neturi savyje"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "nesibaigia"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "neskamba panaðiai á"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "neprasideda su"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "baigiasi su"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "egzistuoja"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "yra"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "yra didesnis uþ"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "yra maþesnis uþ"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "nëra"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "tuo metu arba po"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "tuo metu ar prieð"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "skamba panaðiai á"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "prasideda su"
-
-#: filter/libfilter-i18n.h:158
-msgid "was after"
-msgstr "buvo po"
-
-#: filter/libfilter-i18n.h:159
-msgid "was before"
-msgstr "buvo prieð"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Pridëti taisyklæ"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Taisyti áverèio taisyklæ"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Pridëti vAplanko taisyklæ"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Keisti vAplanko taisyklæ"
-
-#. add the vTrash folder
-#: mail/component-factory.c:219 mail/component-factory.c:447
-msgid "vTrash"
-msgstr "vÐiukðlës"
-
-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Negaliu inicializuoti Evolution paðto komponento."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr "Negaliu uþregistruoti laikmenos su shell'u"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Áraðyti paieðkà kaip vAplankà"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Tekstas ar tema savyje turi"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Tekstas savyje turi"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Tema savyje turi"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Tekstas savyje neturi"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Tema savyje neturi"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Siuntëjas savyje turi"
-
-#: mail/folder-browser.c:667
-msgid "VFolder on Subject"
-msgstr "vAplankas pagal Temà"
-
-#: mail/folder-browser.c:668
-msgid "VFolder on Sender"
-msgstr "vAplankas pagal Siuntëjà"
-
-#: mail/folder-browser.c:669
-msgid "VFolder on Recipients"
-msgstr "vAplankas pagal Gavëjus"
-
-#: mail/folder-browser.c:670 mail/folder-browser.c:788
-msgid "VFolder on Mailing List"
-msgstr "vAplankas pagal Konferencijà"
-
-#: mail/folder-browser.c:672
-msgid "Filter on Subject"
-msgstr "Filtras pagal Temà"
-
-#: mail/folder-browser.c:673
-msgid "Filter on Sender"
-msgstr "Filtras pagal Siuntëjà"
-
-#: mail/folder-browser.c:674
-msgid "Filter on Recipients"
-msgstr "Filtras pagal Gavëjus"
-
-#: mail/folder-browser.c:675 mail/folder-browser.c:787
-msgid "Filter on Mailing List"
-msgstr "Filtras pagal Konferencijà"
-
-#: mail/folder-browser.c:681 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atidaryti"
-
-#: mail/folder-browser.c:683
-msgid "Save As..."
-msgstr "Iðsaugoti kaip..."
-
-#: mail/folder-browser.c:684 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Spausdinti"
-
-#: mail/folder-browser.c:686
-msgid "Reply to Sender"
-msgstr "Atsakyti siuntëjui"
-
-#: mail/folder-browser.c:687 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Atsakyti visiems"
-
-#: mail/folder-browser.c:688 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Persiøsti"
-
-#: mail/folder-browser.c:689 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Persiøsti viduje"
-
-#: mail/folder-browser.c:691
-msgid "Mark as Read"
-msgstr "Paþymëti skaitytu"
-
-#: mail/folder-browser.c:692
-msgid "Mark as Unread"
-msgstr "Paþymëti neskaitytu"
-
-#: mail/folder-browser.c:694
-msgid "Move to Folder..."
-msgstr "Perkelti á aplankà..."
-
-#: mail/folder-browser.c:695
-msgid "Copy to Folder..."
-msgstr "Kopijuoti á aplankà..."
-
-#: mail/folder-browser.c:697
-msgid "Undelete"
-msgstr "Sugràþinti"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:701
-msgid "Apply Filters"
-msgstr "Pritaikyti filtrus"
-
-#: mail/folder-browser.c:703
-msgid "Create Rule From Message"
-msgstr "Sukurti taisyklæ ið laiðko"
-
-#: mail/folder-browser.c:790
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtras pagal Konferencijà (%s)"
-
-#: mail/folder-browser.c:791
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr "vAplankas pagal Konferencijà (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Evolution paðto komponento."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Evolution paðto komponento."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Negalëjau inicializuoti Evolution kûryklos."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Negaliu inicializuoti Evolution paðto komponento."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importuoja Outlook Express 4 bylas á Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importuoja mbox bylas á Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Esamas saugyklos formatas:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Paðto dëþutës formatas"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Naujas saugyklos formatas:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Pastaba: Konvertuojant tarp paðto dëþutës formatø, nesëkmë\n"
-"(tokia kaip vietos diske trûkumas) negali bûti savaime\n"
-"atstatoma. Naudok ðià priemonæ atsargiai."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Jokio"
-
-#: mail/mail-accounts.c:116
-msgid " (default)"
-msgstr " (áprastas)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:389
-msgid "Evolution Account Manager"
-msgstr "Evolution sàskaitø tvarkyklë"
-
-#: mail/mail-account-editor.c:290
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Vienas ar daugiau tavo serveriø nëra teisingai sutvarkytas.\n"
-"Ar vis tiek nori iðsaugoti?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
-msgid "Evolution Account Editor"
-msgstr "Evolution sàskaitø tvarkyklë"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Paðtas á %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Tema yra %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Paðtas nuo %s"
-
-#: mail/mail-autofilter.c:284
-#, c-format
-msgid "%s mailing list"
-msgstr "%s konferencija"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Tu dar nesutvarkei paðto kliento.\n"
-"Tik kai padarysi tai, tu galësi siøsti,\n"
-"gauti ir raðyti laiðkus.\n"
-"Ar norëtum sutvarkyti já dabar?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Tu turi susitvarkyti asmenybæ,\n"
-"tik tada galësi kurti laiðkus."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Tu turi sutvarkyti paðto siuntimà,\n"
-"tik tada galësi kurti laiðkus."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Tu nenustatei paðto siuntimo metodo"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Ðis laiðkas neturi temos.\n"
-"Tikrai siøsti?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Tu turi susitvarkyti sàskaità, tik tada galësi iðsiøsti ðá laiðkà."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Tu turi nurodyti gavëjus, kad galëtum iðsiøsti ðá laiðkà."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s, %s raðë:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Persiøstas laiðkas:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Perkelti laiðkà(us) á"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Kopijuoti laiðkà(us) á"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Tu gali taisyti tik laiðkus, esanèius \n"
-"Juodraðèiø aplanke."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Uþraðyti bylà?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Byla tokiu vardu jau yra.\n"
-"Uþraðyti jà?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Iðsaugoti laiðkà kaip..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Iðsaugoti laiðkus kaip..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Klaida, ákeliant filtro informacijà:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Spausdinti laiðkà"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Nepavyko atspausdinti laiðko"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Sàskaita"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Sàskaitos informacija"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Sàskaitos tvarkymas"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Sàskaitos savybës"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentikacija"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentikacijos tipas:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Automatiðkai·tikrinti·paðtà·kas"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Tikrinti nuostatas"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Sveikinu, tavo paðto konfigûravimas uþbaigtas.\n"
-"\n"
-"Tu jau gali siøsti ir gauti laiðkus, naudodamasis Evolution.\n"
-"\n"
-"Paspausk ¥Baigti´, kad iðsaugotum nuostatas."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Áprastas"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Baigta"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "El. paðto adresas:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "El. paðto adresas:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution paðto nustatymas"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Pilnas vardas:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Hosto vardas:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Asmenybë"
-
-#: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Átraukti á ¥Gauti paðtà´ veiksmus."
-
-#: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Gaunamo paðto serveris"
-
-#: mail/mail-config.glade.h:34
-msgid "Keep mail on server"
-msgstr "Palikti laiðkus serveryje"
-
-#: mail/mail-config.glade.h:35
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail"
-msgstr "Paðtas"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Account"
-msgstr "Paðto sàskaita"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration"
-msgstr "Paðto nustatymas"
-
-#: mail/mail-config.glade.h:39
-msgid "Mail Configuration Druid"
-msgstr "Paðto nustatymo meistras"
-
-#: mail/mail-config.glade.h:40
-msgid "Make this my default account"
-msgstr "Padaryti ðià sàskaità áprastine"
-
-#: mail/mail-config.glade.h:41
-msgid "Mark messages as \"Read\" after:"
-msgstr "Paþymëti laiðkus skaitytais po:"
-
-#: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Ávairûs"
-
-#: mail/mail-config.glade.h:44
-msgid "News"
-msgstr "Naujienos"
-
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Nebûtinas"
-
-#: mail/mail-config.glade.h:47
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Siunèiamo paðto serveris"
-
-#: mail/mail-config.glade.h:50
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
-msgid "Password:"
-msgstr "Slaptaþodis:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config.glade.h:54
-msgid "Receiving Email"
-msgstr "Paðto gavimas"
-
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Prisiminti mano slaptaþodá"
-
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Atsakyti-kam:"
-
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Reikalingas"
-
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Iðsaugoti slaptaþodá"
-
-#: mail/mail-config.glade.h:60
-#, fuzzy
-msgid "Select PGP binary"
-msgstr "Pasirink PGP"
-
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Pasirink paraðo bylà"
-
-#: mail/mail-config.glade.h:62
-msgid "Send mail in HTML format by default."
-msgstr "Áprastai siøsti laiðkus HTML formatu."
-
-#: mail/mail-config.glade.h:63
-msgid "Sending Email"
-msgstr "Paðto siuntimas"
-
-#: mail/mail-config.glade.h:65
-msgid "Server Configuration"
-msgstr "Serverio nustatymas"
-
-#: mail/mail-config.glade.h:66
-msgid "Server Type: "
-msgstr "Serverio tipas:"
-
-#: mail/mail-config.glade.h:67
-msgid "Server requires authentication"
-msgstr "Serveris reikalauja autentikacijos"
-
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Serveriai"
-
-#: mail/mail-config.glade.h:69
-msgid "Signature file:"
-msgstr "Paraðo byla:"
-
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Paraðas:"
-
-#: mail/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Ðaltiniai"
-
-#: mail/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Ðis serveris reikalauja saugios jungties (SSL)"
-
-#: mail/mail-config.glade.h:74
-#, fuzzy
-msgid "Transport"
-msgstr "Skaidrus"
-
-#: mail/mail-config.glade.h:75
-msgid "Type"
-msgstr "Tipas"
-
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For example: "
-"\"Work\" or \"Home\"."
-msgstr ""
-"Pasirink pavadinimà, kuriuo norëtum pavadinti ðá serverá. Pavyzdþiui, ¥Namai´ "
-"ar ¥Darbas´."
-
-#: mail/mail-config.glade.h:78
-msgid "User Information"
-msgstr "Vartotojo informacija"
-
-#: mail/mail-config.glade.h:79
-msgid "Username:"
-msgstr "Vartotojo vardas:"
-
-#: mail/mail-config.glade.h:80
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Sveikas patekæs á Evolution paðto nustatymo meistrà.\n"
-"\n"
-"Spausk ¥Tolyn´ kad pradëtum."
-
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "minutes."
-
-#: mail/mail-config-druid.c:401
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Nepavyko patikrinti gaunamo paðto konfigûracijos.\n"
-"Tau gali iðkilti problemø parsiunèiant paðtà ið %s"
-
-#: mail/mail-config-druid.c:495
-#, fuzzy
-msgid "Namespace:"
-msgstr "Vardas:"
-
-#: mail/mail-config-druid.c:683
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Nepavyko patikrinti siunèiamo paðto konfigûracijos.\n"
-"Tau gali iðkilti problemø siunèiant paðtà, naudojantis %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1042
-msgid "Evolution Account Wizard"
-msgstr "Evolution sàskaitø meistras"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Iðsaugoti priedà"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Negalëjau sukurti laikino katalogo: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Iðsaugoti á diskà..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Atidaryti su %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Þiûrëti viduje"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Iðorinë þiûrëklë"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Þiûrëti viduje (per %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Slëpti"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s priedas"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Ákeliamas laiðko turinys"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Uþðifruotas laiðkas neparodytas"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Uþðifruotas laiðkas"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Paspausk ant ikonos, kad iððifruotum."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Rodyklë á FTP saità (%s)"
-
-#: mail/mail-format.c:1639
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Rodyklë á vietinæ bylà (%s), galiojanti saite ¥%s´"
-
-#: mail/mail-format.c:1643
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Rodyklë á vietinæ bylà (%s)"
-
-#: mail/mail-format.c:1677
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Rodyklë á neþinomus iðorinius duomenis (¥%s´ tipo)"
-
-#: mail/mail-format.c:1682
-msgid "Malformed external-body part."
-msgstr "Blogai suformuota iðorinio kûno dalis."
-
-#: mail/mail-local.c:454
-#, c-format
-msgid "Opening '%s'"
-msgstr "Atidaromas ¥%s´"
-
-#: mail/mail-local.c:727
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Keièiamas aplanko ¥%s´ formatas á ¥%s´"
-
-#: mail/mail-local.c:731
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Pakeisti aplanko ¥%s´ formatà á ¥%s´"
-
-#: mail/mail-local.c:755
-msgid "Reconfiguring folder"
-msgstr "Perkonfigûruojamas aplankas"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:784
-msgid "Closing current folder"
-msgstr "Uþdaromas esamas aplankas"
-
-#: mail/mail-local.c:816
-msgid "Renaming old folder and opening"
-msgstr "Pervadinamas senas aplankas ir atidaromas"
-
-#: mail/mail-local.c:834
-msgid "Creating new folder"
-msgstr "Kuriamas naujas aplankas"
-
-#: mail/mail-local.c:848
-msgid "Copying messages"
-msgstr "Kopijuojami laiðkai"
-
-#: mail/mail-local.c:869
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Negaliu iðsaugoti metainfo. Tikriausiai tau daugiau\n"
-"nebepavyks atidaryti ðio aplanko: %s"
-
-#: mail/mail-local.c:908
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Jei tu nebegali daugiau atidaryti ðios paðto\n"
-"dëþutës, tau teks sutaisyti jà rankutëmis."
-
-#: mail/mail-mt.c:137
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Klaida ¥%s´ metu:\n"
-"%s"
-
-#: mail/mail-mt.c:139
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Klaida vykdant veiksmà:\n"
-"%s"
-
-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
-msgid "Working"
-msgstr "Dirbu"
-
-#: mail/mail-mt.c:707
-msgid "Evolution progress"
-msgstr "Evolution paþanga"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Siunèiamas ¥%s´"
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Siunèiamas laiðkas"
-
-#: mail/mail-ops.c:747
-msgid "Saving message to folder"
-msgstr "Laiðkas iðsaugomas á aplankà"
-
-#: mail/mail-ops.c:820
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Laiðkai perkeliami á %s"
-
-#: mail/mail-ops.c:820
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Laiðkai kopijuojami á %s"
-
-#: mail/mail-ops.c:837
-msgid "Moving"
-msgstr "Perkeliama"
-
-#: mail/mail-ops.c:840
-msgid "Copying"
-msgstr "Kopijuojama"
-
-#: mail/mail-ops.c:851
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s laiðkà %d ið %d (uid ¥%s´)"
-
-#: mail/mail-ops.c:922
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Skanuojami aplankas, esantys ¥%s´"
-
-#: mail/mail-ops.c:1036
-msgid "Forwarded messages"
-msgstr "Persiøsti laiðkai"
-
-#: mail/mail-ops.c:1077 mail/mail-ops.c:1215
-#, c-format
-msgid "Opening folder %s"
-msgstr "Atidaromas aplankas %s"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Opening store %s"
-msgstr "Atidaroma saugykla %s"
-
-#: mail/mail-ops.c:1331
-msgid "Expunging folder"
-msgstr "Iðvalomas aplankas"
-
-#: mail/mail-ops.c:1380
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Gaunamas laiðkas %s"
-
-#: mail/mail-ops.c:1447
-msgid "Retrieving messages"
-msgstr "Gaunami laiðkai"
-
-#: mail/mail-ops.c:1457
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Gaunamas laiðkas numeris %d ið %d (uid ¥%s´)"
-
-#: mail/mail-ops.c:1531
-msgid "Saving messages"
-msgstr "Iðsaugomi laiðkai"
-
-#: mail/mail-ops.c:1610
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Negaliu sukurti iðvesties bylos: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1623
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Iðsaugomas laiðkas %d ið %d (uid ¥%s´)"
-
-#: mail/mail-ops.c:1637
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Klaida iðsaugant laiðkus á: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1711
-msgid "Saving attachment"
-msgstr "Iðsaugomas priedas"
-
-#: mail/mail-ops.c:1726
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Negaliu sukurti iðvesties bylos: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1754
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Negalëjau áraðyti duomenø: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Ieðkoti"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Nutraukiama..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Siunèiamas ir gaunamas paðtas"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Gaunamas"
-
-#: mail/mail-send-recv.c:268
-msgid "Updating ..."
-msgstr "Atnaujinama..."
-
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
-msgid "Waiting ..."
-msgstr "Laukiama..."
-
-#: mail/mail-send-recv.c:289
-msgid "Sending"
-msgstr "Siunèiamas"
-
-#: mail/mail-send-recv.c:484
-msgid "Cancelled."
-msgstr "Nutraukta."
-
-#: mail/mail-send-recv.c:488
-msgid "Complete."
-msgstr "Uþbaigta."
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "Nepilnas laiðkas suraðytas á pipe!"
-
-#: mail/mail-tools.c:197
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Negalëjau sukurti laikinos mbox ¥%s´: %s"
-
-#: mail/mail-tools.c:255
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (persiøstas laiðkas)"
-
-#: mail/mail-tools.c:265
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (be temos)"
-
-#: mail/mail-tools.c:282
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Persiøstas laiðkas - %s"
-
-#: mail/mail-tools.c:284
-msgid "Forwarded message (no subject)"
-msgstr "Persiøstas laiðkas (be temos)"
-
-#: mail/mail-tools.c:366
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Negaliu atidaryti vietos ¥%s´: \n"
-"%s"
-
-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "vAplankai"
-
-#: mail/mail-vfolder.c:321
-msgid "New VFolder"
-msgstr "Naujas vAplankas"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Atsakyti"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Atsakyti ðio laiðko siuntëjui"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Atsakyti visiems ðio laiðko gavëjams"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Persiøsti ðá laiðkà"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Spausdinti parinktà laiðkà"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Iðtrinti ðá laiðkà"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Nematytas"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Keletas nematytø laiðkø"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Keletas laiðkø"
-
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<neþinomas>"
-
-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "Ðiandien %H:%M"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "Vakar %H:%M"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %H:%M"
-
-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%Y %b %d"
-
-#: mail/message-list.c:1172
-msgid "From"
-msgstr "Nuo"
-
-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "Gautas"
-
-#: mail/message-list.c:1173
-msgid "To"
-msgstr "Kam"
-
-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "Dydis"
-
-#: mail/openpgp-utils.c:84
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Praðau ávesti tavo %s slaptaþodá dël %s"
-
-#: mail/openpgp-utils.c:87
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Praðau ávesti tavo %s slaptaþodá"
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
-msgid "No GPG/PGP program available."
-msgstr "Nëra jokios PGP/GPG programos."
-
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
-msgid "No password provided."
-msgstr "Nepateiktas saptaþodis."
-
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
-msgid "No recipients specified"
-msgstr "Nenurodyti jokie gavëjai"
-
-#: mail/openpgp-utils.c:1067
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Negalëjau sukurti laikinos bylos: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Aplankas"
-
-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "Saugykla"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "Rodyti aplankus, prasidedanèius:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Gaunama saugykla dël ¥%s´"
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Uþsakomas aplankas ¥%s´"
-
-#: mail/subscribe-dialog.c:282
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Atsisakoma aplanko ¥%s´"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Aplanko pavadinimas:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Aplanko tipas:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Nurodyk, kur sukurti aplankà:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importuojama %s\n"
-"Importeris nepasiruoðæs.\n"
-"Laukiu 5 sekundes kol bandysiu vël."
-
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas %d."
-
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Nëra importerio, kuris galëtø suprasti\n"
-"%s"
-
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "Importuojama"
-
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importuojama %s.\n"
-"Pradedama %s"
-
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "Klaida ákeliant %s"
-
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas 1."
-
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "Automatiðkas"
-
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "Bylos vardas:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "Pasirink bylà"
-
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "Bylos tipas:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "Importuoti"
-
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Pasirink bylà, kurià nori imortuoti á Evolution, ir pasirink jos tipà ið "
-"sàraðo.\n"
-"\n"
-"Gali pasirinkti ¥Automatiðkas´ jei tu neþinai, ir Evolution bandys "
-"susigaudyti pati."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Spausk ¥Import´, kad pradëtum importuoti bylà á Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution importavimo priemonë"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution importavimo priemonë"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Sveikas atvykæs á Evolution importavimo priemonæ.\n"
-"Ðis meistras padës tau importuojant iðorines bylas á Evolution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution ádiegimas"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Ðiai naujai Evolution versijai reikia ádiegti papildomø bylø\n"
-"á tavo asmeniná Evolution katalogà"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Praðau, paspausk ¥Gerai´, kad ádiegtum bylas, arba ¥Atðaukti´, kad iðeitum."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Negalëjau tvarkingai atnaujinti bylø"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution bylos sëkmingai ádiegtos."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Atrodo, kad tai pirmas kartas, kai tu pasileidai Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Praðom paspausti ¥Gerai´, kad ádiegtum Evolution vartotojo bylas á"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Negaliu sukurti katalogo\n"
-"%s\n"
-"Klaida: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Negaliu kopijuoti bylø á\n"
-"¥%s´."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Byla ¥%s´ yra ne katalogas.\n"
-"Praðau, perkelk já, kad galëèiau ádiegti\n"
-"Evolution vartotojo bylas."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Katalogas ¥%s´ egzistuoja, bet jis nëra\n"
-"Evolution katalogas. Praðau, perkelk já, kad \n"
-"galëèiau ádiegti Evolution vartotojo bylas."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Negaliu sukurti nurodyto aplanko:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Nurodytas aplanko vardas yra negalimas."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution -- Sukurti naujà aplankà"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Pasirinkto aplanko tipas yra netinkamas\n"
-"praðytàjam veiksmui."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Naujas..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Bevardis)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy negalëjo bûti paleistas."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution yra rinkinys grupiniø aplikacijø\n"
-"paðtui, kalendoriams ir kontaktø tvarkymui\n"
-"GNOME darbo aplinkoje."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Eiti á aplankà..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Joks aplankas nerodomas)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Aplankai"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Vaje!  ¥%s´ rodinys netikëtai numirë.  :-(\n"
-"Tikriausiai tai reiðkia, kad %s komponentas nulûþo."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Sukurti naujà trumpiø grupæ"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Grupës pavadinimas:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Ar tu tikrai nori paðalinti grupæ\n"
-"¥%s´ ið trumpiø juostos?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Nepaðalinti"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Maþos ikonos"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Rodyti trumpes kaip maþas ikonas"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Didelës ikonos"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Rodyti trumpes kaip dideles ikonas"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nauja grupë..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Sukurti naujà trumpiø grupæ"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Paðalinti ðià grupæ..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Paðalinti ðià trumpiø grupæ"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Paslëpti trumpiø juostà"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Paslëpti trumpiø juostà"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Suþadinti"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Suþadinti ðià trumpæ"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Paðalinti ðià trumpæ ið trumpiø juostos"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Klaida iðsaugant trumpes."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Rodinys"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Rodyti parinktà aplankà"
-
-#: shell/e-storage.c:176
-msgid "(No name)"
-msgstr "(Be pavadinimo)"
-
-#: shell/e-storage.c:427
-msgid "No error"
-msgstr "Nëra klaidø"
-
-#: shell/e-storage.c:429
-msgid "Generic error"
-msgstr "Bendroji klaida"
-
-#: shell/e-storage.c:431
-msgid "A folder with the same name already exists"
-msgstr "Jau yra aplankas su tokiu pat pavadinimu"
-
-#: shell/e-storage.c:433
-msgid "The specified folder type is not valid"
-msgstr "Nurodytas aplanko tipas yra blogas"
-
-#: shell/e-storage.c:435
-msgid "I/O error"
-msgstr "I/O klaida"
-
-#: shell/e-storage.c:437
-msgid "Not enough space to create the folder"
-msgstr "Neuþtenka vietos aplankui sukurti"
-
-#: shell/e-storage.c:439
-msgid "The specified folder was not found"
-msgstr "Nurodytas aplankas nerastas"
-
-#: shell/e-storage.c:441
-msgid "Function not implemented in this storage"
-msgstr "Funkcija neágyvendinta ðioje saugykloje"
-
-#: shell/e-storage.c:443
-msgid "Permission denied"
-msgstr "Priëjimas uþdraustas"
-
-#: shell/e-storage.c:445
-msgid "Operation not supported"
-msgstr "Veiksmas nepalaikomas"
-
-#: shell/e-storage.c:447
-msgid "The specified type is not supported in this storage"
-msgstr "Nurodytas tipas ðioje saugykloje nepalaikomas"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Evolution apvalkalas."
-
-#: shell/main.c:74
-#, fuzzy
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr "Sveiki. Aèiû uþ laikà\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Aèiû\n"
-"Evolution komanda\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Negalëjau inicializuoti Evolution shell."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Iðjungti."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Negaliu inicializuoti Bonobo komponentø sistemos."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Sukurti naujà kontaktà"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Iðtrinti kontaktà"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rasti"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rasti kontaktà"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Naujas kontaktas"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Spausdinti kontaktus"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stop"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Sustabdyti ákëlimà"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Rodyti visus"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Rodyti visus kontaktus"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Adresø knygelës konfigûravimas..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "S_pausdinti kontaktus..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Ieðkoti kontaktø"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "Áran_kiai"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dienos"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Sutvarkyti kalendoriø"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lendorius"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Kalendoriaus nuostatos..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Sukurti naujà ávyká"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Sukurti naujà kalendoriø"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Diena"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Eiti á ankstesná laikà"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Eiti á ateities laikà"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Eiti"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Eiti á nurodytà datà"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Eiti á dabartiná laikà"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mënesis"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Naujas ávykis"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Kitas"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Atidaryti kalendoriø"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Praeitas"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Spausdinti ðá kalendoriø"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Iðsaugoti kaip"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Iðsaugoti kalendoriø kaip kaþkà kità"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Rodyti 1 dienà"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Rodyti 1 mënesá"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Rodyti 1 savaitæ"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Rodyti darbo savaitæ"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Dabar"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Savaitë"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Naujas"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Atidaryti kalendoriø"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "S_pausdinti ðá kalendoriø"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Ið_saugoti kaip..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Iðtrinti ðá elementà"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Iðtrinti..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Pagalba"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Spausdinti _vokà..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Spausdinti ðá elementà"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Spausdinti..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Iðsaugoti _kaip..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Iðsaugoti ir uþdaryti"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Iðsaugoti kontaktà ir uþdaryti dialogo langà"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Siøsti ko_ntaktà kitam..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Rodyti þinynà"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Siøsti _laiðkà kontaktui..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Byla"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_pausdinti..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "Ið_saugoti"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Apie ðià aplikacijà"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Apie..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_Veiksmai"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Adresø knygelë... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Iðva_lyti"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Iðkirpti"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Ti_krinti vardus (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Iðvalyti"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Iðvalyti paþymëjimà"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Uþdaryti ðá ávyká"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopijuoti á aplankà... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopijuoti"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopijuoti paþymëjimà"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Iðkirpti"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Iðkirpti paþymëjimà"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "_Pirmas elementas aplanke (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "_Persiøsti (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Persiøsti kaip v_Calendar (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Eiti á tolesná elementà"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Eiti á ankstesná elementà"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "_Neuþbaigta uþduotis (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Pakeisti bylos savybes"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Kitas"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Ádëti"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Ádëti ið krepðio"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Praeitas"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Praeitas"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Spa_udinio perþiûra"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Spausdinimo _nuostatos..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Spausdinimo nuostatos"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Savybës"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Iðsaugoti"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Iðsaugoti ávyká ir uþdaryti dialogo langà"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Iðsaugoti esamà bylà"
-
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "Áraðyti susitikimà á dienotvarkæ"
-
-#: ui/evolution-event-editor.xml.h:46
-#, fuzzy
-msgid "Schedule _Meeting"
-msgstr "Átraukti s_usitikimà á dienotvarkæ"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Áraðyti á dienotvarkæ kaþkoká susitikimà"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Paþymëti visus"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Paþymëti viskà"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-#, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_Uþduotis"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Apie..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Uþdaryti"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontaktas (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopijuoti"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Derinti"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Taisa"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Pagalba"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Elementas (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Þu_rnalo áraðas (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "P_askutinis elementas aplanke (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Paðto laiðkas (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Per_kelti á aplankà... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Pastaba (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Á_dëti"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_pausdinti"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Savybës..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Paþymëti _viskà"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Uþduotis (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Neskaitytas elementas (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Pridëti paslaugà"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Sukurti naujà laiðkà"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Naujas laiðkas"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Sukurti"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Sukurti naujà laiðkà"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopijuoti laiðkà á naujà aplankà"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Sukurti taisyklæ"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Aplankas"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltras pagal Siuntëjà"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtras pagal _Gavëjus"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Pa_mirðti slaptaþodþius"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Gauti paðtà"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Paslëpti paþy_mëtus laiðkus"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Paslëpti ið_trintus laiðkus"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Paslëpti _skaitytus laiðkus"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Paðto _filtrai..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Tvarkyti uþsakymus..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Paþymëti s_kaitytu"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Paþymëti _neskaityta"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Perkelti"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Perkelti laiðkà á naujà aplankà"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Perþiûrëti laiðkà prieð spausdinant"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Laiðko spaudinio perþiûra..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Spausdinti laiðkà spausdintuvu"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Spausdinti laiðkà..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Atsakyti _visiems"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Atsakyti _siuntëjui"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "Ð_altinis"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Paþymëti _viskà"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Iðsiøsti laukiantá paðtà ir parsiøsti naujà paðtà"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Rodyti _visus laiðkus"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Gijomis suskirstytas laiðkø sàraðas"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "vAplankas pagal Siu_ntëjà"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "vAplankas pagal _Gavëjus"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Rodyti grynà laiðko ðaltiná"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Pritaikyti filtrus"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigûruoti aplankà..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopijuoti á aplankà..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Taisyti laiðkà"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "Ið_valyti"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtras pagal Temà"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Persiøsti"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertuoti paþymëjimà"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Paðto nustatymas...."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Laiðkas"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Perkelti á aplankà..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Atidaryti naujame lange"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "S_pausdinti laiðkà"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Ið_saugoti laiðkà kaip..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Gijomis"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Su_gràþinti"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_vAplankas pagal Temà"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtualiø aplankø taisiklis..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Prisegti"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Uþdaryti esamà bylà"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Uþðifruoti ðá laiðkà su PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormatas"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Áterpti bylà á laiðkà kaip tekstà"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Áterpti tekstinæ bylà..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Atidaryti bylà"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP uþðifruoti"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP pasiraðyti"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Iðsaugoti juo_draðtá"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Iðsaugoti á _aplankà... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Iðsaugoti á aplankà..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Iðsaugoti esamà bylà kitokiu vardu"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Iðsaugoti laiðkà á nurodytà aplankà"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Siøsti"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Siøsti vë_liau"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Siøsti vë_liau"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Siøsti laiðkà HTML formatu"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Siøsti laiðkà vëliau"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Siøsti laiðkà dabar"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Siøsti ðá laiðkà dabar"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Rodyti/slëpti priedus"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Rodyti _priedus"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Rodyti priedus"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Pasiraðyti ðá laiðkà tavo PGP raktu"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Áterpt_i tekstinæ bylà... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Atidaryti..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Saugumas"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Pridëti aplankà á uþsakytø aplankø sàraðà"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Atnaujinti sàraðà"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Atnaujinti aplankø sàraðà"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Paðalinti aplankà ið uþsakytø aplankø sàraðo"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Uþsakyti"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Atsisakyti"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_Uþduotis"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Rasti vël"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-#, fuzzy
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Uþduoties _praðymas"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Pakartoti"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Pakartoti atðauktà veiksmà"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Pakeisti"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Pakeisti eilutæ"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Atsakyti _visiems (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Siøs_ti bûsenos ataskaità (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Praleisti pasi_kartojimà (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Iðsaugoti uþduotá ir uþdaryti dialogo langà"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Vël ieðkoti tos paèios eilutës"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Ieðkoti eilutës"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Atðaukti"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Atðaukti paskutiná veiksmà"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "Á_vykis"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Paþymëti uþbaigta (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Atsakyti (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Sukurti naujà uþduotá"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nauja"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Iðsaugoti uþduotá kaip kaþkà kità"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Uþduoèiø nuostatos..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Apie Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Uþdaryti ðá langà"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Prisi_taikyti..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prisitaikyti"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prisitaikyti árankines"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Parodyti kità aplankà"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "I_ðeiti"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution juostos _trumpë"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Iðeiti"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Iðeiti ið programos"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "_Susipaþinimas"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importuoti iðorinæ bylà"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Pagrindinë árankinë"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Parodyti informacijà apie Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Rodyti _Aplankø juostà"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Rodyti _Trumpiø juostà"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Iðsiøsti klaidos praneðimà"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Ið_siøsti klaidos praneðimà"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Praneðti apie klaidà, naudojant Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Perjungti, ar rodyti aplankø juostà"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Perjungti, ar rodyti trumpiø juostà"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "K_ontaktø menedþerio naudojimas"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "_Kalendoriaus vartojimas"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Paðto programos naudojimas"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Apie Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Aplankas"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Eiti á aplankà..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importuoti bylà..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indeksas"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Paðto laiðkas"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Nuostatos"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Uþimtas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Nesu darbe"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nëra informacijos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Pakv_iesti kitus..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Parinktys"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Rodyti tik _darbo valandas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Rodyti _atitrauktà"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Atnaujinti Laisvas/Uþimtas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Visi þmonës ir resursai"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Visi þ_monës ir vienas resursas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Reikalingi þmonës"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Reikalingi þmonës ir _vienas resursas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Susitikimo _pradþios laikas:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Susitikimo pa_baigos laikas:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Visi dalyviai"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PATKPÐS"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Dabar"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Informacija"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Áspëjimas"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Klausimas"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Þinutë"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Kità kartà neberodyti ðios þinutës."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "Pai_eðka"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Asmeninis Adresø knygelës serveris"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-
-#: wombat/wombat.c:153
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): negalëjau inicializuoti GNOME-VFS"
-
-#: wombat/wombat.c:165
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): negalëjau inicializuoti GNOME"
-
-#: wombat/wombat.c:178
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): negalëjau inicializuoti Bonobo"
-
-#: evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution juostos _trumpë"
-
diff --git a/po/nl.po b/po/nl.po
deleted file mode 100644
index 8f8f8cbf93..0000000000
--- a/po/nl.po
+++ /dev/null
@@ -1,11139 +0,0 @@
-# Evolution - Dutch translation
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Arjan Scherpenisse <acscherp@wins.uva.nl>, 2000
-# Gerard Oskamp <gerard@linuxfreak.nl>, 2000
-# Dennis Smit <synap@area101.penguin.nl>, 2000
-# Almer S. Tigelaar <almer@gnome.org>, 2000, 2001
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-02-24 19:28+0100\n"
-"PO-Revision-Date: 2001-02-24 19:27+0100\n"
-"Last-Translator: Almer S. Tigelaar <almer@gnome.org>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-# addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kaart: "
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Naam: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefix:      "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Gegeven:      "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Extra: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familie:      "
-
-# addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Achtervoegsel:      "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Geboorte Datum: "
-
-# addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adres:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postbus:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"Ext:           "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Straat:      "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Stad:        "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regio:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postcode: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:      "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Afleverings Label: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoons:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefoon:"
-
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Mailer: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tijdzone: "
-
-# addressbook/printing/e-contact-print.glade.h:12

-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografische Locatie: "
-
-# addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Bedrijfsrol: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"Naam:   "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Eenheid:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Eenheid2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Eenheid3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Eenheid4: "
-
-# addressbook/contact-editor/categories-strings.h:7

-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categorieën: "
-
-# calendar/gui/gncal-todo.c:207

-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Commentaar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unieke Tekenreeks: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Publieke Sleutel: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Fabriek om GnomeCard bestanden importeren naar Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importeert GnomeCard bestanden naar Evolution."
-
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kon Bonobo niet initialiseren"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Uitgezet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiëren Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiëren Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mengen Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mengen Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Originele Auteur:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution Adresboek Kanaal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Configuratie programma voor het evolution adresboek kanaal.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Actie Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Kanaal status"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Niet verbonden met de gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Cursor kon niet worden geladen\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook niet geladen\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Kon \"wombat\" server niet starten"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Kon \"wombat\" niet starten"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configureer het adres kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution Adres kanaal"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:11

-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Toevoegen"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:39

-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "_Verjaardag:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:24

-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "_Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:21

-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "Bedrijfs _Fax"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:26

-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakten..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:27

-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tegorieën..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:13

-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontaken Bewerken"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:41

-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Details"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:15

-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Opslaan Als:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:30

-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Algemeen"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:10

-# addressbook/contact-editor/e-contact-editor-strings.h:12

-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Nieuw telefoon type"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:40

-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "Aa_ntekeningen:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:9

-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefoon Typen"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:23

-# addressbook/contact-editor/e-contact-editor.c:1340

-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Primaire E-mail"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:17

-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Ontvangt liever _HTML berichten"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:16

-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Homepage:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:7

-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Toevoegen"
-
-# composer/e-msg-composer-address-dialog.glade.h:11

-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adres..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:37

-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "_Assistent:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:36

-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Ge_boortedatum:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:19

-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:29

-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Bedrijf:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:8

-# addressbook/contact-editor/e-contact-editor.c:673

-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Verwijderen"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:31

-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "Af_deling:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:14

-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Volledige Naam..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "T_huis"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:28

-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Titel:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:38

-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "_Manager:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:22

-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobiele Telefoon"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:34

-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "_Nickname:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:32

-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Kant_oor:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Beroep:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "_Echtgeno(o)t(e):"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:25

-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "Dit is een email-adres"
-
-# addressbook/gui/component/addressbook.c:426

-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Contact verwijderen?"
-
-# addressbook/contact-editor/categories-strings.h:8

-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Dit contact behoort tot deze categoriëen:"
-
-# addressbook/contact-editor/e-contact-editor.c:1278

-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistent"
-
-# addressbook/contact-editor/e-contact-editor.c:1279

-# addressbook/contact-editor/e-contact-editor.c:1383

-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Bedrijf 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1281

-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Bedrijfs Fax"
-
-# addressbook/contact-editor/e-contact-editor.c:1282

-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Terugbel"
-
-# addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Auto"
-
-# addressbook/contact-editor/e-contact-editor.c:1284

-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor.c:1285

-# addressbook/contact-editor/e-contact-editor.c:1384

-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Thuis"
-
-# addressbook/contact-editor/e-contact-editor.c:1286

-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Thuis 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1287

-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax Thuis"
-
-# addressbook/contact-editor/e-contact-editor.c:1288

-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN Nummer"
-
-# addressbook/contact-editor/e-contact-editor.c:1289

-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobiele Telefoon"
-
-# addressbook/contact-editor/e-contact-editor.c:1290

-# addressbook/contact-editor/e-contact-editor.c:1385

-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
-msgid "Other"
-msgstr "Overige"
-
-# addressbook/contact-editor/e-contact-editor.c:1291

-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Andere Fax"
-
-# addressbook/contact-editor/e-contact-editor.c:1292

-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Oppieper"
-
-# addressbook/contact-editor/e-contact-editor.c:1293

-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Eerste"
-
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radio"
-
-# addressbook/contact-editor/e-contact-editor.c:1295

-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Telex"
-
-# addressbook/contact-editor/e-contact-editor.c:1296

-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-mail 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1342

-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-mail 3"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adres _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canada"
-
-# composer/e-msg-composer-address-dialog.glade.h:11

-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Controleer Adres"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Land:"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adres:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:36

-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Gemeente:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postbus:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Staat/Provincie:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Postcode:"
-
-# addressbook/contact-editor/fullname-strings.h:7

-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Controleer Volledige Naam"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Mr."
-
-# addressbook/gui/component/alphabet.glade.h:14

-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-# addressbook/gui/component/alphabet.glade.h:17

-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Mejuffrouw"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Dhr."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mvr."
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Jfr."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Hr."
-
-# addressbook/contact-editor/fullname-strings.h:9

-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "Voornaam:"
-
-# addressbook/contact-editor/fullname-strings.h:11

-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "Achternaam:"
-
-# addressbook/contact-editor/fullname-strings.h:10

-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "Tweede Naa_m:"
-
-# addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "Achtervoeg_sel:"
-
-# addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titel:"
-
-# addressbook/gui/component/addressbook.c:1046

-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Als _Minikaarten"
-
-# addressbook/gui/component/addressbook.c:499

-# addressbook/gui/component/addressbook.c:1039

-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Als _Tabel"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Voer het wachtwoord voor %s in"
-
-# addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Kan het adresboek niet openen"
-
-# addressbook/gui/component/addressbook.c:598

-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Het is niet gelukt om dit adresboek te openen. Dit betekent\n"
-"dat je een verkeerde URI hebt opgegeven, of geprobeerd hebt een\n"
-"LDAP server te gebruiken terwijl er geen LDAP support ingecompi-\n"
-"leerd is. Als je een URI hebt opgegeven, controleer die dan en\n"
-"probeer het opnieuw. Als dat niet zo is, heb je waarschijnlijk\n"
-"een LDAP server gebruikt. Als je LDAP wilt gebruiken, moet je\n"
-"OpenLDAP downloaden en installeren en Evolution hercompileren\n"
-"en opnieuw installeren.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Allen Weergeven"
-
-# calendar/gui/gncal-todo.c:479

-# composer/e-msg-composer-address-dialog.glade.h:13

-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Geavanceerd..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Een veld bevat"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Naam bevat"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "E-mail bevat"
-
-# addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "De URI die de Map Bladeraar zal laten zien"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Andere Contacten"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:8

-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-# widgets/e-table/e-table-config.glade.h:10

-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Bestand"
-
-# addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Onbekend adresboek type"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Geen (anonieme modus)"
-
-# mail/folder-browser-factory.c:101

-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-# shell/e-storage.c:434

-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Onbekende auth type"
-
-# composer/e-msg-composer-address-dialog.c:191

-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Een"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Subboom"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Onbekend strekkingstype"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Verbindings DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Verbindings DN Help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Onthoud dit wachtwoord"
-
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Computernaam:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Computernaam help tekst hier."
-
-# calendar/gui/gncal-todo.c:190

-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Poort:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Poort help tekst hier."
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:10

-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Stam DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Stam DN help tekst hier."
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Zoek Strekking:"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Authenticatie:"
-
-# mail/mail-config.c:732

-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
-msgid "Path:"
-msgstr "Pad:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pad Help tekst hier"
-
-# composer/e-msg-composer.c:676

-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Maak pad als het niet bestaat."
-
-# addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Bewerk Adresboek"
-
-# addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Adresboek Toevoegen"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Selecteer het soort adresboek dat je hebt en voer de relevante informatie "
-"erover in."
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Naam:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Naam help tekst hier"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beschrijving:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Beschrijving help tekst hier"
-
-# mail/mail-config.c:1490

-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adresboek Bronnen"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:696
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Verwijderen"
-
-# calendar/gui/gncal-todo.c:488

-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:682 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Bewerken"
-
-# composer/e-msg-composer-address-dialog.glade.h:10

-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Naam"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control dat een Evolution minikaart adresboek weergeeft."
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adresboek minikaart bekijker"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Een component voor het afhandelen van contacten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabriek voor het Adresboek Minikaart control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabriek voor het Evolution adresboek component."
-
-# composer/e-msg-composer-hdrs.c:174

-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabriek voor het voorbeeld Adresboek control"
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "De adresboek naam selectie interface van Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabriek voor de naam selectie interface van het Adresboek"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Vind..."
-
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Geaddresseerden"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecteer namen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecteer naam van:"
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Zoeken"
-
-# addressbook/gui/component/alphabet.glade.h:8

-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-# addressbook/gui/component/alphabet.glade.h:9

-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-# addressbook/gui/component/alphabet.glade.h:10

-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-# addressbook/gui/component/alphabet.glade.h:11

-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-# addressbook/gui/component/alphabet.glade.h:12

-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-# addressbook/gui/component/alphabet.glade.h:13

-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-# addressbook/gui/component/alphabet.glade.h:14

-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-# addressbook/gui/component/alphabet.glade.h:15

-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-# addressbook/gui/component/alphabet.glade.h:16

-# calendar/cal-util/timeutil.c:98

-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-# addressbook/gui/component/alphabet.glade.h:17

-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-# addressbook/gui/component/alphabet.glade.h:18

-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-# addressbook/gui/component/alphabet.glade.h:19

-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-# addressbook/gui/component/alphabet.glade.h:20

-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-# addressbook/gui/component/alphabet.glade.h:21

-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-# addressbook/gui/component/alphabet.glade.h:22

-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-# addressbook/gui/component/alphabet.glade.h:23

-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-# addressbook/gui/component/alphabet.glade.h:24

-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-# addressbook/gui/component/alphabet.glade.h:25

-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-# addressbook/gui/component/alphabet.glade.h:26

-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-# addressbook/gui/component/alphabet.glade.h:27

-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-# addressbook/gui/component/alphabet.glade.h:28

-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-# addressbook/gui/component/alphabet.glade.h:29

-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-# addressbook/gui/component/alphabet.glade.h:30

-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-# addressbook/gui/component/alphabet.glade.h:31

-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-# addressbook/gui/component/alphabet.glade.h:32

-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-# addressbook/gui/component/alphabet.glade.h:33

-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-# addressbook/gui/component/alphabet.glade.h:34

-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-# addressbook/gui/component/addressbook.c:943

-# addressbook/gui/minicard/e-minicard.c:330

-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Opslaan als VCard"
-
-# addressbook/gui/component/addressbook.c:1010

-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Klik hier om een contact toe te voegen *"
-
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-mail"
-
-# mail/mail-config.c:328

-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisatie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Web Site"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:31

-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Afdeling:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:32

-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Kantoor:"
-
-# addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titel:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Beroep:"
-
-# addressbook/contact-editor/e-contact-editor.c:1292

-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Manager"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:34

-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Aliasnaam:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Echtgeno(o)t(e):"
-
-# shell/e-shell-view.c:596

-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Opmerkingen"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Vrij-druk URL"
-
-# addressbook/gui/component/addressbook.c:1010

-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Klik hier om een contact toe te voegen"
-
-# addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Opslaan in adresboek"
-
-# addressbook/gui/minicard/e-minicard-view.c:110

-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Er zijn geen items om weer te geven\n"
-"\n"
-"Dubbelklik hier om een nieuw Contact te maken."
-
-# addressbook/printing/e-contact-print.glade.h:23

-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 punts Tahoma"
-
-# addressbook/printing/e-contact-print.glade.h:25

-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 punts Tahoma"
-
-# addressbook/printing/e-contact-print.glade.h:18

-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Lege formulieren op het einde:"
-
-# addressbook/printing/e-contact-print.glade.h:24

-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Inhoud"
-
-# addressbook/printing/e-contact-print.glade.h:38

-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Onderkant:"
-
-# addressbook/printing/e-contact-print.glade.h:32

-# addressbook/printing/e-contact-print.glade.h:44

-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensies:"
-
-# addressbook/printing/e-contact-print.glade.h:20

-# addressbook/printing/e-contact-print.glade.h:21

-# addressbook/printing/e-contact-print.glade.h:51

-# addressbook/printing/e-contact-print.glade.h:54

-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Lettertype..."
-
-# addressbook/printing/e-contact-print.glade.h:19

-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Lettertypen"
-
-# addressbook/printing/e-contact-print.glade.h:53

-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Voet:"
-
-# addressbook/printing/e-contact-print.glade.h:28

-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formaat"
-
-# addressbook/printing/e-contact-print.glade.h:52

-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Kop"
-
-# addressbook/printing/e-contact-print.glade.h:56

-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Koptekst/Voettekst"
-
-# addressbook/printing/e-contact-print.glade.h:22

-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Koppen"
-
-# addressbook/printing/e-contact-print.glade.h:15

-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Koppen voor elke letter"
-
-# addressbook/printing/e-contact-print.glade.h:34

-# addressbook/printing/e-contact-print.glade.h:46

-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Hoogte:"
-
-# addressbook/printing/e-contact-print.glade.h:13

-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Elkaar direct opvolgend"
-
-# addressbook/printing/e-contact-print.glade.h:11

-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Insluiten:"
-
-# addressbook/printing/e-contact-print.glade.h:49

-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Liggend"
-
-# addressbook/printing/e-contact-print.glade.h:39

-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Links:"
-
-# addressbook/printing/e-contact-print.glade.h:14

-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Letter tabs aan de kant"
-
-# addressbook/printing/e-contact-print.glade.h:36

-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marges"
-
-# addressbook/printing/e-contact-print.glade.h:17

-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Aantal kolommen:"
-
-# addressbook/printing/e-contact-print.glade.h:10

-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opties"
-
-# addressbook/printing/e-contact-print.glade.h:47

-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientatie"
-
-# addressbook/printing/e-contact-print.glade.h:41

-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Pagina"
-
-# addressbook/printing/e-contact-print.glade.h:7

-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Pagina Instellingen:"
-
-# addressbook/printing/e-contact-print.glade.h:29

-# addressbook/printing/e-contact-print.glade.h:50

-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Paper"
-
-# addressbook/printing/e-contact-print.glade.h:35

-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papier bron:"
-
-# addressbook/printing/e-contact-print.glade.h:48

-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Staand"
-
-# addressbook/printing/e-contact-print.glade.h:9

-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Voorbeeld:"
-
-# addressbook/printing/e-contact-print.glade.h:27

-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Maak gebruik van grijze schaduw op de afdruk"
-
-# addressbook/printing/e-contact-print.glade.h:55

-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Omgedraaid afdrukken op even pagina's"
-
-# addressbook/printing/e-contact-print.glade.h:40

-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Rechts:"
-
-# addressbook/printing/e-contact-print.glade.h:12

-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Secties:"
-
-# addressbook/printing/e-contact-print.glade.h:26

-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Shaduw"
-
-# addressbook/printing/e-contact-print.glade.h:42

-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Grootte:"
-
-# addressbook/printing/e-contact-print.glade.h:16

-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Begin op een nieuwe pagina"
-
-# addressbook/printing/e-contact-print.glade.h:8

-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stijl Naam:"
-
-# addressbook/printing/e-contact-print.glade.h:37

-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Top:"
-
-# addressbook/printing/e-contact-print.glade.h:30

-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
-msgid "Type:"
-msgstr "Type:"
-
-# addressbook/printing/e-contact-print.glade.h:33

-# addressbook/printing/e-contact-print.glade.h:45

-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Breedte:"
-
-# addressbook/printing/e-contact-print.glade.h:31

-# addressbook/printing/e-contact-print.glade.h:43

-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution Kalender Kanaal"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Fout tijdens communiceren met kalender server"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configureer het GnomeCal kanaal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution Kalender kanaal"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configureer het to-do kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo Kanaal"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Configuratie programma voor het evolution to-do kanaal.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van je afspraak op "
-
-# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sluimeren"
-
-# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124

-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-# calendar/gui/calendar-commands.c:434

-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Bestand niet gevonden"
-
-# calendar/gui/calendar-commands.c:456

-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Open kalender"
-
-# calendar/gui/calendar-commands.c:495

-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Kalender opslaan"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Kon het kalender aanzicht niet maken.  Controleer je ORBit en OAF "
-"instellingen."
-
-# calendar/gui/event-editor.c:1745

-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d-%m-%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d-%m-%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d-%m-%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Publiekelijk"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Prive"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Vertrouwelijk"
-
-# shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "N"
-
-# calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "Z"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "O"
-
-# calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "W"
-
-# mail/mail-config.c:1220

-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Doorzichtig"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Mat"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"De datum moet ingevoerd worden in het formaat: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d-%m-%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"De geografische positie moet ingevoerd worden in het formaat: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
-
-# addressbook/printing/e-contact-print.glade.h:28

-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normaal"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Herhalend"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Ja"
-
-# addressbook/gui/component/addressbook.c:420

-# calendar/gui/calendar-commands.c:544

-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Nee"
-
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B, %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-# composer/e-msg-composer.c:494

-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fout bij laden van kalender</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Weergave"
-
-# calendar/gui/event-editor.c:298

-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Geef afspraken weer"
-
-# composer/e-msg-composer.c:906

-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Geef taken weer"
-
-# calendar/gui/print.c:1084

-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Bezig met laden Kalender"
-
-# calendar/gui/control-factory.c:136

-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "De URI die de kalender weer zal geven"
-
-# calendar/gui/dialogs/alarm-notify-dialog.c:181

-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm op %A %b %d %Y %H:%M"
-
-# calendar/gui/dialogs/alarm-notify-dialog.c:188

-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Herinnering van de afspraak op %A %b %d %Y %H:%M"
-
-# calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Geen samenvatting beschikbaar."
-
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Sluiten"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:9

-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Afspraak bewerken"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:10

-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Sluimer tijd (minuten)"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minuten"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minuten"
-
-# calendar/gui/prop.c:335

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 uurs (am/pm)"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuten"
-
-# calendar/gui/prop.c:336

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 uurs"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minuten"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minuten"
-
-# calendar/gui/prop.c:803

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarm stopt na"
-
-# calendar/gui/prop.c:780

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Audio Alarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Piep als het alarm venster verschijnt."
-
-# calendar/gui/calendar-commands.c:659

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalender"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Kalender Instellingen"
-
-# calendar/gui/prop.c:522

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Kleuren"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Weekeinden comprimeren"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Datum navigator instellingen"
-
-# calendar/gui/prop.c:836

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Standaard instellingen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Weergave instellingen"
-
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Verloop Datum"
-
-# calendar/gui/prop.c:820

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Maak sluimeren mogelijk voor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Eind van dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Eerste dag van de week:"
-
-# calendar/gui/gnome-month-item.c:741

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Vrij"
-
-# calendar/gui/getdate.y:413

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Vrijdag"
-
-# calendar/gui/calendar-commands.c:60

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markeer"
-
-# calendar/gui/prop.c:648

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Items die vandaag verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Items die vandaag verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Items die nog niet zijn verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Items die nog niet zijn verlopen:"
-
-# calendar/gui/gnome-month-item.c:737

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Maa"
-
-# calendar/gui/prop.c:348

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Maandag"
-
-# calendar/gui/prop.c:642

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Verlopen items"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Verlopen items:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Kies een kleur"
-
-# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

-# mail/message-list.c:474

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
-msgid "Priority"
-msgstr "Prioriteit"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Herinner me van alle afspraken"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Herinneringen"
-
-# calendar/gui/gnome-month-item.c:742

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Zat"
-
-# calendar/gui/getdate.y:414

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Weergeven"
-
-# calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Geef afspraak eindtijden weer"
-
-# calendar/gui/calendar-commands.c:528

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Geef weeknummers weer"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Start van dag:"
-
-# calendar/gui/gnome-month-item.c:736

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Zon"
-
-# calendar/gui/prop.c:347

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Zondag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaakBlad"
-
-# calendar/gui/gnome-month-item.c:740

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Don"
-
-# calendar/gui/getdate.y:410

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Donderdag"
-
-# calendar/gui/prop.c:606

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tijd Tot Verlooptijd"
-
-# calendar/gui/e-day-view-time-item.c:391

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Tijd delingen:"
-
-# calendar/gui/prop.c:334

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tijdsformaat:"
-
-# calendar/gui/gnome-month-item.c:738

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Din"
-
-# calendar/gui/getdate.y:406

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-# calendar/gui/prop.c:780

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuele Alarmen"
-
-# calendar/gui/gnome-month-item.c:739

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Woe"
-
-# calendar/gui/getdate.y:408

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Woensdag"
-
-# calendar/gui/getdate.y:423

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Werk week"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minuten voor ze plaatsvinden."
-
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
-msgid "seconds."
-msgstr "seconden."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Weet je zeker dat je afspraak `%s' wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Weet je zeker dat je deze afspraak zonder naam wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Weet je zeker dat je de taak `%s' wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Weet je zeker dat je deze taak zonder naam wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Weet je zeker dat je dagboek entry `%s' wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Weet je zeker dat je deze dagboek entry zonder naam wilt verwijderen?"
-
-# composer/e-msg-composer-attachment-bar.c:395

-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wil je de wijzingen opslaan?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Af:"
-
-# filter/filter-editor.c:212

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Classificatie"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Gedaan"
-
-# mail/message-list.c:502

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Datum & Tijd"
-
-# calendar/gui/gncal-todo.c:207

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Datum Afgemaakt:"
-
-# addressbook/printing/e-contact-print.glade.h:34

-# addressbook/printing/e-contact-print.glade.h:46

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Hoog"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In Uitvoer"
-
-# calendar/gui/getdate.y:438

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Laag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Niet Gestart"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vé"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Progressie"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Pu_bliekelijk"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Be_gin Datum:"
-
-# calendar/gui/gncal-todo.c:171

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Opso_mming:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "_Taak"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Ongedefiniëerd"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Vertrouwelijk"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:26

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "C_ontacten..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:31

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Verloop Datum:"
-
-# calendar/gui/gncal-todo.c:190

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioriteit:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Taak Bewerken"
-
-# calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Geen opsomming"
-
-# calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Afspraak - %s"
-
-# calendar/gui/event-editor.c:301

-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Taak - %s"
-
-# calendar/gui/event-editor.c:304

-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Dagboek Item - %s"
-
-# addressbook/contact-editor/categories-strings.h:7

-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Categorieën"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Afmaak datum"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Eind Datum"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Begin Datum"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografische Positie"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Percentage compleet"
-
-# calendar/gui/gncal-todo.c:425

-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Transparantheid"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-# calendar/gui/prop.c:780

-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmen"
-
-# addressbook/gui/component/addressbook.c:1010

-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Klik hier om een taak toe te voegen"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Markeer als Gedaan"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Markeer de taak als gedaan"
-
-# calendar/gui/gncal-todo.c:326

-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Bewerk deze taak..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Taak Bewerken"
-
-# addressbook/contact-editor/e-contact-editor.c:853

-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Verwijder deze taak"
-
-# addressbook/contact-editor/e-contact-editor.c:853

-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Verwijder de taak"
-
-# calendar/gui/e-day-view-time-item.c:391

-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
-
-# calendar/gui/event-editor.c:1745

-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-# calendar/gui/event-editor.c:1745

-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543

-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324

-# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643

-# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659

-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nieuwe Afspraak..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Afspraak Plannen"
-
-# calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328

-# calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654

-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Bewerk deze afspraak..."
-
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Verwijdert deze afspraak"
-
-# calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655

-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Maak deze afspraak verplaatsbaar"
-
-# calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656

-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Verwijder deze gebeurtenis"
-
-# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657

-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Verwijder alle gebeurtenissen"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kon je kalender bestand niet updaten!\n"
-
-# shell/e-setup.c:88

-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Component successvol ge-update."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kon je kalender bestand niet openen!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kon je kalender bestand niet laden!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kon je kalender bestand niet lezen!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dit is een antwoord van iemand die niet was uitgenodigd!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Kon je kalender store niet updaten."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "I kon het kalender component niet verwijderen!\n"
-
-# shell/e-setup.c:88

-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Component successvol verwijderd."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Type kalender component niet herkend."
-
-# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704

-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Toevoegen aan Kalender"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Accepteer"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Weiger"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:386

-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Experimenteel"
-
-# calendar/gui/calendar-commands.c:663

-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Kalender updaten"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Afspraak annuleren"
-
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--naar--"
-
-# calendar/gui/calendar-commands.c:659

-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Kalender Bericht"
-
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Datum:"
-
-# calendar/gui/print.c:1084

-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Bezig met laden kalender..."
-
-# mail/mail-config.c:328

-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
-msgid "Sender"
-msgstr "Afzender"
-
-# calendar/gui/gncal-todo.c:171

-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Opsomming:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "einddatum"
-
-# calendar/gui/prop.c:385

-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "begindatum"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Aanwezige"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adres aanwezige"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Aanwezigen: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annuleer\n"
-"Afspraak"
-
-# addressbook/contact-editor/e-contact-editor.c:1283

-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Voorzitter"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Vergadering Uitnodigingen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Niet-Deelnemer"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Optionele Deelnemer"
-
-# mail/mail-config.c:328

-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizator: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publiceren\n"
-"Gebeurtenis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Verzoek\n"
-"Afspraak"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Benodigde Deelnemer"
-
-# addressbook/contact-editor/e-contact-editor.c:1289

-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Plan\n"
-"Tijd"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Allen"
-
-# addressbook/contact-editor/categories-strings.h:7

-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Categorie:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kon de taken in `%s' niet laden"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Gebeurtenis die de gehele dag plaatsvind"
-
-# calendar/gui/calendar-commands.c:59

-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Afspraak"
-
-# calendar/gui/calendar-commands.c:59

-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Afspraak Basis:"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Aangepaste herhaling"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Elke"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Uitzonderingen"
-
-# calendar/gui/prop.c:348

-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Aanpassen"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Geen herhaling"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Speel een geluid af"
-
-# addressbook/printing/e-contact-print.glade.h:9

-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Voorbeeld"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Herhaling"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Herhalings Regel"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Herinnering"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Start een programma"
-
-# mail/mail-ops.c:374

-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Verstuur een e-mail"
-
-# addressbook/printing/e-contact-print.glade.h:12

-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Instellingen..."
-
-# calendar/gui/calendar-commands.c:522

-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Laat een dialoogvenster zien"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Eenvoudige herhaling"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Eindtijd:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Begintijd:"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Begin datum:"
-
-# filter/filter-editor.c:198

-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
-msgid "after"
-msgstr "na"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
-msgid "before"
-msgstr "voor"
-
-# calendar/gui/getdate.y:424

-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dag(en)"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "einde van afspraak"
-
-# calendar/gui/getdate.y:445

-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "voor"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "oneindig"
-
-# calendar/gui/getdate.y:425

-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "u(u)r(en)"
-
-# widgets/e-table/e-table-group.glade.h:9

-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-# addressbook/printing/e-contact-print.glade.h:31

-# addressbook/printing/e-contact-print.glade.h:43

-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minu(u)t(en)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "maand(en)"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:9

-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "begin van afspraak"
-
-# shell/e-shell-folder-title-bar.c:355

-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "totdat"
-
-# calendar/gui/getdate.y:423

-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "week(en)"
-
-# calendar/gui/getdate.y:420

-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "jar(en)"
-
-# calendar/gui/event-editor.c:289

-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Afspraak Bewerken"
-
-# calendar/gui/gnome-month-item.c:737

-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "op"
-
-# calendar/gui/getdate.y:424

-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-# calendar/gui/getdate.y:421

-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "op de"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "e"
-
-# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657

-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "gebeurtenissen"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Deze afspraak bevat herhalingen de Evolution niet kan bewerken."
-
-# calendar/gui/getdate.y:424

-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d dagen"
-
-# calendar/gui/calendar-commands.c:522

-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 dag"
-
-# calendar/gui/getdate.y:423

-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d weken"
-
-# calendar/gui/calendar-commands.c:528

-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 week"
-
-# calendar/gui/getdate.y:425

-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d uren"
-
-# calendar/gui/getdate.y:425

-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 uur"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuten"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minuut"
-
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d seconden"
-
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 seconde"
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " voor het begin van een afspraak"
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " na het begin van een afspraak"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " voor het eind van een afspraak"
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " na het eind van een afspraak"
-
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Een voorbeeld Bonobo control dat een kalender weergeeft."
-
-# mail/component-factory.c:196

-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender uitvoer samenvattings component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip bekijker"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution component voor het afhandelen van de kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabriek voor het Kalender Samenvattings component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabriek voor het Evolution kalender component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabriek voor het kalender iTip bekijk control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabriek voor het voorbeeld Kalender control"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kon de map in `%s' niet openen"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
-
-# calendar/gui/getdate.y:394

-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-# calendar/gui/getdate.y:398

-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Augustus"
-
-# calendar/gui/getdate.y:403

-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "December"
-
-# calendar/gui/getdate.y:392

-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februari"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ga Naar Datum"
-
-# calendar/gui/goto.c:312

-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ga Naar Vandaag"
-
-# calendar/gui/getdate.y:391

-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Januari"
-
-# calendar/gui/getdate.y:397

-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juli"
-
-# calendar/gui/getdate.y:396

-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juni"
-
-# calendar/gui/getdate.y:393

-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Maart"
-
-# calendar/gui/prop.c:348

-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mei"
-
-# calendar/gui/getdate.y:402

-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
-
-# calendar/gui/getdate.y:401

-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Oktober"
-
-# calendar/gui/getdate.y:399

-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
-
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kon Gnome niet initialiseren"
-
-# calendar/gui/print.c:265

-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5e"
-
-# calendar/gui/print.c:266

-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6e"
-
-# calendar/gui/print.c:266

-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7e"
-
-# calendar/gui/print.c:266

-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8e"
-
-# calendar/gui/print.c:266

-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9e"
-
-# calendar/gui/print.c:266

-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10e"
-
-# calendar/gui/print.c:267

-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11e"
-
-# calendar/gui/print.c:267

-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12e"
-
-# calendar/gui/print.c:267

-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13e"
-
-# calendar/gui/print.c:267

-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14e"
-
-# calendar/gui/print.c:267

-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15e"
-
-# calendar/gui/print.c:268

-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16e"
-
-# calendar/gui/print.c:268

-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17e"
-
-# calendar/gui/print.c:268

-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18e"
-
-# calendar/gui/print.c:268

-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19e"
-
-# calendar/gui/print.c:268

-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20ste"
-
-# calendar/gui/print.c:269

-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21ste"
-
-# calendar/gui/print.c:269

-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22ste"
-
-# calendar/gui/print.c:269

-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23ste"
-
-# calendar/gui/print.c:269

-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24ste"
-
-# calendar/gui/print.c:269

-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25ste"
-
-# calendar/gui/print.c:270

-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26ste"
-
-# calendar/gui/print.c:270

-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27ste"
-
-# calendar/gui/print.c:270

-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28ste"
-
-# calendar/gui/print.c:270

-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29ste"
-
-# calendar/gui/print.c:270

-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30ste"
-
-# calendar/gui/print.c:271

-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31ste"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Zo"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Ma"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Di"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Wo"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Do"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Vr"
-
-# calendar/gui/print.c:326

-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Za"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "_Taken"
-
-# calendar/gui/print.c:980

-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Dag van vandaag (%a %b %d %Y)"
-
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-# calendar/gui/print.c:1004

-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Huidige week (%s - %s)"
-
-# calendar/gui/print.c:1040

-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Huidige maand (%b %Y)"
-
-# calendar/gui/print.c:1047

-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Huidig jaar (%Y)"
-
-# calendar/gui/print.c:1084

-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Druk Kalender af"
-
-# calendar/gui/print.c:1249

-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Afdrukvoorbeeld"
-
-# calendar/gui/control-factory.c:136

-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "De URI van de takenmap om weer te geven"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "ZMDWDVZ"
-
-# composer/e-msg-composer.c:474

-#: camel/camel-filter-driver.c:790
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Fout bij taalkunding ontleden bestand: %s: %s"
-
-# composer/e-msg-composer.c:474

-#: camel/camel-filter-driver.c:795
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Fout bij uitvoeren filter: %s: %s"
-
-# composer/e-msg-composer.c:474

-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Fout bij uitvoeren filter zoekactie: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan zoek expressie niet taalkunding ontleden: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fout bij uitvoeren zoek expressie: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr "(past-allen) heeft een enkel bool resultaat nodig"
-
-#: camel/camel-folder-search.c:551
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Bezig met uitvoeren van query op onbekende kop: %s"
-
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kon vergrendelings bestand voor %s niet maken: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Maximale wachttijd overschreden tijdens het wachten op exclusieve toegang "
-"tot bestand %s. Probeer het later opnieuw."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Vergaren van 'lock' gebruik makend van fcntl(2) mislukt: %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Vergaren van 'lock' gebruik makend van flock(2) mislukt: %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Kon post bestand %s niet controleren: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Kon post bestand %s niet openen: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Kon tijdelijk post bestand %s niet openen: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kon het vergrendelings bestand voor %s niet testen: %s"
-
-# composer/e-msg-composer.c:494

-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fout bij het lezen van post bestand: %s"
-
-# composer/e-msg-composer.c:474

-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fout bij opslaan van tijdelijk post bestand: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Kon de pipe niet maken: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Kon niet starten: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail programma mislukt: %s"
-
-# shell/e-storage.c:434

-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Onbekende fout)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Kon %s niet laden: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Kon %s niet laden: Geen initialisatie code in de module."
-
-# mail/mail-config.c:1658

-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s service voor %s op %s"
-
-# filter/filter-editor.c:212

-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Verbinding geannuleerd"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kon niet verbinden met %s (poort %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(onbekende computer)"
-
-# calendar/gui/calendar-commands.c:456

-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operatie Geannuleerd"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Compilatie van reguliere expressie mislukt: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' heeft een gebruikersnaam gedeelte nodig"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' heeft een computernaam gedeelte nodig"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' heeft een pad gedeelte nodig"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Computer %s niet gevonden."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Kan computernaam %s tijdelijk niet opzoeken"
-
-# mail/folder-browser-factory.c:89

-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "Virtuele map e-mail aanbieder"
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-"Voor het lezen van post als een query of een andere verzameling van mappen"
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
-
-# shell/e-setup.c:69

-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Kon de directory %s niet aanmaken:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL `%s' bevat geen protocol"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL `%s' bevat een ongeldig protocol"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Poort nummer in URL `%s' is niet numeriek"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kon Kerberos ticket niet vergaren:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Slechte authenticatie respons van server."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Onverwachte respons van IMAP server: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP commando mislukt: %s"
-
-# shell/e-storage.c:434

-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
-msgid "Unknown error"
-msgstr "Onbekende fout"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Het antwoord van de server eindigde te snel."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "De respons van de IMAP server bevatte geen %s informatie"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "De IMAP Server gaf onverwacht een 'OK' respons: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:199
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Kon samenvatting voor %s niet laden"
-
-#: camel/providers/imap/camel-imap-folder.c:329
-msgid "Scanning IMAP folder"
-msgstr "Bezig met scannen IMAP map"
-
-#: camel/providers/imap/camel-imap-folder.c:457
-msgid "Synchronising IMAP folder"
-msgstr "Bezig met Synchronizeren IMAP map"
-
-#: camel/providers/imap/camel-imap-folder.c:726
-#: camel/providers/imap/camel-imap-folder.c:888
-msgid "Could not find message body in FETCH response."
-msgstr "Kon bericht inhoud niet vinden in FETCH respons."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Voor het lezen en opslaan van post op IMAP servers."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
-"als platte tekst."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
-"Kerberos 4 authenticatie."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Fout bij het authenticeren op de IMAP server.\n"
-"%s\n"
-"\n"
-
-# shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kon directory %s niet maken: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "MH-formaat post directories"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Voor het opslaan van lokale post in MH-achtige post directories"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standaard Unix mailbox bestand"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Voor het opslaan van lokale post in standaard mbox formaat"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir-formaat post bestanden"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Voor het opslaan van lokale post in qmail maildir directories"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Opslag locatie %s is geen absoluut pad"
-
-# composer/e-msg-composer.c:686

-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Opslag stam `%s' is geen gewone directory"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan map niet vergaren: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Lokale opslag locaties hebben geen postvak in"
-
-# composer/e-msg-composer.c:474

-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokaal post bestand %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kon samenvattings bestand van map `%s' niet verwijderen: %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kon index bestand van map `%s' niet verwijderen: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
-
-# mail/folder-browser-factory.c:41

-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan bericht niet vergaren: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Een dergelijk bericht bestaat niet"
-
-# addressbook/contact-editor/e-contact-editor.c:782

-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Ongeldige bericht inhoud"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kon map `%s' niet openen:\n"
-"%s"
-
-# composer/e-msg-composer.c:676

-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Map `%s' bestaat niet."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kon map `%s' niet maken:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' is geen maildir directory."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kon map `%s' niet verwijderen: %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "geen maildir directory"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kon postvak niet openen: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan bericht niet aan mbox bestand toevoegen: %s: %s"
-
-# mail/folder-browser-factory.c:41

-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan bericht %s uit folder %s niet vergaren\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "De map lijkt onherstelbaar beschadigt te zijn."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kon bestand `%s' niet openen:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Kon bestand `%s' niet aanmaken:\n"
-"%s"
-
-# composer/e-msg-composer.c:686

-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' is geen gewoon bestand."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kon map `%s' niet verwijderen:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Map `%s' is niet leeg. Niet verwijderd."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Bezig met samenvatten map"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatale e-mail ontleed fout op positie %ld in map %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kon map niet samenvatten: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1279
-msgid "Synchronising folder"
-msgstr "Bezig met synchronizeren map"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Kon tijdelijk postvak niet openen: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fout bij het schrijven naar tijdelijk postvak: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fout bij het schrijven naar tijdelijk postvak %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kon de bron map %s niet sluiten: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Kon de tijdelijke map niet sluiten: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kon de naam van de map niet wijzigen: %s"
-
-# shell/e-storage.c:434

-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Onbekende fout: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' is geen directory."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Voer het NNTP wachtwoord voor %s@%s in"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Volgens de server is de gebruikersnaam ongeldig"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Fout bij het versturen van de gebruikersnaam naar de server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Volgens de server is de gebruikernaam en/of het wachtwoord ongeldig"
-
-# calendar/gui/calendar-commands.c:434

-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Bericht %s kon niet worden gevonden."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kon groepenlijst niet van server ophalen."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Fout bij het laden van het groepenlijst bestand voor %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET nieuws"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Dit is een provider voor het lezen van en versturen naar USENET "
-"nieuwsgroepen."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Kon directory voor nieuws servers niet openen: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET Nieuws via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Het wachtwoord zal naar de NNTP server worden verstuurd in platte tekst vorm."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
-
-# mail/folder-browser-factory.c:37

-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Bezig met ophalen POP samenvatting"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kon map niet openen: berichtenlijst was niet compleet."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Geen bericht met uid %s"
-
-# mail/folder-browser-factory.c:37

-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Bezig met ophalen POP bericht %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kon bericht niet van POP server %s halen: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Voor het verbinden met POP servers. Het POP protocol kan ook gebruikt worden "
-"om post te halen van bepaalde 'web mail' providers en gesloten post systemen."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Bij het verbinden met de POP server het wachtwoord versturen in platte tekst "
-"vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
-"servers."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Bij het verbinden met de POP server word gebruik gemaakt van een versleuteld "
-"wachtwoord via het APOP protocol. Deze optie zal niet werken voor alle "
-"gebruikers op servers die te kennen geven het te ondersteunen."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Dit zal verbinden met de POP server en gebruik maken van Kerberos 4 bij het "
-"aanmelden."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kon niet aanmelden bij KPOP server: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kon niet verbinden met POP server op %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sVoer het POP3 wachtwoord voor %s@%s in"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Fout bij het verbinden met de POP server.\n"
-"Fout bij versturen van gebruikersnaam: %s"
-
-# shell/e-storage.c:434

-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Onbekend)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Fout bij verbinden met de POP server.\n"
-"Geen ondersteuning voor de ingestelde aanmeldings methode."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Fout bij verbinden met de POP server.\n"
-"Fout bij het versturen van het wachtwoord: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Map `%s' bestaat niet."
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Het afleveren van post zal afgehandelt worden door het \"sendmail\" "
-"programma dat op het lokale systeem."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Kon kanaal naar sendmail niet maken: %s: bericht niet verstuurt"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Kon sendmail niet starten: %s: bericht niet verstuurt"
-
-# mail/folder-browser-factory.c:37

-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Kon bericht niet versturen: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail stopte met signaal %s: bericht niet verstuurd."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail stopte met staat %d: bericht niet verstuurt."
-
-# mail/folder-browser-factory.c:29

-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Post aflevering via het sendmail programma"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
-"afstand gebruik makend van SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Spelfout, commando niet herkend"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Spelfout in parameters of argumenten"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Commando niet geïmplementeerd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Commando parameter niet geïmplementeerd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Systeem status, of systeem help antwoord"
-
-# composer/e-msg-composer.c:894

-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Help bericht"
-
-# addressbook/printing/e-contact-print.glade.h:52

-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Dienst klaar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Dienst heeft transmissie kanaal gesloten"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Dienst niet beschikbaar, transmissie kanaal gesloten"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Verzochte post actie oke, voltooid"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Verzochte mail actie niet genomen: mailbox niet beschikbaar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Verzochte actie niet genomen: mailbox niet beschikbaar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Verzochte actie niet genomen: onvoldoende ruimte op systeem"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Verzochte post actie afgebroken: ruimte allocatie overschreden"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Verzochte actie niet genomen: mailbox naam niet toegestaan"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Start post invoer; eindig met <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transactie mislukt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Welkom respons fout: %s: waarschijnlijk niet-fataal"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Geen authenticatie vereist"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Deze optie zal verbinden met de SMTP server zonder gebruik te maken van "
-"authenticatie. Dit werkt prima met de meeste SMTP servers."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Deze optie zal verbinden met de SMTP server gebruik makend van CRAM-MD5 "
-"authenticatie."
-
-# mail/mail-config.c:1658

-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Post aflevering via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan bericht niet versturen: afzender niet gedefiniëerd."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Kan berichten niet versturen: afzender niet geldig."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO respons fout: %s: niet-fataal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Time-out tijdens MAIL FROM verzoek: %s: bericht niet verzonden"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL FROM respons fout: %s: bericht niet verzonden"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Time-out tijdens RCPT TO  verzoek: %s: bericht niet verzonden"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO respons fout: %s: bericht niet verzonden"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Time-out tijdens DATA verzoek: %s: bericht niet verstuurd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA respons fout: %s: bericht niet verstuurd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
-"niet verstuurd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA respons fout: bericht afgebroken: %s: bericht niet verstuurd"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Time-out tijdens RSET verzoek: %s"
-
-# shell/e-storage.c:434

-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "RSET respons fout: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Time-out tijdens QUIT verzoek: %s: niet-fataal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT respons fout: %s: niet-fataal"
-
-# composer/e-msg-composer-attachment-bar.c:76

-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-# composer/e-msg-composer-attachment-bar.c:78

-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-# composer/e-msg-composer-attachment-bar.c:85

-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-# composer/e-msg-composer-attachment-bar.c:89

-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-# composer/e-msg-composer-attachment-bar.c:93

-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-# composer/e-msg-composer-attachment-bar.c:299

-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "bijvoegsel"
-
-# composer/e-msg-composer.c:951

-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Voeg een bestand bij"
-
-# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333

-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Verwijderen"
-
-# composer/e-msg-composer-attachment-bar.c:363

-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Verwijder het geselecteerde bestand uit de lijst van attachments"
-
-# composer/e-msg-composer-attachment-bar.c:394

-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Bestand bijvoegen..."
-
-# composer/e-msg-composer-attachment-bar.c:395

-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Voeg een bestand bij het bericht"
-
-# composer/e-msg-composer-attachment-bar.c:299

-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr "Bijvoegsel"
-
-# composer/e-msg-composer-attachment.glade.h:7

-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Attachment eigenschappen"
-
-# composer/e-msg-composer-attachment.glade.h:10

-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Bestandsnaam:"
-
-# composer/e-msg-composer-attachment-bar.c:299

-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Ingebonden bijvoegsel"
-
-# composer/e-msg-composer-attachment.glade.h:8

-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME type:"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Verstuur als:"
-
-# mail/message-list.c:488

-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Van:"
-
-# composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
-
-# composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Geef de identiteit waarvan je dit bericht wilt versturen"
-
-# composer/e-msg-composer-hdrs.c:216

-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Aan:"
-
-# composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Geef de geaddresseerden"
-
-# composer/e-msg-composer-hdrs.c:221

-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-# composer/e-msg-composer-hdrs.c:222

-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
-
-# composer/e-msg-composer-hdrs.c:227

-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-# composer/e-msg-composer-hdrs.c:228

-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
-"op de geadresseerden-lijst van het bericht verschijnen."
-
-# composer/e-msg-composer-hdrs.c:234

-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-# composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Geef het onderwerp van het bericht"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kon handtekenings bestand %s niet openen:\n"
-"%s"
-
-# composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "Opslaan als..."
-
-# composer/e-msg-composer.c:474

-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fout bij opslaan bestand: %s"
-
-# composer/e-msg-composer.c:494

-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Error bij openen bestand: %s"
-
-# shell/e-shell-view-menu.c:159

-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Dit bericht is nog niet verstuurd.\n"
-"\n"
-"Wil je je wijzingen opslaan?"
-
-# composer/e-msg-composer.c:561

-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "Bestand openen"
-
-# composer/e-msg-composer.c:676

-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "Het bestand bestaat niet."
-
-# composer/e-msg-composer.c:686

-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "Het is geen gewoon bestand."
-
-# composer/e-msg-composer.c:696

-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "Het bestand bestaat maar is niet leesbaar."
-
-# composer/e-msg-composer.c:707

-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Het bestand is toegangelijk maar open(2) mislukte."
-
-# composer/e-msg-composer.c:729

-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Het bestand is zeer groot (groter dan 100K).\n"
-"Weet u zeker dat u het wil invoegen?"
-
-# composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "Een fout trad op tijdens het openen van het bestand."
-
-# composer/e-msg-composer.c:1127

-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "Stelt een nieuw bericht op"
-
-# mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr ""
-"Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
-"aanmaken."
-
-# mail/component-factory.c:196

-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan de post samensteller van Evolution niet initialiseren."
-
-# composer/e-msg-composer-address-dialog.glade.h:11

-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "adres kaart"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "kalender informatie"
-
-# mail/component-factory.c:196

-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution component voor de uitvoer samenvatting."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabriek voor het Evolution uitvoer samenvattings component."
-
-# mail/component-factory.c:196

-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Kan het Uitvoer Samenvattings component van Evolution niet initializeren"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Je kunt een andere HTML pagina voor de achtergrond van de Uitvoer "
-"Samenvatting.\n"
-"\n"
-"Je kan het leeg laten indien je de standaardwaarde wilt"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Open %s met de standaard Gnome applicatie"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Open %s met de standaard Gnome web browser"
-
-# mail/mail-ops.c:374

-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Verstuur een e-mail naar %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Verander het aanzicht naar %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Start %s"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Sluiten %s"
-
-# shell/e-shell-view-menu.c:402

-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Verplaats %s naar links"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Verplaats %s naar rechts"
-
-# addressbook/contact-editor/e-contact-editor.c:857

-# calendar/gui/event-editor.c:1340

-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Verplaats %s naar de vorige rij"
-
-# addressbook/contact-editor/e-contact-editor.c:860

-# calendar/gui/event-editor.c:1342

-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Verplaats %s naar de volgende rij"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configureer %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan HTML bestand niet openen:\n"
-"%s"
-
-# composer/e-msg-composer.c:494

-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fout bij lezen gegevens:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Bestand heeft geen plaats voor de diensten.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Verschijningsvorm"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Achtergrond:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Uitvoer samenvatting component kon Bonobo niet initializeren.\n"
-"Als er een waarschuwings bericht was over de RootPOA, dan geeft dit\n"
-"waarschijnlijk aan de je Bonobo gecompileerd hebt tegen GOAD in plaats van "
-"OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabriek voor de RDF samenvatting."
-
-# calendar/gui/gncal-todo.c:425

-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Samenvatting"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabriek voor het bonobo test component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabriek voor het Evolution kalender kanaal."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test bonobo dienst"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test dienst"
-
-# shell/e-storage.c:412

-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Fout"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Update automatisch"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Update nu"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473

-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Update elke "
-
-# calendar/gui/getdate.y:426

-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuten"
-
-# calendar/gui/getdate.y:420

-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "jaar"
-
-# calendar/gui/getdate.y:420

-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "jaren"
-
-# calendar/gui/getdate.y:421

-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "maand"
-
-# calendar/gui/getdate.y:421

-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "maanden"
-
-# calendar/gui/getdate.y:423

-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "week"
-
-# calendar/gui/getdate.y:423

-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "weken"
-
-# calendar/gui/getdate.y:424

-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dagen"
-
-# calendar/gui/getdate.y:425

-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "uur"
-
-# calendar/gui/getdate.y:425

-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "uren"
-
-# calendar/gui/getdate.y:426

-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuut"
-
-# calendar/gui/getdate.y:428

-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "seconde"
-
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " seconden"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oops. Je bent vergeten een datum te kiezen."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oops. Je hebt een ongeldige datum gekozen."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"De datum van het bericht zal vergelijken worden tegen\n"
-"de tijd die het is op het moment dat de filter gestart\n"
-"word of een vfolder word geopend."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"De datum van het bericht zal vergelijken worden met\n"
-"de tijd die je hier invoert."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"De datum van het bericht zal vergelijken worden met\n"
-"een tijd relatief aan het moment dat de filter word gestart;\n"
-"\"een week geleden\", bijvoorbeeld."
-
-# calendar/gui/calendar-commands.c:553

-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "de huidige tijd"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "Een tijd die je specificeert"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "Een tijd relatief aan de huidige tijd"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Vergelijk tegen"
-
-# calendar/gui/getdate.y:438

-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "nu"
-
-# addressbook/gui/component/addressbook.c:1010

-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<klik hier om een datum te selecteren>"
-
-# mail/mail-config.c:1490

-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Filter Regel Toevoegen"
-
-# filter/filter-editor.c:198

-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Bewerk VMap Regel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "inkomend"
-
-# calendar/gui/calendar-commands.c:56

-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "uitgaand"
-
-# filter/filter-editor.c:198

-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filters Bewerken"
-
-# calendar/gui/print.c:326

-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Dan"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Actie Toevoegen"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Deze Actie Verwijderen"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, je bent vergeten een map te kiezen.\n"
-"Ga terug en specificeer een geldige map om mail in af te leveren."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Selecteer Map"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Voer een Map URI in"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<klik hier om een map te selecteren>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fout in reguliere expressie '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-# composer/e-msg-composer-attachment.glade.h:10

-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Regel naam: "
-
-# shell/e-shell-folder-title-bar.c:355

-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Geen Titel"
-
-# addressbook/gui/component/alphabet.glade.h:14

-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Als"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Acties uitvoeren"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "als aan alle criteria wordt voldaan"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "als aan een van de criteria wordt voldaan"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Criteria toevoegen"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Deze criteria Verwijderen"
-
-# mail/folder-browser-factory.c:35

-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Beantwoord aan"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Belangrijk"
-
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Gelezen"
-
-# filter/filter-editor.c:198

-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Bewerk VMappen"
-
-# mail/mail-config.c:1490

-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filter Regels"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Inkomend"
-
-# calendar/gui/calendar-commands.c:56

-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Uitgaand"
-
-# mail/folder-browser-factory.c:89

-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuele Mappen"
-
-# mail/mail-config.c:1199

-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "VMap Bronnen"
-
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Beantwoord"
-
-#: filter/libfilter-i18n.h:14
-msgid "Assign Colour"
-msgstr "Geef Kleur"
-
-#: filter/libfilter-i18n.h:15
-msgid "Assign Score"
-msgstr "Geef Score"
-
-# shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:16
-msgid "Copy to Folder"
-msgstr "Kopieër naar Map"
-
-# mail/message-list.c:509

-#: filter/libfilter-i18n.h:17
-msgid "Date received"
-msgstr "Ontvangst datum"
-
-# mail/message-list.c:502

-#: filter/libfilter-i18n.h:18
-msgid "Date sent"
-msgstr "Verzend datum"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Verwijderd"
-
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Klad"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "Expressie"
-
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Gevlagd"
-
-# mail/folder-browser-factory.c:37

-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
-
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
-msgstr "Mailing lijst"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
-msgstr "Bericht"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "Bericht Kop"
-
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "Bericht ontvangen"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "Bericht verzonden"
-
-# shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "Verplaats naar Map"
-
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "Geaddresseerden"
-
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
-msgstr "Overeenkomende Regex"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Gelezen"
-
-# calendar/gui/print.c:326

-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Stel Vlag in"
-
-# mail/message-list.c:460

-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "Stel Status in"
-
-# mail/mail-config.c:1490

-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Bron"
-
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
-msgstr "Specifieke kop"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
-msgstr "Stop met Verwerken"
-
-# mail/message-list.c:495

-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "Onderwerp"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-# composer/e-msg-composer.c:676

-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "eindigt op"
-
-# calendar/gui/getdate.y:441

-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "bestaat"
-
-# addressbook/gui/component/alphabet.glade.h:17

-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "is grote dan"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "is gelijk aan reguliere expressie"
-
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "op of na"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "op of voor"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "begint met"
-
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:158
-msgid "was after"
-msgstr "was na"
-
-#: filter/libfilter-i18n.h:159
-msgid "was before"
-msgstr "was voor"
-
-# mail/mail-config.c:1490

-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Regel Toevoegen"
-
-# mail/mail-config.c:1488

-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Bewerk Score Regel"
-
-# filter/filter-editor.c:198

-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VMap Regel Toevoegen"
-
-# filter/filter-editor.c:198

-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Bewerk VMap Regel"
-
-#. add the vTrash folder
-#: mail/component-factory.c:219 mail/component-factory.c:447
-msgid "vTrash"
-msgstr "vPrullenbak"
-
-# mail/component-factory.c:196

-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan het post gedeelte van Evolution niet initialiseren."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr "Kan opslag niet registreren met shell"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Sla op als vFolder"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Bericht of onderwerp bevat"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Bericht bevat"
-
-# mail/message-list.c:495

-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Onderwerp bevat"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Bericht bevat niet"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Onderwerp bevat niet"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Afzender bevat"
-
-#: mail/folder-browser.c:667
-msgid "VFolder on Subject"
-msgstr "VMap op Onderwerp"
-
-#: mail/folder-browser.c:668
-msgid "VFolder on Sender"
-msgstr "VMap op Afzender"
-
-#: mail/folder-browser.c:669
-msgid "VFolder on Recipients"
-msgstr "VMap op Geadresseerden"
-
-#: mail/folder-browser.c:670 mail/folder-browser.c:788
-msgid "VFolder on Mailing List"
-msgstr "VFolder op Mailing Lijst"
-
-#: mail/folder-browser.c:672
-msgid "Filter on Subject"
-msgstr "Filter op Onderwerp"
-
-#: mail/folder-browser.c:673
-msgid "Filter on Sender"
-msgstr "Filter op Afzender"
-
-#: mail/folder-browser.c:674
-msgid "Filter on Recipients"
-msgstr "Filter op Geadresseerden"
-
-#: mail/folder-browser.c:675 mail/folder-browser.c:787
-msgid "Filter on Mailing List"
-msgstr "Filter op Mailing Lijst"
-
-#: mail/folder-browser.c:681 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Openen"
-
-# composer/e-msg-composer.c:463

-#: mail/folder-browser.c:683
-msgid "Save As..."
-msgstr "Opslaan Als..."
-
-# addressbook/gui/component/addressbook.c:425

-# addressbook/gui/component/addressbook.c:492

-# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

-#: mail/folder-browser.c:684 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Afdrukken"
-
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:686
-msgid "Reply to Sender"
-msgstr "Afzender beantwoorden"
-
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:687 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Iedereen beantwoorden"
-
-# mail/folder-browser-factory.c:37

-#: mail/folder-browser.c:688 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Doorsturen"
-
-# calendar/gui/calendar-commands.c:554

-#: mail/folder-browser.c:689 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Ingebonden doorsturen"
-
-#: mail/folder-browser.c:691
-msgid "Mark as Read"
-msgstr "Markeer Als Gelezen"
-
-# addressbook/contact-editor/e-contact-editor.c:704

-# calendar/gui/event-editor.c:1179

-#: mail/folder-browser.c:692
-msgid "Mark as Unread"
-msgstr "Markeer Als Ongelezen"
-
-# shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:694
-msgid "Move to Folder..."
-msgstr "Verplaats naar Map..."
-
-# shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:695
-msgid "Copy to Folder..."
-msgstr "Kopiëer naar Map..."
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: mail/folder-browser.c:697
-msgid "Undelete"
-msgstr "Terughalen"
-
-# addressbook/contact-editor/e-contact-editor.c:745

-# calendar/gui/event-editor.c:1222

-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:701
-msgid "Apply Filters"
-msgstr "Filters Toepassen"
-
-#: mail/folder-browser.c:703
-msgid "Create Rule From Message"
-msgstr "Maak Regel Van Bericht"
-
-#: mail/folder-browser.c:790
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter op Mailing Lijst (%s)"
-
-#: mail/folder-browser.c:791
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr "VFolder op Mailing Lijst (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution component voor het afhandelen van mail"
-
-# mail/component-factory.c:196

-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution bericht opsteller."
-
-# mail/component-factory.c:196

-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution post uitvoer samenvattings component."
-
-# mail/component-factory.c:196

-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution post map weergave component."
-
-# mail/component-factory.c:196

-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution post map factory component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabriek voor de Evolution opsteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabriek voor het Evolution post component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fabriek voor het Post Samenvattings component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importeert mbox bestanden naar Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Huidig opslagformaat:"
-
-# calendar/gui/event-editor.c:294

-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Mailbox Formaat"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:10

-# addressbook/contact-editor/e-contact-editor-strings.h:12

-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nieuw opslagformaat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Opmerking: Bij het converteren tussen mailbox formaten zal een fout,\n"
-"zoals te weinig diskruimte, wellicht niet automatisch herstelbaar zijn.\n"
-"Wees voorzichtig met het gebruiken van deze optie."
-
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-# addressbook/gui/component/alphabet.glade.h:16

-# calendar/cal-util/timeutil.c:98

-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-# shell/e-shell-view.c:596

-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Geen"
-
-# calendar/gui/prop.c:836

-#: mail/mail-accounts.c:116
-msgid " (default)"
-msgstr " (standaard)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:389
-msgid "Evolution Account Manager"
-msgstr "Evolution Account Beheer"
-
-#: mail/mail-account-editor.c:290
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Een of meer servers zijn niet correct geconfigureerd.\n"
-"Wil je toch opslaan?"
-
-# shell/e-shell-view-menu.c:369

-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
-msgid "Evolution Account Editor"
-msgstr "Evolution Account Bewerker"
-
-# mail/mail-config.c:1199

-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Post versturen naar %s"
-
-# mail/message-list.c:495

-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Onderwerp is %s"
-
-# mail/mail-ops.c:374

-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Post ophalen van %s"
-
-#: mail/mail-autofilter.c:284
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailing lijst"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Je hebt het post programma nog niet geconfigureerd.\n"
-"Dit moet gebeuren voordat je e-mail kan zenden, versturen,\n"
-"of ontvangen.\n"
-"Wil je nu het programma configureren?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Je moet een identiteit configuren\n"
-"voordat je post kunt versturen."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Je moet een post transport configuren\n"
-"voordat je een e-mail kunt versturen."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Er is geen post transport methode ingesteld"
-
-# mail/mail-ops.c:386

-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Dit bericht heeft geen onderwerp.\n"
-"Weet u zeker dat u het wilt versturen?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Je moet een account configureren voordat je deze e-mail kan versturen."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-"De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Op %s, %s schreef:\n"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Doorgestuurd bericht:\n"
-
-# mail/folder-browser-factory.c:41

-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Verplaats bericht(en) naar"
-
-# composer/e-msg-composer.c:1127

-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Kopiëer bericht(en) naar"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Je mag alleen berichten bewerken die opgeslagen zijn\n"
-"in de Klad map."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Bestand overschrijven?"
-
-# shell/e-storage.c:416

-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Er bestaat al een bestand met die naam.\n"
-"Overschrijven?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Bericht Opslaan Als..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Berichten Opslaan Als..."
-
-# composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fout bij het laden van filter informatie:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Bericht Afdrukken"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Afdrukken van bericht mislukt"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Account"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Account Informatie"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Account Beheer"
-
-# composer/e-msg-composer-attachment.glade.h:7

-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Account Eigenschappen"
-
-# calendar/gui/gncal-todo.c:479

-# composer/e-msg-composer-address-dialog.glade.h:13

-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Authenticatie"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Authenticatie Type:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Automatisch controleren op nieuwe post elke"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Test instellingen"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Gefeliciteerd, je mail configuratie is voltooid.\n"
-"\n"
-"Je kunt nu e-mails versturen en ontvangen\n"
-"gebruik makend van Evolution.\n"
-"\n"
-"Klik op \"Voltooien\" om je instellingen op te slaan."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-# calendar/gui/prop.c:836

-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Standaard"
-
-# shell/e-shell-view.c:596

-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Klaar"
-
-# mail/mail-config.c:305

-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-Mail Adres:"
-
-# mail/mail-config.c:305

-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "E-mail Adres:"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution Post Configuratie"
-
-# mail/mail-config.c:277

-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Volledige Naam:"
-
-# mail/mail-config.c:725

-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Computernaam:"
-
-# mail/mail-config.c:1180

-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identiteit"
-
-#: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Opnemen in \"Get Mail\" bewerkingen."
-
-#: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Inkomende E-Mail Server"
-
-#: mail/mail-config.glade.h:34
-msgid "Keep mail on server"
-msgstr "Houdt e-mails op de server"
-
-#: mail/mail-config.glade.h:35
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail"
-msgstr "Post"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#: mail/mail-config.glade.h:37
-msgid "Mail Account"
-msgstr "Post Account"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration"
-msgstr "Post Configuratie"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:39
-msgid "Mail Configuration Druid"
-msgstr "Post Configuratie Druide"
-
-#: mail/mail-config.glade.h:40
-msgid "Make this my default account"
-msgstr "Stel dit in als standaard account"
-
-#: mail/mail-config.glade.h:41
-msgid "Mark messages as \"Read\" after:"
-msgstr "Markeer berichten als \"Gelezen\" na: "
-
-#: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Andere"
-
-# shell/e-shell-view-menu.c:398

-#: mail/mail-config.glade.h:44
-msgid "News"
-msgstr "Nieuws"
-
-# addressbook/printing/e-contact-print.glade.h:10

-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Optioneel"
-
-# mail/mail-config.c:328

-#: mail/mail-config.glade.h:47
-msgid "Organization:"
-msgstr "Organisatie:"
-
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Uitgaande E-Mail Server"
-
-#: mail/mail-config.glade.h:50
-msgid "PGP binary path:"
-msgstr "Locatie van PGP:"
-
-# mail/folder-browser-factory.c:101

-#: mail/mail-config.glade.h:51
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "Platte Tekst"
-
-#: mail/mail-config.glade.h:54
-msgid "Receiving Email"
-msgstr "Bezig met ontvangen E-mail"
-
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Onthoud mijn wachtwoord"
-
-# mail/folder-browser-factory.c:34

-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Antwoord-Naar:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Benodigd"
-
-# addressbook/gui/component/addressbook.c:943

-# addressbook/gui/minicard/e-minicard.c:330

-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Wachtwoord opslaan"
-
-#: mail/mail-config.glade.h:60
-msgid "Select PGP binary"
-msgstr "Selecteer lokatie PGP"
-
-# mail/mail-config.c:340

-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Selecteer signatuur bestand"
-
-#: mail/mail-config.glade.h:62
-msgid "Send mail in HTML format by default."
-msgstr "Stuur post standaard in HTML formaat."
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: mail/mail-config.glade.h:63
-msgid "Sending Email"
-msgstr "Bezig met versturen E-mail"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:65
-msgid "Server Configuration"
-msgstr "Server Configuratie"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config.glade.h:66
-msgid "Server Type: "
-msgstr "Server Type: "
-
-#: mail/mail-config.glade.h:67
-msgid "Server requires authentication"
-msgstr "Server vereist authenticatie"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Servers"
-
-# mail/mail-config.c:340

-#: mail/mail-config.glade.h:69
-msgid "Signature file:"
-msgstr "Signatuur bestand:"
-
-# mail/mail-config.c:340

-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Signatuur:"
-
-# mail/mail-config.c:1490

-#: mail/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Bronnen"
-
-#: mail/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Deze server heeft een beveiligde verbinding (SSL) nodig"
-
-# mail/mail-config.c:1220

-#: mail/mail-config.glade.h:74
-msgid "Transport"
-msgstr "Transport"
-
-# addressbook/printing/e-contact-print.glade.h:30

-#: mail/mail-config.glade.h:75
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Type de naam waarmee je wilt referen naar deze servers. Bijvoorbeeld: "
-"\"Thuis\" of \"Werk\"."
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: mail/mail-config.glade.h:78
-msgid "User Information"
-msgstr "Gebruikers Informatie"
-
-# mail/mail-config.c:725

-#: mail/mail-config.glade.h:79
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: mail/mail-config.glade.h:80
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Welkom bij de Evolution Post Configuratie Wizard.\n"
-"\n"
-"Klik op \"Volgende\" om te beginnen."
-
-# calendar/gui/getdate.y:426

-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "minuten."
-
-#: mail/mail-config-druid.c:401
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Fout bij het verifiëren van de inkomende post configuratie.\n"
-"Je zou problemen kunnen ondervinden tijdens het ophalen van je post van %s"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: mail/mail-config-druid.c:495
-msgid "Namespace:"
-msgstr "Benoemingsruimte:"
-
-#: mail/mail-config-druid.c:683
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Fout bij het verifiëren van de uitgaande post configuratie.\n"
-"Je zou problemen kunnen ondervinden tijdens het versturen van je post via %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1042
-msgid "Evolution Account Wizard"
-msgstr "Evolution Account Wizard"
-
-# addressbook/contact-editor/e-contact-editor.c:671

-# calendar/gui/event-editor.c:1146

-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Aanhangsel Opslaan"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kon tijdelijke directory niet maken: %s"
-
-# composer/e-msg-composer.c:463

-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Opslaan op Schijf..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Openen in %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Geef Ingebonden Weer"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Extern Weergave Programma"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Geef Ingebonden Weer (via %s)"
-
-# addressbook/printing/e-contact-print.glade.h:52

-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Verbergen"
-
-# composer/e-msg-composer-attachment-bar.c:299

-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s bijvoegsel"
-
-# addressbook/contact-editor/e-contact-editor.c:782

-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Bezig met laden bericht inhoud"
-
-# calendar/gui/prop.c:519

-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Versleutelde berichten worden niet weergegeven"
-
-# composer/e-msg-composer.c:894

-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Versleuteld bericht"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Klik op het icoon om te decoderen."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Dit bericht is digitaal gesigneerd en is authentiek."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Dit bericht is digitaal gesigneerd, maar er kan niet worden bewezen dat het "
-"authentiek is."
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Wijzer naar FTP site (%s)"
-
-#: mail/mail-format.c:1639
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Wijzer naar lokaal bestand (%s) geldig bij site \"%s\""
-
-#: mail/mail-format.c:1643
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Wijzer naar lokaal bestand (%s)"
-
-#: mail/mail-format.c:1677
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
-
-#: mail/mail-format.c:1682
-msgid "Malformed external-body part."
-msgstr "Misvorms extern-bericht gedeelte"
-
-#: mail/mail-local.c:454
-#, c-format
-msgid "Opening '%s'"
-msgstr "Bezig met openen '%s'"
-
-#: mail/mail-local.c:727
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
-
-#: mail/mail-local.c:731
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Verander map van \"%s\" naar \"%s\" formaat"
-
-#: mail/mail-local.c:755
-msgid "Reconfiguring folder"
-msgstr "Herconfigureer map"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:784
-msgid "Closing current folder"
-msgstr "Huidige map gesloten"
-
-#: mail/mail-local.c:816
-msgid "Renaming old folder and opening"
-msgstr "Naam oude map gewijzigd en map geopend"
-
-# shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:834
-msgid "Creating new folder"
-msgstr "Bezig met aanmaken van nieuwe map"
-
-# composer/e-msg-composer.c:1127

-#: mail/mail-local.c:848
-msgid "Copying messages"
-msgstr "Bezig met het kopiëren van berichten"
-
-#: mail/mail-local.c:869
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
-"meer worden geopend: %s"
-
-#: mail/mail-local.c:908
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Als deze map niet meer kan worden geopend, dan is\n"
-"allicht noodzakelijk om deze handmatig te repareren."
-
-#: mail/mail-mt.c:137
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Fout tijdens '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:139
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Fout tijden het uitvoeren van bewerking:\n"
-"%s"
-
-# calendar/gui/gnome-month-item.c:737

-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
-msgid "Working"
-msgstr "Bezig"
-
-# shell/e-shell-view-menu.c:159

-#: mail/mail-mt.c:707
-msgid "Evolution progress"
-msgstr "Evolution voortgang"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Bezig met verzenden \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Bezig met versturen bericht"
-
-#: mail/mail-ops.c:747
-msgid "Saving message to folder"
-msgstr "Bezig met opslaan bericht naar map"
-
-#: mail/mail-ops.c:820
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Bezig met verplaatsen van berichten naar %s"
-
-# composer/e-msg-composer.c:1127

-#: mail/mail-ops.c:820
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Bezig met het kopiëren van berichten naar %s"
-
-# calendar/gui/gnome-month-item.c:737

-#: mail/mail-ops.c:837
-msgid "Moving"
-msgstr "Bezig met verplaatsen"
-
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:840
-msgid "Copying"
-msgstr "Bezig met kopiëren"
-
-#: mail/mail-ops.c:851
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:922
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Bezig met scannen van mappen in \"%s\""
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1036
-msgid "Forwarded messages"
-msgstr "Doorgestuurde berichten"
-
-#: mail/mail-ops.c:1077 mail/mail-ops.c:1215
-#, c-format
-msgid "Opening folder %s"
-msgstr "Bezig met openen map %s"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Opening store %s"
-msgstr "Bezig met openen van opslag %s"
-
-#: mail/mail-ops.c:1331
-msgid "Expunging folder"
-msgstr "Bezig met legen map"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1380
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Bezig met ophalen bericht %s"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1447
-msgid "Retrieving messages"
-msgstr "Bezig met ophalen berichten"
-
-#: mail/mail-ops.c:1457
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-# composer/e-msg-composer.c:1127

-#: mail/mail-ops.c:1531
-msgid "Saving messages"
-msgstr "Bezig met het opslaan van berichten"
-
-#: mail/mail-ops.c:1610
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Kon uitvoerbestand niet maken: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1623
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
-
-# composer/e-msg-composer.c:474

-#: mail/mail-ops.c:1637
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Fout bij opslaan berichten naar: %s:\n"
-" %s"
-
-# addressbook/contact-editor/e-contact-editor.c:671

-# calendar/gui/event-editor.c:1146

-#: mail/mail-ops.c:1711
-msgid "Saving attachment"
-msgstr "Bezig met opslaan bijvoegsel"
-
-#: mail/mail-ops.c:1726
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Kan uitvoerbestand niet maken: %s:\n"
-" %s"
-
-# mail/mail-threads.c:814

-#: mail/mail-ops.c:1754
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kon gegevens niet wegschrijven: %s"
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Zoeken"
-
-# filter/filter-editor.c:212

-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Bezig met annuleren ..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Verstuur & Ontvang e-mail"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Bezig met ontvangen"
-
-#: mail/mail-send-recv.c:268
-msgid "Updating ..."
-msgstr "Bezig met Updaten ..."
-
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
-msgid "Waiting ..."
-msgstr "Bezig met wachten ..."
-
-#: mail/mail-send-recv.c:289
-msgid "Sending"
-msgstr "Bezig met verzenden"
-
-# filter/filter-editor.c:212

-#: mail/mail-send-recv.c:484
-msgid "Cancelled."
-msgstr "Geannuleerd."
-
-#: mail/mail-send-recv.c:488
-msgid "Complete."
-msgstr "Klaar."
-
-# mail/mail-threads.c:621

-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "Onafgemaakt bericht naar pipe geschreven!"
-
-#: mail/mail-tools.c:197
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:255
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (doorgestuurd bericht)"
-
-#: mail/mail-tools.c:265
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (geen onderwerp)"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:282
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Doorgestuurd bericht - %s"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:284
-msgid "Forwarded message (no subject)"
-msgstr "Doorgestuurd bericht (geen onderwerp)"
-
-#: mail/mail-tools.c:366
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kan locatie `%s' niet openen:\n"
-"%s"
-
-# shell/e-shell-view.c:208

-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "VMappen"
-
-#: mail/mail-vfolder.c:321
-msgid "New VFolder"
-msgstr "Nieuwe VMap"
-
-# mail/folder-browser-factory.c:34

-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Beantwoorden"
-
-# mail/folder-browser-factory.c:34

-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Beantwoord dit bericht"
-
-# mail/folder-browser-factory.c:35

-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Dit bericht doorsturen"
-
-# mail/folder-browser-factory.c:43

-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Druk dit bericht af"
-
-# mail/folder-browser-factory.c:45

-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Verwijdert dit bericht"
-
-# calendar/gui/getdate.y:448

-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Ongelezen"
-
-# mail/folder-browser-factory.c:37

-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Meerdere Ongelezen Berichten"
-
-# composer/e-msg-composer.c:894

-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Meerdere Berichten"
-
-# calendar/gui/calendar-commands.c:746

-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, en dergelijke."
-
-# shell/e-storage.c:434

-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<onbekend>"
-
-# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "Today %l:%M %p"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "Gisteren %l:%M %p"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-# calendar/gui/event-editor.c:1745

-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-# mail/message-list.c:488

-#: mail/message-list.c:1172
-msgid "From"
-msgstr "Van"
-
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "Datum"
-
-# mail/message-list.c:509

-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "Ontvangen"
-
-# mail/message-list.c:516

-#: mail/message-list.c:1173
-msgid "To"
-msgstr "Aan"
-
-# mail/message-list.c:523

-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "Grootte"
-
-#: mail/openpgp-utils.c:84
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Voer je %s passphrase voor %s in"
-
-#: mail/openpgp-utils.c:87
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Voer je %s passphrase in."
-
-# calendar/gui/event-editor.c:294

-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
-msgid "No GPG/PGP program available."
-msgstr "Geen GPG/PGP programma beschikbaar."
-
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
-msgid "No password provided."
-msgstr "Geen wachtwoord ingevoerd."
-
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
-
-#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
-msgid "No recipients specified"
-msgstr "Geen ontvangers gespecifieerd"
-
-#: mail/openpgp-utils.c:1067
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kon tijdelijk bestand niet maken: %s"
-
-# shell/e-shell-view.c:208

-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Map"
-
-# calendar/gui/print.c:326

-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "Opslag"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "Geef mappen weer die beginnen met:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Bezig met vergaren opslag voor \"%s\""
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Bezig met aanmelden bij map \"%s\""
-
-#: mail/subscribe-dialog.c:282
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Bezig met afmelden van map \"%s\""
-
-# composer/e-msg-composer-attachment.glade.h:10

-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Map naam:"
-
-# shell/e-shell-view.c:208

-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Map type:"
-
-# shell/e-storage.c:422

-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Specificeer waar de map gemaakt moet worden:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importeren %s\n"
-"Importeerder niet klaar.\n"
-"Bezig met 5 seconden wachten om opnieuw te proberen."
-
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importeren %s\n"
-"Bezig met importeren item %d."
-
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Er is geen importeerder die het volgende kan afhandelen\n"
-"%s"
-
-# calendar/gui/gnome-month-item.c:737

-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "Bezig met importeren"
-
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importeren %s.\n"
-"Beginnen %s"
-
-# composer/e-msg-composer.c:494

-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "Fout bij laden %s"
-
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importeren %s\n"
-"Bezig met importeren item 1."
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508

-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "Automatisch"
-
-# composer/e-msg-composer-attachment.glade.h:10

-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "Bestandsnaam:"
-
-# mail/mail-config.c:340

-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "Selecteer een bestand"
-
-# composer/e-msg-composer-attachment.glade.h:10

-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "Bestandstype:"
-
-# widgets/e-table/e-table-config.glade.h:9

-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "Importeer"
-
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Kies het bestand dat je wilt importeren in Evolution en selecteer wat voor "
-"bestandstype het is uit de lijst.\n"
-"\n"
-"Je kunt \"Automatisch\" selecteren als je het niet zeker weet, Evolution zal "
-"dan proberen om het uit te zoeken."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Klik op \"Importeren\" om te beginnen met het importeren van het bestand "
-"naar Evolution."
-
-# shell/e-shell-view-menu.c:369

-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution Importeer Hulpmiddel"
-
-# shell/e-shell-view-menu.c:369

-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution Importeer Hulpmiddel"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Welkom bij het Evolution Importeer Hulpmiddel.\n"
-"Deze wizard zal je begeleiden door het proces van het importeren\n"
-"van externe bestanden naar Evolution."
-
-# shell/e-setup.c:47

-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution installatie"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
-"in je persoonlijke Evolutie directory"
-
-# shell/e-setup.c:52

-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
-"breken."
-
-# mail/mail-threads.c:814

-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Kon bestanden niet correct updaten"
-
-# shell/e-setup.c:88

-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution bestanden succesvol geinstalleerd."
-
-# shell/e-setup.c:51

-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Het lijkt erop dat dit de eerste keer is dat je Evolution draait."
-
-# shell/e-setup.c:52

-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Klik op \"OK\" om de Evolution files te installeren in"
-
-# shell/e-setup.c:69

-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kon de directory niet aanmaken\n"
-"%s\n"
-"Fout: %s"
-
-# shell/e-setup.c:84

-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan de bestanden niet kopieren naar\n"
-"`%s'."
-
-# shell/e-setup.c:108

-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Het bestand `%s' is geen directory.\n"
-"Verplaats het om de installatie van de Evolution\n"
-"bestanden af te maken."
-
-# shell/e-setup.c:108

-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Het bestand `%s' is geen directory.\n"
-"Verplaats het om de installatie van de Evolution\n"
-"bestanden af te maken."
-
-# shell/e-shell-folder-creation-dialog.c:81

-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan de gespecificeerde folder niet aanmaken:\n"
-"%s"
-
-# shell/e-shell-folder-creation-dialog.c:133

-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "De opgegeven folder-naam is niet geldig."
-
-# shell/e-shell-folder-creation-dialog.c:223

-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Nieuwe folder maken"
-
-# shell/e-shell-folder-selection-dialog.c:95

-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Het type van de geselecteerde folder is niet geldig\n"
-"voor de opdracht."
-
-# shell/e-shell-folder-selection-dialog.c:236

-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nieuw..."
-
-# shell/e-shell-folder-title-bar.c:355

-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Geen)"
-
-# shell/e-shell-view-menu.c:110

-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy kon niet worden gevonden in het $PATH."
-
-# shell/e-shell-view-menu.c:116

-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy kon niet worden gestart."
-
-# shell/e-shell-view-menu.c:161

-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-# shell/e-shell-view-menu.c:163

-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution is een een verzameling van groupware\n"
-"programma's voor post, planning en kontakt beheer\n"
-"in de GNOME werkomgeving."
-
-# shell/e-shell-view-menu.c:301

-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Ga naar folder..."
-
-# shell/e-shell-view.c:113

-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Geen map weergegeven)"
-
-# shell/e-shell-view.c:208

-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mappen"
-
-# shell/e-shell-view.c:600

-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-# shell/e-shell-view.c:600

-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-# shell/e-shell.c:299

-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan de lokale opslag niet opzetten -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
-"Dit betekent waarschijnlijk dat het %s component is gecrashed"
-
-# addressbook/gui/component/addressbook.c:420

-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Nieuwe snelkoppelings groep aanmaken"
-
-# mail/mail-config.c:277

-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Groep:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Wil je echt de groep `%s' verwijderen\n"
-"van de snelkoppelingsbalk?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Niet verwijderen"
-
-# shell/e-shortcuts-view.c:235

-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Kleine Iconen"
-
-# shell/e-shortcuts-view.c:236

-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Toont de snelkoppelingen als kleine iconen"
-
-# shell/e-shortcuts-view.c:238

-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Grote Iconen"
-
-# shell/e-shortcuts-view.c:239

-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Toont de snelkoppelingen als grote iconen"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nieuwe Groep..."
-
-# addressbook/gui/component/addressbook.c:420

-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "Deze Groep _Verwijderen..."
-
-# shell/e-shortcuts-view.c:333

-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Verwijder deze snelkoppelingsgroep"
-
-# shell/e-shell-view-menu.c:419

-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Verberg de Snelkoppelingenbalk"
-
-# shell/e-shell-view-menu.c:419

-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Verberg de snelkoppelingenbalk"
-
-# shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activeren"
-
-# shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activeer deze snelkoppeling"
-
-# shell/e-shortcuts-view.c:333

-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
-
-# shell/e-shortcuts.c:358

-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Fout bij opslaan van snelkoppelingen."
-
-# shell/e-shell-view-menu.c:398

-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "Weerga_ve"
-
-# mail/folder-browser-factory.c:43

-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Geef de geselecteerde map weer"
-
-# shell/e-storage.c:217

-#: shell/e-storage.c:176
-msgid "(No name)"
-msgstr "(Geen naam)"
-
-# shell/e-storage.c:412

-#: shell/e-storage.c:427
-msgid "No error"
-msgstr "Geen fout"
-
-# shell/e-storage.c:414

-#: shell/e-storage.c:429
-msgid "Generic error"
-msgstr "Generieke fout"
-
-# shell/e-storage.c:416

-#: shell/e-storage.c:431
-msgid "A folder with the same name already exists"
-msgstr "Een folder met die naam bestaat al"
-
-# shell/e-storage.c:418

-#: shell/e-storage.c:433
-msgid "The specified folder type is not valid"
-msgstr "Het gespecificeerde folder type is niet geldig"
-
-# shell/e-storage.c:420

-#: shell/e-storage.c:435
-msgid "I/O error"
-msgstr "I/O fout"
-
-# shell/e-storage.c:422

-#: shell/e-storage.c:437
-msgid "Not enough space to create the folder"
-msgstr "Niet genoeg ruimte vrij om de folder te maken"
-
-# shell/e-storage.c:424

-#: shell/e-storage.c:439
-msgid "The specified folder was not found"
-msgstr "De opgegeven folder was niet gevonden"
-
-# shell/e-storage.c:426

-#: shell/e-storage.c:441
-msgid "Function not implemented in this storage"
-msgstr "Functie niet geimplementeerd voor deze opslag"
-
-# shell/e-storage.c:428

-#: shell/e-storage.c:443
-msgid "Permission denied"
-msgstr "Operatie niet toegestaan"
-
-# shell/e-storage.c:430

-#: shell/e-storage.c:445
-msgid "Operation not supported"
-msgstr "Operatie niet ondersteund"
-
-# shell/e-storage.c:432

-#: shell/e-storage.c:447
-msgid "The specified type is not supported in this storage"
-msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
-
-# shell/main.c:172

-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "De Evolution schil."
-
-# shell/main.c:99

-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hallo. Bedankt voor het nemen van de tijd voor het downloaden van deze\n"
-"preview release van de Evolution werkgroep suite.\n"
-"\n"
-"Sinds de vorige vrijgave heeft onze nadruk gelegen op het bruikbaar maken\n"
-"van Evolution. Veel Evolution ontwikkelaars gebruiken Evolution om hun \n"
-"e-mail fulltime te lezen. Dat kan jij ook doen. (Maar maak\n"
-"wel regelmatig een backup)\n"
-"\n"
-"Maar zelfs al hebben we vele fouten die de stabiliteit en veiligheid \n"
-"beinvloeden verholpen, krijg je nog steeds de disclaimer: Evolution zal:\n"
-"crashen, je e-mail verliezen als je het niet wilt, weigeren om je e-mail\n"
-"te verwijderen als je het wilt, lopende processen achterlaten, 100% CVE\n"
-"tijd consumeren, mislopen, vastlopen, HTML e-mail sturen naar willekeurige\n"
-"mailing lijsten en je voor schut zetten voor je vrienden en collega's.\n"
-"Gebruik op eigen risico.\n"
-"\n"
-"We hopen dat plezier hebt van het resultaat van ons harde werk en we "
-"wachten\n"
-"met smart je bijdrages af!\n"
-
-# shell/main.c:126

-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Bedankt\n"
-"Het Evolution Team\n"
-
-# shell/main.c:172

-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan de Evolution shell niet initialiseren."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Uitzetten."
-
-# shell/main.c:220

-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kan het Bonobo componentensysteem niet initializeren"
-
-# shell/e-shell-view-menu.c:404

-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Nieuw contact maken"
-
-# addressbook/gui/component/addressbook.c:426

-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Selecteer een contact"
-
-# addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Vinden"
-
-# addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Zoek een contact"
-
-# addressbook/gui/component/addressbook.c:506

-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nieuw contact"
-
-# addressbook/gui/component/addressbook.c:425

-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Druk contacten af"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stoppen"
-
-# addressbook/printing/e-contact-print.glade.h:26

-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stop met Laden"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Allen Weergeven"
-
-# addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Geef alle kontaken weer"
-
-# mail/folder-browser-factory.c:95

-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Adresboek Configuratie..."
-
-# addressbook/gui/component/addressbook.c:425

-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Druk Kontakten af..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Zoek naar kontakten"
-
-# addressbook/contact-editor/e-contact-editor.c:807

-# calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473

-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Gereedschap"
-
-# calendar/gui/calendar-commands.c:525

-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dagen"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Instellingen Wijzigen"
-
-# calendar/gui/calendar-commands.c:659

-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Kalender Instellingen..."
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Maak een nieuwe afspraak"
-
-# calendar/gui/calendar-commands.c:660

-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Maak een nieuwe kalender"
-
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

-# calendar/gui/gncal-todo.c:717

-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Dag"
-
-# calendar/gui/calendar-commands.c:552

-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Ga terug in tijd"
-
-# calendar/gui/calendar-commands.c:554

-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Ga vooruit in tijd"
-
-# calendar/gui/calendar-commands.c:558

-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Ga naar"
-
-# calendar/gui/calendar-commands.c:558

-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Ga naar specifieke datum"
-
-# calendar/gui/calendar-commands.c:553

-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Ga naar huidig moment"
-
-# calendar/gui/calendar-commands.c:531

-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Maand"
-
-# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324

-# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643

-# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659

-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nieuwe afspraak"
-
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Volgende"
-
-# calendar/gui/calendar-commands.c:663

-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Open Kalender"
-
-# calendar/gui/calendar-commands.c:552

-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Vorige"
-
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Druk deze Kalender af"
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Opslaan Als"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Kalender bewaren als iets anders"
-
-# calendar/gui/calendar-commands.c:522

-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Laat 1 dag zien"
-
-# calendar/gui/calendar-commands.c:531

-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Toon 1 maand"
-
-# calendar/gui/calendar-commands.c:528

-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Laat 1 week zien"
-
-# calendar/gui/calendar-commands.c:525

-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Laat de werkweek zien"
-
-# calendar/gui/calendar-commands.c:553

-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Vandaag"
-
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Week"
-
-# shell/e-shell-view-menu.c:398

-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nieuw"
-
-# calendar/gui/calendar-commands.c:663

-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "Open Ka_lender"
-
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Druk deze kalender af"
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Opslaan Als..."
-
-# addressbook/contact-editor/e-contact-editor.c:853

-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Verwijderd dit item"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Verwijderen..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Help"
-
-# addressbook/contact-editor/e-contact-editor.c:844

-# calendar/gui/calendar-commands.c:673

-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "En_velop Afdrukken..."
-
-# addressbook/contact-editor/e-contact-editor.c:845

-# calendar/gui/event-editor.c:1326

-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Item afdrukken"
-
-# addressbook/contact-editor/e-contact-editor.c:844

-# calendar/gui/calendar-commands.c:673

-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Afdrukken..."
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Opslaan _Als..."
-
-# addressbook/contact-editor/e-contact-editor.c:839

-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Opslaan en Sluiten"
-
-# addressbook/contact-editor/e-contact-editor.c:840

-# calendar/gui/event-editor.c:1321

-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Stu_ur contact naar ander..."
-
-# addressbook/contact-editor/e-contact-editor.c:863

-# calendar/gui/event-editor.c:1344

-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Zie help"
-
-# addressbook/contact-editor/e-contact-editor.c:782

-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Nieuw _bericht naar contact..."
-
-# widgets/e-table/e-table-config.glade.h:10

-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Bestand"
-
-# addressbook/contact-editor/e-contact-editor.c:844

-# calendar/gui/calendar-commands.c:673

-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Afdrukken..."
-
-# calendar/gui/print.c:326

-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Opslaan"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Over deze applicatie"
-
-# addressbook/printing/e-contact-print.glade.h:20

-# addressbook/printing/e-contact-print.glade.h:21

-# addressbook/printing/e-contact-print.glade.h:51

-# addressbook/printing/e-contact-print.glade.h:54

-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Over..."
-
-# shell/e-shell-view-menu.c:474

-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ac_ties"
-
-# calendar/gui/event-editor.c:1251

-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Adres _Boek... (FIXME)"
-
-# calendar/gui/calendar-commands.c:659

-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "W_issen"
-
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "K_nippen"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Contro_leer Namen (FIXME)"
-
-# calendar/gui/calendar-commands.c:659

-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Wissen"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Selectie wissen"
-
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Deze afspraak sluiten"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kopiëer naar Map... (FIXME)"
-
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopiëer de selectie"
-
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Knippen"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Knip de selectie"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML Dumpen"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Dump de UI Xml omschrijving"
-
-# addressbook/contact-editor/e-contact-editor.c:715

-# calendar/gui/event-editor.c:1190

-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Ee_rste Item in Folder (FIXME)"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "_Doorsturen (FIXME)"
-
-# calendar/gui/event-editor.c:1265

-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Doorsturen als v_Calendar (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:860

-# calendar/gui/event-editor.c:1342

-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Ga naar het volgende item"
-
-# addressbook/contact-editor/e-contact-editor.c:857

-# calendar/gui/event-editor.c:1340

-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Ga naar het vorige item"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "On_afgemaakte Taak (FIXME)"
-
-# calendar/gui/prop.c:678

-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "De bestandseigenschappen wijzigen"
-
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "V_olgende"
-
-# composer/e-msg-composer-address-dialog.c:191

-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Plakken"
-
-# composer/e-msg-composer-address-dialog.c:192

-# composer/e-msg-composer-address-dialog.c:200

-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Plak het klembord"
-
-# addressbook/contact-editor/e-contact-editor.c:737

-# calendar/gui/event-editor.c:1212

-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Vorige"
-
-# addressbook/contact-editor/e-contact-editor.c:737

-# calendar/gui/event-editor.c:1212

-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Vorige"
-
-# calendar/gui/print.c:1249

-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Afdruk_voorbeeld"
-
-# addressbook/contact-editor/e-contact-editor.c:844

-# calendar/gui/calendar-commands.c:673

-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Afdruk In_stellingen..."
-
-# addressbook/printing/e-contact-print.glade.h:7

-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Printer Instellingen"
-
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Eigenschappen"
-
-# calendar/gui/print.c:326

-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Opslaan"
-
-# addressbook/contact-editor/e-contact-editor.c:840

-# calendar/gui/event-editor.c:1321

-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Bewaar de afspraak en sluit dit venster"
-
-# calendar/gui/calendar-commands.c:553

-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Huidig bestand opslaan"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Afspraak Plannen"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Afspraak Plannen"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Een soort afspraak maken"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Alles Selecteren"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Selecteer alles"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Stel de pagina instellingen in voor de huidige printer"
-
-# shell/e-shell-view-menu.c:387

-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Taak Ve_rzoek (FIXME)"
-
-# shell/e-shell-view-menu.c:159

-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Over..."
-
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Sluiten"
-
-# shell/e-shell-view-menu.c:381

-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
-
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopiëren"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
-
-# calendar/gui/gncal-todo.c:488

-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "B_ewerken..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Help"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Item (FIXME)"
-
-# shell/e-shell-view-menu.c:381

-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Dagboek Entry (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:722

-# calendar/gui/event-editor.c:1197

-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Laatste Item in Folder (FIXME)"
-
-# shell/e-shell-view-menu.c:375

-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Bericht Versturen (FIXME)"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Verplaatsen naar Map... (FIXME)"
-
-# shell/e-shell-view-menu.c:381

-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Notitie (FIXME)"
-
-# composer/e-msg-composer-address-dialog.c:191

-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Plakken"
-
-# addressbook/gui/component/addressbook.c:425

-# addressbook/gui/component/addressbook.c:492

-# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Afdrukken"
-
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Alles _Selecteren"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Taak (FIXME)"
-
-# shell/e-shell-view-menu.c:381

-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Ongelezen Item (FIXME)"
-
-# mail/mail-config.c:1490

-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Dienst Toevoegen"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Voeg een nieuwe dienst toe aan de Uitvoer Samenvatting"
-
-# shell/e-shell-view-menu.c:404

-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Nieuwe e-mail opstellen"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Uitvoer Samenvattings Instellingen..."
-
-# mail/folder-browser-factory.c:29

-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nieuwe E-Mail"
-
-# mail/folder-browser-factory.c:30

-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Opstellen"
-
-# mail/folder-browser-factory.c:30

-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Stel een nieuw bericht op"
-
-# mail/folder-browser-factory.c:41

-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopiëer het bericht naar een nieuwe map"
-
-# filter/filter-editor.c:198

-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Maak Regel"
-
-# shell/e-shell-view-menu.c:365

-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Map"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filteren op Afzender"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filteren op Geadresseerden"
-
-# mail/folder-browser-factory.c:101

-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Wachtwoorden _Vergeten"
-
-# mail/folder-browser-factory.c:29

-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Post Ophalen"
-
-# mail/folder-browser-factory.c:43

-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Verberg G_eselecteerde Berichten"
-
-# mail/folder-browser-factory.c:45

-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Verberg Verwij_derde Berichten"
-
-# mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Verberg _Gelezen Berichten"
-
-# addressbook/contact-editor/e-contact-editor.c:745

-# calendar/gui/event-editor.c:1222

-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Post _Filters..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Aanmeldingen Beheren..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "_Markeer Als Gelezen"
-
-# addressbook/contact-editor/e-contact-editor.c:704

-# calendar/gui/event-editor.c:1179

-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
-
-# calendar/gui/print.c:326

-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Verplaatsen"
-
-# mail/folder-browser-factory.c:41

-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Sla het bericht op in een bepaalde folder"
-
-# composer/e-msg-composer.c:894

-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Geeft een voorbeeld van het af te drukken bericht"
-
-# calendar/gui/print.c:1249

-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Afdrukvoorbeeld van bericht..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Bericht afdrukken..."
-
-# mail/folder-browser-factory.c:35

-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Iedereen Be_antwoorden"
-
-# mail/folder-browser-factory.c:35

-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Af_zender beantwoorden"
-
-# mail/mail-config.c:1490

-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "Br_on"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Alles Selecteren"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Geef _Alle Berichten weer"
-
-# mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VMap op Afze_nder"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VMap op _Geadresseerden"
-
-# mail/mail-config.c:1490

-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Bekijk Pure Bericht Bron"
-
-# addressbook/contact-editor/e-contact-editor.c:745

-# calendar/gui/event-editor.c:1222

-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "Filters _Toepassen"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configureer Map..."
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopiëren naar Map..."
-
-# composer/e-msg-composer.c:894

-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "Bericht _Bewerken"
-
-# mail/folder-browser-factory.c:77

-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Legen"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filteren op Onderwerp"
-
-# mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Doorsturen"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Selectie _Inverteren"
-
-# mail/folder-browser-factory.c:95

-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Mail Configuratie..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Bericht"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Verplaatsen naar Map..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Openen in Nieuw Venster"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Bericht A_fdrukken"
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Bericht Op_slaan als..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "Rela_ties weergeven"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:8

-# addressbook/contact-editor/e-contact-editor.c:673

-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Herstellen"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMap op Onderwerp"
-
-# mail/folder-browser-factory.c:89

-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtuele Map Bewerker..."
-
-# composer/e-msg-composer.c:951

-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Bijvoegen"
-
-# calendar/gui/calendar-commands.c:553

-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Huidig bestand sluiten"
-
-# composer/e-msg-composer.c:894

-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Versleutel dit bericht met PGP"
-
-# addressbook/contact-editor/e-contact-editor.c:806

-# calendar/gui/event-editor.c:1280

-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "_Opmaak"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-# composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Voeg een bestand bij het bericht"
-
-# composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Tekst bestand invoegen..."
-
-# composer/e-msg-composer.c:561

-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Bestand openen"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP Versleutelen"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP Signeren"
-
-# filter/filter-editor.c:198

-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Kla_d Opslaan"
-
-# composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Opslaan in _map... (FIXME)"
-
-# composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Opslaan in _map..."
-
-# composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Sla het huidige bestand op onder een andere naam"
-
-# composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Sla het bericht op in een bepaalde folder"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Versturen"
-
-# filter/filter-editor.c:198

-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "_Later Versturen"
-
-# filter/filter-editor.c:198

-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "_Later versturen"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Stuur de mail in HTML formaat"
-
-# composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Dit bericht later versturen"
-
-# composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Dit bericht nu versturen"
-
-# composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Dit bericht nu versturen"
-
-# composer/e-msg-composer.c:907

-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Toon / Verberg bijvoegsels"
-
-# composer/e-msg-composer.c:906

-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Bekijk _bijvoegsels"
-
-# composer/e-msg-composer.c:906

-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Bekijk bijvoegsels"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Signeer dit bericht met je PGP sleutel"
-
-# composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Voeg test-bestand _in... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Openen..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Beveiliging"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "map toevoegen aan de lijst van aangemelde mappen"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Lijst Verfrissen"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Lijst of Mappen Verfrissen"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Map verwijderen van je lijst van aangemelde mappen"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Aanmelden"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Afmelden"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Taak Toewijze_n (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Opnieuw Zoeken"
-
-# shell/e-shell-view-menu.c:387

-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Ve_rzoek Vergadering (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Herhalen"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
-
-# mail/folder-browser-factory.c:34

-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Vervangen"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Tekenreeks vervangen"
-
-# mail/folder-browser-factory.c:35

-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Iedereen _beantwoorden (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:667

-# calendar/gui/event-editor.c:1142

-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Verstuur een _status rapport (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:667

-# calendar/gui/event-editor.c:1142

-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Sla Voorkomst over (FIXME)"
-
-# addressbook/contact-editor/e-contact-editor.c:840

-# calendar/gui/event-editor.c:1321

-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Bewaar deze taak en sluit het dialoogvenster"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Zoek naar een tekenreeks"
-
-# composer/e-msg-composer.c:948

-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Ongedaan maken"
-
-# composer/e-msg-composer.c:948

-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Maak de laatste bewerking ongedaan"
-
-# shell/e-shell-view-menu.c:378

-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Afspraak (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Markeer als Gedaan (FIXME)"
-
-# shell/e-shell-view-menu.c:384

-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Beantwoorden (FIXME)"
-
-# shell/e-shell-view-menu.c:404

-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Nieuwe taak aanmaken"
-
-# shell/e-shell-view-menu.c:398

-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nieuw"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Stuur taak als iets anders"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Taak Voorkeuren..."
-
-# shell/e-shell-view-menu.c:159

-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Over Evolution..."
-
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-# addressbook/contact-editor/e-contact-editor.c:732

-# calendar/gui/event-editor.c:1207

-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Aan_passen..."
-
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Aanpassen"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Toolbalken aanpassen"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Toon een andere map"
-
-# calendar/gui/gncal-todo.c:488

-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "Stop_pen"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution balk _snelkoppeling"
-
-# calendar/gui/gncal-todo.c:488

-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Stoppen"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Programma verlaten"
-
-# shell/e-shell-view-menu.c:443

-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "_Beginnen"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importeer een extern bestandsformaat"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Hoofd toolbalk"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Geef informatie over Evolution weer"
-
-# shell/e-shell-view-menu.c:422

-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "_Mapbalk Tonen"
-
-# shell/e-shell-view-menu.c:419

-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "_Snelkoppelingenbalk Tonen"
-
-# shell/e-shell-view-menu.c:457

-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Bug Report Insturen"
-
-# shell/e-shell-view-menu.c:457

-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "_Bug Report Insturen"
-
-# shell/e-shell-view-menu.c:458

-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Bug Report insturen met Bug Buddy."
-
-# shell/e-shell-view-menu.c:423

-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Toont de mapbalk"
-
-# shell/e-shell-view-menu.c:420

-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Toont de snelkoppelingenbalk"
-
-# shell/e-shell-view-menu.c:452

-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Gebruik van de Kont_akt Beheerder"
-
-# shell/e-shell-view-menu.c:449

-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Gebruik van de _Kalender"
-
-# shell/e-shell-view-menu.c:446

-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "De _Mailer Gebruiken"
-
-# shell/e-shell-view-menu.c:159

-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Over Evolution..."
-
-# shell/e-shell-view-menu.c:365

-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Map"
-
-# shell/e-shell-view-menu.c:402

-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Ga naar Map..."
-
-# composer/e-msg-composer.c:891

-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importeer bestand..."
-
-# shell/e-shell-view-menu.c:440

-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Index"
-
-# shell/e-shell-view-menu.c:375

-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Bericht versturen"
-
-# addressbook/printing/e-contact-print.glade.h:12

-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "In_stellingen:"
-
-# calendar/gui/event-editor.c:1745

-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:387

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Bezig"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:388

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Uit het Kantoor"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Geen informatie"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:405

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Nod_ig anderen uit..."
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:425

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opties"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:442

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "T_oon alleen werkuren"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:455

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Toon Uitge_zoomd"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Update Vrij/Druk"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:491

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Automatisch uitzoeken"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:522

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:539

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mensen en bronnen"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:552

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mensen en een bron"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Benodigde Mensen"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:578

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Vereiste mensen en een br_on"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Begintijd _vergadering:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:625

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "_Eindtijd vergadering:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle Gasten"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MDWDVZZ"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-# widgets/misc/e-clipped-label.c:106

-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-# addressbook/gui/component/addressbook.c:420

-# calendar/gui/calendar-commands.c:544

-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nu"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Informatie"
-
-# calendar/gui/gnome-month-item.c:737

-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Waarschuwing"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Vraag"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Bericht"
-
-# composer/e-msg-composer.c:942

-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Dit bericht niet meer weergeven."
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "_Zoeken"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "De Persoonlijke Adresboek Server"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "De Persoonlijke Kalender Server; kalender fabriek"
-
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: wombat/wombat.c:153
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): kon Gnome-VFS niet initializeren"
-
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: wombat/wombat.c:165
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba: kon Gnome niet initializeren"
-
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: wombat/wombat.c:178
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): kon Bonobo niet initializeren"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "De Evolution werkgroep suite"
-
-#~ msgid "Reflow Test"
-#~ msgstr "Reflow Test"
-
-# shell/e-shell-view-menu.c:161

-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#~ msgid "This should test the reflow canvas item"
-#~ msgstr "Dit zou het 'reflow' canvas item moeten testen"
-
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "UNIX mbox-formaat post bestanden"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
-#~ "het opslaan van post op de lokale schijf."
-
-#~ msgid "No such message: %s"
-#~ msgstr "Een dergelijk bericht bestaat niet"
-
-#~ msgid "Connect to server"
-#~ msgstr "Kon niet verbinden met POP server op %s."
-
-# mail/component-factory.c:196

-#~ msgid "Cannot initialize Evolution's notes component."
-#~ msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
-
-# mail/main.c:62

-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
-
-# addressbook/contact-editor/fullname-strings.h:13

-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mvr.\n"
-#~ "Dr.\n"
-
-# addressbook/contact-editor/fullname-strings.h:18

-#~ msgid ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "de eerste\n"
-#~ "de tweede\n"
-#~ "de derde\n"
-#~ "Esq.\n"
-
-#~ msgid "Open..."
-#~ msgstr "_Openen"
-
-#~ msgid "Open the task"
-#~ msgstr "Open de taak"
-
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "Lokale opslag locaties hebben geen standaard map"
-
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mappen mogen niet recursief in elkaar worden opgenomen."
-
-#~ msgid "Saving changes to message..."
-#~ msgstr "Bezig met opslaan wijzigingen aan bericht..."
-
-#~ msgid "Save changes to message..."
-#~ msgstr "Wijzigingen aan bericht opslaan..."
-
-#~ msgid "Error saving composition to 'Drafts': %s"
-#~ msgstr "Fout bij het opslaan van de compositie naar 'Klad': %s"
-
-#~ msgid "Failed to perform regex search on message header: %s"
-#~ msgstr "Fout bij het uitoefenen van regex zoekactie op bericht kop: %s"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Er is geen \"Postvak uit\" geconfigureerd"
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kon bestand %s niet openen:\n"
-#~ "%s"
-
-# shell/e-shell-view-menu.c:404

-#~ msgid "Registering local folder"
-#~ msgstr "Bezig met registreren lokale map"
-
-# shell/e-shell-view-menu.c:404

-#~ msgid "Register local folder"
-#~ msgstr "Registreren lokale map"
-
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
-
-# mail/mail-ops.c:374

-#~ msgid "Fetching email from %s"
-#~ msgstr "Bezig met ophalen post van %s"
-
-# mail/mail-ops.c:374

-#~ msgid "Fetch email from %s"
-#~ msgstr "Post ophalen van %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Bezig met op verzoek filteren van post"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Filter post op verzoek"
-
-#~ msgid "Sending queue"
-#~ msgstr "Bezig met verzenden wachtrij"
-
-#~ msgid "Send queue"
-#~ msgstr "Verzendings wachtrij"
-
-#~ msgid "Appending \"%s\""
-#~ msgstr "Bezig met toevoegen \"%s\""
-
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
-
-#~ msgid "Moving messages from \"%s\" into \"%s\""
-#~ msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
-
-#~ msgid "Copying messages from \"%s\" into \"%s\""
-#~ msgstr "Bezig met kopiëren berichten van \"%s\" naar \"%s\""
-
-#~ msgid "Move messages from \"%s\" into \"%s\""
-#~ msgstr "Verplaats berichten van \"%s\" naar \"%s\""
-
-#~ msgid "Copy messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiëer berichten van \"%s\" naar \"%s\""
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#~ msgid "(No description)"
-#~ msgstr "(Geen beschrijving)"
-
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "Bezig met laden %s Map"
-
-#~ msgid "Load %s Folder for %s"
-#~ msgstr "Laad \"%s\" Map"
-
-#~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fout tijden het preparen van %s:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error while `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fout tijdens `%s':\n"
-#~ "%s"
-
-# mail/mail-threads.c:623

-#~ msgid "Error reading commands from dispatching thread."
-#~ msgstr ""
-#~ "Fout tijdens het lezen van commando's van het verzendende parallele proces"
-
-# mail/mail-threads.c:712

-#~ msgid "Corrupted message from dispatching thread?"
-#~ msgstr "Verminkt bericht van het verzend parallel proces?"
-
-# mail/mail-threads.c:814

-#~ msgid "Could not create dialog box."
-#~ msgstr "Kon dialoog venster niet aanmaken."
-
-# mail/mail-threads.c:849

-#~ msgid "User cancelled query."
-#~ msgstr "Gebruiker heeft vraag afgebroken."
-
-#~ msgid "Examining %s"
-#~ msgstr "Bezig met Bestuderen %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Kon UID cache bestand \"%s\" niet lezen. Je zou dubbele berichten kunnen "
-#~ "ontvangen."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Bezig met ophalen bericht %d van %d"
-
-# mail/folder-browser-factory.c:41

-#~ msgid "Writing message %d of %d"
-#~ msgstr "Bezig met wegschrijven bericht %d van %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Bezig met opslaan wijzingen aan %s"
-
-#~ msgid "Get store for \"%s\""
-#~ msgstr "Bezig met vergaren opslag voor \"%s\""
-
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Aanmelden bij map \"%s\""
-
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Afmelden bij map \"%s\""
-
-# addressbook/contact-editor/e-contact-editor.c:643

-# calendar/gui/event-editor.c:1118

-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Afspraak"
-
-# addressbook/contact-editor/e-contact-editor.c:644

-# calendar/gui/event-editor.c:1119

-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "FIXME: Verzoek tot Vergadering"
-
-# addressbook/contact-editor/e-contact-editor.c:646

-# calendar/gui/event-editor.c:1121

-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "FIXME: _Mail bericht"
-
-# addressbook/contact-editor/e-contact-editor.c:647

-# calendar/gui/event-editor.c:1122

-#~ msgid "FIXME: _Contact"
-#~ msgstr "FIXME: _Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:648

-# calendar/gui/event-editor.c:1123

-#~ msgid "FIXME: _Task"
-#~ msgstr "FIXME: _Taak"
-
-# addressbook/contact-editor/e-contact-editor.c:649

-# calendar/gui/event-editor.c:1124

-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: Taak Verzoek"
-
-# addressbook/contact-editor/e-contact-editor.c:650

-# calendar/gui/event-editor.c:1125

-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "FIXME: Dagboek Item"
-
-# addressbook/contact-editor/e-contact-editor.c:651

-# calendar/gui/event-editor.c:1126

-#~ msgid "FIXME: _Note"
-#~ msgstr "FIXME: Aanteke_ning"
-
-# addressbook/contact-editor/e-contact-editor.c:653

-# addressbook/contact-editor/e-contact-editor.c:758

-# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

-#~ msgid "FIXME: Ch_oose Form..."
-#~ msgstr "FIXME: Seleecteer F_ormulier"
-
-# addressbook/contact-editor/e-contact-editor.c:658

-# calendar/gui/event-editor.c:1133

-#~ msgid "FIXME: _Memo Style"
-#~ msgstr "FIXME: _Memo Stijl"
-
-# addressbook/contact-editor/e-contact-editor.c:660

-# calendar/gui/event-editor.c:1135

-#~ msgid "FIXME: Define Print _Styles..."
-#~ msgstr "FIXME: Definiëer Print _Stijlen..."
-
-# addressbook/contact-editor/e-contact-editor.c:667

-# calendar/gui/event-editor.c:1142

-#~ msgid "FIXME: S_end"
-#~ msgstr "FIXME: V_ersturen"
-
-# calendar/gui/event-editor.c:1333

-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "FIXME: Aanhangels Opslaan..."
-
-# addressbook/contact-editor/e-contact-editor.c:674

-# calendar/gui/event-editor.c:1149

-#~ msgid "FIXME: _Move to Folder..."
-#~ msgstr "FIXME: Verplaats naar Folder..."
-
-# addressbook/contact-editor/e-contact-editor.c:675

-# calendar/gui/event-editor.c:1150

-#~ msgid "FIXME: Cop_y to Folder..."
-#~ msgstr "FIXME: Kopieer naar Folder..."
-
-# addressbook/contact-editor/e-contact-editor.c:677

-# calendar/gui/event-editor.c:1152

-#~ msgid "Page Set_up"
-#~ msgstr "Pagina instellingen"
-
-# addressbook/contact-editor/e-contact-editor.c:678

-# calendar/gui/event-editor.c:1153

-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "FIXME: Afdruk_voorbeeld"
-
-# addressbook/contact-editor/e-contact-editor.c:699

-# calendar/gui/event-editor.c:1174

-#~ msgid "FIXME: Paste _Special..."
-#~ msgstr "FIXME: Plakken _Speciaal..."
-
-# addressbook/contact-editor/e-contact-editor.c:704

-# calendar/gui/event-editor.c:1179

-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Markeer Als Ongelezen"
-
-# addressbook/contact-editor/e-contact-editor.c:708

-# calendar/gui/event-editor.c:1183

-#~ msgid "_Object"
-#~ msgstr "_Object"
-
-# addressbook/contact-editor/e-contact-editor.c:713

-# addressbook/contact-editor/e-contact-editor.c:720

-# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

-#~ msgid "FIXME: _Item"
-#~ msgstr "FIXME: _Item"
-
-# addressbook/contact-editor/e-contact-editor.c:714

-# addressbook/contact-editor/e-contact-editor.c:721

-# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

-#~ msgid "FIXME: _Unread Item"
-#~ msgstr "FIXME: Ongelezen Item"
-
-# addressbook/contact-editor/e-contact-editor.c:727

-# calendar/gui/event-editor.c:1202

-#~ msgid "FIXME: _Standard"
-#~ msgstr "FIXME: _Standaard"
-
-# addressbook/contact-editor/e-contact-editor.c:729

-# calendar/gui/event-editor.c:1204

-#~ msgid "FIXME: __Formatting"
-#~ msgstr "FIXME: Opmaak"
-
-# addressbook/contact-editor/e-contact-editor.c:738

-# calendar/gui/event-editor.c:1213

-#~ msgid "Ne_xt"
-#~ msgstr "Volgende"
-
-# addressbook/contact-editor/e-contact-editor.c:740

-# calendar/gui/event-editor.c:1217

-#~ msgid "_Toolbars"
-#~ msgstr "_Werkbalk"
-
-# addressbook/contact-editor/e-contact-editor.c:745

-# calendar/gui/event-editor.c:1222

-#~ msgid "FIXME: _File..."
-#~ msgstr "FIXME: Bestand..."
-
-# addressbook/contact-editor/e-contact-editor.c:746

-# calendar/gui/event-editor.c:1223

-#~ msgid "FIXME: It_em..."
-#~ msgstr "FIXME: It_em..."
-
-# addressbook/contact-editor/e-contact-editor.c:747

-# calendar/gui/event-editor.c:1224

-#~ msgid "FIXME: _Object..."
-#~ msgstr "FIXME: _Object..."
-
-# addressbook/contact-editor/e-contact-editor.c:752

-# calendar/gui/event-editor.c:1229

-#~ msgid "FIXME: _Font..."
-#~ msgstr "FIXME: _Font..."
-
-# addressbook/contact-editor/e-contact-editor.c:753

-# calendar/gui/event-editor.c:1230

-#~ msgid "FIXME: _Paragraph..."
-#~ msgstr "FIXME: _Paragraaf..."
-
-# addressbook/contact-editor/e-contact-editor.c:760

-# calendar/gui/event-editor.c:1237

-#~ msgid "FIXME: Desi_gn This Form"
-#~ msgstr "FIXME: Ontwerp dit Formulier"
-
-# addressbook/contact-editor/e-contact-editor.c:761

-# calendar/gui/event-editor.c:1238

-#~ msgid "FIXME: D_esign a Form..."
-#~ msgstr "FIXME: Ontw_erp een Formulier..."
-
-# addressbook/contact-editor/e-contact-editor.c:763

-# calendar/gui/event-editor.c:1240

-#~ msgid "FIXME: Publish _Form..."
-#~ msgstr "FIXME: Publiceer een _Formulier..."
-
-# addressbook/contact-editor/e-contact-editor.c:764

-# calendar/gui/event-editor.c:1241

-#~ msgid "FIXME: Pu_blish Form As..."
-#~ msgstr "FIXME: Pu_bliceer een Formulier als..."
-
-# addressbook/contact-editor/e-contact-editor.c:766

-# calendar/gui/event-editor.c:1243

-#~ msgid "FIXME: Script _Debugger"
-#~ msgstr "FIXME: Script _Debugger"
-
-# addressbook/contact-editor/e-contact-editor.c:771

-# calendar/gui/event-editor.c:1248

-#~ msgid "FIXME: _Spelling..."
-#~ msgstr "FIXME: _Spelling..."
-
-# addressbook/contact-editor/e-contact-editor.c:773

-# calendar/gui/event-editor.c:1253

-#~ msgid "_Forms"
-#~ msgstr "_Formulier"
-
-# addressbook/contact-editor/e-contact-editor.c:778

-#~ msgid "FIXME: _New Contact"
-#~ msgstr "FIXME: _Nieuw Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:779

-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor.c:781

-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "FIXME: Nieuwe Brief naar Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:781

-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Nieuwe Brief naar Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:783

-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "FIXME: Nieuwe Afspraak met Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:784

-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "FIXME: Een Afspraak _Plannen..."
-
-# addressbook/contact-editor/e-contact-editor.c:785

-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "FIXME: Nieuwe _Taak for contact"
-
-# addressbook/contact-editor/e-contact-editor.c:786

-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "FIXME: Nieuwe Dagboek "
-
-# addressbook/contact-editor/e-contact-editor.c:788

-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Vlag voor Vervolg..."
-
-# addressbook/contact-editor/e-contact-editor.c:789

-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: Toon Folder met Adressen"
-
-# addressbook/contact-editor/e-contact-editor.c:790

-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: Pagina Bekijken"
-
-# addressbook/contact-editor/e-contact-editor.c:792

-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "FIXME: Doorsturen als _vCard"
-
-# addressbook/contact-editor/e-contact-editor.c:793

-# calendar/gui/event-editor.c:1266

-#~ msgid "FIXME: For_ward"
-#~ msgstr "FIXME: Doorsturen"
-
-# addressbook/contact-editor/e-contact-editor.c:805

-# calendar/gui/event-editor.c:1279

-#~ msgid "_Insert"
-#~ msgstr "_Invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:856

-# calendar/gui/event-editor.c:1339

-#~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Vorige"
-
-# addressbook/contact-editor/e-contact-editor.c:859

-# calendar/gui/event-editor.c:1341

-#~ msgid "FIXME: Next"
-#~ msgstr "FIXME: Volgende"
-
-# widgets/shortcut-bar/e-group-bar.c:632

-#~ msgid "Group %i"
-#~ msgstr "Group %i"
-
-#~ msgid "C_lassification:"
-#~ msgstr "C_lassificatie:"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "taak-bewerkings-dialoogvenster"
-
-# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

-#~ msgid "Days"
-#~ msgstr "Dagen"
-
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#~ msgid "Hours"
-#~ msgstr "Uren"
-
-# mail/mail-config.c:1199

-#~ msgid "Mail _to:"
-#~ msgstr "Post _naar:"
-
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#~ msgid "Minutes"
-#~ msgstr "Minuten"
-
-# calendar/gui/gncal-todo.c:428

-#~ msgid "Time"
-#~ msgstr "Resterende tijd"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:7

-#~ msgid "_Audio"
-#~ msgstr "_Geluid"
-
-#~ msgid "_Mail"
-#~ msgstr "_Post"
-
-#~ msgid "_Program"
-#~ msgstr "_Programma"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "gebeurtenis-bewerkings-dialoog"
-
-#~ msgid "Server disconnected."
-#~ msgstr "Server verbrak de verbinding."
-
-#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
-#~ msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
-
-#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
-#~ msgstr "UNIX mbox-formaat post bestanden (CamelLocal versie)"
-
-#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-#~ msgstr "UNIX qmail maildir-formaat e-mail bestanden (CamelLocal versie)"
-
-#~ msgid "Show all hidden"
-#~ msgstr "Allen Weergeven"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#~ msgid "Hide selected"
-#~ msgstr "Verwijderd"
-
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#~ msgid "Hide deleted"
-#~ msgstr "Verwijderd"
-
-# mail/message-list.c:495

-#~ msgid "Hide Subject"
-#~ msgstr "Onderwerp"
-
-#~ msgid "Hide from Sender"
-#~ msgstr "Filter op Afzender"
-
-# mail/message-list.c:495

-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Onderwerp is %s"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Je hebt geen post bronnen geconfigureerd"
-
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-# mail/folder-browser-factory.c:34

-#~ msgid "Reply-to:"
-#~ msgstr "Antwoord-naar:"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#~ msgid "Server Timeouts"
-#~ msgstr "Server Type: "
-
-# mail/mail-config.c:262

-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Geef de naam en e-mail adres op voor uitgaande mail. Je kan ook de naam van "
-#~ "het het bedrijf oppgeven, en de naam van het bestand waar je signature in "
-#~ "staat."
-
-# mail/mail-config.c:277

-#~ msgid "Full name:"
-#~ msgstr "Volledige naam:"
-
-# mail/mail-config.c:305

-#~ msgid "Email address:"
-#~ msgstr "E-mail adres:"
-
-# mail/mail-config.c:345

-#~ msgid "Signature File"
-#~ msgstr "Signatuur Bestand"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#~ msgid "Server:"
-#~ msgstr "Server:"
-
-# mail/mail-config.c:751 mail/mail-config.c:831

-#~ msgid "Detect supported types..."
-#~ msgstr "Detecteer ondersteunde types..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Verwijder de berichten niet van de server"
-
-# mail/mail-config.c:1220

-#~ msgid "Mail source type:"
-#~ msgstr "Post bron type:"
-
-# mail/mail-config.c:960

-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Selecteer het soort postserver, en de overige benodigde infomatie.\n"
-#~ "\n"
-#~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-#~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:10

-# addressbook/contact-editor/e-contact-editor-strings.h:12

-#~ msgid "News source type:"
-#~ msgstr "Nieuws bron type:"
-
-# mail/mail-config.c:960

-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Selecteer het soort mailserver, en de overige benodigde informatie.\n"
-#~ "\n"
-#~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-#~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
-
-# mail/mail-config.c:1220

-#~ msgid "Mail transport type:"
-#~ msgstr "Mail transport type:"
-
-# mail/mail-config.c:960

-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Selecteer het soort postserver, en de overige benodigde infomatie.\n"
-#~ "\n"
-#~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-#~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
-
-# mail/mail-config.c:1345

-#~ msgid "Add Identity"
-#~ msgstr "Identiteit Toevoegen"
-
-# mail/mail-config.c:1343

-#~ msgid "Edit Identity"
-#~ msgstr "Identiteit Bewerken"
-
-# mail/mail-config.c:1488

-#~ msgid "Edit Source"
-#~ msgstr "Bron Bewerken"
-
-# mail/mail-config.c:1658

-#~ msgid "Add News Server"
-#~ msgstr "Nieuwe Nieuws Server Toevoegen"
-
-# mail/mail-config.c:1656

-#~ msgid "Edit News Server"
-#~ msgstr "Bewerk Nieuws Server"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Bezig met Testen \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "De verbinding was successvol!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Bezig met uitzoeken van aanmeldings mogelijkheden van \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
-
-# mail/mail-config.c:1180

-#~ msgid "Identities"
-#~ msgstr "Identiteiten"
-
-# mail/mail-config.c:1199

-#~ msgid "Mail Sources"
-#~ msgstr "Post Bronnen"
-
-# mail/mail-config.c:1220

-#~ msgid "Mail Transport"
-#~ msgstr "Post Transport"
-
-# mail/mail-config.c:1658

-#~ msgid "News Servers"
-#~ msgstr "Nieuws Servers"
-
-# mail/mail-config.c:1490

-#~ msgid "News Sources"
-#~ msgstr "Nieuws Bronnen"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Stuur berichten in HTML formaat"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr ""
-#~ "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
-
-# calendar/gui/calendar-commands.c:664

-#~ msgid "Open a calendar"
-#~ msgstr "Open een kalender"
-
-# calendar/gui/event-editor.c:1250

-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Controleer Namen"
-
-# addressbook/contact-editor/e-contact-editor.c:862

-# calendar/gui/event-editor.c:1343

-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Help"
-
-# addressbook/contact-editor/e-contact-editor.c:648

-# calendar/gui/event-editor.c:1123

-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Niet complete taak"
-
-# addressbook/contact-editor/e-contact-editor.c:848

-# calendar/gui/event-editor.c:1327

-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Bestand Bijvoegen"
-
-# calendar/gui/event-editor.c:1260

-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "FIXME: _Herhaling..."
-
-# addressbook/contact-editor/e-contact-editor.c:729

-# calendar/gui/event-editor.c:1204

-#~ msgid "FIXME: _Formatting"
-#~ msgstr "FIXME: _Opmaak"
-
-# calendar/gui/event-editor.c:1258

-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nieuwe Afspraak"
-
-#~ msgid "Find _Again"
-#~ msgstr "Opnieuw _Vinden"
-
-# addressbook/gui/component/addressbook.c:424

-#~ msgid "_Find..."
-#~ msgstr "_Vind..."
-
-# addressbook/contact-editor/e-contact-editor.c:1294

-#~ msgid "_Redo"
-#~ msgstr "_Herhalen"
-
-# composer/e-msg-composer.c:463

-#~ msgid "_Replace..."
-#~ msgstr "Ve_rvangen..."
-
-# composer/e-msg-composer.c:948

-#~ msgid "_Undo"
-#~ msgstr "_Ongedaan maken"
-
-# mail/mail-config.c:1490

-#~ msgid "_Source"
-#~ msgstr "_Bron"
-
-# addressbook/contact-editor/categories-strings.h:9

-#~ msgid "Available Categories:"
-#~ msgstr "Beschikbare Categorieën:"
-
-#~ msgid "External Directories"
-#~ msgstr "Externe Directories"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

-#~ msgid "Port Number:"
-#~ msgstr "Poort:"
-
-# calendar/gui/calendar-commands.c:56

-#~ msgid "Outline:"
-#~ msgstr "Buitenlijn:"
-
-# calendar/gui/calendar-commands.c:57

-#~ msgid "Headings:"
-#~ msgstr "Koppen:"
-
-# calendar/gui/calendar-commands.c:58

-#~ msgid "Empty days:"
-#~ msgstr "Lege dagen:"
-
-# calendar/gui/calendar-commands.c:60

-#~ msgid "Highlighted day:"
-#~ msgstr "Gemarkeerde dag:"
-
-# calendar/gui/calendar-commands.c:61

-#~ msgid "Day numbers:"
-#~ msgstr "Dag nummers:"
-
-# calendar/gui/calendar-commands.c:62

-#~ msgid "Current day's number:"
-#~ msgstr "Nummer van vandaag:"
-
-# calendar/gui/calendar-commands.c:63

-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "To-Do item dat nog niet verlopen is:"
-
-# calendar/gui/calendar-commands.c:64

-#~ msgid "To-Do item that is due today:"
-#~ msgstr "To-Do item dat vandaag af moet:"
-
-# calendar/gui/calendar-commands.c:65

-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "To-Do item dat af moest zijn:"
-
-# calendar/gui/getdate.y:395

-#~ msgid "may"
-#~ msgstr "may"
-
-# calendar/gui/getdate.y:400

-#~ msgid "sept"
-#~ msgstr "sept"
-
-# calendar/gui/getdate.y:404

-#~ msgid "sunday"
-#~ msgstr "zondag"
-
-# calendar/gui/getdate.y:405

-#~ msgid "monday"
-#~ msgstr "maandag"
-
-# calendar/gui/getdate.y:406

-#~ msgid "tuesday"
-#~ msgstr "dinsdag"
-
-# calendar/gui/getdate.y:407

-#~ msgid "tues"
-#~ msgstr "di"
-
-# calendar/gui/getdate.y:408

-#~ msgid "wednesday"
-#~ msgstr "woensdag"
-
-# calendar/gui/getdate.y:409

-#~ msgid "wednes"
-#~ msgstr "woe"
-
-# calendar/gui/getdate.y:410

-#~ msgid "thursday"
-#~ msgstr "donderdag"
-
-# calendar/gui/getdate.y:411

-#~ msgid "thur"
-#~ msgstr "do"
-
-# calendar/gui/getdate.y:412

-#~ msgid "thurs"
-#~ msgstr "don"
-
-# calendar/gui/getdate.y:413

-#~ msgid "friday"
-#~ msgstr "vrijdag"
-
-# calendar/gui/getdate.y:414

-#~ msgid "saturday"
-#~ msgstr "zaterdag"
-
-# calendar/gui/getdate.y:422

-#~ msgid "fortnight"
-#~ msgstr "twee weken"
-
-# calendar/gui/getdate.y:427

-#~ msgid "min"
-#~ msgstr "min"
-
-# calendar/gui/getdate.y:429

-#~ msgid "sec"
-#~ msgstr "sec"
-
-# calendar/gui/getdate.y:435

-#~ msgid "tomorrow"
-#~ msgstr "morgen"
-
-# calendar/gui/getdate.y:436

-#~ msgid "yesterday"
-#~ msgstr "gisteren"
-
-# calendar/gui/getdate.y:437

-#~ msgid "today"
-#~ msgstr "vandaag"
-
-# calendar/gui/getdate.y:439

-#~ msgid "last"
-#~ msgstr "afgelopen"
-
-# calendar/gui/getdate.y:440

-#~ msgid "this"
-#~ msgstr "deze"
-
-# calendar/gui/getdate.y:441

-#~ msgid "next"
-#~ msgstr "volgende"
-
-# calendar/gui/getdate.y:442

-#~ msgid "first"
-#~ msgstr "eerste"
-
-# calendar/gui/getdate.y:444

-#~ msgid "third"
-#~ msgstr "derde"
-
-# calendar/gui/getdate.y:445

-#~ msgid "fourth"
-#~ msgstr "vierde"
-
-# calendar/gui/getdate.y:446

-#~ msgid "fifth"
-#~ msgstr "vijfde"
-
-# calendar/gui/getdate.y:447

-#~ msgid "sixth"
-#~ msgstr "zesde"
-
-# calendar/gui/getdate.y:448

-#~ msgid "seventh"
-#~ msgstr "sevende"
-
-# calendar/gui/getdate.y:449

-#~ msgid "eighth"
-#~ msgstr "achtste"
-
-# calendar/gui/getdate.y:450

-#~ msgid "ninth"
-#~ msgstr "negende"
-
-# calendar/gui/getdate.y:451

-#~ msgid "tenth"
-#~ msgstr "tiende"
-
-# calendar/gui/getdate.y:452

-#~ msgid "eleventh"
-#~ msgstr "elfde"
-
-# calendar/gui/getdate.y:453

-#~ msgid "twelfth"
-#~ msgstr "twaalfde"
-
-# calendar/gui/getdate.y:454

-#~ msgid "ago"
-#~ msgstr "geleden"
-
-# calendar/gui/goto.c:82

-#~ msgid "Year:"
-#~ msgstr "Jaar:"
-
-# calendar/gui/goto.c:275

-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Selecteer de datum waar je naar toe wil.\n"
-#~ "Wanneer op je die dag klikt, ga je naar die\n"
-#~ "dag toe."
-
-# mail/mail-config.c:1199

-#~ msgid "Mail Source"
-#~ msgstr "Post Bron"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Stuur een bericht zonder onderwerp"
-
-# mail/folder-browser-factory.c:77

-#~ msgid "Expunge \"%s\""
-#~ msgstr "Legen \"%s\""
-
-# mail/folder-browser-factory.c:41

-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Bezig met Markeren berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Markeer berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#~ msgid "Marking message %d of %d"
-#~ msgstr "Bezig met markeren bericht %d van %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Scan mappen in \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Bezig met bijvoegen berichten uit map \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Voeg berichten van \"%s\" bij"
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Bezig met Doorsturen berichten \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Bezig met doorsturen berichten zonder onderwerp"
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Forward message \"%s\""
-#~ msgstr "Bericht \"%s\" doorsturen"
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Stuur een bericht door zonder onderwerp"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Fout bij genereren mime deel van bericht tijden het genereren van het door "
-#~ "te sturen bericht."
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Bezig met laden \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Laden \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Bezig met Maken \"%s\""
-
-#~ msgid "Create \"%s\""
-#~ msgstr "Maken \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr ""
-#~ "Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
-#~ "component listener'."
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synchronizeren \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Bezig met weergeven UID van bericht \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "Bezig met leegmaken berichtweergave"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Geef UID van bericht \"%s\" weer"
-
-# calendar/gui/prop.c:519

-#~ msgid "Clear message display"
-#~ msgstr "Maak berichtweergave leeg"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Bezig met openen berichten uit map \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Open berichten van \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Bezig met bekijken berichten uit map \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Bekijk berichten uit \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Bezig met opslaan berichten uit map \"%s\""
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Rebuilding message view"
-#~ msgstr "Bezig met herstructureren van bericht weergave"
-
-# composer/e-msg-composer.c:894

-#~ msgid "Rebuild message view"
-#~ msgstr "Herstructureer bericht weergave"
-
-# addressbook/gui/component/addressbook.c:514

-#~ msgid "N_ew Directory Server"
-#~ msgstr "Ni_euwe Directory Server"
-
-# shell/e-shell-view-menu.c:474

-#~ msgid "_Actions"
-#~ msgstr "_Acties"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#~ msgid "_Save Calendar As"
-#~ msgstr "_Bewaar Kalender Als"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "_Mail Configuration"
-#~ msgstr "_Post Configuratie"
-
-# mail/mail-threads.c:814

-#~ msgid "Could not create summary"
-#~ msgstr "Kon samenvatting niet maken"
-
-# shell/e-shell.c:299

-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan bericht niet vergaren: %s"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr ""
-#~ "Kon de naam van de map niet wijzigen van %s naar %s: de map bestaat al"
-
-#~ msgid "Mbox folders may not be nested."
-#~ msgstr "Mbox mappen mogen niet recursief in elkaar worden opgenomen."
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Kon samenvatting %s niet openen"
-
-#~ msgid "Summary mismatch, aborting sync"
-#~ msgstr "Samenvattingen niet gelijk, synchroniseren word afgebroken"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
-
-# shell/e-setup.c:84

-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Kan de gegevens niet naar het uitvoerbestand kopiëren: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kon samenvatting niet aanmaken of laden"
-
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan bericht niet toevoegen aan mh map: %s"
-
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kon de naam van map `%s' niet wijzigen: %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Kon de naam van map `%s' niet wijzigen: %s bestaat al"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "MH mappen mogen niet recursief in elkaar worden opgenomen."
-
-#~ msgid "Local mail directory %s"
-#~ msgstr "Directory voor lokale post %s"
-
-# mail/component-factory.c:196

-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr ""
-#~ "Kan het post \"hash\" opslag gedeelte van Evolution niet initialiseren."
-
-# composer/e-msg-composer.c:906

-#~ msgid "Forward as Attachment"
-#~ msgstr "Bekijk als Bijvoegsel"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Kon de kanaal naar %s niet maken: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Kon %s niet uitvoeren: %s\n"
-
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan %s niet starten: %s"
-
-# addressbook/printing/e-contact-print.glade.h:24

-#~ msgid "Bold"
-#~ msgstr "Vet"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Stelt iets in als vet"
-
-# addressbook/gui/component/alphabet.glade.h:7

-#~ msgid "window2"
-#~ msgstr "venster2"
-
-#~ msgid "does not match regex"
-#~ msgstr "niet gelijk aan reguliere expressie"
-
-# calendar/gui/gncal-todo.c:325

-#~ msgid "Add Optional Fields..."
-#~ msgstr "Optionele Velden Toevoegen..."
-
-# mail/mail-config.c:1345

-#~ msgid "Additional Identity Fields"
-#~ msgstr "Optionele Identiteits Velden"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#~ msgid "Browse..."
-#~ msgstr "Bladeren..."
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Edit Mail Configuration Settings"
-#~ msgstr "Bewerk Post Configuratie Instellingen"
-
-#~ msgid ""
-#~ "Please enter information about your incoming mail server below. If you don't "
-#~ "know what"
-#~ msgstr ""
-#~ "Voer informatie over je inkomende e-mail server in. Als je niet weet wat"
-
-#~ msgid ""
-#~ "Please enter information about your outgoing mail protocol below. If you "
-#~ "don't know "
-#~ msgstr ""
-#~ "Voer informatie omtrent je uitgaand e-mail protocol beneden in. Als je niet "
-#~ "weet "
-
-#~ msgid ""
-#~ "Please enter your name and email address below. The &quot;optional&quot; "
-#~ "fields below do not "
-#~ msgstr ""
-#~ "Voer je naam en e-mail adres beneden in. De &quot;optional&quot; velden "
-#~ "beneden doen niet "
-
-#~ msgid "Preferred type: "
-#~ msgstr "Voorkeurstype:"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#~ msgid "Sending Mail"
-#~ msgstr "Bezig met versturen Post"
-
-#~ msgid ""
-#~ "You are almost done with the mail configuration process. The identity, "
-#~ "incoming"
-#~ msgstr ""
-#~ "Je bent bijna klaar met het post configuratie proces. De indentiteit, "
-#~ "inkomend"
-
-#~ msgid ""
-#~ "Your mail server supports the following types of authentication. Please"
-#~ msgstr ""
-#~ "Je mail server ondersteund de volgende authenticatie typen. Alsjeblieft"
-
-# calendar/gui/calendar-commands.c:659

-#~ msgid "New Ca_lendar"
-#~ msgstr "Nieuwe Ka_lender"
-
-# calendar/gui/calendar-commands.c:682

-#~ msgid "_New appointment..."
-#~ msgstr "_Nieuwe Afspraak..."
-
-#~ msgid "_Open"
-#~ msgstr "_Openen"
-
-# shell/e-shell-view-menu.c:404

-#~ msgid "_Create New Folder..."
-#~ msgstr "Nieu_we map aanmaken..."
-
-# calendar/gui/gncal-todo.c:137

-#~ msgid "Create to-do item"
-#~ msgstr "Maak een To-Do item aan"
-
-# calendar/gui/gncal-todo.c:137

-#~ msgid "Edit to-do item"
-#~ msgstr "Bewerk To-Do item"
-
-# calendar/gui/gncal-todo.c:181

-#~ msgid "Due Date:"
-#~ msgstr "Verloop Datum:"
-
-# calendar/gui/gncal-todo.c:190

-#~ msgid "Priority:"
-#~ msgstr "Prioriteit:"
-
-# calendar/gui/gncal-todo.c:207

-#~ msgid "Item Comments:"
-#~ msgstr "Item Commentaar:"
-
-# calendar/gui/prop.c:330

-#~ msgid "Time display"
-#~ msgstr "Tijd weergave"
-
-# calendar/gui/prop.c:334

-#~ msgid "Time format"
-#~ msgstr "Tijdsformaat"
-
-# calendar/gui/prop.c:335

-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12-uurs (AM/PM)"
-
-# calendar/gui/prop.c:336

-#~ msgid "24-hour"
-#~ msgstr "24-uurs"
-
-# calendar/gui/prop.c:346

-#~ msgid "Weeks start on"
-#~ msgstr "Week begint op"
-
-# calendar/gui/prop.c:358

-#~ msgid "Day range"
-#~ msgstr "Dag bereik"
-
-# calendar/gui/prop.c:369

-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Selecteer de begin en eind uren die je wilt weergeven\n"
-#~ "in het dag en week overzicht. Tijden buiten dit bereik\n"
-#~ "zullen niet automatisch worden weergegeven."
-
-# calendar/gui/prop.c:396

-#~ msgid "Day end:"
-#~ msgstr "Einddag:"
-
-# calendar/gui/prop.c:519

-#~ msgid "Colors for display"
-#~ msgstr "Kleuren voor beeld"
-
-# calendar/gui/prop.c:599

-#~ msgid "Show on TODO List:"
-#~ msgstr "Weergeven op To-Do Lijst:"
-
-# calendar/gui/prop.c:637

-#~ msgid "To Do List style options:"
-#~ msgstr "To-Do lijst stijl opties:"
-
-# calendar/gui/prop.c:642

-#~ msgid "Highlight overdue items"
-#~ msgstr "Markeer items die zijn verlopen"
-
-# calendar/gui/prop.c:645

-#~ msgid "Highlight not yet due items"
-#~ msgstr "Markeer items die nog niet zijn verlopen"
-
-# calendar/gui/prop.c:648

-#~ msgid "Highlight items due today"
-#~ msgstr "Markeer items die vandaag verlopen"
-
-# calendar/gui/prop.c:678

-#~ msgid "To Do List Properties"
-#~ msgstr "To-Do lijst Eigenschappen"
-
-# calendar/gui/prop.c:681

-#~ msgid "To Do List"
-#~ msgstr "To-Do Lijst"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#~ msgid "Preferences"
-#~ msgstr "Instellingen"
-
-# calendar/gui/prop.c:783

-#~ msgid "Alarm Properties"
-#~ msgstr "Alarm Eigenschappen"
-
-# calendar/gui/prop.c:793

-#~ msgid "Beep on display alarms"
-#~ msgstr "Piep bij weergave alarm"
-
-# calendar/gui/prop.c:803

-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Geluid alarm stopt na"
-
-# calendar/gui/prop.c:820

-#~ msgid "Enable snoozing for "
-#~ msgstr "Maak sluimeren mogelijk voor "
-
-#~ msgid "Viewing message sources from folder \"%s\""
-#~ msgstr "Bezig met bekijken bericht bronnen uit map \"%s\""
-
-#~ msgid "View message sources from \"%s\""
-#~ msgstr "Bekijk bericht bronnen uit \"%s\""
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Threading message list"
-#~ msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Thread message list"
-#~ msgstr "Berichtenlijst weergeven met onderlinge relaties"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#~ msgid "Quick Search"
-#~ msgstr "Snel Zoeken"
-
-#~ msgid "Recur on the"
-#~ msgstr "Herhaal op de"
-
-#~ msgid "th day of the month"
-#~ msgstr "de dag van de maand"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Deze afspraak heeft aangepaste herhalings regels die niet kunnen worden "
-#~ "bewerkt door \n"
-#~ "Evolution.\n"
-#~ "\n"
-#~ "Maar, deze afspraak zal zich wel herhalen op de juiste tijd en zal juist "
-#~ "worden \n"
-#~ "weergegeven op de kalender."
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Slechte opslag URL (geen server): %s"
-
-#~ msgid "Custom search"
-#~ msgstr "Aangepast zoeken"
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#~ msgid "Full Search"
-#~ msgstr "Volledige Zoekactie"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Welkom bij de Evolutie Post configuratie wizard!\n"
-#~ "Door het invullen van wat informatie over je email\n"
-#~ "instellingen kun je direct e-mail versturen en ontvangen.\n"
-#~ "Klik op Volgende om verder te gaan."
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX ongelezen)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Geen protocol om URI `%s' te openen"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Open in Nieuw Venster"
-
-# mail/folder-browser-factory.c:37

-#~ msgid "Forward Message"
-#~ msgstr "Bericht Doorsturen"
-
-#~ msgid "Move Message"
-#~ msgstr "Bericht Verplaatsen"
-
-# composer/e-msg-composer.c:1127

-#~ msgid "Copy Message"
-#~ msgstr "Bericht Kopiëren"
-
-#~ msgid "Gpilotd address conduit"
-#~ msgstr "Gpilotd adres kanaal"
-
-#~ msgid "(C) 1998 the Free Software Foundation"
-#~ msgstr "(C) 1998 the Free Software Foundation"
-
-#~ msgid "Address holds %ld address entries"
-#~ msgstr "Address bevat %ld adressen"
-
-#~ msgid "Error while communicating with address server"
-#~ msgstr "Fout bij communiceren met adres server"
-
-# addressbook/contact-editor/e-contact-editor.c:648

-# calendar/gui/event-editor.c:1123

-#~ msgid "FIXME: _New Task"
-#~ msgstr "FIXME: _Nieuwe Taak"
-
-# calendar/gui/event-editor.c:1148

-#~ msgid "FIXME: _Mark Complete"
-#~ msgstr "FIXME: _Markeer Volledig"
-
-# addressbook/contact-editor/e-contact-editor.c:648

-# calendar/gui/event-editor.c:1123

-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "FIXME: Ken Taak Toe"
-
-# addressbook/contact-editor/e-contact-editor.c:862

-# calendar/gui/event-editor.c:1343

-#~ msgid "FIXME: _Reply"
-#~ msgstr "FIXME: Beantwoorden"
-
-# mail/folder-browser-factory.c:35

-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "FIXME: Iedereen beantwoorden"
-
-# calendar/gui/event-editor.c:1325

-#~ msgid "FIXME: Print..."
-#~ msgstr "FIXME: Afdrukken"
-
-# addressbook/contact-editor/e-contact-editor.c:849

-# calendar/gui/event-editor.c:1328

-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Bestand als attachmente invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:761

-# calendar/gui/event-editor.c:1238

-#~ msgid "FIXME: Assign Task..."
-#~ msgstr "FIXME: Ken Taak Toe..."
-
-#~ msgid "Assign the task to someone"
-#~ msgstr "Ken de taak aan iemand toe"
-
-# calendar/gui/event-editor.c:1215

-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "FIXME: Ka_lender..."
-
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#~ msgid "Save and close this appointment"
-#~ msgstr "Deze afspraak opslaan en sluiten"
-
-# calendar/gui/event-editor.c:1334

-#~ msgid "Invite attendees to a meeting"
-#~ msgstr "Nodig gasten uit op een afspraak"
-
-# calendar/gui/gncal-todo.c:171

-#~ msgid "_Summary:"
-#~ msgstr "_Samenvatting:"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days\n"
-#~ msgstr ""
-#~ "Minutes\n"
-#~ "Uren\n"
-#~ "Dagen\n"
-
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

-# calendar/gui/gncal-todo.c:717

-#~ msgid "Daily"
-#~ msgstr "Dagelijks"
-
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#~ msgid "Weekly"
-#~ msgstr "Weekelijks"
-
-# calendar/gui/calendar-commands.c:531

-#~ msgid "Monthly"
-#~ msgstr "Maandelijks"
-
-# calendar/gui/calendar-commands.c:535

-#~ msgid "Yearly"
-#~ msgstr "Jaarlijks"
-
-# addressbook/printing/e-contact-print.glade.h:31

-# addressbook/printing/e-contact-print.glade.h:43

-#~ msgid "label23"
-#~ msgstr "label23"
-
-#~ msgid "Every "
-#~ msgstr "Elke "
-
-# addressbook/printing/e-contact-print.glade.h:31

-# addressbook/printing/e-contact-print.glade.h:43

-#~ msgid "label24"
-#~ msgstr "label24"
-
-#~ msgid ""
-#~ "1st\n"
-#~ "2nd\n"
-#~ "3rd\n"
-#~ "4th\n"
-#~ "5th\n"
-#~ msgstr ""
-#~ "eerste\n"
-#~ "tweede\n"
-#~ "derde\n"
-#~ "vierde\n"
-#~ "vijfde\n"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday\n"
-#~ msgstr ""
-#~ "Maandag\n"
-#~ "Dindag\n"
-#~ "Woensdag\n"
-#~ "Donderdag\n"
-#~ "Vrijdag\n"
-#~ "Zaterdag\n"
-#~ "Zondag\n"
-
-# composer/e-msg-composer-address-dialog.glade.h:18

-#~ msgid "label27"
-#~ msgstr "label27"
-
-#~ msgid "Ending date"
-#~ msgstr "Eind datum"
-
-#~ msgid "Change"
-#~ msgstr "Veranderen"
-
-# composer/e-msg-composer-address-dialog.c:184

-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Knip het geselecteerde item naar het klembord"
-
-# composer/e-msg-composer-address-dialog.c:188

-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopieer het geselecteerde item naar het klembord"
-
-# composer/e-msg-composer-address-dialog.c:528

-#~ msgid "Select recipients' addresses"
-#~ msgstr "Selecteer de geadresseerden"
-
-# composer/e-msg-composer-address-dialog.glade.h:9

-#~ msgid "Search..."
-#~ msgstr "Zoeken..."
-
-# composer/e-msg-composer-address-dialog.glade.h:14

-#~ msgid "To: >>"
-#~ msgstr "Aan: >>"
-
-# composer/e-msg-composer-address-dialog.glade.h:15

-#~ msgid "Cc: >>"
-#~ msgstr "Cc: >>"
-
-# composer/e-msg-composer-address-dialog.glade.h:16

-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc: >>"
-
-# composer/e-msg-composer-address-dialog.glade.h:17

-#~ msgid "label9"
-#~ msgstr "label9"
-
-# composer/e-msg-composer-address-dialog.glade.h:18

-#~ msgid "label7"
-#~ msgstr "label7"
-
-# composer/e-msg-composer-address-dialog.glade.h:19

-#~ msgid "label8"
-#~ msgstr "label8"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Laad een eerder opgeslagen bericht"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#~ msgid "Send _Now"
-#~ msgstr "_Nu Versturen"
-
-#~ msgid "Quit the message composer"
-#~ msgstr "Sluit het bericht venster"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#~ msgid "More criterion"
-#~ msgstr "Meer criteria:"
-
-#~ msgid "Fewer criterion"
-#~ msgstr "Minder criteria"
-
-#~ msgid "Run filter \"%s\""
-#~ msgstr "Start filter \"%s\""
-
-#~ msgid "Could not read pilot's DateBook application block"
-#~ msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
-
-# calendar/gui/calendar-commands.c:175

-#~ msgid "Gnome Calendar"
-#~ msgstr "Gnome Kalender"
-
-# calendar/gui/calendar-commands.c:178

-#~ msgid "The GNOME personal calendar and schedule manager."
-#~ msgstr "Het GNOME persoonlijke kalender en rooster beheer."
-
-# calendar/gui/calendar-commands.c:535

-#~ msgid "Year"
-#~ msgstr "Jaar"
-
-# calendar/gui/calendar-commands.c:535

-#~ msgid "Show 1 year"
-#~ msgstr "Toon 1 jaar"
-
-# calendar/gui/calendar-commands.c:746

-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
-# calendar/gui/calendar-commands.c:746

-#~ msgid "'s calendar"
-#~ msgstr "'s zijn kalender"
-
-# calendar/gui/event-editor.c:1148

-#~ msgid "FIXME: _Delete"
-#~ msgstr "FIXME: Verwij_deren"
-
-# calendar/gui/event-editor.c:1320

-#~ msgid "FIXME: Save and Close"
-#~ msgstr "FIXME: Opslaan en sluiten"
-
-# calendar/gui/event-editor.c:1330

-#~ msgid "FIXME: Recurrence..."
-#~ msgstr "FIXME: Herhaling..."
-
-# calendar/gui/event-editor.c:1331

-#~ msgid "Configure recurrence rules"
-#~ msgstr "Configureer herhalings regels"
-
-# calendar/gui/event-editor.c:1336

-#~ msgid "FIXME: Delete"
-#~ msgstr "FIXME: Verwijderen"
-
-# composer/e-msg-composer-hdrs.c:234

-#~ msgid "S_ubject:"
-#~ msgstr "Onderwerp:"
-
-#~ msgid ""
-#~ "Not Started\n"
-#~ "In Progress\n"
-#~ "Completed\n"
-#~ "Cancelled\n"
-#~ msgstr ""
-#~ "Niet Gestart\n"
-#~ "Onderweg\n"
-#~ "Klaar\n"
-#~ "Afgebroken\n"
-
-#~ msgid ""
-#~ "High\n"
-#~ "Normal\n"
-#~ "Low\n"
-#~ msgstr ""
-#~ "Hoog\n"
-#~ "Normaal\n"
-#~ "Laag\n"
-
-# addressbook/printing/e-contact-print.glade.h:35

-#~ msgid "Resources:"
-#~ msgstr "Bronnen:"
-
-# mail/message-list.c:502

-#~ msgid "Due date"
-#~ msgstr "Verloop Datum"
-
-# addressbook/contact-editor/e-contact-editor.c:671

-# calendar/gui/event-editor.c:1146

-#~ msgid "FIXME: Invite _Attendees..."
-#~ msgstr "FIXME: Nodig _Gasten Uit..."
-
-# calendar/gui/event-editor.c:1263

-#~ msgid "FIXME: C_ancel Invitation..."
-#~ msgstr "FIXME: _Annuleer Uitnodiging..."
-
-# calendar/gui/gncal-todo.c:428

-#~ msgid "Time Left"
-#~ msgstr "Resterende tijd"
-
-# calendar/gui/gncal-todo.c:440

-#~ msgid "To-do list"
-#~ msgstr "To-Do lijst"
-
-# calendar/gui/gncal-todo.c:488

-#~ msgid "Edit..."
-#~ msgstr "Bewerken..."
-
-# calendar/gui/gncal-todo.c:712

-#~ msgid "Weeks"
-#~ msgstr "Weken"
-
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#~ msgid "Hour"
-#~ msgstr "Uur"
-
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#~ msgid "Minute"
-#~ msgstr "Minuut"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#~ msgid "Seconds"
-#~ msgstr "Seconden"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#~ msgid "Second"
-#~ msgstr "Seconde"
-
-# calendar/gui/print.c:868

-#~ msgid "TODO Items"
-#~ msgstr "TODO Items"
-
-# calendar/gui/print.c:1000 calendar/gui/print.c:1014

-# calendar/gui/print.c:1015

-#~ msgid "%a"
-#~ msgstr "%a"
-
-# calendar/gui/print.c:1001 calendar/gui/print.c:1002

-# calendar/gui/print.c:1016 calendar/gui/print.c:1017

-#~ msgid "%b"
-#~ msgstr "%b"
-
-# calendar/gui/print.c:1021

-#~ msgid "Current week (%s %s %d - %s %s %d %d)"
-#~ msgstr "Current week (%s %s %d - %s %s %d %d)"
-
-# calendar/gui/print.c:1027

-#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
-#~ msgstr "Current week (%s %s %d %d - %s %s %d %d)"
-
-# addressbook/printing/e-contact-print.glade.h:28

-#~ msgid "_Format"
-#~ msgstr "_Formaat"
-
-#~ msgid "Less"
-#~ msgstr "Minder"
-
-# mail/folder-browser-factory.c:29

-#~ msgid "Check for new mail"
-#~ msgstr "Controleer op nieuwe mail"
-
-#~ msgid ""
-#~ "You need to configure the mail client\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Je moet het mail programma configuren\n"
-#~ "voordat je mail kunt versturen."
-
-#~ msgid "Bad folder passed to fetch_mail"
-#~ msgstr "Slechte map gepasseerd naar fetch_mail"
-
-#~ msgid "Loading Draftbox"
-#~ msgstr "Bezig met laden Kladvak"
-
-#~ msgid "Load Draftbox"
-#~ msgstr "Laden Kladvak"
-
-#~ msgid "The component now claims that it doesn't support PersistStream!"
-#~ msgstr "Het component claimt nu dat het geen PersistStream ondersteund!"
-
-#~ msgid ""
-#~ "An exception occured while trying to load data into the component with "
-#~ "PersistStream"
-#~ msgstr ""
-#~ "Een uitzondering trad op tijdens het proberen van het laden van het "
-#~ "component\n"
-#~ "in PersistStream"
-
-#~ msgid "The %s component doesn't support PersistStream!\n"
-#~ msgstr "Het %s component ondersteund geen PersistStream!\n"
-
-# composer/e-msg-composer.c:894

-#~ msgid "Open Mime Message"
-#~ msgstr "Open Mime Bericht"
-
-# widgets/e-table/e-table-config.glade.h:7

-#~ msgid "Fields"
-#~ msgstr "Velden"
-
-# widgets/e-table/e-table-config.glade.h:8

-#~ msgid "Grouping"
-#~ msgstr "Groeperen"
-
-# widgets/e-table/e-table-config.glade.h:10

-#~ msgid "Filter"
-#~ msgstr "Filter"
-
-# widgets/e-table/e-table-field-chooser.glade.h:7

-#~ msgid "Field Chooser"
-#~ msgstr "Veld Kiezer"
-
-# widgets/e-table/e-table-field-chooser.glade.h:8

-#~ msgid ""
-#~ "To add a column to your table, drag it into\n"
-#~ "the location in which you want it to appear."
-#~ msgstr ""
-#~ "Om een kolom toe te voegen in de tabel, moet je\n"
-#~ "het slepen naar de plaats waar je de kolum wilt."
-
-# widgets/e-table/e-table-group.glade.h:7

-#~ msgid "window1"
-#~ msgstr "window1"
-
-# widgets/e-table/e-table-group.glade.h:8

-#~ msgid "Available fields"
-#~ msgstr "Beschikbare velden"
-
-# widgets/e-table/e-table-group.glade.h:10

-#~ msgid "Show in this order"
-#~ msgstr "Toon in deze volgorde"
-
-# widgets/e-table/e-table-group.glade.h:11

-#~ msgid "label2"
-#~ msgstr "label2"
-
-# widgets/e-table/e-table-group.glade.h:12

-#~ msgid "Add >>"
-#~ msgstr "Toevoegen >>"
-
-# widgets/e-table/e-table-group.glade.h:13

-#~ msgid "<< Remove"
-#~ msgstr "<< Verwijderen"
-
-#~ msgid "Sort Ascending"
-#~ msgstr "Sorteer Oplopend"
-
-#~ msgid "Sort Descending"
-#~ msgstr "Sorteer Aflopend"
-
-# addressbook/contact-editor/e-contact-editor.c:805

-# calendar/gui/event-editor.c:1279

-#~ msgid "Unsort"
-#~ msgstr "Sortering Opheffen"
-
-#~ msgid "Group By This Field"
-#~ msgstr "Groeperen Op Dit Veld"
-
-# widgets/shortcut-bar/e-group-bar.c:632

-#~ msgid "Group By Box"
-#~ msgstr "Grouperen Per Vak"
-
-# calendar/gui/calendar-commands.c:59

-#~ msgid "Alignment"
-#~ msgstr "Uitlijning:"
-
-#~ msgid "Best Fit"
-#~ msgstr "Meest Passend"
-
-#~ msgid "Format Columns..."
-#~ msgstr "Kolom Opmaak..."
-
-#~ msgid "Customize Current View..."
-#~ msgstr "Huidige Weergave Aanpassen..."
-
-# calendar/gui/calendar-commands.c:687

-#~ msgid "New appointment for _today..."
-#~ msgstr "Nieuwe afspraak voor vandaag..."
-
-# calendar/gui/calendar-commands.c:688

-#~ msgid "Create a new appointment for today"
-#~ msgstr "Maak een nieuwe afspraak voor vandaag"
-
-# composer/e-msg-composer.c:945

-#~ msgid "Cut selected region into the clipboard"
-#~ msgstr "Knip het geselecteerde gebied naar het klembord"
-
-# composer/e-msg-composer.c:946

-#~ msgid "Copy selected region into the clipboard"
-#~ msgstr "Kopieer het geselecteerde gebied naar het klembord"
-
-# composer/e-msg-composer.c:947

-#~ msgid "Paste selected region into the clipboard"
-#~ msgstr "Plak het geselecteerde gebied vanuit het klembord"
-
-# filter/filter-editor.c:209

-#~ msgid "Back"
-#~ msgstr "Terug"
-
-# filter/filter-editor.c:211

-#~ msgid "Finish"
-#~ msgstr "Afmaken"
-
-# filter/filter-editor.c:216

-#~ msgid "Apply"
-#~ msgstr "Toepassen"
-
-# filter/filter-editor.c:233

-#~ msgid ""
-#~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-#~ "continue forwards to customise it.</p>"
-#~ msgstr ""
-#~ "<h2>Cre-eer Filter Regel</h2><p>Selecteer een van de basis-regels hierboven, "
-#~ "en ga dan door om hem aan te passen.</p>"
-
-# mail/folder-browser-factory.c:83

-#~ msgid "_Filter Druid ..."
-#~ msgstr "_Filter Wizard..."
-
-# mail/mail-config.c:777 mail/mail-config.c:853

-#~ msgid "Test these values before continuing"
-#~ msgstr "Controleer deze waarden voordat je doorgaat"
-
-# mail/mail-config.c:978

-#~ msgid "Select the method you would like to use to deliver your mail."
-#~ msgstr "Selecteer de methode die je wil gebruiken om de mail te bezorgen."
-
-# mail/mail-config.c:1600

-#~ msgid "Enter the hostname of the News Server you have."
-#~ msgstr "Geef de hostname van uw News Server."
-
-# mail/mail-threads.c:483

-#~ msgid "Currently pending operations:"
-#~ msgstr "Opdrachten die nog uitgevoerd moeten worden:"
-
-# shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379

-#~ msgid "Composes a new mail message"
-#~ msgstr "Stelt een nieuw bericht op"
-
-# shell/main.c:214

-#~ msgid "Cannot initialize the configuration system."
-#~ msgstr "Kan het configuratie-systeem niet initialiseren."
-
-#~ msgid "Evolution can not create its local folders"
-#~ msgstr "Evolution kan zijn lokale mappen niet maken"
-
-#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
-#~ msgstr "Het spijt ons, Evolution's Map Bladeraar kon niet worden geladen."
-
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "Of een voorbeeld-bericht getoond moet worden"
-
-#~ msgid "Clos_e All Items"
-#~ msgstr "Alle Items _Sluiten"
-
-#~ msgid "Closes all the open items"
-#~ msgstr "Sluit alle geopende items"
-
-#~ msgid "Show _Treeview"
-#~ msgstr "_Boomoverzicht Tonen"
-
-#~ msgid ""
-#~ "This is a development version of Evolution.\n"
-#~ "Using the mail component on your mail files\n"
-#~ "is extremely hazardous.\n"
-#~ "\n"
-#~ "Do not run this program on your real mail\n"
-#~ " and do not give it access to your real mail server.\n"
-#~ "\n"
-#~ "You have been warned\n"
-#~ msgstr ""
-#~ "Dit is een ontwikkel-versie van Evolution.\n"
-#~ "Het gebruik van het email-gedeelte op uw mail bestanden\n"
-#~ "is erg af te raden.\n"
-#~ "\n"
-#~ "Gebruik dit programma niet om uw echte email mee\n"
-#~ "te lezen en geef het geen toegang tot uw echte mail server.\n"
-#~ "\n"
-#~ "U bent gewaarschuwd\n"
-
-#~ msgid "A folder containing mail items"
-#~ msgstr "Een map die de mail items bevat"
-
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "Een map die kalender entries bevat"
-
-#~ msgid "A service containing mail items"
-#~ msgstr "Een dienst die mail items bevat"
-
-#~ msgid "A service containing contacts"
-#~ msgstr "Een dienst die contacten bevat"
-
-#~ msgid "A service containing calendar entries"
-#~ msgstr "Een dienst die kalender entries bevat"
-
-#~ msgid "A service containing tasks"
-#~ msgstr "Een dienst die taken bevat"
-
-#~ msgid "Rename Group"
-#~ msgstr "Naam Wijzigen Groep"
-
-#~ msgid "Advanced Find"
-#~ msgstr "Geavanceerd Zoeken"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Naam Wijzigen Snelkoppeling"
-
-#~ msgid "Tasks list"
-#~ msgstr "Taaklisjt"
-
-#~ msgid "Enables some debugging functions"
-#~ msgstr "Zet wat debugging functies aan"
-
-#~ msgid "LEVEL"
-#~ msgstr "LEVEL"
-
-#~ msgid ""
-#~ "It was not possible to setup the Evolution startup files.  Please\n"
-#~ "fix the problem, and restart Evolution"
-#~ msgstr ""
-#~ "Het was niet mogelijk om de Evolution opstartbestanden de installeren.\n"
-#~ "Repareer het probleem, en start Evolution overnieuw."
diff --git a/po/nn.po b/po/nn.po
deleted file mode 100644
index 018702a5db..0000000000
--- a/po/nn.po
+++ /dev/null
@@ -1,7481 +0,0 @@
-# Norwegian (Nynorsk) KDE translation.
-# Copyright (C) 2000 Gaute Hvoslef Kvalnes.
-# Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-09-07 20:17+02:00\n"
-"Last-Translator: Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>\n"
-"Language-Team: Norwegian (Nynorsk)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Opphavsrett (c), %1 1997-2000"
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Vidaresendt melding"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Hentar data frå %1"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Lukk"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Flytt til mappe"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "GÃ¥ til neste som treng ettersyn"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ikkje vis den overskytande teksten"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Ingen feil."
-
-#: mail/mail-config.c:799
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Sambandet er brote."
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "New"
-msgstr "Ny ..."
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Lagar eit nytt dokument"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-#, fuzzy
-msgid "Card: "
-msgstr "Teikn"
-
-#: addressbook/backend/ebook/e-card.c:3051
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Navn:"
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-#, fuzzy
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "Etterstaving"
-
-#: addressbook/backend/ebook/e-card.c:3070
-#, fuzzy
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "Start-dato:"
-
-#: addressbook/backend/ebook/e-card.c:3081
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-#, fuzzy
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr "ZIP/Postnummer"
-
-#: addressbook/backend/ebook/e-card.c:3089
-#, fuzzy
-msgid ""
-"\n"
-"  Country:     "
-msgstr "Land:"
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "E-post 2"
-
-#: addressbook/backend/ebook/e-card.c:3144
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "E-post 2"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-#, fuzzy
-msgid ""
-"\n"
-"Business Role: "
-msgstr "Firma"
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-#, fuzzy
-msgid ""
-"\n"
-"  Name:  "
-msgstr "Navn:"
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-#, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "Kategoriar"
-
-#: addressbook/backend/ebook/e-card.c:3203
-#, fuzzy
-msgid ""
-"\n"
-"Comment: "
-msgstr "Kommentar:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-#, fuzzy
-msgid ""
-"\n"
-"Public Key: "
-msgstr "Praksis"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronisér"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiér fra pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiér til pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flett fra pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flett til pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-#, fuzzy
-msgid "Original Author:"
-msgstr "Opprinneleg forfattar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution Addressbook Conduit"
-msgstr "Gpilotd adressekomponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-#, fuzzy
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Oppsettfil lasta på nytt."
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-#, fuzzy
-msgid "Synchronize Action"
-msgstr "Synkroniser"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-#, fuzzy
-msgid "Conduit state"
-msgstr "&Lenkjer"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-#, fuzzy
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Kan ikkje kopla til daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-#, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr "Feil under opning av dette dokumentet"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-#, fuzzy
-msgid "Could not start wombat server"
-msgstr "Kunne ikkje starta underprosess."
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-#, fuzzy
-msgid "Could not start wombat"
-msgstr "Kunne ikkje starta %1."
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-#, fuzzy
-msgid "_Add"
-msgstr "Legg til"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-#, fuzzy
-msgid "_Delete"
-msgstr "Slett"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-#, fuzzy
-msgid "Phone Types"
-msgstr "Kjende typar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-#, fuzzy
-msgid "New phone type"
-msgstr "&Ny type"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-#, fuzzy
-msgid "Contact Editor"
-msgstr "Comment=X-redigering"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-#, fuzzy
-msgid "_Full Name..."
-msgstr "Fullt namn"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-#, fuzzy
-msgid "File As:"
-msgstr "Arkiver som"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-#, fuzzy
-msgid "Web page address:"
-msgstr "&WINS-adresse:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-#, fuzzy
-msgid "_Business"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-#, fuzzy
-msgid "_Home"
-msgstr "Heim"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-#, fuzzy
-msgid "Business _Fax"
-msgstr "Firma-fax"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-#, fuzzy
-msgid "_Mobile"
-msgstr "Mobil:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-#, fuzzy
-msgid "Primary Email"
-msgstr "Primær&oppsett"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-#, fuzzy
-msgid "B_usiness"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-#, fuzzy
-msgid "_This is the mailing address"
-msgstr "Rediger e-post-adresser"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "&Innhald ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#, fuzzy
-msgid "Ca_tegories..."
-msgstr "Kategoriar ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#, fuzzy
-msgid "_Job title:"
-msgstr "Jobb-tittel"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-#, fuzzy
-msgid "_Company:"
-msgstr "Firma:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-#, fuzzy
-msgid "_Address..."
-msgstr "Adresse"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Generelt"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-#, fuzzy
-msgid "_Department:"
-msgstr "Avdeling:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-#, fuzzy
-msgid "_Office:"
-msgstr "K&ontor:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-#, fuzzy
-msgid "_Profession:"
-msgstr "&Yrke:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-#, fuzzy
-msgid "_Nickname:"
-msgstr "Kallenamn:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-#, fuzzy
-msgid "_Spouse:"
-msgstr "Ektefelle"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-#, fuzzy
-msgid "_Birthday:"
-msgstr "Fødselsdag:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-#, fuzzy
-msgid "_Assistant's name:"
-msgstr "&Namn på assistent:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-#, fuzzy
-msgid "_Manager's Name:"
-msgstr "Namn på sjef"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-#, fuzzy
-msgid "Anni_versary:"
-msgstr "Merkedag"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-#, fuzzy
-msgid "No_tes:"
-msgstr "Notat:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detaljar"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-#, fuzzy
-msgid "Assistant"
-msgstr "Namn på assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#, fuzzy
-msgid "Business 2"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Firma-fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Ring tilbake"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-#, fuzzy
-msgid "Car"
-msgstr "Teikn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Heim"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#, fuzzy
-msgid "Home 2"
-msgstr "Heim"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Heime-faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobil:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Anna"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Alternativ faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Personsøkjar"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-#, fuzzy
-msgid "Primary"
-msgstr "Privat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-#, fuzzy
-msgid "Radio"
-msgstr "Tilfeldig"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#, fuzzy
-msgid "TTY/TDD"
-msgstr "TTY/TDD-telefon"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-#, fuzzy
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-#, fuzzy
-msgid "Email 3"
-msgstr "E-post 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-#, fuzzy
-msgid "Check Full Name"
-msgstr "Fullt namn"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-#, fuzzy
-msgid "_First:"
-msgstr "Førenamn"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-#, fuzzy
-msgid "_Title:"
-msgstr "Tittel:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-#, fuzzy
-msgid "_Middle:"
-msgstr "Midt på:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-#, fuzzy
-msgid "_Last:"
-msgstr "Etternamn"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-#, fuzzy
-msgid "_Suffix:"
-msgstr "Etterstaving"
-
-#: addressbook/gui/component/addressbook.c:231
-#, fuzzy
-msgid "As _Minicards"
-msgstr "Bruk jokerteikn"
-
-#: addressbook/gui/component/addressbook.c:237
-#, fuzzy
-msgid "As _Table"
-msgstr "Tabell"
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-#, fuzzy
-msgid "Unable to open addressbook"
-msgstr "Kan ikkje opna adresseboka."
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-#, fuzzy
-msgid "Advanced..."
-msgstr "Legg til ..."
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-#, fuzzy
-msgid "Email contains"
-msgstr "Små ikon"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Slett kolonne"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Tenar:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Kan ikkje opna adresseboka."
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Ukjend feil"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Lim inn"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Kjelder"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "time/timar"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Prioritet:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-#, fuzzy
-msgid "Root DN:"
-msgstr "Rot"
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Søk"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Fila finst ikkje\n"
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "KDE adressebok"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "KDE adressebok"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Skildring:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Søk"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-#, fuzzy
-msgid "Save as VCard"
-msgstr "Lagra som"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Namn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-#, fuzzy
-msgid "Organization"
-msgstr "Organisasjon:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "Avdeling:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "K&ontor:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "Tittel:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "&Yrke:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Personsøkjar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "Kallenamn:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "Ektefelle"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Ingen"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-#, fuzzy
-msgid "Save in addressbook"
-msgstr "KDE adressebok"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Tilgjengelege lenkjer:"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-#, fuzzy
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Øydelagd oppsettfil."
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-#, fuzzy
-msgid "Error while communicating with calendar server"
-msgstr "Feil ved tilkopling til tenar."
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-#, fuzzy
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-#, fuzzy
-msgid "Snooze"
-msgstr "Spooler"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Fann ikkje fil"
-
-#: calendar/gui/calendar-commands.c:269
-#, fuzzy
-msgid "Open calendar"
-msgstr "Feil ved opning"
-
-#: calendar/gui/calendar-commands.c:311
-#, fuzzy
-msgid "Save calendar"
-msgstr "Ny kalender"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-#, fuzzy
-msgid "Public"
-msgstr "Praksis"
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:380
-#, fuzzy
-msgid "Confidential"
-msgstr "Eksponentiell"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: calendar/gui/calendar-model.c:471
-#, fuzzy
-msgid "N"
-msgstr "Nr"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:473
-#, fuzzy
-msgid "W"
-msgstr "RW"
-
-#: calendar/gui/calendar-model.c:545
-#, fuzzy
-msgid "Transparent"
-msgstr "Gjennomsiktig "
-
-#: calendar/gui/calendar-model.c:548
-#, fuzzy
-msgid "Opaque"
-msgstr "Opna"
-
-#: calendar/gui/calendar-model.c:774
-#, fuzzy, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr "Ein bandindeks må vera valt i treet."
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-#, fuzzy
-msgid "%H:%M%n"
-msgstr "%H:%M"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-#, fuzzy
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten må vera i området 1-99"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%1 bit %2 %3"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%H:%M"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "Vis"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Avtale"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "Vedlegg"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/control-factory.c:127
-#, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "Viser korleis datoverdiar vert viste."
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-#, fuzzy
-msgid "No summary available."
-msgstr "Ingen bilete tilgjengeleg."
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-#, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-#, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "Rediger oppgåve"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-#, fuzzy
-msgid "No summary"
-msgstr "oppsummering"
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Avtale"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "Oppgåver"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-#, fuzzy
-msgid "Do you want to save changes?"
-msgstr "I ferd med å senda e-post ..."
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "Kategoriar"
-
-#: calendar/gui/e-calendar-table.c:155
-#, fuzzy
-msgid "Classification"
-msgstr "&Forstørring"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "Fullføring"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Slutt-dato"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Start-dato:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Forfallsdato"
-
-#: calendar/gui/e-calendar-table.c:160
-#, fuzzy
-msgid "Geographical Position"
-msgstr "Etikettplassering"
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Prosentformat"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Samandrag"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "Gjennomsiktig "
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Alarms"
-msgstr "Alarm"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Opna ..."
-
-#: calendar/gui/e-calendar-table.c:398
-#, fuzzy
-msgid "Open the task"
-msgstr "Opna med %1"
-
-#: calendar/gui/e-calendar-table.c:400
-#, fuzzy
-msgid "Mark Complete"
-msgstr "Ferdig"
-
-#: calendar/gui/e-calendar-table.c:401
-#, fuzzy
-msgid "Mark the task complete"
-msgstr "Marker alle som l&esne"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Slett"
-
-#: calendar/gui/e-calendar-table.c:404
-#, fuzzy
-msgid "Delete the task"
-msgstr "Slett denne adressa"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-#, fuzzy
-msgid "%d %b"
-msgstr "%1 %2"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-#, fuzzy
-msgid "New appointment..."
-msgstr "&Vis avtale ..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-#, fuzzy
-msgid "Edit this appointment..."
-msgstr "&Endra avtale ..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "&Slett avtale"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-#, fuzzy
-msgid "Make this appointment movable"
-msgstr "Se&nd avtale"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-#, fuzzy
-msgid "Delete this occurrence"
-msgstr "Erstatt denne førekomsten?"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-#, fuzzy
-msgid "Delete all occurrences"
-msgstr "Slettar klassen"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr "Kategoriar"
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/e-tasks.c:297
-#, fuzzy, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden %1 er ikkje støtta."
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-#, fuzzy
-msgid "%d %B"
-msgstr "%1 %2"
-
-#: calendar/gui/event-editor.c:331
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "&Endra avtale ..."
-
-#: calendar/gui/event-editor.c:409
-#, fuzzy
-msgid "on"
-msgstr "MÃ¥n"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dagen"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "MÃ¥ndag"
-
-#: calendar/gui/event-editor.c:436
-#, fuzzy
-msgid "Tuesday"
-msgstr "Tysdag"
-
-#: calendar/gui/event-editor.c:437
-#, fuzzy
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/event-editor.c:438
-#, fuzzy
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/event-editor.c:439
-#, fuzzy
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/event-editor.c:440
-#, fuzzy
-msgid "Saturday"
-msgstr "Laurdag"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Sundag"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "MÃ¥nad"
-
-#: calendar/gui/event-editor.c:568
-#, fuzzy
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "gong(ar)"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-#, fuzzy
-msgid "%a %b %d %Y"
-msgstr "%1 bit %2 %3"
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: calendar/gui/gnome-cal.c:707
-#, fuzzy, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metoden %1 er ikkje støtta."
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sun"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "MÃ¥n"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tys"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lau"
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Su"
-msgstr "Sum"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Mo"
-msgstr "MÃ¥n"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Tu"
-msgstr "Tys"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "We"
-msgstr "Ons"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Th"
-msgstr "Tor"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Fr"
-msgstr "Fre"
-
-#: calendar/gui/print.c:355
-#, fuzzy
-msgid "Sa"
-msgstr "Lau"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Oppgåver"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr ""
-
-#. Month
-#: calendar/gui/print.c:1105
-#, fuzzy
-msgid "Current month (%b %Y)"
-msgstr "Denne månaden"
-
-#. Year
-#: calendar/gui/print.c:1112
-#, fuzzy
-msgid "Current year (%Y)"
-msgstr "Gjeldande: %1"
-
-#: calendar/gui/print.c:1149
-#, fuzzy
-msgid "Print Calendar"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-#, fuzzy
-msgid "Print Preview"
-msgstr "&Førehandsvising ..."
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "Viser korleis datoverdiar vert viste."
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, fuzzy, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-movemail.c:146
-#, fuzzy, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-movemail.c:156
-#, fuzzy, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: camel/camel-movemail.c:197
-#, fuzzy, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-movemail.c:243
-#, fuzzy, c-format
-msgid "Error reading mail file: %s"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
-
-#: camel/camel-movemail.c:254
-#, fuzzy, c-format
-msgid "Error writing mail temp file: %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, fuzzy, c-format
-msgid "Could not create pipe: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-movemail.c:316
-#, fuzzy, c-format
-msgid "Could not fork: %s"
-msgstr "Kunne ikkje starta %1."
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-#, fuzzy
-msgid "(Unknown error)"
-msgstr "Ukjend feil"
-
-#: camel/camel-provider.c:133
-#, fuzzy, c-format
-msgid "Could not load %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, fuzzy, c-format
-msgid "%s server %s"
-msgstr "Diskusjonsgruppetenarar"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Avbroten."
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Feil ved opning"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, fuzzy, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Slett e-post frå tenaren"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Ukjend feil"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, fuzzy, c-format
-msgid "Could not load summary for %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, fuzzy, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "Separate katalogar"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "er ei vanleg fil"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Leitar etter tilleggsmodular"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, fuzzy, c-format
-msgid "Local mail file %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Mottek meldingar frå %1"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "Vidaresendt melding"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, fuzzy, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, fuzzy, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Fila finst ikkje\n"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, fuzzy, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, fuzzy, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr "Mottek meldingar frå %1"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, fuzzy, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, fuzzy, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, fuzzy, c-format
-msgid "`%s' is not a regular file."
-msgstr "er ei vanleg fil"
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, fuzzy, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, fuzzy, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, fuzzy, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, fuzzy, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, fuzzy, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, fuzzy, c-format
-msgid "Unknown error: %s"
-msgstr "Ukjend feil"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Mottek meldingar frå %1"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, fuzzy, c-format
-msgid "Message %s not found."
-msgstr "Fann ikkje fil"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Kunne ikkje starta underprosess."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, fuzzy, c-format
-msgid "No message with uid %s"
-msgstr "Lag meldingar og slå saman"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, fuzzy, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Slett e-post frå tenaren"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, fuzzy, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikkje starta underprosess."
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Ukjend"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#, fuzzy
-msgid "Sendmail"
-msgstr "Send"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, fuzzy, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, fuzzy, c-format
-msgid "Could not send message: %s"
-msgstr "Vidaresendt melding frå %1"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autentisering:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, fuzzy, c-format
-msgid "SMTP server %s"
-msgstr "Diskusjonsgruppetenarar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Ukjend feil"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-#, fuzzy
-msgid "1 byte"
-msgstr "%1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, fuzzy, c-format
-msgid "%u bytes"
-msgstr "%1 byte ="
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, fuzzy, c-format
-msgid "%.1fK"
-msgstr "%1 KB"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, fuzzy, c-format
-msgid "%.1fM"
-msgstr "%1 MB"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, fuzzy, c-format
-msgid "%.1fG"
-msgstr "%1 GB"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-#, fuzzy
-msgid "attachment"
-msgstr "Vedlegg"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#, fuzzy
-msgid "Attach a file"
-msgstr "Legg ved fil"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Fjern"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-#, fuzzy
-msgid "Remove selected items from the attachment list"
-msgstr "Fjern det valte programmet frå lista"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-#, fuzzy
-msgid "Add attachment..."
-msgstr "Vedlegg"
-
-#: composer/e-msg-composer-attachment-bar.c:493
-#, fuzzy
-msgid "Attach a file to the message"
-msgstr "Kunne ikkje lagra melding(ar)."
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "Frå:"
-
-#: composer/e-msg-composer-hdrs.c:257
-#, fuzzy
-msgid "Click here for the address book"
-msgstr "Legg adresse til adresseboka"
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:318
-#, fuzzy
-msgid "Enter the recipients of the message"
-msgstr "Oppgi eit nytt namn på meldinga."
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-#, fuzzy
-msgid "Cc:"
-msgstr "&CC:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:328
-#, fuzzy
-msgid "Bcc:"
-msgstr "&Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:336
-#, fuzzy
-msgid "Enter the subject of the mail"
-msgstr "Oppgi typen til medlemsvariabelen her."
-
-#: composer/e-msg-composer.c:430
-#, fuzzy, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Lagra som ..."
-
-#: composer/e-msg-composer.c:609
-#, fuzzy, c-format
-msgid "Error saving file: %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: composer/e-msg-composer.c:629
-#, fuzzy, c-format
-msgid "Error loading file: %s"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
-
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Lagrar alle endra filer ..."
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Lagrar alle endra filer ..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-#, fuzzy
-msgid "Evolution"
-msgstr "Oppløysing"
-
-#: composer/e-msg-composer.c:758
-#, fuzzy
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Dette er siste trekk.\n"
-"Vil du leggja til fleire trekk?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Opna fil"
-
-#: composer/e-msg-composer.c:909
-#, fuzzy
-msgid "That file does not exist."
-msgstr "Fila finst ikkje\n"
-
-#: composer/e-msg-composer.c:919
-#, fuzzy
-msgid "That is not a regular file."
-msgstr "er ei vanleg fil"
-
-#: composer/e-msg-composer.c:929
-#, fuzzy
-msgid "That file exists but is not readable."
-msgstr "%1 finst, men er inga vanleg fil"
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-#, fuzzy
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr "Det finst ulagra endringar. Er du sikker på at du vil avslutta?"
-
-#: composer/e-msg-composer.c:982
-#, fuzzy
-msgid "An error occurred while reading the file."
-msgstr "Feil ved opning av fil."
-
-#: composer/e-msg-composer.c:1362
-#, fuzzy
-msgid "Compose a message"
-msgstr "Lukk melding"
-
-#: composer/e-msg-composer.c:1439
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "Kan ikkje laga nytt vindauge.\n"
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: filter/filter-datespec.c:62
-#, fuzzy
-msgid "year"
-msgstr "Ã…r"
-
-#: filter/filter-datespec.c:62
-#, fuzzy
-msgid "years"
-msgstr "Ã¥r"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "MÃ¥nad"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "months"
-msgstr "månad(er)"
-
-#: filter/filter-datespec.c:64
-#, fuzzy
-msgid "week"
-msgstr "Veke"
-
-#: filter/filter-datespec.c:64
-#, fuzzy
-msgid "weeks"
-msgstr "Veke"
-
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr " dag"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hour"
-msgstr "time/timar"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hours"
-msgstr "time/timar"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "minute"
-msgstr "minutt"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutt"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-#, fuzzy
-msgid "the current time"
-msgstr "tid no"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-#, fuzzy
-msgid "a time relative to the current time"
-msgstr "Vis hendingane for denne dagen"
-
-#. The label
-#: filter/filter-datespec.c:416
-#, fuzzy
-msgid "Compare against"
-msgstr "Kompilatoråtvaringar"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-#, fuzzy
-msgid "now"
-msgstr "nei"
-
-#: filter/filter-datespec.c:690
-#, fuzzy
-msgid "<click here to select a date>"
-msgstr "Trykk for å velja ein skrifttype"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "Filter-reglar"
-
-#: filter/filter-editor.c:233
-#, fuzzy
-msgid "Edit Filter Rule"
-msgstr "Rediger filterreglar"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-#, fuzzy
-msgid "Edit Filters"
-msgstr "Rediger fil"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-#, fuzzy
-msgid "Then"
-msgstr "Tiaren"
-
-#: filter/filter-filter.c:414
-#, fuzzy
-msgid "Add action"
-msgstr "&Legg til handling"
-
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "Fjern ein kolonne"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-#, fuzzy
-msgid "Select Folder"
-msgstr "Vel mappe"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-#, fuzzy
-msgid "<click here to select a folder>"
-msgstr "Trykk for å velja ein skrifttype"
-
-#: filter/filter-input.c:185
-#, fuzzy, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-#, fuzzy
-msgid "Rule name: "
-msgstr "Filnamn:"
-
-#: filter/filter-rule.c:534
-#, fuzzy
-msgid "Untitled"
-msgstr "Utan tittel"
-
-#: filter/filter-rule.c:550
-#, fuzzy
-msgid "If"
-msgstr "I"
-
-#: filter/filter-rule.c:567
-#, fuzzy
-msgid "Execute actions"
-msgstr "Køyr autorun.sh"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-#, fuzzy
-msgid "Add criterion"
-msgstr "Legg til kriterium"
-
-#: filter/filter-rule.c:593
-#, fuzzy
-msgid "Remove criterion"
-msgstr "Fjern element"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Svar til alle:"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Tilfeldig"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
-
-#: filter/libfilter-i18n.h:5
-#, fuzzy
-msgid "Date received"
-msgstr "Motta"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Date sent"
-msgstr "Dato"
-
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "&Yrke:"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "Flytta alle meldingar til papirkorga"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Melding motteken"
-
-#: filter/libfilter-i18n.h:12
-#, fuzzy
-msgid "Message was received"
-msgstr "Melding motteken"
-
-#: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "Lag meldingar og slå saman"
-
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
-
-#: filter/libfilter-i18n.h:15
-#, fuzzy
-msgid "Recipients"
-msgstr "Nyleg brukte fargar"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Poengsum"
-
-#: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Send"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "Status:"
-
-#: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Kjelder"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "Status:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "Handlingar"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
-
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
-
-#: filter/libfilter-i18n.h:32
-#, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "exists"
-msgstr "Neste"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-#, fuzzy
-msgid "was after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-#, fuzzy
-msgid "Add Rule"
-msgstr "Legg til fil"
-
-#: filter/score-editor.c:166
-#, fuzzy
-msgid "Edit Score Rule"
-msgstr "Rediger filterreglar"
-
-#: filter/vfolder-editor.c:155
-#, fuzzy
-msgid "Add VFolder Rule"
-msgstr "Rediger filterreglar"
-
-#: filter/vfolder-editor.c:204
-#, fuzzy
-msgid "Edit VFolder Rule"
-msgstr "Rediger filterreglar"
-
-#: mail/component-factory.c:284
-#, fuzzy
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Vel mappe"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-#, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
-#, fuzzy
-msgid "VFolder on Subject"
-msgstr "Ingen emne"
-
-#: mail/folder-browser.c:646
-#, fuzzy
-msgid "VFolder on Sender"
-msgstr "Mappenamn:"
-
-#: mail/folder-browser.c:647
-#, fuzzy
-msgid "VFolder on Recipients"
-msgstr "Mappa finst: "
-
-#: mail/folder-browser.c:649
-#, fuzzy
-msgid "Filter on Subject"
-msgstr "Ingen emne"
-
-#: mail/folder-browser.c:650
-#, fuzzy
-msgid "Filter on Sender"
-msgstr "Fil under:"
-
-#: mail/folder-browser.c:651
-#, fuzzy
-msgid "Filter on Recipients"
-msgstr "Skriv ut filer"
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-#, fuzzy
-msgid "Filter on Mailing List"
-msgstr "Fil alt i liste"
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Rediger"
-
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Save As..."
-msgstr "Lagra som ..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/folder-browser.c:663
-#, fuzzy
-msgid "Reply to Sender"
-msgstr "Svar til avsendar:"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-#, fuzzy
-msgid "Reply to All"
-msgstr "Svar til alle:"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Fram"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Fram"
-
-#: mail/folder-browser.c:668
-#, fuzzy
-msgid "Mark as Read"
-msgstr "Mar&ker som ulesen"
-
-#: mail/folder-browser.c:669
-#, fuzzy
-msgid "Mark as Unread"
-msgstr "Mar&ker som ulesen"
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "Flytt til mappe"
-
-#: mail/folder-browser.c:672
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "Flytt til mappe"
-
-#: mail/folder-browser.c:674
-#, fuzzy
-msgid "Undelete"
-msgstr "Slett"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Standard"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "KDeelop-installering"
-
-#: mail/mail-autofilter.c:71
-#, fuzzy, c-format
-msgid "Mail to %s"
-msgstr "Postkasse: %1"
-
-#: mail/mail-autofilter.c:214
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Emne"
-
-#: mail/mail-autofilter.c:230
-#, fuzzy, c-format
-msgid "Mail from %s"
-msgstr "Melding frå %s"
-
-#: mail/mail-autofilter.c:331
-#, fuzzy, c-format
-msgid "%s mailing list"
-msgstr "E-post&liste for språket:"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-#, fuzzy
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr "Meldinga har ingen sendar"
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-callbacks.c:675
-#, fuzzy
-msgid "Move message(s) to"
-msgstr "Flytta alle meldingar til papirkorga"
-
-#: mail/mail-callbacks.c:677
-#, fuzzy
-msgid "Copy message(s) to"
-msgstr "&Kopier bileteplassering"
-
-#: mail/mail-callbacks.c:812
-#, fuzzy
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-#, fuzzy
-msgid "Overwrite file?"
-msgstr "Overskriv filer"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-#, fuzzy
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
-
-#: mail/mail-callbacks.c:893
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Lagra melding"
-
-#: mail/mail-callbacks.c:895
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Lagra melding"
-
-#: mail/mail-callbacks.c:979
-#, fuzzy, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr "Les filinformasjon"
-
-#: mail/mail-callbacks.c:1028
-#, fuzzy
-msgid "Print Message"
-msgstr "Private meldingar"
-
-#: mail/mail-callbacks.c:1075
-#, fuzzy
-msgid "Printing of message failed"
-msgstr "Feil ved skriving av band-ID."
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, fuzzy, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: mail/mail-display.c:131
-#, fuzzy, c-format
-msgid "Could not write data: %s"
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-display.c:229
-#, fuzzy
-msgid "Save Attachment"
-msgstr "Smarte vedlegg"
-
-#: mail/mail-display.c:269
-#, fuzzy, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: mail/mail-display.c:311
-#, fuzzy
-msgid "Save to Disk..."
-msgstr "Lagra til disk"
-
-#: mail/mail-display.c:313
-#, fuzzy, c-format
-msgid "Open in %s..."
-msgstr "Opnar URL ..."
-
-#: mail/mail-display.c:315
-#, fuzzy
-msgid "View Inline"
-msgstr "Vinkel"
-
-#: mail/mail-display.c:342
-#, fuzzy
-msgid "External Viewer"
-msgstr "Hendingsvisar"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Skjul"
-
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "Vedlegg"
-
-#: mail/mail-format.c:626
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Svar"
-
-#: mail/mail-format.c:856
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Endra tidsvising"
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Lagra melding"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr ""
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Lagar ei ny mappe"
-
-#: mail/mail-local.c:327
-#, fuzzy
-msgid "Copying messages"
-msgstr "Melding"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: mail/mail-mt.c:85
-#, fuzzy, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Feil ved laging av fil '%1':\n"
-"%2"
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Flyttar"
-
-#: mail/mail-ops.c:107
-#, fuzzy, c-format
-msgid "Fetching email from %s"
-msgstr "Hentar data frå %1"
-
-#: mail/mail-ops.c:109
-#, fuzzy, c-format
-msgid "Fetch email from %s"
-msgstr "Slett e-post frå tenaren"
-
-#: mail/mail-ops.c:359
-#, fuzzy, c-format
-msgid "There is no new mail at %s."
-msgstr "Det er ikkje band i stasjonen."
-
-#: mail/mail-ops.c:430
-#, fuzzy
-msgid "Filtering email on demand"
-msgstr "Ring ved førespurnad"
-
-#: mail/mail-ops.c:432
-#, fuzzy
-msgid "Filter email on demand"
-msgstr "Ring ved førespurnad"
-
-#: mail/mail-ops.c:563
-#, fuzzy, c-format
-msgid "Sending \"%s\""
-msgstr "Sender %1"
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Sen melding"
-
-#: mail/mail-ops.c:682
-#, fuzzy
-msgid "Sending queue"
-msgstr "&Send meldingane i køen"
-
-#: mail/mail-ops.c:684
-#, fuzzy
-msgid "Send queue"
-msgstr "&Send meldingane i køen"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, fuzzy, c-format
-msgid "Appending \"%s\""
-msgstr "Sender %1"
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-#, fuzzy
-msgid "Appending a message without a subject"
-msgstr "Sender meldingar til %1"
-
-#: mail/mail-ops.c:912
-#, fuzzy, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:914
-#, fuzzy, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:917
-#, fuzzy, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Flytta alle meldingar til papirkorga"
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "Flyttar"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "Kopierer"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, fuzzy, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Leitar etter tilleggsmodular"
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-#, fuzzy
-msgid "(No description)"
-msgstr "Inga skildring"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Leitar etter tilleggsmodular"
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synkroniser"
-
-#: mail/mail-ops.c:1401
-#, fuzzy
-msgid "Expunging folder"
-msgstr "Forventar %1"
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1527
-#, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Les mapper"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Endra mappe"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Melding"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: mail/mail-search-dialogue.c:104
-#, fuzzy
-msgid "Cancel"
-msgstr "Avbroten."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-#, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "<ferdig melding>"
-
-#: mail/mail-threads.c:302
-#, fuzzy, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, fuzzy, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Feil ved laging av fil '%1':\n"
-"%2"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-#, fuzzy
-msgid "Could not create dialog box."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-threads.c:928
-#, fuzzy
-msgid "User cancelled query."
-msgstr ""
-"Brukaren avbraut handling\n"
-"%1"
-
-#: mail/mail-tools.c:189
-#, fuzzy, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, fuzzy, c-format
-msgid "Examining %s"
-msgstr "Forventar %1"
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, fuzzy, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Mottek meldingar frå %1"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, fuzzy, c-format
-msgid "Writing message %d of %d"
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-tools.c:347
-#, fuzzy, c-format
-msgid "Saving changes to %s"
-msgstr "Lagrar alle endra filer ..."
-
-#: mail/mail-tools.c:381
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Vidaresendt melding"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (ingen emne)"
-
-#: mail/mail-tools.c:427
-#, fuzzy, c-format
-msgid "Forwarded message - %s"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-tools.c:429
-#, fuzzy
-msgid "Forwarded message (no subject)"
-msgstr "Vidaresendt melding frå %1"
-
-#: mail/mail-tools.c:530
-#, fuzzy, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: mail/mail-vfolder.c:149
-#, fuzzy
-msgid "VFolders"
-msgstr "Mapper"
-
-#: mail/mail-vfolder.c:298
-#, fuzzy
-msgid "New VFolder"
-msgstr "Ny mappe"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/mail-view.c:138
-#, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "Fann ikkje sendaren av denne meldinga"
-
-#: mail/mail-view.c:141
-#, fuzzy
-msgid "Reply to all recipients of this message"
-msgstr "Fann ikkje sendaren av denne meldinga"
-
-#: mail/mail-view.c:144
-#, fuzzy
-msgid "Forward this message"
-msgstr "Vidaresendt melding"
-
-#: mail/mail-view.c:148
-#, fuzzy
-msgid "Print the selected message"
-msgstr "Sentrer dei valte elementa"
-
-#: mail/mail-view.c:150
-#, fuzzy
-msgid "Delete this message"
-msgstr "Slett denne adressa"
-
-#: mail/message-list.c:599
-#, fuzzy
-msgid "Unseen"
-msgstr "partalssider"
-
-#: mail/message-list.c:602
-#, fuzzy
-msgid "Seen"
-msgstr "Send"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "Ukjend"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%H:%M"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%H:%M"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%H:%M"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%1 bit %2 %3"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "Vedlegg"
-
-#: mail/message-list.c:1110
-msgid "From"
-msgstr "Frå"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Forfallsdato"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Motta"
-
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Til"
-
-#: mail/message-list.c:1111
-msgid "Size"
-msgstr "Storleik"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: mail/openpgp-utils.c:81
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-#, fuzzy
-msgid "No GPG/PGP program available."
-msgstr "Ingen bilete tilgjengeleg."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-#, fuzzy
-msgid "No password provided."
-msgstr "Ingen passord oppgitt."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, fuzzy, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Mapper"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Poengsum"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, fuzzy, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Leitar etter tilleggsmodular"
-
-#: mail/subscribe-dialog.c:293
-#, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/subscribe-dialog.c:297
-#, fuzzy, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Lag ny mappe i %1"
-
-#: mail/subscribe-dialog.c:300
-#, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-#, fuzzy
-msgid "Evolution installation"
-msgstr "KDeelop-installering"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-
-#: shell/e-setup.c:157
-#, fuzzy
-msgid "Could not update files correctly"
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-#, fuzzy
-msgid "Evolution files successfully installed."
-msgstr "Alle filer vart sletta."
-
-#: shell/e-setup.c:189
-#, fuzzy
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-"Dette er første nivå\n"
-"i denne samlinga."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, fuzzy, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
-
-#: shell/e-setup.c:224
-#, fuzzy, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr "kan ikkje opna fila %1"
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, fuzzy, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikkje laga fila\n"
-"\""
-
-#: shell/e-shell-folder-creation-dialog.c:134
-#, fuzzy
-msgid "The specified folder name is not valid."
-msgstr "Arkivfilnamnet er ikkje gyldig.\n"
-
-#: shell/e-shell-folder-creation-dialog.c:225
-#, fuzzy
-msgid "Evolution - Create new folder"
-msgstr "Lagar ei ny mappe"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Ny ..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Utan tittel"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:120
-#, fuzzy
-msgid "Bug buddy could not be run."
-msgstr "Kunne ikkje lagra adresseboka."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Opphavsrett (c), %1 1997-2000"
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-#, fuzzy
-msgid "Go to folder..."
-msgstr "Flytt til mappe"
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Mapper"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evalueringsfeil"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evalueringsfeil"
-
-#: shell/e-shell.c:372
-#, fuzzy, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-#, fuzzy
-msgid "Create new shortcut group"
-msgstr "Endra snarveg for:"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Gruppenamn:"
-
-#: shell/e-shortcuts-view.c:249
-#, fuzzy, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
-
-#: shell/e-shortcuts-view.c:254
-#, fuzzy
-msgid "Don't remove"
-msgstr "fjern"
-
-#: shell/e-shortcuts-view.c:265
-#, fuzzy
-msgid "_Small Icons"
-msgstr "Små ikon"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-#, fuzzy
-msgid "_Large Icons"
-msgstr "Ordna ikon"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-#, fuzzy
-msgid "_New Group..."
-msgstr "Ny gruppe ..."
-
-#: shell/e-shortcuts-view.c:281
-#, fuzzy
-msgid "Create a new shortcut group"
-msgstr "Lagar eit nytt dokument"
-
-#: shell/e-shortcuts-view.c:283
-#, fuzzy
-msgid "_Remove This Group..."
-msgstr "Fjern gruppe"
-
-#: shell/e-shortcuts-view.c:284
-#, fuzzy
-msgid "Remove this shortcut group"
-msgstr "Fjern denne oppføringa"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "&Programsnøggtastar"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktiver"
-
-#: shell/e-shortcuts-view.c:374
-#, fuzzy
-msgid "Activate this shortcut"
-msgstr "&Programsnøggtastar"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-#, fuzzy
-msgid "Error saving shortcuts."
-msgstr "Feil ved lagring av innstillingar."
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "_View"
-msgstr "Vis"
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "View the selected folder"
-msgstr "Slettar den valte fila"
-
-#: shell/e-storage.c:138
-#, fuzzy
-msgid "(No name)"
-msgstr "Ingen namn"
-
-#: shell/e-storage.c:389
-#, fuzzy
-msgid "No error"
-msgstr "Ingen feil."
-
-#: shell/e-storage.c:391
-#, fuzzy
-msgid "Generic error"
-msgstr "Generell feil"
-
-#: shell/e-storage.c:393
-#, fuzzy
-msgid "A folder with the same name already exists"
-msgstr "Ein tabell med det namnet finst alt."
-
-#: shell/e-storage.c:395
-#, fuzzy
-msgid "The specified folder type is not valid"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: shell/e-storage.c:397
-#, fuzzy
-msgid "I/O error"
-msgstr "IU-feil"
-
-#: shell/e-storage.c:399
-#, fuzzy
-msgid "Not enough space to create the folder"
-msgstr "Ikkje nok skip å senda."
-
-#: shell/e-storage.c:401
-#, fuzzy
-msgid "The specified folder was not found"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: shell/e-storage.c:403
-#, fuzzy
-msgid "Function not implemented in this storage"
-msgstr "Kommando ikkje støtta på tenar"
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Nekta tilgang"
-
-#: shell/e-storage.c:407
-#, fuzzy
-msgid "Operation not supported"
-msgstr "Operasjonen vart stoppa"
-
-#: shell/e-storage.c:409
-#, fuzzy
-msgid "The specified type is not supported in this storage"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:132
-#, fuzzy
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan ikkje initialisera adresseboka"
-
-#: shell/main.c:178
-#, fuzzy
-msgid "Disable."
-msgstr "Deaktivert"
-
-#: shell/main.c:198
-#, fuzzy
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kan ikkje initialisera adresseboka"
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "Avtale"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-#, fuzzy
-msgid "FIXME: _Memo Style"
-msgstr "Elementstil"
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Smarte vedlegg"
-
-#: ui/evolution-contact-editor.xml:38
-#, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "Flytt til mappe"
-
-#: ui/evolution-contact-editor.xml:39
-#, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopier til mappe"
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Speloppsett"
-
-#: ui/evolution-contact-editor.xml:42
-#, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "Lim inn spesiell ..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Mar&ker som ulesen"
-
-#: ui/evolution-contact-editor.xml:72
-#, fuzzy
-msgid "_Object"
-msgstr "Objekt"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-#, fuzzy
-msgid "FIXME: _Standard"
-msgstr "Standard"
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "Tekstformatering"
-
-#: ui/evolution-contact-editor.xml:96
-#, fuzzy
-msgid "FIXME: _Customize..."
-msgstr "Tilpass ..."
-
-#: ui/evolution-contact-editor.xml:101
-#, fuzzy
-msgid "Pre_vious"
-msgstr "Førre"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Neste"
-
-#: ui/evolution-contact-editor.xml:104
-#, fuzzy
-msgid "_Toolbars"
-msgstr "Verktøylinjer"
-
-#: ui/evolution-contact-editor.xml:109
-#, fuzzy
-msgid "FIXME: _File..."
-msgstr "Sett inn fil ..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-#, fuzzy
-msgid "FIXME: _Object..."
-msgstr "&Objekt ..."
-
-#: ui/evolution-contact-editor.xml:116
-#, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Skrifttype ..."
-
-#: ui/evolution-contact-editor.xml:117
-#, fuzzy
-msgid "FIXME: _Paragraph..."
-msgstr "&Avsnitt ..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-#, fuzzy
-msgid "FIXME: _Spelling..."
-msgstr "&Stavekontroll ..."
-
-#: ui/evolution-contact-editor.xml:137
-#, fuzzy
-msgid "_Forms"
-msgstr "Forum"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "Se&nd avtale"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "&Stavekontroll ..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "Ny oppgåve"
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "Kopier til mappe"
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "&Stavekontroll ..."
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "Fort framover"
-
-#: ui/evolution-contact-editor.xml:157
-#, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Fort framover"
-
-#: ui/evolution-contact-editor.xml:169
-#, fuzzy
-msgid "_Insert"
-msgstr "Set inn"
-
-#: ui/evolution-contact-editor.xml:170
-#, fuzzy
-msgid "F_ormat"
-msgstr "Format"
-
-#: ui/evolution-contact-editor.xml:171
-#, fuzzy
-msgid "_Tools"
-msgstr "Verktøy"
-
-#: ui/evolution-contact-editor.xml:172
-#, fuzzy
-msgid "Actio_ns"
-msgstr "Handlingar"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Førre"
-
-#: ui/evolution-contact-editor.xml:247
-#, fuzzy
-msgid "Go to the previous item"
-msgstr "GÃ¥ til neste som treng ettersyn"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "Finn neste"
-
-#: ui/evolution-contact-editor.xml:250
-#, fuzzy
-msgid "Go to the next item"
-msgstr "Ikkje vis den overskytande teksten"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Mellombels"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Oppteke"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-#, fuzzy
-msgid "Out of Office"
-msgstr "Kontor"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-#, fuzzy
-msgid "No Information"
-msgstr "Informasjon"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-#, fuzzy
-msgid "_Invite Others..."
-msgstr "Andre ..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-#, fuzzy
-msgid "_Options"
-msgstr "Val"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-#, fuzzy
-msgid "Show _Zoomed Out"
-msgstr "Forminsk"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-#, fuzzy
-msgid "_Update Free/Busy"
-msgstr "Oppdateringsfrekvens"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-#, fuzzy
-msgid "_<<"
-msgstr "<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-#, fuzzy
-msgid "_Autopick"
-msgstr "Automatisk"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-#, fuzzy
-msgid ">_>"
-msgstr ">>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-#, fuzzy
-msgid "_All People and Resources"
-msgstr "Alle filer og katalogar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-#, fuzzy
-msgid "Meeting _start time:"
-msgstr "&Helsingstekst:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-#, fuzzy
-msgid "All Attendees"
-msgstr "Kontaktar"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-#, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr " ..."
-
-#: widgets/misc/e-dateedit.c:407
-#, fuzzy
-msgid "Now"
-msgstr "&No"
-
-#: widgets/misc/e-dateedit.c:413
-#, fuzzy
-msgid "Today"
-msgstr "i dag"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-#, fuzzy
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-#, fuzzy
-msgid "%I:%M %p"
-msgstr "%H:%M"
-
-#: widgets/misc/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "Søk"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, fuzzy, c-format
-msgid "Group %i"
-msgstr "Gruppe %1"
-
-#, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "Slett kolonne"
-
-#, fuzzy
-#~ msgid "Address _2:"
-#~ msgstr "Adresse"
-
-#, fuzzy
-#~ msgid "Check Address"
-#~ msgstr "Alternativ adresse"
-
-#, fuzzy
-#~ msgid "Countr_y:"
-#~ msgstr "Land:"
-
-#, fuzzy
-#~ msgid "_Address:"
-#~ msgstr "Adresse"
-
-#, fuzzy
-#~ msgid "_City:"
-#~ msgstr "Stad:"
-
-#, fuzzy
-#~ msgid "_PO Box:"
-#~ msgstr "Postboks"
-
-#, fuzzy
-#~ msgid "_State/Province:"
-#~ msgstr "Stat/provins"
-
-#, fuzzy
-#~ msgid "_ZIP Code:"
-#~ msgstr "ZIP/Postnummer"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Kjelde:"
-
-#, fuzzy
-#~ msgid "URI"
-#~ msgstr "URL"
-
-#~ msgid "Find..."
-#~ msgstr "Finn ..."
-
-#, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "Melding motteken"
-
-#, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "Merk område"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Vel ei gruppe først."
-
-#, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
-
-#, fuzzy
-#~ msgid "b"
-#~ msgstr "av"
-
-#, fuzzy
-#~ msgid "c"
-#~ msgstr "cm"
-
-#, fuzzy
-#~ msgid "d"
-#~ msgstr "Id"
-
-#, fuzzy
-#~ msgid "g"
-#~ msgstr "gs"
-
-#, fuzzy
-#~ msgid "i"
-#~ msgstr "er"
-
-#, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
-
-#, fuzzy
-#~ msgid "m"
-#~ msgstr "ms"
-
-#, fuzzy
-#~ msgid "n"
-#~ msgstr "PÃ¥"
-
-#, fuzzy
-#~ msgid "o"
-#~ msgstr "Nei"
-
-#, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
-
-#, fuzzy
-#~ msgid "r"
-#~ msgstr "Dr"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#, fuzzy
-#~ msgid "t"
-#~ msgstr "Qt"
-
-#, fuzzy
-#~ msgid "x"
-#~ msgstr "Tx"
-
-#, fuzzy
-#~ msgid "y"
-#~ msgstr "av"
-
-#, fuzzy
-#~ msgid "z"
-#~ msgstr "Hz"
-
-#~ msgid "Body"
-#~ msgstr "Kropp"
-
-#~ msgid "Bottom:"
-#~ msgstr "Botn:"
-
-#, fuzzy
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensjonar"
-
-#~ msgid "Font..."
-#~ msgstr "Skrifttype ..."
-
-#~ msgid "Fonts"
-#~ msgstr "Skrifttypar"
-
-#, fuzzy
-#~ msgid "Footer:"
-#~ msgstr "Botntekst"
-
-#~ msgid "Format"
-#~ msgstr "Format"
-
-#~ msgid "Header"
-#~ msgstr "Dekl."
-
-#, fuzzy
-#~ msgid "Header/Footer"
-#~ msgstr "&Topp-/botntekst ..."
-
-#, fuzzy
-#~ msgid "Headings"
-#~ msgstr "Les"
-
-#, fuzzy
-#~ msgid "Headings for each letter"
-#~ msgstr "Les mapper"
-
-#~ msgid "Height:"
-#~ msgstr "Høgd:"
-
-#, fuzzy
-#~ msgid "Include:"
-#~ msgstr "Inkluder fil"
-
-#~ msgid "Landscape"
-#~ msgstr "Liggjande"
-
-#~ msgid "Left:"
-#~ msgstr "Venstre:"
-
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "&Marg"
-
-#, fuzzy
-#~ msgid "Number of columns:"
-#~ msgstr "Tal på kolonnar:"
-
-#~ msgid "Options"
-#~ msgstr "Val"
-
-#~ msgid "Orientation"
-#~ msgstr "Retning"
-
-#~ msgid "Page"
-#~ msgstr "Side"
-
-#, fuzzy
-#~ msgid "Page Setup:"
-#~ msgstr "Speloppsett"
-
-#~ msgid "Paper"
-#~ msgstr "Papir"
-
-#, fuzzy
-#~ msgid "Paper source:"
-#~ msgstr "Papir&storleik:"
-
-#~ msgid "Portrait"
-#~ msgstr "Ståande"
-
-#~ msgid "Preview:"
-#~ msgstr "Førehandsvising:"
-
-#, fuzzy
-#~ msgid "Print using gray shading"
-#~ msgstr "Skriv med grånyansar"
-
-#, fuzzy
-#~ msgid "Reverse on even pages"
-#~ msgstr "Merk partal-sider"
-
-#~ msgid "Right:"
-#~ msgstr "Høgre:"
-
-#, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Del:"
-
-#, fuzzy
-#~ msgid "Shading"
-#~ msgstr "Lagring"
-
-#~ msgid "Size:"
-#~ msgstr "Storleik:"
-
-#, fuzzy
-#~ msgid "Start on a new page"
-#~ msgstr "Startar nytt spel ..."
-
-#, fuzzy
-#~ msgid "Style name:"
-#~ msgstr "Typenamn:"
-
-#~ msgid "Top:"
-#~ msgstr "Topp:"
-
-#~ msgid "Type:"
-#~ msgstr "Type:"
-
-#~ msgid "Width:"
-#~ msgstr "Breidd:"
-
-#, fuzzy
-#~ msgid "label26"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Kan ikkje initialisera lokale variablar"
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Tilgjengelege lenkjer:"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Øydelagd oppsettfil."
-
-#, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "&Endra avtale ..."
-
-#, fuzzy
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "LÃ¥g grense (minutt):"
-
-#, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "24 hour"
-#~ msgstr "time/timar"
-
-#, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "Innstillingar"
-
-#~ msgid "Colors"
-#~ msgstr "Fargar"
-
-#~ msgid "Defaults"
-#~ msgstr "Standard"
-
-#, fuzzy
-#~ msgid "Display options"
-#~ msgstr "Vis"
-
-#, fuzzy
-#~ msgid "End of day:"
-#~ msgstr "Slutt trekk"
-
-#, fuzzy
-#~ msgid "Highlight"
-#~ msgstr "Opplysing:"
-
-#, fuzzy
-#~ msgid "Items Due Today"
-#~ msgstr "&Opplys syntaks"
-
-#, fuzzy
-#~ msgid "Overdue Items"
-#~ msgstr "&Syntaksmerkingsmodusar"
-
-#, fuzzy
-#~ msgid "Remind me of all appointments"
-#~ msgstr "&Slett avtale"
-
-#, fuzzy
-#~ msgid "Reminders"
-#~ msgstr "PÃ¥minning:"
-
-#, fuzzy
-#~ msgid "Show week numbers"
-#~ msgstr "Vis %1"
-
-#, fuzzy
-#~ msgid "Start of day:"
-#~ msgstr "Start-dato"
-
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "Oppgåve"
-
-#, fuzzy
-#~ msgid "Time Until Due"
-#~ msgstr "Tid og dato"
-
-#, fuzzy
-#~ msgid "Time divisions:"
-#~ msgstr "Dimensjonar"
-
-#, fuzzy
-#~ msgid "Time format:"
-#~ msgstr "Tidsformat:"
-
-#, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarm"
-
-#, fuzzy
-#~ msgid "Work week"
-#~ msgstr "Veke"
-
-#, fuzzy
-#~ msgid "seconds."
-#~ msgstr "sekund"
-
-#, fuzzy
-#~ msgid "% Comp_lete:"
-#~ msgstr "Ferdig"
-
-#, fuzzy
-#~ msgid "C_lassification:"
-#~ msgstr "&Forstørring"
-
-#~ msgid "Completed"
-#~ msgstr "Ferdig"
-
-#, fuzzy
-#~ msgid "Date Completed:"
-#~ msgstr "Ferdig"
-
-#, fuzzy
-#~ msgid "High"
-#~ msgstr "Høgd"
-
-#, fuzzy
-#~ msgid "In Progress"
-#~ msgstr "Framgong:"
-
-#, fuzzy
-#~ msgid "Low"
-#~ msgstr "Senk"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "Starta"
-
-#, fuzzy
-#~ msgid "S_ummary"
-#~ msgstr "Samandrag"
-
-#~ msgid "Task"
-#~ msgstr "Oppgåve"
-
-#, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "&Innhald ..."
-
-#, fuzzy
-#~ msgid "_Due Date:"
-#~ msgstr "Forfallsdato:"
-
-#, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Prioritet:"
-
-#, fuzzy
-#~ msgid "_Status:"
-#~ msgstr "Status:"
-
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Avtale"
-
-#, fuzzy
-#~ msgid "Custom recurrence"
-#~ msgstr "Repetering"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Dag"
-
-#, fuzzy
-#~ msgid "Every"
-#~ msgstr "kvar"
-
-#~ msgid "Exceptions"
-#~ msgstr "Unntak"
-
-#, fuzzy
-#~ msgid "Hours"
-#~ msgstr "time/timar"
-
-#, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "E-post:"
-
-#, fuzzy
-#~ msgid "Minutes"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "MÃ¥ndag"
-
-#, fuzzy
-#~ msgid "No recurrence"
-#~ msgstr "Repetering"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Førehandsvising:"
-
-#, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Privat"
-
-#, fuzzy
-#~ msgid "Pu_blic"
-#~ msgstr "Praksis"
-
-#~ msgid "Recurrence"
-#~ msgstr "Repetering"
-
-#, fuzzy
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regel for repetering"
-
-#, fuzzy
-#~ msgid "Reminder"
-#~ msgstr "PÃ¥minning:"
-
-#, fuzzy
-#~ msgid "Simple recurrence"
-#~ msgstr "Repetering"
-
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "Samandrag:"
-
-#~ msgid "Time"
-#~ msgstr "Tid"
-
-#, fuzzy
-#~ msgid "_Audio"
-#~ msgstr "Lyd"
-
-#, fuzzy
-#~ msgid "_Confidential"
-#~ msgstr "Eksponentiell"
-
-#, fuzzy
-#~ msgid "_End time:"
-#~ msgstr "Slutt-tid:"
-
-#, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "Send"
-
-#, fuzzy
-#~ msgid "_Program"
-#~ msgstr "Program"
-
-#, fuzzy
-#~ msgid "_Run program:"
-#~ msgstr "Terminalprogram:"
-
-#, fuzzy
-#~ msgid "_Start time:"
-#~ msgstr "Start-tid:"
-
-#, fuzzy
-#~ msgid "_Starting date:"
-#~ msgstr "Start-dato"
-
-#~ msgid "day(s)"
-#~ msgstr "dag(ar)"
-
-#, fuzzy
-#~ msgid "event-editor-dialog"
-#~ msgstr "Opnar angrehistoriedialogen"
-
-#, fuzzy
-#~ msgid "for"
-#~ msgstr "Munnar"
-
-#, fuzzy
-#~ msgid "forever"
-#~ msgstr "Repeterer for alltid"
-
-#, fuzzy
-#~ msgid "label21"
-#~ msgstr "Etikett"
-
-#~ msgid "month(s)"
-#~ msgstr "månad(er)"
-
-#, fuzzy
-#~ msgid "until"
-#~ msgstr "utan tittel"
-
-#, fuzzy
-#~ msgid "week(s)"
-#~ msgstr "veke(r) på:"
-
-#~ msgid "year(s)"
-#~ msgstr "Ã¥r"
-
-#, fuzzy
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "April"
-
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "August"
-
-#, fuzzy
-#~ msgid "December"
-#~ msgstr "Desember"
-
-#, fuzzy
-#~ msgid "February"
-#~ msgstr "Februar"
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "GÃ¥ til side"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "GÃ¥ til &i dag"
-
-#, fuzzy
-#~ msgid "January"
-#~ msgstr "Januar"
-
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "Juli"
-
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "Juni"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "Mars"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "MÃ¥ndag"
-
-#, fuzzy
-#~ msgid "November"
-#~ msgstr "November"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "Oktober"
-
-#, fuzzy
-#~ msgid "September"
-#~ msgstr "September"
-
-#, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Vedleggseigenskapar"
-
-#~ msgid "File name:"
-#~ msgstr "Filnamn:"
-
-#, fuzzy
-#~ msgid "MIME type:"
-#~ msgstr "MIME-type"
-
-#, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "Rediger filterreglar"
-
-#, fuzzy
-#~ msgid "Filter Rules"
-#~ msgstr "Filter-reglar"
-
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Oversikt"
-
-#, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "Mapper"
-
-#, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "Kjelder"
-
-#~ msgid "Save"
-#~ msgstr "Lagra"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Skjul"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Slett"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Emne"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Fil under:"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Lagra melding"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Emne"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Kunne ikkje starta %1."
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Format"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "&Ny type"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "ms"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Informasjon"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Vedleggseigenskapar"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Legg til ..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autentisering:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autentisering:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Slett e-post frå tenaren"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-post-adresse:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "E-post-adresse:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Fullt namn"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Brukarnamn:"
-
-#~ msgid "Identity"
-#~ msgstr "Identitet"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "Send"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Små ikon"
-
-#, fuzzy
-#~ msgid "Mail Configuration"
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "Ny ..."
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Val"
-
-#~ msgid "Organization:"
-#~ msgstr "Organisasjon:"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Svar"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Lagra som"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Send"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Tenar:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Tenar:"
-
-#, fuzzy
-#~ msgid "Signature file:"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Signaturfil:"
-
-#~ msgid "Sources"
-#~ msgstr "Kjelder"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "Type:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Informasjon"
-
-#~ msgid "Username:"
-#~ msgstr "Brukarnamn:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minutt"
-
-#, fuzzy
-#~ msgid "Full name:"
-#~ msgstr "Fullt namn"
-
-#~ msgid "Email address:"
-#~ msgstr "E-post-adresse:"
-
-#, fuzzy
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil:"
-
-#~ msgid "Server:"
-#~ msgstr "Tenar:"
-
-#, fuzzy
-#~ msgid "Detect supported types..."
-#~ msgstr "Vel modemtype ..."
-
-#, fuzzy
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Slett e-post frå tenaren"
-
-#, fuzzy
-#~ msgid "Test Settings"
-#~ msgstr "Skriftinnstillingar"
-
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "E-post-&transport:"
-
-#, fuzzy
-#~ msgid "News source type:"
-#~ msgstr "&Ny type"
-
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "E-post-&transport:"
-
-#, fuzzy
-#~ msgid "Add Identity"
-#~ msgstr " Identitet"
-
-#, fuzzy
-#~ msgid "Edit Identity"
-#~ msgstr " Identitet"
-
-#, fuzzy
-#~ msgid "Add Source"
-#~ msgstr "Kjelde:"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Endra teneste"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Legg til tenar"
-
-#, fuzzy
-#~ msgid "Edit News Server"
-#~ msgstr "R&ediger tenarar"
-
-#, fuzzy
-#~ msgid "Testing \"%s\""
-#~ msgstr "Lagar"
-
-#, fuzzy
-#~ msgid "The connection was successful!"
-#~ msgstr "Sambandet er brote."
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#, fuzzy
-#~ msgid "Identities"
-#~ msgstr "Identifikator"
-
-#, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "Kjelder"
-
-#, fuzzy
-#~ msgid "Mail Transport"
-#~ msgstr "&E-post-transport"
-
-#, fuzzy
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Lag meldingar og slå saman"
-
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Diskusjonsgruppetenarar"
-
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Kjelder"
-
-#, fuzzy
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meldingar:"
-
-#, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "Slett kolonne"
-
-#, fuzzy
-#~ msgid "Find"
-#~ msgstr "Finn ..."
-
-#, fuzzy
-#~ msgid "Stop Loading"
-#~ msgstr "Lagring"
-
-#, fuzzy
-#~ msgid "View All"
-#~ msgstr "Vinkel"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "&Innhald ..."
-
-#, fuzzy
-#~ msgid "5 Days"
-#~ msgstr " dag"
-
-#, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Innstillingar"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Innstillingar"
-
-#, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "&Slett avtale"
-
-#, fuzzy
-#~ msgid "Create a new calendar"
-#~ msgstr "Feil ved opning"
-
-#~ msgid "Day"
-#~ msgstr "Dag"
-
-#, fuzzy
-#~ msgid "Go to"
-#~ msgstr "GÃ¥ til side"
-
-#, fuzzy
-#~ msgid "Go to a specific date"
-#~ msgstr "GÃ¥ til side"
-
-#, fuzzy
-#~ msgid "Go to present time"
-#~ msgstr "Ikkje vis den overskytande teksten"
-
-#~ msgid "Month"
-#~ msgstr "MÃ¥nad"
-
-#, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "Feil ved opning"
-
-#, fuzzy
-#~ msgid "Prev"
-#~ msgstr "Førehandsvising:"
-
-#, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "Show 1 day"
-#~ msgstr "Vis dato"
-
-#, fuzzy
-#~ msgid "Show 1 month"
-#~ msgstr "Vis metodar"
-
-#, fuzzy
-#~ msgid "Show 1 week"
-#~ msgstr "Vis %1"
-
-#, fuzzy
-#~ msgid "Show the working week"
-#~ msgstr "Vis hovudvindauget"
-
-#~ msgid "Week"
-#~ msgstr "Veke"
-
-#, fuzzy
-#~ msgid "_New"
-#~ msgstr "Vis"
-
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Feil ved opning"
-
-#, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Lagra som ..."
-
-#, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "Slett denne adressa"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Slett"
-
-#, fuzzy
-#~ msgid "Print this item"
-#~ msgstr "Skriv til fil"
-
-#, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Skriv ut"
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Lagra som ..."
-
-#, fuzzy
-#~ msgid "Save and Close"
-#~ msgstr "Lagra ei fil"
-
-#, fuzzy
-#~ msgid "See online help"
-#~ msgstr "Me er tilkopla!"
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "Fil"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Skriv ut"
-
-#, fuzzy
-#~ msgid "_Save"
-#~ msgstr "Lagra"
-
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Skrifttype ..."
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Teikn"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Klipp ut"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Teikn"
-
-#, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "Slettar den valte fila"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "&Slett avtale"
-
-#~ msgid "Copy"
-#~ msgstr "Kopier"
-
-#~ msgid "Cut"
-#~ msgstr "Klipp ut"
-
-#, fuzzy
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "Adresse&bok ..."
-
-#, fuzzy
-#~ msgid "FIXME: Help"
-#~ msgstr "&KDE-hjelp"
-
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "Sett inn fil ..."
-
-#, fuzzy
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Repetering"
-
-#, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Linjeeigenskapar"
-
-#, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "Neste"
-
-#~ msgid "Paste"
-#~ msgstr "Lim inn"
-
-#, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Limer inn ..."
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "Førre"
-
-#, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Speloppsett"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Eigenskapar ..."
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Tilfeldig"
-
-#, fuzzy
-#~ msgid "Redo the undone action"
-#~ msgstr "Fjern ein kolonne"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Svar"
-
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "tid no"
-
-#, fuzzy
-#~ msgid "Schedule Meeting"
-#~ msgstr "Køyreplan ..."
-
-#, fuzzy
-#~ msgid "Schedule _Meeting"
-#~ msgstr "Køyreplan ..."
-
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Vel mappe"
-
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Vel mappe"
-
-#, fuzzy
-#~ msgid "_About..."
-#~ msgstr "Skrifttype ..."
-
-#, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Lukk"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Kopier"
-
-#, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Rediger"
-
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Finn ..."
-
-#, fuzzy
-#~ msgid "_Help"
-#~ msgstr "Heim"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Lim inn"
-
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Skriv ut"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Eigenskapar ..."
-
-#, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "Tilfeldig"
-
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "Opna ..."
-
-#, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Lukk"
-
-#, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Lukk melding"
-
-#, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "&Kopier bileteplassering"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "Mapper"
-
-#, fuzzy
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Fil under:"
-
-#, fuzzy
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Skriv ut filer"
-
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "Detaljar"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Neste melding"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Vidaresendt melding frå %1"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Sentrer dei valte elementa"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "E-post:"
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Skildring:"
-
-#, fuzzy
-#~ msgid "Mark As U_nread"
-#~ msgstr "Mar&ker som ulesen"
-
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "MÃ¥n"
-
-#, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Lagra side til ascii-fil"
-
-#, fuzzy
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "&Førehandsvising ..."
-
-#, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Private meldingar"
-
-#, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Svar til alle:"
-
-#, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Svar til avsendar:"
-
-#, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Vel mappe"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Vidaresendt melding frå %1"
-
-#, fuzzy
-#~ msgid "Threaded Message list"
-#~ msgstr "Vidaresendt melding frå %1"
-
-#, fuzzy
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Mappenamn:"
-
-#, fuzzy
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "Mappa finst: "
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Kopier til mappe"
-
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Legg til melding"
-
-#, fuzzy
-#~ msgid "_Filter on Subject"
-#~ msgstr "Ingen emne"
-
-#, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Fram"
-
-#, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Oppsett"
-
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Legg til melding"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Flytt til mappe"
-
-#, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "&Opna i eige vindauge"
-
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Private meldingar"
-
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Lagra melding"
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Kjelder"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Slett"
-
-#, fuzzy
-#~ msgid "_VFolder on Subject"
-#~ msgstr "Ingen emne"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Mapper"
-
-#, fuzzy
-#~ msgid "Attach"
-#~ msgstr "&Legg ved"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "tid no"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Lagra melding"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Oppgi eit nytt namn på meldinga."
-
-#, fuzzy
-#~ msgid "Insert text file..."
-#~ msgstr "Sett inn fil ..."
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Opna fil"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Lagra"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Lagrar fil ..."
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Lagrar fil ..."
-
-#, fuzzy
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Sender ei melding til ein nettverksspelar"
-
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Lagra side til ascii-fil"
-
-#~ msgid "Send"
-#~ msgstr "Send"
-
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Send &seinare"
-
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Send &seinare"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Vedlegg som ikon"
-
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "Vedlegg"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Sender meldingar til %1"
-
-#, fuzzy
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "Sett inn fil ..."
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Opna ..."
-
-#, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Avslutt"
-
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evalueringsfeil"
-
-#, fuzzy
-#~ msgid "Getting _Started"
-#~ msgstr "Starta"
-
-#, fuzzy
-#~ msgid "Using the _Calendar"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Oppløysing"
-
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Avtale"
-
-#, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "Comment=X-redigering"
-
-#, fuzzy
-#~ msgid "_Folder"
-#~ msgstr "Mapper"
-
-#, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Flytt til mappe"
-
-#, fuzzy
-#~ msgid "_Index"
-#~ msgstr "Set inn"
-
-#, fuzzy
-#~ msgid "_Settings"
-#~ msgstr "Skriftinnstillingar"
-
-#, fuzzy
-#~ msgid "Available Categories:"
-#~ msgstr "Tilgjengelege kategoriar"
-
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
-#, fuzzy
-#~ msgid "Outline:"
-#~ msgstr "Oversikt"
-
-#, fuzzy
-#~ msgid "Headings:"
-#~ msgstr "Overskrift:"
-
-#, fuzzy
-#~ msgid "Empty days:"
-#~ msgstr " dag"
-
-#, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "Avtale"
-
-#, fuzzy
-#~ msgid "Highlighted day:"
-#~ msgstr "Opplysing:"
-
-#, fuzzy
-#~ msgid "Day numbers:"
-#~ msgstr "Høgste tal"
-
-#, fuzzy
-#~ msgid "Current day's number:"
-#~ msgstr "Noverande namn:"
-
-#, fuzzy
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Element i hugselista:"
-
-#, fuzzy
-#~ msgid "may"
-#~ msgstr "Mai"
-
-#, fuzzy
-#~ msgid "sept"
-#~ msgstr "Nullstill"
-
-#, fuzzy
-#~ msgid "sunday"
-#~ msgstr "Sundag"
-
-#, fuzzy
-#~ msgid "monday"
-#~ msgstr "MÃ¥ndag"
-
-#, fuzzy
-#~ msgid "tuesday"
-#~ msgstr "Tysdag"
-
-#, fuzzy
-#~ msgid "tues"
-#~ msgstr "sann"
-
-#, fuzzy
-#~ msgid "wednesday"
-#~ msgstr "Onsdag"
-
-#, fuzzy
-#~ msgid "wednes"
-#~ msgstr "Sverige"
-
-#, fuzzy
-#~ msgid "thursday"
-#~ msgstr "Torsdag"
-
-#, fuzzy
-#~ msgid "thur"
-#~ msgstr "Anna"
-
-#, fuzzy
-#~ msgid "thurs"
-#~ msgstr "Andre"
-
-#, fuzzy
-#~ msgid "friday"
-#~ msgstr "Fredag"
-
-#, fuzzy
-#~ msgid "saturday"
-#~ msgstr "Laurdag"
-
-#, fuzzy
-#~ msgid "fortnight"
-#~ msgstr "høgre"
-
-#, fuzzy
-#~ msgid "min"
-#~ msgstr " min"
-
-#, fuzzy
-#~ msgid "sec"
-#~ msgstr " sek"
-
-#, fuzzy
-#~ msgid "tomorrow"
-#~ msgstr "Comoros"
-
-#, fuzzy
-#~ msgid "yesterday"
-#~ msgstr "kvar dag"
-
-#~ msgid "today"
-#~ msgstr "i dag"
-
-#, fuzzy
-#~ msgid "last"
-#~ msgstr "Etternamn"
-
-#, fuzzy
-#~ msgid "this"
-#~ msgstr "er"
-
-#, fuzzy
-#~ msgid "next"
-#~ msgstr "Neste"
-
-#, fuzzy
-#~ msgid "first"
-#~ msgstr "Førenamn"
-
-#, fuzzy
-#~ msgid "third"
-#~ msgstr "Anna"
-
-#, fuzzy
-#~ msgid "fourth"
-#~ msgstr "Munnar"
-
-#, fuzzy
-#~ msgid "fifth"
-#~ msgstr "Shift"
-
-#, fuzzy
-#~ msgid "sixth"
-#~ msgstr "Høgre"
-
-#, fuzzy
-#~ msgid "seventh"
-#~ msgstr "partalssider"
-
-#, fuzzy
-#~ msgid "eighth"
-#~ msgstr "høgd"
-
-#, fuzzy
-#~ msgid "ninth"
-#~ msgstr "int"
-
-#, fuzzy
-#~ msgid "tenth"
-#~ msgstr "1 tidel"
-
-#, fuzzy
-#~ msgid "eleventh"
-#~ msgstr "partalssider"
-
-#, fuzzy
-#~ msgid "ago"
-#~ msgstr "Tag"
-
-#~ msgid "Year:"
-#~ msgstr "Ã…r:"
-
-#, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "E-posttenar"
-
-#, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Lagra: %s"
-
-#, fuzzy
-#~ msgid "Send a message without a subject"
-#~ msgstr "Sender ei melding til ein nettverksspelar"
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Markerer meldingar"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Lag meldingar og slå saman"
-
-#, fuzzy
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Markerer meldingar"
-
-#, fuzzy
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Lag ny mappe i %1"
-
-#, fuzzy
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Melding frå %s"
-
-#, fuzzy
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Markerer meldingar"
-
-#, fuzzy
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#, fuzzy
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Vidaresendt melding"
-
-#, fuzzy
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Vidaresendt melding frå %1"
-
-#, fuzzy
-#~ msgid "Loading \"%s\""
-#~ msgstr "Lastar meldingar"
-
-#, fuzzy
-#~ msgid "Load \"%s\""
-#~ msgstr "Last inn"
-
-#, fuzzy
-#~ msgid "Creating \"%s\""
-#~ msgstr "Lagar"
-
-#, fuzzy
-#~ msgid "Create \"%s\""
-#~ msgstr "Laga"
-
-#, fuzzy
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkroniser"
-
-#, fuzzy
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Vis meldingstorleik"
-
-#, fuzzy
-#~ msgid "Clearing message display"
-#~ msgstr "Markerer meldingar"
-
-#, fuzzy
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Vis meldingstorleik"
-
-#, fuzzy
-#~ msgid "Clear message display"
-#~ msgstr "Endra tidsvising"
-
-#, fuzzy
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Melding frå %s"
-
-#, fuzzy
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Melding frå %s"
-
-#, fuzzy
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
-#~ msgid "Rebuilding message view"
-#~ msgstr "Feil ved skriving av band-ID."
-
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Diskusjonsgruppetenarar"
-
-#, fuzzy
-#~ msgid "_Actions"
-#~ msgstr "Handlingar"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "Ny kalender"
-
-#~ msgid "(C) 1998 the Free Software Foundation"
-#~ msgstr "(C) 1998 the Free Software Foundation"
-
-#, fuzzy
-#~ msgid "Could not start addressbook server"
-#~ msgstr ""
-#~ "Kunne ikkje starta prosess\n"
-#~ "%1"
-
-#, fuzzy
-#~ msgid "Error while communicating with address server"
-#~ msgstr "Feil ved tilkopling til tenar."
-
-#, fuzzy
-#~ msgid "_Street Address:"
-#~ msgstr "Gateadresse"
-
-#, fuzzy
-#~ msgid "window2"
-#~ msgstr "Vindauge"
-
-#, fuzzy
-#~ msgid "* Click here to add a contact *"
-#~ msgstr "Trykk her for å leggja til ein ny virtuell vert."
-
-#, fuzzy
-#~ msgid "Could not start gnomecal server"
-#~ msgstr ""
-#~ "Kunne ikkje starta prosess\n"
-#~ "%1"
-
-#, fuzzy
-#~ msgid "Year"
-#~ msgstr "Ã…r"
-
-#, fuzzy
-#~ msgid "Show 1 year"
-#~ msgstr "Vis topptekst"
-
-#, fuzzy
-#~ msgid "FIXME: S_kip Occurrence"
-#~ msgstr "Førekomst"
-
-#, fuzzy
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "Svar til alle:"
-
-#, fuzzy
-#~ msgid "FIXME: Print..."
-#~ msgstr "Skriv &ut ..."
-
-#, fuzzy
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Meldinga har vedlegg"
-
-#, fuzzy
-#~ msgid "Due date"
-#~ msgstr "Forfallsdato"
-
-#, fuzzy
-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "&Slå saman kalender ..."
-
-#, fuzzy
-#~ msgid "_Summary:"
-#~ msgstr "Samandrag:"
-
-#~ msgid "Daily"
-#~ msgstr "Dagleg"
-
-#~ msgid "Weekly"
-#~ msgstr "Kvar veke"
-
-#~ msgid "Monthly"
-#~ msgstr "Kvar månad"
-
-#~ msgid "Yearly"
-#~ msgstr "Kvart år"
-
-#, fuzzy
-#~ msgid "label23"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "Every "
-#~ msgstr "kvar"
-
-#, fuzzy
-#~ msgid "label24"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "label25"
-#~ msgstr "Etikett"
-
-#~ msgid "Recur on the"
-#~ msgstr "Repeter på den"
-
-#, fuzzy
-#~ msgid "th day of the month"
-#~ msgstr "Dagar i månaden"
-
-#, fuzzy
-#~ msgid "label27"
-#~ msgstr "Nivå 27"
-
-#, fuzzy
-#~ msgid "Ending date"
-#~ msgstr "Ingen slutt-dato"
-
-#~ msgid "Change"
-#~ msgstr "Endra"
-
-#, fuzzy
-#~ msgid "Create to-do item"
-#~ msgstr "Lag mappe"
-
-#, fuzzy
-#~ msgid "Edit to-do item"
-#~ msgstr "Rediger punkt"
-
-#~ msgid "Due Date:"
-#~ msgstr "Forfallsdato:"
-
-#, fuzzy
-#~ msgid "Time display"
-#~ msgstr "Endra tidsvising"
-
-#, fuzzy
-#~ msgid "Weeks start on"
-#~ msgstr " start"
-
-#, fuzzy
-#~ msgid "Day range"
-#~ msgstr "Dato-område"
-
-#, fuzzy
-#~ msgid "Day start:"
-#~ msgstr " start"
-
-#, fuzzy
-#~ msgid "Day end:"
-#~ msgstr "Dag:"
-
-#, fuzzy
-#~ msgid "Colors for display"
-#~ msgstr "Farge eller pixmap"
-
-#, fuzzy
-#~ msgid "Show on TODO List:"
-#~ msgstr "Vis lang gruppeliste"
-
-#, fuzzy
-#~ msgid "Highlight not yet due items"
-#~ msgstr "&Syntaksmerkingsmodusar"
-
-#, fuzzy
-#~ msgid "To Do List"
-#~ msgstr "Hugseliste"
-
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "Rammeeigenskapar ..."
-
-#, fuzzy
-#~ msgid " seconds"
-#~ msgstr "sekund"
-
-#, fuzzy
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Kopierer utvalet til utklippstavla"
-
-#, fuzzy
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopierer utvalet til utklippstavla"
-
-#, fuzzy
-#~ msgid "Select recipients' addresses"
-#~ msgstr "Slett denne adressa"
-
-#~ msgid "Search..."
-#~ msgstr "Søk ..."
-
-#, fuzzy
-#~ msgid "To: >>"
-#~ msgstr "Til:"
-
-#, fuzzy
-#~ msgid "Cc: >>"
-#~ msgstr "Cc:"
-
-#, fuzzy
-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc:"
-
-#, fuzzy
-#~ msgid "label9"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "label7"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "label8"
-#~ msgstr "Etikett"
-
-#, fuzzy
-#~ msgid "Load a previously saved message"
-#~ msgstr "Førre melding"
-
-#, fuzzy
-#~ msgid "_Save..."
-#~ msgstr "Lagra ..."
-
-#, fuzzy
-#~ msgid "Send _Now"
-#~ msgstr "Send &no"
-
-#, fuzzy
-#~ msgid "_Close..."
-#~ msgstr "Fargar ..."
-
-#, fuzzy
-#~ msgid "Quit the message composer"
-#~ msgstr "Comment=E-postredigering"
-
-#, fuzzy
-#~ msgid "Run filter \"%s\""
-#~ msgstr "Inga slik fil \"%s\"!"
-
-#, fuzzy
-#~ msgid "Forward Message"
-#~ msgstr "Vidaresendt melding"
diff --git a/po/no.po b/po/no.po
deleted file mode 100644
index 3c1a64034b..0000000000
--- a/po/no.po
+++ /dev/null
@@ -1,9351 +0,0 @@
-# Norwegian (bokmål) translation of evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-02-13 01:13+0100\n"
-"PO-Revision-Date: 2001-02-13 01:16+01:00\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian <no@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Navn:"
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"Prefiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"Oppgitt:     "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"Tillegg: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"Familie:    "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"Suffiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Fødselsdato: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"Postboks:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"Linje:         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"Gate:     "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"By:          "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"Region:     "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"Postnummer: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"Land:    "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveringsetikett: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoner:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"E-post program: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidssone: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografisk lokasjon: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Stilling: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"Navn:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"Enhet:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"Enhet2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"Enhet3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"Enhet4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorier: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik streng: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Offentlig nøkkel: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-#, fuzzy
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-#, fuzzy
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Slått av"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronisér"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiér fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiér til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flett fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flett til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevar <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Opprinnelig forfatter:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions adressebok-komponent.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkroniseringshandling"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Komponent-tilstand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen pilot er konfigurert, vennligst\n"
-"velg cappleten 'Egenskaper for pilot link' først."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ikke tilkoblet gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"En feil oppsto under forsøk på å hente\n"
-"pilot-listen fra gnome-pilot daemonen"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Markøren kunne ikke lokaliseres\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook ikke lastet\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Kunne ikke starte wombat tjener"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Kunne ikke starte wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Konfigurér oppgavelisten"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Oppgaver"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Br_yllupsdag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "A_rbeid"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Faks på arbeid"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegorier..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Kontaktredigering"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detaljer"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Lagre som:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Generelt"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Ny telefontype"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "No_tater:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Telefontyper"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Primær e-post"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Vil motta _HTML e-post"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Hjemmeside-adresse:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Legg til"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresse..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Assistents navn"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Fø_dselsdag:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "Ar_beid"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Slett"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "Av_deling:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr ":Fullt navn..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Hjemme"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "_Jobbtittel:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "_Leders navn:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Kalle_navn:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Kont_or:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Yrke:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "Ekte_felle:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "De_tte er postadressen"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Arbeid"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Arbeid 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Faks på arbeid"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Tilbakering"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Hjemme 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Annet"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Personsøker"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Primær"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Sjekk adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Lan_d:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Sjekk fullt navn:"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Frk"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Hr."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Fru"
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Frk."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Fornavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Etternavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Mellomnavn:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Suffiks:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Tittel:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Som _tabell"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Skriv inn passord for %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åpne adresseboken"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Kunne ikke åpne denne adresseboken. Dette beyr at du\n"
-"har skrevet inn en ugyldig URI, eller at du har forsøkt\n"
-"å aksessere en LDAP-tjener og ikke har støtte for LDAP\n"
-"kompilert inn. Hvis du skrev inn en URI, vær vennlig\n"
-"og sjekk om denne er korrekt, og skriv den inn på nytt.\n"
-"Hvis ikke har du sannsynligvis forsøkt å bruke en LDAP-\n"
-"tjener. Hvis du ønsker å bruke LDAP må du laste ned og\n"
-"installere OpenLDAP, deretter må du kompilere og\n"
-"installere Evolution på nytt.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Vis alle"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avansert..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Et felt inneholder"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Navn inneholder"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "E-post inneholder"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "URIen som mappeutforskeren vil vise"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Ukjent type adressebok"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonym modus)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:248
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Passord"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Ukjent autentiseringstype"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Undertre"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Ukjent type område"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Husk dette passordet"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Vert:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Rot DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Søkeområde:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "Hjelp for stier her?"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Opprett sti hvis den ikke eksisterer."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Redigér adressebok"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Legg til adressebok"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Slett"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Redigér"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontroll som viser et minikort for Evolutions adressebok."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebok minikort visning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for håndtering av kontakter."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory for minikort kontroll for adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Factory for Evolution adressebok-komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory for eksempelkontroll for adressebok"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory for adressebokens grensesnitt for navnevalg"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Finn..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Meldingsmottakere:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Velg navn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Velg navn fra:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Søk"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Lagre som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Klikk her for å legge til en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Nettside"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Avdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Tittel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Ektefelle"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Fri-ledig URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Klikk her for å legge til en kontakt"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Lagre i adressebok"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen\n"
-"\n"
-"Dobbelklikk her for å opprette en ny kontakt."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blanke skjema på slutten:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Kropp"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bunn:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Skrifttype..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Bunntekst:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Topptekst"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Topp-/bunntekst"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Topptekster"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Topptekst for hver bokstav"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Høyde:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Rett etter hverandre"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inkluder:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landskap"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Bokstavfaner på siden"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marger"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Antall kolonner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativer"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Sideoppsett"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papirkilde:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portrett"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Forhåndsvis:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Skriv ut med gråtoner"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Motsatt på like sider"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Høyre:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Seksjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Skyggelegging"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start på en ny side"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilnavn:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Topp:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredde:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etikett26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Feil under kommunikasjon med kalendertjeneren"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Konfigurér GnomeCal-komponent"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Konfigurér oppgavelistekomponenten"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Oppgaver"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution oppgaveliste-komponent"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Utsett"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:248
-msgid "File not found"
-msgstr "Fil ikke funnet"
-
-#: calendar/gui/calendar-commands.c:272
-msgid "Open calendar"
-msgstr "Åpne kalender"
-
-#: calendar/gui/calendar-commands.c:314
-msgid "Save calendar"
-msgstr "Lagre kalender"
-
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
-"konfigurasjon."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d.%m.%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d.%m.%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d.%m.%Y %H:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Public"
-msgstr "Offentlig"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:385
-msgid "Confidential"
-msgstr "Konfidensiell"
-
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: calendar/gui/calendar-model.c:476
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:476
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:478
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/calendar-model.c:478
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Transparent"
-msgstr "Gjennomsiktig"
-
-#: calendar/gui/calendar-model.c:553
-msgid "Opaque"
-msgstr "Ugjennomsiktig"
-
-#: calendar/gui/calendar-model.c:779
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datoen må skrives inn på formatet: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:898
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:901
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:905
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1028
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske posisjonen må skrives inn på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1068
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
-
-#: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten må være mellom 0 og 9, inklusive"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Feil under lasting av kalender</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Vis"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Vis avtaler"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Vis oppgaver"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Laster kalender"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm på %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Melding om din avtale på %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Ingen sammendrag tilgjengelig."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Lukk"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Rediger avtale:"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Utsett-tid (minutter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "5 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Tidsavbrudd for alarm etter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip når alarmvinduet kommer til syne."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Brukervalg for kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Komprimér helger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis alternativer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Slå på utsetting for "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Første dag i uken:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markér"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Oppføringer som går ut idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Oppføringer som går ut i dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Oppføringer som ikke har gått ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Oppføringer som ikke har gått ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Man"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Mandag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Utgåtte oppføringer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Utgåtte oppføringer:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Velg en farge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Påminnelse om alle avtaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Påminnelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "Lør"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Lørdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Vis tid for avtalers slutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Vis ukenummer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagen starter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Søn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Søndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Oppgaveblokk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid før den går ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Oppdeling av tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Tir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbeidsuke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutter i forveien."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "sekunder"
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil slette avtalen `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil slette oppgaven `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil slette journaloppføringen `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringene?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ferdi_g:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Avbrutt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Klassifisering"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Fullført"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Dato & klokke"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Fullført dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Høy"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Under arbeid"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Lav"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fremgang"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "Of_fentlig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Oppgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Udefinert"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Fer_dig-dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Redigér oppgave"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journaloppføring - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategorier"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Fullført dato"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Startdato"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografisk plassering"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Prosent fullført"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Gjennomsiktighet"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmer"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Klikk her for å legge til en oppgave"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Merk som fullført"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Merk oppgaven som fullført"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Redigér denne oppgaven..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Redigér oppgaven"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Slett denne oppgaven"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Slett oppgaven"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters oppdeling"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Ny avtale..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Sett opp møte"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Redigér denne avtalen..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Slett denne avtalen"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Gjør denne avtalen flyttbar"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Slett denne oppføringen"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Slett alle oppføringer"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kunne ikke oppdatere din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Oppdatering av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Det oppsto en feil under lasting av kalenderfilen."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kunne ikke åpne din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kunne ikke laste din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke lese din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra noen som ikke er invitert!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke oppdatere ditt kalenderlager."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Sletting av komponent fullført."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Legg til i kalenderen"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Akseptér"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Avslå"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Oppdatér kalender"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Alys møte"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--til--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Kalendermelding"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Dato:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Laster kalender..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Avsender"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sammendrag:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "slutt-dato"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "start-dato"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Deltakers adresse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Deltakere: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Avlys\n"
-"møte"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Møteinvitasjoner"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ikke-deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Valgfri deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organisator: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publiser\n"
-"hendelse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Forespør\n"
-"møte"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr ""
-"Obligatorisk\n"
-"deltaker"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rolle"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Sett av\n"
-"tid"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1157
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Alle"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikke laste oppgavene i `%s'"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Avtale"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Grunnleggende om avtaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Egendefinert gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Unntak"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Endre"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ingen gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Spill en lyd"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Forhåndsvis"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regel for gjenintreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Påminnelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Kjør et program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Send en melding"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Innstillinger..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Vis en dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Enkel gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lutt-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "etter"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "før"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dag(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "slutt på avtale"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "for"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "for alltid"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "time(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etikett21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "etikett55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minutt(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "måned(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "start på avtale"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "til"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "uke(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "år"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "på"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "gjentakelser"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d dager"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 dag"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d uker"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 uke"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d timer"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 time"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutter"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minutt"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d  sekunder"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " før avtalen starter"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " etter avtalens start"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " før avtalens slutt"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " etter avtalens slutt"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution komponent for kalendersammendrag."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponent for håndtering av kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory for kalenderens sammendragskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory for Evolution kalender-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory for kalenderens iTip visningskontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Factory for eksempelkontroll for kalender"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kunne ikke åpne mappen i `%s'"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Desember"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Gå til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Gå til idag"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Januar"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juli"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juni"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Mars"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mai"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Oktober"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikke initiere GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Søn"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Man"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Tir"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Ons"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Tor"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Fre"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Lør"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Oppgaver"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "I dag (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Denne uken (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Denne måneden (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Dette året (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Skriv ut kalender"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Forhåndsvisning av utskrift"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URIen til oppgavemappen skal vises"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Feil under lesing av filter: %s: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Feil under kjøring av filter: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Feil under lagring av filtersøk: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan ikke tolke uttrykket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Feil under kjøring av søkeuttrykket %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(treff-alle) krever et enkelt bolsk resultat"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Utfører spørring på ukjent header: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ugyldig type i kropp-inneholder, forventer streng"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikke opprette låsfil for %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Feil under låsing ved bruk av fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Feil under låsing ved bruk av flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Kunne ikke sjekke e-post fil %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Kunne ikke åpne postfil %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Kunne ikke åpne midlertidig postfil %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunne ikke sjekke låsfil for %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Feil under lesing av postfil: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Feil under skriving av midlertidig fil: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Kunne ikke opprette rør: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Kunne ikke kjøre fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail-programmet feilet: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Ukjent feil)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Kunne ikke laste %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s-tjener %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-tjeneste for %s på %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(ukjent vert)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Opreasjon avbrutt"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' må inneholde et brukernavn"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' må inneholde et vertsnavn"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' må inneholde en sti"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Ingen vert %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Midlertidig ute av stand til å slå opp vertsnavn %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
-
-#: camel/camel-session.c:394
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Kan ikke opprette katalog %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-streng `%s' inneholder ikke protokoll"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnummer i URL `%s' er ikke-numerisk"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Fikk ikke Kerberos \"ticket\":\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Ugyldig svar på autentisering fra tjener."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-kommando feilet: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Svar fra tjener ble avsluttet for tidlig."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Kunne ikke laste sammendrag for %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "For lesing og lagring av e-post på IMAP-tjenere."
-
-#: camel/providers/imap/camel-imap-store.c:250
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et "
-"klartekst-passord."
-
-#: camel/providers/imap/camel-imap-store.c:259
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Dette lar deg koble til IMAP-tjeneren ved å bruke Kerberos 4 som "
-"autentisering."
-
-#: camel/providers/imap/camel-imap-store.c:367
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:395
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Kunne ikke autentisere mot IMAP-tjener.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:672
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kan ikke opprette katalog %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "E-postkataloger i MH-format"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger "
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standard Unix postboksfil"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "For lagring av lokal e-post i standard mbox format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail e-post filer i maildir-format"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "For lagring av lokal e-post i qmail meldingskataloger"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Lagerrot %s er ikke en absolutt sti"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Lagerrot %s er ikke en vanlig katalog"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Finner ikke mappe: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Lokalt lager har ikke en innboks"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokal e-post-fil %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
-
-#: camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:290
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente melding: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ingen slik melding"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Ugyldig meldingsinnhold"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke åpne mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Mappen `%s' eksisterer ikke."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke opprette mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' er ikke en maildir katalog."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunne ikke slette mappe `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "ikke en maildir katalog"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan ikke åpne postboks: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente melding: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Oppbygging av melding feilet: Korrupt postboks?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke åpne fil `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke opprette fil `%s'\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' er ikke en vanlig fil."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappen `%s'\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "MAppen `%s' er ikke tom. Ikke slettet."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Lager sammendrag for mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunne ikke åpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1346
-msgid "Synchronising folder"
-msgstr "Synkroniserer mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kan ikke åpne mappe for å lage sammendrag: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Kan ikke åpne midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Feil under skriving til midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Skriving til midlertidig postboks feilet: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kunne ikke lukke kildemappe %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Kunne ikke lukke midlertidig mappe: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kunne ikke endre navn på mappe: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Ukjent feil: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' er ikke en katalog."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Tjeneren godtok ikke brukernavn"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Feil under sending av brukernavn til tjener"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Tjeneren godtok ikke brukernavn/passord"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Melding %s ikke funnet"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppeliste fra tjeneren."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Kunne ikke laste gruppelistefil for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET news"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Dette er en tilbyder for lesing av og posting av innlegg til USENET "
-"nyhetsgrupper."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Kunne ikke åpne katalog for news-tjener: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET News via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
-"passord."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Kunne ikke åpne eller opprette .newsrc-fil for %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Henter POP-sammendrag"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kunne ikke åpne mappe: meldingslisten var ikke komplett."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Ingen melding med uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Henter POP-melding %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kunne ikke hente melding fra POP-tjener %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"For tilkobling til POP-tjenere. POP-protokollen kan også brukes for å hente "
-"e-post fra enkelte e-posttilbydere via web i tillegg til proprietære "
-"e-postsystemer."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Dette alternativet lar deg koble til POP-tjeneren ved bruk av passord i "
-"klartekst. Dette er det eneste alternativet som er støttet av mange "
-"POP-tjenere."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Dette alternativet lar deg koble til POP-tjenere ved bruk av krypterte "
-"passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
-"selv på tjenere som hevder å støtte det."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Dette lar deg koble til POP-tjeneren ved å bruke Kerberos 4 som "
-"autentisering."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kunne ikke koble til POP-tjener på %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Kunne ikke koble til POP-tjener.\n"
-"Feil under oversending av brukernavn: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Ukjent)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Kunne ikke koble til POP-tjeneren.\n"
-"Ingen støtte for forespurt autentiseringsmekanisme."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Kunne ikke koble til POP-tjener.\n"
-"Feil ved oversending av passord: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Ingen slik mappe `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"For levering av e-post ved å videresende den til \"sendmail\"-programmet på "
-"det lokale systemet."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Kunne ikke opprette rør til sendmail: %s: melding ikke sendt"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Kunne ikke kjøre fork på sendmail: %s: melding ikke sendt"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Kunne ikke sende meldingen: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail avsluttet med signal %s: melding ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Kunne ikke kjøre %s: melding ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail avsluttet med status %d: melding ikke sendt."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Levering av e-post via sendmail programmet"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Syntaksfeil, kommando ikke gjenkjent"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntaksfeil i parametere eller argumenter"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Kommando ikke implementert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Kommandoparameter ikke implementert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Systemstatus, eller svar på systemhjelp"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Hjelp-melding"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Tjeneste klar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Tjenesten lukker sendekanalen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Forespurt e-post handling er ok, fullført"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Ikke lokal bruker; videresender til <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Forespurt e-post handling er ikke utført: postboks ikke tilgjengelig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Forespurt handling ikke utført: postboks ikke tilgjengelig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Forespurt handling avbrutt: feil i prosessering"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Ikke lokal bruker; vennligst prøv <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Forespurt handling ikke utført: utilstrekkelig lagringsplass"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Forespurt handling ikke utført: postboksnavn ikke tillatt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transaksjonen feilet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Ingen autentisering nødvendig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
-"autentisering. Dette bør fungere for de fleste SMTP-tjenerene."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Dette lar deg koble til SMTP-tjeneren ved å bruke CRAM-MD5-autentisering."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-tjener %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP e-postlevering via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan ikke sende melding: senderadresse ikke definert."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Kan ikke sende melding: ingen mottakere definert."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Tidsavbrudd for HELO-forespørsel: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Feil ved HELO-svar: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Tidsavbrudd for \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Feil ved \"MAIL FROM\"-forespørsel: %s: melding ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Tidsavbrudd for \"RCPT TO\"-forespørsel: %s: melding ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Tidsavbrudd for RSET-forespørsel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Feil ved RSET-svar: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Tidsavbrudd for QUIT-forespørsel: %s: ikke-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Ingen slik melding: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "E-post-tilbyder for virtuelle mapper"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "vedlegg"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Legg ved en fil"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Fjern"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Fjern valgte oppføringer fra vedleggslisten"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Legg til vedlegg..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Legg en fil ved meldingen"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1157
-msgid "Attachment"
-msgstr "Vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Egenskaper for vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Inline vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Send som:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Fra:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klikk her for å få opp adresseboken"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Skriv inn mottakerene for meldingen"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
-"syne i mottakerlisten for meldingen."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Skriv inn emnet for meldingen"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kunne ikke åpne signaturfilen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Lagre som..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Feil under lagring av fil: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Feil under lasting av fil: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Lagre endringer i meldingen..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Lagre endringer til meldingen..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Feil under lagring av brevet i 'Skisser': %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne meldingen er ikke sendt.\n"
-"\n"
-"Vil du lagre endringene?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Filen eksisterer ikke."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Er ikke en vanlig fil."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Filen eksisterer men er ikke lesbar."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Filen ser ut til å være tilgjengelig men open(2) feilet."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"File en meget stor (mer enn 100K).\n"
-"Er du sikker på at du vil sette den inn?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "En feil oppsto under lesing fra filen."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Skriv en melding"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Kan ikke opprette komponeringsvinduet."
-
-#: composer/evolution-composer.c:360
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan ikke initiere Evolutions composer."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "adressekort"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "kalenderinformasjon"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr "Evolution komponent for håndtering av kalenderen."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory for Evolution kalender-komponent."
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikke initiere Evolutions sammendragskomponent."
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Du kan velge en annen HTML-side som bakgrunn for sammendraget.\n"
-"\n"
-"Bare la den være blank som standard"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Åpne %s med standard GNOME applikasjon"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Åpne %s med standard GNOME nettleser"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Send en melding til %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Endre visning til %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Kjør %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Lukk %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flytt %s til venstre"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flytt %s til høyre"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Flytt %s til forrige rad"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Flytt %s til neste rad"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigurér %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan ikke åpne HTML-fil:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Feil under lesing av data:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Filen har ikke en plass til tjenestene.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Utseende"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Bakgrunn:"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Sammendragskomponenten kunne ikke initiere Bonobo.\n"
-"Hvis du så en advarsel angående RootPOA, betyr dette sannsynligvis\n"
-"at du kompilerte Bonobo mot GOAD i stedet for OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "Factory for e-post sammendrag komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Factory for Evolution adressebok-komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Factory for Evolution e-post komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test bonobo-tjeneste"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test-tjeneste"
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Feil"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "år"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "år"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "måned"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "måneder"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "uke"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "uker"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dager"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "time"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "timer"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minutt"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutter"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " sekunder"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Du har glemt å velge en dato."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Du har valgt en ugyldig dato."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med tiden\n"
-"når filteret kjøres eller tiden når vfolderen\n"
-"åpnes."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med\n"
-"tiden du spesifiserer her."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med\n"
-"en tid relativ til når filteret blir kjørt;\n"
-"for eksempel \"for en uke siden\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "tiden nå"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "en tid du spesifiserer"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "en tid relativ til tiden nå"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Sammenligne med"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "nå"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<klikk her for å velge en dato>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Legg til filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redigér filterregel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "innkommende"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "utgående"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redigér filtre"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Så"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Legg til handling"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Fjern handling"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Du glemte å velge en meppe.\n"
-"Vennligst gå tilbake og spesifisér en gyldig mappe for levering av e-post."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Velg mappe"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Skriv inn URI for mappen"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<klikk her for å velge en mappe>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Feil i regulært uttrykk '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Regelnavn: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Uten navn"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Hvis"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Utfør handlinger"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er møtt"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "hvis et kriterie er møtt"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Legg til kriterie"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Fjern kriterie"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Svart til"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Viktig"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Les"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redigér VFoldere"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Innkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Utgående"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "vFolder kilder"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Gi farge"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Gi poeng"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Kopiér til mappe"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Dato mottatt"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Dato sendt"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Uttrykk"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Meldingskropp"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Meldingshode"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Meldingen ble mottatt"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Meldingen ble sendt"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Mottakere"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1157
-msgid "Score"
-msgstr "Poenggi"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Sett status"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Kilde"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Spesifikk header"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stopp behandling"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1158
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "inneholder ikke"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "på eller etter"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "på eller før"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "var etter"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "var før"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Legg til regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Rediger poengregel"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Legg til regel for VFolder"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redigér VFolder regel"
-
-#: mail/component-factory.c:297
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikke initiere Evolutions e-postkomponent."
-
-#: mail/component-factory.c:323
-msgid "Cannot register storage with shell"
-msgstr "Kan ikke registrere lagring i skallet"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Lagre søk som vMappe"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Kropp inneholder"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Emne inneholder"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Sender inneholder"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "VFolder for emne"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "VFolder for sender"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "VFolder for mottakere"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtrér etter emne"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtrér etter sender"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtrér etter mottaker"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtrér etter e-postliste"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Åpne"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Lagre som..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Svar til sender"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Videresend"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Videresend \"inline\""
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Markér som lest"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Merk som ulest"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Flytt til mappe..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Kopiér til mappe..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Angre slett"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Påfør filtre"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Lage regel fra melding"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtrér etter e-postliste (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponent for håndtering av e-post."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolutions e-postredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-post komponent for sammendrag."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution komponent for e-post mappevisning."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution komponent for e-postmappe factory."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Factory for Evolution meldingsredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Factory for Evolution e-post komponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Factory for e-post sammendrag komponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-#, fuzzy
-msgid "Factory to import mbox into Evolution"
-msgstr "Factory for Evolution meldingsredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-#, fuzzy
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-#, fuzzy
-msgid "Imports mbox files into Evolution"
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktivt lagringsformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Format for postboks"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nytt lagringsformat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Merk: Ved konvertering mellom postboksformater, kan en feil\n"
-"(slik som mangel på diskplass) ikke nødvendigvis rettes opp\n"
-"igjen. Vennligst bruk denne funksjonen med forsiktighet."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:746 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (forvalgt)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Kontohåndtering for Evolution"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"En eller flere av dine tjenere er ikke korrekt konfigurert.\n"
-"Vil du lagre likevel?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Kontoredigering for Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Send til %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "E-post fra %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s e-postliste"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Du har ikke konfigurert e-postklienten.\n"
-"Du må gjøre dette før du kan sende,\n"
-"motta eller skrive meldinger.\n"
-"Vil du konfigurere den nå?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Du må konfigurere en identitet\n"
-"før du kan skrive e-post."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Du må konfigurere en e-post-transport\n"
-"før du kan skrive e-post."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Du har ikke satt en transportmetode for e-post"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Denne meldingen har ikke emne.\n"
-"Send likevel?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Den %s, skrev %s:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Videresendt melding:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Flytt melding(er) til"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Kopiér melding(er) til"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Du kan kun redigere meldinger lagret\n"
-"i Skisser-katalogen."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Lagre melding som..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Lagre meldinger som..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Feil under lasting av filter-informasjon:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Skriv ut melding"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Feil under utskrift av melding"
-
-#: mail/mail-config.c:834
-msgid "Connecting to server"
-msgstr "Kobler til tjener"
-
-#: mail/mail-config.c:836
-msgid "Connect to server"
-msgstr "Koble til tjener"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Kontoinformasjon"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Håndtering av konti"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaper for konto"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avansert"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringstype:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Sjekk etter meldinger hver(t)"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Sjekk innstillinger"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
-"\n"
-"Du kan nå sende og motta e-post \n"
-"med Evolution.\n"
-"\n"
-"Klikk \"Fullfør\" for å lagre dine innstillinger"
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Forvalgt"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Ferdig"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-post-konfigurasjon"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Fullt navn:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Vertsnavn:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "E-posttjener for innkommende post"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Behold e-post på tjener"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "E-post konto"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "E-post-konfigurasjonsdruide"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "Bruk denne som standard konto"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr "Merk melding som \"Lest\" etter:"
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "News"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Valgfri"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "E-posttjener for utgående post"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Passord:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Vanlig tekst"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Mottar e-post"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Husk mitt passord"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Nødvendige"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Lagre passord"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Velg signaturfil"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Send meldinger i HTML-format som standard"
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Sender e-post"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Tjenerkonfigurasjon"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Tjenertype: "
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Tjener krever autentisering"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Tjenere"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
-"eller \"Hjemme\"."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Brukerinformasjon"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
-"\n"
-"Klikk \"Neste\" for å begynne."
-
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "minutes."
-msgstr "minutter"
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Feil under verifisering av konfigurasjon av innkommende\n"
-"post. Du vil kunne oppleve problemer ved henting av e-post fra %s"
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Navneområde:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Feil under verifisering av konfigurasjon av utgående e-post.\n"
-"Du vil kunne oppleve problemer ved sending av e-post gjennom %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Evolution kontoveiviser"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Lagre vedlegg"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke opprette midlertidig katalog: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Lagre til disk..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Åpne i %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Vis \"inline\""
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Ekstern visning"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Vis \"inline\" (via %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Skjul"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Laster meldingsinnhold"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Kryptert melding ikke vist"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Kryptert melding"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Klikk på ikonet for å dekryptere."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peker til FTP-tjener (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Peker til lokal fil (%s) gyldig på nettsted \"%s\""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peker til lokal fil (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern-kropp."
-
-#: mail/mail-local.c:399
-msgid "Registering local folder"
-msgstr "Registrerer lokal mappe"
-
-#: mail/mail-local.c:401
-msgid "Register local folder"
-msgstr "Registrér lokal mappe"
-
-#: mail/mail-local.c:508
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Kan ikke registrer mappe '%s':\n"
-"%s"
-
-#: mail/mail-local.c:672
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Endrer mappe \"%s\" til \"%s\"-format"
-
-#: mail/mail-local.c:676
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Endre mappe \"%s\" til \"%s\"-format"
-
-#: mail/mail-local.c:707
-msgid "Reconfiguring folder"
-msgstr "Omkonfigurerer mappe"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:736
-msgid "Closing current folder"
-msgstr "Lukker aktiv mappe"
-
-#: mail/mail-local.c:768
-msgid "Renaming old folder and opening"
-msgstr "Endrer navn på gammel mappe og gjenåpner"
-
-#: mail/mail-local.c:786
-msgid "Creating new folder"
-msgstr "Oppretter en ny mappe"
-
-#: mail/mail-local.c:800
-msgid "Copying messages"
-msgstr "Kopierer meldinger"
-
-#: mail/mail-local.c:821
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
-"ikke kunne åpne denne mappen igjen: %s"
-
-#: mail/mail-local.c:852
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Hvis du ikke kan åpne denne postboksen igjen må\n"
-"du reparere den manuelt."
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Feil under '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Feil under utføring av operasjon:\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "Arbeider"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sender \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Sender melding"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Legger til \"%s\""
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Legger til en melding uten emne"
-
-#: mail/mail-ops.c:842
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Flytter meldinger fra \"%s\" til \"%s\""
-
-#: mail/mail-ops.c:844
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
-
-#: mail/mail-ops.c:847
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Flytt meldinger fra \"%s\" til \"%s\""
-
-#: mail/mail-ops.c:849
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
-
-#: mail/mail-ops.c:880
-msgid "Moving"
-msgstr "Flytter"
-
-#: mail/mail-ops.c:883
-msgid "Copying"
-msgstr "Kopiérer"
-
-#: mail/mail-ops.c:903
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s melding %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:978
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Skanner mapper i \"%s\""
-
-#: mail/mail-ops.c:1044 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Ingen beskrivelse)"
-
-#: mail/mail-ops.c:1109
-msgid "Forwarded messages"
-msgstr "Videresendte meldinger"
-
-#: mail/mail-ops.c:1150 mail/mail-ops.c:1284
-#, c-format
-msgid "Opening folder %s"
-msgstr "Åpner mappe %s"
-
-#: mail/mail-ops.c:1215
-#, c-format
-msgid "Opening store %s"
-msgstr "Åpner lager %s"
-
-#: mail/mail-ops.c:1396
-msgid "Expunging folder"
-msgstr "Tømmer mappe"
-
-#: mail/mail-ops.c:1445
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Henter melding %s"
-
-#: mail/mail-ops.c:1512
-msgid "Retrieving messages"
-msgstr "Henter meldinger"
-
-#: mail/mail-ops.c:1522
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter melding nummer %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1672
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Laster %s-mappe for %s"
-
-#: mail/mail-ops.c:1674
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Last %s-mappe for %s"
-
-#: mail/mail-ops.c:1840
-msgid "Saving messages"
-msgstr "Lagrer meldinger"
-
-#: mail/mail-ops.c:1919
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1932
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Lagrer melding %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1946
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Feil under lagring av av meldinger til: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2020
-msgid "Saving attachment"
-msgstr "Lagrer vedlegg"
-
-#: mail/mail-ops.c:2035
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2063
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kan ikke skrive data: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Søk"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Avbryter..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Send & motta e-post"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Mottar"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "Oppdaterer..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "Venter..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Sender"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Avbrutt"
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Fullført."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
-msgid "Incomplete message written on pipe!"
-msgstr "Uferdig melding skrevet på rør!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Feil under forberedelser til %s:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Feil under `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Feil under lesing av kommandoer fra utsender-tråd."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Korrupt melding fra utsender-tråd?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Kan ikke opprette dialogboks."
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "Spørring avbrutt av bruker."
-
-#: mail/mail-tools.c:198
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
-
-#: mail/mail-tools.c:256
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (videresendt melding)"
-
-#: mail/mail-tools.c:266
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (uten emne)"
-
-#: mail/mail-tools.c:283
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Videresendt melding - %s"
-
-#: mail/mail-tools.c:285
-msgid "Forwarded message (no subject)"
-msgstr "Videresendt melding (uten emne)"
-
-#: mail/mail-tools.c:357
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kan ikk åpne lokasjon `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "VMapper"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Ny VFolder"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Svar til avsender av denne meldingen"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Svar til alle mottakere av denne meldingen"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Videresend denne meldingen"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Skriv ut den valgte meldingen"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Slett denne meldingen"
-
-#: mail/message-list.c:608
-msgid "Unseen"
-msgstr "Ulest"
-
-#: mail/message-list.c:611
-msgid "Seen"
-msgstr "Lest"
-
-#: mail/message-list.c:614
-msgid "Answered"
-msgstr "Besvart"
-
-#: mail/message-list.c:617
-msgid "Multiple Unseen Messages"
-msgstr "Flere uleste meldinger"
-
-#: mail/message-list.c:620
-msgid "Multiple Messages"
-msgstr "Flere meldinger"
-
-#: mail/message-list.c:938
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:950 mail/message-list.c:966
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
-
-#: mail/message-list.c:953 mail/message-list.c:969
-msgid "<unknown>"
-msgstr "<ukjent>"
-
-#: mail/message-list.c:1021
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1028
-msgid "Today %l:%M %p"
-msgstr "Idag %l:%M %p"
-
-#: mail/message-list.c:1037
-msgid "Yesterday %l:%M %p"
-msgstr "I går %l:%M %p"
-
-#: mail/message-list.c:1049
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1057
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1059
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1157
-msgid "Flagged"
-msgstr "Merket"
-
-#: mail/message-list.c:1158
-msgid "From"
-msgstr "Fra"
-
-#: mail/message-list.c:1158
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:1158
-msgid "Received"
-msgstr "Mottatt"
-
-#: mail/message-list.c:1159
-msgid "To"
-msgstr "Til"
-
-#: mail/message-list.c:1159
-msgid "Size"
-msgstr "Størrelse"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Vennligst skriv inn din %s passphrase for %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Vennligst skriv inn din %s passphrase"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Ingen GPG/PGP-program tilgjengelig."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Ingen passord gitt."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Ingen mottakere spesifisert"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikke opprette midlertidig fil: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Mappe"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Lager"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Vis mapper som som starter med:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Henter lager for \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Hent lager for \"%s\""
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Abonnerer på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Sletter abonnement på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Abonnér på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Slett abonnement på mappe \"%s\""
-
-#: mail/subscribe-dialog.glade.h:1
-msgid "All Folders"
-msgstr "Alle mapper"
-
-#: mail/subscribe-dialog.glade.h:2
-msgid "Display folders whose name contain:"
-msgstr "Vis mapper som inneholder:"
-
-#: mail/subscribe-dialog.glade.h:3
-msgid "Query"
-msgstr "Spør"
-
-#: mail/subscribe-dialog.glade.h:4 ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Abonnér"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Subscribed"
-msgstr "Abonnert"
-
-#: mail/subscribe-dialog.glade.h:6 ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Mappetype:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Spesifiser hvor mappen skal opprettes:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importerer %s\n"
-"Importerer ikke klar.\n"
-"Venter 5 sekunder før nytt forsøk."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ingen importerer som kan håndtere\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importerer"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importerer %s.\n"
-"Starter %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Feil under lasting av %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importerer %s\n"
-"Importerer oppføring 1."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Velg en fil"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Filtype:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
-msgid "Import"
-msgstr "Importér"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
-"er fra listen.\n"
-"\n"
-"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
-"ut hvilken type det er for deg."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Klikk \"Importer\" for å starte import av filen til Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Importverktøy for Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Importverktøy for Evolution"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Velkommen til Evolutions importverktøy.\n"
-"Gjennom denne veiviseren vil du ledes gjennom import av\n"
-"eksterne filer til Evolution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution installasjon"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Denne nye versjonen av Evolution må installere tilleggsfiler i\n"
-"din personlige Evolution-katalog"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Vennligst klikk \"OK\" for å installere filene, eller \"Avbryt\" for å "
-"avslutte."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Kunne ikke oppdatere filene."
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolutions filer ble installert."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Dette ser ut til å være første gang du kjører Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Vennligst klikk \"OK\" for å installere Evolutions brukerfiler under"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kan ikke opprette katalogen\n"
-"%s\n"
-"Feil: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan ikke kopiere filer til\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Filen '%s' er ikke en katalog.\n"
-"Venligst flytt denne for å tillate installasjon\n"
-"av Evolution's brukerfiler."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Katalogen `%s' eksisterer men er ikke.\n"
-"Evolution-katalogen. Venligst flytt den for å \n"
-"tillate installasjon av Evolution's brukerfiler."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikke opprette spesifisert katalog:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Spesifisert mappe er ikke gyldig."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Lag ny mappe"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typen for valgt mappe er ikke gyldig for den\n"
-"forespurte operasjonen."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Ny..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Uten navn)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy ble ikke funnet i din $PATH."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy kunne ikke kjøres."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution er en suite av gruppevareapplikasjoner\n"
-"for e-post, kalender og kontaktdatabaser for\n"
-"GNOME skrivebordsmiljøet."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Gå til mappe..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mapper"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution - %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke sette opp lokal lagring -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ops! Visningen for `%s' døde uventet. :-(\n"
-"Dette betyr sannsynligvis at komponenten %s har krasjet."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Opprett ny snarveigruppe"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Gruppenavn:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Vil du virkelig fjerne gruppen\n"
-"`%s' fra snarveilinjen?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Ikke fjern"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Vis snarveier som små ikoner"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Store i_koner"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Vis snarveier som store ikoner"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Ny gruppe..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Opprett en ny snarveigruppe"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "Fje_rn denne gruppen..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Fjern denne snarveigruppen"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "Sk_jul snarveilinjen"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Skjul snarveilinjen"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktiver"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Aktiver denne snarveien"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne snarveien fra snarveilinjen"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Feil under lagring av snarveier."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Vis den valgte mappen"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Uten navn)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Ingen feil"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Vanlig feil"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "En mappe med samme navn eksisterer allerede"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Spesifisert mappetype er ikke gyldig"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "I/U-feil"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Ikke nok plass til å opprette mappen"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Spesifisert mappe ble ikke funnet"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Funksjonen er ikke implementert i dette lageret"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Tilgang nektet"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Operasjonen er ikke støttet"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Spesifisert type er ikke støttet for dette lageret"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution skallet."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
-"av Evolution gruppevare-suiten.\n"
-"\n"
-"Siden forrige versjon har vi fokusert på å gjøre Evolution klar\n"
-"for generell bruk. Mange av utviklerene bruker nå Evolution som sin\n"
-"eneste e-postløsning. Det kan du også gjøre. (Bare sørg for å ha en \n"
-"sikkerhetskopi.)\n"
-"\n"
-"Men selv om vi har rettet mange feil mhp. stabilitet og sikkerhet, vil vi\n"
-"fremdeles vise deg denne meldingen: Evolution vil: krasje, miste din e-post\n"
-"når du ikke vil at det skal skje, etterlate seg vilfarne prosesser som  \n"
-"spiser 100% av din CPU-tid, låse seg, sende e-post i HTML-format til\n"
-"tilfeldige e-postlister, og tabbe deg ut foran dine venner og kolleger.\n"
-"Bruk kun etter anvisninger.\n"
-"\n"
-"Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
-"spenning på at du tilbyr din hjelp!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Takk\n"
-"Evolution utviklerene\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan ikke initialisere Evolution skallet."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Slå av."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Opprett en ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slett en kontakt"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Finn"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Finn en kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stopp"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stopp innlesing"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Vis alle"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfigurasjon av adressebok..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "S_kriv ut kontakter..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Søk etter kontakter"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Verktøy"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dager"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Endre brukervalg"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Brukervalg for kalender..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Opprett en ny kalender"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Dag"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Gå tilbake i tid"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Gå fremover i tid"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Gå til"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Gå til en spesifikk dato"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Gå til i dag"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Måned"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Neste"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Åpne kalender"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Forrige"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Skriv ut denne kalenderen"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Lagre som"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Lagre kalender som noe annet"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Vis 1 dag"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Vis 1 måned"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Vis 1 uke"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Vis arbeidsuken"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Idag"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Uke"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Ny"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Åpne kalender"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "S_kriv ut denne kalenderen"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Lagre _som..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Slett denne oppføringen"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Slett..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hjelp"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv ut konvolutt..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Skriv ut denne oppføringen"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Skriv ut..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "L_agre som..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Lagre og lukk"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Lagre kontakten og lukk dialogboksen"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Se_nd kontakt til andre..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Se hjelp"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Send _melding til kontakt..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Fil"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_kriv ut..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Lagre"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikasjonen"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Addresse_bok..."
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "T_øm"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Klipp _ut"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Sje_kk navn"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Tøm"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Tøm utvalget"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Lukk denne avtalen"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kop_iér til mappe..."
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopiér"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopiér utvalget"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Klipp ut utvalget"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse av grensesnittet som XML"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-#, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Fø_rste oppføring i mappen"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "_Videresend"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Videresend som v_Calendar"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Gå til neste oppføring"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Gå til forrige oppføring"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "U_komplett oppgave"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Endre filens egenskaper"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "N_este"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Lim inn"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavlen"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Forri_ge"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Forrige"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Forhåndsvisning av utskrift"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Skriveropps_ett..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Skriveroppsett"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Lagre"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Lagre avtalen og lukk dialogboksen"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Lagre aktiv fil"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Sett opp møte"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Sett opp _møte"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Sett opp ett eller annet møte"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Velg alle"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Velg alt"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Redigér sideinnstillinger for aktiv skriver"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Oppgaveforespørsel"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Om..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "L_ukk"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopiér"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Feilsøk"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "R_edigér"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Oppføring"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journaloppføring"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Siste oppføring i mappen"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "Send _melding"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Flytt til _mappe..."
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Notis"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Lim inn"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_kriv ut"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Egenska_per..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Velg alle"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Ulest oppføring"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Legg til tjeneste"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Legg til en ny tjeneste i sammendraget"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Skriv ny melding"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Innstillinger for sammendrag..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Ny melding"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Komponér en ny melding"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopiér meldingen til en ny mappe"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Lag regel"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "M_appe"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrér etter sender"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "F_iltrér etter mottaker"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Glem _passord"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent e-post"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slette_de meldinger"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul le_ste meldinger"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Håndtér abonnement..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Mar_kér som lest"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Merk som _ulest"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flytt"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flytt meldingen til en ny mappe"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vis forhåndsvisning av melding..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Skriv ut denne meldingen på skriveren"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Skriv ut melding..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svar til _sender"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "K_ilde"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Velg _alle"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send kølagt e-post og hent ny e-post"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Vis _alle meldinger"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Meldingsliste med tråder"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VFolder for se_nder"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VFolder for mottake_re"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Vis rå meldingskode"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Påfør filtre"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigurér mappe..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopiér til mappe..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "R_edigér melding"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Tøm"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrér etter emne"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_versér utvalg"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Melding"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "F_lytt til mappe..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Åpne i nytt vindu"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "S_kriv ut melding"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Lagre melding _som..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "Med _tråder"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "A_ngre slett"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VFolder for emne"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Lukk aktiv fil"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Kryptér denne meldingen med PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Sett inn en tekstfil i meldingen"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Sett inn tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Åpne en fil"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Kryptér med PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Signér med PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "L_agre utkast"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Lagre i _mappe..."
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Lagre i mappe..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Lagre aktiv fil med et nytt navn"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Lagre meldingen i en spesifisert mappe"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Send"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Send meldingen i HTML-format"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Send meldingen senere"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send meldingen nå"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Send denne meldingen nå"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Vis/skjul vedlegg"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Vis _vedlegg"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Vis vedlegg"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Signér denne meldingen med din PGP-nøkkel"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Sett _inn tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Åpne..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sikkerhet"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Legg til mappe på listen over abonnerte mapper"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Les listen på nytt"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Les mappelisten på nytt"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abbonerte mapper"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tildel oppgave"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Finn igjen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Møteforesp_ørsel"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Gjenopprett"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Gjenopprett angret handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Erstatt"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Erstattt en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Svar til a_lle"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "S_end statusrapport"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Hopp over gjenta_kelse"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Lagre oppgaven og lukk dialogboksen"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Søk etter samme streng på nytt"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Søk etter en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Angre"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Angre siste handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Merk som fullført"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Sva_r"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Ny"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Lagre oppgave som noe annet"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Brukervalg for oppgaver..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Om Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Tilpass..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Tilpass"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Tilpass verktøylinjer"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Vis en annen mappe"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "A_vslutt"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-linje _snarvei"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Avslutt"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Avslutt programmet"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Kom _igang"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importér et eksternt filformat"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Hovedverktøylinje"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Vis _mappelinjen"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Vis _snarveilinjen"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Send inn feilrapport"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Sen_d inn feilrapport"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Send inn feilrapport ved bruk av Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Slå av/på visning av mappelinjen"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Slå av/på visning av snarveilinjen"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Bruk av k_ontaktdatabasen"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Bruk av _kalenderen"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Bruk av e-_postprogrammet"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Gå til mappe..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importér fil..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indeks"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "Send _melding"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Inn_stillinger"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Opptatt"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ute"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen informasjon"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Inviter andre..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbeidstid"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ut"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Oppdater fri/ledig"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovelg"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og ressurser"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en ressurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Nødvendige mennesker"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Nødvendige mennesker _og en ressurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for møtets _start:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for møtets slutt:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltakere"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nå"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Informasjon"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Advarsel"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Spørsmål"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Melding"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Ikke vis denne meldingen igjen."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "Sø_k"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Personlig adressebok-tjener"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Personlig adressebok-tjener; factory"
-
-#: wombat/wombat.c:182
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
-
-#: wombat/wombat.c:194
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): kunne ikke initiere GNOME"
-
-#: wombat/wombat.c:207
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Gruppevaresuiten Evolution"
-
-#~ msgid ""
-#~ "Evolution has taken the tasks that were in your calendar folder and "
-#~ "automatically migrated them to the new tasks folder."
-#~ msgstr ""
-#~ "Evolution har utført automatisk migrasjon av oppgavene fra din kalendermappe "
-#~ "til den nye oppgaver-mappen."
-
-#~ msgid ""
-#~ "Evolution has tried to take the tasks that were in your calendar folder and "
-#~ "migrate them to the new tasks folder.\n"
-#~ "Some of the tasks could not be migrated, so this process may be attempted "
-#~ "again in the future."
-#~ msgstr ""
-#~ "Evolution har forsøkt å migrere oppgavene som var i din kalendermappe til "
-#~ "den nye oppgavemappen.\n"
-#~ "Noen av oppgavene kunne ikke migreres, så denne prosessen vil kunne forsøkes "
-#~ "igjen i fremtiden."
-
-#~ msgid ""
-#~ "Could not open `%s'; no items from the calendar folder will be migrated to "
-#~ "the tasks folder."
-#~ msgstr ""
-#~ "Kunne ikke åpne `%s'; ingen oppføringer fra kalendermappen vil flyttes til "
-#~ "oppgavemappen."
-
-#~ msgid ""
-#~ "The method required to load `%s' is not supported; no items from the "
-#~ "calendar folder will be migrated to the tasks folder."
-#~ msgstr ""
-#~ "Metoden som kreves for å laste `%s' er ikke støttet; ingen oppføringer fra "
-#~ "kalendermappen vil bli migrert til oppgavemappen."
-
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "Lokale lager har ikke en standardmappe"
-
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mapper kan ikke være rekursive."
-
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#, fuzzy
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "Oppgavefo_respørsel"
-
-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "Send _melding"
-
-#~ msgid "FIXME: _Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "FIXME: _Task"
-#~ msgstr "_Oppgave"
-
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "Oppgavefo_respørsel"
-
-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "_Journaloppføring"
-
-#~ msgid "FIXME: _Note"
-#~ msgstr "_Notis"
-
-#~ msgid "FIXME: Ch_oose Form..."
-#~ msgstr "Velg skjema..."
-
-#~ msgid "FIXME: _Memo Style"
-#~ msgstr "_Notis-stil"
-
-#, fuzzy
-#~ msgid "FIXME: Define Print _Styles..."
-#~ msgstr "Definér utskrift_stiler"
-
-#~ msgid "FIXME: S_end"
-#~ msgstr "_Send"
-
-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "Lagre vedle_gg..."
-
-#~ msgid "FIXME: _Move to Folder..."
-#~ msgstr "_Flytt til mappe..."
-
-#~ msgid "FIXME: Cop_y to Folder..."
-#~ msgstr "Kopiér til mappe..."
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sideoppsett"
-
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "Forhåndsvisning av utskrift"
-
-#, fuzzy
-#~ msgid "FIXME: Paste _Special..."
-#~ msgstr "Lim inn _spesial..."
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
-#~ msgid "_Object"
-#~ msgstr "_Objekt"
-
-#~ msgid "FIXME: _Item"
-#~ msgstr "_Oppføring"
-
-#~ msgid "FIXME: _Unread Item"
-#~ msgstr "_Ulest oppføring"
-
-#~ msgid "FIXME: _Standard"
-#~ msgstr "_Standard"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "FIXME: _Customize..."
-#~ msgstr "_Tilpass..."
-
-#~ msgid "Ne_xt"
-#~ msgstr "Nes_te"
-
-#~ msgid "_Toolbars"
-#~ msgstr "Verk_tøylinjer"
-
-#~ msgid "FIXME: _File..."
-#~ msgstr "_Fil..."
-
-#~ msgid "FIXME: It_em..."
-#~ msgstr "Opp_føring"
-
-#~ msgid "FIXME: _Object..."
-#~ msgstr "_Objekt..."
-
-#~ msgid "FIXME: _Font..."
-#~ msgstr "FIXME: Skri_fttyper..."
-
-#~ msgid "FIXME: _Paragraph..."
-#~ msgstr "_Avsnitt..."
-
-#~ msgid "FIXME: Desi_gn This Form"
-#~ msgstr "_Utform dette skjemaet"
-
-#~ msgid "FIXME: D_esign a Form..."
-#~ msgstr "U_tform et skjema..."
-
-#~ msgid "FIXME: Publish _Form..."
-#~ msgstr "Publisér skjema..."
-
-#~ msgid "FIXME: Pu_blish Form As..."
-#~ msgstr "Pu_blisér skjema som..."
-
-#~ msgid "FIXME: Script _Debugger"
-#~ msgstr "Feilsøking i skript"
-
-#~ msgid "FIXME: _Spelling..."
-#~ msgstr "_Stavekontroll..."
-
-#~ msgid "_Forms"
-#~ msgstr "Sk_jemaer"
-
-#, fuzzy
-#~ msgid "FIXME: _New Contact"
-#~ msgstr "_Kontakt"
-
-#, fuzzy
-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "_Kontakt"
-
-#, fuzzy
-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "_Kontakt"
-
-#, fuzzy
-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "_Stavekontroll..."
-
-#, fuzzy
-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "_Kontakt"
-
-#, fuzzy
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "_Journaloppføring"
-
-#, fuzzy
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "Kopiér til mappe..."
-
-#, fuzzy
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "Send _melding"
-
-#, fuzzy
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "Send _melding"
-
-#, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "_Videresend"
-
-#~ msgid "FIXME: For_ward"
-#~ msgstr "_Videresend"
-
-#~ msgid "_Insert"
-#~ msgstr "Sett _inn"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
-#~ msgid "Configure the Evolution Calendar conduit"
-#~ msgstr "Konfigurasjon av Evolution kalenderkomponent"
-
-#~ msgid "Configure the Evolution ToDo conduit"
-#~ msgstr "Konfigurasjon av Evolution oppgavelistekomponent"
-
-#~ msgid "C_lassification:"
-#~ msgstr "K_lassifisering"
-
-#~ msgid "Su_mmary"
-#~ msgstr "Sa_mmendrag"
-
-#~ msgid "Time"
-#~ msgstr "Tid"
-
-#~ msgid "_Contacts"
-#~ msgstr "_Kontakter"
-
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
-#~ msgid "name"
-#~ msgstr "navn"
-
-#~ msgid "Evolution shell factory"
-#~ msgstr "Factory for Evolution skall"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Hr.\n"
-#~ "Fru.\n"
-#~ "Frk.\n"
-#~ "Frøken\n"
-#~ "Dr.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "S_ummary"
-#~ msgstr "Sa_mmendrag"
-
-#~ msgid "Open..."
-#~ msgstr "Åpne..."
-
-#~ msgid "Open the task"
-#~ msgstr "Åpne oppgaven"
-
-#~ msgid "Days"
-#~ msgstr "Dager"
-
-#~ msgid "Hours"
-#~ msgstr "Timer"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Send _til:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutter"
-
-#~ msgid "_Audio"
-#~ msgstr "_Lyd"
-
-#~ msgid "_Display"
-#~ msgstr "_Vis"
-
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Åpne en kalender"
-
-#~ msgid "Failed to perform regex search on message header: %s"
-#~ msgstr "Feil under utførelse av søk etter vanlig uttrykk i meldingshode: %s"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Du har ikke konfigurert en utboks"
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke åpne fil %s:\n"
-#~ "%s"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "Henter e-post fra %s"
-
-#~ msgid "Fetch email from %s"
-#~ msgstr "Hent e-post fra %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Filtrering av post etter behov"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Fi_ltrér e-post ved behov"
-
-#~ msgid "Sending queue"
-#~ msgstr "Sender kø"
-
-#~ msgid "Send queue"
-#~ msgstr "Send kø"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Examining %s"
-#~ msgstr "Undersøker %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Henter melding %d av %d"
-
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Skriver melding %d av %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Lagrer endringer til %s"
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "Sjek_k navn"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "Hjelp"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "U_komplett oppgave"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "Sett inn fil"
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Gjentakelse..."
-
-#~ msgid "FIXME: _Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Ny avtale"
-
-#~ msgid "Find _Again"
-#~ msgstr "Finn ig_jen"
-
-#~ msgid "_Find..."
-#~ msgstr "_Finn..."
-
-#~ msgid "_Redo"
-#~ msgstr "Gjenopp_rett"
-
-#~ msgid "_Replace..."
-#~ msgstr "E_rstatt..."
-
-#~ msgid "_Undo"
-#~ msgstr "_Angre"
-
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "Tildel o_ppgave"
-
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "Svar til a_lle"
-
-#~ msgid "FIXME: _Mark Complete"
-#~ msgstr "_Merk som fullført"
-
-#~ msgid "FIXME: _New Task"
-#~ msgstr "_Ny oppgave"
-
-#~ msgid "FIXME: _Reply"
-#~ msgstr "Sva_r"
-
-#~ msgid "FIXME: _note"
-#~ msgstr "_notis"
-
-#~ msgid "Group %i"
-#~ msgstr "Gruppe %i"
-
-#~ msgid "<b>Error loading calendar:<br>Calendar in use."
-#~ msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
-
-#~ msgid "Could not create a tasks file in `%s'"
-#~ msgstr "Kunne ikke opprette oppgavefil i `%s'"
-
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr "Kunne ikke opprette mappe i `%s'"
-
-#~ msgid "Server disconnected."
-#~ msgstr "Tjener koblet fra."
-
-#~ msgid " for "
-#~ msgstr " for "
-
-#~ msgid "Show all hidden"
-#~ msgstr "Vis alle skjulte"
-
-#~ msgid "Hide selected"
-#~ msgstr "Skjul valgte"
-
-#~ msgid "Hide deleted"
-#~ msgstr "Skjul slettede"
-
-#~ msgid "Hide Subject"
-#~ msgstr "Skjul emne"
-
-#~ msgid "Hide from Sender"
-#~ msgstr "Skjul fra sender"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Skjul emne \"%s\""
-
-#~ msgid "Hide from Sender <%s>"
-#~ msgstr "Skjul fra sender <%s>"
-
-#~ msgid "_Source"
-#~ msgstr "_Kildekode"
-
-#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
-#~ msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
-
-#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
-#~ msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
-
-#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-#~ msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Du har ikke konfigurert e-postkilder"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Svar-til:"
-
-#~ msgid "Calendar Repository"
-#~ msgstr "Kalenderlager"
-
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Gratulerer, konfigurasjon av e-post er fullført.\n"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Skriv inn ditt navn og din e-post adresse for bruk i utgående post. Du kan "
-#~ "også skrive inn navnet på din organisasjon, og navnet på en signaturfil."
-
-#~ msgid "Full name:"
-#~ msgstr "Fullt navn:"
-
-#~ msgid "Email address:"
-#~ msgstr "E-post adresse:"
-
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil"
-
-#~ msgid "Server:"
-#~ msgstr "Tjener:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Søk etter støttede typer..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ikke slett meldinger fra tjeneren"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Type e-post-kilde:"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-#~ "denne.\n"
-#~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
-
-#~ msgid "News source type:"
-#~ msgstr "Type news-kilde:"
-
-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
-#~ "denne.\n"
-#~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-#~ "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Type e-post-transport"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-#~ "denne.\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
-#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
-
-#~ msgid "Add Identity"
-#~ msgstr "Legg til identitet"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Rediger identitet"
-
-#~ msgid "Edit Source"
-#~ msgstr "Rediger kilde"
-
-#~ msgid "Add News Server"
-#~ msgstr "Legg til news-tjener"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Redigér news-tjener"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Tester \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Tilkoblingen var vellykket!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Spør etter autorisasjonsegenskaper for \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Spør etter autorisasjon hos \"%s\""
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Identities"
-#~ msgstr "Identiteter"
-
-#~ msgid "Mail Sources"
-#~ msgstr "E-post-kilder"
-
-#~ msgid "Mail Transport"
-#~ msgstr "E-post-transport"
-
-#~ msgid "News Servers"
-#~ msgstr "News-tjenere"
-
-#~ msgid "News Sources"
-#~ msgstr "News-kilder"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meldinger i HTML-format"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Ingen GPG/PGP-støtte tilgjengelig i denne versjonen av Evolution."
-
-#~ msgid "Server Timeouts"
-#~ msgstr "Tidsavbrudd for tjener"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Oppføring(er) hører til disse kategoriene:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Tilgjengelige kategorier:"
-
-#~ msgid "Deleted"
-#~ msgstr "Slettet"
-
-#~ msgid "Draft"
-#~ msgstr "Skisse"
-
-#~ msgid "Mail Source"
-#~ msgstr "E-post-kilde"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "Sender en melding uten emne"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Send en melding uten emne"
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Merker meldinger i mappe \"%s"
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Merk meldinger i mappe \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Merker melding %d av %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Skann foldere i \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Legger ved meldinger fra mappe \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Legg ved meldinger fra \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Videresender meldinger \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Videresender en melding uten emne"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Videresend meldingen \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Videresend en melding uten emne"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
-#~ "melding."
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Oppretter \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
-
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Lagrer meldinger fra mappe \"%s\""
-
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Lagre meldinger fra mappe \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Bygger opp meldingsvisningen på nytt"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Gjenoppbygg meldingsvisningen"
-
-#~ msgid "Note: When converting between mailbox formats, a failure\n"
-#~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
-
-#~ msgid "External Directories"
-#~ msgstr "Eksterne kataloger"
-
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
-#~ msgid "Outline:"
-#~ msgstr "Omriss:"
-
-#~ msgid "Headings:"
-#~ msgstr "Topptekster:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Tomme dager:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Merket dag:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Dagnummer:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Nummer for idag:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Oppgavelisteoppføring som ikke har gått ut ennå:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Oppgavelisteoppføring som går ut idag:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Oppgavelisteoppføring som har gått ut:"
-
-#~ msgid "Expunging \"%s\""
-#~ msgstr "Fjerner \"%s\""
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Tøm \"%s\""
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Laster \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Last \"%s\""
-
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserer \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkronisér \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Viser melding-UID \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "Tømmer meldingsvisning"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Vis meldings-UID \"%s\""
-
-#~ msgid "Clear message display"
-#~ msgstr "Tøm meldingsvisning"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Åpner meldinger fra mappe \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Åpne meldinger fra \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Viser meldinger fra mappe \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Vis meldinger fra \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Henter melding %d av %d (uid \"%s\")"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Ny katalog-tj_ener"
-
-#~ msgid "_Actions"
-#~ msgstr "H_andlinger"
-
-#~ msgid "appointment"
-#~ msgstr "avtaler"
-
-#~ msgid "task"
-#~ msgstr "oppgave"
-
-#~ msgid "journal entry"
-#~ msgstr "journaloppføring"
-
-#~ msgid "Year:"
-#~ msgstr "År:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Vennligst velg datoen du vil gå til.\n"
-#~ "Når du klikker på en dag vil du flytte\n"
-#~ "deg til denne datoen."
-
-#~ msgid "_Mail Configuration"
-#~ msgstr "E-post-ko_nfigurasjon"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "Lagre kalender _som"
-
-#~ msgid "may"
-#~ msgstr "mai"
-
-#~ msgid "sept"
-#~ msgstr "sept"
-
-#~ msgid "sunday"
-#~ msgstr "søndag"
-
-#~ msgid "monday"
-#~ msgstr "mandag"
-
-#~ msgid "tuesday"
-#~ msgstr "tirsdag"
-
-#~ msgid "tues"
-#~ msgstr "tirs"
-
-#~ msgid "wednesday"
-#~ msgstr "onsdag"
-
-#~ msgid "wednes"
-#~ msgstr "ons"
-
-#~ msgid "thursday"
-#~ msgstr "torsdag"
-
-#~ msgid "thur"
-#~ msgstr "tor"
-
-#~ msgid "thurs"
-#~ msgstr "tors"
-
-#~ msgid "friday"
-#~ msgstr "fredag"
-
-#~ msgid "saturday"
-#~ msgstr "lørdag"
-
-#~ msgid "fortnight"
-#~ msgstr "14-dager"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sek"
-
-#~ msgid "tomorrow"
-#~ msgstr "imorgen"
-
-#~ msgid "yesterday"
-#~ msgstr "igår"
-
-#~ msgid "today"
-#~ msgstr "idag"
-
-#~ msgid "last"
-#~ msgstr "forrige"
-
-#~ msgid "this"
-#~ msgstr "denne"
-
-#~ msgid "next"
-#~ msgstr "neste"
-
-#~ msgid "first"
-#~ msgstr "første"
-
-#~ msgid "third"
-#~ msgstr "tredje"
-
-#~ msgid "fourth"
-#~ msgstr "fjerde"
-
-#~ msgid "fifth"
-#~ msgstr "femte"
-
-#~ msgid "sixth"
-#~ msgstr "sjette"
-
-#~ msgid "seventh"
-#~ msgstr "syvende"
-
-#~ msgid "eighth"
-#~ msgstr "åttende"
-
-#~ msgid "ninth"
-#~ msgstr "niende"
-
-#~ msgid "tenth"
-#~ msgstr "tiende"
-
-#~ msgid "eleventh"
-#~ msgstr "ellevte"
-
-#~ msgid "twelfth"
-#~ msgstr "tolvte"
-
-#~ msgid "ago"
-#~ msgstr "siden"
-
-#~ msgid "Could not create summary"
-#~ msgstr "Kunne ikke opprette sammendrag"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan ikke hente melding: %s"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
-#~ "på lokal disk."
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Kunne ikke endre navn på mappe %s til %s: målet eksisterer"
-
-#~ msgid "Mbox folders may not be nested."
-#~ msgstr "Mbox-mapper kan ikke være rekursive."
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Kunne ikke åpne sammendrag %s"
-
-#~ msgid "Summary mismatch, aborting sync"
-#~ msgstr "Feil i sammendrag, avbryter synkronisering"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Feil i sammendrag, X-Evolution topptekst mangler"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Kan ikke kopiere data til utfil: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kunne ikke laste eller opprette sammendrag"
-
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan ikke legge til melding i mh-mappe: %s"
-
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kunne ikke endre navn på mappe `%s': %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Kunne ikke endre navn på mappe `%s': %s eksisterer"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "MH-mapper kan ikke være rekursive."
-
-#~ msgid "Local mail directory %s"
-#~ msgstr "Lokal e-postkatalog %s"
-
-#~ msgid "Bold"
-#~ msgstr "Uthevet"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Setter utvalg til uthevet"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Kunne ikke opprette rør til %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Kunne ikke kjøre %s: %s\n"
-
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan ikke kjøre fork på %s: %s"
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
-
-#~ msgid "Set Flag"
-#~ msgstr "Sett flagg"
-
-#~ msgid "Forward as Attachment"
-#~ msgstr "Videresend som vedlegg"
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Ny ka_lender"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Ny avtale..."
-
-#~ msgid "_Open"
-#~ msgstr "_Åpne"
-
-#~ msgid "Create a new folder"
-#~ msgstr "Opprett en ny mappe"
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "Opprett ny mappe..."
-
-#~ msgid "Monday\n"
-#~ msgstr "Mandag\n"
-
-#~ msgid "None\n"
-#~ msgstr "Ingen\n"
-
-#~ msgid ""
-#~ "Incoming\n"
-#~ "Outgoing"
-#~ msgstr ""
-#~ "Innkommende\n"
-#~ "Utgående"
-
-#~ msgid "window2"
-#~ msgstr "vindu2"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Denne avtalen har egendefinerte regler for gjeninntreffelse som ikke kan "
-#~ "redigeres av Evolution.\n"
-#~ "\n"
-#~ "Avtalen vil uansett inntreffe til riktig tid og vil vises korrekt i "
-#~ "kalendervisningene."
-
-#~ msgid "Create to-do item"
-#~ msgstr "Opprett opgavelisteoppføring"
-
-#~ msgid "Edit to-do item"
-#~ msgstr "Redigér oppgavelisteoppføring"
-
-#~ msgid "Due Date:"
-#~ msgstr "Ferdig-dato:"
-
-#~ msgid "Item Comments:"
-#~ msgstr "Kommentarer for oppføring:"
-
-#~ msgid "Time display"
-#~ msgstr "Tidsvisning"
-
-#~ msgid "Time format"
-#~ msgstr "Tidsformat"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 timer (AM/PM)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 timer"
-
-#~ msgid "Weeks start on"
-#~ msgstr "Uken starter på"
-
-#~ msgid "Day range"
-#~ msgstr "Dagområde"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Vennligst velg start og slutt-tidene du ønsker\n"
-#~ "at skal vises i dagvisningen og ukevisningen.\n"
-#~ "Tider utenfor dette området vil ikke vises\n"
-#~ "som standard."
-
-#~ msgid "Day end:"
-#~ msgstr "Dagens slutt:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Farger i visning"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Vis på oppgavelisten:"
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Alternativer for stil for oppgaveliste:"
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Merk utgåtte oppføringer"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Merk oppføringer som ikke har gått ut"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "Merk oppføringer som går ut idag"
-
-#~ msgid "To Do List Properties"
-#~ msgstr "Egenskaper for oppgaveliste"
-
-#~ msgid "To Do List"
-#~ msgstr "Oppgaveliste"
-
-#~ msgid "Preferences"
-#~ msgstr "Brukervalg"
-
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaper for alarmer"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Pip ved visning av alarmer"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Tidsavbrudd for lydalarmer"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Slå på utsetting for "
-
-#~ msgid "does not match regex"
-#~ msgstr "er ulik regex"
-
-#~ msgid "matches regex"
-#~ msgstr "er lik regex"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Velkommen til Evolution E-post-konfigurasjonsdruiden!\n"
-#~ "Ved å fylle ut litt informasjon om dine e-post-\n"
-#~ "innstillinger kan du begynne å sende og motta e-post\n"
-#~ "med én gang. Klikk neste for å fortsette."
-
-#~ msgid "Add Optional Fields..."
-#~ msgstr "Legg til tillegsfelt..."
-
-#~ msgid "Additional Identity Fields"
-#~ msgstr "Ekstra identitetsfelt"
-
-#~ msgid "Browse..."
-#~ msgstr "Bla gjennom..."
-
-#~ msgid "Edit Mail Configuration Settings"
-#~ msgstr "Redigér innstillinger for e-post-konfigurasjon"
-
-#~ msgid ""
-#~ "Please enter information about your incoming mail server below. If you don't "
-#~ "know what"
-#~ msgstr ""
-#~ "Vennligst skriv inn informasjon om din tjener for innkommende e-post under. "
-#~ "Hvis du ikke vet hva"
-
-#~ msgid ""
-#~ "Please enter information about your outgoing mail protocol below. If you "
-#~ "don't know "
-#~ msgstr ""
-#~ "Vennligst skriv inn informasjon om protokoll for utgående e-post under. Hvis "
-#~ "du ikke vet "
-
-#~ msgid ""
-#~ "Please enter your name and email address below. The &quot;optional&quot; "
-#~ "fields below do not "
-#~ msgstr ""
-#~ "Vennligst skriv inn ditt navn og din e-post adresse under. "
-#~ "&quot;optional&quot; feltene under er ikke"
-
-#~ msgid "Preferred type: "
-#~ msgstr "Foretrukket type: "
-
-#~ msgid "Sending Mail"
-#~ msgstr "Sender e-post"
-
-#~ msgid ""
-#~ "You are almost done with the mail configuration process. The identity, "
-#~ "incoming"
-#~ msgstr ""
-#~ "Du er nesten ferdig med konfigurasjonsprosessen for e-post. Identiteten, "
-#~ "innkommende"
-
-#~ msgid ""
-#~ "Your mail server supports the following types of authentication. Please"
-#~ msgstr "Din e-post tjener støtter følgende typer autentisering. Vennligst"
-
-#~ msgid "Threading message list"
-#~ msgstr "Utvider tråder for meldingsliste"
-
-#~ msgid "Thread message list"
-#~ msgstr "Vis tråder i meldingsliste"
-
-#~ msgid "Drafts"
-#~ msgstr "Skisser"
-
-#~ msgid "Sent"
-#~ msgstr "Sendt"
-
-#~ msgid "_Submit Bug Report"
-#~ msgstr "_Send inn feilrapport"
-
-#~ msgid "Send _Now"
-#~ msgstr "Send _nå"
-
-#~ msgid "Custom search"
-#~ msgstr "Egendefinert søk"
-
-#~ msgid "Full Search"
-#~ msgstr "Fullt søk"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX ulest)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Ingen protokoll for åpning av URI `%s'"
-
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopiér til mappe"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_Flytt til mappe"
-
-#~ msgid "Recur on the"
-#~ msgstr "Gjeninntreff den"
-
-#~ msgid "th day of the month"
-#~ msgstr "de dagen i måneden"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Åpne i nytt vindu"
-
-#~ msgid "Forward Message"
-#~ msgstr "Videresend melding"
-
-#~ msgid "Move Message"
-#~ msgstr "Flytt melding"
-
-#~ msgid "Copy Message"
-#~ msgstr "Kopiér melding"
-
-#~ msgid "Quick Search"
-#~ msgstr "Raskt søk"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Ugyldig URL for lagring (ingen tjener): %s"
-
-#~ msgid "File As"
-#~ msgstr "Lagre som"
-
-#~ msgid "Family Name"
-#~ msgstr "Etternavn"
-
-#~ msgid "Prim"
-#~ msgstr "Pri"
-
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "Kunne ikke koble til IMAP-tjener på %s."
-
-#~ msgid "_Summary:"
-#~ msgstr "_Sammendrag:"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days\n"
-#~ msgstr ""
-#~ "Minutter\n"
-#~ "Timer\n"
-#~ "Dager\n"
-
-#~ msgid "Daily"
-#~ msgstr "Daglig"
-
-#~ msgid "Weekly"
-#~ msgstr "Ukentlig"
-
-#~ msgid "Monthly"
-#~ msgstr "Månedlig"
-
-#~ msgid "Yearly"
-#~ msgstr "Årlig"
-
-#~ msgid "label23"
-#~ msgstr "etikett23"
-
-#~ msgid "Every "
-#~ msgstr "Hver"
-
-#~ msgid "label24"
-#~ msgstr "etikett24"
-
-#~ msgid ""
-#~ "1st\n"
-#~ "2nd\n"
-#~ "3rd\n"
-#~ "4th\n"
-#~ "5th\n"
-#~ msgstr ""
-#~ "1ste\n"
-#~ "2dre\n"
-#~ "3dje\n"
-#~ "4de\n"
-#~ "5te\n"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday\n"
-#~ msgstr ""
-#~ "Mandag\n"
-#~ "Tirsdag\n"
-#~ "Onsdag\n"
-#~ "Torsdag\n"
-#~ "Fredag\n"
-#~ "Lørdag\n"
-#~ "Søndag\n"
-
-#~ msgid "label27"
-#~ msgstr "etikett27"
-
-#~ msgid "Ending date"
-#~ msgstr "Sluttdato"
-
-#~ msgid "End on "
-#~ msgstr "Slutt på "
-
-#~ msgid "Change"
-#~ msgstr "Endre"
-
-#~ msgid "_Unselect All"
-#~ msgstr "_Velg bort alt"
-
-#~ msgid "FIXME: Print..."
-#~ msgstr "Skriv ut..."
-
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Sett inn en fil som vedlegg"
-
-#~ msgid "FIXME: Assign Task..."
-#~ msgstr "Tildel oppgave..."
-
-#~ msgid "Assign the task to someone"
-#~ msgstr "Tildel oppgaven til noen"
-
-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "Ka_lender..."
-
-#~ msgid "Save and close this appointment"
-#~ msgstr "Lagre og lukk denne avtalen"
-
-#~ msgid "Invite attendees to a meeting"
-#~ msgstr "Invitér deltakere til et møte"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Klipp ut valgt oppføring til utklippstavlen"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopiér valgt oppføring til utklippstavlen"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "Velg mottakerenes adresser"
-
-#~ msgid "Search..."
-#~ msgstr "Søk..."
-
-#~ msgid "To: >>"
-#~ msgstr "Til: >>"
-
-#~ msgid "Cc: >>"
-#~ msgstr "Cc: >>"
-
-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc: >>"
-
-#~ msgid "label9"
-#~ msgstr "etikett9"
-
-#~ msgid "label7"
-#~ msgstr "etikett7"
-
-#~ msgid "label8"
-#~ msgstr "etikett8"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Les en tidligere lagret melding"
-
-#~ msgid "_Save..."
-#~ msgstr "_Lagre..."
-
-#~ msgid "Quit the message composer"
-#~ msgstr "Avslutt meldingsredigering"
-
-#~ msgid "More criteria"
-#~ msgstr "Flere kriterier"
-
-#~ msgid "Fewer criteria"
-#~ msgstr "Færre kriterier"
-
-#~ msgid "Run filter \"%s\""
-#~ msgstr "Kjør filter \"%s\""
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644
index 21a8726832..0000000000
--- a/po/pl.po
+++ /dev/null
@@ -1,6711 +0,0 @@
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-11-30 14:00+0100\n"
-"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nie mo¿na zainicjowaæ komponentu pocztowego Evlution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Nie mo¿na zainicjowaæ Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-#, fuzzy
-msgid "UNIX mbox-format mail files"
-msgstr "Pliki z listami w uniksowym formacie mbox"
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Nie ma komputera o nazwie %s."
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Sendmail"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Zamknij"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Przenie¶ do foldera"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Przechodzi do poprzedniego elementu"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Przechodzi do nastêpnego elementu"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Skonfiguruj folder"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nie mo¿na otworzyæ pliku %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "B³±d przy odczycie pliku z listem: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "bez b³êdu"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "Nie mo¿na nawi±zaæ po³±czenia z serwerem POP pod adresem %s."
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Nowy"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Tworzy nowy folder"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Nie mo¿na zainicjowaæ komponentu pocztowego Evlution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Nie mo¿na zainicjowaæ Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr "Karta: "
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nazwa: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Przedrostek: "
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Przyrostek: "
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data urodzenia: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adres:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Skrzynka pocztowa: "
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Ulica:       "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Miasto:      "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Kod pocztowy: "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Kraj:        "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefony:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Strefa czasowa: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Po³o¿enie geograficzne: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Stanowisko s³u¿bowe: "
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nazwa: "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Jednostka: "
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Jednostka2: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Jednostka3: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Jednostka4: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorie: "
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentarz: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Klucz publiczny: "
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Nieaktywne"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Zsynchronizuj"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Skopiuj z pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Skopiuj na pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Oryginalny autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation oraz Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Czynno¶æ synchronizacji"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stan po³±czenia"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Brak po³±czenia z demonem gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Podczas próby pobrania listy pilotów od demona\n"
-"gnome-pilot wyst±pi³ b³±d"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "Nie mo¿na uruchomiæ serwera wombat"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "Nie mo¿na uruchomiæ wombata"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Usuñ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Typy telefonów"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Nowy typ telefonu"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Dodaj"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Edytor kontaktów"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Pe³na nazwa..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Zapisz jako:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Adres strony WWW:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Chce otrzymywaæ listy w HTML-u"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Praca"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Dom"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Faks s³u¿bowy"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "P_rzeno¶ny"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "G³ówny e-mail"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "_Praca"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_Kontakty..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "K_ategorie..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "Tytu³ _s³u¿bowy:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Firma:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adres..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Ogólne"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Oddzia³:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Biuro:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Zawód:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Przydomek:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Urodziny:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Notatki:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Szczegó³y"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Asystent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Praca"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Praca 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Faks s³u¿bowy"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Samochód"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Dom"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Dom 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Faks w domu"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Przeno¶ny"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Inne"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Inny faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "G³ówny"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Pan\n"
-"Pani\n"
-"Dr\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tytu³:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Przyrostek:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Jako _tabela"
-
-#: addressbook/gui/component/addressbook.c:374
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Wprowad¼ has³o NNTP dla %s@%s"
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Nie mo¿na otworzyæ ksi±¿ki adresowej"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Wy¶wietl wszystkie"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Zaawansowane..."
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr "Jakiekolwiek pole zawiera"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr "Nazwa zawiera"
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr "E-mail zawiera"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "URI które ma wy¶wietliæ przegl±darka katalogów"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "_Nowy Kontakt"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Serwer LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Plik"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Nie mo¿na otworzyæ ksi±¿ki adresowej"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Has³o"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Nieznany b³±d"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Wklej"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Zapisz"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "Godziny"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "_Priorytety:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Wyszukiwanie"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Uwierzytelnianie:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "¦cie¿ka:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Podany plik nie istnieje."
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Zapisz w ksi±¿ce adresowej"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Zapisz w ksi±¿ce adresowej"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "Opis:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Wyszukiwanie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Zapisz jako VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#, fuzzy
-msgid "Name"
-msgstr "Nazwa:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organizacja"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "_Oddzia³:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "_Biuro:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Tytu³:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "_Zawód:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Pager"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "_Przydomek:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "¬ród³o"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Brak"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Zapisz w ksi±¿ce adresowej"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "B³±d przy komunikacji z serwerem terminarza"
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Przypomnienie o terminie "
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Nie odnaleziono pliku"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Otwórz terminarz"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Zapisz terminarz"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr "Publiczny"
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr "Prywatny"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr "Tajny"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data musi byæ podana w formacie: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Po³o¿enie geograficzne musi byæ podane w formacie: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Warto¶æ procentowa musi siê zawieraæ w przedziale od 0 do 100 w³±cznie"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Priorytet musi siê zawieraæ w przedziale od 1 do 9 w³±cznie"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %B %d, %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "B³±d przy odczycie pliku : %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "_Wy¶wietlanie"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Wy¶wietlanie czasu koñca terminu"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "Prze³±cza wy¶wietlanie za³±czników"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Drukuj terminarz"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "Modyfikuj zadanie"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "Zadanie - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "kategorie"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Klasyfikacja"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "% _zakoñczenia:"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Czas _zakoñczenia"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Czas _rozpoczêcia:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Data wykonania"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "Oznacza zadanie jako zakoñczone"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Priorytet"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "Z_estawienie:"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Alarms"
-msgstr "Alarmy d¼wiêkowe"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Otwórz..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Otwiera zadanie"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Oznacz jako zakoñczone"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Oznacza zadanie jako zakoñczone"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Usuñ"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Usuwa zadanie"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Nowy termin..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Modyfikuj termin..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "Usuñ termin"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Przekszta³æ ten termin w przesuwalny"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr "Usuñ to wyst±pienie"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr "Usuñ wszystkie wyst±pienia"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr ""
-"\n"
-"Kategorie: "
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nie mo¿na wczytaæ terminarza w \"%s\""
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Modyfikuj termin"
-
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dzieñ"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Poniedzia³ek"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "¦roda"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Pi±tek"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Sobota"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Niedziela"
-
-#: calendar/gui/event-editor.c:561
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr "powtórzenia"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"Nie mo¿na otworzyæ foldera \"%s\":\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Nie"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Pon"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Wto"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "¦ro"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Czw"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pi±"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sob"
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Nie mo¿na zainicjowaæ Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "Ni"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "Po"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "Wt"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "¦r"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "Cz"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "Pt"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "So"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Zadania"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "Bie¿±cy dzieñ (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Bie¿±cy tydzieñ (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr "Bie¿±cy miesi±æ (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Bie¿±cy rok (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Drukuj terminarz"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Podgl±d wydruku"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "URI które ma wy¶wietliæ przegl±darka katalogów"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nie mo¿na utworzuæ pliku blokady dla %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nie mo¿na sprawdziæ pliku z listami %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Nie mo¿na otworzyæ pliku z listami %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Nie mo¿na otworzyæ tymczasowego pliku z listami %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "B³±d przy odczycie pliku z listem: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "B³±d przy zapisie do tymczasowego pliku z listami: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Zapisanie listu w pliku tymczasowym %s nie powiod³o siê: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Utworzenie potoku nie powiod³o siê: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Nie mo¿na utworzyæ procesu: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Nieznany b³±d)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Nie mo¿na wczytaæ %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Nie mo¿na wczytaæ %s: Brak kodu inicjuj±cego w module."
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Anuluj"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nie mo¿na nawi±zañ po³±czenia z %s (port %d): %s"
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(nieznany komputer)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Otwórz terminarz"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "W URL-u \"%s\" wymagana jest nazwa u¿ytkownika"
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "W URL-u \"%s\" wymagana jest ¶cie¿ka"
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr "Nie ma komputera o nazwie %s."
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Brak dostarczyciela dla protoko³u \"%s\""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Nie mo¿na utworzyæ katalogu %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL \"%s\" nie zawiera nazwy protoko³u"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL \"%s\" nie zawiera niepoprawn± nazwê protoko³u"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Numer portu w URL-u \"%s\" nie jest numeryczny"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "Utworzenie potoku nie powiod³o siê: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Nieoczekiwana odpowied¼ od serwera IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Nieoczekiwana odpowied¼ od serwera IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Nie powiod³o siê polecenie IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "Nieznany b³±d"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Nieoczekiwana odpowied¼ OK od serwera IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "Nie mo¿na odnale¼æ tre¶ci listu w odpowiedzi na FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Przy tej opcji nast±pi po³±czenie z serwerem IMAP z u¿yciem hase³ w postaci "
-"czystego tekstu."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Przy tej opcji nast±pi po³±czenie z serwerem IMAP z wykorzystaniem "
-"uwierzytelniania Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sWprowad¼ has³o IMAP dla %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nie mo¿na dokonaæ uwierzytelnienia na serwerze IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nie mo¿na utworzyæ katalogu %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "Lokalny katalog z listami %s"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "\"%s\" nie jest zwyk³ym plikiem."
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Nie mo¿na utworzyæ procesu dla %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-#, fuzzy
-msgid "Local folders may not be nested."
-msgstr "Foldery mbox nie mog± byæ zagnie¿d¿one."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokalny plik z listami %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Nie mo¿na zmieniæ nazwy foldera \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Nie mo¿na usun±æ foldera \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Nie mo¿na usun±æ foldera \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nie mo¿na do³±czyæ listu do foldera mh: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nie mo¿na pobraæ listu: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "Nie ma komputera o nazwie %s."
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-#, fuzzy
-msgid "Invalid message contents"
-msgstr "Wy¶lij _list do kontaktu..."
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na otworzyæ foldera \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Folder \"%s\" nie istnieje."
-
-# y, c-format
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na utworzyæ foldera \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, fuzzy, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "\"%s\" nie jest katalogiem."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nie mo¿na usun±æ foldera \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-#, fuzzy
-msgid "not a maildir directory"
-msgstr "Lokalny katalog z listami %s"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nie mo¿na otworzyæ tymczasowej skrzynki: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, fuzzy, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nie mo¿na do³±czyæ listu do pliku mbox: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nie mo¿na pobraæ listu: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na otworzyæ pliku \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na utworzyæ pliku \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "\"%s\" nie jest zwyk³ym plikiem."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na usun±æ foldera \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Folder \"%s\" nie jest pusty. Nie zosta³ usuniêty."
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nie mo¿na otworzyæ foldera: spis listów by³ niekompletny."
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Nie mo¿na utworzyæ procesu dla %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"Nie mo¿na otworzyæ foldera \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Nie mo¿na otworzyæ tymczasowej skrzynki: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, fuzzy, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Nie mo¿na otworzyæ pliku z listami %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Nie mo¿na zamkn±æ foldera ¼ród³owego %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Nie mo¿na zamkn±æ foldera tymczasowego: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Nie mo¿na zmieniæ nazwy foldera: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Nieznany b³±d: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nie mo¿na do³±czyæ listu do foldera mh: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" nie jest katalogiem."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Wprowad¼ has³o NNTP dla %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Swerwer odrzuci³ nazwê u¿ytkownika"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Wys³anie nazwy u¿ytkownika do serwera nie powiod³o siê"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Serwer odrzuci³ nazwê u¿ytkownika/has³o"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Nie odnaleziono listu %s."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Nie mo¿na otworzyæ lub utworzyæ pliku .newsrc dla %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nie mo¿na otworzyæ foldera: spis listów by³ niekompletny."
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "Brak listu o warto¶ci uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nie mo¿na pobraæ listu z serwera POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nie mo¿na przeprowadziæ uwierzytelnienia na serwerze KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Nie mo¿na nawi±zaæ po³±czenia z serwerem POP pod adresem %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sWprowad¼ has³o POP3 dla %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nie mo¿na nawi±zaæ po³±czenia z serwerem POP.\n"
-"Wyst±pi³ b³±d przy wysy³aniu nazwy u¿ytkownika: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(Nieznane)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Nie mo¿na nawi±zaæ po³±czenia z serwerem POP.\n"
-"Wyst±pi³ b³±d przy wysy³aniu has³a: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Folder \"%s\" nie istnieje."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Nie mo¿na utworzyæ potoku do programu sendmail: %s: poczta nie zosta³a "
-"wys³ana"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-"Nie mo¿na utworzyæ procesu dla programu sendmail: %s: poczta nie zosta³a "
-"wys³ana"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Nie mo¿na wys³aæ listu: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-"Program sendmail zosta³ przerwany przez sygna³ %s: poczta nie zosta³a "
-"wys³ana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Nie mo¿na wykonaæ %s: poczta nie zosta³a wys³ana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-"Program sendmail zosta³ zakoñczony z kodem stanu %d: poczta nie zosta³a "
-"wys³ana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Wysy³anie listów za pomoc± programu sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Uwierzytelnianie:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Przy tej opcji nast±pi po³±czenie z serwerem IMAP z wykorzystaniem "
-"uwierzytelniania Kerberos 4."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, fuzzy, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Wysy³anie listów za pomoc± programu sendmail"
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-"Nie mo¿na utworzyæ potoku do programu sendmail: %s: poczta nie zosta³a "
-"wys³ana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr "Nie mo¿na wykonaæ %s: poczta nie zosta³a wys³ana."
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Nie mo¿na wykonaæ %s: poczta nie zosta³a wys³ana."
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, fuzzy, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-"Nie mo¿na utworzyæ procesu dla programu sendmail: %s: poczta nie zosta³a "
-"wys³ana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, fuzzy, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Program sendmail zosta³ przerwany przez sygna³ %s: poczta nie zosta³a "
-"wys³ana."
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "Nieznany b³±d: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtów"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fk"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "za³±cznik"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Za³±czenie pliku"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Usuñ"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Usuwa wybrane elementy z listy za³±czników"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Dodaj za³±cznik..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Za³±cza plik do listu"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "Od:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Kliknij tu aby otworzyæ ksi±¿kê adresow±"
-
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Dla:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "Podaj adres odbiorcy listu"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Podaj adresy, pod które zostanie przes³ana kopia listu"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Podaj adresy, pod które zostanie przes³ana kopia listu bez listy odbiorców."
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Temat:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Podaj temat listu"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "Zapisz jako..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "B³±d przy zapisie pliku: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "B³±d przy odczycie pliku : %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Zapisywanie zmian listu..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Zapisz zmiany listu..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"List nie zosta³ wys³any.\n"
-"\n"
-"Czy chcesz zapisaæ zmiany?"
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Otwiera plik"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "Podany plik nie istnieje."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "Podany plik nie jest zwyk³ym plikiem."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr "Podany plik istnieje, lecz nie mo¿na go odczytaæ."
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-"Podany plik wydaje siê byæ odczytywalny, lecz funkcja open(2) nie powiod³a "
-"siê."
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Plik jest bardzo du¿y (wiêkszy ni¿ 100K).\n"
-"Czy na pewno chcesz go wstawiæ?"
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "Podczas odczytu pliku wyst±pi³ b³±d."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Tworzenie listu"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "rok"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "lat"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "miesi±c"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "miesiêcy"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "tydzieñ"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "tygodni"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dni"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "godzina"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "godzin"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuta"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minut"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunda"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Data listu bêdzie porównywana z czasem\n"
-"zastosowania filtra."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Data listu bêdzie porównywana z czasem podanym\n"
-"poni¿ej."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Data listu bêdzie porównywana z czasem podanym\n"
-"jako wzglêdny do czasu zastosowania filtra, np.\n"
-"\"tydzieñ temu\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "bie¿±cym czasem"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "podanym czasem"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "czasem podanym wzglêdem bie¿±cego"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Porównanie z"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "teraz"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<kliknij, aby wybraæ datê>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Dodanie regu³y filtra"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Zmodyfikuj regu³ê filtra"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr ""
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "Podejmowane czynno¶ci"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "Dodaj czynno¶æ"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "Usuñ czynno¶æ"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Wybór foldera"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Wprowad¼ URI foldera"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<kliknij, aby wybraæ folder> "
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"B³±d w wyra¿eniu regularnym \"%s\":\n"
-"%s"
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nazwa regu³y: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Bez nazwy"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Lista warunków"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Wykonywanie czynno¶ci"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "przy spe³nieniu wszystkich kryteriów"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "przy spe³nieniu któregokolwiek z kryteriów"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Dodaj kryterium"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Usuñ kryterium"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Wszystkim"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Ponów"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Przypisz kolor"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Kopiuj do foldera"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data otrzymania"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data wys³ania"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Wyra¿enie"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Prze¶lij na adres"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Tre¶æ listu"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Nag³ówek listu"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "List zosta³ otrzymany"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "List zosta³ wys³any"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Przenie¶ do foldera"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Lista odbiorców"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Nadawca"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Stan:"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "¬ród³o"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Okre¶lony nag³ówek"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Stan:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Zatrzymanie przetwarzania"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Temat"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "przed"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "zawiera"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nie zawiera"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nie koñczy siê na"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nie istnieje"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nie rozpoczyna siê od"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "koñczy siê na"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "istnieje"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "jest wiêkszy ni¿"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "jest mniejszy ni¿"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nie jest"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "jest"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "w lub po"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "w lub przed"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "jest po"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "jest przed"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Dodaj regu³ê"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Dodaj regu³ê VFoldera"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Zmodyfikuj regu³ê VFoldera"
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Nie mo¿na zainicjowaæ komponentu pocztowego Evlution."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Wybór foldera"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "Tre¶æ lub temat zawiera"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "Tre¶æ zawiera"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "Temat zawiera"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "Tre¶æ nie zawiera"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "Temat nie zawiera"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr "Utwórz VFolder w oparciu o temat"
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr "Utwórz VFolder w oparciu o nadawcê"
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr "Utwórz VFolder w oparciu o odbiorców"
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr "Utwórz filtr w oparciu o temat"
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr "Utwórz filtr w oparciu o nadawcê"
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr "Utwórz filtr w oparciu o odbiorców"
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr "Utwórz filtr w oparciu o listê dyskusyjn±"
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "Otwórz"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Edycja"
-
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Save As..."
-msgstr "Zapisz j_ako..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Drukuj"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "Odpowiedz nadawcy"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Wszystkim"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "Prze¶lij"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "Przemieszcza w czasie do przodu"
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr "Oznacz jako przeczytany"
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr "Oznacz jako nieprzeczytany"
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr "Przenie¶ do foldera..."
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr "Kopiuj do foldera..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr "Cofnij usuniêcie"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr "Zastosuj filtry"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr "Utwórz regu³ê na podstawie listu"
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Utwórz filtr w oparciu o listê dyskusyjn± (%s)"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Brak"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Domy¶lne"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Instalacja Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "lista dyskusyjna %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "Nie zosta³ skonfigurowany folder Poczta wychodz±ca"
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"List nie zawiera tematu.\n"
-"Naprawdê wys³aæ?"
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr "Przes³any list:\n"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr "Przenoszenie listów do foldera"
-
-#: mail/mail-callbacks.c:677
-msgid "Copy message(s) to"
-msgstr "Kopiowanie listów do foldera"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Mo¿liwe jest redagowanie wy³±cznie\n"
-"listów zapisanych w folderze Poczta robocza."
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr "Nadpisaæ plik?"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Plik o tej nazwie ju¿ istnieje.\n"
-"Nadpisaæ go?"
-
-#: mail/mail-callbacks.c:893
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Zapisz jako..."
-
-#: mail/mail-callbacks.c:895
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Zapisz jako..."
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"B³±d przy wczytywaniu informacji o filtrze:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "Wydrukuj list"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "Wydrukowanie listu nie powiod³o siê"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Nie mo¿na otworzyæ pliku %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Nie mo¿na zapisaæ danych: %s"
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "Zapis za³±cznika"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nie mo¿na utworzyæ katalogu tymczasowego: %s"
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr "Zapisz na dysk..."
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr "Otwórz za pomoc± programu %s..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr "Wy¶wietl na miejscu"
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr "Zewnêtrzna przegl±darka"
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Wy¶wietl na miejscu (za pomoc± programu %s)"
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "Ukryj"
-
-#: mail/mail-format.c:504
-#, c-format
-msgid "%s attachment"
-msgstr "Za³±cznik %s"
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr "List zaszyfrowany"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr "Kliknij ikonê aby rozszyfrowaæ."
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Wska¼nik do witryny FTP (%s)"
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Wska¼nik do lokalnego pliku (%s)"
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Konwertowanie foldera \"%s\" na format \"%s\""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Skonfiguruj folder"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "Zamykanie bie¿±cego foldera"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Tworzenie nowego foldera"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Kopiowanie listów"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr "Rejestrowanie lokalnego foldera"
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr "Zarejestruj lokalny folder"
-
-# y, c-format
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Nie mo¿na utworzyæ foldera \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:85
-#, fuzzy, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"B³±d podczas \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"B³±d przy wczytywaniu informacji o filtrze:\n"
-"%s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Przenoszenie"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr "Filtrowanie listu na ¿±danie"
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr "Filtruj list na ¿±danie"
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Wysy³anie \"%s\""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Natychmiast wysy³a wiadomo¶æ"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "Wysy³anie kolejki"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr "Wy¶lij kolejkê"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Do³±czanie \"%s\""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr "Do³±czanie listu bez tematu"
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Przenoszenie listów z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopiowanie listów z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Przenie¶ listy z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Skopiuj listy z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "Przenoszenie"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "Kopiowanie"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Brak opisu)"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Przes³any list:\n"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Nie mo¿na utworzyæ procesu dla %s: %s"
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synchronizowanie \"%s\""
-
-#: mail/mail-ops.c:1401
-#, fuzzy
-msgid "Expunging folder"
-msgstr "Czyszczenie \"%s\""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Pobieranie listu %d z %d"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Pobieranie listu %d z %d"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Wczytywanie foldera %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Wczytywanie foldera %s"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Kopiowanie listów"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "Nie mo¿na otworzyæ lub utworzyæ pliku .newsrc dla %s: %s"
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Zaznaczanie listu %d z %d"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "B³±d przy zapisie pliku: %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"B³±d podczas \"%s\":\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Nie mo¿na utworzyæ okna dialogowego."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Pobieranie listu %d z %d"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "Zapisywanie listu %d z %d"
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "Zapisywanie zmian do %s"
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (przes³any list)"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Przes³any list - %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "Przes³any list (bez tematu)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr "VFoldery"
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "Nowy VFolder"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Odpowiedz"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "Odpowiada nadawcy listu"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Odpowiada wszystkim odbiorcom listu"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "Przesy³a list dalej"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "Drukuje list"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "Usuwa list"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr "Niewidziany"
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr "Widziany"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "Nieznany"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%a %d %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr "Oznaczony"
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "za³±cznik"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "Od:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Data wykonania"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Data otrzymania"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "Dla:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Rozmiar:"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Wprowad¼ has³o NNTP dla %s@%s"
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "Brak dostêpnego programu GPG/PGP."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr "Nie podano has³a."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo¿na utworzyæ potoku do GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Utworzenie potoku nie powiod³o siê: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "Foldery"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "¬ród³o"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instalacja Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Kliknij \"OK\" aby zainstalowaæ pliki lub \"Anuluj\" aby zakoñczyæ."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr ""
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Nie mo¿na utworzyæ katalogu\n"
-"%s\n"
-"B³±d: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Nie mo¿na skopiowaæ plików do\n"
-"\"%s\"."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nie mo¿na utworzyæ podanego foldera:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Nowy..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nie znajduje siê w ¶cie¿ce."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "Nie mo¿na uruchomiæ Bug buddy."
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution to pakiet aplikacji do\n"
-"komunikacji grupowej przez pocztê\n"
-"elektroniczn±, wspólny terminarz\n"
-"i zarz±dzanie kontaktami w\n"
-"¶rodowisku GNOME."
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr ""
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "Foldery"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nie mo¿na ustawiæ lokalnego pojemnika -- %s"
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nazwa grupy:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nowa grupa..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Wy¶wietlanie paska _skrótów"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Wy¶wietlanie paska _skrótów"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Widok"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Wy¶wietla zaznaczony folder"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(Bez nazwy)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "bez b³êdu"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "B³±d We/Wy"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "Brak miejsca na utworzenie foldera"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "Nie odnaleziono okre¶lonego foldera"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr "Brak uprawnieñ"
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-#, fuzzy
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Cze¶æ. Dziêki za poswiêcenie chwili na ¶ci±gniêcie tej wersji\n"
-"wstêpnej pakietu do komunikacji grupowej Evolution.\n"
-"\n"
-"Zespó³ Evolution ciê¿ko pracowa³ nad stworzeniem tego programu\n"
-"tak rozszerzalnym, ³adnym, szybkim i dopasowanym do potrzeb\n"
-"zagorza³ych uzytkowników Internetu, jak to tylko mo¿liwe. Jeste¶my\n"
-"bardzo zmêczeni. Ale to jeszcze nie koniec -- jeszcze nie.\n"
-"Podczas odkrywania Evolution nale¿y pamiêtaæ, ¿e wiêkszo¶æ naszej pracy\n"
-"zosta³a po¶wiêcona silnikowi napêdzaj±cemu system, a nie interfejsowi\n"
-"u¿ytkownika. W ka¿dym razie od tej pory bêdziemy wk³adaæ wiêkszo¶æ\n"
-"naszej mi³o¶ci i troski w³a¶nie w interfejs. Ale przynajmniej wiadomo,\n"
-"¿e to nie jest demo.\n"
-"Pora na umycie r±czek. Evolution bêdzie: przewracaæ siê, gubiæ przesy³ki,\n"
-"mno¿yæ procesy, zjadaæ 100 mocy procesora, zawieszaæ siê, wysy³aæ\n"
-"przesy³ki w HTML-u na losowe listy dyskusyjne i zawstydzaæ Ciê\n"
-"przed Twoimi przyjació³mi i wspó³pracownikami. U¿ywaj na w³asn±\n"
-"odpowiedzialno¶æ.\n"
-"Mamy nadzieje, ¿e spodoba Ci siê efekt naszej ciê¿kiej pracy\n"
-"i niecierpliwie oczekujemy Twojej pomocy!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Dziêki\n"
-"Zespó³ Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Nie mo¿na uruchomiæ pow³oki Evlution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Nie mo¿na zainicjowaæ systemu komponentów Bonobo."
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Nowy termin"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Ustawienia strony:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "P_isownia..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Oznacz jako nieprzeczytany"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Obiekt"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "_Poprzedni"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Nastêpny"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "_Plik..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "_Czcionka..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "_Akapit..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "P_isownia..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Wy¶lij _list do kontaktu..."
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "P_isownia..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "_Akapit..."
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "P_isownia..."
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Wstaw"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Narzêdzia"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_Czynno¶ci"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Poprzedni"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Przechodzi do poprzedniego elementu"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Przechodzi do nastêpnego elementu"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Zajêty"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Poza biurem"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Brak informacji"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcje"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Wy¶wietlanie _tylko godzin roboczych"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Wszyscy ludzie i zasoby"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Wszyscy _ludzie i jeden zasób"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Wymagani ludzie"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Wymagani ludzie i j_eden zasób"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Czas p_ocz±tku spotkania:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Czas _koñca spotkania:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Teraz"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Dzi¶"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "_Wyszukiwanie"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupa %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Usun±æ kontakt?"
-
-#~ msgid "Address _2:"
-#~ msgstr "Adres _2:"
-
-#, fuzzy
-#~ msgid "Canada"
-#~ msgstr "Terminarz"
-
-#~ msgid "Countr_y:"
-#~ msgstr "_Kraj:"
-
-#, fuzzy
-#~ msgid "Finland"
-#~ msgstr "Znajd¼"
-
-#~ msgid "_Address:"
-#~ msgstr "_Adres:"
-
-#~ msgid "_City:"
-#~ msgstr "_Miasto:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "_Stan/Prowincja:"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Dodaj ¼ród³o"
-
-#~ msgid "Find..."
-#~ msgstr "Znajd¼..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "Odbiorcy listu"
-
-#~ msgid "Select Names"
-#~ msgstr "Wybierz nazw"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Wybierz nazwê z listy:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
-
-#, fuzzy
-#~ msgid "e"
-#~ msgstr "¦r"
-
-#, fuzzy
-#~ msgid "f"
-#~ msgstr "Lista warunków"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#, fuzzy
-#~ msgid "i"
-#~ msgstr "jest"
-
-#, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
-
-#, fuzzy
-#~ msgid "m"
-#~ msgstr "am"
-
-#, fuzzy
-#~ msgid "o"
-#~ msgstr "Po"
-
-#, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
-
-#, fuzzy
-#~ msgid "r"
-#~ msgstr "Pt"
-
-#, fuzzy
-#~ msgid "s"
-#~ msgstr "jest"
-
-#, fuzzy
-#~ msgid "t"
-#~ msgstr "."
-
-#, fuzzy
-#~ msgid "u"
-#~ msgstr "Ni"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10-punktowa Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8-ounktowa Tahoma"
-
-#~ msgid "Body"
-#~ msgstr "Tre¶æ"
-
-#~ msgid "Bottom:"
-#~ msgstr "Dó³:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Wymiary:"
-
-#~ msgid "Font..."
-#~ msgstr "Czcionka..."
-
-#~ msgid "Fonts"
-#~ msgstr "Czcionki"
-
-#~ msgid "Footer:"
-#~ msgstr "Stopka:"
-
-#~ msgid "Header"
-#~ msgstr "G³ówka"
-
-#~ msgid "Header/Footer"
-#~ msgstr "G³ówka/Stopka"
-
-#~ msgid "Height:"
-#~ msgstr "Wysoko¶æ:"
-
-#~ msgid "Landscape"
-#~ msgstr "Pejza¿"
-
-#~ msgid "Left:"
-#~ msgstr "Lewy:"
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "Zak³adki liter z boku"
-
-#~ msgid "Margins"
-#~ msgstr "Marginesy"
-
-#~ msgid "Number of columns:"
-#~ msgstr "Liczba kolumn:"
-
-#~ msgid "Options"
-#~ msgstr "Opcje"
-
-#~ msgid "Orientation"
-#~ msgstr "U³o¿enie"
-
-#~ msgid "Page"
-#~ msgstr "Strona"
-
-#~ msgid "Paper"
-#~ msgstr "Papier"
-
-#~ msgid "Paper source:"
-#~ msgstr "¬ród³o papieru:"
-
-#~ msgid "Portrait"
-#~ msgstr "Portret"
-
-#~ msgid "Preview:"
-#~ msgstr "Podgl±d:"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "Odwrotnie na stronach parzystych"
-
-#~ msgid "Right:"
-#~ msgstr "Prawy:"
-
-#~ msgid "Sections:"
-#~ msgstr "Sekcje:"
-
-#~ msgid "Start on a new page"
-#~ msgstr "Rozpoczynanie na nowej stronie"
-
-#~ msgid "Style name:"
-#~ msgstr "Nazwa stylu:"
-
-#~ msgid "Top:"
-#~ msgstr "Góra:"
-
-#~ msgid "Type:"
-#~ msgstr "Typ:"
-
-#~ msgid "Width:"
-#~ msgstr "Szeroko¶æ:"
-
-#~ msgid "label26"
-#~ msgstr "etykieta26"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Terminarz"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Nie mo¿na zainicjowaæ komponentu pocztowego Evlution."
-
-#~ msgid "Edit appointment"
-#~ msgstr "Modyfikuj termin"
-
-#, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "minut"
-
-#, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "minut"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12-godzinny (am/pm)"
-
-#, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "minut"
-
-#~ msgid "24 hour"
-#~ msgstr "24-godzinny"
-
-#, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "minut"
-
-#, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "minut"
-
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Sygna³ d¼wiêkowy przy pojawianiu siê okien alarmu."
-
-#~ msgid "Calendar"
-#~ msgstr "Terminarz"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Ustawienia termiarza"
-
-#~ msgid "Colors"
-#~ msgstr "Kolory"
-
-#~ msgid "Compress weekends"
-#~ msgstr "Kompresowanie weekendów"
-
-#~ msgid "Date navigator options"
-#~ msgstr "Opcje wyboru daty"
-
-#~ msgid "Defaults"
-#~ msgstr "Domy¶lne"
-
-#~ msgid "Display options"
-#~ msgstr "Opcje wy¶wietlania"
-
-#~ msgid "End of day:"
-#~ msgstr "Koniec dnia:"
-
-#~ msgid "First day of week:"
-#~ msgstr "Pierwszy dzieñ tygodnia:"
-
-#~ msgid "Pick a color"
-#~ msgstr "Wybór koloru"
-
-#~ msgid "Show week numbers"
-#~ msgstr "Wy¶wietlanie numerów tygodni"
-
-#~ msgid "Start of day:"
-#~ msgstr "Pocz±tek dnia:"
-
-#~ msgid "Time divisions:"
-#~ msgstr "Przedzia³y czasu:"
-
-#~ msgid "Time format:"
-#~ msgstr "Format czasu:"
-
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmy wizualne"
-
-#~ msgid "Work week"
-#~ msgstr "Tydzieñ roboczy"
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% _zakoñczenia:"
-
-#~ msgid "Date Completed:"
-#~ msgstr "Data zakoñczenia:"
-
-#, fuzzy
-#~ msgid "High"
-#~ msgstr "Wysoko¶æ:"
-
-#, fuzzy
-#~ msgid "Low"
-#~ msgstr "teraz"
-
-#, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "_Rozpoczynanie"
-
-#~ msgid "Task"
-#~ msgstr "Zadanie"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontakty..."
-
-#~ msgid "_Priority:"
-#~ msgstr "_Priorytety:"
-
-#~ msgid "_Status:"
-#~ msgstr "_Stan:"
-
-#~ msgid "A_ll day event"
-#~ msgstr "Wydarzenie _ca³odniowe"
-
-#~ msgid "Appointment Basics"
-#~ msgstr "Podstawowe elementy"
-
-#~ msgid "Custom recurrence"
-#~ msgstr "Dowolna powtarzalno¶æ"
-
-#~ msgid "Days"
-#~ msgstr "Dni"
-
-#~ msgid "Exceptions"
-#~ msgstr "Wyj±tki"
-
-#~ msgid "Hours"
-#~ msgstr "Godziny"
-
-#~ msgid "Mail _to:"
-#~ msgstr "_Adresat listu:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuty"
-
-#~ msgid "Modify"
-#~ msgstr "Zmieñ"
-
-#~ msgid "No recurrence"
-#~ msgstr "Brak powtarzalno¶ci"
-
-#~ msgid "Preview"
-#~ msgstr "Podgl±d"
-
-#~ msgid "Pri_vate"
-#~ msgstr "P_rywatny"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Pu_bliczny"
-
-#~ msgid "Recurrence"
-#~ msgstr "Powtarzalno¶æ"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regu³a powtarzalno¶ci"
-
-#~ msgid "Reminder"
-#~ msgstr "Przypominanie"
-
-#~ msgid "Simple recurrence"
-#~ msgstr "Prosta powtarzalno¶æ"
-
-#~ msgid "Time"
-#~ msgstr "Czas"
-
-#~ msgid "_Audio"
-#~ msgstr "_D¼wiêk"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Tajny"
-
-#~ msgid "_Mail"
-#~ msgstr "_List"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid "_Run program:"
-#~ msgstr "U_ruchomiany program:"
-
-#~ msgid "_Start time:"
-#~ msgstr "Czas _rozpoczêcia:"
-
-#~ msgid "_Starting date:"
-#~ msgstr "Czas _rozpoczêcia:"
-
-#~ msgid "day(s)"
-#~ msgstr "dzieñ/dni"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
-
-#~ msgid "label21"
-#~ msgstr "etykieta21"
-
-#~ msgid "month(s)"
-#~ msgstr "miesiêcy"
-
-#~ msgid "week(s)"
-#~ msgstr "tygodni"
-
-#~ msgid "year(s)"
-#~ msgstr "lat"
-
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Nie mo¿na wczytaæ terminarza w \"%s\""
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "kwiecieñ"
-
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "sierpieñ"
-
-#, fuzzy
-#~ msgid "December"
-#~ msgstr "grudzieñ"
-
-#, fuzzy
-#~ msgid "February"
-#~ msgstr "luty"
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Przejd¼ do daty:"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Przejd¼ do dnia dzisiejszego"
-
-#, fuzzy
-#~ msgid "January"
-#~ msgstr "styczeñ"
-
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "lipiec"
-
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "czerwiec"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "marzec"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "Poniedzia³ek"
-
-#, fuzzy
-#~ msgid "November"
-#~ msgstr "listopad"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "pa¼dziernik"
-
-#, fuzzy
-#~ msgid "September"
-#~ msgstr "wrzesieñ"
-
-#~ msgid "Attachment properties"
-#~ msgstr "W³a¶ciwo¶ci za³±cznika"
-
-#~ msgid "File name:"
-#~ msgstr "Nazwa pliku:"
-
-#~ msgid "MIME type:"
-#~ msgstr "Typ MIME:"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "Modyfikacja VFolderów"
-
-#~ msgid "Filter Rules"
-#~ msgstr "Regu³y filtrów"
-
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Obrys:"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "Wirtualne foldery"
-
-#~ msgid "vFolder Sources"
-#~ msgstr "¬ród³a VFolderów"
-
-#~ msgid "Save"
-#~ msgstr "Zapisz"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Wy¶wietl wszystkie"
-
-#, fuzzy
-#~ msgid "Hide selected"
-#~ msgstr "Usuniêty"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Ukryj"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Usuniêty"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Temat"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Utwórz filtr w oparciu o nadawcê"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Wydrukuj list"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Nie mo¿na uruchomiæ wombata"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Format czasu:"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Nie skonfigurowano ¿adnych ¼róde³ listów"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Brak informacji"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "W³a¶ciwo¶ci za³±cznika"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Zaawansowane..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Uwierzytelnianie:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Uwierzytelnianie:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "bez usuwania listów z serwera"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Brak"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adres e-mail:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Adres e-mail:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Konfiguracja poczty"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Pe³na nazwa:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "nazwa u¿ytkownika:"
-
-#, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAPv4"
-
-#~ msgid "Identity"
-#~ msgstr "Dane osobowe"
-
-#, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_List"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "E-mail zawiera"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Konfiguracja poczty"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Konfiguracja poczty"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "Nowy"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Opcje"
-
-#~ msgid "Organization:"
-#~ msgstr "Organizacja:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Has³o"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Odpowiedz"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "_Wymagani ludzie"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Zapisz jako VCard"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Plik z podpisem:"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Konfiguracja poczty"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Serwer:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Serwer:"
-
-#~ msgid "Signature file:"
-#~ msgstr "Plik z podpisem:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Plik z podpisem:"
-
-#~ msgid "Sources"
-#~ msgstr "¬ród³a"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "Typ:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Brak informacji"
-
-#~ msgid "Username:"
-#~ msgstr "nazwa u¿ytkownika:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minut"
-
-#~ msgid "Full name:"
-#~ msgstr "Pe³na nazwa:"
-
-#~ msgid "Email address:"
-#~ msgstr "Adres e-mail:"
-
-#~ msgid "Signature File"
-#~ msgstr "Plik z podpisem"
-
-#~ msgid "Server:"
-#~ msgstr "Serwer:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Wykryj obs³ugiwane typy..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "bez usuwania listów z serwera"
-
-#~ msgid "Test Settings"
-#~ msgstr "Przetestuj ustawienia"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Typ ¼ród³a listów:"
-
-#~ msgid "Add Source"
-#~ msgstr "Dodaj ¼ród³o"
-
-#~ msgid "Edit Source"
-#~ msgstr "Zmodyfikuj ¼ród³o"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Testowanie \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Po³±czenie zakoñczy³o siê powodzeniem!"
-
-#~ msgid "Address"
-#~ msgstr "Adres"
-
-#~ msgid "Mail Sources"
-#~ msgstr "¬ród³a listów"
-
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Opó¼nienie oznaczania listu jako widzianego [ms]: "
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Wysy³anie listów w formacie HTML"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "W tej kopii Evolution nie jest dostêpna obs³uga GPG/PGP"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Tworzy nowy kontakt"
-
-#~ msgid "Delete a contact"
-#~ msgstr "Usuñ kontakt"
-
-#~ msgid "Find"
-#~ msgstr "Znajd¼"
-
-#~ msgid "Find a contact"
-#~ msgstr "Odnajduje kontakt"
-
-#~ msgid "Print contacts"
-#~ msgstr "Drukuj kontakty"
-
-#~ msgid "Stop"
-#~ msgstr "Zatrzymaj"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Zatrzymuje wczytywanie"
-
-#~ msgid "View All"
-#~ msgstr "Wy¶wietl wszystkie"
-
-#~ msgid "View all contacts"
-#~ msgstr "Wy¶wietla wszystkie kontakty"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Konfiguracja _listów"
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Drukuj kontakty..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_Szukaj kontaktów"
-
-#~ msgid "5 Days"
-#~ msgstr "5 dni"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Terminarz"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Ustawienia terminarza..."
-
-#~ msgid "Create a new appointment"
-#~ msgstr "Tworzy nowy termin"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Tworzy nowy termianrz"
-
-#~ msgid "Day"
-#~ msgstr "Dzieñ"
-
-#~ msgid "Go back in time"
-#~ msgstr "Przemieszcza w czasie do ty³u"
-
-#~ msgid "Go forward in time"
-#~ msgstr "Przemieszcza w czasie do przodu"
-
-#~ msgid "Go to"
-#~ msgstr "Przejd¼"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "Przemieszcza do podanej daty"
-
-#~ msgid "Go to present time"
-#~ msgstr "Przemieszcza do bie¿±cego czasu"
-
-#~ msgid "Month"
-#~ msgstr "Miesi±c"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Otwiera terminarz"
-
-#~ msgid "Prev"
-#~ msgstr "Poprzedni"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Drukuje terminarz"
-
-#~ msgid "Save calendar as something else"
-#~ msgstr "Zapisuje terminarz w innej formie"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Wy¶wietla jeden dzieñ"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Wy¶wietla jeden miesi±c"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Wy¶wietla jeden tydzieñ"
-
-#~ msgid "Show the working week"
-#~ msgstr "Wy¶wietla tydzieñ roboczy"
-
-#~ msgid "Week"
-#~ msgstr "Tydzieñ"
-
-#~ msgid "_New"
-#~ msgstr "_Nowy"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_Otwórz terminarz"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Zapisz j_ako..."
-
-#~ msgid "Delete this item"
-#~ msgstr "Usuwa bie¿±cy element"
-
-#~ msgid "Delete..."
-#~ msgstr "Usuñ..."
-
-#~ msgid "Help"
-#~ msgstr "Pomoc"
-
-#~ msgid "Print this item"
-#~ msgstr "Drukuje bie¿±cy element"
-
-#~ msgid "Print..."
-#~ msgstr "Drukuj..."
-
-#~ msgid "Save _As..."
-#~ msgstr "Zapisz j_ako..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Zapisz i zamknij"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Zapisuje kontakt i zamyka okno dialogowe"
-
-#~ msgid "_File"
-#~ msgstr "_Plik"
-
-#~ msgid "_Print..."
-#~ msgstr "_Drukuj..."
-
-#~ msgid "_Save"
-#~ msgstr "_Zapisz"
-
-#~ msgid "About this application"
-#~ msgstr "Informacje o aplikacji"
-
-#~ msgid "About..."
-#~ msgstr "Informacje o..."
-
-#~ msgid "C_lear"
-#~ msgstr "Wyc_zy¶æ"
-
-#~ msgid "C_ut"
-#~ msgstr "_Wytnij"
-
-#~ msgid "Clear"
-#~ msgstr "Wyczy¶æ"
-
-#~ msgid "Clear the selection"
-#~ msgstr "Czy¶ci zaznaczenie"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Zamyka termin"
-
-#~ msgid "Copy"
-#~ msgstr "Kopiuj"
-
-#~ msgid "Copy the selection"
-#~ msgstr "Kopiuje zaznaczenie"
-
-#~ msgid "Cut"
-#~ msgstr "Wytnij"
-
-#~ msgid "Cut the selection"
-#~ msgstr "Wycina zaznaczenie"
-
-#~ msgid "Dump XML"
-#~ msgstr "Wypisz XML"
-
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Wypisuje opis interfejsu u¿ytkownika w XML-u"
-
-#~ msgid "Find Again"
-#~ msgstr "Znajd¼ ponownie"
-
-#~ msgid "Find _Again"
-#~ msgstr "Znajd¼ p_onownie"
-
-#~ msgid "Modify the file's properties"
-#~ msgstr "Modyfikuje w³a¶ciwo¶ci pliku"
-
-#~ msgid "N_ext"
-#~ msgstr "_Nastêpny"
-
-#~ msgid "Paste"
-#~ msgstr "Wklej"
-
-#~ msgid "Paste the clipboard"
-#~ msgstr "Wkleja zawarto¶æ schowka"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "Ustawienia _wydruku..."
-
-#~ msgid "Print Setup"
-#~ msgstr "Ustawienia wydruku"
-
-#~ msgid "Properties"
-#~ msgstr "W³a¶ciwo¶ci"
-
-#~ msgid "Redo"
-#~ msgstr "Ponów"
-
-#~ msgid "Redo the undone action"
-#~ msgstr "Ponawia cofniêt± czynno¶æ"
-
-#~ msgid "Replace"
-#~ msgstr "Zast±p"
-
-#~ msgid "Replace a string"
-#~ msgstr "Zastêpuje napis"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Zapisuje termin i zamyka okno"
-
-#~ msgid "Save the current file"
-#~ msgstr "Zapisuje bie¿±cy plik"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Ponownie wyszukuje ten sam napis"
-
-#~ msgid "Search for a string"
-#~ msgstr "Wyszukuje napis"
-
-#~ msgid "Select All"
-#~ msgstr "Zaznacz wszystkie"
-
-#~ msgid "Select everything"
-#~ msgstr "Zaznacza wszystko"
-
-#~ msgid "Undo"
-#~ msgstr "Cofnij"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Cofa ostatni± czynno¶æ"
-
-#~ msgid "_About..."
-#~ msgstr "_Informacje o..."
-
-#~ msgid "_Close"
-#~ msgstr "_Zamknij"
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopiuj"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edycja"
-
-#~ msgid "_Find..."
-#~ msgstr "_Znajd¼..."
-
-#~ msgid "_Help"
-#~ msgstr "Pomo_c"
-
-#~ msgid "_Paste"
-#~ msgstr "Wk_lej"
-
-#~ msgid "_Print"
-#~ msgstr "_Drukuj"
-
-#~ msgid "_Properties..."
-#~ msgstr "_W³a¶ciwo¶ci..."
-
-#~ msgid "_Redo"
-#~ msgstr "_Ponów"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Zast±p..."
-
-#~ msgid "_Undo"
-#~ msgstr "_Cofnij"
-
-#~ msgid "Compose"
-#~ msgstr "Utwórz"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Tworzy nowy list"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Kopiuje list do nowego foldera"
-
-#~ msgid "F_older"
-#~ msgstr "_Folder"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Utwórz filtr w oparciu o n_adawcê"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Utwórz filtr w oparciu o o_dbiorców"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "Zapomnij _has³a"
-
-#~ msgid "Get Mail"
-#~ msgstr "Pobierz"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Drukuje list"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Przes³any list:\n"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Drukuje list"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtry listów..."
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Opis:"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "Oznacz jako p_rzeczytany"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Oznacz jako _nieprzeczytany"
-
-#~ msgid "Move"
-#~ msgstr "Przenie¶"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Przenosi list do nowego foldera"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Podgl±d wydruku listu..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "Drukuje list na drukarce"
-
-#~ msgid "Print message..."
-#~ msgstr "Wydrukuj list..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "Odpowiedz _wszystkim"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Odpowiedz _nadawcy"
-
-#~ msgid "Select _All"
-#~ msgstr "Zaznacz _wszystkie"
-
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Wysy³a listy w kolejce i pobiera nowe"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Wy¶wietl wszystkie"
-
-#~ msgid "Threaded Message list"
-#~ msgstr "Wy¶wietlanie listów z wyodrêbnieniem w±tków"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Utwórz VFolder w oparciu o _nadawcê"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "Utwórz VFolder w oparciu o _odbiorców"
-
-#~ msgid "_Apply Filters"
-#~ msgstr "_Zastosuj filtry"
-
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Skopiuj do foldera..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "_Zredaguj list"
-
-#~ msgid "_Expunge"
-#~ msgstr "_Wyczy¶æ"
-
-#~ msgid "_Filter on Subject"
-#~ msgstr "Utwórz filtr w oparciu o t_emat"
-
-#~ msgid "_Forward"
-#~ msgstr "_Prze¶lij"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "_Odwróæ zaznaczenie"
-
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Konfiguracja _listów"
-
-#~ msgid "_Message"
-#~ msgstr "_List"
-
-#~ msgid "_Move to Folder..."
-#~ msgstr "P_rzenie¶ do foldera..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "_Otwórz w nowym oknie"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Drukuj list"
-
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Zapisz jako..."
-
-#~ msgid "_Source"
-#~ msgstr "¬_ród³o"
-
-#~ msgid "_Threaded"
-#~ msgstr "Z _w±tkami"
-
-#~ msgid "_Undelete"
-#~ msgstr "_Cofnij usuniêcie"
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "Utwórz VFolder w oparciu o _temat"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Edytor _wirtualnych folderów..."
-
-#~ msgid "Attach"
-#~ msgstr "Za³±cz"
-
-#~ msgid "Close the current file"
-#~ msgstr "Zamyka bie¿±cy plik"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "List zaszyfrowany"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Wstawia zawarto¶æ pliku jako tekst do listu"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Wstaw plik tekstowy.."
-
-#~ msgid "Open a file"
-#~ msgstr "Otwiera plik"
-
-#~ msgid "Save As"
-#~ msgstr "Zapisz jako"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Zapisz do foldera..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Zapisuje list w podanym folderze"
-
-#~ msgid "Send"
-#~ msgstr "Wy¶lij"
-
-#~ msgid "Send _Later"
-#~ msgstr "Wy¶lij pó¼_niej"
-
-#~ msgid "Send _later"
-#~ msgstr "Wy¶lij pó¼_niej"
-
-#~ msgid "Send this message now"
-#~ msgstr "Natychmiast wysy³a wiadomo¶æ"
-
-#~ msgid "Show / hide attachments"
-#~ msgstr "Wy¶wietla / ukrywa za³±czniki"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Wy¶wietlanie _za³±czników"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Wysy³anie listu bez tematu"
-
-#~ msgid "_Open..."
-#~ msgstr "_Otwórz..."
-
-#~ msgid "Refresh List"
-#~ msgstr "Od¶wie¿ listê"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Od¶wie¿a listê folderów"
-
-#~ msgid "Subscribe"
-#~ msgstr "Zapisz"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Wypisz"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Wy¶wietla inny folder"
-
-#~ msgid "E_xit"
-#~ msgstr "Za_koñcz"
-
-#~ msgid "Exit the program"
-#~ msgstr "Koñczy pracê programu"
-
-#~ msgid "Getting _Started"
-#~ msgstr "_Rozpoczynanie"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "Wy¶wietla informacje o Evolution"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Wy¶wietlanie paska f_olderów"
-
-#~ msgid "Submit _Bug Report"
-#~ msgstr "Wy¶lij zg³oszenie _b³êdu"
-
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Wysy³a zg³oszenie b³êdu za pomoc± Bug Buddy"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Prze³±cza wy¶wietlanie paska folderów"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Prze³±cza wy¶wietlanie paska skrótów"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Informacje o Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Termin (FIXME)"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Kontakt (FIXME)"
-
-#~ msgid "_Folder"
-#~ msgstr "_Folder"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Przejd¼ do foldera..."
-
-#~ msgid "_Index"
-#~ msgstr "_Indeks"
-
-#~ msgid "_Settings"
-#~ msgstr "_Ustawienia"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Zadanie (FIXME)"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Elementy nale¿±ce do tych kategorii:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Dostêpne kategorie:"
-
-#~ msgid "External Directories"
-#~ msgstr "Zewnêtrzne katalogi"
-
-#~ msgid "Port Number:"
-#~ msgstr "Numer portu:"
-
-#~ msgid "Outline:"
-#~ msgstr "Obrys:"
-
-#~ msgid "Headings:"
-#~ msgstr "Nag³ówki:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Puste dni:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Terminy:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Pod¶wietlenie dnia"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Numery dni:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Numer bie¿±cego dnia:"
-
-#~ msgid "may"
-#~ msgstr "maj"
-
-#~ msgid "sept"
-#~ msgstr "wrz"
-
-#~ msgid "sunday"
-#~ msgstr "niedziela"
-
-#~ msgid "monday"
-#~ msgstr "poniedzia³ek"
-
-#~ msgid "tuesday"
-#~ msgstr "wtorek"
-
-#~ msgid "tues"
-#~ msgstr "wto"
-
-#~ msgid "wednesday"
-#~ msgstr "¶roda"
-
-#~ msgid "wednes"
-#~ msgstr "¶ro"
-
-#~ msgid "thursday"
-#~ msgstr "czwartek"
-
-#~ msgid "thur"
-#~ msgstr "czw"
-
-#~ msgid "thurs"
-#~ msgstr "czw"
-
-#~ msgid "friday"
-#~ msgstr "pi±tek"
-
-#~ msgid "saturday"
-#~ msgstr "sobota"
-
-#~ msgid "fortnight"
-#~ msgstr "dwa tygodnie"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sek"
-
-#~ msgid "tomorrow"
-#~ msgstr "jutro"
-
-#~ msgid "yesterday"
-#~ msgstr "wczoraj"
-
-#~ msgid "today"
-#~ msgstr "dzi¶"
-
-#~ msgid "last"
-#~ msgstr "ostatni"
-
-#~ msgid "this"
-#~ msgstr "ten"
-
-#~ msgid "next"
-#~ msgstr "nastêpny"
-
-#~ msgid "first"
-#~ msgstr "pierwszy"
-
-#~ msgid "third"
-#~ msgstr "trzeci"
-
-#~ msgid "fourth"
-#~ msgstr "czwarty"
-
-#~ msgid "fifth"
-#~ msgstr "pi±ty"
-
-#~ msgid "sixth"
-#~ msgstr "szósty"
-
-#~ msgid "seventh"
-#~ msgstr "siódmy"
-
-#~ msgid "eighth"
-#~ msgstr "ósmy"
-
-#~ msgid "ninth"
-#~ msgstr "dziewi±ty"
-
-#~ msgid "tenth"
-#~ msgstr "dziesi±ty"
-
-#~ msgid "eleventh"
-#~ msgstr "jedenasty"
-
-#~ msgid "twelfth"
-#~ msgstr "dwunasty"
-
-#~ msgid "ago"
-#~ msgstr "temu"
-
-#~ msgid "Year:"
-#~ msgstr "Rok:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Wybierz datê, do której chcesz przej¶æ.\n"
-#~ "Klikniêcie na dniu spowoduje przej¶cie\n"
-#~ "do wybranego dnia."
-
-#~ msgid "Mail Source"
-#~ msgstr "¬ród³o listów"
-
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "Konfiguracja poczta zosta³a zakoñczona.\n"
-#~ "Kliknij \"Zakoñcz\", aby zapisaæ nowe ustawienia."
-
-#~ msgid "Send \"%s\""
-#~ msgstr "Wy¶lij \"%s\""
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Wy¶lij list bez tematu"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Wyczy¶æ \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Zaznaczanie listu %d z %d"
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Przesy³anie listów \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Przesy³anie listu bez tematu"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Prze¶lij list \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Prze¶lij list bez tematu"
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Wczytywanie \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Tworzenie \"%s\""
-
-#~ msgid "Create \"%s\""
-#~ msgstr "Utwórz \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Zsynchronizuj \"%s\""
-
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Zapisywanie listów z foldera \"%s\""
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Zapisywanie listów z foldera \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Przebudowywanie widoku listu"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Przebudowywanie widoku listu"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "_Nowy serwer katalogowy"
-
-#~ msgid "_Actions"
-#~ msgstr "_Czynno¶ci"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Zapisz terminarz jako"
-
-#, fuzzy
-#~ msgid "_Mail Configuration"
-#~ msgstr "Konfiguracja poczty"
-
-#~ msgid "window2"
-#~ msgstr "okno2"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Nie mo¿na pobraæ listu: %s"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr ""
-#~ "Nie mo¿na zmieniæ nazwy foldera %s na %s: folder o nazwie docelowej istnieje"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Nie mo¿na skopiowaæ danych do pliku wyj¶ciowego: %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Nie mo¿na zmieniæ nazwy foldera \"%s\": %s istnieje"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "Foldery MH nie mog± byæ zagnie¿d¿one"
-
-#~ msgid "Draft"
-#~ msgstr "Roboczy"
-
-#~ msgid "Set Flag"
-#~ msgstr "Oznacz"
-
-#~ msgid "Forward as Attachment"
-#~ msgstr "Prze¶lij jako za³±cznik"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Nie mo¿na utworzyæ potoku do %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Nie mo¿na wykonaæ %s: %s\n"
-
-#~ msgid "Saving messages from \"%s\""
-#~ msgstr "Zapisywanie listów z \"%s\""
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nowy _terminarz"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Nowy termin..."
-
-#~ msgid "_Open"
-#~ msgstr "_Otwórz"
-
-#~ msgid "Bold"
-#~ msgstr "Pogrubienie"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Pogrubia co¶"
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Utwórz nowy folder..."
diff --git a/po/pt.po b/po/pt.po
deleted file mode 100644
index d807b4803a..0000000000
--- a/po/pt.po
+++ /dev/null
@@ -1,6392 +0,0 @@
-# Portuguese translation of evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Tiago Antão <tiagoantao@bigfoot.com>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-04-16 16:33+01:00\n"
-"Last-Translator: Tiago Antão <tiagoantao@bigfoot.com>\n"
-"Language-Team: Gnome Portuguese <gnome@poli.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Não consigo inicializar o componente de mail do Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Não se consegui inicializar Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Enviar a mensagem"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Cores"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Ir para a _pasta..."
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Ir para o item anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ir para o próximo item"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Nova pasta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Não consigo abrir a localização: %s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro a gravar os atalhos."
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Novo"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Criar um novo contacto"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Não consigo inicializar o componente de mail do Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Component de correio: Não consegui inicializar Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-#, fuzzy
-msgid "Card: "
-msgstr "Carro"
-
-#: addressbook/backend/ebook/e-card.c:3051
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Nome"
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3081
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "Endereço"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3141
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "Correio electrónico 2"
-
-#: addressbook/backend/ebook/e-card.c:3144
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "Correio electrónico 2"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-#, fuzzy
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 Free Software Foundation"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-#, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Um excepção ocorreu enquanto se tentava carregar dados no componente com "
-"PersistStream"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-#, fuzzy
-msgid "Could not start wombat"
-msgstr "Não se consegui inicializar Bonobo"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-#, fuzzy
-msgid "_Add"
-msgstr "Adicionar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-#, fuzzy
-msgid "_Delete"
-msgstr "Apagar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Adicionar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-#, fuzzy
-msgid "Contact Editor"
-msgstr "_Contacto"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-#, fuzzy
-msgid "_Full Name..."
-msgstr "Nome completo:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-#, fuzzy
-msgid "Web page address:"
-msgstr "Endereço de correio:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-#, fuzzy
-msgid "_Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-#, fuzzy
-msgid "_Mobile"
-msgstr "Telemóvel"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Endereço principal de correio electrónico"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_Contacto"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-#, fuzzy
-msgid "_Company:"
-msgstr "Empresa"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-#, fuzzy
-msgid "_Address..."
-msgstr "Endereço"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-#, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Carro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Empresa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Casa 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Fax de casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "RDIS"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Telemóvel"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Outro Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Bip"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "Primário"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "Correio electrónico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Correio electrónico 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-#, fuzzy
-msgid "Check Full Name"
-msgstr "Nome completo:"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-#, fuzzy
-msgid "_First:"
-msgstr "_Pasta"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:25
-#, fuzzy
-msgid "_Middle:"
-msgstr "_Correio"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Como _Tabela"
-
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Impossível abrir o livro de endereços"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-#, fuzzy
-msgid "Advanced..."
-msgstr "Adicionar..."
-
-#: addressbook/gui/component/addressbook.c:562
-#, fuzzy
-msgid "Any field contains"
-msgstr "Uma pasta contendo tarefas"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:564
-#, fuzzy
-msgid "Email contains"
-msgstr "Ícone_s pequenos"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que o navegador de pastas mostrará"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "_Novo Contacto"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "_Pasta"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Impossível abrir o livro de endereços"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-#, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Colar"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "Fontes"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "Horas"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "Prioridade:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Ano"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Autenticação"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Caminho"
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Impossível abrir o livro de endereços"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "Impossível abrir o livro de endereços"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-#, fuzzy
-msgid "Name:"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.c:617
-#, fuzzy
-msgid "Description:"
-msgstr "Nenhuma descrição"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-#, fuzzy
-msgid "Search"
-msgstr "Ano"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gravar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#, fuzzy
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "Correio electrónico 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Organização"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "Data"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "Fora do escritório"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "_Pasta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "Bip"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "Nome"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "Fontes"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "Nenhuma"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-#, fuzzy
-msgid "Save in addressbook"
-msgstr "Impossível abrir o livro de endereços"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Atalho para _barra do Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution ToDo Conduit"
-msgstr "Atalho para _barra do Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-#, fuzzy
-msgid "Snooze"
-msgstr "Tamanho"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Ficheiro não encontrado"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir calendário"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Gravar calendário"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-#, fuzzy
-msgid "Private"
-msgstr "Imprimir"
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-#, fuzzy
-msgid "S"
-msgstr "Do"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-#, fuzzy
-msgid "W"
-msgstr "Qa"
-
-#: calendar/gui/calendar-model.c:545
-#, fuzzy
-msgid "Transparent"
-msgstr "Transportes"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "Dia"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "Compromisso - %s"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "Ver _anexos"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimir calendário"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "O URI que o calendário mostrará"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-#, fuzzy
-msgid "No summary available."
-msgstr "Nenhum sumário"
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Nenhum sumário"
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "_Entrada diária?"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _fim de _encontro"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "Hora de ín_icio de encontro"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "Sumário"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "Transportes"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:397
-#, fuzzy
-msgid "Open..."
-msgstr "_Abrir"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Apagar"
-
-#: calendar/gui/e-calendar-table.c:404
-#, fuzzy
-msgid "Delete the task"
-msgstr "Apagar este item"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Novo compromisso"
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr "Apagar esta ocurrência"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr "Apagar todas as ocurrências"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Criar um novo calendário"
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "_Editar Compromisso"
-
-#: calendar/gui/event-editor.c:409
-#, fuzzy
-msgid "on"
-msgstr "Seg"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-#, fuzzy
-msgid "day"
-msgstr "Hoje"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: calendar/gui/event-editor.c:436
-#, fuzzy
-msgid "Tuesday"
-msgstr "Hoje"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr ""
-
-#: calendar/gui/event-editor.c:438
-#, fuzzy
-msgid "Thursday"
-msgstr "Hoje"
-
-#: calendar/gui/event-editor.c:439
-#, fuzzy
-msgid "Friday"
-msgstr "Sex"
-
-#: calendar/gui/event-editor.c:440
-#, fuzzy
-msgid "Saturday"
-msgstr "Domingo"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "Mês"
-
-#: calendar/gui/event-editor.c:568
-#, fuzzy
-msgid "th"
-msgstr "h"
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "Apagar todas as ocurrências"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Criar um novo calendário"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Seg"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ter"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Qua"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Qui"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Sex"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sáb"
-
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Não se consegui inicializar Bonobo"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr ""
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr ""
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr ""
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr ""
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr ""
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26º"
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27º"
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28º"
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29º"
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30º"
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31º"
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "Do"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "Sg"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "Te"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "Qa"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "Qi"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "Sx"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "Sá"
-
-#: calendar/gui/print.c:941
-#, fuzzy
-msgid "Tasks"
-msgstr "_Tarefa"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr ""
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr ""
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr ""
-
-#: calendar/gui/print.c:1097
-#, fuzzy, c-format
-msgid "Current week (%s - %s)"
-msgstr "Ano corrente (%Y)"
-
-#. Month
-#: calendar/gui/print.c:1105
-#, fuzzy
-msgid "Current month (%b %Y)"
-msgstr "Mês corrente (%a %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Ano corrente (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Imprimir calendário"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "Prever impressão"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "O URI que o calendário mostrará"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr ""
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr ""
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr ""
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr ""
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Abrir calendário"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr ""
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "Enviar a mensagem"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, fuzzy, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Não consigo abrir a localização: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, fuzzy, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Não consigo abrir a localização: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, fuzzy, c-format
-msgid "Message %s not found."
-msgstr "Ficheiro não encontrado"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#, fuzzy
-msgid "Sendmail"
-msgstr "Enviar"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, fuzzy, c-format
-msgid "Could not send message: %s"
-msgstr "Criar uma nova mensagem"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticação"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, c-format
-msgid "RSET response error: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-#, fuzzy
-msgid "attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Anexar um ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Remover items seleccionados da lista de anexos"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Adicionar anexo..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Anexar um ficheiro à mensagem"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-#, fuzzy
-msgid "From:"
-msgstr "De"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "Pressione aqui para o livro de endereços"
-
-#: composer/e-msg-composer-hdrs.c:313
-#, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduza os receptores da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "Para:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "Introduza os receptores da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Entre os endereços que irão receber uma cópia da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Entre os endereços que irão receber uma cópia da mensagem sem conhecimento "
-"do receptor"
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o assunto da carta"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:598
-#, fuzzy
-msgid "Save as..."
-msgstr "Gravar como VCard"
-
-#: composer/e-msg-composer.c:609
-#, fuzzy, c-format
-msgid "Error saving file: %s"
-msgstr "Erro a gravar os atalhos."
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Enviar uma nova mensagem"
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Enviar uma nova mensagem"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr ""
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr ""
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr ""
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Criar uma nova mensagem"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr ""
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Não consigo inicializar o componente de mail do Evolution."
-
-#: filter/filter-datespec.c:62
-#, fuzzy
-msgid "year"
-msgstr "Ano"
-
-#: filter/filter-datespec.c:62
-#, fuzzy
-msgid "years"
-msgstr "Ano"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "Mês"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "months"
-msgstr "Mês"
-
-#: filter/filter-datespec.c:64
-#, fuzzy
-msgid "week"
-msgstr "Semana"
-
-#: filter/filter-datespec.c:64
-#, fuzzy
-msgid "weeks"
-msgstr "Semanas"
-
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr "DiasRascunhos"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hour"
-msgstr "Hora"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hours"
-msgstr "Horas"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "minute"
-msgstr "Minuto"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "minutes"
-msgstr "Minutos"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr " segundos"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "seconds"
-msgstr " segundos"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr ""
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-#, fuzzy
-msgid "Then"
-msgstr "Qi"
-
-#: filter/filter-filter.c:414
-#, fuzzy
-msgid "Add action"
-msgstr "_Acções"
-
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "Remover grupo"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-#, fuzzy
-msgid "Select Folder"
-msgstr "_Nova pasta"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:530
-#, fuzzy
-msgid "Rule name: "
-msgstr "Nome completo:"
-
-#: filter/filter-rule.c:534
-#, fuzzy
-msgid "Untitled"
-msgstr "(Sem título)"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:593
-#, fuzzy
-msgid "Remove criterion"
-msgstr "Remover grupo"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "Reponder para todos"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Read"
-msgstr "Remover"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "Ir para a _pasta..."
-
-#: filter/libfilter-i18n.h:5
-#, fuzzy
-msgid "Date received"
-msgstr "Receber"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Date sent"
-msgstr "Data"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Enviar esta mensagem"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "Situação das mensagens"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Situação das mensagens"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "Situação das mensagens"
-
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Score"
-msgstr "Fontes"
-
-#: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "Situação online"
-
-#: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "Sáb"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
-
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Data"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "_Acções"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro não encontrado"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr ""
-
-#: filter/score-editor.c:127
-#, fuzzy
-msgid "Add Rule"
-msgstr "Adicionar Fonte"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Não consigo inicializar o componente de mail do Evolution."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "_Nova pasta"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-#, fuzzy
-msgid "Subject contains"
-msgstr "Assunto"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:650
-#, fuzzy
-msgid "Filter on Sender"
-msgstr "Ficheiro não encontrado"
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/folder-browser.c:663
-#, fuzzy
-msgid "Reply to Sender"
-msgstr "Reponder para todos"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "Reponder para todos"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr ""
-
-#: mail/folder-browser.c:666
-msgid "Forward inline"
-msgstr ""
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr ""
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr ""
-
-#: mail/folder-browser.c:671
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "Ir para a _pasta..."
-
-#: mail/folder-browser.c:672
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "Ir para a _pasta..."
-
-#: mail/folder-browser.c:674
-#, fuzzy
-msgid "Undelete"
-msgstr "Apagar"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:680
-#, fuzzy
-msgid "Create Rule From Message"
-msgstr "Mensagens de correio em rascunho"
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhuma"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Apagar"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Atalho para _barra do Evolution"
-
-#: mail/mail-autofilter.c:71
-#, fuzzy, c-format
-msgid "Mail to %s"
-msgstr "Fontes de correio"
-
-#: mail/mail-autofilter.c:214
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Assunto"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-callbacks.c:675
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:677
-#, fuzzy
-msgid "Copy message(s) to"
-msgstr "Criar uma nova mensagem"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:979
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:1028
-#, fuzzy
-msgid "Print Message"
-msgstr "Encontrar mensagens"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
-#, fuzzy
-msgid "Save Attachment"
-msgstr "Anexo"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr ""
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "Adicionar anexo"
-
-#: mail/mail-format.c:626
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Enviar a mensagem"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Nova pasta"
-
-#: mail/mail-local.c:269
-#, fuzzy
-msgid "Closing current folder"
-msgstr "Fechar o calendário corrente"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:313
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Criar um novo calendário"
-
-#: mail/mail-local.c:327
-#, fuzzy
-msgid "Copying messages"
-msgstr "Encontrar mensagens"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "Seg"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "Mensagens enviadas"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:950
-#, fuzzy
-msgid "Moving"
-msgstr "Seg"
-
-#: mail/mail-ops.c:953
-#, fuzzy
-msgid "Copying"
-msgstr "Copiar"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-#, fuzzy
-msgid "(No description)"
-msgstr "Nenhuma descrição"
-
-#: mail/mail-ops.c:1179
-#, fuzzy
-msgid "Forwarded messages"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "Abrir ficheiro"
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizar"
-
-#: mail/mail-ops.c:1401
-msgid "Expunging folder"
-msgstr ""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Encontrar mensagens"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "Encontrar mensagens"
-
-#: mail/mail-ops.c:1922
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "Erro a gravar os atalhos."
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-#, fuzzy
-msgid "Could not create dialog box."
-msgstr "Não se consegui inicializar Bonobo"
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr ""
-
-#: mail/mail-tools.c:381
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:427
-#, fuzzy, c-format
-msgid "Forwarded message - %s"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-tools.c:429
-#, fuzzy
-msgid "Forwarded message (no subject)"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-tools.c:530
-#, fuzzy, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr "Não consigo abrir a localização: %s"
-
-#: mail/mail-vfolder.c:149
-#, fuzzy
-msgid "VFolders"
-msgstr "_Pastas"
-
-#: mail/mail-vfolder.c:298
-#, fuzzy
-msgid "New VFolder"
-msgstr "_Nova pasta"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138
-#, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "Responder ao emissor desta mensagem"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Reponder a todos receptores da mensagem"
-
-#: mail/mail-view.c:144
-#, fuzzy
-msgid "Forward this message"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-view.c:148
-#, fuzzy
-msgid "Print the selected message"
-msgstr "Imprimir a mensagem seleccionada"
-
-#: mail/mail-view.c:150
-#, fuzzy
-msgid "Delete this message"
-msgstr "Enviar esta mensagem"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-#, fuzzy
-msgid "Seen"
-msgstr "Enviar"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr ""
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr ""
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr ""
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "Anexo"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "Receber"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "Para:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "Tamanho"
-
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr ""
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Criar um novo calendário"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "_Pastas"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "Fontes"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr ""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instalação do Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-#, fuzzy
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
-"em"
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr ""
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros do Evolution instalados com sucesso"
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Esta parece ser a primeira vez que está a correr o Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
-"em"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, fuzzy, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr "Gravar a mensagem na pasta especificada"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:225
-#, fuzzy
-msgid "Evolution - Create new folder"
-msgstr "O Evolution não consegue criar as suas pastas locais"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-#, fuzzy
-msgid "New..."
-msgstr "Novo"
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sem título)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "O Bug buddy não foi encontrado no seu $PATH."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "Não consegui correr o Bub buddy"
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr "Ir para a _pasta..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr "(Nenhuma pasta mostrada)"
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "_Pastas"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-#, fuzzy
-msgid "Create new shortcut group"
-msgstr "Criar um novo contacto"
-
-#: shell/e-shortcuts-view.c:126
-#, fuzzy
-msgid "Group name:"
-msgstr "Nome completo:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:265
-#, fuzzy
-msgid "_Small Icons"
-msgstr "Ícone_s pequenos"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:268
-#, fuzzy
-msgid "_Large Icons"
-msgstr "Ícones _grandes"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Mostrar atalhos co ícones grandes"
-
-#: shell/e-shortcuts-view.c:280
-#, fuzzy
-msgid "_New Group..."
-msgstr "Novo grupo"
-
-#: shell/e-shortcuts-view.c:281
-#, fuzzy
-msgid "Create a new shortcut group"
-msgstr "Criar um novo contacto"
-
-#: shell/e-shortcuts-view.c:283
-#, fuzzy
-msgid "_Remove This Group..."
-msgstr "Remover grupo"
-
-#: shell/e-shortcuts-view.c:284
-#, fuzzy
-msgid "Remove this shortcut group"
-msgstr "Remover este atalho da barra de atalhos"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "Mostrar a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "Mostrar barra de atalho_s"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activar"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activar este atalho"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Remover este atalho da barra de atalhos"
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr "Erro a gravar os atalhos."
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "_View"
-msgstr "_Novo"
-
-#: shell/e-storage-set-view.c:338
-#, fuzzy
-msgid "View the selected folder"
-msgstr "Imprimir a mensagem seleccionada"
-
-#: shell/e-storage.c:138
-#, fuzzy
-msgid "(No name)"
-msgstr "Nome"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Falhou a inicialização do sistema de componentes Bonobo."
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Compromisso"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "Pedido de _encontro"
-
-#: ui/evolution-contact-editor.xml:10
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Mensagem de _correio"
-
-#: ui/evolution-contact-editor.xml:11
-#, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:13
-#, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "_Pedido de tarefa"
-
-#: ui/evolution-contact-editor.xml:14
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "_Entrada diária?"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-#, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "Pedido de _encontro"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Adicionar anexo..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Imprimir"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objecto"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Pró_ximo"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Ferramentas"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:137
-#, fuzzy
-msgid "_Forms"
-msgstr "_Pasta"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar mensagem em formato HTML"
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:150
-#, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "_Entrada diária?"
-
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "Mensagem de _correio"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "Mensagem de _correio"
-
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_Acções"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "An_terior"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir para o item anterior"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "_Contacto"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir para o próximo item"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora do escritório"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nenhuma Informação"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opções"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Pessoas _Necessãrias"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de ín_icio de encontro"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fim de _encontro"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-#, fuzzy
-msgid "Now"
-msgstr "Novo"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
-
-#, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "Apagar um contacto"
-
-#, fuzzy
-#~ msgid "Address _2:"
-#~ msgstr "Endereço"
-
-#, fuzzy
-#~ msgid "Check Address"
-#~ msgstr "Endereço"
-
-#, fuzzy
-#~ msgid "Finland"
-#~ msgstr "Encontrar"
-
-#, fuzzy
-#~ msgid "_Address:"
-#~ msgstr "Endereço"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Adicionar Fonte"
-
-#, fuzzy
-#~ msgid "Find..."
-#~ msgstr "Encontrar"
-
-#, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "Situação das mensagens"
-
-#, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "_Items seleccionados"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "_Items seleccionados"
-
-#, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
-
-#, fuzzy
-#~ msgid "b"
-#~ msgstr "%b"
-
-#, fuzzy
-#~ msgid "c"
-#~ msgstr "Cc"
-
-#, fuzzy
-#~ msgid "e"
-#~ msgstr "Qa"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
-
-#, fuzzy
-#~ msgid "m"
-#~ msgstr "am"
-
-#, fuzzy
-#~ msgid "o"
-#~ msgstr "Para"
-
-#, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
-
-#, fuzzy
-#~ msgid "r"
-#~ msgstr "Sx"
-
-#, fuzzy
-#~ msgid "u"
-#~ msgstr "Do"
-
-#, fuzzy
-#~ msgid "Body"
-#~ msgstr "Hoje"
-
-#, fuzzy
-#~ msgid "Font..."
-#~ msgstr "Imprimir..."
-
-#, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "Mês"
-
-#, fuzzy
-#~ msgid "Format"
-#~ msgstr "F_ormato"
-
-#, fuzzy
-#~ msgid "Header"
-#~ msgstr "Ano"
-
-#, fuzzy
-#~ msgid "Headings"
-#~ msgstr "Cabeçalhos:"
-
-#, fuzzy
-#~ msgid "Height:"
-#~ msgstr "Cabeçalhos:"
-
-#, fuzzy
-#~ msgid "Margins"
-#~ msgstr "Ícones _grandes"
-
-#, fuzzy
-#~ msgid "Options"
-#~ msgstr "_Opções"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "Organização"
-
-#, fuzzy
-#~ msgid "Page"
-#~ msgstr "Bip"
-
-#, fuzzy
-#~ msgid "Paper"
-#~ msgstr "Bip"
-
-#, fuzzy
-#~ msgid "Paper source:"
-#~ msgstr "Fontes de correio"
-
-#, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Prioridade"
-
-#, fuzzy
-#~ msgid "Preview:"
-#~ msgstr "Prever impressão"
-
-#, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Segundos"
-
-#, fuzzy
-#~ msgid "Shading"
-#~ msgstr "Cabeçalhos:"
-
-#, fuzzy
-#~ msgid "Start on a new page"
-#~ msgstr "Enviar uma nova mensagem"
-
-#, fuzzy
-#~ msgid "Style name:"
-#~ msgstr "Nome completo:"
-
-#, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Para:"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Novo Ca_lendário"
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Atalho para _barra do Evolution"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Não consigo inicializar o componente de mail do Evolution."
-
-#, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "_Editar Compromisso"
-
-#, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (AM/PM)"
-
-#, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
-
-#, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Novo Ca_lendário"
-
-#, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferências"
-
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
-#, fuzzy
-#~ msgid "Show week numbers"
-#~ msgstr "Mostrar 1 semana"
-
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes"
-
-#, fuzzy
-#~ msgid "Work week"
-#~ msgstr "Semana"
-
-#, fuzzy
-#~ msgid "seconds."
-#~ msgstr " segundos"
-
-#, fuzzy
-#~ msgid "Normal"
-#~ msgstr "F_ormato"
-
-#, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "_Começando"
-
-#, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "_Contacto"
-
-#, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Prioridade:"
-
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Compromissos:"
-
-#~ msgid "Days"
-#~ msgstr "DiasRascunhos"
-
-#, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "_Acções"
-
-#~ msgid "Hours"
-#~ msgstr "Horas"
-
-#, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "atalhos principais"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
-
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Segunda-feira"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Prever impressão"
-
-#, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Activar"
-
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "Sumário:"
-
-#~ msgid "_Mail"
-#~ msgstr "_Correio"
-
-#, fuzzy
-#~ msgid "day(s)"
-#~ msgstr "DiasRascunhos"
-
-#, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "Mês"
-
-#, fuzzy
-#~ msgid "week(s)"
-#~ msgstr "Semanas"
-
-#, fuzzy
-#~ msgid "April"
-#~ msgstr "_Correio"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Hoje"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "Ano"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "Segunda-feira"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Propriedades do alarme"
-
-#, fuzzy
-#~ msgid "File name:"
-#~ msgstr "Nome completo:"
-
-#, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_Pastas"
-
-#, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "_Pastas"
-
-#, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "Adicionar Fonte"
-
-#, fuzzy
-#~ msgid "Save"
-#~ msgstr "Sá"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Apagar"
-
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Assunto"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Ficheiro não encontrado"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Encontrar mensagens"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assunto"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Não se consegui inicializar Bonobo"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "F_ormato"
-
-#, fuzzy
-#~ msgid "mbox"
-#~ msgstr "Correio novo"
-
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Nenhuma Informação"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propriedades do alarme"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Adicionar..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autenticação"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticação"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "Nenhuma"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Endereço de correio:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Endereço de correio:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuração do correio"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Nome completo:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Utilizador:"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correio"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Ícone_s pequenos"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuração do correio"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Configuração do correio"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "Novo"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_Opções"
-
-#~ msgid "Organization:"
-#~ msgstr "Organização:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Esquecer _Senhas"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Responder"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "Pessoas _Necessãrias"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gravar como VCard"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Configuração do correio"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Servidor:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
-
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro com assinatura:"
-
-#~ msgid "Sources"
-#~ msgstr "Fontes"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Nenhuma Informação"
-
-#~ msgid "Username:"
-#~ msgstr "Utilizador:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "Minutos"
-
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
-
-#~ msgid "Email address:"
-#~ msgstr "Endereço de correio:"
-
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "Fontes de correio"
-
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Transporte de correio"
-
-#~ msgid "Add Source"
-#~ msgstr "Adicionar Fonte"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Adicionar novo grupo"
-
-#~ msgid "Address"
-#~ msgstr "Endereço"
-
-#, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "atalhos principais"
-
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte de correio"
-
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Servidor:"
-
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Fontes"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
-
-#~ msgid "Delete a contact"
-#~ msgstr "Apagar um contacto"
-
-#~ msgid "Find"
-#~ msgstr "Encontrar"
-
-#~ msgid "Find a contact"
-#~ msgstr "Encontrar um contacto"
-
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
-
-#, fuzzy
-#~ msgid "View all contacts"
-#~ msgstr "Encontrar um contacto"
-
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuração do co_rreio..."
-
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "Imprimir contactos"
-
-#~ msgid "5 Days"
-#~ msgstr "5 Dias"
-
-#, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Preferências"
-
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Novo Ca_lendário"
-
-#, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Preferências"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Criar um novo calendário"
-
-#~ msgid "Go to"
-#~ msgstr "Ir para"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para uma data específica"
-
-#~ msgid "Month"
-#~ msgstr "Mês"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir um calendário"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir este calendário"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Mostrar 1 dia"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Mostrar 1 mês"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Mostrar 1 semana"
-
-#~ msgid "Show the working week"
-#~ msgstr "Mostrar a semana de trabalho"
-
-#~ msgid "Week"
-#~ msgstr "Semana"
-
-#~ msgid "_New"
-#~ msgstr "_Novo"
-
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Abrir Ca_lendário"
-
-#, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Imprimir este calendário"
-
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gravar na _pasta..."
-
-#~ msgid "Delete this item"
-#~ msgstr "Apagar este item"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Apagar"
-
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Imprimir..."
-
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este item"
-
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Gravar na _pasta..."
-
-#, fuzzy
-#~ msgid "Save and Close"
-#~ msgstr "Guardar Calendário como"
-
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Pasta"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Carro"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Cortar"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Carro"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Novo compromisso"
-
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
-#~ msgid "Cut"
-#~ msgstr "Cortar"
-
-#, fuzzy
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Compromisso"
-
-#, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propriedades"
-
-#~ msgid "Paste"
-#~ msgstr "Colar"
-
-#, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Colar item da área de transferência"
-
-#, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Imprimir..."
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propriedades do alarme"
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Remover"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Responder"
-
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Reponder para todos"
-
-#~ msgid "Undo"
-#~ msgstr "Anular"
-
-#, fuzzy
-#~ msgid "Undo the last action"
-#~ msgstr "Anular a última operação"
-
-#, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Cores"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Copiar"
-
-#, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Editar..."
-
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Encontrar"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Colar"
-
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Imprimir"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Propriedades do alarme"
-
-#, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Anular"
-
-#, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Cores"
-
-#, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Criar uma nova mensagem"
-
-#, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_Pastas"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Senhas"
-
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_Correio"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Novas mensagens de correio"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "Druída dos _filtros"
-
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "Sg"
-
-#, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Prever impressão"
-
-#, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Encontrar mensagens"
-
-#, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Reponder para todos"
-
-#, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Reponder para todos"
-
-#, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Reponder para todos"
-
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Novas mensagens de correio"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Ir para a _pasta..."
-
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Mensagem de _correio"
-
-#, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuração do co_rreio..."
-
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Mensagem de _correio"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Ir para a _pasta..."
-
-#, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "Åbrir em nova janela"
-
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Encontrar mensagens"
-
-#, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Apagar"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "_Pastas"
-
-#~ msgid "Attach"
-#~ msgstr "Anexar"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Fechar o calendário corrente"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Enviar a mensagem"
-
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Anexar um ficheiro à mensagem"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Guardar Calendário como"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Gravar na _pasta..."
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Gravar na _pasta..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensagem"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar a mensagem"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Enviar esta mensagem"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Ver/esconder anexos"
-
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "Ver _anexos"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviar esta mensagem"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Abrir"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Mostrar uma pasta diferente"
-
-#, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Pró_ximo"
-
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Atalho para _barra do Evolution"
-
-#~ msgid "Getting _Started"
-#~ msgstr "_Começando"
-
-#, fuzzy
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Mostrar a barra de pastas"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Mostrar a barra de pastas"
-
-#, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Mostrar a barra de atalhos"
-
-#, fuzzy
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Usando o programa de C_orreio"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Usando o _Calendário"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Usando o programa de C_orreio"
-
-#, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution"
-
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Compromisso"
-
-#, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto"
-
-#~ msgid "_Folder"
-#~ msgstr "_Pasta"
-
-#, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Ir para a _pasta..."
-
-#, fuzzy
-#~ msgid "_Index"
-#~ msgstr "Índ_ice de ajuda"
-
-#, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Mensagem de _correio"
-
-#~ msgid "Headings:"
-#~ msgstr "Cabeçalhos:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Dias vazios:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Compromissos:"
-
-#, fuzzy
-#~ msgid "may"
-#~ msgstr "Dia"
-
-#, fuzzy
-#~ msgid "sunday"
-#~ msgstr "Domingo"
-
-#, fuzzy
-#~ msgid "monday"
-#~ msgstr "Segunda-feira"
-
-#, fuzzy
-#~ msgid "tuesday"
-#~ msgstr "Domingo"
-
-#, fuzzy
-#~ msgid "thur"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "thurs"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "friday"
-#~ msgstr "Primário"
-
-#, fuzzy
-#~ msgid "today"
-#~ msgstr "Hoje"
-
-#, fuzzy
-#~ msgid "last"
-#~ msgstr "Colar"
-
-#, fuzzy
-#~ msgid "next"
-#~ msgstr "Pró_ximo"
-
-#, fuzzy
-#~ msgid "third"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "fourth"
-#~ msgstr "Hora"
-
-#, fuzzy
-#~ msgid "ninth"
-#~ msgstr "Imprimir"
-
-#, fuzzy
-#~ msgid "tenth"
-#~ msgstr "Enviar"
-
-#~ msgid "Year:"
-#~ msgstr "Ano:"
-
-#, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "atalhos principais"
-
-#, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Segundos"
-
-#, fuzzy
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Enviar esta mensagem"
-
-#, fuzzy
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Sincronizar"
-
-#, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "Encontrar mensagens"
-
-#~ msgid "_Actions"
-#~ msgstr "_Acções"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "Guardar Calendário como"
-
-#, fuzzy
-#~ msgid "_Mail Configuration"
-#~ msgstr "Configuração do correio"
-
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Inserir ficheiro como anexo"
-
-#~ msgid "Gnome Calendar"
-#~ msgstr "Calendário do Gnome"
-
-#~ msgid "Show 1 year"
-#~ msgstr "Mostrar 1 ano"
-
-#~ msgid "_Close Calendar"
-#~ msgstr "_Fechar Calendário"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Novo compromisso..."
-
-#~ msgid "New appointment for _today..."
-#~ msgstr "Novo compromisso para _hoje..."
-
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Criar um novo compromisso para hoje"
-
-#~ msgid "About Calendar"
-#~ msgstr "Sobre o calendário"
-
-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
-#, fuzzy
-#~ msgid "'s calendar"
-#~ msgstr "O seu calendário"
-
-#~ msgid "Syncing with the pilot..."
-#~ msgstr "Sincronizando com o pilot..."
-
-#~ msgid "Edit this item..."
-#~ msgstr "Editar este item..."
-
-#, fuzzy
-#~ msgid "To-do list"
-#~ msgstr "_Ferramentas"
-
-#~ msgid "Second"
-#~ msgstr "Segundo"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Cortar item seleccionado para a área de transferência"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Copiar item seleccionada para a área de transferência"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "Seleccionar o endereço dos receptores"
-
-#~ msgid "Discard this message?"
-#~ msgstr "Descartar esta mensagem?"
-
-#~ msgid "Cut selected region into the clipboard"
-#~ msgstr "Cortar a região seleccionada para a área de transferência"
-
-#~ msgid "Copy selected region into the clipboard"
-#~ msgstr "Copiar a região seleccionada para a área de transferência"
-
-#~ msgid "Paste selected region into the clipboard"
-#~ msgstr "Colar a região seleccionada para a área de transferência"
-
-#~ msgid "Check for new mail"
-#~ msgstr "Verificar novo correio"
-
-#~ msgid "Composes a new mail message"
-#~ msgstr "Criar uma nova mensagem"
-
-#~ msgid "Task _Request"
-#~ msgstr "_Pedido de tarefa"
-
-#~ msgid "_Journal Entry"
-#~ msgstr "_Entrada diária?"
-
-#~ msgid "Clos_e All Items"
-#~ msgstr "_Fechar todos os items"
-
-#~ msgid "Closes all the open items"
-#~ msgstr "Fecha todos os items abertos"
-
-#~ msgid "Show _folder bar"
-#~ msgstr "Motrar barra de _pastas"
-
-#~ msgid ""
-#~ "Evolution detected that the file `%s' is a not a directory.\n"
-#~ "\n"
-#~ "Evolution can rename the file, delete the file or shutdown and\n"
-#~ "let you fix the problem."
-#~ msgstr ""
-#~ "O Evolution detectou que o ficheiro '%s' não é um directório.\n"
-#~ "\n"
-#~ "O Evolution pode mudar o nome ou apagar o ficheiro ou então desligue\n"
-#~ "e resolva o problema."
-
-#~ msgid ""
-#~ "This is a development version of Evolution.\n"
-#~ " Using the mail component on your mail files\n"
-#~ " is extremely hazardous.\n"
-#~ "Please backup all your mails before trying\n"
-#~ " this program. \n"
-#~ "     You have been warned\n"
-#~ msgstr ""
-#~ "Esta verão do Evolution é de desenvolvimento.\n"
-#~ " Usar o componente de correio nos seus ficheiros\n"
-#~ " é extremamente perigoso.\n"
-#~ "Por favor faça uma cópia de segurança antes de usar\n"
-#~ " o programa.\n"
-#~ "     Foi avisado\n"
-
-#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
-#~ msgstr ""
-#~ "Pedimos desculpa. O navegador de pastas do Evolution não pode ser "
-#~ "inicializado."
-
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "Se uma previsão da mensagem deve ser mostrada"
-
-#~ msgid "The %s component doesn't support PersistStream!\n"
-#~ msgstr "O componente %s não suporta PersistStream!\n"
-
-#~ msgid "A folder containing mail items"
-#~ msgstr "Uma pasta contendo items de correio"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "Uma pasta contendo contactos"
-
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "Uma pasta contendo entradas de calendário"
-
-#~ msgid "A service containing mail items"
-#~ msgstr "Um serviço contendo items de correio"
-
-#~ msgid "A service containing contacts"
-#~ msgstr "Um serviço contendo contactos"
-
-#~ msgid "A service containing calendar entries"
-#~ msgstr "Um serviço contendo entradas de calendário"
-
-#~ msgid "A service containing tasks"
-#~ msgstr "Um serviço contendo tarefas"
-
-#~ msgid "Rename Group"
-#~ msgstr "Mudar nome de grupo"
-
-#~ msgid "Advanced Find"
-#~ msgstr "Encontrar avançado"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Mudar nome de atalho"
-
-#~ msgid "Executive Summary"
-#~ msgstr "Sumário executivo"
-
-#~ msgid "Your contacts list"
-#~ msgstr "A sua lista de contactos"
-
-#~ msgid "Tasks list"
-#~ msgstr "Lista de tarefas"
-
-#~ msgid "Enables some debugging functions"
-#~ msgstr "Liga algumas funções de deupração"
-
-#~ msgid "LEVEL"
-#~ msgstr "NÍVEL"
diff --git a/po/pt_BR.po b/po/pt_BR.po
deleted file mode 100644
index b27e463cb5..0000000000
--- a/po/pt_BR.po
+++ /dev/null
@@ -1,7328 +0,0 @@
-# Brazilian Translation of Evolution.
-# Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2001.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-26 17:19-0200\n"
-"PO-Revision-Date: 2001-01-26 17:42-02:00\n"
-"Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
-"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Adicionar serviço"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Adicionar um novo serviço ao Executive Summary"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Criar um novo correio eletrônico"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Configurações do Executive Summary..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova mensagem"
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Não é possível iniciar o componente Executive Summary do Evolution."
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Não existe tal mensagem: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Você pode selecionar uma página HTML diferente para o fundo do Executive "
-"Summary.\n"
-"\n"
-"Apenas deixe-o vazio para o padrão"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s com o aplicativo Gnome padrão"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s com o navegador web Gnome padrão"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar uma mensagem para %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Mudar a visualização para %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Fechar %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a direita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s para a linha anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s para a próxima linha"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Não é possível abrir o arquivo HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Erro ao ler dados:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Arquivo não possui um lugar para os serviços.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O componente Executive Summary não pode iniciar o Bonobo.\n"
-"Se ocorreu uma mensagem de alerta sobre o RootPOA, isto provavelmente\n"
-"significa você compilou Bonobo com GOAD no lugar de OAF."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-msgid "Error"
-msgstr "Erro"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr "Conectando ao servidor"
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr "Conectar ao servidor"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Sobre este aplicativo"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Sobre..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_Ações"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "C_lear"
-msgstr "_Limpar"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
-msgid "C_ut"
-msgstr "Recor_tar"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
-msgid "Clear"
-msgstr "Limpar"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
-msgid "Clear the selection"
-msgstr "Limpar a seleção"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fechar"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
-msgid "Close the current file"
-msgstr "Fechar o arquivo atual"
-
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
-msgid "Copy"
-msgstr "Copiar"
-
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
-msgid "Copy the selection"
-msgstr "Copiar a seleção"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
-msgid "Cut"
-msgstr "Recortar"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cut the selection"
-msgstr "Recortar a seleção"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:403
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Delete"
-msgstr "Excluir"
-
-#: ui/evolution-task-editor-dialog.xml.h:15
-msgid "Delete this task"
-msgstr "Excluir esta tarefa"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Dump XML"
-msgstr "Descarregar XML"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Descarregar a descrição de IU XML"
-
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Catálogo de endereços..."
-
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Atri_buir tarefa"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Escolher _formulário..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: _Verificar nomes"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: _Copiar para pasta..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Projetar um formulário..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Definir estilos de _impressão"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Pro_jetar este formulário"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rimeiro item na pasta"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
-msgstr "FIXME: E_ncaminhar"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "FIXME: Ajuda"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Tarefa imcom_pleta"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "FIXME: Inserir arquivo"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
-
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: _Pedido de reunião"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Colar e_special..."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Visuali_zar impressão"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar formulário como..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _formulário..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Repetição..."
-
-#: ui/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Responder a _todos"
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "FIXME: En_viar"
-
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: En_viar relatório de estado"
-
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Pu_lar ocorrência"
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Salvar ane_xo..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de scripts"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _Pedido de tarefa"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Compromisso"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contato"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Arquivo..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Formatação"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Item de _diário"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: Úl_timo item na pasta"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mensagem de correio"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: _Marcar como cumprida"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estilo de _memorando"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para pasta..."
-
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _New Task"
-msgstr "FIXME: _Nova tarefa"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objeto..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Parágrafo..."
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Reply"
-msgstr "FIXME: _Responder"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Padrão"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Item _não lido"
-
-#: ui/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _note"
-msgstr "FIXME: _nota"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "FIXME: o que vai aqui?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "Find"
-msgstr "Localizar"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "Localizar novamente"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "Localizar _novamente"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
-msgid "Go to the next item"
-msgstr "Vai para o próximo item"
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
-msgid "Go to the previous item"
-msgstr "Vai para o item anterior"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
-msgid "Modify the file's properties"
-msgstr "Modificar as propriedades do arquivo"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
-msgid "N_ext"
-msgstr "P_róximo"
-
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
-msgid "Next"
-msgstr "Próximo"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
-msgid "Paste"
-msgstr "Colar"
-
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Colar a área de transferência"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
-msgid "Previous"
-msgstr "Anterior"
-
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
-msgid "Print S_etup..."
-msgstr "Configurar i_mpressão..."
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
-msgid "Print Setup"
-msgstr "Configurar impressão..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "Print this item"
-msgstr "Imprime este item"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ui/evolution-event-editor.xml.h:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "Refazer"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "Refazer a ação desfeita"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "Substituir"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "Substituir uma expressão"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
-msgid "Save"
-msgstr "Salvar"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
-msgid "Save _As..."
-msgstr "Salvar _como..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
-msgid "Save and Close"
-msgstr "Salvar e fechar"
-
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
-msgid "Save the current file"
-msgstr "Salvar o arquivo atual"
-
-#: ui/evolution-task-editor-dialog.xml.h:94
-msgid "Save the task and close the dialog box"
-msgstr "Salva a tarefa e fecha a caixa de diálogo"
-
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "Buscar novamente pela mesma espressão"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "Buscar por uma expressão"
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
-msgid "See online help"
-msgstr "Ver ajuda on-line"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
-msgid "Select All"
-msgstr "Selecionar todos"
-
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
-msgid "Select everything"
-msgstr "Selecionar tudo"
-
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar a página para a sua impressora atual"
-
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "Desfazer"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "Desfazer a última ação"
-
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
-msgid "_About..."
-msgstr "_Sobre..."
-
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
-msgid "_Delete"
-msgstr "_Excluir"
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:109 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Arquivo"
-
-#: ui/evolution-event-editor.xml.h:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_Localizar..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "_Formulários"
-
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objeto"
-
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
-msgid "_Paste"
-msgstr "C_olar"
-
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimir"
-
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "_Substituir..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
-msgid "_Save"
-msgstr "_Salvar"
-
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: shell/e-storage-set-view.c:338 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:124 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Visualizar"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Mudar preferências"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Novo"
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Salvar tarefa como outra coisa"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferências da tarefa..."
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Salvar _como..."
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr "Cartão: "
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nome: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefixo:    "
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dado:       "
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Adicional:  "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Família:    "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufixo:     "
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data de nascimento: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Endereço:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Caixa postal:"
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:         "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Rua:         "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cidade:      "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Região:      "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Código postal:"
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  País:        "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Rótulo de entrega: "
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefones:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefone:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Agente de correio: "
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Fuso horário: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Localização geográfica: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Cargo comercial: "
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nome:  "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Unidade:  "
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Unidade2: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Unidade3: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Unidade4: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categorias: "
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Comentários: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"String única: "
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Chave pública: "
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Não foi possível iniciar Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Desativado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mesclar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mesclar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Canal para catálogo de endereços do Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-"Utilitário de configuração do canal para catálogo de endereços do "
-"Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Ação ao sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado do canal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nenhum pilot configurado, por favor visite primeiramente\n"
-"o painel Pilot Link na central de controle."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Não conectado ao daemon Gnome Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ocorreu um erro ao tentar ler a lista de\n"
-"pilots a partir do daemon Gnome Pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Não foi possível carregar cursor\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook não foi carregado\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Não foi possível iniciar o servidor wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Não foi possível iniciar wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Não foi possível ler os dados do aplicativo de endereços do pilot"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Excluir contato?"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Incluir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de telefone"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de telefone"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Incluir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Editor de contatos"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _completo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Arquivar como:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Endereço de página web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Deseja receber correio _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Comercial"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Residencial"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax comercial"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "Cel_ular"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "E-mail principal"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "C_omercial"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "E_ste é o endereço de correspondência"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "Co_ntatos..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Ca_tegories..."
-msgstr "Ca_tegorias..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "C_argo:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "E_mpresa:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Endereço..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
-msgid "General"
-msgstr "Geral"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departamento:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Escritório:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Profissão:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Apelido:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_Cônjuge:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Ani_versário:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Nome do a_ssistente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "Nome do _gerente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Bodas:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Notas:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detalhes"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "Assistente:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "Comercial"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "Comercial 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "Fax comercial"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Callback"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "Carro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Empresa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "Residencial"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "Residencial 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "Fax residencial"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "Celular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: mail/mail-config.glade.h:45
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Outro fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Rádio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Endereço _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canadá"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Verificar endereço"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_País:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finlândia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "EUA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Endereço:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Cidade:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "Cai_xa postal:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "E_stado:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "CEP/Códi_go postal:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Verificar nome completo"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"Senhorita\n"
-"Dr.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Nome:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "Nome do _meio:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "S_ufixo:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Como _minicartões"
-
-#: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como _tabela"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entre senha para %s"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "Não é possível abrir o catálogo de endereços"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Não foi possível abrir este catálogo de endereços. Isto \n"
-"significa que você forneceu uma URI incorreta ou tentou\n"
-"acessar um servidor LDAP sem que o suporte para LDAP esteja\n"
-"compilado. Se você entrou uma URI, verifique a URI e tente \n"
-"novamente. Caso contrário, você provavelmente tentou\n"
-"acessar um servidor LDAP. Se você quiser usar LDAP, você\n"
-"vai precisar baixar e instalar OpenLDAP e recompilar e\n"
-"instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Exibir todos"
-
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avançado..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Qualquer campo contém"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "Nome contém"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "E-mail contém"
-
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "A URI que o navegador de pastas vai exibir"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Outros contatos"
-
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr "Arquivo"
-
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr "Tipo de catálogo de endereços desconhecido"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr "Nenhum (modo anônimo)"
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Senha"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr "Tipo de autenticação desconhecido"
-
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr "Um"
-
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr "Subárvore"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr "Tipo de escopo desconhecido"
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr "Vincular DN:"
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr "Lembrar esta senha"
-
-#: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config.glade.h:27
-msgid "Host:"
-msgstr "Máquina:"
-
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr "Porta:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "DN raiz:"
-
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr "Escopo de busca:"
-
-#: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autenticação:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.c:460 mail/mail-config.glade.h:48
-msgid "Path:"
-msgstr "Caminho:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr "Criar caminho se ele não existir."
-
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr "Editar catálogo de endereços"
-
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr "Incluir catálogo de endereços"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Selecione o tipo de catálogo de endereços você possui e entre os dados sobre "
-"ele."
-
-#: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:40
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrição"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Fontes de catálogos de endereços"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:670
-#: mail/mail-config.glade.h:22
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Localizar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatários da mensagem"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecionar nomes"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecionar nome de:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Buscar"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Salvar como vCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "Empresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr "Site web"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Office"
-msgstr "Escritório"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Title"
-msgstr "Tratamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Profession"
-msgstr "Profissão"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Manager"
-msgstr "Gerente"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Nickname"
-msgstr "Apelido"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Spouse"
-msgstr "Cônjuge"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr "URL livre-ocupado"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Salvar no catálogo de endereços"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Não há itens neste modo de exibição\n"
-"\n"
-"Clique duas vezes aqui para criar um novo contato."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Formulários vazios no fim:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corpo"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Inferior:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Tamanho:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Fonte..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Fontes"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Rodapé:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formato"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Cabeçalho"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Cabeçalho/rodapé"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Cabeçalhos"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Cabeçalhos para cada carta"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Altura:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Aparecem uma após a outra"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Incluir:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Paisagem"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Esquerda:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Tabulações ao lado"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margens"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Número de colunas:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opções"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientação"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Página"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Configuração de página:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papel"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Fonte de papel:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Retrato"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Visualizar:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Imprimir usando sombreamento"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Inverter nas páginas pares"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Direita:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Seções:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Sombreamento"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Começam em uma nova página"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Nome do estilo:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Superior:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:70
-msgid "Type:"
-msgstr "Tipo:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Largura:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Canal para agenda do Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilitário de configuração do canal para agenda do Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Erro ao comunicar com o servidor de agenda"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Não foi possível ler os dados do aplicativo de agenda do pilot"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Canal para tarefas do Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilitário de configuração do canal para tarefas do Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Não foi possível ler os dados do aplicativo de tarefas do pilot"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Arquivo não encontrado"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir agenda"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Salvar agenda"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Não foi possível criar a visualização da agenda. Por favor verifique a "
-"configuração do seu ORBit e OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:377
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Private"
-msgstr "Particular"
-
-#: calendar/gui/calendar-model.c:380
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr "L"
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr "Transparente"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr "Opaco"
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"A data deve ser fornecida no formato: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posição geográfica deve ser fornecida no formato: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioridade deve estar entre 1 e 9, inclusive"
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr "%A, %e de %B de %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr "%H:%M"
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro ao carregar agenda</b>"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro ao carregar agenda:<br>Método não suportado"
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr "Exibição"
-
-#: calendar/gui/calendar-summary.c:489
-msgid "Show appointments"
-msgstr "Exibir compromissos"
-
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr "Exibir tarefas"
-
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr "Carregando agenda"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "A URI que a agenda vai exibir"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme em %A %d %b %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificação sobre seu compromisso em %A %d %b %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Sem resumo disponível."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar compromisso"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmes param após"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes audíveis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Soe um bip quando janelas de alarme aparecerem."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Calendar"
-msgstr "Agenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Preferências da agenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Comprimir fins de semana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Opções do navegador de datas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Padrões"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Opções de exibição"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Prazo de conclusão"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Permitir adiamento por"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Término do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Primeiro dia da semana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "sex"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:440
-msgid "Friday"
-msgstr "Sexta-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Realçar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Tarefas com prazo ainda não vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Tarefas com prazo ainda não vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "seg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:436
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Tarefas atrasadas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Tarefas atrasadas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Escolha uma cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Lembre-me de todos os compromissos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "Lembretes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "sáb"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:441
-msgid "Saturday"
-msgstr "Sábado"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Exibir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Exibir hora de término de compromissos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Exibir números das semanas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Início do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:442
-msgid "Sunday"
-msgstr "Domigo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Tarefas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "qui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:439
-msgid "Thursday"
-msgstr "Quinta-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo até o prazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Unidades de tempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Formato da hora:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "ter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:437
-msgid "Tuesday"
-msgstr "Terça-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "qua"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:438
-msgid "Wednesday"
-msgstr "Quarta-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semana útil"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutos antes que ocorram."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:76
-msgid "seconds."
-msgstr "segundos."
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Você tem certeza que deseja excluir este comprimisso sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Você tem certeza que deseja excluir esta tarefa sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Você tem certeza que deseja excluir este item de diário sem título?"
-
-#: calendar/gui/dialogs/save-comp.c:46
-msgid "Do you want to save changes?"
-msgstr "Você deseja salvar as modificações?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Cu_mprida:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-msgid "C_lassification:"
-msgstr "C_lassificação:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Cumprida"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Cumprida em:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Em progresso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Baixa"
-
-#. add a "None" option to the stores menu
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-account-editor.c:674 mail/mail-account-editor.c:676
-#: mail/mail-account-editor.c:725 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:872 mail/mail-config.glade.h:42
-#: shell/e-shell-view.c:1116 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhum"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Not Started"
-msgstr "Não iniciada"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "S_ummary"
-msgstr "_Resumo"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Sta_rt Date:"
-msgstr "Data de _início:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Indefinido"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Contacts..."
-msgstr "Co_ntatos..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "_Due Date:"
-msgstr "Prazo de _conclusão:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Priority:"
-msgstr "_Prioridade:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Status:"
-msgstr "_Estado:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:692
-msgid "Edit Task"
-msgstr "Editar tarefa"
-
-#: calendar/gui/dialogs/task-editor.c:698 calendar/gui/event-editor.c:338
-msgid "No summary"
-msgstr "Sem resumo"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:344
-#, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:347
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:350
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Item de diário - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Categorias"
-
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Classification"
-msgstr "Classificação"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Data cumprida"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Data de término"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Data de início"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Posição geográfica"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Porcentagem cumprida"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Resumo"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Transparência"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abre a tarefa"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Marcar como cumprida"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Marca a tarefa como cumprida"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Exclui a tarefa"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i frações de minuto"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Novo compromisso..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Editar este compromisso..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#: ui/evolution-event-editor.xml.h:15
-msgid "Delete this appointment"
-msgstr "Excluir este compromisso"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Tornar este compromisso móvel"
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr "Excluir esta ocorrência"
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr "Excluir todas as ocorrências"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Todos"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Não foi possível carregar as tarefas em `%s'"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O método necessário para carregar `%s' não é suportado"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Dia _inteiro"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "Básico do compromisso"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Repetição personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dias"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "A cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Exceções"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Horas"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Co_rreio para:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Sem repetição"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "Visualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pa_rticular"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Repetição"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regra de repetição"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Repetição simples"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "R_esumo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tempo"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Audio"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "Co_ntatos"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Exibição"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _término:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_Correio"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Programa"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "E_xecutar programa:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "Hora de _início:"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "Data de _início:"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dia(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "por"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "para sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mês(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "até"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "ano(s)"
-
-#: calendar/gui/event-editor.c:332
-msgid "Edit Appointment"
-msgstr "Editar compromisso"
-
-#: calendar/gui/event-editor.c:410
-msgid "on"
-msgstr "no"
-
-#: calendar/gui/event-editor.c:435 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
-
-#: calendar/gui/event-editor.c:562
-msgid "on the"
-msgstr "no"
-
-#: calendar/gui/event-editor.c:569
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/event-editor.c:723
-msgid "occurrences"
-msgstr "ocorrências"
-
-#: calendar/gui/event-editor.c:840
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Este compromisso possui repetições que o Evolution não pode editar."
-
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/gnome-cal.c:696
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Não foi possível abrir pasta em `%s'"
-
-#: calendar/gui/gnome-cal.c:707
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "O método necessário para abrir `%s' não é suportado"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Abril"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Agosto"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Dezembro"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Fevereiro"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ir para data"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir para hoje"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Janeiro"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Julho"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Junho"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Março"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Maio"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "Novembro"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Outubro"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "Setembro"
-
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "Não foi possível iniciar Gnome"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1º"
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2º"
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3º"
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4º"
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5º"
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6º"
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7º"
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8º"
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9º"
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10º"
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11º"
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12º"
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13º"
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14º"
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15º"
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16º"
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17º"
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18º"
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19º"
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20º"
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21º"
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22º"
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23º"
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24º"
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25º"
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26º"
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27º"
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28º"
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29º"
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30º"
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31º"
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "do"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "se"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "te"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "qu"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "qu"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "se"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "sá"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "Dia atual (%a %d %b %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a %d %b"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Semana atual (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr "Mês atual (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "Ano atual (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "Imprimir agenda"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1035
-msgid "Print Preview"
-msgstr "Visualizar impressão"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "A URI da pasta de tarefas a ser exibida"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "DSTQQSS"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Erro ao executar busca por filtro: %s: %s"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Não foi possível criar arquivo de bloqueio para %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente "
-"mais tarde."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Falha ao obter bloqueio usando fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Falha ao obter bloqueio usando flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Não foi possível verificar arquivo de correio %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Não foi possível abrir arquivo de correio %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Não foi possível abrir arquivo de correio temporário %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Não foi possível testar arquivo de bloqueio para %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro ao ler arquivo de correio: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro ao escrever arquivo de correio temporário: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Falha ao armazenar correio no arquivo temporário %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Não foi possível criar pipe: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Não foi possível executar fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Falha no programa Movemail: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Erro desconhecido)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Não foi possível carregar %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Não foi possível carregar %s: Sem código de inicialização no módulo."
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "%s servidor %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s serviço para %s em %s"
-
-#: camel/camel-remote-store.c:318
-msgid "Connection cancelled"
-msgstr "Conexão cancelada"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Não foi possível conectar à %s (porta %d): %s."
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(máquina desconhecida)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operação cancelada"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "A URL '%s' precisa de um componente nome do usuário"
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "A URL '%s' precisa de um componente máquina"
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "A URL '%s' precisa de um componente caminho"
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr "Não existe a máquina %s."
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Não é possível temporariamente procurar nome de máquina %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Não existe provedor disponível para o protocolo `%s'"
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Não foi possível criar diretório %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "A URL `%s' não possui um protocolo"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "A URL `%s' contém um protocolo inválido"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Número de porta na URL `%s' não é númerico"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Não foi possível obter ticket do Kerberos:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Resposta de autenticação inválida do servidor."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Resposta inesperada do servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Falhou o comando IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Resposta do servidor terminou cedo demais."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Resposta do servidor IMAP não contém informação de %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Resposta OK inesperada do servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Não foi possível carregar resumo para %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "Não foi possível localizar corpo da mensagem na resposta FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Para ler e armazenar correio em servidores IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Esta opção conectará ao servidor IMAP usando uma senha em texto claro."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Esta opção conectará ao servidor IMAP usando autenticação Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sPor favor entre a senha IMAP para %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Não é possível autenticar com o servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Não foi possível criar o diretório %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Diretórios de correio no formato MH"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Para armazenar correio local em diretórios de correio do tipo MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Arquivo mbox padrão do Unix"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Para armazenar correio local no formato padrão mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Arquivos de correio no formato qmail maildir"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Para armazenar correio local em diretórios no formato qmail maildir"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Raiz de armazenagem %s não é um caminho absoluto"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Raiz de armazenagem %s não é um diretório comum"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Não é possível obter pasta: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Repositórios locais não possuem uma pasta raiz"
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Repositórios locais não possuem uma pasta padrão"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Pastas locais não podem ser aninhadas."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Arquivo de correio local %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Não foi possível renomear pasta %s para %s: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Não foi possível excluir arquivo de resumo de pasta `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Não foi possível excluir arquivo de índice de pasta `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Não é possível acrescentar mensagem à pasta maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Não é possível obter mensagem: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Não existe tal mensagem"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Conteúdo de mensagem inválido"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível abrir pasta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Pasta `%s' não existe."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível criar pasta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' não é um diretório maildir."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Não foi possível excluir a pasta `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "não é um diretório maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Não é possível abrir mbox: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Não é possível acrescentar mensagem ao arquivo mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Não é possível obter mensagem: %s da pasta %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Falha ao construir a mensagem: mbox corrompida?"
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível abrir arquivo `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível criar arquivo `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' não é um arquivo comum."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível excluir pasta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Pasta `%s' não está vazia. Ela não foi excluída."
-
-#: camel/providers/local/camel-mbox-summary.c:240
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Não foi possível abrir pasta: %s: resumindo da posição %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:274
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Erro fatal do analisador de correio próximo à posição %ld na pasta %s"
-
-#: camel/providers/local/camel-mbox-summary.c:349
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Não é possível resumir a pasta: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Não foi possível abrir pasta para resumir: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:499
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Não é possível abrir mbox temporário: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "O resumo e a pasta não coincidem, mesmo após uma sincronização"
-
-#: camel/providers/local/camel-mbox-summary.c:571
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erro ao escrever para o mbox temporário: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:588
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Falha ao escrever para o mbox temporário: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Não foi possível fechar pasta fonte %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:615
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Não foi possível fechar pasta temporária: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Não foi possível renomear pasta: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:836
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Erro desconhecido: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Não é possível acrescentar mensagem a pasta MH: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' não é um diretório."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Por favor entre a senha NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "O servidor rejeitou o nome do usuário"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Falha ao enviar nome do usuário ao servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Servidor rejeitou nome do usuário/senha"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Mensagem %s não encontrada."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Não foi possível obter a lista de grupos do servidor."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Não é possível carregar o arquivo de lista de grupos para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Não é possível salvar o arquivo de lista de grupos para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "Notícias USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Este é um provedor para ler e publicar em grupos de notícias da USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Não foi possível abrir diretório para servidor de notícias: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "Notícias USENET via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Esta opção autenticará com o servidor NNTP usando uma senha em texto claro."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Não é possível abrir ou criar o arquivo .newsrc para %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"Não foi possível abrir pasta: a listagem das mensagens estava incompleta."
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "Não existe mensagem com uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Não foi possível recuperar mensagem do servidor POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Para conectar à servidores POP. O protocolo POP também pode ser usado para "
-"recuperar correio a partir de certos provedores de correio web e sistemas de "
-"correio proprietários."
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Esta opção conectará ao servidor POP usando uma senha em texto claro. Esta é "
-"a única opção suportada por vários servidores POP."
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Esta opção conectará ao servidor POP usando uma senha cifrada usando o "
-"protocolo APOP. Isto pode não funcionar para todos os usuários mesmo em "
-"servidores que alegam suportar o protocolo."
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Esta opção conectará ao servidor POP usando Kerberos 4 para autenticação."
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Não foi possível autenticar o servidor KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Não foi possível conectar ao servidor POP em %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPor favor entre a senha POP3 para %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Não é possível conectar ao servidor POP.\n"
-"Erro ao enviar nome do usuário: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-msgid "(Unknown)"
-msgstr "(Desconhecido)"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Não é possível conectar ao servidor POP.\n"
-"Não existe suporte para o mecanismo de autenticação pedido."
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Não é possível conectar ao servidor POP.\n"
-"Erro ao enviar senha: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Não existe a pasta `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:59
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Para entregar correio passando-o para o programa \"sendmail\" no sistema "
-"local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Não foi possível criar pipe para o sendmail: %s: a mensagem não foi enviada"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-"Não foi possível executar fork para o sendmail: %s: a mensagem não foi "
-"enviada"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Não foi possível enviar a mensagem: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail terminou com sinal %s: a mensagem não foi enviada."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Não foi possível executar %s: a mensagem não foi enviada"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail terminou com estado %d: a mensagem não foi enviada."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Entrega de correio usando o programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:54
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para entregar correio conectando à um servidor remoto usando SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Erro de sintaxe, comando não reconhecido"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Erro de sintaxe nos parâmetros ou argumentos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Comando não implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Parâmetro de comando não implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Estado do sistema ou resposta de ajuda do sistema"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Mensagem de ajuda"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Serviço pronto"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Serviço fechando canal de transmissão"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Serviço indisponível, fechando canal de transmissão"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Ação de correio pedida OK, terminada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "O usuário não é local; irei encaminhar para <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Ação de correio pedida não executada: caixa postal indisponível"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Ação pedida não executada: caixa postal indisponível"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Ação pedida abortada: erro no processamento"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "O usuário não é local; por favor tente <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Ação pedida não executada: espaço no sistema insuficiente"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Ação de correio pedida abortada: espaço alocado excedido"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Ação pedida não executada: nome da caixa postal não permitido"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Inicie entrada da mensagem; termine com <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "A transação falhou"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erro na resposta de boas-vindas: %s: possivelmente não-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Não é necessária autenticação"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Esta opção conectará ao servidor SMTP sem usar qualquer tipo de "
-"autenticação. Isto deve ser adequado para conectar à maioria dos servidores "
-"SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:10
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Esta opção conectará ao servidor SMTP usando autenticação CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "Servidor SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Entrega de correio SMTP via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Não é possível enviar mensagem: endereço do remetente não foi definido."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Não é possível enviar mensagem: endereço do remetente não é válido."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Não é possível enviar mensagem: não foram definido destinatários."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Tempo excedido no pedido HELO: %s: não-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Erro na resposta de HELO: %s: não-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Erro na resposta de MAIL FROM: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Erro na resposta de RCPT TO: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Erro na resposta de DATA: %s: a mensagem não foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Tempo excedido no envio de DATA: terminação de mensagem: %s: a mensagem não "
-"foi enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"Erro na resposta de DATA: terminação de mensagem: %s: a mensagem não foi "
-"enviada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Tempo excedido no pedido RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Erro na resposta de RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Tempo excedido no pedido QUIT: %s: não-fatal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Erro na resposta de QUIT: %s: não-fatal"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Provedor de correio em pastas virtuais"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bytes"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:154
-msgid "attachment"
-msgstr "anexo"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Anexar um arquivo"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Remover itens selecionados da lista de anexos"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Incluir anexo..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Anexar um arquivo à mensagem"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1109
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Propriedades do anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nome do arquivo:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Anexo embutido"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
-
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:353
-#: mail/mail-format.c:626
-msgid "From:"
-msgstr "De:"
-
-#: composer/e-msg-composer-hdrs.c:297
-msgid "Click here for the address book"
-msgstr "Clique aqui para o catálogo de endereços"
-
-#: composer/e-msg-composer-hdrs.c:354
-msgid "Enter the identity you wish to send this message from"
-msgstr "Entre a identidade com a qual você deseja enviar esta mensagem"
-
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:630
-msgid "To:"
-msgstr "Para:"
-
-#: composer/e-msg-composer-hdrs.c:359
-msgid "Enter the recipients of the message"
-msgstr "Entre os destinatários da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:632
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:364
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Entre os endereços que receberão uma cópia da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:369
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:370
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Entre os endereços que receberão uma cópia da mensagem sem aparecer na lista "
-"de destinatários da mensagem"
-
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:634
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:377
-msgid "Enter the subject of the mail"
-msgstr "Entre o assunto da correspondência"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Não foi possível abrir arquivo de assinatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Salvar como..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro ao salvar arquivo: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro ao carregar arquivo: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Salvando modificações à mensagem..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Salvar modificações à mensagem..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Erro ao salvar mensagem para 'Drafts': %s"
-
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensagem não foi enviada.\n"
-"\n"
-"Você deseja salvar as suas modificações?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Abrir arquivo"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Este arquivo não existe."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Este não é um arquivo comum."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Este arquivo existe mas não é legível."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Este arquivo aparenta ser acessível mas open(2) falhou."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O arquivo é muito grande (mais que 100K).\n"
-"Você tem certeza que deseja inserí-lo?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Um erro ocorreu ao ler o arquivo."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Redigir uma mensagem"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Não foi possível criar janela de redação."
-
-#: composer/evolution-composer.c:360
-msgid "Cannot initialize Evolution's composer."
-msgstr "Não é possível iniciar o redator do Evolution."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "ano"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "anos"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mês"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "meses"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "semanas"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dias"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Oops. Você esqueceu de escolher uma data."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Oops. Você escolheu uma data inválida."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"A data da mensagem será comparada em relação\n"
-"ao instante quando o filtro é executado ou\n"
-"a pasta virtual é aberta."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"A data da mensagem será comparada em relação\n"
-"ao instante que você especificou aqui."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"A data da mensagem será comparada em relação a um\n"
-"instante relativo a quando o filtro é executado;\n"
-"\"uma semana atrás\", por exemplo."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "o instante atual"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "um instante especificado"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "um instante relativo ao instante atual"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Comparar em relação a"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "agora"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<clique aqui para selecionar uma data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Incluir regra de filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar regra de filtro"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "de entrada"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "de saída"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Então"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Incluir ação"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Excluir ação"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Oops, você esqueceu de escolher uma pasta.\n"
-"Por favor volte e especifique uma pasta válida para onde entregar correio."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Selecionar pasta"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Entre URI da pasta"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<clique aqui para selecionar uma pasta>"
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Erro na expressão regular '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Teste"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Nome da regra: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Sem título"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Se"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Executar ações"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "se todos os critérios forem atendidos"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "se algum critério for atendido"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Adicionar critério"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Remover critério"
-
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr "Em resposta a"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr "Importante"
-
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "Lida"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar pastas virtuais"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Regras de filtro"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "De entrada"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "De saída"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Pastas virtuais"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Fontes de pastas virtuais"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Atribuir cor"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Atribuir pontuação"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar para pasta"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recebimento"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de envio"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expressão"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Encaminhar para endereço"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da mensagem"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Cabeçalho da mensagem"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Mensagem foi recebida"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Mensagem foi enviada"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para pasta"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatários"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Correspondência com expressão regular"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Pontuação"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remetente"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Atribuir estado"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Fonte"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Cabeçalho específico"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "Estado"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Parar o processamento"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "após"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "antes"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contém"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "não contém"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "não termina com"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "não existe"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "não soa como"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "não começa com"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina com"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "não é"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "em ou após"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "em ou antes"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "começa com"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "foi após"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "foi antes"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Adicionar regra"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Editar regra de pontuação"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Adicionar regra de pasta virtual"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Editar regra de pasta virtual"
-
-#: mail/component-factory.c:294
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Não é possível iniciar o componente de correio do Evolution."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "Não é possível registrar repositório com a shell."
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Armazenar busca como pasta virtual"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Corpo ou assunto contém"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Corpo contém"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Assunto contém"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Corpo não contém"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Assunto não contém"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Remetente contém"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Pasta virtual por assunto"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Pasta virtual por remetente"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Pasta virtual por destinatários"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtro por assunto"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtro por remetente"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtro por destinatários"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtro por lista de discussão"
-
-#: mail/folder-browser.c:669 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Salvar como..."
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Responder ao remetente"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Responder a todos"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Encaminhar"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Encaminhar embutido"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Marcar como lida"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Marcar como não lida"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Mover para pasta..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copiar para pasta..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Desfazer exclusão"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Aplicar filtros"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Criar regra a partir da mensagem"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtro por lista de discussão (%s)"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato do repositório corrente:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Formato da caixa de correio"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Novo formato do repositório:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Nota: Ao converter entre formatos de caixa postal, uma falha\n"
-"(como falta de espaço em disco) pode não ser recuperável\n"
-"automaticamente. Por favor use esta função com cuidado."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (padrão)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Gerenciador de contas do Evolution"
-
-#: mail/mail-account-editor.c:265
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Um ou mais dos seus servidores não estão configurados corretamente.\n"
-"Você deseja salvar de qualquer forma?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:625
-msgid "Evolution Account Editor"
-msgstr "Editor de contas do Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Correio para %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Assunto é %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Correio de %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "Lista de discussão %s"
-
-#: mail/mail-callbacks.c:82
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Você não configurou o cliente de correio.\n"
-"Você deve fazê-lo antes de poder enviar,\n"
-"receber ou redigir mensagens.\n"
-"Você desejaria configurá-lo agora?"
-
-#: mail/mail-callbacks.c:135
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Você deve configurar uma identidade\n"
-"antes de poder redigir uma mensagem."
-
-#: mail/mail-callbacks.c:147
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Você deve configurar um transporte de correio\n"
-"antes de poder redigir uma mensagem."
-
-#: mail/mail-callbacks.c:191
-msgid "You have not set a mail transport method"
-msgstr "Você não estabeleceu um método de transporte de correio"
-
-#: mail/mail-callbacks.c:224
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Esta mensagem não possui um assunto.\n"
-"Enviar mesmo assim?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Você deve configurar uma conta antes de poder enviar esta mensagem."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Você deve especificar destinatários para poder enviar esta mensagem."
-
-#: mail/mail-callbacks.c:535
-msgid "Forwarded message:\n"
-msgstr "Mensagem encaminhada:\n"
-
-#: mail/mail-callbacks.c:618
-msgid "Move message(s) to"
-msgstr "Mover mensagem(ns) para"
-
-#: mail/mail-callbacks.c:620
-msgid "Copy message(s) to"
-msgstr "Copiar mensagem(ns) para"
-
-#: mail/mail-callbacks.c:755
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Você pode apenas editar mensagens salvas\n"
-"na pasta Drafts."
-
-#: mail/mail-callbacks.c:788 mail/mail-display.c:78
-msgid "Overwrite file?"
-msgstr "Sobrescrever arquivo?"
-
-#: mail/mail-callbacks.c:792 mail/mail-display.c:82
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Já existe um arquivo com este nome.\n"
-"Sobrescrevê-lo?"
-
-#: mail/mail-callbacks.c:836
-msgid "Save Message As..."
-msgstr "Salvar mensagem como..."
-
-#: mail/mail-callbacks.c:838
-msgid "Save Messages As..."
-msgstr "Salvar mensagens como..."
-
-#: mail/mail-callbacks.c:946
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Erro ao carregar inforação do filtro:\n"
-"%s"
-
-#: mail/mail-callbacks.c:995
-msgid "Print Message"
-msgstr "Imprimir mensagem"
-
-#: mail/mail-callbacks.c:1042
-msgid "Printing of message failed"
-msgstr "Falhou a impressão da mensagem"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Conta"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Informação de conta"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Gerência de conta"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propriedades de conta"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avançado"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Tipo de autenticação:"
-
-#: mail/mail-config.glade.h:11
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Parabéns, sua configuração de correio está completa.\n"
-"\n"
-"Você está pronto agora para enviar e receber correio\n"
-"eletrônico usando o Evolution. \n"
-"\n"
-"Pressione \"Concluir\" para salvar suas configurações."
-
-#: mail/mail-config.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:18
-msgid "Default"
-msgstr "Padrão"
-
-#: mail/mail-config.glade.h:20
-msgid "Done"
-msgstr "Terminado"
-
-#: mail/mail-config.glade.h:21
-msgid "E-Mail Address:"
-msgstr "Endereço eletrônico:"
-
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Endereço eletrônico:"
-
-#: mail/mail-config.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Configuração de correio do Evolution"
-
-#: mail/mail-config.glade.h:25
-msgid "Full Name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config.glade.h:28
-msgid "Hostname:"
-msgstr "Nome da máquina:"
-
-#: mail/mail-config.glade.h:29
-msgid "Identity"
-msgstr "Identidade"
-
-#: mail/mail-config.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "Servidor de correio de entrada"
-
-#: mail/mail-config.glade.h:31
-msgid "Keep mail on server"
-msgstr "Manter correio no servidor"
-
-#: mail/mail-config.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:33
-msgid "Mail"
-msgstr "Correio"
-
-#: mail/mail-config.glade.h:34
-msgid "Mail Account"
-msgstr "Conta de correio"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail Configuration"
-msgstr "Configuração de correio"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "Assitente de configuração de correio"
-
-#: mail/mail-config.glade.h:37
-msgid "Make this my default account"
-msgstr "Torne esta a minha conta padrão"
-
-#: mail/mail-config.glade.h:38
-msgid "Mark messages as \"Read\" after:"
-msgstr "Marcar mensagens como \"Lida\" após:"
-
-#: mail/mail-config.glade.h:39
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#: mail/mail-config.glade.h:41
-msgid "News"
-msgstr "Notícias"
-
-#: mail/mail-config.glade.h:43
-msgid "Optional"
-msgstr "Opcional"
-
-#: mail/mail-config.glade.h:44
-msgid "Organization:"
-msgstr "Empresa:"
-
-#: mail/mail-config.glade.h:46
-msgid "Outgoing Mail Server"
-msgstr "Servidor de correio de saída"
-
-#: mail/mail-config.glade.h:47
-msgid "Password:"
-msgstr "Senha:"
-
-#: mail/mail-config.glade.h:49
-msgid "Plain Text"
-msgstr "Texto claro"
-
-#: mail/mail-config.glade.h:50
-msgid "Receiving Email"
-msgstr "Recebendo mensagem"
-
-#: mail/mail-config.glade.h:51
-msgid "Remember my password"
-msgstr "Lembre a minha senha"
-
-#: mail/mail-config.glade.h:52 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Responder-a:"
-
-#: mail/mail-config.glade.h:53
-msgid "Required"
-msgstr "Exigido"
-
-#: mail/mail-config.glade.h:55
-msgid "Save password"
-msgstr "Salvar senha"
-
-#: mail/mail-config.glade.h:56
-msgid "Select signature file"
-msgstr "Selecionar arquivo de assinatura"
-
-#: mail/mail-config.glade.h:57
-msgid "Send mail in HTML format by default."
-msgstr "Enviar mensagens em formato HTML como padrão."
-
-#: mail/mail-config.glade.h:58
-msgid "Sending Email"
-msgstr "Enviando mensagem"
-
-#: mail/mail-config.glade.h:60
-msgid "Server Configuration"
-msgstr "Configuração do servidor"
-
-#: mail/mail-config.glade.h:61
-msgid "Server Type: "
-msgstr "Tipo do servidor: "
-
-#: mail/mail-config.glade.h:62
-msgid "Server requires authentication"
-msgstr "Servidor requer autenticação"
-
-#: mail/mail-config.glade.h:63
-msgid "Servers"
-msgstr "Servidores"
-
-#: mail/mail-config.glade.h:64
-msgid "Signature file:"
-msgstr "Arquivo de assinatura:"
-
-#: mail/mail-config.glade.h:65
-msgid "Signature:"
-msgstr "Assinatura:"
-
-#: mail/mail-config.glade.h:66
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:67
-msgid "This server requires a secure connection (SSL)"
-msgstr "Este servidor requer uma conexão segura (SSL)"
-
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:69
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Digite o nome com o qual deseja identificar estes servidores. Por exemplo: "
-"\"Trabalho\" ou \"Casa\"."
-
-#: mail/mail-config.glade.h:71
-msgid "User Information"
-msgstr "Informação do usuário"
-
-#: mail/mail-config.glade.h:72
-msgid "Username:"
-msgstr "Nome do usuário:"
-
-#: mail/mail-config.glade.h:73
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Bem-vindo ao assistente de configuração de correio do Evolution.\n"
-"\n"
-"Pressione \"Próximo\" para começar. "
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Falha ao verificar a configuração de recebimento de correio.\n"
-"Você pode enfrentar problemas ao recuperar mensagens de %s"
-
-#: mail/mail-config-druid.c:458
-msgid "Namespace:"
-msgstr "Espaço de nomes:"
-
-#: mail/mail-config-druid.c:643
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Falha ao verificar a configuração de envio de correio.\n"
-"Você pode enfrentar problemas ao enviar mensagens usando %s"
-
-#. set window title
-#: mail/mail-config-druid.c:992
-msgid "Evolution Account Wizard"
-msgstr "Assitente de contas do Evolution"
-
-#: mail/mail-display.c:97
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Não foi possível abrir arquivo %s:\n"
-"%s"
-
-#: mail/mail-display.c:130
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Não foi possível escrever dados: %s"
-
-#: mail/mail-display.c:228
-msgid "Save Attachment"
-msgstr "Salvar anexo"
-
-#: mail/mail-display.c:268
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Não foi possível criar diretório temporário: %s"
-
-#: mail/mail-display.c:310
-msgid "Save to Disk..."
-msgstr "Salvar para o disco..."
-
-#: mail/mail-display.c:312
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir em %s..."
-
-#: mail/mail-display.c:314
-msgid "View Inline"
-msgstr "Visualizar embutido"
-
-#: mail/mail-display.c:341
-msgid "External Viewer"
-msgstr "Visualizador externo"
-
-#: mail/mail-display.c:364
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Visualizar embutido (via %s)"
-
-#: mail/mail-display.c:368
-msgid "Hide"
-msgstr "Esconder"
-
-#: mail/mail-format.c:505
-#, c-format
-msgid "%s attachment"
-msgstr "anexo %s"
-
-#: mail/mail-format.c:653
-msgid "Loading message content"
-msgstr "Carregando conteúdo da mensagem"
-
-#: mail/mail-format.c:941
-msgid "Encrypted message not displayed"
-msgstr "Mensagem cifrada não exibida"
-
-#: mail/mail-format.c:947
-msgid "Encrypted message"
-msgstr "Mensagem cifrada"
-
-#: mail/mail-format.c:948
-msgid "Click icon to decrypt."
-msgstr "Clique no ícone para decifrar."
-
-#: mail/mail-format.c:1350
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Esta mensagem está assinada digitalmente e é autêntica."
-
-#: mail/mail-format.c:1358
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Esta mensagem está assinada digitalmente mas não é possível estabelecer sua autenticidade."
-
-#: mail/mail-format.c:1562
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Apontador para site FTP (%s)"
-
-#: mail/mail-format.c:1574
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Apontador para arquivo local (%s) válido no site \"%s\""
-
-#: mail/mail-format.c:1578
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Apontador para arquivo local (%s)"
-
-#: mail/mail-format.c:1612
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
-
-#: mail/mail-format.c:1617
-msgid "Malformed external-body part."
-msgstr "Parte external-body malformada."
-
-#: mail/mail-format.c:1788
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Em %s, %s escreveu:\n"
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Alterando pasta \"%s\" para o formato \"%s\""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Alterar pasta \"%s\" para o formato \"%s\""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando pasta"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "Fechando pasta atual"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "Renomeando pasta antiga e abrindo"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Criando nova pasta"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Copiando mensagens"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Não é possível salvar metainfo da pasta; você provavelmente descobrirá que "
-"não pode mais abrir esta pasta: %s"
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Se você não pode mais abrir esta caixa postal\n"
-"então você precisar repará-la manualmente."
-
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr "Registrando pasta local"
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr "Registrar pasta local"
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Não é possível registrar a pasta '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Erro enquanto '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:89
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Erro ao executar operação:\n"
-"%s"
-
-#: mail/mail-mt.c:372 mail/mail-mt.c:401
-msgid "Working"
-msgstr "Trabalhando"
-
-#: mail/mail-ops.c:510
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Enviando \"%s\""
-
-#: mail/mail-ops.c:512
-msgid "Sending message"
-msgstr "Enviando mensagem"
-
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Concatenando \"%s\""
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Concatenando uma mensagem sem um assunto"
-
-#: mail/mail-ops.c:833
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Movendo mensagens de \"%s\" para \"%s\""
-
-#: mail/mail-ops.c:835
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensagens de \"%s\" para \"%s\""
-
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensagens de \"%s\" para \"%s\""
-
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensagens de \"%s\" para \"%s\""
-
-#: mail/mail-ops.c:871
-msgid "Moving"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:874
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:894
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:969
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Varrendo pastas em \"%s\""
-
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:356
-msgid "(No description)"
-msgstr "(Sem descrição)"
-
-#: mail/mail-ops.c:1100
-msgid "Forwarded messages"
-msgstr "Mensagens encaminhadas"
-
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1210
-#, c-format
-msgid "Opening folder %s"
-msgstr "Abrindo pasta %s"
-
-#: mail/mail-ops.c:1272
-msgid "Synchronising folder"
-msgstr "Sincronizando pasta"
-
-#: mail/mail-ops.c:1322
-msgid "Expunging folder"
-msgstr "Excluindo permanentemente pasta"
-
-#: mail/mail-ops.c:1371
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Recuperando mensagem %s"
-
-#: mail/mail-ops.c:1438
-msgid "Retrieving messages"
-msgstr "Recuperando mensagens"
-
-#: mail/mail-ops.c:1448
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recuperando mensagem número %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1596
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Carregando pasta %s para %s"
-
-#: mail/mail-ops.c:1598
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Carregar pasta %s para %s"
-
-#: mail/mail-ops.c:1764
-msgid "Saving messages"
-msgstr "Salvando mensagens"
-
-#: mail/mail-ops.c:1843
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Não é possível criar arquivo de saída: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1856
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvando mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1870
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Erro ao salvar mensagens para: %s:\n"
-" %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Mensagem incompleta escrita no pipe!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Erro ao preparar para %s:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Erro enquanto `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Erro ao ler comandos da thread de envio."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Mensagem corrompida da thread de envio?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Não foi possível criar caixa de diálogo."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "O usuário cancelou a consulta."
-
-#: mail/mail-tools.c:192
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Não foi possível criar mbox temporário `%s': %s"
-
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensagem encaminhada)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Enc: (sem assunto)"
-
-#: mail/mail-tools.c:277
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Mensagem encaminhada - %s"
-
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Mensagem encaminhada (sem assunto)"
-
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Não é possível abrir local `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "Pastas virtuais"
-
-#: mail/mail-vfolder.c:302
-msgid "New VFolder"
-msgstr "Nova pasta virtual"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Responder ao remetente desta mensagem"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Responder a todos os destinatários desta mensagem"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Encaminhar esta mensagem"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Imprime a mensagem selecionada"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Exclui esta mensagem"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr "Não vista"
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr "Vista"
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr "Respondida"
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
-
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr "<desconhecido>"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
-msgstr "Hoje %k:%M"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr "Ontem %k:%M"
-
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
-msgstr "%a %k:%M"
-
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %k:%M"
-
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr "Marcada"
-
-#: mail/message-list.c:1110
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1110
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1110
-msgid "Received"
-msgstr "Recebida"
-
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1111
-msgid "Size"
-msgstr "Tamanho"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor, entre a sua frase-senha de %s para %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor, entre a sua frase-senha de %s"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Sem programa GPG/PGP disponível."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Não foi fornecida uma senha."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Não foi possível criar pipe para GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Sem destinatários especificados"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Não foi possível criar arquivo temporário: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Pasta"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Repositório"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Exibir pastas começando com:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Obtendo repositório para \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Obter repositório para \"%s\""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Assinando a pasta \"%s\""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Cancelando assinatura da pasta \"%s\""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Assinar a pasta \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Cancelar a assinatura da pasta \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Instalação do Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Esta nova versão do Evolution precisa instalar arquivos adicionais\n"
-"no seu diretório pessoal do Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Por favor clique \"OK\" para instalar os arquivos ou \"Cancelar\" para sair."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Não foi possível atualizar os arquivos corretamente"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Arquivos do Evolution instalados com sucesso."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Esta parece ser a primeira vez que você executa o Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Por favor clique \"OK\" para instalar os arquivos do Evolution em"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Não é possível criar o diretório\n"
-"%s\n"
-"Erro: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Não é possível copiar arquivos em\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"O arquivo `%s' não é um diretório.\n"
-"Por favor o mova para permitir a instalação\n"
-"dos arquivos de usuário do Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"O diretório `%s' existe mas não é o diretório\n"
-"do Evolution. Por favor, o mova para permitir\n"
-"a instalação dos arquivos de usuário do Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Não é possível criar a pasta especificada:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "O nome especificado para a pasta é inválido."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Criar nova pasta"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"O tipo da pasta selecionada não é válido para\n"
-"a operação desejada."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Novo..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Sem nome)"
-
-#: shell/e-shell-view-menu.c:127
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy não foi encontrado em seu $PATH."
-
-#: shell/e-shell-view-menu.c:133
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy não pôde ser executado."
-
-#: shell/e-shell-view-menu.c:185
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:187
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution é um conjunto de aplicativos de 'groupware'\n"
-"para correio, agenda e gerenciamento de contatos\n"
-"dentro do ambiente GNOME."
-
-#: shell/e-shell-view-menu.c:347
-msgid "Go to folder..."
-msgstr "Ir para a pasta..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Nenhuma pasta exibida)"
-
-#: shell/e-shell-view.c:471
-msgid "Folders"
-msgstr "Pastas"
-
-#: shell/e-shell-view.c:1121
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1123
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Não é possível definir repositório local -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Ooops! A visualização para `%s' terminou inesperadamente. :-(\n"
-"Isto provavelmente significa que o componente %s falhou."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Criar um novo grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Nome do grupo:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Você deseja realmente excluir o grupo\n"
-"`%s' da barra de atalhos?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Não remover"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "Ícones _pequenos"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Exibe os atalhos como ícones pequenos"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "Ícones _grandes"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Exibe os atalhos como ícones grandes"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Novo group..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Criar um novo grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Excluir este grupo..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Exclui este atalho da barra de atalhos"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "Es_conder a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Esconder a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Ativar"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Ativa este atalho"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Remove este atalho da barra de atalhos"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Erro ao salvar atalhos."
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Visualizar a pasta selecionada"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Sem nome)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Sem erro"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Erro genérico"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Já existe uma pasta com o mesmo nome"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "O tipo de pasta especificado não é válido"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Não há espaço suficiente para criar a pasta"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "A pasta especificada não foi achada"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Função não implementada neste repositório"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Permissão negada"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Operação não suportada"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "O tipo especificado não é suportado neste repositório"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Obrigado\n"
-"The Evolution Team\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Não é possível iniciar o Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Desativar."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Não é possível iniciar o sistema de componentes Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Criar novo contato"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Apagar um contato"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Localizar um contato"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Novo contato"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Imprimir contatos"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Parar"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Parar a carga"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Visualizar todos"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Visualizar todos os contatos"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Configuração do catálogo de _endereços..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Imprimir contatos..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Busca por contatos"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dias"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "A_genda"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "Preferências da agenda..."
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
-msgstr "Criar um novo compromisso"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Criar uma nova agenda"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dia"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Go back in time"
-msgstr "Voltar no tempo"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go forward in time"
-msgstr "Avançar no tempo"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "Ir para"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to a specific date"
-msgstr "Ir para uma data específica"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to present time"
-msgstr "Ir para o presente"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "Mês"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "New appointment"
-msgstr "Novo compromisso"
-
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "Abrir uma agenda"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Ant"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
-msgstr "Imprimir esta agenda"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Salvar agenda como outra coisa"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Show 1 day"
-msgstr "Exibe 1 dia"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "Show 1 month"
-msgstr "Exibe 1 mês"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Show 1 week"
-msgstr "Exibe 1 semana"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show the working week"
-msgstr "Exibe a semana útil"
-
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Novo"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_Abrir agenda"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "_Imprimir esta agenda"
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Exclui este item"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Excluir..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ajuda"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Imprimir en_velope..."
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Salva o contato e fecha a caixa de diálogo"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "E_nviar o contato a outro..."
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Enviar _mensagem ao contato..."
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Fechar este compromisso"
-
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Encaminar como vCa_lendar"
-
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Novo compromisso"
-
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
-
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva o compromisso e fecha a caixa de diálogo"
-
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
-msgstr "Agendar reunião"
-
-#: ui/evolution-event-editor.xml.h:89
-msgid "Schedule _Meeting"
-msgstr "Agendar _reunião"
-
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Agendar algum tipo de reunião"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Redigir"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Redigir uma nova mensagem"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copiar mensagem para uma nova pasta"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Criar regra"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Pasta"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtro por _remetente"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtro por _destinatários"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Esquecer _senhas"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Pegar correio"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Esconder mensagens _selecionadas"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Esconder mensagens _excluídas"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Esconder mensagens _lidas"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtros de correio..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Gerenciar assinaturas..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Marcar como _lida"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marcar como _não lida"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Mover"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Mover a mensagem para uma nova pasta"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Visualiza a impressão da mensagem a ser impressa"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Visualizar impressão da mensagem..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprime a mensagem na impressora"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Imprimir mensagem..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Responder a _todos"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Responder ao _remetente"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_Fonte"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecionar _todos"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar mensagens na fila de saída e recuperar novas mensagens"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Exibir _todas as mensagens"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Lista de mensagens encadeadas"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Pasta virtual por _remetente"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "Pasta virtual por _destinatários"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Ver o código fonte da mensagem"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Aplicar filtros"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configurar pasta..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copiar para pasta..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Editar mensagem"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Excluir permanentemente"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtro por assunto"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Encaminhar"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter seleção"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Configuração de correio..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Mensagem"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Mover para pasta..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Abrir em uma nova janela"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Imprimir mensagem"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Salvar mensagem como..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Encadeado"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Des_fazer exclusão"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Pasta virtual por assunto"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de pastas _virtuais..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Anexar"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Cifrar esta mensagem com PGP"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Inserir um arquivo como texto na mensagem"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Inserir arquivo texto..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Abrir um arquivo"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Cifrar com PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Assinar com PGP"
-
-#: ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Salvar como"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salvar _rascunho"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salvar na _pasta... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Salvar na pasta..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Salvar o arquivo atual com um nome diferente"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Salvar a mensagem em uma pasta especificada"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Enviar"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Enviar mais _tarde"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Enviar mais _tarde"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Enviar as mensagens em formato HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Enviar a mensagem mais tarde"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensagem agora"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Enviar esta mensagem agora"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Exibir / esconder anexos"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Exibir _anexos"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Exibir anexos"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Assinar esta mensagem com a sua chave PGP"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir arquivo texto... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Abrir..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Segurança"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Adicionar pasta em sua lista de pastas assinadas"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Atualizar lista"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Atualizar lista de pastas"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Remover pasta de sua lista de pastas assinadas"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Assinar"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Cancelar a assinatura"
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Sobre o Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Personalizar..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de ferramentas"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Exibir uma pasta diferente"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "Sai_r"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atalhos do Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Sair"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Sair do programa"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Primeiros passos"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importar um formato de arquivo externo"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de tarefas principal"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Exibir informação sobre o Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Exibir a barra de _pastas"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Exibir a barra de _atalhos"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Enviar relatório de erro"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "Enviar relatório de _erro"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Enviar relatório de erro usando o Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Alternar a exibição da barra de pastas"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Alternar a exibição da barra de atalhos"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Usando o gerenciador de _contatos"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Usando a _agenda"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Usando o _correio"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_Sobre o Evolution"
-
-#: ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Compromisso (FIXME)"
-
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contato (FIXME)"
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Pasta"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Ir para pasta..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importar arquivo..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Indexar"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Mensagem de correio"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Configurações"
-
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (FIXME)"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Preliminar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora do escritório"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sem informação"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Convidar outros..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opções"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Exibir apenas _horas do expediente"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Exibir com _menos ampliação"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Atualizar livre/ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autoescolher"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Todas as pessoas e recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Todas as _pessoas e um recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Pessoas _necessárias"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Pessoas necessárias e _um recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de _início da reunião:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _término da reunião:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Todos os participantes"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "STQQSSD"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "_Buscar"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
-
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "Suíte do grupo Evolution"
diff --git a/po/ru.po b/po/ru.po
deleted file mode 100644
index bc47e3d921..0000000000
--- a/po/ru.po
+++ /dev/null
@@ -1,7931 +0,0 @@
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Valek Filippov <frob@df.ru>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-02-24 16:47+0300\n"
-"PO-Revision-Date: 2001-02-24 16:55+03:00\n"
-"Last-Translator: Valek Filippov <frob@df.ru>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "ëÁÒÔÏÞËÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"éÍÑ: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  ðÒÅÆÉËÓ:    "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  äÏÂÁ×ÏÞÎÙÊ: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  æÁÍÉÌÉÑ:    "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  óÕÆÆÉËÓ:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"äÁÔÁ ÒÏÖÄÅÎÉÑ: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"áÄÒÅÓ:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"ðÏÞÔÏ×ÙÊ ÑÝÉË:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  òÁÓÛ.:        "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  õÌÉÃÁ:     "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  çÏÒÏÄ:      "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  ïÂÌÁÓÔØ:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ðÏÞÔÏ×ÙÊ ËÏÄ: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  óÔÒÁÎÁ:     "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr "\níÅÔËÁ ÄÌÑ ÄÏÓÔÁ×ËÉ:"
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"ôÅÌÅÆÏÎÙ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"ôÅÌÅÆÏÎ:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"üÌ.ÁÄÒÅÓ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"üÌ.ÁÄÒÅÓ:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"ðÏÞÔÏ×ÙÊ ËÌÉÅÎÔ: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"þÁÓÏ×ÏÊ ÐÏÑÓ: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"çÅÏÇÒ.ÐÏÌÏÖÅÎÉÅ: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"äÏÌÖÎÏÓÔØ: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"ïÒÇ.:"
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  éÍÑ:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr "\nåÄÉÎÉÃÁ:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr "\nåÄÉÎÉÃÁ2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr "\nåÄÉÎÉÃÁ3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr "\nåÄÉÎÉÃÁ4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr "\nëÁÔÅÇÏÒÉÉ: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"ëÏÍÍÅÎÔÁÒÉÉ: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"õÎÉËÁÌØÎÁÑ ÓÔÒÏËÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"ðÕÂÌÉÞÎÙÊ ËÌÀÞ: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "éÍÐÏÒÔÉÒÕÅÔ ÆÁÊÌÙ GnomeCard × Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "ïÔËÌÀÞÅÎÏ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "óÉÎÈÒÏÎÉÚÏ×ÁÔØ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ÉÚ ðÉÌÏÔÁ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "óËÏÐÉÒÏ×ÁÔØ × ðÉÌÏÔ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "ïÂßÅÄÉÎÉÔØ ÉÚ ðÉÌÏÔÁ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "ïÂßÅÄÉÎÉÔØ × ðÉÌÏÔÅ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "ðÅÒ×ÏÎÁÞÁÌØÎÙÊ Á×ÔÏÒ:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "ëÏÎÄÕÉÔ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation É Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "óÒÅÄÓÔ×Ï ÎÁÓÔÒÏÊËÉ ÄÌÑ ËÏÎÄÕÉÔÁ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "óÉÎÈÒÏÎÉÚÏ×ÁÔØ ÄÅÊÓÔ×ÉÑ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "óÏÓÔÏÑÎÉÅ ËÏÎÄÕÉÔÁ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"ðÉÌÏÔ ÎÅ ÎÁÓÔÒÏÅÎ, ÐÏÖÁÌÕÊÓÔÁ ×ÙÂÅÒÉÔÅ\n"
-"ÓÎÁÞÁÌÁ capplet \"ó×ÏÊÓÔ×Á Ó×ÑÚÉ Ó ðÉÌÏÔÏÍ\"."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "îÅ ÐÏÄËÌÀÞÅÎ Ë ÄÅÍÏÎÕ gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"ðÒÉ ÐÏÐÙÔËÅ ÐÏÌÕÞÉÔØ ÓÐÉÓÏË ðÉÌÏÔÏ×\n"
-"ÏÔ ÄÅÍÏÎÁ gnome-pilot ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "ëÕÒÓÏÒ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎ\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook ÎÅ ÚÁÇÒÕÖÅÎÁ\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ ÓÅÒ×ÅÒ wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÂÌÏË ÐÒÉÌÏÖÅÎÉÑ ÁÄÒÅÓÏ× ðÉÌÏÔÁ"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "îÁÓÔÒÏÉÔØ ËÏÎÄÕÉÔ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "ëÏÎÄÕÉÔ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "äÏÂÁ×ÉÔØ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "çÏÄÏ×ÝÉÎÁ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "òÁÂÏÞÉÊ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "òÁÂÏÞÉÊ ÆÁËÓ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "ëÏÎÔÁËÔÙ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "ëÁÔÅÇÏÒÉÉ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "òÅÄÁËÔÏÒ ËÏÎÔÁËÔÏ×"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "äÅÔÁÌÉ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "æÁÊÌ ËÁË:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "ïÂÝÅÅ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "îÏ×ÙÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "úÁÍÅÔËÉ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "ôÉÐ ÔÅÌÅÆÏÎÁ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "ðÅÒ×ÙÊ ÜÌ.ÁÄÒÅÓ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "èÏÞÅÔ ÐÏÌÕÞÁÔØ ÐÏÞÔÕ × HTML"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "áÄÒÅÓ web-ÓÔÒÁÎÉÃÙ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "äÏÂÁ×ÉÔØ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "áÄÒÅÓ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "éÍÑ ÐÏÍÏÝÎÉËÁ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "äÅÎØ ÒÏÖÄÅÎÉÑ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "òÁÂÏÞÉÊ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "ëÏÍÐÁÎÉÑ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "õÄÁÌÉÔØ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "ïÔÄÅÌ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "ðÏÌÎÏÅ ÉÍÑ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "äÏÍÁÛÎÉÊ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "äÏÌÖÎÏÓÔØ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "éÍÑ ÍÅÎÅÄÖÅÒÁ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "íÏÂÉÌØÎÙÊ"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "ðÓÅ×ÄÏÎÉÍ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "ïÆÉÓ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "ðÒÏÆÅÓÓÉÑ:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "óÕÐÒÕÇ(Á):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "üÔÏ ÐÏÞÔÏ×ÙÊ ÁÄÒÅÓ"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "õÄÁÌÉÔØ ËÏÎÔÁËÔ?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "üÔÏÔ ËÏÎÔÁËÔ ÐÒÉÎÁÄÌÅÖÉÔ ÓÌÅÄÕÀÝÉÍ ËÁÔÅÇÏÒÉÑÍ:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "ðÏÍÏÝÎÉË"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "òÁÂÏÞÉÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "òÁÂÏÞÉÊ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "òÁÂÏÞÉÊ ÆÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "ïÂÒÁÔÎÙÊ ÏÔÚ×ÏÎ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "íÁÛÉÎÁ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "ëÏÍÐÁÎÉÑ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "äÏÍÁÛÎÉÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "äÏÍÁÛÎÉÊ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "äÏÍÁÛÎÉÊ æÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "íÏÂÉÌØÎÙÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
-msgid "Other"
-msgstr "äÒÕÇÏÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "äÒÕÇÏÊ ÆÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "ðÜÊÄÖÅÒ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "ðÅÒ×ÙÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "òÁÄÉÏ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "ôÅÌÅËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "üÌ.ÁÄÒÅÓ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "üÌ.ÁÄÒÅÓ 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "áÄÒÅÓ 2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "ðÒÏ×ÅÒÉÔØ ÁÄÒÅÓ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "óÔÒÁÎÁ:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "æÉÎÌÑÎÄÉÑ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "óûá"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "áÄÒÅÓ:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "çÏÒÏÄ:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "áÂ.ÑÝÉË:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "ïÂÌÁÓÔØ/òÁÊÏÎ (ûÔÁÔ/ðÒÏ×ÉÎÃÉÑ):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "ðÏÞÔÏ×ÙÊ ÉÎÄÅËÓ:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "ðÒÏ×ÅÒÉÔØ ÐÏÌÎÏÅ ÉÍÑ"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "äÒ."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "üÓË×."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "ÍÌ."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "íÉÓÓ"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "éÍÑ:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "æÁÍÉÌÉÑ:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "ïÔÞÅÓÔ×Ï:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "óÕÆÆÉËÓ:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "úÁÇÏÌÏ×ÏË:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "ëÁË ÍÉÎÉËÁÒÔÏÞËÉ"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "ëÁË ÔÁÂÌÉÃÁ"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ ÄÌÑ %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÁÄÒÅÓÎÕÀ ËÎÉÇÕ"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÜÔÕ ÁÄÒÅÓÎÕÀ ËÎÉÇÕ. üÔÏ ÚÎÁÞÉÔ,\n"
-"ÞÔÏ ÌÉÂÏ ×Ù ××ÅÌÉ ÎÅËÏÒÒÅËÔÎÙÊ URI, ÌÉÂÏ ÐÙÔÁÌÉÓØ\n"
-"ÏÂÒÁÔÉÔØÓÑ Ë LDAP ÓÅÒ×ÅÒÕ É ÎÅ ÉÍÅÅÔÅ ×ÓÔÒÏÅÎÎÏÊ\n"
-"ÐÏÄÄÅÒÖËÉ LDAP. åÓÌÉ ×Ù ××ÏÄÉÌÉ URI, ÐÒÏ×ÅÒØÔÅ ÅÇÏ\n"
-"ÐÒÁ×ÉÌØÎÏÓÔØ É ÐÅÒÅ××ÅÄÉÔÅ. åÓÌÉ ÎÅÔ, ×Ù ×ÏÚÍÏÖÎÏ\n"
-"ÐÙÔÁÌÉÓØ ÏÂÒÁÔÉÔØÓÑ Ë LDAP ÓÅÒ×ÅÒÕ. åÓÌÉ ×Ù ÈÏÔÉÔÅ\n"
-"ÉÓÐÏÌØÚÏ×ÁÔØ LDAP, ×ÁÍ ÎÁÄÏ ÓËÁÞÁÔØ É ÕÓÔÁÎÏ×ÉÔØ \n"
-"OpenLDAP É ÐÅÒÅËÏÍÐÉÌÉÒÏ×ÁÔØ É ÕÓÔÁÎÏ×ÉÔØ evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "ðÏËÁÚÁÔØ ×ÓÅ"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "òÁÓÛÉÒÅÎÎÙÅ..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "ìÀÂÏÅ ÐÏÌÅ ÓÏÄÅÒÖÉÔ"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "éÍÑ ÓÏÄÅÒÖÉÔ"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "üÌ.ÁÄÒÅÓ ÓÏÄÅÒÖÉÔ"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ËÏÔÏÒÙÊ ÂÕÄÅÔ ÐÏËÁÚÙ×ÁÔØ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ ÐÁÐÏË"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "äÒÕÇÉÅ ËÏÎÔÁËÔÙ"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "óÅÒ×ÅÒ LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "æÁÊÌ"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "îÅÔ (ÁÎÏÎÉÍÎÙÊ ÒÅÖÉÍ)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "ðÁÒÏÌØ"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÔÉÐ Á×ÔÏÒÉÚÁÃÉÉ"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "ïÓÎÏ×Á"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "ïÄÉÎ"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "ðÏÄÄÅÒÅ×Ï"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÏÂÌÁÓÔÉ ÄÅÊÓÔ×ÉÑ"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "úÁÐÏÍÎÉÔØ ÜÔÏÔ ÐÁÒÏÌØ"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "èÏÓÔ:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "ðÏÒÔ:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "ðÏÉÓË ÏÂÌÁÓÔÉ ÄÅÊÓÔ×ÉÑ:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "éÄÅÎÔÉÆÉËÁÃÉÑ:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
-msgid "Path:"
-msgstr "ðÕÔØ:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "óÏÚÄÁÔØ ÐÕÔØ, ÅÓÌÉ ÏÎ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "ðÒÁ×ËÁ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "äÏÂÁ×ÉÔØ ÁÄÒÅÓÎÕÀ ËÎÉÇÕ"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"÷ÙÂÅÒÉÔÅ ×ÉÄ ×ÁÛÅÊ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ É ××ÅÄÉÔÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÅÊ."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "éÍÑ:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "ïÐÉÓÁÎÉÅ:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "éÓÔÏÞÎÉËÉ ÁÄÒÅÓÎÙÈ ËÎÉÇ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:696
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "õÄÁÌÉÔØ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:682 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "ðÒÁ×ËÁ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "éÍÑ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "þÔÏ ÐÏËÁÚÙ×ÁÔØ × ÍÉÎÉËÁÒÔÏÞËÁÈ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "ðÒÏÓÍÏÔÒÝÉË ÍÉÎÉËÁÒÔÏÞÅË ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "ëÏÍÐÏÎÅÎÔ Evolution ÄÌÑ ÏÂÒÁÂÏÔËÉ ËÏÎÔÁËÔÏ×."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "óÒÅÄÓÔ×Ï ÎÁÓÔÒÏÊËÉ ÄÌÑ ËÏÎÄÕÉÔÁ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "ýÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "éÎÔÅÒÆÅÊÓ ×ÙÂÏÒÁ ÉÍÅÎÉ × ÁÄÒÅÓÎÏÊ ËÎÉÇÅ Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "îÁÊÔÉ..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "ðÏÌÕÞÁÔÅÌÉ ÓÏÏÂÝÅÎÉÑ"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "÷ÙÂÒÁÔØ ÉÍÅÎÁ"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "÷ÙÂÒÁÔØ ÉÍÅÎÁ ÉÚ:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "ðÏÉÓË"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "óÏÈÒÁÎÉÔØ ËÁË VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* ýÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ËÏÎÔÁËÔÁ *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "üÌ.ÁÄÒÅÓ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "ïÒÇÁÎÉÚÁÃÉÑ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "óÁÊÔ × éÎÔÅÒÎÅÔ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "ïÔÄÅÌ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "ïÆÉÓ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "úÁÇÏÌÏ×ÏË"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "ðÒÏÆÅÓÓÉÑ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "õÐÒÁ×ÌÑÀÝÉÊ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "ðÓÅ×ÄÏÎÉÍ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "óÕÐÒÕÇ(Á)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "úÁÍÅÔËÁ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "ýÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ËÏÎÔÁËÔÁ"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "óÏÈÒÁÎÉÔØ × ÁÄÒÅÓÎÏÊ ËÎÉÇÅ"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"îÅÔ ÜÌÅÍÅÎÔÏ× ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ × ÜÔÏÍ ÏËÎÅ\n"
-"\n"
-"ä×ÁÖÄÙ ÝÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÓÏÚÄÁÎÉÑ ÎÏ×ÏÇÏ ËÏÎÔÁËÔÁ."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "ðÕÓÔÁÑ ÆÏÒÍÁ × ËÏÎÃÅ:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "ôÅÌÏ"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "óÎÉÚÕ:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "òÁÚÍÅÒÙ:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "ûÒÉÆÔ..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "ûÒÉÆÔÙ..."
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "óÎÏÓËÁ:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "æÏÒÍÁÔ"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "úÁÇÏÌÏ×ÏË"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "úÁÇÏÌÏ×ÏË/óÎÏÓËÁ"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "úÁÇÏÌÏ×ËÉ"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "úÁÇÏÌÏ×ËÉ ÄÌÑ ËÁÖÄÏÊ ÂÕË×Ù"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "÷ÙÓÏÔÁ:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "ïÄÉÎ ÚÁ ÄÒÕÇÉÍ"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "÷ËÌÀÞÉÔØ:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "âÌÏËÎÏÔ"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "óÌÅ×Á:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "úÁËÌÁÄËÉ ÂÕË× ÓÂÏËÕ"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "ðÏÌÑ"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "þÉÓÌÏ ÓÔÏÌÂÃÏ×:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "ðÁÒÁÍÅÔÒÙ"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "ïÒÉÅÎÔÁÃÉÑ"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "óÔÒÁÎÉÃÁ"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "îÁÓÔÒÏÊËÁ ÓÔÒÁÎÉÃÙ:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "âÕÍÁÇÁ"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "éÓÔÏÞÎÉË ÂÕÍÁÇÉ:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "ðÏÒÔÒÅÔ"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "ðÒÏÓÍÏÔÒ:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ðÅÞÁÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÏÌÕÔÏÎÏ×"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "ïÂÒÁÝÁÔØ ÎÁ ÞÅÔÎÙÈ ÓÔÒÁÎÉÃÁÈ"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "óÐÒÁ×Á:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "òÁÚÄÅÌÙ:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "ðÏÌÕÔÏÎÁ"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "òÁÚÍÅÒ:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "îÁÞÉÎÁÔØ Ó ÎÏ×ÏÊ ÓÔÒÁÎÉÃÙ"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "îÁÚ×ÁÎÉÅ ÓÔÉÌÑ:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "ó×ÅÒÈÕ:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
-msgid "Type:"
-msgstr "ôÉÐ:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "ûÉÒÉÎÁ:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "ÍÅÔËÁ26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "ëÏÎÄÕÉÔ ËÁÌÅÎÄÁÒÑ Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "óÒÅÄÓÔ×Ï ÎÁÓÔÒÏÊËÉ ÄÌÑ ËÏÎÄÕÉÔÁ ËÁÌÅÎÄÁÒÑ Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÐÏÄËÌÀÞÅÎÉÉ Ë ÓÅÒ×ÅÒÕ ËÁÌÅÎÄÁÒÑ"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÂÌÏË ÐÒÉÌÏÖÅÎÉÑ ËÁÌÅÎÄÁÒØ ðÉÌÏÔÁ"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "îÁÓÔÒÏÊËÁ ËÏÎÄÕÉÔÁ GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "ëÏÎÄÕÉÔ ËÁÌÅÎÄÁÒÑ Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "îÁÓÔÒÏÉÔØ ËÏÎÄÕÉÔ ÚÁÄÁÎÉÊ"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "ëÏÎÄÕÉÔ ÚÁÄÁÎÉÊ Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "ëÏÎÄÕÉÔ ÚÁÄÁÎÉÊ Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "óÒÅÄÓÔ×Ï ÎÁÓÔÒÏÊËÉ ÄÌÑ ËÏÎÄÕÉÔÁ ÚÁÄÁÎÉÊ Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÂÌÏË ÐÒÉÌÏÖÅÎÉÑ ÚÁÄÁÎÉÊ ðÉÌÏÔÁ"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "îÁÐÏÍÉÎÁÔØ ÏÂÏ ×ÓÅÈ ×ÓÔÒÅÞÁÈ"
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "ëÏÒÏÔËÉÊ ÓÏÎ"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "ïÔËÒÙÔØ ËÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "óÏÈÒÁÎÉÔØ ËÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÏËÎÏ ËÁÌÅÎÄÁÒÑ. ðÏÖÁÌÕÊÓÔÁ ÐÒÏ×ÅÒØÔÅ ×ÁÛÕ ÕÓÔÁÎÏ×ËÕ ORBit "
-"É OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "ïÂÝÅÅ"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "ìÉÞÎÏÅ"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "ëÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "îÅÉÚ×ÅÓÔÎÏÅ"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "ó"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "à"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "÷"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "ú"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "ðÒÏÚÒÁÞÎÙÊ"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "îÅÐÒÏÚÒÁÞÎÙÊ"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"äÁÔÁ ÄÏÌÖÎÁ ÂÙÔØ ××ÅÄÅÎÁ × ÆÏÒÍÁÔÅ:\n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"çÅÏÇÒÁÆÉÞÅÓËÏÅ ÐÏÌÏÖÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ××ÅÄÅÎÏ × ÆÏÒÍÁÔÅ:\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "úÎÁÞÅÎÉÅ ÐÒÏÃÅÎÔÁ ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 0 É 100, ×ËÌÀÞÉÔÅÌØÎÏ"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "ðÒÉÏÒÉÔÅÔ ÄÏÌÖÅÎ ÂÙÔØ ÍÅÖÄÕ 1 É 9, ×ËÌÀÞÉÔÅÌØÎÏ"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "îÏÒÍÁÌØÎÙÊ"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "ðÏ×ÔÏÒÅÎÉÅ"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "ó×ÑÚÁÎÎÏÅ"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "äÁ"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "îÅÔ"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ËÁÌÅÎÄÁÒÑ</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>ïÛÉÂËÁ ÚÁÇÒÕÚËÉ ËÁÌÅÎÄÁÒÑ:<br>íÅÔÏÄ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "ïÔÏÂÒÁÚÉÔØ"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "ðÏËÁÚÁÔØ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "ðÏËÁÚÁÔØ ÚÁÄÁÎÉÑ"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "úÁÇÒÕÚËÁ ËÁÌÅÎÄÁÒÑ"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ËÏÔÏÒÙÊ ÂÕÄÅÔ ÐÏËÁÚÙ×ÁÔØ ËÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "ôÁÊÍÅÒ ÎÁ %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "õ×ÅÄÏÍÌÅÎÉÅ Ï ×ÁÛÅÊ ×ÓÔÒÅÞÅ × %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "éÔÏÇ ÎÅ ÄÏÓÔÕÐÅÎ."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "úÁËÒÙÔØ"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "ðÒÁ×ËÁ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "÷ÒÅÍÑ ÄÒÅÍÁÎÉÑ (ÍÉÎÕÔ)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 ÍÉÎÕÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 ÍÉÎÕÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12-ÞÁÓÏ×ÏÊ (äð/ðð)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 ÍÉÎÕÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24-ÞÁÓÏ×ÏÊ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 ÍÉÎÕÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 ÍÉÎÕÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "úÁÄÅÒÖËÁ ÔÁÊÍÅÒÁ ÎÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "áÕÄÉÏ ôÁÊÍÅÒÙ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "çÕÄÏË ÐÒÉ ×ÏÚÎÉËÎÏ×ÅÎÉÉ ÏËÎÁ ÔÁÊÍÅÒÁ."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "ëÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "îÁÓÔÒÏÊËÉ ËÁÌÅÎÄÁÒÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "ã×ÅÔÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "óÖÁÔØ ×ÙÈÏÄÎÙÅ ÄÎÉ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "ðÁÒÁÍÅÔÒÙ ÎÁ×ÉÇÁÔÏÒÁ ÄÁÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "éÓÈ.ÚÎÁÞÅÎÉÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "ïÔÏÂÒÁÚÉÔØ ÐÁÒÁÍÅÔÒÙ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "õÓÌÏ×ÌÅÎÎÁÑ ÄÁÔÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "òÁÚÒÅÛÉÔØ ËÒÁÔËÉÊ ÓÏÎ ÄÌÑ "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "ëÏÎÅà ÄÎÑ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "ðÅÒ×ÙÊ ÄÅÎØ ÎÅÄÅÌÉ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "ðÑÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "ðÑÔÎÉÃÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "ðÏÄÓ×ÅÞÅÎÎÙÅ ÄÎÉ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "úÁÄÁÎÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÇÏÄÎÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "úÁÄÁÎÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÇÏÄÎÑ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "åÝÅ ÎÅ ÐÒÏÓÒÏÞÅÎÎÙÅ ÚÁÄÁÎÉÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "åÝÅ ÎÅ ÐÒÏÓÒÏÞÅÎÎÙÅ ÚÁÄÁÎÉÑ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "ðÏÎ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "ðÏÎÅÄÅÌØÎÉË"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "ðÒÏÓÒÏÞÅÎÎÙÅ ÚÁÄÁÎÉÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "ðÒÏÓÒÏÞÅÎÎÙÅ ÚÁÄÁÎÉÑ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "÷ÙÂÒÁÔØ Ã×ÅÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
-msgid "Priority"
-msgstr "ðÒÉÏÒÉÔÅÔ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "îÁÐÏÍÉÎÁÔØ ÏÂÏ ×ÓÅÈ ×ÓÔÒÅÞÁÈ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "îÁÐÏÍÉÎÁÎÉÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "óÕÂ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "óÕÂÂÏÔÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "ðÏËÁÚÁÔØ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "ðÏËÁÚÁÔØ ×ÒÅÍÑ ÏËÏÎÞÁÎÉÉ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "ðÏËÁÚÁÔØ ÎÏÍÅÒÁ ÎÅÄÅÌØ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "îÁÞÁÌÏ ÄÎÑ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "÷ÓË"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "÷ÏÓËÒÅÓÅÎØÅ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "ðÁÎÅÌØ ÚÁÄÁÎÉÊ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "þÔ×"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "þÅÔ×ÅÒÇ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "÷ÒÅÍÑ ÄÏ ÕÓÌÏ×ÌÅÎÎÏÇÏ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "òÁÚÄÅÌÉÔÅÌÉ ×ÒÅÍÅÎÉ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "æÏÒÍÁÔ ×ÒÅÍÅÎÉ:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "÷ÔÒ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "÷ÔÏÒÎÉË"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "÷ÉÄÉÍÙÅ ÔÁÊÍÅÒÙ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "óÒÄ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "óÒÅÄÁ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "òÁÂÏÞÁÑ ÎÅÄÅÌÑ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "ÍÉÎÕÔ ÄÏ ÎÁÚÎÁÞÅÎÎÏÇÏ ×ÒÅÍÅÎÉ."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
-msgid "seconds."
-msgstr "ÓÅËÕÎÄ."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ×Ù ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÓÔÒÅÞÕ \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÕ ÎÅÏÚÁÇÌÁ×ÌÅÎÎÕÀ ×ÓÔÒÅÞÕ?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ×Ù ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÚÁÄÁÎÉÅ \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏ ÎÅÏÚÁÇÌÁ×ÌÅÎÎÏÅ ÚÁÄÁÎÉÅ?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ×Ù ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÖÕÒÎÁÌØÎÕÀ ÚÁÐÉÓØ \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÕ ÎÅÏÚÁÇÌÁ×ÌÅÎÎÕÀ ÖÕÒÎÁÌØÎÕÀ ÚÁÐÉÓØ?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "èÏÔÉÔÅ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ÷ÙÐÏÌÎÅÎÉÑ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "ïÔÍÅÎÅÎÏ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "ëÌÁÓÓÉÆÉËÁÃÉÑ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "÷ÙÐÏÌÎÅÎÏ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "äÁÔÁ É ×ÒÅÍÑ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "äÁÔÁ ×ÙÐÏÌÎÅÎÉÑ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "÷ÙÓÏËÉÊ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "÷ ÐÒÏÃÅÓÓÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "îÉÚËÉÊ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "îÅ ÎÁÞÁÔÏ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "ìÉÞÎÏÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "ðÒÏÄ×ÉÖÅÎÉÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "ïÂÝÅÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "äÁÔÁ ÎÁÞÁÌÁ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "éÔÏÇ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "úÁÄÁÎÉÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "îÅÏÐÒÅÄÅÌÅÎÎÏÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "ëÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "ëÏÎÔÁËÔÙ..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "õÓÌÏ×ÌÅÎÎÁÑ ÄÁÔÁ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "ðÒÉÏÒÉÔÅÔ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "óÏÓÔÏÑÎÉÅ:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "ðÒÁ×ËÁ ÚÁÄÁÎÉÑ"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "îÅÔ ÉÔÏÇÁ"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "÷ÓÔÒÅÞÁ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "úÁÄÁÎÉÅ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "öÕÒÎÁÌØÎÁÑ ÚÁÐÉÓØ - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "ëÁÔÅÇÏÒÉÉ"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "äÁÔÁ ×ÙÐÏÌÎÅÎÅÎÉÑ"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "äÁÔÁ ÏËÏÎÞÁÎÉÑ"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "äÁÔÁ ÎÁÞÁÌÁ"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "çÅÏÇÒÁÆÉÞÅÓËÏÅ ÒÁÓÐÏÌÏÖÅÎÉÅ"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "ðÒÏÃÅÎÔ ×ÙÐÏÌÎÅÎÎÏÇÏ"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "éÔÏÇ"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "ðÒÏÚÒÁÞÎÏÓÔØ"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "áÕÄÉÏ ôÁÊÍÅÒÙ"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "ýÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÚÁÄÁÞÉ"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ×ÙÐÏÌÎÅÎÎÏÅ"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "ðÏÍÅÔÉÔØ ÚÁÄÁÎÉÅ ËÁË ×ÙÐÏÌÎÅÎÎÏÅ"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "ðÒÁ×ËÁ ÜÔÏÇÏ ÚÁÄÁÎÉÑ..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "ðÒÁ×ËÁ ÚÁÄÁÎÉÑ"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "õÄÁÌÉÔØ ÜÔÏ ÚÁÄÁÎÉÅ"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "õÄÁÌÉÔØ ÚÁÄÁÎÉÅ"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "Ä.Ð."
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "Ð.Ð."
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "îÏ×ÁÑ ×ÓÔÒÅÞÁ..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "÷ÓÔÁ×ÉÔØ ×ÓÔÒÅÞÕ × ÒÁÓÐÉÓÁÎÉÅ"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "ðÒÁ×ËÁ ÜÔÏÊ ×ÓÔÒÅÞÉ..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "õÄÁÌÉÔØ ÜÔÕ ×ÓÔÒÅÞÕ"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "óÄÅÌÁÔØ ÜÔÕ ×ÓÔÒÅÞÕ ÐÅÒÅÍÅÝÁÅÍÏÊ"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "õÄÁÌÉÔØ ÜÔÏÔ ÓÌÕÞÁÊ"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "õÄÁÌÉÔØ ×ÓÅ ÓÌÕÞÁÉ"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÂÎÏ×ÉÔØ ×ÁÛ ÆÁÊÌ ËÁÌÅÎÄÁÒÑ!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "ëÏÍÐÏÎÅÎÔ ÕÓÐÅÛÎÏ ÏÂÎÏ×ÌÅÎ."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "ðÒÉ ÚÁÇÒÕÚËÅ ÆÁÊÌÁ ËÁÌÅÎÄÁÒÑ ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÁÛ ÆÁÊÌ ËÁÌÅÎÄÁÒÑ!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÇÒÕÚÉÔØ ×ÁÛ ÆÁÊÌ ËÁÌÅÎÄÁÒÑ!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÒÏÞÅÓÔØ ×ÁÛ ÆÁÊÌ ËÁÌÅÎÄÁÒÑ!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "üÔÏ ÏÔ×ÅÔ ÏÔ ËÏÇÏ-ÔÏ ËÔÏ ÎÅ ÂÙÌ ÐÒÉÇÌÁÛÅÎ!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÂÎÏ×ÉÔØ ÈÒÁÎÉÌÉÝÅ ×ÁÛÅÇÏ ËÁÌÅÎÄÁÒÑ."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÄÁÌÉÔØ ËÏÍÐÏÎÅÎÔ ËÁÌÅÎÄÁÒÑ!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "ëÏÍÐÏÎÅÎÔ ÕÓÐÅÛÎÏ ÕÄÁÌÅÎ."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "îÅ ÒÁÓÐÏÚÎÁÎ ÜÔÏÔ ÔÉÐ ËÏÍÐÏÎÅÎÔÁ ËÁÌÅÎÄÁÒÑ."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "äÏÂÁ×ÉÔØ Ë ËÁÌÅÎÄÁÒÀ"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "ðÒÉÎÑÔØ"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "ïÔËÌÏÎÉÔØ"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "üËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "ïÂÎÏ×ÉÔØ ËÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "ïÔÍÅÎÉÔØ ×ÓÔÒÅÞÕ"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr ""
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "óÏÏÂÝÅÎÉÅ ËÁÌÅÎÄÁÒÑ"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "äÁÔÁ:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "úÁÇÒÕÚËÁ ËÁÌÅÎÄÁÒÑ..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "ïÒÇÁÎÉÚÁÔÏÒ:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
-msgid "Sender"
-msgstr "ïÔÐÒÁ×ÉÔÅÌØ"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "éÔÏÇ:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "ÄÁÔÁ-ÚÁ×ÅÒÛÅÎÉÑ"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "ÄÁÔÁ-ÎÁÞÁÌÁ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "óÏÐÒÏ×ÏÖÄÅÎÉÅ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "áÄÒÅÓ ÓÏÐÒÏ×ÏÖÄÅÎÉÑ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "óÏÐÒÏ×ÏÖÄÅÎÉÅ:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"ïÔÍÅÎÉÔØ\n"
-"×ÓÔÒÅÞÕ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "ðÒÅÄÓÅÄÁÔÅÌØ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "ðÒÉÇÌÁÛÅÎÉÅ ÎÁ ×ÓÔÒÅÞÕ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÙÅ ÕÞÁÓÔÎÉËÉ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "ïÒÇÁÎÉÚÁÔÏÒ:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"úÁÐÒÏÓÉÔØ\n"
-"×ÓÔÒÅÞÕ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "ôÒÅÂÕÅÍÙÅ ÕÞÁÓÔÎÉËÉ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "òÏÌØ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"÷ÓÔÁ×ÉÔØ ×ÓÔÒÅÞÕ\n"
-"× ÒÁÓÐÉÓÁÎÉÅ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
-msgid "Status"
-msgstr "óÏÓÔÏÑÎÉÅ"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "÷ÓÅ"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "ëÁÔÅÇÏÒÉÉ:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÚÁÄÁÎÉÅ × \"%s\""
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "íÅÔÏÄ ÎÅÏÂÈÏÄÉÍÙÊ ÄÌÑ ÚÁÇÒÕÚËÉ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "÷ÓÅ ÓÏÂÙÔÉÑ ÄÎÑ"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "÷ÓÔÒÅÞÁ"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "ïÓÎÏ×ÁÎÉÑ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "äÒÕÇÏÅ ÐÏ×ÔÏÒÅÎÉÅ"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "ëÁÖÄÙÊ"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "éÓËÌÀÞÅÎÉÑ"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "éÚÍÅÎÉÔØ"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "âÅÚ ÐÏ×ÔÏÒÅÎÉÑ"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ Ú×ÕË"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "ðÒÏÓÍÏÔÒ"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "ðÏ×ÔÏÒÅÎÉÅ"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "ðÒÁ×ÉÌÏ ÐÏ×ÔÏÒÅÎÉÑ"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "îÁÐÏÍÉÎÁÎÉÅ"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "úÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÕ"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÞÔÕ"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "õÓÔÁÎÏ×ËÉ..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "ðÏËÁÚÁÔØ ÄÉÁÌÏÇ"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "ðÒÏÓÔÏÅ ÐÏ×ÔÏÒÅÎÉÅ"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "÷ÒÅÍÑ ÏËÏÎÞÁÎÉÑ:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "÷ÒÅÍÑ ÎÁÞÁÌÁ:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "äÁÔÁ ÎÁÞÁÌÁ:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
-msgid "after"
-msgstr "ÐÏÓÌÅ"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
-msgid "before"
-msgstr "ÄÏ"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "ÄÅÎØ"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "ÚÁ×ÅÒÛÅÎÉÅ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "×"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "×ÓÅÇÄÁ"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "ÞÁÓÙ"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "ÍÅÔËÁ26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "ÍÅÔËÁ26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "ÍÉÎÕÔÙ"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "ÍÅÓÑÃÙ"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "ÎÁÞÁÌÏ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "ÄÏ"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "ÎÅÄÅÌÑ"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "ÇÏÄ"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "ðÒÁ×ËÁ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "×"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "ÄÅÎØ"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr "ÙÊ"
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "ÓÌÕÞÁÉ"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"üÔÁ ×ÓÔÒÅÞÁ ÉÍÅÅÔ ÐÒÁ×ÉÌÁ ÐÏ×ÔÏÒÅÎÉÑ, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÔÒÅÄÁËÔÉÒÏ×ÁÎÙ "
-"× Evolution."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr "%d ÄÎÅÊ"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 ÄÅÎØ"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d ÎÅÄÅÌØ"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 ÎÅÄÅÌÑ"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d ÞÁÓÏ×"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 ÞÁÓ"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d ÍÉÎÕÔ"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 ÍÉÎÕÔÁ"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d ÓÅËÕÎÄ"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 ÓÅËÕÎÄÁ"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " ÄÏ ÎÁÞÁÌÁ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " ÐÏÓÌÅ ÎÁÞÁÌÁ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " ÐÅÒÅÄ ÏËÏÎÞÁÎÉÅÍ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " ÐÏÓÌÅ ÏËÏÎÞÁÎÉÑ ×ÓÔÒÅÞÉ"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "ëÏÍÐÏÎÅÎÔ Executive Summary ÐÒÏÇÒÁÍÍÙ Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "ðÒÏÓÍÏÔÒÝÉË iTip/iMip ËÁÌÅÎÄÁÒÑ Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "ëÏÍÐÏÎÅÎÔ Evolution ÄÌÑ ÏÂÒÁÂÏÔËÉ ËÁÌÅÎÄÁÒÑ."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "óÒÅÄÓÔ×Ï ÎÁÓÔÒÏÊËÉ ÄÌÑ ËÏÎÄÕÉÔÁ ËÁÌÅÎÄÁÒÑ Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁÐËÕ \"%s\""
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "íÅÔÏÄ ÎÅÏÂÈÏÄÉÍÙÊ ÄÌÑ ÏÔËÒÙÔÉÑ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "áÐÒÅÌØ"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "á×ÇÕÓÔ"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "äÅËÁÂÒØ"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "æÅ×ÒÁÌØ"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "ðÅÒÅÊÔÉ Ë ÄÁÔÅ"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "óÅÇÏÄÎÑ"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "ñÎ×ÁÒØ"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "éÀÌØ"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "éÀÎØ"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "íÁÒÔ"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "íÁÊ"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "îÏÑÂÒØ"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "ïËÔÑÂÒØ"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "óÅÎÔÑÂÒØ"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1-ÙÊ"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2-ÏÊ"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3-ÉÊ"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4-ÙÊ"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5-ÙÊ"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6-ÏÊ"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7-ÏÊ"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8-ÏÊ"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9-ÙÊ"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10-ÙÊ"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11-ÙÊ"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12-ÙÊ"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13-ÙÊ"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14-ÙÊ"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15-ÙÊ"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16-ÙÊ"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17-ÙÊ"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18-ÙÊ"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19-ÙÊ"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20-ÙÊ"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21-ÙÊ"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22-ÏÊ"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23-ÉÊ"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24-ÙÊ"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25-ÙÊ"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26-ÏÊ"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27-ÏÊ"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28-ÏÊ"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29-ÙÊ"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30-ÙÊ"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31-ÙÊ"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "÷Ó"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "ðÎ"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "÷Ô"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "óÒ"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "þÔ"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "ðÔ"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "CÂ"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "úÁÄÁÎÉÑ"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "ôÅËÕÝÉÊ ÄÅÎØ (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "ôÅËÕÝÁÑ ÎÅÄÅÌÑ (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "ôÅËÕÝÉÊ ÍÅÓÑÃ (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "ôÅËÕÝÉÊ ÇÏÄ (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "îÁÐÅÞÁÔÁÔØ ËÁÌÅÎÄÁÒØ"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "ðÒÏÓÍÏÔÒ ÐÅÞÁÔÉ"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URI, ËÏÔÏÒÙÊ ÂÕÄÅÔ ÐÏËÁÚÁÎ × ÐÁÐËÅ ÚÁÄÁÎÉÊ "
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "ð÷óþðó÷"
-
-#: camel/camel-filter-driver.c:790
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "ïÛÉÂËÁ ÁÎÁÌÉÚÁ ÆÉÌØÔÒÁ: %s: %s"
-
-#: camel/camel-filter-driver.c:795
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÆÉÌØÔÒÁ: %s: %s"
-
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÐÏÉÓËÁ ÆÉÌØÔÒÁ: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ×ÙÒÁÖÅÎÉÑ ÐÏÉÓËÁ \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr "(ÓÏ×ÐÁÄÁÅÔ ×ÓÅ) ÔÒÅÂÕÅÔ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ ÌÏÇÉÞÅÓËÏÇÏ ÒÅÚÕÌØÔÁÔÁ"
-
-#: camel/camel-folder-search.c:551
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "óÏ×ÅÒÛÅÎÉÅ ÚÁÐÒÏÓÁ ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÚÁÇÏÌÏ×ËÅ: %s"
-
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
-msgid "Invalid type in body-contains, expecting string"
-msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÔÉÐ × ÔÅÌÏ-ÓÏÄÅÒÖÉÔ, ÏÖÉÄÁÅÔÓÑ ÓÔÒÏËÁ"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ ÄÌÑ %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"ðÒÅ×ÙÛÅÎÉÅ ×ÒÅÍÅÎÉ ÐÒÉ ÐÏÐÙÔËÅ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ %s. ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ "
-"ÐÏÚÖÅ."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ lock ÉÓÐÏÌØÚÕÑ fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ lock ÉÓÐÏÌØÚÕÑ flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÒÏ×ÅÒÉÔØ ÐÏÞÔÏ×ÙÊ ÆÁÊÌ %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÆÁÊÌ %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÆÁÊÌ %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ ÄÌÑ %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÐÏÞÔÏ×ÏÇÏ ÆÁÊÌÁ: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÆÁÊÌÁ: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "óÂÏÊ ÐÒÉ ÓÏÈÒÁÎÅÎÉÉ ÐÏÞÔÙ ×Ï ×ÒÅÍÅÎÎÏÍ ÆÁÊÌÅ %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ËÁÎÁÌ: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÚ×ÅÔ×ÉÔØ: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "óÂÏÊ ÐÒÏÇÒÁÍÍÙ ÐÅÒÅÍÅÝÅÎÉÑ ÐÏÞÔÙ: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ %s: ÎÅÔ ÉÎÉÃÉÁÌÉÚÁÃÉÏÎÎÏÇÏ ËÏÄÁ × ÍÏÄÕÌÅ."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s ÓÅÒ×ÅÒ %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s ÓÅÒ×ÉÓ ÄÌÑ %s ÎÁ %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "óÏÅÄÉÎÅÎÉÅ ÏÔÍÅÎÅÎÏ"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØÓÑ Ë %s (ÐÏÒÔ %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÈÏÓÔ)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "ïÐÅÒÁÃÉÑ ÏÔÍÅÎÅÎÁ"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "óÂÏÊ ËÏÍÐÉÌÑÃÉÉ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL \"%s\" ÎÕÖÄÁÅÔÓÑ × ËÏÍÐÏÎÅÎÔÅ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL \\\"%s\\\" ÎÕÖÄÁÅÔÓÑ × ËÏÍÐÏÎÅÎÔÅ ÈÏÓÔÁ"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL \\\"%s\\\" ÎÕÖÄÁÅÔÓÑ × ËÏÍÐÏÎÅÎÔÅ ÐÕÔÉ"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "îÅÔ ÔÁËÏÇÏ ÈÏÓÔÁ %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "÷ÒÅÍÅÎÎÏ ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÉÍÑ ÈÏÓÔÁ %s."
-
-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "ðÒÏ×ÁÊÄÅÒ ×ÉÒÔÕÁÌØÎÙÈ ÐÁÐÏË ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ"
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr "äÌÑ ÞÔÅÎÉÑ ÐÏÞÔÙ ÐÏ ÚÁÐÒÏÓÕ Ë ÄÒÕÇÏÍÕ ÎÁÂÏÒÕ ÐÁÐÏË"
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "ðÒÏ×ÁÊÄÅÒ ÄÌÑ ÐÒÏÔÏËÏÌÁ \"%s\" ÎÅ ÄÏÓÔÕÐÅÎ"
-
-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "óÔÒÏËÁ URL \"%s\" ÎÅ ÓÏÄÅÒÖÉÔ ÐÒÏÔÏËÏÌÁ"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "óÔÒÏËÁ URL \"%s\" ÓÏÄÅÒÖÉÔ ÎÅÄÏÐÕÓÔÉÍÙÊ ÐÒÏÔÏËÏÌ"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "îÏÍÅÒ ÐÏÒÔÁ × URL \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÞÉÓÌÏÍ"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÂÉÌÅÔ Kerberos:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "ïÔÒÉÃÁÔÅÌØÎÙÊ ÏÔ×ÅÔ ÉÄÅÎÔÉÆÉËÁÃÉÉ ÏÔ ÓÅÒ×ÅÒÁ."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "îÅÏÖÉÄÁÎÎÙÊ ÏÔ×ÅÔ ÏÔ ÓÅÒ×ÅÒÁ IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "óÂÏÊ ËÏÍÁÎÄÙ IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
-msgid "Unknown error"
-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "ïÔ×ÅÔ ÓÅÒ×ÅÒÁ ÚÁËÏÎÞÉÌÓÑ ÓÌÉÛËÏÍ ÒÁÎÏ."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "ïÔ×ÅÔ IMAP ÓÅÒ×ÅÒÁ ÎÅ ÓÏÄÅÒÖÉÔ ÉÎÆÏÒÍÁÃÉÉ Ï %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "îÅÏÖÉÄÁÎÎÙÊ ÏÔ×ÅÔ \"OK\" ÏÔ IMAP ÓÅÒ×ÅÒÁ: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:199
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÉÔÏÇ ÄÌÑ %s"
-
-#: camel/providers/imap/camel-imap-folder.c:329
-msgid "Scanning IMAP folder"
-msgstr "óËÁÎÉÒÏ×ÁÎÉÅ ÐÁÐÏË IMAP"
-
-#: camel/providers/imap/camel-imap-folder.c:457
-msgid "Synchronising IMAP folder"
-msgstr "óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÁÐÏË IMAP"
-
-#: camel/providers/imap/camel-imap-folder.c:726
-#: camel/providers/imap/camel-imap-folder.c:888
-msgid "Could not find message body in FETCH response."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ × ÏÔ×ÅÔÅ FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "äÌÑ ÞÔÅÎÉÑ É ÈÒÁÎÅÎÉÑ ÐÏÞÔÙ ÎÁ ÓÅÒ×ÅÒÁÈ IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë IMAP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ "
-"ÎÅÚÁÛÉÆÒÏ×ÁÎÎÏÇÏ ÐÁÒÏÌÑ."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë IMAP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÄÌÑ "
-"ÉÄÅÎÔÉÆÉËÁÃÉÉ ÐÒÏÔÏËÏÌÁ Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÐÁÒÏÌØ IMAP ÄÌÑ %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÔØÓÑ ÎÁ ÓÅÒ×ÅÒÅ IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "ðÏÞÔÏ×ÙÅ ËÁÔÁÌÏÇÉ × ÆÏÒÍÁÔÅ UNIX MH"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "äÌÑ ÈÒÁÎÅÎÉÑ ÌÏËÁÌØÎÏÊ ÐÏÞÔÙ × ÐÏÞÔÏ×ÙÈ ËÁÔÁÌÏÇÁÈ ÔÉÐÁ MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "óÔÁÎÄÁÒÔÎÙÊ ÆÁÊÌ Unix mailbox"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "äÌÑ ÈÒÁÎÅÎÉÑ ÌÏËÁÌØÎÏÊ ÐÏÞÔÙ × ÐÏÞÔÏ×ÙÈ ËÁÔÁÌÏÇÁÈ ÆÏÒÍÁÔÁ mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "ðÏÞÔÏ×ÙÅ ÆÁÊÌÙ × ÆÏÒÍÁÔÅ ÐÏÞÔÏ×ÙÈ ËÁÔÁÌÏÇÏ× qmail"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "äÌÑ ÈÒÁÎÅÎÉÑ ÌÏËÁÌØÎÏÊ ÐÏÞÔÙ × ÐÏÞÔÏ×ÙÈ ËÁÔÁÌÏÇÁÈ ÔÉÐÁ qmail"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÐÁÐËÕ: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "ìÏËÁÌØÎÙÊ ÐÏÞÔÏ×ÙÊ ÆÁÊÌ %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÐÁÐËÕ %s × %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÄÁÌÉÔØ ÉÔÏÇÏ×ÙÊ ÆÁÊÌ ÐÁÐËÉ \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÄÁÌÉÔØ ÉÎÄÅËÓÎÙÊ ÆÁÊÌ ÐÁÐËÉ \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ë ÐÁÐËÅ ÐÏÞÔÏ×ÏÇÏ ËÁÔÁÌÏÇÁ: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "îÅÔ ÔÁËÏÇÏ ÓÏÏÂÝÅÎÉÑ"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÓÏÄÅÒÖÉÍÏÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁÐËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "ðÁÐËÁ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÐÁÐËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ËÁÔÁÌÏÇÏÍ."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÁÐËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ËÁÔÁÌÏÇ"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÉÓÏÅÄÉÎÉÔØ ÓÏÏÂÝÅÎÉÅ Ë ÆÁÊÌÕ mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ: %s ÉÚ ÐÁÐËÉ %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "÷ÉÄÉÍÏ ÐÁÐËÁ ÎÅ×ÏÓÔÁÎÏ×ÉÍÏ ÉÓÐÏÒÞÅÎÁ."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "óÂÏÊ × ËÏÎÓÔÒÕËÃÉÉ ÓÏÏÂÝÅÎÉÑ: ÐÏÞÔÏ×ÙÊ ÑÝÉË ÐÏ×ÒÅÖÄÅÎ?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÙÞÎÙÍ ÆÁÊÌÏÍ."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÁÐËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "ðÁÐËÁ \"%s\" ÎÅ ÐÕÓÔÁ. îÅ ÕÄÁÌÅÎÁ."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "óÕÍÍÁÒÉÚÁÃÉÑ ÐÁÐËÉ"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÐÁÐËÕ: %s: ÉÔÏÇ Ó ÐÏÚÉÃÉÉ %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ ÐÏÞÔÏ×ÏÇÏ ÁÎÁÌÉÚÁÔÏÒÁ ×ÏÚÌÅ ÐÏÚÉÃÉÉ %ld × ÐÁÐËÅ %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÕÍÍÉÒÏ×ÁÔØ ÐÁÐËÕ: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1279
-msgid "Synchronising folder"
-msgstr "óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÁÐËÉ"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÐÁÐËÕ ÄÌÑ ÓÕÍÍÁÒÉÚÁÃÉÉ: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ÐÁÐËÉ É ÉÔÏÇÁ, ÄÁÖÅ ÐÏÓÌÅ ÓÉÎÈÒÏÎÉÚÁÃÉÉ"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ×Ï ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "óÂÏÊ ÚÁÐÉÓÉ ×Ï ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ÉÓÈÏÄÎÕÀ ÐÁÐËÕ %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ×ÒÅÍÅÎÎÕÀ ÐÁÐËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÐÁÐËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ë ÐÁÐËÅ mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÐÁÒÏÌØ NNTP ÄÌÑ %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "óÅÒ×ÅÒ ÏÔÂÒÏÓÉÌ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "óÂÏÊ ÐÒÉ ÏÔÐÒÁ×ËÅ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÁ ÓÅÒ×ÅÒ"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "óÅÒ×ÅÒ ÏÔÂÒÏÓÉÌ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÐÁÒÏÌØ"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "óÏÏÂÝÅÎÉÅ %s ÎÅ ÎÁÊÄÅÎÏ."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ Ó ÓÅÒ×ÅÒÁ ÓÐÉÓÏË ÇÒÕÐÐ."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ ÓÐÉÓËÁ ÇÒÕÐÐ ÄÌÑ %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ ÓÐÉÓËÁ ÇÒÕÐÐ ÄÌÑ %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "îÏ×ÏÓÔÉ USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"üÔÏ ÐÒÏ×ÁÊÄÅÒ ÄÌÑ ÞÔÅÎÉÑ É ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÊ × ÇÒÕÐÐÙ ÎÏ×ÏÓÔÅÊ USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÔÁÌÏÇ ÄÌÑ ÓÅÒ×ÅÒÁ ÎÏ×ÏÓÔÅÊ: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "îÏ×ÏÓÔÉ USENET ÞÅÒÅÚ %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë NNTP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ "
-"ÎÅÚÁÛÉÆÒÏ×ÁÎÎÏÇÏ ÐÁÒÏÌÑ."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÉÌÉ ÓÏÚÄÁÔØ ÆÁÊÌ .newsrc ÄÌÑ %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "ðÏÌÕÞÅÎÉÅ ÉÔÏÇÁ POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÐÁÐËÕ: ÓÐÉÓÏË ÓÏÏÂÝÅÎÉÊ ÂÙÌ ÎÅÐÏÌÏÎ."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "îÅÔ ÓÏÏÂÝÅÎÉÑ Ó uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÑ %d ÐÏ POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ Ó POP ÓÅÒ×ÅÒÁ %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"äÌÑ ÐÏÄËÌÀÞÅÎÉÑ Ë POP ÓÅÒ×ÅÒÁÍ. POP ÐÒÏÔÏËÏÌ ÍÏÖÅÔ ÂÙÔØ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÎ "
-"ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÞÔÙ ÏÔ ÏÂÙÞÎÙÈ ÐÒÏ×ÁÊÄÅÒÏ× Web-ÐÏÞÔÙ É ÓÐÅÃÉÆÉÞÅÓËÉÈ ÓÉÓÔÅÍ "
-"ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë POP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ "
-"ÎÅÚÁÛÉÆÒÏ×ÁÎÎÏÇÏ ÐÁÒÏÌÑ. âÏÌØÛÉÎÓÔ×ÏÍ POP ÓÅÒ×ÅÒÏ× ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ "
-"ÜÔÏÔ ×ÁÒÉÁÎÔ."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë POP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÛÉÆÒÏ×ÁÎÎÏÇÏ "
-"ÐÁÒÏÌÑ ÐÏ ÐÒÏÔÏËÏÌÕ APOP. üÔÏ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ ÎÅ ÄÌÑ ×ÓÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÄÁÖÅ "
-"ÎÁ ÓÅÒ×ÅÒÁÈ, ËÏÔÏÒÙÅ ÑËÏÂÙ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÜÔÏ."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë POP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Kerberos 4 "
-"ÄÌÑ ÉÄÅÎÔÉÆÉËÁÃÉÉ."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÔØÓÑ ÎÁ KPOP ÓÅÒ×ÅÒÅ: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØÓÑ Ë POP ÓÅÒ×ÅÒÕ ÎÁ %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ POP3 ÐÁÒÏÌØ ÄÌÑ %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØÓÑ Ë POP ÓÅÒ×ÅÒÕ.\n"
-"ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(îÅÉÚ×ÅÓÔÎÏÅ)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØÓÑ Ë POP ÓÅÒ×ÅÒÕ.\n"
-"îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÚÁÔÒÅÂÏ×ÁÎÎÙÊ ÍÅÈÁÎÉÚÍ ÉÄÅÎÔÉÆÉËÁÃÉÉ."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØÓÑ Ë POP ÓÅÒ×ÅÒÕ.\n"
-"ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÐÁÒÏÌÑ: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "îÅÔ ÔÁËÏÊ ÐÁÐËÉ \"%s\""
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"äÌÑ ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ ÐÅÒÅÄÁÞÅÊ Å£ ÐÒÏÇÒÁÍÍÅ \"Sendmail\" ÎÁ ÌÏËÁÌØÎÏÊ ÓÉÓÔÅÍÅ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ËÁÎÁÌ Ë Sendmail: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÚ×ÅÔ×ÉÔØ Sendmail: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "Sendmail ÚÁ×ÅÒÛÉÌÁ ÒÁÂÏÔÕ Ó ÓÉÇÎÁÌÏÍ %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "Sendmail ÚÁ×ÅÒÛÉÌÁ ÒÁÂÏÔÕ Ó ÓÏÓÔÏÑÎÉÅÍ %d: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "äÏÓÔÁ×ËÁ ÐÏÞÔÙ ÞÅÒÅÚ ÐÒÏÇÒÁÍÍÕ sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"äÌÑ ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ Ó ÐÏÍÏÝØÀ ÐÏÄËÌÀÞÅÎÉÑ Ë ÕÄÁÌÅÎÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÕÚÌÕ ÐÏ "
-"ÐÒÏÔÏËÏÌÕ SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ, ËÏÍÁÎÄÁ ÎÅ ÒÁÓÐÏÚÎÁÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ÐÁÒÁÍÅÔÒÁÈ ÉÌÉ ÁÒÇÕÍÅÎÔÁÈ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "ëÏÍÁÎÄÁ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "ðÁÒÁÍÅÔÒ ËÏÍÁÎÄÙ ÎÅ ÒÅÁÌÉÚÏ×ÁÎ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "óÏÓÔÏÑÎÉÅ ÓÉÓÔÅÍÙ ÉÌÉ ÏÔ×ÅÔ ÓÐÒÁ×ËÉ ÓÉÓÔÅÍÙ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "óÐÒÁ×ÏÞÎÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "óÅÒ×ÉÓ ÇÏÔÏ×"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "óÅÒ×ÉÓ ÚÁËÒÙ×ÁÅÔ ËÁÎÁÌ ÐÅÒÅÄÁÞÉ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "óÅÒ×ÉÓ ÎÅ ÄÏÓÔÕÐÅÎ, ÚÁËÒÙÔÉÅ ËÁÎÁÌÁ ÐÅÒÅÄÁÞÉ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÐÏÞÔÏ×ÏÅ ÄÅÊÓÔ×ÉÅ ×ÙÐÏÌÎÅÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "îÅ ÌÏËÁÌØÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ; ÂÕÄÅÔ ÏÔÐÒÁ×ÌÅÎÏ Ë <ÐÕÔØ-ÏÔÐÒÁ×ËÉ>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ Ó ÐÏÞÔÏÊ ÎÅ ×ÙÐÏÌÎÅÎÏ: ÐÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÄÏÓÔÕÐÅÎ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ ÎÅ ×ÙÐÏÌÎÅÎÏ: ÐÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÄÏÓÔÕÐÅÎ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ ÏÔÍÅÎÅÎÏ: ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÌÏËÁÌØÎÙÊ; ÐÏÖÁÌÕÊÓÔÁ ÐÏÐÒÏÂÕÊÔÅ <ÐÕÔØ-ÐÅÒÅÓÙÌËÉ>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ ÎÅ ×ÙÐÏÌÎÅÎÏ: ÎÅÄÏÓÔÁÔÏÞÎÏ ÓÉÓÔÅÍÎÏÇÏ ÈÒÁÎÉÌÉÝÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "úÁÐÒÏÛÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ ÎÅ ×ÙÐÏÌÎÅÎÏ: ÎÁÚ×ÁÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÎÅÄÏÐÕÓÔÉÍÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "îÁÞÁÌÏ ××ÏÄÁ ÐÏÞÔÙ; ÏËÏÎÞÁÎÉÅ ÐÏÓÌÅ <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "óÂÏÊ ÔÒÁÎÚÁËÃÉÉ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "éÄÅÎÔÉÆÉËÁÃÉÑ ÎÅ ÔÒÅÂÕÅÔÓÑ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë SMTP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ËÁËÏÊ ÌÉÂÏ "
-"ÉÄÅÎÔÉÆÉËÁÃÉÉ. üÔÏÔ ×ÁÒÉÁÎÔ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÂÏÌØÛÉÎÓÔ×ÏÍ SMTP ÓÅÒ×ÅÒÏ×."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"ðÏÄËÌÀÞÅÎÉÅ Ë SMTP ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÄÌÑ "
-"ÉÄÅÎÔÉÆÉËÁÃÉÉ ÐÒÏÔÏËÏÌÁ CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ÓÅÒ×ÅÒ %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "äÏÓÔÁ×ËÁ SMTP ÐÏÞÔÙ ÞÅÒÅÚ %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: ÎÅ ÏÐÒÅÄÅÌÅÎ ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: ÎÅ ÏÐÒÅÄÅÌÅÎÙ ÐÏÌÕÞÁÔÅÌÉ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ HELO: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ HELO: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ MAIL FROM: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ MAIL FROM: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ RCPT TO: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ RCPT TO: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ DATA: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ DATA: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÔÐÒÁ×ËÉ DATA: ÓÏÏÂÝÅÎÉÅ ÐÒÅÒ×ÁÎÏ: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ DATA: ÓÏÏÂÝÅÎÉÅ ÐÒÅÒ×ÁÎÏ: %s: ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "ðÒÅ×ÙÛÅÎÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÏÔ×ÅÔÁ ÎÁ QUIT: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "ïÛÉÂËÁ ÏÔ×ÅÔÁ QUIT: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 ÂÁÊÔ"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u ÂÁÊÔ"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fë"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "×ÌÏÖÅÎÉÅ"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ðÒÉÓÏÅÄÉÎÉÔØ ÆÁÊÌ"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "õÄÁÌÉÔØ"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "õÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ÜÌÅÍÅÎÔÙ ÉÚ ÓÐÉÓËÁ ×ÌÏÖÅÎÉÊ"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "äÏÂÁ×ÉÔØ ×ÌÏÖÅÎÉÅ..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "ðÒÉÓÏÅÄÉÎÉÔØ ÆÁÊÌ Ë ÓÏÏÂÝÅÎÉÀ"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr "÷ÌÏÖÅÎÉÅ"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "ó×ÏÊÓÔ×Á ×ÌÏÖÅÎÉÑ"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "éÍÑ ÆÁÊÌÁ:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "÷ÓÔÒÏÅÎÎÏÅ ×ÌÏÖÅÎÉÅ"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "ôÉÐ MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "ïÔÐÒÁ×ÉÔØ ËÁË:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "ïÔ:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "ýÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "÷×ÅÄÉÔÅ ÉÍÅÎÏ×ÁÎÉÅ, ÏÔ ËÏÔÏÒÏÇÏ ×Ù ÈÏÔÉÔÅ ÏÔÐÒÁ×ÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "ëÏÍÕ:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "÷×ÅÄÉÔÅ ÐÏÌÕÞÁÔÅÌÅÊ ÓÏÏÂÝÅÎÉÑ"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "ëÏÐÉÑ:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "÷×ÅÄÉÔÅ ÁÄÒÅÓÁÔÏ×, ËÏÔÏÒÙÅ ÐÏÌÕÞÁÔ ËÏÐÉÀ ÓÏÏÂÝÅÎÉÑ"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "óËÒ.ËÏÐÉÑ:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"÷×ÅÄÉÔÅ ÁÄÒÅÓÁÔÏ×, ËÏÔÏÒÙÅ ÐÏÌÕÞÁÔ ËÏÐÉÀ ÓÏÏÂÝÅÎÉÑ ÎÅ ÐÏÐÁ× × ÓÐÉÓÏË "
-"ÐÏÌÕÞÁÔÅÌÅÊ."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "ôÅÍÁ:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "÷×ÅÄÉÔÅ ÔÅÍÕ ÐÉÓØÍÁ"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÐÏÄÐÉÓÉ %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "óÏÈÒÁÎÉÔØ ËÁË..."
-
-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÆÁÊÌÁ: %s"
-
-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÆÁÊÌÁ: %s"
-
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "ü×ÏÌÀÃÉÑ"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"üÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÔÐÒÁ×ÌÅÎÏ.\n"
-"\n"
-"÷Ù ÈÏÔÉÔÅ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ?"
-
-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
-
-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "üÔÏÔ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
-
-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "üÔÏ ÎÅ ÏÂÙÞÎÙÊ ÆÁÊÌ."
-
-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "üÔÏÔ ÆÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ ÞÉÔÁÅÔÓÑ."
-
-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "æÁÊÌ ×ÙÇÌÑÄÉÔ ÄÏÓÔÕÐÎÙÍ, ÎÏ ÐÒÏÉÚÏÛÅÌ ÓÂÏÊ open(2)."
-
-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"æÁÊÌ ÏÞÅÎØ ÂÏÌØÛÏÊ (ÂÏÌØÛÅ 100ë).\n"
-"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ×ÓÔÁ×ÉÔØ ÅÇÏ?"
-
-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "ðÒÉ ÞÔÅÎÉÉ ÆÁÊÌÁ ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ."
-
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "óÏÚÄÁÔØ ÓÏÏÂÝÅÎÉÅ"
-
-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÏËÎÏ ÒÅÄÁËÔÏÒÁ."
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÒÅÄÁËÔÏÒ ÐÏÞÔÙ Evolution."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "×ÉÚÉÔÎÁÑ ËÁÒÔÏÞËÁ"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "ÉÎÆÏÒÍÁÃÉÑ ËÁÌÅÎÄÁÒÑ"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "ëÏÍÐÏÎÅÎÔ Evolution ÄÌÑ Executive Summary."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ËÏÍÐÏÎÅÎÔ Executive Summary ÐÒÏÇÒÁÍÍÙ Evolution."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ËÏÍÐÏÎÅÎÔ Executive Summary ÐÒÏÇÒÁÍÍÙ Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "ïÔËÒÙÔØ %s Ó ÐÏÍÏÝØÀ ÐÏÄÈÏÄÑÝÅÇÏ ÐÒÉÌÏÖÅÎÉÑ GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "ïÔËÒÙÔØ %s Ó ÐÏÍÏÝØÀ ÐÒÏÇÒÁÍÍÙ ÐÒÏÓÍÏÔÒÁ web ÄÌÑ GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÞÔÕ %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "éÚÍÅÎÉÔØ ×ÉÄ ÎÁ %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "úÁÐÕÓÔÉÔØ %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "úÁËÒÙÔØ %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ %s ×ÌÅ×Ï"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ %s ×ÐÒÁ×Ï"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ %s × ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÏËÕ"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ %s × ÓÌÅÄÕÀÝÕÀ ÓÔÒÏËÕ"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "îÁÓÔÒÏÉÔØ %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ HTML ÆÁÊÌ:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÄÁÎÎÙÈ:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "÷ÎÅÛÎÉÊ ×ÉÄ"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "æÏÎ:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "éÔÏÇ RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "ðÏÍÅÔÉÔØ ÚÁÄÁÎÉÅ ËÁË ×ÙÐÏÌÎÅÎÎÏÅ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "ðÒÏ×ÅÒÉÔØ ÓÅÒ×ÉÓ bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "ðÒÏ×ÅÒÉÔØ ÓÅÒ×ÉÓ"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "ïÛÉÂËÁ"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "ïÂÎÏ×ÌÑÔØ Á×ÔÏÍÁÔÉÞÅÓËÉ"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "ïÂÎÏ×ÉÔØ ÓÅÊÞÁÓ"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "ïÂÎÏ×ÌÑÔØ ËÁÖÄÙÅ "
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "ÍÉÎÕÔÙ"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "ÇÏÄ"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "ÇÏÄÙ"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "ÍÅÓÑÃ"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "ÍÅÓÑÃÙ"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "ÎÅÄÅÌÑ"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "ÎÅÄÅÌÉ"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "ÄÎÉ"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "ÞÁÓ"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "ÞÁÓÙ"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "ÍÉÎÕÔÁ"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "ÓÅËÕÎÄÁ"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "ÓÅËÕÎÄÙ"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "ïÐ-ÌÑ! ÷Ù ÚÁÂÙÌÉ ×ÙÂÒÁÔØ ÄÁÔÕ."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "ïÐ-ÌÑ! ÷Ù ×ÙÂÒÁÌÉ ÎÅÐÒÁ×ÉÌØÎÕÀ ÄÁÔÕ."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"äÁÔÁ ÓÏÏÂÝÅÎÉÑ ÂÕÄÅÔ ÓÒÁ×ÎÉ×ÁÔØÓÑ ÌÉÂÏ\n"
-"ÓÏ ×ÒÅÍÅÎÅÍ ÚÁÐÕÓËÁ ÆÉÌØÔÒÁ, ÌÉÂÏ \n"
-"ÏÔËÒÙÔÉÑ ×ÉÒÔ.ÐÁÐËÉ."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"äÁÔÁ ÓÏÏÂÝÅÎÉÑ ÂÕÄÅÔ ÓÒÁ×ÎÉ×ÁÔØÓÑ Ó ÄÁÔÏÊ,\n"
-"ËÏÔÏÒÕÀ ×Ù ÕËÁÚÁÌÉ ÚÄÅÓØ."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"äÁÔÁ ÓÏÏÂÝÅÎÉÑ ÂÕÄÅÔ ÓÒÁ×ÎÉ×ÁÔØÓÑ ÓÏ\n"
-"×ÒÅÍÅÎÅÍ ÏÔÎÏÓÉÔÅÌØÎÏ ÚÁÐÕÓËÁ ÆÉÌØÔÒÁ;\n"
-"ÎÁÐÒÉÍÅÒ \"ÎÅÄÅÌÀ ÎÁÚÁÄ\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "ÔÅËÕÝÅÅ ×ÒÅÍÑ"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "ÕËÁÚÁÎÎÏÅ ×ÁÍÉ ×ÒÅÍÑ"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "×ÒÅÍÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÔÅËÕÝÅÇÏ"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "óÒÁ×ÎÉ×ÁÔØ Ó"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "ÓÅÊÞÁÓ"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<ÝÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ×ÙÂÏÒÁ ÄÁÔÙ>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "äÏÂÁ×ÉÔØ ÐÒÁ×ÉÌÏ ÆÉÌØÔÒÁ"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "ðÒÁ×ËÁ ÐÒÁ×ÉÌÁ ÆÉÌØÔÒÁ"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "×ÈÏÄÑÝÉÅ"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "ÉÓÈÏÄÑÝÉÅ"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "ðÒÁ×ËÁ ÆÉÌØÔÒÏ×"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "ôÏÇÄÁ"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "äÏÂÁ×ÉÔØ ÄÅÊÓÔ×ÉÅ"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "õÄÁÌÉÔØ ÄÅÊÓÔ×ÉÅ"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"ïÐ-ÌÑ... ÷Ù ÚÁÂÙÌÉ ×ÙÂÒÁÔØ ÐÁÐËÕ.\n"
-"ðÏÖÁÌÕÊÓÔÁ, ×ÅÒÎÉÔÅÓØ É ÕËÁÖÉÔÅ ÐÒÁ×ÉÌØÎÕÀ ÐÁÐËÕ ÄÌÑ ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "÷ÙÂÒÁÔØ ÐÁÐËÕ"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "÷×ÅÓÔÉ URI ÐÁÐËÉ"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<ÝÅÌËÎÉÔÅ ÚÄÅÓØ ÄÌÑ ×ÙÂÏÒÁ ÐÁÐËÉ>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ \"%s\":\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "ðÒÏ×ÅÒËÁ"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "îÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "îÅÏÚÁÇÌÁ×ÌÅÎÎÏÅ"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "åÓÌÉ"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "÷ÙÐÏÌÎÉÔØ ÄÅÊÓÔ×ÉÑ"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "ÅÓÌÉ ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ×ÓÅÍ ËÒÉÔÅÒÉÑÍ"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "ÅÓÌÉ ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ÌÀÂÏÍÕ ÉÚ ËÒÉÔÅÒÉÅ×"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "äÏÂÁ×ÉÔØ ËÒÉÔÅÒÉÊ"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "õÄÁÌÉÔØ ËÒÉÔÅÒÉÊ"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "ïÔ×ÅÔÉÔØ"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "÷ÁÖÎÏÅ"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "ðÒÏÞÉÔÁÎÎÏÅ"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "ðÒÁ×ËÁ ×ÉÒÔ.ÐÁÐÏË"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "ðÒÁ×ÉÌÁ ÆÉÌØÔÒÁ"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "÷ÈÏÄÑÝÉÅ"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "éÓÈÏÄÑÝÉÅ"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "÷ÉÒÔÕÁÌØÎÙÅ ÐÁÐËÉ"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "éÓÔÏÞÎÉËÉ ×ÉÒÔ.ÐÁÐËÉ"
-
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "ïÔ×ÅÞÅÎÏ"
-
-#: filter/libfilter-i18n.h:14
-msgid "Assign Colour"
-msgstr "ó×ÑÚÁÔØ Ã×ÅÔ"
-
-#: filter/libfilter-i18n.h:15
-msgid "Assign Score"
-msgstr "ó×ÑÚÁÔØ ÐÏÄÓÞÅÔ"
-
-#: filter/libfilter-i18n.h:16
-msgid "Copy to Folder"
-msgstr "óËÏÐÉÒÏ×ÁÔØ × ÐÁÐËÕ"
-
-#: filter/libfilter-i18n.h:17
-msgid "Date received"
-msgstr "äÁÔÁ ÐÏÌÕÞÅÎÉÑ"
-
-#: filter/libfilter-i18n.h:18
-msgid "Date sent"
-msgstr "äÁÔÁ ÏÔÐÒÁ×ËÉ"
-
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "õÄÁÌÅÎÎÏÅ"
-
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "þÅÒÎÏ×ÉË"
-
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "÷ÙÒÁÖÅÎÉÅ"
-
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "ïÔÍÅÞÅÎÎÏÅ"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "ðÅÒÅÓÌÁÔØ ÐÏ ÁÄÒÅÓÕ"
-
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
-msgstr "óÐÉÓÏË ÒÁÓÓÙÌËÉ"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
-msgstr "ôÅÌÏ ÓÏÏÂÝÅÎÉÑ"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "úÁÇÏÌÏ×ÏË ÓÏÏÂÝÅÎÉÑ"
-
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "óÏÏÂÝÅÎÉÅ ÂÙÌÏ ÐÏÌÕÞÅÎÏ"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "óÏÏÂÝÅÎÉÅ ÂÙÌÏ ÏÔÐÒÁ×ÌÅÎÏ"
-
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÐÁÐËÕ"
-
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "ðÏÌÕÞÁÔÅÌÉ"
-
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
-msgstr "óÏ×ÐÁÄÅÎÉÅ ÒÅÇ.×ÙÒÁÖÅÎÉÑ"
-
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "ðÒÏÞÉÔÁÎÎÏÅ"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "ðÏÄÓÞÅÔ"
-
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÆÌÁÇ"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ"
-
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "éÓÔÏÞÎÉË"
-
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
-msgstr "óÐÅÃÉÆÉÞÅÓËÉÊ ÚÁÇÏÌÏ×ÏË"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÏÂÒÁÂÏÔËÕ"
-
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "ôÅÍÁ"
-
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "ÓÏÄÅÒÖÉÔ"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "ÎÅ ÓÏÄÅÒÖÉÔ"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "Ú×ÕÞÉÔ ÎÅ ËÁË"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "ÎÅ ÎÁÞÉÎÁÅÔÓÑ Ó"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "cÕÝÅÓÔ×ÕÅÔ"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "Ñ×ÌÑÅÔÓÑ"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "ÂÏÌØÛÅ ÞÅÍ"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "ÍÅÎØÛÅ ÞÅÍ"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "ÓÏ×ÐÁÄÁÅÔ Ó ÒÅÇ.×ÙÒÁÖÅÎÉÅÍ"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "ÎÁ ÉÌÉ ÐÏÓÌÅ"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "ÎÁ ÉÌÉ ÄÏ"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "Ú×ÕÞÉÔ ËÁË"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "ÎÁÞÉÎÁÅÔÓÑ Ó"
-
-#: filter/libfilter-i18n.h:158
-msgid "was after"
-msgstr "ÂÙÌÏ ÐÏÓÌÅ"
-
-#: filter/libfilter-i18n.h:159
-msgid "was before"
-msgstr "ÂÙÌÏ ÄÏ"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "äÏÂÁ×ÉÔØ ÐÒÁ×ÉÌÏ"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "ðÒÁ×ËÁ ÐÒÁ×ÉÌÁ ÐÏÄÓÞÅÔÁ"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "äÏÂÁ×ÉÔØ ÐÒÁ×ÉÌÏ ×ÉÒÔ.ÐÁÐËÉ"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "ðÒÁ×ËÁ ÐÒÁ×ÉÌÁ ×ÉÒÔ.ÐÁÐËÉ"
-
-#. add the vTrash folder
-#: mail/component-factory.c:219 mail/component-factory.c:447
-msgid "vTrash"
-msgstr "÷ÉÒÔ.ÕÒÎÁ"
-
-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ËÏÍÐÏÎÅÎÔ \"ü×ÏÌÀÃÉÉ\"."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÈÒÁÎÉÌÉÝÅ Ó ÐÏÍÏÝØÀ ÏÂÏÌÏÞËÉ"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "óÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ × ×ÉÒÔÕÁÌØÎÏÊ ÐÁÐËÅ"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "ôÅÌÏ ÉÌÉ ÔÅÍÁ ÓÏÄÅÒÖÁÔ"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "ôÅÌÏ ÓÏÄÅÒÖÉÔ"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "ôÅÍÁ ÓÏÄÅÒÖÉÔ"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "ôÅÌÏ ÎÅ ÓÏÄÅÒÖÉÔ"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "ôÅÍÁ ÎÅ ÓÏÄÅÒÖÉÔ"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "ïÔÐÒÁ×ÉÔÅÌØ ÓÏÄÅÒÖÉÔ"
-
-#: mail/folder-browser.c:667
-msgid "VFolder on Subject"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÔÅÍÅ"
-
-#: mail/folder-browser.c:668
-msgid "VFolder on Sender"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: mail/folder-browser.c:669
-msgid "VFolder on Recipients"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÐÏÌÕÞÁÔÅÌÀ"
-
-#: mail/folder-browser.c:670 mail/folder-browser.c:788
-msgid "VFolder on Mailing List"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÓÐÉÓËÕ ÒÁÓÓÙÌËÉ"
-
-#: mail/folder-browser.c:672
-msgid "Filter on Subject"
-msgstr "æÉÌØÔÒ ÐÏ ÔÅÍÅ"
-
-#: mail/folder-browser.c:673
-msgid "Filter on Sender"
-msgstr "æÉÌØÔÒ ÐÏ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: mail/folder-browser.c:674
-msgid "Filter on Recipients"
-msgstr "æÉÌØÔÒ ÐÏ ÐÏÌÕÞÁÔÅÌÀ"
-
-#: mail/folder-browser.c:675 mail/folder-browser.c:787
-msgid "Filter on Mailing List"
-msgstr "æÉÌØÔÒ ÐÏ ÓÐÉÓËÕ ÒÁÓÓÙÌËÉ"
-
-#: mail/folder-browser.c:681 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "ïÔËÒÙÔØ"
-
-#: mail/folder-browser.c:683
-msgid "Save As..."
-msgstr "óÏÈÒÁÎÉÔØ ËÁË..."
-
-#: mail/folder-browser.c:684 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "ðÅÞÁÔØ"
-
-#: mail/folder-browser.c:686
-msgid "Reply to Sender"
-msgstr "ïÔ×ÅÔÉÔØ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: mail/folder-browser.c:687 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "ïÔ×ÅÔÉÔØ ×ÓÅÍ"
-
-#: mail/folder-browser.c:688 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "ðÅÒÅÓÌÁÔØ"
-
-#: mail/folder-browser.c:689 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "ðÅÒÅÓÌÁÔØ ×ÓÔÒÏÅÎÎÏÅ"
-
-#: mail/folder-browser.c:691
-msgid "Mark as Read"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ÐÒÏÞÉÔÁÎÎÏÅ"
-
-#: mail/folder-browser.c:692
-msgid "Mark as Unread"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ÎÅÐÒÏÞÔÅÎÎÏÅ"
-
-#: mail/folder-browser.c:694
-msgid "Move to Folder..."
-msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÐÁÐËÕ..."
-
-#: mail/folder-browser.c:695
-msgid "Copy to Folder..."
-msgstr "óËÏÐÉÒÏ×ÁÔØ × ÐÁÐËÕ..."
-
-#: mail/folder-browser.c:697
-msgid "Undelete"
-msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:701
-msgid "Apply Filters"
-msgstr "ðÒÉÍÅÎÉÔØ ÆÉÌØÔÒÙ"
-
-#: mail/folder-browser.c:703
-msgid "Create Rule From Message"
-msgstr "óÏÚÄÁÔØ ÐÒÁ×ÉÌÏ ÉÚ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/folder-browser.c:790
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "æÉÌØÔÒ ÐÏ ÓÐÉÓËÕ ÒÁÓÓÙÌËÉ (%s)"
-
-#: mail/folder-browser.c:791
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÓÐÉÓËÕ ÒÁÓÓÙÌËÉ (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "ëÏÍÐÏÎÅÎÔ Evolution ÄÌÑ ÏÂÒÁÂÏÔËÉ ÐÏÞÔÙ."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "ëÏÍÐÏÎÅÎÔ ÒÅÄÁËÔÏÒÁ ÐÉÓÅÍ Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "ëÏÍÐÏÎÅÎÔ Executive Summary ÐÒÏÇÒÁÍÍÙ Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "ëÏÍÐÏÎÅÎÔ ÏÔÏÂÒÁÖÅÎÉÑ ÐÏÞÔÏ×ÏÊ ÐÁÐËÉ Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÒÅÄÁËÔÏÒ ÐÏÞÔÙ Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ËÏÍÐÏÎÅÎÔ \"ü×ÏÌÀÃÉÉ\"."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "éÍÏÒÔÉÒÕÅÔ ÆÁÊÌÙ Outlook Express 4 × Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "éÍÐÏÒÔÉÒÕÅÔ mbox ÆÁÊÌÙ × Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "ôÅËÕÝÉÊ ÆÏÒÍÁÔ ÈÒÁÎÅÎÉÑ:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "æÏÒÍÁÔ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "îÏ×ÙÊ ÆÏÒÍÁÔ ÈÒÁÎÅÎÉÑ:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"÷ÎÉÍÁÎÉÅ: ÐÒÉ ËÏÎ×ÅÒÔÉÒÏ×ÁÎÉÉ ÍÅÖÄÕ ÆÏÒÍÁÔÁÍÉ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÓÂÏÊ\n"
-"(ÔÁËÏÊ ËÁË ÎÅÈ×ÁÔËÁ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á) ÍÏÖÅÔ ÎÅ ÂÙÔØ Á×ÔÏÍÁÔÉÞÅÓËÉ\n"
-"×ÏÓÓÔÁÎÁ×ÌÉ×ÁÅÍÙÍ. éÓÐÏÌØÚÕÊÔÅ ÜÔÕ ×ÏÚÍÏÖÎÏÓÔØ Ó ÏÓÔÏÒÏÖÎÏÓÔØÀ."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "îÅÔ"
-
-#: mail/mail-accounts.c:116
-msgid " (default)"
-msgstr "(éÓÈ.ÚÎÁÞÅÎÉÑ)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:389
-msgid "Evolution Account Manager"
-msgstr "äÉÓÐÅÔÞÅÒ ÓÞÅÔÏ× Evolution"
-
-#: mail/mail-account-editor.c:290
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"ïÄÉÎ ÉÌÉ ÂÏÌÅÅ ×ÁÛÉÈ ÓÅÒ×ÅÒÏ× ÎÅ ÎÁÓÔÒÏÅÎÙ ËÏÒÒÅËÔÎÏ.\n"
-"óÏÈÒÁÎÉÔØ × ÌÀÂÏÍ ÓÌÕÞÁÅ?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
-msgid "Evolution Account Editor"
-msgstr "òÅÄÁËÔÏÒ ÓÞÅÔÏ× Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "ðÏÞÔÁ ÄÌÑ %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "ôÅÍÁ -- %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "ðÏÞÔÁ ÏÔ %s"
-
-#: mail/mail-autofilter.c:284
-#, c-format
-msgid "%s mailing list"
-msgstr "%s ÓÐÉÓÏË ÒÁÓÓÙÌËÉ"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"÷Ù ÎÅ ÎÁÓÔÒÏÉÌÉ ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ.\n"
-"÷ÁÍ ÎÁÄÏ ÓÄÅÌÁÔØ ÜÔÏ ÄÏ ÔÏÇÏ ËÁË ×Ù ÓÍÏÖÅÔÅ\n"
-"ÏÔÐÒÁ×ÌÑÔØ, ÐÒÉÎÉÍÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ÐÏÞÔÕ.\n"
-"÷Ù ÈÏÔÉÔÅ ÎÁÓÔÒÏÉÔØ ÜÔÏ ÓÅÊÞÁÓ?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"÷Ù ÄÏÌÖÎÙ ÎÁÓÔÒÏÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
-"ÄÏ ÔÏÇÏ ËÁË ×Ù ÓÍÏÖÅÔÅ ÐÏÓÌÁÔØ ÐÏÞÔÕ."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"÷Ù ÄÏÌÖÎÙ ÎÁÓÔÒÏÉÔØ ÐÅÒÅÄÁÞÕ ÐÏÞÔÙ\n"
-"ÄÏ ÔÏÇÏ ËÁË ×Ù ÓÍÏÖÅÔÅ ÐÏÓÌÁÔØ ÐÏÞÔÕ."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "÷Ù ÎÅ ÕÓÔÁÎÏ×ÉÌÉ ÍÅÔÏÄ ÔÒÁÎÓÐÏÒÔÉÒÏ×ËÉ ÐÏÞÔÙ"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"üÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÉÍÅÅÔ ÔÅÍÙ.\n"
-"ðÏÓÌÁÔØ ÅÇÏ?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "÷Ù ÄÏÌÖÎÙ ÎÁÓÔÒÏÉÔØ ÓÞÅÔ ÄÏ ÔÏÇÏ ËÁË ×Ù ÓÍÏÖÅÔÅ ÐÏÓÌÁÔØ ÐÏÞÔÕ."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "÷Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÐÏÌÕÞÁÔÅÌÅÊ, ÞÔÏÂÙ ÏÔÐÒÁ×ÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s, %s ÎÁÐÉÓÁÌ:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "ðÅÒÅÓÌÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ÓÏÏÂÝÅÎÉÅ ×"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÑ ×"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"÷Ù ÍÏÖÅÔÅ ÐÒÁ×ÉÔØ ÔÏÌØËÏ ÓÏÏÂÝÅÎÉÑ\n"
-"ÓÏÈÒÁÎÅÎÎÙÅ × ÐÁÐËÅ \"þÅÒÎÏ×ÉËÉ\"."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "ðÅÒÅÐÉÓÁÔØ ÆÁÊÌ?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"æÁÊÌ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
-"ðÅÒÅÐÉÓÁÔØ ÅÇÏ?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "óÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÅ ËÁË..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "óÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÑ ËÁË..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÉÎÆÏÒÍÁÃÉÉ ÆÉÌØÔÒÁ:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "ðÅÞÁÔØ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "óÂÏÊ ÐÅÞÁÔÉ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "óÞÅÔ"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÓÞÅÔÅ"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "õÐÒÁ×ÌÅÎÉÅ ÓÞÅÔÁÍÉ"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "ó×ÏÊÓÔ×Á ÓÞÅÔÁ"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "òÁÓÛÉÒÅÎÎÙÅ"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "éÄÅÎÔÉÆÉËÁÃÉÑ"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "ôÉÐ ÉÄÅÎÔÉÆÉËÁÃÉÉ"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÐÒÏ×ÅÒÑÔØ ÐÏÞÔÕ ËÁÖÄÙÅ"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "ðÒÏ×ÅÒÉÔØ ÕÓÔÁÎÏ×ËÉ"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"ðÏÚÄÒÁ×ÌÑÅÍ, ×ÁÛÉ ÐÏÞÔÏ×ÙÅ ÎÁÓÔÒÏÊËÉ ÚÁ×ÅÒÛÅÎÙ.\n"
-"\n"
-"÷Ù ÇÏÔÏ×Ù Ë ÏÔÐÒÁ×ËÅ É ÐÒÉÅÍÕ ÜÌ.ÐÏÞÔÙ\n"
-"Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Evolution.\n"
-"\n"
-"îÁÖÍÉÔÅ \"úÁ×ÅÒÛÉÔØ\", ÞÔÏÂÙ ÓÏÈÒÁÎÉÔØ ×ÁÛÉ ÎÁÓÔÒÏÊËÉ."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "éÓÈ.ÚÎÁÞÅÎÉÑ"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "óÄÅÌÁÎÏ"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "üÌ.ÁÄÒÅÓ:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "üÌ.ÁÄÒÅÓ:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "îÁÓÔÒÏÊËÁ ÐÏÞÔÙ Evolution"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "ðÏÌÎÏÅ ÉÍÑ:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "éÍÑ ÈÏÓÔÁ:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "éÍÅÎÏ×ÁÎÉÅ"
-
-#: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "÷ËÌÀÞÉÔØ × ÄÅÊÓÔ×ÉÑ \"ðÏÌÕÞÉÔØ ÐÏÞÔÕ\"."
-
-#: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "÷ÈÏÄÑÝÉÊ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ"
-
-#: mail/mail-config.glade.h:34
-msgid "Keep mail on server"
-msgstr "óÏÈÒÁÎÑÔØ ÐÏÞÔÕ ÎÁ ÓÅÒ×ÅÒÅ"
-
-#: mail/mail-config.glade.h:35
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail"
-msgstr "ðÏÞÔÁ"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Account"
-msgstr "ðÏÞÔÏ×ÙÊ ÓÞÅÔ"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration"
-msgstr "îÁÓÔÒÏÊËÁ ÐÏÞÔÙ"
-
-#: mail/mail-config.glade.h:39
-msgid "Mail Configuration Druid"
-msgstr "ðÏÍÏÝÎÉË ÐÏ ÎÁÓÔÒÏÊËÅ ÐÏÞÔÙ"
-
-#: mail/mail-config.glade.h:40
-msgid "Make this my default account"
-msgstr "óÄÅÌÁÔØ ÍÏÉÍ ÓÞÅÔÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-
-#: mail/mail-config.glade.h:41
-msgid "Mark messages as \"Read\" after:"
-msgstr "ðÏÍÅÞÁÔØ ÓÏÏÂÝÅÎÉÑ ËÁË \"ðÒÏÞÉÔÁÎÎÙÅ\" ÐÏÓÌÅ:"
-
-#: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "òÁÚÎÏÅ"
-
-#: mail/mail-config.glade.h:44
-msgid "News"
-msgstr "îÏ×ÙÅ"
-
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÙÅ"
-
-#: mail/mail-config.glade.h:47
-msgid "Organization:"
-msgstr "ïÒÇÁÎÉÚÁÃÉÑ:"
-
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "éÓÈÏÄÑÝÉÊ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ"
-
-#: mail/mail-config.glade.h:50
-msgid "PGP binary path:"
-msgstr "ðÕÔØ Ë ÐÒÏÇÒÁÍÍÅ PGP:"
-
-#: mail/mail-config.glade.h:51
-msgid "Password:"
-msgstr "ðÁÒÏÌØ:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "ðÒÏÓÔÏÊ ÔÅËÓÔ"
-
-#: mail/mail-config.glade.h:54
-msgid "Receiving Email"
-msgstr "ðÏÌÕÞÅÎÉÅ ÜÌ.ÐÏÞÔÙ"
-
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "úÁÐÏÍÎÉÔØ ÍÏÊ ÐÁÒÏÌØ"
-
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "ïÔ×ÅÔÉÔØ:"
-
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "ôÒÅÂÕÅÍÙÊ"
-
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "óÏÈÒÁÎÉÔØ ÐÁÒÏÌØ"
-
-#: mail/mail-config.glade.h:60
-msgid "Select PGP binary"
-msgstr "÷ÙÂÒÁÔØ ÆÁÊÌ"
-
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "÷ÙÂÒÁÔØ ÆÁÊÌ ÐÏÄÐÉÓÉ"
-
-#: mail/mail-config.glade.h:62
-msgid "Send mail in HTML format by default."
-msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÕ × ÆÏÒÍÁÔÅ HTML."
-
-#: mail/mail-config.glade.h:63
-msgid "Sending Email"
-msgstr "ïÔÐÒÁ×ËÁ ÜÌ.ÐÏÞÔÙ"
-
-#: mail/mail-config.glade.h:65
-msgid "Server Configuration"
-msgstr "îÁÓÔÒÏÊËÁ ÓÅÒ×ÅÒÁ"
-
-#: mail/mail-config.glade.h:66
-msgid "Server Type: "
-msgstr "ôÉÐ ÓÅÒ×ÅÒÁ:"
-
-#: mail/mail-config.glade.h:67
-msgid "Server requires authentication"
-msgstr "óÅÒ×ÅÒ ÔÒÅÂÕÅÔ ÉÄÅÎÔÉÆÉËÁÃÉÉ"
-
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "óÅÒ×ÅÒÙ"
-
-#: mail/mail-config.glade.h:69
-msgid "Signature file:"
-msgstr "æÁÊÌ ÐÏÄÐÉÓÉ:"
-
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "ðÏÄÐÉÓØ:"
-
-#: mail/mail-config.glade.h:72
-msgid "Sources"
-msgstr "éÓÔÏÞÎÉËÉ"
-
-#: mail/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "üÔÏÔ ÓÅÒ×ÅÒ ÔÒÅÂÕÅÔ ÚÁÝÉÝÅÎÎÏÇÏ ÐÏÄËÌÀÞÅÎÉÑ (SSL)"
-
-#: mail/mail-config.glade.h:74
-msgid "Transport"
-msgstr "ôÒÁÎÓÐÏÒÔ"
-
-#: mail/mail-config.glade.h:75
-msgid "Type"
-msgstr "ôÉÐ"
-
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"÷×ÅÄÉÔÅ ÎÁÚ×ÁÎÉÅ, ÐÏ ËÏÔÏÒÏÍÕ ×Ù ÈÏÔÉÔÅ ÕËÁÚÙ×ÁÔØ ÜÔÉ ÓÅÒ×ÅÒÙ. îÁÐÒÉÍÅÒ: "
-"\"òÁÂÏÔÁ\" ÉÌÉ \"äÏÍ\"."
-
-#: mail/mail-config.glade.h:78
-msgid "User Information"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ"
-
-#: mail/mail-config.glade.h:79
-msgid "Username:"
-msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ:"
-
-#: mail/mail-config.glade.h:80
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ Ë ÐÏÍÏÝÎÉËÕ ÐÏ ÎÁÓÔÒÏÊËÅ ÐÏÞÔÙ × Evolution.\n"
-"\n"
-"îÁÖÍÉÔÅ \"óÌÅÄ.\" ÄÌÑ ÎÁÞÁÌÁ."
-
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "ÍÉÎÕÔ."
-
-#: mail/mail-config-druid.c:401
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"óÂÏÊ ÐÒÉ ÐÒÏ×ÅÒËÅ ÎÁÓÔÒÏÅË ×ÈÏÄÑÝÅÊ ÐÏÞÔÙ.\n"
-"õ ×ÁÓ ÍÏÇÕÔ ×ÏÚÎÉËÎÕÔØ ÐÒÏÂÌÅÍÙ Ó ÐÏÌÕÞÅÎÉÅÍ ×ÁÛÅÊ ÐÏÞÔÙ Ó %s"
-
-#: mail/mail-config-druid.c:495
-msgid "Namespace:"
-msgstr "ðÒÏÓÔÒÁÎÓÔ×Ï ÉÍÅÎ:"
-
-#: mail/mail-config-druid.c:683
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"óÂÏÊ ÐÒÉ ÐÒÏ×ÅÒËÅ ÎÁÓÔÒÏÅË ÉÓÈÏÄÑÝÅÊ ÐÏÞÔÙ.\n"
-"õ ×ÁÓ ÍÏÇÕÔ ×ÏÚÎÉËÎÕÔØ ÐÒÏÂÌÅÍÙ Ó ÏÔÐÒÁ×ËÏÊ ×ÁÛÅÊ ÐÏÞÔÙ ÞÅÒÅÚ %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1042
-msgid "Evolution Account Wizard"
-msgstr "ðÏÍÏÝÎÉË ÐÏ ÓÞÅÔÁÍ Evolution"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "óÏÈÒÁÎÉÔØ ×ÌÏÖÅÎÉÅ"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "óÏÈÒÁÎÉÔØ ÎÁ ÄÉÓËÅ..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "ïÔËÒÙÔØ × %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "÷ÓÔÒÏÅÎÎÙÊ ÐÒÏÓÍÏÔÒ"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "÷ÎÅÛÎÑÑ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "÷ÓÔÒÏÅÎÎÙÊ ÐÒÏÓÍÏÔÒ (ÞÅÒÅÚ %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "óËÒÙÔØ"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s ×ÌÏÖÅÎÉÅ"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "úÁÇÒÕÚËÁ ÓÏÄÅÒÖÉÍÏÇÏ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "úÁÛÉÆÒÏ×ÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÏÔÏÂÒÁÖÁÅÔÓÑ"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "úÁÛÉÆÒÏ×ÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "ýÅÌËÎÉÔÅ ÎÁ ÐÉËÔÏÇÒÁÍÍÅ ÄÌÑ ÄÅÛÉÆÒÁÃÉÉ."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"üÔÏ ÓÏÏÂÝÅÎÉÅ Ó ÃÉÆÒÏ×ÏÊ ÐÏÄÐÉÓØÀ, ËÏÔÏÒÁÑ ÐÒÏÛÌÁ ÐÒÏ×ÅÒËÕ ÉÄÅÎÔÉÞÎÏÓÔÉ."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"üÔÏ ÓÏÏÂÝÅÎÉÅ Ó ÃÉÆÒÏ×ÏÊ ÐÏÄÐÉÓØÀ, ËÏÔÏÒÁÑ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÁ ÎÁ "
-"ÉÄÅÎÔÉÞÎÏÓÔØ."
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "õËÁÚÁÔÅÌØ ÎÁ FTP ÓÁÊÔ (%s)"
-
-#: mail/mail-format.c:1639
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1643
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "õËÁÚÁÔÅÌØ ÎÁ ÌÏËÁÌØÎÙÊ ÆÁÊÌ (%s)"
-
-#: mail/mail-format.c:1677
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "õËÁÚÁÔÅÌØ ÎÁ ÎÅÉÚ×ÅÓÔÎÙÅ ×ÎÅÛÎÉÅ ÄÁÎÎÙÅ (ÔÉÐÁ \"%s\")"
-
-#: mail/mail-format.c:1682
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-local.c:454
-#, c-format
-msgid "Opening '%s'"
-msgstr "ïÔËÒÙÔÉÅ \"%s\""
-
-#: mail/mail-local.c:727
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "éÚÍÅÎÅÎÉÅ ÐÁÐËÉ \"%s\" × ÆÏÒÍÁÔ \"%s\""
-
-#: mail/mail-local.c:731
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "éÚÍÅÎÉÔØ ÐÁÐËÕ \"%s\" × ÆÏÒÍÁÔ \"%s\""
-
-#: mail/mail-local.c:755
-msgid "Reconfiguring folder"
-msgstr "ðÅÒÅÎÁÓÔÒÏÊËÁ ÐÁÐËÉ"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:784
-msgid "Closing current folder"
-msgstr "úÁËÒÙÔÉÅ ÔÅËÕÝÅÊ ÐÁÐËÉ"
-
-#: mail/mail-local.c:816
-msgid "Renaming old folder and opening"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ ÓÔÁÒÏÊ ÐÁÐËÉ É ÏÔËÒÙÔÉÅ"
-
-#: mail/mail-local.c:834
-msgid "Creating new folder"
-msgstr "óÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÐÁÐËÉ"
-
-#: mail/mail-local.c:848
-msgid "Copying messages"
-msgstr "ëÏÐÉÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ"
-
-#: mail/mail-local.c:869
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:908
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-mt.c:137
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ ÐÒÉ \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:139
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"ïÛÉÂËÁ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ:\n"
-"%s"
-
-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
-msgid "Working"
-msgstr "ïÂÒÁÂÏÔËÁ"
-
-#: mail/mail-mt.c:707
-msgid "Evolution progress"
-msgstr "ðÒÏÄ×ÉÖÅÎÉÅ Evolution"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "ïÔÐÒÁ×ËÁ \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-ops.c:747
-msgid "Saving message to folder"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÓÏÏÂÝÅÎÉÑ × ÐÁÐËÅ"
-
-#: mail/mail-ops.c:820
-#, c-format
-msgid "Moving messages to %s"
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ ÓÏÏÂÝÅÎÉÊ × %s"
-
-#: mail/mail-ops.c:820
-#, c-format
-msgid "Copying messages to %s"
-msgstr "ëÏÐÉÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ × %s"
-
-#: mail/mail-ops.c:837
-msgid "Moving"
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ"
-
-#: mail/mail-ops.c:840
-msgid "Copying"
-msgstr "ëÏÐÉÒÏ×ÁÎÉÅ"
-
-#: mail/mail-ops.c:851
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s ÓÏÏÂÝÅÎÉÑ %d ÉÚ %d (uid \"%s\")"
-
-#: mail/mail-ops.c:922
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "óÞÉÔÙ×ÁÎÉÅ ÐÁÐÏË × \"%s\""
-
-#: mail/mail-ops.c:1036
-msgid "Forwarded messages"
-msgstr "ðÅÒÅÓÌÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-ops.c:1077 mail/mail-ops.c:1215
-#, c-format
-msgid "Opening folder %s"
-msgstr "ïÔËÒÙÔÉÅ ÐÁÐËÉ \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Opening store %s"
-msgstr "ïÔËÒÙÔÉÅ ÈÒÁÎÉÌÉÝÁ %s"
-
-#: mail/mail-ops.c:1331
-msgid "Expunging folder"
-msgstr "÷ÙÞÅÒËÉ×ÁÎÉÅ ÐÁÐËÉ"
-
-#: mail/mail-ops.c:1380
-#, c-format
-msgid "Retrieving message %s"
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÑ %s"
-
-#: mail/mail-ops.c:1447
-msgid "Retrieving messages"
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÊ"
-
-#: mail/mail-ops.c:1457
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ ÓÏÏÂÝÅÎÉÑ ÎÏÍÅÒ %d ÉÚ %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1531
-msgid "Saving messages"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÓÏÏÂÝÅÎÉÊ"
-
-#: mail/mail-ops.c:1610
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1623
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÓÏÏÂÝÅÎÉÑ %d ÉÚ %d (uid  \"%s\")"
-
-#: mail/mail-ops.c:1637
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÓÏÏÂÝÅÎÉÊ ×: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1711
-msgid "Saving attachment"
-msgstr "óÏÈÒÁÎÅÎÉÅ ×ÌÏÖÅÎÉÑ"
-
-#: mail/mail-ops.c:1726
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1754
-#, c-format
-msgid "Could not write data: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÄÁÎÎÙÅ: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "ðÏÉÓË"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "ïÔÍÅÎÁ..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "ðÏÌÕÞÅÎÉÅ É ÏÔÐÒÁ×ËÁ ÐÏÞÔÙ"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "ðÏÌÕÞÅÎÉÅ"
-
-#: mail/mail-send-recv.c:268
-msgid "Updating ..."
-msgstr "ïÂÎÏ×ÌÅÎÉÅ..."
-
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
-msgid "Waiting ..."
-msgstr "ïÖÉÄÁÎÉÅ..."
-
-#: mail/mail-send-recv.c:289
-msgid "Sending"
-msgstr "ïÔÐÒÁ×ËÁ"
-
-#: mail/mail-send-recv.c:484
-msgid "Cancelled."
-msgstr "ïÔÍÅÎÅÎÏ."
-
-#: mail/mail-send-recv.c:488
-msgid "Complete."
-msgstr "÷ÙÐÏÌÎÅÎÏ."
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "îÅÐÏÌÎÏÅ ÓÏÏÂÝÅÎÉÅ ÚÁÐÉÓÁÎÏ × ËÁÎÁÌ!"
-
-#: mail/mail-tools.c:197
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ mbox \"%s\": %s"
-
-#: mail/mail-tools.c:255
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (ÐÅÒÅÓÌÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ)"
-
-#: mail/mail-tools.c:265
-msgid "Fwd: (no subject)"
-msgstr "ðÅÒÅÓÌ.: (ÎÅÔ ÔÅÍÙ)"
-
-#: mail/mail-tools.c:282
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "ðÅÒÅÓÌÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ - %s"
-
-#: mail/mail-tools.c:284
-msgid "Forwarded message (no subject)"
-msgstr "ðÅÒÅÓÌÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ (ÂÅÚ ÔÅÍÙ)"
-
-#: mail/mail-tools.c:366
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÌÏÖÅÎÉÅ \"%s\":\n"
-"%s"
-
-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "÷ÉÒÔ.ÐÁÐËÉ"
-
-#: mail/mail-vfolder.c:321
-msgid "New VFolder"
-msgstr "îÏ×ÁÑ ×ÉÒÔ.ÐÁÐËÁ"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "ïÔ×ÅÔÉÔØ"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "ïÔ×ÅÔÉÔØ ÏÔÐÒÁ×ÉÔÅÌÀ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "ïÔ×ÅÔÉÔØ ×ÓÅÍ ÐÏÌÕÞÁÔÅÌÑÍ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "ðÅÒÅÓÌÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "òÁÓÐÅÞÁÔÁÔØ ×ÙÄÅÌÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "õÄÁÌÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "îÅÐÒÏÞÉÔÁÎÎÏÅ"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "íÎÏÖÅÓÔ×Ï ÎÅÐÒÏÓÍÏÔÒÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "íÎÏÖÅÓÔ×Ï ÓÏÏÂÝÅÎÉÊ"
-
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, É Ô.Ä."
-
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<ÎÅÉÚ×ÅÓÔÎÏÅ>"
-
-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "óÅÇÏÄÎÑ %I:%M %p"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "÷ÞÅÒÁ %l:%M %p"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1172
-msgid "From"
-msgstr "ïÔ"
-
-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "äÁÔÁ"
-
-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "ðÏÌÕÞÅÎÉÑ"
-
-#: mail/message-list.c:1173
-msgid "To"
-msgstr "ëÏÍÕ"
-
-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "òÁÚÍÅÒ"
-
-#: mail/openpgp-utils.c:84
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "ðÏÖÁÌÕÊÓÔÁ ××ÅÄÉÔÅ ×ÁÛÕ %s ÐÁÒÏÌØÎÕÀ ÆÒÁÚÕ ÄÌÑ %s"
-
-#: mail/openpgp-utils.c:87
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "ðÏÖÁÌÕÊÓÔÁ ××ÅÄÉÔÅ ×ÁÛÕ %s ÐÁÒÏÌØÎÕÀ ÆÒÁÚÕ."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
-msgid "No GPG/PGP program available."
-msgstr "îÅÄÏÓÔÕÐÎÁ ÐÒÏÇÒÁÍÍÁ GPG/PGP."
-
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
-msgid "No password provided."
-msgstr "ðÁÒÏÌØ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎ."
-
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ËÁÎÁÌ Ë GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
-msgid "No recipients specified"
-msgstr "îÅ ÕËÁÚÁÎÙ ÐÏÌÕÞÁÔÅÌÉ"
-
-#: mail/openpgp-utils.c:1067
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "ðÁÐËÁ"
-
-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "èÒÁÎÉÔØ"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "ðÏËÁÚÁÔØ ÐÁÐËÉ ÎÁÞÉÎÁÀÝÉÅÓÑ Ó:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "ðÏÄÐÉÓÙ×ÁÎÉÅ ÎÁ ÐÁÐËÕ \"%s\""
-
-#: mail/subscribe-dialog.c:282
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "ïÔÐÉÓÙ×ÁÎÉÅ ÏÔ ÐÁÐËÉ \"%s\""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "îÁÚ×ÁÎÉÅ ÐÁÐËÉ:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "ôÉÐ ÐÁÐËÉ:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "õËÁÚÁÔØ ÇÄÅ ÓÏÚÄÁÔØ ÐÁÐËÕ:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ %s\n"
-"éÍÐÏÒÔÅÒ ÎÅ ÇÏÔÏ×.\n"
-"5 ÓÅËÕÎÄ ÏÖÉÄÁÎÉÑ ÐÅÒÅÄ ÐÏ×ÔÏÒÏÍ."
-
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ %s\n"
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ ÜÌÅÍÅÎÔÁ %d."
-
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"îÅÔ ÉÍÐÏÒÔÅÒÁ, ËÏÔÏÒÙÊ ÓÐÏÓÏÂÅÎ ÏÂÒÁÂÏÔÁÔØ\n"
-"%s"
-
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "éÍÐÏÒÔÉÒÏ×ÁÎÉÅ"
-
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ %s.\n"
-"îÁÞÁÔÏ %s"
-
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ %s"
-
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ %s\n"
-"éÍÐÏÒÔÉÒÏ×ÁÎÉÅ ÜÌÅÍÅÎÔÁ 1."
-
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "á×ÔÏÍÁÔÉÞÅÓËÏÅ"
-
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "éÍÑ ÆÁÊÌÁ:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "÷ÙÂÒÁÔØ ÆÁÊÌ"
-
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "ôÉÐ ÆÁÊÌÁ:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "éÍÐÏÒÔÉÒÏ×ÁÔØ"
-
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"÷ÙÂÅÒÉÔÅ ÆÁÊÌ, ËÏÔÏÒÙÊ ×Ù ÈÏÔÉÔÅ ÉÍÐÏÒÔÉÒÏ×ÁÔØ × Evolution É ×ÙÂÅÒÉÔÅ ÔÉÐ "
-"ÆÁÊÌÁ ÉÚ ÓÐÉÓËÁ.\n"
-"\n"
-"÷Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ \"á×ÔÏÍÁÔÉÞÅÓËÉÊ\" ÅÓÌÉ ×Ù ÎÅ ÚÎÁÅÔÅ É Evolution "
-"ÐÏÐÙÔÁÅÔÓÑ ÏÐÏÚÎÁÔØ ÅÇÏ."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"îÁÖÍÉÔÅ \"éÍÐÏÒÔÉÒÏ×ÁÔØ\" ÄÌÑ ÎÁÞÁÌÁ ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ ÆÁÊÌÏ× × Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "óÒÅÄÓÔ×Ï ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "óÒÅÄÓÔ×Ï ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ Evolution"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"óÒÅÄÓÔ×Ï ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ Evolution.\n"
-"üÔÏÔ ÐÏÍÏÝÎÉË ÐÒÏ×ÅÄÅÔ ×ÁÓ ÞÅÒÅÚ ÐÒÏÃÅÓÓ ÉÍÐÏÒÔÁ\n"
-"×ÎÅÛÎÉÈ ÆÁÊÌÏ× × Evolution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "õÓÔÁÎÏ×ËÁ Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"üÔÏÊ ÎÏ×ÏÊ ×ÅÒÓÉÉ Evolution ÔÒÅÂÕÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÆÁÊÌÙ\n"
-"× ×ÁÛ ÌÉÞÎÙÊ ËÁÔÁÌÏÇ Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"ðÏÖÁÌÕÊÓÔÁ ÎÁÖÍÉÔÅ \"ïË\", ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÆÁÊÌÙ ÉÌÉ \"ïÔÍÅÎÁ\" ÄÌÑ ×ÙÈÏÄÁ."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ ÆÁÊÌÙ ËÏÒÒÅËÔÎÏ"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "æÁÊÌÙ Evolution ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "ðÏÈÏÖÅ ×Ù ÚÁÐÕÓÔÉÌÉ Evolution × ÐÅÒ×ÙÊ ÒÁÚ."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"ðÏÖÁÌÕÊÓÔÁ ÎÁÖÍÉÔÅ \"ïË\", ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÅ ÆÁÊÌÙ Evolution "
-"×"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ\n"
-"%s\n"
-"ïÛÉÂËÁ: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ÆÁÊÌÙ ×\n"
-"\"%s\"."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"æÁÊÌ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ.\n"
-"ðÏÖÁÌÕÊÓÔÁ, ÐÅÒÅÍÅÓÔÉÔÅ ÅÇÏ, ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ\n"
-"ÕÓÔÁÎÏ×ÉÔØ ÆÁÊÌÙ ÐÏÌØÚÏ×ÁÔÅÌÑ Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"æÁÊÌ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ Evolution.\n"
-"ðÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ÅÇÏ, ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ\n"
-"ÕÓÔÁÎÏ×ÉÔØ ÆÁÊÌÙ ÐÏÌØÚÏ×ÁÔÅÌÑ Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÕËÁÚÁÎÎÕÀ ÐÁÐËÕ:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "õËÁÚÁÎÎÏÅ ÉÍÑ ÐÁÐËÉ ÎÅ ÄÏÐÕÓÔÉÍÏ."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "ü×ÏÌÀÃÉÑ - óÏÚÄÁÔØ ÎÏ×ÕÀ ÐÁÐËÕ"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"ôÉÐ ×ÙÂÒÁÎÎÏÊ ÐÁÐËÉ ÎÅ ÐÏÄÈÏÄÉÔ ÄÌÑ\n"
-"ÚÁÐÒÏÛÅÎÎÏÇÏ ÄÅÊÓÔ×ÉÑ."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "îÏ×ÁÑ..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(âÅÚ ÚÁÇÏÌÏ×ËÁ)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy ÎÅ ÂÙÌ ÎÁÊÄÅÎ × ×ÁÛÅÍ $PATH."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Bug-buddy ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright (C) 1999-2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"\"ü×ÏÌÀÃÉÑ\" ÜÔÏ ÎÁÂÏÒ ÐÒÉÌÏÖÅÎÉÊ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ,\n"
-"×ÅÄÅÎÉÑ ËÁÌÅÎÄÁÒÅÊ É ËÏÎÔÁËÔÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÄÌÑ\n"
-"ÇÒÕÐÐÏ×ÏÊ ÒÁÂÏÔÙ × ÓÒÅÄÅ GNOME."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "ðÅÒÅÊÔÉ Ë ÐÁÐËÅ..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(ðÁÐËÉ ÎÅ ÐÏËÁÚÁÎÙ)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "ðÁÐËÉ"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÌÏËÁÌØÎÏÅ ÈÒÁÎÉÌÉÝÅ -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"ïÐ-ÌÑ! ïËÎÏ ÄÌÑ \"%s\" ÎÅÏÖÉÄÁÎÎÏ ÕÍÅÒÌÏ. :-(\n"
-"÷ÏÚÍÏÖÎÏ ÜÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ËÏÍÐÏÎÅÎÔ %s ÒÕÈÎÕÌ."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÇÒÕÐÐÕ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "îÁÚ×ÁÎÉÅ ÇÒÕÐÐÙ:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÇÒÕÐÐÕ\n"
-"\"%s\" ÉÚ ÐÁÎÅÌÉ ÚÁËÌÁÄÏË?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "îÅ ÕÄÁÌÑÔØ"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "íÁÌÅÎØËÉÅ ÐÉËÔÏÇÒÁÍÍÙ"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "ðÏËÁÚÁÔØ ÚÁËÌÁÄËÉ ËÁË ÍÁÌÅÎØËÉÅ ÐÉËÔÏÇÒÁÍÍÙ"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "âÏÌØÛÉÅ ÐÉËÔÏÇÒÁÍÍÙ"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "ðÏËÁÚÁÔØ ÚÁËÌÁÄËÉ ËÁË ÂÏÌØÛÉÅ ÐÉËÔÏÇÒÁÍÍÙ"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "îÏ×ÁÑ ÇÒÕÐÐÁ..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÇÒÕÐÐÕ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "õÄÁÌÉÔØ ÜÔÕ ÇÒÕÐÐÕ..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "õÄÁÌÉÔØ ÜÔÕ ÇÒÕÐÐÕ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "óËÒÙÔØ ÓÔÒÏËÕ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "óËÒÙÔØ ÓÔÒÏËÕ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "áËÔÉ×ÉÒÏ×ÁÔØ"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "áËÔÉ×ÉÒÏ×ÁÔØ ÜÔÕ ÚÁËÌÁÄËÕ"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "õÄÁÌÉÔØ ÜÔÕ ÚÁËÌÁÄËÕ ÉÚ ÓÔÒÏËÉ ÚÁËÌÁÄÏË"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁËÌÁÄÏË."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "ðÒÏÓÍÏÔÒ"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "ðÒÏÓÍÏÔÒ ×ÙÂÒÁÎÎÏÊ ÐÁÐËÉ"
-
-#: shell/e-storage.c:176
-msgid "(No name)"
-msgstr "(âÅÚ ÉÍÅÎÉ)"
-
-#: shell/e-storage.c:427
-msgid "No error"
-msgstr "îÅÔ ÏÛÉÂËÉ"
-
-#: shell/e-storage.c:429
-msgid "Generic error"
-msgstr "ïÂÙÞÎÁÑ ÏÛÉÂËÁ"
-
-#: shell/e-storage.c:431
-msgid "A folder with the same name already exists"
-msgstr "ðÁÐËÁ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: shell/e-storage.c:433
-msgid "The specified folder type is not valid"
-msgstr "õËÁÚÁÎÎÙÊ ÔÉÐ ÐÁÐËÉ ÎÅ ÄÏÐÕÓÔÉÍ"
-
-#: shell/e-storage.c:435
-msgid "I/O error"
-msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ"
-
-#: shell/e-storage.c:437
-msgid "Not enough space to create the folder"
-msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÁÐËÉ"
-
-#: shell/e-storage.c:439
-msgid "The specified folder was not found"
-msgstr "õËÁÚÁÎÎÁÑ ÐÁÐËÁ ÎÅ ÎÁÊÄÅÎÁ"
-
-#: shell/e-storage.c:441
-msgid "Function not implemented in this storage"
-msgstr "æÕÎËÃÉÑ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÁ ÄÌÑ ÜÔÏÇÏ ÎÏÓÉÔÅÌÑ"
-
-#: shell/e-storage.c:443
-msgid "Permission denied"
-msgstr "ïÔËÁÚ × ÄÏÓÔÕÐÅ"
-
-#: shell/e-storage.c:445
-msgid "Operation not supported"
-msgstr "ïÐÅÒÁÃÉÑ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#: shell/e-storage.c:447
-msgid "The specified type is not supported in this storage"
-msgstr "õËÁÚÁÎÎÙÊ ÔÉÐ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÜÔÏÇÏ ÎÏÓÉÔÅÌÑ"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "ïÂÏÌÏÞËÁ Evolution."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"ðÒÉ×ÅÔ! óÐÁÓÉÂÏ, ÞÔÏ ÎÁÛÌÉ ×ÒÅÍÑ ÓËÁÞÁÔØ ÜÔÕ ÐÒÅÄ×ÁÒÉÔÅÌØÎÕÀ ×ÅÒÓÉÀ\n"
-"ÎÁÂÏÒÁ ÇÒÕÐÐÏ×ÙÈ ÐÒÉÌÏÖÅÎÉÊ \"Evolution\"\n"
-"ëÏÍÁÎÄÁ \"Evolution\" ÕÐÏÒÎÏ ÒÁÂÏÔÁÅÔ, ÞÔÏÂÙ ÓÄÅÌÁÔØ ÐÒÏÇÒÁÍÍÕ ÎÁÓÔÏÌØËÏ\n"
-"ÕÓÔÏÊÞÉ×ÏÊ, ÒÁÓÛÉÒÑÅÍÏÊ, ËÒÁÓÉ×ÏÊ, ÂÙÓÔÒÏÊ É ÆÕÎËÃÉÏÎÁÌØÎÏÊ ÄÌÑ\n"
-"ÉÚÏÝÒÅÎÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ éÎÔÅÒÎÅÔ, ÎÁÓËÏÌØËÏ ×ÏÚÍÏÖÎÏ. é ÍÙ ÕÓÔÁÌÉ.\n"
-"îÏ ÍÙ ÅÝÅ ÎÅ ÇÏÔÏ×Ù -- ÐÏËÁ ÎÅÔ.\n"
-"\n"
-"ëÏÇÄÁ ×Ù ÉÓÓÌÅÄÕÅÔÅ \"Evolution\", ÐÏÖÁÌÕÊÓÔÁ ÕÞÉÔÙ×ÁÊÔÅ, ÞÔÏ ÂÏÌØÛÁÑ ÞÁÓÔØ\n"
-"ÎÁÛÅÊ ÒÁÂÏÔÙ ÂÙÌÁ ÎÁÐÒÁ×ÌÅÎÁ ÎÁ ÓÏÚÄÁÎÉÅ ÍÏÝÎÏÇÏ Ä×ÉÖËÁ, ËÏÔÏÒÙÊ ÂÕÄÅÔ\n"
-"ÕÐÒÁ×ÌÑÔØ ×ÓÅÊ ÓÉÓÔÅÍÏÊ, Á ÎÅ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ. ðÒÅÄÓÔÏÉÔ ÅÝÅ\n"
-"ÍÎÏÇÏ ÒÁÂÏÔÙ, ÍÙ Ó ÌÀÂÏ×ØÀ É ×ÎÉÍÁÎÉÅÍ ÂÕÄÅÍ ÒÁÚ×É×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ\n"
-"ÉÎÔÅÒÆÅÊÓ. á ×Ù ÕÚÎÁÅÔÅ, ÞÔÏ ÜÔÏ ÎÅ ÄÅÍÏÎÓÔÒÁÛËÁ.\n"
-"\n"
-"÷ÒÅÍÑ ÄÌÑ ÚÁÎÕÄÎÏÇÏ \"ïÐÒÏ×ÅÒÖÅÎÉÑ\". \"ü×ÏÌÀÃÉÑ ÂÕÄÅÔ: ÐÁÄÁÔØ, ÕÎÉÞÔÏÖÁÔØ\n"
-"×ÁÛÕ ÐÏÞÔÕ, ÏÓÔÁ×ÌÑÔØ ÚÁÐÕÝÅÎÎÙÍÉ ÚÁÂÌÕÄÉ×ÛÉÅÓÑ ÐÒÏÃÅÓÓÙ, ÐÏÇÌÏÝÁÔØ 100%\n"
-"ãðõ, ÚÁ×ÉÓÁÔØ, ÏÔÐÒÁ×ÌÑÔØ HTML-ÐÏÞÔÕ × ÓÌÕÞÁÊÎÙÅ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ É ÓÔÁ×ÉÔØ\n"
-"×ÁÓ × ÎÅÌÏ×ËÏÅ ÐÏÌÏÖÅÎÉÅ ÐÅÒÅÄ ÄÒÕÚØÑÍÉ É ËÏÌÌÅÇÁÍÉ. éÓÐÏÌØÚÕÊÔÅ ÎÁ Ó×ÏÊ\n"
-"ÓÔÒÁÈ É ÒÉÓË.\n"
-"íÙ ÎÁÄÅÅÍÓÑ, ÞÔÏ ×ÁÍ ÐÏÎÒÁ×ÑÔÓÑ ÒÅÚÕÌØÔÁÔÙ ÎÁÛÅÊ ÕÐÏÒÎÏÊ ÒÁÂÏÔÙ É ÍÙ\n"
-"ÒÁÓÓÞÉÔÙ×ÁÅÍ ÎÁ ×ÁÛÅ ÕÞÁÓÔÉÅ!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"ó ÂÌÁÇÏÄÁÒÎÏÓÔØÀ\n"
-"ëÏÍÁÎÄÁ Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÏÂÏÌÏÞËÕ \"ü×ÏÌÀÃÉÉ\"."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "ïÔËÌÀÞÅÎÏ."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ËÏÍÐÏÎÅÎÔÎÕÀ ÓÉÓÔÅÍÕ Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ËÏÎÔÁËÔ"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "õÄÁÌÉÔØ ËÏÎÔÁËÔ"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "ðÏÉÓË"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "ðÏÉÓË ËÏÎÔÁËÔÁ"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "îÏ×ÙÊ ËÏÎÔÁËÔ"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "ðÅÞÁÔØ ËÏÎÔÁËÔÏ×"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "óÔÏÐ"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÚÁÇÒÕÚËÕ"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "ðÒÏÓÍÏÔÒÅÔØ ×ÓÅ"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "ðÒÏÓÍÏÔÒÅÔØ ×ÓÅ ËÏÎÔÁËÔÙ"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "îÁÓÔÒÏÊËÁ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "îÁÐÅÞÁÔÁÔØ ËÏÎÔÁËÔÙ..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "ðÏÉÓË ËÏÎÔÁËÔÏ×"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "éÎÓÔÒÕÍÅÎÔÙ"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 ÄÎÅÊ"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "äÒÕÇÉÅ ÎÁÓÔÒÏÊËÉ"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "ëÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "îÁÓÔÒÏÊËÉ ËÁÌÅÎÄÁÒÑ..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ×ÓÔÒÅÞÕ"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ËÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "äÅÎØ"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "ðÅÒÅÊÔÉ × ÐÒÏÛÌÏÅ"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "ðÅÒÅÊÔÉ × ÂÕÄÕÝÅÅ"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "ðÅÒÅÊÔÉ Ë"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "ðÅÒÅÊÔÉ Ë ÕËÁÚÁÎÎÏÊ ÄÁÔÅ"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "ðÅÒÅÊÔÉ Ë ÎÁÓÔÏÑÝÅÍÕ ×ÒÅÍÅÎÉ"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "íÅÓÑÃ"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "îÏ×ÁÑ ×ÓÔÒÅÞÁ"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "óÌÅÄ."
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "ïÔËÒÙÔØ ËÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "ðÒÅÄ."
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "îÁÐÅÞÁÔÁÔØ ÜÔÏÔ ËÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "óÏÈÒÁÎÉÔØ ËÁË"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "óÏÈÒÁÎÉÔØ ËÁÌÅÎÄÁÒØ ËÁË ÞÔÏ-ÎÉÂÕÄØ ÅÝÅ"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "ðÏËÁÚÁÔØ 1 ÄÅÎØ"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "ðÏËÁÚÁÔØ 1 ÍÅÓÑÃ"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "ðÏËÁÚÁÔØ 1 ÎÅÄÅÌÀ"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "ðÏËÁÚÁÔØ ÒÁÂÏÞÕÀ ÎÅÄÅÌÀ"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "óÅÇÏÄÎÑ"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "îÅÄÅÌÑ"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "îÏ×ÙÊ"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "ïÔËÒÙÔØ ËÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "îÁÐÅÞÁÔÁÔØ ÜÔÏÔ ËÁÌÅÎÄÁÒØ"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "óÏÈÒÁÎÉÔØ ËÁË..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "õÄÁÌÉÔØ ÜÔÏÔ ÜÌÅÍÅÎÔ"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "õÄÁÌÉÔØ..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "óÐÒÁ×ËÁ"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "ðÅÞÁÔØ ËÏÎ×ÅÒÔÁ..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "ðÅÞÁÔØ ÜÔÏÇÏ ÜÌÅÍÅÎÔÁ"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "ðÅÞÁÔØ..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "óÏÈÒÁÎÉÔØ ËÁË..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "óÏÈÒÁÎÉÔØ É ÚÁËÒÙÔØ"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "óÏÈÒÁÎÉÔØ ÚÁÄÁÎÉÅ É ÚÁËÒÙÔØ ÏËÎÏ ÄÉÁÌÏÇÁ"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "ðÏÓÌÁÔØ ËÏÎÔÁËÔ ÄÒÕÇÏÍÕ..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "ðÒÏÓÍÏÔÒ ÏÎÌÁÊÎÏ×ÏÊ ÓÐÒÁ×ËÉ"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "ðÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ Ë ËÏÎÔÁËÔÕ..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "æÁÊÌ"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "ðÅÞÁÔØ..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "óÏÈÒÁÎÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "ï ÜÔÏÊ ÐÒÏÇÒÁÍÍÅ"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "äÅÊÓÔ×ÉÑ"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "áÄÒÅÓÎÁÑ ËÎÉÇÁ... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "ïÞÉÓÔÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "÷ÙÒÅÚÁÔØ"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "ðÒÏ×ÅÒÉÔØ ÉÍÅÎÁ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "ïÞÉÓÔÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "ïÞÉÓÔÉÔØ ×ÙÄÅÌÅÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "úÁËÒÙÔØ ÜÔÕ ×ÓÔÒÅÞÕ"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "óËÏÐÉÒÏ×ÁÔØ × ÐÁÐËÕ... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "óËÏÐÉÒÏ×ÁÔØ"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ×ÙÄÅÌÅÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "÷ÙÒÅÚÁÔØ"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "÷ÙÒÅÚÁÔØ ×ÙÄÅÌÅÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "äÁÍÐ XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "äÁÍÐ XML ÏÐÉÓÁÎÉÑ ÉÎÔÅÒÆÅÊÓÁ"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "ðÅÒ×ÙÊ ÜÌÅÍÅÎÔ × ÐÁÐËÅ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "ðÅÒÅÓÌÁÔØ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "ðÅÒÅÓÌÁÔØ ËÁË v_Calendar (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÜÌÅÍÅÎÔÕ"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "ðÅÒÅÊÔÉ Ë ÐÒÅÄÙÄÕÝÅÍÕ ÜÌÅÍÅÎÔÕ"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "îÅÚÁ×ÅÒÛÅÎÎÏÅ ÚÁÄÁÎÉÅ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÆÁÊÌÁ"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "óÌÅÄ."
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "÷ÓÔÁ×ÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "÷ÓÔÁ×ÉÔØ ×ÙÄÅÌÅÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "ðÒÅÄ."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "ðÒÅÄ."
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "ðÒÏÓÍÏÔÒ ÐÅÞÁÔÉ"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "îÁÓÔÒÏÊËÁ ÐÅÞÁÔÉ..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "îÁÓÔÒÏÊËÁ ÓÔÒÁÎÉÃÙ"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "ó×ÏÊÓÔ×Á"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "óÏÈÒÁÎÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "óÏÈÒÁÎÉÔØ ×ÓÔÒÅÞÕ É ÚÁËÒÙÔØ ÏËÎÏ ÄÉÁÌÏÇÁ"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "óÏÈÒÁÎÉÔØ ÔÅËÕÝÉÊ ÆÁÊÌ"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "÷ÓÔÁ×ÉÔØ ×ÓÔÒÅÞÕ × ÒÁÓÐÉÓÁÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "÷ÓÔÁ×ÉÔØ ×ÓÔÒÅÞÕ × ÒÁÓÐÉÓÁÎÉÅ"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "÷ÓÔÁ×ÉÔØ × ÒÁÓÐÉÓÁÎÉÅ ×ÓÔÒÅÞÕ ÎÅËÏÔÏÒÏÇÏ ÔÉÐÁ"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "÷ÙÂÒÁÔØ ×ÓÅ"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "÷ÙÂÒÁÔØ ×ÓÅ"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "îÁÓÔÒÏÊËÉ ÓÔÒÁÎÉÃÙ ÄÌÑ ×ÁÛÅÇÏ ÔÅËÕÝÅÇÏ ÐÒÉÎÔÅÒÁ"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "úÁÐÒÏÓ ÚÁÄÁÎÉÑ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "úÁËÒÙÔØ"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "ëÏÎÔÁËÔ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "óËÏÐÉÒÏ×ÁÔØ"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "ïÔÌÁÄËÁ"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "ðÒÁ×ËÁ"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "óÐÒÁ×ËÁ"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "üÌÅÍÅÎÔ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "öÕÒÎÁÌØÎÁÑ ÚÁÐÉÓØ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "ðÏÓÌÅÄÎÉÊ ÜÌÅÍÅÎÔ × ÐÁÐËÅ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "ðÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÐÁÐËÕ... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "úÁÍÅÔËÁ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "÷ÓÔÁ×ÉÔØ"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "ðÅÞÁÔØ"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "ó×ÏÊÓÔ×Á..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "÷ÙÂÒÁÔØ ×ÓÅ"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "úÁÄÁÎÉÅ (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "îÅÐÒÏÞÉÔÁÎÎÙÊ ÜÌÅÍÅÎÔ (FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "äÏÂÁ×ÉÔØ ÓÅÒ×ÉÓ"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÙÊ ÓÅÒ×ÉÓ Ë Executive Summary"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "õÓÔÁÎÏ×ËÉ Executive Summary"
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "îÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "óÏÚÄÁÔØ"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ × ÎÏ×ÕÀ ÐÁÐËÕ"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "óÏÚÄÁÔØ ÐÒÁ×ÉÌÏ"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "ðÁÐËÁ"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "æÉÌØÔÒ ÐÏ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "æÉÌØÔÒ ÐÏ ÐÏÌÕÞÁÔÅÌÀ"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "úÁÂÙÔØ ÐÁÒÏÌÉ"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "ðÏÌÕÞÉÔØ ÐÏÞÔÕ"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "óËÒÙÔØ ×ÙÄÅÌÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "óËÒÙÔØ ÕÄÁÌÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "óËÒÙÔØ ÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "ðÏÞÔÏ×ÙÅ ÆÉÌØÔÒÙ..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "õÐÒÁ×ÌÅÎÉÅ ÐÏÄÐÉÓËÁÍÉ..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ÐÒÏÞÉÔÁÎÎÏÅ"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ÎÅÐÒÏÞÔÅÎÎÏÅ"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ÓÏÏÂÝÅÎÉÅ × ÎÏ×ÕÀ ÐÁÐËÕ"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "ðÒÏÓÍÏÔÒ ÐÅÞÁÔÁÅÍÙÈ ÓÏÏÂÝÅÎÉÊ"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "ðÒÏÓÍÏÔÒ ÐÅÞÁÔÉ ÓÏÏÂÝÅÎÉÑ..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "òÁÓÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ ÎÁ ÐÒÉÎÔÅÒÅ"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "ðÅÞÁÔØ ÓÏÏÂÝÅÎÉÑ..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "ïÔ×ÅÔÉÔØ ×ÓÅÍ"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "ïÔ×ÅÔÉÔØ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "éÓÔÏÞÎÉË"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "÷ÙÂÒÁÔØ ×ÓÅ"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÞÔÕ ÉÚ ÏÞÅÒÅÄÉ É ÐÏÌÕÞÉÔØ ÎÏ×ÕÀ ÐÏÞÔÕ"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "ðÏËÁÚÁÔØ ×ÓÅ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "óÐÉÓÏË ÐÏÄÛÉÔÙÈ ÓÏÏÂÝÅÎÉÊ"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÏÔÐÒÁ×ÉÔÅÌÀ"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÐÏÌÕÞÁÔÅÌÀ"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "ðÒÏÓÍÏÔÒ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "ðÒÉÍÅÎÉÔØ ÆÉÌØÔÒÙ"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "îÁÓÔÒÏÉÔØ ÐÁÐËÕ..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "óËÏÐÉÒÏ×ÁÔØ × ÐÁÐËÕ..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "ðÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "÷ÙÞÅÒËÎÕÔØ"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "æÉÌØÔÒ ÐÏ ÔÅÍÅ"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "ðÅÒÅÓÌÁÔØ"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "ïÂÒÁÔÉÔØ ×ÙÄÅÌÅÎÉÅ"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "îÁÓÔÒÏÊËÁ ÐÏÞÔÙ..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "óÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÐÁÐËÕ..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "ðÅÞÁÔØ ÓÏÏÂÝÅÎÉÑ"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "óÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÅ ËÁË..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "ðÏÄÛÉÔÙÅ"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "÷ÉÒÔ.ÐÁÐËÁ ÐÏ ÔÅÍÅ"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "òÅÄÁËÔÏÒ ×ÉÒÔÕÁÌØÎÙÈ ÐÁÐÏË..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "ðÒÉÓÏÅÄÉÎÉÔØ"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "úÁËÒÙÔØ ÔÅËÕÝÉÊ ÆÁÊÌ"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "úÁÛÉÆÒÏ×ÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ Ó ÐÏÍÏÝØÀ PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "æÏÒÍÁÔ"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "÷ÓÔÁ×ÉÔØ ÆÁÊÌ ËÁË ÔÅËÓÔ × ÓÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔÏ×ÙÊ ÆÁÊÌ..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "ûÉÆÒÏ×ÁÎÉÅ PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "ðÏÄÐÉÓØ PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "óÏÈÒÁÎÉÔØ ÞÅÒÎÏ×ÉË"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "óÏÈÒÁÎÉÔØ × ÐÁÐËÅ... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "óÏÈÒÁÎÉÔØ × ÐÁÐËÅ..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "óÏÈÒÁÎÉÔØ ÔÅËÕÝÉÊ ÆÁÊÌ ÐÏÄ ÄÒÕÇÉÍ ÉÍÅÎÅÍ"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "óÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÅ × ÕËÁÚÁÎÎÏÊ ÐÁÐËÅ"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "ïÔÐÒÁ×ÉÔØ"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÚÖÅ"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÚÖÅ"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "ïÔÐÒÁ×ÉÔØ ÐÏÞÔÕ × ÆÏÒÍÁÔÅ HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÐÏÚÖÅ"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÓÅÊÞÁÓ"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "ïÔÐÒÁ×ÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÓÅÊÞÁÓ"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "ðÏËÁÚÁÔØ/óËÒÙÔØ ×ÌÏÖÅÎÉÑ"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "ðÏËÁÚÁÔØ ×ÌÏÖÅÎÉÑ"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "ðÏËÁÚÁÔØ ×ÌÏÖÅÎÉÑ"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "ðÏÄÐÉÓÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ Ó ×ÁÛÉÍ PGP-ËÌÀÞÏÍ"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔÏ×ÙÊ ÆÁÊÌ... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "ïÔËÒÙÔØ..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "âÅÚÏÐÁÓÎÏÓÔØ"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "äÏÂÁ×ÉÔØ ÐÁÐËÕ Ë ×ÁÛÅÍÕ ÓÐÉÓËÕ ÐÁÐÏË ÐÏÄÐÉÓÏË"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "ïÂÎÏ×ÉÔØ ÓÐÉÓÏË"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "ïÂÎÏ×ÉÔØ ÓÐÉÓÏË ÐÁÐÏË"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "õÄÁÌÉÔØ ÐÁÐËÕ ÉÚ ×ÁÛÅÇÏ ÓÐÉÓËÁ ÐÁÐÏË ÐÏÄÐÉÓÏË"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "ðÏÄÐÉÓÁÔØÓÑ"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "ïÔËÁÚÁÔØÓÑ"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "îÁÚÎÁÞÉÔØ ÚÁÄÁÎÉÅ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "ðÏ×ÔÏÒÎÙÊ ÐÏÉÓË"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "úÁÐÒÏÓ ×ÓÔÒÅÞÉ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "÷ÏÚ×ÒÁÔ"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "ðÏ×ÔÏÒÉÔØ ÏÔÍÅÎÅÎÎÏÅ ÄÅÊÓÔ×ÉÅ"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "úÁÍÅÎÉÔØ"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "úÁÍÅÎÉÔØ ÓÔÒÏËÕ"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "ïÔ×ÅÔÉÔØ ×ÓÅÍ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "ðÏÓÌÁÔØ ÏÔÞÅÔ Ï ÓÏÓÔÏÑÎÉÉ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "ðÒÏÐÕÓÔÉÔØ ÐÏ×ÔÏÒÙ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "óÏÈÒÁÎÉÔØ ÚÁÄÁÎÉÅ É ÚÁËÒÙÔØ ÏËÎÏ ÄÉÁÌÏÇÁ"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "éÓËÁÔØ ÔÕ ÖÅ ÓÔÒÏËÕ ÅÝÅ ÒÁÚ"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "ðÏÉÓË ÓÔÒÏËÉ"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "ïÔËÁÔ"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "ïÔÍÅÎÉÔØ ÐÏÓÌÅÄÎÅÅ ÄÅÊÓÔ×ÉÅ"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "÷ÓÔÒÅÞÁ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "ðÏÍÅÔÉÔØ ËÁË ×ÙÐÏÌÎÅÎÎÏÅ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "ïÔ×ÅÔÉÔØ (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÏÅ ÚÁÄÁÎÉÅ"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "îÏ×ÙÊ"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "óÏÈÒÁÎÉÔØ ÚÁÄÁÎÉÅ ËÁË ÞÔÏ-ÎÉÂÕÄØ ÅÝÅ"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "îÁÓÔÒÏÊËÉ ÚÁÄÁÎÉÊ..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "úÁËÒÙÔØ ÜÔÏ ÏËÎÏ"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "îÁÓÔÒÏÉÔØ..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "îÁÓÔÒÏÉÔØ"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "îÁÓÔÒÏÉÔØ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ×"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "ðÏËÁÚÁÔØ ÄÒÕÇÕÀ ÐÁÐËÕ"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "÷ÙÈÏÄ"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "óÔÒÏËÁ ÑÒÌÙËÏ× Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "÷ÙÈÏÄ"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "÷ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "ëÒÁÔËÏÅ ÒÕËÏ×ÏÄÓÔ×Ï"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "éÍÐÏÒÔÉÒÏ×ÁÔØ ×Ï ×ÎÅÛÎÉÊ ÆÏÒÍÁÔ ÆÁÊÌÁ"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "çÌÁ×ÎÁÑ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÒÏÇÒÁÍÍÅ Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÐÁÐÏË"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÚÁËÌÁÄÏË"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ ÉÓÐÏÌØÚÕÑ Bug Buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "ðÅÒÅËÌÀÞÉÔØ ÏÔÏÂÒÁÖÅÎÉÅ ÓÔÒÏËÉ ÐÁÐÏË"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "ðÅÒÅËÌÀÞÉÔØ ÏÔÏÂÒÁÖÅÎÉÅ ÓÔÒÏËÉ ÚÁËÌÁÄÏË"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ÄÉÓÐÅÔÞÅÒÁ ËÏÎÔÁËÔÏ×"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ËÁÌÅÎÄÁÒÑ"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏÞÔÙ"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "ðÁÐËÁ"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "ðÅÒÅÊÔÉ Ë ÐÁÐËÅ..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "éÍÐÏÒÔÉÒÏ×ÁÔØ ÆÁÊÌ..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "éÎÄÅËÓ"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "ðÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "õÓÔÁÎÏ×ËÉ"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "úÁÎÑÔ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "÷ÎÅ ÏÆÉÓÁ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "îÅÔ ÉÎÆÏÒÍÁÃÉÉ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "ðÒÉÇÌÁÓÉÔØ ÄÒÕÇÉÈ..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "ðÁÒÁÍÅÔÒÙ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÒÁÂÏÞÉÅ ÞÁÓÙ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÕÍÅÎØÛÅÎÎÙÅ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "ïÂÎÏ×ÉÔØ ó×ÏÂÏÄÅÎ/úÁÎÑÔ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "á×ÔÏ×ÙÂÏÒ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "÷ÓÅ ÌÀÄÉ É ÒÅÓÕÒÓÙ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "÷ÓÅ ÌÀÄÉ É ÏÄÉÎ ÒÅÓÕÒÓ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "ôÒÅÂÕÅÍÙÅ ÌÀÄÉ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "ôÒÅÂÕÅÍÙÅ ÌÀÄÉ É ÏÄÉÎ ÒÅÓÕÒÓ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "÷ÒÅÍÑ ÎÁÞÁÌÁ ÓÏÂÒÁÎÉÑ:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "÷ÒÅÍÑ ÚÁ×ÅÒÛÅÎÉÑ ÓÏÂÒÁÎÉÑ:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "÷ÓÅ ÓÏÐÒÏ×ÏÖÄÅÎÉÅ"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "ð÷óþðó÷"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "óÅÊÞÁÓ"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "éÎÆÏÒÍÁÃÉÑ"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "÷ÏÐÒÏÓ"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "óÏÏÂÝÅÎÉÅ"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "îÅ ÐÏËÁÚÙ×ÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÓÎÏ×Á."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "ðÏÉÓË"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "óÅÒ×ÅÒ ÐÅÒÓÏÎÁÌØÎÙÈ ÁÄÒÅÓÎÙÈ ËÎÉÇ"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-
-#: wombat/wombat.c:153
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ GNOME-VFS"
-
-#: wombat/wombat.c:165
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ GNOME"
-
-#: wombat/wombat.c:178
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ Bonobo"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "îÁÂÏÒ ÐÒÉÌÏÖÅÎÉÊ ÇÒÕÐÐÏ×ÏÊ ÒÁÂÏÔÙ Evolution"
diff --git a/po/sk.po b/po/sk.po
deleted file mode 100644
index 757bc50422..0000000000
--- a/po/sk.po
+++ /dev/null
@@ -1,7956 +0,0 @@
-# evolution Slovak translation.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-02-19 13:32+0100\n"
-"PO-Revision-Date: 2001-02-19 13:33CET\n"
-"Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
-"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.8\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Karta: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Meno: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Predpona:     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Krstné:      "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Ïal¹ie: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Priezvisko:     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Prípona:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Dátum narodenia:"
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresa:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"Po¹tová schránka:"
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Príp:         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Ulica:      "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"   Mesto:  "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Región:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"   PSÈ:  "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Krajina:  "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Dodacie ozn:"
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefóny:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-" Telefón: "
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Po¹t.klient:"
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Èasová zóna:"
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Miesto: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Pozícia: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-" Meno: "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Vlastné:"
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Vlastné2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Vlastné3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Vlastné4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategórie: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Poznámka "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unikátny re»azec:"
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Verejný kµúè:"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Vytváracie rozhranie pre import súborov GnomeCard do Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importuje súbory GnomeCard do Evolution"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Nie je mo¾né inicializova» Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Zakázané"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizova»"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopírova» z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopírova» do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Spoji» z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Spoji» do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Pôvodný autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Spojka pre adresár Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfiguraèný nástroj pre spojku adresára Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Akcia Synchronizova»"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stav spojky"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nie je nastavený ¾iadny pilot, prosím,\n"
-"najprv pou¾ite 'Vlastnosti spojenia Pilota'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nespojený s démonom gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Nastala chyba pri pokuse o získanie\n"
-"zoznamu pilotov od démona gnome-pilot"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Kurzor nie je mo¾né naèíta»\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook nenaèítaný\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Nie je mo¾né spusti» server wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Nie je mo¾né spusti» wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Nie je mo¾né preèíta» blok aplikácie Adresa z pilota"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Nastavenie pre spojku adresára Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Spojka adresára Evolution"
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Prida»"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "_Výroèie:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "Do _práce"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "_Fax do práce"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Kontakty..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegórie..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Editor kontaktov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detaily"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Ulo¾i» ako:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "V¹eobecné"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Nový typ telefónu"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "_Poznámky:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Typy telefónov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "Primárny e-mail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "Chce prijíma» po¹tu ako _HTML"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Adresa WWW stránky:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Prida»"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Adresa..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "Meno _asistenta:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "Dátum na_rodenia:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Práca"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Odstráni»"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "O_ddelenie:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Celé meno..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Domov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "Èinnos»/po_zícia:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "Meno _vedúceho:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "Pre_zývka:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Prac_ovisko:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Povolanie:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "Ma_n¾el(ka):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "_Toto je e-mailová adresa"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Odstráni» kontakt?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Tento kontakt patrí do týchto kategórií:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Asistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Práca"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Práca 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Pracovný fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Spätné volanie"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Domov"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Domov 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Domáci fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
-msgid "Other"
-msgstr "Iné"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Ïal¹í fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Primárny"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Rádio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresa _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Skontrolova» adresu"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Kra_jina:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Fínsko"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresa:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Mesto:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_PO Box:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_©tát/Provincia:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_PSÈ:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Skontrolova» celé meno"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr. "
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Esq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Ml."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Sleèna"
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Pán"
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Pani"
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Sl."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "St."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Krstné:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Priezvisko:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Stredné:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "_Prípona:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Titul:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Ako _minikarty"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Ako _tabuµku"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Zadajte heslo pre %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Nie je mo¾né otvori» adresár"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Neboli sme schopní otvori» tento adresár. To znamená,\n"
-"¾e buï ste zadali nesprávne URI alebo ste sa pokúsili\n"
-"pristúpi» na LDAP server a nemáte zakompilovanú\n"
-"podporu pre LDAP. Ak ste zadali URI, overte, èi je \n"
-"správne. Ak ste neuspeli, potom ste asi chceli pracova»\n"
-"s LDAP serverom. Ak chcete pou¾íva» LDAP, musíte\n"
-"si nain¹talova» OpenLDAP a znovu skompilova» a \n"
-"nain¹talova» Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Zobrazi» v¹etko"
-
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Pokroèilé..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "¥ubovoµné pole obsahuje"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Meno obsahuje"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "E-mail obsahuje"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ktoré zobrazí prehliadaè prieèinku"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Iné kontakty"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Súbor"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Neznámy typ adresára"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "®iadny (anonymný mód)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Heslo"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Neznámy typ overenia"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Sústava"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Podstrom"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Neznámy typ rozsahu"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Pripájacie DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Pomocník pre Bind DN"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Ulo¾i» toto heslo"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Hostiteµ:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Pomocník pre Host"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Pomocník pre Port"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Koreòové DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Pomocník pre Root DN"
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Oblas» hµadania:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Overenie:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
-msgid "Path:"
-msgstr "Cesta:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pomocník pre Path"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Vytvori» cestu, ak e¹te neexistuje."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Upravi» adresár"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Prida» adresár"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Vyberte typ adresára, ktorý máte, a zadajte po¾adované informácie."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
-msgid "Name:"
-msgstr "Meno:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Pomocník pre Name"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Popis:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Pomocník pre Description"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Zdroje adresára"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Odstráni»"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Upravi»"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Meno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Uká¾kový ovládací prvok Bonobo, ktorý zobrazuje adresár."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Prehliadaè minikariet adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Komponent Evolution pre prácu s kontaktami."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Vytváracie rozhranie pre ovládací prvok minikariet adresára."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Vytváracie rozhranie pre komponent adresára Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Vytváracie rozhranie pre uká¾kový ovládací prvok Adresár"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Rozhranie pre výber mena adresára Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Nájs»..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Adresáti správy"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Výber mien"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Vybra» meno z:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Hµada»"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
-msgid "Save as VCard"
-msgstr "Ulo¾i» ako vKartu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* kliknutím pridáte kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organizácia"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "WWW stránka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Oddelenie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Pracovisko"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titul"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Povolanie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Vedúci"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Prezývka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Man¾el(ka)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Poznámka"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Voµno/zaneprázdnený URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Kliknutím pridáte kontakt"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Ulo¾i» do adresára"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"V tomto pohµade nie je èo ukáza»\n"
-"\n"
-"Dvojitým kliknutím vytvoríte nový kontakt."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 bd. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 bd. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Prázdnych strán na konci:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Telo"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Spodný:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Rozmery:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Písmo..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Písma"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Pätièka:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formát"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Hlavièka"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Hlavièka/Pätièka"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Hlavièky"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Hlavièky pre ka¾dý list"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Vý¹ka:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Okam¾ite jeden za druhým"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Vlo¾i»:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Na ¹írku"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "¥avý:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Zálo¾ky písmen na okraji"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Okraje"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "Poèet ståpcov:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Nastavenie"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientácia"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Strana"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Nastavenie stránky:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papier"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Zdroj papiera:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Na vý¹ku"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Náhµad:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Tlaèi» v stupòoch ¹edej"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Opaène na párnych stránkach"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Pravý:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Èasti:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Tieòovanie"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Veµkos»:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Zaèa» na novej stránke"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Meno ¹týlu:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Vrchný:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Typ:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "©írka:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Spojka kalendára Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Nástroj pre nastavenie spojky pre kalendár Evolution.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Chyba pri komunikácii s kalendárovým serverom"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Nie je mo¾né preèíta» blok aplikácie Calendar pilota"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Nastavenie spojky GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Spojka kalendára Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Nastavenie spojky pre todo Evolution."
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Spojka ToDo pre Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Spojka ToDo pre Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Nástroj pre nastavenie spojky pre todo Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Nie je mo¾né preèíta» blok aplikácie ToDo pilota"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Pripomenú» schôdzku o "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Opakova»"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Súbor nenájdený"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Otvori» kalendár"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Ulo¾i» kalendár"
-
-#: calendar/gui/calendar-commands.c:444
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Nie je mo¾né vytvori» kalendárový pohµad. Prosím, overte nastavenie ORBit a "
-"OAF."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Verejný"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Súkromný"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Tajný"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Neznámy"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "J"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "Z"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Priesvitný"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Nepriehµadný"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Dátum musí by» vo formáte:\n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografické miesto musí by» zadané vo formáte:\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Percentuálna hodnota musí by» medzi 0 a¾ 100"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Priorita musí by» medzi 1 a¾ 9"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normálny"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Opakovanie"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Priradené"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Áno"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Nie"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b> Chyba naèítavania kalendára</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b> Chyba naèítavania kalendára</b>Metóda nepodporovaná"
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Zobrazenie"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Zobrazi» schôdzky"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Zobrazi» úlohy"
-
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Naèítavam kalendár"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ktoré bude kalendár zobrazova»"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Poplach o %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Upozornenie na schôdzku o %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Súhrn nie je k dispozícii."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Zavrie»"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Upravi» schôdzku"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Èas opakovania (minúty)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minút"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minút"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12-hodinový (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minút"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 hodín"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minút"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minút"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarm vypr¹í po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Zvukové alarmy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pípnu» pri zobrazení okna alarmu."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Kalendár"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Nastavenie kalendára"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farby"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Zhustené víkendy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Mo¾nosti navigácie dátumov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "©tandard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Mo¾nosti zobrazenia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Termín"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Povoli» opakovanie na"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Koniec dòa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Prvý deò tý¾dòa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "Pia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
-msgid "Friday"
-msgstr "Piatok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Zvýraznenie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Dne¹né termíny"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Dne¹né termíny:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "E¹te pred termínom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "E¹te pred termínom:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "Pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
-msgid "Monday"
-msgstr "Pondelok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Po termíne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Po termíne:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Vyberte farbu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Priorita"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Pripomenú» v¹etky schôdzky"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Pripomenutia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "So"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
-msgid "Saturday"
-msgstr "Sobota"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Ukáza»"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Zobrazi» koncové èasy schôdzok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Zobrazi» èísla tý¾dòov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Zaèiatok dòa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "Ne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
-msgid "Sunday"
-msgstr "Nedeµa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Zoznam úloh"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "©tv"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
-msgid "Thursday"
-msgstr "©tvrtok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Èas do termínu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Rozdelenie èas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Formát èasu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "Ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
-msgid "Tuesday"
-msgstr "Utorok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Vizuálne alarmy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "Str"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
-msgid "Wednesday"
-msgstr "Streda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Pracovný tý¾deò"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minút predtým, ne¾ nastanú."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
-msgid "seconds."
-msgstr "sekúnd."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Naozaj chcete odstráni» schôdzku `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Naozaj chcete odstráni» túto schôdzku bez mena?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Naozaj chcete odstráni» úlohu `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Naozaj chcete odstráni» úlohu bez mena?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Naozaj chcete odstráni» polo¾ku denníka `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Naozaj chcete odstráni» polo¾ku denníka bez mena?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Chcete ulo¾i» zmeny?"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% _Hotových:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Zru¹ený"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Klasifikácia"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Dokonèený"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Dátum a èas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Dátum dokonèenia:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Vysoká"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Prebieha"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Nízka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Nezaèal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "_Súkromné"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Priebeh"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "_Verejné"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "_Poèiatoèný dátum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "_Súhrn:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Úloha"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Nedefinovaný"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Tajné"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontakty..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Termín:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorita:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Stav:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Upravi» úlohu"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
-msgid "No summary"
-msgstr "®iadny súhrn"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
-#, c-format
-msgid "Appointment - %s"
-msgstr "Schôdzka - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
-#, c-format
-msgid "Task - %s"
-msgstr "Úloha - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Polo¾ka denníku - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategórie"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Dátum dokonèenia"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Dátum konca"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Dátum ¹tartu"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografické umiestnenie"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Hotových percent"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Súhrn"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Priesvitnos»"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmy"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Kliknutím pridáte úlohu"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Oznaèi» ako dokonèenú"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Oznaèí úlohu ako dokonèenú"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Upravi» túto úlohu..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Upravi» úlohu"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Odstráni» túto úlohu"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Odstráni» úlohu"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "dopoludnia"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "popoludní"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nová schôdzka..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Naplánova» stretnutie"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Upravi» túto schôdzku..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Odstráni» túto schôdzku"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Nastavi» túto schôdzku ako presunuteµnú"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Odstráni» tento výskyt"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Odstráni» v¹etky výskyty"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Nie je mo¾né aktualizova» vá¹ súbor s kalendárom!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Komponent úspe¹ne aktualizovaný."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Nastala chyba poèas naèítavania súboru s kalendárom."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nie je mo¾né otvori» vá¹ súbor s kalendárom!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nie je mo¾né naèíta» vá¹ súbor s kalendárom!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nie je mo¾né èíta» vá¹ súbor s kalendárom!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Toto je odpoveï od niekoho nepozvaného!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Nie je mo¾né aktualizova» kalendár."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nie je mo¾né odstráni» komponent kalendára!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Komponent úspe¹ne zmazaný."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Nie je mo¾né rozozna» typ komponentu kalendára."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Prida» do kalendára"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Akceptova»"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Odmietnu»"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Predbe¾ný"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Aktualizova» kalendár"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Zru¹i» stretnutie"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--do--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Správa kalendára"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Dátum:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Naèítavam kalendár..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizátor:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Odosielateµ"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Súhrn:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "dátum konca"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "dátum zaèiatku"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Úèastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adresa úèastníka"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Úèastníci:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Zru¹i»\n"
-"stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Predseda"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Pozvánky na stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Nie-úèastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Nepovinný úèastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizátor:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publikova»\n"
-"udalos»"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Po¾adova»\n"
-"stretnutie"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Vy¾adovaný úèastník"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rola"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Naplánova»\n"
-"èas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1167
-msgid "Status"
-msgstr "Stav"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "V¹etky"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Kategória:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nepodarilo sa naèíta» úlohy v `%s'"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metódy potrebná pre naèítanie `%s' nie je podporovaná"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Celodenná udalos»"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Schôdzka"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Základy schôdzky"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Vlastné opakovanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Ka¾dých"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Výnimky"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Zmeni»"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Neopakova»"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
-msgid "Play a sound"
-msgstr "Prehra» zvuk"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Uká¾ka"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Opakovanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pravidlo opakovania"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Pripomenutie"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
-msgid "Run a program"
-msgstr "Spusti» program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
-msgid "Send an email"
-msgstr "Posla» e-mail"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Nastavenie..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
-msgid "Show a dialog"
-msgstr "Zobrazi» dialóg"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Jednoduché opakovanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Èas _konca:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Èas _zaèiatku:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Dátum _zaèiatku:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "pred"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dòa/í"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "koniec schôdzky"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "poèas"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "nav¾dy"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hodín"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minút"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mesiaca/ov"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "zaèiatok schôdzky"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "pokým"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "tý¾dòov"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "rokov"
-
-#: calendar/gui/event-editor.c:369
-msgid "Edit Appointment"
-msgstr "Upravi» schôdzku"
-
-#: calendar/gui/event-editor.c:447
-msgid "on"
-msgstr "zapnutá"
-
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
-msgid "day"
-msgstr "deò"
-
-#: calendar/gui/event-editor.c:599
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:606
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:752
-msgid "occurrences"
-msgstr "výskytov"
-
-#: calendar/gui/event-editor.c:869
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedoká¾e upravi»."
-
-#: calendar/gui/event-editor.c:1521
-#, c-format
-msgid " %d days"
-msgstr " %d dní"
-
-#: calendar/gui/event-editor.c:1523
-msgid " 1 day"
-msgstr " 1 deò"
-
-#: calendar/gui/event-editor.c:1526
-#, c-format
-msgid " %d weeks"
-msgstr " %d tý¾dòov"
-
-#: calendar/gui/event-editor.c:1528
-msgid " 1 week"
-msgstr " 1 tý¾deò"
-
-#: calendar/gui/event-editor.c:1531
-#, c-format
-msgid " %d hours"
-msgstr " %d hodín"
-
-#: calendar/gui/event-editor.c:1533
-msgid " 1 hour"
-msgstr " 1 hodina"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d minutes"
-msgstr " %d minút"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 minute"
-msgstr " 1 minúta"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekúnd"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 second"
-msgstr " 1 sekunda"
-
-#: calendar/gui/event-editor.c:1590
-msgid " before start of appointment"
-msgstr " pred zaèiatkom schôdzky"
-
-#: calendar/gui/event-editor.c:1592
-msgid " after start of appointment"
-msgstr " po zaèiatku schôdzky"
-
-#: calendar/gui/event-editor.c:1600
-msgid " before end of appointment"
-msgstr " pred koncom schôdzky"
-
-#: calendar/gui/event-editor.c:1602
-msgid " after end of appointment"
-msgstr " po konci schôdzky"
-
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Komponent Súhrn kalendára Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Prehliadaè iTip/mTip kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Komponent Evolution pre prácu s kalendárom."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrnu kalendára."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Vytváracie rozhranie pre komponent Kalendár Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Vytváracie rozhranie pre ovládací prvok pohµadu iTip kalendára"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Uká¾kový ovládací prvok Bonobo pre zobrazenie kalendára."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Vytváracie rozhranie pre uká¾kový ovládací prvok Kalendár."
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Nie je mo¾né otvori» prieèinok v `%s'"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Apríl"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "December"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Február"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Prejs» na dátum"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Prejs» na dne¹ný dátum"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Január"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Júl"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Jún"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Marec"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Máj"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Október"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Nie je mo¾né inicializova» GNOME"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Ne"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Po"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Ut"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "St"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "©t"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Pi"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "So"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Úlohy"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Dnes (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Tento tý¾deò (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Tento mesiac (%b - %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Tento rok (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Tlaèi» kalendár"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
-msgid "Print Preview"
-msgstr "Uká¾ka pred tlaèou"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URI, ktoré bude zobrazova» prieèinok úloh"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "NPUS©PS"
-
-#: camel/camel-filter-driver.c:773
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Chyba pri spracovávaní filtra: %s: %s"
-
-#: camel/camel-filter-driver.c:778
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Chyba pri vykonávaní filtra: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Chyba pri vykonávaní hµadania filtra: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nie je mo¾né spracova» hµadací výraz: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Chyba pri vykonávaní hµadacieho výrazu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(odpovedá v¹etkému) vy¾aduje jeden pravdivostný výsledok"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Vykonanie otázky na neznámej hlavièke: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Neplatný typ v body-contains, oèakávam re»azec"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nie je mo¾né vytvori» súbor so zámkom pre %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Vypr¹al èas pri pokuse o získanie zámku na %s. Skúste to neskôr."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nepodarilo sa získa» zámok pomocou fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nepodarilo sa získa» zámok pomocou flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nie je mo¾né skontrolova» súbor s po¹tou %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Nie je mo¾né otvori» súbor s po¹tou %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Nie je mo¾né otvori» doèasný súbor s po¹tou %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nepodarilo sa otestova» súbor so zámkom pre %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Chyba pri èítaní súboru s po¹tou: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Chyba pri zápise po¹ty do doèasného súboru: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nepodarilo sa ulo¾i» po¹tu v doèasnom súbore %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Nie je mo¾né vytvori» rúru: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Nie je mo¾né vykona» fork: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Program movemail zlyhal: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Neznáma chyba)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Nie je mo¾né naèíta» %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Nie je mo¾né naèíta» %s: V module nie je inicializaèný kód."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s slu¾ba pre %s na %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Spojenie zru¹ené"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nie je mo¾né spojenie s %s (port %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(neznámy hostiteµ)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operácia zru¹ená"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' vy¾aduje komponentu pou¾ívateµského mena"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' vy¾aduje komponentu hostiteµa"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' vy¾aduje komponentu cesty"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Hostiteµ %s nenájdený."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Doèasne nie je mo¾né nájs» meno hostiteµa %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Pre protokol `%s' nie je k dispozícii poskytovateµ"
-
-#: camel/camel-session.c:394
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Nie je mo¾né vytvori» prieèinok %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "Re»azec URL `%s' neobsahuje protokol"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "Re»azec URL `%s' obsahuje neplatný protokol"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Èíslo portu v URL `%s' nie je èíslo"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Nie je mo¾né získa» Kerberos ticket:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Neplatná odpoveï na overenie od serveru."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Neoèakávaná odpoveï od IMAP serveru: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP príkaz zlyhal: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Neznáma chyba"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Odpoveï serveru skonèila príli¹ skoro."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Odpoveï IMAP serveru neobsahovala informáciu %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Neoèakávaná odpoveï OK od IMAP serveru: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Nie je mo¾né naèíta» súhrn pre %s"
-
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
-msgid "Could not find message body in FETCH response."
-msgstr "Nie je mo¾né nájs» telo správy v odpovedi FETCH."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Pre èítanie a ukladanie po¹ty na IMAP serveroch."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Táto voµba pripojí na IMAP server pomocou hesiel prená¹aných ako èistý text."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid "This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Táto voµba pripojí na IMAP server pomocou overenia Kerberos 4."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nepodarilo sa overi» na IMAP serveri.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nie je mo¾né vytvori» prieèinok %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Po¹tové prieèinky vo formáte MH"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Pre ukladanie lokálnej po¹ty v po¹tových prieèinkoch typu MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "©tandardný Unixový súbor mailbox"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Pre ukladanie lokálnej po¹ty v ¹tandardnom formáte mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Po¹tové súbory vo formáte Qmail maildir"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Pre ukladanie lokálnej po¹ty v prieèinkov vo formáte qmail"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Koreò ukladania %s nie je absolútna cesta"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Koreò ukladania %s nie je normálny prieèinok"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Nie je mo¾né získa» prieèinok: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Lokálne ukladanie nemá prieèinok pre novú po¹tu"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokálny po¹tový súbor %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Nie je mo¾né premenova» prieèinok %s na %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Nie je mo¾né odstráni» súbor súhrnu prieèinku `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Nie je mo¾né odstráni» indexový súbor prieèinku`%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nie je mo¾né prida» správu do prieèinku maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nie je mo¾né získa» správu: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Taká správa neexistuje"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Neplatný obsah správy"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né otvori» prieèinok `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Prieèinok `%s' neexistuje."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né vytvori» prieèinok `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' nie je prieèinok maildir."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nie je mo¾né odstráni» prieèinok `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "nie je prieèinok maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nie je mo¾né otvori» po¹tovú schránku: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nie je mo¾né prida» správu do súboru mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nie je mo¾né získa» správu: %s z prieèinku %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Prieèinok vyzerá ako nenapraviteµne po¹kodený."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Vytvorenie správy zlyhalo: Po¹kodená po¹tová schránka?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né otvori» súbor `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né vytvori» súbor `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' nie je normálny súbor."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né odstráni» prieèinok `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Prieèinok `%s' nie je prázdny. Neodstránený."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Vytváram súhrn prieèinku"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nie je mo¾né otvori» prieèinok: %s: vytváram súhrn od pozície %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Kritická chyba spracovania správy na pozícii %ld v prieèinku %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Nie je mo¾né vytvori» súhrn: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
-msgid "Synchronising folder"
-msgstr "Synchronizujem prieèinok"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Nie je mo¾né otvori» prieèinok pre vytvorenie súhrnu: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Nie je mo¾né otvori» doèasnú po¹tovú schránku: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Súhrn a prieèinok si neodpovedajú, ani po synchronizácii"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Chyba pri zápise do doèasnej schránky: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Zápis do doèasnej schránky zlyhal: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Nie je mo¾né zatvori» zdrojový prieèinok: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Nie je mo¾né zatvori» doèasný prieèinok: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Nie je mo¾né premenova» prieèinok: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Neznáma chyba: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nie je mo¾né prida» správu do prieèinok mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nie je prieèinok."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosím, zadajte NNTP heslo pre %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Server odmietol pou¾ívateµské meno"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Nepodarilo sa posla» pou¾ívateµské meno na server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Server odmietol pou¾ívateµské meno/heslo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Správa %s nenájdená."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nie je mo¾né získa» zoznam skupín zo serveru."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nie je mo¾né naèíta» súbor so zoznamom skupín pre %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nie je mo¾né ulo¾i» súbor so zoznamom skupín pre %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "Diskusné skupiny USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Toto je prístup k èítaniu a posielaniu do Diskusných skupín USENET."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Nie je mo¾né otvori» prieèinok pre server diskusných skupín: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "Diskusné skupiny USENET pomocou %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Táto mo¾nos» nastaví overenie na NNTP server pomocou poslania hesla ako "
-"èistého textu."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Nie je mo¾né otvori» alebo vytvori» súbor .newsrc pre %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Získavam POP súhrn"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nie je mo¾né otvori» prieèinok: zoznam správ nebol úplný."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "®iadna správa s uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Získavam POP správu %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nie je mo¾né získa» správu zo POP serveru %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Pre spojenie s POP serverami. Protokol POP je mo¾né pou¾i» aj pre získavanie "
-"po¹ty od rôznych poskytovateµov po¹ty pomocou WWW a proprietárnymi po¹tovými "
-"systémami."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Táto voµba vás spojí s POP serverom pomocou hesla preneseného ako èistý "
-"text. To je èasto jediná mo¾nos», ktorú POP servery podporujú."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Táto voµba vás spojí s POP serverom pomocou ¹ifrovaného hesla protokolom "
-"APOP. Nemusí to fungova» pre v¹etkých pou¾ívateµov aj keï server tvrdí, ¾e "
-"tento protokol podporuje."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr "Táto voµba vás spojí s POP serverom pomocou overenia Kerberos 4."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nepodarilo sa overi» na KPOP serveri: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Nie je mo¾né sa spoji» s POP serverom na %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sProsím, zadajte POP3 heslo pre %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nepodarilo sa pripoji» k POP serveru.\n"
-"Chyba pri posielaní pou¾ívateµského mena: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Neznámy)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Nepodarilo sa pripoji» k POP serveru.\n"
-"Po¾adovaný spôsob overenia nie je podporovaný."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Nepodarilo sa pripoji» k POP serveru.\n"
-"Chyba pri posielaní hesla: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Prieèinok `%s' neexistuje."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr "Pre doruèenie po¹ty programom \"sendmail\" na tomto poèítaèi."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nie je mo¾né vytvori» rúru do sendmailu: %s: po¹ta neodoslaná"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nie je mo¾né spusti» sendmail: %s: po¹ta neodoslaná"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Nie je mo¾né posla» správu: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail skonèil so signálom %s: po¹ta neodoslaná."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Nie je mo¾né vykona» %s: po¹ta neodoslaná."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail skonèil so stavom %d: po¹ta neodoslaná."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Prenos po¹ty pomocou programu sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Pre doruèenie po¹ty spojením sa so vzdialeným serverom pomocou SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Syntaktická chyba, príkaz neznámy"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntaktická chyba v parametroch alebo argumentoch"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Príkaz neimplementovaný"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Parameter príkazu neimplementovaný"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Stav systému alebo odpoveï na pomoc"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Správa pomocníka"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Slu¾ba pripravená"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Slu¾ba zatvára prenosový kanál"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Slu¾ba nie je k dispozícii, zatváram prenosový kanál"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Po¾adovaná po¹tová akcia v poriadku, dokonèená"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Pou¾ívateµ nie je lokálny, bude predaná podµa <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Po¾adovaná po¹tová akcia nevykonaná, po¹tová schránka nie je k dispozícii"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Po¾adovaná akcia nevykonaná, po¹tová schránka nie je k dispozícii"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Po¾adovaná akcia zru¹ená: chyba pri spracovaní"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Pou¾ívateµ nie je lokálny, skúste <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Po¾adovaná akcia nevykonaná: nedostatok miesta v systéme"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Po¾adovaná po¹tová akcia preru¹ená: presiahnutá alokácia miesta"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Po¾adovaná akcia nevykonaná: meno po¹tovej schránky nepovolené"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Spusti» vstup po¹ty, konèí <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Prenos zlyhal"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Chyba privítanie od serveru: %s : mo¾no nie kritické"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Overenie nie je vy¾adované"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Táto voµba vás pripojí k SMTP serveru bez overenia. To je asi v poriadku pre "
-"väè¹inu SMTP serverov."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid "This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Táto voµba vás pripojí k SMTP serveru pomocou overenia CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Doruèenie po¹ty SMTP pomocou %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Nie je mo¾né posla» správu: adresa odosielateµa nie je definovaná."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Nie je mo¾né posla» správu: adresa odosielateµa nie je platná."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Nie je mo¾né posla» správu: adresáti nie sú definovaní."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Vypr¹al èas odpovede HELO: %s: nie je kritická"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Chyba odpovede HELO: %s: nie je kritická"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Vypr¹al èas odpovede MAIL FROM: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Chyba odpovede MAIL FROM: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Vypr¹al èas odpovede RCPT TO: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Chyba odpovede RCPT TO: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Vypr¹al èas posielania DATA: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Chyba odpovede DATA: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "Vypr¹al èas posielania DATA: koniec správy: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Chyba odpovede DATA: koniec správy: %s: po¹ta neodoslaná"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Vypr¹al èas odpovede RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Chyba odpovede RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Vypr¹al èas odpovede QUIT: %s: nie je kritická"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Chyba odpovede QUIT: %s: nie je kritická"
-
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "®iadna taká správa: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Poskytovateµ po¹ty pre virtuálny prieèinok"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Pre èítanie po¹ty ako otázky na inú mno¾inu prieèinkov"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtov"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "príloha"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prilo¾i» súbor"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Odstráni»"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Odstráni vybrané polo¾ky zo zoznamu príloh"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Prida» prílohu..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Prilo¾í súbor k správe"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
-msgid "Attachment"
-msgstr "Príloha"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Vlastnosti prílohy"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Meno súboru:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Príloha v texte"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Typ MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Posla» ako:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Od:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Zadajte identitu, pod ktorou chcete túto správu posla»"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Komu:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Zadajte adresátov správy"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
-"adresátov správy."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Predmet:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Zadajte predmet správy"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Nie je mo¾né otvori» súbor s podpisom %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Ulo¾i» ako..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Chyba pri ukladaní súboru: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Chyba pri naèítavaní súboru: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Ukladám zmeny do správy..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Ulo¾i» zmeny do správy..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Chyba pri ukladaní do prieèinku 'Koncepty': %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Táto správa nebola odoslaná.\n"
-"\n"
-"Chcete ulo¾i» zmeny?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Otvori» súbor"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Súbor neexistuje."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Toto nie je normálny súbor."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Súbor existuje, ale nedá sa preèíta»."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Súbor vyzerá ako dostupný, ale open(2) zlyhala."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Súbor je veµmi veµký (viac ako 100K)\n"
-"Naozaj ho chcete vlo¾i»?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Nastala chyba poèas èítania súboru."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Napísa» správu"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Nie je mo¾né vytvori» okno editora správ."
-
-#: composer/evolution-composer.c:359
-msgid "Cannot initialize Evolution's composer."
-msgstr "Nie je mo¾né inicializova» editor správ Evolution."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "karta s adresou"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "informácie o kalendári"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Komponent Evolution pre Súhrn."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrn Evolution."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nie je mo¾né inicializova» komponent Súhrn Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Vybrali ste inú stránku HTML pre pozadie Súhrnu.\n"
-"\n"
-"Pre ¹tandardnú nevypåòajte niè."
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Otvori» %s pomocou ¹tandardnej aplikácie GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Otvori» %s pomocou ¹tandardného prehliadaèa WWW GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Posla» e-mail %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Zmeni» pohµad na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Spusti» %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zavrie» %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Presunú» %s doµava"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Presunú» %s doprava"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Presunú» %s do predchádzajúceho riadku"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Presunú» %s do nasledujúceho riadku"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavenie %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nie je mo¾né otvori» súbor HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Chyba pri èítaní dát:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Súbor nemá miesto pre slu¾by.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Vzhµad"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Pozadie:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Komponent Súhrn nemohol inicializova» Bonobo.\n"
-"Ak bolo zobrazené nejaké varovanie o RootPOA, asi to\n"
-"znamená, ¾e ste prelo¾ili Bonobo s GOAD a nie s OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Vytváracie rozhranie pre súhrn RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Súhrn RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Vytváracie rozhranie pre komponent testovacej slu¾by"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Vytváracie rozhranie pre testovaciu slu¾bu."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testovacia slu¾ba Bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testovacia slu¾ba"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Chyba"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Aktualizova» automaticky"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Aktualizova»"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Aktualizova» ka¾dých"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minút"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "roku"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "rokov"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mesiaca"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mesiacov"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "tý¾dòa"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "tý¾dòov"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dní"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hodiny"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "hodín"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minúty"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekundy"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekúnd"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Aj. Zabudli ste vybra» dátum."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Aj. Vybrali ste neplatný dátum."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Dátum správy bude porovnaný s èasom\n"
-"keï bol spustený filter alebo keï bol\n"
-"otvorený vprieèinok."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s èasom, ktorý tu uvediete."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s èas relatívnym k okam¾iku, keï bol\n"
-"filter spustený. Napr. \"pred tý¾dòom\".."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "aktuálny tento"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "zadaný èas"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "èas relatívny k aktuálnemu èasu"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Porovna» s"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "teraz"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<kliknutím vyberiete dátum>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Prida» pravidlo filtra"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Upravi» pravidlo filtra"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "prijatá"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "odoslaná"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Upravi» filtre"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Potom"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Prida» akciu"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Odstráni» akciu"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Aj, zabudli ste vybra» prieèinok.\n"
-"Prosím, vrá»te sa a zadajte platný prieèinok, kam doruèi» po¹tu."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Vybra» prieèinok"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Zadajte URI prieèinku"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<kliknutím vyberiete prieèinok>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Chyba v regulárnom výraze '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Meno pravidla: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Bez mena"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Ak"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Spusti» akcie"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "ak odpovedajú v¹etky kritériá"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "ak odpovedá niektoré kritérium"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Prida» kritérium"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Odstráni» kritérium"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Odpovedaná"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Dôle¾ité"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Preèítaná"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Upravi» vprieèinky"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Pravidlá filtra"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Prijatá"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odoslaná"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuálne prieèinky"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Zdroje vprieèinkov"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Priradi» farbu"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Priradi» skóre"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Kopírova» do prieèinku"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Dátum prijatia"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Dátum odoslania"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Výraz"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Preda» ïalej na adresu"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Telo správy"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Hlavièka správy"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Správa bola prijatá"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Správa bola odoslaná"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Presunú» do prieèinku"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Adresáti"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Regul. výraz"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
-msgid "Score"
-msgstr "Skóre"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Nastavi» stav"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Zdroj"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "©peciálna hlavièka"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Zastavi» spracovanie"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1168
-msgid "Subject"
-msgstr "Predmet"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nekonèí na"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nezaèína na"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "konèí na"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "je viac ne¾"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "je menej ne¾"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "dòa a po"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "dòa a pred"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "zaèína na"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "bolo po"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "bolo pred"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Prida» pravidlo"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Upravi» pravidlo skóre"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Prida» pravidlo vprieèinku"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Upravi» pravidlo vprieèinku"
-
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:219 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "Odpadky"
-
-#: mail/component-factory.c:305
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Nie je mo¾né inicializova» po¹tový komponent Evolution."
-
-#: mail/component-factory.c:378
-msgid "Cannot register storage with shell"
-msgstr "Nie je mo¾né zaregistrova» sklad u shellu"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Ulo¾i» hµadanie ako vPrieèinok"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Telo alebo predmet obsahuje"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Telo neobsahuje"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Predmet obsahuje"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Telo neobsahuje"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Predmet neobsahuje"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Odosielateµ obsahuje"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Vprieèinok na predmet"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Vprieèinok na odosielateµovi"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Vprieèinok na adresátoch"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filter na predmet"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filter na odosielateµovi"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filter na adresátoch"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filter na konferenciu"
-
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otvori»"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Ulo¾i» ako..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Tlaèi»"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Odpoveda» odosielateµovi"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Odpoveda» v¹etkým"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Posla» ïalej"
-
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Preda» ïalej v tele"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Oznaèi» ako preèítanú"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Oznaèi» ako nepreèítanú"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Presunú» do prieèinku..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Kopírova» do prieèinku..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Obnovi» zmazaný záznam"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Pou¾i» filtre"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Vytvori» pravidlo zo správy"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter na konferenciu (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Komponent Evolution pre prácu s po¹tou."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Po¹tový komponent Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Komponent Súhrn po¹ty Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Komponent zobrazenia po¹tového prieèinku Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Vytváracie rozhranie pre komponent po¹tového prieèinku Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Vytváracie rozhranie pre po¹tový komponent Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrnu po¹ty Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importuje súbory Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importuje súbory mbox do Evolution"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Súèasný formát ukladania:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Formát po¹tová schránky"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nový formát ukladania:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Poznámka: Pri prevode medzi formátmi po¹tových schránok\n"
-"nie je mo¾ná automatická oprava pri zlyhaní (napr. nedostatku\n"
-"miesta na disku). Prosím, pou¾ívajte túto funkciu opatrne."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "®iadna"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (¹tandard)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Správca úètov Evolution"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Jeden alebo viacero va¹ich serverov nie je správne nastavených.\n"
-"Chcete ich aj tak ulo¾i»?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Editor úètov Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Po¹ta pre %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Predmet je %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Po¹ta od %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s konferencia"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Nemáte nastaveného po¹tového klienta.\n"
-"To ale musíte urobi» predtým, ako budete\n"
-"posiela», prijíma» alebo písa» po¹tu.\n"
-"Chcete ho nastavi» teraz?"
-
-#: mail/mail-callbacks.c:134
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Predtým, ako zaènete písa» správu,\n"
-"musíte nastavi» identitu."
-
-#: mail/mail-callbacks.c:146
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Predtým, ako zaènete písa» správu,\n"
-"musíte nastavi» spôsob prenosu.."
-
-#: mail/mail-callbacks.c:190
-msgid "You have not set a mail transport method"
-msgstr "Nemáte nastavený spôsob prenosu po¹ty"
-
-#: mail/mail-callbacks.c:223
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Táto správa nemá predmet.\n"
-"Naozaj ju chcete posla»?"
-
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Musíte nastavi» úèet pred poslaním tejto správy."
-
-#: mail/mail-callbacks.c:310
-msgid "You must specify recipients in order to send this message."
-msgstr "Musíte zada» adresátov pre poslanie tejto správy."
-
-#: mail/mail-callbacks.c:571
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "V %s, %s zapísané:\n"
-
-#: mail/mail-callbacks.c:727
-msgid "Forwarded message:\n"
-msgstr "Predaná správa:\n"
-
-#: mail/mail-callbacks.c:812
-msgid "Move message(s) to"
-msgstr "Presunú» správu do"
-
-#: mail/mail-callbacks.c:814
-msgid "Copy message(s) to"
-msgstr "Kopírova» správu do"
-
-#: mail/mail-callbacks.c:949
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Upravova» mô¾ete iba správy ulo¾ené\n"
-"v prieèinku Koncepty."
-
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Prepísa» súbor?"
-
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Súbor s týmto menom u¾ existuje\n"
-"Prepísa» ho?"
-
-#: mail/mail-callbacks.c:1030
-msgid "Save Message As..."
-msgstr "Ulo¾i» správu ako..."
-
-#: mail/mail-callbacks.c:1032
-msgid "Save Messages As..."
-msgstr "Ulo¾i» správy ako..."
-
-#: mail/mail-callbacks.c:1140
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Chyba pri naèítavaní informácie o filtroch:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1189
-msgid "Print Message"
-msgstr "Tlaèi» správu"
-
-#: mail/mail-callbacks.c:1236
-msgid "Printing of message failed"
-msgstr "Tlaè správy zlyhala"
-
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "Pripájam sa k serveru"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "Pripojenie k serveru"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Úèet"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Informácia o úète"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Správa úètu"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Vlastnosti úètu"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Pokroèilé"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Overenie"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Typ overenia:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Automaticky kontrolova» po¹tu ka¾dých"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Overi» nastavenie"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Blaho¾eláme, nastavenie va¹ej po¹ty je hotové.\n"
-"\n"
-"Teraz mô¾ete zaèa» pou¾íva» Evolution\n"
-"pre posielanie a prijímanie po¹ty. \n"
-"\n"
-"Kliknutím na \"Dokonèi»\" ulo¾íte va¹e nastavenie."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "©tandardné"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Hotovo"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-mailová adresa:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "E-mailová adresa:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Nastavenie po¹ty Evolution"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Celé meno:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Hostiteµ:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identita"
-
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Server pre príjem po¹ty"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Necháva» po¹tu na serveri"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Po¹ta"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Po¹tový úèet"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Configuration"
-msgstr "Nastavenie po¹ty"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Sprievodca pre nastavenie po¹ty"
-
-#: mail/mail-config.glade.h:39
-msgid "Make this my default account"
-msgstr "Pou¾i» ho ako ¹tandardný úèet"
-
-#: mail/mail-config.glade.h:40
-msgid "Mark messages as \"Read\" after:"
-msgstr "Oznaèi» správy ako \"Preèítané\" po:"
-
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Rôzne"
-
-#: mail/mail-config.glade.h:43
-msgid "News"
-msgstr "Diskusné skupiny"
-
-#: mail/mail-config.glade.h:45
-msgid "Optional"
-msgstr "Voliteµné"
-
-#: mail/mail-config.glade.h:46
-msgid "Organization:"
-msgstr "Organizácia:"
-
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Server odosielanej po¹ty"
-
-#: mail/mail-config.glade.h:49
-msgid "Password:"
-msgstr "Heslo:"
-
-#: mail/mail-config.glade.h:51
-msgid "Plain Text"
-msgstr "Èistý text"
-
-#: mail/mail-config.glade.h:52
-msgid "Receiving Email"
-msgstr "Príjem po¹ty"
-
-#: mail/mail-config.glade.h:53
-msgid "Remember my password"
-msgstr "Ulo¾i» heslo"
-
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Odpoveda» komu:"
-
-#: mail/mail-config.glade.h:55
-msgid "Required"
-msgstr "Po¾adované"
-
-#: mail/mail-config.glade.h:57
-msgid "Save password"
-msgstr "Ulo¾i» heslo"
-
-#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Vybra» súbor s podpisom"
-
-#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "Posiela» ¹tandardne ako HTML."
-
-#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Posielanie po¹ty"
-
-#: mail/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Nastavenie serveru"
-
-#: mail/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Typ serveru:"
-
-#: mail/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Server vy¾aduje overenie"
-
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Servery"
-
-#: mail/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Súbor s podpisom:"
-
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: mail/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Zdroje"
-
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Tento server vy¾aduje bezpeèné pripojenie (SSL)"
-
-#: mail/mail-config.glade.h:70
-msgid "Type"
-msgstr "Typ"
-
-#: mail/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Zadajte meno, ktorým chcete tieto servery oznaèova». Napríklad:\"Doma\" "
-"alebo \"Práca\"."
-
-#: mail/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Informácie o pou¾ívateµovi"
-
-#: mail/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Meno pou¾ívateµa:"
-
-#: mail/mail-config.glade.h:75
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Vitajte v Sprievodcovi nastavením po¹ty Evolution.\n"
-"\n"
-"Kliknutím \"Ïal¹í\" zaèneme."
-
-#: mail/mail-config.glade.h:78
-msgid "minutes."
-msgstr "minút."
-
-#: mail/mail-config-druid.c:399
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Nepodarilo sa overi» nastavenie prijímania po¹ty.\n"
-"Mo¾no sa stretnete s problémami pri príjme va¹ej po¹ty z %s"
-
-#: mail/mail-config-druid.c:489
-msgid "Namespace:"
-msgstr "Priestor mien:"
-
-#: mail/mail-config-druid.c:677
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Nepodarilo sa overi» nastavenie odosielania po¹ty.\n"
-"Mo¾no sa stretnete s problémami pri odosielaní va¹ej po¹ty z %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1036
-msgid "Evolution Account Wizard"
-msgstr "Sprievodca úètom Evolution"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Ulo¾i» prílohu"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nie je mo¾né vytvori» doèasný prieèinok: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Ulo¾i» na disk..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Otvori» v %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Zobrazi» v texte"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Externý zobrazovaè"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Zobrazi» v text (pomocou %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Skry»"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s príloha"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Naèítavam obsah správy"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Za¹ifrovaná správa nie je zobrazená"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Za¹ifrovaná správa"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Kliknite na ikonu pre de¹ifrovanie."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Táto správa je digitálne podpísaná a podpis je platný."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Odkaz na FTP server (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Odkaz na lokálny súbor (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Nesprávna èas» externého tela."
-
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "Registrujem lokálny prieèinok"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "Registrova» lokálny prieèinok"
-
-#: mail/mail-local.c:553
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Nepodarilo sa zaregistrova» prieèinok '%s':\n"
-"%s"
-
-#: mail/mail-local.c:717
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Mení prieèinok \"%s\" na formát \"%s\""
-
-#: mail/mail-local.c:721
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Zmeni» prieèinok \"%s\" na formát \"%s\""
-
-#: mail/mail-local.c:752
-msgid "Reconfiguring folder"
-msgstr "Prenastavujem prieèinok"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:781
-msgid "Closing current folder"
-msgstr "Zatváram aktuálny prieèinok"
-
-#: mail/mail-local.c:813
-msgid "Renaming old folder and opening"
-msgstr "Premenovávam starý prieèinok a otváram"
-
-#: mail/mail-local.c:831
-msgid "Creating new folder"
-msgstr "Vytváram nový prieèinok"
-
-#: mail/mail-local.c:845
-msgid "Copying messages"
-msgstr "Kopírujem správy"
-
-#: mail/mail-local.c:866
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Nie je mo¾né ulo¾i» metainformácie do prieèinku, asi zistíte,\n"
-"¾e ho nie je mo¾né ani otvori»: %s"
-
-#: mail/mail-local.c:898
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Ak nemô¾ete otvori» túto po¹tovú schránku, potom\n"
-"ju budete musie» opravi» ruène."
-
-#: mail/mail-mt.c:88
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Chyba poèas '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:90
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Chyba pri vykonávaní operácie:\n"
-"%s"
-
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
-msgid "Working"
-msgstr "Pracujem"
-
-#: mail/mail-ops.c:519
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Posielam \"%s\""
-
-#: mail/mail-ops.c:521
-msgid "Sending message"
-msgstr "Posielam správu"
-
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Pridávam \"%s\""
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Pridávam správu bez predmetu"
-
-#: mail/mail-ops.c:841
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Presúvam správy z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:843
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopírujem správy z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:846
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Presun správ z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopírova» správy z \"%s\" do \"%s\""
-
-#: mail/mail-ops.c:879
-msgid "Moving"
-msgstr "Premiestòujem"
-
-#: mail/mail-ops.c:882
-msgid "Copying"
-msgstr "Kopírujem"
-
-#: mail/mail-ops.c:902
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s správa %d z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:977
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Prechádzam prieèinky v \"%s\""
-
-#: mail/mail-ops.c:1089
-msgid "Forwarded messages"
-msgstr "Správy predané ïalej"
-
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
-#, c-format
-msgid "Opening folder %s"
-msgstr "Otváram prieèinok %s"
-
-#: mail/mail-ops.c:1195
-#, c-format
-msgid "Opening store %s"
-msgstr "Otváram sklad %s"
-
-#: mail/mail-ops.c:1376
-msgid "Expunging folder"
-msgstr "Èistím prieèinok"
-
-#: mail/mail-ops.c:1425
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Získavam správu %s"
-
-#: mail/mail-ops.c:1492
-msgid "Retrieving messages"
-msgstr "Získavam správy"
-
-#: mail/mail-ops.c:1502
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Získavam správu èíslo %d z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "Otváram prieèinok Odpadky pre %s"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Naèítavam %s prieèinok pre %s"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Naèíta» %s prieèinok pre %s"
-
-#: mail/mail-ops.c:1969
-msgid "Saving messages"
-msgstr "Ukladám správy"
-
-#: mail/mail-ops.c:2048
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Nepodarilo sa vytvori» výstupný súbor: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2061
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Ukladám správu %d z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2075
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Chyba pri ukladaní správ do `%s':\n"
-"%s"
-
-#: mail/mail-ops.c:2149
-msgid "Saving attachment"
-msgstr "Ukladám prílohu"
-
-#: mail/mail-ops.c:2164
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Nepodarilo sa vytvori» výstupný súbor: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2192
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Nie je mo¾né zapísa» dáta: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Nájs»"
-
-#: mail/mail-send-recv.c:127
-msgid "Cancelling ..."
-msgstr "Ru¹ím..."
-
-#: mail/mail-send-recv.c:218
-msgid "Send & Receive mail"
-msgstr "Príjem a odoslanie po¹ty"
-
-#: mail/mail-send-recv.c:221
-msgid "Receiving"
-msgstr "Príjímam"
-
-#: mail/mail-send-recv.c:267
-msgid "Updating ..."
-msgstr "Aktualizujem..."
-
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
-msgid "Waiting ..."
-msgstr "Èakám..."
-
-#: mail/mail-send-recv.c:288
-msgid "Sending"
-msgstr "Posielam"
-
-#: mail/mail-send-recv.c:483
-msgid "Cancelled."
-msgstr "Zru¹ené."
-
-#: mail/mail-send-recv.c:487
-msgid "Complete."
-msgstr "Dokonèené."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
-msgid "Incomplete message written on pipe!"
-msgstr "Do rúry zapísaná neúplná správa!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Chyba pri príprave `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Chyba poèas `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Chyba pri èítaní príkazov z rozdeµovacieho vlákna."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Po¹kodená správa z rozdeµovacieho vlákna?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Nie je mo¾né vytvori» dialóg."
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "Pou¾ívateµ zru¹il otázku."
-
-#: mail/mail-tools.c:198
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nie je mo¾né vytvori» doèasnú po¹tovú schránku `%s': %s"
-
-#: mail/mail-tools.c:256
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (predaná správa)"
-
-#: mail/mail-tools.c:266
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (¾iadny predmet)"
-
-#: mail/mail-tools.c:283
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Predaná správa - %s"
-
-#: mail/mail-tools.c:285
-msgid "Forwarded message (no subject)"
-msgstr "Predaná správa (bez predmetu)"
-
-#: mail/mail-tools.c:357
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Nie je mo¾né otvori» miesto `%s':\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "VPrieèinky"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Nový vPrieèinok"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Odpoveda»"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Odpoveda» odosielateµovi tejto správy"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Odpoveda» v¹etkým adresátom tento správy"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Preda» túto správu ïalej"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Tlaèi» vybranú správu"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Odstráni» túto správu"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Nevidené"
-
-#: mail/message-list.c:621
-msgid "Seen"
-msgstr "Videné"
-
-#: mail/message-list.c:624
-msgid "Answered"
-msgstr "Odpovedané"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "Viacero nepreèítaných správ"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Viacero správ"
-
-#: mail/message-list.c:948
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:960 mail/message-list.c:976
-#, c-format
-msgid "%s, et al."
-msgstr "%s, a spol."
-
-#: mail/message-list.c:963 mail/message-list.c:979
-msgid "<unknown>"
-msgstr "<neznámy>"
-
-#: mail/message-list.c:1031
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1038
-msgid "Today %l:%M %p"
-msgstr "Dnes %l:%M %p"
-
-#: mail/message-list.c:1047
-msgid "Yesterday %l:%M %p"
-msgstr "Vèera %l:%M %p"
-
-#: mail/message-list.c:1059
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1067
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:1069
-msgid "%b %d %Y"
-msgstr "%b %d %Y"
-
-#: mail/message-list.c:1167
-msgid "Flagged"
-msgstr "Vyznaèené"
-
-#: mail/message-list.c:1168
-msgid "From"
-msgstr "Od"
-
-#: mail/message-list.c:1168
-msgid "Date"
-msgstr "Dátum"
-
-#: mail/message-list.c:1168
-msgid "Received"
-msgstr "Prijaté"
-
-#: mail/message-list.c:1169
-msgid "To"
-msgstr "Komu"
-
-#: mail/message-list.c:1169
-msgid "Size"
-msgstr "Veµkos»"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosím, zadajte va¹e %s heslo pre %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosím, zadajte va¹e %s heslo"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Program GPG/PGP nie je k dispozícii."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Nezadané heslo."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie je mo¾né vytvori» rúru do GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Neuvedený ¾iadni adresáti"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nie je mo¾né vytvori» doèasný súbor: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Prieèinok"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Ulo¾i»"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Zobrazi» prieèinky zaèínajúce na:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Získavam miesto pre \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Získa» miesto pre \"%s\""
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Prihlasujem si prieèinok \"%s\""
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Odhlasujem sa z prieèinku \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Prihlási» si prieèinok \"%s\""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Odhlási» sa z prieèinku \"%s\""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Meno prieèinku:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Typ prieèinku:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Zadajte, kde vytvori» prieèinok"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:156
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importujem %s\n"
-"Importér nie je pripravený.\n"
-"Èakám 5 sekúnd a skúsim to znovu."
-
-#: shell/importer/importer.c:174 shell/importer/importer.c:201
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importujem %s\n"
-"Importujem polo¾ku %d."
-
-#: shell/importer/importer.c:308
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Pre spracovanie\n"
-"%s\n"
-"nie je k dispozícii importér."
-
-#: shell/importer/importer.c:318
-msgid "Importing"
-msgstr "Importujem"
-
-#: shell/importer/importer.c:326
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importujem %s\n"
-"Zaèínam %s"
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid "Error loading %s"
-msgstr "Chyba pri naèítavaní %s"
-
-#: shell/importer/importer.c:356
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importujem %s\n"
-"Importujem polo¾ku 1."
-
-#: shell/importer/importer.c:427
-msgid "Automatic"
-msgstr "Automaticky"
-
-#: shell/importer/importer.c:477
-msgid "Filename:"
-msgstr "Meno súboru:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:482
-msgid "Select a file"
-msgstr "Vyberte súbor"
-
-#: shell/importer/importer.c:492
-msgid "File type:"
-msgstr "Typ súboru:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:573
-msgid "Import"
-msgstr "Import"
-
-#: shell/importer/importer.c:606
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Vyberte súbor, ktorý chcete importova» do Evolution a jeho typ\n"
-"zo zoznamu.\n"
-"\n"
-"Pou¾ijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
-"ho pokúsi urèi»."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Kliknite na \"Importova\" pre spustenie importu súboru do Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Nástroj Evolution pre import"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Nástroj Evolution pre import"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Vitajte v Nástroji Evolution pre import.\n"
-"Tento sprievodca vám pomô¾e importova»\n"
-"externé súbory do Evolution."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "In¹talácia Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Táto nová verzia Evolution vy¾aduje in¹taláciu dodatoèných súborov\n"
-"do vá¹ho osobného prieèinku Evolution"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Prosím, stlaète \"OK\" pre in¹taláciu súborov, alebo \"Zru¹i»\" pre koniec."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Nepodarilo sa korektne aktualizova» súbory"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Súbory Evolution boli úspe¹ne nain¹talované."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Vyzerá to, ¾e ste Evolution spustili prvýkrát."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Prosím, stlaète \"OK\" pre in¹taláciu súborov Evolution do"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Nie je mo¾né vytvori» prieèinok\n"
-"%s\n"
-"Chyba: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Nie je mo¾né skopírova» súbory do\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Súbor `%s' nie je prieèinok\n"
-"Prosím, presuòte ho, aby mohli\n"
-"by» nain¹talované súbory Evolution."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Prieèinok `%s' existuje, ale nie je\n"
-"to prieèinok Evolution. Prosím, presuòte ho,\n"
-"aby mohli by» nain¹talované súbory Evolution."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Zadaný prieèinok sa nedá vytvori»:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Zadané meno prieèinku nie je platné."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Vytvori» nový prieèinok"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typ vybraného prieèinku nie je platný\n"
-"pre po¾adovanú operáciu."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nová..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Bez mena)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Nedá sa spusti» nástroj pre oznamovanie chýb"
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution je skupina groupwarových aplikácií\n"
-"pre elektronickú po¹tu, kalendár a správu kontaktov\n"
-"v rámci prostredia GNOME."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Prejs» na prieèinku..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Nezobrazený ¾iadny prieèinok)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Prieèinky"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nepodarilo sa vytvori» lokálny sklad -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Aj! Pohµad pre `%s' neoèakávane spadol. :-(\n"
-"To asi znamená, ¾e komponent %s spadol."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Vytvori» novú skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Meno skupiny:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Naozaj chcete odstráni» skupinu\n"
-"`%s' z panelu skratiek?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Neodstraòova»"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Malé ikony"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Zobrazi» skratky ako malé ikony"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Veµké ikony"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Zobrazi» skratky ako veµké ikony"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nová skupina..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Vytvori» novú skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "Odst_ráni» túto skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Odstráni» túto skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Skry» panel skratiek"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Skry» panel skratiek"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Pou¾i»"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Pou¾i» túto skratku"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstráni» túto skratku z panelu skratiek"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Chyba pri ukladaní skratiek."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Pohµad"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Zobrazi» vybraný prieèinok"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Bez mena)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "®iadna chyba"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "V¹eobecná chyba"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Prieèinok s týmto menom u¾ existuje"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Uvedený typ prieèinku nie je platný"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "Chyba V/V"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Nedostatok miesta pre vytvorenie prieèinku"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Uvedený prieèinok nebol nájdený"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Funkcia nie je v tomto sklade implementovaná"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Prístup zamietnutý"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Operácia nepodporovaná"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Uvedený typ nie je podporovaný týmto skladom"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Shell Evolution."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Vitajte.  Vïaka za èas strávený s»ahovaním tejto uká¾ky\n"
-"groupwarového nástroja Evolution.\n"
-"\n"
-"Kedysi dávno sme sa pri vývoji sústreïovali hlavne na pou¾iteµnos»\n"
-"Evolution.  Veµa vývojárov Evolution ho dnes pou¾íva ako\n"
-"hlavný nástroj pre elektronickú po¹tu. Vy mô¾ete tie¾. (Len si\n"
-"nezabudnite urobi» zálohu dát.)\n"
-"\n"
-"Ale zatiaµ èo sme opravili veµa chýb týkajúcich sa stability\n"
-"a bezpeènosti, stále tu zostáva vyhlásenie:  Evolution vám: spadne,\n"
-"stratí v¹etku po¹tu keï to nechcete, odmietne odstráni» správy\n"
-"keï to chcete, nechá be¾a» stratené procesy,\n"
-"zaberie 100% CPU, zatuhne, po¹le po¹tu HTML do náhodných\n"
-"konferencií a zahanbí vás pred va¹imi priateµmi, priateµkami.\n"
-"a spolupracovníkmi. Pou¾ívajte ho len ako je to doporuèené.\n"
-"\n"
-"Dúfame, ¾e vás pote¹ia výsledky na¹ej »a¾kej práce a netrpezlivo\n"
-"èakáme na vá¹ príspevok!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Vïaka\n"
-"Tím Evolution\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Nie je mo¾né inicializova» shell Evolution."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Zakáza»."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Nie je mo¾né inicializova» komponentový systém Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Vytvori» nový kontakt"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Odstráni» kontakt"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Nájs»"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Nájs» kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nový kontakt"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Tlaèi» kontakty"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Zastavi»"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Zastavi» naèítavanie"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Zobrazi» v¹etko"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Zobrazi» v¹etky kontakty"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Nastavenie _adresára..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Tlaèi» kontakty..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_Hµada» kontakty"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Nástroje"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dní"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Zmeni» nastavenie"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lendár"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Nastavenie kalendára..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Vytvori» novú schôdzku"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Vytvori» nový kalendár"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Deò"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Prejs» dozadu"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Prejs» dopredu"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Prejs» na"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Prejs» na zadaný dátum"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Prejs» na aktuálny èas"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mesiac"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nová schôdzka"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Nasl"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Otvori» kalendár"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Pred"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Tlaèi» tento kalendár"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Ulo¾i» ako"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Ulo¾i» kalendár ako nieèo iné"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Zobrazi» jeden deò"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Zobrazi» jeden mesiac"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Zobrazi» jeden tý¾deò"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Zobrazi» pracovný tý¾deò"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Dnes"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Tý¾deò"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nový"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "_Otvori» kalendár"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Tlaèi» tento kalendár"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Ulo¾i» _ako..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Odstráni túto polo¾ku"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Odstráni»..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Pomocník"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Tlaèi» _obálku..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Tlaèi» túto polo¾ku"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Tlaèi»..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Ulo¾i» _ako..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Ulo¾i» a zavrie»"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Ulo¾i» kontakt a zatvori» dialóg"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Posla» kontakt _inému..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Zobrazi» pomocníka"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Posla» _správu kontaktu..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Súbor"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Tlaèi»..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Ulo¾i»"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "O tejto aplikácii"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "O aplikácii..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "A_kcie"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Adresár..."
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Zmaza»"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Vystri_hnú»"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Kontrolova» mená"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Zmaza»"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Zmaza» výber"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Zavrie» túto schôdzku"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopírova» do prieèinku..."
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopírova»"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Skopíruje výber"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Vystrihnú»"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Vystrihne výber"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Vypísa» XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Vypí¹e XML popis rozhrania"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rvá polo¾ka v prieèinku"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Preda» ï_alej"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Posla» ïalej ako v_Kalendár"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Prejs» na nasledujúcu polo¾ku"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Prejs» na predchádzajúcu polo¾ku"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Ne_dokonèená úloha"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Zmeni» vlastnosti súboru"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Nasledujúca"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Vlo¾i»"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Vlo¾í obsah schránky"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Predchádzajúca"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Predchádzajúca"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "U_ká¾ka pred tlaèou"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Nastavenie _tlaèiarne..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Nastavenie tlaèiarne"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Ulo¾i»"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Ulo¾i» schôdzku a zavrie» tento dialóg"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Ulo¾i» aktuálny súbor"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Naplánova» stretnutie"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Naplánova» _stretnutie"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Naplánova» nieèo ako stretnutie"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Vybra» v¹etko"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Vybra» v¹etko"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nastaví stránku pre aktuálnu tlaèiareò"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Po¾iadavka na úlohu"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_O programe..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zavrie»"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopírova»"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Ladi»"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Upravi»"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Polo¾ka"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Polo¾ka _denníka"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Pos_ledná polo¾ka v prieèinku"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Posla» správu"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Pre_sunú» do prieèinka..."
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Poznámka"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Vlo¾i»"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Tlaèi»"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Vlastnosti..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Vybra» _v¹etko"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "Ú_loha"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Nepreèítaná polo¾ka"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Nová slu¾ba"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Pridá novú slu¾bu do Súhrnu"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Vytvorí novú e-mailovú správu"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Nastavenie Súhrnu..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nová správa"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Napísa»"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Napísa» novú správu"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopírova» správu do nového prieèinka"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Vytvori» pravidlo"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "P_rieèinok"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filter na _odosielateµa"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filter na _adresátov"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Zabudnú» _heslá"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Stiahnu» po¹tu"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skry» _vybrané správy"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skry» _odstránené správy"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skry» _preèítané správy"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtre po¹ty..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Správa prihlásení..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Oznaèi» ako _preèítané"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Oznaèi» ako _nepreèítané"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Presunú»"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Presunú» správu do nového prieèinka"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Uká¾ka správy pred tlaèou"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Uká¾ka správy pred tlaèou..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Tlaèi» správu na tlaèiarni"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Tlaèi» správu..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Odpoveda» _v¹etkým"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Odpoveda» _odosielateµovi"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_Zdroj"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Vybra» _v¹etko"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Posla» neodoslanú po¹tu a prija» novú po¹tu"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Ukáza» _v¹etky správy"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Zoznam vlákien"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Vprieèinok na _odosielateµa"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "Vprieèinok na _adresátov"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Zobrazi» èistý kód správy"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Pou¾i» filtre"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Nastavenie prieèinku..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopírova» do prieèinku..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Upravi» správu"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Vyèisti»"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filter na predmet"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "Posla» ï_alej"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obráti» výber"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Nastavenie po¹ty..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Správa"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "Pre_sunú» do prieèinka..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "Otvori» v novom o_kne"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Tlaèi» správu"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Ulo¾i» správu _ako..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Vlákna"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Obnovi» _zmazané"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_vPrieèinok na predmete"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor _virtuálneho prieèinku..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Prilo¾i»"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Zavrie aktuálny súbor"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Za¹ifrova» túto správu pomocou PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "_Formát"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Vlo¾i» súbor ako text do správy"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Vlo¾i» textový súbor...."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Otvorí súbor"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "©ifrovanie PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Podpis PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Ulo¾i» _koncept"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Ulo¾i» v _prieèinku..."
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Ulo¾i» v prieèinku..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Ulo¾í aktuálny súbor pod iným menom"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Ulo¾i» správu do daného prieèinku"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Posla»"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Posla» _neskôr"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Posla» _neskôr"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Posla» správu vo formáte HTML"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Posla» správu neskôr"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Posla» správu hneï"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Posla» túto správu hneï"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Zobrazi» / Skry» prílohy"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Zobrazi» _prílohy"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Zobrazi» prílohy"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Podpísa» túto správu kµúèom PGP"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "Vlo¾i» _textový súbor..."
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Otvori»..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "Za_bezpeèenie"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Prida» prieèinok do zoznamu prihlásených prieèinkov"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Obnovi» zoznam"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Obnovi» zoznam prieèinkov"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstráni» prieèinok zo zoznamu prihlásených prieèinkov"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Prihlási» si"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Odhlási»"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "P_riradi» úlohu"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Hµada» znovu"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Po¾ia_davka na stretnutie"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Opakova»"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Opakova» vrátenú akciu"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Nahradi»"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Nahradi» re»azec"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Odpoveda» _v¹etkým"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Posla» informáciu o _stave"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Pres_koèi» výskyt"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Ulo¾i» úlohu a zavrie» dialóg"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Hµada» znovu rovnaký re»azec"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Nájs» re»azec"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Vráti»"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Vráti spä» poslednú akciu"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "S_chôdzka"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Oznaèi» ako _dokonèenú"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Odpoveï"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Vytvori» novú úlohu"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nový"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Ulo¾i» úlohu ako nieèo iné"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Nastavenie úloh..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "O Evolution..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Zavrie toto okno"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Pri_spôsobi»..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prispôsobi»"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prispôsobi» panely nástrojov"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Zobrazi» iný prieèinok"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Koniec"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "_Skratka pre panel Evolution"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Koniec"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Ukonèí program"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "_Zaèíname"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Importuje externý súbor"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Hlavný panel nástrojov"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Zobrazí informáciu o Evolution"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Ukáza» panel _prieèinkov"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Ukáza» panel _skratiek"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Po¹le správu o chybe"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "_Posla» správu o chybe"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Po¹le správu o chybe pomocou nástroja pre oznamovanie chýb."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Prepne, èi sa má zobrazova» panel prieèinkov"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Prepne, èi sa má zobrazova» panel skratiek"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Pomocou Správcu  ko_ntaktov"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Pomocou _Kalendára"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Pomocou _Po¹ty "
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "O _Evolution..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Prieèinok"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "_Prejs» do prieèinku..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Importova» súbor..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Posla» správu"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Nas_tavenie"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Zaneprázdnený"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Mimo kancelárie"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "®iadna informácia"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Pozva» ostatných..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Nastavenie"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Zobrazi» _iba pracovné hodiny"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Ukáza» z_men¹ené"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Obnovi» voµno/zaneprázdnený"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovýber"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_V¹etky osoby a zdroje"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "V¹etky _osoby a jeden zdroj"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Vy¾adované osoby"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Vy¾adované osoby a _jeden zdroj"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "_Zaèiatok stretnutia:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "_Koniec stretnutia:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "V¹etci úèastníci"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PUS©PSN"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Teraz"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Informácia"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Varovanie"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Otázka"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Správa"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Túto správu u¾ nezobrazova»."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "_Nájs»"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Osobný adresárový server"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Vytváracie rozhranie kalendára pre Osobný kalendárový server."
-
-#: wombat/wombat.c:182
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): Nie je mo¾né inicializova» GNOME"
-
-#: wombat/wombat.c:194
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): Nie je mo¾né inicializova» GNOME"
-
-#: wombat/wombat.c:207
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Nie je mo¾né inicializova» Bonobo"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Sada nástrojov pre pracovné skupiny Evolution"
-
diff --git a/po/sl.po b/po/sl.po
deleted file mode 100644
index 032bf11646..0000000000
--- a/po/sl.po
+++ /dev/null
@@ -1,9303 +0,0 @@
-# Slovenian translation file for Evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Andraz Tori <andraz.tori1@guest.arnes.si> 2000
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-03-01 21:16+0100\n"
-"PO-Revision-Date: 2000-07-28 03:15+0200\n"
-"Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Vizitka: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ime: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Predpona:   "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dano:       "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Dodatno:    "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Dru¾insko:     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Pripona:    "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Datum rojstva: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Naslov:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Po¹tni predal:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Interna:     "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Ulica:       "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Mesto:       "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regija:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Po¹tna ¹tevilka: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Dr¾ava:      "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Dostavna oznaka: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoni:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-naslov:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-naslov:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Po¹tni program: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Èasovni pas: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografski polo¾aj: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Poslovna vloga: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Organizacija: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ime:   "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Enota:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Enota2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Enota3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Enota4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorije: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Enolièen niz:  "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Javni kljuè: "
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Tovarna uvozov datotek GnomeVizitka v Evolucijo."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Uvozi GnomeVizitka datoteke v Evolucijo. "
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Nisem mogel inicializirati Bonoba"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Izkljuèeno"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Uskladi"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiraj iz Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiraj na Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Zlij iz Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Zlij na Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Prvotni avtor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 Fundacija za prosto programje in Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Uskladi dejanje"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stanje veznika"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Noben Pilot ni nastavljen, prosim najprej izberite\n"
-"'Lastnosti povezave s Pilotom' nastavitveni vstavek."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nisem povezaqn z gnome-pilot daemonom"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ob prena¹anju seznama pilotov z gnome-pilot\n"
-"daemona se je zgodila napaka"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Kazalec se ni mogel nalo¾iti\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EKnjiga ni nalo¾ena\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Nisem mogel pognati stre¾nika wombat"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Nisem mogel pognati programa wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Nisem mogel prebrati Pilotovega adresarja"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Nastavi veznik adresarja"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolucijin veznik adresarja "
-
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Dodaj"
-
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
-msgstr "Ob_letnica:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
-msgstr "V sl_u¾bi"
-
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
-msgstr "Slu¾beni _faks"
-
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Stiki..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ka_tegorije..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
-msgstr "Urejevalnik stikov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
-msgstr "Zavedi kot:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "General"
-msgstr "Splo¹no"
-
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
-msgstr "Nov tip telefona"
-
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
-msgstr "Opom_be:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
-msgstr "Tipi telefonov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
-msgstr "®eli dobivati _HTML e-po¹to"
-
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
-msgstr "Naslov spletne strani:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:17
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
-msgstr "_Naslov..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
-msgstr "_Ime pomoènika:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
-msgstr "_Rojstni dan:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
-msgstr "_Slu¾beni"
-
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Podjetje:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
-msgstr "_Zbri¹i"
-
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
-msgstr "O_ddelek:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
-msgstr "_Polno Ime..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
-msgstr "_Doma"
-
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
-msgstr "Slu¾beni _naziv:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
-msgstr "Ime _managerja:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
-msgstr "_Prenosni telefon"
-
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
-msgstr "_Vzdevek:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
-msgstr "Pi_sarna:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
-msgstr "_Poklic:"
-
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
-msgstr "_Partner(ka):"
-
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
-msgstr "_To je po¹tni naslov"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Zbri¹i stik?"
-
-#: addressbook/contact-editor/e-contact-editor.c:574
-msgid "This contact belongs to these categories:"
-msgstr "Stik pripada sledeèim kategorijam:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Pomoènik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Slu¾ba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Slu¾ba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Slu¾beni faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Callback"
-msgstr "Povratni klic"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Avto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Company"
-msgstr "Podjetje"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Doma 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Domaèi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Prenosni telefon"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
-msgid "Other"
-msgstr "Drugo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Other Fax"
-msgstr "Drugi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Prvi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Radio"
-msgstr "Radijo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Naslov _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Preveri naslov"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Dr¾a_va:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finska"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "ZDA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Naslov:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Mesto:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Po¹tni predal:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Dr¾ava/Provinca:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Po¹tna ¹tevilka:"
-
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Preveri polno ime"
-
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
-msgstr "Dr."
-
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
-msgstr "Ssq."
-
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Ml."
-
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Gdè."
-
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "G."
-
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Ga."
-
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ga."
-
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "St."
-
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
-msgstr "_Ime:"
-
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
-msgstr "_Priimek:"
-
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
-msgstr "_Drugo ime:"
-
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
-msgstr "P_ripona:"
-
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
-msgstr "_Naziv:"
-
-#: addressbook/gui/component/addressbook.c:230
-msgid "As _Minicards"
-msgstr "Kot _minivizitke"
-
-#: addressbook/gui/component/addressbook.c:236
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Kot tabelo"
-
-#: addressbook/gui/component/addressbook.c:405
-#, c-format
-msgid "Enter password for %s"
-msgstr "Vpi¹ite geslo za %s"
-
-#: addressbook/gui/component/addressbook.c:433
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
-
-#: addressbook/gui/component/addressbook.c:438
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Adresarja ni bilo mogoèe odpreti. To lahko pomeni ali\n"
-"da ste vnesli napaèen URI, ali pa posku¹ali dostopati \n"
-"do LDAP stre¾nika brez prevedene LDAP podpore. Èe ste \n"
-"vnesli URI, preverite njegovo pravilnost in ga znova \n"
-"vnesite. Èe ne, ste verjetno posku¹ali dostopati do LDAP \n"
-"stre¾nika. Èe ¾elite uporabljalti LDAP morate nalo¾iti in \n"
-"namestiti OpenLDAP in ponovno prevesti in namestiti Evolucijo. \n"
-
-#: addressbook/gui/component/addressbook.c:561
-msgid "Show All"
-msgstr "Ka¾i vse"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Advanced..."
-msgstr "Napredno..."
-
-#: addressbook/gui/component/addressbook.c:593
-msgid "Any field contains"
-msgstr "Katerokoli polje vsebuje"
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Name contains"
-msgstr "Ime vsebuje"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Email contains"
-msgstr "E-naslov vsebuje"
-
-#: addressbook/gui/component/addressbook.c:738
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ki naj ga prika¾e brskalnik map"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP stre¾nik"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Datoteka"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Neznan tip adresarja"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Brez (anonimni naèin)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
-msgid "Password"
-msgstr "Geslo"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Neznan naèin avtentifikacije"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Poddrevo"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Neznan tip dosega"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Povezan z domeno:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
-msgid "Host:"
-msgstr "Gostitelj:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Vrata:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Kornsko ime domene:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Avtentifikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
-msgid "Path:"
-msgstr "Pot:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path help text here"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Èe pot ne obstaja jo ustvari."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Ime:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Opis:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:535
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Zbri¹i"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:521 mail/mail-config.glade.h:24
-msgid "Edit"
-msgstr "Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Vzorèna kontrola Bonobo, ki prika¾e adresar."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrola, ki prika¾e mini vizitko iz Evolucijinega adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution component for handling contacts."
-msgstr "Evolucijina komponenta za urejanje stikov."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Tovarna za orodje mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Evolution addressbook component."
-msgstr "Tovarna za Evolucijino komponento adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the sample Addressbook control"
-msgstr "Tovarna za vzorèno kontrolo adresarja"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Poi¹èi..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Prejemniki sporoèila"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Izberi ime iz:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Iskanje"
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:435
-msgid "Save as VCard"
-msgstr "Shrani kot vVizitko"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Kliknite tu za dodajo stika *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-po¹ta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Spletna stran"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Oddelek"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Pisarna"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Naziv"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Poklic"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Upravljalec"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Vzdevek"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Partner(ka)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Opomba"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "URL zasedenosti"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:599
-msgid "Click here to add a contact"
-msgstr "Kliknite tu za dodajo stika"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Shranite v adresarju"
-
-#: addressbook/gui/widgets/e-minicard-view.c:141
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"V tem pogledu ni predmetov za prikaz\n"
-"\n"
-"Èe ¾elite ustvariti nov stik, dvojno kliknite tu.."
-
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pik Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pik Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Prazni obrazci na koncu:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Telo"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Spodaj:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Mere:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Pisava..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Pisave"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Noga:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Oblika izpisa"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Glava"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Glava/noga"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Zaglavja"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Zaglavja za vsako èrko"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Vi¹ina:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Si sledijo takoj"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Vkljuèi:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Le¾eèe"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Levo:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Uhlji èrk ob strani"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Robovi"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
-msgid "Number of columns:"
-msgstr "©tevilo stolpcev:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Mo¾nosti"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Usmerjenost"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Stran"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Nastavitev strani:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Vir papirja:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Pokonèno"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Predogled:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Tiskaj z uporabo sivinskega senèenja"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Obratno na sodih straneh"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Desno:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sekcije:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Senèenje"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Velikost:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Zaèni na novi strani"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Zgoraj:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
-msgid "Type:"
-msgstr "Tip:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "©irina:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "oznaèba26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolucijin veznik koledarja"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Napaka ob komuniciranju s stre¾nikom koledarja"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Nisem mogel prebrati Pilotovega koledarja"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Nastavi veznik GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Nastavi veznik za-opravit"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolucijin veznik za-opravit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolucijin veznik za-opravit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Podalj¹ek spanja"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "V redu"
-
-#: calendar/gui/calendar-commands.c:233
-msgid "File not found"
-msgstr "Datoteke ni mogoèe najti"
-
-#: calendar/gui/calendar-commands.c:257
-msgid "Open calendar"
-msgstr "Odpri koledar"
-
-#: calendar/gui/calendar-commands.c:299
-msgid "Save calendar"
-msgstr "Shrani koledar"
-
-#: calendar/gui/calendar-commands.c:444
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
-"in OAF-a."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
-msgid "Public"
-msgstr "Javno"
-
-#: calendar/gui/calendar-model.c:379
-msgid "Private"
-msgstr "Osebno"
-
-#: calendar/gui/calendar-model.c:382
-msgid "Confidential"
-msgstr "Zaupno"
-
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1590 calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Neznano"
-
-#: calendar/gui/calendar-model.c:473
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:473
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:475
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:475
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:547
-msgid "Transparent"
-msgstr "Prozorno"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Opaque"
-msgstr "Prosojno"
-
-#: calendar/gui/calendar-model.c:776
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datum mora biti vpisan v obliki: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1025
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Zemljepisna lega mora biti zapisana v obliki: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1065
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost v procentih mora biti med vkljuèno 0 in 100"
-
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteta mora biti med vkljuèno 1 in 9"
-
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Obièajna"
-
-#: calendar/gui/calendar-model.c:1550
-msgid "Recurring"
-msgstr "Ponovi se"
-
-#: calendar/gui/calendar-model.c:1552
-msgid "Assigned"
-msgstr "Doloèena"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/calendar-model.c:1558
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Napaka ob nalaganju koledarja</b>"
-
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
-
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Prikaz"
-
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Ka¾i zmenke"
-
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Ka¾i posle"
-
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Nalagam koledar"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ki naj ga prika¾e brskalnik map"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm na %A %d %b %Y ob %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Obvestilo o va¹em zmenku na %A %d %b %Y ob %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Povzetek ni na voljo."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Zapri"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Èas podalj¹ka spanja (minut)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 urna"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmi preteèejo èez"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Zvoèni alarmi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pozvoni, ko se poka¾ejo okna alarmov."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar"
-msgstr "Koledar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Nastavitve koledarja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Barve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Skrèi vikende"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Mo¾nosti navigatorja datumov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Poka¾i mo¾nosti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Omogoèi podalj¹anje spanja za"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Konec dneva:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Prvi dan tedna:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
-msgstr "pet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
-msgid "Friday"
-msgstr "petek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Osvetli"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Predmeti z dana¹njim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Predmeti z rokom v prihodnosti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
-msgid "Monday"
-msgstr "ponedeljek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Predmeti s prekoraèenim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoraèenim rokom:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Izberi barvo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "Opomni me na vse zmenke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Opozorila"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "sob"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
-msgid "Saturday"
-msgstr "sobota"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Ka¾i"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Ka¾i èase koncev zmenkov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Ka¾i ¹tevilke tednov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Zaèetek dneva:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "ned"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
-msgid "Sunday"
-msgstr "nedeljo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Naloge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "èet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
-msgid "Thursday"
-msgstr "èetrtek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Èas do preteka"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Èasovne delitve:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Oblika izpisa èasa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
-msgid "Tuesday"
-msgstr "torek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "sre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
-msgid "Wednesday"
-msgstr "sreda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Delavni teden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
-msgid "seconds."
-msgstr "sekund."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ste preprièani, da ¾elite zbrisati ta zmenek `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ste preprièani, ¾elite zbrisati ta neimenovan zmenek?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ste preprièani, da ¾elite zbrisati posel `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ste preprièani, da ¾elite zbrisati ta neimenovan posel?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ste preprièani, da ¾elite zbrisati dnevni¹ki vpis `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ste preprièani, da ¾elite izbrisati ta neimenovan dnevni¹ki vpis?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "®elite shraniti spremembe"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% konèa_no:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Uvrstitev"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Konèano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
-msgstr "Datum in ura"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Konèano dne:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Visoka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "V teku"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Nizka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ni prièeto"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vatno"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Napredek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "_Javno"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Datum _prièetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Naloga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Ni definiran"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Zaupno"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Do datuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioriteta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Stanje:"
-
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Uredi nalogo"
-
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
-msgid "No summary"
-msgstr "Ni povzetka"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
-#, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
-
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "kategorije"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Datum zakljuèka"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Datum prièetka"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Zemljepisna lega"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Procentov opravljeno"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Prosojnost"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmi"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Kliknite tu za dodajo opravila"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Oznaèi kot opravljeno"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Oznaèi nalogo kot opravljeno"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Uredi to opravilo..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Uredi opravilo"
-
-#: calendar/gui/e-calendar-table.c:407
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Zbri¹i to nalogo"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Zbri¹i nalogo"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "pop"
-
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nov zmenek..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Naèrtuj sestanek"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Uredi ta zmenek..."
-
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Zbri¹i ta zmenek"
-
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Naredi zmenek prestavljiv"
-
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
-msgstr "Zbri¹i to pojavitev"
-
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
-msgstr "Zbri¹i vse pojavitve"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Nisem mogel posodobiti va¹ege datoteeke koledarja!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Komponenta je bila uspe¹no posodobljena."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Napaka ob nalaganju datoteke koledarja."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nisem mogel odpreti datoteke koledarja!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nisem mogel nalo¾iti va¹ege datoteke koledarja!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nisem mogel prebrati datoteke va¹ega koledarja!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "To je odgovor nekoga, ki ni bil povabljen!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Nisem mogel posodobiti va¹e shrambe koledarja."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nisem mogel zbriati komponente koledarja!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Komponenta uspe¹no zbrisana."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Ne preoznam te vrste komponente koledarja."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Dodaj _koledarju"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Sprejmi"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Zavrni"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Poskusno"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Posodobi koledar"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Preklièi sestanek"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
-msgstr "--za--"
-
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
-msgstr "Sporoèilo koledarja"
-
-#: calendar/gui/e-itip-control.glade.h:5
-msgid "Date:"
-msgstr "Datum:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Nalagam koledar..."
-
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
-msgid "Sender"
-msgstr "Po¹iljatelj"
-
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Povzetek:"
-
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "konèni-datum"
-
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "zaèetni-datum"
-
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Udele¾en"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Naslov udele¾enca"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Udele¾eni:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Preklièi\n"
-"sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Povabila na sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ne-sodelujoèi"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Mo¾ni sodelujoèi"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizator: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Objavi\n"
-"dogodek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Zahtevaj\n"
-"sestanek"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Potrebni udele¾enci"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Vloga"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Naèrtuj\n"
-"èas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
-msgid "Status"
-msgstr "Stanje"
-
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr "Vse"
-
-#: calendar/gui/e-tasks.c:150
-msgid "Category:"
-msgstr "Kategorija:"
-
-#: calendar/gui/e-tasks.c:288
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nisem mogel nalo¾iti poslov v `%s'"
-
-#: calendar/gui/e-tasks.c:300
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Postopek potreben za nalo¾itev `%s' ni podprt"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Celodnevni dogodek"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Zmenek"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Vsak"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Izjeme"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ni ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
-msgid "Play a sound"
-msgstr "Predvajaj zvok"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Predogled"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Opozorilo"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
-msgid "Run a program"
-msgstr "Po¾eni program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
-msgid "Send an email"
-msgstr "Po¹lji e-po¹to"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Settings..."
-msgstr "Nastavitve..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
-msgid "Show a dialog"
-msgstr "Ka¾i dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Èas konca:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Èas prièetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Datum _prièetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
-msgid "before"
-msgstr "pred"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "konec zmenka"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "za"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "vseskozi"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "ur"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "oznaèba21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "minut"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mesec"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "prièetek zmenka"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "do"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "tednov"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "let"
-
-#: calendar/gui/event-editor.c:371
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dan"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "pojavitve"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
-
-#: calendar/gui/event-editor.c:1532
-#, c-format
-msgid " %d days"
-msgstr " %d dni"
-
-#: calendar/gui/event-editor.c:1534
-msgid " 1 day"
-msgstr " 1 dan"
-
-#: calendar/gui/event-editor.c:1537
-#, c-format
-msgid " %d weeks"
-msgstr " %d tedenov"
-
-#: calendar/gui/event-editor.c:1539
-msgid " 1 week"
-msgstr " 1 teden"
-
-#: calendar/gui/event-editor.c:1542
-#, c-format
-msgid " %d hours"
-msgstr " %d ur"
-
-#: calendar/gui/event-editor.c:1544
-msgid " 1 hour"
-msgstr " 1 ura"
-
-#: calendar/gui/event-editor.c:1547
-#, c-format
-msgid " %d minutes"
-msgstr " %d minut"
-
-#: calendar/gui/event-editor.c:1549
-msgid " 1 minute"
-msgstr " 1 minuta"
-
-#: calendar/gui/event-editor.c:1552
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekund"
-
-#: calendar/gui/event-editor.c:1554
-msgid " 1 second"
-msgstr " 1 sekunda"
-
-#: calendar/gui/event-editor.c:1601
-msgid " before start of appointment"
-msgstr " pred prièetkom zmenka"
-
-#: calendar/gui/event-editor.c:1603
-msgid " after start of appointment"
-msgstr " po prièetku zmenka"
-
-#: calendar/gui/event-editor.c:1611
-msgid " before end of appointment"
-msgstr " pred koncem zmenka"
-
-#: calendar/gui/event-editor.c:1613
-msgid " after end of appointment"
-msgstr " po koncu zmenka"
-
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Kontrola Bonobo, ki prika¾e koledar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Komponenta Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Tovarna komponent Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Tvoarna za orodje koledarja iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Vzorèna tovarna za kontrolo koledarja"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Nisem mogel odpreti imenika v `%s'"
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Postopek potreben za nalo¾itev `%s' ni podprt"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "april"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "avgust"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Pojdi na datum"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Pojdi na danes"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "januar"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "julij"
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "junij"
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "marec"
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "maj"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "november"
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "oktober"
-
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "september"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Nisem mogel inicializirati GNOMEa"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "ne"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "po"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "to"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "sr"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "èe"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "pe"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "so"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Naloge"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Trenuten dan (%b %a %d %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %d %b"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Trenutni teden (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Trenutni mesec (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Trenutno leto (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Natisni _koledar"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1237
-msgid "Print Preview"
-msgstr "Predogled tiskanja"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URI mape poslov, ki naj se ka¾e"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "PTSÈPSN"
-
-#: camel/camel-filter-driver.c:790
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Napaka ob razèlenjanju filtra: %s: %s"
-
-#: camel/camel-filter-driver.c:795
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Napaka ob izvajanju filtra: %s: %s"
-
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel razèleniti iskalnega izraza %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Napaka ob izvajanju iskalnega izraza %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) zahteva enojen booleanov rezultat"
-
-#: camel/camel-folder-search.c:551
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Opravljam poizvedbo na neznani glavi: %s"
-
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Neveljaven tip v body-contains, prièakovan niz"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nisem mogel ustvariti kljuèavniène datoteke za %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Ob pridobivanju kljuèavnice na %s je pretekla èasovna omejitev. Poskusite "
-"znova kasneje."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nisem uspel zakleniti s pomoèjo fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nisem uspel zakleniti s pomoèjo flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nisem mogel preverti po¹tne datoteke %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Nisem mogel odpreti po¹tne datoteke %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Nisem mogel odpreti zaèasne po¹tne datoteke %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nisem mogel preveriti kljuèavniène datoteke %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Napaka ob branju po¹tne datoteke: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Napaka ob pisanju v zaèasno po¹tno datoteko: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nisem uspel shraniti po¹te v zaèasno datoteko %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Nisem mogel ustvariti cevi: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Nisem se mogel razvejiti: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Program movemail ni uspel: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Neznana napaka)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Nisem mogel nalo¾iti %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Nisem mogel nalo¾iti %s: V modulu ni inicializacijske kode."
-
-#: camel/camel-remote-store.c:176
-#, c-format
-msgid "%s server %s"
-msgstr "stre¾nik %s %s"
-
-#: camel/camel-remote-store.c:180
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "storitev %s za %s na %s"
-
-#: camel/camel-remote-store.c:306
-msgid "Connection cancelled"
-msgstr "Povezava prekinjena"
-
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
-
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
-msgid "(unknown host)"
-msgstr "(neznan gostitelj)"
-
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operacija razveljavljena"
-
-#: camel/camel-remote-store.c:543
-msgid "Server unexpectedly disconnected"
-msgstr "Povezava s stre¾nikom je bila neprièakovano prekinjena"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
-
-#: camel/camel-service.c:142
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' potrebuje komponento uporabni¹kega imena"
-
-#: camel/camel-service.c:151
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' potrebuje komponento gostitelja"
-
-#: camel/camel-service.c:160
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' potrebuje komponento poti"
-
-#: camel/camel-service.c:512
-#, c-format
-msgid "No such host %s."
-msgstr "Ni tak¹nega gostitelja %s."
-
-#: camel/camel-service.c:515
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
-
-#: camel/camel-session.c:54
-msgid "Virtual folder email provider"
-msgstr "Nuditelj virutalne mape e-po¹te"
-
-#: camel/camel-session.c:56
-msgid "For reading mail as a query of another set of folders"
-msgstr "Za branje po¹te kot poizvedbe po drugem sklopu map"
-
-#: camel/camel-session.c:323
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Noben nuditelj za protokol '%s' ni dostopen"
-
-#: camel/camel-session.c:418
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti imenika %s:\n"
-"%s"
-
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL niz '%s' ne vsebuje protokola"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL niz '%s' vsebuje neveljaven protokol"
-
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "©tevilka vrat v URL '%s' ni numerièna"
-
-#: camel/providers/imap/camel-imap-auth.c:109
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Nisem mogel dobiti Kerberos vstopniice:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:181
-msgid "Bad authentication response from server."
-msgstr "Stre¾nik je sporoèil slab odgovor avtentifikaciji."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Neprièakovan odgovor stre¾nika IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP ukaz ni uspel: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Odgovor stre¾nika se je prehitro konèal."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "odgovor IMAP stre¾nika ni vseboval podatkov %s"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Neprièakovan OK odgovor stre¾nika IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:199
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Nisem mogel nalo¾iti povzetka za %s"
-
-#: camel/providers/imap/camel-imap-folder.c:329
-msgid "Scanning IMAP folder"
-msgstr "Pregledujem mapo IMAP"
-
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
-msgid "Could not find message body in FETCH response."
-msgstr "Nisem mogel najti telesa sporoèila v FETCH odgovoru."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Za branje in hranjenje po¹te na IMAP stre¾nikih."
-
-#: camel/providers/imap/camel-imap-store.c:252
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ta mo¾nost narekuje povezavo s stre¾nikom IMAP z ne¹ifriranim geslom."
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Ta mo¾nost narekuje povezavo s stre¾nikom IMAP s Kerberos 4 avtentifikacijo."
-
-#: camel/providers/imap/camel-imap-store.c:369
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sProsim vpi¹ite IMAP geslo za %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:397
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nisem se mogel avtentificirati na stre¾niku IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:674
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nisem mogel ustvariti imenika %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Po¹tni imeniki tipa MH"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne po¹te v imenikih tipa MH"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Obièajna Unix datoteka po¹tnega predala"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Za shranjevanje krajevne po¹te v datoteki tipa mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Po¹tne datoteke tipa Qmail"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Za shranjevanje krajevne po¹te v imenikih tipa qmail"
-
-#: camel/providers/local/camel-local-store.c:128
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Korenski imenik shrambe %s ni absolutna pot"
-
-#: camel/providers/local/camel-local-store.c:135
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Korenski imenik shrambe %s ni obièajnen imenik"
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:174
-msgid "Local stores do not have an inbox"
-msgstr "Krajevno shrambe nimajo vhodnega predala"
-
-#: camel/providers/local/camel-local-store.c:184
-#, c-format
-msgid "Local mail file %s"
-msgstr "Krajevna datoteka s po¹to %s"
-
-#: camel/providers/local/camel-local-store.c:240
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Nisem mogel preimenovati mape %s v %s: %s"
-
-#: camel/providers/local/camel-local-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:292
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ne morem dodati sporoèila v mapo tipa maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporoèila: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ni tak¹nega sporoèila"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Neveljavna vsebina sporoèila"
-
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti imenika `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Mapa `%s' ne obstaja."
-
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti mape `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:120
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' ni imenik tipa maildir."
-
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nisem mogel zbrisati mape `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:150
-msgid "not a maildir directory"
-msgstr "ni imenik tipa maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ne morem odpreti po¹tnega predala: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ne morem pripeti sporoèila k datoteki tipa mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporoèila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Zdi se, da je mapa po¹kodovana in je ni mogoèe popraviti."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Konstrukcija sporoèila ni uspela: Naj pokvarim po¹tni predal?"
-
-#: camel/providers/local/camel-mbox-store.c:92
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Ne morem odpreti datoteke '%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:108
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti datoteke `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ni obièajna datoteka."
-
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel zbrisati mape `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:151
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Mapa `%s' ni prazna. Ni zbrisana."
-
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
-msgid "Summarising folder"
-msgstr "Delam povzetek mape"
-
-#: camel/providers/local/camel-mbox-summary.c:245
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:287
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Usodna napaka razèlenjevanja po¹te na mestu %ld v mapi %s"
-
-#: camel/providers/local/camel-mbox-summary.c:362
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Ne morem narediti povzetka mape %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
-msgid "Synchronising folder"
-msgstr "Uskljajujem mapo %s"
-
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:515
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Nisem mogel odpreti zaèasnega po¹tnega predala: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
-
-#: camel/providers/local/camel-mbox-summary.c:591
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Napaka ob pisanju v zaèasni po¹tni predal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:608
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Pisanje v zaèasni po¹tni predal ni uspelo: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Nisem mogel zapreti izvorne mape %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:635
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Nisem mogel zapreti zaèasne mape: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:646
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Nisem mogel preimenovati mape: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:870
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Neznana napaka: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ne morem dodati sporoèila v mapo tipa mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:108
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ni imenik."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosim vpi¹ite geslo NNTP za %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Stre¾nik je zavrnil uporabni¹ko ime"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Nisem uspel poslati uporabni¹kega imena stre¾niku"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Stre¾nik je zavrnil uporabni¹ko ime/geslo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Sporoèilo %s ni bilo najdeno."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nisem mogel dobiti seznama skupin s stre¾nika."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nisem mogel nalo¾iti datoteke s seznamom skupin za %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET novièke"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "To je nuditelj za branje in pisanje v USENET novièkarske skupine."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Nisem mogel odpreti imenika za novièkarski stre¾nik: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USNET Novièke preko %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Ta mo¾nost se bo avtentificirala pri stre¾niku NNTP z ne¹ifriranim geslom."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:145
-msgid "Retrieving POP summary"
-msgstr "Prena¹am povzetek POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:188
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nisem mogel odpreti mape: seznam sporoèil je bil nepopoln."
-
-#: camel/providers/pop3/camel-pop3-folder.c:282
-#, c-format
-msgid "No message with uid %s"
-msgstr "Ni sporoèila z uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:286
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Prena¹am sporoèilo POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:304
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nisem uspel prenesti sporoèila s POP stre¾nika %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Za povezovanje s stre¾niki POP. POP protokol se lahko uporabi tudi za "
-"prena¹anje po¹te iz nekaterih spletnih nuditeljev po¹te in zaprtih sistemov "
-"e-po¹te."
-
-#: camel/providers/pop3/camel-pop3-store.c:142
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Ta mo¾nost narekuje povezavo s stre¾nikom POP z ne¹ifriranim geslom. To je v "
-"veèini edina mo¾nost, ki jo stre¾niki POP podpirajo."
-
-#: camel/providers/pop3/camel-pop3-store.c:152
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Ta mo¾nost narekuje povezavo s stre¾nikom POP z uporabo ¹ifriranega gesla "
-"preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
-"za stre¾nike, ki trdijo, da jo podpirajo."
-
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"To se bo povezalo s stre¾nikom POP in uporabilo Kerbos 4 za ustrezno "
-"avtentifikacijo."
-
-#: camel/providers/pop3/camel-pop3-store.c:209
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nisem se mogel avtentificirati do stre¾nika KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:326
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Nisem se mogel povezati s stre¾nikom POP na %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:373
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sProsim vpi¹ite POP3 geslo za %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:392
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nisem se mogel povezati s stre¾nikom POP.\n"
-"Napaka ob po¹iljanju uporabni¹kega imena: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
-msgid "(Unknown)"
-msgstr "(Neznana)"
-
-#: camel/providers/pop3/camel-pop3-store.c:422
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Ne morem se povezati s stre¾nikom POP.\n"
-"Ni podpore za zahtevan avtentifikacijski mehanizm."
-
-#: camel/providers/pop3/camel-pop3-store.c:430
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Nisem se mogel povezati s stre¾nikom POP.\n"
-"Napaka ob po¹iljanju gesla: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Ni tak¹ne mape `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
-msgid "Sendmail"
-msgstr "Program sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Za dostavljanjem po¹te preko programa \"sendmail\" na krajevnem sistemu."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Nisem mogel ustvariti cevi do programa sendmail: %s: po¹ta ni bila poslana"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nisem mogel vejiti programa sendmail: %s: po¹ta ni bila poslana"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Nisem mogel poslati sporoèila: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "program sendmail je zakljuèil s signalom %s: po¹ta ni bila poslana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Nisem mogel izvr¹iti %s: po¹ta ni bila poslana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "program sendmail je zakljuèil s stanjem %d: po¹ta ni bila poslana."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "program sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Dostava po¹te preko programa sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Za dostavo po¹te preko povezave z oddaljenim po¹tnim razdelilcem z uporabo "
-"SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Sintaktièna napaka, ukaz ni prepoznan"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Sintaktièna napaka v parametrih ali argumentih"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Ukaz ni implementiran"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Parameter ukaza ni implementiran"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Stanje sistema ali odgvor na pomoè"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Sporèilo pomoèi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Storitev pripravljena"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Storitev zapira kanal za prenos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Storitev ni na voljo, zapiram kanal za prenos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Zahtevano dejanje v redu, opravljeno"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Zahtevano po¹tno dejanje ni bilo izvedeno: po¹tni predal ni na voljo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Zahtevano dejanje ni bilo izvedeno: po¹tni predal ni na voljo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Zahtevano dejanje preklicano: prekoraèena obremenitev diska"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Zahtevano dejanje ni bilo izvedeno: ime po¹tnega predala ni dovoljeno"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Zaèni z vpisom po¹te; konèaj z <ENTER>.<ENTER>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transakcija ni uspela"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Napaka pri pozdravu: %s: morda ni usodna"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Avtentifikacija ni potrebna"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Ta mo¾nost narekuje povezavo s stre¾nikom SMTP brez uporabe avtentifikacije. "
-"To bi moralo biti v redu za povezavo z veèino stre¾niki SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Ta mo¾nost narekuje povezavo s stre¾nikom SMTP s CRAM-MD5 avtentifikacijo."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "Stre¾nik SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Dostava po¹te s SMTP preko %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Ne morem poslati sporoèila: naslov po¹iljatelja ni naveden."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Ne morem poslati sporoèila: naslov po¹iljatelja ni veljaven."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Ne morem poslati sporoèila: ni naslovnikov."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zahtevek HELO je prekoraèil èasovno omejitev: %s: ni usodno"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-"Zahtevek MAIL FROM je prekoraèil èasovno omejitev: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na MAIL FROM: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-"Zahtevek RCPT TO je prekoraèil èasovno omejitev: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na RCPT TO: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-"Zahtevek DATA je prekoraèil èasovno omejitev: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Napaka v ogovoru na DATA: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Zahtevek DATA je prekoraèil èasovno omejitev: konec sporoèila: %s: po¹ta ni "
-"bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Napaka v ogovoru na DATA: konec sporoèila: %s: po¹ta ni bila poslana"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Zahtevek RSET je prekoraèil èasovno omejitev: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Napaka v odgovoru na RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zahtevek QUIT je prekoraèil èasovno omejitev: %s: ni usodno"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtov"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "priloga"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prilo¾i datoteko"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Odstrani"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Odstrani izbrane predmete iz seznama prilog"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Dodaj prilogo..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Prilo¾i datoteko k sporoèilu"
-
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-msgid "Attachment"
-msgstr "Priloga"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment properties"
-msgstr "Lastnosti priloge"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Ime datoteke:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Priloga kot del sporoèila"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "MIME type:"
-msgstr "Tip MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Po¹lji kot:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Od:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Vnesite identiteto s katero ¾elite poslati to sporoèilo"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporoèila"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporoèila"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vnesite naslove, ki bodo prejeli karbonske kopije sporoèila, a  se ne bodo "
-"pojavili v seznamu prejemnikov sporoèila."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Vnesite zadevo sproèila"
-
-#: composer/e-msg-composer.c:512
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti datoteke s podpisom %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:680
-msgid "Save as..."
-msgstr "Shrani kot..."
-
-#: composer/e-msg-composer.c:691
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Napaka ob shranjevanju datoteke: %s"
-
-#: composer/e-msg-composer.c:711
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Napaka ob nalaganju datoteke %s"
-
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
-msgid "Evolution"
-msgstr "Evolucija"
-
-#: composer/e-msg-composer.c:797
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"To sporoèilo ni bilo poslano.\n"
-"\n"
-"®elite shraniti spremembe?"
-
-#: composer/e-msg-composer.c:822
-msgid "Open file"
-msgstr "Odpri datoteko"
-
-#: composer/e-msg-composer.c:948
-msgid "That file does not exist."
-msgstr "Datoteka ne obstaja."
-
-#: composer/e-msg-composer.c:958
-msgid "That is not a regular file."
-msgstr "To ni obièajna datoteka."
-
-#: composer/e-msg-composer.c:968
-msgid "That file exists but is not readable."
-msgstr "Ta datoteka obstaja a ni berljiva."
-
-#: composer/e-msg-composer.c:978
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Datoteka se je zdela dostopna a open(2) ni uspel."
-
-#: composer/e-msg-composer.c:1000
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Datoteka je zelo velika (èez 100K).\n"
-"Ste preprièani,da jo ¾elite vstaviti?"
-
-#: composer/e-msg-composer.c:1021
-msgid "An error occurred while reading the file."
-msgstr "Ob branju datoteke se je zgodila napaka."
-
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
-msgid "Compose a message"
-msgstr "Sestavi novo sporoèilo"
-
-#: composer/e-msg-composer.c:1580
-msgid "Could not create composer window."
-msgstr "Nisem mogel ustvariti okna skladatelja."
-
-#: composer/evolution-composer.c:352
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Nisem mogel ustvariti okna skladatelja, ker ¹e niste nastavili\n"
-"identitet v komponenti po¹te."
-
-#: composer/evolution-composer.c:367
-msgid "Cannot initialize Evolution's composer."
-msgstr "Ne morem inicializirati Evolucijinega skladatelja."
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "vizitka"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "podatki o kodledarju"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Tovarna za Evolucijine komponente za povzetke."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Za ozadje izvleèka lahko izberete drugaèno HTML stran.\n"
-"\n"
-"Pustite pravno za privzete nastavitve"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Odpri %s s privzetim GNOMEovim programom"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Po¹lji e-po¹to %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Spremeni pogled na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Po¾eni %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zapri %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Premakni %s na levo"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Premakni %s na desno"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Premakni %s v pre¹njo vrstico"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Premakni %s v naslednjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavi %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Videz"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Ozadje:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-"Èe se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
-"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Tovarna za povzetke RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Povzetek RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Tovarna za preizkusno komponento bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Tovarna za preizkusno komponento."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Preizkusi storitev bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Preizkusi storitev"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Napaka"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Samodejno posodobi"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Posodobi sedaj"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Posodobi vsakih"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minut"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "leto"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "let"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "mesec"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "mesecev"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "teden"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "tedenov"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dni"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "ura"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "ur"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuta"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunda"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr " sekund"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Opa. Pozabili ste izbrati datum."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Opa. Izbrali ste neveljaven datum."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Datum tega sporoèila bo primerjan s\n"
-"èasom ob katerem se bo pognal filter\n"
-"ali vmapa odprta."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Datum tega sporoèila bo primerjan s èasom,\n"
-"ki ga navedete tu."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Datum tega sporoèila bo primerjan s èasom\n"
-"relativnim glede na èas zagona filtra;\n"
-".na primer \"teden dni nazaj\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "trenutni èas"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "èas, ki ga navedete"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "èas, relatievn trenutnemu"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Primerjaj z"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "sedaj"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<kliknite tukaj za izbiro datuma>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Filtru dodaj pravilo"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Uredi pravilo filtra"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "dohodna"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "odhodna"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Uredi filtre"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Potem"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Dodaj dejanje"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Odstrani dejanje"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Opa, pozabili ste izbrati mapo.\n"
-"Prosim pojdite nazaj in navedite veljavno mapo kamor naj se po¹ta dostavi."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Izberi mapo"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Vnesite URI mape"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<kliknite tukaj za izbiro mape>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Napaka v regularnem izrazu '%s':\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Preizkus"
-
-#: filter/filter-rule.c:545
-msgid "Rule name: "
-msgstr "Ime pravila: "
-
-#: filter/filter-rule.c:549
-msgid "Untitled"
-msgstr "Neimenovan"
-
-#: filter/filter-rule.c:565
-msgid "If"
-msgstr "Èe"
-
-#: filter/filter-rule.c:582
-msgid "Execute actions"
-msgstr "Izvr¹i dejanja"
-
-#: filter/filter-rule.c:586
-msgid "if all criteria are met"
-msgstr "èe je zado¹èeno vsem pogojem"
-
-#: filter/filter-rule.c:591
-msgid "if any criteria are met"
-msgstr "èe je zado¹èeno kateremukoli pogoju"
-
-#: filter/filter-rule.c:602
-msgid "Add criterion"
-msgstr "Dodaj pogoj"
-
-#: filter/filter-rule.c:608
-msgid "Remove criterion"
-msgstr "Odstrani pogoj"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Odgovorjeno na"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Pomembno"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Beri"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Uredi vMape"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odhodna"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtualne mape"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "Viri vMap"
-
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Odgovorjeno"
-
-#: filter/libfilter-i18n.h:14
-msgid "Assign Colour"
-msgstr "Pripi¹i barvo"
-
-#: filter/libfilter-i18n.h:15
-msgid "Assign Score"
-msgstr "Pripi¹i toèke"
-
-#: filter/libfilter-i18n.h:16
-msgid "Copy to Folder"
-msgstr "Kopiraj v mapo"
-
-#: filter/libfilter-i18n.h:17
-msgid "Date received"
-msgstr "Sprejeto dne"
-
-#: filter/libfilter-i18n.h:18
-msgid "Date sent"
-msgstr "Poslano dne"
-
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Zbrisano"
-
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Osnutek"
-
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "Izraz"
-
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Oznaèeno"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
-
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
-msgstr "Dopisni seznam"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
-msgstr "Jedro sporoèila"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "Glava sporoèila"
-
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "Sporoèilo je bilo sprejeto"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "Sporoèilo je bilo poslano"
-
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "Prestavi v mapo"
-
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "Prejemnik"
-
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
-msgstr "Regularni izraz"
-
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Videno"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
-msgstr "Toèke"
-
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Postavi oznaèbo"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "Nastavi stanje"
-
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
-msgid "Source"
-msgstr "Vir"
-
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
-msgstr "Doloèena glava"
-
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
-msgstr "Prenehaj z obdelavo"
-
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "Zadeva"
-
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "ne vsebuje"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "se ne konèa z"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "se ne zaène z"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "se konèa z"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "je veèje"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "je manj¹e"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "ni"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "ustreza regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "na ali po"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "na ali pred"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "se zaène z"
-
-#: filter/libfilter-i18n.h:158
-msgid "was after"
-msgstr "je bilo po"
-
-#: filter/libfilter-i18n.h:159
-msgid "was before"
-msgstr "je bilo pred"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Dodaj pravilo"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Uredi pravilo toèk"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Dodaj pravilo vMape"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Uredi pravilo vMape"
-
-#: mail/component-factory.c:302
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Ne morem inicializirati Evolucijine komponente za po¹to."
-
-#: mail/component-factory.c:375
-msgid "Cannot register storage with shell"
-msgstr "Ne morem registrirati shrambe z lupino"
-
-#: mail/folder-browser.c:218
-msgid "Store search as vFolder"
-msgstr "Shrani iskanje kot vMapo"
-
-#: mail/folder-browser.c:506
-msgid "VFolder on Subject"
-msgstr "vMapa glede na Zadevo"
-
-#: mail/folder-browser.c:507
-msgid "VFolder on Sender"
-msgstr "vMapa glede na Po¹iljatelja"
-
-#: mail/folder-browser.c:508
-msgid "VFolder on Recipients"
-msgstr "vMapa glede na Prejemnika"
-
-#: mail/folder-browser.c:509 mail/folder-browser.c:627
-msgid "VFolder on Mailing List"
-msgstr "vMapa glede na Po¹tni seznam"
-
-#: mail/folder-browser.c:511
-msgid "Filter on Subject"
-msgstr "Filter glede na Zadevo"
-
-#: mail/folder-browser.c:512
-msgid "Filter on Sender"
-msgstr "Filter glede na Po¹iljatelja"
-
-#: mail/folder-browser.c:513
-msgid "Filter on Recipients"
-msgstr "Filter glede na Prejemnike"
-
-#: mail/folder-browser.c:514 mail/folder-browser.c:626
-msgid "Filter on Mailing List"
-msgstr "Filter glede na Po¹tni seznam"
-
-#: mail/folder-browser.c:520 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Odpri"
-
-#: mail/folder-browser.c:522
-msgid "Save As..."
-msgstr "Shrani kot..."
-
-#: mail/folder-browser.c:523 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Natisni"
-
-#: mail/folder-browser.c:525
-msgid "Reply to Sender"
-msgstr "Odgovori po¹iljatelju"
-
-#: mail/folder-browser.c:526 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Odgovori vsem"
-
-#: mail/folder-browser.c:527 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: mail/folder-browser.c:528 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Posreduj naprej kot del sporoèila"
-
-#: mail/folder-browser.c:530
-msgid "Mark as Read"
-msgstr "Oznaèi kot prebrano"
-
-#: mail/folder-browser.c:531
-msgid "Mark as Unread"
-msgstr "Oznaèi kot neprebrano"
-
-#: mail/folder-browser.c:533
-msgid "Move to Folder..."
-msgstr "Prestavi v mapo..."
-
-#: mail/folder-browser.c:534
-msgid "Copy to Folder..."
-msgstr "Kopiraj v mapo..."
-
-#: mail/folder-browser.c:536
-msgid "Undelete"
-msgstr "Odbri¹i"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:540
-msgid "Apply Filters"
-msgstr "Uveljavi filtre"
-
-#: mail/folder-browser.c:542
-msgid "Create Rule From Message"
-msgstr "Iz sporoèila ustvari pravilo"
-
-#: mail/folder-browser.c:629
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter glede na Po¹tni seznam (%s)"
-
-#: mail/folder-browser.c:630
-msgid "VFolder on Mailing List (%s)"
-msgstr "vMapa glede na Po¹tni seznam (%s)"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolucijina komponenta za obravnavo po¹te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolucijin setavljalnik po¹te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolucijina komponenta za po¹tne mape."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolucijina komponenta za tovarne po¹tnih map."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Tovarna za Evolucijinega skladatelja."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Tovarna za Evolucijino komponento po¹te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Tovarna za komponento povzetka po¹te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Tovarna za uvoz po¹te Outlook Express 4 v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Uvozi mbox daoteke v Evolucijo"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Trenutna oblika hranjenja:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Tip po¹tnega predala"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nova oblika hranjenja:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Opomba: Ob pretvarjanju med razliènimi oblikami po¹tnih predalov\n"
-"napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
-" odpravljiva. Prosimo to mo¾nost uprabljajte pazljivo."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Brez"
-
-#: mail/mail-accounts.c:116
-msgid " (default)"
-msgstr " (privzeto)"
-
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
-msgid "Are you sure you want to delete this account?"
-msgstr "Ste preprièani, da ¾elite zbrisati ta raèun?"
-
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ste preprièani, ¾elite zbrisati ta novièarski raèun?"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
-msgid "Evolution Account Manager"
-msgstr "Upravljalnik Evolucijinih raèunov"
-
-#: mail/mail-account-editor.c:290
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Eden ali veè stre¾nikov ni pravilno nastavljenih.\n"
-"Vseeno shrani?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
-msgid "Evolution Account Editor"
-msgstr "Urejevalnik Evolucijinih raèunov"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Po¹ta za %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Zadeva je %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Po¹ta od %s"
-
-#: mail/mail-autofilter.c:284
-#, c-format
-msgid "%s mailing list"
-msgstr "%s po¹tnih seznamov"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Niste nastavili va¹ega odjemalca po¹te.\n"
-"To morate storiti preden lahko po¹iljate,\n"
-"ali skladate po¹to.\n"
-"Bi ga ¾eleli nastaviti sedaj?"
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Nastaviti morate sovjo identiteto\n"
-"preden lahko skladate po¹to."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Nastaviti morate naèin prenosa po¹te\n"
-"preden lahko skladate po¹to."
-
-#: mail/mail-callbacks.c:192
-msgid "You have not set a mail transport method"
-msgstr "Niste nastavili postopka prena¹anja po¹te"
-
-#: mail/mail-callbacks.c:225
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"To poroèilo nima 'zadeve'.\n"
-"Resnièno po¹lji?"
-
-#: mail/mail-callbacks.c:292
-msgid "You must configure an account before you can send this email."
-msgstr "Nastaviti morate raèun preden lahko po¹ljete to e-po¹to."
-
-#: mail/mail-callbacks.c:314
-msgid "You must specify recipients in order to send this message."
-msgstr "Navesti morate naslovnike, èe ¾eliti poslati sporoèilo."
-
-#: mail/mail-callbacks.c:577
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Na %s, je %s zapisal:\n"
-
-#: mail/mail-callbacks.c:735
-msgid "Forwarded message:\n"
-msgstr "Posredovano sporoèilo:\n"
-
-#: mail/mail-callbacks.c:820
-msgid "Move message(s) to"
-msgstr "Prestavi sporoèilo(a) v"
-
-#: mail/mail-callbacks.c:822
-msgid "Copy message(s) to"
-msgstr "Kopiraj sporoèilo(a) v"
-
-#: mail/mail-callbacks.c:957
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Urejate lahko le sporoèila shranjena\n"
-"v mapi Osnutki."
-
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Prepi¹i datoteko?"
-
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Mapa z enakim imenom ¾e obstaja.\n"
-"Naj jo prepi¹em?"
-
-#: mail/mail-callbacks.c:1038
-msgid "Save Message As..."
-msgstr "Shrani sporoèilo kot..."
-
-#: mail/mail-callbacks.c:1040
-msgid "Save Messages As..."
-msgstr "Shrani sporoèila kot..."
-
-#: mail/mail-callbacks.c:1148
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Napaka ob nalaganju podatkov o filtrih:\n"
-"%s"
-
-#: mail/mail-callbacks.c:1197
-msgid "Print Message"
-msgstr "Natisni sporoèilo"
-
-#: mail/mail-callbacks.c:1244
-msgid "Printing of message failed"
-msgstr "Tiskanje sporoèila ni uspelo"
-
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Raèun"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Podatki o raèunu"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Upravljanje z raèunom"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Lastnosti raèuna"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Napredno"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Avtentifikacija"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Naèin avtentifikacije:"
-
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
-msgstr "Samodejno preveri po¹to vsakih"
-
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
-msgstr "Preveri nastavitve"
-
-#: mail/mail-config.glade.h:13
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Èestitke, nastavljanje va¹e po¹te je konèano.\n"
-"\n"
-"Sedaj ste pripravljeni na sprejemanje in po¹iljanje po¹te \n"
-"s pomoèjo Evolucije. \n"
-"\n"
-"Kliknite \"Konèaj\" za shranitev va¹ih nastavitev."
-
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Privzeto"
-
-#: mail/mail-config.glade.h:22
-msgid "Done"
-msgstr "Opravljeno"
-
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-po¹tni naslov:"
-
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
-msgstr "E-po¹tni naslov:"
-
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "Nastavitev Evolucijine po¹te"
-
-#: mail/mail-config.glade.h:27
-msgid "Full Name:"
-msgstr "Polno ime:"
-
-#: mail/mail-config.glade.h:30
-msgid "Hostname:"
-msgstr "Ime gostitelja:"
-
-#: mail/mail-config.glade.h:31
-msgid "Identity"
-msgstr "Identiteta"
-
-#: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Vkljuèuj v operacije \"Dobi po¹to\"."
-
-#: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Stre¾nik dohodne po¹te"
-
-#: mail/mail-config.glade.h:34
-msgid "Keep mail on server"
-msgstr "Ohrani po¹to na stre¾niku"
-
-#: mail/mail-config.glade.h:35
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail"
-msgstr "Po¹ta"
-
-#: mail/mail-config.glade.h:37
-msgid "Mail Account"
-msgstr "Po¹tni raèun"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration"
-msgstr "Nastavitev po¹te"
-
-#: mail/mail-config.glade.h:39
-msgid "Mail Configuration Druid"
-msgstr "Druid za nastavitev po¹te"
-
-#: mail/mail-config.glade.h:40
-msgid "Make this my default account"
-msgstr "Naj bo to moj privzet raèun"
-
-#: mail/mail-config.glade.h:41
-msgid "Mark messages as \"Read\" after:"
-msgstr "Oznaèi sporoèila kot \"Prebrana\" po:"
-
-#: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Razno"
-
-#: mail/mail-config.glade.h:44
-msgid "News"
-msgstr "Novice"
-
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr "Dodatno"
-
-#: mail/mail-config.glade.h:47
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Stre¾nik odhodne po¹te"
-
-#: mail/mail-config.glade.h:50
-msgid "PGP binary path:"
-msgstr "Pot do izvr¹ljive datoteke PGP"
-
-#: mail/mail-config.glade.h:51
-msgid "Password:"
-msgstr "Geslo:"
-
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
-msgstr "Ne¹ifrirano"
-
-#: mail/mail-config.glade.h:54
-msgid "Receiving Email"
-msgstr "Sprejemanje e-po¹te"
-
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "Zapomni si geslo"
-
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#: mail/mail-config.glade.h:57
-msgid "Required"
-msgstr "Potrebno"
-
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Shrani geslo"
-
-#: mail/mail-config.glade.h:60
-msgid "Select PGP binary"
-msgstr "Izberi datoteko PGP"
-
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "Izberi datoteko s podpisom"
-
-#: mail/mail-config.glade.h:62
-msgid "Send mail in HTML format by default."
-msgstr "Privzeto po¹lji po¹to v HTML obliki."
-
-#: mail/mail-config.glade.h:63
-msgid "Sending Email"
-msgstr "Po¹iljam e-po¹to"
-
-#: mail/mail-config.glade.h:65
-msgid "Server Configuration"
-msgstr "Nastavitev stre¾nika"
-
-#: mail/mail-config.glade.h:66
-msgid "Server Type: "
-msgstr "Vrsta stre¾nika:"
-
-#: mail/mail-config.glade.h:67
-msgid "Server requires authentication"
-msgstr "Stre¾nik zahteva avtentifikacijo"
-
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Stre¾niki"
-
-#: mail/mail-config.glade.h:69
-msgid "Signature file:"
-msgstr "Datoteka s podpisom:"
-
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: mail/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Viri"
-
-#: mail/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Ta stre¾nik zahteva varno povezavo (SSL)"
-
-#: mail/mail-config.glade.h:74
-msgid "Transport"
-msgstr "Prenos"
-
-#: mail/mail-config.glade.h:75
-msgid "Type"
-msgstr "Vrsta"
-
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Vpi¹ite ime s katerimi ¾elite nazivati te stre¾nike. Na primer:\"slu¾beni\" "
-"ali \"domaèi\"."
-
-#: mail/mail-config.glade.h:78
-msgid "User Information"
-msgstr "Podatki o uporabniku"
-
-#: mail/mail-config.glade.h:79
-msgid "Username:"
-msgstr "Uporabni¹ko ime:"
-
-#: mail/mail-config.glade.h:80
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"Dobrodo¹li v Evolucijinem druidu za nastavitev po¹te.\n"
-"\n"
-"Kliknite \"Naprej\" za zaèetek. "
-
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "minut."
-
-#: mail/mail-config-druid.c:401
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Nisem uspel preveriti nastavitve dohodne po¹te.\n"
-"Morda boste naleteli na probleme ob dobivanju po¹te z %s"
-
-#: mail/mail-config-druid.c:495
-msgid "Namespace:"
-msgstr "Imenski prostor:"
-
-#: mail/mail-config-druid.c:683
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Nisem uspel preveriti nastavitve odhodne po¹te.\n"
-"Morda boste naleteli na probleme ob po¹iljanju po¹te preko %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1042
-msgid "Evolution Account Wizard"
-msgstr "Evolucijin èarovnik za raèune"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Shrani prilogo"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nisem mogel ustvariti zaèasnega imenika: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Shrani na disk..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Odpri v %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Poglej vsebino"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "zunanjem pregledovalniku"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Poglej vsebino (z %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Skrij"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s priloga"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Nalagam vsebino sporoèila"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "©ifrirano sporoèilo ni prikazano"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "©ifrirano sporoèilo"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Kliknite ikono za de¹ifriranje."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "To sporoèilo ima elektronski podpis in je ugotovljeno za avtentièno."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"To sporoèilo ima elektronski podpis, a se ne, da dokazati da je avtentièno."
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Kazalec na FTP povezavo (%s)"
-
-#: mail/mail-format.c:1639
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Kazalec na krajevno datoteko (%s) veljaven na stre¾niku \"%s\""
-
-#: mail/mail-format.c:1643
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Kazalec na lokalno datoteko (%s)"
-
-#: mail/mail-format.c:1677
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
-
-#: mail/mail-format.c:1682
-msgid "Malformed external-body part."
-msgstr "Napaèno oblikovano dodatno telo sporoèila."
-
-#: mail/mail-local.c:456
-msgid "Opening '%s'"
-msgstr "Odpiram '%s'"
-
-#: mail/mail-local.c:738
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
-
-#: mail/mail-local.c:742
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
-
-#: mail/mail-local.c:766
-msgid "Reconfiguring folder"
-msgstr "Prenastavljam mapo"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:795
-msgid "Closing current folder"
-msgstr "Zapiram trenutno mapo"
-
-#: mail/mail-local.c:827
-msgid "Renaming old folder and opening"
-msgstr "Preimenujem in odpiram staro mapo"
-
-#: mail/mail-local.c:845
-msgid "Creating new folder"
-msgstr "Ustvari novo mapo"
-
-#: mail/mail-local.c:859
-msgid "Copying messages"
-msgstr "Kopiram sporoèilo"
-
-#: mail/mail-local.c:880
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Nisem mogel shraniti meta podatkov mape; verjetno ne boste veè mogli odpreti "
-"te mape: %s"
-
-#: mail/mail-local.c:919
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Èe ne morete veè odpreti tega po¹tnega predala, potem\n"
-"ga boste morda morali popraviti roèno."
-
-#: mail/mail-mt.c:177
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Napaka ob '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:179
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Napaka ob opravljanju dejanja:\n"
-"%s"
-
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:789
-msgid "Working"
-msgstr "Delam"
-
-#: mail/mail-mt.c:771
-msgid "Evolution progress"
-msgstr "Napredek evolucije"
-
-#: mail/mail-ops.c:516
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Po¹iljam \"%s\""
-
-#: mail/mail-ops.c:518
-msgid "Sending message"
-msgstr "Po¹iljam sporoèilo"
-
-#: mail/mail-ops.c:744
-msgid "Saving message to folder"
-msgstr "Shranjujem sporoèilo v mapo"
-
-#: mail/mail-ops.c:817
-msgid "Moving messages to %s"
-msgstr "Prestavljam sporoèila v %s"
-
-#: mail/mail-ops.c:817
-msgid "Copying messages to %s"
-msgstr "Kopiram sporoèia v %s"
-
-#: mail/mail-ops.c:834
-msgid "Moving"
-msgstr "Prestavljam"
-
-#: mail/mail-ops.c:837
-msgid "Copying"
-msgstr "Kopiram"
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s sporoèilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Osve¾ujem mape v \"%s\""
-
-#: mail/mail-ops.c:1068
-msgid "Forwarded messages"
-msgstr "Posredovana sporoèila"
-
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
-#, c-format
-msgid "Opening folder %s"
-msgstr "Odpiram mapo %s"
-
-#: mail/mail-ops.c:1176
-#, c-format
-msgid "Opening store %s"
-msgstr "Odpiram shrambo %s"
-
-#: mail/mail-ops.c:1363
-msgid "Expunging folder"
-msgstr "Unièujem mapo"
-
-#: mail/mail-ops.c:1412
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Prena¹am sporoèilo %s"
-
-#: mail/mail-ops.c:1479
-msgid "Retrieving messages"
-msgstr "Prena¹am sporoèilo"
-
-#: mail/mail-ops.c:1489
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Prena¹am sporoèilo ¹tevilka %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1563
-msgid "Saving messages"
-msgstr "Shranjujem sporoèila"
-
-#: mail/mail-ops.c:1642
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Nisem mogel ustvariti izhodne datoteke: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1655
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Shranjujem sporoèilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1669
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Napaka ob shranjevanju sporoèil v: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1743
-msgid "Saving attachment"
-msgstr "Shranjujem prilogo"
-
-#: mail/mail-ops.c:1758
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Nisem mogel ustvariti izhodne datoteke: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:1786
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Nisem model pisati podatkov: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Iskanje"
-
-#: mail/mail-send-recv.c:136
-msgid "Cancelling ..."
-msgstr "Preklicujem ..."
-
-#: mail/mail-send-recv.c:231
-msgid "Send & Receive mail"
-msgstr "Oddaja in sprejem po¹te"
-
-#: mail/mail-send-recv.c:234
-msgid "Receiving"
-msgstr "Sprejemam"
-
-#: mail/mail-send-recv.c:283
-msgid "Updating ..."
-msgstr "Posodabljam ..."
-
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
-msgid "Waiting ..."
-msgstr "Èakam ..."
-
-#: mail/mail-send-recv.c:304
-msgid "Sending"
-msgstr "Po¹iljam"
-
-#: mail/mail-send-recv.c:469
-msgid "Cancelled."
-msgstr "Preklicano."
-
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Konèano."
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "V cev je bilo zapisano nepopolno sporoèilo!"
-
-#: mail/mail-tools.c:146
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nisem mogel ustvariti zaèasnega po¹tnega predala `%s': %s"
-
-#: mail/mail-tools.c:199
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (posredovano sporoèilo)"
-
-#: mail/mail-tools.c:209
-msgid "Fwd: (no subject)"
-msgstr "Posreduj: (ni zadeve)"
-
-#: mail/mail-tools.c:226
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Posredovano sporoèilo %s"
-
-#: mail/mail-tools.c:228
-msgid "Forwarded message (no subject)"
-msgstr "Posredovano sporoèilo (brez navedene zadeve)"
-
-#: mail/mail-vfolder.c:170
-msgid "VFolders"
-msgstr "vMape"
-
-#: mail/mail-vfolder.c:335
-msgid "New VFolder"
-msgstr "Nova vMapa"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Odgovori"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Odgovori po¹iljatelju tega sporoèila"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Odgovori vsem prejemnikom tega sporoèila"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Sporoèilo posreduj naprej"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Natisni izbrano sporoèilo"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Zbri¹i to sporèilo"
-
-#: mail/message-list.c:618
-msgid "Unseen"
-msgstr "Nevideno"
-
-#: mail/message-list.c:627
-msgid "Multiple Unseen Messages"
-msgstr "veè nevidenih sporoèil"
-
-#: mail/message-list.c:630
-msgid "Multiple Messages"
-msgstr "Veè sporoèil"
-
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
-
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<neznan>"
-
-#: mail/message-list.c:1035
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1042
-msgid "Today %l:%M %p"
-msgstr "Danes %l:%M %p"
-
-#: mail/message-list.c:1051
-msgid "Yesterday %l:%M %p"
-msgstr "Vèeraj %l:%M %p"
-
-#: mail/message-list.c:1063
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: mail/message-list.c:1071
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: mail/message-list.c:1073
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
-
-#: mail/message-list.c:1172
-msgid "From"
-msgstr "Od"
-
-#: mail/message-list.c:1172
-msgid "Date"
-msgstr "Datum"
-
-#: mail/message-list.c:1172
-msgid "Received"
-msgstr "Sprejeto"
-
-#: mail/message-list.c:1173
-msgid "To"
-msgstr "Za"
-
-#: mail/message-list.c:1173
-msgid "Size"
-msgstr "Velikost"
-
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosim vpi¹ite svoje %s geslo za %s"
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosim vpi¹ite svoje %s geslo"
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP program ni na voljo."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "Geslo ni bilo dano."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Prejemniki niso navedeni"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nisem mogel ustvariti zaèasne datoteke: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Mapa"
-
-#: mail/subscribe-dialog.c:65
-msgid "Store"
-msgstr "Shramba"
-
-#: mail/subscribe-dialog.c:147
-msgid "Display folders starting with:"
-msgstr "Prika¾i mape, ki se zaènejo z:"
-
-#: mail/subscribe-dialog.c:177
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Dobivam shrambo za \"%s\""
-
-#: mail/subscribe-dialog.c:280
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Naroèam se na mapo \"%s\""
-
-#: mail/subscribe-dialog.c:282
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Preklicujem naroènino na mapo \"%s\""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ime mape:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Vrsta mape:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Navedi kje naj se ustvarimapa:"
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Uva¾am %s\n"
-"Uvoznik ni pripravljen.\n"
-"Èakam 5 sekund na nov poskus."
-
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Uva¾am %s\n"
-"Uva¾am predmet %d."
-
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ni uvoznika, ki bi lahko obravnaval\n"
-" %s"
-
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "Uva¾am"
-
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Uva¾am %s.\n"
-"Prièenjam %s"
-
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "Napaka ob nalaganju %s"
-
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Uva¾am %s\n"
-"Uva¾am predmet 1."
-
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "Samodeno"
-
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "Ime datoteke:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "Izberi datoteko"
-
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "Vrsta datoteke:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "Uvozi"
-
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Izberite datoteko, ki jo ¾elite uvoziti v Evolucijo in izberite vrsto "
-"datoteke s seznama\n"
-"\n"
-"Èe ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
-"ugotoviti."
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Kliknite \"Uvozi\" za prièetek uvoza datoteke v Evolucijo. "
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolucijino uvozno orodje"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolucijino uvozno orodje"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Dobrodo¹li v Evolucijinem uvnoznem orodju.\n"
-"S tem druidom boste vodeni skozi proces uvoza\n"
-"zunanjih datotek v Evolucijo."
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Namestitev Evolucije"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Ta razlièica Evolucije mora namestiti dodatne datoteke\n"
-"v va¹ osebni imenik Evolucije"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Prosim kliknite \"V redu\" za namestitev datotek ali \"Preklièi\" za izhod."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Nisem mogel pravilno prenoviti datotek"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolucijine datoteke so se uspe¹no namestile."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Ka¾e, da je to va¹ prvi zagon Evolucije."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabni¹kih datotek "
-"pod"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Ne morem ustvariti imenika\n"
-"%s\n"
-"Napaka: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Ne morem kopirati datotek v\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Datoteka `%s' ni imenik.\n"
-"Prosim premestite jo, da se lahko namestitev\n"
-"Evolucijinih uporabni¹kih datotek nadaljuje."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Datoteka `%s' obstaja a ni Evolucijin imenik.\n"
-"Prosim premestite jo, da se lahko namestitev\n"
-"Evolucijinih uporabni¹kih datotek nadaljuje."
-
-#: shell/e-shell-folder-creation-dialog.c:96
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Ne morem ustvariti izbrane mape:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:153
-msgid "The specified folder name is not valid."
-msgstr "Izbrano ime mape ni veljavno."
-
-#: shell/e-shell-folder-creation-dialog.c:245
-msgid "Evolution - Create new folder"
-msgstr "Evolucija - Ustvar novo mapo"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Tip izbrane mape ni veljaven za zahtevano\n"
-"operacijo."
-
-#: shell/e-shell-folder-selection-dialog.c:318
-msgid "New..."
-msgstr "Nova..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Neimenovana)"
-
-#: shell/e-shell-view-menu.c:159
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Program 'Bug buddy' ni bil najden v va¹i poti ($PATH)."
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy could not be run."
-msgstr "Programa 'Bug buddy' ni bilo mogoèe pognati."
-
-#: shell/e-shell-view-menu.c:194
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Avtorske pravice pridr¾ane 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:196
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolucija je zbirka programov okolja \n"
-"GNOME za delo v skupinah, za po¹to, koledar in \n"
-"urejanje stikov."
-
-#: shell/e-shell-view-menu.c:360
-msgid "Go to folder..."
-msgstr "Pojdi v mapo..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mape"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Opa!  Pogled `%s' je neprièakovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Ustvari novo skupino bli¾njic"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Ime skupine:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Zares ¾elite odstraniti skupino\n"
-"`%s' iz vrstice bli¾njic?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Ne odstrani"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Majhne ikone"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Ka¾i bli¾njice kot majhne ikone"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Velike ikone"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Ka¾i bli¾njice kot velike ikone"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Nova skupina..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Ustvari novo skupino bli¾njic"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Odstrani to skupino..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Odstrani to skupino bli¾njic"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Skrij vrstico z bli¾njicami"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Skrij vrstico z bli¾njicami"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktiviraj"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Aktiviraj to bli¾njico"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstrani to bli¾njico iz vrstice bli¾njic"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bli¾njic."
-
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Pogled"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
-#: shell/e-storage.c:178
-msgid "(No name)"
-msgstr "(Brez imena)"
-
-#: shell/e-storage.c:429
-msgid "No error"
-msgstr "Brez napak"
-
-#: shell/e-storage.c:431
-msgid "Generic error"
-msgstr "Generièna napaka"
-
-#: shell/e-storage.c:433
-msgid "A folder with the same name already exists"
-msgstr "Mapa z enakim imenom ¾e obstaja"
-
-#: shell/e-storage.c:435
-msgid "The specified folder type is not valid"
-msgstr "Izbran tip mape ni veljaven"
-
-#: shell/e-storage.c:437
-msgid "I/O error"
-msgstr "V/I napaka"
-
-#: shell/e-storage.c:439
-msgid "Not enough space to create the folder"
-msgstr "Ni dovolj prostora za ustvaritev mape"
-
-#: shell/e-storage.c:441
-msgid "The specified folder was not found"
-msgstr "Izbrana mapa ni bila najdena"
-
-#: shell/e-storage.c:443
-msgid "Function not implemented in this storage"
-msgstr "Funkcija ni implementirana v tem hranilniku"
-
-#: shell/e-storage.c:445
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#: shell/e-storage.c:447
-msgid "Operation not supported"
-msgstr "Operacija ni podprta"
-
-#: shell/e-storage.c:449
-msgid "The specified type is not supported in this storage"
-msgstr "Izbran tip ni podprt v tem hranilniku"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolucijina lupina."
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
-"\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Zdravo.  Hvala, ker ste si vzeli èas za prenos te predogledne\n"
-"programja za delovne skupine Evolucija.\n"
-"\n"
-"Evolucija ¹e ni konèana. ©e vedno so kraji, kjer funkcionalnost manjka ali\n" 
-"deluje le polovièno. Èe ne morete ugotoviti kako nekaj narediti, je to\n"
-"verjetno zato, ker se tega zaenkrat ¹ne da narediti\n"
-"\n"
-"Upamo, da vam bo Evolucija uporabna, a ¹e vedno vas moramo opozoriti, da se\n"
-"lahko: sesuje, izgubi va¹o po¹to, pusti teèi mrtve procese, porabi 100% \n"
-"procesorskega èasa, po¹lje neveljavne ukaze na va¹e stre¾nike in vas na \n"
-"splo¹no osramoti pred prijatelji in sodelavci. Uporabljajte jo le tako \n"
-"kot je predvideno.\n"
-"\n"
-"Upamo, da boste u¾ivali sadove na¹ega trdega dela in nestrpno\n"
-"prièakujemo va¹e prispevke!\n"
-
-#: shell/main.c:99
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Hvala!\n"
-"Skupina Evolucije\n"
-
-#: shell/main.c:130
-msgid "Cannot initialize the Evolution shell."
-msgstr "Ne morem inicializirati lupine Evolucije."
-
-#: shell/main.c:176
-msgid "Disable."
-msgstr "Izkljuèeno."
-
-#: shell/main.c:196
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
-
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
-msgstr "Ustvari nov stik"
-
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Zbri¹i stik"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Poi¹èi"
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Poi¹èi stik"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
-msgstr "Nov stik"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Natisni stike"
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Ustavi"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Ustavi nalaganje"
-
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Glej vse"
-
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Glej vse stike"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Nastavitev _adresarja..."
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Natisni stike..."
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_I¹èi po kontaktih"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
-msgid "_Tools"
-msgstr "_Orodja"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
-
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ko_ledar"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Nastavitve koledarja..."
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Ustvari nov zmenek"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new calendar"
-msgstr "Ustvari nov koledar"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Day"
-msgstr "Dan"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr "Pojdi po èasu nazaj"
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
-msgstr "Pojdi po èasu naprej"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Pojdi na"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to a specific date"
-msgstr "Pojdi na doloèen datum"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to present time"
-msgstr "Pojdi na sedanjost"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Month"
-msgstr "Mesec"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "Nov zmenek"
-
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Naprej"
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Open Calendar"
-msgstr "Odpri koledar"
-
-#: ui/evolution-calendar.xml.h:19
-msgid "Prev"
-msgstr "Nazaj"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Natisni ta koledar"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Shrani kot"
-
-#: ui/evolution-calendar.xml.h:23
-msgid "Save calendar as something else"
-msgstr "Shrani koledar kot nekaj drugega"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
-msgstr "Ka¾i en dan"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr "Ka¾i en mesec"
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
-msgstr "Ka¾i en teden"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
-msgstr "Poka¾i delavni teden"
-
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Danes"
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Week"
-msgstr "Teden"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nova"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "_Open Calendar"
-msgstr "Odpri ko_ledar"
-
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Natisni ta koledar"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Zbri¹i ta predmet"
-
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Zbri¹i..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Pomoè"
-
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Tiskaj kuverto..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Natisni ta predmet"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Natisni..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
-msgid "Save _As..."
-msgstr "Shrani _kot..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Shrani in zapri"
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Shrani stik in zapri dialog"
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Po¹lji stik drugim..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Glej pomoè na liniji"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Po¹lji _sporoèilo stiku..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Natisni..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
-msgstr "_Shrani"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "O tem programu"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "O..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_Dejanja"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "A_dresar... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Poè_isti"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Izre¾i"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Preveri imena (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Poèisti"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Poèisti izbiro"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopiraj v mapo... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Izre¾i"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Izre¾i izbrano"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Shrani kot XML"
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabni¹kega vmesnika"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rvi predmet v mapi (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Posreduj (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Posreduj naprej kot v_Koledar (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Pojdi na prej¹nji predmet"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Ne_popolna naloga (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Napr_ej"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Prilepi"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Prilepi odlo¾i¹èe"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "P_rej¹nji"
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Prej¹nji"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Predogled _tiskanja"
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Nas_tavitev tiskanja..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
-msgid "Save"
-msgstr "Shrani"
-
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Naèrtuj sestanek"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Naèrtuj sestanek"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Naèrtuj nek tip sestanka"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Izberi vse"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za va¹ trenutni tiskalnik"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Zahtevek opravila (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_O..."
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Razhro¹èuj"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Pomoè"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Predmet (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Dnevni¹ki zapis (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Zadnji predmet v mapi (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Po¹lji sporoèilo (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Prestavi v mapo... (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Opomba (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Natisni"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Lastnosti..."
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Izberi vse"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
-msgid "_Task (FIXME)"
-msgstr "_Naloga (FIXME)"
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Predmet neprebran(FIXME)"
-
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Dodaj storitev"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Dodaj novo storitev v povzetek"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Ustvari novo e-po¹to"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Nastaviteve povzetka..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova po¹ta"
-
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Sestavi"
-
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Sestavi novo sporoèilo"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Prestavi sporoèilo v novo mapo"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Ustvari pravilo"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Mapa"
-
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtriraj glede na Po¹iljatelja"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtriraj glede na Prejemnike"
-
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Pozabi _gesla"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Poberi po¹to"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skrij _izbrana sporoèila"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skrij _zbrisana sporoèila"
-
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skrij _prebrana sporoèila"
-
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Po¹lji _filtre ..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Uredi naroènine..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Oznaèi _kot prebrano"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Oznaèi kot _neprebrano"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Prestavi"
-
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Prestavi sporoèilo v novo mapo"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Predogled sporoèika, ki bo natisnjeno"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Predogled tiskanja sporoèila..."
-
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Natisni sporoèilo na tiskalniku"
-
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Natisni sporoèilo..."
-
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Odgovori po¹iljatelju"
-
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_Vir"
-
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Izberi vse"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Po¹lji po¹to v vrsti in sprejmi novo po¹to"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Ka¾i vsa sporoèila"
-
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "_Niten seznam sporoèil"
-
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "vMapa glede na _Po¹iljatelja"
-
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "vMapa glede na _Sprejemnike"
-
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Glej izvorno obliko sporoèila"
-
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Uveljavi filtre"
-
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Nastavi mapo..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopiraj v mapo..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Uredi sporoèilo"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Unièi"
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "Filtriraj glede na _Zadevo"
-
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "Posreduj _naprej"
-
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obrni izbor"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Nastavitev _Po¹te..."
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Sporoèilo"
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Prestavi v mapo..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Odpri v novem oknu"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Natisni sporoèilo"
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Shrani sporoèilo kot..."
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Niteno"
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Odbri¹i"
-
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "vMapa glede na _Zadevo"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Urejevalnik _virtualnih map..."
-
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Prilo¾i"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
-msgid "Close the current file"
-msgstr "Zapri trenutno datoteko"
-
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "©ifriraj sporoèilo s PGP"
-
-#: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
-
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Vstavi datoteko v sporoèilo kot besedilo"
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Vstavi datoteko z besedilom..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Odpri datoteko"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "©ifriraj s PGP"
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Podpis s PGP"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Shrani osnutek"
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Shrani v _mapo... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Shrani v mapo..."
-
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Shrani trenutno datoteko pod drugim imenom"
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Shrani sporoèilo v izbrano mapo"
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Po¹lji"
-
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Po¹ilji _kaseneje"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Po¹lji _kasneje"
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Po¹lji po¹to v HTML obliki"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Po¹lji sporoèilo kasneje"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Takoj po¹lji sporoèilo"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Takoj po¹lji to sporoèilo"
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Ka¾i / skrij priloge"
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Ka¾i priloge"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Ka¾i priloge"
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Podpi¹i to sporoèilo s svojim PGP kljuèem"
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Vstavi datoteko z besedilom... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_Odpri..."
-
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Varnost"
-
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Dodaj mapo na seznam naroèenih map"
-
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Osve¾i seznam"
-
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Osve¾i seznam map"
-
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrani mapo iz seznama naroèenih map"
-
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Naroèi"
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Prekini naroènino"
-
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Dodali _nalogo (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Poi¹èi znova"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Za_htevek po sestanku (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Obnovi"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Odgovori _vsem (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Po¹lji poroèilo stanja (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Preskoèi ponovitev (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Shrani posel in zapri dialog"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "I¹èi enak niz znova"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "I¹èi niz"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Zmenek (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Oznaèi kot opravljeno (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Odgovori (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nov"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Shrani posel kot nekaj drugega"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Nastavitve poslov..."
-
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "_O Evoluciji..."
-
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Zapri to okno"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Prilagodi..."
-
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prilagodi"
-
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prliagodi orodne vrstice"
-
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr "Poka¾i drugo mapo"
-
-#: ui/evolution.xml.h:8
-msgid "E_xit"
-msgstr "_Izhod"
-
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolucijina vrstica z bli¾njicami"
-
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Izhod"
-
-#: ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Izhod iz programa"
-
-#: ui/evolution.xml.h:12
-msgid "Getting _Started"
-msgstr "Kako _zaèeti"
-
-#: ui/evolution.xml.h:13
-msgid "Import an external file format"
-msgstr "Uvozi datoteko zunanje oblike"
-
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Glavna orodna vrstica"
-
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Ka¾i podatke o Evoluciji"
-
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Ka¾i vrstico z _mapami"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Ka¾i vrstico z bli¾njicami"
-
-#: ui/evolution.xml.h:18
-msgid "Submit Bug Report"
-msgstr "Po¹lji poroèilo o hro¹èu"
-
-#: ui/evolution.xml.h:19
-msgid "Submit _Bug Report"
-msgstr "_Po¹lji poroèilo o hro¹èu"
-
-#: ui/evolution.xml.h:20
-msgid "Submit bug report using Bug Buddy."
-msgstr "Po¹lji poroèilo o hro¹èu z uporabo progama Bug buddy."
-
-#: ui/evolution.xml.h:21
-msgid "Toggle whether to show the folder bar"
-msgstr "Preklopi prikaz vrstice z mapami"
-
-#: ui/evolution.xml.h:22
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Preklopi prikaz vrstice z bli¾njicami"
-
-#: ui/evolution.xml.h:23
-msgid "Using the C_ontact Manager"
-msgstr "Uporaba upravljalnika _stikov"
-
-#: ui/evolution.xml.h:24
-msgid "Using the _Calendar"
-msgstr "Uporaba _koledarja"
-
-#: ui/evolution.xml.h:25
-msgid "Using the _Mailer"
-msgstr "Uporaba _po¹te"
-
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
-msgstr "_O Evoluciji..."
-
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Mapa"
-
-#: ui/evolution.xml.h:33
-msgid "_Go to Folder..."
-msgstr "Pojdi v _mapo..."
-
-#: ui/evolution.xml.h:35
-msgid "_Import file..."
-msgstr "_Uvozi datoteko..."
-
-#: ui/evolution.xml.h:36
-msgid "_Index"
-msgstr "_Kazalo"
-
-#: ui/evolution.xml.h:37
-msgid "_Mail message"
-msgstr "_Po¹lji sporoèilo"
-
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Nastavitve"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Zaseden"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Iz pisarne"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ni podatkov"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Povabi ostale..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Mo¾nosti"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Ka¾i le delavne ure"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Ka¾i poman_j¹ano"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Posodobi prosto/zasedeno"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Samodeno izberi"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Vsi ljudje in vsa sredstva"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Vsi ljudje in eno sredstvo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Potrebni ljudje"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Potrebni ljudje in eno sredstvo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Èas prièetka sestanka:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Èas zakljuèka sestanka:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Vsi udele¾eni"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PTSÈPSN"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Sedaj"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Podatki"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Vpra¹anje"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Sporoèilo"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Tega sporoèila ne ka¾i veè."
-
-#: widgets/misc/e-search-bar.c:140
-msgid "Sear_ch"
-msgstr "_Iskanje"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Stre¾nik osebnega adresarja"
-
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Stre¾nik osebnega koledarja; tovarna koledarjal"
-
-#: wombat/wombat.c:153
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
-
-#: wombat/wombat.c:165
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
-
-#: wombat/wombat.c:178
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolucijino programje za delo v skupini"
-
-#~ msgid "No such message: %s"
-#~ msgstr "Ni tak¹nega sporoèila: %s"
-
-#~ msgid "Saving changes to message..."
-#~ msgstr "Shranjujem spremembe sporoèila..."
-
-#~ msgid "Save changes to message..."
-#~ msgstr "Shranjujem spremembe sporoèila..."
-
-#~ msgid "Error saving composition to 'Drafts': %s"
-#~ msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
-
-#~ msgid "Trash"
-#~ msgstr "Smeti"
-
-#~ msgid "Body or subject contains"
-#~ msgstr "Telo ali zadeva vsebuje"
-
-#~ msgid "Body contains"
-#~ msgstr "Telo vsebuje"
-
-#~ msgid "Subject contains"
-#~ msgstr "Zadeva vsebuje"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Telo ne vsebuje"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Zadeva ne vsebuje"
-
-#~ msgid "Sender contains"
-#~ msgstr "Po¹iljatelj vsebuje"
-
-#~ msgid "Connecting to server"
-#~ msgstr "Vzpostavljam povezavo s stre¾nikom"
-
-#~ msgid "Connect to server"
-#~ msgstr "Pove¾i se s stre¾nikom"
-
-#~ msgid "Registering local folder"
-#~ msgstr "Registriam krajevno mapo"
-
-#~ msgid "Register local folder"
-#~ msgstr "Registriaj krajevno mapo"
-
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel registriati mape '%s':\n"
-#~ "%s"
-
-#~ msgid "Appending \"%s\""
-#~ msgstr "Dodajam \"%s\""
-
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Dodajam sporoèilo brez navedene zadeve"
-
-#~ msgid "Moving messages from \"%s\" into \"%s\""
-#~ msgstr "Prestavljam sporoèila iz \"%s\" v \"%s\""
-
-#~ msgid "Copying messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiram sporoèila iz \"%s\" v \"%s\""
-
-#~ msgid "Move messages from \"%s\" into \"%s\""
-#~ msgstr "Prestavi sporoèilo iz \"%s\" v \"%s\""
-
-#~ msgid "Copy messages from \"%s\" into \"%s\""
-#~ msgstr "Kopiraj sporoèilo iz \"%s\" v \"%s\""
-
-#~ msgid "(No description)"
-#~ msgstr "(ni opisa)"
-
-#~ msgid "Opening Trash folder for %s"
-#~ msgstr "Odpiram mapo Smeti za %s"
-
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "Nalagam mapo %s za %s"
-
-#~ msgid "Load %s Folder for %s"
-#~ msgstr "Nalo¾i mapo %s za %s"
-
-#~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Napaka ob pripravljanju na %s:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error while `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Napaka ob '%s':\n"
-#~ "%s"
-
-#~ msgid "Error reading commands from dispatching thread."
-#~ msgstr "Napaka ob branju ukazov iz razpo¹iljalne niti."
-
-#~ msgid "Corrupted message from dispatching thread?"
-#~ msgstr "Prispelo pokvarjeno sporoèilo iz razpo¹iljalne niti?"
-
-#~ msgid "Could not create dialog box."
-#~ msgstr "Nisem mogel ustvariti dialoga."
-
-#~ msgid "User cancelled query."
-#~ msgstr "Uporabnik je preklical poizvedbo."
-
-#~ msgid ""
-#~ "Cannot open location `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel odpreti URIja `%s':\n"
-#~ "%s"
-
-#~ msgid "Get store for \"%s\""
-#~ msgstr "Dobi shrambo za \"%s\""
-
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Naroèi se na mapo \"%s\""
-
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Preklièi naroènino na mapo \"%s\""
-
-#~ msgid "All Folders"
-#~ msgstr "Vse mape"
-
-#~ msgid "Display folders whose name contain:"
-#~ msgstr "Prika¾i mape, katerih ime vsebuje:"
-
-#~ msgid "Query"
-#~ msgstr "Poizvedba"
-
-#~ msgid "Subscribed"
-#~ msgstr "Naroèen"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "G.\n"
-#~ "Ga.\n"
-#~ "Ga.\n"
-#~ "Gdè.\n"
-#~ "Dr.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Sr.\n"
-#~ "Jr.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "St.\n"
-#~ "Ml.\n"
-#~ "I\n"
-#~ "II\n"
-#~ "III\n"
-#~ "Esq.\n"
-
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "Krajevno hranjenje nima privzete mape"
-
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Krajevnih map ni mogoèe gnezditi."
-
-#~ msgid "Note: When converting between mailbox formats, a failure\n"
-#~ msgstr ""
-#~ "Opomba: Med pretvarjanjem med razliènimi oblikami po¹tnih predalov\n"
-
-#~ msgid "(such as lack of disk space) may not be automatically\n"
-#~ msgstr "napaka (kot pomanjkanje diska) ni nujno samodejno\n"
-
-#~ msgid "recoverable.  Please use this feature with care."
-#~ msgstr "odpravljiva. Prosimo pazljivo uporabljajte to mo¾nost."
-
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Èestitamo, va¹a nastavitev po¹te je opravljena.\n"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "You are now ready to send and receive email \n"
-#~ msgstr "Sedaj ste pripravljeni za sprejemanje e-po¹te \n"
-
-#~ msgid "using Evolution. \n"
-#~ msgstr "z Evolucijo. \n"
-
-#~ msgid "Click \"Finish\" to save your settings."
-#~ msgstr "Kliknite \"Konèaj\" za shranitev va¹ih nastavitev."
-
-#~ msgid "Click \"Next\" to begin. "
-#~ msgstr "Kliknite \"Naprej\" za zaèetek. "
-
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "FIXME: Dodali _nalogo"
-
-#~ msgid "FIXME: Ch_oose Form..."
-#~ msgstr "FIXME: Izberi izmed..."
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Preve_ri imena"
-
-#~ msgid "FIXME: Cop_y to Folder..."
-#~ msgstr "FIXME: Kopiraj v mapo..."
-
-#~ msgid "FIXME: D_esign a Form..."
-#~ msgstr "FIXME: _Oblikuj obrazec..."
-
-#~ msgid "FIXME: Define Print _Styles"
-#~ msgstr "FIXME: Doloèi _sloge tiskanja"
-
-#~ msgid "FIXME: Desi_gn This Form"
-#~ msgstr "FIXME: Obli_kuj ta obrazec"
-
-#~ msgid "FIXME: For_ward"
-#~ msgstr "FIXME: _Posreduj naprej"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Pomoè"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Do_konèana naloga"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Vstavi datoteko"
-
-#~ msgid "FIXME: It_em..."
-#~ msgstr "FIXME: Pr_edmet..."
-
-#~ msgid "FIXME: Paste _Special... "
-#~ msgstr "FIXME: Prilepi po_sebno..."
-
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "FIXME: Predogled tiskanja"
-
-#~ msgid "FIXME: Pu_blish Form As..."
-#~ msgstr "FIXME: O_bjavi obrazec kot..."
-
-#~ msgid "FIXME: Publish _Form..."
-#~ msgstr "FIXME: Ob_javi obrazec..."
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "FIXME: Ponovitve..."
-
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "FIXME: Odgovori v_sem"
-
-#~ msgid "FIXME: S_end"
-#~ msgstr "FIXME: Po¹lji"
-
-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "FIXME: Dodaj prilogo..."
-
-#~ msgid "FIXME: Script _Debugger"
-#~ msgstr "FIXME: Razhro¹èevalnik skript"
-
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: Zahteva po _nalogi"
-
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Zmenek"
-
-#~ msgid "FIXME: _Contact"
-#~ msgstr "FIXME: _Stik"
-
-#~ msgid "FIXME: _Customize..."
-#~ msgstr "FIXME: _Prilagodi..."
-
-#~ msgid "FIXME: _File..."
-#~ msgstr "FIXME: _Datoteka..."
-
-#~ msgid "FIXME: _Font..."
-#~ msgstr "FIXME: _Pisava..."
-
-#~ msgid "FIXME: _Formatting"
-#~ msgstr "FIXME: _Oblikovanje"
-
-#~ msgid "FIXME: _Item"
-#~ msgstr "FIXME: _Predmet"
-
-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "FIXME: _Vpis v dnevniku"
-
-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "FIXME: _Po¹lji sporoèilo"
-
-#~ msgid "FIXME: _Mark Complete"
-#~ msgstr "FIXME: _Oznaèi kot dokonèano"
-
-#~ msgid "FIXME: _Memo Style"
-#~ msgstr "FIXME: V slogu zabele¾ka"
-
-#~ msgid "FIXME: _Move to Folder..."
-#~ msgstr "FIXME: Prestavi v mapo..."
-
-#~ msgid "FIXME: _New Task"
-#~ msgstr "FIXME: _Nova naloga"
-
-#~ msgid "FIXME: _Object..."
-#~ msgstr "FIXME: _Zadeva..."
-
-#~ msgid "FIXME: _Paragraph..."
-#~ msgstr "FIXME: _Odstavek..."
-
-#~ msgid "FIXME: _Reply"
-#~ msgstr "FIXME: _Odgovori"
-
-#~ msgid "FIXME: _Spelling..."
-#~ msgstr "FIXME: _Èrkovanje..."
-
-#~ msgid "FIXME: _Standard"
-#~ msgstr "FIXME: _Obièajno"
-
-#~ msgid "FIXME: _Task"
-#~ msgstr "FIXME: _Naloga"
-
-#~ msgid "FIXME: _Unread Item"
-#~ msgstr "FIXME: _Neprebran predmet"
-
-#~ msgid "FIXME: _note"
-#~ msgstr "FIXME: _opomba"
-
-#~ msgid "Find _Again"
-#~ msgstr "Poi¹èi znova"
-
-#~ msgid "_Find..."
-#~ msgstr "_Poi¹èi..."
-
-#~ msgid "_Forms"
-#~ msgstr "_Obrazci"
-
-#~ msgid "_Insert"
-#~ msgstr "Vstavi"
-
-#~ msgid "_Object"
-#~ msgstr "_Predmet"
-
-#~ msgid "_Redo"
-#~ msgstr "Obnovi"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Zamenjaj..."
-
-#~ msgid "_Toolbars"
-#~ msgstr "_Orodjarne"
-
-#~ msgid "_Undo"
-#~ msgstr "_Razveljavi"
-
-#~ msgid "C_lassification:"
-#~ msgstr "_Uvrstitev:"
-
-#~ msgid "S_ummary"
-#~ msgstr "_Povzetek"
-
-#~ msgid "task-editor-dialog"
-#~ msgstr "dialog-urejevalnik-dogodkov"
-
-#~ msgid "Open..."
-#~ msgstr "Odpri..."
-
-#~ msgid "Open the task"
-#~ msgstr "Odpri nalogo"
-
-#~ msgid "Days"
-#~ msgstr "Dni"
-
-#~ msgid "Hours"
-#~ msgstr "Ur"
-
-#~ msgid "Mail _to:"
-#~ msgstr "Po¹lji po¹to _za:"
-
-#~ msgid "Minutes"
-#~ msgstr "Minut"
-
-#~ msgid "Time"
-#~ msgstr "Èas"
-
-#~ msgid "_Audio"
-#~ msgstr "_Zvok"
-
-#~ msgid "_Contacts"
-#~ msgstr "_Stiki"
-
-#~ msgid "_Display"
-#~ msgstr "_Prikaz"
-
-#~ msgid "_Mail"
-#~ msgstr "_Po¹lji po¹to"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "dialog-urejevalec-dogodkov"
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel odpreti datoteke: %s:\n"
-#~ "%s"
-
-#~ msgid "Cancel"
-#~ msgstr "Preklièi"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Odpri koledar"
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nov zmenek"
-
-#~ msgid "FIXME: _Note"
-#~ msgstr "FIXME: _Opomba"
-
-#~ msgid "Group %i"
-#~ msgstr "Skupina %i"
-
-#~ msgid "Failed to perform regex search on message header: %s"
-#~ msgstr ""
-#~ "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporoèil: %s"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Nimate nastavljenega Izhodnega po¹tnega predala"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "Pobiram po¹to iz %s"
-
-#~ msgid "Fetch email from %s"
-#~ msgstr "Poberi po¹to iz %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Filtriram po¹to na zahtevo"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Fitriraj po¹to na zahtevo"
-
-#~ msgid "Sending queue"
-#~ msgstr "Po¹iljam vrsto"
-
-#~ msgid "Send queue"
-#~ msgstr "Po¹lji vrsto"
-
-#~ msgid "Examining %s"
-#~ msgstr "Preuèujem %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Nisem mogel prebrati UID medpomnilne datoteke \"%s\". Morda boste "
-#~ "dobilipodvojeno sporoèilo."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Prena¹am sporoèilo %d od %d"
-
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Pi¹em sporoèilo %d od %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Shranjujem spremembe pri %s"
-
-#~ msgid "Experimental/new code to get/receive mail"
-#~ msgstr "Eksperimentalna/nova koda za sprejem/po¹iljanje po¹te"
-
-#~ msgid "Get Mail (new)"
-#~ msgstr "Dobi po¹to (novo)"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Dostopne kategorije:"
-
-#~ msgid "External Directories"
-#~ msgstr "Zunanji imeniki"
-
-#~ msgid "Port Number:"
-#~ msgstr "©tevilka vrat:"
-
-#~ msgid "window2"
-#~ msgstr "okno2"
-
-#~ msgid "Headings:"
-#~ msgstr "Zaglavja:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Prazni dnevi:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Osvetljen dan:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "©tevilke dni:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "©tevilka trenutnega dne:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Predmet za-opravit, ki ¹e ni na vrsti:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Predmet za-opravit, ki je na vrsti danes:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Predmet za-opravit, ki je ¾e pretekel:"
-
-#~ msgid "Recur on the"
-#~ msgstr "Ponovitev na"
-
-#~ msgid "th day of the month"
-#~ msgstr "dan v mesecu"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
-#~ "Evolucije.\n"
-#~ "\n"
-#~ "Vendar se bo zmenek ponovil pravoèasno in bo  pravilno prikazan v pogledu "
-#~ "koledarja."
-
-#~ msgid "may"
-#~ msgstr "maj"
-
-#~ msgid "sept"
-#~ msgstr "sept"
-
-#~ msgid "sunday"
-#~ msgstr "nedelja"
-
-#~ msgid "monday"
-#~ msgstr "ponedeljek"
-
-#~ msgid "tuesday"
-#~ msgstr "torek"
-
-#~ msgid "tues"
-#~ msgstr "tor"
-
-#~ msgid "wednesday"
-#~ msgstr "sreda"
-
-#~ msgid "wednes"
-#~ msgstr "sre"
-
-#~ msgid "thursday"
-#~ msgstr "èetrtek"
-
-#~ msgid "thur"
-#~ msgstr "èet"
-
-#~ msgid "thurs"
-#~ msgstr "èet"
-
-#~ msgid "friday"
-#~ msgstr "petek"
-
-#~ msgid "saturday"
-#~ msgstr "sobota"
-
-#~ msgid "fortnight"
-#~ msgstr "¹tirinajst dni"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sek"
-
-#~ msgid "tomorrow"
-#~ msgstr "jutri"
-
-#~ msgid "yesterday"
-#~ msgstr "vèeraj"
-
-#~ msgid "today"
-#~ msgstr "danes"
-
-#~ msgid "last"
-#~ msgstr "zadnji"
-
-#~ msgid "this"
-#~ msgstr "ta"
-
-#~ msgid "next"
-#~ msgstr "naslednji"
-
-#~ msgid "first"
-#~ msgstr "prvi"
-
-#~ msgid "third"
-#~ msgstr "tretji"
-
-#~ msgid "fourth"
-#~ msgstr "èetrti"
-
-#~ msgid "fifth"
-#~ msgstr "peti"
-
-#~ msgid "sixth"
-#~ msgstr "¹esti"
-
-#~ msgid "seventh"
-#~ msgstr "sedmi"
-
-#~ msgid "eighth"
-#~ msgstr "osmi"
-
-#~ msgid "ninth"
-#~ msgstr "deveti"
-
-#~ msgid "tenth"
-#~ msgstr "deseti"
-
-#~ msgid "eleventh"
-#~ msgstr "enajsti"
-
-#~ msgid "twelfth"
-#~ msgstr "dvanajsti"
-
-#~ msgid "ago"
-#~ msgstr "nazaj"
-
-#~ msgid "Create to-do item"
-#~ msgstr "Ustvari predmet za-opravit"
-
-#~ msgid "Edit to-do item"
-#~ msgstr "Uredi predemet za-opravit"
-
-#~ msgid "Due Date:"
-#~ msgstr "Do datuma:"
-
-#~ msgid "Item Comments:"
-#~ msgstr "Komentarji predmeta:"
-
-#~ msgid "Year:"
-#~ msgstr "Leto:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Prosim izberite datum na katerega hoèete iti.\n"
-#~ "Ko klikente na dan boste samodejno ¹li\n"
-#~ "na ta datum."
-
-#~ msgid "Time display"
-#~ msgstr "Prikaz èasa"
-
-#~ msgid "Time format"
-#~ msgstr "Oblika izpisa èasa"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 urna (dop./pop.)"
-
-#~ msgid "24-hour"
-#~ msgstr "24 urna"
-
-#~ msgid "Weeks start on"
-#~ msgstr "Tedni se zaènejo v"
-
-#~ msgid "Day range"
-#~ msgstr "Razpon dni"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Prosim izberite ure zaèetka in konca dneva, ki naj\n"
-#~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
-#~ "Èasi izven tega razpona ne bodo samodejno prikazani"
-
-#~ msgid "Day end:"
-#~ msgstr "Konec dneva:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Barve za prikaz"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Poka¾i v seznamu za-opravit:"
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Slog seznama za-opravit:"
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Osvetli preteèene predmete"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Osvetli ¹e nepreteèene predmete"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "Osvetli predmete z dana¹njim rokom"
-
-#~ msgid "To Do List Properties"
-#~ msgstr "Lastnosti seznama Za-opravit"
-
-#~ msgid "To Do List"
-#~ msgstr "Seznam Za-opravit"
-
-#~ msgid "Preferences"
-#~ msgstr "Nastavitve"
-
-#~ msgid "Alarm Properties"
-#~ msgstr "Lastnosti alarma"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Piskaj ob zaslonskih alarmih"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Zvoèni alarmi preteèejo po"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Omogoèi podalj¹anje spanja za "
-
-#~ msgid "Could not create summary"
-#~ msgstr "Nisem mogel ustvariti povzetka"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Ne morem dobiti sporoèila: %s"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "Za branje po¹te dostavljene na krajevni sistem in za shranjevanje po¹te na "
-#~ "krajevni disk."
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj ¾e obstaja"
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Nisem mogel odpreti povzetka %s"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Povzetek se ne ujema, X-Evolucije glava manjka"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Nisem mogel nalo¾iti ali ustvariti povzetka"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Nisem mogel preimenovati mape `%s': %s ¾e obstaja"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "MH mape ne morejo biti gnezdene"
-
-#~ msgid "does not match regex"
-#~ msgstr "ne ustreza z regularnemu izrazu"
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr ""
-#~ "Ne morem inicializirati Evolucijine komponente za razpr¹eno shrambo."
-
-#~ msgid "Custom search"
-#~ msgstr "Iskanje po meri"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Odpri v novem oknu"
-
-#~ msgid "Edit Message"
-#~ msgstr "Uredi sporoèilo"
-
-#~ msgid "Forward Message"
-#~ msgstr "Sporoèilo posreduj naprej"
-
-#~ msgid "Copy Message"
-#~ msgstr "Kopiraj sporoèilo"
-
-#~ msgid "Full Search"
-#~ msgstr "Polno iskanje"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Nimate nastavljenih izvorov po¹te"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Vnesite svoje ime in e-po¹tni naslov, ki naj se uporablja v izhodni po¹ti Po "
-#~ "¾elji lahko vnesete tudi ime va¹e organizacije in ime datoteke iz katere naj "
-#~ "se prebere va¹ podpis."
-
-#~ msgid "Signature File"
-#~ msgstr "Datoteka s podpisom"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Ugotovi podprte tipe..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ne zbri¹i sporoèil s stre¾nika"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Tip izvora po¹te:"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Izberite vrsto po¹tnega stre¾nika, ki ga uporabljate, in nastavite zanj  "
-#~ "potrebne podatke.\n"
-#~ "\n"
-#~ "Èe stre¾nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-#~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
-
-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Izberite vrsto po¹tnega stre¾nika, ki ga uporabljate, in nastavite zanj  "
-#~ "potrebne podatke.\n"
-#~ "\n"
-#~ "Èe stre¾nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-#~ "podprte tipe...\", po tem ko boste vnesli ostale podatke."
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Tip prenosa po¹te:"
-
-#~ msgid "Add Identity"
-#~ msgstr "Dodaj identiteto"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Uredi identiteto"
-
-#~ msgid "Edit Source"
-#~ msgstr "Uredi izbor"
-
-#~ msgid "Add News Server"
-#~ msgstr "Dodaj novièarski stre¾nik"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Uredi novièarski stre¾nik"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Preizku¹am \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Povezava je bila uspe¹na!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Poizvedujem o mo¾nostih avtentifikacije pri \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Poizvedi o mo¾nostih avtentifikacije pri \"%s\""
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Dobrodo¹li v nastavitvenem èarovniku po¹te!\n"
-#~ "Z vpisom nekaterih podatkov o va¹ih nastavitvah e-po¹te\n"
-#~ "lahko takoj priènete po¹iljati in sprejemati po¹to\n"
-#~ "Kliknite naprej za nadaljevanje."
-
-#~ msgid "Mail Transport"
-#~ msgstr "Prenos Po¹te"
-
-#~ msgid "Identities"
-#~ msgstr "Identitete"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Izvori po¹te"
-
-#~ msgid "News Servers"
-#~ msgstr "Novièarski stre¾niki"
-
-#~ msgid "News Sources"
-#~ msgstr "Viri novic"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Po¹iljaj sporoèila v HTML obliki"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Nisem mogel izvr¹iti %s: %s\n"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "V tej razlièici Evolucije GPG/PGP podpora ni prisotna."
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX neprebran)"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Po¹lji sporoèilo brez navedene zadeve"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Unièi \"%s\""
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Izbiram sporoèila v mapi \"%s\""
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Izberi sporoèila v mapi \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Izbiram sporoèilo %d od %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Osve¾i mape v \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Prilagam sporoèilo iz mape \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Prilo¾i sporoèilo iz mape \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Posredujem sporoèilo \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Posredujem sporoèilo brez navedene zadeve"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Posreduj sporoèilo \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Posreduj sporoèilo brez navedene zadeve"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Nisem uspel generirati mime dela iz sporoèila med generiranjem posredovanega "
-#~ "sporoèila."
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Nalagam \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Nalo¾i \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Ustvarjam \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr "Izjema med sporoèanjem rezultatov lupini"
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Uskladi \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Prikazujem sporoèilo z UID \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "Èistim prikazano sporoèilo"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Prika¾i sporoèilo z UID \"%s\""
-
-#~ msgid "Clear message display"
-#~ msgstr "Èisti prikaz sporoèila"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Odpiram sporoèila iz  mape \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Odpri sporoèilo iz \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Gledam sporoèilo iz mape \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Glej sporoèilo iz \"%s\""
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Ne poznam protokola za odpiranje URIja `%s'"
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Obnavljam pogled sporoèil"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Obnovi pogled sporoèil"
-
-#~ msgid "Threading message list"
-#~ msgstr "Nitim seznam sporoèil"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ov stre¾nik imenikov"
-
-#~ msgid "_Actions"
-#~ msgstr "_Dejanja"
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nov Ko_ledar"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Nov zmenek..."
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Shrani koledar kot"
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Ustvari novo mapo..."
-
-#~ msgid "Quick Search"
-#~ msgstr "Hitro iskanje"
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Neveljaven URL shrambe (ni stre¾nika): %s"
-
-#~ msgid "Ne_xt"
-#~ msgstr "_Naslednji"
-
-#~ msgid "FIXME: _New Contact"
-#~ msgstr "FIXME: _Nov stik"
-
-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "FIXME: Nov _stik iz istega podjetja"
-
-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "FIXME: Novo _pismo za stik"
-
-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "FIXME: Nov sestanek s stikom"
-
-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "FIXME: Nova na_loga za stik"
-
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "FIXME: Nov vpis v _dnevnik za stik"
-
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Zastavica za nadaljevanje..."
-
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: _Poka¾i zemljevid naslova"
-
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: _Odpri spletno stran"
-
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "FIXME: Posreduj naprej kot _vVizitko"
-
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "Vstavi datoteko kot prilogo"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Prej¹nji"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "FIXME: Naslednji"
-
-#~ msgid "Gnome Calendar"
-#~ msgstr "Gnome Koledar"
-
-#~ msgid "The GNOME personal calendar and schedule manager."
-#~ msgstr "Gnome osebni koledar in urnik."
-
-#~ msgid "Year"
-#~ msgstr "Leto"
-
-#~ msgid "Show 1 year"
-#~ msgstr "Poka¾e vrstico z mapami"
-
-#~ msgid "New appointment for _today..."
-#~ msgstr "Nov zmenek za _danes..."
-
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Ustvari nov zmenek za danes"
-
-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
-#~ msgid "'s calendar"
-#~ msgstr " koledar"
-
-#~ msgid "FIXME: _Delete"
-#~ msgstr "FIXME: _Zbri¹i"
-
-#~ msgid "FIXME: Save and Close"
-#~ msgstr "FIXME: Shrani in zapri"
-
-#~ msgid "FIXME: Print..."
-#~ msgstr "FIXME: Natisni..."
-
-#~ msgid "FIXME: Recurrence..."
-#~ msgstr "FIXME: Ponovitev..."
-
-#~ msgid "Configure recurrence rules"
-#~ msgstr "Nastavi pravila ponovitev"
-
-#~ msgid "FIXME: Assign Task..."
-#~ msgstr "FIXME: _Dodeli nalogo..."
-
-#~ msgid "Assign the task to someone"
-#~ msgstr "Nekomu dodeli nalogo"
-
-#~ msgid "FIXME: Delete"
-#~ msgstr "FIXME: Zbri¹i"
-
-#~ msgid "S_ubject:"
-#~ msgstr "Z_adeva:"
-
-#~ msgid ""
-#~ "Not Started\n"
-#~ "In Progress\n"
-#~ "Completed\n"
-#~ "Cancelled\n"
-#~ msgstr ""
-#~ "Ni prièeto\n"
-#~ "V delu\n"
-#~ "Konèano\n"
-#~ "Zavrnjeno\n"
-
-#~ msgid ""
-#~ "High\n"
-#~ "Normal\n"
-#~ "Low\n"
-#~ msgstr ""
-#~ "Visoka\n"
-#~ "Obièajna\n"
-#~ "Nizka\n"
-
-#~ msgid "Resources:"
-#~ msgstr "Viri:"
-
-#~ msgid "Last Modification Date"
-#~ msgstr "Datum zadnje spremembe"
-
-#~ msgid "Location"
-#~ msgstr "Lega"
-
-#~ msgid "% Complete"
-#~ msgstr "% konèano"
-
-#~ msgid "FIXME: Ca_lendar..."
-#~ msgstr "FIXME: Ko_kedar..."
-
-#~ msgid "FIXME: Invite _Attendees..."
-#~ msgstr "FIXME: Povabi udele¾ence..."
-
-#~ msgid "FIXME: C_ancel Invitation..."
-#~ msgstr "FIXME: Preklièi povabilo..."
-
-#~ msgid "FIXME: Invite Attendees..."
-#~ msgstr "FIXME: Povabi udele¾ence..."
-
-#~ msgid "Invite attendees to a meeting"
-#~ msgstr "Povabi udele¾ence na sestanek"
-
-#~ msgid "_Summary:"
-#~ msgstr "_Povzetek:"
-
-#~ msgid "_Owner:"
-#~ msgstr "_Lastnik:"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days\n"
-#~ msgstr ""
-#~ "Minut\n"
-#~ "Ur\n"
-#~ "Dni\n"
-
-#~ msgid "Daily"
-#~ msgstr "Dnevne"
-
-#~ msgid "Weekly"
-#~ msgstr "Tedenske"
-
-#~ msgid "Monthly"
-#~ msgstr "Meseène"
-
-#~ msgid "Yearly"
-#~ msgstr "Letne"
-
-#~ msgid "label23"
-#~ msgstr "label23"
-
-#~ msgid "Every "
-#~ msgstr "Vsak "
-
-#~ msgid "label24"
-#~ msgstr "label24"
-
-#~ msgid ""
-#~ "1st\n"
-#~ "2nd\n"
-#~ "3rd\n"
-#~ "4th\n"
-#~ "5th\n"
-#~ msgstr ""
-#~ "1.\n"
-#~ "2.\n"
-#~ "3.\n"
-#~ "4.\n"
-#~ "5.\n"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday\n"
-#~ msgstr ""
-#~ "Ponedeljek\n"
-#~ "Torek\n"
-#~ "Sreda\n"
-#~ "Èetrtek\n"
-#~ "Petek\n"
-#~ "Sobota\n"
-#~ "Nedelja\n"
-
-#~ msgid "label27"
-#~ msgstr "oznaka27"
-
-#~ msgid "Ending date"
-#~ msgstr "Datum zakljuèka"
-
-#~ msgid "Add to-do item..."
-#~ msgstr "Dodaj predmet za-opravit..."
-
-#~ msgid "Time Left"
-#~ msgstr "Preostalo èasa"
-
-#~ msgid "To-do list"
-#~ msgstr "Seznam za opravit"
-
-#~ msgid "Edit..."
-#~ msgstr "Uredi..."
-
-#~ msgid "Weeks"
-#~ msgstr "Tednov"
-
-#~ msgid "Hour"
-#~ msgstr "Ura"
-
-#~ msgid "Minute"
-#~ msgstr "Minuta"
-
-#~ msgid "Second"
-#~ msgstr "Sekunda"
-
-#~ msgid "TODO Items"
-#~ msgstr "Predmeti za-opravit"
-
-#~ msgid "%a"
-#~ msgstr "%b"
-
-#~ msgid "%b"
-#~ msgstr "%a"
-
-#~ msgid "Current week (%s %s %d - %s %s %d %d)"
-#~ msgstr "Trenutni teden (%s %s %d - %s %s %d %d)"
-
-#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
-#~ msgstr "Trenutni teden (%s %s %d %d - %s %s %d %d)"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Izre¾i izbran predmet na odlo¾i¹èe"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Kopiraj izbran predmet na odlo¾i¹èe"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "Izberi naslove prejemnikov"
-
-#~ msgid "To: >>"
-#~ msgstr "Za: >>"
-
-#~ msgid "Cc: >>"
-#~ msgstr "Cc: >>"
-
-#~ msgid "Bcc: >>"
-#~ msgstr "Bcc: >>"
-
-#~ msgid "label9"
-#~ msgstr "oznaka9"
-
-#~ msgid "label7"
-#~ msgstr "oznaka7"
-
-#~ msgid "label8"
-#~ msgstr "oznaka8"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Nalo¾i prej shranjeno sporoèilo"
-
-#~ msgid "_Close..."
-#~ msgstr "_Zapri..."
-
-#~ msgid "_Format"
-#~ msgstr "_Oblika izpisa"
-
-#~ msgid "Check for new mail"
-#~ msgstr "Preveri za novo po¹to"
-
-#~ msgid "_vFolder Editor ..."
-#~ msgstr "Urejevalnik vMap ..."
-
-#~ msgid "Currently pending operations:"
-#~ msgstr "Trenutno èakajoèe operacije:"
-
-#~ msgid "Waiting for user to close error dialog"
-#~ msgstr "Èakam na uporabnika, da zapre dialog z napako"
-
-#~ msgid "Waiting for user to enter data"
-#~ msgstr "Èakam na uporabnika, da vpi¹e podatek"
-
-#~ msgid "Show _folder bar"
-#~ msgstr "Ka¾i vrstico z _mapami"
-
-#~ msgid "Help _index"
-#~ msgstr "Kazalo _pomoèi"
-
-#~ msgid "Fields"
-#~ msgstr "Polja"
-
-#~ msgid "Sort"
-#~ msgstr "Sortiranje"
-
-#~ msgid "Field Chooser"
-#~ msgstr "Izbirnik polij"
-
-#~ msgid ""
-#~ "To add a column to your table, drag it into\n"
-#~ "the location in which you want it to appear."
-#~ msgstr ""
-#~ "Da bi dodali stolpec k va¹i tabeli, ga potegnite\n"
-#~ "do mesta kjer ¾elite, da se pojavi."
-
-#~ msgid "window1"
-#~ msgstr "okno1"
-
-#~ msgid "Available fields"
-#~ msgstr "Polja na voljo"
-
-#~ msgid "Show in this order"
-#~ msgstr "Ka¾i v tem vrstnem redu"
-
-#~ msgid "label2"
-#~ msgstr "label2"
-
-#~ msgid "Add >>"
-#~ msgstr "Dodaj >>"
-
-#~ msgid "<< Remove"
-#~ msgstr "<< odstrani"
-
-#~ msgid "Discard this message?"
-#~ msgstr "Zavrzi to sporoèilo"
-
-#~ msgid "Back"
-#~ msgstr "Prej¹nji"
-
-#~ msgid "Finish"
-#~ msgstr "Konèaj"
-
-#~ msgid "Apply"
-#~ msgstr "Uporabi"
-
-#~ msgid ""
-#~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-#~ "continue forwards to customise it.</p>"
-#~ msgstr ""
-#~ "<h2>Ustvari pravilo filtriranja</h2><p>Izberite eno od osnovnih pravil "
-#~ "zgorajnato nadaljujte naprej, da ga prilagodite.</p>"
-
-#~ msgid "Test these values before continuing"
-#~ msgstr "Preveri te vrednosti pred nadaljevanjem"
-
-#~ msgid "Select the method you would like to use to deliver your mail."
-#~ msgstr "Izberite naèin na katerega ¾elite dostavljati va¹o po¹to."
-
-#~ msgid "Enter the hostname of the News Server you have."
-#~ msgstr "Vpi¹ite ime raèunalnika na katerem teèe novièarski stre¾nik."
-
-#~ msgid "Cannot initialize the configuration system."
-#~ msgstr "Ne morem inicializirati nastavitvenega sistema."
diff --git a/po/sv.po b/po/sv.po
deleted file mode 100644
index 74277c942b..0000000000
--- a/po/sv.po
+++ /dev/null
@@ -1,8674 +0,0 @@
-# Swedish translation of Evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
-# Richard Hult <rhult@codefactory.se>, 2000-2001.
-# Christian Rose <menthos@menthos.com>, 2000.
-# Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
-#
-# $Id: sv.po,v 1.62 2001/02/11 02:56:15 menesis Exp $
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-02-08 01:36+0100\n"
-"PO-Revision-Date: 2001-02-08 01:38+0100\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Namn: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefix:     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Förnamn:    "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Andranamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Efternamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffix:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Födelsedatum: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adress:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Box:           "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Anknytning:    "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gatuadress:    "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ort:           "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:        "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postnummer:    "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:          "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveransetikett: "
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoner:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"E-postprogram: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidszon: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografisk plats: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Yrkesroll: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Namn:    "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Enhet:   "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Enhet 2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Enhet 3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Enhet 4: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorier: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik sträng: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Publik nyckel: "
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kunde inte initiera Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Avstängd"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronisera"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiera från Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiera till Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Slå samman från Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Slå samman till Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Originalförfattare:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolutions adressbokskanal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "© 1998-2000 Free Software Foundation och Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurationsverktyg för evolutions adressbokskanal.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkroniseringsåtgärd"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Kanaltillstånd"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen Pilot konfigurerad. Var vänlig och\n"
-"välj \"Pilot-länkningsegenskaper\" först."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Inte ansluten till gnome-pilot-demonen"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ett fel inträffade vid hämnting av\n"
-"pilotlista från gnome-pilot-demonen"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Markören kunde inte läsas in\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook inte inläst\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "Kunde inte starta wombat-server"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Kunde inte starta wombat"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Kunde inte läsa pilotens adressprogramblock"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Ta bort kontakten?"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Lägg till"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:62 po/tmp/evolution-mail.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:74
-msgid "_Delete"
-msgstr "_Ta bort"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Telefontyper"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Ny telefontyp"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
-msgid "Add"
-msgstr "Lägg till"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "_Kontakteditor"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Fullständigt namn..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Spara som:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Webbsideadress:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Vill ha _HTML-post"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "Företa_g"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Hem"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Företags_fax"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Primär e-post"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "F_öretag"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "De_tta är e-postadressen"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_Kontakter..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:10 po/tmp/task-editor-dialog.glade.h:8
-msgid "Ca_tegories..."
-msgstr "Ka_tegorier..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Jobbtitel:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "_Företag:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adress..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/mail-config.glade.h:32
-msgid "General"
-msgstr "Allmänt"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "Av_delning:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "K_ontor:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Yrke:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Smeknamn:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "Partne_r:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Födelsedag:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Assistentens namn:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "Chefens na_mn:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Jubileum:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "An_teckningar:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
-msgid "Details"
-msgstr "Detaljer"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Business"
-msgstr "Företag"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Business 2"
-msgstr "Företag 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Business Fax"
-msgstr "Företagsfax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Tillbakaringning"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Företag"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Home"
-msgstr "Hem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Home 2"
-msgstr "Hem 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Home Fax"
-msgstr "Fax hem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: po/tmp/mail-config.glade.h:51
-msgid "Other"
-msgstr "Annat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Annan fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Pager"
-msgstr "Personsökare"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Primary"
-msgstr "Primär"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Email 3"
-msgstr "E-post 3"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Adress _2:"
-
-#: po/tmp/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Kontrollera adress"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "_Land:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finland"
-
-#: po/tmp/fulladdr.glade.h:11
-msgid "USA"
-msgstr "USA"
-
-#: po/tmp/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Adress:"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Ort:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Box:"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "Del_stat/Provins:"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Postnummer:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Kontrollera fullständiga namnet"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Herr\n"
-"Fru\n"
-"Fru\n"
-"Fröken\n"
-"Dr.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Förnamn:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Titel:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Mellannamn:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Efternamn:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "_Suffix:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
-msgid "As _Table"
-msgstr "Som _tabell"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "Ange lösenord för %s"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "Kan inte öppna adressboken"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Vi kunde inte öppna den här adressboken. Detta beror\n"
-"antingen på att du har angivit en felaktig URI eller\n"
-"att du har försökt komma åt en LDAP-server och inte\n"
-"har kompilerat in LDAP-stöd. Om du har angett en URI\n"
-"bör du kontrollera så att URI:n är korrekt och\n"
-"eventuellt ange den på nytt. Om det inte är så har du\n"
-"troligtvis försökt att komma åt en LDAP-server. Om du\n"
-"vill kunna använda LDAP måste du hämta och installera\n"
-"OpenLDAP och kompilera om och installera Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Visa alla"
-
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avancerat..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Något fält innehåller"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "Namnet innehåller"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "E-postadressen innehåller"
-
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "URI:n som mappbläddraren kommer att visa"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Andra kontakter"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Okänd adressbokstyp"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonymt läge)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Lösenord"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Okänd autentiseringstyp"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Bas"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Underträd"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Okänd omfattningstyp"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Bind-DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN-hjälptext här"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Kom ihåg detta lösenord"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: po/tmp/mail-config.glade.h:33
-msgid "Host:"
-msgstr "Värd:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Värd-hjälptext här."
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME POrt-hjälptext här."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Rot-DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN-hjälptext här."
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Sökomfattning:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: po/tmp/mail-config.glade.h:14
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:481 po/tmp/mail-config.glade.h:54
-msgid "Path:"
-msgstr "Sökväg:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Sökvägshjälptext här"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Skapa sökvägen om den inte finns."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Redigera adressbok"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Lägg till adressbok"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Markera den typ av adressbok du har och ange den relevanta informationen om "
-"den."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: po/tmp/mail-config.glade.h:46
-msgid "Name:"
-msgstr "Namn:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Namnhjälptext här"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "FIXME Beskrivningshjälptext här"
-
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Adressbokskällor"
-
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:22
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:23
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:25
-msgid "Delete"
-msgstr "Ta bort"
-
-#: mail/folder-browser.c:670 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:28
-msgid "Edit"
-msgstr "Redigera"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Namn"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/select-names.glade.h:6
-msgid "Find..."
-msgstr "Sök..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Mottagare"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Markera namn"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-msgstr "Välj namn från:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Sök"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: po/tmp/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: po/tmp/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: po/tmp/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: po/tmp/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: po/tmp/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: po/tmp/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: po/tmp/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: po/tmp/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: po/tmp/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: po/tmp/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: po/tmp/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: po/tmp/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: po/tmp/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: po/tmp/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
-
-#: po/tmp/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
-
-#: po/tmp/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
-
-#: po/tmp/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
-
-#: po/tmp/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
-
-#: po/tmp/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
-
-#: po/tmp/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
-
-#: po/tmp/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
-
-#: po/tmp/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
-
-#: po/tmp/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
-
-#: po/tmp/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
-
-#: po/tmp/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
-
-#: po/tmp/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Spara som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "* Click here to add a contact *"
-msgstr "* Klicka här för att lägga till en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Web Site"
-msgstr "Webbsida"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Department"
-msgstr "Avdelning"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Manager"
-msgstr "Manager"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Nickname"
-msgstr "Smeknamn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Spouse"
-msgstr "Partner"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Note"
-msgstr "Notering"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:598
-msgid "Free-busy URL"
-msgstr "Ledig/Upptagen-URL"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Spara i adressboken"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Det finns inga objekt att visa i denna vy\n"
-"\n"
-"Dubbelklicka här för att skapa en ny kontakt."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Tomma blanketter vid slutet:"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Meddelandetext"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Underst:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensioner:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Typsnitt..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Typsnitt"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Sidfot:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Format"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Rubrik"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Rubrik/sidfot"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Rubriker"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Rubriker för varje brev"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Höjd:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Följ omedelbart efter varandra"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Inkludera:"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Liggande"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Vänster:"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Brevflikar på sidan"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marginaler"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Antal kolumner:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Alternativ"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Orientering"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Sida"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Sidinställningar:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papper"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Papperskälla:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Stående"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Förhandsgranska:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Skriv ut med grå skuggning"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Vänd jämna sidor"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Höger:"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sektioner:"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Skuggning"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Storlek:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Börja på en ny sida"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Stil:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Överst:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:76
-msgid "Type:"
-msgstr "Typ:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Bredd:"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolutions kalenderkanal"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurationsverktyg för evolutions kalenderkanal.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Fel vid kommunikation med kalenderserver"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunde inte läsa pilotens kalenderprogramblock"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolutions att-göra-kanal"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Kunde inte läsa pilotens att-göra-programblock"
-
-#: calendar/gui/calendar-commands.c:248
-msgid "File not found"
-msgstr "Filen hittades inte"
-
-#: calendar/gui/calendar-commands.c:272
-msgid "Open calendar"
-msgstr "Öppna kalender"
-
-#: calendar/gui/calendar-commands.c:314
-msgid "Save calendar"
-msgstr "Spara kalender"
-
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Kunde inte skapa kalendervyn. Var vänlig och kontrollera din ORBit- och "
-"OAF-installation."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y-%m-%d %H.%M.%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y-%m-%d %I.%M.%S %p"
-
-#: calendar/gui/calendar-model.c:379 po/tmp/task-editor-dialog.glade.h:21
-msgid "Public"
-msgstr "Publikt"
-
-#: calendar/gui/calendar-model.c:382 po/tmp/task-editor-dialog.glade.h:20
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:385 po/tmp/task-editor-dialog.glade.h:11
-msgid "Confidential"
-msgstr "Konfidentiellt"
-
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1607 calendar/gui/event-editor.c:1634
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Okänt"
-
-#: calendar/gui/calendar-model.c:476
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:476
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:478
-msgid "E"
-msgstr "Ö"
-
-#: calendar/gui/calendar-model.c:478
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Transparent"
-msgstr "Genomskinlig"
-
-#: calendar/gui/calendar-model.c:553
-msgid "Opaque"
-msgstr "Ogenomskinlig"
-
-#: calendar/gui/calendar-model.c:779
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datumet måste anges i formatet: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:898
-msgid "%I:%M:%S %p%n"
-msgstr "%I.%M.%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:901
-msgid "%H:%M:%S%n"
-msgstr "%H.%M.%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:905
-msgid "%I:%M %p%n"
-msgstr "%I.%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H.%M%n"
-
-#: calendar/gui/calendar-model.c:1028
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiska positionen måste anges i formatet: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1068
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Procentvärdet måste vara mellan 0 och 100"
-
-#: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten måste vara mellan 1 och 9"
-
-#: calendar/gui/calendar-summary.c:197
-msgid "%A, %e %B %Y"
-msgstr "%A %e %B %Y"
-
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
-msgid "%I:%M%p"
-msgstr "%H.%M"
-
-#: calendar/gui/calendar-summary.c:438
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fel vid inläsning av kalender</b>"
-
-#: calendar/gui/calendar-summary.c:450
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fel vid inläsning av kalender:<br>Stödjer inte metoden."
-
-#: calendar/gui/calendar-summary.c:620
-msgid "Display"
-msgstr "Visa"
-
-#: calendar/gui/calendar-summary.c:625
-msgid "Show appointments"
-msgstr "Visa möten"
-
-#: calendar/gui/calendar-summary.c:633
-msgid "Show tasks"
-msgstr "Visa uppgifter"
-
-#: calendar/gui/calendar-summary.c:719
-msgid "Loading Calendar"
-msgstr "Läser in kalendern"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI:n som kalendern kommer att visa"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm på %A %d %b %Y %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Avisering om ditt möte på %A %d %b %Y %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Ingen sammanfattning finns tillgänglig."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:15
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:16 po/tmp/evolution.xml.h:7
-msgid "Close"
-msgstr "Stäng"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Redigera möte"
-
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Slumra"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Slumringstid (minuter)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minuter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minuter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 timmar (fm/em)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minuter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 timmar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minuter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minuter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Ljudalarm stängs av efter"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Ljudalarm"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Pip när alarmfönster visas."
-
-#: po/tmp/cal-prefs-dialog.glade.h:16 po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar"
-msgstr "Kalender"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Kalenderinställningar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Färger"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Tryck ihop helger"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Alternativ för datumnavigerare"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Standardvärden"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Visningsalternativ"
-
-#: calendar/gui/e-calendar-table.c:159 po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Förfallodatum"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Aktivera slummer i"
-
-#: po/tmp/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Dagen slutar:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Första dagen i veckan:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "fre"
-
-#: calendar/gui/event-editor.c:485 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "fredag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Markera"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Objekt som ska ha utförts idag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Objekt som ska ha utförts idag:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr "Objekt som inte ska utföras än"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "Objekt som inte ska utföras än:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "mån"
-
-#: calendar/gui/event-editor.c:481 po/tmp/cal-prefs-dialog.glade.h:35
-msgid "Monday"
-msgstr "måndag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "objekt som skulle ha utförts"
-
-#: po/tmp/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Objekt som skulle ha utförts:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Välj en färg"
-
-#: calendar/gui/e-calendar-table.c:162 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "Prioritet"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Påminn mig om alla möten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:41 po/tmp/event-editor-dialog.glade.h:25
-msgid "Reminders"
-msgstr "Påminnare"
-
-#: po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "lör"
-
-#: calendar/gui/event-editor.c:486 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "lördag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Visa"
-
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Visa sluttiderna på möten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Visa veckonummer"
-
-#: po/tmp/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Dagen startar:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "sön"
-
-#: calendar/gui/event-editor.c:487 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "söndag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "Uppgiftsyta"
-
-#: po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "tor"
-
-#: calendar/gui/event-editor.c:484 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "torsdag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "Tid till förfallodatum"
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Tidsdivisioner:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Tidsformat:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "tis"
-
-#: calendar/gui/event-editor.c:482 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "tisdag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Visuella alarm"
-
-#: po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "ons"
-
-#: calendar/gui/event-editor.c:483 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Arbetsvecka"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minuter innan de sker."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63 po/tmp/mail-config.glade.h:82
-msgid "seconds."
-msgstr "sekunder."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Är du säker på att du vill ta bort mötet \"%s\""
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Vill du spara ändringar?"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% färdig_t:"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "K_lassifikation:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Avbruten"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Färdigt"
-
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Datum utfört:"
-
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Hög"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "Pågår"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Låg"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:746 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:906 po/tmp/mail-config.glade.h:48
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1119
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Inte startad"
-
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "Sta_rt Date:"
-msgstr "Sta_rtdatum:"
-
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Su_mmary"
-msgstr "Sa_mmanfattning"
-
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Uppgift"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "Undefined"
-msgstr "Odefinierad"
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Due Date:"
-msgstr "Förfallo_datum:"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "_Status:"
-msgstr "_Status:"
-
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:693
-msgid "Edit Task"
-msgstr "Redigera uppgift"
-
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:383
-msgid "No summary"
-msgstr "Ingen sammanfattning"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Appointment - %s"
-msgstr "Möte - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:392
-#, c-format
-msgid "Task - %s"
-msgstr "Uppgift - %s"
-
-#: calendar/gui/dialogs/task-editor.c:711 calendar/gui/event-editor.c:395
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Dagbokspost - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategorier"
-
-#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:11
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Färdigdatum"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Slutdatum"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Startdatum"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Geografisk position"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Procent klar"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Sammanfattning"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Genomskinlighet"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarm"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Klicka här för att lägga till en uppgift"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Märk som färdig"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Märk uppgiften som färdig"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Redigera denna uppgift..."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Redigera uppgiften"
-
-#: calendar/gui/e-calendar-table.c:407
-#: po/tmp/evolution-task-editor-dialog.xml.h:24
-msgid "Delete this task"
-msgstr "Ta bort denna uppgift"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Ta bort uppgiften"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutdivisioner"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1270
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1284
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1297
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:552 calendar/gui/e-week-view.c:286
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "fm"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "em"
-
-#: calendar/gui/e-day-view.c:3007 calendar/gui/e-day-view.c:3016
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3210
-#: calendar/gui/e-week-view.c:3219 calendar/gui/e-week-view.c:3233
-msgid "New appointment..."
-msgstr "Nytt möte..."
-
-#: calendar/gui/e-day-view.c:3011 calendar/gui/e-day-view.c:3024
-#: calendar/gui/e-week-view.c:3214 calendar/gui/e-week-view.c:3227
-msgid "Edit this appointment..."
-msgstr "Redigera detta möte..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-week-view.c:3215
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "Delete this appointment"
-msgstr "Ta bort detta möte"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Gör detta möte flyttbart"
-
-#: calendar/gui/e-day-view.c:3025 calendar/gui/e-week-view.c:3228
-msgid "Delete this occurrence"
-msgstr "Ta bort denna förekomst"
-
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3229
-msgid "Delete all occurrences"
-msgstr "Ta bort alla förekomster"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Komponenten uppdaterades utan problem."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Ett fel uppstod när kalenderfilen lästes in."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Jag kunde inte läsa in din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Jag kunde inte läsa din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Detta är ett svar från någon som inte var inbjuden!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Jag kunde inte uppdatera ditt kalenderlagringsplats."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Jag kunde inte ta bort kalenderkomponenten!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Komponenten togs bort utan problem."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Jag känner inte igen denna typ av kalenderkomponent."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Lägg till i kalender"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Acceptera"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Neka"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Preliminär"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Uppdatera kalender"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Avboka möte"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Alla"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunde inte läsa in uppgifterna i \"%s\""
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "He_ldagsarrangemang"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment"
-msgstr "Möte"
-
-#: po/tmp/event-editor-dialog.glade.h:9
-msgid "Appointment Basics"
-msgstr "Grundläggande mötessaker"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Custom recurrence"
-msgstr "Anpassad upprepning"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Var"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Undantag"
-
-#: po/tmp/event-editor-dialog.glade.h:16
-msgid "Modify"
-msgstr "Ändra"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "No recurrence"
-msgstr "Ingen upprepning"
-
-#: calendar/gui/event-editor.c:1594 po/tmp/event-editor-dialog.glade.h:18
-msgid "Play a sound"
-msgstr "Spela ett ljud"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Preview"
-msgstr "Förhandsgranska"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "Pu_blic"
-msgstr "Pu_blikt"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Recurrence"
-msgstr "Upprepning"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Recurrence Rule"
-msgstr "Upprepningsregel"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Reminder"
-msgstr "Påminnare"
-
-#: calendar/gui/event-editor.c:1603 po/tmp/event-editor-dialog.glade.h:26
-msgid "Run a program"
-msgstr "Kör ett program"
-
-#: calendar/gui/event-editor.c:1600 po/tmp/event-editor-dialog.glade.h:27
-msgid "Send an email"
-msgstr "Skicka ett brev"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Settings..."
-msgstr "Inställningar..."
-
-#: calendar/gui/event-editor.c:1597 po/tmp/event-editor-dialog.glade.h:29
-msgid "Show a dialog"
-msgstr "Visa ett dialogfönster"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Simple recurrence"
-msgstr "Enkel upprepning"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "Su_mmary:"
-msgstr "Sa_mmanfattning:"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "Time"
-msgstr "Tid"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Confidential"
-msgstr "_Konfidentiellt"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Contacts"
-msgstr "_Kontakter"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Slutti_d:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Start time:"
-msgstr "_Starttid:"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Starting date:"
-msgstr "_Startdatum:"
-
-#: filter/libfilter-i18n.h:25 po/tmp/event-editor-dialog.glade.h:38
-msgid "after"
-msgstr "efter"
-
-#: filter/libfilter-i18n.h:26 po/tmp/event-editor-dialog.glade.h:39
-msgid "before"
-msgstr "före"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "day(s)"
-msgstr "dag"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "end of appointment"
-msgstr "slut på möte"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "i"
-
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "för alltid"
-
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "hour(s)"
-msgstr "timme/timmar"
-
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "label21"
-msgstr "label21"
-
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "label55"
-msgstr "label55"
-
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "minute(s)"
-msgstr "minut(er)"
-
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "month(s)"
-msgstr "månad(er)"
-
-#: po/tmp/event-editor-dialog.glade.h:50
-msgid "start of appointment"
-msgstr "start på möte"
-
-#: po/tmp/event-editor-dialog.glade.h:51
-msgid "until"
-msgstr "till"
-
-#: po/tmp/event-editor-dialog.glade.h:52
-msgid "week(s)"
-msgstr "vecka"
-
-#: po/tmp/event-editor-dialog.glade.h:53
-msgid "year(s)"
-msgstr "år"
-
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Redigera möte"
-
-#: calendar/gui/event-editor.c:455
-msgid "on"
-msgstr "vid"
-
-#: calendar/gui/event-editor.c:480 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:607
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:614
-msgid "th"
-msgstr ":e"
-
-#: calendar/gui/event-editor.c:760
-msgid "occurrences"
-msgstr "förekomster"
-
-#: calendar/gui/event-editor.c:877
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
-
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d days"
-msgstr " %d dagar"
-
-#: calendar/gui/event-editor.c:1551
-msgid " 1 day"
-msgstr " 1 dag"
-
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d weeks"
-msgstr " %d veckor"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 week"
-msgstr " 1 vecka"
-
-#: calendar/gui/event-editor.c:1559
-#, c-format
-msgid " %d hours"
-msgstr " %d timmar"
-
-#: calendar/gui/event-editor.c:1561
-msgid " 1 hour"
-msgstr " 1 timme"
-
-#: calendar/gui/event-editor.c:1564
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuter"
-
-#: calendar/gui/event-editor.c:1566
-msgid " 1 minute"
-msgstr " 1 minut"
-
-#: calendar/gui/event-editor.c:1569
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekunder"
-
-#: calendar/gui/event-editor.c:1571
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor.c:1618
-msgid " before start of appointment"
-msgstr " innan start på möte"
-
-#: calendar/gui/event-editor.c:1620
-msgid " after start of appointment"
-msgstr " efter start på möte"
-
-#: calendar/gui/event-editor.c:1628
-msgid " before end of appointment"
-msgstr " före slut på möte"
-
-#: calendar/gui/event-editor.c:1630
-msgid " after end of appointment"
-msgstr " efter slut på möte"
-
-#: calendar/gui/event-editor.c:3251 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kunde inte öppna mappen i \"%s\""
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-msgid "April"
-msgstr "april"
-
-#: po/tmp/goto-dialog.glade.h:7
-msgid "August"
-msgstr "augusti"
-
-#: po/tmp/goto-dialog.glade.h:8
-msgid "December"
-msgstr "december"
-
-#: po/tmp/goto-dialog.glade.h:9
-msgid "February"
-msgstr "februari"
-
-#: po/tmp/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr "Gå till datum"
-
-#: po/tmp/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr "Gå till idag"
-
-#: po/tmp/goto-dialog.glade.h:12
-msgid "January"
-msgstr "januari"
-
-#: po/tmp/goto-dialog.glade.h:13
-msgid "July"
-msgstr "juli"
-
-#: po/tmp/goto-dialog.glade.h:14
-msgid "June"
-msgstr "juni"
-
-#: po/tmp/goto-dialog.glade.h:15
-msgid "March"
-msgstr "mars"
-
-#: po/tmp/goto-dialog.glade.h:16
-msgid "May"
-msgstr "maj"
-
-#: po/tmp/goto-dialog.glade.h:17
-msgid "November"
-msgstr "november"
-
-#: po/tmp/goto-dialog.glade.h:18
-msgid "October"
-msgstr "oktober"
-
-#: po/tmp/goto-dialog.glade.h:19
-msgid "September"
-msgstr "september"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kunde inte initiera Gnome"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1:a"
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2:a"
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3:e"
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4:e"
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5:e"
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6:e"
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7:e"
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8:e"
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "9:e"
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10:e"
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11:e"
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12:e"
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13:e"
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14:e"
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15:e"
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16:e"
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17:e"
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18:e"
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19:e"
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20:e"
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21:a"
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22:a"
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23:e"
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24:e"
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25:e"
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26:e"
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27:e"
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28:e"
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29:e"
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "30:e"
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31:a"
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Sö"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Må"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Ti"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "On"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "To"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Fr"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Lö"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Aktuell dag (%a %d %b %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%a %d %b"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Aktuell vecka (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Aktuell månad (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Aktuellt år (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Skriv ut kalender"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1036
-msgid "Print Preview"
-msgstr "Förhandsgranska"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "URI:t som uppgiftsmappen ska visa"
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "SMTOTFL"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Fel vid tolkning av filter: %s: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Fel vid körning av filter: %s: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Fel vid körning av filtersökning: %s: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan inte tolka sökuttrycket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fel vid körning av sökuttrycket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Utför fråga på okänt huvud: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ogiltig typ i \"body-contains\", förväntar sträng"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunde inte skapa låsfil för %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Tidsgränsen överskreds när låsfil skulle fås för %s. Försök igen senare."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Misslyckades med att få lås med fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Misslyckades med att få lås med flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Kunde inte kontrollera brevlådefilen %s: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Kunde inte öppna brevlådefilen %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Kunde inte öppna temporära brevlådefilen %s: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunde inte testa låsfilen för %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fel vid läsning av brevlådefil: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fel vid skrivande av temporär brevlådefil: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Kunde inte skapa rör: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Kunde inte grena: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Programmet movemail misslyckades: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Okänt fel)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Kunde inte läsa in %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Kunde inte läsa in %s: Ingen initialiseringskod i modulen."
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "%s-server %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-tjänst för %s på %s"
-
-#: camel/camel-remote-store.c:314
-msgid "Connection cancelled"
-msgstr "Anslutning avbruten"
-
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:330
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunde inte ansluta till %s (port %d): %s"
-
-#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
-msgid "(unknown host)"
-msgstr "(okänd värd)"
-
-#: camel/camel-remote-store.c:422 camel/camel-remote-store.c:484
-#: camel/camel-remote-store.c:552
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Operation avbruten"
-
-#: camel/camel-search-private.c:105
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
-
-#: camel/camel-service.c:138
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL:en \"%s\" behöver ett användarnamn"
-
-#: camel/camel-service.c:147
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL:en \"%s\" behöver ett värdnamn"
-
-#: camel/camel-service.c:156
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL:en \"%s\" behöver en sökväg"
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "No such host %s."
-msgstr "Det finns ingen värd med namnet %s."
-
-#: camel/camel-service.c:526
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Kunde temporärt inte slå upp värdnamnet %s."
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Det finns ingen leverantör för protokollet \"%s\""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Kunde inte skapa katalogen %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "URL-strängen \"%s\" innehåller inget protokoll"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL-strängen \"%s\" innehåller ett ogiltigt protokoll"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Portnumret i URL:en \"%s\" består inte av siffror"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kunde inte få Kerberos-biljett:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Felaktigt autentiseringssvar från servern."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Oväntat svar från IMAP-servern: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP-kommandot misslyckades: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Okänt fel"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Serversvaret tog slut för tidigt."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP-serversvaret innehöll inte %s-information"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Oväntat OK-svar från IMAP-servern: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Kunde inte läsa in sammanfattning för %s"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "För läsande och lagrande av e-post på IMAP-servrar."
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Det här alternativet ansluter till IMAP-servern med ett lösenord i klartext."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Detta alternativ kommer att ansluta till IMAP-servern med Kerberos "
-"4-autentisering."
-
-#: camel/providers/imap/camel-imap-store.c:368
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sVar vänlig och ange IMAP-lösenordet för %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:396
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Kunde inte autentisera till IMAP-servern.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:652
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kunde inte skapa katalogen %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "Brevlådekataloger i MH-format"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "För lagrande av e-post i MH-liknande brevlådekataloger"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standard Unix-brevlådefil"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "För lagrande av e-post i standard-mbox-format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Brevlådefiler i Qmail maildir-format"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "För lagrande av e-post i qmail maildir-liknande kataloger"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Lagringsroten %s är inte en absolut sökväg"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Lagringsroten %s är ingen vanlig katalog"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan inte få mapp: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokala lagringar har ingen rotmapp"
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokala lagringar har ingen standardmapp"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokala mappar kan inte nästlas."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokal brevlådefil %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunde inte byta namn på mappen %s till %s: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan inte hämta meddelande: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Det finns inget sådant meddelande"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Ogiltigt meddelandeinnehåll"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte öppna mappen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Mappen \"%s\" finns inte."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "\"%s\" är inte en brevlådekatalog."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunde inte ta bort mappen \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "är inte en brevlådekatalog"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan inte öppna brevlåda: %s %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen verkar vara obotligt skadad."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kan inte öppna filen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte skapa filen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "\"%s\" är ingen vanlig fil."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte ta bort mappen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
-
-#: camel/providers/local/camel-mbox-summary.c:240
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunde inte öppna mapp: %s: summerar från position %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:274
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
-
-#: camel/providers/local/camel-mbox-summary.c:349
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan inte summera mapp: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kunde inte öppna mapp för att summera: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:499
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Kan inte öppna temporär brevlåda: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Summeringen stämmer inte överens, avbryter synk"
-
-#: camel/providers/local/camel-mbox-summary.c:571
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fel vid skrivning av temporär brevlåda: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:588
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kunde inte stänga källmappen %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:615
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Kunde inte stänga temporära mapp: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kunde inte byta namn på mapp: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:836
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Okänt fel: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" är inte en katalog."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Var vänlig och ange NNTP-lösenordet för %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Servern avvisade användarnamnet"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Misslyckades med att skicka användarnamnet till servern"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Servern avvisade användarnamnet/lösenordet"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Meddelandet %s hittades inte."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunde inte hämta grupplista från servern."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Kan inte läsa in grupplistefilen för %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kan inte spara grupplistefilen för %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET-diskussionsgrupper"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Det här är en leverantör för läsning och postning till "
-"USENET-diskussionsgrupper."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Kunde inte öppna katalog för diskussionsgruppsserver: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET-diskussionsgrupper via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Det här alternativet kommer att autentisera med NNTP-servern genom att "
-"använda ett klartextlösenord."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kunde inte öppna mapp: meddelandelistningen var inte komplett."
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "Inget meddelande med uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"För anslutning till POP-servrar. POP-protokollet kan även användas för att "
-"hämta e-post från vissa webb-epostleverantörer och slutna e-postsystem."
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Det här alternativet kommer att ansluta till POP-servern med ett "
-"klartextlösenord. Det här är det enda alternativet som stöds hos många "
-"POP-servrar."
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Det här alternativet kommer att ansluta till POP-servern genom att använda "
-"ett krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar "
-"för alla användare även med servrar som sägs stöda detta."
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Det här kommer att ansluta till POP-servern och använda Kerberos 4 för att "
-"autentisera med den."
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunde inte autentisera till KPOP-server: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:332
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kunde inte ansluta till POP-servern på %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:379
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sVar vänlig och ange ett POP3-lösenord för %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:398
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Kunde inte ansluta till POP-servern,\n"
-"Fel vid skickande av filnamn: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:401
-#: camel/providers/pop3/camel-pop3-store.c:438
-msgid "(Unknown)"
-msgstr "(Okänd)"
-
-#: camel/providers/pop3/camel-pop3-store.c:428
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"Kan inte ansluta till POP-servern.\n"
-"Inget stöd för begärd autentiseringsmekanism."
-
-#: camel/providers/pop3/camel-pop3-store.c:436
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"Kan inte ansluta till POP-server.\n"
-"Fel vid skickande av lösenord: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:545
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Det finns ingen mapp \"%s\"."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:65
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"För leverans av e-post genom att skicka det till programmet \"sendmail\" på "
-"det lokala systemet."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Kunde inte skicka meddelande: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail avslutade med signal %s: brevet skickades inte."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Kunde inte köra %s: brevet skickades inte."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail avslutade med status %d: brevet skickades inte."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "E-postleverans via programmet sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 po/tmp/mail-config.glade.h:60
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"För leverans av e-post genom anslutning till ett fjärr-epostnav som använder "
-"SMTP.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Syntaxfel, okänt kommando"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntaxfel i parametrar eller argument"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Kommandot inte implementerat"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Kommandoparameter inte implementerad"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Systemstatus, eller svar från systemhjälp"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Hjälpmeddelande"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Tjänsten klar"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Tjänsten stänger överföringskanalen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Tjänsten inte tillgänglig, stänger överföringskanalen"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Efterfrågad e-poståtgärd okej, färdig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Användaren inte lokal; vidarebefordrar till <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Efterfrågad e-poståtgärd inte utförd: brevlådan inte tillgänglig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Efterfrågad åtgärd inte utförd: brevlådan inte tillgänglig"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Efterfrågad åtgärd avbruten: fel i behandling"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Användaren inte lokal; försök med <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Efterfrågad åtgärd inte utförd: otillräckligt systemutrymme"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Efterfrågad åtgärd avbruten: överskriden utrymmesallokering"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Efterfrågad åtgärd inte utförd: brevlådenamn inte tillåtet"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Börja skriva in brevet, avsluta med <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Transaktionen misslyckades"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Ingen autentisering krävs"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Det här alternativet kommer att ansluta till SMTP-servern utan någon form av "
-"autentisering. Detta bör fungera för anslutning till de flesta SMTP-servrar."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353
-#: po/tmp/mail-config.glade.h:15
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Detta alternativ kommer att ansluta till SMTP-servern med "
-"CRAM-MD5-autentisering."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP-server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP-epostleverans via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan inte skicka meddelande: avsändaradressen är inte angiven."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Tidsgränsen för HELO-begäran passerades: %s: inte ödesdigert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Fel i HELO-svar: %s: inte ödesdigert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-"Tidsgränsen för MAIL FROM-begäran passerades: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Tidsgränsen för RCPT TO-begäran passerades: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "Tidsgränsen för DATA-begäran passerades: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Fel i DATA-svar: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "Tidsgränsen för DATA-skickande passerades: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Tidsgränsen för RSET-begäran passerades: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "Fel i RSET-svar: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Tidsgränsen för QUIT-begäran passerades: %s: inte ödesdigert"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Fel i QUIT-svar: %s: inte ödesdigert"
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Det finns inget sådant meddelande: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "E-postleverantör för virtuell mapp"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "För läsande av e-post som en fråga av en annan samling mappar"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 byte"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u byte"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fk"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "bilaga"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
-msgid "Attach a file"
-msgstr "Bifoga en fil"
-
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Ta bort"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Ta bort markerade objekt från bifogningslistan"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Lägg till bilaga..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Bifoga en fil till meddelandet"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/message-list.c:1152 po/tmp/e-msg-composer-attachment.glade.h:6
-msgid "Attachment"
-msgstr "Bilaga"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-msgid "Attachment properties"
-msgstr "Egenskaper hos bilagan"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:9
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:10
-msgid "Inline attachment"
-msgstr "Inkluderad bilaga"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:11
-msgid "MIME type:"
-msgstr "MIME-typ:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:12
-msgid "Send as:"
-msgstr "Skicka som:"
-
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Från:"
-
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klicka här för att ta fram adressboken"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Ange den identitet som du vill skicka detta meddelande ifrån"
-
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
-msgid "To:"
-msgstr "Till:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the recipients of the message"
-msgstr "Ange meddelandets mottagare"
-
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:397
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Ange adresserna som ska få en kopia av meddelandet"
-
-#: composer/e-msg-composer-hdrs.c:402
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:403
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan "
-"att visas i mottagarlistan av meddelandet."
-
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Ämne:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Ange ämnet på brevet"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kunde inte öppna signaturfilen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Spara som..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fel vid sparande av filen: %s"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fel vid inläsning av filen: %s"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Sparar ändringar i meddelandet..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Sparar ändringar i meddelande..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Fel vid sparande av alster i \"Drafts\": %s"
-
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Meddelandet har inte skickats än.\n"
-"\n"
-"Vill du spara dina ändringar?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Öppna fil"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Den filen finns inte."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Det är ingen vanlig fil."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Den filen finns, men är inte läsbar."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Filen verkade åtkomlig, men open(2) misslyckades."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Filen är mycket stor (större än 100kB).\n"
-"Är du säker på att du vill infoga den?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Ett fel uppstod vid läsning av filen."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Skriv ett meddelande"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Kunde inte skapa fönster för meddelanderedigering."
-
-#: composer/evolution-composer.c:360
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan inte initiera Evolutions e-postredigerare."
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Du kan välja en annan HTML-sida som bakgrund för sammanfattningen.\n"
-"\n"
-"Lämna fältet tomt för att få standardsidan."
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Öppna %s med det program som är standard i Gnome"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Öppna %s med standardwebbläsaren i Gnome"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Skicka e-post till %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Ändra vy till %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Kör %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Stäng %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flytta %s till vänster"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flytta %s till höger"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Flytta %s till föregående rad"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Flytta %s till nästa rad"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigura %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kunde inte öppna HTML-filen:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fel vid läsning av data:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Filen har ingen plats för tjänsterna.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
-"Om du fick en varning om RootPOA, betyder det förmodligen att\n"
-"du kompilerade Bonobo med GOAD i stället för OAF."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Fel"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "år"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "år"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "månad"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "månader"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "vecka"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "veckor"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dagar"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "timme"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "timmar"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minut"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuter"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "sekunder"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Hoppsan. Du har glömt välja ett datum."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Hoppsan. Du har valt ett ogiltigt datum."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"den tid då filtret körs eller en virtuell\n"
-"mapp öppnas."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"datumet som du anger här."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"en tid som är relativ till den då filtret\n"
-"körs; \"en vecka sen\" till exempel."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "aktuell tid"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "en tid du anger"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "en tid som är relativ till aktuell tid"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Jämför med"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "nu"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<klicka här för att välja ett datum>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Lägg till filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redigera filterregel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "inkommande"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "utgående"
-
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
-msgid "Edit Filters"
-msgstr "Redigera filter"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Då"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Lägg till åtgärd"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Ta bort åtgärd"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Hoppsan, du glömde välja en mapp.\n"
-"Var vänlig och gå tillbaka och ange en giltig mapp som e-post kan levereras "
-"till."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Välj mapp"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Ange mappens URI"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<klicka här för att välja en mapp>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fel i reguljära uttrycket \"%s\":\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Regelnamn: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Namnlös"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Om"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Utför åtgärder"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "om alla villkor uppfylls"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "om något villkor uppfylls"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Lägg till villkor"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Ta bort villkor"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Svarade till"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Viktigt"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Läs"
-
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Redigera virtuella mappar"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "Inkommande"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "Utgående"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Virtuella mappar"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Källor för virtuella mappar"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Tilldela färg"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Tilldela poäng"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Kopiera till mapp"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Ankomstdatum"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Avsändningsdatum"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Uttryck"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Vidarebefordra till adress"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Meddelandetext"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Meddelandehuvud"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Meddelandet mottogs"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Meddelandet skickades"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Flytta till mapp"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Mottagare"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Sökning med reguljärt uttryck"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1152
-msgid "Score"
-msgstr "Poäng"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Avsändare"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Ställ in status"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Källa"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Specifikt huvud"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
-msgid "Status"
-msgstr "Status"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stoppa behandling"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
-msgid "Subject"
-msgstr "Ämne"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "innehåller"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "innehåller inte"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "slutar inte med"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "låter inte som"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "börjar inte med"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "slutar med"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "finns"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "är större än"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "är mindre än"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "är inte"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "är"
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "den eller efter"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "den eller innan"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "låter som"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "börjar med"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "var efter"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "var före"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Lägg till regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Redigera poängregel"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Lägg till regel för virtuell mapp"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redigera regel för virtuell mapp"
-
-#: mail/component-factory.c:294
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan inte initiera Evolutions e-postkomponent."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "Kan inte registrera lagring hos skal"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Lagra sökning som vMapp"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Meddelandetexten eller ämnet innehåller"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Meddelandetexten innehåller"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Ämnesraden innehåller"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Meddelandetexten innehåller inte"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Ämnesraden innehåller inte"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Avsändaren innehåller"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Virtuell mapp på ämnesrad"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Virtuell mapp på avsändare"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Virtuell mapp på mottagare"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Filtrera på ämnesrad"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Filtrera på avsändare"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Filtrera på mottagare"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "Filtrera på sändlista"
-
-#: mail/folder-browser.c:669 po/tmp/evolution-calendar.xml.h:22
-#: po/tmp/evolution-message-composer.xml.h:15
-msgid "Open"
-msgstr "Öppna"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Spara som..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:25
-#: po/tmp/evolution-mail.xml.h:31 po/tmp/evolution-tasks.xml.h:9
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Svara till avsändaren"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
-msgid "Reply to All"
-msgstr "Svara till alla"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
-msgid "Forward"
-msgstr "Vidarebefordra"
-
-#: mail/folder-browser.c:677 po/tmp/evolution-mail.xml.h:18
-msgid "Forward inline"
-msgstr "Vidarebefordra inuti"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Märk som läst"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Märk som oläst"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Flytta till mapp..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Kopiera till mapp..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Ångra borttagning"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Tillämpa filter"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Skapa regel från meddelande"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtrera på sändlista (%s)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-msgid "Current store format:"
-msgstr "Aktuellt lagringsformat:"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr "Brevlådeformat"
-
-#: po/tmp/local-config.glade.h:8
-msgid "New store format:"
-msgstr "Nytt lagringsformat:"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr ""
-"Observera: Vid konvertering mellan brevlådeformat kommer ett misslyckande\n"
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr "maildir"
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr "mbox"
-
-#: po/tmp/local-config.glade.h:14
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (standard)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Evolution Kontohantering"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"En eller flera av dina servrar är inte korrekt konfigurerade.\n"
-"Vill du spara i alla fall?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Evolution kontoeditor"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "Skicka e-post till %s"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Ämnesraden är %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "Hämta e-post från %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "Sändlistan %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Du har inte konfigurerat e-postklienten.\n"
-"Du måste göra detta innan du kan skicka,\n"
-"ta emot eller skriva nya brev.\n"
-"Vill du konfigurera det nu?"
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Du måste konfigurera en identititet\n"
-"innan du kan skriva brev."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Du måste konfigurera en e-posttransport\n"
-"innan du kan skriva brev."
-
-#: mail/mail-callbacks.c:192
-msgid "You have not set a mail transport method"
-msgstr "Du har inte angivit någon e-posttransportmetod"
-
-#: mail/mail-callbacks.c:225
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Detta meddelande har ingen ämnesrad.\n"
-"Vill du verkligen skicka?"
-
-#: mail/mail-callbacks.c:291
-msgid "You must configure an account before you can send this email."
-msgstr "Du måste konfigurera ett konto innan du kan skicka brevet."
-
-#: mail/mail-callbacks.c:311
-msgid "You must specify recipients in order to send this message."
-msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
-
-#: mail/mail-callbacks.c:536
-msgid "Forwarded message:\n"
-msgstr "Vidarebefordrat meddelande:\n"
-
-#: mail/mail-callbacks.c:619
-msgid "Move message(s) to"
-msgstr "Flytta meddelande(n) till"
-
-#: mail/mail-callbacks.c:621
-msgid "Copy message(s) to"
-msgstr "Kopiera meddelande(n) till"
-
-#: mail/mail-callbacks.c:756
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Du kan bara redigera meddelanden\n"
-"som du sparat i mappen Drafts."
-
-#: mail/mail-callbacks.c:789 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Skriv över fil?"
-
-#: mail/mail-callbacks.c:793 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Det finns redan en fil med det namnet.\n"
-"Ska den skrivas över?"
-
-#: mail/mail-callbacks.c:837
-msgid "Save Message As..."
-msgstr "Spara meddelande som..."
-
-#: mail/mail-callbacks.c:839
-msgid "Save Messages As..."
-msgstr "Spara meddelanden som..."
-
-#: mail/mail-callbacks.c:947
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fel vid läsning av filterinformation:\n"
-"%s"
-
-#: mail/mail-callbacks.c:996
-msgid "Print Message"
-msgstr "Skriv ut meddelande"
-
-#: mail/mail-callbacks.c:1043
-msgid "Printing of message failed"
-msgstr "Utskrift av meddelande misslyckades"
-
-#: mail/mail-config.c:806
-msgid "Connecting to server"
-msgstr "Ansluter till server"
-
-#: mail/mail-config.c:808
-msgid "Connect to server"
-msgstr "Anslut till server"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
-msgid "Account"
-msgstr "Konto"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Kontoinformation"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "Kontohantering"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "Kontoegenskaper"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Autentiseringstyp:"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Check settings"
-msgstr "Kontrollera inställningarna"
-
-#: po/tmp/mail-config.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Gratulerar, din e-postkonfiguration är färdig.\n"
-
-#: po/tmp/mail-config.glade.h:23
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:24
-msgid "Default"
-msgstr "Standard"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "Done"
-msgstr "Klar"
-
-#: po/tmp/mail-config.glade.h:27
-msgid "E-Mail Address:"
-msgstr "E-postadress:"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Email Address:"
-msgstr "E-postadress:"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-postkonfiguration"
-
-#: po/tmp/mail-config.glade.h:31
-msgid "Full Name:"
-msgstr "Fullständigt namn:"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Hostname:"
-msgstr "Värd:"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Identity"
-msgstr "Identitet"
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Incoming Mail Server"
-msgstr "Server för inkommande post"
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Keep mail on server"
-msgstr "Spara meddelanden på servern"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail"
-msgstr "E-post"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Account"
-msgstr "Epostkonton"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration"
-msgstr "E-postkonfiguration"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Mail Configuration Druid"
-msgstr "E-postkonfigurationsguide"
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Make this my default account"
-msgstr "Gör detta till mitt standardkonto"
-
-#: po/tmp/mail-config.glade.h:44
-msgid "Mark messages as \"Read\" after:"
-msgstr "Märk meddelanden som \"Läst\" efter: "
-
-#: po/tmp/mail-config.glade.h:45
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "News"
-msgstr "Diskussionsgrupper"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Optional"
-msgstr "Valfri"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Outgoing Mail Server"
-msgstr "Server för utgående post"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: po/tmp/mail-config.glade.h:55
-msgid "Plain Text"
-msgstr "Vanlig text"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Receiving Email"
-msgstr "Tar emot e-post"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "Remember my password"
-msgstr "Kom ihåg mitt lösenord"
-
-#: mail/mail-format.c:629 po/tmp/mail-config.glade.h:58
-msgid "Reply-To:"
-msgstr "Svara-Till:"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Required"
-msgstr "Krävs"
-
-#: po/tmp/mail-config.glade.h:61
-msgid "Save password"
-msgstr "Spara lösenord"
-
-#: po/tmp/mail-config.glade.h:62
-msgid "Select signature file"
-msgstr "Välj signaturfil"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Send mail in HTML format by default."
-msgstr "Skicka brev i HTML-format som standard."
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Sending Email"
-msgstr "Skickar e-post"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Server Configuration"
-msgstr "Serverkonfiguration"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Server Type: "
-msgstr "Servertyp: "
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Server requires authentication"
-msgstr "Servern kräver autentisering"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "Servers"
-msgstr "Servrar"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: po/tmp/mail-config.glade.h:71
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: po/tmp/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Källor"
-
-#: po/tmp/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Servern kräver en säker anslutning (SSL)"
-
-#: po/tmp/mail-config.glade.h:74
-msgid "Type"
-msgstr "Typ"
-
-#: po/tmp/mail-config.glade.h:75
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv in namnet som du vill använda för att referera till dessa servrar, "
-"till exempel: \"Jobb\" eller \"Hemma\"."
-
-#: po/tmp/mail-config.glade.h:77
-msgid "User Information"
-msgstr "Användarinformation"
-
-#: po/tmp/mail-config.glade.h:78
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: po/tmp/mail-config.glade.h:79
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Välkommen till Evolutions guide för e-postkonfiguration.\n"
-
-#: mail/mail-config-druid.c:389
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Misslyckades med att verifiera konfigurationen för inkommande post.\n"
-"Du kan komma att få problem med att hämta post från %s"
-
-#: mail/mail-config-druid.c:479
-msgid "Namespace:"
-msgstr "Namnrymd:"
-
-#: mail/mail-config-druid.c:667
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Misslyckades med att verifiera konfigurationen för utgående post.\n"
-"Du kan komma att få problem med att skicka post med %s"
-
-#. set window title
-#: mail/mail-config-druid.c:1026
-msgid "Evolution Account Wizard"
-msgstr "Kontoguide för Evolution"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Spara bilaga"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunde inte skapa temporär katalog: %s"
-
-#: mail/mail-display.c:290
-msgid "Save to Disk..."
-msgstr "Spara till disk..."
-
-#: mail/mail-display.c:292
-#, c-format
-msgid "Open in %s..."
-msgstr "Öppna i %s..."
-
-#: mail/mail-display.c:294
-msgid "View Inline"
-msgstr "Visa inuti"
-
-#: mail/mail-display.c:323
-msgid "External Viewer"
-msgstr "Externt visningsprogram"
-
-#: mail/mail-display.c:346
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Visa inuti (med %s)"
-
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "Göm"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilaga"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Läser in meddelandeinnehåll"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Krypterat meddelande visas inte"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Krypterat meddelande"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Klicka på ikonen för att dekryptera."
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pekare till FTP-plats (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pekare till lokal fil (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pekare till okänd extern data (typen \"%s\")"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Felaktig del med extern meddelandetext."
-
-#: mail/mail-format.c:1837
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Den %s skrev %s:\n"
-
-#: mail/mail-local.c:211
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Byter format på mappen \"%s\" till \"%s\""
-
-#: mail/mail-local.c:215
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Byt format på mappen \"%s\" till \"%s\""
-
-#: mail/mail-local.c:258
-msgid "Reconfiguring folder"
-msgstr "Omkonfigurerar mapp"
-
-#: mail/mail-local.c:276
-msgid "Closing current folder"
-msgstr "Stänger aktuell mapp"
-
-#: mail/mail-local.c:302
-msgid "Renaming old folder and opening"
-msgstr "Byter namn på gammal mapp och öppnar"
-
-#: mail/mail-local.c:320
-msgid "Creating new folder"
-msgstr "Skapar ny mapp"
-
-#: mail/mail-local.c:334
-msgid "Copying messages"
-msgstr "Kopierar meddelanden"
-
-#: mail/mail-local.c:355
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Kan inte spara metadata för mapp; du kommer antagligen att\n"
-"upptäcka att du inte kan öppna denna mapp längre: %s"
-
-#: mail/mail-local.c:386
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Om du inte längre kan öppna denna brevlåda måste\n"
-"du kanske reparera den manuellt."
-
-#: mail/mail-local.c:794
-msgid "Registering local folder"
-msgstr "Registrerar lokal mapp"
-
-#: mail/mail-local.c:796
-msgid "Register local folder"
-msgstr "Registrera lokal mapp"
-
-#: mail/mail-local.c:900
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Kan inte registrera mappen \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"Fel vid \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:89
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Fel vid utförande av operation:\n"
-"%s"
-
-#: mail/mail-mt.c:385 mail/mail-mt.c:414
-msgid "Working"
-msgstr "Jobbar"
-
-#: mail/mail-ops.c:510
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Skickar \"%s\""
-
-#: mail/mail-ops.c:512
-msgid "Sending message"
-msgstr "Skickar meddelande"
-
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Tillägger \"%s\""
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Tillägger ett meddelande utan en ämnesrad"
-
-#: mail/mail-ops.c:833
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Flyttar meddelanden från \"%s\" till \"%s\""
-
-#: mail/mail-ops.c:835
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopierar meddelanden från \"%s\" till \"%s\""
-
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Flytta meddelanden från \"%s\" till \"%s\""
-
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopiera meddelanden från \"%s\" till \"%s\""
-
-#: mail/mail-ops.c:871
-msgid "Moving"
-msgstr "Flyttar"
-
-#: mail/mail-ops.c:874
-msgid "Copying"
-msgstr "Kopierar"
-
-#: mail/mail-ops.c:894
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s meddelande %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:969
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Genomsöker mappar i \"%s\""
-
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Ingen beskrivning)"
-
-#: mail/mail-ops.c:1100
-msgid "Forwarded messages"
-msgstr "Vidarebefordrade meddelanden"
-
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1275
-#, c-format
-msgid "Opening folder %s"
-msgstr "Öppnar mappen %s"
-
-#: mail/mail-ops.c:1206
-#, c-format
-msgid "Opening store %s"
-msgstr "Öppnar lagringsplatsen %s"
-
-#: mail/mail-ops.c:1337
-msgid "Synchronising folder"
-msgstr "Synkroniserar mapp"
-
-#: mail/mail-ops.c:1387
-msgid "Expunging folder"
-msgstr "Tömmer mapp"
-
-#: mail/mail-ops.c:1436
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Hämtar meddelande %s"
-
-#: mail/mail-ops.c:1503
-msgid "Retrieving messages"
-msgstr "Hämtar meddelanden"
-
-#: mail/mail-ops.c:1513
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Hämtar meddelande nummer %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1661
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Läser in mappen %s för %s"
-
-#: mail/mail-ops.c:1663
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Läs in mappen %s för %s"
-
-#: mail/mail-ops.c:1829
-msgid "Saving messages"
-msgstr "Sparar meddelanden"
-
-#: mail/mail-ops.c:1908
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Kan inte spara utdatafilen: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1921
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Sparar meddelande %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Fel vid sparande av meddelanden till: %s\n"
-" %s"
-
-#: mail/mail-ops.c:2009
-msgid "Saving attachment"
-msgstr "Sparar bilaga"
-
-#: mail/mail-ops.c:2024
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Kan inte skapa utdatafil: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2052
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kunde inte skriva data: %s"
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Sök"
-
-#: mail/mail-send-recv.c:109
-msgid "Cancelling ..."
-msgstr "Avbryter..."
-
-#: mail/mail-send-recv.c:191
-msgid "Send & Receive mail"
-msgstr "Skicka och ta emot e-post"
-
-#: mail/mail-send-recv.c:195
-msgid "Receiving"
-msgstr "Tar emot"
-
-#: mail/mail-send-recv.c:224
-msgid "Updating ..."
-msgstr "Uppdaterar..."
-
-#: mail/mail-send-recv.c:226 mail/mail-send-recv.c:266
-msgid "Waiting ..."
-msgstr "Väntar..."
-
-#: mail/mail-send-recv.c:252
-msgid "Sending"
-msgstr "Skickar"
-
-#: mail/mail-send-recv.c:412
-msgid "Cancelled."
-msgstr "Avbruten."
-
-#: mail/mail-send-recv.c:416
-msgid "Complete."
-msgstr "Färdig."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Inkomplett meddelande skrevs på rör!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Fel vid förberedelse av %s:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Fel vid \"%s\":\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Fel vid läsning av kommandon från döende tråd."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Trasigt meddelande från döende tråd?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Kunde inte skapa dialogfönster."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "Användaren avbröt frågan."
-
-#: mail/mail-tools.c:192
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
-
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (vidarebefordrat meddelande)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (inget ämne)"
-
-#: mail/mail-tools.c:277
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Vidarebefordrat meddelande - %s"
-
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Vidarebefordrat meddelande (inget ämne)"
-
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kan inte öppna platsen \"%s\":\n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "Virtuella mappar"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Ny virtuell mapp"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
-msgid "Reply"
-msgstr "Svara"
-
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
-msgid "Reply to the sender of this message"
-msgstr "Svara till avsändaren av det här meddelandet"
-
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
-msgid "Reply to all recipients of this message"
-msgstr "Svara till alla mottagare av det här meddelandet"
-
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
-msgid "Forward this message"
-msgstr "Vidarebefordra detta meddelande"
-
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
-msgid "Print the selected message"
-msgstr "Skriv ut det markerade meddelandet"
-
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
-msgid "Delete this message"
-msgstr "Ta bort detta meddelande"
-
-#: mail/message-list.c:608
-msgid "Unseen"
-msgstr "Oläst"
-
-#: mail/message-list.c:611
-msgid "Seen"
-msgstr "Läst"
-
-#: mail/message-list.c:614
-msgid "Answered"
-msgstr "Besvarad"
-
-#: mail/message-list.c:617
-msgid "Multiple Unseen Messages"
-msgstr "Flera olästa meddelanden"
-
-#: mail/message-list.c:620
-msgid "Multiple Messages"
-msgstr "Flera meddelanden"
-
-#: mail/message-list.c:933
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:945 mail/message-list.c:961
-#, c-format
-msgid "%s, et al."
-msgstr "%s m.fl."
-
-#: mail/message-list.c:948 mail/message-list.c:964
-msgid "<unknown>"
-msgstr "<okänt>"
-
-#: mail/message-list.c:1016
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1023
-msgid "Today %l:%M %p"
-msgstr "Idag %I.%M"
-
-#: mail/message-list.c:1032
-msgid "Yesterday %l:%M %p"
-msgstr "Igår %I.%M"
-
-#: mail/message-list.c:1044
-msgid "%a %l:%M %p"
-msgstr "%a %I.%M"
-
-#: mail/message-list.c:1052
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %I:%M"
-
-#: mail/message-list.c:1054
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
-
-#: mail/message-list.c:1152
-msgid "Flagged"
-msgstr "Flaggad"
-
-#: mail/message-list.c:1153
-msgid "From"
-msgstr "Från"
-
-#: mail/message-list.c:1153
-msgid "Date"
-msgstr "Datum"
-
-#: mail/message-list.c:1153
-msgid "Received"
-msgstr "Mottaget"
-
-#: mail/message-list.c:1154
-msgid "To"
-msgstr "Till"
-
-#: mail/message-list.c:1154
-msgid "Size"
-msgstr "Storlek"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Ange din %s-lösenordsfras för %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Ange din %s-lösenordsfras"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Inget GPG/PGP-program finns tillgängligt."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Inget lösenord angavs."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunde inte skapa rör till GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Inga avsändare är angivna"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunde inte skapa temporär fil: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Mapp"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Lagringsutrymme"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Visa mappar som börjar med:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Hämtar lagringsutrymme för \"%s\""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Hämta lagringsutrymme för \"%s\""
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Prenumerar på mappen \"%s\""
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Säger upp prenumeration på mappen \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Prenumerera på mappen \"%s\""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Säg upp prenumeration på mappen \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution-installation"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Denna nya version av Evolution måste installera ytterligare filer\n"
-"i din personliga Evolution-katalog"
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Var vänlig och klicka på \"OK\" för att installera filerna, eller \"Avbryt\" "
-"för att avsluta."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Kunde inte uppdatera filerna korrekt"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolutionfilerna installerades utan problem."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Detta verkar vara första gången du kör Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Var vänlig och klicka på \"OK\" för att installera Evolutions användarfiler i"
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kan inte skapa katalogen\n"
-"%s\n"
-"Fel: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan inte kopiera filer till\n"
-"\"%s\"."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Filen \"%s\" är ingen katalog.\n"
-"Var vänlig och flytta den så att installationen\n"
-"av Evolutions användarfiler kan genomföras."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Katalogen \"%s\" finns men är inte Evolution-\n"
-"katalogen. Var vänlig och flytta den så att\n"
-"Evolutions användarfiler kan installeras."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan inte skapa den angivna katalogen:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "Det angivna mappnamnet är inte giltigt."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Skapa ny mapp"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Den valda typen av mapp är inte giltig för\n"
-"den begärda åtgärden."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Ny..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(Namnlös)"
-
-#: shell/e-shell-view-menu.c:127
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy hittades inte i din $PATH."
-
-#: shell/e-shell-view-menu.c:133
-msgid "Bug buddy could not be run."
-msgstr "Bug-buddy kunde inte köras."
-
-#: shell/e-shell-view-menu.c:185
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:187
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution är en svit av grupprogram\n"
-"för e-post, kalender- och kontakthantering\n"
-"inom Gnome-skrivbordsmiljön."
-
-#: shell/e-shell-view-menu.c:347
-msgid "Go to folder..."
-msgstr "Gå till mapp..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(Ingen mapp visas)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Mappar"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Hoppsan! Vyn för \"%s\" dog oväntat. :-(\n"
-"Det här betyder antagligen att komponenten %s har kraschat."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Skapa en ny genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Gruppnamn:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Vill du verkligen ta bort gruppen\n"
-"\"%s\" från genvägsraden?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Ta inte bort"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Visa genvägarna som små ikoner"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "S_tora ikoner"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Visa genvägarna som stora ikoner"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "_Ny grupp..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Skapa en ny genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "Ta bo_rt denna grupp..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Ta bort denna genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "_Göm genvägsraden"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "_Visa genvägsraden"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Aktivera"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Aktivera denna genväg"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Ta bort denna genväg från genvägsraden"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Fel vid sparande av genvägar."
-
-#: po/tmp/evolution-event-editor.xml.h:81
-#: po/tmp/evolution-message-composer.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:95 po/tmp/evolution.xml.h:46
-#: shell/e-storage-set-view.c:345
-msgid "_View"
-msgstr "_Visa"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Visa den markade mappen"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(Inget namn)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Inga fel"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Allmänt fel"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "En mapp med samma namn finns redan"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Den angivna mapptypen är inte giltig"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "I/O-fel"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Inte tillräckligt med utrymme för att skapa mapp"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Den angivna mappen hittades inte"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Funktionen är ännu inte implementerad i detta lager"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Åtkomst nekas"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Åtgärden stöds inte"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Den angivna typen stöds inte i detta lager"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Hej. Tack för att du tog dig tiden att hämta den här förhands-\n"
-"versionen av grupprogramsviten Evolution.\n"
-"\n"
-"Under den tid som har gått sedan vår senaste version har vårt fokus\n"
-"varit att göra Evolution användbart. Många av utvecklarna av\n"
-"Evolution använder nu Evolution hela tiden för att läsa all sin\n"
-"e-post. Det kan du också göra. (Försäkra dig dock om att du har en\n"
-"säkerhetskopia).\n"
-"\n"
-"Även om vi har fixat många buggar som påverkar stabiliteten och\n"
-"säkerheten får du fortfarande \"disclaimern\": Evolution kommer att:\n"
-"krascha, slarva bort din e-post när du inte vill att den ska göra det,\n"
-"vägra att ta bort din e-post när du vill att den ska göra det, lämna\n"
-"vilsna processer körandes, förbruka 100% processortid, kapplöpa, låsa\n"
-"sig, skicka HTML-formaterade brev till diverse sändlistor, och göra\n"
-"dig till åtlöje framför dina vänner och arbetskamrater.\n"
-"Använd bara enligt ordinationen.\n"
-"\n"
-"Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
-"inväntar med spänning dina bidrag!\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Tack\n"
-"Evolution-teamet\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan inte initiera Evolution-skalet."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Stäng av."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kan inte initiera Bonobo-komponentsystemet."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importerar %s\n"
-"Importören är inte redo.\n"
-"Väntar 5 sekunder med nytt försök."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importerar %s\n"
-"Importerar objekt %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Det finns ingen importör som kan hantera\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Importerar"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importerar %s.\n"
-"Startar %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Fel vid inläsning av %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importerar %s\n"
-"Importerar objekt 1."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Välj en fil"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Filtyp:"
-
-#: shell/importer/importer.c:572
-msgid "Import"
-msgstr "Importera"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Välj den fil som du vill importera till Evolution, och välj vilken typ av "
-"fil det är i listan.\n"
-"\n"
-"Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
-"reda ut det."
-
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create new contact"
-msgstr "Skapa ny kontakt"
-
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Ta bort en kontakt"
-
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:28
-msgid "Find"
-msgstr "Sök"
-
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Sök efter en kontakt"
-
-#: po/tmp/evolution-addressbook.xml.h:12
-msgid "New contact"
-msgstr "Ny kontakt"
-
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
-
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
-msgid "Stop"
-msgstr "Stopp"
-
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Stoppa inläsning"
-
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Visa alla"
-
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Visa alla kontakter"
-
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "_Adressbokskonfiguration..."
-
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Skriv _ut kontakter..."
-
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Sök kontakter"
-
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:79
-#: po/tmp/evolution-task-editor-dialog.xml.h:93
-msgid "_Tools"
-msgstr "_Verktyg"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 dagar"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
-msgid "Alter preferences"
-msgstr "Ändra inställningar"
-
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Calendar Preferences..."
-msgstr "Inställningar för kalendern..."
-
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new appointment"
-msgstr "Skapa ett nytt möte"
-
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Create a new calendar"
-msgstr "Skapa en ny kalender"
-
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Day"
-msgstr "Dag"
-
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go back in time"
-msgstr "Gå bakåt i tiden"
-
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go forward in time"
-msgstr "Gå framåt i tiden"
-
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to"
-msgstr "Gå till"
-
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to a specific date"
-msgstr "Gå till ett specifikt datum"
-
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Go to present time"
-msgstr "Gå till nuvarande tid"
-
-#: po/tmp/evolution-calendar.xml.h:19
-msgid "Month"
-msgstr "Månad"
-
-#: po/tmp/evolution-calendar.xml.h:20
-msgid "New appointment"
-msgstr "Nytt möte"
-
-#: po/tmp/evolution-calendar.xml.h:21 po/tmp/evolution-event-editor.xml.h:34
-#: po/tmp/evolution-task-editor-dialog.xml.h:37
-msgid "Next"
-msgstr "Nästa"
-
-#: po/tmp/evolution-calendar.xml.h:23
-msgid "Open Calendar"
-msgstr "Öppna kalender"
-
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Prev"
-msgstr "Föreg"
-
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
-msgstr "Skriv ut denna kalender"
-
-#: po/tmp/evolution-calendar.xml.h:27
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Spara som"
-
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Spara kalender som något annat"
-
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show 1 day"
-msgstr "Visa 1 dag"
-
-#: po/tmp/evolution-calendar.xml.h:30
-msgid "Show 1 month"
-msgstr "Visa 1 månad"
-
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Show 1 week"
-msgstr "Visa 1 vecka"
-
-#: po/tmp/evolution-calendar.xml.h:32
-msgid "Show the working week"
-msgstr "Visa arbetsveckan"
-
-#: po/tmp/evolution-calendar.xml.h:33 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Idag"
-
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "Week"
-msgstr "Vecka"
-
-#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-event-editor.xml.h:71
-#: po/tmp/evolution-task-editor-dialog.xml.h:84 po/tmp/evolution.xml.h:43
-msgid "_New"
-msgstr "_Ny"
-
-#: po/tmp/evolution-calendar.xml.h:36
-msgid "_Open Calendar"
-msgstr "_Öppna kalender"
-
-#: po/tmp/evolution-calendar.xml.h:37
-msgid "_Print this calendar"
-msgstr "Skriv _ut denna kalender"
-
-#: po/tmp/evolution-calendar.xml.h:38 po/tmp/evolution-tasks.xml.h:13
-msgid "_Save As..."
-msgstr "_Spara som..."
-
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Ta bort detta objekt"
-
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Ta bort..."
-
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Hjälp"
-
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Skriv ut ku_vert..."
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:42
-#: po/tmp/evolution-task-editor-dialog.xml.h:45
-msgid "Print this item"
-msgstr "Skriv ut detta objekt"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:43
-#: po/tmp/evolution-task-editor-dialog.xml.h:46
-msgid "Print..."
-msgstr "Skriv ut..."
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:46
-#: po/tmp/evolution-message-composer.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:56
-msgid "Save _As..."
-msgstr "Spara so_m..."
-
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:57
-msgid "Save and Close"
-msgstr "Spara och stäng"
-
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Spara kontakten och stäng dialogrutan"
-
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "Skicka kontakte_n till annan..."
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-msgid "See online help"
-msgstr "Se online-hjälpen"
-
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Skicka _meddelande till kontakt..."
-
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:64
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:76 po/tmp/evolution.xml.h:36
-msgid "_File"
-msgstr "_Arkiv"
-
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "Skriv _ut..."
-
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:76
-#: po/tmp/evolution-message-composer.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:90
-msgid "_Save"
-msgstr "_Spara"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
-#: po/tmp/evolution-task-editor-dialog.xml.h:6
-msgid "About this application"
-msgstr "Om detta program"
-
-#: po/tmp/evolution-event-editor.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:7
-msgid "About..."
-msgstr "Om..."
-
-#: po/tmp/evolution-event-editor.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:8
-msgid "Actio_ns"
-msgstr "_Åtgärder"
-
-#: po/tmp/evolution-event-editor.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:9
-msgid "Address _Book... (FIXME)"
-msgstr "Adress_bok... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:11
-msgid "C_lear"
-msgstr "_Töm"
-
-#: po/tmp/evolution-event-editor.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:12
-msgid "C_ut"
-msgstr "Klipp _ut"
-
-#: po/tmp/evolution-event-editor.xml.h:12
-#: po/tmp/evolution-task-editor-dialog.xml.h:13
-msgid "Chec_k Names (FIXME)"
-msgstr "_Kontrollera namn (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-task-editor-dialog.xml.h:14
-msgid "Clear"
-msgstr "Töm"
-
-#: po/tmp/evolution-event-editor.xml.h:14
-#: po/tmp/evolution-task-editor-dialog.xml.h:15
-msgid "Clear the selection"
-msgstr "Töm markeringen"
-
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Close this appointment"
-msgstr "Stäng detta möte"
-
-#: po/tmp/evolution-event-editor.xml.h:17
-#: po/tmp/evolution-task-editor-dialog.xml.h:18
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "K_opiera till mapp... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:18 po/tmp/evolution-mail.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:19
-msgid "Copy"
-msgstr "Kopiera"
-
-#: po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:20
-msgid "Copy the selection"
-msgstr "Koiera markeringen"
-
-#: po/tmp/evolution-event-editor.xml.h:20
-#: po/tmp/evolution-task-editor-dialog.xml.h:21
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: po/tmp/evolution-event-editor.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:22
-msgid "Cut the selection"
-msgstr "Klipp ut markeringen"
-
-#: po/tmp/evolution-event-editor.xml.h:24
-#: po/tmp/evolution-task-editor-dialog.xml.h:25
-msgid "Dump XML"
-msgstr "Kasta XML"
-
-#: po/tmp/evolution-event-editor.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:26
-msgid "Dump the UI Xml description"
-msgstr "Kasta användargränssnittsbeskrivningen i XML"
-
-#: po/tmp/evolution-event-editor.xml.h:26
-#: po/tmp/evolution-task-editor-dialog.xml.h:27
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Fö_rsta objektet i mappen (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:27
-#: po/tmp/evolution-task-editor-dialog.xml.h:30
-msgid "For_ward (FIXME)"
-msgstr "_Vidarebefordra (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Vidarebefordra som v_Calendar (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:29
-#: po/tmp/evolution-task-editor-dialog.xml.h:31
-msgid "Go to the next item"
-msgstr "Gå till nästa objekt"
-
-#: po/tmp/evolution-event-editor.xml.h:30
-#: po/tmp/evolution-task-editor-dialog.xml.h:32
-msgid "Go to the previous item"
-msgstr "Gå till föregående objekt"
-
-#: po/tmp/evolution-event-editor.xml.h:31
-#: po/tmp/evolution-task-editor-dialog.xml.h:33
-msgid "In_complete Task (FIXME)"
-msgstr "Of_ärdig uppgift (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:32
-#: po/tmp/evolution-task-editor-dialog.xml.h:35
-msgid "Modify the file's properties"
-msgstr "Ändra filens egenskaper"
-
-#: po/tmp/evolution-event-editor.xml.h:33
-#: po/tmp/evolution-task-editor-dialog.xml.h:36
-msgid "N_ext"
-msgstr "N_ästa"
-
-#: po/tmp/evolution-event-editor.xml.h:35
-#: po/tmp/evolution-task-editor-dialog.xml.h:38
-msgid "Paste"
-msgstr "Klistra in"
-
-#: po/tmp/evolution-event-editor.xml.h:36
-#: po/tmp/evolution-task-editor-dialog.xml.h:39
-msgid "Paste the clipboard"
-msgstr "Klistra in från urklipp"
-
-#: po/tmp/evolution-event-editor.xml.h:37
-#: po/tmp/evolution-task-editor-dialog.xml.h:40
-msgid "Pre_vious"
-msgstr "Före_gående"
-
-#: po/tmp/evolution-event-editor.xml.h:38
-#: po/tmp/evolution-task-editor-dialog.xml.h:41
-msgid "Previous"
-msgstr "Föregående"
-
-#: po/tmp/evolution-event-editor.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:42
-msgid "Print Pre_view"
-msgstr "Förhands_granska"
-
-#: po/tmp/evolution-event-editor.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:43
-msgid "Print S_etup..."
-msgstr "Skrivar_inställning..."
-
-#: po/tmp/evolution-event-editor.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:44
-msgid "Print Setup"
-msgstr "Skrivarinställningar"
-
-#: po/tmp/evolution-event-editor.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:47
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: po/tmp/evolution-event-editor.xml.h:45
-#: po/tmp/evolution-message-composer.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:55
-msgid "Save"
-msgstr "Spara"
-
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "Save the appointment and close the dialog box"
-msgstr "Spara mötet och stäng dialogrutan"
-
-#: po/tmp/evolution-event-editor.xml.h:49
-#: po/tmp/evolution-message-composer.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:58
-msgid "Save the current file"
-msgstr "Spara aktuell fil"
-
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "Schedule Meeting"
-msgstr "Boka möte"
-
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "Schedule _Meeting"
-msgstr "Boka _möte"
-
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "Schedule some sort of a meeting"
-msgstr "Boka någon typ av möte"
-
-#: po/tmp/evolution-event-editor.xml.h:53
-#: po/tmp/evolution-task-editor-dialog.xml.h:62
-msgid "Select All"
-msgstr "Markera allt"
-
-#: po/tmp/evolution-event-editor.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:63
-msgid "Select everything"
-msgstr "Markera alltihop"
-
-#: po/tmp/evolution-event-editor.xml.h:55
-#: po/tmp/evolution-task-editor-dialog.xml.h:64
-msgid "Setup the page settings for your current printer"
-msgstr "Ställ in sidinställningarna för din aktuella skrivare"
-
-#: po/tmp/evolution-event-editor.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:65
-msgid "Task _Request (FIXME)"
-msgstr "_Uppgiftsbegäran (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:57
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:68
-msgid "_About..."
-msgstr "_Om..."
-
-#: po/tmp/evolution-event-editor.xml.h:58
-#: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:70 po/tmp/evolution.xml.h:33
-msgid "_Close"
-msgstr "S_täng"
-
-#: po/tmp/evolution-event-editor.xml.h:59
-#: po/tmp/evolution-task-editor-dialog.xml.h:71 po/tmp/evolution.xml.h:34
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:60
-#: po/tmp/evolution-task-editor-dialog.xml.h:72
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: po/tmp/evolution-event-editor.xml.h:61
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:73
-msgid "_Debug"
-msgstr "Fels_ök"
-
-#: po/tmp/evolution-event-editor.xml.h:63
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15
-#: po/tmp/evolution-task-editor-dialog.xml.h:75 po/tmp/evolution.xml.h:35
-msgid "_Edit"
-msgstr "R_edigera"
-
-#: po/tmp/evolution-event-editor.xml.h:65
-#: po/tmp/evolution-message-composer.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:77 po/tmp/evolution.xml.h:39
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-task-editor-dialog.xml.h:78
-msgid "_Item (FIXME)"
-msgstr "_Objekt (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:67
-#: po/tmp/evolution-task-editor-dialog.xml.h:79
-msgid "_Journal Entry (FIXME)"
-msgstr "_Dagbokspost (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:68
-#: po/tmp/evolution-task-editor-dialog.xml.h:80
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Sista objektet i mappen (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:69
-#: po/tmp/evolution-task-editor-dialog.xml.h:81
-msgid "_Mail Message (FIXME)"
-msgstr "_Posta meddelande (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:70
-#: po/tmp/evolution-task-editor-dialog.xml.h:83
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Flytta till mapp... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:72
-#: po/tmp/evolution-task-editor-dialog.xml.h:85
-msgid "_Note (FIXME)"
-msgstr "_Anteckna (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:73
-#: po/tmp/evolution-task-editor-dialog.xml.h:86
-msgid "_Paste"
-msgstr "Klistra _in"
-
-#: po/tmp/evolution-event-editor.xml.h:74
-#: po/tmp/evolution-task-editor-dialog.xml.h:87
-#: po/tmp/evolution-tasks.xml.h:12
-msgid "_Print"
-msgstr "Skriv _ut"
-
-#: po/tmp/evolution-event-editor.xml.h:75
-#: po/tmp/evolution-task-editor-dialog.xml.h:88
-msgid "_Properties..."
-msgstr "_Egenskaper..."
-
-#: po/tmp/evolution-event-editor.xml.h:77
-#: po/tmp/evolution-task-editor-dialog.xml.h:91
-msgid "_Select All"
-msgstr "_Markera allt"
-
-#: po/tmp/evolution-event-editor.xml.h:78
-#: po/tmp/evolution-task-editor-dialog.xml.h:92 po/tmp/evolution.xml.h:45
-msgid "_Task (FIXME)"
-msgstr "_Uppgift (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:80
-#: po/tmp/evolution-task-editor-dialog.xml.h:94
-msgid "_Unread Item (FIXME)"
-msgstr "O_läst objekt (FIXME)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-executive-summary.xml.h:6
-msgid "Add Service"
-msgstr "Lägg till tjänst"
-
-#: po/tmp/evolution-executive-summary.xml.h:7
-msgid "Add a new service to the Executive Summary"
-msgstr "Lägg till ny tjänst till sammanfattningen"
-
-#: po/tmp/evolution-executive-summary.xml.h:8
-msgid "Create a new email"
-msgstr "Skriv ett nytt e-brev"
-
-#: po/tmp/evolution-executive-summary.xml.h:9
-msgid "Executive Summary Settings..."
-msgstr "Inställningar för sammanfattningen..."
-
-#: po/tmp/evolution-executive-summary.xml.h:10
-msgid "New Mail"
-msgstr "Ny post"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Skriv"
-
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Skriv ett nytt meddelande"
-
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Kopiera meddelandet till en ny mapp"
-
-#: po/tmp/evolution-mail.xml.h:10
-msgid "Create Rule"
-msgstr "Skapa regel"
-
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "Ma_pp"
-
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrera på avsändare"
-
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtrera på _mottagare"
-
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Glöm _lösenord"
-
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Hämta e-post"
-
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Hide S_elected Messages"
-msgstr "Göm _markerade meddelanden"
-
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted Messages"
-msgstr "Göm _borttagna meddelanden"
-
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Göm _lästa meddelanden"
-
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Mail _Filters..."
-msgstr "E-post_filter..."
-
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Manage Subscriptions..."
-msgstr "Hantera prenumerationer..."
-
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Mar_k As Read"
-msgstr "Mar_kera som läst"
-
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mark As U_nread"
-msgstr "Märk som _oläst"
-
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Move"
-msgstr "Flytta"
-
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move message to a new folder"
-msgstr "Flytta meddelandet till en ny mapp"
-
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Previews the message to be printed"
-msgstr "Förhandsgranskar meddelandet som ska skrivas ut"
-
-#: po/tmp/evolution-mail.xml.h:32
-msgid "Print Preview of message..."
-msgstr "Förhandsgranska meddelande..."
-
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print message to the printer"
-msgstr "Skriv ut meddelande på skrivaren"
-
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message..."
-msgstr "Skriv ut meddelande..."
-
-#: po/tmp/evolution-mail.xml.h:38
-msgid "Reply to _All"
-msgstr "Svara till _alla"
-
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _Sender"
-msgstr "Svara till av_sändaren"
-
-#: po/tmp/evolution-mail.xml.h:42
-msgid "S_ource"
-msgstr "_Källa"
-
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Markera _alla"
-
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Skicka kölagd e-post och hämta ny e-post"
-
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All Messages"
-msgstr "Visa _alla meddelanden"
-
-#: po/tmp/evolution-mail.xml.h:47
-msgid "Threaded Message list"
-msgstr "Trådad meddelandelista"
-
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on Se_nder"
-msgstr "Virtuell mapp på avsä_ndare"
-
-#: po/tmp/evolution-mail.xml.h:49
-msgid "VFolder on _Recipients"
-msgstr "Virtuell mapp på mottaga_re"
-
-#: po/tmp/evolution-mail.xml.h:50
-msgid "View Raw Message Source"
-msgstr "Visa rå meddelandekälla"
-
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Apply Filters"
-msgstr "Tillämp_a filter"
-
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Configure Folder..."
-msgstr "_Konfigura mapp..."
-
-#: po/tmp/evolution-mail.xml.h:53
-msgid "_Copy to Folder..."
-msgstr "_Kopiera till mapp..."
-
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Edit Message"
-msgstr "R_edigera meddelande"
-
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Expunge"
-msgstr "V_erkställ tömning"
-
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Filter on Subject"
-msgstr "_Filtrera på ämne"
-
-#: po/tmp/evolution-mail.xml.h:58
-msgid "_Forward"
-msgstr "Vidarebe_fordra"
-
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "Om_vänd markering"
-
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Mail Configuration..."
-msgstr "_E-postkonfiguration..."
-
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Message"
-msgstr "_Meddelande"
-
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Move to Folder..."
-msgstr "_Flytta till mapp..."
-
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Open in New Window"
-msgstr "_Öppna i nytt fönster"
-
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Print Message"
-msgstr "Skriv _ut meddelande"
-
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Save Message As..."
-msgstr "Spara meddelande so_m..."
-
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_Trådat"
-
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Ångra borttagning"
-
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_Virtuell mapp på ämne"
-
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "Editor för _virtuella mappar..."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Bifoga"
-
-#: po/tmp/evolution-message-composer.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:17
-msgid "Close the current file"
-msgstr "Stäng aktuell fil"
-
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Kryptera detta meddelande med PGP"
-
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
-
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Infoga en fil som text i meddelandet"
-
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Infoga textfil..."
-
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Öppna en fil"
-
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "PGP-kryptera"
-
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "PGP-signera"
-
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr "Spara _utkast"
-
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in _folder... (FIXME)"
-msgstr "Spara i map_p... (FIXME)"
-
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Spara i mapp..."
-
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Spara aktuell fil med ett annat namn"
-
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Spara meddelandet i angiven mapp"
-
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Skicka"
-
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _Later"
-msgstr "Skicka senar_e"
-
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send _later"
-msgstr "Skicka senar_e"
-
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the mail in HTML format"
-msgstr "Skicka brevet i HTML-format"
-
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message later"
-msgstr "Skicka meddelandet senare"
-
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send the message now"
-msgstr "Skicka meddelandet nu"
-
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Send this message now"
-msgstr "Skicka detta meddelande nu"
-
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show / hide attachments"
-msgstr "Visa/göm bilaga"
-
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show _attachments"
-msgstr "Visa _bilagor"
-
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Show attachments"
-msgstr "Visa bilagor"
-
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "Sign this message with your PGP key"
-msgstr "Signera detta meddelande med din PGP-nyckel"
-
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Insert text file... (FIXME)"
-msgstr "_Infoga textfil... (FIXME)"
-
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Open..."
-msgstr "_Öppna..."
-
-#: po/tmp/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Säkerhet"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "Lägg till mapp till din lista över prenumererade mappar"
-
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Uppdatera lista"
-
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Uppdatera listan med mappar"
-
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ta bort mapp från din lista över prenumererade mappar"
-
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Säg upp prenumeration"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:10
-msgid "Assig_n Task (FIXME)"
-msgstr "Tilldela _uppgift (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:29
-msgid "Find Again"
-msgstr "Sök igen"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:34
-msgid "Meeting Re_quest (FIXME)"
-msgstr "_Mötesbegäran (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:48
-msgid "Redo"
-msgstr "Gör om"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:49
-msgid "Redo the undone action"
-msgstr "Gör om den ångrade åtgärden"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:50
-msgid "Replace"
-msgstr "Ersätt"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:51
-msgid "Replace a string"
-msgstr "Ersätt en sträng"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:52
-msgid "Reply to A_ll (FIXME)"
-msgstr "Svara till a_lla (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:53
-msgid "S_end Status Report (FIXME)"
-msgstr "S_kicka statusrapport (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:54
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Hoppa _över förekomst (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:59
-msgid "Save the task and close the dialog box"
-msgstr "Spara uppgiften och stäng dialogrutan"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:60
-msgid "Search again for the same string"
-msgstr "Sök igen efter samma sträng"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:61
-msgid "Search for a string"
-msgstr "Sök efter en sträng"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:66
-msgid "Undo"
-msgstr "Ångra"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:67
-msgid "Undo the last action"
-msgstr "Ångra den senaste åtgärden"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:69 po/tmp/evolution.xml.h:32
-msgid "_Appointment (FIXME)"
-msgstr "_Möte (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:82
-msgid "_Mark Complete (FIXME)"
-msgstr "_Märk som färdig (FIXME)"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:89
-msgid "_Reply (FIXME)"
-msgstr "_Svara (FIXME)"
-
-#: po/tmp/evolution-tasks.xml.h:7
-msgid "Create a new task"
-msgstr "Skapa en ny uppgift"
-
-#: po/tmp/evolution-tasks.xml.h:8
-msgid "New"
-msgstr "Ny"
-
-#: po/tmp/evolution-tasks.xml.h:10
-msgid "Save task as something else"
-msgstr "Spara uppgift som något annat"
-
-#: po/tmp/evolution-tasks.xml.h:11
-msgid "Tasks Preferences..."
-msgstr "Inställningar för uppgifter..."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution.xml.h:6
-msgid "About Evolution..."
-msgstr "Om Evolution..."
-
-#: po/tmp/evolution.xml.h:8
-msgid "Close this window"
-msgstr "Stäng detta fönster"
-
-#: po/tmp/evolution.xml.h:9
-msgid "Customi_ze..."
-msgstr "_Anpassa..."
-
-#: po/tmp/evolution.xml.h:10
-msgid "Customize"
-msgstr "Anpassa"
-
-#: po/tmp/evolution.xml.h:11
-msgid "Customize toolbars"
-msgstr "Anpassa verktygsrader"
-
-#: po/tmp/evolution.xml.h:12
-msgid "Display a different folder"
-msgstr "Visa en annan mapp"
-
-#: po/tmp/evolution.xml.h:13
-msgid "E_xit"
-msgstr "_Avsluta"
-
-#: po/tmp/evolution.xml.h:14
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-genväg för _rader"
-
-#: po/tmp/evolution.xml.h:15
-msgid "Exit"
-msgstr "Avsluta"
-
-#: po/tmp/evolution.xml.h:16
-msgid "Exit the program"
-msgstr "Avlsuta programmet"
-
-#: po/tmp/evolution.xml.h:17
-msgid "Getting _Started"
-msgstr "Komma i _gång"
-
-#: po/tmp/evolution.xml.h:18
-msgid "Import an external file format"
-msgstr "Importera ett externt filformat"
-
-#: po/tmp/evolution.xml.h:19
-msgid "Main toolbar"
-msgstr "Huvudverktygsrad"
-
-#: po/tmp/evolution.xml.h:20
-msgid "Show information about Evolution"
-msgstr "Visa information om Evolution"
-
-#: po/tmp/evolution.xml.h:21
-msgid "Show the _Folder Bar"
-msgstr "Visa _mappraden"
-
-#: po/tmp/evolution.xml.h:22
-msgid "Show the _Shortcut Bar"
-msgstr "Visa _genvägsraden"
-
-#: po/tmp/evolution.xml.h:23
-msgid "Submit Bug Report"
-msgstr "Skicka felrapport"
-
-#: po/tmp/evolution.xml.h:24
-msgid "Submit _Bug Report"
-msgstr "Skicka _felrapport"
-
-#: po/tmp/evolution.xml.h:25
-msgid "Submit bug report using Bug Buddy."
-msgstr "Skicka felrapport med Bug-Buddy."
-
-#: po/tmp/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
-msgstr "Växla om mappraden ska visas"
-
-#: po/tmp/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Växla om genvägsraden ska visas"
-
-#: po/tmp/evolution.xml.h:28
-msgid "Using the C_ontact Manager"
-msgstr "Använda k_ontakthanteraren"
-
-#: po/tmp/evolution.xml.h:29
-msgid "Using the _Calendar"
-msgstr "Använda _kalendern"
-
-#: po/tmp/evolution.xml.h:30
-msgid "Using the _Mailer"
-msgstr "Använda _e-postdelen"
-
-#: po/tmp/evolution.xml.h:31
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
-
-#: po/tmp/evolution.xml.h:37
-msgid "_Folder"
-msgstr "_Mapp"
-
-#: po/tmp/evolution.xml.h:38
-msgid "_Go to Folder..."
-msgstr "_Gå till mapp..."
-
-#: po/tmp/evolution.xml.h:40
-msgid "_Import file..."
-msgstr "_Infoga fil..."
-
-#: po/tmp/evolution.xml.h:41
-msgid "_Index"
-msgstr "_Index"
-
-#: po/tmp/evolution.xml.h:42
-msgid "_Mail message"
-msgstr "_Posta meddelande"
-
-#: po/tmp/evolution.xml.h:44
-msgid "_Settings"
-msgstr "_Inställningar"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Upptagen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Inte inne"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Bjud _in andra..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Visa _endast arbetstimmar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Visa ut_zoomade"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Uppdatera ledig/upptagen"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovälj"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alla människor och resurser"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alla _människor och en resurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Folk som k_rävs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Folk som krävs _och en resurs"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Mötets _starttid:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Mötets slu_ttid:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alla närvarande"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTOTFLS"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nu"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H.%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I.%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Varning"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Fråga"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Meddelande"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Visa inte detta meddelande igen."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "S_ök"
-
-#~ msgid "Find _Again"
-#~ msgstr "Sök ige_n..."
-
-#~ msgid "_Find..."
-#~ msgstr "_Sök..."
-
-#~ msgid "_Forms"
-#~ msgstr "_Formulär"
-
-#~ msgid "_Insert"
-#~ msgstr "_Infoga"
-
-#~ msgid "_Object"
-#~ msgstr "_Objekt"
-
-#~ msgid "_Redo"
-#~ msgstr "_Gör om"
-
-#~ msgid "_Replace..."
-#~ msgstr "_Ersätt..."
-
-#~ msgid "_Toolbars"
-#~ msgstr "_Verktygsrader"
-
-#~ msgid "_Undo"
-#~ msgstr "_Ångra"
-
-#~ msgid "S_ummary"
-#~ msgstr "S_ammanfattning"
-
-#~ msgid "Open..."
-#~ msgstr "Öppna..."
-
-#~ msgid "Open the task"
-#~ msgstr "Öppna uppgiften"
-
-#~ msgid "Days"
-#~ msgstr "dag"
-
-#~ msgid "Hours"
-#~ msgstr "timme"
-
-#~ msgid "Mail _to:"
-#~ msgstr "E-posta _till:"
-
-#~ msgid "Minutes"
-#~ msgstr "minut"
-
-#~ msgid "_Audio"
-#~ msgstr "_Ljud"
-
-#~ msgid "_Display"
-#~ msgstr "_Visa"
-
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
-#~ msgid ""
-#~ "Note: When converting between mailbox formats, a failure\n"
-#~ "(such as lack of disk space) may not be automatically\n"
-#~ "recoverable.  Please use this feature with care."
-#~ msgstr ""
-#~ "Notera: När du konverterar mellan brevlådeformat, kan ett fel\n"
-#~ "(såsom utrymmesbrist på disken) inte automatiskt rättas till.\n"
-#~ "Använd denna finess med försiktighet."
-
-#~ msgid ""
-#~ "Congratulations, your mail configuration is complete.\n"
-#~ "\n"
-#~ "You are now ready to send and receive email \n"
-#~ "using Evolution. \n"
-#~ "\n"
-#~ "Click \"Finish\" to save your settings."
-#~ msgstr ""
-#~ "Grattis, din e-postkonfiguration är nu klar.\n"
-#~ "\n"
-#~ "Du kan nu skicka och ta emot e-post med Evolution.\n"
-#~ "\n"
-#~ "Klicka på \"Slutför\" för att spara dina inställningar."
-
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunde inte öppna filen %s:\n"
-#~ "%s"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Open a calendar"
-#~ msgstr "Öppna en kalender"
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nytt möte"
-
-#~ msgid "FIXME: _Note"
-#~ msgstr "FIXME: _Anteckning"
-
-#~ msgid "Group %i"
-#~ msgstr "Grupp %i"
-
-#~ msgid "Failed to perform regex search on message header: %s"
-#~ msgstr ""
-#~ "Misslyckades med att utföra sökning med reguljärt uttryck på "
-#~ "meddelandehuvud: %s"
-
-#~ msgid "You have no Outbox configured"
-#~ msgstr "Du har inte angivit någon utkorg"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "Hämtar e-post från %s"
-
-#~ msgid "Fetch email from %s"
-#~ msgstr "Hämta e-post från %s"
-
-#~ msgid "Filtering email on demand"
-#~ msgstr "Filtrerar e-post vid behov"
-
-#~ msgid "Filter email on demand"
-#~ msgstr "Filtrera e-post vid behov"
-
-#~ msgid "Sending queue"
-#~ msgstr "Skickar kö"
-
-#~ msgid "Send queue"
-#~ msgstr "Skicka kö"
-
-#~ msgid "Examining %s"
-#~ msgstr "Undersöker %s"
-
-#~ msgid ""
-#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
-#~ msgstr ""
-#~ "Kunde inte läsa UID-cachefilen \"%s\". Du kommer kanske att få dubbla kopior "
-#~ "av meddelanden."
-
-#~ msgid "Retrieving message %d of %d"
-#~ msgstr "Hämtar meddelande %d av %d"
-
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Skriver meddelande %d av %d"
-
-#~ msgid "Saving changes to %s"
-#~ msgstr "Sparar ändringar i %s"
-
-#~ msgid "Reflow Test"
-#~ msgstr "Reflow-test"
-
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright © 2000 Helix Code, Inc."
-
-#~ msgid "This should test the reflow canvas item"
-#~ msgstr "Detta är ett test av reflow canvas-elementet"
-
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Brevlådefiler i UNIX-mbox-format"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "För läsning av e-post som levereras av det lokala systemet och som lagras på "
-#~ "lokal disk."
-
-#~ msgid "Create a new note"
-#~ msgstr "Skapa en ny anteckning"
-
-#~ msgid "Cannot initialize Evolution's notes component."
-#~ msgstr "Kan inte initiera Evolutions anteckningspostkomponent."
-
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Anteckningskomponent: Kunde inte initiera Bonobo"
-
-#~ msgid "Reminder of your appointment at "
-#~ msgstr "Påminnelse om ditt möte den "
-
-#~ msgid "<b>Error loading calendar:<br>Calendar in use."
-#~ msgstr "<b>Fel vid inläsning av kalender:<br>Kalendern upptagen."
-
-#~ msgid "Could not create a tasks file in `%s'"
-#~ msgstr "Kunde inte skapa en uppgiftsfil i \"%s\""
-
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr "Kunde inte skapa en mapp i \"%s\""
-
-#~ msgid " for "
-#~ msgstr " för "
-
-#~ msgid "Server disconnected."
-#~ msgstr "Servern kopplade ifrån."
-
-#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
-#~ msgstr "Brevlådekataloger i UNIX-MH-format (CamelLocal-version)"
-
-#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-#~ msgstr "UNIX-brevfiler i qmail-brevlådekatalogformat (CamelLocal-version)"
-
-#~ msgid "Show all hidden"
-#~ msgstr "Visa alla gömda"
-
-#~ msgid "Hide selected"
-#~ msgstr "Göm markerade"
-
-#~ msgid "Hide deleted"
-#~ msgstr "Göm borttagna"
-
-#~ msgid "Hide Subject"
-#~ msgstr "Göm ämnesrad"
-
-#~ msgid "Hide from Sender"
-#~ msgstr "Göm för avsändaren"
-
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Göm ämnesraden \"%s\""
-
-#~ msgid "Hide from Sender <%s>"
-#~ msgstr "Göm för avsändaren <%s>"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Du har inte konfigurerat några e-postkällor"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Svara-till:"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Ange ditt namn och din e-postadress för utgående post. Du kan också, om du "
-#~ "vill, ange namnet på din organisation och en fil att läsa din signatur från."
-
-#~ msgid "Full name:"
-#~ msgstr "Fullständigt namn:"
-
-#~ msgid "Email address:"
-#~ msgstr "E-postadress:"
-
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil"
-
-#~ msgid "Server:"
-#~ msgstr "Server:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "Detektera vilka typer som stöds..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Ta inte bort meddelanden från servern"
-
-#~ msgid "Mail source type:"
-#~ msgstr "Typ av e-postkälla:"
-
-#~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Välj den typ av e-postserver som du har och ange den relevanta informationen "
-#~ "om den.\n"
-#~ "\n"
-#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
-#~ "typer som stöds...\" när du har angett den andra informationen."
-
-#~ msgid "News source type:"
-#~ msgstr "Typ av diskussionsgruppskälla:"
-
-#~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
-#~ msgstr ""
-#~ "Välj den typ av diskussionsgruppsserver som du har och ange den relevanta "
-#~ "informationen om den.\n"
-#~ "\n"
-#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera de "
-#~ "typer som stöds...\" när du har angett den andra informationen."
-
-#~ msgid "Mail transport type:"
-#~ msgstr "Typ av e-posttransport:"
-
-#~ msgid "Add Identity"
-#~ msgstr "Lägg till identitet"
-
-#~ msgid "Edit Identity"
-#~ msgstr "Redigera identitet"
-
-#~ msgid "Edit Source"
-#~ msgstr "Redigera källa"
-
-#~ msgid "Add News Server"
-#~ msgstr "Lägg till diskussionsgruppsserver"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Redigera diskussionsgruppsserver"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "Testar \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "Anslutningen lyckades!"
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Frågar efter autentiseringsmöjligheterna hos \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Fråga efter autentisering hos \"%s\""
-
-#~ msgid "Address"
-#~ msgstr "Adress"
-
-#~ msgid "Identities"
-#~ msgstr "Identiteter"
-
-#~ msgid "Mail Sources"
-#~ msgstr "E-postkällor"
-
-#~ msgid "Mail Transport"
-#~ msgstr "E-posttransport"
-
-#~ msgid "News Servers"
-#~ msgstr "Diskussionsgruppsservrar"
-
-#~ msgid "News Sources"
-#~ msgstr "Diskussionsgruppskällor"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Skicka meddelanden som HTML"
-
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Det finns inget stöd för GPG/PGP i denna kopia av Evolution."
-
-#~ msgid "_Source"
-#~ msgstr "_Källa"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Element(en) tillhör dessa kategorier:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Tillgängliga kategorier:"
-
-#~ msgid "Deleted"
-#~ msgstr "Borttagen"
-
-#~ msgid "Mail Source"
-#~ msgstr "E-postkälla"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "Skickar ett meddelande utan en ämnesrad"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Skicka ett meddelande utan en ämnesrad"
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Märker meddelanden i mappen \"%s\""
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Märk meddelanden i mappen \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Märker meddelande %d av %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Genomsök mappar i \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Skapar \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
-
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Sparar meddelanden från mappen \"%s\""
-
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Spara meddelanden från mappen \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Bygger om meddelandevyn"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Bygg om meddelandevyn"
-
-#~ msgid "External Directories"
-#~ msgstr "Externa kataloger"
-
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
-#~ msgid "Outline:"
-#~ msgstr "Ram:"
-
-#~ msgid "Headings:"
-#~ msgstr "Rubriker:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Tomma dagar:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Markerad dag:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Dagnummer:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Aktuella dagens nummer:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Att-göra-objekt som inte är aktuellt än:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Att-göra-objekt som ska utföras idag:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Att-göra-objekt som skulle ha utförts:"
-
-#~ msgid "Expunging \"%s\""
-#~ msgstr "Tömmer \"%s\""
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Töm \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Bifogar meddelanden i mappen \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Bifoga meddelanden i \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Vidarebefordra meddelanden \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Vidarebefordrar meddelande utan en ämnesrad"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Vidarebefordra meddelande \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Vidarebefordra ett meddelande utan en ämnesrad"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Misslyckades med att generera mime-del från meddelande när ett "
-#~ "vidarebefordrat meddelande skulle genereras."
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Läser in \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Läs in \"%s\""
-
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserar \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkronisera \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Visar meddelande-UID \"%s\""
-
-#~ msgid "Clearing message display"
-#~ msgstr "Tömmer meddelandevisningen"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Visa meddelande-UID \"%s\""
-
-#~ msgid "Clear message display"
-#~ msgstr "Töm meddelandevisning"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Öppnar meddelanden från mappen \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Öppnar meddelanden från \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Visar meddelanden från mappen \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Visa meddelanden från \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Hämtar meddelande %d av %d (uid \"%s\")"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_y katalogserver"
-
-#~ msgid "_Actions"
-#~ msgstr "_Åtgärder"
-
-#~ msgid "appointment"
-#~ msgstr "möte"
-
-#~ msgid "task"
-#~ msgstr "uppgift"
-
-#~ msgid "journal entry"
-#~ msgstr "dagbokspost"
-
-#~ msgid "Year:"
-#~ msgstr "År:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Var vänlig och välj datumet dit du vill gå.\n"
-#~ "När du klickar på en dag kommer du att tas\n"
-#~ "till det datumet."
-
-#~ msgid "_Mail Configuration"
-#~ msgstr "_E-postkonfiguration"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Spara kalendern som"
-
-#~ msgid "may"
-#~ msgstr "maj"
-
-#~ msgid "sept"
-#~ msgstr "sept"
-
-#~ msgid "sunday"
-#~ msgstr "söndag"
-
-#~ msgid "monday"
-#~ msgstr "måndag"
-
-#~ msgid "tuesday"
-#~ msgstr "tisdag"
-
-#~ msgid "tues"
-#~ msgstr "tis"
-
-#~ msgid "wednesday"
-#~ msgstr "onsdag"
-
-#~ msgid "wednes"
-#~ msgstr "ons"
-
-#~ msgid "thursday"
-#~ msgstr "torsdag"
-
-#~ msgid "thur"
-#~ msgstr "tor"
-
-#~ msgid "thurs"
-#~ msgstr "tors"
-
-#~ msgid "friday"
-#~ msgstr "fredag"
-
-#~ msgid "saturday"
-#~ msgstr "lördag"
-
-#~ msgid "fortnight"
-#~ msgstr "två veckor"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sek"
-
-#~ msgid "tomorrow"
-#~ msgstr "imorgon"
-
-#~ msgid "yesterday"
-#~ msgstr "igår"
-
-#~ msgid "today"
-#~ msgstr "idag"
-
-#~ msgid "last"
-#~ msgstr "senaste"
-
-#~ msgid "this"
-#~ msgstr "den"
-
-#~ msgid "next"
-#~ msgstr "nästa"
-
-#~ msgid "first"
-#~ msgstr "första"
-
-#~ msgid "third"
-#~ msgstr "tredje"
-
-#~ msgid "fourth"
-#~ msgstr "fjärde"
-
-#~ msgid "fifth"
-#~ msgstr "femte"
-
-#~ msgid "sixth"
-#~ msgstr "sjätte"
-
-#~ msgid "seventh"
-#~ msgstr "sjunde"
-
-#~ msgid "eighth"
-#~ msgstr "åttonde"
-
-#~ msgid "ninth"
-#~ msgstr "nionde"
-
-#~ msgid "tenth"
-#~ msgstr "tionde"
-
-#~ msgid "eleventh"
-#~ msgstr "elfte"
-
-#~ msgid "twelfth"
-#~ msgstr "tolfte"
-
-#~ msgid "ago"
-#~ msgstr "sen"
-
-#~ msgid "Could not create summary"
-#~ msgstr "Kunde inte skapa sammanfattning"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "Kan inte hämta meddelande: %s"
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr "Kunde inte byta namn på mappen %s till %s: målet existerar"
-
-#~ msgid "Mbox folders may not be nested."
-#~ msgstr "Mbox-mappar kan inte nästlas."
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "Kunde inte öppna sammanfattningen %s"
-
-#~ msgid "Summary mismatch, aborting sync"
-#~ msgstr "Sammanfattningen stämmer inte överens, avbryter synk"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "Sammanfattningen stämmer inte överens, avbryter synk"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "Kan inte kopiera data till utdatafil: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "Kunde inte läsa in eller skapa sammanfattning"
-
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan inte lägga till meddelande i mh-mapp: %s"
-
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kunde inte byta namn på mappen \"%s\": %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "MH-mappar får inte nästlas."
-
-#~ msgid "Local mail directory %s"
-#~ msgstr "Lokal brevlådekatalog %s"
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Kunde inte skapa rör till %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Kunde inte köra %s: %s\n"
-
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan inte grena %s: %s"
-
-#~ msgid "Bold"
-#~ msgstr "Fet"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Sätt någonting till fetstil"
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Kan inte initiera Evolutions hashfunktion för e-postlagring."
-
-#~ msgid "Forward as Attachment"
-#~ msgstr "Vidarebefordra som bilaga"
-
-#~ msgid "Set Flag"
-#~ msgstr "Ställ flagga"
-
-#~ msgid "does not match regex"
-#~ msgstr "matchar inte reguljära uttrycket"
-
-#~ msgid "matches regex"
-#~ msgstr "matchar reguljära uttrycket"
-
-#~ msgid "Add Optional Fields..."
-#~ msgstr "Lägg till valfria fält..."
-
-#~ msgid "Additional Identity Fields"
-#~ msgstr "Extra identitetsfält"
-
-#~ msgid "Browse..."
-#~ msgstr "Bläddra..."
-
-#~ msgid "Edit Mail Configuration Settings"
-#~ msgstr "Redigera e-postkonfigurationsinställningar"
-
-#~ msgid "Optional Information"
-#~ msgstr "Valfri information"
-
-#~ msgid ""
-#~ "Please enter information about your incoming mail server below. If you don't "
-#~ "know what"
-#~ msgstr ""
-#~ "Var vänlig och ange information om din server för inkommande e-post nedan. "
-#~ "Om du inte vet vad"
-
-#~ msgid ""
-#~ "Please enter information about your outgoing mail protocol below. If you "
-#~ "don't know "
-#~ msgstr ""
-#~ "Var vänlig och ange information om din server för utgående e-post nedan. Om "
-#~ "du inte vet "
-
-#~ msgid ""
-#~ "Please enter your name and email address below. The &quot;optional&quot; "
-#~ "fields below do not "
-#~ msgstr ""
-#~ "Var vänlig och ange ditt namn och din e-postadress nedan. Fälten "
-#~ "&quot;optional&quot; nedan "
-
-#~ msgid "Preferred type: "
-#~ msgstr "Typ som föredras: "
-
-#~ msgid "Sending Mail"
-#~ msgstr "Skickar e-post"
-
-#~ msgid ""
-#~ "You are almost done with the mail configuration process. The identity, "
-#~ "incoming"
-#~ msgstr "Du är nästan färdig med e-postkonfigurationen. Identiteten "
-
-#~ msgid ""
-#~ "Your mail server supports the following types of authentication. Please"
-#~ msgstr ""
-#~ "Din e-postserver stöder följande typer av autentisering. Var vänlig och"
-
-#~ msgid "Saving messages from \"%s\""
-#~ msgstr "Sparar meddelanden från \"%s\""
-
-#~ msgid "New Ca_lendar"
-#~ msgstr "Ny ka_lender"
-
-#~ msgid "_New appointment..."
-#~ msgstr "_Nytt möte..."
-
-#~ msgid "_Open"
-#~ msgstr "_Öppna"
-
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Skapa ny mapp..."
-
-#~ msgid "Create to-do item"
-#~ msgstr "Skapa att-göra-objekt"
-
-#~ msgid "Edit to-do item"
-#~ msgstr "Redigera att-göra-objekt"
-
-#~ msgid "Summary:"
-#~ msgstr "Sammanfattning:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Förfallodatum:"
-
-#~ msgid "Item Comments:"
-#~ msgstr "Objektkommentarer:"
-
-#~ msgid "Time display"
-#~ msgstr "Tidsvisning"
-
-#~ msgid "Time format"
-#~ msgstr "Tidsformat"
-
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12-timmars (FM/EM)"
-
-#~ msgid "24-hour"
-#~ msgstr "24-timmars"
-
-#~ msgid "Weeks start on"
-#~ msgstr "Veckor börjar på"
-
-#~ msgid "Day range"
-#~ msgstr "Dagsintervall"
-
-#~ msgid ""
-#~ "Please select the start and end hours you want\n"
-#~ "to be displayed in the day view and week view.\n"
-#~ "Times outside this range will not be displayed\n"
-#~ "by default."
-#~ msgstr ""
-#~ "Var vänlig och välj den starttimme och sluttimme\n"
-#~ "som du vill ska visas i dagsvyn och veckovyn.\n"
-#~ "Tider utanför detta intervall kommer inte att\n"
-#~ "visas som standard."
-
-#~ msgid "Day start:"
-#~ msgstr "Dagsstart:"
-
-#~ msgid "Day end:"
-#~ msgstr "Dagsslut:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Färger för visning"
-
-#~ msgid "Show on TODO List:"
-#~ msgstr "Visa på ATT GÖRA-listan:"
-
-#~ msgid "To Do List style options:"
-#~ msgstr "Stilalternativ för att-göra-listan"
-
-#~ msgid "Highlight overdue items"
-#~ msgstr "Markera objekt som skulle ha utförts"
-
-#~ msgid "Highlight not yet due items"
-#~ msgstr "Markera objekt som inte är aktuella än"
-
-#~ msgid "Highlight items due today"
-#~ msgstr "Markera objekt som ska ha utförts idag"
-
-#~ msgid "To Do List Properties"
-#~ msgstr "Egenskaper för att-göra-listan"
-
-#~ msgid "To Do List"
-#~ msgstr "Att-göra-lista"
-
-#~ msgid "Preferences"
-#~ msgstr "Inställningar"
-
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaper för alarm"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Pip vid alarmvisning"
-
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Ljudalarm stängs av efter"
-
-#~ msgid "Enable snoozing for "
-#~ msgstr "Aktivera slummer i "
-
-#~ msgid "Viewing message sources from folder \"%s\""
-#~ msgstr "Visar meddelandekällor från mappen \"%s\""
-
-#~ msgid "View message sources from \"%s\""
-#~ msgstr "Visa meddelandekällor från \"%s\""
-
-#~ msgid "Threading message list"
-#~ msgstr "Trådar meddelandelista"
-
-#~ msgid "Thread message list"
-#~ msgstr "Tråda meddelandelista"
-
-#~ msgid ""
-#~ "This appointment has custom recurrence rules that cannot be edited by "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "However, the appointment will recur at the appropriate time and will be "
-#~ "displayed properly in the calendar views."
-#~ msgstr ""
-#~ "Det här mötet har anpassade upprepningsregler som inte kan redigeras av "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "Mötet kommer dock att dyka upp vid den angivna tiden och kommer att visas "
-#~ "korrekt i kalendervyerna."
-
-#~ msgid "Custom search"
-#~ msgstr "Anpassad sökning"
-
-#~ msgid "Full Search"
-#~ msgstr "Fullständig sökning"
-
-#~ msgid ""
-#~ "Welcome to the Evolution Mail configuration wizard!\n"
-#~ "By filling in some information about your email\n"
-#~ "settings, you can start sending and receiving email\n"
-#~ "right away. Click Next to continue."
-#~ msgstr ""
-#~ "Välkommen till Evolutions guide för e-postkonfiguration!\n"
-#~ "Efter att ha fyllt i en del information om dina\n"
-#~ "e-postinställningar kan du börja skicka och ta emot e-post\n"
-#~ "direkt. Klicka på \"Nästa\" för att fortsätta."
-
-#~ msgid "Recur on the"
-#~ msgstr "Upprepa den"
-
-#~ msgid "th day of the month"
-#~ msgstr ":e dagen i månaden"
-
-#~ msgid " (XXX unread)"
-#~ msgstr " (XXX olästa)"
-
-#~ msgid "Don't know protocol to open URI `%s'"
-#~ msgstr "Känner inte till protokoll för att öppna URI:n \"%s\""
-
-#~ msgid "_Copy to Folder"
-#~ msgstr "_Kopiera till mapp"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "_Flytta till mapp"
-
-#~ msgid "Open in New Window"
-#~ msgstr "Öppna i nytt fönster"
-
-#~ msgid "Forward Message"
-#~ msgstr "Vidarebefordra meddelande"
-
-#~ msgid "Move Message"
-#~ msgstr "Flytta meddelande"
-
-#~ msgid "Copy Message"
-#~ msgstr "Kopiera meddelande"
-
-#~ msgid "Quick Search"
-#~ msgstr "Snabbsökning"
-
-#~ msgid "Bad storage URL (no server): %s"
-#~ msgstr "Felaktig lagrings-URL (ingen server): %s"
-
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
-
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "Kunde inte ansluta till IMAP-servern på %s."
-
-#~ msgid ""
-#~ "Evolution has taken the tasks that were in your calendar folder and "
-#~ "automatically migrated them to the new tasks folder."
-#~ msgstr ""
-#~ "Evolution har tagit de uppgifter som var i din kalendermapp och automatiskt "
-#~ "flyttat dem till den nya uppgiftsmappen."
-
-#~ msgid ""
-#~ "Evolution has tried to take the tasks that were in your calendar folder and "
-#~ "migrate them to the new tasks folder.\n"
-#~ "Some of the tasks could not be migrated, so this process may be attempted "
-#~ "again in the future."
-#~ msgstr ""
-#~ "Evolution har försökt att ta de uppgifter som var i din kalendermapp och "
-#~ "flytta dem till den nya uppgiftsmapp.\n"
-#~ "En del av dessa uppgifter kunde inte flyttas, så detta förfarande kan "
-#~ "försökas igen i framtiden."
-
-#~ msgid ""
-#~ "Could not open `%s'; no items from the calendar folder will be migrated to "
-#~ "the tasks folder."
-#~ msgstr ""
-#~ "Kunde inte öppna \"%s\"; inga objekt från kalendermappen kommer att flyttas "
-#~ "till uppgiftsmappen."
-
-#~ msgid ""
-#~ "The method required to load `%s' is not supported; no items from the "
-#~ "calendar folder will be migrated to the tasks folder."
-#~ msgstr ""
-#~ "Metoden som krävs för att läsa in \"%s\" stöds inte; inga objekt från "
-#~ "kalendermappen kommer att flyttas till uppgiftsmappen."
-
-#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
-#~ msgstr "setup_vfs(): kunde inte initiera GNOME-VFS"
-
-#~ msgid "init_corba(): could not initialize GNOME"
-#~ msgstr "init_corba(): kunde inte initiera GNOME"
-
-#~ msgid "init_bonobo(): could not initialize Bonobo"
-#~ msgstr "init_bonobo(): kunde inte initiera Bonobo"
-
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "Grupprogramvaran Evolution"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
-msgid "Evolution Address conduit "
-msgstr "Adresser"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
-msgid "Configure the address conduit"
-msgstr "Konfigurera adresskanalen"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
-msgid "Evolution Calendar conduit"
-msgstr "Kalenderkanal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
-msgid "Configure the GnomeCal conduit"
-msgstr "Konfigurera GnomeCal-kanalen"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
-msgid "Evolution ToDo conduit "
-msgstr "Att göra-lista"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
-msgid "Configure the todo conduit"
-msgstr "Konfigurerar att göra-listan"
diff --git a/po/tr.po b/po/tr.po
deleted file mode 100644
index 77dbf301f7..0000000000
--- a/po/tr.po
+++ /dev/null
@@ -1,7720 +0,0 @@
-# -------------------------------------------------------
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Fatih Demir <kabalak@gmx.net>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:343
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-02-08 00:09+0100\n"
-"PO-Revision-Date: 2001-02-08 00:10+0100\n"
-"Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n"
-"Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-9\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid "Card: "
-msgstr "Kart: "
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ýsim: "
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Önek:     "
-
-#: addressbook/backend/ebook/e-card.c:3057
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Verilen:      "
-
-#: addressbook/backend/ebook/e-card.c:3058
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Ek: "
-
-#: addressbook/backend/ebook/e-card.c:3059
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Aile:     "
-
-#: addressbook/backend/ebook/e-card.c:3060
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sonek:     "
-
-#: addressbook/backend/ebook/e-card.c:3074
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Doðum Günü: "
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adres:"
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Posta Kutusu:  "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Diðer:         "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Cadde:      "
-
-#: addressbook/backend/ebook/e-card.c:3090
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Þehir:        "
-
-#: addressbook/backend/ebook/e-card.c:3091
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Bölge:      "
-
-#: addressbook/backend/ebook/e-card.c:3092
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Posta Kodu: "
-
-#: addressbook/backend/ebook/e-card.c:3093
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Ülke:     "
-
-#: addressbook/backend/ebook/e-card.c:3106
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3118
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonlar:\n"
-
-#: addressbook/backend/ebook/e-card.c:3121
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3145
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-posta:\n"
-
-#: addressbook/backend/ebook/e-card.c:3148
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-posta:"
-
-#: addressbook/backend/ebook/e-card.c:3167
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Postalayýcý: "
-
-#: addressbook/backend/ebook/e-card.c:3173
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zaman Dilimi: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Coðrafi Konum: "
-
-#: addressbook/backend/ebook/e-card.c:3185
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Meslek: "
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Kurum: "
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ýsim:  "
-
-#: addressbook/backend/ebook/e-card.c:3199
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Ünite:  "
-
-#: addressbook/backend/ebook/e-card.c:3200
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Ünite2: "
-
-#: addressbook/backend/ebook/e-card.c:3201
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Ünite3: "
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Ünite5: "
-
-#: addressbook/backend/ebook/e-card.c:3206
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Sýnýflar: "
-
-#: addressbook/backend/ebook/e-card.c:3207
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Açýklama: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3220
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Özel Dizi: "
-
-#: addressbook/backend/ebook/e-card.c:3223
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Açýk Anahtar: "
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo'yu baþlatamadým"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Etkisiz"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Eþzamanla"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Pilot'tan Kopyala"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Pilot'a Kopyala"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Pilot'tan Birleþtir"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Pilot'a Birleþtir"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Programcý(lar):"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution Adres Defteri"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 Free Software Foundation ve Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution adres defteri yapýlandýrma programý\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Ýþlemi Eþzamanla"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ayarlý pilot yok. Lütfen 'Pilot Baðlantý\n"
-"Özellikleri' bölümüne gidiniz."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot programýna baðlantý kurulmadý"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"gnome-pilot programýndan pilot listesi\n"
-"alýnýrken bir hata oluþtu"
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr "Ýmleç yüklenemedi\n"
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr "EBook yüklenmedi\n"
-
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat server"
-msgstr "wombat sunucusu baþlatýlamadý"
-
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
-msgid "Could not start wombat"
-msgstr "Wombat baþlatýlamadý"
-
-#: addressbook/conduit/address-conduit.c:684
-#: addressbook/conduit/address-conduit.c:687
-msgid "Could not read pilot's Address application block"
-msgstr "Pilot adres uygulama defteri okunamadý"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Baðlantýyý Sil?"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Ekle"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:62 po/tmp/evolution-mail.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:74
-msgid "_Delete"
-msgstr "_Sil"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Telefon Türleri"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Yeni telefon türü"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
-msgid "Add"
-msgstr "Ekle"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Ýletiþim Düzenleyici"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Tam Ýsim..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Farklý Dosyala:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Web adresi:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "_HTML e-postalarýný kabul ediyor"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Meslek"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Ev"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Ýþyeri _Faksý"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Cep"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "_Meslek"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Bu mektuplaþma adresidir"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_Baðlantýlar..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:10 po/tmp/task-editor-dialog.glade.h:8
-msgid "Ca_tegories..."
-msgstr "Kategoriler..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Meslek tanýmý:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "Þ_irket:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adres..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/mail-config.glade.h:32
-msgid "General"
-msgstr "Genel"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Bölüm:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Ofis:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Uzmanlýk alaný:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Lakap:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_Eþ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Doðum günü:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Sekreterinin adý:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "_Menejerinin adý:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Yýldönümü:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Notlar:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
-msgid "Details"
-msgstr "Ayrýntýlar"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:593
-msgid "Assistant"
-msgstr "Yardýmcý"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business"
-msgstr "Meslek"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Business 2"
-msgstr "2. Meslek"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Business Fax"
-msgstr "Ýþyeri Faksý"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr "Geri Arama"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "Car"
-msgstr "Araba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "Þirket"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home"
-msgstr "Ev"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Home 2"
-msgstr "2. ev"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Home Fax"
-msgstr "Ev Faksý"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Mobile"
-msgstr "Cep"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#: po/tmp/mail-config.glade.h:51
-msgid "Other"
-msgstr "Diðer"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "Baþka Fakslar"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-msgid "Pager"
-msgstr "Çaðrý Cihazý"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Primary"
-msgstr "Ýlk"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "Radyo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "_2. Adres:"
-
-#: po/tmp/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Adresi Denetle"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Ü_lke:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finlandiya"
-
-#: po/tmp/fulladdr.glade.h:11
-msgid "USA"
-msgstr "ABD"
-
-#: po/tmp/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Adres:"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "Þ_ehir:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Posta Kutusu:"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Bölge:"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "Posta _Numarasý:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Tam Ýsmi Kontrol Et"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"Bay\n"
-"Bn.\n"
-"Dr.\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I.\n"
-"II.\n"
-"III.\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Birinci:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Sýfatý:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Ortanca:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Soyadý:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "S_onek:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "_Minikartlar olarak"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
-msgid "As _Table"
-msgstr "_Tablo olarak"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s için parolayý girin"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "Adres defterini açamadým"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Bu adres defteri açýlamadý. Bu durum, yanlýþ bir\n"
-"URI bilgisi verilmesinden ya da LDAP desteðine sahip \n"
-"olmadan bir sunucuya ulaþmaya denendiði için olabilir.\n"
-"Bir URI verilmiþse bu URI'nin doðruluðundan emin olun.\n"
-"Ayrýca bir  LDAP sunucusuna eriþmeniz halinde lütfen \n"
-"openLdap paketini kurduktan sonra Evolution'u yeniden \n"
-"derleyin.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Tümünü Göster"
-
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Geliþmiþ..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Herhangi bir alanýn içeriði"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "Ýsim içeriði"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "E-posta içeriði"
-
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "Dizin tarayýcýsýnýn göstereceði URI"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Diðer Baðlantýlar"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Sunucusu"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Dosya"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Bilinmeyen adres defteri türü"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "Hiçbiri (anonim kipi)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Bilinmeyen kimlik denetim türü"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Temel"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Biri"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Alt Aðaç"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr "Bilinmeyen saha türü"
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr "Baðlantý DN:"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr "Bind DN yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "Bu parolayý hatýrla"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: po/tmp/mail-config.glade.h:33
-msgid "Host:"
-msgstr "Makina:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "Makine yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "Port yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "Kök DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "Root DN yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Arama Sahasý:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: po/tmp/mail-config.glade.h:14
-msgid "Authentication:"
-msgstr "Kimlik Denetimi:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:481 po/tmp/mail-config.glade.h:54
-msgid "Path:"
-msgstr "Yol:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "Yol yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Eðer yoksa yol oluþtur."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Adres Defterini Düzenle"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Sahip olduðunuz adres defterini seçin ve gerekli bilgileri girin."
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: po/tmp/mail-config.glade.h:46
-msgid "Name:"
-msgstr "Ýsim:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "Ýsim yardým metni"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "Description:"
-msgstr "Açýklama:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr "Açýklama yardým metni"
-
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Adres Defteri Kaynaklarý"
-
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:22
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:23
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:25
-msgid "Delete"
-msgstr "Sil"
-
-#: mail/folder-browser.c:670 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:28
-msgid "Edit"
-msgstr "Düzenle"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Ýsim"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/select-names.glade.h:6
-msgid "Find..."
-msgstr "Bul..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Ýleti Alýcýlarý"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Ýsimleri Seçin"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-msgstr "Ýsimleri seçin:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-msgid "Search"
-msgstr "Ara"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: po/tmp/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: po/tmp/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: po/tmp/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: po/tmp/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: po/tmp/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: po/tmp/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: po/tmp/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: po/tmp/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: po/tmp/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: po/tmp/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: po/tmp/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: po/tmp/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: po/tmp/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: po/tmp/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
-
-#: po/tmp/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
-
-#: po/tmp/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
-
-#: po/tmp/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
-
-#: po/tmp/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
-
-#: po/tmp/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
-
-#: po/tmp/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
-
-#: po/tmp/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
-
-#: po/tmp/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
-
-#: po/tmp/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
-
-#: po/tmp/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
-
-#: po/tmp/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
-
-#: po/tmp/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard olarak kaydet"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Email"
-msgstr "E-posta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Organization"
-msgstr "Kurum"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-msgid "Web Site"
-msgstr "Web Sayfasý"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Department"
-msgstr "Bölüm"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-msgid "Office"
-msgstr "Ofis"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-msgid "Title"
-msgstr "Sýfat"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-msgid "Profession"
-msgstr "Uzmanlýk alaný"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Manager"
-msgstr "Yönetici"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:594
-msgid "Nickname"
-msgstr "Lakap"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:595
-msgid "Spouse"
-msgstr "Eþ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:596
-msgid "Note"
-msgstr "Not"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:597
-msgid "Free-busy URL"
-msgstr "Web Sayfasý"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "Adres Defterine kaydet"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Bu bakýþta gösterilecek öðe yok\n"
-"\n"
-"Buraya çift týklayarak bir baðlantý öðesini yarat."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 bn. Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 bn. Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Sonda boþ formlar:"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Gövde"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Alt:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Boyutlar:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Yazýtipi..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Yazýtipleri"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Altbilgi:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Biçim"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Üstbilgi"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Üstbilgi/Altbilgi"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Baþlýklar"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Her mektup için baþlýklar"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Yükseklik:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Birbirini ardýþýk takip et"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Ýçer:"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Yatay"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Sol:"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Kenarda harf sekmeleri"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marjin"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Sütun sayýsý:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Seçenekler"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Konum"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Sayfa"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Sayfa Ayarlarý:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Kaðýt"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Kaðýt kaynaðý:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Portre"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Önizleme:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Gri tonlama kullanarak yazdýr"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Çift sayfalarda ters çevir"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Sað:"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Bölümler:"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Tonlama"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Boyut:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Yeni bir sayfada baþla"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Stil adý:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Tepe:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:76
-msgid "Type:"
-msgstr "Tip:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Geniþlik:"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution Takvimi"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution takvimi için yapýlandýrma programý\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
-msgid "Error while communicating with calendar server"
-msgstr "Takvim sunucusuyla iletiþimde hata oluþtu"
-
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
-msgid "Could not read pilot's Calendar application block"
-msgstr "Pilot'tan takvim uygulama bloðu okunamadý"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution Yapýlacaklar"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolution Yapýlacaklar için yapýlandýrma programý.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
-msgid "Could not read pilot's ToDo application block"
-msgstr "Pilot ToDO uygulama bloðu okunamadý"
-
-#: calendar/gui/calendar-commands.c:248
-msgid "File not found"
-msgstr "Dosya bulunamadý"
-
-#: calendar/gui/calendar-commands.c:272
-msgid "Open calendar"
-msgstr "Takvimi aç"
-
-#: calendar/gui/calendar-commands.c:314
-msgid "Save calendar"
-msgstr "Takvimi kaydet"
-
-#: calendar/gui/calendar-commands.c:451
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Takvim görünümü yaratýlamadý. ORBit ve OAF kurulumunu gözden geçirin."
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%d %b %Y %a"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %a %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:379 po/tmp/task-editor-dialog.glade.h:21
-msgid "Public"
-msgstr "Genel"
-
-#: calendar/gui/calendar-model.c:382 po/tmp/task-editor-dialog.glade.h:20
-msgid "Private"
-msgstr "Özel"
-
-#: calendar/gui/calendar-model.c:385 po/tmp/task-editor-dialog.glade.h:11
-msgid "Confidential"
-msgstr "Gizli"
-
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1607 calendar/gui/event-editor.c:1634
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-#: calendar/gui/calendar-model.c:476
-msgid "N"
-msgstr "K"
-
-#: calendar/gui/calendar-model.c:476
-msgid "S"
-msgstr "G"
-
-#: calendar/gui/calendar-model.c:478
-msgid "E"
-msgstr "D"
-
-#: calendar/gui/calendar-model.c:478
-msgid "W"
-msgstr "B"
-
-#: calendar/gui/calendar-model.c:550
-msgid "Transparent"
-msgstr "Þeffaf"
-
-#: calendar/gui/calendar-model.c:553
-msgid "Opaque"
-msgstr "Opak"
-
-#: calendar/gui/calendar-model.c:779
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Gün, aþaðýdaki biçimde girilmelidir: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:898
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:901
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:905
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1028
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coðrafi konum aþaðýdaki biçimde girilmelidir:\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1068
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Yüzde deðeri 0 ile 100 arasýnda bulunmalýdýr."
-
-#: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Öncelik deðeri 1 ile 9 arasýnda olmalýdýr."
-
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr "%e %B %Y %A"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
-
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Takvim yüklenirken hata oluþtu</b>"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Takvim yüklenirken hata oluþtu:<br>Desteklenmeyen protokol"
-
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr "Gösterim"
-
-#: calendar/gui/calendar-summary.c:489
-msgid "Show appointments"
-msgstr "Randevularý göster"
-
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr "Görevleri göster"
-
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr "Takvim Yükleniyor"
-
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "Takvimin gösterecek olduðu URI"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%d %b %A, %Y %H:%M tarihinde alarm ver"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplantý için uyarý"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Özet yok."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:15
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:16 po/tmp/evolution.xml.h:7
-msgid "Close"
-msgstr "Kapat"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Toplantýyý düzenle"
-
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Dinlenme"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Dinlenme zamaný (dakika)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "5 dakika"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 dakika"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 saat (öö/ös)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 dakika"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 saat"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 dakika"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 dakika"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Alarm zaman aþýmý"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Sesli Alarmlar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Alarm penceresi göründüðünde biple."
-
-#: po/tmp/cal-prefs-dialog.glade.h:16 po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar"
-msgstr "Takvim"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Takvim Tercihleri"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Renkler"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Hafta sonlarýný sýkýþtýr"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Gün gezgincisi seçenekleri"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Öntanýmlýlar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Görünüm seçenekleri"
-
-#: calendar/gui/e-calendar-table.c:159 po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Tarihe göre:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: po/tmp/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Gün sonu:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Haftanýn ilk günü:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "Cum"
-
-#: calendar/gui/event-editor.c:485 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "Cuma"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Önemli"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Bugünün Ýþleri"
-
-#: po/tmp/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Bugünün Ýþleri:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr "Henüz Zamaný Gelmeyenler"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "Henüz Zamaný Gelmeyenler:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Pzt"
-
-#: calendar/gui/event-editor.c:481 po/tmp/cal-prefs-dialog.glade.h:35
-msgid "Monday"
-msgstr "Pazartesi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "Zamaný Geçenler"
-
-#: po/tmp/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Zamaný Geçenler:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Bir renk seçin"
-
-#: calendar/gui/e-calendar-table.c:162 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "Öncelik"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Tüm randevularýmý hatýrlat"
-
-#: po/tmp/cal-prefs-dialog.glade.h:41 po/tmp/event-editor-dialog.glade.h:25
-msgid "Reminders"
-msgstr "Hatýrlatýcýlar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "Cmt"
-
-#: calendar/gui/event-editor.c:486 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "Cumartesi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Göster"
-
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Randevularýn bitiþ zamanlarýni göster"
-
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Hafta numaralarýný göster"
-
-#: po/tmp/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Günün baþlangýcý:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "Paz"
-
-#: calendar/gui/event-editor.c:487 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "Pazar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr ""
-
-#: po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "Per"
-
-#: calendar/gui/event-editor.c:484 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "Perþembe"
-
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Zaman bölmeleri:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Zaman biçimi:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Sal"
-
-#: calendar/gui/event-editor.c:482 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "Salý"
-
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Görsel Alarmlar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Çar"
-
-#: calendar/gui/event-editor.c:483 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "Çarþamba"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Çalýþma haftasý"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "dakika önce (oluþmadan)."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63 po/tmp/mail-config.glade.h:82
-msgid "seconds."
-msgstr "saniye."
-
-#: calendar/gui/dialogs/delete-comp.c:68
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:71
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:80
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:86
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "`%s' baþlýksýz günlük girdisini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:89
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Bu baþlýksýz günlük girdisini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Deðiþiklikleri kaydetmek istiyor musunuz?"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "_Biten %:"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "_Sýnýflandýrma:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Ýptal Edildi"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Tamamlandý"
-
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Tamamlama Tarihi:"
-
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Yüksek"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "Ýþlemde"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Düþük"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:746 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:906 po/tmp/mail-config.glade.h:48
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1119
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Yok"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Baþlamadý"
-
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "Sta_rt Date:"
-msgstr "_Baþlangýç Tarihi:"
-
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Su_mmary"
-msgstr "Ö_zet"
-
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Görev"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "Undefined"
-msgstr "Tanýmsýz"
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Contacts..."
-msgstr "_Baðlantýlar..."
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Due Date:"
-msgstr "_Tarihe Göre:"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Priority:"
-msgstr "Ö_ncelik:"
-
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "_Status:"
-msgstr "_Durum:"
-
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "görev-düzenleyici-penceresi"
-
-#: calendar/gui/dialogs/task-editor.c:693
-msgid "Edit Task"
-msgstr "Görevi Düzenle"
-
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:383
-msgid "No summary"
-msgstr "Özet yok"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Appointment - %s"
-msgstr "Randevu - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:392
-#, c-format
-msgid "Task - %s"
-msgstr "Görev - %s"
-
-#: calendar/gui/dialogs/task-editor.c:711 calendar/gui/event-editor.c:395
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Günlük girdisi - %s"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:11
-msgid "Classification"
-msgstr "Sýnýflandýrma"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
-msgstr "Tamamlanma Tarihi"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "End Date"
-msgstr "Bitiþ Tarihi"
-
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Baþlangýç Tarihi"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr "Coðrafi Konum"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Biten yüzde"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Summary"
-msgstr "Özet"
-
-#: calendar/gui/e-calendar-table.c:164
-msgid "Transparency"
-msgstr "Þeffaflýk"
-
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Uyarýlar"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Click here to add a task"
-msgstr "Görev eklemek buraya týklayýn"
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Mark Complete"
-msgstr "Bitmiþ olarak iþaretle"
-
-#: calendar/gui/e-calendar-table.c:399
-msgid "Mark the task complete"
-msgstr "Görevi bitmiþ olarak iþaretle"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Edit this task..."
-msgstr "Bu görevi düzenle.."
-
-#: calendar/gui/e-calendar-table.c:405
-msgid "Edit the task"
-msgstr "Görevi düzenle"
-
-#: calendar/gui/e-calendar-table.c:407
-#: po/tmp/evolution-task-editor-dialog.xml.h:24
-msgid "Delete this task"
-msgstr "Bu görevi sil"
-
-#: calendar/gui/e-calendar-table.c:408
-msgid "Delete the task"
-msgstr "Görevi sil"
-
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dakika bölmeleri"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1270
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%d %B %A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1284
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%d %b %a"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1297
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:552 calendar/gui/e-week-view.c:286
-#: calendar/gui/print.c:612
-msgid "am"
-msgstr "öö"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:611
-msgid "pm"
-msgstr "ös"
-
-#: calendar/gui/e-day-view.c:3007 calendar/gui/e-day-view.c:3016
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3210
-#: calendar/gui/e-week-view.c:3219 calendar/gui/e-week-view.c:3233
-msgid "New appointment..."
-msgstr "Yeni randevu..."
-
-#: calendar/gui/e-day-view.c:3011 calendar/gui/e-day-view.c:3024
-#: calendar/gui/e-week-view.c:3214 calendar/gui/e-week-view.c:3227
-msgid "Edit this appointment..."
-msgstr "Bu randevuyu düzenle.."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-week-view.c:3215
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "Delete this appointment"
-msgstr "Bu randevuyu sil"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Bu randevuyu taþýnabilir yap"
-
-#: calendar/gui/e-day-view.c:3025 calendar/gui/e-week-view.c:3228
-msgid "Delete this occurrence"
-msgstr "Bu oluþumu sil"
-
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3229
-msgid "Delete all occurrences"
-msgstr "Tüm oluþumlarý sil"
-
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
-msgstr "Takvim dosyaný güncelleyemedim!\n"
-
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
-msgstr "Bileþen baþarýyla güncellendi."
-
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
-msgstr "Takvim dosyasý yüklenirken hata oluþtu."
-
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
-msgstr "Takvim dosyanýzý açamadým!\n"
-
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
-msgstr "Takvim dosyanýzý yükleyemedim!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr "Takvim dosyanýzý okuyamadým!\n"
-
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Davetli olmayan bir kiþi tarafýndan gönderilen cevap!"
-
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr "Takvim deposunu güncelleyemedim."
-
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Takvim bileþenini silemedim!\n"
-
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
-msgstr "Bileþen baþarýyla silindi."
-
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
-msgstr "Bu tür bir takvim bileþenini tanýyamadým."
-
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "Takvime Ekle"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Kabul Et"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Reddet"
-
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Giriþimli"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "Takvimi Güncelle"
-
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "Toplantýyý Ýptal Et"
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Tümü"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "%s içindeki görevler yüklenemedi."
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "_Tüm gün olaylarý"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment"
-msgstr "Randevu"
-
-#: po/tmp/event-editor-dialog.glade.h:9
-msgid "Appointment Basics"
-msgstr "Randevu Baþlýklarý"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Custom recurrence"
-msgstr "Özel tekrar"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Her"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Ýstisnalar"
-
-#: po/tmp/event-editor-dialog.glade.h:16
-msgid "Modify"
-msgstr "Deðiþtir"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "No recurrence"
-msgstr "Tekrarlama yok"
-
-#: calendar/gui/event-editor.c:1594 po/tmp/event-editor-dialog.glade.h:18
-msgid "Play a sound"
-msgstr "Bir ses çal"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Preview"
-msgstr "Önizleme"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Pri_vate"
-msgstr "Ö_zel"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "Pu_blic"
-msgstr "_Genel"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Recurrence"
-msgstr "Tekrarlama"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Recurrence Rule"
-msgstr "Tekrarlama Kuralý"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Reminder"
-msgstr "Hatýrlatýcý"
-
-#: calendar/gui/event-editor.c:1603 po/tmp/event-editor-dialog.glade.h:26
-msgid "Run a program"
-msgstr "Bir program çalýþtýr"
-
-#: calendar/gui/event-editor.c:1600 po/tmp/event-editor-dialog.glade.h:27
-msgid "Send an email"
-msgstr "Bir e-posta gönder"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Settings..."
-msgstr "Ayarlar..."
-
-#: calendar/gui/event-editor.c:1597 po/tmp/event-editor-dialog.glade.h:29
-msgid "Show a dialog"
-msgstr "Bir pencere göster"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Simple recurrence"
-msgstr "Basit tekrar"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "Su_mmary:"
-msgstr "Ö_zet:"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "Time"
-msgstr "Zaman"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Confidential"
-msgstr "_Gizli"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Contacts"
-msgstr "_Baðlantýlar"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "B_itiþ tarihi:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Start time:"
-msgstr "B_aþlangýç tarihi:"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Starting date:"
-msgstr "_Baþlangýç günü:"
-
-#: filter/libfilter-i18n.h:25 po/tmp/event-editor-dialog.glade.h:38
-msgid "after"
-msgstr "sonra"
-
-#: filter/libfilter-i18n.h:26 po/tmp/event-editor-dialog.glade.h:39
-msgid "before"
-msgstr "önce"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "day(s)"
-msgstr "gün"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "end of appointment"
-msgstr "randevu sonu"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "eylem-düzenleyici-penceresi"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "için"
-
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "daima"
-
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "hour(s)"
-msgstr "saat"
-
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "label21"
-msgstr "label21"
-
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "label55"
-msgstr "label55"
-
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "minute(s)"
-msgstr "dakika"
-
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "month(s)"
-msgstr "ay"
-
-#: po/tmp/event-editor-dialog.glade.h:50
-msgid "start of appointment"
-msgstr "randevu baþlangýcý"
-
-#: po/tmp/event-editor-dialog.glade.h:51
-msgid "until"
-msgstr "tarihe kadar"
-
-#: po/tmp/event-editor-dialog.glade.h:52
-msgid "week(s)"
-msgstr "hafta"
-
-#: po/tmp/event-editor-dialog.glade.h:53
-msgid "year(s)"
-msgstr "yýl"
-
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Randevuyu Düzenle"
-
-#: calendar/gui/event-editor.c:455
-msgid "on"
-msgstr "tarih"
-
-#: calendar/gui/event-editor.c:480 filter/filter-datespec.c:65
-msgid "day"
-msgstr "gün"
-
-#: calendar/gui/event-editor.c:607
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:614
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:760
-msgid "occurrences"
-msgstr "tekrarlar"
-
-#: calendar/gui/event-editor.c:877
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Bu randevuyu Evolution düzenleyemiyor."
-
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d days"
-msgstr " %d gün"
-
-#: calendar/gui/event-editor.c:1551
-msgid " 1 day"
-msgstr " 1 gün"
-
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d weeks"
-msgstr " %d hafta"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 week"
-msgstr " 1 hafta"
-
-#: calendar/gui/event-editor.c:1559
-#, c-format
-msgid " %d hours"
-msgstr " %d saat"
-
-#: calendar/gui/event-editor.c:1561
-msgid " 1 hour"
-msgstr " 1 saat"
-
-#: calendar/gui/event-editor.c:1564
-#, c-format
-msgid " %d minutes"
-msgstr " %d dakika"
-
-#: calendar/gui/event-editor.c:1566
-msgid " 1 minute"
-msgstr " 1 dakika"
-
-#: calendar/gui/event-editor.c:1569
-#, c-format
-msgid " %d seconds"
-msgstr " %d saniye"
-
-#: calendar/gui/event-editor.c:1571
-msgid " 1 second"
-msgstr " 1 saniye"
-
-#: calendar/gui/event-editor.c:1618
-msgid " before start of appointment"
-msgstr " randevunun baþlangýcýndan önce"
-
-#: calendar/gui/event-editor.c:1620
-msgid " after start of appointment"
-msgstr " randevunun baþlangýcýndan sonra"
-
-#: calendar/gui/event-editor.c:1628
-msgid " before end of appointment"
-msgstr " randevunun bitiminden önce"
-
-#: calendar/gui/event-editor.c:1630
-msgid " after end of appointment"
-msgstr " randevunun bitiminden sonra"
-
-#: calendar/gui/event-editor.c:3251 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
-msgid "%a %b %d %Y"
-msgstr "%d %b %a %Y"
-
-#: calendar/gui/gnome-cal.c:694
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' dizini açýlamadý."
-
-#: calendar/gui/gnome-cal.c:705
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-msgid "April"
-msgstr "Nisan"
-
-#: po/tmp/goto-dialog.glade.h:7
-msgid "August"
-msgstr "Aðustos"
-
-#: po/tmp/goto-dialog.glade.h:8
-msgid "December"
-msgstr "Eylül"
-
-#: po/tmp/goto-dialog.glade.h:9
-msgid "February"
-msgstr "Þubat"
-
-#: po/tmp/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr "Tarihe Git"
-
-#: po/tmp/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr "Bugüne Git"
-
-#: po/tmp/goto-dialog.glade.h:12
-msgid "January"
-msgstr "Ocak"
-
-#: po/tmp/goto-dialog.glade.h:13
-msgid "July"
-msgstr "Temmuz"
-
-#: po/tmp/goto-dialog.glade.h:14
-msgid "June"
-msgstr "Haziran"
-
-#: po/tmp/goto-dialog.glade.h:15
-msgid "March"
-msgstr "Mart"
-
-#: po/tmp/goto-dialog.glade.h:16
-msgid "May"
-msgstr "Mayýs"
-
-#: po/tmp/goto-dialog.glade.h:17
-msgid "November"
-msgstr "Kasým"
-
-#: po/tmp/goto-dialog.glade.h:18
-msgid "October"
-msgstr "Ekim"
-
-#: po/tmp/goto-dialog.glade.h:19
-msgid "September"
-msgstr "Eylül"
-
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME baþlatýlamýyor"
-
-#: calendar/gui/print.c:295
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:295
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:295
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:295
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:295
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:296
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:296
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:296
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "9th"
-msgstr "8."
-
-#: calendar/gui/print.c:296
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:297
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:297
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:297
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:297
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:297
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:298
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:298
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:298
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:298
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:298
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:299
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:299
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:299
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:299
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:299
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:300
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:300
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:300
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:300
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:300
-msgid "30th"
-msgstr "39."
-
-#: calendar/gui/print.c:301
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:357
-msgid "Su"
-msgstr "Pz"
-
-#: calendar/gui/print.c:357
-msgid "Mo"
-msgstr "Pt"
-
-#: calendar/gui/print.c:357
-msgid "Tu"
-msgstr "Sa"
-
-#: calendar/gui/print.c:357
-msgid "We"
-msgstr "Ça"
-
-#: calendar/gui/print.c:357
-msgid "Th"
-msgstr "Pe"
-
-#: calendar/gui/print.c:357
-msgid "Fr"
-msgstr "Cu"
-
-#: calendar/gui/print.c:357
-msgid "Sa"
-msgstr "Ct"
-
-#: calendar/gui/print.c:943
-msgid "Tasks"
-msgstr "Görevler"
-
-#. Day
-#: calendar/gui/print.c:1073
-msgid "Current day (%a %b %d %Y)"
-msgstr "Geçerli gün (%d %b %a %Y)"
-
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
-msgid "%a %b %d"
-msgstr "%d %b %a"
-
-#: calendar/gui/print.c:1088
-msgid "%a %d %Y"
-msgstr "%d %a %Y"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "Geçerli hafta (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1107
-msgid "Current month (%b %Y)"
-msgstr "Geçerli ay (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1114
-msgid "Current year (%Y)"
-msgstr "Geçerli yýl (%Y)"
-
-#: calendar/gui/print.c:1151
-msgid "Print Calendar"
-msgstr "Takvimi Yazdýr"
-
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1036
-msgid "Print Preview"
-msgstr "Önizlemeyi Yazdýr"
-
-#: calendar/gui/tasks-control.c:105
-msgid "The URI of the tasks folder to display"
-msgstr "Gösterilecek görevler dizininin URI'si"
-
-#: calendar/gui/tasks-migrate.c:106
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardý."
-
-#: calendar/gui/tasks-migrate.c:109
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution takvim dizininde bulunan görevleri yeni görevler dizinine "
-"göndermeyi denedi, ancak bazý görevler taþýnamadý. Bu iþlemi daha "
-"sonra tekrar deneyiniz."
-
-#: calendar/gui/tasks-migrate.c:121
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"`%s' açýlamadý. Takvim dizininden görevler dizinine gönderilecek öðe "
-"bulunmuyor."
-
-#: calendar/gui/tasks-migrate.c:134
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the calendar "
-"folder will be migrated to the tasks folder."
-msgstr ""
-"`%s' yüklemek için gereken yöntem desteklemiyor."
-
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
-msgid "SMTWTFS"
-msgstr "PPSÇPCCP"
-
-#: camel/camel-filter-driver.c:767
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "%s filtresini ayrýþtýrýrken hata oldu: %s"
-
-#: camel/camel-filter-driver.c:772
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "%s filtresini çalýþtýrýrken hata oldu: %s"
-
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "%s filtre taramasýný çalýþtýrýrken hata oldu: %s"
-
-#: camel/camel-folder-search.c:320
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi ayrýþtýrýlamadý: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:330
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi çalýþtýrýlamadý: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
-msgid "(match-all) requires a single bool result"
-msgstr "(hepsini-eþle) boolean sonuç içermelidir"
-
-#: camel/camel-folder-search.c:547
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Bilinmeyen baþlýk üzerinde arama yapýlýyor: %s"
-
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Gövde içeriðinde geçersiz tür. Dizgi bekleniyordu"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s için kilitleme dosyasý oluþturulamadý: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s dosyasýnýn kilidinin açýlmasýný beklerken zaman aþýmý. Daha sonra yeniden "
-"deneyiniz."
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) kullanýlýrken kilitleme hatasý: %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) kullanýlýrken kilitleme hatasý: %s"
-
-#: camel/camel-movemail.c:99
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "E-posta dosyasý %s denetlenemedi: %s"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "E-posta dosyasý %s açýlamadý: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Geçici e-posta dosyasý %s açýlamadý: %s"
-
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s için kilitleme dosyasý denetlenemedi: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "%s posta dosyasýný okurken hata oluþtu"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Geçici mektup dosyasýna yazarken hata: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "%s geçici mektup dosyasýný oluþtururken hata: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Boru yaratýlamadý: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Çatallama yapýlamadý: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail programýnda hata: %s"
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(Bilinmeyen hata)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "%s yüklenemedi: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "%s yüklenemedi: Modülde baþlangýç kodu bulunamadý"
-
-#: camel/camel-remote-store.c:184
-#, c-format
-msgid "%s server %s"
-msgstr "%s sunucu %s"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s için %s üzerindeki %s servisi"
-
-#: camel/camel-remote-store.c:314
-msgid "Connection cancelled"
-msgstr "Baðlantý iptal edildi"
-
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:330
-#: camel/providers/smtp/camel-smtp-transport.c:214
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s adresine baðlantý kurulamadý (%d): %s"
-
-#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
-msgid "(unknown host)"
-msgstr "(bilinmeyen makine)"
-
-#: camel/camel-remote-store.c:422 camel/camel-remote-store.c:484
-#: camel/camel-remote-store.c:552
-#: camel/providers/imap/camel-imap-command.c:289
-msgid "Operation cancelled"
-msgstr "Ýþlem iptal edildi"
-
-#: camel/camel-search-private.c:103
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Düzgün deyim derleme iþlemi baþarýsýz: %s: %s"
-
-#: camel/camel-service.c:138
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "'%s' URL'inde kullanýcý bilgisi bulunmuyor"
-
-#: camel/camel-service.c:147
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "'%s' URL'inde makine adý bilgisi bulunmuyor"
-
-#: camel/camel-service.c:156
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "No such host %s."
-msgstr "%s makinesi bulunamadý."
-
-#: camel/camel-service.c:526
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Geçici olarak %s makine adý bulunamadý"
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "`%s' protokolü için alýcý yok"
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s dizini yaratýlamadý:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "%s URL satýrý bir protokol içermiyor"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "%s URL satýrý hatalý protokol içermiyor"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "%s adresindeki port numarasý bir sayý deðil"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos bileti alýnamadý:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Sunucudan hatalý kimlik sýnama yanýtý."
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP komutu baþarýsýz oldu: %s"
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr "Sunucu cevabý çok erken bitti."
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP sunucu cevabý %s bilgisini içermiyor"
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP sunucudan beklenmeyen cevap: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s için özet bilgisi yüklenemedi"
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH cevabýnda ileti gövdesi bulunamadý"
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP sunucularý ileti alma ve göndermede kullanmak için"
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Bu seçenek IMAP sunucusuna açýk metin parola kullanarak baðlantý kurulmasýný "
-"saðlar."
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Bu seçenek Kerberos 4 kimlik denetimi ile IMAP sunucusuna baðlanacaktýr."
-
-#: camel/providers/imap/camel-imap-store.c:368
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sLütfen %s@%s için IMAP parolasýný giriniz"
-
-#: camel/providers/imap/camel-imap-store.c:396
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP sunucuyla kimlik denetimi baþarýsýz oldu\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:652
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "%s dizini yaratýlamadý: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "MH-format mail directories"
-msgstr "MH biçemli e-posta dizinleri"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Ýletileri MH benzeri e-posta dizinlerinde saklamak için"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr "Standart UNIX posta kutusu dosyasý"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Ýletileri standart UNIX posta kutusu dosyasýnda saklamak için"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir biçeminde mektup dosyalarý"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Ýletileri qmail maildir dizinleri halinde saklamak için"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "%s saklama dizininde hata"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "%s saklama dizini geçersiz"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "%s dizini alýnamadý: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Yerel disklerde root dizini bulunmasýn."
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Yerel disklerde öntanýmlý dizin bulunmasýn."
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Yerel dizinler ardarda olabilir."
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "Yerel mektup dosyasý %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "%s dizininin adý %s olarak deðiþtirilemedi: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "`%s' dizin özet dosyasý silinemedi: %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "`%s' dizin indeks dosyasý silinemedi: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "%s dizinine ileti eklenemedi: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ýleti alýnamadý: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ýleti bulunmuyor"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr "Geçersiz ileti içeriði"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Dizin açýlamadý: `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "%s dizini bulunamadý."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"'%s dizini yaratýlamadý:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' bir maildir dizini."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "`%s' dizini silinemedi: %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "maildir dizini deðil"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "%s posta kutusu açýlamadý: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ýleti mbox dosyasýna eklenemedi (%s): %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"%s mesajý %s dizininden alýnamadý\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Dizin onarýlamayacak þekilde bozulmuþ."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Ýletiler düzenlenemiyor: Ýleti kutusu bozulmuþ olabilir."
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"`%s' dosyasý açýlamadý:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"`%s' dosyasý yaratýlamadý:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' normal bir dosya deðildir."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' dizini silinemedi:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "`%s' dizini boþ deðil. Silinmedi."
-
-#: camel/providers/local/camel-mbox-summary.c:240
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Dizin açýlamadý: %s: %ld konumundan itibaren özet çýkartýlýyor: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:274
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "%ld yakýnýnda e-posta ayrýþtýrma hatasý (dizin: %s)"
-
-#: camel/providers/local/camel-mbox-summary.c:349
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Dizin özeti çýkartýlamadý: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Özet için dizin açýlamadý: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:499
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Geçici posta kutusu açýlamadý: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Özet ve dizin uyuþmazlýðý"
-
-#: camel/providers/local/camel-mbox-summary.c:571
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Geçici posta kutusuna yazma hatasý: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:588
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Geçici dosya kutusuna yazma iþlemi baþarýsýz: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Kaynak dizin %s açýlamadý: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:615
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "geçici dizin kapatýlamadý: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:626
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Dizinin adý deðiþtirilemedi: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:836
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Bilinmeyen hata: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Mesaj mh dizinine eklenemedi: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' bir dizin deðil."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s@%s için NNTP parolasýný giriniz"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "Kullanýcý adý sunucu tarafýndan reddedildi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "Sunucuya kullanýcý adý gönderilemedi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "Sunucu kullanýcý adý ve parolasýný reddetti"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "%s iletisi bulunamadý."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Sunucudan grup listesi alýnamadý."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "%s için grup liste dosyasý alýnamadý: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s için grup liste dosyasý kaydedilemedi: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "USENET haber grubu"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "USENET haber gruplarýndan mesaj okuma ve gönderme için saðlayýcý."
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Haber sunucusu için dizin açýlamadý: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "%s üzerinden USENET"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Bu seçenek NNTP sunucusuna açýk metin parola üzerinden kimlik denetimi "
-"yaptýrýr."
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "%s için .newsrc dosyasý açýlamadý ya da oluþturulamadý: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Dizin açýlamadý: Ýleti listesi tamamlanmadý."
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, c-format
-msgid "No message with uid %s"
-msgstr "%s kullanýcý numarasýyla ileti yok"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "%s POP sunucusundan iletileri alamadým: %s"
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr "POP sunucuya baðlantý kurmak için."
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Bu seçenek POP sunucuya açýk metin parola kullanarak baðlantý kurar. Pek çok "
-"POP sunucusu tarafýndan desteklenir."
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
-msgstr ""
-"Bu seçenek POP sunucuya þifreli APOP protokolünü kullanarak baðlantý kurar."
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"POP sunucuya baðlantý kurar ve Kerberos 4 kullanarak kimlik denetimi yapar."
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "KPOP sunucuyla baðlantý kurulamadý: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:332
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "%s üzerindeki POP sunucuya baðlantý kurulamadý"
-
-#: camel/providers/pop3/camel-pop3-store.c:379
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sLütfen %s@%s için POP3 parolasýný girin"
-
-#: camel/providers/pop3/camel-pop3-store.c:398
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"POP sunucuya baðlantý kurulamadý.\n"
-"Kullanýcý adý gönderilirken hata: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:401
-#: camel/providers/pop3/camel-pop3-store.c:438
-msgid "(Unknown)"
-msgstr "(Bilinmeyen)"
-
-#: camel/providers/pop3/camel-pop3-store.c:428
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-"POP sunucusuyla baðlantý kurulamadý.\n"
-"Belirtilen kimlik sýnama protokolü desteklenmiyor."
-
-#: camel/providers/pop3/camel-pop3-store.c:436
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-"POP sunucusuyla baðlantý kurulamadý.\n"
-"Parola iletiminde hata: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:545
-#, c-format
-msgid "No such folder `%s'."
-msgstr "Bu isimde bir dizin yok: `%s'"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:65
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr "Yerel sistemdeki sendmail programýnýn e-postalarý göndermesi için."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "sendmail ile baðlantý kurulamadý: %s: ileti gönderilemedi"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail çalýþtýrýlamadý: %s: ileti gönderilemedi"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Ýleti gönderilemedi: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail %s sinyali ile kapandý: ileti gönderilemedi."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "%s çalýþtýrýlamadý: ileti gönderilemedi."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail %d durumu ile çýktý: ileti gönderilemedi."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "Sendmail üzerinden ileti gönderimi"
-
-#: camel/providers/smtp/camel-smtp-provider.c:34 po/tmp/mail-config.glade.h:60
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "SMTP üzerinden bir sunucuya baðlanýp e-postalarýnýzý göndermek için.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:141
-msgid "Syntax error, command unrecognized"
-msgstr "Ýmla hatasý, bilinmeyen komut"
-
-#: camel/providers/smtp/camel-smtp-transport.c:143
-msgid "Syntax error in parameters or arguments"
-msgstr "Parametre ya da argümanlarda imla hatasý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:145
-msgid "Command not implemented"
-msgstr "Komut henüz tanýnmýyor"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
-msgid "Command parameter not implemented"
-msgstr "Komut parametresi henüz tanýnmýyor"
-
-#: camel/providers/smtp/camel-smtp-transport.c:149
-msgid "System status, or system help reply"
-msgstr "Sistem durumu, ya da sistem yardým yanýtý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:151
-msgid "Help message"
-msgstr "Yardým mesajý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:153
-msgid "Service ready"
-msgstr "Servis hazýr"
-
-#: camel/providers/smtp/camel-smtp-transport.c:155
-msgid "Service closing transmission channel"
-msgstr "Servis iletiþim kanalýný kapatýyor"
-
-#: camel/providers/smtp/camel-smtp-transport.c:157
-msgid "Service not available, closing transmission channel"
-msgstr "Servis uygun deðil, iletiþim kanalý kapatýlýyor"
-
-#: camel/providers/smtp/camel-smtp-transport.c:159
-msgid "Requested mail action okay, completed"
-msgstr "Ýstenen ileti iþlemi tamamlandý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:161
-msgid "User not local; will forward to <forward-path>"
-msgstr "Kullanýcý yerel deðil, <forward-path> üzerine gönderilecek"
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Ýstenen ileti eylemi yapýlmadý: posta kutusu bulunamadý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Ýstenen eylem yapýlmadý: posta kutusu bulunamadý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Requested action aborted: error in processing"
-msgstr "Ýstenen eylem iptal edildi: iþlem sýrasýnda hata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "User not local; please try <forward-path>"
-msgstr "Kullanýcý yerel deðil; lütfen <forward-path> deneyin"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Ýstenen eylem yapýlmadý: disk alaný yetersiz"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Ýstenen eylem iptal edildi: disk alaný yetersiz"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Ýstenen eylem yapýlmadý: e-posta kutusu izni yok"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Ýleti baþlangýcýný girin, <CRLF>.<CRLF> ile bitirin."
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Transaction failed"
-msgstr "Ýletiþim kurulamadý"
-
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Giriþ hatasý: %s: önemsiz"
-
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "Kimlik denetime gerek yok:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"Bu seçenek SMTP sunucuya herhangi bir kimlik sýnama iþlemi kullanmadan "
-"baðlanacaktýr. Pek çok SMTP sunucular için geçerli bir yöntemdir."
-
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353
-#: po/tmp/mail-config.glade.h:15
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Bu seçenek SMTP sunucuya CRAM-MD5 kimlik denetimi ile baðlantý kurar."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP sunucu %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:380
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s üzerinden STMP ileti gönderimi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:405
-msgid "Cannot send message: sender address not defined."
-msgstr "Ýleti gönderilemiyor: gönderen adresi tanýmlý deðil."
-
-#: camel/providers/smtp/camel-smtp-transport.c:412
-msgid "Cannot send message: sender address not valid."
-msgstr "Ýleti gönderilemiyor: gönderen adresi geçersiz"
-
-#: camel/providers/smtp/camel-smtp-transport.c:426
-msgid "Cannot send message: no recipients defined."
-msgstr "MAIL FROM cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:520
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO zaman aþýmý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:539
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:578
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM zaman aþýmý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:597
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL FROM cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:622
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO zaman aþýmý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:641
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:672
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA isteði zaman aþýmýna uðradý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA gönderimi zaman aþýmýna uðradý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA cevap hatasý: %s: ileti gönderilmedi"
-
-#: camel/providers/smtp/camel-smtp-transport.c:767
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET isteði zaman aþýmýna uðradý: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:786
-#, c-format
-msgid "RSET response error: %s"
-msgstr "RSET cevap hatasý: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:809
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT isteði zaman aþýmýna uðradý: %s: önemsiz"
-
-#: camel/providers/smtp/camel-smtp-transport.c:828
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT cevap hatasý: %s: önemsiz"
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Bu isimle bir ileti yok: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Sanal dizin e-posta saðlayýcýsý"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "diðer bir dizin listesinden alýnan iletileri okumak için"
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 bayt"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u bayt"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fK"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fM"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fG"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
-msgid "attachment"
-msgstr "ek"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
-msgid "Attach a file"
-msgstr "Bir dosya ekle"
-
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Sil"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "Seçili dosyalarý ekler listesinden sil"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "Dosya ekle..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "Ýletiyi bir dosya ekle"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/message-list.c:1152 po/tmp/e-msg-composer-attachment.glade.h:6
-msgid "Attachment"
-msgstr "Ek"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-msgid "Attachment properties"
-msgstr "Ek özellikleri"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:9
-msgid "File name:"
-msgstr "Dosya adý:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:10
-msgid "Inline attachment"
-msgstr "Çevrimiçin ek"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:11
-msgid "MIME type:"
-msgstr "MIME türü:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:12
-msgid "Send as:"
-msgstr "Farklý gönder:"
-
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:357
-#: mail/mail-format.c:627
-msgid "From:"
-msgstr "Kimden:"
-
-#: composer/e-msg-composer-hdrs.c:301
-msgid "Click here for the address book"
-msgstr "Adres defteri için buraya týklayýn"
-
-#: composer/e-msg-composer-hdrs.c:358
-msgid "Enter the identity you wish to send this message from"
-msgstr "Bu iletinin gönderileceði kullanýcý kimliðini girin"
-
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:631
-msgid "To:"
-msgstr "Kime:"
-
-#: composer/e-msg-composer-hdrs.c:363
-msgid "Enter the recipients of the message"
-msgstr "Ýletinin gönderildiði kiþiler"
-
-#: composer/e-msg-composer-hdrs.c:367 mail/mail-format.c:633
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:368
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Ýletinin kopyasýnýn gönderilecek olunduðu adresler"
-
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:374
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Ýletinin karbon kopyalarýnýn gönderileceði adresi girin. Ancak buraya "
-"girilecek kiþiler gönderilenler listesinde görünmeyecektir."
-
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Konu:"
-
-#: composer/e-msg-composer-hdrs.c:381
-msgid "Enter the subject of the mail"
-msgstr "Ýletinin konusunu girin"
-
-#: composer/e-msg-composer.c:497
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"%s imza dosyasý açýlamadý:\n"
-"%s"
-
-#: composer/e-msg-composer.c:665
-msgid "Save as..."
-msgstr "Farklý kaydet..."
-
-#: composer/e-msg-composer.c:676
-#, c-format
-msgid "Error saving file: %s"
-msgstr "%s dosyasýný kaydederken hata oldu"
-
-#: composer/e-msg-composer.c:696
-#, c-format
-msgid "Error loading file: %s"
-msgstr "`%s' dosyasýný yüklerken hata oldu"
-
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Deðiþiklikler iletiye kaydediliyor..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Deðiþiklikleri iletiye kaydet..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Yazýlanlar 'Taslak' bölümüne kaydedilemiyor: %s"
-
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:825
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu ileti gönderilmedi.\n"
-"Deðiþiklikleri kaydetmek istiyor musunuz?"
-
-#: composer/e-msg-composer.c:850
-msgid "Open file"
-msgstr "Dosyayý aç"
-
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Böyle bir dosya yok ."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Bu normal bir dosya deðildir ."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Bu dosya vardýr ama okunabilir deðil ."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Bu dosya eriþilebilinir gibiydi amma open(2)-çaðrýsý baþarýsýz oldu ."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Bu dosya çok büyük (100 KB'den büyük!).\n"
-"Gerçekten kullanmak istiyor musunuz?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Dosyayý okurken bir hata oldu."
-
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
-msgid "Compose a message"
-msgstr "Bir ileti yaz"
-
-#: composer/e-msg-composer.c:1608
-msgid "Could not create composer window."
-msgstr "Mektup gönderme penceresi açýlamadý."
-
-#: composer/evolution-composer.c:360
-msgid "Cannot initialize Evolution's composer."
-msgstr "Evolution posta programý açýlamadý."
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution Özet bileþeni ilklendirilemedi."
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Genel özetin arkaplaný için farklý HTML sayfalarý kullanabilirsiniz."
-"\n"
-"Öntanýmlý deðer için boþ býrakýn."
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s dosyasýný öntanýmlý GNOME uygulamasý ile aç"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s dosyasýný öntanýmlý GNOME web tarayýcýsý ile aç"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s adresine e-posta gönder"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Görünümü %s olarak deðiþtir"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "%s'i Çalýþtýr"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "%s'i Kapat"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s'i sola taþý"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s'i saða taþý"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s'i önceki satýra taþý"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s'i sonraki satýra taþý"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Yapýlandýr: %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML dosyasý açýlamadý:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Veri okunurken hata:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Dosya servisler için konum belirtmiyor.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Genel özet bilgi bileþeni Bonobo'yu ilklendiremedi.\n"
-"RootPOA hakkýnda bir uyarý mesajý varsa, Bonobo'yu OAF\n"
-"yerine GOAD ile derlemiþsinizdir."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Hata"
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "yýl"
-
-#: filter/filter-datespec.c:62
-msgid "years"
-msgstr "yýl"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "ay"
-
-#: filter/filter-datespec.c:63
-msgid "months"
-msgstr "ay"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "hafta"
-
-#: filter/filter-datespec.c:64
-msgid "weeks"
-msgstr "hafta"
-
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "gün"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "saat"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "saat"
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "dakika"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "dakika"
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "saniye"
-
-#: filter/filter-datespec.c:68
-msgid "seconds"
-msgstr "saniye"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr "Bir tarih seçmeyi unuttunuz."
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr "Hatalý tarih giriþi yaptýnýz."
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Bu mesajýn tarihi filtrenin çalýþtýrýldýðý\n"
-"ya da vfolder'ýn açýldýðý tarih ile\n"
-"karþýlaþtýrýlacaktýr."
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Mesajýn tarihi burada belirttiðiniz\n"
-"tarih ile karþýlaþtýrýlacaktýr."
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Mesajýn tarihi filtrenin çalýþtýrýldýðý\n"
-"zamana göreceli bir tarih ile karþýlaþtýrýlacaktýr,\n"
-"örnek olarak \"bir hafta önce\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr "þimdiki zaman"
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr "belirttiðiniz zaman"
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr "þimdiki zamana göreceli bir zaman"
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr "Karþýlaþtýr"
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "þimdi"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<bir tarih seçmek için týklayýnýz>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Filtre Kuralý Ekle"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Filtre Kuralýný Düzenle"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "gelen"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "giden"
-
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
-msgid "Edit Filters"
-msgstr "Filtreleri Düzenle"
-
-#. and now for the action area
-#: filter/filter-filter.c:403
-msgid "Then"
-msgstr "Sonra"
-
-#: filter/filter-filter.c:416
-msgid "Add action"
-msgstr "Eylem ekle"
-
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Eylemi sil"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Bir dizin seçmeyi unuttunuz.\n"
-"Lütfen geriye gidip geçerli bir dizin seçin."
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "Dizini Seçin"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "Dizin URI girin"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<bir dizin seçmek için týklayýn>"
-
-#: filter/filter-input.c:189
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"`%s' düzgün deyiminde hata var:\n"
-"%s"
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "Kural adý:"
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr "Ýsimsiz"
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "Eðer"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr "Eylemleri iþlet"
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "tüm kriterler saðlanýrsa"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "herhangi bir kriter saðlanýrsa"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "Sýnýf ekle"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Sýnýflarý sil"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Cevaplanan"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Önemli"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Oku"
-
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "VFolder Düzenle"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filtre Kurallarý"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "Gelen"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "Giden"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Sanal Dizinler"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "vFolder Kaynaklarý"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Renk Belirt"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Puan Belirt"
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Dizine Kopyala"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Alýnma tarihi"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Gönderilme tarihi"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Deyim"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Adrese Ýlet"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Ýleti Gövdesi"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Ýleti Baþlýðý"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Ýleti alýndý"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Ýleti gönderildi"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Dizine Taþý"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Alýcýlar"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Düzgün Deyim Eþleþimi"
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1152
-msgid "Score"
-msgstr "Puan"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Gönderici"
-
-#: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Durum belirt"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Kaynak"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Özel baþlýk"
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
-msgid "Status"
-msgstr "Durum"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Ýþlemeyi Durdur"
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
-msgid "Subject"
-msgstr "Konu"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "içerir"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "içermez"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "sonlanmaz"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "bulunmaz"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "benzemez"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "baþlamaz"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "biter"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "bulunur"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "büyük"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "küçük"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "deðil"
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr " "
-
-#: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "birlikte ya da sonra"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "birlikte ya da önce"
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "benzer"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "baþlayan"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "daha önce"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "daha sonra"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Kural Ekle"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "Kaynak Kuralýný Düzenle"
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VFolder Kuralý Ekle"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "VFolder Kuralýný Düzenle"
-
-#: mail/component-factory.c:294
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Evolution'ýn posta programý baþlatýlamadý."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "Depo kabuða kayýt ettirilemedi"
-
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Kaydý vFolder þeklinde kaydet"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Gövde ya da konu içeriyor"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Gövde içeriyor"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Konu içeriyor"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Gövde içermiyor"
-
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Konu içermiyor"
-
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Gönderen içeriyor"
-
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
-msgstr "Konuya Göre VFolder"
-
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Gönderene Göre VFolder"
-
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Alýcýlara Göre VFolder"
-
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
-msgstr "Konuya Göre Filtreleme"
-
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
-msgstr "Göndericiye Göre Filtreleme"
-
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
-msgstr "Alýcýlara Göre Filtreleme"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
-msgstr "E-posta Listelerine Göre Filtreleme"
-
-#: mail/folder-browser.c:669 po/tmp/evolution-calendar.xml.h:22
-#: po/tmp/evolution-message-composer.xml.h:15
-msgid "Open"
-msgstr "Aç"
-
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Farklý Kaydet..."
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:25
-#: po/tmp/evolution-mail.xml.h:31 po/tmp/evolution-tasks.xml.h:9
-msgid "Print"
-msgstr "Yazdýr"
-
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
-msgstr "Gönderene Cevapla"
-
-#: mail/folder-browser.c:675 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
-msgid "Reply to All"
-msgstr "Tümüne cevapla"
-
-#: mail/folder-browser.c:676 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
-msgid "Forward"
-msgstr "Ýlet"
-
-#: mail/folder-browser.c:677 po/tmp/evolution-mail.xml.h:18
-msgid "Forward inline"
-msgstr "Çevrimiçi ilet"
-
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
-msgstr "Okunmuþ Olarak Ýþaretle"
-
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
-msgstr "Okunmamýþ Olarak Ýþaretle"
-
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Dizine Taþý..."
-
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Dizine Kopyala..."
-
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Silme"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
-msgid "Apply Filters"
-msgstr "Filtreleri Uygula"
-
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
-msgstr "Mesajdan Bir Kural Yarat"
-
-#: mail/folder-browser.c:779
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "E-posta Listesine Filtre (%s)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-msgid "Current store format:"
-msgstr "Güncel depolama biçemi:"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr "Posta Kutusu Biçemi"
-
-#: po/tmp/local-config.glade.h:8
-msgid "New store format:"
-msgstr "Yeni depolama biçemi:"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr "Not: Farklý posta kutusu biçemleri arasýnda çeviri yaparken,\n"
-
-#: po/tmp/local-config.glade.h:10
-msgid "(such as lack of disk space) may not be automatically\n"
-msgstr "disk yetersizliði gibi sorunlar otomatik olarak düzeltilmeyebilir.\n"
-
-#: po/tmp/local-config.glade.h:11
-msgid "recoverable.  Please use this feature with care."
-msgstr "Lütfen bu özelliði dikkatli kullanýn."
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr "pdizini"
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr "pkutusu"
-
-#: po/tmp/local-config.glade.h:14
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (öntanýmlý)"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Evolution Hesap Yöneticisi"
-
-#: mail/mail-account-editor.c:286
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Bir ya da birden fazla sunucu düzgün olarak yapýlandýrýlmadý.\n"
-"Yine de kaydetmek istiyor musunuz?"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
-msgid "Evolution Account Editor"
-msgstr "Evolution Hesap Düzenleyici"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "%s'e Postala"
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "Konu: %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "%s'ten E-posta"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "%s posta listesi"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Bir e-posta istemcisi yapýlandýrmadýnýz.\n"
-"Bu iþlemi bir e-posta gönderip almadan\n"
-"önce yapmanýz gerekiyor.\n"
-"Þimdi yapýlandýrmak istiyor musunuz?"
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Ýleti göndermeden önce kendinize\n"
-"ait bir kimlik oluþturmalýsýnýz."
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Ýleti göndermeden önce bir posta\n"
-"iletim ayarý yapmalýsýnýz."
-
-#: mail/mail-callbacks.c:192
-msgid "You have not set a mail transport method"
-msgstr "Posta iletim yöntemi düzenlenmemiþ"
-
-#: mail/mail-callbacks.c:225
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Bu iletinin konusu yok.\n"
-"Yine de gönderilsin mi?"
-
-#: mail/mail-callbacks.c:291
-msgid "You must configure an account before you can send this email."
-msgstr "Bu e-postayý göndermeden önce bir hesap ayarý yapmalýsýnýz."
-
-#: mail/mail-callbacks.c:311
-msgid "You must specify recipients in order to send this message."
-msgstr "Bu e-postayý göndermek için alýcýsýný belirtmeniz gereklidir."
-
-#: mail/mail-callbacks.c:536
-msgid "Forwarded message:\n"
-msgstr "Ýletilen mesaj:\n"
-
-#: mail/mail-callbacks.c:619
-msgid "Move message(s) to"
-msgstr "Ýletileri buraya taþý"
-
-#: mail/mail-callbacks.c:621
-msgid "Copy message(s) to"
-msgstr "Ýleti(leri) buraya kopyala"
-
-#: mail/mail-callbacks.c:756
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Sadece taslaklar dizinine kaydedilen\n"
-"mesajlarý düzenleyebilirsiniz."
-
-#: mail/mail-callbacks.c:789 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr "Dosya üzerine yazýlsýn mý?"
-
-#: mail/mail-callbacks.c:793 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ayný isimde bir dosya zaten var\n"
-"Üzerine yazýlsýn mý?"
-
-#: mail/mail-callbacks.c:837
-msgid "Save Message As..."
-msgstr "Ýletiyi Farklý Kaydet..."
-
-#: mail/mail-callbacks.c:839
-msgid "Save Messages As..."
-msgstr "Ýletileri Farklý Kaydet..."
-
-#: mail/mail-callbacks.c:947
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Filtre bilgisini yüklerken hata oluþtu:\n"
-"%s"
-
-#: mail/mail-callbacks.c:996
-msgid "Print Message"
-msgstr "Ýletiyi Yazdýr"
-
-#: mail/mail-callbacks.c:1043
-msgid "Printing of message failed"
-msgstr "Ýletiyi yazdýrýlmasýnda hata"
-
-#: mail/mail-config.c:806
-msgid "Connecting to server"
-msgstr "Sunucuya baðlantý kuruluyor"
-
-#: mail/mail-config.c:808
-msgid "Connect to server"
-msgstr "Sunucuya baðlan"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
-msgid "Account"
-msgstr "Hesap"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Hesap Bilgisi"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "Hesap Yöneticisi"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "Hesap Özellikleri"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "Geliþmiþ"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "Kimlik Denetimi"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Kimlik Denetim Türü:"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Check settings"
-msgstr "Ayarlarý kontrol et"
-
-#: po/tmp/mail-config.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Tebrikler, e-posta ayarlarýnýz tamamlandý.\n"
-
-#: po/tmp/mail-config.glade.h:18 po/tmp/mail-config.glade.h:21
-#: po/tmp/mail-config.glade.h:80
-msgid "\n"
-msgstr "\n"
-
-#: po/tmp/mail-config.glade.h:19
-msgid "You are now ready to send and receive email \n"
-msgstr "Artýk Evolution kullanarak iletilerinizi \n"
-
-#: po/tmp/mail-config.glade.h:20
-msgid "using Evolution. \n"
-msgstr "gönderebilir ve alabilirsiniz.\n"
-
-#: po/tmp/mail-config.glade.h:22
-msgid "Click \"Finish\" to save your settings."
-msgstr "Ayarlarý kaydetmek için \"Bitir\" tuþuna týklayýn."
-
-#: po/tmp/mail-config.glade.h:23
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:24
-msgid "Default"
-msgstr "Öntanýmlý"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "Done"
-msgstr "Tamamlandý"
-
-#: po/tmp/mail-config.glade.h:27
-msgid "E-Mail Address:"
-msgstr "E-Posta Adresi:"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Email Address:"
-msgstr "Eposta Adresi:"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Evolution Mail Configuration"
-msgstr "Evolution E-posta Yapýlandýrmasý"
-
-#: po/tmp/mail-config.glade.h:31
-msgid "Full Name:"
-msgstr "Tam Ýsim:"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Hostname:"
-msgstr "Makine adý:"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Identity"
-msgstr "Kimlik"
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Incoming Mail Server"
-msgstr "Gelen Posta Sunucusu"
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Keep mail on server"
-msgstr "Postalarý sunucuda tut"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail"
-msgstr "E-posta"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Account"
-msgstr "E-posta Hesabý"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration"
-msgstr "E-posta Yapýlandýrmasý"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Mail Configuration Druid"
-msgstr "E-posta Yapýlandýrma Sihirbazý"
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Make this my default account"
-msgstr "Bunu öntanýmlý hesabým yap"
-
-#: po/tmp/mail-config.glade.h:44
-msgid "Mark messages as \"Read\" after:"
-msgstr "Mesajlarý okunmuþ olarak iþaretle:"
-
-#: po/tmp/mail-config.glade.h:45
-msgid "Miscellaneous"
-msgstr "Çeþitli"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "News"
-msgstr "Haberler"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Optional"
-msgstr "Seçimlik"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Organization:"
-msgstr "Kurum:"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Outgoing Mail Server"
-msgstr "Giden Posta Sunucusu"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Password:"
-msgstr "Parola:"
-
-#: po/tmp/mail-config.glade.h:55
-msgid "Plain Text"
-msgstr "Düz Metin"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Receiving Email"
-msgstr "E-posta Alýnýyor"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "Remember my password"
-msgstr "Parolamý hatýrla"
-
-#: mail/mail-format.c:629 po/tmp/mail-config.glade.h:58
-msgid "Reply-To:"
-msgstr "Cevapla:"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Required"
-msgstr "Gerekli"
-
-#: po/tmp/mail-config.glade.h:61
-msgid "Save password"
-msgstr "Parolayý kaydet"
-
-#: po/tmp/mail-config.glade.h:62
-msgid "Select signature file"
-msgstr "Ýmza dosyasýný seç"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Send mail in HTML format by default."
-msgstr "E-postalarý öntanýmlý olarak HTML gönder."
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Sending Email"
-msgstr "E-posta Gönderiliyor"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Server Configuration"
-msgstr "Sunucu Yapýlandýrmasý"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Server Type: "
-msgstr "Sunucu Türü: "
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Server requires authentication"
-msgstr "Sunucu kimlik denetimi istiyor"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "Servers"
-msgstr "Sunucular"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "Signature file:"
-msgstr "Ýmza dosyasý:"
-
-#: po/tmp/mail-config.glade.h:71
-msgid "Signature:"
-msgstr "Ýmza:"
-
-#: po/tmp/mail-config.glade.h:72
-msgid "Sources"
-msgstr "Kaynaklar"
-
-#: po/tmp/mail-config.glade.h:73
-msgid "This server requires a secure connection (SSL)"
-msgstr "Bu sunucu güvenli baðlantý (SSL) istiyor"
-
-#: po/tmp/mail-config.glade.h:74
-msgid "Type"
-msgstr "Tür"
-
-#: po/tmp/mail-config.glade.h:75
-msgid ""
-"Type the name by which you would like to refer to these servers. For example: "
-"\"Work\" or \"Home\"."
-msgstr ""
-"Bu sunucularý hangi isimle tanýmlamak istediðinizi belirtiniz (Örnek olarak "
-"\"Ýþ\" ya da \"Ev\"."
-
-#: po/tmp/mail-config.glade.h:77
-msgid "User Information"
-msgstr "Kullanýcý Bilgisi"
-
-#: po/tmp/mail-config.glade.h:78
-msgid "Username:"
-msgstr "Kullanýcý adý:"
-
-#: po/tmp/mail-config.glade.h:79
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Evolution E-posta Yapýlandýrma Sihirbazýna Hoþgeldiniz.\n"
-
-#: po/tmp/mail-config.glade.h:81
-msgid "Click \"Next\" to begin. "
-msgstr "Baþlamak için \"Ýleri\" tuþuna týklayýn."
-
-#: mail/mail-config-druid.c:389
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-"Gelen e-posta yapýlandýrmasýnýn doðrulanmasýnda hata oluþtu.\n"
-"%s adresinden gelen iletilerde sorunlar yaþanabilir."
-
-#: mail/mail-config-druid.c:479
-msgid "Namespace:"
-msgstr "Ýsim:"
-
-#: mail/mail-config-druid.c:667
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-"Giden e-posta yapýlandýrmasýnýn doðrulanmasýnda hata\n"
-"%s kullanarak gönderilen mektuplarda sorunlar yaþanabilir."
-
-#. set window title
-#: mail/mail-config-druid.c:1026
-msgid "Evolution Account Wizard"
-msgstr "Evolution Hesap Sihirbazý"
-
-#: mail/mail-display.c:189
-msgid "Save Attachment"
-msgstr "Eki Kaydet"
-
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Geçici dizin yaratýlamadý: %s"
-
-#: mail/mail-display.c:271
-msgid "Save to Disk..."
-msgstr "Diske Kaydet..."
-
-#: mail/mail-display.c:273
-#, c-format
-msgid "Open in %s..."
-msgstr "%s içinde aç..."
-
-#: mail/mail-display.c:275
-msgid "View Inline"
-msgstr "Ýzle"
-
-#: mail/mail-display.c:302
-msgid "External Viewer"
-msgstr "Harici Ýzleyici"
-
-#: mail/mail-display.c:325
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Ýzle (%s kullanarak)"
-
-#: mail/mail-display.c:329
-msgid "Hide"
-msgstr "Gizle"
-
-#: mail/mail-format.c:506
-#, c-format
-msgid "%s attachment"
-msgstr "%s ek"
-
-#: mail/mail-format.c:654
-msgid "Loading message content"
-msgstr "Mesaj içeriði yükleniyor"
-
-#: mail/mail-format.c:943
-msgid "Encrypted message not displayed"
-msgstr "Þifrelenmiþ ileti gösterilemiyor"
-
-#: mail/mail-format.c:949
-msgid "Encrypted message"
-msgstr "Þifrelenmiþ ileti"
-
-#: mail/mail-format.c:950
-msgid "Click icon to decrypt."
-msgstr "Þifreyi açmak için simgeye týklayýn"
-
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Bu mesaj dijital olarak imzalanmýþtýr ve güvenlidir."
-
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Bu mesaj dijital olarak imzalanmýþ, fakat güvenli olduðu kanýtlanmamýþtýr."
-
-#: mail/mail-format.c:1611
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP adresine bað (%s)"
-
-#: mail/mail-format.c:1623
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "%s yerel dosyasýna bað (\"%s\" adresinde geçerli)"
-
-#: mail/mail-format.c:1627
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Yerel dosyaya bað (%s)"
-
-#: mail/mail-format.c:1661
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Bilinmeyen harici veriye bað (\"%s\" türünde)"
-
-#: mail/mail-format.c:1666
-msgid "Malformed external-body part."
-msgstr "Bozuk harici gövde"
-
-#: mail/mail-format.c:1837
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s tarihinde, %s dedi ki:\n"
-
-#: mail/mail-local.c:211
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" biçeminden \"%s\" biçemine geçiliyor"
-
-#: mail/mail-local.c:215
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" biçeminden \"%s\" biçemine geç"
-
-#: mail/mail-local.c:258
-msgid "Reconfiguring folder"
-msgstr "Dizin yeniden yapýlandýrýlýyor"
-
-#: mail/mail-local.c:276
-msgid "Closing current folder"
-msgstr "Geçerli dizin kapatýlýyor"
-
-#: mail/mail-local.c:302
-msgid "Renaming old folder and opening"
-msgstr "Yeni dizinin adý deðiþtiriliyor ve açýlýyor"
-
-#: mail/mail-local.c:320
-msgid "Creating new folder"
-msgstr "Yeni dizin yaratýlýyor"
-
-#: mail/mail-local.c:334
-msgid "Copying messages"
-msgstr "Ýletiler kopyalanýyor"
-
-#: mail/mail-local.c:355
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-"Dizin meta bilgisi kaydedilemedi. Büyük ihtimalle bu dizini \n"
-"yeniden açamayacaksýnýz: %s"
-
-#: mail/mail-local.c:386
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Eðer bu dizini tekrar açamazsýnýz, elle \n"
-"düzeltme yapmak zorunda kalacaksýnýz."
-
-#: mail/mail-local.c:794
-msgid "Registering local folder"
-msgstr "Yerel dizin kaydý yapýlýyor"
-
-#: mail/mail-local.c:796
-msgid "Register local folder"
-msgstr "Yerel dizin kaydý yap"
-
-#: mail/mail-local.c:900
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Dizin kaydý yapýlamadý: '%s':\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"'%s' sýrasýnda hata:\n"
-"%s"
-
-#: mail/mail-mt.c:89
-#, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr ""
-"Ýþlem sýrasýnda hata:\n"
-"%s"
-
-#: mail/mail-mt.c:385 mail/mail-mt.c:414
-msgid "Working"
-msgstr "Çalýþýyor"
-
-#: mail/mail-ops.c:510
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" gönderiliyor"
-
-#: mail/mail-ops.c:512
-msgid "Sending message"
-msgstr "Ýleti gönderiliyor"
-
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "\"%s\" arkasýna ekleniyor"
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Bir mesajýn arkasýna konu olmaksýzýn ekleniyor"
-
-#: mail/mail-ops.c:833
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Ýleti \"%s\"den \"%s\"e taþýnýyor"
-
-#: mail/mail-ops.c:835
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Ýleti \"%s\"den \"%s\"e kopyalanýyor"
-
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Ýletiyi \"%s\"den \"%s\"e taþý"
-
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Ýletiyi \"%s\"den \"%s\"e kopyala"
-
-#: mail/mail-ops.c:871
-msgid "Moving"
-msgstr "Taþýnýyor"
-
-#: mail/mail-ops.c:874
-msgid "Copying"
-msgstr "Kopyalanýyor"
-
-#: mail/mail-ops.c:894
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s ileti %d/%d (uid \"%s\")"
-
-#: mail/mail-ops.c:969
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" içinde dizinler taranýyor"
-
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Açýklama yok)"
-
-#: mail/mail-ops.c:1100
-msgid "Forwarded messages"
-msgstr "Ýletilen mesajlar"
-
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1275
-#, c-format
-msgid "Opening folder %s"
-msgstr "%s dizini açýlýyor"
-
-#: mail/mail-ops.c:1206
-#, c-format
-msgid "Opening store %s"
-msgstr "%s deposu açýlýyor"
-
-#: mail/mail-ops.c:1337
-msgid "Synchronising folder"
-msgstr "Dizin eþzamanlý hale getiriliyor"
-
-#: mail/mail-ops.c:1387
-msgid "Expunging folder"
-msgstr "Dizin siliniyor"
-
-#: mail/mail-ops.c:1436
-#, c-format
-msgid "Retrieving message %s"
-msgstr "%s iletisi alýnýyor"
-
-#: mail/mail-ops.c:1503
-msgid "Retrieving messages"
-msgstr "Ýletiler alýnýyor"
-
-#: mail/mail-ops.c:1513
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "%d/%d mesaj alýnýyor (uid \"%s\")"
-
-#: mail/mail-ops.c:1661
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s dizini yükleniyor (%s)"
-
-#: mail/mail-ops.c:1663
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s dizinini yükle (%s)"
-
-#: mail/mail-ops.c:1829
-msgid "Saving messages"
-msgstr "Ýletiler kaydediliyor"
-
-#: mail/mail-ops.c:1908
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Çýkýþ dosyasý yaratýlamadý: %s\n"
-" %s"
-
-#: mail/mail-ops.c:1921
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
-
-#: mail/mail-ops.c:1935
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Ýletilerin kaydýnda hata: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2009
-msgid "Saving attachment"
-msgstr "Ek kaydediliyor"
-
-#: mail/mail-ops.c:2024
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Çýkýþ dosyasý yaratýlamadý: %s:\n"
-" %s"
-
-#: mail/mail-ops.c:2052
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Veri yazýlamadý: %s."
-
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Ara"
-
-#: mail/mail-send-recv.c:109
-msgid "Cancelling ..."
-msgstr "Ýptal ediliyor ..."
-
-#: mail/mail-send-recv.c:191
-msgid "Send & Receive mail"
-msgstr "E-posta Al & Gönder"
-
-#: mail/mail-send-recv.c:195
-msgid "Receiving"
-msgstr "Alýnýyor"
-
-#: mail/mail-send-recv.c:224
-msgid "Updating ..."
-msgstr "Güncelleniyor ..."
-
-#: mail/mail-send-recv.c:226 mail/mail-send-recv.c:266
-msgid "Waiting ..."
-msgstr "Bekleniyor ..."
-
-#: mail/mail-send-recv.c:252
-msgid "Sending"
-msgstr "Gönderiliyor"
-
-#: mail/mail-send-recv.c:412
-msgid "Cancelled."
-msgstr "Ýptal edildi."
-
-#: mail/mail-send-recv.c:416
-msgid "Complete."
-msgstr "Tamamlandý."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Tünellemeden bozuk bir ileti geldi!"
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"%s iþlemine baþlarken hata:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"'%s' sýrasýnda hata:\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Konu dizimini komutalarla okurken hata oldu ."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Konu dizimini ayýrtýrken bir ileti bozuk mu cýktý ?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Diyalog kutusunu yaratamadým ."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "Sorgulamayý kullanýcý durdurdu ."
-
-#: mail/mail-tools.c:192
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Geçici ileti kutusu '%s' hazýrlanamadý: %s"
-
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (iletilen e-posta)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Ýlt: (konusuz)"
-
-#: mail/mail-tools.c:277
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Ýletilen e-posta - %s"
-
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Ýletilen e-posta (konusuz)"
-
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"`%s' konumu açýlamadý: \n"
-"%s"
-
-#: mail/mail-vfolder.c:150
-msgid "VFolders"
-msgstr "VDizin"
-
-#: mail/mail-vfolder.c:303
-msgid "New VFolder"
-msgstr "Yeni VDizin"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
-msgid "Reply"
-msgstr "Cevapla"
-
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
-msgid "Reply to the sender of this message"
-msgstr "Ýletiyi gönderene cevap ver"
-
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
-msgid "Reply to all recipients of this message"
-msgstr "Ýletinin tüm alýcýlarýna cevap ver"
-
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
-msgid "Forward this message"
-msgstr "Bu e-postayý ilet"
-
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
-msgid "Print the selected message"
-msgstr "Seçili iletiyi yazdýr"
-
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
-msgid "Delete this message"
-msgstr "Bu iletiyi sil"
-
-#: mail/message-list.c:608
-msgid "Unseen"
-msgstr "Görünmeyen"
-
-#: mail/message-list.c:611
-msgid "Seen"
-msgstr "Görünen"
-
-#: mail/message-list.c:614
-msgid "Answered"
-msgstr "Cevaplanan"
-
-#: mail/message-list.c:617
-msgid "Multiple Unseen Messages"
-msgstr "Çoklu Görülmeyen Mesaj"
-
-#: mail/message-list.c:620
-msgid "Multiple Messages"
-msgstr "Çoklu Mesajlar"
-
-#: mail/message-list.c:933
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:945 mail/message-list.c:961
-#, c-format
-msgid "%s, et al."
-msgstr "%s, ve diðerleri"
-
-#: mail/message-list.c:948 mail/message-list.c:964
-msgid "<unknown>"
-msgstr "<bilinmeyen>"
-
-#: mail/message-list.c:1016
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:1023
-msgid "Today %l:%M %p"
-msgstr "Bugün %l:%M %p"
-
-#: mail/message-list.c:1032
-msgid "Yesterday %l:%M %p"
-msgstr "Dün %l:%M %p"
-
-#: mail/message-list.c:1044
-msgid "%a %l:%M %p"
-msgstr "%a %l %M %p"
-
-#: mail/message-list.c:1052
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: mail/message-list.c:1054
-msgid "%b %d %Y"
-msgstr "%d %b %Y"
-
-#: mail/message-list.c:1152
-msgid "Flagged"
-msgstr "Ýþaretli"
-
-#: mail/message-list.c:1153
-msgid "From"
-msgstr "Kimden"
-
-#: mail/message-list.c:1153
-msgid "Date"
-msgstr "Tarih"
-
-#: mail/message-list.c:1153
-msgid "Received"
-msgstr "Alýndý"
-
-#: mail/message-list.c:1154
-msgid "To"
-msgstr "Kime"
-
-#: mail/message-list.c:1154
-msgid "Size"
-msgstr "Boyut"
-
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "%s parolasýný %s için parolayý girin"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "%s parolasýný girin"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP programý bulunamadý."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "Parola verilmedi"
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "GPG/PGP ile baðlantý kurulamadý: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Alýcý belirtilmedi"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "%s geçici dosyasý yaratýlamadý"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
-msgstr "Dizin"
-
-#: mail/subscribe-dialog.c:63
-msgid "Store"
-msgstr "Sakla"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr "Bununla baþlayan dizinleri göster:"
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" için depo alýnýyor"
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "\"%s\" için depo al"
-
-#: mail/subscribe-dialog.c:292
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "\"%s\" dizinine üye olunuyor"
-
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "\"%s\" dizininden üyelik siliniyor"
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "\"%s\" dizinine üye ol"
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "\"%s\" dizininden üyeliði sil"
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "Evolution kurulumu"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Evolution'un bu yeni sürümü kiþisel Evolution dizinine ek dosya\n"
-"yerleþtirilmesini gerektirir."
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Dosyalarý kurmak için \"Tamam\" düðmesine, ya da iþlemi durdurmak için "
-"\"Ýptal\" düðmesine týklayýn."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "Dosyalar düzgün bir þekilde güncellenemedi"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution dosyalarý baþarýyla kuruldu."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Evolution'u ilk defa çalýþtýrýyorsunuz."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Evolution kullanýcý dosyalarýný buraya kurmak için \"Tamam\" düðmesine "
-"týklayýn."
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"%s dizini yaratýlamadý\n"
-"\n"
-"Hata: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Dosyalar kopyalanamadý\n"
-"`%s'."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"`%s' bir dizin deðil.\n"
-"Evolution kullanýcý dosyalarýnýn yüklenmesi\n"
-"bunu silmelisiniz."
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"`%s' dizini var, ancak Evolution için \n"
-"kullanýlmýyor. Lütfen Evolution kullanýcý dosyalarýnýn\n"
-"kopyalanabilmesi için bu dizini taþýyýnýz."
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Belirlenen dizin yaratýlamadý:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "Belirtilen dizin adý geçerli deðildir."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Yeni dizin yarat"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Ýstenen iþlem için seçili dizin tipi \n"
-"geçerli deðildir ."
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "Yeni..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(isimsiz)"
-
-#: shell/e-shell-view-menu.c:127
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy $PATH dizininde bulunamadý."
-
-#: shell/e-shell-view-menu.c:133
-msgid "Bug buddy could not be run."
-msgstr "Bug-buddy çalýþtýrýlamadý."
-
-#: shell/e-shell-view-menu.c:185
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Telif hakký 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:187
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution, GNOME masaüstü için bir e-posta, \n"
-"takvim ve iletiþim listesi yönetim uygulamasýdýr."
-
-#: shell/e-shell-view-menu.c:347
-msgid "Go to folder..."
-msgstr "Dizine git..."
-
-#: shell/e-shell-view.c:143
-msgid "(No folder displayed)"
-msgstr "(dizin gösterilmiyor)"
-
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Dizinler"
-
-#: shell/e-shell-view.c:1124
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1126
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerel kayýt kurulamadý -- %s"
-
-#: shell/e-shell.c:1238
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"`%s görünümü beklenmeyen bir þekilde sonlandýrýldý.\n"
-"%s bileþeni çöktü."
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr "Yeni bir kýsayol grubu yarat"
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "Grup adý:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Kýsayol çubuðundan `%s' grubunu \n"
-"kaldýrmak istiyor musunuz?"
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "Silme"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "_Küçük Simgeler"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "Kýsayollarý küçük simgeler olarak göster"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "_Büyük Simgeler"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "Kýsayollarý büyük simgeler olarak göster"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "Yeni _Grup..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr "Yeni bir kýsayol grubu yarat"
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "_Bu Grubu Sil..."
-
-#: shell/e-shortcuts-view.c:284
-msgid "Remove this shortcut group"
-msgstr "Bu kýsayolu grubunu sil"
-
-#: shell/e-shortcuts-view.c:289
-msgid "_Hide the Shortcut Bar"
-msgstr "Kýsayol Çubuðunu Gizle"
-
-#: shell/e-shortcuts-view.c:290
-msgid "Hide the shortcut bar"
-msgstr "Kýsayol çubuðunu gizle"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Geçerli yap"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Bu kýsayolu geçerli yap"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Bu kýsayolu kýsayol çubuðundan sil"
-
-#: shell/e-shortcuts.c:375
-msgid "Error saving shortcuts."
-msgstr "Kýsayollarý kaydederken hata oldu."
-
-#: po/tmp/evolution-event-editor.xml.h:81
-#: po/tmp/evolution-message-composer.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:95 po/tmp/evolution.xml.h:46
-#: shell/e-storage-set-view.c:345
-msgid "_View"
-msgstr "_Göster"
-
-#: shell/e-storage-set-view.c:345
-msgid "View the selected folder"
-msgstr "Seçili dizini göster"
-
-#: shell/e-storage.c:160
-msgid "(No name)"
-msgstr "(isimsiz)"
-
-#: shell/e-storage.c:411
-msgid "No error"
-msgstr "Hata yok"
-
-#: shell/e-storage.c:413
-msgid "Generic error"
-msgstr "Genel hata"
-
-#: shell/e-storage.c:415
-msgid "A folder with the same name already exists"
-msgstr "Ayný isimli bir dizin zaten var"
-
-#: shell/e-storage.c:417
-msgid "The specified folder type is not valid"
-msgstr "Belirtilen dizin türü geçerli deðildir"
-
-#: shell/e-storage.c:419
-msgid "I/O error"
-msgstr "G/Ç hatasý"
-
-#: shell/e-storage.c:421
-msgid "Not enough space to create the folder"
-msgstr "Dizin yaratmak için gerekli disk alaný yok"
-
-#: shell/e-storage.c:423
-msgid "The specified folder was not found"
-msgstr "Belirtilen dizin bulunamadý"
-
-#: shell/e-storage.c:425
-msgid "Function not implemented in this storage"
-msgstr "Fonksiyon desteklenmiyor"
-
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Izin yok"
-
-#: shell/e-storage.c:429
-msgid "Operation not supported"
-msgstr "Ýþlem desteklenmiyor"
-
-#: shell/e-storage.c:431
-msgid "The specified type is not supported in this storage"
-msgstr "Bu kayýtta belirtilen tip desteklenmiyor"
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Merhaba. Evolution grup çalýþma uygulamasýnýn öncü sürümünü\n"
-"yüklediðiniz için teþekkürler.\n"
-"\n"
-"Evolution geniþ bir geliþtirici grubu tarafýndan hazýrlanmaktadýr. Sizlerin "
-"de desteðini bekliyoruz.\n"
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Teþekkürler\n"
-"Evolution Takýmý\n"
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "Evolution kabuðu baþlatýlamadý."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Etkisizleþtir."
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo parçalar sistemi baþlatýlamadý."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s alýnýyor\n"
-"(Hazýr deðil).\n"
-"5 saniye içinde yeniden denenecek."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s alýnýyor\n"
-"%d öðesi alýnýyor."
-
-#: shell/importer/importer.c:307
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Bunu açabilecek hiç bir filtre bulunamadý:\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Alýnýyor"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s alýnýyor.\n"
-"%s baþlatýlýyor"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "%s yüklenirken hata oluþtu"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s alýnýyor\n"
-"1. öðe alýnýyor."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Otomatik"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Dosya adý:"
-
-#: shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Bir dosya seçin"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Dosya türü:"
-
-#: shell/importer/importer.c:572
-msgid "Import"
-msgstr "Ekle"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Evolution'a eklemek istediðiniz dosyayý seçin ve listenin bu dosyanýn türünü "
-"belirleyin.\n"
-"\n"
-"Eðer dosya türünü bilmiyorsanýz \"Otomatik\" seçeneðini iþaretleyin. Bu "
-"durumda Evolution dosya türünü bulmaya çalýþacaktýr."
-
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create new contact"
-msgstr "Yeni bir baðlantý yarat"
-
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Bir baðlantýyý sil"
-
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:28
-msgid "Find"
-msgstr "Bul"
-
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Baðlantý bul"
-
-#: po/tmp/evolution-addressbook.xml.h:12
-msgid "New contact"
-msgstr "Yeni baðlantý"
-
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Baðlantýlarý yazdýr"
-
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
-msgid "Stop"
-msgstr "Dur"
-
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Yüklemeyi Durdur"
-
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Tümünü Ýzle"
-
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Tüm baðlantýlarý izle"
-
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "_Adres Defteri Yapýlandýrmasý..."
-
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Baðlantýlarý Yazdýr..."
-
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "Bað_lantýlarý ara"
-
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:79
-#: po/tmp/evolution-task-editor-dialog.xml.h:93
-msgid "_Tools"
-msgstr "_Araçlar"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 Gün"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
-msgid "Alter preferences"
-msgstr "Tercihleri deðiþtir"
-
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "_Takvim"
-
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Calendar Preferences..."
-msgstr "Takvim Tercihleri..."
-
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new appointment"
-msgstr "Yeni bir randevu yarat"
-
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Create a new calendar"
-msgstr "Yeni bir takvim yarat"
-
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Day"
-msgstr "Gün"
-
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go back in time"
-msgstr "Zamanda geriye git"
-
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go forward in time"
-msgstr "Zamanda ileri git"
-
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to"
-msgstr "Git"
-
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to a specific date"
-msgstr "Belirli bir tarihe git"
-
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Go to present time"
-msgstr "Þimdiki zamana git"
-
-#: po/tmp/evolution-calendar.xml.h:19
-msgid "Month"
-msgstr "Ay"
-
-#: po/tmp/evolution-calendar.xml.h:20
-msgid "New appointment"
-msgstr "Yeni randevu"
-
-#: po/tmp/evolution-calendar.xml.h:21 po/tmp/evolution-event-editor.xml.h:34
-#: po/tmp/evolution-task-editor-dialog.xml.h:37
-msgid "Next"
-msgstr "Ý_leri"
-
-#: po/tmp/evolution-calendar.xml.h:23
-msgid "Open Calendar"
-msgstr "Takvimi Aç"
-
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Prev"
-msgstr "Geri"
-
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
-msgstr "Bu Takvimi Yazdýr"
-
-#: po/tmp/evolution-calendar.xml.h:27
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Farklý Kaydet"
-
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Takvimi farklý kaydet"
-
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show 1 day"
-msgstr "1 gün göster"
-
-#: po/tmp/evolution-calendar.xml.h:30
-msgid "Show 1 month"
-msgstr "1 ay göster"
-
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Show 1 week"
-msgstr "1 hafta göster"
-
-#: po/tmp/evolution-calendar.xml.h:32
-msgid "Show the working week"
-msgstr "Çalýþma günlerini göster"
-
-#: po/tmp/evolution-calendar.xml.h:33 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Bugün"
-
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "Week"
-msgstr "Hafta"
-
-#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-event-editor.xml.h:71
-#: po/tmp/evolution-task-editor-dialog.xml.h:84 po/tmp/evolution.xml.h:43
-msgid "_New"
-msgstr "_Yeni"
-
-#: po/tmp/evolution-calendar.xml.h:36
-msgid "_Open Calendar"
-msgstr "_Takvimi Aç"
-
-#: po/tmp/evolution-calendar.xml.h:37
-msgid "_Print this calendar"
-msgstr "_Bu takvimi yazdýr"
-
-#: po/tmp/evolution-calendar.xml.h:38 po/tmp/evolution-tasks.xml.h:13
-msgid "_Save As..."
-msgstr "_Farklý Kaydet..."
-
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Bu öðeyi sil"
-
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Sil..."
-
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Yardým"
-
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "_Zarfý Yazdýr..."
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:42
-#: po/tmp/evolution-task-editor-dialog.xml.h:45
-msgid "Print this item"
-msgstr "Bu öðeyi yazdýr"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:43
-#: po/tmp/evolution-task-editor-dialog.xml.h:46
-msgid "Print..."
-msgstr "Yazdýr..."
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:46
-#: po/tmp/evolution-message-composer.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:56
-msgid "Save _As..."
-msgstr "_Farklý Kaydet..."
-
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:57
-msgid "Save and Close"
-msgstr "Kaydet ve Kapat"
-
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Baðlantýyý kaydet ve diyalog penceresini kapat"
-
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "_Baðlantýyý baþkasýna gönder..."
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-msgid "See online help"
-msgstr "Çevrimiçi yardýma git"
-
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Baðlantýya _mesaj gönder..."
-
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:64
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:76 po/tmp/evolution.xml.h:36
-msgid "_File"
-msgstr "_Dosya"
-
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "_Yazdýr..."
-
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:76
-#: po/tmp/evolution-message-composer.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:90
-msgid "_Save"
-msgstr "_Kaydet"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
-#: po/tmp/evolution-task-editor-dialog.xml.h:6
-msgid "About this application"
-msgstr "Bu uygulama hakkýnda"
-
-#: po/tmp/evolution-event-editor.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:7
-msgid "About..."
-msgstr "Hakkýnda..."
-
-#: po/tmp/evolution-event-editor.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:8
-msgid "Actio_ns"
-msgstr "E_ylemler"
-
-#: po/tmp/evolution-event-editor.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:9
-msgid "Address _Book... (FIXME)"
-msgstr "Adres _Defteri... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:11
-msgid "C_lear"
-msgstr "_Temizle"
-
-#: po/tmp/evolution-event-editor.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:12
-msgid "C_ut"
-msgstr "_Kes"
-
-#: po/tmp/evolution-event-editor.xml.h:12
-#: po/tmp/evolution-task-editor-dialog.xml.h:13
-msgid "Chec_k Names (FIXME)"
-msgstr "Ý_simleri Denetle (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-task-editor-dialog.xml.h:14
-msgid "Clear"
-msgstr "Temizle"
-
-#: po/tmp/evolution-event-editor.xml.h:14
-#: po/tmp/evolution-task-editor-dialog.xml.h:15
-msgid "Clear the selection"
-msgstr "Seçimi temizle"
-
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Close this appointment"
-msgstr "Bu randevuyu kapat"
-
-#: po/tmp/evolution-event-editor.xml.h:17
-#: po/tmp/evolution-task-editor-dialog.xml.h:18
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Dizine Kopyala... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:18 po/tmp/evolution-mail.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:19
-msgid "Copy"
-msgstr "Kopyala"
-
-#: po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:20
-msgid "Copy the selection"
-msgstr "Seçimi kopyala"
-
-#: po/tmp/evolution-event-editor.xml.h:20
-#: po/tmp/evolution-task-editor-dialog.xml.h:21
-msgid "Cut"
-msgstr "Kes"
-
-#: po/tmp/evolution-event-editor.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:22
-msgid "Cut the selection"
-msgstr "Seçimi kes"
-
-#: po/tmp/evolution-event-editor.xml.h:24
-#: po/tmp/evolution-task-editor-dialog.xml.h:25
-msgid "Dump XML"
-msgstr "XML göster"
-
-#: po/tmp/evolution-event-editor.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:26
-msgid "Dump the UI Xml description"
-msgstr "UI Xml tanýmýný göster"
-
-#: po/tmp/evolution-event-editor.xml.h:26
-#: po/tmp/evolution-task-editor-dialog.xml.h:27
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Dizindeki Ý_lk Öðe"
-
-#: po/tmp/evolution-event-editor.xml.h:27
-#: po/tmp/evolution-task-editor-dialog.xml.h:30
-msgid "For_ward (FIXME)"
-msgstr "Ýlet (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "v_Calendar olarak ilet (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:29
-#: po/tmp/evolution-task-editor-dialog.xml.h:31
-msgid "Go to the next item"
-msgstr "Sonraki öðeye git"
-
-#: po/tmp/evolution-event-editor.xml.h:30
-#: po/tmp/evolution-task-editor-dialog.xml.h:32
-msgid "Go to the previous item"
-msgstr "Gerideki öðeye git"
-
-#: po/tmp/evolution-event-editor.xml.h:31
-#: po/tmp/evolution-task-editor-dialog.xml.h:33
-msgid "In_complete Task (FIXME)"
-msgstr "_Bitmemiþ Görev"
-
-#: po/tmp/evolution-event-editor.xml.h:32
-#: po/tmp/evolution-task-editor-dialog.xml.h:35
-msgid "Modify the file's properties"
-msgstr "Dosya özelliklerini düzenle"
-
-#: po/tmp/evolution-event-editor.xml.h:33
-#: po/tmp/evolution-task-editor-dialog.xml.h:36
-msgid "N_ext"
-msgstr "Ý_leri"
-
-#: po/tmp/evolution-event-editor.xml.h:35
-#: po/tmp/evolution-task-editor-dialog.xml.h:38
-msgid "Paste"
-msgstr "Yapýþtýr"
-
-#: po/tmp/evolution-event-editor.xml.h:36
-#: po/tmp/evolution-task-editor-dialog.xml.h:39
-msgid "Paste the clipboard"
-msgstr "Panoyu yapýþtýr"
-
-#: po/tmp/evolution-event-editor.xml.h:37
-#: po/tmp/evolution-task-editor-dialog.xml.h:40
-msgid "Pre_vious"
-msgstr "_Geri"
-
-#: po/tmp/evolution-event-editor.xml.h:38
-#: po/tmp/evolution-task-editor-dialog.xml.h:41
-msgid "Previous"
-msgstr "Geri"
-
-#: po/tmp/evolution-event-editor.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:42
-msgid "Print Pre_view"
-msgstr "Ö_nizlemeyi Yazdýr"
-
-#: po/tmp/evolution-event-editor.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:43
-msgid "Print S_etup..."
-msgstr "Yazdýrma _Ayarlarý..."
-
-#: po/tmp/evolution-event-editor.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:44
-msgid "Print Setup"
-msgstr "Yazdýrma Ayarlarý"
-
-#: po/tmp/evolution-event-editor.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:47
-msgid "Properties"
-msgstr "Özellikler"
-
-#: po/tmp/evolution-event-editor.xml.h:45
-#: po/tmp/evolution-message-composer.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:55
-msgid "Save"
-msgstr "Kaydet"
-
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "Save the appointment and close the dialog box"
-msgstr "Randevuyu kaydet ve diyalog penceresini kapat"
-
-#: po/tmp/evolution-event-editor.xml.h:49
-#: po/tmp/evolution-message-composer.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:58
-msgid "Save the current file"
-msgstr "Þimdiki zamaný kaydet"
-
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "Schedule Meeting"
-msgstr "_Toplantý Zamaný Düzenle"
-
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "Schedule _Meeting"
-msgstr "Toplantý Zamaný Düzenle"
-
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "Schedule some sort of a meeting"
-msgstr "Bir toplantý ayarla"
-
-#: po/tmp/evolution-event-editor.xml.h:53
-#: po/tmp/evolution-task-editor-dialog.xml.h:62
-msgid "Select All"
-msgstr "Hepsini Seç"
-
-#: po/tmp/evolution-event-editor.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:63
-msgid "Select everything"
-msgstr "Herþeyi seç"
-
-#: po/tmp/evolution-event-editor.xml.h:55
-#: po/tmp/evolution-task-editor-dialog.xml.h:64
-msgid "Setup the page settings for your current printer"
-msgstr "Güncel yazýcý için sayfa ayarlarýný yap"
-
-#: po/tmp/evolution-event-editor.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:65
-msgid "Task _Request (FIXME)"
-msgstr "Görev Ý_steði (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:57
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:68
-msgid "_About..."
-msgstr "_Hakkýnda..."
-
-#: po/tmp/evolution-event-editor.xml.h:58
-#: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:70 po/tmp/evolution.xml.h:33
-msgid "_Close"
-msgstr "_Kapat"
-
-#: po/tmp/evolution-event-editor.xml.h:59
-#: po/tmp/evolution-task-editor-dialog.xml.h:71 po/tmp/evolution.xml.h:34
-msgid "_Contact (FIXME)"
-msgstr "_Baðlantý (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:60
-#: po/tmp/evolution-task-editor-dialog.xml.h:72
-msgid "_Copy"
-msgstr "_Kopyala"
-
-#: po/tmp/evolution-event-editor.xml.h:61
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:73
-msgid "_Debug"
-msgstr "_Hata ayýkla"
-
-#: po/tmp/evolution-event-editor.xml.h:63
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15
-#: po/tmp/evolution-task-editor-dialog.xml.h:75 po/tmp/evolution.xml.h:35
-msgid "_Edit"
-msgstr "_Düzenle"
-
-#: po/tmp/evolution-event-editor.xml.h:65
-#: po/tmp/evolution-message-composer.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:77 po/tmp/evolution.xml.h:39
-msgid "_Help"
-msgstr "_Yardým"
-
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-task-editor-dialog.xml.h:78
-msgid "_Item (FIXME)"
-msgstr "Öð_e (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:67
-#: po/tmp/evolution-task-editor-dialog.xml.h:79
-msgid "_Journal Entry (FIXME)"
-msgstr "Gü_nlük Giriþi"
-
-#: po/tmp/evolution-event-editor.xml.h:68
-#: po/tmp/evolution-task-editor-dialog.xml.h:80
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Dizindeki _Son Öðe"
-
-#: po/tmp/evolution-event-editor.xml.h:69
-#: po/tmp/evolution-task-editor-dialog.xml.h:81
-msgid "_Mail Message (FIXME)"
-msgstr "Mesajý _Postala (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:70
-#: po/tmp/evolution-task-editor-dialog.xml.h:83
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Dizine Git... (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:72
-#: po/tmp/evolution-task-editor-dialog.xml.h:85
-msgid "_Note (FIXME)"
-msgstr "_Not (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:73
-#: po/tmp/evolution-task-editor-dialog.xml.h:86
-msgid "_Paste"
-msgstr "_Yapýþtýr"
-
-#: po/tmp/evolution-event-editor.xml.h:74
-#: po/tmp/evolution-task-editor-dialog.xml.h:87
-#: po/tmp/evolution-tasks.xml.h:12
-msgid "_Print"
-msgstr "_Yazdýr"
-
-#: po/tmp/evolution-event-editor.xml.h:75
-#: po/tmp/evolution-task-editor-dialog.xml.h:88
-msgid "_Properties..."
-msgstr "Ö_zellikler..."
-
-#: po/tmp/evolution-event-editor.xml.h:77
-#: po/tmp/evolution-task-editor-dialog.xml.h:91
-msgid "_Select All"
-msgstr "_Hepsini Seç"
-
-#: po/tmp/evolution-event-editor.xml.h:78
-#: po/tmp/evolution-task-editor-dialog.xml.h:92 po/tmp/evolution.xml.h:45
-msgid "_Task (FIXME)"
-msgstr "_Görev (FIXME)"
-
-#: po/tmp/evolution-event-editor.xml.h:80
-#: po/tmp/evolution-task-editor-dialog.xml.h:94
-msgid "_Unread Item (FIXME)"
-msgstr "_Okunmamýþ Öðe (FIXME)"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-executive-summary.xml.h:6
-msgid "Add Service"
-msgstr "Servis Ekle"
-
-#: po/tmp/evolution-executive-summary.xml.h:7
-msgid "Add a new service to the Executive Summary"
-msgstr "Genel özete yeni bir servis ekle"
-
-#: po/tmp/evolution-executive-summary.xml.h:8
-msgid "Create a new email"
-msgstr "Yeni bir e-posta yarat"
-
-#: po/tmp/evolution-executive-summary.xml.h:9
-msgid "Executive Summary Settings..."
-msgstr "Genel Özet Ayarlarý..."
-
-#: po/tmp/evolution-executive-summary.xml.h:10
-msgid "New Mail"
-msgstr "Yeni Ýleti"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Düzenle"
-
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Yeni bir mesaj düzenle"
-
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Mesajlarý yeni dizine kopyala"
-
-#: po/tmp/evolution-mail.xml.h:10
-msgid "Create Rule"
-msgstr "Kural Yarat"
-
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Dizin"
-
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "_Göndericiye Göre Filtreleme"
-
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "_Alýcýlara Göre Filtreleme"
-
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Parolalarý _Unut"
-
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Ýletileri Al"
-
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Hide S_elected Messages"
-msgstr "Seçili Mesajlarý Gizle"
-
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted Messages"
-msgstr "_Silenen mesajlarý gizle"
-
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "_Okunan mesajlarý gizle"
-
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Mail _Filters..."
-msgstr "Posta _Filtreleri..."
-
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Manage Subscriptions..."
-msgstr "Üyelikleri Göster..."
-
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Mar_k As Read"
-msgstr "O_kunmuþ Olarak Ýþaretle"
-
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mark As U_nread"
-msgstr "_Okunmamýþ Olarak Ýþaretle"
-
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Move"
-msgstr "Taþý"
-
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move message to a new folder"
-msgstr "Mesajlarý yeni dizine taþý"
-
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Previews the message to be printed"
-msgstr "Yazdýrýlacak olan mesajý önizler"
-
-#: po/tmp/evolution-mail.xml.h:32
-msgid "Print Preview of message..."
-msgstr "Mesajýn önizlemesini yazdýr..."
-
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print message to the printer"
-msgstr "Mesajý yazýcýya gönder"
-
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message..."
-msgstr "Mesajý yazdýr..."
-
-#: po/tmp/evolution-mail.xml.h:38
-msgid "Reply to _All"
-msgstr "_Tümüne Cevapla"
-
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _Sender"
-msgstr "_Gönderene Cevapla"
-
-#: po/tmp/evolution-mail.xml.h:42
-msgid "S_ource"
-msgstr "_Kaynak"
-
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Tümünü _Seç"
-
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
-
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All Messages"
-msgstr "_Tüm Mesajlarý Göster"
-
-#: po/tmp/evolution-mail.xml.h:47
-msgid "Threaded Message list"
-msgstr "Konumlandýrýlan Mesaj listesi"
-
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on Se_nder"
-msgstr "_Gönderene Göre VFolder"
-
-#: po/tmp/evolution-mail.xml.h:49
-msgid "VFolder on _Recipients"
-msgstr "_Alýcýlara Göre VFolder"
-
-#: po/tmp/evolution-mail.xml.h:50
-msgid "View Raw Message Source"
-msgstr "Ham Mesaj Kaynaðýný Ýzle"
-
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Apply Filters"
-msgstr "_Filtreleri Uygula"
-
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Configure Folder..."
-msgstr "_Dizini Yapýlandýr..."
-
-#: po/tmp/evolution-mail.xml.h:53
-msgid "_Copy to Folder..."
-msgstr "D_izine Kopyala..."
-
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Edit Message"
-msgstr "_Mesajý Düzenle"
-
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Expunge"
-msgstr "_Sil"
-
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Filter on Subject"
-msgstr "_Konuya Göre Filtreleme"
-
-#: po/tmp/evolution-mail.xml.h:58
-msgid "_Forward"
-msgstr "Ý_let"
-
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "S_eçimi Tersine Çevir"
-
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Mail Configuration..."
-msgstr "_Yapýlandýrmayý Postala.."
-
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Message"
-msgstr "_Mesaj"
-
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Move to Folder..."
-msgstr "_Dizine Taþý..."
-
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Open in New Window"
-msgstr "_Yeni Pencerede Aç"
-
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Print Message"
-msgstr "Mesajý _Yazdýr"
-
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Save Message As..."
-msgstr "Mesajý _Farklý Kaydet..."
-
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_Konumlu"
-
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Silme"
-
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_Konuya Göre VFolder"
-
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "Sanal Dizin Düzenleyici..."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Ekle"
-
-#: po/tmp/evolution-message-composer.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:17
-msgid "Close the current file"
-msgstr "Güncel dosyayý kapat"
-
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Bu mesajý PGP ile þifrele"
-
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "_Biçim"
-
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
-
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Bir dosyayý mesaj içine ekle"
-
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Metin dosyasý ekle..."
-
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Bir dosya aç"
-
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "PGP Þifre"
-
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "PGP Ýmza"
-
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr "_Taslaðý Kaydet"
-
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in _folder... (FIXME)"
-msgstr "Di_zine kaydet..."
-
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Dizine kaydet..."
-
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Güncel dosyayý farklý bir isimle kaydet"
-
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Mesajý belirtilen dizine kaydet"
-
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _Later"
-msgstr "_Sonra Gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send _later"
-msgstr "Sonra _gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the mail in HTML format"
-msgstr "Ýletiyi HTML olarak gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message later"
-msgstr "Mesajý daha sonra gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send the message now"
-msgstr "Mesajý þimdi gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Send this message now"
-msgstr "Bu mesajý þimdi gönder"
-
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show / hide attachments"
-msgstr "Ekleri göster/gizle"
-
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show _attachments"
-msgstr "Ekleri _göster"
-
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Show attachments"
-msgstr "Ekleri göster"
-
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "Sign this message with your PGP key"
-msgstr "PGP anahtarýyla bu mesajý imzala"
-
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Insert text file... (FIXME)"
-msgstr "_Metin dosyasý ekle..."
-
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Open..."
-msgstr "_Aç..."
-
-#: po/tmp/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Güvenlik"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "Bu dizini üye dizinler listesine ekle"
-
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Listeyi Tazele"
-
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Dizin Listesini Tazele"
-
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Bu dizini üye diziler listesinden sil"
-
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Üye ol"
-
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Üyelikten çýk"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:10
-msgid "Assig_n Task (FIXME)"
-msgstr "_Görev Tanýmla"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:29
-msgid "Find Again"
-msgstr "Yeniden Ara"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:34
-msgid "Meeting Re_quest (FIXME)"
-msgstr "_Toplantý Ýsteði"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:48
-msgid "Redo"
-msgstr "Ýleri al"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:49
-msgid "Redo the undone action"
-msgstr "Geri alýnan neylemi ileri al"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:50
-msgid "Replace"
-msgstr "Deðiþtir"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:51
-msgid "Replace a string"
-msgstr "Bir dizgiyi deðiþtir"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:52
-msgid "Reply to A_ll (FIXME)"
-msgstr "Tümüne _Cevapla"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:53
-msgid "S_end Status Report (FIXME)"
-msgstr "_Durum Raporu Gönder"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:54
-msgid "S_kip Occurrence (FIXME)"
-msgstr "_Oluþlarý Atla"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:59
-msgid "Save the task and close the dialog box"
-msgstr "Görevi kaydet ve diyalog kutusunu kapat"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:60
-msgid "Search again for the same string"
-msgstr "Ayný diziyi yeniden arat"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:61
-msgid "Search for a string"
-msgstr "Bir diziyi arat"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:66
-msgid "Undo"
-msgstr "Geri al"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:67
-msgid "Undo the last action"
-msgstr "Son iþlemi geri al"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:69 po/tmp/evolution.xml.h:32
-msgid "_Appointment (FIXME)"
-msgstr "_Randevu"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:82
-msgid "_Mark Complete (FIXME)"
-msgstr "_Bitmiþ olarak iþaretle"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:89
-msgid "_Reply (FIXME)"
-msgstr "_Yanýtla"
-
-#: po/tmp/evolution-tasks.xml.h:7
-msgid "Create a new task"
-msgstr "Yeni bir görev yarat"
-
-#: po/tmp/evolution-tasks.xml.h:8
-msgid "New"
-msgstr "Yeni"
-
-#: po/tmp/evolution-tasks.xml.h:10
-msgid "Save task as something else"
-msgstr "Görevi farklý kaydet"
-
-#: po/tmp/evolution-tasks.xml.h:11
-msgid "Tasks Preferences..."
-msgstr "Görev Tercihleri..."
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution.xml.h:6
-msgid "About Evolution..."
-msgstr "Evolution Hakkýnda..."
-
-#: po/tmp/evolution.xml.h:8
-msgid "Close this window"
-msgstr "Bu pencereyi kapat"
-
-#: po/tmp/evolution.xml.h:9
-msgid "Customi_ze..."
-msgstr "Ö_zelleþtir..."
-
-#: po/tmp/evolution.xml.h:10
-msgid "Customize"
-msgstr "Ö_zelleþtir"
-
-#: po/tmp/evolution.xml.h:11
-msgid "Customize toolbars"
-msgstr "Araç çubuklarýný özelleþtir"
-
-#: po/tmp/evolution.xml.h:12
-msgid "Display a different folder"
-msgstr "Farklý bir dizin göster"
-
-#: po/tmp/evolution.xml.h:13
-msgid "E_xit"
-msgstr "Çý_k"
-
-#: po/tmp/evolution.xml.h:14
-msgid "Evolution bar _shortcut"
-msgstr "Evolution çubuðu _kýsayolu"
-
-#: po/tmp/evolution.xml.h:15
-msgid "Exit"
-msgstr "Çýk"
-
-#: po/tmp/evolution.xml.h:16
-msgid "Exit the program"
-msgstr "Programdan çýk"
-
-#: po/tmp/evolution.xml.h:17
-msgid "Getting _Started"
-msgstr "_Baþlangýç"
-
-#: po/tmp/evolution.xml.h:18
-msgid "Import an external file format"
-msgstr "Harici dosya biçimini ekle"
-
-#: po/tmp/evolution.xml.h:19
-msgid "Main toolbar"
-msgstr "Ana araç çubuðu"
-
-#: po/tmp/evolution.xml.h:20
-msgid "Show information about Evolution"
-msgstr "Evolution hakkýnda bilgi ver"
-
-#: po/tmp/evolution.xml.h:21
-msgid "Show the _Folder Bar"
-msgstr "_Dizin Çubuðunu Göster"
-
-#: po/tmp/evolution.xml.h:22
-msgid "Show the _Shortcut Bar"
-msgstr "_Kýsayol Çubuðunu Göster"
-
-#: po/tmp/evolution.xml.h:23
-msgid "Submit Bug Report"
-msgstr "Hata Raporu Gönder"
-
-#: po/tmp/evolution.xml.h:24
-msgid "Submit _Bug Report"
-msgstr "_Hata Raporu Gönder"
-
-#: po/tmp/evolution.xml.h:25
-msgid "Submit bug report using Bug Buddy."
-msgstr "_Bug Buddy kullanarak hata raporu gönder."
-
-#: po/tmp/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
-msgstr "Dizin çubuðunu göster/gizle"
-
-#: po/tmp/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Kýsayol çubuðunu göster/gizle"
-
-#: po/tmp/evolution.xml.h:28
-msgid "Using the C_ontact Manager"
-msgstr "_Baðlantý Yöneticisini Kullanarak"
-
-#: po/tmp/evolution.xml.h:29
-msgid "Using the _Calendar"
-msgstr "_Takvim Kullanarak"
-
-#: po/tmp/evolution.xml.h:30
-msgid "Using the _Mailer"
-msgstr "_Postalayýcý Kullanarak"
-
-#: po/tmp/evolution.xml.h:31
-msgid "_About Evolution..."
-msgstr "_Evolution Hakkýnda..."
-
-#: po/tmp/evolution.xml.h:37
-msgid "_Folder"
-msgstr "_Dizin"
-
-#: po/tmp/evolution.xml.h:38
-msgid "_Go to Folder..."
-msgstr "Dizine _Git..."
-
-#: po/tmp/evolution.xml.h:40
-msgid "_Import file..."
-msgstr "Dosya _ekle..."
-
-#: po/tmp/evolution.xml.h:41
-msgid "_Index"
-msgstr "Ý_ndex"
-
-#: po/tmp/evolution.xml.h:42
-msgid "_Mail message"
-msgstr "_Mesajý postala"
-
-#: po/tmp/evolution.xml.h:44
-msgid "_Settings"
-msgstr "_Ayarlar"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Meþgul"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ofiste Deðil"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Bilgi Yok"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Baþkalarýný Davet Et..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Seçenekler"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "_Sadece Çalýþma Saatlerini Göster"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "_Uzaklaþtýrýlmýþ Göster"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Boþ/Meþgul Olanlarý Güncelle"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Otomatikman seç"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Tüm Kiþiler ve Kaynaklar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Tüm _Kiþiler ve Bir Kaynak"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Gerekli Kiþiler"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Gerekli Kiþiler ve _Bir Kaynak"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Toplantý b_aþlama saati :"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Toplantý _bitiþ saati:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tüm Katýlýmcýlar"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PSÇPCCP"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Þimdi"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-messagebox.c:141
-msgid "Information"
-msgstr "Bilgi"
-
-#: widgets/misc/e-messagebox.c:148
-msgid "Warning"
-msgstr "Uyarý"
-
-#: widgets/misc/e-messagebox.c:162
-msgid "Question"
-msgstr "Soru"
-
-#: widgets/misc/e-messagebox.c:169
-msgid "Message"
-msgstr "Mesaj"
-
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
-msgid "Don't show this message again."
-msgstr "Bu mesajý bir daha gösterme."
-
-#: widgets/misc/e-search-bar.c:135
-msgid "Sear_ch"
-msgstr "_Ara"
-
-#: wombat/wombat.c:182
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS baþlatýlamadý"
-
-#: wombat/wombat.c:194
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME baþlatýlamadý"
-
-#: wombat/wombat.c:207
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo baþlatýlamadý"
-
-
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "Evolution kitlesel iþlemler uygulamasý"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
-msgid "Evolution Address conduit "
-msgstr "Adres parçasý"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
-msgid "Configure the address conduit"
-msgstr "Adres parçasýnýn ayarlarý"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
-msgid "Evolution Calendar conduit"
-msgstr "Takvim parçasý"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
-msgid "Configure the GnomeCal conduit"
-msgstr "GnomeCal takvim parçasý ayarlarý"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
-msgid "Evolution ToDo conduit "
-msgstr "Yapýlacaklar parçasý"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
-msgid "Configure the todo conduit"
-msgstr "Yapýlacaklar parçasý ayarlarý"
diff --git a/po/uk.po b/po/uk.po
deleted file mode 100644
index de6f0cec5a..0000000000
--- a/po/uk.po
+++ /dev/null
@@ -1,6462 +0,0 @@
-# Ukrainian translation of evolution.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Yuri Syrota <rasta@renome.rovno.ua>, 2000.
-#
-#: camel/providers/smtp/camel-smtp-transport.c:285
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
-"PO-Revision-Date: 2000-04-04 15:25+0200\n"
-"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
-"Language-Team: Ukrainian <uk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "îÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "úÁËÒÉÔÉ"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅÌÅÍÅÎÔÕ"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅÌÅÍÅÎÔÕ"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "ëÏÎƦ­ÕÒÕ×ÁÔÉ ÔÅËÕ"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "ðÏÍÉÌËÁ ÚÞÉÔÕ×ÁÎÎÑ ÆÁÊÌÕ ÐÏÛÔÉ: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "âÅÚ ÐÏÍÉÌÏË"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "îÏ×ÉÊ"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÏÎÔÁËÔ"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "îÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
-msgid "Card: "
-msgstr "ëÁÒÔËÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3051
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"¶Í'Ñ: "
-
-#: addressbook/backend/ebook/e-card.c:3052
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  ðÒÅƦËÓ:    "
-
-#: addressbook/backend/ebook/e-card.c:3053
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3054
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3055
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3056
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3070
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"äÁÔÁ ÎÁÒÏÄÖÅÎÎÑ: "
-
-#: addressbook/backend/ebook/e-card.c:3081
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"áÄÒÅÓÁ:"
-
-#: addressbook/backend/ebook/e-card.c:3083
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  ðÏÛÔÏ×Á ÓËÒÉÎØËÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3084
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3085
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  ÷ÕÌÉÃÑ:      "
-
-#: addressbook/backend/ebook/e-card.c:3086
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  í¦ÓÔÏ:       "
-
-#: addressbook/backend/ebook/e-card.c:3087
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  òÅ­¦ÏÎ:      "
-
-#: addressbook/backend/ebook/e-card.c:3088
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ¶ÎÄÅËÓ:      "
-
-#: addressbook/backend/ebook/e-card.c:3089
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ëÒÁ§ÎÁ:      "
-
-#: addressbook/backend/ebook/e-card.c:3102
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3114
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"ôÅÌÅÆÏÎÉ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3117
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"ôÅÌÅÆÏÎ:"
-
-#: addressbook/backend/ebook/e-card.c:3141
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"åÌÅËÔÒÏÎÎÁ ÐÏÛÔÁ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3144
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3163
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"ðÏÛÔÏ×Á ÐÒÏÇÒÁÍÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3169
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"þÁÓÏ×ÉÊ ÐÏÑÓ: "
-
-#: addressbook/backend/ebook/e-card.c:3177
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"òÏÚÔÁÛÕ×ÁÎÎÑ: "
-
-#: addressbook/backend/ebook/e-card.c:3181
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"ðÏÍÁÄÁ: "
-
-#: addressbook/backend/ebook/e-card.c:3193
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"ïÒÇÁΦÚÁæÑ: "
-
-#: addressbook/backend/ebook/e-card.c:3194
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  ¶Í'Ñ:  "
-
-#: addressbook/backend/ebook/e-card.c:3195
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3196
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3197
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3198
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3202
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"ëÁÔÅÇÏÒ¦§: "
-
-#: addressbook/backend/ebook/e-card.c:3203
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"ëÏÍÅÎÔÁÒ: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3216
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3219
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"ðÕÂ̦ÞÎÉÊ ËÌÀÞ: "
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "óËÏЦÀ×ÁÔÉ Ú Ð¦ÌÏÔÁ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "óËÏЦÀ×ÁÔÉ × Ð¦ÌÏÔ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "ðÏÞÁÔËÏ×ÉÊ Á×ÔÏÒ:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "ëÁÎÁÌ ÁÄÒÅÓÎϧ ËÎÉÇÉ Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "¿ 1998-2000 the Free Software Foundation ÔÁ Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "óÔÁÎ ËÁÎÁÌÕ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "îÅÍÁ¤ Ú'¤ÄÎÁÎÎÑ Ú ÄÅÍÏÎÏÍ gnome-pilot."
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁÐÕÓÔÉÔÉ ÓÅÒ×ÅÒ Wombat"
-
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
-msgid "Could not start wombat"
-msgstr "îÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ Wombat"
-
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "äÏÄÁÔÉ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "óÔÅÒÔÉ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "ôÉÐÉ ÔÅÌÅÆÏΦ×"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "îÏ×ÉÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "äÏÄÁÔÉ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "òÅÄÁËÔÏÒ ËÏÎÔÁËÔ¦×"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "ðÏ×ÎÅ ¦Í'Ñ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "áÄÒÅÓÁ ÓÔÏÒ¦ÎËÉ WWW:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "èÏÞÅ ÏÔÒÉÍÕ×ÁÔÉ ÌÉÓÔÉ × HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "òÏÂÏÞÁ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "äÏÍÁÛÎÑ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "òÏÂÏÞÉÊ ÆÁËÓ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "íϦÌØÎÉÊ ÔÅÌÅÆÏÎ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "ðÅÒ×ÉÎÎÁ Å-ÐÏÛÔÁ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "òÏÂÏÔÁ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "ãÅ ÐÏÛÔÏ×Á ÁÄÒÅÓÁ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "ú×'ÑÚËÉ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "ëÁÔÅÇÏÒ¦§..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "ðÏÓÁÄÁ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "ëÏÍÐÁΦÑ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "áÄÒÅÓÁ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "úÁÇÁÌØÎÅ"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "÷¦ÄĦÌ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "ïƦÓ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "ðÒÏÆÅÓ¦Ñ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "ðÒ¦Ú×ÉÓØËÏ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "äÁÔÁ ÎÁÒÏÄÖÅÎÎÑ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "¶Í'Ñ ÐÏͦÞÎÉËÁ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "¶Í'Ñ ËÅÒ¦×ÎÉËÁ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "îÏÔÁÔËÉ:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "ðÏÄÒÏÂÉæ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
-msgid "Assistant"
-msgstr "ðÏͦÞÎÉË"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
-msgid "Business"
-msgstr "òÏÂÏÞÁ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-msgid "Business 2"
-msgstr "òÏÂÏÞÁ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-msgid "Business Fax"
-msgstr "òÏÂÏÞÉÊ ÆÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
-msgid "Car"
-msgstr "á×ÔÏ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Company"
-msgstr "ëÏÍÐÁΦÑ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
-msgid "Home"
-msgstr "äÏÍÁÛÎÑ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-msgid "Home 2"
-msgstr "äÏÍÁÛÎÑ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-msgid "Home Fax"
-msgstr "äÏÍÁÛÎ¦Ê ÆÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
-msgid "Mobile"
-msgstr "íϦÌØÎÉÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-msgid "Other"
-msgstr "¶ÎÛÁ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Other Fax"
-msgstr "¶ÎÛÉÊ ÆÁËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
-msgid "Pager"
-msgstr "ðÅÊÄÖÅÒ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
-msgid "Primary"
-msgstr "ðÅÒ×ÉÎÎÉÊ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1290
-msgid "Radio"
-msgstr "òÁĦÏ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Telex"
-msgstr "ôÅÌÅËÓ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "å-ÐÏÛÔÁ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "å-ÐÏÛÔÁ 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "ðÅÒÅצÒÉÔÉ ÐÏ×ÎÅ ¦Í'Ñ"
-
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"ðÁÎ\n"
-"ðÁΦ\n"
-"äÏËÔÏÒ\n"
-
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "¶Í'Ñ:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "ôÉÔÕÌ:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "ðÏ-ÂÁÔØËÏצ:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "ðÒ¦Ú×ÉÝÅ:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "ñË _Minicards"
-
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:374
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ NNTP ÄÌÑ %s@%s"
-
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
-
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
-
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "äÏÄÁÔËÏ×Ï..."
-
-#: addressbook/gui/component/addressbook.c:562
-msgid "Any field contains"
-msgstr "âÕÄØ-ÑËÅ ÐÏÌŠͦÓÔÉÔØ"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
-msgstr "¶Í'Ñ Í¦ÓÔÉÔØ"
-
-#: addressbook/gui/component/addressbook.c:564
-msgid "Email contains"
-msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ ͦÓÔÉÔØ"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "URI ÔÅËÉ, ÝÏ ÂÕÄŠצÄÏÂÒÁÖÅÎÏ ÐÅÒÅÇÌÑÄÁÞÅÍ"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-#, fuzzy
-msgid "Other Contacts"
-msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ?"
-
-#: addressbook/gui/component/addressbook-config.c:139
-#, fuzzy
-msgid "LDAP Server"
-msgstr "óÅÒ×ÅÒ:"
-
-#: addressbook/gui/component/addressbook-config.c:141
-#, fuzzy
-msgid "File"
-msgstr "æÁÊÌ"
-
-#: addressbook/gui/component/addressbook-config.c:144
-#, fuzzy
-msgid "Unknown addressbook type"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "ðÁÒÏÌØ"
-
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ"
-
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "÷ÓÔÁ×ÉÔÉ"
-
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:173
-#, fuzzy
-msgid "Subtree"
-msgstr "äÖÅÒÅÌÏ"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅÊ ÐÁÒÏÌØ"
-
-#: addressbook/gui/component/addressbook-config.c:360
-#, fuzzy
-msgid "Host:"
-msgstr "çÏÄÉÎÉ"
-
-#: addressbook/gui/component/addressbook-config.c:361
-#, fuzzy
-msgid "Port:"
-msgstr "ðÒ¦ÏÒÉÔÅÔ:"
-
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:384
-#, fuzzy
-msgid "Search Scope:"
-msgstr "ðÏÛÕË"
-
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "áÕÔÅÎƦËÁæÑ:"
-
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "ûÌÑÈ:"
-
-#: addressbook/gui/component/addressbook-config.c:460
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "ãØÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
-
-#: addressbook/gui/component/addressbook-config.c:593
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "úÂÅÒÅÇÔÉ Õ ÁÄÒÅÓÎ¦Ê ËÎÉÚ¦"
-
-#: addressbook/gui/component/addressbook-config.c:595
-#, fuzzy
-msgid "Add Addressbook"
-msgstr "úÂÅÒÅÇÔÉ Õ ÁÄÒÅÓÎ¦Ê ËÎÉÚ¦"
-
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:616
-#, fuzzy
-msgid "Name:"
-msgstr ""
-"\n"
-"¶Í'Ñ: "
-
-#: addressbook/gui/component/addressbook-config.c:617
-msgid "Description:"
-msgstr "ïÐÉÓ:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "ðÏÛÕË"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "úÂÅÒÅÇÔÉ ÑË VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#, fuzzy
-msgid "Name"
-msgstr ""
-"\n"
-"¶Í'Ñ: "
-
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
-msgid "Email"
-msgstr "å-ÐÏÛÔÁ 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:570
-msgid "Organization"
-msgstr "ïÒÇÁΦÚÁæÑ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:582
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
-msgid "Department"
-msgstr "÷¦ÄĦÌ:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#, fuzzy
-msgid "Office"
-msgstr "ïƦÓ:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
-msgid "Title"
-msgstr "ôÉÔÕÌ:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:586
-#, fuzzy
-msgid "Profession"
-msgstr "ðÒÏÆÅÓ¦Ñ:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:587
-#, fuzzy
-msgid "Manager"
-msgstr "ðÅÊÄÖÅÒ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
-msgid "Nickname"
-msgstr "ðÒ¦Ú×ÉÓØËÏ:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
-msgid "Spouse"
-msgstr "äÖÅÒÅÌÏ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#, fuzzy
-msgid "Note"
-msgstr "îÅÍÁ¤"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:592
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
-msgid "Save in addressbook"
-msgstr "úÂÅÒÅÇÔÉ Õ ÁÄÒÅÓÎ¦Ê ËÎÉÚ¦"
-
-#: addressbook/gui/widgets/e-minicard-view.c:129
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "ëÁÎÁÌ ËÁÌÅÎÄÁÒÑ Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "óÏÎ"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "çÁÒÁÚÄ"
-
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "æÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ"
-
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "úÂÅÒÅÇÔÉ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:377
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:380
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:471
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:473
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:545
-msgid "Transparent"
-msgstr "ðÒÏÚÏÒÉÊ"
-
-#: calendar/gui/calendar-model.c:548
-msgid "Opaque"
-msgstr "îÅÐÒÏÚÏÒÉÊ"
-
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"äÁÔÕ ÐÏÔÒ¦ÂÎÏ ××ÏÄÉÔÉ Õ ÔÁËÏÍÕ ÆÏÒÍÁÔ¦: \n"
-"\n"
-"%s"
-
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"çÅÏÇÒÁƦÞÎÅ ÐÏÌÏÖÅÎÎÑ ÐÏÔÒ¦ÂÎÏ ××ÏÄÉÔÉ Õ ÔÁËÏÍÕ ÆÏÒÍÁÔ¦: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "úÎÁÞÅÎÎÑ ×¦ÄÓÏÔËÁ ÍÁ¤ ÂÕÔÉ Í¦Ö 0 ÔÁ 100, ×ËÌÀÞÎÏ"
-
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "úÎÁÞÅÎÎÑ ÐÒ¦ÏÒÉÔÅÔÕ ÍÁ¤ ÂÕÔÉ Í¦Ö 1 ÔÁ 9, ×ËÌÀÞÎÏ"
-
-#: calendar/gui/calendar-summary.c:97
-#, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d %B %Y"
-
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-#, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
-
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
-msgid "Display"
-msgstr "äÅÎØ"
-
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
-msgid "Show appointments"
-msgstr "ðÏËÁÚÁÔÉ ÞÁÓ ÚÁ×ÅÒÛÅÎÎÑ ÚÕÓÔÒ¦ÞÅÊ"
-
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
-msgid "Show tasks"
-msgstr "ðÏËÁÚÁÔÉ ÄÏÌÕÞÅÎÎÑ"
-
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "URI, ÑËÉÊ ×¦ÄÏÂÒÁÚÉÔØ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:63
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÕÓÔÒ¦Þ"
-
-#: calendar/gui/dialogs/delete-comp.c:66
-#, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÕÓÔÒ¦Þ"
-
-#: calendar/gui/dialogs/delete-comp.c:72
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
-
-#: calendar/gui/dialogs/delete-comp.c:75
-#, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
-
-#: calendar/gui/dialogs/delete-comp.c:81
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁÐÉÓ × ÖÕÒÎÁ̦"
-
-#: calendar/gui/dialogs/delete-comp.c:84
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁÐÉÓ × ÖÕÒÎÁ̦"
-
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÁ×ÄÁÎÎÑ"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Appointment - %s"
-msgstr "úÕÓÔÒ¦Þ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
-#, c-format
-msgid "Task - %s"
-msgstr "úÁ×ÄÁÎÎÑ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
-#, c-format
-msgid "Journal entry - %s"
-msgstr "öÕÒÎÁÌØÎÉÊ ÚÁÐÉÓ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr "÷É ÈÏÞÅÔÅ ÚͦÎÉÔÉ ÚͦÎÉ?"
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
-msgid "Categories"
-msgstr "ËÁÔÅÇÏÒ¦§"
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "ëÌÁÓÉƦËÁæÑ"
-
-#: calendar/gui/e-calendar-table.c:156
-#, fuzzy
-msgid "Completion Date"
-msgstr "úÁ×ÅÒÛÅÎÏ"
-
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "End Date"
-msgstr "þÁÓ ÚÁ×ÅÒÛÅÎÎÑ:"
-
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
-msgid "Start Date"
-msgstr "þÁÓ ÐÏÞÁÔËÕ:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Precent complete"
-msgstr "ðÏÚÎÁÞÉÔÉ ÚÁ×ÄÁÎÎÑ ÑË ×ÉËÏÎÁÎÅ"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "ðÒ¦ÏÒÉÔÅÔ"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
-msgid "Summary"
-msgstr "îÅĦÌÑ"
-
-#: calendar/gui/e-calendar-table.c:164
-#, fuzzy
-msgid "Transparency"
-msgstr "ðÒÏÚÏÒÉÊ"
-
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Alarms"
-msgstr "ú×ÕËÏצ ÓÉ­ÎÁÌÉ"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "÷¦ÄËÒÉÔÉ..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "÷¦ÄËÒÉÔÉ ÚÁ×ÄÁÎÎÑ"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "ðÏÚÎÁÞÉÔÉ ÑË ×ÉËÏÎÁÎÅ"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "ðÏÚÎÁÞÉÔÉ ÚÁ×ÄÁÎÎÑ ÑË ×ÉËÏÎÁÎÅ"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "óÔÅÒÔÉ"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "óÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
-
-#: calendar/gui/e-day-view-time-item.c:517
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
-msgid "am"
-msgstr "ÄÐ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
-msgid "pm"
-msgstr "ÐÐ"
-
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "îÏ×Á ÚÕÓÔÒ¦Þ..."
-
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ..."
-
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr "óÔÅÒÔÉ ÃÀ ÚÕÓÔÒ¦Þ"
-
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
-msgid "Category:"
-msgstr ""
-"\n"
-"ëÁÔÅÇÏÒ¦§: "
-
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ËÁÌÅÎÄÁÒ × \"%s\""
-
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "íÅÔÏÄ, ÎÅÏÂȦÄÎÉÊ ÄÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ \"%s\", ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ"
-
-#: calendar/gui/event-editor.c:409
-#, fuzzy
-msgid "on"
-msgstr "ðÎÄ"
-
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "ÄÅÎØ"
-
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "ðÏÎÅĦÌÏË"
-
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "÷¦×ÔÏÒÏË"
-
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "óÅÒÅÄÁ"
-
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "þÅÔ×ÅÒ"
-
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "ð'ÑÔÎÉÃÑ"
-
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "óÕÂÏÔÁ"
-
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "îÅĦÌÑ"
-
-#: calendar/gui/event-editor.c:561
-#, fuzzy
-msgid "on the"
-msgstr "ͦÓÑÃØ"
-
-#: calendar/gui/event-editor.c:568
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:722
-#, fuzzy
-msgid "occurrences"
-msgstr "äÖÅÒÅÌÁ"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:707
-#, fuzzy, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "íÅÔÏÄ, ÎÅÏÂȦÄÎÉÊ ÄÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ \"%s\", ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "îÄÌ"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "ðÎÄ"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "÷ÔÒ"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "óÒÄ"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "þÔ×"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "ðÔÎ"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "óÂÔ"
-
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "îÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ GNOME"
-
-#: calendar/gui/print.c:293
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:293
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:293
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:293
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:293
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:294
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:294
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:294
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:294
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:294
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:295
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:295
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:295
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:295
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:295
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:296
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:296
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:296
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:296
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:296
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:297
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:297
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:297
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:297
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:297
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:298
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:298
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:298
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:298
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:298
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:299
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:355
-msgid "Su"
-msgstr "îÄÌ"
-
-#: calendar/gui/print.c:355
-msgid "Mo"
-msgstr "ðÎÄ"
-
-#: calendar/gui/print.c:355
-msgid "Tu"
-msgstr "÷ÔÒ"
-
-#: calendar/gui/print.c:355
-msgid "We"
-msgstr "óÒÄ"
-
-#: calendar/gui/print.c:355
-msgid "Th"
-msgstr "þÔ×"
-
-#: calendar/gui/print.c:355
-msgid "Fr"
-msgstr "ðÔÎ"
-
-#: calendar/gui/print.c:355
-msgid "Sa"
-msgstr "óÂÔ"
-
-#: calendar/gui/print.c:941
-msgid "Tasks"
-msgstr "úÁ×ÄÁÎÎÑ"
-
-#. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
-msgstr "ðÏÔÏÞÎÉÊ ÄÅÎØ (%a %b %d %Y)"
-
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: calendar/gui/print.c:1086
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
-msgstr "ðÏÔÏÞÎÉÊ ÔÉÖÄÅÎØ (%s - %s)"
-
-#. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
-msgstr "ðÏÔÏÞÎÉÊ Í¦ÓÑÃØ (%b %Y)"
-
-#. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
-msgstr "ðÏÔÏÞÎÉÊ Ò¦Ë (%Y)"
-
-#: calendar/gui/print.c:1149
-msgid "Print Calendar"
-msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
-msgid "Print Preview"
-msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ"
-
-#: calendar/gui/tasks-control.c:105
-#, fuzzy
-msgid "The URI of the tasks folder to display"
-msgstr "URI, ÑËÉÊ ×¦ÄÏÂÒÁÚÉÔØ ËÁÌÅÎÄÁÒ"
-
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
-msgid "SMTWTFS"
-msgstr "îð÷óþðó"
-
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ÆÁÊÌ ÂÌÏËÕ×ÁÎÎÑ ÄÌÑ %s: %s"
-
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "îÅ ×ÄÁÌÏÓØ ÚÒÏÂÉÔÉ ÂÌÏËÕ×ÁÎÎÑ ÚÁ ÄÏÐÏÍÏÇÏÀ fcntl(2): %s"
-
-#: camel/camel-lock.c:253
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "îÅ ×ÄÁÌÏÓØ ÚÒÏÂÉÔÉ ÂÌÏËÕ×ÁÎÎÑ ÚÁ ÄÏÐÏÍÏÇÏÀ flock(2): %s"
-
-#: camel/camel-movemail.c:99
-#, fuzzy, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/camel-movemail.c:146
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÐÏÛÔÉ %s: %s"
-
-#: camel/camel-movemail.c:156
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÐÏÛÔÉ %s: %s"
-
-#: camel/camel-movemail.c:197
-#, fuzzy, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "ðÏÍÉÌËÁ ÚÞÉÔÕ×ÁÎÎÑ ÆÁÊÌÕ ÐÏÛÔÉ: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "ðÏÍÉÌËÁ ÚÁÐÉÓÕ ÐÏÛÔÉ Õ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÐÏÛÔÕ × ÔÉÍÞÁÓÏ×ÏÍÕ ÆÁÊ̦ %s: %s"
-
-#: camel/camel-movemail.c:304
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ: %s"
-
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁÐÕÓÔÉÔÉ ÓÐÁÄËϤÍÎÉÊ ÐÒÏÃÅÓ: %s"
-
-#: camel/camel-movemail.c:354
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(îÅצÄÏÍÁ ÐÏÍÉÌËÁ)"
-
-#: camel/camel-provider.c:133
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ %s: %s"
-
-#: camel/camel-provider.c:141
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ %s: ÎÅÍÁ¤ ¦Î¦Ã¦Á̦ÚÁæ§ × ÍÏÄÕ̦."
-
-#: camel/camel-remote-store.c:184
-#, fuzzy, c-format
-msgid "%s server %s"
-msgstr "óÅÒ×ÅÒ:"
-
-#: camel/camel-remote-store.c:188
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:318
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "÷¦ÄͦÎÅÎÏ"
-
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
-msgid "(unknown host)"
-msgstr "(ÎÅצÄÏÍÉÊ ÈÏÓÔ)"
-
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
-
-#: camel/camel-service.c:137
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr ""
-
-#: camel/camel-service.c:146
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr ""
-
-#: camel/camel-service.c:155
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr ""
-
-#: camel/camel-service.c:520
-#, c-format
-msgid "No such host %s."
-msgstr ""
-
-#: camel/camel-service.c:523
-#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr ""
-
-#: camel/camel-session.c:299
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:390
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ %s:\n"
-"%s"
-
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "òÑÄÏË URL \"%s\" ΊͦÓÔÉÔØ ÎÁÚ×É ÐÒÏÔÏËÏÌÕ"
-
-#: camel/camel-url.c:90
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "òÑÄÏË URL \"%s\" ΊͦÓÔÉÔØ ÎÅצÒÎÕ ÎÁÚ×Õ ÐÒÏÔÏËÏÌÕ"
-
-#: camel/camel-url.c:150
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "îÏÍÅÒ ÐÏÒÔÁ × URL \"%s\" ÎÅ ÞÉÓÌÏ×ÉÊ"
-
-#: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "îÅÏÞ¦ËÕ×ÁÎÁ צÄÐÏצÄØ ×¦Ä ÓÅÒ×ÅÒÁ IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "îÅÏÞ¦ËÕ×ÁÎÁ צÄÐÏצÄØ ×¦Ä ÓÅÒ×ÅÒÁ IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:242
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ"
-
-#: camel/providers/imap/camel-imap-command.c:297
-msgid "Server response ended too soon."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:469
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "îÅÏÞ¦ËÕ×ÁÎÁ צÄÐÏצÄØ OK ×¦Ä ÓÅÒ×ÅÒÁ IMAP: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:198
-#, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAP4"
-
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "äÌÑ ÚÞÉÔÕ×ÁÎÎÑ ÔÁ ÚÂÅÒÅÖÅÎÎÑ ÐÌÛÔÉ ÎÁ ÓÅÒ×ÅÒÁÈ IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:361
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:389
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ %s: %s"
-
-#: camel/providers/local/camel-local-provider.c:36
-#, fuzzy
-msgid "MH-format mail directories"
-msgstr "ËÁÔÁÌÏÇ ÎÅ Maildir"
-
-#: camel/providers/local/camel-local-provider.c:37
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "Standard Unix mailbox file"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "Qmail maildir-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, fuzzy, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "\"%s\" ÎÅ ¤ Ú×ÉÞÁÊÎÉÍ ÆÁÊÌÏÍ."
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÔÅËÕ: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
-#, c-format
-msgid "Local mail file %s"
-msgstr "æÁÊÌ ÌÏËÁÌØÎϧ ÐÏÛÔÉ %s"
-
-#: camel/providers/local/camel-local-store.c:256
-#, fuzzy, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ ÔÅËÕ \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, fuzzy, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔÅÒÔÉ ÔÅËÕ \"%s\": %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔÅÒÔÉ ÔÅËÕ \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
-msgid "No such message"
-msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "Invalid message contents"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "ôÅËÉ \"%s\" ÎÅ ¦ÓÎÕ¤."
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "\"%s\" ÎÅ ¤ ËÁÔÁÌÏÇÏÍ Maildir."
-
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔÅÒÔÉ ÔÅËÕ \"%s\": %s"
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "ËÁÔÁÌÏÇ ÎÅ Maildir"
-
-#: camel/providers/local/camel-mbox-folder.c:201
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:257
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÄÏ ÆÁÊÌÕ Mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ \"%s\" Ú ÔÅËÉ \"%s\"\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:366
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "óÈÏÖÅ ÔÅËÁ ÎÅÐÏÐÒÁ×ÎÏ Ú¦ÐÓÏ×ÁÎÁ."
-
-#: camel/providers/local/camel-mbox-folder.c:379
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:101
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÆÁÊÌ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:117
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ ÆÁÊÌ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "\"%s\" ÎÅ ¤ Ú×ÉÞÁÊÎÉÍ ÆÁÊÌÏÍ."
-
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓØ ÓÔÅÒÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "ôÅËÁ \"%s\" ÎÅ ÐÏÒÏÖÎÑ. îÅ ÓÔÅÒÔÏ."
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:343
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ ÔÅËÕ \"%s\": %s"
-
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÔÅËÕ \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-summary.c:493
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:565
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "ðÏÍÉÌËÁ ÚÁÐÉÓÕ × ÔÉÍÞÁÓÏ×Õ ÐÏÛÔÕ ÓËÒÉÎØËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "úÂ¦Ê ÚÁÐÉÓÕ × ÔÉÍÞÁÓÏ×Õ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:609
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÔÅËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:620
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ ÔÅËÕ: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:830
-#, c-format
-msgid "Unknown error: %s"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ: %s"
-
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: camel/providers/local/camel-mh-store.c:116
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" ÎÅ ¤ ËÁÔÁÌÏÇÏÍ."
-
-#: camel/providers/nntp/camel-nntp-auth.c:41
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ NNTP ÄÌÑ %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:62
-msgid "Server rejected username"
-msgstr "óÅÒ×ÅÒ ×¦ÄËÉÎÕ× ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ"
-
-#: camel/providers/nntp/camel-nntp-auth.c:68
-msgid "Failed to send username to server"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦Ä¦ÓÌÁÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ÎÁ ÓÅÒ×ÅÒ"
-
-#: camel/providers/nntp/camel-nntp-auth.c:77
-msgid "Server rejected username/password"
-msgstr "óÅÒ×ÅÒ ×¦ÄËÉÎÕ× ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ¦ ÐÁÒÏÌØ"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "ðÏצÄÏÍÌÅÎÎÑ %s ÎÅ ÚÎÁÊÄÅÎÏ."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÓЦÓÏË ÇÒÕÐ Ú ÓÅÒ×ÅÒÁ."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:38
-msgid "USENET news"
-msgstr "îÏ×ÉÎÉ USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:40
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:226
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ËÁÔÁÌÏÇ ÓÅÒ×ÅÒÁ ÎÏ×ÉÎ: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:288
-#, c-format
-msgid "USENET News via %s"
-msgstr "îÏ×ÉÎÉ USENET ÞÅÒÅÚ %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:295
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:180
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:274
-#, fuzzy, c-format
-msgid "No message with uid %s"
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#: camel/providers/pop3/camel-pop3-folder.c:288
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:34
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:158
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:170
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:335
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/providers/pop3/camel-pop3-store.c:375
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:394
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
-#, fuzzy
-msgid "(Unknown)"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:432
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:541
-#, c-format
-msgid "No such folder `%s'."
-msgstr "îÅצÒÎÁ ÔÅËÁ \"%s\"."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ ÄÏ sendmail: %s: ÐÏÛÔÕ ÎŠצĦÓÌÁÎÏ"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÒÏÚÇÁÌÕÄÉÔÉ sendmail: %s: ÐÏÛÔÕ ÎŠצĦÓÌÁÎÏ"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not send message: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ×¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail ÚÁ×ÅÒÛÉ×ÓÑ ÓÉ­ÎÁÌÏÍ %s: ÐÏÛÔÕ ÎŠצĦÓÌÁÎÏ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "îÅ ×ÄÁÌÏÓÑ ×ÉËÏÎÁÔÉ %s: ÐÏÛÔÕ ÎŠצĦÓÌÁÎÏ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail ÚÁ×ÅÒÛÉ×ÓÑ Ú ÓÔÁÎÏÍ %d: ÐÏÛÔÕ ÎŠצĦÓÌÁÎÏ."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
-msgid "Mail delivery via the sendmail program"
-msgstr "äÏÓÔÁÞÁÎÎÑ ÐÏÛÔÉ ÞÅÒÅÚ ÐÒÏÇÒÁÍÕ sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
-msgstr "¶ÄÅÎÔÉƦËÁÃ¦Ñ ÎÅ ×ÉÍÁÇÁ¤ÔØÓÑ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#, c-format
-msgid "SMTP server %s"
-msgstr "óÅÒ×ÅÒ SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:322
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "äÏÓÔÁÞÁÎÎÑ ÐÏÛÔÉ SMTP ÞÅÒÅÚ %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:347
-msgid "Cannot send message: sender address not defined."
-msgstr "îÅÍÏÖÌÉ×Ï ×¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ: ÁÄÒÅÓÁ צÄÐÒÁ×ÎÉËÁ ÎÅ ×ÉÚÎÁÞÅÎÁ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:354
-msgid "Cannot send message: sender address not valid."
-msgstr "îÅÍÏÖÌÉ×Ï ×¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ: ÁÄÒÅÓÁ צÄÐÒÁ×ÎÉËÁ ΊצÒÎÁ."
-
-#: camel/providers/smtp/camel-smtp-transport.c:368
-msgid "Cannot send message: no recipients defined."
-msgstr "îÅÍÏÖÌÉ×Ï ×¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ: ÎÅ ×ÉÚÎÁÞÅÎÏ ÏÔÒÉÍÕ×ÁÞ¦×"
-
-#: camel/providers/smtp/camel-smtp-transport.c:462
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "ðÅÒÅ×ÉÝÅÎÏ ÞÁÓ ÏÞ¦ËÕ×ÁÎÎÑ ×¦ÄÐÏצĦ ÎÁ HELO: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:478
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "ðÏÍÉÌËÁ צÄÐÏצĦ ÎÁ HELO: %s: ÎÅ ÆÁÔÁÌØÎÏ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:604
-#, fuzzy, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#: camel/providers/smtp/camel-smtp-transport.c:620
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:709
-#, fuzzy, c-format
-msgid "RSET response error: %s"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:732
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
-msgid "1 byte"
-msgstr "1 ÂÁÊÔ"
-
-#: composer/e-msg-composer-attachment-bar.c:89
-#, c-format
-msgid "%u bytes"
-msgstr "%u ÂÁÊÔ¦×"
-
-#: composer/e-msg-composer-attachment-bar.c:96
-#, c-format
-msgid "%.1fK"
-msgstr "%.1fë"
-
-#: composer/e-msg-composer-attachment-bar.c:100
-#, c-format
-msgid "%.1fM"
-msgstr "%.1fí"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.1fG"
-msgstr "%.1fç"
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
-msgid "attachment"
-msgstr "ÄÏÌÕÞÅÎÎÑ"
-
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "äÏÌÕÞÉÔÉ ÆÁÊÌ"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "÷ÉÄÁÌÉÔÉ"
-
-#: composer/e-msg-composer-attachment-bar.c:461
-msgid "Remove selected items from the attachment list"
-msgstr "÷ÉÄÁÌÉÔÉ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ Ú ÓÐÉÓËÕ ÄÏÌÕÞÅÎÎÑ"
-
-#: composer/e-msg-composer-attachment-bar.c:492
-msgid "Add attachment..."
-msgstr "äÏÌÕÞÉÔÉ..."
-
-#: composer/e-msg-composer-attachment-bar.c:493
-msgid "Attach a file to the message"
-msgstr "äÏÌÕÞÉÔÉ ÆÁÊÌ ÄÏ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "÷¦Ä:"
-
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
-msgstr "ëÌÁÃΦÔØ ÔÕÔ ÝÏ ×ÉËÌÉËÁÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
-
-#: composer/e-msg-composer-hdrs.c:313
-#, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦× ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
-msgid "To:"
-msgstr "äÏ:"
-
-#: composer/e-msg-composer-hdrs.c:318
-msgid "Enter the recipients of the message"
-msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦× ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:323
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦×, ÝÏ ÏÔÒÉÍÁÀÔØ ËÏЦÀ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: composer/e-msg-composer-hdrs.c:328
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:329
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦×, ÝÏ ÏÔÒÉÍÁÀÔØ ËÏЦÀ ÐÏצÄÏÍÌÅÎÎÑ ÎÅ ÐÏÐÁ×ÛÉ × ÓÐÉÓÏË "
-"ÏÔÒÉÍÕ×ÁÞ¦×."
-
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "ôÅÍÁ:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "÷×ÅĦÔØ ÔÅÍÕ ÐÏÓÌÁÎÎÑ"
-
-#: composer/e-msg-composer.c:430
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÆÁÊÌ Ð¦ÄÐÉÓÕ %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:598
-msgid "Save as..."
-msgstr "úÂÅÒÅÇÔÉ ÑË..."
-
-#: composer/e-msg-composer.c:609
-#, c-format
-msgid "Error saving file: %s"
-msgstr "ðÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: composer/e-msg-composer.c:629
-#, c-format
-msgid "Error loading file: %s"
-msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ × ÐÏצÄÏÍÌÅÎΦ..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ × ÐÏצÄÏÍÌÅÎΦ..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:758
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:783
-msgid "Open file"
-msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ"
-
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
-msgstr "ãØÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
-
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
-msgstr "ãÅ ÎÅ Ú×ÉÞÁÊÎÉÊ ÆÁÊÌ."
-
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
-msgstr "óÔÁÌÁÓÑ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÞÉÔÕ×ÁÎÎÑ ÆÁÊÌÕ."
-
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "ð¦ÄÇÏÔÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
-msgstr "îÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ ×¦ËÎÏ ËÏÎÓÔÒÕËÔÏÒÁ."
-
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÏÂÏÌÏÎËÕ Evolutuion."
-
-#: filter/filter-datespec.c:62
-msgid "year"
-msgstr "Ò¦Ë"
-
-#: filter/filter-datespec.c:62
-#, fuzzy
-msgid "years"
-msgstr "úÁÇÏÌÏ×ÏË"
-
-#: filter/filter-datespec.c:63
-msgid "month"
-msgstr "ͦÓÑÃØ"
-
-#: filter/filter-datespec.c:63
-#, fuzzy
-msgid "months"
-msgstr "ûÒÉÆÔÉ"
-
-#: filter/filter-datespec.c:64
-msgid "week"
-msgstr "ÔÉÖÄÅÎØ"
-
-#: filter/filter-datespec.c:64
-#, fuzzy
-msgid "weeks"
-msgstr "ôÉÖÄÅÎØ"
-
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr "ô¦ÌÏ"
-
-#: filter/filter-datespec.c:66
-msgid "hour"
-msgstr "ÇÏÄÉÎÁ"
-
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:67
-msgid "minute"
-msgstr "È×ÉÌÉÎÁ"
-
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
-msgid "second"
-msgstr "ÓÅËÕÎÄÁ"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "seconds"
-msgstr "÷¦Ä¦ÓÌÁÔÉ"
-
-#: filter/filter-datespec.c:183
-msgid "Oops. You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:185
-msgid "Oops. You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:259
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:282
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:322
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:357
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:358
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:416
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
-msgid "now"
-msgstr "ÚÁÒÁÚ"
-
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<ËÌÁÃΦÔØ ÔÕÔ ÄÌÑ ×ÉÂÏÒÕ ÄÁÔÉ>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ"
-
-#: filter/filter-editor.c:233
-#, fuzzy
-msgid "Edit Filter Rule"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ ×¦ÌØÔÒ¦×"
-
-#. and now for the action area
-#: filter/filter-filter.c:401
-msgid "Then"
-msgstr "ôÏĦ"
-
-#: filter/filter-filter.c:414
-msgid "Add action"
-msgstr "äÏÄÁÔÉ Ä¦À"
-
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr "÷ÉÄÁÌÉÔÉ Ä¦À"
-
-#: filter/filter-folder.c:143
-msgid ""
-"Oops, you forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
-msgid "Select Folder"
-msgstr "÷ÉÂ¦Ò ÔÅËÉ"
-
-#: filter/filter-folder.c:243
-msgid "Enter folder URI"
-msgstr "÷×ÅĦÔØ URI ÔÅËÉ"
-
-#: filter/filter-folder.c:289
-msgid "<click here to select a folder>"
-msgstr "<ËÌÁÃΦÔØ ÔÕÔ ÄÌÑ ×ÉÂÏÒÕ ÔÅËÉ>"
-
-#: filter/filter-input.c:185
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"ðÏÍÉÌËÁ Õ ÒÅ­ÕÌÑÒÎÏÍÕ ×ÉÒÁÚ¦ \"%s\":\n"
-"%s"
-
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
-msgid "Test"
-msgstr "ôÅÓÔ"
-
-#: filter/filter-rule.c:530
-msgid "Rule name: "
-msgstr "îÁÚ×Á ÐÒÁ×ÉÌÁ: "
-
-#: filter/filter-rule.c:534
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:550
-msgid "If"
-msgstr "ñËÝÏ"
-
-#: filter/filter-rule.c:567
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:571
-msgid "if all criteria are met"
-msgstr "ÑËÝÏ ×Ó¦ צÄÐÏצÄϤ ×Ó¦Í ËÒÉÔÅÒ¦ÑÍ"
-
-#: filter/filter-rule.c:576
-msgid "if any criteria are met"
-msgstr "ÑËÝÏ ×¦ÄÐÏצÄÁ¤ ÂÕÄØ-ÑËÏÍÕ ËÒÉÔÅÒ¦À"
-
-#: filter/filter-rule.c:587
-msgid "Add criterion"
-msgstr "äÏÄÁÔÉ ËÒÉÔÅÒ¦Ê"
-
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "÷ÉÄÁÌÉÔÉ ËÒÉÔÅÒ¦Ê"
-
-#: filter/filter-system-flag.c:63
-#, fuzzy
-msgid "Replied to"
-msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr "÷ÁÖÌÉ×Ï"
-
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "ðÒÏÞÉÔÁÎÏ"
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ"
-
-#: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "äÁÔÁ ÏÔÒÉÍÁÎÎÑ"
-
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "äÁÔÁ צÄÓÉÌÁÎÎÑ"
-
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "÷ÉÒÁÚ"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "ðÅÒÅÓÌÁÔÉ ÎÁ ÁÄÒÅÓÕ"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "ô¦ÌÏ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "úÁÇÏÌÏ×ÏË ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ÏÔÒÉÍÁÎÏ"
-
-#: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ×¦Ä¦ÓÌÁÎÏ"
-
-#: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
-
-#: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "áÄÒÅÓÁÔÉ"
-
-#: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Score"
-msgstr "íϦÌØÎÉÊ"
-
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "÷¦ÄÐÒÁ×ÎÉË"
-
-#: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "óÔÁÎ:"
-
-#: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "äÖÅÒÅÌÏ"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "óÔÁÎ:"
-
-#: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "ôÅÍÁ"
-
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "ЦÓÌÑ"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "ÐÅÒÅÄ"
-
-#: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "ͦÓÔÉÔØ"
-
-#: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ΊͦÓÔÉÔØ"
-
-#: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "ÎÅ ÚÁ˦ÎÞÕ¤ÔØÔÓÑ ÎÁ"
-
-#: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "ÎÅ ¦ÓÎÕ¤"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ÎÅ ÓÈÏÖÅ ÎÁ"
-
-#: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "ÎÅ ÐÏÞÉÎÁ¤ÔØÓÑ Ú"
-
-#: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "ÚÁ˦ÎÞÕ¤ÔØÓÑ ÎÁ"
-
-#: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "¦ÓÎÕ¤"
-
-#: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "¦ÌØÛÅ"
-
-#: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "ÍÅÎÛÅ"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "ë¦ÎÃÅ×Á ÄÁÔÁ"
-
-#: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "ÓÈÏÖÅ ÎÁ"
-
-#: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "ÐÏÞÉÎÁ¤ÔØÓÑ ÎÁ"
-
-#: filter/libfilter-i18n.h:43
-msgid "was after"
-msgstr "ÂÕÌÏ ÐÅÒÅÄ"
-
-#: filter/libfilter-i18n.h:44
-msgid "was before"
-msgstr "ÂÕÌÏ Ð¦ÓÌÑ"
-
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "äÏÄÁÔÉ ÐÒÁ×ÉÌÏ"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "äÏÄÁÔÉ ÐÒÁ×ÉÌÏ ×¦ÒÔÕÁÌØÎϧ ÔÅËÉ"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÒÁ×ÉÌÏ ×¦ÒÔÕÁÌØÎϧ ÔÅËÉ"
-
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
-
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr ""
-
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "÷ÉÂ¦Ò ÔÅËÉ"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "ô¦ÌÏ ÞÉ ÔÅÍÁ ͦÓÔÉÔØ"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "ô¦ÌÏ Í¦ÓÔÉÔØ"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "ôÅÍÁ ͦÓÔÉÔØ"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "ô¦ÌÏ ÎŠͦÓÔÉÔØ"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "ôÅÍÁ ΊͦÓÔÉÔØ"
-
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÔÅÍÉ"
-
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
-msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ צÄÐÒÁ×ÎÉËÁ"
-
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
-msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÏÔÒÉÍÕ×ÁÞ¦×"
-
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
-msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
-
-#: mail/folder-browser.c:650
-msgid "Filter on Sender"
-msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
-
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr "æ¦ÌØÔÒ ÏÔÒÉÍÕ×ÁÞ¦×"
-
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
-msgstr "æ¦ÌØÔÒ ÓÐÉÓËÕ ÒÏÚÓÉÌËÉ"
-
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "÷¦ÄËÒÉÔÉ"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "÷ÉÐÒÁ×ÉÔÉ"
-
-#: mail/folder-browser.c:660
-msgid "Save As..."
-msgstr "úÂÅÒÅÇÔÉ ÑË..."
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr "äÒÕËÕ×ÁÔÉ"
-
-#: mail/folder-browser.c:663
-msgid "Reply to Sender"
-msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ"
-
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
-msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
-
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
-msgstr "ðÅÒÅÓÌÁÔÉ"
-
-#: mail/folder-browser.c:666
-#, fuzzy
-msgid "Forward inline"
-msgstr "ðÅÒÅÓÌÁÔÉ"
-
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
-msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÐÒÏÞÉÔÁÎÅ"
-
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
-msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÎÅÐÒÏÞÉÔÁÎÅ"
-
-#: mail/folder-browser.c:671
-msgid "Move to Folder..."
-msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ..."
-
-#: mail/folder-browser.c:672
-msgid "Copy to Folder..."
-msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ..."
-
-#: mail/folder-browser.c:674
-msgid "Undelete"
-msgstr "÷¦ÄÎÏ×ÉÔÉ"
-
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
-msgid "Apply Filters"
-msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ"
-
-#: mail/folder-browser.c:680
-msgid "Create Rule From Message"
-msgstr "óÔ×ÏÒÉÔÉ ÐÒÁ×ÉÌÏ Ú ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/folder-browser.c:768
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "æ¦ÌØÔÒ ÓÐÉÓËÕ ÒÏÚÓÉÌËÉ (%s)"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "îÅÍÁ¤"
-
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "óÔÅÒÔÉ"
-
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
-msgstr ""
-
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "¶ÎÓÔÁÌÑÃ¦Ñ Evolution"
-
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "ôÅÍÁ - %s"
-
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "ðÏÛÔÁ ×¦Ä %s"
-
-#: mail/mail-autofilter.c:331
-#, c-format
-msgid "%s mailing list"
-msgstr "óÐÉÓÏË ÒÏÚÓÉÌËÉ %s"
-
-#: mail/mail-callbacks.c:83
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:136
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:148
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:223
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:594
-msgid "Forwarded message:\n"
-msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ:\n"
-
-#: mail/mail-callbacks.c:675
-#, fuzzy
-msgid "Move message(s) to"
-msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-callbacks.c:677
-#, fuzzy
-msgid "Copy message(s) to"
-msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-callbacks.c:812
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
-msgstr "ðÅÒÅÐÉÓÁÔÉ ÆÁÊÌ?"
-
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"æÁÊÌ Ú Ã¦¤À ÎÁÚ×ÏÀ ×ÖÅ ¦ÓÎÕ¤.\n"
-"ðÅÒÅÐÉÓÁÔÉ ÊÏÇÏ?"
-
-#: mail/mail-callbacks.c:893
-msgid "Save Message As..."
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
-
-#: mail/mail-callbacks.c:895
-msgid "Save Messages As..."
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
-
-#: mail/mail-callbacks.c:979
-#, fuzzy, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: mail/mail-callbacks.c:1028
-msgid "Print Message"
-msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-callbacks.c:1075
-msgid "Printing of message failed"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÎÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
-msgstr ""
-
-#: mail/mail-config-druid.c:629
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
-msgstr ""
-
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "îÅ ×ÄÁÌÏÓØ ÚÁÐÉÓÁÔÉ ÄÁΦ: %s"
-
-#: mail/mail-display.c:229
-msgid "Save Attachment"
-msgstr "úÂÅÒÅÇÔÉ ÄÏÌÕÞÅÎÎÑ"
-
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ËÁÔÁÌÏÇ: %s"
-
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
-msgstr "úÂÅÒÅÇÔÉ ÎÁ ÄÉÓË..."
-
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
-msgstr "÷¦ÄËÒÉÔÉ × %s..."
-
-#: mail/mail-display.c:315
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:342
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:369
-msgid "Hide"
-msgstr "ðÒÉÂÒÁÔÉ"
-
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "ÄÏÌÕÞÅÎÎÑ"
-
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "÷¦ÄÐÏצÄÁÔÉ ÎÁ:"
-
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:862
-msgid "Encrypted message"
-msgstr "úÁÛÉÆÒÏ×ÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
-msgstr ""
-
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
-
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:251
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "ëÏÎƦ­ÕÒÕ×ÁÔÉ ÔÅËÕ"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "úÁËÒÉ×ÁÎÎÑ ÐÏÔÏÞÎϧ ÔÅËÉ"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÓÔÁÒϧ ÔÅËÉ ÔÁ צÄËÒÉ×ÁÎÎÑ"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ"
-
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
-msgstr ""
-
-#: mail/mail-local.c:379
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÔÅËÕ"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
-
-#: mail/mail-mt.c:85
-#, fuzzy, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
-msgstr ""
-"ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:87
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
-msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
-msgid "Working"
-msgstr "ðÅÒÅÎÅÓÅÎÎÑ"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "ïÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú %s"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr "îÅÍÁ¤ ÎÏ×ϧ ËÏÒÅÓÐÏÎÄÅÎæ§ ÎÁ %s."
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
-msgstr "÷¦ÄÓÉÌÁÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:565
-#, fuzzy
-msgid "Sending message"
-msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
-
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "÷¦ÄÓÉÌÁÎÎÑ ÞÅÒÇÉ"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr "÷¦Ä¦ÓÌÁÔÉ ÞÅÒÇÕ"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr "äÏÄÁ×ÁÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr "äÏÄÁ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "ðÅÒÅÎÅÓÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú \"%s\" × \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú \"%s\" × \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "ðÅÒÅÎÅÓÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\" × \"%s\""
-
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "óËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\" × \"%s\""
-
-#: mail/mail-ops.c:950
-msgid "Moving"
-msgstr "ðÅÒÅÎÅÓÅÎÎÑ"
-
-#: mail/mail-ops.c:953
-msgid "Copying"
-msgstr "ëÏЦÀ×ÁÎÎÑ"
-
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "óËÁÎÕ×ÁÎÎÑ ÔÅË × \"%s\""
-
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(îÅÍÁ¤ ÏÐÉÓÕ)"
-
-#: mail/mail-ops.c:1179
-msgid "Forwarded messages"
-msgstr "ðÅÒÅÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
-#, fuzzy, c-format
-msgid "Opening folder %s"
-msgstr "óËÁÎÕ×ÁÎÎÑ ÔÅË × \"%s\""
-
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "óÉÎÈÒÏΦÚÁÃ¦Ñ \"%s\""
-
-#: mail/mail-ops.c:1401
-#, fuzzy
-msgid "Expunging folder"
-msgstr "÷ÉËÒÅÓÌÅÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:1450
-#, fuzzy, c-format
-msgid "Retrieving message %s"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
-
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
-
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÅËÉ %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÔÅËÕ %s"
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
-msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ"
-
-#: mail/mail-ops.c:1922
-#, fuzzy, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
-
-#: mail/mail-ops.c:1935
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr "ðÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ: %s"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "÷¦ÄͦÎÉÔÉ"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ \"%s\":\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ Ä¦ÁÌÏÇÏ׊צËÎÏ."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "ëÏÒÉÓÔÕ×ÁÞ ×¦ÄͦÎÉ× ÚÁÐÉÔ."
-
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ \"%s\": %s"
-
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "ðÅÒÅצÒËÁ %s"
-
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
-
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
-
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "úÁÐÉÓ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
-
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
-msgstr "úÂÅÒÅÖÅÎÎÑ ÚÍ¦Î Õ %s"
-
-#: mail/mail-tools.c:381
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (ÐÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ)"
-
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (ÂÅÚ ÔÅÍÉ)"
-
-#: mail/mail-tools.c:427
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ %s"
-
-#: mail/mail-tools.c:429
-msgid "Forwarded message (no subject)"
-msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ (ÂÅÚ ÔÅÍÉ)"
-
-#: mail/mail-tools.c:530
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-vfolder.c:149
-msgid "VFolders"
-msgstr "÷¦ÒÔÕÁÌØΦ ÔÅËÉ"
-
-#: mail/mail-vfolder.c:298
-msgid "New VFolder"
-msgstr "îÏ×Á צÒÔÕÁÌØÎÁ ÔÅËÁ"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "÷¦ÄÐÏצÓÔÉ"
-
-#: mail/mail-view.c:138
-msgid "Reply to the sender of this message"
-msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í ÏÔÒÉÍÕ×ÁÞÁÍ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-view.c:144
-msgid "Forward this message"
-msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-view.c:148
-msgid "Print the selected message"
-msgstr "îÁÄÒÕËÕ×ÁÔÉ ×ÉÂÒÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/mail-view.c:150
-msgid "Delete this message"
-msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: mail/message-list.c:599
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:602
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:605
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
-
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr "%s, ÔÏÝÏ."
-
-#: mail/message-list.c:905 mail/message-list.c:921
-#, fuzzy
-msgid "<unknown>"
-msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ"
-
-#: mail/message-list.c:973
-msgid "?"
-msgstr ""
-
-#: mail/message-list.c:980
-#, fuzzy
-msgid "Today %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:1001
-#, fuzzy
-msgid "%a %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1009
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:1011
-#, fuzzy
-msgid "%b %d %Y"
-msgstr "%a %d %Y"
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "ÄÏÌÕÞÅÎÎÑ"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "From"
-msgstr "÷¦Ä:"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Date"
-msgstr "ЦÓÌÑ"
-
-#: mail/message-list.c:1110
-#, fuzzy
-msgid "Received"
-msgstr "äÁÔÁ ÏÔÒÉÍÁÎÎÑ"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "To"
-msgstr "äÏ:"
-
-#: mail/message-list.c:1111
-#, fuzzy
-msgid "Size"
-msgstr "òÏÚͦÒ:"
-
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ NNTP ÄÌÑ %s@%s"
-
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
-msgstr "ðÒÏÇÒÁÍÁ GPG/PGP ÎÅ ÄÏÓÐÕÎÁ."
-
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
-msgstr "îÅ ×ËÁÚÁÎÏ ÐÁÒÏÌÀ."
-
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ ÄÏ GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
-msgid "Folder"
-msgstr "ôÅËÉ"
-
-#: mail/subscribe-dialog.c:63
-#, fuzzy
-msgid "Store"
-msgstr "íϦÌØÎÉÊ"
-
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
-msgstr ""
-
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "ðÒɤÄÎÁÎÎÑ ÄÏ ÔÅËÉ \"%s\""
-
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "÷¦Ä'¤ÄÎÁÎÎÑ ×¦Ä ÔÅËÉ \"%s\""
-
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "ðÒɤÄÎÁÔÉÓØ ÄÏ ÔÅËÉ \"%s\""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "÷¦Ä'¤ÄÎÁÔÉÓØ ×¦Ä ÔÅËÉ \"%s\""
-
-#: shell/e-setup.c:112 shell/e-setup.c:185
-msgid "Evolution installation"
-msgstr "¶ÎÓÔÁÌÑÃ¦Ñ Evolution"
-
-#: shell/e-setup.c:116
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-
-#: shell/e-setup.c:117
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "îÁÔÉÓΦÔØ \"çÁÒÁÚÄ\" ÝÏ ×ÓÔÁÎÏ×ÉÔÉ ÆÁÊÌÉ, ÞÉ \"÷¦ÄͦÎÉÔÉ\" ÝÏ ×ÉÊÔÉ."
-
-#: shell/e-setup.c:157
-msgid "Could not update files correctly"
-msgstr "îÅ ×ÄÁÌÏÓÑ ËÏÒÅËÔÎÏ ÐÏÎÏ×ÉÔÉ ÆÁÊÌÉ"
-
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "æÁÊÌÉ Evolution ÕÓЦÛÎÏ ×ÓÔÁÎÏ×ÌÅÎÏ."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "óÈÏÖÅ ÃÅ ×ÁÛ ÐÅÒÛÉÊ ÚÁÐÕÓË Evolution."
-
-#: shell/e-setup.c:190
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:209
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ\n"
-"%s\n"
-"ðÏÍÉÌËÁ: %s"
-
-#: shell/e-setup.c:224
-#, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ÓËÏЦÀ×ÁÔÉ ÆÁÊÌÉ ×\n"
-"\"%s\"."
-
-#: shell/e-setup.c:249
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-
-#: shell/e-setup.c:261
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:82
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ×ËÁÚÁÎÕ ÔÅËÕ:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:134
-msgid "The specified folder name is not valid."
-msgstr "÷ËÁÚÁÎÁ ÎÁÚ×Á ÔÅËÉ ÎŠצÒÎÁ."
-
-#: shell/e-shell-folder-creation-dialog.c:225
-msgid "Evolution - Create new folder"
-msgstr "Evolution - óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
-
-#: shell/e-shell-folder-selection-dialog.c:96
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:297
-msgid "New..."
-msgstr "îÏ×ÉÊ..."
-
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
-msgid "(Untitled)"
-msgstr "(îÅÎÁÊÍÅÎÏ×ÁÎÉÊ)"
-
-#: shell/e-shell-view-menu.c:114
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy ÎÅ ÚÎÁÊÄÅÎÏ ÚÁ ÛÌÑÈÏÍ ×ËÁÚÁÎÉÍ × $PATH."
-
-#: shell/e-shell-view-menu.c:120
-msgid "Bug buddy could not be run."
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁÐÕÓÔÉÔÉ Bug buddy"
-
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:174
-msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:334
-msgid "Go to folder..."
-msgstr "ðÅÒÅÊÔÉ ÎÁ ÔÅËÕ..."
-
-#: shell/e-shell-view.c:140
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "ôÅËÉ"
-
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1100
-#, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell.c:372
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1212
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:123
-msgid "Create new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:126
-msgid "Group name:"
-msgstr "îÁÚ×Á ÇÒÕÐÉ:"
-
-#: shell/e-shortcuts-view.c:249
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:254
-msgid "Don't remove"
-msgstr "îÅ ×ÉÄÁÌÑÔÉ"
-
-#: shell/e-shortcuts-view.c:265
-msgid "_Small Icons"
-msgstr "íÁ̦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:266
-msgid "Show the shortcuts as small icons"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÑÒÌÉ˦ ÑË ÍÁ̦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:268
-msgid "_Large Icons"
-msgstr "÷ÅÌÉ˦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:269
-msgid "Show the shortcuts as large icons"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÑÒÌÉ˦ ÑË ×ÅÌÉ˦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:280
-msgid "_New Group..."
-msgstr "îÏ×Á ÇÒÕÐÁ..."
-
-#: shell/e-shortcuts-view.c:281
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr "÷ÉÄÁÌÉÔÉ ÃÀ ÇÒÕÐÕ..."
-
-#: shell/e-shortcuts-view.c:284
-#, fuzzy
-msgid "Remove this shortcut group"
-msgstr "áËÔÉצÚÕ×ÁÔÉ ÃÅÊ ÑÒÌÉË"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "_Hide the Shortcut Bar"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÑÒÌÉ˦ ÑË ×ÅÌÉ˦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:290
-#, fuzzy
-msgid "Hide the shortcut bar"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÑÒÌÉ˦ ÑË ×ÅÌÉ˦ ЦËÔÏÇÒÁÍÉ"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "áËÔÉצÚÕ×ÁÔÉ"
-
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "áËÔÉצÚÕ×ÁÔÉ ÃÅÊ ÑÒÌÉË"
-
-#: shell/e-shortcuts-view.c:377
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "÷ÉÄ"
-
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "ðÏËÁÚÁÔÉ ×ÉÂÒÁÎÕ ÔÅËÉ"
-
-#: shell/e-storage.c:138
-msgid "(No name)"
-msgstr "(âÅÚ ÎÁÚ×É)"
-
-#: shell/e-storage.c:389
-msgid "No error"
-msgstr "âÅÚ ÐÏÍÉÌÏË"
-
-#: shell/e-storage.c:391
-msgid "Generic error"
-msgstr "úÁÇÁÌØÎÁ ÐÏÍÉÌËÁ"
-
-#: shell/e-storage.c:393
-msgid "A folder with the same name already exists"
-msgstr "ôÅËÁ Ú Ã¦¤À ÎÁÚ×ÏÀ ×ÖÅ ¦ÓÎÕ¤"
-
-#: shell/e-storage.c:395
-msgid "The specified folder type is not valid"
-msgstr "÷ËÁÚÁÎÉÊ ÔÉÐ ÔÅËÉ ÎŠצÒÎÉÊ"
-
-#: shell/e-storage.c:397
-msgid "I/O error"
-msgstr "ðÏÍÉÌËÁ ××ÏÄÕ/×É×ÏÄÕ"
-
-#: shell/e-storage.c:399
-msgid "Not enough space to create the folder"
-msgstr "îÅ ×ÉÓÔÁÞÁ¤ ͦÓÃÑ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÔÅËÉ"
-
-#: shell/e-storage.c:401
-msgid "The specified folder was not found"
-msgstr "÷ËÁÚÁÎϧ ÔÅËÉ ÎÅ ÚÎÁÊÄÅÎÏ"
-
-#: shell/e-storage.c:403
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
-msgid "Operation not supported"
-msgstr "ïÐÅÒÁÃ¦Ñ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ"
-
-#: shell/e-storage.c:409
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/main.c:74
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:101
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÏÂÏÌÏÎËÕ Evolutuion."
-
-#: shell/main.c:178
-msgid "Disable."
-msgstr ""
-
-#: shell/main.c:198
-msgid "Cannot initialize the Bonobo component system."
-msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ËÏÍÐÏÎÅÎÔÎÕ ÓÉÓÔÅÍÕ Bonobo."
-
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "îÏ×Á ÚÕÓÔÒ¦Þ..."
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:10
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "ëÏÎÔÁËÔ"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "úÁ×ÄÁÎÎÑ"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "öÕÒÎÁÌØÎÉÊ ÚÁÐÉÓ"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "úÂÅÒÅÇÔÉ ÄÏÌÕÞÅÎÎÑ..."
-
-#: ui/evolution-contact-editor.xml:38
-#, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ..."
-
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "ðÁÒÁÍÅÔÒÉ ÓÔÏÒ¦ÎËÉ:"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ"
-
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "çÒÁÍÁÔÉËÁ..."
-
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÎÅÐÒÏÞÉÔÁÎÅ"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "ïÂ'¤ËÔ"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "åÌÅÍÅÎÔ"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "ðÅÒÛÉÊ ÅÌÅÍÅÎÔ Õ ÔÅæ"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "ïÓÔÁÎÎ¦Ê ÅÌÅÍÅÎÔ Õ ÔÅæ"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "æÏÒÍÁÔÕ×ÁÎÎÑ"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "ðÏÐÅÒÅÄΦÊ"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "äÁ̦"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "ÐÁÎÅϦ ¦ÎÓÔÒÕÍÅΦ×"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "æÁÊÌ..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "åÌÅÍÅÎÔ..."
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "ïÂ'¤ËÔ..."
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "ûÒÉÆÔ..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "áÂÚÁÃ..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "îÁÌÁÇÏÄÖÅÎÎÑ ÓËÒÉÐÔ¦×"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "çÒÁÍÁÔÉËÁ..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "æÏÒÍÉ"
-
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "ëÏÎÔÁËÔ"
-
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "ëÏÎÔÁËÔ"
-
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÚÁ ËÏÎÔÁËÔÏÍ..."
-
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "ëÏÎÔÁËÔ"
-
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "çÒÁÍÁÔÉËÁ..."
-
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "ëÏÎÔÁËÔ"
-
-#: ui/evolution-contact-editor.xml:150
-#, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "öÕÒÎÁÌØÎÉÊ ÚÁÐÉÓ"
-
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ..."
-
-#: ui/evolution-contact-editor.xml:153
-#, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#: ui/evolution-contact-editor.xml:156
-#, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "ðÅÒÅÓÌÁÔÉ"
-
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "ðÅÒÅÓÌÁÔÉ"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "÷ÓÔÁ×ÉÔÉ"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "æÏÒÍÁÔ"
-
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "¶ÎÓÔÒÕÍÅÎÔÉ"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "䦧"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "ðÏÐÅÒÅÄΦÊ"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅÌÅÍÅÎÔÕ"
-
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "äÏצÄËÁ"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅÌÅÍÅÎÔÕ"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "úÁÊÎÑÔÉÊ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "úÁ ÍÅÖÁÍÉ ÏƦÓÕ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "îÅÍÁ¤ ¦ÎÆÏÒÍÁæ§"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "úÁÐÒÏÓÉÔÉ ¦ÎÛÉÈ..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "ðÁÒÁÍÅÔÒÉ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "á×ÔÏ×ɦÒ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr "_>>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "÷Ó¦ ÌÀÄÉ ¦ ÒÅÓÕÒÓÉ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "÷Ó¦ ÌÀÄÉ ¦ ÏÄÉÎ ÒÅÓÕÒÓ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "ðÏÔÒ¦ÂΦ ÌÀÄÉ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "ðÏÔÒ¦ÂΦ ÌÀÄÉ ¦ ÏÄÉÎ ÒÅÓÕÒÓ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "þÁÓ ÐÏÞÁÔËÕ Ú¦ÂÒÁÎÎÑ:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "þÁÓ ÚÁ×ÅÒÛÅÎÎÑ Ú¦ÂÒÁÎÎÑ:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "÷ÅÓØ ÓÕÐÒÏצÄ"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "ð÷óþðóî"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "ÚÁÒÁÚ"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "ÓØÏÇÏÄΦ"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "ðÏÛÕË"
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "çÒÕÐÁ %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ?"
-
-#~ msgid "Address _2:"
-#~ msgstr "áÄÒÅÓÁ _2:"
-
-#~ msgid "Canada"
-#~ msgstr "ëÁÎÁÄÁ"
-
-#~ msgid "Check Address"
-#~ msgstr "ðÅÒÅצÒËÁ ÁÄÒÅÓÉ"
-
-#~ msgid "Countr_y:"
-#~ msgstr "ëÒÁ§ÎÁ:"
-
-#~ msgid "Finland"
-#~ msgstr "æ¦ÎÌÑÎĦÑ"
-
-#~ msgid "USA"
-#~ msgstr "óûá"
-
-#~ msgid "_Address:"
-#~ msgstr "áÄÒÅÓÁ:"
-
-#~ msgid "_City:"
-#~ msgstr "í¦ÓÔÏ:"
-
-#~ msgid "_PO Box:"
-#~ msgstr "á/ó:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "ûÔÁÔ/ÏÂÌÁÓÔØ:"
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "¶ÎÄÅËÓ:"
-
-#, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
-
-#~ msgid "Find..."
-#~ msgstr "ûÕËÁÔÉ..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "áÄÒÅÓÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Select Names"
-#~ msgstr "÷ÉÂÒÁÔÉ ÎÁÚ×É"
-
-#, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "÷ÉÂÅÒ¦ÔØ ÎÁÚ×Õ Ú ÓÐÉÓËÕ:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "Tahoma 10 ÐÔ"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "Tahoma 8 ÐÔ"
-
-#~ msgid "Body"
-#~ msgstr "ô¦ÌÏ"
-
-#~ msgid "Bottom:"
-#~ msgstr "÷ÎÉÚÕ:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "òÏÚͦÒÉ:"
-
-#~ msgid "Font..."
-#~ msgstr "ûÒÉÆÔ..."
-
-#~ msgid "Fonts"
-#~ msgstr "ûÒÉÆÔÉ"
-
-#~ msgid "Footer:"
-#~ msgstr "îÉÖÎ¦Ê ËÏÌÏÎÔÉÔÕÌ:"
-
-#~ msgid "Format"
-#~ msgstr "æÏÒÍÁÔ"
-
-#~ msgid "Header"
-#~ msgstr "÷ÅÒÈÎ¦Ê ËÏÌÏÎÔÉÔÕÌ"
-
-#~ msgid "Header/Footer"
-#~ msgstr "ëÏÌÏÎÔÉÔÕÌÉ"
-
-#~ msgid "Headings"
-#~ msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ"
-
-#~ msgid "Headings for each letter"
-#~ msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ ÄÌÑ ËÏÖÎÏÇÏ ÌÉÓÔÁ"
-
-#~ msgid "Height:"
-#~ msgstr "÷ÉÓÏÔÁ:"
-
-#~ msgid "Immediately follow each other"
-#~ msgstr "ïÄÉÎ ÚÁ ÄÒÕÇÉÍ"
-
-#~ msgid "Include:"
-#~ msgstr "÷ËÌÀÞÉÔÉ:"
-
-#~ msgid "Landscape"
-#~ msgstr "áÌØÂÏÍÎÁ"
-
-#~ msgid "Left:"
-#~ msgstr "ì¦×ÏÒÕÞ:"
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "úÁËÌÁÄËÉ Ì¦ÔÅÒ ÚÂÏËÕ"
-
-#~ msgid "Margins"
-#~ msgstr "ðÏÌÑ"
-
-#~ msgid "Number of columns:"
-#~ msgstr "ë¦ÌØ˦ÓÔØ ÓÔÏ×ÐÞÉ˦×:"
-
-#~ msgid "Options"
-#~ msgstr "ðÁÒÁÍÅÔÒÉ"
-
-#~ msgid "Orientation"
-#~ msgstr "ïÒ¦¤ÎÔÁæÑ"
-
-#~ msgid "Page"
-#~ msgstr "óÔÏÒ¦ÎËÁ"
-
-#~ msgid "Paper"
-#~ msgstr "ðÁЦÒ"
-
-#~ msgid "Paper source:"
-#~ msgstr "äÖÅÒÅÌÏ ÐÁÐÅÒÕ:"
-
-#~ msgid "Portrait"
-#~ msgstr "ëÎÉÖÎÁ"
-
-#~ msgid "Preview:"
-#~ msgstr "ðÅÒÅÇÌÑÄ:"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "äÒÕË Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ ÎÁЦ×ÔÏΦ×"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "ïÂÅÒÔÁÔÉ ÎÁ ÐÁÒÎÉÈ ÓÔÏÒ¦ÎËÁÈ"
-
-#~ msgid "Right:"
-#~ msgstr "ðÒÁ×ÏÒÕÞ:"
-
-#~ msgid "Sections:"
-#~ msgstr "òÏÚĦÌÉ:"
-
-#~ msgid "Shading"
-#~ msgstr "ð¦×ÔÏÎÉ"
-
-#~ msgid "Start on a new page"
-#~ msgstr "ðÏÞÉÎÁÔÉ Ú ÎÏ×ϧ ÓÔÏÒ¦ÎËÉ"
-
-#~ msgid "Style name:"
-#~ msgstr "îÁÚ×Á ÓÔÉÌÀ:"
-
-#~ msgid "Top:"
-#~ msgstr "÷ÇÏÒ¦:"
-
-#~ msgid "Type:"
-#~ msgstr "ôÉÐ:"
-
-#~ msgid "Width:"
-#~ msgstr "ûÉÒÉÎÁ:"
-
-#~ msgid "label26"
-#~ msgstr "label26"
-
-#, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "ëÁÌÅÎÄÁÒ"
-
-#, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "ëÁÎÁÌ ËÁÌÅÎÄÁÒÑ Evolution"
-
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
-
-#~ msgid "Edit appointment"
-#~ msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ"
-
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "þÁÓ ÓÎÕ (× È×ÉÌÉÎÁÈ)"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 È×ÉÌÉÎ"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 È×ÉÌÉÎ"
-
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 ÇÏÄÉÎ (ÄÐ/ÐÐ)"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 È×ÉÌÉÎ"
-
-#~ msgid "24 hour"
-#~ msgstr "24 ÇÏÄÉÎÉ"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 È×ÉÌÉÎ"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 È×ÉÌÉÎ"
-
-#~ msgid "Calendar"
-#~ msgstr "ëÁÌÅÎÄÁÒ"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "ðÁÒÁÍÅÔÒÉ ËÁÌÅÎÄÁÒÑ"
-
-#~ msgid "Colors"
-#~ msgstr "ëÏÌØÏÒÉ"
-
-#~ msgid "End of day:"
-#~ msgstr "ë¦ÎÅÃØ ÄÎÑ:"
-
-#~ msgid "First day of week:"
-#~ msgstr "ðÅÒÛÉÊ ÄÅÎØ ÔÉÖÎÑ:"
-
-#~ msgid "Pick a color"
-#~ msgstr "÷ÉÂ¦Ò ËÏÌØÏÒÕ"
-
-#~ msgid "Remind me of all appointments"
-#~ msgstr "îÁÇÁÄÕ×ÁÔÉ ÐÒÏ ×Ó¦ ÚÕÓÔÒ¦Þ¦"
-
-#~ msgid "Reminders"
-#~ msgstr "îÁÇÁÄÕ×ÁÎÎÑ"
-
-#~ msgid "Show"
-#~ msgstr "ðÏËÁÚÁÔÉ"
-
-#~ msgid "Show week numbers"
-#~ msgstr "ðÏËÁÚÁÔÉ ÎÏÍÅÒÁ ÔÉÖΦ×"
-
-#~ msgid "Start of day:"
-#~ msgstr "ðÏÞÁÔÏË ÄÎÑ:"
-
-#~ msgid "TaskPad"
-#~ msgstr "ðÁÎÅÌØ ÚÁ×ÄÁÎØ"
-
-#~ msgid "Time divisions:"
-#~ msgstr "òÏÚĦÌÀ×ÁÞ¦ ÞÁÓÕ:"
-
-#~ msgid "Time format:"
-#~ msgstr "æÏÒÍÁÔ ÞÁÓÕ:"
-
-#~ msgid "Work week"
-#~ msgstr "òÏÂÏÞÉÊ ÔÉÖÄÅÎØ"
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% ÚÁ×ÅÒÛÅÎÎÑ:"
-
-#~ msgid "C_lassification:"
-#~ msgstr "ëÌÁÓÉƦËÁæÑ:"
-
-#~ msgid "Date Completed:"
-#~ msgstr "äÁÔÁ ×ÉËÏÎÁÎÎÑ:"
-
-#~ msgid "High"
-#~ msgstr "÷ÉÓÏËÉÊ"
-
-#~ msgid "In Progress"
-#~ msgstr "÷ÉËÏÎÕ¤ÔØÓÑ"
-
-#~ msgid "Low"
-#~ msgstr "îÉÚØËÉÊ"
-
-#~ msgid "Normal"
-#~ msgstr "ú×ÉÞÁÊÎÉÊ"
-
-#~ msgid "Not Started"
-#~ msgstr "îÅ ÒÏÚÐÏÞÁÔÏ"
-
-#~ msgid "Task"
-#~ msgstr "úÁ×ÄÁÎÎÑ"
-
-#~ msgid "_Contacts..."
-#~ msgstr "ëÏÎÔÁËÔÉ..."
-
-#~ msgid "_Priority:"
-#~ msgstr "ðÒ¦ÏÒÉÔÅÔ:"
-
-#~ msgid "_Status:"
-#~ msgstr "óÔÁÎ:"
-
-#~ msgid "Appointment Basics"
-#~ msgstr "ð¦ÄÓÔÁ×É ÚÕÓÔÒ¦Þ¦"
-
-#~ msgid "Days"
-#~ msgstr "äΦ"
-
-#~ msgid "Every"
-#~ msgstr "ëÏÖÅÎ"
-
-#~ msgid "Exceptions"
-#~ msgstr "÷ÉËÌÀÞÅÎÎÑ"
-
-#~ msgid "Hours"
-#~ msgstr "çÏÄÉÎÉ"
-
-#~ msgid "Mail _to:"
-#~ msgstr "ìÉÓÔ ÄÏ:"
-
-#~ msgid "Minutes"
-#~ msgstr "è×ÉÌÉÎÉ"
-
-#~ msgid "Modify"
-#~ msgstr "úͦÎÉÔÉ"
-
-#~ msgid "No recurrence"
-#~ msgstr "âÅÚ ÐÏ×ÔÏÒÅÎÎÑ"
-
-#~ msgid "Preview"
-#~ msgstr "ðÅÒÅÇÌÑÄ"
-
-#~ msgid "Pri_vate"
-#~ msgstr "ïÓÏÂÉÓÔÅ"
-
-#~ msgid "Pu_blic"
-#~ msgstr "ðÕÂ̦ÞÎÅ"
-
-#~ msgid "Recurrence"
-#~ msgstr "ðÏ×ÔÏÒÅÎÎÑ"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "ðÒÁ×ÉÌÏ ÐÏ×ÔÏÒÅÎÎÑ"
-
-#~ msgid "Reminder"
-#~ msgstr "îÁÇÁÄÕ×ÁÎÎÑ"
-
-#~ msgid "Simple recurrence"
-#~ msgstr "ðÒÏÓÔÅ ÐÏ×ÔÏÒÅÎÎÑ"
-
-#~ msgid "Time"
-#~ msgstr "þÁÓ"
-
-#~ msgid "_Audio"
-#~ msgstr "áÕĦÏ"
-
-#~ msgid "_Mail"
-#~ msgstr "ðÏÛÔÁ"
-
-#~ msgid "_Program"
-#~ msgstr "ðÒÏÇÒÁÍÁ"
-
-#~ msgid "_Run program:"
-#~ msgstr "úÁÐÕÓÔÉÔÉ ÐÒÏÇÒÁÍÕ:"
-
-#~ msgid "_Starting date:"
-#~ msgstr "äÁÔÁ ÐÏÞÁÔËÕ:"
-
-#~ msgid "event-editor-dialog"
-#~ msgstr "ĦÁÌÏÇ ÒÅÄÁËÔÏÒÁ ÐÏÍÉÌÏË"
-
-#~ msgid "for"
-#~ msgstr "×"
-
-#~ msgid "forever"
-#~ msgstr "ÚÁ×ÖÄÉ"
-
-#~ msgid "label21"
-#~ msgstr "label26"
-
-#~ msgid "month(s)"
-#~ msgstr "ͦÓÑÃØ"
-
-#~ msgid "year(s)"
-#~ msgstr "Ò¦Ë"
-
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÌÅÎÄÁÒ × \"%s\""
-
-#, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "ë¦ÎÃÅ×Á ÄÁÔÁ"
-
-#, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "ÓØÏÇÏÄΦ"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "ðÏÛÕË"
-
-#, fuzzy
-#~ msgid "May"
-#~ msgstr "ðÏÎÅĦÌÏË"
-
-#, fuzzy
-#~ msgid "October"
-#~ msgstr "¶ÎÛÁ"
-
-#~ msgid "Attachment properties"
-#~ msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÄÏÌÕÞÅÎÎÑ"
-
-#~ msgid "File name:"
-#~ msgstr "îÁÚ×Á ÆÁÊÌÕ:"
-
-#~ msgid "MIME type:"
-#~ msgstr "ôÉÐ MIME:"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "÷ÉÐÒÁ×ÌÅÎÎÑ ×¦ÒÔÕÁÌØÎÉÈ ÔÅË"
-
-#~ msgid "Filter Rules"
-#~ msgstr "ðÒÁ×ÉÌÁ ƦÌØÔÒÕ×ÁÎÎÑ"
-
-#~ msgid "Virtual Folders"
-#~ msgstr "÷¦ÒÔÕÁÌØΦ ÔÅËÉ"
-
-#, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "ôÅËÉ"
-
-#~ msgid "Save"
-#~ msgstr "úÂÅÒÅÇÔÉ"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
-
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "ðÒÉÂÒÁÔÉ"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "÷¦ÄÎÏ×ÉÔÉ"
-
-#~ msgid "Hide Subject"
-#~ msgstr "ðÒÉÂÒÁÔÉ ÔÅÍÕ"
-
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
-
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "ôÅÍÁ - %s"
-
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "îÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ Wombat"
-
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "æÏÒÍÁÔ"
-
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "îÏ×ÉÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
-
-#~ msgid "You have no mail sources configured"
-#~ msgstr "÷É ÎÅ ÍÁ¤ÔÅÔÅ ÓËÏÎƦ­ÕÒÏ×ÁÎÉÈ ÄÖÅÒÅÌ ÐÏÛÔÉ"
-
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "îÅÍÁ¤ ¦ÎÆÏÒÍÁæ§"
-
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÄÏÌÕÞÅÎÎÑ"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "äÏÄÁÔËÏ×Ï..."
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "áÕÔÅÎƦËÁæÑ:"
-
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "áÕÔÅÎƦËÁæÑ:"
-
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "îÅ ×ÉÄÁÌÑÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÁ"
-
-#, fuzzy
-#~ msgid "Done"
-#~ msgstr "îÅÍÁ¤"
-
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
-
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
-
-#, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
-
-#, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "ðÏ×ÎÁ ÎÁÚ×Á:"
-
-#, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ:"
-
-#, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAP4"
-
-#, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
-
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "ðÏÛÔÁ"
-
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ ͦÓÔÉÔØ"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
-
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
-
-#, fuzzy
-#~ msgid "News"
-#~ msgstr "îÏ×ÉÊ"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "ðÁÒÁÍÅÔÒÉ"
-
-#~ msgid "Organization:"
-#~ msgstr "ïÒ¦¤ÎÔÁæÑ:"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "ðÁÒÏÌØ"
-
-#, fuzzy
-#~ msgid "Remember my password"
-#~ msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅÊ ÐÁÒÏÌØ"
-
-#, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "÷¦ÄÐÏצÄÁÔÉ ÎÁ:"
-
-#, fuzzy
-#~ msgid "Required"
-#~ msgstr "ðÏÔÒ¦ÂΦ ÌÀÄÉ"
-
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "úÂÅÒÅÇÔÉ ÑË VCard"
-
-#, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
-
-#, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Sendmail"
-
-#, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
-
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "óÅÒ×ÅÒ:"
-
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "óÅÒ×ÅÒ:"
-
-#~ msgid "Signature file:"
-#~ msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
-
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
-
-#~ msgid "Sources"
-#~ msgstr "äÖÅÒÅÌÁ"
-
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "ôÉÐ:"
-
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "îÅÍÁ¤ ¦ÎÆÏÒÍÁæ§"
-
-#~ msgid "Username:"
-#~ msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ:"
-
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "È×ÉÌÉÎÁ"
-
-#~ msgid "Full name:"
-#~ msgstr "ðÏ×ÎÁ ÎÁÚ×Á:"
-
-#~ msgid "Email address:"
-#~ msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
-
-#~ msgid "Signature File"
-#~ msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ"
-
-#~ msgid "Server:"
-#~ msgstr "óÅÒ×ÅÒ:"
-
-#~ msgid "Detect supported types..."
-#~ msgstr "÷ÉÚÎÁÞÉÔÉ ÔÉÐÉ, ÝÏ Ð¦ÄÔÒÉÍÕÀÔØÓÑ..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "îÅ ×ÉÄÁÌÑÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÁ"
-
-#~ msgid "Mail source type:"
-#~ msgstr "ôÉÐ ÄÖÅÒÅÌÁ ÐÏÛÔÉ:"
-
-#, fuzzy
-#~ msgid "News source type:"
-#~ msgstr "îÏ×ÉÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
-
-#~ msgid "Add Source"
-#~ msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
-
-#~ msgid "Edit Source"
-#~ msgstr "÷ÉÐÒÁ×ÉÔÉ ÄÖÅÒÅÌÏ"
-
-#~ msgid "Add News Server"
-#~ msgstr "äÏÄÁÔÉ ÓÅÒ×ÅÒ ÎÏ×ÉÎ"
-
-#~ msgid "Edit News Server"
-#~ msgstr "÷ÉÐÒÁ×ÉÔÉ ÓÅÒ×ÅÒ ÎÏ×ÉÎ"
-
-#~ msgid "Testing \"%s\""
-#~ msgstr "ðÅÒÅצÒËÁ \"%s\""
-
-#~ msgid "The connection was successful!"
-#~ msgstr "ú'¤ÄÎÁÎÎÑ ÕÓЦÛÎÅ!"
-
-#~ msgid "Address"
-#~ msgstr "áÄÒÅÓÁ"
-
-#~ msgid "Mail Sources"
-#~ msgstr "ðÏÛÔÏצ ÄÖÅÒÅÌÁ"
-
-#, fuzzy
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#~ msgid "News Servers"
-#~ msgstr "óÅÒ×ÅÒÉ ÎÏ×ÉÎ"
-
-#~ msgid "News Sources"
-#~ msgstr "äÖÅÒÅÌÁ ÎÏ×ÉÎ"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÆÏÒÍÁÔ¦ HTML"
-
-#~ msgid "Delete a contact"
-#~ msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ"
-
-#~ msgid "Find"
-#~ msgstr "úÎÁÊÔÉ"
-
-#~ msgid "Find a contact"
-#~ msgstr "úÎÁÊÔÉ ËÏÎÔÁËÔ"
-
-#~ msgid "Print contacts"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎÔÁËÔÉ"
-
-#~ msgid "Stop"
-#~ msgstr "úÕÐÉÎÉÔÉ"
-
-#~ msgid "Stop Loading"
-#~ msgstr "úÕÐÉÎÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÎÑ"
-
-#~ msgid "View All"
-#~ msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
-
-#~ msgid "View all contacts"
-#~ msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ËÏÎÔÁËÔÉ"
-
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÁÄÒÅÓÎϧ ËÎÉÇÉ..."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎÔÁËÔÉ..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "ðÏÛÕË ËÏÎÔÁËÔ¦×"
-
-#~ msgid "5 Days"
-#~ msgstr "5 äΦ×"
-
-#~ msgid "Ca_lendar"
-#~ msgstr "ëÁÌÅÎÄÁÒ"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "ðÁÒÁÍÅÔÒÉ ËÁÌÅÎÄÁÒÑ..."
-
-#~ msgid "Create a new appointment"
-#~ msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÚÕÓÔÒ¦Þ"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
-
-#~ msgid "Go back in time"
-#~ msgstr "ðÅÒÅÊÔÉ ÎÁÚÁÄ × ÞÁÓ¦"
-
-#~ msgid "Go forward in time"
-#~ msgstr "ðÅÒÅÊÔÉ ×ÐÅÒÅÄ × ÞÁÓ¦"
-
-#~ msgid "Go to"
-#~ msgstr "ðÅÒÅÊÔÉ"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "ðÅÒÅÊÔÉ ÄÏ ×ËÁÚÁÎϧ ÄÁÔÉ"
-
-#~ msgid "Go to present time"
-#~ msgstr "ðÏÐÅÒÅÊÔÉ × ÔÏÞÎÉÊ ÞÁÓ"
-
-#~ msgid "Month"
-#~ msgstr "í¦ÓÑÃØ"
-
-#~ msgid "Open a calendar"
-#~ msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
-
-#~ msgid "Prev"
-#~ msgstr "ðÏ×ÅÒÎÕÔÉÓØ"
-
-#~ msgid "Print this calendar"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ËÁÌÅÎÄÁÒ"
-
-#~ msgid "Save calendar as something else"
-#~ msgstr "úÂÅÒÅÇÔÉ ËÁÌÅÎÄÁÒ ÑË ÝÏÓØ ¦ÎÛÅ"
-
-#~ msgid "Show 1 day"
-#~ msgstr "ðÏËÁÚÁÔÉ 1 ÄÅÎØ"
-
-#~ msgid "Show 1 month"
-#~ msgstr "ðÏËÁÚÁÔÉ 1 ͦÓÑÃØ"
-
-#~ msgid "Show 1 week"
-#~ msgstr "ðÏËÁÚÁÔÉ 1 ÔÉÖÄÅÎØ"
-
-#~ msgid "Show the working week"
-#~ msgstr "ðÏËÁÚÁÔÉ ÒÏÂÏÞÉÊ ÔÉÖÄÅÎØ"
-
-#~ msgid "Week"
-#~ msgstr "ôÉÖÄÅÎØ"
-
-#~ msgid "_New"
-#~ msgstr "îÏ×ÉÊ"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ËÁÌÅÎÄÁÒ"
-
-#~ msgid "_Save As..."
-#~ msgstr "úÂÅÒÅÇÔÉ ÑË..."
-
-#~ msgid "Delete this item"
-#~ msgstr "óÔÅÒÔÉ ÃÅÊ ÅÌÅÍÅÎÔ"
-
-#~ msgid "Delete..."
-#~ msgstr "óÔÅÒÔÉ..."
-
-#~ msgid "Help"
-#~ msgstr "äÏצÄËÁ"
-
-#~ msgid "Print En_velope..."
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎ×ÅÒÔ..."
-
-#~ msgid "Print this item"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ÅÌÅÍÅÎÔ"
-
-#~ msgid "Print..."
-#~ msgstr "äÒÕËÕ×ÁÔÉ..."
-
-#~ msgid "Save _As..."
-#~ msgstr "úÂÅÒÅÇÔÉ ÑË..."
-
-#~ msgid "Save and Close"
-#~ msgstr "úÂÅÒÅÇÔÉ ÔÁ ÚÁËÒÉÔÉ"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "úÂÅÒÅÇÔÉ ËÏÎÔÁËÔ ¦ ÚÁËÒÉÔÉ Ä¦ÁÌÏÇ"
-
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ËÏÎÔÁËÔ ¦ÎÛÏÍÕ..."
-
-#~ msgid "_File"
-#~ msgstr "æÁÊÌ"
-
-#~ msgid "_Print..."
-#~ msgstr "äÒÕËÕ×ÁÔÉ..."
-
-#~ msgid "_Save"
-#~ msgstr "úÂÅÒÅÇÔÉ"
-
-#~ msgid "About this application"
-#~ msgstr "ðÒÏ ÃÀ ÐÒÏÇÒÁÍÕ"
-
-#~ msgid "About..."
-#~ msgstr "ðÒÏ..."
-
-#~ msgid "C_lear"
-#~ msgstr "ïÞÉÓÔÉÔÉ"
-
-#~ msgid "C_ut"
-#~ msgstr "÷ÉÒ¦ÚÁÔÉ"
-
-#~ msgid "Clear"
-#~ msgstr "ïÞÉÓÔÉÔÉ"
-
-#~ msgid "Clear the selection"
-#~ msgstr "ïÞÉÓÔÉÔÉ ×ÉÂÒÁÎÅ"
-
-#~ msgid "Close this appointment"
-#~ msgstr "úÁËÒÉÔÉ ÃÀ ÚÕÓÔÒ¦Þ"
-
-#~ msgid "Copy"
-#~ msgstr "óËÏЦÀ×ÁÔÉ"
-
-#~ msgid "Copy the selection"
-#~ msgstr "óËÏЦÀ×ÁÔÉ ×ÉÂÒÁÎÅ"
-
-#~ msgid "Cut"
-#~ msgstr "÷ÉÒ¦ÚÁÔÉ"
-
-#~ msgid "Cut the selection"
-#~ msgstr "÷ÉÒ¦ÚÁÔÉ ×ÉÂÒÁÎÅ"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ..."
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÆÁÊÌ"
-
-#~ msgid "Find Again"
-#~ msgstr "ûÕËÁÔÉ ÄÁ̦"
-
-#~ msgid "Find _Again"
-#~ msgstr "ûÕËÁÔÉ ÄÁ̦"
-
-#~ msgid "N_ext"
-#~ msgstr "îÁÓÔÕÐÎÉÊ"
-
-#~ msgid "Paste"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ"
-
-#~ msgid "Paste the clipboard"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÂÕÆÅÒ ÏÂͦÎÕ"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ..."
-
-#~ msgid "Print Setup"
-#~ msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ"
-
-#~ msgid "Properties"
-#~ msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦"
-
-#~ msgid "Redo"
-#~ msgstr "ðÏ×ÔÏÒÉÔÉ"
-
-#~ msgid "Redo the undone action"
-#~ msgstr "ðÏ×ÔÏÒÉÔÉ ×¦ÄͦÎÅÎÕ Ä¦À"
-
-#~ msgid "Replace"
-#~ msgstr "úÁͦÎÉÔÉ"
-
-#~ msgid "Replace a string"
-#~ msgstr "úÁͦÎÉÔÉ ÒÑÄÏË"
-
-#~ msgid "Save the current file"
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ"
-
-#~ msgid "Schedule Meeting"
-#~ msgstr "ðÌÁÎÕ×ÁÎÎÑ ÚÕÓÔÒ¦Þ¦"
-
-#~ msgid "Schedule _Meeting"
-#~ msgstr "ðÌÁÎÕ×ÁÔÉ ÚÕÓÔÒ¦Þ"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "ûÕËÁÔÉ ÚÎÏ×ÕÊ ÔÏÊ ÖÅ ÒÑÄÏË"
-
-#~ msgid "Search for a string"
-#~ msgstr "ðÏÛÕË ÒÑÄËÁ"
-
-#~ msgid "Select All"
-#~ msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
-
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "÷ÉÂÒÁÔÉ ÎÁÚ×É"
-
-#~ msgid "Undo"
-#~ msgstr "÷¦ÄͦÎÉÔÉ"
-
-#~ msgid "Undo the last action"
-#~ msgstr "÷¦ÄͦÎÉÔÉ ÏÓÔÁÎÎÀ ÏÐÅÒÁæÀ"
-
-#~ msgid "_About..."
-#~ msgstr "ðÒÏ..."
-
-#~ msgid "_Close"
-#~ msgstr "úÁËÒÉÔÉ"
-
-#~ msgid "_Copy"
-#~ msgstr "óËÏЦÀ×ÁÔÉ"
-
-#~ msgid "_Edit"
-#~ msgstr "òÅÄÁÇÕ×ÁÎÎÑ"
-
-#~ msgid "_Find..."
-#~ msgstr "úÎÁÊÔÉ..."
-
-#~ msgid "_Help"
-#~ msgstr "äÏצÄËÁ"
-
-#~ msgid "_Paste"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ"
-
-#~ msgid "_Print"
-#~ msgstr "äÒÕËÕ×ÁÔÉ"
-
-#~ msgid "_Properties..."
-#~ msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦..."
-
-#~ msgid "_Redo"
-#~ msgstr "ðÏ×ÔÏÒÉÔÉ"
-
-#~ msgid "_Replace..."
-#~ msgstr "úÁͦÎÉÔÉ..."
-
-#~ msgid "_Undo"
-#~ msgstr "÷¦ÄͦÎÉÔÉ"
-
-#~ msgid "Compose"
-#~ msgstr "ð¦ÄÇÏÔÕ×ÁÔÉ"
-
-#~ msgid "Compose a new message"
-#~ msgstr "óËÌÁÓÔÉ ÎÏ×Å ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "óËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÎÏ×Õ ÔÅËÕ"
-
-#~ msgid "F_older"
-#~ msgstr "ôÅËÁ"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "æ¦ÌØÔÒ ×¦ÄÐÒÁ×ÎÉËÁ"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "æ¦ÌØÔÒ ÏÔÒÉÍÕ×ÁÞ¦×"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "úÁÂÕÔÉ ÐÁÒÏ̦"
-
-#~ msgid "Get Mail"
-#~ msgstr "ïÔÒÉÍÁÔÉ ÐÏÛÔÕ"
-
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "ðÒÉÂÒÁÔÉ ÓÔÅÒÔ¦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Hide _Read messages"
-#~ msgstr "ðÒÉÂÒÁÔÉ ÐÒÏÞÉÔÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Hide _Selected messages"
-#~ msgstr "ðÒÉÂÒÁÔÉ ×ÉÂÒÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Mail _Filters..."
-#~ msgstr "ðÏÛÔÏצ ƦÌØÔÒÉ..."
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "ïÐÉÓ:"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÐÒÏÞÉÔÁÎÅ"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÎÅÐÒÏÞÉÔÁÎÅ"
-
-#~ msgid "Move"
-#~ msgstr "ðÅÒÅÎÅÓÔÉ"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "ðÅÒÅÎÅÓÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÎÏ×Õ ÔÅËÕ"
-
-#~ msgid "Previews the message to be printed"
-#~ msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÐÏצÄÏÍÌÅÎÎÑ, ÝÏ ÂÕÄÅ ÎÁÄÒÕËÕ×ÁÎÏ"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ ÐÏצÄÏÍÌÅÎÎÑ..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÁ ÐÒÉÎÔÅÒ¦"
-
-#~ msgid "Print message..."
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ"
-
-#~ msgid "Select _All"
-#~ msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
-
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÞÅÒÇÉ ÔÁ ÏÔÒÉÍÁÔÉ ÎÏצ"
-
-#~ msgid "Show _All messages"
-#~ msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#, fuzzy
-#~ msgid "Threaded Message list"
-#~ msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ צÄÐÒÁ×ÎÉËÁ"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÏÔÒÉÍÕ×ÁÞ¦×"
-
-#~ msgid "_Apply Filters"
-#~ msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ"
-
-#~ msgid "_Copy to Folder..."
-#~ msgstr "óËÏЦÀ×ÁÔÉ × ÔÅËÕ..."
-
-#~ msgid "_Edit Message"
-#~ msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "_Filter on Subject"
-#~ msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
-
-#~ msgid "_Forward"
-#~ msgstr "ðÅÒÅÓÌÁÔÉ"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒ"
-
-#, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
-
-#~ msgid "_Message"
-#~ msgstr "ðÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "_Move to Folder..."
-#~ msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
-
-#~ msgid "_Print Message"
-#~ msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
-
-#~ msgid "_Source"
-#~ msgstr "äÖÅÒÅÌÏ"
-
-#~ msgid "_Undelete"
-#~ msgstr "÷¦ÄÎÏ×ÉÔÉ"
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÔÅÍÉ"
-
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "òÅÄÁËÔÏÒ ×¦ÒÔÕÁÌØÎÉÈ ÔÅË"
-
-#~ msgid "Attach"
-#~ msgstr "äÏÌÕÞÉÔÉ"
-
-#~ msgid "Close the current file"
-#~ msgstr "úÁËÒÉÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ"
-
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "úÁÛÉÆÒÕ×ÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ PGP"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÆÁÊÌ ÑË ÔÅËÓÔ Õ ÐÏצÄÏÍÌÅÎÎÑ"
-
-#~ msgid "Insert text file..."
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔÏ×ÉÊ ÆÁÊÌ..."
-
-#~ msgid "Open a file"
-#~ msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "ûÉÆÒÕ×ÁÎÎÑ PGP"
-
-#~ msgid "PGP Sign"
-#~ msgstr "ð¦ÄÐÉÓ PGP"
-
-#~ msgid "Save As"
-#~ msgstr "úÂÅÒÅÇÔÉ ÑË"
-
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "úÂÅÒÅÇÔÉ × ÔÅæ..."
-
-#~ msgid "Save in folder..."
-#~ msgstr "úÂÅÒÅÇÔÉ × ÔÅæ..."
-
-#~ msgid "Save the current file with a different name"
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ Ú ¦ÎÛÏÀ ÎÁÚ×ÏÀ"
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#~ msgid "Send"
-#~ msgstr "÷¦ÄÐÒÁ×ÉÔÉ"
-
-#~ msgid "Send _Later"
-#~ msgstr "÷¦ÄÐÒÁ×ÉÔÉ Ð¦ÚΦÛÅ"
-
-#~ msgid "Send _later"
-#~ msgstr "÷¦ÄÐÒÁ×ÉÔÉ Ð¦ÚΦÛÅ"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏÛÔÕ × ÆÏÒÍÁÔ¦ HTML"
-
-#~ msgid "Send the message later"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ð¦ÚΦÛÅ"
-
-#~ msgid "Send the message now"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
-
-#~ msgid "Send this message now"
-#~ msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
-
-#~ msgid "Show / hide attachments"
-#~ msgstr "ðÏËÁÚÁÔÉ / ÐÒÉÂÒÁÔÉ ÄÏÌÕÞÅÎÎÑ"
-
-#~ msgid "Show _attachments"
-#~ msgstr "ðÏËÁÚÁÔÉ ÄÏÌÕÞÅÎÎÑ"
-
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "ð¦ÄÐÉÓÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ×ÁÛÉÍ ËÌÀÞÅÍ PGP"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔÏ×ÉÊ ÆÁÊÌ..."
-
-#~ msgid "_Open..."
-#~ msgstr "÷¦ÄËÒÉÔÉ..."
-
-#~ msgid "Refresh List"
-#~ msgstr "ïÎÏ×ÉÔÉ ÓÐÉÓÏË"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "ïÎÏ×ÉÔÉ ÓÐÉÓÏË ÔÅË"
-
-#~ msgid "Display a different folder"
-#~ msgstr "÷¦ÄÏÂÒÁÚÉÔÉ ¦ÎÛÕ ÔÅËÕ"
-
-#~ msgid "E_xit"
-#~ msgstr "÷ÉÊÔÉ"
-
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evolution - %s"
-
-#~ msgid "Exit the program"
-#~ msgstr "÷ÉÊÔÉ Ú ÐÒÏÇÒÁÍÉ"
-
-#, fuzzy
-#~ msgid "Getting _Started"
-#~ msgstr "þÁÓ ÐÏÞÁÔËÕ ÚÕÓÔÒ¦Þ¦:"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "ðÏËÁÚÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ Evolution"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "ðÏËÁÚÁÔÉ ÐÁÎÅÌØ ÔÅË"
-
-#~ msgid "Submit _Bug Report"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ Ú×¦Ô ÐÒÏ ÐÏÍÉÌËÕ"
-
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ Ú×¦Ô ÐÒÏ ÐÏÍÉÌËÕ ×ÉËÏÒÉÓÔÏ×ÕÀÞÉ Bug Buddy"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "ðÅÒÅÍÉËÎÕÔÉ ÓÔÁÎ ÐÏËÁÚÕ ÐÁÎÅ̦ ÔÅË"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ ËÁÌÅÎÄÁÒÑ"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ ÐÏÛÔÏ×ϧ ÐÒÏÇÒÁÍÉ"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "ðÒÏ Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "úÕÓÔÒ¦Þ"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "ëÏÎÔÁËÔ"
-
-#~ msgid "_Folder"
-#~ msgstr "ôÅËÁ"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "ðÅÒÅÊÔÉ ÎÁ ÔÅËÕ..."
-
-#~ msgid "_Index"
-#~ msgstr "ðÏËÁÖÞÉË"
-
-#~ msgid "_Settings"
-#~ msgstr "õÓÔÁÎÏ×ËÉ"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "úÁ×ÄÁÎÎÑ"
-
-#~ msgid "Available Categories:"
-#~ msgstr "äÏÓÔÕÐΦ ËÁÔÅÇÏÒ¦§:"
-
-#~ msgid "Headings:"
-#~ msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ:"
-
-#~ msgid "Appointments:"
-#~ msgstr "úÕÓÔÒ¦Þ¦:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "þÉÓÌÁ ÄΦ×:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "þÉÓÌÏ ÐÏÔÏÞÎÏÇÏ ÄÎÑ:"
-
-#~ msgid "Deleted"
-#~ msgstr "óÔÅÒÔÏ"
-
-#~ msgid "Draft"
-#~ msgstr "þÏÒÎÏ×ÉË"
-
-#~ msgid "Mail Source"
-#~ msgstr "äÖÅÒÅÌÏ ÐÏÛÔÉ"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "÷¦ÄÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ \"%s\""
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "÷ÉËÒÅÓÌÉÔÉ \"%s\""
-
-#, fuzzy
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#, fuzzy
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#, fuzzy
-#~ msgid "Marking message %d of %d"
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "óËÁÎÕ×ÁÔÉ ÔÅËÉ × \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "äÏÌÕÞÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "äÏÌÕÞÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎØ \"%s\""
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ \"%s\""
-
-#~ msgid "Load \"%s\""
-#~ msgstr "úÁ×ÁÎÔÁÖÉÔÉ \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "óÔ×ÏÒÅÎÎÑ \"%s\""
-
-#~ msgid "Create \"%s\""
-#~ msgstr "óÔ×ÏÒÉÔÉ \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "óÉÎÈÒÏΦÚÕ×ÁÔÉ \"%s\""
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "÷¦ÄËÒÉ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "÷¦ÄËÒÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
-
-#~ msgid "Loading %s Folder"
-#~ msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÅËÉ %s"
-
-#~ msgid "Load %s Folder"
-#~ msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÔÅËÕ %s"
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "÷¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
-
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "úÂÅÒÅÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÔÁËÉ \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "ðÅÒÅÂÕÄÕ×ÁÎÎÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "ðÅÒÅÂÕÄÕ×ÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"
diff --git a/po/update.sh b/po/update.sh
deleted file mode 100755
index f16601f81b..0000000000
--- a/po/update.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-#
-#  Script for translators not being able to run autogen.sh
-#
-#  Copyright (C) 2000 Free Software Foundation.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This script is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-
-PACKAGE=evolution
-
-DEPENDS=$(which xml-i18n-toolize 2> /dev/null)
-
-if [ "$DEPENDS" = "" -o ! -x "$DEPENDS" ] ;
-   then echo "The xml-i18n-tools system is not installed or in path!"
-        echo
-        echo "The module $PACKAGE requires this inplimentation, which"
-        echo "can be found at:"
-        echo
-        echo "  ftp://ftp.gnome.org/pub/GNOME/stable/xml-i18n-tools "
-        echo
-        echo "Please install before trying to update the translations"
-        echo "again..."
-        echo
-        exit
-fi
-
-XMLDIR=$(which xml-i18n-toolize | sed s@/bin/xml-i18n-toolize@@)
-XML_I18N_EXTRACT="$XMLDIR/share/xml-i18n-tools/xml-i18n-extract"
-XML_I18N_UPDATE="$XMLDIR/share/xml-i18n-tools/xml-i18n-update"
-PACKAGE=$PACKAGE XML_I18N_EXTRACT=$XML_I18N_EXTRACT \
-$XML_I18N_UPDATE $1
diff --git a/shell/.cvsignore b/shell/.cvsignore
deleted file mode 100644
index a8aeb0faec..0000000000
--- a/shell/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-evolution
-evolution.pure
-Makefile.in
-Makefile
-Evolution-stubs.c
-Evolution-skels.c
-Evolution-common.c
-Evolution.h
-GNOME_Evolution_Shell.oaf
diff --git a/shell/ChangeLog b/shell/ChangeLog
deleted file mode 100644
index 3843f23c1b..0000000000
--- a/shell/ChangeLog
+++ /dev/null
@@ -1,3881 +0,0 @@
-2001-02-27  Dan Winship  <danw@ximian.com>
-
-	* main.c (development_warning): Update this again.
-
-2001-02-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Evolution-Shell.idl: Rename `FolderTypeList' to
-	`FolderTypeNameList' as it was confusing.
-
-	* Evolution-ShellComponent.idl: New members
-	`accepted_dnd_mime_types' and `exported_dnd_mime_types' in `struct
-	FolderType'.
-
-2001-02-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-storage.c (folder_changed_cb): Don't free a const pointer.
-
-2001-02-23  Iain Holmes  <iain@ximian.com>
-
-	* e-local-storage.c (construct): Connect to the create-folder signal.
-	(impl_async_create_folder): Move this into the real_do_folder_create
-	function.
-	(real_do_folder_create): Function that creates the folder.
-	(create_folder_cb): Creates the folder form a callback.
-
-2001-02-21  Michael Meeks  <michael@ximian.com>
-
-	* importer/importer.c: add include.
-	(show_import_wizard): update signature to that of a verb.
-
-	* evolution-shell-component.c (corba_class_init): move into
-	(class_init): here & upd.
-	(evolution_shell_component_construct): upd.
-	(create_servant): kill.
-	(E_MAKE_TYPE) -> E_MAKE_X_TYPE.
-
-2001-02-20  Dan Winship  <danw@ximian.com>
-
-	* e-folder.c (_EFolderPrivate): split "highlighted" into
-	self_highlight and child_highligh.
-	(e_folder_get_highlighted): Return TRUE if either self_highlight
-	is true or any child is highlighted.
-	(e_folder_set_child_highlight): New function to tell the folder
-	about a child highlight change.
-
-	* e-storage.c (folder_changed_cb): Update child highlights
-	correctly on folders so that folders will be highlighted whenever
-	their children are.
-
-2001-02-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* e-shell-view-menu.c (file_verbs): Cast this fucntion pointer.
-
-	* e-storage-set-view.c (ETABLE_SPEC): Turn on horizontal scrolling
-	here.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_async_copy_folder): Commented out this unused
-	function.
-
-	* evolution-storage.c (storage_gtk_to_corba_result): Removed an
-	unused variable here.
-
-	* importer/importer.c: Include gal/widets/e-gui-utils.h.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* Evolution-Storage.idl: add asyncCreateFolder and
-	asyncRemoveFolder interfaces. (Use Bonobo::Listener rather than
-	creating a new listener interface.)
-
-	* Evolution-LocalStorage.idl: Remove the
-	Evolution::LocalStorageOpsListener interface, which wasn't being
-	used.
-
-	* evolution-storage.c (impl_Storage_async_create_folder,
-	impl_Storage_async_remove_folder): implement by emitting signals
-	on the EvolutionStorage object. Convert from
-	EvolutionStorageResult to GNOME_Evolution_Storage_Result (blah!)
-	(class_init): Set up the new "create_folder" and "remove_folder"
-	signals.
-
-	* e-corba-storage.c (async_create_folder, async_remove_folder):
-	Implement, using the new Evolution::Storage IDL. Convert from
-	GNOME_Evolution_Storage_Result to EStorageResult (blah!)
-
-	* e-storage-set.c (e_storage_set_async_create_folder): Don't allow
-	a NULL description (since it doesn't allow a NULL anythign else).
-
-	* e-shell-folder-creation-dialog.c (dialog_clicked_cb): Pass ""
-	rather than NULL for the description.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Shell.oaf.in: Mark strings for translation.
-	
-2001-02-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view-menu.c: Moved the author list to the top of the
-	file.
-	(command_about_box): Display the `SUB_VERSION' as well.
-
-2001-02-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (dialog_clicked_cb): Destroy
-	the dialog instead of using `gnome_dialog_close()'.
-	(dialog_clicked_cb): Likewise.
-	(dialog_close_cb): Removed.
-	(e_shell_show_folder_creation_dialog): Don't connect to the
-	"close" signal anymore.
-
-	* e-shell-folder-selection-dialog.c
-	(folder_creation_dialog_result_cb): New callback.  Set the default
-	folder to be the newly created one.
-	(impl_clicked): Use it.
-
-	* e-shell-folder-creation-dialog.c: Add members `folder_path',
-	`result_callback' and `result_callback_data' to `struct
-	_DialogData'.
-	(e_shell_show_folder_creation_dialog): New args @result_callback
-	and @result_callback_data.
-	(async_create_cb): Notify the result through the specified
-	callback.
-	(dialog_clicked_cb): Likewise.  Set the `folder_path' in the
-	DialogData so that we can pass it over when we get the async
-	notification of the result of the operation.
-
-	* e-shell-folder-creation-dialog.h: New type
-	`EShellFolderCreationDialogCallback'.
-
-	* e-storage-set-view.c (e_storage_set_view_set_current_folder):
-	Show the node too, using `e_tree_model_show_node()'.
-
-2001-02-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-setup.c (copy_default_stuff): s/first time you run/first time
-	you are running/.
-
-2001-02-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-component-registry.h: Don't #include <config.h>.
-	* e-corba-storage-registry.h: Likewise.
-	* e-corba-storage.h: Likewise.
-	* e-folder-type-registry.h: Likewise.
-	* e-folder.h: Likewise.
-	* e-local-folder.h: Likewise.
-	* e-local-storage.h: Likewise.
-	* e-shell-folder-title-bar.h: Likewise.
-	* e-shell-view.h: Likewise.
-	* e-shell.h: Likewise.
-	* e-shortcuts-view.h: Likewise.
-	* e-shortcuts.h: Likewise.
-	* e-splash.h: Likewise.
-	* e-storage-set-view.h: Likewise.
-	* e-storage-set.h: Likewise.
-	* e-storage.h: Likewise.
-	* evolution-local-storage.h: Likewise.
-	* evolution-session.h: Likewise.
-	* evolution-shell-client.h: Likewise.
-	* evolution-shell-component.h: Likewise.
-	* evolution-shell-view.h: Likewise.
-	* evolution-storage-listener.h: Likewise.
-	* evolution-storage.h: Likewise.
-
-2001-02-02  Iain Holmes  <iain@ximian.com>
-
-	* importer/evolution-importer-client.c:
-	(evolution_importer_client_new_from_id): Free the CORBA_Environment.
-
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c: (start_import): Added a notice if there is no
-	importer that can handle the file.
-	(get_iid_for_filetype): Free the list of multiple items before returning.
-	(importer_timeout_fn): Removed notice.
-	(import_cb): Removed notice.	
-
-2001-01-30  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c: Added a nasty hack to change the druids Finish
-	button to be Import.
-
-	* importer/import.glade: Remove the FIXME warning.
-
-2001-01-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* importer/importer.c: Fixed some typos.
-	
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-creation-dialog.c (add_storage_set_view): Set the
-	shadow type to be `GTK_SHADOW_IN' in the EScrollFrame.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (storage_set_view_box_button_release_event_cb):
-	Don't pop down the folder bar if the button release happens in the
-	e-paned's handle.
-	(storage_set_view_box_button_release_event_cb): Changed the return
-	value to be int.  Stupid me.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* e-shortcuts-view.h: Fix #include to point to gal instead of
-	widgets/shortcut-bar/
-	
-	* e-shortcuts.c: Here too.
-	* e-shortcuts-view-model.h: And lastly here.
-	
-	* Makefile.am (evolution_LDADD): Don't link with the old
-	widgets/shortcut-bar/libshortcut-bar.la anymore, gal has the new
-	shortcut-bar.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (get_pixbuf_for_folder): Don't scale if the
-	size is the same.  `gdk_pixbuf_scale()' seems to be blurring the
-	image even if the scaling factor is 1.0.
-
-2001-01-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c: Remove all instances of `__FUNCTION__'.
-	* e-folder-tree.c: Likewise.
-	* e-folder-type-registry.c: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shell-view-menu.c: Likewise.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (e_shell_view_construct): Connect the
-	"updated_folder" with `gtk_signal_connect_while_alive()' so that
-	it gets disconnected when the shell view dies.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* e-shell-view-menu.c (command_close): New function, destroys the
-	current view.
-
-	* e-shell.c (view_destroy_cb): Make sure shell settings get saved
-	when the last view is destroyed.
-	
-2001-01-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* importer/GNOME_Evolution_Importer.idl: Fix missing ';'.
-	
-2001-01-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-corba-storage.c (impl_StorageListener_update_folder): Don't
-	call `e_storage_updated_folder()' as it's supposed to happen
-	automatically now.
-
-	* e-storage.c (e_storage_updated_folder): Removed.
-	(folder_changed_cb): New callback for the "changed" signal on the
-	EFolders.
-	(e_storage_new_folder): Connect it.
-
-	* e-folder-tree.c: New member `data_to_path' in `EFolderTree'.
-	(e_folder_tree_new): Init here.
-	(e_folder_tree_destroy): Destroy it here.
-	(e_folder_tree_add): Add to the `data_to_path' hash.  Make sure
-	we are not adding the same folder twice.
-	(remove_folder): Remove from the `data_to_path' hash.
-	(e_folder_tree_get_path_for_folder): New.
-
-	* e-shell-view.c (e_shell_view_construct): Don't connect to the
-	"folder_updated" signal of the local storage anymore.
-	(folder_updated_cb): Removed.
-	(updated_folder_cb): New.
-	(e_shell_view_construct): Connect it to the "updated_folder"
-	signal.
-
-	* e-local-storage.c: Remove `FOLDER_UPDATED' enum value and the
-	`signals' variable, as we don't want to define any custom signals
-	here anymore.
-	(bonobo_interface_update_folder_cb): No need to emit the
-	"folder_updated" signal here.  The base class will take care of
-	this already.
-	(class_init): Don't install the "folder_updated" signal here.
-
-	* e-local-storage.h: Removed signal "folder_updated".  It is not
-	necessary, as we already have an `updated_folder' in `EStorage',
-	which is the parent class of `ELocalStorage'.
-
-2001-01-24  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Removed the busy exception.
-
-2001-01-19  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Make the processItem oneway.
-	Make the Listener interface inherit from Bonobo::Unknown.
-
-	* importer/evolution-importer-client.[ch]: Remove all the crap to deal
-	with creating the Listener object.
-
-	* importer/evolution-importer-listener.[ch]: A new bonobo object to 
-	implement the ImporterListener interface.
-
-	* importer/importer.c: Fix it up to use the new Listener object.
-
-2001-01-18  Iain Holmes  <iain@ximian.com>
-
-	* e-shortcuts-view.c (show_new_group_dialog): Don't make the dialog
-	modal. 
-
-2001-01-16  Iain Holmes  <iain@ximian.com>
-
-	* importer/GNOME_Evolution_Importer.idl: Removed the ImporterFactory
-	interface and put the methods from it into the Importer interface.
-
-	* importer/evolution-importer-factory.[ch]: Removed.
-
-	* importer/evolution-importer.[ch]: Added the new methods.
-	Added inline documentation for all public functions.
-
-	* importer/evolution-importer-client.[ch]: Added new client support for
-	the new methods.
-	Added inline documentation for all public functions.
-
-	* importer/importer.c (create_plugin_menu): Changed the query to look for
-	IDL:GNOME/Evolution/Importer:1.0.
-	(start_import): Do all CORBA methods through the EvolutionImporterClient.
-	(get_iid_for_filetype): Change query to search for 
-	IDL:GNOME/Evolution/Importer:1.0.
-
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* evolution-storage.c (evolution_storage_folder_exists): New
-	function. Obvious.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #883: Shortcut bar does not update when a folders display
-	 name changes)
-
-	* e-local-storage.c (class_init): Define a new "folder_updated"
-	signal here.
-	(bonobo_interface_update_folder_cb): Emit the new folder_updated
-	signal here.
-
-	* e-shell-view.c (e_shell_view_construct): Connect the
-	EShell::ELocalStorage folder_updated signal here.  Also connect
-	the updated_folder signal coming from EShell::EStorageSet to the
-	new callback.
-
-	* e-shell-view.c (folder_updated_cb): Callback that actually
-	initiates the shell updating.
-	
-	* e-shortcuts.c (e_shortcuts_update_shortcut_by_uri): New
-	function.  Given a URI for a shortcut bar item, we'll update it.
-
-	* e-shortcuts.c (e_shortcuts_remove_shortcut_by_uri): New
-	function.  Given a URI for a shortcut bar item, we'll remove it.
-
-	* e-shortcuts.c (removed_folder_cb): Connect this callback that
-	will remove a renamed vfolder from the shortcut bar.  Temporary
-	fix to the problem of renaming vfolders and having the shortcut
-	bar think the old vfolder still exists.
-	
-	(Bug #1168: Shortcut bar and icon size persistence)
-	
-	* e-shell-view.c (save_shortcut_bar_icon_modes): New static
-	function, save the icon modes (for all shortcut bar groups, even
-	though we only have one group now).
-	(load_shortcut_bar_icon_modes): New static function, load the
-	saved shortcut bar group icon modes and apply them to our shortcut
-	bar.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* importer/evolution-importer.h: Use "typedef enum { ... } Blah;"
-	instead of "typedef enum _Blah Blah; enum _Blah { ... };" so that
-	gtk-doc can parse it.  Sigh.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_construct): Set the shadow type
-	for the EScrollFrame.  Also, make the EStorageSetView widget grab
-	the focus.  For some reason it doesnt' seem to work, but I'll
-	blame ETree for now.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-shell-view.c (update_for_current_uri): Display the folder name
-	before "Evolution" instead of after it.  Also, display the
-	sub-version string if it was defined when configuring.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.c (table_drag_drop): Don't emit the
-	"dnd_action" signal here.  Instead, do a `gtk_drag_get_data()' to
-	retrieve information about the drop.
-	(table_drag_data_received): New, implementation for
-	`ETable::table_drag_data_received'.
-	(class_init): Install it.
-	(table_drag_data_get): Use `unsigned int' instead of `guint' for
-	consistency.
-	(table_drag_motion): Same here.  Also use `int' instead of `gint'.
-	(table_drag_drop): Likewise.
-	(treepath_compare): Likewise.
-	(marshal_NONE__ENUM_STRING_STRING_STRING): Removed.
-	(marshal_NONE__GDKDRAGACTION_STRING_STRING_STRING): New.
-	(class_init): Use it; update signal "dnd_action" so that it passes
-	a `GdkDragAction *' instead of .
-
-	* e-storage-set-view.h: Change signal "::dnd_action" so that it
-	provides a `GdkDragContext' instead of just a `GdkDragAction'.
-
-2001-01-16  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): set config
-	path on window.
-
-2001-01-16  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_new): pop the
-	visual/cm after the construct
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_new): push/pop
-	the color map
-	(e_shell_folder_title_bar_new): and the visual...
-
-2001-01-15  Iain Holmes  <iain@ximian.com>
-
-	* importer/importer.c (import_druid_cancel): Just destroy the wizard.
-	All other freeing code is moved into import_druid_destroy.
-	(show_import_wizard): Connect the destroy signal to import_druid_destroy.
-	(start_import): Connect to the destroy signal of the dialog and the
-	clicked as well.
-	(dialog_destroy_cb): Stop the import after the current item has finished.
-	(dialog_clicked_cb): Stop the import.
-	(import_cb): Only process the next item if the dialog hasn't been stopped.
-	Destroy the dialog if it hasn't been destroyed already.
-
-	* e-splash.c (e_splash_construct): Set the window title to Evolution.
-
-2001-01-13  Jason Leach  <jasonleach@usa.net>
-
-	(Fix bug #934: Add Right-click item to hide the shortcut bar)
-
-	* e-shortcuts-view.c (class_init): Create a new hide_requested
-	signal.
-	(hide_shortcut_bar_cb): New function that gets called from the
-	right click menu items, it emits the hide_requested signal.
-
-	* e-shell-view.c (setup_widgets): Connect the hide_requested from
-	the shortcut bar.
-	(hide_requested_cb): New function.
-
-2001-01-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-storage-set-view.h: New signal `dnd_action'.
-
-	* e-storage-set-view.c: Renamed `drag_types' to
-	`source_drag_types' and `num_drag_types' to
-	`num_source_drag_types'.  New variables `destination_drag_types'
-	and `num_destination_drag_types'.
-	(e_storage_set_view_construct): Set the ETree as a drag
-	destination.  Allow both GDK_ACTION_MOVE and GDK_ACTION_COPY.
-
-	* e-storage-set-view.c (table_drag_begin): Renamed from
-	`etable_drag_begin'.
-	(table_drag_data_get): Renamed from `etable_drag_data_get'.
-	Changed to be a method override instead of a signal handler.
-	(table_drag_motion): New; implementation for the
-	`ETable::table_drag_motion' method. Changed to be a method
-	override instead of a signal handler.
-	(table_drag_drop): New, implementation for `::table_drag_drop'.
-	(cursor_change): Renamed from `on_cursor_change'.
-	(e_storage_set_view_construct): Don't connect the signals here.
-	(class_init): Instead, override the methods here.  Also, install
-	our override for `::table_drag_motion' and for
-	`::table_drag_drop'.
-	(right_click): Changed to be a method instead of a signal handler.
-	(cursor_change): Likewise.
-
-2001-01-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-shell.c (e_shell_construct): Unref our copy, and then destroy.
-
-	* e-splash.c (e_splash_set_icon_highlight): Do not execute code if
-	we have been destroyed.
-	(e_splash_add_icon): ditto.
-
-2001-01-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-splash.c (e_splash_construct): Ok, talked to Ettore.  Going
-	back to TOPLEVEL non-POPUP.
-	(e_splash_construct): Remove nice toplevel window.
-
-2001-01-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c: Add member `copy_folder_fn' to
-	`EvolutionShellComponentPrivate'.
-	(init): Init to NULL.
-	(impl_ShellComponent_async_copy_folder): New function,
-	implementation for `::asyncCopyFolder'.
-	(evolution_shell_component_construct): New arg @copy_folder_fn.
-	Set the corresponding member in `EvolutionShellComponentPrivate'.
-	(evolution_shell_component_new): New arg @copy_folder_fn.  Pass it
-	to `evolution_shell_component_construct'.
-
-	* evolution-shell-component.h: New type
-	`EvolutionShellComponentCopyFolderFn'.
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Evolution-ShellComponent.idl: Add method `::removeFolderAsync'.
-
-2001-01-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-shell-component.c (corba_class_init):
-	s/addFolderAsync/createFolderAsync/.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_async_create_folder):
-	s/addFolderAsync/createFolderAsync/.
-
-	* Evolution-ShellComponent.idl: Rename `addFolder' into
-	`createFolder'.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* importer/.cvsignore: Create
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* e-storage-set-view.c: Added translation strings.
-
-	* e-shell-view-menu.c (command_about_box): Update our name
-	(command_new_mail_message): Remove "window"
-	from the moniker path.
-
-	* e-splash.c (e_splash_construct): Make the spalsh screen a
-	toplevel instead of a popup.
-
-2001-01-11  Dan Winship  <danw@ximian.com>
-
-	* e-shell-view.c (show_existing_view): Remove the "Already have
-	view for..." message. People keep assuming it's an error.
-
-2001-01-11  Iain Holmes  <iain@ximian.com>
-
-	* importer/*: New directory containing the importer framework.
-
-	* e-shell-view-menu.c (file_verbs): Add the FileImporter verb.
-
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Fix prototype
-	(command_new_view): ditto.
-	(command_new_mail_message): Implement command_new_mail_message.
-
-	verbs: Use BONOBO_UI_VERB instead of BONOBO_UI_UNSAFE_VERB
-
-2001-01-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_update_folder_by_uri):
-	New function to update a folder given its URI. Plus associated
-	changes to other functions to keep track of the path<->URI
-	mappings.
-
-2000-12-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Make sure the
-	`*uri_return' and `*physical_uri_return' are always initialized on
-	return, as that's what the caller expects.
-
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* e-shell-view-menu.c (command_run_bugbuddy): Fix a crash when the
-	user tries to "Submit bug report" but doesn't have bug-buddy
-	installed.  Bug #633.
-
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* e-setup.c (copy_default_stuff): Make the "Evolution
-	installation" dialog resizable. Bug #742.
-	(check_evolution_directory): Here too.
-
-2000-12-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Modify to suit the
-	new double click callback signature. Destroy the dialog after the double
-	click as well.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (development_warning): Slightly updated the text for the
-	release.
-
-2000-12-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-splash.c (ICON_Y): Update for the size of the new splash.
-
-2000-12-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-splash.c (button_press_event): Return TRUE as we have handled
-	the event.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (get_control_for_uri): Pass path+1 rather than
-	path to get_type_for_storage, to match the convention used by its
-	other callers.
-
-2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-splash.c (e_splash_construct): Connect a button-press-event
-	signal on the splash screen so users can click it to hide it.
-	(button_press_event): New callback to hide the splash screen.
-
-2000-12-11  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (get_type_for_{folder,storage}): return NULL if
-	no {folder,storage} is found.
-	(get_control_for_uri): return NULL if no folder_type is found.
-
-2000-12-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Ooops.  We were
-	reffing a bogus pointer that was not assigned yet.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Updated according to the new IDL.
-
-	* e-local-storage.c (construct): Pass `NULL' to
-	`e_storage_construct' as the @toplevel_node_type arg.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new_for_objref): New.
-	(evolution_shell_component_client_new): Refactored to use it.
-
-	* e-corba-storage.c (e_corba_storage_construct): New arg
-	@toplevel_node_type.  Pass it to `e_storage_construct'.
-	(e_corba_storage_new): New arg @toplevel_node_type.  Pass it to
-	`e_corba_storage_construct'.
-
-	* e-storage.c: New member `toplevel_node_uri_type' in
-	`EStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Unref.
-	(e_storage_construct): New arg @toplevel_node_type.  Set the
-	private member value accordingly.
-	(e_storage_new): New arg @toplevel_node_type.  Pass to
-	`e_storage_construct'.
-	(e_storage_get_toplevel_node_type): New.
-
-	* e-shell-view.c (get_physical_uri_for_evolution_uri): New arg
-	@shell_view.
-	(get_physical_uri_for_storage): Filled in.  New arg @shell_view.
-	(get_physical_uri_for_folder): Filled in.  New arg @shell_view.
-
-	* evolution-local-storage.c (evolution_local_storage_construct):
-	Pass `NULL' as the @toplevel_node_type arg to
-	`evolution_storage_construct'.
-
-	* evolution-storage.c: New member `toplevel_node_type' in
-	`EvolutionStoragePrivate'.
-	(destroy): Free.
-	(init): Init to NULL.
-	(evolution_storage_construct): New arg @toplevel_node_handler
-	to initialize the corresponding field in `->priv'.
-	(evolution_storage_new): New arg @toplevel_node_type.  Pass
-	it to `evolution_storage_construct'.
-	(evolution_storage_register): Pass the @toplevel_node_type
-	arg to `::addStorage'.
-
-	* Evolution-Storage.idl: Add arg @toplevel_node_type to
-	`StorageRegistry::addStorage'.
-
-	* main.c (new_view_on_running_shell): Deal with an exception in
-	`::createNewView' gracefully.
-
-	* e-shell-view.c (switch_on_folder_tree_click): New.
-	(folder_selected_cb): Refactored to use it.
-	(storage_selected_cb): Use it.
-
-2000-12-07  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (oaf_DATA): update to GNOME_Evolution_Shell.oafinfo
-
-	* e-shell.h: upd.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Evolution-StorageSetView.idl: Arg @uri renamed to @name in
-	`StorageSetViewListener::notifyStorageSelected'.
-
-	* evolution-storage-set-view.c
-	(storage_set_view_widget_storage_selected_cb): Renamed arg @uri to
-	@name.
-
-	* e-storage-set-view.c (on_cursor_change): Only emit the name of
-	the storage for the "storage_selected" signal [i.e. remove the
-	leading slash].
-
-	* e-shell-view.c (storage_selected_cb): New callback for the
-	"storage_selected" signal on the EStorageSetView used for the
-	folder tree.
-	(setup_storage_set_subwindow): Connect it.
-
-	* evolution-local-storage.c (evolution_local_storage_construct):
-	Pass NULL as the @toplevel_node_uri arg to
-	`evolution_storage_construct()'.
-
-	* evolution-storage.c: New member `toplevel_node_uri' in
-	`EvolutionStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(evolution_storage_construct): New arg @toplevel_node_uri.  Set
-	the @toplevel_node_uri member in the private part to its value.
-	(evolution_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`evolution_storage_construct()'.
-	(evolution_storage_register): Pass the @toplevel_node_uri value to
-	the `::addStorage' CORBA method.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	New arg @toplevel_node_uri, to go with the IDL change.
-
-	* Evolution-Storage.idl (StorageRegistry::addStorage): New arg
-	@toplevel_node_uri.
-
-	* e-local-storage.c (construct): Pass NULL as the
-	@toplevel_node_uri arg to `e_storage_construct()'.
-
-	* e-corba-storage.c (e_corba_storage_construct): New arg
-	@toplevel_node_uri.  Pass it to `e_storage_construct()'.
-	(e_corba_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`e_corba_storage_construct()'.
-
-	* e-storage.c: New member `toplevel_node_uri' in
-	`EStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(e_storage_construct): New arg @toplevel_node_uri.  Set the
-	`toplevel_node_uri' member in the private part to its value.
-	(e_storage_new): New arg @toplevel_node_uri.  Pass it to
-	`e_storage_construct()'.
-	(e_storage_get_toplevel_node_uri): New.
-
-	* e-corba-storage-registry.c (impl_StorageRegistry_addStorage):
-	Renamed from `impl_StorageRegistry_register_storage'.
-	(impl_StorageRegistry_removeStorageByName): Renamed from
-	`impl_StorageRegistry_unregister_storage'.
-	(corba_class_init): Updated accordingly.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (new_view_on_running_shell): Don't crash if the object
-	returned from `oaf_activate_from_id' is NIL and the exception
-	isn't set.  Just handle this as a normal error condition.
-
-2000-12-04  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (get_control_for_uri): return NULL if we can't
-	create a view.
-	(setup_evolution_shell_view_interface): add precondition.
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Ref the
-	shortcuts.
-
-	* main.c (new_view_on_running_shell): New.
-	(idle_cb): If the shell cannot be created, then call
-	`new_view_on_running_shell'.
-
-	* e-shell-view.c: New member `shell_view_interface' in
-	`EShellViewPrivate'.
-	(init): Init to NULL.
-	(setup_evolution_shell_view_interface): Set up.
-	(destroy): Unref.
-
-	* e-shell.c (impl_Shell_getComponentByType): Renamed from
-	`impl_Shell_get_component_for_type'.
-	(impl_Shell_selectUserFolder): Renamed from
-	`impl_Shell_user_select_folder'.
-	(impl_Shell_getLocalStorage): Renamed from
-	`impl_Shell_get_local_storage'.
-	(impl_Shell_createStorageSetView): Renamed from
-	`impl_Shell_create_storage_set_view'.
-	(corba_class_init): Updated accordingly.
-	(impl_Shell_createNewView): New, implementation for the
-	`createNewView' CORBA method.
-	(corba_class_init): Install it.
-
-	* Evolution-Shell.idl: New method `::createNewView'.
-
-	* e-shell.c (register_shell): New.
-	(e_shell_construct): Return value changed to `gboolean'.  New arg
-	@iid.  Construct the Bonobo object before displaying the splash,
-	then try to register it with the specified @iid.  If registration
-	fails, return %FALSE.  Otherwise, just do everything normally and
-	return %TRUE.
-	(e_shell_new): Pass the OAFIID to `e_shell_construct()'.  If it
-	fails, unref the object and return NULL.
-
-	* evolution.oafinfo: New.
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Add myself, anna, jesse
-
-2000-11-15  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell.c (e_shell_component_maybe_crashed): de-register
-	a component's UI if it dies.
-
-2000-11-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (idldir): Install our IDL's into $(datadir)/idl.
-
-2000-11-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-setup.c (check_dir_recur): Plug leaks of the fullname and
-	fulldefaultname.
-	(check_evolution_directory): Plug leaks of defaultdir and newfiles
-	and the list's data; made the code have a single return point.
-
-	* e-shell.c (e_shell_restore_from_settings): Plug leak of prefix.
-	(corba_class_init): Plug leak; we were not assigning the
-	vepv->_base_epv.
-
-	* evolution-storage.c (corba_class_init): Likewise.
-
-	* evolution-local-storage.c (corba_class_init): Likewise.
-
-2000-11-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent__get_supported_types): Plug leak; mark the
-	CORBA sequence so that it will be released.
-
-2000-11-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (unmerge_on_error): add
-	(e_shell_view_construct): hook up to system_exception on
-	ui_container.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell.c: (setup_components), (save_settings_for_component):
-	* evolution-storage.c: (evolution_storage_register_on_shell):
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (unrealize): remove.
-	(e_shell_view_construct): ditto.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Make the panes of the EPaned not shrinkable
-	beyond their minimum size.
-
-2000-11-08  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell-folder-selection-dialog.c: Fix typo in a comment.
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* e-storage-set-view.c (insert_folders): Pass full_name, not
-	folder_name to callback.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-view.c (impl_ShellView_change_current_view):
-	Constified @uri.
-	(impl_ShellView_set_title): Constified @title.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c: New member `crash_type_names' in `EShellPrivate'.
-	(init): Init to NULL.
-	(destroy): Free.
-	(e_shell_component_maybe_crashed): New.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_create_view):
-	`CORBA_Object_duplicate()' the return value.
-
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-setup.c: Added #include <config.h>
-	
-2000-11-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c: New local static variables `evolution_directory',
-	`no_splash'.
-	(main): Removed local variable `evolution_directory'.  Add a
-	`--no-splash' command-line option for setting the value of
-	`no_splash'.
-	(idle_cb): Use the static `evolution_directory'.  Make the newly
-	created shell show the splash or not according to the value of
-	`no_splash'.
-
-	* e-shell.c (setup_components): Deal with a NULL @splash
-	parameter.
-	(e_shell_construct): New arg `show_splash'.  Don't create a splash
-	screen if FALSE; instead, pass NULL to `setup_components()' as the
-	@splash arg.
-	(e_shell_new): New arg `show_splash'.  Pass it to
-	`e_shell_construct()'.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage-listener.c (class_init): Fix the name of the
-	signal passed to gtk_signal_new so that this actually works.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Make this
-	take "highlighted" as well.
-
-	* e-local-storage.c (new_folder): 
-	* e-corba-storage.c (impl_StorageListener_new_folder): set
-	highlighted on the new folder.
-
-	* e-storage-set-view.c (updated_folder_cb): Remove an unused
-	variable.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* Evolution-ShellView.idl: Added a change_current_view method and 
-	a set_title.
-
-	* evolution-shell-view.c (class_init): Added signals for the above methods.
-	(impl_ShellView_change_current_view), (impl_ShellView_set_title): Implementations
-	for above methods.
-	(corba_class_init): Connect the implemenations.
-
-	* e-shell-view.c (shell_view_interface_change_current_view): Change
-	the display to the new uri.
-	(shell_view_interface_set_title): Set the window title.
-	(setup_evolution_shell_view_interface): Connect the signals to the above
-	functions.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Storage.idl: Add "highligted" field to Folder. Add
-	update_folder method to StorageListener to change display_name and
-	highlight status.
-
-	* e-folder.c: Add "highlighted" to EFolder to match the
-	Evolution::Folder type.
-	(e_folder_get_highlighted, e_folder_set_highlighted): Added
-
-	* evolution-storage-listener.c
-	(impl_Evolution_StorageListener_update_folder, etc):
-	* e-storage.c (e_storage_updated_folder, etc):
-	* e-corba-storage.c (impl_StorageListener_update_folder, etc):
-	Implement update_folder.
-
-	* e-storage-set.c (storage_updated_folder_cb, etc): Re-emit
-	updated_folder signals received from EStorage.
-
-	* e-storage-set-view.c (various): Add another model column to the
-	ETable and set it up as a bold_column based on
-	e_folder_get_highligted.
-	(updated_folder_cb, etc): Listen to EStorageSet update_folder
-	signal and emit ETree node_changed signals.
-
-	* evolution-storage.c (evolution_storage_update_folder): Client
-	function to update a folder's display_name and highlighted status.
-
-	* Evolution-LocalStorage.idl:
-	* evolution-local-storage.c: 
-	* e-local-storage.c: Change set_display_name to update_folder to
-	match Evolution::StorageListener
-
-2000-10-25    <jpr@helixcode.com>
-
-	* e-shortcuts-view-model.c (load_group_into_model): Set folder to NULL to
-	kill warning
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_populate_folder_context_menu),
-	(evolution_shell_component_client_create_view): update to new UI handler
-
-	* e-shell-view-menu.c (command_create_folder): ditto.
-
-	* e-storage-set-view.c (popup_folder_menu): ditto.
-
-	* evolution-shell-component-client.h: kill ui-compat include.
-
-2000-10-19  Iain Holmes  <iain@helixcode.com>
-
-	*e-shell-view.c (e_shell_view_save_settings): If there is no view
-        save the default uri instead.
-        (socket_destroy_cb): When a view crashes, change the view to the
-        default one.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	update for new UI handler.
-
-2000-10-18  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-view.c (start_progress_bar): If the widget is not realized
-	don't do anything, to prevent BadGC's at shut down.
-	(stop_progress_bar): Don't draw anything if the widget is not realized.
-	Same reason.
-
-	* e-shell-folder-selection-dialog.c (dbl_click_cb): Emit the
-	folder-selected signal.
-	(e_shell_folder_selection_dialog_construct): Connect to the e-table's
-	double-click signal.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-	
-	* e-shell.c (view_deleted_cb): Save the settings before the
-	view is destroyed.
-	(e_shell_quit): Don't save the settings when there are no views.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-setup.c (check_evolution_directory): Better dialog.
-
-	* e-splash.c (icon_free): Don't unref the canvas item.
-	(e_splash_construct): Add a frame round the splash screen.
-
-2000-10-16  Dan Winship  <danw@helixcode.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): Add a typecast.
-
-	* e-storage-set-view.c (popup_folder_menu): Move variable
-	declarations into the #if 0 to kill warnings.
-	(populate_folder_context_menu_with_common_items,
-	folder_context_menu_activate_cb): Move these into #if 0 too.
-
-	* e-shell.c: Add prototype.
-
-	* e-shell-view.c (storage_set_view_box_map_cb): 
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Remove unused variables.
-
-	* e-setup.c: Fix warning caused by e-util -> gal migration.
-
-2000-10-11  Iain Holmes  <iain@helixcode.com>
-
-	* e-setup.c (check_evolution_directory): Check if there are any
-	files in default_user that are not in ~/evolution and if so
-	copy them over.
-	(check_dir_recur): Recursive function to check the directory.
-
-	* e-shell-view-menu.c: Look Maw! I'm an Evolution hacker too.
-
-	* e-shell-view.c: Don't quit on when a view is destroyed.
-
-	* e-shell.c: Save the settings for the remaining views whenever
-	a view is destroyed.
-
-2000-10-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_storage_set_subwindow): Use an
-	EScrollFrame instead of a GtkScrolledWindow.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Display a splash screen.
-	(setup_components): New arg @splash, pointer to an ESplash.
-	Display the icons of the components in the splash and highlight
-	them as the components are activated.
-
-	* e-splash.c: New.
-	* e-splash.h: New.
-
-2000-10-13  Anna Marie Dirks  <anna@helixcode.com>
-	
-	* e-shell-folder-creation-dialog.glade: Added focus to the
-	folder-name text entry.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Fixed the spec on this.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Changed this to use the built in cells.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Adapted this for the new ETable system.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Change paths in such a way as to require
-	HEAD bonobo.
-	(command_toggle_folder_bar, command_toggle_shortcut_bar): only
-	respond to state changes.
-
-2000-10-07  Matt Wilson  <msw@redhat.com>
-
-	* e-shell-view.c (init): initialize priv->sockets to NULL, fixes
-	startup crash on non-ia32 platforms
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New member `sockets.
-	(init): Init to NULL.
-	(destroy): Free.  Also, disconnect the "destroy" signal from them
-	before the controls get destroyed.
-	(find_socket): New function.  [Thanks Dan.]
-	(socket_destroy_cb): New callback for the destruction of a socket.
-	(get_control_for_uri): Get the socket through `find_socket()' and
-	connect the "destroy" signal to `socket_destroy_cb'.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (insert_storages): call
-	_set_compare_function after inserting the storage.
-
-2000-10-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_display_uri): add a freeze / thaw
-	pair to reduce flicker on switching controls.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (command_xml_dump): fix.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c: #include <gal/widgets/e-gui-utils.h>
-	
-	* e-shell-folder-selection-dialog.c: same.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c: add #include for
-	libgnomeui/gnome-messagebox.h
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (shortcut_bar_mode_changed_cb): upd.
-	(folder_bar_mode_changed_cb): upd.
-	(command_xml_dump): clobber.
-	(e_shell_view_menu_setup): upd.
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): upd.
-	(shell_view_interface_unset_message_cb): upd.
-	(e_shell_view_construct): upd.
-	(get_control_for_uri): upd.
-	(e_shell_view_get_bonobo_ui_component): upd.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (setup_progress_bar): remove evil usize set.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Use
-	`bonobo_ui_component_add_verb_list' instead of
-	`bonobo_ui_component_add_verb_list_with_data' for help_verbs,
-	so that `command_help' gets an html filename as user_data,
-	instead of a ptr to EShellView.
-	(menu_do_misc): Move DumpXML from help_verbs to here, because
-	`command_xml_dump' needs to get EShellView as user_data.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (show_new_group_dialog): Destroy the dialog
-	if the user has clicked on "OK" or "Cancel".
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_get_current_folder): if
-	we're not displaying folders, the current folder is NULL.
-	(class_init): fix typo.
-
-	* Makefile.am (libeshell_a_SOURCES):
-	evolution-storage-set-view-listener.[ch] should be here, not
-	evolution_SOURCES.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view.c: add storage_selected behavior -
-	loop over the listeners calling _storage_selected.
-
-	* Evolution-StorageSetView.idl: add storage_selected to the
-	Listener interface.
-
-	* e-storage-set-view.c add storage_selected signal.
-	(on_cursor_change): if the depth is less than 2, emit
-	"storage_selected", otherwise emit "folder_selected".
-
-	* e-storage-set-view.h: add storage_selected signal.
-
-	* evolution-storage-set-view-listener.h: add storage_selected
-	signal.
-
-	* evolution-storage-set-view-listener.c: add storage_selected
-	signal.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-set-view-listener.c: New.
-	* evolution-storage-set-view-listener.h: New.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view.c (impl_StorageSetView_add_listener): fix typo.
-	(impl_StorageSetView_remove_listener): same.
-	(impl_StorageSetView__get_show_folders): implementation of getter for show_folders.
-	(impl_StorageSetView__set_show_folders): implementation of setter for show_folders.
-	(corba_class_init): install _set_show_folders and _get_show_folders.
-
-	* Evolution-StorageSetView.idl: add show_folders attribute to
-	StorageSetView.
-
-	* e-storage-set-view.h: add prototypes for
-	e_storage_set_view_{get,set}_show_folders.
-
-	* e-storage-set-view.c (insert_storages): split this code out from
-	e_storage_set_view_construct so we can call it when "show_folders"
-	has been changed.
-	(e_storage_set_view_construct): remove the code to insert
-	storages.
-	(e_storage_set_view_set_show_folders): new function.  tears down
-	existing tree and node/path hashtable and calls insert_storages.
-	(e_storage_set_view_get_show_folders): new function, retrieves
-	current show_folders state.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-storage-set-view-factory.c
-	(evolution_storage_set_view_factory_new_view): pass
-	storage_set_view_interface as second argument to
-	bonobo_object_add_interface, and call gtk_widget_show on the
-	storage_set_view widget.
-
-2000-10-03  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): kill.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): strip
-	out the XML UI merge; move it to
-
-	* e-shell-view.c (e_shell_view_construct): here, +
-	freeze / thaw pair.
-
-	* e-shell-view.c (setup_progress_bar): impl.
-	(setup_widgets): hook in.
-	(progress_bar_timeout_cb): fix.
-	(start_progress_bar): fix.
-	(stop_progress_bar): fix.
-	(e_shell_view_construct): setup ui handler first.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): upd.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (new_folder_cb): set the new node's compare function.
-	(insert_folders): same.
-
-	(new_storage_cb): remove uunecessary cast.
-
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (new_storage_cb): track e-tree sort api change.
-	(treepath_compare): same.
-	(new_folder_cb): same.
-	
-2000-10-02  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_construct): pass NULL
-	for the open/closed pixbuf of the tree renderer.  we'll let it
-	supply the default.
-	(destroy): remove the expanded/unexpanded pixbuf references.
-	(new_storage_cb): use e_tree_model_node_insert_id so we can (soon)
-	save expanded/collapsed state.
-	(new_folder_cb): same.
-	(insert_folders): same.
-	(e_storage_set_view_construct): same.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_create_storage_set_view): New,
-	implementation for `::create_storage_set_view'.
-	(corba_class_init): Install.
-
-	* evolution-storage-set-view-factory.c: New.
-	* evolution-storage-set-view-factory.h: New.
-
-	* evolution-storage-set-view.c: New.
-	* evolution-storage-set-view.h: New.
-
-	* Evolution-Shell.idl: New method
-	`Shell::create_storage_set_view'.
-
-	* Evolution.idl: #include <Evolution-StorageSetView.idl>.
-
-	* Evolution-StorageSetView.idl: New.
-
-2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (find_listener_in_list): New helper
-	function.
-	(impl_Storage_remove_listener): New, implementation for
-	`Storage::remove_listener'.
-	(remove_listener): Helper function for
-	`impl_Storage_remove_listener'.
-	(evolution_storage_get_epv): Install the implementation for
-	`::remove_listener'.
-	(add_listener): Return a boolean indicating success or failure.
-	Reject multiple additions of the same listener.
-	(impl_Storage_add_listener): Updated accordingly: raise an
-	exception if `add_listener' fails.
-
-	* Evolution-Storage.idl: Added `Storage::remove_listener'.  Added
-	exception `AlreadyListening' for `::add_listener'.
-
-2000-09-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (popup_storage_set_view_button_clicked): Renamed
-	from `popup_storage_set_view_close_button_clicked'.
-	(storage_set_view_box_map_cb): Updated accordingly.  Connect to
-	"button_clicked" instead of "close_button_clicked".
-	(disconnect_popup_signals): Updated accordingly.
-	(e_shell_view_set_folder_bar_mode): Update the button mode of the
-	title bar according to the folder bar mode.
-
-2000-09-28  Dan Winship  <danw@helixcode.com>
-
-	* e-corba-storage.c (impl_StorageListener_new_folder): Don't print
-	"Folder registered successfully" if it didn't. (Duh. :)
-
-2000-09-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New constant `DEFAULT_URI'.
-	(e_shell_view_load_settings): If the `DisplayedURI' from
-	`gnome_config' cannot be displayed, display the `DEFAULT_URI'.
-
-2000-09-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (e_shortcuts_get_group_title): Cast the data
-	pointer, not the node pointer.
-	(e_shortcuts_add_group): If @group_num is -1, emit the effective
-	group number with the "new_group" signal instead of -1, which is
-	going to confuse the signal handler.
-	(e_shortcuts_add_shortcut): Likewise with the shortcut.
-
-	* e-shortcuts-view-model.c (shortcuts_new_group_cb): We are @data,
-	not @shortcuts.
-	(class_init): Install the `::destroy' handler.
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Set
-	`priv->shortcuts'.
-	(remove_shortcut_cb): Don't remove the item both on the data and
-	the model.
-	(toggle_small_icons_cb): Removed some crufty checks.
-	(toggle_large_icons_cb): Likewise.
-	(show_new_group_dialog): New, implementation for the "Create new
-	shortcut group" dialog.
-	(destroy_group_cb): Callback for the "Destroy this group" item.
-	(create_new_group): Callback for the "Create new group" item.
-
-2000-09-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (item_selected): Renamed from
-	`selected_item'.
-	(class_init): Updated accordingly.
-	(impl_shortcut_dropped): New function, implementation for
-	`EShortcutBar::shortcut_dropped'.
-	(impl_shortcut_dragged): New function, implementation for
-	`EShortcutBar::shortcut_dragged'.
-	(e_shortcuts_view_construct): Update to use EShortcutsViewModel.
-	(class_init): Install them.
-
-	* e-shortcuts.c (e_shortcuts_get_group_title): New.
-
-	* e-shortcuts-view-model.c: New.
-	* e-shortcuts-view-model.h: New.
-
-2000-09-24  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_local_storage): Don't unref the local storage.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-shell-view-menu.c: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (show_existing_view): upd.
-
-	* Evolution-ShellComponent.idl: upd.
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	upd.
-
-2000-09-18  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (command_xml_dump): add xml dump option.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-component-registry.c, e-corba-storage-registry.c,
-	e-corba-storage.c, e-folder-type-registry.c, e-folder.c,
-	e-local-folder.c, e-local-storage.c,
-	e-shell-folder-creation-dialog.c,
-	e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c,
-	e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c,
-	e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c,
-	e-storage.c, evolution-local-storage.c, evolution-session.c,
-	evolution-shell-client.c, evolution-shell-component-client.c,
-	evolution-shell-component.c, evolution-shell-view.c,
-	evolution-storage-listener.c, evolution-storage.c, main.c: Fixed
-	the #include lines to deal properly with gal.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.h: #include "bonobo-win.h", not "bonobo-app.h".
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* e-storage.c (get_path_for_physical_uri_foreach): foreach_data
-	should be set to the caller-supplied data, not the tree item data.
-
-2000-09-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Remove the *kludge* so that the button width is set properly.
-	Fixes bug #XXXX
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Remove sillies in toggle paths.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c: move fn to bonobo.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(GNOME_PRINT_LIBS) to evolution_LDADD.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): prune cruft.
-	(shell_view_interface_unset_message_cb),
-	(shell_view_interface_set_message_cb): impl.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): re-order to suit and
-	add freeze / thaw, update paths to toggles, remove warnings
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view-menu.c: Re-hash pretty much the whole file
-
-	* ui.xml: Add.
-
-	* e-shell-view.c (e_shell_view_construct): connect unrealize & delete_event
-	to theit signals on the window (class_init): remove widget_class bits.
-
-2000-09-06  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell.c (view_destroy_cb, destroy, e_shell_new_view, e_shell_quit): 
-	update to track object type change.
-
-	* e-shell.c (e_shell_restore_from_settings): ditto.
-
-	* main.c (idle_cb): ditto.
-
-	* e-shell-view.c (e_shell_view_new, e_shell_view_construct, setup_widgets): 
-	updated for BonoboApp.
-	(progress_bar_timeout_cb, start_progress_bar, stop_progress_bar),
-	(shell_view_interface_set_message_cb, shell_view_interface_unset_message_cb): 
-	emasculated for now.
-
-	* e-storage-set-view.c (popup_folder_menu): disable popup menu for now.
-
-2000-09-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (popdown_transient_folder_bar): New.
-	(storage_set_view_box_button_release_event_cb): Rewritten to use
-	it.
-	(folder_selected_cb): Pop down the transient folder bar if the
-	folder bar mode is `TRANSIENT'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ($(IDL_GENERATED)): Stupid `orbit-idl' wants a space after the
-	`-I'.
-
-2000-09-12  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-view.c (update_folder_title_bar): Translate UTF-8
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Remove the `ui.xml' stuff.
-
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Initialize libunicode
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-local-storage.c: Fixed some warnings.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (set_default_folder): Work on
-	the assumption that @default_uri is not NULL.
-	(e_shell_folder_selection_dialog_construct): Only call if the
-	@default_uri is not NULL.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-storage.c (new_folder): Removed debugging message.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): If
-	description is NULL, use the empty string instead.
-
-	* e-local-storage.c (new_folder): New utility function to add a
-	new folder by keeping both the Bonobo interface and the EStorage
-	up-to-date.
-	(load_folders): Use it here instead of just
-	`e_storage_new_folder()'.
-	(component_async_create_folder_callback): Likewise.
-
-	* e-shell-view.c (update_for_current_uri): Prevent an
-	EStorageSetView warning if the path is NULL.
-
-	* evolution-storage.c (impl_Storage_add_listener): New,
-	implementation for `Evolution::Storage::add_listener'.
-	(evolution_storage_get_epv): Install it.
-
-	* evolution-storage-listener.c
-	(evolution_storage_listener_corba_objref): New.
-	(create_servant): Create the servant with `g_new0()' instead of
-	`g_new()'.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-listener.c
-	(evolution_storage_listener_construct): Unset the `GTK_FLOATING'
-	flag as `EvolutionStorageListener' is self-owned.
-
-2000-09-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (impl_list_folders): Removed.
-	(impl_get_subfolder_paths): New static function, implementation
-	for `::get_subfolder_paths'.
-	(class_init): Install it.
-	(e_storage_get_subfolder_paths): New.
-
-	* e-storage.h: `list_folders' virtual method removed.  New virtual
-	method `list_subfolder_paths'.
-
-	* e-storage-set-view.c (etree_icon_at): If the folder is not
-	found, return NULL.
-
-	* e-local-storage.c (bonobo_interface_set_display_name_cb): New
-	function, callback for the `set_display_name' signal on the
-	EvolutionLocalStorage.
-	(construct): Connect it.
-
-	* e-storage-set-view.c (folder_changed_cb): New callback for the
-	"changed" signal emitted by the EFolders.  It makes the model emit
-	the "changed" signal for the appropriate row.
-	(insert_folders): Connect it.
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (etree_value_at): Return the name of the
-	folder or the storage instead of just returning the last segment
-	of the path.
-
-	* e-storage-set.c (e_storage_set_get_folder): If the storage is
-	not found, just return NULL to avoid a g_warning.
-
-2000-09-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed some warnings.
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (update_for_current_uri): Make sure `folder_name'
-	is always dynamically allocated, as we `g_free()' it.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-view.c (update_for_current_uri): Translate UTF-8 string
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (list_through_listener_foreach): Don't crash
-	on nodes with no data.  [The root node has none indeed.]
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-tree.c (e_folder_tree_get_folder): Return NULL if there
-	is no folder with that @path, instead of segfaulting.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c: New member `folder_tree' in
-	`EvolutionStoragePrivate'.
-	(init): Initialize it.
-	(destroy): Destroy it.
-	(list_through_listener): New.
-	(add_listener): Use it to list all the current folders through the
-	listener.
-	(evolution_storage_new_folder): Add the thingie to the
-	`folder_tree'.
-	(evolution_storage_removed_folder): Remove the thingie from the
-	`folder_tree'.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c: Replaced the `path_to_folder' GHashTable with an
-	EFolderTree named `folder_tree'.
-	(init): Updated accordingly.
-	(destroy): Updated accordingly.
-	(free_private): Removed.
-	(remove_folder): Removed.
-	(folder_new): Removed.
-	(folder_remove_subfolder): Removed.
-	(folder_add_subfolder): Removed.
-	(folder_destroy): Removed.
-	(get_parent_path): Removed.
-	(impl_list_folders): Reimplemented by using the `EFolderTree'
-	methods.
-	(e_storage_construct): Don't create the root folder here.
-	(get_path_for_physical_uri_foreach): Updated to be an
-	`EFolderTreeForeachFunc'.
-	(e_storage_get_path_for_physical_uri): Likewise, updated to use
-	`e_folder_tree_foreach()'.
-	(e_storage_new_folder): Updated to use the EFolderTree.
-	(e_storage_removed_folder): Likewise.
-	(folder_destroy_notify): New function, for the destroy
-	notification of `EFolder'.
-
-	* evolution-storage-listener.c: Change the `servant' member in
-	`EvolutionStorageListenerPrivate' into an
-	`EvolutionStorageListenerServant'.
-
-	* e-folder-tree.c: New.
-	* e-folder-tree.h: New.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage-listener.c (create_servant): Return an
-	`EvolutionStorageListenerServant' instead of a
-	`POA_Evolution_StorageListener'.
-	(evolution_storage_listener_new): Add a cast accordingly.
-
-	* evolution-storage.c (corba_class_init): Remove `NO_WARNINGS'
-	madness.
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Added base ETableModel functions.
-
-	* evolution-storage-listener.c, evolution-storage.c: Fixed some
-	warnings.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (set_owner_on_components): New.
-	(e_shell_construct): Call it after setting up the local storage.
-
-	* e-component-registry.c (register_component): Don't set the owner
-	here.
-
-	* evolution-shell-client.c
-	(evolution_shell_client_get_local_storage): New.
-
-2000-09-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-view.c (destroy): Chain to the parent's
-	destroy method.
-
-	* evolution-shell-component.c (destroy): Chain to the parent's
-	destroy method.
-
-	* evolution-storage.c: `corba_storage_listener' in
-	`EvolutionStoragePrivate' replaced with a list of listeners,
-	`corba_storage_listeners'.
-	(init): Init to NULL.
-	(add_listener): New utility function.
-	(destroy): Destroy all the listeners.
-	(evolution_storage_new_folder): Notify all the listeners.
-	(evolution_storage_removed_folder): Likewise.
-
-	* e-local-storage.c: New member `bonobo_interface' in
-	`ELocalStoragePrivate'.
-	(init): Init to NULL.
-	(e_local_storage_get_corba_interface): New.
-
-	* e-shell.c: New member `local_storage' in `EShellPrivate'.
-	(init): Init to NULL.
-	(setup_local_storage): Make it point to the newly created local
-	storage.
-	(destroy): Unref if not NULL.
-	(impl_Shell_get_local_storage): New, implementation for
-	`Evolution::Shell::get_local_storage'.
-	(corba_class_init): Set it up.
-
-	* evolution-local-storage-client.c: New.
-	* evolution-local-storage-client.h: New.
-	* evolution-local-storage.c: New.
-	* evolution-local-storage.h: New.
-	* evolution-storage-listener.c: New.
-	* evolution-storage-listener.h: New.
-
-	* Evolution-Storage.idl: New method `Storage::add_listener'.
-
-	* Evolution-Shell.idl: New method `Shell::get_local_storage'.
-
-	* Evolution-LocalStorage.idl: New.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c: Use e_utf8 wrappers
-
-2000-09-01  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c (removed_folder_cb): free node_data.
-	(removed_storage_cb): same.
-	(new_storage_cb): don't free the path we put in the node's
-	node_data.
-	(e_storage_set_view_set_current_folder): remove calls to
-	set_cursor_row (-1), and clean up a little bit.
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-local-storage.c: Strdup path when setting the callback data.
-
-	* evolution-storage.c: Removed an unused variable.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-view.c (init): initialize delayed_selection = NULL;
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_new_folder): Handle @path
-	as the full path.
-
-	* e-storage.c (e_storage_new_folder): Consider @path to be the
-	full path, not the parent path.
-	* e-local-storage.c (load_folders): Updated accordingly.
-
-	* Evolution-Storage.idl: Member `name' of `struct Folder' renamed
-	to `display_name'.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* e-shell-view.c: add delayed_selection to _EShellViewPrivate.
-	(new_folder_cb): new function.  check if the path is our
-	delayed_selection and if so, select it.
-	(folder_selected_cb): if the user selects something using a UI
-	gesture, clear out a pending delayed selection.
-	(e_shell_view_display_uri): if the uri isn't available, save it in
-	the delayed_selection field, and set up the new_folder signal.
-
-2000-08-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): If the
-	message contains a newline, only display the part until the
-	newline, excluding the newline.  Otherwise the status bar resizes
-	nastily.
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_components): Removed the hardcoding of the
-	shell component IDs.  Rather, do an OAF query looking for the
-	`Evolution::ShellComponent' interface and activate all the
-	components in the result.
-	(MAIL_COMPONENT_ID): Removed.
-	(CALENDAR_COMPONENT_ID): Removed.
-	(ADDRESSBOOK_COMPONENT_ID): Removed.
-
-	* e-storage-set-view.c: Make `sort_model' static.
-
-2000-08-25  Chris Toshok  <toshok@helixcode.com>
-
-	* e-storage-set-view.c: convert to use ETree instead of GtkCTree.
-
-	* e-storage-set-view.h: change superclass from GtkCTree to ETable.
-
-	* main.c (main): call e_cursors_init.
-
-	* Makefile.am (evolution_LDADD): add libetable.a
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	Silence some obvious assertions.
-	
-	* e-shell.c (e_shell_construct): Ref our shortcut bar to
-	sink it. Same with the folder_type_registry.
-
-	* e-shell-folder-title-bar.c (destroy): Only attempt to unref
-	priv->icon if nonnull.
-
-	* e-shell-view.c (update_folder_title_bar): Don't attempt to set
-	the folder_icon/_name if they're NULL.
-
-2000-08-24  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Don't abort if the
-	component cannot be activated.  Rather, just return NULL.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* Makefile.am (evolution_LDADD): Added UNICODE_LIBS to link in the
-	new e-text stuff.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-folder-title-bar.c: Fixed a warning.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed a warning.
-
-2000-08-18  Larry Ewing  <lewing@helixcode.com>
-
-	* e-shell-folder-title-bar.c (style_set_cb): update the pixmap
-	define E_USE_STYLES to disable the current darkening behavior
-	(destroy): free the icon.
-	(e_shell_folder_title_bar_construct): style_set_cb does everything
-	important now.
-	(e_shell_folder_title_bar_set_icon): actually store the pixbuf
-	when we set it so that we still have it if the style changes and
-	take care of refcounting them properly.
-
-2000-08-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (menu_create_file): Make capitalization of
-	menu items consistent.
-	(menu_create_view): Likewise.
-	(menu_create_help): Likewise.
-	(e_shell_view_menu_setup): Create a component menu placeholder so
-	that components can add their own component-specific menus there.
-	(menu_create_actions): Removed.
-	(e_shell_view_menu_setup): Don't call it.
-	(menu_create_tools): Removed.
-	(e_shell_view_menu_setup): Don't call it.
-	(menu_create_settings): New.
-	(e_shell_view_menu_setup): Call it.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (delete_event): New.  Make the parent shell quit.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (shell_view_interface_set_message_cb): Removed
-	debugging message.
-	(shell_view_interface_unset_message_cb): Likewise.
-
-2000-08-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New members `progress_bar_timeout_id',
-	`progress_bar_value' in `EShellViewPrivate'.
-	(init): Init them.
-	(destroy): If the timeout id is not zero, remove the associated
-	timeout.
-	(progress_bar_timeout_cb): New.
-	(start_progress_bar): New.
-	(stop_progress_bar): New.
-	(shell_view_interface_set_message_cb): If busy, start the progress
-	bar.  Otherwise, stop it.
-	(shell_view_interface_unset_message_cb): Stop the progress bar.
-
-	* e-shell-view.c (setup_widgets): Enable the progress bar in the
-	appbar.
-
-	* e-shell-view.c (shell_view_interface_unset_message_cb): New
-	function, callback for the `EvolutionShellView::unset_message'
-	signal.
-	(shell_view_interface_set_message_cb): New function, callback for
-	the `EvolutionShellView::set_message' signal.
-	(setup_evolution_shell_view_interface): Connect these signals to a
-	newly created EvolutionShellView object, add ::add_interface this
-	object to the control's frame.
-
-	* evolution-shell-view.c: New.
-	* evolution-shell-view.h: New.
-
-	* Evolution-ShellView.idl: New interface.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-ShellComponent.idl: add "in string evolution_homedir"
-	to ShellComponent::set_owner's arguments.
-
-	* e-shell.c (e_shell_get_local_directory): Expose local_directory.
-
-	* e-component-registry.c (register_component): Pass the shell's
-	"local_directory" to the component as its evolution_homedir.
-
-	* evolution-shell-component.c (impl_ShellComponent_set_owner):
-	Update to include evolution_homedir.
-	(class_init): Update signal prototype.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_set_owner): Update to include
-	evolution_homedir.
-
-	* e-init.c: Remove. This wasn't being used.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Add lil' ol'
-	me to the about box.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-setup.c, e-shell.c: Fixed some warnings.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (menu_create_file_new): Create a placeholder
-	for the print items.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* e-setup.c (e_setup): Check for ~/evolution/shortcuts.xml in
-	addition to ~/evolution, to make sure it's really the directory
-	we're expecting it to be. Also, convert from old-style config file
-	to new-style config directory.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
-	unref.
-
-	* e-shell.c (e_shell_construct): Remove erroneous refs on
-	folder_type_registry, storage_set.
-
-	* e-shortcuts-view.c (destroy): unref the shortcuts, causing a
-	massive ripple chain ref-count reaction.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* e-shell.h: Remove gconf references
-
-	* e-shell-view.h: Remove gconf references
-
-	* main.c (idle_cb): Remove gconf references
-
-	* Makefile.am: Remove gconf cflags and libs 
-
-	* e-shell-view.c (e_shell_view_load_settings): Change to use
-	gnome-config
-	(e_shell_view_save_settings): ditto
-
-	* e-shell.c (e_shell_restore_from_settings): Change to
-	use gnome_config
-	(save_settings_for_views): ditto
-
-2000-08-03  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-view.c (destroy): unref the UI handler.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c (set_default_folder): Make
-	sure default_uri isn't NULL!!
-
-2000-08-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Just use the current
-	URI as the @default_uri parameter for
-	`e_shell_folder_selection_dialog_new()'.
-
-	* evolution-session.c (class_init): Call `corba_class_init()'.
-
-	* e-shell-folder-selection-dialog.c
-	(e_shell_folder_selection_dialog_new): @default_path renamed to
-	@default_uri.
-	(e_shell_folder_selection_dialog_construct): Likewise.  If the
-	@default_uri is an `evolution:' one, use it as a path; if it is
-	different, assume it is a physical URI and consequently look for
-	the folder that has that physical URI and make it the default.
-	(set_default_folder): New helper function.
-	(e_shell_folder_selection_dialog_construct): Use it.
-
-	* e-storage-set.c (e_storage_set_get_path_for_physical_uri): New.
-
-	* e-storage.c (e_storage_get_path_for_physical_uri): New.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* main.c (idle_cb): work with either gconf 0.5 or newer
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* e-storage.c (e_storage_new_folder): Fix tiny mem leak.
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (disconnect_popup_signals): Disconnect the "map"
-	signal handler too.
-
-2000-07-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-creation-dialog.c (add_folder_types): Work around
-	GtkOptionMenu utter brokenness by destroying the associated
-	Glade-built GtkMenu and creating a new one from scratch.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c, main.c: Remove GOAD support.
-
-	* evolution-shell-component-client.c: Remove GOAD support.
-	(evolution_shell_component_client_new): Give the "maybe
-	OAF_INFO_PATH" message if no oafinfo file was found, and give a
-	"consult previous error messages" message if the component was
-	found but not activated. Abort in either case.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Converted to use `bonobo_ui_handler_*()'
-	stuff directly, instead of converting from GnomeUIInfo.
-	(command_quit): Update arg types for BonoboUIHandler.
-	(command_run_bugbuddy): Likewise.
-	(command_about_box): Likewise.
-	(command_new_task): Removed.
-	(command_new_journal_entry): Removed.
-	(menu_create_file_new): New.
-	(menu_create_file): New.
-	(menu_create_edit): New.
-	(menu_create_view): New.
-	(menu_create_tools): New.
-	(menu_create_actions): New.
-	(e_shell_view_menu_setup): Create menus using them instead of
-	converting from GnomeUIInfo.
-
-2000-07-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Don't unref NULL shortcuts, you
-	idiot.
-
-2000-07-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_set_folder_bar_mode): Make the
-	title bar non-clickable when the folder tree is visible.
-
-	* e-shell-folder-title-bar.c: New members `button_arrow' and
-	`clickable' in `EShellFolderTitleBarPrivate'.  Renamed `label'
-	into `button_label'.  Added `label'.
-	(init): Init them.
-	(e_shell_folder_title_bar_construct): Pass a pointer to the title
-	bar as the user data for the "realize" signal.  Create `label'.
-	(title_button_box_realize_cb): Use the `button_arrow' member
-	instead of using `gtk_object_{set,get}_data()'.
-	(setup_style): Set the style for `label' too.
-	(e_shell_folder_title_bar_set_clickable): New.
-	(e_shell_folder_title_bar_set_title): Set both `label' and
-	`button_label'.
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Don't use
-	g_main_loop to block the caller; this will break when 
-	threads are enabled and GDK_THREADS_ENTER deadlocks. Use
-	gtk_main / gtk_main_exit to enter and exit the main loop,
-	which handles the recursive case correctly.
-	(impl_FolderSelectionListener_selected): Same.
-	(impl_FolderSelectionListener_cancel): Same.
-	(struct _FolderSelectionListenerServant): No more main_loop member.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (storage_set_view_box_button_release_event_cb):
-	Set the toggle state to FALSE on the title bar.
-
-	* e-shell-folder-title-bar.c: Signal "title_clicked" replaced by
-	"title_toggled".
-	(setup_style): Change the style for the button too.
-	(e_shell_folder_title_bar_construct): Use a GtkToggleButton, not a
-	GtkButton.
-	(e_shell_folder_title_bar_set_toggle_state): New.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (create_icon_pixmap): New.  Create a
-	small arrow-shaped GtkPixmap.
-	(title_button_box_realize_cb): New.  Callback for the "realize"
-	signal of the button's inner box.
-
-	* e-shell-view.c (title_bar_clicked_cb): New function, callback
-	for the "title_clicked" signal of the title bar.
-	(setup_widgets): Connect it.
-
-	* e-shell-view.c: New member `storage_set_title_bar' in
-	`EShellViewPrivate'.
-	(setup_storage_set_subwindow): Set it.
-
-	* e-shell-folder-title-bar.c: Use a GtkLabel instead of an
-	EClippedLabel for the title.
-	(title_button_clicked_cb): New.
-	(e_shell_folder_title_bar_construct): Put the label into a button.
-	Connect the button's "clicked" signal to
-	`title_button_clicked_cb'.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_populate_folder_context_menu): If the pointer
-	to the function to populate the folder context menu is NULL, don't
-	do anything.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (popup_folder_menu): New.  Create a
-	BonoboUIHandler-managed pop-up menu, let the component fill it in
-	with `::populate_folder_context_menu', and display it.  Then
-	destroy it with the associated BonoboUIHandler.
-	(handle_right_button_selection): New.
-	(handle_left_button_selection): New.  This pops up the right-click
-	menu.
-	(button_release_event): Use them.
-	(init): Set the `GTK_BUTTON_SELECTS' flag for button #3's actions.
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_populate_folder_context_menu):
-	New.
-	(evolution_shell_component_client_async_create_folder): Added
-	preconditions.
-
-	* e-shell-view.c (e_shell_view_save_settings): Add missing cast.
-
-	* evolution-shell-component.c: New member
-	`populate_folder_context_menu' in
-	`EvolutionShellComponentPrivate'.
-	(impl_ShellComponent_populate_folder_context_menu): New,
-	implementation for
-	`Evolution::ShellComponent::populate_folder_context_menu'.
-	(corba_class_init): Install it.
-	(evolution_shell_component_new): New arg
-	@populate_folder_context_menu.
-	(evolution_shell_component_construct): Likewise.
-
-	* Evolution-ShellComponent.idl: New method
-	`::populate_folder_context_menu'.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_save_settings): Save the paned
-	positions.
-	(e_shell_view_load_settings): Restore them.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (save_settings_for_views): New.  Code moved out of
-	`e_shell_save_settings'.
-	(e_shell_save_settings): Use it.
-	(save_settings_for_component): New.
-	(save_settings_for_components): New.
-	(e_shell_save_settings): Use it, so that we make all the
-	components save settings too.
-
-	* e-component-registry.c
-	(e_component_registry_get_id_list): New.
-	(e_component_registry_get_component_by_id): New.
-
-	* Makefile.am (libeshell_a_SOURCES): Add
-	`evolution-shell-component-client' and `evolution-session'.
-
-	* evolution-session.c: New.
-	* evolution-session.h: New.
-
-	* Makefile.am (evolution_SOURCES): Removed files that were already
-	in `libeshell.a'.
-
-	* Evolution.idl: #include <Evolution-Session.idl>.
-
-	* Evolution-Session.idl: New.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (no_views_left_cb): Call `e_shell_quit()' on the shell
-	before getting out of the GTK+ main loop.
-	(view_delete_event_cb): Removed.
-	(idle_cb): Don't call it.
-
-	* e-shell-view-menu.c (command_new_view): New, implementation of
-	the "New view" command.
-
-2000-07-16  Damon Chaplin  <damon@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): created a model
-	for the EShortcutBar. This will probably have to be moved to support
-	multiple views.
-	(class_init): #if'd out overriding the class functions. They don't
-	exist any more (they are in the model instead).
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* main.c: Fixed to match gconf API change.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* main.c (development_warning): Update the message.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (title_button_clicked_cb):
-	Temporarily `#if 0'ed out.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): Translate a
-	default_folder of "" into NULL (which can't be passed over CORBA).
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (e_storage_new_folder): Removed debugging message.
-
-	* e-storage-set.c (storage_new_folder_cb): Removed debugging
-	message.
-
-2000-07-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-shell-view.c (unrealize): As a quasi-hack, do a gdk_flush()
-	when the shell view is unrealized so that the DeleteEvent gets
-	sent to the remote plugs as soon as possible before we start
-	making other CORBA calls.  The problem is that our CORBA pipe is
-	synchronous while our X pipe is asynch.  We have to ensure
-	ordering for certain operations.  This is NOT the correct and
-	complete fix, which should go in Bonobo.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_display_uri): Don't update the
-	current URI if there are problems creating a view for it.
-	(show_error): Remove.  Not used anymore.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Cleanup some unused menu items and added
-	"FIXMEs" for the ones we plan to add in the short term but are not
-	implemented yet.
-	(command_create_folder): Get rid of an unused variable.
-
-2000-07-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.c (user_select_folder): Fix small warning
-	by adding proper cast when filling in the CORBA sequence struct.
-
-2000-07-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_corba_storages): Ref the CORBA storage
-	registry.
-
-2000-07-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c: Removed `corba_storage_registry' member
-	from `EvolutionStoragePrivate'.
-	(destroy): Don't unref/release it.  Call
-	`StorageListener::destroy' to notify that we are dead.
-	(evolution_storage_register): Don't ref and store the registry.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* e-shell.c (e_shell_save_settings): Use the correct gconf path
-	(/apps, not /app), and call gconf_client_suggest_sync at the end.
-	(e_shell_restore_from_settings): Use the correct gconf path.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (command_goto_folder): Set the folder
-	selection dialog as transient for the shell view.
-	(command_create_folder): New, bound to the "Create folder"
-	command in the "File" menu.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): New arg
-	@allowed_types.  Pass it to the EShellFolderSelectionDialog.
-	Connect to the "cancelled" and "folder_selected" signals instead
-	of "clicked".
-	(corba_listener_destroy_notify): New callback.
-	(impl_Shell_user_select_folder): Associate it to the DestroyNotify
-	for the "corba_listener" GtkObject data, so we don't leak it.
-	(folder_selection_dialog_clicked_cb): Don't release the listener
-	interface here.
-	(folder_selection_dialog_cancelled_cb): New callback for the
-	"cancelled" signal.
-	(folder_selection_dialog_folder_selected_cb): New callback for the
-	"folder_selected" signal.
-
-	* e-shell-view-menu.c (command_goto_folder): Don't connect to
-	"clicked".  Connect to "cancelled" and "folder_selected" instead.
-	(folder_selection_dialog_cancelled_cb): New, callback for the
-	"cancelled" signal.
-	(folder_selection_dialog_folder_selected_cb): New, callback for
-	the "folder_selected" signal.
-
-	* e-shell-folder-selection-dialog.c New members `allowed_types',
-	`storage_set' in `EShellFolderSelectionDialogPrivate'.
-	(class_init): Install signals "folder_selected", "cancelled".
-	(init): Init to NULL.
-	(impl_destroy): Free/unref them.
-	(e_shell_folder_selection_dialog_new): New arg @allowed_types.
-	(e_shell_folder_selection_dialog_construct): New arg
-	@allowed_types.  Initialize `priv->allowed_types' from it.
-	(check_folder_type): New function.  Check if the selected folder
-	is of the appropriate type and, if not, return FALSE and pop up an
-	error dialog.  Otherwise, return TRUE.
-	(impl_clicked): Use `check_folder_type()' to check if the folder
-	type is OK.  If it is not, stop emission of the "clicked" signal.
-
-	* e-shell-folder-selection-dialog.h: New signals
-	"folder_selected", "cancelled".
-
-	* evolution-shell-client.c
-	(evolution_shell_client_user_select_folder): New arg
-	@allowed_types.
-	(user_select_folder): New arg @allowed_types.  Pass this to the
-	::user_select_folder method.
-
-	* Evolution-Shell.idl: New arg @required_types in
-	::user_select_folder.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_components): Don't ref the component registry.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Shell.idl: add "cancel" to FolderSelectionListener.
-
-	* evolution-shell-client.c (impl_FolderSelectionListener_cancel):
-	Implement cancel (set *uri and *physical_uri to NULL).
-	(evolution_shell_client_user_select_folder): document %NULL uri
-	and physical_uri return values.
-	
-	* e-shell.c (folder_selection_dialog_clicked_cb): If the user
-	clicked "Cancel" or used the wm to close the dialog, call _cancel
-	instead of _selected.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_set_owner):
-	Duplicate the object before storing it, you doofus.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (impl_ShellComponent_unset_owner):
-	NULL the owner_client.
-
-2000-06-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-client.h
-	(evolution_shell_client_user_select_folder): Add prototype.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c: New member `owner_client'.  Removed
-	member `corba_owner'.  All the code updated to use it.
-	(evolution_shell_component_get_owner): Changed so that it returns
-	an EvolutionShellClient instead of the raw CORBA object.
-
-	* evolution-shell-component.h: Change signal "owner_set" to get an
-	EvolutionShellClient wrapper instead of a CORBA interface.
-
-	* evolution-shell-client.c: New.
-	* evolution-shell-client.h: New.
-
-2000-06-29  Dan Winship  <danw@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Update warning message to
-	not say "CRASHING", since it won't if you have current bonobo.
-
-2000-06-29  Peter Williams  <peter@beta.newton.cx>
-
-	* e-shell.c (e_shell_restore_from_settings): Check for the 
-	insanely invalid NumberOfViews = 0 case.
-
-2000-06-29  Peter Williams  <peter@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Ref the various E-things that
-	we create to go with our unrefs in the destructor.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_construct): Don't ref the shell.
-	(destroy): Don't unref the shell.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (e_shortcuts_construct): Fix typo: @shortcuts
-	should unset `GTK_FLOATING', not @storage_set.
-
-	* e-shell-view.c (get_storage_set_path_from_uri): If @uri is NULL,
-	return NULL.
-
-	* main.c (idle_cb): Restore the shell from the settings.  If this
-	fails, just create a new view.
-
-	* e-shell.c (e_shell_save_settings): New.
-	(e_shell_quit): Save settings before exiting.
-	(e_shell_restore_from_settings): New.
-
-	* e-shell-view.c (e_shell_view_save_settings): New.
-	(e_shell_view_load_settings): New.
-
-	* main.c (idle_cb): Initialize Gconf, create the GConfClient and
-	pass it to `e_shell_new()'.
-
-	* e-shell.c: New member `gconf_client' in `EShellPrivate'.
-	(destroy): Unref it if not NULL.
-	(init): Init to NULL.
-	(e_shell_new): New param @gconf_client.
-	(e_shell_construct): Likewise.
-
-	* Makefile.am (INCLUDES): Add `GCONF_CFLAGS'.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Enable the title bar button.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* e-shell.c (folder_selection_dialog_clicked_cb): Close the dialog
-	when done.  Dont do anything if 'new' was pressed, and always
-	return empty strings if 'cancel' was pressed.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* e-shell.c (impl_Shell_user_select_folder): Set the listener as
-	the corba_listener data, not the shell.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* glade/Makefile.am: Added EXTRA_DIST for make distcheck.
-
-2000-06-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-storage.c: Don't #define POSIX_SOURCE at all; this is
-	not needed anymore as we no longer use `readdir_r'.
-
-2000-06-19  Chris Toshok  <toshok@helixcode.com>
-
-	* e-local-storage.c: #undef _POSIX_SOURCE after including
-	dirent.h.  this breaks the build on freebsd if we leave it
-	#defined.  go figure.
-
-2000-06-19  Dan Winship  <danw@helixcode.com>
-
-	* evolution-shell-component-client.c
-	(evolution_shell_component_client_new): Add a warning before
-	crashing due to a known bug when it can't activate a component, so
-	people don't have to waste any time trying to figure out what's
-	up.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: Compile the CORBA-built files,
-	evolution-shell-component.c and evolution-storage.c into a
-	separate `libeshell.a' library.  Link the `evolution' executable
-	to it.  Also cleaned up a bit and got rid of the `CPP_FLAGS'
-	assignment.
-
-2000-06-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-shell-folder-selection-dialog.c: include gnome-dialog.h
-	(PARENT_TYPE): GNOME_TYPE_DIALOG replaced with gnome_dialog_get_type.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (impl_Shell_user_select_folder): New, implementation
-	for `Shell:user_select_folder'.
-	(corba_class_init): Install it.
-	(folder_selection_dialog_clicked_cb): Callback for the folder
-	selection dialog.
-
-	* Evolution-Shell.idl: New method `Shell::user_select_folder'.
-	New interface `FolderSelectionListener'.
-
-	* glade/e-shell-folder-creation-dialog.glade: Make it larger.
-
-	* e-shell-folder-creation-dialog.h: Fix typo: #include
-	<gtk/gtkwindow.h>, not <gtk/gtkwidget.h>.
-
-	* e-shell-view-menu.c: Added "Go to folder..." command.
-	(commmand_goto_folder): Implementation for it.
-
-	* e-shell-folder-selection-dialog.c: New.
-	* e-shell-folder-selection-dialog.h: New.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-local-folder.c (save_metadata): Don't set the description in
-	the XML file if null.  Compute the physical path correctly.
-
-	* e-folder.c (e_folder_construct): Allow NULL description.
-
-	* evolution-shell-component-client.c (init): Initalize
-	`listener_interface' to `CORBA_OBJECT_NIL' and `listener_servant'
-	to NULL.
-	(create_listener_interface): Return void and set the `servant' and
-	`listener_servant' fields directly.
-	(evolution_shell_component_client_async_create_folder): Updated
-	accordingly.
-
-	* e-shell-folder-creation-dialog.c: New struct `DialogData' to be
-	passed to the dialog's callbacks.
-	(dialog_data_destroy): New.
-	(e_shell_show_folder_creation_dialog): Set up a `DialogData'
-	object and pass it as the data for the signals.
-	(shell_destroy_cb): New handler for the "destroy" signal on the
-	shell.
-	(e_shell_show_folder_creation_dialog): Connect it.
-	(dialog_destroy_cb): New handler for the "destroy" signal on the
-	dialog; it frees the associated `DialogData'.
-	(e_shell_show_folder_creation_dialog): Connect it.
-	(async_create_cb): New function, callback for the async folder
-	creation function.
-	(entry_name_is_valid): New function to check if the entered folder
-	name is valid.
-	(dialog_clicked_cb): Check if the specified folder name is valid
-	and, if so, asynchronously create the new folder.
-	(add_folder_types): Set "type_name" data on each menu item.
-
-	* e-storage-set-view.c (e_storage_set_view_get_current_folder):
-	New function.
-
-	* e-storage-set.c (get_storage_for_path): New helper function.
-	(e_storage_set_get_folder): Use it.
-
-	* e-storage.c (e_storage_async_create_folder): Renamed from
-	`e_storage_create_folder'.
-	(e_storage_remove_folder): Renamed from `e_storage_remove_folder'.
-	(impl_create_create_folder): Renamed from `impl_create_folder'.
-	(impl_create_remove_folder): Renamed from `impl_remove_folder'.
-	(class_init): Updated accordingly.
-	(e_storage_result_to_string): New function.
-
-	* e-storage.h: `::create_folder' renamed to
-	`::async_create_folder'.  `::remove_folder' renamed to
-	`::async_remove_folder'.
-
-	* evolution-shell-component.h: Return type of
-	`EvolutionShellComponentCreateFolderFn' and
-	`EvolutionShellComponentRemoveFolderFn' changed to `void'.
-
-	* e-local-storage.c: `EComponentRegistry component_registry'
-	replaced with `EFolderTypeRegistry folder_type_registry' in
-	`ELocalStoragePrivate'
-	(component_async_create_folder_callback): New function, to handle
-	the callback from EvolutionShellComponent.
-	(construct): Likewise.
-	(e_local_storage_open): Replaced @component_registry with
-	@folder_type_registry.
-	(impl_create_folder): Implemented.
-
-	* e-local-folder.c (e_local_folder_new): New.
-	(e_local_folder_construct): New.
-	(e_local_folder_save): Precondition: physical URI is not NULL.
-	(save_metadata): Unlink the metadata file if `xmlSaveFile()'
-	fails.
-
-	* e-storage.c (e_storage_create_folder): Precondition: @path is
-	absolute.
-	(e_storage_remove_folder): Likewise.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c: Removed folder menu and "save as..." command.
-
-	* main.c (main): Call `glade_gnome_init()'.
-
-	* e-shell-view-menu.c (command_new_folder): Implemented.
-
-	* e-shell-folder-creation-dialog.c: New.
-	* e-shell-folder-creation-dialog.h: New.
-
-	* glade/Makefile.am: New.
-	* glade/e-shell-folder-creation-dialog.glade: New.
-
-	* e-shell-view.c (e_shell_view_get_current_uri): New.
-
-	* e-folder-type-registry.c
-	(e_folder_type_registry_get_type_names): New.
-
-	* e-shell-view.c (get_control_for_uri): Updated to use
-	`EvolutionShellComponentClient'.
-
-	* e-folder-type-registry.c: Use `EvolutionShellComponentClient's
-	instead of `BonoboObjectClient's.
-
-	* e-component-registry.c: Use `EvolutionShellComponentClient'
-	instead of `BonoboObjectClient' in `Component'.
-	(component_new): Updated accordingly.
-	(register_component): Likewise.
-
-	* evolution-shell-component-client.h: New.
-	* evolution-shell-component-client.c: New.
-
-	* evolution-shell-component.c
-	(impl_ShellComponent_async_create_folder): New, implementation of
-	`::async_create_folder'.
-	(impl_ShellComponent_async_remove_folder): New, implementation of
-	`::async_remove_folder'.
-	(corba_class_init): Install them.
-	(evolution_shell_component_new): New args `create_folder_fn' and
-	`remove_folder_fn' for setting the handlers for these new methods.
-	(evolution_shell_component_construct): Likewise.
-
-	* Evolution-ShellComponent.idl
-	(ShellComponent::async_create_folder): New.
-	(ShellComponent::async_remove_folder): New.
-	(ShellComponentListener): New.
-
-	* evolution-shell-component.c (impl_ShellComponent_create_view):
-	New param @type.  Use the new `EvolutionShellComponentCreateViewFn'.
-
-	* evolution-shell-component.h: New enum `EvolutionShellComponentResult'.
-	Changed `EvolutionShellComponentCreateViewFn' to return an
-	`EvolutionShellComponentResult'.
-
-	* e-shell-view.c (get_control_for_uri): Pass the folder type to
-	`ShellComponent::create_view'.
-
-	* Evolution-ShellComponent.idl: New param @type for
-	`ShellComponent::create_view'.
-
-2000-06-08  Miguel de Icaza  <miguel@helixcode.com>
-
-	* main.c (development_warning): Use version here.  Add padding to
-	the message.
-	Only destroy object if its window was not closed.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): Oops.  Don't create
-	the toolbar.  This was not supposed to be committed.
-
-2000-06-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage.c (folder_destroy): Don't destroy the subfolders.
-	(remove_folder): New helper function.
-	(free_private): Use it.
-	(e_storage_removed_folder): Use it here too.
-	(folder_destroy): Don't unref the EFolder if NULL.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Use
-	`gtk_signal_connect_while_alive()' instead of just
-	`gtk_signal_connect()' so that the signal handler is automatically
-	removed when we are destroyed.
-
-	* e-storage-set.c (e_storage_set_remove_all_storages): New
-	function.
-
-	* e-shell-view.c (e_shell_view_construct): Use `bonobo_object_ref'
-	on the shell instead of `gtk_object_ref'.
-	(destroy): Unref the shell.
-
-	* e-local-storage.h: #include "e-component-registry.h".
-
-	* e-shell.c (setup_local_storage): Renamed from `setup_storages'.
-	Only set up the local storage, not the CORBA one, and don't create
-	the storage set.
-	(e_shell_construct): Create the storage set here instead.  Call
-	`setup_local_storage' after setting up the components.
-
-	* e-local-storage.c: New member `component_registry' in
-	`ELocalStoragePrivate'.
-	(init): Init to NULL.
-	(destroy): If not null, unref it.
-	(e_local_storage_open): New arg @component_registry.
-	(construct): New arg @component_registry.  Init
-	`priv->component_registry' from it.
-
-	* e-local-storage.c (impl_get_name): Renamed from `get_name'.
-	(impl_create_folder): New function, implementing
-	`EStorage::create_folder'.  Just a stub for now.
-	(impl_remove_folder): New function, implementing
-	`EStorage::remove_folder'.  Just a stub for now.
-	(class_init): Install these stub implementations.
-
-	* e-storage.c (e_storage_remove_folder): New function.
-	(e_storage_create_folder): New function.
-	(impl_create_folder): New function, default implementation for
-	`::create_folder'.
-	(impl_remove_folder): New function, default implementation for
-	`::remove_folder'.
-	(class_init): Install the implementations.
-
-	* e-storage.c (impl_get_name): Renamed from `get_name'.
-	(impl_get_folder): Renamed from `get_folder'.
-	(impl_list_folders): Renamed from `list_folders'.
-
-	* e-storage.h: New virtual methods `remove_folder',
-	`create_folder'.
-
-	* e-storage.c (e_storage_removed_folder): Renamed from
-	`e_storage_remove_folder'.
-	* e-corba-storage.c (impl_StorageListener_removed_folder): Updated
-	accordingly.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (setup_bonobo_ui_handler): Create the default toolbar.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-shell-view-menu.c: Changed "Using the Shell" to "Getting Started"
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Free the uri variable.
-
-	* e-shell.c: Free the local_directory variable.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (view_delete_event_cb): New callback for the
-	"delete_event" on the view.
-	(idle_cb): Connect it.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c (set_e_shortcut_selection): Added a
-	g_return_if_fail check.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view-menu.c (command_help): New menu callback to launch
-	the help browser.
-	(menu_help): add pointers to the users' guide.
-	(e_shell_view_menu_setup): Add the help menu stuff to the uih.
-
-	* main.c (main): Set up gettext. (Problem noted by Héctor García
-	Alvarez)
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_WIDTH): Add more 5 pixels.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_WIDTH): Made the default window a bit
-	narrower.
-	(DEFAULT_HEIGHT): And shorter.
-	(setup_widgets): Set the border width of the vbox that holds the
-	title bar to 2 pixels, so that the view looks a bit nicer.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (DEFAULT_TREE_WIDTH): Made the tree 150 pixel
-	wide [instead of 100].
-	(setup_widgets): Use `DEFAULT_TREE_WIDTH' instead of
-	`DEFAULT_SHORTCUT_BAR_WIDTH' where appropriate.
-	(e_shell_view_construct): Hide the folder bar by default.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Set
-	auto-resize mode for column one.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Set the
-	statusbar.
-
-	* e-shell-view.c: New member `appbar' for `EShellViewPrivate'.
-	(init): Initialize to NULL.
-	(setup_widgets): Install a status bar and set `appbar' to point to
-	it.
-	(setup_bonobo_ui_handler): Make the BonoboUIHandler use `appbar'
-	as its statusbar.
-	(e_shell_view_get_appbar): New function.
-	(e_shell_view_construct): Set up the BonoboUIHandler after setting
-	up the widgets.
-
-	* e-shortcuts.c (class_init): Add new signals "new_shortcut",
-	"removed_shortcut", "new_group", "removed_group".
-	(e_shortcuts_remove_shortcut): Emit "remove_shortcut".
-	(e_shortcuts_add_shortcut): Emit "new_shortcut".
-	(e_shortcuts_remove_group): Emit "remove_group".
-	(e_shortcuts_add_group): Emit "new_group".
-	(unload_shortcuts): Emit "remove_group" for all the groups.
-
-	* e-shortcuts.h: New signals "new_shortcut", "removed_shortcut",
-	"new_group", "removed_group".
-
-	* e-shortcuts-view.c (pop_up_right_click_menu): New function to
-	pop up the right-click menu for the shortcut bar.
-	(pop_up_right_click_menu_for_shortcut): New function.
-	(selected_item): Pop up right click menu when appropriate.  Don't
-	activate the shortcut when right-clicking.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.h: #include 'Evolution.h".
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c (show_error): Use `set_current_notebook_page()'
-	instead of `gtk_notebook_set_page()'; this will also deactivate
-	the current control properly.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): Initialize the
-	state of the shortcut/folder toggle menu items using
-	`e_shell_view_get_shortcut_bar_mode()' and
-	`e_shell_view_get_folder_bar_mode()'.
-	(command_toggle_shortcut_bar): Removed debugging message.
-	(command_toggle_folder_bar): Likewise.
-
-	* e-shell-view.c (e_shell_view_get_shortcut_bar_mode): New
-	function.
-	(e_shell_view_get_folder_bar_mode): New function.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New constant `DRAG_RESISTANCE'.  New
-	members `button_x', `button_y' in `EStorageSetViewPrivate'.
-	(init): Initialize to zero.
-	(button_press_event): Set.
-	(motion_notify_event): Don't start drag unless the current x/y
-	position is farther than `DRAG_RESISTANCE', in any of the two
-	directions, from the original position of the button click.
-	(button_release_event): Always ungrab the pointer, even if
-	`selected_row_path' is NULL.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-shell-component.c (class_init): Eeek!
-	s/owner_set/owner_unset/.
-
-	* e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct):
-	Increase the size of the border of the hbox slightly to make the
-	title bar a bit nicer.
-
-2000-05-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-component-registry.c (component_free): Invoke `::unset_owner'
-	on the component before releasing it.
-
-	* evolution-shell-component.c (class_init): Install the
-	"owner_set" signal.
-	(impl_ShellComponent_unset_owner): New function, implementation of
-	`ShellComponent::unset_owner'.
-	(corba_class_init): Install it.
-
-	* evolution-shell-component.h: New signal "owner_unset".
-
-	* Evolution-ShellComponent.idl: New method `ShellComponent::
-	unset_owner'.
-
-	* e-shell.c (e_shell_quit): Destroy all the views explicitly.
-
-	* e-shell-view-menu.c: Changed `Show shortcut bar' and `Show
-	folder tree' items into toggle items.
-	(shortcut_bar_mode_changed_cb): New callback to update the status
-	of the "show shortcut bar" toggle item when the shortcut bar is
-	hidden/shown in the view.
-	(folder_bar_mode_changed_cb): Likewise for the folder bar.
-	(e_shell_view_menu_setup): Connect these to the corresponding
-	signals on the shell.
-
-	* e-shell-view.c: New members `shortcut_bar_mode' and
-	`folder_bar_mode' in `EShellViewPrivate'.
-	(init): Initialize `shortcut_bar_mode' and `folder_bar_mode' to
-	`E_SHELL_VIEW_SUBWINDOW_HIDDEN'.
-	(class_init): Add the new signals.
-	(e_shell_view_set_shortcut_bar_mode): Renamed from
-	`e_shell_view_show_shortcuts'.  Emit "shortcut_bar_mode_changed"
-	and update the `shortcut_bar_mode' member.
-	(e_shell_view_set_folder_bar_mode): Renamed from
-	`e_shell_view_show_folders'.  Emit "folder_bar_mode_changed" and
-	update the `folder_bar_mode' member.
-
-	* e-shell-view.h: New signals "shortcut_bar_mode_changed",
-	"folder_bar_mode_changed".
-
-	* e-shell-view.c (setup_menus): Removed.
-	(e_shell_view_construct): Use `e_shell_view_menu_setup' instead.
-	(e_shell_view_get_bonobo_ui_handler): New function.
-
-	* e-shell-view-menu.c (e_shell_view_menu_setup): New.
-
-	* e-shell.c (impl_Shell_get_component_for_type): New function,
-	implementation of `Evolution::Shell::get_component_for_type'.
-	(corba_class_init): Install it into the EPV.
-
-	* Evolution-Shell.idl: Added method `get_component_for_type'.
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c: New members `dirty', `save_idle_id' in
-	`EShortcutsPrivate'.
-	(init): Initialize.
-	(destroy): If the idle ID is nonzero, remove the idle.  If `dirty'
-	is true, save.
-	(idle_cb): New.
-	(schedule_idle): New.
-	(make_dirty): New.
-	(e_shortcuts_remove_shortcut): Call it.
-	(e_shortcuts_add_shortcut): Likewise.
-	(e_shortcuts_remove_group): Likewise.
-	(e_shortcuts_add_group): Likewise.
-
-	* e-shell.c (e_shell_construct): Updated to match the `EShortcuts'
-	API changes.
-
-	* e-shortcuts.c: New member `file_name' in `EShortcutsPrivate'.
-	(init): Init to NULL.
-	(destroy): Free it.
-	(e_shortcuts_load): Removed.
-	(e_shortcuts_save): Removed.
-	(e_shortcuts_new): New arg @file_name.  Load from the specified
-	file name.
-
-	* e-shortcuts-view.c (added_item): New method implementation.
-	(removed_item): New method implementation.
-	(added_group): New method implementation.
-	(removed_group): New method implementation.
-	(class_init): Install these.
-
-	* e-shortcuts.c (e_shortcuts_remove_shortcut): New function.
-	(e_shortcuts_add_shortcut): New function.
-	(e_shortcuts_remove_group): New function.
-	(e_shortcuts_add_group): New function.
-
-	* e-shell-view.c: New member `view_title_bar' in
-	`EShellViewPrivate'.
-	(setup_widgets): Put an EShellFolderTitleBar on top of the tree
-	view and the content view.
-	(update_window_icon): Renamed from `set_icon'.
-	(update_folder_title_bar): New.
-	(popup_tree): New function to pop up the tree view when the title
-	button in the title bar is clicked.
-	(folder_title_clicked_cb): New callback for the "clicked" signal
-	of EShellFolderTitleBar.
-	(setup_widgets): Don't add a title bar to the shortcut bar.
-	(create_storage_set_subwindow): New helper function.
-	(setup_widgets): Use it.
-	(show_error): Use an EClippedLabel instead of a GtkLabel.
-
-	* e-shell-view.c: Replaced all the occurences of `gpointer' with
-	`void *' for consistency.
-
-	* e-shell-folder-title-bar.c: New file.
-	* e-shell-folder-title-bar.h: New file.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Ooops.  Fix
-	inverted key/value pair in the call to `g_hash_table_insert()'.
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* main.c (main): Remove extra free of evolution_directory.
-
-2000-05-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-storage.c (evolution_storage_register): Use the
-	storage's name when registering.
-
-2000-05-26  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view-menu.c (command_about_box): Make authorlist more
-	alphabetical.
-	(command_show_treeview): New function; shows the treeview, when it
-	has been hidden.
-	(command_show_shortcut_bar): New function; shows the shortcut bar,
-	when it's been hidden.
-
-2000-05-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-corba-storage.c (impl_StorageListener_new_folder): Set the
-	physical URI on the folder using `e_folder_set_physical_uri()'.
-
-	* e-local-folder.c (get_physical_uri): Removed.
-	(construct_loading_metadata): Use EFolder's `physical_uri' field
-	instead of ours, which is gone.
-	(save_metadata): Likewise.
-	(destroy): Don't free.
-
-	* e-local-folder.h: Removed `physical_uri' from `ELocalFolder'.
-
-	* e-folder.c: New member `physical_uri' in `EFolderPrivate'.
-	(init): Initialize to NULL.
-	(destroy): Free it.
-	(get_physical_uri): Removed.
-	(e_folder_set_physical_uri): New function.
-
-	* e-storage-set.c (e_storage_set_get_folder): Fix off-by-one error
-	in extracting the base name.
-
-	* e-storage.c: New member `path' in `Folder'.
-	(folder_destroy): Free it.
-	(folder_new): New arg.  Initialize `path' from it.
-	(e_storage_construct): Updated accordingly.
-	(e_storage_new_folder): Likewise.
-	(e_storage_remove_folder): Remove the folder from the hash.
-
-	* e-storage-set-view.c (remove_node): New function.
-	(removed_storage_cb): Use it.
-	(new_folder_cb): New function, callback for the "new_folder"
-	signal on the EStorageSet.
-	(removed_folder_cb): New function, callback for the
-	"removed_folder" signal on the EStorageSet.
-	(e_storage_set_view_construct): Connect these signal handlers to
-	the respective signals on our model storage.
-
-	* e-storage-set.c (storage_new_folder_cb): New function, callback
-	for the "new_folder" signal on the storages.
-	(storage_removed_folder_cb): New function, callback for the
-	"removed_folder" signal on the storages.
-	(e_storage_set_add_storage): Connect them to the signals of the
-	storage being added.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_register_storage): Throw an exception if
-	`e_storage_set_add_storage()' returns false.
-
-	* e-shell.c (setup_storages): Unref the local storage after adding
-	to the storage set.
-
-	* e-corba-storage-registry.c
-	(impl_StorageRegistry_register_storage): Unref the storage after
-	adding to the storage set.
-
-	* e-storage-set.c: New hash table `name_to_named_storage' in
-	`EStorageSetPrivate'.
-	(named_storage_new): New helper function.
-	(named_storage_destroy): New helper function.
-	(e_storage_set_add_storage): Use the hash table.  Return value
-	changed to `gboolean'.  Return FALSE if there is a storage with
-	that name already.  Also, ref the storage.
-	(e_storage_set_remove_storage): Likewise [but of course don't ref
-	the storage].
-	(e_storage_set_get_storage): Use the `name_to_named_storage' hash
-	table.
-	(destroy): Destroy the `name_to_named_storage' hash.
-
-	* e-storage-set.h: New signals "new_folder", "removed_folder".
-
-	* e-storage.c (e_storage_get_watcher_for_path): Removed.
-	(get_watcher_for_path): Removed.
-	(class_init): Install signals "new_folder" and "removed_folder".
-	(e_storage_remove_folder): Emit "removed_folder".
-	(e_storage_new_folder): Emit "new_folder".
-
-	* e-storage.h: Removed method `get_watcher_for_path'.  New signals
-	"new_folder", "removed_folder".
-
-	* e-storage-watcher.c: Removed.
-	* e-storage-watcher.h: Removed.
-
-	* e-corba-storage-registry.c (corba_class_init): Set the
-	Bonobo_Unknown evp parts.
-
-	* evolution-storage.c: New.
-	* evolution-storage.h: New.
-
-	* evolution-shell-component.c
-	(evolution_shell_component_get_owner): New.
-
-	* e-storage-set-view.c (new_storage_cb): New function.
-	(e_storage_set_view_construct): Connect to the "new_storage"
-	signal on the EStorageSet.
-	(removed_storage_cb): New function.
-	(e_storage_set_view_construct): Connect to the "removed_storage"
-	signal on the EStorageSet.
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Make this
-	always look pretty, with Helix GNOME or without.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-storage-set-view.c: Make this always look pretty, with Helix
-	GNOME or without.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c (e_storage_set_view_construct): Set the
-	dotted line type again.  Dotted is less butt-ugly than continuous.
-
-	* e-shell-view.c (show_error): Display page zero in the notebook.
-
-	* main.c (idle_cb): Renamed from `new_view_idle_cb'.  Create the
-	EShell object here, because now the shell depends on the GLib loop
-	to be running for correct operation.
-	(main): Don't create the EShell here.
-
-	* e-storage-set-view.c (get_pixmap_and_mask_for_folder): If the
-	icon is not found, set the returned pixmap and mask to NULL.
-
-	* e-shell.c (e_shell_construct): Added precondition: @corba_object
-	must be non-nil.
-	(e_shell_new): Added precondition: @local_direcory must be
-	non-null.
-
-	* evolution-shell-component.c: New.
-	* evolution-shell-component.h: New.
-
-	* e-shell.c: New member `component_registry' in `EShellPrivate'.
-	(init): Initialize to NULL.
-	(destroy): Unref it.
-	(setup_components): New function to set up the compnent registry
-	and initialize the mail, calendar and addressbook components.
-	(e_shell_construct): Call it.
-
-	* e-storage-set.c: Updated to use EFolderTypeRegistry.
-	* e-storage-set.h: Likewise.
-	* e-shortcuts.c: Likewise.
-	* e-shortcuts.h: Likewise.
-	* e-shell.c: Likewise.
-
-	* e-shell.h: Likewise.
-	* e-shell-view.c: Likewise.
-	* e-shortcuts-view.c: Likewise.
-	* e-storage-set-view.c: Likewise.
-
-	* e-component-registry.c: New.
-	* e-component-registry.h: New.
-
-	* e-folder-type-registry.c: New.
-	* e-folder-type-registry.h: New.
-
-	* e-folder-type-repository.c: Removed.
-	* e-folder-type-repository.h: Removed.
-
-	* Evolution-ShellComponent.idl: New struct `FolderType'; new type
-	`FolderTypeList'. New attribute `supported_types'.
-	(ShellComponent::set_owner): Renamed from `set_shell'.
-	(ShellComponent::create_view): New.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Was using the wrong include here.
-
-	* e-storage-set-view.c: Got rid of the lines in the tree view.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added libepaned.a.
-
-	* e-shell-view.c: Switched from GtkPaned to EPaned.
-
-2000-05-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c: New member `corba_storage_registry' in
-	`EShellPrivate'.
-	(init): Initialize it to NULL.
-	(destroy): Unref it if not NULL.
-	(setup_corba_storages): New function to set up the CORBA storage
-	registry and `bonobo_object_add_interface()' it to the shell.
-	(setup_storages): Call it from here.
-
-	* e-shell.h, e-shell.c: Derive EShell from BonoboObject instead of
-	GtkObject.
-
-	* e-storage.c (e_storage_remove_folder): Return value changed into
-	`gboolean'; return false if an error occurs, true otherwise.
-	(e_storage_new_folder): Likewise.
-
-	* e-corba-storage-registry.c: New.
-	* e-corba-storage-registry.h: New.
-
-	* e-corba-storage.c: New.
-	* e-corba-storage.h: New.
-
-	* Evolution.idl: Include the new IDLs, but no
-	`evolution-service-repository.idl' anymore.
-
-	* Evolution-Shell.idl: New.
-	* Evolution-ShellComponent.idl: New.
-	* Evolution-Storage.idl: New.
-
-	* evolution-service-repository.idl: Removed.
-	* evolution-service-repository.c: Removed.
-	* evolution-service-repository.h: Removed.
-
-	* e-folder-type-repository.c (folder_type_new): Free `icon_path'.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* main.c (new_view_idle_cb): add development_warning (moved from
-	mail component)
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: Get rid of the `ICON_WIDTH' and
-	`ICON_HEIGHT' #defines.
-	(get_pixmap_and_mask_for_folder): Get the mini icon instead of the
-	big one.  Use `E_SHELL_MINI_ICON_SIZE' instead of `ICON_WIDTH' and
-	`ICON_HEIGHT'.
-
-	* e-folder-type-repository.c: New member `mini_icon_pixbuf' in
-	`FolderType'.
-	(folder_type_new): Initialize `mini_icon_pixbuf' by loading the
-	mini icon if possible.  If the mini icon is not found, resort to
-	the big one.
-	(folder_type_free): Unref the mini icon.
-	(e_folder_type_repository_get_icon_for_type): New arg @mini.  If
-	true, return the mini icon instead of the standard one.
-
-	* e-shell-view.c (set_icon): Get the mini icon instead of the big
-	one by using `e_shell_get_icon_path's @try_mini arg.
-
-	* e-shell-constants.h: New file.
-
-	* e-shell-utils.c
-	(e_shell_get_icon_path): New arg @try_mini.  If true, look for the
-	mini version [whose name ends in `-mini'].
-
-	* e-folder-type-repository.c
-	(folder_type_new): Free string returned by
-	`e_shell_get_icon_path()'.
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: New members `storage_set_view_box',
-	`shortcut_bar_box', `hpaned1_position', `hpaned2_position' in
-	`EShellViewPrivate'.
-	(init): Initialize them.
-	(setup_widgets): Add title bars to the tree and shortcut views.
-	(shortcuts_view_close_button_clicked_cb): New callback function.
-	(setup_widgets): Connect to the "close_button_clicked" signal of
-	the shortcut view's title bar.
-	(storage_set_view_close_button_clicked_cb): New callback function.
-	(setup_widgets): Connect to the "close_button_clicked" signal of
-	the storage set view's title bar.
-	(e_shell_view_show_shortcuts): New function.
-	(e_shell_view_show_folders): New function.
-
-	* e-shell-view.c: New members `hpaned1', `hpaned2' in
-	`EShellViewPrivate'.
-	(init): Initialize both to NULL.
-	(setup_widgets): Invert the parenting order for the GtkHPaneds and
-	store them into the private `hpaned' and `hpaned2' members.
-
-	* Makefile.am (evolution_LDADD): Link with `libemiscwidgets.a'.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c
-	(load_shortcuts_into_view): Removed.
-	(e_shortcuts_new_view): Don't set up the shortcut bar manually
-	here anymore, and don't set the icon callback either.  The
-	`EShortcutsView' object is now able to do this by itself.
-
-	* e-shortcuts-view.c
-	(icon_callback): Moved here from `e-shortcuts.c'.
-	(load_group): New function.
-	(load_all_shortcuts): New function.
-	(e_shortcuts_view_construct): Call it to load the shortcuts from
-	the `EShortcuts' object.  Also, set `icon_callback' as the icon
-	callback.
-
-	* e-storage-set-view.c
-	(button_press_event): Add/remove grab with `gtk_grab_add' and
-	`gtk_grab_remove'.
-	(button_release_event): Call `gtk_grab_remove' when removing the
-	grab.
-
-	* e-shortcuts.c: New member `title_to_group' in
-	`EShortcutsPrivate'.
-	(init): Initialize here.
-	(destroy): Destroy here.
-	(unload_shortcuts): Destroy and recreate here.
-	(load_shortcuts): Avoid inserting multiple groups with the same
-	title, and insert the groups into the `title_to_group' hash table.
-	Also, avoid leaking the return value from `xmlNodeListGetString'.
-	(e_shortcuts_get_group_titles): New function.
-	(e_shortcuts_get_shortcuts_in_group): New function.
-	(e_shortcuts_get_storage_set): New function.
-
-	* e-storage-set-view.c
-	(e_storage_set_view_set_current_folder): Emit the
-	"folder_selected" signal.
-
-	* e-local-folder.c
-	(get_string_value): Return a `char *' to be deallocated by the
-	caller instead of a `const char *' that does not need to be
-	deallocated.
-	(construct_loading_metadata): Free values returned from
-	`get_string_value'.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New members `dragged_row_path',
-	`selected_row_path_before_click' in `EStorageSetViewPrivate'.
-	(init): Initialize them to NULL.
-	(motion_notify_event): Set `dragged_row_path' from
-	`selected_row_path'.
-	(button_press_event): Initialize `selected_row_path_before_click'
-	from `selected_row_path'.
-	(button_release_event): Set `selected_row_path_before_click' to
-	NULL.
-	(drag_end): Restore the current selection from
-	`selected_row_path_before_click'; then set both `dragged_row_path'
-	to NULL.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c: New members `in_drag' and `drag_button' in
-	`EStorageSetViewPrivate'.  New static variables `drag_types',
-	`num_drag_types', `target_list'.
-	(class_init): Create the `target_list'.
-	(init): Initialize the private `in_drag' member to false.
-	Initialize the private `drag_button' member to zero.
-	(button_release_event): Set it to false.
-	(motion_notify_event): New function, implementation of
-	`GtkWidget::motion_notify_event'.  If `in_drag' is false, set it
-	to true and set ourselves up as a drag source.
-	(button_press_event): New function, implementation of
-	`GtkWidget::button_press_event'.  Set `drag_button' to the event's
-	button number and then chain to the implementation in the parent
-	class.
-	(drag_end): New function, implementation of `GtkWidget::drag_end'.
-	(drag_data_get): New function, implementation of
-	`GtkWidget::drag_data_get'.
-	(set_e_shortcut_selection): New function, helper for `drag_data_get'.
-	(set_uri_list_selection): New function, helper for `drag_data_get'.
-	(class_init): Install these method implementations.
-
-	* e-storage-set-view.c: New member `selected_row_path' in
-	`EStorageSetViewPrivate'.
-	(init): Initialize it to NULL.
-	(tree_select_row): Set it to the path of the selected row.  Don't
-	emit "folder_selected" yet.  Also, keep the grab.
-	(button_release_event): New function, implementation of
-	`GtkWidget::button_release_event'.  If `selected_row_path' is not
-	NULL, emit the "folder_selected" signal with `selected_row_path'
-	as the parameter and then set `selected_row_path' to NULL again.
-	(class_init): Install `button_release_event'.
-
-	* e-storage-set-view.c: Made `ICON_WIDTH' and `ICON_HEIGHT' global
-	#defines.
-	(e_storage_set_view_construct): Set the row height to
-	`ICON_HEIGHT'.  Alos, set the selection mode to
-	`GTK_SELECTION_BROWSE'.
-
-2000-05-15  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* e-local-folder.c (get_string_value): Use the correct function to
-	get the node's contents.
-	
-	* e-shortcuts.c (load_shortcuts): Same as above.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-type-repository.c
-	(e_folder_type_repository_get_control_id_for_type): Protect
-	against non-existing types.
-	(e_folder_type_repository_get_icon_for_type): Likewise.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-storage-set-view.c
-	(folder_compare_cb): Callback comparison function for comparing
-	folders based on their names.
-	(insert_folders): Use it to sort the folder list before using it.
-
-2000-05-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c
-	(setup_storages): Pass the pointer to the folder type repository.
-	(e_shell_construct): Initialize the folder type repository before
-	everything else.
-
-	* e-storage-set.c: New member `folder_type_repository' in
-	`EStorageSetPrivate'.
-	(init): Initialize it to NULL.
-	(destroy): Unref it.
-	(e_storage_set_construct): New arg @folder_type_repository.
-	Initialize the corresponding member in the private struct through
-	it.
-	(e_storage_set_new): New arg @folder_type_repository.
-	(e_storage_set_get_folder_type_repository): New function.
-
-	* e-shortcuts.c (icon_callback): Just use [the new version of]
-	`e_folder_type_repository_get_icon_for_type()' instead of loading
-	the image manually.
-
-	* e-folder-type-repository.c: New member `icon_pixbuf' in
-	`FolderType'.
-	(folder_type_new): Load the pixbuf.
-	(folder_type_free): Unref the pixbuf.
-	(e_folder_type_repository_get_icon_name_for_type): Renamed from
-	`e_folder_type_repository_get_icon_for_type'.
-	(e_folder_type_repository_get_icon_for_type): New function, now
-	returning a `GdkPixbuf *'.
-
-	* e-shortcuts.c
-	(icon_callback): Use `e_shell_get_icon_name()'.
-
-	* e-shell-view.c: New member `storage_set_view' in
-	`EShellViewPrivate'.
-	(init): Initialize it to NULL.
-	(e_shell_view_construct): Create an EStorageSetView for the
-	shell's EStorageSet and put it into a scrolled window.  Also, put
-	the scrolled window into the EShellView with some
-	[temporary] GtkPaned action.  Store the pointer to the
-	EStorageSetView to `priv->storage_set_view'.
-	(set_icon): Get an EShellView and an EFolder instead of an
-	EShellView and a URI.  Also, don't leak.
-	(update_for_current_uir): New helper function.  Call `set_icon'.
-	(show_error): Call it.
-	(folder_selected_cb): New function.
-	(setup_widgets): Connect it to the "folder_selected" signal of the
-	storage set view.
-
-	* e-storage-set-view.c: New file.
-	* e-storage-set-view.h: New file.
-
-	* e-shell-utils.c: New file.
-	* e-shell-utils.h: New file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view-menu.c: Added an about box.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Set the icons when changing between components.
-
-	* main.c: Set the default icon.  (The change in e-shell-view.c
-	doesn't work unless we do this.)
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view-menu.c (command_run_bugbuddy): New function; allows
-	users to submit a bug.
-	(command_run_bugbuddy): Implemented with jacob's patch.
-
-2000-05-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_new_view): Display the specified @uri in the
-	view.
-
-	* e-shell-view.c (e_shell_view_construct): Removed arg @uri.
-	(e_shell_view_new): Likewise.
-
-	* main.c: New string constant `STARTUP_URI', specifying the URI to
-	show in the startup view.
-	(new_view_idle_cb): New callback function to create a new view for
-	`STARTUP_URI' in the idle loop.  We need to do this in the idle
-	loop because the CORBA stuff cannot work until the loop starts
-	running.
-	(main): Set `new_view_idle_cb' up as the idle callback instead of
-	creating the view right away.
-
-2000-05-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (setup_storages): Woops.  Don't free the path before
-	the warning message, as we need to print it.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (destroy_cb): New function.
-	(main): Connect it to the `destroy' signal on the shell.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (load_shortcuts): Const fix.
-
-2000-05-08  Larry Ewing  <lewing@helixcode.com>
-
-	* e-shortcuts.c (load_shortcuts_into_view): xmlFree the return
-	value of xmlGetProp.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts-view.c (e_shortcuts_view_construct): Use
-	correct cast.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (main): Connect to "no_views_left", not "destroy".
-
-	* e-shell.c (view_destroy_cb): Grmpf.
-
-2000-05-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell.c (e_shell_construct): Output a warning message if the
-	shortcut file is not found.
-	(setup_storages): Output a warning message if the local storage
-	cannot be initialized.
-	(destroy): Destroy all the views.
-
-	* e-shell-view.c
-	(e_shell_view_construct): Ref the shell.
-
-	* e-shortcuts-view.c
-	(e_shortcuts_view_construct): Ref the shortcuts.
-
-	* e-shell.c: Create the "no_views_left" signal.  New member
-	`views' in `EShellPrivate'.
-	(init): Initialize `views' to NULL.
-	(view_destroy_cb): Destroy handler for a view: remove the view
-	from `views', and emit the "no_views_left" signal if this was the
-	last view.
-	(e_shell_new_view): Add the new view to `views' and connect the
-	"destroy" signal to `view_destroy_cb'.
-	(destroy): Destroy the views.
-
-	* e-shell.h: New signal "no_views_left".
-
-	* e-shell-view-menu.c (command_quit): New function, implementation
-	of the "quit" command.
-
-	* e-shell-view.c (e_shell_view_get_shell): New function.
-
-	* e-shell.c (e_shell_quit): New function.
-
-	* main.c (main): If it is not possible to create the shell for
-	some reason, pop up an error message.
-	(shell_destroy_cb): New function, signal handler for "destroy" on
-	the shell object.
-	(main): Connect it.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcuts.c (destroy): Be safer about NULL objects.
-
-	* e-shell.c (destroy): Be safer about NULL objects.
-
-	* e-local-storage.c (load_folders): Use `readdir()', not
-	`readdir_r()'.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* main.c (init_corba) [! USING_OAF]: We have no options no
-	popt context.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* All files: Reorganized and redone a lot of the shell.  New
-	features: internal URI namespace, extensible storage/folder
-	mechanism, configurable shortcuts.
-
-2000-05-03  Damon Chaplin  <damon@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_new): turned the notebook border off.
-	The calendar looks better without it. If any of the views want a
-	border they should create it themselves, shouldn't they?
-
-2000-05-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shortcut.c (shell_icon_cb): Type of @url changed from `gchar
-	*' to `const gchar *'; new arg @data.
-	(e_shortcut_bar_view_new): Pass NULL as the closure value for
-	`e_shortcut_bar_set_icon_callback()'.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder-mail.c: Removed.
-
-	* e-folder-mail.h: Removed.
-
-	* eshell-types.h: Removed.
-
-	* e-folder.h: Don't #include "eshell-types.h".
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-folder.h: Removed member `eservice' from `EFolder'.
-
-	* e-service.c: Removed.
-
-	* e-service.h: Removed.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  Dan Winship  <danw@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_set_view): Turn off control frame
-	autoactivation, so the toolbars work correctly. This may actually
-	be a bug in Bonobo, but we'll kludge around it here for now.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-shell-view.c: OAFized.
-	(get_view): If `bonobo_widget_new_control()' fails for the
-	calendar, don't try to get the property bag and stuff and thus
-	prevent a segfault.
-
-	* main.c
-	(corba_init): Removed Bonobo initialization.  Implemented OAF
-	version for the case in which `USING_OAF' is #defined.
-	(init_bonob): New function.
-	(main): Call `init_bonobo()'.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (bonobo_widget_is_dead): Helper function to see
-	whether a bonobo widget is a zombie (ie the remote bonobo control
-	died).
-	(e_shell_view_set_view): Try to respawn dead widgets.
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: include -I$(datadir)/idl in orbit-idl arguments so
-	that you can have bonobo installed in the same prefix as
-	evolution, when that isn't the same prefix is gnome-libs, which a
-	lot of people seem to be doing.
-	(CLEANFILES): add EVOLUTION_CORBA_GENERATED
-	
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* idl/folder.idl: Made some functions syncronous that didn't need
-	to be asyncronous.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.h: Added hpaned and treeview widgets to
-	EShellView. Added e_shell_view_toggle_shortcut_bar() and
-	e_shell_view_toggle_treeview().
-
-	* e-shell-view.c (e_shell_view_setup_shortcut_display): Use EPaned
-	widget to house our shortcut bar.
-	(e_shell_view_toggle_shortcut_bar): New function; toggles whether
-	the shortcut bar is showing.
-	(e_shell_view_toggle_treeview): Same, for the treeview (NYI).
-	(e_shell_view_new): Put the notebook view in our EPaned widget.
-
-	* e-shell-view-menu.c (esv_cmd_toggle_shortcut_bar): New function;
-	toggles whether the shortcut bar is viewed.
-	(esv_cmd_toggle_treeview): Same, but with the treeview.  Added
-	menuitems in the "view" menu to allow access to the above.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* e-shell-view.c (get_view): set calendar's uri with a property bag
-
-2000-04-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* idl/folder.idl: New idl file.  Still unused.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-shell-view.c: Made the left pane of the shell view not
-	autoresize.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (e_shell_view_setup): Set the default height
-	bigger, to 600, so that everything in the shortcut-bar shows up.
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* e-shell-view.c (destroy_folder_view): New function;
-	Bonobo_Unknown_unref's the controls that have the views in them.
-	(esv_destroy): Calls the above for each folder_view in the
-	hashtable.
-	(get_view): unref the ServiceRepository interface of the control
-	when we're done with it.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shortcut.c (shell_icon_cb): Append a slash here.
-	(shell_icons): Only list the filenames.
-
-	* shell/main.c (evolution_boot): Be less rude.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* shell/main.c (evolution_boot): Make sure our data directory is
-	available with e_setup_base_dir ().
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shortcut.c (shell_icon_cb): Load the icons from the
-	installation path, not form the GNOME-libs installation prefix. 
-	(shell_icon_cb): Memory leak fix.
-
-	* shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES
-	installation directory here.
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* shell/e-shell-view.c (get_view): hook up control:calendar
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shortcut.c (e_shortcut_bar_view_new, shell_icon_cb):
-	Update for shortcut bar changes.
-
-	* shell/e-folder.h: add E_FOLDER_SUMMARY
-	* shell/e-shell.c (e_shell_setup_default_folders): make the
-	"Today" icon be of type E_FOLDER_SUMMARY, not E_FOLDER_MAIL.
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Hold off on
-	deactivating the "outgoing" control until after setting up the
-	"incoming" control. That way if the new control takes a few
-	seconds to load, there won't be an ugly empty spot where the
-	toolbar used to be while the new control loads.
-
-2000-03-29  Dan Winship  <danw@helixcode.com>
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Call
-	bonobo_control_frame_activate on the folder_view every time it
-	is displayed, and bonobo_control_frame_deactivate every time it is
-	hidden.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* shell/e-shell-view.c (get_view): Move CORBA_Environment to
-	different scope.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* shell/main.c (evolution_boot): gtk_signal_connect'ed "destroy"
-	to gtk_main_quit, so that the shell dies when you want it to.
-
-	* shell/e-shell-view.c (get_view): Reorganized, and added
-	assertions.
-	(e_shell_view_set_view): Added assertions.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-	
-	* shell/e-shell-view.h: New private field in EShellView added,
-	which contains the notebook and a hashtable of folders to views.
-
-	* shell/e-shell-view.c (e_shell_view_set_view): Instead of
-	creating a new control every time we set the view, we now keep our
-	controls in a notebook. This function now switches to the correct
-	notebook page, or creates a new page/control as necessary.
-	(e_shell_view_new): Creates and inserts the notebook into the
-	shell.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* shell/e-shell-view.c: Added an E_FOLDER_CONTACTS section to the
-	get_view function.
-
-2000-03-13  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell.c (EShell_register_service): 
-	test implementation. Show the uri and the type 
-	of service that	has just been registered.
-	
-	* shell/e-shell-view.c (get_view): 
-	once we have the bonobo control widget, 
-	disable the autoactivation and activate
-	the control frame.
-	(get_view): added a parameter to have
-	a reference to the EShellView.
-	(get_view): In the case of the mail component
-	use the Evolution_ServiceRepository to 
-	give the component a reference to the 
-	Shell server.
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell-view.c (get_view): name change
-	
-
-	* shell/e-folder.c (e_folder_get_folder_type): added the
-	get_e_folder_type function.
-
-	* shell/evolution-service-repository.c:
-	(evolution_service_repository_new): creates an 
-	Evolution_ServiceRepository object.
-	(create_evolution_service_repository): 
-	create the corresponding servant.
-	(evolution_service_repository_construct): set 
-	the closure as well as the virtual functions. 
-
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/evolution-service-repository.c: 
-	* shell/evolution-service-repository.h: 
-	Implementation of the service repository interface
-	as a bonobo object.
-
-	* shell/evolution-service-repository.idl: 
-	new file. Contains the definition for the service
-	repository interface.
-
-	* shell/Shell.idl: move the shell related stuff 
-	here
-	
-2000-03-12  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-folder.h: add a field refering to a
-	service associated to the efolder. In the case of 
-	distant folders, it is generally a server.  
-
-	* shell/e-service.c: New class. Models a service.
-	A service is an object with an URI and a root folder. 
-	It genreally reporesents a distant folder. 
-	A service is generally a ressource shared amongst
-	several folders. 
-	* shell/e-service.h: 
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* shell/e-shell-shortcut.c (shortcut_bar_item_selected): 
-	removed a test that prevented the standard menu 
-	to be shown.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* shell/Makefile.am (INCLUDES): use `top_srcdir' instead of
-	`srcdir'.  Also, add `$(top_srcdir)'.  And put the srcdir includes
-	before everything else.
-	(evolution_LDADD): `libeutil.la', not `libeutil.a'.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* shell/Makefile.am (evolution_LDADD): 
-	add libetext.a.
-
-2000-02-08  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* shell/Makefile.am: Changed the order of the compilation, so the CORBA
-	stuff was generated before it was needed.
-
-2000-01-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/e-shell.c: Construct the default folders 
-
-	* shell/e-shell-view.c (e_shell_view_new): Setup the main GnomeApp
-	application, load the shortcut, internal api. 
-
-	* shell/e-folder.c (e_folder_get_type_name): Return description
-	here;  Change of policy;  We now know about all of the possible
-	types that can be displayed on Evolution. 
-
-2000-01-15  Miguel de Icaza <miguel@gnu.org>
-
-	* shell/e-folder.c: Renamed signal.
-
-	* widgets/shortcut-bar/e-shortcut-bar.c (e_shortcut_bar_add_item):
-	Use e_bar_set_item_data.
-
-	Drop item_url;  Require image argument;  Require user data
-	argument. 
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* shell/Makefile.am: New file.
-
diff --git a/shell/Evolution-LocalStorage.idl b/shell/Evolution-LocalStorage.idl
deleted file mode 100644
index 04d04c7150..0000000000
--- a/shell/Evolution-LocalStorage.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution local storage.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	interface LocalStorage : Evolution::Storage {
-		/**
-		 * update_folder:
-		 * @path: Path of a folder within the storage.
-		 * @display_name: Name to be displayed in the tree view for
-		 * this folder
-		 * @highlighted: Whether or not to highlight the name.
-		 *
-		 * Set the name to display for the folder at the specified
-		 * @path.
-		 */
-		void updateFolder (in string path,
-				   in string display_name,
-				   in boolean highlighted);
-	};
-};
-};
diff --git a/shell/Evolution-Session.idl b/shell/Evolution-Session.idl
deleted file mode 100644
index 6e842e421c..0000000000
--- a/shell/Evolution-Session.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for saving configuration information.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.h>
-
-module GNOME {
-module Evolution {
-
-	interface Session : Bonobo::Unknown {
-		exception Failed {};
-
-		/**
-		 * saveConfiguration:
-		 * @prefix: A configuration path prefix.
-		 *
-		 * Save the current configuration at the specified @prefix.
-		 * The component can use any path starting by @prefix for its
-		 * keys.
-		 */
-		void saveConfiguration (in string prefix)
-			raises (Failed);
-
-		/**
-		 * loadConfiguration:
-		 * @prefix: A configuration path prefix.
-		 *
-		 * Load the saved configuration at the specified @prefix.
-		 */
-		void loadConfiguration (in string prefix)
-			raises (Failed);
-	};
-	
-};
-};
diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl
deleted file mode 100644
index 6519de6f19..0000000000
--- a/shell/Evolution-Shell.idl
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution shell.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	interface ShellComponent;
-
-	interface FolderSelectionListener;
-
-	interface Shell : Bonobo::Unknown {
-		exception NotFound {};
-		exception Busy {};
-
-		/**
-		 * getComponentByType:
-		 * @type: name of a valid folder type
-		 *
-		 * Get the shell component associated with a specific folder type.
-		 *
-		 * Return value: the Evolution::ShellComponent interface for the component that
-		 * handles @type.
-		 */
-		ShellComponent getComponentByType (in string type)
-			raises (NotFound);
-
-		typedef sequence<string> FolderTypeNameList;
-
-		/**
-		 * createNewView:
-		 * @uri: URI for the view to open
-		 *
-		 * Return value: the new view.
-		 */
-		ShellView createNewView (in string uri);
-
-		/**
-		 * selectUserFolder:
-		 * @listener: a listener interface to report the answer of the user.
-		 * @title: title for the folder selector dialog
-		 * @default_folder: physical or `evolution:' URI for the folder that must be
-		 * selected by default, when the dialog is popped up
-		 * @possible_types: list of the names of the types of folders that are allowed
-		 *
-		 * Pop up a folder selection dialog from which the user can select a folder.
-		 * Initially, the @default_folder is selected.  The user can also create a new
-		 * folder by using the "New..." button.  The dialog only lets the user choose
-		 * a folder whose type is listed in @possible_types.
-		 */
-		void selectUserFolder (in FolderSelectionListener listener,
-					 in string title,
-					 in string default_folder,
-					 in FolderTypeNameList possible_types)
-			raises (Busy);
-
-		/**
-		 * getLocalStorage:
-		 *
-		 * Get the interface to the local storage.
-		 *
-		 * FIXME: Probably we just want to be able to request this to
-		 * the StorageRegistry.  This is an ugly kludge.
-		 *
-		 * Return value: the `Evolution::LocalStorage' interface for
-		 * the local storage.  */
-		LocalStorage getLocalStorage ();
-
-		/**
-		 * createStorageSetView:
-		 *
-		 * Create a control for the storage set view.  This control
-		 * will also implement the `Evolution::StorageSetView' interface.
-		 *
-		 * Return value: the newly created control.
-		 */
-		Bonobo::Control createStorageSetView ();
-	};
-
-	interface FolderSelectionListener {
-		void notifySelected (in string uri, in string physical_uri);
-		void notifyCanceled ();
-	};
-};
-};
diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
deleted file mode 100644
index 989aa06827..0000000000
--- a/shell/Evolution-ShellComponent.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution components.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.h>
-
-module GNOME {
-module Evolution {
-	interface Shell;
-
-	struct FolderType {
-		string name;
-		string icon_name;
-
-		sequence<string> accepted_dnd_mime_types;
-		sequence<string> exported_dnd_mime_types;
-	};
-
-	typedef sequence<FolderType> FolderTypeList;
-
-	interface ShellComponentListener;
-
-	interface ShellComponent : Bonobo::Unknown {
-		readonly attribute FolderTypeList supported_types;
-
-		/* FIXME: Can we use an attribute here?  */
-		exception AlreadyOwned {};
-
-		void setOwner (in Shell shell, in string evolution_homedir)
-			raises (AlreadyOwned);
-
-		exception NotOwned {};
-
-		void unsetOwner ()
-			raises (NotOwned);
-
-		/* FIXME: We might want more exceptions here.  */
-		exception NotFound {};
-		exception UnsupportedType {};
-		exception InternalError {};
-
-		Bonobo::Control createView (in string physical_uri,
-					    in string type)
-			raises (NotFound, UnsupportedType, InternalError);
-
-		exception Busy {};
-
-		void createFolderAsync (in ShellComponentListener listener,
-					in string physical_uri,
-					in string type)
-			raises (Busy);
-
-		void removeFolderAsync (in ShellComponentListener listener,
-					in string physical_uri)
-			raises (Busy);
-
-		void copyFolderAsync (in ShellComponentListener listener,
-				      in string source_physical_uri,
-				      in string destination_physical_uri,
-				      in boolean remove_source)
-			raises (Busy);
-
-		void populateFolderContextMenu (in Bonobo::UIContainer uih,
-						in string physical_uri,
-						in string type);
-	};
-
-	interface ShellComponentListener {
-		enum Result {
-			OK,
-			UNSUPPORTED_OPERATION,
-			UNSUPPORTED_TYPE,
-			EXISTS,
-			INVALID_URI,
-			PERMISSION_DENIED,
-			HAS_SUBFOLDERS,
-			NO_SPACE
-		};
-
-		void notifyResult (in Result result);
-	};
-};
-};
diff --git a/shell/Evolution-ShellView.idl b/shell/Evolution-ShellView.idl
deleted file mode 100644
index 75734a155c..0000000000
--- a/shell/Evolution-ShellView.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution shell views.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	interface ShellView : Bonobo::Unknown {
-		void setMessage        (in string message,
-					in boolean busy);
-		void unsetMessage      ();
-		void changeCurrentView (in string uri);
-		void setTitle          (in string title);
-	};
-};
-};
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
deleted file mode 100644
index 879df8afb0..0000000000
--- a/shell/Evolution-Storage.idl
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Storage interface for the Evolution shell.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.h>
-
-module GNOME {
-module Evolution {
-	struct Folder {
-		string type;
-		string description;
-		string display_name;
-		string physical_uri;
-		boolean highlighted;
-	};
-
-	interface Storage;
-	interface StorageListener;
-
-	interface Storage : Bonobo::Unknown {
-		exception AlreadyListening {};
-		exception NotFound {};
-
-		attribute string name;
-
-		enum Result {
-			OK,
-			UNSUPPORTED_OPERATION,
-			UNSUPPORTED_TYPE,
-			INVALID_URI,
-			ALREADY_EXISTS,
-			DOES_NOT_EXIST,
-			PERMISSION_DENIED,
-			NO_SPACE,
-			NOT_EMPTY,
-			GENERIC_ERROR
-		};
-
-		void asyncCreateFolder (in string path,
-					in string type,
-					in string description,
-					in string parent_physical_uri,
-					in Bonobo::Listener listener);
-
-		void asyncRemoveFolder (in string path,
-					in string physical_uri,
-					in Bonobo::Listener listener);
-
-		void addListener       (in StorageListener listener)
-			raises (AlreadyListening);
-
-		void removeListener    (in StorageListener listener)
-			raises (NotFound);
-	};
-
-	interface StorageListener {
-		exception Exists {};
-		exception NotFound {};
-
-		void notifyDestroyed ();
-
-		/* FIXME exceptions don't make much sense here...  */
-
-		void notifyFolderCreated (in string  path,
-					  in Folder  folder)
-			raises (Exists);
-		
-		void notifyFolderUpdated (in string  path,
-					  in string  display_name,
-					  in boolean highlighted)
-			raises (NotFound);
-
-		void notifyFolderRemoved (in string  path)
-			raises (NotFound);
-	};
-
-	interface StorageRegistry : Bonobo::Unknown {
-		exception Exists {};
-		exception NotFound {};
-
-		/* FIXME: The toplevel attributes should probably be attributes
-                   of the storage instead of being passed here.  */
-		StorageListener addStorage (in Storage storage,
-					    in string name,
-					    in string toplevel_node_uri,
-					    in string toplevel_node_type)
-			raises (Exists);
-
-		void removeStorageByName (in string name)
-			raises (NotFound);
-	};
-};
-};
diff --git a/shell/Evolution-StorageSetView.idl b/shell/Evolution-StorageSetView.idl
deleted file mode 100644
index ec192aea00..0000000000
--- a/shell/Evolution-StorageSetView.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution's StorageSetView control.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonoob.idl>
-
-module GNOME {
-module Evolution {
-	interface StorageSetViewListener {
-		void notifyFolderSelected  (in string uri);
-		void notifyStorageSelected (in string name);
-	};
-
-	/* FIXME: Maybe we should have a generic Bonobo::Listener interface.  */
-	interface StorageSetView : Bonobo::Unknown {
-		exception AlreadyListening {};
-		exception NotFound {};
-
-		attribute boolean showFolders;
-
-		void addListener    (in StorageSetViewListener listener)
-			raises (AlreadyListening);
-
-		void removeListener (in StorageSetViewListener listener)
-			raises (NotFound);
-	};
-};
-};
diff --git a/shell/Evolution.idl b/shell/Evolution.idl
deleted file mode 100644
index 71ae040684..0000000000
--- a/shell/Evolution.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution shell.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-#include <Evolution-Session.idl>
-#include <Evolution-ShellComponent.idl>
-#include <Evolution-ShellView.idl>
-#include <Evolution-Storage.idl>
-#include <Evolution-StorageSetView.idl>
-#include <Evolution-LocalStorage.idl>
-#include <Evolution-Shell.idl>
diff --git a/shell/GNOME_Evolution_Shell.oaf.in b/shell/GNOME_Evolution_Shell.oaf.in
deleted file mode 100644
index 1234d78139..0000000000
--- a/shell/GNOME_Evolution_Shell.oaf.in
+++ /dev/null
@@ -1,15 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Shell"
-            type="exe"
-            location="evolution">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Shell:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="The Evolution shell."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/shell/GNOME_Evolution_Shell.oafinfo b/shell/GNOME_Evolution_Shell.oafinfo
deleted file mode 100644
index 38a3b7b778..0000000000
--- a/shell/GNOME_Evolution_Shell.oafinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Shell"
-            type="exe"
-            location="evolution">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Shell:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Evolution shell."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/shell/Makefile.am b/shell/Makefile.am
deleted file mode 100644
index 699e137496..0000000000
--- a/shell/Makefile.am
+++ /dev/null
@@ -1,163 +0,0 @@
-SUBDIRS = glade importer
-
-INCLUDES = 								\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_srcdir)/widgets/misc					\
-	-I$(top_srcdir)							\
-	$(BONOBO_GNOME_CFLAGS)						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"		\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"				\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            		\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"		\
-	-DG_LOG_DOMAIN=\"evolution-shell\"
-
-CLEANFILES = $(IDL_GENERATED)
-
-# CORBA stuff
-
-IDLS = \
-	Evolution-LocalStorage.idl	\
-	Evolution-Session.idl		\
-	Evolution-Shell.idl		\
-	Evolution-ShellComponent.idl	\
-	Evolution-ShellView.idl		\
-	Evolution-Storage.idl		\
-	Evolution-StorageSetView.idl	\
-	Evolution.idl
-
-IDL_GENERATED = \
-	Evolution.h		\
-	Evolution-common.c	\
-	Evolution-skels.c	\
-	Evolution-stubs.c
-
-Evolution-impl.o: Evolution.h
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		$(srcdir)/Evolution.idl
-
-# IDL install
-
-idldir = $(datadir)/idl
-
-idl_DATA = $(IDLS)
-
-# Shell library
-
-noinst_LIBRARIES =	\
-	libeshell.a
-
-libeshell_a_SOURCES = 				\
-	$(IDL_GENERATED)			\
-	e-folder-tree.c				\
-	e-folder-tree.h				\
-	evolution-local-storage.c		\
-	evolution-local-storage.h		\
-	evolution-session.c			\
-	evolution-session.h			\
-	evolution-shell-client.c		\
-	evolution-shell-client.h		\
-	evolution-shell-component-client.c	\
-	evolution-shell-component-client.h	\
-	evolution-shell-component.c		\
-	evolution-shell-component.h		\
-	evolution-shell-view.c			\
-	evolution-shell-view.h			\
-	evolution-storage-listener.c		\
-	evolution-storage-listener.h		\
-	evolution-storage-set-view-listener.c	\
-	evolution-storage-set-view-listener.h	\
-	evolution-storage.c			\
-	evolution-storage.h
-
-# Evolution executable
-
-bin_PROGRAMS = evolution
-
-evolution_SOURCES =				\
-	e-component-registry.c			\
-	e-component-registry.h			\
-	e-corba-storage-registry.c		\
-	e-corba-storage-registry.h		\
-	e-corba-storage.c			\
-	e-corba-storage.h			\
-	e-folder-type-registry.c		\
-	e-folder-type-registry.h		\
-	e-folder.c				\
-	e-folder.h				\
-	e-local-folder.c			\
-	e-local-folder.h			\
-	e-local-storage.c			\
-	e-local-storage.h			\
-	e-setup.c				\
-	e-setup.h				\
-	e-shell-constants.h			\
-	e-shell-folder-creation-dialog.c	\
-	e-shell-folder-creation-dialog.h	\
-	e-shell-folder-selection-dialog.c	\
-	e-shell-folder-selection-dialog.h	\
-	e-shell-folder-title-bar.c		\
-	e-shell-folder-title-bar.h		\
-	e-shell-utils.c				\
-	e-shell-utils.h				\
-	e-shell-view-menu.c			\
-	e-shell-view-menu.h			\
-	e-shell-view.c				\
-	e-shell-view.h				\
-	e-shell.c				\
-	e-shell.h				\
-	e-shortcuts-view-model.c		\
-	e-shortcuts-view-model.h		\
-	e-shortcuts-view.c			\
-	e-shortcuts-view.h			\
-	e-shortcuts.c				\
-	e-shortcuts.h				\
-	e-splash.c				\
-	e-splash.h				\
-	e-storage-set-view.c			\
-	e-storage-set-view.h			\
-	e-storage-set.c				\
-	e-storage-set.h				\
-	e-storage.c				\
-	e-storage.h				\
-	evolution-storage-set-view.c		\
-	evolution-storage-set-view.h		\
-	evolution-storage-set-view-factory.c	\
-	evolution-storage-set-view-factory.h	\
-	main.c
-
-evolution_LDADD =						\
-	libeshell.a						\
-	importer/libevolution-importer.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(EXTRA_GNOME_LIBS)					\
-	$(UNICODE_LIBS)						\
-	$(GNOME_PRINT_LIBS)					\
-	$(GTKHTML_LIBS)						\
-	$(BONOBO_GNOME_LIBS)
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Shell.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-EXTRA_DIST = $(IDLS) $(oaf_in_files) $(oaf_DATA)
-
-# Purify support
-
-if ENABLE_PURIFY
-
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution.pure
-
-evolution.pure: evolution
-	@rm -f evolution.pure
-	$(PLINK) $(evolution_LDFLAGS) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS)
-
-endif
diff --git a/shell/README b/shell/README
deleted file mode 100644
index fc0871eb5d..0000000000
--- a/shell/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Two things are built in this directory: the shell's executable, named
-`evolution', and the shell utility library, `libeshell'.
-
-The `e-*' files belong to the shell, and their API is not exported at
-all.
-
-The `evolution-*' files, instead, are Bonobo-style wrappers for the
-shell's Evolution:: CORBA interfaces.  They are all compiled into
-`libeshell'; the shell itself links against `libeshell'.
-
-The `evolution-*-client' files are utility GTK+-style wrappers for the
-CORBA methods; the modules whose name does not end with `-client',
-instead, are Bonobo-like GTK+ objects wrapping the implementation of
-the CORBA server.
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
deleted file mode 100644
index 89638fa14c..0000000000
--- a/shell/e-component-registry.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-component-registry.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtktypeutils.h>
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-#include "e-shell-utils.h"
-
-#include "Evolution.h"
-
-#include "evolution-shell-component-client.h"
-
-#include "e-component-registry.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
-
-typedef struct _Component Component;
-
-struct _Component {
-	char *id;
-	
-	EvolutionShellComponentClient *client;
-
-	/* Names of the folder types we support (normal ASCII strings).  */
-	GList *folder_type_names;
-};
-
-struct _EComponentRegistryPrivate {
-	EShell *shell;
-
-	GHashTable *component_id_to_component;
-};
-
-
-/* Component information handling.  */
-
-static Component *
-component_new (const char *id,
-	       EvolutionShellComponentClient *client)
-{
-	Component *new;
-
-	bonobo_object_ref (BONOBO_OBJECT (client));
-
-	new = g_new (Component, 1);
-	new->id                = g_strdup (id);
-	new->folder_type_names = NULL;
-	new->client            = client;
-
-	return new;
-}
-
-static void
-component_free (Component *component)
-{
-	GNOME_Evolution_ShellComponent corba_shell_component;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (component->client));
-	GNOME_Evolution_ShellComponent_unsetOwner (corba_shell_component, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_warning ("Cannot unregister component -- %s", component->id);
-	else
-		g_print ("Component unregistered successfully -- %s\n", component->id);
-	CORBA_exception_free (&ev);
-
-	g_free (component->id);
-
-	bonobo_object_unref (BONOBO_OBJECT (component->client));
-
-	e_free_string_list (component->folder_type_names);
-
-	g_free (component);
-}
-
-static gboolean
-register_type (EComponentRegistry *component_registry,
-	       const char *name,
-	       const char *icon_name,
-	       Component *handler)
-{
-	EComponentRegistryPrivate *priv;
-	EFolderTypeRegistry *folder_type_registry;
-
-	priv = component_registry->priv;
-
-	folder_type_registry = e_shell_get_folder_type_registry (priv->shell);
-	g_assert (folder_type_registry != NULL);
-
-	if (! e_folder_type_registry_register_type (folder_type_registry, name, icon_name)) {
-		g_warning ("Trying to register duplicate folder type -- %s", name);
-		return FALSE;
-	}
-
-	e_folder_type_registry_set_handler_for_type (folder_type_registry, name, handler->client);
-
-	return TRUE;
-}
-
-static gboolean
-register_component (EComponentRegistry *component_registry,
-		    const char *id)
-{
-	EComponentRegistryPrivate *priv;
-	GNOME_Evolution_ShellComponent component_corba_interface;
-	GNOME_Evolution_Shell shell_corba_interface;
-	GNOME_Evolution_FolderTypeList *supported_types;
-	Component *component;
-	EvolutionShellComponentClient *client;
-	CORBA_Environment ev;
-	CORBA_unsigned_long i;
-
-	priv = component_registry->priv;
-
-	if (g_hash_table_lookup (priv->component_id_to_component, id) != NULL) {
-		g_warning ("Trying to register component twice -- %s", id);
-		return FALSE;
-	}
-
-	client = evolution_shell_component_client_new (id);
-	if (client == NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-
-	/* FIXME we could use the EvolutionShellComponentClient API here instead, but for
-           now we don't care.  */
-
-	component_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	shell_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (priv->shell));
-
-	supported_types = GNOME_Evolution_ShellComponent__get_supported_types (component_corba_interface, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || supported_types->_length == 0) {
-		bonobo_object_unref (BONOBO_OBJECT (client));
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	component = component_new (id, client);
-	g_hash_table_insert (priv->component_id_to_component, component->id, component);
-
-	for (i = 0; i < supported_types->_length; i++) {
-		const GNOME_Evolution_FolderType *type;
-
-		type = supported_types->_buffer + i;
-
-		if (! register_type (component_registry, type->name, type->icon_name, component)) {
-			g_warning ("Cannot register type `%s' for component %s",
-				   type->name, component->id);
-		} else {
-			g_print ("Registered type for component -- (%s) %s\n",
-				 type->name, component->id);
-		}
-	}
-
-	CORBA_free (supported_types);
-
-	return TRUE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-component_id_foreach_free (void *key,
-			   void *value,
-			   void *user_data)
-{
-	Component *component;
-
-	component = (Component *) value;
-	component_free (component);
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EComponentRegistry *component_registry;
-	EComponentRegistryPrivate *priv;
-
-	component_registry = E_COMPONENT_REGISTRY (object);
-	priv = component_registry->priv;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->shell));
-
-	g_hash_table_foreach (priv->component_id_to_component, component_id_foreach_free, NULL);
-	g_hash_table_destroy (priv->component_id_to_component);
-
-	g_free (priv);
-}
-
-
-static void
-class_init (EComponentRegistryClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-}
-
-
-static void
-init (EComponentRegistry *component_registry)
-{
-	EComponentRegistryPrivate *priv;
-
-	priv = g_new (EComponentRegistryPrivate, 1);
-	priv->shell                     = NULL;
-	priv->component_id_to_component = g_hash_table_new (g_str_hash, g_str_equal);
-
-	component_registry->priv = priv;
-}
-
-
-void
-e_component_registry_construct (EComponentRegistry *component_registry,
-				EShell *shell)
-{
-	EComponentRegistryPrivate *priv;
-
-	g_return_if_fail (component_registry != NULL);
-	g_return_if_fail (E_IS_COMPONENT_REGISTRY (component_registry));
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	priv = component_registry->priv;
-
-	bonobo_object_ref (BONOBO_OBJECT (shell));
-	priv->shell = shell;
-}
-
-EComponentRegistry *
-e_component_registry_new (EShell *shell)
-{
-	EComponentRegistry *component_registry;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	component_registry = gtk_type_new (e_component_registry_get_type ());
-	e_component_registry_construct (component_registry, shell);
-
-	return component_registry;
-}
-
-
-gboolean
-e_component_registry_register_component (EComponentRegistry *component_registry,
-					 const char *id)
-{
-	g_return_val_if_fail (component_registry != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMPONENT_REGISTRY (component_registry), FALSE);
-	g_return_val_if_fail (id != NULL, FALSE);
-
-	return register_component (component_registry, id);
-}
-
-
-static void
-compose_id_list_foreach (void *key,
-			 void *value,
-			 void *data)
-{
-	GList **listp;
-	const char *id;
-
-	listp = (GList **) data;
-	id = (const char *) key;
-
-	*listp = g_list_prepend (*listp, g_strdup (id));
-}
-
-/**
- * e_component_registry_get_id_list:
- * @component_registry: 
- * 
- * Get the list of components registered.
- * 
- * Return value: A GList of strings containining the IDs for all the registered
- * components.  The list must be freed by the caller when not used anymore.
- **/
-GList *
-e_component_registry_get_id_list (EComponentRegistry *component_registry)
-{
-	EComponentRegistryPrivate *priv;
-	GList *list;
-
-	g_return_val_if_fail (component_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPONENT_REGISTRY (component_registry), NULL);
-
-	priv = component_registry->priv;
-	list = NULL;
-
-	g_hash_table_foreach (priv->component_id_to_component, compose_id_list_foreach, &list);
-
-	return list;
-}
-
-/**
- * e_component_registry_get_component_by_id:
- * @component_registry: 
- * @id: The component's OAF ID
- * 
- * Get the registered component client for the specified ID.  If that component
- * is not registered, return NULL.
- * 
- * Return value: A pointer to the ShellComponentClient for that component.
- **/
-EvolutionShellComponentClient *
-e_component_registry_get_component_by_id  (EComponentRegistry *component_registry,
-					   const char *id)
-{
-	EComponentRegistryPrivate *priv;
-	const Component *component;
-
-	g_return_val_if_fail (component_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPONENT_REGISTRY (component_registry), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	priv = component_registry->priv;
-
-	component = g_hash_table_lookup (priv->component_id_to_component, id);
-	if (component == NULL)
-		return NULL;
-
-	return component->client;
-}
-
-
-E_MAKE_TYPE (e_component_registry, "EComponentRegistry", EComponentRegistry,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
deleted file mode 100644
index da39d948ac..0000000000
--- a/shell/e-component-registry.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-component-registry.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_COMPONENT_REGISTRY_H__
-#define __E_COMPONENT_REGISTRY_H__
-
-#include <gtk/gtkobject.h>
-
-#include "e-shell.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_COMPONENT_REGISTRY             (e_component_registry_get_type ())
-#define E_COMPONENT_REGISTRY(obj)             (GTK_CHECK_CAST ((obj), E_TYPE_COMPONENT_REGISTRY, EComponentRegistry))
-#define E_COMPONENT_REGISTRY_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_REGISTRY, EComponentRegistryClass))
-#define E_IS_COMPONENT_REGISTRY(obj)          (GTK_CHECK_TYPE ((obj), E_TYPE_COMPONENT_REGISTRY))
-#define E_IS_COMPONENT_REGISTRY_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_REGISTRY))
-
-
-typedef struct _EComponentRegistry        EComponentRegistry;
-typedef struct _EComponentRegistryPrivate EComponentRegistryPrivate;
-typedef struct _EComponentRegistryClass   EComponentRegistryClass;
-
-struct _EComponentRegistry {
-	GtkObject parent;
-
-	EComponentRegistryPrivate *priv;
-};
-
-struct _EComponentRegistryClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType                        e_component_registry_get_type             (void);
-void                           e_component_registry_construct            (EComponentRegistry *component_registry,
-									  EShell             *shell);
-EComponentRegistry            *e_component_registry_new                  (EShell             *shell);
-
-gboolean                       e_component_registry_register_component   (EComponentRegistry *component_registry,
-									  const char         *id);
-
-GList                         *e_component_registry_get_id_list          (EComponentRegistry *component_registry);
-
-EvolutionShellComponentClient *e_component_registry_get_component_by_id  (EComponentRegistry *component_registry,
-									  const char         *id);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_COMPONENT_REGISTRY_H__ */
diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
deleted file mode 100644
index c740bbe9b5..0000000000
--- a/shell/e-corba-storage-registry.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-storage-registry.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gal/util/e-util.h>
-
-#include "e-corba-storage.h"
-
-#include "e-corba-storage-registry.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ECorbaStorageRegistryPrivate {
-	EStorageSet *storage_set;
-};
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_StorageRegistry__vepv storage_registry_vepv;
-
-static POA_GNOME_Evolution_StorageRegistry *
-create_servant (void)
-{
-	POA_GNOME_Evolution_StorageRegistry *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &storage_registry_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static GNOME_Evolution_StorageListener
-impl_StorageRegistry_addStorage (PortableServer_Servant servant,
-				 const GNOME_Evolution_Storage storage_interface,
-				 const CORBA_char *name,
-				 const CORBA_char *toplevel_node_uri,
-				 const CORBA_char *toplevel_node_type,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ECorbaStorageRegistry *storage_registry;
-	ECorbaStorageRegistryPrivate *priv;
-	EStorage *storage;
-	GNOME_Evolution_StorageListener listener_interface;
-
-	g_print ("Shell: Registering storage -- %s\n", name);
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object);
-	priv = storage_registry->priv;
-
-	storage = e_corba_storage_new (toplevel_node_uri,
-				       toplevel_node_type,
-				       storage_interface,
-				       name);
-
-	if (! e_storage_set_add_storage (priv->storage_set, storage)) {
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageRegistry_Exists,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (storage));
-
-	listener_interface = CORBA_Object_duplicate (e_corba_storage_get_StorageListener
-						     (E_CORBA_STORAGE (storage)), ev);
-
-	return listener_interface;
-}
-
-static void
-impl_StorageRegistry_removeStorageByName (PortableServer_Servant servant,
-					  const CORBA_char *name,
-					  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ECorbaStorageRegistry *storage_registry;
-	ECorbaStorageRegistryPrivate *priv;
-	EStorage *storage;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object);
-	priv = storage_registry->priv;
-
-	storage = e_storage_set_get_storage (priv->storage_set, name);
-	if (storage == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageRegistry_NotFound,
-				     NULL);
-		return;
-	}
-
-	/* FIXME: Yucky to get the storage by name and then remove it.  */
-	/* FIXME: Check failure.  */
-	e_storage_set_remove_storage (priv->storage_set, storage);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	ECorbaStorageRegistry *corba_storage_registry;
-	ECorbaStorageRegistryPrivate *priv;
-
-	corba_storage_registry = E_CORBA_STORAGE_REGISTRY (object);
-	priv = corba_storage_registry->priv;
-
-	if (priv->storage_set != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->storage_set));
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Initialization.  */
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_StorageRegistry__vepv *vepv;
-	POA_GNOME_Evolution_StorageRegistry__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_StorageRegistry__epv, 1);
-	epv->addStorage          = impl_StorageRegistry_addStorage;
-	epv->removeStorageByName = impl_StorageRegistry_removeStorageByName;
-
-	vepv = &storage_registry_vepv;
-	vepv->_base_epv                     = base_epv;
-	vepv->Bonobo_Unknown_epv            = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_StorageRegistry_epv = epv;
-}
-
-static void
-class_init (ECorbaStorageRegistryClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	corba_class_init ();
-}
-
-static void
-init (ECorbaStorageRegistry *corba_storage_registry)
-{
-	ECorbaStorageRegistryPrivate *priv;
-
-	priv = g_new (ECorbaStorageRegistryPrivate, 1);
-	priv->storage_set = NULL;
-
-	corba_storage_registry->priv = priv;
-}
-
-
-void
-e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registry,
-				    GNOME_Evolution_StorageRegistry corba_object,
-				    EStorageSet *storage_set)
-{
-	ECorbaStorageRegistryPrivate *priv;
-
-	g_return_if_fail (corba_storage_registry != NULL);
-	g_return_if_fail (E_IS_CORBA_STORAGE_REGISTRY (corba_storage_registry));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	bonobo_object_construct (BONOBO_OBJECT (corba_storage_registry), corba_object);
-
-	priv = corba_storage_registry->priv;
-
-	gtk_object_ref (GTK_OBJECT (storage_set));
-	priv->storage_set = storage_set;
-}
-
-ECorbaStorageRegistry *
-e_corba_storage_registry_new (EStorageSet *storage_set)
-{
-	ECorbaStorageRegistry *corba_storage_registry;
-	POA_GNOME_Evolution_StorageRegistry *servant;
-	GNOME_Evolution_StorageRegistry corba_object;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	corba_storage_registry = gtk_type_new (e_corba_storage_registry_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (corba_storage_registry),
-						       servant);
-
-	e_corba_storage_registry_construct (corba_storage_registry, corba_object, storage_set);
-
-	return corba_storage_registry;
-}
-
-
-E_MAKE_TYPE (e_corba_storage_registry, "ECorbaStorageRegistry", ECorbaStorageRegistry, class_init, init, PARENT_TYPE)
diff --git a/shell/e-corba-storage-registry.h b/shell/e-corba-storage-registry.h
deleted file mode 100644
index 20aedbff4b..0000000000
--- a/shell/e-corba-storage-registry.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-storage-registry.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_CORBA_STORAGE_REGISTRY_H__
-#define __E_CORBA_STORAGE_REGISTRY_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution.h"
-#include "e-storage-set.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CORBA_STORAGE_REGISTRY            (e_corba_storage_registry_get_type ())
-#define E_CORBA_STORAGE_REGISTRY(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CORBA_STORAGE_REGISTRY, ECorbaStorageRegistry))
-#define E_CORBA_STORAGE_REGISTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_STORAGE_REGISTRY, ECorbaStorageRegistryClass))
-#define E_IS_CORBA_STORAGE_REGISTRY(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CORBA_STORAGE_REGISTRY))
-#define E_IS_CORBA_STORAGE_REGISTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_STORAGE_REGISTRY))
-
-
-typedef struct _ECorbaStorageRegistry        ECorbaStorageRegistry;
-typedef struct _ECorbaStorageRegistryPrivate ECorbaStorageRegistryPrivate;
-typedef struct _ECorbaStorageRegistryClass   ECorbaStorageRegistryClass;
-
-struct _ECorbaStorageRegistry {
-	BonoboObject parent;
-
-	ECorbaStorageRegistryPrivate *priv;
-};
-
-struct _ECorbaStorageRegistryClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType                e_corba_storage_registry_get_type   (void);
-void                   e_corba_storage_registry_construct  (ECorbaStorageRegistry     *corba_storage_registry,
-							    GNOME_Evolution_StorageRegistry  corba_object,
-							    EStorageSet               *storage_set);
-ECorbaStorageRegistry *e_corba_storage_registry_new        (EStorageSet               *storage_set);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_CORBA_STORAGE_REGISTRY_H__ */
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
deleted file mode 100644
index 18e0723512..0000000000
--- a/shell/e-corba-storage.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-storage.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-
-#include "Evolution.h"
-
-#include "e-corba-storage.h"
-
-
-#define PARENT_TYPE E_TYPE_STORAGE
-static EStorageClass *parent_class = NULL;
-
-typedef struct _StorageListenerServant StorageListenerServant;
-
-struct _ECorbaStoragePrivate {
-	char *name;
-
-	GNOME_Evolution_Storage storage_interface;
-
-	/* The Evolution::StorageListener interface we expose.  */
-
-	GNOME_Evolution_StorageListener storage_listener_interface;
-	StorageListenerServant *storage_listener_servant;
-};
-
-
-/* Implementation of the CORBA Evolution::StorageListener interface.  */
-
-static POA_GNOME_Evolution_StorageListener__vepv storage_listener_vepv;
-
-struct _StorageListenerServant {
-	POA_GNOME_Evolution_StorageListener servant;
-	EStorage *storage;
-};
-
-static StorageListenerServant *
-storage_listener_servant_new (ECorbaStorage *corba_storage)
-{
-	StorageListenerServant *servant;
-
-	servant = g_new0 (StorageListenerServant, 1);
-
-	servant->servant.vepv = &storage_listener_vepv;
-
-	gtk_object_ref (GTK_OBJECT (corba_storage));
-	servant->storage = E_STORAGE (corba_storage);
-
-	return servant;
-}
-
-static void
-storage_listener_servant_free (StorageListenerServant *servant)
-{
-	gtk_object_unref (GTK_OBJECT (servant->storage));
-
-	g_free (servant);
-}
-
-#if 0
-static void
-impl_StorageListener_destroy (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	/* FIXME */
-}
-#endif
-
-static void
-impl_StorageListener_new_folder (PortableServer_Servant servant,
-				 const CORBA_char *path,
-				 const GNOME_Evolution_Folder *folder,
-				 CORBA_Environment *ev)
-{
-	StorageListenerServant *storage_listener_servant;
-	EStorage *storage;
-	EFolder *e_folder;
-
-	storage_listener_servant = (StorageListenerServant *) servant;
-	storage = storage_listener_servant->storage;
-
-	e_folder = e_folder_new (folder->display_name,
-				 folder->type,
-				 folder->description);
-
-	e_folder_set_physical_uri (e_folder, folder->physical_uri);
-	e_folder_set_highlighted (e_folder, folder->highlighted);
-
-	if (! e_storage_new_folder (storage, path, e_folder)) {
-		g_print ("Cannot register folder -- %s %s\n", path, folder->display_name);
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageListener_Exists,
-				     NULL);
-		gtk_object_unref (GTK_OBJECT (e_folder));
-		return;
-	}
-
-	g_print ("Folder registered successfully -- %s %s\n", path, folder->display_name);
-}
-
-static void
-impl_StorageListener_update_folder (PortableServer_Servant servant,
-				    const CORBA_char *path,
-				    const CORBA_char *display_name,
-				    CORBA_boolean highlighted,
-				    CORBA_Environment *ev)
-{
-	StorageListenerServant *storage_listener_servant;
-	EStorage *storage;
-	EFolder *e_folder;
-
-	storage_listener_servant = (StorageListenerServant *) servant;
-	storage = storage_listener_servant->storage;
-
-	e_folder = e_storage_get_folder (storage, path);
-	if (e_folder == NULL) {
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageListener_NotFound,
-				     NULL);
-		return;
-	}
-
-	e_folder_set_name (e_folder, display_name);
-	e_folder_set_highlighted (e_folder, highlighted);
-}
-
-static void
-impl_StorageListener_removed_folder (PortableServer_Servant servant,
-				     const CORBA_char *path,
-				     CORBA_Environment *ev)
-{
-	StorageListenerServant *storage_listener_servant;
-	EStorage *storage;
-
-	storage_listener_servant = (StorageListenerServant *) servant;
-	storage = storage_listener_servant->storage;
-
-	if (! e_storage_removed_folder (storage, path))
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageListener_NotFound,
-				     NULL);
-}
-
-
-static gboolean
-setup_storage_listener (ECorbaStorage *corba_storage)
-{
-	StorageListenerServant *servant;
-	ECorbaStoragePrivate *priv;
-	GNOME_Evolution_StorageListener storage_listener_interface;
-	CORBA_Environment ev;
-
-	priv = corba_storage->priv;
-
-	servant = storage_listener_servant_new (corba_storage);
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_StorageListener__init (servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		goto error;
-
-	CORBA_free (PortableServer_POA_activate_object (bonobo_poa (), servant, &ev));
-	if (ev._major != CORBA_NO_EXCEPTION)
-		goto error;
-
-	storage_listener_interface = PortableServer_POA_servant_to_reference (bonobo_poa (),
-									      servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		goto error;
-
-	priv->storage_listener_interface = storage_listener_interface;
-	priv->storage_listener_servant = servant;
-
-	return TRUE;
-
- error:
-	storage_listener_servant_free (servant);
-	CORBA_exception_free (&ev);
-	return FALSE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	CORBA_Environment ev;
-	ECorbaStorage *corba_storage;
-	ECorbaStoragePrivate *priv;
-
-	corba_storage = E_CORBA_STORAGE (object);
-	priv = corba_storage->priv;
-
-	g_free (priv->name);
-
-	CORBA_exception_init (&ev);
-
-	if (priv->storage_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (priv->storage_interface, &ev);
-		CORBA_Object_release (priv->storage_interface, &ev);
-	}
-
-	if (priv->storage_listener_interface != CORBA_OBJECT_NIL)
-		CORBA_Object_release (priv->storage_listener_interface, &ev);
-
-	if (priv->storage_listener_servant != NULL) {
-		PortableServer_ObjectId *object_id;
-
-		object_id = PortableServer_POA_servant_to_id (bonobo_poa (), priv->storage_listener_servant,
-							      &ev);
-		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
-
-		POA_GNOME_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev);
-		CORBA_free (object_id);
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* EStorage methods.  */
-
-static const char *
-get_name (EStorage *storage)
-{
-	ECorbaStorage *corba_storage;
-	ECorbaStoragePrivate *priv;
-
-	corba_storage = E_CORBA_STORAGE (storage);
-	priv = corba_storage->priv;
-
-	return priv->name;
-}
-
-struct async_folder_closure {
-	EStorageResultCallback callback;
-	EStorage *storage;
-	void *data;
-};
-
-static void
-async_folder_cb (BonoboListener *listener, char *event_name, 
-		 CORBA_any *any, CORBA_Environment *ev,
-		 gpointer user_data)
-{
-	struct async_folder_closure *closure = user_data;
-	GNOME_Evolution_Storage_Result *corba_result;
-	EStorageResult result;
-
-	corba_result = any->_value;
-	switch (*corba_result) {
-	case GNOME_Evolution_Storage_OK:
-		result = E_STORAGE_OK;
-		break;
-	case GNOME_Evolution_Storage_UNSUPPORTED_OPERATION:
-		result = E_STORAGE_UNSUPPORTEDOPERATION;
-		break;
-	case GNOME_Evolution_Storage_UNSUPPORTED_TYPE:
-		result = E_STORAGE_UNSUPPORTEDTYPE;
-		break;
-	case GNOME_Evolution_Storage_ALREADY_EXISTS:
-		result = E_STORAGE_EXISTS;
-		break;
-	case GNOME_Evolution_Storage_DOES_NOT_EXIST:
-		result = E_STORAGE_NOTFOUND;
-		break;
-	case GNOME_Evolution_Storage_PERMISSION_DENIED:
-		result = E_STORAGE_PERMISSIONDENIED;
-		break;
-	case GNOME_Evolution_Storage_NO_SPACE:
-		result = E_STORAGE_NOSPACE;
-		break;
-	case GNOME_Evolution_Storage_INVALID_URI:
-	case GNOME_Evolution_Storage_NOT_EMPTY:
-	case GNOME_Evolution_Storage_GENERIC_ERROR:
-	default:
-		result = E_STORAGE_GENERICERROR;
-		break;
-	}
-
-	closure->callback (closure->storage, result, closure->data);
-	bonobo_object_unref (BONOBO_OBJECT (listener));
-	g_free (closure);
-}
-
-static void
-async_create_folder (EStorage *storage, const char *path,
-		     const char *type, const char *description,
-		     EStorageResultCallback callback, void *data)
-{
-	ECorbaStorage *corba_storage;
-	ECorbaStoragePrivate *priv;
-	const char *parent_uri;
-	char *p;
-	BonoboListener *listener;
-	Bonobo_Listener corba_listener;
-	CORBA_Environment ev;
-	struct async_folder_closure *closure;
-
-	corba_storage = E_CORBA_STORAGE (storage);
-	priv = corba_storage->priv;
-
-	p = strrchr (path, '/');
-	if (p && p != path) {
-		char *parent_path;
-		EFolder *parent;
-
-		parent_path = g_strndup (path, p - path);
-		parent = e_storage_get_folder (storage, parent_path);
-		parent_uri = e_folder_get_physical_uri (parent);
-	} else
-		parent_uri = "";
-
-	closure = g_new (struct async_folder_closure, 1);
-	closure->callback = callback;
-	closure->storage = storage;
-	closure->data = data;
-	listener = bonobo_listener_new (async_folder_cb, closure);
-	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_asyncCreateFolder (priv->storage_interface,
-						   path, type, description,
-						   parent_uri,
-						   corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		callback (storage, E_STORAGE_GENERICERROR, data);
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		g_free (closure);
-	}
-	CORBA_exception_free (&ev);
-}
-
-static void
-async_remove_folder (EStorage *storage, const char *path,
-		     EStorageResultCallback callback, void *data)
-{
-	ECorbaStorage *corba_storage;
-	ECorbaStoragePrivate *priv;
-	EFolder *folder;
-	BonoboListener *listener;
-	Bonobo_Listener corba_listener;
-	CORBA_Environment ev;
-	struct async_folder_closure *closure;
-
-	corba_storage = E_CORBA_STORAGE (storage);
-	priv = corba_storage->priv;
-
-	folder = e_storage_get_folder (storage, path);
-
-	closure = g_new (struct async_folder_closure, 1);
-	closure->callback = callback;
-	closure->storage = storage;
-	closure->data = data;
-	listener = bonobo_listener_new (async_folder_cb, closure);
-	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_asyncRemoveFolder (priv->storage_interface,
-						   path, e_folder_get_physical_uri (folder),
-						   corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		callback (storage, E_STORAGE_GENERICERROR, data);
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		g_free (closure);
-	}
-	CORBA_exception_free (&ev);
-}
-
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_StorageListener__vepv *vepv;
-	POA_GNOME_Evolution_StorageListener__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1);
-	epv->notifyFolderCreated = impl_StorageListener_new_folder;
-	epv->notifyFolderUpdated = impl_StorageListener_update_folder;
-	epv->notifyFolderRemoved = impl_StorageListener_removed_folder;
-
-	vepv = &storage_listener_vepv;
-	vepv->_base_epv                     = base_epv;
-	vepv->GNOME_Evolution_StorageListener_epv = epv;
-}
-
-static void
-class_init (ECorbaStorageClass *klass)
-{
-	GtkObjectClass *object_class;
-	EStorageClass *storage_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	storage_class = E_STORAGE_CLASS (klass);
-	storage_class->get_name = get_name;
-	storage_class->async_create_folder = async_create_folder;
-	storage_class->async_remove_folder = async_remove_folder;
-
-	corba_class_init ();
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-init (ECorbaStorage *corba_storage)
-{
-	ECorbaStoragePrivate *priv;
-
-	priv = g_new (ECorbaStoragePrivate, 1);
-	priv->name              = NULL;
-	priv->storage_interface = CORBA_OBJECT_NIL;
-
-	corba_storage->priv = priv;
-}  
-
-
-/* FIXME: OK to have a boolean construct function?  */
-void
-e_corba_storage_construct (ECorbaStorage *corba_storage,
-			   const char *toplevel_node_uri,
-			   const char *toplevel_node_type,
-			   const GNOME_Evolution_Storage storage_interface,
-			   const char *name)
-{
-	ECorbaStoragePrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (corba_storage != NULL);
-	g_return_if_fail (E_IS_CORBA_STORAGE (corba_storage));
-	g_return_if_fail (storage_interface != CORBA_OBJECT_NIL);
-	g_return_if_fail (name != NULL);
-
-	e_storage_construct (E_STORAGE (corba_storage), toplevel_node_uri, toplevel_node_type);
-
-	priv = corba_storage->priv;
-
-	priv->name = g_strdup (name);
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_ref (storage_interface, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_warning ("e_corba_storage_construct() -- Cannot reference Bonobo object");
-	else
-		priv->storage_interface = CORBA_Object_duplicate (storage_interface, &ev);
-
-	CORBA_exception_free (&ev);
-
-	setup_storage_listener (corba_storage);
-}
-
-EStorage *
-e_corba_storage_new (const char *toplevel_node_uri,
-		     const char *toplevel_node_type,
-		     const GNOME_Evolution_Storage storage_interface,
-		     const char *name)
-{
-	EStorage *new;
-
-	g_return_val_if_fail (storage_interface != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	new = gtk_type_new (e_corba_storage_get_type ());
-
-	e_corba_storage_construct (E_CORBA_STORAGE (new),
-				   toplevel_node_uri,
-				   toplevel_node_type,
-				   storage_interface, name);
-
-	return new;
-}
-
-
-const GNOME_Evolution_StorageListener
-e_corba_storage_get_StorageListener (ECorbaStorage *corba_storage)
-{
-	g_return_val_if_fail (corba_storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_CORBA_STORAGE (corba_storage), NULL);
-
-	return corba_storage->priv->storage_listener_interface;
-}
-
-
-E_MAKE_TYPE (e_corba_storage, "ECorbaStorage", ECorbaStorage, class_init, init, PARENT_TYPE)
diff --git a/shell/e-corba-storage.h b/shell/e-corba-storage.h
deleted file mode 100644
index 01e5f5b8d4..0000000000
--- a/shell/e-corba-storage.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-storage.h
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_CORBA_STORAGE_H__
-#define __E_CORBA_STORAGE_H__
-
-#include "e-storage.h"
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CORBA_STORAGE		(e_corba_storage_get_type ())
-#define E_CORBA_STORAGE(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_CORBA_STORAGE, ECorbaStorage))
-#define E_CORBA_STORAGE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_STORAGE, ECorbaStorageClass))
-#define E_IS_CORBA_STORAGE(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_CORBA_STORAGE))
-#define E_IS_CORBA_STORAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_STORAGE))
-
-
-typedef struct _ECorbaStorage        ECorbaStorage;
-typedef struct _ECorbaStoragePrivate ECorbaStoragePrivate;
-typedef struct _ECorbaStorageClass   ECorbaStorageClass;
-
-struct _ECorbaStorage {
-	EStorage parent;
-
-	ECorbaStoragePrivate *priv;
-};
-
-struct _ECorbaStorageClass {
-	EStorageClass parent_class;
-};
-
-
-GtkType   e_corba_storage_get_type   (void);
-void      e_corba_storage_construct  (ECorbaStorage                 *corba_storage,
-				      const char                    *toplevel_node_uri,
-				      const char                    *toplevel_node_type,
-				      const GNOME_Evolution_Storage  storage_interface,
-				      const char                    *name);
-EStorage *e_corba_storage_new        (const char                    *toplevel_node_uri,
-				      const char                    *toplevel_node_type,
-				      const GNOME_Evolution_Storage  storage_interface,
-				      const char                    *name);
-
-/* FIXME: I don't like this call.  */
-const GNOME_Evolution_StorageListener  e_corba_storage_get_StorageListener  (ECorbaStorage *corba_storage);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_CORBA_STORAGE_H__ */
diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c
deleted file mode 100644
index f8e23955a9..0000000000
--- a/shell/e-folder-tree.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder-set.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <string.h>
-
-#include "e-folder-tree.h"
-
-
-struct _Folder {
-	struct _Folder *parent;
-	char *path;
-	void *data;
-	GList *subfolders;
-};
-typedef struct _Folder Folder;
-
-struct _EFolderTree {
-	GHashTable *path_to_folder;
-	GHashTable *data_to_path;
-
-	EFolderDestroyNotify folder_destroy_notify;
-	void *folder_destroy_notify_closure;
-};
-
-
-/* Utility functions.  */
-
-static char *
-get_parent_path (const char *path)
-{
-	const char *last_separator;
-
-	g_assert (g_path_is_absolute (path));
-
-	last_separator = strrchr (path, G_DIR_SEPARATOR);
-
-	if (last_separator == path)
-		return g_strdup (G_DIR_SEPARATOR_S);
-
-	return g_strndup (path, last_separator - path);
-}
-
-static void
-traverse_subtree (EFolderTree *tree,
-		  Folder *root_folder,
-		  EFolderTreeForeachFunc foreach_func,
-		  void *data)
-{
-	GList *p;
-
-	g_assert (foreach_func != NULL);
-
-	(* foreach_func) (tree, root_folder->path, root_folder->data, data);
-
-	for (p = root_folder->subfolders; p != NULL; p = p->next) {
-		Folder *folder;
-
-		folder = (Folder *) p->data;
-		traverse_subtree (tree, folder, foreach_func, data);
-	}
-}
-
-
-/* Folder handling.  */
-
-static Folder *
-folder_new (const char *path,
-	    void *data)
-{
-	Folder *folder;
-
-	folder = g_new (Folder, 1);
-	folder->parent     = NULL;
-	folder->path       = g_strdup (path);
-	folder->data       = data;
-	folder->subfolders = NULL;
-
-	return folder;
-}
-
-static void
-folder_remove_subfolder (Folder *folder,
-			 Folder *subfolder)
-{
-	g_list_remove (folder->subfolders, folder);
-}
-
-static void
-folder_add_subfolder (Folder *folder,
-		      Folder *subfolder)
-{
-	folder->subfolders = g_list_prepend (folder->subfolders, subfolder);
-	subfolder->parent = folder;
-}
-
-static void
-folder_destroy (Folder *folder)
-{
-	g_assert (folder->subfolders == NULL);
-
-	if (folder->parent != NULL)
-		folder_remove_subfolder (folder->parent, folder);
-
-	g_free (folder->path);
-
-	g_free (folder);
-}
-
-static void
-remove_folder (EFolderTree *folder_tree,
-	       Folder *folder)
-{
-	if (folder->subfolders != NULL) {
-		GList *p;
-
-		for (p = folder->subfolders; p != NULL; p = p->next) {
-			Folder *subfolder;
-
-			subfolder = (Folder *) p->data;
-			remove_folder (folder_tree, subfolder);
-		}
-
-		g_list_free (folder->subfolders);
-		folder->subfolders = NULL;
-	}
-
-	g_hash_table_remove (folder_tree->path_to_folder, folder->path);
-	g_hash_table_remove (folder_tree->data_to_path, folder->data);
-
-	if (folder_tree->folder_destroy_notify != NULL)
-		(* folder_tree->folder_destroy_notify) (folder_tree,
-							folder->path,
-							folder->data,
-							folder_tree->folder_destroy_notify_closure);
-
-	folder_destroy (folder);
-}
-
-
-/**
- * e_folder_tree_new:
- * @folder_destroy_notify: Function to be called when a folder gets removed from the tree
- * @closure: Additional data to pass to @folder_destroy_notify
- * 
- * Create a new EFolderTree.
- * 
- * Return value: A pointer to the newly created EFolderTree.
- **/
-EFolderTree *
-e_folder_tree_new (EFolderDestroyNotify folder_destroy_notify,
-		   void *closure)
-{
-	EFolderTree *new;
-	Folder *root_folder;
-
-	new = g_new (EFolderTree, 1);
-
-	new->folder_destroy_notify         = folder_destroy_notify;
-	new->folder_destroy_notify_closure = closure;
-
-	new->path_to_folder = g_hash_table_new (g_str_hash, g_str_equal);
-	new->data_to_path = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-	root_folder = folder_new (G_DIR_SEPARATOR_S, NULL);
-	g_hash_table_insert (new->path_to_folder, root_folder->path, root_folder);
-	g_hash_table_insert (new->data_to_path, root_folder->data, root_folder->path);
-
-	return new;
-}
-
-/**
- * e_folder_tree_destroy:
- * @folder_tree: A pointer to an EFolderTree
- * 
- * Destroy @folder_tree.
- **/
-void
-e_folder_tree_destroy (EFolderTree *folder_tree)
-{
-	Folder *root_folder;
-
-	g_return_if_fail (folder_tree != NULL);
-
-	root_folder = g_hash_table_lookup (folder_tree->path_to_folder, G_DIR_SEPARATOR_S);
-	remove_folder (folder_tree, root_folder);
-
-	g_hash_table_destroy (folder_tree->path_to_folder);
-	g_hash_table_destroy (folder_tree->data_to_path);
-
-	g_free (folder_tree);
-}
-
-/**
- * e_folder_tree_add:
- * @folder_tree: A pointer to an EFolderTree
- * @path: Path at which the new folder must be added
- * @data: Data associated with the new folder
- * 
- * Insert a new folder at @path, with the specified @data.
- *
- * Return value: %TRUE if successful, %FALSE if failed.
- **/
-gboolean
-e_folder_tree_add (EFolderTree *folder_tree,
-		   const char *path,
-		   void *data)
-{
-	Folder *parent_folder;
-	Folder *folder;
-	const char *existing_path;
-	char *parent_path;
-
-	g_return_val_if_fail (folder_tree != NULL, FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
-	g_return_val_if_fail (g_path_is_absolute (path), FALSE);
-
-	parent_path = get_parent_path (path);
-
-	parent_folder = g_hash_table_lookup (folder_tree->path_to_folder, parent_path);
-	if (parent_folder == NULL) {
-		g_warning ("e_folder_tree_add() -- Trying to add a subfolder to a path that does not exist yet -- %s",
-			   parent_path);
-		return FALSE;
-	}
-
-	folder = g_hash_table_lookup (folder_tree->path_to_folder, path);
-	if (folder != NULL) {
-		g_warning ("e_folder_tree_add() -- Trying to add a subfolder for a path that already exists -- %s",
-			   path);
-		return FALSE;
-	}
-
-	existing_path = g_hash_table_lookup (folder_tree->data_to_path, data);
-	if (existing_path != NULL) {
-		g_warning ("e_folder_tree_add() -- Trying to add a folder with duplicate data -- %s",
-			   path);
-		return FALSE;
-	}
-
-	folder = folder_new (path, data);
-	folder_add_subfolder (parent_folder, folder);
-
-	g_hash_table_insert (folder_tree->path_to_folder, folder->path, folder);
-	g_hash_table_insert (folder_tree->data_to_path, data, folder->path);
-
-	g_free (parent_path);
-
-	return TRUE;
-}
-
-/**
- * e_folder_tree_remove:
- * @folder_tree: A pointer to an EFolderTree
- * @path: Path of the folder to remove
- * 
- * Remove the folder at @path from @folder_tree.
- *
- * Return value: %TRUE if successful, %FALSE if failed.
- **/
-gboolean
-e_folder_tree_remove (EFolderTree *folder_tree,
-		      const char *path)
-{
-	Folder *folder;
-
-	g_return_val_if_fail (folder_tree != NULL, FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
-	g_return_val_if_fail (g_path_is_absolute (path), FALSE);
-
-	folder = g_hash_table_lookup (folder_tree->path_to_folder, path);
-	if (folder == NULL)
-		return FALSE;
-
-	remove_folder (folder_tree, folder);
-	return TRUE;
-}
-
-/**
- * e_folder_tree_get_folder:
- * @folder_tree: A pointer to an EFolderTree
- * @path: Path of the folder for which we want to get the data
- * 
- * Get the data for the folder at @path.
- * 
- * Return value: The pointer to the data for the folder at @path.
- **/
-void *
-e_folder_tree_get_folder (EFolderTree *folder_tree,
-			  const char *path)
-{
-	Folder *folder;
-
-	g_return_val_if_fail (folder_tree != NULL, NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	folder = g_hash_table_lookup (folder_tree->path_to_folder, path);
-	if (folder == NULL)
-		return NULL;
-
-	return folder->data;
-}
-
-/**
- * e_folder_tree_get_subfolders:
- * @folder_tree: A pointer to an EFolderTree
- * @path: A path in @folder_tree
- * 
- * Get a list of the paths of the subfolders of @path.
- * 
- * Return value: A list of pointers to the paths of the subfolders.  The list
- * and the strings must be freed by the caller.
- **/
-GList *
-e_folder_tree_get_subfolders (EFolderTree *folder_tree,
-			      const char *path)
-{
-	Folder *folder;
-	GList *list;
-	GList *p;
-
-	g_return_val_if_fail (folder_tree != NULL, NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	folder = g_hash_table_lookup (folder_tree->path_to_folder, path);
-	if (folder == NULL)
-		return NULL;
-
-	list = NULL;
-	for (p = folder->subfolders; p != NULL; p = p->next) {
-		const Folder *folder;
-
-		folder = (const Folder *) p->data;
-		list = g_list_prepend (list, g_strdup (folder->path));
-	}
-
-	return list;
-}
-
-
-/**
- * e_folder_tree_foreach:
- * @folder_tree: 
- * @foreach_func: 
- * @data: 
- * 
- * Call @foreach_func with the specified @data for all the folders
- * in @folder_tree, starting at the root node.
- **/
-void
-e_folder_tree_foreach (EFolderTree *folder_tree,
-		       EFolderTreeForeachFunc foreach_func,
-		       void *data)
-{
-	Folder *root_node;
-
-	g_return_if_fail (folder_tree != NULL);
-	g_return_if_fail (foreach_func != NULL);
-
-	root_node = g_hash_table_lookup (folder_tree->path_to_folder,
-					 G_DIR_SEPARATOR_S);
-	if (root_node == NULL) {
-		g_warning ("e_folder_tree_foreach -- What?!  No root node!?");
-		return;
-	}
-
-	traverse_subtree (folder_tree, root_node, foreach_func, data);
-}
-
-
-/**
- * e_folder_tree_get_path_for_data:
- * @folder_tree: A pointer to an EFolderTree
- * @data: The data for the folder for which the path is needed
- * 
- * Look up the path for the specified @data.
- * 
- * Return value: The path for the folder that holds that @data.
- **/
-const char *
-e_folder_tree_get_path_for_data  (EFolderTree *folder_tree,
-				  const void *data)
-{
-	g_return_val_if_fail (folder_tree != NULL, NULL);
-	g_return_val_if_fail (data != NULL, NULL);
-
-	return (const char *) g_hash_table_lookup (folder_tree->data_to_path, data);
-}
diff --git a/shell/e-folder-tree.h b/shell/e-folder-tree.h
deleted file mode 100644
index 26fa4b13a4..0000000000
--- a/shell/e-folder-tree.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder-tree.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_FOLDER_TREE_H_
-#define _E_FOLDER_TREE_H_
-
-
-typedef struct _EFolderTree EFolderTree;
-
-typedef void (* EFolderDestroyNotify)   (EFolderTree *tree, const char *path, void *data, void *closure);
-typedef void (* EFolderTreeForeachFunc) (EFolderTree *tree, const char *path, void *data, void *closure);
-
-
-EFolderTree *e_folder_tree_new               (EFolderDestroyNotify    folder_destroy_notify,
-					      void                   *closure);
-					    
-void        e_folder_tree_destroy            (EFolderTree            *folder_tree);
-					    
-gboolean    e_folder_tree_add                (EFolderTree            *folder_tree,
-					      const char             *path,
-					      void                   *data);
-gboolean    e_folder_tree_remove             (EFolderTree            *folder_tree,
-					      const char             *path);
-					    
-void       *e_folder_tree_get_folder         (EFolderTree            *folder_tree,
-					      const char             *path);
-GList      *e_folder_tree_get_subfolders     (EFolderTree            *folder_tree,
-					      const char             *path);
-					    
-void        e_folder_tree_foreach            (EFolderTree            *folder_tree,
-					      EFolderTreeForeachFunc  foreach_func,
-					      void                   *data);
-
-const char *e_folder_tree_get_path_for_data  (EFolderTree            *folder_tree,
-					      const void             *data);
-
-#endif /* _E_FOLDER_TREE_H_ */
diff --git a/shell/e-folder-type-registry.c b/shell/e-folder-type-registry.c
deleted file mode 100644
index b73deb4b06..0000000000
--- a/shell/e-folder-type-registry.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder-type-registry.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-shell-utils.h"
-
-#include "e-folder-type-registry.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
-
-struct _FolderType {
-	char *name;
-	char *icon_name;
-
-	EvolutionShellComponentClient *handler;
-
-	/* The icon, standard (48x48) and mini (16x16) versions.  */
-	GdkPixbuf *icon_pixbuf;
-	GdkPixbuf *mini_icon_pixbuf;
-};
-typedef struct _FolderType FolderType;
-
-struct _EFolderTypeRegistryPrivate {
-	GHashTable *name_to_type;
-};
-
-
-/* FolderType handling.  */
-
-static FolderType *
-folder_type_new (const char *name,
-		 const char *icon_name)
-{
-	FolderType *new;
-	char *icon_path;
-
-	new = g_new (FolderType, 1);
-
-	new->name      = g_strdup (name);
-	new->icon_name = g_strdup (icon_name);
-	new->handler   = NULL;
-
-	icon_path = e_shell_get_icon_path (icon_name, FALSE);
-	if (icon_path == NULL)
-		new->icon_pixbuf = NULL;
-	else
-		new->icon_pixbuf = gdk_pixbuf_new_from_file (icon_path);
-
-	g_free (icon_path);
-
-	icon_path = e_shell_get_icon_path (icon_name, TRUE);
-	if (icon_path != NULL) {
-		new->mini_icon_pixbuf = gdk_pixbuf_new_from_file (icon_path);
-	} else {
-		if (new->icon_pixbuf != NULL)
-			new->mini_icon_pixbuf = gdk_pixbuf_ref (new->icon_pixbuf);
-		else
-			new->mini_icon_pixbuf = NULL;
-	}
-
-	g_free (icon_path);
-
-	return new;
-}
-
-static void
-folder_type_free (FolderType *folder_type)
-{
-	g_free (folder_type->name);
-	g_free (folder_type->icon_name);
-
-	if (folder_type->icon_pixbuf != NULL)
-		gdk_pixbuf_unref (folder_type->icon_pixbuf);
-	if (folder_type->mini_icon_pixbuf != NULL)
-		gdk_pixbuf_unref (folder_type->mini_icon_pixbuf);
-
-	if (folder_type->handler != NULL)
-		bonobo_object_unref (BONOBO_OBJECT (folder_type->handler));
-
-	g_free (folder_type);
-}
-
-static FolderType *
-get_folder_type (EFolderTypeRegistry *folder_type_registry,
-		 const char *type_name)
-{
-	EFolderTypeRegistryPrivate *priv;
-
-	priv = folder_type_registry->priv;
-
-	return g_hash_table_lookup (priv->name_to_type, type_name);
-}
-
-static gboolean
-register_folder_type (EFolderTypeRegistry *folder_type_registry,
-		      const char *name,
-		      const char *icon_name)
-{
-	EFolderTypeRegistryPrivate *priv;
-	FolderType *folder_type;
-
-	priv = folder_type_registry->priv;
-
-	/* Make sure we don't add the same type twice.  */
-	if (get_folder_type (folder_type_registry, name) != NULL)
-		return FALSE;
-
-	folder_type = folder_type_new (name, icon_name);
-	g_hash_table_insert (priv->name_to_type, folder_type->name, folder_type);
-
-	return TRUE;
-}
-
-static gboolean
-set_handler (EFolderTypeRegistry *folder_type_registry,
-	     const char *name,
-	     EvolutionShellComponentClient *handler)
-{
-	EFolderTypeRegistryPrivate *priv;
-	FolderType *folder_type;
-
-	priv = folder_type_registry->priv;
-
-	folder_type = get_folder_type (folder_type_registry, name);
-	if (folder_type == NULL)
-		return FALSE;
-	if (folder_type->handler != NULL) {
-		g_warning ("Folder type already has a handler -- %s",
-			   folder_type->name);
-		return FALSE;
-	}
-
-	bonobo_object_ref (BONOBO_OBJECT (handler));
-	folder_type->handler = handler;
-
-	return TRUE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-hash_forall_free_folder_type (gpointer key,
-			      gpointer value,
-			      gpointer data)
-{
-	FolderType *folder_type;
-
-	folder_type = (FolderType *) value;
-	folder_type_free (folder_type);
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EFolderTypeRegistry *folder_type_registry;
-	EFolderTypeRegistryPrivate *priv;
-
-	folder_type_registry = E_FOLDER_TYPE_REGISTRY (object);
-	priv = folder_type_registry->priv;
-
-	g_hash_table_foreach (priv->name_to_type,
-			      hash_forall_free_folder_type, NULL);
-	g_hash_table_destroy (priv->name_to_type);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EFolderTypeRegistryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-}
-
-static void
-init (EFolderTypeRegistry *folder_type_registry)
-{
-	EFolderTypeRegistryPrivate *priv;
-
-	priv = g_new (EFolderTypeRegistryPrivate, 1);
-	priv->name_to_type = g_hash_table_new (g_str_hash, g_str_equal);
-
-	folder_type_registry->priv = priv;
-}
-
-
-void
-e_folder_type_registry_construct (EFolderTypeRegistry *folder_type_registry)
-{
-	g_return_if_fail (folder_type_registry != NULL);
-	g_return_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry));
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (folder_type_registry), GTK_FLOATING);
-}
-
-EFolderTypeRegistry *
-e_folder_type_registry_new (void)
-{
-	EFolderTypeRegistry *new;
-
-	new = gtk_type_new (e_folder_type_registry_get_type ());
-
-	e_folder_type_registry_construct (new);
-
-	return new;
-}
-
-
-gboolean
-e_folder_type_registry_register_type (EFolderTypeRegistry *folder_type_registry,
-				      const char *type_name,
-				      const char *icon_name)
-{
-	g_return_val_if_fail (folder_type_registry != NULL, FALSE);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
-	g_return_val_if_fail (type_name != NULL, FALSE);
-	g_return_val_if_fail (icon_name != NULL, FALSE);
-
-	return register_folder_type (folder_type_registry, type_name, icon_name);
-}
-
-gboolean
-e_folder_type_registry_set_handler_for_type  (EFolderTypeRegistry *folder_type_registry,
-					      const char *type_name,
-					      EvolutionShellComponentClient *handler)
-{
-	g_return_val_if_fail (folder_type_registry != NULL, FALSE);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
-	g_return_val_if_fail (handler != NULL, FALSE);
-	g_return_val_if_fail (BONOBO_IS_OBJECT_CLIENT (handler), FALSE);
-
-	return set_handler (folder_type_registry, type_name, handler);
-}
-
-
-static void
-get_type_names_hash_forall (void *key,
-			    void *value,
-			    void *data)
-{
-	GList **type_name_list;
-
-	type_name_list = (GList **) data;
-
-	*type_name_list = g_list_prepend (*type_name_list, g_strdup ((const char *) key));
-}
-
-GList *
-e_folder_type_registry_get_type_names (EFolderTypeRegistry *folder_type_registry)
-{
-	GList *type_name_list;
-	EFolderTypeRegistryPrivate *priv;
-
-	g_return_val_if_fail (folder_type_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), NULL);
-
-	priv = folder_type_registry->priv;
-
-	type_name_list = NULL;
-	g_hash_table_foreach (priv->name_to_type, get_type_names_hash_forall, &type_name_list);
-
-	return type_name_list;
-}
-
-
-const char *
-e_folder_type_registry_get_icon_name_for_type (EFolderTypeRegistry *folder_type_registry,
-					       const char *type_name)
-{
-	const FolderType *folder_type;
-
-	g_return_val_if_fail (folder_type_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), NULL);
-	g_return_val_if_fail (type_name != NULL, NULL);
-
-	folder_type = get_folder_type (folder_type_registry, type_name);
-	if (folder_type == NULL) {
-		g_warning ("e_folder_type_registry_get_icon_name_for_type() -- Unknown type `%s'", type_name);
-		return NULL;
-	}
-
-	return folder_type->icon_name;
-}
-
-GdkPixbuf *
-e_folder_type_registry_get_icon_for_type (EFolderTypeRegistry *folder_type_registry,
-					  const char *type_name,
-					  gboolean mini)
-{
-	const FolderType *folder_type;
-
-	g_return_val_if_fail (folder_type_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), NULL);
-	g_return_val_if_fail (type_name != NULL, NULL);
-
-	folder_type = get_folder_type (folder_type_registry, type_name);
-	if (folder_type == NULL) {
-		g_warning ("e_folder_type_registry_get_icon_for_type() -- Unknown type `%s'", type_name);
-		return NULL;
-	}
-
-	if (mini)
-		return folder_type->mini_icon_pixbuf;
-	else
-		return folder_type->icon_pixbuf;
-}
-
-EvolutionShellComponentClient *
-e_folder_type_registry_get_handler_for_type (EFolderTypeRegistry *folder_type_registry,
-					     const char *type_name)
-{
-	const FolderType *folder_type;
-
-	g_return_val_if_fail (folder_type_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), NULL);
-	g_return_val_if_fail (type_name != NULL, NULL);
-
-	folder_type = get_folder_type (folder_type_registry, type_name);
-	if (folder_type == NULL) {
-		g_warning ("e_folder_type_registry_get_handler_for_type() -- Unknown type `%s'", type_name);
-		return NULL;
-	}
-
-	return folder_type->handler;
-}
-
-
-E_MAKE_TYPE (e_folder_type_registry, "EFolderTypeRegistry", EFolderTypeRegistry,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/e-folder-type-registry.h b/shell/e-folder-type-registry.h
deleted file mode 100644
index f4a1905f52..0000000000
--- a/shell/e-folder-type-registry.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder-type-registry.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_FOLDER_TYPE_REGISTRY_H_
-#define _E_FOLDER_TYPE_REGISTRY_H_
-
-#include <gtk/gtkobject.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "evolution-shell-component-client.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_FOLDER_TYPE_REGISTRY		(e_folder_type_registry_get_type ())
-#define E_FOLDER_TYPE_REGISTRY(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_FOLDER_TYPE_REGISTRY, EFolderTypeRegistry))
-#define E_FOLDER_TYPE_REGISTRY_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_FOLDER_TYPE_REGISTRY, EFolderTypeRegistryClass))
-#define E_IS_FOLDER_TYPE_REGISTRY(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_FOLDER_TYPE_REGISTRY))
-#define E_IS_FOLDER_TYPE_REGISTRY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_FOLDER_TYPE_REGISTRY))
-
-
-typedef struct _EFolderTypeRegistry        EFolderTypeRegistry;
-typedef struct _EFolderTypeRegistryPrivate EFolderTypeRegistryPrivate;
-typedef struct _EFolderTypeRegistryClass   EFolderTypeRegistryClass;
-
-struct _EFolderTypeRegistry {
-	GtkObject parent;
-
-	EFolderTypeRegistryPrivate *priv;
-};
-
-struct _EFolderTypeRegistryClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType              e_folder_type_registry_get_type   (void);
-void                 e_folder_type_registry_construct  (EFolderTypeRegistry *folder_type_registry);
-EFolderTypeRegistry *e_folder_type_registry_new        (void);
-
-gboolean  e_folder_type_registry_register_type         (EFolderTypeRegistry           *folder_type_registry,
-							const char                    *type_name,
-							const char                    *icon_name);
-gboolean  e_folder_type_registry_set_handler_for_type  (EFolderTypeRegistry           *folder_type_registry,
-							const char                    *type_name,
-							EvolutionShellComponentClient *handler);
-
-GList *e_folder_type_registry_get_type_names  (EFolderTypeRegistry *folder_type_registry);
-
-GdkPixbuf                     *e_folder_type_registry_get_icon_for_type       (EFolderTypeRegistry *folder_type_registry,
-									       const char          *type_name,
-									       gboolean             mini);
-const char                    *e_folder_type_registry_get_icon_name_for_type  (EFolderTypeRegistry *folder_type_registry,
-									       const char          *type_name);
-EvolutionShellComponentClient *e_folder_type_registry_get_handler_for_type    (EFolderTypeRegistry *folder_type_registry,
-									       const char          *type_name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_FOLDER_TYPE_REGISTRY_H_ */
diff --git a/shell/e-folder.c b/shell/e-folder.c
deleted file mode 100644
index f76829b0d4..0000000000
--- a/shell/e-folder.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-folder.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
-
-struct _EFolderPrivate {
-	char *name;
-	char *type;
-	char *description;
-	char *physical_uri;
-	gboolean self_highlight;
-	int child_highlight;
-};
-
-#define EF_CLASS(obj) \
-	E_FOLDER_CLASS (GTK_OBJECT (obj)->klass)
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* EFolder methods.  */
-
-static gboolean
-save_info (EFolder *folder)
-{
-	g_warning ("`%s' does not implement `EFolder::save_info()'",
-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));
-	return FALSE;
-}
-
-static gboolean
-load_info (EFolder *folder)
-{
-	g_warning ("`%s' does not implement `EFolder::load_info()'",
-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));
-	return FALSE;
-}
-
-static gboolean
-remove (EFolder *folder)
-{
-	g_warning ("`%s' does not implement `EFolder::remove()'",
-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));
-	return FALSE;
-}
-
-static const char *
-get_physical_uri (EFolder *folder)
-{
-	return folder->priv->physical_uri;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EFolder *folder;
-	EFolderPrivate *priv;
-
-	folder = E_FOLDER (object);
-	priv = folder->priv;
-
-	g_free (priv->name);
-	g_free (priv->type);
-	g_free (priv->description);
-	g_free (priv->physical_uri);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EFolderClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	signals[CHANGED] = gtk_signal_new ("changed",
-					   GTK_RUN_FIRST,
-					   object_class->type,
-					   GTK_SIGNAL_OFFSET (EFolderClass, changed),
-					   gtk_marshal_NONE__NONE,
-					   GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	klass->save_info 	= save_info;
-	klass->load_info 	= load_info;
-	klass->remove    	= remove;
-	klass->get_physical_uri = get_physical_uri;
-}
-
-static void
-init (EFolder *folder)
-{
-	EFolderPrivate *priv;
-
-	priv = g_new (EFolderPrivate, 1);
-	priv->type            = NULL;
-	priv->name            = NULL;
-	priv->description     = NULL;
-	priv->physical_uri    = NULL;
-	priv->self_highlight  = FALSE;
-	priv->child_highlight = 0;
-
-	folder->priv = priv;
-}
-
-
-void
-e_folder_construct (EFolder *folder,
-		    const char *name,
-		    const char *type,
-		    const char *description)
-{
-	EFolderPrivate *priv;
-
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (type != NULL);
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (folder), GTK_FLOATING);
-
-	priv = folder->priv;
-
-	priv->name        = g_strdup (name);
-	priv->type        = g_strdup (type);
-	priv->description = g_strdup (description);
-}
-
-EFolder *
-e_folder_new (const char *name,
-	      const char *type,
-	      const char *description)
-{
-	EFolder *folder;
-
-	g_return_val_if_fail (name != NULL, NULL);
-	g_return_val_if_fail (type != NULL, NULL);
-	g_return_val_if_fail (description != NULL, NULL);
-
-	folder = gtk_type_new (E_TYPE_FOLDER);
-
-	e_folder_construct (folder, name, type, description);
-
-	return folder;
-}
-
-
-const char *
-e_folder_get_name (EFolder *folder)
-{
-	g_return_val_if_fail (folder != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER (folder), NULL);
-
-	return folder->priv->name;
-}
-
-const char *
-e_folder_get_type_string (EFolder *folder)
-{
-	g_return_val_if_fail (folder != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER (folder), NULL);
-
-	return folder->priv->type;
-}
-
-const char *
-e_folder_get_description (EFolder *folder)
-{
-	g_return_val_if_fail (folder != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER (folder), NULL);
-
-	return folder->priv->description;
-}
-
-const char *
-e_folder_get_physical_uri (EFolder *folder)
-{
-	g_return_val_if_fail (folder != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER (folder), NULL);
-
-	return folder->priv->physical_uri;
-}
-
-gboolean
-e_folder_get_highlighted (EFolder *folder)
-{
-	g_return_val_if_fail (folder != NULL, FALSE);
-	g_return_val_if_fail (E_IS_FOLDER (folder), FALSE);
-
-	return folder->priv->self_highlight || folder->priv->child_highlight;
-}
-
-
-void
-e_folder_set_name (EFolder *folder,
-		   const char *name)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-	g_return_if_fail (name != NULL);
-
-	g_free (folder->priv->name);
-	folder->priv->name = g_strdup (name);
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-void
-e_folder_set_type_string (EFolder *folder,
-			  const char *type)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-	g_return_if_fail (type != NULL);
-
-	g_free (folder->priv->type);
-	folder->priv->type = g_strdup (type);
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-void
-e_folder_set_description (EFolder *folder,
-			  const char *description)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-	g_return_if_fail (description != NULL);
-
-	g_free (folder->priv->description);
-	folder->priv->description = g_strdup (description);
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-void
-e_folder_set_physical_uri (EFolder *folder,
-			   const char *physical_uri)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-	g_return_if_fail (physical_uri != NULL);
-
-	g_free (folder->priv->physical_uri);
-	folder->priv->physical_uri = g_strdup (physical_uri);
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-void
-e_folder_set_highlighted (EFolder *folder,
-			  gboolean highlighted)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-
-	folder->priv->self_highlight = highlighted;
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-void
-e_folder_set_child_highlight (EFolder *folder,
-			      gboolean highlighted)
-{
-	g_return_if_fail (folder != NULL);
-	g_return_if_fail (E_IS_FOLDER (folder));
-
-	if (highlighted)
-		folder->priv->child_highlight++;
-	else
-		folder->priv->child_highlight--;
-
-	gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]);
-}
-
-
-E_MAKE_TYPE (e_folder, "EFolder", EFolder, class_init, init, PARENT_TYPE)
diff --git a/shell/e-folder.h b/shell/e-folder.h
deleted file mode 100644
index 81bbd54448..0000000000
--- a/shell/e-folder.h
+++ /dev/null
@@ -1,91 +0,0 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-folder.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_FOLDER_H_
-#define _E_FOLDER_H_
-
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_FOLDER			(e_folder_get_type ())
-#define E_FOLDER(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_FOLDER, EFolder))
-#define E_FOLDER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_FOLDER, EFolderClass))
-#define E_IS_FOLDER(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_FOLDER))
-#define E_IS_FOLDER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_FOLDER))
-
-
-typedef struct _EFolder        EFolder;
-typedef struct _EFolderPrivate EFolderPrivate;
-typedef struct _EFolderClass   EFolderClass;
-
-struct _EFolder {
-	GtkObject parent;
-
-	EFolderPrivate *priv;
-};
-
-struct _EFolderClass {
-	GtkObjectClass parent_class;
-
-	/* Virtual methods.  */
-	gboolean     (* save_info) 	  (EFolder *folder);
-	gboolean     (* load_info) 	  (EFolder *folder);
-	gboolean     (* remove)    	  (EFolder *folder);
-	const char * (* get_physical_uri) (EFolder *folder);
-
-	/* Signals.  */
-	void (* changed) (EFolder *folder);
-};
-
-
-GtkType  e_folder_get_type   (void);
-void     e_folder_construct  (EFolder    *folder,
-			      const char *name,
-			      const char *type,
-			      const char *description);
-EFolder *e_folder_new        (const char *name,
-			      const char *type,
-			      const char *description);
-
-const char *e_folder_get_name         (EFolder *folder);
-const char *e_folder_get_type_string  (EFolder *folder);
-const char *e_folder_get_description  (EFolder *folder);
-const char *e_folder_get_physical_uri (EFolder *folder);
-gboolean    e_folder_get_highlighted  (EFolder *folder);
-
-void e_folder_set_name            (EFolder *folder, const char *name);
-void e_folder_set_type_string     (EFolder *folder, const char *type);
-void e_folder_set_description     (EFolder *folder, const char *description);
-void e_folder_set_physical_uri    (EFolder *folder, const char *physical_uri);
-void e_folder_set_highlighted     (EFolder *folder, gboolean highlighted);
-void e_folder_set_child_highlight (EFolder *folder, gboolean highlighted);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_FOLDER_H_ */
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
deleted file mode 100644
index 62dad4f4c2..0000000000
--- a/shell/e-local-folder.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-local-folder.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* The metafile goes like this:
-
-   <?xml version="1.0"?>
-   <efolder>
-           <type>mail</type>
-	   <description>This is the folder where I store mail from my gf</description>
-	   <homepage>http://www.somewhere.net</homepage>
-   </efolder>
-
-   FIXME: Do we want to use a namespace for this?
-   FIXME: Do we want to have an internationalized description?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-
-#include "e-local-folder.h"
-
-
-#define PARENT_TYPE E_TYPE_FOLDER
-static EFolderClass *parent_class = NULL;
-
-#define URI_PREFIX     "file://"
-#define URI_PREFIX_LEN 7
-
-#define METADATA_FILE_NAME     "folder-metadata.xml"
-#define METADATA_FILE_NAME_LEN 19
-
-struct _ELocalFolderPrivate {
-	int dummy;
-};
-
-
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL)
-		return NULL;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-construct_loading_metadata (ELocalFolder *local_folder,
-			    const char *path)
-{
-	EFolder *folder;
-	xmlDoc *doc;
-	xmlNode *root;
-	char *type;
-	char *description;
-	char *metadata_path;
-	char *physical_uri;
-
-	folder = E_FOLDER (local_folder);
-
-	metadata_path = g_concat_dir_and_file (path, METADATA_FILE_NAME);
-
-	doc = xmlParseFile (metadata_path);
-	if (doc == NULL) {
-		g_free (metadata_path);
-		return FALSE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "efolder") != 0) {
-		g_free (metadata_path);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	type = get_string_value (root, "type");
-	description = get_string_value (root, "description");
-
-	e_folder_construct (folder, g_basename (path), type, description);
-
-	g_free (type);
-	g_free (description);
-
-	xmlFreeDoc (doc);
-
-	physical_uri = g_strconcat (URI_PREFIX, path, NULL);
-	e_folder_set_physical_uri (folder, physical_uri);
-	g_free (physical_uri);
-
-	g_free (metadata_path);
-
-	return TRUE;
-}
-
-static gboolean
-save_metadata (ELocalFolder *local_folder)
-{
-	EFolder *folder;
-	xmlDoc *doc;
-	xmlNode *root;
-	const char *physical_directory;
-	char *physical_path;
-
-	folder = E_FOLDER (local_folder);
-
-	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "efolder", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	xmlNewChild (root, NULL, (xmlChar *) "type",
-		     (xmlChar *) e_folder_get_type_string (folder));
-
-	if (e_folder_get_description (folder) != NULL)
-		xmlNewChild (root, NULL, (xmlChar *) "description",
-			     (xmlChar *) e_folder_get_description (folder));
-
-	physical_directory = e_folder_get_physical_uri (folder) + URI_PREFIX_LEN - 1;
-	physical_path = g_concat_dir_and_file (physical_directory, METADATA_FILE_NAME);
-
-	if (xmlSaveFile (physical_path, doc) < 0) {
-		unlink (physical_path);
-		g_free (physical_path);
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	g_free (physical_path);
-
-	xmlFreeDoc (doc);
-	return TRUE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	/* No ELocalFolder-specific data to free.  */
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (ELocalFolderClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (e_folder_get_type ());
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-}
-
-static void
-init (ELocalFolder *local_folder)
-{
-}
-
-
-void
-e_local_folder_construct (ELocalFolder *local_folder,
-			  const char *name,
-			  const char *type,
-			  const char *description)
-{
-	g_return_if_fail (local_folder != NULL);
-	g_return_if_fail (E_IS_LOCAL_FOLDER (local_folder));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (type != NULL);
-
-	e_folder_construct (E_FOLDER (local_folder), name, type, description);
-}
-
-EFolder *
-e_local_folder_new (const char *name,
-		    const char *type,
-		    const char *description)
-{
-	ELocalFolder *local_folder;
-
-	g_return_val_if_fail (name != NULL, NULL);
-	g_return_val_if_fail (type != NULL, NULL);
-
-	local_folder = gtk_type_new (e_local_folder_get_type ());
-
-	e_local_folder_construct (local_folder, name, type, description);
-
-	return E_FOLDER (local_folder);
-}
-
-EFolder *
-e_local_folder_new_from_path (const char *path)
-{
-	EFolder *folder;
-
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	folder = gtk_type_new (e_local_folder_get_type ());
-
-	if (! construct_loading_metadata (E_LOCAL_FOLDER (folder), path)) {
-		gtk_object_unref (GTK_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-gboolean
-e_local_folder_save (ELocalFolder *local_folder)
-{
-	g_return_val_if_fail (local_folder != NULL, FALSE);
-	g_return_val_if_fail (E_IS_LOCAL_FOLDER (local_folder), FALSE);
-	g_return_val_if_fail (e_folder_get_physical_uri (E_FOLDER (local_folder)) != NULL, FALSE);
-
-	return save_metadata (local_folder);
-}
-
-
-E_MAKE_TYPE (e_local_folder, "ELocalFolder", ELocalFolder, class_init, init, PARENT_TYPE)
diff --git a/shell/e-local-folder.h b/shell/e-local-folder.h
deleted file mode 100644
index 4e83af4b40..0000000000
--- a/shell/e-local-folder.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-local-folder.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_LOCAL_FOLDER_H_
-#define _E_LOCAL_FOLDER_H_
-
-#include <gtk/gtkobject.h>
-
-#include "e-folder.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_LOCAL_FOLDER		(e_local_folder_get_type ())
-#define E_LOCAL_FOLDER(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_LOCAL_FOLDER, ELocalFolder))
-#define E_LOCAL_FOLDER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LOCAL_FOLDER, ELocalFolderClass))
-#define E_IS_LOCAL_FOLDER(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_LOCAL_FOLDER))
-#define E_IS_LOCAL_FOLDER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_LOCAL_FOLDER))
-
-typedef struct _ELocalFolder        ELocalFolder;
-typedef struct _ELocalFolderClass   ELocalFolderClass;
-
-struct _ELocalFolder {
-	EFolder parent;
-};
-
-struct _ELocalFolderClass {
-	EFolderClass parent_class;
-};
-
-
-GtkType   e_local_folder_get_type       (void);
-void      e_local_folder_construct      (ELocalFolder *local_folder,
-					 const char   *name,
-					 const char   *type,
-					 const char   *description);
-EFolder  *e_local_folder_new            (const char   *name,
-					 const char   *type,
-					 const char   *description);
-EFolder  *e_local_folder_new_from_path  (const char   *physical_path);
-gboolean  e_local_folder_save           (ELocalFolder *local_folder);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_LOCAL_FOLDER_H__ */
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
deleted file mode 100644
index b669701be9..0000000000
--- a/shell/e-local-storage.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-local-storage.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* FIXMEs:
- *
- *   - If we have `.' or `..' as path elements, we lose.
- *
- *   - If the LocalStorage is destroyed and an async operation on a shell component is
- *     pending, we get a callback on a bogus object.  We need support for cancelling
- *     operations on the shell component.
- *
- *   - The tree is kept both in the EStorage and the EvolutionStorage.  Very
- *     bad design.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dirent.h>
-
-#include <errno.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <gnome.h>
-
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-#include "e-local-folder.h"
-
-#include "evolution-local-storage.h"
-
-#include "e-local-storage.h"
-
-
-#define PARENT_TYPE E_TYPE_STORAGE
-static EStorageClass *parent_class = NULL;
-
-#define SUBFOLDER_DIR_NAME     "subfolders"
-#define SUBFOLDER_DIR_NAME_LEN 10
-
-struct _ELocalStoragePrivate {
-	EFolderTypeRegistry *folder_type_registry;
-	char *base_path;
-	EvolutionLocalStorage *bonobo_interface;
-};
-
-
-/* Utility functions.  */
-
-/* Translate a storage path into a physical path on the file system.  */
-static char *
-get_physical_path (ELocalStorage *local_storage,
-		   const char *path)
-{
-	EStorage *storage;
-	ELocalStoragePrivate *priv;
-	const char *p, *newp;
-	char *dp;
-	char *real_path;
-	int real_path_len;
-	int base_path_len;
-
-	storage = E_STORAGE (local_storage);
-	priv = local_storage->priv;
-
-	/* @path is always absolute, so it starts with a slash.  The base class should
-           make sure this is the case; if not, it's broken.  */
-	g_assert (*path == G_DIR_SEPARATOR);
-	path++;
-
-	/* Calculate the length of the real path. */
-
-	real_path_len = strlen (path);
-	real_path_len++;	/* For the ending zero.  */
-
-	base_path_len = strlen (priv->base_path);
-	real_path_len += base_path_len;
-	real_path_len++;	/* For the separating slash.  */
-
-	/* Take account for the fact that we need to translate every separator into
-           `subfolders/'. */
-	p = path;
-	while (1) {
-		newp = strchr (p, G_DIR_SEPARATOR);
-		if (newp == NULL)
-			break;
-
-		real_path_len += SUBFOLDER_DIR_NAME_LEN;
-		real_path_len++; /* For the separating slash.  */
-
-		/* Skip consecutive slashes.  */
-		while (*newp == G_DIR_SEPARATOR)
-			newp++;
-
-		p = newp;
-	};
-
-	real_path = g_malloc (real_path_len);
-	dp = real_path;
-
-	memcpy (dp, priv->base_path, base_path_len);
-	dp += base_path_len;
-	*(dp++) = G_DIR_SEPARATOR;
-
-	/* Copy the mangled path.  */
-	p = path;
- 	while (1) {
-		newp = strchr (p, G_DIR_SEPARATOR);
-		if (newp == NULL) {
-			strcpy (dp, p);
-			break;
-		}
-
-		memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too.  */
-		dp += newp - p + 1;
-
-		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
-		dp += SUBFOLDER_DIR_NAME_LEN;
-
-		*(dp++) = G_DIR_SEPARATOR;
-
-		/* Skip consecutive slashes.  */
-		while (*newp == G_DIR_SEPARATOR)
-			newp++;
-
-		p = newp;
-	}
-
-	return real_path;
-}
-
-static void
-new_folder (ELocalStorage *local_storage,
-	    const char *path,
-	    EFolder *folder)
-{
-	ELocalStoragePrivate *priv;
-
-	priv = local_storage->priv;
-
-	e_storage_new_folder (E_STORAGE (local_storage), path, folder);
-
-	evolution_storage_new_folder (EVOLUTION_STORAGE (priv->bonobo_interface),
-				      path,
-				      e_folder_get_name (folder),
-				      e_folder_get_type_string (folder),
-				      e_folder_get_physical_uri (folder),
-				      e_folder_get_description (folder),
-				      e_folder_get_highlighted (folder));
-}
-
-static gboolean
-load_folders (ELocalStorage *local_storage,
-	      const char *parent_path,
-	      const char *path,
-	      const char *physical_path)
-{
-	DIR *dir;
-	char *subfolder_directory_path;
-
-	if (parent_path == NULL) {
-		/* On the top level, we don't have any folders and, consequently, no
-		   subfolder directory.  */
-
-		subfolder_directory_path = g_strdup (physical_path);
-	} else {
-		EFolder *folder;
-
-		/*  Otherwise, we have to load the corresponding folder.  */
-
-		folder = e_local_folder_new_from_path (physical_path);
-		if (folder == NULL)
-			return FALSE;
-
-		new_folder (local_storage, path, folder);
-
-		subfolder_directory_path = g_concat_dir_and_file (physical_path, SUBFOLDER_DIR_NAME);
-	}
-
-	/* Now scan the subfolders and load them.  The subfolders are represented by
-           directories under the "SUBFOLDER_DIR_NAME" directory.  */
-
-	dir = opendir (subfolder_directory_path);
-
-	if (dir == NULL) {
-		g_free (subfolder_directory_path);
-		return FALSE;
-	}
-
-	while (1) {
-		struct stat file_stat;
-		struct dirent *dirent;
-		char *file_path;
-		char *new_path;
-
-		dirent = readdir (dir);
-		if (dirent == NULL)
-			break;
-
-		if (strcmp (dirent->d_name, ".") == 0 || strcmp (dirent->d_name, "..") == 0)
-			continue;
-
-		file_path = g_concat_dir_and_file (subfolder_directory_path,
-						   dirent->d_name);
-
-		if (stat (file_path, &file_stat) < 0) {
-			g_free (file_path);
-			continue;
-		}
-		if (! S_ISDIR (file_stat.st_mode)) {
-			g_free (file_path);
-			continue;
-		}
-
-		new_path = g_concat_dir_and_file (path, dirent->d_name);
-
-		load_folders (local_storage, path, new_path, file_path);
-
-		g_free (file_path);
-		g_free (new_path);
-	}
-
-	closedir (dir);
-	g_free (subfolder_directory_path);
-
-	return TRUE;
-}
-
-static gboolean
-load_all_folders (ELocalStorage *local_storage)
-{
-	const char *base_path;
-
-	base_path = e_local_storage_get_base_path (local_storage);
-
-	return load_folders (local_storage, NULL, G_DIR_SEPARATOR_S, base_path);
-}
-
-static EStorageResult
-errno_to_storage_result (void)
-{
-	EStorageResult storage_result;
-
-	switch (errno) {
-	case EACCES:
-	case EROFS:
-		storage_result = E_STORAGE_PERMISSIONDENIED;
-		break;
-	case EEXIST:
-		storage_result = E_STORAGE_EXISTS;
-		break;
-	case ENOSPC:
-		storage_result = E_STORAGE_NOSPACE;
-		break;
-	default:
-		storage_result = E_STORAGE_GENERICERROR;
-	}
-
-	return storage_result;
-}
-
-static EStorageResult
-shell_component_result_to_storage_result (EvolutionShellComponentResult result)
-{
-	/* FIXME: Maybe we need better mapping here.  */
-	switch (result) {
-	case EVOLUTION_SHELL_COMPONENT_OK:
-		return E_STORAGE_OK;
-	case EVOLUTION_SHELL_COMPONENT_NOTFOUND:
-		return E_STORAGE_NOTFOUND;
-	case EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE:
-		return E_STORAGE_UNSUPPORTEDTYPE;
-	case EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDOPERATION:
-		return E_STORAGE_UNSUPPORTEDOPERATION;
-	case EVOLUTION_SHELL_COMPONENT_EXISTS:
-		return E_STORAGE_EXISTS;
-	case EVOLUTION_SHELL_COMPONENT_PERMISSIONDENIED:
-		return E_STORAGE_PERMISSIONDENIED;
-	case EVOLUTION_SHELL_COMPONENT_ALREADYOWNED:
-	case EVOLUTION_SHELL_COMPONENT_BUSY:
-	case EVOLUTION_SHELL_COMPONENT_CORBAERROR:
-	case EVOLUTION_SHELL_COMPONENT_HASSUBFOLDERS:
-	case EVOLUTION_SHELL_COMPONENT_INTERNALERROR:
-	case EVOLUTION_SHELL_COMPONENT_INTERRUPTED:
-	case EVOLUTION_SHELL_COMPONENT_INVALIDARG:
-	case EVOLUTION_SHELL_COMPONENT_INVALIDURI:
-	case EVOLUTION_SHELL_COMPONENT_NOSPACE:
-	case EVOLUTION_SHELL_COMPONENT_NOTOWNED:
-	case EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR:
-	default:
-		return E_STORAGE_GENERICERROR;
-	}
-}
-
-
-/* Callbacks for the async methods invoked on the `Evolution::ShellComponent's.  */
-
-struct _AsyncCreateFolderCallbackData {
-	EStorage *storage;
-
-	char *path;
-	char *display_name;
-	char *type;
-	char *description;
-	char *physical_uri;
-	char *physical_path;
-
-	EStorageResultCallback callback;
-	void *callback_data;
-};
-typedef struct _AsyncCreateFolderCallbackData AsyncCreateFolderCallbackData;
-
-static void
-component_async_create_folder_callback (EvolutionShellComponentClient *shell_component_client,
-					EvolutionShellComponentResult result,
-					void *data)
-{
-	AsyncCreateFolderCallbackData *callback_data;
-
-	callback_data = (AsyncCreateFolderCallbackData *) data;
-
-	if (result != EVOLUTION_SHELL_COMPONENT_OK) {
-		/* XXX: This assumes the component won't leave any files in the directory.  */
-		rmdir (callback_data->physical_path);
-	} else {
-		EFolder *folder;
-
-		folder = e_local_folder_new (callback_data->display_name,
-					     callback_data->type,
-					     callback_data->description);
-
-		e_folder_set_physical_uri (folder, callback_data->physical_uri);
-
-		if (e_local_folder_save (E_LOCAL_FOLDER (folder))) {
-			new_folder (E_LOCAL_STORAGE(callback_data->storage), callback_data->path, folder);
-		} else {
-			rmdir (callback_data->physical_path);
-			gtk_object_unref (GTK_OBJECT (folder));
-			result = E_STORAGE_IOERROR;
-		}
-	}
-
-	bonobo_object_unref (BONOBO_OBJECT (shell_component_client));
-
-	if (callback_data->callback != NULL)
-		(* callback_data->callback) (callback_data->storage,
-					     shell_component_result_to_storage_result (result),
-					     callback_data->callback_data);
-	
-	g_free (callback_data->path);
-	g_free (callback_data->display_name);
-	g_free (callback_data->type);
-	g_free (callback_data->description);
-	g_free (callback_data->physical_uri);
-	g_free (callback_data->physical_path);
-	g_free (callback_data);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ELocalStorage *local_storage;
-	ELocalStoragePrivate *priv;
-	CORBA_Environment ev;
-
-	local_storage = E_LOCAL_STORAGE (object);
-	priv = local_storage->priv;
-
-	CORBA_exception_init (&ev);
-
-	g_free (priv->base_path);
-
-	if (priv->folder_type_registry != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
-
-	if (priv->bonobo_interface != NULL)
-		bonobo_object_unref (BONOBO_OBJECT (priv->bonobo_interface));
-
-	g_free (priv);
-
-	CORBA_exception_free (&ev);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* EStorage methods.  */
-
-static const char *
-impl_get_name (EStorage *storage)
-{
-	return E_LOCAL_STORAGE_NAME;
-}
-
-static int
-real_do_folder_create (ELocalStorage *local_storage,
-		       const char *path,
-		       const char *type,
-		       const char *description,
-		       EStorageResultCallback callback,
-		       void *data)
-{
-	EStorage *storage;
-	ELocalStoragePrivate *priv;
-	EvolutionShellComponentClient *component_client;
-	AsyncCreateFolderCallbackData *callback_data;
-	const char *folder_name;
-	char *physical_path;
-	char *physical_uri;
-	char *parent_path;
-	
-	storage = E_STORAGE (local_storage);
-	priv = local_storage->priv;
-	component_client = e_folder_type_registry_get_handler_for_type (priv->folder_type_registry,
-									type);
-	if (component_client == NULL) {
-		if (callback != NULL)
-			(* callback) (storage, E_STORAGE_INVALIDTYPE, data);
-
-		return E_STORAGE_INVALIDTYPE;
-	}
-	
-	g_assert (g_path_is_absolute (path));
-	
-	folder_name = g_basename (path);
-	if (folder_name == path + 1) {
-		/* We want a direct child of the root, so we don't need to create a
-		   `subfolders' directory.  */
-		physical_path = get_physical_path (local_storage, path);
-		parent_path = g_strdup (G_DIR_SEPARATOR_S);
-	} else {
-		char *parent_physical_path;
-		char *subfolders_directory_physical_path;
-		
-		/* Create the `subfolders' subdirectory under the parent.  */
-		
-		parent_path = g_strndup (path, folder_name - path - 1);
-		parent_physical_path = get_physical_path (local_storage, parent_path);
-		subfolders_directory_physical_path = g_concat_dir_and_file (parent_physical_path,
-									    SUBFOLDER_DIR_NAME);
-		
-		if (! g_file_exists (subfolders_directory_physical_path)
-		    && mkdir (subfolders_directory_physical_path, 0700) == -1) {
-			g_free (parent_path);
-			g_free (subfolders_directory_physical_path);
-			g_free (parent_physical_path);
-			if (callback != NULL)
-				(* callback) (storage, 
-					      errno_to_storage_result (), data);
-			return errno_to_storage_result ();
-		}
-		
-		physical_path = g_concat_dir_and_file (subfolders_directory_physical_path,
-						       folder_name);
-		g_free (subfolders_directory_physical_path);
-		g_free (parent_physical_path);
-	}
-	
-	/* Create the directory that holds the folder.  */
-	
-	if (mkdir (physical_path, 0700) == -1) {
-		g_free (physical_path);
-		if (callback != NULL)
-			(* callback) (storage,
-				      errno_to_storage_result (), data);
-
-		return errno_to_storage_result ();
-	}
-
-	/* Finally tell the component to do the job of creating the physical files in
-           it. */
-	/* FIXME: We should put the operations on a queue so that we can cancel them when
-           the ELocalStorage is destroyed.  */
-	
-	physical_uri = g_strconcat ("file://", physical_path, NULL);
-	
-	callback_data = g_new (AsyncCreateFolderCallbackData, 1);
-	callback_data->storage       = E_STORAGE (local_storage);
-	callback_data->path          = g_strdup (path);
-	callback_data->display_name  = g_strdup (folder_name);
-	callback_data->type          = g_strdup (type);
-	callback_data->description   = g_strdup (description);
-	callback_data->physical_uri  = physical_uri;
-	callback_data->physical_path = physical_path;
-	callback_data->callback      = callback;
-	callback_data->callback_data = data;
-	
-	bonobo_object_ref (BONOBO_OBJECT (component_client));
-	
-	evolution_shell_component_client_async_create_folder (component_client,
-							      physical_path,
-							      type,
-							      component_async_create_folder_callback,
-							      callback_data);
-	return EVOLUTION_STORAGE_OK;
-}
-
-static int
-create_folder_cb (EvolutionStorage *estorage,
-		  const char *path,
-		  const char *type,
-		  const char *description,
-		  const char *parent_p_path,
-		  void *data)
-{
-	ELocalStorage *local_storage;
-	int ret;
-
-	local_storage = E_LOCAL_STORAGE (data);
-	ret = real_do_folder_create (local_storage, path, type, 
-				     description, NULL, data);
-
-	return ret;
-}
-
-static void
-impl_async_create_folder (EStorage *storage,
-			  const char *path,
-			  const char *type,
-			  const char *description,
-			  EStorageResultCallback callback,
-			  void *data)
-{
-	ELocalStorage *local_storage;
-
-	local_storage = E_LOCAL_STORAGE (storage);
-	real_do_folder_create (local_storage, path, type, 
-			       description, callback, data);
-}
-
-static void
-impl_async_remove_folder (EStorage *storage,
-			  const char *path,
-			  EStorageResultCallback callback,
-			  void *data)
-{
-	ELocalStorage *local_storage;
-
-	local_storage = E_LOCAL_STORAGE (storage);
-}
-
-
-/* Callbacks for the `Evolution::LocalStorage' interface we are exposing to the outside world.  */
-
-static void
-bonobo_interface_update_folder_cb (EvolutionLocalStorage *bonobo_local_storage,
-				   const char *path,
-				   const char *display_name,
-				   gboolean highlighted,
-				   void *data)
-{
-	ELocalStorage *local_storage;
-	EFolder *folder;
-
-	local_storage = E_LOCAL_STORAGE (data);
-
-	folder = e_storage_get_folder (E_STORAGE (local_storage), path);
-	if (folder == NULL)
-		return;
-
-	e_folder_set_name (folder, display_name);
-	e_folder_set_highlighted (folder, highlighted);
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (ELocalStorageClass *class)
-{
-	EStorageClass *storage_class;
-	GtkObjectClass *object_class;
-
-	parent_class  = gtk_type_class (e_storage_get_type ());
-	object_class  = GTK_OBJECT_CLASS (class);
-	storage_class = E_STORAGE_CLASS (class);
-
-	object_class->destroy              = impl_destroy;
-
-	storage_class->get_name            = impl_get_name;
-	storage_class->async_create_folder = impl_async_create_folder;
-	storage_class->async_remove_folder = impl_async_remove_folder;
-}
-
-static void
-init (ELocalStorage *local_storage)
-{
-	ELocalStoragePrivate *priv;
-
-	priv = g_new (ELocalStoragePrivate, 1);
-
-	priv->base_path            = NULL;
-	priv->folder_type_registry = NULL;
-	priv->bonobo_interface     = NULL;
-
-	local_storage->priv = priv;
-}
-
-
-static gboolean
-construct (ELocalStorage *local_storage,
-	   EFolderTypeRegistry *folder_type_registry,
-	   const char *base_path)
-{
-	ELocalStoragePrivate *priv;
-	int base_path_len;
-
-	e_storage_construct (E_STORAGE (local_storage), NULL, NULL);
-
-	priv = local_storage->priv;
-
-	base_path_len = strlen (base_path);
-	while (base_path_len > 0 && base_path[base_path_len - 1] == G_DIR_SEPARATOR)
-		base_path_len--;
-
-	g_return_val_if_fail (base_path_len != 0, FALSE);
-
-	g_assert (priv->folder_type_registry == NULL);
-	gtk_object_ref (GTK_OBJECT (folder_type_registry));
-	priv->folder_type_registry = folder_type_registry;
-
-	g_assert (priv->base_path == NULL);
-	priv->base_path = g_strndup (base_path, base_path_len);
-
-	g_assert (priv->bonobo_interface == NULL);
-	priv->bonobo_interface = evolution_local_storage_new (E_LOCAL_STORAGE_NAME);
-
-	gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "create_folder",
-			    GTK_SIGNAL_FUNC (create_folder_cb), local_storage);
-	gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "update_folder",
-			    GTK_SIGNAL_FUNC (bonobo_interface_update_folder_cb),
-			    local_storage);
-
-	return load_all_folders (local_storage);
-}
-
-EStorage *
-e_local_storage_open (EFolderTypeRegistry *folder_type_registry,
-		      const char *base_path)
-{
-	EStorage *new;
-
-	g_return_val_if_fail (folder_type_registry != NULL, NULL);
-	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), NULL);
-	g_return_val_if_fail (base_path != NULL, NULL);
-
-	new = gtk_type_new (e_local_storage_get_type ());
-
-	if (! construct (E_LOCAL_STORAGE (new), folder_type_registry, base_path)) {
-		gtk_object_unref (GTK_OBJECT (new));
-		return NULL;
-	}
-
-	return new;
-}
-
-const char *
-e_local_storage_get_base_path (ELocalStorage *local_storage)
-{
-	g_return_val_if_fail (local_storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_LOCAL_STORAGE (local_storage), NULL);
-
-	return local_storage->priv->base_path;
-}
-
-
-const GNOME_Evolution_LocalStorage
-e_local_storage_get_corba_interface (ELocalStorage *local_storage)
-{
-	ELocalStoragePrivate *priv;
-	GNOME_Evolution_LocalStorage corba_interface;
-
-	g_return_val_if_fail (local_storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_LOCAL_STORAGE (local_storage), NULL);
-
-	priv = local_storage->priv;
-	corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (priv->bonobo_interface));
-
-	return corba_interface;
-}
-
-
-E_MAKE_TYPE (e_local_storage, "ELocalStorage", ELocalStorage, class_init, init, PARENT_TYPE)
diff --git a/shell/e-local-storage.h b/shell/e-local-storage.h
deleted file mode 100644
index f844c34bb4..0000000000
--- a/shell/e-local-storage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-local-storage.h
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_LOCAL_STORAGE_H_
-#define _E_LOCAL_STORAGE_H_
-
-#include "e-folder-type-registry.h"
-#include "e-storage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_LOCAL_STORAGE			(e_local_storage_get_type ())
-#define E_LOCAL_STORAGE(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_LOCAL_STORAGE, ELocalStorage))
-#define E_LOCAL_STORAGE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LOCAL_STORAGE, ELocalStorageClass))
-#define E_IS_LOCAL_STORAGE(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_LOCAL_STORAGE))
-#define E_IS_LOCAL_STORAGE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_LOCAL_STORAGE))
-
-typedef struct _ELocalStorage        ELocalStorage;
-typedef struct _ELocalStoragePrivate ELocalStoragePrivate;
-typedef struct _ELocalStorageClass   ELocalStorageClass;
-
-struct _ELocalStorage {
-	EStorage parent;
-
-	ELocalStoragePrivate *priv;
-};
-
-struct _ELocalStorageClass {
-	EStorageClass parent_class;
-};
-
-
-#define E_LOCAL_STORAGE_NAME "local"
-
-
-GtkType                       e_local_storage_get_type             (void);
-
-EStorage                     *e_local_storage_open                 (EFolderTypeRegistry *folder_type_registry,
-								    const char          *base_path);
-const char                   *e_local_storage_get_base_path        (ELocalStorage       *storage);
-
-const GNOME_Evolution_LocalStorage  e_local_storage_get_corba_interface  (ELocalStorage       *storage);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_LOCAL_STORAGE_H__ */
diff --git a/shell/e-setup.c b/shell/e-setup.c
deleted file mode 100644
index 96a7a11d15..0000000000
--- a/shell/e-setup.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-setup.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/* This needs to be a lot better.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gnome.h>
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <gal/widgets/e-gui-utils.h>
-
-#include "e-setup.h"
-
-
-static GList *
-check_dir_recur (const char *evolution_directory,
-		 const char *current_directory)
-{
-	DIR *def;
-	GList *newfiles = NULL;
-	struct dirent *current;
-
-	def = opendir (current_directory);
-	if (def == NULL)
-		return NULL;
-
-	current = readdir (def);
-	while (current != NULL) {
-		struct stat buf;
-		char *fullname, *fulldefaultname;
-
-		if (current->d_name[0] == '.' &&
-		    (current->d_name[1] == '\0' ||
-		     (current->d_name[1] == '.' && current->d_name[2] == '\0'))) {
-			current = readdir (def);
-			continue;
-		}
-
-		fullname = g_concat_dir_and_file (evolution_directory,
-						  current->d_name);
-		fulldefaultname = g_concat_dir_and_file (current_directory,
-							 current->d_name);
-
-		if (stat (fullname, &buf) == -1) {
-			char *name;
-
-			name = g_strdup (fulldefaultname);
-			newfiles = g_list_append (newfiles, name);
-		} else {
-			if (S_ISDIR (buf.st_mode)) {
-				newfiles = g_list_concat (newfiles,
-							  check_dir_recur (fullname,
-									   fulldefaultname));
-			}
-		}
-
-		g_free (fulldefaultname);
-		g_free (fullname);
-		current = readdir (def);
-	}
-
-	closedir (def);
-	return newfiles;
-}
-
-static gboolean
-check_evolution_directory (const char *evolution_directory)
-{
-	GtkWidget *dialog;
-	GtkWidget *label1, *label2;
-	gboolean retval;
-	GList *newfiles, *l;
-	char *defaultdir;
-	int result;
-
-	defaultdir = g_strdup (EVOLUTION_DATADIR "/evolution/default_user");
-	newfiles = g_list_concat (NULL, check_dir_recur (evolution_directory,
-							 defaultdir));
-
-	if (newfiles == NULL) {
-		retval = TRUE;
-		goto out;
-	}
-
-	dialog = gnome_dialog_new (_("Evolution installation"),
-				   GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-
-	label1 = gtk_label_new (_("This new version of Evolution needs to install additional files\ninto your personal Evolution directory"));
-	label2 = gtk_label_new (_("Please click \"OK\" to install the files, or \"Cancel\" to exit."));
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label1, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label2, TRUE, TRUE, 0);
-
-	gtk_widget_show (label1);
-	gtk_widget_show (label2);
-
-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
-
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	if (result != 0) {
-		retval = FALSE;
-		goto out;
-	}
-
-	retval = TRUE;
-	for (l = newfiles; l; l = l->next) {
-		char *command;
-		char *shortpath;
-
-		shortpath = l->data + strlen (EVOLUTION_DATADIR "/evolution/default_user/");
-		command = g_strconcat ("cp -r ",
-				       l->data, " ",
-				       evolution_directory, "/",
-				       shortpath,
-				       NULL);
-
-		if (system (command) != 0) {
-			retval = FALSE;
-		} else {
-			retval = (retval && TRUE);
-		}
-
-		g_free (command);
-	}
-
-	if (retval == FALSE)
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Could not update files correctly"));
-	else
-		e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
-			  _("Evolution files successfully installed."));
-
- out:
-
-	for (l = newfiles; l; l = l->next)
-		g_free (l->data);
-
-	g_list_free (newfiles);
-	g_free (defaultdir);
-
-	return retval;
-}
-
-
-static gboolean
-copy_default_stuff (const char *evolution_directory)
-{
-	GtkWidget *dialog;
-	GtkWidget *label1;
-	GtkWidget *label2;
-	GtkWidget *label3;
-	gboolean retval;
-	char *command;
-	int result;
-
-	dialog = gnome_dialog_new (_("Evolution installation"),
-				   GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-
-	label1 = gtk_label_new (_("This seems to be the first time you are running Evolution."));
-	label2 = gtk_label_new (_("Please click \"OK\" to install the Evolution user files under"));
-	label3 = gtk_label_new (evolution_directory);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label1, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label2, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label3, TRUE, TRUE, 0);
-
-	gtk_widget_show (label1);
-	gtk_widget_show (label2);
-	gtk_widget_show (label3);
-
-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
-
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	if (result != 0)
-		return FALSE;
-
-	if (mkdir (evolution_directory, 0700)) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot create the directory\n%s\nError: %s"),
-			  evolution_directory,
-			  g_strerror (errno));
-		return FALSE;
-	}
-
-	command = g_strconcat ("cp -r ",
-			       EVOLUTION_DATADIR,
-			       "/evolution/default_user/* ",
-			       evolution_directory,
-			       NULL);
-
-	if (system (command) != 0) {
-		/* FIXME: Give more help.  */
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot copy files into\n`%s'."), evolution_directory);
-		retval = FALSE;
-	} else {
-		e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
-			  _("Evolution files successfully installed."));
-		retval = TRUE;
-	}
-
-	g_free (command);
-
-	return retval;
-}
-
-
-gboolean
-e_setup (const char *evolution_directory)
-{
-	struct stat statinfo;
-	char *file;
-
-	if (stat (evolution_directory, &statinfo) != 0)
-		return copy_default_stuff (evolution_directory);
-
-	if (! S_ISDIR (statinfo.st_mode)) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("The file `%s' is not a directory.\n"
-			    "Please move it in order to allow installation\n"
-			    "of the Evolution user files."));
-		return FALSE;
-	}
-
-	/* Make sure this is really our directory, not an Evolution
-	 * build tree or something like that.
-	 */
-	file = g_strdup_printf ("%s/shortcuts.xml", evolution_directory);
-	if (stat (file, &statinfo) != 0) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("The directory `%s' exists but is not the\n"
-			    "Evolution directory.  Please move it in order\n"
-			    "to allow installation of the Evolution user "
-			    "files."), evolution_directory);
-		g_free (file);
-		return FALSE;
-	}
-	g_free (file);
-
-	/* If the user has an old-style config file, replace it with
-	 * the new-style config directory. FIXME: This should be
-	 * temporary.
-	 */
-	file = g_strdup_printf ("%s/config", evolution_directory);
-	if (stat (file, &statinfo) == 0 && ! S_ISDIR (statinfo.st_mode)) {
-		char *old = g_strdup_printf ("%s.old", file);
-		rename (file, old);
-		mkdir (file, 0700);
-		g_free (old);
-	}
-	g_free (file);
-
-	/* User has evolution directory...
-	   Check if it is up to date. */
-	return check_evolution_directory (evolution_directory);
-}
diff --git a/shell/e-setup.h b/shell/e-setup.h
deleted file mode 100644
index a69d216b94..0000000000
--- a/shell/e-setup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-setup.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SETUP_H
-#define _E_SETUP_H
-
-#include <glib.h>
-
-gboolean  e_setup  (const char *evolution_directory);
-
-#endif /* _E_SETUP_H */
diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h
deleted file mode 100644
index 70986144d0..0000000000
--- a/shell/e-shell-constants.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-utils.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_SHELL_CONSTANTS_H
-#define E_SHELL_CONSTANTS_H
-
-#define E_SHELL_URI_PREFIX		"evolution:"
-#define E_SHELL_URI_PREFIX_LEN		10
-
-#define E_SHELL_MINI_ICON_SUFFIX	"-mini"
-#define E_SHELL_MINI_ICON_SUFFIX_LEN	5
-
-#define E_SHELL_ICON_SIZE		48
-#define E_SHELL_MINI_ICON_SIZE		16
-
-#endif
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
deleted file mode 100644
index b9da2cf8c8..0000000000
--- a/shell/e-shell-folder-creation-dialog.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <glade/glade-xml.h>
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-storage-set.h"
-#include "e-storage-set-view.h"
-
-#include "e-shell-folder-creation-dialog.h"
-
-
-#define GLADE_FILE_NAME  EVOLUTION_GLADEDIR "/e-shell-folder-creation-dialog.glade"
-
-
-/* Data for the callbacks.  */
-struct _DialogData {
-	GtkWidget *dialog;
-	EShell *shell;
-
-	GtkWidget *folder_name_entry;
-	GtkWidget *storage_set_view;
-	GtkWidget *folder_type_option_menu;
-
-	GList *folder_types;
-
-	char *folder_path;
-
-	EShellFolderCreationDialogCallback result_callback;
-	void *result_callback_data;
-};
-typedef struct _DialogData DialogData;
-
-static void
-dialog_data_destroy (DialogData *dialog_data)
-{
-	e_free_string_list (dialog_data->folder_types);
-	g_free (dialog_data->folder_path);
-
-	g_free (dialog_data);
-}
-
-
-/* Callback for the asynchronous folder creation function.  */
-
-static void
-async_create_cb (EStorage *storage,
-		 EStorageResult result,
-		 void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-
-	if (result == E_STORAGE_OK) {
-		if (dialog_data->result_callback != NULL)
-			(* dialog_data->result_callback) (dialog_data->shell,
-							  E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS,
-							  dialog_data->folder_path,
-							  dialog_data->result_callback_data);
-		gtk_widget_destroy (dialog_data->dialog);
-		return;
-	}
-
-	e_notice (GTK_WINDOW (dialog_data->dialog), GNOME_MESSAGE_BOX_ERROR,
-		  _("Cannot create the specified folder:\n%s"),
-		  e_storage_result_to_string (result));
-}
-
-
-/* Sanity check for the user-specified folder name.  */
-/* FIXME in the future we would like not to have the `G_DIR_SEPARATOR' limitation.  */
-static gboolean
-entry_name_is_valid (GtkEntry *entry)
-{
-	const char *name;
-
-	name = gtk_entry_get_text (entry);
-
-	if (name == NULL || *name == '\0')
-		return FALSE;
-
-	if (strchr (name, G_DIR_SEPARATOR) != NULL)
-		return FALSE;
-
-	if (strcmp (name, ".") == 0 || strcmp (name, "..") == 0)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* Dialog signal callbacks.  */
-
-static void
-dialog_clicked_cb (GnomeDialog *dialog,
-		   int button_number,
-		   void *data)
-{
-	DialogData *dialog_data;
-	EStorageSet *storage_set;
-	GtkWidget *folder_type_menu_item;
-	const char *folder_type;
-	const char *parent_path;
-	char *folder_name;
-	char *path;
-
-	dialog_data = (DialogData *) data;
-
-	if (button_number != 0) {
-		if (dialog_data->result_callback != NULL)
-			(* dialog_data->result_callback) (dialog_data->shell,
-							  E_SHELL_FOLDER_CREATION_DIALOG_RESULT_CANCEL,
-							  NULL,
-							  dialog_data->result_callback_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		return;
-	}
-
-	if (! entry_name_is_valid (GTK_ENTRY (dialog_data->folder_name_entry))) {
-		/* FIXME: Explain better.  */
-		e_notice (GTK_WINDOW (dialog), GNOME_MESSAGE_BOX_ERROR,
-			  _("The specified folder name is not valid."));
-		return;
-	}
-
-	parent_path = e_storage_set_view_get_current_folder
-		(E_STORAGE_SET_VIEW (dialog_data->storage_set_view));
-	if (parent_path == NULL) {
-		if (dialog_data->result_callback != NULL)
-			(* dialog_data->result_callback) (dialog_data->shell,
-							  E_SHELL_FOLDER_CREATION_DIALOG_RESULT_CANCEL,
-							  NULL,
-							  dialog_data->result_callback_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		return;
-	}
-
-	folder_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog_data->folder_name_entry));
-	path = g_concat_dir_and_file (parent_path, folder_name);
-	g_free (folder_name);
-
-	storage_set = e_shell_get_storage_set (dialog_data->shell);
-
-	folder_type_menu_item = GTK_OPTION_MENU (dialog_data->folder_type_option_menu)->menu_item;
-	folder_type = gtk_object_get_data (GTK_OBJECT (folder_type_menu_item), "folder_type");
-
-	if (folder_type == NULL) {
-		g_warning ("Cannot get folder type for selected GtkOptionMenu item.");
-		return;
-	}
-
-	g_free (dialog_data->folder_path);
-	dialog_data->folder_path = g_strdup (path);
-
-	e_storage_set_async_create_folder (storage_set,
-					   path,
-					   folder_type,
-					   "", /* description */
-					   async_create_cb, dialog_data);
-}
-
-static void
-dialog_destroy_cb (GtkObject *object,
-		   void *data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-	dialog_data_destroy (dialog_data);
-}
-
-static void
-folder_name_entry_changed_cb (GtkEditable *editable,
-			      void *data)
-{
-	GnomeDialog *dialog;
-	GtkEntry *entry;
-
-	entry  = GTK_ENTRY (editable);
-	dialog = GNOME_DIALOG (data);
-
-	if (entry->text_length > 0)
-		gnome_dialog_set_sensitive (dialog, 0, TRUE);
-	else
-		gnome_dialog_set_sensitive (dialog, 0, FALSE);
-}
-
-
-/* Shell signal callbacks.  */
-
-static void
-shell_destroy_cb (GtkObject *object,
-		  void *data)
-{
-	GnomeDialog *dialog;
-
-	dialog = GNOME_DIALOG (data);
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-
-/* Dialog setup.  */
-
-static void
-setup_dialog (GtkWidget *dialog,
-	      GladeXML *gui,
-	      EShell *shell,
-	      GtkWindow *parent_window)
-{
-	if (parent_window != NULL)
-		gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution - Create new folder"));
-
-	gnome_dialog_set_default   (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog), 0, FALSE);
-
-	gtk_widget_show (dialog);
-}
-
-static void
-setup_folder_name_entry (GtkWidget *dialog,
-			 GladeXML *gui,
-			 EShell *shell)
-{
-	GtkWidget *folder_name_entry;
-
-	folder_name_entry = glade_xml_get_widget (gui, "folder_name_entry");
-
-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE (folder_name_entry));
-
-	gtk_signal_connect (GTK_OBJECT (folder_name_entry), "changed",
-			    GTK_SIGNAL_FUNC (folder_name_entry_changed_cb), dialog);
-}
-
-static GtkWidget *
-add_storage_set_view (GtkWidget *dialog,
-		      GladeXML *gui,
-		      EShell *shell,
-		      const char *default_parent_folder)
-{
-	EStorageSet *storage_set;
-	GtkWidget *storage_set_view;
-	GtkWidget *scroll_frame;
-	GtkWidget *vbox;
-
-	storage_set = e_shell_get_storage_set (shell);
-	storage_set_view = e_storage_set_new_view (storage_set);
-
-	GTK_WIDGET_SET_FLAGS (storage_set_view, GTK_CAN_FOCUS);
-
-	if (default_parent_folder != NULL)
-		e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (storage_set_view),
-						       default_parent_folder);
-
-	vbox = glade_xml_get_widget (gui, "main_vbox");
-
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
-
-	gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
-
-	gtk_widget_show (scroll_frame);
-	gtk_widget_show (storage_set_view);
-
-	return storage_set_view;
-}
-
-static GList *
-add_folder_types (GtkWidget *dialog,
-		  GladeXML *gui,
-		  EShell *shell)
-{
-	EFolderTypeRegistry *folder_type_registry;
-	GtkWidget *folder_type_option_menu;
-	GtkWidget *menu;
-	GList *folder_types;
-	GList *p;
-	int default_item;
-	int i;
-
-	folder_type_option_menu = glade_xml_get_widget (gui, "folder_type_option_menu");
-
-	/* KLUDGE.  So, GtkOptionMenu is badly broken.  It calculates its size
-           in `gtk_option_menu_set_menu()' instead of using `size_request()' as
-           any sane widget would do.  So, in order to avoid the "narrow
-           GtkOptionMenu" bug, we have to destroy the existing associated menu
-           and create a new one.  Life sucks.  */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (folder_type_option_menu));
-	g_assert (menu != NULL);
-	gtk_widget_destroy (menu);
-
-	menu = gtk_menu_new ();
-
-	folder_type_registry = e_shell_get_folder_type_registry (shell);
-	g_assert (folder_type_registry != NULL);
-
-	folder_types = e_folder_type_registry_get_type_names (folder_type_registry);
-	if (folder_types == NULL)
-		return NULL;		/* Uh? */
-
-	folder_types = g_list_sort (folder_types, (GCompareFunc) g_strcasecmp);
-
-	/* FIXME: Use descriptive name (not in the registry's implementation yet).  */
-	/* FIXME: Add icon (I don't feel like writing an alpha-capable thingie again).  */
-
-	default_item = 0;
-	for (p = folder_types, i = 0; p != NULL; p = p->next, i++) {
-		const char *type_name;
-		GtkWidget *menu_item;
-
-		type_name = (const char *) p->data;
-
-		menu_item = gtk_menu_item_new_with_label (type_name);
-		gtk_widget_show (menu_item);
-		gtk_menu_append (GTK_MENU (menu), menu_item);
-
-		gtk_object_set_data (GTK_OBJECT (menu_item), "folder_type", (void *) type_name);
-
-		if (strcmp (type_name, "mail") == 0)
-			default_item = i;
-	}
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (folder_type_option_menu), menu);
-	gtk_widget_show (menu);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU (folder_type_option_menu), default_item);
-	gtk_widget_queue_resize (folder_type_option_menu);
-
-	return folder_types;
-}
-
-
-/* FIXME: Currently this is modal.  I think it's OK, but if people think it is
-   not, we should change it to non-modal and make sure only one of these is
-   open at once.  Currently it relies on modality for this.  */
-void
-e_shell_show_folder_creation_dialog (EShell *shell,
-				     GtkWindow *parent_window,
-				     const char *default_parent_folder,
-				     EShellFolderCreationDialogCallback result_callback,
-				     void *result_callback_data)
-{
-	GladeXML *gui;
-	GtkWidget *dialog;
-	GtkWidget *storage_set_view;
-	GList *folder_types;
-	DialogData *dialog_data;
-
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	gui = glade_xml_new (GLADE_FILE_NAME, NULL);
-	if (gui == NULL) {
-		g_warning ("Cannot load Glade description file for the folder creation dialog -- %s",
-			   GLADE_FILE_NAME);
-		return;
-	}
-
-	dialog = glade_xml_get_widget (gui, "create_folder_dialog");
-
-	setup_dialog (dialog, gui, shell, parent_window);
-	setup_folder_name_entry (dialog, gui, shell);
-
-	storage_set_view = add_storage_set_view (dialog, gui, shell, default_parent_folder);
-	folder_types = add_folder_types (dialog, gui, shell);
-
-	dialog_data = g_new (DialogData, 1);
-	dialog_data->dialog                  = dialog;
-	dialog_data->shell                   = shell;
-	dialog_data->folder_name_entry       = glade_xml_get_widget (gui, "folder_name_entry");
-	dialog_data->storage_set_view        = storage_set_view;
-	dialog_data->folder_type_option_menu = glade_xml_get_widget (gui, "folder_type_option_menu");
-	dialog_data->folder_types            = folder_types;
-	dialog_data->folder_path             = NULL;
-	dialog_data->result_callback         = result_callback;
-	dialog_data->result_callback_data    = result_callback_data;
-
-	gtk_signal_connect (GTK_OBJECT (dialog), "clicked",
-			    GTK_SIGNAL_FUNC (dialog_clicked_cb), dialog_data);
-	gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), dialog_data);
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (shell), "destroy",
-					GTK_SIGNAL_FUNC (shell_destroy_cb), dialog_data,
-					GTK_OBJECT (dialog));
-
-	gtk_object_unref (GTK_OBJECT (gui));
-}
diff --git a/shell/e-shell-folder-creation-dialog.h b/shell/e-shell-folder-creation-dialog.h
deleted file mode 100644
index 63b6b1179a..0000000000
--- a/shell/e-shell-folder-creation-dialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_SHELL_FOLDER_CREATION_DIALOG_H
-#define E_SHELL_FOLDER_CREATION_DIALOG_H
-
-#include <gtk/gtkwindow.h>
-
-#include "e-shell.h"
-
-enum _EShellFolderCreationDialogResult {
-	E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS,
-	E_SHELL_FOLDER_CREATION_DIALOG_RESULT_FAIL,
-	E_SHELL_FOLDER_CREATION_DIALOG_RESULT_CANCEL
-};
-typedef enum _EShellFolderCreationDialogResult EShellFolderCreationDialogResult;
-
-typedef void (* EShellFolderCreationDialogCallback) (EShell *shell,
-						     EShellFolderCreationDialogResult result,
-						     const char *path,
-						     void *data);
-
-void  e_shell_show_folder_creation_dialog  (EShell                             *shell,
-					    GtkWindow                          *parent,
-					    const char                         *default_parent_folder,
-					    EShellFolderCreationDialogCallback  result_callback,
-					    void                               *result_callback_data);
-
-#endif /* E_SHELL_FOLDER_CREATION_DIALOG_H */
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
deleted file mode 100644
index c76e956131..0000000000
--- a/shell/e-shell-folder-selection-dialog.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-folder-selection-dialog.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "e-shell-constants.h"
-#include "e-storage-set-view.h"
-#include "e-storage-set.h"
-
-#include "e-shell-folder-creation-dialog.h"
-
-#include "e-shell-folder-selection-dialog.h"
-
-
-#define PARENT_TYPE (gnome_dialog_get_type ())
-static GnomeDialogClass *parent_class = NULL;
-
-struct _EShellFolderSelectionDialogPrivate {
-	EShell *shell;
-	GList *allowed_types;
-	EStorageSet *storage_set;
-	GtkWidget *storage_set_view;
-};
-
-enum {
-	FOLDER_SELECTED,
-	CANCELLED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static gboolean
-check_folder_type (EShellFolderSelectionDialog *folder_selection_dialog)
-{
-	EShellFolderSelectionDialogPrivate *priv;
-	const char *selected_path;
-	EFolder *folder;
-	const char *folder_type;
-	GList *p;
-
-	priv = folder_selection_dialog->priv;
-	if (priv->allowed_types == NULL)
-		return TRUE;
-
-	selected_path = e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog);
-	if (selected_path == NULL)
-		return FALSE;
-
-	folder = e_storage_set_get_folder (priv->storage_set, selected_path);
-	if (folder == NULL)
-		return FALSE;
-
-	folder_type = e_folder_get_type_string (folder);
-
-	for (p = priv->allowed_types; p != NULL; p = p->next) {
-		const char *type;
-
-		type = (const char *) p->data;
-		if (strcasecmp (folder_type, type) == 0)
-			return TRUE;
-	}
-
-	e_notice (GTK_WINDOW (folder_selection_dialog), GNOME_MESSAGE_BOX_ERROR,
-		  _("The type of the selected folder is not valid for\n"
-		    "the requested operation."));
-
-	return FALSE;
-}
-
-
-/* Folder creation dialog callback.  */
-
-static void
-folder_creation_dialog_result_cb (EShell *shell,
-				  EShellFolderCreationDialogResult result,
-				  const char *path,
-				  void *data)
-{
-	EShellFolderSelectionDialog *dialog;
-	EShellFolderSelectionDialogPrivate *priv;
-
-	dialog = E_SHELL_FOLDER_SELECTION_DIALOG (data);
-	priv = dialog->priv;
-
-	e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view), path);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EShellFolderSelectionDialog *folder_selection_dialog;
-	EShellFolderSelectionDialogPrivate *priv;
-
-	folder_selection_dialog = E_SHELL_FOLDER_SELECTION_DIALOG (object);
-	priv = folder_selection_dialog->priv;
-
-	if (priv->storage_set != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->storage_set));
-
-	e_free_string_list (priv->allowed_types);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* ETable callback */
-static void
-dbl_click_cb (EStorageSetView *essv,
-	      int row,
-	      int col,
-	      GdkEvent *event,
-	      EShellFolderSelectionDialog *folder_selection_dialog)
-{
-	EShellFolderSelectionDialogPrivate *priv;
-
-	g_return_if_fail (folder_selection_dialog != NULL);
-
-	priv = folder_selection_dialog->priv;
-	if (check_folder_type (folder_selection_dialog)) {
-		gtk_signal_emit (GTK_OBJECT (folder_selection_dialog),
-				 signals[FOLDER_SELECTED],
-				 e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog));
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog));
-}
-
-
-/* GnomeDialog methods.  */
-
-static void
-impl_clicked (GnomeDialog *dialog,
-	      int button_number)
-{
-	EShellFolderSelectionDialog *folder_selection_dialog;
-	EShellFolderSelectionDialogPrivate *priv;
-	EStorageSetView *storage_set_view;
-	const char *default_parent_folder;
-
-	folder_selection_dialog = E_SHELL_FOLDER_SELECTION_DIALOG (dialog);
-	priv = folder_selection_dialog->priv;
-
-	switch (button_number) {
-	case 0:			/* OK */
-		if (check_folder_type (folder_selection_dialog)) {
-			gtk_signal_emit (GTK_OBJECT (folder_selection_dialog), signals[FOLDER_SELECTED],
-					 e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog));
-			gtk_widget_destroy (GTK_WIDGET (dialog));
-		}
-		break;
-	case 1:			/* Cancel */
-		gtk_signal_emit (GTK_OBJECT (folder_selection_dialog), signals[CANCELLED]);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
-	case 2:			/* Add */
-		storage_set_view = E_STORAGE_SET_VIEW (priv->storage_set_view);
-		default_parent_folder = e_storage_set_view_get_current_folder (storage_set_view);
-
-		e_shell_show_folder_creation_dialog (priv->shell, GTK_WINDOW (dialog),
-						     default_parent_folder,
-						     folder_creation_dialog_result_cb,
-						     dialog);
-
-		break;
-	}
-}
-
-
-/* GTK+ type initialization.  */
-
-static void
-class_init (EShellFolderSelectionDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	object_class = GTK_OBJECT_CLASS (klass);
-	dialog_class = GNOME_DIALOG_CLASS (klass);
-
-	object_class->destroy = impl_destroy;
-
-	dialog_class->clicked = impl_clicked;
-
-	signals[FOLDER_SELECTED]
-		= gtk_signal_new ("folder_selected",
-				  GTK_RUN_LAST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, folder_selected),
-				  gtk_marshal_NONE__POINTER,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	signals[CANCELLED]
-		= gtk_signal_new ("cancelled",
-				  GTK_RUN_LAST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, cancelled),
-				  gtk_marshal_NONE__NONE,
-				  GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EShellFolderSelectionDialog *shell_folder_selection_dialog)
-{
-	EShellFolderSelectionDialogPrivate *priv;
-
-	priv = g_new (EShellFolderSelectionDialogPrivate, 1);
-	priv->shell            = NULL;
-	priv->storage_set      = NULL;
-	priv->storage_set_view = NULL;
-	priv->allowed_types    = NULL;
-
-	shell_folder_selection_dialog->priv = priv;
-}
-
-
-static void
-set_default_folder (EShellFolderSelectionDialog *shell_folder_selection_dialog,
-		    const char *default_uri)
-{
-	EShellFolderSelectionDialogPrivate *priv;
-	char *default_path;
-
-	g_assert (default_uri != NULL);
-
-	priv = shell_folder_selection_dialog->priv;
-
-	if (strncmp (default_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) {
-		/* `evolution:' URI.  */
-		default_path = g_strdup (default_uri + E_SHELL_URI_PREFIX_LEN);
-	} else {
-		/* Physical URI.  */
-		default_path = e_storage_set_get_path_for_physical_uri (priv->storage_set,
-									default_uri);
-	}
-
-	e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view),
-					       default_path);
-
-	g_free (default_path);
-}
-
-
-/**
- * e_shell_folder_selection_dialog_construct:
- * @folder_selection_dialog: A folder selection dialog widget
- * @shell: The this folder selection dialog is for
- * @title: Title of the window
- * @default_uri: The URI of the folder to be selected by default
- * @allowed_types: List of the names of the allowed types
- * 
- * Construct @folder_selection_dialog.
- **/
-void
-e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_selection_dialog,
-					   EShell *shell,
-					   const char *title,
-					   const char *default_uri,
-					   const char *allowed_types[])
-{
-	EShellFolderSelectionDialogPrivate *priv;
-	GtkWidget *scroll_frame;
-	int i;
-
-	g_return_if_fail (folder_selection_dialog != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_SELECTION_DIALOG (folder_selection_dialog));
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	priv = folder_selection_dialog->priv;
-
-	gtk_window_set_modal (GTK_WINDOW (folder_selection_dialog), TRUE);
-	gtk_window_set_title (GTK_WINDOW (folder_selection_dialog), title);
-
-	gnome_dialog_append_buttons (GNOME_DIALOG (folder_selection_dialog),
-				     GNOME_STOCK_BUTTON_OK,
-				     GNOME_STOCK_BUTTON_CANCEL,
-				     _("New..."),
-				     NULL);
-	gnome_dialog_set_default (GNOME_DIALOG (folder_selection_dialog), 0);
-
-	gtk_window_set_policy (GTK_WINDOW (folder_selection_dialog), TRUE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (folder_selection_dialog), 350, 300);
-
-	priv->shell = shell;
-	gtk_signal_connect_object_while_alive (GTK_OBJECT (shell), "destroy",
-					       GTK_SIGNAL_FUNC (gtk_widget_destroy),
-					       GTK_OBJECT (folder_selection_dialog));
-
-	priv->storage_set = e_shell_get_storage_set (shell);
-	gtk_object_ref (GTK_OBJECT (priv->storage_set));
-
-	priv->storage_set_view = e_storage_set_new_view (priv->storage_set);
-	GTK_WIDGET_SET_FLAGS (priv->storage_set_view, GTK_CAN_FOCUS);
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_view),
-			    "double_click", GTK_SIGNAL_FUNC (dbl_click_cb),
-			    folder_selection_dialog);
-
-	g_assert (priv->allowed_types == NULL);
-	if (allowed_types != NULL) {
-		for (i = 0; allowed_types[i] != NULL; i++)
-			priv->allowed_types = g_list_prepend (priv->allowed_types,
-							      g_strdup (allowed_types[i]));
-	}
-
-	if (default_uri != NULL)
-		set_default_folder (folder_selection_dialog, default_uri);
-
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (scroll_frame), priv->storage_set_view);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (folder_selection_dialog)->vbox),
-			    scroll_frame, TRUE, TRUE, 2);
-
-	gtk_widget_show (priv->storage_set_view);
-	gtk_widget_show (scroll_frame);
-}
-
-/**
- * e_shell_folder_selection_dialog_new:
- * @shell: The this folder selection dialog is for
- * @title: Title of the window
- * @default_uri: The URI of the folder to be selected by default
- * @allowed_types: List of the names of the allowed types
- * 
- * Create a new folder selection dialog widget.  @default_uri can be either an
- * `evolution:' URI or a physical URI (all the non-`evolution:' URIs are
- * considered to be physical URIs).
- * 
- * Return value: 
- **/
-GtkWidget *
-e_shell_folder_selection_dialog_new (EShell *shell,
-				     const char *title,
-				     const char *default_uri,
-				     const char *allowed_types[])
-{
-	EShellFolderSelectionDialog *folder_selection_dialog;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	folder_selection_dialog = gtk_type_new (e_shell_folder_selection_dialog_get_type ());
-	e_shell_folder_selection_dialog_construct (folder_selection_dialog, shell,
-						   title, default_uri, allowed_types);
-
-	return GTK_WIDGET (folder_selection_dialog);
-}
-
-
-const char *
-e_shell_folder_selection_dialog_get_selected_path (EShellFolderSelectionDialog *folder_selection_dialog)
-{
-	EShellFolderSelectionDialogPrivate *priv;
-
-	g_return_val_if_fail (folder_selection_dialog != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL_FOLDER_SELECTION_DIALOG (folder_selection_dialog), NULL);
-
-	priv = folder_selection_dialog->priv;
-
-	return e_storage_set_view_get_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view));
-}
-
-
-E_MAKE_TYPE (e_shell_folder_selection_dialog, "EShellFolderSelectionDialog", EShellFolderSelectionDialog,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/e-shell-folder-selection-dialog.h b/shell/e-shell-folder-selection-dialog.h
deleted file mode 100644
index 2ddb98bafe..0000000000
--- a/shell/e-shell-folder-selection-dialog.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-folder-selection-dialog.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_SHELL_FOLDER_SELECTION_DIALOG_H
-#define E_SHELL_FOLDER_SELECTION_DIALOG_H
-
-#include <libgnomeui/gnome-dialog.h>
-
-#include "e-shell.h"
-
-#ifdef cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
-
-#define E_TYPE_SHELL_FOLDER_SELECTION_DIALOG			(e_shell_folder_selection_dialog_get_type ())
-#define E_SHELL_FOLDER_SELECTION_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_FOLDER_SELECTION_DIALOG, EShellFolderSelectionDialog))
-#define E_SHELL_FOLDER_SELECTION_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_SELECTION_DIALOG, EShellFolderSelectionDialogClass))
-#define E_IS_SHELL_FOLDER_SELECTION_DIALOG(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_FOLDER_SELECTION_DIALOG))
-#define E_IS_SHELL_FOLDER_SELECTION_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_SELECTION_DIALOG))
-
-
-typedef struct _EShellFolderSelectionDialog        EShellFolderSelectionDialog;
-typedef struct _EShellFolderSelectionDialogPrivate EShellFolderSelectionDialogPrivate;
-typedef struct _EShellFolderSelectionDialogClass   EShellFolderSelectionDialogClass;
-
-struct _EShellFolderSelectionDialog {
-	GnomeDialog parent;
-
-	EShellFolderSelectionDialogPrivate *priv;
-};
-
-struct _EShellFolderSelectionDialogClass {
-	GnomeDialogClass parent_class;
-
-	void (* folder_selected) (EShellFolderSelectionDialog *folder_selection_dialog,
-				  const char *path);
-	void (* cancelled)       (EShellFolderSelectionDialog *folder_selection_dialog);
-};
-
-
-GtkType     e_shell_folder_selection_dialog_get_type           (void);
-void        e_shell_folder_selection_dialog_construct          (EShellFolderSelectionDialog *folder_selection_dialog,
-								EShell                      *shell,
-								const char                  *title,
-								const char                  *default_path,
-								const char                  *allowed_types[]);
-GtkWidget  *e_shell_folder_selection_dialog_new                (EShell                      *shell,
-								const char                  *title,
-								const char                  *default_path,
-								const char                  *allowed_types[]);
-
-const char *e_shell_folder_selection_dialog_get_selected_path  (EShellFolderSelectionDialog *folder_selection_dialog);
-
-#ifdef cplusplus
-}
-#endif /* cplusplus */
-
-#endif /* E_SHELL_FOLDER_SELECTION_DIALOG_H */
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
deleted file mode 100644
index 44f5ae7988..0000000000
--- a/shell/e-shell-folder-title-bar.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-folder-title-bar.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "widgets/misc/e-clipped-label.h"
-#include <gal/util/e-util.h>
-
-#include "e-shell-constants.h"
-#include "e-shell-folder-title-bar.h"
-
-
-#define PARENT_TYPE GTK_TYPE_EVENT_BOX
-static GtkEventBox *parent_class = NULL;
-
-struct _EShellFolderTitleBarPrivate {
-	GdkPixbuf *icon;
-	GtkWidget *icon_widget;
-
-	/* The hbox containing the button, the label and the icon on the right.  */
-	GtkWidget *hbox;
-
-	/* We have a label and a button.  When the button is enabled, the label is hidden;
-           when the button is disable, only the label is visible.  */
-
-	/* The label.  */
-	GtkWidget *label;
-
-	/* The button.  */
-	GtkWidget *button;
-	GtkWidget *button_label;
-	GtkWidget *button_arrow;
-
-	gboolean clickable;
-};
-
-enum {
-	TITLE_TOGGLED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static char *arrow_xpm[] = {
-	"11 5  2 1",
-	" 	c none",
-	".	c #ffffffffffff",
-	" ......... ",
-	"  .......  ",
-	"   .....   ",
-	"    ...    ",
-	"     .     ",
-};
-
-
-/* Icon handling.  */
-
-static unsigned int
-rgb_from_gdk_color (GdkColor *color)
-{
-	return (((color->red >> 8) << 16)
-		| ((color->green >> 8) << 8)
-		| ((color->blue >> 8)));
-}
-
-static GdkPixmap *
-make_icon_pixmap (EShellFolderTitleBar *folder_title_bar,
-		  const GdkPixbuf *pixbuf)
-{
-	GdkPixmap *pixmap;
-	GtkWidget *widget;
-	unsigned int depth;
-	unsigned int rgb;
-
-	widget = GTK_WIDGET (folder_title_bar);
-
-	rgb = rgb_from_gdk_color (&widget->style->bg[GTK_STATE_NORMAL]);
-
-	depth = gtk_widget_get_visual (widget)->depth;
-
-	pixmap = gdk_pixmap_new (GTK_WIDGET (folder_title_bar)->window,
-				 E_SHELL_MINI_ICON_SIZE, E_SHELL_MINI_ICON_SIZE,
-				 depth);
-
-	if (pixbuf == NULL) {
-		gdk_draw_rectangle (pixmap, widget->style->bg_gc[GTK_STATE_NORMAL], TRUE,
-				    0, 0, E_SHELL_MINI_ICON_SIZE, E_SHELL_MINI_ICON_SIZE);
-	} else {
-		GdkPixbuf *composited_pixbuf;
-
-		composited_pixbuf = gdk_pixbuf_composite_color_simple
-			(pixbuf, gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
-			 GDK_INTERP_NEAREST, 255, 32, rgb, rgb);
-
-		gdk_pixbuf_render_to_drawable (composited_pixbuf,
-					       pixmap, widget->style->fg_gc[GTK_STATE_NORMAL],
-					       0, 0, 0, 0,
-					       E_SHELL_MINI_ICON_SIZE, E_SHELL_MINI_ICON_SIZE,
-					       GDK_RGB_DITHER_MAX, 0, 0);
-
-		gdk_pixbuf_unref (composited_pixbuf);
-	}
-
-	return pixmap;
-}
-
-
-/* Icon pixmap.  */
-
-static GtkWidget *
-create_icon_pixmap (GtkWidget *parent)
-{
-	GtkWidget *gtk_pixmap;
-	GdkPixmap *gdk_pixmap;
-	GdkBitmap *gdk_mask;
-
-	gdk_pixmap = gdk_pixmap_create_from_xpm_d (parent->window, &gdk_mask, NULL, arrow_xpm);
-	gtk_pixmap = gtk_pixmap_new (gdk_pixmap, gdk_mask);
-
-	gdk_pixmap_unref (gdk_pixmap);
-	gdk_bitmap_unref (gdk_mask);
-
-	return gtk_pixmap;
-}
-
-static void
-title_button_box_realize_cb (GtkWidget *widget,
-			     void *data)
-{
-	EShellFolderTitleBar *folder_title_bar;
-	EShellFolderTitleBarPrivate *priv;
-	GtkWidget *button_arrow;
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (data);
-	priv = folder_title_bar->priv;
-
-	if (priv->button_arrow != NULL)
-		return;
-
-	button_arrow = create_icon_pixmap (widget);
-
-	gtk_widget_show (button_arrow);
-	gtk_box_pack_start (GTK_BOX (widget), button_arrow, FALSE, TRUE, 2);
-
-	priv->button_arrow = button_arrow;
-}
-
-
-/* Style handling.  */
-
-static void
-endarken_style (GtkWidget *widget)
-{
-#ifndef E_USE_STYLES
-	GtkStyle *style;
-	GtkRcStyle *new_rc_style;
-	int i;
-
-	style = widget->style;
-
-	new_rc_style = gtk_rc_style_new ();
-
-	for (i = 0; i < 5; i++) {
-		new_rc_style->bg[i].red      = style->bg[i].red * .8;
-		new_rc_style->bg[i].green    = style->bg[i].green * .8;
-		new_rc_style->bg[i].blue     = style->bg[i].blue * .8;
-		new_rc_style->fg[i].red      = 0xffff;
-		new_rc_style->fg[i].green    = 0xffff;
-		new_rc_style->fg[i].blue     = 0xffff;
-
-		new_rc_style->color_flags[i] = GTK_RC_BG | GTK_RC_FG;
-	}
-
-	gtk_widget_modify_style (widget, new_rc_style);
-
-	gtk_rc_style_unref (new_rc_style);
-#endif
-}
-
-static void
-style_set_cb (GtkWidget *widget,
-	      GtkStyle *previous_style,
-	      void *data)
-{
-	EShellFolderTitleBar *folder_title_bar;
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (widget);
-	
-	/* 
-	   This will cause a style_set signal to be emitted again, 
-	   so we need to do this to prevent infinite recursion.  
-	*/
-	gtk_signal_handler_block_by_func (GTK_OBJECT (widget), GTK_SIGNAL_FUNC (style_set_cb), data);
-
-	endarken_style (widget);
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT (widget), GTK_SIGNAL_FUNC (style_set_cb), data);
-
-	if (folder_title_bar->priv->icon)
-		e_shell_folder_title_bar_set_icon (folder_title_bar, folder_title_bar->priv->icon);
-}
-
-
-/* Popup button callback.  */
-
-static void
-title_button_toggled_cb (GtkToggleButton *button,
-			 void *data)
-{
-	EShellFolderTitleBar *folder_title_bar;
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (data);
-	gtk_signal_emit (GTK_OBJECT (folder_title_bar),
-			 signals[TITLE_TOGGLED],
-			 gtk_toggle_button_get_active (button));
-}
-
-
-/* GTkWidget methods. */
-
-static void
-realize (GtkWidget *widget)
-{
-	EShellFolderTitleBar *folder_title_bar;
-	EShellFolderTitleBarPrivate *priv;
-	GdkPixmap *pixmap;
-
-	(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (widget);
-	priv = folder_title_bar->priv;
-
-	pixmap = make_icon_pixmap (folder_title_bar, priv->icon);
-	priv->icon_widget = gtk_pixmap_new (pixmap, NULL);
-	gdk_pixmap_unref (pixmap);
-	gtk_widget_show (priv->icon_widget);
-
-	gtk_misc_set_alignment (GTK_MISC (priv->icon_widget), 1.0, .5);
-	gtk_misc_set_padding (GTK_MISC (priv->icon_widget), 5, 0);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->icon_widget, TRUE, TRUE, 2);
-}
-
-static void
-unrealize (GtkWidget *widget)
-{
-	EShellFolderTitleBar *folder_title_bar;
-	EShellFolderTitleBarPrivate *priv;
-
-	(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (widget);
-	priv = folder_title_bar->priv;
-
-	gtk_widget_destroy (priv->icon_widget);
-	priv->icon_widget = NULL;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EShellFolderTitleBar *folder_title_bar;
-	EShellFolderTitleBarPrivate *priv;
-
-	folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (object);
-	priv = folder_title_bar->priv;
-
-	if (priv->icon)
-		gdk_pixbuf_unref (priv->icon);
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EShellFolderTitleBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	widget_class = GTK_WIDGET_CLASS (klass);
-	widget_class->realize   = realize;
-	widget_class->unrealize = unrealize;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	signals[TITLE_TOGGLED] = gtk_signal_new ("title_toggled",
-						 GTK_RUN_FIRST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, title_toggled),
-						 gtk_marshal_NONE__BOOL,
-						 GTK_TYPE_NONE, 1,
-						 GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EShellFolderTitleBar *shell_folder_title_bar)
-{
-	EShellFolderTitleBarPrivate *priv;
-
-	priv = g_new (EShellFolderTitleBarPrivate, 1);
-
-	priv->icon         = NULL;
-	priv->icon_widget  = NULL;
-	priv->hbox         = NULL;
-	priv->label        = NULL;
-	priv->button_label = NULL;
-	priv->button       = NULL;
-	priv->button_arrow = NULL;
-
-	priv->clickable    = TRUE;
-
-	shell_folder_title_bar->priv = priv;
-}
-
-
-/**
- * e_shell_folder_title_bar_construct:
- * @folder_title_bar: 
- * 
- * Construct the folder title bar widget.
- **/
-void
-e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar)
-{
-	EShellFolderTitleBarPrivate *priv;
-	GtkWidget *button_hbox;
-	GtkWidget *widget;
-
-	g_return_if_fail (folder_title_bar != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-
-	priv = folder_title_bar->priv;
-	widget = GTK_WIDGET (folder_title_bar);
-
-	priv->label = gtk_label_new ("");
-	gtk_misc_set_padding (GTK_MISC (priv->label), 5, 0);
-	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-
-	priv->button_label = gtk_label_new ("");
-	gtk_misc_set_padding (GTK_MISC (priv->button_label), 5, 0);
-	gtk_misc_set_alignment (GTK_MISC (priv->button_label), 0.0, 0.5);
-	gtk_widget_show (priv->button_label);
-
-	button_hbox = gtk_hbox_new (FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (button_hbox), "realize",
-			    GTK_SIGNAL_FUNC (title_button_box_realize_cb), folder_title_bar);
-	gtk_box_pack_start (GTK_BOX (button_hbox), priv->button_label, TRUE, TRUE, 0);
-	gtk_widget_show (button_hbox);
-
-	priv->button = gtk_toggle_button_new ();
-	gtk_button_set_relief (GTK_BUTTON (priv->button), GTK_RELIEF_NONE);
-	gtk_container_add (GTK_CONTAINER (priv->button), button_hbox);
-	GTK_WIDGET_UNSET_FLAGS (priv->button, GTK_CAN_FOCUS);
-	gtk_widget_show (priv->button);
-
-	priv->hbox = gtk_hbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (priv->hbox), 2);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->label, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->button, FALSE, TRUE, 0);
-
-	gtk_widget_show (priv->hbox);
-
-	gtk_signal_connect (GTK_OBJECT (priv->button), "toggled",
-			    GTK_SIGNAL_FUNC (title_button_toggled_cb), folder_title_bar);
-
-	gtk_container_add (GTK_CONTAINER (folder_title_bar), priv->hbox);
-
-	gtk_signal_connect (GTK_OBJECT (folder_title_bar), "style_set",
-			    GTK_SIGNAL_FUNC (style_set_cb), NULL);
-
-	e_shell_folder_title_bar_set_title (folder_title_bar, NULL);
-}
-
-/**
- * e_shell_folder_title_bar_new:
- * @void: 
- * 
- * Create a new title bar widget.
- * 
- * Return value: 
- **/
-GtkWidget *
-e_shell_folder_title_bar_new (void)
-{
-	EShellFolderTitleBar *new;
-
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	new = gtk_type_new (e_shell_folder_title_bar_get_type ());
-
-	e_shell_folder_title_bar_construct (new);
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	return GTK_WIDGET (new);
-}
-
-/**
- * e_shell_folder_title_bar_set_title:
- * @folder_title_bar: 
- * @title: 
- * 
- * Set the title for the title bar.
- **/
-void
-e_shell_folder_title_bar_set_title (EShellFolderTitleBar *folder_title_bar,
-				    const char *title)
-{
-	EShellFolderTitleBarPrivate *priv;
-
-	g_return_if_fail (folder_title_bar != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-
-	priv = folder_title_bar->priv;
-
-	if (title == NULL) {
-		gtk_label_set_text (GTK_LABEL (priv->button_label), _("(Untitled)"));
-		gtk_label_set_text (GTK_LABEL (priv->label), _("(Untitled)"));
-	} else {
-		gtk_label_set_text (GTK_LABEL (priv->button_label), title);
-		gtk_label_set_text (GTK_LABEL (priv->label), title);
-	}
-
-	/* FIXME: There seems to be a bug in EClippedLabel, this is just a workaround.  */
-	gtk_widget_queue_draw (GTK_WIDGET (folder_title_bar));
-}
-
-/**
- * e_shell_folder_title_bar_set_icon:
- * @folder_title_bar: 
- * @icon: 
- * 
- * Set the name of the icon for the title bar.
- **/
-void
-e_shell_folder_title_bar_set_icon (EShellFolderTitleBar *folder_title_bar,
-				   const GdkPixbuf *icon)
-{
-	EShellFolderTitleBarPrivate *priv;
-	GdkPixmap *pixmap;
-
-	g_return_if_fail (icon != NULL);
-
-	g_return_if_fail (folder_title_bar != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-
-	priv = folder_title_bar->priv;
-
-	gdk_pixbuf_ref ((GdkPixbuf *) icon);
-	if (priv->icon)
-		gdk_pixbuf_unref (priv->icon);
-	priv->icon = (GdkPixbuf *) icon;
-
-	pixmap = make_icon_pixmap (folder_title_bar, icon);
-
-	gtk_pixmap_set (GTK_PIXMAP (priv->icon_widget), pixmap, NULL);
-}
-
-
-/**
- * e_shell_folder_title_bar_set_toggle_state:
- * @folder_title_bar: 
- * @state: 
- * 
- * Set whether the title bar's button is in pressed state (TRUE) or not (FALSE).
- **/
-void
-e_shell_folder_title_bar_set_toggle_state (EShellFolderTitleBar *folder_title_bar,
-					   gboolean state)
-{
-	EShellFolderTitleBarPrivate *priv;
-
-	g_return_if_fail (folder_title_bar != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-
-	priv = folder_title_bar->priv;
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button), state);
-}
-
-/**
- * e_shell_folder_title_bar_set_clickable:
- * @folder_title_bar: 
- * @clickable: 
- * 
- * Specify whether @folder_title_bar is clickable.  If not, the arrow pixmap is not shown.
- **/
-void
-e_shell_folder_title_bar_set_clickable (EShellFolderTitleBar *folder_title_bar,
-					gboolean clickable)
-{
-	EShellFolderTitleBarPrivate *priv;
-
-	g_return_if_fail (folder_title_bar != NULL);
-	g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
-
-	priv = folder_title_bar->priv;
-
-	if ((priv->clickable && clickable) || (! priv->clickable && ! clickable))
-		return;
-
-	if (clickable) {
-		gtk_widget_show (priv->button);
-		gtk_widget_hide (priv->label);
-	} else {
-		gtk_widget_hide (priv->button);
-		gtk_widget_show (priv->label);
-	}
-
-	priv->clickable = !! clickable;
-}
-
-
-E_MAKE_TYPE (e_shell_folder_title_bar, "EShellFolderTitleBar", EShellFolderTitleBar, class_init, init, PARENT_TYPE)
diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
deleted file mode 100644
index f6eef54bbf..0000000000
--- a/shell/e-shell-folder-title-bar.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-folder-title-bar.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SHELL_FOLDER_TITLE_BAR_H__
-#define __E_SHELL_FOLDER_TITLE_BAR_H__
-
-#include <gtk/gtkeventbox.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SHELL_FOLDER_TITLE_BAR			(e_shell_folder_title_bar_get_type ())
-#define E_SHELL_FOLDER_TITLE_BAR(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBar))
-#define E_SHELL_FOLDER_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBarClass))
-#define E_IS_SHELL_FOLDER_TITLE_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
-#define E_IS_SHELL_FOLDER_TITLE_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
-
-
-typedef struct _EShellFolderTitleBar        EShellFolderTitleBar;
-typedef struct _EShellFolderTitleBarPrivate EShellFolderTitleBarPrivate;
-typedef struct _EShellFolderTitleBarClass   EShellFolderTitleBarClass;
-
-struct _EShellFolderTitleBar {
-	GtkEventBox parent;
-
-	EShellFolderTitleBarPrivate *priv;
-};
-
-struct _EShellFolderTitleBarClass {
-	GtkEventBoxClass parent_class;
-
-	/* Signals.  */
-	void  (* title_toggled)  (EShellFolderTitleBar *folder_title_bar, gboolean pressed);
-};
-
-
-GtkType    e_shell_folder_title_bar_get_type          (void);
-void       e_shell_folder_title_bar_construct         (EShellFolderTitleBar *folder_title_bar);
-GtkWidget *e_shell_folder_title_bar_new               (void);
-
-void       e_shell_folder_title_bar_set_title         (EShellFolderTitleBar *folder_title_bar,
-						       const char           *title);
-void       e_shell_folder_title_bar_set_icon          (EShellFolderTitleBar *folder_title_bar,
-						       const GdkPixbuf      *icon);
-void       e_shell_folder_title_bar_set_toggle_state  (EShellFolderTitleBar *folder_title_bar,
-						       gboolean              state);
-void       e_shell_folder_title_bar_set_clickable     (EShellFolderTitleBar *folder_title_bar,
-						       gboolean              clickable);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_SHELL_FOLDER_TITLE_BAR_H__ */
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
deleted file mode 100644
index 9065fc224c..0000000000
--- a/shell/e-shell-utils.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-utils.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "e-shell-constants.h"
-
-#include "e-shell-utils.h"
-
-
-static char *
-get_icon_path (const char *icon_name)
-{
-	char *icon_path;
-
-	if (g_path_is_absolute (icon_name)) {
-		icon_path = g_strdup (icon_name);
-	} else {
-		icon_path = gnome_pixmap_file (icon_name);
-
-		if (icon_path == NULL)
-			icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES,
-							   icon_name);
-	}
-
-	if (g_file_exists (icon_path)) {
-		return icon_path;
-	} else {
-		g_free (icon_path);
-		return NULL;
-	}
-}
-
-static char *
-get_mini_name (const char *icon_name)
-{
-	const char *dot_ptr;
-	const char *basename;
-	char *name_without_extension;
-	char *mini_name;
-
-	basename = g_basename (icon_name);
-	if (basename == NULL)
-		return NULL;
-
-	dot_ptr = strrchr (basename, '.');
-
-	if (dot_ptr == NULL) {
-		/* No extension.  */
-		return g_strconcat (icon_name, E_SHELL_MINI_ICON_SUFFIX, NULL);
-	}
-
-	name_without_extension = g_strndup (icon_name, dot_ptr - icon_name);
-	mini_name = g_strconcat (name_without_extension, E_SHELL_MINI_ICON_SUFFIX,
-				 dot_ptr, NULL);
-	g_free (name_without_extension);
-
-	return mini_name;
-}
-
-
-char *
-e_shell_get_icon_path (const char *icon_name,
-		       gboolean try_mini)
-{
-	if (try_mini) {
-		char *path;
-		char *mini_name;
-
-		mini_name = get_mini_name (icon_name);
-		if (mini_name == NULL) {
-			path = NULL;
-		} else {
-			path = get_icon_path (mini_name);
-			g_free (mini_name);
-		}
-
-		if (path != NULL)
-			return path;
-	}
-
-	return get_icon_path (icon_name);
-}
diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h
deleted file mode 100644
index a701dd38eb..0000000000
--- a/shell/e-shell-utils.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-utils.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_SHELL_UTILS_H
-#define E_SHELL_UTILS_H
-
-char *e_shell_get_icon_path (const char *icon_name,
-			     gboolean try_mini);
-
-#endif
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
deleted file mode 100644
index 4238aa5b9e..0000000000
--- a/shell/e-shell-view-menu.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-view.c
- *
- * Copyright (C) 2000, 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Miguel de Icaza
- *   Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-shell-folder-creation-dialog.h"
-#include "e-shell-folder-selection-dialog.h"
-
-#include "e-shell-constants.h"
-
-#include "e-shell-view-menu.h"
-#include "importer/importer.h"
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-
-
-const char *authors[] = {
-	"Seth Alves",
-	"Anders Carlsson",
-	"Damon Chaplin",
-	"Clifford R. Conover",
-	"Anna Dirks",
-	"Miguel de Icaza",
-	"Radek Doulik",
-	"Arturo Espinoza",
-	"Larry Ewing",
-	"Nat Friedman",
-	"Bertrand Guiheneuf",
-	"Iain Holmes",
-	"Tuomas Kuosmanen",
-	"Christopher J. Lahey",
-	"Matthew Loper",
-	"Federico Mena",
-	"Eskil Heyn Olsen",
-	"Jesse Pavel",
-	"Ettore Perazzoli",
-	"JP Rosevear",
-	"Jeffrey Stedfast",
-	"Russell Steinthal",
-	"Peter Teichman",
-	"Chris Toshok",
-	"Peter Williams",
-	"Dan Winship",
-	"Michael Zucchi",
-	NULL
-};
-
-
-/* EShellView callbacks.  */
-
-static void
-shortcut_bar_mode_changed_cb (EShellView *shell_view,
-			      EShellViewSubwindowMode new_mode,
-			      void *data)
-{
-	BonoboUIComponent *uic;
-	const char *path;
-	char *txt;
-
-	if (new_mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN)
-		txt = "0";
-	else
-		txt = "1";
-
-	path = (const char *) data;
-	uic = e_shell_view_get_bonobo_ui_component (shell_view);
-
-	bonobo_ui_component_set_prop (uic, path, "state", txt, NULL);
-}
-
-static void
-folder_bar_mode_changed_cb (EShellView *shell_view,
-			    EShellViewSubwindowMode new_mode,
-			    void *data)
-{
-	BonoboUIComponent *uic;
-	const char *path;
-	char *txt;
-
-	if (new_mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN)
-		txt = "0";
-	else
-		txt = "1";
-
-	path = (const char *) data;
-	uic = e_shell_view_get_bonobo_ui_component (shell_view);
-
-	bonobo_ui_component_set_prop (uic, path, "state", txt, NULL);
-}
-
-
-/* Command callbacks.  */
-
-static void
-command_close (BonoboUIComponent *uih,
-	       void *data,
-	       const char *path)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	gtk_object_destroy (GTK_OBJECT (shell_view));
-}
-
-static void
-command_quit (BonoboUIComponent *uih,
-	      void *data,
-	      const char *path)
-{
-	EShellView *shell_view;
-	EShell *shell;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	shell = e_shell_view_get_shell (shell_view);
-	e_shell_quit (shell);
-}
-
-static void
-command_run_bugbuddy (BonoboUIComponent *uih,
-		      void *data,
-		      const char *path)
-{
-        int pid;
-        char *args[] = {
-                "bug-buddy",
-                "--sm-disable",
-                "--package=evolution",
-                "--package-ver="VERSION,
-                NULL
-        };
-        args[0] = gnome_is_program_in_path ("bug-buddy");
-        if (!args[0]) {
-                gnome_error_dialog (_("Bug buddy was not found in your $PATH."));
-		return;
-        }
-        pid = gnome_execute_async (NULL, 4, args);
-        g_free (args[0]);
-        if (pid == -1) {
-                gnome_error_dialog (_("Bug buddy could not be run."));
-        }
-}
-
-static void
-zero_pointer(GtkObject *object, void **pointer)
-{
-	*pointer = NULL;
-}
-
-static void
-command_about_box (BonoboUIComponent *uih,
-		   void *data,
-		   const char *path)
-{
-	static GtkWidget *about_box = NULL;
-
-	if (about_box) {
-		gdk_window_raise(GTK_WIDGET(about_box)->window);
-	} else {
-		char *version;
-
-		if (SUB_VERSION[0] == '\0')
-			version = g_strdup (VERSION);
-		else
-			version = g_strdup_printf ("%s [%s]", VERSION, SUB_VERSION);
-
-		about_box = gnome_about_new(_("Evolution"),
-					    version,
-					    _("Copyright 1999, 2000, 2001 Ximian, Inc."),
-					    authors,
-					    _("Evolution is a suite of groupware applications\n"
-					      "for mail, calendaring, and contact management\n"
-					      "within the GNOME desktop environment."),
-					    NULL);
-		gtk_signal_connect(GTK_OBJECT(about_box), "destroy",
-				   GTK_SIGNAL_FUNC(zero_pointer), &about_box);
-		gtk_widget_show(about_box);
-
-		g_free (version);
-	}
-}
-
-static void
-command_help (BonoboUIComponent *uih,
-	      void *data,
-	      const char *path)
-{
-	char *url;
-
-	url = g_strdup_printf ("ghelp:%s/gnome/help/evolution/C/%s",
-			       EVOLUTION_DATADIR, (char *)data);
-	gnome_url_show (url);
-}
-
-static void
-command_toggle_folder_bar (BonoboUIComponent           *component,
-			   const char                  *path,
-			   Bonobo_UIComponent_EventType type,
-			   const char                  *state,
-			   gpointer                     user_data)
-{
-	EShellView *shell_view;
-	EShellViewSubwindowMode mode;
-	gboolean show;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	shell_view = E_SHELL_VIEW (user_data);
-
-	show = atoi (state);
-	if (show)
-		mode = E_SHELL_VIEW_SUBWINDOW_STICKY;
-	else
-		mode = E_SHELL_VIEW_SUBWINDOW_HIDDEN;
-
-	e_shell_view_set_folder_bar_mode (shell_view, mode);
-}
-
-static void
-command_toggle_shortcut_bar (BonoboUIComponent           *component,
-			     const char                  *path,
-			     Bonobo_UIComponent_EventType type,
-			     const char                  *state,
-			     gpointer                     user_data)
-{
-	EShellView *shell_view;
-	EShellViewSubwindowMode mode;
-	gboolean show;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	shell_view = E_SHELL_VIEW (user_data);
-
-	show = atoi (state);
-
-	if (show)
-		mode = E_SHELL_VIEW_SUBWINDOW_STICKY;
-	else
-		mode = E_SHELL_VIEW_SUBWINDOW_HIDDEN;
-
-	e_shell_view_set_shortcut_bar_mode (shell_view, mode);
-}
-
-
-static void
-command_new_folder (BonoboUIComponent *uih,
-		    void *data,
-		    const char *path)
-{
-	EShellView *shell_view;
-	EShell *shell;
-	const char *current_uri;
-	const char *default_parent_folder;
-
-	shell_view = E_SHELL_VIEW (data);
-	shell = e_shell_view_get_shell (shell_view);
-	current_uri = e_shell_view_get_current_uri (shell_view);
-
-	if (strncmp (current_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0)
-		default_parent_folder = current_uri + E_SHELL_URI_PREFIX_LEN;
-	else
-		default_parent_folder = NULL;
-
-	e_shell_show_folder_creation_dialog (shell, GTK_WINDOW (shell_view),
-					     default_parent_folder,
-					     NULL /* result_callback */,
-					     NULL /* result_callback_data */);
-}
-
-static void
-command_new_view (BonoboUIComponent *uih,
-		  gpointer          data,
-		  const char *path)
-{
-	EShellView *shell_view;
-	EShell *shell;
-	const char *current_uri;
-
-	shell_view = E_SHELL_VIEW (data);
-	shell = e_shell_view_get_shell (shell_view);
-	current_uri = e_shell_view_get_current_uri (shell_view);
-
-	e_shell_new_view (shell, current_uri);
-}
-
-
-/* Going to a folder.  */
-
-static void
-folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog,
-				      void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog));
-}
-
-static void
-folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_selection_dialog,
-					    const char *path,
-					    void *data)
-{
-	if (path != NULL) {
-		EShellView *shell_view;
-		char *uri;
-
-		shell_view = E_SHELL_VIEW (data);
-
-		uri = g_strconcat (E_SHELL_URI_PREFIX, path, NULL);
-		e_shell_view_display_uri (shell_view, uri);
-		g_free (uri);
-	}
-}
-
-static void
-command_goto_folder (BonoboUIComponent *uih,
-		     gpointer    data,
-		     const char *path)
-{
-	GtkWidget *folder_selection_dialog;
-	EShellView *shell_view;
-	EShell *shell;
-	const char *current_uri;
-
-	shell_view = E_SHELL_VIEW (data);
-	shell = e_shell_view_get_shell (shell_view);
-
-	current_uri = e_shell_view_get_current_uri (shell_view);
-
-	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell,
-								       _("Go to folder..."),
-								       current_uri,
-								       NULL);
-
-	gtk_window_set_transient_for (GTK_WINDOW (folder_selection_dialog), GTK_WINDOW (shell_view));
-
-	gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected",
-			    GTK_SIGNAL_FUNC (folder_selection_dialog_folder_selected_cb), shell_view);
-	gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled",
-			    GTK_SIGNAL_FUNC (folder_selection_dialog_cancelled_cb), shell_view);
-
-	gtk_widget_show (folder_selection_dialog);
-}
-
-static void
-command_create_folder (BonoboUIComponent *uih,
-		       void *data,
-		       const char *path)
-{
-	EShellView *shell_view;
-	EShell *shell;
-	const char *current_uri;
-	const char *default_folder;
-
-	shell_view = E_SHELL_VIEW (data);
-	shell = e_shell_view_get_shell (shell_view);
-
-	current_uri = e_shell_view_get_current_uri (shell_view);
-
-	if (strncmp (current_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0)
-		default_folder = current_uri + E_SHELL_URI_PREFIX_LEN;
-	else
-		default_folder = NULL;
-
-	e_shell_show_folder_creation_dialog (shell, GTK_WINDOW (shell_view), default_folder,
-					     NULL /* result_callback */,
-					     NULL /* result_callback_data */);
-}
-
-static void
-command_xml_dump (gpointer    dummy,
-		  EShellView *view)
-{
-	bonobo_window_dump (BONOBO_WINDOW (view), "On demand");
-}
-
-
-/* Unimplemented commands.  */
-
-#define DEFINE_UNIMPLEMENTED(func)					\
-static void								\
-func (BonoboUIComponent *uic, void *data, const char *path)		\
-{									\
-	g_warning ("e-shell-view-menu.c: %s: not implemented.", #func);	\
-}									\
-
-static void
-command_new_mail_message (BonoboUIComponent *uih,
-			  gpointer          data,
-			  const char *path)
-{
-	CORBA_Environment ev;
-	Bonobo_Unknown object;
-	
-	CORBA_exception_init (&ev);
-	object = bonobo_get_object (
-		"OAFIID:GNOME_Evolution_Mail_Composer!visible=1",
-		"Bonobo/Unknown", &ev);
-
-	CORBA_exception_free (&ev);
-}
-	
-DEFINE_UNIMPLEMENTED (command_new_shortcut)
-
-DEFINE_UNIMPLEMENTED (command_new_contact)
-DEFINE_UNIMPLEMENTED (command_new_task_request)
-
-BonoboUIVerb new_verbs [] = {
-	BONOBO_UI_VERB ("NewView", command_new_view),
-	BONOBO_UI_VERB ("NewFolder", command_new_folder),
-	BONOBO_UI_VERB ("NewShortcut", command_new_shortcut),
-	BONOBO_UI_VERB ("NewMailMessage", command_new_mail_message),
-		  
-	BONOBO_UI_VERB ("NewAppointment", command_new_shortcut),
-	BONOBO_UI_VERB ("NewContact", command_new_contact),
-	BONOBO_UI_VERB ("NewTask", command_new_task_request),
-
-	BONOBO_UI_VERB_END
-};
-
-BonoboUIVerb file_verbs [] = {
-	BONOBO_UI_VERB ("FileImporter", (BonoboUIVerbFn) show_import_wizard),
-	BONOBO_UI_VERB ("FileGoToFolder", command_goto_folder),
-	BONOBO_UI_VERB ("FileCreateFolder", command_create_folder),
-	BONOBO_UI_VERB ("FileClose", command_close),
-	BONOBO_UI_VERB ("FileExit", command_quit),
-
-	BONOBO_UI_VERB_END
-};
-
-BonoboUIVerb help_verbs [] = {
-	BONOBO_UI_VERB_DATA ("HelpIndex", command_help, "index.html"),
-	BONOBO_UI_VERB_DATA ("HelpGetStarted", command_help, "usage-mainwindow.html"),
-	BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"),
-	BONOBO_UI_VERB_DATA ("HelpUsingCalendar", command_help, "usage-calendar.html"),
-	BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"),
-
-	BONOBO_UI_VERB_END
-};
-
-static void
-menu_do_misc (BonoboUIComponent *component,
-	      EShellView        *shell_view)
-{
-	bonobo_ui_component_add_listener (
-		component, "ViewShortcutBar",
-		command_toggle_shortcut_bar, shell_view);
-	bonobo_ui_component_add_listener (
-		component, "ViewFolderBar",
-		command_toggle_folder_bar, shell_view);
-	bonobo_ui_component_add_verb (
-		component, "HelpSubmitBug",
-		(BonoboUIVerbFn) command_run_bugbuddy, shell_view);
-	bonobo_ui_component_add_verb (
-		component, "HelpAbout",
-		(BonoboUIVerbFn) command_about_box, shell_view);
-	bonobo_ui_component_add_verb (
-		component, "DebugDumpXml",
-		(BonoboUIVerbFn) command_xml_dump, shell_view);
-}
-
-
-#define SHORTCUT_BAR_TOGGLE_PATH "/commands/ViewShortcutBar"
-#define FOLDER_BAR_TOGGLE_PATH "/commands/ViewFolderBar"
-
-void
-e_shell_view_menu_setup (EShellView *shell_view)
-{
-	BonoboUIComponent *uic;
-
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
-
-	uic = e_shell_view_get_bonobo_ui_component (shell_view);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, file_verbs, shell_view);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, new_verbs, shell_view);
-
-	bonobo_ui_component_add_verb_list (
-		uic, help_verbs);
-
-	menu_do_misc (uic, shell_view);
-
-	gtk_signal_connect (GTK_OBJECT (shell_view), "shortcut_bar_mode_changed",
-			    GTK_SIGNAL_FUNC (shortcut_bar_mode_changed_cb),
-			    SHORTCUT_BAR_TOGGLE_PATH);
-	gtk_signal_connect (GTK_OBJECT (shell_view), "folder_bar_mode_changed",
-			    GTK_SIGNAL_FUNC (folder_bar_mode_changed_cb),
-			    FOLDER_BAR_TOGGLE_PATH);
-
-	/* Initialize the toggles.  Yeah, this is, well, yuck.  */
-	folder_bar_mode_changed_cb   (shell_view, e_shell_view_get_folder_bar_mode (shell_view),
-				      FOLDER_BAR_TOGGLE_PATH);
-	shortcut_bar_mode_changed_cb (shell_view, e_shell_view_get_shortcut_bar_mode (shell_view),
-				      SHORTCUT_BAR_TOGGLE_PATH);
-}
diff --git a/shell/e-shell-view-menu.h b/shell/e-shell-view-menu.h
deleted file mode 100644
index 7f8c3ce0b3..0000000000
--- a/shell/e-shell-view-menu.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-view.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Miguel de Icaza
- *   Ettore Perazzoli
- */
-
-#ifndef E_SHELL_VIEW_MENU_H
-#define E_SHELL_VIEW_MENU_H
-
-#include "e-shell-view.h"
-
-void e_shell_view_menu_setup (EShellView *shell_view);
-
-#endif
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
deleted file mode 100644
index 5875546eba..0000000000
--- a/shell/e-shell-view.c
+++ /dev/null
@@ -1,1831 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-view.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Matt Loper <matt@helixcode.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-socket.h>
-#include <libgnomeui/gnome-window-icon.h>
-
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "widgets/misc/e-clipped-label.h"
-
-#include "evolution-shell-view.h"
-
-#include "e-shell-constants.h"
-#include "e-shell-folder-title-bar.h"
-#include "e-shell-utils.h"
-#include "e-shell.h"
-#include "e-shortcuts-view.h"
-#include "e-storage-set-view.h"
-#include "e-title-bar.h"
-
-#include "e-shell-view.h"
-#include "e-shell-view-menu.h"
-
-#include <gal/e-paned/e-hpaned.h>
-
-
-static BonoboWindowClass *parent_class = NULL;
-
-struct _EShellViewPrivate {
-	/* The shell.  */
-	EShell *shell;
-
-	/* EvolutionShellView Bonobo object for implementing the
-           Evolution::ShellView interface.  */
-	EvolutionShellView *corba_interface;
-
-	/* The UI handler.  */
-	BonoboUIComponent *ui_component;
-
-	/* Currently displayed URI.  */
-	char *uri;
-
-	/* delayed selection, used when a path doesn't exist in an
-           EStorage.  cleared when we're signaled with
-           "folder_selected" */
-	char *delayed_selection;
-
-	/* The widgetry.  */
-	GtkWidget *appbar;
-	GtkWidget *hpaned;
-	GtkWidget *view_vbox;
-	GtkWidget *view_title_bar;
-	GtkWidget *view_hpaned;
-	GtkWidget *contents;
-	GtkWidget *notebook;
-	GtkWidget *shortcut_bar;
-	GtkWidget *storage_set_title_bar;
-	GtkWidget *storage_set_view;
-	GtkWidget *storage_set_view_box;
-	GtkWidget *progress_bar;
-
-	/* The view we have already open.  */
-	GHashTable *uri_to_control;
-
-	/* Position of the handles in the paneds, to be restored when we show elements
-           after hiding them.  */
-	unsigned int hpaned_position;
-	unsigned int view_hpaned_position;
-
-	/* Status of the shortcut and folder bars.  */
-	EShellViewSubwindowMode shortcut_bar_mode;
-	EShellViewSubwindowMode folder_bar_mode;
-
-	/* Timeout ID for the progress bar.  */
-	int progress_bar_timeout_id;
-
-	/* Status of the progress bar.  */
-	int progress_bar_value;
-
-	/* List of sockets we created.  */
-	GList *sockets;
-};
-
-enum {
-	SHORTCUT_BAR_MODE_CHANGED,
-	FOLDER_BAR_MODE_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-#define DEFAULT_SHORTCUT_BAR_WIDTH 100
-#define DEFAULT_TREE_WIDTH         130
-
-#define DEFAULT_WIDTH 705
-#define DEFAULT_HEIGHT 550
-
-#define DEFAULT_URI "evolution:/local/Inbox"
-
-static void update_for_current_uri (EShellView *shell_view);
-static const char * get_storage_set_path_from_uri (const char *uri);
-
-
-/* Utility functions.  */
-
-static GtkWidget *
-create_label_for_empty_page (void)
-{
-	GtkWidget *label;
-
-	label = e_clipped_label_new (_("(No folder displayed)"));
-	gtk_widget_show (label);
-
-	return label;
-}
-
-/* FIXME this is broken.  */
-static gboolean
-bonobo_widget_is_dead (BonoboWidget *bonobo_widget)
-{
-	BonoboControlFrame *control_frame;
-	CORBA_Object corba_object;
-	CORBA_Environment ev;
-	gboolean is_dead;
-
-	control_frame = bonobo_widget_get_control_frame (bonobo_widget);
-	corba_object = bonobo_control_frame_get_control (control_frame);
-
-	CORBA_exception_init (&ev);
-	is_dead = CORBA_Object_non_existent (corba_object, &ev);
-	CORBA_exception_free (&ev);
-
-	return is_dead;
-}
-
-
-/* Folder bar pop-up handling.  */
-
-static void disconnect_popup_signals (EShellView *shell_view);
-
-static void
-popdown_transient_folder_bar (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	priv = shell_view->priv;
-
-	gdk_pointer_ungrab (GDK_CURRENT_TIME);
-	gtk_grab_remove (priv->storage_set_view_box);
-
-	e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	disconnect_popup_signals (shell_view);
-
-	e_shell_folder_title_bar_set_toggle_state (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar), FALSE);
-}
-
-static int
-storage_set_view_box_button_release_event_cb (GtkWidget *widget,
-					      GdkEventButton *button_event,
-					      void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	if (button_event->window == E_PANED (priv->view_hpaned)->handle)
-		return FALSE;
-
-	popdown_transient_folder_bar (shell_view);
-
-	return TRUE;
-}
-
-static void
-popup_storage_set_view_button_clicked (ETitleBar *title_bar,
-				       void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	gdk_pointer_ungrab (GDK_CURRENT_TIME);
-	gtk_grab_remove (priv->storage_set_view_box);
-
-	disconnect_popup_signals (shell_view);
-
-	e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_STICKY);
-	e_shell_folder_title_bar_set_toggle_state (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar), FALSE);
-}
-
-static void
-storage_set_view_box_map_cb (GtkWidget *widget,
-			     void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	if (gdk_pointer_grab (widget->window, TRUE,
-			      (GDK_BUTTON_PRESS_MASK
-			       | GDK_BUTTON_RELEASE_MASK
-			       | GDK_ENTER_NOTIFY_MASK
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_POINTER_MOTION_MASK),
-			      NULL, NULL, GDK_CURRENT_TIME) != 0) {
-		g_warning ("e-shell-view.c:storage_set_view_box_map_cb() -- pointer grab failed.");
-		e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_STICKY);
-		return;
-	}
-
-	gtk_grab_add (widget);
-	gtk_signal_connect (GTK_OBJECT (widget), "button_release_event",
-			    GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb), shell_view);
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_view), "button_release_event",
-			    GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb), shell_view);
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_title_bar), "button_clicked",
-			    GTK_SIGNAL_FUNC (popup_storage_set_view_button_clicked), shell_view);
-}
-
-static void
-disconnect_popup_signals (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	priv = shell_view->priv;
-
-	gtk_signal_disconnect_by_func (GTK_OBJECT (priv->storage_set_view_box),
-				       GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb),
-				       shell_view);
-	gtk_signal_disconnect_by_func (GTK_OBJECT (priv->storage_set_view),
-				       GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb),
-				       shell_view);
-	gtk_signal_disconnect_by_func (GTK_OBJECT (priv->storage_set_title_bar),
-				       GTK_SIGNAL_FUNC (popup_storage_set_view_button_clicked),
-				       shell_view);
-	gtk_signal_disconnect_by_func (GTK_OBJECT (priv->storage_set_view_box),
-				       GTK_SIGNAL_FUNC (storage_set_view_box_map_cb),
-				       shell_view);
-}
-
-static void
-pop_up_folder_bar (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	priv = shell_view->priv;
-
-	priv->folder_bar_mode = E_SHELL_VIEW_SUBWINDOW_TRANSIENT;
-
-	/* We need to show the storage set view box and do a pointer grab to catch the
-           mouse clicks.  But until the box is shown, we cannot grab.  So we connect to
-           the "map" signal; `storage_set_view_box_map_cb()' will do the grab.  */
-
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_view_box), "map",
-			    GTK_SIGNAL_FUNC (storage_set_view_box_map_cb), shell_view);
-	gtk_widget_show (priv->storage_set_view_box);
-
-	e_paned_set_position (E_PANED (priv->view_hpaned), priv->view_hpaned_position);
-}
-
-
-/* Switching views on a tree view click.  */
-
-static void new_folder_cb (EStorageSet *storage_set, const char *path, void *data);
-
-static void
-switch_on_folder_tree_click (EShellView *shell_view,
-			     const char *path)
-{
-	EShellViewPrivate *priv;
-	char *uri;
-
-	priv = shell_view->priv;
-
-	uri = g_strconcat (E_SHELL_URI_PREFIX, path, NULL);
-	e_shell_view_display_uri (shell_view, uri);
-	g_free (uri);
-
-	if (priv->delayed_selection) {
-		g_free (priv->delayed_selection);
-		priv->delayed_selection = NULL;
-		gtk_signal_disconnect_by_func (GTK_OBJECT (e_shell_get_storage_set(priv->shell)),
-					       GTK_SIGNAL_FUNC (new_folder_cb),
-					       shell_view);
-	}
-
-	if (priv->folder_bar_mode == E_SHELL_VIEW_SUBWINDOW_TRANSIENT)
-		popdown_transient_folder_bar (shell_view);
-}
-
-
-/* Callbacks.  */
-
-/* Callback when a new folder is added.  removed when we clear the
-   delayed_selection */
-static void
-new_folder_cb (EStorageSet *storage_set,
-	       const char *path,
-	       void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-	char *delayed_path;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	delayed_path = strchr (priv->delayed_selection, ':');
-	if (delayed_path) {
-		delayed_path ++;
-		if (!strcmp(path, delayed_path)) {
-			gtk_signal_disconnect_by_func (GTK_OBJECT (e_shell_get_storage_set(priv->shell)),
-						       GTK_SIGNAL_FUNC (new_folder_cb),
-						       shell_view);
-			g_free (priv->uri);
-			priv->uri = priv->delayed_selection;
-			priv->delayed_selection = NULL;
-			e_shell_view_display_uri (shell_view, priv->uri);
-		}
-	}
-}
-
-/* Callback called when an icon on the shortcut bar gets clicked.  */
-static void
-activate_shortcut_cb (EShortcutsView *shortcut_view,
-		      EShortcuts *shortcuts,
-		      const char *uri,
-		      void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	e_shell_view_display_uri (shell_view, uri);
-}
-
-/* Callback when user chooses "Hide shortcut bar" via a right click */
-static void
-hide_requested_cb (EShortcutsView *shortcut_view,
-		   void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	e_shell_view_set_shortcut_bar_mode (shell_view,
-					    E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-}
-
-/* Callback called when a folder on the tree view gets clicked.  */
-static void
-folder_selected_cb (EStorageSetView *storage_set_view,
-		    const char *path,
-		    void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	switch_on_folder_tree_click (shell_view, path);
-}
-
-/* Callback called when a storage in the tree view is clicked.  */
-static void
-storage_selected_cb (EStorageSetView *storage_set_view,
-		     const char *name,
-		     void *data)
-{
-	EShellView *shell_view;
-	char *path;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	path = g_strconcat (G_DIR_SEPARATOR_S, name, NULL);
-	switch_on_folder_tree_click (shell_view, path);
-
-	g_free (path);
-}
-
-/* Callback called when the button on the tree's title bar is clicked.  */
-static void
-storage_set_view_button_clicked_cb (ETitleBar *title_bar,
-				    void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-}
-
-/* Callback called when the title bar button has been pressed.  */
-static void
-title_bar_toggled_cb (EShellFolderTitleBar *title_bar,
-		      gboolean state,
-		      void *data)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-
-	if (! state)
-		return;
-
-	if (e_shell_view_get_folder_bar_mode (shell_view) != E_SHELL_VIEW_SUBWINDOW_TRANSIENT)
-		pop_up_folder_bar (shell_view);
-}
-
-
-/* Widget setup.  */
-
-static void
-setup_storage_set_subwindow (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	GtkWidget *storage_set_view;
-	GtkWidget *vbox;
-	GtkWidget *scroll_frame;
-
-	priv = shell_view->priv;
-
-	storage_set_view = e_storage_set_view_new (e_shell_get_storage_set (priv->shell));
-	gtk_signal_connect (GTK_OBJECT (storage_set_view), "folder_selected",
-			    GTK_SIGNAL_FUNC (folder_selected_cb), shell_view);
-	gtk_signal_connect (GTK_OBJECT (storage_set_view), "storage_selected",
-			    GTK_SIGNAL_FUNC (storage_selected_cb), shell_view);
-
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-
-	gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	priv->storage_set_title_bar = e_title_bar_new (_("Folders"));
-
-	gtk_box_pack_start (GTK_BOX (vbox), priv->storage_set_title_bar, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
-
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_title_bar), "button_clicked",
-			    GTK_SIGNAL_FUNC (storage_set_view_button_clicked_cb), shell_view);
-
-	gtk_widget_show (vbox);
-	gtk_widget_show (storage_set_view);
-	gtk_widget_show (priv->storage_set_title_bar);
-	gtk_widget_show (scroll_frame);
-
-	priv->storage_set_view_box = vbox;
-	priv->storage_set_view = storage_set_view;
-}
-
-static void
-setup_progress_bar (EShellViewPrivate *priv)
-{
-	GtkProgressBar *progress_bar;
-	BonoboControl  *control;
-
-	progress_bar = (GTK_PROGRESS_BAR (gtk_progress_bar_new ()));
-
-	gtk_progress_bar_set_orientation (progress_bar, GTK_PROGRESS_LEFT_TO_RIGHT);
-	gtk_progress_bar_set_bar_style (progress_bar, GTK_PROGRESS_CONTINUOUS);
-	
-	priv->progress_bar = GTK_WIDGET (progress_bar);
-	gtk_widget_show (priv->progress_bar);
-
-	control = bonobo_control_new (priv->progress_bar);
-	g_return_if_fail (control != NULL);
-
-	bonobo_ui_component_object_set (priv->ui_component, "/status/Progress",
-					bonobo_object_corba_objref (BONOBO_OBJECT (control)),
-					NULL);
-}
-
-static void
-setup_widgets (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	priv = shell_view->priv;
-
-	/* The progress bar.  */
-
-	setup_progress_bar (priv);
-
-	/* The shortcut bar.  */
-
-	priv->shortcut_bar = e_shortcuts_new_view (e_shell_get_shortcuts (priv->shell));
-	gtk_signal_connect (GTK_OBJECT (priv->shortcut_bar), "activate_shortcut",
-			    GTK_SIGNAL_FUNC (activate_shortcut_cb), shell_view);
-
-	gtk_signal_connect (GTK_OBJECT (priv->shortcut_bar), "hide_requested",
-			    GTK_SIGNAL_FUNC (hide_requested_cb), shell_view);
-
-	/* The storage set view.  */
-
-	setup_storage_set_subwindow (shell_view);
-
-	/* The tabless notebook which we used to contain the 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);
-
-	/* Page for "No URL displayed" message.  */
-
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), create_label_for_empty_page (), NULL);
-
-	/* Put things into a paned and the paned into the GnomeApp.  */
-
-	priv->view_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (priv->view_vbox), 2);
-
-	priv->view_title_bar = e_shell_folder_title_bar_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->view_title_bar), "title_toggled",
-			    GTK_SIGNAL_FUNC (title_bar_toggled_cb), shell_view);
-
-	priv->view_hpaned = e_hpaned_new ();
-	e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, FALSE);
-	e_paned_pack2 (E_PANED (priv->view_hpaned), priv->notebook, TRUE, FALSE);
-	e_paned_set_position (E_PANED (priv->view_hpaned), DEFAULT_TREE_WIDTH);
-
-	gtk_box_pack_start (GTK_BOX (priv->view_vbox), priv->view_title_bar,
-			    FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (priv->view_vbox), priv->view_hpaned,
-			    TRUE, TRUE, 2);
-
-	priv->hpaned = e_hpaned_new ();
-	e_paned_pack1 (E_PANED (priv->hpaned), priv->shortcut_bar, FALSE, FALSE);
-	e_paned_pack2 (E_PANED (priv->hpaned), priv->view_vbox, TRUE, FALSE);
-	e_paned_set_position (E_PANED (priv->hpaned), DEFAULT_SHORTCUT_BAR_WIDTH);
-
-	bonobo_window_set_contents (BONOBO_WINDOW (shell_view), priv->hpaned);
-
-	/* Show stuff.  */
-
-	gtk_widget_show (priv->shortcut_bar);
-	gtk_widget_show (priv->storage_set_view);
-	gtk_widget_show (priv->storage_set_view_box);
-	gtk_widget_show (priv->notebook);
-	gtk_widget_show (priv->hpaned);
-	gtk_widget_show (priv->view_hpaned);
-	gtk_widget_show (priv->view_vbox);
-	gtk_widget_show (priv->view_title_bar);
-
-	/* By default, both the folder bar and shortcut bar are visible.  */
-	priv->shortcut_bar_mode = E_SHELL_VIEW_SUBWINDOW_STICKY;
-	priv->folder_bar_mode   = E_SHELL_VIEW_SUBWINDOW_STICKY;
-
-	/* FIXME: Session management and stuff?  */
-	gtk_window_set_default_size (GTK_WINDOW (shell_view), DEFAULT_WIDTH, DEFAULT_HEIGHT);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-hash_forall_destroy_control (void *name,
-			     void *value,
-			     void *data)
-{
-	BonoboWidget *bonobo_widget;
-
-	bonobo_widget = BONOBO_WIDGET (value);
-	gtk_widget_destroy (GTK_WIDGET (bonobo_widget));
-
-	g_free (name);
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-	GList *p;
-
-	shell_view = E_SHELL_VIEW (object);
-	priv = shell_view->priv;
-
-	if (priv->corba_interface != NULL)
-		bonobo_object_unref (BONOBO_OBJECT (priv->corba_interface));
-
-	for (p = priv->sockets; p != NULL; p = p->next) {
-		GtkWidget *socket_widget;
-		int destroy_connection_id;
-
-		socket_widget = GTK_WIDGET (p->data);
-		destroy_connection_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (socket_widget),
-									      "e_shell_view_destroy_connection_id"));
-		gtk_signal_disconnect (GTK_OBJECT (socket_widget), destroy_connection_id);
-	}
-
-	g_hash_table_foreach (priv->uri_to_control, hash_forall_destroy_control, NULL);
-	g_hash_table_destroy (priv->uri_to_control);
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->ui_component));
-
-	g_free (priv->uri);
-
-	if (priv->progress_bar_timeout_id != 0)
-		gtk_timeout_remove (priv->progress_bar_timeout_id);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static  int
-delete_event (GtkWidget *widget,
-	      GdkEventAny *event)
-{
-	EShell *shell;
-
-	shell = e_shell_view_get_shell (E_SHELL_VIEW (widget));
-/*  	e_shell_quit (shell); */
-
-	/* FIXME: Is this right, or should it be FALSE? */
-	return FALSE;
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EShellViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);
-
-	signals[SHORTCUT_BAR_MODE_CHANGED]
-		= gtk_signal_new ("shortcut_bar_mode_changed",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShellViewClass, shortcut_bar_mode_changed),
-				  gtk_marshal_NONE__INT,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_INT);
-
-	signals[FOLDER_BAR_MODE_CHANGED]
-		= gtk_signal_new ("folder_bar_mode_changed",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShellViewClass, folder_bar_mode_changed),
-				  gtk_marshal_NONE__INT,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	priv = g_new (EShellViewPrivate, 1);
-
-	priv->shell                   = NULL;
-	priv->corba_interface         = NULL;
-	priv->ui_component            = NULL;
-	priv->uri                     = NULL;
-	priv->delayed_selection       = NULL;
-
-	priv->appbar                  = NULL;
-	priv->hpaned                  = NULL;
-	priv->view_hpaned             = NULL;
-	priv->contents                = NULL;
-	priv->notebook                = NULL;
-
-	priv->storage_set_title_bar   = NULL;
-	priv->storage_set_view        = NULL;
-	priv->storage_set_view_box    = NULL;
-	priv->shortcut_bar            = NULL;
-
-	priv->shortcut_bar_mode       = E_SHELL_VIEW_SUBWINDOW_HIDDEN;
-	priv->folder_bar_mode         = E_SHELL_VIEW_SUBWINDOW_HIDDEN;
-
-	priv->hpaned_position         = 0;
-	priv->view_hpaned_position    = 0;
-
-	priv->uri_to_control          = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->progress_bar_timeout_id = 0;
-	priv->progress_bar_value      = 0;
-	priv->sockets		      = NULL;
-
-	shell_view->priv = priv;
-}
-
-
-/* Progress bar handling.  */
-
-#define PROGRESS_BAR_TIMEOUT 80
-
-static int
-progress_bar_timeout_cb (void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-	GtkWidget *progress_bar;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-	progress_bar = priv->progress_bar;
-
-	priv->progress_bar_value = ! priv->progress_bar_value;
-	gtk_progress_set_value (GTK_PROGRESS (progress_bar), priv->progress_bar_value);
-
-	return TRUE;
-}
-
-static void
-start_progress_bar (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	GtkProgress *progress;
-
-	priv = shell_view->priv;
-
-	progress = GTK_PROGRESS (priv->progress_bar);
-
-	if (!GTK_WIDGET_REALIZED (progress))
-	    return;
-	    
-	if (priv->progress_bar_timeout_id != 0)
-		return;
-	
-	priv->progress_bar_timeout_id = gtk_timeout_add (PROGRESS_BAR_TIMEOUT, progress_bar_timeout_cb, shell_view);
-	
-	gtk_progress_set_activity_mode (progress, TRUE);
-	gtk_progress_set_value (progress, priv->progress_bar_value);
-}
-
-static void
-stop_progress_bar (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	GtkWidget *progress_bar;
-
-	priv = shell_view->priv;
-	progress_bar = priv->progress_bar;
-
-	if (priv->progress_bar_timeout_id != 0) {
-		gtk_timeout_remove (priv->progress_bar_timeout_id);
-		priv->progress_bar_timeout_id = 0;
-	}
-
-	if (!GTK_WIDGET_REALIZED (progress_bar))
-		return;
-
-	gtk_progress_set_activity_mode (GTK_PROGRESS (progress_bar), FALSE);
-	gtk_progress_set_value (GTK_PROGRESS (progress_bar), 0);
-}
-
-
-/* EvolutionShellView interface callbacks.  */
-
-static void
-corba_interface_set_message_cb (EvolutionShellView *shell_view,
-				     const char *message,
-				     gboolean busy,
-				     void *data)
-{
-	char *status;
-	EShellView *view;
-
-	view = E_SHELL_VIEW (data);
-
-	g_return_if_fail (view != NULL);
-
-	if (message != NULL) {
-		const char *newline;
-		
-		newline = strchr (message, '\n');
-		if (newline == NULL)
-			status = g_strdup (message);
-		else
-			status = g_strndup (message, newline - message);
-	} else {
-		status = g_strdup ("");
-	}
-
-	bonobo_ui_component_set_status (view->priv->ui_component, status, NULL);
-
-	g_free (status);
-
-	if (busy)
-		start_progress_bar (E_SHELL_VIEW (data));
-	else
-		stop_progress_bar (E_SHELL_VIEW (data));
-}
-
-static void
-corba_interface_unset_message_cb (EvolutionShellView *shell_view,
-				       void *data)
-{
-	EShellView *view;
-
-	view = E_SHELL_VIEW (data);
-
-	g_return_if_fail (view != NULL);
-
-	bonobo_ui_component_set_status (view->priv->ui_component, "", NULL);
-
-	stop_progress_bar (E_SHELL_VIEW (data));
-}
-
-static void
-corba_interface_change_current_view_cb (EvolutionShellView *shell_view,
-					     const char *uri,
-					     void *data)
-{
-	EShellView *view;
-
-	view = E_SHELL_VIEW (data);
-
-	g_return_if_fail (view != NULL);
-
-	e_shell_view_display_uri (view, uri);
-}
-
-static void
-corba_interface_set_title (EvolutionShellView *shell_view,
-				const char *title,
-				void *data)
-{
-	EShellView *view;
-
-	view = E_SHELL_VIEW (data);
-	
-	g_return_if_fail (view != NULL);
-
-	gtk_window_set_title (GTK_WINDOW (view), title);
-}
-
-static void
-unmerge_on_error (BonoboObject *object,
-		  CORBA_Object  cobject,
-		  CORBA_Environment *ev)
-{
-	BonoboWindow *win;
-
-	win = bonobo_ui_container_get_win (BONOBO_UI_CONTAINER (object));
-
-	if (win)
-		bonobo_window_deregister_component_by_ref (win, cobject);
-}
-
-static void
-updated_folder_cb (EStorageSet *storage_set,
-		   const char *path,
-		   void *data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-	char *uri;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	uri = g_strconcat (E_SHELL_URI_PREFIX, path, NULL);
-
-	/* Update the shortcut bar */
-	e_shortcuts_update_shortcut_by_uri (e_shell_get_shortcuts (priv->shell), uri);
-	g_free (uri);
-
-	/* Update the folder title bar and the window title bar */
-	update_for_current_uri (shell_view);
-}
-
-
-EShellView *
-e_shell_view_construct (EShellView *shell_view,
-			EShell     *shell)
-{
-	EShellViewPrivate *priv;
-	EShellView *view;
-	GtkObject *window;
-	BonoboUIContainer *container;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (shell_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	priv = shell_view->priv;
-
-	view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Evolution"));
-
-	if (!view) {
-		gtk_object_unref (GTK_OBJECT (shell_view));
-		return NULL;
-	}		
-
-	window = GTK_OBJECT (view);
-
-	gtk_signal_connect (window, "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-
-	priv->shell = shell;
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), "updated_folder",
-					updated_folder_cb, shell_view, GTK_OBJECT (shell_view));
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (shell_view));
-	gtk_signal_connect (GTK_OBJECT (container), "system_exception", GTK_SIGNAL_FUNC (unmerge_on_error), NULL);
-
-	priv->ui_component = bonobo_ui_component_new ("evolution");
-	bonobo_ui_component_set_container (priv->ui_component,
-					   bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-
-	bonobo_ui_component_freeze (priv->ui_component, NULL);
-
-	bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, "evolution.xml", "evolution");
-
-	setup_widgets (shell_view);
-
-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (shell_view)),
-					  "/evolution/UIConf/kvps");
-
-	e_shell_view_menu_setup (shell_view);
-
-	e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	bonobo_ui_component_thaw (priv->ui_component, NULL);
-
-	return view;
-}
-
-EShellView *
-e_shell_view_new (EShell *shell)
-{
-	GtkWidget *new;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	new = gtk_type_new (e_shell_view_get_type ());
-
-	return e_shell_view_construct (E_SHELL_VIEW (new), shell);
-}
-
-const GNOME_Evolution_ShellView
-e_shell_view_get_corba_interface (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-
-	g_return_val_if_fail (shell_view != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), CORBA_OBJECT_NIL);
-
-	priv = shell_view->priv;
-
-	return bonobo_object_corba_objref (BONOBO_OBJECT (priv->corba_interface));
-}
-
-
-static const char *
-get_storage_set_path_from_uri (const char *uri)
-{
-	const char *colon;
-
-	if (uri == NULL)
-		return NULL;
-
-	if (g_path_is_absolute (uri))
-		return NULL;
-
-	colon = strchr (uri, ':');
-	if (colon == NULL || colon == uri || colon[1] == '\0')
-		return NULL;
-
-	if (! g_path_is_absolute (colon + 1))
-		return NULL;
-
-	if (g_strncasecmp (uri, E_SHELL_URI_PREFIX, colon - uri) != 0)
-		return NULL;
-
-	return colon + 1;
-}
-
-static void
-update_window_icon (EShellView *shell_view,
-		    EFolder *folder)
-{
-	EShellViewPrivate *priv;
-	const char *type;
-	const char *icon_name;
-	char *icon_path;
-
-	priv = shell_view->priv;
-
-	if (folder == NULL)
-		type = NULL;
-	else
-		type = e_folder_get_type_string (folder);
-
-	if (type == NULL) {
-		icon_path = NULL;
-	} else {
-		EFolderTypeRegistry *folder_type_registry;
-
-		folder_type_registry = e_shell_get_folder_type_registry (priv->shell);
-		icon_name = e_folder_type_registry_get_icon_name_for_type (folder_type_registry, type);
-		if (icon_name == NULL)
-			icon_path = NULL;
-		else
-			icon_path = e_shell_get_icon_path (icon_name, TRUE);
-	}
-
-	if (icon_path == NULL) {
-		gnome_window_icon_set_from_default (GTK_WINDOW (shell_view));
-	} else {
-		gnome_window_icon_set_from_file (GTK_WINDOW (shell_view), icon_path);
-		g_free (icon_path);
-	}
-}
-
-static void
-update_folder_title_bar (EShellView *shell_view,
-			 EFolder *folder)
-{
-	EShellViewPrivate *priv;
-	EFolderTypeRegistry *folder_type_registry;
-	GdkPixbuf *folder_icon;
-	const char *folder_name;
-	const char *folder_type_name;
-
-	priv = shell_view->priv;
-
-	if (folder == NULL)
-		folder_type_name = NULL;
-	else
-		folder_type_name = e_folder_get_type_string (folder);
-
-	if (folder_type_name == NULL) {
-		folder_name = NULL;
-		folder_icon = NULL;
-	} else {
-		folder_type_registry = e_shell_get_folder_type_registry (priv->shell);
-		folder_icon = e_folder_type_registry_get_icon_for_type (folder_type_registry,
-									folder_type_name,
-									TRUE);
-		folder_name = e_folder_get_name (folder);
-	}
-
-	if (folder_icon)
-		e_shell_folder_title_bar_set_icon (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar), folder_icon);
-	if (folder_name) {
-		gchar * utf;
-		utf = e_utf8_to_gtk_string (GTK_WIDGET (priv->view_title_bar), folder_name);
-		e_shell_folder_title_bar_set_title (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar), utf);
-		g_free (utf);
-	}
-}
-
-static void
-update_for_current_uri (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	EFolder *folder;
-	char *folder_name;
-	const char *path;
-	char *window_title;
-
-	priv = shell_view->priv;
-
-	path = get_storage_set_path_from_uri (priv->uri);
-
-	if (path == NULL)
-		folder = NULL;
-	else
-		folder = e_storage_set_get_folder (e_shell_get_storage_set (priv->shell),
-						   path);
-
-	if (folder == NULL)
-		folder_name = g_strdup (_("None"));
-	else
-		folder_name = e_utf8_to_gtk_string ((GtkWidget *) shell_view, e_folder_get_name (folder));
-
-	if (SUB_VERSION[0] == '\0')
-		window_title = g_strdup_printf (_("%s - Evolution %s"), folder_name, VERSION);
-	else
-		window_title = g_strdup_printf (_("%s - Evolution %s [%s]"), folder_name, VERSION, SUB_VERSION);
-
-	gtk_window_set_title (GTK_WINDOW (shell_view), window_title);
-	g_free (window_title);
-	g_free (folder_name);
-
-	update_folder_title_bar (shell_view, folder);
-
-	update_window_icon (shell_view, folder);
-
-	gtk_signal_handler_block_by_func (GTK_OBJECT (priv->storage_set_view),
-					  GTK_SIGNAL_FUNC (folder_selected_cb),
-					  shell_view);
-
-	if (path != NULL)
-		e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view), path);
-
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT (priv->storage_set_view),
-					    GTK_SIGNAL_FUNC (folder_selected_cb),
-					    shell_view);
-}
-
-/* This displays the specified page, doing the appropriate Bonobo activation/deactivation
-   magic to make sure things work nicely.  FIXME: Crappy way to solve the issue.  */
-static void
-set_current_notebook_page (EShellView *shell_view,
-			   int page_num)
-{
-	EShellViewPrivate *priv;
-	GtkNotebook *notebook;
-	GtkWidget *current;
-	BonoboControlFrame *control_frame;
-	int current_page;
-
-	priv = shell_view->priv;
-	notebook = GTK_NOTEBOOK (priv->notebook);
-
-	current_page = gtk_notebook_get_current_page (notebook);
-	if (current_page == page_num)
-		return;
-
-	if (current_page != -1 && current_page != 0) {
-		current = gtk_notebook_get_nth_page (notebook, current_page);
-		control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (current));
-
-		bonobo_control_frame_set_autoactivate (control_frame, FALSE);
-		bonobo_control_frame_control_deactivate (control_frame);
-	}
-
-	gtk_notebook_set_page (notebook, page_num);
-
-	if (page_num == -1 || page_num == 0)
-		return;
-
-	current = gtk_notebook_get_nth_page (notebook, page_num);
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (current));
-
-	bonobo_control_frame_set_autoactivate (control_frame, FALSE);
-	bonobo_control_frame_control_activate (control_frame);
-}
-
-static void
-setup_corba_interface (EShellView *shell_view,
-		       GtkWidget *control)
-{
-	EShellViewPrivate *priv;
-	BonoboControlFrame *control_frame;
-	EvolutionShellView *corba_interface;
-
-	g_return_if_fail (control != NULL);
-
-	priv = shell_view->priv;
-
-	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (control));
-	corba_interface = evolution_shell_view_new ();
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "set_message",
-					GTK_SIGNAL_FUNC (corba_interface_set_message_cb),
-					shell_view, GTK_OBJECT (shell_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "unset_message",
-					GTK_SIGNAL_FUNC (corba_interface_unset_message_cb),
-					shell_view, GTK_OBJECT (shell_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "change_current_view",
-					GTK_SIGNAL_FUNC (corba_interface_change_current_view_cb),
-					shell_view, GTK_OBJECT (shell_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (corba_interface), "set_title",
-					GTK_SIGNAL_FUNC (corba_interface_set_title),
-					shell_view, GTK_OBJECT (shell_view));
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control_frame),
-				     BONOBO_OBJECT (corba_interface));
-
-	bonobo_object_ref (BONOBO_OBJECT (corba_interface));
-	priv->corba_interface = corba_interface;
-}
-
-
-/* Socket destruction handling.  */
-
-static GtkWidget *
-find_socket (GtkContainer *container)
-{
-	GList *children, *tmp;
-
-	children = gtk_container_children (container);
-	while (children) {
-		if (BONOBO_IS_SOCKET (children->data))
-			return children->data;
-		else if (GTK_IS_CONTAINER (children->data)) {
-			GtkWidget *socket = find_socket (children->data);
-			if (socket)
-				return socket;
-		}
-		tmp = children->next;
-		g_list_free_1 (children);
-		children = tmp;
-	}
-	return NULL;
-}
-
-static void
-socket_destroy_cb (GtkWidget *socket_widget, gpointer data)
-{
-	EShellView *shell_view;
-	EShellViewPrivate *priv;
-	EFolder *folder;
-	GtkWidget *control;
-	const char *uri;
-	char *copy_of_uri;
-
-	shell_view = E_SHELL_VIEW (data);
-	priv = shell_view->priv;
-
-	uri = (const char *) gtk_object_get_data (GTK_OBJECT (socket_widget), "e_shell_view_folder_uri");
-
-	/* Strdup here as the string will be freed when the socket is destroyed.  */
-	copy_of_uri = g_strdup (uri);
-
-	control = g_hash_table_lookup (priv->uri_to_control, uri);
-	if (control == NULL) {
-		g_warning ("What?! Destroyed socket for non-existing URI?  -- %s", uri);
-		return;
-	}
-
-	priv->sockets = g_list_remove (priv->sockets, socket_widget);
-
-	gtk_widget_destroy (control);
-	g_hash_table_remove (priv->uri_to_control, uri);
-
-	folder = e_storage_set_get_folder (e_shell_get_storage_set (priv->shell),
-					   get_storage_set_path_from_uri (uri));
-
-	e_shell_view_display_uri (shell_view, NULL);
-
-	e_shell_component_maybe_crashed (priv->shell,
-					 uri,
-					 e_folder_get_type_string (folder),
-					 shell_view);
-
-	g_free (copy_of_uri);
-
-	e_shell_view_display_uri (shell_view, DEFAULT_URI);
-}
-
-
-static const char *
-get_type_for_storage (EShellView *shell_view,
-		      const char *name,
-		      const char **physical_uri_return)
-{
-	EShellViewPrivate *priv;
-	EStorageSet *storage_set;
-	EStorage *storage;
-
-	priv = shell_view->priv;
-
-	storage_set = e_shell_get_storage_set (priv->shell);
-	storage = e_storage_set_get_storage (storage_set, name);
-	if (!storage)
-		return NULL;
-
-	*physical_uri_return = e_storage_get_toplevel_node_uri (storage);
-
-	return e_storage_get_toplevel_node_type (storage);
-}
-
-static const char *
-get_type_for_folder (EShellView *shell_view,
-		     const char *path,
-		     const char **physical_uri_return)
-{
-	EShellViewPrivate *priv;
-	EStorageSet *storage_set;
-	EFolderTypeRegistry *folder_type_registry;
-	EFolder *folder;
-
-	priv = shell_view->priv;
-
-	storage_set = e_shell_get_storage_set (priv->shell);
-	folder = e_storage_set_get_folder (storage_set, path);
-	if (!folder)
-		return NULL;
-
-	*physical_uri_return = e_folder_get_physical_uri (folder);
-
-	folder_type_registry = e_shell_get_folder_type_registry (e_shell_view_get_shell (shell_view));
-
-	return e_folder_get_type_string (folder);
-}
-
-/* Create a new view for @uri with @control.  It assumes a view for @uri does not exist yet.  */
-static GtkWidget *
-get_control_for_uri (EShellView *shell_view,
-		     const char *uri)
-{
-	EShellViewPrivate *priv;
-	CORBA_Environment ev;
-	EvolutionShellComponentClient *handler_client;
-	EFolderTypeRegistry *folder_type_registry;
-	GNOME_Evolution_ShellComponent handler;
-	Bonobo_UIContainer container;
-	GtkWidget *control;
-	GtkWidget *socket;
-	Bonobo_Control corba_control;
-	const char *path;
-	const char *slash;
-	const char *physical_uri;
-	const char *folder_type;
-	int destroy_connection_id;
-
-	priv = shell_view->priv;
-
-	path = strchr (uri, ':');
-	if (path == NULL)
-		return NULL;
-
-	path++;
-	if (*path == '\0')
-		return NULL;
-
-	/* FIXME: This code needs to be made more robust.  */
-
-	slash = strchr (path + 1, G_DIR_SEPARATOR);
-	if (slash == NULL || slash[1] == '\0')
-		folder_type = get_type_for_storage (shell_view, path + 1, &physical_uri);
-	else
-		folder_type = get_type_for_folder (shell_view, path, &physical_uri);
-	if (!folder_type)
-		return NULL;
-
-	folder_type_registry = e_shell_get_folder_type_registry (e_shell_view_get_shell (shell_view));
-
-	handler_client = e_folder_type_registry_get_handler_for_type (folder_type_registry, folder_type);
-	if (handler_client == CORBA_OBJECT_NIL)
-		return NULL;
-
-	handler = bonobo_object_corba_objref (BONOBO_OBJECT (handler_client));
-
-	CORBA_exception_init (&ev);
-
-	corba_control = GNOME_Evolution_ShellComponent_createView (handler, physical_uri, folder_type, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (corba_control == CORBA_OBJECT_NIL)
-		return NULL;
-
-	container = bonobo_ui_component_get_container (priv->ui_component);
-	control = bonobo_widget_new_control_from_objref (corba_control, container);
-
-	socket = find_socket (GTK_CONTAINER (control));
-	destroy_connection_id = gtk_signal_connect (GTK_OBJECT (socket), "destroy",
-						    GTK_SIGNAL_FUNC (socket_destroy_cb),
-						    shell_view);
-	gtk_object_set_data (GTK_OBJECT (socket),
-			     "e_shell_view_destroy_connection_id",
-			     GINT_TO_POINTER (destroy_connection_id));
-	gtk_object_set_data_full (GTK_OBJECT (socket), "e_shell_view_folder_uri", g_strdup (uri), g_free);
-
-	priv->sockets = g_list_prepend (priv->sockets, socket);
-
-	setup_corba_interface (shell_view, control);
-
-	return control;
-}
-
-static gboolean
-show_existing_view (EShellView *shell_view,
-		    const char *uri,
-		    GtkWidget *control)
-{
-	EShellViewPrivate *priv;
-	int notebook_page;
-
-	priv = shell_view->priv;
-
-	notebook_page = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), control);
-	g_assert (notebook_page != -1);
-
-	/* A BonoboWidget can be a "zombie" in the sense that its actual
-	   control is dead; if it's zombie, we have to recreate it.  */
-	if (bonobo_widget_is_dead (BONOBO_WIDGET (control))) {
-		GtkWidget *parent;
-
-		parent = control->parent;
-
-		/* Out with the old.  */
-		gtk_container_remove (GTK_CONTAINER (parent), control);
-		g_hash_table_remove (priv->uri_to_control, uri);
-
-		/* In with the new.  */
-		control = get_control_for_uri (shell_view, uri);
-		if (control == NULL)
-			return FALSE;
-
-		gtk_container_add (GTK_CONTAINER (parent), control);
-		g_hash_table_insert (priv->uri_to_control, g_strdup (uri), control);
-
-		/* Show.  */
-		gtk_widget_show (control);
-	}
-
-	set_current_notebook_page (shell_view, notebook_page);
-
-	return TRUE;
-}
-
-static gboolean
-create_new_view_for_uri (EShellView *shell_view,
-			 const char *uri)
-{
-	GtkWidget *control;
-	EShellViewPrivate *priv;
-	int page_num;
-
-	priv = shell_view->priv;
-
-	control = get_control_for_uri (shell_view, uri);
-	if (control == NULL)
-		return FALSE;
-
-	gtk_widget_show (control);
-
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), control, NULL);
-
-	page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), control);
-	g_assert (page_num != -1);
-	set_current_notebook_page (shell_view, page_num);
-
-	g_hash_table_insert (priv->uri_to_control, g_strdup (uri), control);
-
-	return TRUE;
-}
-
-gboolean
-e_shell_view_display_uri (EShellView *shell_view,
-			  const char *uri)
-{
-	EShellViewPrivate *priv;
-	GtkWidget *control;
-	gboolean retval;
-
-	g_return_val_if_fail (shell_view != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), FALSE);
-
-	priv = shell_view->priv;
-
-	bonobo_window_freeze (BONOBO_WINDOW (shell_view));
-
-	if (uri == NULL) {
-		gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-		gtk_notebook_prepend_page (GTK_NOTEBOOK (priv->notebook), create_label_for_empty_page (), NULL);
-
-		set_current_notebook_page (shell_view, 0);
-
-		if (priv->uri != NULL) {
-			g_free (priv->uri);
-			priv->uri = NULL;
-		}
-
-		retval = TRUE;
-
-		goto end;
-	}
-
-	if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) != 0) {
-		retval = FALSE;
-		goto end;
-	}
-
-	control = g_hash_table_lookup (priv->uri_to_control, uri);
-	if (control != NULL) {
-		g_assert (GTK_IS_WIDGET (control));
-		show_existing_view (shell_view, uri, control);
-	} else if (! create_new_view_for_uri (shell_view, uri)) {
-		priv->delayed_selection = g_strdup (uri);
-		gtk_signal_connect_after (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), "new_folder",
-					  GTK_SIGNAL_FUNC (new_folder_cb), shell_view);
-		retval = FALSE;
-		goto end;
-	}
-
-	g_free (priv->uri);
-	priv->uri = g_strdup (uri);
-
-	retval = TRUE;
-
- end:
-	update_for_current_uri (shell_view);
-
-	bonobo_window_thaw (BONOBO_WINDOW (shell_view));
-
-	return retval;
-}
-
-
-void
-e_shell_view_set_shortcut_bar_mode (EShellView *shell_view,
-				    EShellViewSubwindowMode mode)
-{
-	EShellViewPrivate *priv;
-
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
-	g_return_if_fail (mode == E_SHELL_VIEW_SUBWINDOW_STICKY
-			  || mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	priv = shell_view->priv;
-
-	if (priv->shortcut_bar_mode == mode)
-		return;
-
-	if (mode == E_SHELL_VIEW_SUBWINDOW_STICKY) {
-		if (! GTK_WIDGET_VISIBLE (priv->shortcut_bar)) {
-			gtk_widget_show (priv->shortcut_bar);
-			e_paned_set_position (E_PANED (priv->hpaned), priv->hpaned_position);
-		}
-	} else {
-		if (GTK_WIDGET_VISIBLE (priv->shortcut_bar)) {
-			gtk_widget_hide (priv->shortcut_bar);
-			/* FIXME this is a private field!  */
-			priv->hpaned_position = E_PANED (priv->hpaned)->child1_size;
-			e_paned_set_position (E_PANED (priv->hpaned), 0);
-		}
-	}
-
-	priv->shortcut_bar_mode = mode;
-
-	gtk_signal_emit (GTK_OBJECT (shell_view), signals[SHORTCUT_BAR_MODE_CHANGED], mode);
-}
-
-/**
- * e_shell_view_set_folder_bar_mode:
- * @shell_view: 
- * @mode: 
- * 
- * Set the visualization mode for the folder bar's subwindow.
- **/
-void
-e_shell_view_set_folder_bar_mode (EShellView *shell_view,
-				  EShellViewSubwindowMode mode)
-{
-	EShellViewPrivate *priv;
-
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
-	g_return_if_fail (mode == E_SHELL_VIEW_SUBWINDOW_STICKY
-			  || mode == E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	priv = shell_view->priv;
-
-	if (priv->folder_bar_mode == mode)
-		return;
-
-	if (mode == E_SHELL_VIEW_SUBWINDOW_STICKY) {
-		if (! GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) {
-			gtk_widget_show (priv->storage_set_view_box);
-			e_paned_set_position (E_PANED (priv->view_hpaned), priv->view_hpaned_position);
-		}
-
-		e_title_bar_set_button_mode (E_TITLE_BAR (priv->storage_set_title_bar),
-					     E_TITLE_BAR_BUTTON_MODE_CLOSE);
-
-		e_shell_folder_title_bar_set_clickable (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar),
-							FALSE);
-	} else {
-		if (GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) {
-			gtk_widget_hide (priv->storage_set_view_box);
-			/* FIXME this is a private field!  */
-			priv->view_hpaned_position = E_PANED (priv->view_hpaned)->child1_size;
-			e_paned_set_position (E_PANED (priv->view_hpaned), 0);
-		}
-
-		e_title_bar_set_button_mode (E_TITLE_BAR (priv->storage_set_title_bar),
-					     E_TITLE_BAR_BUTTON_MODE_PIN);
-
-		e_shell_folder_title_bar_set_clickable (E_SHELL_FOLDER_TITLE_BAR (priv->view_title_bar),
-							TRUE);
-	}
-
-        priv->folder_bar_mode = mode;
-
-	gtk_signal_emit (GTK_OBJECT (shell_view), signals[FOLDER_BAR_MODE_CHANGED], mode);
-}
-
-EShellViewSubwindowMode
-e_shell_view_get_shortcut_bar_mode (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	return shell_view->priv->shortcut_bar_mode;
-}
-
-EShellViewSubwindowMode
-e_shell_view_get_folder_bar_mode (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), E_SHELL_VIEW_SUBWINDOW_HIDDEN);
-
-	return shell_view->priv->folder_bar_mode;
-}
-
-
-EShell *
-e_shell_view_get_shell (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	return shell_view->priv->shell;
-}
-
-BonoboUIComponent *
-e_shell_view_get_bonobo_ui_component (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	return shell_view->priv->ui_component;
-}
-
-GtkWidget *
-e_shell_view_get_appbar (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	return shell_view->priv->appbar;
-}
-
-const char *
-e_shell_view_get_current_uri (EShellView *shell_view)
-{
-	g_return_val_if_fail (shell_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	return shell_view->priv->uri;
-}
-
-static void
-save_shortcut_bar_icon_modes (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	EShortcutBar *shortcut_bar;
-	int num_groups;
-	int group;
-
-	priv = shell_view->priv;
-	shortcut_bar = E_SHORTCUT_BAR (priv->shortcut_bar);
-
-	num_groups = e_shortcut_model_get_num_groups (shortcut_bar->model);
-
-	for (group = 0; group < num_groups; group++) {
-		char *tmp;
-
-		tmp = g_strdup_printf ("ShortcutBarGroup%dIconMode", group);
-		gnome_config_set_int (tmp, e_shortcut_bar_get_view_type (shortcut_bar, group));
-		g_free (tmp);
-	}
-}
-
-static void
-load_shortcut_bar_icon_modes (EShellView *shell_view)
-{
-	EShellViewPrivate *priv;
-	EShortcutBar *shortcut_bar;
-	int num_groups;
-	int group;
-
-	priv = shell_view->priv;
-	shortcut_bar = E_SHORTCUT_BAR (priv->shortcut_bar);
-
-	num_groups = e_shortcut_model_get_num_groups (shortcut_bar->model);
-
-	for (group = 0; group < num_groups; group++) {
-		char *tmp;
-		int iconmode;
-
-		tmp = g_strdup_printf ("ShortcutBarGroup%dIconMode", group);
-		iconmode = gnome_config_get_int (tmp);
-		g_free (tmp);
-
-		e_shortcut_bar_set_view_type (shortcut_bar, group, iconmode);
-	}
-}
-
-
-/**
- * e_shell_view_save_settings:
- * @shell_view: 
- * @prefix: 
- * 
- * Save settings for @shell_view at the specified gnome config @prefix
- * 
- * Return value: TRUE if successful, FALSE if not.
- **/
-gboolean
-e_shell_view_save_settings (EShellView *shell_view,
-			    const char *prefix)
-{
-	EShellViewPrivate *priv;
-	const char *uri;
-
-	g_return_val_if_fail (shell_view != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), FALSE);
-	g_return_val_if_fail (prefix != NULL, FALSE);
-
-	priv = shell_view->priv;
-
-	gnome_config_push_prefix (prefix);
-
-	gnome_config_set_int ("FolderBarMode",      e_shell_view_get_folder_bar_mode (shell_view));
-	gnome_config_set_int ("ShortcutBarMode",    e_shell_view_get_shortcut_bar_mode (shell_view));
-	gnome_config_set_int ("HPanedPosition",     e_paned_get_position (E_PANED (priv->hpaned)));
-	gnome_config_set_int ("ViewHPanedPosition", e_paned_get_position (E_PANED (priv->view_hpaned)));
-
-	uri = e_shell_view_get_current_uri (shell_view);
-	if (uri != NULL)
-		gnome_config_set_string ("DisplayedURI", uri);
-	else
-		gnome_config_set_string ("DisplayedURI", DEFAULT_URI);
-
-	save_shortcut_bar_icon_modes (shell_view);
-
-	gnome_config_pop_prefix ();
-	
-	return TRUE;
-}
-
-/**
- * e_shell_view_load_settings:
- * @shell_view: 
- * @prefix: 
- * 
- * Load settings for @shell_view at the specified gnome config @prefix
- * 
- * Return value: 
- **/
-gboolean
-e_shell_view_load_settings (EShellView *shell_view,
-			    const char *prefix)
-{
-	EShellViewPrivate *priv;
-	int val;
-	char *stringval;
-
-	g_return_val_if_fail (shell_view != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), FALSE);
-	g_return_val_if_fail (prefix != NULL, FALSE);
-
-	priv = shell_view->priv;
-
-	gnome_config_push_prefix (prefix);
-
-	val = gnome_config_get_int ("FolderBarMode");
-	e_shell_view_set_folder_bar_mode (shell_view, val);
-
-	val = gnome_config_get_int ("ShortcutBarMode");
-	e_shell_view_set_shortcut_bar_mode (shell_view, val);
-
-	val = gnome_config_get_int ("HPanedPosition");
-	e_paned_set_position (E_PANED (priv->hpaned), val);
-
-	val = gnome_config_get_int ("ViewHPanedPosition");
-	e_paned_set_position (E_PANED (priv->view_hpaned), val);
-
-	stringval = gnome_config_get_string ("DisplayedURI");
-	if (! e_shell_view_display_uri (shell_view, stringval))
-		e_shell_view_display_uri (shell_view, DEFAULT_URI);
-	g_free (stringval);
-
-	load_shortcut_bar_icon_modes (shell_view);
-
-	gnome_config_pop_prefix ();
-	
-	return TRUE;
-}
-
-
-E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WINDOW)
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
deleted file mode 100644
index 2585c3aa68..0000000000
--- a/shell/e-shell-view.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-view.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SHELL_VIEW_H_
-#define _E_SHELL_VIEW_H_
-
-#include <bonobo/bonobo-win.h>
-
-#include "e-shell.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-#define E_TYPE_SHELL_VIEW			(e_shell_view_get_type ())
-#define E_SHELL_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
-#define E_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
-#define E_IS_SHELL_VIEW(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_VIEW))
-#define E_IS_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
-
-typedef struct _EShellView        EShellView;
-typedef struct _EShellViewPrivate EShellViewPrivate;
-typedef struct _EShellViewClass   EShellViewClass;
-
-enum _EShellViewSubwindowMode {
-	E_SHELL_VIEW_SUBWINDOW_HIDDEN,
-	E_SHELL_VIEW_SUBWINDOW_TRANSIENT,
-	E_SHELL_VIEW_SUBWINDOW_STICKY
-};
-typedef enum _EShellViewSubwindowMode EShellViewSubwindowMode;
-
-struct _EShellView {
-	BonoboWindow parent;
-
-	EShellViewPrivate *priv;
-};
-
-struct _EShellViewClass {
-	BonoboWindowClass parent_class;
-
-	/* Signals.  */
-	void (* shortcut_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode new_mode);
-	void (* folder_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode mode);
-};
-
-
-GtkType     e_shell_view_get_type   (void);
-EShellView *e_shell_view_construct  (EShellView *shell_view,
-				     EShell     *shell);
-EShellView *e_shell_view_new        (EShell     *shell);
-
-const GNOME_Evolution_ShellView  e_shell_view_get_corba_interface  (EShellView *view);
-
-gboolean  e_shell_view_display_uri  (EShellView *shell_view,
-				     const char *uri);
-
-void                     e_shell_view_set_shortcut_bar_mode  (EShellView              *shell_view,
-							      EShellViewSubwindowMode  mode);
-EShellViewSubwindowMode  e_shell_view_get_shortcut_bar_mode  (EShellView              *shell_view);
-
-void                     e_shell_view_set_folder_bar_mode  (EShellView              *shell_view,
-							    EShellViewSubwindowMode  mode);
-EShellViewSubwindowMode  e_shell_view_get_folder_bar_mode  (EShellView              *shell_view);
-
-EShell            *e_shell_view_get_shell                (EShellView *shell_view);
-BonoboUIComponent *e_shell_view_get_bonobo_ui_component  (EShellView *shell_view);
-GtkWidget         *e_shell_view_get_appbar               (EShellView *shell_view);
-const char        *e_shell_view_get_current_uri          (EShellView *shell_view);
-
-gboolean  e_shell_view_save_settings  (EShellView *shell_view,
-				       const char *prefix);
-gboolean  e_shell_view_load_settings  (EShellView *shell_view,
-				       const char *prefix);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SHELL_VIEW_H_ */
diff --git a/shell/e-shell.c b/shell/e-shell.c
deleted file mode 100644
index 6656e2f79b..0000000000
--- a/shell/e-shell.c
+++ /dev/null
@@ -1,1249 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "Evolution.h"
-
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/util/e-util.h>
-
-#include "e-component-registry.h"
-#include "e-corba-storage-registry.h"
-#include "e-folder-type-registry.h"
-#include "e-local-storage.h"
-#include "e-shell-constants.h"
-#include "e-shell-folder-selection-dialog.h"
-#include "e-shell-view.h"
-#include "e-shortcuts.h"
-#include "e-storage-set.h"
-#include "e-splash.h"
-
-#include "evolution-storage-set-view-factory.h"
-
-#include "e-shell.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EShellPrivate {
-	char *local_directory;
-
-	GList *views;
-
-	EStorageSet *storage_set;
-	ELocalStorage *local_storage;
-
-	EShortcuts *shortcuts;
-	EFolderTypeRegistry *folder_type_registry;
-
-	EComponentRegistry *component_registry;
-
-	ECorbaStorageRegistry *corba_storage_registry;
-
-	/* Names for the types of the folders that have maybe crashed.  */
-	GList *crash_type_names; /* char * */
-};
-
-
-/* Constants.  */
-
-/* FIXME: We need a component repository instead.  */
-
-#define SHORTCUTS_FILE_NAME     "shortcuts.xml"
-#define LOCAL_STORAGE_DIRECTORY "local"
-
-
-enum {
-	NO_VIEWS_LEFT,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Callback for the folder selection dialog.  */
-
-static void
-folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog,
-				      void *data)
-{
-	GNOME_Evolution_FolderSelectionListener listener;
-	CORBA_Environment ev;
-
-	listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener");
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_FolderSelectionListener_notifyCanceled (listener, &ev);
-
-	CORBA_exception_free (&ev);
-
-	gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog));
-}
-
-static void
-folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_selection_dialog,
-					    const char *path,
-					    void *data)
-{
-	CORBA_Environment ev;
-	EShell *shell;
-	GNOME_Evolution_FolderSelectionListener listener;
-	EStorageSet *storage_set;
-	EFolder *folder;
-	char *uri;
-	const char *physical_uri;
-
-	shell = E_SHELL (data);
-	listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener");
-
-	CORBA_exception_init (&ev);
-
-	storage_set = e_shell_get_storage_set (shell);
-	folder = e_storage_set_get_folder (storage_set, path);
-
-	uri = g_strconcat (E_SHELL_URI_PREFIX, path, NULL);
-
-	if (folder == NULL)
-		physical_uri = "";
-	else
-		physical_uri = e_folder_get_physical_uri (folder);
-
-	GNOME_Evolution_FolderSelectionListener_notifySelected (listener, uri, physical_uri, &ev);
-	g_free (uri);
-
-	CORBA_exception_free (&ev);
-
-	gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog));
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Shell__vepv shell_vepv;
-
-static POA_GNOME_Evolution_Shell *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Shell *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Shell *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &shell_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Shell__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static GNOME_Evolution_ShellComponent
-impl_Shell_getComponentByType (PortableServer_Servant servant,
-			       const CORBA_char *type,
-			       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponentClient *handler;
-	EFolderTypeRegistry *folder_type_registry;
-	GNOME_Evolution_ShellComponent corba_component;
-	EShell *shell;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-	folder_type_registry = shell->priv->folder_type_registry;
-
-	handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, type);
-
-	if (handler == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (handler));
-	Bonobo_Unknown_ref (corba_component, ev);
-
-	return CORBA_Object_duplicate (corba_component, ev);
-}
-
-static GNOME_Evolution_ShellView
-impl_Shell_createNewView (PortableServer_Servant servant,
-			  const CORBA_char *uri,
-			  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EShell *shell;
-	EShellView *shell_view;
-	GNOME_Evolution_ShellView shell_view_interface;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-
-	shell_view = e_shell_new_view (shell, uri);
-	shell_view_interface = e_shell_view_get_corba_interface (shell_view);
-
-	Bonobo_Unknown_ref (shell_view_interface, ev);
-	return CORBA_Object_duplicate ((CORBA_Object) shell_view_interface, ev);
-}
-
-static void
-corba_listener_destroy_notify (void *data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_FolderSelectionListener listener_interface;
-
-	listener_interface = (GNOME_Evolution_FolderSelectionListener) data;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener_interface, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-impl_Shell_selectUserFolder (PortableServer_Servant servant,
-			     const GNOME_Evolution_FolderSelectionListener listener,
-			     const CORBA_char *title,
-			     const CORBA_char *default_folder,
-			     const GNOME_Evolution_Shell_FolderTypeNameList *corba_allowed_type_names,
-			     CORBA_Environment *ev)
-{
-	GtkWidget *folder_selection_dialog;
-	BonoboObject *bonobo_object;
-	GNOME_Evolution_FolderSelectionListener listener_duplicate;
-	EShell *shell;
-	const char **allowed_type_names;
-	int i;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-
-	allowed_type_names = alloca (sizeof (allowed_type_names[0]) * (corba_allowed_type_names->_length + 1));
-	for (i = 0; i < corba_allowed_type_names->_length; i++)
-		allowed_type_names[i] = corba_allowed_type_names->_buffer[i];
-	allowed_type_names[corba_allowed_type_names->_length] = NULL;
-
-	/* CORBA doesn't allow you to pass a NULL pointer. */
-	if (!*default_folder)
-		default_folder = NULL;
-	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, title, default_folder, allowed_type_names);
-
-	listener_duplicate = CORBA_Object_duplicate (listener, ev);
-	gtk_object_set_data_full (GTK_OBJECT (folder_selection_dialog), "corba_listener",
-				  listener_duplicate, corba_listener_destroy_notify);
-
-	gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "folder_selected",
-			    GTK_SIGNAL_FUNC (folder_selection_dialog_folder_selected_cb), shell);
-	gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "cancelled",
-			    GTK_SIGNAL_FUNC (folder_selection_dialog_cancelled_cb), shell);
-
-	gtk_widget_show (folder_selection_dialog);
-}
-
-static GNOME_Evolution_LocalStorage
-impl_Shell_getLocalStorage (PortableServer_Servant servant,
-			    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	GNOME_Evolution_LocalStorage local_storage_interface;
-	GNOME_Evolution_LocalStorage copy_of_local_storage_interface;
-	EShell *shell;
-	EShellPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-	priv = shell->priv;
-
-	local_storage_interface = e_local_storage_get_corba_interface (priv->local_storage);
-
-	copy_of_local_storage_interface = CORBA_Object_duplicate (local_storage_interface, ev);
-	Bonobo_Unknown_ref (copy_of_local_storage_interface, ev);
-
-	return copy_of_local_storage_interface;
-}
-
-static Bonobo_Control
-impl_Shell_createStorageSetView (PortableServer_Servant servant,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EShell *shell;
-	BonoboControl *control;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-
-	control = evolution_storage_set_view_factory_new_view (shell);
-
-	return bonobo_object_corba_objref (BONOBO_OBJECT (control));
-}
-
-
-/* OAF registration.  */
-
-static OAF_RegistrationResult
-register_shell (EShell *shell,
-		const char *iid)
-{
-	CORBA_Object corba_object;
-
-	/* FIXME: Multi-display stuff.  */
-
-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
-	return oaf_active_server_register (iid, corba_object);
-}
-
-
-/* Initialization of the storages.  */
-
-static gboolean
-setup_corba_storages (EShell *shell)
-{
-	EShellPrivate *priv;
-	ECorbaStorageRegistry *corba_storage_registry;
-
-	priv = shell->priv;
-
-	g_assert (priv->storage_set != NULL);
-	corba_storage_registry = e_corba_storage_registry_new (priv->storage_set);
-
-	if (corba_storage_registry == NULL)
-		return FALSE;
-
-	bonobo_object_add_interface (BONOBO_OBJECT (shell), BONOBO_OBJECT (corba_storage_registry));
-
-	/* Notice that `bonobo_object_add_interface()' aggregates the two object's
-           reference counts, so we need an extra ref here if we want to keep a separate
-           pointer to the storage interface.  */
-	bonobo_object_ref (BONOBO_OBJECT (corba_storage_registry));
-	priv->corba_storage_registry = corba_storage_registry;
-
-	return TRUE;
-}
-
-static gboolean
-setup_local_storage (EShell *shell)
-{
-	EStorage *local_storage;
-	EShellPrivate *priv;
-	gchar *local_storage_path;
-
-	priv = shell->priv;
-
-	g_assert (priv->folder_type_registry != NULL);
-	g_assert (priv->local_storage == NULL);
-
-	local_storage_path = g_concat_dir_and_file (priv->local_directory, LOCAL_STORAGE_DIRECTORY);
-	local_storage = e_local_storage_open (priv->folder_type_registry, local_storage_path);
-	if (local_storage == NULL) {
-		g_warning (_("Cannot set up local storage -- %s"), local_storage_path);
-		g_free (local_storage_path);
-		return FALSE;
-	}
-	g_free (local_storage_path);
-
-	e_storage_set_add_storage (priv->storage_set, local_storage);
-	priv->local_storage = E_LOCAL_STORAGE (local_storage);
-
-	return TRUE;
-}
-
-
-/* Initialization of the components.  */
-
-static char *
-get_icon_path_for_component_info (const OAF_ServerInfo *info)
-{
-	OAF_Property *property;
-	const char *shell_component_icon_value;
-
-	/* FIXME: liboaf is not const-safe.  */
-	property = oaf_server_info_prop_find ((OAF_ServerInfo *) info,
-					      "evolution:shell-component-icon");
-
-	if (property == NULL || property->v._d != OAF_P_STRING)
-		return gnome_pixmap_file ("gnome-question.png");
-
-	shell_component_icon_value = property->v._u.value_string;
-
-	if (g_path_is_absolute (shell_component_icon_value))
-		return g_strdup (shell_component_icon_value);
-
-	else
-		return g_concat_dir_and_file (EVOLUTION_IMAGES, shell_component_icon_value);
-}
-
-static void
-setup_components (EShell *shell,
-		  ESplash *splash)
-{
-	EShellPrivate *priv;
-	OAF_ServerInfoList *info_list;
-	CORBA_Environment ev;
-	int i;
-
-	CORBA_exception_init (&ev);
-
-	priv = shell->priv;
-	priv->component_registry = e_component_registry_new (shell);
-
-	info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/ShellComponent:1.0')", NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_error ("Eeek!  Cannot perform OAF query for Evolution components.");
-
-	for (i = 0; i < info_list->_length; i++) {
-		const OAF_ServerInfo *info;
-		GdkPixbuf *icon_pixbuf;
-		char *icon_path;
-
-		info = info_list->_buffer + i;
-
-		icon_path = get_icon_path_for_component_info (info);
-
-		icon_pixbuf = gdk_pixbuf_new_from_file (icon_path);
-
-		if (splash != NULL)
-			e_splash_add_icon (splash, icon_pixbuf);
-
-		gdk_pixbuf_unref (icon_pixbuf);
-
-		g_free (icon_path);
-	}
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	for (i = 0; i < info_list->_length; i++) {
-		const OAF_ServerInfo *info;
-
-		info = info_list->_buffer + i;
-
-		if (! e_component_registry_register_component (priv->component_registry, info->iid))
-			g_warning ("Cannot activate Evolution component -- %s", info->iid);
-		else
-			g_print ("Evolution component activated successfully -- %s\n", info->iid);
-
-		if (splash != NULL)
-			e_splash_set_icon_highlight (splash, i, TRUE);
-
-		while (gtk_events_pending ())
-			gtk_main_iteration ();
-	}
-
-	if (info_list->_length == 0)
-		g_warning ("No Evolution components installed.");
-
-	CORBA_free (info_list);
-
-	CORBA_exception_free (&ev);
-}
-
-/* FIXME what if anything fails here?  */
-static void
-set_owner_on_components (EShell *shell)
-{
-	GNOME_Evolution_Shell corba_shell;
-	EShellPrivate *priv;
-	const char *local_directory;
-	GList *id_list;
-	GList *p;
-
-	priv = shell->priv;
-	local_directory = e_shell_get_local_directory (shell);
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
-
-	id_list = e_component_registry_get_id_list (priv->component_registry);
-	for (p = id_list; p != NULL; p = p->next) {
-		EvolutionShellComponentClient *component_client;
-		const char *id;
-
-		id = (const char *) p->data;
-		component_client = e_component_registry_get_component_by_id (priv->component_registry, id);
-
-		evolution_shell_component_client_set_owner (component_client, corba_shell, local_directory);
-	}
-
-	e_free_string_list (id_list);
-}
-
-
-/* EShellView destruction callback.  */
-
-static int
-view_deleted_cb (GtkObject *object,
-		 GdkEvent *ev,
-		 gpointer data)
-{
-	EShell *shell;
-
-	g_assert (E_IS_SHELL_VIEW (object));
-
-	shell = E_SHELL (data);
-	e_shell_save_settings (shell);
-
-	/* Destroy it */
-	return FALSE;
-}
-
-static void
-view_destroy_cb (GtkObject *object,
-		 gpointer data)
-{
-	EShell *shell;
-	int nviews;
-
-	g_assert (E_IS_SHELL_VIEW (object));
-
-	shell = E_SHELL (data);
-
-	nviews = g_list_length (shell->priv->views);
-
-	/* If this is our last view, save settings now because in the
-	   callback for no_views_left shell->priv->views will be NULL
-	   and settings won't be saved because of that */
-	if (nviews - 1 == 0)
-		e_shell_save_settings (shell);
-
-	shell->priv->views = g_list_remove (shell->priv->views, object);
-
-	if (shell->priv->views == NULL) {
-		/* FIXME: This looks like a Bonobo bug to me.  */
-		bonobo_object_ref (BONOBO_OBJECT (shell));
-		gtk_signal_emit (GTK_OBJECT (shell), signals [NO_VIEWS_LEFT]);
-		bonobo_object_unref (BONOBO_OBJECT (shell));
-	}
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EShell *shell;
-	EShellPrivate *priv;
-	GList *p;
-
-	shell = E_SHELL (object);
-	priv = shell->priv;
-
-	g_free (priv->local_directory);
-
-	if (priv->storage_set != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->storage_set));
-
-	if (priv->local_storage != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->local_storage));
-
-	if (priv->shortcuts != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->shortcuts));
-
-	if (priv->folder_type_registry != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
-
-	if (priv->component_registry != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->component_registry));
-
-	for (p = priv->views; p != NULL; p = p->next) {
-		EShellView *view;
-
-		view = E_SHELL_VIEW (p->data);
-
-		gtk_signal_disconnect_by_func (
-			GTK_OBJECT (view),
-			GTK_SIGNAL_FUNC (view_destroy_cb), shell);
-		gtk_signal_disconnect_by_func (GTK_OBJECT (view),
-					       GTK_SIGNAL_FUNC (view_deleted_cb),
-					       shell);
-
-		gtk_object_destroy (GTK_OBJECT (view));
-	}
-
-	g_list_free (priv->views);
-
-	if (priv->corba_storage_registry != NULL)
-		bonobo_object_unref (BONOBO_OBJECT (priv->corba_storage_registry));
-
-	e_free_string_list (priv->crash_type_names);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Initialization.  */
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Shell__vepv *vepv;
-	POA_GNOME_Evolution_Shell__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Shell__epv, 1);
-	epv->getComponentByType   = impl_Shell_getComponentByType;
-	epv->createNewView        = impl_Shell_createNewView;
-	epv->selectUserFolder     = impl_Shell_selectUserFolder;
-	epv->getLocalStorage      = impl_Shell_getLocalStorage;
-	epv->createStorageSetView = impl_Shell_createStorageSetView;
-
-	vepv = &shell_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Shell_epv = epv;
-}
-
-static void
-class_init (EShellClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	signals[NO_VIEWS_LEFT] =
-		gtk_signal_new ("no_views_left",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EShellClass, no_views_left),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EShell *shell)
-{
-	EShellPrivate *priv;
-
-	priv = g_new (EShellPrivate, 1);
-
-	priv->views = NULL;
-
-	priv->local_directory        = NULL;
-	priv->storage_set            = NULL;
-	priv->local_storage          = NULL;
-	priv->shortcuts              = NULL;
-	priv->component_registry     = NULL;
-	priv->folder_type_registry   = NULL;
-	priv->corba_storage_registry = NULL;
-	priv->crash_type_names       = NULL;
-
-	shell->priv = priv;
-}
-
-
-/**
- * e_shell_construct:
- * @shell: An EShell object to construct
- * @corba_object: A CORBA Object implementing the Evolution::Shell interface
- * @iid: OAFIID for registering the shell into the name server
- * @local_directory: Local directory for storing local information and folders
- * @show_splash: Whether to display a splash screen.
- * 
- * Construct @shell so that it uses the specified @local_directory and
- * @corba_object.
- *
- * Return value: %FALSE if the shell cannot be registered; %TRUE otherwise.
- **/
-gboolean
-e_shell_construct (EShell *shell,
-		   GNOME_Evolution_Shell corba_object,
-		   const char *iid,
-		   const char *local_directory,
-		   gboolean show_splash)
-{
-	GtkWidget *splash;
-	EShellPrivate *priv;
-	gchar *shortcut_path;
-
-	g_return_val_if_fail (shell != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-	g_return_val_if_fail (corba_object != CORBA_OBJECT_NIL, FALSE);
-	g_return_val_if_fail (local_directory != NULL, FALSE);
-	g_return_val_if_fail (g_path_is_absolute (local_directory), FALSE);
-
-	bonobo_object_construct (BONOBO_OBJECT (shell), corba_object);
-
-	if (register_shell (shell, iid) != OAF_REG_SUCCESS)
-		return FALSE;
-
-	if (! show_splash) {
-		splash = NULL;
-	} else {
-		splash = e_splash_new ();
-		gtk_widget_show (splash);
-
-		/* Keep our own reference */
-		gtk_object_ref (GTK_OBJECT (splash));
-	}
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	priv = shell->priv;
-
-	priv->local_directory      = g_strdup (local_directory);
-	priv->folder_type_registry = e_folder_type_registry_new ();
-	priv->storage_set          = e_storage_set_new (shell->priv->folder_type_registry);
-
-	gtk_object_ref (GTK_OBJECT (priv->folder_type_registry));
-	gtk_object_ref (GTK_OBJECT (priv->storage_set));
-
-	/* CORBA storages must be set up before the components, because otherwise components
-           cannot register their own storages.  */
-	if (! setup_corba_storages (shell))
-		return FALSE;
-
-	if (splash != NULL)
-		setup_components (shell, E_SPLASH (splash));
-	else
-		setup_components (shell, NULL);
-
-	/* The local storage depends on the component registry.  */
-	setup_local_storage (shell);
-
-	/* Now that we have a local storage, we can tell the components we are here.  */
-	set_owner_on_components (shell);
-
-	shortcut_path = g_concat_dir_and_file (local_directory, "shortcuts.xml");
-	priv->shortcuts = e_shortcuts_new (priv->storage_set,
-					   priv->folder_type_registry,
-					   shortcut_path);
-
-	if (priv->shortcuts == NULL)
-		g_warning ("Cannot load shortcuts -- %s", shortcut_path);
-	else
-		gtk_object_ref (GTK_OBJECT (priv->shortcuts));
-
-	g_free (shortcut_path);
-
-	sleep (2);
-	gtk_widget_unref (splash);
-	gtk_widget_destroy (splash);
-
-	return TRUE;
-}
-
-/**
- * e_shell_new:
- * @local_directory: Local directory for storing local information and folders.
- * @show_splash: Whether to display a splash screen.
- * 
- * Create a new EShell.
- * 
- * Return value: 
- **/
-EShell *
-e_shell_new (const char *local_directory,
-	     gboolean show_splash)
-{
-	EShell *new;
-	EShellPrivate *priv;
-	GNOME_Evolution_Shell corba_object;
-	POA_GNOME_Evolution_Shell *servant;
-
-	g_return_val_if_fail (local_directory != NULL, NULL);
-	g_return_val_if_fail (*local_directory != '\0', NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	new = gtk_type_new (e_shell_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
-	if (! e_shell_construct (new,
-				 corba_object, E_SHELL_OAFIID,
-				 local_directory, show_splash)) {
-		bonobo_object_unref (BONOBO_OBJECT (new));
-		return NULL;
-	}
-
-	priv = new->priv;
-
-	if (priv->shortcuts == NULL || priv->storage_set == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (new));
-		return NULL;
-	}
-
-	return new;
-}
-
-
-/**
- * e_shell_new_view:
- * @shell: The shell for which to create a new view.
- * @uri: URI for the new view.
- * 
- * Create a new view for @uri.
- * 
- * Return value: The new view.
- **/
-EShellView *
-e_shell_new_view (EShell *shell,
-		  const char *uri)
-{
-	EShellView *view;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	view = e_shell_view_new (shell);
-
-	gtk_widget_show (GTK_WIDGET (view));
-	gtk_signal_connect (GTK_OBJECT (view), "delete-event",
-			    GTK_SIGNAL_FUNC (view_deleted_cb), shell);
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroy_cb), shell);
-
-	if (uri != NULL)
-		e_shell_view_display_uri (E_SHELL_VIEW (view), uri);
-
-	shell->priv->views = g_list_prepend (shell->priv->views, view);
-
-	return view;
-}
-
-
-/**
- * e_shell_get_local_directory:
- * @shell: An EShell object.
- * 
- * Get the local directory associated with @shell.
- * 
- * Return value: A pointer to the path of the local directory.
- **/
-const char *
-e_shell_get_local_directory (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->local_directory;
-}
-
-/**
- * e_shell_get_shortcuts:
- * @shell: An EShell object.
- * 
- * Get the shortcuts associated to @shell.
- * 
- * Return value: A pointer to the EShortcuts associated to @shell.
- **/
-EShortcuts *
-e_shell_get_shortcuts (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->shortcuts;
-}
-
-/**
- * e_shell_get_storage_set:
- * @shell: An EShell object.
- * 
- * Get the storage set associated to @shell.
- * 
- * Return value: A pointer to the EStorageSet associated to @shell.
- **/
-EStorageSet *
-e_shell_get_storage_set (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->storage_set;
-}
-
-/**
- * e_shell_get_folder_type_registry:
- * @shell: An EShell object.
- * 
- * Get the folder type registry associated to @shell.
- * 
- * Return value: A pointer to the EFolderTypeRegistry associated to @shell.
- **/
-EFolderTypeRegistry *
-e_shell_get_folder_type_registry (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->folder_type_registry;
-}
-
-/**
- * e_shell_get_local_storage:
- * @shell: An EShell object.
- *
- * Get the local storage associated to @shell.
- *
- * Return value: A pointer to the ELocalStorage associated to @shell.
- **/
-ELocalStorage *
-e_shell_get_local_storage (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->local_storage;
-}
-
-
-static gboolean
-save_settings_for_views (EShell *shell)
-{
-	EShellPrivate *priv;
-	GList *p;
-	gboolean retval;
-	char *prefix;
-	int i;
-
-	priv = shell->priv;
-	retval = TRUE;
-
-	for (p = priv->views, i = 0; p != NULL; p = p->next, i++) {
-		EShellView *view;
-
-		view = E_SHELL_VIEW (p->data);
-
-		prefix = g_strdup_printf ("=%s/config/Shell=/Views/%d/",
-					  priv->local_directory, i);
-
-		if (! e_shell_view_save_settings (view, prefix)) {
-			g_warning ("Cannot save settings for view -- %d", i);
-			retval = FALSE;
-		}
-
-		g_free (prefix);
-	}
-
-	prefix = g_strdup_printf ("=%s/config/Shell=/Views/NumberOfViews",
-				  priv->local_directory);
-	gnome_config_set_int (prefix, g_list_length (priv->views));
-	g_free (prefix);
-	
-	gnome_config_sync ();
-
-	return TRUE;
-}
-
-static gboolean
-save_settings_for_component (EShell *shell,
-			     const char *id,
-			     EvolutionShellComponentClient *client)
-{
-	Bonobo_Unknown unknown_interface;
-	GNOME_Evolution_Session session_interface;
-	CORBA_Environment ev;
-	char *prefix;
-	gboolean retval;
-
-	unknown_interface = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	g_assert (unknown_interface != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	session_interface = Bonobo_Unknown_queryInterface (unknown_interface, "IDL:GNOME/Evolution/Session:1.0", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || CORBA_Object_is_nil (session_interface, &ev)) {
-		CORBA_exception_free (&ev);
-		return TRUE;
-	}
-
-	prefix = g_strconcat ("/apps/Evolution/Shell/Components/", id, NULL);
-	GNOME_Evolution_Session_saveConfiguration (session_interface, prefix, &ev);
-
-	if (ev._major == CORBA_NO_EXCEPTION)
-		retval = TRUE;
-	else
-		retval = FALSE;
-
-	g_free (prefix);
-
-	CORBA_exception_free (&ev);
-
-	return retval;
-}
-
-static gboolean
-save_settings_for_components (EShell *shell)
-{
-	EShellPrivate *priv;
-	GList *component_ids;
-	GList *p;
-	gboolean retval;
-
-	priv = shell->priv;
-
-	g_assert (priv->component_registry);
-	component_ids = e_component_registry_get_id_list (priv->component_registry);
-
-	retval = TRUE;
-	for (p = component_ids; p != NULL; p = p->next) {
-		EvolutionShellComponentClient *client;
-		const char *id;
-
-		id = p->data;
-		client = e_component_registry_get_component_by_id (priv->component_registry, id);
-
-		if (! save_settings_for_component (shell, id, client))
-			retval = FALSE;
-	}
-
-	e_free_string_list (component_ids);
-
-	return retval;
-}
-
-/**
- * e_shell_save_settings:
- * @shell: 
- * 
- * Save the settings for this shell.
- * 
- * Return value: %TRUE if it worked, %FALSE otherwise.  Even if %FALSE is
- * returned, it is possible that at least part of the settings for the views
- * have been saved.
- **/
-gboolean
-e_shell_save_settings (EShell *shell)
-{
-	gboolean views_saved;
-	gboolean components_saved;
-
-	g_return_val_if_fail (shell != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-
-	views_saved      = save_settings_for_views (shell);
-	components_saved = save_settings_for_components (shell);
-
-	return views_saved && components_saved;
-}
-
-/**
- * e_shell_restore_from_settings:
- * @shell: An EShell object.
- * 
- * Restore the existing views from the saved configuration.  The shell must
- * have no views for this to work.
- * 
- * Return value: %FALSE if the shell has some open views or there is no saved
- * configuration.  %TRUE if the configuration could be restored successfully.
- **/
-gboolean
-e_shell_restore_from_settings (EShell *shell)
-{
-	EShellPrivate *priv;
-	gboolean retval;
-	char *prefix;
-	int num_views;
-	int i;
-
-	g_return_val_if_fail (shell != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-	g_return_val_if_fail (shell->priv->views == NULL, FALSE);
-
-	priv = shell->priv;
-
-	prefix = g_strdup_printf ("=%s/config/Shell=/Views/NumberOfViews",
-				  priv->local_directory);
-	num_views = gnome_config_get_int (prefix);
-	g_free (prefix);
-
-	if (num_views == 0)
-		return FALSE;
-	
-	retval = TRUE;
-
-	for (i = 0; i < num_views; i++) {
-		EShellView *view;
-
-		prefix = g_strdup_printf ("=%s/config/Shell=/Views/%d/",
-					  priv->local_directory, i);
-
-		/* FIXME restore the URI here.  There should be an
-                   e_shell_view_new_from_configuration() thingie.  */
-		view = e_shell_new_view (shell, NULL);
-
-		if (! e_shell_view_load_settings (view, prefix))
-			retval = FALSE;
-
-		g_free (prefix);
-	}
-
-	return retval;
-}
-
-/**
- * e_shell_quit:
- * @shell: An EShell.
- * 
- * Make @shell quit.  This will close all the associated views and destroy the
- * object.
- **/
-void
-e_shell_quit (EShell *shell)
-{
-	EShellPrivate *priv;
-	GList *p;
-
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	if (shell->priv->views)
-		e_shell_save_settings (shell); 
-
-	priv = shell->priv;
-
-	for (p = priv->views; p != NULL; p = p->next) {
-		EShellView *shell_view;
-
-		shell_view = E_SHELL_VIEW (p->data);
-		gtk_signal_disconnect_by_func (
-			GTK_OBJECT (shell_view),
-			GTK_SIGNAL_FUNC (view_destroy_cb), shell);
-		gtk_object_destroy (GTK_OBJECT (shell_view));
-	}
-
-	g_list_free (priv->views);
-	priv->views = NULL;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->corba_storage_registry));
-
-	priv->corba_storage_registry = NULL;
-
-	e_storage_set_remove_all_storages (priv->storage_set);
-
-	/*
-	 *  Ok, so you thought the GUI components lifecycle was coupled to
-	 * the Shell's, in fact this is not the case, they are unref'd
-	 * here, and NULL'd to avoid shell destruction killing them again.
-	 * So; the shell can be destroyed either remotely or localy.
-	 */
-
-	gtk_object_unref (GTK_OBJECT (priv->storage_set));
-	gtk_object_unref (GTK_OBJECT (priv->shortcuts));
-	gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
-	gtk_object_unref (GTK_OBJECT (priv->component_registry));
-
-	priv->storage_set          = NULL;
-	priv->shortcuts            = NULL;
-	priv->folder_type_registry = NULL;
-	priv->component_registry   = NULL;
-
-	bonobo_object_unref (BONOBO_OBJECT (shell));
-}
-
-
-/**
- * e_shell_component_maybe_crashed:
- * @shell: A pointer to an EShell object
- * @uri: URI that caused the crash
- * @type_name: The type of the folder that caused the crash
- * @shell_view: Pointer to the EShellView over which we want the modal dialog
- * to appear.
- * 
- * Report that a maybe crash happened when trying to display a folder of type
- * @type_name.  The shell will pop up a crash dialog whose parent will be the
- * @shell_view.
- **/
-void
-e_shell_component_maybe_crashed   (EShell *shell,
-				   const char *uri,
-				   const char *type_name,
-				   EShellView *shell_view)
-{
-	EShellPrivate *priv;
-	GtkWindow *parent_window;
-	GList *p;
-
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (type_name != NULL);
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
-
-	priv = shell->priv;
-
-	/* See if that type has caused a crash already.  */
-
-	for (p = priv->crash_type_names; p != NULL; p = p->next) {
-		const char *crash_type_name;
-
-		crash_type_name = (const char *) p->data;
-		if (strcmp (type_name, crash_type_name) == 0) {
-			/* This type caused a crash already.  */
-			return;
-		}
-	}
-
-	/* New crash.  */
-
-	priv->crash_type_names = g_list_prepend (priv->crash_type_names, g_strdup (type_name));
-
-	if (shell_view == NULL)
-		parent_window = NULL;
-	else
-		parent_window = GTK_WINDOW (shell_view);
-
-	e_notice (parent_window, GNOME_MESSAGE_BOX_ERROR,
-		  _("Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-		    "This probably means that the %s component has crashed."),
-		  uri, type_name);
-
-	if (shell_view)
-		bonobo_window_deregister_dead_components (BONOBO_WINDOW (shell_view));
-
-	/* FIXME: we should probably re-start the component here */
-}
-
-
-E_MAKE_TYPE (e_shell, "EShell", EShell, class_init, init, PARENT_TYPE)
diff --git a/shell/e-shell.h b/shell/e-shell.h
deleted file mode 100644
index 2237f7458a..0000000000
--- a/shell/e-shell.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SHELL_H_
-#define _E_SHELL_H_
-
-#include <bonobo/bonobo-object.h>
-
-#include <liboaf/liboaf.h>	/* For the registration stuff.  */
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct _EShell        EShell;
-typedef struct _EShellPrivate EShellPrivate;
-typedef struct _EShellClass   EShellClass;
-
-#include "Evolution.h"
-#include "e-shortcuts.h"
-#include "e-shell-view.h"
-#include "e-local-storage.h"
-
-
-#define E_TYPE_SHELL			(e_shell_get_type ())
-#define E_SHELL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHELL, EShell))
-#define E_SHELL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
-#define E_IS_SHELL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHELL))
-#define E_IS_SHELL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
-
-
-struct _EShell {
-	BonoboObject parent;
-
-	EShellPrivate *priv;
-};
-
-struct _EShellClass {
-	BonoboObjectClass parent_class;
-
-	void (* no_views_left) (EShell *shell);
-};
-
-
-/* ID for registering the shell in the OAF name service.  */
-#define E_SHELL_OAFIID  "OAFIID:GNOME_Evolution_Shell"
-
-
-GtkType  e_shell_get_type   (void);
-gboolean e_shell_construct  (EShell                *shell,
-			     GNOME_Evolution_Shell  corba_object,
-			     const char            *iid,
-			     const char            *local_directory,
-			     gboolean               show_splash);
-EShell  *e_shell_new        (const char            *local_directory,
-			     gboolean               show_splash);
-
-EShellView *e_shell_new_view  (EShell     *shell,
-			       const char *uri);
-
-const char          *e_shell_get_local_directory       (EShell          *shell);
-EShortcuts          *e_shell_get_shortcuts             (EShell          *shell);
-EStorageSet         *e_shell_get_storage_set           (EShell          *shell);
-ELocalStorage       *e_shell_get_local_storage         (EShell          *shell);
-EFolderTypeRegistry *e_shell_get_folder_type_registry  (EShell          *shell);
-
-gboolean             e_shell_save_settings             (EShell          *shell);
-gboolean             e_shell_restore_from_settings     (EShell          *shell);
-
-void                 e_shell_quit                      (EShell          *shell);
-
-void                 e_shell_component_maybe_crashed   (EShell          *shell,
-							const char      *uri,
-							const char      *type_name,
-							EShellView      *shell_view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SHELL_H_ */
diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
deleted file mode 100644
index f0d08b8458..0000000000
--- a/shell/e-shortcuts-view-model.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts-view-model.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* FIXME.  This really sucks.  We are using the model/view approach in the
-   dumbest possible way.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "e-shortcuts-view-model.h"
-
-
-#define PARENT_TYPE e_shortcut_model_get_type ()
-static EShortcutModelClass *parent_class = NULL;
-
-struct _EShortcutsViewModelPrivate {
-	EShortcuts *shortcuts;
-};
-
-
-/* View initialization.  */
-
-static const char *
-get_storage_set_path_from_uri (const char *uri)
-{
-	const char *colon;
-
-	if (g_path_is_absolute (uri))
-		return NULL;
-
-	colon = strchr (uri, ':');
-	if (colon == NULL || colon == uri || colon[1] == '\0')
-		return NULL;
-
-	if (! g_path_is_absolute (colon + 1))
-		return NULL;
-
-	if (g_strncasecmp (uri, "evolution", colon - uri) != 0)
-		return NULL;
-
-	return colon + 1;
-}
-
-static void
-load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
-		       const char *group_title,
-		       int group_num)
-{
-	EShortcutsViewModelPrivate *priv;
-	EStorageSet *storage_set;
-	GList *shortcut_list;
-	GList *p;
-
-	priv = shortcuts_view_model->priv;
-
-	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
-	g_assert (storage_set != NULL);
-
-	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_title);
-	if (shortcut_list == NULL)
-		return;
-
-	for (p = shortcut_list; p != NULL; p = p->next) {
-		EFolder *folder = NULL;
-		const char *path;
-		const char *uri;
-		const char *name;
-
-		uri = (const char *) p->data;
-		path = get_storage_set_path_from_uri (uri);
-		if (path != NULL)
-			folder = e_storage_set_get_folder (storage_set, path);
-
-		if (path == NULL || folder == NULL) {
-			/* FIXME */
-			g_warning ("Invalid link while loading shortcut bar view -- %s\n",
-				   uri);
-			continue;
-		}
-
-		name = e_folder_get_name (folder);
-		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, uri, name);
-	}
-
-	e_free_string_list (shortcut_list);
-}
-
-static void
-load_all_shortcuts_into_model (EShortcutsViewModel *shortcuts_view_model)
-{
-	EShortcutsViewModelPrivate *priv;
-	GList *group_titles;
-	GList *p;
-	int group_num;
-
-	priv = shortcuts_view_model->priv;
-
-	group_titles = e_shortcuts_get_group_titles (priv->shortcuts);
-
-	for (p = group_titles; p != NULL; p = p->next) {
-		const char *group_title;
-
-		group_title = (const char *) p->data;
-		group_num = e_shortcut_model_add_group (E_SHORTCUT_MODEL (shortcuts_view_model), -1, group_title);
-
-		load_group_into_model (shortcuts_view_model, group_title, group_num);
-	}
-
-	e_free_string_list (group_titles);
-}
-
-
-/* EShortcuts callbacks.  */
-
-static void
-shortcuts_new_group_cb (EShortcuts *shortcuts,
-			int group_num,
-			void *data)
-{
-	EShortcutsViewModel *shortcuts_view_model;
-	EShortcutsViewModelPrivate *priv;
-	const char *title;
-
-	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
-	priv = shortcuts_view_model->priv;
-
-	title = e_shortcuts_get_group_title (priv->shortcuts, group_num);
-	e_shortcut_model_add_group (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, title);
-}
-
-static void
-shortcuts_remove_group_cb (EShortcuts *shortcuts,
-			   int group_num,
-			   void *data)
-{
-	EShortcutsViewModel *shortcuts_view_model;
-
-	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
-	e_shortcut_model_remove_group (E_SHORTCUT_MODEL (shortcuts_view_model), group_num);
-}
-
-static void
-shortcuts_new_shortcut_cb (EShortcuts *shortcuts,
-			   int group_num,
-			   int item_num,
-			   void *data)
-{
-	EShortcutsViewModel *shortcuts_view_model;
-	EShortcutsViewModelPrivate *priv;
-	EStorageSet *storage_set;
-	EFolder *folder;
-	const char *uri;
-	const char *storage_set_path;
-	const char *folder_name;
-
-	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
-	priv = shortcuts_view_model->priv;
-
-	uri = e_shortcuts_get_uri (priv->shortcuts, group_num, item_num);
-	g_assert (uri != NULL);
-
-	storage_set_path = get_storage_set_path_from_uri (uri);
-	if (storage_set_path == NULL)
-		return;
-
-	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
-	folder = e_storage_set_get_folder (storage_set, storage_set_path);
-	folder_name = e_folder_get_name (folder);
-
-	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
-				   group_num, item_num, uri, folder_name);
-}
-
-static void
-shortcuts_remove_shortcut_cb (EShortcuts *shortcuts,
-			      int group_num,
-			      int item_num,
-			      void *data)
-{
-	EShortcutsViewModel *shortcuts_view_model;
-
-	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
-	e_shortcut_model_remove_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, item_num);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EShortcutsViewModel *view_model;
-	EShortcutsViewModelPrivate *priv;
-
-	view_model = E_SHORTCUTS_VIEW_MODEL (object);
-	priv = view_model->priv;
-
-	g_free (priv);
-}
-
-
-static void
-class_init (EShortcutsViewModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (e_shortcut_model_get_type ());
-}
-
-static void
-init (EShortcutsViewModel *shortcuts_view_model)
-{
-	EShortcutsViewModelPrivate *priv;
-
-	priv = g_new (EShortcutsViewModelPrivate, 1);
-	priv->shortcuts = NULL;
-
-	shortcuts_view_model->priv = priv;
-}
-
-
-void
-e_shortcuts_view_model_construct (EShortcutsViewModel *model,
-				  EShortcuts *shortcuts)
-{
-	EShortcutsViewModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS_VIEW_MODEL (model));
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = model->priv;
-	g_return_if_fail (priv->shortcuts == NULL);
-
-	priv->shortcuts = shortcuts;
-
-	load_all_shortcuts_into_model (model);
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
-					"new_group", GTK_SIGNAL_FUNC (shortcuts_new_group_cb), model,
-					GTK_OBJECT (model));
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
-					"remove_group", GTK_SIGNAL_FUNC (shortcuts_remove_group_cb), model,
-					GTK_OBJECT (model));
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
-					"new_shortcut", GTK_SIGNAL_FUNC (shortcuts_new_shortcut_cb), model,
-					GTK_OBJECT (model));
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
-					"remove_shortcut", GTK_SIGNAL_FUNC (shortcuts_remove_shortcut_cb), model,
-					GTK_OBJECT (model));
-}
-
-EShortcutsViewModel *
-e_shortcuts_view_model_new (EShortcuts *shortcuts)
-{
-	EShortcutsViewModel *new;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	new = gtk_type_new (e_shortcuts_view_model_get_type ());
-
-	e_shortcuts_view_model_construct (new, shortcuts);
-
-	return new;
-}
-
-
-E_MAKE_TYPE (e_shortcuts_view_model, "EShortcutsViewModel", EShortcutsViewModel, class_init, init, PARENT_TYPE)
diff --git a/shell/e-shortcuts-view-model.h b/shell/e-shortcuts-view-model.h
deleted file mode 100644
index c8de47f773..0000000000
--- a/shell/e-shortcuts-view-model.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts-view-model.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SHORTCUTS_VIEW_MODEL_H_
-#define _E_SHORTCUTS_VIEW_MODEL_H_
-
-#include "e-shortcuts.h"
-
-#include <gal/shortcut-bar/e-shortcut-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SHORTCUTS_VIEW_MODEL			(e_shortcuts_view_model_get_type ())
-#define E_SHORTCUTS_VIEW_MODEL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHORTCUTS_VIEW_MODEL, EShortcutsViewModel))
-#define E_SHORTCUTS_VIEW_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHORTCUTS_VIEW_MODEL, EShortcutsViewModelClass))
-#define E_IS_SHORTCUTS_VIEW_MODEL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHORTCUTS_VIEW_MODEL))
-#define E_IS_SHORTCUTS_VIEW_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHORTCUTS_VIEW_MODEL))
-
-
-typedef struct _EShortcutsViewModel        EShortcutsViewModel;
-typedef struct _EShortcutsViewModelPrivate EShortcutsViewModelPrivate;
-typedef struct _EShortcutsViewModelClass   EShortcutsViewModelClass;
-
-struct _EShortcutsViewModel {
-	EShortcutModel parent;
-
-	EShortcutsViewModelPrivate *priv;
-};
-
-struct _EShortcutsViewModelClass {
-	EShortcutModelClass parent_class;
-};
-
-
-GtkType              e_shortcuts_view_model_get_type   (void);
-void                 e_shortcuts_view_model_construct  (EShortcutsViewModel *model,
-							EShortcuts          *shortcuts);
-EShortcutsViewModel *e_shortcuts_view_model_new        (EShortcuts          *shortcuts);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SHORTCUTS_VIEW_MODEL_H_ */
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
deleted file mode 100644
index 4db5b2261c..0000000000
--- a/shell/e-shortcuts-view.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts-view.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-shortcuts-view-model.h"
-
-#include "e-shortcuts-view.h"
-
-
-#define PARENT_TYPE E_TYPE_SHORTCUT_BAR
-static EShortcutBarClass *parent_class = NULL;
-
-struct _EShortcutsViewPrivate {
-	EShortcuts *shortcuts;
-};
-
-enum {
-	ACTIVATE_SHORTCUT,
-	HIDE_REQUESTED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* FIXME this should all be in the model.  */
-
-static const char *
-get_storage_set_path_from_uri (const char *uri)
-{
-	const char *colon;
-
-	if (g_path_is_absolute (uri))
-		return NULL;
-
-	colon = strchr (uri, ':');
-	if (colon == NULL || colon == uri || colon[1] == '\0')
-		return NULL;
-
-	if (! g_path_is_absolute (colon + 1))
-		return NULL;
-
-	if (g_strncasecmp (uri, "evolution", colon - uri) != 0)
-		return NULL;
-
-	return colon + 1;
-}
-
-/* Icon callback for the shortcut bar.  */
-static GdkPixbuf *
-icon_callback (EShortcutBar *shortcut_bar,
-	       const char *uri,
-	       gpointer data)
-{
-	EFolderTypeRegistry *folder_type_registry;
-	EShortcuts *shortcuts;
-	EStorageSet *storage_set;
-	EFolder *folder;
-	GdkPixbuf *pixbuf;
-	const char *type;
-
-	shortcuts = E_SHORTCUTS (data);
-
-	storage_set = e_shortcuts_get_storage_set (shortcuts);
-	folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
-
-	folder = e_storage_set_get_folder (storage_set,
-					   get_storage_set_path_from_uri (uri));
-
-	if (folder == NULL)
-		return NULL;
-
-	type = e_folder_get_type_string (folder);
-	if (type == NULL)
-		return NULL;
-
-	/* FIXME mini icons?  */
-	pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
-	if (pixbuf != NULL)
-		gdk_pixbuf_ref (pixbuf);
-
-	return pixbuf;
-}
-
-
-static void
-show_new_group_dialog (EShortcutsView *view)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-	GtkWidget *entry;
-	GtkWidget *box;
-	const char *group_name;
-	int button_num;
-
-	dialog = gnome_dialog_new (_("Create new shortcut group"),
-				   GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
-
-	label = gtk_label_new (_("Group name:"));
-	gtk_widget_show (label);
-
-	entry = gtk_entry_new ();
-	gtk_widget_show (entry);
-
-	box = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (box);
-
-	gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), box, FALSE, TRUE, 0);
-
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))));
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-
-	gtk_widget_grab_focus (entry);
-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE (entry));
-
-	gtk_widget_show (dialog);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (dialog));
-	if (button_num == -1)
-		return;
-	if (button_num != 0) {
-		gtk_widget_destroy (dialog);
-		return;
-	}
-
-	group_name = gtk_entry_get_text (GTK_ENTRY (entry));
-	e_shortcuts_add_group (view->priv->shortcuts, -1, group_name);
-
-	gtk_widget_destroy (dialog);
-}
-
-
-/* Shortcut bar right-click menu.  */
-
-struct _RightClickMenuData {
-	EShortcutsView *shortcuts_view;
-	int group_num;
-};
-typedef struct _RightClickMenuData RightClickMenuData;
-
-static void
-toggle_large_icons_cb (GtkWidget *widget,
-		       void *data)
-{
-	RightClickMenuData *menu_data;
-
-	menu_data = (RightClickMenuData *) data;
-
-	if (menu_data == NULL)
-		return;
-
-	if (! GTK_CHECK_MENU_ITEM (widget)->active)
-		return;
-
-	e_shortcut_bar_set_view_type (E_SHORTCUT_BAR (menu_data->shortcuts_view),
-				      menu_data->group_num,
-				      E_ICON_BAR_LARGE_ICONS);
-}
-
-static void
-toggle_small_icons_cb (GtkWidget *widget,
-		       void *data)
-{
-	RightClickMenuData *menu_data;
-
-	menu_data = (RightClickMenuData *) data;
-	if (menu_data == NULL)
-		return;
-
-	if (! GTK_CHECK_MENU_ITEM (widget)->active)
-		return;
-
-	e_shortcut_bar_set_view_type (E_SHORTCUT_BAR (menu_data->shortcuts_view),
-				      menu_data->group_num,
-				      E_ICON_BAR_SMALL_ICONS);
-}
-
-static void
-hide_shortcut_bar_cb (GtkWidget *widget,
-		      void *data)
-{
-	RightClickMenuData *menu_data;
-	EShortcutsView *shortcut_view;
-
-	menu_data = (RightClickMenuData *) data;
-
-	shortcut_view = E_SHORTCUTS_VIEW (menu_data->shortcuts_view);
-
-	gtk_signal_emit (GTK_OBJECT (shortcut_view), signals[HIDE_REQUESTED]);
-}
-
-static void
-create_new_group_cb (GtkWidget *widget,
-		     void *data)
-{
-	RightClickMenuData *menu_data;
-
-	menu_data = (RightClickMenuData *) data;
-
-	show_new_group_dialog (menu_data->shortcuts_view);
-}
-
-static void
-destroy_group_cb (GtkWidget *widget,
-		  void *data)
-{
-	RightClickMenuData *menu_data;
-	EShortcuts *shortcuts;
-	EShortcutsView *shortcuts_view;
-	EShortcutsViewPrivate *priv;
-	GtkWidget *message_box;
-	char *question;
-
-	menu_data = (RightClickMenuData *) data;
-	shortcuts_view = menu_data->shortcuts_view;
-	priv = shortcuts_view->priv;
-	shortcuts = priv->shortcuts;
-
-	question = g_strdup_printf (_("Do you really want to remove group\n"
-				      "`%s' from the shortcut bar?"),
-				    e_shortcuts_get_group_title (shortcuts, menu_data->group_num));
-
-	message_box = gnome_message_box_new (question, GNOME_MESSAGE_BOX_QUESTION,
-					     _("Remove"), _("Don't remove"), NULL);
-	gnome_dialog_set_parent (GNOME_DIALOG (message_box),
-				 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (shortcuts_view))));
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (message_box)) != 0)
-		return;
-
-	e_shortcuts_remove_group (shortcuts, menu_data->group_num);
-}
-
-static GnomeUIInfo icon_size_radio_group_uiinfo[] = {
-	{ GNOME_APP_UI_ITEM, N_("_Small Icons"),
-	  N_("Show the shortcuts as small icons"), toggle_small_icons_cb, NULL,
-	  NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("_Large Icons"),
-	  N_("Show the shortcuts as large icons"), toggle_large_icons_cb, NULL,
-	  NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo right_click_menu_uiinfo[] = {
-	GNOMEUIINFO_RADIOLIST (icon_size_radio_group_uiinfo),
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, N_("_New Group..."),
-	  N_("Create a new shortcut group"), create_new_group_cb, NULL,
-	  NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("_Remove This Group..."),
-	  N_("Remove this shortcut group"), destroy_group_cb, NULL,
-	  NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, N_("_Hide the Shortcut Bar"), 
-	  N_("Hide the shortcut bar"), hide_shortcut_bar_cb, NULL,
-	  NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_END
-};
-
-static void
-pop_up_right_click_menu_for_group (EShortcutsView *shortcuts_view,
-				   GdkEventButton *event,
-				   int group_num)
-{
-	RightClickMenuData *menu_data;
-	GtkWidget *popup_menu;
-
-	menu_data = g_new (RightClickMenuData, 1);
-	menu_data->shortcuts_view = shortcuts_view;
-	menu_data->group_num      = group_num;
-
-	popup_menu = gnome_popup_menu_new (right_click_menu_uiinfo);
-
-	if (e_shortcut_bar_get_view_type (E_SHORTCUT_BAR (shortcuts_view), group_num)
-	    == E_ICON_BAR_SMALL_ICONS)
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (icon_size_radio_group_uiinfo[0].widget),
-						TRUE);
-	else
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (icon_size_radio_group_uiinfo[1].widget),
-						TRUE);
-
-	if (group_num == 0)
-		gtk_widget_set_sensitive (right_click_menu_uiinfo[3].widget, FALSE);
-
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event, menu_data);
-
-	g_free (menu_data);
-	gtk_widget_destroy (popup_menu);
-}
-
-
-/* Shortcut right-click menu.  */
-
-struct _ShortcutRightClickMenuData {
-	EShortcutsView *shortcuts_view;
-	int group_num;
-	int item_num;
-};
-typedef struct _ShortcutRightClickMenuData ShortcutRightClickMenuData;
-
-static void
-activate_shortcut_cb (GtkWidget *widget,
-		      void *data)
-{
-	ShortcutRightClickMenuData *menu_data;
-	EShortcutsView *shortcuts_view;
-	EShortcuts *shortcuts;
-	const char *uri;
-
-	menu_data = (ShortcutRightClickMenuData *) data;
-	shortcuts_view = menu_data->shortcuts_view;
-	shortcuts = shortcuts_view->priv->shortcuts;
-
-	uri = e_shortcuts_get_uri (shortcuts, menu_data->group_num, menu_data->item_num);
-	if (uri == NULL)
-		return;
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts_view), signals[ACTIVATE_SHORTCUT],
-			 shortcuts, uri);
-}
-
-static void
-remove_shortcut_cb (GtkWidget *widget,
-		    void *data)
-{
-	ShortcutRightClickMenuData *menu_data;
-	EShortcutsView *shortcuts_view;
-	EShortcuts *shortcuts;
-
-	menu_data = (ShortcutRightClickMenuData *) data;
-	shortcuts_view = menu_data->shortcuts_view;
-	shortcuts = shortcuts_view->priv->shortcuts;
-
-	e_shortcuts_remove_shortcut (shortcuts, menu_data->group_num, menu_data->item_num);
-}
-
-static GnomeUIInfo shortcut_right_click_menu_uiinfo[] = {
-	GNOMEUIINFO_ITEM       (N_("Activate"), N_("Activate this shortcut"),
-				activate_shortcut_cb, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_STOCK (N_("Remove"), N_("Remove this shortcut from the shortcut bar"),
-				remove_shortcut_cb, GNOME_STOCK_MENU_CLOSE),
-	GNOMEUIINFO_END
-};
-
-static void
-pop_up_right_click_menu_for_shortcut (EShortcutsView *shortcuts_view,
-				      GdkEventButton *event,
-				      int group_num,
-				      int item_num)
-{
-	ShortcutRightClickMenuData *menu_data;
-	GtkWidget *popup_menu;
-
-	menu_data = g_new (ShortcutRightClickMenuData, 1);
-	menu_data->shortcuts_view = shortcuts_view;
-	menu_data->group_num 	  = group_num;
-	menu_data->item_num  	  = item_num;
-
-	popup_menu = gnome_popup_menu_new (shortcut_right_click_menu_uiinfo);
-
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event, menu_data);
-
-	g_free (menu_data);
-	gtk_widget_destroy (popup_menu);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EShortcutsViewPrivate *priv;
-	EShortcutsView *shortcuts_view;
-
-	shortcuts_view = E_SHORTCUTS_VIEW (object);
-
-	priv = shortcuts_view->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->shortcuts));
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* EShortcutBar methods.  */
-
-static void
-item_selected (EShortcutBar *shortcut_bar,
-	       GdkEvent *event,
-	       int group_num,
-	       int item_num)
-{
-	EShortcuts *shortcuts;
-	EShortcutsView *shortcuts_view;
-	const char *uri;
-
-	shortcuts_view = E_SHORTCUTS_VIEW (shortcut_bar);
-	shortcuts = shortcuts_view->priv->shortcuts;
-
-	if (event->button.button == 3) {
-		if (item_num < 0)
-			pop_up_right_click_menu_for_group (shortcuts_view, &event->button,
-							   group_num);
-		else
-			pop_up_right_click_menu_for_shortcut (shortcuts_view, &event->button,
-							      group_num, item_num);
-		return;
-	} else if (event->button.button != 1) {
-		return;
-	}
-
-	if (item_num < 0)
-		return;
-
-	uri = e_shortcuts_get_uri (shortcuts, group_num, item_num);
-	if (uri == NULL)
-		return;
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts_view), signals[ACTIVATE_SHORTCUT],
-			 shortcuts, uri);
-}
-
-static void
-impl_shortcut_dropped (EShortcutBar *shortcut_bar,
-		       int group_num,
-		       int position,
-		       const char *item_url,
-		       const char *item_name)
-{
-	EShortcutsView *shortcuts_view;
-	EShortcutsViewPrivate *priv;
-
-	shortcuts_view = E_SHORTCUTS_VIEW (shortcut_bar);
-	priv = shortcuts_view->priv;
-
-	e_shortcuts_add_shortcut (priv->shortcuts, group_num, position, item_url);
-}
-
-static void
-impl_shortcut_dragged (EShortcutBar *shortcut_bar,
-		       gint group_num,
-		       gint item_num)
-{
-	EShortcutsView *shortcuts_view;
-	EShortcutsViewPrivate *priv;
-
-	shortcuts_view = E_SHORTCUTS_VIEW (shortcut_bar);
-	priv = shortcuts_view->priv;
-
-	e_shortcuts_remove_shortcut (priv->shortcuts, group_num, item_num);
-}
-
-
-static void
-class_init (EShortcutsViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	EShortcutBarClass *shortcut_bar_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	shortcut_bar_class = E_SHORTCUT_BAR_CLASS (klass);
-	shortcut_bar_class->item_selected    = item_selected;
-	shortcut_bar_class->shortcut_dropped = impl_shortcut_dropped;
-	shortcut_bar_class->shortcut_dragged = impl_shortcut_dragged;
-
-	parent_class = gtk_type_class (e_shortcut_bar_get_type ());
-
-	signals[ACTIVATE_SHORTCUT] =
-		gtk_signal_new ("activate_shortcut",
-				GTK_RUN_LAST | GTK_RUN_ACTION,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EShortcutsViewClass, activate_shortcut),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_STRING);
-
-	signals[HIDE_REQUESTED] =
-		gtk_signal_new ("hide_requested",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EShortcutsViewClass,
-						   hide_requested),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EShortcutsView *shortcuts_view)
-{
-	EShortcutsViewPrivate *priv;
-
-	priv = g_new (EShortcutsViewPrivate, 1);
-	priv->shortcuts = NULL;
-
-	shortcuts_view->priv = priv;
-}
-
-
-void
-e_shortcuts_view_construct (EShortcutsView *shortcuts_view,
-			    EShortcuts *shortcuts)
-{
-	EShortcutsViewPrivate *priv;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = shortcuts_view->priv;
-
-	priv->shortcuts = shortcuts;
-	gtk_object_ref (GTK_OBJECT (priv->shortcuts));
-
-	e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
-					  shortcuts);
-
-	e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
-				  E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts)));
-}
-
-GtkWidget *
-e_shortcuts_view_new (EShortcuts *shortcuts)
-{
-	GtkWidget *new;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	new = gtk_type_new (e_shortcuts_view_get_type ());
-	e_shortcuts_view_construct (E_SHORTCUTS_VIEW (new), shortcuts);
-
-	return new;
-}
-
-
-E_MAKE_TYPE (e_shortcuts_view, "EShortcutsView", EShortcutsView, class_init, init, PARENT_TYPE)
diff --git a/shell/e-shortcuts-view.h b/shell/e-shortcuts-view.h
deleted file mode 100644
index 6152bd230d..0000000000
--- a/shell/e-shortcuts-view.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts-view.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SHORTCUTS_VIEW_H_
-#define _E_SHORTCUTS_VIEW_H_
-
-#include <gtk/gtkwidget.h>
-
-#include <gal/shortcut-bar/e-shortcut-bar.h>
-#include "e-shortcuts.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SHORTCUTS_VIEW			(e_shortcuts_view_get_type ())
-#define E_SHORTCUTS_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHORTCUTS_VIEW, EShortcutsView))
-#define E_SHORTCUTS_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHORTCUTS_VIEW, EShortcutsViewClass))
-#define E_IS_SHORTCUTS_VIEW(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHORTCUTS_VIEW))
-#define E_IS_SHORTCUTS_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHORTCUTS_VIEW))
-
-
-typedef struct _EShortcutsView        EShortcutsView;
-typedef struct _EShortcutsViewPrivate EShortcutsViewPrivate;
-typedef struct _EShortcutsViewClass   EShortcutsViewClass;
-
-struct _EShortcutsView {
-	EShortcutBar parent;
-
-	EShortcutsViewPrivate *priv;
-};
-
-struct _EShortcutsViewClass {
-	EShortcutBarClass parent_class;
-
-	void (* activate_shortcut) (EShortcutsView *view,
-				    EShortcuts *shortcuts,
-				    const char *uri);
-
-	void (* hide_requested) (EShortcutsView *view);
-};
-
-
-GtkType    e_shortcuts_view_get_type   (void);
-void       e_shortcuts_view_construct  (EShortcutsView *shortcuts_view,
-					EShortcuts     *shortcuts);
-GtkWidget *e_shortcuts_view_new        (EShortcuts     *shortcuts);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SHORTCUTS_VIEW_H_ */
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
deleted file mode 100644
index 661201f9b0..0000000000
--- a/shell/e-shortcuts.c
+++ /dev/null
@@ -1,915 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* The shortcut list goes like this:
-
-   <?xml version="1.0"?>
-   <shortcuts>
-           <group title="Evolution shortcuts">
-	           <item>evolution:/local/Inbox</item>
-	           <item>evolution:/local/Trash</item>
-	           <item>evolution:/local/Calendar</item>
-	   </group>
-
-	   <group title="Personal shortcuts">
-	           <item>evolution:/local/Personal</item>
-	   </group>
-   </shortcuts>
-
-   FIXME: Do we want to use a namespace for this?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtktypeutils.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <string.h>
-
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gal/shortcut-bar/e-shortcut-bar.h>
-
-#include "e-shortcuts-view.h"
-
-#include "e-shortcuts.h"
-#include "e-shell-constants.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
-
-struct _ShortcutGroup {
-	/* Title of the group.  */
-	char *title;
-
-	/* A list of strings with the URI for the shortcut.  */
-	GList *shortcuts;
-};
-typedef struct _ShortcutGroup ShortcutGroup;
-
-struct _EShortcutsPrivate {
-	/* Name of the file associated with these shortcuts.  Changes in the shortcuts
-           will update this file automatically.  */
-	char *file_name;
-
-	/* ID of the idle function that will be called to save the shortcuts when they are
-           changed.  */
-	int save_idle_id;
-
-	/* Whether these shortcuts need to be saved to disk.  */
-	gboolean dirty;
-
-	/* The storage set to which these shortcuts are associated.  */
-	EStorageSet *storage_set;
-
-	/* The folder type registry.  */
-	EFolderTypeRegistry *folder_type_registry;
-
-	/* A list of ShortcutGroups.  */
-	GList *groups;
-
-	/* A list of ShortcutViews.  */
-	GList *views;
-
-	/* A hash table to get a group given its name.  */
-	GHashTable *title_to_group;
-};
-
-enum {
-	NEW_GROUP,
-	REMOVE_GROUP,
-	NEW_SHORTCUT,
-	REMOVE_SHORTCUT,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static void
-unload_shortcuts (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-	GList *orig_groups;
-	GList *p, *q;
-
-	priv = shortcuts->priv;
-	orig_groups = priv->groups;
-
-	for (p = priv->groups; p != NULL; p = p->next) {
-		ShortcutGroup *group;
-
-		gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_GROUP], 0);
-
-		group = (ShortcutGroup *) p->data;
-
-		g_hash_table_remove (priv->title_to_group, group->title);
-
-		for (q = group->shortcuts; q != NULL; q = q->next)
-			g_free (q->data);
-		g_free (group->title);
-
-		g_list_free (group->shortcuts);
-
-		priv->groups = priv->groups->next;
-	}
-
-	if (orig_groups != NULL)
-		g_list_free (orig_groups);
-
-	priv->groups = NULL;
-
-	g_hash_table_destroy (priv->title_to_group);
-	priv->title_to_group = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static gboolean
-load_shortcuts (EShortcuts *shortcuts,
-		const char *file_name)
-{
-	EShortcutsPrivate *priv;
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *p, *q;
-
-	/* FIXME: Update the views by emitting the appropriate signals.  */
-
-	priv = shortcuts->priv;
-
-	doc = xmlParseFile (file_name);
-	if (doc == NULL)
-		return FALSE;
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "shortcuts") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	unload_shortcuts (shortcuts);
-
-	for (p = root->childs; p != NULL; p = p->next) {
-		ShortcutGroup *shortcut_group;
-		char *shortcut_group_title;
-
-		if (strcmp ((char *) p->name, "group") != 0)
-			continue;
-
-		shortcut_group_title = (char *) xmlGetProp (p, "title");
-		if (shortcut_group_title == NULL)
-			continue;
-
-		shortcut_group = g_hash_table_lookup (priv->title_to_group,
-						      shortcut_group_title);
-		if (shortcut_group != NULL) {
-			g_warning ("Duplicate shortcut group title -- %s",
-				   shortcut_group_title);
-			xmlFree (shortcut_group_title);
-			continue;
-		}
-
-		shortcut_group = g_new (ShortcutGroup, 1);
-		shortcut_group->title = g_strdup (shortcut_group_title);
-		xmlFree (shortcut_group_title);
-
-		shortcut_group->shortcuts = NULL;
-		for (q = p->childs; q != NULL; q = q->next) {
-			char *content;
-
-			if (strcmp ((char *) q->name, "item") != 0)
-				continue;
-
-			content = xmlNodeListGetString (doc, q->childs, 1);
-			shortcut_group->shortcuts = g_list_prepend (shortcut_group->shortcuts,
-								    g_strdup (content));
-			xmlFree (content);
-		}
-		shortcut_group->shortcuts = g_list_reverse (shortcut_group->shortcuts);
-
-		priv->groups = g_list_prepend (priv->groups, shortcut_group);
-		g_hash_table_insert (priv->title_to_group, shortcut_group->title, shortcut_group);
-	}
-
-	priv->groups = g_list_reverse (priv->groups);
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-static gboolean
-save_shortcuts (EShortcuts *shortcuts,
-		const char *file_name)
-{
-	EShortcutsPrivate *priv;
-	xmlDoc *doc;
-	xmlNode *root;
-	GList *p, *q;
-
-	priv = shortcuts->priv;
-
-	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "shortcuts", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	for (p = priv->groups; p != NULL; p = p->next) {
-		ShortcutGroup *group;
-		xmlNode *group_node;
-
-		group = (ShortcutGroup *) p->data;
-		group_node = xmlNewChild (root, NULL, (xmlChar *) "group", NULL);
-
-		xmlSetProp (group_node, (xmlChar *) "title", group->title);
-
-		for (q = group->shortcuts; q != NULL; q = q->next) {
-			const char *shortcut;
-
-			shortcut = (const char *) q->data;
-			xmlNewChild (group_node, NULL, (xmlChar *) "item", (xmlChar *) shortcut);
-		}
-	}
-
-	if (xmlSaveFile (file_name, doc) < 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	xmlFreeDoc (doc);
-	return TRUE;
-}
-
-
-/* Idle function to update the file on disk.  */
-
-static int
-idle_cb (void *data)
-{
-	EShortcuts *shortcuts;
-	EShortcutsPrivate *priv;
-
-	shortcuts = E_SHORTCUTS (data);
-	priv = shortcuts->priv;
-
-	if (priv->dirty) {
-		g_print ("Saving shortcuts -- %s\n", priv->file_name);
-		if (! e_shortcuts_save (shortcuts, NULL))
-			g_warning ("Saving of shortcuts failed -- %s", priv->file_name);
-		else
-			priv->dirty = FALSE;
-	}
-
-	priv->save_idle_id = 0;
-
-	return FALSE;
-}
-
-static void
-schedule_idle (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-
-	priv = shortcuts->priv;
-
-	if (priv->save_idle_id != 0)
-		return;
-
-	gtk_idle_add (idle_cb, shortcuts);
-}
-
-static void
-make_dirty (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-
-	priv = shortcuts->priv;
-
-	priv->dirty = TRUE;
-	schedule_idle (shortcuts);
-}
-
-/* Signal handlers for the storage set */
-static void
-removed_folder_cb (EStorageSet *storage_set,
-		   const char  *path,
-		   void        *data)
-{
-	EShortcuts *shortcuts;
-	char *tmp;
-
-	shortcuts = E_SHORTCUTS (data);
-
-	tmp = g_strconcat (E_SHELL_URI_PREFIX, path, NULL);
-	e_shortcuts_remove_shortcut_by_uri (shortcuts, tmp);
-	g_free (tmp);
-}
-
-
-/* Signal handlers for the views.  */
-
-static void
-view_destroyed_cb (GtkObject *object,
-		   gpointer data)
-{
-	EShortcuts *shortcuts;
-	EShortcutsPrivate *priv;
-
-	shortcuts = E_SHORTCUTS (data);
-	priv = shortcuts->priv;
-
-	priv->views = g_list_remove (priv->views, object);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EShortcuts *shortcuts;
-	EShortcutsPrivate *priv;
-
-	shortcuts = E_SHORTCUTS (object);
-	priv = shortcuts->priv;
-
-	g_free (priv->file_name);
-
-	if (priv->storage_set != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->storage_set));
-
-	if (priv->folder_type_registry != NULL)
-		gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
-
-	unload_shortcuts (shortcuts);
-
-	if (priv->save_idle_id != 0)
-		gtk_idle_remove (priv->save_idle_id);
-
-	if (priv->dirty) {
-		if (! e_shortcuts_save (shortcuts, NULL))
-			g_warning (_("Error saving shortcuts.")); /* FIXME */
-	}
-
-	g_hash_table_destroy (priv->title_to_group);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EShortcutsClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	signals[NEW_GROUP]
-		= gtk_signal_new ("new_group",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShortcutsClass, new_group),
-				  gtk_marshal_NONE__INT,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_INT);
-
-	signals[REMOVE_GROUP]
-		= gtk_signal_new ("remove_group",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShortcutsClass, remove_group),
-				  gtk_marshal_NONE__INT,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_INT);
-
-	signals[NEW_SHORTCUT]
-		= gtk_signal_new ("new_shortcut",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShortcutsClass, new_shortcut),
-				  gtk_marshal_NONE__INT_INT,
-				  GTK_TYPE_NONE, 2,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT);
-
-	signals[REMOVE_SHORTCUT]
-		= gtk_signal_new ("remove_shortcut",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EShortcutsClass, remove_shortcut),
-				  gtk_marshal_NONE__INT_INT,
-				  GTK_TYPE_NONE, 2,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-
-static void
-init (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-
-	priv = g_new (EShortcutsPrivate, 1);
-
-	priv->file_name      = NULL;
-	priv->storage_set    = NULL;
-	priv->groups         = NULL;
-	priv->views          = NULL;
-	priv->title_to_group = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->dirty          = 0;
-	priv->save_idle_id   = 0;
-
-	shortcuts->priv = priv;
-}
-
-
-void
-e_shortcuts_construct (EShortcuts  *shortcuts,
-		       EStorageSet *storage_set,
-		       EFolderTypeRegistry *folder_type_registry)
-{
-	EShortcutsPrivate *priv;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (shortcuts), GTK_FLOATING);
-
-	priv = shortcuts->priv;
-
-	gtk_object_ref (GTK_OBJECT (storage_set));
-	priv->storage_set = storage_set;
-
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set), "removed_folder",
-			    removed_folder_cb, shortcuts);
-
-	gtk_object_ref (GTK_OBJECT (folder_type_registry));
-	priv->folder_type_registry = folder_type_registry;
-}
-
-EShortcuts *
-e_shortcuts_new (EStorageSet *storage_set,
-		 EFolderTypeRegistry *folder_type_registry,
-		 const char *file_name)
-{
-	EShortcuts *new;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	new = gtk_type_new (e_shortcuts_get_type ());
-	e_shortcuts_construct (new, storage_set, folder_type_registry);
-
-	if (! e_shortcuts_load (new, file_name)) {
-		gtk_object_unref (GTK_OBJECT (new));
-		return NULL;
-	}
-
-	return new;
-}
-
-
-GList *
-e_shortcuts_get_group_titles (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-	GList *list;
-	GList *p;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	priv = shortcuts->priv;
-
-	list = NULL;
-
-	for (p = priv->groups; p != NULL; p = p->next) {
-		group = (ShortcutGroup *) p->data;
-		list = g_list_prepend (list, g_strdup (group->title));
-	}
-
-	return g_list_reverse (list);
-}
-
-GList *
-e_shortcuts_get_shortcuts_in_group (EShortcuts *shortcuts,
-				    const char *group_title)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *shortcut_group;
-	GList *list;
-	GList *p;
-
-	priv = shortcuts->priv;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-	g_return_val_if_fail (group_title != NULL, NULL);
-
-	shortcut_group = g_hash_table_lookup (priv->title_to_group, group_title);
-	if (shortcut_group == NULL)
-		return NULL;
-
-	list = NULL;
-
-	for (p = shortcut_group->shortcuts; p != NULL; p = p->next)
-		list = g_list_prepend (list, g_strdup ((const char *) p->data));
-
-	return g_list_reverse (list);
-}
-
-
-EStorageSet *
-e_shortcuts_get_storage_set (EShortcuts *shortcuts)
-{
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	return shortcuts->priv->storage_set;
-}
-
-
-GtkWidget *
-e_shortcuts_new_view (EShortcuts *shortcuts)
-{
-	EShortcutsPrivate *priv;
-	GtkWidget *new;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	priv = shortcuts->priv;
-
-	new = e_shortcuts_view_new (shortcuts);
-	priv->views = g_list_prepend (priv->views, new);
-
-	gtk_signal_connect (GTK_OBJECT (new), "destroy", view_destroyed_cb, shortcuts);
-
-	return new;
-}
-
-
-gboolean
-e_shortcuts_load (EShortcuts *shortcuts,
-		  const char *file_name)
-{
-	EShortcutsPrivate *priv;
-	char *tmp;
-
-	g_return_val_if_fail (shortcuts != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), FALSE);
-	g_return_val_if_fail (file_name == NULL || g_path_is_absolute (file_name), FALSE);
-
-	priv = shortcuts->priv;
-
-	if (file_name == NULL) {
-		if (priv->file_name == NULL)
-			return FALSE;
-		file_name = priv->file_name;
-	}
-
-	if (! load_shortcuts (shortcuts, file_name))
-		return FALSE;
-
-	tmp = g_strdup (file_name);
-	g_free (priv->file_name);
-	priv->file_name = tmp;
-
-	return TRUE;
-}
-
-gboolean
-e_shortcuts_save (EShortcuts *shortcuts,
-		  const char *file_name)
-{
-	EShortcutsPrivate *priv;
-	char *tmp;
-
-	g_return_val_if_fail (shortcuts != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), FALSE);
-	g_return_val_if_fail (file_name == NULL || g_path_is_absolute (file_name), FALSE);
-
-	priv = shortcuts->priv;
-
-	if (file_name == NULL) {
-		if (priv->file_name == NULL)
-			return FALSE;
-		file_name = priv->file_name;
-	}
-
-	if (! save_shortcuts (shortcuts, file_name))
-		return FALSE;
-
-	tmp = g_strdup (file_name);
-	g_free (priv->file_name);
-	priv->file_name = tmp;
-
-	return TRUE;
-}
-
-
-const char *
-e_shortcuts_get_uri (EShortcuts *shortcuts, int group_num, int num)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-	GList *shortcut_element;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	priv = shortcuts->priv;
-
-	group = g_list_nth (priv->groups, group_num)->data;
-	if (group == NULL)
-		return NULL;
-
-	shortcut_element = g_list_nth (group->shortcuts, num);
-	if (shortcut_element == NULL)
-		return NULL;
-
-	return shortcut_element->data;
-}
-
-
-void
-e_shortcuts_remove_shortcut (EShortcuts *shortcuts,
-			     int group_num,
-			     int num)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-	GList *p;
-	char *uri;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = shortcuts->priv;
-
-	p = g_list_nth (priv->groups, group_num);
-	g_return_if_fail (p != NULL);
-
-	group = (ShortcutGroup *) p->data;
-
-	p = g_list_nth (group->shortcuts, num);
-	g_return_if_fail (p != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_SHORTCUT], group_num, num);
-
-	uri = (char *) p->data;
-	g_free (uri);
-
-	group->shortcuts = g_list_remove_link (group->shortcuts, p);
-
-	make_dirty (shortcuts);
-}
-
-void
-e_shortcuts_add_shortcut (EShortcuts *shortcuts,
-			  int group_num,
-			  int num,
-			  const char *uri)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-	GList *p;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = shortcuts->priv;
-
-	p = g_list_nth (priv->groups, group_num);
-	g_return_if_fail (p != NULL);
-
-	group = (ShortcutGroup *) p->data;
-
-	if (num == -1)
-		num = g_list_length (group->shortcuts);
-
-	group->shortcuts = g_list_insert (group->shortcuts, g_strdup (uri), num);
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts), signals[NEW_SHORTCUT], group_num, num);
-
-	make_dirty (shortcuts);
-}
-
-void
-e_shortcuts_update_shortcut (EShortcuts *shortcuts,
-			     int         group_num,
-			     int         num,
-			     const char *uri)
-{
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-		
-	/* FIXME: need support in e-shortcut-bar widget (and also
-           e-icon-bar) to be able to "update" a shortcut without doing
-           this lame remove then add */
-
-	e_shortcuts_remove_shortcut (shortcuts, group_num, num);
-	e_shortcuts_add_shortcut (shortcuts, group_num, num, uri);
-}
-
-
-/* The shortcuts_by_uri functions */
-
-
-typedef struct {
-	int group_num;
-	int num;
-} EShortcutPosition;
-
-static GList *
-find_positions_by_uri (EShortcuts  *shortcuts,
-		       const char  *uri)
-{
-	EShortcutsPrivate *priv;
-	GList *p = NULL, *q = NULL;
-	GList *retval = NULL;
-	int group_num = 0, num = 0;
-
-	priv = shortcuts->priv;
-
-	for (p = priv->groups; p != NULL; p = p->next) {
-		ShortcutGroup *group;
-
-		group = (ShortcutGroup *) p->data;
-
-		for (q = group->shortcuts; q != NULL; q = q->next) {
-			char *listeduri = q->data;
-
-			if (!strcmp (uri, listeduri)) {
-				EShortcutPosition *position;
-
-				position = g_new (EShortcutPosition, 1);
-				position->group_num = group_num;
-				position->num = num;
-				
-				retval = g_list_append (retval, position);
-			}
-			num++;
-		}
-
-		group_num++;
-		num = 0;
-	}
-
-	return g_list_first (retval);
-}
-
-void
-e_shortcuts_remove_shortcut_by_uri (EShortcuts *shortcuts,
-				    const char *uri)
-{
-	GList *items = NULL;
-
-	items = find_positions_by_uri (shortcuts, uri);
-
-	while (items) {
-		EShortcutPosition *pos = (EShortcutPosition *) items->data;
-
-		if (pos) {
-			e_shortcuts_remove_shortcut (shortcuts, pos->group_num, pos->num);
-			g_free (pos);
-		}
-		items = g_list_next (items);
-	}
-	g_list_free (items);
-}
-
-void
-e_shortcuts_update_shortcut_by_uri (EShortcuts *shortcuts,
-				    const char *uri)
-{
-	GList *items = NULL;
-
-	items = find_positions_by_uri (shortcuts, uri);
-
-	while (items) {
-		EShortcutPosition *pos = (EShortcutPosition *) items->data;
-
-		if (pos) {
-			e_shortcuts_update_shortcut (shortcuts,
-						     pos->group_num, pos->num,
-						     uri);
-			g_free (pos);
-		}
-		items = g_list_next (items);
-	}
-	g_list_free (items);
-}
-
-void
-e_shortcuts_remove_group (EShortcuts *shortcuts,
-			  int group_num)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-	GList *p;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = shortcuts->priv;
-
-	p = g_list_nth (priv->groups, group_num);
-	g_return_if_fail (p != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_GROUP], group_num);
-
-	group = (ShortcutGroup *) p->data;
-
-	e_free_string_list (group->shortcuts);
-
-	priv->groups = g_list_remove_link (priv->groups, p);
-
-	make_dirty (shortcuts);
-}
-
-void
-e_shortcuts_add_group (EShortcuts *shortcuts,
-		       int group_num,
-		       const char *group_name)
-{
-	EShortcutsPrivate *priv;
-	ShortcutGroup *group;
-
-	g_return_if_fail (shortcuts != NULL);
-	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
-
-	priv = shortcuts->priv;
-
-	group = g_new (ShortcutGroup, 1);
-	group->title     = g_strdup (group_name);
-	group->shortcuts = NULL;
-
-	if (group_num == -1)
-		group_num = g_list_length (priv->groups);
-
-	priv->groups = g_list_insert (priv->groups, group, group_num);
-
-	gtk_signal_emit (GTK_OBJECT (shortcuts), signals[NEW_GROUP], group_num);
-
-	make_dirty (shortcuts);
-}
-
-
-const char *
-e_shortcuts_get_group_title (EShortcuts *shortcuts,
-			     int group_num)
-{
-	EShortcutsPrivate *priv;
-	GList *group_element;
-	const ShortcutGroup *group;
-
-	g_return_val_if_fail (shortcuts != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
-
-	priv = shortcuts->priv;
-
-	group_element = g_list_nth (priv->groups, group_num);
-	if (group_element == NULL)
-		return NULL;
-
-	group = (ShortcutGroup *) group_element->data;
-
-	return group->title;
-}
-
-
-E_MAKE_TYPE (e_shortcuts, "EShortcuts", EShortcuts, class_init, init, PARENT_TYPE)
-
diff --git a/shell/e-shortcuts.h b/shell/e-shortcuts.h
deleted file mode 100644
index bd7ed54080..0000000000
--- a/shell/e-shortcuts.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shortcuts.h
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SHORTCUTS_H_
-#define _E_SHORTCUTS_H_
-
-#include <gtk/gtkwidget.h>
-
-#include "e-folder-type-registry.h"
-#include "e-storage-set.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SHORTCUTS			(e_shortcuts_get_type ())
-#define E_SHORTCUTS(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SHORTCUTS, EShortcuts))
-#define E_SHORTCUTS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHORTCUTS, EShortcutsClass))
-#define E_IS_SHORTCUTS(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SHORTCUTS))
-#define E_IS_SHORTCUTS_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHORTCUTS))
-
-
-typedef struct _EShortcuts        EShortcuts;
-typedef struct _EShortcutsPrivate EShortcutsPrivate;
-typedef struct _EShortcutsClass   EShortcutsClass;
-
-struct _EShortcuts {
-	GtkObject parent;
-
-	EShortcutsPrivate *priv;
-};
-
-struct _EShortcutsClass {
-	GtkObjectClass parent_class;
-
-	/* Signals.  */
-
-	void  (* new_group)        (EShortcuts *shortcuts, int group_num);
-	void  (* remove_group)     (EShortcuts *shortcuts, int group_num);
-	void  (* new_shortcut)     (EShortcuts *shortcuts, int group_num, int item_num);
-	void  (* remove_shortcut)  (EShortcuts *shortcuts, int group_num, int item_num);
-};
-
-
-
-GtkType      e_shortcuts_get_type                (void);
-void         e_shortcuts_construct               (EShortcuts          *shortcuts,
-						  EStorageSet         *storage_set,
-						  EFolderTypeRegistry *folder_type_registry);
-EShortcuts  *e_shortcuts_new                     (EStorageSet         *storage_set,
-						  EFolderTypeRegistry *folder_type_registry,
-						  const char          *file_name);
-
-GList       *e_shortcuts_get_group_titles        (EShortcuts          *shortcuts);
-const char  *e_shortcuts_get_group_title         (EShortcuts          *shortcuts,
-						  int                  group_num);
-
-GList       *e_shortcuts_get_shortcuts_in_group  (EShortcuts          *shortcuts,
-						  const char          *group_title);
-EStorageSet *e_shortcuts_get_storage_set         (EShortcuts          *shortcuts);
-GtkWidget   *e_shortcuts_new_view                (EShortcuts          *shortcuts);
-
-gboolean     e_shortcuts_load                    (EShortcuts          *shortcuts,
-						  const char          *path);
-gboolean     e_shortcuts_save                    (EShortcuts          *shortcuts,
-						  const char          *path);
-
-const char  *e_shortcuts_get_uri                 (EShortcuts          *shortcuts,
-						  int                  group_num,
-						  int                  num);
-
-void         e_shortcuts_remove_shortcut         (EShortcuts          *shortcuts,
-						  int                  group_num,
-						  int                  num);
-void         e_shortcuts_add_shortcut            (EShortcuts          *shortcuts,
-						  int                  group_num,
-						  int                  num,
-						  const char          *uri);
-void         e_shortcuts_update_shortcut         (EShortcuts *shortcuts,
-						  int         group_num,
-						  int         num,
-						  const char *uri);
-void         e_shortcuts_remove_group            (EShortcuts          *shortcuts,
-						  int                  group_num);
-void         e_shortcuts_add_group               (EShortcuts          *shortcuts,
-						  int                  group_num,
-						  const char          *group_name);
-
-void         e_shortcuts_remove_shortcut_by_uri (EShortcuts *shortcuts,
-						 const char *uri);
-
-void         e_shortcuts_update_shortcut_by_uri  (EShortcuts *shortcuts,
-						  const char *uri);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SHORTCUTS_H_ */
diff --git a/shell/e-splash.c b/shell/e-splash.c
deleted file mode 100644
index 424758d13c..0000000000
--- a/shell/e-splash.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-splash.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <gal/util/e-util.h>
-
-#include "e-splash.h"
-
-
-#define PARENT_TYPE gtk_window_get_type ()
-static GtkWindowClass *parent_class = NULL;
-
-struct _Icon {
-	GdkPixbuf *dark_pixbuf;
-	GdkPixbuf *light_pixbuf;
-	GnomeCanvasItem *canvas_item;
-};
-typedef struct _Icon Icon;
-
-struct _ESplashPrivate {
-	GnomeCanvas *canvas;
-	GdkPixbuf *splash_image_pixbuf;
-
-	GList *icons;		/* (Icon *) */
-	int num_icons;
-
-	int layout_idle_id;
-};
-
-
-/* Layout constants.  These need to be changed if the splash changes.  */
-
-#define ICON_Y    280
-#define ICON_SIZE 32
-
-
-/* Icon management.  */
-
-static GdkPixbuf *
-create_darkened_pixbuf (GdkPixbuf *pixbuf)
-{
-	GdkPixbuf *new;
-	unsigned char *rowp;
-	int width, height;
-	int rowstride;
-	int i, j;
-
-	new = gdk_pixbuf_copy (pixbuf);
-	if (! gdk_pixbuf_get_has_alpha (new))
-		return new;
-
-	width     = gdk_pixbuf_get_width (new);
-	height    = gdk_pixbuf_get_height (new);
-	rowstride = gdk_pixbuf_get_rowstride (new);
-
-	rowp = gdk_pixbuf_get_pixels (new);
-	for (i = 0; i < height; i ++) {
-		unsigned char *p;
-
-		p = rowp;
-		for (j = 0; j < width; j++) {
-			p[3] *= .25;
-			p += 4;
-		}
-
-		rowp += rowstride;
-	}
-
-	return new;
-}
-
-static Icon *
-icon_new (ESplash *splash,
-	  GdkPixbuf *image_pixbuf)
-{
-	ESplashPrivate *priv;
-	GnomeCanvasGroup *canvas_root_group;
-	Icon *icon;
-
-	priv = splash->priv;
-
-	icon = g_new (Icon, 1);
-
-	icon->light_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, ICON_SIZE, ICON_SIZE);
-	gdk_pixbuf_scale (image_pixbuf, icon->light_pixbuf,
-			  0, 0,
-			  ICON_SIZE, ICON_SIZE,
-			  0, 0,
-			  (double) ICON_SIZE / gdk_pixbuf_get_width (image_pixbuf),
-			  (double) ICON_SIZE / gdk_pixbuf_get_height (image_pixbuf),
-			  GDK_INTERP_HYPER);
-
-	icon->dark_pixbuf  = create_darkened_pixbuf (icon->light_pixbuf);
-
-	/* Set up the canvas item to point to the dark pixbuf initially.  */
-
-	canvas_root_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (priv->canvas)->root);
-
-	icon->canvas_item = gnome_canvas_item_new (canvas_root_group,
-						   GNOME_TYPE_CANVAS_PIXBUF,
-						   "pixbuf", icon->dark_pixbuf,
-						   NULL);
-
-	return icon;
-}
-
-static void
-icon_free (Icon *icon)
-{
-	gdk_pixbuf_unref (icon->dark_pixbuf);
-	gdk_pixbuf_unref (icon->light_pixbuf);
-/*  	gtk_object_unref (GTK_OBJECT (icon->canvas_item)); */
-
-	g_free (icon);
-}
-
-
-/* Icon layout management.  */
-
-static void
-layout_icons (ESplash *splash)
-{
-	ESplashPrivate *priv;
-	GList *p;
-	double x_step;
-	double x, y;
-
-	priv = splash->priv;
-
-	x_step = ((double) gdk_pixbuf_get_width (priv->splash_image_pixbuf)) / priv->num_icons;
-
-	x = (x_step - ICON_SIZE) / 2.0;
-	y = ICON_Y;
-
-	for (p = priv->icons; p != NULL; p = p->next) {
-		Icon *icon;
-
-		icon = (Icon *) p->data;
-
-		gtk_object_set (GTK_OBJECT (icon->canvas_item),
-				"x", (double) x,
-				"y", (double) ICON_Y,
-				NULL);
-
-		x += x_step;
-	}
-}
-
-static int
-layout_idle_cb (void *data)
-{
-	ESplash *splash;
-	ESplashPrivate *priv;
-
-	splash = E_SPLASH (data);
-	priv = splash->priv;
-
-	layout_icons (splash);
-
-	priv->layout_idle_id = 0;
-
-	return FALSE;
-}
-
-static void
-schedule_relayout (ESplash *splash)
-{
-	ESplashPrivate *priv;
-
-	priv = splash->priv;
-
-	if (priv->layout_idle_id != 0)
-		return;
-
-	priv->layout_idle_id = gtk_idle_add (layout_idle_cb, splash);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESplash *splash;
-	ESplashPrivate *priv;
-	GList *p;
-
-	splash = E_SPLASH (object);
-	priv = splash->priv;
-
-	if (priv->splash_image_pixbuf != NULL)
-		gdk_pixbuf_unref (priv->splash_image_pixbuf);
-
-	for (p = priv->icons; p != NULL; p = p->next) {
-		Icon *icon;
-
-		icon = (Icon *) p->data;
-		icon_free (icon);
-	}
-
-	g_list_free (priv->icons);
-
-	if (priv->layout_idle_id != 0)
-		gtk_idle_remove (priv->layout_idle_id);
-
-	g_free (priv);
-}
-
-
-static void
-class_init (ESplashClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (gtk_window_get_type ());
-}
-
-static void
-init (ESplash *splash)
-{
-	ESplashPrivate *priv;
-
-	priv = g_new (ESplashPrivate, 1);
-	priv->canvas              = NULL;
-	priv->splash_image_pixbuf = NULL;
-	priv->icons               = NULL;
-	priv->num_icons           = 0;
-	priv->layout_idle_id      = 0;
-
-	splash->priv = priv;
-}
-
-static gboolean
-button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	ESplash *splash = (ESplash *) data;
-	
-	gtk_widget_hide (GTK_WIDGET (splash));
-	
-	return TRUE;
-}
-
-
-/**
- * e_splash_construct:
- * @splash: A pointer to an ESplash widget
- * @splash_image_pixbuf: The pixbuf for the image to appear in the splash dialog
- * 
- * Construct @splash with @splash_image_pixbuf as the splash image.
- **/
-void
-e_splash_construct (ESplash *splash,
-		    GdkPixbuf *splash_image_pixbuf)
-{
-	ESplashPrivate *priv;
-	GtkWidget *canvas, *frame;
-	int image_width, image_height;
-
-	g_return_if_fail (splash != NULL);
-	g_return_if_fail (E_IS_SPLASH (splash));
-	g_return_if_fail (splash_image_pixbuf != NULL);
-
-	priv = splash->priv;
-
-	priv->splash_image_pixbuf = gdk_pixbuf_ref (splash_image_pixbuf);
-
-	canvas = gnome_canvas_new_aa ();
-	priv->canvas = GNOME_CANVAS (canvas);
-
-	image_width = gdk_pixbuf_get_width (splash_image_pixbuf);
-	image_height = gdk_pixbuf_get_height (splash_image_pixbuf);
-
-	gtk_widget_set_usize (canvas, image_width, image_height);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, image_width, image_height);
-	gtk_widget_show (canvas);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (frame), canvas);
-	gtk_widget_show (frame);
-
-	gtk_container_add (GTK_CONTAINER (splash), frame);
-
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (priv->canvas->root),
-			       GNOME_TYPE_CANVAS_PIXBUF,
-			       "pixbuf", splash_image_pixbuf,
-			       NULL);
-	
-	gtk_signal_connect (GTK_OBJECT (splash), "button-press-event",
-			    GTK_SIGNAL_FUNC (button_press_event), splash);
-	
-	gtk_object_set (GTK_OBJECT (splash), "type", GTK_WINDOW_TOPLEVEL, NULL);
-	gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
-	gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height);
-	gtk_window_set_title (GTK_WINDOW (splash), "Evolution");
-
-}
-
-/**
- * e_splash_new:
- *
- * Create a new ESplash widget.
- * 
- * Return value: A pointer to the newly created ESplash widget.
- **/
-GtkWidget *
-e_splash_new (void)
-{
-	ESplash *new;
-	GdkPixbuf *splash_image_pixbuf;
-
-	splash_image_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/splash.png");
-	g_return_val_if_fail (splash_image_pixbuf != NULL, NULL);
-
-	new = gtk_type_new (e_splash_get_type ());
-	e_splash_construct (new, splash_image_pixbuf);
-
-	gdk_pixbuf_unref (splash_image_pixbuf);
-
-	return GTK_WIDGET (new);
-}
-
-
-/**
- * e_splash_add_icon:
- * @splash: A pointer to an ESplash widget
- * @icon_pixbuf: Pixbuf for the icon to be added
- * 
- * Add @icon_pixbuf to the @splash.
- * 
- * Return value: The total number of icons in the splash after the new icon has
- * been added.
- **/
-int
-e_splash_add_icon (ESplash *splash,
-		   GdkPixbuf *icon_pixbuf)
-{
-	ESplashPrivate *priv;
-	Icon *icon;
-
-	g_return_val_if_fail (splash != NULL, 0);
-	g_return_val_if_fail (E_IS_SPLASH (splash), 0);
-	g_return_val_if_fail (icon_pixbuf != NULL, 0);
-
-	if (GTK_OBJECT_DESTROYED (splash))
-		return 0;
-	
-	priv = splash->priv;
-
-	icon = icon_new (splash, icon_pixbuf);
-	priv->icons = g_list_append (priv->icons, icon);
-
-	priv->num_icons ++;
-
-	schedule_relayout (splash);
-
-	return priv->num_icons;
-}
-
-/**
- * e_splash_set_icon_highlight:
- * @splash: A pointer to an ESplash widget
- * @num: Number of the icon whose highlight state must be changed
- * @highlight: Whether the icon must be highlit or not
- * 
- * Change the highlight state of the @num-th icon.
- **/
-void
-e_splash_set_icon_highlight  (ESplash *splash,
-			      int num,
-			      gboolean highlight)
-{
-	ESplashPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (splash != NULL);
-	g_return_if_fail (E_IS_SPLASH (splash));
-
-	if (GTK_OBJECT_DESTROYED (splash))
-		return;
-	
-	priv = splash->priv;
-
-	icon = (Icon *) g_list_nth (priv->icons, num)->data;
-
-	gtk_object_set (GTK_OBJECT (icon->canvas_item),
-			"pixbuf", highlight ? icon->light_pixbuf : icon->dark_pixbuf,
-			NULL);
-}
-
-
-E_MAKE_TYPE (e_splash, "ESplash", ESplash, class_init, init, PARENT_TYPE)
diff --git a/shell/e-splash.h b/shell/e-splash.h
deleted file mode 100644
index 153d54d7c3..0000000000
--- a/shell/e-splash.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-splash.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SPLASH_H_
-#define _E_SPLASH_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwindow.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SPLASH			(e_splash_get_type ())
-#define E_SPLASH(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
-#define E_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
-#define E_IS_SPLASH(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
-#define E_IS_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
-
-
-typedef struct _ESplash        ESplash;
-typedef struct _ESplashPrivate ESplashPrivate;
-typedef struct _ESplashClass   ESplashClass;
-
-struct _ESplash {
-	GtkWindow parent;
-
-	ESplashPrivate *priv;
-};
-
-struct _ESplashClass {
-	GtkWindowClass parent_class;
-};
-
-
-GtkType    e_splash_get_type            (void);
-void       e_splash_construct           (ESplash   *splash,
-					 GdkPixbuf *splash_image);
-GtkWidget *e_splash_new                 (void);
-
-int        e_splash_add_icon            (ESplash   *splash,
-					 GdkPixbuf *icon);
-void       e_splash_set_icon_highlight  (ESplash   *splash,
-					 int        num,
-					 gboolean   highlight);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SPLASH_H_ */
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
deleted file mode 100644
index e31a5e6700..0000000000
--- a/shell/e-storage-set-view.c
+++ /dev/null
@@ -1,1253 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage-set-view.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- * Etree-ification: Chris Toshok
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <gal/util/e-util.h>
-#include "e-util/e-gtk-utils.h"
-
-#include "e-shell-constants.h"
-
-#include "e-storage-set-view.h"
-
-#include <gal/e-table/e-tree-simple.h>
-#include <gal/e-table/e-cell-tree.h>
-#include <gal/e-table/e-cell-text.h>
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("Folder"),
-};
-#endif
-
-#define ETABLE_SPEC "<ETableSpecification no-headers=\"true\" selection-mode=\"single\" cursor-mode=\"line\" draw-grid=\"true\" horizontal-scrolling=\"true\"> \
-  <ETableColumn model_col=\"0\" _title=\"Folder\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"render_tree\" compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping></grouping>                                  \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-
-#define PARENT_TYPE E_TABLE_TYPE
-static ETableClass *parent_class = NULL;
-
-struct _EStorageSetViewPrivate {
-	EStorageSet *storage_set;
-
-	ETreeModel *etree_model;
-	ETreePath *root_node;
-
-	GHashTable *path_to_etree_node;
-
-	GHashTable *type_name_to_pixbuf;
-
-	/* Path of the row selected by the latest "cursor_change" signal.  */
-	const char *selected_row_path;
-
-	gboolean show_folders;
-};
-
-
-enum {
-	FOLDER_SELECTED,
-	STORAGE_SELECTED,
-	DND_ACTION,
-	LAST_SIGNAL
-};
-
-static unsigned int signals[LAST_SIGNAL] = { 0 };
-
-
-/* DND stuff.  */
-
-enum _DndTargetType {
-	DND_TARGET_TYPE_URI_LIST,
-	DND_TARGET_TYPE_E_SHORTCUT
-};
-typedef enum _DndTargetType DndTargetType;
-
-#define URI_LIST_TYPE   "text/uri-list"
-#define E_SHORTCUT_TYPE "E-SHORTCUT"
-
-static GtkTargetEntry source_drag_types [] = {
-	{ URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST },
-	{ E_SHORTCUT_TYPE, 0, DND_TARGET_TYPE_E_SHORTCUT }
-};
-static const int num_source_drag_types = sizeof (source_drag_types) / sizeof (source_drag_types[0]);
-
-static GtkTargetEntry destination_drag_types [] = {
-	{ URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST },
-	{ E_SHORTCUT_TYPE, 0, DND_TARGET_TYPE_E_SHORTCUT }
-};
-static const int num_destination_drag_types = sizeof (destination_drag_types) / sizeof (destination_drag_types[0]);
-
-static GtkTargetList *target_list;
-
-
-/* Helper functions.  */
-
-static gboolean
-add_node_to_hash (EStorageSetView *storage_set_view,
-		  const char *path,
-		  ETreePath *node)
-{
-	EStorageSetViewPrivate *priv;
-	char *hash_path;
-
-	g_return_val_if_fail (g_path_is_absolute (path), FALSE);
-
-	priv = storage_set_view->priv;
-
-	if (g_hash_table_lookup (priv->path_to_etree_node, path) != NULL) {
-		g_warning ("EStorageSetView: Node already existing while adding -- %s", path);
-		return FALSE;
-	}
-
-	hash_path = g_strdup (path);
-
-	g_hash_table_insert (priv->path_to_etree_node, hash_path, node);
-
-	return TRUE;
-}
-
-static ETreePath *
-lookup_node_in_hash (EStorageSetView *storage_set_view,
-		     const char *path)
-{
-	EStorageSetViewPrivate *priv;
-	ETreePath *node;
-
-	priv = storage_set_view->priv;
-
-	node = g_hash_table_lookup (priv->path_to_etree_node, path);
-	if (node == NULL)
-		g_warning ("EStorageSetView: Node not found while updating -- %s", path);
-
-	return node;
-}
-
-static ETreePath *
-remove_node_from_hash (EStorageSetView *storage_set_view,
-		       const char *path)
-{
-	EStorageSetViewPrivate *priv;
-	ETreePath *node;
-
-	priv = storage_set_view->priv;
-
-	node = g_hash_table_lookup (priv->path_to_etree_node, path);
-	if (node == NULL) {
-		g_warning ("EStorageSetView: Node not found while removing -- %s", path);
-		return NULL;
-	}
-
-	g_hash_table_remove (priv->path_to_etree_node, path);
-
-	return node;
-}
-
-static GdkPixbuf*
-get_pixbuf_for_folder (EStorageSetView *storage_set_view,
-		       EFolder *folder)
-{
-	GdkPixbuf *scaled_pixbuf;
-	const char *type_name;
-	EStorageSetViewPrivate *priv;
-
-	priv = storage_set_view->priv;
-	
-	type_name = e_folder_get_type_string (folder);
-
-	scaled_pixbuf = g_hash_table_lookup (priv->type_name_to_pixbuf, type_name);
-
-	if (scaled_pixbuf == NULL) {
-		EFolderTypeRegistry *folder_type_registry;
-		EStorageSet *storage_set;
-		GdkPixbuf *icon_pixbuf;
-		int icon_pixbuf_width, icon_pixbuf_height;
-
-		storage_set = priv->storage_set;
-		folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
-
-		icon_pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry,
-									type_name, TRUE);
-
-		if (icon_pixbuf == NULL)
-			return NULL;
-
-		icon_pixbuf_width = gdk_pixbuf_get_width (icon_pixbuf);
-		icon_pixbuf_height = gdk_pixbuf_get_height (icon_pixbuf);
-
-		if (icon_pixbuf_width == E_SHELL_MINI_ICON_SIZE && icon_pixbuf_height == E_SHELL_MINI_ICON_SIZE) {
-			scaled_pixbuf = gdk_pixbuf_ref (icon_pixbuf);
-		} else {
-			scaled_pixbuf = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (icon_pixbuf),
-							gdk_pixbuf_get_has_alpha (icon_pixbuf),
-							gdk_pixbuf_get_bits_per_sample (icon_pixbuf),
-							E_SHELL_MINI_ICON_SIZE, E_SHELL_MINI_ICON_SIZE);
-
-			gdk_pixbuf_scale (icon_pixbuf, scaled_pixbuf,
-					  0, 0, E_SHELL_MINI_ICON_SIZE, E_SHELL_MINI_ICON_SIZE,
-					  0.0, 0.0,
-					  (double) E_SHELL_MINI_ICON_SIZE / gdk_pixbuf_get_width (icon_pixbuf),
-					  (double) E_SHELL_MINI_ICON_SIZE / gdk_pixbuf_get_height (icon_pixbuf),
-					  GDK_INTERP_HYPER);
-		}
-
-		g_hash_table_insert (priv->type_name_to_pixbuf, g_strdup(type_name), scaled_pixbuf);
-	}
-
-	return scaled_pixbuf;
-}
-
-
-/* Custom marshalling function.  */
-
-typedef void (* GtkSignal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING) (GtkObject *object,
-								      GdkDragContext *action,
-								      const char *,
-								      const char *,
-								      const char *);
-
-static void
-marshal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING (GtkObject *object,
-						   GtkSignalFunc func,
-						   void *func_data,
-						   GtkArg *args)
-{
-	GtkSignal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING rfunc;
-
-	rfunc = (GtkSignal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING) func;
-	(* rfunc) (object,
-		   GTK_VALUE_POINTER (args[0]),
-		   GTK_VALUE_STRING (args[1]),
-		   GTK_VALUE_STRING (args[2]),
-		   GTK_VALUE_STRING (args[3]));
-}
-
-
-/* DnD selection setup stuff.  */
-
-static void
-set_uri_list_selection (EStorageSetView *storage_set_view,
-			GtkSelectionData *selection_data)
-{
-	EStorageSetViewPrivate *priv;
-	char *uri_list;
-
-	priv = storage_set_view->priv;
-
-	/* FIXME: Get `evolution:' from somewhere instead of hardcoding it here.  */
-	uri_list = g_strconcat ("evolution:", priv->selected_row_path, "\n", NULL);
-	gtk_selection_data_set (selection_data, selection_data->target,
-				8, (guchar *) uri_list, strlen (uri_list));
-	g_free (uri_list);
-}
-
-static void
-set_e_shortcut_selection (EStorageSetView *storage_set_view,
-			  GtkSelectionData *selection_data)
-{
-	EStorageSetViewPrivate *priv;
-	int shortcut_len;
-	char *shortcut;
-	const char *trailing_slash;
-	const char *name;
-
-	g_return_if_fail(storage_set_view != NULL);
-
-	priv = storage_set_view->priv;
-
-	trailing_slash = strrchr (priv->selected_row_path, '/');
-	if (trailing_slash == NULL)
-		name = NULL;
-	else
-		name = trailing_slash + 1;
-
-	/* FIXME: Get `evolution:' from somewhere instead of hardcoding it here.  */
-
-	if (name != NULL)
-		shortcut_len = strlen (name);
-	else
-		shortcut_len = 0;
-	
-	shortcut_len ++;	/* Separating zero.  */
-
-	shortcut_len += strlen ("evolution:");
-	shortcut_len += strlen (priv->selected_row_path);
-	shortcut_len ++;	/* Trailing zero.  */
-
-	shortcut = g_malloc (shortcut_len);
-
-	if (name == NULL)
-		sprintf (shortcut, "%cevolution:%s", '\0', priv->selected_row_path);
-	else
-		sprintf (shortcut, "%s%cevolution:%s", name, '\0', priv->selected_row_path);
-
-	gtk_selection_data_set (selection_data, selection_data->target,
-				8, (guchar *) shortcut, shortcut_len);
-
-	g_free (shortcut);
-}
-
-
-/* Folder context menu.  */
-/* FIXME: This should be moved somewhere else, so that also the shortcut code
-   can share it.  */
-
-#if 0
-static void
-folder_context_menu_activate_cb (BonoboUIComponent *uih,
-				 void *data,
-				 const char *path)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-
-	gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED],
-			 priv->selected_row_path);
-}
-
-static void
-populate_folder_context_menu_with_common_items (EStorageSetView *storage_set_view,
-						BonoboUIComponent *uih)
-{
-	bonobo_ui_handler_menu_new_item (uih, "/Activate",
-					 _("_View"), _("View the selected folder"),
-					 0, BONOBO_UI_HANDLER_PIXMAP_NONE,
-					 NULL, 0, 0,
-					 folder_context_menu_activate_cb,
-					 storage_set_view);
-}
-#endif
-
-static void
-popup_folder_menu (EStorageSetView *storage_set_view,
-		   GdkEventButton *event)
-{
-#if 0
-	EvolutionShellComponentClient *handler;
-	EStorageSetViewPrivate *priv;
-	EFolderTypeRegistry *folder_type_registry;
-	BonoboUIComponent *uih;
-	EFolder *folder;
-
-	priv = storage_set_view->priv;
-
-	uih = bonobo_ui_handler_new ();
-	bonobo_ui_handler_create_popup_menu (uih);
-
-	folder = e_storage_set_get_folder (priv->storage_set, priv->selected_row_path);
-	if (folder == NULL) {
-		/* Uh!?  */
-		return;
-	}
-
-	folder_type_registry = e_storage_set_get_folder_type_registry (priv->storage_set);
-	g_assert (folder_type_registry != NULL);
-
-	handler = e_folder_type_registry_get_handler_for_type (folder_type_registry,
-							       e_folder_get_type_string (folder));
-	g_assert (handler != NULL);
-
-	evolution_shell_component_client_populate_folder_context_menu (handler,
-								       uih,
-								       e_folder_get_physical_uri (folder),
-								       e_folder_get_type_string (folder));
-
-	populate_folder_context_menu_with_common_items (storage_set_view, uih);
-
-	bonobo_ui_handler_do_popup_menu (uih);
-
-	bonobo_object_unref (BONOBO_OBJECT (uih));
-#endif
-}
-
-
-/* GtkObject methods.  */
-
-static void
-path_free_func (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-
-static void
-pixbuf_free_func (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	gdk_pixbuf_unref ((GdkPixbuf*)value);
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-
-	storage_set_view = E_STORAGE_SET_VIEW (object);
-	priv = storage_set_view->priv;
-
-	/* need to destroy our tree */
-	e_tree_model_node_remove (priv->etree_model, priv->root_node);
-	gtk_object_unref (GTK_OBJECT (priv->etree_model));
-
-	/* now free up all the paths stored in the hash table and
-           destroy the hash table itself */
-	g_hash_table_foreach (priv->path_to_etree_node, path_free_func, NULL);
-	g_hash_table_destroy (priv->path_to_etree_node);
-
-	/* now free up all the type_names and pixbufs stored in the
-           hash table and destroy the hash table itself */
-	g_hash_table_foreach (priv->type_name_to_pixbuf, pixbuf_free_func, NULL);
-	g_hash_table_destroy (priv->type_name_to_pixbuf);
-
-	gtk_object_unref (GTK_OBJECT (priv->storage_set));
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* ETable methods */
-
-static void
-table_drag_begin (ETable *etable,
-		  int row, int col,
-		  GdkDragContext *context)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreePath *node;
-
-	storage_set_view = E_STORAGE_SET_VIEW (etable);
-	priv = storage_set_view->priv;
-
-	node = e_tree_model_node_at_row (priv->etree_model, row);
-
-	priv->selected_row_path = e_tree_model_node_get_data (priv->etree_model, node);
-}
-
-static void
-table_drag_data_get (ETable *etable,
-		     int drag_row,
-		     int drag_col,
-		     GdkDragContext *context,
-		     GtkSelectionData *selection_data,
-		     unsigned int info,
-		     guint32 time)
-{
-	EStorageSetView *storage_set_view;
-
-	storage_set_view = E_STORAGE_SET_VIEW (etable);
-
-	switch (info) {
-	case DND_TARGET_TYPE_URI_LIST:
-		set_uri_list_selection (storage_set_view, selection_data);
-		break;
-	case DND_TARGET_TYPE_E_SHORTCUT:
-		set_e_shortcut_selection (storage_set_view, selection_data);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static gboolean
-table_drag_motion (ETable *table,
-		   int row,
-		   int col,
-		   GdkDragContext *context,
-		   int x,
-		   int y,
-		   unsigned int time)
-{
-	gdk_drag_status (context, GDK_ACTION_MOVE, time);
-
-	return TRUE;
-}
-
-static gboolean
-table_drag_drop (ETable *etable,
-		 int row,
-		 int col,
-		 GdkDragContext *context,
-		 int x,
-		 int y,
-		 unsigned int time)
-{
-	if (context->targets != NULL) {
-		gtk_drag_get_data (GTK_WIDGET (etable), context,
-				   GPOINTER_TO_INT (context->targets->data),
-				   time);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-table_drag_data_received (ETable *etable,
-			  int row,
-			  int col,
-			  GdkDragContext *context,
-			  int x,
-			  int y,
-			  GtkSelectionData *selection_data,
-			  unsigned int info,
-			  unsigned int time)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreePath *target_tree_path;
-	const char *target_path;
-
-	storage_set_view = E_STORAGE_SET_VIEW (etable);
-	priv = storage_set_view->priv;
-
-	target_tree_path = e_tree_model_node_at_row (priv->etree_model, row);
-	target_path = e_tree_model_node_get_data (priv->etree_model, target_tree_path);
-}
-
-static gboolean
-right_click (ETable *etable,
-	     int row,
-	     int col,
-	     GdkEvent *event)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-
-	storage_set_view = E_STORAGE_SET_VIEW (etable);
-	priv = storage_set_view->priv;
-
-	popup_folder_menu (storage_set_view, (GdkEventButton *) event);
-
-	return TRUE;
-}
-
-static void
-cursor_change (ETable *table,
-	       int row)
-{
-	EStorageSetView *storage_set_view;
-	ETreePath *node;
-	EStorageSetViewPrivate *priv;
-
-	storage_set_view = E_STORAGE_SET_VIEW (table);
-
-	priv = storage_set_view->priv;
-
-	node = e_tree_model_node_at_row (priv->etree_model, row);
-
-	priv->selected_row_path = e_tree_model_node_get_data (priv->etree_model, node);
-
-	if (e_tree_model_node_depth (priv->etree_model, node) >= 2) {
-		/* it was a folder */
-		gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED],
-				 priv->selected_row_path);
-	} else {
-		/* it was a storage */
-		gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[STORAGE_SELECTED],
-				 priv->selected_row_path + 1);
-	}
-}
-
-
-/* ETableModel Methods */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-etree_col_count (ETableModel *etc, void *data)
-{
-	return 2;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-etree_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup (value);
-	else
-		return (void *)value;
-}
-
-/* This function frees the value passed to it. */
-static void
-etree_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col == 0)
-		g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-etree_initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == 0)
-		return g_strdup ("");
-	else
-		return NULL;
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-etree_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return !(value && *(char *)value);
-	else
-		return !value;
-}
-
-/* This function reports if a value is empty. */
-static char *
-etree_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup(value);
-	else
-		return g_strdup(value ? "Yes" : "No");
-}
-
-/* ETreeModel Methods */
-
-static GdkPixbuf*
-etree_icon_at (ETreeModel *etree,
-	       ETreePath *tree_path,
-	       void *model_data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSet *storage_set;
-	EFolder *folder;
-	char *path;
-
-	/* folders are from depth 2 on.  depth 1 are storages and 0 is
-           our (invisible) root node. */
-	if (e_tree_model_node_depth (etree, tree_path) < 2)
-		return NULL;
-
-	storage_set_view = E_STORAGE_SET_VIEW (model_data);
-	storage_set = storage_set_view->priv->storage_set;
-
-	path = (char*)e_tree_model_node_get_data (etree, tree_path);
-
-	folder = e_storage_set_get_folder (storage_set, path);
-	if (folder == NULL)
-		return NULL;
-
-	return get_pixbuf_for_folder (storage_set_view, folder);
-}
-
-static void*
-etree_value_at (ETreeModel *etree, ETreePath *tree_path, int col, void *model_data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSet *storage_set;
-	EStorage *storage;
-	EFolder *folder;
-	char *path;
-
-	storage_set_view = E_STORAGE_SET_VIEW (model_data);
-	storage_set = storage_set_view->priv->storage_set;
-
-	path = (char *) e_tree_model_node_get_data (etree, tree_path);
-
-	folder = e_storage_set_get_folder (storage_set, path);
-	if (folder != NULL) {
-		if (col == 0)
-			return (void *) e_folder_get_name (folder);
-		else
-			return (void *) e_folder_get_highlighted (folder);
-	}
-
-	storage = e_storage_set_get_storage (storage_set, path + 1);
-	if (storage != NULL && col == 0)
-		return (void *) e_storage_get_name (storage);
-
-	return NULL;
-}
-
-static void
-etree_set_value_at (ETreeModel *etree, ETreePath *path, int col, const void *val, void *model_data)
-{
-	/* nada */
-}
-
-static gboolean
-etree_is_editable (ETreeModel *etree, ETreePath *path, int col, void *model_data)
-{
-	return FALSE;
-}
-
-
-/* StorageSet signal handling.  */
-
-static int
-treepath_compare (ETreeModel *model,
-		  ETreePath  *node1,
-		  ETreePath  *node2)
-{
-	char *path1, *path2;
-	path1 = e_tree_model_node_get_data (model, node1);
-	path2 = e_tree_model_node_get_data (model, node2);
-
-	return strcasecmp (path1, path2);
-}
-
-static void
-new_storage_cb (EStorageSet *storage_set,
-		EStorage *storage,
-		void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreePath *node;
-	char *path;
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-
-	path = g_strconcat (G_DIR_SEPARATOR_S, e_storage_get_name (storage), NULL);
-
-	node = e_tree_model_node_insert_id (priv->etree_model,
-					    priv->root_node,
-					    -1, path, path);
-
-	e_tree_model_node_set_expanded (priv->etree_model, node, TRUE);
-
-	if (! add_node_to_hash (storage_set_view, path, node)) {
-		g_free (path);
-		e_tree_model_node_remove (priv->etree_model, node);
-		return;
-	}
-
-	/* FIXME: We want a more specialized sort, e.g. the local folders should always be
-           on top.  */
-	e_tree_model_node_set_compare_function (priv->etree_model, priv->root_node, treepath_compare);
-}
-
-static void
-removed_storage_cb (EStorageSet *storage_set,
-		    EStorage *storage,
-		    void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreeModel *etree;
-	ETreePath *node;
-	char *path;
-	char *node_data;
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-	etree = priv->etree_model;
-
-	path = g_strconcat (G_DIR_SEPARATOR_S, e_storage_get_name (storage), NULL);
-	node = remove_node_from_hash (storage_set_view, path);
-	g_free (path);
-
-	node_data = e_tree_model_node_remove (etree, node);
-	g_free (node_data);
-}
-
-static void
-new_folder_cb (EStorageSet *storage_set,
-	       const char *path,
-	       void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreeModel *etree;
-	ETreePath *parent_node;
-	ETreePath *new_node;
-	const char *last_separator;
-	char *parent_path;
-	char *copy_of_path;
-
-	g_return_if_fail (g_path_is_absolute (path));
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-	etree = priv->etree_model;
-
-	last_separator = strrchr (path, G_DIR_SEPARATOR);
-
-	parent_path = g_strndup (path, last_separator - path);
-	parent_node = g_hash_table_lookup (priv->path_to_etree_node, parent_path);
-	if (parent_node == NULL) {
-		g_print ("EStorageSetView: EStorageSet reported new subfolder for non-existing folder -- %s\n",
-			 parent_path);
-		g_free (parent_path);
-		return;
-	}
-
-	g_free (parent_path);
-
-	copy_of_path = g_strdup (path);
-	new_node = e_tree_model_node_insert_id (etree, parent_node, -1, copy_of_path, copy_of_path);
-	e_tree_model_node_set_compare_function (priv->etree_model, new_node, treepath_compare);
-
-	if (! add_node_to_hash (storage_set_view, path, new_node)) {
-		e_tree_model_node_remove (etree, new_node);
-		return;
-	}
-
-	e_tree_model_node_sort (priv->etree_model, parent_node);
-}
-
-static void
-updated_folder_cb (EStorageSet *storage_set,
-		   const char *path,
-		   void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreeModel *etree;
-	ETreePath *node;
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-	etree = priv->etree_model;
-
-	node = lookup_node_in_hash (storage_set_view, path);
-	e_tree_model_node_changed (etree, node);
-}
-
-static void
-removed_folder_cb (EStorageSet *storage_set,
-		   const char *path,
-		   void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	ETreeModel *etree;
-	ETreePath *node;
-	char *node_data;
-
-	storage_set_view = E_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-	etree = priv->etree_model;
-
-	node = remove_node_from_hash (storage_set_view, path);
-	node_data = e_tree_model_node_remove (etree, node);
-	g_free (node_data);
-}
-
-
-static void
-class_init (EStorageSetViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableClass *etable_class;
-
-	parent_class = gtk_type_class (e_table_get_type ());
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	etable_class = E_TABLE_CLASS (klass);
-	etable_class->right_click              = right_click;
-	etable_class->cursor_change            = cursor_change;
-	etable_class->table_drag_begin         = table_drag_begin;
-	etable_class->table_drag_data_get      = table_drag_data_get;
-	etable_class->table_drag_motion        = table_drag_motion;
-	etable_class->table_drag_drop          = table_drag_drop;
-	etable_class->table_drag_data_received = table_drag_data_received;
-
-	signals[FOLDER_SELECTED]
-		= gtk_signal_new ("folder_selected",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EStorageSetViewClass, folder_selected),
-				  gtk_marshal_NONE__STRING,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	signals[STORAGE_SELECTED]
-		= gtk_signal_new ("storage_selected",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EStorageSetViewClass, storage_selected),
-				  gtk_marshal_NONE__STRING,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	signals[DND_ACTION]
-		= gtk_signal_new ("dnd_action",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EStorageSetViewClass, dnd_action),
-				  marshal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING,
-				  GTK_TYPE_NONE, 4,
-				  GTK_TYPE_GDK_DRAG_CONTEXT,
-				  GTK_TYPE_STRING,
-				  GTK_TYPE_STRING,
-				  GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	/* Set up DND.  */
-
-	target_list = gtk_target_list_new (source_drag_types, num_source_drag_types);
-	g_assert (target_list != NULL);
-}
-
-static void
-init (EStorageSetView *storage_set_view)
-{
-	EStorageSetViewPrivate *priv;
-
-	priv = g_new (EStorageSetViewPrivate, 1);
-
-	priv->storage_set         = NULL;
-	priv->path_to_etree_node  = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->type_name_to_pixbuf = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->selected_row_path   = NULL;
-	priv->show_folders        = TRUE;
-
-	storage_set_view->priv = priv;
-}
-
-
-/* Handling of the "changed" signal in EFolders displayed in the EStorageSetView.  */
-
-struct _FolderChangedCallbackData {
-	EStorageSetView *storage_set_view;
-	char *path;
-};
-typedef struct _FolderChangedCallbackData FolderChangedCallbackData;
-
-static void
-folder_changed_callback_data_destroy_notify (void *data)
-{
-	FolderChangedCallbackData *callback_data;
-
-	callback_data = (FolderChangedCallbackData *) data;
-
-	g_free (callback_data->path);
-	g_free (callback_data);
-}
-
-static void
-folder_changed_cb (EFolder *folder,
-		   void *data)
-{
-	EStorageSetView *storage_set_view;
-	EStorageSetViewPrivate *priv;
-	FolderChangedCallbackData *callback_data;
-	ETreePath *node;
-
-	callback_data = (FolderChangedCallbackData *) data;
-
-	storage_set_view = callback_data->storage_set_view;
-	priv = callback_data->storage_set_view->priv;
-
-	node = g_hash_table_lookup (priv->path_to_etree_node, callback_data->path);
-	if (node == NULL) {
-		g_warning ("EStorageSetView -- EFolder::changed emitted for a folder whose path I don't know.");
-		return;
-	}
-
-	e_tree_model_node_changed (priv->etree_model, node);
-}
-
-
-static void
-insert_folders (EStorageSetView *storage_set_view,
-		ETreePath *parent,
-		EStorage *storage,
-		const char *path)
-{
-	EStorageSetViewPrivate *priv;
-	ETreeModel *etree;
-	ETreePath *node;
-	GList *folder_path_list;
-	GList *p;
-	const char *storage_name;
-
-	priv = storage_set_view->priv;
-	etree = priv->etree_model;
-
-	storage_name = e_storage_get_name (storage);
-
-	folder_path_list = e_storage_get_subfolder_paths (storage, path);
-	if (folder_path_list == NULL)
-		return;
-
-	for (p = folder_path_list; p != NULL; p = p->next) {
-		FolderChangedCallbackData *folder_changed_callback_data;
-		EFolder *folder;
-		const char *folder_name;
-		const char *folder_path;
-		char *full_path;
-
-		folder_path = (const char *) p->data;
-		folder = e_storage_get_folder (storage, folder_path);
-		folder_name = e_folder_get_name (folder);
-
-		full_path = g_strconcat ("/", storage_name, folder_path, NULL);
-		node = e_tree_model_node_insert_id (etree, parent, -1, (void *) full_path, full_path);
-		add_node_to_hash (storage_set_view, full_path, node);
-		e_tree_model_node_set_compare_function (priv->etree_model, node, treepath_compare);
-
-		insert_folders (storage_set_view, node, storage, folder_path);
-
-		folder_changed_callback_data = g_new (FolderChangedCallbackData, 1);
-		folder_changed_callback_data->storage_set_view = storage_set_view;
-		folder_changed_callback_data->path = g_strdup (full_path);
-
-		e_gtk_signal_connect_full_while_alive (GTK_OBJECT (folder), "changed",
-						       GTK_SIGNAL_FUNC (folder_changed_cb),
-						       NULL,
-						       folder_changed_callback_data,
-						       folder_changed_callback_data_destroy_notify,
-						       FALSE, FALSE,
-						       GTK_OBJECT (storage_set_view));
-	}
-
-	e_free_string_list (folder_path_list);
-}
-
-static void
-insert_storages (EStorageSetView *storage_set_view)
-{
-	EStorageSetViewPrivate *priv;
-	EStorageSet *storage_set;
-	GList *storage_list;
-	GList *p;
-
-	priv = storage_set_view->priv;
-
-	storage_set = priv->storage_set;
-
-	storage_list = e_storage_set_get_storage_list (storage_set);
-
-	for (p = storage_list; p != NULL; p = p->next) {
-		EStorage *storage = E_STORAGE (p->data);
-		const char *name;
-		char *path;
-		ETreePath *parent;
-
-		name = e_storage_get_name (storage);
-		path = g_strconcat ("/", name, NULL);
-
-		parent = e_tree_model_node_insert_id (priv->etree_model, priv->root_node,
-						   -1, path, path);
-		e_tree_model_node_set_expanded (priv->etree_model, parent, TRUE);
-		e_tree_model_node_set_compare_function (priv->etree_model, parent, treepath_compare);
-
-		g_hash_table_insert (priv->path_to_etree_node, path, parent);
-
-		if (priv->show_folders)
-			insert_folders (storage_set_view, parent, storage, "/");
-	}
-
-	e_free_object_list (storage_list);
-}
-
-void
-e_storage_set_view_construct (EStorageSetView *storage_set_view,
-			      EStorageSet *storage_set)
-{
-	EStorageSetViewPrivate *priv;
-	ETableExtras *extras;
-	ECell *cell;
-
-	g_return_if_fail (storage_set_view != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view));
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-
-	priv = storage_set_view->priv;
-
-	priv->etree_model = e_tree_simple_new (etree_col_count,
-					       etree_duplicate_value,
-					       etree_free_value,
-					       etree_initialize_value,
-					       etree_value_is_empty,
-					       etree_value_to_string,
-					       etree_icon_at,
-					       etree_value_at,
-					       etree_set_value_at,
-					       etree_is_editable,
-					       storage_set_view);
-	e_tree_model_root_node_set_visible (priv->etree_model, FALSE);
-
-	priv->root_node = e_tree_model_node_insert (priv->etree_model, NULL, -1, "/Root Node");
-
-	extras = e_table_extras_new ();
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell), "bold_column", 1, NULL);
-	e_table_extras_add_cell (extras, "render_tree",
-				 e_cell_tree_new (NULL, NULL, TRUE, cell));
-
-	e_table_construct (E_TABLE (storage_set_view), E_TABLE_MODEL(priv->etree_model), extras,
-			   ETABLE_SPEC, NULL);
-	gtk_object_unref (GTK_OBJECT (extras));
-
-	e_table_drag_source_set (E_TABLE (storage_set_view), GDK_BUTTON1_MASK,
-				 source_drag_types, num_source_drag_types,
-				 GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
-	e_table_drag_dest_set (E_TABLE (storage_set_view), GTK_DEST_DEFAULT_ALL,
-			       source_drag_types, num_source_drag_types,
-			       GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
-	gtk_object_ref (GTK_OBJECT (storage_set));
-	priv->storage_set = storage_set;
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "new_storage",
-					GTK_SIGNAL_FUNC (new_storage_cb), storage_set_view,
-					GTK_OBJECT (storage_set_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "removed_storage",
-					GTK_SIGNAL_FUNC (removed_storage_cb), storage_set_view,
-					GTK_OBJECT (storage_set_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "new_folder",
-					GTK_SIGNAL_FUNC (new_folder_cb), storage_set_view,
-					GTK_OBJECT (storage_set_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "updated_folder",
-					GTK_SIGNAL_FUNC (updated_folder_cb), storage_set_view,
-					GTK_OBJECT (storage_set_view));
-	gtk_signal_connect_while_alive (GTK_OBJECT (storage_set), "removed_folder",
-					GTK_SIGNAL_FUNC (removed_folder_cb), storage_set_view,
-					GTK_OBJECT (storage_set_view));
-
-	insert_storages (storage_set_view);
-}
-
-GtkWidget *
-e_storage_set_view_new (EStorageSet *storage_set)
-{
-	GtkWidget *new;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	new = gtk_type_new (e_storage_set_view_get_type ());
-	e_storage_set_view_construct (E_STORAGE_SET_VIEW (new), storage_set);
-
-	return new;
-}
-
-
-void
-e_storage_set_view_set_current_folder (EStorageSetView *storage_set_view,
-				       const char *path)
-{
-	EStorageSetViewPrivate *priv;
-	ETreePath *node;
-
-	g_return_if_fail (storage_set_view != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view));
-	g_return_if_fail (path != NULL && g_path_is_absolute (path));
-
-	priv = storage_set_view->priv;
-
-	node = g_hash_table_lookup (priv->path_to_etree_node, path);
-	if (node == NULL) {
-		return;
-	}
-
-	e_tree_model_show_node (priv->etree_model, node);
-	e_table_set_cursor_row (E_TABLE (storage_set_view),
-				e_tree_model_row_of_node (priv->etree_model, node));
-
-	gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], path);
-}
-
-const char *
-e_storage_set_view_get_current_folder (EStorageSetView *storage_set_view)
-{
-	EStorageSetViewPrivate *priv;
-	ETreePath *etree_node;
-	const char *path;
-	int row;
-
-	g_return_val_if_fail (storage_set_view != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view), NULL);
-
-	priv = storage_set_view->priv;
-
-	if (!priv->show_folders)
-		return NULL; /* Mmh! */
-
-	row = e_table_get_cursor_row (E_TABLE (storage_set_view));
-	etree_node = e_tree_model_node_at_row (priv->etree_model, row);
-
-	if (etree_node == NULL)
-		return NULL;	/* Mmh? */
-
-	path = (char*)e_tree_model_node_get_data(priv->etree_model, etree_node);
-
-	return path;
-}
-
-void
-e_storage_set_view_set_show_folders (EStorageSetView *storage_set_view,
-				     gboolean show)
-{
-	EStorageSetViewPrivate *priv;
-
-	g_return_if_fail (storage_set_view != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view));
-
-	priv = storage_set_view->priv;
-
-	if (show == priv->show_folders)
-		return;
-
-	/* tear down existing tree and hash table mappings */
-	e_tree_model_node_remove (priv->etree_model, priv->root_node);
-	g_hash_table_foreach (priv->path_to_etree_node, path_free_func, NULL);
-
-	/* now re-add the root node */
-	priv->root_node = e_tree_model_node_insert (priv->etree_model, NULL, -1, "/Root Node");
-
-	/* then reinsert the storages after setting the "show_folders"
-	   flag.  insert_storages will call insert_folders if
-	   show_folders is TRUE */
-
-	priv->show_folders = show;
-	insert_storages (storage_set_view);
-}
-
-gboolean
-e_storage_set_view_get_show_folders (EStorageSetView *storage_set_view)
-{
-	return storage_set_view->priv->show_folders;
-}
-
-
-E_MAKE_TYPE (e_storage_set_view, "EStorageSetView", EStorageSetView, class_init, init, PARENT_TYPE)
diff --git a/shell/e-storage-set-view.h b/shell/e-storage-set-view.h
deleted file mode 100644
index 88d6f52862..0000000000
--- a/shell/e-storage-set-view.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage-set-view.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_STORAGE_SET_VIEW_H__
-#define __E_STORAGE_SET_VIEW_H__
-
-#include <gal/e-table/e-table.h>
-#include "e-storage-set.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_STORAGE_SET_VIEW			(e_storage_set_view_get_type ())
-#define E_STORAGE_SET_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_STORAGE_SET_VIEW, EStorageSetView))
-#define E_STORAGE_SET_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_STORAGE_SET_VIEW, EStorageSetViewClass))
-#define E_IS_STORAGE_SET_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_STORAGE_SET_VIEW))
-#define E_IS_STORAGE_SET_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_STORAGE_SET_VIEW))
-
-
-typedef struct _EStorageSetView        EStorageSetView;
-typedef struct _EStorageSetViewPrivate EStorageSetViewPrivate;
-typedef struct _EStorageSetViewClass   EStorageSetViewClass;
-
-struct _EStorageSetView {
-	ETable parent;
-
-	EStorageSetViewPrivate *priv;
-};
-
-struct _EStorageSetViewClass {
-	ETableClass parent_class;
-
-	/* Signals.  */
-
-	void (* folder_selected)  (EStorageSetView *storage_set_view,
-				   const char *path);
-	void (* storage_selected) (EStorageSetView *storage_set_view,
-				   const char *name);
-
-	void (* dnd_action) (EStorageSetView *storage_set_view,
-			     GdkDragContext *context,
-			     const char *source_data,
-			     const char *source_data_type,
-			     const char *target_path);
-};
-
-
-GtkType     e_storage_set_view_get_type            (void);
-GtkWidget  *e_storage_set_view_new                 (EStorageSet     *storage_set);
-void        e_storage_set_view_construct           (EStorageSetView *storage_set_view,
-						    EStorageSet     *storage_set);
-void        e_storage_set_view_set_current_folder  (EStorageSetView *storage_set_view,
-						    const char      *path);
-const char *e_storage_set_view_get_current_folder  (EStorageSetView *storage_set_view);
-
-void        e_storage_set_view_set_show_folders    (EStorageSetView *storage_set_view,
-						    gboolean show);
-gboolean    e_storage_set_view_get_show_folders    (EStorageSetView *storage_set_view);
-						    
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_STORAGE_SET_VIEW_H__ */
diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
deleted file mode 100644
index 9921fe192c..0000000000
--- a/shell/e-storage-set.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage-set.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktypeutils.h>
-
-#include <string.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-storage-set-view.h"
-#include "e-storage-set.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-
-static GtkObjectClass *parent_class = NULL;
-
-/* This is just to make GHashTable happy.  */
-struct _NamedStorage {
-	char *name;
-	EStorage *storage;
-};
-typedef struct _NamedStorage NamedStorage;
-
-struct _EStorageSetPrivate {
-	GList *storages;	/* EStorage */
-	GHashTable *name_to_named_storage;
-
-	EFolderTypeRegistry *folder_type_registry;
-};
-
-enum {
-	NEW_STORAGE,
-	REMOVED_STORAGE,
-	NEW_FOLDER,
-	UPDATED_FOLDER,
-	REMOVED_FOLDER,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static NamedStorage *
-named_storage_new (EStorage *storage)
-{
-	NamedStorage *new;
-
-	new = g_new (NamedStorage, 1);
-	new->name    = g_strdup (e_storage_get_name (storage));
-	new->storage = storage;
-
-	return new;
-}
-
-static void
-named_storage_destroy (NamedStorage *named_storage)
-{
-	g_free (named_storage->name);
-	g_free (named_storage);
-}
-
-static gboolean
-name_to_named_storage_foreach_destroy (void *key,
-				       void *value,
-				       void *user_data)
-{
-	NamedStorage *named_storage;
-
-	named_storage = (NamedStorage *) value;
-	named_storage_destroy (named_storage);
-
-	return TRUE;
-}
-
-
-/* Handling for signals coming from the EStorages.  */
-
-static char *
-make_full_path (EStorage *storage,
-		const char *path)
-{
-	const char *storage_name;
-	char *full_path;
-
-	storage_name = e_storage_get_name (storage);
-
-	if (! g_path_is_absolute (path))
-		full_path = g_strconcat (G_DIR_SEPARATOR_S, storage_name,
-					 G_DIR_SEPARATOR_S, path, NULL);
-	else
-		full_path = g_strconcat (G_DIR_SEPARATOR_S, storage_name,
-					 path, NULL);
-
-	return full_path;
-}
-
-static void
-storage_new_folder_cb (EStorage *storage,
-		       const char *path,
-		       void *data)
-{
-	EStorageSet *storage_set;
-	char *full_path;
-
-	storage_set = E_STORAGE_SET (data);
-
-	full_path = make_full_path (storage, path);
-	gtk_signal_emit (GTK_OBJECT (storage_set), signals[NEW_FOLDER], full_path);
-	g_free (full_path);
-}
-
-static void
-storage_updated_folder_cb (EStorage *storage,
-			   const char *path,
-			   void *data)
-{
-	EStorageSet *storage_set;
-	char *full_path;
-
-	storage_set = E_STORAGE_SET (data);
-
-	full_path = make_full_path (storage, path);
-	gtk_signal_emit (GTK_OBJECT (storage_set), signals[UPDATED_FOLDER], full_path);
-	g_free (full_path);
-}
-
-static void
-storage_removed_folder_cb (EStorage *storage,
-			   const char *path,
-			   void *data)
-{
-	EStorageSet *storage_set;
-	char *full_path;
-
-	storage_set = E_STORAGE_SET (data);
-
-	full_path = make_full_path (storage, path);
-	g_print ("EStorageSet: Removed folder -- %s\n", full_path);
-	gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_FOLDER], full_path);
-	g_free (full_path);
-}
-
-
-static EStorage *
-get_storage_for_path (EStorageSet *storage_set,
-		      const char *path,
-		      const char **subpath_return)
-{
-	EStorage *storage;
-	char *storage_name;
-	const char *first_separator;
-
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	/* Skip initial separator.  */
-	path++;
-
-	first_separator = strchr (path, G_DIR_SEPARATOR);
-
-	if (first_separator == NULL || first_separator == path || first_separator[1] == 0) {
-		*subpath_return = NULL;
-		return NULL;
-	}
-
-	storage_name = g_strndup (path, first_separator - path);
-	storage = e_storage_set_get_storage (storage_set, storage_name);
-	g_free (storage_name);
-
-	*subpath_return = first_separator;
-
-	return storage;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EStorageSet *storage_set;
-	EStorageSetPrivate *priv;
-
-	storage_set = E_STORAGE_SET (object);
-	priv = storage_set->priv;
-
-	e_free_object_list (priv->storages);
-
-	gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
-
-	g_hash_table_foreach (priv->name_to_named_storage,
-			      (GHFunc) named_storage_destroy, NULL);
-	g_hash_table_destroy (priv->name_to_named_storage);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EStorageSetClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	object_class->destroy = destroy;
-
-	signals[NEW_STORAGE] = 
-		gtk_signal_new ("new_storage",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageSetClass, new_storage),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	signals[REMOVED_STORAGE] = 
-		gtk_signal_new ("removed_storage",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageSetClass, removed_storage),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	signals[NEW_FOLDER] = 
-		gtk_signal_new ("new_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageSetClass, new_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	signals[UPDATED_FOLDER] = 
-		gtk_signal_new ("updated_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageSetClass, updated_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	signals[REMOVED_FOLDER] = 
-		gtk_signal_new ("removed_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageSetClass, removed_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EStorageSet *storage_set)
-{
-	EStorageSetPrivate *priv;
-
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-
-	priv = g_new (EStorageSetPrivate, 1);
-	priv->storages              = NULL;
-	priv->name_to_named_storage = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->folder_type_registry  = NULL;
-
-	storage_set->priv = priv;
-}
-
-
-void
-e_storage_set_construct (EStorageSet *storage_set,
-			 EFolderTypeRegistry *folder_type_registry)
-{
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-
-	GTK_OBJECT_UNSET_FLAGS (storage_set, GTK_FLOATING);
-
-	gtk_object_ref (GTK_OBJECT (folder_type_registry));
-	storage_set->priv->folder_type_registry = folder_type_registry;
-}
-
-EStorageSet *
-e_storage_set_new (EFolderTypeRegistry *folder_type_registry)
-{
-	EStorageSet *new;
-
-	new = gtk_type_new (e_storage_set_get_type ());
-
-	e_storage_set_construct (new, folder_type_registry);
-
-	return new;
-}
-
-
-GList *
-e_storage_set_get_storage_list (EStorageSet *storage_set)
-{
-	EStorageSetPrivate *priv;
-	GList *list;
-	GList *p;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	priv = storage_set->priv;
-
-	list = NULL;
-	for (p = priv->storages; p != NULL; p = p->next) {
-		gtk_object_ref (GTK_OBJECT (p->data));
-		list = g_list_prepend (list, p->data);
-	}
-
-	return g_list_reverse (list); /* Lame.  */
-}
-
-/**
- * e_storage_set_add_storage:
- * @storage_set: 
- * @storage: 
- * 
- * Add @storage to @storage_set.  Notice that will ref the storage.
- **/
-gboolean
-e_storage_set_add_storage (EStorageSet *storage_set,
-			   EStorage *storage)
-{
-	EStorageSetPrivate *priv;
-	const char *storage_name;
-	NamedStorage *named_storage;
-
-	g_return_val_if_fail (storage_set != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), FALSE);
-	g_return_val_if_fail (storage != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE (storage), FALSE);
-
-	priv = storage_set->priv;
-
-	storage_name = e_storage_get_name (storage);
-	if (g_hash_table_lookup (priv->name_to_named_storage, storage_name) != NULL)
-		return FALSE;
-
-	gtk_object_ref (GTK_OBJECT (storage));
-
-	gtk_signal_connect (GTK_OBJECT (storage), "new_folder",
-			    GTK_SIGNAL_FUNC (storage_new_folder_cb), storage_set);
-	gtk_signal_connect (GTK_OBJECT (storage), "updated_folder",
-			    GTK_SIGNAL_FUNC (storage_updated_folder_cb), storage_set);
-	gtk_signal_connect (GTK_OBJECT (storage), "removed_folder",
-			    GTK_SIGNAL_FUNC (storage_removed_folder_cb), storage_set);
-
-	priv->storages = g_list_append (priv->storages, storage);
-
-	named_storage = named_storage_new (storage);
-	g_hash_table_insert (priv->name_to_named_storage, named_storage->name, named_storage);
-
-	gtk_signal_emit (GTK_OBJECT (storage_set), signals[NEW_STORAGE], storage);
-
-	return TRUE;
-}
-
-gboolean
-e_storage_set_remove_storage (EStorageSet *storage_set,
-			      EStorage *storage)
-{
-	EStorageSetPrivate *priv;
-	NamedStorage *named_storage;
-
-	g_return_val_if_fail (storage_set != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), FALSE);
-	g_return_val_if_fail (storage != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE (storage), FALSE);
-
-	priv = storage_set->priv;
-
-	named_storage = g_hash_table_lookup (priv->name_to_named_storage,
-					     e_storage_get_name (storage));
-	if (named_storage == NULL)
-		return FALSE;
-
-	g_hash_table_remove (priv->name_to_named_storage, named_storage->name);
-	named_storage_destroy (named_storage);
-
-	priv->storages = g_list_remove (priv->storages, storage);
-
-	gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage);
-	gtk_object_unref (GTK_OBJECT (storage));
-
-	return TRUE;
-}
-
-void
-e_storage_set_remove_all_storages (EStorageSet *storage_set)
-{
-	EStorageSetPrivate *priv;
-	GList *p;
-
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-
-	priv = storage_set->priv;
-
-	for (p = priv->storages; p != NULL; p = p->next) {
-		EStorage *storage;
-
-		storage = E_STORAGE (p->data);
-
-		gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage);
-		gtk_object_unref (GTK_OBJECT (storage));
-	}
-
-	g_hash_table_foreach_remove (priv->name_to_named_storage,
-				     name_to_named_storage_foreach_destroy,
-				     NULL);
-
-	g_list_free (priv->storages);
-	priv->storages = NULL;
-}
-
-
-EStorage *
-e_storage_set_get_storage (EStorageSet *storage_set,
-			   const char *name)
-{
-	EStorageSetPrivate *priv;
-	NamedStorage *named_storage;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	priv = storage_set->priv;
-
-	named_storage = g_hash_table_lookup (priv->name_to_named_storage, name);
-	if (named_storage == NULL)
-		return NULL;
-	else
-		return named_storage->storage;
-}
-
-EFolder *
-e_storage_set_get_folder (EStorageSet *storage_set,
-			  const char *path)
-{
-	EStorage *storage;
-	const char *subpath;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	storage = get_storage_for_path (storage_set, path, &subpath);
-	if (storage == NULL)
-		return NULL;
-
-	return e_storage_get_folder (storage, subpath);
-}
-
-
-GtkWidget *
-e_storage_set_new_view (EStorageSet *storage_set)
-{
-	GtkWidget *storage_set_view;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	storage_set_view = e_storage_set_view_new (storage_set);
-
-	return storage_set_view;
-}
-
-
-void
-e_storage_set_async_create_folder  (EStorageSet            *storage_set,
-				    const char             *path,
-				    const char             *type,
-				    const char             *description,
-				    EStorageResultCallback  callback,
-				    void                   *data)
-{
-	EStorage *storage;
-	const char *subpath;
-
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (g_path_is_absolute (path));
-	g_return_if_fail (type != NULL);
-	g_return_if_fail (description != NULL);
-	g_return_if_fail (callback != NULL);
-
-	storage = get_storage_for_path (storage_set, path, &subpath);
-
-	e_storage_async_create_folder (storage, subpath, type, description, callback, data);
-}
-
-void
-e_storage_set_async_remove_folder  (EStorageSet            *storage_set,
-				    const char             *path,
-				    EStorageResultCallback  callback,
-				    void                   *data)
-{
-	EStorage *storage;
-	const char *subpath;
-
-	g_return_if_fail (storage_set != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET (storage_set));
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (g_path_is_absolute (path));
-	g_return_if_fail (callback != NULL);
-
-	storage = get_storage_for_path (storage_set, path, &subpath);
-
-	e_storage_async_remove_folder (storage, path, callback, data);
-}
-
-
-EFolderTypeRegistry *
-e_storage_set_get_folder_type_registry (EStorageSet *storage_set)
-{
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-
-	return storage_set->priv->folder_type_registry;
-}
-
-
-/* Utility functions.  */
-
-/**
- * e_storage_set_get_path_for_physical_uri:
- * @storage_set: A storage set
- * @physical_uri: A physical URI
- * 
- * Retrieve the path of the folder whose physical URI matches @physical_uri.
- * 
- * Return value: 
- **/
-char *
-e_storage_set_get_path_for_physical_uri (EStorageSet *storage_set,
-					 const char *physical_uri)
-{
-	EStorageSetPrivate *priv;
-	GList *p;
-
-	g_return_val_if_fail (storage_set != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
-	g_return_val_if_fail (physical_uri != NULL, NULL);
-
-	priv = storage_set->priv;
-
-	for (p = priv->storages; p != NULL; p = p->next) {
-		EStorage *storage;
-		char *storage_path;
-
-		storage = E_STORAGE (p->data);
-
-		storage_path = e_storage_get_path_for_physical_uri (storage, physical_uri);
-		if (storage_path != NULL) {
-			char *storage_set_path;
-
-			storage_set_path = g_strconcat (G_DIR_SEPARATOR_S,
-							e_storage_get_name (storage),
-							storage_path,
-							NULL);
-			g_free (storage_path);
-
-			return storage_set_path;
-		}
-	}
-
-	return NULL;
-}
-
-
-E_MAKE_TYPE (e_storage_set, "EStorageSet", EStorageSet, class_init, init, PARENT_TYPE)
diff --git a/shell/e-storage-set.h b/shell/e-storage-set.h
deleted file mode 100644
index b39725ea1c..0000000000
--- a/shell/e-storage-set.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage-set.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_STORAGE_SET_H_
-#define _E_STORAGE_SET_H_
-
-#include <gtk/gtkwidget.h>
-
-#include "e-folder-type-registry.h"
-#include "e-storage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_STORAGE_SET			(e_storage_set_get_type ())
-#define E_STORAGE_SET(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_STORAGE_SET, EStorageSet))
-#define E_STORAGE_SET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_STORAGE_SET, EStorageSetClass))
-#define E_IS_STORAGE_SET(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_STORAGE_SET))
-#define E_IS_STORAGE_SET_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_STORAGE_SET))
-
-
-typedef struct _EStorageSet        EStorageSet;
-typedef struct _EStorageSetPrivate EStorageSetPrivate;
-typedef struct _EStorageSetClass   EStorageSetClass;
-
-struct _EStorageSet {
-	GtkObject parent;
-
-	EStorageSetPrivate *priv;
-};
-
-struct _EStorageSetClass {
-	GtkObjectClass parent_class;
-
-	/* Signals.  */
-
-	void (* new_storage)     (EStorageSet *storage_set, EStorage *storage);
-	void (* removed_storage) (EStorageSet *storage_set, EStorage *storage);
-	/* FIXME?  Inconsistency between storage and folders.  */
-	void (* new_folder)     (EStorageSet *storage_set, const char *path);
-	void (* updated_folder) (EStorageSet *storage_set, const char *path);
-	void (* removed_folder) (EStorageSet *storage_set, const char *path);
-};
-
-
-GtkType      e_storage_set_get_type             (void);
-void         e_storage_set_construct            (EStorageSet            *storage_set,
-						 EFolderTypeRegistry    *folder_type_registry);
-EStorageSet *e_storage_set_new                  (EFolderTypeRegistry    *folder_type_registry);
-
-gboolean     e_storage_set_add_storage          (EStorageSet            *storage_set,
-						 EStorage               *storage);
-gboolean     e_storage_set_remove_storage       (EStorageSet            *storage_set,
-						 EStorage               *storage);
-void         e_storage_set_remove_all_storages  (EStorageSet            *storage_set);
-
-GList       *e_storage_set_get_storage_list     (EStorageSet            *storage_set);
-EStorage    *e_storage_set_get_storage          (EStorageSet            *storage_set,
-						 const char             *storage_name);
-EFolder     *e_storage_set_get_folder           (EStorageSet            *storage_set,
-						 const char             *path);
-
-GtkWidget   *e_storage_set_new_view             (EStorageSet            *storage_set);
-
-void         e_storage_set_async_create_folder  (EStorageSet            *storage_set,
-						 const char             *path,
-						 const char             *type,
-						 const char             *description,
-						 EStorageResultCallback  callback,
-						 void                   *data);
-void         e_storage_set_async_remove_folder  (EStorageSet            *storage_set,
-						 const char             *path,
-						 EStorageResultCallback  callback,
-						 void                   *data);
-
-EFolderTypeRegistry *e_storage_set_get_folder_type_registry (EStorageSet *storage_set);
-
-/* Utility functions.  */
-
-char *e_storage_set_get_path_for_physical_uri  (EStorageSet *storage_set,
-						const char  *physical_uri);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_STORAGE_SET_H_ */
diff --git a/shell/e-storage.c b/shell/e-storage.c
deleted file mode 100644
index e38c5e3fbf..0000000000
--- a/shell/e-storage.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-
-#include <gnome.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-folder-tree.h"
-
-#include "e-storage.h"
-
-
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
-
-#define ES_CLASS(obj) \
-	E_STORAGE_CLASS (GTK_OBJECT (obj)->klass)
-
-struct _EStoragePrivate {
-	/* The set of folders we have in this storage.  */
-	EFolderTree *folder_tree;
-
-	/* URI for the toplevel node.  */
-	char *toplevel_node_uri;
-
-	/* Toplevel node type.  */
-	char *toplevel_node_type;
-};
-
-enum {
-	NEW_FOLDER,
-	UPDATED_FOLDER,
-	REMOVED_FOLDER,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Destroy notification function for the folders in the tree.  */
-
-static void
-folder_destroy_notify (EFolderTree *tree,
-		       const char *path,
-		       void *data,
-		       void *closure)
-{
-	EFolder *e_folder;
-
-	if (data == NULL) {
-		/* The root folder has no EFolder associated to it.  */
-		return;
-	}
-
-	e_folder = E_FOLDER (data);
-	gtk_object_unref (GTK_OBJECT (e_folder));
-}
-
-
-/* Signal callbacks for the EFolders.  */
-
-static void
-folder_changed_cb (EFolder *folder,
-		   void *data)
-{
-	EStorage *storage;
-	EStoragePrivate *priv;
-	const char *path, *p;
-	gboolean highlight;
-
-	g_assert (E_IS_STORAGE (data));
-
-	storage = E_STORAGE (data);
-	priv = storage->priv;
-
-	path = e_folder_tree_get_path_for_data (priv->folder_tree, folder);
-	g_assert (path != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (storage), signals[UPDATED_FOLDER], path);
-
-	highlight = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (folder), "last_highlight"));
-	if (highlight != e_folder_get_highlighted (folder)) {
-		highlight = !highlight;
-		gtk_object_set_data (GTK_OBJECT (folder), "last_highlight",
-				     GINT_TO_POINTER (highlight));
-		p = strrchr (path, '/');
-		if (p && p != path) {
-			char *name;
-			
-			name = g_strndup (path, p - path);
-			folder = e_folder_tree_get_folder (priv->folder_tree, name);
-			g_free (name);
-			if (folder)
-				e_folder_set_child_highlight (folder, highlight);
-		}
-	}
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EStorage *storage;
-	EStoragePrivate *priv;
-
-	storage = E_STORAGE (object);
-	priv = storage->priv;
-
-	if (priv->folder_tree != NULL)
-		e_folder_tree_destroy (priv->folder_tree);
-
-	g_free (priv->toplevel_node_uri);
-	g_free (priv->toplevel_node_type);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* EStorage methods.  */
-
-static GList *
-impl_get_subfolder_paths (EStorage *storage,
-			  const char *path)
-{
-	EStoragePrivate *priv;
-
-	priv = storage->priv;
-
-	return e_folder_tree_get_subfolders (priv->folder_tree, path);
-}
-
-static EFolder *
-impl_get_folder (EStorage *storage,
-		 const char *path)
-{
-	EStoragePrivate *priv;
-	EFolder *e_folder;
-
-	priv = storage->priv;
-
-	e_folder = (EFolder *) e_folder_tree_get_folder (priv->folder_tree, path);
-
-	return e_folder;
-}
-
-static const char *
-impl_get_name (EStorage *storage)
-{
-	return _("(No name)");
-}
-
-static void
-impl_async_create_folder (EStorage *storage,
-			  const char *path,
-			  const char *type,
-			  const char *description,
-			  EStorageResultCallback callback,
-			  void *data)
-{
-	(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
-}
-
-static void
-impl_async_remove_folder (EStorage *storage,
-			  const char *path,
-			  EStorageResultCallback callback,
-			  void *data)
-{
-	(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EStorageClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (class);
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = destroy;
-
-	class->get_subfolder_paths = impl_get_subfolder_paths;
-	class->get_folder          = impl_get_folder;
-	class->get_name            = impl_get_name;
-	class->async_create_folder = impl_async_create_folder;
-	class->async_remove_folder = impl_async_remove_folder;
-
-	signals[NEW_FOLDER] =
-		gtk_signal_new ("new_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageClass, new_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	signals[UPDATED_FOLDER] =
-		gtk_signal_new ("updated_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageClass, updated_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	signals[REMOVED_FOLDER] =
-		gtk_signal_new ("removed_folder",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EStorageClass, removed_folder),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EStorage *storage)
-{
-	EStoragePrivate *priv;
-
-	priv = g_new (EStoragePrivate, 1);
-
-	priv->folder_tree        = e_folder_tree_new (folder_destroy_notify, NULL);
-	priv->toplevel_node_uri  = NULL;
-	priv->toplevel_node_type = NULL;
-
-	storage->priv = priv;
-}
-
-
-/* Creation.  */
-
-void
-e_storage_construct (EStorage *storage,
-		     const char *toplevel_node_uri,
-		     const char *toplevel_node_type)
-{
-	EStoragePrivate *priv;
-
-	g_return_if_fail (storage != NULL);
-	g_return_if_fail (E_IS_STORAGE (storage));
-
-	priv = storage->priv;
-
-	priv->toplevel_node_uri  = g_strdup (toplevel_node_uri);
-	priv->toplevel_node_type = g_strdup (toplevel_node_type);
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (storage), GTK_FLOATING);
-}
-
-EStorage *
-e_storage_new (const char *toplevel_node_uri,
-	       const char *toplevel_node_type)
-{
-	EStorage *new;
-
-	new = gtk_type_new (e_storage_get_type ());
-
-	e_storage_construct (new, toplevel_node_uri, toplevel_node_type);
-
-	return new;
-}
-
-
-gboolean
-e_storage_path_is_absolute (const char *path)
-{
-	g_return_val_if_fail (path != NULL, FALSE);
-
-	return *path == G_DIR_SEPARATOR;
-}
-
-gboolean
-e_storage_path_is_relative (const char *path)
-{
-	g_return_val_if_fail (path != NULL, FALSE);
-
-	return *path != G_DIR_SEPARATOR;
-}
-
-
-GList *
-e_storage_get_subfolder_paths (EStorage *storage,
-			       const char *path)
-{
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (g_path_is_absolute (path), NULL);
-
-	return (* ES_CLASS (storage)->get_subfolder_paths) (storage, path);
-}
-
-EFolder *
-e_storage_get_folder (EStorage *storage,
-		      const char *path)
-{
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (e_storage_path_is_absolute (path), NULL);
-
-	return (* ES_CLASS (storage)->get_folder) (storage, path);
-}
-
-const char *
-e_storage_get_name (EStorage *storage)
-{
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-
-	return (* ES_CLASS (storage)->get_name) (storage);
-}
-
-/**
- * e_storage_get_toplevel_node_uri:
- * @storage: A pointer to an EStorage object
- * 
- * Get the physical URI for the toplevel node in the storage.
- * 
- * Return value: a pointer to a string representing that URI.
- **/
-const char *
-e_storage_get_toplevel_node_uri (EStorage *storage)
-{
-	EStoragePrivate *priv;
-
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-
-	priv = storage->priv;
-	return priv->toplevel_node_uri;
-}
-
-/**
- * e_storage_get_toplevel_node_type:
- * @storage: A pointer to an EStorage object.
- * 
- * Get the folder type for the toplevel node.
- * 
- * Return value: A string identifying the type of the toplevel node.
- **/
-const char *
-e_storage_get_toplevel_node_type (EStorage *storage)
-{
-	EStoragePrivate *priv;
-
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-
-	priv = storage->priv;
-	return priv->toplevel_node_type;
-}
-
-
-/* Folder operations.  */
-
-void
-e_storage_async_create_folder (EStorage *storage,
-			       const char *path,
-			       const char *type,
-			       const char *description,
-			       EStorageResultCallback callback,
-			       void *data)
-{
-	g_return_if_fail (storage != NULL);
-	g_return_if_fail (E_IS_STORAGE (storage));
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (g_path_is_absolute (path));
-	g_return_if_fail (type != NULL);
-	g_return_if_fail (callback != NULL);
-
-	(* ES_CLASS (storage)->async_create_folder) (storage, path, type, description, callback, data);
-}
-
-void
-e_storage_async_remove_folder (EStorage *storage,
-			       const char *path,
-			       EStorageResultCallback callback,
-			       void *data)
-{
-	g_return_if_fail (storage != NULL);
-	g_return_if_fail (E_IS_STORAGE (storage));
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (g_path_is_absolute (path));
-	g_return_if_fail (callback != NULL);
-
-	(* ES_CLASS (storage)->async_remove_folder) (storage, path, callback, data);
-}
-
-
-const char *
-e_storage_result_to_string (EStorageResult result)
-{
-	switch (result) {
-	case E_STORAGE_OK:
-		return _("No error");
-	case E_STORAGE_GENERICERROR:
-		return _("Generic error");
-	case E_STORAGE_EXISTS:
-		return _("A folder with the same name already exists");
-	case E_STORAGE_INVALIDTYPE:
-		return _("The specified folder type is not valid");
-	case E_STORAGE_IOERROR:
-		return _("I/O error");
-	case E_STORAGE_NOSPACE:
-		return _("Not enough space to create the folder");
-	case E_STORAGE_NOTFOUND:
-		return _("The specified folder was not found");
-	case E_STORAGE_NOTIMPLEMENTED:
-		return _("Function not implemented in this storage");
-	case E_STORAGE_PERMISSIONDENIED:
-		return _("Permission denied");
-	case E_STORAGE_UNSUPPORTEDOPERATION:
-		return _("Operation not supported");
-	case E_STORAGE_UNSUPPORTEDTYPE:
-		return _("The specified type is not supported in this storage");
-	default:
-		return _("Unknown error");
-	}
-}
-
-
-/* Public utility functions.  */
-
-struct _GetPathForPhysicalUriForeachData {
-	const char *physical_uri;
-	char *retval;
-};
-typedef struct _GetPathForPhysicalUriForeachData GetPathForPhysicalUriForeachData;
-
-static void
-get_path_for_physical_uri_foreach (EFolderTree *folder_tree,
-				   const char *path,
-				   void *path_data,
-				   void *user_data)
-{
-	GetPathForPhysicalUriForeachData *foreach_data;
-	const char *physical_uri;
-	EFolder *e_folder;
-
-	foreach_data = (GetPathForPhysicalUriForeachData *) user_data;
-	if (foreach_data->retval != NULL)
-		return;
-
-	e_folder = (EFolder *) path_data;
-	if (e_folder == NULL)
-		return;
-
-	physical_uri = e_folder_get_physical_uri (e_folder);
-
-	if (strcmp (foreach_data->physical_uri, physical_uri) == 0)
-		foreach_data->retval = g_strdup (path);
-}
-
-/**
- * e_storage_get_path_for_physical_uri:
- * @storage: A storage
- * @physical_uri: A physical URI
- * 
- * Look for the folder having the specified @physical_uri.
- * 
- * Return value: The path of the folder having the specified @physical_uri in
- * @storage.  If such a folder does not exist, just return NULL.  The return
- * value must be freed by the caller.
- **/
-char *
-e_storage_get_path_for_physical_uri (EStorage *storage,
-				     const char *physical_uri)
-{
-	GetPathForPhysicalUriForeachData foreach_data;
-	EStoragePrivate *priv;
-
-	g_return_val_if_fail (storage != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
-	g_return_val_if_fail (physical_uri != NULL, NULL);
-
-	priv = storage->priv;
-
-	foreach_data.physical_uri = physical_uri;
-	foreach_data.retval       = NULL;
-
-	e_folder_tree_foreach (priv->folder_tree, get_path_for_physical_uri_foreach, &foreach_data);
-
-	return foreach_data.retval;
-}
-
-
-/* Protected functions.  */
-
-/* These functions are used by subclasses to add and remove folders from the
-   state stored in the storage object.  */
-
-gboolean
-e_storage_new_folder (EStorage *storage,
-		      const char *path,
-		      EFolder *e_folder)
-{
-	EStoragePrivate *priv;
-
-	g_return_val_if_fail (storage != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE (storage), FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
-	g_return_val_if_fail (g_path_is_absolute (path), FALSE);
-	g_return_val_if_fail (e_folder != NULL, FALSE);
-	g_return_val_if_fail (E_IS_FOLDER (e_folder), FALSE);
-
-	priv = storage->priv;
-
-	if (! e_folder_tree_add (priv->folder_tree, path, e_folder))
-		return FALSE;
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (e_folder), "changed", folder_changed_cb,
-					storage, GTK_OBJECT (storage));
-
-	gtk_signal_emit (GTK_OBJECT (storage), signals[NEW_FOLDER], path);
-
-	return TRUE;
-}
-
-gboolean
-e_storage_removed_folder (EStorage *storage,
-			  const char *path)
-{
-	EStoragePrivate *priv;
-
-	g_return_val_if_fail (storage != NULL, FALSE);
-	g_return_val_if_fail (E_IS_STORAGE (storage), FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
-	g_return_val_if_fail (g_path_is_absolute (path), FALSE);
-
-	priv = storage->priv;
-
-	if (e_folder_tree_get_folder (priv->folder_tree, path) == NULL)
-		return FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (storage), signals[REMOVED_FOLDER], path);
-
-	e_folder_tree_remove (priv->folder_tree, path);
-
-	return TRUE;
-}
-
-
-E_MAKE_TYPE (e_storage, "EStorage", EStorage, class_init, init, PARENT_TYPE)
diff --git a/shell/e-storage.h b/shell/e-storage.h
deleted file mode 100644
index a6716d7262..0000000000
--- a/shell/e-storage.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_STORAGE_H_
-#define _E_STORAGE_H_
-
-#include <gtk/gtkobject.h>
-
-#include "evolution-shell-component-client.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_STORAGE			(e_storage_get_type ())
-#define E_STORAGE(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_STORAGE, EStorage))
-#define E_STORAGE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_STORAGE, EStorageClass))
-#define E_IS_STORAGE(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_STORAGE))
-#define E_IS_STORAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_STORAGE))
-
-
-typedef struct _EStorage        EStorage;
-typedef struct _EStoragePrivate EStoragePrivate;
-typedef struct _EStorageClass   EStorageClass;
-
-enum _EStorageResult {
-	E_STORAGE_OK,
-	E_STORAGE_GENERICERROR,
-	E_STORAGE_EXISTS,
-	E_STORAGE_INVALIDTYPE,
-	E_STORAGE_IOERROR,
-	E_STORAGE_NOSPACE,
-	E_STORAGE_NOTFOUND,
-	E_STORAGE_NOTIMPLEMENTED,
-	E_STORAGE_PERMISSIONDENIED,
-	E_STORAGE_UNSUPPORTEDOPERATION,
-	E_STORAGE_UNSUPPORTEDTYPE
-};
-typedef enum _EStorageResult EStorageResult;
-
-typedef void (* EStorageResultCallback) (EStorage *storage, EStorageResult result, void *data);
-
-#include "e-folder.h"
-
-struct _EStorage {
-	GtkObject parent;
-
-	EStoragePrivate *priv;
-};
-
-struct _EStorageClass {
-	GtkObjectClass parent_class;
-
-	/* Signals.  */
-
-	void * (* new_folder)     (EStorage *storage, const char *path);
-	void * (* updated_folder) (EStorage *storage, const char *path);
-	void * (* removed_folder) (EStorage *storage, const char *path);
-
-	/* Virtual methods.  */
-
-	GList      * (* get_subfolder_paths)  (EStorage *storage, const char *path);
-	EFolder    * (* get_folder)    	      (EStorage *storage, const char *path);
-	const char * (* get_name)      	      (EStorage *storage);
-
-	void         (* async_create_folder)  (EStorage *storage, const char *path,
-					       const char *type, const char *description,
-					       EStorageResultCallback callback, void *data);
-	void         (* async_remove_folder)  (EStorage *storage, const char *path,
-					       EStorageResultCallback callback, void *data);
-};
-
-
-GtkType   e_storage_get_type   (void);
-void      e_storage_construct  (EStorage   *storage,
-				const char *toplevel_node_uri,
-				const char *toplevel_node_type);
-EStorage *e_storage_new        (const char *toplevel_node_uri,
-				const char *toplevel_node_type);
-
-gboolean    e_storage_path_is_relative      (const char *path);
-gboolean    e_storage_path_is_absolute      (const char *path);
-
-GList      *e_storage_get_subfolder_paths   (EStorage   *storage,
-					     const char *path);
-EFolder    *e_storage_get_folder            (EStorage   *storage,
-					     const char *path);
-
-const char *e_storage_get_name                (EStorage *storage);
-const char *e_storage_get_toplevel_node_uri   (EStorage *storage);
-const char *e_storage_get_toplevel_node_type  (EStorage *storage);
-
-/* Folder operations.  */
-
-void        e_storage_async_create_folder  (EStorage               *storage,
-					    const char             *path,
-					    const char             *type,
-					    const char             *description,
-					    EStorageResultCallback  callback,
-					    void                   *data);
-void        e_storage_async_remove_folder  (EStorage               *storage,
-					    const char             *path,
-					    EStorageResultCallback  callback,
-					    void                   *data);
-
-const char *e_storage_result_to_string     (EStorageResult          result);
-
-/* Utility functions.  */
-
-char *e_storage_get_path_for_physical_uri  (EStorage   *storage,
-					    const char *physical_uri);
-
-/* Protected.  C++ anyone?  */
-gboolean  e_storage_new_folder      (EStorage *storage, const char *path, EFolder *folder);
-gboolean  e_storage_removed_folder  (EStorage *storage, const char *path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_STORAGE_H_ */
diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c
deleted file mode 100644
index 96a1af33dd..0000000000
--- a/shell/evolution-local-storage.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-local-storage.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-local-storage.h"
-
-
-#define PARENT_TYPE evolution_storage_get_type ()
-static EvolutionStorageClass *parent_class = NULL;
-
-struct _EvolutionLocalStoragePrivate {
-	int dummy;
-};
-
-
-enum {
-	UPDATE_FOLDER,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_LocalStorage__vepv LocalStorage_vepv;
-
-static void
-impl_GNOME_Evolution_LocalStorage_updateFolder (PortableServer_Servant servant,
-					   const CORBA_char *path,
-					   const CORBA_char *display_name,
-					   CORBA_boolean highlighted,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionLocalStorage *local_storage;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	local_storage = EVOLUTION_LOCAL_STORAGE (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (local_storage), signals[UPDATE_FOLDER], path, display_name, highlighted);
-}
-
-static POA_GNOME_Evolution_LocalStorage *
-create_servant (void)
-{
-	POA_GNOME_Evolution_LocalStorage *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_LocalStorage *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &LocalStorage_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_LocalStorage__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionLocalStorage *local_storage;
-	EvolutionLocalStoragePrivate *priv;
-
-	local_storage = EVOLUTION_LOCAL_STORAGE (object);
-	priv = local_storage->priv;
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_LocalStorage__vepv *vepv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	vepv = &LocalStorage_vepv;
-	vepv->_base_epv                        = base_epv;
-	vepv->Bonobo_Unknown_epv               = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Storage_epv      = evolution_storage_get_epv ();
-	vepv->GNOME_Evolution_LocalStorage_epv = evolution_local_storage_get_epv ();
-}
-
-static void
-class_init (EvolutionLocalStorageClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	signals[UPDATE_FOLDER] = gtk_signal_new ("update_folder",
-						 GTK_RUN_FIRST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (EvolutionLocalStorageClass,
-								    update_folder),
-						 e_marshal_NONE__POINTER_POINTER_INT,
-						 GTK_TYPE_NONE, 3,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionLocalStorage *local_storage)
-{
-	EvolutionLocalStoragePrivate *priv;
-
-	priv = g_new (EvolutionLocalStoragePrivate, 1);
-
-	local_storage->priv = priv;
-}
-
-
-POA_GNOME_Evolution_LocalStorage__epv *
-evolution_local_storage_get_epv (void)
-{
-	POA_GNOME_Evolution_LocalStorage__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_LocalStorage__epv, 1);
-	epv->updateFolder = impl_GNOME_Evolution_LocalStorage_updateFolder;
-
-	return epv;
-}
-
-void
-evolution_local_storage_construct (EvolutionLocalStorage *local_storage,
-				   GNOME_Evolution_LocalStorage corba_object,
-				   const char *name)
-{
-	g_return_if_fail (local_storage != NULL);
-	g_return_if_fail (EVOLUTION_IS_LOCAL_STORAGE (local_storage));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (name[0] != '\0');
-
-	evolution_storage_construct (EVOLUTION_STORAGE (local_storage), corba_object, name, NULL, NULL);
-}
-
-EvolutionLocalStorage *
-evolution_local_storage_new (const char *name)
-{
-	EvolutionLocalStorage *new;
-	POA_GNOME_Evolution_LocalStorage *servant;
-	GNOME_Evolution_LocalStorage corba_object;
-
-	g_return_val_if_fail (name != NULL, NULL);
-	g_return_val_if_fail (name[0] != '\0', NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	new = gtk_type_new (evolution_local_storage_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
-	evolution_local_storage_construct (new, corba_object, name);
-
-	return new;
-}
-
-
-E_MAKE_TYPE (evolution_local_storage, "EvolutionLocalStorage", EvolutionLocalStorage,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-local-storage.h b/shell/evolution-local-storage.h
deleted file mode 100644
index 8f3f403d3a..0000000000
--- a/shell/evolution-local-storage.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-local-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_LOCAL_STORAGE_H__
-#define __EVOLUTION_LOCAL_STORAGE_H__
-
-#include <gnome.h>
-
-#include "evolution-storage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_LOCAL_STORAGE			(evolution_local_storage_get_type ())
-#define EVOLUTION_LOCAL_STORAGE(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_LOCAL_STORAGE, EvolutionLocalStorage))
-#define EVOLUTION_LOCAL_STORAGE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_LOCAL_STORAGE, EvolutionLocalStorageClass))
-#define EVOLUTION_IS_LOCAL_STORAGE(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_LOCAL_STORAGE))
-#define EVOLUTION_IS_LOCAL_STORAGE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_LOCAL_STORAGE))
-
-
-typedef struct _EvolutionLocalStorage        EvolutionLocalStorage;
-typedef struct _EvolutionLocalStoragePrivate EvolutionLocalStoragePrivate;
-typedef struct _EvolutionLocalStorageClass   EvolutionLocalStorageClass;
-
-struct _EvolutionLocalStorage {
-	EvolutionStorage parent;
-
-	EvolutionLocalStoragePrivate *priv;
-};
-
-struct _EvolutionLocalStorageClass {
-	EvolutionStorageClass parent_class;
-
-	void (* update_folder) (EvolutionLocalStorage *local_storage,
-				const char *path,
-				const char *display_name,
-				gboolean highlighted);
-};
-
-
-POA_GNOME_Evolution_LocalStorage__epv *evolution_local_storage_get_epv    (void);
-
-GtkType                          evolution_local_storage_get_type   (void);
-void                             evolution_local_storage_construct  (EvolutionLocalStorage  *local_storage,
-								     GNOME_Evolution_LocalStorage  corba_object,
-								     const char             *name);
-EvolutionLocalStorage           *evolution_local_storage_new        (const char             *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_LOCAL_STORAGE_H__ */
diff --git a/shell/evolution-session.c b/shell/evolution-session.c
deleted file mode 100644
index d512ab1656..0000000000
--- a/shell/evolution-session.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-session.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "Evolution.h"
-
-#include <gal/util/e-util.h>
-
-#include "evolution-session.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionSessionPrivate {
-	int dummy;
-};
-
-enum {
-	LOAD_CONFIGURATION,
-	SAVE_CONFIGURATION,
-	LAST_SIGNAL
-};
-
-static int signals[LAST_SIGNAL];
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionSession *session;
-	EvolutionSessionPrivate *priv;
-
-	session = EVOLUTION_SESSION (object);
-	priv = session->priv;
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* CORBA interface implementation.  */
-
-static void
-impl_GNOME_Evolution_Session_saveConfiguration (PortableServer_Servant servant,
-					   const CORBA_char *prefix,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *self;
-
-	self = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (self), signals[SAVE_CONFIGURATION], prefix);
-}
-
-static void
-impl_GNOME_Evolution_Session_loadConfiguration (PortableServer_Servant servant,
-					   const CORBA_char *prefix,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *self;
-
-	self = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (self), signals[LOAD_CONFIGURATION], prefix);
-}
-
-
-/* Initialization.  */
-
-static POA_GNOME_Evolution_Session__vepv GNOME_Evolution_Session_vepv;
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Session__vepv *vepv;
-	POA_GNOME_Evolution_Session__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Session__epv, 1);
-	epv->saveConfiguration = impl_GNOME_Evolution_Session_saveConfiguration;
-	epv->loadConfiguration = impl_GNOME_Evolution_Session_loadConfiguration;
-
-	vepv = &GNOME_Evolution_Session_vepv;
-	vepv->_base_epv             = base_epv;
-	vepv->Bonobo_Unknown_epv    = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Session_epv = epv;
-}
-
-static void
-class_init (EvolutionSessionClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = impl_destroy;
-
-	signals[LOAD_CONFIGURATION]
-		= gtk_signal_new ("load_configuration",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionSessionClass, load_configuration),
-				  gtk_marshal_NONE__STRING,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-	signals[SAVE_CONFIGURATION]
-		= gtk_signal_new ("save_configuration",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionSessionClass, save_configuration),
-				  gtk_marshal_NONE__STRING,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionSession *session)
-{
-	EvolutionSessionPrivate *priv;
-
-	priv = g_new (EvolutionSessionPrivate, 1);
-
-	session->priv = priv;
-}
-
-
-static GNOME_Evolution_Session
-create_corba_session (BonoboObject *object)
-{
-	POA_GNOME_Evolution_Session *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Session *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &GNOME_Evolution_Session_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Session__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (GNOME_Evolution_Session) bonobo_object_activate_servant (object, servant);
-}
-
-void
-evolution_session_construct (EvolutionSession *session,
-			     CORBA_Object corba_session)
-{
-	g_return_if_fail (session != NULL);
-	g_return_if_fail (corba_session != CORBA_OBJECT_NIL);
-
-	bonobo_object_construct (BONOBO_OBJECT (session), corba_session);
-}
-
-EvolutionSession *
-evolution_session_new (void)
-{
-	EvolutionSession *session;
-	GNOME_Evolution_Session corba_session;
-
-	session = gtk_type_new (evolution_session_get_type ());
-
-	corba_session = create_corba_session (BONOBO_OBJECT (session));
-	if (corba_session == CORBA_OBJECT_NIL) {
-		bonobo_object_unref (BONOBO_OBJECT (session));
-		return NULL;
-	}
-
-	evolution_session_construct (session, corba_session);
-	return session;
-}
-
-
-E_MAKE_TYPE (evolution_session, "EvolutionSession", EvolutionSession, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-session.h b/shell/evolution-session.h
deleted file mode 100644
index 2eeab8e069..0000000000
--- a/shell/evolution-session.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-session.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_SESSION_H__
-#define __EVOLUTION_SESSION_H__
-
-#include <bonobo.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_SESSION			(evolution_session_get_type ())
-#define EVOLUTION_SESSION(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SESSION, EvolutionSession))
-#define EVOLUTION_SESSION_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SESSION, EvolutionSessionClass))
-#define EVOLUTION_IS_SESSION(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SESSION))
-#define EVOLUTION_IS_SESSION_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SESSION))
-
-
-typedef struct _EvolutionSession        EvolutionSession;
-typedef struct _EvolutionSessionPrivate EvolutionSessionPrivate;
-typedef struct _EvolutionSessionClass   EvolutionSessionClass;
-
-struct _EvolutionSession {
-	BonoboObject parent;
-
-	EvolutionSessionPrivate *priv;
-};
-
-struct _EvolutionSessionClass {
-	BonoboObjectClass parent_class;
-
-	void (* save_configuration) (EvolutionSession *session, const char *prefix);
-	void (* load_configuration) (EvolutionSession *session, const char *prefix);
-};
-
-
-GtkType           evolution_session_get_type   (void);
-void              evolution_session_construct  (EvolutionSession *session,
-						CORBA_Object      corba_session);
-EvolutionSession *evolution_session_new        (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_SESSION_H__ */
diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c
deleted file mode 100644
index fb919b0a3f..0000000000
--- a/shell/evolution-shell-client.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-client.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-shell-client.h"
-
-
-struct _EvolutionShellClientPrivate {
-	int dummy;
-};
-
-#define PARENT_TYPE bonobo_object_client_get_type ()
-static BonoboObjectClientClass *parent_class = NULL;
-
-
-/* Easy-to-use wrapper for Evolution::user_select_folder.  */
-
-static PortableServer_ServantBase__epv FolderSelectionListener_base_epv;
-static POA_GNOME_Evolution_FolderSelectionListener__epv FolderSelectionListener_epv;
-static POA_GNOME_Evolution_FolderSelectionListener__vepv FolderSelectionListener_vepv;
-static gboolean FolderSelectionListener_vtables_initialized = FALSE;
-
-struct _FolderSelectionListenerServant {
-	POA_GNOME_Evolution_FolderSelectionListener servant;
-	char **uri_return;
-	char **physical_uri_return;
-};
-typedef struct _FolderSelectionListenerServant FolderSelectionListenerServant;
-
-static void
-impl_FolderSelectionListener_selected (PortableServer_Servant servant,
-				       const CORBA_char *uri,
-				       const CORBA_char *physical_uri,
-				       CORBA_Environment *ev)
-{
-	FolderSelectionListenerServant *listener_servant;
-
-	listener_servant = (FolderSelectionListenerServant *) servant;
-
-	if (listener_servant->uri_return != NULL)
-		* (listener_servant->uri_return) = g_strdup (uri);
-
-	if (listener_servant->physical_uri_return != NULL)
-		* (listener_servant->physical_uri_return) = g_strdup (physical_uri);
-
-	gtk_main_quit ();
-}
-
-static void
-impl_FolderSelectionListener_cancel (PortableServer_Servant servant,
-				     CORBA_Environment *ev)
-{
-	FolderSelectionListenerServant *listener_servant;
-
-	listener_servant = (FolderSelectionListenerServant *) servant;
-
-	if (listener_servant->uri_return != NULL)
-		* (listener_servant->uri_return) = NULL;
-
-	if (listener_servant->physical_uri_return != NULL)
-		* (listener_servant->physical_uri_return) = NULL;
-
-	gtk_main_quit ();
-}	
-
-static void
-init_FolderSelectionListener_vtables (void)
-{
-	FolderSelectionListener_base_epv._private    = NULL;
-	FolderSelectionListener_base_epv.finalize    = NULL;
-	FolderSelectionListener_base_epv.default_POA = NULL;
-
-	FolderSelectionListener_epv.notifySelected = impl_FolderSelectionListener_selected;
-	FolderSelectionListener_epv.notifyCanceled = impl_FolderSelectionListener_cancel;
-
-	FolderSelectionListener_vepv._base_epv                             = &FolderSelectionListener_base_epv;
-	FolderSelectionListener_vepv.GNOME_Evolution_FolderSelectionListener_epv = &FolderSelectionListener_epv;
-		
-	FolderSelectionListener_vtables_initialized = TRUE;
-}
-
-static GNOME_Evolution_FolderSelectionListener
-create_folder_selection_listener_interface (char **result,
-					    char **uri_return,
-					    char **physical_uri_return)
-{
-	GNOME_Evolution_FolderSelectionListener corba_interface;
-	CORBA_Environment ev;
-	FolderSelectionListenerServant *servant;
-	PortableServer_Servant listener_servant;
-
-	if (! FolderSelectionListener_vtables_initialized)
-		init_FolderSelectionListener_vtables ();
-
-	servant = g_new0 (FolderSelectionListenerServant, 1);
-	servant->servant.vepv        = &FolderSelectionListener_vepv;
-	servant->uri_return          = uri_return;
-	servant->physical_uri_return = physical_uri_return;
-
-	listener_servant = (PortableServer_Servant) servant;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_FolderSelectionListener__init (listener_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free(servant);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_free (PortableServer_POA_activate_object (bonobo_poa (), listener_servant, &ev));
-
-	corba_interface = PortableServer_POA_servant_to_reference (bonobo_poa (), listener_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		corba_interface = CORBA_OBJECT_NIL;
-
-	CORBA_exception_free (&ev);
-
-	return corba_interface;
-}
-
-static int
-count_string_items (const char *list[])
-{
-	int i;
-
-	if (list == NULL)
-		return 0;
-
-	for (i = 0; list[i] != NULL; i++)
-		;
-
-	return i;
-}
-
-static void
-user_select_folder (EvolutionShellClient *shell_client,
-		    const char *title,
-		    const char *default_folder,
-		    const char *possible_types[],
-		    char **uri_return,
-		    char **physical_uri_return)
-{
-	GNOME_Evolution_FolderSelectionListener listener_interface;
-	GNOME_Evolution_Shell corba_shell;
-	CORBA_Environment ev;
-	GNOME_Evolution_Shell_FolderTypeNameList corba_type_name_list;
-	int num_possible_types;
-	char *result;
-
-	result = NULL;
-
-	if (uri_return != NULL)
-		*uri_return = NULL;
-	if (physical_uri_return != NULL)
-		*physical_uri_return = NULL;
-
-	listener_interface = create_folder_selection_listener_interface (&result, uri_return, 
-									 physical_uri_return);
-	if (listener_interface == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-	num_possible_types = count_string_items (possible_types);
-
-	corba_type_name_list._length  = num_possible_types;
-	corba_type_name_list._maximum = num_possible_types;
-	corba_type_name_list._buffer  = (CORBA_char **) possible_types;
-
-	GNOME_Evolution_Shell_selectUserFolder (corba_shell, listener_interface,
-						title, default_folder, &corba_type_name_list,
-						&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	gtk_main();
-
-	CORBA_Object_release (listener_interface, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionShellClient *shell_client;
-	EvolutionShellClientPrivate *priv;
-
-	shell_client = EVOLUTION_SHELL_CLIENT (object);
-	priv = shell_client->priv;
-
-	/* Nothing to do here.  */
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EvolutionShellClientClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	object_class->destroy = destroy;
-}
-
-static void
-init (EvolutionShellClient *shell_client)
-{
-	EvolutionShellClientPrivate *priv;
-
-	priv = g_new (EvolutionShellClientPrivate, 1);
-	priv->dummy = 0;
-
-	shell_client->priv = priv;
-}
-
-
-/**
- * evolution_shell_client_construct:
- * @shell_client: 
- * @corba_shell: 
- * 
- * Construct @shell_client associating it to @corba_shell.
- **/
-void
-evolution_shell_client_construct (EvolutionShellClient *shell_client,
-				  GNOME_Evolution_Shell corba_shell)
-{
-	g_return_if_fail (shell_client != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client));
-	g_return_if_fail (corba_shell != CORBA_OBJECT_NIL);
-
-	bonobo_object_construct (BONOBO_OBJECT (shell_client), (CORBA_Object) corba_shell);
-}
-
-/**
- * evolution_shell_client_new:
- * @corba_shell: A pointer to the CORBA Evolution::Shell interface.
- * 
- * Create a new client object for @corba_shell.
- * 
- * Return value: A pointer to the Evolution::Shell client BonoboObject.
- **/
-EvolutionShellClient *
-evolution_shell_client_new (GNOME_Evolution_Shell corba_shell)
-{
-	EvolutionShellClient *shell_client;
-
-	shell_client = gtk_type_new (evolution_shell_client_get_type ());
-
-	evolution_shell_client_construct (shell_client, corba_shell);
-
-	if (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)) == CORBA_OBJECT_NIL) {
-		bonobo_object_unref (BONOBO_OBJECT (shell_client));
-		return NULL;
-	}
-
-	return shell_client;
-}
-
-
-/**
- * evolution_shell_client_user_select_folder:
- * @shell_client: A EvolutionShellClient object
- * @title: The title for the folder selection dialog
- * @default_folder: URI (physical or evolution:) of the folder initially selected on the dialog
- * @uri_return: 
- * @physical_uri_return: 
- * 
- * Pop up the shell's folder selection dialog with the specified @title and
- * @default_folder as the initially selected folder.  On return, set *@uri and
- * *@physical_uri to the evolution: URI and the physical URI of the selected
- * folder (or %NULL if the user cancelled the dialog).  (The dialog is modal.)
- **/
-void
-evolution_shell_client_user_select_folder (EvolutionShellClient *shell_client,
-					   const char *title,
-					   const char *default_folder,
-					   const char *possible_types[],
-					   char **uri_return,
-					   char **physical_uri_return)
-{
-	g_return_if_fail (shell_client != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client));
-	g_return_if_fail (title != NULL);
-	g_return_if_fail (default_folder != NULL);
-
-	user_select_folder (shell_client, title, default_folder, possible_types,
-			    uri_return, physical_uri_return);
-}
-
-
-/**
- * evolution_shell_client_get_local_storage:
- * @shell_client: An EvolutionShellClient object
- * 
- * Retrieve the local storage interface for this shell.
- * 
- * Return value: a pointer to the CORBA object implementing the local storage
- * in the shell associated with @shell_client.
- **/
-GNOME_Evolution_LocalStorage
-evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client)
-{
-	GNOME_Evolution_Shell corba_shell;
-	GNOME_Evolution_LocalStorage corba_local_storage;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (shell_client != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client), CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-	if (corba_shell == CORBA_OBJECT_NIL)
-		return CORBA_OBJECT_NIL;
-
-	corba_local_storage = GNOME_Evolution_Shell_getLocalStorage (corba_shell, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return corba_local_storage;
-}
-
-
-E_MAKE_TYPE (evolution_shell_client, "EvolutionShellClient", EvolutionShellClient, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-shell-client.h b/shell/evolution-shell-client.h
deleted file mode 100644
index 98553a522d..0000000000
--- a/shell/evolution-shell-client.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-client.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_SHELL_CLIENT_H__
-#define __EVOLUTION_SHELL_CLIENT_H__
-
-#include <bonobo/bonobo-object-client.h>
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_SHELL_CLIENT			(evolution_shell_client_get_type ())
-#define EVOLUTION_SHELL_CLIENT(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SHELL_CLIENT, EvolutionShellClient))
-#define EVOLUTION_SHELL_CLIENT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SHELL_CLIENT, EvolutionShellClientClass))
-#define EVOLUTION_IS_SHELL_CLIENT(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_CLIENT))
-#define EVOLUTION_IS_SHELL_CLIENT_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_CLIENT))
-
-
-typedef struct _EvolutionShellClient        EvolutionShellClient;
-typedef struct _EvolutionShellClientPrivate EvolutionShellClientPrivate;
-typedef struct _EvolutionShellClientClass   EvolutionShellClientClass;
-
-struct _EvolutionShellClient {
-	BonoboObjectClient parent;
-
-	EvolutionShellClientPrivate *priv;
-};
-
-struct _EvolutionShellClientClass {
-	BonoboObjectClientClass parent_class;
-};
-
-
-GtkType                 evolution_shell_client_get_type            (void);
-void                    evolution_shell_client_construct           (EvolutionShellClient  *shell_client,
-								    GNOME_Evolution_Shell        corba_shell);
-EvolutionShellClient   *evolution_shell_client_new                 (GNOME_Evolution_Shell        shell);
-
-void                    evolution_shell_client_user_select_folder  (EvolutionShellClient  *shell_client,
-								    const char            *title,
-								    const char            *default_folder,
-								    const char            *possible_types[],
-								    char                 **uri_return,
-								    char                 **physical_uri_return);
-
-GNOME_Evolution_LocalStorage  evolution_shell_client_get_local_storage   (EvolutionShellClient  *shell_client);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_SHELL_CLIENT_H__ */
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
deleted file mode 100644
index 4717c5f23d..0000000000
--- a/shell/evolution-shell-component-client.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-component-client.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gtk/gtktypeutils.h>
-
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-widget.h>
-
-#include <liboaf/liboaf.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-shell-component-client.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionShellComponentClientPrivate {
-	EvolutionShellComponentClientCallback callback;
-	void *callback_data;
-
-	GNOME_Evolution_ShellComponentListener listener_interface;
-	PortableServer_Servant listener_servant;
-};
-
-
-#define RETURN_ERROR_IF_FAIL(cond) \
-	g_return_val_if_fail ((cond), EVOLUTION_SHELL_COMPONENT_INVALIDARG)
-
-
-/* Utility functions.  */
-
-static EvolutionShellComponentResult
-corba_exception_to_result (const CORBA_Environment *ev)
-{
-	if (ev->_major == CORBA_NO_EXCEPTION)
-		return EVOLUTION_SHELL_COMPONENT_OK;
-
-	if (ev->_major == CORBA_USER_EXCEPTION) {
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_AlreadyOwned) == 0)
-			return EVOLUTION_SHELL_COMPONENT_ALREADYOWNED;
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotOwned) == 0)
-			return EVOLUTION_SHELL_COMPONENT_NOTOWNED;
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotFound) == 0)
-			return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_UnsupportedType) == 0)
-			return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_InternalError) == 0)
-			return EVOLUTION_SHELL_COMPONENT_INTERNALERROR;
-		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_Busy) == 0)
-			return EVOLUTION_SHELL_COMPONENT_BUSY;
-
-		return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR;
-	} else {
-		/* FIXME maybe we need something more specific here.  */
-		return EVOLUTION_SHELL_COMPONENT_CORBAERROR;
-	}
-}
-
-static void
-dispatch_callback (EvolutionShellComponentClient *shell_component_client,
-		   EvolutionShellComponentResult result)
-{
-	EvolutionShellComponentClientPrivate *priv;
-	EvolutionShellComponentClientCallback callback;
-	PortableServer_ObjectId *oid;
-	void *callback_data;
-	CORBA_Environment ev;
-
-	priv = shell_component_client->priv;
-
-	g_return_if_fail (priv->callback != NULL);
-	g_return_if_fail (priv->listener_servant != NULL);
-
-	/* Notice that we destroy the interface and reset the callback information before
-           dispatching the callback so that the callback can generate another request.  */
-
-	CORBA_exception_init (&ev);
-
-	oid = PortableServer_POA_servant_to_id (bonobo_poa (), priv->listener_servant, &ev);
-	PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev);
-	POA_GNOME_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev);
-	CORBA_free (oid);
-
-	CORBA_Object_release (priv->listener_interface, &ev);
-
-	CORBA_exception_free (&ev);
-
-	priv->listener_servant   = NULL;
-	priv->listener_interface = CORBA_OBJECT_NIL;
-
-	callback      = priv->callback;
-	callback_data = priv->callback_data;
-
-	priv->callback      = NULL;
-	priv->callback_data = NULL;
-
-	(* callback) (shell_component_client, result, callback_data);
-}
-
-
-/* CORBA listener interface implementation.  */
-
-static PortableServer_ServantBase__epv            ShellComponentListener_base_epv;
-static POA_GNOME_Evolution_ShellComponentListener__epv  ShellComponentListener_epv;
-static POA_GNOME_Evolution_ShellComponentListener__vepv ShellComponentListener_vepv;
-static gboolean ShellComponentListener_vepv_initialized = FALSE;
-
-struct _ShellComponentListenerServant {
-	POA_GNOME_Evolution_ShellComponentListener servant;
-	EvolutionShellComponentClient *component_client;
-};
-typedef struct _ShellComponentListenerServant ShellComponentListenerServant;
-
-static EvolutionShellComponentClient *
-component_client_from_ShellComponentListener_servant (PortableServer_Servant servant)
-{
-	ShellComponentListenerServant *listener_servant;
-
-	listener_servant = (ShellComponentListenerServant *) servant;
-	return listener_servant->component_client;
-}
-
-static EvolutionShellComponentResult
-result_from_async_corba_result (GNOME_Evolution_ShellComponentListener_Result async_corba_result)
-{
-	switch (async_corba_result) {
-	case GNOME_Evolution_ShellComponentListener_OK:
-		return EVOLUTION_SHELL_COMPONENT_OK;
-	case GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION:
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDOPERATION;
-	case GNOME_Evolution_ShellComponentListener_EXISTS:
-		return EVOLUTION_SHELL_COMPONENT_EXISTS;
-	case GNOME_Evolution_ShellComponentListener_INVALID_URI:
-		return EVOLUTION_SHELL_COMPONENT_INVALIDURI;
-	case GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED:
-		return EVOLUTION_SHELL_COMPONENT_PERMISSIONDENIED;
-	case GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS:
-		return EVOLUTION_SHELL_COMPONENT_HASSUBFOLDERS;
-	case GNOME_Evolution_ShellComponentListener_NO_SPACE:
-		return EVOLUTION_SHELL_COMPONENT_NOSPACE;
-	default:
-		return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR;
-	}
-}
-
-static void
-impl_ShellComponentListener_report_result (PortableServer_Servant servant,
-					   const GNOME_Evolution_ShellComponentListener_Result result,
-					   CORBA_Environment *ev)
-{
-	EvolutionShellComponentClient *component_client;
-
-	component_client = component_client_from_ShellComponentListener_servant (servant);
-	dispatch_callback (component_client, result_from_async_corba_result (result));
-}
-
-static void
-ShellComponentListener_vepv_initialize (void)
-{
-	ShellComponentListener_base_epv._private = NULL;
-	ShellComponentListener_base_epv.finalize = NULL;
-	ShellComponentListener_base_epv.default_POA = NULL;
-
-	ShellComponentListener_epv.notifyResult = impl_ShellComponentListener_report_result;
-
-	ShellComponentListener_vepv._base_epv = & ShellComponentListener_base_epv;
-	ShellComponentListener_vepv.GNOME_Evolution_ShellComponentListener_epv = & ShellComponentListener_epv;
-
-	ShellComponentListener_vepv_initialized = TRUE;
-}
-
-static PortableServer_Servant *
-create_ShellComponentListener_servant (EvolutionShellComponentClient *component_client)
-{
-	ShellComponentListenerServant *servant;
-
-	if (! ShellComponentListener_vepv_initialized)
-		ShellComponentListener_vepv_initialize ();
-
-	servant = g_new0 (ShellComponentListenerServant, 1);
-	servant->servant.vepv     = &ShellComponentListener_vepv;
-	servant->component_client = component_client;
-
-	return (PortableServer_Servant) servant;
-}
-
-static void
-free_ShellComponentListener_servant (PortableServer_Servant servant)
-{
-	g_free (servant);
-}
-
-static void
-create_listener_interface (EvolutionShellComponentClient *shell_component_client)
-{
-	EvolutionShellComponentClientPrivate *priv;
-	PortableServer_Servant listener_servant;
-	GNOME_Evolution_ShellComponentListener corba_interface;
-	CORBA_Environment ev;
-
-	priv = shell_component_client->priv;
-
-	listener_servant = create_ShellComponentListener_servant (shell_component_client);
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_ShellComponentListener__init (listener_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		free_ShellComponentListener_servant (listener_servant);
-		return;
-	}
-
-	CORBA_free (PortableServer_POA_activate_object (bonobo_poa (), listener_servant, &ev));
-
-	corba_interface = PortableServer_POA_servant_to_reference (bonobo_poa (), listener_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		corba_interface = CORBA_OBJECT_NIL;
-		free_ShellComponentListener_servant (listener_servant);
-	}
-
-	CORBA_exception_free (&ev);
-
-	priv->listener_servant   = listener_servant;
-	priv->listener_interface = corba_interface;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionShellComponentClient *shell_component_client;
-	EvolutionShellComponentClientPrivate *priv;
-
-	shell_component_client = EVOLUTION_SHELL_COMPONENT_CLIENT (object);
-	priv = shell_component_client->priv;
-
-	if (priv->callback != NULL)
-		dispatch_callback (shell_component_client, EVOLUTION_SHELL_COMPONENT_INTERRUPTED);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EvolutionShellComponentClientClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = impl_destroy;
-}
-
-static void
-init (EvolutionShellComponentClient *shell_component_client)
-{
-	EvolutionShellComponentClientPrivate *priv;
-
-	priv = g_new (EvolutionShellComponentClientPrivate, 1);
-	priv->listener_interface = CORBA_OBJECT_NIL;
-	priv->listener_servant   = NULL;
-	priv->callback           = NULL;
-	priv->callback_data      = NULL;
-
-	shell_component_client->priv = priv;
-}
-
-
-/* Construction.  */
-
-void
-evolution_shell_component_client_construct (EvolutionShellComponentClient *shell_component_client,
-					    CORBA_Object corba_object)
-{
-	g_return_if_fail (shell_component_client != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (shell_component_client),
-					corba_object);
-}
-
-EvolutionShellComponentClient *
-evolution_shell_component_client_new (const char *id)
-{
-	CORBA_Environment ev;
-	CORBA_Object corba_object;
-
-	g_return_val_if_fail (id != NULL, NULL);
-
-	CORBA_exception_init (&ev);
-
-	corba_object = oaf_activate_from_id ((char *) id, 0, NULL, &ev); /* Yuck.  */
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start up component for %s. "
-			   "(See previous error messages?)", id);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	if (corba_object == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate component %s. "
-			   "(Maybe you need to set OAF_INFO_PATH?)", id);
-		return NULL;
-	}
-
-	return evolution_shell_component_client_new_for_objref (corba_object);
-}
-
-EvolutionShellComponentClient *
-evolution_shell_component_client_new_for_objref (const GNOME_Evolution_ShellComponent objref)
-{
-	EvolutionShellComponentClient *new;
-
-	g_return_val_if_fail (objref != CORBA_OBJECT_NIL, NULL);
-
-	new = gtk_type_new (evolution_shell_component_client_get_type ());
-	evolution_shell_component_client_construct (new, objref);
-
-	return new;
-}
-
-
-/* Synchronous operations.  */
-
-EvolutionShellComponentResult
-evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell_component_client,
-					    GNOME_Evolution_Shell shell,
-					    const char *evolution_homedir)
-{
-	EvolutionShellComponentResult result;
-	CORBA_Environment ev;
-
-	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
-	RETURN_ERROR_IF_FAIL (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	RETURN_ERROR_IF_FAIL (shell != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_ShellComponent_setOwner (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)),
-					    shell, evolution_homedir, &ev);
-
-	result = corba_exception_to_result (&ev);
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-EvolutionShellComponentResult
-evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *shell_component_client,
-					      GNOME_Evolution_Shell shell)
-{
-	EvolutionShellComponentResult result;
-	GNOME_Evolution_ShellComponent corba_component;
-	CORBA_Environment ev;
-
-	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
-	RETURN_ERROR_IF_FAIL (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	RETURN_ERROR_IF_FAIL (shell != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
-
-	GNOME_Evolution_ShellComponent_unsetOwner (corba_component, &ev);
-
-	result = corba_exception_to_result (&ev);
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-EvolutionShellComponentResult
-evolution_shell_component_client_create_view (EvolutionShellComponentClient *shell_component_client,
-					      BonoboUIComponent *uih,
-					      const char *physical_uri,
-					      const char *type_string,
-					      BonoboControl **control_return)
-{
-	EvolutionShellComponentResult result;
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellComponent corba_component;
-	Bonobo_Control corba_control;
-
-	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
-	RETURN_ERROR_IF_FAIL (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	RETURN_ERROR_IF_FAIL (uih != NULL);
-	RETURN_ERROR_IF_FAIL (BONOBO_IS_UI_COMPONENT (uih));
-	RETURN_ERROR_IF_FAIL (physical_uri != NULL);
-	RETURN_ERROR_IF_FAIL (type_string != NULL);
-	RETURN_ERROR_IF_FAIL (control_return != NULL);
-
-	CORBA_exception_init (&ev);
-
-	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
-	corba_control = GNOME_Evolution_ShellComponent_createView (corba_component, physical_uri, type_string, &ev);
-
-	result = corba_exception_to_result (&ev);
-
-	if (result != EVOLUTION_SHELL_COMPONENT_OK) {
-		*control_return = NULL;
-	} else {
-		Bonobo_UIContainer corba_uih;
-
-		corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (uih));
-		*control_return = BONOBO_CONTROL (bonobo_widget_new_control_from_objref (corba_control,
-											 corba_uih));
-	}
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-
-/* Asyncronous operations.  */
-
-void
-evolution_shell_component_client_async_create_folder (EvolutionShellComponentClient *shell_component_client,
-						      const char *physical_uri,
-						      const char *type,
-						      EvolutionShellComponentClientCallback callback,
-						      void *data)
-{
-	EvolutionShellComponentClientPrivate *priv;
-	GNOME_Evolution_ShellComponent corba_shell_component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (shell_component_client != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	g_return_if_fail (physical_uri != NULL);
-	g_return_if_fail (type != NULL);
-	g_return_if_fail (callback != NULL);
-
-	priv = shell_component_client->priv;
-
-	if (priv->callback != NULL) {
-		(* callback) (shell_component_client, EVOLUTION_SHELL_COMPONENT_BUSY, data);
-		return;
-	}
-
-	create_listener_interface (shell_component_client);
-
-	CORBA_exception_init (&ev);
-
-	corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
-
-	priv->callback      = callback;
-	priv->callback_data = data;
-
-	GNOME_Evolution_ShellComponent_createFolderAsync (corba_shell_component,
-							  priv->listener_interface,
-							  physical_uri, type,
-							  &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-void
-evolution_shell_component_client_async_remove_folder (EvolutionShellComponentClient *shell_component_client,
-						      const char *physical_uri,
-						      EvolutionShellComponentClientCallback callback,
-						      void *data)
-{
-	/* FIXME to do. */
-}
-
-void
-evolution_shell_component_client_populate_folder_context_menu (EvolutionShellComponentClient *shell_component_client,
-							       BonoboUIComponent *uih,
-							       const char *physical_uri,
-							       const char *type)
-{
-	Bonobo_UIContainer corba_uih;
-	EvolutionShellComponentClientPrivate *priv;
-	GNOME_Evolution_ShellComponent corba_shell_component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (shell_component_client != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
-	g_return_if_fail (physical_uri != NULL);
-	g_return_if_fail (type != NULL);
-
-	priv = shell_component_client->priv;
-
-	CORBA_exception_init (&ev);
-
-	corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
-	corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (uih));
-
-	GNOME_Evolution_ShellComponent_populateFolderContextMenu (corba_shell_component,
-							       corba_uih,
-							       physical_uri,
-							       type,
-							       &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-
-E_MAKE_TYPE (evolution_shell_component_client, "EvolutionShellComponentClient",
-	     EvolutionShellComponentClient, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
deleted file mode 100644
index 319902198f..0000000000
--- a/shell/evolution-shell-component-client.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-component-client.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef EVOLUTION_SHELL_COMPONENT_CLIENT_H
-#define EVOLUTION_SHELL_COMPONENT_CLIENT_H
-
-#include <bonobo/bonobo-object-client.h>
-
-#include "evolution-shell-component.h"
-
-#ifdef cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
-
-#define EVOLUTION_TYPE_SHELL_COMPONENT_CLIENT            (evolution_shell_component_client_get_type ())
-#define EVOLUTION_SHELL_COMPONENT_CLIENT(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SHELL_COMPONENT_CLIENT, EvolutionShellComponentClient))
-#define EVOLUTION_SHELL_COMPONENT_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SHELL_COMPONENT_CLIENT, EvolutionShellComponentClientClass))
-#define EVOLUTION_IS_SHELL_COMPONENT_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT_CLIENT))
-#define EVOLUTION_IS_SHELL_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT_CLIENT))
-
-
-typedef struct _EvolutionShellComponentClient        EvolutionShellComponentClient;
-typedef struct _EvolutionShellComponentClientPrivate EvolutionShellComponentClientPrivate;
-typedef struct _EvolutionShellComponentClientClass   EvolutionShellComponentClientClass;
-
-struct _EvolutionShellComponentClient {
-	BonoboObjectClient parent;
-
-	EvolutionShellComponentClientPrivate *priv;
-};
-
-struct _EvolutionShellComponentClientClass {
-	BonoboObjectClientClass parent_class;
-};
-
-typedef void (* EvolutionShellComponentClientCallback) (EvolutionShellComponentClient *shell_component_client,
-							EvolutionShellComponentResult result,
-							void *data);
-
-
-/* Construction.  */
-GtkType                        evolution_shell_component_client_get_type        (void);
-void                           evolution_shell_component_client_construct       (EvolutionShellComponentClient        *shell_component_client,
-										 CORBA_Object                          corba_object);
-EvolutionShellComponentClient *evolution_shell_component_client_new             (const char                           *id);
-EvolutionShellComponentClient *evolution_shell_component_client_new_for_objref  (const GNOME_Evolution_ShellComponent  objref);
-
-/* Synchronous operations.  */
-EvolutionShellComponentResult  evolution_shell_component_client_set_owner    (EvolutionShellComponentClient  *shell_component_client,
-									      GNOME_Evolution_Shell                 shell,
-									      const char                     *evolution_homedir);
-EvolutionShellComponentResult  evolution_shell_component_client_unset_owner  (EvolutionShellComponentClient  *shell_component_client,
-									      GNOME_Evolution_Shell                 shell);
-EvolutionShellComponentResult  evolution_shell_component_client_create_view  (EvolutionShellComponentClient  *shell_component_client,
-									      BonoboUIComponent                *uih,
-									      const char                     *physical_uri,
-									      const char                     *type_string,
-									      BonoboControl                 **control_return);
-
-/* Asyncronous operations.  */
-void  evolution_shell_component_client_async_create_folder  (EvolutionShellComponentClient         *shell_component_client,
-							     const char                            *physical_uri,
-							     const char                            *type,
-							     EvolutionShellComponentClientCallback  callback,
-							     void                                  *data);
-void  evolution_shell_component_client_async_remove_folder  (EvolutionShellComponentClient         *shell_component_client,
-							     const char                            *physical_uri,
-							     EvolutionShellComponentClientCallback  callback,
-							     void                                  *data);
-
-void  evolution_shell_component_client_populate_folder_context_menu  (EvolutionShellComponentClient *shell_component_client,
-								      BonoboUIComponent               *uih,
-								      const char                    *physical_uri,
-								      const char                    *type);
-
-#ifdef cplusplus
-}
-#endif /* cplusplus */
-
-#endif /* EVOLUTION_SHELL_COMPONENT_CLIENT_H */
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
deleted file mode 100644
index 63f5fb7254..0000000000
--- a/shell/evolution-shell-component.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-component.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "Evolution.h"
-
-#include <gal/util/e-util.h>
-
-#include "evolution-shell-component.h"
-
-
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
-
-static GtkObjectClass *parent_class = NULL;
-
-struct _EvolutionShellComponentPrivate {
-	GList *folder_types;	/* EvolutionShellComponentFolderType */
-
-	EvolutionShellComponentCreateViewFn              create_view_fn;
-	EvolutionShellComponentCreateFolderFn            create_folder_fn;
-	EvolutionShellComponentRemoveFolderFn            remove_folder_fn;
-	EvolutionShellComponentCopyFolderFn              copy_folder_fn;
-	EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn;
-
-	EvolutionShellClient *owner_client;
-
-	void *closure;
-};
-
-enum {
-	OWNER_SET,
-	OWNER_UNSET,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* CORBA interface implementation.  */
-
-static GNOME_Evolution_FolderTypeList *
-impl_ShellComponent__get_supported_types (PortableServer_Servant servant,
-					  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-	GNOME_Evolution_FolderTypeList *folder_type_list;
-	unsigned int i;
-	GList *p;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	folder_type_list = GNOME_Evolution_FolderTypeList__alloc ();
-	CORBA_sequence_set_release (folder_type_list, TRUE);
-	folder_type_list->_length = g_list_length (priv->folder_types);
-	folder_type_list->_maximum = folder_type_list->_length;
-	folder_type_list->_buffer = CORBA_sequence_GNOME_Evolution_FolderType_allocbuf (folder_type_list->_maximum);
-
-	for (p = priv->folder_types, i = 0; p != NULL; p = p->next, i++) {
-		GNOME_Evolution_FolderType *corba_folder_type;
-		EvolutionShellComponentFolderType *folder_type;
-
-		folder_type = (EvolutionShellComponentFolderType *) p->data;
-
-		corba_folder_type = folder_type_list->_buffer + i;
-		corba_folder_type->name      = CORBA_string_dup (folder_type->name);
-		corba_folder_type->icon_name = CORBA_string_dup (folder_type->icon_name);
-	}
-
-	return folder_type_list;
-}
-
-static void
-impl_ShellComponent_set_owner (PortableServer_Servant servant,
-			       const GNOME_Evolution_Shell shell,
-			       const CORBA_char *evolution_homedir,
-			       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-	GNOME_Evolution_Shell shell_duplicate;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->owner_client != NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_ShellComponent_AlreadyOwned, NULL);
-		return;
-	}
-
-	shell_duplicate = CORBA_Object_duplicate (shell, ev);
-
-	if (ev->_major == CORBA_NO_EXCEPTION) {
-		priv->owner_client = evolution_shell_client_new (shell_duplicate);
-		gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_SET], priv->owner_client, evolution_homedir);
-	}
-}
-
-static void
-impl_ShellComponent_unset_owner (PortableServer_Servant servant,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->owner_client == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_ShellComponent_NotOwned, NULL);
-		return;
-	}
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-	priv->owner_client = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_UNSET]);
-}
-
-static Bonobo_Control
-impl_ShellComponent_create_view (PortableServer_Servant servant,
-				 const CORBA_char *physical_uri,
-				 const CORBA_char *type,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-	EvolutionShellComponentResult result;
-	BonoboControl *control;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	result = (* priv->create_view_fn) (shell_component, physical_uri, type,
-					   &control, priv->closure);
-
-	if (result != EVOLUTION_SHELL_COMPONENT_OK) {
-		switch (result) {
-		case EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE:
-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_GNOME_Evolution_ShellComponent_UnsupportedType,
-					     NULL);
-			break;
-		case EVOLUTION_SHELL_COMPONENT_INTERNALERROR:
-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_GNOME_Evolution_ShellComponent_InternalError,
-					     NULL);
-			break;
-		default:
-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_GNOME_Evolution_ShellComponent_NotFound,
-					     NULL);
-		}
-
-		return CORBA_OBJECT_NIL;
-	}
-
-	return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev);
-}
-
-static void
-impl_ShellComponent_async_create_folder (PortableServer_Servant servant,
-					 const GNOME_Evolution_ShellComponentListener listener,
-					 const CORBA_char *physical_uri,
-					 const CORBA_char *type,
-					 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->create_folder_fn == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-								     ev);
-		return;
-	}
-
-	(* priv->create_folder_fn) (shell_component, physical_uri, type, listener, priv->closure);
-}
-
-static void
-impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
-					 const GNOME_Evolution_ShellComponentListener listener,
-					 const CORBA_char *physical_uri,
-					 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->remove_folder_fn == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-								     ev);
-		return;
-	}
-
-	(* priv->remove_folder_fn) (shell_component, physical_uri, listener, priv->closure);
-}
-
-#if 0
-static void
-impl_ShellComponent_async_copy_folder (PortableServer_Servant servant,
-				       const GNOME_Evolution_ShellComponentListener listener,
-				       const CORBA_char *source_physical_uri,
-				       const CORBA_char *destination_physical_uri,
-				       const CORBA_boolean remove_source,
-				       CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->copy_folder_fn == NULL) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-								     ev);
-		return;
-	}
-
-	(* priv->copy_folder_fn) (shell_component,
-				  source_physical_uri,
-				  destination_physical_uri,
-				  remove_source,
-				  listener,
-				  priv->closure);
-}
-#endif
-
-static void
-impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant,
-						  const Bonobo_UIContainer corba_uih,
-						  const CORBA_char *physical_uri,
-						  const CORBA_char *type,
-						  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-	BonoboUIComponent *uic;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
-	priv = shell_component->priv;
-
-	if (priv->populate_folder_context_menu_fn == NULL)
-		return;
-
-	uic = bonobo_ui_component_new_default ();
-	bonobo_ui_component_set_container (uic, corba_uih);
-	bonobo_object_release_unref (corba_uih, NULL);
-
-	(* priv->populate_folder_context_menu_fn) (shell_component, uic, physical_uri, type, priv->closure);
-
-	bonobo_object_unref (BONOBO_OBJECT (uic));
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentPrivate *priv;
-	CORBA_Environment ev;
-	GList *p;
-
-	shell_component = EVOLUTION_SHELL_COMPONENT (object);
-
-	priv = shell_component->priv;
-
-	CORBA_exception_init (&ev);
-
-	if (priv->owner_client != NULL)
-		bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-
-	CORBA_exception_free (&ev);
-
-	for (p = priv->folder_types; p != NULL; p = p->next) {
-		EvolutionShellComponentFolderType *folder_type;
-
-		folder_type = (EvolutionShellComponentFolderType *) p->data;
-
-		g_free (folder_type->name);
-		g_free (folder_type->icon_name);
-		g_free (folder_type);
-	}
-	g_list_free (priv->folder_types);
-
-	g_free (priv);
-
-	parent_class->destroy (object);
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EvolutionShellComponentClass *klass)
-{
-	GtkObjectClass *object_class;
-	POA_GNOME_Evolution_ShellComponent__epv *epv = &klass->epv;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	signals[OWNER_SET]
-		= gtk_signal_new ("owner_set",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellComponentClass, owner_set),
-				  gtk_marshal_NONE__POINTER_POINTER,
-				  GTK_TYPE_NONE, 2,
-				  GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	signals[OWNER_UNSET]
-		= gtk_signal_new ("owner_unset",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellComponentClass, owner_unset),
-				  gtk_marshal_NONE__NONE,
-				  GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	epv->_get_supported_types      = impl_ShellComponent__get_supported_types;
-	epv->setOwner                  = impl_ShellComponent_set_owner;
-	epv->unsetOwner                = impl_ShellComponent_unset_owner;
-	epv->createView                = impl_ShellComponent_create_view;
-	epv->createFolderAsync         = impl_ShellComponent_async_create_folder;
-	epv->removeFolderAsync         = impl_ShellComponent_async_remove_folder;
-	epv->populateFolderContextMenu = impl_ShellComponent_populate_folder_context_menu;
-}
-
-static void
-init (EvolutionShellComponent *shell_component)
-{
-	EvolutionShellComponentPrivate *priv;
-
-	priv = g_new (EvolutionShellComponentPrivate, 1);
-
-	priv->folder_types                    = NULL;
-	priv->create_view_fn                  = NULL;
-	priv->create_folder_fn                = NULL;
-	priv->remove_folder_fn                = NULL;
-	priv->copy_folder_fn                  = NULL;
-	priv->populate_folder_context_menu_fn = NULL;
-
-	priv->owner_client                    = NULL;
-	priv->closure                         = NULL;
-
-	shell_component->priv = priv;
-}
-
-
-void
-evolution_shell_component_construct (EvolutionShellComponent *shell_component,
-				     const EvolutionShellComponentFolderType folder_types[],
-				     EvolutionShellComponentCreateViewFn create_view_fn,
-				     EvolutionShellComponentCreateFolderFn create_folder_fn,
-				     EvolutionShellComponentRemoveFolderFn remove_folder_fn,
-				     EvolutionShellComponentCopyFolderFn copy_folder_fn,
-				     EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
-				     void *closure)
-{
-	EvolutionShellComponentPrivate *priv;
-	int i;
-
-	g_return_if_fail (shell_component != NULL);
-
-	priv = shell_component->priv;
-
-	priv->create_view_fn                  = create_view_fn;
-	priv->create_folder_fn                = create_folder_fn;
-	priv->remove_folder_fn                = remove_folder_fn;
-	priv->copy_folder_fn                  = copy_folder_fn;
-	priv->populate_folder_context_menu_fn = populate_folder_context_menu_fn;
-
-	priv->closure = closure;
-
-	for (i = 0; folder_types[i].name != NULL; i++) {
-		EvolutionShellComponentFolderType *new;
-
-		if (folder_types[i].icon_name == NULL
-		    || folder_types[i].name[0] == '\0'
-		    || folder_types[i].icon_name[0] == '\0')
-			continue;
-
-		new = g_new (EvolutionShellComponentFolderType, 1);
-		new->name      = g_strdup (folder_types[i].name);
-		new->icon_name = g_strdup (folder_types[i].icon_name);
-
-		priv->folder_types = g_list_prepend (priv->folder_types, new);
-	}
-
-	if (priv->folder_types == NULL)
-		g_warning ("No valid folder types constructing EShellComponent %p", shell_component);
-}
-
-EvolutionShellComponent *
-evolution_shell_component_new (const EvolutionShellComponentFolderType folder_types[],
-			       EvolutionShellComponentCreateViewFn create_view_fn,
-			       EvolutionShellComponentCreateFolderFn create_folder_fn,
-			       EvolutionShellComponentRemoveFolderFn remove_folder_fn,
-			       EvolutionShellComponentCopyFolderFn copy_folder_fn,
-			       EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
-			       void *closure)
-{
-	EvolutionShellComponent *new;
-
-	new = gtk_type_new (evolution_shell_component_get_type ());
-
-	evolution_shell_component_construct (new,
-					     folder_types,
-					     create_view_fn,
-					     create_folder_fn,
-					     remove_folder_fn,
-					     copy_folder_fn,
-					     populate_folder_context_menu_fn,
-					     closure);
-
-	return new;
-}
-
-EvolutionShellClient *
-evolution_shell_component_get_owner  (EvolutionShellComponent *shell_component)
-{
-	g_return_val_if_fail (shell_component != NULL, NULL);
-	g_return_val_if_fail (EVOLUTION_IS_SHELL_COMPONENT (shell_component), NULL);
-
-	return shell_component->priv->owner_client;
-}
-
-
-E_MAKE_X_TYPE (evolution_shell_component, "EvolutionShellComponent", EvolutionShellComponent,
-	       class_init, init, PARENT_TYPE,
-	       POA_GNOME_Evolution_ShellComponent__init,
-	       GTK_STRUCT_OFFSET (EvolutionShellComponentClass, epv));
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
deleted file mode 100644
index 0f5e57b9af..0000000000
--- a/shell/evolution-shell-component.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-component.h
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef EVOLUTION_SHELL_COMPONENT_H
-#define EVOLUTION_SHELL_COMPONENT_H
-
-#include <bonobo/bonobo-xobject.h>
-#include <bonobo/bonobo-control.h>
-
-#include "Evolution.h"
-
-#include "evolution-shell-client.h"
-
-#ifdef cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
-
-#define EVOLUTION_TYPE_SHELL_COMPONENT            (evolution_shell_component_get_type ())
-#define EVOLUTION_SHELL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SHELL_COMPONENT, EvolutionShellComponent))
-#define EVOLUTION_SHELL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SHELL_COMPONENT, EvolutionShellComponentClass))
-#define EVOLUTION_IS_SHELL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT))
-#define EVOLUTION_IS_SHELL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_COMPONENT))
-
-
-typedef struct _EvolutionShellComponent        EvolutionShellComponent;
-typedef struct _EvolutionShellComponentPrivate EvolutionShellComponentPrivate;
-typedef struct _EvolutionShellComponentClass   EvolutionShellComponentClass;
-
-enum _EvolutionShellComponentResult {
-	EVOLUTION_SHELL_COMPONENT_OK,
-	EVOLUTION_SHELL_COMPONENT_CORBAERROR,
-	EVOLUTION_SHELL_COMPONENT_INTERRUPTED,
-	EVOLUTION_SHELL_COMPONENT_INVALIDARG,
-	EVOLUTION_SHELL_COMPONENT_ALREADYOWNED,
-	EVOLUTION_SHELL_COMPONENT_NOTOWNED,
-	EVOLUTION_SHELL_COMPONENT_NOTFOUND,
-	EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE,
-	EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDOPERATION,
-	EVOLUTION_SHELL_COMPONENT_INTERNALERROR,
-	EVOLUTION_SHELL_COMPONENT_BUSY,
-	EVOLUTION_SHELL_COMPONENT_EXISTS,
-	EVOLUTION_SHELL_COMPONENT_INVALIDURI,
-	EVOLUTION_SHELL_COMPONENT_PERMISSIONDENIED,
-	EVOLUTION_SHELL_COMPONENT_HASSUBFOLDERS,
-	EVOLUTION_SHELL_COMPONENT_NOSPACE,
-	EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR
-};
-typedef enum _EvolutionShellComponentResult EvolutionShellComponentResult;
-
-typedef EvolutionShellComponentResult (* EvolutionShellComponentCreateViewFn)
-	                                               (EvolutionShellComponent *shell_component,
-							const char *physical_uri,
-							const char *type,
-							BonoboControl **control_return,
-							void *closure);
-typedef void (* EvolutionShellComponentCreateFolderFn) (EvolutionShellComponent *shell_component,
-						        const char *physical_uri,
-						        const char *type,
-						        const GNOME_Evolution_ShellComponentListener listener,
-						        void *closure);
-typedef void (* EvolutionShellComponentRemoveFolderFn) (EvolutionShellComponent *shell_component,
-						        const char *physical_uri,
-						        const GNOME_Evolution_ShellComponentListener listener,
-						        void *closure);
-typedef void (* EvolutionShellComponentCopyFolderFn)   (EvolutionShellComponent *shell_component,
-							const char *source_physical_uri,
-							const char *destination_physical_uri,
-							gboolean remove_source,
-						        const GNOME_Evolution_ShellComponentListener listener,
-						        void *closure);
-typedef void (* EvolutionShellComponentPopulateFolderContextMenu) (EvolutionShellComponent *shell_component,
-								   BonoboUIComponent *uic,
-								   const char *physical_uri,
-								   const char *type,
-								   void *closure);
-
-struct _EvolutionShellComponentFolderType {
-	char *name;
-	char *icon_name;
-};
-typedef struct _EvolutionShellComponentFolderType EvolutionShellComponentFolderType;
-
-struct _EvolutionShellComponent {
-	BonoboXObject parent;
-
-	EvolutionShellComponentPrivate *priv;
-};
-
-struct _EvolutionShellComponentClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_ShellComponent__epv epv;
-
-	/* Signals.  */
-
-	void (* owner_set)   (EvolutionShellComponent *shell_component,
-			      EvolutionShellClient *shell_client,
-			      const char *evolution_homedir);
-	void (* owner_unset) (EvolutionShellComponent *shell_component);
-};
-
-
-GtkType                  evolution_shell_component_get_type   (void);
-void                     evolution_shell_component_construct  (EvolutionShellComponent                          *shell_component,
-							       const EvolutionShellComponentFolderType           folder_types[],
-							       EvolutionShellComponentCreateViewFn               create_view_fn,
-							       EvolutionShellComponentCreateFolderFn             create_folder_fn,
-							       EvolutionShellComponentRemoveFolderFn             remove_folder_fn,
-							       EvolutionShellComponentCopyFolderFn               copy_folder_fn,
-							       EvolutionShellComponentPopulateFolderContextMenu  populate_folder_context_menu_fn,
-							       void                                             *closure);
-EvolutionShellComponent *evolution_shell_component_new        (const EvolutionShellComponentFolderType           folder_types[],
-							       EvolutionShellComponentCreateViewFn               create_view_fn,
-							       EvolutionShellComponentCreateFolderFn             create_folder_fn,
-							       EvolutionShellComponentRemoveFolderFn             remove_folder_fn,
-							       EvolutionShellComponentCopyFolderFn               copy_folder_fn,
-							       EvolutionShellComponentPopulateFolderContextMenu  populate_folder_context_menu_fn,
-							       void                                             *closure);
-EvolutionShellClient    *evolution_shell_component_get_owner  (EvolutionShellComponent                          *shell_component);
-
-#ifdef cplusplus
-}
-#endif /* cplusplus */
-
-#endif /* EVOLUTION_SHELL_COMPONENT_H */
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
deleted file mode 100644
index 53c525a5cb..0000000000
--- a/shell/evolution-shell-view.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-view.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-shell-view.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionShellViewPrivate {
-	int dummy;
-};
-
-enum {
-	SET_MESSAGE,
-	UNSET_MESSAGE,
-	CHANGE_VIEW,
-	SET_TITLE,
-	LAST_SIGNAL
-};
-static int signals[LAST_SIGNAL] = { 0 };
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_ShellView__vepv ShellView_vepv;
-
-static POA_GNOME_Evolution_ShellView *
-create_servant (void)
-{
-	POA_GNOME_Evolution_ShellView *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_ShellView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &ShellView_vepv;
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_ShellView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_ShellView_set_message (PortableServer_Servant servant,
-			    const CORBA_char *message,
-			    const CORBA_boolean busy,
-			    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_MESSAGE], message, busy);
-}
-
-static void
-impl_ShellView_unset_message (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[UNSET_MESSAGE]);
-}
-
-static void
-impl_ShellView_change_current_view (PortableServer_Servant servant,
-				    const CORBA_char *uri,
-				    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW],
-			 uri);
-}
-
-static void
-impl_ShellView_set_title (PortableServer_Servant servant,
-			  const CORBA_char *title,
-			  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE],
-			 title);
-}
-
-
-/* GtkObject methods.  */
-static void
-destroy (GtkObject *object)
-{
-	EvolutionShellView *shell_view;
-	EvolutionShellViewPrivate *priv;
-
-	shell_view = EVOLUTION_SHELL_VIEW (object);
-	priv = shell_view->priv;
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_ShellView__vepv *vepv;
-	POA_GNOME_Evolution_ShellView__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_ShellView__epv, 1);
-	epv->setMessage        = impl_ShellView_set_message;
-	epv->unsetMessage      = impl_ShellView_unset_message;
-	epv->changeCurrentView = impl_ShellView_change_current_view;
-	epv->setTitle          = impl_ShellView_set_title;
-
-	vepv = &ShellView_vepv;
-	vepv->_base_epv               = base_epv;
-	vepv->Bonobo_Unknown_epv      = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_ShellView_epv = epv;
-}
-
-static void
-class_init (EvolutionShellViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	signals[SET_MESSAGE]
-		= gtk_signal_new ("set_message",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_message),
-				  gtk_marshal_NONE__POINTER_INT,
-				  GTK_TYPE_NONE, 2,
-				  GTK_TYPE_STRING,
-				  GTK_TYPE_BOOL);
-
-	signals[UNSET_MESSAGE]
-		= gtk_signal_new ("unset_message",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellViewClass, unset_message),
-				  gtk_marshal_NONE__NONE,
-				  GTK_TYPE_NONE, 0);
-
-	signals[CHANGE_VIEW]
-		= gtk_signal_new ("change_current_view",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellViewClass, change_current_view),
-				  gtk_marshal_NONE__POINTER,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	signals[SET_TITLE]
-		= gtk_signal_new ("set_title",
-				  GTK_RUN_FIRST,
-				  object_class->type,
-				  GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_title),
-				  gtk_marshal_NONE__POINTER,
-				  GTK_TYPE_NONE, 1,
-				  GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionShellView *shell_view)
-{
-	EvolutionShellViewPrivate *priv;
-
-	priv = g_new (EvolutionShellViewPrivate, 1);
-	priv->dummy = 0;
-
-	shell_view->priv = priv;
-}
-
-
-/**
- * evolution_shell_view_construct:
- * @shell_view: 
- * @corba_object: 
- * 
- * Construct @shell_view with the specified @corba_object.
- **/
-void
-evolution_shell_view_construct (EvolutionShellView *shell_view,
-				GNOME_Evolution_ShellView corba_object)
-{
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (EVOLUTION_IS_SHELL_VIEW (shell_view));
-
-	bonobo_object_construct (BONOBO_OBJECT (shell_view), corba_object);
-}
-
-/**
- * evolution_shell_view_new:
- *
- * Create a new EvolutionShellView object.
- * 
- * Return value: The new EvolutionShellView object.
- **/
-EvolutionShellView *
-evolution_shell_view_new (void)
-{
-	POA_GNOME_Evolution_ShellView *servant;
-	GNOME_Evolution_ShellView corba_object;
-	EvolutionShellView *new;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	new = gtk_type_new (evolution_shell_view_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
-
-	evolution_shell_view_construct (new, corba_object);
-
-	return new;
-}
-
-
-E_MAKE_TYPE (evolution_shell_view, "EvolutionShellView", EvolutionShellView, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h
deleted file mode 100644
index bdff814d0d..0000000000
--- a/shell/evolution-shell-view.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-view.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_SHELL_VIEW_H__
-#define __EVOLUTION_SHELL_VIEW_H__
-
-#include <gnome.h>
- 
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_SHELL_VIEW			(evolution_shell_view_get_type ())
-#define EVOLUTION_SHELL_VIEW(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SHELL_VIEW, EvolutionShellView))
-#define EVOLUTION_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SHELL_VIEW, EvolutionShellViewClass))
-#define EVOLUTION_IS_SHELL_VIEW(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_VIEW))
-#define EVOLUTION_IS_SHELL_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_VIEW))
-
-
-typedef struct _EvolutionShellView        EvolutionShellView;
-typedef struct _EvolutionShellViewPrivate EvolutionShellViewPrivate;
-typedef struct _EvolutionShellViewClass   EvolutionShellViewClass;
-
-struct _EvolutionShellView {
-	BonoboObject parent;
-
-	EvolutionShellViewPrivate *priv;
-};
-
-struct _EvolutionShellViewClass {
-	BonoboObjectClass parent_class;
-
-	/* Signals.  */
-
-	void  (* set_message)   (EvolutionShellView *shell_view, const char *message, gboolean busy);
-	void  (* unset_message) (EvolutionShellView *shell_view);
-	void  (* change_current_view) (EvolutionShellView *shell_view, const char *uri);
-	void  (* set_title)     (EvolutionShellView *shell_view, const char *message);
-};
-
-
-GtkType             evolution_shell_view_get_type   (void);
-void                evolution_shell_view_construct  (EvolutionShellView       *shell_view,
-						     GNOME_Evolution_ShellView corba_object);
-EvolutionShellView *evolution_shell_view_new        (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_SHELL_VIEW_H__ */
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
deleted file mode 100644
index 7dd8b9ac88..0000000000
--- a/shell/evolution-storage-listener.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-listener.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-storage-listener.h"
-
-
-#define PARENT_TYPE gtk_object_get_type ()
-static GtkObjectClass *parent_class = NULL;
-
-struct _EvolutionStorageListenerPrivate {
-	GNOME_Evolution_StorageListener corba_objref;
-	EvolutionStorageListenerServant *servant;
-};
-
-
-enum {
-  DESTROYED,
-  NEW_FOLDER,
-  UPDATE_FOLDER,
-  REMOVED_FOLDER,
-  LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Evolution::StorageListener implementation.  */
-
-static POA_GNOME_Evolution_StorageListener__vepv my_GNOME_Evolution_StorageListener_vepv;
-
-static EvolutionStorageListener *
-gtk_object_from_servant (PortableServer_Servant servant)
-{
-	EvolutionStorageListenerServant *my_servant;
-
-	my_servant = (EvolutionStorageListenerServant *) servant;
-	return my_servant->gtk_object;
-}
-
-static void
-impl_GNOME_Evolution_StorageListener_notifyDestroyed (PortableServer_Servant servant,
-					  CORBA_Environment *ev)
-{
-	EvolutionStorageListener *listener;
-	EvolutionStorageListenerPrivate *priv;
-
-	listener = gtk_object_from_servant (servant);
-	priv = listener->priv;
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[DESTROYED]);
-}
-
-static void
-impl_GNOME_Evolution_StorageListener_notifyFolderCreated (PortableServer_Servant servant,
-					   const CORBA_char *path,
-					   const GNOME_Evolution_Folder *folder,
-					   CORBA_Environment *ev)
-{
-	EvolutionStorageListener *listener;
-	EvolutionStorageListenerPrivate *priv;
-
-	listener = gtk_object_from_servant (servant);
-	priv = listener->priv;
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[NEW_FOLDER], path, folder);
-}
-
-static void
-impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
-					      const CORBA_char *path,
-					      const CORBA_char *display_name,
-					      CORBA_boolean highlighted,
-					      CORBA_Environment *ev)
-{
-	EvolutionStorageListener *listener;
-	EvolutionStorageListenerPrivate *priv;
-
-	listener = gtk_object_from_servant (servant);
-	priv = listener->priv;
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[UPDATE_FOLDER], path,
-			 display_name, highlighted);
-}
-
-static void
-impl_GNOME_Evolution_StorageListener_removed_folder (PortableServer_Servant servant,
-					       const CORBA_char *path,
-					       CORBA_Environment *ev)
-{
-	EvolutionStorageListener *listener;
-	EvolutionStorageListenerPrivate *priv;
-
-	listener = gtk_object_from_servant (servant);
-	priv = listener->priv;
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[REMOVED_FOLDER], path);
-}
-
-static EvolutionStorageListenerServant *
-create_servant (EvolutionStorageListener *listener)
-{
-	EvolutionStorageListenerServant *servant;
-	POA_GNOME_Evolution_StorageListener *corba_servant;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	servant = g_new0 (EvolutionStorageListenerServant, 1);
-	corba_servant = (POA_GNOME_Evolution_StorageListener *) servant;
-
-	corba_servant->vepv = &my_GNOME_Evolution_StorageListener_vepv;
-	POA_GNOME_Evolution_StorageListener__init ((PortableServer_Servant) corba_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	servant->gtk_object = listener;
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static GNOME_Evolution_StorageListener
-activate_servant (EvolutionStorageListener *listener,
-		  POA_GNOME_Evolution_StorageListener *servant)
-{
-	GNOME_Evolution_StorageListener corba_object;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	CORBA_free (PortableServer_POA_activate_object (bonobo_poa (), servant, &ev));
-
-	corba_object = PortableServer_POA_servant_to_reference (bonobo_poa(), servant, &ev);
-
-	if (ev._major == CORBA_NO_EXCEPTION && ! CORBA_Object_is_nil (corba_object, &ev)) {
-		CORBA_exception_free (&ev);
-		return corba_object;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return CORBA_OBJECT_NIL;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionStorageListener *storage_listener;
-	EvolutionStorageListenerPrivate *priv;
-	CORBA_Environment ev;
-
-	storage_listener = EVOLUTION_STORAGE_LISTENER (object);
-	priv = storage_listener->priv;
-
-	CORBA_exception_init (&ev);
-
-	if (priv->corba_objref != CORBA_OBJECT_NIL)
-		CORBA_Object_release (priv->corba_objref, &ev);
-
-	if (priv->servant != NULL) {
-		PortableServer_ObjectId *object_id;
-
-		object_id = PortableServer_POA_servant_to_id (bonobo_poa(), priv->servant, &ev);
-		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
-		CORBA_free (object_id);
-
-		POA_GNOME_Evolution_StorageListener__fini (priv->servant, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_StorageListener__vepv *vepv;
-	POA_GNOME_Evolution_StorageListener__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1);
-	epv->notifyDestroyed     = impl_GNOME_Evolution_StorageListener_notifyDestroyed;
-	epv->notifyFolderCreated = impl_GNOME_Evolution_StorageListener_notifyFolderCreated;
-	epv->notifyFolderUpdated = impl_GNOME_Evolution_StorageListener_notifyFolderUpdated;
-	epv->notifyFolderRemoved = impl_GNOME_Evolution_StorageListener_removed_folder;
-
-	vepv = & my_GNOME_Evolution_StorageListener_vepv;
-	vepv->_base_epv                     = base_epv;
-	vepv->GNOME_Evolution_StorageListener_epv = epv;
-}
-
-static void
-class_init (EvolutionStorageListenerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	signals[DESTROYED]      = gtk_signal_new ("destroyed",
-						  GTK_RUN_FIRST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, destroyed),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-
-	signals[NEW_FOLDER]     = gtk_signal_new ("new_folder",
-						  GTK_RUN_FIRST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, new_folder),
-						  gtk_marshal_NONE__POINTER_POINTER,
-						  GTK_TYPE_NONE, 2,
-						  GTK_TYPE_STRING,
-						  GTK_TYPE_POINTER);
-
-	signals[UPDATE_FOLDER]  = gtk_signal_new ("update_folder",
-						  GTK_RUN_FIRST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, update_folder),
-						  e_marshal_NONE__POINTER_POINTER_INT,
-						  GTK_TYPE_NONE, 3,
-						  GTK_TYPE_STRING,
-						  GTK_TYPE_STRING,
-						  GTK_TYPE_BOOL);
-
-	signals[REMOVED_FOLDER] = gtk_signal_new ("removed_folder",
-						  GTK_RUN_FIRST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, removed_folder),
-						  gtk_marshal_NONE__POINTER,
-						  GTK_TYPE_NONE, 1,
-						  GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionStorageListener *storage_listener)
-{
-	EvolutionStorageListenerPrivate *priv;
-
-	priv = g_new (EvolutionStorageListenerPrivate, 1);
-	priv->corba_objref = CORBA_OBJECT_NIL;
-
-	storage_listener->priv = priv;
-}
-
-
-void
-evolution_storage_listener_construct (EvolutionStorageListener *listener,
-				      GNOME_Evolution_StorageListener corba_objref)
-{
-	EvolutionStorageListenerPrivate *priv;
-
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (corba_objref != CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-
-	g_return_if_fail (priv->corba_objref == CORBA_OBJECT_NIL);
-
-	priv->corba_objref = corba_objref;
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (listener), GTK_FLOATING);
-}
-
-EvolutionStorageListener *
-evolution_storage_listener_new (void)
-{
-	EvolutionStorageListener *new;
-	EvolutionStorageListenerPrivate *priv;
-	GNOME_Evolution_StorageListener corba_objref;
-
-	new = gtk_type_new (evolution_storage_listener_get_type ());
-	priv = new->priv;
-
-	priv->servant = create_servant (new);
-	corba_objref = activate_servant (new, (POA_GNOME_Evolution_StorageListener *) priv->servant);
-
-	evolution_storage_listener_construct (new, corba_objref);
-
-	return new;
-}
-
-
-/**
- * evolution_storage_listener_corba_objref:
- * @listener: A pointer to an EvolutionStorageListener
- * 
- * Get the CORBA object reference for the interface embedded in this GTK+
- * object wrapper.
- * 
- * Return value: A pointer to the CORBA object reference.
- **/
-GNOME_Evolution_StorageListener
-evolution_storage_listener_corba_objref (EvolutionStorageListener *listener)
-{
-	EvolutionStorageListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE_LISTENER (listener), CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-	return priv->corba_objref;
-}
-
-
-E_MAKE_TYPE (evolution_storage_listener, "EvolutionStorageListener", EvolutionStorageListener,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h
deleted file mode 100644
index 7433c83836..0000000000
--- a/shell/evolution-storage-listener.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-listener.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_STORAGE_LISTENER_H__
-#define __EVOLUTION_STORAGE_LISTENER_H__
-
-#include <gnome.h>
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_STORAGE_LISTENER			(evolution_storage_listener_get_type ())
-#define EVOLUTION_STORAGE_LISTENER(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_STORAGE_LISTENER, EvolutionStorageListener))
-#define EVOLUTION_STORAGE_LISTENER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE_LISTENER, EvolutionStorageListenerClass))
-#define EVOLUTION_IS_STORAGE_LISTENER(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_STORAGE_LISTENER))
-#define EVOLUTION_IS_STORAGE_LISTENER_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE_LISTENER))
-
-
-typedef struct _EvolutionStorageListener        EvolutionStorageListener;
-typedef struct _EvolutionStorageListenerPrivate EvolutionStorageListenerPrivate;
-typedef struct _EvolutionStorageListenerClass   EvolutionStorageListenerClass;
-
-struct _EvolutionStorageListener {
-	GtkObject parent;
-
-	EvolutionStorageListenerPrivate *priv;
-};
-
-struct _EvolutionStorageListenerClass {
-	GtkObjectClass parent_class;
-
-	/* Signals.  */
-	void (* destroyed)       (EvolutionStorageListener *storage_listener);
-	void (* new_folder)      (EvolutionStorageListener *storage_listener,
-				  const char *path,
-				  const GNOME_Evolution_Folder *folder);
-	void (* update_folder)   (EvolutionStorageListener *storage_listener,
-				  const char *path,
-				  const char *display_name);
-	void (* removed_folder)  (EvolutionStorageListener *storage_listener,
-				  const char *path);
-};
-
-
-struct _EvolutionStorageListenerServant {
-	POA_GNOME_Evolution_StorageListener servant_placeholder;
-	EvolutionStorageListener *gtk_object;
-};
-typedef struct _EvolutionStorageListenerServant EvolutionStorageListenerServant;
-
-
-GtkType                    evolution_storage_listener_get_type      (void);
-void                       evolution_storage_listener_construct     (EvolutionStorageListener  *listener,
-								     GNOME_Evolution_StorageListener  corba_objref);
-EvolutionStorageListener  *evolution_storage_listener_new           (void);
-
-GNOME_Evolution_StorageListener  evolution_storage_listener_corba_objref  (EvolutionStorageListener *listener);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_STORAGE_LISTENER_H__ */
diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
deleted file mode 100644
index 93359def10..0000000000
--- a/shell/evolution-storage-set-view-factory.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-storage-set-view.h"
-#include "e-shell.h"
-#include "evolution-storage-set-view.h"
-
-#include "evolution-storage-set-view-factory.h"
-
-
-BonoboControl *
-evolution_storage_set_view_factory_new_view (EShell *shell)
-{
-	EStorageSet *storage_set;
-	GtkWidget *storage_set_view;
-	BonoboControl *control;
-	EvolutionStorageSetView *storage_set_view_interface;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	storage_set = e_shell_get_storage_set (shell);
-	storage_set_view = e_storage_set_view_new (storage_set);
-	gtk_widget_show (storage_set_view);
-
-	storage_set_view_interface = evolution_storage_set_view_new (E_STORAGE_SET_VIEW (storage_set_view));
-	if (storage_set_view_interface == NULL) {
-		gtk_widget_destroy (storage_set_view);
-		return NULL;
-	}
-
-	control = bonobo_control_new (storage_set_view);
-	bonobo_object_add_interface (BONOBO_OBJECT (control), BONOBO_OBJECT (storage_set_view_interface));
-
-	return control;
-}
diff --git a/shell/evolution-storage-set-view-factory.h b/shell/evolution-storage-set-view-factory.h
deleted file mode 100644
index 85710e6cd1..0000000000
--- a/shell/evolution-storage-set-view-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _EVOLUTION_STORAGE_SET_VIEW_FACTORY_H
-#define _EVOLUTION_STORAGE_SET_VIEW_FACTORY_H
-
-#include "e-shell.h"
-
-BonoboControl *evolution_storage_set_view_factory_new_view (EShell *shell);
-
-#endif /* _EVOLUTION_STORAGE_SET_VIEW_FACTORY_H */
diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
deleted file mode 100644
index e7f73b5e0a..0000000000
--- a/shell/evolution-storage-set-view-listener.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view-listener.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-storage-set-view-listener.h"
-
-
-#define PARENT_TYPE gtk_object_get_type ()
-static GtkObjectClass *parent_class = NULL;
-
-struct _EvolutionStorageSetViewListenerPrivate {
-	GNOME_Evolution_StorageSetViewListener corba_listener;
-	EvolutionStorageSetViewListenerServant *servant;
-};
-
-enum {
-	FOLDER_SELECTED,
-	STORAGE_SELECTED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Evolution::StorageSetViewListener implementation.  */
-
-static POA_GNOME_Evolution_StorageSetViewListener__vepv my_GNOME_Evolution_StorageSetViewListener_vepv;
-
-static EvolutionStorageSetViewListener *
-gtk_object_from_servant (PortableServer_Servant servant)
-{
-	EvolutionStorageSetViewListenerServant *my_servant;
-
-	my_servant = (EvolutionStorageSetViewListenerServant *) servant;
-	return my_servant->gtk_object;
-}
-
-static void
-impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (PortableServer_Servant servant,
-						       const CORBA_char *uri,
-						       CORBA_Environment *ev)
-{
-	EvolutionStorageSetViewListener *listener;
-
-	listener = gtk_object_from_servant (servant);
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[FOLDER_SELECTED], uri);
-}
-
-static void
-impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (PortableServer_Servant servant,
-							const CORBA_char *uri,
-							CORBA_Environment *ev)
-{
-	EvolutionStorageSetViewListener *listener;
-
-	listener = gtk_object_from_servant (servant);
-
-	gtk_signal_emit (GTK_OBJECT (listener), signals[STORAGE_SELECTED], uri);
-}
-
-static EvolutionStorageSetViewListenerServant *
-create_servant (EvolutionStorageSetViewListener *listener)
-{
-	EvolutionStorageSetViewListenerServant *servant;
-	POA_GNOME_Evolution_StorageSetViewListener *corba_servant;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	servant = g_new0 (EvolutionStorageSetViewListenerServant, 1);
-	corba_servant = (POA_GNOME_Evolution_StorageSetViewListener *) servant;
-
-	corba_servant->vepv = &my_GNOME_Evolution_StorageSetViewListener_vepv;
-	POA_GNOME_Evolution_StorageSetViewListener__init ((PortableServer_Servant) corba_servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	servant->gtk_object = listener;
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static GNOME_Evolution_StorageSetViewListener
-activate_servant (EvolutionStorageSetViewListener *listener,
-		  POA_GNOME_Evolution_StorageSetViewListener *servant)
-{
-	GNOME_Evolution_StorageSetViewListener corba_object;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	CORBA_free (PortableServer_POA_activate_object (bonobo_poa (), servant, &ev));
-
-	corba_object = PortableServer_POA_servant_to_reference (bonobo_poa(), servant, &ev);
-
-	if (ev._major == CORBA_NO_EXCEPTION && ! CORBA_Object_is_nil (corba_object, &ev)) {
-		CORBA_exception_free (&ev);
-		return corba_object;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return CORBA_OBJECT_NIL;
-}
-
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionStorageSetViewListener *listener;
-	EvolutionStorageSetViewListenerPrivate *priv;
-	CORBA_Environment ev;
-
-	listener = EVOLUTION_STORAGE_SET_VIEW_LISTENER (object);
-	priv = listener->priv;
-
-	CORBA_exception_init (&ev);
-
-	if (priv->corba_listener != CORBA_OBJECT_NIL)
-		CORBA_Object_release (priv->corba_listener, &ev);
-
-	if (priv->servant != NULL) {
-		PortableServer_ObjectId *object_id;
-
-		object_id = PortableServer_POA_servant_to_id (bonobo_poa(), priv->servant, &ev);
-		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
-		CORBA_free (object_id);
-
-		POA_GNOME_Evolution_StorageSetViewListener__fini (priv->servant, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_StorageSetViewListener__vepv *vepv;
-	POA_GNOME_Evolution_StorageSetViewListener__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_StorageSetViewListener__epv, 1);
-	epv->notifyFolderSelected  = impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected;
-	epv->notifyStorageSelected = impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected;
-
-	vepv = & my_GNOME_Evolution_StorageSetViewListener_vepv;
-	vepv->_base_epv                            = base_epv;
-	vepv->GNOME_Evolution_StorageSetViewListener_epv = epv;
-}
-
-static void
-class_init (EvolutionStorageSetViewListenerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	signals[FOLDER_SELECTED] = gtk_signal_new ("folder_selected",
-						   GTK_RUN_FIRST,
-						   object_class->type,
-						   GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, folder_selected),
-						   gtk_marshal_NONE__STRING,
-						   GTK_TYPE_NONE, 1,
-						   GTK_TYPE_STRING);
-
-	signals[STORAGE_SELECTED] = gtk_signal_new ("storage_selected",
-						    GTK_RUN_FIRST,
-						    object_class->type,
-						    GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, storage_selected),
-						    gtk_marshal_NONE__STRING,
-						    GTK_TYPE_NONE, 1,
-						    GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionStorageSetViewListener *storage_set_view_listener)
-{
-	EvolutionStorageSetViewListenerPrivate *priv;
-
-	priv = g_new (EvolutionStorageSetViewListenerPrivate, 1);
-	priv->corba_listener = CORBA_OBJECT_NIL;
-
-	storage_set_view_listener->priv = priv;
-}
-
-
-void
-evolution_storage_set_view_listener_construct (EvolutionStorageSetViewListener *listener,
-					       GNOME_Evolution_StorageSetViewListener corba_listener)
-{
-	EvolutionStorageSetViewListenerPrivate *priv;
-
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (EVOLUTION_IS_STORAGE_SET_VIEW_LISTENER (listener));
-	g_return_if_fail (corba_listener != CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-
-	g_return_if_fail (priv->corba_listener == CORBA_OBJECT_NIL);
-
-	priv->corba_listener = corba_listener;
-
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (listener), GTK_FLOATING);
-}
-
-EvolutionStorageSetViewListener *
-evolution_storage_set_view_listener_new (void)
-{
-	EvolutionStorageSetViewListener *new;
-	EvolutionStorageSetViewListenerPrivate *priv;
-	GNOME_Evolution_StorageSetViewListener corba_listener;
-
-	new = gtk_type_new (evolution_storage_set_view_listener_get_type ());
-	priv = new->priv;
-
-	priv->servant = create_servant (new);
-	corba_listener = activate_servant (new, (POA_GNOME_Evolution_StorageSetViewListener *) priv->servant);
-
-	evolution_storage_set_view_listener_construct (new, corba_listener);
-
-	return new;
-}
-
-GNOME_Evolution_StorageSetViewListener
-evolution_storage_set_view_listener_corba_objref (EvolutionStorageSetViewListener *listener)
-{
-	EvolutionStorageSetViewListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE_SET_VIEW_LISTENER (listener), CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-	return priv->corba_listener;
-}
-
-
-E_MAKE_TYPE (evolution_storage_set_view_listener, "EvolutionStorageSetViewListener", EvolutionStorageSetViewListener,
-	     class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-storage-set-view-listener.h b/shell/evolution-storage-set-view-listener.h
deleted file mode 100644
index 334072a55e..0000000000
--- a/shell/evolution-storage-set-view-listener.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view-listener.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _EVOLUTION_STORAGE_SET_VIEW_LISTENER_H_
-#define _EVOLUTION_STORAGE_SET_VIEW_LISTENER_H_
-
-#include <gtk/gtkobject.h>
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_STORAGE_SET_VIEW_LISTENER		(evolution_storage_set_view_listener_get_type ())
-#define EVOLUTION_STORAGE_SET_VIEW_LISTENER(obj)		(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW_LISTENER, EvolutionStorageSetViewListener))
-#define EVOLUTION_STORAGE_SET_VIEW_LISTENER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE_SET_VIEW_LISTENER, EvolutionStorageSetViewListenerClass))
-#define EVOLUTION_IS_STORAGE_SET_VIEW_LISTENER(obj)		(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW_LISTENER))
-#define EVOLUTION_IS_STORAGE_SET_VIEW_LISTENER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW_LISTENER))
-
-
-typedef struct _EvolutionStorageSetViewListener        EvolutionStorageSetViewListener;
-typedef struct _EvolutionStorageSetViewListenerPrivate EvolutionStorageSetViewListenerPrivate;
-typedef struct _EvolutionStorageSetViewListenerClass   EvolutionStorageSetViewListenerClass;
-
-struct _EvolutionStorageSetViewListener {
-	GtkObject parent;
-
-	EvolutionStorageSetViewListenerPrivate *priv;
-};
-
-struct _EvolutionStorageSetViewListenerClass {
-	GtkObjectClass parent_class;
-
-	void (* folder_selected) (EvolutionStorageSetViewListener *listener,
-				  const char *uri);
-	void (* storage_selected) (EvolutionStorageSetViewListener *listener,
-				   const char *uri);
-};
-
-
-struct _EvolutionStorageSetViewListenerServant {
-	POA_GNOME_Evolution_StorageSetViewListener servant_placeholder;
-	EvolutionStorageSetViewListener *gtk_object;
-};
-typedef struct _EvolutionStorageSetViewListenerServant EvolutionStorageSetViewListenerServant;
-
-
-GtkType                          evolution_storage_set_view_listener_get_type      (void);
-void                             evolution_storage_set_view_listener_construct     (EvolutionStorageSetViewListener  *listener,
-										    GNOME_Evolution_StorageSetViewListener  corba_objref);
-EvolutionStorageSetViewListener *evolution_storage_set_view_listener_new           (void);
-
-GNOME_Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref  (EvolutionStorageSetViewListener *listener);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _EVOLUTION_STORAGE_SET_VIEW_LISTENER_H_ */
diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c
deleted file mode 100644
index a90bce0266..0000000000
--- a/shell/evolution-storage-set-view.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include "evolution-storage-set-view.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionStorageSetViewPrivate {
-	GtkWidget *storage_set_view_widget;
-	GList *listeners;
-};
-
-
-/* EStorageSet widget callbacks.  */
-
-static void
-storage_set_view_widget_folder_selected_cb (EStorageSetView *storage_set_view_widget,
-					    const char *uri,
-					    void *data)
-{
-	EvolutionStorageSetView *storage_set_view;
-	EvolutionStorageSetViewPrivate *priv;
-	GList *p;
-
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-
-	for (p = priv->listeners; p != NULL; p = p->next) {
-		CORBA_Environment ev;
-		GNOME_Evolution_StorageSetViewListener listener;
-
-		CORBA_exception_init (&ev);
-
-		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
-		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, uri, &ev);
-
-		/* FIXME: What if we fail?  */
-
-		CORBA_exception_free (&ev);
-	}
-}
-
-static void
-storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_widget,
-					     const char *name,
-					     void *data)
-{
-	EvolutionStorageSetView *storage_set_view;
-	EvolutionStorageSetViewPrivate *priv;
-	GList *p;
-
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (data);
-	priv = storage_set_view->priv;
-
-	for (p = priv->listeners; p != NULL; p = p->next) {
-		CORBA_Environment ev;
-		GNOME_Evolution_StorageSetViewListener listener;
-
-		CORBA_exception_init (&ev);
-
-		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
-		GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (listener, name, &ev);
-
-		/* FIXME: What if we fail?  */
-
-		CORBA_exception_free (&ev);
-	}
-}
-
-
-/* Listener handling.  */
-
-static GList *
-find_listener_in_list (GNOME_Evolution_StorageSetViewListener listener,
-		       GList *list)
-{
-	CORBA_Environment ev;
-	GList *p;
-
-	CORBA_exception_init (&ev);
-
-	for (p = list; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageSetViewListener listener_item;
-
-		listener_item = (GNOME_Evolution_StorageSetViewListener) p->data;
-		if (CORBA_Object_is_equivalent (listener, listener_item, &ev))
-			break;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return p;
-}
-
-static gboolean
-add_listener (EvolutionStorageSetView *storage_set_view,
-	      GNOME_Evolution_StorageSetViewListener listener)
-{
-	EvolutionStorageSetViewPrivate *priv;
-	CORBA_Environment ev;
-	const char *current_uri;
-	GNOME_Evolution_StorageSetViewListener copy_of_listener;
-
-	priv = storage_set_view->priv;
-
-	if (find_listener_in_list (listener, priv->listeners) != NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-
-	copy_of_listener = CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	priv->listeners = g_list_prepend (priv->listeners, copy_of_listener);
-
-	current_uri = e_storage_set_view_get_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view_widget));
-	if (current_uri != NULL)
-		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, current_uri, &ev);
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-static gboolean
-remove_listener (EvolutionStorageSetView *storage_set_view,
-		 GNOME_Evolution_StorageSetViewListener listener)
-{
-	EvolutionStorageSetViewPrivate *priv;
-	GList *listener_node;
-	CORBA_Environment ev;
-
-	priv = storage_set_view->priv;
-
-	listener_node = find_listener_in_list (listener, priv->listeners);
-	if (listener_node == NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release ((CORBA_Object) listener_node->data, &ev);
-	CORBA_exception_free (&ev);
-
-	priv->listeners = g_list_remove_link (priv->listeners, listener_node);
-
-	return TRUE;
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_StorageSetView__vepv StorageSetView_vepv;
-
-static POA_GNOME_Evolution_StorageSetView *
-create_servant (void)
-{
-	POA_GNOME_Evolution_StorageSetView *servant;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	servant = (POA_GNOME_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &StorageSetView_vepv;
-
-	POA_GNOME_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		servant = NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_StorageSetView_add_listener (PortableServer_Servant servant,
-				  const GNOME_Evolution_StorageSetViewListener listener,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorageSetView *storage_set_view;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (bonobo_object);
-
-	if (! add_listener (storage_set_view, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageSetView_AlreadyListening, NULL);
-}
-
-static void
-impl_StorageSetView_remove_listener (PortableServer_Servant servant,
-				     const GNOME_Evolution_StorageSetViewListener listener,
-				     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorageSetView *storage_set_view;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (bonobo_object);
-
-	if (! remove_listener (storage_set_view, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_StorageSetView_NotFound, NULL);
-}
-
-static CORBA_boolean
-impl_StorageSetView__get_show_folders (PortableServer_Servant servant,
-				       CORBA_Environment * ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorageSetView *storage_set_view;
-	EvolutionStorageSetViewPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (bonobo_object);
-	priv = storage_set_view->priv;
-
-	return (CORBA_boolean)e_storage_set_view_get_show_folders (
-			 E_STORAGE_SET_VIEW(priv->storage_set_view_widget));
-}
-
-static void
-impl_StorageSetView__set_show_folders (PortableServer_Servant servant,
-				       const CORBA_boolean value,
-				       CORBA_Environment * ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorageSetView *storage_set_view;
-	EvolutionStorageSetViewPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (bonobo_object);
-	priv = storage_set_view->priv;
-
-	e_storage_set_view_set_show_folders (
-		          E_STORAGE_SET_VIEW(priv->storage_set_view_widget),
-			  (gboolean)value);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EvolutionStorageSetView *storage_set_view;
-	EvolutionStorageSetViewPrivate *priv;
-	CORBA_Environment ev;
-	GList *p;
-
-	storage_set_view = EVOLUTION_STORAGE_SET_VIEW (object);
-	priv = storage_set_view->priv;
-
-	CORBA_exception_init (&ev);
-
-	for (p = priv->listeners; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageSetViewListener listener;
-
-		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
-		CORBA_Object_release (listener, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_StorageSetView__vepv *vepv;
-	POA_GNOME_Evolution_StorageSetView__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_StorageSetView__epv, 1);
-	epv->addListener      = impl_StorageSetView_add_listener;
-	epv->removeListener   = impl_StorageSetView_remove_listener;
-	epv->_set_showFolders = impl_StorageSetView__set_show_folders;
-	epv->_get_showFolders = impl_StorageSetView__get_show_folders;
-
-	vepv = &StorageSetView_vepv;
-	vepv->_base_epv                    = base_epv;
-	vepv->Bonobo_Unknown_epv           = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_StorageSetView_epv = epv;
-}
-
-static void
-class_init (EvolutionStorageSetViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionStorageSetView *storage_set_view)
-{
-	EvolutionStorageSetViewPrivate *priv;
-
-	priv = g_new (EvolutionStorageSetViewPrivate, 1);
-	priv->storage_set_view_widget = NULL;
-	priv->listeners               = NULL;
-
-	storage_set_view->priv = priv;
-}
-
-
-void
-evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view,
-				      GNOME_Evolution_StorageSetView corba_object,
-				      EStorageSetView *storage_set_view_widget)
-{
-	EvolutionStorageSetViewPrivate *priv;
-
-	g_return_if_fail (storage_set_view != NULL);
-	g_return_if_fail (EVOLUTION_IS_STORAGE_SET_VIEW (storage_set_view));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	g_return_if_fail (storage_set_view_widget != NULL);
-	g_return_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view_widget));
-
-	priv = storage_set_view->priv;
-
-	bonobo_object_construct (BONOBO_OBJECT (storage_set_view), corba_object);
-
-	g_assert (priv->storage_set_view_widget == NULL);
-	priv->storage_set_view_widget = GTK_WIDGET (storage_set_view_widget);
-
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_view_widget), "folder_selected",
-			    GTK_SIGNAL_FUNC (storage_set_view_widget_folder_selected_cb), storage_set_view);
-	gtk_signal_connect (GTK_OBJECT (priv->storage_set_view_widget), "storage_selected",
-			    GTK_SIGNAL_FUNC (storage_set_view_widget_storage_selected_cb), storage_set_view);
-}
-
-EvolutionStorageSetView *
-evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget)
-{
-	POA_GNOME_Evolution_StorageSetView *servant;
-	GNOME_Evolution_StorageSetView corba_object;
-	EvolutionStorageSetView *new;
-
-	g_return_val_if_fail (storage_set_view_widget != NULL, NULL);
-	g_return_val_if_fail (E_IS_STORAGE_SET_VIEW (storage_set_view_widget), NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	new = gtk_type_new (evolution_storage_set_view_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
-
-	evolution_storage_set_view_construct (new, corba_object, storage_set_view_widget);
-
-	return new;
-}
-
-
-E_MAKE_TYPE (evolution_storage_set_view, "EvolutionStorageSetView", EvolutionStorageSetView, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-storage-set-view.h b/shell/evolution-storage-set-view.h
deleted file mode 100644
index 36f7c99f63..0000000000
--- a/shell/evolution-storage-set-view.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage-set-view.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _EVOLUTION_STORAGE_SET_VIEW_H_
-#define _EVOLUTION_STORAGE_SET_VIEW_H_
-
-#include <bonobo/bonobo-object.h>
-
-#include "e-storage-set-view.h"
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_STORAGE_SET_VIEW			(evolution_storage_set_view_get_type ())
-#define EVOLUTION_STORAGE_SET_VIEW(obj)			(GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW, EvolutionStorageSetView))
-#define EVOLUTION_STORAGE_SET_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE_SET_VIEW, EvolutionStorageSetViewClass))
-#define EVOLUTION_IS_STORAGE_SET_VIEW(obj)			(GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW))
-#define EVOLUTION_IS_STORAGE_SET_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE_SET_VIEW))
-
-
-typedef struct _EvolutionStorageSetView        EvolutionStorageSetView;
-typedef struct _EvolutionStorageSetViewPrivate EvolutionStorageSetViewPrivate;
-typedef struct _EvolutionStorageSetViewClass   EvolutionStorageSetViewClass;
-
-struct _EvolutionStorageSetView {
-	BonoboObject parent;
-
-	EvolutionStorageSetViewPrivate *priv;
-};
-
-struct _EvolutionStorageSetViewClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType                  evolution_storage_set_view_get_type   (void);
-void                     evolution_storage_set_view_construct  (EvolutionStorageSetView  *storage_set_view,
-								GNOME_Evolution_StorageSetView  corba_object,
-								EStorageSetView          *storage_set_view_widget);
-EvolutionStorageSetView *evolution_storage_set_view_new        (EStorageSetView          *storage_set_view_widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _EVOLUTION_STORAGE_SET_VIEW_H_ */
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
deleted file mode 100644
index bf02c19110..0000000000
--- a/shell/evolution-storage.c
+++ /dev/null
@@ -1,873 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "Evolution.h"
-
-#include <gal/util/e-util.h>
-
-#include "e-util/e-corba-utils.h"
-
-#include "e-folder-tree.h"
-
-#include "evolution-storage.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionStoragePrivate {
-	/* Name of the storage.  */
-	char *name;
-
-	/* URI for the toplevel node of the storage.  */
-	char *toplevel_node_uri;
-
-	/* Type for the toplevel node of the storage.  */
-	char *toplevel_node_type;
-
-	/* The set of folders we have in this storage.  */
-	EFolderTree *folder_tree;
-
-	/* Mappings from URIs to folder tree paths.  */
-	GHashTable *uri_to_path;
-
-	/* The listener registered on this storage.  */
-	GList *corba_storage_listeners;
-};
-
-
-enum {
-	CREATE_FOLDER,
-	REMOVE_FOLDER,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Utility functions.  */
-
-static void
-list_through_listener_foreach (EFolderTree *tree,
-			       const char *path,
-			       void *data,
-			       void *closure)
-{
-	const GNOME_Evolution_Folder *corba_folder;
-	GNOME_Evolution_StorageListener corba_listener;
-	CORBA_Environment ev;
-
-	corba_folder = (GNOME_Evolution_Folder *) data;
-	corba_listener = (GNOME_Evolution_StorageListener) closure;
-
-	/* The root folder has no data.  */
-	if (corba_folder == NULL)
-		return;
-	
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_StorageListener_notifyFolderCreated (corba_listener, path, corba_folder, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-list_through_listener (EvolutionStorage *storage,
-		       GNOME_Evolution_StorageListener listener,
-		       CORBA_Environment *ev)
-{
-	EvolutionStoragePrivate *priv;
-
-	priv = storage->priv;
-
-	e_folder_tree_foreach (priv->folder_tree,
-			       list_through_listener_foreach,
-			       listener);
-}
-
-static GList *
-find_listener_in_list (const GNOME_Evolution_StorageListener listener,
-		       GList *list)
-{
-	CORBA_Environment ev;
-	GList *p;
-
-	CORBA_exception_init (&ev);
-
-	for (p = list; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageListener listener_item;
-
-		listener_item = (GNOME_Evolution_StorageListener) p->data;
-
-		if (CORBA_Object_is_equivalent (listener_item, listener, &ev) && ev._major == CORBA_NO_EXCEPTION)
-			return p;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return NULL;
-}
-
-static gboolean
-add_listener (EvolutionStorage *storage,
-	      const GNOME_Evolution_StorageListener listener)
-{
-	EvolutionStoragePrivate *priv;
-	GNOME_Evolution_StorageListener listener_copy;
-	CORBA_Environment ev;
-
-	priv = storage->priv;
-
-	if (find_listener_in_list (listener, priv->corba_storage_listeners) != NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		/* Panic.  */
-		g_warning ("EvolutionStorage -- Cannot duplicate listener.");
-		CORBA_exception_free (&ev);
-
-		/* FIXME this will cause the ::add_listener implementation to
-                   incorrectly raise `AlreadyListening' */
-		return FALSE;
-	}
-
-	priv->corba_storage_listeners = g_list_prepend (priv->corba_storage_listeners,
-							listener_copy);
-
-	list_through_listener (storage, listener_copy, &ev);
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-static gboolean
-remove_listener (EvolutionStorage *storage,
-		 const GNOME_Evolution_StorageListener listener)
-{
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-	GList *p;
-
-	priv = storage->priv;
-
-	p = find_listener_in_list (listener, priv->corba_storage_listeners);
-	if (p == NULL)
-		return FALSE;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release ((CORBA_Object) p->data, &ev);
-	CORBA_exception_free (&ev);
-
-	priv->corba_storage_listeners = g_list_remove_link (priv->corba_storage_listeners, p);
-
-	return TRUE;
-}
-
-
-/* Functions for the EFolderTree in the storage.  */
-
-static void
-folder_destroy_notify (EFolderTree *tree,
-		       const char *path,
-		       void *data,
-		       void *closure)
-{
-	GNOME_Evolution_Folder *corba_folder;
-
-	corba_folder = (GNOME_Evolution_Folder *) data;
-	CORBA_free (data);
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Storage__vepv Storage_vepv;
-
-static POA_GNOME_Evolution_Storage *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Storage *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Storage *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Storage_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Storage__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static CORBA_char *
-impl_Storage__get_name (PortableServer_Servant servant,
-			CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorage *storage;
-	EvolutionStoragePrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage = EVOLUTION_STORAGE (bonobo_object);
-	priv = storage->priv;
-
-	return CORBA_string_dup (priv->name);
-}
-
-static GNOME_Evolution_Storage_Result
-storage_gtk_to_corba_result (EvolutionStorageResult result)
-{
-	switch (result) {
-	case EVOLUTION_STORAGE_OK:
-		return GNOME_Evolution_Storage_OK;
-	case EVOLUTION_STORAGE_ERROR_UNSUPPORTED_OPERATION:
-		return GNOME_Evolution_Storage_UNSUPPORTED_OPERATION;
-	case EVOLUTION_STORAGE_ERROR_UNSUPPORTED_TYPE:
-		return GNOME_Evolution_Storage_UNSUPPORTED_TYPE;
-	case EVOLUTION_STORAGE_ERROR_INVALID_URI:
-		return GNOME_Evolution_Storage_INVALID_URI;
-	case EVOLUTION_STORAGE_ERROR_ALREADY_EXISTS:
-		return GNOME_Evolution_Storage_ALREADY_EXISTS;
-	case EVOLUTION_STORAGE_ERROR_DOES_NOT_EXIST:
-		return GNOME_Evolution_Storage_DOES_NOT_EXIST;
-	case EVOLUTION_STORAGE_ERROR_PERMISSION_DENIED:
-		return GNOME_Evolution_Storage_PERMISSION_DENIED;
-	case EVOLUTION_STORAGE_ERROR_NO_SPACE:
-		return GNOME_Evolution_Storage_NO_SPACE;
-	case EVOLUTION_STORAGE_ERROR_NOT_EMPTY:
-		return GNOME_Evolution_Storage_NOT_EMPTY;
-	default:
-		return GNOME_Evolution_Storage_GENERIC_ERROR;
-	}
-}
-
-static void
-impl_Storage_async_create_folder (PortableServer_Servant servant,
-				  const CORBA_char *path,
-				  const CORBA_char *type,
-				  const CORBA_char *description,
-				  const CORBA_char *parent_physical_uri,
-				  const Bonobo_Listener listener,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorage *storage;
-	int int_result;
-	CORBA_any any;
-	GNOME_Evolution_Storage_Result corba_result;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage = EVOLUTION_STORAGE (bonobo_object);
-
-	int_result = GNOME_Evolution_Storage_UNSUPPORTED_OPERATION;
-	gtk_signal_emit (GTK_OBJECT (storage), signals[CREATE_FOLDER],
-			 path, type, description, parent_physical_uri,
-			 &int_result);
-
-	corba_result = storage_gtk_to_corba_result (int_result);
-	any._type = TC_GNOME_Evolution_Storage_Result;
-	any._value = &corba_result;
-
-	Bonobo_Listener_event (listener, "result", &any, ev);
-}
-
-static void
-impl_Storage_async_remove_folder (PortableServer_Servant servant,
-				  const CORBA_char *path,
-				  const CORBA_char *physical_uri,
-				  const Bonobo_Listener listener,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorage *storage;
-	int int_result;
-	CORBA_any any;
-	GNOME_Evolution_Storage_Result corba_result;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage = EVOLUTION_STORAGE (bonobo_object);
-
-	int_result = GNOME_Evolution_Storage_UNSUPPORTED_OPERATION;
-	gtk_signal_emit (GTK_OBJECT (storage), signals[REMOVE_FOLDER],
-			 path, physical_uri, &int_result);
-
-	corba_result = storage_gtk_to_corba_result (int_result);
-	any._type = TC_GNOME_Evolution_Storage_Result;
-	any._value = &corba_result;
-
-	Bonobo_Listener_event (listener, "result", &any, ev);
-}
-
-static void
-impl_Storage_add_listener (PortableServer_Servant servant,
-			   const GNOME_Evolution_StorageListener listener,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorage *storage;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage = EVOLUTION_STORAGE (bonobo_object);
-
-	if (! add_listener (storage, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_AlreadyListening, NULL);
-}
-
-static void
-impl_Storage_remove_listener (PortableServer_Servant servant,
-			      const GNOME_Evolution_StorageListener listener,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionStorage *storage;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	storage = EVOLUTION_STORAGE (bonobo_object);
-
-	if (! remove_listener (storage, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_NotFound, NULL);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-free_mapping (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionStorage *storage;
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-	GList *p;
-
-	storage = EVOLUTION_STORAGE (object);
-	priv = storage->priv;
-
-	g_free (priv->name);
-	g_free (priv->toplevel_node_uri);
-	g_free (priv->toplevel_node_type);
-	if (priv->folder_tree != NULL)
-		e_folder_tree_destroy (priv->folder_tree);
-	if (priv->uri_to_path != NULL) {
-		g_hash_table_foreach (priv->uri_to_path, free_mapping, NULL);
-		g_hash_table_destroy (priv->uri_to_path);
-	}
-
-	CORBA_exception_init (&ev);
-
-	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageListener listener;
-
-		listener = p->data;
-
-		GNOME_Evolution_StorageListener_notifyDestroyed (listener, &ev);
-
-		/* (This is not a Bonobo object, so no unref.)  */
-		CORBA_Object_release (listener, &ev);
-	}
-
-	g_list_free (priv->corba_storage_listeners);
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Storage__vepv *vepv;
-
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	vepv = &Storage_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Storage_epv = evolution_storage_get_epv ();
-}
-
-static void
-class_init (EvolutionStorageClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	signals[CREATE_FOLDER] = gtk_signal_new ("create_folder",
-						 GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (EvolutionStorageClass,
-								    create_folder),
-						 e_marshal_INT__POINTER_POINTER_POINTER_POINTER,
-						 GTK_TYPE_INT, 4,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_STRING);
-
-	signals[REMOVE_FOLDER] = gtk_signal_new ("remove_folder",
-						 GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (EvolutionStorageClass,
-								    remove_folder),
-						 e_marshal_INT__POINTER_POINTER,
-						 GTK_TYPE_INT, 2,
-						 GTK_TYPE_STRING,
-						 GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-init (EvolutionStorage *storage)
-{
-	EvolutionStoragePrivate *priv;
-
-	priv = g_new (EvolutionStoragePrivate, 1);
-	priv->name                    = NULL;
-	priv->toplevel_node_uri       = NULL;
-	priv->toplevel_node_type      = NULL;
-	priv->folder_tree             = e_folder_tree_new (folder_destroy_notify, storage);
-	priv->uri_to_path                = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->corba_storage_listeners = NULL;
-
-	storage->priv = priv;
-}
-
-
-POA_GNOME_Evolution_Storage__epv *
-evolution_storage_get_epv (void)
-{
-	POA_GNOME_Evolution_Storage__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Storage__epv, 1);
-	epv->_get_name         = impl_Storage__get_name;
-	epv->asyncCreateFolder = impl_Storage_async_create_folder;
-	epv->asyncRemoveFolder = impl_Storage_async_remove_folder;
-	epv->addListener       = impl_Storage_add_listener;
-	epv->removeListener    = impl_Storage_remove_listener;
-
-	return epv;
-}
-
-void
-evolution_storage_construct (EvolutionStorage *storage,
-			     GNOME_Evolution_Storage corba_object,
-			     const char *name,
-			     const char *toplevel_node_uri,
-			     const char *toplevel_node_type)
-{
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (storage != NULL);
-	g_return_if_fail (EVOLUTION_IS_STORAGE (storage));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (name[0] != '\0');
-
-	CORBA_exception_init (&ev);
-
-	bonobo_object_construct (BONOBO_OBJECT (storage), corba_object);
-
-	priv = storage->priv;
-	priv->name               = g_strdup (name);
-	priv->toplevel_node_uri  = g_strdup (toplevel_node_uri);
-	priv->toplevel_node_type = g_strdup (toplevel_node_type);
-
-	CORBA_exception_free (&ev);
-}
-
-EvolutionStorage *
-evolution_storage_new (const char *name,
-		       const char *toplevel_node_uri,
-		       const char *toplevel_node_type)
-{
-	EvolutionStorage *new;
-	POA_GNOME_Evolution_Storage *servant;
-	GNOME_Evolution_Storage corba_object;
-
-	g_return_val_if_fail (name != NULL, NULL);
-	g_return_val_if_fail (name[0] != '\0', NULL);
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	new = gtk_type_new (evolution_storage_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
-	evolution_storage_construct (new, corba_object, name, toplevel_node_uri, toplevel_node_type);
-
-	return new;
-}
-
-EvolutionStorageResult
-evolution_storage_register (EvolutionStorage *evolution_storage,
-			    GNOME_Evolution_StorageRegistry corba_storage_registry)
-{
-	EvolutionStorageResult result;
-	GNOME_Evolution_StorageListener corba_storage_listener;
-	GNOME_Evolution_Storage corba_storage;
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (corba_storage_registry != CORBA_OBJECT_NIL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	priv = evolution_storage->priv;
-
-	if (priv->corba_storage_listeners != NULL)
-		return EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED;
-
-	CORBA_exception_init (&ev);
-
-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (evolution_storage));
-	corba_storage_listener = GNOME_Evolution_StorageRegistry_addStorage (corba_storage_registry,
-									     corba_storage,
-									     priv->name,
-									     e_safe_corba_string (priv->toplevel_node_uri),
-									     e_safe_corba_string (priv->toplevel_node_type),
-									     &ev);
-
-	if (ev._major == CORBA_NO_EXCEPTION) {
-		add_listener (evolution_storage, corba_storage_listener);
-		result = EVOLUTION_STORAGE_OK;
-	} else {
-		if (ev._major != CORBA_USER_EXCEPTION)
-			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageRegistry_Exists) == 0)
-			result = EVOLUTION_STORAGE_ERROR_EXISTS;
-		else
-			result = EVOLUTION_STORAGE_ERROR_GENERIC;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-EvolutionStorageResult
-evolution_storage_register_on_shell (EvolutionStorage *evolution_storage,
-				     GNOME_Evolution_Shell corba_shell)
-{
-	GNOME_Evolution_StorageRegistry corba_storage_registry;
-	EvolutionStorageResult result;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (corba_shell != CORBA_OBJECT_NIL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	CORBA_exception_init (&ev);
-
-	corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell,
-								 "IDL:GNOME/Evolution/StorageRegistry:1.0",
-								 &ev);
-	if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return EVOLUTION_STORAGE_ERROR_NOREGISTRY;
-	}
-
-	result = evolution_storage_register (evolution_storage, corba_storage_registry);
-
-	Bonobo_Unknown_unref (corba_storage_registry, &ev);
-	CORBA_Object_release (corba_storage_registry, &ev);
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-EvolutionStorageResult
-evolution_storage_new_folder (EvolutionStorage *evolution_storage,
-			      const char *path,
-			      const char *display_name,
-			      const char *type,
-			      const char *physical_uri,
-			      const char *description,
-			      gboolean highlighted)
-{
-	EvolutionStorageResult   result;
-	EvolutionStoragePrivate *priv;
-	GNOME_Evolution_Folder  *corba_folder;
-	CORBA_Environment ev;
-	GList *p;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (path != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (g_path_is_absolute (path), EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (type != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (physical_uri != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	if (description == NULL)
-		description = "";
-
-	priv = evolution_storage->priv;
-
-	CORBA_exception_init (&ev);
-
-	corba_folder = GNOME_Evolution_Folder__alloc ();
-	corba_folder->display_name = CORBA_string_dup (display_name);
-	corba_folder->description  = CORBA_string_dup (description);
-	corba_folder->type         = CORBA_string_dup (type);
-	corba_folder->physical_uri = CORBA_string_dup (physical_uri);
-	corba_folder->highlighted  = highlighted;
-
-	if (! e_folder_tree_add (priv->folder_tree, path, corba_folder)) {
-		CORBA_free (corba_folder);
-		return EVOLUTION_STORAGE_ERROR_EXISTS;
-	}
-	g_hash_table_insert (priv->uri_to_path, g_strdup (physical_uri), g_strdup (path));
-
-	result = EVOLUTION_STORAGE_OK;
-
-	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageListener listener;
-
-		listener = p->data;
-		GNOME_Evolution_StorageListener_notifyFolderCreated (listener, path, corba_folder, &ev);
-
-		if (ev._major == CORBA_NO_EXCEPTION)
-			continue;
-
-		if (ev._major != CORBA_USER_EXCEPTION)
-			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_Exists) == 0)
-			result = EVOLUTION_STORAGE_ERROR_EXISTS;
-		else
-			result = EVOLUTION_STORAGE_ERROR_GENERIC;
-
-		break;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-EvolutionStorageResult
-evolution_storage_update_folder (EvolutionStorage *evolution_storage,
-				 const char *path, const char *display_name,
-				 gboolean highlighted)
-{
-	EvolutionStorageResult result;
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-	GList *p;
-	GNOME_Evolution_Folder *corba_folder;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (path != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (g_path_is_absolute (path), EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	priv = evolution_storage->priv;
-
-	if (priv->corba_storage_listeners == NULL)
-		return EVOLUTION_STORAGE_ERROR_NOTREGISTERED;
-
-	CORBA_exception_init (&ev);
-
-	result = EVOLUTION_STORAGE_OK;
-
-	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageListener listener;
-
-		listener = p->data;
-		GNOME_Evolution_StorageListener_notifyFolderUpdated (listener, path, display_name, highlighted, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			continue;
-
-		if (ev._major != CORBA_USER_EXCEPTION)
-			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0)
-			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
-		else
-			result = EVOLUTION_STORAGE_ERROR_GENERIC;
-
-		break;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (result == EVOLUTION_STORAGE_OK) {
-		corba_folder = e_folder_tree_get_folder (priv->folder_tree, path);
-		if (corba_folder != NULL) {
-			CORBA_free (corba_folder->display_name);
-			corba_folder->display_name = CORBA_string_dup (display_name);
-			corba_folder->highlighted = highlighted;
-		} else
-			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
-	}
-
-	return result;
-}
-
-EvolutionStorageResult
-evolution_storage_update_folder_by_uri (EvolutionStorage *evolution_storage,
-					const char *physical_uri,
-					const char *display_name,
-					gboolean highlighted)
-{
-	EvolutionStoragePrivate *priv;
-	char *path;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (physical_uri != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	priv = evolution_storage->priv;
-
-	path = g_hash_table_lookup (priv->uri_to_path, physical_uri);
-	return evolution_storage_update_folder (evolution_storage, path, display_name, highlighted);
-}
-
-EvolutionStorageResult
-evolution_storage_removed_folder (EvolutionStorage *evolution_storage,
-				  const char *path)
-{
-	EvolutionStorageResult result;
-	EvolutionStoragePrivate *priv;
-	CORBA_Environment ev;
-	GNOME_Evolution_Folder *corba_folder;
-	gpointer key, value;
-	GList *p;
-
-	g_return_val_if_fail (evolution_storage != NULL,
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (path != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (g_path_is_absolute (path), EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	priv = evolution_storage->priv;
-
-	if (priv->corba_storage_listeners == NULL)
-		return EVOLUTION_STORAGE_ERROR_NOTREGISTERED;
-
-	corba_folder = e_folder_tree_get_folder (priv->folder_tree, path);
-	if (corba_folder == NULL)
-		return EVOLUTION_STORAGE_ERROR_NOTFOUND;
-	if (g_hash_table_lookup_extended (priv->uri_to_path, corba_folder->physical_uri, &key, &value)) {
-		g_hash_table_remove (priv->uri_to_path, key);
-		g_free (key);
-		g_free (value);
-	}
-	e_folder_tree_remove (priv->folder_tree, path);
-
-	CORBA_exception_init (&ev);
-
-	result = EVOLUTION_STORAGE_OK;
-
-	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		GNOME_Evolution_StorageListener listener;
-
-		listener = p->data;
-		GNOME_Evolution_StorageListener_notifyFolderRemoved (listener, path, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			continue;
-
-		if (ev._major != CORBA_USER_EXCEPTION)
-			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0)
-			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
-		else
-			result = EVOLUTION_STORAGE_ERROR_GENERIC;
-
-		break;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-gboolean
-evolution_storage_folder_exists (EvolutionStorage *evolution_storage,
-				 const char *path)
-{
-	EvolutionStoragePrivate *priv;
-
-	g_return_val_if_fail (EVOLUTION_IS_STORAGE (evolution_storage),
-			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (path != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-	g_return_val_if_fail (g_path_is_absolute (path), EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
-
-	priv = evolution_storage->priv;
-
-	return e_folder_tree_get_folder (priv->folder_tree, path) != NULL;
-}
-
-
-E_MAKE_TYPE (evolution_storage, "EvolutionStorage", EvolutionStorage, class_init, init, PARENT_TYPE)
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
deleted file mode 100644
index 39a82a019e..0000000000
--- a/shell/evolution-storage.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_STORAGE_H__
-#define __EVOLUTION_STORAGE_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_STORAGE            (evolution_storage_get_type ())
-#define EVOLUTION_STORAGE(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_STORAGE, EvolutionStorage))
-#define EVOLUTION_STORAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_STORAGE, EvolutionStorageClass))
-#define EVOLUTION_IS_STORAGE(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
-#define EVOLUTION_IS_STORAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_STORAGE))
-
-
-typedef struct _EvolutionStorage        EvolutionStorage;
-typedef struct _EvolutionStoragePrivate EvolutionStoragePrivate;
-typedef struct _EvolutionStorageClass   EvolutionStorageClass;
-
-enum _EvolutionStorageResult {
-	EVOLUTION_STORAGE_OK,
-
-	/* Generic errors */
-	EVOLUTION_STORAGE_ERROR_GENERIC,
-	EVOLUTION_STORAGE_ERROR_CORBA,
-	EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER,
-
-	/* Registration errors */
-	EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED,
-	EVOLUTION_STORAGE_ERROR_NOTREGISTERED,
-	EVOLUTION_STORAGE_ERROR_NOREGISTRY,
-	EVOLUTION_STORAGE_ERROR_EXISTS,
-	EVOLUTION_STORAGE_ERROR_NOTFOUND,
-
-	/* Folder creation/deletion errors */
-	EVOLUTION_STORAGE_ERROR_UNSUPPORTED_OPERATION,
-	EVOLUTION_STORAGE_ERROR_UNSUPPORTED_TYPE,
-	EVOLUTION_STORAGE_ERROR_INVALID_URI,
-	EVOLUTION_STORAGE_ERROR_ALREADY_EXISTS,
-	EVOLUTION_STORAGE_ERROR_DOES_NOT_EXIST,
-	EVOLUTION_STORAGE_ERROR_PERMISSION_DENIED,
-	EVOLUTION_STORAGE_ERROR_NO_SPACE,
-	EVOLUTION_STORAGE_ERROR_NOT_EMPTY
-};
-typedef enum _EvolutionStorageResult EvolutionStorageResult;
-
-struct _EvolutionStorage {
-	BonoboObject parent;
-
-	EvolutionStoragePrivate *priv;
-};
-
-struct _EvolutionStorageClass {
-	BonoboObjectClass parent_class;
-
-	/* signals */
-	int (*create_folder) (EvolutionStorage *storage,
-			      const char *path,
-			      const char *type,
-			      const char *description,
-			      const char *parent_physical_uri);
-
-	int (*remove_folder) (EvolutionStorage *storage,
-			      const char *path,
-			      const char *physical_uri);
-};
-
-
-POA_GNOME_Evolution_Storage__epv *evolution_storage_get_epv            (void);
-
-GtkType           evolution_storage_get_type   (void);
-void              evolution_storage_construct  (EvolutionStorage        *storage,
-						GNOME_Evolution_Storage  corba_object,
-						const char              *name,
-						const char              *toplevel_node_uri,
-						const char              *toplevel_node_type);
-EvolutionStorage *evolution_storage_new        (const char              *name,
-						const char              *toplevel_node_uri,
-						const char              *toplevel_node_type);
-
-EvolutionStorageResult  evolution_storage_register             (EvolutionStorage                *storage,
-								GNOME_Evolution_StorageRegistry  corba_registry);
-EvolutionStorageResult  evolution_storage_register_on_shell    (EvolutionStorage                *evolution_storage,
-								GNOME_Evolution_Shell            corba_shell);
-EvolutionStorageResult  evolution_storage_new_folder           (EvolutionStorage                *evolution_storage,
-								const char                      *path,
-								const char                      *display_name,
-								const char                      *type,
-								const char                      *physical_uri,
-								const char                      *description,
-								gboolean                         highlighted);
-EvolutionStorageResult  evolution_storage_update_folder        (EvolutionStorage                *evolution_storage,
-								const char                      *path,
-								const char                      *display_name,
-								gboolean                         highlighted);
-EvolutionStorageResult  evolution_storage_update_folder_by_uri (EvolutionStorage                *evolution_storage,
-								const char                      *physical_uri,
-								const char                      *display_name,
-								gboolean                         highlighted);
-EvolutionStorageResult  evolution_storage_removed_folder       (EvolutionStorage                *evolution_storage,
-								const char                      *path);
-gboolean                evolution_storage_folder_exists        (EvolutionStorage                *evolution_storage,
-								const char                      *path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_STORAGE_H__ */
diff --git a/shell/glade/.cvsignore b/shell/glade/.cvsignore
deleted file mode 100644
index 3045c518dc..0000000000
--- a/shell/glade/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.deps
-.libs
-Makefile.in
-Makefile
diff --git a/shell/glade/Makefile.am b/shell/glade/Makefile.am
deleted file mode 100644
index 9ef3238360..0000000000
--- a/shell/glade/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-gladedir = $(datadir)/evolution/glade
-
-glade_DATA = e-shell-folder-creation-dialog.glade
-
-EXTRA_DIST = $(glade_DATA)
diff --git a/shell/glade/e-shell-folder-creation-dialog.glade b/shell/glade/e-shell-folder-creation-dialog.glade
deleted file mode 100644
index 55319a6505..0000000000
--- a/shell/glade/e-shell-folder-creation-dialog.glade
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Shell</name>
-  <program_name>shell</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>create_folder_dialog</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>350</default_width>
-  <default_height>410</default_height>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>ok_button</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>cancel_button</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>main_vbox</name>
-      <homogeneous>False</homogeneous>
-      <spacing>6</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>folder_name_label</name>
-	<label>Folder name:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>7.45058e-09</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>folder_name_entry</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>folder_type_label</name>
-	<label>Folder type:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>7.45058e-09</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkOptionMenu</class>
-	<name>folder_type_option_menu</name>
-	<can_focus>True</can_focus>
-	<items></items>
-	<initial_choice>0</initial_choice>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>creation_position_label</name>
-	<label>Specify where to create the folder:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>7.45058e-09</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/shell/importer/.cvsignore b/shell/importer/.cvsignore
deleted file mode 100644
index a1e30a4161..0000000000
--- a/shell/importer/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile.in
-Makefile
-GNOME_Evolution_Importer-stubs.c
-GNOME_Evolution_Importer-skels.c
-GNOME_Evolution_Importer-common.c
-GNOME_Evolution_Importer.h
-*.lo
-*.la
diff --git a/shell/importer/GNOME_Evolution_Importer.idl b/shell/importer/GNOME_Evolution_Importer.idl
deleted file mode 100644
index fe49ab82c5..0000000000
--- a/shell/importer/GNOME_Evolution_Importer.idl
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interfaces for the importer framework.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-	interface ImporterListener : Bonobo::Unknown {
-		enum ImporterResult {
-			OK,
-			UNSUPPORTED_OPERATION,
-			NOT_READY,
-			BUSY,
-			UNKNOWN_DATA,
-			BAD_DATA,
-			BAD_FILE
-		};
-
-		/**
-		 * notifyResult:
-		 * @result: The result of the import.
-		 * @more_items: Are there any more items to be processed?
-		 *
-		 * Notifies the listener of the result and whether there are
-		 * any more items to be imported.
-		 */
-		oneway void notifyResult (in ImporterResult result,
-		  			   in boolean more_items);
-	};
-
-	interface Importer : Bonobo::Unknown {
-
-		/**
-		 * processItem:
-		 * @listener: The ImporterListener that will be notified of the
-		 * progress.
-		 *
-		 * Processes the next item.
-		 *
-		 */
-		oneway void processItem (in ImporterListener listener);
-
-		/**
-		 * getError:
-		 * 
-		 * Retrieve a detailed explaination of the error.
-		 *
-		 * Returns: A string.
-		 */
-		string getError ();
-
-		/**
-		 * supportFormat:
-		 * @filename: The filename of the file.
-		 *
-		 * Checks if the importer created by this factory can 
-		 * import the file specified.
-		 *
-		 * Returns: A boolean, TRUE if it can import the file,
-		 * FALSE otherwise.
-		 */
-		boolean supportFormat (in string filename);
-
-		/**
-		 * loadFile:
-		 * @filename: The filename of the file.
-		 * 
-		 * Loads the file and prepares an Importer object that can
-		 * process files of this type.
-		 *
-		 * Returns: An Importer object.
-		 */
-		boolean loadFile (in string filename);
-	};
-};
-};
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
deleted file mode 100644
index 96bbbafd5c..0000000000
--- a/shell/importer/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shell	\
-	-I$(includedir) $(GNOME_INCLUDEDIR) 		\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\" -g -Wall 	\
-	-Wmissing-prototypes -Wmissing-declarations	\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"
-
-lib_LTLIBRARIES = libevolution-importer.la
-
-IDLS = \
-	GNOME_Evolution_Importer.idl
-
-IDL_GENERATED = 	\
-	GNOME_Evolution_Importer.h	\
-	GNOME_Evolution_Importer-common.c	\
-	GNOME_Evolution_Importer-skels.c	\
-	GNOME_Evolution_Importer-stubs.c
-
-GNOME_Evolution_Importer-impl.o: GNOME_Evolution_Importer.h
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		$(srcdir)/GNOME_Evolution_Importer.idl
-
-idldir = $(datadir)/idl
-idl_DATA = $(IDLS)
-
-libevolution_importerincludedir = $(includedir)/evolution/importer
-libevolution_importer_la_SOURCES = 	\
-	$(IDL_GENERATED)		\
-	evolution-importer-client.c	\
-	evolution-importer-listener.c	\
-	evolution-importer.c		\
-	importer.c			\
-	importer.h
-
-libevolution_importerinclude_HEADERS = 	\
-	GNOME_Evolution_Importer.h	\
-	evolution-importer-client.h	\
-	evolution-importer-listener.h	\
-	evolution-importer.h
-
-libevolution_importer_la_LIBADD =	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(EXTRA_GNOME_LIBS)		\
-	$(GTKHTML_LIBS)
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = import.glade
-
-EXTRA_DIST = $(glade_DATA) $(IDLS)
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
deleted file mode 100644
index 9b3bc3490f..0000000000
--- a/shell/importer/evolution-importer-client.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@ximian.com>
- * Based on evolution-shell-component-client.c by Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-main.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include "GNOME_Evolution_Importer.h"
-#include "evolution-importer-client.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-
-static void
-destroy (GtkObject *object)
-{
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-class_init (EvolutionImporterClientClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = destroy;
-}
-
-static void
-init (EvolutionImporterClient *client)
-{
-}
-
-static void
-evolution_importer_client_construct (EvolutionImporterClient *client,
-				     CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-/**
- * evolution_importer_client_new:
- * @objref: The CORBA_Object to make a client for.
- *
- * Makes a client for @objref. @objref should be an Evolution_Importer.
- * 
- * Returns: A newly created EvolutionImporterClient.
- */
-EvolutionImporterClient *
-evolution_importer_client_new (const CORBA_Object objref)
-{
-	EvolutionImporterClient *client;
-
-	g_return_val_if_fail (objref != CORBA_OBJECT_NIL, NULL);
-
-	client = gtk_type_new (evolution_importer_client_get_type ());
-	evolution_importer_client_construct (client, objref);
-
-	return client;
-}
-
-/**
- * evolution_importer_client_new_from_id:
- * @id: The oafiid of the component to make a client for.
- *
- * Makes a client for the object returned by activating @id.
- * 
- * Returns: A newly created EvolutionImporterClient.
- */
-EvolutionImporterClient *
-evolution_importer_client_new_from_id (const char *id)
-{
-	CORBA_Environment ev;
-	CORBA_Object objref;
-
-	g_return_val_if_fail (id != NULL, NULL);
-
-	CORBA_exception_init (&ev);
-	objref = oaf_activate_from_id ((char *) id, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start %s.", id);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-	if (objref == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate component %s", id);
-		return NULL;
-	}
-
-	return evolution_importer_client_new (objref);
-}
-
-/* API */
-/**
- * evolution_importer_client_support_format:
- * @client: The EvolutionImporterClient.
- * @filename: Name of the file to check.
- *
- * Checks whether @client is able to import @filename.
- *
- * Returns: TRUE if @client can import @filename, FALSE otherwise.
- */
-gboolean
-evolution_importer_client_support_format (EvolutionImporterClient *client,
-					  const char *filename)
-{
-	GNOME_Evolution_Importer corba_importer;
-	gboolean result;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), FALSE);
-	g_return_val_if_fail (filename != NULL, FALSE);
-
-	CORBA_exception_init (&ev);
-	corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	result = GNOME_Evolution_Importer_supportFormat (corba_importer, 
-							 filename, &ev);
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-/**
- * evolution_importer_client_load_file:
- * @client: The EvolutionImporterClient.
- * @filename: The file to load.
- *
- * Loads and initialises the importer.
- *
- * Returns: TRUE on sucess, FALSE on failure.
- */
-gboolean
-evolution_importer_client_load_file (EvolutionImporterClient *client,
-				     const char *filename)
-{
-	GNOME_Evolution_Importer corba_importer;
-	gboolean result;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), FALSE);
-	g_return_val_if_fail (filename != NULL, FALSE);
-
-	CORBA_exception_init (&ev);
-	corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	result = GNOME_Evolution_Importer_loadFile (corba_importer,
-						    filename, &ev);
-	CORBA_exception_free (&ev);
-
-	return result;
-}
-
-/**
- * evolution_importer_client_process_item:
- * @client: The EvolutionImporterClient.
- * @listener: The EvolutionImporterListener.
- *
- * Starts importing the next item in the file. @listener will be notified
- * when the item has finished.
- */
-void
-evolution_importer_client_process_item (EvolutionImporterClient *client,
-					EvolutionImporterListener *listener)
-{
-	GNOME_Evolution_Importer corba_importer;
-	GNOME_Evolution_ImporterListener corba_listener;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client));
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (EVOLUTION_IS_IMPORTER_LISTENER (listener));
-
-	CORBA_exception_init (&ev);
-
-	corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
-	GNOME_Evolution_Importer_processItem (corba_importer,
-					      corba_listener, &ev);
-	CORBA_exception_free (&ev);
-}
-
-/**
- * evolution_importer_client_get_error:
- * @client: The EvolutionImporterClient.
- *
- * Gets the error as a string. 
- *
- * Returns: The error as a string. If there is no error NULL is returned. 
- * Importers need not support this method and if so, NULL is also returned.
- */
-const char *
-evolution_importer_client_get_error (EvolutionImporterClient *client)
-{
-	GNOME_Evolution_Importer corba_importer;
-	CORBA_char *str;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), NULL);
-
-	corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	CORBA_exception_init (&ev);
-	str = GNOME_Evolution_Importer_getError (corba_importer, &ev);
-	
-	return str;
-}
-
-E_MAKE_TYPE (evolution_importer_client, "EvolutionImporterClient",
-	     EvolutionImporterClient, class_init, init, PARENT_TYPE)
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
deleted file mode 100644
index 178d20254f..0000000000
--- a/shell/importer/evolution-importer-client.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#ifndef EVOLUTION_IMPORTER_CLIENT_H
-#define EVOLUTION_IMPORTER_CLIENT_H
-
-#include <bonobo/bonobo-object-client.h>
-#include <importer/evolution-importer.h>
-#include <importer/evolution-importer-listener.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-#define EVOLUTION_TYPE_IMPORTER_CLIENT (evolution_importer_client_get_type ())
-#define EVOLUTION_IMPORTER_CLIENT(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_IMPORTER_CLIENT, EvolutionImporterClient))
-#define EVOLUTION_IMPORTER_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_IMPORTER_CLIENT, EvolutionImporterClientClass))
-#define EVOLUTION_IS_IMPORTER_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_IMPORTER_CLIENT))
-#define EVOLUTION_IS_IMPORTER_CLIENT_CLASS(klass) (GTK_CHECK_TYPE ((klass), EVOLUTION_TYPE_IMPORTER_CLIENT))
-
-
-typedef struct _EvolutionImporterClient EvolutionImporterClient;
-typedef struct _EvolutionImporterClientClass EvolutionImporterClientClass;
-
-struct _EvolutionImporterClient {
-  BonoboObjectClient parent;
-};
-
-struct _EvolutionImporterClientClass {
-  BonoboObjectClientClass parent_class;
-};
-
-GtkType evolution_importer_client_get_type (void);
-
-EvolutionImporterClient *evolution_importer_client_new (const CORBA_Object objref);
-EvolutionImporterClient *evolution_importer_client_new_from_id (const char *id);
-
-gboolean evolution_importer_client_support_format (EvolutionImporterClient *client,
-						   const char *filename);
-gboolean evolution_importer_client_load_file (EvolutionImporterClient *client,
-					      const char *filename);
-void evolution_importer_client_process_item (EvolutionImporterClient *client,
-					     EvolutionImporterListener *listener);
-const char *evolution_importer_client_get_error (EvolutionImporterClient *client);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
deleted file mode 100644
index 35e73634d5..0000000000
--- a/shell/importer/evolution-importer-listener.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-client.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include <gal/util/e-util.h>
-
-#include "GNOME_Evolution_Importer.h"
-#include "evolution-importer-listener.h"
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *parent_class;
-
-struct _EvolutionImporterListenerPrivate {
-	EvolutionImporterListenerCallback callback;
-
-	void *closure;
-};
-
-static POA_GNOME_Evolution_ImporterListener__vepv Listener_vepv;
-
-static POA_GNOME_Evolution_ImporterListener *
-create_servant (void)
-{
-	POA_GNOME_Evolution_ImporterListener *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_ImporterListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_ImporterListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static EvolutionImporterResult
-corba_result_to_evolution (GNOME_Evolution_ImporterListener_ImporterResult corba_result)
-{
-	switch (corba_result) {
-	case GNOME_Evolution_ImporterListener_OK:
-		return EVOLUTION_IMPORTER_OK;
-	case GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION:
-		return EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION;
-	case GNOME_Evolution_ImporterListener_UNKNOWN_DATA:
-		return EVOLUTION_IMPORTER_UNKNOWN_DATA;
-	case GNOME_Evolution_ImporterListener_BAD_DATA:
-		return EVOLUTION_IMPORTER_BAD_DATA;
-	case GNOME_Evolution_ImporterListener_BAD_FILE:
-		return EVOLUTION_IMPORTER_BAD_FILE;
-	case GNOME_Evolution_ImporterListener_NOT_READY:
-		return EVOLUTION_IMPORTER_NOT_READY;
-	case GNOME_Evolution_ImporterListener_BUSY:
-		return EVOLUTION_IMPORTER_BUSY;
-	default:
-		return EVOLUTION_IMPORTER_UNKNOWN_ERROR;
-	}
-}
-
-static void
-impl_GNOME_Evolution_ImporterListener_notifyResult (PortableServer_Servant servant,
-						    GNOME_Evolution_ImporterListener_ImporterResult result,
-						    CORBA_boolean more_items,
-						    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionImporterListener *listener;
-	EvolutionImporterListenerPrivate *priv;
-	EvolutionImporterResult out_result;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	listener = EVOLUTION_IMPORTER_LISTENER (bonobo_object);
-	priv = listener->private;
-
-	out_result = corba_result_to_evolution (result);
-	if (priv->callback) {
-		(priv->callback) (listener, out_result, more_items, 
-				  priv->closure);
-	}
-
-	return;
-}	
-
-
-/* GtkObject methods */
-static void
-destroy (GtkObject *object)
-{
-	EvolutionImporterListener *listener;
-	EvolutionImporterListenerPrivate *priv;
-
-	listener = EVOLUTION_IMPORTER_LISTENER (object);
-	priv = listener->private;
-
-	if (priv == NULL)
-		return;
-
-	g_free (priv);
-	listener->private = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_ImporterListener__vepv *vepv;
-	POA_GNOME_Evolution_ImporterListener__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_ImporterListener__epv, 1);
-	epv->notifyResult = impl_GNOME_Evolution_ImporterListener_notifyResult;
-	
-	vepv = &Listener_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_ImporterListener_epv = epv;
-}
-
-static void
-class_init (EvolutionImporterListenerClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	corba_class_init ();
-}
-
-static void
-init (EvolutionImporterListener *listener)
-{
-	EvolutionImporterListenerPrivate *priv;
-
-	priv = g_new0 (EvolutionImporterListenerPrivate, 1);
-	listener->private = priv;
-}
-
-E_MAKE_TYPE (evolution_importer_listener, "EvolutionImporterListener",
-	     EvolutionImporterListener, class_init, init, PARENT_TYPE);
-
-static void
-evolution_importer_listener_construct (EvolutionImporterListener *listener,
-				       GNOME_Evolution_ImporterListener corba_object,
-				       EvolutionImporterListenerCallback callback,
-				       void *closure)
-{
-	EvolutionImporterListenerPrivate *priv;
-
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (EVOLUTION_IS_IMPORTER_LISTENER (listener));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	g_return_if_fail (callback != NULL);
-
-	priv = listener->private;
-	priv->callback = callback;
-	priv->closure = closure;
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_object);
-}
-
-/**
- * evolution_importer_listener_new
- * @callback: The #EvolutionImporterListenerCallback callback.
- * @closure: The data that will be passed to that callback.
- *
- * Creates a new #EvolutionImporterListener object which calls @callback when
- * something happens.
- * Returns: A newly allocated #EvolutionImporterListener.
- */
-EvolutionImporterListener *
-evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
-				 void *closure)
-{
-	EvolutionImporterListener *listener;
-	POA_GNOME_Evolution_ImporterListener *servant;
-	GNOME_Evolution_ImporterListener corba_object;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	listener = gtk_type_new (evolution_importer_listener_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (listener),
-						       servant);
-
-	evolution_importer_listener_construct (listener, corba_object, 
-					       callback, closure);
-	return listener;
-}
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
deleted file mode 100644
index 33c4617332..0000000000
--- a/shell/importer/evolution-importer-listener.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer-listener.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@ximian.com>
- */
-
-#ifndef EVOLUTION_IMPORTER_LISTENER_H
-#define EVOLUTION_IMPORTER_LISTENER_H
-
-#include <bonobo/bonobo-object.h>
-
-#include "evolution-importer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
-
-#define EVOLUTION_TYPE_IMPORTER_LISTENER            (evolution_importer_listener_get_type ())
-#define EVOLUTION_IMPORTER_LISTENER(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_IMPORTER_LISTENER, EvolutionImporterListener))
-#define EVOLUTION_IMPORTER_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_IMPORTER_LISTENER, EvolutionImporterListenerClass))
-#define EVOLUTION_IS_IMPORTER_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_IMPORTER_LISTENER))
-#define EVOLUTION_IS_IMPORTER_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_IMPORTER_LISTENER))
-
-typedef struct _EvolutionImporterListener        EvolutionImporterListener;
-typedef struct _EvolutionImporterListenerPrivate EvolutionImporterListenerPrivate;
-typedef struct _EvolutionImporterListenerClass   EvolutionImporterListenerClass;
-
-typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *listener,
-						    EvolutionImporterResult result,
-						    gboolean more_items,
-						    void *closure);
-struct _EvolutionImporterListener {
-  BonoboObject parent;
-
-  EvolutionImporterListenerPrivate *private;
-};
-
-struct _EvolutionImporterListenerClass {
-  BonoboObjectClass parent_class;
-};
-
-GtkType evolution_importer_listener_get_type (void);
-
-EvolutionImporterListener *evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
-							    void *closure);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
deleted file mode 100644
index 85d2446a19..0000000000
--- a/shell/importer/evolution-importer.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include <gal/util/e-util.h>
-
-#include "GNOME_Evolution_Importer.h"
-#include "evolution-importer.h"
-
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionImporterPrivate {
-	EvolutionImporterLoadFileFn load_file_fn;
-	EvolutionImporterSupportFormatFn support_format_fn;
-	EvolutionImporterProcessItemFn process_item_fn;
-	EvolutionImporterGetErrorFn get_error_fn;
-
-	void *closure;
-};
-
-
-static POA_GNOME_Evolution_Importer__vepv Importer_vepv;
-
-static POA_GNOME_Evolution_Importer *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Importer *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Importer *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Importer_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Importer__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Importer_supportFormat (PortableServer_Servant servant,
-					     const CORBA_char *filename,
-					     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionImporter *importer;
-	EvolutionImporterPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	importer = EVOLUTION_IMPORTER (bonobo_object);
-	priv = importer->private;
-
-	if (priv->support_format_fn != NULL)
-		return (priv->support_format_fn) (importer, filename, 
-						  priv->closure);
-	else
-		return FALSE;
-}
-
-static CORBA_boolean
-impl_GNOME_Evolution_Importer_loadFile (PortableServer_Servant servant,
-					const CORBA_char *filename,
-					CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionImporter *importer;
-	EvolutionImporterPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	importer = EVOLUTION_IMPORTER (bonobo_object);
-	priv = importer->private;
-
-	if (priv->load_file_fn != NULL)
-		return (priv->load_file_fn) (importer, filename, priv->closure);
-	else
-		return FALSE;
-}
-
-static void
-impl_GNOME_Evolution_Importer_processItem (PortableServer_Servant servant,
-					   GNOME_Evolution_ImporterListener listener,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionImporter *importer;
-	EvolutionImporterPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	importer = EVOLUTION_IMPORTER (bonobo_object);
-	priv = importer->private;
-
-	if (priv->process_item_fn != NULL)
-		(priv->process_item_fn) (importer, listener, priv->closure, ev);
-	else
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION, FALSE, ev);
-}
-
-static CORBA_char *
-impl_GNOME_Evolution_Importer_getError (PortableServer_Servant servant,
-					CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionImporter *importer;
-	EvolutionImporterPrivate *priv;
-	CORBA_char *out_str;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	importer = EVOLUTION_IMPORTER (bonobo_object);
-	priv = importer->private;
-
-	if (priv->get_error_fn != NULL) {
-		out_str = (priv->get_error_fn) (importer, priv->closure);
-		return CORBA_string_dup (out_str ? out_str : "");
-	} else
-		return CORBA_string_dup ("");
-}
-
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionImporter *importer;
-	EvolutionImporterPrivate *priv;
-
-	importer = EVOLUTION_IMPORTER (object);
-	priv = importer->private;
-
-	if (priv == NULL)
-		return;
-
-	g_free (priv);
-	importer->private = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-corba_class_init (void)
-{
-	POA_GNOME_Evolution_Importer__vepv *vepv;
-	POA_GNOME_Evolution_Importer__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	
-	epv = g_new0 (POA_GNOME_Evolution_Importer__epv, 1);
-	epv->supportFormat = impl_GNOME_Evolution_Importer_supportFormat;
-	epv->loadFile = impl_GNOME_Evolution_Importer_loadFile;
-	epv->processItem = impl_GNOME_Evolution_Importer_processItem;
-	epv->getError = impl_GNOME_Evolution_Importer_getError;
-
-	vepv = &Importer_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Importer_epv = epv;
-}
-
-static void
-class_init (EvolutionImporterClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	corba_class_init ();
-}
-
-static void
-init (EvolutionImporter *importer)
-{
-	EvolutionImporterPrivate *priv;
-
-	priv = g_new0 (EvolutionImporterPrivate, 1);
-
-	importer->private = priv;
-}
-
-
-
-static void
-evolution_importer_construct (EvolutionImporter *importer,
-			      GNOME_Evolution_Importer corba_object,
-			      EvolutionImporterSupportFormatFn support_format_fn,
-			      EvolutionImporterLoadFileFn load_file_fn,
-			      EvolutionImporterProcessItemFn process_item_fn,
-			      EvolutionImporterGetErrorFn get_error_fn,
-			      void *closure)
-{
-	EvolutionImporterPrivate *priv;
-
-	g_return_if_fail (importer != NULL);
-	g_return_if_fail (EVOLUTION_IS_IMPORTER (importer));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	g_return_if_fail (support_format_fn != NULL);
-	g_return_if_fail (load_file_fn != NULL);
-	g_return_if_fail (process_item_fn != NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (importer), corba_object);
-
-	priv = importer->private;
-	priv->support_format_fn = support_format_fn;
-	priv->load_file_fn = load_file_fn;
-	priv->process_item_fn = process_item_fn;
-	priv->get_error_fn = get_error_fn;
-
-	priv->closure = closure;
-}
-
-/**
- * evolution_importer_new:
- * @support_format_fn: The function to be called by the supportFormat method.
- * @load_file_fn: The function to be called by the loadFile method.
- * @process_item_fn: The function to be called by the processItem method.
- * @get_error_fn: The function to be called by the getError method.
- * @closure: The data to be passed to all of the above functions.
- *
- * Creates a new EvolutionImporter object. Of the parameters only 
- * @get_error_function and @closure may be #NULL.
- *
- * Returns: A newly created EvolutionImporter object.
- */
-EvolutionImporter *
-evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn,
-			EvolutionImporterLoadFileFn load_file_fn,
-			EvolutionImporterProcessItemFn process_item_fn,
-			EvolutionImporterGetErrorFn get_error_fn,
-			void *closure)
-{
-	EvolutionImporter *importer;
-	POA_GNOME_Evolution_Importer *servant;
-	GNOME_Evolution_Importer corba_object;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	importer = gtk_type_new (evolution_importer_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (importer),
-						       servant);
-	evolution_importer_construct (importer, corba_object, 
-				      support_format_fn, load_file_fn,
-				      process_item_fn, get_error_fn, closure);
-	return importer;
-}
-
-E_MAKE_TYPE (evolution_importer, "EvolutionImporter", EvolutionImporter,
-	     class_init, init, PARENT_TYPE);
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
deleted file mode 100644
index fa5c944c2c..0000000000
--- a/shell/importer/evolution-importer.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-importer.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#ifndef EVOLUTION_IMPORTER_H
-#define EVOLUTION_IMPORTER_H
-
-#include <bonobo/bonobo-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
-
-#define EVOLUTION_TYPE_IMPORTER            (evolution_importer_get_type ())
-#define EVOLUTION_IMPORTER(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_IMPORTER, EvolutionImporter))
-#define EVOLUTION_IMPORTER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_IMPORTER, EvolutionImporterClass))
-#define EVOLUTION_IS_IMPORTER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_IMPORTER))
-#define EVOLUTION_IS_IMPORTER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_IMPORTER))
-
-typedef struct _EvolutionImporter        EvolutionImporter;
-typedef struct _EvolutionImporterPrivate EvolutionImporterPrivate;
-typedef struct _EvolutionImporterClass   EvolutionImporterClass;
-
-typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *importer,
-						       const char *filename,
-						       void *closure);
-typedef gboolean (* EvolutionImporterLoadFileFn) (EvolutionImporter *importer,
-						  const char *filename,
-						  void *closure);
-typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer,
-						 CORBA_Object listener,
-						 void *closure,
-						 CORBA_Environment *ev);
-typedef char *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer,
-					       void *closure);
-
-typedef enum {
-	EVOLUTION_IMPORTER_OK,
-	EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION,
-	EVOLUTION_IMPORTER_INTERRUPTED,
-	EVOLUTION_IMPORTER_BUSY,
-	EVOLUTION_IMPORTER_NOT_READY,
-	EVOLUTION_IMPORTER_UNKNOWN_DATA,
-	EVOLUTION_IMPORTER_BAD_DATA,
-	EVOLUTION_IMPORTER_BAD_FILE,
-	EVOLUTION_IMPORTER_UNKNOWN_ERROR
-} EvolutionImporterResult;
-
-struct _EvolutionImporter {
-  BonoboObject parent;
-
-  EvolutionImporterPrivate *private;
-};
-
-struct _EvolutionImporterClass {
-  BonoboObjectClass parent_class;
-};
-
-GtkType evolution_importer_get_type (void);
-
-EvolutionImporter *evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn,
-					   EvolutionImporterLoadFileFn load_file_fn,
-					   EvolutionImporterProcessItemFn process_item_fn,
-					   EvolutionImporterGetErrorFn get_error_fn,
-					   void *closure);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/shell/importer/import.glade b/shell/importer/import.glade
deleted file mode 100644
index d3163c9bbe..0000000000
--- a/shell/importer/import.glade
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>import</name>
-  <program_name>import</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <translatable_strings_file></translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>importwizard</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>Evolution Importer Utility</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GnomeDruid</class>
-    <name>druid1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-
-    <widget>
-      <class>GnomeDruidPageStart</class>
-      <name>page1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <title>Evolution Import Utility</title>
-      <text>Welcome to the Evolution Import Utility.
-With this wizard you will be guided through the process of
-importing external files into Evolution.</text>
-      <title_color>1,1,1</title_color>
-      <text_color>0,0,0</text_color>
-      <background_color>153,174,191</background_color>
-      <logo_background_color>255,255,255</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageStandard</class>
-      <name>page2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <title>Select a file</title>
-      <title_color>1,1,1</title_color>
-      <background_color>153,174,191</background_color>
-      <logo_background_color>255,255,255</logo_background_color>
-
-      <widget>
-	<class>GtkVBox</class>
-	<child_name>GnomeDruidPageStandard:vbox</child_name>
-	<name>druid-vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDruidPageFinish</class>
-      <name>page3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <title>Import</title>
-      <text>Click &quot;Import&quot; to begin importing the file into Evolution. </text>
-      <background_color>153,174,191</background_color>
-      <logo_background_color>255,255,255</logo_background_color>
-      <textbox_color>255,255,255</textbox_color>
-      <text_color>0,0,0</text_color>
-      <title_color>1,1,1</title_color>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/shell/importer/importer.c b/shell/importer/importer.c
deleted file mode 100644
index 5286a1b04d..0000000000
--- a/shell/importer/importer.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <liboaf/liboaf.h>
-
-#include <evolution-importer-client.h>
-
-#include <glade/glade.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <e-util/e-html-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "importer.h"
-#include "GNOME_Evolution_Importer.h"
-
-typedef struct _ImportDialogFilePage {
-	GtkWidget *vbox;
-	GtkWidget *filename;
-	GtkWidget *filetype;
-	GtkWidget *menu;
-
-	gboolean need_filename;
-} ImportDialogFilePage;
-
-typedef struct _ImportData {
-	GladeXML *wizard;
-	GtkWidget *dialog;
-	GtkWidget *druid;
-	ImportDialogFilePage *filepage;
-	GtkWidget *filedialog;
-	GtkWidget *vbox;
-
-	char *choosen_iid;
-} ImportData;
-
-/* Some HTML helper functions from mail/mail-config-gui.c */
-static void
-html_size_req (GtkWidget *widget,
-	       GtkRequisition *requisition)
-{
-	requisition->height = GTK_LAYOUT (widget)->height;
-}
-
-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If
- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.
- */
-static GtkWidget *
-html_new (gboolean white)
-{
-	GtkWidget *html, *scrolled, *frame;
-	GtkStyle *style;
-
-	html = gtk_html_new ();
-	GTK_LAYOUT (html)->height = 0;
-	gtk_signal_connect (GTK_OBJECT (html), "size_request",
-			    GTK_SIGNAL_FUNC (html_size_req), NULL);
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	style = gtk_rc_get_style (html);
-	if (style) {
-		gtk_html_set_default_background_color (GTK_HTML (html),
-						       white ? &style->white:
-						       &style->bg[0]);
-	}
-	gtk_widget_set_sensitive (html, FALSE);
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	if (white) {
-		frame = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (GTK_FRAME (frame),
-					   GTK_SHADOW_ETCHED_IN);
-		gtk_container_add (GTK_CONTAINER (frame), scrolled);
-		gtk_widget_show_all (frame);
-	} else {
-		gtk_widget_show_all (scrolled);
-	}
-
-	return html;
-}
-	
-static void
-put_html (GtkHTML *html,
-	  const char *text)
-{
-	GtkHTMLStream *handle;
-	char *htmltext;
-
-	htmltext = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
-	handle = gtk_html_begin (html);
-	gtk_html_write (html, handle, "<HTML><BODY>", 12);
-	gtk_html_write (html, handle, text, strlen (text));
-	gtk_html_write (html, handle, "</BODY></HTML>", 14);
-	g_free (htmltext);
-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
-}
-
-/* Importing functions */
-
-/* Data to be passed around */
-typedef struct _ImporterComponentData {
-	EvolutionImporterClient *client;
-	EvolutionImporterListener *listener;
-	char *filename;
-
-	GnomeDialog *dialog;
-	GtkWidget *contents;
-
-	int item;
-
-	gboolean stop;
-	gboolean destroyed;
-} ImporterComponentData;
-
-static gboolean importer_timeout_fn (gpointer data);
-static void
-import_cb (EvolutionImporterListener *listener,
-	   EvolutionImporterResult result,
-	   gboolean more_items,
-	   void *data)
-{
-	ImporterComponentData *icd = (ImporterComponentData *) data;
-	char *label;
-
-	if (icd->stop != TRUE) {
-		if (result == EVOLUTION_IMPORTER_NOT_READY) {
-			/* Importer isn't ready yet. 
-			   Wait 5 seconds and try again. */
-			
-			label = g_strdup_printf (_("Importing %s\nImporter not ready."
-						   "\nWaiting 5 seconds to retry."),
-						 icd->filename);
-			gtk_label_set_text (GTK_LABEL (icd->contents), label);
-			g_free (label);
-			while (gtk_events_pending ())
-				gtk_main_iteration ();
-			
-			gtk_timeout_add (5000, importer_timeout_fn, data);
-			return;
-		}
-		
-		if (result == EVOLUTION_IMPORTER_BUSY) {
-			gtk_timeout_add (5000, importer_timeout_fn, data);
-			return;
-		}
-
-		if (more_items) {
-			label = g_strdup_printf (_("Importing %s\nImporting item %d."),
-						 icd->filename, ++(icd->item));
-			gtk_label_set_text (GTK_LABEL (icd->contents), label);
-			g_free (label);
-			while (gtk_events_pending ())
-				gtk_main_iteration ();
-			
-			g_idle_add_full (G_PRIORITY_LOW, importer_timeout_fn, 
-					 data, NULL);
-			return;
-		}
-	}
-	
-	g_free (icd->filename);
-	if (!icd->destroyed)
-		gtk_object_destroy (GTK_OBJECT (icd->dialog));
-	bonobo_object_unref (BONOBO_OBJECT (icd->listener));
-	bonobo_object_unref (BONOBO_OBJECT (icd->client));
-	g_free (icd);
-}
-
-static gboolean
-importer_timeout_fn (gpointer data)
-{
-	ImporterComponentData *icd = (ImporterComponentData *) data;
-	char *label;
-
-	label = g_strdup_printf (_("Importing %s\nImporting item %d."),
-				 icd->filename, icd->item);
-	gtk_label_set_text (GTK_LABEL (icd->contents), label);
-	g_free (label);
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-	
-	evolution_importer_client_process_item (icd->client, icd->listener);
-	return FALSE;
-}
-
-static void
-dialog_clicked_cb (GnomeDialog *dialog,
-		   int button_number,
-		   ImporterComponentData *icd)
-{
-	if (button_number != 0)
-		return; /* Interesting... */
-
-	icd->stop = TRUE;
-}
-
-static void
-dialog_destroy_cb (GtkObject *object,
-		   ImporterComponentData *icd)
-{
-	icd->stop = TRUE;
-	icd->destroyed = TRUE;
-}
-
-static char *
-get_iid_for_filetype (const char *filename)
-{
-	OAF_ServerInfoList *info_list;
-	CORBA_Environment ev;
-	GList *can_handle = NULL, *l;
-	char *ret_iid;
-	int i, len = 0;
-
-	CORBA_exception_init (&ev);
-	info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/Importer:1.0')", NULL, &ev);
-
-	for (i = 0; i < info_list->_length; i++) {
-		CORBA_Environment ev2;
-		CORBA_Object importer;
-		const OAF_ServerInfo *info;
-
-		info = info_list->_buffer + i;
-
-		CORBA_exception_init (&ev2);
-		importer = oaf_activate_from_id ((char *) info->iid, 0, NULL, &ev2);
-		if (ev2._major != CORBA_NO_EXCEPTION) {
-			g_warning ("Error activating %s", info->iid);
-			CORBA_exception_free (&ev2);
-			continue;
-		}
-
-		if (GNOME_Evolution_Importer_supportFormat (importer,
-							    filename, &ev2)) {
-			can_handle = g_list_prepend (can_handle, 
-						     g_strdup (info->iid));
-			len++;
-		}
-
-		bonobo_object_release_unref (importer, &ev2);
-		CORBA_exception_free (&ev2);
-	}
-
-	if (len == 1) {
-		ret_iid = can_handle->data;
-		g_list_free (can_handle);
-		return ret_iid;
-	} else if (len > 1) {
-		/* FIXME: Some way to choose between multiple iids */
-		/* FIXME: Free stuff */
-		g_warning ("Multiple iids can support %s", filename);
-		ret_iid = g_strdup (can_handle->data);
-		
-		for (l = can_handle; l; l = l->next)
-			g_free (l->data);
-		g_list_free (can_handle);
-		return ret_iid;
-	} else {
-		return NULL;
-	}
-}
-		    
-static void
-start_import (const char *filename,
-	      const char *iid)
-{
-	ImporterComponentData *icd;
-	char *label;
-	char *real_iid;
-	
-	if (iid == NULL || strcmp (iid, "Automatic") == 0) {
-		/* Work out the component to use */
-		real_iid = get_iid_for_filetype (filename);
-	} else {
-		real_iid = g_strdup (iid);
-	}
-
-	g_print ("Importing with: %s\n", real_iid);
-
-	if (real_iid == NULL) {
-		char *message;
-
-		message = g_strdup_printf (_("There is no importer that is able to handle\n%s"), filename);
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, message);
-		g_free (message);
-
-		return;
-	}
-
-	icd = g_new (ImporterComponentData, 1);
-	icd->stop = FALSE;
-	icd->destroyed = FALSE;
-	icd->dialog = GNOME_DIALOG (gnome_dialog_new (_("Importing"),
-						      GNOME_STOCK_BUTTON_CANCEL,
-						      NULL));
-	gtk_signal_connect (GTK_OBJECT (icd->dialog), "clicked",
-			    GTK_SIGNAL_FUNC (dialog_clicked_cb), icd);
-	gtk_signal_connect (GTK_OBJECT (icd->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), icd);
-	
-	label = g_strdup_printf (_("Importing %s.\nStarting %s"),
-				 filename, real_iid);
-	icd->contents = gtk_label_new (label);
-	g_free (label);
-	
-	gtk_box_pack_start (GTK_BOX (icd->dialog->vbox), icd->contents,
-			    TRUE, TRUE, 0);
-	gtk_widget_show_all (GTK_WIDGET (icd->dialog));
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-	
-	icd->client = evolution_importer_client_new_from_id (real_iid);
-	g_free (real_iid);
-
-	if (evolution_importer_client_load_file (icd->client, filename) == FALSE) {
-		label = g_strdup_printf (_("Error loading %s"), filename);
-		gtk_label_set_text (GTK_LABEL (icd->contents), label);
-		g_free (label);
-		while (gtk_events_pending ())
-			gtk_main_iteration ();
-		
-		bonobo_object_unref (BONOBO_OBJECT (icd->client));
-		gtk_object_unref (GTK_OBJECT (icd->dialog));
-		g_free (icd);
-		return;
-	}
-
-	icd->filename = g_strdup (filename);
-	icd->item = 1;
-	
-	label = g_strdup_printf (_("Importing %s\nImporting item 1."),
-				 filename);
-	gtk_label_set_text (GTK_LABEL (icd->contents), label);
-	g_free (label);
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	icd->listener = evolution_importer_listener_new (import_cb, icd);
-	evolution_importer_client_process_item (icd->client, icd->listener);
-}
-
-static void
-filename_changed (GtkEntry *entry,
-		  ImportData *data)
-{
-	ImportDialogFilePage *page;
-	char *filename;
-
-	page = data->filepage;
-
-	filename = gtk_entry_get_text (entry);
-	if (filename != NULL && *filename != '\0')
-		page->need_filename = FALSE;
-	else
-		page->need_filename = TRUE;
-
-	gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid), 
-					   TRUE, !page->need_filename, TRUE);
-}
-
-static const char *
-get_name_from_component_info (const OAF_ServerInfo *info)
-{
-	OAF_Property *property;
-	const char *name;
-
-	property = oaf_server_info_prop_find ((OAF_ServerInfo *) info,
-					      "evolution:menu-name");
-	if (property == NULL || property->v._d != OAF_P_STRING)
-		return NULL;
-
-	name = property->v._u.value_string;
-
-	return name;
-}
-
-static void
-item_selected (GtkWidget *item,
-	       ImportData *data)
-{
-	char *iid;
-
-	g_free (data->choosen_iid);
-	iid = gtk_object_get_data (GTK_OBJECT (item), "oafiid");
-	g_print ("iid: %s\n", iid);
-	if (iid == NULL)
-		data->choosen_iid = g_strdup ("Automatic");
-	else
-		data->choosen_iid = g_strdup (iid);
-}
-
-static GtkWidget *
-create_plugin_menu (ImportData *data)
-{
-	OAF_ServerInfoList *info_list;
-	CORBA_Environment ev;
-	int i;
-	GtkWidget *menu;
-	GtkWidget *item;
-
-	menu = gtk_menu_new ();
-	item = gtk_menu_item_new_with_label (_("Automatic"));
-	gtk_object_set_data_full (GTK_OBJECT (item), "oafiid",
-				  g_strdup ("Automatic"), g_free);
-	gtk_menu_append (GTK_MENU (menu), item);
-
-	CORBA_exception_init (&ev);
-	info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/Importer:1.0')", NULL, &ev);
-	for (i = 0; i < info_list->_length; i++) {
-		const OAF_ServerInfo *info;
-		char *name = NULL;
-
-		info = info_list->_buffer + i;
-
-		name = g_strdup (get_name_from_component_info (info));
-		if (name == NULL) {
-			name = g_strdup (info->iid);
-		}
-
-		item = gtk_menu_item_new_with_label (name);
-		g_free (name);
-
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (item_selected), data);
-
-		gtk_object_set_data_full (GTK_OBJECT (item), "oafiid",
-					  g_strdup (info->iid), g_free);
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-
-	return menu;
-}
-
-static ImportDialogFilePage *
-importer_file_page_new (ImportData *data)
-{
-	ImportDialogFilePage *page;
-	GtkWidget *table, *label;
-	int row = 0;
-
-	page = g_new0 (ImportDialogFilePage, 1);
-
-	page->vbox = gtk_vbox_new (FALSE, 5);
-	page->need_filename = TRUE;
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	gtk_box_pack_start (GTK_BOX (page->vbox), table, TRUE, TRUE, 0);
-
-	label = gtk_label_new (_("Filename:"));
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, 
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	page->filename = gnome_file_entry_new (NULL, _("Select a file"));
-	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (page->filename))),
-			    "changed", GTK_SIGNAL_FUNC (filename_changed),
-			    data);
-
-	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, 
-			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-	row++;
-
-	label = gtk_label_new (_("File type:"));
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	page->filetype = gtk_option_menu_new ();
-	page->menu = create_plugin_menu (data);
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (page->filetype), page->menu);
-
-	gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2, 
-			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show_all (table);
-
-	return page;
-}
-
-static void
-import_druid_cancel (GnomeDruid *druid,
-		     ImportData *data)
-{
-  	gtk_widget_destroy (GTK_WIDGET (data->dialog));
-}
-
-static void
-import_druid_destroy (GtkObject *object,
-		      ImportData *data)
-{
-	gtk_object_unref (GTK_OBJECT (data->wizard));
-	g_free (data->choosen_iid);
-	g_free (data);
-}
-
-static void
-import_druid_finish (GnomeDruidPage *page,
-		     GnomeDruid *druid,
-		     ImportData *data)
-{
-	char *filename;
-	char *iid;
-
-	filename = g_strdup (gtk_entry_get_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (data->filepage->filename)))));
-	iid = g_strdup (data->choosen_iid);
-
-	gtk_widget_destroy (data->dialog);
-	start_import (filename, iid);
-
-	g_free (filename);
-	g_free (iid);
-}
-
-static gboolean
-prepare_file_page (GnomeDruidPage *page,
-		   GnomeDruid *druid,
-		   ImportData *data)
-{
-	g_print ("Prepare thyself\n");
-	gnome_druid_set_buttons_sensitive (druid, TRUE, 
-					   !data->filepage->need_filename, 
-					   TRUE);
-	return FALSE;
-}
-
-/* Hack to change the Finish button */
-static void
-druid_finish_button_change (GnomeDruid *druid)
-{
-	GtkWidget *button = druid->finish;
-	GtkWidget *hbox = GTK_BIN (button)->child, *hbox2;
-	GtkBoxChild *child;
-	GtkWidget *label;
-
-	/* Get the second item from the children list */
-	hbox2 = ((GtkBoxChild *)GTK_BOX (hbox)->children->data)->widget;
-
-	g_return_if_fail (GTK_IS_BOX (hbox2));
-	child = (GtkBoxChild *)g_list_nth_data (GTK_BOX (hbox2)->children, 0);
-	label = child->widget;
-
-	/* Safety check :) */
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_label_set_text (GTK_LABEL (label), _("Import"));
-}
-
-void
-show_import_wizard (BonoboUIComponent *component,
-		    gpointer           user_data,
-		    const char        *cname)
-{
-	ImportData *data = g_new0 (ImportData, 1);
-	GnomeDruidPageStart *start;
-	GnomeDruidPageFinish *finish;
-	GtkWidget *html;
-
-	data->wizard = glade_xml_new (EVOLUTION_GLADEDIR "/import.glade", NULL);
-	data->dialog = glade_xml_get_widget (data->wizard, "importwizard");
-	gtk_window_set_wmclass (GTK_WINDOW (data->dialog), "importdruid",
-				"Evolution:shell");
-
-	data->druid = glade_xml_get_widget (data->wizard, "druid1");
-	gtk_signal_connect (GTK_OBJECT (data->druid), "cancel",
-			    GTK_SIGNAL_FUNC (import_druid_cancel), data);
-
-	druid_finish_button_change (GNOME_DRUID (data->druid));
-	start = GNOME_DRUID_PAGE_START (glade_xml_get_widget (data->wizard, "page1"));
-	data->filedialog = glade_xml_get_widget (data->wizard, "page2");
-	gtk_signal_connect (GTK_OBJECT (data->filedialog), "prepare",
-			    GTK_SIGNAL_FUNC (prepare_file_page), data);
-
-	finish = GNOME_DRUID_PAGE_FINISH (glade_xml_get_widget (data->wizard, "page3"));
-
-	data->filepage = importer_file_page_new (data);
-	data->vbox = data->filepage->vbox;
-
-	html = html_new (TRUE);
-	put_html (GTK_HTML (html),
-		  _("Choose the file that you want to import into Evolution, "
-		    "and select what type of file it is from the list.\n\n"
-		    "You can select \"Automatic\" if you do not know, and "
-		    "Evolution will attempt to work it out."));
-	gtk_box_pack_start (GTK_BOX (data->vbox), html->parent->parent, 
-			    FALSE, TRUE, 0);
-	gtk_box_reorder_child (GTK_BOX (data->vbox), html->parent->parent, 0);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->filedialog)->vbox), data->vbox, TRUE, TRUE, 0);
-
-	/* Finish page */
-	gtk_signal_connect (GTK_OBJECT (finish), "finish",
-			    GTK_SIGNAL_FUNC (import_druid_finish), data);
-	gtk_signal_connect (GTK_OBJECT (data->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (import_druid_destroy), data);
-
-	gtk_widget_show_all (data->dialog);
-}
diff --git a/shell/importer/importer.h b/shell/importer/importer.h
deleted file mode 100644
index 644ff62866..0000000000
--- a/shell/importer/importer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#include <bonobo/bonobo-ui-component.h>
-
-#ifndef __IMPORTER_H__
-#define __IMPORTER_H__
-
-void show_import_wizard (BonoboUIComponent *component,
-			 gpointer           user_data,
-			 const char        *cname);
-
-#endif
diff --git a/shell/main.c b/shell/main.c
deleted file mode 100644
index 6be5ad4e29..0000000000
--- a/shell/main.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <glade/glade.h>
-#include <liboaf/liboaf.h>
-#include <unicode.h>
-
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-cursors.h>
-#include "e-setup.h"
-
-#include "e-shell.h"
-
-
-#define STARTUP_URI "evolution:/local/Inbox"
-
-
-static EShell *shell = NULL;
-static char *evolution_directory = NULL;
-static gboolean no_splash = FALSE;
-
-
-static void
-no_views_left_cb (EShell *shell, gpointer data)
-{
-	e_shell_quit (shell);
-	gtk_main_quit ();
-}
-
-static void
-destroy_cb (GtkObject *object, gpointer data)
-{
-	gtk_main_quit ();
-}
-
-
-static void
-development_warning (void)
-{
-	GtkWidget *label, *warning_dialog;
-	int ret;
-	
-	warning_dialog = gnome_dialog_new (
-		"Evolution" VERSION,
-		GNOME_STOCK_BUTTON_OK,
-		NULL);
-
-	label = gtk_label_new (
-		_(
-		  "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
-		  "of the Evolution groupware suite.\n"
-		  "\n"
-		  "Evolution is not yet complete. It's getting close, but there are\n"
-		  "places where features are either missing or only half working. If\n"
-		  "you can't figure out how to do something, it's probably because\n"
-		  "there's no way to do it yet! :-)\n"
-		  "\n"
-		  "We hope Evolution will be usable for you, but we still feel the\n"
-		  "need to warn you that it may: crash, lose your mail, leave stray\n"
-		  "processes running, consume 100% of your CPU, send non-\n"
-		  "compliant commands to your servers, and generally embarass you\n"
-		  "in front of your friends and co-workers. Use only as directed.\n"
-		  "\n"
-		  "We hope that you enjoy the results of our hard work, and we\n"
-		  "eagerly await your contributions!\n"
-		  ));
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 4);
-
-	label = gtk_label_new (
-		_(
-		  "Thanks\n"
-		  "The Evolution Team\n"
-		  ));
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
-	gtk_widget_show (label);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 0);
-
-	ret = gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-	if (ret != -1)
-		gtk_object_destroy (GTK_OBJECT (warning_dialog));
-}
-
-
-/* This is for doing stuff that requires the GTK+ loop to be running already.  */
-
-static void
-new_view_on_running_shell (void)
-{
-	CORBA_Object corba_object;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	corba_object = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION
-	    || CORBA_Object_is_nil (corba_object, &ev)) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize the Evolution shell."));
-		return;
-	}
-
-	shell_view = GNOME_Evolution_Shell_createNewView ((GNOME_Evolution_Shell) corba_object, STARTUP_URI, &ev);
-	if (ev._major == CORBA_NO_EXCEPTION) {
-		Bonobo_Unknown_unref ((Bonobo_Unknown) shell_view, &ev);
-		CORBA_Object_release ((CORBA_Object) shell_view, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gint
-idle_cb (gpointer data)
-{
-	EShellView *view;
-
-	shell = e_shell_new (evolution_directory, ! no_splash);
-	g_free (evolution_directory);
-
-	if (shell == NULL) {
-		/* A new shell cannot be created, so try to get a new view from
-                   an already running one.  */
-		new_view_on_running_shell ();
-		exit (1);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (shell), "no_views_left",
-			    GTK_SIGNAL_FUNC (no_views_left_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_cb), NULL);
-
-	if (! e_shell_restore_from_settings (shell))
-		view = e_shell_new_view (shell, STARTUP_URI);
-
-	if (!getenv ("EVOLVE_ME_HARDER"))
-		development_warning ();
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-	struct poptOption options[] = {
-		{ "no-splash", '\0', POPT_ARG_NONE, &no_splash, 0, N_("Disable."), NULL },
-		{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL },
-		POPT_AUTOHELP
-		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
-	};
-
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	gnome_init_with_popt_table ("Evolution", VERSION, argc, argv, options, 0, NULL);
-	oaf_init (argc, argv);
-
-	glade_gnome_init ();
-	unicode_init ();
-	e_cursors_init ();
-
-	gnome_window_icon_set_default_from_file (EVOLUTION_IMAGES "/evolution-inbox.png");
-
-	if (! bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize the Bonobo component system."));
-		exit (1);
-	}
-
-	/* FIXME */
-	evolution_directory = g_concat_dir_and_file (g_get_home_dir (), "evolution");
-
-	if (! e_setup (evolution_directory)) {
-		g_free (evolution_directory);
-		exit (1);
-	}
-
-	gtk_idle_add (idle_cb, evolution_directory);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/stamp.h.in b/stamp.h.in
deleted file mode 100644
index 8b13789179..0000000000
--- a/stamp.h.in
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/.cvsignore b/tests/.cvsignore
deleted file mode 100644
index 1ad18182a2..0000000000
--- a/tests/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-test1
-test2
-test3
-test4
-test5
-test6
-test7
-test8
-test9
-test10
-test11
-test12
-test13
-Makefile.in
-Makefile
-.deps
-.libs
-.pure
-mail1.test
-mail2.test
-test-formatter
-test-movemail
-test-url
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index a73eb21c55..0000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-# process this file with automake to create Makefile.in
-
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
-	-I$(includedir) -I$(top_srcdir)/camel/providers/pop3 \
-	-I$(top_srcdir)/camel/providers/mbox -I$(top_srcdir)/camel/providers/nntp \
-	-DG_LOG_DOMAIN=\"evolution-tests\"	
-
-LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-#	$(BONOBO_LIBS)				
-
-
-
-
-#test4_LDADD = \
-#	$(top_builddir)/camel/libcamel.la 	\
-#	$(top_builddir)/camel/providers/MH/libcamelmh.la 	\
-#	$(GNOME_LIBDIR) 			\
-#	$(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB)
-
-#test11_LDADD = \
-#	$(LDADD) \
-#	$(top_builddir)/filter/libfilter.la \
-#	$(top_builddir)/libibex/libibex.a
-
-#test9_LDADD = \
-#	$(top_builddir)/camel/libcamel.la 	\
-#	$(top_builddir)/camel/providers/mbox/libcamelmbox.la 	\
-#	$(top_builddir)/libibex/libibex.la 	\
-#	$(GNOME_LIBDIR) 			\
-#	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-test14_LDADD = \
-	$(top_builddir)/camel/providers/vee/libcamelvee.la 	\
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-#test12_LDADD = \
-#	$(top_builddir)/camel/libcamel.la 	\
-#	$(top_builddir)/camel/providers/nntp/libcamelnntp.la 	\
-#	$(top_builddir)/libibex/libibex.la 	\
-#	$(GNOME_LIBDIR) 			\
-#	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-test_movemail_LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-
-THREAD_RELATED_TESTS=test8
-
-noinst_PROGRAMS =  	\
-	test1		\
-	test2		\
-	test10		\
-	test11		\
-	test13		\
-	test14		\
-	test-movemail	\
-	test-url	\
-	$(THREAD_RELATED_TESTS)
-
-#	test3		\
-#	test12		\
-#	test-formatter	
diff --git a/tests/test-movemail.c b/tests/test-movemail.c
deleted file mode 100644
index bcd5334b5a..0000000000
--- a/tests/test-movemail.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <camel.h>
-#include <e-util/e-setup.h>
-
-static char *
-auth_callback (char *prompt, gboolean secret, CamelService *service,
-	       char *item, CamelException *ex)
-{
-	char buf[80];
-
-	printf ("%s\n", prompt);
-	if (secret)
-		printf ("(Warning: your input will be displayed)\n");
-	if (fgets (buf, sizeof (buf), stdin) == NULL) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     "User cancelled input.");
-		return NULL;
-	}
-	return g_strdup (buf);
-}
-
-extern char *evolution_folders_dir;
-
-int main (int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	CamelStore *store, *outstore;
-	CamelFolder *folder, *outfolder;
-	int nmsgs, i;
-	CamelMimeMessage *msg;
-	char *url;
-	gboolean delete = FALSE;
-
-	gtk_init (&argc, &argv);
-	camel_init ();
-
-	if (argc == 3) {
-		if (!strcmp (argv[1], "--delete") ||
-		    !strcmp (argv[1], "-d")) {
-			delete = TRUE;
-			argc--;
-			argv++;
-		}
-	}
-	if (argc != 2) {
-		fprintf (stderr, "Usage: test-movemail [--delete] url\n");
-		exit (1);
-	}
-	e_setup_base_dir ();
-	session = camel_session_new (auth_callback);
-
-	ex = camel_exception_new ();
-	store = camel_session_get_store (session, argv[1], ex);
-	if (!store) {
-		fprintf(stderr, "Could not open store %s:\n%s\n", argv[1],
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-	camel_service_connect_with_url (CAMEL_SERVICE (store), argv[1], ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't connect to %s:\n%s\n", argv[1],
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-
-	folder = camel_store_get_folder (store, "inbox", ex);
-	if (!folder) {
-		fprintf(stderr, "Could not get inbox:\n%s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-	camel_folder_open (folder, FOLDER_OPEN_READ, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't open folder: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-
-	nmsgs = camel_folder_get_message_count (folder, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't get message count: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-	printf ("Inbox contains %d messages.\n", nmsgs);
-
-#ifdef DISPLAY_ONLY
-	stdout_stream = camel_stream_fs_new_with_fd (1);
-#else
-	url = g_strdup_printf ("mbox://%s", evolution_folders_dir);
-	outstore = camel_session_get_store (session, url, ex);
-	g_free (url);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't open output store: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-	outfolder = camel_store_get_folder (outstore, "inbox", ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't make output folder: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-	camel_folder_open (outfolder, FOLDER_OPEN_WRITE, ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't open output folder: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-#endif
-
-	for (i = 1; i <= nmsgs; i++) {
-		msg = camel_folder_get_message_by_number (folder, i, ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			printf ("Couldn't get message: %s\n",
-				camel_exception_get_description (ex));
-			exit (1);
-		}
-
-#ifdef DISPLAY_ONLY
-		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg),
-						    stdout_stream);
-#else
-		camel_folder_append_message (outfolder, msg, ex);
-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-			printf ("Couldn't write message: %s\n",
-				camel_exception_get_description (ex));
-			exit (1);
-		}
-
-		if (delete) {
-			camel_folder_delete_message_by_number (folder, i, ex);
-			if (camel_exception_get_id (ex) !=
-			    CAMEL_EXCEPTION_NONE) {
-				printf ("Couldn't delete message: %s\n",
-					camel_exception_get_description (ex));
-				exit (1);
-			}
-		}
-#endif
-	}
-
-#ifndef DISPLAY_ONLY
-	camel_folder_close (outfolder, FALSE, ex);
-#endif
-	camel_folder_close (folder, TRUE, ex);
-
-	camel_service_disconnect (CAMEL_SERVICE (store), ex);
-	if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
-		printf ("Couldn't disconnect: %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-
-	return 0;
-}
-
-void
-gratuitous_dependency_generator()
-{
-	xmlSetProp();
-}
diff --git a/tests/test-url.c b/tests/test-url.c
deleted file mode 100644
index 5d8d75951b..0000000000
--- a/tests/test-url.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <camel.h>
-
-int main (int argc, char **argv)
-{
-	CamelURL *url;
-	CamelException *ex;
-
-	if (argc != 2) {
-		fprintf (stderr, "Usage: test-url URL\n");
-		exit (1);
-	}
-
-	ex = camel_exception_new ();
-	url = camel_url_new (argv[1], ex);
-	if (!url) {
-		fprintf (stderr, "Could not parse URL:\n%s",
-			 camel_exception_get_description (ex));
-		exit (1);
-	}
-
-	printf ("URL     : %s\n\n", camel_url_to_string (url, TRUE));
-	printf ("Protocol: %s\n", url->protocol);
-	if (url->user)
-		printf ("User    : %s\n", url->user);
-	if (url->authmech)
-		printf ("Authmech: %s\n", url->authmech);
-	if (url->passwd)
-		printf ("Password: %s\n", url->passwd);
-	if (url->host)
-		printf ("Host    : %s\n", url->host);
-	if (url->port)
-		printf ("Port    : %d\n", url->port);
-	if (url->path)
-		printf ("Path    : %s\n", url->path);
-
-	return 0;
-}
diff --git a/tests/test1.c b/tests/test1.c
deleted file mode 100644
index c21cfd371b..0000000000
--- a/tests/test1.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <stdio.h>
-
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel-data-wrapper.h"
-#include "camel.h"
-
-int
-main (int argc, char**argv)
-{
-	CamelMimeMessage *message;
-	CamelMultipart *multipart;
-	CamelMimePart *body_part;
-	CamelMimePart *attachment_part;
-	CamelStream *attachment_stream;
-	CamelStream *stream;
-	CamelException *ex = camel_exception_new ();
-
-	gtk_init (&argc, &argv);
-	camel_init ();
-
-	if (argc < 2) {
-		attachment_stream = NULL;
-	} else {
-		if (argc == 2) {
-			attachment_stream = camel_stream_fs_new_with_name (argv[1], O_RDONLY, 0, ex);
-			if (attachment_stream == NULL) {
-				fprintf (stderr, "Cannot open `%s': %s\n",
-					 argv[1],
-					 camel_exception_get_description (ex));
-				return 1;
-			}
-		} else {
-			fprintf (stderr, "Usage: %s [<attachment>]\n",
-				 argv[0]);
-			return 1;
-		}
-	}
-
-	message = camel_mime_message_new ();
-
-	camel_mime_part_set_description (CAMEL_MIME_PART (message), "a test");
-
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-test1", "the value of a test");
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-test2", "the value of another test");
-	/*camel_mime_part_add_content_language (CAMEL_MIME_PART (message), g_string_new ("es-ca"));*/
-
-	camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	camel_mime_message_set_subject (message, g_strdup ("A test message"));
-	camel_mime_message_set_reply_to (message, g_strdup ("toto@toto.com"));
-	camel_mime_message_set_from (message, g_strdup ("Bertrand.Guiheneuf@aful.org"));
-
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  "Franck DeChamps", "franck.dechamps@alseve.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  NULL, "mc@alseve.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  "Richo", "richard.lengagne@inria.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
-					  "Frank", "Francois.fleuret@inria.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
-					  NULL, "maury@justmagic.com");
- 	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_BCC, 
-					  "Bertie", "Bertrand.Guiheneuf@aful.org");
-
-	multipart = camel_multipart_new ();
-	body_part = camel_mime_part_new ();
-	camel_mime_part_set_content (CAMEL_MIME_PART (body_part), "This is a test.\nThis is only a test.\n",
-				     strlen("This is a test.\nThis is only a test.\n"), "text/plain");
-	camel_multipart_add_part (multipart, body_part);
-
-	if (attachment_stream == NULL) {
-		attachment_part = NULL;
-	} else {
-		CamelDataWrapper *attachment_wrapper;
-		
-		/*CamelDataWrapper *stream_wrapper;
-
-		stream_wrapper = camel_stream_data_wrapper_new
-			                                   (attachment_stream);
-
-		attachment_part = camel_mime_body_part_new ();
-		camel_mime_part_set_encoding (CAMEL_MIME_PART (attachment_part),
-					      CAMEL_MIME_PART_ENCODING_BASE64);
-		camel_medium_set_content_object (CAMEL_MEDIUM (attachment_part),
-						 stream_wrapper);
-		camel_multipart_add_part (multipart, attachment_part);
-
-		gtk_object_unref (GTK_OBJECT (stream_wrapper));*/
-		
-		attachment_wrapper = camel_data_wrapper_new ();
-		camel_data_wrapper_construct_from_stream (attachment_wrapper, 
-							  attachment_stream);
-		
-		attachment_part = camel_mime_part_new ();
-		camel_mime_part_set_encoding (CAMEL_MIME_PART (attachment_part),
-					      CAMEL_MIME_PART_ENCODING_BASE64);
-		camel_medium_set_content_object (CAMEL_MEDIUM (attachment_part),
-						 attachment_wrapper);
-		camel_multipart_add_part (multipart, attachment_part);
-	}
-	
-	camel_medium_set_content_object (CAMEL_MEDIUM (message), CAMEL_DATA_WRAPPER (multipart));
-
-	stream = camel_stream_fs_new_with_name ("mail1.test", O_WRONLY|O_TRUNC|O_CREAT, 0600, ex);
-	if (!stream)  {
-		printf ("Could not open output file: %s\n",
-			camel_exception_get_description (ex));
-		exit(2);
-	}
-		       
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
-					    stream, ex);
-	camel_stream_flush (stream, ex);
-	gtk_object_unref (GTK_OBJECT (stream));
-	if (camel_exception_is_set (ex)) {
-		printf ("Oops. Failed. %s\n",
-			camel_exception_get_description (ex));
-		exit (1);
-	}
-
-	gtk_object_unref (GTK_OBJECT (message));
-	gtk_object_unref (GTK_OBJECT (multipart));
-	gtk_object_unref (GTK_OBJECT (body_part));
-
-	if (attachment_part != NULL)
-		gtk_object_unref (GTK_OBJECT (attachment_part));
-	
-	printf ("Test1 finished\n");
-	return 1;
-}
- 
diff --git a/tests/test10.c b/tests/test10.c
deleted file mode 100644
index efe069242a..0000000000
--- a/tests/test10.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#include "camel.h"
-#include "camel-mbox-folder.h"
-#include "camel-exception.h"
-#include "md5-utils.h"
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-
-static CamelMimeMessage *
-create_sample_mime_message ()
-{
-	CamelMimeMessage *message;
-	CamelMimePart *body_part;
-	CamelMultipart *multipart;
-
-
-	message = camel_mime_message_new ();
-
-	camel_mime_part_set_description (CAMEL_MIME_PART (message), "a test");
-
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-test1", "the value of a test");
-	camel_medium_add_header (CAMEL_MEDIUM (message), "X-test2", "the value of another test");
-
-	camel_mime_message_set_date (message, time(0), 200);
-	camel_mime_message_set_subject (message, "A test message");
-	camel_mime_message_set_reply_to (message, "toto@toto.com");
-	camel_mime_message_set_from (message, "Bertrand.Guiheneuf@aful.org");
-
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  "Franck DeChamps", "franck.dechamps@alseve.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  NULL, "mc@alseve.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
-					  "Richo", "richard.lengagne@inria.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
-					  "Frank", "Francois.fleuret@inria.fr");
-	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
-					  NULL, "maury@justmagic.com");
- 	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_BCC, 
-					  "Bertie", "Bertrand.Guiheneuf@aful.org");
-
-	multipart = camel_multipart_new ();
-	body_part = camel_mime_part_new ();
-	camel_mime_part_set_content (CAMEL_MIME_PART (body_part), "This is a test.\nThis is only a test.\n",
-				     strlen("This is a test.\nThis is only a test.\n"), "text/plain");
-	camel_multipart_add_part (multipart, body_part);
-	camel_medium_set_content_object (CAMEL_MEDIUM (message), CAMEL_DATA_WRAPPER (multipart));
-	
-	return message;
-}
-
-static char *
-auth_callback(char *prompt, gboolean secret,
-	      CamelService *service, char *item,
-	      CamelException *ex)
-{
-	printf ("auth_callback called: %s\n", prompt);
-	return NULL;
-}
-
-
-
-
-int
-main (int argc, char**argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	CamelStore *store;
-	gchar *store_url = "mbox:///tmp/evmail";
-	CamelFolder *folder;
-	CamelMimeMessage *message;
-	GList *uid_list;
-
-	gtk_init (&argc, &argv);
-	camel_init ();		
-	ex = camel_exception_new ();
-	
-	session = camel_session_new (auth_callback);
-	store = camel_session_get_store (session, store_url, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_session_get_store\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	folder = camel_store_get_folder (store, "Inbox", ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_store_get_folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	camel_folder_open (folder, FOLDER_OPEN_RW, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught when trying to open the folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	message = create_sample_mime_message ();
-	camel_folder_append_message (folder, message, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught when trying to append a message to the folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-	
-	uid_list = camel_folder_get_uid_list (folder, ex);
-	
-	
-	camel_folder_get_message_by_uid (folder, (gchar *)uid_list->data, ex);
-	camel_folder_close (folder, FALSE, ex);	
-	return 1;
-}
-
-
-
-
diff --git a/tests/test11.c b/tests/test11.c
deleted file mode 100644
index 1323a5f90b..0000000000
--- a/tests/test11.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
-  Test search api
-  */
-
-
-#include <camel/camel.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/md5-utils.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-static char *
-auth_callback(char *prompt, gboolean secret,
-	      CamelService *service, char *item,
-	      CamelException *ex)
-{
-	printf ("auth_callback called: %s\n", prompt);
-	return NULL;
-}
-
-int
-main (int argc, char**argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	CamelStore *store;
-	gchar *store_url = "mbox:///tmp/evmail";
-	CamelFolder *folder, *outbox;
-	GList *n, *matches;
-
-	gtk_init (&argc, &argv);
-	camel_init ();		
-	ex = camel_exception_new ();
-
-	session = camel_session_new (auth_callback);
-
-	camel_provider_load (session, "../camel/providers/mbox/.libs/libcamelmbox.so.0", ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exceptions suck: %s\n", camel_exception_get_description (ex));
-		return 1;
-	}
-
-	store = camel_session_get_store (session, store_url, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_session_get_store\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	printf("get folder\n");	
-
-	folder = camel_store_get_folder (store, "Inbox", ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_store_get_folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-	
-	printf("open folder\n");
-
-	camel_folder_open (folder, FOLDER_OPEN_READ, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught when trying to open the folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	printf("create output folder ...\n");
-	outbox = camel_store_get_folder (store, "Gnome", ex);
-	if (!camel_folder_exists(outbox, ex)) {
-		camel_folder_create(outbox, ex);
-	}
-	
-	camel_folder_open (outbox, FOLDER_OPEN_WRITE, ex);
-
-	printf("Search for messages\n");
-
-	matches = camel_folder_search_by_expression  (folder,
-/*						      "(match-all (header-contains \"subject\" \"gnome\"))",*/
-						      "(body-contains \"gnome\")",
-						      ex);
-
-	printf("search found matches:\n");
-	n = matches;
-	while (n) {
-		CamelMimeMessage *m;
-		
-		printf("uid: %s\n", (char *) n->data);
-		m = camel_folder_get_message_by_uid(folder, n->data, ex);
-
-		if (camel_exception_get_id (ex)) {
-			printf ("Cannot get message\n"
-				"Full description : %s\n", camel_exception_get_description (ex));
-			camel_exception_init(ex);
-		} else {
-
-#if 1
-		
-			camel_folder_append_message(outbox, m, ex);
-			
-			if (camel_exception_get_id (ex)) {
-				printf ("Cannot save message\n"
-					"Full description : %s\n", camel_exception_get_description (ex));
-			}
-
-			printf("Removing matching message from source folder?\n");
-			camel_mime_message_set_flags(m, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-/*			camel_mime_message_set_flags(m, CAMEL_MESSAGE_ANSWERED, CAMEL_MESSAGE_ANSWERED);*/
-#endif
-
-		}
-		if (m)
-			gtk_object_unref(m);
-		n = g_list_next(n);
-	}
-
-	camel_folder_close (outbox, TRUE, ex);
-	camel_folder_close (folder, TRUE, ex);
-
-	gtk_object_unref((GtkObject *)outbox);
-	gtk_object_unref((GtkObject *)folder);
-
-	return 0;
-}
-
-
-
-
diff --git a/tests/test12.c b/tests/test12.c
deleted file mode 100644
index 223eb980a8..0000000000
--- a/tests/test12.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <stdio.h>
-
-#include "camel.h"
-#include "camel-nntp-store.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-
-static char*
-authenticator (char *prompt, gboolean secret, CamelService *service, char *item,
-	       CamelException *ex)
-{
-}
-
-static void
-print_name(gpointer data, gpointer foo)
-{
-	printf ("%s\n", (char*)data);
-}
-
-int
-main (int argc, char **argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	CamelStore *store;
-	CamelFolder *n_p_m_a;
-	GList *groups;
-	const gchar *news_url = "news://news.mozilla.org";
-
-	gtk_init (&argc, &argv);
-	camel_init ();		
-	ex = camel_exception_new ();
-
-	g_assert (camel_provider_register_as_module ("/usr/local/lib/evolution/camel-providers/0.0.1/libcamelnntp.so"));
-
-	session = camel_session_new (authenticator);
-	store = camel_session_get_store (session, news_url, ex);
-
-	g_assert (store);
-
-	camel_nntp_store_subscribe_group (store, "netscape.public.mozilla.announce");
-
-	printf ("subscribed groups on %s\n", news_url);
-
-	groups = camel_nntp_store_list_subscribed_groups (store);
-
-	g_list_foreach(groups, print_name, NULL);
-
-	n_p_m_a = camel_store_get_folder (store, "netscape.public.mozilla.announce", ex);
-
-	camel_folder_open(n_p_m_a, FOLDER_OPEN_READ, ex);
-
-	camel_folder_close(n_p_m_a, FALSE, ex);
-}
diff --git a/tests/test13.c b/tests/test13.c
deleted file mode 100644
index 3e191eddf5..0000000000
--- a/tests/test13.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* tests mime message file parsing */
-#include "stdio.h"
-#include "camel-mime-message.h"
-#include "camel-mime-part.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel.h"
-
-
-static void
-dump_message_content(CamelDataWrapper *object)
-{
-	CamelDataWrapper *containee;
-	CamelStream *stream;
-	int parts, i;
-	int len;
-	int left;
-	char buffer[128];
-
-	printf("Dumping message ...");
-
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee) {
-		char *type = gmime_content_field_get_mime_type(containee->mime_type);
-
-		printf("type = %s\n", type);
-		
-		if (CAMEL_IS_MULTIPART(containee)) {
-			parts = camel_multipart_get_number (CAMEL_MULTIPART(containee));
-			printf("multipart message, scanning contents  %d parts ...\n", parts);
-			for (i=0;i<parts;i++) {
-				dump_message_content(CAMEL_DATA_WRAPPER (camel_multipart_get_part(CAMEL_MULTIPART(containee), i)));
-			}
-		} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-			dump_message_content((CamelDataWrapper *)containee);
-		} else {
-			stream = camel_data_wrapper_get_output_stream(containee);
-			left = 0;
-
-			if (stream) {
-				while ( (len = camel_stream_read(stream, buffer+left, sizeof(buffer)-left, NULL)) > 0) {
-					fwrite(buffer, len, 1, stdout);
-				}
-				printf("\n");
-			} else {
-				g_warning("cannot get stream for message?");
-			}
-		}
-
-		g_free(type);
-	} else {
-		printf("no containee?\n");
-	}
-}
-
-int
-main (int argc, char**argv)
-{
-	CamelMimeMessage *message;
-	CamelStream *input_stream, *output_stream;
-	CamelMimeParser *parser;
-
-	gtk_init (&argc, &argv);
-	camel_init ();
-
-/* should have another program to test all this internationalisation/header parsing stuff */
-#if 0
-	{
-		char *s, *o;
-		s = "This is a test, simple ascii text";
-		o = header_encode_string(s);
-		printf("%s -> %s\n", s, o);
-		s = "To: Markus \"D�Åhr\" <doehrm@aubi.de>";
-		o = header_encode_string(s);
-		printf("%s -> %s\n", s, o);
-
-		s = "From: =?iso-8859-1?Q?Kenneth_ll=E9phaane_Christiansen?= <kenneth@ripen.dk>";
-		o = header_encode_string(s);
-		printf("%s -> %s\n", s, o);
-
-		printf("decoding ... \n");
-		s = "From: =?iso-8859-1?Q?Kenneth_ll=E9phaane_Christiansen?= <kenneth@ripen.dk>";
-		o = header_decode_string(s);
-		printf("%s -> %s\n", s, o);
-
-		printf("reencoded\n");
-		s = header_encode_string(o);
-		printf("%s -> %s\n", o, s);
-		return 0;
-	}
-#endif
-		
-	message = camel_mime_message_new ();
-
-	
-	input_stream = camel_stream_fs_new_with_name ("mail.test", O_RDONLY, 0, NULL);
-	if (!input_stream) {
-		perror ("could not open input file\n");
-		printf ("You must create the file mail.test before running this test\n");
-		exit(2);
-	}
-
-	printf("creating parser to create message\n");
-	parser = camel_mime_parser_new();
-	camel_mime_parser_init_with_stream(parser, input_stream);
-	camel_mime_part_construct_from_parser(CAMEL_MIME_PART (message),
-					      parser);
-
-	dump_message_content(CAMEL_DATA_WRAPPER (message));
-
-	gtk_object_unref (GTK_OBJECT (input_stream));
-
-	output_stream = camel_stream_fs_new_with_name ("mail2.test", O_WRONLY|O_CREAT|O_TRUNC, 0600, NULL);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream, NULL);
-	camel_stream_flush (output_stream, NULL);
-	gtk_object_unref (GTK_OBJECT (output_stream));
-	
-	//gtk_object_unref (GTK_OBJECT (message));
-	return 0;
-
-}
diff --git a/tests/test14.c b/tests/test14.c
deleted file mode 100644
index 80963415db..0000000000
--- a/tests/test14.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
-  Test vfolder.
-  */
-
-
-#include <camel/camel.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/providers/vee/camel-vee-folder.h>
-#include <camel/md5-utils.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-static void
-dump_message_content(CamelDataWrapper *object)
-{
-	CamelDataWrapper *containee;
-	CamelStream *stream;
-	int parts, i;
-	int len;
-	int left;
-	char buffer[128];
-
-	printf("Dumping message ...");
-
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee) {
-		char *type = gmime_content_field_get_mime_type(containee->mime_type);
-
-		printf("type = %s\n", type);
-		
-		if (CAMEL_IS_MULTIPART(containee)) {
-			parts = camel_multipart_get_number (CAMEL_MULTIPART(containee));
-			printf("multipart message, scanning contents  %d parts ...\n", parts);
-			for (i=0;i<parts;i++) {
-				dump_message_content(CAMEL_DATA_WRAPPER (camel_multipart_get_part(CAMEL_MULTIPART(containee), i)));
-			}
-		} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-			dump_message_content((CamelDataWrapper *)containee);
-		} else {
-			stream = camel_data_wrapper_get_output_stream(containee);
-			left = 0;
-
-			if (stream) {
-				while ( (len = camel_stream_read(stream, buffer+left, sizeof(buffer)-left, NULL)) > 0) {
-					fwrite(buffer, len, 1, stdout);
-				}
-				printf("\n");
-			} else {
-				g_warning("cannot get stream for message?");
-			}
-		}
-
-		g_free(type);
-	} else {
-		printf("no containee?\n");
-	}
-}
-
-
-static char *
-auth_callback(char *prompt, gboolean secret,
-	      CamelService *service, char *item,
-	      CamelException *ex)
-{
-	printf ("auth_callback called: %s\n", prompt);
-	return NULL;
-}
-
-int
-main (int argc, char**argv)
-{
-	CamelSession *session;
-	CamelException *ex;
-	CamelStore *store;
-	gchar *store_url = "vfolder:";
-	CamelFolder *folder;
-	GList *n, *matches;
-
-	gtk_init (&argc, &argv);
-	camel_init ();		
-	ex = camel_exception_new ();
-
-	session = camel_session_new (auth_callback);
-
-	camel_provider_load (session, "../camel/providers/vee/.libs/libcamelvee.so.0", ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exceptions suck: %s\n", camel_exception_get_description (ex));
-		return 1;
-	}
-
-	store = camel_session_get_store (session, store_url, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_session_get_store\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	printf("get folder\n");	
-
-	folder = camel_store_get_folder (store, "gnome_email?(match-all (header-contains \"subject\" \"gnome\"))", ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught in camel_store_get_folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	/* setup searched folders */
-	{
-		CamelFolder *subfolder;
-		CamelStore *substore;
-
-		substore = camel_session_get_store (session, "mbox:///home/notzed/evolution/local/Inbox", ex);
-		subfolder = camel_store_get_folder(substore, "mbox", ex);
-		camel_folder_open (subfolder, FOLDER_OPEN_READ, ex);
-		camel_vee_folder_add_folder(folder, subfolder);
-
-		if (camel_exception_get_id (ex)) {
-			printf ("Exception caught in camel_store_get_folder\n"
-				"Full description : %s\n", camel_exception_get_description (ex));
-			return -1;
-		}
-
-		substore = camel_session_get_store (session, "mbox:///home/notzed/evolution/local/Outbox", ex);
-		subfolder = camel_store_get_folder(substore, "mbox", ex);
-		camel_folder_open (subfolder, FOLDER_OPEN_READ, ex);
-		camel_vee_folder_add_folder(folder, subfolder);
-
-		if (camel_exception_get_id (ex)) {
-			printf ("Exception caught in camel_store_get_folder\n"
-				"Full description : %s\n", camel_exception_get_description (ex));
-			return -1;
-		}
-	}
-	
-	printf("open folder\n");
-
-	camel_folder_open (folder, FOLDER_OPEN_READ, ex);
-	if (camel_exception_get_id (ex)) {
-		printf ("Exception caught when trying to open the folder\n"
-			"Full description : %s\n", camel_exception_get_description (ex));
-		return -1;
-	}
-
-	printf("vfolder's uid's:\n");
-	n = camel_folder_get_uid_list(folder, ex);
-	while (n) {
-		CamelMimeMessage *m;
-		
-		printf("uid: %s\n", (char *) n->data);
-
-		m = camel_folder_get_message_by_uid(folder, n->data, ex);
-		if (m) {
-			dump_message_content(m);
-			gtk_object_unref(m);
-		}
-		n = g_list_next(n);
-	}
-
-	camel_folder_close (folder, TRUE, ex);
-
-	gtk_object_unref((GtkObject *)folder);
-
-	return 0;
-}
-
-
-
-
diff --git a/tests/test2.c b/tests/test2.c
deleted file mode 100644
index a6299357cb..0000000000
--- a/tests/test2.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* tests mime message file parsing */
-#include "stdio.h"
-#include "camel-mime-message.h"
-#include "camel-mime-part.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel.h"
-
-int
-main (int argc, char**argv)
-{
-	CamelMimeMessage *message;
-	CamelStream *input_stream;
-	CamelException *ex = camel_exception_new ();
-	
-	gtk_init (&argc, &argv);
-	camel_init ();
-		
-	message = camel_mime_message_new ();
-
-	
-	input_stream = camel_stream_fs_new_with_name ("mail.test", O_RDONLY, 0, ex);
-	if (!input_stream) {
-		perror ("could not open input file\n");
-		printf ("You must create the file mail.test before running this test\n");
-		exit(2);
-	}
-
-
-	camel_data_wrapper_construct_from_stream ( CAMEL_DATA_WRAPPER (message), input_stream);
-
-	camel_medium_get_content_object (CAMEL_MEDIUM (message));
-
-#if 0
-	camel_stream_close (input_stream);
-	gtk_object_unref (GTK_OBJECT (input_stream));
-
-	output_stream = camel_stream_fs_new_with_name ("mail2.test", O_WRONLY|O_TRUNC|O_CREAT, 0600);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream);
-	camel_stream_close (output_stream);
-	gtk_object_unref (GTK_OBJECT (output_stream));
-	
-	//gtk_object_unref (GTK_OBJECT (message));
-#endif 
-	return 0;
-
-}
diff --git a/tests/test3.c b/tests/test3.c
deleted file mode 100644
index 9893e2e507..0000000000
--- a/tests/test3.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include "camel.h"
-
-int
-main (int argc, char**argv)
-{
-	GtkType type;
-	
-	gtk_init (&argc, &argv);
-	camel_init ();
-	
-	printf ("Test 3 : data wrapper repository\n");
-
-	printf ("\nMime type : \"multipart\"\n");
-	type = data_wrapper_repository_get_data_wrapper_type ("multipart");
-	printf ("Type found %s\n", gtk_type_name (type) );
-	
-	printf ("\nMime type : \"multipart/alternative\"\n");
-	type = data_wrapper_repository_get_data_wrapper_type ("multipart/alternative");
-	printf ("Type found %s\n", gtk_type_name (type) );
-	
-	printf ("\nMime type : \"toto/titi\"\n");
-	type = data_wrapper_repository_get_data_wrapper_type ("toto/titi");
-	printf ("Type found %s\n", gtk_type_name (type) );
-	
-	printf ("Test3 finished\n");
-	return 1;
-}
- 
diff --git a/tests/test4.c b/tests/test4.c
deleted file mode 100644
index bc9eef71d1..0000000000
--- a/tests/test4.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* testing mh providers 
-   do not use CamelMhFolder and CamelMhStore directly.
-   We do it here for test purpose only */
-
-
-
-#include "camel-folder.h"
-#include "camel-mh-folder.h"
-#include "camel-mh-store.h"
-#include "camel.h"
-
-int
-main (int argc, char**argv)
-{
-	CamelStore *store;
-	CamelFolder *inbox_folder;
-	CamelFolder *root_mh_folder;
-	GList *mh_subfolders_name;
-	CamelMimeMessage *message_1;
-	gboolean inbox_exists;
-
-	gtk_init (&argc, &argv);
-	camel_init ();
-
-	
-	store = gtk_type_new (CAMEL_MH_STORE_TYPE);
-	camel_store_init (store, (CamelSession *)NULL, g_strdup ("mh:///root/Mail"));
-	
-	root_mh_folder = camel_store_get_folder (store, "");
-	mh_subfolders_name = camel_folder_list_subfolders (root_mh_folder, NULL);
-	
-	printf ("\n------------- Listing root Mh folder subfolders --------\n");
-	while (mh_subfolders_name) {
-		printf ("\t\"%s\"\n", (gchar *)mh_subfolders_name->data);
-		mh_subfolders_name = mh_subfolders_name->next;
-	}
-	printf ("--------------------------------------------------------\n\n");
-
-	inbox_folder = camel_store_get_folder (store, "inbox");
-	if (!inbox_folder) {
-		printf ("** Error: could not get inbox folder from store\n");
-		return 1;
-	}
-	
-	/* test existence */
-	inbox_exists = camel_folder_exists (inbox_folder, NULL);
-	if (inbox_exists)
-		printf ("MH folder inbox exists, continuing tests\n");
-	else {
-		printf ("MH folder inbox does not exist. Stopping \n");
-		return 1;
-	}
-	
-	printf ("\n  Inbox folder contains %d messages\n", camel_folder_get_message_count (inbox_folder, NULL));
-	printf ("\n------------- Gettting message numer 3 in inbox --------\n");
-	message_1 = camel_folder_get_message (inbox_folder, 3, NULL);
-	printf ("--------------------------------------------------------\n\n");
-
-
-	return 1;
-
-	
-}
diff --git a/tests/test5.c b/tests/test5.c
deleted file mode 100644
index 81c5e2256a..0000000000
--- a/tests/test5.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* test for the RFC 2047 decoder */
-
-#include <string.h>
-#include <unicode.h>
-
-#include "gmime-utils.h"
-#include "stdio.h"
-#include "camel-mime-message.h"
-#include "camel-mime-part.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel.h"
-#include "gmime-rfc2047.h"
-
-#define TERMINAL_CHARSET "UTF-8"
-
-/* 
- * Info on many unicode issues, including, utf-8 xterms from :
- * 
- *   http://www.cl.cam.ac.uk/~mgk/unicode.html
- *
- */
-
-const char *tests[] = 
-{ 
-/* these strings come from RFC 2047. Ought to add a few torture cases here. */
-  "=?US-ASCII?Q?Keith_Moore?= <moore@cs.utk.edu>",
-  "=?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= <keld@dkuug.dk>",
-  "=?ISO-8859-1?Q?Andr=E9?= Pirard <PIRARD@vm1.ulg.ac.be>",
-  "=?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?= =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=",
-  "=?ISO-8859-1?Q?Olle_J=E4rnefors?= <ojarnef@admin.kth.se>",
-  "=?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <paf@nada.kth.se>",
-  "Nathaniel Borenstein <nsb@thumper.bellcore.com> (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)",
-  "",
-  "(=?ISO-8859-1?Q?a?=)",     /* should be displayed as           (a)   */
-  "(=?ISO-8859-1?Q?a?= b)",                                  /*   (a b) */
-  "(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)",                 /*   (ab)  */
-  "(=?ISO-8859-1?Q?a?=  =?ISO-8859-1?Q?b?=)",                /*   (ab)  */
-  "(=?ISO-8859-1?Q?a?= \n=?ISO-8859-1?Q?b?=)",               /*   (ab)  */
-  "(=?ISO-8859-1?Q?a_b?=)",                                  /*   (a b) */
-  "(=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)",                /*   (ab)  */
-  NULL
-};
-  
-
-int
-main (int argc, char**argv)
-{      
-	const char **b = tests;
-	while (*b) {
-		printf("%s\n", gmime_rfc2047_decode(*b, TERMINAL_CHARSET));
-		b++;
-	}
-
-	return 0;
-
-}
diff --git a/tests/test6.c b/tests/test6.c
deleted file mode 100644
index c2883d89c0..0000000000
--- a/tests/test6.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* test for the RFC 2047 encoder */
-
-#include <string.h>
-#include <unicode.h>
-
-#include "gmime-utils.h"
-#include "stdio.h"
-#include "camel-mime-message.h"
-#include "camel-mime-part.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel.h"
-#include "gmime-rfc2047.h"
-
-#define TERMINAL_CHARSET "UTF-8"
-
-/* 
- * Info on many unicode issues, including, utf-8 xterms from :
- * 
- *   http://www.cl.cam.ac.uk/~mgk25/unicode.html
- *
- */
-
-const char *tests[] = 
-{ 
-  "Ðis is a test", "ISO-8859-1",
-  "Iñtérñàtiönælîçation", "ISO-8859-1",
-  "Καλημέ�α κόσμε", "UTF-8",
-  "コンニ��", "UTF-8",
-  "ði ıntəˈnæʃənəl fəˈnɛtık əsoʊsiˈeıʃn", "UTF-8",
-  NULL
-};
-  
-
-int
-main (int argc, char**argv)
-{      
-	const char **b = tests;
-	while (*b) {
-		char *e = gmime_rfc2047_encode(b[0], b[1]);
-		printf("%s\t%s\n", e, gmime_rfc2047_decode(e, TERMINAL_CHARSET));
-		b+=2;
-	}
-
-	return 0;
-
-}
diff --git a/tests/test8.c b/tests/test8.c
deleted file mode 100644
index aa7debdba9..0000000000
--- a/tests/test8.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* test posix thread folder proxy */
-
-
-#include "camel.h"
-
-CamelThreadProxy *proxy;
-CamelFuncDef *func_def;
-
-
-void 
-test_sync_func (int num)
-{
-	printf ("Sync function number %d\n", num);
-	printf ("Sync function : current thread : %d\n", pthread_self ());
-  
-}
-
-
-void 
-test_async_cb (int num)
-{
-	printf ("Callback number %d\n", num);	
-	printf ("Callback : current thread : %d\n", pthread_self ());
-}
-
-void 
-test_async_func (int num)
-{
-  CamelOp *cb;
-
-  printf ("Async function number %d\n", num);
-  printf ("Async function : current thread : %d\n", pthread_self ());
-  sleep (1);	
-  cb = camel_marshal_create_op (func_def, test_async_cb, num);
-  camel_thread_proxy_push_cb (proxy, cb);
-  
-	
-}
-
-int 
-main (int argc, char **argv)
-{
-	int i;
-	CamelOp *op;
-
-	camel_init ();
-
-	func_def = 
-	  camel_func_def_new (camel_marshal_NONE__INT, 
-			      1, 
-			      GTK_TYPE_INT);
-
-	printf ("--== Testing Simple marshalling system ==--\n");
-	for (i=0; i<5; i++) {
-	  printf ("Iterration number %d\n", i);
-	  op = camel_marshal_create_op (func_def, test_sync_func, i);
-	  camel_op_run (op);
-	  camel_op_free (op);
-
-	}	       	
-	printf ("\n\n");
-
-	proxy = camel_thread_proxy_new ();
-
-	printf ("--== Testing Asynchronous Operation System ==--\n");
-	for (i=0; i<5; i++) {
-	  printf ("Pushing async operation number %d for execution\n", i);
-	  op = camel_marshal_create_op (func_def, test_async_func, i);
-	  camel_thread_proxy_push_op (proxy, op);
-	}	       	
-	printf ("\n\n");
-	printf ("--== Operations execution planned ==--\n");
-	gtk_main ();
-} 
-
diff --git a/tests/test9.c b/tests/test9.c
deleted file mode 100644
index 7fbbee8b8a..0000000000
--- a/tests/test9.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include "camel.h"
-#include "camel-mbox-folder.h"
-#include "camel-mbox-parser.h"
-#include "camel-mbox-utils.h"
-#include "camel-mbox-summary.h"
-#include "camel-exception.h"
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h> 
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-int
-main (int argc, char**argv)
-{
-	GArray *message_info_array;
-	gint test_file_fd;
-	CamelException *ex;
-	CamelMboxSummary *sum1, *sum2;
-	GArray *mbox_summary_info;
-	CamelMboxSummaryInformation *msg_info;
-	int i;
-	guint32 next_uid;
-	guint32 mbox_file_size;
-
-	gtk_init (&argc, &argv);
-	camel_init ();	
-	
-	ex = camel_exception_new ();
-	test_file_fd = open (argv[1], O_RDONLY);
-	message_info_array = camel_mbox_parse_file (test_file_fd, 
-						    "From ", 
-						    0,
-						    &mbox_file_size,
-						    &next_uid,
-						    TRUE,
-						    NULL,
-						    0,
-						    ex); 
-	
-	close (test_file_fd);
-#warning This test is no longer valid.
-#if 0
-	/* needs a folder to work with (indexing) */
-	camel_mbox_write_xev (argv[1], message_info_array, &mbox_file_size, 1, ex);
-#endif
-	if (camel_exception_get_id (ex)) { 
-		printf ("Exception caught in camel_mbox_write_xev : %s\n", camel_exception_get_description (ex));
-	}
-	
-	
-	mbox_summary_info =
-		parsed_information_to_mbox_summary (message_info_array);
-	sum1 = CAMEL_MBOX_SUMMARY (gtk_object_new (camel_mbox_summary_get_type (), NULL));
-
-	sum1->nb_message = mbox_summary_info->len;
-
-	sum1->message_info = mbox_summary_info;
-
-	camel_mbox_summary_save (sum1, "ev-summary.mbox", ex);
-
-	sum2 = camel_mbox_summary_load ("ev-summary.mbox", ex);
-
-	for (i=0; i<sum1->nb_message; i++) {
-		
-		msg_info = (CamelMboxSummaryInformation *)(sum1->message_info->data) + i;
-		printf ("Message %d :\n"
-			"  From : %s\n", i, msg_info->headers.sender);
-	}
-
-	return 1;
-	
-}
-
-
-
diff --git a/tests/ui-tests/.cvsignore b/tests/ui-tests/.cvsignore
deleted file mode 100644
index 84c2937bdc..0000000000
--- a/tests/ui-tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-store_listing
-msg-composer-test
-message-browser
-filter
\ No newline at end of file
diff --git a/tests/ui-tests/Makefile.am b/tests/ui-tests/Makefile.am
deleted file mode 100644
index e61a054093..0000000000
--- a/tests/ui-tests/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# process this file with automake to create Makefile.in
-
-INCLUDES =					\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/camel			\
-	-I$(includedir)				\
-	-I$(top_srcdir)/camel/providers/MH	\
-	-I$(top_srcdir)/widgets			\
-	-I$(top_srcdir)/filter			\
-	$(EXTRA_GNOME_CFLAGS) $(BONOBO_GNOME_CFLAGS) \
-	-DG_LOG_DOMAIN=\"evolution-ui-tests\"
-
-LDADD =							\
-	$(top_builddir)/widgets/libevolutionwidgets.la	\
-	$(top_builddir)/camel/libcamel.la		\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)				\
-	$(PTHREAD_LIB)
-
-message_browser_LDADD = \
-	$(top_builddir)/camel/libcamel.la		\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)				\
-	$(PTHREAD_LIB) 					\
-	$(EXTRA_GNOME_LIBS) \
-	-lgtkhtml -lgnomeprint ../../mail/html-stream.o $(BONOBO_GNOME_LIBS)
-
-filter_LDADD = \
-	$(top_builddir)/camel/libcamel.la		\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)				\
-	$(PTHREAD_LIB) 					\
-	$(EXTRA_GNOME_LIBS) 				\
-	$(top_builddir)/filter/libfilter.la		\
-	-lgtkhtml -lgnomeprint
-
-noinst_PROGRAMS =  	\
-	message-browser	\
-	filter
diff --git a/tests/ui-tests/filter.c b/tests/ui-tests/filter.c
deleted file mode 100644
index 3ff6a1b1ae..0000000000
--- a/tests/ui-tests/filter.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#include <gnome.h>
-#include "filter-editor.h"
-
-int main(int argc, char **argv)
-{
-	GList *rules, *options, *options2;
-	xmlDocPtr doc, out, optionset, filteroptions;
-	GString *s;
-	GtkWidget *w;
-
-	gnome_init("Test", "0.0", argc, argv);
-	gdk_rgb_init ();
-	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-
-	w = filter_editor_new();
-
-	doc = xmlParseFile("filterdescription.xml");
-	rules = filter_load_ruleset(doc);
-	options = filter_load_optionset(doc, rules);
-	options2 = options;
-	out = xmlParseFile("saveoptions.xml");
-	options = filter_load_optionset(out, rules);
-	
-	filter_editor_set_rules(w, rules, options2, options);
-
-	gtk_widget_show(w);
-	gtk_main();
-}
diff --git a/tests/ui-tests/filterdescription.xml b/tests/ui-tests/filterdescription.xml
deleted file mode 100644
index 07c392aa70..0000000000
--- a/tests/ui-tests/filterdescription.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<ruleset type="match">
-<rule name="from-address">
-  <code>
-   (match-all (header-contains "From" ${sender}))
-  </code>
-  <description lang="en">The From address matches <source type="address" name="sender">sender(s)</source>.</description>
-</rule>
-
-<rule name="to-address">
-  <code>
-   (match-all (header-contains "To" ${receipient}))
-  </code>
-  <description lang="en">The To address matches <source type="address" name="receipient">receipients</source>.</description>
-</rule>
-
-<rule name="cc-address">
-  <code>
-    (match-all (header-contains "CC" ${self-email}))
-  </code>
-  <description lang="en">I am in the cc list.</description>
-</rule>
-
-<rule name="msg-size">
-  <code>
-   (&amp; (&gt; message-size (size-lower size-range))
-      (&lt; message-size (size-uppwer size-range)))
-  </code>
-  <description lang="en">The message is a <source type="size-range" name="size">certain size</source>.</description>
-</rule>
-</ruleset>
-
-<ruleset type="action">
-<rule name="copy-me">
-  <code>
-    (copy-to ${folder})
-  </code>
-  <description language="en">Send a copy to <source type="folder" name="folder">folder</source>.</description>
-</rule>
-<rule name="forward">
-  <code>
-    (forward-to ${address})
-  </code>
-  <description language="en">Forward the message to <source type="address" name="address">people</source>.</description>
-</rule>
-<rule name="delete">
-  <code>
-    (delete)
-  </code>
-  <description language="en">Delete message.</description>
-</rule>
-<rule name="stop">
-  <code>
-    (stop)
-  </code>
-  <description language="en">Stop processing further rules for this message.</description>
-</rule>
-</ruleset>
-
-<ruleset type="except">
-<rule name="except-me">
-  <code>
-    (match-all (not (header-contains "To" "zucchi@zedzone")))
-  </code>
-  <description language="en">When I am the receipient.</description>
-</rule>
-</ruleset>
-
-<optionset>
-  <option type="receive">
-    <description language="en">When a message arrives.</description>
-  </option>
-  <option type="send">
-    <description language="en">When a message is sent.</description>
-  </option>
-  <option type="receive">
-    <description language="en">Copy incoming messages from a certain address to specific folder.</description>
-    <optionrule type="match" rule="from-address"/>
-    <optionrule type="action" rule="copy-me"/>
-  </option>
-  <option type="send">
-    <description language="en">Copy sent messages to a specific folder.</description>
-    <optionrule type="action" rule="copy-me"/>
-  </option>
-  <option type="send">
-    <description language="en">Copy messages to me and others to a specific folder.</description>
-    <optionrule type="match" rule="from-address">
-      <optionvalue name="sender">
-        <address name="zucchi" email="zucchi@zedzone"/>
-        <address name="foo" email="bar"/>
-      </optionvalue>
-    </optionrule>
-    <optionrule type="match" rule="to-address"/>
-    <optionrule type="match" rule="cc-address"/>
-    <optionrule type="action" rule="copy-me"/>
-  </option>
-</optionset>
-</filterdescription>
diff --git a/tests/ui-tests/mail-atchmt-image.msg b/tests/ui-tests/mail-atchmt-image.msg
deleted file mode 100644
index e828e722b9..0000000000
--- a/tests/ui-tests/mail-atchmt-image.msg
+++ /dev/null
@@ -1,67 +0,0 @@
-X-Mailer: exmh version 2.0.3
-X-Exmh-Isig-CompType: unknown
-X-Exmh-Isig-Folder: inbox
-To:guiheneu
-cc:
-Subject:image
-Mime-Version: 1.0
-Content-Type: multipart/mixed ;
-	boundary="==_Exmh_20679612960"
---------
-This is a multipart MIME message.
-
---==_Exmh_20679612960
-Content-Type: text/plain
-
-voici une image, c'est super. 
-
-
---==_Exmh_20679612960
-Content-Type: image/png ; name="gnome-fontsel.png"
-Content-Description: gnome-fontsel.png
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="gnome-fontsel.png"
-
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAB85J
-REFUeJztmFlslNcVx3+zexnP2MYrXjEBHGICCChgQVu5icCkzUuxm7QSKKKtWgUiRd3eKvHS
-8hIqtUVtWqlVpFBVNlLVB1dJSkHEyGwJFC9g43U8Y3sWz74v39w+eKYMxp7xzLhqHvyTrj7N
-t/zvOffce+49AxtssMEGX2TeA8Qa2qEsNLvWqCkS/a8Lqwn2JO5nQz1LTgyk6A4k7nUte9aV
-u8lPSR2x5YI9ic5yIXWk311BV7DkbFqUa+goVeTWsmcX1/B9Jk0A07Lft1a5nxPJ0ZhdZkBP
-roLt7e3vd3R0iM7OzmQEkhxK6GazpjIym+gk1eD3eNahrKjYu1e8ceqbQrelRZw4cSLVgWTS
-WDNrmUINiWtyLSTpzaajJHW7d4muo7vYX1/IxJgOk8nEMl1jNnryDM9TF203IEs0eH49rIkj
-TSW88eqXqCorxmReRK/XJ7W7E6/czkZvLRFIsnxksl5gbS3V4uvtuzCODjI6MYvZYMJsMHXz
-bDSzGhhZhuc9PI1CpndX5S8DPS0f/uK3k987vp+dLdVcv/k5fZ/N4I9puXbtWs66kDkCyXSX
-1bxczu/P/3ryJ91fY3t1AcOPp3B6A0yafDx6dDcvXcjswOHENat5mcrp06dFS5XE1oYq5o2z
-zM5Z+GTIisFshnXI8+kWceoOm8zPWXHlyhURDAb56t6dRINexqenWXCF+PyxAb/DAUsDlNeR
-Id38W0k0q9R59JV28bM3X2FHYyXG2Rlu3B7k/B//2b3Cq7fIMRrpplBOeT5Jd3e3aK0I0Vyt
-x+t2MmG08NHAWN66y8m0D+TE5cuXRSQc5BuvHkWtVjD6ZIY7j+cYM9j44IMPxLlz57I9wa5K
-XilsOadOnRIAs3NjnP/Bt6ivKGb00RBDj6cYcsm4/GEfHR0d3L9/HyEER44coa+vb602yFjh
-mLFuETje1Snad6gJBoO8dbKDhtpNLC4YsDvdjFkDlOqbAZgaG2TLZj1VZQX037i+VvlVncxm
-J16Vs2fPirZKHy+0NBEITtK+rZa4z4bb62fcYOOTgWEO7C+lsaac+i2tbKuSEwn5uDE4h8cX
-WEsXq065dBFIHqMztS5sD3lxx3bs7jjbG6tRqvUMj81QpCng3ogBNYJqpYOfvnWcN7/chNfl
-wmRxYzJZspk+K76bLgJGltLbYVZOc4dYOqn2Hjt2DLWulpKIjd0vvYzf4yIejxEKh3jn+93E
-/G4Gp+zMWpzYHYvMWL3Y/LE12g6kiUA6B37EUql3GPgVz6e/WcD4neN7hb5Egz8QYuvmEiQR
-Z3Z6FLlMRk1TI8UFxciVWxiZ6GPkyThTFg9CpWVbTQHl9YfFg/5beSWSTIs4eZRIGv8uT3fk
-hpMnT1rb2l6idus+lFEX8ogXtUZHsUbBpjIdWv1mXE43i/NTtDaU4/aGeXHXHk6/doCjB3by
-Qk3GkjdvB7pSrl0JB5LlXndzc/O+lsbNhIIemhvqKGnYS1zE0GmLqKmuRlNaj8lkJByFHa07
-+M3Pv8u+5gqMhjluPRij/95dzpw5k9eekM6B1OHpSbQGnh7setVqNXJVIXHPPAX6ShSFJRDx
-o1Yp0dZswzI9TFGRmrrGFpQigpAi1OoEAyMz3B2aQaeCqzc/zcf+tA4kp89Flqql5D8Q/y04
-4ov3KC5UUUAQTUkVYacRKRJEW9dGcNFAkXBRXVGBXF3MgjPI4PgCtqgGhVZHc20ZVaWFiLA/
-LwfSLeLkVOlladSNLEXgFsClS5dE2NzP9ubNaEsrEZJEPBpEo6sh6DQhRXyoikopKWvEMH6f
-RZuN3W2tKOIBytUSM4Y5AqoijP/6d14OpItAspi/nXLtTv7u//gPvNbxFQqLtSiLSgl7rcgV
-KqIBB1GvFWVxORpdDb75IbQqqCzTEo94uDk0g9PpQiAYMwcwTBj+ZxVZF2nq02gsjjzoRrmp
-iVjYRzToRAr5iEoRlAUlqMsbcE3fByFYsNiJxCQcLj8W0xxub5BFSck//n4177PYSg6k1sHJ
-ggOWImIC+Ovvvi1KVDoABAIhxQh7rCBFKdjUTCQSwWd4gNXmoLRMz5zVSRwZHq8Po9kJRVom
-App8bQdW3p5Xq7yeKUR6L/5QHDx4CFWhnrDXStBjw+wI0lBThtE0T5ley4PBJ3ijcZxuH2qV
-kofDM4zMLDA0aV23U/BKEVipYlrOn/e0NvkVGm1xNOgm6ncElApFUX2lloDfh93h4d7QJFa7
-B622SJIkKfLoiVH69OFUxGz3LQLvsBRNH/AZ4FhPBzKxtaGm3K7WVhTHIwHC7oUQoAGIxmLM
-LdiYNC4gSVCi1UTtTm+0//44NpfPa7H7LgiBGbCzlNUmgHiuxufqwJ6uYwd8MoWSiN8BUADg
-9vqx2JxMm2zEhcz+0cBILByVlEq5LCCXy3rdvtCP4wIZoAfc+RqejwP17Xu2KqRIEJlcATAH
-1IXDEYzzNmRC4vHkPIYFx0goGvtldZn2+uCEWUp8KwDnehieJBcHJkLhWEQK+5Er1QB1AHan
-B7lcNmuyeCITpsWzBrPrYwCL3beO5j5PLiVl38GXW/4khDQMxIBYIBhCo1b5rXb30NU7ozdf
-P7rz2jrbuSp5pTMhhE4mk3kuvN35ulwmW5ics0vv/+3OQ0DK+PEXiQtvdyr+3zZssEGO/Afd
-sGNaGjYibwAAAABJRU5ErkJggg==
-
---==_Exmh_20679612960--
-
-
diff --git a/tests/ui-tests/mail-atchmt-postscript.msg b/tests/ui-tests/mail-atchmt-postscript.msg
deleted file mode 100644
index 9787567865..0000000000
--- a/tests/ui-tests/mail-atchmt-postscript.msg
+++ /dev/null
@@ -1,8069 +0,0 @@
-X-Mailer: exmh version 2.0.3
-X-Exmh-Isig-CompType: unknown
-X-Exmh-Isig-Folder: drafts
-To:
-cc:
-Subject:
-Mime-Version: 1.0
-Content-Type: multipart/mixed ;
-	boundary="==_Exmh_-1506175120"
---------
-This is a multipart MIME message.
-
---==_Exmh_-1506175120
-Content-Type: text/plain
-
-
-
---==_Exmh_-1506175120
-Content-Type: application/postscript ; name="popt.ps"
-Content-Description: popt.ps
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="popt.ps"
-
-JSFQUy1BZG9iZS0yLjAKJSVDcmVhdG9yOiBkdmlwc2sgNS41OGYgQ29weXJpZ2h0IDE5ODYs
-IDE5OTQgUmFkaWNhbCBFeWUgU29mdHdhcmUKJSVUaXRsZTogYm9vay5kdmkKJSVQYWdlczog
-MTEKJSVQYWdlT3JkZXI6IEFzY2VuZAolJUJvdW5kaW5nQm94OiAwIDAgNTY3IDcwMgolJURv
-Y3VtZW50Rm9udHM6IFphcGZEaW5nYmF0cyBQYWxhdGluby1Cb2xkIFBhbGF0aW5vLVJvbWFu
-CiUlKyBTdG9uZVNhbnMtQm9sZCBTdG9uZVNhbnMgUGFsYXRpbm8tSXRhbGljIFBQQ29kZQol
-JSsgU3RvbmVTYW5zLVNlbWlib2xkSXRhbGljIFN0b25lU2Fucy1TZW1pYm9sZCBQUENvZGVC
-b2xkCiUlRG9jdW1lbnRQYXBlclNpemVzOiBMZXR0ZXIKJSVFbmRDb21tZW50cwolRFZJUFND
-b21tYW5kTGluZTogZHZpcHMgLWsgLW8gInwuL2ZpeGFwcGVuZGl4IGJvb2sucHMiIGJvb2su
-ZHZpCiVEVklQU1BhcmFtZXRlcnM6IGRwaT02MDAsIGNvbW1lbnRzIHJlbW92ZWQKJURWSVBT
-U291cmNlOiAgVGVYIG91dHB1dCAxOTk4LjAzLjIzOjE1MjMKJSVCZWdpblByb2NTZXQ6IHRl
-eC5wcm8KL1RlWERpY3QgMjUwIGRpY3QgZGVmIFRlWERpY3QgYmVnaW4gL057ZGVmfWRlZiAv
-QntiaW5kIGRlZn1OIC9Te2V4Y2h9TgovWHtTIE59QiAvVFJ7dHJhbnNsYXRlfU4gL2lzbHMg
-ZmFsc2UgTiAvdnNpemUgMTEgNzIgbXVsIE4gL2hzaXplIDguNSA3MgptdWwgTiAvbGFuZHBs
-dXM5MHtmYWxzZX1kZWYgL0ByaWdpbntpc2xze1swIGxhbmRwbHVzOTB7MSAtMX17LTEgMX0K
-aWZlbHNlIDAgMCAwXWNvbmNhdH1pZiA3MiBSZXNvbHV0aW9uIGRpdiA3MiBWUmVzb2x1dGlv
-biBkaXYgbmVnIHNjYWxlCmlzbHN7bGFuZHBsdXM5MHtWUmVzb2x1dGlvbiA3MiBkaXYgdnNp
-emUgbXVsIDAgZXhjaH17UmVzb2x1dGlvbiAtNzIgZGl2CmhzaXplIG11bCAwfWlmZWxzZSBU
-Un1pZiBSZXNvbHV0aW9uIFZSZXNvbHV0aW9uIHZzaXplIC03MiBkaXYgMSBhZGQgbXVsClRS
-W21hdHJpeCBjdXJyZW50bWF0cml4e2R1cCBkdXAgcm91bmQgc3ViIGFicyAwLjAwMDAxIGx0
-e3JvdW5kfWlmfQpmb3JhbGwgcm91bmQgZXhjaCByb3VuZCBleGNoXXNldG1hdHJpeH1OIC9A
-bGFuZHNjYXBley9pc2xzIHRydWUgTn1CCi9AbWFudWFsZmVlZHtzdGF0dXNkaWN0IC9tYW51
-YWxmZWVkIHRydWUgcHV0fUIgL0Bjb3BpZXN7LyNjb3BpZXMgWH1CCi9GTWF0WzEgMCAwIC0x
-IDAgMF1OIC9GQkJbMCAwIDAgMF1OIC9ubiAwIE4gL0lFIDAgTiAvY3RyIDAgTiAvZGYtdGFp
-bHsKL25uIDggZGljdCBOIG5uIGJlZ2luIC9Gb250VHlwZSAzIE4gL0ZvbnRNYXRyaXggZm50
-cnggTiAvRm9udEJCb3ggRkJCIE4Kc3RyaW5nIC9iYXNlIFggYXJyYXkgL0JpdE1hcHMgWCAv
-QnVpbGRDaGFye0NoYXJCdWlsZGVyfU4gL0VuY29kaW5nIElFIE4KZW5kIGR1cHsvZm9vIHNl
-dGZvbnR9MiBhcnJheSBjb3B5IGN2eCBOIGxvYWQgMCBubiBwdXQgL2N0ciAwIE5bfUIgL2Rm
-ewovc2YgMSBOIC9mbnRyeCBGTWF0IE4gZGYtdGFpbH1CIC9kZnN7ZGl2IC9zZiBYIC9mbnRy
-eFtzZiAwIDAgc2YgbmVnIDAgMF0KTiBkZi10YWlsfUIgL0V7cG9wIG5uIGR1cCBkZWZpbmVm
-b250IHNldGZvbnR9QiAvY2gtd2lkdGh7Y2gtZGF0YSBkdXAKbGVuZ3RoIDUgc3ViIGdldH1C
-IC9jaC1oZWlnaHR7Y2gtZGF0YSBkdXAgbGVuZ3RoIDQgc3ViIGdldH1CIC9jaC14b2Zmewox
-MjggY2gtZGF0YSBkdXAgbGVuZ3RoIDMgc3ViIGdldCBzdWJ9QiAvY2gteW9mZntjaC1kYXRh
-IGR1cCBsZW5ndGggMiBzdWIKZ2V0IDEyNyBzdWJ9QiAvY2gtZHh7Y2gtZGF0YSBkdXAgbGVu
-Z3RoIDEgc3ViIGdldH1CIC9jaC1pbWFnZXtjaC1kYXRhCmR1cCB0eXBlIC9zdHJpbmd0eXBl
-IG5le2N0ciBnZXQgL2N0ciBjdHIgMSBhZGQgTn1pZn1CIC9pZCAwIE4gL3J3IDAgTgovcmMg
-MCBOIC9ncCAwIE4gL2NwIDAgTiAvRyAwIE4gL3NmIDAgTiAvQ2hhckJ1aWxkZXJ7c2F2ZSAz
-IDEgcm9sbCBTIGR1cAovYmFzZSBnZXQgMiBpbmRleCBnZXQgUyAvQml0TWFwcyBnZXQgUyBn
-ZXQgL2NoLWRhdGEgWCBwb3AgL2N0ciAwIE4gY2gtZHgKMCBjaC14b2ZmIGNoLXlvZmYgY2gt
-aGVpZ2h0IHN1YiBjaC14b2ZmIGNoLXdpZHRoIGFkZCBjaC15b2ZmCnNldGNhY2hlZGV2aWNl
-IGNoLXdpZHRoIGNoLWhlaWdodCB0cnVlWzEgMCAwIC0xIC0uMSBjaC14b2ZmIHN1YiBjaC15
-b2ZmCi4xIHN1Yl17Y2gtaW1hZ2V9aW1hZ2VtYXNrIHJlc3RvcmV9QiAvRHsvY2MgWCBkdXAg
-dHlwZSAvc3RyaW5ndHlwZSBuZXtdfQppZiBubiAvYmFzZSBnZXQgY2MgY3RyIHB1dCBubiAv
-Qml0TWFwcyBnZXQgUyBjdHIgUyBzZiAxIG5le2R1cCBkdXAKbGVuZ3RoIDEgc3ViIGR1cCAy
-IGluZGV4IFMgZ2V0IHNmIGRpdiBwdXR9aWYgcHV0IC9jdHIgY3RyIDEgYWRkIE59QiAvSXsK
-Y2MgMSBhZGQgRH1CIC9ib3B7dXNlcmRpY3QgL2JvcC1ob29rIGtub3due2JvcC1ob29rfWlm
-IC9TSSBzYXZlIE4gQHJpZ2luCjAgMCBtb3ZldG8gL1YgbWF0cml4IGN1cnJlbnRtYXRyaXgg
-ZHVwIDEgZ2V0IGR1cCBtdWwgZXhjaCAwIGdldCBkdXAgbXVsCmFkZCAuOTkgbHR7L1FWfXsv
-UlZ9aWZlbHNlIGxvYWQgZGVmIHBvcCBwb3B9TiAvZW9we1NJIHJlc3RvcmUgdXNlcmRpY3QK
-L2VvcC1ob29rIGtub3due2VvcC1ob29rfWlmIHNob3dwYWdlfU4gL0BzdGFydHt1c2VyZGlj
-dCAvc3RhcnQtaG9vawprbm93bntzdGFydC1ob29rfWlmIHBvcCAvVlJlc29sdXRpb24gWCAv
-UmVzb2x1dGlvbiBYIDEwMDAgZGl2IC9EVkltYWcgWAovSUUgMjU2IGFycmF5IE4gMCAxIDI1
-NXtJRSBTIDEgc3RyaW5nIGR1cCAwIDMgaW5kZXggcHV0IGN2biBwdXR9Zm9yCjY1NzgxLjc2
-IGRpdiAvdnNpemUgWCA2NTc4MS43NiBkaXYgL2hzaXplIFh9TiAvcHtzaG93fU4gL1JNYXRb
-MSAwIDAgLTEgMAowXU4gL0JEb3QgMjYwIHN0cmluZyBOIC9ydWxleCAwIE4gL3J1bGV5IDAg
-TiAvdnsvcnVsZXkgWCAvcnVsZXggWCBWfUIgL1YKe31CIC9SViBzdGF0dXNkaWN0IGJlZ2lu
-IC9wcm9kdWN0IHdoZXJle3BvcCBwcm9kdWN0IGR1cCBsZW5ndGggNyBnZXswIDcKZ2V0aW50
-ZXJ2YWwgZHVwKERpc3BsYXkpZXEgZXhjaCAwIDQgZ2V0aW50ZXJ2YWwoTmVYVCllcSBvcn17
-cG9wIGZhbHNlfQppZmVsc2V9e2ZhbHNlfWlmZWxzZSBlbmR7e2dzYXZlIFRSIC0uMSAuMSBU
-UiAxIDEgc2NhbGUgcnVsZXggcnVsZXkgZmFsc2UKUk1hdHtCRG90fWltYWdlbWFzayBncmVz
-dG9yZX19e3tnc2F2ZSBUUiAtLjEgLjEgVFIgcnVsZXggcnVsZXkgc2NhbGUgMSAxCmZhbHNl
-IFJNYXR7QkRvdH1pbWFnZW1hc2sgZ3Jlc3RvcmV9fWlmZWxzZSBCIC9RVntnc2F2ZSBuZXdw
-YXRoIHRyYW5zZm9ybQpyb3VuZCBleGNoIHJvdW5kIGV4Y2ggaXRyYW5zZm9ybSBtb3ZldG8g
-cnVsZXggMCBybGluZXRvIDAgcnVsZXkgbmVnCnJsaW5ldG8gcnVsZXggbmVnIDAgcmxpbmV0
-byBmaWxsIGdyZXN0b3JlfUIgL2F7bW92ZXRvfUIgL2RlbHRhIDAgTiAvdGFpbAp7ZHVwIC9k
-ZWx0YSBYIDAgcm1vdmV0b31CIC9Ne1MgcCBkZWx0YSBhZGQgdGFpbH1CIC9ie1MgcCB0YWls
-fUIgL2N7LTQgTX0KQiAvZHstMyBNfUIgL2V7LTIgTX1CIC9mey0xIE19QiAvZ3swIE19QiAv
-aHsxIE19QiAvaXsyIE19QiAvanszIE19QiAva3sKNCBNfUIgL3d7MCBybW92ZXRvfUIgL2x7
-cCAtNCB3fUIgL217cCAtMyB3fUIgL257cCAtMiB3fUIgL297cCAtMSB3fUIgL3F7CnAgMSB3
-fUIgL3J7cCAyIHd9QiAvc3twIDMgd31CIC90e3AgNCB3fUIgL3h7MCBTIHJtb3ZldG99QiAv
-eXszIDIgcm9sbCBwCmF9QiAvYm9zey9TUyBzYXZlIE59QiAvZW9ze1NTIHJlc3RvcmV9QiBl
-bmQKJSVFbmRQcm9jU2V0CiUlQmVnaW5Gb250OiBQYWxhdGluby1Cb2xkCiUgQEBwc2VuY29k
-aW5nZmlsZUB7CiUgICBhdXRob3IgPSAiUy4gUmFodHosIFAuIE1hY0theSwgQWxhbiBKZWZm
-cmV5LCBCLiBIb3JuLCBLLiBCZXJyeSIsCiUgICB2ZXJzaW9uID0gIjAuNiIsCiUgICBkYXRl
-ID0gIjIyIEp1bmUgMTk5NiIsCiUgICBmaWxlbmFtZSA9ICI4ci5lbmMiLAolICAgZW1haWwg
-PSAia2JAQG1haWwudHVnLm9yZyIsCiUgICBhZGRyZXNzID0gIjEzNSBDZW50ZXIgSGlsbCBS
-ZC4gLy8gUGx5bW91dGgsIE1BIDAyMzYwIiwKJSAgIGNvZGV0YWJsZSA9ICJJU08vQVNDSUki
-LAolICAgY2hlY2tzdW0gPSAiMTE5ICAgICA2NjIgICAgNDQyNCIsCiUgICBkb2NzdHJpbmcg
-PSAiRW5jb2RpbmcgZm9yIFRydWVUeXBlIG9yIFR5cGUgMSBmb250cyB0byBiZSB1c2VkIHdp
-dGggVGVYLiIKJSBAfQolIAolIElkZWEgaXMgdG8gaGF2ZSBhbGwgdGhlIGNoYXJhY3RlcnMg
-bm9ybWFsbHkgaW5jbHVkZWQgaW4gVHlwZSAxIGZvbnRzCiUgYXZhaWxhYmxlIGZvciB0eXBl
-c2V0dGluZy4gVGhpcyBpcyBlZmZlY3RpdmVseSB0aGUgY2hhcmFjdGVycyBpbiBBZG9iZQol
-IFN0YW5kYXJkIEVuY29kaW5nICsgSVNPIExhdGluIDEgKyBleHRyYSBjaGFyYWN0ZXJzIGZy
-b20gTHVjaWRhLgolIAolIENoYXJhY3RlciBjb2RlIGFzc2lnbm1lbnRzIHdlcmUgbWFkZSBh
-cyBmb2xsb3dzOgolIAolICgxKSB0aGUgV2luZG93cyBBTlNJIGNoYXJhY3RlcnMgYXJlIGFs
-bW9zdCBhbGwgaW4gdGhlaXIgV2luZG93cyBBTlNJCiUgcG9zaXRpb25zLCBiZWNhdXNlIHNv
-bWUgV2luZG93cyB1c2VycyBjYW5ub3QgZWFzaWx5IHJlZW5jb2RlIHRoZQolIGZvbnRzLCBh
-bmQgaXQgbWFrZXMgbm8gZGlmZmVyZW5jZSBvbiBvdGhlciBzeXN0ZW1zLiBUaGUgb25seSBX
-aW5kb3dzCiUgQU5TSSBjaGFyYWN0ZXJzIG5vdCBhdmFpbGFibGUgYXJlIHRob3NlIHRoYXQg
-bWFrZSBubyBzZW5zZSBmb3IKJSB0eXBlc2V0dGluZyAtLSBydWJvdXQgKDEyNyBkZWNpbWFs
-KSwgbm9icmVha3NwYWNlICgxNjApLCBzb2Z0aHlwaGVuCiUgKDE3MykuIHF1b3Rlc2luZ2xl
-IGFuZCBncmF2ZSBhcmUgbW92ZWQganVzdCBiZWNhdXNlIGl0J3Mgc3VjaCBhbgolIGlycml0
-YXRpb24gbm90IGhhdmluZyB0aGVtIGluIFRlWCBwb3NpdGlvbnMuCiUgCiUgKDIpIFJlbWFp
-bmluZyBjaGFyYWN0ZXJzIGFyZSBhc3NpZ25lZCBhcmJpdHJhcmlseSB0byB0aGUgbG93ZXIg
-cGFydAolIG9mIHRoZSByYW5nZSwgYXZvaWRpbmcgMCwgMTAgYW5kIDEzIGluIGNhc2Ugd2Ug
-bWVldCBkdW1iIHNvZnR3YXJlLgolIAolICgzKSBZJlkgTHVjaWRhIEJyaWdodCBpbmNsdWRl
-cyBzb21lIGV4dHJhIHRleHQgY2hhcmFjdGVyczsgaW4gdGhlCiUgaG9wZXMgdGhhdCBvdGhl
-ciBQb3N0U2NyaXB0IGZvbnRzLCBwZXJoYXBzIGNyZWF0ZWQgZm9yIHB1YmxpYwolIGNvbnN1
-bXB0aW9uLCB3aWxsIGluY2x1ZGUgdGhlbSwgdGhleSBhcmUgaW5jbHVkZWQgc3RhcnRpbmcg
-YXQgMHgxMi4KJSAKJSAoNCkgUmVtYWluaW5nIHBvc2l0aW9ucyBsZWZ0IHVuZGVmaW5lZCBh
-cmUgZm9yIHVzZSBpbiAoaG9wZWZ1bGx5KQolIHVwd2FyZC1jb21wYXRpYmxlIHJldmlzaW9u
-cywgaWYgc29tZWRheSBtb3JlIGNoYXJhY3RlcnMgYXJlIGdlbmVyYWxseQolIGF2YWlsYWJs
-ZS4KJSAKJSAoNSkgaHlwaGVuIGFwcGVhcnMgdHdpY2UgZm9yIGNvbXBhdGliaWxpdHkgd2l0
-aCBib3RoIEFTQ0lJIGFuZCBXaW5kb3dzLgolIAovVGVYQmFzZTFFbmNvZGluZyBbCiUgMHgw
-MCAoZW5jb2RlZCBjaGFyYWN0ZXJzIGZyb20gQWRvYmUgU3RhbmRhcmQgbm90IGluIFdpbmRv
-d3MgMy4xKQogIC8ubm90ZGVmIC9kb3RhY2NlbnQgL2ZpIC9mbAogIC9mcmFjdGlvbiAvaHVu
-Z2FydW1sYXV0IC9Mc2xhc2ggL2xzbGFzaAogIC9vZ29uZWsgL3JpbmcgLy5ub3RkZWYKICAv
-YnJldmUgL21pbnVzIC8ubm90ZGVmIAolIFRoZXNlIGFyZSB0aGUgb25seSB0d28gcmVtYWlu
-aW5nIHVuZW5jb2RlZCBjaGFyYWN0ZXJzLCBzbyBtYXkgYXMKJSB3ZWxsIGluY2x1ZGUgdGhl
-bS4KICAvWmNhcm9uIC96Y2Fyb24gCiUgMHgxMAogL2Nhcm9uIC9kb3RsZXNzaSAKJSAodW51
-c3VhbCBUZVggY2hhcmFjdGVycyBhdmFpbGFibGUgaW4sIGUuZy4sIEx1Y2lkYSBCcmlnaHQp
-CiAvZG90bGVzc2ogL2ZmIC9mZmkgL2ZmbCAKIC8ubm90ZGVmIC8ubm90ZGVmIC8ubm90ZGVm
-IC8ubm90ZGVmCiAvLm5vdGRlZiAvLm5vdGRlZiAvLm5vdGRlZiAvLm5vdGRlZgogJSB2ZXJ5
-IGNvbnRlbnRpb3VzOyBpdCdzIHNvIHBhaW5mdWwgbm90IGhhdmluZyBxdW90ZWxlZnQgYW5k
-IHF1b3RlcmlnaHQKICUgYXQgOTYgYW5kIDE0NSB0aGF0IHdlIG1vdmUgdGhlIHRoaW5ncyBu
-b3JtYWxseSBmb3VuZCB0aGVyZSBkb3duIHRvIGhlcmUuCiAvZ3JhdmUgL3F1b3Rlc2luZ2xl
-IAolIDB4MjAgKEFTQ0lJIGJlZ2lucykKIC9zcGFjZSAvZXhjbGFtIC9xdW90ZWRibCAvbnVt
-YmVyc2lnbgogL2RvbGxhciAvcGVyY2VudCAvYW1wZXJzYW5kIC9xdW90ZXJpZ2h0CiAvcGFy
-ZW5sZWZ0IC9wYXJlbnJpZ2h0IC9hc3RlcmlzayAvcGx1cyAvY29tbWEgL2h5cGhlbiAvcGVy
-aW9kIC9zbGFzaAolIDB4MzAKIC96ZXJvIC9vbmUgL3R3byAvdGhyZWUgL2ZvdXIgL2ZpdmUg
-L3NpeCAvc2V2ZW4KIC9laWdodCAvbmluZSAvY29sb24gL3NlbWljb2xvbiAvbGVzcyAvZXF1
-YWwgL2dyZWF0ZXIgL3F1ZXN0aW9uCiUgMHg0MAogL2F0IC9BIC9CIC9DIC9EIC9FIC9GIC9H
-IC9IIC9JIC9KIC9LIC9MIC9NIC9OIC9PCiUgMHg1MAogL1AgL1EgL1IgL1MgL1QgL1UgL1Yg
-L1cKIC9YIC9ZIC9aIC9icmFja2V0bGVmdCAvYmFja3NsYXNoIC9icmFja2V0cmlnaHQgL2Fz
-Y2lpY2lyY3VtIC91bmRlcnNjb3JlCiUgMHg2MAogL3F1b3RlbGVmdCAvYSAvYiAvYyAvZCAv
-ZSAvZiAvZyAvaCAvaSAvaiAvayAvbCAvbSAvbiAvbwolIDB4NzAKIC9wIC9xIC9yIC9zIC90
-IC91IC92IC93CiAveCAveSAveiAvYnJhY2VsZWZ0IC9iYXIgL2JyYWNlcmlnaHQgL2FzY2lp
-dGlsZGUKIC8ubm90ZGVmICUgcnVib3V0OyBBU0NJSSBlbmRzCiUgMHg4MAogLy5ub3RkZWYg
-Ly5ub3RkZWYgL3F1b3Rlc2luZ2xiYXNlIC9mbG9yaW4KIC9xdW90ZWRibGJhc2UgL2VsbGlw
-c2lzIC9kYWdnZXIgL2RhZ2dlcmRibAogL2NpcmN1bWZsZXggL3BlcnRob3VzYW5kIC9TY2Fy
-b24gL2d1aWxzaW5nbGxlZnQKIC9PRSAvLm5vdGRlZiAvLm5vdGRlZiAvLm5vdGRlZgolIDB4
-OTAKIC8ubm90ZGVmIC8ubm90ZGVmIC8ubm90ZGVmIC9xdW90ZWRibGxlZnQKIC9xdW90ZWRi
-bHJpZ2h0IC9idWxsZXQgL2VuZGFzaCAvZW1kYXNoCiAvdGlsZGUgL3RyYWRlbWFyayAvc2Nh
-cm9uIC9ndWlsc2luZ2xyaWdodAogL29lIC8ubm90ZGVmIC8ubm90ZGVmIC9ZZGllcmVzaXMK
-JSAweEEwCiAvLm5vdGRlZiAlIG5vYnJlYWtzcGFjZQogL2V4Y2xhbWRvd24gL2NlbnQgL3N0
-ZXJsaW5nCiAvY3VycmVuY3kgL3llbiAvYnJva2VuYmFyIC9zZWN0aW9uCiAvZGllcmVzaXMg
-L2NvcHlyaWdodCAvb3JkZmVtaW5pbmUgL2d1aWxsZW1vdGxlZnQKIC9sb2dpY2Fsbm90CiAv
-aHlwaGVuICUgWSZZIChhbHNvIGF0IDQ1KTsgV2luZG93cycgc29mdGh5cGhlbgogL3JlZ2lz
-dGVyZWQKIC9tYWNyb24KJSAweEQwCiAvZGVncmVlIC9wbHVzbWludXMgL3R3b3N1cGVyaW9y
-IC90aHJlZXN1cGVyaW9yCiAvYWN1dGUgL211IC9wYXJhZ3JhcGggL3BlcmlvZGNlbnRlcmVk
-CiAvY2VkaWxsYSAvb25lc3VwZXJpb3IgL29yZG1hc2N1bGluZSAvZ3VpbGxlbW90cmlnaHQK
-IC9vbmVxdWFydGVyIC9vbmVoYWxmIC90aHJlZXF1YXJ0ZXJzIC9xdWVzdGlvbmRvd24KJSAw
-eEMwCiAvQWdyYXZlIC9BYWN1dGUgL0FjaXJjdW1mbGV4IC9BdGlsZGUgL0FkaWVyZXNpcyAv
-QXJpbmcgL0FFIC9DY2VkaWxsYQogL0VncmF2ZSAvRWFjdXRlIC9FY2lyY3VtZmxleCAvRWRp
-ZXJlc2lzCiAvSWdyYXZlIC9JYWN1dGUgL0ljaXJjdW1mbGV4IC9JZGllcmVzaXMKJSAweEQw
-CiAvRXRoIC9OdGlsZGUgL09ncmF2ZSAvT2FjdXRlCiAvT2NpcmN1bWZsZXggL090aWxkZSAv
-T2RpZXJlc2lzIC9tdWx0aXBseQogL09zbGFzaCAvVWdyYXZlIC9VYWN1dGUgL1VjaXJjdW1m
-bGV4CiAvVWRpZXJlc2lzIC9ZYWN1dGUgL1Rob3JuIC9nZXJtYW5kYmxzCiUgMHhFMAogL2Fn
-cmF2ZSAvYWFjdXRlIC9hY2lyY3VtZmxleCAvYXRpbGRlCiAvYWRpZXJlc2lzIC9hcmluZyAv
-YWUgL2NjZWRpbGxhCiAvZWdyYXZlIC9lYWN1dGUgL2VjaXJjdW1mbGV4IC9lZGllcmVzaXMK
-IC9pZ3JhdmUgL2lhY3V0ZSAvaWNpcmN1bWZsZXggL2lkaWVyZXNpcwolIDB4RjAKIC9ldGgg
-L250aWxkZSAvb2dyYXZlIC9vYWN1dGUKIC9vY2lyY3VtZmxleCAvb3RpbGRlIC9vZGllcmVz
-aXMgL2RpdmlkZQogL29zbGFzaCAvdWdyYXZlIC91YWN1dGUgL3VjaXJjdW1mbGV4CiAvdWRp
-ZXJlc2lzIC95YWN1dGUgL3Rob3JuIC95ZGllcmVzaXMKXSBkZWYKJSVFbmRGb250CiUlQmVn
-aW5Qcm9jU2V0OiBzdG9uZXNiLnBmYQoxMSBkaWN0IGJlZ2luCi9Gb250SW5mbyAxMCBkaWN0
-IGR1cCBiZWdpbgovdmVyc2lvbiAoMDAxLjAwMikgcmVhZG9ubHkgZGVmCi9Ob3RpY2UgKENv
-cHlyaWdodCAoYykgMTk4NywgMTk5MCwgMTk5MiBBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRl
-ZC4gIEFsbCBSaWdodHMgUmVzZXJ2ZWQuSVRDIFN0b25lIGlzIGEgcmVnaXN0ZXJlZCB0cmFk
-ZW1hcmsgb2YgSW50ZXJuYXRpb25hbCBUeXBlZmFjZSBDb3Jwb3JhdGlvbi4pIHJlYWRvbmx5
-IGRlZgovRnVsbE5hbWUgKElUQyBTdG9uZSBTYW5zIEJvbGQpIHJlYWRvbmx5IGRlZgovRmFt
-aWx5TmFtZSAoSVRDIFN0b25lIFNhbnMpIHJlYWRvbmx5IGRlZgovV2VpZ2h0IChCb2xkKSBy
-ZWFkb25seSBkZWYKL2lzRml4ZWRQaXRjaCBmYWxzZSBkZWYKL0l0YWxpY0FuZ2xlIDAgZGVm
-Ci9VbmRlcmxpbmVQb3NpdGlvbiAtMTAwIGRlZgovVW5kZXJsaW5lVGhpY2tuZXNzIDUwIGRl
-ZgplbmQgcmVhZG9ubHkgZGVmCi9Gb250TmFtZSAvU3RvbmVTYW5zLUJvbGQgZGVmCi9FbmNv
-ZGluZyBTdGFuZGFyZEVuY29kaW5nIGRlZgovUGFpbnRUeXBlIDAgZGVmCi9Gb250VHlwZSAx
-IGRlZgovRm9udE1hdHJpeCBbMC4wMDEgMCAwIDAuMDAxIDAgMF0gcmVhZG9ubHkgZGVmCi9V
-bmlxdWVJRCAzODc4MiBkZWYKL0ZvbnRCQm94ey0xNTggLTI1MCAxNTQwIDk0Nn1yZWFkb25s
-eSBkZWYKY3VycmVudGRpY3QgZW5kCmN1cnJlbnRmaWxlIGVleGVjCjQwNTE0OUI1NzNBRUM5
-Mzc4QkFFNDY2ODVBQUY3ODQ5RTVDOUE1QzhDODc2NzQ4NzI1NTg5RkIxNEEwNDk4MDhEMzlB
-NzVENTVGNjQ2NAoxMUE5QzM1MjZGMTg4N0FBMkJBRTUzRUU0QkE2Mzc3Q0IwOTQwOThCQjI1
-OTA4MjhEQjk2RkZEM0EyODk1Nzk1MjREQkJDNzlEOTU5N0QKNDdBNzkxOTJFMDFDMzYwRjA2
-QjkzQkZGODlBM0M2NDJCQzQxMDMzN0Q3NDM0OTlBN0Y4QjFFNDc2RkExQkRCMEIxOThGNjdD
-QUUzRjU3CjQ5QTFBQ0M0ODc5RjZFQkNEODQ3NDBENjJDNTI0ODU5NUI1MzBFNkMzRDNDREMz
-QUY1NDM2OUVBRkRFRENEOTg0OEUyRDM4Q0QwOTFCRgoyQUNBRDEwREYxQzg3ODcyQUFCRDA4
-NkQ2MDQ3NUVENjA0NkUyNDBGMjIzMkZFMkYwMDI1OTIyNTkzMTUxOEI3QjQyOTEzN0IxNDM4
-NEQKMTVGNTgyNDY3QTgxOEMyMEMxQzYzMTZDNTY3MzZDMTlGMUQ3NDY0MjMxRDY5ODAwRDk0
-Q0Y1MDEzREMyMzdEQTFFQzE2RkQ2M0QzMTU0CjRGQURGODNGMTUyRDE0OTZFM0UxQjUwRTY1
-N0Q1MTk1MkE2NURBMjIyNEFFM0MyOTBBOTQ4MjI2RjAwNUMzN0FCQTJGNkNBQTczMjM2Nwo5
-RDAzQTFGOTI0QTMzMkZDRjcxM0MzQUZGNjg1RENEMTRGOTUwQTlGNTBGNDY5Mzk3NTlGOTE1
-Rjc4MEY2OEVCMUU4QTJBNkREMzcwREQKREVGNUE1MTY1MkNEMEM1REVDQkNDOTQzOTY5NjI5
-MDRCMTkwNjlBQ0FCMjI3QjZENEQxNDg1MkE2NTM2MkQyQkZFM0IzOTM2RDhBQjNGCjIzMThB
-OTlBNDY5MTNEODY4RURGMTk4NEY4Njg3ODVFM0IxMTA3NjQzQkM0RTU4MjA2RThFNUU3MUU1
-RTEzQTgyMkEyODlBN0M3NTU5RQowN0JCRDg4MjI4NDdDNTZFQzBEREIxMjIwMjYzM0NBQ0E5
-OTBCNTg0NEI1MjUzRUJGNzIxOEMyQzQ5MTIxMUQxODc5QTRGMzZCQUQ5QjYKOTM1M0Q2MzY1
-MDZDNTJGMjQ4MThFNDQ2NEUwMkM0MUFBQTE3QUY3QkYwOUZCQzM3QzMzNUE3QkNBNDA0ODFD
-MTM3MTgyOEQ0QURFNjMwCjhERjA5REMwOEM2NDEzNzcyOTVDRDc1NDg1REMxNDczMjgxOUMy
-REIyMUNDNDk5NzMzRkVDQUUxQ0E5NDkwN0ExRjE0NEYwRUI5QkZDMgo5OEU0NzFBRjMwNEJD
-MzYyOENEMzkwMjAyRkZGNTlBN0JEMTREOUY5Q0M5OTM2ODgyNkRFNjQ0NkNENDBBNjhBREVE
-QkJFOEMzODg3OTgKMEZFNTc0NDQ4QjE5NkU5ODdDMkEzOTJEQTg2NURBNDZFNjUyQUFDOEY5
-QTQ4MjZENUFEMTc3NkZFMkU1RDJERUVGQTAxMTUwN0JFOTM1CjlFMTlFMkFGMzQ2NDMxMzU2
-OTFFM0EyMjFCNEIwQUIwRDE4REMzOTkzRjY0NjU0ODlDRTVFRkEwRDJGRUMwODc4ODE5MjdB
-NDM0RTUxRgo5OTY4M0FBMDQ2MzY5N0JCOTYxNEI2Q0Y1MjQ3MzMwQkI3MzkzRjgzNkE3ODlB
-Mzc3NDYyOUIyN0UxRjgyQUU0QzAxRURCRTk1QzIzN0EKMEVBQzc4QTVBN0ZGQ0MyMzMyRENE
-QjcyNUJERTkxMDFBOURFNTNBNkNDQTY0QTk4NDI5NDcxQkE4MDE4QTNFM0MyRDI4N0I2MzE2
-RkJGCjA4QzNEMkJCNUE2MTFEMUJFODQ2QjE3QzJGMENBQUUyOTU1QkJBN0VFNEQ4NERCRkE2
-QkI1RDU0QjVEOTBFMjNDMjFEMzQ1NjIxNDREQQo0RjVBNDlFNjY2QzFFNkY3RjE4QjJCMzNC
-MkJDNEE3RkU3MjI0NDBEMjcyQ0U1MzM1NEIzOTQ0MkYzQkM4OUU1RjkzOUI3MTc1NDQ4RjAK
-MDJENkE2MEJDMjk3Qzc3MDc0NTIyMkZEQUNDOUQ0NTZCNEY4NjlFN0JENEU4MDJDMDFENTE3
-QUQ3NTJCQTUzM0RGMUVDRjRGOUE2Q0YwCkRFODMwNkM1NUE5MDQwNUYyM0QxODM0RDc2RDJC
-NDQ1MkU0NTA0QUE5NTNBOEI0RERBNEYwQzk2NzMyOUQ5MjJBNjg2MTVCMUI3MUY3MwpFOEJC
-NjgyRUNCRTNDNzQxN0EyMThEQzM4NkIwMDk1QjM4NTc1RUJCQTU1NTgxRjc2OEJBNUQ1RjIw
-M0E3NjI1RkU3ODg1N0VGMkI5MTkKQkFFNERFMDExNjUwNkZFMkM0NzZBNjQyMzQxNEZFRjU4
-MzNERkUwMEQzRUFENkM2QjVGMzE2MjVDRDc2RkIwQTQ5RDA0QzFERDg1QTdFCjY5MkJFQ0Uw
-Q0MzMkM5QThDMDRBQzIwOUI1RDFENzdCN0JEMjEzQjcxODU1RkJFODFGNzU3RjQ2MTI3RTcy
-NTM4MjNFNzMyQTYwOURDRgoxNkM3OTQxMkQxRjBBMTUxNzI4OEE4MUI0MjE2NUI0N0RBNjZF
-Q0E1RThFMUY2QTM5QTQ3NDQ4NkEzRDRCNjY5QkM2NUNGNjMxMzZBQzkKMjQzRTdBNDkyQ0ZF
-MjIyQ0I0RjU1QzJFRDRCQUE3NTU2REVEQUQ0MjVCRDcwNkFFRUQ4OTVFQUM3NjcwNEFGNjM2
-NjI5NUVGQjRBOTFCCjU0OEMyMTc2RDRBMzBCMTAyNjQ4OUU3MEQ4RDk4MUQxMTBERTQ2RTBE
-NURGM0EyODcwNTkyMjAxNDJEQjAxMDAwOTJGQkQ5RTE2NDg0Qgo3Q0RGQkFDMkI1OTVGRDM1
-MzU5RDY1RDUzNTFENUFBMUFGOEVFOTRFNkEyNTlBNTY4RjNENjIxOUYyNTM4RUI5RTMxRTg4
-RDJBN0Q4QjIKMTVGODhDNTgxQUZBQUFFNjdBRjU4NzM0M0FCNkFCMzYzNkFFNTE5Q0FCMDBD
-RDBBNzlFQUU0REJDQjU2RTc2RTQ2RjE0REQ3RjAzNzU5CkQxMEE0Rjc4QkM3MTRCNjBFM0ND
-NTZCQzA0QzRGRTY4QzU1NDlCQzFBNDU3N0YyQUY1NzhGMTQ0MUVFRTkxNzhFNjc4OENFMDNF
-RTE2Qwo4QzNFODBERUUzRjBEMDE2QUMwOUIwQjYyQjQ2RUJFNTQ3RjBDMTA0NjZFOEJDOUMz
-QUMyMzVGOTFGNTk5QjI0NEY4REFDM0I5RkE2NjEKOEEwOUQ5QTYyRTlFOTA0Q0NFMzNCQjFE
-QTFGNkZDODFFMUY5N0ExQzU2QTIxMDdGNzIxRjgzNzE4MERGMjRGRjExMEM3QUVENjI4RTdE
-CjBCNDY1RDUwNjRBNkRCMEUxNzhDNDAwQjY1RTIzOTUxRTc1NjJBOEM4OTBCQUIwNzc0QzJB
-Q0NFRDA3RTQ4N0Q1NEU2ODhFNUFGMzU0Ngo2NjFCMTMzMzZFQjFBNEVGNDg0QkZFNENBQjYx
-QkZBNDdCN0YyMzJENDZFRkFGNTBENUUzMUE4MzA1RUY3MjdEQjA5MUFCMEI5MzQzMEUKNjFG
-QjkzOEY3MjEzOTBFRTI3MUQyQkE1RDhCMzNCQUZENUNCM0YyNEM3QTRBREVGRjZDMEU0MkQ5
-M0UxQjlEQUJEMjVGODkxODExQTA5CjQ1N0JDOTRFMTNGMUI3MUY2Mjg5Njk2Nzk3NDBEOTFD
-MTk3MTU5OEExRDRDMjQ4Rjg0MEJCRUYyQkNGNzRGQjFFQUM2RDNENTgzMDZERAo2MDdDQUVC
-MThBOEIxOUVCNzc1QkNCQzY2MDJERUQ2REMyNzNENEEwMTkwRUY4RDMwRTA1Njc1QkM3QjNF
-RTFGNkQ1ODQzMTFDNjgxRjAKQzlCN0Q2MEQyNUJFQ0MzQ0E3QkM4M0IxN0U3RDQyODMyRDky
-Q0I2NjM0NTY2OEY0NTVGODZBMzlENTk1MzRCODQ5NjdENTU0MkQyODhCCjAwMThGQTE4M0E0
-MjcxMTUwRjU0OUQwNTMyRTY5MkMzMTA3N0FDRDhGOTA1MjkzQ0MxNkM5OTAxREVBQUU2QjMy
-NjY4MEE1OTQ5MzcwNwo4OTUyNjRGODgxRDY5M0JCQ0E5NTVBNkYwM0I1OEFFMEQ4MTU0MEUy
-NkJDOUEyMTA0RDRBQjIwQzVDRDFENEZBM0RCMDlBMzgyNDY0MjUKRTVCMUZFMUVGQkU2QzMy
-QUY2MDlFQkU3MUNBNURFNEUyNEQ4Q0RDQUYxQzNDODQzNTkxMjZEQUE2QUQwMDk4QkY3NDI4
-NDQ1NTk0M0Y1CjExNTM2MDc5OUYxMEJERDY1N0QwMEZGQkMyMDM5ODE2Nzg1QUQ2RTVFRkE4
-NDQ0RjNBRUFBOERCNTJFMkYzQ0JFQTgxNUM0RUMwOTA3NgoxRDAzRTg3NDAxMzE3QTEyNTY3
-REEzNUE5REVEOTU5NzQ2RkQ1NjEzRTFENzQ5N0QwNEY4MENBQTM0NjNEM0YzRUI3OTEyQ0NC
-NkVGODcKOEI0ODc0ODVBMjc1RDE1NEUyNTQ5RjNDNDI0QTczMEY2NkY2NkFDOUU2RkFFMDk5
-RTcxNTA0QUQ1Qjc2QjRGOTdDN0JFMTVENzBFNEE0CjNDQjAxRTA5Q0Q0N0Y0MUJGMDQ3NzU3
-NDM2Qzg4NkEzNkI5QzVGMkM1MUIxNjFBMzk3REZDNTQ5NEMyRUNCNUE0Q0NDQzA3NURCRTJE
-MgpFMzdCMjJGMTRDMzY2NTE4MjIwMDgzMEY2Nzk2QzFDOTg0MUYyNDQ1MzI4NjUxNUUzRjZC
-NzAxRUY4QzBCRTY1QjgzMDVBM0QyQTA1MjIKQ0E1QTMwQ0ZFNUNCRkM1MEE5QjZFN0QzOTI1
-RTUzMkFCNUE1OEQ0QzZDRUE1RkFFMUMxRUVEMkUzOUM4MTVFNjRCQ0M5NkRFMkFGODVFCkY1
-QkMxODMxRURBM0IxQkE1NDFCN0RCNUVERjZFMDQyMjQ2QTg1MzQzNTNCMjBFOTlBMEFEREI0
-NkIzMkFGMTFERURDMkZFMUIzMjI2MwpGMDU0RTc1MkY2ODQyN0Y1QTFCNzFFRDk1M0ZDMjcy
-RkRERUE1NTUwNkNDOEZERThGMzVDNjE5RTM3Mjk2MDQ4MDI0RkE2MzAzQTlGRkUKNkM5QkUz
-RURFNEJFNTc5NEFEMUE4RTc2MUIzQ0RGMTM3QzdBMjlDNjREMEQ4RUUxQ0YwNzFGOTA5NkRF
-RTg0M0VENDBGMUQ0QTU0M0E4CkNFMjhGNzA0M0QzOEE3NEU5MjlFQUVBQjZCQTk1Q0REMTdF
-NTFCREQ3NzY5MUYwODQ2RjlFRUU0OENENUNBRjkwNUNFMDgxNEYzQzdERgpBMTdGNDMwMzg0
-Q0YxQjIwMDRGMzFFMDc5NzVDRTRBNkJDODhDQUQwQTgwNUNGODlEMTY3QkREMTVDOUYwRjg0
-NDIxNjZERTNERkE2ODcKNUZDMDhBMzVEMjIxQTE1MTY5OEI4MDNCRDY3MDY0NTcxQUU1N0I2
-Nzc5N0I1RjA2MThCNkI4RjNEMTQ4MjlCODdBREE3ODM4RDY1QkNFCkQ1MjdDRTJGRjk5ODQ1
-NTVCOEE2QjkxNUE2ODI2M0U2NDE0MTQwOEZDQjdCQkYxRkY3QjhDMDQzNzA1QTg4MDNBREI4
-NDM5N0I4NjFCRAo2NEEzQTdCQTc4MUM0NEM4NDdBNjhGMUE5RThGRjZFRDdCRTg4MUIwOEM4
-RUQzQTJCQUZBQjkxOUQ3RDM2RDM2NzcyREFBRjgxMkE3NEEKRUMzNjhFQTYyMkRCNjkwM0NC
-QTMxMzRFNzU1QzYzQjAwMjBFRTcyRUE2OTlBMzk3NUJBNEIxQ0Y3MDMwRTY2QjM2QkRFOEE2
-NkJEMEIyCjcwQzdBMkVDMDg0QjgzODNEMDIzMjY5QjkzMUI5Q0EwMzZGQ0EzNjJBOURBNkRD
-OUREREZDMTFGNzE1QjFGMkE2MDA5OEM1NkI2QjY4RAo1MkJBRjMzQkYwQUVFMkQ4NTUxRjBD
-ODgwOTM0Mjg5NEY2MEQzNDkwRDlEQUQxMzE3QUIyRjcwRTMxMzkyNEU5RDY4MEM2MTBENDFD
-QzMKMTkyNEUxNDU4QUQyMjBGRkUwQjM4NDQwNERGM0FBNjdFNzMwNUEwODM2QzVDMTk1NTEz
-RUMzRDA2ODZCMzY4QTY1REQzREU5QUVGNUQ0CkVBMjgzNzZCNEFDQzFEMDBFQjM4RjZENEVF
-RDdFMDI1RUUxN0ExRDE1N0MxRTcxODc5REUxNkJGNDZENThFMUJCNDZCMkNGOUNCQTA4MgpD
-MEE5NDU2N0E1Qzg3NEU4RTY0NzdBM0NEMEQ2RTQ4RjhDRDRFNEFDMzczMEUzM0VDODA3OUI0
-Q0NFMEVCRERBNUU0OEVEMTM2MjZGOTAKODg4QTI4OTI0NDhERDA3NUVBM0E4NDZEMUM4RTZF
-M0YwRkYwM0I4RDYzRDA0QUVERkM2NTk4NDBBOTQ5Mjc1Mzk0RUIyMUI4NUU1NDRDCjI4QkYw
-QzJBQjcxMTNFQkU0QThBM0QwNTc5RUY0OEMxNUQ5RDgyQTA5RTk2MzQ3NDIyMDczQTQ1RTMx
-OTc0OTBENTlGRTVFOTgxODY5NwowNjVBNDE5RTk1NzY4REFGNzY4RTFEOTM4NDE0RUNERTUx
-NTkyODFGNEJCMzVFRUQ4RDY1RDM2NTE5MDYyMTdGRkMwOEFGQkIwNzU0NzQKRDBGNkI3NTE5
-Q0UzNjY4MDkwQjExNUEzNTBEQzNFOTBEQjM1MEEyOTA4MjI0MDVDN0FENjcxM0YzQkMyOUZF
-RTBBNEUzMkY5Qzg1RkRCCjIzMkE0NThGNTVEQjFDQTMzNUZDOTRBNDcyQzM5MEEzMjI0MjJD
-QUQ2MDk0NDNGNTY0NUU2QzQ1MjM4NTcwQjY4OUE3QUIzMDdCNjNEQgpCNTk4RkNGMkVCMkE3
-MEY2QzRDOUNCNURDMzA3NjkzOEM0RDJDNDAwOTMwREMyNjI1Mjg1RUI0NDgzMjk0NTA5QTRC
-MDE4MDAyQjgyNjEKQUVGNTcxQjA2RDhFOUJEODZFOEFBNDBDRkVEOEU5MkQwNTVEMUY2NTNG
-RjY4RjJFREY5NDYzNzk2QjA3MEEyQjM2NkJBMjc0QTA3Q0E4CjI4M0IzMENGNzkyMzFDRERF
-NEEyOTQ5RjQ3RDhDMThDMTU4MzY3M0ZCQzVBRTE4RTBBNTREMzJCMDk1MzIyQ0ZGNURGMzgz
-MUY5MTA2OApFOURDNzEzRUYxQjI4MEQ0MUM0QkJFRkIyNjA5NUZDRDU3QTVGRjc0NUUwQTI0
-QzAzN0I4MDkzRkZGMkUxMERBN0Y2RjZBNDgxMjYwRDMKMjM3MTU4Q0U1MDYxOEE4QkRCMUNF
-MUNGNTU1MUI0NTk4OTE3RTRENDAxMzdFNjc5OTNEOTZENzVENkMzODUwRDkyRDUzNzM1NDFE
-N0U2CjVFN0NDQTE0NzhBNUYzRDExN0FCOEVGMkY4MEYwMjQ4OUU3RDk4OTlBNDZCNEIxQzMw
-RTYxRDY1N0FFRDg0OEExNDREQzI0RjExQTFGNwoxODIwMjAyOUM4MTkyNkFBNzZEOUY3RTRC
-OENERTM4ODQ4RTcwMkVDNjg0MTExNUEwRjU4NTMzNEY0MjQ0NUFFQUFFNzg3QkYyNzJBMjYK
-MzU5NEU0RjYyMzU4RTdFREFBQUE2MzAyOERFNzg4NzI0RUUwNEQxNzUxQTU5QkQ5NUQ5REMy
-RjJFREYwMjU2Q0I0NEVEM0UyMjEwQTlCCkFGRTgyODMzOTI2RUQ2REFCQTYwMTQxRDc0MERC
-MDMxOEZERDlBN0QzQjRDRUM4RjJDOTVFM0ZBNkVGNjAxMzczN0YwQjFENDhEMjRENgpGRTM4
-OUMyRUY1QkQxMkFEOEM2RDJBQkFGOTAxNkVGQzdERThEQkRBNkZEQTIxNzI3RUY4RTAwN0Ix
-NTVEMzExRDdCMjc5NzU3MTY3RjQKRDFCMjQ3MzUzNEMyNDA4RTQwMkFBMDUwNEY4NTNBQ0JC
-QjVDRURFMjA4MTM3RjJEQTZDMjEyMzBGRTI3MTVDNDVFRjAwM0FBOTAxM0Y4CjU0QTU1MzRG
-M0FEM0Y4RkYwNTUwQkFEMzcxNjQ0OURGQjNBNkE0RjQ2MEM3MkVGRTNFQzVBQTIyMEU5MDJD
-M0M5RjA2MkU4RUI0MTA2OQo1QjNENjAyNTQ1QkJDMjRENjE2RjA5NzVCMTZFOEM3RDM0MTVG
-NzkyNTU1MzY3NzA0QjkyQ0VDOUJGRDZBODUxQzgxRjVEOTcxNEFGOEIKRTZGOEM5OTJBQjFD
-MTNENTFGNDZDNUUzMkY3OTczMUVBMzJEOUM1MjZEMkFBQTBBMTU4NDY5MkEwMjRFMEY4NUJG
-OUUxMzgzQ0RBMUM4CkZDNkJFMzZDQTNDMTJFNEZGMzRGMTFCQTYyRDk1OTZCMzk4MzZFQjU5
-QjYxQkM1RjVEQTk3RDgwMzIxNUJBMUQ0MzQzMzM3RkJCNUQ3MgowQ0RFQTA4MUVDNDAzMjlG
-RjMxMDU3QkVBNzY5OEFFNERFMUYwQjc1RDREOTAyN0Y3NDFGNTg3QjRCNTI0RUIxMjI4N0RG
-RDBCOTBBQzQKQkVCMjc1MzhBNzg1NUI3OTY2NTc2QjY4RjE2ODJCOTkwQ0I1RkY0QkEyOTRG
-Mjc4REM5ODk1NkM1OEZBQ0NCQUYzODNCNzA4RkU0NjY2CjUyNzYxRTk0QkIzRTVFNjVDN0U5
-MDQ2NDNENTRDNjg5MjBDMEIxMDcyQjc5MEFFRjk5MjI5RDFGNzc0NUNCNDAzRjA3QzAyM0ZB
-NkEzMApFMEEwMEQ0QURFNzA1MUE4QjU5QURCMjlENDQxMzBBQjAzQjdGQjMwMzY1MEU5RUY1
-NUM0OTk3OEE5NEE1ODM5NzRCNkI5MUEwQTQwNjUKQjQ3REJBMzRCQ0VEQTE5RDQ0QTNGRDgz
-RTdGRDIzQ0JFQjZEMTY5OTAyM0I3MDRCOEMwRTJGQTgwMUNFMTVBOThFQ0RCQjA0OThCQkEy
-CjIzQjQ0NEMwQTc1RTBFNEREOTk1RDQwQUE0RjlGMDNDMEFGODVCQzU3NDIxODJENjI4QjND
-MEQxRjc2QTFBOUM3RTAyQ0IyMjk1Q0YyNgpBMkY3Mzc2MEJDNDcyRTIyNzhDQUU1NEQ5NzYy
-RkEyN0E5MjQ2OTY1MzI2QTBDREJDQUU5OTc2MDhEMEExRDUzMjZFNzhCNjc4MEUxNUIKQUU2
-ODg4Mjc2NjVERDc4NkU2Mjc1OTY5NDQ4RTMwMzAxMjQ4NkJDQkU0MTMwRDg0OEI0NjY2NkQ2
-NjBEMDc5MzU1OUFFM0U5ODREREQxCjA0QzRENTZBMDY2Nzg3QjRBQTRFMURFODE4M0IwNzhB
-OERFNDJGMDY2M0QzM0QzNUJBQ0IxOUEyRDgyQTYyQzUyQkU2RDNDNkVBNkM1RQozREM5QzQ5
-QkI3NEZCMUU0MzA2MjlGNDM3REZFNjdEQjREQUM3MzU5MDI1ODg3M0I2RDgwOEU4REFENEZG
-RkU2NjBGMDlENTIwN0FBN0QKN0Y0NUVFREU2RUNDMzJFQThGOEJBQTA3NUVGMjM2QzcyRjk3
-NTlGNDRGNTlGREI0NzhFQjgxODc2OEVGNzQwQjlDODkyMzk4QjM1Qjg5CkM2RjQ0RUZBMUUz
-QkFGMzg0RDRCRUM2OEQ4MTdBRTdDNDQ5REUwNjFENTNDNzU2OEYyNzE0MzY1RDVDODA3Mjk4
-RDZGNzJFNEQ1RDhBRApCODdBQ0UxOUU0MDU3RTIxODgxMUVEMTJGODQ5MDZGNEZGOUJFRDQ2
-NjA3MjYzQUYxQ0U0RTRGQzFBN0QwNkQ1OTcyNUJGQUY5QjE5MUMKMTdEOTEyQzY3NzI2RDg4
-Q0U4MDVFQ0Y5MzA4MUExQkVFMjgxQTAzNjRFRjBDRUZCQTkyRkNENjQzM0I0QTQ0QUM4M0M0
-NDkzNTkwMUQ5CjJFMzIxODRBMzFGRTc2NjFCNzYzNkI3MEZGNjJEOTdBRTlENzQ0MEEzQTYx
-MkE2OERGRDcxNzY0NDVGMDczNDZGRDI1REE1RDkxMDA3MAo1QjdBQzZGOTA2QkNCQ0FGRTJC
-QjNBM0UyOTZENTgwNjYwQjVGN0IyQjgyOTk1MUQyOTFBNzU5Q0U1REFCQzQ3RTkwMjFDMTRB
-RjgwRDQKRTI1OUVFMTMxNjkyNTdFRTI0QzAzNzNBN0NBQzE3Qjk1NDlBMzk0MEZDNjU4QkMz
-NUZDNjM2NkM3QTlFQURGREI2RkYxNUNGQ0UwMzhECkI1RjFFMEIyQTMzQ0I4QzQ1RDc4Q0Uw
-M0U4Mzk0RTBFQTlENjc3MDhDMTFGN0UyNUFEQTQyOThENUM4OUQ5NzdCRjE3NTU1QUM3MDU3
-MApCRTA3ODE1QzhDRDIwNEUzQ0NDRDNFODlBNkE0QjlCQjFBMDVGRDZERDRBNTZEREMwQUU1
-NkQ3RjU4MzgxMjQ2MDk1RTg2MjQ1MDU1QjcKNzYyRDA5ODExNDgwRTlBMTcwMEZCMzkwQkJE
-NDVGRDA1RjEwNTRFRTY1QTlGQ0E4MkIyOEYxNDUzRDcxOUQ4RUExRTM4RTE0NzVEOTRECjNE
-MUIxNkY2NUNDNDU4MkNDMzJDQkY1QjlERTkwRTk2RDkyQTM5RjY2NzA5MEI4QjQ3RTBFQUNC
-QkU4NUY4ODVGQjU1RjgzQjE5QjAzMAo1MkQ0RUQ1NTJDMUNBNzc4MEE0QUJGMERCMDJGNDc2
-RDZBNDk0QjM2Mzk5OEI0QkU4MzJDRkRCREZCMjhFMEQyRjZEQkRGMDQyOTFFNTMKRjhDRUU5
-N0Q2MDU3RTY2OEYzNTk0NzVGQTU3NTQ0MUJDNzdGQTZGRjMxNzA2MjFEMTAwMkIxQUI0MEMx
-NTVCOEY0MEY3NERDODIyQjlBCjlDRUVGNzY2MkM5Q0VDRTEwODJBRTI2OTk1M0FDQUUyRTc4
-RTNFQjAxMUY3MjFFNkQ2NUI4OTc2OTlERjZCRTFEMTQzOTg5RkUwN0JFOQpFMUVFQUM0QTdG
-QUIyQkI4ODg0MUUzM0U5QUYwRTEwOUExODZGNzJCNkQ5NThEMkRCRDkyRTA3MEI2MUZBOEFD
-OURFNjBEM0IwQkUwODkKNTBDNTk3RDAyNTUxQjNCMTBBMEU1MkU0MDU3MUJGNkFGNDA0N0Ix
-OTE0RkE1NjUxRUFGMERFMEQzMzJFRTk1OUY1OEY0RERFMUQ4RDRECjZEODQ3REU1MEU0QTQ3
-QUMwQzJFRTczRkI2N0NFN0ZBMjJGMjQyRDRFNjlFREYyQ0MwNTBEQUREQjI1Rjg5NTlFOTA2
-MEFGMEUyQUJDRAoyRTAyMjVBMUI5QzQ3OTJFRTk4ODUxN0IzQTU2N0RBMDlGM0UxMkUwNTJF
-Q0RDOTFBNTczN0M0NDAyNjUxM0U0NkQ3QjBDNzM5OUIwMDYKQjE1MDVGM0I3RjQxODgzQTE0
-QkE1QjE4MEU4MEM2M0RENUQzN0VDNUU5MEMzOEY0NkRDODhGMTFGRDVDMTU3MDQ1NTk0MTk0
-OTYwNkNBCjU5OENBMjAxMDU2OERDMEI0OUZFNUU1RUI1REZCN0UzQUYxOTVBMjNGNTFGODdG
-NTg5OEQxMEEzNDA0M0YyMzQwOUE5NTUxOTM1NjYxNwowNzNFQzgzQ0QzMTJBRjY5NjFFRUE0
-MDM3N0VBQjBCMEMxNTlDMzkwNkYwNDkyRTk0NDE0QUJCOEZGMzRGMUZCNkQzMzU5NERDQjVB
-NjQKRkFBN0EwMkM3NDk3OTlCQzE0NTUyRjIwNTEyMkUyMjIwOEVEQjYzM0ZBNTAzMTFCMzk4
-Qjk4RUZGQzBGRUI1Q0FFOEIwOTUzQ0QxRDBGCjA1NzAxQzI5MTlENURFNThFRUEyQ0E0QUVE
-RDA2NDQ0OTE1QjE2OTI1NTA0RDE1OUYwNTBBQUEyMDM0NzNDMjk4MDVFREY1QTcxQUFEMgow
-NkM2MDEyNjZFRDJCOTA5RTY4ODg3Rjk0Qjc2MTRFNzIzOTUwRUE5ODE4Rjc3OTMwNDBCQjhG
-N0UzNTAwQkU0NDg5OEI5MkUxQkRDOTcKQkNDRjMxMkQzNUE4NUU2Njc2NjlGMTVCREI0Mjg4
-NEU3QTI1OEMzNkM3Q0Y0OTQ3ODUyODY0RkY0NkVGQ0Q1NjgxN0M1OEE3QkRGMjlGCjMxMTFB
-MTg4QTVGOUYyNTVGRTA0MjU1QjE0MjdDQ0Q5RDBDQUY2RDk5OTJDNkZENDkzRTExQUFBODFF
-MTNGQzY5QzU2OUE1NzNBNzlDQwpEM0QyODU5QjA1MUI3RUM3Q0I1NUEyOTI5RTUxNUZDMTVC
-MDhBREE1MDM2OUMxMDgwOEI4M0VGQjY0NDVCNEU1N0U4QkJCRDc1RDZBNkEKNjJGNzIyODc1
-QzZBNjVCQTM1NUJGMjRDRERGNEY1NjExRDQ5MThFRDlEREM1MkU1MjdDNDlBMjg0M0JBMzY0
-NkYzN0IwMTAzRUQwODM4CjVENjg4MzQ3ODNGMjlDMjFGQzY2RjU1QTdCMTFDREQxNTQ4MTAz
-MTBDQjBDMDUzNjdEMkYxMkQ3NDlGNUJBRkNBODZBRjE2MTYwRTkwRQoxRTY2MDlEQkZFQjMw
-MkJCNzM5MzIzNzczMUZGOTBFRjU1NUUxQTE5NEY4OEJCMDVGQ0VCQjZCMDU3MzcyNzMxQ0Yx
-RDE0Q0I0N0U0N0IKNjlBM0UxMTU4RjE3NDFEQTQ1MDU1NDFBODMyRDAzNjJDRDREMTZFQzU0
-QkIxNkU0MENDNjgyQ0U2MTMyRTM2OUMwQkFBMkFCRDdBMzVGCkMyNzk5OTg4MUIwMkQ5QzIy
-REZERDU2Q0Q3NTIwQ0I4M0E4Q0ZDQjRBMTdEQzc5OTA0M0YyNUQ2OUJGMzQ2MERFRUJGMThD
-MjU3OUYwNQoyQjY5QjlGRTVFNkI3NDY3QTE1REFDMTBGM0QzNTAwQjdFQjBENDFFOENCQjBE
-M0REN0E2OUQyODQ1ODM3M0M2ODFGQTc2M0JBRkZDNTcKMjRFMUI1OUYyMUFBODgzMEU3Mzkx
-RThCRjhDRDY0OUY3RjM4MjYyNjQ5MTQ1MDVBM0IzNjcwNTY1NUFGM0MzRkY1MDYzMzJBNDNE
-NzUzCkQxNUJGMEE0MTVENkM3RjhGNjUzRUVDMEE2Njg0MEU3QjlFNzhDOEFCMDU1NjQxNzA3
-MUNBREI4NjFEOUNFOTU5Q0Q0NjQxRUYyQ0RFQQpCNDUwNTg3NzUyQjRBQkU4RjFFNjE3MzJD
-NDlDNTcyNDE3NDZFOTEzQjk5RDIzNTY4RjYyN0FBN0EyMkI5RDMzNzJGMjRBOUYxQjhBQzMK
-NDI3RTU5ODgwOTA4NEQ0QkNEQ0M4RTI5Qjk3NTAyMEU3MzdGQkRFMUJFMUFGNzRDRDAyQkRE
-NzgxMzg4RjM5QTE4OUY2NTgzMDc1QTU3CkE1QjIxRTFBNUU5M0FEMTcwQzM3NjdCNTQzQkZD
-QzE1MkUzMjZCNzY4RDk4QkRERDQwM0ZDQUMwN0VBMzk1QTAxOUU2NDUwNjVCMEREOApEREFE
-MzM5ODI5OUFBQkU2MUQyMEQ4NUU5OUZCODFDNjNDMTUyMTJCNDk2QTNFMjNGNjRGNDBBQkU2
-MEJEODUyN0Y4NUE3ODkwQkI3QzEKQTMxRjlGQUQ1Nzc2Q0JGODUyRERGOTA5OTYzMEEwQjEx
-MEREMUZEQjg3RkEwNzRFQzU0OTNCQjIxODg5NDBGMjk3OUEwMUMxNDYzQURFCkI2ODhBM0Mz
-MzM5MjkzQjBFMUVBN0ZFQjUyMDMzMzVEMjU1OEVCQjhCREI2NUYxM0RDMkVCOEVERDZDMjc4
-NEQ5MDJENkIyMDEzNUY3Qwo4ODY2Mjk5MUNEQzkxRTJCOTk4MEZENjhCMTdCNjJFNDQ2OTM5
-ODRCNzY2MjQ3QTlGMTIxQTEyRTI4MEFFQzREM0M3NjVGMjg1NzMzOEMKODg3MTAyNjYwNTM3
-QUUyOEVCQzc3NzFENDAyQkUzODFFNkFDNzVEMDcxRDZFNjZCRDUzQ0MwMkVDOTY4NTFCN0Y2
-RUNBN0E5NDY0ODM0CjcwRjJBRjE4MjU5MkY1M0ZCQ0Y3RjNEMDg3OEUxNEJEM0E3MjYzMzQ2
-MTg3RkIzMjUwRjE3MjY2RjExMDYyQkRFNzc0QUEzOTk3RTgxMAoyQkE5QzdCQzM3QTBCNjlE
-Q0Q3ODgwNzA3MjVERTdEOERERTgwNEIzQjUzODAyNEYyRDY3REY3QjlFMDA5QTIwQzIzRkZB
-NUIzNkNFRjEKRjIzRDdBMTJGNjY3QTE3NTBCQkYyQjIyMkM4RUQ4MjQ5OEE5QzY0NEFBRTdB
-QzI1OTg0MEYzODgxNzQ3RjJCNEVBREU3RDk2MUU3NEVFCkExNzg2M0I3NDBFMUE2NzJGMjcw
-OTcyODczRUYzQkNEQTQyOTRFNzAwOEFFM0Y0NzBBODkxNTkwMDU0MzFEOUNCRDFCREVCMEIz
-NDIwMgo0MUQ0MTg2ODdCRDA0NEI5REVBMDlGNDgwMUJGMTE5M0IxMEE2Qjk2NDc4QzkzOEFB
-NjdDQkUzNTgwMTg3RjJDQzI2MDQ5MTJCRTZBQjEKQ0M5RDEwRTE1REQyRDAyQzU1QzZFRjgy
-NEU0RThEQ0QxQzFGOTI4NzFBQUU0QTMzNDU1RjE1RDcxQjQzNTlFMTVDRkIyOUY4RkZCMUZE
-CkYwODg5NzhCOTJCNDM2QThGNDJDRjgwNjFEQzk4Njk0QTc2MjdFQTA2ODcyREQyNEZENUY2
-Q0FFNEEwOTEwNkI4MkFGNkQwQTRGMTMxQwoxRDI1QTA2MjY0OUZFOEI2RkExNjkyOTM4NEQ0
-QzE1QzMwMTg3NUIwNUI3ODQ4MTM5MUE0OTdERUYzRDZFMjQ3NzY5ODVFN0I5RDAxMTEKODQ1
-MkIzM0VFRTA4NEExQTVDRUI4ODY2QThFN0Y3MDE2RDgyRDA1ODhDOUVDMDA2NzFEQjc5RjIy
-QkJDOTA0MjA0MTM2RjJBOTdCMjdECkIxRTIwQTU3MUE4OTMxMkY3RjFGREFFMUY5QUE2NkVF
-QjZDN0I0NzNGRUM5MEZGRTc1RURDQkI1M0NENEY0NjI1RDNFMDlDNzlBRjhBOQowODI3OTc1
-N0FDNDk5NUFCNTc1REM0NzYyQjMzQjY2MDhBOEE4NUQ1RUIzOUM1MkMxQ0E0NTIwNDdFRDE4
-M0EwMzExNDJBRTA2MUQyQzEKMUM4QThGQUM0OEI1MjM5RDI3RTE5NkFEMTk2MTMxNThDMkIy
-NEJGNjZFRjVFQjA0MEM1NzFCNjc3OTE5OTZGMThFN0M1RTQxMjVCOUNCCjUyNTkxMTMyNTAx
-RDRFM0U5QTQzQjExMUJFNzZFQzA2RTcwODY3NDk0QzRERDI3QzEzN0U2QkUzNUMzMkNBRTlD
-QTRGNUNFMzkzNEFEQQo4NjVGMThDMTUyNjk3QzZCMUNGMDYwNDUxN0FEOEM2RDJBRjRDQzAw
-RDNFMzU0RTJEMjg1RUUyRjA2MjM3QzlGQ0IwMkEzQTRBNjAxNTcKQ0NCMEEwRjM1OTE1NTY5
-QUFBNjRBOTVDN0REQTAwRUUyNzE4RTJDNjA3MkY3RTVEODhBODhCNTcwMjFERTRGRUMzOUM0
-NzQ0NjAwMDczCkIyRDgxQTY2ODEwOUE2NTE2NjcwQTFGM0VGNzhCRjQ2NTE4RTk1RDAyMjQz
-MDg5RDg5QTQ5RkRENzhBOEVFMTgzNTk0RUY5MzZGNzFBMQo4RkI1RjkzMzE4NjAyRDY0OTZG
-RjM1RkZGRjc5RkVBRTIyMzYzODZGMDdBQTg0MzAwQjA2N0E5RUQ0RkVCRjUxQjY5RkRGQkI5
-NzNGQ0EKNjIxMjVGRUU0NDYzQTA2QjhGRkNGNUM2NjI5ODRDMUNENENBREVDQzI3NTcwOTI2
-OEM0RkZBRTc3NEUxMkI2MTc5NzM3NjBFMzY5RDFCCjhDNzlGMDA0NzEzMTBFREJCMzU2OTAy
-MkJFMEZBQTJFOURFQjEyRTgxQzQwQThFRDM4MDNGRjNFNDAwOTMzQjUwOTA1RjNFQjIzMTU0
-NwoxNTc4ODcxNDg3Mzg4NDU2Njc4MTdGRUJFQjAwRDE3Njk4REJBOUQxRTIzNkQ1OTZEREYz
-RUJERjQ2QTMzNDY3NTdDQzAxMjY1N0QwRTYKQTBEQzc4Mzk5RkY0Q0E4M0IyNTQ1Q0YzRTM3
-NEYxNkRCMkE1REMzNkIzREY5QUUwRkFGRURBQzkzNzlGMEVFQTNGQTE3NUNBMEU5RkQ2CjJF
-MTFGMTAzNjlCMjFGQUI5OUQ3MjFFREE5QjEzNTE5ODIyREY5OTlCNTEyQTgwNjE1ODJGN0Mw
-RTgzNjExMkQwMjNDNDYxNzg0OEMyQwo2RjkyM0Y4QkJFMjcwMTdERTdDRUFCM0M4NTdGNkEx
-NTFCRDk5ODI2NkRGNjJENzg4NUEzQzM4MzYzRjU5ODY2MTQxOTFENjhDMjk4NzcKNTY3QjE0
-MDhENERBMUM1QURBOTFBNzVBMUE1Q0IwN0M3RDU4NDNDRjcyNDYyMzNCRkIzMjNGRkY0OTVF
-RUFGNzJEOTZBOEVERDhDMzIwCjU3Njc0NTM2QjA4RTc2MDQwNzQyRUFGNjVFQjBGRUU1MEQ0
-QjBCRkM2NjFCMUVENUE0MzZENjYwMUE4MTNGMzYwQkMxQTZDOEQ4REEzNApERDE1NjBGODY0
-ODY4Qzg4QTRCNzJDOTVDODJBMDMyOEQ0MTZFQTZBMkE3NUU1RjlBRTY1OEQ2MjM5RTU0RTc4
-NjZDRjhDN0UzN0Y5MTEKN0U5RDk0MEYxQTI0Mzk5MjRFQTYzMEMzMTA0MTZEMUExQjk1QzNF
-OEJDQkQwRjFEQTZCQjNGNUFDOTM0MkZBRDE0NUVERDk2QzQyNTBGCjg5QjVCNUU1RjEwNjdE
-NEIyRTJFNTJBMTgyRkEzODNBRDQ0QkM0REVDQTFEMjA3NEJCNkVCMURGQkU3REYyNUFGM0Iw
-MjcxQjAyN0IxMQpCRjRCMEYxQjU2RTgzNEEwNjY3QThCMzBDOUI2MUUzQjQ0MjgzRDU3MUEx
-MTY2N0E0REMxMEY3QjZFM0IzMzQ3NjRDQjEwMzU3MDkwQjIKNzRGN0JGNkI5QTE5RUNCQUVB
-QzBBOTQyRjk1RjgyQTYwNEM1MERENzFGMkNGRTVCMUI4NjhFNjlDMDc3Q0RERjVDODI5OUNB
-NkMxODE2CjkzQUIwRTQzRjg5QURCRjNCQjk0RTJFM0NGQjAxREU0N0JFQzlGQUE1OUVEQzVC
-NkQ1MDc2NUI2RUIwOTk5NTc1NUM2MDc0QzIxMDZBNgpGQjE0OEZCOTgzQ0ZFMDZFQjRFQUJF
-ODI3Rjk4Q0YxNTgzNzVBN0M5Qzc0NUQzRjc5MDdDNjk1MkQwQ0JGMjhGNUYxREREQTMxQThC
-QzUKNUEyNEZBMzVFNTU4NEY2MUY0QUNBMjU3NzNEODZDNDZCN0EwNDJCRjAwMzA4NkQ4ODc5
-NTA1RkI0RTRBODhCMzc3MjQyNzZFNUFFRTA5CkZEODI0Mjk4MTRDMEI2MDFDRTI5Rjc2ODFC
-QjM5MDNFNjQ2MTlCQTU3RDRDNzM5OUUzQkI3MzgxMDVDNjQwNDE2NUQxRkYyRTREQjY1NAoy
-NzJDMTExODU4ODZCOUY5Q0JCOTRGRTFEMUY3Q0NCQTZFMEU0OTQ0RDZDNTlFQUI1QkU3RjY5
-RkRDMTQ5NkE3NzlDNjMzOTFFMUZBNkEKMzhBQ0QxMUU4NkY2ODg2MDBGRTFDQjM5ODRCNTI3
-RkQ4NTZEQTAyRjhGMEQxRDI0N0RDRkMxNzIyMTEzOUMzMTI0OThBQ0Y4RDlFODEyCjRBNjRB
-NTExQUNCNjUwMUVBREU5Rjg3OTBENEY2RTlDM0I0MkJDMDRDMjNFNkFEMkE2RTZBNTQxNzhC
-QzM4REM2ODRCMDBGQjU0OUE5Mgo4MTYyNzA1NkY0NkI2ODM2QTY4ODk4MjExODc2MDU4Mzk0
-RDVCQjI2MzIwMUJDNjlFNjhGMDUwREEwMzhCN0Y4NkVFQ0MxMTdDMzdDNzQKQUFCMEM5QzRG
-OEI0NjUyRTJGODNGMDkyN0FEQjJBN0JFOTAzMzI1NUM2MzE5NTZERENCMTdEQjJGRTM3NUQ3
-OUJEODEwQUM0M0EyRkUwCjhCNTFEN0JBOTYxOTM1QjNEOUJCQzc4NUIwREVENjhEODRDOTBE
-M0RDM0IyMjU0MUMyQjNDMUE1M0RFOTlEQTE2RTZFQzZEMTQ3NkNCRgo1NTE0RTNCQ0FENDI3
-QzlDODg3NUFFQzU5MUJCNUUyMUEyQ0E0M0MxNDA1MUQ3MkMxOEJFRDczNjEyQ0U1Qjg4QThB
-NzFDMTE0QTU2MjMKN0ZFRkM1NDU4M0EzMDQxQTZFODcxQzhFN0RDQjRDQzQ1N0JBRTczOTBE
-RTY3NDk5MkVGMkUzREM1QUNDODA4Q0VGMUI2RjNENTgyMTRDCkY1MDI0NDE3QkQ5MDEzNDNG
-MkYwOTYxNTdDRTMxRUMwRUE2Q0JFODA4QzhFNTA4RTYwMDBGMDE2NzBFNTUyREUwMEE0RUI0
-RDdCRDI1NApGODQwQ0E2RUU2Qzc1QkQ5NkU5NDQzNTJEOUFFREVFNjk0MUNFM0VFOERBM0U4
-NTFEODExMzA5RTNCNUVDQzYxMEU5OERERUUyNjI0NzMKM0Q2MURCOTYzNTMxMjI1OUNGREE4
-OTUzREY0RDAxQTlCODU3REI2NTMyQ0VENURFRjJBREI1ODMwQUNEQUMzQkRDODlCOTU4MzQy
-NTVDCjQ0MTMxMDBCMTlDRjQ5QTU0NzVDNUM5ODVGODJEMUM0Mzc1MEU5MzNDNTlDQkMzRjky
-RjU3ODVFQjU0MzM5Q0Y3NDJGNDRBMkI0RDc3Rgo2OTQ1OTJDRTJGOTI2REFGRTFGM0QyQ0U1
-MkY0M0MxNkEyMzMxRTAyN0ZGM0UyNEMxMDJEMDk0MTFCNTc4QjE0MzU4MkI1NTEwMzI0N0YK
-Nzg2NkIxQjg3MTI3NzYzRUFFOUJBMDYzNzQ2Qjc4NUUzOTJFRDExRThENEE2QzI1QUUzOURB
-N0FGNkYxMjUwNkJGOUFGQ0FCODlENzdFCjE0QzY3NTdBNkU4MDZDMEYxQTE2QTBFNDJFRUNE
-Q0UxOTk5NkFERURFNDNFNDc3Qjg0RTUwM0M3QURFODRCMUQ3OUVBQThDM0UwRDRDRgo5NDM0
-MTZCNTVFQUNGNEQzRTYyMTc4QTI5NDg2QThGMzExOTA3MjgyMEYzN0IyMDRBMUJENDgyNUU3
-NTg2NTBFNEIwNjYwOUI4NjdDREYKQTM2RTUwQTgyMzZDQjlGQzg3RkQ4MTNEOEU4NDcyOTRC
-NUI1REQ2M0RCN0E1NTM5MTdENTgzODNFQUY2OUJEMDk2RUQ2NTg1MzZDQTlDCkI4M0RBOTY3
-RUNDNDY3RTgzMjlFQkZDNDUwRkM4NkM5NjBEMjNBQkZFMEE2Njk4Mjg3QTU0MDVGNTQwODNE
-NUM2QTk0OUY3M0MwNUVDQgpERjUyMUJGRDBBMzU4M0NEMzhBRDdCMjMyNEZFNTc5NTgyMTJC
-NDRFQzZDQkNGQkU2NDkxRDVGMjdGOTFBN0M2OEJGN0FFOTEyMzlCQzEKMDZBMzdEMTQ0Rjcy
-OEE5Rjk0NTJBMTdDM0UzQzgxNTAxRTYxOThCQUU5NThFMzdDOUI1MEMxQUYyN0MxOERGQzE0
-NTc5NzcyRjlGODc2CjlEMUM0QkExQ0U4NkE4OEIxRUIwRDVFQTlGNTFEQzA4RERFQjU3MzdB
-Q0RENThEODU2Njk4Nzk1QjFCM0VFMjVFN0JEQUM5RTUwQzZDMwpENkNFNjVGQjM0QUY0Qzkz
-QTQ5Nzk2MzI0QjdEQjQ0MTBBNTA2ODAzOTJCRkE1QUFERjIzNERGMjU4NjE3NkJDOTlBMDRG
-QkE3RTJBMDcKOUY1Rjc5QzdEOEFENjhGOTNCMkYzQjdCRUFFQUMxQ0Q0RTQzMzhBOUNEMDIw
-M0QxRTA0QkMwRkMzMTY1RkNBNDEwM0VFQjcxREZEMTE5CjUwNTQ3MzQwQUM4MzYwNUI4ODVD
-MkYyQjIzNUJCMUZBMUY4RkEwQ0FDMkVCNjQ2MTVERjVDMjRGQjJDRkEyNTU0QjdGQzJDNUNG
-NzQ0MAozQzVEQ0VGQzIyQzcxOUU5ODU1M0IwRUNBMUQwODQ4MUExMzBGREFCNjE5OUNGRDVG
-Q0JGNjEwRDRFMkY1MUExNzYzMjI3MEEwOTZBNzAKRjFFRDIzNDVFMTk2ODQ0Q0FGQUIxQTk3
-OUZBMUNCQTU0NTE4QUZGQjUwN0M1OEU4NkUyQ0NBNDE3ODE3MkI0ODhEN0FENjEwQjUzMkU3
-CkZCMTA2Rjk0RTkwQzA2MkZGRDY3RkREMThBNzJCM0YyNjUyNDUzODA3OTAxNzM3REI4ODU5
-MDM1ODg0RDI4OTI2NkU0MDJCRjhGNDcxOAo1M0FBQjY4MDZCRTFCQzM5RkZEOTc1NTJCMDJC
-QjA4MDkyNkY5MDk1RDU2RjJFQzJDQjA0OTgwQTc2RjZERUQzMkI5Rjg3OTAzNEFFMkMKQTYy
-MkUwRTIxNDdFMzM1ODRFREVBNUQwMDNBRjc1MTI1NUI1MTk1OTk1NkQxRTI3Q0ExMDhDNkVE
-QTlDRjVDQUY1M0NDNDY0OTg2MTIzCkI5NTgyRDAxNzZCNjY4OTkwNEQ1NzQ0QjkyNUYxMkFF
-RTE3NDkyRUQzRkZGMDQ4RTA3NjExOUZEMUY4RkQyQTRBMUI3MEE2MzY5MzEyRgo2NEY0NDY2
-NEQxQUM1MTk0NjRBMEYyQURGMzAxOEIzOUE4OEFGMDdDNTJCM0NDQkM5REVCRDk5MzdGQjIz
-MzA5MjhDMUU1RkY1NkJENzMKQzRFQkI5NDNBMzAwM0U0MkQ5MTNDMTVFRkU1MkVDMTdGMDFD
-N0YyNjNGNzk1NDYyQkU2MDVBMjkxMENFQTc5QzZCNzI0OTVDQzU4RjgxCkNFODMyOTdCMjEw
-NjMxOUVDNjA5N0MzOEE3Mzk0Mzc4MTY0Qjc3MzU1MDA0NTM5NzRBQkE1RTNCRTA0NTQyODkz
-QUUxNUNENUIzNEFENQowMzJCOEQxRjJBQjY4M0M3NDNCN0REM0NFQTFDMzlBMDAxNEU5MjY0
-RTc2NTU2NTE1MzkwMDNBMkJEQzU4N0YzMUI2MkUzQkUxQjdGOUQKNUYxMzRBRTc2OTQ5RjVB
-QTYyOUQ1QTYzRkMyMzk5MjAxODAyNDZFQTFGRjYxNzZERDQ4MkUzM0FEMjU4QjE1NUQ1NUNE
-NjZCNDRBMjgxCjcyM0NEM0NDQjY2QTM2MkYxMUU0RDU4RjlERDAwNkNGMTY1MUQ2QUZEOTAz
-QUY4N0U3MjU0NENEMzcyNTY3MDIzMkQ3RERBOEFCMTkzRAoyQzA4NzM2QTQ5RDFGQUFBRTg2
-MUE2NjRBOURBNDI5NzcyOTQ3MTA3RjI5MTdEN0U3NzE3QTQ1MzVENDY0RDM0QjNDNjVCMUU3
-NzQ0NEEKNDcwRUFDQTY4RTREQUIxMjI0MjBGMDFGOEE3RDIxM0QwMDQxOTA4QTg2NENBQTZB
-NjIxRjE0QzE0RTQwN0YwQkM1Q0M3MENGMEJDNEZDCkNEMkZBRjhDRDBDNUQ1RkIyMDgwMDEw
-RTAzOEMwRjExOEQ3NjJDMDk4OTg2ODZEOERCRkMyOUNDREQ0NkYwOEVGRDU5OTMyODEwMUJG
-NQoxNkE1NzM2RjIwQURENEFDMUMxNTBCRDNCRUFENTg1RDFEMzYyMjYxQzczNUYyNENGQkJE
-NEI2NDY4MkUzNDkyNkNCMDRGOUQzMUUwOUMKQTYzMzVBRUIzQzQ3REUzOUQxNjAwRDdGNjIy
-MTNBNzFDNzRBMEY4MTk2NURDNUIxQjNENzIyNzYzNjY5MEI4ODJGMzgxMjZEOTAxQTlDCkU0
-MThCQzZEM0Q5MjNGQkI4MDE3NjFGRTdCODFBNTVERTNGMkU0MjY4ODI0NkEwNjQ0MUZBRTE0
-RjIzRERCOTkzNjcxOTAxRjk3NDUwQwpFQTZEQjEwQjBEQjEzQTIzQ0UwRTIxQzI3QzFDRDZB
-QjUyNEQyNUVGQzEzREFBNDUwRkQ4MEJCREM2Mzc2MDY1QTE0RDc0OUQ0OEVFMUUKOEM4M0I4
-MzNCNTEwMDI3RjlDODlGNzMxOUIxNTA5QjY5OTE2MkI3RjlDNUI4QTczOUFDQzEwMDY2MzlD
-Mjk3QzIzQjhBNjYyMTNGNDdFCkE4NzNGODdGMUNDMTlGNTgxRUMwMjZERTU4NEJDMDQ5QzQ5
-QkRDRkU4OUMwMDE1MDRGNDFERTE3RDg0Rjk3MzgyNjg4NkY0RTUyNDZCRgpGQjg3QURGMDcy
-NkNFQzdBNEYxNjdFMDM4NEI5MTUyNjg5NEMyRDAwOTBEMzhFQUIxNDYxQzYwN0VGMzU5RTc0
-NjI4ODU0REVFMUFFQzAKNURBODk0NTk5NUEzRDY4NjcxRThCREQ5OTQ2QzIyMjI5NEIwQzQ2
-ODBFRjJGREMyMjRBMEM3QUZBOUU1NDY2QzdCMTQ1N0NFM0RDN0I4CjdCMEMzNTE3REI4MzNF
-REQzMDJCQUNGM0MzN0JBRTQ2MTdCQTYyMDZENUQxQzc3REQ1MzU0N0E3QkJFMEM5NDhEMjE3
-MjQ2QzI5NEM3MAo1QjI1NEE5NjBDQzVDMkY1RTM1MTIwMDM2MzU2RDc2MDQ1Mjg4NzIzN0Q3
-MEQxRTJGM0Q2QjY0QTAxNzFGQzU3ODg1OUFCQjYyQzE0NDQKRDNGRTA3MTlERDg1RTdBODgx
-MkY3QTVDMEI4QkVBNzIwN0UzMUM3QzU1MjgwMzQ4MTcyREM1RUIyNzU4OTgwNDRDMDBDMkQ5
-MjU0NUEzCjM2MkY3QjQyRTA3M0M3NUJGMTc5RDEzQjBCRTc2QjQ4MzZEMDY5RkUwMUMyODdC
-MzY3RDAyRERDRUM5NDEyQzJGQkVDM0Q0QjMyN0ExMAo3NjU4Njc1MEM4OTk0QUNFMERFMTcz
-MjdCMDFGNzRBMzgxM0QzRUY5RkJCOUM5QzU0MTRGMkU5Q0MxREQ5RDA2Mjk3RDE3NERGRDJE
-RTkKQ0U3QkM5NUY1ODBCNEYzRjI2ODMyQUVFNTM1QUMxNkEwODdBMDEyREU0N0JDQzY5MkI3
-QzA1QjYwMTVDRUUyMjEzMjNGN0VBQTE5MUVCCjg2RkE5NERCRUFDRjA5OTZBOEM4RDAxMzMw
-MUE3QkY2NEMyNDM2MTM1QzNDQ0YyMjk0QjFFMjI0NjE4NDI2MUI5QTZCRDJGNEI5OEE5MQpF
-NDFFRUY5QkQwNzAxOEY1Q0I5QjAwNjBBQTc2NjUxQ0UxNDA1RTA4RTQ1NUJBNjg5Q0QyRTZB
-MzEyNzAwN0JCNEIzMTFDMjM4MDQ2ODkKRUNGNjBEQTc5NzIzNzNEOTY1MjUwNDJDMzYwRjVE
-RTA5RENGRjk0MEU3MkNENURDMEE5MTU0QjYzMUFDMUYyRTM4QUEyQjg1NTFCQkM5CkFENUNC
-NzRDRDg2RjUzODhBQTc1QjZEOTJCMUUzN0E0Rjg3NUE2NzE0OTA4Mzc3RDc4QkM5NkRGQUI3
-RUJFMDQ3QkU0RDQyQzQxNkZERQo1MEEzM0ZDQTlFNjU2MDBBMkM3QTc1NzVENjA1OTA4MkMz
-RkEwREYzQzMxRTgyRDNGQTM5NjlDRTQzOTY1RUE0OUYwNjYzQ0YyQTJDNzEKRUU0QUQ1QzdE
-ODUzQjUyQjZBQTBGNDFBQjNENDdFNTEwRDhCRjY0QUZCMUU4QjhGNzgyQzk4Q0QyODdERUI5
-QUZFRDM5MzM1NTIwQjcyCkI4QjVDRkUyQTZCQjdDMUFCMEVCNzQ2RUNGNkY3QUY4NkMxODM2
-MTJCMERDRDU4M0ZBQzY3OEQ5NjAyOTU3RTYxQzE4N0YzOUIzQTY1NApCMjBDNzkyQkRBOUQ4
-MUZBOTc0QTlFODg2NEMxQTg2RjlBQjcyOTE4RkVCRkU0NzUxNjI5OUFFMUU5QjI3RjQ2RjND
-Mjk1OUM1QUFBRDAKQTVDM0MzMDY1MTE0RTg5OTU2RjVGQTM2RTE2MTc0NDcwREI4REIyRkUw
-ODM5NkVBNUVEN0Q1MEFGOTg5RDhEMTQzM0UwREU3MTE1QTQxCjAxMTVBREUwQkE3NEU4QTRE
-QkNFM0Q5Qjg3Q0E3NjdBRTM4MDI4MEQ1MUZFQTlBMEY2MjNBQjE3NUMzNDYyQjk0ODJERjZE
-MEJFOEY4RAo0MjA3ODJEQkE2M0Q1RjQzOTY2QTg4RTM3NTJCMjcwMDQ4RUFGRThCQTI5MUU3
-MEI4QkRGOEZCNDMzQTVBNTdDNjY5QjRGN0QzNUM4RDcKM0M1MjcwMERFRkJENENENDJFMUYy
-QzhFNDQyRDE5QzAzMENCMzVBRDY2QUVGN0VGMDIzM0JCNEUwOEZDQjQ4Qzg3MjM5OUFGODU5
-OTM4CkEwMkJFNUY5NjM5MUZDNjRFMjk3QUM3OTBENzAzMDJENTE5NzlDRjU0NTlGNERGMkE0
-MUIyNzU5MkQwNTM4REJBQzM5NEMzN0VDRjBFMgpDMTE2RDBBMkEyQzZBREFCNUIwNTQyRjg2
-Q0U1NDM2Q0Y5ODlBODY5NTY2QURFNEQ3NjRFNDIzQkU1ODNBQ0IxMjc4QzdFRDM2MkMwMjMK
-RjhBQzQ4NTUyOTAwNkExODkzREQ1QTk4RDA1MDU2NTU0M0VENkE0RjNCMDMwOTJFMjdFODkx
-Mzc2NUU1REVDMUZGRkJBODA5ODIzNDBECkFBQURDQTdBOTVBMjRFQjVGMzkyREE5OUZFM0U2
-QzM0OTQ4REQ0Q0JDNDY5QkYyQjUzQTUwRjE2MkQwNTk2M0Q3M0U3OUVDODhBOUQ5NAowNTIw
-OTk0MzE3OTNDRjhBMENDQUVBNUM5NUIxNzQ2MDYxNkExMzkyNzUzMjA0M0JFOUZBNzlGRTAy
-MzFENTdGRTg2MUZDMEQzMkRGOTAKRTlGM0VBNUQwMjhFMDYyODE2MThFOTg0QTE2OUY1MDA2
-NzU2MzQxQzFCMkNDQjlCQjVDNkNCRDJFREY3MUE1MjQ0RUU2NDZEQkVDRDI2CjBGNTQ3QjhD
-RjAzRjI2ODlFQjdGQURFNTZEMzY0M0FCOERDN0I4OUE1MTk0NDE5ODE4RkI2N0RENUM2NkU3
-ODY2RUJCMDEyQzM2NUUyNwpCRDRCRUY0QTZGQThBQkU0MjlCRUUzODcxNUFGMzVBQTNGMjc1
-MUUwRkQ5ODBEQ0Y2QUY5NEE4Q0Q2QTc2OTRCNkZBNzFGMkZDMkZFNjEKODc4ODREMDI5RUE3
-QkI5NTFFQzFGRUMzNkMxMDAzOTU5NDNDOEEwNDBFNUYxMzI1RUY4RUI2NjhCMDg5OTlGMDQz
-MUMyQjM2NzYxRkZBCkY2RTIxNzkwRTUxMTEzNTI2QjkyREY3NkFCMjJCOTc2MUIxMUEwQTY2
-NzNDOEUwOTNBREJFRkIxQjE4RkI3Q0Y4MEY0M0QxRDM4RjE3Ngo3ODU5N0I0RjYzOTA3NjRE
-NjBBMUM3OTdEQzA5MjZERDAxQjdEMDk0NDhDNjcxRkE1QjUxQjkzQTU4NjQwRUVCNjJFODBD
-NEYzODEwRTkKOUFDOTk5NTBEOEFFMzE4OTE1MkJBMEFDN0Q4RkE4NDMxREZGMUVBM0NENEZE
-MDdCMjcyQTU2M0U2N0MzRkRDMzE4OEJENjIxQkNGMEJFCjQwQUVFMTkyQTAyQkE1RUMzNkM1
-QTQ1RTFFMTYwOTdGNDI4NEI3NEFGQ0Q4NjkwQjI0RUQ4QzE0RDI1QzdFREE3Q0I2MzkwNDNB
-MjMxNwo4QTU4MDk0NzMzRkU3Mzg4N0Y3RkJCQzk5NTE1MEI2RTU0RjVDQURFNjUzMzhBMTJB
-MEYzODI0OTg0RjVCMTZBQTBDQkRGRjMzMEE0MDgKNzExNkVGQzE3OUREMDNDREZDMjMxMkVG
-NDlGQ0Q1MDE3MzI4NzVBOTYxREZBNzVERjJBRkVDMDcxMUREOEEyMTVDNjlCOUVGREUwOTVF
-CkIwMzI2MUM2M0M4OEI2QzY2QzNEQkVEQTIyMjM0MjA3MTMxOTJGQzM4QUYwREQ5QzRFNDJG
-M0JBRDlFMTMwNkFDODQ3MUFGQUI4OTUxQwoxMENDM0ZBNTFFMDk2QUYyOEQ3M0ZBQzVDRkFG
-NDEwRjgzRURDMDhGN0FGODZBMjgwQTIzMzY3NzQzRkVDQTcxMDZFRTBENDYwMjYxQzkKQUVE
-RTgyNkQzQzFCMTZEQkU0QzBERTBFRkY5Rjc0NENBMjYyNDZERkY5NTBCMEZENkYxNDYwMjUw
-M0Y1OEE0RjNCNzc2RDk0RTNDRjQ3CkNEQTAzQzA0RDMxRTcxQkQwMjgxQzJBNjZGMkQ4MDIx
-QTVFQjI1MDBBNzBENzNCNTU1MTlBQUI4N0RGRDk0MTQzQTYyM0ZCMjUwRDBDRAozMUIzOEQ4
-RUQyQzVFRTVDNUE3OERCMDIyMENDNUEwODEwMDNGNjhEODM2N0YzNTAxMTVGREIyNEYyQTE5
-MUFGRTg1QjlGOEM5REE2NTQKODRDM0ZEQzk5NDg4OUY0MkQ1NjE2Mzg0MDRDQUY4OEI4MzFF
-NjVENkQyNjIzQUE4RTgyQTA1MERBNzI3Rjg4NkVBQTdEQkM0MDEyQUNBCjUxRkIxNUNDNDgw
-MTZBQUY5RjgyMDEyRUNDNkIzQTRCNUM5RjYyODc5NTg1OERCNzI1QjgzOTc3MjI3NDlDMUJG
-MDY4MjY4M0E4Q0Q2Qwo1NTE4NUEzMEMzQTIxOTEzNkM4NTMwQ0MzMkM4RTU3Q0QzRjY2Njc3
-NTQ5RUYzQTlDNThCMDM2QzJDRTIxRUEzQUVENTg5MDAyMzAxNzYKOEZBMUNGRUUyQTVBRjQx
-NEEwOUY1REMzQ0E3N0M3MEFDMTU3MjBCQTA4QjVDNDk4QTVDNkY2QzUyMUMzNjQ3NURCNkU3
-Njc3ODE5Mjk1CkFFRUY5NUUyRkM4OTFFMUM0NUNFNzI5QzhBMTAzMkUwMjIwMUMxRTExMkRC
-RDc0QzMyMDNFMkZCRTM4OTMyMkQyNjZEQzJFRTE1NTE5RAoxRTdGMDkwN0M2MTVGMjI4NzMz
-RDI0MjdCNTVDMEQzNzM1QUYyNUExNUYwRUIwQTdGMzM3NDc1NTQ1NDg2OUNGOEQ4MjVDOThC
-OEVGQTIKNDVBNDRGQTcyNkFDN0ZEQ0NBMUI4NTg1QTZFRTY0ODk3NjQzMTM3QjY1NjhDMEQ2
-RUM5ODU5MDJDODcwNzgzRjI2MDJENTcwMTc2NTkwCjBFNzlGQzdCQzVBNDBEQzI5RTk2RkU2
-NTU3NUNDNjNERjFFNEYzOTQyNUIwRUMxMENDMzcwNDVBMEI1RkFFRDI0N0MxN0VGOTE4MDQ5
-Mgo0Qzg4OEEzOURBQTFEOEYyOEYyQTY4MkE5QTUyMkQ1QjhBRTY2NjhDMDJFOUUwNEUyRkRE
-OTM2RTJBMENBRDFEQUMzQ0NENkUzNkYwQUMKMUQyNkY5QkIyNTZBN0FCREQwQjUzMkI3QjQ4
-N0MxQkNCOTNBNjExNDgyMUExRkM4NUVBNkRBRTRGQTg4OUY1NTU2ODBBOUVCODkzQjJCCjhF
-NjBGOTk3MzQzODNFQTA2MDVBNDhBMkJFQTA3NTJEMEM3QTQyQzM2RDBFQzI1MkE1MjJFNTUz
-NjFCRTQ0MDlCRURCQkM1NTAwNDI4OQpBQ0VGQzhFMTFDQzk4OTYwOTUyMUNGOEY1NTYxMkYy
-NTAzMEM1QTM4ODM0MEZDQ0E3OTFGMUU0QzE0RjJBRTMzMzM1ODFCMEQ4MTkxMUEKQTA2RDIy
-RTQzQTVDRDU2NEU4MUVGQzA5OEYzRDhEQ0QxMDdEQzg0QjI3QjZDQUFEQkY2Q0VCNzM1Nzgz
-Q0Y0NTM5NDNGNjA4OTc2NjBDCjgxOEUxNDU3MDE3QTU2NTEyREFEODBDNjQ4NUY2NzQ5NzI0
-QjgzRERERUVFMERDNThBMEZGRjlFQzcxRjBGQ0NEOTNERTlCMkRGMDcwQwo3NjZDRjFDRDMw
-NjI5NjJDRjFBRTIyOTlFQ0Q5MDkyNEE4RDdDNDg2NDFBMDc2NEQwMDBEQkNGQ0JFQTMyMDVE
-REZGNjQ2NUMxNDZFQjIKMkU5OTA3OEVBNkNCNkY2MkQ2ODdCRDczMUU1NkVFNzA4MTU3MDkz
-NUZCNDNGMzlGRUVFOEY4NkVGOTEwRkYwQjk0NENFQTg3ODk5MEFDCkY0NkM0ODZCOTc2RDhE
-RkU4OTA1QkFDNkYyQjAxQzY5NTQxNjZGNTA4NkM0NDgwNEM3RkY2NDBENjg5Njk3RTFCRjZF
-Q0QyRDZGRjIwQgoxQzY5NUM5NkM3OEI5MjM2MzBCOEMyMDY0RjRDRjU3NDI0OUJEODEyNDk4
-NUVDQzBENzYyRUQwQkZCNTJFMjA0MkVCOTAwMDEwREFCMTgKMTM1Mjc0MTA5RkExMDE1Nzcx
-MEZGM0I2OTVGREEwMjExRjJEN0U0Q0Y3RUEzOERCRUQ1ODVGRDRBNUE2RDRGRkY0NjBGQTJD
-MjJBQjE1CjA1MkQ0MEVGNjBBMzVGMzYyNjU2NDI1MDJGRDBDMzdBMjY4MTMwMUM4NjA4MUE0
-MDE2RTk4MUUzRjZBMTg0QTUxMzNGNEExOTZGMzVENgoyMzQ0MENGREVBOTlGNThDNTFBOTc0
-QzE1QTNBNkI5NkVGQ0EyNUQxN0IwMDgxRTY0NDFBQjJFREZBMjU0ODU2NUI5RTcxNjQyMjkw
-QkQKN0MxQTcwNzdEQ0IzNDYxNkE4RkZGMzVFRTRFQUUzNjI3RDJGMURBRjUyMDIzRTE3QjE4
-NEVFNEY3NEMyQjZGQkE2M0QyMUZBMzQzM0YxCjQ0QjUyMTU2NEI4MUZDMkIyMEQ2NDIzNkRF
-N0ZGQzA5NzgzNUFDM0Y5RTMyMzYyRjA0RTMwNjFERjg4QjZBOTkwMUMzMTg0MEUzMUJDMgpD
-NTkwNzA2QjRCNzM0NDE2NTQzQzNCMjQ3N0U4MERDMEY0RkU5NTE4N0IzNkU1RUJFMDIwNzUz
-NTBGRkY4NjQ4NkM0ODU0NDNENDhEQ0QKMUZGNEFGMTg2MjQwMzAxMUVBNjMwQTA0MDM0RTBB
-MzRBQTdEQ0QxOTI2QTJBNEExQjUxNjBCNzhCMzEzNDQ1MTYxRjBBNUJBNjU2RDBCCjY5QTI1
-RjlDQTMyQkFEQzJBQjBBNTA3NkQ0QzYzNTdDMzkwM0E0RDQ1NzQxRDQ0QTVFNDAwMEY4NTEw
-MkZFRkY0NTEzNzU5NUM0MzhCMgo4RkMyQTVFNUVDMkE5REYzQjQ4QjA4QTk5RUMyRUE3MTVE
-RTIzQzM3QUE2MDNEOUZDNEZENzZBQUIxQTM1ODMyNjM4NzY1NDRGN0FGQ0IKOUI2OTlDQUE1
-MTc1NUIxQzQ4NzFBODc0NkZGQjYxODMzMzlBRDg1M0MyOENFNzIwN0U3NzJGMzI4NkY4MDE5
-MDg3OTVCRDhDNzAxMDMwCjBBRjE1MzQ1RjU3NDY4NEQ4NzgwN0E4RDBCRjdCMDE1MDMwRTky
-MTE2RTVBMDlDREIzMTU0NjBCQzNCNTk4RDU5RUQ3RjNCNTUxQzFGNwpDOTYxNTJERkY3QkM4
-RkQzNTZCMkUzOTFCMENCOTI3MEZBRkI5ODZFMTFDOEVBMjM1MEI2NzJCRDZBQTM2RjA5NjdG
-NTdERkU5OENFQkYKQTlBQkZCQzdCNUQyRUVFRTk5NTM5OTUxNjk5QkY5RURDNUNGMjFCNEU3
-QzY2QTkyRTFDNDhBMDIyMEE2REUxREMwODQzNUJFOTRCN0VFCjkyQUQ2RDQ4MjI5NjNGRkY4
-MTU2RTlFREY1MjQxMzJDMTdGRDIzNkUzNTU4MERENkQ4MUEyMDFCRjgwRjJEODkzQzlENTZC
-NTM2RjRDRAoyQzA2M0MwQUE3MzVDRTg0NDEwMTdCNDk2MDI3NTNCNzc2QTI4QkE1MEUzMzQy
-NjgxQzY2QTg4MUJBRUQ0OTRDMzFEMDY1NzA0OUU0NzkKMUMwQjE4RjcxOTBCMUNENEZGQkQw
-QTA0NUM5NzA0Q0FFQTkyOTJGQkE2QjYyQ0ZBMkU1Rjg2NzRCQjE0QUY4NENCQ0E0MkZGM0RC
-NUNCCkI1QTM3RjIwOTI2QjE3MDY2NzExMTYxNjMwOUUyQjBBNDQ5NEFCMkY2MjhDOUZDMEQ2
-MjZGMDJDQzlBQTg5NENEMkU2QzRGQkU0MDcyNwozNzE2ODA5MUFCOTUzNkUzRUU2RDBENzNG
-NTUxRTMwNTM4RDdCRDdGOTE0RDlFODE2MDQ0QjNDMzdCQjM3QjIyRjAyMjFBRDVGNzE1QjYK
-RjEyODhEN0U0REYyRkU0REFGNEM2NUQwOTdCMkE3NTdGMEVBOTc1NjVCODQzN0I0MkY4NjZG
-Q0MxQjZFRkQyRUZERThBRTlEODg4MTRCCjVCQkRCQUJBQUZCNjA2N0YxMzgyRUQ1QTU5Qzgw
-M0JFNUE4RjM3RERBMTk5MTc3RTFBRDBFQUE0OEUxMjQ5Mjg4QjY1RDI4MURFQjIxQwowNTFG
-QkVBNzE2NUFFNUVFOERBOUMzNTg5NkI1MDA4QTY4M0M5NkFDQjQxRjg5MURBRjZCMDdBQkQ4
-RjhDRThDMEI2MEYwMjQ0RDRGNDcKRkMzMEY4NEFEMDc5Nzk1RTZDOUNEMzVENTI1NUM2MEU4
-RTBGRjczNkVFNThCQkJBQzAxOURERjM3MDk5MkY5OEQwRTU5NUZBOTJFOTExCjc2NTlCNzY2
-N0VCQzEyRDJCMDExNThFNzgyMzFFNjg5MzZBQzgwMDNBMUI2MEIyMEE4NUU4OUY2MjU0NjEx
-MEUwOUE3NTE0QjQ0N0M3NAo0NDdENkM3NzA3RkVEQTM2MzZGM0IwMEM0NzBDRTBENEEyMzMz
-NkM1NkJCOEIzNTMyQzNEN0I5RDdFRTRBOTQ2ODRERDc4Qjc0NjI2MzQKMUY5NjgzQUQ0RDgw
-QTM1OEI2ODRGNTIyRTg0OTc1RDEzOTZGMDE2M0E0ODU4RkEyQzE3NTQyMTk3N0U2MkVCNTFF
-N0E3MzM3NThCNzZDCjZGMzc4QkYyMzU4NjBFODA4RDkwNDMzQkZGREUwMUVGMDk0ODAzQ0RC
-RTU4NTNENkI3QTRCMzBBODVFODNGRUY1RjQzNTNGQzFGODE0MwpFMTNBMjU1NjAwMjE2OUY4
-NjA0OTQ0NkQ5MkM1NDg1NkQyNUE5MEYyNzBFRjk2MzYyN0JDNzg5MEEwMTU2QzIxRjNBMkFG
-QkRDNDVCRDAKMEM3QTRCQ0U2QzA0QkJFMTkwMzJDOUNGNzJFMjYzOTVEOUEzMUUzQzVEQkQw
-NjFDNzEwODI4MzgzMEQ0Q0IwQ0VFN0Q2REVGQzBENjQyCkRFMzgzMzNCQjcyMTMyQzlFOTU2
-RkQ1OERGNEI0OEM3NEJBRTVEOEU5NzYwQUJFQTk3NTIwOTk0QTZGOThDNDJDMDE3NjAwMTFC
-MTlCOQpFM0RDNzk3ODlBOUJFNzUwNTI0NzdDOTZGNzgxRDMwOUM3Q0E0NDkzOUEzRDBBNDU4
-RUYyNUQ1NDc1Rjk5MzgwNDkyRTUwOENDMzZENEEKMkJCMUFGODdCOEQ3QjA2Mjc1MEQ4RkMx
-Rjg3Qzc3NEE0Q0Q1RURGQTBBN0EwNEU3RjlGMjczRjkwMzE3RTJCMDE3NEMzOThGM0U1ODNG
-CjA4NUFCNEU1ODIwMDg0NzAzNTI3NDM1NzJBNzZBNkVBQUEyREUzRDBGQjI1MTdGQUE4MzJF
-RUYwODc3MjFEMjA5MkZBNDNDNjE2NURBQgpGMDkwRjU5QkY5RTFERjJFQTQ3MTcyMTEyODVC
-NTFDN0NFQ0YzRURCOThCNEY0MTdDQTAxNTY4ODhGNEE5NURFNjdCNzMyMTkyNTZFRjUKNEY1
-NTMwMzhENERCREM2NERGN0I3MDRGMkI4RUE3QTM2RUE1QTQ2NzBFM0ExMkNFNkUyNjg2REI4
-RUU2NTFDNkY1RjMwODcxODM1MzA0CjU0Q0FEQTAzNjMwREJBQjQwN0I0NTcyMzg0NkMzOTlB
-MkU0N0M5RjdFQUM5NUM4NkY0QUQyMTE5RDQ5QjYxNkQyODIwNUNCODgxN0U0Nwo0QTkxQ0NC
-NTg2MjlCQzlCMkRFMEExNDNFM0VBNzBERTI0MjlGRjgzQTI5NzJBREY0QjhDRUUwREJGMEIy
-MkJGNDdBQUU2NDM2MjdEQUEKNTY1RkY0NzNDNEYxRjdCREZEOEQzMjBFQ0U0NzIzNTJCRjAz
-NzE1Mjg1NUZCOTA0NjcwNUQ4MzE5RDc4QzNFOEQwRDZBMDk1NTY1QzRECkFFQjJDMkE2MjFF
-RjgxNjE2RkVBNDZDRjhCNTFEMEIyM0E5QTQ3QTlCNkE3MDQ2RUMyRjUyRTFBOUYxRUE2MTI1
-NzZFNkIwMjZDREUwMgo5Q0IxQTAxNjhEREU0QTcyOUREQkRCN0Q5REREMjUzNTAwQzY0NEUw
-RDRENjgwRjM3QTA3OTMxOUJERUJGQzlDMjQ3QzY3NUU4MjAyRDIKQjA5NjY5RTNEOTBGNkYy
-REZDN0M2ODk5RThGQzlFNDgxNjdEMjkxQkE5RDBCMzNCQTBGMUYzMzFBQjY1Nzg3MzRGMkE0
-RDI3QjlCRTQwCjkzQzFBMTM1MUY5NTBFOTlBODA1RTJGMTZDOTAwQzYxQjdBMUZDQjNCM0I2
-NkY2NkM1RDA3NDAyMTU5QkNEQkQxNUYzMEM1OTkxNzMxNgoyNTVCNzdFMEVCQUEzQjRGODFE
-NUFFRDQzOEIzMkJGODE1Qzk0NzcyRkREQTEyM0VBNEJERjI5MDgxNDIyQ0E5MzRBOEJFRkJB
-OUZBQzkKM0VCQTYxOTQyNjVBQzU5RkJFMEI1QkIzQkIwNTZFOTYwNTVBOTYxRDU2MjlEMENB
-ODhFRTBBNjcyQjk5NDY1NDJDQTFBRTgzRjFCQUQ1CkJFRUM1NzMzNkU0OTFFODA2N0VGMjYw
-RUI4QkRFNjM0RTgxNjNEMkEyNjNCQzgxNTk2OERGOUVCNzc3MDQ4NjUxOUMxMzIwN0UzQURB
-MAowOUE3NTgwMDU1RDdFMDRGQjcyQUUzNjRGQTUxNDQxMjJDRDdBNTBBQUYxODcwNTcxQTBB
-N0YxOUI1MjgwNTk1NkM3ODA2MkIxN0ZCNzEKNThBMzE5M0Y3Q0VFQTk2QTE4QTA1RjZBRTJF
-RDQ4NDgyMEM0MDJCRDBERkRGQUVBNDgyMzhFMzdGNDI4MzcxRkVGNzlBMUI5M0YxRjJCCkJD
-MDJGMkZEQUExMjZEODkwNEU2RTRDRUVFQUREN0Y2RUQwMzZBMkU3RDFCNkY1REE3RjU5OEZE
-Q0M3QUM3QkIxNzVERUM0NUQ0RkNEQwo0QTg2RTJFM0E5QTUxRDAwQjMzOTQ1REM3RTM4Nzcx
-NTMyRjNBNzVCOTAxN0FFQkUxRkRENzQ1MzU2RUVCNTRDMUMzMTBFRjZDMUI4NUQKQjBEMDlC
-MEM2MUJFM0FBQjA4MEI1OEUyNzkzODNEODYyNzk2NjgwMjY4NjI4M0I1MDcxNDMwMjJCQTI4
-MTE2NUJEOTk1NUM4MzNCMUZDCjY5QTNBMjA3MUE1RjVENjY0QTJFN0U5REJEQzg1QjY0QTQ4
-Njg0QTJEQzZFRTk5MTNCNTYzM0E5OEYxOUE1NDZEQ0E2NzI3MzYxMDEwRgoyMTdFNjBBQ0Qx
-OTQ2RDBEMUEyQjBBMzFBNjEwM0Q4RTc0MzhGQUY1NTQzNDExOTJFMkIzM0ZDMjJDNTc3NTc2
-ODBCMEM0NDE0N0FBMDkKMjdDQjQxRTQ2NEU5NEUwRTBERDhFQkVEMTg3M0Y5RkRDQTMxMkE0
-QUJGMTQ2NDgyMkRFNUU2Q0E3MjNCOEIyRjNCMjNCNzM2OEIxREEyCkRBREU4QzJCNThFRjcx
-QjA2OEJFQkEzM0RFRDFCMjc4RDNCODFEOEFENDRERkJBQjcyRDRBQURCQ0FDMUQwMUZGQTkw
-MUNDM0ZEQzU2RApEQkVGNDBCREVDNEJFQUI2NDkxNkY5Q0ZERjIxRjVCMTE4NDMzQjY3MkJF
-MzA4MjY3RjFBOEFBRTg1RUYyODA4MzRGRjhGQzYxMzhBMkMKNDE3NzNGQkEzNzYxMjUwQUY3
-NDRCQTA2ODZCNkJFOERGMzY5NzQ4Q0IyQTMwRUMzMzQ0OEFDQjFBNzA0RDFCQTAxQzIzNjVG
-QjEyMDdFCjk4REVGRENDNjFDREE1NEIxMjBBNzQwNjFGOEIzMjQ0RDEyRjZCMzFCRUZCRTJB
-QzQ2MjlFNkI4MDA5QzgyMzlENDI3REIyQUM5Q0M1Rgo3MEY1NDg3MEQ1OEMyODZDOERDRTBE
-RTg5QjZFMkQwQjYzMTlBRDFBMTBEOTFGMTNDOEZFNjFEN0EzQjJFMUVBMTlFMzhGMTI3MzNC
-RjUKMzczMkI0RjNGQzZBOEUxMkZCMDFDMEYwM0MzOEY2NDVFODFFNjRFMTYzQjRDM0UzREI3
-QjZERTAzMjFFNzg3MjZDMDc3NUUzQUYwRTY1CjU0QjAzN0IzMTkyQUJGMUQ2ODg4MTJCQkJE
-NEU2NDMzMDFCRkJERkUyN0RFNEM5Q0VEOEQ5QTcwNUM5NEEyMkY1OTlDRDRBQjcyRDUxMgo0
-MjNCM0Q0Mzk2QjQyQzkwMUM0MkI5NThDNDY4ODI2NzI0NDk0NDBGMEM3OEJCMzMyMzY4NjA3
-NzBCOTYwMDhENzg2M0QzNzREMDVDNzkKQjIyMUIyMDMyOTA2NDYxM0E3QjdGRTE4MjhFNUE4
-MEVDNDVDNjRFQjA4NTYzNTc0Rjk5MkI1NjczRTUzNDU2Q0EzRThENEZEQjgxRTE1CjZBODM4
-NjlCQTk1QzhBNkU4RUFCODA0NDM4RUI1QkM1QjZCNzNGRDQ5M0UxOEU0Qzk1RTIxN0I4NDdF
-NDIyQTk0N0Q5QURCMTRGRjBEMgowNjZGNDMyNUE1MEJBMDdGNjg4MDJEODZENTE2NTNCMjY0
-ODMyQjRENjEwMjEwN0ZFMDQ5OTRGOERCMDQ2NEMzN0YzQjBEQzg3RDQ1QUQKRkNCRjk1QjFC
-QjIwNjIwRjA3QUU0MjBBQTY2RDc1ODVFRTg0QTNBQjczRkM4RjFFNUZBQjNDRjJGRjM4NERB
-OTY2OURBOTFCMDEzMkQ2CjlCQ0E3QkMyMUVCN0FGRDgyOTAyQ0NEOUY2NDI4NDlCMEFCNjIw
-QTkwQjNCNTc1NTRBNTdDMTdFRUY1MUE4MzEyRjQyODAyMkQ1RUJFMApGMjNCNTJDMDZBN0Mz
-RjE3RDRCQzU2NzAwQzY3MDFGMkUwMDNCRDEzNDNCNDE2QUUzNkNCRTZENkQwNjJFQUNBRTQ1
-NjlGRDU1QjU5RDEKNTVFQjJFMDgwMUQ4QzgyMTIxMTNBOUJCN0JBNUJGNEFFODlENDM0QjJC
-ODM4QzkxMUQ4NDU0MENBRTFFMkJDOTVERDI4QTI3OEYzNTcwCjQwNEQ5MUQzQzE4QkU0NjhF
-NkY1NEJBNkI4NEQ2MzA3QTJERDU1ODdEQUQyMzBBQjIzODNFNjk1N0U5QUMxQTc1RUM2REIw
-ODM1RjI0OApDOUVFNDgwMzE4RTFCRkIwMEFCMEVDQkIxRjE2MDMwMEUwQjZCMkM1NjJEMUI4
-NTZGNTQ5Mjc1Rjk4RkUxNDgwQjk0MDlBMjZCQjU1REQKRjVFNjdBRUYxNjI4OEIzRjRDOUZF
-QTU4NEE4QUE2MTY2NEI3M0JFRTBBNjJBNUQ4QkFCRjE4NDRGOTdGN0FCRkI3M0IzQ0QxOTAy
-NUY5CkZFN0MwODlCOTYzMEJGNTVDMjJERDE0ODQ5RkIzNTQzMTIyQ0ZCNjY5QjUxNTMzQzI5
-Rjc4RTUxRjUzQzQ5NEIyMjAxQ0Q1RkRFQTQ4OApGMjU5QzU0Rjc5MTJFNzY1MzYwQTBEMTQz
-QjU5RjQ5QjkzNTAwNjA2NjIwOUQxMUZGOUY5NTQxRjExQUU0RjdDNzBFQ0M0RkY3OEZFOEUK
-MDIwNUUxRjk3RDkwRkFBQUQ3RDEyRTIzOUMwMDlDQjk3QjFBQTdGNzA3QjdEMDE4RjEyNTYz
-Q0ZGNjVBQzJGQjE0RDdFQTYzOTAxMDYyCjJENUUzRDJBNzRDQjhFRkJDQTM0REIyNDBEMTBD
-OUZDMUYyRURDRDQ4Q0UwOThBRjFGQzAxQzNGQjQ5QTI3OTU3NDA1REE4OTMwN0ExRQpBODc3
-RTFENEIwQUZDOThDRTAyMzVBQzJDMjFEMkQ3M0I1REJBQzY4QTBERDA3OTZBQ0RBNzZBMTky
-ODQxMkVFQTUwNTNGMUUyRUM3OEMKNjVENDQyNzdDMjU4QTlCMjExRUNCOEEzRDQ5QzM0Qzg5
-QURBOTk0ODJBREQzRkNGNUFDNzQ5NUFDNDgzRjkyQ0M4MDc0QUY2QjU3OTcyCjZCNDk3RDVB
-NDM3RTdEMzdCNENDNzkxM0ZFMjMwNDdEODg2MTUyQzA0MUFFM0I1RDcwMDYzNjQ5QzhBQTcz
-MzVBRDNCRkMxMDVCOTE0MApDNUM0QkVGN0REQTMxNTZFQjg4NDFBMDcwNjRBQTJBMEVBNUU3
-RTY4MjhBNjZDQjIyODRBNkQ1RDQxODlCNkRGOUJFNzQ1NTVCODgxQjYKRjgyNjkxN0IyRDA5
-REY2MzNGQ0FGQTUyQjZFM0E4QjBFNjcwNjIzQUU4MjVBNzQ2QkI3RUE5RUYzRjUyRUUwNUYw
-QTdFODcwQTYxNDAxCjk2RDUwQjBGRTIwNjQzNjcxNEI3NERDN0IzNjczRDkzNTZGODg1REFB
-N0Y3OUE3MzY3NjkxMkI4NDU3OUYwRjQ5NzhGMzI3Q0NCRTA2MwpEMDlEMjJEQjAxMjIyQUZC
-NDQzNDA0NUM5MEExN0QwQjUyNjY1Nzk1ODA3MEY3QTZBQjU1NTk2MURCNkQ3OEY0NzkzMzFF
-MzczMDVENUEKMjA3MkFFMTk5QzlDMzFCMTJERDYxRDEwRTMxODg5RTZERTVCRkRCQjUxQzkw
-NTQ4QkY3RjUwMUJEMzNERDMzQjVGNjc5RjhFODQ2MDA3CkJFMDlDMzkwNTBBQUYwMzQ2NEE1
-N0NBNzBGRDA4M0UyRURDMkJBRjVERDNFMENCMzc1REQzQTI3ODI4OTgyNzM1MThEN0FFMDlC
-NUFGRQoyN0YyNTYwRkQ3Njg5MTI4MkY3QjY4OTA5QzZGQjlGNTQ5QUI5QjRFNjY0Q0EyNTlF
-MDY1MkU2NkNDNThDMjUwRDI4NUZEMjUzNTY2MEQKN0M5RjRFRENGRDg3NEY0QUZEQzY3RDFC
-OTA5RTA1NzZEMTU5REU2OUZCQjREQTMwN0ZFMzdDQ0IwMUU3QjdDNjY4Mjg3MkZBRkZENTkw
-CjJGMzFCQUM2OEU2OENCM0EwM0JCODI0QjVGMzU2MTZFQzBFQjQzNDI3QkU3QjM5NzY5MDZC
-NkU3MkY5RDcwQjhENjk3NThENEQ0RUQxQgpEOUFCNDA1QjBFOUUzMjQwMEVCNkM1RTdGQjAw
-Njk5N0Q1QUM1MjY1RkI1NTcxREU0RDFFM0UzMTIzQTcyNUYzNzE1M0M4NzQ0Mzk0MDcKOEQx
-Nzg2QjlDMjQ2MzM5OTAzREYxODU1NjQ5RkYxQjk3QzkxOUE4MThBM0M5ODZBRUYyOThGMkM5
-MDFGNDdDNDRFNzI2QkNERDE2QURBCjJERTQ2N0YzNDhGMjczMzY0MjQyRTgyRTZDNzAyQzc3
-MUI4QjA2MTIzODBCQkRCRTI5NzYwRjE5MEVBN0VGOEYxQzJCOTk5MUI3MDFEQwoyRDE4MzhB
-QTgyODI4NTZGM0VGQ0VBMjc0NzE4QTM5M0IxMjlDNzY4RDUwRDcxQjU4NDlFQ0E2OENCMTMx
-NkZBNkQxQjgzQ0E5RkZCQUUKQzQ2ODE3ODM5NjI1OEUwNzczOTNGMEVBNkVGRDIzOUM1NTRB
-NzIyNTIyOTBFQzFDRUQyNDMwNjJCMUM0MjE0NzMxODVENEUwN0ZGQkE0CjExQTJBQTE2QTBB
-NjRBQTM1NTBGOTdENzc4QkQ3RkRBNjk2MkJEQTBCRDk2RjM1OUVDRUVEREEzNTA2MjQ5RkQw
-Nzk1RUFEMUI0QThENwo2OEJGQTE5ODk1NUYzNjBCRDFGNTdFRDlEOTM2RTFBNzY1RUIyQTEz
-RkQ3MzkyODc0RDFBRkI0NjE2MDBEMDc3QkVBODMxNzVGN0JDNEQKNzMyMzM0Q0U2RjBDODU1
-NjQxNEMzNUUzQThGMjYyNkVDRDg1MjM5OURGQjc4MzUyMEY5MTgwNzgyMkYzNEJGMUM5OUFD
-NUE4OTU5NEU1CjVDRTI1Q0E0N0Q5QUI0MTFENzRDNDg5ODQyQzg1MTA5QzEyQUIyNUIwMTA1
-RjZEODE2Q0Q5NjNBQjUzMjMyM0Y5MjM5Q0IzODYxQkEyMgpCMTExMzlGMzVBNEU5Qjg0M0Qy
-RDlCODMyREM4MUNFQkJCMDY0MDVCMEY2RjE5ODMyRTk3RUJENTZCNTg3MzlDODNEMkIwMTVD
-RUQyNzkKMjc2QzlFQUMwQzFEOTJCMTA5ODZBQ0I0MTBBNDZEMEMzQkQxNkIzNEI0QTQ4QzhF
-MkQ1RTQ3NDYxOTU5REIwM0QwRjJENzZBMzc1NTM1CkFFODgxOEVBRURFQzFFRUFEMTgxQjE5
-MzBDNTgyODc1MUZEMTAwMkExODA4N0EwM0QyODc0RTIwRUI3QzQ5QTAyOTAxQzkyOTczQzIz
-NQowOTAxREJEN0YyOTY1QkIxN0VENzhGM0NEMTI1NjhBRjE1QkYwNEM5RDM2NjM4MERDM0Mx
-ODRBOTdFNEE3MkU5RjhDQzAyQ0ZCN0VFN0YKNDk1NkNBOTI5QTZFMzJBQTJCMjgwN0FGMzcy
-ODk0QUYyRTlDMzdBMzcyRjUxRDlFNDVFNjg2MDFGRjZGMDY1MjQyMTBGMDU2N0I3NzlDCjk3
-NjYxOEEzMEI1OUQyNjlCODA4NzQxRERBN0IwMDM2NTkwNzIzNzQ2OTExMDFEM0QwOUQ1MDVD
-NjBBQ0JBRjdDMTIyQkY4RkQ2RUFENQo3MzI4RTYwQjY5MTY4MDgwNzE5QjZEQkZCRTY1QTMx
-QzI3RkEzQzQ1NkYzQ0ZGNEJFQ0Q2QjMyMDQ4Q0IyMEJFNDc3QkZEMzM3MUEwMTQKMEMyMkFF
-RkU5QjEzQjBDNzE4OUFCRkI0MzY5OUU0M0U1QjJENEFENzMxNjAxMkY3NTlFRTZDRDQ5ODI4
-NEM4MUFBNUFCQTgxOUNGOUY0CkM4MzNDN0Y2MkIyQUU3Nzk0RkU4ODhGMENFMEYwRDdGQTIx
-QTZDNkE4Q0RCMUFBRDgwMkZFNkQ4NTc3N0FEQjZEQzFDQzk1NTg3RjJGRApBODRBQzI2NUEx
-ODQ5RjY2ODczRjE0QkU4NDc1M0M0OTk1NjI1NzlGMjM2MTc1MUZCN0FDODA5MTA3RjAyQ0Qz
-RDk1M0U0N0VFRkVFREQKMzgxNzhGREE5MEEyRkQwMUI3RkFFNTIzOTVCOTcwQUI3QjRGOTIz
-MTc1RkFFMjk4MjhDRkREODI0RTIxQ0U5RkNDQkRCOURGOTg0QjFCCkY2NDBEODk5NUMxRDMy
-REM2NUFGMjhBODk5QzVFOTdCODI4ODg1NzA0RTY4QTBFQUY2MDU4MTkxQzFGNkQ3QzY2ODdG
-MjAxOURFOEE0RgpCNUY2NUEwNDY5QkQ4MjNFNzdFNkVGNkRGMTc3NTE3QUM3NzRERkU1Njg5
-MjNDNDc0QzlFN0M1RkNFQUE3RUMxMjQxOTYwMDkzQURDOUYKM0VDRUZBN0IzMzQ0RjVFMDY0
-QjhGRjAyM0U5RTFEQzE4NTY2Q0IxRkY5NjBERkJFNDcwRjQyMjIyMTBDNUE0MUVDM0U4RDRD
-NTZDRjlDCkI5OUU2OENGQjBBMjZEOUQ2OThEQkJFOTVENDA3RkJDNzdGOUFCM0UzM0I5NERE
-RDIyOTlDQkU0MEIwRjIwODY3MkFBRkJDMzZBQkYwNwpGMzlFQ0VFQ0UzQTJBRTBFREEzNEE3
-OENCMzg5OTM2NjhCNjA5MDlGRjFBOUZCMTBFRTc0MTZEOUExNkE3NzExQjc2QjdCQTAzRDAx
-MEQKQUUwNDU4MUZFMDFBMzc5NTM2RTRBN0M5MTNCNzQxRThBNjEzNUI2Mzk4MzAwQjIyQjhF
-MDdEM0IxNEE5M0JBNzYxOTVBQzAzQTFFQjFGCkUwRkUxRENDQ0QwNDhEMTYyOTRGMzY1MTc4
-RkE4NTNCRjc2RTdCOTIyMDdERjI3QTREMUVFNTg3M0M5QTQwRUJCNDJFMThDQjdERTgxMgox
-QkE1NEE0NzlFQzk2QTcyN0VFNTgxREU1NUY0NkY1MzZDRDk0N0ZFRDcwNkIwQzJDQkNCMkVE
-NEMyMzk5RkM4RDRCNjQ5Q0E1Q0I4REQKNkIzRDhBRDY0RDZCQjM5NUQ5NDVFMTMzRTI0QkE1
-NzM3N0U0QjgyQjc3QzcyOUFDN0Q1RUU5MTUzQjJFMEMxQUY0MDE0Q0RBODY0NzZGCkVBRjFF
-NTZCN0Q4NjQyMTgxNDA3MTg4NkVFMzBERDhFNkVGM0YzMUIwQjE3OTM2N0Y3NDVBNTI5MUND
-NjMwMEE1MzVFODI5MTJFODRCNQoyN0EyODNERDEzNjNDOEQ2QjUyQ0IyRkMyRkVFNTlEOTUw
-OTM5NUEzOEE0NkYyMzVBMUI0MzM4NDNBODdDMkYwN0E2NkJDMTIwMDY2QUUKQ0Q2QkMwOTM2
-ODA2MDUxMDAxQkVFRDFBMTM1OUU2MjZENzdBOTc4MjQxMjE5N0RFMTcyQkEyM0QwNzFFOTMw
-RDEzRTBEQkNGNTlDM0U2Cjc5Njc4MjlGNkM5MEI1MDBEMkQ3NkFFM0ZCNUU2QzkyNDBFRUU4
-OEFGREU1RjJDQ0IwNEIwMzZCN0M5RkFBRjY3OUU2NUM4Q0M3QzAxMwozMzlCNTZCRTI4NUQ1
-Rjk4NTQwOERBQzAyQUVGMTBBODY1RUQxRkQzNENGQzAzRjA4N0MxNzU1MDlCMkVFRkIzNzQ0
-QzU4MEIzMUIwOTcKMzI4RjM2MEU5OUE0ODBGQkQ3QTg3N0REQkU3NThFNjU3NDlBNzUzRUQ4
-ODAxRjY0NTA0ODhCQjgwQzUzMDNCMDUwMTFFRjVDNjgyMEY1CjAwOEI3MURBM0U2Mjc2MUI1
-NTk4NDNDNTlBQkI3RTk1RTQxMzY4OEM0MDkwMzUzOEY0NTI0MzBCNjVCQzFCOUNGREM3NzA1
-MUJBQUU2MAo5QzQxM0UwMzcwRTY0QjU3QzU5RTdFMDJCN0IwNzc2OERBODQzMjYyMjFDNjFF
-OEFEQzBCOEY3RTNCM0YwMjg5NzMzMEY4Mzk3QkEzMTkKOTRBMDc1MTE5OTk5ODkzNTA1RjVC
-NjY1QTkzNDk4RTk4Qzc4RUZBOEFCN0IyNjdCOTlDN0UwNzBDRTJEMjY5MjkwNTI0OThCRTMz
-NkJDCkVFN0E4MUZENDQ4NTcyRTMwMkQxNzc5QjQxM0E4QUFBRkMxRDAwNTQ2MUUzREQ2M0I2
-NEVENjk0Q0VBODJDQTk2MTg0MjFGRjQ2NUI4NAo2OTczOUE1RjJCREQyRjgwRkRDQzY0QTJB
-NkI3N0IxNjRFOEYwNDkwQTNGRTcxOTc5NzFDMEUyN0JEMTQ1OUM3Q0I3NTZCNUEzNDYwREIK
-RjkxNEM4NzM2RDdGRDc0QTQzNzE3NDFGNjcwODQwQzdDMTU0RDcwRUJBQkIyQjA0MERDODY0
-NDgzQ0JBMUFFOEI2MzBGMzg2OTlCRThDCjAzMTZCRjVFMjVFODFBQ0U2NDgyQjA4NEU3MEYw
-MDBENjEyMUYyODA0MzdFQTBFNDNCM0YxNEI1MDUyQTYxQkYwNkMzOTc0RTc1M0ZGNwo1NTdF
-MTFGNzBENzBGRTI5NjUyMzhBRjE1REUzQTRBOTY4NDI3MTM1OEU4MTM0N0FDREU4MjQ0ODBE
-NTEwMDYyMTE4NDA2NjFENDhFMEIKNzU4NjYyMDg2QzU2ODgwNjVBN0M1QzAzMjE3MTI0MDcz
-NDk1RTNFN0ZFRDcyMzgzRkNCOEFBMjQ2RjI5NzM5RDNBODNEQUFGOENCOTY0CkEwMjNERkQx
-MzFGMDIyMTIzQkZDQzc4MkNDMjM3Q0Q3QzhDMDYxMUFFMUQ4RkQ4Q0MxNTIxMUZBRUUxM0Q2
-OTQ4N0Y5OTY5NUZDMzJGQQoyRDJEMEVFRkEzNjcxRjU4QkU1QTEwNTE3Rjc4N0ZGQkEwNTBC
-OTQxMEQwREU0RTRBQzJGNjcxQTIzRjFBMzczMEY5RTUzQ0UxRjA3M0YKRjZEODI0RkQ0Qjc0
-MkI4NTA5Q0VDNzNBOEJDM0Q3OTAxOTgxRTVDNDYwNkU1REYzMUNDNDIwODIzNUZBMEIwRUQ3
-ODREMUI0NzE3MkY1CkI4QkUxQUU0NjBGRTE0NUYzREFEMjgzNTE2MUMyOTY5NEQwODc0ODdE
-QjdBMjNGODFBMjE4NjI2MDlFNzU2N0NEOTIyQkM0MzkwRUIxQQo2OThGMDcxOUFCNjZFQTAw
-MUU4OEY5NzE3NzY1MTY0RkY1ODJFNzVCOTM0Q0Y2NkVCQzE5MjFBMDBERkU2NTI5NDA1MDBD
-NEM1OEI4OUQKQjZBMzQ4NUFEODA3QjkwNTM0MjQ5NjY4MzM4NDdCOUQ5QkIzMDk1MzBBODFF
-MUVBODE4MDI1M0UxMDhFODRFRTcwRkZGRTgxODgwODcwCkVGNjk5MDhERjkyQTQ4MDMwQkY2
-MjQwMzA2NzQ5NEMwOUQ5OEE4OTYyNDBFODQ4RTNEQzQwOEZDNDVEMjM3Njc5RjhDNzE1QkU5
-QzAzMQozMTdEQjg4QThDMUUzOTg1NTgwQkVFNEI5QzFEMjA5NENCQjYyRkU2QTVENkM1QTM3
-QzM4RjgwQTQxMEQyNjdEMkQwQkQ1MDJGNjFDODkKRTkzN0M2N0YxNDJBRTg3RkRCMTM1M0NE
-RjI5MTA2RjQzMkY5REEyNDEwRjY5QkMxQjJBOUYyRjZFNTZGM0JFRDJDMzdCQUFDNEE5NUJF
-Cjc3NDZBOThCRDlBREYzRjQyRTgxQjc3QzcyQUJBNzM5MTk1QTE4ODUyMTQ1OTY0QTE4RUVF
-MjQyRjFEQjg1OEZCOTc4QUVEREVEQjVBMApDNzM1RjEyN0U2RjI2QjQxNDY3MkQ3MjdGRDAx
-NzU0RDFGNEU2RjFGNzYzRjZGMTQzODBEODNCRjAxQkZDNEU1MjVBNTEwNTc5QzVBQjcKMzA0
-MEY3RUZCMUJBN0UwQUYxMUQ4MTQ4M0UyOTVDNDY3RjU3NjAwRDlDRUIxQzkwMzY1MTNBNTFE
-RDJEMjNGRTVCNDYxQjlBNjExOEY2CjhCNTA2QkREMTM1N0ZEREIyNTREQ0JEMkYyODhCNERF
-ODlDMzA1RTAyQjY1NEVGMTFBQTBBOERFNTI5QjA5M0JERjc1QkJGNDk1QTU3NApGRTIyNzND
-OTgwMzZFM0Q5OTA5NTZDM0ZCODMyRDhBNTJFODQ4NjQ1RjFGMzcwM0E5MDdCREZFNTIyQTBF
-NDBBNDZGNjJDNjYxQzBCNzUKRTkyNjZDOURBREQ4MTFFQzhFRDZENjc1MUYxREZFNEUzMjdD
-RENCMEIzOTYyQzZBMkI2RDVBQTc4MEEwRkRFODE5QzE4NzAxMTFGNzg4CjAxOERENTNGMUE3
-NzI4QjQzMEVBRjFEOTU5QjNFMUE1MUFGMjZDQ0ZEMjZFQUU5QzQwODNBQUFCMjgzRDFCREY5
-NERCRkUxNzI1NUI1MwoyRUFBRkUxQTBCOUZCOTUzNUMzQTc2MTJDRUQ4MTg2ODU0NDdEMDRB
-RDk4M0MyOTlCRTBGRjEwMTIxQ0IxNjcyNDRBRjgzM0JGQTg0QTUKNTg1MzcxOEQ3NUZENTFG
-ODNFRUJCOTk4NDA3MDE1NzlDODU2NTU4OEMwRkI0MjkxQjlCNUNEREYxOUFGN0IxQzY3OTNE
-NzRCMERDODBFCjQ2OEFCMzU2NzE1MjY1MDU1MDUwRjRBQjU1NTY3QzY5QkFGREQ3RTYxN0U5
-MzVCRjY2ODJGOUUyQzRDQzI0MzI0NENDMjQ3MjY3MDE3NAo2QkEzRTc0M0E5NjAzQzQzMDk1
-QkI4RTZEOTg2MDA3MTdENDUyQzVEQURCMjM3MDM2ODg5Qzk3NzhGN0JCOEJCMTZENkMyN0I5
-RDg0NDcKOEU2OTA1QjUxN0JCRjYyNzQ1NUNDMjFBNTI0NTJENEQ5N0JDRTRDQzM4OTkyMkRF
-RDFFOTUwQzY2RjgzM0NBMUVDNEIxMzVDQTUwNEExCkYxMjA5OTUzMzhEMEMzQTlBODFCRkM4
-MUQ2M0ZGOUU2QzUzRTRFRjZBMDdDNTExMjE0RjVFNEQ3QkI5REQ2MDMyNDU0NTQyQUI2NDlG
-Nwo2RkYxREEzOEZGRjk4RjlEMTA0RjVFMDM4QzIwNzRDMkM0RDk3MkNGODREODEzQzVENTEz
-NkFGRDIwNEQxMENCRjJCNTg2NTA0MEMwM0IKMTg4OUFERkQwMEM4QUUzNjEyNTQ4NTY0NzZC
-ODFGRjg3MDRDOTRENkVEQ0U3RTlDNjQ0QUQ2OTc5MUQ1MTk3OEYxRTE4RjdENDNGMzIwCjAw
-RjYxQjA2ODM1MjMzRjlFQzczQUExRUZCQjEzNDU4M0MwQjJERTM5ODM3QTVBM0I2NTI4MjlD
-RTNFM0M0RkMyOUMxN0MzNzkyNTY1OApDQUVFRjUzRDU5N0M2NzVFNjA5QzE5Q0I1OUEwNTIy
-NEY0N0M3N0Q3OTlBN0VDNUJFMEY4RUU5NDI3MUFCNEUwQjJDNTU3MzdGRTVFMzUKNjkyN0RG
-QUYyRTc5RjgxNUMyRkNCOThDMTk0RjI3NjEyNjg0RTRDMzM1QjhBOTVGRDc5RUE5QTVDNTlG
-Q0I3NjFBMEQ4NUMzRDFGRTI0CjE4NjNGQURDQjdCODMyRkZGOUIzQjg5MkExRUUxRjAwQkNC
-QjUyNDIwMzVFNDBENjc4Rjg1NTJBQjQ2MTA1MzcwQjVEREM0OUQzMEZGMQpFMzhDMzg3ODEw
-MjQ5OUVBOTc4OUE1RTE3NjcwMTE3Q0Q0NDQ4RTVBMDREQTY4RTY2NzA1QzFCNUVGQzc0QjUw
-QUI1NTY3MDA4MzQyNTUKMjkwMjlDQTA3RDY0NUJFRjMwQTBCMTRFMTczOThENUJGNEZFOTBB
-ODE5RUEwMEIwN0ZCREM4NDU0RjkwMjIwMzg2Nzk5Qzg5RDNGNTU2CkJENkIwREYzMUNFN0VC
-NkQ2MzdCQUM1RUNFRjQyRDRDQkU0MzdDQThDM0U5NzUwQ0ZENTk3Q0Q1QTY2MTE5QUU0NURF
-MzQxODcwMkVCNAo3Q0Q3RUNDOTAwRTIxODNFMEQzQzlDMTM5QjhBNzU1MUI5RDVCREJCNEFC
-MTdFRUQ3NjVEMUNBQkZBNEIzRjUxMzQzNzhCMzBGREY2OTYKRkUwNjBCNkQ4MjNBN0Y2RDM1
-Qjg2NjUyNzYxMEIyOUI1RTY5RDU3MTFGQzgzNEUyQzYwQzExODU3ODg4RUJFMkFBOURDREI5
-ODVBRDVFCjQ0MDA3QUVCODlFMTFEQTA4RjY2NkIwNDk0QUJCRUU0QzAzNDg2OTJBNkE5OTAy
-QkI3RTREMTQ3NEU0OEE0MTA5MjhEMjE1NTk4Njk2OAoyQjQ4QkFBQzEwMDkwRjJGODU4NUQ0
-NkJCMTM2MTIyMjAyNDE3NjM3NjY0MzNBN0YyMzU5OUE0NjJDNUUzOUFFQjhEQjcxMjk5REM4
-RUYKQTI2OEVFM0IwQjhBNTIyQjVBMDg2MTk0ODNBQUQ2QTA0Q0YxMDdFMjY4REE2NzUxQUIw
-NDk1NDI0MUNBQjg3RjY3OUZDQjA0MTQwRDFBCjdCNEU2RUI2QTc1Qjc2NTI1QTg2QTFFNTI3
-Q0U1NkM1NDZFNkRFM0Y2QzQyQzE3MTUzN0M4Qzg2QjA0NkFGQTMzOEFBOUE3NkM5N0ZCMQpF
-N0JGQjE2MUZBNTdFRTM4QjNBNzVDMjNGREM0QjQ5QkJBM0MzNEUzNDkwQTBBMDQwRTU1NjlF
-MjQ1NkFFNDBEMjg5NDY3ODQ0MDhFNkYKMUM3NUQ4QkY4MTMxOUUzRDNBOTQ2QjI4NjdFODg0
-QjU4RENDOTdGODQ2Njc0QUM5M0YyNTcwMTI2NDgwQTA5MzJEMUNDM0RDQjk0RUM2CkU5MUFF
-MURDNEM0NDJBNTZCMTVCRkMwQjIyQUU1RTg2QTQwM0NCOEEyRTdFQUFBQzk5NkRBOEY4REE1
-RjdEMTQ1ODMwQzA2QTdCNTBFOQo5MTNBOERBRjYzRDU5Njg3MUMyMzJFQkFBQkZENkNCQUZD
-OUFEQkVERUQ4Qzc2NjJFQjM5QkQzMDZBOUUzOEM5Q0Y5RjcxRkQ3MThGQUUKRDg4QjQ0MDlF
-NjRBRkY3QjZFMDdFQUQ4MUQzQTUwNzEyMTkzRjlDQzIzNDMwM0M1NUNGREZGQjBBM0E3ODI5
-OTQyQzRGQzU1QTg5Njk3Cjc5OTYxQUM1M0NGMUZCMjU2NkE4NTEwQUQ4MTA5ODlENkNGOTA2
-N0E0RDcyQjIwQzBFQjFFOEY0NDAzOTRCNzFBMDgzRjg2NERFQTJCMAo0NzZCODA3NDU5QUVC
-NzdEMERDNjg0NTRGMjI2RDA0QzNENEJFRTU0QzlEMUY3RjkwMTNBOEFFMDFFMzc0MzVDQjkw
-NDcyRjM1Nzg2RTYKNEZCQjA3NzFCREIyRkNFMEFEMDU3RjkwN0RFREYxOEE5RDg3MDZBNDhB
-Mjg4RDgyQTQyMUQxMjZEQjQyMTExQzdCQ0EyMzMzQzdCQTkxCjBGNzlCNjczQUMyN0RDMkIx
-QzA0NTI2MjFGMEJDOEVBRjg4QzdFRERFRThFQTg4QTMxQjNCRDdBRTUwOUQ2ODk1OTEwMkU5
-RkYzQ0ZBMwpDRkU4MUJFREJDQ0RBNkE3NDJDMzEwN0Q1N0ZEQzkzRDRFRkIzMjhDODBBNUY2
-NTJCNEM1QjYwN0E3RDM2ODVEQTVGREQ1NEYyRjBEMjYKRjJCM0Q3MTk4NThFM0U5MDJCN0ZC
-NDlFMDZCMUI1REM3QTNBM0MyQ0U1RERDNDcxODE2QzczOUFGRThDNUE2MTdGNkExMDlENkQ0
-MTJBCjI5OUI3OEFGOTk3MDdBNjZENThFQzQwNjE1NUJGOUUxMzQwQjBDREM3RUNGQjRGRjFB
-RDNEQjBBMEQwNTE5RkJCNUVDNjUxM0Y5ODAxMQpERTBDMzdDNjVFOTdDQjdDQzZENjhDMjI0
-QjFENEFEOTZFQTk3MTI3MEJDOUMyMzA2RDBGQkQ2MUY1NzlEQjMxODI4OUVEQ0NCNjUzMEMK
-MzY4MzRCMzk2MERGMzhCQ0QwQjdGNzIzOUU4NEEwQTY0RUM2NEMxQzZDQ0MwODdBQjY4NTg3
-MDg2ODdDOEQwMDgzMTY4NjM5MTczMDZBCjlFQ0ZCQkY3MjYxRkNBRTc3RTEwQUExODExMkVG
-M0M0NjNDRDg2QTZCOENDQkZGOUU0OTdDOTREMTQyRjQ0NDFDRDMwREYwNzc3QTExNQo2RTM5
-NkVFMDU0QjBDMzAwMjFGM0REOUI1Q0RBRUM2NzU2NDI2NEYzQUEyRjEyQTU5MDBGOERBRDg1
-NTQyRUFFMDM0NEIwODZBNkYxN0QKMjhDMjNGRDlDQTJGRkIwRTc0N0I4RjdCNDdBRTk5NDY5
-RTVBRTg5QkM4RDNBRjgwNkMzN0QzRUJFRTc5ODI4Q0VGMjYyMjkzNjUwMzcyCjgzQzk2NDI4
-QjFBNDY4NjUzQzFFQzk2QTMxRkRFMjc5NjgxMzcxQzI2M0FCNUExOEYwRUE4NkU0NzExMUVG
-MDcyQzcyQUVDQUMyNTg0MQozRkQ4RTgyOEY1Q0EzOENDM0ZGRkI4NDcxNDhDNjhEQ0NBOTA1
-MUNDQzVBOTcxQzgzRjMwOTg3Qjg3NEM2NjQyNEZCOTEwQjU1ODgxOTYKMjY3MTk2MEE3QTk1
-QTBENTM1RDAwNzk4MEE1NkU1QUIyQTJDRDA1RTk5NEIyQzcxNTU2RjM4OTY0MTYxRDQ5NjUy
-NzVFNjcxMjMzOEM2CjE0RDQ4NDZGRDg2QkZGQUI3QUU4RDJCRTFDNThDMjU5RDQ2RjdDRDQ3
-REIzMzEzNUIzN0UyQ0ZGQTc1N0M5NzZGODYxN0I2QkIwMDdCNApFQzM5QjI3Nzk1ODYxNkRB
-RDEzQzBDOUZFRkY4OEY0QjBBRTFEQUY4NzdENzEwODE0NzRERkE0OEY2RjI1NzczNDBBODVF
-RjcxQzRDRDYKODY2NUQzNTUyMjlFODRFMzA4RDc2MjI0M0JDMEVEMzg1RjE4QUMxNEVCNjZG
-RDMxQUI2RjI0RkQ3NTYwOUYzODlCMDdDMDJGQUEyRjM3CjZBODg5N0MyODY5RjBCNENGMTYw
-N0RFMzhGRDQxQ0ZGMTcxQjBENEIzOUNFMkEyOEIyQzM5NUE3RkNFM0UwNEYwRDdBRTZGMEJC
-NUQyMwo5RTYyMERERTc5QjJDRkQ1QkRDQjU1NDBCQkYzRDJGN0M1QUJCMUY0QzM3NkRCMkQx
-NkJFODIzREVDNDhGNjRCRjkyOEVCODlGMURGRkIKMjI4NDVCRjk3NzQwQzAxRDU2QjMyMTMx
-MkYyNkNFODkwQ0ZGODk4NUQxNjNGNDA2MjY4QUU0MzE4QjEwMzEyNTA4OTMxOTI4N0ZCMTky
-CjNGOUZBQTg3N0RDM0VEODYzODYxQURDRkNEQUU3NjE4RkFGRkFCMzU4MTExREU4NDIwQTVC
-NkU1OUNFNkExQjQ4N0E1RURCMjhGQTgxMwo2RkM1NzMwNzdCOEYzNkZCMDAxN0UzMTE5QjU2
-MDIzQjJFMEUwRjI4RjQ0MjNDMTFBMjY0QjlCRUE1RTY0NDZBRjdFOTA5OUIxNEZFQ0QKQjI5
-QTBGODg4NEE4ODI4MDg3QTYwQ0ZCNjlGQkY2MzM0QzVDNkU5RDc1NEVERDQwM0JGRTAwNzU5
-NjFBRkY2RTk3NDVBMDQ3RjY3MTBFCjREOTRFMkM0MzMxOEU2RUQwQUE2ODBCNzA3Qzc2ODU4
-OEE2NzE2NjYwQ0I2NjM1MkM4RjZFNEI4MDA5QkI3NjE2MTFENzU1RTcyMjM0Qgo0NUJEMzVE
-ODRGNTc1NTk0NDFBNTcxMzk5ODMwQ0U0ODUwMDhDMkNEMzVDMkY1MEJFMzhERTc0NDNGRTE4
-NjI3NTZFNjU3NzYyNkUxM0YKMzhCMENGQjVFOTA0QzZBNTExN0UzNkE3QUVBNDFBMEJEQUND
-MjVCMERDQTYxMzgxQUFFMTM1OUE5OEQzOThCOEMwNEVEMzA2MEY5RTY5CkE4MTY0MEJFRTZE
-MkQ5N0MzMDAzMDY5Qjc2M0MxQTAyNEY0NzZDODIxNTU3Njc2M0Y0QzhFQTYxRDUxODJBQTNF
-MzRCMDNFODE0QzhBQQoxOEE5NTBDMEY5RjVFNzIxMkJCMDgyM0E2OTc3MDlEQTY0MzNFOUUw
-RkM4RDg2RkZCQ0U5NEQ4QjBFMjQ5QTYwNUU0RjNCMzhGQzA0OUYKQkJGNDAwRTlBMzIwRUNC
-RTEyN0FDNTBDQUE5RkIxRjVBQzEyMDdBOUU2RTdCRjQ0REM5NEQwMDg3MDlFNjk2NzExQjg3
-RUY3NDVFMTdBCjhENUIzODYxMUQ4M0U1RTI2RDg3MjBFRURGNEFENjQ1NUU4Nzk0MzI2RTNE
-Q0NCMDQxNjc5MzVDQjczOTg0QzcyRENEMDM2QjI0MTkwRgoyQjRGQTY4OTZFMDFCMDE3NzdE
-QzYwMzJDNzAxNzEzMjgyOUZFOUIzNzBDNDlDMjU2MjA2MDBBOTk5Rjg3RjFBN0M3NzkwRDA0
-N0Q5NjAKNEVDN0EwNzQ2QkZEMEQ4NUUwMkE2MjZEMTUxMzA5MjE2OTlBMzNFRDM5RDE4NjM0
-RjU2RkM4MTQwMkU1ODlFNjY0NEQ2MDU0MTJFNTNBCkZCMzY2RDVBOTk3N0UyMjA0RkY3REM5
-NDlGQjc1ODdFNzY5NTBGMDEyN0NFRkY4RjNDQURBQ0Q2N0QzRDNCNDQzMEUzNzVFODBGM0Ux
-Nwo5QzMxRTY5RDMzRjIwMzRENjJDRUY5NzExMkEyMjMwQTRFQUFEQ0EzNkM3MTU3QzQ4OTQy
-NDVDNkQ2MDc1M0FBQUNFQTYxNDlGNTY0NkQKQkVBNkRGNTc5MThFM0NFMjBBMTg0RDY1QzIy
-RUYzN0U2QzFDN0I2MTg0NTc0M0NGOEM1MkRFNDJEMTIxNkMyMjg3MEMwRTdBQTJGNUMxCjgx
-RjdBMTVEREM1NzAyMEEzMEFGRjhENEY2NDYyQjM4REE3RTcyQzFFMjkwMjFGMDI3NzIzNUY4
-QTE5OTA4OUI1MzY1RTdFNjdFNUIwQQozRkE2QzIyMDkxQkEwRTk2RUNGNDlENzE2MUQxMzRC
-N0ZEMTcwMTM1MEZCQjJGOTlCNTRBNTFCNDE4QjU2N0I1NjQ3RDdGOUFEN0I0RUUKNURENjcw
-REY4NDY5RkMxODc3NEU4QUI0RDZFRjRCNEY1NzUxQ0YwMTIyMEFGQTVDM0RFRkE1Q0ZDQzI5
-RjdDMTgxQjY2N0ZCOUM4NjMyCjVCRjRCQUMxMEFGMjM4QUIyRDJBNzQ0QTUwOTQyN0Y2NTRG
-OUI4NUZDOTA4RkREQTYwQjMxQ0M5MkU4MzdBNzhEMzg2ODRDODRERjM4QgpGMDE0NDMwQkM0
-OUEzMDQ0NTdCMkU3RDlCNzM5QjA5MDJENkJFQTA0OTJENkMxNDNCN0RDQjQ2MkJEQTdERjBD
-NTRDM0M3NkE1MkUzNTUKNEYzQTE3NDk2NTZEMTUyMDEyMTk0ODEwMkFERTYwNUU2NTk3OTM2
-RDdDQ0NBNTFBQjdEODBBNERBQUEwOTk5MkI5MDVBNDkxMDk5QUM3CjEyMEZFREE4OENBNTYx
-QTE5OUNBRjNFQ0Q2QUVDN0I5OTk5NEE4NDE2RUVGQkJGOUExQkRDRUM2NzFBNkIzRkY4REVD
-NTlDOURGRDc5NQpEREIyNDkyNDdCOTE4QkU2MzdBMjA0QzI3NUQ0M0RCNTUwNkVFOERDNzg3
-NTI1QjNFNjc5Q0NDRDNFRDQzQjU4MDk2MjgxRTJCQUIzNTgKQzUzMDM0NjVFNDZEQkVGNjk3
-QjVERDMzRUY4QTY0OERENzA1MzIzNEE1M0IxNzk1MzlDNDU1RUI5RTFBMTdCNzJGNzA3RkUz
-MENCOTVECjBDMjg5MTFGODY0MzM4OUNDNjk5NUM1OEM2QjgzQzg4QUZEM0M1OTQwNTJGMzcz
-Njc4ODJDMjZBODkzNkE0NzlFNDI2OTk3RDg5RkUwQwozQUI5MDkxRTQ4MERBRjkxOEJDMjZB
-ODdDQUVGN0JEMUM2NTgyQzczRjc1Qjg1RDU5QjcwOEQ5Qzc2Rjk1MzM3NjM0MUNCQUZEMjBG
-MUMKODg3NkY2RUU1MzhGNjEyODNEMDNGREFCQjNDQjI4ODhDNUYzOTQyQTY3MDUxN0U4RERD
-OThCNjIwNDM5NzAzOEI5NTFFMDIzQjQ2NTFECjhFM0YxOTczM0M4RDY2MTA4MjczNDg4ODFC
-NTcwNTcxRkEzNTlDODQwNTY4REVEQkFGRTk0MUI5REM3REFEOEMzRTFCMTkwNjA2NDIwRQox
-REFDRjM5NjUzMzdDNTFBNkJFQUYyRjJFNUVDNjBDREY4MzlFMkRFQzlCMTMwQzIzQkVFOUY2
-NUI0NjYyNkQyMDI3M0EzQTVCRDM5RTMKQkIyNDdCMURFMUNGOTI5NUM0MDlCOTFBRjQ3QjM4
-RDQ3MjAwRTBEQ0QzMTdCNERFM0FDRDc1MUU5NjdBQUY5REE3RjZDMDI2RDAxMTcxCjNFRTBG
-ODc1RUZEN0IzMUI3M0FDRDY2QzZCOTU5NDg0OTJCNTRBN0I5ODY1QjNGMzJERDcyMjkxM0Yz
-RDlFRkI0MEU0RjAzRkY5RTkyOApBQUUzQUMxQzRGMjM5REQ4OEJBRDUwQTJCQjQ0MkQxQTA2
-NjFCM0Y0N0NFMkJDQ0YxQTc2QTg2MDRDNzkxMDg3M0JERTJDMkVGQjQxMTIKNjBDOThDNzUx
-OThFREY1ODQ2RUY2RUJDMUJGOTQyNTBEMzRGNjQ2QTQzRDAwRTNBNDJBQ0M0RTNFMUE0NEEy
-QjBCN0ZENzQwMDNDNjFGCjAwQUJDOTExNEI2OTM2QTUwQzY3NTQ0RUY2MkZGQjJGMTlDRDFF
-NUFDNTVFQUVFNTQ3QzQ2RUQ5MUExM0M3NjAyNUFBN0FFOTVFMEIwQwo0RDI0MDhFNTNEN0VD
-NDg0MDlEMjFCMkRFQkIwNEM3MTIxNDg3QzUwQUM3RkE4NzkwQTJFRDU3N0E5QUI2RTQwNjNG
-MURCN0JEQzc3QkIKNDU0MkVDMTU1NzNDM0YyRTNDQjc2N0RFNTJERTJEQ0NFMDRGMzhBNThG
-MDZGMDhGMEE1NDFBOThEMzUzOENCNDFBQTVEQUIwNDUzOERDCkVBRDFCRDZCNDFDNzE1NDJF
-Q0Q4MzRGODIxODRBN0Y1MUE0QjUwQjU5NUU1MEUwNEE1MjM0MDk0MDQ5RjEwQTFFOTFCQ0E4
-QzJGN0JGQQpBQjYzOEJCQURGNkREMDJENDlCMkNDNDA2RTlGRDQwQjczNEJBNzcyQTA0MjlC
-RDk5Q0NEMDFGMTEyRTFFRTk1Q0I3RTlGNDhENUE5QkEKNTg0NjM2QTAzQjUyRjk0RkJDMDcy
-NEExRUQwRTVFMDUyMEU1QkFBNDMwMTc3M0VCOTg3MDlBQjAzNUFGMjhENjE1MjMwRDNFRTBE
-RURGCkNEMzMwNTZDRThDMjJBMUZDOEI3QjNDMjI1NkJGN0I3QzdDOEQxQ0Q2NjlBQjM1OEU1
-N0ExRjZBNDAwRDE4RkE1OUZENURFQjBDMjYwMQowMkM1OTExMjIxNkJDNkU4QzA4MTdFQjVC
-RTM0MjBCQTBDMkE0MzYzMDIxRTU3RkY4M0YwOUI1MDI2NTI2Qjk0OUJGQTMzNDJBNzBEQzgK
-ODFERDU4ODgzM0JFQTUzRTA2RDI5MjU0QjQ4MDIwMThCMDAyQjA2QjYzMzc0QTZDNkYzMzU1
-NjI0NzlEMDM0N0RDN0MxNEUyRTM4NzJCCjRDNEM1NUUxOThFQTI4QjM1QTNCOTRDRkE4OERE
-M0Y1MkMzQzE5MjQ3NUI2QzhCNjk2OEI0OUQyRkIxNjIzODU1RTFEMTY2Mjk0RTFFQQpDODMz
-N0IzREY5QjFCM0YyODExNDI4NkZBMjRDN0E1NjczMUYwNTQxN0M0MDg3MkRGMDlDNTVDM0U4
-MUQ5M0M0REQwMTdCQUM5QTJDQjcKNEFCRDEzRTk2MjJEM0M1MzNFQzYwQjRBNkMwM0UyNTNB
-M0U1ODZEODMxRDcwRTQ3NTAxQTFCNTIxRTJEQTVENjdCQjE5NDk1MDNDQkMxCjY5M0Q2OTM5
-MjUxMzA5MjhCQUVDNjM5RjgwREI0MjBERjEwQzg1NTMzODVFNzlGRjc1RDhCRDk3MDA0MTQ3
-NDc1NzE4NDAyMEZBMDNDNwo5N0VDRTEwQzhCNTRFM0FDNTZGMzMwMTQ0RjIyNTNCODE2NDQx
-RDc1RDBFQTU1RDczNDJFN0NENzRCM0I1MzExODk2QjQzRjRCRDFERDMKODJBNkE4QTBDMzc5
-OURGMjRCRTRENjU4RTZBQTJBQUM1MTIxNUMzNDk1QTc5Q0EzMjM5MjdBNjkwMzQ5NTlDQjAx
-RDU5NzhFRTFEQTlGCkIyOTg4NDVBNEEyQjQwRUZERjdCODU5OTYwOTQ3NTZDOTlEREEzQzgz
-NUVBQzM5ODI2QzA0OEZGRDVDNUM1ODJEODY5ODE4ODA0ODI1NAo2NjM4N0VDMUNCMTZCQzUw
-NjUzM0Q2MjRCRjIzMzNDQTU2QzM3Mjk1QkJENDFFQTVDODdEQUVDODBDMzY4N0MzN0JDM0U1
-MTRCQ0U0OEYKQjRBRkU5QkI1QjE2RTM2MzIxQjFDMEEyOUE0MjNBRDlBREYxNTcxOEJDOTQ2
-RDcyMEFGNUMyMEMxOTIyQTY4REEwRjM2ODM4RDAyREJGCjdDRjREMDE3QkQyQ0JCOTZBQjFC
-NTRCQzhCNzUxMzAxMDlBQjU3Q0U0RTEzNzEyQ0ZCNEZGMDk5Q0JFODI4MkMwN0QzQzYxNDE3
-OTQzMwpCMjYzNjk2RTdFM0U0NTQzRTQ4OUE5QkJERTBBRURFNkVDMEYxNzIzMjE0QUMwQzFD
-OEY2NjJEQzA1NTg2RTc1NjRENDA1RERFQTlCQjAKOUQ3MjdBRjVFNzVEN0E1Rjk3MEZCNDEw
-RTFEQUQ1MkJCMTNFNzlGQkZENzMzNDAxNTBFMkZBMDhFQkE5NEM1OTEwMEQ3Q0M3NkJFM0RD
-CjVBRjRDNTgxMUUxNzVFNERBM0M4NTczMjA1OTNDNUUzOEQ2NkU1NjVGMUMwNkZDRkU5QTFC
-OEM4ODVBMDFFQzMwMjFENEEyRTZBN0FFQwoyNENGODMyQTZFNzMxNzMyODM1RkMwQjY3RTRE
-NzI2RDhGMjJGQkVDRTVBQTY0RUY5NzI0MDdEQjQwN0VDOUY5ODc2QUFGRjJGQ0FDMzUKNEJB
-RkU0N0ZGNzVGMDZBMTdEMkZDMEIwNUEyOUVEOTYzQzczRjA0NjFBQTU5OUUwMDUxRTQ3RjU4
-NTRDOTc0NzI0QTVBNTNCNzM4OTA4CjI0RDBCNDU4QTI5OUE5OTQ4MDc1OTZEQ0VGMDdBMUU0
-MEM1RkU3NTU3RTk0OTlENkJGRjc3NEI3OTE2RjA0RDU4NEI4MThGMERBMTI4QQpGRjg1NkI0
-OTQzODVGOUE5QjJBRURDNDY4MEE2Rjk3MkUyNTQ0Q0EyNEU5NTI3M0QzOTRGRDVCRThEOTA4
-M0Y5RUE4MUE4RkJGNDRFRTIKOTQ3NzE3NjdENkZBRTYwNjE3Qjg5OTc0MTdFQzZCQzc5NkVC
-MDIwOUU2QjhEODc4REFDQTY0MUVDMzI5QjBBRjk0RTMwM0EwQUQ2MTFECjVFMkMyQzhDOTAw
-ODU3NzMwRDFFRjExRTIxOERGN0YwRUFDRjdFNTVGMTBCNUY3QzU2RTZBRjQxNEIwNjA0NTND
-MEVCRTQ4MTE4Qjk2NAo1NkQzOEM4QTkyM0Y0MkFDNTc5N0YxM0M4Njk1NUY3QzFGRkUyOTg4
-MUFCODI0NDkzNzdGM0M4RTlFMDg5NjdCNkY2NkZFOTI1RTlCN0QKNDc0Q0Y4MEJGNEY5QTI0
-RTQxNTgzNDg0QTBBRURCOEVEQjAwNzVERDNCNzU2OUUzMjYxQTE3MDZGOEE5NUM2NjIxQzYx
-RUE5OURDNjcyCjdCRjUwQ0E3NUUzNEE2MTJEMDA0QzdDQjgxOTQxQUE0NTBGQjgyNkVGOUE1
-MUFGOEQzRkExN0RGMUExODRDRUZBRTMzRjlDN0U2M0JENwowNDUyNzk1NDIwMEZFNDM2MjIw
-RjJDQUNGMjM0QkIwODhCNURFRkI1MkIyNDQ5MjM4QzA4NzVEMzk1RjhFMjJGRUFFRjA5NkVE
-QkYzOTIKQUZENkZGNkMwN0VEMDQyODhGQjczQzQwMUUyOUFGQzJBNzZENEMzRDAyQzRGNDg5
-NTVBOEYzMkQzMjM4NTczMzNBQkRGMzAyMkJBRUEwCkFFNkU0NTMxQzE4QUNGNzUwNDE2QzU0
-QzgzNEQyNUUyNDYzMzNDMTM0NTZGMkI4NjZCOTU4QjkyOUFCQjhFNDk3OTE3NjIyMzY1QjVF
-Mwo4NkZGMjM1NTc0ODc2NzY3NTg4Q0IyNEE4QzA2RkUwRDQ5NUFBMzI4MzVDQzYzNjVBNDgx
-Nzg4RUEyNDk3MkZCOEJFMTI2NTlBQ0Q4RjIKMjg3QzIzMTM5NjY0NzM3MTM1MTQ5ODY0N0NF
-RTlGNjJDMjY3MEU4RUY0ODc4ODUzMEJCNUIwMDZEOTNBMjlDRDRBMkUzNTREMkM4NUFBCjBB
-QjJDODAwQUFGQzgxRjI0QzgwQTU4QzZGQkJCODlBODg3MjYwRDAwQzU5RUY0MDIxNzZDODBE
-QjNDRjQ0QjBBMjgxQkM2MDQyQkRDMwozQUVFODhBRDhBNTc2NzRGNjUyOTAzODZDNzMxOTMz
-NDYwODJGOTQ3N0VCMDRBOTIxQjNFRTk2MDM0OUJEQUI5RTUzMjZCNUM1N0UyMjMKNTI3QjFB
-MzE3MzE4MzM5M0FERjg2MjY3RjEyN0I1MkM0OTMyMEI2RUQzNjI4NUU4QURBRDA3QzBDOTFF
-NDc5MzczNjk4RTcwOUExODcwCkMzQjlGNjY1NURGNEU1Qjk2RTkyRDBFMkYyQTE1QzVENkYz
-RDg4QUNBRjZGOTVFOUJDQzUyMjQxNzk5RUI3MTFEQ0UxNUE2OERENTI0NAo2RTgzMkY1MDA4
-NzNCMDQ1QUFCQUI4MTZFQjY4RkFBNzVFMEUxOEI1RjMyMDAyRjI4M0Q2QkUxMjE1ODI3NThD
-QTU5QTY1Q0E0M0MyOEEKNjhCQjlFNDA3RThGNzY3MTUyQTM1RThBOTBFNkE2REVFQ0JFRkVG
-QTJDRTc3OUJDQ0I5Nzg2MjI0MEZBNzJCOTJDMkUzNDI4Mjk0REM1CjRBRDRGN0M2NjExRTJE
-NkIyNURCM0VCNDk5NUU4OTRENUExNzg2M0Q0Qzg4MzA0RTc3RUY2OTY2MzNBRTZGMjI0MzQy
-RDM5MUY3RTNEOAoyRkRDMjRFMjg4N0Y0M0Y0ODM0RUJFQzNGMkIzMkFEMTMzOTk5NTgyMjU1
-M0FDNjhGREE5NTFEQjRCQzk1QjAzNTVBOTk2MTEzRTQ4MDAKOEEzODdFQjhDRERBMEM0RDBC
-MjQwOUJGOUNFRTJCMzdFMUY2RjRCNTVFOUJFMjA5NkI4REI1QTYxN0YxQ0ZFMTJCRjkxQTIx
-QkFDOTIxCjQ1M0U0MkU0REQ1RUNCNUE0NzkwNzhGRjg2ODhCQ0ZGNTZBNENENTA0N0FCRTFC
-QjREM0VBQTlGQTAzQ0Q0OEZCNEEyODNGQ0U2RkZGMQoxODg1REFFNkFGQkYxQzcyRTgzOTk5
-ODhDMEVFNjAxMERDNDFERDU5NjUzMEZBNzZFQUU1NjYyQ0ZGQTM1MTQ2QTc1RTU1NDQ0MDQ5
-REYKMUIyMEM2QTk5RDgzOEI2RjhDNDExQkEwMjJENTBBQ0M4NDdFRjk0RTUyOTA4RTgzQjYy
-OTNFNzE5QzQzRTJDNDJDOTUzQTdFQjEzOTVGCkQ1MkFBMUI2RTY2Rjc3NjRCNzdDQTNFRDM3
-QzYwNkVGQjkzMTdDRDI3OTI5NDEzMzQ1Qzc2QUVBNDYxOUMwOEE0QTAwRUY3NzAyMDBCMgo2
-QkU3MzgxNTk3MDk2MUFGN0YyRjc5MTRCNjRGODRBMUJENDNGOUQxODZFQ0VBODY1NkI4RUJE
-Q0M3RUZBMzVBRDM1RDVFQkFCMENBMDIKQTE5OUJGM0Y3NTE0NDc4RDg5RUJBMDdCMjgyRjAw
-QjU1QkVBOTBENEU4NTQzRkVBN0U2RDQ4OTk0NDA1NDg4MEIwOUVBREE0MURCNERCCjA2NTlC
-OEQ5NkNFRDY3QzhBN0MxOERENUM0MUM1MEQ4MTQ5RTg1QTkwQ0MxNzg3RTg2Mzc1RUNDMzg2
-MzY5NDIwREU3NUFCNDRBRUJDOApBMUQwMzREQzgwNDU0NzkzODlFMjMxODgyQkU2OUMxN0VF
-NTdFQUJFMDA4NDhGMTJENDA0RTBDNDQzNDBFMjFGQ0RBOTVFN0E3NTE1RDYKRjYwNkM2MDBB
-NDg4MzM3QjRGRTMwRkRFNDBCMTlGMzI5NEE4MTAyREJGNTcxMDlGNDk0QzI0NTlFOTMyNTc2
-NkRDNzEzNzVDNDE4QjExCjRCMDA2MjBCQjdFMkIzOENFRkE2NzkwMTAwNjlEQjVDNkI0Q0VC
-N0QzMTcxNkFDMDVFMEFCOEM0MTFDODk5MThBMTlGODk1NzhEN0JDNQoxMENBODZCQTk5NkY0
-MjYzRDJCN0M5OEFCNUM4QURFOEU3RDVCOTZENDY3RUE0ODQ5NThDOEI1MTRFMTc1NzQxQUY3
-MTUxODdGMEU4MDcKQjlDNUIxOUI2MzJCQjQyQjc0NTE4NzY4MTcxNDUyNjg3N0VCRkI1NjhC
-MzEzM0Y0Qzg2RUMzREUwQzZEN0RBRTE2NjBGMUUxMDQ0NTIxCkNFREU2QjhFRDNCMDNDMTYw
-MzFBN0RGQzY3QzMyQzg3RkE4M0E1RTI5ODk4Mzc1QTVBNUMzRjIwOEJCM0NBNzE4QUQwNkQw
-RTdCRjJEMQowN0U3RjY3REM2MzlDNUQ5NTZCNzlGQjIyQkRDMzcyODQ2NjQ2RjYwNzYwODU1
-QTRGOUYxMzVGNkNCMUJCMEVGRUVEMDAzM0IwOUZDRjMKQTM0RTFBQTc2NTYwRjM2MTE1N0Uw
-QzJBMTY3NUJEOTRFMEJERDFDNzI5M0U3Njk5NTE2QTEzMDRDRDNBMERBNTY0NkFDQ0M5NTQ4
-NTZCCjNBNjJEMzhFQTg3OUVCMEIwNzI2NDQ3RDBFMTk4NTM1MTI0NTUxQkY2Rjk4MjEwNTRE
-OEI4NDVDNDQxQTlDMjQ4MUUxQUMzRTU0MkFBQQo1NTM2OTFEN0Q2RTRCMzAzODU5QTUwODZB
-N0FERTE4MTA2RjE3NDc0NUYzOEY2RTMxODJGOTI2MEZFOUU5QzE5RUVGNDUzNTlENkI5REYK
-REQwMDMxRDFGODdEQTg5MTUxQjFCRTRBRjU0QjY2NzBFQkQ1NThCQjMxOEYyMTg0RUNFRTkx
-NTJBQ0EzNUUwOTk5NDBGMDk0QUEyQUM3CjU2NDgzNUU2OUU1QzlDNDdEQzdEOTYyNUFDQjFE
-NDI0M0ZGMUQ5OTNDRjg1NDYzOUMxMjZERDhDRTIxQTAyMjQxMTlBQ0E3MzEzNDZBNgo0QUM4
-QzE4QUEyMkZCMUExOTY4QjBBNkIwNUNGM0ExRDVCMjREM0VBQTdDOEQyMzc2RDQyMjkwMjY0
-M0QzRkFCM0Y4RTdEQzhCMjQxNjEKM0RCQUJCMTcwMjM4QTFBMTlCNEM4QTQ3MDNFMkIwQTJB
-MDMzRTcxNzIzRjU1N0MzMTREQjQyQjE1OUU3ODRCMTgyMkJFMUY5OTBEMTY3CjBFNTIyQjlG
-QjFCM0E2MDJCMTBBRTA4QThFN0UzQjJDRkU1MTIzNkQ3NkI3NDQ0NTZFNUE2ODk5NTI5NDc1
-OEE0MkYxMDA0RTg4NjNDQQowRDNBRTQ1NUVDQUQxMzUwMTY2OUExREI0MUY3RTg1M0JCMTUz
-MUE0Qjk0OUFBNUJGMEE1RTQ3OEE1NzA1RDVFRTQ1MTA0NzYwQzcyN0EKMDY4RTcwNTdBODA4
-RERBMzBDRkJDMDMxNTdFMTQxQUM1RTlFMEEzMTU5NjdDMjExN0VFREIzOEY5QzY2QTM0RTEz
-OEIyOUUzREU2QTAzCkMzNEQwQTM3NzQwREQwNEVGOEY5RDA4RTU0NUZERUJDNTcxMDQzQTAy
-MTY1RTYwODYzODlEQzdCQTNCRkZBNTJEOTRCRDRDMUEyN0I4NQo5QjhFQ0M2Nzk5NEVCRDM3
-MDI3MEI1OTk4QjhGMjQ2RUE0RkUwRUE2OTYzQUUzRTMzOTg4NDVBNjI4NTYwNjhBOEE4NzhC
-NkY4OTRBN0QKMjgwNDFCRDMwQ0Y0RjBCQkI1MDUzQUE3REQ4NkEyQjk0RjM3OTRDNzhGNjE1
-QzY2OTI3NDYyOUYzOTJGQjJEMzIwQkI4MkVEQTk4NDVBCjY2QjBFRjAzODQ5ODVCOTM4RkU4
-QTNGNDdCMDBDMkRDNTc1OTQ5QjhCOTMyRjNBRjQyM0UxN0Y3MkJDM0JCOUI2M0E4MTk0NUNB
-MTMzQgpDREE1RUJDOUNCOEI4Qjk2OUFEQjVDRTYwQ0E2Rjc0NkM2M0RBNUM1MTZEQjQxMEY4
-NkRCRjg3ODkwMkU3NTNBMzM4RDNGQjA4QzYwRTkKNDFBQzMwNERENzY3QkY0N0Q0OUJBN0ZC
-QTExMDM5OEJFMjFFMEY5RjAxQjZERjRDRDMyNTZBNzgwM0U1QkE5MzVERDZDREUxMTc1MEQ1
-CkRFRTA2MDdDMTRBOUE0REQwMzdCNjg1RjgzMDA5NEM1QkFDRDIyODNENTg1NEY1MzYwRUND
-OTI0MTA4RjRDMTI5MTc2QUY2RTYyNDQ1OApCQUM0MUUwNDM2OTEyQ0M1MjgxRUE5NEFGNzkx
-MjE5RjFEMDRDQTMwNjlGMzBCNTBBRTc5QkQ4Qjg1NzZCOUFCNzZFNjAzMzc4N0NFMzIKM0JE
-MjUyNDBDMDBGQTAzRkFBMjUzQkQ4M0VGQjhGRUNEMkRDNDVDMUZEN0NDMTk0RkI2MUNCQkVD
-ODgwNDdDRThBRUREQkQ5MjA2NjZCCkMyNjc2RTIxQTM5MTk5ODZGRDU2QUY1NDQwMjgwRTcw
-ODNGMDQ5ODdGMDI3MkJFRUNGOEYzQjUyNjEwMDcyMDM3MDJDOUY4MkI2NDBBRAoyRTZFQ0Y5
-RDBCQTgxRTVEQUE5NTY4OEQ2NTQ4NzNEQzkxNzdBMkU3MTYyREQyMUE3QjQwQ0IzQzg1QUI0
-OTQ2OUFCRjhGMTMzRjgwOEIKM0MyREEyQTUwMDhFMjVBMTNBNkQwRTQ5RkNGRkMwQzhEM0U1
-QTI1N0E4QzhENkIxMTI0RDcwMTdDQzAyNjNDRDk0RjUwRDMyREFFMTI1CkM2NkEwQUE3MTc4
-MzlCREFGQkU4ODkwODNDMDFENUU0MTk5NEI3Q0Q1MkU2M0E1RkJENEQ4OTYzMUE5M0IzNzcw
-NDBEQUU5OUM1QkRCRgo2OEMyMTQyRkZGM0YyQjUzREQ1RTE4MkZGNkFEMzRBMEJGNkRGMTlG
-NThFMDU4NDUwMTIzOTgxNTQ5NURBRDE0NERDRTc0ODc0NDg5OUEKNjU2MDAwRTI4M0EyMzdF
-NzRFRDU4RTI0NTJGMUI2RTczQTJEQzYyNkMzRTUyMTU1MDM2ODIyOTg0RTVFNzJDNjY3QzJF
-M0Q3OTBGRkFCCjVDMEE0QUFFMDMyNTg3MkFFOTQ4ODQzNzc2MkY0QzcwQkMwQTM2OUMwOTFF
-QUI4QTNFOEY0MDQ0NjRCOTlEMjZENkMzNUIwNDJFMTBEOAo5N0UwMjlBMTA0NDMwNzRDRjcz
-OTQ5RUFEMERDQjdFMEI4RDM5QkYzODA2RjM5RDNFM0MyMDQ1MjdDMTcxOThGMjFGQzc2RkE1
-QUJENkEKQkFGQjIxQzk0MjE0NjQxM0YwM0UwQ0RFMjQ3QThDQ0Q3QzcyNkU5OTM5NzZGMkQ3
-MzBFNDMwNTQyMjlBNDVDMEZFQzA5REJDQ0E5OEZFCkMyQzQ5QjJDNkIwMTVEMzQ4ODEyNTRD
-RjExMjQ2NTIxRDc4NURBMTJDNDhBNDczMUMzQUYxMzUzRjk5QjBEQjk2OTUzRjVFNDJCM0Mz
-NwpFQTQ2MDg3NkZEN0VCMDM2RjdCQzVEODYzMDM1NENBMTg5MDFDNTYxQTQ2QTlFMjAxQzMw
-RTYyRjIzRjNGN0IwRERERkY1OTZFMTNEN0UKMDBEMjU2RTY4MzM0OTVCQUZERTcyM0FGNTlF
-NzBEODQxQjUwMjgyNjFGQUM3MjNBRTRFMzdBREFDQjAyNzcyREZENjMyMUZFQjY1NzI5CkQ2
-NUNDRDU4QjMxMkZBNjg4NDNBQ0ZBQjdFREQ3OEQzMUFEREI3MzRCNjQ3RTg3QzdDRTI1QTA0
-MzZBMEQ0OTQ5OUZBMjcyRkNDODhGMgpFMENFNUQ3MzgyRDhDQkY3OTMwNDY3QUEzQzJCMUJG
-NjdFNjgzNTczREVCM0VCNTdEOUVFQTVFMTg1Nzg2REM5NzIxQTRCOTVBQ0YzMkYKMDlENUFE
-MkMwNjYyOTE5OEQxNUE3NEZENDFEODk3MkUxRkQ3N0NCNzFBOTMzRDIzNUUzN0U4OTNFMEE0
-REUxRDUwNzE3RTEyNTM2NUE5CkNCQzJCODI5MUQ3Mzc1QUUyMzQwODMzOTM5QkIwRjEzOUZB
-MzkyRjI5MzQ3Mjc2NkEyRUQ0MDUwOTVCRDk5MDY2MENDNkY0MDk1NEU5Ngo3MUY5NTU3RDU4
-NDI2NkM2RjNCRjQxRjRGRjZFMEJCN0FCRUIyNzJBRjk5RDBBNDQzOEJEQjRBRjY3ODlCOTA0
-MzFCN0RFRENDQjBENUUKMzVCRjg3MjYwMDY3MEIwRjE1QzE5RjM0QkNCRkM1OUM0QTJCRTM5
-NzhGNkExODREQjRBNDc0NUI0MDFCQUNCOEM3N0RCNjJEM0FCQjg1CkZEQTIxMjkxMjMyNUM1
-NUM1QTZEMzNBMjRENzZDN0JGNzJBNkE3MTBEQUE3MzkyQTdGN0NCMEE2MzM5NTA1QUM5MzVE
-MzQ2QzlCNUUyRApEMkU4NTYwODM5MkIzQTI1MjM3MzM3RUM4RjU4NTZCRjNGM0VENkUxNTE0
-MDUzRjRGQUNEMTJBOTREQUZEMUMxMjI0OUE2N0UzRjA4MDUKMDhDQkU2OTE2QjJERjNEOTQ3
-OEM3MzdBMTQxQUY3QzU0RTg4MzJERTgyMjgxNzM2NEVGMzYwOTY1OEM2NTkyM0VENjY2RDg2
-MzgwQjk5CkFERjdFQTAyQzlEQUUxMTFEQ0YzOTk4NzhDRUE2MEY1RDVCN0MxOEQyNDRBRTc2
-RDZCOTc4QkExN0REQjcxRDNERkMxMjI1MjIwMkIzOQo2QjAzRTM2RTM3NkE1NEUxMzA1QTAw
-RDA3NDQxOUE4RDA0RDUzQzNEQTgyOEEzNkM4RjQwQzQzOUNEN0Q1OEE0ODk2MkU3QkU5OTJB
-OUEKQTgyRUM4NTM3QjI2OEFBMTNGRDFCODgyNzVEODdCRjAyNDREN0I2MTUzM0IxNjczMEJC
-OUVGQTY0M0E1Qjk2QzRFOUMxMDc1NUE4NUE0CkY0QzcxQUM0QzNEREQzMDhERkZBMDY2MTYy
-QjhCN0Y3NUY3QkVDOERBNDBDNTE5NEI3NTk3MzYzODEzNDlBNjIxQzQwN0EzNEI5MDg4RQo5
-RUJFMzQ2NTA1ODJDRDc1OEUyNjk4NDczMjhBQzQzRUI3OUI1NzI1RkQ3RTUxNkI4QTk3NDI4
-OUQ4QzVCRTkwQzMwMTMyM0RFRUZDQzAKQTE4QUY2NjMyQUE4QjgwQzhEMTg4Q0VDMjc1QTkz
-RjY4Q0Y4N0ZCN0M2QzE5QkZGMkMwNzAzQ0ZEMTVFQ0NBMTYxNjBBQ0Q2RTNFMTZCCjAwRkJD
-Mjc2MTZDRTAwM0ZGOUE2MDU2OTYzNERGNkQ0Mzk5N0E0REMyM0FGQUE4QzJDRTlDNDQ2QjY3
-MzU4MUZFOUYzMEE5QTIzMjNFNApDMjhDN0M5RkJBMjdBM0I1RUFGQ0NBODJEODVCMDVDREI2
-QjM5QTdDNkIzNTg0RjQ4RjRFM0ExRjAxM0FERTQ3MDIzODMwRTQ3RUQ4QzkKNUNGRjNGNjQ4
-QzM4QkVBMUFGOTEzNUUxNkM4N0E0MjMxMTk5NUUwOUU3RkI1MUYwNkE4NzEwMkJGQTgyNjND
-MzIwNjdCMjZCMDk0MUM4CjRGMkY2MjAzNUQ1OEU5MTUzRDg5RDgwOEFCNzE1NDVBMUJBREFE
-MTgxN0QwREMyODM2QzYyMDRBMEEwNDE4QTJENjJFRkMyRkFBNjNDNwpBOUQwQTVDREFBNUYw
-RTQ5MTI2OUIxMjdCNUM3MTZDM0Q1Q0VFNkJBRTdGRDhDNEY4NkMwNjMyQUU3NTdBRUE1NUYx
-NUNDMEY5NUQ3Q0MKQzQxRUU5QjFBRDkzNDlDNEY4MUYwOTk4RUQxMEIxRjY4NjI3MkUzNzM4
-NjBBQzJFQkI5ODZDMjU1OERFOTg5REZBRDk1REJCRjlFQjU0CjU2Mzg0QTAwNzhDMTMzRTkx
-QUM5Q0Y1MzY1QTFFNzMzODM0QjA3MDFCNEZFNDM5NjQ1MTdGMEFBMUMwMTFCQjZBNzAyOUY4
-RDVBMjMzMwpCNjdEQTNFMDE5RjBEOEQ3RDUzM0FEMzI5MUMyQ0JCMUVFOTIwRTk1MzEyOEQw
-NkJCQzUxN0M1MThBRTlBMkRENDlCOTMzRTkxNUFFRUQKOTgxMEM2MTkwMzVBQkY5REMxNDdG
-NjUzQURCMTI2ODE2OTAwMkUwMzJBNDI1MDEyMDBBNjg1RDE5MDcwRjEyRjkxMzdCQjFEOUYy
-QThBCjQ1QzVCNTJGNTU3NzMwNUFGOTREOUM1MTFFNUU4MkFDNjdBMjIxNjQ4MzM0NzFDQkI4
-NjY4RERDODhEOUM1MDA5MTcxODNDNUUxNEE4MgpGMUQ5QTBBQTNERjJEN0JFNERFODQ0QkVE
-RTU1NzAwQTI0NzhFMTIxNTU1QzdGNjUyOUZGQkIwNTIwMjZDODA3NzZCNDQ3RjFGNUJFMEUK
-ODVBQUYyQ0YwOUJBM0IwOTE3MjUyRDY4RDY3MTAwNUQwRkEzMjhCRDIyNTU1M0Q5OEYyQzQ3
-NkUwODBCRThFMDNBRjRBNzY1MTU2M0ZCCkZFMDhDMjMwRjNBOTU2RjJGQUY3QUJGODY4QzA4
-Q0UzM0E3RkVBREJCOEU2RDZBRjM4QTgyMUNDRDhCNEVGRkMwMkZFMjNBMzdDNjkxRgo2OTI3
-RDQ1RjU3MTBERDVGQUM3NTA1RkIzQTBEQzMxQzc2Njg0MkI0ODJCQjc3RERCMzk5MDM0NkY2
-MjdFMEUxNjU3REE4QUJDOEVBNzcKOTYzRDZDQjgzOEQ5QzRFNThDOTQzQzNBMjcyNTgyQjNF
-NjM3NzEwNzBBNkY2MkJCRTdBNEIxMUI4Q0I1NTA1NDdFMTdFRDVERTZFRTE2CjFCRDkxMTZD
-QkEwRTBFRUU5MTBGOTg5NDhGNzQwRTdBNTQzMDE3NjcyMkJCQ0RDNEFCNjZCRDM1NDE0NDNC
-MDk2MDYzQzgzOUU1M0IwNQpBNTVFNzIyMzVCRTIyM0QyODZDNDMxOUZENUE1MTYzMjVDOEJE
-NDgwRDE4NjdGMjAxMzU5OTg0NEZEMjQ3OEIzQjUyNTQyODE1Q0U5NDUKRkZDOEZCRUFBRjlC
-MDcyQ0I0OTg4MjUzRUY3MEU0MkExRUQzMTVGRTJDNzU3MTM2N0U1MjE3QURGM0FFNEZCNjc1
-NzVDRjQ5QjFBMjY5CjE1RTY1M0I1QTg2RTNGQUUxQzdEMDRFMUFDMjFDQTVEN0U3QkRCRUEw
-RjU4Qzk5NjJCNDBBMTY4RkQ3QTI0QjRCRjEwOTY0NTQ4MUVCMQoxOEQ0OUJCOTlCMzU0MTc1
-NkUwREFDMEUyMzI3RDFGQUNBRUQ5RjdBNzY5M0ZDMUExNUE1NzE1RjFGRDFCRkJDQTdEMjMy
-RkNGOTY2M0YKQjBDQjM1MjU3MEE1ODA3RDE3MEU1QjZDNjcyN0Y3ODI4Rjg3RkRDOUQ5MzAx
-QTg0MkM1M0EzOEM2MkM4MDRDQkQ2MTE5OTJCM0ExQzhFCkM3MTAzRTc2Mjk0RjdFNkE1MDkx
-NkI4Q0VBODJCRTVCN0VCNzc3QUIyRTdBOEM5NTU0MTRDOEM2MUVBMzMwQkQxOEM3NDFENUVC
-NkUxNQpBNkRBNDZCMzAzNDVGNEQ1NkNFQTU5NUNDNDgzOEJCRjk5MzM5QkNFODI1ODIzMTY4
-NDc1MTNDRUY0M0I3REVBQUExN0M3RjNEQjgyQTEKMzQ3MUNFODFCRjc4OTQ3MjFCODBGODE2
-NUJDQzNGNzYwMUQ1RDNERjE3RDJGMzdDNThDNUU5RDg3RjM5OTBFODM4RTU1RThCRkY3MDg3
-CkJCNzlBMURGQzMyMTYwMkIzODZGOThEMUQ5N0NCQjA3RjZEN0IwNkY5MDBBNzdFNDg0N0ND
-RDY4OUIyM0MyNzdFNjQ3NjMwMEQ0RDlDRQoyQjVCQjVDQTIwNjJCRkYwRUYyQkIzRDRBQkUy
-QTlGOTkwRENGNzQ1NjhEN0NEQjcxN0U0Q0RCMDdCOTc2MTQ1MDhFRjM0RUU5MDFCQUIKQjQ3
-N0Y3NUM0MUIyQUFFQThGNDZCMjE4REQwREU1QkQ4MkYxNzE3Rjk2RTE0QURGOEQ3MzY2Mjc0
-RjNDMDc3NjgxRTBDRjMzQUREOTUzCjg5MjJENTM5MDc3QzU2NDMxOTA5RUU4QzFFRkY3NDY3
-QzlBNUUyMTUzNTAyNzg1MzRFNUE5MkM2QkVDNzJENEMzNEQ4RDEzQ0M1NDVCRQo1NDNCQkMz
-NzE0NDNGMkQzNDY3MzdBM0MzOTBBMEY3RTI4NEQ5QzQ2NjlEMzc0ODM5RDNFRDhBNDAyM0Yx
-Rjk5RkQ5MzU5ODc1NTAwNUIKQzJBMzRERkNDNEQxOUNCRDQyMkVENEU4NTdENDE5QkUzQjlF
-MTJFMDFEMDMyN0M1MUQzNTg5RTgzMzI1ODk2MDE4QzlCMDQxN0ZEODc2CjBBRUJDNUUwREM4
-MzY3Q0JBQjExQjI5ODlGNEVDQzFBRUY4N0Q5MzU3MjI5MTJGMTgwQTcwREZDRTk0MERFMzg4
-MkE0MTZFMjlCQTE0QQo5Qzg2RTc3MzgwQ0U0NjQ1ODNGMzg1RkYxNkY3RkJEQjYwN0FBNzQ1
-NURBNzBDRDhBMEQ5NzE0OTYzQkY3OTFEMkQ1RTJFNTUwRDEwREQKMTA1Rjg4REFCMUJDMUY2
-ODhCMUVFOEI0MDE1MUU1MzNCNkQ1NkZBQzNBNEE5OEJBRDg4MDE4NjQ3MDlBRkY2REZCM0Qz
-RUVENUE1MzJCCjgzRTkxQ0Q4MTI1QTdBN0FCNjY2OEYwNjZBQjc5NjgzQzZBM0YxMjlDNUFE
-QTk0MzFCMDZBQkYzN0E3MjQzODBDRUEyNTFENjdCNUZEMgpCOUM5NzMzNDI5N0I5REI4RTg1
-Q0JDQ0QxMzkxMUFGOERDMjQxNUQxRDhFNzgwNDgzOEQzRDAzRjlEMTQzQjkyM0Y1QzVCNThF
-MjhCNzQKODIzODY2NTA2NUExNUE1NEI0M0NFOTYwODlCOEU3REI5MDY5QjJCNTMyMTBGNUEw
-M0QxRUNEMkY4M0UxMDQ0QUE1NjFBRTY1NjgzQTQzCjlGRkEzRTFGQjYwQzFDQjY0RjMyRkE3
-MUUzRkI1NTdERjNDQUJEODdGRDJGOTQ1RUIzQzY5NjAyMjg4MDhFMUY3N0IyM0RGOEM3QjVC
-MQo4ODlCQjRDMjczOEVFNUQ2MDc3NTlDMzNENUQ2MTc0MTk0QUE5RjhGOTBEOTY5RUEzREFF
-ODM0QjM4MUEyRTA4RTVEQzlFQjU0MDY3OUYKOTRENDkwRjc3M0ExMDlEMjYyRTA4Q0FFNjBF
-MkU1NzY5MEU4Q0Y3NTZGOUFDMTEyODQ0Q0FDRTAyQUM5NkY1MTIzMUZEODNCQjlGRjcwCjEw
-MkZDRkUzRENBQ0M4QkY5RTk5QkQ3QTlDOUNEOTI3OUI2NEIzNjAyNDQyNjI0RUZGQTYwNjMy
-NkJGOTZEQjlFRUREMTZBNTE1NDUyQQo3RjI1RUQzRTc4QUNFMTVGRUEyQ0Y5RjFEM0M2QTA1
-NDFENDQxQTlEOTRFRDlGQkU5NDdBRjM1QjcwQjIxQ0RCQzAyNTI5QzI2NTA3MkMKOTk2NDJF
-REM4NzhEOTJBNzY2NEYzN0Y1RDlEQzE3M0Y2QzI4RjkwMDU4NkM0ODk2MDI0MUUyOTMyRjEx
-Mzk4NEJBNTM0RkUyNDU3RjQ1CjE2RTdGRUJDN0E3NjczRThCQ0Q0QzhCMDVBOEQ5QzczODE2
-NEE0M0RCN0Y1ODFGQUE4NzI0RDEyMDM1NTczQkU4MDBDMDMyQUFEQjIzRAo5QTI3N0JFQzM4
-N0UyOUYyMDFFNUY0MDkxQTREQUE0NzkyQUJGRkQ2NTc2MkU2NjM3RTM1NUI4ODM0NzkxMzcw
-REI3OUZGQkFFOTkxMDgKOTIwMzZCNTcxM0Y2NEEyODc1MDkyODI1NjE2QzY0QzY4MjdCRkM2
-MEY4QzBEMUVCMEZBRjA1MTYzNDhBNzg0NkI2NTdDODA5MDMwMTEyCjFGRTNCMEYxRUI5OTJB
-QkU3M0YwODQyQTVFRTEwRDY0MzY0NDc0NzEwNDRFQjdEOTI0N0IxNjlDM0Y3QzM3QjUxMDlB
-NUU3NjUwQUREMQoxNkU1MkMyMTAyMkZDOTkxNzU2QjkzRDIxMEM2NUY1QjdGNjdDRDM4QjQ4
-NjNGOTBEM0ExNzQyODc1REY4RTZCMjREOUUyN0Q3MjY1MjEKNDMyQ0JEMjI1RTBERjM2REMz
-M0I4RThCRUQ5RkU4OTdFNzcwOTg4MzJCOTE1NjcyNURDMzhFRTgyNTk1NDgxQTc2RDE2NkIz
-NzA1NUVFCjg0RUVGMTg5OUQyNDlERTQyODBGN0YxNUM3NkMwNDQ1NjU5NDlFOUU0RDQzOEYz
-MjdFMDUyNjVFMzRGQUY4MTJFNjYxNzcwNjU4RjJGMgpCQkJGQ0M5MzNBRURBRTdCRTE3QTQw
-ODgwQTE1MzQwOUMzNTdGODMwRjFGODQ3RDkxMTExMzU0NjhEN0EzNkJDQjFFNjlDQ0ZGNTdF
-MjYKMjBEOTdEOTg4NjY5RDczMkE5QTRGNEVEMEIxQjZCNTQyRDcyOUM5RDJGRTE1REQ4NTg0
-RUNENDU4QTEzMDVEQzcyOUM0NzcxNEI2REEwCjMzQTBEMEUyMjE1NzAzOTdGNjFFNjdDMDU2
-RjY2RUY1MEJFNTkxQTZEQzNFMzI0NjkwOEI4RUY0OTczRjc2QzQ0MDNCMTcxNzVCMDQ2RAoy
-MzBGMTdCOThBMjE3RDM0NkYwNzk2QTc3QjZGMTlCNEIwODg5RjA5QTAzQjRGN0JFRjNCMjQx
-MjE4QTg1QjVDMzRDNDQyMEI4N0YwRTgKQUQ5NDJEMEEyMzJCNjZGQkJFNDlEMjg2NEY3QUMy
-RTU2NTJDQ0U5MUMwRkE2RkFFNzk5NzFGMkQwMEU5NzIxNTFCNjExOTExOTBGOUU2CjlDQzdB
-NTFCNzc3N0FGMEVGQ0FFMEIyRkJCNjI2MjM1RDBCOTQyMTM0QTg1RUQwMTY4RDJFMEU1ODY1
-NEQ5NEJDRkFEMUQwRUFBREMwMAoxMTkzOTA1MjI1OUYxOTMzMjREQkE0NzlCRjU3QUZERTA1
-MjM3QTA4NDQ0ODg4RjA4RjlCQTExOTE3NUM3NzY0MDI0OTBEQjI5RkE5NkUKQjBCREM2ODRD
-QUE4RTBDQjQ4RUNDMEY0MEEwQzhGMThFMzdFRDA0MTIyMDA3Q0U0RTExRTFGRjM4OUVCQzdE
-RTlGMDc4ODhFQzFERUI5CkE1QzA4M0U1NzgzMEMxRDMwM0QwMzQ3M0NGNjQ5QzgzRDAzQjE3
-MDQ1RjNCNzRBMzI0NThGQjk2QzU4NTZGMDJCNzI4MjZCNjRENDg2NgoxM0M3RjA3RDJBMzQ0
-MUM3MTU0MkVDQzU2RDY1RjJBODBCNTc0NDYwOEQwRENEQzE0MjA0QkMwMEVEOEVGQjY3RjdD
-MzE3OTQwMTFDMDMKOTNDNjQ1ODVFQzhCNzQyN0I4MjQ2N0VBMzJBOTAyRkExQkRFNjkxRkM3
-N0NDNjE5NTJDNzJGODZCMkZCQTI0MEQ5RDBDQzU2NUQ4MDA2CjRCMEQ5NTI1Q0UwOUZCQzFG
-N0E2MTA0RUE1RjVBRjlDQUM0QTFDMTg5MkJGNzhFRDU1MDBGQjVBRkVDMjk1MzJBRTdFRDk5
-MUNFQzI4RApGOUIwNzZFOTVDNjRCOTFFMEQyNjJENEVBRkUxQzI3RTI0NEMzNkI1Mjc2NDY2
-NTJGNTRDMjNFM0JFNTlFNkEwQTJCMTIzQkIzMTAxRkQKRDkxQkIyRjNCMzEzQ0EwQjAwQjEx
-MzJBMzg4NjE3MkFEQTBBMjM0RDgwNUNEOTVCMkQKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAow
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwCmNsZWFydG9tYXJrCiUlRW5kUHJvY1NldAolJUJlZ2luUHJvY1NldDogc3Rv
-bmVzLnBmYQoxMSBkaWN0IGJlZ2luCi9Gb250SW5mbyAxMCBkaWN0IGR1cCBiZWdpbgovdmVy
-c2lvbiAoMDAxLjAwMikgcmVhZG9ubHkgZGVmCi9Ob3RpY2UgKENvcHlyaWdodCAoYykgMTk4
-NywgMTk5MCwgMTk5MiBBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZC4gIEFsbCBSaWdodHMg
-UmVzZXJ2ZWQuSVRDIFN0b25lIGlzIGEgcmVnaXN0ZXJlZCB0cmFkZW1hcmsgb2YgSW50ZXJu
-YXRpb25hbCBUeXBlZmFjZSBDb3Jwb3JhdGlvbi4pIHJlYWRvbmx5IGRlZgovRnVsbE5hbWUg
-KElUQyBTdG9uZSBTYW5zKSByZWFkb25seSBkZWYKL0ZhbWlseU5hbWUgKElUQyBTdG9uZSBT
-YW5zKSByZWFkb25seSBkZWYKL1dlaWdodCAoTWVkaXVtKSByZWFkb25seSBkZWYKL2lzRml4
-ZWRQaXRjaCBmYWxzZSBkZWYKL0l0YWxpY0FuZ2xlIDAgZGVmCi9VbmRlcmxpbmVQb3NpdGlv
-biAtMTAwIGRlZgovVW5kZXJsaW5lVGhpY2tuZXNzIDUwIGRlZgplbmQgcmVhZG9ubHkgZGVm
-Ci9Gb250TmFtZSAvU3RvbmVTYW5zIGRlZgovRW5jb2RpbmcgU3RhbmRhcmRFbmNvZGluZyBk
-ZWYKL1BhaW50VHlwZSAwIGRlZgovRm9udFR5cGUgMSBkZWYKL0ZvbnRNYXRyaXggWzAuMDAx
-IDAgMCAwLjAwMSAwIDBdIHJlYWRvbmx5IGRlZgovVW5pcXVlSUQgMzg3NzcgZGVmCi9Gb250
-QkJveHstMTc5IC0yNTAgMTI5NyA5NDN9cmVhZG9ubHkgZGVmCmN1cnJlbnRkaWN0IGVuZApj
-dXJyZW50ZmlsZSBlZXhlYwpFQjdFRUI4OUJCOTQ2RjE0MzczOUE4MzUyOURFMzM4MUYzNzg0
-Q0MwNDlEOUEyMzJFN0UwODg0RjBGMjc3RThDNkU2QjBDOTVGNUUzQ0QKREZFRkYyRjQ2MENF
-MDZFMkZDODVDNjg3QjI0NTJGNjY2NDkzQUI2QzU1QTIwNzVDNjFGNERBRkZCMDU0NzYzQjk0
-OTJFNjI0RjVFNEEzCjhGMTFFM0JDNzZFRERBQTVDMjI4QkNEMjBGMUJGMjI4M0U4MTMzRjA3
-RjVBQTkxQkZGOTY4MDg5ODVEOEMxNzM2RThCQzc1ODc4MTMzOApGMTJDQzYxODgxOUQ0NzZC
-NzY3NENCRjZBN0IzRjEwMjVBNzI5MUM3QzA3NEIzMDU1RjI4MjQ5ODQ4NEM2RjBGRjhGNjQx
-RDBDRjZGRjgKOEUxQUJEODMyOTYxQjg5OTU4MzhDOUMwRjZCRDA3NTkyNDUxMjg4NTQzOUI5
-MzY5QjM3QUJEOUY0NzRCRjg2NDZCRjlEQUQ1QzVFQzE3Cjc5QUI4REU4MkMzRDA5OEU2QTY2
-MzdEOUI0Q0M3MTc0QUJEREVGQkQzMTgwRjBFNjJFMUU2NTBDRjJEQURBQTdDN0E2QjE5OTFF
-RjlDNgpCNTA0NjY5M0FGRDhCMUNFQzcwRDg1NDA3MDI3ODY0RjcxNEU1OTlERjlFNEU2Nzc2
-Q0Y4NDY3MjE0REFCNjkwMkVENUI0MEZBRTQyNDQKODJFRDQ1QTdCRUNCMjY5NDE3MjcyODFG
-OEUwQjNDMTVFQzA0NTEzMzQ0MDA3MEFENzI3MzZGNEQ4N0E5NjMzNUNDQUY4RTZBQTM4MjI5
-CjhDQjdFREE0OUY5NjNBOUUxMTlDQjcwQjk1MjBFNUQ3QUFFREQ1NDk4RjBFRDFDOEIzOTAy
-NjM3RTcxNzM0QTdEN0UyNDEyRDVFQjc5MgpCN0I2MEJBOTM1NTYyOEJFRTNERkRBNUU5M0Iz
-MDI2RUMyODg2RDQwQjIyNjg1QzhFOUJFNUUzOERFMzFGQUI1NTFBOTc4RDA5NUM1NUMKRTNG
-RUM0RDZFRDY1QzcwOEYzNjc2RjRDRTVGODNGNjE0QzAyQzhGMTA5RjFBN0ZFOTNDNjAzMEQz
-MDMyMjdBRjBFRjg0M0M0NUYxNUIyCjI3OTc4NTJDRkVBMjZENzlBRTI5MzRFOEI2ODM3MzJC
-MzA2RjkxMjVBREFBMUE4MDJDOEI4MjYwNUQ3Mzk1RDBGMjJDNzdDRDFCMjBFMgowMkJDMDgy
-MDE1RTI5M0M4RjFEOEQ3OEEwRTQ1NjU1NDAzNzFFQjNCNTEyNTZCQTcyNzZCMkZBQkEyQ0RG
-NDdEMzRDNDQ1RDAyNTVBNEIKMjNBODhDQjQ0M0I5OTc4MTNFQUNFQkZGNTFGNUI4QzlCMUI4
-RUM1OTY4QTE4Q0EyNkJEQUUyRjAwQUUwMzREREJFNERERDU5OEVDRTYwCjUyQTlCQUVDNDIw
-RkUyNzhCMDhGNjRCRUYxMDY5QkQxRkQ0QUI4QjJBMTNFRDNERENGRjgwNzY1MDFCQzhBMDE1
-NjcxNUVDMTMyRjYzNgo3MTFFRTlEMEQ4Qzg5QzkzMkVFNUQxNkY4MDk2QTlDNDU2RENFN0Y1
-OTUxN0Y4NUZBNDA5QjYxMTBERkMyMkEyMzkxQTAwNTQ5MkJGRjAKQzg2MTBBOTIwNEQzOUFF
-RTUxMjcxRDM1NUNFMjAxQTU3MTk4NDIxMTJDODg2MzJBRkIwOTdDMzY4RUFCODk3REMxOTU3
-QjAyOTYyRTJCCjNFNDczMkY2NTI3QzI1QkM3NkFDMDQzQjczMDBDQjE1M0Y2OTcxQzAzMzVG
-RDNDNkFFNUFGN0M1REE1NjIxRDAzRkFFRkQzQjhBREI5OAo4MjcyQzYzODA3MDgyMTBCRjE0
-MDgwOUU0QTE5MTE5M0YzNTQ3QjJFNEQ0M0Q0RTk4MUY3MTQwQjk0NDczQjkzOUJFNDU4RTNC
-NjlCODkKMzNBREJCODJEQTgwQkEwMUIyRkY5ODc4QkU5MzhEN0UxRTRBNkU3OUIyMUMwQjUz
-RUU1MTBENjM3N0UxNzhFOEUzNTU2MTI1RTQ0RDk3CjMyRUNGN0E3QzU5MUFEMjhCOUM2NTE2
-MjlDQzVBNTZCRjYxMUUyQzIxOTlERUM1N0Q2MUMwOTlFNURDRUY1NTI3QjlCMjI5OUZBNjRE
-RgpCMzQxMDE5M0I3N0NGNjAzQTA3M0QwNzg1RTFCQTlDQjFFM0YwQUI4ODU5QTg3Mjc4NzY5
-QkI2RkNCMEMwMUVCQ0I0MEY4MEJFRUM0RUUKMDI4M0NCNDgwRTJCMzE4NjNDMjEyOEVENUFB
-OTU5NDRFRDc0ODgwNUY5QkJDNzBGQTc5RjdBNDBDMTc1RjhBNjU1QzExQzAxRkE5QzJCCjlF
-MEE2QThGRTVBRjVENkUzNDJFRDE1MDRCQzMzMkVBMEYxNzg4MDgxODA4QUI4QTQ5M0EwNzhB
-RUNBQkFCQjdEMEQ3MTgzQUQwQUJENgo1NzYxMTk0NTZEMEI1MEIwQUM2QzZDM0RERDQ0QzY0
-RDREMTFBNzZEMkMzRjVGQzUzRTYyNkIxMkU5MkQyMkI3NTdFODk3NDlBMUNFMjYKMkM4MUY3
-NjQ2RDlGMjRFRTAzNTBDMzA5QzBEOUE2NUQxMzRGQkQyMTZEM0VDRUI1NDg0NUJFNkZBN0Q2
-N0UyREQ2QjFGMTI2MkFFRUYwCkExMzRBNkU2MzlBMkUzQTZDODExMDAwNDA1N0JGOURBNDg3
-MjhGNTBENDg2MTYwMTIyRkI3REU2NTg3RDQzMjU4OTYwMDM2M0NCNzYyMAo3MjhFMTA0MDVD
-OUI1Q0Q3NTIwRjQzRjY0NzJGNENGNzFGREY4Q0Q5NUU3ODk1MDQyMkRFQTgyQkJBRDJBMzdF
-RkMwMUI3N0MyOTYwRUQKOUE2RjIxMzMzNDE4M0MzNEI1QkM4RjkwNUJGMzVDQTE2MDRGNTkz
-RjE5MzlCNzU4MjQyM0IxOTg2NEYzM0M3MjBERTZEM0IyM0IzRDgwCjY3NDc2MUNBNTlCMTU2
-MUY2MDk0RTQzMzcxNEVEQjE3NTIzRDI5MzA3OTUwRkU2N0IxMUZERTJBQzFFNDgzMDNEQkZF
-RjA2RUYxQjAwQgo1NzIwMUQ3Qzc4Q0E5RUMwNzk3NjAwMjE1MTMyQUJDMzVGQzgxODQwOTIw
-QTMxMUU4QzdCM0IxOTFDMjBGNzZENjY4RDA4MzhFNUEyQkQKNzEzRDhGRUFCNjhDRUFDMzY1
-QUZFQjk4NzQ4MEM1QTc0MkIzRjg1RDJDNkIzRERDNDZFMkJDMUMyN0IzMTZGNkMyRTk0NDg5
-RTZENkE4CjkwQThDMjJCNzFBNzRCODk3MjEwRTE0M0JGRDE3RUZGNTU4QkI2N0VGRDIxNEY2
-OUJCQTJBMzQ2QUY5NTMzODQwOTMxOEE5Qzk1RDhGNwo3Njc0OTg1NEE3Q0M0QUVGNDA0Q0U0
-MTUyOUMzMThDMjE2NUUyODIwREJBNkIyMEU2QzQyMzE4Mzk2NTIyRkFCODAyNzI4OUE5M0Iz
-MTYKOUZDM0VDRUFENjFEMDk5NTNEMjA2QTgxNjMwQkYxOEI2RjExRTI4Qzc0OEY3MUI1RkQx
-MDVGOTEzQkUyNkZDRTkyN0YwNjExQzdEMjAyCkFBQkE3MTRCNDdCNzU0RThFOEFDQTU4Q0ZE
-NzQyMUM1Qjg3OTNDODMyMzZEMzc1RUY1RUM1OUJDNzFCNUE2M0MyRDRGRDAxQUI3MjA2NAo2
-MzRBMzU5MkJGMTIxNEUxOTJGNTIzODlGNkFCNEE4OURDNENCQzFBOUY0QjI2N0EwQkNCNjEz
-NzQ4N0Y4MTNFRUEwQzYzMTBDRUVDRDcKREFCNzgxQThDMThFMDhBMUIyMEJEMkNERjU4REM3
-MkM5RDU3RUM0NzIyNTRBQkZCMTU3RUU1NEM5NjkxNTBERDk3QTMwRUM3QTc4QjlDCkY4QzE2
-M0ZBNjE4NUIxRTM5OUNGRDBCOTMxNkI3MEZDMTFBMTUyRjcxREM0QjlDOTAyQkQwNUYxQUE3
-QTY1NUVDQjFFNjlGRkJGN0NFRAo3MUI2NjQwQUE4QzUyOUFGODIyRkQ0RDE3M0NBQ0Y2NkRC
-MTlGMzVBQkEzQUVCQ0REQ0VFRUEwNjFCMDYwMTE1NTNCODZBMTI5MTg3RjkKMjZEMThGRDY0
-NDY2MDAwMUM3QzFFQkIwMkMzMzQ0RUYwRTg4RjkzQURDOEYzMzRFQzRBQkQxNUQ0NUMzMzIy
-MUE1QkJFRUM0OEEzMjEzCjJCRUMyNTdGNEExNTRFMkIwNDAxNDU0MTM4QjgzNDhDOUI1Mjc4
-OUUxRUNCNUMwMUY3RThCMEVBQjJBRjM5QjgxRkY0QTdBMDY5OTY0MwoyNjdENzhDMUI3OTQy
-NDNBRTdFNEE1RTU5NzJEMjY1M0JFODUyOUZGM0FERTE1QjhEMkQ5Q0VEQjVCMTI3RThFQURE
-NzREMkU0NUZCNEIKNDcwNEIyQkM3REM2QjkwMEE2NkI1RjE5RjRBOTJERjkyRDM0MzNBNzEw
-NEI4NjlFMzFFRUQwMTEwMURBRjlBRDVFNDI0QTg1NUNCRDJBCjlGMjQwNDJBRUY3NjcxOTYx
-NjY2NzRBRUE5QjREOEI4NzFGODRFQTc3NkVDREY1Rjk4MUFFQkI1OEQxMzlCMzNGMTg4QUIy
-QTk5QjgxNgoxRUZGOEQ4OEU2QTU3QzQ1OTU2RTdFQ0RGQUQxRDM1RDZGNTFCM0JENjJGNjlF
-MTVGRUE1NjQzNTVBMDU1NjNBMTMzREFFM0U4MjUxQUQKNkJCRTVDMkU1OUNEMDA2RDhGODdB
-NTFCQ0UwNzJCQzQwMDk4REUwQkRDMzA3OEMxNzA1Q0EyQjUyQzdBMzYyOTc2MkY1OTk3QzYy
-RUI3CjkyQUQ1MkU1RjUxQTAzNUE5NDcxMTBCNDFEQUYyQzNENDBGNDVFNUM3Q0RFMDlCNTM4
-ODBCMTYxNTkwQjcwNkRBRkQzQTk4NDM2RjgyRQo3OEU3RjdDMERGQ0I2ODA0QjcxOUVGMEFF
-NzY2MzdDMzhEMDJGODA3NURDNjNGRDQ4RDg1QUE4RDY1OThEQTFENDg5QkRBMkJEOTEzN0IK
-NTZFRkI2QkIzNzIyMUY3M0RFN0JCRjA3QTFFNkQ0NjU3QUM1NkVFMkJDQTUzNTY1QUJCNTcy
-Qzg0QTBEMDIzQUM5NDU2ODFFRUU1QjhGCjU2Njc5RTU1NEI3MTNFRjI3N0Q4NDNDRDk5NzJB
-RkU4NTFEN0EyMTM4MjRGRUJDQUVGMkYxNTlEMUQ5NDRERUZEMEM3RjJGRjAxNDU2OAo1QTBG
-NzcwOTM3NkZBNzc1NUZBMEU5RTJFQUY1ODI3RTJGMjNBNDUyNTAyRjBDNjlDNTFBOTJCRjAx
-QzNDQ0Y5NDdCNTYwNDE2NENFQjAKRjY1MTkyMjQwMTdEOEYwQUM4ODg3QzZFODNGMEZGQ0JE
-MERBQTU3NTIzRDIwOUVDREMyN0M2Q0RDNkE3MDlEMzg0QUMyNEZBMzM1MEYyCjcyNTkzQzVG
-QzA1RkNGQjRGMkVCMEQ1NDI0Qjk1OEYzRTVCODNEMjQ2MkM4RTMxOEE5OTRCNTBDMUUyQUUx
-RDBGRjc5ODgzN0M2RTVDOAoyM0Q0RDZGOEQzNDA0M0NGQjJGRTlBOTQyNzExOTgyQkMxMTRE
-MTQyNEI3RTM1OEYyOTdCMjI0RERDQzYzQUIxMzAzREM4Njc1RjEyQTcKQjM4ODM4RDhGMzQ5
-NUQyMEFGM0Q0NTIwMjYzOTdBMDAyRTExMkI4MjY2QUE3NkFBNEM4MDY2REY0MzY0N0ZCMkRC
-Rjc0RThEMzcxNDY2CkVGNkMwNUJCNENGRjM2QzNCNDZENjYxQkQwQkVEQ0E3NTNDQjA2REYw
-N0VDM0U4RjJGMzk0ODhBODdBNzdCOUZEMERBNDc3ODdENEU4NAozOTA1REVBQzJBODNGRUVG
-QUEwQzJGOEExOEQ3NTY4NTVCM0ZGMDIxODhGREE2RjU1NTE0MEUyMjM1MjgxRjFFQjBFRDBF
-MEY2RjI2NDUKQzM2QTQyMzU3OUE3RUQzNTI3MzhBQUQxQjU5RkRDNzI2MjMyNkU1ODBEMzky
-NkE2QkNGQjczM0RGNzBGRThBNTVDQjk0OEI3QjlDQTVECkZEM0VDQTU5OEQ3MjM4MDMzMjE2
-QzAzODQwMTgzMTc1OTJGMjZFMTcwODU5MTc3RDZFQzI4NUQzNjhBNzI2MjAxMDVDNEY2NDc1
-M0JCMwpDQ0RERjc4MTMzOTUyNDQ4RERFQUYxRDk5RDQxM0EzMTkyNTU2RDVFQ0RBNjA1RkY3
-NUVEMDYzNUQ1ODc0RjNEQ0NBNDZGQ0JCRENDNDYKQjg4M0Y3MTZCNkM0NDRENzhDRTI2REY3
-NDJBOTBEOUM4Njg3RjRDN0I5MzlGNDZBQ0NDNEQ5MjgxQzIxREMwMEE1Qzc0NENDQjU0Q0U1
-CjkyOTIxMjlGMDI3QUUwNzJCNDhBQjJGNTUwQzFGQTRCMzZCOTkwMTgwRjZFQjZFRjg4NzY2
-MEQ1MTZBNUFEOTA1QUFBRDk0QzdFODkyQwpFODAxN0NBQjQxMDhEMUZGOTQwMTA2NjJERUQ2
-NThDNkFCN0IwMjYwMEY4NEZFN0Q5OTA3REIyMTNDOTFDMzI0QjI1MTVEODMxRjk5QUUKNUEx
-RTBCODUyMUI5RkVEMTIzMDlFQTBFNkFBMTNEMUNEOUE1RDZBNDk0M0EyNjQ3M0FBMjNGMTc1
-MzQ5NDkwQTRGOURBNzk1QUJFRTE2CkIxNEY4QkFDOEEyQUQ2QzY2NDZBRTJCNDgyQjhCMkRD
-MDE2QUIxNDI5REFBNjk3Q0IzMTVDQjE1QjU4N0ExQjQ5MjdGMzQ1Qzc3ODYzMQo5OUREMzQy
-RDJFODVDMjE4Rjc0MUFCNDRCODIxOTc4QUM4NjlERTI1MzQ3ODg2RDE2M0E4MENDQ0UzRUJC
-ODQxQjdENjZGOUY0RTE3MDYKRkE5MERDMkEyNjFFRDQ5RDY5QUEyMUU5NUM0RjIwNDM2MzU5
-ODc3RjM5MEUyNkVEOEU3QUZEMzcxNjMyMDFCRTQzNEI4OUFBNzE0NEI4CjNFODk3N0Q0MEQ4
-NzNDMTVGQ0QxMzZFNzExQjEzMjkyQzhGQTBCNTk0NTk4RUNGOERGRjVBNjk2RUU4Njg3NTRD
-NjI2MjgxNDQ0QzMwRAozMTY3REJGOUI5NDQwQUUwREI4QTkzN0VBNkExMTgzNEQ0NzI2QTVD
-MjEzODhDOUFCRjU0REE4MkZGRURBNUI3MkZBNTNFNjcwNEM5MTYKMzg3QjhFQzM2MDg1RjQx
-OUEzQUM3OTZENENBRjRDMzIxRUM1RjVCRUQ3NjEyRjVDODQxMEY5RjRDNTg0RTc2MkM0RkQ2
-MUIzNjk2NURECjZEM0M0QTU4RjE1QkZERjgzQzU2NUY0NTdGNTZERTNGOEJGREUzNkNGRTk2
-NEE3MEU4RTA1RDMxQTZDQjg3QjAzQTRBOENFRDk4MDU1MQo1QkM3Rjg1MzVEMjNDRDc1M0NG
-OUQxQ0RGOTBBNzE0MjA0NUU1Q0VFQjlEOEJDMkE4RUUyRjRCN0E0OUNGNkQ2QTBGRkEyMDRC
-QjU3ODgKRjdBQzVCQTU3OTg1QkVGQUE5ODMxNTA5NzRGQzEwNDhFODI0RDg3NTA2Qjc4NzQz
-ODdGRUQ2ODIwRjBFODEyRkE1MzZERjVBRjRENzgwCjQ0OUJBNTREMUIyQTQ0ODlFMEY4ODE1
-NTcyMDBDODBBN0U5NjA1Rjc1MEJGQzkyQTMwQTM4OTQzRkY2QzREMzk3Mjc5N0M5N0M5MzI3
-RQo3RTREOTc0RDQ0MDQ0Nzk0QjM2NjdDRUYwODcxQ0VFODA3QzcwQzhBNzI3REQ5Mzg0NEI0
-RUM2MzZBRjIyMDhCMUY0RjQwNzcwRjQ1MTkKN0M3QzNCRDM2QjBFMTY2MkZGNTA3RTY3MjhF
-ODZEMzU5OTU0OTgzOTcwNzM5N0UxQjZFODM3RkI1NkU3NDdERTY4RkY4Q0NBQkM4MzU4Cjk1
-Rjk1MTc4NDI4RDE2NUFGRDlFNjNCNEYzMzI3NzczMTQ2OUMwRjNCQTJDRjMwNEVGNjk2RTcz
-MzQ3Q0MzMzZGNTM4NTgxRTRFNkZEMwo4N0ZGQjNBNTE2MDcwNDU3N0UwMTE2RTUzMjdBRjEz
-MDIxOUFEQTg1QUM1MkNERTA4ODRGMEY3MzU3NkYxNTA0QTAyMEM3NTJGOEJGODMKOEJDQTFD
-NkVEMEIxNEIzODFGQjAyQ0NBRTQyQzY0QThBNjVBODJCM0M5RUM5RDg3MTZDMDg2MTIxRDhB
-NkIxOEYwRTQxMUJGRTE3N0NGCkIxOEY5QjlCQ0Q1M0MyQUNGOTc1QTE4NzJDRkFDQUUzMDg5
-ODQ0QThBM0I2QUUwMkVEM0RFNEQyMDc3QzdDMzc3Njk0NkUyQTVEMEQzRAoxOTA3MkRCQzE0
-ODQ5OEYwNEYyM0Y4QjE3RjRCMjk0RUM5MzlGMzZGREUxREU2ODE0NTNCNzdGN0ExQkZFMkQ3
-ODQwQTMyNDgxNTI0QUIKMzE4NkIwNkNGRUE2RDc1OTM1NTdBQUE2NDA2MThGODNEOEMyMkYz
-RTA1NjQ1QzQ3ODVBRUE5NEE3MzZBQzkyQkEwODkwMkZDREQwODk1CkVCRjk3NTM3MUVCN0RG
-MDEzQTU5RTUxRTMzMzcyN0VBMTYwQjVGQ0NBMDAzRTI3QkU3Q0Y2NjVGNENBNEJCRTdCMTRG
-Qzc1ODE1RTA1MwoyMERDRUFDNkQwMzJENzE0OEI5REJFQTlENjI3MjRCNUM1MkQ0OTk5MDAy
-MDdEQUFBREMwQUU5QjJDQ0Q4MUI0Qzk5QjkwMUIzNDg4QkEKMEVDQzI3NTE0QTczMEFBQjU4
-QTdBNjA5MzdCNTVCRTNEMjlGNjhCNUI5Qzc3NkRDQkY0QkM3MTNGRUEwOTFCQTYwODNDQjIw
-QzlDMEIwCjE4RDk0QzEwMTIyREQ0Q0M3QzA0MjE3MUIyNTU0QTg0RkQ0ODkwMDlCODZGMDgw
-NTI2QjgyMDczRDk4RDFEMzZDNDExMzg2MjQyRDYwMAoxMEE1ODQ0QUY5MUREM0M5NTUyMDVB
-QjBERkM4Q0FBMUIyOUMwRkJEQjBFRUJDNjk4MTVEOUQzQzcyQjUyNTU4MjQzMUM3MDBGMDk1
-NzkKOTBGRUMyQTA2RTMxNjc5Nzk1RkYwQjBGODNBQUY4MzRBQTI0ODYyRjA1NzZEMzA2RkRD
-MjdGOTAzMzBFQjA0MzA1NDhENDVFRjc1Q0YxCjg1OUJBOTg0Mzk1ODNGOUZDREMwMkRBNDI2
-Qzk4OTU1RDYyNDZFNEQ1RjE0NzFDNEFDNEZGQjE5NDdBQzlGRjdGQzBDQTQxRkJGMDFEMgoy
-QjgyOENFQUM3MDMwQTZGNTZGOEIwNTc2NDQ4OTY1M0E3NzE1OUFCQTRERUU0MkIyMTEwQTY2
-MzREQTE1NDIxODhENUU1NzcwMjE5NTAKNjk0QjU3MUFDMzU1MEUzQkMyQ0IzQTgwMkEyRTgz
-MEEzQjVDN0RCNzc1MTZCRkFDM0E3QzgyN0Q3OUFCRDc1RjEwQjdFQTVCQ0E1MkI2CjkwRkQx
-OUUwNDI2RDI1MjZGQzU5MUEzNDU0MjY2QjRFMzgxMTREMEYxNjUxRERERTA5OTVDNENFOUE2
-REY4RkIwRUYwMkU3NDUzNUMzNApGMUY1NjNFQzk0ODIzMUNEMTU5RTJDMTcyQTg0NzNFN0Mw
-OEJDNTlGRjNEMDgxMEMwRUMwRDFEOUQxMDM4RTg4MkYwNUM3RTNBMEJFMUUKRjk4RjlERDJB
-NjBBRjk4QzJEQkYzMkI5RjUwMDNGRTNCMDlCQTAxQTc3NDRCRkE4QzM2OUI3QjdGNzNDQTY5
-MTVDREVFQkExRDcxRjg0CjlERjREQTIzRkUwMTk1REZCNkFBNDcxRUExMDlENkU0RDdFODAx
-QUM3N0NGRjczRjRFRDU4OUQwMDkwNkFBMDg0NUI4NEQ0NEQ3ODE4OAo5QjRCNUI5NDc1OEYw
-MTNFQTE0MTE3MTUyNUFFMTQwMDQ0QzhEQ0RCMzc0NzZCRkFDOTI2MjhGQTE3NzIzQ0M0MzRD
-ODIyRUYzMDdCRTIKNEQ3Mjk1NTIyMEI0REFCRjM3OTU5QjQ2QUQ5QzUyRkMwRjVGQjNERUM3
-MkJFNUY1RTVGMEJDMUNGRkMwOUQ4REVGNUNDNkJDOTRBNDU2CkYzN0FBQUQ5QTYyRTcwNUI2
-REQ4NDRDNTY0QjI3MDhCRDhCN0ZFNUYzQzYyMTA0QjM0OUEyRDg4RkMxMEVCQzFENDkwMEE1
-RUY2QzUzRgo4QzE4MjUwREJDNEJDNTExNzMzNjRCNjAzM0UxRTVEMzU0M0FEOTVFREMzQTA3
-QzYwMjczRTlCMDUyQzYwMDQzMUY2M0QxRTRERTBCRkMKRTg2MDUzN0JFMDUzN0EwQTJDOUJD
-NTM5MTE0QkREQjVBMzk1MTQzN0Q4Q0NGNDU3REQxRUMwQjBGRkI3QjlBRkIyNDA1QUZGRTMz
-QUE4CjVGMzNGRDA2Q0Q3MkIzODJEMEE2QzZEQjQwQkVERDNBMTZDNjhEQjk4QUU2QUQ4MkNC
-QjYwRDFCQzIwREE5MzJCRkE0RkE3MDMzMzQ1OQpBMjhEM0I5OTk2NkI5QjRGMkU5OTNFOERF
-NzgwQjg5MEFCRUEzN0Y3MTQzRjk3MDJFOTlFMUY1OUY4RUUyN0FCMTVDQ0NDMDUxNUEyQTQK
-N0RGRjU2REQ4QzM5RTE0NDI1RkJCMkIzMzExNUQ3ODY1QURCNjY5NzNDRDE0NDQ2RTUzNTBC
-MjgxQ0EyRDg1NUQyMzEyRDNERjVGNThFCjY5ODU4Q0JCQjA1ODA5NjQ4NEVEOENBOERCNTM0
-RUYxMDM4MzRCOEVGMzM4MzRCODE3OUQ5QTYxNDNCODhCMjQ0RjVGODc3MzcyODQwNQo4RDM1
-MTg2QTgzQTE1Q0RDOUNCMzJDOEE1ODg1QjVFQkE0RjczQjgxRUE0MTI4RDI0NDgxODcwQjcy
-MjNBMEYwRjI4ODhFNzdEQzAxQjAKMkFDODMzNzg0NkMyQTUwMzU3MjQwMzFENzQzN0ZEMTE4
-MDYyNjBDMkJFN0VGNjQ0MDlFN0E3NUFEMDQ3RjdBRUIxQ0UzRkNCRDUzREVCCjBGMzlCQTVB
-NjNCNkMwRUY5MEM5QTNEMjE2ODMzOTZBMjUwQkFBMzdFRDNDODFEQkRGREIyMjUzRUMwQjA5
-QTE4OEQ3OTExNjgyMjJCNgo2QTA1RjAwQzEzM0Y0MjIwMjM5RjY1QTg4MTEyNzE3RThCMzE4
-RTkwNUJGMjhENThFRDE4NDkwODQ3MTlGMUZCMDE3NkQyNkM1NkFDODEKMjg2ODBEMUFEMDdE
-M0VGQzExOTI1REM0NUNCNzg2RTUzRjEzNUI3REJCRjYxMDU1NEI2RDlCQzBCRDM2MjI2RTU1
-QzIzRkM4NzM1MUEzCjNDMjQxNkM4RjI4MTdCM0NBNjlGQjBEMzMyQ0VEOEMwRTMzQzZGNDBE
-QkY4NURFRUQxMEE3RTlFMjk0ODUxM0YzMTkwREVFOTMxMzJENQozMjA0NUNCRkY2RTQzREEx
-NDVDREUyRDU2MUUzQkEwNzhCNzJGOTUwQTgwMTcwMjVBQTVGMkZDRUUwOEFCNEU3OUQ4RDE3
-RDQyMkM5NzgKMTY1Njk4OEFENjIwNURFNjkwMzVFREJFNTE2RDdFNTJBODI0OUI0RkVENEU1
-RDE3N0Q4NzE4OEZFMzUxNUM1MUIwOUU4REE1NzNGQzFGCjg2QjMxOTNFRTkzNUNFMjdFNTIx
-MzE3MjBEODI2NEM1ODBBQzA4NzIxODI2MkIzN0ExOTRFRTg1ODlCOEFCMzA4NTQ1QzJFNUFF
-MjNCMQpCRTRFRTNCQzlFOTlDODg5MENENEExN0NDQ0VCNzQwRjc2NkQ5MTk1REZDOTU4QkM0
-Q0VCRDI5MUQwNEZFNjkxRENDNEJBN0RDMjBDQjYKMjkzOEYwQUE5QzRBNTFGQTdENkUyMTNF
-MUIzNkIwRTMxOUYxRTk4QkJERjI5OTlDOTMyNUVBRUI4NjA2OUYzMTU4QzJGMkU3OTM2NUYy
-CjI4QkVGMEQ5MDk0OEQwN0U1M0I5QzQ1RjgyNkY4QTg3ODNGNDlDRjAzN0Q0Q0IyQzkyRjJG
-NkU2NkMxMDQzNDNBODk5NUE4NkUzREMwQQpBOUE2MjU3N0ZGREVDRkVDQTJEN0QyNzgzM0U5
-MDNGQjA0OUI5MTc4M0U0MUQzNUQyMTZERjM2OTdGRjAzQjUxRUMzQUNDQTE3RTkxODcKQzM3
-MjM3NzQ5MDgzOUU0OTAxMzZDQjMzNDNDODdENUEwNEFENkMxMzdBNUZDRUFBOTFGQ0JFQ0Ey
-NjI5QzEzMkNCMkJBQkUzOTA5QzcwCkVDNTVBOEZGMUREQTA1QjhCMkEwRDJBNTFCQzc0MTFC
-NkE2RjM1NjA5RTZFRTBDNjA3RENDNkVBRjk1RTQzRTYyRjEwNDJERDBEQUY5MQpFOUFCQzIx
-MkQyRTJBOEZFRUFEMEQzMTBCQzhERjQzMjAyODkxNTQwQkYwN0ZDQTJFQUQxQTI0QkNBRTVF
-NEE2MTdFNzI2QUM0RTkyMTUKRTAxRjdFQTJDRjc2OEI3MTU4MTEwRTNEMTYwMTBEMjdCOTUy
-RTg4QTMyRTQ0NTc0M0M2QkY1OTg0OTcwRDUxODk5ODIyMUNDOTVBNDdBCjlGNjI3QUYwREUx
-NDc5M0M5N0MxREU1NUI4NUEwNjI4MTZBREFERjIzQ0VCQzQzOTE2QjFDOTY2RURBQTE0MjRC
-MjNBNTUyRTUxNTA0QQowOEFGQkI4MTgyRTlBMTExMjRFMTI5MjQ0QjE5QzdCQUUxQ0FBRTJD
-RTM0OTA2MDc1REJGNzRDQzg3RTQ3ODI3MjU0MURGRkZDRDMyRTMKQzA3Q0Y5NjBGNjU0RjY3
-NDQ1OUZCMTM2RkU2RDE4MTIxRkVEODdCOTBEQzA1QzI0NzhEQkQxMjFEM0E0OEE2ODdEQTBC
-RjVBODgyQTAwCjE0OTBCODNBQkM5MzJDQzAxMUU0NThENjRBNkUzRDJDRTBGNUM5QjFENjlC
-QzdERTY4Q0EwREYzMTczNjJGRjgxQkQyN0Y2RkQ5OTYxRgo5M0Q5QjExNDk5QjhFQ0I5NTQy
-OEVBMDA3QTQ2NDlCMTYwMzNFOEQ1OTFGRkM3QjRDQjZFRTA3RTZGNzA2ODc5OTZBM0QyRTg1
-RURDMzEKQzFERUVCNUQ4NEMxNjkwNzlDMTYyOTc1NDBDQTBDQkExMzA5MjRBQTdDQjc1QzM1
-N0I1OTJFMDhFNDc3MTYyMDVDRUM5QTAxNzhGNTRDCjkyOEEzMENERjVGMkU5NzZGRjAxNzQw
-MTI1MDhGMjZFRUQwMzQxN0UzOTczMzJGRDgwNkUxMUI0ODY2NDlCRjE3RjJFRTlBMEI4NjBB
-QgpDQTQ0QzMxNzg0REYyNUI1NjgyNTc5MDg0N0NCOTQxMUIyNDg4RkJBQUYwM0IwQjBGQTJD
-QzFCMEM1RDMyMEI2OUZGOTg3MTNBODc4QUIKM0Y2NTZBQjQ1RkM1NjFGNjFEMDA5MDMwMUZF
-N0NBN0NFRUU2Qjc2RTU3QUIyMjNEMTNBRkQ1ODQzODREMEJCNUYwN0U2OTkxNTUxRTFECjJC
-M0M1MjMyMDM5Mzc3QTY2RjExNDNEQUYyNUU4MjM3NzRCODY4OTcyOTE3NkNFNTRGMEQ1M0FB
-MjFFN0JGNjQ1N0FCREE2NzEwRDU5MwoyNDdFOTNBNUNCMjNDMjRENTNFQjBENkM3RkQ3M0U5
-NEJBMTVCNkQ0NDNCMTBBODM4RDM0RDk2NkFFQUU4MUI4QTIwODk1RTM5QjgxOTgKRDA3REY4
-NUZFOUQwNjM4QjI3NDU0RTU0RDg0OUM4M0UzMTQ5OUM3NUIyRDJFODUxRDVCODk2NjA4MzYx
-RkI1NjIzRkMwRkE4NUMyNjMwCjI5OEI3NUQzQkYxRDUzRDc3NjIxMTlFREFDQzM4RUZBRTQx
-MjZEQ0YyOUIzRDcxQzBFRkM3NUFBMkRGMUU5NTY3MkI2QzdEMURGNzRGOQozODhCN0NEM0NC
-MjFGQTQ2RjAwMEUzMzBEM0E1NTYzMjZBNkYzN0FDREUwMDQ1QzBEOEQwMEFCRThBODY4RkI0
-RERDMjFDM0REOUM3RDYKMjJGMEI4MDE2NUNDNEQ4NDIyN0I3QUU5OTI3QzkzNkRGN0ZFOEY4
-OTNFMzE5QzQ1QkI5RjlEQzVFNjFEMzdBRURGOUU1MjJDQkJCMjBDCjI0MDVBMTM3ODQyMjY2
-QjQ4RjJCRUREQ0I5MzIwNjY0QkRENjY3OUI3MjAzMEUxQjAxQjVFNjk3OUM1OTJENjQ5Q0Ey
-REE1NkMwMTlCQgowOUY2RTEzOTgwM0FDMDEyRDMyOTNCMUU0Q0M5MUU4NjI4NEFBNjg0MUI2
-QjlFQUQzMUQ2NzI3MTQwMzlENzMzMzZFMDIzODk3MzJBQkQKQUJCOEMxNDdEQTlDRjQwNzEx
-NDA1QTEzMjhFRTE5RTBFNkUxRUE2NURGQTg5MjE5OTRGMkJGMzEwRkI4NUEwOEY0QkFBN0ZD
-NTlEQkRECjM1MDAwNjIwMERGMjdDMDk5RjIyMjk4NjJDQTVFOUMwODUxQkU0RTMyRDAwNDc1
-RjI1ODMzNDM1OTAxMEQ4MTc4Q0E0REJFRTgyMjMyQwpEMjFDM0NGNjY2QTBFQkY0QkQyMDMw
-MEMwQTcwMDE2ODA3RTQyRDE1RjlFRTI0QTE5NEVEMDRCNEM2QUVEODg0REM3MDg4QjZFMzc4
-NTEKRkFGRDdBREZDRjdGQUJCMEU2MzM5NDZCOTAyOTE2MEYxMEI2MjYxMzI4OUI4QzQ2QjJC
-NzRGREQ0N0JENEY0RTdCNTNFOTZERjhGOUMzCjY5OTI1NTA4RDM0MkUxNUE0RDA5NDNCMjIz
-NjVCOEQ4RjlDQjhGNUQwMERFNkE0MkZDRjlGRjQzRDM2NEMwMkRGRDJGNDRGNzI4MTlFNgox
-NkI3ODhBNERDQkVDMUI1RjlBRUJERTRGMzhBMjU0QjRFRUE0QTM0RENBRUE4NURDQjdGOUYy
-QkY0N0JCODdFOTU1MjQwMkMzNzI2MjgKOTU2RUU1OEEwMUU4NkJBRTFFMDgzRDcxMjlCNzgz
-N0Q2RTU3QjdERThDMTc5QkRERTY1MjREOUY3NTYxODcyNTAyNjg1NEMwQjFBMThGCkE2NjJD
-RDYzMjQyODVBRjY1RTREMUY4NjY1RjE1MzhGMkQ4NUZGN0Q1MDJCM0JGRDREMzEwQTMwODhB
-OEVFNjc4MEQ1NDFEOUFDNDY4NwozMUEyN0REN0RBODBGRUJCNkY2MEMyN0JCQ0EwMkRDOThB
-QzU0MENGNDVFM0I2RDUyREU0NkI3QzZFOTg1MDhERERGQ0IwMjBBQzU1MzMKMTJGMDhDMkFC
-RjI3QjZDMzRBRDlGODQxRUI3ODM3M0YyRjM2N0EyOEVFM0UyMUQyQkNGQ0U0QzE0QzM0QzM2
-Mzg5NzhDNDBCMTM2QUM1CjhENzQ3RUUwNkUxOTdBQjA3QURGMzcwOUU3MzgzM0JDNzg2OTE3
-RDNFQzA0NjVFRTQ4OTQ4RTM5N0Y4RjcyNTZFRDREMjYxNzk0QjI4RQozOUQ2RDRFRkZDRUU2
-RENGMEMxNDI1NkRGNjgwMjZCQUEwRDUwQTczN0UzMDM5MjNFNkQ5NTZERjNGQ0UyOTgzRkY0
-NDNCQzFFRTE1OTUKRUM1N0U4NkUzNzcwRjczQjgwMkExNTJGQkNGNkI0Mzk0RUUyREIzMERB
-QkE2OUYwMTI0RTZBNzRCRkVENzcxNUU0NjkxNTBDMjU1M0Q2CjRGQ0I1Njc4NkQzMzRGMzM1
-RjRFQzY4MzZBNjEzQTI2MTUyOUZBODVCNTM0Njk1ODVBNjgzQkI5Q0NBREMyNEFDNTdFMzVC
-QkE2QjA4NgpGMzg4MTE2MTMyNzkwNkIxODVFOTU4RTcwMEE3MEJFODI2MjdBOEY0RjQ5REEy
-MjAyNEJENUY2RDBFRjMzNTdFQUMyNDE0NjE1RDRFRDIKMTMwRDNEOERGMjNDNTJEMkI1NzM3
-MkJBQTY4QkYxOTAxQjg2M0U2QTM2RUEyMzA5NDk3MUJDRTI2MkZERDVBNjhCMEIyMEYwRTlG
-RTBCCjBEQUUzMENBNTZGQUQ5NEM5Q0U0OTg3NUE0RDA2RTc3NENEQzQ2ODQ1ODY2QkNENjEx
-MjI4ODdEQjg1QjIwN0UyODgwMzUzNTY4N0UzOQowMjhGODJEOTQzOUZCNkI3RjM0RkZGMUJE
-OEUzQzhFMUM3REYwM0RGRjhFM0MwNjAyODQwNUYyRTZBQUY5N0E1NDA3NUIyQTFFQkNFNjEK
-M0E1Q0Y3QzczMDQyRDc0ODI0QTA0RDVCMjA2NjczMDM0OEIwN0YxODhBODcyNUVBQjBGMDc2
-QkVGMjVEQThCODJCMzZCMDYxRjg2NkE3CkJGMjNFNjA5NzgwQThDQTZDMUU3QTUyQUEyREY0
-RDVFQTIyRTZDNjQ5MUI1QzRBNjQ4RjM3ODM4QTdCMUY3QkREOTg4NDA2NTMzNzJBMAo4NkE3
-QUZENTZDRTJCOTczQjVGRjIyNEUzNDkzMEFERkEzMDcxREJEMzM5NjE4QjI0NUFEMjdCQUZD
-ODA1QkYyQTQ5QTRFMjk2RjE3RDkKRUIyNTcwMEY4RThGMEM5RTg1NDhGQUJCMjNEMkNEOENF
-QkU4NjIxREZCNjYxMTVFNjA2MzBBMUZBRTM4OTdGRDcyMjY5QjI3NTAzODQxCjU5NDNEN0Ey
-QjU3MjlBNURDODdFMkY4RUM4MjU4NkQyQTI5NzkwMzNDMzE4OUVFNUNFQ0M5N0MyNzZCNzUx
-RTdBMjY5MDQ3QzBCNDczMQo5RTM4QzhBNUVGQ0ZCMEJEOTBDNTQ1NTYzOTcxRjdEREZCNzZD
-MjhERDVEMjk3Qzc5MDdEMjBDN0QwMjBGMDQ1NTdGNTU3QUQ2NkU1MUYKOUQ0MkY3OTY3MzY5
-OTdCQzY0ODg4MzE0NENERDlFQjQ3NzQzMUFCOTU4M0M1OEE5NEZCNzM5NUU1RjdDQzBGRjk0
-MzRBOTdGNTkxNTgwCjQ4NTA5QjcwMDgxNjhCNkU4NzdDQkZFMTQwODNDMUNDMkIxOTdDRENE
-OTMwNjhEMDM1MTAyQjAyNUQ1MkE4QUE0NzIxRTAxOUREMDJBNwo5OTNFNUM3NEE2NENDNEQ0
-MjJEQzAzMjEwQTI2NEY3MzU2NTE0RjEzQjU1NUMzNzM1NjZBNUQ3OEU2MjcwNjVBRDM2QzI2
-NTEzMjQ2RTAKMDFDOUMxNTk1MjM1N0E4RDhFNzU4MUVDQzhDMEE4NkE4ODBDNzNBQzUxOUJC
-MTBDMUI5NzIwREY2NTAxRkVGRENFNTVDQjFDREJERkFECjQyQzNGMjE0OEVBMzU4NjFDMzkx
-NDc4QjlBOEQwNThGQTEyMUI0QTI2MzlFN0E2MjY1NTBGNkUxODkyMERBMDc5NDBGNTczQUEy
-OTlGNwowNDNGM0VDQkZDNjI2QzE2QkVGOTJEOTM0Njk0NkEwRTdCQ0FDNTI4QUUyNjRFQTM3
-OTczMjk1N0FDMzVFMkM3REVGQjQxN0ZERkJDRjQKQjI5Q0FBRjExMzM1QzFCREFDNTBEOTVD
-MEEzRjA2RTM2N0ZBMENDNDgzMTdBQ0Q3MkRBQTM1QTc2Q0EzQTFBQzI5NzVCQTNFMzY5MDE1
-CkY0QUI4Q0FBRTlCODA0REM0MkI3RTE5RUY5QjczQzNFRjM5NjhCNENCRjRDNzA5N0E0QURE
-RjgzNTlEQUIxQzZFMkM0NDA3ODhGOEJDRgpEMjcyRDgzNjZDMjMyQjcwRDUwRTIwOUU3NjYx
-MzRGMEMxRjFFQ0RFRjI1RTA1MjAwRDlFNjZGRDZEMEU2QTZERjVDRDFBNjJBNEU3RkIKREI1
-NEI0OTVDREU1REIwRkRBODVFREE0RDYyODM3NEUwRTZFQTQ1MUVBRTY3NDU5RDkyQUM4NEUz
-OEZGQjUxNTZEMUZDMEVEMjY0RDlDCjA1MzE5Mjc2MzYxRjUxOTJCM0ZFM0FDMDUyMTU0RTI0
-MjVENzc2NjZFMzg3Qjg4ODQxRjJBQjgwNjJGOThDQzExQUVFNTg3MTdCRTg2Nwo2QzI2RUQx
-RDA2ODM5RkI4NjJEMkQ2RjE0MjE3RURGQzQ0RDM2MjgwOTBENEU0QUU2RDhEMDhDMjkyNURF
-QzYyQ0MyREVFNENERURBNjUKRjFGQ0IyMkQ1MEQ1NzM0OTU2NjkyQ0JCQUYyNUE1MThEMjEx
-MkY1NEU2RDM4RjlDMkI5Q0Q2NkEzOEJDQTBFODJBQUUzRERFNDVDM0FDCkU3NjFCOUExMkIx
-MzU3NzI1ODlFNDI1QTNCNEUyMjlFMEU4MjQ5MDY5MzI4QjZBMjIyQzQ2REFGNEY3QzYxRkRB
-QzE5NjdDN0FGNkUxMwpDMzgyOTNGNEEwQUUzREY3MDBFNDBDMkRFOUY4QkM4MDI2ODZGMjM5
-RjdGMEM3QjQ3RTAyNjFGNEJFOEI1QzE3NEVFODZBRkIyNDhGMDgKRDBDRDk0NTc4ODY3RjQ3
-MzE2MTcwQTkwOUMwNTAxOTkxNTM0M0M2QzRDRTBDOTk0QUExMDVGNzBFNThFNTc2NTY0QTRC
-MkIwODk0NEQzCjE4MENFQkU2NkJFODk0Qzg0MkMwOTZGOTJDQTUzRTY3MDRDOTE2Mzg3QjhF
-Mzc0RDFCNzE3NjFGMzkzMDQyMkIwREY4QTRFMjQ3ODVDMQo0RUVFOTIwRTNDOEQ2OTcyNzk4
-MTRBNkQwMjc2RkVDRDY2RURGMTI3NDExQTA3RUY5RDIyRUJBRkU3QUY0M0M2QjYxMjJDQjBC
-MTREREMKRDMzNjdDOEFBQzU1OUFGODkzQUU5QkI3M0Y3ODRCQjEwRTY2NTdGMzQ0QUQ2OTMz
-MEMyNEE0RTNDNDQ2RTg2RTA3RjVCNTk2RDJDOTg0CjRDMjRDQkRGNTFDQ0FFRURENEQ2MkZG
-NDhDN0Q5Rjc0QzkwNDUxRkM5MEY0ODVGMkMyRjZDMTI1NTU2QTU5OTJCQUQ4Qzg3REZGREQ5
-QQo3QzA5MkFEQzlBQzIyMjBDMEVDQ0JBQkExQjRDNDk0QTRERjQwQ0U2QkM0MTJEMzdEMjdG
-QUZDODNGOTU1NEM2NjRCN0UxNUIyQzRGOUEKNkJDRTE3MkZGREM4ODVDOEQ1QTZFNDMwOUQ0
-NzAzMUNDMUE1N0QxNUNGMzBGNDEzQzcwMDQ0NUExMTgwNTg3ODM2Mzk2RUNGN0E0NTI2CkJC
-MEFDQTUxRjI5MDZDRTE0NkY4Qzg0QTFCMUZFMjQ1NEVERUUxNjU3MEQ1OTRFNzlCODk0Q0ZD
-M0FCMTYwQTAxOUU1MDczNDdFNzYzQQpCNkNEM0FERjQ2MzkzRTA1NzlCQTQyNEREODUwMjQ2
-Qjg3MkU4ODE2OUVGRkQyNkU1OTBBMTkyRUYzNTM1REZGRDdDNTQ3RjIzNTgwNDIKRkM1Qzk4
-MzhCM0FFRDAxRjEwOTZCQkZBMzU2NUFCRkZCNkYxM0RBMDg4MEI1NjI2NjJFRERCRDE0RkU3
-MTBFREJFNjZBM0VBMUZEODA0Cjg1REE1MzkwRDNGOUFBN0QyRkM3QTZDRTY3QUQ3OEExODFC
-Qjg1MjRCN0QyMjQzQTIyRDkzNkQ2MzFGRDNBMzhCNkQ3RUU0MjEwRTNGOQo2N0U1MzZENzI0
-QjVFOTUwNkYyQzJGOEVEOTg0RDBBNzZCMjhDRUY2MTgwOUVGNDlEN0MxOThCRkVCQkI5MTIz
-MzAyNjUwNEE1NThDRDQKN0I3OTg1QTE0NThCMTRBNTcwRjJCMjJCMTk2QUEwRTkzOUQ1RjhC
-NDQzOUM1M0Q4QzE3ODY0Mzc2QzUzNzUxMzI4RTM5MUJBMDlEMjU0CjA2MkFBMjZDQkE2MzRE
-QUZEN0VBQjRBMjA2OTdEOUQ2NkVGNTlBMzcxOEZGM0JDQTBBNjlBMjAzRUUwQTcwQ0M1NjQy
-NjRFQkY0NTY3QQo3MUE5NTg5ODYzNENCNzY4RTg1QzFDOTQxOTRFNkM4QjAzMjA3MzVERkRF
-Qzg2MEQxMTBBOUUwRjBGMUQwQjM1MjhCMjRERTVDODUwMjEKN0YyOEQ0MjAzRjU2MEJEMTlE
-Q0YxNDVFOEEyOEY5MDY0QzI0NTlENEZDODBBQUE4MUFFMTJERTRCRTEyNDIwNjQxRDFGODJE
-NjA0MTZDCkREQ0ZFNzgyOTg0OTU1QTEwQjU3NkZEMUEzOEMxNjUyNDMxRkJFQTBGNkEwMEM0
-M0RFRjUwNUIxNTc3N0RCRkZDRENERUNCQ0I4NDZBRQo1NzAxRDRGOTRDQkQ4MzVDRUI5OEJF
-RDZFRTczRTEwMUNDNTU1MDE2MzdFRjYwMDkzNTc3MDk0OTNBM0IzQTEwOTJGMEFDODk2MzY5
-RkIKRUVDODg3QjJEQzlDRjUwNzkyMDYzNEE2QTdFQTQ5QzVEMDZENkE3M0QwNkZDRDg1MEI0
-OTM3NUEwQzZFOTRDREVBQ0ZFNkEzNDVEMEYwCjIyMjBFNzFGRDI4OTA5M0IwMzAxQ0U5RDNB
-MDAwNjJFMUIxNjgyNUY2QjQ0OEUyQjk3NjMxQkY3RUZFNzRBRkY4MzE1NzFERDhDNkQ2NAoz
-NDBEMkQ3NDk4M0VGMTkzMUIwRThCMUQxOTE0REJFRDIyNjM4QjQyMDJFNDE0QkRDMDkwQjI2
-QkYzN0U5OTAwRDg2OTFDRUU4MkJCMTUKQ0IyRkJEN0Q4NzEyMERDMUJDRTYwODZFNkNCRjZF
-NUVDQUEzQjk1NEQ1RkIxNEY5ODdGMTc4QTQ1MjBGNkMwQkQ2MzFBM0M5RkMyRDdBCjI3QTg3
-RkQ2NDY2QzcxRjk5MDkzRDQ1N0IyMzc4MDc0ODBBMEJCRjlCM0U5QTkzMkYyQjU0RERFMDY0
-REY2MDg4NTVCNTcyOTMzNDRCNgpFRTY3ODE4OEM4MjBBQTk3NENDOTNDREQxOUMyQUZBREFC
-NzEwOUNDMzU3Q0ZCNjMzQzNBQzZFOTRDMzc3NjA0QTk3MTQzQjJDNDZFMzQKRUJBNjI0RjlF
-OEQwRUUyRjcwNzMwOTMxRDE4RUY0OEJDMkU5RDg5QkNDRURGNDQwQUQyMUJBMEFCQkYwN0Yx
-RjNBRUU5MUM2ODBCQjMwCjM1RTExN0ZFQTE4NzY5OUM2NDMyNzk1NTM2NTI4NTlCNEU0RjE0
-RjEwOEVDMTdDMTNCQzRGNEYwRjFBNEYzRUI4RTEwNzA3MEVERDgwQgo2NTQ5Njg1NzBEMTBE
-RDk2RTNBRjNEMUNFN0U5MTg4MDExOUMwQzEzQkExOTU5NkIyNzYyRjAxOEU0QjUxMzFDOTI5
-QzdCMjEwREEyRkMKMTYxMDBGQ0Q4Q0RBMzYxRENGOTFDOTQzMUQxNUNERjE5RUE2MTkxMkRC
-OTEwMDFBMEFCRTYzNkRCQjMxQkFFRENCNjVGOEQ0MEM3NDM1CkNFOEExODgxNjlGMDBENUND
-QUIwNzUwRUEzN0QyMEYxODM4NjA3MkI1RTA1M0REMUYyQzFDODE1RTUwNDMwRDA4NEQyMjZF
-MTA4Qzc4MgoyQkU0MDI1QzdCNkZBRkE0NDkyRDFBNkI5QUVDOENDQkFEOTYzOThBM0EwMjgx
-ODEwNTlEQzMyOTAxRDlCNjVBNENCQzk3MEMxMURFQTEKNDU2NEM4MzJGNDFDNUMyNzhEOTdB
-QUU4OTlGRDE1ODFGMDI5NUVBOTA4Q0RDNDVGQkZFNDY5NzMwRjc2QTY2NTcwNUIzRkE4QUMz
-MDFCCjQwMzBBREM4QjA4MjA2NjkzRUNDQ0U1MDlGQkM5QzQwMTYzOTQ5RTQ1RDJFMDcyQkJE
-RjZFQzE3QjU2RTM5QjQ5QzU1NjVDNDkyODgzMwo0NEY1MDdFOTI2ODRDNjRCRTI0RDM3MEZE
-MUJDRDJFODA0RkMzMkM1REMzQzZDRDJEMkM4QzQyMjE4MjBFN0RCRjI0Mjg1RTBERjc2NjMK
-QTM0OEM3QTkwQkJFQ0JERUYzMjFEOTEyOERDRkQxNjU3NjgwQzA2Njk2MDg0QTJEMTc4MkNG
-QTRGNUYwQTgyQ0M4NTkzMDE0N0FCQ0YyCjYwQkM1NDE4MUE1MEFCMTJCREY1MjQ5NjUwNDE1
-QTI2RDA5QUExRjU1QTBCQURGMTJCNzYwQTMzM0QzRDM1RjE1REFFNjhCRTU4NTYwNQo3NkRB
-NkU1NzI3MTFGMDkxOTJCMUM1MDU3MkJFQTYyM0VDODZFMzNEMkQ1MTU4NTE2MDk5MjMwRUY4
-RDRBMDNGNEFFMjlDRkUyRTQxOUQKQUJFODlDMkVGRjI3Qjc5QTAxMTc2MTU5NjFGODQ3NUY5
-QUQ3MEQyQ0E2RkZEMkI4Q0I2MjlBMjE2NjEwNjE1OTA5NUZEQTc4ODc4MDgzCjM4RTM0OUNF
-QjcyMDY5REFDNzQyRkM4MTI2NzM0N0QwODhDRjlENzZDOTkzRkU3MDc4QzhGQ0YzNjcyQzU2
-ODhDNkY2Q0FERDZDMTgxOAoxN0VEQzZGQTY3RjFEOEI2RTQyODYwOEI2NjdCRjY5QzdEM0Iz
-RTA2RTc2Mjc1NkNEOUEyMDUxMDI3MjlBNjJCRDBEMDY1NzkwRTQ4MTQKQTJCRTgyNUJCRTI5
-NDY3Q0YxMzQzOUFGOEREQkQ3MTJDQUVENTFBRTgwMjNFRTJFRjNFODJBMzIyMTFDMTUyQTNC
-MDBGQjU5RTNBRDA2CjE2OTExN0ZBMDU5OTk1Qjg1ODI3QzcwNzM2RTVDNUI5MkE3QTA1MEFG
-NTg2RTQyNzRFMkI4RUIzMDFCMUE0NEE3OEJERkI3QTFDRDVCRAoyMDQxOUI0NkE3QkFDNzJE
-OEI3NkFCNzlGNDNERENGNzM4OENFNjk5NTNCMDcyMjlDQjA4NTM3ODQxNzUzQTc3OUY4REIz
-NTA1OEJDQjcKOUZFMEI5MkM5NUVGMkY1QkI0RkY5MkExN0NDQzE3Qzc1NDdFRTgxMkJFMDJE
-Qzg3QTk3QjcwQTA3QjQ3RjI1MDk2Q0Y3RkIyOEVFQTk1CjkzMzMyRDhGRDRDMDU0OTlDMEYw
-QjVEQzE2QjYwNDg2Qzc5NDVBMjRDOEY1RUYyNEVDRjI2QkUzN0RDMUJEMTZDRTA4RDlGOTZC
-QzQ4NQo3M0MxRDdBODg3MkEzOTBBNEZENUUyMzc2NTg0NUM2OEVENTk0NTZENjZFQjRCRTY5
-N0Y0NTRCNzFCRjZFOTc2QkZEN0M3ODE5QkRGQTEKNEQ4REQ3Rjc3N0I0OTk3NzNBQzQ1Nzkw
-MkRDMTMwNTQ0QTMyOTU3RTcyM0FBRjBFRTgzRDQ2REM2QUMxNTc4RUUwM0M1NUI4OUYzRkRC
-CkFGNjBDOEFEQjVDRTEwREFCNjAwQkRFRkI1Rjc5M0IwQUQ4QTQ3NTdBNjVBQTQ5M0JCQkJC
-NjAzQ0ZEQURCMDg3OENEODMwNDMzNzBCNQo3RjFDMTlFMDJENUVDNDNEN0YyMTI4QzhGQzlC
-MkFFQzRDOENCMzg2REFCNjAyOTY5QTA2RUQ0OTk5NTRDMEZBQUEyNzNCRTE3QzJDNzAKNTk4
-OTVBNzk2MUM5MTA1RkVDREMxNTJBMUNERTY4MTRFQkE2RTNCRkJBOENFMTEwMzkzRTEwNDZG
-RDUxQTEwM0JFMTk0RjRCOUI1QkY3CjEyMzk2REJBMDEyQkRDQTBFRDM4RjYxMzk0QkRBODg2
-MkRDRDcwQzgyMEQzMDFBNDAwQjU3RjEwRjExMTdBNEIwOTM3M0U5QkY0QTcyQgpFNjIwNEMz
-RjU2Q0I5NjYxQ0QxNzVGNzJCMjM1MUE2Q0FBNjQwMUNCNTY5Q0UzMzM5NDI5MDE1QUIxQzY5
-ODRGNTE4QzZDMEQ2MDY0RDcKQTNEQUY2RUVGOTQ5RUM2MzNBNjcwNzBENTg3MDdENkU2RTAx
-RjI2NkQzRjU1MkI3NzcyMUEwRDU5RThEREM4NkY5ODgzMzAwOUQ3MzQyCjhGRDM3Q0JCMERF
-OUM4OTRFOTk2NjI4MTlDMTk2RThBOUZEQ0NFNDdDNEE0QkExRjFFRDFEOTBEQzIzMEE1NDBC
-MjZDMjE4QjlCMzBFMwo4QzIyNkEyM0IyODgyM0RDNkQ4NEQ0OUE2RTM0NkNCMkY3RjlGNzFG
-QjEwNkE1REZCMzZDMTZDREZGMUQ2NTFBOTc1NkJCM0IwRjAwRUYKMEE3MEQyOERFQzc4MUZF
-RDVBRDQxNzg0NDY5RTg4RUNEQjg3MENGODhDRTk5RkY4QjhDOTk0NzgzMDBBMzFERTgxMDU0
-NTVDRDVBNkI3CjZBM0RCQjUxOUM4N0MxQjYxQjE1RUYyNTRCMzg0ODI4ODk2ODc4OUMxRjVE
-NDc5QjEwQUQ5MjcyRkI3NzQzNTc2NkJBNDBBQzk4ODkxMwowN0Q4QTQwQzE0RUQwQjc4Mjkz
-NDQ5MUFDQzgyQTI4NEE4ODZEMjA0RDQ1RjFENTcxQUQxNDNBQ0E3Qzc0ODFGQ0FEQzIzNjZG
-OEFBMTQKREUxOUI4MjU3NEIyRkQ5RUVENzE1M0E1QjQ3ODc3RDNENTc5Qzc0RjhCOTFENTE1
-NUFGMEYzNDg4MkM5RTJDN0VCMzIwNkIxQjQxMjA5CjlFNzc2RERENEUyRTI0RkRBQTk4NTU3
-RTdDODczNDdGNTZFMUIxRDZEQjc4NjE4NDg5NjZCNkQwREQyMzJGQzJDQ0Y4OUVCQTUyNjAw
-RgoyMDg0MjMxN0JCRjRGOEI0NEFDNEFDQkZFMEE0Qjc3NzIyODIzN0U1MkQyMkRFNEEzQjhF
-M0FEM0Y4NjQ1NjdGNzg1NzUwQjIwNjRFQUIKRkY5NjU3QjM2MjJFNUQzOUY2QkFERkNCNjkw
-M0REN0RBOTM1MDE4Q0IzNkM2OTQ1NkQyQzgyRUQ2OTU0RTQwNjk0MkQwRUUzMTBDQTM0Cjgw
-MzMwOTYwM0Q3N0JENEJBMjQ4QzAyRkNFMzM1QkE5NURFQTk0RkY4NEREODA1NDI5NjZDNTAw
-MEI2MTBBNTU5MThBQzJDQTg2RDgzNwowQzlDOUY0QjU0MTI4NzU1NUQzQjEyM0EyN0E4MzU0
-NURGMjhDNzk3MEZCQkRCN0Q3MjE0QzcyN0FFNjg3RDAzNDg1RUE1NTVCNEJFREUKQzQ1ODhG
-NDFGMTE5NUJBNzUxOEM2NkZENDU0QTk1REE2QkYxNDQ0QzA2QkZFQUE3NTQ3MEZDNUE5MTk2
-NTY4QTlGQzczREIyODQ5RDk4Cjg3MUNFMDA1NTMxMjg0N0YzNzZEN0MxMDVCOTVGQjQxQUFF
-NjI5QkZFMjQxRTUyQUI5MTNCQUE1QTRGNjc1Q0RGMjU2NDYzMDA0MTYyNwpFMkE5RDhDQzE0
-NDg5MDgzODY0RTgxMjFEREYzMUM2QkU5RTBDMUYyOEYyRTQzNzE2QjQ4QjJDODUwQTZBRTRE
-RUZFNEM3MkI0M0ZGQkMKN0FEQzMwNzQzNzA0MUY5MDg3NjNCQzg3NjJDNzM1QUQyODU0RkM0
-OTY0Qjg3ODlFRDgyNUI0NjhGQTcyRDJBRUE2RTBGQjQ4N0U2N0IwCjhDMzAxMTlBREQyQzBE
-RURCMDczOTg3MEVBMDIwQzNBRUZDQzMwNkI0NjU3RUY3MjdDN0I5RDQ0RTlFRkE5RDFFOTRF
-RjQ1RjA0MzJBMAoxQ0EzNERGMzcyRDEyODY2MzlEM0Q2MjFCQkVBMEEyNzlERTE3RkFCQUNG
-N0MzNzAwRUUwQUI5NkI5MUU5QzY1RDAwMzA3QUY1QjdEM0MKQzVGRTQ0RTc0OUNDOTk3NDVF
-QkMxREFENEVFNEZBMzIwOUE4RjZCNzlENTFCQ0IxNEQxNkU3MTZFNTczNDlDQzcyNzBGNzU2
-M0REODkxCjFGNjFFQTNENTg3RTBBN0FCNkQ1RjUyQzUxQ0VFRTUwMEUxQTVCODdFNDY5OEY4
-NTg3MkE3OEQyNjhEQzU4OUVERjIzNTk1NTk1NzZCRQo2REZDMTdBQ0IzQUYyMUNDRURERTlF
-MkVBQzU3NzkyMUQ0QjY2NENCM0E5OTE2MjE0RjE0RTBFRTBBNUE3OTRGNTJBRUIyQTg1QzFG
-REMKNzU0NDhGNkU4QjI4NTgzQzg0OTk1RDIzNTM0NTk1MzlGREJEM0E3ODcwNDA0N0E5Q0E0
-RjhCRkVFOEZDNDE0RTZCQTg1RjBERjFEOTdECjAyMzREQ0UyRUQ2OEVFMEU5NkVENTcyQjY2
-RDFEQUZEMkREMkYwRkU3QkVDQ0I0Qzg1MTI5OEZEQjlGODk0Q0FEODU4QUY0OTY4Q0Y5Qgow
-MDFGQTE1QUU0QzdFMzhGRTI0NjAzOUZEODM0Q0NFRkM5NDY1MkVEMDEzQUU2RDRGQkY0QTQx
-OUM0RDFBRUUxOEFENjgxRThDQzg2NzIKNEI5RUIxQzVEQjEzRTgzOUIyMThCRjZCNzFBRUY5
-QUIyMzBEMzdEODQ5NEE2OTcwNUM0NzBBQ0I0Nzg3NUMzODgwOTQ2NTQ2QTU2OTQ0Cjk4MTYw
-MkFDMjJCMzc5NDdCQ0QxQTM2MTRGODY5NURFMzE0NzM4MzMwMkMwRjFEQkQzQTQxREFEMzYx
-MzgxRTI1RjUxQzQ5MjI5MjJFNgo0NTU1Q0E2M0IyRjUwNkU0QzFFQTdGQkNENzA3QTFDMjg3
-OUVFNEU5RUM0OEMwQUI5M0ZBN0MxQzlEOTk0MDk2MUI2RUU3M0JBMjlENDgKMDdDREQ4Q0ZF
-MDVBQUFFNzI0QUI3MThCMkYwRjNFNkM1MEY1RjUzRDlCQTU3MkZDMTRFQzYzODc4QUVDREFG
-OTkwQTdGNTBFQkMzMUE3CjE2M0E1MTdGMTE3MjFDQzg2MkY1MTU2QTY4OTIzNDg2MEJBMkNG
-RjE5RDZGQjMwRTYyNzJGOEFFOTkyNUNBNkJBOTVGNTQzMjMzQjYzRgoyRUU3NDZFREQ3MjVG
-NUYyRjUxNTE2RjFERjE0MzlGOTA2MkExQjJCMzIwNDQzNEYyQzIxODg4RDM4QTRGRjY3NkE2
-Qjg1MEUzQTY4MTcKMDQ5MUY1MzIzMTE2RUExMUJFMTBBMDQ5MDQ3MEY1OTIwNDRDRDQyQUVF
-MTc0OTFGMjU3NERDMjI5MzJFNzU4MzE5MEU5M0QxODJGRDcyCjVGRDZFRTAxQTYzQkNCMDE0
-MDE5QTY5MDI3N0U4RTQyMkNGQTRCMEE1MEZBRTA3MkUzNkY0QzZGMTQxOTNENTQ0RkJFMjE2
-QTc4QTNBNAo2ODlBNEM2RUNCOEJCMTQ5Q0I4RjZFQjZEQjAwMjk0MDlBNDhDQjdCNDU0RkRE
-Nzk2RDYzOEE3RUM3NDNBMTVFQjVFRTY1REQ5M0Q2QTIKM0RGREEwNEI4QjA0MEI4NTZCNzY2
-RkVBNDY1RTdBQ0QwNUNBQThBM0YxM0JBNEQyQjA0QUU1NTM5RDQyNEJGQTM0MjI3MDkwRkQx
-ODMxCjdFQUFBODM1MjhCM0Q0MEU1QzEwOEUzOUVCMkVDRkYyMzFEQTE0RTk5MDNFRkVDRTgw
-NzEzRkRCQ0JBQzkwNzczNDRGQTg2RDdGNzczMgo1MzVBMjZFQkQ4OUE4MDY0OUIyNkYyNDdD
-NzEwRDcyNTM2MTI3OEU3NzMxODcwMDk1QUFFQkNFOUI5QzA0QTczNjk4QTI4Q0U1MDlGOUQK
-QTFEODhFOUE4Q0VDQ0QwMjAzQzNBM0I4REJGQzU2MDYzRUNCMTdEQUU2MEMyNkE4MDgxNEY3
-MUZFMTJCMjNFQjE1QkE1NzQzQjRGOUUxCjI0RkNEQzk5RDQ3RDhBNDQ5QTRFN0JCRTdERThD
-QTM2RDk0Njc1NkREMEI5NDQzOEVFODBBNjc0M0U2ODNCNTcyMjNFQzZGMjA2MkIzMQowNDIz
-MTNFQ0UyQThFNjQ2MzYxRUU1RTI3OEVFNTk3RDc5Q0QxNkRGREMyNDAzNEMwRjJFMDNDNTRE
-REE5MTMyQjM3QUQ5M0Q1OTg2NTEKNTlEREE3OTNDMkNBRkM3NjUyODdGN0I5NDMxOTFCMDY4
-QjUyMENGQUNDMTM0RjQ3RDQ1NDEyMUVGMTc1MzA2NTY3ODc2MEQ5QTZCOTI0CkM5MEQ3QzlE
-NDMyOTY3RTRERTA2QkM1QUVFMTI1NTREQkNCRTM2NjE5QzA4NjVCMTlDOUU5MzlGMjg2Njc3
-RDQ2NDlDNjJEQzc5QUFCNQoyNEFDOUI2QThDQ0E2NkM0NkM4RUUyRTVEREQ0RTExM0I4QkMw
-RTM1Njg2N0IwMDFBQUQ5OTJGMUM4NTk0MENCMjU3MzYyMUM5OTg2QjYKMkU4MzBFMDgyM0ZB
-NDZGQjY0QUU5RUE3QTY3Q0VCRjBCOEFGNUQzQUQ2QUIzNjZFNTJENjBCNTAzNjIyMkRGNjVG
-NTA3OEY3MDIzNkExCjI1QTY1QkZDMzQ1RjZBNDAwQTgxREVFQ0QwNzE4M0ZCNUQxMEEyNjQw
-RjZEMjFEOThCOEMyRTA2NTBDMkREQjhBRDUzOUI3NzE5RDAzMApCMjIwQjkxRTE3RkYzQTVG
-RkZERUU0RDY2RDBDNDU4NkQ5RTRFREQxNUE2NDM5M0RFNjEyQThBMjA4Nzk5MUE3MjZDQkI1
-OTE3NkFFM0IKRDQ4Qzc5RjBEN0M4ODRFODMzREFCMjk0NDk5NTA5ODI1N0YzMDBEMjdDNDUw
-NEUzQURBNzFGNENEOUMzMDZEODJGQTE1QzExRkM3MDk4CjFFQ0RCNTlFOERDNTc4Nzg4MzE3
-QkJDQUJFQTc5REE4ODgyOTA3MzREQ0VCOEU1RUQ4RjdENTFDNjQxMDQyODFFRTAwRDk1MDc3
-RDRBNQo4Q0U5MDJBOEQzREI2Mjk3Q0ZCQUI5QjRFMEVGNzdEQjMyM0UzNEE1MkIxQTkzOENF
-OTUxQTE5ODk2NDBFQTQ5MzVBNDcxRDEwNzQ5RUYKNzI4OTQ3Mzg2REE1RUFBOUJFMDExN0U0
-MENGQ0Q4MDVBREMwMUVGM0IxNTI4MTlCQ0QzMzJERkU1RkFDRTE2QzIzNjY5MzcxRTYxMDgx
-Cjk0NzgzNjE0Q0Q0NkE2ODg1RTU0M0MwMDM1NUIxQjgxQUM5MTdEMDUzMjVGRDM5NUJGNjE5
-NTg3NkQ0RjQ2Q0Y3MzlENzQ4MjY1NzYwNwpDN0FFOThDN0RFNkQzOTdGNjA1NURGNjdGMTg4
-NDgzNkUyRDY4NUM4MDY0RDgzNEE3NzE4RUI0MUE4NDNEOTk0RTA3MEQ1NDg4RTI4NDIKM0Ez
-MDA2OENERjAxRjg0QTM0RUEyQzQ3QTQzNDFGQTk4QzkwMTFGQUVFNTFDQkQ5OERBQjI1Qzk4
-Qjc4QzA5NTdBMEZGRDAyMkJDQzk3CjY0MUY4NThEQzQ0NTcxNUFCNDYxMTE2QUU5NTY5NTNG
-MjA0OEZCMUE5OTBENzc1MkQzRUYxQ0I2NzY5NzU4MzY4MUY5NkIzODVGRDg3MAozQ0UzNUVF
-RTYxMUU4MERGQjBBOTkyRjg3QkVCNUI3MjRFQUIxMzBCMjU1M0Y0QjA1OTlFNzk1QzQ3NDNB
-QjMxMjQ2MEI2NUNENTNERkMKNjQ4RTg1M0MwMzJGMEE5RDc2MEYyNDFGNjE3NDcxMENEMTYw
-MkNENzhEQzQwNTMxNkIwREE0M0Q1RTJENEVBREExRTM2ODhGMzJDNkI5CjRGMDJFRTI5RUQ3
-OTg0OEM0NTk4OTExODc0MzI5NTdBMEY0MjhEMjU2RTAxNUU4NkMxMkU2ODY5NkFGQTREODkw
-RkI4NDIyNTQ4MjJFMAo3OUFBMzIwQkMxQkQ0ODBDMEEyRjI3NkQ4MzNGQjNDOUQ4NzQ2QjUy
-RUVGNEQwREMwQjYzRDAxRjYxRjk1MTJDMERGNkU5MTFBNDEyNUEKQ0VBRUY0OUFDNDg4RjFB
-Mzk1ODQzRjc2MERGMDE4MzgzMzlBQzVCNTNFNzYwRUJFMjU2QTA0RjA5MkNDRUJBRkQ5MjE4
-QURENDE2OUUxCjgyRDJGMjA3NTMyMDA4NTlBNzc2QjIzNkU2RTU0MDBDNDI1NUU3Q0REMjJE
-MUQ2MTM1NDgwRTE2NTkyRkI2ODAxNDJFNUFCQjA5QkMwRAo3QjY0M0JCRTA4ODhFRTVENUEw
-MDA4ODE1NzQ4QjIzNTZFNzE3ODEzQUIzQUVCMjBBNThDMjkxQzQ1NTkwODNFQTU0N0U2QkRB
-MDc1MjEKMzQyQUUxRDQ4OUYwRUM3RTlBQjRBMjRBQTk4Q0M0NDhBRjNBMTk4OTEwRTQ2Q0Y4
-MjlDQjM1MTgyREI1M0NDMDRFQTAwMEUwNUY0NEJCCjQ5NUE2Nzk3MzZFMUQzQUQ3ODg1OUMx
-OEE5QzgyRTlCNkRBOTZBREY0MzlEQUMxMjI2OURFMkI3NDU4NDE1MjVDNUIzOURFRjNGRjRE
-RQo0MDVDN0ZGQTMwQzI5QkY5RUE5NzlCOTc0MUREOUMwNzIwQzI1QkU0MkRGRjEzQkFEOTEz
-MjdEMTVGQ0Y5MEU3NTg4MjAxQjY0QzJFNzMKREU4MTM4NzM3RjFCNDc0MEIzQzU0Qjc4RkI0
-NTgwODE1QzVENDdBQjE4NzBBNTQ4REJDMjBEMTE4RjhBOEE3RUZBNUQ1MzgzRDcwNjlGCkUw
-QTNGN0VERTQzQUYxRTQxMUYzRTQxOUYxOEYzNDdFRDUxNTNEOUI4QUIyRUI1ODRERjJBODc0
-NzA2MDE0NUMwNzRDQzJEMzA4RkVGQgpCNjM4NDFFQUZFNTZDOTA1QjRBNEIxM0E5RkU4MEU5
-Q0JERTQyREZDRUU2QTNGNUJDOTg2QzJDNzQwNDAxQjQ1MDkzOUE2RUM0NEU1OEMKQ0JBNzk1
-NUI3QTI5RUQzREQyOEM3RDYzRkJCMDRGOEZDODI1QTYwQzYzOTlEQTc2MkQwNDVDNTE4MkYy
-NDBBOEVFN0FGNEY0MDQwMzkwCjk5NDJDOEY1MzNCM0JDNUM3NjNCMERDOTVBODM0RDFFNUVG
-MEY5MEJBRDA3RUMwNzM4MEU3NUE5NUY1N0I4QzFDNDZBMjhFRDZBNDU1QQozQ0RCMDVDNTY5
-ODFEQTEwMDY4RUIwQkQ5RUVGMEIzQjMxQTc2RjY2MEU5RDM0MEQzNzdCM0Q4QjYwNjhBNzIy
-OEY3Mzg2RDhGMEQ0MTAKMzcwMURERkNFNUY2NzhDQkY2RTcwRkRBQUJBRjg2Qjk1RTJBNzMx
-NDg3REYwNkI0RDAxMUUzODEyMEJFQ0Q2QjhDOURBRTIyQzk4QzM5CjFGRjhEMDE5RkFDNTc4
-MDY5RjZGOUVBRUVCRERDNjdBQUJENDEyNjc2NEQxNkI4OUU0RjhBOTlDOTNBOTYxQjkzMTIy
-QTREOUIzODlBRQoxQzY2NEMzMzg4RTFFN0Y5MDcxMzIxRjVBMjJEOTE4MDJCNUI5NkJCODlB
-QjdEMEQ4NTMyNDhCMDFFQjc3RTUyQjI2NDYzQUQzMTdGNzgKNDdDNjI4ODFGMjFEMjU3OENC
-QjI4NTVBQTAyQTUwQkVGNTU3OUQwOUFBRUNBRjU5ODM1RTlFOTQ5MjQ1QTFDRjUzOTgzRTY3
-Q0Q1RjdGCkNBNURCQTVGNEJBNzQxRTdFNDlDNDA2NTIyQzM4MEE1MEEzNjMzMzQyMDQyRUMz
-MkY4MENEQ0ZENzI1QzkwNzJCMjcxQUM4MzcyMkY3Mwo0QjNBOThGN0M1MTZDN0NEQTgwNkEx
-RkFGOTdDRTQ2MjEwQzQxNTNBODQ0QTM1Mjc5MUU2QUU1OTQ2MTlGNTFDNjU2Q0YwN0I3ODNE
-NjEKNjRCRkZFRDg4MDlBMUU1MDJBNTMzQ0EzQzEyNzI3RkZGNDg1MkMwOThEMUMyRjBGOTI1
-QjNBMDI5RUZCNkZGRjgwREFCOERDRjdDOUNBCkZBNUY3RDk1OEE4NTA0REJFMkU3QTJDM0Yy
-NjFENzM2Q0Q0ODk0RkUwMDA5QzZDMjRCQzdGN0E5RUZEMTJFNkFFQjREMUE2MEFENjI1Nwo0
-QjhGOEI3QzU0OTU0RUQxQ0FFOTU1MTFGMTY4ODZFNTEwOUE5OTMzRDg0RkYyNjZFQzREOTRE
-QTg5NjE5QzgyRDM3NkE2MzUwN0NGNEUKMjMzQkM3MEJFMEQ2NjBCNkVCNDcyRjRFQjZCOEQ4
-NUM5NjEwOEM1RDAyRDBEMzlBNkQwMjQyOUQ2MEQwMTBFMUMxM0E4MUUxQUIwMDEyCjlGRERC
-MUMwOTAwRUFENzg0NUIzMEIxQ0M3OTU1MjBBMzQzRTBGQUI4QkNFNEQ5RjY0MkVDN0Y1MTg0
-NkY1RkYzQjg3RUVDNDA0MjNFMQpBOTE5MzFGREY3M0JBRkRGMzgzRTU1QjI1NTU2NjY3OTk3
-OUYzN0UyNTZENjA2MTIxRjBDMzExNkJFRTAwODk3QTdDMUMyOTgwQzc4NUUKQTM3RTA1RjJF
-MzA3MDE4MUYxN0Q4REY5QzEwNDAyMjE5NzBGNjI4MjAyQURGQkNFQTZDQ0VDREE2MTYzN0U0
-MEFCQUQ2QjBGNjM5QzIxCjczNTI5OEYzNUVBQkQzN0ZBRDMxMjYyNDczMDlFRjk1NzBBQTRE
-N0YyQUZGOTU5ODk0QzA4OUQ3Nzg3OEVCNUQzNzA1RjhGQ0I3NDhBQwowMENENzc1MzVCNjcy
-RkZEMzZFMTYyRDg1MzcwMTM5QzBGOEU3NjQ1QTY2NUMxRDIzQzZDNDVDMENBMDZBODlGMkNG
-MkYyM0MyN0E1RkQKMDcwRjU3NTQzOUE1RkY4OEQ5MjM1REY1NzlEODU0OTYyRTAyNUMzNDcw
-NzcyNTZBNUY0REQzQzVGQUUxMEE1QzI4MDFGOTNDMDhFMDIyCjk2MDBDRTVDQjAwMUNCRjcx
-RTgxM0UxMTZDNTYxNDczMDQ5NzZDQzI1ODAxQkMwMjM5RUU2RDEyQUYyRDJBMTBFNzI4QTRC
-RUMyNDlFMApCRTUzNDIyNzJGNkE1MDgyNjQyMjZDQTg0NzlCRDk0NkUyQkVENDA1Mzc5RDA3
-NDhENEE3MDdFMEVGRjYxNzVENUU1NzExN0EwNEZEOTgKQzAzNDA1MzgxQUY0NDMzM0ZENzM0
-NkREN0Q0NkY3MUNGNUFBMUE4NzIwNUVFRjhEN0IxQ0NFOTcxRjlCRERBNDY3NjI5QkUxNTU2
-Q0E0CkZFNDc5REQ3NzM4MEYyMkU5MzY4NUMxMkQ2NDFFQzMyMjdGQTk4QzkwRDkyNjVENzUw
-NEI3Q0RCM0NDRDA5MkY0QUUwNDg3RTg5Q0E3NQpEQzAxN0RBRjlDOUM5NDc3OEZERkM3Q0Yy
-NDE5RDMxN0FFRjJENzA4NTdFNTI3QTVGNDlGQTI2RkYzRUU1NzdBMEE0NEVGNTQxQzdENjQK
-MDYyRjdERjNFRkJCRDBGRDdCQTYzRjVENEYxRkZGNDAxM0YxNDkyMTU1MjFGNUU5MTA5MjU1
-M0YyOTczRTBCRTFBRkY2QjU4NzZFRTYxCjNBMDgxOTE3QTQxOTgyOTI0NTVERjdBMzM3OTU0
-MjM0RTJBNDQxMjc1RTVGNEE0N0VCMTlCMzM2Mjc3OEJBNzA4Nzg4NDdGNDc4RTM0MQpCRTA5
-MjU3REQ5ODIzQkIwNTg1MTJENTg4RkE4MjY2OTExQzU4NDZFQTVBRkM4ODY1NDk1Mzg3MjFF
-NDc3NUVFQjgzNTRGNjRFMjBEQUQKNEI5MTI5QzZFOTM3MDI0MTQwOEJBNEFFMUUwOTA1OUEw
-RjJDNUU0NDQzRkFGRkM3NjJEMkVEMkNBQzlGNkVDMjQ0NjY2MjEyMTc4NDQwCkEyRDMwNzRB
-OEI1RENCRDgxMEZBQzUxNjI3QTgxRkM5RDQwRkMzMjU4MUNDMUJBNDM4QjUwODY1MDUwNzY1
-RUFBRTFGMUU5OUMxRDg5QQpBNkNEMzgzOEE1NDU5RkJGOERFQTIwQzk1MzE4MDFDMDM3RDUy
-ODhGNkNFMTlBQjgwNzNCNTk1MUQ3Njk5RDNEM0M3RjkzN0I1QjUyMUEKMzVBRTEyNzkxMTAy
-ODcxQTBDMjdBQUVGOTYzMTE5MjE4MkE1QzQwQjlDODM5NTlBOTYyMDc4MDJERUU5MjYxMUZG
-Mzc3ODY2NERCMUFECkQzMDlCRkFGNUVCQUFFNEI4QTRGRjAwOEMwQkU0MkYxMTUxRTlEMUY0
-NjBDQ0YwMThDNDI3MDNFMUEyODM2Q0NEQUJGMjZCNDc0NERFRgo5RTExMUM0RkI4MUZFODlC
-NEI5QkMxNUUyODgwODU3RUIzNEIyMTk1MkM1NUY4QzYyRTgyNTRFQzMwMEZDRTFDRDVENDY2
-NTdCOTAyQTEKRDgxQUNEQUU5MkU0Q0NEQkU0QzM5REY3NDdCRjlDRjhCMUNGQTMzMTRDNDUz
-RkRFMjNGNTJFM0FCMUFGRDY2QUZFMTJGNkRENTNGQzVBCkYyMzZGMTIyOEVFQzlEQzhDOEFE
-RTgxNzMzRDZCRkFCQTY2OTg5RURDNjc2MjQ3NUYwRTcwMjI4MDA5RDEzMDFERDVBQzY1ODNC
-RTEwOAozN0Q5MEVDMUQwRTRDNTQzRERBNjY0NTk2OUZGMzRDN0JBMjFERjJBRDNCOTUyN0VC
-MTA0QjcwNDk4RUU5RTYxRkZGQjJGQjM4NDM0MDQKRjhEQzMyMkM4OTQ2MzU5NDY0QUMwNTcz
-NzBDNzZBOTBFRDNDMDI1NEQzOEVGQjUxNkI4Qjk5RTE1NjA4NTdFQkI1Q0I4ODU2NkFEMjY5
-CjU2NjUyRjFEMzM0RjAxRkM4RjAxODU0NkE3RjQ5RkQxNzEwM0JCNUVGMkE2QTNCNkMyNkY5
-Q0VCRkZDNzQxOUQ3MUY2MkFBNUIyMjJGOQo5M0VCNUEyMjdDNzNFMzEwQTNGMzRDMTlBM0Y3
-Q0U5QTEwNTM2REU1MEJEODFDNDExODIyMkMxNjNEMENFQjhBMTZERjZCNEVCRjJCMDYKODQw
-REVEMDgxMDZGMjhERjkzRTMzQUMyQzQwNzVCNDM3MjM2OTBGOUM4OTBENEY5MUNGNUFDODc0
-QjRDQTdCQ0UyRjI5NjJFNTMyNTI2CkY0REFCNzQ0RjgzQ0Y5MDVBQTQzNzdCRTZGMDU3NThF
-QjQ0NjEyQkNCRDUyQTU2OTJCNjBCREUxMDU4NkExMTEzMDA1RDkxNUE3NERGQgo1RTQxOTIx
-MEIyRTVBODZFNTgxNEVEMzRENURBRUQ2RUVDMzgwMjg1MTE2OTYxNUI2QTI3NDRBNUJDQkE1
-QjY3RTkzM0ZFMkQzRDczOTgKMDU2RDdBMzE2QTRDN0QwQTc3OTA0MDVDN0EzRDA1MTdFMTc0
-ODMxQUE3OTgzQTg3RkJCNEM1RDI0RjJERkZCRjg1NzdBOEIzMEEyMDlCCjI3NDY2NzMyRjYw
-MEI2MEZGNTAzQUU1QkNFRjA4QjI5QTk3MTVFREQ3RUJDM0RBNEUxNTIxOEI3NkQ4RkQ2MDY2
-NEI2MUUyQjY4MkIxRgo1NkNFNEI1QjEzQUMxQjBFQTRFREQ2QUQ3NzI0NEFCMTY2QUNDMjNC
-MTAzNzkwRkNGMzJGNDFCN0MxRTE1RDc4NkE4NUJEM0I4MUE0NEQKMzc3NDM4N0NGQkQ0MUI0
-M0I0Njc4QUY0MjE3NEVENzZCOUM3MEY0QkMxODNEMDFDNTI1RUNBNzU2MEE3REMxMkUwODA0
-RjhBNkZDRTA1Cjc2MDM2MUI5MEExNTY5MTVFRkI5NUNGQzU1QUQ0REY5OUQ3N0E2NTM3Njg2
-QTJBNjBEOUY5MjZERDlCQTNGQkQ4QjY1MUQ1QjY5QkZENQpBQkVEN0QyQzhCMzI1MzlENzUx
-MzQ2MTU3NjFGQUY3ODNBNkVFNEMzMUI0NzIwNDgwOEM5MTU2QTZFQzJENzAwNDlEQjM1QTcy
-MDc0NDcKQjM0NkRBMjQzNURCRjQ2QUY3QjI0QzZFNEJFMUI3NUIzMEU1RjY4NjgzQTAzMDUy
-QjA1QkIyREQ3NUE1MTI3Q0VDNEZFMTEyODRGMDNDCkE5QzQxMDJBOUJCMDEzMEVCOTk5MzNB
-NzQ3OURCNTk3OTYwNjQwQTNFQjkwQkYwRURGODlEOTNBOEI3MzkyMUU5RTdDNEY3ODJFREZC
-MAo3MjMzNzcyRDIzNDNEOTBFMUU1ODFGRjIwRjUxODFDNjdFMDUwQTE0QUU0MEVGQUExNkZD
-RDYyRkQ5QUFENDE5RTMwMUQ2ODkzRTIyOTEKOEJCQTMxMzQ1QTlEOTQ3MjA4RUEyMzkyNEI5
-MjU3RUU3NTNBNzEwNEU0MUVBMTBENzJCNkU3MkU1MDcwNTNBRTM1QkMyMEFFNUYzNjlFCkIw
-RDc4MEU1Mzc0MDY3ODBBNTVBRTdDMTEzQTgxRjRFMTAwOEZBRjI3NkY1OThFMjc2Mzk5QjRE
-RjExQUZFNTFDRjhEMjJBMzVCMUJDRAoyNDdEQTcwMzc3Q0JGN0E5NkU4RENFQzE5NjU4Rjg4
-RDZBMjE0RDNGQUQzNTZCQURDNjUwQTQxQjM2RjEyQjExRUM5QjE0OUZCNkE0OTEKMTBERUYy
-MDNCOEY4NjcyRkNCQTMxNzk3NEYxN0VCQUYyQzgxQ0IzOThBMDZCNjJGNjM1RUUwMTBFMTk0
-QTM4RUQ0QUIzMEM3RTcwNzlDCkFENTFFRkJBOEUwNjlCODExQTM1QjQ1OUIzNTM3RDY4MDFE
-NzQ3QkZERUM1Rjg5RjQ2NUZEMjk2Q0UzOTZGODk0NDkyMkQ1RjgyQTEyQQpBREZBRTM0QjZE
-NzIzODI4QzhBMzAyOTJFOUU4QUQ4RkI4RDk3QURCRDlBQjIyRTVFNDU1MjNCREZGNEMxNzIz
-Njg4MTYzQkM3RUNEREYKNDQwNTJCNjk2MTY3QzBBQ0ExQjRBODExMzVFMEI4MzdBQ0NEMjJE
-QUJCNURGRTQ2NzY1RUQ0QkMwNTU2QjdGQjI3MjM5ODEyRkQzMDg5CkZBNDgzRUFFNjBDMTBD
-RTZEM0I4RkIwQUUzM0YwNzAyMkY5NkUxQjk1REM4MThDNjdBRURBMUQ0MUJFMTE3MTI1NDhE
-MDU2OEEwNjJCNQoyNkE0NTY5QjlCQjVGNkVBRUMyRDE3NkY5MjRBQkZDOTk3OEUzQUZDNDI3
-RUIyQkE0NkM3NjhGODNFODZGM0I4MTc4NzA0RTZBRjRBRDIKRUE0REY0N0U4OTg5RjMyN0Q4
-NTgxMjc5MEVBODg4Q0RDOTIwRDE1QjgwRTUxRjdDRkM0NEExMTg5MTI3RDJDOTQ2OEQ1MDIz
-MUNBODA1CjAzREYyQzIwMDdFRjI3REE5QzQ5OEM3NzhGMzgzNzczNUVFNUVEQUM0N0Y0QTAx
-QzJBMzkxQkUwMjMwMDQxNTY2NTIzNDlGMDYyQjFFQgo1MDRFNUFCQzgyMjgyQTQyM0U0NzM0
-MjAwMjAwOTc3MEQ2NDZFQTUwRjkzM0YwQkM1RTYxNDNGQTRCMTczM0RGQzZERjZFRDdERTZE
-RDQKRkI4Mzg4QzdDQTgxQzkyMTBFQTBBOThCMDI3NUI3NEEwRTBGNTEwQzkwREY3MUM5M0Iz
-QTlGREI2QTg2REZGMjkyMTM4MjM1MkM4RkVFCjFBMEEyRTYwMDNCMDA1NDY1QzFGMzFCNjY3
-RjVCREQ5QUNFNzQ1MzFEMEZERDU2Q0VBQkJCRjVFMEE1NTYzM0UyOEY3NTBBN0MyNTcxRAoy
-N0ZDQkUxQjAxQzM4N0Y2RjM2RDIyNUEzMEM2OEJEMTg1ODQzRjQ4N0MyRTk4QjU2MjlBNjI4
-N0NCQUYyMjY3ODgwQjJGNDg1OTYzMjAKRDdBMUVDODdEQ0U1QzUyODNFMDM0QUY1ODJGNTky
-QjdFMEIxODUyMDlBQjA3NDgwQTk4RTY3NjYwM0Y3RjkyRjk2RjlBRTZFQkU4MEE5CjVFNjI1
-RUY3RjRCNDY5NDU4QjJBN0RBQTRCOEZBRTkxMDM2NTI2NjNGMzUzQzM1Rjg4RkZGRUM0MTI5
-NjgwOUQ1MjEwNEUxRDYyOTk5OAo3MzVFMUNBNEQzNjQ0MkJCOEJENkMwMkVFNkUyNzM3NEIy
-NUNCQUU5NzA1MUZERTdFM0VCODFFQTdGNkQ4Q0JEREE0NUYyOTIzMjQ1NkQKQzFDNzBCNjA4
-NjlENjNBNTA5RTlBQTMzREQwMDE4N0JFRDVBQTEyMkFDOEFDQUU1QjVBMDJDODVBNEMwQjY4
-MTkzQjJGNDM1NUVBNzc5CkRGNDRGNDg4MjcyRTkyMjk3REYxQzhFN0ZBRUNDNEVGQjAzMUUw
-MjMyRUMwMzJGMUVDRDRGNkMzN0I2NzA3QTI4RjFDRjlBMjY4M0ZDOAozQjk3MjVGMTk0OEQw
-MjA5MzEwNjVDQjUyMUIzNDkzNEQyQ0VGRTk0NThBMUNDN0VDNTUyOEExODNGMjcwQUFDMDhD
-RTgxODRCOTA0ODIKNjIyMUNCQ0E0REFGRENFODgwRDM5MUQ2QzREODI4OUJCNDVFQ0M3M0M5
-NERFQkFBQkJDRkQ1MjlFRDlCNUZFNTVFNUQ2QTQ4RUIwOTY5CkVBMDNFMTVCOEQ3REE4RDU0
-Q0IxNUUwMzcwQzhFMzlDQjgwMTU4QzZCN0Q0MEMyOTUxRDczMzQ1QkYzRDgyRTQ5Qzk3NkEw
-RTkxOEIxMAoxQzIyRkZENTUxQzY4NUEzQzdBRDE3REM5OTE1QTgwODE1RUIxMTQ1NTBFOUJB
-REZBQzJFQUQxN0MyOUQwQzgzNDg3MUNEODg1NjNGOUMKQzJDRDhCMTkwRDAyRUUzNDZBODJD
-NTM3REYyOTk5NzIyNTg0QTk1ODQ1QkIzNjdFNEY3RDY3NUZEMDY3REM0MkZFRDU5NTQ3M0M5
-QjU1CjE5MTFBNTRCMTRERDEzMEJDN0NBRDc4QzQ2OURCQTk2NjA5NkZBNjlGQjkwMjdDMTU0
-MkI4Qjk1QkRBNEZDMjI2ODNEQUYyMkM4RUJBOApFMzU4OTI5RUFFNkMxOThDN0Y5NzMwQzVE
-M0JBRDYzMTk2NTE1QzRCRUFBRDI3QzI2ODQ0Mzk4QkQ2NEQ3NTBCQjA2QTI0MDM5N0JDOTEK
-NDkyQUNFMERBN0Y2MDUwQkJCMTU3NDBEQ0JCRkMyREM2N0NDNzQwQUU4RUU5MTUxOTI3MTVC
-RDQ3MkE0NUJCRjMzQUE1RTNFOTNGRTZGCjZDMzlFMDlEOEVGMzA2OEQzRTdEMkJFNzY4NjMy
-QjZDMkYxRjJCMEYwODg0NEM1QkQ3QUYyRUZBNkNFRDI4NTY0Njc1MEY3MEVBODE5QgoxOEIw
-MzcxQjNERjdCQzREQTJCOTBFOEZGQjlFM0RDMDY2QjlFQ0RGMDFBMDJCREJEODgyQUI4OEVG
-RDdGQ0YyNDY3RDRCOENDMzIwMjQKMUZENjhDNkM5NzQyQzVFMjUwQkE2NjJBODU2REE3MTk0
-QzBBREUzNkJERkIzNjU2MkMyOTEzMkRFRDNCQUEwQTg3QTc2MTY2OUNFM0IyCjU2RTExQTZD
-QzQyQkRDNkYwQUUwOUY4N0MwRDdGRTY4OEVGODk0OEY2OTIxMEFDQjE0OEE5M0Y1OUZDMkVG
-NUIyMUI4RTgxQjcxRDE4NQpEMzdFMENGMzZCMkYzM0JCRDc3Q0QzNjA0N0U5OTg4NzA0QjA2
-MjlGQ0FBMzE4MDAwQURGQzRCMzcwRkE1QjIxOEExNjFBRTdBOEQ5OUIKODg5MDcwMjlCQzgz
-MTM0Q0U5RjkyQjIxNzM1QkExNUYwRkU1NDdFQTc5RjVCMkQ4Q0M5NkQxMEUxQjAzNzNBMTNF
-RDE4NTAwRUVGNDYwCkRERjJDQUVDQjBGNDRBNEY4OEE2MDkwRDY2MEU4NzlBQ0MwM0ZEODVC
-NDkwOTA4MkRERkI3QzkwNDI4RTJBOUZFOEI2MDM3N0REMUVDQQozRDA4ODVDNTQwMDQ3M0NG
-MjEyREZDMkVGMzA5OUM3M0EzN0IzODg2REE4QzEzOUZCRUZGODQ5MTE2ODdEMURBOTYzRDBF
-OTY5MEJFRTMKRjE5MUE1RTFGN0I5RDNGRUIwQTQ5N0FDQUNFNjhENDI2NjBEOTRDRUE1ODI1
-QTE5QjY1QzFBMzk0Q0FBRUI2OEJFRDVCODg2Rjk0RDcwCjg0MDdDNkRGRTgxODQ0OEE0OUFD
-M0E5QkUxMEM4OTkxQkZBNURBM0M5NEJGNjA4RkVDQ0MwNjA2QkY2QUEwRjFFRDFBRUZFRUFE
-RjBBNApENTIyNjUyM0M0QzZBNzdGMEZDOUE2QzczMTg4MjZBQjhGQTI4NjMyNDIyOEFCQ0Qy
-NkQxREYyRkZGMTY1MEJENzE4NzlBRTVEOTIzMzcKRUI2RUFCRjlBNTk5MzA4ODk5NzUyMjE5
-RkY4Qzk3Q0E3MkMxMTI0NkREMTExRjM0ODY0NkYyM0E2Mjk4MEY2NDQ1RENDRkUwMzVBQTRD
-CjVCMkU5NzNBNzg3RUY4RURBMjYwQkY4Mjk4Nzk0Qjc2RkVGN0Y2Q0Y3OURDQTkyM0Y5QURD
-MkIwNTI0RDlBMkQ0RDQyNjlFQTcwOUMzOQo1RDc1RTNGMjNGOTJGRkRDRjdFOEJGODY5MUQ1
-MkRGMTMzMjk3RTRBRUI5QjE2NjhBQzA5NzQwOTQyODQxMUM3ODg3NDI3REU5QzAzQUMKMUYy
-MjlCQjk4MzMyNTI1OEUzRDM2RTkzRDMwMEYzQTMxRTFCNDg2MUExQTMxRDYxNzMxMzU5MDQ0
-RkIxMDc2RTk4QzJDQUYyNEM3N0QyCjQ1OTM1NjE1NkUxRDk1NzBEOUI3RjhFRDMwRTE0Qzk1
-RDg2MzhBRjU0MTBFQUUzNEM0MUEzNUU1NTI4MDIyNDhEQTkyM0JFQUExNTNCMQo0RTYyNzM1
-QkQ1RTA5RTIzRTU2MTZGMTBGNUI2NkZFMUQyMzhFQTU5RTI5M0YwNDU5MDQzRTQyNTM4RTE3
-QUVDNzZCQjA5QzRBNjM1M0MKMzBFNEI3NTZBODlFNDBCOUQ5Q0E2RkUxRDQwNTY2NzY5Q0M2
-RkUzQjE0NDI4OTk3RUQ0QTI0QjIzOTYxRUYyMUE2MUQ4NzlBMjk2N0RBCkNGRjkwOTE4MEY1
-MjYwNEFGOEM0QkQ0N0Y2QTk0NzRDNDJBNzUyODYxRTgzMkI3QjkzMTYxQkMxMjI0Qjg2NzNB
-NTNCREM3RjY2M0JDQwpEQzcxQTlBQ0FBNTk0NDg2NjA3QzE4MEMzMDM4NDg4MUMzMjQ1NTQz
-NTc2ODVDMTQ5QTBEOTZBRjZBMzdFNEUzRDIwRDUwMjFGMTEyMzgKMUQ0Q0IxRjg2NzQwMzUw
-NzFGQzYzNDYzODA3NkMyNDgwQjBFQUNEMzA2QTYyRkQyMkVBODU5OTAzRjJGMzBGMUY5OUM4
-N0YzMjQ1REZFCkE0QUI1MTQxRDI4MEM1RUVBRTY5RjQ0RDQ3RDM1OUEwMTFBMUQwMUZFOEJF
-QUYzQjQzNDc4RjhCNDdBNEYzNzUwODg2MUEyRERENzcwOApCOUQ0NzQyQjZGRkExNTZCNjRF
-QkMwQ0Q4RkY1NjI0RkI4MDkwMkRDRTU5Qjc4MDZBNDNDODYyMDA2ODY5RDBDRkNBM0VCMTM0
-NzM5NTIKNDkyQ0ZEQURFMUU0NThBNTVEQjA3OEIxRUY1OERDNUQ2QzMwM0VBQUE0MTVGNDNE
-RTlGMTlBNTA4MTQ3RkFCRkZCRkFCNjk4NjJFNTI3CjE5NTIzREYwMUJERjIyQ0E3NzlENTg3
-MDU1RDM3NTM5QkJGOEQ4QkQ2ODUzRTRFNjk5RTY1RjdFQzZFNUQwOTY2MDFEMDkzNDBCRDEx
-NgozODU0NEE0NUFENkU1ODY2M0ExQzQ5NURDQzFGQTc5QzgzNTFENjlEMjk4QjQ5ODM4MkFF
-NDcyNUYxOEY4NkYzMTVDNTg4QkVEOEJGQ0MKNjY1NUNGMkU0QUJCNDM5MjgxRDE5OTk5NEJG
-MjFFNDdBMkU4NERCRTM3RDM2MzdEQjMyRTk2MUI1QzQwQkVEQjM0NUM4MjE5N0QzMjRDCjM1
-MEJDMzQ0RjJFRjkwRTZCNDk2QkRCQzFCQjRBMzU5QjcwNjMzQjBBMzUwNzZGQjg2QkUxMzQz
-Q0JEMzlFNkRENzc2NzFBRjY3MUNGNAozNjRDMUNEOUJDN0JDMTUxRkMwRkVEQjEzNzkxMUNB
-NTkwRjM3N0IzNTk5MDA5OUFGMzc1NkMxRkYyMTg2NTZEMTc2OUIyRTVBREU3RjcKNTcxRTcx
-MzJDRkJFRkI2RjBCQ0Q5RjQxNjRDMzM3MzhDQTYyOTM0RTEzOEVFNUE1RkE1RTgxQzNDMUUw
-NEQxQzFBQ0NBRUFEOEQxNUFDCjRGQ0JCMEZGRUJFNTc3MzQyMjcyQThCRTVGREU2MDY4MzBD
-MDI4OUFEQzQxNDE4QzcyODJCMENCNTIzNEQ4Qjc1RDY2ODgyM0EzMkI3MwpFMTQwMjI4RThF
-ODAzMTE1REYzOEQxRDYyMTM3MThCRkJGQ0IyMkIwNDA1MTA4QTVDOEJEMzAwOUQ2MEJGRUVE
-MUIxNUU3QTVEMjFGMTEKOThGMDkxRTExQjgzOUMyQkE4MDlBMjI2NTJGNTdCMzAwN0RFRTY4
-MjdBQzIyQTk2NTU2Mzk0Q0Y5MDUxQjkxQjFDQzQyQTIwRUFGQjhBCjJEM0Y5NUI3MDkwREE3
-OUFBM0Y0MzQyMDQ1RURFMjQ3QUM2M0Q4RDgwMDZGRTRDMkE2MTdDOUIwQUVCRjI3NTMwNDI0
-NzM3NjJFNTA1MAoyMDYyNzQwOUFFOEY5NzVFMDU0N0MwN0Q0MTQxMDVBQkZFRTQ5Njk4NUMz
-NDIzRTFGM0FDNzEwNzZGQUFEOTc3ODNDQTQyNTA5NTFBQjMKMzc5QjQ1NjJGMkE3NzQ0RjQx
-RkM0MEUwNDVBNzk2QTNDNzU2OTgxRDdGMzVBMzhCNkE1N0MxMkI4Rjg3NzJFRjA3NTM1OTFD
-NjVGNjMyCjcyOTczMkVGRTdGMDUzQzI3QTREQUM5OTA3RkVCQTA0MDNDRThBOTAyRjcxQTI3
-OERFOUE1NjE2NDYzMjU2OTE0QzFCRDExN0E2NkI4RAo2MjkyOEEwMEI3RkJCNjZFMzMyOTlE
-NjczQjY4MkJEQjZBMzA3OTBDMkEyREQwNkYzRDgyRTE5Q0Y0OUMxQjlDNjc2QTQ0MTNDRDRF
-NzAKNzE4RjkyRkMwMDg5QTcyNTcyNjhGNzVDQjNFNTNGOEQ0NzgxQzM3RThENUUzN0QyQzkx
-OUM2MTlBMzNCNEM3MTQxQ0E3MTA3RDFEQUM3CjY5MDE2MzU1Qzg5QzFERjJEQjc4MjcyM0I3
-MTM1N0NDMEFGNjc0RjBGMzZFMTg0ODUwODhBRDA4QjhCOTk1RDVBOUNERkQ1MDcwQ0VGRQoz
-NzQyNEMyOTA5QTM4QkQ2NkRCRTY0NDAzOTZEMDJEQzI5ODBGMUMwMTNFOUMyQzE2MUY5MjdD
-N0I4MDNCMzRFQjdDNTdGQjIzNDlGQjIKNzg4NTE1ODg1QjdCMkU1QkNDNzAwMUExMDhGQkQ0
-NzNGMzQ4MTBDMjc3NEU1NDkzNTAxRkEyODgyQkE1OTg1RUE5QUU4NEFEMDc2ODA3CkFFRkVG
-QzgwODFBQzhCOTlGODgzNzE5N0VFQkQyRDczNEVGNzgwODZGMDIwMDkxRjQ0MDQ1ODIzQ0Y3
-MDQ2MkE4NTZDNTkyMTU4M0RCNgpCMjA5NDczNDk0RTc4RDFEODFGMjg1Qjg1MDA1MkIxNzg0
-MzczREI2MkZBNkNFOEVERkI3MEVBQ0U0QzJBMDFDQ0E5QkI4NkVDNjFFNTQKNUU0Mzk5NDY2
-MjMzRjc3MTQzOTJGNTNFQUY4MjM3ODhFN0Y0NzVFMDY2RTcxOEEzQTU0QTgxODA1MDU4QjMx
-MjQ0NzM5QjlFM0Q1QkFFCkQ4OTY5MDFEOUYwMTRGRjYyNzI4ODQ3QUI3MTlBRDJDQTMzMkQ5
-OEY5OTUzMkQ3QTkzQzcwMzAyNzFGNUJBNTIzMDA5NUJFRTgxMDZBNwpEMzNEMTZEMkQzQkQ3
-NjA2NEFEMjY0MzE5MjJCN0NGNDMzQkNGM0FGMDJDNTNDNTlEMzk4NzI0NzgyMjdFNjQ1ODI4
-RjJGRjFDNEIzQjUKOUJFRDlGODA2MUM3NEY3OTM0OEFENjM5QzRGM0E2N0UyN0ZGOTk5NTlC
-OTA5RTNBRERERjk4NUI3MTkzNTlGODAzOTM4Nzk4RTM2REU1CjY1NTQ0OEU2NTQ3MkNDRTJE
-NkE3NTM3QTVGODU1QTUwNDZDNUQ3QzY0RDc3RjYzNkUzMTg1OTJCMzA0MDk4MTExMEU2NjRG
-QUJCNUZFRQpCOUIxNEM0OEQ3NEU3QTQ1ODIyNzREM0JFMDdFOEQ2N0MyRjI5NEQyNTkxNzk2
-QTI4ODBDMzI1MzA2MEJBMjZBRkYwMEM1MDNENjE0REYKNzJCRjhCOTFFODBFNzIyQzVGNEY3
-NDk2QTE3QUQ2QjUzNTdERTAxQzVBQzgxMzZBM0Y0QjdGNzIyRDA4RUFGQjM0MTlDQjc2NjM4
-QTI5CkJERjI0MkJDNkVENEZCNzEyN0Q3NkY1MUI4RTc3ODUwQzc3QTNEOUZGRDk0RTgxNERE
-MDcyQzZBQUU5MDFGMUNCOTk5NjFFNzkzMjRENApBRDBEOTdDRTAwRjdBNENEQ0NCRkQ3RDVB
-OUE4MjI3MEIyRkM3RTg4NzU3NzQ3RkVBRkU5MTdBQ0M5QzA3NTA3RjJDODc1MzA0NjVCMkYK
-N0JFM0I2MjA0N0YxMUVFQjBGRTc1MTNDOUE3RUNCQUVGREI2NzhGMjk1Q0JGN0I1NUNERDA3
-RkRDMTFBOTc2NEEzMUMxQTc3ODg3RDNDCkY5QzEzREY3RDk4N0U3MjVDNEJEMUU3RjgwQTg0
-MzhGNTRGQzM2NjhFMkNDQUU0MkE1OEEwODM1NDgyNUJCODdCRDE0MjRBMTkxOTk3MwozQjQ5
-QjZBM0E1NDY3QjNBOTlGNzBCNjNFRDM4NTQ5MTY4REQ1RkVGMEE2NjIwQkQ1QjgwNTA5Njgz
-NzdDN0VDQzRERjZBNDNDODUyQzUKNzIzMzlDMEU1NEY5OTU0NzI0MEFBRjk0ODdCNzQ4Q0E4
-N0FCMjI3OEIxNjIyOTE5OTE1NTZERkRDQjU5NUMyOERCMDVENkQ1NTEwODI0Cjk2MTNEQ0FE
-NzE0NEExRUM2REEyNTlFMTZGREFDRTcxMjJDRTFBMTcxRkEwMzQ2QTkxNTVCMjVEQ0E4RTZC
-QTczMDA0NTE4OTFEQzIxQwo3REI5MkUzQUQyMTgzQkI0RERBNzBDNjY5RjFGNTVGQ0MxOTFC
-NTk4MjNCMDE3RTU1RDE1RTlDMEVCNzk5QkJBREJCODkzNUFEOTBDQkQKRkJBMTU2Q0I1MDNB
-MjMzM0E0RUJBOTJDQTJEQ0U5MkM1QjY4N0E0RTQzRjczQkI3RjA5QjYyRkE2QkU3RTE0OTUz
-MThDRTRFN0JBMzQzCkQwOEE3Q0I1M0UzMkIwNUY2M0Q4MzZEOEI1NjI5NjUxQUE0QzJEQzY4
-QUYyRTEzRjQ5Mjc2NDUwRjY2QjU2QzFFRjI5OTYwNENGMDkzMwo0QzdCMTU0QzkyM0Q0MTA3
-RDA1NUFDN0VGMEYyODQ3OEZEMDZDNTRGNjYzQjE3MERENThBNDFGMjkzOTA0RUM3QUFGNkM4
-RTRERkRDQzMKN0IwODcwMkJCRDhGRkIzM0IwMDcwNDRBQ0VFN0FDRTM0NjRENTQzM0E1M0FG
-QjZCN0VFNzU0Q0VEODMwQTFDNTQwRUI1Nzc4QzIyN0M0CjVDQzdCRkI5NDg1MDU0NERFNkMw
-RDE5NjA4NzQ1NzQyODRCMUQwMjU2QkZCN0U1NDgzRkRFREFGMzFBQ0Y3ODIyQTJCOUREMjdF
-QTFBMgpCQTg5MUQ3MkM5QUUyOEYwNzQyMTFENTI4NzU4QzZFMTY4RkJCQjEyNzQxOTkyODlB
-Q0EwMzdEMUE2NDFBREVEN0YzMDBBNEIyN0M5NTQKNjNCRUY4QTlCRDQ5RDQ5NjMwMDY1NUMx
-QUNCNzBBMkEzRkY4OUUwNjVCRTc5RjVGMjkyRUM2RjZCRDZGODk4N0I3QThFMkY2NjQyRTkx
-CjE4QUJBQjcxREM3MDU5ODFDMzBDNTFDN0ZFNkExMDgyOEE4RUZFRkM0M0VGQ0JCNkJDQzVB
-ODQ5MkUwMTY5RjAzNDkyOTY4RDdGMEVBMQpDNDMzOTUxOUVFMzZBMUU5MTAzNDY3MEE4NUIx
-OTNGNURCNjAzN0M1OUI1RTQ2MTgzRkZFNDY4QkRDQjc5NDkxOEJCQzhBRUIyQkE3MTUKMDkw
-OERBMEI2MzY1M0MwQkRDQ0Y4MEJCNjRGMzZEMEU1RThENDY4NUI4MENGQzdFM0U2RjREQTRG
-REQ0QkI4Q0E4REU0QUJGMTY1MDNCCkQ5RjZDM0MzQjZGOEY5Q0IyOTJDOURBRUZDQzY4RUZB
-QjE2Mzg4QUZGOTIyQjMyQjUyNTdCMDMzQzlEOEZDMDc4QUQyOTZENDlDQjhBMwozQTMyQUYw
-MUZDMTkyQkE3OTJDM0ExNUU2QzVCN0E0QUZCMUMyRkIwMERGMTgwNzYyMjk1NTBBREQ0QTk5
-MTAzN0M1RDkxQjdDRkQ0QTMKNUQwOEU4RkE4NUQxNkNDMkM0OEYzRjMyQkE4OTRDQ0JBMkM2
-QTNGOTY0QkRDQjhCQzRGQjkyMjZDN0Y4ODk5OTAwQzI2N0M3MEUzRUQzCkMwNzk3RkQ3Mzc3
-RDMwNDRENDNDMEU4MTcyQkIwRkI3NDZBNzA2Mjk2RDcwQ0QyM0E1Q0UyNTg4NTE1OEM4M0ZB
-MkM5RjEwQUMxRTBCRAo4Qzg4REQ2RDU4MTI4OUNFMTRBQTg4QjEwMkE0N0Q0RTUyNTQ2RUM2
-RkZFN0U4NDUwQUZFM0YwMTcwNkIyRTNBRkREQ0NFNERBQUI0MzEKNTYzOEUyOEZBNDY2ODQ1
-OENBQjI0NjY3NjhDMUYzRjg4ODFDRUE5RTlBN0VENTdBRTdBRkI1M0RDNTkwRTYwMUFEMTFF
-Q0EwRTVDQjJFCjRCRUE4OTVGNjI3MUI4NzVEMDlFREI5RDVCOEQ5MjY0N0I2Nzk1NDgyNEYw
-QUQ0REYxQ0M5RTgyRjk3REI2MzhCQjE3MzIyRUEyNkM2RQpDNEE1RTAyNDMzRDExQjZBMzdE
-MkFDMTBEQTZEMTAzNUIyM0YxQzZDODBCN0MzODJGMUVGQUM0NjIyQzA0MEQxMDhFRUU5MUMz
-OTdDQUMKRTFFREM3NjFDMUVCREFGRkNENjEyN0I0ODYyMUU2NjZBNUE1QzMzQTNCRDRGNTU5
-QzdDMkNBN0ZGM0M0QkREQjI4OEEzMDQzRTA5NDQxCkQzNUNCNTRGMTIxOEZGQzQwOTdEMUZB
-NjA5MTExODk0OTZBMTZCNDBEMzRFREE2NEE5MjI1RUYwMEI4NzU4ODUxMjdEMkE0NDFERUNF
-QwpCMkJGNkYxNEY2QTM4MTVBNzgwQTRERkNCNjIyN0M3MzU1QjM3N0VBNjFGOTI4RTk0NDg2
-Q0RDMEQ0MkVFOTI0OTRENTA2M0FCRTJEQ0QKNEQyOUU4OTY3ODM1QkU1ODk0RDM4RjA5Mzk5
-RTcwNDE4RDIxREJEOEFDNjc5MzY3RUE5REVGQTcwQkFGNjI1Rjk0RjU2Q0NEMURBNkRFCkFD
-RjU4M0U5NzYzQkNEMEVCQ0Q5RUU1ODEwQ0Q5MzMwRkVBRjVGRTYwQkUzQUY4QTE1QTFENThD
-QTJBOUIwNzg1QkMwOUFCQzUzRjg2QQo2NkNDQkQ4ODE1RjNGOEI5QjE4Mzk2QjA0NURFM0I0
-QTAwRDU5RDQ3RjUyQjUyREU3QTUyQUIyNkY1RERBMDVFM0I5NzUxRUUxMUE2RjcKOTI2NjU0
-RkM3RjkwOUVCQjc0MjMyOTUzODUwNDRCOEM0NEEyMDMyMDMxRDQ2MjA0OUZGRDc3Q0E4RjMx
-Nzg3MjY4RjY0RkRGMDAzOTdBCkE4OTQ5NDMwOEFEOUVGMTVEQ0VGNTVCQTBDNUFDNEU0NDM1
-QTUyRDIyMjVCRkVCNDM4QzkyMzBDQzY5MTJEQjE4RkNEMEE2RDdENEM4OQpCQjZCNjk5NzRC
-MENEQzI4RDA5NzRDOTRDMDVBNjExRUVDRTg2NjE0MEEwMEY0QkY5ODI4QzUzNjNEOUE2RkE4
-RkM5NzQzNjgzNzAzNzgKMkVFQzE4OUI0QUI5NjBBOEJBNzVFRjQzMkQ3RjdCODA1MUIyRDAx
-MkZGNzZGMUE1NUJBQkExNkRCOUVFNUM5QkRENTdEQTlBODdBQ0QxCkQxODcyRUI1Njc3QTE0
-Q0MyMEY4MzczOUQ5NUFBRDBCM0YyNjUwNjk3NkIxQzgyMkFBOENCNEE5Njk2MDIyMENCMjQ1
-M0RGQkI2RUU2Nwo2N0ZDNkMxNTRFQTkyN0ZBMDFFNjk3RDJGREU3M0Y5ODQwMDQzNDgwQTU4
-NDMzN0U3RjQ2NkY1MjQ4NTcwODQxQTczNDRBMzcyMzJDQkIKRjA4OEVDQkJCQTlBREE4OUE4
-QjhEMDBFQTdBRDhGQTAyQTRGNzlBRjIxRkI4RkM0ODc1MjhFM0Y3QjMxRjExQzNGMjY0NkZE
-NzgxNTVCCkZCMTAyNDU5Nzg1NTREOEM5NUJBNTk5MjUyODE1QTQ5OTVBNTA3MDI2MzQ4NzU4
-NjI2Q0EzODZGMzE3NDhGNzBDMkRGMTQ4MkI2Qzk4Nwo1Q0I3NTQ2QjNCMUI3NTZGMzE2OUVB
-MzU4OUExRDBBNTQzRkIxNjU3OTUyMzQ0NjQyNDNBNkRFMTJBRkE3NkQ1NzdFQTU1QTRCNzY0
-RDAKMjFCQkI0RjIwM0VENjZBNEZFQzNCNTEzMzNBNTc3NzZBMjEyN0RGQzU5RUUyODIyOTIw
-MEM5QjkzQTFGRDFFODRCOUQ1QkE4QTIyRkMwCjI0Qzg0NEZGODM1MTI1NkVCREEyOENENzhD
-OURDNzgyRTVCQjg1RDE4OEI0RkFFNkE0MjdDMjUxQkUyQzc5NEQ4Qzc3Q0EzOTI5NjAzOQo5
-RUJDOEJFODREQjlDNzgzMTlCRDM4QTQ0MTE1OEE5OTlBNzRCMDRDNEM1MjQ2RDY5ODJFRjdE
-Q0Y4RDhBREIzMDRBODUxMTI2N0ZGQUMKQzFBQkU0NkM5RUUxQ0JDQUQ2MzY2NUFDNjA2Q0FD
-N0Q1NkU5QkMzNjA5QjNFRjcyMTc2QjQ5QjYzQzkwQTAxMzBDRDE4M0I5MEE2QTQwCjc5NkU0
-Q0I5MDkxQkJBMEZGQzhEMEY4Q0YyQjAxNjgwMEIxQjQzOUI1REI2RkVBMEMzOTlGOEMxQTIy
-QjE4OTZFMDQ4N0EwODQ3NkY2NQpGNTA1NzE3QUUyQkNBMzEyRUM4OTFCQUY5NUI0M0Y0OUM1
-RjcxQzNCRjRBOEIzRTBFMzdEOTNBNzBEMDZDMkZCQkJERDc3RTdBMDYzN0UKQkJEQTI3QzI3
-QzUzOUVBM0FENzkzNkU0NTQ0NTgzRENDRkJGQUY3MzdBNjE1NTdCMEZFRDUyNDcxQjVBNTcz
-M0ExNTU4QzlCNTNGRDU3CkQzNjEzMDY5NDVBNjE1MEQxQzBGQzVFREY1MjFGMTdGNEQ3MjQz
-NDhENUVGQjg2RThGQTgwOEQyQ0YwMTk3N0I0MzFEM0U5RjRFOEEzQwpDQjFDQ0I0QjE3NTBD
-QTI5MzZBMzYyQTYxMEIwNUM3M0UzODJENzYxMTgwMjRFNThFRDUxMkIyMTJCMURBQkVFQ0RB
-NzE5NkM3NUJERUYKMzA0OTQ1NTI3ODk1NkY2MEZBMDBENDUwNzI5Q0NEMEYwMUI0QTYzQUQz
-MEQ5MkIwQzE0QzE1OEIxODM2NDdCNjU1QUVERUE2MTJDRkEwCkJFODlGNzlDMjJGMUYyRDZB
-QUIyMENDMzgyMzU1QjExNTlEMTZCN0MyOUVEQkYwNkU2ODMxQjM5NUVBN0E0MTAyQzk5RTQw
-MEY5MTFBMwpGMzA2NTg5QzVERTZDM0ZDQ0Q0MDJCNEUyNUU4NUM2NUIzMDFDMzk2QURBMDlE
-NkE0NTc3RjM4RDIxRUVBNkZCQThENTBCNUZDMzFDOTUKNzQwQTlBNzQ0NkI5RkNCNUQzN0FE
-QzMwMTAwMEFBQkM3RDhFQThERDU5QTYzREEwRkE4RjcwMzhCQjFEOUIyOTQ4NjM1NDI0Qzgw
-QkQxCkNBRkNCMTFGQkI4NTQ5N0JDNEMzQkNBRTJBMjRCOTM3M0NCRDAwNTY4MTgzNUQ2RkE3
-Nzk4QTQ1RkIwMUM1MURCODQyQjZENDczNzkwMQo4MzQ5QUU3RDhDNUE0ODA1MDI4QjFEQjRG
-NjM0ODY5QTNCQ0EwNjAyOUU4QkVBMDI4MzIzOTc2MjdEREZFOEJBQTQ0QjA1RDVFQjU1QjkK
-MjY1NUEzODdFMzQwNzMwOEUzNEFEMjAzOEM3ODAzNzk5NTMzOUUwNDdEOTMxMEI4RUVBODVG
-RTI3NTYzNkQ2QzVDMTk1ODY3MDFGQTIxCkVCQjc0MzRBNDkxNUNBNzFCQjBFODMzQzE2NzEy
-QkM2M0RFOThCNTIwOUIwQTczMDE4MEM1RDYwMTJGQTgxRUFFMDAxRTFDMUUxNEQ4MAozNENF
-NjQyQTMxRUZBMTJCM0ExNUVBNTNCRDg5QzQ5MkNENjY3MDUzOEI3QkZEQ0M2MjlBQ0JGQ0FF
-RTRGQzRDRUEwNzBDQ0ZDQjc1NjAKQjRGOTMzRTNEOUQyNTlGNzBDQzM2OTc5MDE5MjlBMUYx
-NjA1RUU4QTBFMDFFRTg1RDRGRkZCMTY3REU2RDkxNkYyNjMwREVCOENGMzE3CkY0OTRDNENB
-QzNFRTczQkUzOTJFRjk2RkJEMjMyRTRBNzc2MDIyRUUwNDE0NjU1MkYwRTFENjZCNEJDMTQz
-MDI5ODZGQ0VGNzZGMUI3RQoxOTY3NTNBMkI0QkNBODdGODA0ODk2QjczOTJGRjhFNTE4MzQ0
-ODg5OTYxN0YwMjAzODZFNjg4RTdFMjYyODZDRTVEMDYwQjAwQjQ4NUQKRUQyNjREMTkxQTVC
-NTI4QTRFNTE2ODMyNjQwMzU0QzMxRDYxRUM0RjdGQTcwMTI1QjVDNjM0OUZERTMwNjk0RTk1
-MDRDMEEwODBEMjUyCkI5MjIzMDU4NzRGMzkzNTRBMEZDMUExOTYwMjFFMjlDNTE2RDYyQTc4
-M0FDMjU5NEMyOEY2OUY2ODAzMzE0RjY3NDVBRTY2ODVFMzgxQgpGQUY4M0YxNEI4NDY0RDdE
-QTQxOThCRTQ4RTc2MDExQkU2QjMxNzFFQUQzNzBDQTY5OUU3MDc2MDcxQjJGRjE4NTZGNkJE
-QzYxRjNGMDEKMDM0QURERERGNTZDQzQ5MTRBRDc0MjgyODU5QzYzMkI5QjE0MjkzQ0RCQkQ5
-RkY4RkQ0NDAzQ0ZEQjc2MUQzQ0JFRkY4NDM5MUUzRDVBCjA2QjVEOTMyREVGMDg2MUVCRTZE
-RDg4NUM5QzMxREE3NjVGQ0YzNTg4NDczMzNDOTY2RkQzOUU1MDAwRTk4MzVBMzVGM0JBOTNG
-QTIwQwo0QzQ1OUE4RjREQUVERTJDOTlFRkJBMTNFQzBCODJBQjU0NkNGREY3QTk3ODc5NjQy
-RDk3RjY5QzIxNzM3QjIyMjgzQjYzNjQ5NEM5RUEKMTI5QTE2MUJEOEM5REQ1NjVCRkIyQTM1
-NTAzQjVCRjhBOTVBQTY5NjI3RTJBMUJCQkJGNUJCRUFBNzRBNThDQ0IxMUY3Q0ZBNDIwQjVE
-CjcwQjNFMzkyRDU0QTUyRkU1OUVDOUEzMDE3QkQyRDgzQjRFOTBFMjREOUZDQzZEODE2RTk3
-NTU0NEI5NkJCMUY0NDQzQ0RCODE5MThBNwo3RkREQUIyNUQ5QkY3MkQyMERFMTc2ODkxMjFF
-QzU3NTdCQjE4MzI0QUMwRDVGMzI0REJEODlCNzJGMjI3MUZBMzYyQkM4Q0NBQ0ZFQ0QKQ0My
-NTMzMUJFOEFCOEZFRDQ2QTZFNjkxRjNBQTZCMDcwMUY1ODJDQTg3NTNGNjQ4ODI4Q0QzRkFC
-NkU0M0NDOTJBOTI0RjI0NUZDNjA4CjM1MEY4MkNBRkY3N0VDOUUyRTI0Rjk4NTQzNkVDQTRB
-RDg0RUIyNDQzNUE1QzRCMzMwMTk4QjIzRTgyNUQxRUNDN0RDNTU4Mjg4NkU5MApEMkVBN0NC
-QUM5MDM3QjExQjE1NkFEQjgxMTBCNkZCNzk1QkZDNkQzOTdCMzlGRjc5RDhGQkJENDJBMDBD
-NjAyMEM2M0IwMTFDREUyREYKMjY5RjQ3NTRFODlDRjNGMThGMkI5REVCRTM4NTBBODZBQUMw
-RjUwMDZCNTI4Q0UzMEJGRjA1NTExMEQ4QUZBNjg4QkEzQjlGMEQyNEFFCjUwMTQzRjA5RDZF
-RTY5MjZCRkEyRTQ2MEI1QjNDNDg2RjM4MTBDNUNGNjhGNjdGRTJBOUREN0ZFOUIzOUJEQkIy
-NEQ2RTU5RDEyMTA4Qwo1MDE2MDA3QkI5RkMyMjc5MTYyMkMwNDQxMzJCRTZCQjhGN0Y5QzI3
-OEM3NTVERUYwMDRFMzEwRUFDRDhGMzk5MzNBNkRGNTZCRUJDNUYKQjcyQjREQzMzRUIyNTVC
-NjQ1Q0VERkVEQjkwMEI2RThCMUZBQTRFRDE1MjIyMkEzRTZGRUE4RDhCRkM3QzQ3N0VGOEQ3
-NTU3QjcwRTQ4CjY5M0Y4QzBEQ0QxMThFRjU0NEU3ODJDMjNERDNBQTNENjZDOTA4NTFBQzA1
-QjU4MTg4MzFFM0FBRjFDNERFOTUyOTI3NURGQUNBRjQ4QQoyQTg3QkVCQ0Y0RUU5NDg0MTUz
-NDEyMjc0NjFEODYyN0QyMTg3Q0M5MTg0REQzMzQzRjU1NERFQkIyNjhCNjVBRDgzMTQ5OTZC
-Q0FENTUKRjc1QjU5ODNGNjJFRkRGMTBDNTgwQUU0NzhCNkMzQzkyNTk1NDkwQTlFM0FGOEQy
-NzkyNDZBRkZGQ0EzRjNGN0U3OUZFRENCNjUyQ0ZDCjU3Q0MzMUI4OUUxOEFBNkM1RjgzOURE
-QzNFQ0NFQTAyNjQ3OTRDQTMxNkVFRTI0QTkzQTI1RTJERDEyRjAxMTVCNkNCNjUwMjI3RkIy
-NgozMEFGNENGNTVGN0FFNDcwMTMxMEUxMTYzNkEzOUM5RkQxRDM0MzY1MjRDNTdBQUY0MDlE
-MjQyNzZEQ0MwQTVDQkU0N0VBRTYyNEQ4MTQKQTNBMDk0QzVDOTYwQzM1NjY3NzhFODUwQkEw
-NENDQjU4RTUwMTZDQkUzOTlBMjAxQjc4OEE0NDhGOTk2OUNCMUM4OUVCRDk1OEFEODNFCjRF
-OUUyMDAxRDVBNzEyMEU3M0RGMEQ3MjJBQTNEQzFDRDA2RjExQjJGOEU5MTFCNzk0RTUwQjUw
-RkFBMjlCNDlBRTAxQjVDMzYxRjA4RQoyN0JGRjhEQkMxNkY0RTRFQzAzNEIzQUIxNUYwNkMw
-OEM5RUY0QjVCMDU0MzI3QkIzQTVEMjVFNDFGM0VERDUzRTJGRjRFRjM4NDEzRUMKRjVFNjkz
-MjI1QzI1NUE5RTFGNDA2MEIxRkZGOEUzODM1N0QwNjU0OUM1MTdGNDU4QjYyQThFMTIzOTg1
-OTg4NzI2REI4REUzQzlEQjM3Cjg0ODBERjBENzMxQjEwMDk1MTY0Mzc1MTJGMkM3Rjg5ODYy
-ODMzMEIwQjJCMjk2MENGODE1QUFEOTE3MUU4MDk3QzkzM0VBRkNBMDI2QgoxRURBMkZENUUx
-RTVGRUExQ0Q3NjA0MTI0MjM0Q0QwNEY1MEFCNTlEQkZGMTMxODQyM0U0RkE2RkNDNkI3RTkx
-RTRGQkRBMTQ5NDA0RUQKRThFMTM5OTNGNjVGMTJFRDgwQjYzRkIxMzc3MTc5OTBGNDUwMkE2
-MUMwMERBQkQ5MzQ1RTk0RjA0MzEzM0FCRUUyMkQyQjdGRjBERjIxCkM0MTk1QzNFMkY3QUJE
-NjM5OTQxRTQ3ODgyNDcwQTZDQUFEMEI0QThDOTZCNEU0RTFEQjkxOEI4QTkyNkFCNDBFMTg1
-OUQ3MTlGRDM4MQpGREEzRjE0OTAwNzZFQUY1RDE3MzExQ0JCNTlBMjZEMTk4Q0YwMzZCNUQ2
-QTU1MTY2NEUyQzIwNkM5MTBGOEE3MzY5MTgzQkI5NTMyOUMKMDk3QTdEQ0I5OTI1MDdGNDc5
-Q0Y1NDZENjQ1RDUyRjJCQkI0NTJFQkNBQjQwRkQ0MTA5NDY0RDE2MEI5N0FDQUYyMjZERjc2
-M0ZCMDI0CjlBQzk3QjcxRjczNUNCRkE1NkQyRTZBQ0Q3NzEwQ0U5QkMyMTg5RkU1M0Y1QkI0
-MUM1OEMwRkYxQTFDNTQ0MkZEQzc2RDIxRTYyNzNGNAoxODk2RDczOTRDRUE2Qzc1MDA5NTBB
-Qjg1RkFDNUM4RDRDRjE3NjY2ODBBMENGQTI0M0EwMEI3REUyRDE4MERDRDE0MTdDRjI1RDdB
-MzAKNUExQjE3NTM0RkQxRDg1OTVGRTcwNEEzNkI0MDJGODY4RTUzNEZFN0NBQ0FEMDM5RTEz
-Q0ZGNENFNTlEMzgyQzEwN0ZCOUREOTg2MjNBCjBGQzA0RjkzMzcwMTAwMzFBQTQ3Qjc5MzhG
-MTExMzM1RUI2OEFGQ0M4NkU0NzdENUU3NkExRTQ3NThDNzMxOTkzODk0NDg1MEU3MTMzMwow
-RjIwRTlBOURGOTY5MTczMDE4Q0ZGNTk0ODcxNjc2NDIwMTM2QkIxQTNFMENDODlDMjMyN0Y2
-OEIwQTQ4N0Q5NTQ2M0QxODNFQ0NGMDcKNEJBNjg3MEVBOTMzMkZGOEIyNjRBQTc3OTY1MEEw
-MEEwNENENUQ0NDNDQTA5NDUzREM5NjFEMzE5M0JEMjIyRDFGODBCQTBCOUM0MTYyCkQyMENC
-ODAxQjFENkU4REQzRDk3Q0YwNUI4NDFCQUIzREYyMkREQkIwNkRENkE2ODJDNkExRTNDRTU5
-NUEyOENBQUQ5ODQwNzU3RUM2Rgo4QkU2NkQ2QjlDQTNGNkVERDVCRUI2MzI0ODczQzBFQzdC
-OEIxMDg3MzFGM0U2QkM2NTg4RDY5RTRDNzU3M0Q0N0JCREQ5M0QwM0UwNTAKMDc2QjlBMEVF
-QkQ3QzAyMEJEQzY0MTI3QUI1ODQyNDI5MUIxQkM3MEE5RjNEMzI2QzY3RDkzQUQyNEY2N0NF
-OUFFNkJEQzgyOUQ3REQxCjYxRUYzQzFBNDc5OTFGNTRBODA3QzA4QUUwQUYyNEQ2Qjk1MkU2
-NkNCOEU5MTk2RUEwMEYzQUZEQ0IxNDEzQTMzNzYzRTI0MTA5NzU5QgpDREI1OUMyMjU3QzI4
-NjRDNDU4NzE5QkUxN0Q5Mjk5MTFDN0ZENzIxNDg4MTU3OTFBMTJFQzJEMkEzREQ2NDA3MzMw
-Q0UwQjRERkMzQTIKNDQwRkYwRDY5NzRCOTJCODFGQkYwNEIwRkM0RTQ0MjlCMDA5QzM4OEZB
-OEZERUEwMjlBQUQ3MDE1MUY1QkY3NkIxMzkzM0QzRjU1QjVBCkMwMERGRENFQTkxQURDNzNE
-M0RDRUYyOUVDMjYxRTA3Qjk2NDIxRTY0ODY1RkRFMUY4RUZCN0I1QUIxMjczRDVDMkJENTI2
-MUFDRUFERAo3ODUxNTA0RDE5QTkxRjI5NUQ2NjRCNDQwQUE2MTYzNkI2MkQwMkEzNDFDRUYx
-NDU5MjBDMzk2QzQyMjQ0Q0YxM0VCQjIxRDRCQzg1RDkKOTVBNTc1NjNDQkEwRDREMDQ2QUMw
-QjBEMUI0MEQxQkNEQjI2RTVBQjg2QTE3MjAwMDU1MDRCRTNENzNFRTIyMDE4RjM2NDJCMUQ4
-Q0Y2CjQ1OTZBMTVBQkE4ODg5MTZFOUYxMkJDQjE1RUI4MjMzMzdERTkwMDE1RkZGNUQxQjg3
-REU4NDQ5NUY2OTZCQTdFMTcwNEI0MjgxMzNEQgo1NDkxNkE0QkI3RTMxQkYzNkNDNzRBQzFC
-MUMxQUFDQzE3NkU0NEI0NUNFNjg2NEVCRjcyNEQyODgxOUNBODBGQ0QxQkNBQzlDNkU5MkMK
-RTYyRDMwNEUyRDE4QTNDODgyMDc0REVBRkVERjFDNTUxMDRGNjI5NDgxRTZFNDJFRTQ1MDcy
-QkJBQjMwNzRFQjVBQTFENDk1OEJGRkI2CkU1NDFGQzE4NDlFNkY1NDAyMTY1RjVDNEY3NTBG
-NzJDRkQ5MEJBMDNDQ0VEN0M1MDE0NzQ1QjBGOTY0MkUyNzFGQkY2NjQ1QUY0MzBEMApFOTI5
-ODRCQjRGOTZDOTkzRTMxODZDMEQ4QzI4OTdCNjkyQzBBMEQxOThGRjlFNDRDNjQ4RkMyNzIz
-RjhEOEE1NDdGN0VEMDhFODlFMDIKQzAwRDI2QTUwQkM4QTFDNzE0QkRFNTM0NTgwMTc2QzdG
-NUQzMTUzNTE0RkNBMjNDMkQ5Q0YzQjZFRkY3Q0Y2ODM3MTJCQjdBQjNDN0QyCkEzRTY2NDI3
-RUQwQjYyNUMwODhBMkE1N0VFQUEyQzQ2N0ZBRjBBQzU3Mjg0OTU0NTFBQ0EwOEFFNTUwNkY1
-NDEwNDExRDJCMDkxMkQzQQpGNkEzOTFGQzdBNEQ3MTA4QzFCMkZGMEQxRjlEMDlDMjM5NkNB
-ODVFQ0I0ODg1QjM4NkY1RkY1MDYxQUI3OEQ5RDkxNUIyRDNBQTA1Q0MKMTkyQ0UyNzUxQjhF
-MUM5OUIwNDNCMjQ5NTBGMjVENThCRTkzNzdEQzFCOTE5OEM1REZCNUZENkEwQjkxRUI5MEE1
-RjAxMjU3QUJCMTVECkRFOEIzNzVCMERENTVDQjE4QjhBNDI1OTQ3MjQ4NDRGQkI4OUZDQTIy
-MTU1MzZCRDlDQUQ4NjYxQ0E2QzkyRTMyQUQ0MzJGNTgxMzgzQQo5MENERTA1RjM0RkFBNTg1
-RkRFN0RBNDI4ODlFQjM0NzUyQUIyNkQyMUQxMzkxOEJCQURDMjNEOUMzNUI4OEM2RkRFMzFF
-QUMyQTQyOTUKRjQxNTlDRTFDQzk0MkI5ODMwMTI5QTFCOTQ3NEYxNTRBMTc1RjNBNzFEODZG
-MUJEQjRCQkYxNTA2Njk0ODk4NEI0RkU5MDJDM0Y4RjNDCjBBNDZFNkE1MUQ4NjA1NEQ2ODND
-MEExMUVEMEYxNTFGNzkwNURFNzNDNTg5MzM5MTUzRThCNDcwOEY2RDk0Q0UwMjU4MUM4MzdD
-NDFGMgpENjU1NTZGNUE3MDZDMDZGRkFENDM2NjlDQ0REQjJGRkZCRTAxRENENDYzODBFREMx
-NkUwODk0NUVCRDc0OUFEMkFFREQ3Q0JDN0MyRTIKRTNFNEY2NjZBQUFFN0E3MThBQjVGQjZB
-NjcyOTdEOEY5RkY3NjhGRDIxNkU0REI0NjQ1MzgzRUM0NTJGMzNDMTA0M0IyM0VEOTc4M0M1
-CkM3NjMzMTAxN0VERUE4MkUyOUNDQThGNDM2REI3MzE1NkE3MTMzM0U4ODUxQ0JDQUYyQTcy
-MUI3QTU3ODAwQ0Q3MkFBREY0MEI2NjIwRgpCOTMyNDM1QUZFM0ZFOTg2NzIwRkU3MTNENDI0
-QTNGMEU5MzYxNjg5NjBFMTcxQjlCNUI4NzIxQjY5OUMzOUI3MEU0MkM4RTA0MzBFNjYKOUJE
-RDI4NzBCN0M0QzY2NDQwQzEwNkRCREJBNzY2NTgzOEY5QzZDRjY3NDZFMTVEQjcyNUY1MDBB
-RDNEM0UyQkEyQzc5OTdGRjBENTEzCkM5MUJCNUM0ODI0RDUxQjg5RTdGRjNDRTI2RUVEMzVF
-OUEyRERBNzQyMDAyNkQ4OTY3NEY3RDMxODRFNkM3NkQ0QjZEMzJGMjhCMTcwQwpBOTI4QjU4
-Q0E5MjVFNjlGMDRBMjJFODVFMUVCQjg2MkM1QUIwOTk2RjA1QzYyRTZEQThEQjBCNjE5NUI3
-MkQ0NzNFQTIzQ0I4Rjk5MDAKM0M3RjM1RDUxRDQ4MEQwNTQ3QkFCRjk5M0I5MjM1NDkzRDQ0
-NzIzMkIzNjJEMzgyRkY5MkJBMTM1NTlGNjlBN0U5NUMxNzk3NkE1QTFBCjk3OUVBNjg3MjI3
-QkQ5NjlEMDZFNzMwMThGQjA5NzMxOUZBNjJEN0NFQzhCMDQ0MTlEREI0NDM1OTcyMzgyQzA0
-RkY5QzU3MDVERkJBNgo1NDg1NjFEMzFDRTAwNDU3NTU5NTM0RTUzMTM3NzE5MzE2OUE4NDQx
-NTJDRDA0MjIyM0I0N0I3MTY2QTZDRUVEMkI3NDZBQzIxMjUxRUIKOTAwRjkzRkM2RjYyNUQ4
-RkRFNkUxRDUzNzQ5NTBGNERERDgxNzU0OEVCRERFRjIwMTIzRkNFRDRDM0RGN0E3RjdDRTY1
-RTlCNUZDM0Q0CkYwNzlCMjgxRDdDMDNEQ0JFOUI4RDg3OTM1RDQyQ0FFM0VDRTU0RUVCRTQx
-QzAwQ0ZDOThFNjQ3ODA5MzVBRDY3NTk2MkJFOUREOTkwNQo5QkMxREI1OTdERTc3OEMxNjhG
-NDQ5MkMyNjE2NzA4NTAzMkU1MTE0ODRBQ0U2RkRDOENGODg1REUyMDBGRjBBOTkwMjI2RDA2
-NDBCRjMKRDc4RjUzNTc2ODc1MjAwRTg1NjA4OUIxMUE1N0E2NTdEMzdFMEJDNUI2MDQ2Njcw
-Mzc3MTE0Mzk2QjhDNzQwQjVDMTY2RTE1QURENUYwCjlCREQwQ0MzQkQxMUMzNDJCNjlDMkQ5
-MEU1NTA3RDgzRDNGNkZEM0RDMTQ0QTJEMkM4MEEwMkY0NTUxNDNGMTU5NDlCODEzNzRCRDQz
-NgowRTM1OTFGMEVFMjYwMjMzRjg0QjUwQ0FBQzUwMTNENkFCNjEyODM3MTE5QUMzQUJCNkIy
-REJGMEFEQzA2RUI0RDQyOTVFNDhGMUI2REYKNjBFNkM5ODMzMkEzODBCQjk5N0I3NjlGN0M2
-OTk4MjdBNkVBQ0I5RTE0Qjc5Q0ZCRjgzRTExQUE4Qjk2QTNFRTkwQTJBRUQ0MDM1Mjk2CjA1
-ODM0RjE0ODlDQ0U3NTQ0M0U3NTM4MkQxQjQxM0Q4RTBBQjRGOEFBN0M2OUEzRTQ5OUZDMDA3
-N0RGQzlDOEFFMTU1RjVFQjQwMzU3OQpCNjI5M0U4MEJFMzcyMTk3RjMzQUUxNkIzRjQxRjc1
-RkQwMzUwRTMyNjdEOTYzRDdEMzlBQUU5RjY3NDFFQjFEMjQyQjNGOUNCMzk5N0EKMDU3NzQy
-MUI4MTYxNjRBNTI1OTQ1N0Y1NjcyNEU3RkQ1NjJBRTY3MTM2RDVCRjc1QUFFOTI5MzRGNzMy
-NDBDOThGMjg5QzU2NkI4NTgyCkVGRkYzNDc3MUU5QTFDMDRGQTAxQUE5NkMyNThBM0M3MDU1
-MDg3NzIxOTgxRjQzNDNDQjg3RjA3RkQ0OUI5NTc2QzRGOTQyOUJDRUNBMAoyMDAyNzk4NzYw
-OUY2QTQ5RDczOTg0ODE5Qzk0MEFBMTcwMUE2QzcwMDg2QkRFNzIwRTFGQ0IwQzZGRkYxNEUx
-NTk3OEU0NjJBM0Q1QUIKNEQwRjIyMkE5OTBFRkI2RDA5RUM2N0I0NjdFRkM4ODI3NURGMjU5
-OEY1OTUxODZERTkxRjM5OEFEOENBM0QyMzJFRTZGQkJGMkI5NTk1CjA3MzVFMEY2MjVCNzA5
-Q0Q0RUQxMjZDMDYzODk0QkZBNUZBQzRGNEI3QTgwOTFGQjlEOTREMjk0RTNDMjg0NzgxNDgy
-MTg0RDlBQUJEOAoxRjcyM0IxRjlEOEFCMkM3MTU3RjhFNEE2MzZGMjUzQ0NFM0VBRDE4QTBG
-N0Q4QzM4Qjc2Qjg4OTEzQjhFOERGMTIxOTAyQkNBMUVFOEMKNENBMkIwNUVGQjVGRkQ4QzFF
-RTQ3MDI4ODVFQkU5Njc1NUEyRDU4MTM3OEY3MTY0Njg4NkRDMTQwMjE2RDEzQUQ0QzNCM0Yy
-QzBEMkNDCkQ4RENENEQ5RUY2OTk1MTM1RDYyMTRFQzRFM0Q2NTNGRUIxMUMyMkY1RUJGRjQz
-RUU1NTIzMEE4NkI4RTc4RTMxMkI3QUJBQUI3Qjc0OQpGN0M3MzcxODUwNEIyODY4N0FFQUY3
-MzFGQjgzRUE0QzBCOUI1NDc3Q0M1MkE1RDBCRDQyNTJGQUIwOTVGNTU4NTUzRkFFQTU3ODRC
-OTQKMTY4M0UwRERFNDNBM0M3QjE5QTZDOEE0RDM5RkRGQkU1MEY5NjcwOTVCMjAyRjVBMTg0
-MjQ0QzMxQzIxNDlFNzNDQ0U3RTBEMzJGRUUyCjU4NDI1RDBCQ0VERjlCRDJGQzI0OTYwOEM2
-RUNCQUQ0QjdFQUE2NEQ3RDAxRjMzM0FFMzM0RDE3M0U4NTlGMTYzMzk2QTg4QTFFMDlBMwo5
-NkY0N0EzRkQ0NDU3MzFGMThFQTdCRDI2QzYyMUUzNDlFMzE0MTU5Qjk5REM0NDMyQUJDOUZD
-MkU1Q0JEOEUxNjJEOUNCRkM3RjVEOEEKOTBCN0ExOTVBN0I1MTdBOTFCRDhBRjUxN0VCMjZB
-OEVCRkUzMENFNjY3QkMzNzY4NzBFNDA1RjRERUVBM0NGNDMzMUIxQTg5QjE0MkExCkRERjM0
-M0I1MjQxOTUyODYyODA0MEQxNzNFQjA4MjhDN0IwMEJBNjJCRjVERTQ5NTZCMjNGRTYyRjU1
-NURDNkVBREFGRTE4MzE1RjI2OAoxNUQzREUxQUQ1Qjk4MDhGM0EwMTZEQjY2QjE5Njk5OTJC
-RTdDQzY3NkVEQzI2Qjg3QTExQTg5Mjc4QTgyREIwNEJGNDFDQjIxQzgwNUYKMkQyQ0JCOUI0
-RTc4MUY2QjREQzc1NTg4MEVGMDU0Qzc0ODcwQjg0NzMzMkIzNDRERDA1NkYxQTNENzMxOTE2
-MkU3ODJBNjI1RTExMTBBCkM4MERFMTBDQjI2RjdFNjcwQkY5OTdFRUVCQzMxQzBEQzg3NUJB
-NjdCRjdFRTk2QzcwMzQ3REZFMDJGQzY0RjRGNzYzMkIyQ0QxRDgyRAowMjZBMkQ3QzE0NTM2
-RTdDOEFERDE4NDkxQ0YyQzAzQjk0QkRGNEE1NDUxMUI3QzlBNTE1RjNFRkJGMTIwNDkxMTEz
-RTdFQjU4RkVEMDgKMUYxNkJFMzJFRTdEMUJENjRDRDEzNDgzNEYyMDZFNjM2RjlEQTFERjdF
-MzkzNjU5ODIxNDkwRTkyQTgxQ0FEODc1NzM2NzEzRDZFQjI2CjkzRTA5MDZDNDM0NzY5OUY1
-NjMyQTdEM0ZFRTYyQzVCRDA5NTY0QUVCRUNDMEEwOTUwMEYxMjE2QjJCQ0M4RDlBQ0NFODU5
-MTBCQzQwNgo3MTY3MDExN0VDMjc5REQzQUUyMTIzMjlCNTBFNTVERTFERkE0RDM0RUVFQjUz
-M0FGNTQwNzMzMUNFOEZDQjJEMzlGMkRDNTk2NTRGQkIKOTBBODE0NTY4OTE0NTQxNEE5NTk1
-MUMyRTQxQTY0Mzc1QjNCN0M3RUZFODUwRkMxNTJEQjIyMjZGNTExOTA2Q0IwMUM0RDQ4N0RD
-N0Q0CjY2NzY3ODQ4MkRBMkEwQjU3NzI4QkJCRTA0RkQ3NDIwQzQ5Mjg5ODMxREM4QTYyN0M4
-MjIzNkIzNzY0RENEQTM5OUQ1QzhFQjBFMDkxNwowQTFDQThFNDNCNENDMkMwQUJFQzVCNjBB
-MEFFRTVERjczOEI3NkMwOEIzNTQzNzJCQzI4QTFFMzk4MTU5QjlCNjg2MzQ1OEVGNDBCREIK
-ODEwNzMxQTQ1OTk2QTY0RUM4MDg4OUI5NEExMkM2QzVFM0NGQ0U3RkVFMDkzMUFEM0JFQUQz
-MUM2MEUwN0I3M0IxODI4Qzg2OTE2OTc5CjU0NjAyQUE2MjI2QTgzMDkwMkJCQkNDOEQyNTQ5
-NEE3QjI0QTY3Q0UyQjI1OEE4MDUwQjk2NTlEM0ZCRDNFM0IwNDk5QTdGQUQ5MDg1MQowREFB
-NEUwQThGQzM5QkE2QTg3MTkwNUJFQzM1MzUwMzJCRDJGQzY0MUY1MzI3NEVEOEE0N0I4RDhG
-NjkzRTcyMkUyODQ4MEIzM0FGNzkKNzgwRjI0Njk3OUMwQkE5MTEyMDcxRTQ1QzczNUFDMzhF
-MEEyRkFFNjFFRDhDRUM0ODEzMDY1RUJEMUVCMzFGQjVGMERGMzczMjJCM0M0Cjc5RDZEOEFC
-RTdEMzAyMkUxQjEwOTkxRjlEQjAzRDMzOTRCRDcxQUQ3NzYzRDhBMjg3QTJGMTFBM0Y0Q0I4
-N0YwQTREMURGQzExQzkzNgo3NzY5NjYwQkYwNjA5NjUxNTRGQkMwMjU1RDZDRDQxRTc3QUJG
-NTI4OTIyODA5RDE0MUE4MDY3OEIxRjU2NDg1MDkzNzM0MjAxMUMyQ0QKQTcxOTNBNEJERENB
-M0ZCMTc3M0ZFQ0Q0MEIzN0YzNjc1MDdFQkUyQzRGNjk3NzhCRERFNTRERjlFRjcwNTgzREM5
-OEY4MEVFOTg0RUNGCjI5NjQ2NDY3QTQ4MTE1QjVCNDBEQzJDNzI1MTAwQTVCRENGODUyNEVF
-NjFCODQxQTQ1QzE1ODMyMzZFRDdCRDk3RjM3RTBBOTQ4NjkwMgo1NUE3OEE0NTYzRjI1QkJD
-MTk1N0UyNjdCQ0MyOTMyQjU5RUU5RjYyRkQ3RUMwNTMwNDFBRTkwQTE2NUU0REM0MTJGM0I1
-NTI1OTMyQTAKNUQxQjcyOUVFMDQ5RTk1RkQ3RERGQzQxMjg5RUQzMDU0MzBDQjlBMEJBMEUy
-OTgzQzQ5NjZBRDFFNEM2MzRFNjc4OTlDMTVDQUU4NEQ2CkM2QTBDMkQ2QTI3NDJENzQxRUU1
-RkI4OTdFMDA0RkE2QUE0OEFCQTczMzJGQkRGMDk3MUE0MTQ4RkU3M0FGNkQ0MDk0ODg5QTg3
-QUIwNgpGRUZCOTdFMTFFRDc4QzNGQUQ3NjM3NkMzNjIwREVFRjgwQkJGN0IyODYyOTAxNjVG
-NTlCNzhFMjFGOTZGQzJFRjAzNkQ2NUIwMTU4OUMKMTREQzMwMENBMkJFRjVFNUM5NDE0QTRC
-N0Y0RTI0MzRERkNCQUUwNTEwQzdDQUFGNUY4NkE5MTdCRENDODVBMEM3RDBCQ0EwQUNFRjQ4
-CkU1NEJFMUQ5NDMzMjRFODI2RTFFOUQzRjBBNTREMzY0NzRGNzQzMDBGOTRFMEQ3MzkxQTEz
-ODg0NDQwOTE1RDFGOTFGNUJBRjMxMDIzMAo5REMxOEEyQTc1RTg3REE3MjI3NjRFNzk5QTEx
-Q0U4OTgzMzIwNUI5REZGMjU5NDhFNUQxRjNBM0NCMUU2MTFDRTI5OURCNzM0M0YzMjAKMDBG
-MjZBMTBDNEU2MzU4MzU4QTVGNjU1RDE1RDM4MUE2RDk4MDAyRDgzREUyOUIxQUM5NDNBNEM2
-RjQyOEQ3NkU2MDc3MDJCNzc3NENECkRBQTNFRDcxMUYzNTJGNUE2NURGMDFCQ0IwQjdCMjVD
-RjgwMUUyNEE0RTM5Nzc4NDBEMEM2QzQyRDcxQzc1QUFBMDBGMjY1Q0QyNTlCNwpDQTBFQzI3
-Q0YwQjEyMDM5NTE1MkYyOUVDMTczNEZFNUY0MEFFQjRCQ0NCNkQ5QUEwQzVEMzhGRTczMjRG
-RUVDQUM1MDEzNDQ2RUIzQkMKRTdERDQ2ODA0N0QwQjc3MDVGRUM4OTg3MDA3M0U1RUY4MjlE
-NEI3ODJBOEM2N0UxMzRBQ0ExRkQ3RkY0NDA1RTFEMzk5Rjg3NkY5MzYxCjRFRjg4RTJGNjVF
-MTNCMUNDQjBEOTE0OUM1OTEyOTM5MTg0MzE1MEFENDkyNUNEOTVBM0NEMDU3ODdFREMyMzZC
-NUZCMDA3MkREQUIxNApBMTQ4MDUzQTRFMDYxNjk5ODA0OTBCQTBFNUI4QkQ0NkRDQ0QwNjNB
-RURGMTlCQjRBQzZGMTM5NjI5NjQzNUM0OTc1NkQwNDNCMTFDRUQKQ0U2NkU3MTEwOEZCNkE1
-RjI5N0E0NzZFRjQxNEFGNzVEODEyRDRFNDgzMEE4MDg5NDgwOTIzNUVGMUM0MzUyOEQwQUZF
-MzkzODcyOEE5CjU2ODUwNDlEMzE1NDhDQjVGQkUyODFDMzUwMUQwNTBFOEEzRUE1MjVBNTU1
-MDZGRkEzMUYwMTY0OTE5QjMwQTlCNEFGQzcwMjI1MDQ4RQo5MzUxN0UyMzRCMEQ2NzFBOUY3
-NEFFOEREMTU1RDM1REQ3MkM2QzhGRDM1OUI1MDIzRUY1QkM3NEE1OUQxNTlFMjZCQTY4RjNE
-MEQ3RDEKRDkwRjFCNjRBNENEMjcwQzFEQjY3ODMyQzgxNEI0NEFBQjI0NDdEQ0IwMEY3M0Mx
-REQ1MDgwQzc2MTYxMTFBQ0I2Mjg5QTAzNjJCNUZFCkMzOUIwOUQ2MkY5MjRBOThDMzdGMUMz
-RDNEMThCNzAxOEU2RjZENkY4NTE0MzZBRjZDRUI2NjY5MTQzRDMwQzg1Rjk1OERCMjc0NzIx
-Mwo3N0I1QjczNzM4Rjk0NDI1ODYwMDhDMzhCODQzRTlBNTY3RjdFQTg3NkEzQTMzRTE4MjdG
-MTJCNjc1MTZBQjJBNjc4RjEzMUQ4RkFGNjIKREY5MjNCRDZDNEM1QzJERTBCOUIyMjk1NDFB
-MDJFOTE4NUFCNkM3QTU2RjREQ0ZCNTkxMjg4ODFEODdDN0E4ODY2MTQwQUVGMEM2QzRBCkIy
-NTNCMTkwRTA0OEEzMTBGNTI0Q0U0NTNFQkE3MEQ5Njc2MjcxNDM4NDNGQzREMTlFNEU3MUND
-RkQzRkE4NEI3MkM1MUJEMjExQjJENgpFOTY5NTFFQTNBQTFFOUI2NkU1NUUwMTE3QTQzRjBE
-RjhFNUNBQUZBQTZCRkQzOEM3MUQ2OEFFQjg0QkUyQUEzQjhDMEU0NTE0MDU4MzYKNTk3MDNE
-Nzk1NjhCN0RFOEQ5NTVEMUFGMzE0NkY1MTRFNUQ4N0NDRUU5RjMwOEVEODAyQjQ5REFGMzQy
-RjhGNDU1NTMwOUJEQzA5QjNCCjlBMUQxM0VGM0ZFNkRCODc1Qjc3NUFBM0EyN0IyQzFBQUY2
-ODM5OEQxRDdFQzg3NTBCN0JDRUMyQjc2RjI3RUIxNkY1RTQ5NkRGMkEyNApEMTRCNkQ2QzM4
-MzA2MTZFMzI2QkQwQzQ1MDBEQjE2NDc0RjU3MDNDOTU1NkU3NjBFOTNGNzEwMUUyNTFEMTRG
-MUU0MjVCQThCQjczQkEKMTJGNTc2QTc3OEJERUY3NzQyQkVCMjI4QkFFRTU5RDQyRTA1NjU2
-MjgxQzQ4RTk4MkZEMDY5OTE3ODI1RjJBMDZEOTE3QzM5QTZFOTkwCjYwQjU3MDM3QTg3OThB
-M0M5QkJGMzYxQzgyNkY2RDBFNTY1Q0Q0QTQ2NTc3MDkwODI1OURFQ0E0NTJENDU5MjJFODdE
-QkNGN0NDOTY4NwpBQzdBMkU1N0IzOUI5QzkxNkMwMEVFRTM0MjJCNzk1Mjk4NDdBMTFFRDhF
-M0VBNEJENjUyMjQwMzM5OTU5QjE5OTYxMDc3MjE5QzdEM0QKN0FBMTUzQ0UzMzRCOTI4OEE0
-Q0ZDNUJEMzc4QzhEMUFCNDJFNkRBN0FGRTlBM0RBOTI4MzJBMjM1RDYxNUFBREI0MTRERjMz
-QTc4ODBDCjQ3NTc1ODdDQ0RDMjk4MTM3MjExNjQ0NDY2QzA3NzYxOEI2QThCNTQ0ODRENjI0
-MDBCOUNGRUNCRUFBMUFCQ0RCN0VFNzgwMjJERjQ2QgpBM0JGNEUzNkRBRDc1MjBBQzE2REJC
-RDg5NUZBQTg5Q0UwNkEzRkMyODMxNTNDQzg2MkRGNTQxOUFDQkMyN0RGNTNBMUMzMkI0QjUw
-QjkKMzRERDc1MzIyN0FBRDM1REFDMEY3Nzg1NTUyNEJFOEJBM0MwQzExNTExRTlFODVBQzRE
-RkM5RjRCQjk3QkRBNzc4NjRCMTYyREJCQjM2CjJBOUMwOEI3NjA0OEE4OEU4OEZGRDA5ODdD
-RDA5RDE2Njk1NEM1OUNDQjY2QUM2MUE2NTFFNDJEQTg1MUQ3RDcyNzNFNjBGQThEQzMzMApE
-MTFBNkQ4MDg3Q0IyNzY1QUYwODVDMDlDRTA1Q0FFODlCMTEwQzZBRDJDNDUyRkQ0RUQzMjZD
-QjY2QTQ4RTBGMDlDRDZEMEM1Mjg3REQKREZFRTlFNzM2OEJGNDFFMTkzNURCQTIzMjY3Qzk5
-OTc5M0YyRUY5QjhERjgyNjBBNzM2NDJGMzIyRTNCRjBDNzlCMUVCOTk4MDc2RDA5CkRFMTA0
-RjE0NkU2RUE2RUZFRkQ4NDI2MzU2MzFBQjJBRTM2NDYxNUNEMzI4OTRDQUREQTJFNjc5MzU0
-QkI0QURFREEzNTc2M0ZDQjE4QQoyRkUxNzQ3NjJEMzE2RjEwNzkwRUE4ODhDRDc2NzI2REEz
-RDEzNDU4RTdBNjY4OUExNDlCNTcwOUI0NTU4NjY1Njc3MTJEMjFFNTgxOUMKNUE3QjhDNEZE
-OTUzNzdBMjhCNzMwMzNFMTBBQzQ4NkM3MjA3NkE2MTY4MTNGMDU2QjFCMzlDRDkyNzlCNjRC
-OUEzODJCNTA2RjNGMjUyCkZEMEY1MTA3QjlDRjM2RDc4QjVFRjYwREQ5Nzg0Q0E3MEUwQkRF
-RUZGNjc3RjUwRjUwNkVDODNFRjMzRjgzMjM0NEFGQjY3RjlBQjREMwozREIyNEJFM0Q3QTAw
-QjhBNjBFRUNDN0VCNUZDOTEzQzA1RjY0MUM3MTU0MkVDQzkyMjlGNjc4MDlCOEFBMDE3NUVG
-MzFFQ0RGNjgyREEKMzkzQTkzNDNGQTE5QzRBQUI1MkU4RkQzMTBGMUEyRUE0OTg3RUY2RUNB
-MEQ2RUFGQTQxNDU0NUFGOTkzNzZGQjEzQkQ3NDREMUEyRUNFCjMwRTJERDQ3QjU4NzhERTVF
-NjMxMkVBNzZENjk5QUQ2QzIxN0JBRENGNTM1QjQ2RTJFQjc4MDBBODREMzA4M0E2MjcwQkIy
-QzVBNUQxQwowMDU3QjQyNDUzMUVCNDhFRUIyOUU0NDVCMUJBQjI3NjM3RkQ0OTU1NTM1RjYy
-QTFFRDU5QzgwN0YzODE2RDQ2QTk2QUEzQjAxNjAxOTAKNUZDN0YyM0FGMTc1Q0NEQkFBMDYw
-RUQ2Q0MxQUFFMTU1RjE4QzBGQTBEODQzOUJEQjczQzM1QkY0MTU3MTE0MkY4QzhBNjk2Nzg3
-MDQxCjk5QjMwMkM0OUFGMDJDNENEOTI5RDJDQTdGMDQwM0JDQ0I2QkE4QjNERDEyQjA4MUE5
-NjEwNDg3NDM2Mjc0RjBBQzhDMjFCNzIyQzUzOQoyMjYxMTAwOUI4NTgxMzUyRDk4OUVFMDY1
-RkIyRDFBODE5MUMxQjBCNzEyQzcwMkM0RkI1NjZBMTlGMzgyQjRBQzhFODQwREMyREM0NTYK
-QkQ5MUY3QkZFMkYxRUIyMjVGNkFFMTU2MkY2REU5RDRENkQ0NkJCMjQyNjEyNkFCQTlFN0JC
-RDIxRjE1OEIzRkE5QTA0MEExODUyOEQ1Cjk0NkU2QzVCNDMyMjA3MEIzOTI0MDNBRjE4Q0Uw
-REU5Q0EwOUZGQ0VENkY2NkY3QzY0NkMzREYxNEY1MTIxQjM0RTQxREJCQTY1MzM3MAo1NDk3
-QTQ0OEM0MTE1REYwMUU3REY3NTNFRjYxRDlCODYxODc5NkFBMjZFMEE4RTc4M0E2REYKMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCmNsZWFydG9tYXJrCiUlRW5kUHJvY1Nl
-dAolJUJlZ2luUHJvY1NldDogcHBjb2QucGZhCgoKCiUgR2VuZXJhdGVkIGJ5IEZvbnRvZ3Jh
-cGhlciAzLjUKCiUgQ29weXJpZ2h0IChjKSAxOTg3IEFkb2JlIFN5c3RlbXMgSW5jb3Jwb3Jh
-dGVkLgoKJSBBREw6IDcxMiAyODggMAoKCiVGb250RGlyZWN0b3J5L1BQQ29kZSBrbm93bnsv
-UFBDb2RlIGZpbmRmb250IGR1cC9VbmlxdWVJRCBrbm93bntkdXAKCiUvVW5pcXVlSUQgZ2V0
-IDQzMDM3MzggZXEgZXhjaC9Gb250VHlwZSBnZXQgMSBlcSBhbmR9e3BvcCBmYWxzZX1pZmVs
-c2UKCiV7c2F2ZSB0cnVlfXtmYWxzZX1pZmVsc2V9e2ZhbHNlfWlmZWxzZQoKMTcgZGljdCBi
-ZWdpbgoKL0ZvbnRJbmZvIDEzIGRpY3QgZHVwIGJlZ2luCgogL3ZlcnNpb24oMDAxLjAwMCly
-ZWFkb25seSBkZWYKCiAvTm90aWNlKENvcHlyaWdodCAoYykgMTk4NyBBZG9iZSBTeXN0ZW1z
-IEluY29ycG9yYXRlZC4pcmVhZG9ubHkgZGVmCgogL0Z1bGxOYW1lKFBQQ29kZSlyZWFkb25s
-eSBkZWYKCiAvRmFtaWx5TmFtZShQKXJlYWRvbmx5IGRlZgoKIC9XZWlnaHQoTWVkaXVtKXJl
-YWRvbmx5IGRlZgoKIC9pc0ZpeGVkUGl0Y2ggZmFsc2UgZGVmCgogL0l0YWxpY0FuZ2xlIDAg
-ZGVmCgogL1VuZGVybGluZVBvc2l0aW9uIC05MCBkZWYKCiAvVW5kZXJsaW5lVGhpY2tuZXNz
-IDM2IGRlZgoKZW5kIHJlYWRvbmx5IGRlZgoKL0ZvbnROYW1lIC9QUENvZGUgZGVmCgovRW5j
-b2RpbmcgU3RhbmRhcmRFbmNvZGluZyBkZWYKCi9QYWludFR5cGUgMCBkZWYKCi9Gb250VHlw
-ZSAxIGRlZgoKL1N0cm9rZVdpZHRoIDAgZGVmCgovRm9udE1hdHJpeFswLjAwMSAwIDAgMC4w
-MDEgMCAwXXJlYWRvbmx5IGRlZgoKL1VuaXF1ZUlEIDQzMDM3MzggZGVmCgovRm9udEJCb3h7
-LTEgLTI4OCA2MDYgMTA0Nn1yZWFkb25seSBkZWYKCmN1cnJlbnRkaWN0IGVuZAoKY3VycmVu
-dGZpbGUgZWV4ZWMKCkQ5RDY2RjYzM0I4NDZBOTdCNjg2QTk3RTQ1QTNEMEFBMDUyNTM5MkVF
-Q0FDMTYzRTU4NEE5MTA0RDk5QUQwQkMxQjFGM0Y3MTIxRDFEMAoKRjJDNjBERDIwNkIwRDND
-OEM0NTA2MjBCNDczMjBDQTBBRUI4OTM3NTExRTQ1NkFBREU4RTY2QjMwMUIxRTNFOURGRTE3
-RTJGNzlFQ0ZFCgpBNzA5RkYzREFFMTlCNEMxNjlERjY3NzNFREE0MTREMDI5MTVBNkYwRkFG
-OEIyNEZCQjA3NzdDNjk3QkU4QTM3RDYzQTM5MEFEOURBRTQKCjk1QkI3RTYyNjcyMUZGMkZE
-M0ZCMTQ3QzgwRDIyQkVBQzM3QzI2MjREODE4RDU4QzhERjAyMDlGNUNFNzZBQ0RERTU3QTMw
-M0Q5MDQyQgoKRjBBNjc0RDA5NTY5N0Y5MjVGNTMyRDE4MTRCRUE4RjhBNUI1MjIzQTMyQkM0
-QTk1NDAyRjJDODQzMTgxNzU4NzUyRkMzMzA5NzBFODE3CgozOTc3NDE4RUI0RjY0RkQ1RTQ1
-NUMzRTQxNjVDOUFCM0Q4NTA0RDk0NkY2QjVDM0Y0OTI5RDQ2M0UxRDZFNkI1ODEwREFENkM3
-QTY1MjkKCjBDQzZEQjk2MEExRjk0MzQwMEE4RjYzNjREQjM3NDJCRTk2QjVDQjRCNzhDREM1
-NjM0QTlFQjNDNjJGREM0ODFDOUMxMDFFMDQ1QzYyOQoKM0NEOUQ0OTFCNzc0ODJEMzI3OTdG
-NENDMEJGRjIwNTc2QzI2MDVFQ0FEQURENzc1QjIxNjVGRUYwRkZBMEY0RDg4NTIyRDFCRkJC
-MDVGCgpCQzUwNjJBRjU0QkIzRkUyQzBCMzcxRThDN0JFQTBDNjQ0QTMyQTNEQUZGQkMwOEJC
-NjNBOTdDMThBMjY2QjMxMEIxQzFCOTIwOTQzNDgKCjYwNDc4RDI4MkQzOTQxMjNBRTA2RDhF
-RjQ1NzI3OEJEMjZGRDZFRUY5Qjk1QjVDQzdEMzFFMUZFNDYyRDhBNUZBQ0FGNUNFNUY0MkI0
-NQoKRTEzOTVBM0RDNjBGMzdGNUNDNzUyQ0Q4MTkwNkYyOEQzOTUzRDYxRjU1MDc1MDgxRTE0
-NzQ1RkRENjU5QjVCMEEyNzFDOEE0MjNBMEY2Cgo3OEIxQ0UyNEU1NzNBMjRCMTBBNUJDMzc4
-QTlFNDQxMDI5OEVBREQ5MEMxNTk1MjVCMzU4RjcyMTQ5RDI0MjkxQzkyM0YyQzkxRDc3QTEK
-CjMyMzQ3RjVGNDcxRjExMzlCOTkzOEU4ODBDQzVCMzQwOUIzMzg1OUZFODcwRDI4Qjg4MkI5
-NkQ4QjUzN0JGMjI5RURBRkRFOEMzRjZDRQoKN0NGNTFGMThDNUI1MEUzMTVFOTNFNDg5NkI4
-NUQ5OThBNDNENDdCQzI1NjAxNjAxMzlGQTA0ODEzQjNDQzVDNENBRDUyN0E4QkY4QTIxCgo3
-NTFEMUZGMDMyNjEwNDEwODY1REM0M0M0OTkwODBFMzE2MkMxQkY3NDA3N0Y4RkRENDU0MThC
-QTdENjkwQzIzRkVCRTVFOURCQzdERkUKCjBBQkJBNDMwQUUyMDZDMTY2RkRDQ0FDRUEzRDRE
-MzQ2RjkxOUZGODI5MzExMUZGNjI2NDYxQzI4QTlFRjIwNzJCMjk1N0Q5OEExMkI3RAoKNDA3
-MkVBMjhGMDc3NTVBRTlEODNCNUQ4NkRGNEIyRUM4MTAyM0JEQjVERTI2MkQxQUYzRkQ4NDRF
-OTQ5NkZCRkNCNjFEQTIwMzg4OTA5Cgo3Q0MxM0NBOUJDNjk1RkY4RUIxMEI1OUFERTUzODRE
-MkZCRTBFNzQxRjk3REQxMENGQ0YxNjhERjM0MzA3NUYzNEY2M0MyNTgyQTUzQjkKCjJDRUFD
-NTcyRURGRkVGNTRCMkY4RkY1RDYxN0FDRURERTU5MDQ2QzREMkQ3QUFFMEYxNDdEOEQyRkMz
-NzY5QUUxNTkwNERFREU2Q0Q0RQoKMUE5NDRFNUFCQUIxODE0NTBDMzZDNzRCOTNEOENGRkVF
-QjNCNTg3NkY5RkE3QjM1MzBBMEU2REY5NjcwRTJCQTlDRTc2NzVGOUYxMzQ2CgpFRjNGNUQz
-ODIwMkE1MEE4Q0Q2QUQyMDMyNTBGMjkzMkVGQzA4QzhBNEY3ODk0QTREQzFDODBGMkIyQkIy
-QzcxNjgyRDIxOEQxNDgxQjEKCjE4OTY0RjMzQjE2RjVCRDM1MjJEMTZGOUYzNzM5RjA2M0Q4
-RDA1NDYzMDM3MDYwNDMzQ0U1RjJGODQyMzFFQkZEMUEwNTI0NDk3NTU1RQoKNDE4NTZEMTcz
-QzcwQUUwRTNEQjlFMUJGNEMyQ0NCOTQ1OEIwQzRGRjM5M0JGNjJGQkU0RTRFNzhDNTNGNjc2
-MjlFRDM3OEVENjk1OTE2Cgo1MjA4M0JGRDQzMkQwNUY4RkNFQTBGQUE1QkMxQjRDRTlFRjY5
-OEVDMjM0NTg3MTk0NERGN0FBNEM0RkMzNjE2QUQ0NEU5Nzg1RTJCNDMKCkI3MzgxNTlDODQy
-NjFGRkQwNEFCQUQwRjgyMDMzRjFEMzY3NzM3RjA0RjcwQ0IyODEyNjMwRDE3MEEwOEU5RDY5
-NzZGMTM0ODM4RTIyQgoKODJEQzYwQ0I0QjkzMjE1NTE1REY1QUUwQkREN0Q5RjE1MEIxMzY0
-QTQ5Rjg4NkY3QjE5NkRENEEzNTg3MTVDQUQ4RUMyODJGOTA2MkEwCgo2RDZGMkNFMEJFMUZC
-NzE4RjRGMEMwMjQyNDE2RkRBN0E5Q0ZBRDFBNjcwMDFERjdBQjdBQzM4NDBGNzc2QTQ3RDA1
-MTlBNzExNjM3NEEKCkQ3NjIwQ0Y1MjdERTYzNDM5NDhBN0NFNjc2MzMxMUZDRTdGMzE4MDMw
-NEMzREY1M0NDRTdERjg1RTlCMjFBOEE1NkVEMkNCMDA3MEM4NQoKNTY0NjhEQzZENkVDNDc1
-OEYzNDQyM0Y2QUU5RjFGOTczRkVFMzk0NzY5QjVBREE0QTA4QzkwQUFCRDVEMDdFMEYwN0U4
-OTM1ODAxMzdECgowOUNFOTRBNkNGM0I4Q0QyQTY1MEE2RjhDNDJGMzNBNUJGMDJBMkYwNEND
-MERBMjI0RkVFREZBNTlGMzEzRThFNUJBOThBMkI5NUM1OUUKCjA4MTA0N0VBMTcyREE4NTY5
-MzQ1QTYyRkMxMkFERTE3REVFNDk5Q0JFMDhFQ0Q3QjE4QTc5NTUzQjNGMzkxREQ3Qzk2OTlG
-RjIwOUI0QgoKODE3NEQyMTdERUMzMjhDMEE4OTM5MTk3RTZDNDBDNjE1M0Y2QTQ5RTY5QUQ3
-QTczMzMzODZCMzAzMDNGREFEODY4REI1OEE5RTVBMTNDCgpBQzU1RUI3NkEyRDI0MUY5MzIz
-NDUwOEI0MzZEMDA4MTc4M0U2NEI5NDMxMjYwMTE1NzIwRUNBMTAxNTZBRkM2NzZFMDEyQTcz
-N0VGQTUKCjBFREZFQTM5NkUyQzEyNUNEQjc4QkVDMjY2Rjg5NEZFODE0RERGQkQyNEYyRDFE
-REQ2OEE5NzczMzM0RkQzOUU3QTcyQzAyM0VCRTBDQwoKQTZFNUQ2RTBFM0M2N0YzMTg3QjRG
-QUI5MDYzMDJFQjgxMEJCQzVBQ0RFQkQ0ODJFMDBGMjgxREFDNEE4N0M4M0ZERjA4RjJFMTVC
-RDE3Cgo4QTc3QTQ3OTJGNjlDMjM0ODZGRUQyMzQ0REYyNjA0M0Q3NkY0QzlCQkY1NEIyQkY0
-MjUxODA0NDVEOTU2M0Q5OUREOEZFRTNGOEQyQzEKCkE2NjBBQUVCQTZFMEFDRkFCNUNBRkE3
-NzQyQUJGMTcyNDRFQzlCRDQzQjc0RTY0NjU5RDAzMzY5RjI1Mjg1MTM0MDk3NkFBMThCRUEy
-NgoKMkI5Mjg3NTY2NDYwRUQwNTQ5MjNEODI3OTdBMzFDM0U0QkQxNEZDREY5RjMwQzk0QjUw
-MzY0MzY4QzFCQjE4QTEwQkNGNDczMjVEODMzCgpGM0RERDgxNTcyNUY2MjhFOTI0MkNDNjIx
-NTU1NTBENTRFMUI2OThGRTY2REYyOUI3OTgxNzc1N0UwMkQwNTE5MENFQTVCNzhDMzVEMDUK
-CkZGODdFNUIyQUNBOUU3RTkxRkQ1MjMzREFBN0Y1Mzc4OTE5QkQxMTAyOEYyNTQzOUUxRTM1
-QTVEREREOENFNzEwRjRERTE2QzFDQzBDRgoKRkIxQTlCQjlGMkI4NjM1NjA5REU2NDc5RTgz
-QkVFOEZBQTRERTNFMjg5MzJCRDE4RTA3RURDMzI2QjE0Mjg5MDFBNzdBM0QyM0U4QjcyCgo2
-Njc5NkNEQjhCNUIxODBFNzc5RkREOURCNzNBRUU1RjQ1RjcyRkI1NUNFQTZCOUU1MkEyRjcy
-NDk3QTBEOEMxMkM0RTE3NjA2MEYzOTgKCjc1ODRFNUMwQThGNkI3NDkzNTM0OUMxNTNBRkM1
-NjQzNEYyN0YwRTI0OENCRjlFNjAwOTkwMEE3QjIzMzE1QTBEODM1Q0EwOEREM0EzNAoKNjk3
-RjM4MUUzREY4Q0U2NTVEQzNCMkQzODNCMDAyREVCNEU4N0IwQjdCRTE0MTMwRjU0Q0MzQjQz
-M0NDQ0M5MDM0RTAyMTcwOUI2RjdGCgo4QzI1REFBRTY5MkJDQjM5OTU5NURDQjAwOTc4RkFF
-MzQ1NEQ0OEVBMTA1MjM2OUIwRkJCNEIzNDBEM0FDNkMzMjc5QUFCQzY1MjZGOTkKCjM2MkM3
-NjkzQjBDMDE2N0E1MzlDRjRDOEVFN0M0QjZGREJFNjIzNUQwNjY5RkY1MjVFMDVFMTI3QTBF
-MkZCRURBQUZBQTgyRTg0M0VFOQoKMENDMzJBOUE4MEVEOTg1NDJFMjNENzgxOUY1NTUxRDhC
-MDY1NjI4RDQ1MzIwODFCMDBCNzI4Q0UyQzY3ODU1MDQ1NDc1RDlEMTQzMkMxCgpDODNGMTJB
-M0E2MjhEMzAyNjk3QjQxOEQ2Njk5QzlFNDM4MDcwNEQwNUMwMjcwQTczNjAxNUE1OUIyQzRB
-RjJFQzM4NENGMEYwNTQ5NkYKCjAxQzk3N0ZEMzlDNkU3NzhGMzhENUU0MzhEQjVCNkIwNUUz
-MzNBQTZGNEQ3REVFQ0M2Q0I0QjA5OEUxRTUxMzhFOTgyOUQ5M0IyMUYwNQoKRkNEM0I1QTMx
-NkJCMzQ1MkM1MTZCMkI4OTM1QjFCRTgwRTY0QTdBNzIyN0JFNkFFODQyQUYxMUJGQUYzNzJB
-RTRFNDFGOEQ5OUQyODEwCgo0MjdGNzA5Qjk3RTNDQzBERTRDOENGNTlBNEI1OTU4MkY5Qjkz
-ODVCNEY4RTgyMjEwN0E3OUNBNDQ3QjlGODg1NDc3REM0QjY1QjdCQUMKCjMwQTQwQjUxNDFB
-OUEzRkJBRTk5RjY4QjI3QTNDRUNCNzQxOTEwM0JBREI3NzBFRjYyN0IyQUUwQzRGNkYzNjhC
-MUM1QjlBRUYwODA0QwoKRkVDRDgyMkQ2RDhFREU5RjQyRTE3RUUyQTZEMzg1RkIwNkVCMTdD
-MURGRkEyNTYyNkU2Njk5QzREM0I3OTFGRDY1RjJFRTVENjlERkJGCgo0Q0M2RTA2RjdGNEVE
-RTY0MkIxNjM2OTlCMjM5ODMwREUwRDEyMEUxRjQ5NkY0MDI2QTMxRDQ2OUU4NkMzNUIwMTMx
-MEQ5QjUyMUY1RDgKCjYxNEFEMjgxRjE1OUUxOTdGOEE2NkM1MzI1QTI5NDYyMTZDQ0NBOTY5
-QzRGNkQyRkMwNTA4MEJENTBBQzNENDMwMjZCODlDMkU2NDBBMwoKNTk2NDU1NUEwNzM0OTUz
-ODhENDg3RTkxOUM3QTQwMDg2MjE3QjMyRkU4QjUyMTVBMjEyMjA0RDQ0NzI4RTFGMjQ1Qzkx
-MzgwNjY5M0MxCgpDQzhGRUQxMkJGQUYxNEM0REU0REUwQkEzMkQ3NkFGNTJGNkIzMTZFOUU2
-NDUzOEE3MkJENDYxREQyRTI0MTU4Qzc1MzYyMDMxODAwQ0EKCjIwRjcwMzg3NTQzQkNGQ0ZF
-RUYwRDFCM0U3RTEwOEUxMDZEOEIxNzJCNEJDNDBGODNBRTRENThDRjhDQ0IxMjMwRDY5ODFB
-RjAwQTcxMgoKOUZBMUFEREMxRUVERjIzQTMzOURGOTNERjQ1QTNGQkQ3ODI5QkQ4NDBDRTg2
-RUEyQ0EyNEUwMjBBMEZEREMyNDY2NEVBNDJCRDE1QzMyCgpBMkNEMUQ3QzMyN0NGMzI5NDgw
-QjcyMTE5MjZGREY0NEZGMUY3M0ZEMjQ4RDk4MDk1NkNFMTcwMjcxQzc3REVFNTcxNjRCQTJG
-RUQ1MTMKCjVDMzc3N0UxMDk1NkM5RTM4MkQwMkI4ODgyNjFCQTIyRkJBM0Q1Mzc0QkQyMTMw
-MDEzRkYyRUFGQTRDRTRDMTIzNURENTEyOEZEREFCMQoKNjMwNTlGNEE3QjkxMUI5NkM1ODc1
-MjY1MzNCRTcyNTU3NDlFRkI0MUFEMDMyQ0MwMENBQTIwQzI1MzFFNERDMDlFQUM0OEFGQkUw
-NDI1Cgo0MzFGQzI5Q0E0OEEzNzQ5QUM5QjAxMkNCQjIwOUY3N0Q5MzE1OTlFRUM4NjQ1RUYx
-ODc5M0U3OUQzNUM2M0Q0RjFBNzEzNDI4NEJFNTAKCjAwREZCMzJFQUY5MDIxRDNDOERFQzJC
-MTE5RTM3NkIzRjJFOTQ3MzFCMjNGREJGOEJGNkQzNkFEOTE3NEY1Njc1NkI5MDIwNzUxMTI2
-NwoKOERCMzBFRjJGMzRGNzkyMUFFRUIzQTAwQjZFQkU2OUQxOEY2RDFEMTBDNUI1RjVDQTVG
-MzdGRUI5NzU0NjE5MUYxN0UxRjg5NzYzN0QyCgo5QUMzNjYxNDhBOUQ3RjA5QjA2MTRGNjMw
-RjgyOUYxNTVBRERBOEU3MDRFQzVDNDlGOTYzQkFFODlBOUE2NjExMTc3NjU1RUI4NUQyQ0EK
-CjAwNzVERjU2NThGRDY4NjQxQUE3QjMxQjhFMUVFQzhGNzE1RDZERTlENDIyMjc0QkNEODM4
-MjA4MkQ2MjVCQzgxMkY1REMzRjg2RUMwQQoKMzc2QkI1OTZDMjMzRjAxQzZGNTQ3ODA5MDk2
-NzE2OTRFOTAyQ0MxQjk2RUZCMEFBRjJCNDJCQzhCQ0EwMUZGNkRCMjM0OEVGN0RBRDNFCgo3
-RTk2NjExODlGQzI3RDY5MTIyNDQ3QkY4MUY5NDY2QTczRUYwNEQ0RDRCQTYyOEI2M0JGQjg0
-QUU4OEI0NzI5NjVFQ0FGREQzNEY3QUYKCjhCQ0E1MTA3N0MyQ0YzNjRGMTUyQTY1MzQ3NDg4
-QkNCOTQ4Rjg3RTk5RTEwRjQzMEIyQjA5NjRFRDYxMTRDQjY5QUM4MTg2RTQ4NkQzNwoKNkY1
-N0M0MzhCODk1OUMzNjBGQkMzNTUwQTNGQzZCOTczQjYwM0Y2NEQyRUY5OTQ1NUM4MkUxMTA3
-NDM0QTBFQzNFRTRFMUZDMTEyOUE5CgpGRjEyQTIzMjQ2QjQxMEM3NEUxM0ZGQjA3REZCNkE2
-MjI3QTczQTBCNkI0NTE4QTBCQTJGQjYwMDdCMjFBQTgxQTdFQzc0N0M1MjVGMkEKCjhFNkMy
-NTY5QTlFOTUwRTBCQUExN0E1QzlEOUExRTUxNTUxNDdFRUE0RERFODMxQUQ4Q0Y2OUM3ODE0
-RDc2QjUwMzkzM0Q5MUFBOTNFOQoKQTk3NTA4QUFGMjk4MzlFMTc3ODk4RDc5QkZEMjc3MDA1
-ODE5QUQ4N0Q5MzM4Q0FGMDJBQ0FDNDRGODkxRjkyODEzRTdEQTY5QzgyRDdCCgo2RUE3MTc1
-NjRCQ0IxRDQ3MEIwOTBEREJCMUVGQjMwODYxM0FENjFGNUQyNzMzOEZEQzgxNzJCMjU4MDA5
-Q0I3QTVGRkI4NzJFNDNDODgKCjIwRkMzQjhEQUUyRUFDRjg3MEQ3QzVBODhENDI2MTk4Mjgw
-MEFBQjM2RTk0OTY4QTRDNUMyNEVDNUIwRTUzODE3MEU4QzZGOUFENjFEMwoKRTZDNzEzQjYz
-MTlFOERCRTcwNzRDQzIyMjg3NzBBRTUxNjQ5MjI4QTlGQzE4NEFGQzFCQjdDNjc2MjhGRjMw
-MzYwNDU5MzUyRUFENkI0CgpBMkE2OUEzRDM5MTgyRTU2Q0JCMjg2NEEyQzExODBBN0M3NzdF
-NzI2OUM1NzQzRDVBNzM5QjUzRDNBMkM1QkJDOUFCRTgzMzdDMzU2NzkKCjZCREE0MDEwMUQx
-MUVFQjQzQkI4RUJGQTczRTRFNzAwN0EyRUE0NDNBRkVEQTY3OEUxQjE0QTJBQTJBRTZBMDZE
-MTIzOThFNjhENjM3MQoKQTQ1Nzg1OUMwRkYyNUE4MUM1REVDM0FGNDgyNzJDQzVGQUMwNDRB
-RjJFNzFENTEwRTVCQUFBQzhBNTA1NDJEOTM3OTg4MEFFN0M5RDJECgoxQzgyMkI1NDc3REFG
-NTE1MEI4NEZCOUExQTA2MkM5QUVGOUMwM0Y4OUUwMjY5NjM3RjA1NkJGNjVBOTJDRUFERTMx
-RjJFM0Q0Qzk1ODkKCjA3MDFBNEEwNjQ2MDVDRjc5RTkzM0E4NTE4NUI1MEQxNEE0NzY2NTYz
-QTk1MkQ1QTNDOTlDMTZDRTdBNTBCQTY4Q0VEOTg1NDlERDM5NQoKRjY2OThCRTRGNzk3NkFE
-NUEwMEU3MzdBQTMzQ0E1MUY0QzczMDhCNjZCMTBCRjYzNkIzQzREQzg4NjZGMTUwOUIwODFC
-MTc4MDU5MzQwCgpCRDk4NDlBQjQ4N0NBQTAwNEI4RTYwMjQxMTI1NDU3QzkyMjM0MEIxQkM4
-MTc4ODVCNzAzOTE0QjBGQzU4RjEzOTEwMTZGRTFFM0RBMDQKCkFCNUYyMDU2QUUwREM4QTY4
-MUM4REU2Q0Y1RkExMjVEMkM3RjU5NjdERTg0MUYwNzZBRUU4NzkxRTZDMTdEN0Y2OThGMjA1
-MkE5QzY0MQoKMDQ5MjRGOUZEODVCQkFGNzdEOUVFODcxMUYxNDdENzMwQTZGODlEQjI5NjVD
-QjQ1MEYwODIwNDAyQzJFNTJDQjU3OTc3QkEwQTc3RTBCCgo3NjgyODQ1RjNFNDI2NkI3NzMw
-NEYxNjNBQjJDRkQ0OTQ5NDkxN0QyQzU5NjNBNzA0Q0ZFNDZDNjQzRUE3RUNFNDQxRjgyRTI3
-MjQ0NEEKCjgyNDJCRkE2Q0I4MTNCNjYxQ0M5NDMxREE5QzFFMUU5QzZBODYxQzZDMEVCMzA1
-M0QxRDYyQ0I3NzQyMDlBNzU4NkY5Njk0QjU1OERDRAoKNjI1QjU1QTBFOUZCQ0U1QzE1QTlB
-MDAyQkM5NDc4OTA4NTUzRTk1MzAyQkFEMUU0REM5QzI1MEFFRjE3MDQ5NUZDODk4RkRFQkEz
-NDVCCgpCNEFGNzA2MzM0Q0VDNTA5MUY4QUM0QTIzODIxRDBGRURDNjE2N0ExNUY0NTYzM0Ez
-MEREQTg4RUMzQzhDNkUyMzVBNUEzQzFCRjFCQkYKCjAzQTg5NkNENzgwNEMyOTdENkJBRTEz
-NERGRTRFMzg4ODcyQTA1QjkyMDM0QUU3MEREMENFQkNENTcxNjU1QjE1MDc4QTI3MTlBQjMy
-QQoKNTI4RTYxM0YyQkUzRDVBQzVGM0M5MzhEMjNCQTIwRERGRjE0MjI1NjA3MjZCNjJCQ0Ix
-QjlFQTA5REExQTI4RURCNTVGNUNBMkQ0RTA1Cgo1MEUxMjMxMTU3QTgxOTc4RTdCMDVGQ0VC
-Qzg1NUU1NEE5MzZERDQwNTNBNDJBQkFCRjgyMEUzRTREMzcyNzg5MDlFRDQ5RTQ5QzYyMTMK
-Cjk1NzU4NjJFREI5ODNCRTRFQUZGQTZCOTQ2Q0Y0REUwNjhGRUI3NDA5MjdDMTk5MzVEMjVE
-Q0IxNUU4MTc4NDcyMTQ3NzRGMjkwQ0YwMwoKRTg2MkU3NjMzNUNEMUNFNDYxODhDQTM5NjlG
-MEIzRjlGMURFMTc0QzlFNDgwQzQ3ODJDRDVERDZEQTRGMTlCNTFGNUYwOUI3OENDQkQzCgpE
-NUFDODBERTg0OTI3OERENUE4NEJFMEY5RDY3MjI5MTEzRkM0QkNDNDgyOUY4OUVGNjFFOEVF
-QjkzRDQ4RjI2MzA5ODA3Mzk5NkNFNzIKCjA1NDM1NTg5NTg4RkJERUE5MUMxOEY4QkY1M0M4
-MURDRDEwQzc0QTYxMzlCNUE2OEVDRTdBQ0QzQTQ4NTcyMzIyNERGMDAxNzdCMUQ2QwoKNDhE
-N0Q5MkQwQTVBOUU1NTBENUUwNjE3NjVCNDk2MTZDNjUzMDU5MTZFOUMwQzUyN0Y2QThFQjZD
-RTAzMUVCODgzMTFBOTY4NjE1OEFBCgpCNTI2QkRDN0IwRUQwMUVGMkU4NEU0OTVEMTBBNTBD
-N0JGODc1MzZDNEQ0QkZBQzIyQ0Y5NUM1ODQ2MkE3REVFOEU2NzE3NTJFOTg0MjkKCjhERUQ2
-NDQ1MkFCODQ2M0E4RDREOThDQjdFMjEyMURDRTY4MEQxM0NENTJCNENBREM3Mzg2OTJGNkM1
-QzMyQUIzNzhDQjJGRTRGRkQ2OAoKMTFCMkY5OUE2RDBCQjlCREVCQ0RDODI3REQ3NzYwM0JB
-NTgxNDIyNkYzOURCOUFBODNBRTJCOTFDMEM2MDIwRTkzNDE5MERDNjEwMTM2CgpBQzZDRkM1
-QjZCNUU4NkE2NkRBMjU4MjQwNjM2NEZEMUFGQjE0MzYwQ0ExNkVCRDRGRUU2REQ1QjVDNDJF
-N0FEQ0RFOUI1NDY2MUNEMjUKCjE0NjRENUM3Rjg5QjYyQzk5RURBQTY5N0E5NkFFODVDMUQy
-ODBCRUE2RjcwMDExMEIyRTM5QzBEMDlCRDE0QTU0OEQyOTc4ODgxRUYxQQoKMzhEQUZCMTk3
-QkQ3OEQ2MkExN0MzNDM4NzNGMjc5RUE4NDE1NUQ3OUUxNzg4N0M4QzU2QjhFN0RFRDM4RDA2
-NEVCODExQTk1M0JFQ0IwCgozOUM5RUZBNDU0MjRENjQ1NUI4NjlFRUE1QTI1MkQ5NDBDRjBF
-NDNENTE2MkVFNDA4RTc1RjJFRjBCRTJERkNFRTY0NDhEREE1MjlCRTcKCjU3Q0U0REUzMUI4
-MEE0Njc2RDIzRkMwRTkwMUI4OUNGMDJBQTA1NjJCRTY2MTg1RjkxMDM3QjFCNTY4MDlGRjEw
-NDZBNkZDMzlDOUI5QgoKN0VDMjdCQTRBREYyMzg3NjBBNTc1QTQ3MjI3M0JCNjRDNUUyQ0I3
-NzYyMDdGMDAzMTVCNzM1MzRBNTM5NzY0MDA5MzcyQTc0Q0M3NjEyCgo5REE2MTg4QTM4Mzk2
-N0RDMTE2NUMwN0M3QjFGOTNCMzlDNkMyMDE0NDkxMDZBMEVBMTI3NjYzNEE2MTYyQUFGQURE
-MjFDNjFDMUQ1NjAKCjFCQUE2NzkwMjc4NUNCOTBDODdCNjExRDNBNkEzQjk0NzAxM0JBRDhD
-NjBBM0Q0RDMzOUEzMDI1QkVDNzRCNkREMzg3QjdBRkFCODMxQQoKODdCN0E3MUEzN0QyNTE1
-MjNDNDg2NDJCMUQ0NzlEODM2OEVCMzFGOEJCODM1NUVGQ0NFNURERDEzMjNGQzk5QTU2QjEw
-ODlCNzUyQTEzCgo1Mjc3MEJDN0UxODIxQTM5ODg5MEIzMTY1MEU4RUUxNEIwRDQ5QkFBOTI0
-NThDMTVDMjk0MUU0MzQ3ODdFQzRCRDAzNEM0MEJCMEUyMDkKCjZDQjI5QjE3NTM4NzcyOUFC
-RjA5NjJFQkQwMjQyNEYwQkI1MDk2ODdCMDNBMzlBM0JFOTY1ODc2MUYwNzAzQzVEODM5QjYw
-QzRGOThGRQoKRkJGQkFFMDcyMDJFMkNBMjJBQUVFMTQ1RERDMTA0MDkwMTBFMkE1OUI5MzQ0
-MDFFQUY2N0I4RUI0OTlFQ0I5MkIzNzVDRkU4RDU0MTI1CgpDQjZCMjBDOTk2OEJBRkM0NUQx
-QThCQzY1RDk4RDdCNzAyRTYyNDc5NEVCQThDMUVGQzk0MzNGRjJCQzM5NzJGNTdEOEZBQkYy
-N0NFNDQKCjJGQTMyQUI4M0FFNURCQURBRTAxRUREMTgzNDAzRDI3MkFFM0ZDRDc1QkNDNzUw
-QzkwREY3RDBCNTI1NTUxOEFBQjBDOTJEMzBBMDE2NAoKNTlEOTgyMUJEN0UxRDRDNEY0NjRF
-MTlCMEFFQjc4Mjc2MTkwRDcyNkMxRDc2NzQ3MDhEMEE3NENEMDU5MjBDMkE4RkNDQzg1ODFG
-RUI5Cgo5OThENzM1RDgxMTYyMzc4MEYxMjlGMEFBQUYxMTNGNzVFQjI4RjM4M0M5QjhDMEM3
-QTIyMjFDM0E0QkY2NDE5NjFGMzhERTlEQUJEMzMKCkE4MDNFOTQzNkU1Qjk4NDI1MDM1ODFC
-M0Y1NDQ1QUZBMDM5Q0IxMEM5MzZDOEIwQzA4REQ0OUJFQUUxMTkwQUQ2MTFGM0YyM0ZBNzdC
-RAoKNzFBODBBMUY5MUI3RjM3NjBGNUZBMzVCQ0Q3NkQ4MDMwRkFDODcyQzYzNzIxN0IwN0NB
-QTQ1MkM3MkRFM0Y4MDVGNTg4MjBCRjFFQ0NFCgoyMzEyMjlGQzVCNjhFNUYxQjIwMjU5REM5
-MkFGNDgxRkRBOTJEMDdGMjc2MDc3RDc4M0FBNDUzNDk5MTVCNUY4MUM4Qzk2OTczOURCNTYK
-CkY0NTIyRDAyRDU0N0RDNzYyNDBENjlDQ0YyRDY4NDI0MjAyMERFNjBFQ0EzN0Q3RTI4NDZD
-NTA0NUY2QjJEMTA1QjdENUEzQ0E1REU2RQoKNzNBNTY3MTVENURFNUYzRUVFMzU1OUU2NTdB
-NUVBMTNDOTcxNkUzQTdBQzBERTI1RTE3MjBENTJFQ0U4QTg0RDVEMUFFQTA0REYwRjdECgpE
-ODQ2NTQ5QkFFQjVDNTAzMkNGM0MyNTFBNUE2M0E5OURGMUEzM0QwNTQ4QTcyNzM1RkQ5REE4
-MjY3QkI0QjU3QTVDNThENDQ1N0JCMTIKCjQyQjUxNTI3MDNFNjJCNjRDMDJBRkE2ODJDNjVD
-NDExMkIyODM4RDlCRDhDRUM2QkQ5RDFCRUE4ODJFNTA5MDA0NkU5RjIyMDg3RTZDQQoKQjY5
-RjUzMjVGMEM2OUE0ODc0RUU4MjBEMThCNjREQ0NBQURFNkVEQkEzQUM3NThFNTRBN0M5QjZF
-REJDNDA1NTBEQkQ0NzU4MDE3ODQyCgoxQThDNUI2OTY3RDg1OERCOTgzNjE4NDQ1OUUyNjM0
-MEJDQ0E3NjM2QTg0QjdCM0NDOTU5NkE5MDc1Mjg0NTVGNDY0NkI1QkQ3ODlFOTQKCjlERDBE
-MUY0MEMwQUYyMUUzOTcxOTk2RkFBRkZCQ0MxNEUxOTAzMDkyNEQwRDM4QTk0OEVBNTUyOTcx
-QkE2NTA0NUYyODE3NTY0RDU5MwoKNEMyOTkwQzZDQ0RFMjYzMjlGMjNEOEIzNjlGM0FBRjc0
-QTEyNUNBMUZENTUyQkM3MTIyRDIxMTA5RkZCMzZDRkUzODdGMjJDRDA5Q0QzCgpDQ0Q0N0VG
-REY3RjY3MTM5N0NERkNCM0Y0NTdCMkU2RkQyRTIyNzNBQTI2OEM0QzM5NEIzNjE0NTEzMUVG
-MkQ0RDEwNzI5RjY0QUJEQzUKCkVCQzdCMjBCRDA3MkVDMTcwNDMyOTgyMjgwMzQxNzM1Mjk3
-QTdDRERDQkRFRjg0ODNGMzRBRjdBNzk3MTYwNDAyQjEwQ0NBMUM3OEFFMwoKOUFCNjE3MENG
-NkREQTE5RUYwRjIyQkVCMjgzMjc3RTA2NTQ0ODgxQjZCMEQ1MjU5MzZBODRFRTkxRkUwQkE4
-QzI5ODVCNkUzMkFGOTRFCgpERjMzRTZDQzcwNDA4RjNCQzY3MDcwQTkwRTA2NDFCQzY4QjhD
-RThGREI0NkJERTJGRTgwQkQ3MDcwRjBBOTUwNUIwOTU5QjE1MDlFODQKCkNDNjY2Q0E3Q0U0
-RUVCNjMxQjZFOEQxOTgxNjYxMUI1QUNFOTU3RTEwNENDRjM0MzlDMkMyNzc0MUNFQ0E2RjI5
-NTZCMEM1RTBCRDdDMgoKQjQxN0MzNzVCNjMwRDRDQUVGNDI4QTg4NTg0QTNEMTk2MjMzMEEz
-MTZCOTA1OEJCMTMyNEZDRDkwODc4MUFEQjQ3QjM5NDI1QTlGRUY3Cgo2QURBRjQ5OTc3NUY2
-OEY5OEY2NUVBRjgwQkJDOUQ0MDE1RDA1RTgxNkQyRUY5QTFGQTkxQjAxRTA1QjY5QjlFMUJG
-NzUxMzBCNEM3RDkKCkFCMjlEOTVDMDdBNEMzRjJERTAwQzdDMjEwOEY3QkREMkYxMDNEOEE3
-QkUwMkFGRDEyRDFFRDI2QTAxQUVGNkIxOENENjMzNjc2NTg5OQoKODA1NjE4RTA0MDVDMThD
-RTdGMDZFRkQ3OTZFQzk1MzJFQ0FGNjk2NkY3NkVFMzM1NDE5NDU0RkY2NDdGRjE0MTYyQ0ZF
-MUFDRUFEQzE1CgpBMjJGRDRFNkRDNzhBOTNENTFBNjA3NjU1M0MyRDcwNzM5OUQyN0U1QUY4
-ODI4MTNCRDMyNDhCOTExMEFCQTNDREU4RDNFNkJDRDIzRjEKCkRBMTQxQkU2RDQ1QTlFNkUz
-NkZBRTFEQjBDMDgxOTI3MDY3NjUzNjUzNkVBMTNEQTRGMDdENUJCNjI3N0Y3RTRDNjA5RTRF
-MTZFMkVBQwoKODgwNkYyOEY0MTkxRTcxMDk2RTI0OTVFNjREQjIzOEUyMEUwRDEzMDFCM0Yz
-NEQ5RkI0RTZFNjEwNkMwM0I2MjQwRTEwQzBGRDAxQjZDCgozNTJFOUJCOTMwMEMyNDZEMEMw
-MjBGMkI0MThENzZBMDQ1Njc4NEU1OEE3NUFBNUM3MjVFNUY5MjY5MzkyQTkwRDE4NURCREI1
-Q0UyRkUKCkFFMzFFQ0RCM0I2Mzg0M0FCMjk1ODI0MUJCRkVDM0MwNENFMEFBMTQ3QzUwNEE0
-NURCRTA1NTAzREQ0OTNBMDM4NTdCQ0Q3RTRCMzdBQgoKRTg1NzI4OTJBRkY0RTI3MUY1MTBD
-N0UwNjQ5QzU4QjNFM0NGNzVCOEMzQkMwOEVCMzRBQjVGNzY1ODEzRTk5Rjk5QURFMjU5QzQ1
-MzI3CgoyNjcyRjlEQzI1RjAzMTc5N0M0MjY5RThDQUVDQkMzRTkyRDFBNTlGRDEyODVCNDY1
-MDBGOUEyRDY3OUVCRUNFNDgwOTQ1RDc5QTUwQjkKCkQ1RDFBRTkwNzI3RERGRDZGOEM1RUIw
-M0IyRUE3MEMxNjk4MjhGQzc1NUJDNDE5M0NEMDI3RUI1MkVBMkRDN0FGMDlDMDg2NTY5NTEw
-NgoKNUJENzhBRjU3QzI4OTY5NzY1NUEzNDMyQTQ1Nzc5MkJCQzg4OTQ5QzQwRjRCREMwNzE3
-OTM4NTNGOUU4Nzc3ODM5QzdEN0Y5MzYzOUNGCgo0MkYxRTQ1MjBGQ0JDQUVCQzNCQ0M1M0M4
-MzMzNDAzM0MyNUU1MEM3MkEzQkUwRjMzN0NEMTQ5OTYzMjZDMTY5QjM5MjFFMzQ0MkNDREUK
-CjFBNDQ0Qzk0QUM4RDJFQ0U2MzI5MDhBRUQ0QTE2MkE3NDAyMTU1NUNBNzNCMjM1NzE1Qjk2
-NUNDODY3NzI3RTQ4QzNCNkIzOUI5ODlFNQoKMzNCOTJCQUU0MEEwRkFERkM4QkNFODVEMkE3
-RUI2QTFDNENFRTIxNDcyMzQ1NDIxRjlCODBDNUVFNjQxQzkxMjk1NDQ4QTUxMzA2Q0FBCgo0
-MTkxNkRFOURCNEE3OEM3MzgxMDY3MzE0QThCMzlCMTNGNTQwMjI4ODIyODY3MjRCQ0EyQzEw
-Njg3OTg4RTRDNEREQkVGNUUyRDM2RjQKCjM2QzlGNjQ5NUUwRDQwQUI2RjM1RTdEMEQ1Q0I4
-QzJBNzUzQjRDMzU1RDBDREFERjQ5RkJFRUJBNTIzOUE5MEE1NkQ4MjZBOUJFMTJCQwoKNjI2
-NzdGMDdDQjFDQTVBRDNBOEEzOUUxMDU3N0U1RkQ5NUU4MkYyRUVDQjRENEY3QjU1REZGODM1
-NjYzODIyODUxQjdCNjZGQjRDQTRDCgo3NTg3NjM0MzdCRDdGRkE5NTU5MTRCMjY3QzE4QTU1
-RDdDOTEzQzRCOEJCQUNFODg1RjU4MDZCQTcyNjUxNjcwMDMxOThGM0MzMjM2Q0MKCjk4MkVC
-QTc4RDAxRjQyNzBBRjU2MzYxMUI4NEM4MzlGOUY0MTRBMEZEQjRDRTBFM0FDMEE2NjI5Mzc4
-NzQxQjU5OTNCNDBDQTE5MDI0MwoKQzMwQzU1NzU5Q0Q1NDVCMjg0MzQwNDk5NEQwMkVEMjcx
-RDgwN0IyMTJENEQzOTA2NzYyNEM1Njg1RDA0OTM1RjdDOTM2RURDMEQ2RjlECgpEQTExMjIy
-OEFGMDUwOTc3ODBFRjZCM0Y3RTM3NjVCN0QzQjlEOUIyOTI0MDBEN0U5MzFDRjk4Qjg0RTVB
-RTUxRDZGRDc0MUU2Rjg0MDEKCkQwMjYzMDlERkE5MjUxMENEMjI1NEVCMjM0RTZCMkEwNEFF
-Q0RGMzlDMDMyMjdEMDcwOTZDNEJFQTU3ODY2RDkxMDk5RThDRjVGMEUxOQoKQTU4N0E0OThE
-NkJCM0I0OTJFRENFNjAwRTQ2M0EwQjZDRUREMEMzM0MyNzBGOTlGRjEyOTA2RUVENjYyNUM2
-MTQ0MkQ3QUUzQTgwNjBECgo4NTEyMTkyMEU2Qjk0MEVCOUU1NTAzN0Y0MEQ5NzdDNjc1REY2
-RTgyNUNFNDZGRDlBMUEzOTM4RDlBMTQ3NkMwRTBBNTc1MjcwMDA0RDAKCkI1NjEyNkM1MEE2
-MkZDMjExREUyOEQzNEM0MDRCRTAxN0E4MjMzNTI2NzY2MDlBNTAwMDE4MkVGQzNEREE2N0Qw
-M0ExMkNCQjI1Qzk5QQoKNjE4MkM2RDNEOTJDQkJCMkYzQjJEM0YzQjdGQzkwREYwQzYwMTQ0
-QTIzM0U3MUVEMjJENDExM0VGRDk1NDIwODE4MDJBQTdBNjc4QzlBCgpGNjgxMTc5MEFDQjM2
-NTRERkRGODI3MTQ1OTg3NTZFMzY1MTgyQTdCREVFMzExQjc0NjhGRTA3QzJGOUI4MjlCNjVG
-Mjg3RDU1NDQwRkUKCjMyMjQwQ0NFNTIxRTM4RDcxOTk5QTg0QUJENkY2QzFGQUMyMzk0NUJE
-RTk3RDFCMkVFODIzNEEyQTEyRjRGNjFBQTkzMTZDNzk0OUQ3NAoKNjYwQzQ1OUUyQUYyMTY5
-OUZEMzM0RkI0MUQ1QTJDQjg2OUE0NTU1MUJFMDYyRUYzMzYzODA4QUNBNUI4NjFDNUNDMDVB
-MEY3NERDNjIwCgpCNzYyQ0YxMjYwMTAwRjdBRjQ5NzU1NUUzQTM4N0RBOUI4MzZGMkIxRkE0
-NDY1NENENUI5QzNDNkYxMUQ1QjU1NTJFMkQ4MjRCN0IxRUQKCjlFMjU5N0IxODQ5REZBQzYx
-MDQxMjg3RTk5Njg1NUIwRUNGRDIxRUVGNEEwQUVEQjQ5Mjg1NjlEMzQ2MTNDNzRCNDZEN0Y0
-NkI1NUVENwoKNTUzMjIxN0JDNzdCMUUwNzVBNEI1Rjc4MkQyRkU1NzQ4RjEyQjUwRjcxNDZB
-RUY1MDZBNDFBNkEzMzY0ODU0RDhBRTRDQTE4NDQ4NjI2Cgo2MzY4RTE4MTg3NDE0ODk3MEI4
-OUFGNzU5NjdFNjFFQTcyMTIwODFGODVBQjE3REZERURDNkYwRkFGN0Y0MTVCM0NDREU3NTY4
-OEU4NUMKCjFEQzkzOUQ3Njc3NTVEQ0JBNjIyQkRCMzYzMUUxMjBCRUZCQTM3MzNGOEJEQjBB
-OUQ0REY4NzM3MjQwMzg1QTZFRDY0MkEzQjZCRkNFMgoKRDNCMDZCMTZGOTk0Q0U0OUJEREYz
-NTVBNUU4RjI4QzREQ0I2QUZBRjYzNTRBOTdENDkwQjU0QjhCRkI5RUUyQ0JGNUFBRTY2OUUz
-MTQ5Cgo0NDYxRTcwQTYwMTU2NzY0RjI1NTIwRUExM0YxMjYyM0YzMjgwMzQzODIyODc2NjYw
-QTdGNjYwM0I1OUFDMzlENDI1QjM4MjE3QUI0QkQKCkUxMjEyMEVBNjExOUYzMkUwODBDREU0
-QUU4REZBMjFFMjNEQkZBQjAzNzQyMUIyMEMzQTUxRjRBRTJGQjVERjQ1ODVFRDI4OTE0NzQy
-NwoKNjgzRjQzRUNDODIyRTA2ODhFNkFCNDc2MTkwMzhENEI5NDA0Q0JCRDkzMjRCRjMyNzcz
-RThDOTVGOUNEQjBDRDY4NzQ4REYwNjY5NzBDCgpBRDJCRjhFNDQyNDk0MENGNkM2RTQxREYy
-QkEwN0RGNDA4NUEwRTZEQTYwODBGRDQzRkZFQTBBNzFBQTdEMDAxNjlEODI4M0M5MTBCQzYK
-CkYwMDY0NkRDOEZBNjUyMkM4NUJGNDZBODYzODM2RjY0Q0U3M0E2RkJDMDUzOEUzMEJFNjM5
-MzBCMEVDMUU0QUM0MEExMjIwQTk5NjQwQwoKMzlGODExQzQyQUI3ODMyNUFGOTc0QTI3QTBD
-MkExQTI3ODVBMzZFQzMxNjA0OEU1Njg2N0ExRjg1Rjc4QjM2MTcxRjEyNkI3N0MxMTRDCgpC
-N0E4RTA1QUQ5MkRDNjg2MEQ1ODkzOTY0RTg5ODk5OEM2MzgzNkNCNUNBQ0UxRUVBMUM5Qzgz
-N0ExRTIyQUZEQzRCMzVFMTQ5RkIwRTEKCkJGMjQ4QTI1ODQ3NjA0REQ2OTYxREYzQUVDRDFB
-OUY2MUMzNkUzRTFFNEFFMUI5RjI4RkFGMzUxRkRBMTEzNjY0QkJGRUNFMEI3QzVFMgoKMzE4
-M0Y4NDI1QkU2OTA2QTU2Mzk4RTMzOTEzMDMzRTUxRTA2NDA4RTAwMUQ5Qzg2MkUzNkE5MzAz
-OUFGNDdGNUYzMDFCNkI1RjM3NzVCCgo0QjJENDI1OEI4NjY1NTkwMDEwNjZDNkVGQzQ4QzU1
-RjRDM0YwQ0RERDhFRjUyNUVERkFENkZDMDYyMTM4MTlBOUJBRTJFNTU3N0Q0MDQKCjZFNDY1
-NkJBMkYzNDIyN0M1RTM3RjBENzdFOTY0Nzc5QUZEQkM2ODQwNjE2Q0YwMjkzNkYyODFGRDM1
-M0YyQTVEOEU3ODE0QUM2QjI4QQoKNzFCQjU3MjUzRjg1MjgxMEI3RERENTU5MEE1MjJDNTBC
-NTZCRTI1MURDNzY0MUUwRDFFMjcxRjhDNENDRUJBQjY1QjZFNzBGODZBN0M4CgozMkQ1NUFB
-M0U2MURDQUU1MDRFQzRBQ0RBN0MyNzRBRkU5QkM3RTc1NjEwQzg2MUFDRERGQTVEREM0RThF
-QkNBMjRBNzcxQkYwQ0EzQTkKCjhCODhBNkVDRTUyRUZBN0M4RDU1Q0YwRUU4NTBBOTlDOTIz
-OUE0NDY2QjU1OEI2RDAyMEZCRUE4RDIyQkM2QUFFNDI5MkI5MEM5QTk4MwoKNkY3RjRDNUE1
-ODhFNkNDM0RBMzMxM0Y1RkVCRDRFNUQyRjdFNDU0RUJDQzk5Mzk3NDJDNjdFN0MwMUU1MTBE
-NTA3RUMzMEM2RTZEMzQwCgo1MTBFRkYzNDkzQjIyMDlBN0FDNDNCNDg0OTIxODcyMzE1NjU3
-RDNCQUY1OUNBRTM4REVBNDhGMzk0RTRERjNBOEM5MzBDNjFDNTQ2MTAKCjMwMEQ2NkE0MjNB
-NENFMjM5MkE3QTQyMjg4M0VERjA4NzY2MTE5QzJEN0I3QzczODQ4MjFCRDZGQ0QxQjc3QjFC
-RUMxNERCMTVGMTA4NwoKRTg5QURGNDY3MjMxMUZGMzY4RUFCNjBDQkI2RUNFQUQzNEE3NTA3
-QTc4MUIxREFENTU3RUQxOUM3QTVCNUUzMzQ4NTEyNjhEQzIxODI0Cgo1M0NGQjdFRjQ3RDE1
-QkFDQTY4NDUzMzAxRTk1MTI1QTVDRDM1RkRGRjFFNkVEQjg1QUU3QzIyODE4MDQyNEEyODQy
-RUQ0NzVCMzFBRjYKCjI0MEE0ODBCNkY2RDdEMzY1MjgwOEY4ODcyRjg1OTg0Mzg0M0Q4NjJF
-ODFFMzU5NEFDM0FGNTc3RTc5RjY0NzMyMjM5MkU0RTYzQ0MwOAoKOTM3QzI5NzZGRjc0OUUx
-NkM1OERBMzlCOTAzNUQ4MDJEMEYwQTlEMUREQUMxODk0RkE3MUJBM0U0MTg0OUMxMzM0NDUx
-OTFENDFEMjVDCgpCMzdBODMzN0M4NzZBNTk3M0VBMTM1NjczODlGRjg5QzY2OEUwRDEzRTIy
-NTk2NEREREMzREJDOTQ5QjQ2RTBFNzVBMkJBQkI2RTJBRjQKCjUzRjY1QUNEQ0Q0NUEzOTRC
-RjIwNjMwODAyQkQ5Qjk0MTg0NTlCQzc3MzZFMzcyNDRGOTIxNUYyRDZGNTM0RkVFQkIxRjg0
-MTk2MjczNwoKRDQ4REE3RDZCMzBBNzFCQzQxNzNCNkUwMEFEQjRFRkJBOTFDRTYzMzJDQzUx
-N0IzOTcwMUUwNzY3MEQzRDFBOUE4NkE3MTAyRTZBODBECgpDMUVDNkNENjQ0RjU1MTFEMDkz
-OERBMDk2RjgwQjQ5Q0EzNDQ0QzBEOTZERDc5RDNGODgzMkQwNDEwRjA0MzAxMjhDNjA1NkRE
-MDlGMzQKCjRDRDdFOEQ3NDM3ODlCRjNBRURCODE4MURFQjFBMjExQUE1MzIwRkNGNzkwNDg5
-NzMyQ0U2QTk4MkIxNDAzQ0M5RTJBRTZCQjlBQjVDNgoKODYzQzMyMDkyOUIzODYxQUMxMDEx
-RkE2MkM0NENBMThCMTBDREQ5REVEQ0VCNzNFOTE0NUI3M0M0NzFDNkY4MjhERDE4ODgwNEY5
-NkVGCgpEQzNEMjI2QTJBNUQ3MTU1RjdGOEJFNzgyMUREMzlFRjQ1MEI1REZCMTREQjZDNEY1
-NjhDQURDRkVEOEM3MDI2NzVCQTFDMDRDRTZENjIKCjgzOTcyN0ZFNkY4QUVGNTk2OTNCQTM4
-QTJCOTAwRDBEMDJDNTZEMkM2MzI4MzNEMkQzNjBBREUwN0FEQ0Q0Q0JCNjIwNTE3RDdEMEIy
-OAoKRTM0NjJFNkVFMkQzMDg1NkJEQTUzREY0RDk3RkFCMDU5QjA2NTdFODE1OTIxQUNCMTZF
-MUFCNkNDNzJGQkFGQjkyOTBBMUVENDMyQTMyCgpDRUY3RDhDQTE5Mzg1ODI3ODVEMTJDOUQ5
-QjEwOERDNTY0QTlGODBCOEM3NUI1QjAyQTFFMUM5QzVCNzkzNTI2Q0JCQUI5MDQyRjQ3OUQK
-CkFCMUQ5RUU5QzE4MTg0NjkyQzgxQUZFMkNERUYyNkNBNDE4ODAwNDc0RTZCNzQyQkI0NUNG
-MDJBQkNEODZDNTJCRTEwQzc3N0RGRjk4MQoKNDY0RDYyNEE3QjZFNDU1RjZGOEQ1QjdGODRG
-QUJFMjg4REUzRkM0Q0U0QTIzNzY2RjNENzcxNDYzQUIxRTU1NUYyRTFFQ0I2MUI2QTJDCgo5
-ODdCNDNDNTNCNjM2REQ0NjZCNTdFRkFEMDk4MTFDNzI4RUQzMTNCOTUwNzg5QjI2MkExN0VB
-OTMyQTc0NUVGNDNBOEVGREExNkQwNUUKCjlCRTQ5RDNCMDVEN0VFNjMwNDM0NjQ1QUQyNDVC
-QkI1NjAwQjhBQUNFMzI0MUYzNzA2QTNENUI5RUZGMEE3OTNDNTZBODY1MEVDNENDMgoKNTVF
-NEEwMDEzNTZCRjcyODEwM0Y1OTg5MDU0MERCOUIzRjJDQUNGNzg4NDk1RjYzQkFGMUQzNkI0
-RkUxMEI4NjI4N0YyMTM2OTVFNDhECgo1QkUyMEVFNzAyNTIyMkM4QUVFNEY1QTE3RDc2MzMy
-MzI0NjA2MjFGN0YzOTVBMjI1RDk5NEFGRjhEMDZDODM1MUZDODNGMEM3RkJGRUUKCjMyMzUy
-QzFBM0UzNTY1MUQyMTk3MTMwMTlDQkZGNzhFQkMzQjE0QzVDM0UyNTY5NUJDNDQ1ODIwMDhG
-QzA1M0Y2RTdGQTgzNTlFODU1NAoKQTdDNEVBOTA2MzIyNTkzMDJFQ0ZCOUI1RjFGOTcyMUEz
-N0VERTlCNkFDRTc4QkQ3QzY4QzczQTk2MDM0NkQ2MDhDRkY3MTUyNjgxRURBCgo4MTY1NjU0
-MUFENEVGNjRCNEI4OEZCRTk4MTA2QUZGNkYyMDUxQTg3MUY3QUFDNTMzN0E4QUEyQTE2RjU5
-QjEwNDQ3RUFERDA4NEZCMDMKCkMzNkU1RjBBNDc4MUU0RDgzNDAyOTQ0NzE0RjE3NkZDOTQy
-MEUyMUVGM0EyOEZFNjVDQzlDQUNBRTEyODQwMUJBQjRFMzMyMkQ2MzAxQQoKMThGRUM1OTVD
-MDVCQkY1QzQ0QzY1RDAyN0ZDMzY5OEY2NkEwN0E1Njc5MzcxMjNENTlGMTZCOTI5MEI3MEI4
-MzhGQkQ0QzZEMTJDNDYwCgo2OTMwOTg4MURERTUwREUwMjI0RjEwMjMxQTBGQkJDMTlGNTdF
-N0I2QjI4ODYyMkY0MDY3NkQ1M0Y0REFFMjdDNkUzMEREMzE3NTlBMzIKCkVDMDMxNTg3NURC
-Nzc5NDg2QzlCNEY3MzM2NTE2QzUyQzUzN0Y2RjI1OTUwREM2NzFBRjNDNzQ5RTIzNTdBNDhF
-OTlEMDMyREFDOUY5MAoKMjVCMTYyRDY3MkEwMTkwODg0MkIyOEMyQTlFOEZCMTNCQzU0MTFD
-QjEzNzVBM0IyNTg3MUU3NzM3QzJCMUZFRTRENDM5NDlEQjE1NjdECgpFMkFBRTQ0QzE1MDU4
-NzE2OTAwNjIzNTgwODgyOTRFNDkyOUQ1NTI4NDdBNkE5NEEwNzVCN0QwQjg5RDdEQkE2NDVE
-MjZCODZGN0Y3RjYKCjQwRDdBRTRCNDc5NTZERDVBQTA1NERFMTk0QTU3NTZCOTUxMjJGMTgy
-RDFEMDI1MDRCRURCRUUwQUNFREFGQ0EwREFEODQwOTI1ODJGQQoKMDYwM0YwMjUyNDAzNzVC
-MTFFOEMyNTJBNTQxN0ZBMUFBNEM5NkREMUM0QTM2OUMyRTU5NEIyMDg5QTNFRkI5RDkzNjIy
-NERFMjVBNDIxCgo1ODg3MThFNjE3N0M4RTMyMDY3OUVBMUM2MzlBQkQzRTRCQjY1M0RDMTdB
-RUU1MjY0RTk5MUJGRjYzNzY5QTdDMDdFRUY2QjBFNkMxQTcKCjM3MUI4ODlCOEJERDE0REE0
-M0VFQjI1MkZDRDgyNTU1NzUyQzI1RERFOTJERUExMUUzMTAwQzhCQkIwRTJEOEQzOEMyOUU3
-RUQ0MjMzOAoKOTgxMUMyMUU0QkQxNjJGRDc1QUIxQTBFNUE1NzkzNTJDRkRFOUNDOEZDRDNB
-NENDMkI1QzREODRDQjVBNkUyRTUyQTUyQTNEOEVGNDQ1CgozN0M2RjgxMjY5NERBNTExOUNF
-OUI3OEEyQzVGMTI0NTRCMUJBOEFENkJFNUQyMDg4OTA2QzNBMTFBNENBODBCMjEyMDQzNEU5
-MkI1MjYKCjE3M0QwN0M1MzBFQUZGNjFBMjcxMkY3QkNFMzYxODE5N0I4QjYxNzVDRUFFOTMx
-ODZCNzMwOENBQTkwQkQyMDA1NEQ5RjQ4RDEzQjQwRgoKMkNCODFBMDhEMjAyMTk1RjNCMDNF
-QjdFMTRBMTdGNTQxNUU0NEM5ODFENDdFNENFQkQ0NkZDMkNFODJCM0QwRjRFQkQyNDI5ODVB
-RTUxCgowQkI2RjNDMUE3MDJFODZFQ0QyNzhDQTMyMjU3NUQ3NUVDRDg2ODk4RjAxMzQ5OUQw
-QTdGQzFGQzEyN0E2QTY5NDYzQkM0NDA5N0Q0N0UKCjhBQkM1MEVEMzZFNEVGRUNCNkU1NTUz
-QzM1Q0I2Q0Y2QkI0Nzc5Q0YyMkY1RjY5NzBGMTVGNTQxNTlGRTVCQUQ3RDU3QjVERDVCNUJB
-MgoKQjJFMjUwNjlFRTc3QjA2OTc3QkVGRjE4RDIxNTk0RTZERERFMkQ0NEM3REYxMkE4MDEy
-MUZCOUEyM0JGQTE2RjRBN0VDN0FDMkIyQUE2CgpEQkM3NTE1RTE4Q0UzOUJBQkMwNEFDQjFD
-QjhDMEEwMUEzQUYxNjkxODFDNDdBQUNBQTBGMEQ4MDNFRTRDNDBGRjBDMEZBMTA5NjMxMDIK
-CjMzMEYwQkEwNTZERUVBMDJBMjQwNTY4RDhERkMzRjAxREJDNDJEQTJBQUQxN0NDOUE1RjFE
-RjEyREEzM0JGNUNBRjhCMjJCRDUyMURFMgoKRUEyQjgzMTEzNTQxN0U4MDQxMkIyNDQ2NDRC
-MEU2REE0MEREM0U1QzJBMjgzQTc1OTUwRjY4NjE2NzcxOUVBNjlBRTFEQkIwMEQ3MzU2CgpG
-QUYzMzEwRDI0MDY2RDQ5NDFFRjcwNjg2REM4NTlDRDUzM0JFQUZFOUQ1QkI0RTQ3MEYzOEIw
-OTEwNEZENkI2M0ExQkM2MUNGQjI3QjYKCjcxMEVGMDkyREVBQzc4MzEzMjQ5QkY2NjYwOERC
-NTA3RjA4RDhCOUNCNTVCQkVFMUNBRjc5QzgzRDYxNjY0ODE2M0Q1NkRGNjM3RTUwNgoKRDA2
-Q0I0NUNCNzBDREFCOTBDRDg3RkVEOTM0RTBBRUFEQzhDNTZCNzBDNjg3QjQ0QzMwQjg0Mzc2
-QTAyQzA0ODcwRTA2OTBGN0Y0M0M5Cgo2NTM2MzI0MDkyQzdGNENGN0I2NDk5MEVBNEM1REI0
-NTZGREQ3MzQ2RkNGNTUxMjFBNTI2NUE0QjMxNjlGRDVEOEFEQzE0QTE3NUY3NUUKCkY4RTg2
-REFGNzBGQzRGMUU3QTAzMTgxQURDNkYwRjlDREU0MkREMkI0QTg1M0U4MUU5QTQwRTE3QUU4
-QjBCOTVGQzYwRTYzNUM3QjQ2MAoKNDc3QjU4MkU3RjQ1QjAwRDc4QTQ3MDM0MTRBNUFCMkEz
-MzQ1NkRBQjcyNDc1MTNDQUNDMTM3MEEwMkQzRTBCMUJCREY1OTkxMzg1RkEyCgo5RTAzRjdD
-QTIxREMxOERBRjYxMkZDQUZBOEUzNURCMzY2Mzg1MDE4MUUwNDY5NTQ5Mzg3MTVCMjRDNEYz
-RjU2OTQ0MkI1ODE0RjIyQkUKCjg5QzYwRDkxMjQwOEQ1MDUxRkFCOEM1NzcyMkZGNjk0MkQw
-NDVBMkQ2MkIyQTY5Njg2N0RFRjM5MTVFRTE5NzM1NjFFOEVEMTY1NEI0OQoKM0U5OUIyNzc1
-NjA1MDY2QjM2QkQxNTZBMTM0N0UwNkIzMERCMTI5MjE0QkVCRkVFRDg4MEMwQjU4MjkwQzVG
-NjI5NUQyNDNFQzQ2QzZFCgoxMjJGNkUyRUVGNEM3REI1QUQ5RUZBNDkzQ0ZCMDExNzNDOEM5
-MkE3NkE1RjkwMERGMDIwMzAzMkM0OTAyMDhFRTVFOEMwMDg4NzA0QTYKCkJDMUQ2OUI0Q0Qy
-RkUxMjJGRDhERTU3OTgwMUIxMTBDNzZGRDhGQUM4OEMyNDU1OEIxMjdCQjkwNzQzRERFNzFG
-REU5N0IxREFDN0I5NgoKNEM0RTVERDhFQUQ5RjBFOTlENDUxRUQ5MkI0RERERjhCNzY2NDM3
-MjdGOEQwMTFGM0U1MjdBMTZBNzAzQ0Q4QTU5N0YxODY4NUFFMDBDCgpENDQ5NDRBNzdCNjlE
-MDkyQjNBNjFFQzk0MEREOEY2NEMxODUwQUY3QzhEMTdCNjkwMjM5NzA3MDAwQkExQTBDMEMx
-RDIzNjQ4ODM4QTIKCjFDMEJGRjkyNDBFQkE2REI1ODMyMjE0QUNDOENGMDIyQkFEMzA1RjY1
-OTRBOUM1QjdGQkZDMzg4MTk1OEExNzBCMDI2Nzg3MEU0QjgzMQoKRjY4OTUxQkI5OTUyRjc5
-MTA3QkNERjI0QkE0QjQxRUUyRkMzMUMwN0U0QTRBNzM0MEIzNkIxQ0QxMjE3ODlENjMzQUE5
-NTg1NjNCODBGCgpBNkNCNTZGMTFFQUM1QjQ2ODgzOUU5NTY2NkE5NkI3REY5RDNFQjE2RjU2
-RDY5QkQzREQ2REM2RDM0NDU4QjNENTZENTVFRTlCQjJFNTIKCkVCMzU3ODg3REIyQjhDMTJE
-MDY0RUYzMUUyQjUzRUM0OEE0OTY0RkVGMDBEREYwQ0IyNkU2QjJGRkE1RjU4NjY2NDlCQzM0
-MTVDMEU2NQoKMTBDMDk4MTQxNThDOEIzOTFCNzRBM0Q3QTA3RUY3Mzg1MTkzQkNCQUFGMjZF
-RDA4NjE5MUZGQjgzMjhCRjM1MTFCNENENTRDNjM2ODc3CgpBOTE2ODY2MTc0REYwMjYwODAx
-NjM5QjMwMjRCOUM5NjUxMTZCMkE2OERFQzhFMTcxQTYyMEFCNDcxRjY3MzM5MUEzMUIwODE2
-NjVGMjcKCjgyNkU5QUMyQTMzRENCMDU2NTEzNEU0MDdDNjE4NzE1RTE0NkNFQ0ZENThFQUY0
-MEQxNTc1QTgwNURGMTJCNzFBQzNEM0JCQTQ5MTNDQQoKRDg0MTg1QkI3RkRCNkEyRURDOTA0
-RUMwRkU4RDk1MjU1RkM1MDE3NEE1MDZERjkzOUZDMEZFOEM2REQ0RDI3NTY2QzMyNTY5RUEy
-MzM5Cgo1ODNENEZBQTgyRTAwRkY5REI4RDMyMzVEMDBBQzNDMUFDNTgzMDZEMkUwMkQ2NUQ1
-NERFRTZERjZFQ0YzMzcyNkUyNDQ0RjYwREJGQTMKCkRGRjRGNkZENEFFODgzNzZCNTA3RTcy
-MUM5RTlGRTAzMEQ3N0I5NUFCMjlDNkRCNzAzRkE0NTUxNUE0MjRCMjEyQUNGOUQ2NThEODQ4
-RAoKMTIwODgzREVFRTc4MzQ1QTM1Njc5QkY4MkQ3QzI2Mjk3MjU5RDg2OTdBMEMyMjFFMjZD
-NkVBQkYzQTcyN0Q5NTEyMjFDRUU3NERGREYxCgo1QTMzMzYwREVBMzZERDAwNjM1MTVCNURE
-MTdDMjA0RTBGNEQ0OTM1RkQwQkJFRTc3NURCRkZBRTIzMkFBMDE4QTA0QTVFNTlFQzYzREQK
-CkREMEI4QjExNDUwRkZGOURBMEQ0ODk0Nzc4ODc3RTBDNjNDODI0ODlEM0Y3Q0Y2N0I2MUVF
-MDhBNjExMzBGQjc3RTE1QjUwQjdFODdBNAoKMkY2RjgzN0Q1MEZBMzY2NTUyOERGOTE2QjE4
-N0IxMTk1NUIwNDI0QTc2MDNGMUY2REMxRTJCRjQxRUFDNkU5OEU5RjBGNUY0NDU4MEEwCgpB
-QjhDNjQ5RURENEY5NjBGNDc1OUNCQzI5OTVEQjBDMEUwN0E4Rjc3M0VGOUY1OEVBNTQ0Mjk3
-NzlCN0QwODVGQjQ2QTUxOUNBODlCQ0IKCjAzNDBBRjg0M0VDQjM3QTgyMDhCNzczNkFDMjc0
-ODExNzI3MjhDMzYwREIxN0NGRTgxRTM2MzU3OTRDQTkxOEMyQkJENjY1NEQyRDRCNwoKNDAw
-NjA1M0VFMTdEMUREN0VGQjhFQTg4MkNEMDU1QkI1RkM5QkFBQUVFNjMwODlBNkYyMEJGODhF
-RDlFQTY0M0FDMjdEQ0U5QkMxRjFBCgpCOUYxNUI0MDE3MkM3RTRDMDYwMkQxM0QxMzIxNkNG
-MEYyRDU3RTUxQjc1MUFGQ0Y4MTYwODM1RkQ0RTNEMjFBNTg4OTg0MDE0MjU5NjEKCjY5Mjcx
-RTJEQzk1RDcyRTZGMDc1RjQxM0M5NkRCN0REMTdCM0ZGMjYwODgwOUQwODc3RTIxMkE3RDFE
-MTdFNzRDQjRGRjQ4QjY1NjQ1QwoKQjgxMjZEMDVBRUJCRjFBNkVEQzcwNDc4N0NDRjU3RjlC
-N0NBQ0Q3NUY3NDhBNUE2QTFDNEVDODYzQ0VFQjJCQjFEOUE0QTIwN0I0RTBCCgo5MDEwNjBE
-MEUzQTk4Nzk5NzBBRTk4NDY0RDhENjdGOUI0RDdDNkU1ODJGMDMwQjhEOEQ2MkUxNUZEREJC
-QTI1Q0NBOEE5RUZCQzAyRUYKCkMzMDRDQUVFOTAyNjcwODE5NDYzRENCMDQxNEIzRDE4NUFB
-NkREMzcwQjgxQ0E5MTQ1Qzc1QUQ0RjdBNDc0MTFGMkJEMENBMTUwNzQ4OAoKMTE3ODY4NDU4
-QzA4MDIwMTAwNzhDQjRFQzJCRTAzMDhDOURDMjJBRUY1QjJFOTI5NEVDMDBCQjU1Njg5MTYx
-NjREQTE4Q0U2OUQxNzBGCgpBMzY0MUQyOUQwREZEMDhCNUFGNkUxRjE5NTFDRDkyNTdDMDY5
-OUIzRkMxQjZDQzE5NDIyRjQzM0NFQkNDN0NDMUUwRDMwQ0NBMUM2RjIKCkQzRkZCMTM4NEY1
-QTFEMzI2ODFBNURERjQ5OTMzNjI5RjdCMDQ0RTQ1REQ3NDhERTg1MDkyNTdFNjg4RjFDQjYz
-N0ZCNzY2MjY5Q0JGRQoKRTIwNkIyQzE1NjBDQzNBODQ0NzBDRENFOEZBMEM3NDI3NERGNTA5
-NEQ0MTNENUE1MUQxQUJERkFBNjZEOUM5REQ2MjdENzJDMjlBOUQyCgpCMEEzNTUyNzg5Nzc0
-MTEwNDgxRkYzRjdFMENCNTgzQzdBQzU2MzRGMDkyMkM1M0ZEODE2MDE0OTdFOTZCODEwMDhE
-OUM1QjQ5RjRFRDQKCjAxRkMyQ0RDOTc0NEMyRTMxOTQxQkIxREEzNEY2RjZDQjYzREMyQzIz
-QTRCRTE3RDNEMTNENDEzMTg4QTJBRjc3MTQzMDIxRDM3NkU2MQoKN0VCMUIyRDMwQ0Y1QTFD
-MkM3NkVFREVCRUI3MTBDMEM0MTU4OTU4QzNEMkJBMjg5ODk1Rjc5RTNERDQ1QjAzMEQ5MEIx
-MjY0MDk2MUI1CgowMzBEMUZGQzYyMUI1NEE4NjkzNDkzQjVGQkREMTkwNTEzMkVEMjZGOTc5
-OTM3MEE2N0IwRDkwRjdGOURGQjA4MEUxNDFGNjQzOTM2Q0YKCkRBODEwRUU4NTIwMTcwNEEx
-NUI5MkM0NDE5RDY1QzBCRDFBREFDNEYxNTc5NThENTJCNTI4QTg0QkNDNjlGNTdBMjUxMjNB
-MDREMjIwMgoKMzE5MDY3QjhCOEU4MEZFQTgwRERCQTlGQzA3NUFFREM0ODBFODIwOTExMUY5
-NDQ0NzQyQTg3MDdGNTc2QTdDN0ExRERCODk0QTMzODEzCgpDMkQ2RkZBN0IwOEUyRERDMTMw
-OUVFMjBCMUQ4MEJDMzg3RjlERjFCQjc4NkJGNkU4MjY0MEQ3NzVGMDg0QUJDQjg2QzA3REYx
-NTQxM0EKCjA0NzVGMjZGRjYyOTYwQUREMUI5NEYyMEZGQjJBOTA4QUFFMkM3OUFDNEVDMzg5
-OTQyNTg1NUQ4MDI2MkIyNzU4RTc2QTQ0ODhEM0E0NwoKMDA1OENFN0JCQkU3Qzk5MTE4MzQ5
-OUVCRDJDNTUwQzI5MThFREFCNUJEOUQ0MzI3M0M0NEREMTkyMDI0RjczNDY4QkEwRUFEMjgy
-NUQ0Cgo5OUVGRjRBOUIxQzJGQzY0QUUyMjIyQTE3MTE2QzFGOENENjE2MjJCMDhCRDU3MzAz
-NkM0ODk1NkMzNTEzQTZBM0I5RjA2NjkxNTM3OEMKCjJBNDFCMzE2MzY4OTk1Mjg0N0FEQjdG
-NjI0MzAzNzg1RTlGNjFBREQ3QzJFNjQ3RDJBMTcxQTVBMDQ3MUU3NkM5QzZERTQ5MDlCMDE1
-RQoKM0JERkM5ODM2REI4ODQ0OTJGNUM5Q0Q3N0Y1RTI5REJCQzgwRjVCODM2Njg0RTgyOTAw
-RkFDQzdBMkNDMUQyMEU2RkVFNjBCRUVBRTkzCgpEQjk4REUyMzhCNjZEMTNCREM4NTg1OTA2
-NTRGOTYwRkQ2QUFBNzc5RjAwREI3NzM2QzdGMTg4MDhGRkMxNjdBRTMyNDIxRkI5NzVFOTQK
-CjdGQzQ5QTIzMjBERENDNEI2ODQxRjU0RUEyMjhBNTgzODNENDIwQTI1QzIxRTg1Qzk5NjY0
-QzhCQjIwQUFDNjYzOTBCQTQ2QjQ5QkE3QwoKNjgzNEU4RjE4Q0IzMUZEQjkyRkNBQ0YxMUZG
-MUE5QzUzRjA2RDY5OTJCMDZCRjBDMDFEQTIwODJFNkVBNzA1MjI0ODQxQTdDNkFEMDJCCgow
-MTVDMkFBRDE5QzhCQkYxQUUyNTA2QjA4RDU3Q0ZCQzBCMjkxNDAyQkRBNUM5NTY5M0FENjU5
-MDJGOTZCOTEwRDQ2NUNCOTM1Q0NBRkEKCkQ3MzFDOUYzMEI0MEVDNTlBRjEyNDQ2QzE4MDBD
-ODBBQzYwRjRENENFNjhCODA0NEI1NzI1NzI3QjMwODlBQkJDNkU5NjMxQTRCQTVGNgoKNTg5
-ODkxQTIwODVDNzRFMzFBNEEyQzRGMDU3MzgwMDE2RjUwODNBRkFCNkQwODlFNEVEQTE3NzA0
-NUJGREYxNjgyRTg0OEJFRUYyRDFBCgpGRDRGOEY5REY2ODMxRkNBMjJDRDdDNEEzNTFDRkU3
-NzA2MzVEQTIyRkQxMUIzMzI2RkY5QUE3OURFNzZFQUZFOTlCNjk5RkYxQzczQzcKCjEyRUJG
-RkMxRDg0QjAxNDI5MTRFMURGRTk5MDYwNUU3M0NFRTdEMEU4OEIwNDk4NjA0QzE3OTY2RkYy
-M0M5MjJGRTcwQzUyMjAzNjIwMAoKRjVCRUEwODFDREY4QkNBODU1OUNCMjJGMTA4REI1MjdB
-QjZBQkFFMUI0NTI5NjdFNTBGNzEyQ0NDQkQxMTI1MEM1NTgyNTc0MUY0NzY3CgowNDM0MTFF
-RjREMDJBMUIyNkU2MzNDQkIwOUUwREMzRTY4RkVBMzNBMjU3QzI2QkMwMjI3NjlGNzFGMjY2
-Nzc3NkE1Nzg4N0REQzA1QjAKCjY5QzE0MjRGOTA4RDhBRjg1OTY4MDU1NzM5RDBFNzY2REE5
-OTdCMkU1QzUzQjkwMjJDRkYwMUIwMDRFQjBGREQ1OUJENTlBMDMwRTZDOAoKMjkxRUU5RDc3
-MURBQkJENTVFRjc4QjZGMkM0NkI3N0E3REFGNDI5MDM3QjQ1NTM1ODY1QzdGMjE0N0Q2MDQ0
-OTFEMzk2NDdFNEZDQ0ExCgpCNTY2OEIxMDA2QjBDOEY2MjE0RDdFNUVCNTUxOUJFODQzOTI3
-QzNCRTRDM0MyMzZGMTAyQTFBMUVFOEI4MkU1REYzNEJDOEZGREFDREIKCjc5QjJEQjkxQTUy
-RkVFNDg5MkY3RjI0NTJCOTAzREQ2MzYxRUNCQUIwNzEzOEYzNTY5NTlCODMyODE5Qzg4QUJF
-OUE2Qjk5OUJBREEyRQoKMUEzQzMyQjA0RjczMUU3NUM3Mjc0NzJFMjMxQjFCRDc5RTA0MEJE
-QjcyMTc1MzI3MjUwOTA1NTcwRkNEOUQ5RDcxRDYyN0Q3OTE0QUQ0CgpGQTUzNkFBNjQ2MUQ1
-RjUxMkUyRTFFQjc0NzVBRjZBODNDMTA5MzA1NjhERjQ4QkYyNzk0NDkwQjFGRDcyNjk0NzNF
-OEU1NkRCODEyMTkKCjUxMjdFRDc4RTUwMEFCQ0E5RDI2MDNFQjQ2MzI0OEIxQjNGNkVFN0Uw
-Qzg3MDA4Mzg0OUFDN0Q4M0I4NDhFODE5MTc1QzQwNzVCREY1MQoKNDA5MDE3NjFFOTUxRUFE
-MTlEQkUyQUI0OTFBRDlFQjVEMTI0QTIwQ0JBQkJFQ0YwNUZBQzdBRDYwOEExQUNCQ0U3RkQx
-Qzg4NDhFNjE0CgpGQzk4OUEzMUQwMDEwRUMzQTExQ0Q2Nzk3RUVFOTQxRDA1NDZFMEE1OTRB
-QUQ5NTczOEVBMEJEMEJEN0Y1NUNEQzBCRjhEQTA4MkMwRTgKCkNFRjM0OTk3MUQxM0NDRTky
-NDZCNzRCNkM1NTI0NzlCMUU1MUM3QjMwOUFDMDI1ODk3RTkxMEIwMDc0NkMxMzA3QkUyQzUz
-MTIxN0UwRQoKNzZDRThBNDcwNzJEMDhDREExMTZCNjVFNzU2ODE1NEJCRDJENjdGNTcyM0Mx
-ODdGRDQ2RTU0MTk3N0FCQkE2NjJCQjA4MDc5RDkzQkVECgo3OEU5MjRDMjQ4MkIzOTg2MUZC
-RTFBRDMzOERERjEzNjQ3MzZCNjAzMERCMkZGRjFFODk2NURENzYzMTI3NkQ1MTZBOTZEREZG
-Qzg5REQKCjJEMzQ4MDQyMkFGQjMxRTlBQjgxRUYxNTU3QUM1QzcyMzA1MTA5NkM0MUVBN0Q0
-MEJDN0ExQTI5MDJFNzgyREY4ODcyREUyRjI3Q0MzMAoKMEM2NDVENEVGODg2NzE2RjI5OTk4
-MTVDMUFGNjM3MkMzNTlCRjg0QzIwOUM0MkI5MzkxODVDNkNCRTE0NTEwQjlEQzAyOTk3MEJG
-REFECgpCRkM3RTJGNEZCMEY1MDYwRDY5Q0ZCMEZGNzEwMjY5NDlCQ0MxNUZDMTc5QTREQzlC
-Q0E2NENDNDQwN0I2OTRFREJDNTQ3MjAzMjNFNEEKCjI3MUFEMzg4NTI5QjA3Q0YyM0IyMTg4
-NkRFN0Q0Q0U3MjFCREQxMUMxOEM4Q0QzRDFENTI2MTk1NDg0MEUyREVGODcyRjBDNzExQ0JB
-RQoKNTE1NTk1N0JEMkU5QzRGOTI3QjdFOEZDMTlCMDQ2MDhGRDQxMUMxMzAxRjQ2MDkyQTYy
-RjNGMEE1MjU0MzZEOTkxOEFEOUM0N0E3NjcxCgpGNDBBQTMxODk2QzZERTgyN0RDMTJGQjdF
-N0M3QjVBOUVBRjkzMUJFQkYxQTRBQTRGMjhGOTI4N0MxNkFCNzgwODVBNDRDNTYzMzg4NjMK
-CjkyQTkzNjBDMTg4MzgzRTMzRkY1OThDQkNFMzQ3MDNBQTREQjg1QjYxQjRCNzlENTM4N0Q1
-NTc2MTI4QjIyOTQ3OTc2NjE3QjY2RkE5RQoKQzNEODBFOEEwRUZFMjU3MEZCNDYwMDYwQkRG
-QkZEODFGRkE4QTg5ODZGNTZEMjY2NTJBQjI5QUQ2RUIyQTQ4ODFGQzQ4QjAyMzEyMkM5Cgoy
-MkRBRkE2NTMzNzExMEM3NjQ5MENFM0Y0MUJBNEFBMDVGNjNDNkZDQjMxQUE1QzM5OUVEMDFG
-RkYzOTQ4QUI2OTBCRjAxQTNBMTk4MUMKCkIxMjBERDVCRDFDNDVEMkM1NzI5NzY4OUFFRTQ4
-MDY4NUJGMjNGRURCRjY2NTE3OEExQkI1NEY5QTVEQTIzRjcyMzE0RUM5RkQwQzY5NwoKN0ND
-OTYwNzg0NjFFNDg2MjVDODdBMjlEMEQxNDRFMjdBMUQ0RDc2RTE4MDI0RDBGNkU5MERCQ0VD
-NEExM0I3REI3NUE4RTk1RTcxNURGCgozRDczMDA3MDcxRkIzMEZFRTlGNTUyRDk2OEJFQTlC
-OEZCODIyQ0NENkREMzM4M0NBOUExRTZGRTgwODhDMERDRUE5QTVEMzhDMDQxOEUKCjg4Njgx
-MTVBMkJGRTZEMDU1NTgwQUZFRkRGNzBENTEyQzg0ODhDM0MxMzg5RjI2QURGQzc2NzMzMDQ1
-MUY3N0QyMDYyN0Y5NTYzRTkxOQoKRTUxODJFRDJDOEUwN0RBNTQwRUUyQzY5MjVEMUU1QzZB
-RTVEMTBGQUE4NERGRkU5MEFEOEI4ODJGREQ0MzFEREZFMzZCNTEzNjE0NTQzCgoxOEZCNDdD
-MzlGQUNBNEQ2NjE3ODU5MjBBOEJCRUJCRDcyREJCQ0FBQzFCNjZDOTQ0QUVEQTAxOEJGRjhG
-MTVDRDU5MTdCRTRBMUM3OTkKCkQ3Rjk2QzY5QjVCNzlGMTFBQTM2QUNGQjlBMzk2MzlENzUw
-NkUxODgwMEE4NjEyRDFEMkM5MThGM0NENEI5NzdDMUZDRjE3NzE5MThDQQoKN0NFNEU1NTBB
-MjREQzBGOUE0NTk3MUIyN0FGMkQ2OEE4NjQxQTRBMjA5QjRGRDcyODU3NzEwQkU2MDY2QjVE
-QUIyMzE0NkFDODY4MDQzCgpBMDRFODE1MkM1MUNCMEZGN0RGRTQxNTc2Q0ZCNDI5OThFNjNG
-NzkzQTMzRjFCNjEyODBCQjYxNTk3QzBFM0IxNzZERUQyOTk5MTlFNzIKCkY2RjNGQTRDMTM4
-RDIwRTQwQjkxOTg4RUY5REZBRjMwNzA2NEM5QzMwN0M5RjRGMkU5QUE0RDUyMTU0RTdCREQ2
-MTk2OTg3QzZGNkU4OAoKMDU0MzgwMjM0NzQyN0ZBRDlFQUYxQzg3OTkyOEE1NDA0REYyNDBF
-ODY1MzgzREMwMDc1ODFEQzI5QjI4RkMxOEYxRTZCQTg0MENCMTlGCgpFNjM5QzY3MDcwQTEx
-MEIwN0RCNjUxOUE1QTA3MjlBN0RFODJBM0NEREIwMzc2NUUxQTdDODE3RUM2MjIyNUE3RDI4
-NTAxMDFFMDdEMjIKCjlDN0NCQ0UwQjQ2QTJCMzM1Q0E5MDM3MkRBRENFRTk4NEJENzVCMENF
-RjEzRjFDRjcyMzdFMTU5MjVDN0I1NEIyNjEyMzZFMjYyMDg3NAoKQUNFRkI1OTc4QzAwRTA2
-NkEwM0E1NzgxNkE3M0Q4RjU1OUZCRTAwNkE5NDRFMEYwMjZEOENDRjMxOTg2NjY5M0I0QTYy
-RkY0ODEwQTJGCgpEMjlBQzM1RjQyOUJBMDQzOEE3NDcyREE3NjUxMDkzN0Y3OTlCNDJEOTYy
-RjNGMTk2RTE1QjIzMzU5OTZBOTIzMDRDNEJEREY3MTI3RUEKCjJGMDlGQjdDNzc5NTI1MDI5
-QjBFQzg2Rjg2QzdFNDE1QjgxRDUwNDI3MTRGREZCRDI0NTdGREJENUFDNkMxRDQzODJENTkz
-NTg2RTJFMgoKQUU5NjYwNTI5REQwRkY3MkQyQzc3QTlFNEI3NjY4OUY4RUU1QzlCQTcyRDMw
-MDI3MUI4Q0IyQkJCMzZGMTBGNTczMDkzNDRDMzExNEQyCgozMTc2MkZDNjhCQUE1QzQ4MkIz
-MzhGODQ3RTRFRjYzRjUwQTlBNzFCQkREODIxNEM2N0E5RkRDRDFDREU3MkNGMDcwMzc2RDgw
-QjBCRkMKCkJFRkJBOUM5MzA5NDJEMzVFODRDQTI4RUEyODU3QURCQTIxNkQ4OTc3NUU0NUZG
-QjQ3QUMyOUI0MTEzOENBMDNCRDc5MTIyQTc4Qjk5MQoKNDMxNzE0NDA0MjIzQjBEMDFFRThG
-MTM4MDBDODM0NkFGRkZEODYzMUQ0Q0IxQTZBRjQ2NTNBNjg4MTlGQzI1NDU1OTFEOENCQTg1
-RTNFCgo2MjBDODE2Rjg5QjhBQTU0MzkyMzEzOTg1OUUwRENGMDgzMEMwMkJFQTIzNkU2QUM0
-MDA2OUNENEJDQ0VEODg4NUNEQTY4REJEQjkwNzEKCkNFNjFDNjE3MThGRTMxODA5MEIwQzJE
-NkNEMTA1OENGOUY5QTA2QjgxRDExNDIxNUYxNUQzNDExMzI3QkQ0OEFBODQ2RjE4RTMzRDlB
-RAoKMTQyNUNBODQ4N0FGQjMzQkY5MDBCNEFCOEQ5REFFNTQ1QTRFRjIwM0Y0ODQ0RjcwMDFD
-MDRFQjNFNUJCRjY2ODgyN0EyRDEyQkU0MjA5CgozMUNERTRFODFBM0FFMDUwMUVFNEU4RTdE
-QTExNkRCNjQ0MTE1MkZGODlGMDQ1MTUwRDNFRTc5MjlEODhFMzQ1MTAyRUE3RjIwRTcxNEEK
-CjA0MDVCNDE1OTcyQjE2NTBENUM5MjAyMDY2QzgxMzcwM0QyMDI0NjlGRDBFRDM0ODM4NzVE
-MkNEOTU1RTc1QTg5Mjk5MUU0NDZGMTQxOAoKNTU1ODQzMUEwNzZGRjQ0MEY0MENCNTlEMEE5
-RUU0MDY4N0FFRTFDQzczMzZCOUQ3QjlBQkYxNzJFNERDODYzRjE1OTFENEQyNDI5MEFBCgo4
-NTgwQUYzQTNFRDVCN0U3OUQ4RkY2REFCNjgxMUIxMDI3RkRBODg3NDY5ODc3MzA0RUYxODAx
-RTgxODZBRjk4OEQwQ0I4OTJFRkY3RjAKCjZBNTQ4RkY2RDVBNUEzODJGRkMxQTMzOENGRDYy
-REVDMUYzODlBMDFFMjZEMEYwNTI2QUIyQjE1QTcyNTJGMUVCMDNDMTg4RDBGRTczQgoKNkY0
-NTI0QjRGNDM3ODQwNzA0MDQwQUFFQTM4MTU0NTI2MDM5RUZEQjY1MTMxM0VGRUYxNjgyRkQ4
-NDRENkI4MTI2ODQ0RkQ2QTE5NTg3CgpBMTM0NTUyODMzRjdBQTdFMzY4MUVFRkZDMjU4OTY3
-N0E0MzYzRThFOTU0NjlGM0M2NjU2RTc3Q0Y2OTU3MkQzNDA4RTlCNkQ4NDM2RjMKCkNEQjky
-NkEzQTU3RUE1NDI3NjA1MEM0QjNDRDg5NjQ2Nzg2NjdBQzA3ODVDOUU5MDA5OTExMTc2MjdE
-NDM1RkYwMzhGNzk5REUwODlFNgoKREYyOEUyQTQwOTgwRDdGNzI1NkZBQTI5MjhFQkExMkE4
-RDZGREQ4MDU1MUIwQ0YzQUE0NDJEODQwQTExQzk1MUI0NDRFNTE5QzE5RjJGCgpEMEYxREU0
-NzJGQUMwRTJFQTBCQTg5OUEzRTcwMzEzRDI4QjQ4QTZBQzM2MkY5QzdFQTVENUFDRjVEMDQz
-NzZERTZDODg0MzZCNzYwRkUKCjhCRjY5NEVDREQ2QzM2NkFDMzFEMzQ0NjkwMDBGQkYzMUJB
-RTlDMTRGQjIwMzBGMTVBMjk2NUI5MTcwMjE3ODBFQzQ2OUYwMEIwODI4QgoKRTJGQjk4RTU0
-NUIyRTQzMDkyMUI4NTUwMzZDQ0ZFQzZFQzlCNEZGMEVCQjY5QTkxNDk1MzgzMTU0QUI4NEYz
-MzFBMzIxM0JERDk1MTU4CgoyMEJFREVGRjQ5NzVFMDc2QUE4QkQ5QTQ4OTlCNUJFN0FEQjI3
-MUMxNzgyM0IxODQ4OEQ3QjM4N0IxQUZDNzEwNkM4N0QyMTlEREY5NkEKCkU4NjZGMUIwNjc2
-MDc2NUJCMkFGREREOTUyRkUwQkNEQkI2MzE4MzQ1RjhEQUQxQTc4MkFBNTM2RjcxNDhBREMy
-RDNCRjVFRjZDNkE2MgoKOURBQzVBNDlCRjE4RjlGMjFFOUFEN0RFQkQyMzdDMjI5Mjg2RkUy
-MzcwNTYwMTM5NTY5MzM4RDQ1NUQ4RDNBOTEzRDMyOUU4MDcyRTYzCgpBMDc2NjAxNzZGQkVG
-RUI5RDg4RkMxQzJEOUQ3NkM1MUNEMzA3ODFFNEVFNTlGOEJGNEY0MzZEOUFBMTNBMzlDRUQz
-ODdDQjU3MzI0RDcKCjI2QUJEQUVCMzBEQjFCMUUxNDc2OUY1RjREQzcyQURDOEJENzU3OTA2
-RkM0NDNCRjZERkREREYyQ0RBODY2NDAyMzYzREZEOUJFOEI4OAoKQTY4REEzRDBFMEIzQkFB
-NDA0QTk3RjU1MUEwQjZDOTBEMzQ5RkI5RjE3REU5NTVGRjVGQ0Y4MDdDMzg4OUZFMTBEQ0Ex
-MUFDNzNFODU1CgpCN0Q5MkEyNkU2NEJFMTk3MUFCOTM1ODJGN0Y1M0YxQzdCMUZFNDAxRDdG
-MEVCMEVCMTIxMjY2Q0ZGNUUyM0IzMzMyRDhCNDEwMkE0Q0UKCkYzMDYzNEM3MTA3RkY5Nzgw
-QThCRkVGRUIxM0ZFNUVBNzhEOEU1QzlFMkU4OEUyMjM1M0QyNEZDNDU4ODlDQTEyRkZBMTRE
-MzcwOTAwRgoKMjU3QjE0RTc2MUQ0OUM3NEZDMTlCOTc0MTIxMjBFNEJFNEVBRDA5NDM5OEU5
-MkJGMURFRjREMzRFMURDMjU4QTg1QkM2MjM1NDdCODcxCgowNEZCQjAyRjQwMjIwNDAyNEE2
-NkJGNjZFREE0REI1RjY2N0ZERkQ3QzBDQjZGRkQ3OTkyODhEQjExMEVBMUZFN0Q3QzNDRjNB
-MTMwQjQKCjI5RDI0NTBEODc1MDdFNjhDNjhGMkYxMzBBMzQxNEI0NDc4QUZCMUVENkJENTVB
-RjY2RUM1M0U2MjdCMEYyNzY0OUQ1QzVBQTU5QTc5MQoKOTJERTEzOUFBQzg5QTM3OEYwREEy
-MkEzMjhCQUVENTkxRDY2MDM1Qjk1OEIzMzk3MUI2N0Q3MzZCMTE5NzMyQTUyNDQ1NjJDRTkz
-MkFECgozNkVEOUM5QkY5QTA3NTZERDYzRTkwOTUyNzExNEQ1ODA2MTg3OTUwOEI5QzA0M0E3
-MDE4QUMzRjFCQ0ZEMDcwQzdDNkRCODc5Q0JDNUYKCjMwNUJDQjI0QzE2RjQzRDhFOUI3N0I1
-RDJBMEQzNzM3NTM2RTY0NTA0OUE2NEVENTU1Qzk5OTA5QUY4MEY2MEIyRjIzMDdFQzU4RUY5
-MQoKNDc5RTFDNDQ3QTU3RUZBNUFEMDY1MkY3OEY5NTJFNjUwOEE3NjhBODhGOERERUM4NTQ5
-ODY1QjkyNjZCNTREMDNBRkIxOTI5RjcxREQ1CgoxNzdEMDVEQkRCNDU1M0E4QzNFQkExMUYy
-ODREOUY2QzhBMjM1MzcyRjc1QzlDMDZBMTM1OTczMzk3OEFFNUY5NjUzRjAxNTc0MUU2NDgK
-CjI2RUI5MkY0QUU1OUQxMTQwNUE1OTk1NDQ3NUQ1NTlBQ0I4RDA5OENENEMwMjZBOTVENjc4
-QUZEODVBOUYyMDMxRjZEMjQyQTI4NTQ4NgoKMTM4NUNEMkJFRDU1QjZFNTQyNjFBRDNBOTVD
-NkFCNDYyNkZCQzVENkM0RjZBNjA5OTI5NzZENDA2RkVFQ0RCNzkyMjExQ0ExMzNDNDMzCgoy
-OEY4RDQzRkFGQUI5QTQ0ODlERDFFMUU4ODg0QjRCQTBCMjU4NjYwRkI4QjhCRUEyMThERTBB
-N0Q5RTVEQ0VBRThCQTFGRkEyMzYyNjgKCjdBRTQ2MzMwM0UxNkM2REJBRDNFMkZCREMwQzkw
-NEI4M0RCQTkxMzRCM0M3MkVDMUZDRjY4NTVDMDhFOTczRTAwQkE4RDM3RTg2NEVGMgoKMEI2
-NzQ4QTY2MjVDODU0MTE2QzNFMzJENUIyNEY1ODQ5NjNENUI0OTJGNjY2NkEyODREMTZBMkYz
-RTMyRTVENzc5MkRDQzFFNTYwNUI0CgpDREJFNEUwRDYyREZFODRCMzUxQjI0QTUwOUE1REM5
-RDFDMjEzMkI4MUM2ODIwOTZERjRFRDdDRTZBM0Q2REM1MTdDNkZFRTgxMDNEQTcKCjNCNUQ4
-NDFEMkI0QkJBQURDRDdEMTMxNkVBQzY4MDlGNzZCOTlGRTE2RUE5MjI3Mjc4MkFFMzkzMEYx
-QTAwNTIwNzhEOThBQTE3MzY3RQoKNzA0MUMzODNDNzMwRUUwODVENjA4OTE2NEFBREM0NjM3
-RDNDQzZBNjFGMjkyRTU4MURCMEQzN0I3RDEyMTRBOEYxMjg1MkZGQjYzNkQ3CgoyRjJGRDlF
-NkFCMkFFMUY5NjdFMkE3NTBBQzBBRDM2NEU2NDIwNzY2OUEyQkFFQkQxOTFFNDk0RDFCMDg3
-NDQ4RjZEQkQ4QjIyOTNBMjcKCkMxMTVFMzRERUVGM0RGNzlBRTFBQjMzMjAxRTBBRDY1M0FD
-QTcyQ0MwNkFEMTU1NzUzMTRERTRCNzYwMDlGNzYxQjhBMUM2Nzg4QTY3MgoKMkQyMERFNDYw
-MjY3NzIxMTdGNDIxNzFCNUQwOUU1NDE0QTU0RUE0NUQ3NjBERDNGRDQ3RkI1NDU4QTc4RTVG
-RkM4M0I1OUFFRTRGOEMyCgo0MTA2RTBENzZCNzE5RjdDMTI5NURDQkM3MUFENDZERUY3RTI0
-NzJCRTkyMjA0N0Q4QjYzM0QzODYxMDJCQ0JBNDk2NEE5MEE1MjQ3QzAKCkQyNENDQTI5OEQz
-OEEzQzUxM0QyNjBFRTQ4MjFCNTgzOTE5ODQyNTMzODVCQzYxNDI5NjU4RTMyOEQ4NkRDNjFC
-NUZFMDQ3NzA1QzhERQoKQzkzMTcwRjkyMzc2QkI0Q0U5NEI0QzkyQjhDRTYzOEZFQzE0MDgz
-MkRGRDg1ODM0MzBFRTM5MTM3MzQyQ0EwRjUyOTczN0E4RjlFMTg0CgoyNjRBRTJBMUUxNzIz
-NzdFOTMxQzZBOEMwMTQxRDM2RjY0NDYwMTFBOTcxNUQ0QjZCQkUxRERDQTUzRTNBQzcyQTcx
-RjYwRUQ4NkVDNkMKCkZEQTIyN0UwNTUzNDk5MUU3NkU5QUE0ODUyMkVBNDI2MUY0QTU2NzAy
-NzZDODA0OEE0QUI5NTAwNzE5RDkyRjA0MDgwRDMxOEIxNTZGRgoKRkMyMTZCQzFCRTAwQzhF
-MzE2MDc1MkJGNUIwMjlCQUE4NTc4MEM1MUM0Q0ExNjJDNzg0MEU3NDUwN0Q0MzNDQzlENzFD
-NjJCNENBRTE0CgpBM0FCNEFEQjI3MjlDNzUzOEIyRUNCRUM0RTY5QTFGNzc5MDNCQkM2OENG
-RUQwQkUwREVFOUM2OTBFN0NFNzRCNUJCOUMyN0E1RjExNUQKCkIxNzAxNUMzOUE4RTYwNDM1
-RTAwMDU2ODc5NzQ1QTQxNTUyRjk1RjdBNTQwRDUzNUEwMkYyOTA2MUFFNUQzMERERUI4RDMw
-RDlGQzJCRQoKQjA0Q0Q0OURGRDIzNjNDNEM3RkU4Mzg0RTkwRjk4QkE4QzI2MzgxRDlEMzQy
-ODAyOUNCQjk5MzNBQjQ3MUNFRjE4RjNGOEVFNTg1MzA5CgoyOTczMUVCMTAwOTA4QkJDMUYw
-NzRGMzk5QUEzOUNDRjVEMTJEQTM4Q0EzOEY0NjRDOTU4ODg3QzE1NUE0QTc3QTAwMkY5MTA5
-MEREQTIKCjAwQjgxNUFEMUUwMkMwM0Y0NDg0NDYyOEJENzAzRTJFMEQ2QUI1M0M4MTkzNzNB
-OTRBREZGRkE2NTc5MTYwRTY5QUQwRjFFQzEzMDkzMAoKMjJGMEI0RDJGNzEwQ0ZCMEY3MzRC
-MDFGNjI1RTQwN0Y5RjdFMEYxNDMxMzFDMTcxM0Q3NzAxNDQ2NjRFQTk4OUJFMEI5RUNDM0I5
-RkIxCgo0NUMxMDQzRjAyQjQ4MUQ4Q0FCQ0YyMURDMTM0NTUzRkM0QzFENDM1M0U3MTgwRUE0
-Q0IxRkNFQUJFRjc0RDZGRTVCQkVBQzdGMzBCMDgKCjFEODhFQjBBMDYyNjYyMkE1NTdERjZF
-ODYwRTU0NTM3QThGRTBEMkVEMEI5NzRCOTk0NDA2QUU1MkQ0N0U5NEZCOEUyOUVGNkIwMkRE
-OQoKNEEzN0RDNzcwREE4NTVBNTlCNzRCQUFFMTY4NUJBM0VBRTI0RkVGNTVCMDZBNjAzNkEz
-RDRGNTEwOUYxRUQ0QjU5QUE2MjE4NjI5QzFGCgo0NTUxNDU0Nzk2MTFBMkI5RkE4M0E3QUIx
-QzhBODBDNUJBRURFMzdFN0JFMTk1QzY4RTM2RkQxOEUyMEJFQzc4N0JCMTNCOEUxQzk4MDYK
-Cjc0N0Q4NUM2NEE0MjE4MTYzN0U4NkNBMjhGRjEzNUNFRDIyRTRENDUzNUNERTc0RTJBRDRD
-QTkzRjlBMzBFNzk0MEYyOERCNTlBQzFBNAoKMUY4Q0ExMkNCOTY1RTBCQjVDNDVBNUYxRDBB
-NURCQ0RBMjEwNDMzNzMzMzg0QTc1Q0JBOEVCOTNCQ0ZGMDVBRUUzNDQ0NTg3RkYzMUNGCgo2
-NDk1RkY4Q0FCNENFQ0ExNkZFQjBDODFFQjQ4NTcxRDMwMDQwQTkwQ0M0MjIwNDNCOEVBNzMy
-QTREQUZFNEU1NTIzNzQxNTMxMjRCNEUKCkIzRDM1QzU2RUU1QjRBMTQ2MTExQkJDNkQ5NjMw
-REIyQzlFMDREMjZFQkRBREI0NjEzOUMyNTkzMTlDN0M5QTc1MEZGMjk0NTEzNDY3NgoKODdE
-RTY4QkFCN0JBNkRFQ0EyMkZDQUYyRTVGMjA4NjdBOUMxN0FCM0UzRENBQzAzQThEQjg5NkQy
-QzAyNDNFOTU2NTI1Mjk4NzU1MThDCgpDRTA1MEE0OURFMzRGNTlGM0EzNDIyQzNDNkU0QTU3
-RkIzNDNBMDQ1ODg1OEM2QjY3NkY5MjA4NTdFQUJEOTk0MTkyNEM1NzEwQzY3NjgKCkM1QTAw
-ODFGQjhGNDdFOUJDOUVDQjcwMUJGMDk3RjAzM0M0QUFDM0UxOEIwMkVGOTIyMjg2N0QyNUZE
-QThGRDI5MUY5MzBEMTYzRjM0NAoKNUVFMzhCNDRGQURDMEU4MzBGOTM1NjBFMUJBNTJFQjlD
-RTlCMzc1RTlGMERGRDYwNjI3QkZDODM2OEJDMEI3QzRDNDQzRDhEOTE5MDdFCgo5RkRDRDA2
-NjZFRTZBOUQ5NjQyODA5MzE0NjUyRUZENEU1NzY5QTE2NEI1MERGRjg0ODZGMjA4OTAzQ0U0
-RjUxNzZDODZDMzY0MkRCNjAKCkFDM0ZBMkRFOUMxMDRFMzZCQjc2RDU2REE1OTNGQjc5NjAz
-NkMxN0EwNEE2NUYyQkU4QkI5QjM3MDU1RENENkY3OUUxOEFCMDBCRENCQQoKQUFGM0ZBOTVD
-NDlBODRBNjlFRjRDMTFENjA2NThDMzUyMDVEOTdEM0FDMzAwM0I2NTkyRUUzNjZBMTZBQTBE
-MUY5RDMyRTlFRUI1Qjg4CgowOEFGRDYxMjNDRjc1NkM1MjRFMTVDN0U1REQwRkU3Q0ZFQTEz
-NUJFMUJFODUyMDFFRkVERjYxRjA0NkM2NTJBNDhENDM1QTJGNjAyNEUKCkEzMTBFNEZEM0NC
-RUUwQTlDNkIxQ0QwMkIxRjNBMUM4Qzk3M0M1RjI4MUM4NjE5NDUwMUJEMDNFQjVDM0UyQTMw
-QzlFQkI4RTRFRkIxNgoKNjNFRURDMDk2OUM0OEM2NzI0QTVDMTI2RTA1Qjk1NzlDMDMxMDg2
-OUREMUVDODhBN0JGODU2MkVFRDk5QzU3QzExNTQxOUU2NTk5QkE1Cgo4MzIzMzI0ODY3RTJC
-RDZFOTcyNjMyMzgwRDJEMjcxRTMzMkM1MkUxQTg3QkI0NUM0RjY2QzlGODM2OTNFNkE5QTI1
-QkMwQjFCQjc1NzAKCjE4RkVFMjYxRjhENDUyOUQ5M0YyMzI4OUMwQjc1Q0ZCMEJCNkE1NTU0
-NTcxMkM5NDU3MDdGQkMyOUNCQjcwQTRDOUMzOTc2QzFERDBGNgoKMTcxRTU3OUE3NUZCQUIz
-ODIxQTJDNURFNDVEOEMxN0VBMTZGQTRCRTEwNjlENzU0OUU1N0U1OTIyQkZBMTgyODZBMUJB
-QUQ2NDQxNjFBCgowMkFCODQzQ0Q1NjI2MDI4QzNFNkE1MkJEM0NEQzc1OTk2MjdBNDlBRDQ4
-ODBFQTVBQjU2OTM2NjU2QTg3QkFEQjgyOEM2QzkyMDBFMjgKCjI3MEQ4MDQxMjY5RUQ3OEE2
-NTU3MTgwOTlGMDk5RTlGMTdGRTI3QTcxREYxNjFENEYxNjA2MDkwRjE5MkU1NjFBQ0E1RjMy
-QjgyNzg1NAoKMjYxMTYzMkYyMUNDRUIzMjI1MzM0NDI3RDlFQUY5QUQzRDk2OTZBQjNCMDU5
-NjU5OEQyREExOTEyRUFERDJBN0QwODU5QUIyNkQ2Q0ZBCgoyMjc2Qjc5QzgyNjM1M0NBQTBF
-QTM0RjY5MEQ2Mzk2NzY4RUZBOEJEOEE2NUNBQjQzMjMyNzIzMzI0Q0QwNUZDNTE3RjMxN0Q4
-QzVFMEMKCjgwOUZGRTc4QzM5M0Y3RThCRDg4MTQxRDFBRkFFODg1RTAyQkIwMjAzQzdENzI2
-MzEwRjZFRERERThCMzhDMUZGRkYzNDJENEU4MUVGQwoKMUNDNjhEMDcyRjY4QTBGQUMxNEJG
-NUE5MEVCN0YwNzYwNDQ3OTQ4OUNDNTcyMDk3OTY5NjlENjJDOTIxMzRCNTlBREYyNjRFQjFC
-MTU4Cgo1NkFGMkIzMkNDNzY5QUNBNjcwMzUxRUFEOEQzRTU5MTE3RTYxM0E0RkQ1ODQ1QzM4
-QUEwQUQzNzUxOTZGMjYyODkyMEYyOTlCOTRFQzIKCjM2Mzg0N0NBNDcwN0E5NTA2QzhERTRF
-QTlCMEMzOERBODg1NjdGQ0VENDBCQzk0RTc0NjVDMzlEM0Y2MjdFRjcwNDI5NTQ4QzM4QzJF
-MQoKRjAwNzAwNURGRTdCQUE3NzAxQjE4M0EyQ0ZERUIzNkNGODQwOTEyNDJBM0NERDhDNTk0
-NzUxM0JDRjdGQUE0NjJBOTJGMUU4NEIzMTk2CgpFM0NGQjAxOTMyMDQ4NUZFRDdEQjIzMUFD
-QkM1NkMwRUVGQ0YzNDQ1MjVGMERFMTUwQUE4OTMzQTREMUFFRkM0QzI2OTlDNEIxRTVGQkMK
-CjE1QUEzQTg5NDAyM0ZEM0YwQzc1RDc5N0U3MTBGQzFCNDFDNDhCQUM2RjVBQTBCQjJDQjE3
-OEI3MDVDMTAzQjY4RjdFODQzNkM0REQwMgoKRjA1NEMyQjRCNkMzODczNkQ5OUM1QkQ4QzU3
-QUZBRTY3NkZDOEI0RjA3OERCODNFRTZGRUEwQzk3QkQ0MzQwNjFCRjU3MkY2NjE1QjM3Cgo0
-MTlFRjUyNTBFMzJDNEYwRjQ4RUU3NzlFNTAwRTdFM0M0RDJBRkY2OTlBNDA3NzQ3M0EyOUNF
-OEMyQTJGQjkyNjQ2MTA3NTc2RjQyRTQKCjhERTEyMzNBQkE0NzIwNTY0REU2ODk5MDQyNUQ2
-QjQ5OTBGRDE5ODI0MzI3NzQ1N0E0MjY5MzQ1N0NDN0FBRkIzNTgxODRGNkFBQTRGQQoKMUZF
-QkM5M0M1NzMzODEyQTFCMzA4REE1MDlGNDczNzYwRDFGMkU4NDZGOEVCMkQ1MkZENTVDQjIy
-MEY0QzE5ODIwNEJEMjFFQTJERjBCCgozMTQzNDYxNkY4NkQ1MjlERTVDQkNBQzUzRkRCN0VF
-QTY5NzI2OTFFOUI4OTgxNTIxMDg3QzI1RjE1NzQ1NzZCRjc5OTU2OUUzNjk5RUIKCjc0NjE4
-RERGQ0Q1RjAxRTZCQUIwRkY1MTNFQzdFMkIzMDAzMDA2RDk2RTQwOTVFRjUwMDkwNDRBNUYx
-QzNCMDA2QUVCNEQxNUVDREU1RAoKNTNDMUM3NkQzNUQ4N0FGMjAxQkI0N0M5NERBQjFCQ0Mx
-ODJDNEY0ODc0N0FBN0UxRUQ5OTFDNEI2MkQ5RjlEMDhENDI4M0VFRDVEMjg4Cgo3RUUyMUI3
-REUyNDlGNzMxNTA5RkI2QjkwODk1NDNGNDc5MUM0MUYzQkMwRUVGQTE5NzkyM0RBODYzMDhE
-RUM4RDYzMkJFMDIyMTI5NEMKCkE0QUVEMkY2MUMyOTdEMTY3MDQ1RTVFNUEzMDEyRTIyM0Q2
-QzM0ODg5OTcxMkM1NTA2MzgzNTFGMTJGRUIzRDY3MzY4OTU5RUFBOEIwMAoKOTA5OTZFMzlF
-RERDNUIzQjE2ODRFMkRGNERGQ0RCQzg5QTZBNkY5QjBBRkNDQjIxMTUyMTczMTZBNDg4MTJD
-MTY4QjI0MzczNEI1N0I5CgpDQkQ3RjA1QTFDQ0U5RTMyNUYwRkJEQTc5MUVBRTdFNjY2RDFG
-RDdGMkQ1RjA4NTE2NUQyQkIxMDM4NzUxM0FDRjlBOTAwRjg0OTM0Q0UKCjkzQTY2Q0QxQkVE
-M0Y5OTA3MTRBRDkzOEJBODU3MkE3MUU1QjI1NTdDMjk0QzFEMUEyMEYyN0U1MUIzNTVGQjM3
-MTEyMzQ1REMzMzcwNwoKNzNGRTc1MEQ1QzIzMzA3ODFFMEEwNTYzNkRGMEYyODMwNDZCOTcz
-RDFCMTI0RDkyQTIxQTNFMEFDRUE4Nzk4NDk3MDBENTkwMTA5M0YyCgo3QjNGOTA0NjBEODIx
-OTRDREIwMUEyQ0YzOEZBRUY5NjQzNzRFQjExRDBFMTUwQTIyOTdEOENBNEE1QTVDNTVCRUE5
-M0IwMEVDQzkxOUUKCjcyNDZDMjg5NDA0Q0FEMzQ2NkVGNkJGMjgxMENGMUVGNzQwRDI4NUQz
-MzAyQjVCMzM2M0E2MDc0OTE4NzFGQ0QxODFFOENFRDVDMEMzMAoKMTlGQTMzRjE2NUNEOTYz
-MEQxMzA5MTdDMkEyNDZGMkQ1MDAzNjU3REJCMkZBOEE3RTNGQTg0MDQ4MkNGMjFFNTc0QUI3
-NEI5RUI1MDI3CgozODdEQTQwRkIzRUJCQTE4OTQyOTdDRDM1NkUyMEFDRjdEOTU2QTNFMTQy
-MjQ4QTU4OTlGRTk0MEEyNUJENUM4MTJDMEU4REM5MjNFRkUKCjI3RTQ5NjQ0OTM4RTNCRDk5
-QTA4NkFENjk3RjBBQzc1ODM5MEIzNjRCNTJDMDQ5QkIxQjMyMzc2RjNBRUZDMTVDQjREQjMz
-M0MxNDhCRQoKOUNBNUMxOERCMzhCOUVCMUYzOUYwN0MzQzJFQUUyQUZCMDIzOEY2ODc1ODNF
-RDdGRTA0RjU1NjMyNTQxQUM1NzJFMEJCN0M3NjU5QUEzCgo5OTlEOENBMTJENjI2N0ZEQjBG
-MUNENzIwQzE3NENDMjhFRTM3Qzc4Q0Q4MDNCODc2QjgxNjgyMDVGMzY2ODdDMTJDMEEyRDM1
-RDFERTQKCkI4NkY0RTg2NUE3NDFFODJFRUE5QzhFNDM4M0FFQzU5OUQxREI4NUM2QkYzODgz
-QzMyMThCQkMwQUI2NDNDRDUxQjhENTFBMzQ0OTJGMAoKQ0I0QzFCQTQ3ODE5MjlDMjc4NEMx
-MUY4NERFNjk5QjBDODRDMzVBNTA0QzM1RTY3MkU5NDFGMUQ2QkE1NDk2MEY2QzUxOUYxMTAy
-OERECgpDRjBFMDk5MUUxOEE3N0Y3NzJDNDNDRTk1QkRFRERBOUM4RDg1NjMzRUE2MEE3MzU4
-RTA2NDVENEI2NEY3NTFCMTFBRThBRTI3RUNCMTcKCkNCMzg1REUyNTlCQTFGRDc4RUE4QTU1
-REJGRUNDMjY3MERBM0MwMTQwNDc5QjYxQUNEOTlBNTlBREM1MDg0OUM2QUE3ODdDN0E5Qjk3
-NQoKRDg0RTJBMzA1MjlBQjhGQUUwOTk1REQ2NkJCQjVDNjA1M0UzQjk2QzU2NzE1NkE0Njk2
-QjE3MzZDMkY2RTE4MzRCOEI4RUU0MkNEQjkwCgozMTU2OTJENkJFMjk5RDcxNEM2RTQzQ0Ux
-M0RFNDI4MkIyNjFDNTE4OEVENkM2RDg3NUI4RDMwOEQ4NDQxNTJCRUIxNUEzQjE1QThCNkEK
-CjkyNERDRjcyODVGQjg1ODk3MzY3MUI5NzJBRUVFNjc3NEE1NzUyNkYyMUZDN0VFRDgwNTY5
-M0EwMDdCMkI0MzY5NEQ1RDMwQzlEQTYwNAoKQjNGQTYyNzgxMTRERDk4NzQ0Njk4RDg4NUZG
-NzE0NzQzQkJFN0Y4MUYyRkJBQkU0NTRCRkZENzRDQjYwMUFFMTA2QUFFNjFFMDk5NDg2Cgox
-NzU0RTRDRjMxMkExRERDN0JEMEY4NUQ4NTREMTVGREJCRjI5NjMxN0FCQjBEMEIyODI0Q0VD
-RTM2MkUyMTM3QTJGNTc5MjI3OUVGMDUKCkQwRkE2QjdEREQ0RkVGNjlGRkY5N0FEMDdGQTk1
-RjNDQjM5M0M0QjBEQjIzMTE1OTZBQjYzOTc0QjZCNzYxQ0M5ODQwNzczMUFGRjJERQoKMUE1
-MjI3NTMzMTVFREMwN0Y3MkNDNzNCRjdCNTVENzY5RTAyNEEwOTcxMEYxNDFBMjFCRjk0RTlC
-NzFDODgxMkNERDhDN0Y3QzNBQzYwCgo2MThFQ0NFNEFDODFGN0Q4NkI3NUUxMjY3MzZBOTA0
-MjU2RjU1NThFQ0U0MUE0NzFFOEY3N0I1RkJEMUZFMkZGNENGMEZFNTY4NjEyMjMKCjI0QzFE
-MTNDQUYxNTc2MzA2QURDQUMxOTI3Njg2MTM5ODgyNjA5RkNFMzM2NzE3MUZCRDBGMDE3RENF
-REZDOTA5QjQwMzk2NDNDM0ZBRQoKRjU5NDZFQTMxMzEyNDYwQkFBNDU4RjVBQzNBM0U1N0U1
-MjQ3QUEzOTBFQ0E0RjI5RUEzMjMyNEYwNkFBM0MzNzZDQjVDNjgwREQxNkYzCgo4NDM0NTY2
-REM1NEU3RDRDNkQ2MzkwMTI0QkI2OUVGNkQ5QUIyNjVEMUVEMkM2ODMzNTg3MEIwOURGNTdD
-MTM3RTYwM0EwRjhEMjZFNzcKCkE0QjE4QjdFNzIyNUIwQTkyQUY5MkM0RjIyRDQzQUUwNTNF
-RUNBRUIzRjg5ODFBOEVEMTNENTA0RTY0NjdEMjY2QkY3MjQ0QzBBMUEzMAoKQTU5NzAwQzFF
-QjlFMTgxMzEyNjNBRjUxQTk0NjBDMUI3NTMzMTZBMUJDNTg3RkFGRTNCNUE3RUM2RTg2NjI2
-RDVGQkU2QkEzMTEzRkFECgpFNjc2MzFCODMzMDE0MjRDQTI3QUZDNjE2NDQxNEY4MjYyRTNG
-RTI4MjcwRjhBREE5NkFGMDIzMkZGQUZFNjREMzdGNTEwNzQxRUFCNEMKCjExNkUwOTc4MEEy
-QzY0QUI4MkM2NTVCMUVBMjIxRUVGMjU3QzY2NzkzOEUzNEE0Rjk1NkI3REQ5NTFEMTBEMjM0
-NEQyMjhERjJCNTlDQgoKRTlBQjcyODIyQUNFMjcwNzg5Rjk3MjQyNkQ1NkEwMzY4NkVBREUy
-ODQzMUMwN0IzQkQ3M0Y2QkUyMkZERjc2ODhFM0I3NzEyOENGNzRGCgpERTk4NzM0QzMzOTBF
-REI3ODc0MEYyNDQ1MkFCQzU0NUFEMDgwNTdDRUYxMzIzMzM4QzBDRjNGMDIxMEE5RDUwQ0Y3
-RDQ1OTFEMjJEQzQKCjc2RTQyOUI0NjJCNzZFOTY1NTgzMTQ2Njg0QjBFMkE4QzZENDBBQzdG
-NDJENTk1NDc4Qzk0QzAxRjlBRkM4QTFBREJFMkQ0QjEzRTAyRAoKRDUyQTE5ODg2QTM5NzhD
-Q0YzQzlDOUUzOTFGRDY2MDM5QzU2MjI4MzlDQzYwMTIwNDA4ODM5RTU1NTgxMzZDNTdFNEJF
-QTI3NjFGMzhBCgo2RDAwRjQ5NTEyNjczNzdGMzY5Qjc3ODJDOTJEN0JGMDBDNkY4MTI5NjJG
-ODZCQkRBQTQzREE3REY0NjgwRUU4NTJGNEVGOUQ4MkJCMzQKCjVCQzFGOEY3NkE5QjdDMDk4
-MjAxMDhCRkUwNTRDODBBQjU2Qjg4QjQzODQ4OUQwQ0MwOTcyMDgxMjU1QzlFRkFDREFBMDhC
-QzgxRTBCNwoKRTA0QzIwMUExMjEyRDU5NzYyOEJCODI4OTRFQTcxMUQ3MzkxNjFFNTEzOTk0
-QTY3QzBDNjM1OTcxMTc3MzZDRjFBOTA0OEQyNDRFMDlECgo0ODA0QzEwNDgzRDA0NzQzM0Yw
-QTY5MjU5RENGOTk5NTU4QUZGQjY3MzlEMzcyMjIxRTQ5MEVBOEIxMDZEMEFGQzc4RUFEOUJE
-NTBFNTIKCkZDREFDQTRDMEYzRUQxMzY1MEI3M0VDNEY4RDBDNkM0QjBCRTI5OUI0QUIyNTNE
-RDRBQkNEMjhBOTZGNzYyQ0U0NTc4N0ZFRkE4OUQ3RAoKRjU2NzVEMERFMDkyRkE3MDk3MTk4
-NTM4RjAzMUE3NUJGQTJFOTFBNjREMTIwNkFCNTlDNUZEQkMyNEM4MEZBNTRDRDE2OEUxOTU0
-MUVGCgo3OTczNkZDNkQwMDg5NkQ3NUM2NEU3OUQ5M0M2NjU4QTAwMkE5MUI1QkFDNzE1ODM1
-MThDNjA0OTczNjUyMjIwQ0YxQ0I2MjZEQUQ4NTMKCjhDMTY2NDVDNjk5RjU3ODVBODYyNkJG
-MUE2MkZFQUI1N0NCMjYzODgxQjEwMjg5MUI1RDg4NkIwOUY2NzhBRTgwMUNCRkZBQ0EyOTA2
-NwoKQzExMjZCQjAxMzZBQ0RERTgxRDA3RjJGOTE5OUZFNDM5RDM1NTNBODE1MkU5RTJDMzFF
-QkEyRTA3NTRCQkJBNzJEQ0Y1MjVBODVCMDhGCgpGQzUyQ0FCNzEzNUUyQTNDODQ5REZCQ0E4
-NkZBMEMyMjE3QjlDRkY3NTU1NDJGQjRDMTQ1QTU2MTY5NkQzNTYxQjVDNTNGNTcwRjYxN0YK
-CjYwQ0JDMzFBMUVFMEY1NzAwOTlDNEZDMkM0NzAzRTFCMkFFODZDNzJBM0VGOEExMzhFRTlD
-Q0FDMjgxNDUzM0RBMjBFNEFCNUQxNzBEOQoKQkIyQTJBNEZFMUMxNEE5NUUxOERCRjNFRkIw
-NDAwQTgzNUVDMUY1MDAwNENCREE4RkZFNzMzNDcwMjdCOTE1MUMwRTAwMTExQzNEQjNCCgox
-NTQ0N0QwMDBDQjBFNkZEMEZFOTg1QUQ3MEFFNTI0M0VDOERDQ0UxRTVFNzAwMTgwODdBMzZB
-NzI1REUxQTZCNkVBMDJBOUNDMzIzQ0EKCjk0M0JDRkM1NDZCNUZGNDNEM0VDMzE1ODE3REQ2
-NTkzQjZBQzdDNTIwMzVFMDY2Mjk1MDlFQkU3Q0Y5QjVGOUIyNEUyOTFDMDY5NTJDOAoKQ0M4
-QUY5QTVGRUJERjhEMTZCMjJEN0JCNTE4RTExOTFBMUUwREJBNjgwNjZGMUNFMTU5QzVFNzYw
-OUVDM0FDN0Y0QTA1MkVCRTVFMDI3CgowNzEyNENERjg0MThEQjlDMDI2NTYzNDAyNzY0QjQ0
-QjBFOEFGMzFGMkJENjBEQTYwRTQyQzBCMzI5RUUzMkMwMzQ0RDQwOUUxNTVGRDkKCjNBNkYy
-OTk1Rjk2NURGNjg1NTIyMkFCMDk5NkIxODVERUM0NzkwNjQyQkExMEQzQjk3QjEwMjhEOUFF
-Njk0M0I3REU1RjJDN0E5RTE1QQoKRDY3MEZEMzUwQ0I3QTYzMzE2REY1MDk1MDc3M0FGQkJG
-N0Y3QkZDOEJDOTEwRUYzQTk1NTcwODgzMEMxM0M5MzFFODVDRjdEMTY1REFCCgo3QTkyNzgx
-MDk2MzMwN0ZDQzIyNTRBQzJDQzlDRTVCODMyOTNBRkRGQjlBNUREMDA4MDBBQzY4QjQzMUMw
-OEIyRTkyQkIyQkZCNkZGNTUKCjZENzA1MTJDQTA5OUJGODQwQ0VFNzBDRjE2MzEzMUJBRkRD
-MkQzNkY5MDg5RTA5MERDNjYwQTk0RjE3MEMwRUQ2RjVCQjZFRTJBRDc2OQoKQkU5NTFCNDBE
-QzFFNDYxODBCMkU1NTcyODlDOUYxM0NCRDlEMzMxRjIwODQ2MkEyMEMyNjk2MjlBRjdFMTgx
-Qjk3NzYzMzVDRDM0QTlFCgpBQjRCMUQ4MTk2ODk5QkJCRTk0NkZENTZDODE4MEM0MkMxNzg1
-MzZFNzJBMTMxQTREMDg3QUNEMzhCOTY2MkNGM0UwQkMyQzA0RTkzODQKCjgyNjNGOEQ2NEVE
-QzZCM0M1MTFDMzBFRjRBNzgyREEyN0U1MzBGOTZBQTBFMUNBNEQyOEVBMTA2MkZGNDY0MzA2
-NURERjk1OEREOTEyNAoKQkQ5NzVEMjdENkJDNzlFQTNBMTk2M0I5OTMwQjVEQzAyOTdBQjlF
-M0YwMjc0NUJDRkVCRjgzQkI5REFCNDZFMkQzNDIzREVGQkYwNTI3Cgo3MDEzRDZGQ0QwOEVB
-QTU0MDdDQ0VFMEY5MUI4RDZCNERDODlFM0E0Njc3NTlCODFDODEzNzk5NTJFMzYyMUQ1N0U4
-NkI3OTYwNUVDMTAKCjU5QTlENDZCQjMwMUVCQkVDQ0NCNjE1REY5MUQ3QTBBOTJCMTdFQzRD
-ODcxNkM0RjFFNjdERTdEMDY5RjdDQTFFNDU2NkY2RDlEQjk2QQoKRTNCQUFCRkNCNkUyREY2
-MDA1MTgyQjdCQkJBN0Y5NkY5OTMxNUNBNzZFMTI0OTdCQjc2QjJDOTRCODU1NDNGN0YxODE5
-RDNGNTNGMkNECgpCNkRBQkNDNUM4RTdCODA5OTVEQ0QzRDA0QTVGNDdFRjMwRDcyNUVCNjE1
-OEE3QTMyRUMxN0Q0OTcwQTExNTk0NTVCMjMwNzU3NzREQkEKCjk1Q0YwREY4RjE1RkNCNEFB
-REU4MEM4RDBDOTI3NjI1OTc0NjFBN0IwNDM4NEFDMjU1NjQ4NkIzQTUyMUI0NDcxODkxMTA4
-M0IwNjIyNAoKM0JEMUQ1NEE0QzhDQUI0M0QyMDdGQTQ2NjFBQUM3Q0Y0QTBBNDIxQzAxMTEx
-QTAyQUVBQTNBOThFQUYzOUIxNTI5OEVCNzVFMTZDM0Y2Cgo3QkUwODk0OEYwMTZDOTIyRUY3
-NDg5QjMzNjk4MTc3ODBDN0ZCQTE3MTJCOEYxMjYwRUZFMDJGMEE3RjExMkREMEU4NUM2MjAy
-NkNGNjMKCkMzMDYzM0YxQzU1ODQzQUI3RUJDQzM4RjM4RTI1MTdFMzVEMjU3RDcyMjBCRkY1
-QkUyQzZDQ0UzNEJCNzNFQzIyNUNBRDE4MkU3MDJCMwoKQzAzNzQwRDU1OERGQ0JDNUZDRUQz
-REIxMEFFQzdBRjFFNkFFODRCNTRENUQ0Q0E3OUY1NkRENjkwREFGQzVBRTdGOTM4M0VDMjIz
-MkQzCgo0QkJEMkIxMjVDQjc4RTJCMjAxMjcxMkIzQzUxODQ5ODY3NjY1Qzk4Q0EyNUYzRTZC
-OUUwMkVDODlCNUIzNzZENzkwNUY3MzAyQ0Q2RTIKCjhDMzM0NzBDMEIzNDMxNjBCRjBGMUIz
-QTlDQTBBNDdCNjA2NUI2NTM3QUZFQkMxQ0JDRUY3OTUwODNDQkM5OENFQUY5QTYwRDlDRUY4
-RQoKRTZGNDg3Q0VDRDg4NDg0QkI0RjE0OTgwN0NDNEI4OTZGNTExQzJDNTMwRUYyOTJBQTUw
-QTlENUU1NUM5MzUyMDkzMDBBRTYzQTE1QTdECgo3RkREMTE3OUIyRjU3NTI1QjcwRjZFRjQw
-MDM2QkQ2NkI2QzI2QTk5ODA3N0Q1QkI1MEJCQzEyMkI4MDZENDVBQzI0OEI1MkNBQTZFNEYK
-CkI5RTAzOUUzMEJFQjc4Q0RBRERFODEwNTM0NzUxRjdBMzIzNTZBNTEwNjVDREU1NDI0NzUw
-Q0VBNTc5RDAzNEE2QzZDQkNCQTJCMjYzOAoKODlCNzY3ODc5REFBQTk5MjNGMEZBNzY5QURC
-NDc0MzczQ0Y4RUFFRTdDQjQ2NUY4NTlERkUxRTcwMDg1RjVGQzk0NkMzMTM1NEYxRTI0Cgo0
-RjMxQzdFOUI1Rjc5MDNEOTJENzM4ODZBQ0FFNzY2NkYyQ0REMUNFM0FBRjY3MDc5REM0RTkx
-OTExOTIzMERBNkIzNjlBQURERjI0MEMKCkU5MERCQ0Q4QUIzOTcyQ0UwOUU1NzEwQjk1OTYz
-QzZBNjJFRTU2RTA5MTY0RUZBNzdBQ0E3RTBFQzVGQ0VGNEQzN0EyREJDNTRBOTc4MwoKREI5
-RTIxMDQ1ODYwRDU5MzIxNzQzNTIyQzdCREQxNEYwNzNERDU1QjYxM0Y3RjE1MDY1RUY5NzQ1
-NkQxQzkzMEU2QjhGQjVEOUVDNDRCCgoxMTEwQUMwNzU0NDM0NTlFRjEwQzQ4RUY4RTRGQUM0
-NDkzQkU5NDlCNzVFRDBFQkJDQ0IwM0UwOTExNDRDMThGMUVBMDIzOUY5MEZENzEKCkUyNEIy
-QzA2QUYxM0JCRERDRDU4Q0VFNEM1QTI5MjZDODczMDk5RDE4NzIxOUQwNjdGRTcyN0I2MUMx
-ODU5NzE2QzNERjA3Q0YxNENFNQoKN0Q2QTc5MjVFMzI5ODQwRDY4RjBBRDYxREIzRkVGOTFC
-MjBEQTQxRUI2RjI4MzUyQTlDNDlGN0ExNDFDNkY0MzA1NkE2Q0ZDMjU0RTRBCgo0N0EzRjk2
-N0FGOTcxNEY1MjQ1OUM1MDM5Q0UxMDU3OTU2MTIxNTU1NzZCRTA4MDcwMUE3N0YwMDI2RkRE
-QjJEQTVCN0Y4MkQxQ0FDMzIKCkM0RUY2MDI2ODg3MDU2NkE2QzNDQ0IyRkNDRjBFMTFBQjYw
-RkQ2NDREQUNBNjk2ODk1RkZBMkNGNzIyNzBDMTkwRjQ4MkVBRTU3NTNCNQoKQkZDRDFBRDZF
-MkU4QjEwNTM1REEwMTI5NTREMDg1QzlBMTRERTk5ODk4NUUwOEYxNzQ0NkQ4MTU5REY2MUUw
-Q0RBNjQzNTE0N0Q0QjZECgo4QTJEMkIxMTVGNDlEMkUxMEFEREQ0RUI2NkNBNDIxNjFBNUU5
-MDA1QTczNkQ5NTQyNDRBQjNENjUyMDc0MUNGMUUzQUM2MzkzMEY0MEIKCjMwNDhGNzgwMUUx
-OEFGRTU1N0RGQkY1MEM2RTJDMTBENEYyODVGMDVCMkMyQzU3NEQzMjdDNDNBOTE1MDFFNkFD
-QTQ1MDQ4QzBEQkNDRQoKRTk2NkMyOEFERTc0RTQ2MUJGRjFDRjU4NEY0MDZFMzJCQTQ3M0Uw
-NzQyQjQzMjlBNzY2NjNEOTJCNjgwRTgwQTRCQUVDQUNDQTgzN0ExCgo4Qzk4RDg4RjEyMDM5
-RDgwRTZBOEI3QjBCMjA2QkZGNjJCMDczQUI1OTYxQkVFNDVEQUFEQzU0OTMxOTM3ODBEQTgx
-NzkyQkY0RTc2QjAKCkE1NTQyRTVDOTczOTE5RDBFRTFEQTFERTVBNUZBMjY5ODYyQkIwRDQ2
-OTQ2NTI4NDlCNjEyNjgxQ0RDQzc1MDVDQUM5NUI4RkQ3MkUyNgoKNTFCN0U0Qzk1NTYwODA2
-MEZEMUI1RTRGOEFCOEFCQ0E2ODA5RkZFMTUxMjAzQTVDQTkwNTg0OUY2MjlCREREMTQ4OTlB
-OUJCRTNCMTc1Cgo4QUZEQkZCRDgyRUNBNUIzNUYyQzJCMzVENUMyNjdFODJFMDA5Q0REQzZC
-RTM1RTk5RTc5MThBNjlGMjhEMUI3NzM4QjkzOTE2RkI3QkUKCkNBQ0I4MjcyN0UyNjM0NTNG
-NDFEMUNBRTVGMzhCNkMzNzA5RjAwREU0OTU3MzEzNTU1M0RFRjc2OTlGQTZGOTY0MTZBRDU2
-N0Q5NzFCMwoKMTg5MzcxNEEwOUI1QjM1NkQ0NDc4MzM5M0ZBMURGN0VDNkZDMzNGRTUwMTg0
-NTRFQkJENUIyQUNGNkFBNjA4MDU2NUZDRTY3NEYzREExCgpEQkQ3N0RBQkYwREM2QjM0RTE5
-NDlCQTJDMDEwQzU0ODEwMDlEQTQzMzdGNzM4M0QyNjlERUQ3OTcxMUEwOEU3ODcyMjhFMDlG
-MEMzREUKCjk4QzBFRjgyNzE1QzRGQUJGQkM3NjA3NzVCRkQxQ0VDN0NDQzgxNjMzMzEzNDFB
-N0QwODIwOUQzRURFNDVENzhBQjJBMDVENTcyNkUyQgoKRDY2OTA0M0UwMkFGMjc0Mzg1RTE2
-MTNGNkE0MkU3RTlCOTRCNzY2MkE1OTA0QzI2NjlDODI3MjcyQUJDOTZBQkUzNzZERjcwOTRF
-RDJDCgoyMUVDNTAxQ0MzMEU2MzFCMkNEM0IwRjRCQUI4QzNDRjIwMjUxMzBBOTlCOTNDNzA0
-REYyRjAxNUE0Njg3NEI1QkNDOEU2NTYxOUZBNTAKCjBEMUFFMkJDQkQ0QzI3RjkyNDQ3Q0Q5
-RTQyM0VDNUI2N0UzNURGMDRDRTMwQUNENjYyOEExM0ZBMjBDMTRCNTE4REQwMzAxRDNCRUFE
-QQoKMEE5QzE0QjhEQ0IyNzgxNzBDOTdFMTA3QjRCQURCQTFCMjVCMTdGMjY4RjhCNTJCODk1
-NzU2Mjc0NzhFMjhFRjU5RjJEODU2QzhDQUE2CgowMzc2QzUzRTk1QkE4NTRGQzA1OUVBOTM4
-NTc1Mjc2Q0U0NzE2QjdBMTlDRDk4MDk5OEFBQTc5RUM4RUQ1N0Q1NkVFMkVBODBEMkFCN0MK
-CjlCMTgxMDBEQTJBN0VGQTcwRUQ0MEEzMkFCMjkyMTI5RDg5N0FEQ0QxQ0VCRjZCMzBCQjc2
-OEFDQUJBQ0M0ODBBRDZCRjFFNzAxRTMzMgoKQjFBOTc0NkNFREREMTI3NDQxQzY5NUMzQTQy
-NEE2REQ4NEJGNjg0QTkwQjAyN0I2OEVGQkRFQzk4QUE1QjlDRDk3RkFGQUFBRkMxOTVECgpE
-QzU0Njg4NzZCMjhGNTZFMkYzQUFCNzREOTczNjY0NDFCMjhDQkFDMEQzMjhFQjhGRDk4REYw
-NkU5OTgwRTIxQ0E3RjYyMzQ1RjAwRDMKCjhDQTgyQTFDQkZFOTU0Q0Y4QzVDNzcwMTdBNUU1
-Q0I2RUNFRDkwMjIyQjVCMTVENUQ3MzEwQjNFMjRBOThBNjQ2NDRFRUFFMEIwQ0IyMgoKQkRD
-N0ZDQzk4M0NBOTQxMDRDM0FGQUU3MUE3NUEzNTEwQ0VEMUMyMTAzNzlFMjg5QzcyMUJENEVG
-RjgyNjczNTY1Mjc1ODI2QTQxRUE1CgozMDA4QkQ2QzE4ODJFOUM4MjM0NkRBOTFFOEREQkYw
-OTJFNzhCRkMwMDlBMEJDQjAwOTdFOTc3ODgxQkYzQzgxQkI2REUyNzg0QUZFRjkKCkJCMEZF
-NTJDQTkxQ0IxRUJCRjAxMDI0QjFFRjk0MTE0NDIyOUIwMTI3NTk5Mjg0RkJGNkVBNzgwOUJG
-MzZGQUJBQ0ZBQkUzRkJBNDFBNgoKQ0NERUVBMUZGNjY1NjgwNUNEOTQ1NDM5RTM2Rjc3MURC
-RjU2Rjg1QUM2Qzk3NTlGRDc3NDFGQ0EzOENDMzYyODExOTYyODgyNDI4QTlBCgoyOUY5RTc4
-ODMxMkI2NzUxRTRDQzZBRjE1Q0I1MTdFOEYxN0EzMjBCQTQzMzVENEM4NjlDNzZGQ0FFN0JE
-RTU5MzM0QzcyQjU3OEIwNTUKCkFGNTg1MEQxOTE5OUYyNjM4OEI0NkQ5RTlGMjk0MERBQzNE
-OUE0M0Y0NUM1Rjc2NDNDQkEyRDM5MTY3MjUwOTEwMkE4ODNBQURCOTk4RAoKMUNCQ0I4ODhE
-NUJCNzFENzQwNTgyRjdCMkJFMUVERTdENkVGNEE5MTREREY1MzY4RDU0N0RBREEyQkU1NTk3
-MTYxOUFGRThEM0E2NzI4Cgo4QzhGMEE3RkU5RUM0NEU0RTAxNjA5MUY3QjE0Rjc5RTgxQTRD
-RDhDMjU5OUY2QUU3NzYxMzZEMzgyMjJBRjFGNjFFMThCRDhCRDZENkQKCjIzMTkxRTJEM0FB
-NjMyMTdDOTEzQzhENjJBMDk0MDUxNkU3MDk5NkEzMDQ3MzYyMUI4QTI1NzQ2NUQxRTZCMjk2
-NkJBRDhCNDQ3RkE4RAoKOEUyRUMyQkUxNUNGQUM5NjM3QTVCRTE5OEQyRUZFNkQ4QzIwNENE
-REY4NTM5OUI5OENBNjkxMUM5QzhFRDVGMjQ4RjA2Q0M4RTlDMjdCCgo2RUJDQ0M4QjJFNTRD
-NEQxNUNFNDZBNkJGMzgxMkNCREQ2N0ZGRTJDODMzNzBFRTc5MkZCMTdDNjNDNDIyMkZCNUVB
-NUMzNjNDMjk2QzQKCkY5RDE3NEU2MkEzRThCNkI3RkUzNUJGNDY2M0UzRDgzRDkyMTQ4Njkw
-OTQ0MUYxRkRDOTU5OTBDOTE4OTgzNzA5NDQ1NUJGQUQ5ODdEOQoKMjIwRTQ0Q0JGRjJFNDk2
-OEUzRDdEMUQ3N0FGQ0U2Nzk2NkI4RTlGRDExRTEzQTY2REU2MUM1RjIzREQwMEM2QzQ4QUUw
-QUQ3REU0REVBCgowQkJCMkM2MDRFNDQzRkI4ODQ0OEZCNkZDNjFEOEFFRUJENTJDNDkzN0Y1
-RDI4RjYxMUE3NThDMTExRDFENTdDQkMyNjJEQkQwQkM4REYKCkExMUUyOTlDMjgyNDBFREE2
-NDNDQzA2QTEwMUZDMEU0NUEzNTE4RTM0RjhCRUJDNDk2NERENUE4NDY3OUYxRTRDMEEyOTI4
-NEZEMkM5QQoKODdFN0RDMEQxRjNEQkY2OEVCMTc3QzlDMUNENjc4MUEyMzM3MkQzRkJFNjU1
-Q0M0REZFQUM1MTM0REVFRENDNkYzMzAxNzY3NjVENzkxCgpENDk1QUNFRThDQjZGQzE1RUQ5
-MTNBMjg3MDZCNTM4RDlGOTdFOTg2QkM2MjhERUVCMUVGQzgyMDkzNkU0MzFCRDVEMDkxNEMx
-RTA4QUYKCkQxNzk1NzE2MDAzNTA0ODhFNDM0MkY3Mjc3Rjc4OUE3QkRCOTc0QTNEMDZERDlB
-Q0Y5QkM2NDVGRDExQzI1M0E5Mjc3M0Y5NUNERjRBRgoKOTExQTdERDgxMEE3MTc2MTdDRUY0
-MjJGN0UyMDc5Q0EzNUQ3OTk2RDVENTJBNTBGMjIwRTlCMjZBNjVBMEExN0I3REE0QTg2NEZD
-QzJDCgpEREY1Q0MyNkZFMUU1NTFBMjAyRjYyNTk0MUJBQTgwOTNBNDBFNDJGRUZGQjE3RDAy
-NjIyNzdBQjlBOUU0MTcyM0FCQzczODE3RkFCNzMKCkE3QjU5RTMwNkMxNDhFMkU5ODY1RENB
-MERFMEEwM0U0NkVBNjkzOEI1M0UwMzA2OTRGMDJGMUNFMEY4QUZGN0E4OUZBRTMzQzhDN0VB
-NAoKNzJBQzNCQTg2ODBBQzA2RTYxQzYwMDI2RjFDNTg5RTgzODFCM0E1NEE4NjE1NTE1NkQy
-MDMzMkZGMkU1NTczNzU1RjBCOTgwOTY3QkI2CgpCRTg2QTg1OEI2RUM0ODY4NjJCQTcwMkFE
-MTE3MTg1MDgxQjIyQTAzNTlDODExQ0VGQ0U5NzE4QUMyQzM1MTJBNjVBQzYzMjgxQkMwMTgK
-Cjg4ODQ5RDk5NkQ4RTFBQTEyMDAyNzMyQ0RFRjBCOENGMzkxMUY3MUQ5MDVENTJEOUJFRUNF
-Q0ZBNEEyREY4MjkwQzhBNDcwMjFBNkZBMQoKMTQ2RkYzOEU2NDI0RTU4OEI0QjRFMTAwMzFG
-NjBDNTEyREYwODJGMDlCNTM5QzE4RDA4RjE4QTQyMzlGQTlCNjQ4NDhDRTMxOEIwRjlDCgpC
-OUY2QTI4RDZCRjFFNzg4QzE2RDZBN0ZCOTIwMTY0MjIwNjA0NEY0NzBEMkFFQzM1REU4NTYy
-QzE3REQ3RjUyMkFCNzMzRTc5NkI4NzAKCjRFMDU0ODVGODY1MzU1RTU1RUVFQ0Y2MEU0QTJC
-NEU0Q0ZBOEU5ODIyNjg1Qzg3QTYwNTYyQUMxNDU5RTI0NkM3REExN0YxNzRFOUUwNwoKMjEw
-MTk3NTE0NEVFNEYyNENERTZFRDkyNTRGQjhBREVCNDE1Rjg5NUQzQTcxQzY4OTcyNjI4QjM5
-QTA1ODgwM0RCODVGMDdCQzQ5MkE0Cgo3MjI4M0REM0QyN0RCMjM1OUY4ODFFMTAzODMyNEIz
-OEZGN0M0RUVGOTFFRjFBMDBCNzQxQjUxMTU4MTk5NzM2NDczOTg0RDIwODAwOTkKCkNFNzM3
-QjAzMzI1RjM5RDc3RUUyRDVFN0JCRjEzMDEyMDdGRUI5NjNFREQ4OEI1MkVBRTQ5MjBBMENC
-NzU4RkNEQ0FEMDQxMTIwMEE0NgoKNDhFNjU3QzI2QTQxRTc1NzdEN0U4NzZBNkE5REUxNkIy
-ODc5QTZDQzZEQkY4OTQwQkE0Q0Y4NjE1Nzk1ODZGN0FCMjM4MUYxRDI0NDA0Cgo5MEJGRDNG
-RjY3NDdGQTkzRjNERUQ0NjcxQUVDREYxQzQwMzQ0RTc1QkM3NDFDQTc4QTIwNzkxMTRDN0E5
-NEFEQzU2MDI2NEU3OTQ2NEEKCjJEREJBNEQ0RTc4NDhBMjU1M0ZERTFDQjUxRjUxRjlFNkYx
-MEFCMUFDNEFDNEQyRkRGNUQ0OTJBQjlCOEI3MUM2ODM0RjBEQzNCMjM5QgoKRTM4NjIxNzg1
-QzYzREY2MDM4Qjc0RDdENTM3QkNCNDExNDdFQTg1N0JCREJCQTQwRUE1NTUwRUE4NTkzNTQ1
-NkQ0QkM5NDVDN0Y1NkVFCgpEMzc1RTIyMDg2Q0FDQTc1QjNFMTk5MTI1MTE0RUU5RkE2NTZG
-RjVFOTAyOTU2NkE3MkU5QkE0QzJEQjVCODNBNUNBNkNGMkUxMzY4QjkKCkI4QjJEMEIxRTJF
-RDZFRThCNkVDNTZFMzUxODAxOUQ5MkI2QzA2MkE5MkY3N0MwOUNBMTkyRTFFNTI3NjI2RUVD
-NzhFNTUzODc2RUZBQQoKMENERjE0RUFGOTI1MTJDNzFGRjZGMDBCQkM2M0Q4QkM1MDkzQzBD
-MzQzQjkyN0E0RjIzM0MwQTFFRDc5NjE0MjZEN0IwMjk2Njk4RjcyCgo1MUMwNTFFM0YyODIz
-MUZEMzAyMTQ4NUUzRDgyMjhDODYyOTkwNjRBQjlEQUQyRTYzRTU5Qjk5NUE0QzZGQTBGNDUz
-MTE0RTgzMjMyRjUKCjk4Mjg2NkQxNkVBMUYzNTQzN0M2NDgwN0Y4QTcyRkE4RENEQTREQzMz
-QjMxODQwRURFMjJDQzgwRjlDMzJGMDhGMTE2ODNFRTY5NjIwNAoKNDU3MjgwQjM5QTI4OTFB
-Q0UzNDMzQ0NFQTgwNDY1RjBDMDdCRTI3MTE1NDczRkJCNDExQ0NFQjhFM0U1MzJFODEyNUFF
-QTAwMjZDRTRECgo5RjUwNTREMjk2OTc0RjJEMEE5M0QyRTY1MjZFODhDMjY2QTU0RTkzNzA5
-NzU3MkYwM0I2NkREN0YxOTM5QTgyQThGNDc3NUVBQjFDQjIKCjQ3RTlERkVBRTAwQzhBODU5
-RjM5MTAzQjE0OUNBMzNCQzZGOTMyMTAzNzM2RTcyNzQyMDIwMUYzRDM4OTU5QUJBRUQwOUQ5
-RDBCQTE3MQoKRjE2MzQ0QTQ5MzIwMDYyRDRCMEMzMEI4MjQzNEE2NDgyRTIzQjA0NTVFODIy
-MzU4Qzc2OTQxRTJFQzZBOEY1NzQ3NTU1NTFBNzcxNzg2CgowNzAxMUZBMkY0RDBGRkE3QUJD
-QTY0MjA1QjQzMDFDQzhDNDdCMUNEMDM1OTQ3QkFDMDBDMjZDMTI1NUVDMDFBNkQ5MEM1OEY3
-NjBFQkUKCjdEN0I0MERCMjVFOTc4Q0Q3MkNEQjhDQ0QxMzI1NUQ1REVCODY3MDQzQUMyMjFD
-RDMyRDc4RjYwRjhEOUFDRkM5NTM0MDU0NkREN0I3RQoKQTZDQ0ZBNDgxMDUyQzU4QkI0MUIz
-NUREMDNCOEQxQUNDOUJEOEJDMEE4QzgwQ0E3MkQ5NjE3QUE2QTE1MTcxNTI2MzU3NEY5NjY1
-RDYyCgo5OTg4MThENzU1Q0Q1MEEyRDkyREY5NjZDMDVEMjhFQTAzRkI1QUU1NzA5QjkzNDk4
-RUY2NkVBMkQ5NjY4MTAwM0U5RjMzMTYyMDBBMTIKCkRBOTY5NjRENkIwQkI0MjA3N0E1MzA2
-QjcxM0M0NjM0OUMxOEVFNDIyOEVDMUE5QzI5QzEwQkE1ODIxOERGNTg3QkQ1MzRGMDhDMDQ0
-RAoKNkYwOUE1RjEwMzY0OEJFRjA2MzM3RDM4MzQ3MDlBNjk4MThGM0Q2MjM0QUNDQjRBMDY4
-Rjk2MDQ4ODE5RDFEN0EwMjNBNTY5MDNGODk0CgpEMzc4MjgxQkZBMjMzOUZFMUE3NDgzQjcy
-QkNBNTJGNjMwNUE3NEExNDIxMTYyQkJBMTI1MzYzNEVCNzQ1MDE0OURGMkZFM0UxMEM2RkEK
-CjEyMzVDMjRGODJEQUNCREFGMTE5ODZEMzY1NzA2N0FDRTFBOEUyREUxMDRFQjRFMTAxQjY0
-OTFGQkQ2N0VDNzA1NTFEQTU2OTRCRDEyMgoKRTM1NDQzREYxNjREMEJBQzQxM0REM0RDMTc4
-N0FCOTJGREVCRjA4MDY5NDIxNjNCMjZFQjNEMTQyQjAzRUVGMzU4MUNEM0MzMkU1M0MzCgo1
-NzIwNUFBNTIxNEQ3MjNFNENFNjkzOUE5QTA5MzMyOUM1MzU2MjFBRDBFOTAzNDExRjc1NUU3
-MTUzNkM3RTM3QTYzQjk5NTJBOUFCRTkKCkU4OTJBQ0RDMjQ3MTZFQzkzNjYxQkI5RjVBMzI3
-QUQwOTg0NjREOTJBMTgwNDc1RUFFNUYyMDlGMEVCREZENzk5RjdFOTgyN0Y2NTdGNAoKOEQz
-OTc4N0FCRDQ5NjQ5MUM4ODkzRTFDMDYzM0U1QUMyRTRGNzVBNUE5NjBDRDUzNUYwRkM5NkU4
-RjRGRTU1NTc5NUM5NjA1NUUwNUY3CgpBMDVFODJGNTM3NjUxMzQ1MjU5MTYxOEZCQjk0ODYw
-RDkwQzcwMUJDODUyNUFGOUMxOTY3RDk3Qjg1M0JBNEVENDhEMDk1RTk5NUY3N0IKCjE0MEM0
-RTE1NjlBRTQ0REQxMkFBQkM2ODgwMUMwMTQ5ODdGODhEQ0YyQjAxOTFBRUFCQ0VEOTBDQUMy
-NzVCRUE2MTczODdEMEY3QTFBRQoKNThGQ0RCQUI1RDc1MkQzMThFQTE0ODJCRjU4MEY3RUFG
-RDg4MkI2ODY0QkYwM0NCMkU0RDU5QzE3OUEwMTQ2QzFCQkM3MDFGNzhCNzE1Cgo1RjMyMjJB
-RDBDMUU3Njg2ODEwNkRDQ0EwRDVEQjYwMkQ4M0NEMkRDODcwRUU2RTQxRjU2MTA4MzVCOEYy
-RkUyRUM3MzBFRjlERTBCQkIKCkZFRjQzMDhBOUFBMDM5MkJGMERGMUM5MkNERTRGNEFERTk1
-REEwRDEzOTUxNDc2NTU5Q0QzQjRCN0RFQTE0REY0NDU5N0E5OTY5QkVCNQoKMzNEODdDOEMx
-OTUxODIxOUM2NDc2N0RERkE1RkFDRjE3M0Q2NENDRjk2QTM2Rjk2MkQ1M0VFMTU4MEI4MjNB
-RkNGOUU2RTI5MDQ1NEZECgoxQzZDMzFDNDVEREU0MjIwRjA0RjNEODUzNDNBMkIzNEVGRUE1
-MjkzNjRENkNGREU1OEE1RjIyNUY3RUY1MDc2RURDMjIzNTBGODYxNzYKCjYwREM4RjlENzJF
-N0VCODI2QTVFODNDRDFCMkYwREFDREYwMTk1QzY3RDRFRTcyNjg3MDExMUYxQTg3NjZENzNG
-RkM4OTQ0MDA0NjQyMQoKOTU4NDc5RDU2RkQwQzc4Q0E1RUE3ODAxRUI2NDVFNTkzMjI5MDMx
-ODIxQUFDNDY2NEI1QzgxNEE4OEY1OERDQkQxQ0Q0NEY4MzM2NEMyCgoyRkI5RUJFRURBMDlG
-OTc1Mzk4NDNGNTREQjdGRkQ0QUIzMjE2REY2QUMzMDVGNUQ4MEVDNjMyNTBDMzNFNDAzMzg1
-QUUwMDlCNUFGMUYKCjVEODMxNTQ5QjJBREQ1RUQ5NDZBNjk0MDkxRDE0MEYyQzAyNEZFQTIy
-QkVBMzY1RTdFRjdGRjZGNjBFNUYzQjM3NjlCNjY3RDJFRTVBMwoKMzU4REQ1NjAyQkNFNjE5
-NkNGMzJFQjAyNzA5OTBGQTA1RDk1MjM3MTJBQkM4RDhEMjRCNURCQzc3RjA1RjVBRjc0QzE3
-NEQzNzUwNjFFCgpBNUY5N0RBMTJGRDM0MjIzRDg0RDE0QjU0N0VCNDlCNDBDQUNFMTc1NUE0
-QjA5QUFBRTFBQzMxQzVGNjJCNTc5MTFEQTgxQkQyQzNDNDcKCkZBRENEMjIxRDlEMDRDMkI0
-OTQ3RTY2NUEyQjNEMkEyMDdEQ0IzNTIxMzM3NEMxMDNBOTEwREY4NTA1QUNFQ0IxQ0Q4MzQ5
-Q0YxN0FDQgoKNUVBNDYzRjA0MEVENzY0OUM3MThDRUMyMUM2QzgyQkNBMzBFRTZDRUI3OUMw
-QTZGMUZEQkUxNkJBMDlDRkFDMzRGNzMzM0VEMUQxODlDCgoxQzBEODcyRkQzMTgyRjMyOUFB
-RTNERjcyQkEwQTBDREJFMjY0REFCMUFBODE5OUNGNUJDMTU2NzhEQjIxNTY1NzkyNUM2OURF
-MDUzMjcKCjEwMjk3MDEwOEI0QTVDNjdDMjgwRkQ2QzUwRjczMUU4OTY3MkJCQTc5QUVFREQz
-RTYyMzc0NUU1NzY0NTJFQjZDMTU3MzNFQzYyQjNDOAoKRDNENTZENkZBMThCNTBBMjFGNkYz
-MThDMkMzNkI1MTc4RTJEN0U0MzhENjU5MERBMUM4RkNCRkRFMTc3QUQ0OEU2NjczRTFEQUQ3
-QjYwCgpGNDQzOEYxQUIzNjBGMkQ0MEYxQTMwQTBGODdEN0JBRjUzRTZFRTc4QkJGNUI1QTk1
-NjVDQUJBRDdFODI1RDAzODQ3NDMwQzY0MjJFMzkKCjlGMDg1ODAxOUFFQjMwNTZGMjI5NEVF
-OTZFNEU5RjE4MkVDNDVGRkM0RUE5OEUwRDQ5OTk4N0ZGMjE4REM5NUQwNTFFQjMwRDY1QjA4
-OAoKOUNBQ0E2RUM3Q0Q4MzExOEFGMjFFNEQ3N0UyQTI1QjIxRjcyMTEwNTk2MDAyNTIxMzEz
-MUJCOUUwQkNFRkQ4REQ3OUVEMUJDMzlCMEI5CgowN0E0RUQ0NTZBOUM1MURERTM0MzAwMTBF
-QzExRDM5QTUzMTc0NTFCMzc3N0NDNjBDQTlFMDJBNTBEM0Y2NjA1NERENjY4RDAxNkNENDcK
-CkM4MEVERUZENEEyQUJFODUwRDQzMjIyNDNGQUU1QjE2OUNERDA5QkQyNTNGM0YyNEFCMEI2
-OUIyREJFOUE3OUU3NkNEMzkzQjcxQjk0MgoKNjc4ODNFOTMwNkU0QUMyNUZDN0M5QkY2NkRD
-Njg1QjUxMzQ4QjAzODJGOTcxMjQyQTc2NDc1ODQzNzY3NUQ3MDZGREZENkMxNEMwRjBECgpE
-RUQwQTVBQUNDMUEyM0NGMTFBQ0QyRjNCMzA5OEIzRDJCNEYwRDM0QjA0NUQ3OEY5ODg3NEVC
-MkNDQjI1MTE1Q0M0NzY3MkM5NzA4NDQKCjI0QzY1QTY4QUZEQTk3N0RCQTlFNTE5RjI4MEMz
-MjQ1QUY4RTg5RDBBM0FFRjMzNDQ4MDA1NkExRjIwM0UxQkZBMDIwOEJBQkQ5QkJGNQoKMDQy
-M0U1NjlGNDlCRjRBQUI0NDI1RTlEN0MzQzFGRjlEQ0Y2RTMyRTUzRjg4MUYyRjg4MEUxQzAz
-MzZEOTUzQTBEMDY4QjdEQTMzRTE2CgozRTM1REEwN0I5QjVBM0I1QjlDRDI2NkI2MUUxRTQ0
-MjMzMTFBMDM3MDk4NDAzMDlGRkREREZGMEQwMDM1RTJENEY1NzkzRTZFOTE2RjMKCkRCQkRF
-QThFODZDOEM3MzgxQzE2Q0M2OTAxQkE2QzBEMDZERDBGRjY0M0FFNkI1OUNBNTUwNjc5M0Qy
-QjAxMkExOUNERTdBMEQ4QjgxQwoKMkZBQ0VBQzMyQkIyMzgwQzExNUY5QTUwRkVGMkU2MEFG
-NzU5MEU0MjEzODU5OUY2RTc2Mzc5MDJCMTA1NzFDNDE1OUVFQTdCMDU4RTRECgo3MzkyNTMx
-REQxQjJBM0IxQTVCQjE3ODQ1NENGMzY1QUVFNDk5N0RFODI2N0RBQjIzOUE4RERGN0FCNjlG
-OTJDRTgwNUI1NkMzMzY4NjAKCkMyNjUyOUFDNkZCOTg3NDg4Qjg0NDk1Nzg3MEI0MEUyQThC
-M0IyOUZDM0ZDQUVGMEIzQTZDMDI1NzBGODY2MUY0RTRFNDU1QUZBMUFFMgoKNTIzMTZCRUNC
-MkM4OEZEMzRDQ0Q2RjZFRUM2QjcwM0ZCRkZGNUJEQzhCQUYwNTZFNTU5MEYxNkJGOTM1NjQ3
-MjI3NDFGRkYzNDRDQzhDCgo4NkExREU4QUZBQTRFMkY1OEI1RkQ5MTZEMTYzRDI4NzMyNzU1
-M0VDMTAxMjE4M0M0NkRDRDkyMDAwMTEwNTNFRDREREY3NzQwMzZDMUMKCjVEQ0Y5NThCOEUw
-OUI4NkNBRTI0RTQ0QjRBQkNDQjA1RENBQ0EwQ0Y0QjgxOTk4RkI3M0U0RTQzNTgyRDJGMjA0
-Q0E4RDk3ODgyREZDRQoKRUVFRjY0M0FBMzlCNUQ0QzlFQjNFQzM4ODZBOUQ1NEU2QURDQzI1
-NDlFNTNBRUJBNzBDQTRDRkFCNDY1RUMwRDMzNkQxNTg3MEEyNzM4Cgo3MjgxMEMyNEMwNzlB
-QUI4OTNBQzUzQzNBMkI0MkYzOUE0OTM1RTEwRjFCM0YyOTlFOUJCMzQ4NkQwMEVENjZBMThG
-MDNCQTJEQ0JCMDQKCjMwREVDOEQ0MEQwMDc3Njg2Q0NCRTUyRkM1NTBFQTk2REExMDIyM0Qx
-RjFGMDk4NDQ5NjQzMzY0NjE1QUU5OEJDMjZEREFGMkQwMjUwOAoKRjY2QUM4MUM3ODE2MjVB
-MjcyQkM4MzYxMDY0MjJGQkMzREE0QUMxQ0JENzc1RTRBQzEzMzgyREM0OUZBNTQ0NDVEODJF
-NkExNkJBRjgxCgo0MDM1QkQyQjBDOUY3RTVGQ0RENTBFM0I4QkUwRUNFRTM5QzVCOTgzREZF
-ODQ2NDUzOTJDNDBFQUZDQUFFMDdDMTBFMjA5RkQyMjgzODAKCjVDQUQ3Qzk4OUJERUUyQjMy
-ODdEQjZENzI1ODM4NTEzRjNGOTVFNTBENUEwOUZDMzRDNjIyODVDMUFENzQzRjBDOUFENDg1
-ODYxNzQwRgoKNDYyQUQ0MjZENkNDOTc0MUNEMTREOTdERjc5NTMzMDMyMjE3RTIxM0M1NzJB
-RDlENkQyRTE3OUZCODc3RkM1Q0NFRTJEMTZEQzQwMTk1CgpFM0M4Nzc5QTg5QjMxNjRCQkVD
-MjA3RjQ0RkY2NjUxOEU0OENGOTZCQ0NGQUY3QTE4RjVGN0UwRkJCOTRFOEQ0RjVGNUE3NEU5
-NUYyOTkKCjEwMTYzMkI1QTI0RUUwNDExNzVBMDcyNUQzMENCOUQ2RDVDNTdDRjQxNDY1QkQ2
-M0VDQjhBNjVDNDAwNDQ1QjA5NUQxNEExREY3MjZFOQoKRTFGRTcyRjVFQjI1RjQyNjEzMjc4
-Mzk4NEZCQTJBQUU5NjUxMDY3MjhDOTlGNkIxRjdEN0JBRkNBQkU1NUYwOUM0NzZEQTEwRDI5
-NDhFCgo0Q0YwN0U2NUQ0Qjc4REE2RjlFOUJCQjU5MjFCRDJFNzUzQjhCNjkyQzMxNUZFQjJB
-MTBDQTExNzU4NEE2NUI2MTYyMzYwQ0ZERENFRjkKCjE3RUJDODYyMjI5RTJFQUE5MDk3QUVD
-RTlBNTkxRTlCQURGOEM2OUJDNUVDMDI2NzREMkI1OEI3QkM3RjVDRkRGRENDN0EzMzdCRTUy
-RgoKNkNFRkFBRkRFNUQxMzk0QTM5QjFDMTg4RjkxQURFMUVEOTQwRjUzOUQ1MzEwRUJCNUY3
-RTFCMTFFOEYyQjA1MjJGQzY3NkFFNzcyRDkwCgpGNTVDM0RCOTU4OTQ2NjcxN0YzQkIxQUU2
-MTYzQ0NERjc3QkMwRkQ2MUY4QkVDRTc0OTFDMTNGQTZFRDhGQUI5RTAyRTM5RTRCNENCQjYK
-CjNCMTVFNUNDRDQzODFCMTU4OTlGNjAxMjEwQTM3NkM2MjQ2NDg0QjA0NkI2RUU2MTlCNDM4
-NTNEN0FEMTMzRTQyNTI2NjJDNjE5MEUyMAoKNzZBRDg0NjE0NkEwM0NBQ0ExNDRDMDE4Qzkz
-N0ZEQkFDRENDNjgwOTk1MkZGRDk0QTZGOEUwQzgwNDJFRjA2MEY0MTgyRkU3NzlEQjAxCgpD
-RjhCODBGMzU0NTEyMkZGNkRCNDI5RTZFQUFEM0JBOUE5MjY3QTYyMjdEMzM3RDYwMjc0QUIz
-NjFDMDgyQTU1MUIwQjdBMzJFQTdDM0EKCjZFMzcxRUE2RUE5NDc5QjQ5MTFENTg0MTQzMkUy
-Rjc1QkZGMTA5OTI3Mjk1NUQ3ODY0RERCRjRDODhDMjlFMzNEQkEwQTkwQkZFMzNGNAoKNEVD
-NUM2MEEwNzUxNEU3OEY5QTcyRjgxMjdBM0E5RUMyQjU3NUJDREIyMzAyQjlBRDY1NDk4NjJD
-MkExRjRGQTk5MjVCNDg0RDJCMUQxCgoxRDVFNDYwMEQ5N0ExQzY0MjUxRDAwRjRERUIzN0JC
-OTY3MTgyMjZBOUVGRDZFNkIwN0U1ODA4RTM1RTFEMTAwNjVDNkFGNjRCRkRDQTUKCkQ0MTNB
-RTMxRkQ5MjkwNUVGNkExNTc1MzkwMjgzNzEyMEExRjk3OEVFMzQxOTEwNjY1QTE1RjREQkJE
-N0MwNjg4OEExMUEwQzY0MDY2MQoKMEFDQThFMDI1RDM4MUE4RkUyOTMyM0RBNjJBNkQ3MEU4
-RUQ0MzRBNDhGRkJEQzk2Q0M3NjM2NjQxNDdDM0RFRUM1ODQ0MDg1NEFERDQ0Cgo4QzRGMjUw
-MzNBQUMzNDAxNTg5OTgwQzk2OEIyQUUxODk2QjRDNDk1RUY3OThDQjQ2NDAzRjIxRTE5MThG
-MkQyNTE2NjZENDNEMDlDOUMKCjNGMUE2NUQwOEJDNTU3NzFFQjNFNkU0MDgyQjdGOUI0MjQ0
-MDc5NDI0MEIyNEFFQzlGNEI5RUNBMEQ3OTIxOUM1MzQwNTkxN0Q0ODEyMwoKNjk1ODhDMjMx
-MzNDOTg1OTg0RUM0RUExN0JCMEI4NUVFQTdGNjI5QkM5RTJFMTBBNUU4MjlFNzcwQjg4MTA3
-NzY3NzlBMzNBODMzQTRECgpERDI0REU2NEFCNkNENUEwODlBODJFN0YyOTNBMjQ4NzRDOEM0
-MTI1Q0U0NUU4NkNFMjYzQUNCQjEwOERFRjY4NTEzOTIwOEE1OTJBMjcKCjc3NEYzRDdCOTIy
-NTBGRUI0QTIyODgzQ0M0MDNDNEQ5N0RCQTY3RUQwQ0VGQjI0NjgwOUJBQUVGMjAxQTU0Rjky
-MUQzNEQyMjJDNTY4NQoKNzA5QURCRkM5NkE3Nzc0MDM3QUIyRjI5OTVCN0M5M0QyMzA4NjMx
-MjgxREVGREY2QTY1N0JBQjA5RTE5M0QwQzlGNzU5QjAzRjNGNTBCCgo0QTVGNEJGMzlGNDEx
-ODM0MkY1MTg2QzRFOURFMjlERkZDQjdBNkQ2M0UwQzMwNjc3N0JCOTI0MzY0OEExQkUyNTY2
-MEY5MTg0REY5REQKCjMyRDFGQkYxMUQwOUQwOUU3MTg5OTUzODI5MTc5MEY4ODlFNUM3RUEy
-MzI4RTVGRkQ4ODEzNEQzMzcxOUJGRTAwNDhCODBFODVDMDhBMAoKQkYwQzUxM0QzRkY3Qjg3
-MEE2N0U2RDIyQTA2QzdCRjE1RjgzMkYwMUZEOEE0MzUwNzRBQUExQTNCNDBCNEM0QkQzNzRD
-OEY1NjZDQzVBCgo2NTI3QTQ0N0IwQjIyNUMyMTZGRDE2RjRGNzQwMjE0MEQwOURBMTA4QzBG
-RjNEQTVCMjYwMTJCODNGMUQ3MDgzRkUyNzM0NDRERTk2MzkKCjA4OTY5NUJFMjAxNzYzMTgx
-OTk2MUE2MzU2M0RFOTRFQUFBNTAyNDYxQzEwNzY2QTdDQTk0NzRBNDFFOTI5N0FGOUM4ODBE
-Q0ExNkUwMAoKMUE5ODE3MEQ4RDYwOEI2MzI1RkU0MjY5OUNDQkZEOTM0Qjg3RDIzMTUwNDc5
-NjRGQkYxMUZBRDJGRDhBMjg5QzExNjA2QzI1RTk5MDIyCgo3MDdDMDNCMDk0NUM0MDc2NzdB
-NzEyNjM1QzNCNTBEN0ZGREQ3QTUyREM4NDlBQzkyNUQ3QTlERDYzNkFFQTk3NDk2NzhENkFC
-MjI3NEIKCjYxNzY1NDhFM0U3QzM0QkI2Q0YyODk4NDlFQjc3RjdFMTk3NjI5MTM3NUYwNEIz
-RkYzQUEwMTFGOUEwQjBBMEVDODE4M0E4MjU4MUJERgoKQkVBMUJFNEQ2QUM1NTZBRTgyODEy
-MTZFQTBBOUNERTc2NUU2ODBCQjRGQ0ZDMDc3MTk0Q0VCRkI3NkY2MEZDNERDMzdCNzdGQUQ3
-QzQ2Cgo0NzQxRTYzRTY3MzE1NzQzNUZCNURBQkQxNzAxOTgyODBBMTdGNDg2NEQ5MkVCMDQx
-MjE3NDQyN0VCN0I5Q0FFRkZEN0RBRjM0RDJENzUKCjU0OEQzNUU1NzgzRTU1NjBEQkJGNURC
-RjczNkUxQzEwRjI0QkU4M0Y2MEE0NzYxNUM0MjQ1QTc4Mzk1RTBBODNFRDBBNzc3REZFREQx
-NwoKMjVGRjU3MzQxNjc3ODRBMTc0MzIzOEZCQTU4OEZGOTMzRTRBQkU1NzNCRjE3RUJBQzAx
-MzIzMDlFNDU4N0QyNDJCQUU3MTZFMDkzODY2Cgo1NDA3Nzg0NDAwNTA4QTA1NTZDRTBFMjMz
-NDdDRUEyQkI1NTAwMzlFNjVFNDMzRjVFNTY5RDFCRkVCNDdDRDAwNjgyOTM5MjQ5NTk5MTEK
-CkIwMDY0MUE2OUVFNTBENkJBQ0FCMDU0NTJDNkExOTNDMDJDQzlCMzZCN0ZBMzEyQUI1MTc5
-NEE2MzlERDc4MUYxQzhCOUUxQzBBQTk5NQoKMzM5QzQ5NTU4OEQ4ODE1MzY2MTEyMEE5RUQ1
-MDAxMkE2NTZFRDBDOUZGNDgxNjM5QTUxRUEwQTAxMEIxNTYxRjkyQ0FFMTU0MEMzOEZGCgpE
-QjkzNzNBNUM4MzY0M0ExMzVCNjU3MUQ1MTI4N0EzMTYxNkY2QUYxMDVCRDE3QzlCNjRCNkEz
-MjVDODhGMzBFMTQ0RENCOUQxNjBGMUMKCjI2RTNERDY1QTZDM0RDMTU1MDUyRUJGRjUxQjUx
-MzgxRDAyMkFCMURGMUMyRjM0RENBREM2NTYxQTI1MUJBQ0EwQkExOEMzQjMyMEZBQwoKNTI3
-NUM3MEQxQjVFMTNENTcxOUE3QkQ3RDFFQUIzRUQzODJFREM1Q0YwNjJBMDYzQURBRURERDE1
-Mzg2QkFGRURGNjBCOTM1Rjk0OERFCgo3NTA2NEU5NDMyMkYwNTYzOTVFOTVGQjcwOTgwRUY4
-QzlFQ0QyN0IyMjJBNDk5MDg1OUEyQjhGQUM1MUYzREUxQUM0QkY3Njc3Q0VFMjYKCjAzMjY5
-REI0NDgzMTkyNTc3OTRCOUFENUU3MDg1MDVEMERBNzI4N0Q1MzBEREE5NTlFMDhDRDg0RkI5
-NzFCOTlCOEQxOTY4ODA2RTdCOAoKQjAxRjIyOEE0RTlBODkzNEU2NjFGNDAzQjYzMTY0QTg0
-NzEzQjkwMTI2OEMzMUE4MDYyQzAwNUIwMEU2Mzk4MUU5NTNGQTNFNkZBMEY0Cgo3OEU5RDBC
-M0REQ0FFQkIwQUEwRkFFNjU3QkUzMEFFQUMxOEJDRTdDODNDMkM2OEIwRTMyQ0JCMTU5Q0Ey
-NUI3OTkzMDQ3NzNCRjg5NDAKCjA1RkI4OTNDMUQ2Mjk4QTkxMUIyREYxNzE3QTFCOTJDQjdB
-MkVENzc3MDcwQjhFMjkzRUVGNEM3MDAwRTlFNDk2QTcwNzAwMEJBMUEyNAoKQkUwRjc4NEZB
-OThCQTU0MzU4NTg0NUIwOUQ4NTVDM0FFQTYyMjcxNDA4M0YwQjFGMDUwMUFFNzRBODQ5MzQ1
-Q0VFMTlFMkI3Q0Q2RDA3CgpFQTM2ODFGMDc3NzRGMEY4NDQyRTdFMzgwNDBFNkUyMTFENjkz
-OTQ0QTMwRTI3RDYyNDIxODFDMjYyNkFBQTRBOEY1NDEyMTVEQjE4NUQKCjU2Mzg0RUI5NEFC
-MEQ0RURCNDk2NTVENTVEQUI4OUY1MjY2MzA4ODg4NEQyNDk0N0NEQ0MwRkQ4MUEwOUFGMDQ1
-MEM2MEZDNjY1QzczNgoKNDlERUU0OTIyRTAwQzNFRTk0M0EwMUZCMDVGMjk4MzM2N0U2QkZD
-NEJDNDE4RDdBNTFFMTQ1MjdCRDBGNUEwQTk1NUM5NDI2RjBGRDU2CgowOEMwMEE0NjREMUFC
-NEI0Njk2OTU1ODYyNkFGNkFDRTJEOTlFQkVEOTMwNjI4NzIwQkRBRkRCNTlFODk0M0I3Qzk1
-OThGRjk0NzgyNjkKCjQ5RDU4NkFBRjE0RjE2OURGRThFQzlEQTQxNTgyRkY0ODMyRkYwMTY0
-MkJFRDFFRjI0NEQ0NkMzMDhENDY4NzgyMkFDQkMzREVCMkUxMQoKMzQ3NDczQTc0Q0ZGNUI1
-OEJBMjdEM0QzRDM2QUEzNTQzRjJEQ0EwNDFENDJCNjBEOEM5RDc0ODNGMTM5ODNCMkUzNzIw
-NzhFQkRBREJBCgoyNjVDNjdBMTIyNDNFNDlDMzUwOTYxOThCNTBEMUM1RDQ1QUFFRUE3MkU0
-QkM2RUM5MjMzOEUwMUNFQjg0OTFCNEI3MjY4MkMzNUFBRkYKCjkzNUY4RUE3NkM5NDJFRTRC
-QkIzMUM4RTQ1QjE3QjgyOTY4NkMyM0Q2OEY2NDQ0MkZBOTM1REVEMTc1Njg3QjVDMDQyODU3
-RUEwNzY1MQoKMzI0ODcxQjdFOEVEQzU4OTgwNURGOTcyRkJDRjc5RTkyQUQxQ0FBMUFDNjMz
-NUQ5MUYwMTE5Q0FCMDQ2NjIwQTgwMjQ3NUZEQzc1RTUwCgoxRjJFNkI3Nzk1NEJFM0VBOTZG
-MTFFMTc1NjU3MzRBMEVBNzAyQTRFODE4OUQ5NTc5NTAxNUY4QjBGN0U5Q0FDNDQ5MkJGOUI4
-RDAxMDIKCjU1Njg1MUZENUM2OEU1ODlGOTlGQ0Y1MUI1RUEwREJBM0QzODg5RUJCMjAxM0FE
-QUIwMzU1NzQwQzg3NTBCMTgyODUzMjhGMDFEMkRCQgoKMUIwNzY4QzJGMTUxMzRCRDZENDJE
-NDNFMzRBOUYwQTg3MDYzNkUyNkYyNDU1RTNFRDkwMEY2NkI4MjU1RjNBRjBBNkYyMjE1MjZD
-Mjc3Cgo1MERDQjg2RDVDMkM5RUQ3QzgyNkI3RUYyOUExMURGRTQ1QjBBQUNENjc0MjA4MUQy
-RDgwRjc2OUFCOEI0NjM4QkE3MUJDNEQ5ODc2MDAKCkRENEQwNENDNTJCQTI2RjQwNzQ0MUUx
-QURERjRENzI3M0E3NTE2RUUxODlBMjU2N0VDOEU1NUQxRDMwMTlDRjcxN0ZGQzk5NjU1N0JD
-NgoKMTE5OUJERDUyRjcyRUYzMTg0Njk4NzQ1NDI3Mzc4QTU4QzI2NkZGQUQ3NDZCMzk3RjA1
-MjhDNDM1RERGRUUyQzYxQzhFMjRDNkZDQkNCCgpBMzBDQTJDOTRBOEEzNDFFMEI4ODc5RDY4
-NjNDN0E3RkI4MDVGMTJBMjUzMEJDOTc0N0I2QkZBN0VBMDU3REE0MUFGQ0Q4MDQ2RUNGMDQK
-CjZDMjU1MkRBNUU0MTlGMTVFNjAzMzlBNkVDNTQ3MzgzQzRCNjM5RkM3QTdFMDg2RUE2OUJB
-NDk5RjVBOTUzNTQzQ0U2MjBFMTU5RDFBOQoKMUJCMkM2QUQyMkQ2Rjk3NzBGOUQyQ0Y3MTlE
-N0FENjg0MTdDOEYzOEU5Qzc5MTEzMzBFQ0EyRTM0Rjg0M0JCOTdFNjk4NjkzMTZEOTkzCgo2
-NDlGOTE2OTRGOEZCOTY5NkRGNzUzMUY3QjMzMjRGOUQ5QkZCNTJFQkMyNzYzMjBDNTgzMkFC
-RDlEMEEzREE5NEQ4MDEzREI5MEVBMkQKCkYzNUQwRTFDQjM3Q0Q3REIwNUZGQzUxNEY1MTBF
-Qjg5MzVCRjU1QzBBRjY0NDA0NjRCRkVBMUQ5MkVDNDRBODIxREE4MjJFMzg3MDUzOAoKQUVD
-QzE0NkQzQ0RENUNEQTMyNEJEODJDQzkwOTlDOTBGMkQ1NENEMTI0NDM1RTI3NUFFQkNDQTA4
-MzhDN0ZDMjUwMjhENTZEREJGQUJFCgozMEIwRkJCMUVCN0M4QkQ2Rjk0OEQ1RkE4QzRGQkEx
-QzEwMTIxRkIyMEY0OTBBNTdDMDEzQzY1NDFDNTZEMDg4MkEzNzMzOTI1MjI3NEEKCkIyNzc3
-RENBMDlDRUM0RTQ5OTkxMURDRTQ1MzJBNkM0RDM1NDY0Q0U1QzE1ODUzREMxRDI5RjAyQkJB
-NTY2N0I3QUQzQ0IwNTE4QTkwOAoKMTk2MDM1NjE4MUM0Mjc2MEMxMENFREJCNDY0MTdGRTBD
-RkUxQjU0NUNBOEIxMjlCNjdGOTI1NDY4M0FCNUY4RjU2ODRCNTBFNzAyRDBCCgpBMjkzMjU4
-RDgxRjA3NTU3RTgzRjZFRENCNUY1MEIwQTlENTdGNkE4MDIxNzg4OTYzODNFQkIyOEQyNzQ5
-REIzOTdDRkVFQThCM0FDN0QKCjE4NjFENDg5RTdEOEUwMkIwMUI0Nzc0MjlEMjgyMDlBMTY0
-ODczMjdEQzNDNTMyRTM1RTRGNEFCMUQ4N0EwRTFBMEY4NDAyQTA2N0JCQgoKMzBENEQ5OTJC
-NUYyOTk3NDQ1MjAxQzc4RERCQkIzMTgwNkVFMzAyRTk2RTM1M0RCMzBFNzlBMzQxQjM4QUYz
-MjQyQjNFQzg3MDFBMzgxCgpCRDRFRURDNTY1NDIzMTMxMkQ1RDREMjU1NUEyRThFMkMyRkI0
-QzUzNjc5NTgxQjU3RURCNkYwMUM3QUVERTAzOTlDNENDNUVGRUM4OUQKCjAyMTMwMUI5NkIx
-NjhFM0QzQkExNUUwQTJDMjUxNkVEREYyRTlCNzhCQ0U5ODNDODIwMEIxOEFERUM1Q0U2QkZF
-QTAxOTM5NzUyNTc3OQoKMjM3OEM4QkY4NDFCRDMzMzIwOTY4OTFBM0Y4MkRFOEZENDYwRjQz
-REM3NUNDQzU5NkI4MkVERjU0NkY4QUMwMjVFRDMwREE2RURERTQ0Cgo3RUJFNkEyNzE3MzlC
-NTFBQUY1QUY1MjQ2MEE4Njk0MkQ5NEYxRDkxODE2RDJDRkEwNTlDMDRFM0U3M0YyNzg0MTg0
-OTJENTQ5ODlFQjcKCkNFMUZFQzlEMzExQUU2OTE4MDM1MTQ0RjA3QkY5ODc5MDlENkJDQzJF
-RDg4OTE3OEVBQjdGMzNGNTg5QTcxMUNFNDkyODI5N0Q5RjM3OAoKRTUwNzc1MjAyMjE3RUZD
-RTgzQUEzQzgzQjczMUMxRjk4Q0U0QTc4ODE2RTdGNkQ5RUYyQzU4QUQ1Q0YyNkE0Q0RDODQw
-NzVFQkYzQTVGCgpEOTc4REFFNkU1MDcyNjY3MEFBNjgzRkQzQkQ1MUQxRjJBNjZBMTVENDJF
-Mzc4OERGNEM1M0YzQ0E2RTJDNTlBMEYyQzFENkJBRDM2OUUKCjJENDY4QThENUZCOEQ4MkM2
-Qjk1RTFEREM3NTA3MUU1NjNFOUI0M0VCMUYyRjdCNjhENzZENTRFNzkxRDgxQkQxMUIwRDRG
-ODhCNEUyNAoKQjhFMDhBMDQzNTBEMDNGNTc3RTIyOEQ3MzE5QUJDREZBNEEyOUE3RkE5RkIy
-RDk5QzU0NTBBNjlFQ0Y0NzQ4RjYwMUYxNUZCRDlFRDg0Cgo1QUVGQzAyOTU2NUZFM0E5ODg1
-N0YxOTdFNEI0QTJDM0M3NzEyMUJBMkQ3ODUyN0FEQkM1MDEyMEI5OTY2NzgxNkZBRjVDNjVE
-MkYwQzEKCjU5MDFCMjk2OEREMkRDQzUzMzVCRDVEQzg3MEU2MzdFRkNDRjM3MjZGQkFEQ0Y5
-OEY3MkMxNDM5MDkxMDlEQjFCODkwMTdBMDI2RjQ1NQoKQ0QzN0Q2NTZDODJBMENBMDdENUU5
-QTMxRjI4QkIyN0UyN0M2NUIyQjQyMkJEOUVDMTJGRDBENkI1MDQ2Q0Q4QkM3RDI3NjA0RDNE
-MTQ2CgpDMjNDNDA5M0Y2REY5NDAyRDMxNzU4RDY3N0M2QkI1QkMxRjU5QjBCOEE2OUUyOTU1
-MTZDNjQwNzIyMTk2MDUyNzkyREM0MEU0RTNDNDgKCjAzMjY3Mzk4RDYxNDRDQjVDMjA2OTk5
-MTA3RDY3Rjc2Nzk0QUY1MDFEMzVCOEI3NzQ4MjM5NUY3Mjc5MEQ3ODhCMDc2QTQxNzk5MUJD
-MAoKQzRBMzYwMkYxOUYyQzA0MzE2MTY5MDFEQkQ3MjY4MEE5NTkxRjMwNzQ1QTZENEY5QThE
-NEI5RDY5MTE2QjRFOENCRUQyRkI4RjA4MjQzCgoyMjE1NkE2MENFMkZDQTgzNEI4MDVFMkY4
-NjdCRDA2QjY5QjU2NkUwOUVGMjFDM0I3QzJCM0U1QkEzNDEwOUM4QjY0RjdCNjA5REY2QUYK
-CjAzQzIzQ0VFQTRCOENCMTIzQkU3Qzk2MzdBQTQ2MTlDMjkzNDhBMUU3MTM4MkM3OEE3NkI3
-RDk3RTFDOTFFNjMyNzhEMjU3RTJFMkVBRAoKOEQxNkY2MkJFNzQxRDU5RUZGRDYwNjY2NkFE
-QjdCQjBBMzE5QkJDOTQ1MEMxMUVERUJFMzM3QzVFMDUzQ0ZDNTgxMTJGOEJFNjdFQkM5CgpE
-N0U4N0E3Njg1MTZFMUE5NzFFNDE5RkQ0OTAzMTQzQjZFMUI1RjlDRjQ3NTVCNUI1QjlFQTJB
-RjY2NTJBMzc2QUFCNkZENTRERDA4QkQKCjMxRDNEQTlDMEJBN0MyODgwMUMwNDhCNDNENEJC
-Njg5QjNFMkE3QkJDRUU5RTlEODBEM0JENzhBN0Q0RDk0ODkzMzc5QTcyMjhFRTVDQwoKOTMy
-MzMwQjUxQjBEQUQ5MDlEMDZERjRCOUZGOTI1Rjg3NUQ0RUUxRUIyNjkyRUNGMUEwMDI0NDE3
-MjczOTY5OTEzQUQyNUREQjhFRDExCgpCQTI0MDFFNURBODNFQzQ1MkM3OEZDNDlFNUJBM0FG
-OEVGMEFBRTJENTVEQkVENkFCMjFCNUM5MzU4QjFDRTA4QTQ1RTg3QzEwQzZGMzEKCjgwMUY4
-MjNFNkJBMEFEODgwNjA2NURFQ0JGRTAwQjlDOUFBM0YzMDBCMjc2NUQ0RDRFOUM1RDJBRTg3
-QUYwNUZBQjIwN0NCNUE5MDFEMwoKREI1QjI4NDA0OEE4QUEyRjBDOEY1MEJDMjk4MzU2NDQ0
-RDI2NzJCNkUxMUFERDEzNkU0QjY5MjZGNDcwNzYzMTA5RkVGM0FBRjFFMjEwCgo4OTVDQkY3
-NzEzN0E2MTQyRUVFOTU4M0QzMkMwNkJENzgwNTUwMjEyQ0M5QkNBMThCNDk0QTBCMEEwOTVG
-MjNFNEVDMkNBNjIyQ0Q1NjUKCjQ5RUQ4QUU5QTgyQjRFNjBGRkQ3QzczRjZEMUM0NjIwOTRG
-NDk0NkUxNjQxOEQwMjMyMDhEOEJBRjQ0NUUyN0M3RUQ5RjM5QTdGQzExQgoKRDRBNThBMEJD
-OTk2N0UxQzU4MUVDMThGODY2RjVBRUI4Njk4RTcxMDc1MEZGNEEwQ0Q2OTVDMzE0Q0EyNDgz
-QkYzRjVERjE0ODg4RDU3Cgo1ODc1ODc4OEYwRDNEM0FGMzU3RTA0RkM0NURCNThFREUxNUFE
-NjRDN0YwNjM2NEUxQjJDNjREQzE0Q0MwMzQ2QUQyODU1NzgwQThDRTcKCkZBNTM5QUYxNzI4
-NDgzRkZDRTgyQjM4OUM1NDZFNTU0RkU2MzE0MDZBNzkxQTAxQTFDRjg5OTU1NUUzNDYzNEI1
-MkYwMzlBQTk1MDg2RQoKRDY0QjUwNTM0RENBNTQwMTJGREY4NjdBNDE3M0Q5N0Q0MjBFOUY1
-Qzk3MDY0MkNCMTJBOUZFOTBBOTc1RUU3QzNEMjdDNDM1N0RCOUU4CgpEQjlBOUFGNzhERkM1
-QzA1NDNDOTI2ODU2QkQ0QkRBOTgzMzg4NzVGRDk1QUJBREEyNjBDMjE4NThCMzc4RDAzOTFG
-NkJCRjE1QUIwQkQKCjcwMjVFNjU3NTg4RDlFNjM2NERFMUVGQTA4ODEwNzgyOEZBNDI1MEU1
-M0U3NDg3RjhCRjg5MTk2MkYyNzgzRkUzMDUwMDJDRUQwM0QyNAoKQ0VGRjVGNkU5QzNFMzIx
-MUUwRDQwRkU3QTlFODMzMTRGQjlGNzJGMURBQTdGRDVCODdFNDQ3NUZFNzhGNTQyQ0QyMkFD
-QzRFNDA5MzNDCgoxNUNCRjE2QjI0MDA0MDQxNEFBRkY4MjkzNzFBNjdCM0Y2REFEQ0I3Mjgx
-NDEwMDM1RTcwMjRCNTY2MDQzNTZGOEQyNEQ4NzlDRjRCOTIKCkMzMTJDRTU1MzhDMjdEMzI2
-RDU2Q0RBMkRCNTJEN0JGQTAxODRFQUJDN0MxMTYwRENERTY1NDQ0QTFGM0QyOTM4N0E4RTJD
-NDFCNjMyRQoKNzc4ODEzRDNGMUUzMzVGOEEwNEYyNzdGMTQxNkRDMzA0MzE1OTU4RTM2NDFB
-N0Q3RTVFQ0M2OENEM0RENTQwNDNDQUZBQ0I5QjMwN0M5Cgo1OEQ2MjM5RTY3NTQ5MjBBMEM4
-MDgwNzgzNUEyRjEzN0FDQjNEMUY4MjhFQ0NCQkREOUE1NUFGQzY0NkVGOTNFQUMzQUZGMTEz
-NjU2N0UKCkRBOEY3NDFFMjQ2MDRGRDQzMjJCMjBGQkEzOUUwMzc0OEJFMDI3NERCQzZBQTg5
-NTdEMzBENzg1M0VCOTZBNjVBOTg3OEREOTRFMjU5QwoKMzhDM0ExNDRFMTI2OUNBQ0E1NkIw
-Qjk1NkM1QzQwQTZCNTk2NDI2RjQ5NUU0MzhBQkYzQTU0QjRCQkYxNjEyOTlGNTk0RUMzMDVG
-OTVFCgo4QkZGMkZCNzg4RTA2NjQyMEI5QzZFRjcyRjZDMjg1MzZENjZFNkYwMDMwOUJCNjlF
-Mzk2RkM4NjQ2MjZFNjdFODREODhERjRFNzQ0MjIKCkE4NDZDMjk4N0NDMThFNzBBNUI0MUUy
-NkI4OTdGMkRFNzlFRkRBNkNEOTlGNTk0NTY0REE5NDZFQzEzOTcyQUI2RjdERDczN0RCQjE0
-QwoKOTQwOTI4RTc4MzlERkNDMDM1MkY3RkY2MDU3NEM0Mjg0Mzk4MTU5RTQ3RDA0ODdEMkQ5
-NEQyMUU5MkJBMzVCRkYwNEZDNzRDNDM2NTJCCgoyNjQwNTEzMzcxNENBMTJBQUYyMTFFQTJF
-N0MzOTdBRjExRTlENzc1QzYxNDYyQTc0MkVDRjk5OTJCNjlGRUQwQzE1MkZFRDVBQTk3MDcK
-CjI0NzlGNThGOEQwRTI4MjlBMUY3OUE1MkVDN0EwREEzMTJGQUU2QjIwMTBCRjcwRDBBRjhD
-Qjk5OEY2MjZGRDI2RkUzQzUzRkU0RENFQwoKOTE2REYwRTlGQURGQTI4MDJBQkU5NDRGMEJC
-RkQxNjZDRDM5RUJBRDNGQTRDRTJDOUFCRjAwNzg5MzY5OUZGMkMyMTA2MDA0RjNGNDc3Cgoy
-NDIwNjhBN0ZDQ0FFNzlCODc5NUY3Mzk0MTAyNTM2RERFRkMxQ0JENjYyNTE0MjMzQjVEQ0VG
-MUMzRjcxNTYzN0JENjk1QjFFMDcxMzYKCkU0MDAwN0M3MjM1Q0NEQ0E5OTFCQUYxNzNEOTE1
-RDVDNUYzM0M0RkRGNjUzRDUxMTY2OTk3QjZBMTRFOUQyRjFCQzI4OEIzNEU0NEREQQoKQThE
-RTU1QUE4NTYyNzM3NDk4OEEwOEQ5NjVBM0UxQzg0ODdDMzEwQUYzMkQyQzBCOEU1RDM3N0Q0
-QjY3NTI5NTRFNERFRkU3MkZENzAxCgoxNjE1RDdDM0VBMjVBNjczM0VGN0VERUFBQkM5OTk2
-RDdGNkMyREQzQ0E2MkEyNDdFMkUzREE4MTE0QUIzNjMwQUY4NzI4QTk4NTRFODQKCjQyOUEy
-NzYxMjZEMTg3NTZFMTI0NTQwOTVFOEQzMEJFRTVEMzMyN0FFRDU5QzFCRkZGQ0NBRUJBQjAy
-NDQ0QTM4QTg5REU2REQzQUQ4OQoKNEVEN0U0QTVDNzYxQzhCQjc3Q0EzOUY0Q0MzREE3QTcw
-ODUyRTI3RTg4QTRENjIwMEU5MjJBRUY1OTNGMDkxMjI2M0NGNDM4MUExMkVCCgpEOEY5NEFF
-MjJFQUJCRDIzOUVDNUU3QUYwM0VBOTEyMEY0REMyRTgyNTNENTU1MUNDRThDQTYzMzY3MTRG
-N0I0QTRDNEI0Q0U1NjVGNzEKCjI2ODVFMTM2NzZBM0I0ODgzMTE3Mjk0MzJFRjI0Q0NGOEJB
-NDgyNjVBQkVFREIyRkJBNTNGRjIwODdCQjlDQjk2ODJFOUREQzk5OTE4QwoKMDA4RkIwRUIy
-OEVCMUI1RDlGRTY3RUE5RDJENEZERTFBOEZFMUQ4N0NCODJGODEyNTg1MEE2MEQ5MjQxNjFG
-REQ0RTdFN0RBNTk1NDMwCgoyMzM5Q0Y2QzYxOTQ4OTQ4NDVDRTVBREJDOTc4ODNDQUQ3RDM2
-OTU3NDY4NTZBQ0YyRUZBMjFEQTVFQUQzM0Q0RkY4Njk0Mjk4RkY4QTUKCkFGRTlDQkIxQzZG
-RjE3NDMxNzlGM0VFODJBQ0U1QUQyQkY4NjQ4OTM4M0E5N0YwNUZCQjE4MDk4ODlEOUVBMzM1
-NDRDMjYzMkYzM0VDMgoKNzExOUIzNjcwODI0MzMyRTdGQkNGNTlDNzFDMDgwQThFNTlBM0FE
-Q0EzOTI1QzY5RDRCRjE4RjFFMkIxRjdGOUMxODRGQUY3QjQ3REYyCgoxRDc5MDVCNzhFRTkx
-QThCRDczM0Q3NTVBMDQ2NjI2QjI1ODY1MTZDRDM1MjdCNkVDMDlBOTA3ODRGNUMyMkJFNTQ2
-NUMyNDk2MUU0MjEKCkI4RjMzQTE0RjI4MENFN0JCMEIyM0Y5NzAyMzYwRjU4QzM3RUU0Q0E5
-OEFDQjQ3RTNFRjhCQjFBOEE3M0Y5QjA4MzU4NjMwOTQwN0JDNgoKMUIzNEQ2N0E1NDE1N0Uz
-NzI4RURFNUE2QTlEMkRBODExQkNBNTIxRDk3QzY2RkI0NEM3NzI1QjY5QUFDMzU4NTI4RkJE
-QjY3NEIyNTU1Cgo3RjAyREFBMTlFQjRFRkM3MTQyM0M4OUY4Mjc3MzcyQjAwREI0NUU3ODNE
-QjI2MUJERTZBNzM3RjY5NzIwMThFNThGQzM2RkFCNzJCODIKCkU0RUI0OEJBNDVGQkQ2REE4
-MDc4Rjc1OEZEQzExNTVDMDZCQTdCQjQ5NjlFQjgyQTVFQTYwN0YyNTdCMEJCNjQyQjkyMzVD
-NDE0Q0JDOQoKREM4ODJFNEIwMDEyQjlBNjAyNEI1ODRGRTY4QUJDQjBGNjBDOEJDQ0Y4RTE4
-MUFDQjc3ODNEQUVDOTlCQzdBM0E4QUYwMjhCRERDRDBGCgo0MTBDOTQ1RjA3NzkwQzA2RUE2
-Mzg5OUYyMDEyMzI3QUQxNjA1NjJERDAzOTBERTU2NEQ5MDA0MEFDMzAzNzU5OEM0NDQzRjA5
-NUZGNkEKCjNGNTI1MEQ0QkUwOTQxOEVBNDMxNThCMjc2NjFCQzI1MDBFQTdCQkYzQjkxMUM0
-N0ZFODU0QTgxOTIxMzgxMzY4NERDNTk3RkU1OUFCMwoKRURCNEIyOUFFMUU1MUFGOERGNUE5
-N0VBNUIyQTM4NUIwMjE5Q0FBMjQxM0U3N0M4RkZGMEFDMTE3QUQwN0RERDEwNTQ0NzRFRjA4
-Q0UyCgo2OTg2Q0I3REUwMEEwMTA4OTM0N0UxNkYzNkMwNkQ2MDgzNjQyRUJCREU0MDJBOThB
-QjQ4Rjg3MTc3QUY1RjZCOEYwMjM0RTMzRkM5OEIKCjAyRTNDNzhDMDgxM0E3NDY3N0FENTI0
-QTMyOTIzM0E0Qzg5QTY5MUQ3NTY5QkM1RTI1QzVFNDZEMTYwRkNDNjlEOTVBOUIxQkM0N0ND
-OAoKMDY5MTdFRTQ0MTU0NkZBMzQ1MEE5QjMwQ0M0QzRCQjRFN0NCNDYxRUNGRUM3MTE1ODkx
-QTI1MkRFQjI5RjIwNkQxRkI3MzMwOUI1MjU3Cgo2QTlDMUZGQTQ4QzgxNzM5MTY3QTkzMzk0
-NjA0QjFBOTFFODZDQkJCNkQxNjRFNUQ3NjU0NUM3NTE1MkRFMkUwQjRCMDlGNjVCRUYzRjMK
-Cjg1Qjg0RjI5RkE3RkQwQzk0MzRDOTM1MzNEN0VDQzRERDhFMUFFREFBOEIxQTIzMUVGRjYy
-NjZCNjYxRUU1RjRFQ0Q0REVFQjE1NEZBRAoKNzAyNkFDOEZFRTY3MDgzOEFDOTg2RDQ4QURC
-QjE2MEE4NzNGOUNDOUY2ODdGNEY0MEE1QjZBMDgyNzEwQTYzRDEwRjkyMzkxRjM0MUQ1Cgox
-MTQ3N0FGQzg4OTk0RTQwMTZCQ0Y2RDFFNzYwMEQ1NUFFRDZFMDJCRjAxQjVDQ0ZCRjBERUZC
-QkJCNjk3RkVBQjNDOUIwMTI4ODJBQkUKCkUwMjQzMzIzMzBEQjAyQ0U2MUVCNUM0M0M1RUJE
-Rjk2RkY3OTkyNDlCRjY0MTAyRkY2NzBCOERCQTI5RjQ4MTVDMUE0RkJDQ0YyM0IxNgoKNUFE
-OUU4RTU3RjU5NkE4QkNGNEMxREQxMEVFNUEzREQxMENBMjBCMTY3NTgwOUExRDI4QUZGODVB
-NUM0RTkzRDUwMjBEQzdBNDVBMDUwCgpDNzIyQUY1M0Q0MkVFQzI5REZGMEU5MjRGOEE1NEY3
-NUY5NjExRDZERjA1RTFBNDM2QUMwMUJFQzA5REMwMTQzMTU2RkZENDdGMzIyNjUKCjlFMEY2
-OTY4RkUyRkQ2MzA3NEVFNzdCRkU4QTRBODY2MTMyODMzOTMwRTEyOEM5MUIxQ0NFRUM3MUJD
-MDJCQUU4MEREMjU5ODQ1MkNCOAoKNEIwRDc1NkU4RDBERENBM0Y2NEQyRTY0QUIyMUM0ODJG
-RkVENkE4NTlCQzNCNUQ2MUYxREI4MTJGRUUxQUYwRDQ4MjIzOUZDQjhBNEM5CgpCRUVGNjMy
-MDY5NjM3QUQ0ODA1MERBRTAxMkY5MUFCNEEyNDQ3NTE0MDNDOTgwQzUwRUU0NEJFMzhEMzNE
-NzY2QTI0MjQyNjg1OTdCQkUKCkQzNkUzOUI1OTU2OTNFRkEwMENCQjY0ODIzNzJCMkMyMEVE
-ODk1NjM5ODNDNkNFREQ1RDI4ODE5NkQ0OUQ4REZFNDY3MEM0QjVGNDU3QwoKMjFDQUY5RDg5
-Q0E3QUM5RTAwOEIzRjg2Nzc2M0EwQTIzNDk0RDRGM0RFMjI5Rjk4M0ZDOUExMzM1MjVBNUJB
-MzNCQUIxODRCNzNBQzQ0CgpBRDg1MTAyRkYxQUE2OTE1RDYyRUYxMEI5OTJFOUI3MTU0QTZE
-Q0NDNDc0REYzNkZBNjY0MUZFNzQ3QjFFODBGRUE4MEREQkE5RkMwMDgKCkE3MUUxNTUyQTMw
-Rjg3OTU2QTZGRTI5OEQ1NzM3QkNFMjg1REFCMUY3NDY2MjJCNjE0MEU1NjMyOEREMEIzNDNC
-QjdGNkVBNENCNzNBMQoKQUUxNDQ4Q0NEMUJCRDFBRTdCOUY1QUVFMkE5NkM1NUQ0QjUxMUIy
-QzM0ODlEOTY0RjZDQUZCNzA1QjE1ODcxOTJDMUI5MzYxM0RFMjYxCgo0OUY2MjNBOTc5QjFG
-QzhGODQwNTkwQ0YyMkRBNkJENTYyRTYxQzExNkQ2QzVCNTQ2MDAyOUNCNUY0NkMyNjYzRjgx
-NDI4NEY1MUMxOEMKCjBBQjFGOTk0QkVGMDhDQzc3NUI4N0UwNjYwRDhFMzk2RTQ4Rjc1NDY3
-NjgzNjE3NkI1NjgwMzREMjZCNUUzMkY5QzAwQjVGQzA2Q0JFMAoKMEMxMDA1OTU3RDIyQzc1
-REUxNEM4QTY1NzA3RjgwODFBMTI5NTVENEVBNTY2M0Y2QUI4MjNFRDNDNzA5NjI3Nzc3QkI3
-N0FBQ0YzRTlGCgo3RDQ0MzAzQUU3OTMxQTAxQUMzMzQ2NDkxMTk0NkZBNzkyNzA2QTM4QUFB
-NjQ1MDI1MjZDMDY1NDhEMjIyNkIxMEZDNDVBQjMzNzhFRjgKCkEyQjdBOUU3OTYwRTA4RDcy
-RUUwOEU3MUU2M0UxNDlFQTU2QTk0MUVDQ0E5MzhEN0UwRTRBOTQ2OUI4NUZGMzIzOUYyMEUz
-RkU5MEE5RgoKMzU5QUFBQjc2MjNDOEZBMjFCQ0VEN0I0MUQ5Mzk3RTdDOTc2MjdDMjBFMjI5
-RjI2OEQzRkNCRjU0M0RFQzczNDI5NzE1M0U5MTY1NzRDCgpDNDcyM0NFNTQ4REY4Q0MxODdB
-NURGMzg0NDg0QzgxQTkyMUE5MEU5MUU2Q0NBMEY5Q0IxMTI3RjAzQ0JDMEUwMTg0NzYyNDI4
-MTJGRDQKCkM3NUEyNEU2NzVFQUQ3OUY2MjYxNTA0RTcxQ0NBM0U1MjM1RkM3RUI0Nzk4MjU0
-MEFBNUE3NTREMUUyOTYyMTM2OUQxRUE4RURGMEJFMAoKOEQyMDk0Mjg4RDAzRDc3Q0ZFQTg1
-RjA0RDE3QjNGNDFCMDdFNkU1NzY0OTBCRjEzMUQzRjc4MjI3RDU2OUYzNjkxRjAxMzVGREQ2
-RkYyCgpEMkIyMTJEN0Q0MTIxMUExQjdFQTJDOUZFMkQyRkI3OTA2NURCNTMwMTQ5ODgwMkI2
-RTFFODE5NDRDNTc5OUFBNzhFM0RDNkZDNzFCOTkKCjVBOEM1Njk1MDFENEYyNDQzN0RGM0I1
-MTBBMjM4RkJBODEyMEFBRkY1ODIyNzI4NUM2QTEwRDA3NTZGMDRFNTE3MTBEMzRDNUIzRUMx
-MQoKNjMyQTg2QkREREE4QUExMkE4QzVGNDg5NDhFMzY3RkU1RURDRDNEOEVCODVFM0QyOTU2
-MDJERTE5QkMxRjVEQUU5NkUxQTdBOUNFMTkyCgpGOUY5REFEMEI5MjFBOTU3MkVEMUQ5MkRB
-QTlBRkFDQTU3NjE4Nzk0MDBGQzFGMTFGM0FDMEMxRDNFRjlCRTVFQUU3RjdCQzk2M0NDMUYK
-CjE1QTNEMzZCNEE0QjI3MjVBQThEQkM3N0M2MTkwNUVBODIwQUEzQ0MxRUFDQUZCODE3Q0E1
-MzBDMzJGNkQyODFGMEY5QzQ1RjE4REU3NwoKMDlBQkYzMDUxQjU4QjVCODU3MzUwQkNGN0Q4
-M0Q2MjFCODlBNjkxN0YyRDMxRkNDQTMzRDdGODQ5QTc4QTAyNDExQTE2ODA1QjU0MkNCCgpC
-QjlFQ0EwODdDRjMyMERDOEE0RTRFRjZBMUIxOTEzQTU0M0U2MkQzNjExRkQxMTk0QjAxOTk4
-N0ZDMUI0NTQwMzdDNzQ3NzNBQTVEQjgKCjNBOTE2QUZCRDU4N0MwM0NBRTJFRDdCREU0QTcz
-ODcwNjA0MUIyRDIzMzIwMzlBN0RDQUZDQzQ3REFCQURGRUFEMjdGQ0Y3MDcxM0RDMQoKNzUx
-QUUzNjgxMjY3OTYxRUUyQ0NBMUIyMTU5OUMyQkEzRjM0NDhERjRCRDBCRjZEMDFEOEVEMkIy
-QjcwRTZBNDI1ODZEOTg1REZGRDcwCgpBNjVCNjVBQTJDRTVBQTE2REI2RjVCOTIyODQ0NDlC
-RDdDNzJEODAyQjM4NENCNjNFRjdCN0FFNTFBQ0YxNkJFNTc1MDY4MDA1RUExQzEKCjI4OTk4
-NzNFOUZBNzZDQkI2MjY2MzJBRjQ3QUQ3QTBGQjNBQTY0OTlERUZGNTQ3NjI5OTEwQTFCMzAw
-NzhGMjNDNjUzOTY0NDZDNTM5OQoKODRCQkQwRTQxNjQzMDc5OENFRjgxOTZEMDkzRTMxQjVG
-QTY2NTA1NzRGMzBEM0ZDNDc5MTc5RjAwQTM1MDcxOTlCREU4MkJDNzE3M0IwCgo0RUM4MDE1
-Njc1QUU0MkU5MkUwQ0MwRUY3RDlEODA5RURDNkZEQjEwMzY1OERBNzhERUQwNzVGQzYxQ0Qy
-Q0FFNEVBRkYxNDU4RjEyNjEKCkQ5QkUyNjE2NDJERjMyOUMwQjBEREI1NzEwM0MzOEU4MjNF
-M0JGMDlDNTk4ODEzODhBQUY3RThFOEJFNDE5MEI4MTFDRkY4M0FFODRCOQoKNjY0QUNCMzA4
-QUFFRTI0MjUzREIwQTU5NTIwM0JEMzA1QTE5RjJBNDFBMDU0QTYxNkNGMDI4NTBBRDREMDAw
-NDVFQzAzNDc5MkE3MDEyCgo2RTdGMTBDRDM5QzkxOUM1RTZCNzdCMkY2MzEwODI2NkFDMzg4
-MkI2RkU1QUNENzMwQzRBNzlFQjQ1NDk2MDREMzFCNzBCQjgxRjlEQTMKCkIzRDhCRkFFMUMy
-QTdBMDAwQTU4ODRDRUMwMjVGRjQxN0QyMDM2MkE5Mzc0RUNGNDA5MzZFOTNFQjc3MzYyQ0U2
-NjM3MEYxNjkyNzEzNQoKNzRGNjBFOTU2QTY5Q0ZCQjcwQkI1OUEwQ0M0OTdCRENGOTEwODc0
-OEI1NDY2MEFCQUYzQUY3QkM1N0U3MEJBQjE5QzRFQzY3MzgxQzBBCgozNjcwOTA0MkFGRjk0
-MDRDRDYwMzlDQzIwNzdDOUJCQTU1MjQ5QzY1MDk3OTc4RDIwRTVBRTlDQ0UxQTI3QTc0NzUy
-RUJDRDRDNTM1NDYKCjNDNzRCOEQ2RUExODdDMkQ1NzVFODlENUNGOTAzOERBQkE0RTVCNkIy
-NDBDNUE4MjYyMzVGREFFMEYyMkU4QjREMjlFNEE4Q0RGNEVENgoKQTkxODc2RkYwNkY1QTkw
-MUI2RjM0QzlDODEzMkUyN0FDMDFCNkI1N0FFMUIzMTJGQzFDMjc4MEU5NjMwMjg2QzkzM0ZD
-NUFEODRCQ0UyCgpDRkQzRENFQTFDN0Y2MjFBMUM5Njk1RDY1ODk1QzMyRjkyMjZEMTRFRjMx
-QjQ2MUZCQjk4RDRFRDNDMkVFNjI0NzdENjY1Qjk5OTkzQTgKCjBGNDI4ODVBMTJFNDU0Q0Y4
-RjQ1Qzk2RTAwMkJBREM3MjE1REUzQjEzNDFDMTFERDVCNzgxNjdENzZEMTM1NDYzMDdCODkw
-Rjg3QTE5OQoKRkMyQ0RCOTUwNjRCQ0VEOEZDNUUwQjUwMkU3QTU4OUVBNkNDMzZGMkI5MzVF
-MDVENkI0Q0JEMzhFMEMzQkI3MTQ0MUYwNUZEMUYyMzRDCgo1NDkwNTRBRjdGRDgwNjUyNzdB
-RkRCODkxNDlGREI2Q0Y2NEE0RTUzNzVEM0VBNjA5RDkwRDk0NUU4N0E4QTJBQURGN0Q1OTY2
-N0FERDgKCjE2RThDM0Q5RjkzQjA1MzQ4OEY0NDA4MTc3MDQ4RUE3N0EwNUY4QjM4M0UyNDkw
-MjJFRDM4NTNENkZBRkQ4NzVGQTM5NzU5QUQzQkU3QgoKRUE2QTI4QzQ5MzEyRDY4MjBFRjJC
-RUFBRUMyMDU4Q0Y5NzU2QzlFQUU1MTdGQzA2QkZCOTgxNDEyNjZENzBGMUY2NTFCOTBBMDY5
-REVCCgozQTJFNjU4OEQ5QkZDRUIzRjRCNUE4RTMwQzJFODI4MjkzNzZCRUM5NzlBNkJDRjNF
-NERDNjlBNkZFN0JCQkYwNUI2NjM5Qjk3MTkxMzYKCjFBQUEwOTlGNEJDNDA5QzE3OUUyNTI0
-NTJFOEM4MDJBMTUxN0Q5QzZGREEzRkIzMDZFQ0JCQUJCMkREMDcxNzQ0ODQ3NzY2ODdGNEVC
-RgoKOUEwOUFCNUYzMjE2RDlFQjg1NTA4MTI1QjIzOUZBMjI4NjdEOEM0N0QyOTE5MzkwRTZG
-NTYwNkRDOUREQUMyQTJDNEU0NDVGQThGQ0Y3Cgo0RTczQjA2QzZDODgwODVCMTE2RUUyODc2
-RTFEQTgyMEYyQzRBMkVDMjlFMDM2MDY4RTVFNTJCRDgyRkJFRTQ3RDY3MUIwNDBENzU3NzIK
-CkE5MzMxNEFGOTI5Nzc1M0EwMTIxMkZEMkE3NjI0REY4OUEzMDZBMTk0MTI1OTI2NjI2NDkx
-QTNBRkI3MENDQTVFRDBGQjE0RjYxNjlBNwoKMzRGQUNDM0QxQkM2OTM4NzE5ODVENTFCMDlE
-QTc1REU5MjdCMEY1RTU5OTZCQjNGRTM4NTMyMjUwRDc2QTZCODc2NzhBRjEzMzMxQTBGCgpG
-N0EzNzcwMEJBQjMxNzFDNTExREVDODhFOTk4RDI1MDBGRTBENzJEN0U2M0REMzVBRkE5ODI2
-NjQwNjVGRDJGREM1OTk4QzlERjhFNTEKCjY5QzNGMDM1Mjk5QTVEN0M1NDQ5MEIxNzVDQTQx
-RTQzODgzODM5QTZDOERERUM4MjEwQ0UxMzE2OTU3NzdBNjA2MTMzRTIzRDM2RTY0MwoKMzMw
-REUwRDcyMDVENTNCODhENkVDQjVCRTZEOTU3OTBDQzdFQjdBMzNGNTQ1RkEyQjFCMUZDRDdF
-ODg3OENENkNCNUUwNDJERUU0RkUwCgo4NzlDQkI4RjBCMjFDMTU1NTg4QjA2NzJEQzZDOEY4
-MzI2NDhFMjk5NTE5MjU4MDE2MzE5QjNCRTcyNUQ1ODY4NEM0QkU1RDY5MkZENTAKCjI1ODkx
-MjIzQTU0RkUzNEYxMERFODE2QzQwRTVCNDk0NzAwNkFDRDgzNURDMDFCMkFGODRCRjQzODBB
-MkQwRDU4MEFDMzg3OEY1RDQ3NgoKREUyNTY0RjMxNTIxM0Y3RENENjY3ODUyNDA5NEU4NUNB
-NDlCQTgyNDk5QTVDRDY5QjU5Nzg3MUVDQ0ZCMDVDQ0M0NzkxQjhCQkJFNDVECgpFODIwRTFG
-NDAyODg1RDk0N0YxQUU2MjI1NDUxRTVDMzNDOEU2NUY3RDc3MTRDNkE2RTU5MTMxRTg1OTlB
-NEIxNkVCQkVGRDJBODZGRTgKCkUyNkQ5Qzc2RTM1Rjg1RkQ5RjhEQjZFRDM3NjBCMTIyMjRF
-RDM4OTc0Q0EzOEY4OTRGMDMyMkNFRjg2MzRGQ0E2RjRDNTY0M0I1RUFBNAoKRDlFNjUyNzRC
-QjVBMkEzODFEQkU4QTEyOEJDODhDQjRGNkUwNEMyQzVDNDQyNUYzNDc0NzlEODYxNjRCQUEz
-RjE5MDAwNTA1Q0JCRDI4CgpCNTJDRDNDOEEzMzc3NEY0NTk5OTEyOUY1MUE3QkYxOEE1NEI3
-MTczOEM1MzRDNUZBQUU1MDEzMTVFQTU4NjlDNkQxQ0ZDNjdEMEFCOUQKCjU4NEI0MDI5NDQy
-NUFCRTM1RjJFOTIzMDI1QTcyMjc2Mzc4NzZFRDNCNzQ2QjY2NzRENTJDQzREQTY3OUQ1MzE3
-REVGMEVENTdCM0M0RAoKOTMwQTk2QzBGQjY5MkRERDJDQkNEMTEzNzk5RkM0QzgwMTQ3MTk3
-QjdCQzlGOTUxNEFBMEE5NkUwNzhDMzYwMUIzMkE5RjY5MERDM0FFCgo3MEY0ODFERDQ5Njg5
-OTVBRjY0NUZDMEU5N0FBQTIyQzk5MUFDMTFCRjNBNThERjQ2RkY4NENGOEI3NkUyNDhCMjNC
-OTk4NTAzOEU3MzcKCjBGRTY1RTBBRTU1Nzg2NUYwRUVDNjNFRDdGNEE5NjQxQ0YwMjgxMEUz
-NEI4NzY3NUZEMDhFQkM4ODAzNjg0OTFGQzZDN0QxQzlCRDI3MwoKNTU0NEJEQzk1Q0UwREEz
-RkYxMUJGODhFOTY4MEE4QzhGOTFFRkQ2NUZEMDRDMDA5NERDOTRDMjlEMDA2NzM4Q0QzNDBF
-QUUwNTg1RjBFCgo2NThERTJEOTkwNzIxODYxMkIyMTcyMjhDREZCOEZCNDg5QUVCRjdENUMw
-NUM1OTYyRjY3RTBBMzk5NzRDNTY2NUIzMzIzNTNGQUUzNDEKCjlCMTA1ODM5ODQ5Q0RCODQz
-RTkwOEVGMTg0RDBERUEzRjRCMUM3NjY5QTk3QzAzNUE4NkZCRUNGMkQyREE5MDVFNjgzODMx
-MzE5RDYyNgoKMzg5NUREQkUyMzhDRDU0OTNDNzlGOUVBMTk5NTg1NDVGQkZGOEIwODhFODZG
-NkQ4NUJBQjZDRDdGQTAzQ0I4NkNCM0FCOTA1MzI5QjZCCgo1Mzg0NTZBMUM2OEEyNjBDMTM3
-RTQ5N0YyRDdBNjI3QzM4RDU3MDMwMjcxMjA5REJFNEJCRjJBNDg0NzQ1RTZGQ0I5RkE5MzBB
-REJCNjEKCjlGNjQxMThFNzc2MjA5MjU0NDlERDZCRkE0QUQ4ODM4QUY4MUJFREQzRkU5RDBD
-MTVFMzdCQTQ4QjMzRDYyMDFDNjcxMEJDQzMwNjRCMwoKMTZCNTM1RTA3QUZGRDYwNjVDRDVB
-MjczOURGRDA2MUMxQzQ2NEI0QUM1NTI2QzRFOTNENEYzMkIxRDA5Q0E0MjAwREFDQjc5REM4
-REYyCgo4QUVBNkMxRTlCRTI0NDYyMjJFOEZFMTQxNzg2RkU1MTQ2QTMwODAxQzA0NDlEOUU3
-MTQzMjI2OTQ4ODYzRDU0MDI3MTBBRkVDNDNGOUMKCjMwRDg1OTE1RTAzNTRCOTZFOUJGNDM4
-RTYyRjlGQzNFNzRCNTU5OTU1NUQwQzcyNDgxRkNGQkI1MTM2RDRDMkUwNjRGOTA3OUU3MjU1
-MgoKMTVDOUU0MTY2RUUxMzBCQUQ4RUEzMTU5RjE1NThFNDhBNEQ5OThEQThEQTFCMDAyQzcy
-RUZDNEYzOEU4REI3Mzk2REUwMzFERTU0OEY5Cgo3NkRFOEUwQzExQUQ0Q0QzOTZENEExMUM1
-QjczQzhFMDRGRTA3NDZBQzMwMEQyQ0QwNEQ3RTlDRURDMUQ3OEZCOUUxMkE4NEVFMjI5NkQK
-Cjg1NkI4OTA4RUFBNzIyREJDRDlDN0U3MkEyRUE0NTc1MUZFMjM1QjQ4ODc5QkE3NjEyOUY0
-MTIzMUZGM0I2QTMxQUE1MUUwRjhGQkNEMQoKNjVCODhEQkI3QTM1M0YwQjA0QzU1NzI5QkQz
-ODUxQTRGRjMyQjc1QUVENTlDQzlBRDQ5ODUxMUE2QzEwNUU0OUYwREZDNTY4N0U4MjkxCgpD
-MzBBNkE4MjZERkQzQzA5QTBDQTg3NkI0QkU0OEEyMjJDRUNCQkEzOTBDNUREODNCRjUxRTZE
-MUM3MkFFNDYzQUNBNUFGNURFOTNERTIKCjU3MjdBNEQ3MEU3QTI2N0ZCN0EwQzEwRDVFQzM0
-MUNERkFEQkQ1NjkwNUU3NEJCMDJGNDQ2RjkxOThDQzhEQzkwM0M1MUFCQUJFOThGNwoKNkU3
-NTg1N0UxRDhGMTIyMDEwOUE4QkM1NjVEMkNFQjdFM0I4MDlFMTZEODlBODNEQ0EyRDlERTBB
-MTU1NTIyNTAyRkQzNkU5REQ4Q0M5CgoxNzU0MEQ0REVDOENFMjA5RjEyQzZENjA3ODQ3MEE2
-RTVENjVEQzY4NUMzMEVBNTgxRTNBRTUzQUZDODcyOTkzOTQwRjBEMEM4OUZGRDQKCjFGNzRB
-OEZBNzMwQkJBODJGMDI5NkE5QThGMTMzODEwQjRCREQ4OTAzRTcyMkM1Rjk1QTg4N0I0MTMx
-RThDNkFGQ0QxNEYyOUZGNDIwMAoKNkYwNEFDRDBGMjU3MEMxMDNGMTU0RERENEE1Q0YwOTE2
-OUFENTY1NDI4NTUxOTUwOTFDMDVCNzEzNTIxMzRBNjU1RTZCQzg0RjM3NjQzCgo5M0ExMDYw
-NTdCNzNGNThEOEU3Rjk5REM5QjBCMTZFMUJFRDQ4NDVDQ0ZBRTYzMjUwMjk5RjBCNDU2QkIy
-Q0M4QjkwOTk5RTYwNzNDOTIKCkE5RUZEMjRCQjJGMjM5ODQ0RTQxMkExNUM3NzgwQkUzQTYw
-RkYyQTY4Njc3OTQ0MEIxMUU5REUwQzQyNTQ3QjNEODlCMDU1NjI5QzI2MAoKREE3OTg5MjJC
-QUE1NUZGRkYyRDEyNTNBODVEQTkzODlDOTI4NEEyRTQ3QjYxRjlBNUNCQjIwRTlFM0M5MDZB
-QTk0QjIxMTY3N0YwNzE2Cgo3MDdDMjhDMzk2NzY5NDMzMTRFNTJGQzI1MERFNDlFOEEzREIx
-RTA0MjQ0M0I2NjU2OEFBMzdEMDcwOURGMDRFRjEzNjJFNUI5QkYwODMKCkQ1OUNEM0JDREZG
-NTBCQkIyNkI3QzhDRTM1QThDNERFOTZGMkU0MERCRDlEM0NDMDRDMzk4NDE4NDRGMzBCMzFE
-RDI1ODI5QkVCQjczMQoKOEQyRTFEQjI5MDk2MEY1NEQxNDk4MDk1RDIwQzZGMDVGN0RCNTdB
-M0E5RkRDRTVEMTU0RkZFQkYzNkVENDE4QkY1RkMwOTY1QkY3QkVCCgpEMTZBQThERDMxRTU2
-MjA5NUIwQ0Q3MjFGODM0OUMxNDc2NjkzRDhFRTM2OEVFMTQ5QzNEMjQzNjk4RjU0RkJCNUNG
-ODNGNjVBNkYxNjkKCjNCRjE1MDE3NzU0MjU5OTk0Qzk5M0M2NzZENUQzQjVFMEU4MDVBQkQ1
-QjUxNzVFQzU1QzNEMUFFRTZFRTc2OUJCMUM2MTQ0MjZEM0UyRgoKMkEzMTY3RUFGMkIwQUY1
-QkI2OEYwMjRDMzUxMjU0ODdDM0FDNjcwMjI3RkM0Qjc4MUJFMkM1RERCNjMxMEI1OTgxN0FC
-RDgyRDVFQUZECgo1QUREN0JBNEVDMEM4OURCQzY4RDAzQzEyRUZCRkMwNTEyMTgxNzk0OTRC
-MEIwMURBNTIzMTY1NzE3RDFERUI3MDY1NkM1NzNCRjcwMDIKCkE2NkNBRTRFNjlCNDJBQjc2
-RDIyRTZENUMyREEwNDMxMDM2MDRGMDZBMjk0NTkzMEY0MjFBRUY5QkIyOEZGMTA2N0MyOTdB
-NkQxMEU1NgoKNjIwOEExRTAwMUJDOEUyNTE0REM2QTk0QjU1OTAzOUYxMDM4MUE1QjAzMUNG
-QzczQjk1OUZFMUQyNzBFMDdGQkMyQzREMkFDQkU4OEE2Cgo4OEUxQUE0RDlGNDQxQjgzMUI2
-RTFFODNFRDRDMTAwMUIyRjM5MzI2NDk0ODIzNTMxMkU4M0YxMkZGMjRBMzNBQThBMzMyMjky
-RUJFRjgKCjk1MjY5Qjc5MzU2MjczMDQ4Njc0N0FGQjc5OTM4QkE3OEJFRjkyNUNFNEM5OTRE
-MUQ1OEM1MTE1Mjk2RDI3RDcyNzVCQzQzNThBOURBOAoKQzhENTIxQzJCNTVGNTA1N0MyODU0
-Q0JGQUUwQUQzNjFBRUQwODNGOEE2MzcyM0Y3RTUzNUM4NEZFMjU1MDQzOTg0RDVBQzM4OUY2
-NTUwCgoyMEEzRkJBRTQ4ODMzNjZBRkZCOURDN0QzN0Y0QkU0MkEzQTQwQUE3NDc3MjFENzYz
-RjNFODIwOTM4NUY4MjNBQzFENzA3NkRCODFDOEEKCjAwQTMzOTk4Q0JCMkU1NzREOUM2NTU2
-M0U0QzI0NDI5REZGQzBCOTkyQkYzNDc3QTkwODkxQUQ2QzY3QkYyNkFDMERBMzNFRDNBMjZC
-RgoKOUE1MjNERTRBOEEyNEE0RUVDQTM1ODFCQkJBNkIxODI5NjFFQjdBRjRGQzJGNTY5MDRD
-Mjc4MzdBMDAzNzNDMEE0OUY4MTIxQjlCRDIxCgo5N0YwQkM2NTU5MkVFMEYxRUIxREY5M0U4
-N0Y0NTE0QkM1RDc2MDU3NkUzQTM5QjE4Njg0NjgyQzBERDg0OTZGQUY5MzlENUZCQzkwN0MK
-CkY3NzY4Mzc5MkRERUI4NkFBOTAyQzhCMjIzRUQyQ0Q5NUQ5QUQ5REJENTIyMTVBQTA1RTY5
-MEZBMjI4MzFFQzFFMjMwOEM5N0I4ODJBRgoKMkYxMEQ1NkRFMDhFQzUyNkI0RUQ2OTZBMTYw
-RTEzOUI1NDA3MjY4RjFFMTdBNzEwQkE0RjcxQTgzREY1MzE1NkE5NUIxMjI0RTVERDE2CgpC
-NEYzRUFERTA3QjU3RDlGQTA2NERENDg3RjRFODRFQUYwNEM2OUNFRTJCQjhEQjg0MTE4NDlC
-ODgzRUQ4MTM4RTIwMjNCODJDQ0EyMjIKCjgyM0UyNEY4MEI4ODE2OTM1QUMzMEJDRTE4RTkw
-NTZCNEU2MDk4QzdBNzhBMjUyOTczQUExOUE2RkQwQTg3RDQ4NjE3MjkxQzNFODZDMwoKQzYx
-NDBDRDIyNUIxMzkwNzBCMkU1NUY0QkYyQkQxRTc1MkREMkY3QzJDMDE2MzkzOEIxQ0FERTZC
-ODBFRTBFNEEyQUI4MTE2MzkxNTdCCgowMUU4QjExQkIwMkY0QzNEMDlGODZGNkExNzhEMERF
-NUZERjgwNEYxMDJGNDhENjZGNTg1MENCNjg1NzQ4RkMzREU3RTBBNjU3RUI3N0UKCjczMTFF
-OThDQTgwRDk2RTdENjBBNkExOTIxRURFODU0NDE1QzM2NDQ0RkMxQzRFOTBBQUEzMkQ2NzVC
-RjZCMzZFQTg3ODE4NjE2RUE4MAoKMENEMTI1OUVBQ0VBNDEwNUYxRkFGMEQzOEFBRkMxQkM0
-MjdBNEIzQUI5QzgzRkIyMkFCRThCQzJFNjA3QzFFRTVEMzg3MjAwODFFQzRBCgo2M0EyMTc0
-RTRDREI0NkVBRURDMUQ1Mzc3MUU3MkM3NjNDN0VGOThGOUNFOUU2RDkzQkU5OEU1MDM1NzFD
-QTE5OTEwNjY3RTk5MDBEQzEKCjY1RDc4RUFEMTBGODc0OEQyQzZDN0JEOUFBNTU3MURGNzk4
-QjYyNkUwQ0NEMzkxNDE1RUYyMkQ3OEFERkIxMUFDMTgyMTQ3QzUwQTE0QQoKMTUzRkIzRENC
-MDkxRDM3MjkwODkxQzNEMUM0NDAxMjcxNkU4NEU3QUEzOUI1NTA4OUQxMzM3MTgxOTUwREE1
-QkY1MkUzOTcwN0UxQTc1Cgo0MzU4MThFNDRGQzAyNjlGNkZBNEUwMzRDMThCOTRDQzBDNkQ0
-NzUwQjQzNzJEMjhGMjRCOTgyOTI3RTVCQ0M5MTBDNjZGODI2NEY2QUQKCkI1REQxMUFBNDY1
-MzRGNkYwNTdDQ0Y2NTBFRkQ4RjFFNTY2NjdDN0I5OTU4RDU2MjlCMjI3RTEyMDM3QzA5OEM3
-QUI1RDU5ODZCQzBEMQoKMkFFNUFFNTUyOTgxRkZCRUExQzAwQ0I2Q0M1RUE5ODhBMjk0NEM3
-RjNBMjM4ODg2ODMxQzQ4REM4MUYxNzlCOUY4RjY4NkQ3RDBEMUFFCgo0MzZBMDg5N0FBNjI1
-NUQzMDQxQzFFRkU3RkM2QUVFNjVBRDg2MDhEQkFDQjJDNDBCQTNDOEUxNzhFOEYwQkMwNEQy
-NzM0M0UzOUMzQjUKCjkzNDk4RkFDODg1NkVEMzE3QTE1Q0VBQkIxRDk4ODBEMUExNTZCNENB
-MEUyQUU5MEQ0QTQyRjIzODM1MjNDMjFERUNFN0QxQTkyRUVGMgoKMDlFODExRjQ0QzQ3MDFD
-MTczN0U3Qzg5NTFDMTQwRjQ0NkFDMDk5MUZDQkFDQjlBNUQ4QTlBMzZDMjlBN0RGOUZDQjU0
-MDUwMzRBOThECgo1NTY5MDBCNzIzOEEyOUU0RDFDNDY3NzBGQjg1QTFDOUQzNDVGNTREM0Yw
-MUZBOTY2RjZBMURCOTIxM0MyMTQyQUU2QzZFODgzQkE1QTYKCjMwN0Q0MjhBNUFGQzBFMDlB
-QzI2MTcxQUU1QjM1OEFERDExQUU2NzAyMDk1QkY4MzJBMzVDMzNBMjZFMjJDMDZCNjBFN0Iy
-MTdFNDM0NgoKMDk3OTM5OTI3MEY1NTU5QTM4RUE4Njk4NjMwNjIxMUJGMzdEMDFCQzA5OTBD
-MzhCQzRDRUIwM0M3NkE5RUU5ODRBNkJFMTlFMDk2RDMzCgpDRDVEMTk3N0REMjM3Qzk2MDBG
-MThGRkVEMDRCQkJFRkYwMjRCQjA2MkM3M0VDMTJGQjAwRTVFMUQ1RUEzMjE0OTA5MzQ1NEVG
-MjcwQzEKCjRGOTQ0NDZCNTVDRTU2QzlCNzAwQTEyQUU3MTE5RTc4MTJBMTQ3MkJDNzBCNTJC
-NjdFMzA2MDhEOERBODEzMzFFQzlFMEYyNTg3QThGQgoKMzRGM0RGM0RGMDQ3NjA0NjgzMkIz
-NzFGMjEwRjZGQzgyNjhDNjdGMDdBREVBRTAyNkNGQzE5MjFCQUU0MDUyNjgwQ0ZDQjM3MzA1
-ODA2Cgo1MjlFQkY2M0Q4MzI3QTFEOTI0QTdFREVFMTk1NUI5NDQ1MTBGRUM5RTI0M0M4NzJG
-MTBGNTMwMUIxRDAzQzJCQTI0OEI1N0QxRTEwMjQKCjJCMjY2QTlBNjE2OTFFMUU5RTA0MjFB
-ODlFMEQyNjdDMUM4N0RFREExMUYyNUVBQjg2QTY5MjBCOTBEQTYzREE1MjQ1QUY2MzlDQjY5
-RgoKQzRFOEYxMkM5MUNBQTI2NjEwQTFCMzIxRjkxRjkwQzc5NzcxQzkxREM0RDJGNjg4Nzg2
-OEQ4MkM5MjhFNDU3NEMwQTM5NUNBMUZENTgyCgo1NDlENjAxRjkyNzRBRTU1REQ2RjE0NkJE
-MkE0NDQwODg5NDdFRTlEMTkxRkM1QUQ5RjVDRTUyRDNBMjY3RkIxNjVENTVCRjcwQTZBODIK
-CjEyMzQzRTczMjhGRUZCRjMwODNBRjUyOEZFQzgzOTYyMjg2NzhBRTIxNTM1NTdGOTMzOTlE
-RTU1Qjg4MEIwMjBBOTIxNjg3QjRCNDcxOQoKREUwN0VDNTdGMDBCMkJERkUwMDNBOTVFMzIx
-MTExOUJDNzJGNDY4QUVEMDBFRDkyQTE4NDNBMjhBRTEwNDE3NTIzMUY4QTI0NkJEOEM1CgpF
-MEYyRkVBREY2NDM1NDdFRDMxMjBCRjQ5NTBGQ0I3MUFCMzNDNTkwQzc0MDA2QThGODI5RDQz
-QTlDNzJFQURCQzdFOEE0OEVFM0U0RUYKCjJDRTg0N0QyNzVGMUQwNkIzMDVEQ0EwQTdGMDIz
-NEQyNDFBMTg3QTNBOUQ3Q0NGMzkwRUFEMzA1RTVEODkxMTBCNUQwNDUzQjJFMjlERAoKMkUw
-RTUzMTNGOEU1RjgyNERENTJEQzUxNUM0NkE0Q0Y0RTdFNUQ2MjJDNTkwQTg4NTRDOURGRTcy
-NENCMzc3RjI2ODUwODY3N0I3MDFGCgo0Q0RDRkYzNTAyRDA3MkU1OTdFM0Y5RDVGM0RGRUQ4
-QkNENDJBQTdFRkE5NkI2QTkzQTQyNjQyMDg4MjAzQjA3NUVDNUNCOTczMkVEQ0UKCjQ0ODM1
-MThFQTZCQzA0QTlCRDUzMUZBOUQwRUQ2NTI1NkVBM0ZBRTBCMTQ5M0ZGMkNCOEZCQTRDN0U1
-RDhBRTFDQzI0NEM4MzRFMDBFNQoKNjk0NTk0RUU5QTVBOTMyNUM4RkU5NUMyRjZGRjg0OTQ0
-NkU0MTc5MThEODhFMDBFODZENTk2NjRFMUQ5NjUzMTBEMzU0MTk5QkVEQkFFCgo1MzY2QzE4
-M0RGMUQ1RDFDQ0E1RTY0QTQzNEM1MDY3NUNBNEYxQUNBOTcwNDIxNUJDNUExRkNENEMzQTI5
-NkNEMjIzODlERDgwOENDRDAKCjg3QUFCOTIxRjVFRDExRjM0RDJEMDMzNDg2MUYyMTQwODNC
-QUM5NTQxQzA1RDc4QUJFNUFCOURGMjUzRTdFQzQwQUIzQThFNjlDRTczMAoKQUVBQjYxMEVG
-OTJBRkVCOTM3MzNDOUNEOTU5MEIxQjFEOEEzQTVFNDREMjJCOTUyOEU0MjlDREU3QUM0MTIz
-QzBEN0E4NzM5RUQ4QkM2Cgo3QzU1ODNFRUQ3OTAzRkEwMzk1MTcxRUZGNDQ5NzNEQjFDRjA1
-MkRGRjgzQjREN0ZDQjZCOUZFRjdFRjA4QTREN0MwRkFCODQ0RjJGOTAKCjQ4NTEzQTZBM0Qz
-OUE0MDdDMzNERDUyMTQwOTcyNEE3OUY4RTg4REQ2ODM4Mjk4RTE3NDczODI5QTIwNDk1Qzg2
-Mzg2N0RCOTcyOUY4MwoKOTJDREVDRDI5MUI2MDFBQ0I1NUJDRjlCQjE4RDg3MzM2NEVEMDNG
-NTE2MzFFRTg4NzI0NkQ1NDgwQTFCNjAxRkM3OTJEQTZCNkQzOThGCgpGQjU4MEEzMkU2NTlC
-QTRCMDc2NDY1NDAyMzQyNkUwRjVFNTEwNDU5NDNEMkVERjA1NTdERkM4RkVGMjg3Q0I3N0I4
-RUEzMjA4RTI0NjYKCjMzMEU3NjJDNTNEOEYxOUUxNzM3MDhGRUM0ODRDQTZFRjA5MEEwQTY1
-QTE5MDM3MEE4MDMwRjg0Q0Q0Q0Q2OThGNjVFODEyNDhFRDEzRgoKOTFBMEMyMUMzQjBEN0M2
-MzM3ODg3QkJDQTlFNUQ2NUNBNjUwN0M1ODk2MDM2N0QzNjgxMEU4MTNCMDYwRUY5QkU3RDM0
-RDRBQzE1Nzc0CgowNkU5NzY0MEYwNEI4N0QyMDNERjQyQkQ2NTEyMjlDNTY2ODFEMjk2REEx
-QkE3QzA5QUYzODU4M0MwOTBEMDQwOTgyOEY0NDVCNkE5REYKCjQyOUEzNzRDRjJERUU2OEZE
-QjVGQTRBMkJERDREMkNDMjVFNDZGRTY5QUEzQzM0QTU5MjI4OERBNERDMTcwMjU5MkZCMDUy
-RERGMDBEMQoKNEFGRjRGRkNFOUU0Qjc0REI0MTBFRjk5MENGRjYwNkJFQjZCOTBBRDM1RDMx
-NzlDREZGMjg1NTgxQTNEMTYxRDk2RjRERTY5RTVENDBFCgpCMzQ0RTVEMjNENkYwQjQ3QUJB
-OTJEMEEzRUZGNjdDOEYxNkQzM0RCQTRFRkY4OUM3M0IzNDQ1MEQxM0I0OEI0RjA0Qzg3RDE2
-N0ZBOEYKCjcwRTlBQjE3RDYwM0M0QzFBRDA3ODczQkYzMzY3NjBFNjU1Q0JCNkFDM0ExOTdE
-NjI1NTFBREVBNUI3QzFFRDUzMDNEODU5ODAwMEZDNAoKQjlFNzM4RTI2NzlGNUFBMDhERjA3
-QkE5OTQyNTMwMDAzNjYxNTdGRUJDQ0UwRUE0NzVBQTAyMkIwNDY0NjExODdDMUVDRDg1RkRF
-Qjk3Cgo3QjJERjQ5NzBFRTAzQzk5RThDMjQ4MDQ0ODREN0I3QTQyNkFDRjgyQjA1QUZFNTFE
-NTA4M0NBRDY4RjE2MEFDQzkwMzNDQjc3MDZDQkUKCjY4RDQ0OTk3RUQ1NEREMEQ3NTIzQTAz
-MjAzNkVERTUwQjIyMDBDRDQ0RjlCODlBMUREMEY1NDFEOTc3QTE3QUQ0OUU0RjgyRkVDQjlF
-NQoKRkY3QzUyNTE5Njc0NkU4RjQ5OTA2QjlCMjAxNEJGNkUxQTlBNkYzNTZEQ0I1Q0JEQjQy
-NzM5NEZDQUQ4NTg4RkYyQTBFRDY3NDMwRjE1Cgo3NUIyRTE2MTdGN0Y3REQxN0U1RjEyRTA0
-MDY4MzRCMjgwMDJEQzdFNzRDMkM0RUJBQjQ4QUZGNDMwNkNGQjJEMTczMDFDQkIyMzhBQzMK
-Cjg1QTQxNENBODRCOTg4QzVFQzVBRTI5M0YzQTZBOTQ3RTcwRUM0QzdGMDk1NkFFMTIzRUI3
-OEU0NkM4RjlCMkU3REZDNzVEQUU2RTUwOQoKMTk4OTIyNDkwMTRCRURBN0ZEMDY2NDVFNkRC
-OTE4QTYwOEVGNEMzNzNFNzE3OTkyMURENkZEOTQ4MzJDMEZEOUMxNUY1NkY3ODQ2OTRBCgo3
-Nzg4RkIzM0I5RkJBN0VCOUIxQTE5Q0ZFNTc2Q0E5OTNGMEZGQzMxMzk4Qzg5MTY3RDVGMUQ2
-QkQ4ODY3MDFCMDdFNzg3ODUxOTEwRDYKCkIwQkY5NkI1MUNDMUM4QkQzRDBCQkEwMEZCRDAw
-ODU3RTQzMjlDMUU5MDkyRTIwRTQzOTU5MDlCREJEMzM0QjAyNzI1MEJBODU5N0Y1NQoKNzlE
-RkQ1NUNDRkI1NzIxRkM3QTU1NTQxMkFCRTQ5RTNEREJGMDlGNzIyMTIwRDY4MUI2QjE5RkEw
-MDI2Q0RDMzA5Nzg5NzZERTgzODg3Cgo2OUM2OEIzQzMyMUI2MTEzRDNBRTMyRkQxQkRCN0Mx
-RjFGRjhGNEREQUU4MUZGQzEzMUFCODMxNkZBQjMzQjZGREVCRUVFMkYxQzQ5NkEKCjgwNUU0
-QjkyMEYzODE2QkRBOEU0MTY3N0RFMzZFRTQxM0U4MEM1MDBCOUZFNEUzRUVBRDAxMTQ2MzBC
-QjFBOTU1RDBGNUM3NzYwMTgzRQoKNjhDMjI2MDYwQjA1MTcyOUY2RTFGNDZDNzUxNjgzOTJE
-MEFERkNDM0RDNTJGMjkwMzg0OUM1QzFGMUNDNEEzOTQ4NkZEODQ0MDExMTJECgpDMUY5NEVC
-RUFBM0EzQkQ0RjI4Mjk3OEFGOEMyRkRFQTMzNjRBQ0IxMTIxRUI1RjU5M0YzMzJEOEJCM0Uy
-ODA1MzBGOUIxQTU4MDQxQkUKCjYzNTA3MDQzOTExOTBDMjRCRjBEQUEwNUZGODc2OEYwODRF
-Njg3MDQwMUZGMzQ2QUM3M0VBQzhBNjkwNjI5MEFCMkJCNThBQTdEMkMwQwoKOTAxQkZENzE0
-QzQ1MTg4Qzc1MDk2MDU3QUVDRTZDRjQ1M0I5ODUyMEFBNzM0NkU0MkU0NDk1NDlFQkRFNEI3
-MEIxNkY2NkY0ODY1NUI4Cgo3RjBFRDQ5MzVEMTA4RTkzNDlGNTdDNTc0NUVERkEwMkQ4M0VB
-QTdFRTdCRTdEN0ZBREJFNjZENjI4N0E2MUNBQTFGNDY4REU5REY1OEEKCkRDRDdENDY2N0Ez
-NDFGNjc0OEEzNUMxOTAzMTc2N0NDMkUwQjI1QjYwMTBDREIzMURERDNBODE0MTBCNzgyQjRB
-NkNCNUM5REVCM0IwOQoKMjZEMkU4NkM2OUM2M0JBRjE3MDU1QUJBNUFGMzlCMjM3QzUzRDNB
-NzlDNTYzOUMzQUM2MzhFMTU5MkE1Qzc0MkIzRjdBNjVDNTU3Rjc2CgowQ0EyRTY4QTBCQjI3
-RDBEQjQ5M0RGNTM1M0Q3NTg0OTMwNEYzQjE1RDQyMTE1RjU1NzE3MjAzODE3RDFGNkNFNTU2
-NzM1OUNDRTcwODUKCjM3MUJGMjNBNjA4NTFCOUJDN0RFRTE5QkJFNDBCOEJGRUVCODVEMjBD
-Nzg4NkNCODlCMjFCRDRERDU3NDE0OTU4RUNEM0I1Q0NENDBGNQoKNzgyNTM3MkNCODkyOUFE
-MjY4MjFGMjgwRkM1QkYzRjkwOUI4NDU0MjQ4NjY1RjM5RTg3QUMxMjY3OTAyMzU2MUQyRTRD
-MTcyMTVDQzgwCgoxNjM2MDBGQkMzQjJBMzYzN0ZFOEFFQzdFNkU5MTQzOTM5QTk2RjlBRkY1
-NDQ5NDRFRTkxNEJBMDU0RDZCNUQwMDcwQzE2Qzk5RDNFRjEKCjBBNUNBNjM1QzgzQTE1NEQ1
-Nzk5QjdGREMzMTE4MjdDOUU5REQ2NTFDQkE1REUzMkEzRUNCNDMyN0JBRjA4RDkyNEVFREJB
-MDU5QzMzQgoKM0U3RURFMTU5RTgzREU3MUVFMDg5NEMyQTcyMDE2MThBQTM5RjM5Q0MzNTc0
-REZENjQ0Q0I0MTYxOEE2NjhCRDhEMUJGMDdGQ0UzQUIyCgo4MEUzQUFDQkQ5RkNCOTBDNEQ4
-QTQzQkUzQjcyQUVCOUU2Nzg1REVDNkUwOUE2Q0JERDk1QTJBQzdBMEJCRDQ5RDg2RDI5QjA4
-RThGMkIKCjk5MTM3QjJDMzFFREMyN0RFRTZBN0Y1RkFBMzlEMUZBRjBCREI5RTA0N0M4M0ZF
-NTk2Qzk1OEEwMUY4MzUxNDkzNjlCMDY0MUY4RUE2RgoKRjBEQjMwM0VCRTU3NzI0RTZCMTA0
-OEZGRDdGMzE2ODJEQUZFQkMxMTAzODUyMjczREQxOUJDOThDMUM1NDUyRjg0MUQ1RUQ3QzJG
-NzQ2Cgo2ODkzRDIzQ0M1RDZEQjQ1QjUzQzkxNTA4NDVEN0VCM0Y0MjI3Q0I1MzYzRTNBM0JG
-NURBRkQ2OEQ0MTVFMjgzNkI0QUI1MzYyMTEyNUYKCkQ3Q0JENkI1NTFCM0QwQkQxNEQ2Mzc3
-REFDRDQ3Nzg3NzM4RUYwQkU5OEY2ODdDNkNERENFRjBENzgwQTFERDhDRTA4QkM5QzAxOEU5
-NQoKQUU0NDQyNEFGMTA4MEY1RDI0NUQ0MkEzQTRDMTdEM0UxOUNFMzQwRTk3QzcyMkJEN0VD
-NTVCMDk3MzVBQUNGMTNGQjJGQjk5MDY4MDJECgowQjM0Q0FCMUMwMjc1OENCNEZFMzFGQ0Yy
-NzU4QjNBNkNGODM1M0UzQzUxRjM5OUFGM0VDQUMyRTEwOUM5OTlCRDE1REYxMTQ4RTM4RDEK
-CkEzQ0VGNjQ3MjI1Q0E4Q0M0NUI5NjJBNjc3MzFDN0RBQkQ5Qjc1NkRBRUU3REM1RTQwNzRF
-M0REODE4RTNERTkxMUMxRkZBOEI2QzFBNQoKNEYyNzlDODcwNEE2MUM2Mjk3MzNCQkYyRjIy
-N0YxNzE1MTJBRDdGQjVFNzJCMjY3RUIwQTdCNkM4NkMwRUU2QkVDQjQxNkE5QzQ4NjdECgpD
-MzcxNjgyNjQ0OERFQzNCOEIyRkMxNzJGRUY1MkMzOUEwNTc0Qjk3NkI5RjNCRkM1MzQyMkEy
-MDMxM0YwQjA1ODYzOEVGMTg3MDU4N0EKCkEwMkQ5QzRCOTZBRjRGNTUzNjU2MkZGRjI2QzFD
-QkRFRkFCNUE2Q0U4MUYyNTA4NEU5MDJGNTZCODQwMzE4ODQ3QjVFMzE4ODM2NDdBMAoKMzA2
-MzY3M0JCMkQwQTdCMkMxMjhBRkQyNjFDNDM0RDFENENGQjA4QzUwMDgxQzIxNjkyN0MyODk1
-NEE3OTE0OUFGMTExNzA1RTU3RkZCCgpGOEM4QTEzOEFBMzQzRjE2RDU0MEUxMzhFQ0I5ODE3
-RjkxQjA0MEZBNjVEOTBBREE2NDJERkM5OEU0MTREM0M5MDlCRUJGMUE0NDJGNjgKCjBBRTky
-RjgyOUQwRjEwQkQ5OUJDMUYwMEU3MzQ1RDA1MTMzQ0EyRjNCQUVEQ0M2M0VENkREOTJEQTg2
-REY0Qzg1QzlENzdGQjRCMUQ5NQoKRTY0NDkyQ0MwRThGMDQ2OEQzRTU1RDExRDk3NTk1ODc2
-Q0MyMjI1NDE2RUIyRDEwNDJGRDhGQTA3QTZGREQ0MDhGNjE5QTBDODRCNjVDCgoyMDg3NkEz
-ODYzOERCRkU5NzNFRDdEQ0I2QThDRTdFQ0FDMEJDNzEzNDlBQjJERkJDODY4MkMxRDVFOEFD
-OEZBQzg2QkE5NUE0NkUzOTEKCjExMzU2MDJBMTQ3QzcyMDVDNEI0OTUxOTk4QkIxRDcwQkM3
-RDMwRTcwMDRGM0M4MUNGQTRBMTM2NENBMUNCNzI4ODU5RjU3MDk1QTA2OAoKMzNGQTU3QjJB
-RTZBRTAwNDU5MkFFODdENkE1N0JGRUU0QkZEMzlCNzdDMzQ0MTZFMjMxNkE3MzlBMjcwODRF
-MkZEQjlBOUE4QTI2MEIxCgpFOTI4RDE0NEZCNDNBRTVBODlCMDU5OTczODBFMzA5ODdEMzE0
-MTRFQzkxNkUzQkQzMzhEMEQ4OTk3NTI5QTE3QkVEOEFGMDFDQUQ2RDEKCkNENEVFMDZDQjZD
-MDU2M0U5MUI5MTk5MDNCQjVDMEVGOEM3OUFDRkJBN0NEMERCODk4NDYwM0Y3Mjk2NzJEQzQ3
-RjZEODQwRDkxMUJDQwoKM0ZGM0YyMkY1NjFBQTVFREEyNzgzQjVERkY4REM1NzNBMDZFODM4
-M0MxQjc0MjAwMDNGRUVCRDc1NEI2MkJDNDYxRDMxNEIzODNENDgzCgpDQjMzNjYwQjY4MUI2
-QTA0MjRENEMxNkI3MzBGOTc1OUQxQzVCOENEQzc2OUQ5NkU2NzgxNzAxNkNBNTM1NkM4RDQ1
-ODM2QzI5N0U1QzAKCkNGODA4MThFNURERjZGRDZCM0Q5NjIxMkE2RTNGMTI0QUIyQjIyODFD
-N0UzMkI1QTExRjczN0M2Q0Q5QTg4NkIyREJDRUZDQURFNkQ4QQoKRjhBMzkyNzA1QjhFRUIz
-RUU3NzE2QkU4NjVDQTk5NDYxNTg0MDIzMzNFNDM0NUExNDNBQkNDMjRGRkI5MjgwRDIyQTJF
-NTM4RkM4QzA4CgoxNEE5RjgyQ0NCQkIzNTBGREUwNDdERjkxN0UzNEI3RjlBM0Q1MjBDOTc3
-NkE1MDEyMjVERkI4QTU0NDBGOTE5ODAxNTVDNjlENjlDMUUKCjhCNzcyQUMxQkVERDg3MEY1
-MTZBMjU2Mjg0NDVBNjg3OTNFQjQ2RkYzMjdFMjMzREUyRUYyNDI4NTA1RDc4RkJDRTFFOTMz
-NTAwQkMwOAoKNzVFRjJBNjU5MTA1QkZCODRENjJDRDg4NDlCMTNBMEEyQUM1RDMyNzAwQzY2
-MDQ2MEJCQ0JDNTA4QTY0NEJDMjFDMDI5MTVENDREMDcxCgpFNjk5NzU1MkYxQTQzRTc3MUM0
-MUQ5QTcwRTUyRkFGQUVDRDczQUY4RjUwRjdGMzhEODVGOUU5NjhFMTc4RkVFNjg2Rjc2QzE3
-QjVGQjUKCkMxMjM1RTc0RUM4MTI0MzMxNTU4NTY2NzdDOEEwMUNFMzI5NzE4QjAxRTg0Njkx
-NjVCNTREQjZEODYxNjU4RTA3M0Q0MDdGQTdEMjk1RgoKNjlERkJGNENDNkUwNkY3RjRFREU1
-QzlGRTA0OTA3REUwRUFGOEJCREI3M0FFMjQzMTNGMTQ0MjYxNEZBOTFDRUNERDFGRUVBQTM2
-RkVFCgo5NjkxMzFCMjAwMzM0RUVEQTQ3QTdCMDI5Qjg3MkE3OUVCRjdDQkQxMDgzODhDOTBB
-Q0MzQTJFMDMyOEVENzAxMDZDQzVEOTYyQkE3MkIKCjRGQTFENUUwMUI3NDc2Mzc1MjI3Q0FB
-RDA4Q0M2NjlGN0VERTM5OEZDRDQ4RTRDOThBNkZFNTkyQzYwRDI2MkQ5QTgxNEYzNjQ4NzFB
-RQoKOEI5RDg4MTAyOUNERUJFQTIyODA1RTU4QzFBQzg4RUEzRDJBMTRDMDZDOTlBNjk5NTIz
-NkNENUI2Njc1OTUyMUQxQzYzQ0FDMzNFNjMxCgo4Qzk0NDFCMjBBRTUxRjZDNTQ4NENENUM5
-MjMwMUNERURCQjZBQkQzMkJFQ0MzMjczOTIxOTAwRDEzMzAzMjIwREI0NjA0MkM3MjAzNDgK
-CkY4RjU2NjBDOTYzNTQ5OTRBOUY0QkM4ODE0RkQ0REU3ODY1MjZFNzYyOUQ0MUY1MjNGOTJF
-NjEyRURGNjRDMDgxMDYwMDQ5MzM2OUYwNgoKMzJBQ0U0QkFCRTQ0ODhGQjIyOTJCRjZCNTYy
-OURGNTA2MkZEN0QyMDM4Q0Q5ODU2QTEzNDMwRkNGN0U5NDQwMjY3QUUwN0E0RURFRkEwCgow
-M0I4M0RBMzY3REJCQzMzRjQ0OUY5ODdBQjRDOTBDNkI1NEYyRkI1REM2MTRENTBDODAzRTZB
-ODVGNEJEQUQ5RjMxQzNDODNGOEM4NEQKCkI1MTk2MEY0Mjk3OEY1OTc4NDc1NkZGOUQwNEMx
-NDg5OUM2MDE2ODE2MTUzNjBCMzQwNzdFMTEwQzZGQjVFQjdFRUM4MUZEMjFDOEFEQgoKRjUw
-ODZCMDI3RDExREI4NTMzMjQzMzk0MDNBMTU3REQ1OTNDMEM0ODJDRkQ2RTQxQUQ1OUU1OEM5
-QTk0ODFBMzkxMTUyMTUxQzUyMzJGCgpGQzlGMTY0NzU3QTA4RjVEQkZENUYyMzlFMjE4OTE1
-RjQxMDE5N0Q1OUFEODRCNDNBQTM0QjU3N0U5RUVDRjY5NDA4NkFERkRCNEU4QkQKCjkyNTU1
-NTBEMEU2RENDMEY3RjIyQzM0RTYzNjc4NTQ1RjJCMzQ0MDBBQkU3RTRFMzEzMUQyMENGMEIw
-MUEzQTI2NkVDNDU0RTNGNEQ1OAoKMjRFNDY3MzJDOUIzMDRFQjRCN0Y2QUU2NjBBMERFRjc0
-RUI3QTM1NjI0QzRGOEVCOEQ0NjdBMDE3NkRFOUFFNDU3RUY2NzBCNTU2NEMyCgo3NDlCNTQ1
-QjI4NEY2MzA4N0EyRUEwMkNBOTdDMTE0MkE3RTZFODFBQzdGNDQxRDVDNEFGNjhGMzdFODUx
-OThDQkJBMkQ1MDlBMzZBOTIKCjk1RjAyQTRBQjZDMDhFMDAxRTY5MTU3N0ZFNzUxMkI3QUU0
-MzdCQTIzRDAyM0UyNjMyMEZERUYyNjJBNUI3QzMyQzUxQUFFNTQzNzk4MwoKMTA4M0Q1Q0I4
-NDc4OTYxOUE2MDVBREFDQjVDRDBGQTVEQkUyQTREQkI3QTUyODdDMTUxNjk2RDJERUM2QkUw
-QUIxMTIyRjE5QzAyNkM4Cgo5RkU0QTQ5QkE4Mjk4QzA1Mjg2NzczMjZGMEQ0MUNGQzJCQjY3
-RUE5REVGNzA3MjJENkUzREYzRTczODY2OEY0QTlDQjJFNkE5N0U4MUIKCkE3MTdCNTk3MThB
-NzgxOTJDNzBFRTlFN0VBMDZDQ0RCQjQwRUE3NzExRDA1REVFMjY0RUNBRjlDQTQ3Q0E1NDJF
-QzVCMTdEOTY4Q0YwRQoKRTMzNDI3MkRFMjY0QjI0M0RCRUM0OTBBM0ZDQzNBQTM0NjM4REI0
-OUMxMkMyNTc0QkUyMDZGNTMzMzE0MjlFMjQyMDYxRjAyOTM5OUQ3Cgo0ODUwRkFDMkIxNEM2
-OUVFOERCQjYxODdENzgyQUEwRjlBNDBDNUI0QzZFNjYzNDc0RTdCRjQ1QzMyRkQ0NTkzQkFG
-NzIzQkRCOEI4NjYKCjMxNUE4OThFMUQ0MjlBOUJBODlENjE4ODM2NDMwRkY2NjAzMTM3MzM0
-RTdDOUYwM0U3REI3QTY4Q0Q3OEExRkYxMTU2NkQ1NTA2M0EwRAoKM0JGMzBBODc3MjcxMzBF
-N0ZCNTAyOTM3OTRBRjVCQzQ1RjU4MThFODk0OUExRjRCODA2OTI0QkY2MjlFQzQ0M0M1QUE2
-RTE3M0JBMTI2CgoyMkEzNDZEOEIwNzFGOTFFMUQzMDVEMTU0MEZBODNDQThERUE3RjA5REM4
-MDMwNUI5RDM5MkJBMzFENkU3MTcyMkQwQjk0N0MyNkY3M0EKCjcxNjYxRjgwMUE5RDA4QTdE
-RTYyODg2QTM5MDM2MUZERUEyMkYxRkU2N0VFQzIxNTNGOTk5NjUzREVFQzY4OEYyNUI0QjlE
-NThDODE1QwoKQTQ1NjgwNDM2MERFMjk0QkZCQkZFNUQ3NDVCOTQ1MTFDMzA0QkQ1Mzg4RkJC
-ODREQTRCMzFFNjUwMTc4Q0MyNTczMTY2NzRDNUEzRUFECgo5MDgxNzcwRDg4NjgzQTEwM0ND
-RDEyOTgyNDY1QTdDQUExQzkwM0NFRUNBNkVBQTExNjk2MzdCRDM3MEYxOTAwQzkxNDNGQzMy
-REY0NEIKCkJCMkQ2QTRDNEM4OEVERUVDMTZDNTk4NTQ1MjA4NDAxRDA5ODUzNDdBRThCMkEx
-NkY5OEJGOTJDQjQ5NUQwQ0FBOUYxMzdERDUzNEQ4NwoKOUQ4OTAyREYwQjQ0ODQ4QjNFQUMx
-QzM4MUI4QTc3MUY5RjgyNkExRDMzRDEyRkQ0NUMyMjBFOTREMUMxOEI2MzBDNDZENDE2NTlG
-NDg1CgoxNkJGNkMxQTUyRTE5NTFBRUQxMTVBRTlENEM2NUJBOUY3RDQzNjgwMkE1NjczOTIz
-RTY1RThCQUI5ODVEMDk0ODQ2MDdENjk5NzkyOUUKCjA5RUIxREJBMURGQjMzQkEyOTk5QUM2
-NDYwNzM0MzEyQzY4Mjc0NjdDNzBFRjA2MUZGODUwOUNEOEQ3OTE4MEZBMEM5MkEzMEI4RkY1
-NAoKNTlFRDEzQ0Q1MTU4QUYzQ0I5MTNEQUI0Q0I3MEFCRTE4RkUwMzY2MDAzNDk5MDIwRjk5
-NkI3ODdGQzVCQjRBNzY3RUYyNUUzNDE3QjRGCgpDNjZFQzc3MDZFNjg5QTU1MUIwRTRBQTE1
-NzU2NUM0QUM1RUE0NDUxMUQ5MDg0Q0I0NUIzQTVGOEVDMUM4MjdDQTQwOEIxNjIyRTUxNzAK
-CjNBNjcyMEQ3NEQxQ0I0NUI1QzRFQTU2MDc2MjAzRjMyMzVCNUQxN0UwMkYxOTU1MTFBQzNC
-MUQyMTNDMDFCNjA0NTI5NDc3RTMwQjFDNQoKNzc1MTgwODY3NkMzRjMxMDM5MThGQTIyNEIz
-QzJDNjVFMDMzOENDODFFMTFBOUFDRDJDOUY2Rjk5NTA0MkU2NTRDM0RFQTI2RkMzQ0YwCgpB
-MDk0QkFGNjM4MjJDQjMwMDRGMjc4NkVFNzRDODZGQjhGQzY1NDJCRUY3MUQ5NjE4M0ExQTRD
-OTRGMDFGOENEQjBBRTFEREFEMTkyRDYKCjFCN0FENzA4RDM0OThCMEVFMTIzRUQ2NjIyNTk3
-NkU5MTI2N0Q0NUMxODQxNDhDNjFGOTlCQ0ZDMTFERERGRDIxRUQ3NkQwRkM4NjFCRgoKNzkK
-CjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCmNsZWFydG9tYXJr
-ICV7cmVzdG9yZX1pZgoKJSVFbmRQcm9jU2V0CiUlQmVnaW5Qcm9jU2V0OiBzdG9uZXNzYmku
-cGZhCjExIGRpY3QgYmVnaW4KL0ZvbnRJbmZvIDEwIGRpY3QgZHVwIGJlZ2luCi92ZXJzaW9u
-ICgwMDEuMDAyKSByZWFkb25seSBkZWYKL05vdGljZSAoQ29weXJpZ2h0IChjKSAxOTg3LCAx
-OTkwLCAxOTkyIEFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkLiAgQWxsIFJpZ2h0cyBSZXNl
-cnZlZC5JVEMgU3RvbmUgaXMgYSByZWdpc3RlcmVkIHRyYWRlbWFyayBvZiBJbnRlcm5hdGlv
-bmFsIFR5cGVmYWNlIENvcnBvcmF0aW9uLikgcmVhZG9ubHkgZGVmCi9GdWxsTmFtZSAoSVRD
-IFN0b25lIFNhbnMgU2VtaWJvbGQgSXRhbGljKSByZWFkb25seSBkZWYKL0ZhbWlseU5hbWUg
-KElUQyBTdG9uZSBTYW5zKSByZWFkb25seSBkZWYKL1dlaWdodCAoU2VtaWJvbGQpIHJlYWRv
-bmx5IGRlZgovaXNGaXhlZFBpdGNoIGZhbHNlIGRlZgovSXRhbGljQW5nbGUgLTEyIGRlZgov
-VW5kZXJsaW5lUG9zaXRpb24gLTEwMCBkZWYKL1VuZGVybGluZVRoaWNrbmVzcyA1MCBkZWYK
-ZW5kIHJlYWRvbmx5IGRlZgovRm9udE5hbWUgL1N0b25lU2Fucy1TZW1pYm9sZEl0YWxpYyBk
-ZWYKL0VuY29kaW5nIFN0YW5kYXJkRW5jb2RpbmcgZGVmCi9QYWludFR5cGUgMCBkZWYKL0Zv
-bnRUeXBlIDEgZGVmCi9Gb250TWF0cml4IFswLjAwMSAwIDAgMC4wMDEgMCAwXSByZWFkb25s
-eSBkZWYKL1VuaXF1ZUlEIDM4Nzk1IGRlZgovRm9udEJCb3h7LTE1MyAtMjUyIDEzMDMgOTUw
-fXJlYWRvbmx5IGRlZgpjdXJyZW50ZGljdCBlbmQKY3VycmVudGZpbGUgZWV4ZWMKQTYyMzkw
-RjJCNjAzNzZERTI1RTZENjNDRkIyQkUxOUMxODVFRTY0QTZCQUMyOUMzNTMyOTUzNTVFMjk1
-M0NCM0FBNjY3MUI4Qjk0OEZBCkZFNjJEMzRGMERDN0Q2MTc4MTlDQ0NDRkE5RDI3NkM3MjM5
-MTRGMjhERjlGNUExQkJGNjQ0MTA5MjY2NDExQTZCOTlDQUJDOTIwOTcwRgpFRjE1N0FGNEY2
-N0FGRDZCODI1NkQzMEI2RUMyNDlEM0QyRDMxMzExRjc4MUU1MEE2Q0YxQTY3NzI4NTI5MDgz
-M0U5NjA3MkQ4RDFFRUQKQjhFNzQwMkE1ODhGNzgxOEEzREYyNEFFQzZFRjVCQTZBMzdEMUY0
-NzhBQjI2NkFEQzJGMTM5RkE1QjA2OUVENzgwQUMyMzdCRDJENTYwCjU3QURFMzUxQkIxN0RE
-REE3MDY1MjBCRUMzODY4MDZFM0QyMEFCQjMzRTcwM0IwMzgzQ0U3RUJEMjBBRUE0MENEMUYz
-QUY4MERDNjNCNwo1NjcyQkI5NzU2Qzg0QkQ1NzIxNzFCNzE3OTc0NTAwRkY0QTE4QUVGMTlC
-MUM3ODdBNzQyRTZCRDUyMzlENENFMUVBOUY0M0Y0ODgxQjYKMkEzNkMwMTYwOTk0N0U5N0NF
-RTk5OUIwRTU3Rjc1MkYwMDkxQkNERERDRTZGQUNERjM4RDk4NzI4RkEwNjlEMzI2QjBCRjNG
-MDMwNjFCCjhGQ0U4MEQ3QjE3RTY5QkQxNkYwMzQ3NTBCRjUxMEI5RDM2QzE5M0U4NTM2NDNB
-Nzk2OEUwNDNBMEI2QzY4MzQ4Mjk3RTUyQjcxOTREQwo4NjM5MEFBMEEzOTQxNEZCOUYyNzhB
-NzJCQjREMzhEM0RFNkYzMTFFRTBCNEVDMEMzOEFCNDkwRDNCQUVDQzVGOUM5QzNDRjk3MDEy
-N0UKOEMzMUE2NTg3RjdCM0EyQUMyMDZCNjBEODFCQ0E4MkQ3QkY4MDM4NDlCODZEOTg3RTVB
-MEY0ODdBMjUyNTJEOUY1RjI0RkY1MkVCOUZBCkU4RjVERDFENEYxQUU2QkNEN0YxMTk5NzBE
-ODM2NjI4MjRBMTdGNTE4RjNCQTdDMEUzNTU2MzBFQ0YxNkQxQjI5MzBBQjcwMEY4NTlGNQpG
-NzlCNThENUFBNUFGRDA0MzQ1MUVGMEUyMTg5NkU5QkFDNjk3Qzk5QTAwNkY4NTAyQUFFMEYz
-MjU1N0JERjlDM0U4OEI1ODY2QkYyODAKQUZCQjYzMDlDNEE2QzU2RERDOTNDQkRBNUJBRjlE
-NEM5QzMzQ0M1Q0M5NjE0MjM2NDI1QjkxNzAxNTFDM0JBNzBGQUEyQjg4MjJGOTk5CjI5MDJC
-MjNFMTFBOERBRTk5Q0E3NjU2NDlGRkZFRTczNENENDVBMDk2MjQ2Q0M0MThGNERBMTA0QTBF
-MzYwRDg0QUY4NDEzQUI2MzE1QwpGN0IyRDkzNDU4RUZEMkNGNzVDRThFNDI5QjRGRDlBMEQ5
-RTI2MjVCNTZCMjMwN0M1QkFBOEFBNDIwOUFERjNBRUZGMTFDMkZGOUNEQzkKOEJDNTVBODFB
-RDBCODk3NUQ3N0I3OTI1OUVEMjZERkRCN0I0OEU2QUMyQkRBOEM1REJDRDU3M0JFOEJGNzU4
-RENFNTUyQkQ4RDdCOUM1CkMzRUZGRUVDMEZFQTAxQTM1OTZDMDM4NzUwREJCREUwMTlERDA2
-MUFBQzc1QzZERjgxRUEwNUQ2QzZCQTk0MEVGRUJEMDkwNEVBNjRBRApDRDlBMjk5RkMyQTY3
-N0JDMTY2QjkxMDE0NjcwM0M0QUM3N0EzN0QxRTM1Mjc1REYxM0YwQzg5QjkyMUMyQjMzOTA1
-REZCNzlCMjE0NTUKQjc2Q0M4NEQ3RUZEQ0NCRTlFQUQ2QzQ1NDhBRkYzRUE1OUE3MDAzQTVC
-MEJFMzU5QzhCNTk5MERCMTU0NTE3NDhEMDBCNjY1OEYxQzFECjNDMDJDOTAxMEU1ODZFOUVE
-QTc0MDNFMDMyODhGOTM5QzVBNTZFNTZCMDM4QkRFQTNEQkRERUVENTk5NTNCNUQ1RjNFQ0RC
-QjlBN0IyMAo2RTk3RTE5RUI0ODZFNjY2RDIyQUY4RTgxQzY1RUNBMDA1NTk5Mjk3Q0MwOUI4
-M0RBRTEyQTQ5NTcyNTJBOTI0NTJDODI5QTMzRTU4NjQKM0FFRDZEMUE1NTM4QkFEQjcyMzM0
-NkYyOEMxRkZCNTU3MzdBQUMzQjZCOTVBQUIyQkZDMzFCOENGRUZDMTIzOEYzNkIyNEI1RTBB
-RjRFCjIwMURDNEI0RjhDNTg0Q0VFMkI2NkE4QkZFQzc1NUNFRkRBQ0M2QkQ0NkQxQURDOTM1
-M0JCNENEOUY1OTg2N0E4Qjk3NTBCQTBEODM2Rgo0MTI2QkZCOTYzNjA1MjNERDVFQjQxQkRF
-MkI2NDQyRDUzQjZEQjM4MjVBQjE5QTVCODEyMkQzOUFENkVEREZGREJFOTU5QTE0OUU5RjYK
-NTUzMkZDNzBDMzJGMjk3QTU2RjQyODhFMzU1RDlFOTE2MjI1QzgwRTQ1NjRGRjNBRkY0RTA0
-QzY1MzQ2QkY5ODM4MjJDRjA0N0YyN0U5CjU4QUZFMDQ2MzMyRjVGOEYxMjJBNjg3RkQwQkRE
-ODEwMzIzMzE2OTlDNjBFRkY0NERBRDdDRkREOThFQUIyNEQzMTQwMTMyMDk0NjdENQpBODA3
-ODYzNzVBQjkyODVEN0U0REE1RDBCMzJBQ0MwQUI5OTBCNDQ0ODgyMkFGMUQxMzI1NjNDNTc5
-QzI4QjM4NjIyQkNFNDg5MTlDMjMKRTQwMDJENjU2M0QzNjUyMzZBQ0JCQzI3ODU0NUNFMjhB
-Q0MyOUE2REU1QTkzODBBNEFGNkQyODYzQzAyODNGNzVDODY0QThCNTg2OUJCCkZERUNBMjVF
-MTdFQkYzQ0U3OEMwOTAzQjM5M0EwMjRDMzgwNzIzNkM5MkI4OTYxMUI3MEVCQkI5NkQ2NzIx
-MzJDRDI4QjBBNDAyRjk4RApENjQ3NUYyRjlFNDcxRDlDRjFEOTY1RTU2RUE0RDBENkVEMzM0
-NDEyMEQ4RDFBQkREODg4N0VCODM5RjdBMkE5RTBEQUNCRjI1NTU4NzQKQTkyMDBBMjlDMDgx
-RUI0NTYyRjEwOTU4MzUzRkI3MkYyRTA0ODZGNDc5QURCRDQ3NjcyODRFNjMzOUJDMkRFQTZB
-MDU1NTYzNjZGQUM3CkQ4QzE5Q0JDN0NGNDE1MzA4RkMzM0FDNjc2M0UyRjQ1MEVCOUZGNEI4
-NkNBN0FEQjJBN0JFOTAzMzI1NUM0NDU5MzZBMkM5NzBEMUZBMwoxQkJENjUwRTEwRUVFQkIw
-MTgyMTJFQUVDQzRENEQwMzA0NkNEMTRCODYwQkM2QkM3RkVDQjRDNzBCQzYwNDU2Mjk1ODAz
-Mzk5Nzk1REEKRDE1RTVBN0YyQTNCOEVDN0JGRjk1NThBMEVGRERGMTc4NzUyRDdEMkJFNkRG
-N0NDMzIyMTJFN0YzQzYzMkI1QUJDRjlGNDQwQ0E0MTk1CkU1MEYzNDA3REMwNUVEOEVFRTND
-NkVGNUQ5MjdBMzA0MDYzRDJDNTkyNzU1OEUyMTIwODcyMzFDNDg1QTExODQzM0JFQTVEMDMx
-NEMzQQpCM0RBQTI2MzE2MTczNjdENUE4Qjc5Q0YwQzFFNzk4Mjk1M0M1NzVDMzYzRkFFMkRE
-MjAyMDdENUY1NzM5ODAzNTgyNUJBQzVGQjAyODAKNDdDN0Q5MDdCM0Y5NTI5QjlCQTM3MjQ1
-Q0ExRjUwNDg4Q0I0RjMxMDYyNjBENEMzMjREMjNFMDYxQTJFMkU4ODk0MUQ1NjYzM0I5OEM4
-Cjc1RTkzNzcwRkMwQjMzMjA5MjQ4QzUyOTA1MzlDMjNFQzNFMDcyQUIwNzk3MTlEMzQxN0VG
-RUM3MjcyRjQ5NkYwQ0VEMEFGMkE1OEI5Mwo0NUY1QTc3OUFBNTRBMEIwNUY4MERCMTkwOEY2
-RjRCOTFDMERGNDFBQjU2RUNDMEI1NEVBOUJERjY5MjlCMUM3OTE0NzVDRjA4NjRFNUIKQTAw
-RENBNjIyODBGRkU2QTRDNjI2MjkxMTdDOTg5RDMzMkZGQkMyNTUzMEJERjRGMDg1OTI3NDE2
-NTZCNjBEODJGMENBMzlBM0NGMzc0CjVBNjI2NDc1RDFFOTc4MzM3OEU5NDA2NTlBQkE3MjEx
-NTg3REUxODUwNEM0QjMwMEY0MDQzNENGRTcxOUNBM0NEQzNEODlCQjIyNkY1QwoxRTM0NUEz
-QzkxODY3MTZFMDNDMjIyNDQwRUM1QTlEOUI1ODVGOUQxMEY5REExOEE5NEY5MjdFQzMyRTcz
-RTg0NDlGRkUzOTJGNzAzQjQKMThCNTI1RjVGOEY3NjVDRDYzODI0ODk2REMyRjgxRkE3NURC
-NzMzQTQxNzI0N0Y5OTBGRTZCRjA4NjFGMUI0NjNFRUYxQjcyNzA4NUFBCjM5RTM2QjQ4RjY5
-Q0QyQUYyRjA1QTNEMzI4QjNGMDU2NTA0OUMxOTQ4MTI4N0FEMDUxNUE1MkIzMjNDMTQxNzg5
-RDA4Q0UxNUQwRDc5MgpGRjJFOEY0OThCQTRERTA5MEI2NjAzRDcyNzBEOTkzQTE1MjIzMkY0
-RDBFMzc3MzlGRTI2OUU0MEU4RUE5Mjg3MjE4MEI2NzM0NzUyMkIKRDkzQURBM0MzQjQ0MTQw
-MDQ3MTFDMjUyNzZCMUQ4NDU1NzExODFGRkI0RUFDNDdFQjJCM0U3NDEyNTkzQTgwRDBBQjk1
-M0JCQUZFQjY0CkEwREE3MzYwN0EyMDdCOEUyQ0YzRjFDQjQ3Qjc0RjFEMzFCREZBQTVGNkU1
-NTZEMjcwRTAwRERGRUZERkRGQ0QwQkQ1OUNEMDNDMjU5MAo3QTRFQjBFMkNCREUyOTRBRDI3
-NEYyOTY0NkJDQkNERTQ0QkU4QUVENDFFODc4NTU3RjMwRTgxQTA4NDJBQjM4ODYzN0Y3QTIx
-MkU5NTMKOEFCMjExOUIyOEM1MUZCRkU0RTc1RUExN0FDMjMzOTQ5QTIzMkIwMTVGNzQ4QTVD
-NTFCMzBBREIwOTE4RDY5RUM2NDFCQkFBNTc0NTg4CkNENDVBQTc3OTFBRjg4QUVBQjRGODJG
-RkEwOTI5QkE3MkFERDRFQUE1OEEwMEVFRjc4MDAzNkI2NUQyNzlBMTAyNDA1MTVBQ0JGNjk2
-Qgo5MEY5MTlFRDVEOUNEOUI2NUQ4NTQ1MDM1NjUyMTI3OEQyRjgzNjcyMjhDMDk1MDdBNkI1
-MkFFNDEzMTgzNTIxQkQyNDU0QTc1NUUxNTAKNzg0RTQ0NkVBRkUzQ0IxMkYzNUE0QTkyRDdG
-NTUzNDI2MENCODRBNEQ2MTk4MEM1MzVEMjNGRDA5MTcwNkIyQkFGQzYwMDQ3RUQxMzg4CjJE
-M0RDMDBCQjFFMDA2QTJENjc4Q0ZCM0MyRjI5MjFBMzBBODA5MEYzMDNCQUI5MjI1REMyNDFG
-OUNDRkRDMTg2MEEwNjJFQTFGRjQwNAo3QTI3MDZGNDJDMUFCNzg5MzMzNDU0ODg3NkVDRUVE
-NjIxQ0IxMDVEMzBFMDNFRjBGNUYyNzAxODI0RDFDRUI1OTlDNDdERTlDRTIyNzQKQTQxRTNE
-NEVENjhDNTZEODEzMDg3N0UyMUVFMTYxRTg2M0NGMjc0MTNGREMwQTlGQkFDQzZENTE4QTc2
-N0NEQzcxMDJCNzg2RkFBOEJFCjQxM0Y2MjUwMzFDNzk5MzQ4NzlEOUYwRDBFODJCNTMzOUJF
-NUVGOTcyRjRCNTQ1MjkzNzQzRjBFMzE2NDdCNkEwMjI1NTBCMUNDRUMzMQo4NjI5N0IxRThF
-RjlBMEFGNzZENkIxNDRDODRBMkZGRDVBRTRCRDRCQkU2QkUwODRCREI0RTUwMzIxNjgzN0Qy
-MjlDQjgwRTRFMkNDNkUKM0JBNzAyQjNFMjNCQUUxRTk2MzA5RDkxOUEzREJENUYzMEQ3OEM1
-NzU5OEVEQzNCRUU0QTgzNzRFNERCNzYyM0UyRTZGMUMzMjE1QjM2CjMxQUU1M0EyOTExMjk4
-QTk1MjYzMUQ4ODg4NEE0NzdCQTA5RjUyNjA3MEFFQjhFMEU5RTFGRkI4RTY5NERDQjJDQkJF
-NEU1MzFBNzU3NQpERTlEMzVCOEVCODdERDVGRTQ0RDQwNDRCNjc0QkNFQzAzOEY1RDREOTMy
-NEM1RENBMUMwNTA1REIyMDQ5N0MyOEYzNDVBMjgzMTNCMTEKMEJFMTlCRjRDMTJBNDI0MkZE
-MDFDRTM4NTM2MkMyNzNENEEwMUYyMzQ2NDJEOTY4N0RDOTMwQ0Q2NjI2MzM0NDE2MUVDMDhC
-NDlDMzBBCjBFMzkxNzZFMDcyNzJDNUZGQUQwRTNBMzQ4OTI2MUEwNzBERkVEQ0U5RjI3RTVE
-QkM4REFGNjk5MzQ0QzA3MEI2QzAzMDMzOTIyMkRFQgpDMUY2MjVBRjZEQjg3NUM2OUZFREI0
-RDYxMzU4MTEwMDUzNTRCMjZGQUYyODRDQTJCOTJGNzM5OEUyNEQ4ODg3QzhFNzBBMTUxQTA1
-MzgKOTg4M0VDNzdFQUU2RjJGN0Q2Q0ZBNzdDNTJEODFBQzIyMUVCNjcxMUVFNUYxMUM2MjFF
-QjNBRDJFRDU3NTVGN0IwNTVDMTk3NDRCOTM3CjRBRjk4QjlEMTc4RkY3QUY0RUFFMUY1NEY0
-OUI0QzlCNzZBMzk0N0Q2NDc5NDFBNUMzRkI5QzNFNUI1QzU3RTRFREVCQ0U3ODMyQjE2QgpE
-RkU3M0ZEODQ1ODJFMUFGNTdBMzkzNDA0RkJEQjA3REY0MzQ0RkY1ODM3RDgyNTgwNEFEQkY1
-QkY4NTY4MkQ5QzIxNzdBREEyNjE1MDEKMzlCMDVBRkU2NTY3ODc1M0VGRkNBRDRGODcxQTND
-N0NERTkxOUY3QjY3N0Q5M0FERTE0MUYwNzc4QzFEQTBEMjVFNEE4MzY3MDg5RTA5CjhDOEU3
-NEVCQzcwQkI1Q0I3Qjg3MTdBMkYyMzQ5NkJDMjRCMDAwODVFODMwRUFEQTQ0QjUyOEU4QTBD
-RUJGQTg3MDE0MDU5OEYyRjY4MAo0MEMyMzdFRDkxNUQ0RTlDNTE1OEIxRkI1RDhBQ0UzQjY2
-RTQyOUU2QjUwQzIyRkJDNEQyODlBMTVCRkY1MkJCQ0Y3MUZERDM2QzY2NzkKNUE5REE1MzAz
-NjU0Qjg0RUREMjdDQkYxOTlBMkM1NjRGMDgwRDhGNTc4MUQzOUEzMkIyMUJFQkJDOTc4RkY4
-QzRDMzY5NEM0Mzk2NzI1CjY5ODExRDYwQTk1RUMzMkEyMzJGQzBERjEyNzZEQTBERDZBMjU0
-OEZGQjZDQUQyMTk3QkEzQzcwNEQwQTY3RkI4M0QwNTA4N0M5QzFGMgo5NEJCQ0YwRjcyRUVF
-OTE4MzNCOUE2MjVDNkE3NDlDMzY2NkM2QTc3NzAxMEUwNUYyNkFGQ0NDQzFBNkQ2Q0EyNkVE
-QjhEMTJBNzEzRUEKNDNGMENCOTY5MkU2QUFGQjI0NzA3ODdDQjIwN0Q3RjNEMjk3MTU4RTRF
-MzdDQ0ZCNjdFRjAxMTc3QzM2QkFDRjU1MTI5MTlFNjJDODg0CkRBMTU1QkZFMjU3QjgyMEFC
-MzZFODhBOUY4QkQ1OTA2NDJFNkVFMThEMjk1QTUzQjg0MzQyRTdGQ0ZBQzY0QzIxRTY4MUQz
-QTk3NDg1Ngo5QTFFMzNGQjQ2MzNGRUIyREU1NzI3ODcyMjAxNzYzQTVFNjQ5OTkxNjY0QzQw
-Qzc2OTA3QUM4NzZERjU2NjkxMUY0RjE1MUM4MTUwOTEKQkYzMTE2RUU3QzYwQ0JEMzc5RDM3
-MzdDNDJGQzM1Q0VGRkQ3MjU0OTJBODBGRjBBQTE3RkFGQ0NCRTVEQkQzMEIzMzEwMzE5NTcw
-MTgyCjAyRTkxRkYzODEzRTVCRjQxRjc5ODZCQjk3MDgwOEZGODAyQzAyQjMxQjg5NkNCNDgw
-QTUwODIzMzRCREY5QTM5MENCMjBFRjAzQzFCQgpGQjY0Mjg4QjI0NDY1NUFCOUVDQjhCRjhC
-OUVBNjE1NzFBQjJGRDNCMUUyOTE2RDM4QzI0N0MyMUY0QTRBRTAzRjdFMUNERDFBMjgzMDcK
-MUFFMDM1OUI5NjBGRDlDNDVBRTM5Nzk0RkNFNUQ3M0NBMUE1MDdGQzZEMEVBMDZDRUVEMTdB
-NDA4M0E1QjZBRDRBQzYzQjlFQ0MwMzc1CjBCNzk5RjNCQjZGODZFMTkwQkZENDdDRTdBNjk3
-QzZCMUM4OUMzQjU1QzJFQzA1OEYzQ0ZFRjJFQjUzQjM1Q0RFNzc0OUU3OTUzMUQ4MgowQTE1
-ODNERjM4QjJGQzBBNEVGREM1QzMwQUE1RDFERDc3REQ4MTk2REU1MTcwMTAxQTRBQzhDOEI5
-RERGREE5M0U5RkRDMDdGM0Y1NzIKRTE1NzdBNkUwQkIwM0Q1QkVEQzVCM0FGQUNERTFGMDE1
-NTM0Njk1OTQyRTlGQ0Y2RTNDOEQ3QzcwQkU1NjczODg2MkUzQTYyOTIyMzkwCkYzMUFFNTM5
-MUQ1NUQxMjU2ODBGM0ZDMERDMzkyQzdGNjk2Q0I5Q0NFNkVERkYyMEEzRUE0QzM4RUMxNkIy
-RDMzODkzRTE0OEREMzczRgpBMzA5MEFBMDFGRkQzQTM3QzFCQzgwNTMxQjQzMTBBQTQyQjdC
-MEZCRTAyNzYyQTY1NkM2OUExMjg1MDAzMDkzMTU4Q0MyRDEzMDU0RDcKQTE5MkRBODg4Mzgw
-QzgyRDRFQzAxQTc3RUU5NjJCNzhEMDUzNzNCMzdBQzU4OEJENUY4RkNDREUxOUM4MDBENjg0
-OTlFOUIwN0JEMzI5CjcwNjkxRUI2QUIyMUZGNENFREM5NEM5NkU1NTcyMDcyOEI1RDU0QUU1
-RjhBNzkwNUQ2QjE4RUJCMTg0OTkyQzJENEI0RUQxMjA0RDZGNAo1NkFCNjQ4MDc2QzI0ODY0
-QThBN0UzRUNBNTJENUM3M0U3NjBBNDQyRjFEMUExNjJGMTU1OTM0NDJFMEMzNzg1NUI1MUZF
-QUFDQzRCMjAKOTkzRDlEOUIzRUY2OTNDQzY4Q0E3NUU0NDlGMUUzMkIwMDIzMUE0ODRGMTEw
-QUFBMjA2NkE0MzQ4RDhEQzVENkFDMUZEMzc0RTQwNEFCCjk2RTMwOEJCMkExNTk5MDFCNkFB
-RTEyRTFCNUI2Njc0QzBEODIwODQxQjQzMzVDREYyMEYyQzY0Q0NGQzdFQjA2NEZBMEEwRjA3
-QjEyNQo4Q0Y5RkE2REU5QUY1N0IwRUNGMDlFMkRGRTk2RjhGNzhCODNDOUY2ODlGMUExMEQw
-QkQ4N0ZFOTkzMDcwMTU4MzE3MUZGREMzMEJCN0EKQkFEQkFCNUIwNzkwODZBNzk0M0EzQzZF
-RjVDOUY2NTJGOUJGMDM1OTE2Qjc2NzY0QjdCNTNFRUVFNTREOEEzM0Q1ODQ2RkM2QTZCNjRF
-Cjk5RkVGNDNDN0ZFOTBERkVCRjgzQ0U0MzU2NjEwQzY1Qzc3MTQyNkU3RDI4QkI2MDBFNzQz
-QTU3NUY4OEU1QTNGMUE2MUI1RjUzRDQzMQoxNTE1MTZCOEQyNDdFNjQyNTc0QjQwOUNFNDE5
-MUZCNkVBMDQwNTg2RjQ5RkQ5MTE2RkNDOUI2MDJGNzZGNjI5OEZBNzQyMjFCMzUwRUIKRjY5
-RjY4NTREMEU4RTJFOEJBNTBEMkRDRjdDMDREM0I5QjYzQzcwMjIwMDYzNzFEQzNGQjhFMTE0
-RjQ0QTUwMUMyOEE1RDYzMzgzOTI1CjM4OTZDM0NBNkE2NUE5QzBCMDk3NkE5QzVGRkYyOUVF
-MUQyN0IwQjZBMUNEMkEzMzkyOEY3NzlDQUI2NTQxODdGRjAwQ0FBRDBGRTI3Qwo3OTNGNUIx
-QTFFQUFEQjc1NzRCMkIwMDdEOUFDNUYzNDFFOEFFNDcxMDg4RERGQjZDREFDRDA0MzdEMUE3
-NUZENzUzMDE1MERFNDA0MTkKRTE0NEM3NzcyQzU4NjZERDA5RkZERjkyOEVBNDk5MTk2M0Uw
-QTU3ODQ5NjFCNDY3MTEwRTRCMTI2RDBGMDVDQUNGM0FFRENDMDBCNTU5CjlDNzg5MTc0Rjk2
-RDIwMThBQ0M4QjU4QkNCQ0I4MjdENjk0QjVBNEUxRjhDNDMxMEY3RkY1QzUwRkIzRTc3NDE3
-M0QyMUVDRDREMjc2RQpCMDJFMDhBNjA5MUQxMjAxRkMxMTc2RjA0NjQ2NkU0RDY4NTY5MkQ5
-N0VBQkVEMzY5OUFDNzQxRkQ1MDZDMTBCOTBEQ0FBNkI5MzZFNTcKMkE0RDdFNjg2MjE5OEIy
-OUFGNTcwMTAxODg5NDFDQzc2NjhFQzZDRTg2MEY0MTZENEFCOTVDNDRFMEIxNjg1ODA0QkZC
-MzI5OTE5RDJDCjBBRDk4Mzc1ODdBMzgwQzZGQTNGNjA1RUUzQzg0QTE0RjRFOEU1NzAyQTFG
-NTA1NzMxN0UyQzNBNzBDNERBNTNGRjE3MDNCRDg4QjE4QQowN0E2OEMyNjIyQkEzQUZENjEw
-QTRDM0FGNzNCN0VBMDk2NUIzNEM2OUFGNzIxNkY5RTlBMDBDQjYwOUFDNDU2N0VGRkVBQjI0
-NUFGRTkKMDI1MDZCODExMjI3QUYwMzZFODk4NUEwRDg5MzFCN0RBRDlDMEREQTAxQTg4QkQ1
-RTQwQzZERkUzRkFEN0QyNjhBNDFEOTNFRTM4RDJDCkI1QjhFQ0Y2QjdGMjk1RDEwN0IyMjE3
-QjA1NTVBNDM5RTk1ODZCMkIyNTI2OTM0REM5MjJDNUQ3NUM0QTU0NjlGOEIzQUNCNzIyQkUw
-MQozOTMxODQyOTEwNUE0RjVBQzI2NTdBQkI0QUYxMUVENjcyMTNBRDE2MTIwRUZDNjAyNjQ4
-MEZCMTVBRUMyOEYzQjBDMEFDNUI4MkFCNTUKMzIyQTlFMEU2REUzOUFDMTAzQzFCNEVFM0Y2
-MjM1RUQ2RDlBRjBBRDRBMjk0OUM2MUMxODI5NzhEOTk0NjREQ0U4MTQ2MkE3NURCRTlCCjM2
-OUYwREFFQjY2Nzk0ODcyN0I3MjFENEI2QzdBRUIwRTcyRTg2ODk2QUM2QkUzRjg5NDhFNUE4
-QzNBMkEwNEZCODg2NzUxNUFEQjkyQQpCMUQwQzc3QjVBMjlEODcxQjZFMzQwNkQ0NEI2QzRB
-RjRBMjkwNzQxOEJCOTlGRjQ5MTJGRDVFMjE3MUQxNDFCMDlDMzgxODU5NTA3MEQKNTgwNDEx
-QUJDMzg2MzI5OTkxRjREODZGQzdFREFBQkM4MTdBNzRCRkZFMzkwOTMxMTVGODI2MzQ1QTQ4
-RTk2NjY3NEIwRDMyOTBBNkJGCjFCNkY2MzREMDAyRjdFMTdBRTdDMDY1REM2RkI0QTE4ODk3
-RTJDMjVDOTZCOUIzNEE2QkNFODhBRjFGMEQyQTgzRDg3QzRGN0VCRUNCMwo5RjkwQUMxNTk0
-RDM5NUY3ODVDQjBGREE0QkNCN0UxNkNDNzhFNTgyNTI1QzVFQTA3M0U5NjExQkI1QjcyOUEz
-NzJEQkI4MEVEMEE1M0IKN0Q0NEUzNUU2NUJBNUI1MEUzODNGOTMyRjdEMEMzOEI0QkNFNDND
-N0VFRjRDQjFEQjE2QUQ1QzNCQjc0MUFFNzNERDAwQzBGNUY5NDlFCjFDNEZFODc5RTdERERD
-Q0Q0NzUxOTc5MTdENERGM0NGNjJDQ0NGQ0VDQjMxMTM3QjBEODA3QUNBOUEwMjQyODk4RkFD
-OTU0QzM4MjIxNAo2NkJCMzZCQzU0QjFERDZCOTI3OTI0QTVCRTFFRjY1QjY2OTdGQzZGMEI2
-MjFBQjU0OTlDMDNDRTRBRUUzQ0Q3REZEMUNBMzY5REZFRkEKRjQyMUJBMDFBOEQ1Nzk0RjYz
-QjA1NjI1Q0UwMjUxM0I0Qzg0QjhDMDE4OURCMzM2OEU3QTc1NjhCNDIyREVCMDdEN0UzNEQx
-MEQzN0EzCjFDRjU5MTExRkE1NEU0OTA4NjdCQkI0NUVFNjM1RDRFNjkxMTZGNEYwMDgxMjBG
-RUVDNkZCN0I3RkRCNUY5MjEzODFDQzUyMEM4MTZENwo0REMyOUVCRUFGNDFFQTYyMzA5ODJF
-NDg2RTQ5MTZCMjg1Q0M2NjU2RUI3RUIyQTFFMTM4MTdFRDIyRkUxMTlFNDk0NTJBQTBCRUE4
-Q0QKREYwNDU3Qjg0NTBGQUE3Q0E2ODYzQjQ3QjI5N0YwMEFBNkYwMzk5NDFEODk2MjYxNTNE
-NUZFN0Y1NEVEMDJGRDAyQkQ2OEVBQjQwODM2CjU1QzExMzA2RTM4RTg5RjQ4NTNFOTExNjk2
-ODk2MjMyRDEyQTA4MDAxMTNEQzAwNjZBRUFDNkUxMEFDNUNGRDU2REJDNEJCMzZCQUFFQQpC
-MUE4MjFDRDdERDVGRUYxNzg4NEY0NkJFODIwNDBCNTM3MDVEMzU0MUVDRkZGNTdGMzc5RTlC
-RTYxOUY1MjQzNjAxN0Y2QzY3N0UyQTcKOEMxMDVDREMyNzZBN0UxMjIyNEJGMzAyODRBOEJF
-MUFFMDYyMzFDRUU4MDM5OEYxNjA0MEZDNzIwOTM0RTMzRTQ2RjRFNENGQjQxMEQ2CjJCMzdD
-OTVDQ0Y2QTVEMEIyMDU4NjVERkQxMzQ1MjA0QTNEMkFGNUFBQkU2QzVDRkMxNkU5N0ZDM0NG
-MjdCQUFGNTRGNEYzRENGMTM4OAoxQzk5MTZCOUJBRjhEMTYwREI1NTczRjE2QzVBMUY5NURF
-ODhGODc4NDYxQkZFOThBQ0YxMzdDMTQyNjhERDg4ODJCMjBBMDg1OTkxNEMKRERERTI4OTlD
-QUFBNDE5RjU2MUMwNEZGMERDMjkwRjQwRTMxOTIxMDMwMEU5MTYyODgwMUFCQkQxREZGQkFE
-QzY4NTA0MDI3MkRGRTkwCjdGM0RDMEMwQTVDNDE5RkQxN0ZCRDRFN0I2MERDMUVDMUI2OUQ4
-M0Y0RURFOEI4QzZBNERDRkQyRDQxOUJBODhCREI0RDlDQTA1MDRGNgpEQzI4RjUwNzFFNzNE
-MkJBOTVEMTVCOEFGMDE1MjdCMjMyMTgzN0NGMUY2NkRDQjU4QjYwNzEzNDlENUVDOTUxRTk4
-QjBBM0UyOTQ1RkQKRkE5MjhENjM5M0Q4NTIwMjRDRTBEOUY1QUQxQzBENENEMjc1MzI4RjEy
-NjNBOTY1QjUzOUY5Rjc3QTExRDk2MDFDNzBGRUM2MTA5RTNECjUyNTI2OUI1NEFDN0FFMTBB
-QkQ3RTlERkU2RDJDMTE2QURDQTA0ODg3RjlBNjEyMzZCMkI2Q0YwN0JGNjYyOUI0RjkxMjcy
-OTIxMDA2RQpCNzNDQTY2OTU5NDM4MjhDOEI2QjZBRTZDNzRERTI2RDAwODc0QjBDQUMyN0I4
-QjZDRTJBQzI5RkNFRjJERDA2NTIwMTEzNDgyQjlFOTcKQjBBNjVCQkUxNDU3MkU4RUQ1RDY5
-OEM0QjMwQjMxRUY0QTY4NjU5Q0IxNzhEQzc5QUVCOUMzN0EwNjkyODBGMTBFODM4MDc1RjM4
-M0IzCkU1OUI4RkE2RkVEMUU4NUFFMjYwQzVDOTYxMkY2NTcyMkE2RUVBOUUwRTkyMTg4NzM4
-MDE5QTNBQUQyNUU3NDY3OTFERDhGRDkyQUUxNQo4MThCRDI3OEYyRTI3REY2RjVFOUY0MTBF
-NDE5OTM1RTg4Mjk5OTBDMUE0NkJBMjkxMjQ4M0Q0OERENUJFNTRBNDJGRTMzNjA0MTdBQzQK
-ODZEMTk2MzM4NjdFQUNGOENERTU4NjVGMkE1REJDRUJFQkJCQUFFQTY3MEFBRkM4NkVDRjIz
-NEZBQUU4MjVBNDcwMTQ5MTNCQkMyOUEzCkZFNkY0QjhBRTA5RjYyRDJGOEI2RTU0RDVEMTY5
-MUQ4QzFBREU2RUJBREQyNjhEQ0ZEREM0QTU4NDg0QkE3MkQ2OTcwRjREQTc5MDVFRAo4MDcw
-OTYwMjI1RDczQjc3OTIzQzVEQkJDMzU5RTM0ODIyMzQ4Mzg3QzMwOUIxN0U0RjM2MzI0QTJF
-QTFDMkYzMDVENkUyQzc1NzNBQzYKNjMwOTFGMkY4Mzk2NDU4MzcxQkI2MkIxQkEwNDFENDE4
-QkNDMDM5NEI2OTc0QUFGNkJFMzdFOEU5QUE3REE1NDNFREU5RjgzRjZERTA2CjE3N0U2MEM5
-ODY4MEI4RTRENkRGRENDOTIxQjZGMDQ0MzY2NTM5QkFBOTgxM0E2QUNENDhEMEYwMjI5QkI5
-M0FGMjQ0REQxOTFBMkIzRgoyNkZFMjhCQkY0Q0E5QkE1RDJFMTdDRThGNDVCMzVENTk1MjIw
-RTQ2QkRCQ0M0NzQ4NDkxMTg2OUU3MDBEODIyOUJERTJERDQ1Nzc1QzgKNTY3OUE3MzBDMDA3
-NjZFQjhFNjlCQThBQ0QyRDkwM0JGMDFCOUY4MTY0RTNDQzdDOTU0NTU5MEM1NUI1Q0MxNzMz
-QkNBQkE3QjA3QTc2CkVBNjFBMDMxNUEwNzdBNTM2MjZFQzU2RDFDMkRGMzM4REYwOUI0REQz
-NzVGQzE1MjYwODA4QzJEQjRGOTY1OUQ1MkY1NkQ0NzRDNTg4RQowQTc3NTc0M0E3MjM4NDYx
-MDQyQkM5QzQwRjFDNEY1QUM2NDBGNTQ2N0RGOEMxNzFFNzRGRTY3MEIzMzFFNTdENzc5OUYw
-QThENTE5RjQKODhCREEyOTlBQUQ4NjYzOEE5OTgzMTcyRDA5RUM4QUNBN0I3QzA4MTlDRTc1
-MjhGQUYzOTQ1NjlFMDRGNTRENUE2MDg2RTc1ODhGQUZCCjY1QUY3RTY5MDRENTQwOUI2MkRB
-NTdBMkMzRTI2MTg0RDY4RDVGRkYyOEU4QTAwMjdFQjVDMTI4QzlDMTJGMUMxQ0RERjA4RDhD
-OUQxMgpFMDU3QUQzMENGRDkwRjNBMjlDRUY0NTI1RUJBMDUzOTYzNzBEQTkxQTc4MDJBNTFF
-NDBDMzMxRjVERTJERjRBMzk1NThDRDY2ODI2NDAKMDNEMTc0QTQyQzUwQjZBNUIyQUI3MjAx
-NkIyQjVFMzlGQ0JCRjUwMjlEMzk3MTJCRTAzMTcxRjEyMDhCRTVFMUE5NDVBRUMzQUZDQjlB
-CjdBNUU2MDU4RjcwQzNBMUMyQ0RBNzREQjBDNDNBMDk0MjJFMTFDRDJBNTdDRTRDQ0YwRkU1
-OEU1RTJFN0UzMDUxRTQwMUMxRjM0NjA2RQo2MTZGRkI0RjQ0NDJEQjE0MUI5QkU0MjZCRkJE
-NDNEMTQ1ODFFQTQxMjhEMjQ0ODE4Rjg1QjY0MjRDODAwREMxMTdENkI3QkQ0NjkzMjEKMEQ3
-MjU1MDM0MEIxREQxQzQzMkIwNUVDNDE0OTIyQzg5OUI3NTU1OUQyNUE2M0E0NDIyM0ExNDlB
-REI1NzRFQTUxNTMyMEU2NzhERjY2CjZBQTlENjE5QjNDNDgzMUIwMEY5NkYxQzAyNzEyQzM5
-NTM4MUNEMDM4M0I2M0JDNTNDMUZBNEM1Q0Q0RDAwODYyRjY4MTlCNDkxRDI2MAo0QTRBRTQ5
-NTVGNzYxNUQ4N0MyOTgzOTZDODI3ODA3NUZEQzAwOENBQzI1NDczQzlGOUNCMjhBNTA3NDUy
-QjdFQURGQTU2QTNEQUE3QzkKMTZBRDRGMDkwMTIzQzhDODg1RDlEMUVDQkZGOEQwNzRDOThC
-RThGMThDMEZEQzI1MTBBNDMwNUU5Q0M4QkE1NzEzNzRCQkI3QkJGNzVDCkYxQ0M5ODI5RDVB
-MUEyNTJFNDczMEQxQUUzMjEwQUIwNzRCNjdCMDBDNTQzOTEzMjhDRTExNDdGMjA1NTAyREZF
-M0E2RUM0N0E0RDYzQQpCN0QyNjM3QjJEQjEyMUU2M0ZBQzFGRUM2ODg4OEEyMDAxODQwQTA1
-QUM5MEIwN0I1NzdFMTFEOTc2NDQ1MTczOTRBRUMwN0NENDBEMDIKQ0RCOUJFNTY3REEzRjQx
-MzVCMDI1M0Q1MDNENTBFQzU2NkY0MjIxODJEQTE3M0FENjJFMkI5NEQzMUE1QjRGMjA5OUY5
-RkNBMjUyMjQ2CjY4NjJCRUY2NTg1RTFBMTg5NTY1OTU4QjM4QTY0Q0ZFQ0E0QkU1MTVFNkUy
-QkQ4QkM1RUU0NEZDQTU5M0EyQjg2ODU0NDMyMTk0OEU3RgpBNEFGQzFGNUEyODY4Q0ZGRTM2
-M0M3QzZFODgxNjU0NDRFMTNDOEM0N0M2NUU3MkM5QzhCMjhDQTQ5NkI0OUEyRTQ2RDgxQjUy
-QjQ4QzUKN0IzQzgwMTFCQUI4RThEQzlBMTQ3NjcxNTNDQ0Q4RkY0QTIxNjZGQjAwQTYwNDAy
-RkUwQUUzRjA2OTFCNTcyNzY2RkE0QkNFNjA3NTA4CjNCMkIxQzNFMTZDRjRDOTEwODQ2MkFG
-MUU2QTQ4RjREN0ExQTQxNjQ1RkEyNzY3NzI4MTAyMjk0OTUwMDQ4M0I0NkJBMjNGMTc1NUI1
-RgpFRjA1NzhFNUYyRTVCRkNFRTJGNzEzQjMzMjRBODM5MEFDRTE5MUQ1MTQwODAyMkMzQzhG
-M0EyMDc3NjZFQUNDMDVBMTRFM0MzRUI2RTQKODVGRjg3Q0U0QzYyRkFFM0M2QkFEMEQyNkFD
-QzhFN0U1ODRBOENEN0EyNUE5QUZCNDJEQTYxMDZGMDdBNjVDMjYxNjcxMjAyQURBRDY5CjU0
-MkVDNkQxQ0M1QjFFRUI2MDVFNDc0QkM5NDlCQTdCMkU4QTY0RDRGNUJEN0JCQjMyNkMwNkY5
-NjMwRDRGOTlCOTcyOUNGNDIwNUQyOQoxMkJFOUNGODFGQjExNDU0MUVGOEQ3RDVDRTRERDE5
-NTFDQkZCQjVCMkZGNUE5ODk2MjAyRDQzOEM3MjI1QjhCMEY0Qzk4NUI1QTk0Q0EKMDk0NDhB
-NDZDMkUzRjA0Njc0QTU5RjU1QkE5ODUxQkE2MTQyNzM4MDkzMEJGMjc0N0NDQTdDQjkzMjM4
-ODU2MTk2OURGN0Y1RDk1NDVDCjUxOTVFNTJBODQ3RUYyQkY0RkUzMzI1NTYwNkJBRjNBRDY5
-NTU0NENBMEZBNzY4MTAzNDUxNzY0MEQ1NjExQUUxQTVGMTE3OENFNjk1QwoyMjNFMjlDNDFB
-NDAxNzc2MEYzNjUxMTIyQjdCREE0RTk2N0JGNUQ3NkZCOTM5ODRBNTI3NzNDNTE4QkJDNzFE
-QjMyRkM1MUZDQzJGMjcKQkY1OTYyMkM4OTA3MjQxQTE2RDMxMDc5QUFGMUYzMTAwNDFENjND
-Nzc1MDg3MkY4RkUyOTRDMDZDNDgzODUyMzk5NDE0QTAzRDRCNjg0CjQ0Mjg5NzE3QjNEMDk3
-MzI0RUE3OTFCOTYzQTI3M0QwMzMxNzE0RjFGOTEyRkQ2MjYyQjgxRkM4OUE1MDUwQTVGMzQx
-RTkxNTAwQ0IwMApFOTcwQ0VFMjJDNkMyOEVEMTUzQTQ0Q0Y0M0U5REE1NUZDRkVEOEI5NTNG
-OTQxMkExRkU0NzcxMDREQjNCQzQ2QTg5NzY4MkI0OTEyQUYKMURERTdGMjBBNkI5QTQzNjUw
-NjBDQURCRTUzMTZCODA1QUQwQzVDMzJENTVCODQ1OEM0N0I1RDQ3RkMxQjQxNDBFMEY2QjQy
-Qjc4RkMwCkJEMjYyMzEzRjk2REZCRUY5RUZBNUE0RjU5MEJDQkEzQzQ4NEExNTFDMDUxMTNF
-NERCOUM1NkZBMTg3Q0U1RDA3QkZBNURBOEVCREU4MwozRTc1QzZBRThEOEU2NTE2NTRFMTEw
-MDgxNzJCRkJFQzBDNTlGODNCQzFENkFEOUM0REU4RUVBQjc3OUMxRjhEQzQ3OUVEMDg0Qjc2
-RDYKRDU4MkRDRkUwOEJDNDM5N0VENzFGMjU2MjU3NTIzMkQ5QjQxRUEyQjVGMjM3MjJEQTQw
-MjMxRTlBQjg1Njc3QzI5QTZCQzM3RkMzNkU0CkRDNDQxNDY2MUNDNjI3RUJGOTRBRjJCMTND
-QTU3MURCRjAxMDVEMDg2MzJDQkY2NDBCRTFBNkY0QjMzMDQ2MjM4RDYyRDExODk2OTJBMwo2
-RUMzN0QwMjk5QjJCNDNEOERDQzA2RDM3NEVBRjBCNUQwMDBBOEIxNDRBOTU0QTM3Q0I3QkE2
-QjdBQkEzNjE3QkUyRjcxOUZCOTU0MTAKNTE3OTg5OUZEMjE4N0JDOTA2RUQxOUQ1NEQ4QkFE
-MkI5NzBFN0I2MkFFOEVFMUIxNzk4OUUyNkYzNDBCREFFMTg4RjdGRjQyMTNBMUVECjc1OEZF
-QjBERTMzQTMzRkNFREQzQjg3NDc5MUI2REE1RjYzQjkxQTJFRDVEQ0Q2NzE4MEQzNzQ1NjJB
-MkFEQzczMzU5Q0U5RURGODhDRQo4MjRBQUMxNTA3OTQ0MUE5NUQ4RjBFQUFBMThFNkNGRTQw
-MTYzMjZBNzVBNzZDMjEwMzQ3QUNBRkJCOTBDM0UxNEM3NzMyQzhGNUNFOTcKQ0M0QTlDQzZF
-MkYxNDQ0RENEMTcwREIxMkE5QkY4MzJDQTFBMjM4QTI5QzYxRTUxOUU5RjAwRjBGNTA5MEU4
-NDkzM0YzNUZCN0U3MTdCCkI2NDk5MUVDQkU2NTBFNDg2NEIyNEFDQTkyOTc0M0VCNzc1OTFG
-NjQ0ODc3ODlFQkZGMkEyQkUzOTlDNTA5N0Q2QzY3M0I2QzVBMjE3OQpCQjNFODQ2RjQ5RjJG
-ODNGM0IxRjM2MEZCQjJEQkE2QUE0QTUxNkVBMUJERUQ1MEE0OTdBREY1MjBGMkQxODg0NkJC
-MzBBRkExQjczMkQKNzYxQjY3NjAwODBCNDQ4OTYzRDc3Njc2RDlCQUNDMTI3RTVFMDMzRTRG
-MTIxNUYwREZGQkY3NDI0NzQwNEIyNzYyMDFDMzlEMTg3REI1Cjk4ODZBNTk3RTA0RTRDQzA1
-REJBNTAwQTI0QzlGMjIzN0Q1QkREOTNGOTA4OUI5MkM2NTNFNDdBRjhFRjAwRTYyRjVGMjJG
-RjhBQUREQQpDQ0YxQ0VFRTYzNTBGMzM0ODc5MjkxMkRDNjEzMUZGQzFEQjkzRkZDQUNGNUI4
-OEM5NkY1REVFNTcwMDA4Q0UzOUIxRTAwMkEyNEJCRkQKQzNCMEEwOTc2N0IyNDY0NDIxNkJG
-ODkwNUUwMkVDMUZFNjQ3NzU3NUUzQzQ1REE1QTA1QkU0NzVDMjBEQUE3QkNBQkI0M0I0QTlG
-MTZFCjZDNUZGNTQ4M0UwRjUxNzhFMzIwQ0EzOTM4NzM2Q0YzMjU2OUI2MUJFNUJCQzcyNEQy
-QUUwRjk3MEFDODhBM0I0QUMyREJBOERFOEVEMApENDJEMDIxNUQ0N0NCNDlFNjlGRTFEN0Q3
-RTQwRTg3RDAzNTRDODM1RjQ1NzM1NzYwQUMwMkExMzI0RUQ3ODE2RDk4MzhEMjg1NzgwOTgK
-REUwRjFDNjUwNTEzM0IwMDAxNjQwODMzMTA1NzNCRUNBRUIyMENDODgwRUU1OTI4NDVCNkNC
-NEQzRjJDOTRERDA2RTNBRjQzMjQyNDk5CjU2QzJERDUxRkUyRDIyMDhFMzJGQzhBODM3QjQ3
-MDVCNzFDQTY4RDcyMTRFOTJGMjk5NjA2NkFENkJBODY3MkEyQjA5NjUyQjNFMTg2MQo3RjZC
-MUI2MENFMThGOUVFNUJFQTM2MTZDM0VERUI5QUI3OUVEN0RCQ0ZGMDVBRTZDNUUwM0YzM0M0
-QjIwQzVEMkFDOEIwNDlCMDlBODAKMUVBODNEM0UxQ0M1QzNDQkY2MDhCMzlGRjI2NjIzNjlC
-ODU0NzhFQkRENDU2NUFDN0U2RDc5Q0RDRTBBMzZFOTEzRkI2QTZBMDk4QjRCCkExNkVERDdC
-RjE0MTVEQkMwQTMxREUzMDkwOUREQjU4OEM1NzNGQTU0QzNBN0M3MDNENzZCRTk3NTA3OUI3
-ODEwNzNDREZENjBFQUU2OQo2QkY5OTFCNjlEQjU0RkUyNENEREIwMkE0NENBOEMzMkYwOTM1
-RTc3QTVCODMzOUY2MEZDODYzMEEwRTkyMUE0NDQ2NDNENjg1MDFFMjUKRjY0ODEzRkQ5NEFG
-NDVGOTA0MEIxNDhCRjA1NjhDMTk2M0Q5QjI2RDcwOTk1MTY5NDgzQjAxMUQ4NjVERDI2NDIy
-NTMyMkM0NUZDNjVDCjUxNzJERUM3MEQwQjJCNzkyNTk0QTlDQUNCMjFBMjI1RThEMDc5MDhB
-MDUyQUU0RjBGQkQzOTE4RjdGOUFCMEQ3RDJFQkRBNUYwRTA3QwpEMDQzMDQ4QzVEQThGMEEz
-OEMyMjVEMkMxNUE1RTAzNjg5MDQ5RDgwNDYzQjdDQzM1QTU0RTIwMkZCMjMzMzcwN0UwQTM2
-ODJCODUxNTAKMUJFMTU3MTVBOTRBQUZEQjQ5QkY2QkU1RjgwRDgzRkNBQjI4QjBCODAwRDY4
-NUU2NThENDEyODZENEJENDIxREYxMDQyOEM0MDU3N0FDCjM2Mzg2RkM2Qjc2RkJCOThCRkI2
-QTEzRkI2RkE0MEM2ODM3NjgwQ0ZCMTUyMEMwNzA2MjU0RkNFNjIyRDE0QUVCRjU4NzgxRTBC
-RjJBNgoyMjJGNTRDNDM3MDRENEUzNzBEMEFCM0M5MUY0RDU1MDFEQ0Y2OUZDREI4QTA4Q0Y3
-NzA2REZBNDU2QTExOTEzQzQyRjYxQTgzMkFFQTgKQjE4OTQwOUUxNDY1NTczMzhBQjA1OUFD
-N0JBOUNGRUVGMkFBOTY5QzU1NjFCNjc3NDE0QTkxNjgwNjQ5Q0MzREFGRjU3NkZFNjg2RjlB
-CkI5OTMxQTc0OUFEMTdGNkMwQzkwMTIwQUY4QTk1ODQ1MzVGMUYwQjdDMzExMzRDMDlDOENC
-MDdEODU3Mzk1RjAwRDk4Mzg0RDhCRkFGQQpGRTI3NTY2QUY5RTk2OTE1ODcwQzg3NDk5RUJG
-MjQzRDhFRTgyOTFFNjBEQzczQzhBREMyODg2RTREOTgwOEEzOTk2NEQyNEI4RUEzMEUKRjkz
-QjA0REZCREE1QTVCODY4RDI5RTM5NDUwMzBBQzBBMzk0RUM0NjU3QjRGQUQ5RDJFMkM3OTY1
-REM3RUE5MTZBM0UyMEU2N0JCQjdFCjk5RDUyNTU0RDIyNDkzOERFQjM1QjExNjc2RjkxRjVF
-RDI0QkE2NjcwRjU3NDUzN0JGQkNENDAzRjA5MjEyQzNERkMzQjhGNEREOUVFRgpERTI3NjU2
-QUZBNDFCNjlEOTA5NEZEMjM3NzlCMzdENkU1NERGQjZBNjU0OTIzQUE5MDkzMDA2QjIzQ0NE
-RDY4REUwRDZEQzZFOEIyMzIKNDY0REYyNTQxMkRBMzI0ODZBODE4ODc0NTA4OTFDRTQ5MTcy
-Q0YwMDMzQzNDRTAyMDZCMDJBOUJDOTRGQjYwOTQ5MUJEM0I4RjJEN0Q5CjA4MDEwMkFGNjg0
-RUY5MzkxMzE2MEEwN0ZFNzg3QjFGRTg0M0E5MDY0RENFNUUyOTYxMjEyOURGRUUwNTU2NDZG
-QjVCRDc4MDE5MDU4Qwo4RTMyRjI5NzIxNUFDNjMxMzAyMkM0MEZGNEJDOUEzODUyOUNFOEY1
-NzREQkM1NERDRUMwRkIzN0YxRTk5QTUwMTY2RjhEN0ZDNDBBRDkKMjgzNDgyOTUyRTA2OTJE
-MjFDNkI4RkQ3NTkyQjQ4RDc3QkQzNDg3RURGRjY5MzVEQTlGNEE5MjZCNUNCNjI1Qzk5NEIy
-MzY1QTM5Njg4CjA5NUI5QzQ2NjMyNTRDNzMwNDYxN0QyRUQ3OUYzMzNGNTc2OUJFQ0NGMEI4
-ODI4N0YxNzA4RkZBNzIxMUJDMENGOUJCNTcxNUVEQjczMwo2RjAwOUE2QTc5N0VCMzY1NkY4
-QjgyQUM5MzA2OTVBNTExQjhFNDVFMjAwQkE4MkI4MUYzMzc4QkJFMjE5NkI0QjZDRkExOUI4
-MjlEOEYKOEZEREE2MDA2RUUwMjg5NjVDMzRDRkZDNUQ3MUVDRTFFOTg2NEQ1Qzc3MEI2Njgy
-OEI5Q0Y4NzgzQUMxNDEzMzcxRkUyN0ZBRkFGNDZECjk5MjA0N0Y2NEMxRkJDREE1NUZDNjUy
-NUZFNUNGMTZFNjgxRkNCNkYzNTc4NkUyNjIwMzRFMUIxQjRGMDlDQzRBRjNBNDc4QTMwQjQw
-OAo0OThEMTkyQzYyN0IwNkFBRjBEODhFODdENEZFMTNEQzE0QTlBOEEyMEY5RUE0MDRGOERD
-ODlDMTIyNDIzRkZCNUIwRTNCODhGMjVDNEEKNDRDNzk5NDQ5RDEzQjE2OUUyOEE2MEM4NkUx
-NzM4NDc3MjU2Q0UyMkUwMTZBMDMxOUI2MERDOEE5RDA0MjZCRTEzNzYxNjk2MkJDNzM2CjZC
-RTY3ODA5NDI5NTVCRERFNENGNENFRjMxNzdFOUZDRTU4RTcwNkIzQkI4QTAxM0JBRUUzOTUw
-NkU3Mzc4QTlDNUExRjlBQUNBMkVGOAoyMjQxODY1NDI1MDFCNzY1RjAwMkI2QjM1QTc5RUQ3
-QTJBNzdERTExOTIyNTBBM0QxMTlCNjg3RDBBRDJDRDI2OTM0OEM2NTA3NUFGQUUKRDhERDgy
-RUNFRjUxRENCQzE4QzM3NEQ4QTA5MkQ5OUJBRDNBQjVDMjlBOEZEMjhGQjQxQzAyRUYzRTRE
-MDk1QjcwODJFNkQ1RUUxQTVFCjQzMDZDOUU4NzdBN0JFMzQ4RkNBMjQwNTI3QjRDMzQ5RkY3
-RkY4NDkwMUE1RDIyNDI4QjI3QUMzNEI0NEVDNTA3NDQ3NjQ0QkJENTUwMQo4RkJBMDFFQkEz
-NjkzNDE4RUEyRjY5MDZFRjNDMTU3N0Q5MUI2M0NEMEJEMkM1MTk1OTdFRTA3RDk4Mjk3OTQy
-RDgwQjBCNjVDMjU5ODcKOTQ5MDgzRkIwNjQyREZGQkJBRDc0QzIyQzNDMTAxMDJFNTdDN0FD
-MERGNDA5OUM5Nzg3M0RFRjcxMzk0NEJBRUI5MjAyODdCOEUwOTNBCkJDRTUxQkQ1MkNFNDVE
-QjNDNkE3MzdBNTVFMUEwMEFFQUI1MEU3MUY1RDVCMENERkU2MTU1MURDN0NDM0JEMDM5MzRE
-RjI3MkJFMTk0NApFRUM2MjFFQUMwMkRBQUQ4RTU0RTA0REREMkMzRjAyQ0VBQ0M5NDdDNzk5
-NDI0RUZEMUE2Qzc1QzdBMzVCRENBRDFEQkNCOUYxOUJDRTQKMTJCQjAxOUNCQzc1MjU1MzZD
-NUNFMjFFMzJFOUI5QUEwNjg1QzdEM0JGRjNEODJFRUZENjg0RThENjNBNTI2MDE4RjQzMDVE
-MTM3Q0Y0CjZCOTdCREZGQzFFMjhCNzc0NUM4MDgyOTNDMjRDODQ5QzlDNjFFOTNDQzY0RDk5
-ODIwRkZCQzVGMUQ5RjAxNkREQTYyMUM5N0ZBODQxOApBMDQxMEY3OERERjQ1MzE4ODU1MDk0
-NjRFNTVDMkVFQkUyM0FEMTdDNjA5NjE2OTk2NjhFRTc2QzZFNDRFMEQwQkNDODM5QjgwOEFC
-REMKQjZGQkI1ODZDODdBOTU3MTM2MjE2OTUzMzE1OTgxQUZCMjA4OUMxMTA1RUYwN0RDNDdF
-NUIzNjcwRUMxNjY0Q0QxMzcxOEI4REJCQzUxCjc0Njc1MEFBQTM3NEU3MUQ0QUJEQzMxRjhF
-OEFDMzgwNEU5MDg1OTdDQUI4QjNFNzBFQjQyQUM2N0EwQjVCMUUyRTYyODc5NkJDM0E2OQpG
-M0RGQjYzREI3REU0RTQwNDExQ0RCRjk4Qjg2Njg4QUY0Q0NEODY0N0FBRTRFMUQ2MDhBMDBF
-MDgzNEU3RDM0Q0ZEQUQ4Qzk1REYyMUYKQUY2MjQwNDY0M0JERTM3MDA1MTRCRERDODFCQjM0
-REY3NUM3RjhFREE3MDRCMTQ2RDIwRTE0RUJDOThCOUQwQTExMjE4RUM4NTc4QkY1CjIzOUU1
-NjMzNjA1Qzc2OUVGM0VGNjg1NUY0OERGMTZERDhERTUzMjBFMTg1MUU3QzE3MzExQ0VCMkY5
-QTI4MTE0MjRERENDMEU2QkQzNgpFNDVCQjUxOTFEODkwMTk3NjU3QjY2RkVFMDVCODNBQ0I4
-OEUxMkJFMUE0OEQ2Njk0OTE4ODA4MEEwRjJERjcxREE3QTJFM0IwNzJCMjMKRkU5NEYxNzYy
-MTZBRDVGOERCQUNFMDc5MTA2MTA1NkU1QkE0MzY0QkI3NDI3M0E5M0I4NTNEQjIzRTM5NjEx
-NkI4QzFDM0YzRjhDNTQ1CkE0MkYwMkQ0NURBN0REMkVBRDM0QzAxRURFMTYzRkM1Qjk0MDBD
-MEQzOUJGMENERTFCMUZDQ0JCNjhENDdCNDQ4ODVFQjBBQjE0RDIwNQpBMzBEMUYyRTRFMTgy
-NUQ5NzQyREEzRUJGNEU0N0Y2RjJGNzUwNTYyNDAwQzU0MzMwRjc5MkE5OThGRkMxNTg2NTA5
-NDBDMEIxMTUyODIKRDhDMjJDRDM0RjhDRDUzMkVEM0I5NEE1NDk2QzMzQjM4MDJBQzVENjI3
-QjVGMEE4NzA2MzExMTkxRUM0MjUyNTQ5RDgxM0M5MkEwMUE5CjgwNEIzOTQwMjY2MEI0ODkw
-OTVGOTQ0MUQ5NThGRTM4NzNDRDZFNkZEM0VBOTFFREZGRkZBQkFGNDYwQjcxRjFDMUVCOTcw
-M0E3RDlBQwpBQUEzNDMzN0MzMDZCNjdFNzQ2MEFFRTFBRjAyRTdFMkU0OUEzMzI1OTlCQThD
-RjIzMDlBRjI3MDM2MzFCNEQ5MUNCRUQyNkFGNDk0MTAKODMwQ0NBNzAyM0E3NTgxRTJBREI5
-NzM4N0E3REJBMjMxODlBQTk5M0I4NkJFREVGNTlBNzJGMjQ2QTRGNThFQkUzNTQ5OTJEOTE1
-MTRGCjEzMEFCMkMxNjc3MTdBOTdENjQ3QTE1N0JCNkIxRDk2OEFDODZDOUE5N0U4RkJERTlC
-MkUxNDFEQTdBMUVGQ0UyMTM5RDEzRjBCNzQ4OQo1MUNFNzNCMUFFOTNCMTlFOTNCNDU2QzQ5
-MTM2M0UwNDVDRDVBNEM3OUVBRTUxNzRGMzMyQTM2QTlCQzEwMDFCNzkzMDIyOTgzREEyQTEK
-OEE4QzdGQUYyMzZEQTg4NDE1QTRDN0EyNjJDQTcxNEUzNzNBNzMzM0IzNjZBQjM1QjlFMzlD
-NzM4OUE5RDNEQzM4NUVFOTUxRjY2ODc5CjE4OEM2QTUwQzNEOTU1NkNGNzBDMTlGMzMwOEVD
-QUUxMjAwOUMzMjRGOTNGNjlFODIwOEEyQThFOTY4NkVEQkIxNDFCMTAxMDM2OEFEQQo3OEVC
-RjNFNTJCRjA1ODI3RTQ1M0E5QjIzMThBN0EzMUI2ODExNDg0MTk0MzRDQjczOEE1QTM2QTlB
-MzkwNURCMDBGNDU5QjI2NUM3OTMKNDEzMzFBOTY2MTM1MkU0MDE1NzIyMUJGMEQzRUU5QTNE
-N0UxMDlCRDJGQUVEM0ZERkY1OEM4QjE3REQ4RDQxRUVBNzgwQTA5MEI2QTYxCkU4NENDODRF
-MEI1QTA3QjdGMTc2RTNFM0IyMUZBNjdBNkU1MUIxNTREQjE0MjJBRUJCM0YxMURFNTdFM0Ey
-OTI4NDQwQkRCMTAwNUJDOAo1ODU5OEQ4RDc3RjMwNjI4REUyNThGMjY2NzRDQURDMkFDMUUx
-NTA5ODFERTVGQ0RGOUE4MTM0ODU5RUZDOTUzNTI0QTgzQzFFNUY0QjcKMEFCODI2NzhEQTg3
-OThBQjU1OEMxOTgxREM2NTU0NUU5NjY5QUVDQzIxRUZGMEY0Mjg3MDlGQzQ1NzgzM0U1OTNB
-RjU4NDQzNUM2RDQ5CjcyMzlFMkU2RkU5Rjk5QTQ0NTZBQjhDQzU0MDU2RkUxQUJCOUM1OTFF
-MTFCOEUxRkE3MkFCRDFDMDdGMjNCQzY1RDgzQkRGMjkxNEYwMgo3NzExQzFCNTQwNUZDODQz
-NzFBOTA1MEZGOUI4NUYxMzM4Q0YyNEQ0NERCMjgwQTI4NEY5REZEMzY4ODE2MDI3QzlCMjFG
-NDFCRDdCNDMKMUFBNzM3OTc1ODVGQzkzQzBBNUVGMTM1M0I5MDEyRkRBQjgwRUE4REE2NDhB
-MzJCQTY4NDQzN0U5MDQ3OTNGQTRCQTM3RjgzQTg2Q0RFCkI5QUI0RkUwNkI1REIwMTcyMDEy
-Q0YyNzYxM0ZCRkVGRTEwOEI0NTlFRjEzQUJEMUYyNjZFNTkyMUI1MUFEQjM1MjM1QTkwQjhF
-NjQ2QwpGQzk0QjhBMkQyNUUyOTUwNTU4MjdCNzM0RDk2NUU5MUI1NTIwNjAxNDE1RjkzQkEw
-Q0E2MDc2N0M2MEFFQUFDODI2NzhFNTlCQUU5RjAKOEMzM0M5MjU3NjhDREE0MjMzNjkwMDZC
-NkE4NEU5RUNGNEE5NTc2Qzk0RkJERkRBQzMyODFFMTNFODg2MDNEQTk5MTNCQTFFMTQ4QTZG
-CjlERENEMTlFMjRFMzlCMjIxMDAxRjZDODI0ODA2QTA0NzQ3Q0IzMDVGOUZCN0IyMkFDNkM1
-RUIxOEU2ODQ3Mzk1OUE1REIwRkVCNUVBNAozOEFBOEQ3MjkyQUVBRkZFQTg5RTlBREU0OTAz
-NEUwRjAzQzJFRERCNTdEMTVDMTEwNkYyQzUwRkMxOUUyNzYwQjhDOEQxRjNGMjFDQzIKMzA2
-NDg1QkY0MzdCQUU0QjcxMEZDNERBM0E3QUE1M0Y5QTVCMEVDMTM0ODg2NDk0NDgyNDkzNDhC
-N0ExNjE4RjU2NDU0MDRFMDRFQjQ4CkQ4MDlEQzBCRDY4Q0IxMkFEMjJGNEI0NkZGMkU5Qjg5
-OTJCODEyRjJDRkM5RjZCNDVGQUM0QjYxODA0NzlFNzZGRUFDNzk0NkZENkRBMwo5NjUwODVD
-QUExNzZGREE5ODgxMDM2MjIwRTI4OUY2MTI0NjMyMzY3Q0Y3NjYwRTBDRjUzNDFFNjc1QTNF
-NzkxNDM5MjQyMUMxQ0E2NDcKMTAzRDRCOUREMDI2MzM3QzRGQzVBMTQ4QzM5RjIzMTE1MUQ5
-RTBDRDQ0MTNERTAzMzc5Q0YwREQxMEQ4MjlCOTVDRkY3MEE4OEJGNTQxCjZCNjA4ODUyOUIw
-NDAzMUMxMkI3NUU2MDFCRDcyQTFDMUNGQzUyQjVEMzc3QzVCODA0OTAxMDVBMEJERDVCNkZF
-NTgyMUZGNzdFMUE3NApERUU1QUZBNUFERUY4RTQ3Mzk3NTM2MDk2NUM5N0JGNDhDRkJGN0Yw
-NERBQzc4NzhEMEIyMTkwQTY2NTk2RTEwOTM0RUJDMURBNTU3NUIKQjU4NTFEMDRDMzRCQUIx
-Nzk3OUIzNURGNTZGNUUzREQ5MTRENkRFMTlGMjIzMTA4NTQ1MTNDMjc2NkFCNkE2QzU4NDgx
-QjA5OTNDQ0E4Cjk1QjczQzNENDU0MTQ4MDNGREEzRDQxM0Y5MjIwQUUxMDA5N0ZCRTdBOUE2
-Q0REMTUwQ0EwRjg1NzVGODgwNkI3RjhFMzVEMTdEQkEwRQpDOUI1QjgyN0I4QjI4RTYzNEQ0
-REZGNTg5MEQ0MDI2OEM5NkE3NTJBOEQwM0VFQjExRjA2Qzc3MzZFQjYwOEIxMDFDMjFFNzFD
-RUVDNzAKNzNCNTRDQjYzOUMyM0QxMTM0NDM5M0ZBODU3QUJFNzJCREE3RDBCOEMxQjQ3Qzky
-QTE4NTE0RUE0NDQ2RTZCQ0YzQzcxMzA1RTUzOTYzCjlBMEFFOTY1RDhFMEUxNEI1MURFNzk1
-MzFFQTVDM0ExQzBBOUY4QjhDQkU0MkEyNDE4MEUwOUFDODExQTg1ODExQTUzNkM1NjhEQjM5
-MAo4RjExN0Q1QTA2QzA3NUM0NTJDQzIyMjZBOURGMTU3RDg0NTcwQTY1REU2MTE5Q0Q2OUJD
-MDkzNkEwQTRFMjQ5NTMzMEEwMjNFQzZDNzkKRUI4ODQ1NDU0QTg4QURBMUQyMkIzMTQ3QUQ5
-NzI1MzdDRDZDOEI3RjFENDFCNDEzOEZENkU4OURGQjY1RDEyQkJBQTI1QzBFMTgyMDc3Cjc1
-NUFGNUYwQjQxNDdERThEMThDNTlGRjFFQjQ2NzdGRERDQUYyRkVGQ0M0OUMwQjMyMDZCQTI2
-MTYxMThBODZGODVGQ0RFNDEwNThDQwpGOEJBQzkwNDVBRUNDMjkxQzVBRkI0QjkyQjA2NzMx
-NUJCQTM4Mjk1QzI1NkZERTlCNEQ3N0I5OTQ3MERCQjBCOTI0MEU2ODJDRTlERkYKQURDN0RF
-QTM0QkUyNDBGNjQzMkRGMjkxQzE5QzFGMkE0RkZGMjA2QzA4MzJCRTYyOEVGMTU2NzJBMzA5
-MUI3QUU3OTY3OTgwRDEwRTAzCjZFQUM2REE1NDBDMDk1MDFBRERGOTg2MEM1OUU2RDcyMUU1
-NTlGM0JGODBCREQ5RUQwRjVFRTNFOTUxMzBBQ0Y2QzRFQzcxNjFCNzE5MApDQTREOUY3NEZG
-REMwNjBDQzM5RkEyMDgxMUM2QTE3MjVDREMyRjYxQzA4MDAzNjE4MUFBMjZDNDNFMDU2RDhG
-RjI2NjBGNDkyQzk5ODkKMzUxQjM4NDRDQzIxMEZFRjA2OTQyNjUyODJEQUZCQkI2QUFCRkRG
-RDYxNDhCM0YyOTgyOTkyQUQzNEJBRjNFMzRCQzFFMkRBRjJGNDVBCkJDRkY5QTk4ODg0MTIx
-NThDNzNGMDI4OUY0NEY3NzkzQjA5QUUxMUQ3Nzg4QjJERjI1MzlFQzA5RjBGQzdFRTkxREZD
-ODM2MDcwQTM4RApGMTJERTFCODY5MDE5NjY0OTdBRTBFRkIxQzQwM0Y4MURBNUNEMzcwNDFG
-MDI0MkI1NTcxOEE5QjQ4NTUzNDVFQUY0REZFQjZBMDAyMEIKMzk5NjYxOENFQzU4QzA5NDhC
-OEQ2ODA0MkE4NzM0M0U4MUZBQTgyQTIwRjE1QUZEQ0U2ODU2MjgxRDgwRTcwODI3OTlCNjU0
-MzU1RUIxCkM1MTVCMEVEQjg0MkYxNTNBMzBFRjEwOUYzMjgwRUVBRTcwQkQxMTA3OUIzRjMz
-OUUyMThBNzdBNUU3M0U1NUY3NzM4QTBDODFEMjVGRApFNUEyNEVBODk5RkFEOEQ3RDVGMTU2
-QkNBOERGMDE5QUIzMUJFMEJFODk4RDUyMUQ5M0UwMkJDQTUzRjdBRkNCMTgyNUEwN0JFNzY3
-NUQKNDRCQjg4NjgzNTQ0MTZGQTNDQjA3MkUwMzJFRDRFMTQzOTdEODk2ODlEOTk4QUIzNTQw
-RjM4NTFGNEQyNzFGMDk1MDI3MEE3MjZBODg1CjVGRUI1NThBRDM1MzMwOEQ1RTE0NDhCMzQ4
-N0Y4OTVDRDAyQTlGMUZDRjcxNjREMzI3NDdDRkJGRDdCQkZBNjM0NzBFODRBNDBFQ0Q2MApE
-REQ5RDRBMTQwQzE4MThDOUIxOUE2N0Y0QkE3RDRDQzk1ODI0NDVFNThGNEE5RTcyQkUzRkE2
-NkYwOUZFQkREQzQxQUU5OTU1MjU4NDAKOTRCMzcyQ0ZGM0NDQjc2QTZERUNDMjA5OTFFMzhD
-NDlCNzA4MzRFMTY0OUNBREVEMjlDN0EzMzY4QTkzRjE5RDE5QzhGN0JGRUU5NThDCjAyMUY1
-NDczMUU1RTYzNzkyOTJDMkVFODg5ODA1ODYzM0RGMTlCQzVGNzQ2M0I0OEJDMTJEQzJERTky
-QzNBRUJFMkU3RUYyNzMxNzJBNgpCMDY0QjYwNzNCQTc5NTBEOUIyMDMxMTk0MTE0OTRFNjk0
-MDk4ODAzODQ5Q0YzQTI3NTdBREQ3NThDNzI2MjkxNDA3MDg1RDE3QjA1NEMKMEI1QUIzNkI4
-NDNBQjEwRTQwQkMxRDU1NkU0MkY2RDEyQTQ5MzRBRDk4QUExRENFMUYzQjVFMzZCM0NGRTk2
-MURFOTFFRjZEMjQyQUExCjkzRDIwNTgyNzk4REU3MTQ2OTY0ODQyQkE0OTkzNEQ4MTE3NTM2
-QkNEQUExQkY0Q0ZEMzlGQUQ1NkZEMTEwMTI4NTA2RjM5MTFBMkY4MAowQ0ZBMkFGMkI2RjdG
-OTMxNjQ1RjhGN0E0OEEyOTM0MUJEN0Q1MDM1MTM2MDBFOENFMThBMDg2NTc4QzE1OEJFRjQy
-MjIxNDFCQTFBQjkKNzQ4MjkzNDgzQUI1QkE3NTA5NENBQzY5RDZCNDhEOUE1OThBMjI4NDMz
-MjJENzFGRTRFNTREMDE2Q0JEMTM5RjFGQjM4NzMwQTEzN0MyCkI1NkZEQzM4RkRDRjRCOTEx
-QUY2NUQ5NjY2RkU4NzFBMDE4NEVCM0M4Njc3QUM3N0QyMEI2NThEMjExOTU2QjEwMTM5NkM3
-MkM2MzgyMQo1QzIxRkNGNTE0NjE1RjdGQkU0RUVCMTdEQTlFNzlBQTJEREI2QkNENDg2QTVC
-M0RCNTIyQzQ5RTc4MTU0NzQ5RDk2NTZFQkRFNjMwMDcKMjFERENGMkQ3MzhFQzg4Qjk2RTIw
-MThBNzZCQjQ3RjcxRUNDNkQyRUEzMzA3OTZCQ0U3OEMxNTAyQUUwMzNEMUI5MzZBQ0Y0QjE0
-RkE3CkRBNjY1QTk3RTRGQTNBQzA5RjlDMjY5RENENTQyMkMyMEI4RTVFMUU0NTMyMjY2MzA0
-MURBMDFDRkE3Mjc4N0U5MDNENEQzOTc0NzkwRgpFRTIyNjY2RUNDNkM4OUFBRDg5RjAxRTVD
-NjgzRDMxQjY5RDI5OEQ1QzgyMzQxRTE3NzM3NDEzQjQ0QjhDREQxMjE3MDVBNEJDNkJGNjcK
-MkNFRUVCN0M5RjhCMTNFMUVDQjc2MEE3RUZGQzFDRTYyMjQ5REFBRDFBNUYwMkQ2NUZFMkRE
-OEQ3NkI5NjREMUVBOEJBRjlBQTI0MjhBCjAyMENFNkFBQTQ4MDM0RDBGQ0UzNkNBRDk4MkE0
-NjQyOEQyQTJCMjc0MURFQTY3NEMwMThDMTI3MTMyODlBODlBNjA4NjA3MTk0NjNEMApCMzVD
-NzZGQkZGOUMzOUE3M0IzMjc3QjM1NzQ5M0M3MDRFMUJGQkNGQjg2QkY1NjZBREY3MEYwRERD
-NUQzRTAxQTA0MTM1MTEzNTg5MjQKMkNDOERCMzEwN0UyMjk3MzM5Njg2MDhCRTAwQURDMUUw
-REU4MDQyN0M2NUM3NEY2OTZCRDI1NkE5RTc0NzMxRUZBMTgyMDI4RDAwRUY4CkU2ODZBNTM2
-NzZGQkFFOTg3MEU5M0NEQjdDM0FFNkFDOUY0RjYyOUU0MEQyMDlFRkJCMjk2MUY4OUFDQ0RF
-ODE3QzQ5MDZERTIwNTBFNQpERTk2NDZCMjE2RTMxQTRGQTAyRjk5NDFBOUExMDRGNjU2ODA3
-OTY5RTVFRDRBNjM5MDAwQzdCRUNFQTU0OTlCNkJFRDEzQjAwQzdGRDEKMTQ3M0JGMzIyQjNB
-NTZCQkIyOTBDMjMwQzY3RkQ1MEVGQUUzREE3QzJEOEZEQTI3QjBCQzY2OTQxRjgwMTJGRDRB
-NDBEN0U2NUU3Q0RECjQ0OThCNjNDNDUyRjE1OUJBMTdFMkI5MzhCRkEzNDM5QkIwREM3MUY0
-NTUxRUI1REQxOTZDOEI3QzBBREFFRDFDMjU1ODgzREZCRjkwMAo5NDc0MDI4MzI5MTY5M0M5
-REM3N0M1MTRGNDUwNTUyQzY2MTIyMjI1MzhDNTJCNjQ3NEMwNzdENzFFMTM2OTI2M0VDQjQ5
-NDgxOTQ1MTQKQ0RBNkE0OTFFQkE0NjRDMjYyRDkwQzExRkQ0NzA2RDM5RUI1RjNGNEVFRjI3
-QUFGMTUwREYyRUVBRDdFQTA2RTk5MzU4QURFRTBGMUQ1CjlBMjREQ0VEMkZCNzJEQjg0OUY0
-RUFDRDUyMzkzQzZFQzg2RTlDREI3OEQzNkI2QjMyODBCRDdCMUMzREYwOERCM0JFNzM2ODcy
-MzJERQpBNEI2QjU4NUNCQzM3NDgxNjRDMDU1RjNEN0Y1M0MzM0Q5Rjc2QjVEQzdBRDc0MjYz
-RUMzNjJEOUUyRkE5QkY5RTQyNDdCQjkwMEM0REMKNjBFOUI0ODk4NTMwRERFQUZFMkUzMTY4
-MjdFMUNCMTNFOUU3Q0Y4OEQ5RkUwRTUwNDNBNTVCOEE1QjEwQ0U2NTREMkQzMTUwNDEzNUE4
-CjVFQjU2NjY5MUI0ODEyRDZFMDVGMzRCRTJEQzZDMUJGNzBDQTE5QTY2MzMwMDA3MzJGRUJD
-RTBFQkY0RTI4NzIxQjc4QTEyRjIzRjc5RgpBRjQzRjJDNjAwRDQxRUI0RTM2OTBCN0VBMjRG
-QzFBQTMwOTJCNUVBNUFBOEY0NzlGNEY1NEIyQzc3MjEzNTE5OTJDMTE0QjhBNzk2MzYKRkQy
-MzVFRTkxRDZCNUIxQkQ1Q0Q5MThFQjM0MzZDOTI5REMxNTFDQjVDNDJFRjRGNjJEMjE2MDRG
-MEYxRUIzRTAxQUE3ODQ4N0I0QjkzCjg1RDBFMDlCOEUyNTMxRDkzNkY1RDNFRDREOEMyNDRC
-ODM4QjhFNzI0MTZGOUQ0NzE2QzQxQzg5RTI5ODBEQURBOTJCNTBBQzk3NkQzOAo3RjlFMzIw
-Nzc1RUMxRTlCMDlBQzkzOTE0RTAxQTcxNTY2Q0E5MzQzRTg1M0NENjNGOUMwQUNFMUZGQzQx
-RTAwQjUwMDNBQzVGQjY4QjgKMERBRTVGQkVCNkNEODQxOUUyNDM0REJFNDBEMDE3RkJDREY2
-MTdGM0E4QjkxNkVFNUQ4QUNEMzY4OUE5RkE0MzhGNTRDNUFFNUMwMkUxCkNDNjYwNEMwMjE0
-MDBBNDM3RTcyOUM2RkE5QkVGNTVBMDQ5QzcwNTZERjkxQzY4REEwQzJGNzk5MEI5Nzk5NEEx
-MERDRDQ5MjYwRkNDOApCQTMxNTIzOENDMkRFRkQwNzY1MURBOTc1REVDMTg4OTcyM0ZBNTAy
-RTRCRkE3QURERDI1MTM4Qzg0QkMwNDlFNEVEMjU4ODVCOUFBNjYKNEJBMThCMjM3NjRDM0FC
-NDEyMTNBNDMzOTNFRUI2RkI4MzlBRjI5RjlFNEI3QUY0MzE3RTQ1NUM3RjM3NTQzQzY2OEFG
-OUI4QjZEQUFDCjA2ODM3MEU3ODdCN0Q2NEFGRDBFOEMwMTBDQ0U5QkIyQzBENjdBNkQ4Q0Ew
-Q0NEMkY2REUzRkJDREUxQkM2Q0Y5RjdBRTg5M0Y5M0FFMgo5QkJFOUFFNjI5MjFDMTc2QzlE
-ODdEQ0E0NjA4REFCM0E0MkVFOUMyRTFGMzE4MEQyMDBDRkMyQ0M5NzA2Mjk1QkYyQkM1QjQx
-Rjc2NDEKMUUwNzNDMzZENTAxRjdCMkYyQTQ4MkQzREU2N0ZFMkE2NUFGNzJBOTA5NTM5RDEx
-MDlFNzA4MDBBMDEyNjMxNTQ0MTQ2NEJBNUQxNjg1CjBEMDQ0NTU3NDZCNEJCREMwODVFN0Qx
-NUJGMkNBNUNEOEU3MTdEREU4NDE1QzE3NjYwNTc0NzNGNTNGNzRFNTQ0Q0FGQkExN0Q1QTRE
-MwpGNzg0MzgzRkM1Q0FGMTUzMjYzNzk0QzhERUI5QzA2MTU3NDA3QTBENjVCMERGRENDMjAz
-ODFDQTBCNTQxMjBFODc0RDgxNTRDQkMwMTYKNkYwMTVBMjVDRkNERDUwQTc5OTI5QjJBOTM3
-NEJCNzM0RDNGQ0U1QTcyRTI3MDA4OUNDRjZFQ0MwRkFFOTNGQTczOTdEQjc5QUM5MzAzCjE2
-MUJFQzUxQjhDNTk5ODgxNzA2QjEzQTY3MzI0RjAyOUY2MkRBQkU4QkQzOEQ2RkM1NDAwRkUy
-OEVCOTAwMzNDRkQ1QTFDNEEyMjcxQwo4Mzc1QUE5OTUxOTJFNDkxNDM2RTk2QUM0NzREQzNB
-MDU1RTVEMERCNzUxMTZDODhFM0U0QTI1ODEwQjE1RTgyQ0EwRkFCNzc1NDYzMDUKN0FFQzZE
-RkRCNTY5QTJBQkJGNUY2MUVCRkI1MzVDRkNDNDUxREVERDEwMDFEQzg5MUE3M0JCQzM3MjY1
-OTI1NDNEMTVBMkM5MEQ4NzQ0CjAxQjk5NkI4MzlBRjVBRkU1QUQ4NUEyNzgxQTc2OUQ2OUIw
-Nzk0ODZENEI1QkRDMTAxOUNEQjY5MDQ2RTQxOTJFRjY3RUYzMDA0NzE1RAo3RTJENDhGRDEw
-MDBEQTkzQzJEN0E5NjNGQjgwRUY0NUEwRDUzRTcwNTVENUE4RUI4NzJCRDkxOTFDOEFBNTQ0
-QjhCRjJGQUFENjg1MzEKMzkwOTI0OTU3MTY1NkE2M0VGMTEzQUI4OUFBRjNEMTJGMUEyNzkz
-MTk3OTYyOTEwRDQxQzVDNjkxMDAzNDhDNUI0ODZFQThDMzU0MjlECjExMjI1MTQyQTcwQTU3
-OEI1RDRBRkVBMzNENkM2QTZDMjBDRUU4N0NCQTlDQkMzMDgzNTA2N0VCRDYwMkM0QjdFQTND
-N0E0MUNGODA2MQpCMzM3RUU5QzRFMjc5RTIwMEM5MjRCMURBMEQ4MUM3MEJFMTgzMDQ4N0RF
-OTYxQkI4OTQzMDA4RDZGQkEyRjVGNUMwQTBFMzE5RDBFRTIKM0M0NThBNjlENjg3RkFBNUZE
-REE5ODVCMzU5M0NFQjc1RDA5OTg3MzZFRjI2QkUyREMyRjdFQ0Y0MTdBNUQxNDBBNTE5NTNE
-OUYwNkI2CkY3RUVGRTVFRjFCMTNEQzUyNUVBRjhBMjAzRDQzNzExNDQ1NDhEQjhEODQ5MDA1
-QkQxNzUzNTRCOUUwODM0MjEzRUJGMjU1ODE3NjVERgo3QjREMjIxNDU2OEM3OUEyRTBFMkRC
-NzlCNkQ5QTMzMEI1RDU4RDkzMjNDQzIxNjU0RUNFQ0JERjdCQTM2QUJDOUYzMDI1QUE0MTRB
-MTIKRjRBMDgwMzRBRjQzN0JENEExODQ4MTFCOEM4NjFEMjFENjhDODlFMUQxOEU1MUFDOThB
-MzA4RjkxRDdDREU0MDI0NDlGRkZCNEQ5MkFBCjdDQzNFRTI1RENEODFEMDM3MTJDMENCMTY2
-NkRBQTU2NjlDNzU1MkMxOTY3OUEyRjEzNjdBMjIyNjM0QTNCM0VGRjdDQjIxRkJCQzBGNgpC
-QzM3QzYyQkFDN0ZDM0RBMTk1MzMzNDRFREI1Q0U1N0M4Q0REOEE2NjM3QTc1Q0JCRjgxMDBC
-ODA0OUMxRjFCRENCNjk1RkUwNTJBMTMKNDc4RDVCMTZFMDI1OTc1RURBMDU5OUU2QkU3OEYz
-NDVDQ0Y5OUEzNDk0RjYxMEZFNDYxNENGNkQ3RjQ5NTE2N0Y4NjI0RTVBODM3MTU3CjQxQzk4
-RENDRTQzMkE3MDIyMkY0QkRCMkM5NDZFODA0QkY1OTAxRTQzMjIyRDg0RkRCQUNCNTA1OURE
-OUJDOUE4NzRDNDk4MjMwRDNGMgo1Njk5RjY0N0M4NzNENjAxNzQ4ODk5MEMyNUY0QTg0RUM0
-QzM4QURENDZBQkFCOTNBMDI3MjIwMUNFM0ZBM0IxQ0YyMzlGQ0E4RkY1MTkKOERFNzQ3NDUx
-OENFMDVGM0YwRDlFNzJEQTQ0NjU4OUNEN0MwODRCMzU2N0QyM0JDRTMwNDlGRTU5RjA1RjU0
-MkEyOTcyOEIwOEE5QkQ2CkU4NTNGMzYzN0E0Q0M5ODY1MTk2QTI0QzlDNkMzOEI5N0UyRDIw
-MDVDMkNEMzk1RTk0MjYwQUE3NTMwQTZDMTM2QkJDRkVDMzMzRDBGRQo3NDAxNEU2RkY5N0JC
-NzJDRDA3NkFEQTIxQjk2MDQ2MkIwRUM3MDk3QTc4MTJFRTMwNDRCMTUyOTNBMDJFM0UwQzcx
-Rjc2RTEwQUNEQTEKNzNGMjlDRUNENkQ5QUFCN0NGQ0EzNDA1NzcyNDYzQ0JFMkJBNkQyM0Ey
-NzA3NTVDM0M3NDBBNUJDNEFEMjdDMzVCOTU5MzJCQ0Q4QjgxCjVGMkU4Nzg2QThGRkE3NzQ2
-REE4OTFDODNBOTYyQTNEODhBN0I2MkM3MjBBMEM3MzYwMzk3QTRBQzc5RDMyRUYwMjBDODQz
-QTFBRDg1NgoxNEZDRUE0MjdEN0Q0NTJFRDZEMjUyMjdCRkQ2QTdDNDkzNDBFMTc4OTA2QTA5
-RDYxNjMzN0ZFN0EzQjQ0ODU0QjdCNDQ5QTQ4NTZGNkYKQUQxNTczNjY1MTc4NTA2NjZGRUYx
-MjdFRTg3RTk3MjM0QkU1RTgwNTlFMTk3NTI2MURBRTM1MzA4RjMxQzNFMTREQkFDNTZGRDdD
-MDU1CkJERUEwMjgzN0ZBNDE4M0YxNThGODcxNTA4MjFEQTUwRkUxQTU3QTc2NDg0RkFCOThG
-ODA4Qzk4QkRERDQwNjYxRkFEOEJBMDBFNjRDOQoyNTE3RTI1OTE3OUVDNDBERjlFQjAwNUY1
-MTdFRTcyQkU3QTNGM0YyMjc0QzZGRkUzNzEyQTRCREFBODcyRTE5RDkzRDhDMDEwNTY0NzQK
-NDFENzJCMTYzQjQ2MDk0Nzk3N0Y5MzIwNkNEQTAyODJENjNGM0I1REIwRDg5MTFCNUY5MjFE
-NTA1NDA4MUI0NjBDRjZCMjEzRDI1NDdCCjI0QkM0NkNDREJGQTNFN0FGREU3NDUwMUI2OEEz
-MUJFNUVDRDAxMUY0Q0U2Q0ZGRDNENzYyQjJEOTAwMDVCQTczMkYxNTU4MUFCNkVGMgpFOTky
-NjRBMEUwNTVFREYzQTJEOEM5Q0ZDRkMwOTg5QUJFM0IyRTlCOEZGMDhBMkJBMUVBRTFGQTky
-RDQ5QkRFNUM0NDdDNUMxNTZDRjAKRTVENUVGNEE0NUExQ0ZBNzI1NTRCMEFENzc1MjBDNzI1
-NkZEQzJBNzA1NjQ5MkQ1MkQ2Q0I0NUZFREQ1RDYyN0EyODk1NjM5N0IwODY5CkFGQkZBNTNC
-NUQzRDExM0U3RUNFQTA1MUEwRTNGQUI3Q0Q4RTYyQkRDOTRGOEI0ODJFREVGRTNGQ0Y5RDM5
-MUU1OTc3N0RFODFFNTYwOQpEOTJFQjcwNDQzNUIyOTFFMzFDQUE2ODVFMjFBRjQ5MUFEQ0Iy
-RTJDQjY3RTQyODAzQjlCODRBNjQ3OUMxNDkyMDZDQjU3NTAzRjY2NjkKMzIzREJDNzE4MDA4
-NDREMDVDMzM1RDk2NjM5OEI0QkFCMTIwNzk5NjU3NjgyMzZEMjk5OTRCOUI0RTNCNTc5NEQ2
-QTg5NzZEMkM4N0E5CjFBRDMxQkU1RDk2MDNBN0MzQTA2MUMzRUM5ODI3RTZFNDhEMTA1RjA5
-M0NGMTFFMTg4RjIzNjgxNUQ3RDA0Qjg3OUFGQ0Y0NTM2QzlENwo5OTcyMTgxRjNCNzc0MUU0
-OEM3MDgxQ0ZFRjVBN0NGMEUxOTI3RTgwREQwOEUzRUEzNjEzRjVDODY3MTc1M0EwMDcxOEJF
-NDJFQTY3NDYKRDk1MzJENUE5QzZDNzA1RkJBMTY4MjJFN0E4NDdFOEIxQzE3ODAyNDc1NEI4
-MTJGNkIwOENCN0I2NzlCNUNFMjlEMDQ0RTlBMkY0MUU3CkNFNkRFNkIwODhCM0MxRDNDQTg4
-MkVFNjY5MkNCMThERDlCNTA3MENBQzIyNEM5NUJEM0JFMEYwRkIwNzIxODk0N0E5QjM5OEM0
-MEQ1NQpEMEUwOUFGQzc4OEQ0MzM5MkYxMjJERjNDRDc0NjEyQTIyMjZGQkQ3NEE1MEM1MzQ1
-NkQzNDRFMzcyNUUyMURCMkUyRTE5NkZFMTUzMkUKMEVBNUNEMzc3MkM5QTBCM0EzQUU4QzND
-NjRERkVBRTRDMjFEMTJGNTcwQTkyQTg0Qzc1QTg3ODA4NEVCRkFEODcwQzFBNURBMzcyREVB
-CjQzM0VBRkQ3OUYzNTBFQkIwRUUyMDgyMkU1QTUyQzkyNzMwRkQyQTBEMDhGOUEwMDRERDA4
-Nzg1M0E0OEQ0OTUwN0FBNUIxQTEyN0QxOQo5MjFEQkNFODZDREQ0MDdCNUI0MzU4RTA5OEFF
-RjMzNEE5RkY3RTRBQjNERTk0RDM0MTRFNDdENzU4QTRGMzc5OThCQTYzMjNBMjczODUKMERC
-MEQ0MUY5NTgwMzQxNTcwQTRDQTcxNDlFQzZFNEY1RDk1MkU1REY4MDI0Rjg2RDJGQjk2MkQ3
-QTcxN0FFREI3Qzk1OTY4RDNERDQxCkRFNDVGMzgwODM2RjAzQjkyMjg0MDFCNUEwRUE4QkE2
-NEQ3QUI2MEM1QjQ1QjhBMjUwNTBCOTg1RjYzRjY2QkFERTZBRjE0OUMwQkU1Mgo1OUQzNjhF
-RDE3MTZEMTI1QkY2QjU1ODdENDQzQzZENUVENzI1N0MyOENBQTc0NzEyMDU2NUZEREMwMDc4
-RDREODA1QkE5MzcyNDQ3NzIKMzc5MjdBODIyQUI2RTA4REFENEE2NzJGMjhDMEExMTU5RjA2
-MUY0NkU0MTYwNkExRTAwQUQwQzlCRkRDMERCNTcxMTQwODNFMzE5QTcxCkUxNTBGNkYyQjVB
-QzI4OTQyNUY2QTdBNDQwQTgzMjAyRDRBQThCNERFNzQ5MkE5NUZEMzQ3QjI4MUQ3RURGNjM0
-Mjc1NjUxMTc1OEQ2QwpGQkFBRTVFMDczRjVEMTVBMzc4RjM2REQxODk4RUNBRTQ1ODBDM0JG
-ODlENjQxNkNCNTIxNTA2Rjg2QTJGQUZBMDRBOTFBOTNCMTkxQjAKQUJENUQ3NzI1RUVEQjJC
-NTk4M0MxNzMzM0I3OEQ3REM4NEVCRkI3RTRBODQ5RDNERUIxNjc2QTQ0REYyMTUzNTkzMUZD
-MTZEOUQ4MThBCjBDNUE4RkU1RTQ0Mjc5RTEyQkMxQ0EyRThCMkVCRjkwNTc2Q0VCQTk2NTZF
-MkVCRUQ3MjU2NDNBQjI2MzQxRDlEQTA4MEVFNTcwOThBMwoyNkI2OUVFNENFQzVFRTY4NEM2
-MUQwMzg3NkZCRUVCRTY1MUQ5ODA3MzhDQzIzQ0NDQzczNzYzMjgzMTRGNUE2RDEwODM1NTI2
-MzE2MjcKMUMwMUE1MDE1MEZFODU0N0I0QkNBMTgxRTFEODg3RUVDNDY1RTJBRjNDQTI2RDRG
-RkE2OTlCMEVDQjlFQUIwREE3MUE1OTBBQTFDRUNBCkZCOERCMENDREExOEFBNzYzMzVEQjc4
-NzRCREM0OTIyNEQxREEzNjMwMTFCMEY3MTg3RDJFMEQ4RkQxOTE4OUE1QzgyQzRGRkFDNENC
-NgowRkE3QjA1MjFCQTUxOTREMTIyMkQwNzc5Qzc0RURDRTY3Mjg0OEMyNzVDOEY4RTlBRjM5
-RTBEQTNEOEJFOUIxQkQ0MTE4RDlCMTFEQTkKRDIzM0Q5Q0JFOEM1QUU1RDJBNjBGRkY3RDI4
-NTY1QTY2MEQyN0Y1MTVENkZBMDg5N0NFQUQwNEM2RDZFMjUzRTBFRDVFNTZEQzFGMDA1CkZD
-RTJBRDYxOEY3OUNEQTY4MjY4NzVEOTEyNjJDQzZENkE2NEJGRDcwRTdGREM5NjVDQkE5QzZC
-RDZGMjUxNzQ4QTVBNDJCRUU0QUIyOQowRTAyNjJBNERCNTgwMjQ5QTAwQzY5RDFDQkRENDlF
-M0FDNzAwQ0I5NzNCQzkzNThBQkVGOEExMTZDQjVEOEQ0NjY4QzMwMkVCREYwNkMKOTUwNDY4
-NEQ3RDE4RTUyMkY3QzQyRUM2QTc3MTcxNTUyQjg3M0U3NTNDMUExODg4NjY2RDIzRTZGOTIy
-NUQwOTJDNkRCRjZBMEQyN0M3CjY5MzM2MzJDNUYxQzVFMDFDOEUxMzlBOUVCOUJDMDg0ODI4
-Rjg1MDk1QkQ5RTZFRkEwMjI0Rjg2OTc3RENGRTY1M0YwMEFBNjkzNjIzRApDRTA0NjkzQTdF
-RTIzODRBMjg1QTZCRDdBQzg3NjcxNjZGREU3NTE5NEUzMjZDQUY0NDdGRUJEMjQyQ0JGQzcx
-QjYzNzQ4NkY5OTM0QkQKMUFBOEJGRTNDQjg1RjNERDI1OEUwNzlFRTkxMEFGQTY0NzcwRDVF
-MzBDQTlCMjg5QTREN0ZCN0NGQzQ4QTcwNDA3NzREMzZFOENEMDYxCkFCMDZGQ0Q5MjM0RDUw
-MzJFRjY4QUZDOTQzODUwRTUzQzFDMzk4MDAxNzU2M0M2N0U4OTM5M0I4RUU0RDkzNTg1QTRF
-RjE1MzNENUYwQwpBNDBGQUI2RUJFODcyMUY1OEQwNUFBNjlENjA2N0MyRDZDQjAzRkRGMEI4
-M0RCREI2OTZENEQ0QUFGMzEzMEE5ODcyOURBNThDQ0Y1NDYKQUIyMjAyRDBCNEFERTZCNDg0
-NUExMjAyRDNGMjQ1NkUzNEExMTAwRkQ2RDQ0NTIwMzE1M0ExRDExRjNBMjUxMUNEQTgzQzkz
-NkFFRjNBCkIwNUI1RkIzMkI3NjAyOTE1M0I3RkJFMDIwNTdBRjY5OTNGNDcxNDlFOTAwODBB
-M0FGN0NCMjk3NjIxNDhENkY5NDUyMEEzNDNFNTI1RAo5NjQ2QzBDNzlGMUM3OUU3NTQ3MEQy
-MzJFMkIyQ0NDMDRBQTg5OTA5MDlFMEQyNkRDNTQwNTgyQjY5OUE3MUJCNTE2REMyODYwQ0FG
-NEYKNkYwQkZDN0I1MjkyMDUyREE0MURCOTJCQ0QwMzA4NjNBMTE3Mzc4QjkzREY3Q0Q5QjAy
-NTI5NjRCQjREODAwMDRFRjhCMzAxMUU5NTUwCkRBQUUyRDI0RjJEOTY1RTkwMzQyRDg0N0Iz
-Njg1REIwNTYzMUQ1NTBDMUZDRDc2QzNCMzkwM0VDRUJBMUEyNDk2RjBERjI4RjRGQTM2NwpD
-OUE5RkRCNDhFNUUxNDEwRTgxNUQ3RTkzNTExRUY3Qzk0MjI0Njg2QkJFODI3QzgzM0U0QzEy
-MTc0N0FGNzlDNjlBMjdBMERDRDk4MkYKOTFBRjBCQUY5RUYzRjk5MjFCNzk1QkY0MkI4MTdE
-OTNERDREODE2REM2OThEMDYzQUZCMzA2Q0MyMDAwQjM3QUU5MzEwNUFCMkU2REFFCjMyRjlE
-RjQ0QzA5RTc0NjZBNjJCMkFENDhCMjE2Mzc0NjEwOTk0Q0IxMjA3MjREMDAwMEFCNTRGNjgz
-N0RDNjRFRDRGNkNFODY4NEIxNAoxNkQ3RURCOUQ5QTM5OUQzOTI3NEZFRTZGRDQxRDhFNDEy
-QjE1OEEyNkMzMDRGQkQ3Q0UwQzRGOTZEMDFGNUFCOEEyMEIxRkM0RjAwQTkKRDMzQUFEMkM2
-NTZCMzEwNTMxOThFQjQ3MDQ0NjBENDc2RkYyRjUwNTMyMTIxMjkwM0ZEMjFFMjA1OUM0NzA2
-NDMxNTJCOTlCMkU5MDNBCjQ5MUU4RTM5NEJCQ0IyQzA0MTFENkQ4NjIxMEQ1QzNBNDNCRkMy
-RTAxRUFGREVBNzEyRjZDQ0NBQTkwQURDMkEzNThBQzYyNzE4RDQ4MgpGQzMxOTE0RTAxNTc3
-MzMyODNCQ0QyOURGNkQyQUZGMDk0QzI0OTZCQUI2QUE3MjI2NTIxNUE0QkUzNDM2M0VCODc5
-ODg5RTc3MjdBQUQKMDU0RjkwMTcyQzFENjg1OEM4QTMzOERGNkMxRUZDRDY0RENBOEFDRjQ2
-MDM4RjQ4MzkyRTc1REQwQkZCQ0ZERThFRTA3OTFDQTJDMEEyCjhBRkQxNkFFNTYzODJBQ0NB
-RkVFMkJERkU5N0RDRjM4NTMyQzE5QkM1RTM2RjlFNUQ4MjgwNkQyNjE3MTI2N0JFQ0M5RkVB
-RkYzMDAwQQowMDU2ODY2MzNGRTI1OTY3QkVEMDA5Njg0M0M0NjRCQ0EwMzMxNEYxQzU5NzFG
-REVDOEUyNEI4MEQwRkQ5N0I3RTU3NjNCNDI3RUJEMjYKRkQ4QkQwODZBMkM0NUZFREYyMzIx
-OENDRDM4MUJGMzY0RUZDQUFCRTA0REE2Njg3MjQxODA1RTM3QUU4NjY3ODZERjk4QzYyNzQ1
-RkNFCjlFMEQ2MzMyRjJCQjkwQzBCMkVGRjE0RDA4RThFRUE2QkNERjY1MEQ4OTk2RjQ4MzU1
-RDI2Q0ZCQjg1OUNEQjQxODk3M0E2NUFFMkMzQQo3Njc3NThBQjI4OEEwMzg4MDdGNEY2NDY5
-QTgyM0E5RUFENzQ2NTYwMTMwQTJBNTMwOEFEMEMzNjc1Q0E4NjQyQjJCOUZGQ0E4MzgyQzYK
-RTYxRDc5NTlEOUJCMzY5QUZGQUQxQzY5QkUzMUUwMEYwQjIzRkI4REY0MDdDNUVDNjhGM0JG
-Mjk4QTM1MzUxODQ0RUI5NjUzQzgzQTAxCkVEQkVFNzVGNzkyQzUwMkRGNTMyNTcxMjFEQzhB
-OEYyNjcwQUYxRkM3NDcyMjlCNTNCNzEwMEQwMkU3MzgyMUUxNzZDRjVCNzUxOEQ1MwpCNDIw
-QjFCREE4QjcwQ0VBRTgwMUQ3NDVDNjYyMzFFNjI3OTcwODRDQjMyMEREQjAyMUJENTgzMEJB
-MUQzRjQ5RTAzODY0RTZBNkNEMzUKMzQ1MTFGQkZBRThBNEVDNEUzRUM4MTcyMjhDNDBGN0Y4
-N0Y1MjQ3OTBDNEEzQzRDOTBDMDEwQ0Q5NjUwMTYzNDUwMThDMjdBMTMyNUFGCkU3RjhGNEEw
-RjAzNDI2MzJEMUM1RjlFNjcyOENGOTMwRjc4OUEwRjNDNzQwRkJFODgwMTVFMDUyMTY4QTBE
-NzIyQjE2MjFFRDcxMEJBNgo2ODQyQkU2OTFFOTFGMzNFRkIwNzA4RTNFQTE4OERCNDJFOEY0
-QTU0Rjc3RDYxNzI1NzMxRkEyRTJENjFGMjQ1NzQ1QUMxREJFMjMxQjgKNDYwQzMzMjNDRUM2
-MEJEMUNFOTJDRTdEMUEyNjQwRDE1OTREMjQ2ODNENUUxMzkxNjRBMjY1Njg1NDRGRDg5RjE0
-NEY1NzkwNURCOUI3CkVGODFBMzZCRDkxOTk5Q0NBRTIxOTJGQzg3Qzg4RjMzQjAxQzYwOUE5
-ODFENjc1QTNBRThCMTNERDA1RTI2MjI4MDg4MjZFQ0UwNUVFRgozQTM2RTI1RDkwRUEzNzIz
-QkYzNEJDNkQ4NkNFOTVFREJDNEREM0QwODg4NjlCREIxMDVBNTMzNEI1MTA4RkFERjFGMzM2
-NjA1QTczNEYKMTcwNDRBNUVBQkY0NjhGNDI1OEY5RTlBM0U2OTU1MUVDRjBBNEU4MTI0RURC
-MTc4QjgwMEQyNzA4Qjk1QzI4ODJBNzU3NTY4Q0NDQzczCkM0MDY3MUJBMUI3NzM3RjU1REU2
-QURBQ0I4NEU4Nzg4OTczODYwM0E2RDhCQTBEQjFENEM1QjM3MzBDMTY5REEzNTAxN0Q0Nzc3
-NThFOAo5QTMzRkNGMDA5QkU1M0Y5NTlDM0YyMjk3Mzg4N0U5MjA0MjdBOTY4NzMwREI4NTc2
-QTA3QzgwMTk2OUY4OUM5MzMzOEE2MDVCOEE5NjEKNTRDNjIwMzZFRjkwOEM4MUU2NURCRTQ0
-MTAzMTk5NENBQ0IwNDM3NTVFNzZBMkU1NUJCQUY2NjI4QjFBRUJGRUM4MUVCNzI3NjYyRTFE
-CkM5REZENDE0OTIxN0RGRTYzMjYwNkFERDkyRDJDQTRFMTQ0NDNEQzAxQ0ZFN0VDMTY2QTRB
-MkJERTNBMDZCQ0RGMTY1MDBFMTJDREQyRgo2OTgyRjE5RTk5NTFBRDgxMzAyRDJEMEEyMEYw
-NzBFNzVDMEEzRURFRjQwQUVCMTI2REFGOTgyNTBGNkYzRTM4RjRCQzFCNjI2RTk5REMKNjQ3
-NjQ0QUU2RTRFQUI0OERBMDQ2QzgyNkFDN0ZFQ0U0NjZDNjNGNzVCODcyRUU3MUY0RjNBMjEy
-MkEzODNCRUZFNzEwMzEwN0E2MTY5Cjc2QzRGQUVDQjE5RUJCODUwODQ0RkJFQkJDMTYxNTA2
-NzE1QzM1N0IzNUI4M0RFRTE4NTJCNzI2OEM2NUY4N0Y0QzJGOTZDM0ZFQ0UzNwo4OEE5MDJG
-NDY1NzFGMDk5NEE2NTg2RTdFNTgyQUFDRDExRUY1RUFBNjkwOTdDQUUyNEM2MTBCRUIzMDMz
-ODdDQkJBMURFMEQwNzVGRjkKMEJENEJFN0UwN0M3OTVBMjQ4RkUzMjFCNDY4RTAyQjg0NTcz
-RDc0ODZENTlDQ0RGODMyNUY5NDAzM0VDNjMzRDJCRjI4NjdBNDJDMEQxCkUwQjA3NDVFRjhE
-OTA0OUQxOEIyQUIzMTcyMDkzNzkzRjRDQkI5REE4ODhBRDQzRkMyMkM5MzNGRjVDNERFRTNE
-ODkwQUUyMUIyODBFRgoyRENCREFBMDNBRTRFQUI1MkY4MUExNDQxMkYyNkQyRDNGMEQ0OUM4
-MzM1RDhFQzRDQUE2QjM1OTYyMzhBMjhCRDYyMjYxMDk0RTc4REUKQkIwRUQ1MUNFQkRFMjU4
-NzhFMUFGNzA1QzYxRDM3QTcxRkY2MEFBNDdGQTM5REI2RERCNUVCRUIyODE1ODRBNUU2N0I5
-NzE1MDI3MTZFCjY2OEZDRDJBNzU4OURBMDc5MTdBMDQ4Rjc5NkJEMUM4NTEyODk0RjlEQUJD
-RjcxMkM4Q0ZCRDlCNUM3NzYwQzZDQkIzQkM2MDMxRjI4OAoyMzVCRDc5MTQ3NTkwN0U1QkND
-NkIxRjMwMDA2OUVCQ0RBQjFDM0RDNTJFNDlENUM4RDk1OTk0Rjg4MEM1NDE1MTI0QkZERDY3
-M0M0OTIKQ0I2RTc3QzhDNDRFRkEwNEY3QzVGRDM1N0NEQUQyM0NBMzY0MkFCNDM1OUE1MkRG
-RDIzNDEwNzJFMzY4Q0M3NjEyNUMwQkQ3NjA3QjExCkE3NjA3RDM1RjFBOTdGMEIzMEJCNTZE
-NEZCREZDOUZGNEJCNERDRjdENjcwRTdGNTYxNUFFRDZDRTBCRkY3OEUzMTgwNzY3QzQ4QUJC
-NgoxOEY4NUNGMTMyOEFEQTIxRTkzN0ZERjBGNEJFREY5Njg4ODcwNzc1QUQ1NUEwQjE5QjIw
-OTQ4QkJCQTFCNzVDMURERUYwQzIyOTNCNEQKQUUxRjU0RjRBOTlEOThGOUI0MEM5MTU5OTBB
-NkEwOEQ1NDY0QUZBMkYzM0IxODZEQkQzODJEMDFGOEI3RjQzNDE5MTQzMTFDQkUyNTA3CkRB
-M0Q0MEEzMzM4OTBFMDgyMzZEQkI0MDYwQ0VCRUJFRTQyN0E0REI4MTY5RTc0OENDRTc5MTdD
-NDYzMkZCODU0MzRDMkFCNzlERUEzNgo1Mzk0RUE0NjE3MjBBRkUyNkI1MTM2N0JGQkJCMzEw
-QTNDQkRGMDUwOUVDNzVDOTdENkVDMTU0ODlGM0UyQUQ1NEQ1RTc2RkZBRDY4MDkKQzg5OTI5
-NzVEOUM2OTRFRUYxN0VDNTJFNzhFRkMzNjY5QjU3MEQ2OUFDQ0U2MUU1QTdENkU3M0ZCMzc4
-MjNENjRDRDlBMTZCREI0ODVCCjk2NDJBQ0YzMkJFQzNGRkM1OTNFMDNDM0NCNzE4NjdBMENC
-NTdERDEzQTkzRENCMDkzMjc2RTg1RDE1M0NEODM5MjBENTYwREE1MEMyMQo0NDNDNzJCNTIx
-REE1NDZGMTI4NTdCQ0ZENUQzNzJFNzFFMEFGMUM5OEVGNDgyRjA0RkUyQTFCNTc3NTA1QzYw
-MkYwNDEzQTcxQjA3MEYKMTMxRTlERUY4Nzg2OUZDMjE5REU1OUExQ0MxOUFFMzhFRkVGREUy
-QjY5RjUyNzA4QjYwRTQ4RUY2ODZFQjM2MkM2OTBERTVDMDMxRDYyCkU5QURBNzQ2OTI5NzUz
-MUJEMDFGNkUzOURDNzhCN0M2ODMwQUFEMDQyNzdBQTk4RUJBMUQ4MkZDMEMwMEY1QTZBMUUx
-MDhDRDY4MzVGNQo1MzM0NkU5MjFENzI4RjFCNEVDMEI5OTMwMjU1QTY4RjNFOTAzMUYzNjBD
-Q0JERjAxQzk2ODFENjAyQTVCOUYwQkUwNTUyNjlENDE5QUQKNzNGRkY1MDREQkQ0OTUzQ0Ez
-MEQ0Q0M1QjRDNTdFNzkyMUQ2RTY0OEU1NzQ0OUUxODlDRjc4MjBCQUQ0Mjc0NTU1Q0E0NUM2
-NkVGMERDCjM0REU1MkQzODM2ODEyMjY0OTg2QjQ1NEM5NjEyQUU4RjRCMUE5M0M4NkI1RTRC
-N0RFMzA0QUZCRjA4MEJDQUVGMUM2MkZFMzVCQjNCRAozMzU5MTBGRkQ0OTY3NjBDRkZEMDAy
-QTIwNjM3QzQ1NjkwNDY2RURFODVBNEYyODk2NUNBQzVDNjZGMzIzRDM5NjBERTgzODlGMUE3
-NTgKMDI3QkQwQzMxODhGMjQ5RkQ2MTU0NUMxRUI5RDc4QTBFQkQ4MUU1RjVDMkM4NDQ1RUU4
-MkMwQ0I5NjlENzg4RjFGQTI2N0IxODk5M0ZECkFDRTk5QjIxQTIxNEM2OTY3MEM3N0Q5MjA2
-MTcwNzQwNTlEOTI4MTlENzlGQjRCQjQ0OTdGNEUyQkUxRDgyNDNBRTBERkREQTA2MDNFRgpF
-NTFEMUYzRDQ3MTM1RDM1NEQ5RDdGNzU2Q0FDNzJFMzVCRDRFOERFQ0IxQUJENTNDRTJBQkE1
-REMxNTI2QTEwREE2OURBMkZCRTkzMjgKQTMzNDM4MUUwQ0I5MjkyNjY3NjU4OThGRDM4Qjc0
-MDM5NzY2OTg1Qzg4QzJCQjlDNDQ4Qjc2NzI2NDM1M0EwQkM2M0IwRkQxNjQ1RDcxCjAyNkRG
-MkMwODQ0OUE5RjMyRjI1QzRGNDMyMTE5QkQ5QTcwMTRBRTNCNDNERUJGNjIxQzlDQjkyMzQ2
-QUNFRUI1QzJCNTk5RDU1MzcwOAoyRTA1NEMzQTU2ODBBMDgxOTFEN0I4Nzk5MUMyQURCMTky
-QkQxMTU0NUJBOUY1MDk2Q0FGMkREN0I3RUIyOTBFNzBBQjRGREQzOTg5QTYKQjdDQzEyM0RE
-QUUzMjhFOTIyMTAwRUQ4QzdGRjk1ODY3RTlBMTY4RjFDOTc1MjU1N0FBMDIzQzgxNTRFOUJB
-OTcwRkEwMjE5QTk4ODlBCjVDQThEMDAxQUVDQUJDNENBODQwMzIyQkU5RUM5RjYwNzJFNkU3
-MzYzQzI1ODc4OUQzMDk2ODc1REQyMzZDQzAyQjA3OEIyMjQ4NDc2NwpEN0EwQ0U4NzM5NDUz
-NkE3OTZBNjQ5ODcwOEMyODdEQTk2OTFCMTQ3MkQ0NTk3REJENDlGNDIwNEEwNTE5MTI2NUY4
-MzZFQUFDNEU1RTEKQjFENzY4N0JFQzYzMEMzQ0E3NDRBMDQ0OTkzQzAzRDRCOTM1RTFDQzcz
-MEZDRUE2OEEyQzBGNUNDRjUyRkMxQTI3NEFBNjdCM0I2MTc3CkY0Qjg3RENFRDQ4NTZFMTRG
-RjAwRkJCRThEQjRFMDI3NzUxQjM2NzcyMkVEMEIzOUNDODgyMTYxNzdGMkNBOTU1OTU4Q0NF
-MEE5RkU4NQo3MUNGOEExRUJGNjREMkJCM0YxNzdGM0YwRUJBNTgxQUY5RUQ3NDZFMTZDQTlD
-Q0MyQjVFRUNFRDdBMEEyMjU0RTc2NkIzNkFCODRBMjUKNDk4NzcyN0YxMzBBQTM5MUI1Q0My
-RkJCOTg1NEFFNjY4NzZGRjA5QTM4N0Y5OEVFRjM5RDNEREE5NENBMkRGMTQ5RUJGQjU5RUE0
-RDRDCkNCQTVCNUY0NjRDNEMwOTRDRjdEMUY4OTcwRjhGNUJGMjdFNEM3RUM5OUQ1QzhEQjFD
-QTU1RERDNkRDNUM3REQ3MkI2MkE3RTVDN0IxNwpENTM3OUE2Q0QyQjZGNjY2RkY2Q0RBOUJG
-NjkwQTg4MzlFMjM0RURGNkU4MUJGMzk2OUYwREFFM0NENjlENDhBNkY1QjBFNTc2NjBCQTQK
-QjU3NDA2Q0U0NkUzQzM2QzBEMzQ4RUI0NEMxMTE2ODc4NDQ5RjkxODJGMjNCQ0I3RjMzRjk0
-NEQzM0QxNUJFODNFRjM5ODlGQjk5MDlDCjNENURGMzQ0MkQ3Q0I3RkY1OTJDRTlBRkNGQkY4
-QjFDRTYzQjAyMzA5MjEyOTY5RTM5QjlDMUE5MzM2MjhGQjM4QUI3NTY1QzMzNjJGRgo4MDNB
-MTU5QzgyQjBGQjZEOUM4RjFFN0JDRTBEQkE4QzQzQzhBMjY5REUyRTY4NEM5RTIwRkM0ODE4
-QkVDN0YzMDdCNkQzNDY2MUQ0QUEKRkY4QTM0QUIzMUEyQjNBMzQ5RDcwNkEzNDgzMUJDNjFB
-REI0MTRDN0I3NUI3OEQwOEE2Qzc0ODcxNUI3QjJGQzg0RDk0QjczRUFBMkQ5CkYxREM5N0U3
-OEEzQTREMzM3NTgyMUZDQkY4MEUxRDMyOTI4OUNENjk4REVGRTAyMURDMkM2MjBEMTU1OEYw
-RDI0NDRBQUE5QTE4NDE5QgpDRjJBRDA3NTI5RDMwN0NGQjExQUNEMDhFRERGOTM3MURDRjU0
-MEIyQjlBQjVEMDA1MDY4RTUwRUJCNkY5QTBGQkU5OERGNkFERTNENEQKRjJGMDczM0M4QjA5
-NDIwMkFFNzQ5OTUzNDk1RkVCM0U5RTlBNjQ1NjQ3Q0I2NzU1QjU5RTczNDlBMUUzMzhDNEZB
-OEU0QkZFQUY5NTFGCjQwN0VCOUY5Q0YxNjk4QzFCMjUzRDQ3MUZFNTUzRDhEQTBDMjE4MjlF
-QzEwQ0JGQTdFNDQxMURFQzcxNjc1MzFCMDA2QkYxREMxMUU1Qwo4QkI5Njc5M0I2OUJCNzgw
-ODFENjc3REIwOEMzRkE3MEQwNTAyMTlERTExNkMwNUIzRkZEODg4NTM0OTZENzNDQTA5NEUz
-RjM3M0MzOUQKRjhEOEYxNkJCRjlGODU4Q0U0MTZEMTc3OTdFRTdGRkVFQkIwNDI4QjE1RUFE
-RjdDMkRDMERDQjY1MzJDRUJEQTFDMDcxNjk4MjAxNzBFCjEzQzVGQzkwREU5MUM5RDk1RENC
-MjM4MzEzNzBBNUI0Qjc5OEYwQjc0OEMzQjgwNjQ1RUM0Mjc5NjVENkEyNEZFNzEyRjE5OTQw
-NTgxMgpFRkVFQjhEREJBMkFBOTFBQjg3RUFEMzQ5Qzg3MjQ4MTIyQjUxMEEwREYyN0VFNDY0
-MDg0MTZEOENFREI3RTY5RUUyMTM4REQ5NUU1MjYKMzdENDQzNzVBQkYzQjlDMjY2RURERDgx
-QzU2MjUwMUFGRjBENDI0MTMwNEEwNEU3MTM0NkVEMTc4Mjg5RTFGMUNFNjE3NzJFMUM3RUMw
-CjAxRTk0NTY0Q0Q1QzlGM0VENjQwRDhEQUY2QzEwODJDRDg4NDQ2NTNGNzhGODAwMEFCQkM0
-RjM0ODI4MDg1MjkxODkzRDY5MDQwMzU3Mwo4ODhFRjgzNDdGNjcyM0E1RjVCN0I0OUFGNzRC
-OTNGNzMxQzgzQkU2QUFCODMyM0QyMjY1OTMyRUQwMDA0NkI1QTgyNUUxNzI5RkJCQjEKQkEx
-OEQ0ODQxM0E5RUNEQTQwMEU3NTcyMkUwMUM3NEQ2QkU1REYyNkIxN0RERjEwQzM3MDA4M0Ey
-MEVGMkQxMDgwQkE5RjJDMkU3MURDCjlDNzhEMDIwMkI5RDgyRURDQzdCQTNBODk0MEFCQkE1
-MUJFMTA1RkQ4NTE2RDhDMDkyRUI0QkM5Mjk3NzY4MzUxRkEwQkIxMzcyMjUxNgoxMTBCMkM3
-MkZCNzMxNjQxQjNCMTUzNDdDRDY4Qzg5NERDRjIyODFEN0EwMjhCRURCNkQzMDAxRDFENjJB
-MDBBMjYwOTg5NTExQzhGQTgKMEMzRjE1NEIxMkI2M0JBN0I2MzlFNkExMTE1MDREMEIwODY1
-QjA4RjBEOTk3MzUwMEMzNjY0QjM3NDkxNjc2MEY4NTg4QzFEQTlBNkFGCjc0RTk4MjcxOTRB
-ODkzRDBFNDE5MTY0NTIxQUM3MkIyRUY2MjZFNTQ0QzM0NjFGOUEyOTc5MUJBNjk4MTQ5NDRE
-REY3MDMyRDJEMUJEMApEMTczRDE4RDNFMDZCQTA4QzIwOUIyMEM3MUJBNzc2QjdGNDQyNDAx
-ODc5OTZCM0Y0QzQyQTc5N0NGNTBGMTUxMjA0N0E2MzU5QkU0OTkKRjY1RTYzOUQ1OTg3N0U3
-MjYzQkIwQ0UyNUIwMDVFN0EzODcxNzM0ODNDQUFGRkZBMERBNTNEREI4NkNBMTJERENBRjhF
-NDE1RkZENTlECjFFMDA4NTVGODM3Q0MxMDg3RjE4NDcxRjIxNDZFMEUwQ0MxOTAxRjlEMUI5
-NjhDMTNCQTIyMDlERTQ1RkE3RkE0ODYzQjE1OUVGQUMyOQo5ODJENjREQzYwRjI0OERCMTZG
-QTlGMDhGOTk1OUU2RkIwMTU0M0E3NzY3OUFGQjcwNUI3RTAzOTk1RDMwOUI5MDFCQkY5ODYw
-Rjk2QUQKNzcxNUU3RTNGMEI2NjM5NUM5NTNERDIxMzgwRDhDQjFCMTc5MUYzNTNEMDZDQzA0
-NUM0NTdBRDJGRUU1OTNDMzJENzdERkU2M0ZFOUU1CjlGMjU1NTY4OTI3MTRGMkM1RTMxOUM3
-RkMxMDUxQUYyRTY5QTBBNTU3RjI2QzQ2QTlGOUI0RjE3NkM1Q0MxQjEwQUE0RjAwQ0RDRjc1
-QgozNTQxMTU0ODE4MzYwRjYwNjM0OTFCRTEwMzExQkFFQ0MxRTI3QzM4RjczNDlCNTBFQ0Q3
-MkI4MUY1QkRCQkU3QzJGMjk5NEJDRjg0M0EKQjA2RkYzRkM3RDM3RDZBNUU4M0ZCMkI0MkY4
-ODRFM0JCMTREN0NFMUIxODExNDJENTU4NzYyREQ3Q0E1MTFBNzlERjk0QUNFMDgwRDkxCkEw
-MDE1MzZCRTA4NDhDQkI5QjU0RkQyOUIxQUQyOUFCNUM3Q0FFNTI1N0FEOEQ1NDYyREEyQTlE
-MjE4NzI2N0NEQzVENzFBRTQ4OTlFQwpGQ0JENDA4MTc3Mzk2RkM1NTM4ODRENTBFQkI4MkU1
-RTQ5MEE2NDZDRTEzM0YwNkZDQTI2NzMzQTVCOEFGQzEzREU1RjNBQ0JGQ0QyNjcKQUJFNjQ5
-MDc5MEJGOTkwRkEyNThEN0IxRjVFNTEzQTkyRjU0MzhDOTlEODE1ODUxMjAwMTUzOEMwODUy
-NTlDRTg1NTJBNjE3ODU1QUZGCjdFQkQ3MURERTNDMEMwNEIxNUFGOThGNzc2RTAwMTIwMERC
-N0U5NEQ1MEU3ODEyQTVEMzIzMTVBQUZFQzQzMEVDMTE2Q0E0MTQ4OUM4Nwo4RTE5REU3NjhB
-MkVFMzkwRTYxMEY5MkVDRUZFRkI1RDYzMTEzMDc4NDIwRUU4MDcxOTRBMjE4REE1NEQxODZD
-NDEyQzk5MDZCQjcyNUMKRDQzODBGQkQ3MzIzNkE3Mjc4OTVDMEJFNjcyRDVFRjQ5RTVDMjcx
-NDQ1NDUwNEU4N0E4RDFCMkFDODA4QUQwOUJCNDdBODE2NTEwNUNBCjI3ODEzRUM2NTExODVG
-NjNDNUE5RUZDQzlBNzUxNkRGNDEyNUU0Mzg5MzYyMkJEQkJDODk3M0M4QzMyMTgyNEFCMUVB
-NTMwOTBEQTdGMQpCM0VGOUFDNEJENUY0RjdENjUzMzlEMEIzMjg4NENDMTQ4MjZFRjQ4NjBC
-MjhFMEIxQ0MxMTlCQUZEMEVGMEJCODkwQTAyMDcyOEREMUUKRUYzRDg5OEUyNTYxMEFBQjVG
-Q0M4M0M5RkQ2NzczODczMDVENEJBRjY1QTdDQzlDQ0ZEQTE3QTQyRTI0QkE2MjU1ODBGMDcw
-OEZGOUI5CjlBODdDREY4NzQ1MkU4NzY0NENEOUY1OUFGMTZBOEU2MkE5Qjc2QkMzMzg1Njky
-RDREM0MwMjk0RUM3MUUzQjY2MkQ1M0JDQzk1MjkxQwozNTEzQzU1NTk0RkFDOTZBQkNGODZB
-NDIxNjc0QjkyQTg2MTAyNTFEM0Q2RTBCQ0Y2MDczOEZBRkY2NEQyMDI0NTM4RkNDNEZCQzU4
-OEIKODQzNjY1RkM0RkM2NEY2MDkyQzZFRTdCNjgyQTNFNUZBMjcyRTM4QzhGQUExQ0ZFQTU1
-RUYyMzVGNUQ2N0Q0OEE0NkEwMEZGNThFNDdGCkY5NjI2M0Q0RkVGOTJGMzMzQzcxQUEzRDZF
-MEQzRDAzMjVEQUIzM0Y2MDIzNEU5ODBBNUUwQjhEQjc3Rjg1RDYyOEE2OTNDODFBNTMyRQpC
-QTdCOTBDMDcxRjhCN0JCMjYxOTQ3RDQzRDcwRjdCNTRFREJEMUQ2RjMwQjg1MDkwMzVGQ0Yx
-OUYxQUQ4Nzc5QzkwODhFQ0M2RjlEMUQKRUE0ODY5NEVENUY3ODE0REZBRERDNDMwRUIzNjFD
-QjI2QjlBRUI0MzBDMzFCMkQ4RUNCMUQ5OTVEQ0E5MzlFMjYxM0NCNDhDMEJGNDAxCkYyMzY5
-MzI5QzIxNUIzODE0QkQxMzVFNTczNDcxNTI3OTU4QTNERDg5NzE2OTRBMDJCODEyQTMzRjRG
-NTU4OEYwNkNCMEZFOTQ5Q0IzRgo2NDg0NzVBRjhDNzc4RERCRUUwQTdFNTIyRkM5MzA5QTY0
-OTY0ODk4NTZCRTcyQjkxRDY0MDhDQTdGMEYzODg3NjdDOEE2QjA3MTAwNjkKMjMwOTczNTNF
-RjkzNEIwQzZBOTY0NjA1NEIwNkI0RkZCQTYzMjgxMzY3NkNCMjRDRUVDM0UyOEQzRDYzQzhE
-MTNBMDQxREZEQ0UwMTU4CjcyQTRFMkRFMkI0NzM1MzYzQ0UwOUUwNkU0RTdGOEY2QTlFQ0Uw
-NkY4QkY4MjkzN0E4RDg5MzA0M0I3NDM4ODMyRjE3RjlENUU3QjA4Mgo5MkQ2OEQwRTA2MTdC
-MjJFMTI2RTc0MEUxQjY3RjM1OTVDRUFGQkE4REY0NzA1OUVCNkFFMUZCMTVGMkRBNUE4OTgx
-Q0M5Qjg4MDU5MjkKRjE1NjQ1NTVDRDA1NTYxNENEOTRBNURCNTQ4N0IzOTYzNkRBQzRGRkJC
-REQ1OTY2NUFGREJDNTI1M0I0NzUzMTZFRUE2ODg4MzA5RjI3CkFEMTRDMjMxNkY5OTczNzJE
-NTY4OERGRDgwNEY2QjYwMzRCNTc4ODVCNzY3MDVEMkUzNDg0Q0FBNTA3OEZFOTU1OTIxMThD
-NDUzRkE2NQpBOTlCRkYyOTU2NzFDMUU5QkQyRTZBQUJGMUY0OEE3MTUwMzYxM0QzQTk4RkIw
-NDdGQjUyNzhBNDU2QTZGREZFMzI4Q0VENDlBMjEyMUYKMEQxMjg1NzAxRjc0MDBBOTZENkYx
-MUZCOTlDNkE0NTZDRjFENzkyQ0VENzI2NTJDQUNGOTNCNjBCMjczMDA2QzgzREIzNzQxNDQx
-QkI5CjM1QTU0ODFDRUNCMjU0RjQxMDEwM0E2REQwMTg4MjA5N0M4RDE5RUZFNDk5MDk1MUND
-QTg4Mzk0QTBGREVFMUQ3NjNGNjM4MTM5MUM4NQpGNzhCOUEyOTg2QUUzQTQ2MjJFOUZFQjU1
-QjM4RUNGNEYwRTBGODNEQUZGMTg3QTczNEM3NTJGNTc5OTA2NjY4QTc0NUQ0RTdEQUM3QjIK
-Qzc3MzFBNjEyNTJFNTFCOEZEODVFMDc3MTc0QkQ5RTYyM0Y3QUZCNzhEQzEwMkNDNjM2OEU4
-RTExNTQyM0Y0Q0QyQ0M0MjEyRjQxOTlECkM1RDZBRTc1NTE5MUQ2RTZCQzA0MEVGRjlERDM4
-MUMxNUZDNDY1OTk5MkZGODk5MEE0ODQ3QTRBMTFCNTBBMjQxMDMxMTk0MjI5QjU0RgowMEIx
-RERCOUQxQUM1NzU1Mjk2MjlBMTYxQTBGMUM5OEIyNDhDNjA1RUQ2Rjg1QTlFQUQ2RUZCMDk4
-RUVGOTgxMEMzMjBBQUQ1MzA5MDEKNTEyNUUxRDU4ODdDMjVFMjIyNDUwQTBDNjA2MTE2RjFE
-QzJFRDg5RDNGMkQzQTZDNjY2MTcxMzcxRTU5RjFERDFENTg5MURDM0FDMDJFCjU3MkIxMzVC
-QURDQzQ1M0VGMTI2RjE1Qzk4NjQ5OUNGMUYzREM3QjlGN0M5QUE0NzM5OTAyMkNGOURGQTI4
-ODk5QzY3OUY3NkJFMkIwMAoxRkIyODEyMDg3MTlFMjNDNTMwMTk0MTc4NkUxODczQ0Y3Q0I0
-REEwRjVGOTI3NTM2MjRDN0Q4MTU3NjgzRjZFOTU3ODA1RUY1NzA2MTgKNkU5RUIwOTE2MkY5
-QUFBMDRENzkwNzk5MDI5NkY4OTlGMTYyMUE0OTc2NzM0RjlEQ0FFMTFDQ0Q5NjlGOUFEQTY2
-OUQ4NkFDRjFGRDcxCjk4RDIzQTFCRTM5MTVEOEFERTI5RDhDRjY0MEQ1MzQ5RkQzNzk5RUY0
-NUU2QkY4NkZDNjBBMzg0QUM3RDZGNTA4Q0QxN0E0QjI3NEIzNwo0QjM3NjQ1QjI1RTM0MzA0
-QzJEODJCMkEzMTE3MEZCRUIwQTY4OTY2NzkzNjc0QzFCM0E0QjZBMTE3QkIyRjFFOUY3Q0JE
-NTJFNTkwRUQKRDMyQkJFNENDMEY3NUQwODYxRDM3NjUxNzU0RDNCQjFGM0ZBQ0VCQkRBNDIz
-NTVEMzAxNTEwQzlEMUMzNUI4REIxQUNFQjVERjM1RDZGCjc2Q0NGQUM3OUYzQkYwQzVDN0Y3
-OTdDODk0RkVEMzY1MjY3QjBBMzM1MTRCOEY3NjAwNDI0Q0M3RDZFN0ZCQkUwQjBEM0M4QjZD
-QzhFRAozQ0UyQjQ1MjBFMkZCRTM1QTE1NDEwN0U2Qjg0Q0RGNDY4MjhENjcyMEY2MjIzNUFF
-MjQ1N0QwRENEQ0Y5MTAxMEJGMTVEM0NBRjk1QjQKQTIzNjAxOUJFMEFFMUEyRThGNzhGNURF
-QTU2RkJGMTAxNjIzNEY3NTQyM0QzMDdCRTQ5MUQyOUY2QzI3RUZEQzExQkNFMTgwQjIwRjM5
-CkVGMEM0QTlDNzJGOEFDQjYxREI0MjVBNTM3NjMzMERDRkRBQzcwMDkxMEFGM0JENzY3QkM4
-N0M0Qjk2OTFDM0RBRUM4REFDN0MyMjZBQwozNkFGN0U0NDRCRDMwRTExRUFGQkM4QkI3NzE4
-MUVFQTMyNjRGQUI3RjYzMTQyQkVDREYzN0I4QTVGNjM4MDcyNDlFNjE4NDU4RDI5QUQKMEUx
-RkVFRTU2N0VBRTFCNEI1MTNBNDQ3RTgyMkE2ODhDNUQ4N0Q2NEM4QUNEODA0QUQxQzgxODE1
-RTI4N0Y1MEJGNTYzMENDNjMxQTkzCkY5NUM1OUNCQTU5NkRCQUUxRUU4NTAyRTMwNzNENzY1
-MjVGQjJENEY5NEM1MjAzNTY5QjAyRjk0NTkzNzc4RTg3NzVBODdDQkFEMDhDOAoyNTZDNTFB
-MTlDRjM4MUMyNDE4MEQ0OTgwRUUxN0U5NEIwMUFDNzYxRjkxMEQ2QUFGMDlDNTAyN0I3OTI5
-M0ZDODdBMURDM0NCNzA4MEYKNkVDMEFCNzYzQ0RGMTRGNkQ3QjE4OTlENTI5QzQyQTI2MkI1
-NzlBM0JCOTZCNjkzQkQ3OTNGMEJGN0FGQzhEMUI2MDI4OUJGMjM5MjI0CjM1Q0MzREU3OEVB
-QjQ0NTQyRURFQTBGMjQ4Mjg5MjJBNzAyRTdBMTFGQ0Y1Mjk5MjVGRUFGRjUzNzUxNTAyRjk0
-MzRCNzI5NzhBQjdBMQoyQjY0RTdCRDZEQTk5MTdDOTE5NkVBQUNCMzk5OTIyNTUwMTQxMEM4
-MTg0NzJCMDk3QzcwODUyM0MzMTBBM0ZBQzc1MjFCRjZBQjZBNEUKOUUxREIzOERGNEQ5M0Y5
-QzEyQkFGNjdCQzhCNzBBRkQ4RDA4RkQ2Rjg5OEI5NjYyOUE5MTNEQTBERTY2OTY3OEZBMUVF
-NzA4NkExQzNDCjBENDVBRDVDNjM0MzNDNTc0QkREOEJBNjI1ODk3MjYyQTA2RjVBQTQ3RkRB
-NzE4MDU4NjhCOUJCRDc5MTREN0JFNjk3QkM5MEM3NDc4NQozMERCRTVGNTU3NjA1ODc2N0I1
-QzMwMkNDRjdEQzY0NjBENDRGQjYzNUI1QUI1OTVGMjE2QzEzRTdBNEQ1NDAyOUMxRTkyODE0
-NDRCNUUKM0IxRkIzRDhDN0Q3MkJBMDIwMUM1MUY0QUJFQjlDQTI2M0Q0QUVEODZCNUIwQ0VG
-RDBFQjE0MkZBREVFNDBBOTUwQ0Y0NDFGNTQ3QjdDCjcxNDI3QzMwQ0EyMkMxNjFERTEzMEFG
-NTIxMEU1QkQwRDU4QUZENzQ4RDU3NEI0NkEyQjRFQjRENkNDRDMxRjREQUYwQ0NGOTRDN0RD
-RAo4MEIwMjY4RENFNEU2OUQ5N0U2RjNDQ0I3MzE1MzY1MjhCNUNGRTlBQzAxMzM4NzFDRUFC
-N0ZENkIxRURBNEZDMTlGOEIzRTdEOUE5MkUKOURCNTBGMTk4Qjc5MkExMzk4NkEyMzY4REUz
-M0NDRTcxN0FERTVCMEZDNkY3NkJFOEI0RURFNkFCMTU3RTAxNEM2QzQ4Q0ZBQzVENTA3CjUz
-MDY3RTkzMzBBMkZFNzczN0EwQThGMjU5RTVGRkE3QTAzMEQ4NUZFQjg1N0Q3ODU4NjZDQThD
-NkE1MDQzRUNFNEMxQ0YzMEU3NkMwQQowNzFGRUY4RkIzMENDOUJGMjZDRjVERDhBREI4N0Ew
-QzAzNDk0ODc2QUExQTJFOUFFRkFBNDVBOThDRDcxRTc4NjA4Rjc1MjNCNkQ2ODYKRUJEODA0
-OEJDOTZGOTEzOTdBNENBQjFENUE0OTZCNDMwNDJDNURFNkMxQzQzOUI4RDA5RjYzODFFODhG
-ODI1QTA4RTgxODI5N0FBMjdDCjFEMzdGRkQ1NDFGNkE5RTVENEI3RThERDhEMTNGODI2OEM4
-MzEzNUM5NjMxQTYwM0M2OUREMjJFNkQzQjc2MDYzRTVCMEJGNzE1OEM5QQpCQzlGQ0NCOTQ2
-QUMyNDk5NTIyOEM0OEJEMDMxRDBBOTU5OTQ0MTgxNDgyNzM5RUZGNkNGMjMzMEE2QTZDNkZC
-OTA2RUIxMjNFNDQ0ODgKRjQyQUMyQkUyMzdDQjMwQzQ0MUI1MDUxQzAyOEI5NEQ5RTZCN0U1
-N0Y1QTNGRjU1MDQ3NTZEN0VDNDExQ0Y2MTA3Mzc2M0E1RTcyRkM5CkREQTZFMzM0NUY1ODY0
-NkI2OUVBMTQwRTFDNzExRDc5NEUwODM2MjNCODRBNEZFMTEwMjU2RkI4NTQzRDMyQTJENTUz
-NUI3REEwQTczQgpEMTcxMDQ5NDEyRkVENzlCODRCRUI1Njk2MkUxRkZFMUExMkY5QkU0RkJD
-NzJDRkRCOUVGOTJCRDYwQjIwMEFFOEQ2NkFFQTMwQjE1OEYKRTlGRTI3OEQ4ODMzMTExQUM4
-MDVFQ0M5MEQ2NTkwOTc4NzczN0UxRTFGRkM4OERFMDdCOEQ3OTk5NkM5RjU2ODVGNTcxMDJD
-NjVEQTYxCjk3NTEzRjg1QjE3MzIwMEUzMjIyODc2QUFCODM5NDFDQjA2NkUzQzY0MkFEMjM5
-NThCMDBCMTc1MTZBMkNDOEQ4QkNCMEM4MDJDRjM0RgpBOTc4NTFDMDM3RTY1NkMzMEM0NDZD
-NzQwNDIyOTkxODMyMTI5ODg5RUFCQjM1RjU2NjFBNDMwRTVBNTAzRjk5RjUzODFDNUYyNjY5
-MkIKRDhEQjdFOUY2RDMxMkEyOTdCNjk3RTkzODMxQTA2RjM4NkFFMkJGQTJCRkQ5MzYxRjJF
-MzY2RTE4RUJDRUU1NkI4MkMxNkIyREEwMDE3Cjk1Q0NEOTdENjdBQ0NBQkQyMkRERjAwODk4
-QjNDMzlDNzQ0MkYxNDg4NTUyQkE0NkQ0NjM0Q0IzMzBENDI4QTE5MzUxRTQwMUY5MTgxOQo3
-MDhBODJEODU2REUzQzI5MTgwRkRDNTZDNkNDNzAzODMwMkU1NUZBQTVCNzc3RThDQzZDRjRC
-RTJBREJFNTlCRDI3MDY1OEYxNjhDMTEKMDk2MTc4QUMwN0I3QjgzMEMwRTc4MkQ0MUY5N0VG
-MjIxQjdCOTFCQkNCRDFFRkUzQTdBQzNCREMwQ0Q2MUM3NDYzOERGNDEwQUE1M0VCCkFDMzVB
-MDc5RDZEMzkxNEYzODBGNEEzNzZCNTA4OTJBRjIwQ0YyOEY0RkEzNTVDNjM2NEM2MTRBOURC
-MDkyREIzOEQ3NjgyMTFGQTE2QwpBOTkxNjg0REZDOEYyNTdBQjBBQjNGMThGM0Q3Qzg5OTM0
-RkNDRUMwODlFNjcwOUJBRDM3QjkzNUU4NzVFMzRBRTVBRjQ1NjExMzhENTQKOUE3MjVGNEFB
-OTJBNjYzNjREQUQ1MEQwMEIxRTI1MUZERUVBOEMxNDVERjFFQ0Y3NEQ1OTk4MTk0OEM2QTM5
-M0Q3REUzRURENzMxRDJGCkVGREUyOUQ4OUU5QTREOTRDNjk4MzUwNTBGQzNEODUxM0VEMkMz
-OUU5RkJGRkJCNzQxNDM3REZCNzMyNzdFMjI3NTIzQTQ1RTYzNjJEOQoxREQ1NzM5RDgyODIx
-Q0UwREQzOTYzRDBBNEYwMTU2M0E4MkE5NEJDQTQyODI1NjNGMTM3MTMyMjk0M0EyODZGQjY3
-NzQyOTUzQjkxNTIKN0IzNzdGNDkzMzQxNDFERTI2QUQ1RDE3MENBRTM2NzY3QTM4MEE3OTRD
-NzU1QTcwOEUzMzk2MzVEREQyRjZFN0ZFQjREQzg1MTUwMkU2CkY0NTAwQ0M4M0RFMkYyMTYz
-MDREMDA5NTE5MEUzRDQwNTY0M0Q2MDk5MjFBNkE4OTVERTZGMkVERDAwM0NDNEQzMEE1RjEz
-MTgwMzgyMgo1RUU2RTA3MjM3NEJGNzU1RDVDMEQzQjU5ODg4RjVCMDZEMDE2N0JCRTBBNkM1
-RDhFNTUwNDAwMEU0Q0I3MUMwRjE4RTAxQ0Q1RUU3NkYKMTAyREM3NzA4NEQyRUZDRThEODVB
-OEMyQzM4ODY3RjEwQzk0NUM4RjEzQjEyRjE0NzBCMDI2MDYxMkM2OUQ0OTRBQzA2RDkyREQz
-RUVFCkEwQ0ZFMjVDRkRGMDlBRThDOTZFRDMyODM2RTI4RTU1ODNENjBBODQ2OUFDMjIwQTRF
-RjYzMTIzRDQ5MDU4OTBFRTQ4QjYxN0M2RjE2QQo3OTc2QkM4NTVBRTBCQTEwRTM3MjYxQUI0
-NzUyQzZDOUJDNDNGREMyMEYyMzU1RTA3QkRGQ0E3MEY3RjE1NzQ0QTk3MzQyNUE0QjdERDIK
-MjZBMTFGQzlENDBGQzM0QTM4RUYzQTA1RkVDRUNCMjlEMUFCNEJFNzNDQjE0Q0IzRjZENDM1
-NDJEM0E0ODIxRDYyNkEzRDVFQTE2OTFECkMzOUY0RTA2NkMxQjZDMzMyRTc2MTFGMTNFMjdC
-QkI2RDcxNDdBQ0RCNTczRTlCQ0VCQ0Y3RTM1RkQzMTQ5QkIwMzYyRTcwMUZBQzI4RAo3RjRE
-MTE0QTM1OEQyODZFNzUwRjM2NENDMkZDRTM2RDNFNkU5RERGNjczOUZBMUQxNzEwNDM5QjI4
-RjE1OUFENkM1M0FGNjNDRjFEOUIKNDNEMjNDRjZCOEJBMkE2RjBFQkNFNTBDNUI3MzBDQzU1
-MEVDQUM2MzBBMzI4QkIyNjlFMjZEQkVEQTVGQ0M2QzFBQzE0RkU1NDg1RkYxCjg5NDVENkMz
-MzY1N0U4NjgxMkUxNDgzQUZERENDRTREQTFGMkNDRDE4NzAzQ0FFMzlBRkQ3MzJBNEMyNkQ2
-NUUyOTY5OTg0OEMyRTM5Ngo2NEJDMTI3Rjg4QkI3NzRBMzA4OEFDMEExNDE0QjBFNDRCMTk0
-RUVCQTIwNTUxNDAzNzRBQTMzOEQ2QjlENDlCNEJCQjY0RkM4NTkwMzEKOTU4OUQ0MTY2RUYz
-OEYxQjVERDhFNEVFQzJCMzkyNTFGQTE1NkI4RDAwQzA3MzUzQzJCMDM4MzIyRDEzMEZDOUVG
-RkE2QkVGRDQ3QkZECkQ2Q0MxOTI0QUU1MDQ2QzA3N0FBQzgwQjI5Q0ZGRUVCODI1MTg3REIx
-QjcyQkZCNDY4OTY3M0YxMEVCMERBMEFCM0I2M0E1RTJFOEM3QgozOTg1NDcwMEYzNTM0QUY2
-ODU0RTBDMzgxQTA1MTMwMUQyNEQ0MTgyQTlGRjc0NTQzNzYzOUE0QzYxQUM3QzA1MDVENjIy
-NjNBMjlFNUYKRTBDN0REMDcwMjQ1OTA2MTMzMEZDOUY3MkRGNDMzMzZCQzFGNkFBMUI1NjMw
-RTc0QzZGNzIzMDk4REQyMkI3QTFERjlENzEwQzEwRDNBCjk2RjkwQTM2NjkzRDk3RjExRjI4
-NUNFM0E0QzdDNzk5QjNDM0YyOEZDOTk1MDRENTQ0NzlBNkMzRDAyN0I0OEQzQjMxRUYyM0ZB
-MUExMQoyNDg0MDA5MkE0MUU3MkUwOEMzMTQ2RTIyQjExMDM0NkIyREE3QkRCNzU1MDU2NThF
-NjZGNDkzQkNDMTI1MEE4QTdFQjQxODM2QTI2NTUKREEwRTlGRUQxQUIzQUI4MDY1Njk1ODcz
-Q0NCMzU4MzIyQkZGRTU0OEExN0Q3OUZFQjRDRjRENEU4QTEyRTZFRDc5Q0QwMDY1RTE4MDRC
-CjIwMUE0NUE2Rjc1NzgwOUQ1Q0U4MTBDMDJBM0VBQ0FCQzhDMjhFMUM3NjY1MDFCODg2MTUy
-QUMwMjdFNzVFRkVFQTdFMTgyN0ZGMjc2QQozOUVENzkxODFDRTNCMkQ5NDE0NTcxMENCNTM1
-MzhFOEJGM0IwREU1Q0QzRUEwRUM0RjdEMkJCOTE3QkVCNUQ4ODU2QzkzNUEwMEE0RTMKNEZG
-QjIyODQyMjc5RDdCMjk5M0I0MjEzQjAxQjcxMTA4RDJCNjUxNkYxQzIyOUZFODNDRUI5RDMz
-MEI2NEE5Q0I5ODg0MzM5QUQ1MEYyCjE0ODkxQkIzQUE4OUE2QjYzMTkzRTU0RjY0MUQwRjg0
-MTZEMEQzMkExRDlFODQ5QjUxRUYxNDE0QTcyMTRBNjVERUFBMzdDNjU1OUNGMwpBOEUxNjI5
-OUY0MkVDNUNGQTMyNUI4QjQwNzEyNTE2RTdDOURENkQ5RTNFMUE2MjU1OUZBRjJBNDlENTAw
-MkY2REQ0MTEzRjVDRDU4RDIKQTAzQzhEQUQ2QjE4OTYwQTgwNkEzMzM1QjREMkE0QThCRDdD
-MDk0MjFCN0I1REZCQkJBQTU3QTEwRTNCODAzNDc2OEE2MzQ1NjVDRTQ0CkI2QzBGODRGQjVB
-QzRERDZDMTkwNUY1NDRCODMwREYxNEU1NkU1QjhFMzNDQzc1OTE3RkNBMEY0RjhDODc4QUJG
-NjA3RTk3MUY4QUE2QwpFNkJBMjRFOTcwQTdBRTcxMEU1NjMzMUQzRjlCQjdDMkVFRkI2QzA5
-ODM1REIyM0YxRUU2OTQyRTQ2NEI3QURCMUM5RTA4Q0U1MTk0RTQKOTQ4MjIzRDRDMzQ0NUQ0
-RDkxQTlEODg0QkM1N0QzMDVDMUU3MTMzMUZEODY5RTQxMkZCQkIzNzAxQUI5RjExNDgzN0FF
-QzczN0MxMEJBCjYyNEYxQjIzNEFCRUJDRTA1QjZEN0RDRjhDNEZBNDQ5NTJEQkM4MjVGQzQx
-QTkzNEQ3MUEyM0I0NzUyRERBRDI4MEI1RUM3OTkyNzhCMApBRUU1QkI4MzA1MUI1REE2MEYz
-NDk1MUZBN0I5MDE4OURGQzBENTNDMEQyQjczMDNFRjA4MzlFQUVGMEEwOTZBQjQ0MkU1MTc2
-RTkxRUEKQTc1NDQ2NkQxODA3QjEyOTBEQTBEM0IzQTY3NUVBMkVGOUQxQUQwMkQxNzcxOTVE
-NjcwQUIzNjhFQkE1N0M0Qjc1QUJDREQ0RDYwM0I3CjdGRjg5MkUyMjEwRERFREQ0MjlENkIx
-MkZENzA3OEEwQTA0QzAyQUJDRjEwQjE2OTY2MEQwQTdFMTg0Q0FBMkVGQ0RDOThBMjIxMjY5
-MgpFRTA5MTQ4OTUyNDhGN0ZCQjY5MENFMkE0NjVBQzkwOTcxQ0Y1NzI3MUVENERFNzc3RDhC
-MzQ1MjU5QUIwMkIwREFDQTk3RTE4NEUzMTkKOEFCQjVEQzMzRTlCQzZGOTI3NDRFQUI5REI1
-QzIwREZGQTM2QjZDMENFMTA0MUFCQkEwOUU1MEQ4QkFCNkI1QjM1MjBGQjM0REY2OEVFCkI0
-M0I2NzQ4NzkyMDFFQTk1REU3REE4NTAwREVCRjI1M0Q1QTgxREQxM0FEM0U3Q0JDQjMwMjAw
-RTAwM0MyN0JFRTE0MUVEODU2QzExQQoyMjEwRDEyQjE0NzA4MDQ3MzNBRTg5QTAxODAyMTFG
-ODFFMjVDNDIyQTk1NDA2QzhBODc0Mzc5OEI0QUYxMDJFRkVBNDdCRkMyQ0MyREMKMzQ5NTk5
-QTRDMDAwMzdBOUVDMDNEMjgxMEI1MEE1MkFFOUU1Q0VCRUEzRTJCNEI2RUFDMEVBMDYwNDZB
-RjY5Q0Q3MThCNTcwNDREQkYwCkRGNUVBMzZBOUI4REM1MTAzN0MzMzk2QjJEMDk1OURFOTdB
-RkQzNUMxNzUwM0ZBMDJBMzEzRjVGRkQ1MEJFRkIzODNFOUJCNjcyQzUzNQo1NDE1NDcxMEJD
-QkFEMTcxQTY1NEM4NzlGNTAwQkI3REFEMTg5QjFFMzA3MDAxQjA0NkQ5OEMzNzM3RjkwNjIy
-NjM0MjA3MkRBN0I3QTIKNEZBREFCNTM4MTQyNkFGRTQwMkM0MkIzMzg2Mjc3MDk5MDBFRUJD
-NzdGOTA0NTk0OTJCRTI3MDQxQTEyNkFBRDlFNDRBMTJDRTAzQzgzCjA5QTQwNzE2M0EwNEY2
-NjdGMjU2Q0ZCMTA2NkJGMDNGMzE3MTc5RTU3QzI3NjJERTQxN0M1RUZBQTg4MEIzNUU3QjQy
-NEJFOTZDRTBBMQoxNjYwRjg1QjhGQ0JBQTQ1RThGMjI2MjgxNEFCQzg2QzU4ODY0Q0YxRTg0
-M0YyNzMzNjQyQzcyRDlBRDEzNzE4QTlBODFDMUNCNERFRUYKMTMwNjE0RTkxQjg4NTJGQzY3
-OTNCQTBGNTVDNDI4Njc5NTFBMUUzOUY1RERCMURGRDMwMjcwNDM4RkYzNjM5NzQ2MzM4NjJD
-NzUzMzVECkJCNjAyQzk0RkEwMzc0MzREQzMxOUU2QTAwMTkzNTAyMDA3ODJDQ0JEQzk2OTEw
-REQxOEZCQTI3MTFBMjUzNEIwODA4N0U4M0E5NkM5MQozQ0I4NTZGRDQ1QUEzNjU4Qjc2Q0U3
-MDQxQTU3RDQ2QjAxOUM3NkIzRUNBMEQ3NTdBRkQwNTM0QjdDNkNFRjI5Mzk5MThDRUI1REM1
-MjQKOUI1NjAxQ0EzN0QwRkJFOEQ5MEVBOTMwMkRGOTk4RTM3QkFFRUNFNjMwRjQwMTlGQThF
-NjAyRDQ2MEQ2RUI4NjgyRDExNUVCM0YyQzVDCjhBQjM5NjM5RTFGQkJCMTEwOUEzMURCNUEx
-OUYxMTYwNjg1MThDM0M5OEZCNEU5MTE0NEI4OTNBNDAzRTY2MDFENEQ4MURCMUMxRjAwQQo4
-MEU4MzcxMTZDRTNFREQzMTMxMDBEMEI4QkZEMzE5M0UyMENBOTBBQzNDQjEwNzczM0I2NDk5
-QTY5MEYyQzhEMzM2RkIyOUUxNDQ0NzAKMkE1MjE3RTFFOTE4NTJGNUVFMEIyRjMwQjYxQ0Y2
-NjExMDlEMEVENjY4N0Q3REUyRkNFOTA2MjJEQ0RCMTc2Q0JGMThDOTg1MkZGM0MyCkIwMkY5
-RkQ3QUFBQTY5MkU5MTYyMzQ5RTc2NkVDMjlDQjk4MDM0RDNBODczMUY0OTEyMTkzRjFGNDgw
-QjY1N0JBODRFMjgyNTQwRDJCRAo3QUZFNTQ3RDEwOTM2QjE3MzlDQkZFRDIzOUE5QzNGQjhE
-RjUyRTlCQTFGMzhGRjBGMzRFNzAzQjE2Rjg3QzQ4RUM1MDY2MjA3OEZBRUYKOUZDNEVGNDUy
-NkY5MDc0MEZBRDY0ODFBRDNCNEI1Nzk1QzlFNTdERkRFMDlERjI0Q0U4NzczQjFGQjRDRUYx
-Qzk1RTczREE2RjcyMDE4CkNBMEUxNkRCNDJEREZFMTZDNjY5N0ZFNEQ3RTBBQjUxN0FCMEE5
-M0M4NUVGNUU3Q0UyQzQ0MTM3QTZBQjE1MTU5NzM4NzI4QzZGQzJBNQpCRTNFNzk5RDVDODMy
-REFDNjAxNDc3QzlGRThDMjRGQjM2OEFEMUM2MDkyQzBEQjZGNTE2Q0M4NTU2QTQ4MUNEREZG
-MUQyNjY0MDY0N0QKMDE1MTZFMzgyNzVFMjdCMjAxMzQzNEU0REY4MzMzNUVCMTY2Mzk1NDA1
-RjlEQ0ZCRjZDMkNFODg2REQ1OUIxQUU2MDU2OTA0OTNDRkIzCjcwOEJEMTI5NUExMTRENzlB
-MjZGNzRDQzExRjQ5RUU5MEVFOUEzNjRCNTE0OTY3QzBCMzc5RTY3NkJFMDBGRjAwNzNDREYw
-Q0NCNTc1NgpFNjZCMDRBQTBGRUU1RUUzNzZDMDI1OEUyODQxRDkwMTc2Q0M2Njk0RjVDQjYz
-NjlCRkU0NDUzMjM2QjRGNUFEREY5OEI4NkM2QzhGMEIKNzQ4MzJGNkJCNjY4NDA1MEQyMkNC
-MjhDQ0Y5MDg3QjU5QURCMzA4Mzg5MzBFMkJEQjFGREI5NTVDNTYwRDRENjE3RUFFNzkwNjRG
-NzQyCjdGMURGM0UyQTIwRTQxM0M3QkEzRTlBRDI2Q0E4MTQyOTVGQjMzMUQxMDgwQjQ1RjAw
-NjUxM0YzNTlBQjgyMkM4QzlBRkRFMEIyQ0UzMAo4OTM2QTY2RkM1QzMwMzM1NjdDNDg5NTY1
-QTU4NzY3RDI1MUQyOURGRUU0NEVFRERDNTlERUE1MDQ1N0EyNThGRTY4RjdFQTYxMjA4QzMK
-MjM4QzdFRkQ2OUYwOUE1QzhGQ0Q1NTczODBBNkI0QkQ4MkQ2NTlCMjZDQjREQ0YxODBDRjAw
-NTdEMTIwRDZBNkUwREMyOTFDNDBEQUUyCjgzM0Y0RTg0QTE4RjEwRjJGMzI5MjRCRDkzQzVD
-NzBDMjA3RTU2MjBCNjBFMTcyRTIzOEVBRjAxOThEN0ExMjQ5RkZCNzg4RDZDMUFBQQo0RTdE
-MEI0MzNENThDNzlBRUIzRTVDQUM3NTFCNzhCNTVFMkMyRjIzODJGMkYwNEE3MUMwNDRCOTgz
-MzBFMTZEOUI3NDQ4MUZDNTU0OTYKQUYyRkZGNDA4MTU3RDk5MTE1QTM4QkYwNzY3MDM5MjEx
-RDY4NDEzNDVCRTNGNkQ2MjRFREFFQTQ2MDJCQ0JDM0E4N0M4MDEzNTk1RDlECjA5RTcyMDcx
-OTdGRTg3RkQ1ODUyNDQwNjA0MThFQjJDQjA5RUYzNjlCNzg1RUE4QjQwMTc5ODY5NUI0NzNB
-QjU4OTY1MDU3ODg3RUZGMApBNjU4NUIzNjI5RTg3RDcwMEM4RTA4MzVGMUUzNUMyODBENjFG
-QjQ5ODcxRURFQzdDNEU1Qzc3MEMzRDhERTcxN0ZERkFCN0VBQ0Y3QUEKRTc4QTFBNEYwNzcy
-RUUzODM0NjQ4MkYwMjFBOTU2ODhFMUQzMTIxREQ4MEE4OEEzNDkyNThBQ0NEOEQwOTRGNDAz
-QTY3NEUxNzEwRjYxCjQ2REU5NTA3QzczRDUxQzc3MzU0QzQ3NUIzN0YzRTI2NkFERUYyRDcz
-OUExN0VBNUU4QkE1RjY1QzMxNEQ1NzU3OUJBRDc3RDM3RTc2NQpERjE5NkZFMTYzOTdDQzU4
-Q0Q4QjIxQzIxQkYyRTkyQTBEMEE0ODkzRDY3OUFDOTAxMjc1NzYwMkVFNjVBNzBCOTNDRUE5
-RDAyRjhEQTIKMjlDNzgzNDc0Q0NBQjNGOEQzQTA2QjJERUVDQ0FEMjdGNjIxRDY4NTI5MzJE
-NDNGQUI4RDgxMTY3QTQ3RDE2RDg2ODM3QjY4QjkxMEZFCjNEOTdFMDcyMzlCNzY3RkVGRTY5
-Mjk5MEE0RjM2MDBGN0JGQzU1QjdCMTM3MDczNDY3RkI3MjJENDVFRjU5MzYyQjExQjdBQTcy
-QzEwMQo0MDFGRjUyMTZGNDgzMjlFNzIxN0FDNTcyQ0M3MzZCNzdCQUQzQjg2M0ZENjIyRjQ2
-Q0Y1NDdFQkFDMEVENjNCQzBBRjNEQzg2QjgxNkUKRDFCODYyQTBBMTcyNTM5QUZDMjNFRDYy
-MDE2MjdCRDE4QTMxN0Y2QTJDNTc5NzU5MUVFRDU0RDlBQzdFNTMzNjQwMkRBNjY5NjVFMzEx
-Cjc2OEVFNzREMURCQTQyRkJFMkM1OTg0OEY0MDVEQjlDRUEzOUM3QUYwRDEzQjZGMENCOTkx
-NjBBMkNCRUQwRUNFNTVCMjE5ODJGREI3RAo1OUZBOTk2NDlFRjdGMDBBQkZCOUFGNzY0REVB
-REQ2MERDM0JFQTk5N0MxODJBOUU1ODU3QjFBOUUzRDEzMDVBNTdGNjA4ODA3QTEyRDkKMDQ1
-MjM2QzE4RjE3NEE2M0JCMkY2NkYwMDY5MTVGNzAxQTdGNkJFRDMxMjBBNjM0MzhCNUIyRUY0
-RjdERjRBNUY0MjJGQzFFNjFEMzk1Cjg4RjBBODY1QjcxMEQxRTkxNjVDRjZEMTUyMjEwQzcx
-NjVCMzkyRTM1QjcyRDEyMzlBMThENTlERTMxQTA4Njc2Njg2RDRDNzM5RDUwMApEMTVEMkRC
-Rjg0QzBDMTg4ODBGNDFCRkQ3NTdDM0UyRDE1Q0Y2OEEyNDQ0Qjg2M0Y2RkZBM0M5NzY1NjM3
-NDYzRkQ5MjEyQUJGRTFCNUYKMDNBODgyRTQ2RDQyMzYwNTJEM0EyNzBEMjVBMjY0NTdBNEM5
-RjM0OEI2QzhGMDgxOUYzQkI1QkE1NEIwOTA3MTMyNjM2OUFDMkU3Q0EwCjY2RDQ3MkY2RjdE
-RjdENEQxRUE5RkRERDA3MTc5NzNBNzIyNTdERUQyNjBGQ0Q5OTJDMDgzMDU4MUVCRkQwMkNE
-NDk0MUVBN0VFQzRCOAo1QzhFQ0NEQ0NBNzc3RkVCMDI0Mjg4NjA0MzUwRDUzRjk3Q0UyM0E3
-QzJFQzI5MkVCNjlEM0IyQjc1REE0N0M2NUMyQzBDRkUzQkUwOTcKRjkyODdBRjlDOTI2Mjky
-Q0U5Mzg1QTQ1RENERDAzMTRCMkRCREU1QUFEMkU2QTYxOTY0RDk2RENBRTIyMTdCQzRCNUEw
-NTZBRTI0RkFECjRBMDcwOEY2MzU5NEJGRjQ4NkNEMThCNTVDNDRBOEZEQTcwNTRCMEM5QTIw
-RjNDMzc5OUI4Rjc2NDdEREQ5QjFFNUE1RTY1NzlCOTVDOQpFQTRGM0UwREU4NTU2Nzg5RkIw
-ODBDNzAxOTEzNDg0MUY0NEI3QzlFNTI2RUY4NThGOEVENUMwMTEyQ0ZEMkUzQzFDMUYzODJC
-NzY2RDcKMzEwNTI5Njk2QUE3QTUzM0Q1QjBCNUQzNTMyQzExQjM1NjJDNkRBNzEzREVCMDRB
-NUJGMDIyMDU4NzcyQzk0Q0IyMkJCNEZBQTMyOTVGCkNDQTYwOUQxOEVBODUxNDZBODlDMDQ2
-RkM2MEIwREE2NUE0MTZFMkE3MUFCNUNGOEQ1MzYxMzhGMkE4NUREMDRBRURBNDJBRUY0MTc1
-NAoyMzJDOTJGMUY3OUIzMDNEQjRGMkVDREQzMDE4RDlDNjgzQTRCRDdENjBBMTU4Q0VBRTcx
-RDVDMjMxMTY1OTYyQkMzRTg4QzJDM0MwRjIKOUNBMkVGOTA3MEY4QzBFOTlCQzlGMzY1MkZE
-NTU5OUJFMzkxMTc1MEJDQkE2RTVDNTkzNEVERUI2Qzg1MDc0QjExQTg5NUE4NzRFQkIwCkU1
-OTA0MzQ5OUQwMjZBNkMwNjJCNEY4NkZGRDRFQUQyQzlBMzFENEU2M0QwOUVBMUYwMEM1NTY1
-M0E1QTY4NzE3RDBCQ0RBMDk2MUVENwo2MDgzOTg4NDFDMjZFMzA3NzQ5QTVDMjc2NkIwRDU2
-NzFBRDc0MDdDMDY5NjU3N0RDMDM0N0ZGRThDQ0UwNzcyNzUwRDRENkUxM0E2OTAKRTRBNUVC
-OTM1RkNDQkZDQkNBNzUxQkZFRDU2RkUzOEExODEwMTZGODdBMDVCOTA4NzNGRDhDOUQ4NDM3
-NDg2NDc4OTRBRjFGQzJFNDhGCkU0MDhGN0JBNENGQzlDMUE4ODk4QUM5OUVEMjMwRTk4NTE3
-M0I4MjlEQzJGRDIxRjM1QzUwMTAzQzA1M0REQ0M5Rjk4MzU3MTkxQ0UxRQoxOUQ2NTY2NzI3
-OTk2NDYwNzgxMDY5RUZGMzNDQTQ1MUExMDg4RTgxOTU2REVGOEU4Q0Y5OTdFMjkyRkJDNjNG
-OTlBODRBQjJDMjNBNTIKMDk5MjI4MzZCMDcyQUZGMTdFQzAzNDNDQUQxQjg0Nzg1MUNDMzE1
-MTBDOENBNTk5MTNDQzhERTJCMENEQUY5OTg0NkY3RjM0MUUyM0UxCkM3NzI3NTUwRUYxMTQ3
-NjQ3MkIzRDA4MkVDQzQ3RUE3RTJCNTZBNzQ3RTZBNzc3N0UyRTFBRDRGNEYyMjA5QjUzMjlG
-NDExMUQ4RjdFNQozODNENzYzODJGOEI1RkEwRDY1RjdEQjQ3QTFBMDgwNTY3MDIzRUUyNzA4
-MzNDQkQ4OEIwMEVCNzlERjQ5MTY3NEI1NzQyRDI3RTY4NzUKRDY4QzEyNzI2MjY1NzYyNDc2
-NEFBRTVCNkE4Nzc1OTY1QTE3OTg3OUQ0RUNFN0VFOUQ3N0JBNkRDOEQ5MTcyMTZGQUREOUEy
-NkNBRTlGCjlGNUIxMzVGNkI2QUEzRENCQzc3MTVCMzNFQUY3MDcxNzU2MUU2QzIwMTUxM0FC
-MjMwMzM3NAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKY2xlYXJ0b21hcmsK
-JSVFbmRQcm9jU2V0CiUlQmVnaW5Qcm9jU2V0OiBzdG9uZXNzYi5wZmEKMTEgZGljdCBiZWdp
-bgovRm9udEluZm8gMTAgZGljdCBkdXAgYmVnaW4KL3ZlcnNpb24gKDAwMS4wMDIpIHJlYWRv
-bmx5IGRlZgovTm90aWNlIChDb3B5cmlnaHQgKGMpIDE5ODcsIDE5OTAsIDE5OTIgQWRvYmUg
-U3lzdGVtcyBJbmNvcnBvcmF0ZWQuICBBbGwgUmlnaHRzIFJlc2VydmVkLklUQyBTdG9uZSBp
-cyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIEludGVybmF0aW9uYWwgVHlwZWZhY2UgQ29y
-cG9yYXRpb24uKSByZWFkb25seSBkZWYKL0Z1bGxOYW1lIChJVEMgU3RvbmUgU2FucyBTZW1p
-Ym9sZCkgcmVhZG9ubHkgZGVmCi9GYW1pbHlOYW1lIChJVEMgU3RvbmUgU2FucykgcmVhZG9u
-bHkgZGVmCi9XZWlnaHQgKFNlbWlib2xkKSByZWFkb25seSBkZWYKL2lzRml4ZWRQaXRjaCBm
-YWxzZSBkZWYKL0l0YWxpY0FuZ2xlIDAgZGVmCi9VbmRlcmxpbmVQb3NpdGlvbiAtMTAwIGRl
-ZgovVW5kZXJsaW5lVGhpY2tuZXNzIDUwIGRlZgplbmQgcmVhZG9ubHkgZGVmCi9Gb250TmFt
-ZSAvU3RvbmVTYW5zLVNlbWlib2xkIGRlZgovRW5jb2RpbmcgU3RhbmRhcmRFbmNvZGluZyBk
-ZWYKL1BhaW50VHlwZSAwIGRlZgovRm9udFR5cGUgMSBkZWYKL0ZvbnRNYXRyaXggWzAuMDAx
-IDAgMCAwLjAwMSAwIDBdIHJlYWRvbmx5IGRlZgovVW5pcXVlSUQgMzg3OTIgZGVmCi9Gb250
-QkJveHstMTc5IC0yNTAgMTQwNSA5NTB9cmVhZG9ubHkgZGVmCmN1cnJlbnRkaWN0IGVuZApj
-dXJyZW50ZmlsZSBlZXhlYwowNUQyNTQyRjlGNzVFQzA4MjJCMzZCRTZGMERFREZDOERFQTQ4
-NjgzMDg3OEI5RUZDMDg2NTQyNTA5M0UwQzJFNjlENkYzM0NDOUFFMjMKREY1RURCQzFFNUQw
-NzlGQjQ3NjRCOUY1NEMxQ0IxMDBBOTM2QTQ0NTA2NUNCOTdEN0NFNkMwQzQzNzBCM0FERTU3
-N0FDRDI3M0VBRUQ2CjE1QzQxMDQ4MEM4NjNDQjc1RkZDRTBFNzJFREI1MDM1RDk3Njc0NzMx
-QkJCOEU2OTRDMDMwMkU4NEM1Q0E1NUY0MDVDODNFMDZGQTQyQQpERUFBODlDRTIxREREMkJD
-OUYwNDhGNzUwMUMyMTI0NTY2RDU1QTgxRTE2RUJEMDQ3REE2OENDQUJEQTlENTJBMzg4MDI5
-NUZEMDU3QzgKQzc5MDBBOEEzMUJBN0M0OTkwNjgwRkYxRjc0RDU2OTlDMTlEQzgzNTk4OThG
-N0EyNTE5NkZEQkU1REE2QTBFNUM2REI3NEI3QkJFODhDCjU0MkZDMEU0NThENjRENTIyMzAw
-NzlDRUIzMkM2NjQ0QTg4MDk0MzZCRDEzMzIwN0ZDQjFFNzE2NTM1OURFQzY1M0M3RUU2NUFF
-ODBBMQo5MkM4M0I2Q0YzMTBGNzRBRjc2MDQ5OURENjdBNERDRTk3Q0NEMURENTM4MzA4QkZB
-NDZBOTkyQjE4QzAyQjhBMzMyODY5RTY3NzUyM0YKRTdDMjU5Nzg2NUYzNTJCMkJFQTQxNDAy
-MDIwNDc2MjEyNjc0OURDMDk1Q0M1NUFBNzZFOUM2N0E5NzY5MkQxNDgyNkRCQkJERjU1MzhE
-Cjk5RTE1RDRDMDgyNzI2OTE2MjcwMzMzRTM4MEVDNkM3MUIyQjc5QTVEMTVEOUI5MjhGNjNB
-NDhDNDMxNEU1Q0MzQ0UyQkQyMzUyNTMzRgo1QkJBM0RFQ0U3NTI2ODE0MTM4QjUxQjg5ODY2
-NkU4MjMyOTFEMDE0MkVENjg5QUEzNkIzMjZGQjQxRTY3REMyOUM0NkE3Q0JDRjU2M0MKNjNC
-NTI2ODBDOUJBRUUyQkI1NTQwOTU0N0RDQTY0MDMzREFGODAzQ0NEMzJFMzc2OEZCQTA4NTQz
-RDgwQTkzN0Y2MUI4Qzk1OTI3QkMyCkEwOEY0QTI1N0QwM0FFRjAyNUYzODc3Qjc5OEU1NURG
-RUExN0EyQzNBNDg0QkM2QzZBQkQ2MEEyNzIzNDQ2RTJDNjdGRTBCQTE4MzFFMgpEN0Q0MkVG
-ODY0MzkyNjM5MTdDQTE5Q0Q4RjVBMEE2NUFBNzAwMzM0NUQxMzc0M0U3NTdBN0IxRDlCQkNF
-QUI2RkUwMDIyQjRBQkMxN0MKMTA4QzkxM0IxMDY2QTdCNTIxODg2MUVFMjk0MkUzOUUxREFC
-Q0UxRDE2Q0I2NjZCMTRDNzQyMUI5QTU4RjFEQUE1MTlFNkU5NjU3MEQyCkFDMTg3NDQ2RjY3
-NDM4RjU2RTFBODBERjdBNzJBNkE3NkNGQzI3RkEwN0QxMEI2MjRFOEUxQzUzRjcxNzIwQjMz
-NTFBOTY0OUE2RjI2MQpGQ0NERTZCQzYxQzA1ODdFN0NDNjIxN0Y5OEQwNDk4NkVFOUFEODZC
-MEJFQjA5QzI0QkE3QTNGNENDNjY0ODJFQzdGRDYwRjREOTNENEUKODIyNzI2MTYzOTIxNjZB
-RTA5NTgyRjFBNjE0NkFGOTkzMkRGNEFEMkM0NUZCNDY4QjVEMkI5RTExOUU5M0I0RTE4RUU5
-NjNEQUYxQUY2CkZEODc2QjM2MkIzMUUzNkJCMEE4NzZBNDlEODJBRTg5RTBDQUMxM0RFM0RC
-RjI5RkI5NkM4Nzg4Q0JDMDExQ0NDRjA0NzM0QzFDQkE1QQo2QzE4MzQzRUExQjBEQ0U4MDgz
-ODJDOUZGQjQ0RjFBNzc1MkM1RjlBQzZFN0RBQTU5QzA4MTMwMDM0QThDRURDQkE4RDQ4ODgx
-RTc5QTEKN0JGNTc0OUYxMzYwNzhEQTlGRUM5Q0NGQjA5Qzg1QzYzRkQ5NjRENzIyQURCMzJC
-MTA0MERCOTFCMTUwOEU0NjBDRDA4RkNCN0E5RTQyCkI3NEFCMDlFQjNGODM2Q0Y0NjY0OEJE
-RDkyRThERDJENDhGOEVFOEY4MEZCMUVFRDI0RTkwMURDMjk0REQwMjREMjVBNzI2NDIyMjVE
-MwowMjhGRjY5RkJBMDQzOTJGRDQxNUI3NzVGMEIxMzJENzVENTZDREU5QzBDRUU0NEMyOUY4
-RjE2OTJFRTAwMkE5NzNDNTExNEIwM0FBQzYKRDFBQzAwOTE4NEQ1MDc5MEQ4M0NGODAzRjJC
-MzZEOTRBOEQ3RjNFMUM1NkEwQzkyNDQ0N0Y1NjkyNUYwOTM5NUNCQjFERTM4QzVGMTNDCjFD
-N0Q1NjNDNDNFRkY1RTg1MzhDMkJFMTJDOEUyMTRCNzc0MDAwRkU0RTI3NTFEQzZGM0UyQ0M4
-REY1RTQ2MzNFMDkwRTRDMzRDMENDNgpGMDZCRDgyOUIxMTA1QjUwNDI5MjA1QjJDNEJBMzI0
-ODAwMzVDRjUxM0Y0MDM5QjY5RUI0NzVGMTZFQTQzOUUyNzdENUNCOTNEN0JBMTcKNDE2OTZB
-REJBMDY5REYwNDYyMzIxNjkxMzQ5ODBERjEzRDJDNzVGQUY1NzU4MkI1NDhGRTY3RjcyMTVE
-NzY3MzA3NzE2OEI3MzNEQ0ExCjUxQjBBNzU5MUMxQzJEN0IxRTkzRTQ4NUY1NDc5OUFFMTEx
-RjI3MkM0OUFDRkRGNjk5Mzk5NkE3QzU2OTlCMjUwQ0QyQTlEODJCN0E0Rgo2MEY5OTA4NjVB
-NUEyMUMzOTRBQ0M0RDYxQkUwRDlEREJGOERDMjUzRDE1NjI2NUZBQTVFNTE2M0RGNzM5RjAx
-M0MxQkU1MTlGNUE2MTYKNkZDREMzOTM4RTE0RDE3RDdCNENFODc4NDgxRDVEQzJERTU0NUND
-MjlDODhDRjA0M0VFOThDNEJGQTZFNzQ3REM2MjYxNTJCNjgwN0E1CjY0MEVBMzlDRTY4MDI1
-NDFFNUI0RTgwRjZBQUI0MUIxM0Y2RThDMDkwNjU1NjI3OTU3MEQ3QjNDNTUwOTIzN0VGRjRB
-OTg2ODAyOTVFRAo3QkQzNzg5REQ1MzJFMTJDNDdFOUQyNkFCOTgzMTY4OEU2QTlEOTg3MTU0
-MTlCQkE3QUUzOTBENkVFRTdFOTEzRTk4RkNCQTZCMjY4QjYKQzk1ODQyNEQ5OEJBQjE4Mzcy
-QzkyNUFEQzUzNDE1NTA4QUU0QUZCRjIxMkQ2NkEyMDA2NjkyOENEODFFNUZGRTVBQkEzNDgw
-MjUyMkI4CkM0OUNEMDBDRDBGNzE1Njg1OUYxNEEyNTQ1NjY1NzhCRTFFMDk4NkE4NjczOEJE
-RDdFODFFQjgyNDlBM0MyQjRGQzUyMjg4NkMyMjIwOQowMEJEQjk2RURBOTcyNTU4RUYxOEU5
-NDA4RTZGQThCNTlCNUU1NTdDREJDNkI5MDA4RTAxODA4OTk3NkE4MzE1NzYzN0VCQ0ZCNjBF
-NDYKMEJFMTJGOUU5MkZBOEFFMzg0RTJFMjdCNThBNERENDZCNkFFRjA3OEYxNzQxMEI2NDI5
-NkJDNDNCRkYxQUE3MjBBQzBENTc1QjBBNEE0CjY4NUY1MzNBODQ2RDFDOEU2RTNGMEE4OTI5
-REE5QTRERDAzOUFFQzA5MDhFRUU2MjlCMjhGODUxNjgzNkREQTg5QUE3RTAzMzk3NDc1OQo3
-QkFDMzJCN0Y2NUE0N0U4NzVENjU3NTkzMEU0NTYxQjEwNzdBOEI2RDRFQkE3MTBBNjBFQkY4
-QkQ3RjkwRDU5NjZEREYyMTc2NzY4MzgKQzcxNEI3RDBBMTAxM0NFNjQ5NjI5Nzk3MzM1RTRG
-MUU3MzZBNDUyRkYxMDVGMUUzMURCMUYxMDVGNTFDNURBQ0ZFMTREQUU1QzM4NUI5CkE0OTNB
-RjIyOTI2OERFMzEzRjAwMjc1RjZFRjRFOTk1RDhFMTA0MTMzRUNEM0JDQjEzNzhCNjlGRTBE
-REIxMDBDRDQ0ODFGM0Y3RkZFQgo2QjY5NjA5NkJGRERFRUYxMjY4QkQ5QURGNjgxQjU3Mzgx
-ODk2Rjg1MUVCMTI1MzRGQjA1RURDODlBQ0U1OUU3Q0RCRUJDREQ2MjI5NTMKNEUxMkJBMEM2
-NzUyNjA4NDE2MDlDQjY1NkIwNUQzN0NDN0ZDQ0JDQzkyQkVCQzRDMkMzMTEyQUUyQ0VENTU5
-MDUxODQzOEIyNzc1REQyCjc4REY4NDdCNUYzNjc3OTM0MDk5QThEMzRCOThFOUY3OTNFNkM4
-NkM3NkIxQ0IwRTQyRUM0RUEyRTlBQ0IyMkVFQkMwODQwMjZEQjE2Mwo0MEY4Q0Q5Q0UxOTRE
-MkY2RUEyNDAzMjU1REEyMThFQzMxRUYxMjg4OEQzQzRBQ0U0Qzg0OTEwQzZERDE3QzgzMjE1
-MzNCNjU0OTZDMEEKNjdFRjlBQjhCQjQ5RDhBOURFMTA2OTREMjFGQTY3OUFFREZENTZERjE4
-QzkxNUZEODJCM0VBQzVGMjc5RDRDQ0JGMDIxODNERjRFRUY2CjExRjUyNjYxMDhBMDFEMDU0
-MzIxRTZGNTkyMkYyRTFGNzhENDhEQTk2NjU0OUYzN0VBODc2QzcxQkExMDlGRTgxNzE5ODIy
-MzE1QzJENApFRERDMEIzQjBDMjU2NEJGNkQyRTJCQzNBQTAyMEI0NjJGMEE0MkM1NjJDMUZE
-MTM1REI4NEE1MUVENjc3RDJFQzk2MkM4QTg2REY5RjEKMkI0NDg3QUY0NTU4NDYwM0Q1MTdE
-NkJEMDRCNjY2NTlFQ0RGNDQ2Q0FCNzFENzY4QTlCNEIzRjU4MjkzQTZERENBODk1MzA5Q0Mw
-NDVGCjk1MUFFMTEwNzdGRDFBQUY3OURDODBDMENBQ0QzNjJFQUYxNzQ0NDU1REI5NjRFQUQy
-RDY1RjAzQjRGN0EwMUFCMkZCNDFBRjA4NDAxMgpDMTk5NzM4QUVGOTM1Q0Y0NkU2NTlERjg1
-MkE3OEQzNDMwNjMwMTRBNzUzOTlGNUZFQzkyQjc1REU3RTA0QzZFNDJERDZENkNGODREMzUK
-ODIwMjk3QjdEMEE0RTA3MkQ5RjU5NDRFN0VEQUJGRDRFMzA5MDE2QjZCQjM0NTBFMjk0MkRE
-MTMxRTc0MjBBQTJDQTNFNzY2QkU5Q0I5CjQ0QzI4MzMwRjJERkUxNTE4QzJGQkVGNzg1QUY4
-RDkwODBFRUYwRjlFMTU1M0MyRTg1NUFBNjhFQTcxRDhGNUExNjgxNUQxRjIxMDQzMAoyNUU4
-OTNFNDA4QjAwNkRFNDMyRDlBMUY1RjNFNDU1MzE3ODVCM0Y4Q0U2QjE3NUUyRjM5Qjk5OTQ1
-MzgyRTYzQzNGMzFDNzQ4QkZDMjYKQjdEMTQwNjAwNDMwMTdCM0VEOTNFMjdFMTcyOEUyNjQz
-MDNCMjFCRTNGNzhERjQ3REFBMTM5NTM2MUJBMEI4NEJFQ0YyRjg1NjhBRDI3CjY3MzE0QzBC
-QzgwQTlCNzMzRDk2NTE1Q0Y1ODZDRjAzODYzMDcwN0QyOTMzRUFGNjY0NjY1Qzc2OTI1NjNC
-MkI4NzA3QjJDMjFFQUZFNwozM0M5NkM1Q0JGNzk3MEMxMzEwRUFFNjcxRjk4OTMwOTE3MDZG
-QTEyOEIyREFBREE5NUYyNkQwRUIyOTk5QkMyOTRBMjJBNjE4ODNFMTkKNDIyMjgxNTkyOUQ3
-REYwNjgzQjVDODA1NkM0RDFGQTBFMzcxNkMxNTVEMUFDRDIyNUQ2QjY4OTc2RUUxQTQyMTcx
-NTkyQTkwRUJDMTBECjkzRkQ3MzVERTBGQUFCNjkxQTQwOTgyMzkyMTNGOTdCRjgxQThDRERC
-NTg4MENCQTcxNEYyMjIzMEQyMDhBRDk2QjlCNzMzMDVCOTBENgpDOTQ2OTdEM0FFOUZFRTVB
-NTI1MDNEODQ0Q0RFMUZDMTUxMTI4OTdDNjJBOUM5RUZCQzNENzc1QzQwQkFGNzg0NEFGNzAz
-NDY2OUIzMzIKNzA1MzNFQTcxQkYwQTlDMjdCQzAzQTAyRDcwNDA5MjZEQTFGMTA5MDZEMjZF
-NjQzMTYwNjkwN0U4NTIyQkY2NTgxQTMxMUExRUYxMDc1CkI2OTcwNTNCNTkwMjBCN0ZGODNE
-MEZDQjBCRkRGMTQzRkE4RTY0NUM1MzQwQjkyMjZEMUZCM0QwM0U4OTJCQjI0RDdGNTQzOEQ3
-Qjg3RQpGRTMzNzM0M0MxODc2Q0M5OTQ5NTcwN0Y4N0Q5NkUxMjM0QjU4QzcxQTQ1MEY2MkNB
-NUNFM0I4OTVCNTIzMjhBQzE3MzlEMzk2N0RCMDEKMjZFRTQ3NUI1QTYwOTk4MkMzMUI4RkYz
-NTJFOTU5RTQxN0U5MDdENUI5QzA3NkEyNzAxODg0OUFDMTBFNjExM0MxQTBGODE2NTgyNjgz
-CjcyNzQ3N0NCQkNERTEyMjJGOUVCQkI1NjQ4RDI5NTE3RTcyNDk2RDFGMEE0NENDREIzNDEw
-NkE1MzUyMUVFOEY2MTM1OEEyNjcxMDVFRgo0OTU3Nzg5MjM4OUJGQjcwMTUyMEFBNzNFNkI4
-MDcwREU2MzRCODUzRjNBNjE4MThBNEI4QjMzMjY0NDE2QzFDM0M4M0ZDMEM4QkUwOTEKRjMw
-MjUyQTg2OTFEMTkzNDU2NjIwQjNCRjQ3MUQ0Q0NFOTM5NzU1OEM3RUFDODEwNEM4QzZBMTND
-RDcxNkQ5MTYyMTFBMTJDNDQzRjJGCjA0RUYwQzMxRkFBRjA0MzcyOUI2MTU5QjU3ODI2Q0RC
-REQ2MjA1OTMyQjI1MTA4OTM4NUU0RTMwQzRENTE3NDRBNDVEOTZGQzI4NDA5NwoyMDA3RUQz
-NTNENjJEM0NEQjZGQzc1NUMxMUJFOThFOEZGQkI0MDU2MEM5M0NCQ0VDQkE3QzA5NjkyRjgx
-N0RDRTFCQTQ1MjZBODExNzkKMkYyQzE5QTE2OUM5MUMwMjU5MzhFMkIyNkE4MDM2ODJDRDk5
-MjE4NDRCRjlBQUIxQTE0NTE0QkQyNkYwNDZFODc2OUQ3OUIzNjA0QUJFCjBCNzg2RjYwRDQy
-NEIyQzYzMjM1MjBBOTgyRTkwNkNDM0U5MkQzQjUyQUYwNDUzMDcwOERENzgyMTM0RjQwNTJF
-QkY5NTMzOUY1MENGNAo1NDk2QjcwQjUyQjU5Q0I2RjU0REYzODJDRDlGNEJCMTFGNjI5ODYx
-MTMzQjRGNTg1QjgxNkVGMTk3QjYwQzVBMkQ5RkNGN0UyMEJGRUEKMzY2QjQyRDVGOUIyQkIw
-RjY3QjA0NUE1QjU3QzE4NUY2MjFFRUM5MTkzMjg1NUUwQzkxNzcwQTVFNEZCREU0QUJCOUNE
-MTM3Qzg4QjRFCkU0OTlENDMyRkE2REIyQjg3QzcxQTAzQUQyM0JFRkJCQzVBOEZCM0UyMTMw
-RjQ1MUIwQTBERDQwRTg0NzgzQzI2RTU3M0I0M0IxNTYxNQo0RjdFRUI4QjM4MUUxRjk3QzU0
-QzQ4RUI1QUQ0QTE1NDUzOTFFQzNGNjY1MEEwRTQzRjRDMjM3NTBERDU4MTU3QUZBQzczOEMw
-N0QyOTYKRUI5QUZBQjBDMEZBQzM4Q0U4NTY2MjkzQzU4NEIyMjU2RTc5NTQ0QTVCMjQyODM0
-QkRCMzFBODY0NkRFQjA0Qzk1RUU4MEVCQzJGODQ1CkJFMDUzNkE2MjlFOEEwRDIzRDM1NUNF
-NEQzNUU1Rjc0QTJENEUwOENBNkQ0N0NGQjFFMEY0Rjk4RUREMkVGM0RDNzc5QjY5QkFERUVG
-NgpBRjA2RjFDNkNEMzZFRUQxQzA5RTgwMENENzIzNjg5QTAwMTAwMEY0MjAxRDM2NURBNTU3
-RDExRjA1N0U4NTg1MjBERTc1RjVDOEYzNTQKNjlBOURERjVBMjlEMzY1MUVGRkZBRjRGREJF
-RDJBOUMxMjc1REI3NjRBQkE2RkY3NEI3ODlERDY1QzhEMDgyRDlBOUZDODAwODczMTMyCkZG
-QUM5RTc4MjI5MUVFNjY5NkQ0ODNENDFDMTM5OEU4QzY1MzA2REEwRDMwNkJCOUVDNzEzQUZC
-NEMzRDU1QTRDMzhEODY1MzgxREZCMApFNjMwNjI4RkJCN0NGNTE5MjJFNTQ3RDg5NzUzMDFF
-MkE4MUUwRDQyOUZBRDFDNjU5OTM1NDRBQTU0MzFCODgwQkU0RjMxNEM0OTgxQTMKRkVGQjJB
-MzdCQzFCRUZCMjY3RkVDNDc3Mzc4MTlDMTRDMDQ0ODY5NDNDQzE0MzIxMzVCRDg0NEEzNDYx
-N0VEN0U0MTQwNDMxQUFFOTQ4CkU5ODlDNUM3MkI2QjA5MEFFODg5QjYyNjYyRThEMzBEN0M2
-MzMxMTBGMDg2MDBGOEYzREVCQUJFMUI4MjcyNTcxQjE1NTBGRTM1QzI1Mgo4MThGODU2RkZE
-ODIzMUU4MDEzMjFDRkE0RTA4OEQxRDZBNEY1NkYyQ0E4MUE5MDlEMEQ1NjVCMzNGNUIyNTc0
-RkM1MkZDQTExMDdFNEUKOTRFNzIzN0Q5OTREQ0EwRTVDMTMzNDhCNkVEODM1QUQ3Mjc5RDc4
-Q0UyOTBCMzhGRDQyODc2RkNFNDQ0NzFBRTZFMjBFNjM2OUM2MzhFCjZFNEI0OUIwMEI2ODQ5
-N0Y5MTJGQTY1MTgwMTZBQ0U2RENBOEU4NjUxODRDRDU2M0UxNzEzRDdFQURGNjRFNTJCQkQx
-M0NFNUNFNTRGMQo5RUM1OTc0RTlGNTlEMjg3Rjc2RjAzRjc1NkFCNDJGQTNDREZBQ0E3OTc5
-MjY3OUI3RUNBNTE2RDE1MzJBMUJGMUFGMkIwNDAwMkEwMjkKQUM4REMwRjM0NTI3RTkxN0Q2
-QTU1OTk3NERGQkY5QTVFMTNFMkUxRUQ1MjZGN0FFMTdCRUEwNDY0MDcwNUNBRUIwNUYwNjU0
-NEExN0Y3CkI0NEJGNTRCNkI4MDU5NEQ3MUFFREFBRDE3MDc5Q0ZFMkI2QzY1NzQ0NjU1NDE4
-QjE1MjdENTFENEM0NUU1RjMyMUQ1MjQ2OEMxNjhGQwpBNTE1OTc5Mjg3NTY2REZGMjZDMDYx
-RkZENzAzOUMyMzJGRTFBQ0Q5Mzc3QzU4ODUwQzk5QkRBRTE0NUY5NDlGNEY1MDRENzRFNDI3
-OEIKM0NCMkVFNTMyNTJBRjc4MDVGMzE0M0YwOTk5QzhDMEQxN0NDRDJFOTIyMzc1RTU2M0VB
-RDY5OEQ5QUU2RDBEQUJBRTVBODM0MDQ5N0MyCjEyMzhGOUZDOUZDMDVCNzZBNDdEQTBDQ0ZG
-OEQxMDhEMUExODhGNURCNTc1RTVDMDgyMTlBMDRDRjc4RTA2QUYxMjRGQjNGQzNCNEU3OAoy
-Njc3RjNDMDlGOUQ4OTJBQjI5NEI0RUExNTI0MUNFMjg5OTUxNEVCNEQxQkNGNTFEMjk0NzM3
-MDg5RUI0QUM1NkFDNzg1MkU0OTgyMTcKN0I4MDQyNDExNzczNTM2NzA2MzczNzZENEQxQkU0
-RjEzQTYxMDdBNkE2RTVBNzM2NzlFNjg3RjU1MTI4MDFCMDdGNjc1NjhGNzM3QjNFCjAwRkYx
-M0Y3RjhERTlDNzNFQjNBMjg2NUIwNzA5NEFGNkZDODcxMEJDQkY2OTE1QkUyRTI0MTZCOUE4
-NjZCRkM1MTNFMjlFOTI4OThGQgo4MEY4MTEzMEU0QUI5RTVDNUQ1NTk1NzZCRUU0QUU1QjAx
-QkQyODc0ODI0MEU3QjJENzQ0MUU1NzA1M0Y5MzQ2MjhBOTlDQUM3RjRDNzIKRjBBMzQzQjc5
-MzdFMjk1QkJBQjlEQUU1Q0VGREQxMDNERkY5MzVCMjQ1NEU0QUUwQUYzOTc3NkEzQzBGNDA3
-MDFERkVDQjI3QzZEREJBCjREOTc5NzJDMDMxMDlBMjA5QzZGOThDMUU2RkQzQzgxQUY1Q0ZD
-RjUyMjM4NjZBNUU1ODUxNEZFOEQ1REVDOTU5NDU4NjVGQjZGNkZCQwo1MUZEREREQURBQjFE
-QkM2OEYzNUY3NTY0MjZFQjI5QTZBNDE1QUVDMTFEMkVDMDlCQzUyMzcxM0VENDQ0NjZGQkEz
-RkRERUE4NzNBMTQKODVEN0MwNDJFNDkwQkVBNzUxMkQ0NjcwNUE5Qzc3QjUyQkY1NzVCQjFD
-ODQ5Qzc2RDBFMzIwMzNBOUY1OUM2MkQzNjQ2NzI1NjI3Q0I3Cjk0OEMyRjcyRURBM0Q1RDI3
-RTgzQzJGMzc5QjEyQ0JCNkQ3RUQyRENGM0JEQTI5NzI4Rjk5MTI2RTU2QTM2Q0M5RDdGQ0Q4
-M0YyQTRGQQpEQkQ1QzE4ODM3OUNDNkE1NjA3M0Y1N0U3NTIyMUU1QkEzMjhFODRFQkI2QURD
-RDlEMjU4REUwM0U1RUQ4MzEyM0RCMTk2NDUxMUI3OTIKMjczMEQ2OTJGOTZCMkU5MzI3M0FD
-MTQ4RUNGMDY5MzYyRjVFQUJCREQ2QzU3N0QwREQxRDcyNEJEQkQ4MDQyNTBEQjJFQjNBMkI1
-RjQ0CkU3REZBQzU0NTdEMTE3RjNBMUIxMzJBNjhDNjFBMzUxNzlCMzM0OUExRjQxMkMwMzIy
-Q0I0MTUyNTZGRTUxN0ZDQjBDMjA2Q0Q1NzZEMAoxODFDRjFFRDNBMDY4NDQ0RjJBMTlEOUVF
-QjUzMjRDRTA3MTQ3MkFFRTAyRTIyNUM3NDc5MTMzOTJFNDMzMzFDNURDOTZCQTk4NUUyRTEK
-NjA1QTNCQzA5RkM5MkNEQkU0QTUxNkUxQkQyNDhEMzRGRDg1MDIzRjlENzM4RUUxMEIyREMy
-M0VEOEExQTJGQTIwN0ExQTQ3NEI5NEEwCkI3ODY5NEQ3QjlDMzg2MzAyQjJCQzcwMjk0NDJF
-NTc0QjYyNThGOUJBQUQ4QTA5OUM1MDAyQkUzNjY2NDlBNzcxQTk0QTUzM0I0RDMzNgo2OTVE
-REQ1OTlERkI0RkE5NjNCMDQ2MjhDNTJENkREOTM3QkJDRUQ0MTdGREZFOTI1Q0E1NEI5Q0NG
-NDRFQzc4RDJDRUE5QUZBQkJBNkEKOEQwRDc0NzlFRTYwMjA0Q0YzOEQxRTlCNDI1QkQzQkQz
-NzUxOUQwRDY0RTE1NENDNkNBRTdDRkM3MjA5RjRBRjRFNjZBOURGQkQxOTM0CkU4MkQxMjA5
-RTEyQzQ0Q0JERjRDM0U5MDI5MzFDNkM5ODNFNzEyREE5M0Y0NURFNzlBNThCRUY2RTc0MkVC
-NjNEN0QwQzE4N0Q0MDM3Qgo5QzFGREUzRjIwNDUwOUVEQ0RDQUE1MDc1RTNCOEI0QzVFNjJD
-MThDMkZBMDEwNDBBNEQxNTNDNThGMEQ2QUE2NjMzNUFDRjdDNDU1RjUKODU1QUIzREIwQTEy
-NDEyODc4NTY1NzREQjE3MERBMEM1NUE5QUUxOTBGREJGMzA0OTk4N0M4Q0UyNkM1MDFEMEYz
-QTE1RTk5MTVFQjVBCjlBRTRBNDk4NjBEQTkzNkNDNjEyMjhBMjFDMzQzREY2QjBDQ0UzMjRG
-QTAwQzMyNjUzREUxNkY5QkJBRTg1RTlDNzY3MzE1OTQzNEQxNAoyRTI1OTI4RDJFQUQ4MDIx
-QkZCMkRCNEYwQUU5MzkwMDU3N0M1OTM3QTdBMEUyOTI1NDZDNjZEOUQzMDc1OUVGMDYxMjA2
-MDQ2ODlGQUUKRjgwODUyMkJFQzU2QkE2MjYyMUY3MjhFOUE0QTREMzFEQjdGN0Q4MkREREZB
-QjEyN0U1MEU3MkY5NUVGQTQ0RDQwRUQ5QTgyQTFBM0QyCjE0QUUyNzU5MzBGNzk1QUQ3NDM3
-NUE5ODlENzhFRjBGM0IyODEzOEQzNUEyMEY1MTZDODU0NjA4MUJBNEJDRDZCNDkzQjQ5RkFC
-NUFEQgpDODQxQzQ4QUM4QjIyRURCOTEzMUJCQUQwMDQyNUQzNjAxRjQ5MjhGNzJGNjBBRjZC
-QTI4NDVERkYyQzFDNDZDOEMwOTE5NDgxQzJGMDIKNkU3MTYyN0EwRUVBN0MxMjMzQkZDNjdC
-MTZERUEwMEFEMDUyNEZGMkZEMDRFNDkyNjY2NTJEREE3NDJFMjc3MDUwNEMyMjQzMDAwNEFF
-CkY4Q0Q5NEU2RTU0RDFFODk4OTI2NEI3QzIyRDc3MEQ5MzYzODk5Rjk3QTkwMEI4NjM3QzQy
-Q0JFOURBMENBRjk3RDY5RkYzOTkxMDkxOQoxNTVDQzY4RkM4MTIwOEY5QzdFOUI3QjY3QkJF
-RjAyRDY1OTMwNDQ0RTkzMTlEOThBM0MwNjNFRTU2QjkwN0NDNUIyQjA1NDk2NUJEMjIKMDc0
-RkY2MUY4Rjc0RUQ1NzM0QzQ2QkU1MzJDOUJBODgzQzU1QUE1RkFBRjVFRTgwODUzRDFCRjA2
-RTI2MDY3OTczMkU3NzEyNjE5QzM5CjlERkM0MjI1RTcxQjg3OENCNzU4QzZDM0RFQjUzNDdD
-NUFENjRBMjJGMEM2QkYyQzY5MkY1RUMzNTRGRTlFRkI5NDBBRkVEQzUxMUY4QgoxQTEyQkQx
-OEMxRkYxNEIzNTQ3NDhERkE0NTUzQTM5NkREODQ1NzIzNEZCMUQ2QkJGMkU1OEVENkE0QkU1
-MzU2RTM0MDJFNjk1MzFCQ0UKMEQ1N0U3NjMyRDJEM0Q5QTdFN0I1NDQ5OUNCQUI4MDc1MTQz
-MzBDNTY2RDEwNEM0OEE0RkJGRDdGMzY3NEVERTY0RDY3NERGMTI2ODU2CjExNDVGOEQ2NDlD
-RkYxQzA2OTQxNDY2Nzg2N0VBN0I2NUEwMTI2NThGMTM3NkU3RUFCNDUyNUVFMTc4OEIyNUMz
-NDg4NTA4MDlFNjFFOApDQ0REMkZGNzA4QzFBNjFFRTBFMkQ2QjVEMUI4NUIyMDk1MTg1NjY4
-QjM3ODM2RkNBRUMxOEQ1NDQ0RDBDMDBFQjZENzVFODExRDNDNTAKOURGRUVEQkU4NkI4MDUy
-RDAwMjFCMTg3QTkzRDFFQTFGRTAxNDdEMTFENzVEQjVCNjM1MzY0MTBERDc0MDQwRDc3Rjkz
-MDI5MkQwMEUwCjgzNTFGN0RFQjYzRDk4RDU1RjExQUU1QUVFRUIwNUQwMEQ3RTdGREQ3NjlF
-RDMzRjFDNjFCRjA4N0MzMDBCRjhENUJDRTM0QjQ3OUQ2Mgo4MjMxQjlBQ0VGMTlFRkNGNjc1
-QkI0RUMyODMzNDU4QTE1MUMzNDBCQTVEQUI5NDk5MTdDQ0Q4QzQ1NUQzMEY0MzMzQTgzNDUx
-OTc4NUIKNTM5Mzg4NjVGQ0UzRDdENTI0QzcxNTJFMDNERTJGODREODJGNkY5MDY4MkIwMTk4
-QkY2ODhCMkE2MzIxM0NCNDMyMjk3QUU5MkZDQjU2CjdEMEMzRUEyMkMyOEMzNzNEMzQ0OEQ0
-MDI3MTlEMEM2OEMzNjg2Q0JBRTRDNDVBNjk1OEQxRTg5RTYxRUE4RkJEM0QxRjYzMzY2QUM1
-OQo5NDkwQ0MyMTE4MTQ4MDE3QzcyRkIyMzlGMTU0MDIxNjM5N0RERjM2RTQxREM0OUJFNEYz
-ODM2QjA5QzY3NDQ1NEMxMDQ0QTAyNzA0RTYKRkY3RkNGNzhBQTg1QjEwMDNDMUIwRUIyQjUw
-MjFGOEYyNjQwQTY4RTQ3OTlFNzVDRjQwRkZGQzIxMkFENTYwMTMxMzMwNDg5NTU1QTQ4Cjgy
-OEVFREQ0NDBCREZGM0ZDQkM4NjAwODA5OTJBMzM2N0U4NTBGOUQ5RDIwQUYxQTAwNTVENEFE
-MTM1MDUyNDU3MjVCQzNERkQ3MjYxQQpCNzc3MENDNDFDNkI5MDg4NzJGRjk5NzU4REY3RUEx
-OUNDQ0I4MTIwQUVBMzJDNUU1Q0VBQ0MwNUEwQzQwMzAwQzhCQkEzRUExNkFDRDcKM0M5MzMx
-MDI2RDg1MEZERTgzOTk2Q0EwM0Y2NDJGNURFNTQ4MTg1NDAwMTRFRjY1NTcxMTkwMzk0RDk0
-RkMyOTczQTZDOTJDRjY3NERFCjJBRDlEREZFQThCOTNGNTU2RTU5QjYxQUU1NThFNkU4Njgy
-NEYyM0Y2QTBBNzJGQzc5QTQ4Q0QxNEZEN0JDQzc2MDExQTM5RDhDQzlBRQpGOEU3MjQwMkRC
-OTZERjBERjQ4ODg1ODgxRjUwOEM3QzU5QUY2RDA2MTAyRkFDODQ3MTg2MzA4NzA1MTZFRkM5
-NDI5QTNFOTUzNzY5NTYKMzE0RTY1QUJBMTI0RjkyQUUxMTY4MkY5Nzg4RTQ5MzM3OUY4M0ZB
-REYzNDA3ODMxNTBDNTE3MzlFRTg3QTg2NkQzNTJCOTlFNkMxRjRFCkFEODE5MUI3REJGMzY0
-MjYwQ0VEMzI3NEEyNjFDM0FBRjkwOEQ0NzNDMjE3NUQxNUFBOTMyRDg4RERFNTdDMkVBRDI3
-QjREMEYwNUM5RQo1MTM3QTQwOTMzNEQwOTU0MTgwQ0FCNjQzNzIxNjYyNjZGQUE1QTIyNTA2
-RDg1QTQ5MjhFMjQwQUZGRjMxOEVGNjNCNDVDMjZEMjMyMzcKNkM0NjVBQzlGQ0Y2NEQ5REND
-RjEzQjZENTEwM0MxRjY2NTc0Q0NDOTY4RUUwRjZDQ0E3NzNCMjhENTNFRDk0QkI3QjQyMjg3
-QTZEM0VDCjEwMjE0M0Y1MjcyMENDNTM5NkVBNTI0NTc1QzFDREI0Mzc0ODcyODhCNTU4N0Qy
-NEJGRkYxQjgyQURENDVBRkVDQjRENzQ3QTYyODk0OAo2MjNFNjE2NjRGMzY1NUJCQjFERTc4
-MkI3QUNCRjI1Njg3NURGNUZDQzIwQkI3NTA2OTEwRDEyQkU3MjkxRUEwNjQ4Mjk4RkQzNjE3
-MzcKMDQ1OEFEMDg5MTcwQTAwNTk0MjYzOUY3QUU1QkU4RDFGQjZCOTU2NjJGRjA3NEZCQ0Y5
-Mjc3NkU2RjRDN0QyNDFEMUVGQUVFRTQwRERGCkU4RDg4REMxRURFM0Q5RTA3NjhCOEUwRkQz
-OEJDRDkzMTBGOEE3NENDMEM2NzFCMEZDRDQwNDczOUZCQzY4QkIwMkIxRDkwQkM0RDkxQgpG
-NUMyNEU3MkQ5OEQxRDM2QTA2MTFCQTk5NjFCNzRDQ0U0MzQxMURBNUJGMjY1OTQxNEQ3NEJD
-RkU4RTI3N0VFQzRBMTFGNzEzNDJBOTcKNjI5MUM1MkEyMTczN0YyMjQxNzhCNjE5RjA0OEYy
-QTQ0RTlGNDJCRDU1MzA4NDZFMTBDNEYwNTYyNDAyNkUzNTVGRTYyMzIyM0RCRjQyCjkwREQ1
-MDRBREM1NjA1MUE5MjU3OENBMkUwMEJFQzEyMEUwODEyRTBFRUVFOTM0RkI5RTdGRUE2QjQ5
-MjVCNEY1MTE4RjMwQzVCRkYzNQpGOEExRjA2OUIxRkNDMjQ2OTQ1MTlGRDlFODE3RTAxNzk5
-RkUxRkI5RkZCREQyODIyMjY2M0E3NEU5QUEyNTNGNTczRkIzNjMxQkFGRUMKRDMyNzUxNEE0
-Mzk0N0YwNEYzMUJDQjIyQzk4Q0Y5RTA1MDczMkJFODU3NEJDRUVCRkI5OTM4QUE3NEZDNjhB
-M0IyRUNENkFDQ0RGMjJECkU5RjQ2QUMzNTg5QUFCMUMzNTI1MzhEQUEwRTFDQTMyMDY5NEY3
-OUQ3RTVFNjkzNDEyOERFN0VFM0UzMzI4RDRENDk0QjVFODVFRTQwRgpGMjAzMkU0NEFFNTg3
-NzBFNzgxODgxNzdGQ0YyM0NERDIwMDI4MEEzOUVEQjc2RTREN0JBNkY3MjhDRTg3ODQ1MDdG
-N0RBMTY0RjA2MkMKMzQ5RTMyNUMxNDU5NzZEMDEwMkU2NURBMTcxRjk1QTA0QTNENTUwRUUz
-REVBQTRBNTY0NzY3RUNGM0U3RDBENUQyQkQ2RDA2Q0ZBQkM0CjFEMUJFNUE1RjFDNDc4REUw
-ODM0M0YyRDlENkE3NEJFQTNEQUM5NTNCRjM4MTgzRUI5QkY5QjE4OEY4ODQ1OTQ5NkJDNzRB
-M0VGNjUxNAoxMjMwN0FGNjlENjhBMUJEOTY3OEM2NDJEMTFCNzVBN0I1QzExM0VBODAzNjU4
-MDU5NkZBMTkzRjJGRTQ1RTUyMjc0RjIwNTgzRjZEMEUKN0Q3QzE3Q0EwOTAyMkQwNzU3M0Uz
-M0Y1MjM5NEZGNDk5RUQwNjdFRERGMTIyQTRBQTQ0QjlCNENENTNDMDQzMDRCRDUzQkRCNzM0
-RDc4CjU4NjY4OTFDRkNDQjVDQzRBQkMyRUEyQkU2RUI0MzJCQzBFQjIyRDlFQzQ1QkQzMUVD
-MTEyNDRGOUM3QURGODFCQ0EyOUE3MEVFRTQzOQo0QTNBQzVDMkJDQkQyRTgyQTI2QjA2QTM0
-ODU0MkE0QzU2RDc3OEQyREZGMjk0NEI1RUUyQjJDQzMyNzYyRkVFQTJFOTVEMTgwNzU4NDcK
-NkUxOEU2NTk2QjlBQkIzRjM2NzQ1QkQ4MjI4RUMzNTZCRDhERkU4OUY4MTgwMjc3QzUwRERB
-ODgzQTU5RjFEOUEyMTcwNEVEMDE5MDcwCjdFODdEMzA2NzI5NzNGNEVFRDZDNzQ0QzJFNzFC
-QTM1RTg4N0MwRUExNTAzQTk0MUVBMjA5MDIxNzdEQjFGNTA1NDE3NUEyMTVBOUQ0QgpGRUJF
-QzUyMUIyMkY5QTI5MjRGNzZBQ0JFNTczRTIxNkIxQzk3RDVEN0VEMzIyREZERkJEQTEwNDlB
-MjE5RUUzNzM2QjlCNzYzNTM4Q0UKMEIxQkUzRTI1MzE3NUE1MTVEQjBFQjg3N0E1NDdDNDky
-OUM5RUZCRjREQkM1ODZCQjA3NkVDRDc1NzU5MzBFNDU2MUIxMEE1NkUwRjkyCjE2NUU0MTVG
-NzhBQ0FGMUE5OUFGNEExQTg2MjVDRjAzQjZGRTU2NENFQUE2Q0FGMkZCMjQ3NTQxQ0FCQTI3
-OERDMTk2NkI2REExOUExRQo5MTUwMjQxODQ4MzJFMzMxMjlEQUE4RjM3QzU3RUE4RkE2NkIx
-RDdDMUUwMzk0NTYyN0Y5ODA3NTEzRUFBMEY4N0NENTU2NzY0NjA2OTIKRTc2QTcxODg1QTFB
-MzdCRkMwQUJGREVERkY2NTVERUQ4QTlGQzgxRjU3OTEyRUE4N0VENUZCMjhFNkZCRjI4M0ZC
-NjgzMkMxMDcwNEZCCkIxQjQ2RDdFMUJFQzcwQjVEQThGNUNEQjU4RDE5RThGQUFCNTcwMkEz
-QTcyNkVCMDc3ODk1RDM2Q0I2MzM4Mzc4QTM0MTI5MjIwMTZFNgo1QzQ1RDc3QzNENzQzOTcw
-NTk3MEM1NzcyREVFMDI4MjFGMUJEMjM2QUZEQjk5ODJDMTk4NkRGMTYxNjY1RDdBOTI3NDEy
-NTA3NzAwRkEKQjJEODczRTc3QkY4MTg3MTNBMjU3RkM3RkMyOUREN0Q0OTg3MjQ5RDUzNUUz
-NTgyODEyQ0NFRjNDRTcyQjYwRDIzRjMzNDM2RDFEQTQyCkJBNjA0OTY3MTk3NzQ3ODNGMzk1
-QzQyQzFCNDRDNzdGNkE2NjYyMEYxRjkyMzY3QjU2Nzc3QTU3QkFDMDI0ODc0NjgwQ0QxMDQ5
-RUUzQwo0NThCMjQyMTA2MjdDNzQ1NTU5MDg3MDMzRURGMENGRTE0NDg1RkI3OUQ1NDE4ODhE
-OTdDQkY5QUU2QkJFRjlDRTBEQzAyQkJCQzgzQjQKQzJCQzI2MzEzQ0NFNDYzNzFDNjBCRkMz
-Mzc1OEM2QkQzMzQzQzA5ODRFNThENENFNTEzMzUxMTg5OEQ3ODYwREFFRjA0REFCQzQ0NzMx
-CjdBRTNBMThCQzg5ODgzMzEzMENGNzJFREQ5MUE0RTQyRDg1RjRCODk3RDBGOUU5REI0NDc3
-RTczMDYzMTg5MTYxOTE2REU2RjM0RkY3MwoxMUZBNjk1QUZBMkY4OTczMzRGRDgxREZGQzUw
-NUJFQTVDMTNBM0FDNzkyNTY5QzY5MzU2MTFFOTVCNzRENDFEOURFMzYxNDA2MjA5NzkKMjA1
-RkE3ODU5RTE1ODVCMTEyNERGRTRCMDREODgwNjE1Q0MyMTk4QTY3RDQ3QjY0ODUxQTY0MkY0
-MENDMTZBOEU4QUUyMDJFRUM1NUUxCjAwOEUzODc5MjQxQTYxRTY2NzNDOUVERjc3RUZCMkE0
-M0Y3RTg1RTE5NkJFQTAwNDM4OThGRUQwMUZCQUFBNDc4OTRFRTczOTJCMURCNQoyQjk0MzNE
-ODg5ODA0NjFBN0Y2QkVBQkU2Qjc1MjYwMEI3NThGMEYyNTI5RUEyNkQ1N0JGMjg5NDkxMEFG
-QzY3RkM2RDE5MEYzNTkwNTgKNTE3NzY2Qzk0MDNCNDA0RDUwODY1Q0Y2MzJGMzcxQUE2NzMx
-OUI2MjYyRjA5QTkyQTY1RTg2QUVERURBQzUwNEJBOTAxQjhBMTlGQTE0CkY3QzY2NTlCMjA5
-ODQ1RTk2NjU0NzQ5ODFFRjk1MTMxMTVCOTNEQTE2OTkxQjVFMzFBNzBERjAxREIwNkQ0N0JG
-MDg5RUIxODRDRTAzOQozQTFDMkMwOEEyQjA1NjI1Q0UwMjUxM0I0QzgyRDAyNkM5MDNEQ0NC
-MzEzNUZFODhBNkE0Q0VDRkQyRDU4MDhDQ0M5OUJGRkM0M0RGOUMKRkEyRUZFOTg3NUMzNDkx
-MzIwRDYyRkEzQTU0NTU4RjI5OEUzODU0REMzRkM4RDYwRUIwOUM1MzRFNkExNDEwMkY0OTUz
-QUY3OUE1N0U4Cjc3NDhBMkUwMUM2ODNCOEVDQ0ZFNEFBNjgxRDk0M0MzNzU4RkU3MDYyNTIy
-N0RFMjE0Q0NBQ0QzNUYxNUI0NzgyMTAwQkEzQzBBRUQ0RAo1MjM2ODE0MzhBRTE5NUQ1QjU4
-RDRGNjFCOTgwN0VGQjEyQjE2MkZCREVFNjNDMjJDRTA1RDk5RTRFMjg5RUYwMTQ2M0RDQkQ3
-NDhEOUMKNkNBMDI3MERCMTExNDk1QjBFN0JBMzc3Q0IzNDE2M0RBNkUzQjdGNUZFODlGQzlG
-RUQ5OTYwRjNFQjlGQzQyRjFDRDM5QkZBQzhBMzZCCkYwRUQwQ0IzQjZEODUwM0U3ODQzMkVC
-RjQyQzBFQzZENjA4MjQxRERBQjJGMzI1NDBBQjIyQ0VGRERCQkIxMDA3NzE1NDg0NkFENTI1
-Mwo4MzU1NThFMUEzMEM0MjZGOUU3QTQ4OEI4OEMxNjk5QURERTY5RjA4MjEzNDJDNjAwNDJE
-MENENTA1Nzk5QkYxQTREODZEOTREQzQ5QTMKMDQ2MjM2Q0RGNDYyQ0E2MzY3MjIwRTA0MUZG
-OEVGRTE4Q0E2NUI5ODlFODY1RkQyMzdBN0UxMjBFRUU5NTkxNTI5NUY0RkI4RDA1MDhGCkE5
-OEEyQjc3MzdENjA4ODA0NzUyMUU2Qjc0MDMxMUJBQTVGRjQwMjc1NENCMTE5M0MzMjlCN0E3
-NEFGNUFCRDU5NkU1QUI2NkMyNDJDOQpGNkY4OURBMTIwNjVEQjAxQUZBRTMyQTdDQzYxNTZC
-OERGRjk0QjcyQzhBNUY0MTVDNzM4OTYzQjExMkRGOTk2MTY1RjUyQ0M0OEMyQUUKRkM5MDMx
-Nzg5MzEwNDRCOTA5NUEwOUE5NjkxNjY4QUFDQTkxMThENjdFMTIyQjcwQkMxOUE1MTE3NTk1
-NDRDRTNBOUJGQ0I3M0E2NTA0CkQ3N0UyNEEzNTBGRTUyRkIwMTA3QUVFMTJGNTlBRDMyQzEy
-MEIxMjA1QjY5RDAxNjVFN0JGOThDOUYxN0EwNERENDY2NDlFRjdFMzYzQwo3RjUyRjU3M0Ex
-Qjk5NzMzRTUzMDNCRUQxOUZBM0NGMzA2ODc5Qzc0OThCMThFRDhFRTAxRThFODc3MTVBNDRE
-Q0VDNUQyNTlFOTU3NjcKMEE0NjlEM0M0RTVFQzIwNDNGNkVFMjg4QUNFMUUzQjM5MDg0NTI5
-NDU1RTFGODM4OTE4NkY3NjYyRjk2RTNFMUIwNTMwNzNDRjA0RDJGCkYzMjJDRkRCNjI2MzU4
-OEIzODAyMzI3MzE4QThEQ0I5QTYxQzlEMUIxREQyRjgwNzBGMjE0REZCMjE5ODY1MEQxNEE3
-N0MxNEZDMUFBNAowNkVDNDg3MTQ5Qjg2Qjk5N0RBRjIyRTMwQ0FFOTY4OTcxNjY0QTEwQTBD
-QzM0Njk2MUZBNDkwNjJFNjE3RUQzREQwREY3MzdCNDE0MzcKQjFEQzJCMDY3MDg5MEY5RUQ5
-N0U0MDZCNDZBOTRCMDVBNTM4RTgyNDA1NzJCQ0NFRkRFMjFGNDFBNjY1MjBDRTVFQ0REM0Mw
-Q0NEQjNGCjE5MzMyRkQ5NDY1NEE5RUI3RDdENTE3NTAxMzA5NEFDNzlCOTJEMUZCMEJBODZG
-MjA5QTMyODNEREE5REIyNUI0RjVBMEEwM0U3MkZGRQpBNDVGOTE0NzU3RThDNTBCOEYwRjgx
-NzZGQThDRjQ0QzI3MUE1ODRGN0JFNzAwQTBEMzY1NzJGQUUwNUVGNkZGMjNDOEJCMzNFRjZC
-QTMKMzE4NjU4M0U0RjU1RDEyNTYwNzJCNTNCOTEwNDdBRjc4NjhCMzFDQjYxNTBGNTQ1NkZE
-NEZGQjhCNEIyRUMzRUUxMTQ4RThEQjM0MzUzCkIzQkZBNEY4NEI4QzMwMDFFNTc1MzcyQkEz
-RjdCREYxQkI2QzRCODJDMkZBRDc1NzVFMTJFMjg3RUI5NzFFRDNEOTE0MDQyMjExMzdBMgo1
-MzAyNkM4OTg5RkM0NzIxNDNERERFOUUyRDQ5QTQxM0YxRDZBNDA5MTc5Q0RDM0NCRjU0NEEw
-OTNGQTA1OTg1RTBCRTcxQ0Q2MDE4RDQKMjEyN0QwQUVCNDM4OEZBN0FCQzg1NTgxNzIzOTY4
-ODVBOEE0MkYwQTBDNzY4QTRCMEVDMkI0RDE4NjJBRkM0RkYzNjNGMzY2OEEzM0JCCjZGNzg4
-QTVEOUU5Q0VBMkJGQUREN0E0QzYxMUJBMjE3RDE1QTFGNkJFQjEzNUY4RjdDOUZCMDExNjQy
-QjYyNDAxODE0OTRBNkMxOTJBNQo3NTY3NjZGNjJENzMzMUMxNDJDNTUxQUIwRTY0RUQ4Q0JD
-NTdFRjNDMjk1RERGMkREQkQyNjU4MTY3NjFGMTk5QUJBMUQyRTUzNDk2ODQKOTRFNjc2RDEw
-NDYxQzM0MTM2RkI4N0I5RkRDODE3REI3MzE0MTkyNzgzMDFERjg2QzkxRDIxNjYyQkZCMzY2
-MTVENEY4NURGMzc5M0UyCjlCQjRBODZGMUFFREMwNjFCMTU5M0Y1OURGMTMzRTRDOTdCNzQ0
-RjZBQTE5RUUwRTIzRUQ4MjZEMEFBQjVFQzQ3OUYyRjEzMUREQUUyNgowRjQ0ODJFODIxNUYy
-QTA2QzMzMTUyRjFFMjZFQjRGN0VGRTg2Mjg0NkEzN0EwODRENjA5MDIxNkExQTlFMTExRDQx
-NjYyOUFBMzczNzUKQzQ5MjRGRDk2RTg3NjczQzVCNDFGNjI3RjVDMUJGNjgyRTZDNDExNzI1
-Q0Y1NDE0RDdFRDQzMjhCOTRFQjhFQUQ5RUE5OTFEMEYxMjBFCjg3MkNEMTM5N0QzNkQ1QzJE
-QjAzMTY0RjJFNUQ0MTQ1MTlGREI2MUREQjNFMjdENUJDNzAxN0NBQkFDOUVCNjdCQ0I2QTVG
-QzQ1MUMxMwpFN0EzQjk0NEMxNzk1QURFNjE4OTQ4MDlCMDg1QUI0RDhDMDQ2NDg2NzE0RDA4
-NjA0M0M4RTUwNEI1NzQ3NkM1QUZGREU4NDczQ0I2RjIKMkRFMDZCRjZGRUZEMzY4RDZGOEQw
-RTAwMjkyQjgyNUVFRTE4RjFGRDNEQjM0REEzNDdGMUIxM0FCRjE5RjIyRjEwMzEzRTZENjQ2
-ODA5CjkwRTRCOEQxNjY0OTkxMjhCQTE0RDJGMjIwMEM4NjA0NUM3MzFCOEVDRkQ1MkIyNDAw
-QzJDRTFCREYwOTU4QzRGQ0U4M0VBQzRCNzU3RApDREUxRjVDRjQ0NTVGQ0IyNzI1OUUzQUEx
-MDJFNENBNjQyMTIyRDVEQjIzN0JFOTE1RTYwNjg1MEQ0N0NENzdBQjA3QkU3QjY3NkRDODYK
-QjVFMENFMUZGRkIxNzdFMkE4NDAyM0Y3ODQ1QjVCNTcwMjI3NDMzNjM4REExNzNDMDg2NzMw
-QzJDNjQ3MDk2NDczQzIyREU3QTQ3RjFDCkMzM0UwMDQzNDk0NkFEOTg0N0E1NUE2RDU0Mjk1
-QkE2QjJGODBFODBBMDU1QTAyQThFODBEMjg2ODVGRkEwQjc2NjQzMDUzMUFFNzlENQpCQ0Ew
-QzY5OTYyNDUwMkI0M0EzRUExMEQ4RTNGRTYzQUZGRDc1MTgyOEZFRTY5QzA3NjlCRDMzMUZG
-MkY0MzY3RkM0RjhBRUIyQzA2QjgKN0NBM0QyNTFEQkM2RTgxRjcxNTk4NjI4NDU3MTIyNDhG
-Qjg2QTBGNzNCNzY3RUE4Nzg0RUVERkI1MzhFNDEzMzRBOEY0MjgwQjY0RTM0CjlDMjI2MEIx
-OTE3NjU3NjUxREVFMTBCNzhDNjBFOTQxQUM1Njk5MkJENjFCODQyMDBFOTQyRjM0MUMzN0M3
-RDczRDlGMkFGRUU4NDVBMQpBOEVDQURGNkJGM0RENzdEMTc1MTdBQTk5RkQ5QTBDODdFNzM1
-Rjk5OEMyQjA1NzE2NzQ2MTU5RUZCNDM5QjYxOUM3QUFCMDJDNjA3RTIKOTExQTIwM0ZBMzZD
-MTVCM0VDRUNDNkM3MjAzN0Q0OUYxNUU1NTBGREJBNURFNkE3QkFBNzFBRjgzNDU5RUQyMEEz
-MzEwMzdGMEUyNUQ3CjE3N0NEMTZCNENCNTcyQzIyNTc3MDBGMTUwRjAzRkU5RUI0NEU5Qzg0
-MEVBODFCQzFEOUI5RTZGQUNGNkQwNUMwMUMxNzA5RTVENzhGMgpCRkJFQkJDRTA4QzVFMzIw
-NjdDREM3MUZENTAwNDJGRjI1NEJGNjJFNUUzOTIzQjY2QUNCQUM0M0RFQjY1NDFFRjk4RTFD
-RDlCMTIyREYKQzM3MUNDQjk3MEMzNDUwMDY4NDc4ODBEQzY4MTRDQ0VDNUI1OTU1QjYzNzg2
-QjRFQTIyNUNBODFDNUExOTQ4N0M1MThDOEZEOTg1NjhGCjEzQjc5RURFQjQ2NUNDMkIwRkZC
-RjUzNzlDNEEyQzBGQ0ZCMDE4OTk1MTA3MjI0REQ0Mzc1NEU1NUY3MDE3RTk3M0Y0RERGQzJB
-MTREMAo5N0M4QzVEQkQ5MkE1RDE2MUMyNUI2NDg4RDUzRTUyQzRFREFEODkyMDNCMEEyQjUw
-NDhENTVFRTlFNTc3RkE3NUU0NkU3NjQ4QjU0MzAKMDk1MjNCRTZENjY2MDNGN0EyRTMxN0ZB
-N0FDNDRFNDUzNDJBOTc3RTc2RDUzODRCNjc2M0ZFMjE4NjM4M0YxMDcxMUYzNkU1QUFCODAx
-CjExQjAyNjk5MDg1QzMyMjJGNjYyMkMyMDFCMUMxRjk3NTcyMUNFRTg2NDE5RTlERjM2NUYx
-NjAzNjQxREY3QTU5MDVCRUEwQzU0RDNBMQo4QkRDRTBDODkyQzhDRUFBRDFGNkFFMEU3MjdC
-NzkyQUFFREIzMDM5MENENEMxN0QwNzJCODI4NTlDMEI2RTY1NzRFOEYyQjRGNEFFMDMKRENG
-RDI3OEI5MERFRDc2NEMwRTZGMjYyQ0NGQUQ3MjU3QzdEMkUyNzMzRDBFOUJFQzNDNkRGMEJG
-Nzc5QjUxNkU0MTUwNkJDMDg0OTI4CjM3MjRDODc2NjgyQzFDNkYzNjM0MEFFODA3MkFGREIx
-RjcxMEMyODEwRTgwOEM4RTc4OURDMzk2MjE3NDk3OEUwMjBEQkMxQTE2RjEyOQpBRTExMEU3
-QzcwMTYwMUQxMjA3MDJCMEFFQTk4RkUzQjlFQTI4Q0QxNzVCOUU0NDU5MjBCQUYzMkJDQkIx
-MzY1MkJCMzNCNjIxNDc4NTkKNzY1Q0QxNUI1MUE2M0ZFRTYxRkY5MkY0NThBQzI4ODQ5QkFC
-Nzc1RkQ0MjEyMzY1OEYzMUY2REMwRjg5NkYyRTM3Q0IwQkQzMTBCMDk4CkU3QjFBNkY0NzNE
-MDYyNEUzRDhFQjdCQjkxRTAwQkQxNjRBMDg4RUFDMjA3RjBBREUxRDkxNTBENTQ2RTAwRjND
-RDAzOEQ3OTJGNDJEMQo5NjI1QTE0RDMwRThCOTcyQjI2MzQzM0JDRUQxOTVFOEZFNEYyMDBD
-NjcyQTFGMTY3Rjk2OUIyRTA2N0UzMkI3RDY5NzY1ODIzNjIwRDMKRTY4ODk0QkQwM0MzRDVF
-NjE0RkFFOUIxNzNDMjFBOTQ2NDUzNDI4QjIyQzAwOUUwQkQ0QUQ2OUQ5NEJDRTc2MzAzNzc1
-RkFGNzRDMTUxCkE2RDBDNUEzRjg3MDNDRDVCREZDQTJBNDY5QkY2QTQyQThGQTg2NzgzOTBC
-OUJENTE2Qzc2QzJENkYzNThDMEEyOEJFQkY5NzFGNEM0RAoxRDgxQ0QxNUQ5MTNDNEUzQzFG
-OTM0ODQ3MDgxQkIxODk3Q0ExOURBRjg3QjlENUVDNzJBN0MyNkI2NTU2MzUxNERDMTYyQ0Mx
-MjkwODgKMENGNEZDMEMxMTVDRjI3NjgwNzVDQTA3QjA0MzQwRjIyOEU4NjJBNDBGMzVBQUQ0
-NDg0QjEwOUZFRTUwRTI2NjU1QThDNjk5MjA1RDcwCkMyQkU0RDIzNjhFM0Y3RjkyN0Y2NERB
-MTQwRjk3OUIyOTlCNTBEQjFCOTIyNEU2NzUwQTdEMUFBOTA5QTQ5MjFBQ0JFMUY0N0M4QjZC
-NwowQ0Q0NkVDOThDOUJENTZDMzVEM0ZCNjFBRTlCQ0QzQ0NDMzkxNDFDOTI3ODZCOEM3Q0E2
-MUUwNkI4OEI5QTE3NDJFRjZENUNENDE3RjQKMjgyRjIyMDIxMkQzMEVGOTdEQ0NCNzBDQjEx
-NTNFODkxMjEzMUM5RTJFODlCNDkwQkE5OTY3Q0VEQTA4OUFBN0Q3RTI5MjVDNDAwNUFECjU2
-MjRBMjk0RTYzRjU0MjM1RjU3OTQ4OEE3MDVEMEQxM0JDRDY2ODI2MzEyMkNDNTkxRDI0MTdD
-RUUxQjFDMjIwQkY0QkU0NTcyMkYzQwo0ODkxODU4RENEQ0Q4OEI2N0FBOUU2OUQwNDVGMjU4
-NDFDMEQ4QTRBOERFNTA3OEEyMjA4ODQyNUE2MDI3QTlGRDEwNjNGMjI0MzYwMEIKQUFCMzQ3
-OTgzMzIyMEQzOEYzNjVDOTVFQUQyQjhFMzdFNjc4NEVBMjlBNEQ1NEM0NDQ1QzUyRjM5MzlC
-MUE2MUYwNUZDOUU1REE4RkMwCjg0QjlCNUZGN0FDNzZCMDdFQkRGQTZFQUQ1RTcwMjEwQ0Y3
-OTU3NjhFQTY0MDhERjRFN0VFRkE1RkJFRUIzRkZGMDM1N0Y2MUVBNjA2MQowNjYxOUMxNEVD
-NkU0RUEzNDdBQzZGOTZGM0M4NTI0NTk5NjVDRDI5MzI4QzNGQzE2NEY1NzBBNjQ2RDUxNEEx
-RkJEOUMyRTA4QTRDNDEKQTA1MzlDOEQ1QzA4NDlBMUM2MTczRTREQzlCMkIwMzlGN0I1QUFG
-QjQ2QTk4QTdBOTQzMUQ3MDM4OEQwNkFCOTBCNThCQkFFQzg2RTc1CjE3RjI1Qzc2NzRBNjMz
-MzI0RTFDREJCQTQ4MjdBNzc1QkQ2Q0ExQTlBOEFDMjRBNTFFNkZEMTYzQ0MwQjQ3QTAwQUQx
-MUVCMDVCM0FGNApGOUY5NzFGMDRGNDg2NUVBQkZGOUVGNTk5REIzOTgyQzYyRkI5MTkxNTkx
-NkQ4N0U0MDQ1ODU1MkVERkQwMEExMEZEQzc1Rjg2OTM4QUQKRTM4RUNFQjgyQ0JGMjk0NEFC
-QTlFOTlCRUI5ODU2RDU4QkVDOUYxRTBGNTJDNjRCQzJCN0IxOUQ5QjI5OTlEMTZDQUUwMkU1
-RDEyRkJBCjYyQjlBQkRDRjk1QzY2NEZCNDU1MEU4OTBBRjczMkU3RUYyNzhBREI5QTk0NUVB
-QjE2N0ZERUU1Mjk5Mzk4Njk0OTU1MTE1OUIzRkJEQwpFODc2M0U4Nzk1OTg5Q0Y0NkRDRTdE
-NTNGOUNEQzcxM0I3OURENzVGMzhEMjY4MTNBNkIzMUZFMEU0ODc3NzQwMUY2RkQ4NkRBNURD
-MTgKM0Y5NjI1REQzMEVDNzUyODJCODMxQ0MxNTFGNEE5MDQyNkJEQzQzRUYyQ0VBMzc0Njgz
-NjM1MTlDQkMxMEVFREU3NDUzRjdGQUNBMTJDCjBGOTI3Qjc4OTIyQTgxQzNFNzgyMTJEODlB
-RUE1MDA2Qzc4OTQyNUEwMUEwRjM4MkVCMzVFNjFBMTU4NDZBN0M5MzRBQTFGMTY0RDQ0RApF
-ODA0MTg3NDBDQ0E5MzY0QTlDQjk2Q0QwMUJGQzkxQzRCQjM1RjBGODU0MjM1RTk4RThERkVB
-RTdEREQ3QUJDRDE4QUI4NEU3OEMwMEQKRDM5QTRGNTNCNTJCMTRFNTcwRDlFNTM3NzMyOEY0
-M0JERDgyOTM2RTU5OTJBNzQ1MTIzQjQyRkZFQkJCQ0YxOTY3NDRGMTkzRjU3QTQwCjM4QjVB
-RjNENUIxNzY5QzEwRUI5NDdCNEMyRDZGQUM1NzhBQkUyQzRFNjgyRjYzOTcxRUY1MzQ2QzYy
-REVGRTE4NERGRkMwMzlDMjMzRApBQTk3N0NFMzIyNERDOUU5ODlFNDlGRkNDQzczQkFEQUU4
-NUIyQTlCRkRBNEY4NDgwMDkyMzdBQkM0ODE5OTNGRDdDMzU4QUFFQjYyRTUKMjY4NUM0NTk3
-QzlCRERDNTVDNkNFRUExQjQ0QTJCQzBBMjcwNjFEMDhCNEVGRDhCOTc2NjRDRjJGQjI1MUI5
-NEQ0OTAwRjEzNUE5NTJDCjQ2RjVGQTEzQTMwRjZBQTVDMTE1MEExODY2NzhCNjEwNTI2Qzc2
-NDA1NEREQ0I1RkZBQUIwQjMxQTkyQjhCRTFBQzYwRjU4MjlBOTI3RgowMDZGNjE5RDEwQjU5
-RjU5RjEzN0ZBNjBEMDFFRDZFRTcxRTY1NDRFQTdDRjhDOEY4MTA3NTc2N0Y3Rjg4RDdBMjQw
-MkVBMzNGOERGMjAKOUE4MzQ1Nzc2Q0RGQUQzMzE1RkFGQ0Y5NEE5Nzc2QkIzNDY5NzI2MkQz
-ODU2QjhGNzJFMjM4RTgzMzFGMkNENEVCRkEyQ0QwQzJGNjMzCkQ2N0NGRTAxMkUzMkY3RTFG
-MTk5OTgzRURBRjM5NDE4OUU3MkQ2Mzk4RjQ4Qjg5ODg2NjhGQkUwQjZCMUYzMDdBOUQxMjdB
-QjY0MDc2Nwo2OUY3ODU2RjI4QjhGOTc5MDkzQjc1MkE3NTNBRkI1RTUzNzFDNjYxOTJEODg0
-RkZGMDBBOTdCMzBGRUQ5OTFBNDZCQjdGOTgyQjc4NTgKNjhCRkNDRTc1OTNENDMyODYxQzU1
-QUE2QzQ4QTJFREE4RkFGNEY5RDIzRkVCNUZEMUY0NzdBRTUzMjIzN0EzNzJENDI1NjY0OTcw
-QkQ2CjY3MDgwNzc1RUI5QTNEMDgwQjEwNTkzQ0JDMjcxRkE5RDhDOTVGOUE3Qzg5REFBNTRG
-NzgxNUY3QzcxMjZGNjQwQ0Q3NzNFNzAyMDM3QgoyRkNGQ0ZGOEJFOUM2QUVCQkVGOTVBNTA3
-OTBEMjVEMUIyODlGMjVCNDNCOTU5RTlDMkY5NEYyQkI2NjM4MkYyOTlGRjVFODhBQzAwM0YK
-MkEwNDA5NUFFODA4QTZGQzgxMkMzRjQ4OEI1NzgzREFDQjU4QUJDMTVGODFCODQyMEMzN0I3
-Nzk3RkY1NTFCMTBEQUMwM0ZDMTk1MEIxCjczNEY3NTNBNzIyRTlFQkFBRTVGQzYxNDBEODAw
-RDFFMzY1NUQ4OUI4OTcyNkJCODEwMEMwMEU1N0ZCODVEMjI5RTY0RUVGNTBDRTAxMAoxNjk5
-RTcyMUI5NENGQjQyRjNDQ0RERkU4NzZCMTBCNDlBN0EzOEZFNjlGODU1MkQ2MzFERTZDRkE5
-RjBDQ0UzMTQ0QUVENkFEMDAyMTQKMzZFQ0Q5MDQ0QTNERjJCOTk0NEJFNDkxQzNGMzI4MkMz
-OEFEMzgzOUJFRUM5NDg1QjMwNTgyQzlEOEMyMDk4NkE5RDJERUJBNzYwQjE0CjZENTQxODQx
-RDQyRkE5RjQ2QzMyOUM1Njc5QzMxQkIzMkY4OUI3RTRGQjgxN0EwMkIxQ0RDN0VDRUVFQjg0
-ODE4QjYwNTQwREJDQ0MwRgozMTQ0QzY3MzMyMEUzRERCRTZFMzFGMTY3NzQ3OUI3NUMxODk2
-OEI3NjZDOTI0NDYxNDgyQjM1NzU0REREQjlFNDNDODFEMjI2QzkxREQKRTIxNzY4QTU0Q0Y2
-NEZFMjk5ODAzMTdDNjg2NEZBREEyMjhEMkE5NzIxNTJFRDE0MTJGOTQ5OENFNjBCN0MzQjUw
-Qjk4OTBBRUQ3MjNDCjc5NTkzNDQwOUM1RUIyQzcyN0E4ODcyQzZBMERBODIwQ0NCQjUwNkNG
-MEQ3OEFGQUQ2NEMwNjg5MUE4QjU3MDczMkFGMTJGNjBENDU2RQoxNzg3MUU1RTNFQ0RENkIz
-Q0JEOEY4NjIzNEMzOEU0RkQwMENEMzk0NTc0MTlBMTY5RTU5RUY0RUU2MjVERDQwNzQ4QkFF
-NDdDREMzOUEKOUJBQUY0QjY1RkM2QzU1MTFEOTA2MURBMzUyRTk4MTg4MEY2MzQwRDZCNkEy
-MEI4Mzk3NTQ2NjNEMjZGNkY1M0VGQ0Q2RUE2RUM5NjNFCjU4MUU0MjMzMUIyMzY0MDlGMkY5
-OEM0MzQ0NUJBMEQ3RDBFQUE1MjE1MDYzNkFGNzM1QkZCNkM0NzVDOTA0RkQ0NzU0MDM0RUQ1
-OEUxQgpCNERGQUM4MjRCMzY2OUQzQUM0NzNCRDgzM0IzQ0U4ODkzMjM5ODdCRjFFQjNDQTFB
-MDg3MkVENTM4ODQ2MEYzNjBGRTlEMTQwMEZDOEYKMTA4MzM5NDZGNjg4MzI5NzhCMEY3NUNC
-MTRFOUZGNzVFN0M1Qjk0NjQ1MTJCRkQ1RDVDNEJEREQ3NTMwRkFFMEIzOTc5NDhGRDU3MjFB
-CjBEN0IzOEZENUI2N0NBRTE2NkVBMkREQ0RGQTFBQkY0RjhFMTE5NTkxM0QyMjJBQzNBN0NE
-NUJBOUMwNzMwNEZDNDc3RkQ5MUZEMzVDQgpDNzg0ODI2QUZFRDVEODBBQjdDOTY4MDM2RTg2
-ODkzMDUwOEY0RjFDNkQ3NDg4MDk0Qjc4OTkwQkE0Qjc5Mzg0QzRFNTVFMDlGQkQyOEUKQ0FE
-Nzc2NERGNDA0QTE4MzJCMjQzRUZGOEIwRjM0NEY0NkEzRDc3MkU2RjA1MDdBNTBDRjEyMEM3
-NERENjY3NERFNEE3MjUzMUEzM0U2CjI4QTVCMUFDMDc5QUU3QTQxRDYyQzcyM0Q5MEI3QTNF
-OTk5NDg2Q0RDRTJCNjRCQ0FGNzQ0M0JDQzM3QTk0NDVDMUI0NjgxQkQyNkREQgpDNDUxNjU4
-QTE5ODFCMzI3RERGMDBFM0M5QUMzNDczNTYwNTU5NTQ2NjQ3MkMzNDYzNjc0OUM0MzY3NzNC
-QUExNTVFNTFBQ0U1N0EyOTQKNjI4MTJEMkY2RTM5NkY1N0U4QTZDRjVBNzM5MzA4RkQ0NzhD
-Njk1MjhEODZCM0NDMTQ0Mjc2MTUzMUQ2QkIxRkY0OEE1MTNEQUExQkVCCjYxN0E0MThBRjY5
-Njk4OEUyOTUzOEQ5RUYwREQ4RTE2NTg4RDkxNTdFNjE5QUUxMjI2RjRDMkYzNzE0NkRDNkE0
-OTY4NUM0OTI1NzhGMwpFRUQ3QjhERUUyRkNFMDM0NjBBRERCOTFDMzdGN0EyOUUyRDMyNzYx
-OTg3NDBCNzNDOTMxNjFBNzVGRTBEODNGMDJFQ0JGMUI1QUVEOTMKMDg2REEwNTQ1RUYxMDAw
-MDcwNjMwNUQyOTExRUUzOUFEQUNFQ0JFMDZDMUI1RkU5NDFFQThCQ0M2QzJCNkU5NDg1Njc0
-RTdEQkNFRjNBCjY1RThGQjU5RTI1QzI5MUFFQzMxNThBRTlEN0MyRkE2NjEyMjRCMkNGQjg3
-OTcwQTg0NTM4RjAzNzBFRDZERTRBQzQzQkUyM0Y5MTRBNApENjdGQzcxQUQyN0FERDM4NENF
-OTA5OUM2NUFEODk5ODA3MzVCMDQ2QzlGMzdDREIyOUJBNUJGQzM1MzBDQjE2NThERkVBOTRE
-NzAzNjAKRjYzNzgxRDg3RjQ1MDE4NzU2NDczNDI3OTFFQTYwOUZEMUNBQzhBMzM4QkMyNUQy
-OTZBODBGNEJFMEEyNEE4NDdBQkU3MDhCRDhCN0VECjE1MEMzRTA3MUJGMEY4NDY5QTk5NDA3
-MkRDRkMxNkJCQTkwRkIyNEE3MUNFOEU3Rjc2RUNFOTVEQUE1QkYzRTc4RDBBRkMyMjQzNTc1
-MwpCOTRFQTM5MENEOTVDMTlCRTZDNzM5RkNCMzdGNzA1MUE4Nzk5MTU1MDdGNkY0Q0E4NUNC
-OUM1QzlCMURFNkVEQzFBNTlEMDQ2M0VDMDkKRUJEQUFDMkU1OTY5NjU4MTExMDA0NzExQzJD
-Mzc2OTYwOUJFMzVGODQ2MUJBMzBCRDdFNjgzMjE1MDVBMTRCMzBFMEJFNTRCMjlEREE2CjRB
-Q0QxRDE4NkU1N0YxNkExNUExMjExRUFEMENDMzE3QjhCNzcwNTA2MEUxODE0MDM1OEY5NTBC
-MDUwQTIzMkUyRTI0RkRERjc0RjkwRApGMUQyODhGMzE3MUEzODM1MUExNDFERjMwNUIzRkQz
-MkY1QTQ3QzI1MzM3QzI1MjE0MEQzRDUyOTcwMEEzOTFGNTE3NjEzNEY2RTQ3NTIKNzQ1MkY3
-NkUxNkI5RDUwMjVBMEQ5QzRCQzBBODg3M0E5RDhCQTRBQTBFMzIzRTFFNjM1RUU3MTVFMDlF
-Mzc4MkE2NEIxQjU3OEM0RkIwCjQ4OUQ1OTQ1NThBOURGREVDNDc5QTk4OThCM0QyMDAyRUY2
-QTNGMEFBQ0VGQjRGNENEODI2MTE3MkMyN0QxNUQzQzhBNkQ4QkJGODU1MApCNUE3MjY3MkE1
-MTNGMzQwNDkyNTM2QTFDNTdFQkExRTU2MTM4QTZFQjFGQzEzOEJBQTFERUUxNEQ4MzM0QkEy
-RDgzNjhFMUIxQkFFREQKRjQ0MTM0OTA3MjNFMjQ5MzM2NTlBMkMyQUE3NjkxOEIzNDdBRENF
-QTJEQTc3M0Y0QTkwMzk5QjBEMTJFNkQ5Njk3Q0NBOTc0M0QyQjlCCkIyRTM0Nzg0MUFGMkZG
-RDNCMkVDQjJGNTJDNkU4NEUyNDlBOTgxNjQ5NDAwOTNDNkIwRjdGM0VEQzEyRkRCMEUyODQ1
-ODMyMUVBNTM5RQpENTNBQzVBOEE2NTgxRDEzODk5NjY2RTM4N0Y0NTYxMUU2REY2RkI2QTkx
-MkRGMzQ4MzdDRDAyQTdDQkQ0NDlEQjZENzZBRThFMEI5RDYKNjc0QTc4RUQ4MzFDQzUyQjUw
-MTc4M0ZGNjFCM0Q2MDEyQzdGRDA5MUY3OEJFNTY4QTJEOUNFNEYzMEZDNkI1NzYyMjk1RENC
-REExRjUzCjU0NTY5RjM4MTM4NjE4NzE4NkVFRkE1OEU1ODNEOTQ3NkE0QzJDRURDNkI5NTIz
-MTVCQzNBQUE2NkFDNEEwRkYzNERDNDYyNjhDNUI0Nwo3Rjk4RjE3MEI1Q0E0Q0U5MTg4RkI1
-QTdERTlCNkM3MDZGMEUxMzY5M0VERDA2QjM1OUVGOEI3MUM5Q0Q5M0E1NURGRDlFOUZGQkRF
-NDMKQTg5OTJFNjFFODAzNzg2NTMxOEMyNjg1OEZENTc3MDk2NzMwMzM0QkY2NEQxNjBGQkFC
-NEI0QTVEMEUxMjZFMUY3NEY4NjZENUI4NERCCjNFRDAyODNDQzQ3MUVENzQyMEQ1QzcwMjk0
-MTcyNTZDMzlBM0RBQTYyODJBODdDNDJFQUY4NUVERUQ5MkQ5RDJDNjhCNzUwOEY5QjQwMQo2
-QzFDNTI1NzZGMjBBRUJGMTdENEZBQzVEMkMyNkMzMEU0RjBCMERDRjgyOTE0QTI5NEIwMUE3
-MTFBMDY3MDI5NDZBOTA4NzZBRkQ1MTEKRTREQThCMUUyREJENjI3N0Y0MkJDNzdENkU1MURD
-RjVGNjgyMjE0RDc3QkREQTM2NjMyRDcwMjRFMDVEMDFBODAzMzZDM0JCQTVEMUVFCjY2NjhD
-RTE2QUM4QkMxMUFDNTA3NTM3NjU5MEVDOTk4MThBQTc0OTU4QjgxODI0N0VENzMxM0IzRDA3
-RDBENUQ4QzMwMzQ4M0YwRjBCNwo1QjQ2MjQ2RjYyQUVFQzdEQzAwRENFMDdGNUM0NjU5QjE4
-QkYwRDE1NzczNjU3NTAyMjUyNEI3MTg4RjhCRjVCNUY0NjE1RTUwN0M5QzYKODYwNTU3MURG
-ODFBMDA3MTVCRjNENEY5QUI2QkM1Q0NGQ0MxMDQ5NkZEN0VBRTgwRDY1RkM5N0E5QTVBMUI4
-MkQ4NUJCREVFQ0ExRTk0CjBFRDM5QTQ5QzVDRDMyNjNGRjA1MTQ1NkNDNzg1NjYzNDM3RDU2
-REY2RkIxNTM5QzQ2QzM1MUZDMEZFRDRGNkMzQjUzRTFENjAxMEY5MQoyQjkyNURGNkUyQTI1
-QTdGREZFQjhCQjZGN0ZDMjgzOTQ2N0VCMTU2NjhCMjE5NURFMjA4M0IxN0NGQjlBNkIxODIy
-ODMzREI3QkUzQTIKREI2QTk3REVCNDg4MTNDMTNENEJCMkQyNTc0NTlGQTcxQTY3RDFDQTU2
-NzJGMDEyMTFFRjlBQkIwQzE2RjM3ODQxOEYyMEM3N0Y1Rjc2CjJGQTU2QjBGODREQTc5RUJE
-RjcyOENEQjcyMjc3Q0ZCNDQ5Mzg3OTlDRjMwN0U2QURGQThBQTU2NDUzMDcxNkQ1Q0E4Njc3
-Qzg3MTBFQwo4NDZDNkU4N0U2M0JDOTYyRDU5MTE3QjY2MUQxRUIyQjE2QjhFMTM0ODREQzFD
-N0U2REYyM0IyMUM2QUM0QzY5QkY2MUM0MUFDRjU5M0YKRDM2QTkxMTk5NjlGNTA3NUE1RDQy
-OEJEQjQ2NjIwQ0I5QjNCRDE2RUQ0OEUzRTc4QzhBOTAwRkNEOTc4REYyMEQxNkUyRjg5NUIx
-NDlBCjUzRkU3QUUxQTE0QjA5MDFCQTNBOUMyRkVBMDAyRkFFM0REMjVCQTBDMUMxOTE4RkNG
-MUM4NTc1MUM0Nzc4QjhENEZGNzFGRDQyNzVFRAo5QzNFNzExRkExMkQ1MDNCMEMwNTQ2OUFF
-MkYwRjgyRTlENkY3RTFDRjBBRDVCRTFCQTM5ODVDQjU4ODUyNEFFNzcxQUQ5NDJBNkMyQkQK
-OEJCRjA4RTlDNzdFQTRCREQ1NDgyMEJEOEEwRkNCMzVBNUM5M0MwRTFBM0JCNTA3RTAwM0RC
-NTk0MUI3OTUwOTQwQkJBMzIzRTQ1RkRCCjMyMjU4NUQ0NzkyQjVCRkE5N0JFRUMxMzhENENB
-NTZGQTMwMjJEM0FEOTlFMzBGODA1NTdEOUI1MzE3NDdFOUY0NDI5QkE5ODA5Q0IzMApEMjAw
-MDVCQzI0RTNBMzQ4ODE3ODUyNjQ2NEU4QTk1MEM3RDA0Qzc4NzIyNUZCNkRGNTFDM0EzODIy
-OUMzM0ZFNTI4NDhGNERERDk2NjUKN0I2MUZGOUUwNjkwRUE2QkI5NjNGODc5RDE3MEYyRUZE
-NTkyRDEyNzMxODkwQkFDOUFEMkZFQTQwN0IxNjFERjE5RUIzMEQ2QjgzM0MyCjdBQ0JDRTU1
-RkEwNTU2RTJGOTkxNTY0QzE1QUNBRTIzNjQ3QzU3QkYxODg1QzFGRDBBODBDMUE5RUYwNDRB
-RjFGNkM2QzIwQjNCQjVDMwowQjk0QzM4RjcxODY5NkMxMjdGM0QwQkJGRUI2NEY2RDJDREQ4
-MjYyMDY0MEQ3RTFBN0JDOTU0RDk3RDE5QjFCQUQ3QjZFQTg5NjVFNzcKRUY1NEI4MDYzMkI5
-Q0Q5RjhCQjYwMjhEQUVFNDBENTk2NTI5OTQwN0EwMUUwOUNDQTExQ0M4MzBCNjYxMzVGODBE
-NUNGRTZCQjRDQjNBCjZDOEZEQzMwOUVBQTk0MEIxNDAxQzI2OEM2MzVBRjcxNjdCOUNDQ0Yz
-RTdCRUJBODlGNzNCNzIxMDAwRjhCMEVDMTlCMEY1NzJBNUI2QgoyNjJDOEZEODYyREUxMEJG
-OTI4NTRGRTcwNUE1QzU5MTFBRDZEMDFFODNCOUYxNUEwQjdGNDExRkEzN0RGRDY0NjA4RDA2
-MTFGQTc1RkEKMzU1NzM3RjBBNUYxQTI3MzZEMDcxQUZCQTMxQTJBQzJGNDFGODc0OEE5QUMx
-RDYxQUE2NDNGRjEwREY5QzdGMDMxMEI4NjFGNzRCNTA0CkM1MzczOUJGNDU0QzBCRkFCMDc1
-NTJCODU4NzlEQkZFNENEMzY3QjNFOTZBREUwQzM2MDRBNEFDNDRCQTQ0MDA1NUQ1NzJGMDZF
-ODZFNAozNzVFODhBNDdEQ0UzOTFFRjhERTBDNzMwRDM0MEFBQTJCQjJBNDg2NTE3RDdBMzBG
-RUY4RTQ5QjcwMDk0Mjg0RkIyMDA3OUJFM0M4RDUKMDQ5RjBCNjMxQjc2RDJERjk4NjUyMDA2
-M0UwQkM2QUM5NERCQkNERUY3OUFDREZCMDIyQ0I1NzVDNTdBRjhGNEFDQTUyRkQwMEYwOEEy
-CkJFQkRERDVDN0NFNUYwMTIxRjI4NjFCOTVDNDE2RjgyQkUwNjc3OEQxNDI3NUQ0QTQ4NjY2
-NUE2MzlERTFCRTg3MURDN0UyRjhGMERGQQozNDBERUJFMDNGOUMzMzYyMkIwQkU2N0RDRDg4
-NzYwQ0YxNTczMjUyN0IyOTEyMEJBRkYwOURBQTA5REE0NUUzMkRFNkI4QTIzMzlEMzUKMEM5
-NERBQTQ3RDBDNzQ5QzI1MENFN0NCMjExQkIzOTBDNTIxNDA0RTY4RjhGRkYxMEQ4Q0MyRUMy
-OTNBMTMyMkEzQTZGM0UzODE4RDBCCjI0OEE5MEQzODYxMjA2MTMyOERFNzRBM0QyMkQwQkU0
-Njc5NzRCQjdEM0ZCOUExOTM3QUMwOEEwOTU1REUyNzg3NjIzNkFCM0ZCNzgwQwpDQ0NCQjA0
-MTlDODE5ODJERTY1QURDRUVFRjcyMzBDRDQ0MkM0QzRBOUMwOTNBQUUzNUEwMjc5N0ZEOTZB
-QzQ5Qzg2OTRGQzcyRDBDODgKMTQyMDExMkMyNkZERUJFRTdBMzA1QUMzNkQwNjU4RjAxRTFE
-OEU2ODU0NzlBQTg5MjRGM0ZFNTA4ODY0MkMwMjY1OENFNjk2ODk0REU2CjAwNENGODFDRjYy
-OUM5REJERDQzRUE0NERCQzc1ODkzNTgzOENFMDlCQjFGOTEyNTBERTIxRjNCMUFENTVGM0JE
-QzhFNkM5NTI3MURDQgo3ODExRUZGRUJFOUNGMzM4MjE3Njg2OUIzQTYxOEUzQjdCQkFBNzIx
-NThCNkFDNTc0OTExOEREQ0YwMzBBRjAwRTc0NjI0RjE3RDQyMkEKOTY5Q0VGQkYxMjdCQ0E5
-QTMxOThDMkJDQTBDOENDQTg2NkE4MDkxNzJFOTBFNDY0NzMzQzlBMjcwQjFDM0QyREZDQTdG
-RUM1OENENzUzCjlEMDc3QkQ3NDRCOTRDOTU1NDQ1M0JBOUQxQkY5RTZBQUE3MDA1ODQ2RkQ0
-QjU1Q0YxNUQ2MEMwNkMzRjI0NDU3NThGMjhCRDMzNUUyMwo1NTU2QjVDMDFBMzhBNzMwNjA3
-QzM1MTc2OThCNjNBRjY5MjQwNzRDRTQ5RjI5MERGNzNDRjQyOUU2REYyRkFFMzdBMkNCQzI2
-MjRGOUEKNkQwOTI3QzlENDUwQkRCODFDMzUyRkJFMUQzMTg3MUU3REREQkExMzU4NTMyRkUy
-NTMzNzFDOEQyRDhCRjhDNENBODYzNjc2RDE1RTU3CkM1MzIxMzY4RkU0RTcwNDI5MzdFQzU1
-MTM4QzRBOEMyN0E2RUEyNjJDRDBEOTFDMEQyQzY4NUMwQTA2NkMyMUVDMDIwOUUzOTFBNUUy
-RAo0OUUyQzQ4RkM1M0VFNEJCRUNGRjA0QTdGODc2NjY4MTgzN0E4NTIzOEVGNEI1QTk2OTJG
-Mjg4MzBDQzU5RDcwQjVGREEwM0Y0MkUwQUMKNThBOTU1RDE4RDM1OTYzMzNDODE2RjU5RDlF
-MTQ1MDk1QTgzNjE3MDIxQjQ3MDU3ODg1MDg2QTAzNDhCNTczNzY2Q0U4M0E4Mjc1QzIzCjZE
-MEZENjZGOTQ1QzM2NDhBMTU0QzIzQUZCQUFBNjZGQURBRjFGOEZFMTE5MjFFNDkxNzU1OEQw
-MDFGMjZGOTg0RUZBNzVBMzdGQ0RGRgpDRkUzOEJDM0E1ODdENDlGREQwMTI2NTNFQzk3OUU2
-NUI4QTUyRTQ2MTc3MkE2RjBDNTBDRDlFMTk0OEZCRkVFQjlGM0IyMTdCNEZGN0MKRTVGMkM4
-NkYwMTFCOENGRkEwMjc0OTlFNUUyREE5NkQyQzFDODNFNTE3QjVCNkVEMTkyNTI1OUU5N0ZD
-REJDQ0YxRDg0RDBBNjNCNEY4CjA2QjNFRUJFQ0JGNkIyNUM1MkY3OEI4MUFEOTQ4MTQyNjY5
-OTkwRTgwMDQ3QUREQTNDQjBCOTEyNUYxRkM5OUYxNDE1ODFFMEY5OEZGRQo5MTAwNkU4Mzg2
-NkFDRUU5QkQ0OEM1RDc5RDg0NzZCRkU2NzBFQTlBNjBCNDcxM0Q4RkVBOUExQTc1REJCQjND
-MzZDNjlFMkU5RUU1OTgKMzM0NThGQjk4N0RFNUUwMDczM0M5NTRENjEwREEzQzUwNEE2NzhE
-QkYyNDhFMDYxRkQ4M0RFNTA3RDQ0QkFEOTBEOEE0REQ1RDlEOTJECkIwQzYwQUUyQTcwNkY3
-RUY2RkE0RDE3RTFFRTFGNDdBRDVBMzk5RDVENTNEQkZCQzY1MTU0NEVFRDlFMzk2OTI3NDlF
-QzlEMDk2QjdDNQpFNDYxQjhBQUYwMzlGNjYzQjA5MkI0RDJFN0EzNkMxMkEzOUE0MTlDQTZG
-M0VGN0Y0RDFEMkFBMTM4N0I3MDEwMzBBRTk0RUQ4Mjg4QzMKQkJBM0Q0NTE0ODg2QkVDNDZC
-RDhBMjUyOTJBOTE5RTk4OTNFNzQ4NzUxMkRDREYzQjgyNjlGNkJBQ0I1QkIzOENDRjA4MDFD
-RUE4OTQ0CkYzODIwOUJCRUZFMTc4OUIzMDA2OTI4MDExOUM2N0NDOUJFMEY3N0IxOTM0MDQ2
-NkQyQTJCQTJDNEI3NUYzOEE0RjhBQUE4MzJGMzA2MwpEOTNDNTE0QjdFMUQyMkE2RDYzREE0
-Q0Q3QUVDNDZEQ0NGOThFNzg3QkU5MzI0MENCRjI4RTU2RUI3NTdCM0E4QUI2ODQ4NkVDMTUx
-MzQKMDg2ODBFMEM3NjVERDA2QzYzMzlFODdGODYzMzY1M0E3NTgxQzUyRkU4RDA3OTg2NjRG
-RUU2MTkxRjhDQjVDQkM5MjU4RTMwRkFCMjExCjZBNjM3Mzg5MEJCOTU4ODRERTRCQUVDRDU5
-MDIwM0VDNEQ4NDI4MDA3MTkzQzExMTMwNzBDMzlEQUNFNTg0RjE5MzYzQ0JCRjREQjRFQwpE
-ODcwQkE3ODAwOEIyQkEyRTVEMDEyNEQ2RUUyOEFGQ0FFMDA5N0E4Qzc4MzZERjVGNkIyQUNF
-ODgxOTA1QzU3NjVDNUQ3QzY4RkVEMDAKRDcxQTVDNzEzMzM1OTQ3NzEzRkRENDlFMTE3ODY2
-RjAyQzFBNDU4OEZDMTUxOEVGNkUxQ0Q5NDA2Q0ZBRDZCNUE5RENDNTA1MTRGNUJBCkYxQjUy
-NTlDOTNBOEQ5MTdFQTc2RTM1N0RFRjJCOEQyN0RFNDA4ODY5NTkyMjA4OThENTk3Njk1MjNB
-NzRBNzM5NTU4NDJDMEI0NDYzNAo3QzlBMUYzMzU0NTRBMjNDNzJGMDkyREEyQUM0MDRDREFE
-QTk5Mjg1MzAzOTM4ODA5ODg4MTBFRUY3M0Y4MDA4MDAxMUYxRTZDM0EyN0UKRTI4MDREQTVD
-QjNFMUREMENFQTRENUI0ODRGNjMxRjYzNDc0QkQ5RUZCMjc3QzEyQTFGOTJBMDcxQTUyQzVF
-OTg2RTg3RUU2OUE1NjdCCjQ0RTZFMTI4OEUwM0Q5MDIzQkE3QTIyMjIxNjhENUZBQjhENDcy
-MTFGN0M1MkVFMTBDNURFQUJBQzk4RkQxOTJCNjA5MDczRjQyMjVGQgpEMDM1QUVGREM0QzlD
-NkEwNDJCRDBBNkQxM0FGMjQxMTE3RTlGMjBFOEU3Q0IyQzA2ODUyOEQyMUQwRjg5RTM0MkI4
-OTJBNEE3MkZCMTgKMTk1RDcxNkFEMDI1NzFFMjEzMzczQzYwOEUxMzAzOEQzRkI0NzRDMDYz
-MDk5OTMzOEQ2NUM2MzdGRUNDQzVGMUFGNEVENUY5MTkwODk0CjU4NTk4OUM2OTBBODNDNjNB
-MEVFMDdBQkNGMjIxNTA1NUVENjY1RDU0MjMxMTEyMThGQjkyNEMwQkNDQUU3QkUzRDYzNEM5
-NTEwRDExOApFODdCOEFCM0I3RDkyQjgwNDRGRjE1QjdBMEM4RTFERDhBOTUwRDk0OTU4Q0Qy
-MDgyRTgxMDFBQkE3NDQ3QjAzOENGMzlEMzA5OUE5NTIKN0U3NkIzQ0QxQTU3MzZGNzZCNDRG
-QjE2REU3ODYwNjNDQTUzRDdGNzJDMTczMjZEQTVCMjU3RDczQjZEQjgyRUQyMjRGQkY4Q0Q4
-QUE3CjQyQjJFQTUxMjYwNzJBQjcwNkVENkYwMDhERDdCNTlBMjc0NDEyQkNGNkRBMjhGOUEz
-OTA5RkJGREFFQ0UzRjhCQzMwMkE5NEE2RTM3NgpCREZGOThFMkI5RTVDNDc2QzAxRkNFOTBB
-NEU5MjE3NkVDODhGREUyQTA5MTgwRTBFMUEyMUY1OTc0MTI0ODBCRjE5RjREMDJDRkM4N0QK
-OTUzNDNCREIxNkYxREExNUJBREZBRTk0MUEzMzFDREFERjQyRDU5MUYwQ0I1OUYxMTdEQjJB
-MUJCMjJEN0MyOTk5MzZDQjZERjM3QzQ3CkIzN0Q0NTcwQzUxMjE0MjgwMUU4MTBCRjgyOTc4
-Q0NGQkEzNTc2MUM2NEZCMjM2RDdDQkEzNzU1QUJEQjJGRjVGOTRDRkQ3NEZGMkM1OApFM0I5
-RUIwMkNCREM4RUIzRDFDRjI1RDE0NjBDM0Q4QUMxRkFCNTI0MTBGQkJCQzMyM0QyQzFBOTlC
-NTQ5MDZFN0FEQ0QzMzc0OUYzNDcKNTFCOUNBQ0M5NzI2OUFEN0E4NzlDNjQ2NDg5QTE3OTQ2
-NTdCQTQxMjdGOTRDRjhFMjY2Mjg5OTc5Q0RFN0EzMjI3NzQyRjFGNDk2N0YyCjVBNDlFQkFC
-NUUwQjNGRjRENzhENTU4REM4NkI0NDY1NTNBRkZGNzVCNzU1OTAxNTdFRjRFNEI2NzBENEQ1
-NTA4RUQ3OTBFMzk4ODRCOAo5QTA4ODFDQUYzMjREODQ3NzJCNTNBRTQwODBBQzUyREVFMjlD
-ODUwNkZFNkYzQUZEQzlBREM3RDE3NzVEQzU5QzgzRDA5RDlBRUREOUYKQkM4NDk1NDVEODBC
-MTFGRDE1QTRGREYyQUNCQzQ5NEVFMDAyNTlBQzM3RkU0OTdDNkYzNUE0RUY1MUIyNUM2N0M1
-MjEyQUU1MDQzMEVECjhENkJCNzNGQzg5RTM0RjJFNzYwMjk2MDQ3QUZBQjlCRkU4OUJEMkZB
-QjQ3RTc2MzlGMDRERUJCOTIyMDg1NzhFNkJBMDI1RjE4MDQxMQoxQUU3OTg1OTY2QTVEMkFB
-NzA4NDY0MEZEN0M3Rjk2NTc4MzIxRDc0RTlCNTA4OTAzRTZENUQzQzE2Q0QzRkM5Nzg4RkY0
-ODdCMzE2MzIKNUZFMDQ0QTI2MkNCMTRENEI5NzI1MEE5MzUxMjRGODAyNEQxMzQwRjU4RTZG
-RDZEN0IwNDExRTNBRDE5RTYyNTIyOTA2QkJEQzk0MjhGCkUzMUYwMEUxQTBDRDk2REJFOTNG
-MUVFNzMxMTlBRkU3QzcxRjA1OUE5MEQ5RERCQUZFMDBBNDE3M0UxRkNGNzRCQTk3RkFFMjhF
-QzhFMgo0NUI5NzJBRjEwNkQxRkMwRUQzNTc0RDFDNzEzRTBFOTU1QzQ5MTc3NDVERTE2M0Ux
-MkIzNDVCMDBBODMyRjdGN0I3MENGQ0VCNzZGMUEKODhDMENGMDUwRUM1RDJDOTMzMUJBMEQ4
-NEI5QkI5RDBBQ0U4NUYwMjE1NTNEREIwRUYzNDg1QjA1NjQyMTU4NzI0MTg0NERENjQ2MjNE
-CjMwQzdFQTkxQjU2ODVFNjFENkQ3MTNEMDg2N0Q4RkY5MDRFMjU0RDg5QjNBNkY2RTQ0MjM5
-RThBRkIyMTBDMkE1RDc0MUUwOTc2QkFDNgo1RjA3Q0ZGNjExMTUzRTJERDgzNzBENEU5MjQ0
-NTlGNTcxQ0M5RDhCOUM0QkE1NkMwQkY2QkMxRjZEMjBBQTA0MkNEQjBFREQ2MTcxNDgKMjJB
-N0E1N0YzQjcwMzBBOUQwNTVBOEI2RDVDRUM4RTgzRjQ3MUQ2OTIyNzhFQUExMzhGQzM3MUFE
-OThENzcyRDIxMEIwRjg3NDc5OUNDCjlEN0YyOUMyMzQ5ODk3QjdDNzczNTNEODZDRTREMTdG
-OTcwNTMxQTU3RkRCN0U3NjQyNzAyRDg1M0FCOERBNUY1ODA2OTAyNjJBQzAxOQpCQzI2NzJB
-NTIzOEZFNDNCRDJGRUZGMkQyMzM4RDcxMDI4RUExREExMEE5ODdFNjEwRjBDNTI3RDZDNUU3
-RDA5NjBBQUY1RDhBNzdGRTkKODhCMUMzMEM2QUU0MUEwNzNERTdERTIwNTNCOTkwMzEyMTRB
-M0M2OUU2NjMwMUIyQjJDMTI3NzBDMDcwRjgwREM5ODZGMjU1RDNDNzY2CjdDNEFDMEM4NUZG
-NjUzMTkzQ0U2MzY5QzhBQTgxNDNCOTlBRjhDMjFGNThFMDhBNzdDQjU3NTM2OUU0NTVFQjA5
-NEY0RDE4MEM2NDVDMgowMzY4NDc3MTI5Q0FFNDhDMzZGNDM5NkU4MkUxODkwMzMxM0FEMEYz
-OUU2NjY0NzlFODhDN0NBNEY5OTA4OTEyMDEzNURCQ0NFMDQ3RjEKOTdGRUE5MkMxMThBMEMz
-RjkzNkU0RDEyQ0Y0NjlGRjJDMTU0NkM2NTU5RUNERTZCQzlFRDk3MUNFMkFDRUVFNkI0NTQx
-Qjk3REI0OEMxCjQ5MTY4OUUwQ0Q4ODNGMjIxQjU4RjJFM0MxMzMzNjE3NkExRDJGRDMxNTI0
-RTRFNTZENURFMDE1MjdFQTNCRjU5NkE5RUM0MTYzREM5RQpFMzAwRDZEOEZCMkE4MDZBMjU2
-OEZDRjE5MDkwM0Q1RkYwODQ0MkMxOTE5ODBBQkNFMzAxNzhCQkI3QTBENTFEQzJGMzk4NTBE
-MkNFNTEKOEY1REFDMTA1NUNEOTNFQjFFNjdBQjI2MjQ2MDY0NkEyMzVBMTRCNkEyRTJEQzFG
-REY5MDc5ODc3RDkwRjE5OTdBMDFEN0VDRTFFMEFDCjNDNjk5NzlDN0E5MkQzMThGNkI5MzA1
-MUNCNTVGMTk5MkEwQTczN0EzNTIwQzU1M0FFQUJBREMxN0ZGNTYwM0YyMzcxMkUzMTk4NUU0
-MAoxNjdFQjMzOEY5Rjk2NDQ0QjkwODcyM0M1RDkwNkI2NzU1NkIwREMwODhFODA4QTIzOTc1
-NzMwNDY3M0RCODYzNEU1QjA0OUEyNUJBODYKMjQ5MUVCNjVFQjJGRDFBQzE3OTNCQzk0RTgw
-NkIyMkYwNjAzMTkwMkJCMzdGNzVCMTZFMTJGQzI4NTkzRTE3MUY0NUU4QjVDMDc2MzcwCkVC
-MjUyMjc5MTAzOEM4NjQzNTRDNDk1RkE2NzY0MEZBRTYyOTZDOTUzQTAwNEI2OEJBRkRBRDYx
-RjlDMDk1NzY4RTQ0OTZCMzEyMEVCNwo3MThEQ0ZFQ0QzQjZENkQ1MDZGMzI1NjFFNDM1RkYy
-QUQ4M0ZEQ0JCNkNERUEwNjY5RjAzNDVGNjUxNzEyRkUwMDBEODA5NTIxNTFDQTgKQ0JFNTc0
-QjU4MjhGQTdEMjU5OUE4MkJENkI0NThCNEY0NjJBNkMwOUYxRDdGMzM1QUM0RDg5MTlERkM4
-RDJCRTczMjg0NjkxQTc4RjgzCjYwNUUwRTE4MTgwMzBEQzY2NkQ0NThFMTY4RjM4OUY5REM1
-MUE3MUYyMzJDNEJCM0YxQ0VEQUMxN0U5QTc1MUQyQTQ5NkE0OUJFOTRBOQpEODA2NjU2Q0ZE
-NjIwODQyRkI3NkJERUUzOTU3NjEzNkQ3RDNCMkREOEIxRDJGRjlBNkEyODhFREI0MTI4Qzcx
-RkYwQThCRTJEMTQwRTcKQjJERTg5M0JEM0YxODc4NjMxNDAxRDEzMTU2RDY5OTJGQThERjI4
-Nzk3OEE4QUY1MDUyQTMzRTdGQzY4RUI5RDI0ODdENDdCMEFBNDNFCkIyNTYyNTk1M0ZFRDZG
-NEFBNjQxNjA0MzY3RTMwRTk0QkI2NkNDNEVCM0VBMjQ5N0RGRTdDQzA4NzRDQjAzMUEwNjM1
-QUFCMkFDQjUwNApFNzBGRDlEOUMxRjFENjM0RDA0MTQyNTY4OERDNkQ0NjY5RTlBQ0M1MTRB
-MDhCRUM5OUE3RjU5MjhFOTg5NDNDRUM5OTY4QTA5QkY3NTcKMzhBQjQyRjUwMzA4NDA3Qjk1
-REU0QUQ2OUVDOUVDNTJEMUU5QzU4OUY4QjUyQjUyMDkxQUUzODcyODEyQ0Q1NUY2MzNERjY3
-MjA5QTI1CjlGRkFCMDU2OTZCMzQwOTZFRTc5QUVGNjRCNTlCNTg5RTJCQjQ5RTI5MDhGQkEz
-MDkxNjdEQjY2RjdGNUQ0N0MzODczRTdCRDIxM0IxQgo0OEU5NjYxNDVENDBERkMwNTQxRkU0
-RjNDMzgyQThFMTVBRTgzN0RENEM3QjkyQzUzRTcyODVEQjFGRTMyRjYwNUI4OUFCNzFEQUQy
-MjkKRDQ5MjE1MzREQUIxNTFFNEFGMzI4NDBGMzNCOUM3RjM4NjZFQ0NCNkI1M0QyMzI5MzRD
-RkQ5NEM4QzU5QkE4N0Q2MkJEQTg1OTQ3MkQyCkIzQ0YyODNFOTQ3ODNCMUQzQkJEMUIzNUFB
-OUMxMDk3NDAxMUJBODU3QTg3NzI0NjJGMUIyQUU4MTMwRTEyNjNCRkNFNDE0ODlGNTUzMgoz
-Q0YyMDdGQzZGOEIyOTlBRjU1RTY3NjJDQTkxODM3NEZFQ0NBNkI1QjU1RjI3MzJGRDkwOEQy
-NUFBQzNFNzAzQTA1QzBENkE3MDI4OUUKRUQ1MzI5NjI4RTk2ODk4OUFCM0ZFNjM0RjQ3MUVE
-RUNBQzhGNzA1NjY4NUI2MURDRUM0NDc3MjA4OTQ4MkFGQTNDRjk2MjA0RTA0NDBBCjA0RTU3
-MEMxMDVGMUE3OUY1OTJBQzQwRjU1NTlGQTBEMjkxNzhGNDI0QzBBMDUxQjkyRTQ2ODRCNkU5
-MERFNDYyMDgzRjMzQTdBMDhCNAo2M0UxMkJGRTk4QjJEQzYwMjFGQTYxMTQwRUIyNTdGQkQ2
-NkYwODVBQUFENEM2RkIwQzA4OUIxRkVGOTFGQTgyMEI3QTJEQ0RBNjE0N0YKQUE4NUM2Mjc5
-OTkyNzQxRUNBQTYxRUI2OTEzRjQzN0NEMEU5RDk0QjU0MzE5QzEyQkE2RUI3MUQ4NzkxRDA0
-RDQwREQzODY1NThGRjlFCkRFMzg4M0MzMjQ1MjhFRjNGNDI4RDAxQTE3NUI3REVEM0E0OEQx
-ODQ0MjBEQjI5RTM1MkQwMjVGRUY4MDRFMTYzOTZGMTg2RkI2ODc3NQo1RjZDOTI3N0EwNTU1
-QjFENEZBQkFCMDJBNkQ0MEFGODhCQjVDOUQ4MkMzMkU1NzdDQUQyMDU0RkRGNjRBREFDNzgy
-RkJEMzE1OTNBNkEKNjVEQTAyRkJEMUFCRDc0MkM3M0I3NjM0RkU5MERDQzY4OTQ4OTc4MEEy
-OTdCMjlCQjNDMTc1QjM0NDhEMzMxQjczRjMwNzc1MUNFRjk2CkJCNkMwQzQ4NDAzQjFBMEM3
-OTc3QUQ3ODM5MTExNDg2RUZDNTBBRTJGQTI4NjY2QTBBRDY1N0Y2ODYwMTg0NjQwMDE4MTFE
-RjU5NkY4QwpFNEFEQjI2QjJGNzE3QTJDNTIwQUEwMzNBMTg0MDQ4QUJEOEM5REI1RDBENTE4
-QjAwQUVGRUMyRTZFMDUwN0ZDQUMyRDVEMDlBRDk0MUMKOEIwNEQ2MTIzM0M0OTc3MDY0MEJF
-RjdDRTBCMUUxNDI0RjE5MTY4MEEwRkM0RTkzQjVDRTk5QTQwNkUyNjJEMzI1RTk1MkQzRjk2
-RUU1CkE2N0UyMkM2ODYxNzA3MjZBODZCNkM1QzcyRjhBODUxMUFBNkY5MkJENTdDOUE3NTI0
-Q0U0N0RCMTIwQUU1MDZFNTc3MTA2REFDRTgzQwo1MjU5NTEyNzEzM0QzMTAzOTc2NDZFM0U3
-NUEzQjlEM0IyRjQ5QzJFN0RCNkIwQjBCRTdGMDM5MkI4OTdCRENBMjg0NjFBMjcyRUQyQUYK
-RTU1NEEzNzVDREI1ODY0OUMwN0U2RkI5RUQ3RUU1NzFGQTQxQjhCMEE3QTZFRTAyNjY3NDQ5
-RUQ4QzA3OUI2ODg0MzhCQjBGQUYyMTY5CjQwQUE2NjhDNzc3MUQ4NEQ0RkFCRTY3QTg5MzA0
-OEMzRUVEOTAxODJDQzIzNkNFQjNBMkVGOTYwQTkyRUZDMjgyOTY0RUZENDAwRURENApERTdC
-ODZERjhEMThFODEwMERBOTQwOUNFMzFGRTZCNzM2MEQ5MjM4REFENzU5MEZCREUyRTY2ODZD
-QUE2MjBFNUI1Nzg1OTZFODEwRTYKQUUxMENBNzM0QUVFNjVGQUNFQzM4MjcwRjcyQTQ4NEM2
-Mzg2RjM3QkM5MTIyRDAzNkI1MzE2ODJCMTZDQ0U4NEMyMDM4QTU4MzI0ODI2CkQ1RkU5MTJF
-RjRBMTdCNTkwNzVDOEZDQjJDOTQ5OTAyQ0JDM0Q5NDhCMUY4RUYzRUEzMUY2Q0UwRTQzNTJG
-M0Q2NDNERjY1MTE2OTc5RgpGQjlDNkJDNDAzQ0YxMjNBRkQxMzM2NDk0N0Q5QzFCOTVFQ0Ey
-MThCMTdGOEM1MTUxMDhCOTUyN0U0MzkwQkNFM0E5QUMyQzIxMDA3MDcKNkU5N0E0NTMxN0I1
-QjU2RkIxQzU4Mjk4NUM4NTNBNEMwQzg4RkUzMUJDMzJFNDk3REU3M0M1N0ZCRUZCRTkxRTU0
-OUMzQkExOTQ4NkIxCjYwQjVBNUMzRTA1MzAwRTU1M0U4MDM2QzREODMxRjRBNjVBRTlENDg5
-QkUwN0VFNEJGRENCMzU0MzAxNUMxNzNBNDE2QjE2OTYwOTNFMgpEQ0FGOTQxMEY0QTJEQTA1
-NzE2MkIwMTkzRDNDMDNGNjAwMTA2Rjc2N0UyNDUxOTFDQUZCREJEQTA0OENGRTgzQzQ0MUUz
-REQyMjNFQkEKMDg2M0JDQUI2QTlCQjY0MzY1Q0VGMTlDRDhFQjFGMzI4QjE3RTJBMzUzNjQw
-N0RCMTg5Q0I1RDRDOEZGQUI5Q0JBQzA3N0Y0MDQxRUI5CkE3M0FFQ0ZFMTY2ODkxNTcwQzA3
-NDdFOTRFNEVCRkY0OTE0RjFCOTg2MzY0ODE3MjMxNDcxQUVBNEQyMTM2RkUxNkE4M0JEN0NB
-RTkxQgo3MjE0OTlGNDBGN0Q3QUE2MUZGNzg2NEZEQzUxNENFOTFFQzg2MDhBMTM1RDhEQUI1
-QjBGQzk2RjcyMzYyOTk0RTVFMjBFMzI4RUJBOEUKNThGMERCODgzNUZDRDM0QzE3NTdCOTlB
-OTgyMDJBRjQ2REUwODc2MUMzNjdCMkM4RkZBRDMwNjNDRTJGMTQxOURGOEUwMUNFMkFBOEND
-CkM3MTQ4QkE3NEFGQzQ3OTc0NjQxOUNBRjIwRTRFMTk1QUI4QkE2OTUwQzI0REYwQkE3MzIx
-OTJGRDYxQjJDRkI4QTY1QkI5QjgzQTlGRQo5Q0FDNjdGRjExQjU3QUVCOEFBMUNGMjlGMDVE
-M0E4RDVFRUNEMTU2RDY0MjNBRENCRTM0QzJCRTlFNkU3RDZCNUY3NTUxNzYzQzVEQkYKQUZC
-RDAyMDIxMzEwQjVFMzY5OTQzNkY4NkY0NDlBMUI4QTlDOUU4OUMzOUY1NDFGRUFBM0VGMDQ1
-RTJFNTA4ODM4ODYxOERGQ0Y1MkE1Cjc5MjFGODhENkMyRDJEQzJDNTAyNzRCNDZFQTY5MDBE
-Mjk1NzIwQ0NBM0IyM0RDNTVFMEIwM0MzMEE3NENCOUM4Rjc3RTk1QTNCRUFEOAo4Q0Q4MEI5
-MTE4Q0YwRTI5NUNGMDJBRDBDQkQ0ODRBQzM1QzgwNDczNUE1NDBFMTczRDQ5NTVEMDMzRUJG
-MjhFRjYyNTQwMzUwNTE5OUIKRjFCODJGMzU2NDhCNzAzNDU1NTBCQUMwNkYwMTY5NkM0Qjgx
-QzI3QkFFRkE1RTdBNkEwQUNCRUVGMUQ2RjgzQjA3MDc3ODdEOEU5OEZBCkRCRjY3Qjc1QUQy
-NjUzOEQ3RUVGQUFDNTdERUM1MDcxNThERTNFQTM5RDNDODhEM0FDOUU3M0FFOTg4QjE3OTBD
-MzQzRTQ5RUJGMDA3MApDMzI0NUZBNEJFMTQ4MEREOUUwNDEwODdGODdBRDA1MjA3OTFEOUJC
-MjBBQTc4RkVFRURGMDc3MkUxNzQ5RjVGRDRGMEZENDYyNjVCNzMKODE1Q0NEQTE5MTczMUY3
-RTk3M0VCNjk4RDNGRkVBQkI4Mzk1NkVDNTVENkE3NTE3NjQzOTA2MjI0RUE1Qzg5NjJEQjY5
-RUIwRUJCRDM4CjY2QkM4RjQ5NTFGOUM2Q0MwQzE1NkY1MTREQzZDQzkxRjRFMEFEOUFGREE0
-Q0UzRDRBNjdFMUQwOUQyOUQ5QjdBRTM4NkNFMjQyOEFBRQo2MjU1QUM2MTZGOTY4MURBQjA2
-RUNFNzIyODJCMDgwNkQ4Mjk0N0MyQTY4MEU4QTNCNTZCMDUzOEEzOUFCNEM1NUI5REIzMjk2
-OTcyMzQKRkVEMUZGNDI5OEREQkI3NThGNUI3OTk3OTEwOUE4QTM3Q0U0OTUyNTEzMTFCRkZC
-RTlFMDY2MEI4MEM0MUY5QTYxQ0Y5OTRGM0VEQTM2CkRCRDY3QTFFNDRGQTlDNzc4QTM0RTVD
-OTc0RTgyMDg3OTU4QjIzODE3Q0Y1OTQ3MThGRkZGMzQyM0RCMUZFNUU3QUNENEM0OTIyNDAy
-RQoyMTc4NTMxQkQwNTc0MDYxMzRFOEY2NUNCMDg4QzNCOUQ0MERDRUE1QkU5QUFGNUNDOEUx
-ODE4MjI2ODUyNDQyQTdGOUU1OTM2ODhGMTgKMUNBNjY1MUQxMDczQzQwMkVGREI0OEYwQTE3
-N0U2NTRCOUNERjE4QjNFQjAxQjhCNzBFQjM2OEZBMjUyMDZEREE0QUFENDEzMTUwM0VECjcy
-RjZFRjE2NDcxMDE4MDVBMDYyMTQwRjA4Qjc0Nzk0Q0VBNzI4MDg3RDUzMkE1Qzk2Qjg5NjYw
-RTY2NDAyNEQxRjBGQ0Y5NjQ0NzI2MQozMjczMzU4MEQ5RUFDOTA0NjZBQ0FBNDdGMEJBNTEx
-M0I5RTQ2MkM2NkY3QjE3REQ0NkY2RUU0RTFDQzQ0NkVGOTI4N0E5NDdGRUE3QzMKMEY0NzA5
-QTcyQzg4RTdDOUJFQUE1N0ZBRDJBN0ZENTNFRURDRDkyOUQ3MDEzODAzRjQ4MUY5ODI3MzdB
-NkNDMTg3OUU1RDMwODBFRjhBCjRCNjc1OUU3NUE1NjQ0M0Q0OUE4RjJDQTJDQzU1RDFGQjJE
-QUQ1NkQ1QjVBMEQ3QzNDN0QwQTMxQkZDN0JCMzc3RkI1MkRDRTJDOEU5OQpDRDM5MzhEQTM3
-MTc3QURFN0YwNjlFOTJBNkRGODc2NzM3N0YzMDIxMzY3N0VGMUMyMEIwMEE0RjVEREY4RTEy
-MTIxQUE0ODE3MUY3RTgKREVDMDNEQkVEMUM2NTA2Nzc4NEE3OUYwMzg5QzE3MzlFNjMzQkE5
-RDI4RUUyQ0E3OTIzMTQ0NzAyNTVCRTcyNDhENDBFMzU4N0MwQTBCCkI2REIyNzdBNDFCRTk1
-QUU2MzkwMjczRThBMEIwN0ZCMTNFNUI1MzBFMjcyMjdGNDhEMTI5OEI0MEFEREUyRTcwMzVG
-OTREMTBBMkE1MApBQTNBM0NFRUQ2N0FFMDBCRUVBQjJEMTYzMzk2RjNEQThGNjg4MjhGQUI5
-RDVFOTYxNUJEMEEzMDJBRkU5Nzc1RTY4NEJDOTcxMjFEODAKQUQzQjQyQzE4QzM3RkIxREFE
-NTkwM0I5N0U4OTIxNjBDNzQ2NDgxM0Q4OTE4NTZFMDhFMUFDRDI3QTQwNzYwQjc2MjdBNDlG
-NThGN0VFCjhCM0QzNjYwQzNEQjY3NkI2QjlCNzFERjI5Njg3NTBCOUYxQTgwREQ2MkVFM0JE
-MzJDM0I0N0RDQzZDMTQwRTVGMTFCMjdGNjBGNzkyNwpGMTg0MEU5QzZFQURCMkQ2RDc3QTFD
-NERFQjBGQThGODkyQjQ0RUE5MUFBNDA5NEM5MDgyNTBCNkY0RjZBRjJDRDU0QUQ1MDIzODRD
-OUMKQUExMTlENEQwNkRBNTUzQjAzRkI4NUFGQjQwMEY3OEFDOTJEODc4OERBQTU1QjFDMzE5
-NDQ1NTZENUFDRjNBRTZCNEM1ODA2NkU1Q0M4CkQ2MThBOEE0OUI5ODRGNzAzQzc5Nzc1NTE0
-NUVCQzg2NjJBRURGODMxMzUyMkRDNjhDNkYxNEMwNTM3MDhGQTREREJBNjg5QzQzQzc3RAow
-NTA1NkQ4RTU1RTRBRkZFMTg5NkUwQTZDMjZGRjAxM0VEMzRFOUZGNjJBRDhDNzM3OUY2MTg4
-Q0QxRUM4QUUwRUY5OEZFQTA5MDhBQkQKMkJCNzIxMTlFQjRENEM3NDcxNTIwNDdFMjZBRDRC
-MTRERjc1RjA5QUFBNjE1N0JGRjBGQjhBQTIyMEQ5NkYyMzY3MjgwRkYyQkIxN0MzCkE5QTcz
-ODQyOEJGQzIzMTg3NTdBNzBFODBFNkZFODU3MDc4Nzk2OUM4QUVFQUM0MkE3NTY3N0ZEREU5
-OTU0NzY5ODZFOUVDMjZEMTdGNwpGQjVGM0FDQkQ1MzVGREQxMzg1M0RCM0JBQUQzRjJFMjQz
-NzBBNEU4ODM3QjNFQjQ4M0MzOTU5NDU3MjJCMzVERkQ3RTJGREI0NkYyRUQKNDQ5MDlDNURF
-REE3MzJDMjAzOUVENjA5ODkyNjQ3Mzk2OTAzMjBFMDM0QjIzRUNFRjU4MjhCQjk2RjhGMkJB
-NDM5N0M3QjY4QjdGNzJGCkY4Mjg1MTE4NEZCRDJDNEMzOTJGM0I1QzU5RTVCNEVERDgzMzUz
-Q0I0N0ZDRDQzMkFEN0FGQzNDN0UyNkI1NTkyOEYwMDY0OTkzREJGRAo5RkE3RTg5RDY2NUM3
-QTA0MUMxOEUxMzA0RDVERTYxODAxQTBEQ0Y0NEQ3RTMxNzk1NEFCQTZDOTQzNjU2NjEzNDcw
-MzBDQ0ZDREZFNjcKMTlFNjcyMjE0NUYyQ0Q4RTFEOTJBRTFENzhDNjBFMzAxRUVCRjk0QjYz
-MTAzMkUwNDUyMjA2QjFGNDc4QjMzNjNCN0I2ODNFRUFGODIxCjNCODE1NkQ5NUVBODhDRDY1
-RTY4NDRBRkFFOUJGNTlGNjE2NDlBRkU1NDBBOUZERTY5MEZENUY1QzMyOEUzMDJDOUVCNDM0
-NTZBRkMxMAo3RTMyOTZBRUY4MTMwM0ZDQjlDRjE4NkE2Qzk2RkRCNzUxM0QyRjZGODRCRTNF
-RTE5NUZFMThGRUE2RjJFREMwNEM0NEYyNjZEODIyMEMKQzIwMUE1Qzg0QjlBODFDMjQzN0I4
-RDJFODVFQjc5OTJGOUZFRTk1NUZCMzE2RUE2QkQ0MEU3MjkyRjY3MzNCOUM1NjFCRjQ2N0ZE
-RjUyCkI3QzU0RDNCMDVENkQ0MDRGMzM0ODc0OEUzRDBGQTQyRTVCQTdCQzI4MTExMzlBNzE2
-MjE4MUI1QjEzRTk5MjE3MDFDNjBCMEZFM0YwOAo5RUZEMzlCRUYxOUU0QzgyMTZFQzU1NjIy
-NTMzN0NCNTA3MDE2MTJDODZFQTFFMEI4NUI5NDQ3RDMwQTg1MEQ5QUYzNUUwMzlBMTE3N0YK
-RTQ0MDIzRjM0NURFREVBREE2OTNFRjBGREMyNjQ2ODQxMUFCQUM1RURENDNEOUI4MUI0MkY2
-RTREQUMzNUY0QzY4QjI1MDk2MDA0MDI1Cjg3RjRBRDQ1ODI5NDcyMEVBMDAzOEQ3NTA5MkQ0
-NDk5ODA1ODRGRTcxMzZFMjJGOUMxNzA0NzdDQ0I5N0U1NDNDQjk5N0Y4NDMzMUEwRQo1QUI1
-MDUxQjcxNDNFODZFODBEMTNGMTYzRkU5RDBCOTBFRTlDNjYwNEI3MTM5NzIxMDMwMEExQTA5
-OEU3MEEyN0M1OTE5NDFBMjA0NjMKQzI0MkYyMDg3Mzk2OTU0QkY5MTkzRTYzNDk5OEFBRDRF
-RjYyQzRFQ0E2QTVBNkI0RkE3NTVFOTY4MEY0MjdEODZBMDZCRkU1OEFDNTE1CkFCRjc1QUMw
-RDhGMjg0M0IzOTY5OTg1MDQwMkQ4NEVBNjIzMUQ2OUE5Rjc0RjdEQkIxMzExMzU4QUI2RUFG
-OUI5NjVGMjEzNTI1N0YyNgpBMzI4NDgyRTQ3OTIyRjIzMzY0RkVDNjdEQjEyM0IwNzMyQkJB
-QUFBNEY4OEI2NkQwOEQ2QUIyM0NDOUIxMjNBRThCNjUyMzc4NzQxQzkKNURFQUFCOEM1NTM4
-NTc4ODNDMzc4OTBBQ0RBMDdEQTY5OTZCM0JCMTFFOEFBQTU2RjdDMEJGOTg5NkNFMjA3OTI4
-QkE4NDc4Rjk5RUQyCkZGNzI5OTY5NTA0REM1OTAxMjY1MTg0QzU2MDZFRTE3N0ZCNUFERUFD
-QzdCMDIzODhENEU5NjBGMEVDNjc0NzI2NDEwRDA5OUI0OTBGQwo2Qjg1MUNGOTA4NUQ4QkQ3
-MzZGODJFNzZERjZERkZGRUY3OTIyMUQwMDM3MEM2RUVEOUMyM0VGRUQ0RkUzQUI4NUQwQTUy
-QjMyQjBDM0IKM0ZENTk4N0EzOUIyQkYyQzg5REY4NjdFMDdBM0M3NjdBMjVGNTI3OTEzNkUx
-RjJFMEI4NjM2RjlFQ0E2MUYwMzc4OUQyQURGM0M5NzM5CjVGQkE5MTVEQTA2OEI5NkFGOEM4
-RjEyRjFENUU1MDlCODczNTc0QUNEMzRGMjU5M0VDMzA5Q0FEMTQ1MkJEQ0JDQzNDMzBGQUE3
-RDAyMwpGNDRGNzQyRUQ2N0NERUQxOTFCOEM2RkQyNkZDODVFOTI2M0QxNzRCOURFOTgyMjAw
-RTk0QTZFNEY2M0ZCMEVENDM5OEQ0QTM5MDZENzAKNzk2QTI5NjQ5RjcwRDc3QThENjNCMTk3
-MEQ2MDlCQzg0QjkzQjFFNDU4M0ZCNUQxODQ5QzQ2RDZDMDBCOTY0M0VENjM1NjI2QTM3MDg4
-CjM2MTg0RUYwRkI2RDBERTVENTM3Q0QzOThGOUE5MzYxQkIzM0REQzE3NEUyRjlDNEM2RDhF
-MDU2NDhGMkRFOTZGQTcxM0Q4NTAyNjc4RApENjRGQjlCNTU5N0Y3ODc3OEEyMkQxNzQ3RUY1
-QjQwOTEzMzkwRUQ4RDI3MDRBODMzNjJBRUVGRDkwQUIzOTM5NjI3MzgyNkJFRDI3RDkKOEZG
-NkI0QUY5NzAwRDNBQzU2ODhCQzQzMjdDOEVCNjk3M0I4NTIxOEMwRDAwMDIwQjU5QjU3REUx
-NzM1QTI4MTUzNzI2NDY2MjUwNzZGCjUyNzhFODI3MTc5RDA4MzcyQjlCQTY3OUVEOTJGM0ZE
-NTVDRkY4QjY5RUJERjdGODA5MzcwMzM4NEU0OEQ5NzRBQTY0QzVDRjg4QzFEQgoxMDNDQURF
-MDUyRTgwNjA1RTcwRjZFQ0IzMkM0NjM5Q0E0MTM3NDRDQTk1RTI5Rjc2REU0ODBGOTg4Q0Yy
-QjUyQzFEQjc4MDU5M0MzMTAKN0E0RThDNzkxNERBRkM4MkI5OEY4NTM5ODFGQkI4OTZERjkw
-OUJBQkM5Q0MxQTFDMDA4QzNFQ0ZGRERENjU2RDQ4MUQ3REZFREM0MkZECkM3MTkwNUYxNUY2
-NjVGODAwQUFFQzY3QzAzNDAzQTE1M0Q0NkIzMDVBNDVBMUUwNUFGRTQwQkYzOTREM0M4QTA3
-MUNENUVFQkYzMDVGRgo1QTM3MUJEMUYxMTc2NzBERjFBNDlDMkI1RDFDQzgzREIyMUZENTM4
-OUJEQzI2NjAxNjI3RDcyOUQ2RDJCQjE4QTg0M0YzNjFDQ0VDNzUKRDE1MUE4Q0FEQ0YyRTQ5
-QTMzMzE2MTY1RDQ0RURFMkNBRkIzMTc5RTBFMkFCOEI1RTBBM0RDMDUwRDk4NkQwNzNCQzc0
-MTNEMDM2QUE5Cjg5NjI4NjcwMjJFQzIzNENEREYxRUI2NzY5MDU0RDhBMkQxNjVBODczMTY0
-OTQ2QzYxNENCOUFFNDgxRTZCNTVCMjgwMUQ5RDYxMTRDNApGM0NDMTY4MzM5OTlFNjY2MkZB
-NjNCN0ZGRkZGQzIxQkQyMDlCNjlGQ0VBMUMyNkI5MDUzNjIxMDU4MDdGMTJDOUU2OEY5RkEw
-MTJFNkQKQzhEREYyMTk2OUQzOEExOUVBRDEzQzVENDk0MDdEQjUzODBBQzQwOTAyMDQ0MTQ5
-MDcwRjlEN0QyNTE4OTVDQzVGOEE1OTdGNDVDRjIzCjc2OTJGQTdGRjMzMzU1QTMxRTI2RTdC
-Qjk3Q0NGMEUwREQyQUEzNkFCMjEwMjY4ODM2RTgxOUU0NURFODUxOEM4RUU1NEUxNzE5QjQ4
-MwoxRkY1RDkwREUwM0M0RTRDODY0MDU3MTQ0RUI0NjU0QjkwOEVCMDUyNzcyMTYwQzhFQ0Yx
-Rjg2MkMzRjUwNDUwNEY5RTE1NjI4QTRBNEQKMTZCMDFGNTQzQzY3N0FEQTI4QTEzMkY4QkY1
-Rjc1OENDMDg2REVFN0MxNDZCODNCNEM2NDc2QzNBNTUwQzYyMTg2NzVGNEMzM0YxRUNFCkRD
-QUIwQzMxMTJCRENGREQ5NEEzMDMyQTczQzYxMjQ0NTEzOTdBMDhFQUYxMjkzN0U5ODA0MjVE
-RjQxMUZBNzYyRTc4MTc3NTVFQjM2NwoxQTk5OUE3ODVENDEwMzAxMTQ1RjdERjQxQ0REMUUz
-QzY0MkVENjRCM0UzQTM1MkQxQzY1RUQxRTYyQjJDOUY0MEM5Mzk4Q0IzMEY3N0YKN0VBODhD
-REVENUE1RDUxMTA2RDgxREEwMzQ3NUIzRjI1MjVEQTFBRDRBRDU1Mzc5NjgyODY4RTRCMzc4
-OTdEMDRBOEJBRThCNDc0QThDCjYwQTUxNjk1MDc2RTkxRkFGMkZEM0U2RkRBRTdBNjMzRUM1
-QTgzMjQyRTIyNEUxNTQ2RUJEMEE2QkU2QTFDMjE2MTlBNTIyNkJBNDZERQpDNEE5M0UyMTJG
-RUEwNTMxQzc0MTE1QkQzOUM1MjY2NUU1MTAwMUQ5RDBDMDFBQjY3RkY3RTNBMjVENEQ2NDRC
-QUJDMTdFQTAzMDBFRDYKNzBCNUJGNjVERkI1RjNERUU0NTE4OUYxODVCNDk0NDk4QTZDMUVE
-MzM2QzYwOTAxQThFMzZBQjk1RjU2Q0I1MzQxMDkyOERFNjgxNkUzCkNBOEZDQzQ4QzFDMzBC
-ODZDQzZFMkIzRTI2NUVCRDRDNUM4ODg1NzRBOTk4N0EwMzcwNTNCOThCRDg2QUQ0MjlDRDc1
-MkM5MkUzODk4Mgo0RTlDMUU0NDE4MjhDNTNDQzQ5NUJFREFCMEZDQzY1NjEyRjRCQUNERjc1
-NjZEQzJEOTc5NDI3NUQzQzY0RTg4RTRBNzA4ODZGQTZDMDYKRjZFNkNEQTI0RjRDNTI1OEQ1
-NkUzRTBGNjQ3MzI1QzE3NkQyODI4NzMyN0I2NDg2ODE4MzM0QjRCRUZDOTIyNkZEODI4MTg0
-RTEzQTdCCjQ0Q0RFMTY2RTEwRDQ0RUM3NEVCMUZDMzM2NDcwNzE3QkU5Q0M1N0I2REJBRUJB
-MTE3NzMwMTI0REVENDEyNzBBQTdBMjBEMkNDNUU4Mgo2RjhFM0E1NkIyNDZFOUVGNjJDQUND
-N0U0REZCQUU0RkMxMTdENkNFNkJENzQ3RkFGN0U2NUZGQUIzMzNCQUZDMjc2QTg2MTVFMzZC
-MkYKOUQyQzI0NTcyOUNGNEYzN0E4NUI2N0NCNzFDMzM5OTg1MDNDNjE5MzIxQTNGMUU5NjVG
-QTYwQ0VCMDQwOTc4MEJDMkM4NUUxNDFDMDQ0CjFBNTJEQzEyRDAxNTgzOTMyRTg3OEJDMzg5
-ODc1NkM4QjcwNjE1MzEwQUI3MkUwMDMyRDU4NDUyRjA4NDQ1NTNEODZCQzQ3MTBCQTc1NwpF
-MEY4QjM0NkYwOENFRjVFMTFBRUFDQTA4RUQ3OTIzMTE2NTkxREZGNzlBMjAwNEFFOUUzNjQ3
-NkNENTIzMDg1RTUyQkY1RjU4NEU5OUEKQThGOTg0MTZGMTFFN0JFNUNGMEVEMTlCOUVENTNB
-OEY1RkFDQkNGRTY4NEM2N0FBNjE1QzU4OTY5RkM5Nzc4QzE3MEQ1QUE0QjQ5NUMyCjdGQ0U5
-MkQ0QkJCNEE2RERDQzAzRDU3RkVDQzYyNUJBRTFGOEVGMUJCNDUwQTYxNzgyOEFCOTQ1Nzc1
-QTlBNDUzQ0U3OTFEMTE4RDdFMwo4MkRDMTc3N0JFNjVFNkU4QjdDNUQ2RDUzQkVBMzFBNDg0
-OTMxNEU2QUQ1NzY0MzdBRDdCRjcyNENFQ0IwQzVGODJFRDBDQ0NDRTZBMkMKMDcwNjRENDg1
-NzAwMUIzQkM5MERGRDNDQjU2Mzc1MEMxRjg1RTFCRUYxRDUwNDM1MUUwMkYxMzZBNjg0NkYz
-RTM3NjZDRTgzQTgyMEI5CkIwMEU0MDMwRTBEMEFFNDZEMTI1OUVDQzBGMjIyRkMyNjFBNTlE
-NDU4RkM2OTBBNEYzQUE5Q0YxMzBDNzUwODk3MDZCQjQ0RDBFMTFBRgo4MEFFRTBEMzBBQjI5
-QUFFMEM0RjE1REMzRUFDRkRCMTdGMkMzOThCMzJGMUJFRjM3NjAwM0FCQzVDMjBBMDkzMjAz
-RDQ0RDNDMUQzQzkKNjczMEEwRTJERkZERUJBMzMyMjY2Q0UwNkYzMUEzNjgyMjMwNTkzQjE0
-NDFENTI5M0YyNTE1MDlCMDZGMkE2MjM5OTdBNkYyRTlFNEI4CkY5OEVGMEZDRUI2OTNBRUJB
-OTJGRTAxNzY4RUI2NDE3NjEwMjI4RDVGMTY0Nzc1RkMxNzU3OUQyMzFBQzNGMzdBNzgxQjk2
-MEIyRDI4RApGN0FDQTZEQkU5NDg3MzE3OThBNDI5QThCMTNBOUU1MEI1NUEzOUNGRDI1Mzgy
-MTRDNzlDNkE2QUVBMzFCNEE2RTAwQ0MzMUE1OUE3NzIKMkI4NTBDQzBFNTZGNjI0RkNDOTUz
-OEVBNTUzNkExMTI5RDNBQTVBMjk4MkQ0QTA5QkU0MTJFMTAyNjMyMjVGREE4RUExRjhFNDJD
-NTdGCjBEQUI0MDI1NTFBMzUwNERDQzQ1MDUxNkZDOEJFMzBCNDgzNTg0OUE5NjlBMzA5ODZG
-QTFENzBBMzUxNTlEQzM4MzhFRDY5OTcyMUYxMAoyNzU4NTMwRkI0REM3RDA5Rjk0OTFENjY1
-MTc1NUVCMEEyMjk3QjRBQ0JEN0QzOUE1RkRCQjE4QzA5ODYwRUJCOEI3NThBRUEzNDkzNEEK
-RTM5ODQwMkRCMUU2NzgzNjhBQzQ0RjNFREExRDBEMEQ5RDRGNjIyMDk4QTc5NTRERTlBRjQw
-QTRCQjIxMjAzNkREQThBNTQ3ODgzRjA5CkVCNDkyOEFCQjJGRTE2QjIwQUQzQzREQTFFNDMz
-REExQTZBNzlEQUFBRjAxNUFDNTc5ODhFNzU0MjhEMEZBMEYyNDM5QkFFMkQ2MzJDMgo0NkM5
-NTE4RDAyRDhBRkNGMkJDRDQ4QjZFRDRFRDcwQTZFODRFM0I0MUMwQzRDMEEzNTA0QkJCN0M4
-QjFFQkY4ODEyMTFCRUIyRDZGNUIKODIxQTc3MzIxMUE0Mjc1QTg4QUNCNjgwMjg5OUVFRUU0
-RTc0OTM4M0Y0QzhCMDVDMzY0QTBGRDUxQzBCRDc5QTI5QTQ0RDc5NjE0Q0E1Cjg4MTQyQzk1
-NTM5NEUyRTY5NDdFQjI4NTY4RTg0RUZGQkMxRTUzMTI2QjBBQTY0OUM1REFCOUZEMzgxMkE4
-MkYzNjkzOERCNDIzQzc0NAo3ODdEQUYxRTM2MTVCMTQzNDZGQzI4NUFGQkVGRjU1NjE5Q0E5
-QzQyRkZFRjcyNDlFOTYzQTQ5NDBCQTU1MjNCNjM0NDAwMTQ0NzA3MjMKRDk4NjgwRTk0NEM2
-MUQ1MkMyNEM5M0Q4RDMxMENDQ0E1ODNBQzUyMjI1N0Y5RkQxODcyMzlDNUNEOEY2QzhGM0VE
-OTE0N0VGOTc1QURBCjY5Qzg4QTZFOTgzN0ZDNjBFQkQyM0JGNjM1M0IxOTFCOUE2MEQzNUU3
-ODNEOUM0MDRGOTI4NjBGQ0FDQ0VDMTNBNTIwRDg3NDQxM0RGQwo5RTQ5Qjk2NjVDNkI0RTU3
-MURBNUY3OTg2NjE0MjhBNTlCM0U4NURBNUMxQ0Y2OTI3OTRBMTlBRTMzOTIxMzQxRDIxQkI4
-RDQ3ODFEMDQKNzA0RDMxRDM2OThDRDYxOUUxOEY2NzFFNzY3MzA3QUFCMDUwOTVBNDdCQURE
-OEE5RjMxMTlBM0JDRUZDRkI5NkI2N0YxOUMyODVDRDQ1CjA0NDc5QjI1MUQ0QzE4NDg2MzZG
-N0FGN0U0RTJGMzQ1MDUyM0M2NkMwNkFCQkY5RUJFNTcxQkY2MDc5QzUzRUQ1OTk2ODRENzAx
-N0Y1OAozM0NBNjAzNTcyNzRDNUQ3N0JBODQ0NjEzOTU1REM0MUYxMjU3Qjg5MzREODk2MjRD
-NjYyOTdBQUE2MEZBM0Q4RkU1MUI4MDcxQTU1QzAKMkI5NzRCRjcxNEE0Nzg3MTU0RTJCRTM5
-RUVBODNDOUNDQzc4RTE3OUJFRTQwNDkxQTdCMUE2OUU5NzY5MDY1MTczQzg4OERBMzJCQUU3
-CjFDNDhBNzVCMUVDQTM0NDYwQzVFN0ZBRTVBNkEwODk3QzcxNkE5MzhFNTAzRDc1NjlFRUUy
-MjY3MzE0OTM0MTQ0REVENDhBNzM3NkRDOQo5NUYxQzNCODlDRTc5OTQ2QTM5RkY0MjhGMTZD
-QkY2NUU4MDA2QzlBMUNCREYyRDc1NTNENEI3MUY4ODQ0MDg0MTU5NjRBRTYwODM5MEIKQ0Ez
-OTAxNzA0RTM5QTY4OTI4RDgxMEM4ODE1Q0Y3QTg2RkEzREUzMjZDQTdENTA2RkVFNDFDQUU0
-NzczMUIyODM0MDQ4RDI1RkE1RjkzCjc4RjQyRjMzNkY4OTA2MkY0MkZCQzRFQ0U3QTJEMDA1
-QTcyMjA0RjI4RjBGMERFRUZEODNBN0UyMTIzRkQ4Mzc0RTlCMjQxMDlFMDBCRQo3MTczOTVF
-QkNGMDY5MjkyNDIxNkUzQkYyODFBRkQyNTRFMkE2OEZDRTEzNDQxOTYwMzE0NTVDODZFMzgw
-MENGNDJEQjEyRjg0RDAzQkIKRjlEQ0M3MDQ0NkI5NEFFMkY2N0NDNDg0NzM3OEYzM0ZENzQ4
-Qzc2QkQ3RDcwQUU0RDAzQUU2QzAyMzBCQ0E4MEU0MzZDMjEyNjk0MEI1CkNDOUFGOTJCQUQz
-QjdENTJCQjMwQTI0ODYyMDg5NjQ0QUIwRTg4MTU4NTZCNEFBRTZBOTMwMjQwRjhCNkUzNTdB
-MDQwOTA3QTNEM0YyRAo4REEyQkRBNjI1RjVENEEyQzJEN0RDQkE2NjNFRTU4RUYyODVGRTE0
-MEJGQTc1RDI4RkNGRjkxMUU0RjE5ODE5OTcwMjY4NDk0QzgyODUKRUJCOUU4NUE2NjIzMDJE
-OTFENUI1NzI1RDUwOEY1NUMxRUZEMzA5MDMwNUE5MDRCRkMzRDlBN0NBOUQ4MERGRjFFQTQz
-NUE4NDY0MzdGCjg2REJDQTQxQkUyRjVCNEM2MzU4OEUzRkFBM0FBMzRFRTE4QUI3NzY4MEY1
-NTFFMEU4MUY5NDgyMkVEMzYwNkEzNjQwOUZGNjAxQjdCMQoyRDU4OTNDMjA2Qjk4NUYyMzRF
-QjIyRDgxNDRERjE0OEU3MzA4MUE0RUE1NzMwOEQ1Q0U2ODA2MUIyMTM4NjJDRjgwQzg3OThF
-RDQzNkIKOThDRUY1OTE1NkNFRDIzQjA3MThEMjQwQjk5NjQwNzRCQkNBNUVCMEJEMkE0RjE2
-NjUxNzU1MDc4QzI4ODUxRDk1NzVEQkIxMzdDMkY0CjNCNEFGQkM1QUI1MUY5MjFCRDZENTBD
-QTFBMTJCMkYwMUMwRDY1MDEzMjRDOTI5RDJEOENCNTZBODNDODJGQzUwNDFBNDI3N0EwN0VD
-MgowODYxMkIwOUJGM0Q5NjNEM0ExOUNBODI4MjJEQUE5OTY5OUNDMDY4Mjg0ODc4ODI5QTI3
-QkU5NzhDMDMxRUY0Q0IyMUUwRjg4ODZGRUIKNzBCQTBFQzRBNkE5MDZFRkIwMkI5RjAzRDAw
-NThFRDc1MThGNzM0M0QxQTZFREZGNkQzOTEyQTgyOTM5QjNDQjA2QkMzNEY5Nzg1NTVFCjc0
-OUFBOEZBMjRBN0Y5RkMyRDU5NDA4M0QxMzlGRUU4NEVDNjUyM0Q4NzgxNzJEOEU2NUJCRjVG
-QUQ0OTAwOTAwOTRBNDk0NTZGNENFQQpFRkU1NDEzRjkzRTUwRUQyQUMzQ0IyRkE1M0U0OTg2
-NzFGMjc0RURFNTdCNDUxQzU0MUIwNDQyODJFNEFGOUEzNzYwNzYyRUFFQjA4MzUKNzQ0Nzcw
-OUMzMzExRTA1OTc4RTRFRThDRkUwODAyRjUyRUQxOEMwNTE2OTBGMUJEQkZCMEFCOEZEOTAx
-N0ZGQTcyOEJFREJEQjI0MzBBCjE0Nzg0N0VDMzcxMTIzMjI5N0IwQTQ2M0E3MDVDNTNBMzZE
-N0M2RkMwODk0OUJERTM0RDQ5NEY1NTAyNTZFQjFFMDgzQkJFN0Y1QzcwMwo1MTRCMTZBRkY1
-RDE5MzBCM0RBQ0E5RkNEMDNDRDA2NDA5RTUxRkVBOTBFOTUwQzZEOTNBOEExRTBEQzdCMkNB
-MjI4RjU2RUMyMDY4NjAKQzg2OTc1MTYzMjdDOUQzMUQyM0Q1OUY4MEZFMkU4MTcyNkRGNzFC
-NDNENjdFOTREMDBFODQxQjVCQzE0NDQ1REEyRTE5NDcwMEU1QTYwCjk4RUZEOTk4MzUwN0U4
-QUE0Q0ZDRUVDQzhCQjQzRTQxNjcxQjBBRTg4RDhCMEY1Mzk3RjIxNjhBMkE3RjVDOUI5RjJB
-NDMzOEFDN0Y4OAo3MDFERTQ4OUFFNTkzMkFGMEFFOUU0ODE3QzRDNzJBQkVBNzQwNDg5RTM0
-NEJEQ0JEODMyQTNBOEI2QTlBRDVCQ0ZBNkE5MzU5NUQyRjgKRTJBNzg0RDMxM0UwNThDNjBG
-NjI1MzUwMTM1MzBDNzdCODU1OUNFOUE5MUYyRjE1NjlFQ0VCNzY2MkMzNENCODZDMEIxNTc5
-QzgzQTZGCjcxQjNEODBDMkZGRUQzQUFCMkQ3NkU3MUVGQUYzMjg3QUM3NzEwQjk4NzlENjUy
-OThEMjhDRkU2RUUxRTM3MTRBOTYyNTlENzJFQ0I0NAo4MzhBRTk2MjNDQTlENEY1N0NBQUZD
-Q0M3RUJFMjkyQzFEMjk2MEE1MURFMUI0QUQ5NjA2NTBERjE3OTExNUJCQzNCNzhCRjVEOTAw
-ODYKQTUwMzgxOEFFODc1RjAyNUJDNTAyNjA2MTQ1MzUwM0QzQUE1NzlDQjBFOUM4MDlFMzFF
-NzUxMjQ4MEJDRTRFMENDMUM2OUVBRTNGMjAyCkIyRDlERUMzRkMwQTIzRDExQjkwNkNENzNF
-NUI3MzU0MjIzNzE0MTMzNTBGQkZBRkEwNTE1ODRFMTQ2M0E5NDgxNkRCNkJCNDhBREUxNQo1
-RDlBMUYzNjZEMzI0NkUwNjQ1QkZGNDk1OUM2Mzg1MzQ0QTlBOUZGRDkzNUE0MTNBMjdCQkU2
-OENFRjM5QzY2REYxNEY1NkUzNkZDOUMKOTBERTIwRTgyRTFFNUFBRUJCNDQxRUU2OENGRDc2
-NkY0MTBDMTYyMkYyQzFENzJDQzQyOEYxMkU5OUUwMkQyQzczM0YyMzhCOTkwMkY5CkNFMUQ1
-MDJEODUzNjRBMkM0MDk2QzRGRUIxNjM5Q0M5RDY5RjkyRDEyQzdBRUU3OEQwNzRCODgwOENE
-MEJBQzgwODZDNDAxQjBGNENENQowRTQ5MzA0RUNBODYwQTQ5QkZGODg3NEYyMzE4NTYxNjg5
-QUI1RjdCMkU1RjFDNTI3MkZCNzVENUVEMTlFNDEzNkE5MUEzQUY5MDU4NTYKM0Q0QjgzODY1
-Q0YxNTA3OENCMEMyQjk2N0UzQUE1NDlEQjU5MUEzRUEwQzE1MjFERDdCMkUyMjJDMTcxQkY4
-RUJFNzY1QTMyQTRBNTc4CjRDNjExQkEyQzYxQjI0MUYyQUZBNDBFNDk3MTJDOTE5NDAxOTY4
-RDg0MTk3QTczMUI3OTlENTM5N0JEMkI5MzczMjlEMjk5QzhGMDA0NwpEQTQ1MTk5MkU2MDZC
-RkUzMEE4RTE4MTQ5MDdBODdGRTg0MTE5QUZCOTM3MDNEOTc4N0Q0QzFDNDEzRjVBNzYyMzZC
-NzhBRUNEN0NCQjUKOTA0MDhBMzEyRjYwQkMxQkI2MzQyM0UxMDMxMkM4MEExMjFBMTU0NzIy
-OTk0MTM4QkZCMTZCMDM5M0EwN0FGRUM3MTZFQTY5NzcwNzFBCjIyQUIzRUQ2MDBBMDk0RTVD
-NkRENzNGNkQ3RjBBRDEzMjM1NUU3QUVDNEUzMDFFODIxRTExRkFBQTY2RDcwQThFM0FDNTI1
-M0FFRTU1MgoxODZCNkY2Mzc4QjYyQzE0RUM0MUFDOTQ1MTUxM0E0QjI3QUVCRDY2OTU5QzQx
-RDc3OEYzRUU4QzY1OTdBMEUyQTQ4QTRFRTlEMTRGMkQKQTM4MDI4MzBENzkxQTNEMDQ1RTk0
-MDcxMDcxRThCRUE4MjMzODA1QkJGMzU5MDZDRTc2REQ2OEYwQjczOEEwNDI3MDhENzk2RUI0
-RURFCkMxN0NBODYwRDg1NzgxNTdEODVGNTUwRjMxRDNCRkE4RDI4Qjc2M0U5QzYzNEY2MUY0
-MkZEOTc4RUMxMjVFOTBDNzFFMkY1MzdFRkFGNQoyODNENEY5N0U1NzJGMTY2NDkxMkY2MUY2
-OUExQkM1MzE0MDc2RkE1MjExQzQwMERFQTNDNDEzMkFCOUNCODE5MjA4MEQ3OEI3RUMzOUQK
-MTRGQUFBMTUyOThBQjZDODBBODAwOTU3QjJCREExQjI3MDVGRTZFRkJBMENFNTg1NUY3RTc0
-Njc5N0Y5NjQ3OTlFRUM4NjY3NUNDMEVCCjMwQjQ0NzgzOUM5OTcxM0QwRDRENjY1RDBGMUJB
-QzY4REFGMjY2MjY3QTU3QUYyQ0EwNjZGREU5NjAwRTQ2MjM2MTNCNDU2NEM1OEE2Qgo3MzQz
-QUI5REI0NDZEQzdGRDQ1Nzk1RkJBQzlFN0E3MDMxQUVBNzhFQjg1MDdCQUNBREJGRDkzOTBF
-QjkwRkMxOTgzOTFDQTdFMTVDQzIKOUI3QzdEQzY5NjRFMjEwRkFENzgwOEU5MjM5N0I4NkUy
-NTUwMDM1NEZFOEY3NDlFRDRDOUE5OEE0OEI2RTVCRUZGMkIyRDZEMUFFOUVFCjE5RjgyRTFB
-MTQ0MTkyQ0U4N0UyODczMUFGOERGODJDREQxOTUzRDczQjYzRDU0NDE2QTg3RjRGQjkyN0Y2
-Qzk5RUE4RUI1MjkxQjEwRApDNTE5RTVFNjBGOEM1REIwNzFGNDZGMUEzMDhCOEY3REZBMzUz
-QzZDRUYyNTc4MDM0QjMxQzNCNzUzNzU2OEI0QzIzNjU3Nzc1NTAzQ0IKMkY5RTgyOUQ4QjVD
-Rjg5MkVDNEQ0MDVGMjE1QUI0ODA1NkMxQURDOUUyRDcxOTU0NjNEREJDQTE2OUY4NDA2MEM2
-QkE5RDg5RDNDQzAxCjBBNThEODQ1RjY4N0IxNDhGMzVDMTdDQUU3RDYyN0U2MzYxNkMzRUQ4
-RTNGN0ZDQTFBMkE4OTRFMEExMTkxOEYyNUM5N0M2MDhCMDJDOAo5NEFFQ0REMzk4MTU3N0Uw
-RjU1MDE0NUUxOEZEOTlFRTJFQ0RFRTk0MEM3MTY2QkVGRjYwNzcxQzA0QzgwOTNBMEU3NEJE
-MzA1NTE3OTMKMTUzNThDMjIwM0FERDg4NTMxM0I5QzRBRkUwMzFBMTUxMTZCNERCNTY0MTg3
-MUY2MDc4QkFGMTMwNDU3RDUwNTQ3QTBGQzQ4NzJBOUVDCkM0QzhCQUI5OEFFRTNFQURCNzI4
-NTIzRjVBMTEzN0REMDQ2Q0Q0MzhFM0Q2QzFERUZERjUzQzY2N0E3NjU3MEVDNUYyQkVDMERC
-RDY2OAo1RTE4QjIwNDY4NUEzQzI5ODI2RTc5Q0U5ODU1NTI5NUNEMUIxN0IyOUI0NkQ1MkFF
-MjY0QzVENzEzREY5MUUzODE2MTcxN0JGMUJDNTIKRkNFRDRFRjBGOUU4RTczODQzNTE1MzBF
-NEUxRkE0MkVFMTk0MDNFNjREMkI4QzMzNUU0NTg1QTMyRkVDQzdEMzg2MDgxOUVDQzQwNDg0
-CkVBRjczRjNDRDg5QTU2QzdEMkVGNDM5QzhDNEU3NzNDMTM2ODk4QUQ3NDkyNDQ0RkRBOEZE
-QjhDMzUyMjM5NjlDQkU4OEJCNTk5OEMyQgpCMzBGNDYwODFBNzA2RUNBNDYzNUIxNkIwRURF
-ODk5MDFCM0E3RkEzMEE4N0FDNTlGMEUzMjQyMzE0MjI5MjY3NTM3RjlGNEJCRkI1QjYKMjlD
-OTY2NUFFMDlCMEEzQkJDREZGRUEzNTQyMkU3QUNENjc3Njc4NkJDMTY1ODExQTQ1N0FGOEZE
-N0JDRDQ2MjRGQ0VFQ0M4M0IyNDE2CkIyMjVBNjA0N0U2MTAzQkI3MzdBNjY4RTZFREJDODgy
-NTMwMkUwMTNCNzM1NDNBNjExNDEzMkNGRkZFRUNEMUY5QTlFMkZBNDQ5QkNGOQo4NUJDREJG
-RERCMEFGNDlFMkU0MkFDMjUxMUQ0NzY3QzlDNjMxOThGMDNFRjM3MzNGMzk2NUEyQzA1NzUy
-ODY0NDE3OTc5MzkxMERCQTQKRTc4NzQ5RkMyRDJERUZCQTE5NzRFM0ExNkMwNkI5N0MzMkIw
-REMwQkNBQzRCNzY1NjRGN0ExRTY5NTlCMjZDQTM1QzgwNkMxMUIwMkE5CjhEMzI2MjlGM0ND
-N0M5MDc4NkRCM0UxQTcwQzdGM0M0MzkwNjg2MDYzMEJFQkYxNENBQkY4QjZENjk0QjI3MTM4
-RDYzM0EzMzhCQTFBNgowRUYxNzBEOEVGNDk5RTNGQjlENThDM0M3MjNBNDI5M0Q0MjQ4QUM2
-NTc0MTg4NEQ1OTI5Qjc3RUZDQjM1Njg1MDBBOTkxQzAwQjU4QUQKMkJENkM0RDdERDAxN0Iw
-NUQwMkZGNkUyMUUxQzBGRTI0ODI0RURGMDg5NDVDN0M2REIwRUFGOTcyMDBEM0YwRkYzREVC
-NjQwNUE1RTlDCkRCNDYxMDgzNzc2OUYxREU1NDNBMTM3Q0IyNTA4MDUxRTk1QzMyMjMyOEU1
-NTBCRUM4RTcyRUY4Q0VFRjZGOEVDODUwMzI2Q0U5MTlFQwoyRDY2RDk2MUEzQTg3MkYwODYz
-NDBCMDBFRDQzRTYzRDcxNEYyQjI2QkY0OEQxQTkzNDQxMUQ5MDlCNEMxQkYzQjU1MTI2Mzgw
-MzYzMjYKNUUyQzQ5ODQzNDAzRUJDNzNCM0Q1QkI5MjREMjg1RTlGNEIyREEzRUQ1RDI1REY4
-NDBGOTVBMDg5RUQ2NjRDNDdCNEVEMjA2N0U3MTA3CkQ1QTgzQzVDMjVFOTgxREVDRUY1QzQy
-RkM3RTdFMjEwQTE0MTVGQTQ3N0E1QkE4REY2MDJFMDRCMDI2MzAzNzU3Q0NDRkY2QzJFQUY1
-MwpBOTVGNjIxNDY5QkI1Njc4NDJGNzBDMkQyNjExOEE2QjAxN0FBMkQ4REVCNDlERkJBNzVF
-OENEQTFBNjk4MDQwODA3MUE4QjMxNTJCNjIKOEI1REI3NDc5MDMxM0NDRDBFQ0VCQTBCRDg2
-MzJDNzE5Mjg1M0E0MUJENDQ3NTkwMDlEMDM0RjI1RUIxQUQyN0ExMjYzMDEyOEFCNEFFCkE3
-RkMzQjM5QjZCQTk3QURFNDBERDJCNzZBQjEwQ0FEQzUxOTc4RDVGM0YzNjZBRkNGQUJGQTAz
-MUFBRkFCQzFCODMwOTU3MURDRTdFRQoyMDcxMEY3MjgyQzc3REFEMTZDMTkxNzg2NDEwOUU0
-MEQxQjc4OTM1NkU0NUY4MTgwMTI2RkM2Mjg4NTBBOTVGQUZEMzQ2QjlCMzg2RTIKQzVGREFB
-REI4MDg0NDM2MUM1RDY1REFGQTlFMzA1MTM2NjI0RTdBRjc0NEU4QTY4MzE2MzlDMDZDNzRF
-MURGRUU0OUU1MkMzRkM3N0ZBCjYwMUYxOTREOTdGQkY2RDhFRjBGOTQ4RjgxOTc4NTRDQjVD
-NzUwOTM3NTY2MEVCMUFGRjJDMzg1OTY2MjI1Q0QxRjc1NjY4OTUwMzNGMwpDNERFNENGMDA4
-MUVFNDcwRjRBQUQ1M0YzMTY1OTM5Q0UzMjEzMjUwOTY3MUZDMTY3RTgxNjhDOERFRjZCNTk1
-RjdFMzJDRTZFREQ4MzMKOTc2RjI3NTU2NTQ1QzgwMEI0MDBGMzExNzM1NzBBNTRFODI0Q0E4
-NDA5MzM0NkFENDM3NjEyMDRDMjY0N0Y4QTEwNUE1NjQ2RTdBNUE0CjA2OTdCRUZCNUI1RTUw
-MzU1QTg0QjlGMEFBRTM0RUREQzM3N0YzQUIzQTZEOTIyRTJCQ0U5Q0Q1NDIwMjE5RDBENURG
-OEIxRDI2QTcxOQoyRTIwRDdBMUNFQUE0MzNGMDU4RTM0ODc5NzQ4Q0Y0Q0JDMUU2QTY3MjUx
-MDJEMzM3NUVGM0Q2Nzg1QTc1M0Y3M0U5MkY3ODU5MDAxNUMKMkIzRUI0NkYxNzNBNENBRDZF
-Mzk3REIwQzMwQkUwRUU1N0RCRjI3NjIyQTIxRTZDNDY1QzVFRUM0QjA3MTEyRkMyRDMyNTky
-MTRFMDM0CjIyOUUyQ0FCMTA3NkNGQTJDRkJEMDkwMkNDREM1NDkyQTNCNEMzMjMzQ0Q0RkU2
-Nzg2MDc3ODk4RTQ3NDExMjU2RkVEMTk3NjZCNUMxMgoyRURBRjAyMDZBRjA2Q0Y4MTU4QTM4
-QkE1NTRDMUYxMDI0RDc4MUJBQ0FCQ0RBNzM5Qzg3RUNBRkExMzIzMDExNjA4MjJGM0M1OEMz
-QTQKQjc2MDQ2NEE4OUQ5OTBBRTlDQ0VBNjdEM0E1NDA2MzU1RTUzMzlGNjk5QUM2QTc3NUYx
-NTE3MjkxNEU1NUUyQzhGOEJCMkVBRjJGREE3CkU3RDc4NDExREFGRTYxQTE1Qjk4NThFOTgw
-MTgzQzEzRjA4MkM2OUQ0RTk5NkRDNTlENUJDNTNBRTY2QzUwQjI3MTM1MTBBNTM0NkZDRQpE
-QzNBNTNGRjczOEIzQUI4RjZFN0YxMkRDRTAzNDM5NENFNDA0OTBEOTVGRDlGNUY0ODRCNEU5
-NjVCMUEzOTk5NkUzRjBERDZFNUZBNkIKNUMyMzhFODU4QjkyRUI0RTlGNEZBMzMxMEY1RTUx
-MzVFNzVBNzgwNjYxMzQxNEM2RUI1MTkxNjQ1RkREREU3REE5MDkzNkUxRDRBRDRCCkIwOTZF
-NDdBNTU3NTA5NEFBQ0VERjdBOEFFNDZDMTU3MkJGNkMyNzNDREM3RENEMkU5ODQ1QUZCOUU1
-NTMxRTkxQzIxQkEwRkQzQUZGNQowMjE1NTY1NDcxM0VEODA3QUY3RDU1RUY1MzRDQUU3NDU2
-RkE2MDhBM0MyNzAwMThBODVEODA1MjJFRUVEOTg2QkFCNzFDQTJGRjU2RjcKQTVCMUREOTIw
-NTQ4OUJEMEUxOUMxNEM1ODVGNTY2MjJFRkE5RERBQ0RGM0QxQzk1NkIyQkZBNzQ2OUVCNTEz
-OTk4REQ3MUIwQzg3NDVGCkY4NjY1RjI5MjY4MjVGRTEKMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-CjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwCmNsZWFydG9tYXJrCiUlRW5kUHJvY1NldAolJUJlZ2luUHJvY1NldDog
-cHBjb2Rib2wucGZhCgoKCiUgR2VuZXJhdGVkIGJ5IEZvbnRvZ3JhcGhlciAzLjUKCiUgQ29w
-eXJpZ2h0IChjKSAxOTg3IEFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkLgoKJSBBREw6IDcx
-MiAyODggMAoKCiVGb250RGlyZWN0b3J5L1BQQ29kZUJvbGQga25vd257L1BQQ29kZUJvbGQg
-ZmluZGZvbnQgZHVwL1VuaXF1ZUlEIGtub3due2R1cAoKJS9VbmlxdWVJRCBnZXQgNDMwMzcz
-NyBlcSBleGNoL0ZvbnRUeXBlIGdldCAxIGVxIGFuZH17cG9wIGZhbHNlfWlmZWxzZQoKJXtz
-YXZlIHRydWV9e2ZhbHNlfWlmZWxzZX17ZmFsc2V9aWZlbHNlCgoxNyBkaWN0IGJlZ2luCgov
-Rm9udEluZm8gMTMgZGljdCBkdXAgYmVnaW4KCiAvdmVyc2lvbigwMDEuMDAwKXJlYWRvbmx5
-IGRlZgoKIC9Ob3RpY2UoQ29weXJpZ2h0IChjKSAxOTg3IEFkb2JlIFN5c3RlbXMgSW5jb3Jw
-b3JhdGVkLilyZWFkb25seSBkZWYKCiAvRnVsbE5hbWUoUFBDb2RlQm9sZClyZWFkb25seSBk
-ZWYKCiAvRmFtaWx5TmFtZShQKXJlYWRvbmx5IGRlZgoKIC9XZWlnaHQoQm9sZClyZWFkb25s
-eSBkZWYKCiAvaXNGaXhlZFBpdGNoIGZhbHNlIGRlZgoKIC9JdGFsaWNBbmdsZSAwIGRlZgoK
-IC9VbmRlcmxpbmVQb3NpdGlvbiAtOTAgZGVmCgogL1VuZGVybGluZVRoaWNrbmVzcyAzNiBk
-ZWYKCmVuZCByZWFkb25seSBkZWYKCi9Gb250TmFtZSAvUFBDb2RlQm9sZCBkZWYKCi9FbmNv
-ZGluZyBTdGFuZGFyZEVuY29kaW5nIGRlZgoKL1BhaW50VHlwZSAwIGRlZgoKL0ZvbnRUeXBl
-IDEgZGVmCgovU3Ryb2tlV2lkdGggMCBkZWYKCi9Gb250TWF0cml4WzAuMDAxIDAgMCAwLjAw
-MSAwIDBdcmVhZG9ubHkgZGVmCgovVW5pcXVlSUQgNDMwMzczNyBkZWYKCi9Gb250QkJveHst
-MjggLTI4OCA2MzEgMTA0Nn1yZWFkb25seSBkZWYKCmN1cnJlbnRkaWN0IGVuZAoKY3VycmVu
-dGZpbGUgZWV4ZWMKCkQ5RDY2RjYzM0I4NDZBOTdCNjg2QTk3RTQ1QTNEMEFBMDUyNTM5MkVF
-Q0FDMTYzRTU4NEE5MTA0RDk5QUQwQkMxQjFGM0Y3MTIxRDFEMAoKRjJDNjBERDIwNkIwRDND
-OEM0NTA2MjBCNDczMjBDQTBBRUI4OTM3NTExRTQ1NkFBREU4RTY2QjMwMUIxRTNFOURGRTE3
-RTJGNzlFQ0ZFCgpBNzA5RkYzREFFMTlCNEMxNjlERjY3NzNFREE0MTREMDI5MTVBNkYwRkFG
-OEIyNEZCQjA3NzdDNjk3QkU4QTM3RDYzQTM5MEFEOURBRTQKCjk1QkI3RTYyNjcyMUZGMkZE
-M0ZCMTQ3QzgwRDIyQkVBQzM3QzI2MjREODE4RDU4QzhERjAyMDlGNUNFNzZBQ0RERTU3QTMw
-M0Q5MDQyQgoKRjBBNjc0RDA5NTY5N0Y5MjVGNTMyRDE4MTRCRUE4RjhBNUI1MjIzQTMyQkM0
-QTk1NDAyRjJDODQzMTgxNzc2RUE2REQ4RkY5RUU1RjM0Cgo4OTA1MUZFMzRBRTg5OEFDRjMy
-MDE0MzNDQ0NFOEI5M0Q1NjI3Qjc2MTE0Rjk5OUM4MUEwQzU1NDU5OUYxMTVDODlBRkE5MjIx
-Rjk2M0IKCjZBMkRBODkzNDI2MjEyNDRBQkVCMEU3OTRDODg1RjMzNUU0RUY4MTg4QzRCMTVC
-MUU2NjMwQTQwNURBNTA1NzhEREIzN0M5NkIzQzhBNQoKNkE3RjcwQjU1QkMyMzYwNkVDMDND
-MjMxQjIzODBBODNFMEYwNDY3QTRDNkY4NThBMDU0OEFDNUFBQzJGMTExN0U3QTRFQTdBOEM1
-MkQyCgowMUIzMzYyNkMyQkVCQ0NBNkREOTIxMUQ2Qzg4RjYwOUJGMkM2QjEzM0U1NUZDRTZE
-ODg2MDA5MEFGQjNDMDY1ODM1RDdCNEYzNEFGRjkKCkQ4RTBGNEUwODQxRTQzNjdGRjg2MDQw
-OTI3MDRFMUUzNjI2RkU4Q0I0QTQ4RUIxM0U0NUNCRkVFQ0JERkNCRkNCRTY0MzIzNTY2QzQz
-NwoKNkFGODU4QUNEOUFDREM0MkExQzkyODVGMjUzQzMxMTMxMjJCQzlBQzQ2MEUyNDczNTgx
-RjlDMUYyMTBCNkZFN0I5RDQ4NkU2Qzk2QkNECgowQ0Y5QzUyQTg5RDJGQTJEMzBEMTREMEZD
-QzlBMjQ3MEEzQjkxQTBDQUE5NjIwQ0IzNzZDNDE3NTczODYwMDcxMzMyQkYwMTIzMDU0ODgK
-CjIyODlDRjJBNTI5MzRGQjdGMzJCQ0Q5NDMzN0FEMUVGRTU3QkVCNDNFNEE2NjFGRjhFRjVE
-QkEzOEZBM0M5MjRFODUxN0FFQzExNDEwMwoKMTFFNzlENkRGODYxMTU5QUM3NEM5NjIwODg4
-RURBM0FGNENBMDhBMTU2MjNCNUYzRDFBRURBODhCMUJDQ0U4RjA1NzE3M0MwMzM3QzY3CgpD
-QTJBNTk5RjFGNEJBMDM5QkJCMjYxNzlGNTRBNTdBODc5N0E5QzRFRkFDMjI4RkVERjFFMkM1
-MEE5NTFFQjE5NzcwNTI1QUYyQzY4NTAKCjU2NjBBNkM1RjRFN0M3QUIzOUQ1NzU1RERERUIx
-QkM0RDA0RUIxMENDMDlGOTA3RTZCRkJCNjg4MDdBODc0MzkyRTQ0M0M5ODY3MDQ2RgoKNEIw
-MjBFNUQ3OUJBNDUwQjYzQkRDMEZCMzhBRUNERUE5MTI1MTY3M0M1MzI3RUVCNzQ4MjE1MDU5
-OTNBNDkwMTMzQjczRjdBNEQ5MEY5Cgo5RDRCMzc3OEU1MDI3NDc2MkZEMThFODdGN0NBMUQw
-MDlEQkY0RUE4Q0RGREFDMTQ5NEI3RTc4QzE3QjQzQTlEQkNBRUUwQ0Q1RkZCRDAKCkUwNDQz
-REI1Q0I3MEU3MUQ3Qzk1QUEzNUI0MkNGOTA4MzA5NjlBOEM4NDgwMkU0OUVEQTk1MjhCN0Qw
-RkREOTE3NUE2RDQxRjdFMzQ5NgoKN0IyRTkzODE1OTU1QTlCMTRCMzREMkEzN0U2RTg4Rjgw
-QzdDMTFERDM5QUNERkIxRjEwQTEyMzdBMEZDQjFCQjM3MjIxRjcxNjBBQ0ExCgo5MDM3QUY3
-OTRBMzE4MzU1NEMwN0MwM0NGOURCM0ZBQ0UzM0EyRkI1ODRBMzBBODE1NzhFOTlCNkE2MjU4
-NjFEMkQyOTU3RDVFQjg3ODkKCkNEMDkzNEE0MUZDQTIzQzkzNUJEQjcwOTQ4NDhCMEZCQkM1
-OTIwNjdBMzRGQjNBRDU2NEJFNzFEMjAwNzRDMkE0QjYyNDk0NUFDRkM3MQoKMTMxNjk0QzQw
-NTZFNDY0RDQzRTMyNDlCQTFGQjEwNkRBNkU2N0JCQzZEQ0Y1NDI4MDFDNzM0NDZBOTIxQURB
-QkE0QjRCQ0ZFNjM2OEU0Cgo1NDM3MzlBMUFCMzUyQTU0RjczNEVDRDNDRERCQzg5RjAxNEY1
-OTY4MkUzQzUyMUIzM0NBMEY5RkJDMjM3NThEQ0IzNDQ2NzI0REM0RjIKCjQ1QjZEMTIzRTkw
-NDQ1MUQyMDMwQjBCQTJGQ0JCM0U1ODcxMTc3OTk0OTc0MEFFRDFGMkUyQjM2Qzc4RUJCQ0NG
-QkNCQjZGQTI1RUZERAoKMEE5Q0EwMDBDNjdENkJFN0IwQjM2MThFMTBFQ0YxRkE1Mjc5QTdE
-MTY0NjJGNTM4MkFGMTA0QjUwNDM3NzcxOTRGMDEzOENGMDlERDJFCgpGNTNEOEY0NzM1QkJB
-OUIxNDkzRkIyREVDNEQzM0IzNUNGMTg4MTNGRjZCRjlFOUVFNzhFMkFGOTM1NjZGMEZDQkY0
-RDZCRkE3Q0EzMDcKCkU3QjI5QkFGMUI0RjQ3NDNCMTQwNzRCRjkxMDU1RTNGRjg0QzNBRjgz
-QzY2NDIyNzFCQUQxNDMwQzdBRkI5NzY4MzJFODg0NzFGQ0QxMwoKQUNGRDBFODY3RjVCRkNF
-M0NFRURCRTYzRUEzM0E0NDBCMUEyODExMUUzOUVCRUQ1RDA4QkMzOTU3Qzk1QzMzQzJGM0JB
-MDI3MDA1Q0Q2CgpGREU2MENDNDQ3MTY1N0ZGNkZBREQ4OTQ1MEFBQjVEQzk2NjgxOTVGQjlE
-OEY3NTEwRjEzQ0M4RUVEQUE2RDA5MTU4OThDQzYxOURDREUKCjhCQUZEMjU3RDZCNzRGMUVD
-QzYyNTk5RkYzNDU3MDJBRUM0RUU3QkEyNDJDNzNDRjhBMzYxQzcyNTk1RjY4MjQyNDBEQjEw
-RjUwQThBMQoKMkU2MDU2MzZGREQ0REVDOEM3RjcyNDdFMTkyNEREMTNGRTA5NTM2NzdFODZD
-RkNCOEExMEYxNUU2MEM3OURBMDE5RkZFMEY3NDg0OTdGCgo4RDdEOTJCMDdGRDI5NDZCRjkw
-OEFGMkI2Q0E0MDI4NUM5NjZENzc2N0ExNEZGODVFN0Y0M0I0OUUwRjhFRTFEQTZCNEU2NjYz
-NDcwMjYKCjQ3NDNFMEFDODcxMzc5Q0Y4QTA3OUVEQzY1QzFEODQ4OTYzMjk5OTBCNjBEOUEz
-M0M3MjRFMDE3NTZEREJEOEI5OTA2QUQxOEQxRTExQQoKMDk1MDg1Njc1QUY5NzIzQzBERTQ2
-Rjc4RTA0NzkwOTE2Q0E4OUI0REQ1RUE1NzYxOUI1OUU3MUJBNTMwQjY5NDU5ODY0OEQzMzJG
-Qzc4CgpFREIzNDM1ODgwNUI2NERGNjBDNUQ0N0FCODJGM0FDODdCNTM4NUMzOTExNkIwMzAx
-N0MzRTRCQjQ1NTZCOTZERTVGMjY2QjM3OUVDNjkKCjlGNEZDOEE5Rjg1NEM0MUU4QkIwM0M5
-QkQ3QzAwMzg4M0E5MDIyNjk5MkM2N0IyRDAyREJBOTIyNDJCOTREMjE1NjZDODNGQUMxQjRD
-MQoKMkFERTZGRkFBMDQ5QkY2ODA1QUU3NkE2QTZFRDQ4MTQ0REFDQUJEQzhEMkYzNUNCNUMw
-ODE1OEE3M0EwQTEwMDY2Njc3MzhDQzQ3MUU4CgoyOUQ5NDg3RTIyREZFQzMwREI2REQyODE5
-MzFFOUJFOUM4NDg1OUQ2RkE5MzJBNzZGOUQ4NUExRTk5QUZCNUY1OTA1QkZFRDZGRkQ3NjIK
-CjU2NTQ2NDk3NTdFQjY0MEI1QjNDMEQxODAxOUJFQ0Q2MjkxNjIwOTFCNjkxNTREQzBCREEx
-RDA4RjA3MjdBQzg1MUJCNDM1MDNFRTM5NgoKRDM2ODI1NDFBNzMwRUU0NTBDMzBGNjYzMTg3
-QzNCNTAwNEQyNDE3M0Y5NjJDRkVBOEUwNEY1REQ2NjRENUY2REQ1MTUyMjRGN0UyNTZBCgo0
-RUEwN0I1Q0E4MjM0NTZENzU3MDg5OTgwOTcyNjdCRTVENzdEMjBFNzFCQkEwQkVBM0YzMjc4
-NjVBN0EwQzU3NDYyODlBQTY1M0VFMkQKCjIxNTdDMkFGMzMzMEE0NTU1N0Y1RjgyNUE4RDc1
-Mjg0RkM2OUJDMTVFMUY3M0FDMEY1QTExQjI2RDQ3MjEwRDE5NUY1NTdCMjY1RTlFMwoKMEY2
-QUM3N0M1RDNBQjA4NDc0M0U2Qjc1ODM2NTc1N0I4MUQ0MzA1NDlFRjUxM0U3OUFFQkJBNTM5
-QTc0NUYyNEQ0OEFFOEU3MjhGMDI4Cgo0REYyODk4NEY1REIxMjAzRjBCRDY2NjI4NzU2NTY1
-MzkzRjE2MjkxOTFDNTAzNDdDMEE0ODIwNUREODA3QjBFNkNGRDM1M0UyMkJBNDMKCjFDQzZB
-Q0Q4QzZCNEU5N0Q2OTFGNzQzREFDNjlDRDA4ODFBQTgxQ0IzQTQ4QTA4Q0FGOUMzMkU0NDAw
-QTc3Rjk0QTUyRjlBQjE4QjRFQwoKQURDQTRGMDczREE1QjNCRjQwNzlFMDEyNUIzMDY0Njg1
-RkI3ODNFMTU2NUQ0QTc3NzkyOTBCQUE3MzQwNTJBRTc5OEY1Q0Q3NUM5MTI3CgpCMzM4QTQ5
-RTJDREZGRDlGMEE0MjlGNjYyRDE3MEFBODg1MTI1MDcxM0UzRDE5OTI4RDk3NEI5QTdDRTY5
-ODdEQ0NCMDdBNTNBQ0MzMkYKCkQyMTc5OTFDODBDNTgzNEJCQUE3OTZBN0Y5QjIwNjM2ODU0
-MjIxODcwMUQ5MzI3OUUxRTE5N0Q2OENCMEZEMDMxM0Q3NjcyQTEzMjdGNwoKMDYyNTBGRUE0
-REQ0QzYyM0NENTY4RjFGNkJBMDQ2OEQ1Qzk4QjRFOUM5NjNFOUU5QjIxQkU1ODkyMjc1MEE1
-MDc2NDQ5QzhCOURBRUEyCgoxQzQ2RTIzODRFRjg3MUM5NDU2RUNDNzM5QzFCM0NDQjVBODVD
-REI2NkU5MDEwOEM4NjBCMTgwRUM3RDRERDc2OTIxNEZBOTYzRjI2QUMKCjY2RTI4RUYyREEx
-Q0RFMjFCM0VGOTM3MTRFNDJFN0FBRDUzMzQ2RjIzRUUzOTg1QjFBM0Y4NzFENDlDRDU2QTBG
-MDQxRkQxOUE0Njg4QgoKNUMxOEIxNEM5M0FDMkQzMEU1NUI5MDJBQ0MzNURFNzlDNkIzRDNC
-QzhERjZFQzM1NTcwQUYzNEQzNDcyQzI0RUVDQjRDMDdBRDdERUVDCgo2NDI5Rjk2OTQyQkZB
-Q0E0QjdDRkRCQkNFRTZGQ0I4RDVCNTQyRTI4OTU5OUY5RkUxQzJGRTJCMUUwRTE4RjEzNTcy
-MkNCMjExODkzM0QKCjc3NDM2NzNERDhBREEwQUVBRkMyMEMzNkUwMTU3QjcyNDc3MUIwMERD
-MkZDRDgyMUMyNkVBREY0MjlFQ0YwQTI0Q0U4MDhFRDA2Q0I4MAoKRURERkZERDgzMDBBQzVG
-RUI3QzFCN0NCNTkwNTREMUE0RjA0MjY3RUZGMDMwRTE3MTUzM0FDRUE4NjlFOEU5Mzc5MkQz
-MzlGQTk2QzZECgo2NDhBOUQ0Q0M4OEM3RDBDMUIwMzZEQTdENDUyMDA3QTUwRUM1RjBDRjhG
-NEM2MjJDNzA3OENGQTNDRjRCQTQyNEE2MzkwNkJENTEwRTAKCkE1ODBDMjJBQTFGMDI3OUY5
-QkUwM0I3RTFCNkM3MTRBQkZBMkZERjRFQzhFMTQ3MTQ5NzBGQUYxQkNBNDlDNzFDOTFDNDZC
-MkYzMUE4QgoKQzMzODE4MEFGRkU5N0UwQTRGQTZCQzlGRTQ3NTBBODQ2MjBFMkNGMjNBQUJD
-NkNEQzQwOTcxNDA0ODBEMkEwOUMyMzFCRDMyNzM4RDU3CgoyNkJGMTI0MzU2NDBDMzk3OENE
-NEM4NTU0ODRENkNDQTQ0ODI4MzRGRDc2MUVBNDE1M0IxOTg0RDA1NzhCNzc2Q0RCMjFENDg5
-MTgwMTIKCjg2QjY0NjY0OTI2MDhERTc5N0E3Qjk1MUE5NzlBMkRDQkVGRkQ2OTI5N0M0NkYy
-QjM3MkY4RUQyQ0NBRTkzNzJCRDRBRjY0NTVEQTcxQwoKNjVGRkFFQTZFODQ1MjNFRDA5OERD
-NDlENTYwQzVENkI2MEJENUMxOUYwRTYxQkU1Rjc4NTk2NjUyOTUxNTBFMTUyRkMzRTg4NTgw
-MEQ4CgpDODMyNzU3RUQ3N0Y3QzUzQjMwRkQ3RUZCN0MyMjU4REY2RUYzQUZFMjMxMDlEN0Ez
-NDJGOUIzNDhGRDZGMzZFRjYzQzk1NzFBOTZGNkYKCjhEREExNzgzN0U3MkE2RkUwNTk4RkZC
-OEUwRDVDMjIwREEzRDM5Mzg1MTA5MjNDOTNEQjcyQjI1NzI2QTU3ODg1RDQxOEU4RDZDMDQ5
-QQoKRjZFREUzQTFERkNBOUIxMEIyOEVGNkYxRDA3N0Q0QjM3NUQ5Q0IzM0NDQUJEQkU4NDlG
-Q0MxNThFNjAzRUNCRTdBOTA2MjI1OThDOTlFCgo4OEIzMkMyREQ0REU2MTRDQ0ZCQ0ZEOUMy
-NzI2REMzQjI2NTQ0QTM5ODlGMUU0NzM5OEZBNDZFRDkzNzhGQjA0OEFERTJBNUU0RDM2MjAK
-CjcwOEFFNEIyMTBGQjREOTdEM0Q2RkE5RkE0NDAzNTE1NTg0RDg2RjdDM0NCRjJGNzQzQ0Yy
-QTYzMjAxQUNENjdFNTg5QjZGNTRCQjA1QQoKNEVCODVCOTEzMjhCOUYyMzc1RTU3MTYyMjc0
-MjY4MURCNEY5NDQ3QTJFMEZCQzRCNENCNTFGRDdGOEJERTRBRDJENTI3OEE0NzJEMkJECgpC
-NUQ4OEI3Nzk4MkIwMTc4NkMwMzVCNTdGODVFODlERTQwRTYzNjg3MjhCNzI4M0Y1NDJGM0E5
-M0QzRjVBN0IxRjZDOTgyQkI0M0E1QjIKCkZERUVGNUJEOEM2MTgzMTg2NTM0OUJENkQ0MUVC
-M0QyQjBGOTRDRDEwRTZENzVDMzcwNjY3ODMxMTE5MzExQjk4ODhEMEJFOUU4NEJFMAoKRjE4
-MDk2MEFGREZDNjVBRkFEQ0EzQTlDMTQ1Njk1Q0RGOEM4QUY5MTUwQjdCRTA5RTVDMEVFNjRG
-QTUxMUIyQzhDNkY1QzFCMjA2Mjk3CgpFM0M3Qzk3MzM4NzVERDM5NzZBNkQ3QTJDRkZBNUNB
-RTgxMEMwMkZDQkYyMzQ5RDM0NjM3MEI1Qzk1RjAwRkM5OUE3RkJDOTEwODNBNkUKCjQ5MDFF
-MjFGOTkxNTlCQ0Q0NjQxOTY2NTFEMzlFNjIwOTU1N0I1MkY2MDRGQTYxNDQ0MzdEQUNDNURD
-QjkyRkU4RjgxOTEzQjJFRTNGNgoKQjQyMDZFMERBNkEwMUYzODFEMzQyNDI5MDI2NzhCQzY4
-RjREOEIxQUU3RkExMUE3OTlEMDZDNzJBMzc2MTk3REIyNTI3RjQ1RTJBMUQ4Cgo1MEQ0N0Q4
-MzVDRUM4Rjk2M0E2RkYwQTgwNzc4RTQ2OTE3RTZEQ0REODQxRERFOTA0RTNGQTk2MUVERkI4
-RTZBNUI3QjQ3Mjc1NTgxRDQKCjFFRUMwNDUyREIwMzIxODlCMEY0MDIwN0IxMTYwN0QxNDI3
-RDUwMjExRDc2OTY2MTIyODMyQzk4MEY5Qjk3MTVERjJBMjVEQjhCNzk0MAoKOTc4MzU2NUEz
-QTMyNUM1Q0E2OEEyNDhFNzE0ODk0NDg0NEVFOEEyQ0RCMkFDRjdEOEE0NjI3NzU1NTVFMzQ4
-OTE0REYzMjM4RjBFRUEwCgo2NTc2MjNFRTY1QzI5QjdBRDA3QzhCNjQxM0Y3OEEwQTRFOUZD
-NTMwN0U0MjczMDVDOTVGRUYwOThFNTNFMzA4NzAzRDc1N0YzN0YxOTMKCjc0ODlBRDExMzE1
-ODIwODdEMjRCRkY1MEE5MTZBMEY4RTZFNzFDMzM1RTUwQjMxNjUwQ0IyRkU0MjM4ODQ3M0M1
-NTIxMzM0NjczN0NGMAoKQTVEODgwRDBBNTZFM0UxOUI3NTM0MTFFOTIwNDVBMEU1QzAwNzNG
-Mzc4RTkwMDJEREJFMEIxMEVFMTc3RjMyRkQ5ODcxQjk4RTAyM0U0CgozQUEzNjY2RjQ1OTQ1
-OTFGNkFBRDhDM0ZGRDM3ODA0QTQ1MUYyMUM4NkU3OTRFNjU3RkY1MEY1NDlCOUYzMkU0QjAy
-ODFDMzZBREVBOTEKCjg1NDk0NDYwNjE3NkE2QjNCN0M1NURCQ0I1NjBEODJENTdEMEFDMTM0
-MUYwMzI0MEFDNTZBMTVEODc4RURDMTEzQTYxMjc3QzRERkU3MQoKREI4NUM2RDgyNjU4MTA1
-MDUyRUYwRUMzQUY4NzNGNUYwRDE4ODFCOTdDQUYwQ0U1MjE2N0M4MTlGRTAxRTAwREU3QjQ0
-ODg4N0EzMERFCgo0NTNBMzhCRkUzN0NGQ0NBNEY0MUU3RUVBNUE0MTVGMzMwNTJGRUU2NEY3
-RDIxMDhDMDlGNzlFOTdEQkE2OTk4QTNFM0Q1REMzN0EzNTIKCjkzMzNDRkIyNTRGQkNCNjJG
-OTBBMEE4MEJEQjM2MDZGRDk0QTVENjlBMzJBNUVBMDA0RTk0RTQ1OTc2QTUxNEJCQ0FDMDQx
-RENDRDU5MwoKQ0E2NzNCQzNFRTFCOEU0RjkwNEMzQkJBMkUxOUUxQjU1NTE4QzdENjlCNjYy
-QzExNTg1OUQ1MTEzN0ZCRjJEM0RDMDE5QThDRDZFNkEwCgpDMTRFNDMxMUIxNUZBNjcwMDkx
-QjlDRjhBQkIxQzE5NkI0RTBGQzgyNEJDMkVCQTc2QzYyQTIzRkU4QzhBMzhEMzEzRjk5MkZG
-QUFCMzAKCjU5NDc5OEVFOUM1QzIxNkQ2RTk1NDExQTgyNUZBNEYyOUFFMDVFMEQ4ODNDMDdE
-MjRDNEY1MTA4ODM5RjEzMTM5NTczMURGMzk0ODZDRgoKNEQ4RDY2OEI4NUY3QTU1REY4M0Y1
-RUQzNUY5QjQ5NEIwOTg5ODc4QzMzQTA4MTdCOEM3NTM3Mzg4QzVDNkE2NTgwMTQ4NjZFQzA3
-RDU0CgpDODlBODBBRjgzQTdDNERBMjFERTQ0NzIwNkRENEMyRjIxQTM5QzhDRERDRjNCNThB
-MzMyODA1NzE0RjgyQjFFOTY2MTgwRjVFQ0E5NTgKCjI3QUNEQzQwQTRBNkVDOEZEOUJCMDI0
-RDMwNjhDOTRGRUYyNUU0RDYzMzdFNDBEMkEwMDI0OTRFRURDNzkwNUU2QkFFMzg0MjZCMzQ0
-RgoKNUIzNkVERThGRkU4OTQ2NTI0MjJCMTFBMzIwMjg1OTE2RjRFRTVENjFFNUVDOTg2OUQ0
-OTcyOUEwQ0FCMTM4NzNCQjNFMEYyMEZBNTE4CgpCODEyRTVEMjRBNjQxNzk2RTM4QTE3NjZE
-ODA1QTg5RDlEOUZCNjQyMTQzQzM3N0IzNjVFQzQ1QkE2QzE5M0IzMTI0QzA2OUM1MjU1MTcK
-CjZGMzVFQzg1NTQ2QzE5MzNGMjVCMDkzREQ1NkM3OEFEODZFNTAyQTIzNUQyNzczQUJFM0I3
-QkQ0OUUzREM3OEE2QUVDRjIwQ0U5REE0QwoKODdBRDdDN0U3NUJCNEFBQjc4Nzk3RUI5Mzgx
-OUE1QzhERTY4NjM4RUZGMjgxQjE0MTY2MkE0NjMxMzVEREEwRDJEMjM2REYwRUVCNzA5CgpB
-QUQ5QTU0OUNBQkJDQUM0RTU3N0IxOTU1QkREOEJFQjQyNjUwNzgwQ0UyQjFFQUE0N0MzNTk5
-M0UxRTFGMDUwNTExNDVBOTRDODlEMkYKCjQxNjJCRkUyM0EyQzkxQjc4NDQ4ODVBRDM0NkJC
-ODhFOUM5RjhGQUVERDIwQjZENkU1NEE5RkNGRTNDMTg1NDAxRUZFNThGMjlDRDRBRgoKOEQ5
-REVBNkVCRkY0MjdFOUFFMThEREQzRDFCRkZFMkExN0E3MTM3QjU5NkUyMzlCNzQyNkNFMzhC
-NUM0OEM4MUQxN0ZGODU0NjJCNjQ4Cgo3MEEzQTdDOUYyRjNBRUU5ODg0RDAzQ0RGMzg3Rjkw
-QzVDREI4MDdFMjIyQTc0NEE2MTczMTcwMzg3MDdCRjMxMzBFQ0FFMjY3OTI2RDEKCjUyMTU0
-RkI0MjNFMkZDRkM0MzhBQjY2MDczODE0ODg4MkJDNjg2REI1NkM1MEQwOTJENjA0MjhEOUIw
-MzcxNzA0RDNGQjhGQkU3NUQ1NgoKOUUyMkIwRTlENzY3QTVBOEVCNzcwMkMzNEY3MzIwQzMw
-RkYxNDJEQ0VCOUQ5MTU3Njc4NjQ1QzUxMzkxNjQ3RjlGNzMyOUIzOUMyNDMyCgowMEE4RDA1
-Mjc5NDBGOERBMzdBMzAwQzAxODJDRjc2RjMyMjBCMUU2MkVBQzE4RThGRTBBOEM5M0EwQTVB
-MzczMzg2RTM4MDkzQjgxQkQKCjNFQzNDRkQ1QkYyRTg4QzUxMzIxRDQ1NDA3MzMxNzM1OTI2
-NjFEODVGMUFGRDA0NzM5NTQzQzM5N0UzNjhDNzM1MDA0NTYyNjRCMjYyNQoKMzdCOEVBNkQx
-NDdEMjY0RTQ4RTY1RkM2Njk0RDI3N0U1OTcwQjBGQjQ3MUQ3NjI4MEE3NDAwOEIxMENDNUEy
-MTZFRDA3RjIxQTI0QkQ1CgpEQkNFQTVBNEUwQURBNDgzRjA0QUNENzY5N0FCN0EwQTkwMUMw
-MTkyNTgxRDRGQUJCQzI0NDg5RTNDRjUzNTczNzA0MEIwQzE1QkYyQ0EKCjk5NzAyNkZDQzM3
-RTM2MDg4RDUxM0NDMjBCNjhDOEQ4NzA5RTVENTgxMUI1QzUxMEQ2MTkzQTgxMzIzQTI3MTYy
-MEQyMzlDRkEzMkY5NgoKM0FGNUYzQjU4NTdBQzY4MEQxNDkxREUzRjIyQThCQkQyOTUyRUVF
-NUI0OTYzN0YyNEJERTkyQjVBOTk0Q0Y1RTAyNzFDQTlBREI0N0Y1CgpDMjk4QTM5MUJGQ0I2
-MEM2MzAzMTJBRTg5M0FDNDhGMjAyNTY4REUxQjQzREQ5ODZBMzhBMEY0NzhBRTY0NjVGODNC
-MEZEM0FCRDdGRkUKCjNFRTA2QkY4OEQ1MDE2QkVFMkU5MEQ0MjM4NzIyQTYwNDQ0ODcwODc0
-OEQ2MDgyOTVFM0I0MzVCRjJCNDdDOTFGRUYzODVGMjczMUU5NQoKMUY3M0ZBQkNDODhDRUI4
-QkE0OEEwODdCRUEyREZGQTkzMDFCNjBDNEFCNDI2QkRDMTA0QTI0MTFFRDgzODA4NUZDMDZD
-RTNFNEU2OTA2Cgo0RDdFRjNGMzAxREQzQ0EzRUFFRjQ5OEU2QTdCNEIxQTM2RTk3OTBFN0Y2
-OUVDRDVFODk2NzA1MDgzNUNFNzc5RTNCNDQwMTRDMjdBQzAKCjQ1NkE5NkI5RTI4QzcxRjMw
-MDMxQjQ5RkIwMERBMTk1QTMyQzQxNzVCNkJGQjI3OUZFNDM1RUU5MkQ0RkQ1OTYzRTQyRkU5
-OUQ5NTQzOAoKNzQwMDcwNkMxNzU2N0IxRkI2NUM0RTkwQUFDMTBDQTYyODAzMkUwNDkzQTk3
-MUJENTVEODNFMUFENzBCMjQwQkZCNkVFRERENjI1RDRFCgo0Q0Q2RDQ4OTU2NjhCMTQ0NkRE
-RDIzNUU4REU0NEI2OTRGM0Y5M0FBQzJCQzBEMDRDODcxRkZCRjVEQkExQzdFRUUwQkY2NkM5
-NDlBNTgKCkIxNkY1NTQ5N0U4MkFDRDQwQkUzNTZDQUQzRUJENzA3QzAwMjBBQ0Q0MTBEQzZG
-RkM3Q0M0NjA1MjVDMjAwMUEwQjRBOEI3QjExNDkzMgoKM0E2NUZCNjVCQjdDMjBDQkEzMDVF
-NTNBMzEyRTk3MTlBMTVDNDVDMzlDODVBNEYxRjAwOEMzNjFCMTc1N0RDMEJEOEMxMDIwNEIw
-MjE4CgpBRUFFMjlEM0ZDNTVDMTJFOTk4NUVGMzZBNDUwNDZGNDY2MDY5MjQ2MzZGN0Y3NjQ4
-MEZFRjdGOEQyNjRDNzMyNjZDMDVBNkRFNjk5QjIKCjM3RjZDMURGNzc3MzA2QkVGMUUwQUM0
-OEE2QjE1NDhFRDQxQjdFRENFNzA2Q0M4QTY2QjNEOTQzNzIxMEM5RkNGQUM5NzhDOEY5RkVF
-QgoKOEUyMjBEMDI0QzA0REFDMkNFNjJEQzhBRkJFN0FENDU0MEI1RUQzNjY4RTdCNTlGQkEy
-OEE3RjhEODIyREJFRjg0REZEQjcyNTY2RUM1CgpENjIyM0ExNjU5NTk0NDNBMkY5ODBGNkQx
-NkM4MTg3QUQzMjFDMjdBQUNGODg0MzM2RjdEODE1NEQwNkZBNDZFM0ZGNTFEMkRDMjYzMTMK
-CkZBODEyRjlGMTUwN0ZENzVCODA0MTFERUY2OUZFMjY4QjlBNDU4NzE5NUU0NUIxRkVBQ0Iw
-Mjk1QzYzQkE4QTRDRkQ0N0U3QzcxMTUxMQoKQUVCMDBFOTNDMEIzNTlFQTBERkRBRkY1REZD
-MDg1NEUyRkM2M0FFRkQzN0RGNDczODU5QzA0MEQ2RThEODJGNjQwQzE4MTVEM0Y5QTUzCgpB
-QjNFMUQ1RTFGMEIwRTEyNTUxMEYyQzZENTAzQzRDQTUxOEJEMzY4OTJCODNBRDMxQjM3MzQ4
-MDRGNzI2MDA1NjJGOTI0NkZBMkI1QjgKCjU2QkQ1NTIxMkNBMjdENzAwQTc5MTNBRjUwNUJC
-RUI5QkMzQjJFRUMxM0Q3Mjg5OTk3QUJFQzA3ODgwOEM3OUY2NTkzOUIwN0EyNjE5QwoKMEVG
-REU2RkY3QkFFQUVCQjNBNEEzMjE4NDZGNjM5QTcwOTZFNEY3Njg4RTUyM0RBMTkwMUVBM0ZG
-QjZBNzExMTBCNkNBMkM0NUQxRkM1Cgo0OUFDMzJGMDNGQTVBQTc5MTVFRjQzNzcwQTEzQUE2
-OEM0M0Y0RkEzREVENTVEMjk0MEY3NjY0ODA3NkQ5NTVCNTA5MjE3MjU0MTI4RjcKCjQ2QzNB
-MkFDNDdENjgzRkJGQkUxMjA1NzQ1NDQzNTk0MUNERTY2MjIyMEFBN0IzNTZFNDcxOEQ1OTFC
-ODFBMDZDMDREQ0E4M0E4MTRFNQoKQUZCQkI3NThFREYxRThERjFCRjYyMkQ0RTRCQjYzN0Uw
-MTdFNEU2NkY2MDY3Q0VGMDY1MEVFRDMxQkNCREM2OTQ3REFEQjM5ODIzMjlECgpFOTAyRTUy
-MDYyQ0VEQkVCNzc3MTU3MzVFNjk4RTQwNDQ4RkVDMDA4NDJCQUUzQkFBMjA3RDJCMjhFRDNC
-RkUxQzFGRTQyODQzOTQ3MEYKCjRFMUQ4MzU4RTM1RTRCOTdENjFFQzZBMTI4QjQzODNFQTAy
-NzZBOTQ3QkM5RDE2Nzk0QzNBM0Q3REIwQkI1OUZGNjQ5ODc1RTBBRkE0MwoKRTY1ODZGOEI0
-Q0E5MjFDMUFBRkMwRTJEMUM5NzBCMzgwOTc3Q0JBNTA1QjNENTMxRjM3ODkyODJFMjFEMUI1
-RDlEMzM3NkVBRDdFNEU0CgowMDA4NUM0N0NCODU4REE5NjBCNTVCRUEwN0UwQjAxMkJFM0Y1
-NjIwREJBMTY3QzEwNUI5NUZGOUI1RkREMjhENTM1NEM4NzdFNTY3MTAKCjFENDVGOUFBNDcx
-RDI3MTgzQTU1QUI5QjM0RDYyNjgxNUQzMkNEODI0QTRDNDY3NzJEOEZDNDkzMTM0MUUyMjcz
-MDlFODMwNzgzNUZEMgoKNTM1OUExMEY4NEFENTc0NEI4MTgxREFENTkxNzZCNkI0NjY1OTVC
-NDIzMzE2ODNGNTc1NDZBQ0E2MDEwNjY1NEM5QTFFNUYxQkQ0N0RBCgpGOUY5MzU5OEU3NUNG
-MDMyMTk4RDY5QTFDNEIxNTJBMjk1ODYyMDk5MDNDN0JGMTI2QkRFRTVBMzgwNkJBMTc2NkJC
-MDJGNUQ3NUUzM0QKCkIyQjAxMTEwNkZDM0M5NjRGOEZBQTlFOTg1N0JDQUY5MDM0NjNGQTdG
-QzM3Mjk0RTRGMEZGOThCRUEyMkZCNDRGN0FFNUU2Nzg5NjU4QgoKQkFCNUMzMEQ2QzMyRDVF
-MjRFMjY4QjU0MzUzRDEyNDVFRDc4RDFENzM4NUVCRUVBNDlFQ0U0OTZBNDI2MUY5OTJGNjdC
-NjY0Nzc2RDZFCgpDQTFDODM1MjQ5OUJGM0NFRUYzNjVFMTUyNTgyRjk4NTkwQjhEOTAzODY3
-QjY1NTcyMDBCMTA3MEQ5MUVBMzJFRkRBQjA1ODA1NTlFQjUKCjU2QTgzNUY3NEJGNDU4Njkz
-RjA5MzM4OUVFMUQxQjFGQzFCRDJBQzExNDZFQTlDNUU0QjE0QkYyNkFCM0VGQTBCQTBBQTE4
-MTNFNkM2MQoKQjcwMTFBQzMzMEIyOTNBNUNDRERCNDE0MTJGOTdCQTAyRDM4RTUwMkQ1OTY5
-MTJEMTY1RjZCMDMwMDIyODg5MTIxMERCNzAwRTk3NUJCCgo0NzQyNzM4OEQ1RjMyNDZEODBD
-Qjk3MDNGRTVGMkIyQ0Q0MDg3M0FFMDUyMTg1MEQ0RDY1NjE3NEI1MkYyNEMwNkFGMUQ5RkU0
-QUJCRjkKCjhCNDMyQjYxNTBCMDcyNUUzMjhFNTRCRTM4MkExNkQ1REY2QzQ3RDlERDE0NzUx
-Qjk2RTJEQkNBRjRDOTg1ODMzNkY1MjcyMzhFMjYzQwoKNTg3MzBDN0UyN0RBMUIyMUFBREJC
-NDgxNTRDRTVFOUM5MjY2MDM5NEQ3MjgyRkMwNzkxN0M5MUQwRTkxREFFM0ZGN0RFQ0ZENUU4
-MDgyCgo1NjNFMTY3M0ExNUNGQzA2OUUwOEQ1NTRFM0I4REY1NzAyMDlENTY3QzY1RjNEMjZG
-MjUxQjQwNUZBRTVGNjEwNjYzNzcyOEJERUY3MzUKCkVDMkQ1RTdBQTNGMDA0MzRFQjU4QzMz
-MDdEMjIxQzEyRkVGNkQ3NDFFRDg3MDgxREQ2QjkzRDJFOTI4MkQwOUE3MjYyRUZGQ0NBRkZE
-RQoKQ0VFOEM0RTk0MkFGRkQ4MjE1Qjg0RkE1N0Q0MUY1ODE1RjNBMzE5MUJDMzc5RURDNDU0
-MjUyRTY4OEVCOTc4OEE1NTFBMTc4NzZBRjFCCgowQTVFRDVBNjJFOTJFN0RFMzMyRUQ4OUE5
-QjRGNDA2NTUyRjlCNzA2QTZGQUQ1OUE0MzNGNzJBQjZENDQwMUUyNUNDMzdDMEZGOTE3MTMK
-CjRDODM4RTVDQjNDRDVBRUI4NTU2NDQzQjFCRjUxMzkwMEYyOTNCOUJDRjMzRjk2NjA4RDFC
-MTA4Q0Y5QkM3REU5NUY0QjUxOEE4Njk4NwoKMjhGMjA3MjlENjBFNzVFNTM0NzY4NjgyMjBC
-NjRFOTA1QkJGQkU4RTI2ODA4RUFFQjBBNDZBMUUwOTZFRjg2OEVFNDQxMEVCQzg3RDM2Cgo0
-NjAzN0FGQzZEMTc3RjQyRjhEQUI4RDVDODgyMDBBRUExNDM4OEFGMDlFQUY1Q0EyNEQ3MkEx
-NzJENjU0QkUxOThDQjQyNjk0OUM0RTMKCkQyM0M3RDQ5RjRBRUU0RDIwMTI0QjU4MzA0ODBE
-MEE4Q0QwRjdFRkNBM0ZEMjUxQzYwOUQxMjREMEJCNEU3QTZDRTg5RUE3QzkyRTBFNwoKQjlD
-Qjg3MEUxMjdFMDMzN0EyRTY0NUFFQzI3RDFCMEQ4NUM1N0QyN0YwRjdBQTFFODQ5Q0YxRjRF
-OUJERjAyMjk3QzNFNjEyOTAwMTBECgo0RUIwRjMwNjk3RDMwRUNDRDFFREUxNzY2QkMxMzdG
-MkUyQTNEN0NFRDI1QjFCQTI1OUQxMDBCQTE2QUMzRDI5QzAxREY4M0RGRTVCMjQKCkRDQzlG
-RkMyQjgwRjYxRTkxRDJFNDE1NjAyNDFDMDBFNzlEQTk3MEEwOUQ4QUEyMjlDQzJGNUMxMTRF
-MDcxM0VBQUI1NjA0NDJDQ0U3MwoKOTkzRUI5ODgyRTdDMDI5MkYyNDhDMDA3MTdFM0ExREE0
-NkFCRjNGQzcxNjIyNkVBQUUzNUU4RjIwNzI2QjFBMDQ1QTIwRjgwQjAyNDczCgo4QjdCOTNE
-MEU3OUM2RkExMTc4MEE2Qzk0RTY0REU1M0ZFQUUwMTlFNEQ4Mzg2MDdBMDVDNzc0NkEzMzg1
-Qzk3MjhDQTI5RDhGNjQzNzMKCkIyNTMwNzI3MkE3NzAyODgxNUQ4MDQ1MTA2MUIwMTBFQzhF
-ODJCMEI3MDI0M0Y2NkI5N0FCRUQyNjRGN0I1M0IxNjNERTgyMDQ3OTZCQwoKQzU5M0NBOUJF
-M0Y0M0UyNjcxM0RDQkQ5RTM0NDlGRDMwMEY2MTExQTUwRUREMkY5Q0NCQzZEMDAxMkE5NzNC
-NUY2QTE2NTEwNzRGRDE0Cgo3NkJGNjk0NTY4NzBDNTIyODU5OUZFN0NDMDk1OUY2ODA0NDk3
-QTI4RTNBQUIxMjkwMjQ4MTZGQkQzQzAxMDFBOUI3MDlEREUwQTkyQUIKCkYwQjI5NDhFMDk2
-NjI0RDA2N0YxN0E4Q0YyRTgyNTFBNDA5NjlFODU3RDg2NzM5ODgzQjZCNDY5NjdFQUMyMjg2
-QkQ0NTFGMjZCNEExNgoKMDI2RkM1RjNBMDg3RjRCRTIxQTkwRDMzNkI2OUM1MTE3RjNBRDUz
-MkFGNkUzRkU5QzhBNDg0RDM3MkExQzhDMUEzNDIyNjREM0MzNzgyCgo0RjNCNTgyRDI4ODU2
-NDJEMkIzNDQyMTIxQTdGM0JGQ0JDQTM1RDA5REFGQzRCOEFBOEJBNEUwQzExMzlFM0YyOUFC
-RURFQTgyNzMyRDYKCjM4MTBGN0ZCMkE0NjJFMTFBMzJERjJFNzQ5MDRBQzdDNTcwNEM1NDVG
-RDZEMDhENkQxRjZGMDdDNjlCRDU0MThFODJGNkIzM0MzNkE5OQoKNTA0NEJBNjYwQURERUIy
-NEM3QUQxMDg4OUNCNzg1MTY5OTYwRjhFNkVFRTlBMzIxQkFBNzg3OTRBRjA4NjBEQjUyNzAx
-OTNDREM5QzBECgo1REFDNDVBMUU2N0ZENjA2M0ExOTk4RDA2MjRBNUREREVCQURDOEM0MjMx
-ODkyOTUzNUE2OTM2Nzc2NzNCMjRDRDJDRDI4NjkxNDhEQkEKCkMxRUE0ODZERUIxQjBEODNF
-Nzc4NUYxRTFFRTY1QjlBRTNDODM5Qzc0MjcxMDhDMTNDNEI3RjY1N0JBOTY2OUQxRkQzRTNC
-RTVGRUU1MAoKQUEyMDk0NkVFMTczQkRDMEE5Qjk0MDc0NEFFRUEzODQ3RDU2REU3RTg2QURE
-RDZGNjMwMDBDQjA0ODQwNzA3MEFGNjVFNEJDMDk3MzQ3CgpDRDgyRjYwODREMjBDNTI5RTM1
-NDkwNDkyRTUyOTNGOTc1NTRGOTk3OTQwNUNDNkZGN0Y4MDFDQzNERUE1MERBRjlCRkVGRTg2
-MjNCMkMKCjhDNzU2MDc2NkM0MTE1RUVGQTQwQkY5ODA2NDdGNkQzMTg3QTY4OTI5NDA2MERG
-QzIxNEUyMjQ0MTA0NENCRkJCMkI2Mjc0RURENDRGNQoKMjE4MDU3ODY5QTQ2QzUxNzEzOEU0
-Rjg0OERBRDY5RjI0MjA4ODk2QzhERjg2MEYwRkY3MUVGODkzMTBGMkQ4MkVCN0FDRTZBNzI5
-MjhCCgowN0NDNTdBMkRGNjQ0Mzc2MUQ5MTI4M0I1OUJEMDA2NjUwQ0RGRENFRjhCRDY0QTBG
-NjI2Q0VBRDc3MDU3MkQ0ODlFOTE2QUZBMUFDMjYKCjhGNkQyMkYzRjM3QjYzOTI4NDcyQjgx
-RUJEMjg3RjY2MTk5MDBBQjVCMjkxQTA0NzkwNkFBRUUyQ0Q5M0Y3RkRCRjE2NThERkVCOEQ4
-QwoKRDdFRjk4N0QwRDEyMzVGRjhERjIwMkY5RTgzQUQxNTQ1MDA5MDk5OTZGRURFQ0RFMEVC
-QjJGOTVGNjk4MDVFRjFGNzc0RDREMTQzQUFFCgo5QTUwQjY0QkQ1MTREODNEMDBGMDU3MTVG
-MTYzQkM3RjY0QjkwNjYzQzU5NzFENkE1MzkzQzFENjAxMTk3OEVFRkZENTdBN0I5M0ZBNTcK
-CkU2Q0UxQ0JCQTMxREQ1MTA2OTZBMzQ0RUJERkFDREI4N0FGREI2RjQyNUJDQzEzQUQyNDVF
-OTI2NDQ2Nzk2MEY5NTFBRDc5N0FFOUQ5RQoKNjMxMjY1RUQwRjEyRDRBQkIwRjYxODlGRDk0
-MzNBMjM2RjAwRDAxRkEwMzhENUJDRkIzREY2ODM5NzYxMDcwOEE3NzdGQzMwMjFCNjg1Cgo0
-NDg0NDVEMzI2RUE3NjQ5NDA2QTg4REEzOTI4NTdGRUE2MTU2Njg0RTM1NDdFOEM3NTdCQzM4
-MjIzQzBDQTI1NjlCRTQzOEQwM0I1NzUKCjcwRTgxNUQ1OEJEODJDMkVFQzg2MTAyMEMxREJG
-MDczRUZEOUM4MTM2QUJGMjYzNDYxRDNBRjc3RDA1N0Y1MDIxNDkwNERERTUxQzNBMAoKNjFB
-M0ExRTFDRkU0MTNFOUExNDhGMDVBODEwODYwOEVGN0ZEQjk2RjM5MkU3NEVFQkM1QTREMzU0
-QkEyQUU1Njc4RDI4QUVDMDE0OTc5CgoxMjg2MzA5ODRFRjNENTU4NkRCODc4M0YwNjAzRDcy
-MTA3ODJERTk3OUMwN0JFOERENTg5QzcxMERENDQzOTQ1NjlCOEJERTc3MEJEOTAKCjM1RkFG
-M0NGQTQ4MDcwQzVDREM4Q0JFQTJCNUFCMjYyMEQ0QzQwODE4QUQ3NDA5NjZCNzMzQjk5RThD
-QkFCNDkwOUY1RUY1QjU1NzVFRAoKMEE4Q0U0NjM1RkJFOUQ2OUU1Nzk5OUIyNzM5RjI4MUNB
-NEJFRUQ2RkYyOTQ4Qjg2NzA0NDZCQkIzMEQwQkE2Njc5QUEzOEMyREEyQTMwCgo5NjA2ODdG
-MkRDRjBDNzQxNTM5MTAyOTY4QzhENjU4MkU1NTk3NDgxMTYzMEIwRkQyMDkxQjYzNDc3NzQ3
-RjQ1Q0EwQURDMjMyMjFBQjQKCkMyRTk0RURBRDZGODYyMTE5RjEyN0E3OUEyQkMwNzMyNTRF
-OTQxQjM3QjgzMEU1RkI1MDRCMjZFNTgwMzIwRENGRDVCMkQwM0E1QTZCRQoKM0M5MzUwMDMx
-RDdBNThGN0IzNTFBOUY5MTdBREVGQTcyRDgxNDkwQjMyNUM0QzFFMzkxNzVEMUQzRjczOTRB
-MDA5RDA0QTdCNzA2RTFECgozQjZGNjFCRUEwOTZDRjREQzUwRTRDNzI5OTk2NjdFRUM4Njkx
-MjVCM0VCMTUyRTNFNzI0MDk2OEY5QjkzQkRDOTFDQzVFNjI2NTREN0IKCjQ2RTJFNjBBNEQy
-MjYwMzIyQjU2M0M1NDNEOUUxNzFENUYxRTgxNkU3MzIyMjcwOUExRTJGMTQxMTIyMDkwODk1
-NTREREVFMTdDQ0IxQwoKRjA2NkQwQUExMzg3NTI0RkM0QjJCQjQ3MDcxNDA3NDI4OTAzQTFC
-OTcyMUQ2Q0U0MDQ2RUMyRkU0M0I5Q0Q5NDA5QkFDNDFCNzZBMjdCCgo4RDRDRjNEQTQyRjlE
-RDhBOEE3NTFEQUQxMDNGMTY5QTE1MjREMDc4MDAyMkY3NjRDNDlGRTlCNDRBRjgwRkFCRkU0
-OEJGRTQwRDYyRDQKCjFBQTA2MTgyNDVBRDdCRkFEN0MxMDVBM0MwNjQ0OTNCMTA5Rjc2NUVC
-MDZCRkY1QzFDODEzODI5NkM2MzVBRDYyNThGQjA4OTRDMkRERAoKQkQzN0M0NkZEMjIzMTFE
-MjY1QUU1MENGMzkxQzg1RjZBREY1OTE4MUVFQUI1QjY1RDFGODExNDlBQTU0MjVCMUMxMUE0
-MzIwMzJDQUEwCgozRUIyRkE4MjA0RTlCQjY3MzY5OThERTlCMTJFOUUzN0VDNjUxNTYwRjRF
-OTA2QjM0MkE3MjVFMjEwMjFCODJCODQyNDlENUMwRjZEOTYKCjMzQzQxOTYyNzlFNTY5REIx
-NjU4NTg0M0Q2NUZBRDBCNUQ4OTNCQjBBOUQzODEzMjRGNzZCNjFEQTg4REI4MTg4RTU5QzRC
-QTE1RUU1RgoKQjI4OTJFNzI2MEY5RUE5ODYxRTQ0OTIxRUNDMUEyN0Q3OUIyNTA1MDYxNTg1
-MkM4MzhCQzNCREI0RDlBM0I4MUFCMkRGRTc2NjdFMkFCCgowNTkyRTREOEFDNDE3MjAzMUUx
-Mjc2MEYxNEFFMUMwNThGOTg2QTIyNjk5RTAyNEU2QzZDQjUwQTQzMDY2RjFBMDMwNEFBNjdB
-QzQ0Q0IKCjM3OTgxNEM3OTExMDNCNkMyRDRDMTQzOUZDMzA0NkI2MTFGNjMyNkE1QkJFNjk3
-Mzg0QTk3NkQwRDAxODE1QjkzM0VCNDczNDk2NkQwNwoKRTFENTA5NDcxQkZBRUVGQkQzRjk2
-ODlFQUY4MkIwRTlBQURDMjM2OEFFNTJBQTQ4RjAzMThBQTFCQ0M4MUMzRjJCODlENDhDMDhB
-MUY5CgpCQTREN0NFODZDNUU5MTNBODdBMDU2M0Q3NzkwQzQ3MURENDdDQkRCMjczQUEzN0NE
-NERFNkJGREJBNDA3NDgzREUyNzVGRjU3RkFGOTMKCjIyNTkxQTg1MjNFNzdBMzM0M0NCNjEw
-MEFGQjYwMzUyMjNFMDVFRjM1MzAzMTM4ODVGRkM2M0E4RDcyREUwOTlDNTBBNzc0QTYwMzA5
-OAoKNTlFRENCM0M0RTQyNEM5MDczRTBCNUIzMkQ5ODhGQUQwNEVCNDg2RTY1QTNFQTdGRjdE
-QjNEMkZERkFCQkM5MkRGNkM3NDJFQjZGMDlECgoyQTc4Mzg3REMwQ0E4NTYxNzQzQ0I5QzhB
-RDk0OTQ3MkRBRUM2NkFDQURENDM1QzgxOEQyODEyNzc3MEE4REEyQTUwOTBDRUNDQkUxNkEK
-CjUxNkQ3OTg1RDdBNDlDN0VFOUQwODg1NDQzNTAwOEFERjI1MDQxRThCQTU3NDQ1OTFBQjdF
-MjJEMzcwNUVBQ0JEMUQ5QzYzNzhGMTcyRAoKQjgyQjJDN0JDNTEyOTNGNDAwNjQzMDZGNjkx
-MDNFNkEwQkMxQzEwNDZDMkEwQUZBMkUwMzg1NTBDMTk0MzU0RUI4RTI2MzA4NUU1MzkwCgo3
-NDlFMkM5OEY0M0VBNjhENDY2RTQwQzVGRUZFNjc2NDkzOUNGRjgxNzgxNEI4NUJBOTI4QzU4
-NTlEMjA3MDlENzhDRDUwQjk1N0U4MDkKCjBGMzdDQUUzNkIxODFDMzdFODBFOUU4NjkwRDJC
-OUYwQzM0RDIwNEI4RTRBNUExNjRDQUYyRkE0RkM2QURDRDc3NTA5RUFBNTIzNjIzMwoKNkU5
-REJGRDFGREExQ0YzMkE5RTk4MERDQkY0QjdDMzM4Q0QxODM5OUFDRTUxMDg0MzU3NjdGRUE4
-NDE0NTg1REU3QzNFMDg1OTBCMzdDCgpDQTAzMThBODJDNjlBRERGQ0VBRTE1NkU1RDFGRTNF
-Rjk1MjY1MTVGRUZGMzU2RTAzNTFDREQxRDNBRDM0MEU3NzI3QTQ3ODI2NERGMkQKCjQ5MTI1
-OUYwNUE2NTA0MDkzOTQ5NTAyRThEMTAyNTA1NTZCODdBQ0JDQTdFQjkzOEM2MkJFMEQwRERB
-NEQwMkE5M0UxODc2OUI4OTVDMAoKNEU1RkMxQjIyOUZGNEEzRDcwNzBBMDg1NjI5MEJCRkYz
-NDYwQzVFMUFGOTIzNDZFNzg3OUYyN0RDQ0Q4QTUzMzg3OTE2NTZDMzc2MTI4Cgo0MjFEQTRC
-MDdBNUY5NjE2MEYwNDIxQUUxMEMxRjE2NzVEMzk2QTgwNjM1QjdDRDFCRkE0Q0M1NjQyNjNE
-QTVDMEM4NEYzNzg3REM4RDAKCjhBQ0FFREUxMTQ4NkMxNTVCQjFCMTY4MDYzMDNCOUQyMTk3
-NENBMTk1MTZDNjM0MDJBOEYwMDY3Q0VEQUY2ODJFQjJBMjEyNzM0OERCQgoKNUE2NjJCNUU4
-N0E1Mzc1QjM5NkIxMTUzQjg0MzMwMzUwMUVEOTM1MzRERjdDN0ZDQTA5RUZCMDI2MTMxMTE1
-NUZDQkEyRUE5NzY2OEE0Cgo2NUE3NzUxRjkxQkNBNTY2RTQ5NDY1NjVCQTFENjY0Q0Q4RkVE
-MTlFODRFNzU2MzIwNUREN0FGNzdFMkE0Q0JDNjg0NkVGNUFEQkQxMUYKCjE5NThFMDg2RkQ3
-NjczRDVBQzk5Nzg2N0VCMDIxNzMxNEYzMkQ2MDM0MkZBQUZGRkY5NTdGNjBEOUIwQUM1N0U2
-MTExMzdBQzY5NURFRgoKRTMxM0JFQjUzMzRCODM4RjgzQTU0QzNFRDc2QUM1NUM2NzU3MUYz
-NjdBNDA5REEwNTJBMDM1NDgzN0JERUU0RDExQjQyNkRDOURDQzc0Cgo2MUE2RjQyMkI5NURG
-Mzg5NEEwMDJCMDJCRERGRTNGRUJBOEQ4RTNCQjc1NTZGNTAxQTgzQTEwRkIwMTM3RjQyOEZD
-NTIyMjYwRTBBNEIKCjE2NTUzOTk0OTBEQTgzQ0NFQUNFRDE0OEFGMUY0NDdDOUJCRkUzQjE1
-OTM5OUM4MkVBQjI1N0JFNTY4QTREQUQ2OEE2NjRENzM5NzM0MgoKQUFFN0QzODIyM0NEOUFF
-RkNGRTVFMzk5RjFENzA0MDRENDcwQTFDRTEwRDQ2Q0FGRjVENTIyMzUyQzUwREI4RkFCRDcz
-NDhGQzZDRUM4CgozNEQ1QTgyQzA0RERBMTA1Rjg1RjQ1MEU3MzYzRTRFOTg5QzY3MjVFNkJC
-Q0Y3QUE2NjgwQzk3RDEyOEZBQUY0RDZFMzg1OUYwM0IwRjUKCkEzQThBNzBFMEM5REFFRTg0
-QkI5NUY0MTkzMUEzMEFBMThENkM1MUQ5REQzRDNCMEFEQzdEMEI1RkYwRDBBODg5QTk0NEM0
-NDY4Rjk2QgoKOUU1OTUxNUJCQTVDODZCREM1Mzk0QkM0MEI4MENCREExOTg1N0U5REZGNDFF
-NzU4MDJEMkEyQzAyNDcxMjJDRTk0QTdENUREOEY1ODQ2CgoyN0FDQTBCRTVDMDQyQTAyRkI3
-MzYyQzM0NjE0QkNEMTczNTBBRkIxRjBFRkRCMDlBRTJGMUMzN0ZGMjFFMDA3Q0Q0REYxNzI5
-QUQ5MzIKCkZBMjBBOEY4NUMwNjIwMUY5NjIzRDk1OUI5RTRBOTBDRDA0QjZFNEFFMkMxNzk1
-ODI4QjAyMkQ5OTBEOTM5RDVEMTk5MkNCMkRCODA3RAoKMDcyQ0VFNTgwRkE5QTc5RjA3RkQ2
-QzQ5ODBDOTk3RUM1MjRCNTdCMzUwRENFNEY5MDEzQjVCQjA3MTY1REQ2RkExOTAyODY4MzI4
-RkE4CgowRDNDRDc3MEI3ODM4MThERTUwOEU1OTM4M0M5NkEwNUZCQkE4NDA4MzFFMTI5RjBE
-QkREN0I0QUIwNTgwMUU5OUU5NjhFRUI3QTAxMDYKCjVBRjA0RjExQzY0MUNBREJFNzQ1RUI2
-RUE3NkNFRTFBQTg1MjRFNDA1RjIzQTlEMDY4Mzk3NEE3ODg3OTI5OTYwMEJERDA5MjRGQkYx
-OAoKOTA4NjI1ODcyQTYzQzM4QjREREJCQzhDNzY0RUJEOTlGMDg3N0ZBREI1OUI1RjFENEZE
-OUZEMkZDMUZDOEM0RjA2OEI3QjIxQjM3ODdGCgo3MjhDRDhDRjVGNTJDRTRBNzYwNzQ2MjQx
-QzRBNjk2RjZCREJBRDU4QTREMzUwNDFENzQ0RkJBQkRBMkY4ODNDQjQ3NUU1Rjc1RDFFQ0IK
-CjkwNTZDM0U1Mjg3OEZBMEREREFBMzAzNTc5MDY1NDNGODQ0MEQxRkVCQzAwMDI5NzY3NkUz
-QzVBRDQ2MkY4MjVGMUQzMDJBMkM3MDIxRAoKNUE2MjU5NTM2M0E3OTFBOEVEQkIyMkVEQjlE
-Qjk2OEJBMEVFQjRERjY2RTQ2MjJBMDRFQjlGREIwNDFERkI1MjdDRDQwNEQ2MkU0ODk4CgpE
-NUU3RUQ0NjRCMEMyNEQ1OERBRkNBN0U4OTE0ODEzNjM3NjFEODAzQTk0NTdCN0EyNDAzRTE4
-MTZGQzY3MTY3NTcxRDQ0RTI3NDY5RTcKCkIxQkMzQUI4NUNBRjgwOEJCNDA0MzUzN0QxQjgw
-Q0M0OTA5NzBEODdBMjA4NTdEODY4Q0JFOTAxMDc2NDE5NDM2QTRFM0M5NUM3QzlCNgoKMEUz
-Q0VBQzdEQjE5ODU5RURFMTQ5RkYzRjA3QkE1ODZCRTEyNjk4RjVDMENDOTgxNUZGMkE2QzYy
-RjdERDk4REFDNjM5MDg0Q0E3MDAzCgpDOTlCOTE5NkNFNkE2REM1OUNBMEIyMDJDOUFGNTQ2
-MjBFMzhBMDcxMkFBQzZFMDFEMjcxMUQ0MEQwMTJGMTVEQ0M1MTY0NzcyMUQ0RjcKCkYzMUUy
-OUU2Q0Q3RUJCNTk4NDJCMDFCRkY4QzdDNDI0RjBFNThENEZEMTVENTZEQUU2MEE2NDUwQUYy
-MjU0RDM2OENDRDA5Q0MzRkE5MAoKMTIzQzQ0RUQ0RERDRDdGMDlENDZDMTM1NEU1RkMxQTZD
-MTkwMUVGQkRGQkQ0RDZBRDgwRUU5NUVBMUI3MjZCMjMwOUMwNzIwNDI0Q0QyCgo1RjcyRDlF
-NUJGMzhCNTEyNzFGRDIzRUVBOTMwMTMxMTRCMzU2MzcwQTNDOUQ0MzhFQkZBMDU5MDE1ODY1
-NEUyQTNCN0Q0Qzg4NzkyMUMKCkY2NTM4RDFCQjI5NENCQUM3NUNBNjZDQ0RERjBCN0Y3REYx
-NzQ4OTQyQTkwOEMwN0VBMTNFNkI4MDlCMTM1MEI5RDczQ0VDQURDOThGQQoKMzU5MzNBODFB
-MzRCN0E2RjhFREM3REMyQUY2MEIyRjA2MzI5NjJCNDAxQUFGRTA2Q0JDOEVBNERDNjM2NDA2
-RjJDRUQ1RkFFN0FEMEQ5CgpFRDUwMjM4MTM4NTVBODMxMTk0MjNFNEExMTRCNDEzQzNBMDE2
-OTY5QTc0ODFDRTQ1RTRFMDYxRUQ5OTgwRkQ5NjE0MDRCODk1RDVBN0UKCjE2N0I0RDMyRTE1
-M0RDNzc4RkNGNURBNUVERURGNjhENTcwNzY3MUIyM0RGMjg3MUM2M0ZEQkQ2RjlCOUJDQTlF
-N0JCNzc2QjM3MTA3QwoKMzg0ODQ0NTNGMjRCNEEzNDIxQTIxRDg3OTdEQjgyMjIzNkNBMUEx
-NUQ4NzE5NzI2QzU5RDUxRjczMzIyNTlFN0NGMjNGMjhGMUQ5MDNGCgoxMDBGOUIwRThEOERF
-NTZDQTNBOTlDQTVCNDBEMDYyMkNDNEQ1QUU2QkE3NzExMkNFQTc5QjEwRDBENUE4MDhEQTIw
-RDc2QjU2RkM0OTkKCjIwNjU4N0Y2QTBFQkVDQTEwQUY3M0Y4RTA5MUQ4MjYyMkJGQUJDNTJB
-MjhEQ0M4QzI5NUEyNDA0MTg2OUU2MzYzQ0Y1ODk2NzBEMzQ3MQoKMUYzQkU2NEQwMkM4NjEw
-NTlGQTlEMTAwODFGRDJBMEVBMTM3QzM5QUNGQjJBODNEQ0M5NDg2MTk1RTQwRTk5QzBGMjg0
-MThCMkMyOUMyCgo5QzAxQThDRTREOThGMjlBMjJFNThDQUE1MUU5RUNBRjRDQTg1RkI1OUUx
-OEMyRTUzODczQTY0MkUzMUJFOEU0NzU5MURBNkVDNkQ3QzQKCkUxMzA1NUI4RDA4RDZEMUYw
-NjA4QTEwODBBMzg4MzEyODBDOThEN0Q0N0NGRUJEMzI1ODQzMkFDMzk2QkJGOTVCNzdFOTQ3
-MEJBNEI2QwoKOUEwNTJDQzhFQkQ3Mjc3QzNCNzg1MTRCREM0OTE1NzBCN0Q3QjQ3M0MxNUND
-RUVDQjREMzEyQzc3NUJEOEQ5OUU0NkVCRUNGNkMzNTMzCgpGRkZEM0U1QkVGOEQ3Qjk0MjQ0
-NDc5OTlBOTFDRTE4ODA5MThENzUwRUEzNDVFNkExMDc3MURCRUJEQjFCNENDQ0UxNDc0QzA3
-QTlDNEUKCkE4OTQwMTdCQzU5MzAyNENDMTZCNTk1REJDODM1RjRFRThEOUFERjdGRTg2NzFF
-MEJERjM2NjEzRkU3ODQ0QzU5OEE3ODlDQTc4NEI5QwoKOTdBRDIzNjFEN0NEQ0IyRTlCRDQ1
-MDMyQTM4RDZCMEVGREZDOEY2N0ZFRDhFQjNDREUyODBEODFDNkRDOTM0OEJENDhDQzU4MEQy
-OTU4Cgo1NjU4QUNENEMzREJGMkQ3RDg1QTc4QkNFOTUxMkQ3RjdCQzJFREY3Qjc2Njk5NTQ1
-RjNCMUJDQzIwMkY1M0M4MTIzQjE1RjQ2RDhGODgKCjEwNzBGMTIzMkNDOEZEMjEyRjE1Nzg1
-RkVDRkM2QjgzQzBGNDM5NzE2QTg1OUI2NDIzOUMxRkE4ODBEMzJGNjIzNzZFRUIxMkVDNkMw
-MAoKMjM1QzlENTUwQUZFODRDOTgxMzI5QjRCM0RGMTdCQzBFNTdFNzJEODkwNThEMUQzRTZF
-REE5MUVDRkVDMEVDRjBCODAyRDQxQjRBRkNDCgo4REQyNTBDMTNBRUNFREVBQTFBMEE2RUUy
-NkYzMzUxNTcyODQ5RkY1RTYzN0E4OThEN0IwQTA5OUQ4NzAxMkUyNzQzOTZBMjdFMjlBMjEK
-CkRCMjk1ODRFRDcyRkI2MTRBMzE3RTQ3QzYxNzdBOUZCQjJFNTMyMEJDRDkwQ0MwODZCN0RD
-REU2RUNFRTAxRjU5NzczOEFBRERDN0Q5RAoKMzNCMDJBMDlDRUNBMkEzODlGMTZBQURDRDJG
-QjAyRUYyNTdCQUIxMjY1RUNEOTdFMjVGMERFMUM4RTc1MjZGQjVGOEMzMjhGRTM3MDc4CgpB
-OUQwRjMwRDgxQjkwQTk3QTc1MjUwNUM4QTJGOEM5QzcyMjZFMjQ4QUZDNUI0MzE4RUI0MDdC
-NkE1RENFMzNGRjUzMDk3OTQwNzM3MzcKCkY3MkNCNTVENzNGRjY2RUUxQzA1NUI5QTNFNDkz
-MDJDMTFENzI0OEYzNkNFMjU3RkIwNTE2NzQyNzRENTFDQTRDMERFMUY5MjdBODgyRAoKRjU0
-QzU2N0I3M0ZGMUQzODU1NkNEMjI3MTZBM0YyNjlCOUZEREQyNjFGQkFFNEE5MTZFMDgxOEVG
-QTVDMTkzQUEwMDQ1NkRCNkY3ODQ1CgpGRTQxRjcxNUE4QzAwMDBFNkZBODE1MTg5NUIzRjIx
-REQ5QkVGOThEOUNGNjc0QTYwQzhBMTA4ODUwMkM2RTA5ODk5RDY0NTZGNEFFQzkKCjU4NzUw
-NjhFMjlFMjE5OUVDQ0I2MzJGN0E0NTkzMjQ1MTJBM0JCRTZFNjUxMzIyNjNFRTNBNEUyRkI0
-MjA1NTgwRjVERUUwODNGRDg0RAoKNDhBQkE4RTNDRkU4MUZCMTQ2NUQzMDI3RkM2OUMyNjA1
-OTRFRDM4MEM0N0I2QUUzREMyRTM1NjYxOTA2RDk4QzAxMjZGQjdBODBGQTNFCgo5QTJERjcy
-N0FFMzYwNDhGNkIwODNEOEQ4RDhCMUE4MDI4QjA3M0I5NkNFNEI1NDQ3MDUwNjY1QkQ5MjZE
-NUExMTUxRjNFMENENjNDNjAKCkZBNzdGRjI3NDZENEE5RTNFMEYyOTU3NzA0MDhDRjM0ODY3
-MkVBQzQ3NzI0NTgxMjVBODk3NkJBQzc1NDY5MDI1QjVBRThCQzU1NTQwRgoKNDEzMDhDRTMx
-RDI3MzY5MEM5NUQxMTczRjA1RDk1M0ZCQTI5MDJFMzY0ODg1RjgyMUUxNEZCODE1M0M3NDlF
-RkYxMDAyNDdFNEFCMzE1CgozMjFEOUMxOTJFNjhCM0ZEN0I1MTU0OUIyMjI0MTgzMTk1QTU0
-OTAxNkQyQTRCRjk0M0YzNzE4NDc0M0Q2RTU1NzVGNUExOTJFMjMyOTAKCkNBMjI3RTI5RjlC
-RjE1QUJGNEZBRDM4OEE5RkI2ODlBODA3QUFERDQ0MDQ4MTkzQjVCNUI4MUNBOUY5RDcxOTU4
-MDNBRTAyRDFBNkE0OQoKMDAwNzRFNDczMTM1NTRBNEYzQjg0MkYwODA1MTBDRTI3NjQ1QjY1
-QjU3NzYxQTM2NEQwRjg5MDExNUQ4ODM0RUVCREZBMjQ3OTIzQUUxCgozM0FFREY4QTQ2RjFE
-MUQ0MTAyOTZFMjVFNzlDMDFGNjY0MTM2RDhEMjE5RDMyNEZBOUIzMzQ5QjFENUQxODBDMDI1
-NDgxRUY5RTdCRjEKCjEwMEYyNDJFRTE2RUY0MzMwNTQ5MTNFMEVDRjI5QzRBMDgzMEU5M0ZB
-OTg5OEY3QjU1MDVGODdCRENDMDIxMDE1MzFDN0M5QzEwN0JFQgoKMEJERUNBRTVBNDlCRUI0
-NUQzQkMwRDg2OUI0NDFCQjQxQTY0QTIyOURGNUE0MENGMjU4QjAxNzgyMDNGOTEzMThEOTdE
-NTI5RDkyMkU4CgpBODJEMzZGMzRGRkY5OEYwQjBEQzA5ODQ5MDNCOURGRTg2OTMyRDk2QkMx
-NkM3NjZGQkFBNEVFODQ0OUREMUJBN0RFOUFCRUFENjg5ODkKCjhCREMyMTU1MzYwQzYzMTQ1
-ODU2OEU2M0I5MjlERUY5ODNDNkU1NkI1NjMzOTRCMjVBNDRCMjVERkUyQ0JGODYyNDREMjY2
-RTQ0QjZEMgoKREExOEFDQjRCMkY1MzdEQjY0MTEwRkM1MTg3RUNFMjBBNTE0Q0U2MTIwOTk1
-NkE2NTU1QjM1ODE4RTQwQTcwMzZCODQwMkM2RTdGOTU3CgowQkE2OUJEREZEOENEM0M3NzQ3
-OEVEODQ5MUMxQjcyMURDNjYwNzhDNTkwOTdGNEYzMjhCQTQ1RDc3MTFENUYxMDVBQjhFNUMw
-RDNDNUMKCkY4OENDODVBMkFEOUQ2MUIzOUI3RDVCRkQ0MUREMjI3RTUwQUM4MjQ0QTAwRDlF
-RkQ2QzEzNjc5QjQxNUIwQTBEQUZFRjg3RjJEMEU5QwoKRTFGRDgzNTczNkRGODY1QzE1MTYy
-OENEOTUwRTdEQkMyMTZBQjM1OUQ0NTc1QkM0NkQ2MTBENkQ0QTBCNTAzNTE5NjY1NDFENjBE
-MDc1CgpEOThDMUUyOEEwNjAyRjA4NzZDMzg3NzA1MDI5MkUyNDY5QjY2Qzg0NzM0MjAyNjZB
-QTg1NTVGMzlGMDFBOEMxRUEzNDNFM0I0MkUxQTgKCkYzNjJERUMxM0U2QjFDQTIxNTBCNTRB
-Mjg5NkQ0MTNDQkFCQzM3NTE1NTg3NDAwOTk0NjYyRjlEODkyQjFFQ0M1NjE3RDMwOURFOTk1
-QgoKRjg4MUJCMjdCMEQxRUI3RUM4MzE4QURDNzY3QTc2RUNFMzY5RTAxQkE4REIzRTQ3OTdB
-NzhGQzgxQTA4NTJEQzNGRjM3NThBNTE1ODlECgpCQjBDODk4MUNCRjc0MDc2RTgzRjQyMTA5
-REI4RTExQzlGQTA0MkExM0Y3ODY2RDM0MTM3RDAyNjgxQ0NDMkE4QTI0QkRBNDZFOURCQUMK
-CkJGOEQ3NzFCOUVGRUE0MTYxNjg5OTJENEEwQzU0ODk4NDhDNUZDRUVCNkZFRUQyNjBERjlE
-MzlGNTc2RUUwODQ5MkI1QkUxOEUzNEQxQgoKN0M0RjA1QTgyOEIyQTgyMDU2MzQ0MjhGMDE2
-OUI1OEM5NUQ2MDE5Qjg5OUZDRDE5MTBCNDUxOEQwQjYyODYxRkMxODAzMDgzNjE3ODU4Cgoz
-RDMyNzM1NTVENTQyMDZBQjk2MjRERTQ2NThDQ0FGM0ZGMkRBOEREQjA3QTAwNkY1NjlGMDVB
-RTBFQzVFOEJCQTY5RTMzNkI1QTFCQjAKCkE2MkM0REVBMEFDRkFCNjk0Mzc0NDg0RUIzRjUz
-MTgwNTQ0NTAyM0NDQjJBNTg4MzJBQTkyREE1MzZGMDU2M0FGQzMxQjBDNTM5QzU2NgoKODI2
-MzMzNjZCNEQ5REQ4QUZGRDA3MDcxQjhBMTcyMTIzOTAxRUUxMDRFMEE2QUUyRTNGRTdBRjIy
-RjIzQzNFNDQyMEYzQjFDMjZDREZGCgoyNTUxODZGMTAwMkZBNzgzNkJENDk2MzdDNDgwREY2
-ODZGMkZDRTgxQzNDQUQ3MkVFQzkxMDQ2QTNGMjU3M0YzQTY4NDQ0MThGQTQzMzMKCjk2RDI0
-QjQwMjcyRTNCNTgwQjY2RUZCMkFEQTRERUZBQjZEQUQwM0I3QzJCRUQwOTEwOEEzNTNGQzY4
-QTc3MDE0MzY1QkNFRDU3RkI1MAoKNUZDNzVGNTlDMjQwMkZEQzI0QTg4NkNGN0I2NEI5RkEx
-M0FCMzgwRERBN0RCRjI3QjZCMDRDN0ZGMzdGNjFDOTk5N0I5Njk2NTRGNzVECgpBOTkyOTM5
-NTM3MUJGRkIwRDVCNEZGRkFDMjc4QzFFM0QyNkU5RDAyQzgxODkxRThGQUJFRkY5OTM1RkIy
-QjZFQUEyMjVCNkEyMjNEMEUKCkQzREE3MDE3MzIxNUQyNUQ3QTNFRTI5OEFDOThCOUIzNDMz
-QTcwNjBCNTJCOUIxNzgzRjg1RTE4NjAyODMyMjI4RDEzOUE4NkIzN0MzQQoKRkZFODVGODU1
-MjQzN0RERUY0NjlBQ0I0OEI4NkZCNzMxMzc5RUIzMTk0MEI2ODM1Q0Q0N0M2NDA2MDAwODJG
-M0VCMkU1MjZCMjJGNDlDCgo1MDQ3MjFBMzI5MDZEQ0Y4NDg4OEU4RDA2MTI0MzU5OTRENzQ3
-NUUyM0IwRDZFNkY4MjlBNTk5NzgxMkU4QjUzREIwMzExNjc2N0RDQzEKCjkwRjM3M0UxQzU4
-QTc4NjU2NEFCMjg0NkM5NUNFM0E2M0RBMEM5QkY3QjVGNDFDMkExNjIwMUUyRjIyMzJCRjA1
-RTRFNzAxNUUwQjg5OAoKRTQxMEM3OTM0NjE2RDQ5OUIzNUU5NkU0RkI3MzgxNjVCOEVENjcw
-OEY5MDI4MTE0RjNFRkJGNUI0QzkyODg0MjJGMjA2QUQ2MzI0QUVDCgoxMjBBM0JDMEFGQjFF
-QkJBNzYzOUM4RDAyMDlEQjJDNDMyMTU1RUQ3MTI0MTEwRjM1OTlEOEU2Q0I5MTY3NDM1QTA2
-MDU3MzA4NzQzRDcKCkRCMUNCNUNBMUYxNzc0RkQ0QUEzQkU1MkM3QjhCMDQyMzRDQjRCOTIy
-OTNEQTI0QUNCNUMwM0UzOEFENEFDRjJENUJGNzgzNzhBNTJCMQoKRDA0NDNBNTQ4RkFERTJB
-Q0Q2QUREQ0EzMTU2NzREOTE3Q0JGRkRENDhGRkQ0MzYwNzIxQTlGM0ZBMEY5RjlFQUYxOTQ5
-OTZBMzNBNTI0CgpDOEIzNzRBQUNFNkEzNjRGMTU1NjA4ODZGNDM3OEY1Njc5QUYzOTNDMTk1
-QzU2ODE3Q0ZDMjZBREE5Njc5MTgwMjc0MzAzREREMzhBNDEKCjgyMDk1NDcwMjc3NEExNjAy
-MjdDRDQ5NkUxNDc4NTlDRjI1MjM0NjZGODk1MUQxQkRFNzlBQTdEMjExOTVCQkVCRDJERjNE
-QkQxMjk0MgoKMkExMTI0MUZBODAwOUY0MzQyMUJGNzk3MzA0NTM0M0JDOTU5Q0ZFMjI1MzBB
-OUMzQjlBRTVGMjcxQkM5MjczNzU2MTcxQjE5ODg1NzkzCgo5N0Q0ODYzMTMzQUY3ODJBOUIx
-NUIyNzE0Qzc3QzZGRDU2MDc3QzAwOTAyQzA1NzE4NEFEMDFCMTBCNTU1NkE2RTA3QjZCMDYy
-NjQ3QUIKCjIyQzc4MzUxOUI4N0UyRDlBMkJFNjg5RTMyQTk1REZCRDI4NjVFNTg1Q0ZCMDEx
-NkE0MTEwRDQwREFGQ0QwREQ4NzcwOURERUM0MEI4NwoKNDQzM0IyOUNGNkFBOUY5NDA2Q0U2
-MkZGRUEwN0E1OUFGRUYyOEU0OUU3QkJBMzJDN0Y2MDY2OTk1NDE0RTlFRTVFMjA0OEEyOTgx
-NzdBCgoxM0RBQzAzRTVERjk0MzM0RUI2RTEyNEU4NkU4Mzc4ODA3NDZEMkU2M0QyQzQ5QjRE
-MEQ1ODcyOTkxNDMxNDQ3Q0U4RTI0MkEzNURFMzQKCjZDMUQyRjNERTc0NDNFQTA1QzJFQ0FF
-MjUxOEI4ODNBNTVERERCRjUzQkQ2NEE3MzUxOTMwQzYxMzdEMzUxRDRBODg5MDhFMTMzQTkx
-NAoKNEVEMEQyMDAxRDdCRjhGNENBQjQyMjQyRkQwQjM4QkU5MEZBNzY4MTZEODE2Nzk3QTcz
-RDNCOTg5MUEwRkIxOTUwNzIzQkJDQjk3RTE1CgoxMTE2RTdEQUE1QjE4RkVEOERCQkJEMkZG
-QTBCNjExNUUyNTZFRTY3NTVFMTcyREUwQzhGMjUxNUE0OTRFNjk4Q0NCREU4MUQ3MTA1MTQK
-CkFFN0Y3MzI5OTIwOTY0NTRCRkE3NjE3MkVBMjU5REQ5Q0IwRkE1RUMxQkUxMDUwQzE1NTNC
-MzRFRTlDMjA2QjU0MERDNEY1MzE3M0M4OAoKQjgwQTg4QjE4M0I2Mzk0OUNDQkNGRkM2NEUw
-QjlDMkE5QzRCQzgzOERCRDJCNDhBQUFBMUJBN0I0MEVGNDMxMUUwQUVBNTFFOEJCMkRFCgoz
-NTA4QkU0M0UzM0Q2M0QxM0JFMzNGRjk1NDYyNTlEMEVBNTQxQ0RDQjQ2MzIxQUQyMjc3M0RF
-NzU3MjY4MjNGMzJFQzFEMzdFRDExMjIKCjY1QkZCRDQxNkQwRUY3NDNCMDQyMEI3M0UwRDcz
-RTFFODEwMUQ1M0U2MzI3OUZCQ0MwM0I1ODBFMDAwNjYzNDg0NDA1Njk3MDRFMzJDRgoKRDQw
-QUVEMzUzRkZDM0VEM0ZFMkQwQTE0NTg2N0VFMjdGQ0IxODRFNEZDMDNBRjVGOUYwMTc2N0Y5
-QjI0NTYyODFEMzI2REI2MzlCQ0E2Cgo2MjIzQUJBN0NDNjNDRDY3OEY2NjNGNjFCMDQwOEYx
-QTE5NzZFREU5Rjk2RkNDRkJDQjBBRDI5QzhFMjdDQ0Q4MUNDNkM1RTY5N0IzMDQKCjk3REQ1
-MUYwMEYzRkU3RkUzM0Y5MzFBMTdGQjc1NDAyNjNEN0Y3NDlBMzQwMDdEMkM3Q0IyRUU1N0Ew
-NzVDNDMzM0UyMjE0Qjg2NjY2MQoKNzQzRTQ4N0VENzYxQjg3NzRFMDc2QUNCRjlDMkRFNjY5
-OTJDNzAxODlBMUVFQjYxQjQ5MDY4RjQxM0NCMzg1MUUxRUQxODI1NzQwN0I4CgpFQ0I3OEVB
-MzgxRDVFNDIzOTA3QjE5NEU3RkQ5REE5NTBDMUE1MDJBMEE2MUFCQUExMkU3MTEwMjc5MkY3
-Q0YwNUFFNjVBN0M2MzFBOTYKCjM3Njc5QjJDNEJDNjUxRTIxREVGMjJFRTMzOTIwNERCNzIy
-RDFGREIxMTlGOTc5OEM3MThFNEVDOTQzOUM0NzJEODlEOTk2MTJGNzFDOQoKRjQ5ODkwQzU5
-NkMyOEJBMzI0QzVBNzk1MzVBRDc3QTVFMzZFMTg0MUY4MjlEQjc0NzdDQzYzQTk0NERDMTZE
-RjI3M0QzNzZCMjMwNjUzCgpDNTBBOTdGNUI5NTkwREEzMjUyMTBCOTM1QjY4REIwMUI4MENB
-NjU5NkVEMkFDNUJCMDI0M0ZENzVFRjhGNjg5MUVGMEEzQzAxRUJGMjEKCkZEOTZEQUY0REFB
-ODNBNUE4OTQ4NTQ5MEE2RkM5QkM2OTNCMjhCMDU1M0VGRkZFNTc0QThCM0M1QkJFQzM2RTY1
-N0MyQ0RGNERGNDVGMgoKNDdDNTlBQjFFRTU5ODA3MjVDNTFDNDNEQzI4OUUyMUZFNjk3OTFE
-OTQzNkI0OURGQzEyMkM0NEJFOTE4NzMzRTcwRTM4NDRDRURFNjMzCgo0OTMyQzUyMDc4OThE
-NzA3QUZDMkJFM0FFMTMyMkNFMEJDOEE1OEY4MTAxMTY2QjA0OENENkU5NEIzOTJBNTRCQTg4
-MTE1RjA4QzEwNjYKCjRGNDE3MDI1QjhBRDI3NTZFQTYyQzk5NDU5OTlFNTM2RDE1NzZCNUUx
-RDMzMjdENTE2NjA5RDFCMzcxQTBFOUIwQjlGRkE5MzRCODU3OAoKMEQ1MUVBMkFEMkFFQTlG
-REI2NDE5REQwNDg1Qjk1QUY5MEEzOEIxRUY1RjY4QTFDQzVDNzMxOUU0QTUzQkQ5QkREMjA4
-RkNENTlCMjY0CgpCQjA1REYzRDdFNTcxRTgxNTQ3RUE0ODE1NjgzQ0ZGNDMyMzQ1RjcxN0NB
-RjNFMjBFNjI3Q0IzOUI5QzQzNEY2NTlBRjk3NzYwMjMwQzgKCjREMEM4MDlBOUY4NkVDNzIx
-RkYxMTNEODREOTRGQTJGMzdBQ0E5QThDNEM2QTI3NjNFMkYyOEM5QTdDODIyMEZFN0Y4QTk5
-MjA5RTA5NAoKRUQ2MjFCNjg0QjY5RkRBOTE5NEE3Q0NDRDUxRkE0OTkzM0VBMTU3MDYxRkEy
-M0RENUZCOTAyNjVFNEVDOUE4MThDMTM3OUQ1RTUwODA5CgpGQzdFRUUxRjEyRDVCMURCMzND
-NkMyMURGMTFGMEQ5QjQ5QTNBMkQyQTlGMzlFMDU2QjA2MDRCNkZFMEZBRTZGMDlCMThGNTlC
-MkMxOTcKCjY1OTJFNThCNzQ2RDNBOTlBRjU2QjFENUYyQUY5M0E0MEU0M0NGMzBFMUNBMTg0
-RDFFODk4Qzk0ODAyRkY5QjIzNjVBRjM4RDBDRURFRgoKNjM4QjIxMDkzMTc3MkJDMTkwRTRE
-NDBGNEM1QTEyMTJEQjk1RUE1OTZEQjY0QzdDMDYwOUM2ODE0NDU5REZBMjI4NkVCQjVFRTE3
-OEZFCgpDNkFGRkMzQjlCNTIwREI4RERCNEVCNUQ0MjIyRDg2OTc5OUZEMTk4QzVENjRFNEYz
-ODg3NTgzRURGQ0EyQjhGNTExRjkwQjBEMjlGRDAKCjQwRDE0MjdGRjEyRjA5NjY0NTkzRTdF
-RjFDMEI0MjZEQzQxMDYxRjM0RUNFNjkzNjdGODUyRkNENzIzNDk5RTU2NEM3NzYxNENFMjQz
-NAoKNUMwRDQxMDExQUFFNzk2MEFEQ0QzRTJENjNFRTE2MTc3RDE5ODk3NUVGMjg4ODQyRkE1
-NzE0QUZGOUU1MzM1OTc4NTVBMDgyN0ZBNDQ0CgpDQzY4N0U4MDI3RUM5OENEQjM2MDZGRUM1
-QTA0NUUyQUM4N0U5MEVBMDA1MDc2ODY5OUM5NTk4MDU3QjUwMzEwRDM4N0U5MTA1NUU5NzQK
-CkFFQkI3QzkxMzZDNjk4NkIyNzlCQkU1RTA1QUEzMDkxRTk3QzcxMDRFMUVFQjBCQ0U5RDM0
-NDhEODY2NDQzNDBBMEQxMUQ5QUM0QjZDQgoKREI0QkU0RDZDRkYxMzA4MzNGQUU0RjAzMjQ5
-QzQ1Mjk4NTcxNDU1NDgwNjAzRjVFRkUyQzE4OTI4NzU3MzdFRDFENTYxQzM5Mzg2ODlFCgo3
-Q0IzMERGNUUyNkQ0NzkwODNDQTYxMDE3NjUwNTkyQURCMDFCRjZERDEyODA3QjY1RjJCRUI2
-QzhGQzk0OUFDNUExRkZCRTgwNzk4MTcKCjkzNEJDODg5N0UyNTFGNEM2QjI3RTdCNkI1MjQ3
-RjVFNDhDMzlDODRBQjhCNzBCMTRBODY4NTUzQjVGMjA1Rjc5QjgxNjBERURFMjE3MgoKQTBG
-RjA3QUVGMDczNTc4MDczNkU1RUJFRjdFODE4NzY0NTU3ODk4OTUxOEUxMzM3RDM1MkJEQjE5
-MkFGNjE4NTg3NzhEMjFEN0I0NEE5Cgo3QzI2RjQ0NTY0ODUyNzg4NTU2RTg0RDYwNjE5RDFD
-Qzg0RTRCNEEwRjQ5Q0FEOUI3QjcxMzkzMEM5NTdDNjMyMTE3Njc0QzUwMzEyMEYKCkM1NjRB
-MzMxODU2MEMxQzU3Q0M3NkY3OEI4RTFGQ0E0RTI0RUZFMDc4RkRFNTFBMjREMTJDRTFCNzk5
-QTA3MjMwNDQxQTA4RUFDRjBDNwoKOUQ1MTQxNjlFNTQzQURFOUI5N0VFRUZCQzZDNTBDRUEy
-MEQ1QUY0ODFFOEYyRDVCNjIzQzQ0NEI0MDlGQ0IxQ0FFRDdDM0VBNzc1NEQ2CgpBRDE0QkJF
-MTFENzA3RDZGRDNBNzAzODRFMjc1REQwNkE4MDk3OTNCODczRTY0NkJBMTQzQkU4MTY5NzEx
-MzlGNjJGRTAwN0MzMTNGN0MKCkM3MzcwRTFBM0VGRDE4RkZGN0JERDhCQ0MxQzY3NzYxQTZE
-MUVBRUNDN0Q5NTNDNTg1OTZDMEI1NDExM0M4RUI1MjJGRTZGRDgwNjhGMAoKMDJENjBDN0VF
-OTI0OTFFMkY4RDUwOUE2RUI4NzIxOTdDOUZFRDk2RDk2M0M2NUZDOThGM0RERkEzNzQ4RDMz
-QTJBODJDMjJDQTRERkI3CgpEREQ0OUY3RDYyMkU4NTlGRThGMERERjk1MTQ0RTZCQkU5MDYx
-NjdDQ0VEMEQ2NUVGMDUzMzJFNTlENzM5MDY2ODU5ODA5RjA3OTVFMDcKCkRGOTA2NDk2OEM1
-NjQ4MTM0RjUyNzMzN0NDNUY2MTBENUI5NDFGMEFBOTc1RjY4MTdCOTIwQTMxMThFQTYzREU3
-RkZGM0Q1OUJGMTQ1MQoKRTI0NzRCRkU1N0M5NEUwM0FDNDE2Q0ZERkNBNTU5NDgxQkI1ODdB
-OUY4MzY2MjYwQTg4NEEyMkNFOTNGQThBMTcyQUI3NzBDMkRDNUIwCgowQjczQzlGRDlGREY1
-RTI0MkJBOUI4NDVGQTREQjlDRENBMjE0OUE0NDc5RUE3N0U2OUU5RjM3NDJBQjU3MTE1MTdC
-RkNEQjFCM0MxOTQKCjcyMzFDNDM3RDlFNTBDNDIyMThDMzU2OEFDRDk1M0Q3NDJEOUUwOTNE
-RUZEMDRDMDdGMkQ1RjE1MUQwMEIxQ0FEMDg2RUZENUIxMDQ0NgoKNzQ4NTI0QzA3MDEyM0Yy
-MUEwOUVFQTgzOUUzODE1MjdERjk4REUxQjczNUMxMTExNjI4QTBGQ0Q3NUFEODYzQUU0N0Ez
-NDIwN0RGMkM3Cgo4RDFBNTBFN0FGMzEyQkNDOTk5REU0OUJFMEY1NEFFNzMzN0IyQjVEODND
-NEY1NTA3QTUzNTVDMkNFMjkwMENERTUxRDI1QTQxQjc0MDcKCjIxMzQwNzQ3MDhGNTU4RERD
-MjJDMTRDNzQyNEE2MTFFMjgxNDEzRkVGOUE0MzhDOERFNEJCQTZCQzY3QTZGMjZGMEUxRUQ5
-MjU0NTEzRAoKMjBFRkUzNjFBNzQyNkIyRTlCQUQ0ODg5MTUyMjk4RUQzOTdDNkFFMUI3RTBB
-QTFGOTNBNEE3MTdDMTM0MzlCMDIzOTlDNzczREU4N0U1CgpBN0FEQTJCMTUxNDQyNDkzOUY0
-NEYxMTRFMEU2NjNBRUZGQkY3QkFFRDUxNjcwRDc4OUE2NzE4NjI1NjY3NzdDOTNFNjFFNEJC
-NUU3NDQKCkZCRkFFRDk0N0JEODk2REE5RTFDOTQ3QTFFOUQzMjhENkIyQjM4QjIzQ0YwRUQ3
-OEJGQzM5OUI5QkMzOTVGMDhEQkY0NTdGQUI2RTQzRQoKODQ3NDQ4NThGOTRBNzI5REU4NDZB
-QThFODg4QzFBMjE1QzIzQTI5N0MyRDdBNjlGM0M2MERBNTNFRDEyRkFFNjQzQTdGQzE1RkJC
-NjgwCgozQThFRDI3NURCM0QxRTAxOTlBNzFGMjAzQzhGRTFGNThGMzkyODkzMDNCRjdBRUU5
-MjhDMDkyN0VGMzRGMTYxNEMyM0M4OUU2RkUzRkIKCjEzQUI2RkI5MUVCM0RDNDcxOEE4QzAz
-MUQzQzdFQzExMUYwOUFDNzlBRTNGNjI0NUQwOTQwQTQyODRGQUNDRURBNjQ1QTEyOUE1MjQx
-RAoKOTFFODFCNjI3MTg5RTE4MDlFNEU0Q0I4NjkwRDdEMTY4NDVDMEU5N0VFRkQ3Rjg4RkVB
-OTU5RkI1NUY3MDgzMDY1OUNCMjAwMkM2OTEzCgo3ODcwREE2RTA2MTIxMDM0NEI1Q0M2QjlE
-MDNBQzdCNTQ0MUJEQUE4MUMyNTUwOEUzRDVERDc2NDVGN0ZEQkUxQzBFOUQyMzYwMDQ1QUYK
-CjJENzZGNDZFRTI2Q0Q3MDM3MTdBN0MyRTgzNDA2QUY2M0E0Mzc4RjEzNDAzNTc3MzVEMTNC
-NkM2QTFFOTQzNzA4N0ZBRTdDNDJFM0NDNQoKRUI4OUVCMjE4NERBODdFNkI1MjMxNjNEMTZD
-QjIyMUZCNTQ2QzAzOTc3NEYxQzdFNEMyRDE5QzY0OEZGMUQwNzg2OTFDQjdBOTA1MjRGCgpB
-RTBGMTk5MDI4OUYzQTAxQkU1QjRCRTMxNTQ0MTAyREIwNEVCNjQ5NTBBNkQ2MzNFNkREMUU3
-MEMxQjVCNTBGRTAwRDEyNzBBRjdEQTEKCkM1QUUyMkVFMEJDN0Q2M0Q2RUQ5RURCQkMyREIy
-MUE2NTdCN0M2RTM5Mjg0NTUxQjY2RTk1OUVGNjI0REFFMjFFRjA1OThFNTk4RTVGQQoKRDhE
-RUVFMEI4N0FFMUNBNzdDODkwMkNDODkyN0U3NEIwNTk5QjhERjg2N0REQjI4NUYzMDgxNzYz
-OTI0M0RCN0Y5NzE5MUZDMTVBRkNECgozNEZFRjhBQ0ZBRjkyNkFFNjBDMTNERjcwQURFRUU3
-MEI0RDJERUY1NkRENjg5MENBQ0EzOUU5NENBQ0IyRTAxQkRDRTFBMjlFOTY2NDMKCkNDOTMy
-OTAyOEM5MzFBNUY3NDg0MjYwMzJDRDU4NkU2RDc1OTAzM0YxRTQ2ODMzRTkzRUZDQTBBRDg5
-NUNFRjEzMTEzODBCODc4MkI2QwoKMTVFREZGQzczNkE5MzlDNkNBNTNCREY2NUY4ODQ4NEU0
-MDUzQjA3NjM1ODc4MEQxNTQ5Q0Q2RkQwMjM0NTg3QTQ2MTZBMDA4RTZGQUE3CgpFNUQ5RUM0
-NThGQjI5M0IxNDNBRjA4NThBODUzMkZDNkI5RTZGNjk3OTdDQzI3NTQ4RjE5NjE4NzdCOUM3
-NDkzNjJDMkUzQkQ0MTA1NkIKCjY4RTI4NDI2NzE1NkM3MkE4OTA5QTg2MDM3RjZBNzU1QTgy
-REYzNDk5OUM2OTU3QzQxNTIxMkQwNjBDMTUxMTRENUZEQUZERjAxQjNERAoKNTYzNDI4QjQw
-MUU4NTEwNUQ3QkREOUFBOThFNTQ2NzA1NjEzNTREMDgyQjVBRTNDMzcwRUY5RTJBQjFCRjhB
-OEUzQkY2MUI0MzQ4QzBDCgpDNkFEMjc5NUI0NTNGOEY4MUQzNkRCQTg4NDcxNDNERDk1NTIw
-M0M5QTBERkEyM0UzMkVDMjM1NUFGRDY2NzhBMkIwNUZFNkU0NkNEQUUKCjNFOEU4NUFEQjRB
-QjcxQjdGODREMTI2NkVDOTJBODQ2RjA4MTcwNjk0QUQ2NjU3Q0E0N0Y1NjA1MzVEMEZGNTcy
-NUM0MUNEMEZCMzIxOQoKQjlCQ0E1Rjk1NDU2NTgyNDhENzk4OTZBOEI1RERGMTk2OEQ0RDk1
-QTM3RUNFQzdGNDRGMkE0RDY4ODgyMTRGQjE5NTQxQURDQTY5RjcyCgo5NEJFRjYyQzA1MjBF
-OTVDQkE0QTJCMTREMTJCQUQwMDRFNjQ2OERDMTM2Qzg5QUM1MDY1NzE5QjkxNzVCOEExMTky
-QzgzQTQzNTk1QjIKCjY2QTE5NkU4MjBFQUM2Q0EzNTQ3Mzc0RkIzQkYyM0NERjE0RDkzOUI2
-N0RGQzVERUE5Rjk4RDgwNTQ1QkY5M0NBNjcyNDBGOTdBMUE1QgoKQ0QxMzdGMkE0MkJERUU3
-NTUyOTY4NjIzRTZDQTY1OUZBNDJFQzVDMkNCQkVGMkUyNzA2RDA2RTBFMkNFQTIyNTQ4MjIx
-NEI5QjZDNDVECgo5N0RBRjI0ODk5RUU4QkM2RDhBOTgwRTU2MjEwNzVCOUNFODM3QjcyNDM0
-MDA2NkI3NEMwMTNFOEFEODA2MjQxREE1QTE4QkMzRTk2NTcKCkVGRkQ0QTE0NDM3MDRCOTBG
-RUFGRTBBNDA3QzdDMkU4ODBGRTk3MDU2MEJBQjA2NDkzNUYyMDlCMTk3MUUwM0MzM0IyQjM3
-QUZCNDQyOAoKMDFBOUM0RDYzQTZBOTM5MTBCNjA3RDQyNDQxNjYyMDU1OUU3Qjk1QTUwRTg3
-OUE4QTA2MDdBMkNGQUIyNkQ0MDg1OEI5NTVDOENCRTRDCgpDNTVCNjczNkYyMEVCNzQzOUIx
-Q0I5NkNGMDBFOTE2OTA2NTkxNDdDN0QxNjA4RTUyNjBBMkU4NEQ3NDlEOTA3MDhCRkRBOTJC
-RDU4MzQKCkZDMjI2MTlBNTE3NjREQjREOENBRTY0NjNBQUU4MDUwM0Y0MkNCNEU3ODMwQkU3
-OTZFNERDQjEwQTFFQURENjM2Qzc5REQxQzE3NEMyNgoKREQ0NDgzMEMzOEU5MkJCMjVERkE3
-MERGQ0JCQjJEMEI2OTJEM0M1OTE3RkI2NjlCQjM2QUIyQzJDMjZBQkYyQjM1QzBCNTgxRjc2
-RDc3Cgo2NDY0NERGODlFRTg3ODYyREUzRDVCQzFFREM3NDkxMkU0RjI3OTk4MzYwMjNFRjg5
-RTVFODE3REY2MjUyQjRGOTUzREE0RkQwQkMwMkEKCjRFMjJGQTc2MjA0ODgzN0ZBOEM5OTQz
-OUJCMUZDQkY1RTIxNUI1QjQzNjg1NzVFOEQ2NzY5RTNEMDFBOUEyNTJEN0IyMDMyN0I5QjMx
-NQoKOTVDMDFCQUNDQjY1QTM4RkYwNEE1NjEzNjk4QUYyRkE2M0IzNkJDNjk0MkVEMjQxRTFF
-Q0VCN0E5RjJFOEUzODFEMzAwMzI5Q0JENEUzCgoxQjE5QkEwQUZGNjQxNTU2OUY4Nzc0QjI4
-Q0Y5RTZEMzQzNDEzQUEwRDQxREMzQzNGNjg2ODQzQkIxQjdEQUEyNDJBNjM1Q0YzNDUxMzcK
-CkIzRkQ0QjYxNjJBOURFRUE2QkZGMUU3MTlERjYwMkE4RDc5Q0Q1QTYwQkIxMUYyNkQ0MzdC
-RThCNEEwMzlENkMyRDY0QUJFRDUyMEMwNwoKRjA5RTgwMzdBOEQ3NkQ3RTNBQkI1OTQ2RDQ4
-MzdGMUIxMjI3NEQwQUZBQjI5QTQ0RTAyN0IyQThDODE1NzRCODQ2QTdCQTk0NzU2QUQ4CgpG
-MzNEMkI3NkM3OUZFNEQ5NENCMzc0OUE2NEVDQUQ4QUU5RDRENEVFMjE5RDVGRTQ1MjRFQzk1
-Q0NCODlCQTNDNzNGMjE5QTg4RjY3NEIKCjJENDBFMkM1QjQ0OTc5MDNGQUVBN0JDM0M3RjIy
-NTkwRjhGMkQ2QjYyMTUxODg1MzgyMTUwRTk2MTFCQkMzM0Q5QURDRTY5NUZCRjk0NwoKMkFG
-NzlFQkVBMDkxNjlGQTAwNDdFMDlEOTQ5OUQ3QTk3N0VENzRFNERFRTNCRkVGMUVGRTAxOTNB
-QUFGOUI4QTJFMjg1QUNFNjNGQ0IwCgo0REQ1QUE0RkQzMTFFQjgwMDVFODFERjk3MEQyQzM5
-MjdCOTMyN0M0MDkzMjM2QkM5OEZFQUM4RTEzMDAwMTIzOUE4MUM0MjZENDc3QzcKCkI2OEFB
-QzQ2NjgyMEY3RTY1NTI1MTU1MENDOTc5MDc5RjMyMDBGMTJCNkRDMzVDODREQzVBMTlFQjA2
-MzBCQkYzQ0JCMjUzOUFFRDM3RgoKNEVBQkM0NjRDQzVBOEJGRTc1NTkzQzdGM0FBNUJFQkE2
-Q0VFMUFBMkRDNDNFNDBBQTgyMzIzMkQ2NjcxNEMwNThGMzZBMDEyQTkyMkVCCgowRkEwQjU4
-NTEwQzEyMzkwMDRCODQ3MzBDMUM2OUFFQjRBMzgwODRCNkU0NjVEOUVBMDQ1ODBCODExMEM5
-QjFCMDIzQ0JEMUVBNDQ3NTMKCkY3Qzg3MzkwQTg4NEJGQUM4MjVEODRCOTNDRTRBQjUxMzYy
-NjRCOEExRTBDMzE2NkU5NEU4RUZBOTA3MkExMEFGQjc2MEZGMjI2NTAxMgoKQTI1NEYwNzU1
-RjgxRTFFNDJBQ0UzQ0YwM0Q0NDNEODFGMjM3RDdERDk1NTVGMjQ0NzE1NURENzZEQzA3NkYz
-QkZDNDkyMzkyODI4NzA1CgozRUU2QkUwNURERkUzMEFGMjAxNkZFQTUzMTU0QUNBOTFBNjA4
-OUU5ODA3NDU1QTUzNjc1MzA3OEI3Mjk0NDExNzUxNDUwQ0U0RUQ2M0QKCjBEQTRDOTkwN0RB
-MjEzNkRFOTZBNTI4OUI3ODMzNDZDRTdFNkREMkMxRDg1Mzk1RjkxMzczQzEzOUIzQ0ZGQzVE
-RjFBMkM0N0YzMjUzNwoKMjMyNjkxODIwQkU0OTdFODE4QkNBNTYxMzQ1NzA3QUQ5ODI0OURD
-NDAwNjJFMzBENjQ3RkE5NzlFRkFGNEZBNTBBRDlDQzI3MEQ0N0VECgo2OEUxRTQ2MkY1NEVC
-NjlFNkQ3MzRDNkREQjQxQjVDMkIxRDYyODFBRDNCOUY0OTdCM0I5NkQwQzk0QUY5MzhFOUU3
-ODVBOTZERTVERUUKCjlBREZGODM0MDYwMEIzQzE3M0I2OTM5QjVCMDZCOEYxMzQxMjc2Rjcy
-N0VBMTY5MzMxNTFEN0RBOEYyNTQ3ODZFQkQ2QTAzNzJCMTBFMgoKNzkwNThEMjMyN0YyNjIw
-QjAzOUM5NDUzRUZBOUI4NTlCQjVCRDQ1OUU3Q0NDQzM2QjgwMjIxOTMyNjY4NDAzRjYyQkQw
-MEQxRTMxNzU4CgpFNjQ3RkVDMUZCODE2QjZDNTI0NTFFNkZGQzUwRUE4RDUyMjc3MTc4RTND
-NEFGNUIyQTU5RjM4M0IyNzFGRDEzMkUyMTY5NDVCNjlBMzQKCkIxMzY1MEY1RUVGMTI5QTk3
-MkE2OTVGRjJCQTEzOEUxMDkzNUE1NjRBRjkxOEE2NkMyRDUxQ0Q5NDJERTdGODQzMTI3QTNE
-QjgyODc1RgoKMUExNDY2MkIwQzNBMTVCRTRCQkUxRDg3NUY4Q0JFNTRDNzQ4OEY0MTMxMDc0
-ODIyRkQ0N0M1OUFBNEFDRjE4REE5NzE0RTI2MTlDOEQxCgo4QTlFQkQ1MDk4QUFBQTExNTBE
-ODM2ODFBNkU4Q0NCMDcwNzg0QjEyOEY3MzZCRkI0M0NBRjVGMjM5RTk5MzQ4NzhDMDIzMjhC
-RDMwODQKCkNGNTJFRUIyMEEyNkJDMzZFNzZBOERGQjM2QzlDMTM5N0IxNkQxNjIyNERCQjlD
-NjRBREVEMTkxRTBFNTNDNjFCRTdEMDU2MzU1RjIwQQoKMUFENEVFMzhFMUVDOEMxOTI3QzJD
-QUZEMzZGRkFDMjQyNDBCRjA3Q0UwMUZGM0I1Q0M1ODY2QjRBM0ZFRDBCRUI4Njk1RTIzQzFF
-MTZECgo2REUyODgzQjhBNjZBMjQwMDMxM0IyNjNFQzJFRTYzNDhCRTAwMkJFMEFDMkI1QjQw
-NkUzOTJDNTNGRDQxQTE0NEY3RkYyNEJERTk4OTIKCjdBRUQxN0JERTYyMEQ1RUU4RjA0OTVB
-OUU5MTVGQzBGN0ZDNjlGODY1NTAyM0YzRDAwRTMzMDkzNDIzNDBBRkQzRjAwQ0U3NkQ1MEI0
-OAoKNUUxQUY5RENBNEQzRjJBNDBGN0IwMjU1ODk0OURERUI2REQ2OUE1RTY3QjhCNURBQTM5
-NTZFRjk3RTcxMENDMUJBQTc0NzZCOEI1MzRECgo0ODU5NjI0MDU1NUM3QTIyMENCMDI5NjY0
-QUQyNzRGNDc4OTAzRTk0QUY2NjAyNkY4NTYyQ0Q2QzE5ODM3Q0U5MjY1Q0I2QUU1NzgyMTcK
-CjAzMzZGRjRDN0EwRUE1QzI4RTA2OTAwNkNDNzYwRDNCNTM1ODY3QkQzNzZDMEU2QkZBNDNB
-OURFNUY2RDg4ODIxMURCMDZCNkYzRTVERAoKQUE2NjY2MDlDQTdFMjI5MUVFMDU5NjczMUU0
-Q0U3OUYzNEZFMDU1OUFFOEUxQzI5RThENjAwMTVBNDQ1QzM0RjhFNjQzQjUzMzcyRUIwCgo1
-MzMxRTU4MTk3MDk2NDc4REZDNDlCN0YwOTJBNjIwOUEyRDIwOURDMDJFRUIxQjdEN0IxMkU4
-OUEwNTUxQzA2RDFDM0YzNzkzRDc0NUUKCkJDNkQyRDZDNTc2MjhFNUJERkFFMDk5MzY5NzZE
-N0M5QUZCNjUzQ0U0RTZFMTk4NTcyQ0U0NjE4MEZGOUVCMDA5Q0ZFNDUwQkEyNkJCNQoKNzA1
-NTI1MDUxNjU1QzM1NUI1RDYxMTQ1QTdFRTA2REZBNDg3QjMxMURFNzJBOTc1OTQ1RkJCNjQ4
-MTA0MzRGOEQ3MzlGRTk1NjMyNjAxCgpBNDZDNkM5NUM4QkUzNjUyNDVBODlDRjc2MzQ3MzVE
-QTE0Q0M2OEUyM0Y0RTlFODJBQzBFMEY4NUFERTg2MjhCQTFCQTRGOTExOEY4MDAKCjcyMzc5
-OTAyODBDMTkwNjFBMzA1Qjg3QkRFNkZCREFCRTcxQTcyNzQwRTMzODkyNUFBODcxQzkxOEQ5
-MjdGMjhBQkIxOUZGRDJBMTI2MQoKQzgyQ0QzQTQ3Qjc2MjQ4ODI4MzAwRTE0RDcxQzc1Qjc3
-NzM3NUQyOTcwREYzNDVDMzdGM0JFMDFFNTZBMDQ3Qzk5RDI3RjQxRDgxREYwCgo0M0MxMTAz
-MzUyRkJBMTk0RUFBQTUwMDU1REFCMDcwMzQ2QTIwRjM5RkIwMDdCRUJBMzQ2MjczMzdDMUI3
-MTQ2NURFODJEMjIyMTE5NEQKCkQ1QTYxQjY2NjY4M0YwOUUyMUY3NjQxOEE4MDg2RkE0QjJB
-REYwQzk0RDVBNzAyQTJCRTZCQkE3MUQyQTlGODc2N0IyQTM5MDIyOTQ1MAoKRUI5ODY3QkVB
-Njg1OUVBRDY4NkM2MUZCNTIxNTcwMzZCQThGNjI0NjhDQjkzNEUxMERBMDdDNDM5NDJCOTY0
-QTkyQzI3OUUzREYyNjM1Cgo1NDFGRjQwM0NDNTBGN0RBRjFGMTE0Njc4M0IwRDI5MDZGNjc0
-MjczMzg4MDg1QTFGNjk3RTZERDgyMTY0OTU2OUI4Q0VBMjkyMDgzMEUKCjk1QTk2NjM1OEZD
-NkJEN0Y4QkEwQjkzNDk1RDA1NDk2N0I0REJGOEQ5MkVCMzM3RjUwQkUwREQ5QTAzQzIzRDJG
-NUI1RDlDNzNERkE0RgoKN0UwMTEyNTQyNUVFNjJFRDlDRUY3ODEwQzg4NTUzQ0M2NzFBN0RG
-OTI5NUY1MERDNDgyNDQwRTQwRDY1RDA5M0ZCNUEzOUM0MDg0QjVBCgozOUE3QzEzQjQyNkJE
-OUJBNUU4REUyOUZFRkNGMDM5MTVDNERGNTcwQ0ZEODU0NkIyNzRCODc1RkQwRjgwRjU3RjFB
-MERBNjlGMDlEQ0QKCkY5OEQyNzlDMDAwMUFFNkRFQUNFMzJFM0IyRDM0NDM1MjRDNUZFMUNE
-Mjc3MEQ3Rjg3MzIwMTQ0MkIxQ0M2M0YzQ0MzM0QyRURDMEUxNAoKOTMyN0FFNkM5RTk3MjBC
-MzQ2QTNENzgzQTBFQjZEMzlFMTBDNkQ4QzQyRTMxMEMzN0FFMDZCRTc3MDU2RjU4RUQzOUQz
-NUJCMkJFODZFCgpFQzBCQUFCRTk5NjgyREU0NTczMTZCNzIyNkUwQzk2ODgwN0QzMzc3MkEy
-MEQ1MDY1ODM1M0QyQTZGMDgwNEU2RjIyNTg0QUY1ODg3RTMKCjZBQTRFN0VGOUQ0NzAxNTNB
-MTE3NTlBRDQyREE2RUI5RkMwQUI1NDk2NTQ3Q0FEMEVCNzI0M0QwMzcxQUYzMzBFOURFRjNC
-QkRFMTE1QgoKQzMxMkQwNzg0OTMyQkU2MzBBQ0YxODUzQkM3Q0I5NzI0RUY5MUI1QkJDNDJF
-RDIxMUE5RkJGOTEwNUVENTBEQkVDNjFFRUEyODg1OEU0CgpCNTc5RUYyOTI5RjI4NUFDQzEw
-MTMxMUUxODJBMjdEQzhGMDVBOEJCMDc0QzU1OUMzNzA4M0Q1QUFEQTIwMkIwQkMzQkVBRkI3
-ODMxRTgKCjc5OTE2QzVGQUExMTZCRjRCNERDNjhERjk0NDAzREIxMTM0RDk2QTcyQTgxRjcw
-RDJGMTZGQUM1NzY4QjRCQjQ1NEM4RENFRDIwMkEzMQoKMjIxQjI1QjJFM0Y4REM5MTJDMzhG
-QzgwODdGMkM4OEIyQTU0Rjk5MzdGRDI1NzExMEFCNjNGRkVEMDFEODVENEIxMTYxRjA4NDIw
-RjIyCgoyNzI1RkVDNEI1REM0RDJBRjY1QThFREJEM0I1OUU0QURCRkMyNDc4RTk4NTBCNkFC
-QTg2ODU1M0RDQjIzMzEzQkJGNkQwM0QxNzhGRjIKCkZEQ0YzMzkzQjA1MUY3OTlENkM2MEFC
-N0Q1N0Q2MkZEMjNBM0YwNzY5MTU4ODJCOUJFMUUzRUQwQTNEQTg5M0Q2QkI2OUE5QkQxNUM4
-QwoKNjA3RjAyMTNEMzQ2NzNGOEZFREE4MTg3REY4QzI4RTZFNEE3QjFGQjkyQjExRTkyMjk0
-MjAzQTM2Rjk1NzkwRUFEMUI0MUNDODMzNjczCgozRkI2QTAxODkzNTZDMTY2MzZCRTk2NUEy
-MEU4OTU5NDc0ODM0Nzk0RTREODM2MzQ0M0NBNDY3ODkwMTE0MUQ4QkZEQ0MzMUI5NEJGRDMK
-CkNGOUU1NEM1NjY3MjNCQjUyQkZDODY4RUMwMkFFMkI5NkM2NTdGQjRGRTlGQkJBRUFCNzAw
-MDc1NTg4Qzg3NEY1NTlGM0M4NUUwMDdBRAoKQ0Y3NkIzRTAzNzJFRDk3RTNFOTc3NUNGQ0U4
-OURCNzlEMzk2OERFMkYzOTZEREY0QzZGMkI2NUM5MDlBMTkxNDMxRjVFMjEzNEJCODg2Cgoz
-QTYyMEUyRDUzNzcxOUQyRjgyRkJEODAyQzM4OEVBNjZDNDU0QjhERUMyN0I3RDY2MjRGRkFB
-MzFGODVDNUIxM0RBOTQxRUU5QTdDOTMKCkE1RjlFRTNDNTM3QjcwOTY1NjY5NjkyOTg0MEND
-MDVEMkU2MEIyODVDRTExNDAxOEYxOUQ4NTZERTZBMTQwODI0NkMzQTJFRDA4NUFCRQoKRTEw
-QzdCN0QxQTgwODBCREUyQUFFQzYyRjVEMzBDNkVFREI2NzMzRUI5N0I2MjY0MzVDOUNBQjVG
-QjU2ODEwRTNFMTkyNEFCMTcwMTAyCgpBRUIyNDY5OTY2MURCMjdDNUE5MkY0MEU0QkQ0QTg4
-Njk3RUE2MjNBM0YyRjgwRTNGMjE3RDU5QjUwNjQ5MDg1NzUzRTlGMTZDNTVCRDEKCkM0NUQy
-QzU3Mjk3Njg5RDEyRjU1RjYyRUEzNDhCNUZGNjU4MEI0OERBODVCOUJBMDU4MzQ5MDI0RDFE
-REM3N0JCQTAwMEFDMEMyQjYzNQoKREUxMjJFM0E5RUVDMzQzNEJDOUI5N0IzNTQ2QkM3ODUw
-QzNBNDcyMTAxMDAyQ0YwNUFFQ0VENjg4QzM4RDVBQjgyOTY2RTQ1QUM0Q0Y3CgpGRjI2NkFF
-MEY2ODY2OUI1RUE0OUM2NUE2NUFDREJGOUE4MzA5ODhCQjYyNUE4MjYzRTU3MEVBMkM2RDZB
-Nzg2Mjc3MzQ1RUU3QkQyOEYKCjY3NUFBNjQ3NEFERDc4RTAxNkQ1OTlCNDE1QjA1NEY2N0VC
-MURFOUJFNTc3MTBERjIxMjI0MDVCNDgyMDE4RDI0OEIyOTYxOTg2MEVBMwoKQTI2OEM1ODY3
-NzU3NjFFNjI2NTFEMUJDQ0QzNzc1NjQ3REZCRTg0QTk3QzRFQjY2RDIwNENFODM5QjZERjgx
-RTg5NzA4MzRDMTkzRkFCCgo3M0ZENDBGREFEMjhEMjQ5QzNBMDg2NzU5RDBGN0EyMzQ1N0I5
-MTI0MEFBMDQ1RkI0NTBFQkYyRjVERjI0RTUxMjNERkZCQzdBNjMzRUYKCjcyMzA4MUFDQkJF
-QkQ4RDk5QzQxQjdBQkQ2QzFCM0NCQjUyRUNBNDk3NkY3NDg3QUQ3NzgwODA1MkQ4MUNFNkYx
-MjgxMDk4ODFDMzJGMwoKODI3RjVFRjU5MDIyMzAxQUU3OTE3QjJEMkU1QzU2RkM4MjM4NkND
-MUUwNjg0RkI2QjQzQTY3QjUxQUU4QjEyRTVCODJDNTIxNEVCNzk4CgozOEEwMDRBNEQ3MDRF
-MDNCQTY1MDM4Qjg3Mzk5RUUxRjkzRUE0Q0RGRkQyQ0JGQTBBRTFDMUU4MTA3M0JEODgyMDIw
-MTVFQjlFRDU3MEUKCkRCMzNFMDE3NzczNDNERTNGODU5OEVCRjBDRTFDNzlGOERCRjQ5QUM5
-QTZFMjZBQkU1NkQ0RTM2RDc0NTJFNkJGN0NEODFBOTkwQjZBQgoKQjA1ODI0QkEyQzI5ODhE
-NTA5RTk4RTlBOUVDQ0UzRjg2OUUxQTMwMUU3QThENjlDMjkzRkM2MDUwNkM3NjJBNjVFNjZB
-MzMzNzMxQkI3Cgo3ODg2RTgyREZGQUIxODdFMjY0QkI4RTkzOTEyNTI0NEE2NThEQjBFRjcy
-NzQyODk2OUM4NkU0MjQwQjg2MDNGNkNFRjc0NjdCQTUwMEIKCkZCMkEwNDYxRjg5MjlFNjUy
-RUI3QzY4NEI2MzU2QTRGMUIwMTMxN0JERTRDMEUyNzhCQzlDMEQxOUQ3RjBGMTA2NkI3OTE1
-QzE1NDgyRAoKMzQ3RUEzMTMyMzkzOTA4ODQ2NDVCOUQ5MjE2MDk2MjU3QUExOTk0MjU5NDRC
-ODhCOEU2MEQxQzlEODE4RTZDN0ZBNTc0ODRFNTczRkFGCgoyNjgxOTAxQ0ZGQTdCMDM4Mzcy
-NTFCRENBNDI5NjM1OTdENTlGNUM0N0NDRjRGRTYxOTYzRDY5OTdFODhEQUE2QTgwMTg5RjU0
-MTA4QUQKCjkxQTYxNTUxOUVCQ0FBMDI5NENFMEQyQTNENkQ1MUJBMjNBQTUzODU2MUFBQ0Ix
-ODU5RjlEOEU3QzdGQkVFREZGQTU5RkRBMzBDNDkzMAoKRjNDNzAyODhBRTNCN0RCNjgzNTYx
-M0Q3OTc1QUZCRjEyNTRFRDgwQTI5M0MyODZBNDAwRTc0ODE2RDA3QUVCOTI3NzMwQzM5N0VC
-MUNGCgowNDExNTNGQzgyMUVFMzU3Q0Y4RDlDMUM1NUNBMUI1NzhCNjAzQTk5NDZFOEI2MjNB
-QjY0MkYyMjcwNDFBMThBOTg3QzhBODI2QjhFNjcKCjdGOERFRjVCMUE3QTg5NkYyRDA0Q0Ex
-OTcwM0E5NDkyQzM1NzQ4QTBFQjM0NjE0ODQzQ0I2NDM1RTM2NjUwQjFEMDMxMUQ4ODYyRTc4
-RgoKQTg3MENCQ0Y2QTFBNkRBMzFGQzFCQ0JFOTdCMDJCOUY5RDA2Mzk3NUE4RjRCNjgxQ0VG
-OEQ3MTcwQzFENjZDNDFCRDhCQkVEN0M0REU0Cgo1RUQ4RUE0RDVEREUwRkJDOUIxMTM0OUFG
-RkZBQkY4QzdDNjJDRjcyMDY0RjkzQ0QzNkVFNzgxRTQ1OTM4NTEzRTY1MTdEMzI1MTM3QjMK
-CkM4QjA3RjZDODVDRUM5OUZFRTczQzE5RTMzMTlDNERFNTQ5NzNFOUYyMzdGRDRGNUY1MjJB
-MUUyNDdEMTNBNUEzRjc2RDlBMjIzQzFEQwoKMDVERDk4QUYyRjI4NzBEREVFQ0QxRDE3ODE2
-RjYzNjJCQTRFNEMzRTc2NzgyMzQ5NjI5N0JENjBENUFFNUYzQkIxNkM0Nzk0NkUxQjlECgo1
-OTlFRTE5NDVERTgxODk2QzIwRTBFMUVFNUJDQ0EzQTgxN0YxNDBEQUI5MTA2QzZBMzkzOTYz
-NTY0NDBFMjhDOEMzN0YwOTA4M0MyQjMKCjhDMEFGMzIyQTVBNkU5OTExOTYzQkNCNjc0RDYz
-QkZERjA4RkUyQTczNzhERkM1MjkyQ0FGMjlFMjlGMkM2RUZGMDAyOTlFMjM2NzNDRAoKQkY5
-N0I5MTlFNERFQUI3NkE1MkJCNTg4Q0ZGNDg5RDZDOTg0QkU2OTQ1MTIxNTU1RDJEMTFENTc2
-MDkzNUExOEM3RUQ1Nzk0QTg1OTBDCgpBOUVFN0NDNzE2RTEyRTVFNTA2MDRFNERFMjZBRTdF
-ODE5OEVGNzIzMjNCOEI0NDlDNzA1OTgzMUZFMkIzMkMwQjdFRDRGOTc3RDQ1NUEKCjc0QUM0
-MjMzNUY5MkZBQkZDNjlCRjc5OEYzNTA1OTg3RTEwRTZFQTRCMUVCQTdEQUNERjJEOEY3NkEx
-NDAzMTY5ODUwNkY5MjA0MzlCNQoKNTQyRTMzNEZCMzg4MEJFQzc1NjA5OTI2RUU5OTUyOUM0
-RTkyM0UzOTM2OUQ0NTNBNEM4NkNBRTI0MURBRDQ5OTk5ODE5QjZEM0NDOEVECgo3Rjk5QzQ4
-MTZERDAxMDY1REQzODVENDdBNTZCM0ZFRDM2RTFGQjI2MTc0RTA0Mjg2NzdENEJDNTM1QTJD
-QjM1NjQ2QzE3QUM2MjE0RjkKCjNDNjhDN0I3MDJEMTY4QjQ0MzlGRDY2QTQ0RUE3NkJBODA1
-MTgwNTM1RUIzMkRCQkZFQzI5RDRCNDUzMzE3QzZGMzVFMjFDQjQ4MjQ5MAoKNzRGMUM4OUIz
-REM2QTUzRkU1ODhGOERCNDA4RUJBMUM2MEM5RjJFQTAxM0YxNTE3QThEQjNDQzlBMDk3QTI2
-NDNDMENFNTNFRkZFNUE1CgpFNUIyNkNGNDBEM0E5MzI0RjBCRDM1QjZGNTI2RTgzRDJBMzgx
-RTk3NkUwMEFGMTRFN0Y0RkUyMkFEQkI3MTIzNkE1MDY4RTI5N0M3RDcKCjA5OTQ2NzJEODZG
-RkJEQkVENDU0NjU5RjU0Q0FGNUEzNjRGRUM4MjY1QUJBOEY0RjJBMDQ3RDU0Qjg4M0U4MUFE
-NDhEMDk0REU3OEEwQQoKRDEzODlGNUY3QkQwQjM2QjNGQTExRjg4NjREMjFFNTdGNDUzQUNC
-RTJBODkyRUI2RjEyNkM5ODgxNzk5QzAyMTUwMjQyOEIwQkY0ODNECgozMDQ3NzdEQzBBRkI3
-QkFDQ0ZBNDJBQUU0MzEyMUEyNDVGQUQ0Q0UyMzI0ODEwMkNBRjkzQzcyMDE2OTQyQjU1NkNF
-NTlBMjg1NkJERDgKCjdDQUI5QTIyRkM2OTBCMzBFQ0Y4OTI2Njk5RTEwMUQ4Rjc0RDk4RjI3
-NTlFODE5MTQ4RTU0RUVENjM5MkYwQjIyMDMwQUZBNjU1RTA3QgoKRTZCMEY2QTU4MjY2RDVB
-QUQ4MzY1RDI3OUZBNTE1ODRFRDRCREY1RTk4MUUzMTczMjg2ODc4OTM2MkExM0Y2OEQ3RUVD
-M0VDQ0Y0NkQ5CgoxODU3NDgyRENBMDE4OTQ0QUFCRjk5M0Y5MDYzNUM2MDI4MDEyMjQwRDhD
-NjcwQkU0OEU0QkFEMjlCQkMxMThEQTBCNzMzRTIwMTk1MDIKCjA5RjJDNjA4Nzk4RTNGQzZD
-RDM2OTlCNjFEMjA3NzUzQTVDN0UzMUQ1QURCNjEwRjdBOUZGMzZDNkU3MzQ0MjU2OUYwMjVF
-QTVFOEE0RAoKRkE4OUU0M0YxMEI0NEM5MDcwMjQzMTZGMDdCNDE4M0IyMDJFODY3N0Y0NDQ5
-NTIwQ0MwNjM2MUYwNzVCQ0MwNjVBMEM0OTExMzczMjgxCgo4OEZBQzcyRUMyNEI5QjUyNTAw
-RDEwMzczN0Q0MEEzMTFENTc1MkVCQTVGMDZFQjU5M0I1NjE0N0Y3MDg5MTRENDc0QjdFNjdF
-QzQ4QzcKCjMyRDQwQUI3Qzg2NzFFMEM4MDI5NURFM0IyQ0U2OUM5NzU5QjUzNjUyMEVCREE5
-Mzg3MjkyMTRDNjhGRkVGQ0ExMTlCODY1QzJBNEJBNQoKMTU5ODYzMjNBRDE0OTYzNjc5MUFE
-MDBCMzI4RTBFMkQ0N0FFQ0Y0MDZBNDNEOTRGQzg3Q0Q1MEFDNjVDNUQ0RTU1RUIyNEY0ODkz
-OEUyCgo4MzA1RTFERjBDNkFEQTQyQ0E0NzY5MTI0Njg2MEY1MEEyQTYyOTJGMDU5MEQ2RjhD
-NDA3NkYzQzYzMjVBRDI1RkFBNTZBMzYxQzAzQzIKCjAzNjk0QTM5MTAzREQyMDlDMDRCODVF
-NUI3NDBDRUMyMjI5OTNDNjc2NzUwQkY5Mzc0NDhFNEIwRUZDOTQ5MDNGQTA0QTY1ODk1MTEw
-OAoKREREQzNERUNDQjdCNzFCNTQ0RDAzMEU2RERDRERERDVEOEFCQkU5MDg2MkU4Q0I0RTY1
-QzI5OEYyQUU0RDZBQjc3MzA5MUY2MzdDRjhDCgpDQTc1NTY4RTQ2QzVDM0Y2RDgzNzk1NEU3
-QzFFNEFFRDNDNDQ5RkJEQzg1QTMxQzg3RDQ1NzQ4NUQwQzFGQjRDOTc5NTc5MjVFQUJDQUYK
-CjgwQUFCOTYwNzg4MUZEMUVFOUREQjk4NjkyNzNBNjlBRTI4RUU2N0U2OTRBN0FDMTVCMzhC
-Q0FFNzYxMjBFODRBM0E1NzA0NjZBRjg4QQoKQzE0MDI0M0I5MENFMkEwQTIwNkY3MjZBQ0Ex
-MDNENEFBREVGOTdFNUI1RTRDNzUzRkIwODM4MTgyMEVDODA1NjI4OEJDQUY4NkRENzE0CgpC
-QzU1QkFFODBFODY3MDgwMkEzMEIyNDM2MUI0ODMwRTU1NTYzQTc0RTVEQjk4NjJDRTBDNUFF
-OTcyRUY5MTg4QTlEOTYxRUNBNUVGRTQKCjQ1REQxMUZGMjQwQjE5NzY2RDI2MUNBQzMyRjJG
-QTI0QjhERjk1REQ5QTVBRTZCQzVBQkQ2NkUwODgzREU4MURBQzgwOEVDOUU2NEQ4MgoKMDZC
-RjM0RDNENDE4Q0QxNTAyQzFCRjg2NUZCODkwNDZCRjIyODMyM0M5QjI1OUZFREM0NEEyNEI0
-MUFGRjdENEU2MjI3RjMzQ0JDNTlECgpCQjMzNjMzRDMxQkEwRjY1NEY0ODc2MkRFNUQ3QjBB
-MDMwNzlFNjcyMDZDNDY2MUJDNDEwRjNENUY0NkRGMTAyNzQxQzU5NDlBRjYxQzgKCkJEQjg1
-NTJCQTAxQUVFQkFBMTgzRUQ1NzY4MUZBMkZEOTJERDRDNDBFOEFCMTBBQUQ0ODU3ODg4RERF
-RkE1Qjg0OTAxOTFBNjI5QzBEQQoKNkYwOTk2MDdGODVFRDEyNDE3RTg3OUQ3NzBFMDE2RDI5
-N0VEMzFFNEQzNjA4MkI2NzAwMkY4MzM1NjEyMjdBMjg4OTFCNkQyQkRDM0NBCgpDRjNGNkNB
-M0Q4MzNFOEIxRTU4N0I0OTAwRjVCQ0RCMjk1REQxNjI2QkZDRDVEOUJDMzFCOENBMDg2RTI2
-NEYyNTU5OUJFNDJFMDdENTgKCkFEQTZFMDU0OTcwRERCRUJBNThENzE4NUVCMDAzQUFBODY5
-MTM4RkIzMUVBNDc3Qzg4MUU1NTZBMEIzNTg0MUFDMDk1RTIyNjUyM0IzMgoKNzczRTEyOEY1
-NDEwNjhBNzdCNDNGNjFCQTc4OTFGMzc3ODFGQzYyN0MzOTU4OUJBNERCQ0E0REQ5OEM3QkZB
-MzExQTdDQjZFQkM3RUYwCgpBMkEyNTM5M0Q3QkQ4NEQwMEQ5NTFENENGOUQ5QTE4MzQwMzg4
-Mzg4MzBBNTAzNTJERjY4Qzk3MDFEMENFNzU4NDYyNkJBMUFERjFEMDAKCkI1OTJGMzQ4OTdF
-QkVDNjI4MERBNTIyM0U0NkEwREI4NzVDQjEwQkI3NzJCN0NEMTZGMjZBRTE5Q0IxRjJFNTU0
-Mzc0RTg5Q0Q0RjdGMgoKNzQ4NUQ5MTY5RkQ0ODM1NDMxN0IxNjQ2NTc4RDk1NjU1MzQzMEJG
-RjIwOTAyMTdCMTVCQUI1NTBBOEUwRjM2REZENjA4OEE1RTlENTJECgo2QjUzMDNEOUUyQzBB
-RUI2MDc3NDkzODRERjBDRTc2NjQ0MzM0RkYzNkMzNTM4N0Q3NkZGODVCODA2NDQ2MEMyOEZD
-ODk1QUEwQjk5OTQKCkMzNjcwRUEyNkU4MzM1QkYzMzFGNEI0MDY4MzZDQjdFQTQ1NzI1ODkx
-MkM2REY0ODA0MjA1MEM3RDMzM0JDMDJGRUU0NzQ4OTA5RkI0NQoKOERENUQ1NUU3RkQwNDQ5
-N0NFMzREQkU4MkU4OEQ2QUU2NDEyNTA4NjNCOEE1N0IxMTYyNEU2MkNFREQ4MEUwNUZFQkFE
-QkE2NDY2MzYzCgpFQ0VDQjkyMUQxMURGNTkzOTg5MUU1QjVDQUJCMzZGQkRGODIyRUJGMTdE
-OTUwRUZGM0Y0RTg1MENFREM1RjBGRkZDOTdBQTE2MkJGRjgKCkE2N0NENzdFRUREQ0Y1RDVG
-QzQ4QTMwM0RFQjJFRTcxNkIwQzZGNTM0NjlFRTIzQjU1M0Q2NUZDNENERTAwNEEyOTQwQzcx
-RTRCQTcyQwoKMTQ4MkIyRkQyQUJGQzZFOEE4NzdBODA3NDg2RDg2REE2OTYxMUFERkFCOUU3
-NjUyN0U2QUMxNTAwNkUyNkRGRENDMzMxNEYyNEQyNzdDCgo1MzMwNTE2MEE5RUZENDM3MjI1
-OEM2OUU4NDU3RUIyNEFFMTYzQUU5OTdEQTY5MkREQkQ2RjlGNkI0QTBBODBBQzJDMkFGRUM3
-MUJFRTEKCjNDOEVERjQzRjdBNjIyQjJCRjBDODYwRkNENjQwNTcwNEQ2MEI2QzcxNjQyRjI3
-RERGQzA4QThBMDJDNjEwOEI5MDM2QjVGN0NBRkJBMAoKQkMwREQyRUU0QUQyQTNEMDYzRTJB
-QTA3OEZDRTIyNkIxMTQ2N0JBRjk5MjcxOUI1NURERjVGRkNFMkIzNDQ2NkQ0Q0JGQThGQzU2
-NDdDCgoyMjJFQkQxMUVFNjBCQzU2N0YwNUFBMzg3MDREREFGRUM4OTM3NDY5QTgzRDA5NjQz
-RjdCNzk4RUIyOEU1REE4MjNCOUEwNkI3QkM4QTUKCkMwNURDNzA1RjBBMTE5NEZFMTdENzk0
-ODk0MDM5NTYxN0FDMjVCQzkyMkIzQzgzOEM1MDdDMUNBQTk1QjY1QTJBNUY0MTkyOUQ3NUQz
-QgoKMUVEQzI2MTkzMENFNDExNjMyMTlDODgyNzgwM0VENUFDNTBCRjg1QUY3QzY5RDU3Mjg2
-RTUxMjBDMEYwODExNEJEQzMyNzhGQ0RGNzc0CgozRkM3RDhENUVBM0I0RDNGMkIyRjNCN0I2
-QzRENjJEMjBBN0Q5OEFBQkRCOUI5REQ3NzM5NTYxQjE1RkNFRTgxMzlCODFFRTYwMzMxRDAK
-CjkzOUU5OTA5OUYyQjE2N0EwQUFBOUU4NUQ4MDMwNjJFQ0M2RUQzNjkxNkM3NUVCNTgyNDND
-MjgyNUJFOTdGMzAyMUQyM0Q3M0ExNTYxNQoKMTJFQTkwNEE5NDkyNEFFMUI2NkY1QUE2MEFG
-RTNFNDdFNUEzN0U1QkM1MzU3MkJCRDU3OEFFOTIzQzU0NjVGODI0MDU2NzAzREQxQTFGCgo1
-RUZBREQ1NTdDRkEzMjJDNDZCQzk0NDE5OTE5MEM5QUJCMjYwNERGMkE3QjU1NDgwQzVENzAz
-NUFGQjdDN0E3NDU5QTBBMjM2NTczQjkKCjkxRjQ2MkFERUY1OTUzQUIyRjQ1Q0Q4MzdEQjIx
-Q0FEQTZEMzlDRkZEQkEzNTU0QzE2NkJBN0YxRkQyODk1M0ZDMzhCODUzNjI3RkEyMQoKNzU1
-MzcxNDRBNjYyNzAzNUE1MTJCMkQzNkRBNzFCREEyMzQxMzJEN0MyQ0VDNEYyOTc1MEMxNEZC
-ODE5NkQyNTZGMDU5MjJGMjZBM0RBCgpFMjJFNEUxNEI1MjE5NkY4Q0Y3MjYxQ0UwQ0JBQkRB
-QzFBMkMyRTA1NDFCMEFCQkM4RTA5QjE3MzFEREVCREQ1NDFEOTU1N0FGQkQ5MEYKCjNEODRB
-ODc4OUVFRDU5NkY2REVGRDM0RTQ2NTFCN0ZGOURFMUNDNDE5RkM3RkFGMUEzRTdEN0VFMTQ3
-RDYwNjg2RUZENUY1NUY1RDkxMQoKRUZERDU1QzRFMEJBNjQ3QUQ1OTlFMENFMTQwNUY3MTY2
-OUZBQjY3OTFGNDY1RTdGQzFDMjQ3QUI0RTUyQzY0RkIyRTZBMThENDQ2M0I5Cgo5NUNGNjM3
-OTk4Q0I5MUJFQjFCNjhBOEMzRTQ0NjBGOEYxRTM1MTY5Rjc4RkFDMkQ2Njc3RTI0Mzg1NEQ2
-RjZDODY4NUU1MTk5RDhGQjcKCjI1RTM4M0NGMzM4QjI3NkZFNzg1OTU0NDM0RUU4NzY4RkI5
-NTMxMUQ0N0ZEMzI3Mzc1MUU0Q0RFQ0YwQ0RFM0Y3N0E3NTEzQjM5RTMxOQoKMTg2QjQ0OTUw
-MTZGQjk3QjREOTk2RjRGQjg2QUZEMDBFQzlGNTRBQzQ0QUM1MTlCQkE1REVCRkQ1RjM5Mjg2
-ODE3QjI1Njk1NzUwRTFBCgo0RjIxMERDOEMwNkE4NjJGMUY4OENFM0FEN0Q1NzY0NTgxRTU4
-OEQ0NzJCOEI0MDdDRDA3NEE1Q0NCMzlENkUxMzhGQzNFNThDOUMwOTYKCjRCOEMwMTk1ODQ3
-QTdCQzBFNThFNzk2RUU2MEExMEZFMDAzRjI2MjMxRUEwRjBFQjdFMTAwREQ2ODkwRjZBRkI4
-QzIyOTAyOTBBOTdERQoKNEVGMUY1QkZGQzA3MjkyRDJCNEQyNjE4QTQzMEZGM0UxMTVCRkIz
-NTExNjgzNTg5MUVFREVGNEQ5NDU2RENDOEEyNURGNTQyOUJEQjUyCgo3MTUxQ0E0MjU3MEY0
-NENGMzZENkZEMzFBMTBENTg2MzFGNTk2NjU3OTQ5NUQ2MjE3QTIxREM0MzZCN0UyNkFDRTFD
-MDNFNjJDRUFFQTAKCjdDMDlBNjcxMUZBNkI3RjM0NTA0QzRFMDc5OUU3OTdENEQyNzc1RkZE
-MEU5QzJDRUQ5RENDOEY2NEY4NjM5REY4QjIwRUE5Nzk3MDhDNQoKODFCRkM1NEYwOEJBQkU5
-RjUzODRFMzU3ODg1QzU0QUMzM0UwRkVEMjcyMTU0ODQzNjMxQ0UwM0VGRDkzREYwMUQxNjAw
-QkU2NTg3N0IxCgo1MUM0MTIxOTM2NzY0MUVEMDE5MkUxMkYyNkY4NzFCMTNFQ0IyNTgyRjc1
-Q0E3RjFCQUIzREYwQjg5OTQyQkFEMDM2RTlBQzdBNEM3MkQKCjZFQkIwQkREQkFGMkY2RjlB
-RDI4NENGRERGMjkzNEI0RUI4NkU5NDk5OUQxNDMzRUZBMkUyNzgzOTREREY2ODYxODhBQThF
-NkMxNTE3OQoKQUEyMzJBQUQyNEQ1MDM2QTM5QTQ5Qzg0QkYzM0FDODY0RkQ3NkJDOTFEOEU5
-MTVGMEE2MDRCOEE0QUE5OTgzNkRFRTAxRDcyRTA2NTk2Cgo4OEZCRDE5MTk1RDkyRjVDN0ZE
-OThDODY4MDRFN0QzRjdFODE4Q0M2MUIzNzdFRDQ4QjVEQkQ3NDQzNTE1NjRGRDRFODJCNkRF
-QjFBNzMKCkI5NjQ2ODQ5ODVGQ0JBQjk3QUM5MDNEREU4MTBFMDFCMjdDNDQyNjdCOUQ2QzND
-RkRBNzQwMENCOTIyRjZEQ0M2QjcxMUMwNDVDN0MxRQoKQkEyNzZFRTkxNTkzNjY0M0EwQTZD
-RUI0OUMwREVBODdCMEQ2N0I0Mjk0RjIxRjMwRkZENTk2MjZENzc3RDVFNjNCNTQwMEIxRUI5
-MkE0CgowM0NCNjg4QjUzNDFDNDBBNjlDNEQ0MTNGRjRCMzE3NzUwNTMxRUFERDExRjg4ODUx
-RjYzNDU2NjlGNThDNTNFQzhCNzY0QUE2NjZCRDYKCkU1NEI0OEU0NzQzQjJFRUMxM0Q3MTYx
-QzUyMDM0MzNGREFERDlBNENCM0U2OTY0MUQzNzk1QTJFODEwQTQ1QkRBRTM1MzJCOTdBNTJD
-NAoKOURCNTUyQTg3NkMxQUJBQUIyRTNBQzEwMkM5ODc5RDIwM0Q2MkIxQkQ0QzIzQkM1MkUz
-RjBDOTRBNTU3OTU5QzZDNTc1MTU1RjdBRjY1CgowNTQyQjVDMTAyNDdDREI1NDA5NDU0QzZC
-RDdGNTZDMTMyMzBDN0Y1Mzk1RTIxMUNGMkZDRDg3MkZCQkMxQUNENjg3MjA2RUU1OUQ2QkIK
-CjRFRTYzRTI0NDE4NjlGODc1QUUzNTY4MDM1NkVGRTVBMDhBQzUwNENCQ0YzNkY5Nzc0M0Yw
-Njc0MEU1MTM3RDE3ODMyREExNDI5MzNGNQoKNzA5QURGNkRGNTE3N0E4NEQyMkJFREU0Q0Iz
-RTZEMzBCMTFCM0M5MUJEMEQyMDIzNTJCREM3NjcxMDZDNEE4NzE5REEyQzc1QTM1NUMzCgo1
-M0M2N0NDNTM3NzVFRTE5MkUzMTU1NEFFMDIzOTlFQzNFNUNFNzc5QUVENzdEMTEyRjNDNzA1
-OUQzQzZBMzE2MTc5RUYzQzNBRTA0RjIKCjNBQ0E0MTEzODdFMUU5RDA5MzBFOUMxRjM3NTIz
-MTVENjMxRTU1NjkzNkNDQzZFRkVFNzdEQ0I3RTcwNTc3OUY4MzAyODQ4RURGRkU3MAoKRDEy
-QTVDN0JFMjNDQjZFRDY1RERENDdGMEUwRjA4MjE2MEEyNTM4RTFCMDMyQUFFMTdDOTdDRjdG
-OTcyMTc5NzJGOTk3Q0IyMEFGNzFCCgo4OTdCMENFMTlDODk3MkE5MDlFRjEzODA2OTJCODJF
-OUIwOUMyNTdBMENBNUNFMDdGMjcyQjU2QkQzMjFEOUVBRUVERUVCRDA4NjM0RDYKCkI5RUMw
-MzMyMEQyQ0UyMDhEODIzQzBEMDJENUJDQjlBOTkxQUY3ODRGRDcwNUNBMzMxNjYyNjIxRDNE
-NzkzQzhDMzExRjc2NDVGQUMwMAoKQkM4Q0FBRjc0RjNGQjhEMzMyMzYzOTA4MjYwMTU4N0I3
-ODE2NDk5RkE0Q0Q5NTY2MjhCNzgwNkNDNDA3ODE1QkEwQ0I5RTI2MTQ1MzAwCgpBOTE1RjdC
-NTQ2MjIyRTVCNDk2OUJENDREOURGNTE5NEQ3NzE5QTBBN0JGNzJCMEZBNERCQThCMjNCQTAy
-REM4NDQxQTlFNEM1N0M3REMKCkNDQzJGNUJFNTk3ODZGM0Q3OUQwNzBDMUYyRDAyMDAzMTYw
-QkU0QjAyRTY3NjdDNTg3Njk3M0M3ODZFMTBGNTY3QTExMjhDNjc1REVCNwoKNDYxODNEQjM0
-REFFMjk4RTA3RjBGNzhBNDhGQkNCRDZFREUyNjk4NjM5QUJDMkU1QTFCMkU0NjdEOTNBNjlC
-RDJENjdGNDFGNjI1OTNCCgo4MjQyQzRBNDA2OEJFQkM0RkE3MTY1QjYwQkNEMDdBODc1MjU3
-OUZFNDZDRTdEMDQ5NEIwNkQwQ0MyRTc1NjhFREVENjBEMEY5Q0JFQzkKCkQzRDQwMzJFNjUw
-NzQxQkMyMUE4Mzk2MjcwMDE0NEYxQ0JCNjhBRjI1QkUwQzBENUVBQTlERThERDhBNjhEQTdF
-MEY2QUZGMUJEOEZCMgoKODI3ODIyNkEyRURERTdFMEIzM0JBNkQyQTA1MTRENEY5MEI0OEZE
-NjMwMEZGQTlCNzQ3OURDOTM0QkYzQUFBQUI5NUIyQUY5NTY0RTlECgo2RUMzOTk1N0U3NzJG
-QzVGMjQ4MTY2Mzc4MjBCNjhCODgwQ0Q4NENCMEM1MEI0REEyMTJBMjBFOTA0RDM3QjM2MEUy
-OUREQ0EyQ0ZCNTcKCkVGMjM5QTVGQUU3Rjk2NEM3MkIxRkFGNjQ5NzJFNDk2OTMzNzAxOEQy
-NkM5Q0I5RDY4QjZDQUM0RTNDRDJEMzg5MzE0NUM5NDMyRkM2RgoKMEZGOEMwNjJDM0YwRjFD
-M0FCMEVEOEQ2QjU1MDVCRDE2RUU2QTE1QUFFNTdCQ0UwNzMzMzQ2NTUwMTg2N0YyREVGQkJF
-MDI3NEU0NjczCgo4RkZFOEJEMUI0MjExRkVGNEE4QzI4MjA4RTk4Q0I0RDcyREVDNTU5MTI3
-QUFEQUZFQUNCQzBEOTg4MTcyMzkxODBCQ0I0M0REMjM5RjYKCjkxQTNFRURFNTE1QTMzNzBB
-RjU3Mzk4NDFBQjlDOTFEQjc3QjkxNDQxRTRBNkYwRkUxMTNCNERDNTA5RTRCQzk1MUM4MDBD
-RTc4ODUyNgoKOUU4MzZBNUFFNTk1QTcyNzdBQUM4NTEzMzBDRDNDREFFNERENDU2OTk5NEUx
-RjRDRkNDNzVFNDU5QkM5RTFCQzdGMjE1QkMyRDY5MjZGCgo1REQ1MDlBMDlDRjIyQzUwNkVC
-RjIyRDIzMDQ4NzBDMzkwNUQ5NDYwOUY4Mjk1RDBDNTVCNDAzQTc1NzJGRjRDMERBNjAwQTc0
-RDM2NDEKCkRFNERDMENGMTRBRTM1MENFOTRFNzEzQTJBRDgzMTQyMkYyMTcxNzc3MTg3ODQw
-MDY5RjQxNENCRDMxRjM2NDhGODgyODdDNTBFNDI3NwoKMzIwNTRGNURGQTFGQUJFQTU3RUVD
-QjhGREM4MDE5RDM3MzM2RDhEMEU4NDBGQ0VDRDBGREYxOUU1NkEzODZDMzUyMUUyODcyNkMz
-RjBECgpCNkRBNDkyMTBGNzJDNjZCQ0MxRTVDQUIxNUZGMTlBOEIyNUM1NDQyQTBGOUUwRDQx
-RkFGODI0MDc4RkM2RjZFQkIzNzc4QzZGRkRFNjkKCjhFRTAyMUMzNTNCMkEwMEY4MzkwM0Uw
-MDFBMTcxNkU3NTMwOEEwOEE4QTg5NzhDQjRBOTlEMzc5Qzc2NjI5RUVGRjY1QjkyNkVFMzMz
-OAoKNTQxNDRGNDNCMDRGODM4QUI1MDAzRkMzNjUwNTMyNUQzRTRFNEI1RkI3NUExMjIxQjMy
-RENBQzRDRkQzNTg4RkUwREEzNEFGM0FBRkFDCgpBMzk1NUNBQTA0ODU2QTE5NkFEREExNjE3
-MUFBQjdFMjFDMzRDQzQ0Nzc0MUU1MDZGMTUzQjdGNDY2ODcxMzQyQUM3MkQ3OThCNjM1NzIK
-CjNGNDk0N0FGODRFNjc5RDRBOTE0NUVDMjYwNjRGMDIzODhDNzMxQjJEQURBMjY5NzdDNTZG
-REUwOUJCREUwNTFBRjg5NUE5Q0M0QTgwQwoKRTlBQUU3OUYwNkJGOTEzQ0JBQTY5RDQ0NUIx
-MjAyM0FGMUE3QkZENTg0RDQ0Q0NFMDRGNTBENzdFOTJGMzkyOTRBQTFCREIwOEZDNjU2Cgo3
-MjE4Q0I3RkEzNEEwOUUxNTc0RjdBRTQwREU0M0ZGQjcxNzYyNUYyQzU2MjlBRkQ3MUFDRDhE
-ODBCODg4MzJDMjREOERGODIyNzlEODgKCjMyODExQUZDRDYzNEM1MkUzMjFBNDc3OEZGMDY2
-NTA4QTBBNjNDRkIzOTA1RUE3NUY1ODIxREQ1NjhCOTBEMTEyOEJCQkE0NDIyM0M3RQoKNzVE
-QzhGNzgwNTY4RkIyRTYwMzk2MjEyNUNCMDJDMUE0OTJGQ0EwQTAwOTZBNUJBOEI3RDBDQjEw
-NTFBOTRFRjYxN0RBMUU1NzcxQjBGCgpEQUNEQ0Q4NzdEMDY5OUUwMTY1MEY4Q0FFNzAyN0Ey
-MEFDMzA4QjdCNzFGOEQyNzA5Q0VEOTgxNTQxQjUwNDU2RDdEMTcyNEQyOEZEQzcKCjRCNUZE
-MDVCRjcxQTk4REJBMUIyN0QyNjk0MzZDOUJDNjY4RkVDQkE4RDY2MEREQjdDRjdGN0Y5NjFC
-RUYwNUZBNjJFNDk0MjE2MTlDNAoKNENBNzIwQzI0MjZBMUQ0ODZDOTVFMDI2NDE2REQ4NTM0
-Qzg1QUEyMDBGOTVCOEVCRDRBNDUyNTQxNjI5RTFGREUyRkUxMUQ4NEQ5NjlCCgoyQUEwMUE5
-QjdGNTQ2QTY0RjU5ODE4M0MyM0UyNkQzOEQ4NkY0N0UyOUM4Mjg5QzVBQkVBRjFENUFDQUJD
-RTEwREU0NkM1MEUzRDI1RDkKCjgwRDA3OUU4QkJBOTk1MTVBRkQ5REIyNUNBOEQzNDk4NEQ1
-RDk2QUJBNjVFMjg1MDQ4MkYyNjREODMxNkVEMzg2OEQ1MzU3QUUwMkFFNwoKM0NENTI4MkRD
-MTkwOEE2NjZGOUVBRjE1RkJCMkUxOUQzRUEzNTA5QzU3ODFFRDA2OTBBMjA2MjFCREQzMUFE
-MkQ4MEY3Nzg3QzVFNjc4CgpCNzE3MUI5NDVDNUFFRDc5MThEQzMxM0UwMTE2NTNENEFCNUNB
-MTUxQjQ4MTQ0QTBBNkIyQzJEQ0ZGMzYxRjcxMTgxMURCNkYyNDlCRTcKCjY1NzlBNDNFRDM2
-MzMwNkQ2ODExRDZFNTgwMUQ2QTg0RDRDODkyOTU2RjBEMDBBOThDQkY1NjhBNEJFNDgxMzI1
-QUM5RjA5NzJGQkQ1QgoKNkNFMzIzQjBGQzQzMjI4ODUwMTI3NkJEREE0RDUwNTA1QkNFQTQ0
-QTVDN0RGRkUxMThGMUVBOUZCMEEwMUNFM0I3RDhEMDQyQ0I4QzQwCgpGQTMxQzBDN0Y1RDY1
-MEQ4NTZDNkNBODY0QkUzQkI0NkQ4ODc1MkQ4MUVCMTUwMDkyM0Y5REI0N0M4NkI4Njk5OEM4
-QjFEQTcwNzc2QUYKCjcyQkQzQ0VFMkYyMkZGN0YxMzJERUVERjhFMUZBRDk2RDI0Mjg2MzI1
-MkYwMzMyMkI0NTg0MjhBNUQ5OTY4NTJCMUE4NjJDNTdDRjA4NwoKQzFBREU5ODAzRkFGMjRE
-MjVFRDU0QzlDQUUxQzMxNzVFNzUyRUJGMERGREQzRENFMDAyQkJFRUQxQTE4NUYyQjk2OEYx
-Nzg5NjQ1RDEzCgpEODNFM0ZCMTVGMjRERjQ0RTg1QjMwM0YzMkM2ODE3NjJEMjNFRDgxM0FC
-Qjc1NTUxQTMyQzhEMzVDNjBGQjM3ODRFOTI2QUYxODdGNDUKCkU5OERGMUZFMTdFQTkxQUQw
-QTExRUJDRjE0QkIyMkJGRjE5QkI1MjQ1MkU4RTA2Q0UzMjJCMjk1OUNFQUFGRDk5MjA1NENG
-RTk1QzdGMgoKNDVGNTZFQ0JBQzA2NTk1RjQyMDJBNTI3MkI3QUZDRDQwQzk5RUYzRjc4REM5
-RkVCRDU1MkRENDkxMzU3MDQzODM1MUNCNzZFRDY5MTQ3CgpCNDZBRjU4OUU3N0RDNDJFRjAy
-MTgwNDk0MEFCQjM5NUY1NDlBRTc2NjFCMEUyOEUxODBDOEIyNEI4MkJEQjc3QUExN0Q4RkJC
-MUJGQkIKCkIxNkFERDVCNDhEQThBQ0E4MzIxQTY2QjYwNkU2N0YwRDY0MjE1QkMzRTI1RTc0
-RTI2RTY5MDhEQjE5RTk2NkY5NEIxRjNGRjg3MjY0MgoKNTM4MEZENzIyQjAyQzI1MUQ1N0Uz
-MDEwMTZGMjlBOTg0MTZEOTBCMTk0NTgzN0UyNjVBMjg0RkYyQjhENjU1ODkxRDc2OURBQUQ3
-NEI1CgpFQjVBMzI3NEZGOTE0MEQzNkVCRkQwOEE1QkY1NzlCRkU1QjNCQTk2ODU2QUJDN0M0
-ODcxQTBBOEY3NkQwNzM0NzI1RjZGMUQ0MkVCOUIKCkIxRUM4NEFFMjkwQkJDM0RFNjAxODAx
-MDAyQjhFNUYwNzVBMTVEODFGOTU4RUE0NDZERDJEQjhGNURBMTBFNzcyOUFFRkY5NEQ1Q0RF
-OQoKOUU0QjkyMzcyMjU2N0I4NkVDODE5OTlFRkEyRjcxM0U1OTdBRThEOTcxNTg2REIxRkI4
-OUFDNjNEM0Q0QTYxMzcwNTNCNEI5QzkxODZECgoyOTk5NEY1RTRDNzAxNzIxNTNCRTM3RTNB
-QjFCOTM4OEE2NzY1QUNEMkIwMkVGQzhERUI1MDY3MEVFRjc5RkRCREIzNDk0RDMyRTk2ODcK
-CkExOTNBRTZEQjJCN0I3M0M0Mzg3NkZGMzJEOENFNjQyMDA5NkQ5QjdGOEE5ODUwODEyODgx
-QTFFMTgwNTRENTdCOTg0MDNBMzIzRDA1RAoKREZGNkNEN0FFNTlGNEVFNUZFNDY2Q0Q2M0My
-N0Q3RkI2RkI2Mzg4NUQwNUY0QUM3NDk1MTM5MkYwQkFBMjdCMDhDRjg4Njg2MEQ0NDg0Cgo0
-MTVFMURCOEVEQ0FBMzlDRTc1OEY4RENCODBGOTYxQkQ0MzA2RTRBNDYyQUQ3QUEzMzMyMTk1
-MDAyQjMyRDUzRTVDMjEyQzAxQzk5NDkKCkZFMzBFOEEzRUVENjc0N0U3NjU3QTU2NzYzOTAw
-NkYzQjQxMTk4NTQ0NEFDM0UxQkQxMzMyNDFENThERDMyQTI3ODAzMzQzRThEQTk2OQoKNjBB
-Rjg1MDEwRTlCM0IxNkFDNENGRUQyOEYzNTAwRDU1OENFQTUwQzUwN0Y3QTg5QTdGMDY5QjFG
-QUU4NzM1ODRENkNGQTBENEYxQzI5CgpDNDYyMDdFQjY3Njc4MkIyMDNDNTUyNzlCNjc3NzE2
-RDc1NEUwQzE0RjE1NzExOTc1MDU0RDk0QURDODIxMEVBQ0QzMDIwOEUwRkNFNDcKCkY4NEUx
-MjBDNTQ1REMwRjFBNDg2MTE5OUQ0MkU1QTgwOUI1MzFENDJBQjA5MkM5QzQyMTY3REI2MzAz
-QzVBMzM0REUxOEREQTdFNzlEOAoKQURDNTQ2QTgxQUY0QkYwMzY5NTY2MkE5Q0ZDRkU2RkE0
-NjlEQUM2MDU2MjQyQThGRUI4NzkyOUY5Nzg5MDlDNkQ0QzkzREQyRDYwQkUxCgo2MEZFRkRB
-QjkyNjM4ODcyQzNFNjUxODc0NkMxQjFEQUUxN0FBOTY3REU3OTg3Njk5OTYxNTA3NUIyRkZE
-QTY3RUU5Qjc0M0UyQ0Q1NjAKCkVCQkE1NjA4QTk4QTA1REEzN0Q4RjIxQzE2MThDMDJEOEU5
-Nzg0MjNEQTgwRDdDMzhDRjU2MjYxMEU4NUREMEYxNzc1RDgwMjFDOTQzMgoKN0NCQjFGNUMy
-MEVBNDFFOENBMTlBNEU2RDUwQTNCRDUxMjlFMjExMDFFMzEyQTlDOEY0NzBFMUVCMTJEMDM4
-RTVBRTRERTUzN0Y0MzI3CgpCNzcwOTE2NjdEMTk2QzM2MTJCQzY5MjVBMjRFNjZFMkJCQ0ZC
-RjZBNEM5Mzg0NTdGRUUzNkRDMUZGNzRFRDdBOUM4RjY0ODNDNThGMkYKCjI3QjcwNjVGMzU2
-NjMyMjdFRTQ0OTJFM0YwNkI2MDcxQ0VBNDU3MzlBQ0I5NDNCRjBFRkZCQ0I5OUQwMzIzM0M1
-MzEyNzAzRTc0Q0ZBMwoKNTI4ODE4MkQ5RjM3MUUzRjIyMjU3OTY0Rjg2NDcyQUFFQkE4MDYx
-QkYwMzlDOThDMEI4REYxNEM3MEZDOEEzMTNEQ0RFQjk0M0U2MjUzCgo1MjM0QUVFNjI4QjlG
-OTc2NjBBNzY4Q0ZDRDA0NzAxQTBGNEM4MThCQTVDMDIxOUU3MEIzNzU3MERCMEQ2MjVFNERF
-M0YyMjBFRUFCMEYKCkExOTQyMkExNzEyNEIwOThFQjRDOUM5RTcxRTJBQTBCRjUzNkE4MTE2
-MUMyNzg4OTczRUI1NkNBMEE4MDY0RDYwMjVFNjRDNTcyNjUyMwoKMjY1QzJFNkFFQ0YyRTA0
-NEQwOTY5NTA4Q0ZENERFQTdBQUZBNzE3N0ZCNzk3QTVFNTgyMDVDMDk0QkU5ODVGQkQ0Q0NE
-MkQyNDlFQ0Y0CgpCMkQ3NjY4OUVDMzNGNjQ4ODlGMkFDNDAwOTJGNDdCOUJDNkQ1Q0VERDFB
-OUY4M0EwODMyMDk2QjgxQkY3NjI5RTQ2NTkxQzEwOUY1N0MKCjQwMThFQUFCNzhGRTcxNkQ3
-NkVCM0MzNTEyOUJCMTYzQzEzRjNBQjc2NTFFMzg5NzEzNTEzQkU2NkEwNkUwODJFOTBGRDJC
-QjBDNUNDQwoKNTFEMjI5QjNCRTVBRkREMTc1REM5NzkxRUFDMEMyQkE0QjMyQ0IwNDI3QUEx
-NUJCNTA2QkQ2Nzc5MDdDRTQzRDU4RjkyOUMwRTcxMUY2CgpGQzk1Nzc4NTE1QzI1RkU5Qjg5
-MkJDQjg0NDhFQzZFQzBCRTQ4ODYxRDFENTdFMEIzNkY2MkNDRDY4N0Q4MjQwNENDRDUyQTM4
-QUYyNjYKCkU0MkQyMDE5NTMyNDlERDBFODQzMDhDMENFNEE2MDU2QjA5NTJGMjUwODRDNjg0
-RDNFRjIwQzYwOEZBNkY0QzRFM0ExQTI3NDMwNzc0NwoKNEU5MDNFQzQ2NzM1NDI5RkNFMUUx
-RUJBMzYzRDUwOTM4NUFDMDY3RkVFMTAyNzI4MkY2QzczNTc2OEI5NjVGMjZFNTQyQzRBNjZB
-NjJDCgpDMTM0REZGOTRDNjkyNDAxRkI5NkU2M0YzRkRGQkUzRjUzMUEyNjQxNDI3NUNBQUFC
-MTQ2OEUyQjQ2MDQ5Q0IzOTk4OTUyM0QyMjY4REEKCkRCMUI5REY0QkZBRTk0RjA2RjcxRkIy
-RkJDNDk2QTY4N0U2MkNFODY1NzJCOUFDRUQ3QTZDNjVGOTg1MERBQTUyRUIyOTZGN0RFMzMy
-RQoKQzQ0RkYxRTBFRjJFMjI1NkExQjUzQkQ5QzU1RTc1QjgxQUE5NjgzMEIxRUREQTM5NUM2
-RkE3NEUwRDJENTA5QTVENzcyMDRCRTdFMTdGCgo4RTRFRTZDQjE3NjM3MjgwMDI5OTFDNjgz
-NTdBRDM4ODJCOUMyMTZCOEE3NTc0NkUyOTY4MEI0QTgwNzM4NjM2NEU4RTVDRTQ0RkQxNjMK
-CjREQzFFRTVCQThGOTVBQzIwMTM1QTQzNDRFMUE5QTM2N0ZENDc0QzM1NzI4MThGRjY0M0RC
-Q0U4QzhEMEMwMEREODAwQ0E5RUFDNTgyRAoKQzVFRjg3QzREMTM0MDg3NTlEQkFCNEU4QUFC
-RThFNzdDREUyQ0E4OUJCNTgxRkY1N0Q3REQyODRCQjgyOTc5ODU0NDREQjA3NEQyOTlCCgoz
-QjcxQThGOUI1ODZFMTUzQTIzRjc1MEI2NkYzOTZCNjMxMkNEMjIxRjQ0MTcyQTZCQTIyNDQ5
-NTgyQTkyOTRFQ0RCREZERjA5MTdCNjYKCjBBMkRGQTFFNjQzMTg4QTAzOTVDMkU3M0IzNUZC
-RjI1QTk1N0E0NTY3OTFBQUJFNDcxM0MyQkQzM0Y4MkUwQjNEQTQxRDE0MUZERjI4QgoKOTRC
-NzJBRTA4QTBEMzk4Mjg2NEU4QTU2NUZGRTVCRjlEQjRBNDlGNzIxRUQyOENFOTREQzI3REFG
-NTAzMTU0QjJBRUY4RDRDM0I1MkRFCgpBRkE3OTRGQkZBNjM5NDFFOUFBN0YxNEQ4RkQ0QTM5
-NzFEMzk5QkRBMDc5Nzc3NkQ2OUMwRjY1RkRFQjA5RjU0RkI3MzJDNEVCMjRBMUUKCjc0REYz
-MEYwOThDNTlCRDg1M0U0QUVGM0RENDcxOUQ4ODNGMzhFRjQxMzFFQUQ4NERDM0UyM0I3QTM1
-ODI1RjM5RjYwM0ExRjhGMTBCNgoKRkI3RkNBRjUyQTFBN0UzMTVFNEE4QjlEQjk1NjhDMkYy
-MzQ4MkU5NjQxRjgwMDczMzMwRThEMUIwMjgwQUEwOTc5M0YxRDkzRDhCNUNCCgo3ODQxQTFF
-QTlDOTIzMjc1MTAzQjYzMjE1QjQzOUY3QzIzQzJFRTJBNENFMzhEQjBCN0ZCQUVBQkI0NDEy
-M0YwRkFDOEE1RkYxREQ1NTUKCjFGNENGN0IzMzEzRDZBMzkyQjU4QkU4NzJGQ0UzQTg2N0Q1
-MDI4MzRCNTZBQjE0MTgxNEJEMDQ1M0QwNDhENkQxMTRGOTM4Qzg1MTRDQQoKNjIwNjA5NzhF
-OUI5NTRGNDVGRDY4ODQ1REFEQ0Y1Qjg5OTJCRTQ5QjI1MDIyQkY2NTlBMDZCNjVENEU3MTgy
-NTY1QTNEOTAwOUI2MkUwCgpEMUFGM0U4OTdEMzVDRjc2RjVBQzY5NzUyREVDQzdFM0FFMzk4
-ODMyRjRFQzQyMDhBMTI0OUYzMTc1RTY1OTY0RjRFMTgzQzhERTJGMDcKCkFERjM3Q0M3M0Ex
-MTE4OTBBQTA3RjEyQjlFNUZBNTNDQzNGRUMyQUZBOTgyODFEOTVEQkJEQTVBRkU3NzA5ODU3
-Qjk4RjIxMTc2QzM4MQoKNUI3NjVBRDgwRTM4NjU4RUE4OUE2Rjg4MzU0QzNCMUM5MDY3NDlG
-NDc3MEYxRDk3QzE3ODU5OThENTkxQzAwMUM0MzdCMjMxNTA4Mzk4CgoxREQ5MzNDMTgyRjNG
-RUZFMjJDNkI5ODE3NzE1QkQwQjA5MjlBMUM5NkVDMzM0MkMzMUEyNTgyQjlGOTAwQ0RENjBG
-MDgzNURCNzE1OTcKCjRERDA4NDQ4OTNDMTNEMTI3MjgwOTM1MzEzOTAwODJCRjNFRDFENEM3
-RkYzOTlDQUYwMTRCRjk5Njc0NTE0MkJCM0I0OUNDRTY0NjEzRQoKNTI3NDI1MkREMzZDOTBD
-NzE0RUMwMkU2NTYwRTBBRDVFRkU1NDEyQjY3ODQ0MjFBN0MxMkE0QzBFQjlCMDc5RTBBMkNB
-REI1OTUxQTkyCgpBNjc4MzA1MzY1OEFENDcwNUYzMjFBMzI2MTY0Q0ZDNzE3QTIxNDUzNEVG
-RDQ5MDk3NjcyQTkwNzZCMzQ3MzU2MEZDNkQwQkMxREU0NzQKCjcxM0Q0MUY2OEI4MDRERjk5
-QURGRDJFMTkzODIzMDU5ODlFMjVGREUzMzM1NkUzRDhDNDU3NEJBNDFGRTEwN0JFMzREMzIy
-QTFDNTBCNwoKM0I5NjQ3MDdEREE0MzgwMTcyMjZENUJCNEUyRkI0OThENTBDOUE3Q0U5M0U2
-RDUyNDczNjgxMDA4QjczM0Q0OTRCQkVDNzY4M0ZFRDhECgozMUYyMDE3MjMxNEI3ODFGRkI5
-RkI3OURFQTYyODEwOTM0MEM5MkFDRDk2N0Q0NjczMTI2Qzk1RkE4QzZFMkE4MDM1QzkxOUMz
-REMyQ0QKCkE2Nzg3RENEMDQxMjIzQTFGNTU1QkYwMTFCRjNBMDAyNEQ4RDM0MThCNENGQTY4
-Mzg5RkJDNTQ1RTFCMzdBQTEwMkQ5MUVGNDAzOTdGNAoKRTJDNDU2NEZCRDRDQzM5NEMwQTEx
-NTNDM0EwRDUxNDMzNzI1RDM1ODI1M0IzNzU2N0VDNTk1NjA5QjJCQzBGRUEwQUU2NURGNEUx
-RDIwCgo3MzQ4MUVBQjUwMzVBN0I5MTM3N0U1MEMxOUEyNjFFQTBBRTlCQ0ZFNERDRkM3OEU0
-MjY2NDZENjRBNTQ2Q0MwM0E4RjI5QjZBNTEzRjgKCjg0OTZFRjIwMUQ3QTlBMzM0NTQ1NEE0
-OTdBMDZGNTdCQ0YwNjBDODA2NDQ3MkE3QTZDMTU2RkZCOTZBOUNENjYzQzgwN0Y0REZDNkI3
-QwoKN0RGNDJBOTVGQzkxRkJFRjRFMjdEMUFCNjAxMEM3NkIwMTZBQzFFRUNCOTgxODRFNTAx
-Qzc3NTA1MDA4MTlGQTRBMzZBNTBFQUFGMDlDCgpBOEEwMjgyMjAwRDIzRjc2OTQxOEU4NDIx
-QTk0MEI4OTQyMDg4NjBBNUZGNTI1RURCODA0QUFBNDU2RUVCRENBMkQ1N0Q1RTQ1RURGMTYK
-Cjc1QjNBNjkzRjFEN0E2OTYxNzI0NDIwQkJBNjFDRTkxRjVEREM5NTNDNjk4RUNGNkNEMTg1
-QkI1MTBCMDVFMDU2Rjg3RTZFQTcyOUNBQgoKMzgxNjhFNTdBNTIxNTNBNUJCNTkzOEMwODU1
-MzNFNTBFNkZERjMwQUU0QzVDRDVGNjFCMzFCQTA2RTVCMDY5RDc2QTk1Q0RDQzY0RTdECgpG
-Q0IxNjJERkVFNDgzNkMzOEFCMTZDRENDQ0ZFQ0YxODEwRUU1NjFEQUI1RjVBOTA1OUQ2MzIx
-RUYwOTg2M0ExNjI3RjVDM0YzMzlBNUIKCjU0Q0Y2MjdENUM0NUI3OTREQUM0NkI5RTU3RkVB
-NDg5NjAzQTlEMjMxNUNCOUE0MkNCMjRBQkI3NTU1NUJGREQyMTQ3RTBEQjBBN0Y1OAoKMEJE
-RTgxQzdDNzBDM0ZGNkZENkNBMzA0RDcxOUMxODlEMEQ3RDk5MUNGM0U4N0UxNTI0MDQxMUZB
-OTQyMzdCOUZCMTQ1RkRENDM4MEZECgozQTVFRTE4NDNCRjU1QzZDOUY2NDBGN0I5RTQyQUFG
-MUQ5NkZGQzQ0RDUzNzE5QjgzRjlDMTFDRkRGRkU1MUJDNDU0RjUwRjIwRDRGNjIKCjU1MTZG
-RTRGRkIxRUU3OThDODVBRkRBNTMzMTkxODVBMkNFOTRFQjM3MTcwQkQzQjk0OTU4MkFDRjIw
-RjQzQjBGMUM0MjExODQzRDUwRAoKNEMwRkI2MTUxMDdBNTk4NUYyQ0U0OUNFMkY3QjE1OUM0
-RTU2NkU2MTdCMUM0NDYxOThGNDhERUUzRDMxRTkxOTRBRkNBNzFDRTI4NzBDCgo2NTI2QUIx
-QjA2MTRDMUI4OTRGREMwREIyRjIzNTYwODJCOEMzMTFDQkJGQzQ0MjJBRTQ1QjkwODUyMzI2
-REU5OEExN0NBOEY1RUI5RDcKCjQ5MjQwNDkxNkM2MTM2N0JCOURGNEZBQUMyRkUzMEM2QTcz
-OUNERDczRTBBQTFBQkQxNEJCMkQ3NjYzQzg2QkEyNTk4QUY4QjU1MzYwMgoKREY1QTAzMkNG
-ODBGNzlEREQwNEQzNjMwREVENDdCNDhFNThFRTc0RUFDODFBNUJEOTAyMzY5NTRBMDJEOThB
-M0RCNzA1REZCQ0JEQkQ3Cgo1OThENzc0QTI5MjAwNjMyRjU0NkExNTlBMjY1NkI4NTk4MkZG
-QUQ2RTI2NjgwNjk2NjNDRTAxN0QxNThCN0NCQzEzMTBCQkI4NjcwNTMKCkIzMDBFOEZGNEE1
-QkNGMjg2RDZENzdDRTVGNTg5MEQzRTNGREE3MkM1REEzMEQ3RDcyQ0EzRTA0MERFQzM3OTJG
-RUZEQTcxQ0VEREJGOAoKNThGMTczOTZCRDVCOERDOTlFREMwOUU5QTJCOTg4NzdBQTc5NjY1
-RTFFNDNDRkYwMjAzMEJFRkRFOUUxNDk3QzgyMkFFNDU4QkI2QjE1CgowRjZBQTQ0RDcwNjRF
-NjgyOTRCQjg0Q0MzNDUzNTA2MDA1M0QzNkE3NUI3NUI3REU2NjREMjgxNDA2RkYzMUJGQzkw
-NzE3NEI3NkZDNTEKCjExNjQ2MDJFQUVDMDlBRDE5QTBERDI0RjAwM0MxN0ZFMzc3Qjc1Q0RB
-ODk4QTM4QTQyOTFFRTUwQzVEOUM2OUY0QUNEQzIzOTQ3Nzg0OQoKQzYwRjAwOTk4MjJFREQ2
-RTNCQjU2N0FDQzE3MUY3QUM4N0M3NzVFNTZCMDc5MTQ3QkZDQTgwMjA3NURERDgzOUI4NjlD
-NEE3MUY2M0I2CgpCMkM2NUU0QjlFQjFDQjhCREY1NUJENkVBQUUxRjI5MEI1MkQ3MTJDMTRG
-MzY1RDM4MDVFMjlBM0I1NjQzQkI5MEVBN0UxQ0Y4RDlCNDIKCkZEMDlGRkJBMDZDRTk5NDE4
-ODVDQTZGOTFGMEQxQ0ZFOTFBOTRBOUJDNjE2NDYzNEZEN0NBMkFCODg5NTJGQUEwRDI0OUZD
-RjQ3RUQ4MQoKQjlCNTIwRUQ5QTU5Q0VCQTg5OTM5MzJENjdDNEY5QURCMjc4NzFFNzExQjdG
-MEYzQTQ4NDU1MTBDNDIzODQ1RjM5NkFDMzkzOERFODNCCgowMzA0MDU0MTkyQTc4OEUzNDNE
-NTEzODFFNjIyRTVENDZGRUFENjdEODUzQkYxQzhDMjY5RDkwRDIxQjYyNjc0MDlBMjBFMjRF
-Q0VBNUIKCjFFMDgzOEE0MzQ1ODU4MTRDN0U1MTI4QkU2RDBDMjQ4Q0FBMjAxNDE2NUE4Qjk3
-QUFBNkJBOEEzQkQ4NjgzNjFFOEFGMEMxMjBFQURCQgoKQzIyOUVFQTc4MjI3MTg4QUIyMkQ4
-RTg1RjYzODM3M0U3NENCRUE3MTk3QkFBOTg0N0Q4RUJGMTYxNDU3MjZBQTcwNkMwQkE4MUVE
-QTdDCgpGRjdFODhCMzlGMTk2MDkxNjU2NDAyNDZBNEE5QjdGMjYxQTVDOTNBNUFENjREOTMz
-QzRBOEVGOUQwMjZGMjI5N0YwRUZBRDU5NUQwRkMKCjg3QzEzOTNFQkI5NTgxRDkxODE0QzQ3
-QTBBM0IwNkU1Q0M0NTBDQzIyRUUxQjIwMTc1MjI1ODQ1M0Q0RjE0NTU2N0Y3RDgzQ0Q5OTky
-MAoKQjVDNUMxOUIwQzhCQ0RBNjk0ODI5OEI2NzcxQTUwQ0FGRUM2NzNGNDRBNjA4MEY4OTg4
-MEVGMEY3NjZERkU5RkUxRDlDODUwQjBDQjdBCgo2Q0NDQTI4MDY5OEU4MzI2NDlDRjYwNENC
-NTQ5Q0FFQjMxQ0Q4MzU2RUQxMDZGMzY1MzIxQ0U2ODA5RTJCRjI2QzE4NjQ5N0NERjJEMTgK
-CjY5ODc2MkU0NzQ5QTkwRjZDMUQ5NUI4RUE3RUM5NjMxOTExM0M4NzExNjExODEwMEZDRUEw
-RDU1MEYyODMyQzU3QThCRjVFMUUxQzg0NwoKRjBDOTBFQjExNEM3Q0Q2QzNBQzJDMkM1RDdB
-N0I1NjU5ODczOUNEMENFRENGOEQwNjlFREM0MzdDN0NFQUU1QzBDREZENDZCQjU3RjIzCgpC
-RDBENjFCMUFDMEI5MjA1RkYzNDE5NDYyOEQ1RkJFQTZDRjU2RERFNDU5NDNFQTE4ODgyNTEz
-ODM0MTcxMzc5Njg3NEUxMDg5Njc1N0QKCjkzRUQ5OEU3QjYwQUQ4OTBEQjJBQjY4MjMzMEFF
-OEUxNTU3MjQ5MDAwMUM5MUVCMkE4RDdCNTZCMzNCQzdFMDU5OUQ0REQzQTU2OTJEQwoKRDJF
-MDVGQzVERUZFQjkxMDI1MDUzOTJBMDA4QUNFRTc5Q0U3QjJCRTJBMkIwQUIxRTc4M0YzNTMx
-ODNCRTBGQzlEMTlDMDA0NzRFMENCCgo4ODE3MzUyQUQ3NTVDNjMxNDVEN0M5NjVDMEU3NDJG
-MTkwOTY1M0ZBRjMwQzQxODc1QzZCN0VEMzQyMTQxREI0RTc0NTEyRUZDQzVCNjQKCkE5MTQ2
-OEM4OUE4RTY5MkYwRUJGQkI0QkFBNjI2NEUzMTcwMjgxN0M5QUQ4RUI4QkY3NTEwNEU0RDRB
-QkRBRDFGRDVBODExNjZGQ0IxNwoKQTU0RTcxNzY3MzQzRjM2QzQ3RDQ3RkRFMDdGQTNCN0Y5
-NDNDMjA3NDYyMkJGQUZCRTc1NjAzQTBBMTE3QzFCRDY3OTExMzkwMDk5MkRFCgo2M0MwRkZB
-RDA2M0I2NjlCQUJGRjA0MEYzNzJCMDNBMzAzMEQxRDFBRTA1MTg4QjczOTMzMTI3RThFRTcz
-NjI1RkM3NURGMTEzOEYwNTUKCkM4MTVGQ0E0QUVEMDg3M0NCNkJDMTM0MTQ3MzFGRUZEN0VG
-RTUyRTNFRjgyNEM3NUUwQTA1NjFERDBEN0JGREM1ODA4RjFCNzhCN0Q5RAoKQjU2MkIzRjA2
-OTdBMTEzNzlEMDg3RDQ5Q0JBRUJBQkZGQjYwNDAyRTM1REM2RkQ0RDIwRDNDMkZDODg2NTEy
-OTFDMzc5RTRFOEYxQkMwCgo5MjRCQTQzNUVERTc0MDEzNzU4M0NFNjI0MUM4QzJGRTREQ0FB
-MTcxMDNDOEM4RjQwQTM3RDI3NDI4RTgxQjM3MDc4OEZBMzBDODE0QkQKCjE1MDFEMDc2NTRD
-NDcwRkQ1RTk0Q0YwQzBDNTJCNUZENkU1MTBFQUIwOEQ4ODY5QjEwODg0OUI5MDAzRTdDRkU4
-QTI1NkRGNzI2OEVCMQoKREJGNEFERTlGQUZBMDk2M0IxQTZBOUI4QUQ0MDAxMUU3MjFCOTky
-QTlGQzlDOTk4RDI2NDAwQUJBOEM1QjlENTIxQzI4NjQyNzI4MDYzCgpEOUQwNjY4QjJCNjM5
-RTYyNUQ0QjRGMkZBMzc4NkU1N0U3OTM4Rjk5NUM4OTNFN0QzMzI2MjE3MTZDNjk2ODAwNEY3
-QzMwMjg4OUM0QkUKCjQ2MDQ2OTgzMjI1QUUyRDFCQzI3NjY4Mzc0NDgwMERGOTY4M0U5NjBB
-ODY4OTMzODc4OUVEMkQyRkVBMUQ2Mzk4MDRFREQ2ODYyOTVEOQoKMDEyODEzMDk0MEFGMjUx
-RDZCNzgwM0YwQUQ5NDFGM0YzRDk5OUM1NDU5QUFDNTc2NUM3NDNCRUI4Q0IwMjQ2MUI1NEVF
-MDI4MUE2MDA2CgozQUE3NjIxODdEM0IwM0VERDNCMEIxRjRFQzQxNkRBMjBEREQwRDg5Q0Yz
-MDJGNjM3N0NBNzNBMzZGRDQ0RTg2QzREQzZEQUUyRjVBNjQKCkFGQUM2MjUzNkNEQkEyQzg2
-RDZBQzFDNkFDNjc5RTUwQjU1NzA0NUIyRUI4MDJDNEM3QUVCRUQ0MDYyM0IxN0E5M0VEMjRC
-NjVBRkEwMQoKMEMzRkQyOTdCNTJCMjY0NzM1NUE0MTFBQ0VEMjU1Q0Q0RUUyRUQzOTdCM0RC
-QkE0RkMyNzQ1OTYwNDkxQUU3NkY4MjZFQjlDMzQ0MkExCgo2NjFENjU2QzI3QzQ4NkIzNTY4
-QTYzRjBENkRCNTcxQjE3MzgwNjUyMzMzQzJEMjYyQTY5RkUxQUMwMTZENkQ2N0M4NTRBMUFF
-MEQ3MkQKCkVDQTJBQTM4RTZBM0EzRUY1MkI0RUZBNTZCMTkxM0MwMTU0QkMxNzIyMDE2QkNC
-M0JFNUI0RUI1MTYwREM5Q0JDMDY4QkEzRUVGMUY2OAoKN0I2NjNEMjU3ODlFMDNENDY1QTg4
-QjkzQTQ3NDA0QUIyQ0FCQjI0QUVBNDMzN0E3OURFRDY5Q0VDQTNFNTYxNkYzQTFCQzZFOTIz
-QjIxCgoyRjU4REZBNDE3MzA1NDNEMEU0ODRENDM2MjFFNjk3REQwOTFEM0JFMTQzQTg1ODk1
-ODI0QzEzRkU1QjJGQzJBRUM5Q0U4QjQ4OTkxOTcKCjgwMTlCNkFBNzc3QUI1RUIyNEZBMzUy
-Q0EzMTdDN0M3RjFFOTU0OTUwMURDRTRDMDE2QUIyMkNGM0ZFNUYxQjkxMUM1RkZDQkJDNzk2
-OQoKMkQ1NEFCMEIwQzkyQTVEQzczQTVCRUIyOEZGOEQyOTYzQ0Y2NkFGRDk4MUVGRkM3QTEy
-NDY2NTNFMDdBNUEwNzE0NDJGMEY1RjcxOUI4CgpENjAwMjJEODI2NDM1MjdDNDI0RDc0RjEz
-MDU0NEZDMzYzRjlENEY3NzFCODQ2MzM3OTAyQUFFOTAxQzg4MTEzMDU1OUNGRUM1NjMwRjMK
-Cjc2N0ExRTEyMDBBNERFMDgyNDI3QTZEMERGRDRDQUE1OURBNTEwQzczRjdFRDE2NUE3RkNB
-QUFFMUI1NDFGMTc3OEE2QjhGRTIyM0YyOAoKNTk3NzQzOTg2RkY4MEMyMTQyQkI5RTM0Nzg5
-MkFGN0FFRkVERDI5QURDRUFDMTQ5OEIzMUY1RkNFRTk0QkI5RTQ4NzUwRUNBRjdERDUyCgpB
-MzlFNzkzRDk5QzAzRDg3NUI5MzMwRkIxQkUwODVCOTY4QzNCNEVERkEwRjA1MENGODQ0MDVE
-M0E0MkVDODczMkFGMERBQzlDODY2NjEKCjMzN0I3MDkyOUNCNDg1MDI4RUVFODFDMEI0NjU4
-NDJFQjAxREYxNUMxRUMwQkJBNTgwNUZGM0U5MDA1NzZFNzQ5MTg3QzBEOTRGQUVDNwoKRTNG
-OTNGMUYzMEQxMTI0MkU3RjY1RkUwRUVGOTE2NzY0MTlCMkU0MzIyM0MwMDYxRTQ2QzQxRkNG
-NUZDODJDMDExRDI0OTBEN0E4NDBGCgpGMEE4REQ2Q0QwQUIxQ0E4MUMyNzNFMTYwNEE5RjU0
-QUM2RUE2QkUwNEU2RDE0RkVCMTRERUIxNERDN0NERjU4NzhGMzUyMjRDNUVBN0QKCkVDNzZD
-OEM1Q0RGODE2MTY0QkI0N0Y5QzYwMjBEMzcxRjMwNDE5MTk4QUY0NUJBRDU3OTJEMTQ4Rjkx
-NUJBRjBERDA4NDExNjlCNzdFNAoKNUFCNTBDREY1MEI5OEI0QzU0Q0QwQkY5MTI2OUQ5RkE2
-N0Y3NEVGNzFCQ0M0NjJBQjlFQzcxOTM5RDM2MUVDMjBBQjUyQkQ5MDZCREE1CgpGRUQwMEQ0
-MjBFMzJDRjMwQUZCOTUzQzREQUFBODA3RDVBNUQzRjI0QTM1M0U5QjBFRENBQ0VCRkM2OUEy
-OUU2NUE1Q0REMUI2MUZCNjYKCjUwMDNGQ0JGMzcyRkFBQTA2MDE5Rjk5NDVGQkYzMkQ2MkM0
-NjFGNEY0RTg5QTQwMEY5RTBCM0E0NkJEQ0E5OUVFQTFBRUFDOTJCM0VDRAoKQzdCMTQ2MTYz
-NDVEOUEzRkQxODM3RkEyNEY5MTY4ODEwMDRDQzI3MzUxQTEzMTQwMEQ3NjM0RUNBRTdEQkZF
-RTQ1NTNDODZBOUIxMzYyCgpFM0JFRjQ2M0QzQjI5MjNCNDVGNUQ4MjQxRjQzNTMzRUMwRTgx
-MTY4RUE3NkRDMjhEQzIwRjZBNzE1MDhFRjFDMEVCNkI5NDZDMjIwREUKCkZBMjY1RjNFOEYz
-NUVCQTM3NEQwODY1NTM5QjM4NTdDOUEyMUIxRDQzQkVENEVGRjc1NUIxRTJDMkVCREVGMkEz
-NjUyRjE5NzI5REJFMAoKNTlEOTRGQjU0NDhCRTFGOEVGMjA1RTA3MDE5OUY3QzFENTUzOTQ5
-NjhBMUZGNzQ1QUU5MjVFRkI3MjM3RkY3OUZCQUE3NzczMUM2QzQ3CgpGNjg2NjgxNTAyMEFB
-NDFGN0YzMDUxQzdFRDAyODUxODYyODUyMkFFODBGQUQ5NzJCMEE5ODhGNTc5M0JFOEQ0MjE0
-NDRBMkQyQzAwNjEKCjhDNjA2MUE0Q0U4MUE4MDdFRDgxOTg3MjQ4RDYzN0I1MjVDNEUyQTNE
-MjRFOEFCNkVCMTFGRDM2RTlCQ0ZFNTQzMkU0NkI4OUIyMTkyQgoKQUU2ODVEN0VFRjQ5NEM4
-MkE0NUVBQkExMzYzRDJGNEI3OTczQUY1QjIwNTBCM0Y1NDcxQjIwMjc1MTFGODE2RjFBMzc3
-NTg2MTY3M0Y0CgpCMjkyRTM0MjUyMzRBNDFBM0QyNzBBMEQwQzAxMzlDMTA1NzMxQTZGNUY4
-NDU2ODVCNzc4NzZCNDZGNUFCQjRERDY0QjY2OTMyMzk2N0UKCkQxMUU0MEUzQTE4MzdCMDYw
-QTY2ODVGRENFNThEMkREMzFEMEM5QTlBQzY4MjAzRTc4QTc4N0ZDNjUwOEI0NjA0REY2MDlE
-MTREN0FGMwoKMEUwRDJDQzA3QTQ5MDUzMzlGN0FFNDUyMkQ2MDYxRkE2QTdFNENCN0E1QThC
-MkI1QzQ5RDdBNzJEQTQ2ODkyQUIwQzgyQUY3RDNBRTFFCgo2RDg4MkJEQThDMjY2OTg0MjMw
-Q0NDQjk1QUQyRjVBMEUzMzY4NUJCOTNERkE2MEQ4RkY3MDNDNzY4ODdDMzJEOTNFNTNERTY0
-OEM3MkYKCjI1MTI4NTY1REY0RjQxMEQxQjJFOEM5RDU2OUI3MDZDQjk5NTQyQTI3QkE2ODVE
-RjA5Qzc1MjI4NjAyMUMxOEY5QkQyQjlDNTgyRTgyNwoKNzQ1RDY5MDFERDk5QzQzMzZDMDI2
-OEMwRThBODVCRTlDNTIzREExRTREMEJBNDU3MUVBREU4MEM4OEExNEJGNEU3NDUwQTFCQ0VB
-MUJCCgpGRjk1QkRERjJBRjFCRUZFQkJFRTc0MjlBNEZGQTVGNzJGRDQwQTdBQzFCNzBGOEVE
-QjgzMjVBQThBNjExRTM3QjBCQ0RDODQ2QzZDMTMKCkNBQTlBODMwRTFGMDkwMDU5QzZFMzQw
-NTM3OERGOTBDMUFGNDgyODg0ODEyNjhEQjJBRjg2MkFGM0FGN0E5QzcxRUI2MERCRTgxOTgz
-OQoKNjA4M0NEMkY1NDVDN0Q3OEEzN0I5MENDM0I5RjM1QjMwRjhENDI0RUFDMzc0REVCOEVD
-ODkzNzE1NzkxRUU4QjBDRjhGODk5QTQ1ODJECgpDOUYyRjczODIzMkI5ODNBRDhBNzc4NTVE
-MUU2MTA2NUM0NDcxRUYwQ0RGNzJDMEM4QUM2QUFBRUVFMUE3NjdFOEY3RjAwMzVEQzc3QUIK
-Cjk1QkMxRTJBRDM5OTE0REYzRTEzNzI1RDhDM0I1REU3NDdCMEVERjFGRjNGODBGRDE2MEQ5
-QTIwNTVCNEYyRkYyMEY0NjI2QUI0MTk3OQoKNUUxRkIxRjM4MkEwNzYzOTM0MkE0NDM5QTZF
-MkYxOEYzODMyQkFEREU2M0RBMUQ3OEZCNjM1NTcyNjFDNkM4NkM2RTk5RkM5RDI1MkQ4Cgo5
-NUE5QjY1Mzc4MkE0Q0FFNjFBNkRFNTEyQ0U5N0VDNDY0NDJCRTI3NzQ2QTkwNDc0ODAwNzI1
-RTk1MzA3ODI1NzM5NTkyRDU4NTA1NEMKCjA3NjgwNjgwRjFCNjBEMzdENjRBNUIwQTY5Qzg0
-QkZCMDVDQUVGRTk0MUFGRjk0Q0QzNTdBNTNDOUMzRTI2RkVEMjIwNUIxMUY4MkY3OQoKNjRE
-RkQ4RkYxNkQ1QTNDRTEyOTA1OTQ1QkY0MUM4QTU2QTU5OTg3NzYxNUIyM0U0MzZEQUVCQzcx
-QjQ1QkYwMTYzQTRFNkQxMzIzOEMwCgo0NzlDM0RCOUVDOTlGRjBCNzRDRDIyMjQ4NjUxRjJF
-MUJDNzg2MEVEMDMzNkU2QzA3OEQwRUQ0RkM3MkY0OTREM0YxMzY1MjhCMjVDRjEKCjUzRDQx
-REVBQTA3NjFFQzFFOEYzMUY5MERGMUQ3M0VCM0E1QkE5QjUyRDgyOUVEQUU5ODAwMEI2MTE2
-MDcyQUVGRUFFNEQ4NjFFODkyOAoKRkY5REUzNzZDODU2RUJBQjFBMTg5RjQyNDgzMThBNDRD
-QzNFMDczQjg1NUExMzkxNjA3MzE2MkQ3QTI2QzA4QkI1NUJCMzlBMTIwMzNGCgo5M0I1NURC
-OTdDRUFBQUI5NzVBNzM3MkMxNUQzMkQ2NjU3OEE2NTM5RUQ2MTA5N0Q0RTAxOUNBRTMzMTE5
-ODcwRTk2QzNFNDA5RTQ0QkEKCkU1RjlDOTJGMDQ0QkNCQkQxQjEwNDFDNUM2OEM0NUI3NjZC
-QzFGRTUxQjU3RDc0QzExNjgyRTZGQjYyNDVEQjVCMjQ4NDBGRjFBRDA4NAoKNEI5ODM0MkIx
-N0UxOEI0MkI5RkY2MTQzMEIzQTcwM0Q5N0VGOEZDNzVCNUY4NDYyRjQwNENBQ0NEQjJFNkQ5
-NDdDMUZDRTdEQkIwMzg4CgpEQ0VGRjUxMEIwNjIxNkMyMThCRTM4Rjk0NjA3MjZGQURDMTlE
-MTMzRTA0NkM5MDU3MTk4QzFDMjVERjg1RDQ1RUFFODRGM0E2NkQzMzkKCkQ5QTFDMENEN0ZC
-NkE4QzcwNkE5QkEwNjJFNjQxNUJCMTFCQ0ExOTIzNzMyQjJBOUJBOTg0RkVBNTM0OTA1NDdB
-MDMwNjM2NzNCQjM4NAoKRDc4Q0Y0ODc4MkFENDUxMTFFRTkxQkFFQzIxMjhERjFBMjczRjkx
-NDNBM0QyOEFBM0UxRjIyREI3MjIwMDkyMDQ3RTIyMjY4QUVBMjE5CgpEMDAzNzY3N0E1N0FB
-OTg0MzJFMzc0OUZENTc3REEyNjI4NUFEMEU2N0UyMzFGNUUyMDgzODVGNDc1N0QyMTdDNzA3
-MDY5MkU2QUVCMDQKCkVBRDg1RkM5ODFBRDU4NkEzNTI5Mzg1NEMxNDdBNjIyMzBBODc5MDgy
-MjU4OUM2MkMxQkMxODJGOUUwN0I3RTBDNUIxRDAyRTlBNzNDRQoKMjIyQUVCREIwQUFEQUFD
-QTk2ODVCMTJEOTE0MjIwNjM3ODU1RjkyOEIxQzk1MjUxMDgwREMxN0JGRTY3NDkzOEQzM0U2
-QzkyQzA0N0YxCgpCREMyMkVERTUwMkFFRUI3ODBENkZFNzgzMDRFMEFFQjQ3RjM5QTdBQTAx
-QzhCMzA3NEZBMEE0MjNCNjAzQkZCMjlEOTlGMUMxMjVFNDEKCjQyRDMxMEZGRkExNkNCRjhF
-QzdDMkIwOUU3QjA4OEZDMjIyNzA2OTkzQkI0RUY0MUM5MzI5Q0YwQUMxRUY2MERCNUJDRDhB
-N0ZFQUMxRQoKOURDMTExNTQwQTdFMTYzM0YzNkIwRDk0Q0IwQjE1QThFMzA3Q0ExOUIzQ0Q4
-NzdCQUM3QUI5MDM4Q0VCMjkzQ0ZBMEVEQzA1M0FBNENDCgo1MDQ5Q0YyMzlBMDg0MUM2Mzkx
-QTFFRDUzN0I0OTY1NUVBNTM5NTQ3NzY0NkJBQUQwNDJBOThCNjFERDI3MDk3MzY2NTQ5N0ZE
-NUNDNDIKCjRCMzBDMzkxMUM1NTg5MjMxNTU5REJEMUZCNzEzRTFBMzg0REM2MkExNjgxNjU1
-OEExNUNGQ0E4NENGNEJBQTI5ODM1MTA3QzExM0I2MAoKMDRCRDg4RTFENEI2RjBFRjAzNTA4
-M0FFNTgwNDA3OTFGODI0OUI3NjRDMzQxMDY0RTk1RDc4OEI5MDY5NUUzRkE5RTU0N0U0NTZG
-NUQ0Cgo3OTk1MDQ2QkM4MUQ1NDczRTY2QzM3NEZDMzYwQjQ0MTA2NzBFNTI3QkM5NTMzMkQ2
-RkU3REI4QjhEQzQ3QUM0NzJGMzdFODMyNDBBRkIKCjM4MDBGQ0Y1QUEzMjc5RTY3MkIzREE2
-M0ZEMjIzODRDQ0Q4NTJDMjUxNjI3MTg5MkU5MjNCOTkzMkI2REQ0MzJCRTQ5QzkwREMwQjU1
-NAoKMjNFREVGRDYwNEEwODk2MzE1MTY3OUE5NEUzRkIzRTY0MzQwMzk5RjA3NUEyMURFRjc4
-NDNDQkRDOUQyRDM0N0Q1OUNCMDcyRjEyOTYyCgo3QkU3ODI4QTZFOURGNDY4NzcyMzVEMDM1
-RENCMUIzOEJCQzQ0QkEzRTdFOEZDQTM5QjVCMzRDQzY0OTE1MkQyMzA5NUY5M0I3NEJCN0EK
-CkVDRDNCQkQ3RTQwODc4NTRDQjQ3MTMyNjc5RkI1NzNBRkUyQTA5MUZFQzI5NEIyQjlFNzMw
-NjI1RjY4MjkxRUU3REMyOEMzRDU1NDAzNwoKRjYyQjMwQjA1MTIxQTVBNTVEMzcwODFCQTRF
-NkRGM0NENkU3MzQ3QzgwNzJFNTE4MjUwREM3MzA1NTU1NDg3QkEyMjlGN0EzNUNBRTdBCgo3
-RTUzNDE3QUI5M0U5NjMwRjZDRUQwNEYzQThDMEIzQjU0MTdEQjlFMUQ0OEM2M0VGMzRBRjVF
-RkQ0RjEzQUI3Njk3RjdEQkI4OEI0MzcKCkEyNjUzMjA3MEU4OUU0MThBRUI1ODc1OUNBMkVB
-MDQwM0MzRDRFRTIyNjBGMURCQjNDRTlGMUYwNkVFNEI5MTQ3RjlERTk4ODMyNDc5MQoKRTFD
-MTExODc3QTY4MjVERDA4RTg5MDJBOTU1NUQyRkM3QjhCNzQ2QzRCMjE0QUI0NzIxRjZBODI1
-MUNBNEQ2MkY4RTMzQ0I0QTdFQjc4CgpDNkM1NUYyMTUzMTQ2MTJBRDg5RDVEQkQ4RDVGNjE0
-QzhERjU4QUE3OThDN0M5MzI0RkQ0MzVGMDU5QTFFOTRFOTBCMkJENUVERkJEQjEKCkZEQzkw
-NkNFQTlGNUNDMTIwNEEwRUU5RkIyNDRBQzQ4QjNGODU1OTNDNDVGQkFDMkRCNDI3M0FDODFD
-NjhFQkNEN0I5NUUxM0IzRDhEMAoKODczOTlDNUVCQUQ4Njk2MzQ1M0U1NEEyREQzQkNEOTFB
-REVBOUYwQjEzNDU3QjQ1NkVEOTQzMkM5RUMxRjRBMzRBQjBGQTgyMzVDMjZGCgoyMzgzOEQ1
-MzI3NUNBQzE0OTFCRDhBNDUwMjY0NDZGMzlFQUZGMENBM0NERjc4N0QzRjc1RURGMEQ5MDI2
-MDgwMTYzOUIzMDI0QjA0RkIKCjREMERBMDNENEZENTZBMkM0NUFBOTQwNjJEOTIzNTQyMTJC
-REI3RTYyREI1N0JBMEYwOEVCMzcyN0Q1NDUyRTVCNzBCNkYwRkFFQjBDNQoKQjhDRDk5MDEx
-RDk5MjUxNEQ1QzFEMTA4RTdFNkUzREVCQTk3NTNEOTZEREUwMkJEODdGQ0M4MzBERjlBRjg5
-RDk3RDZGREQ5QTZDNzdDCgo0ODlFRTA2QTFCNDUzRjhBN0IzNzc2RjExRENCNzFDOTMwNDg5
-OUEyMkZGMzkzRjhEQTU1NDYwQ0REMkVBMUM4QzcwRjQ5MzFGQTEwOUQKCjUxMzlFREQwRkM5
-RTMyM0QwRjhFMzIzNDQ5RDEyNDcwMzE2QTFENTAyMkREODU1RUU5MzU3QTM1QzA2NzNBMDkz
-MDIzREY5ODhGNTJCRAoKNjQzODU3NEI1RkYwRURGQUFGRTEyREYzNzQ3MzAwNDU2RUNERTI4
-MTRCNUNCMzlFQkJBQzgxOThCM0ZEMjFEMUZFNDdEN0U5MzI2QTY3Cgo5OUFCNENENTA3MjU4
-NEY3NzRFOTVDNTVFQzk2N0FENkVCQzk0QzQ1RTNFMjU3MUY5ODIzNzkyMzRFNUZCRkNBRjY2
-NkFERjZDNjQ3NjMKCkI5OTQ5NjQ5N0E0NEExRTMwMDkyODczNkI3NzAxMTAzOUEzMUNFNkJB
-NTY5QjE5QUI0NDdBNkYxQzk1RDVDQjQyM0Q2QTZBOUZDRUI3NwoKNEMxODRGNDVFRTYxMDVG
-NzAyQjI1RTY1ODYyOTZFRTE3N0E5N0Y1QzUwODM5MzIwNkExNUM0MEJGMUVFOTBDMURBNjU0
-RUExMkJCNEU5CgpDMEYxRDgwNzRFQkYyMkJDNEZGRTk0REIwMEJCQzAxREE2OTJEQzZFNzJG
-Mzk3NkM2MTg0QjdGMTcwNjZCNkMwQjkxMzU3NzcwNUVGRUYKCkYyOEM0MzBBMEQyMEU5Q0ZC
-RjNGMUJBMkYzNzhGREQwN0NGN0M0REFDMDIxRkYwQTY1RTgyQTc4NEY1QjREQjA2MTQ0MDAz
-MjAwN0UzQwoKQ0JDNDkxOUI3NTYyMzVEQjc5ODhBMTdGNzZDOUYxNjczOUYzMjAyMTAyRDg0
-NDg0Q0JCRkU1QkMyOTI3QjAyMENDMTIzMTIxRUUyNDdBCgpBMDNBQzA4NTlCNTQyMzFDMzQ1
-MTE2MzE0QTQ1M0UzNUUxQzBFOUZEMzA0MzQ5MTU2MTZGMUI2Q0E0MjA3M0Q1M0VDNDQ2RjRE
-RTY1QTAKCjQwNjAzNjdEMkFFNjFGNEI3MTk0NUQzRjAwNDM4RTk4QkU4NDBBQjQyNTRBNTVG
-RjczMEJEODk3RjU5MkM1MzA4QTQxMzUxRUUzOTY1MAoKRDcxRDI0QjhGMjUwMDM5MkI2OENG
-ODhDMjVEQzM1N0NCRjBBNTE1MTI0MzM2QkJERkU0MkE5REEyQUU1QURDRjVGNzRCNEI2Mjg1
-QzBDCgo2QkYzODI4M0VDMENCNDg5ODFDMTQyRTcwNzI3MTM1MDZCNkEzOEU5OTFCNTA3REY4
-RjA5MjdDQjg2Q0M4NkM3MTAyNDQ2RURCQjlEQTQKCjAxOUNBNDc1NEZCNjczMjQwMTk4MzdF
-OERCMDlDNEZDMzNDRkU0MjNEQTFGMkZGMzJDQzM0MzQwOUMyREQ3MUM4MTRCOTMwRjU5RkUy
-NQoKRTgxQUE4RURDOTdCQ0IwNUMwM0E1MUM0ODQzODAyMDgxNkVBMzFFNkNFRTU3RTM5NEY2
-MDE5OTQ1QURFM0Y5QkJFNTIzOEY1QUVFMjk3Cgo4Mjg5NkVBRkRCNDBDQjQyODc2QkNBQjZG
-MzdDQkY4QzA1QjlBODRBRTlENzIxNTc3NDY4MkMwRjMyRTIzRkZFMEQ2MUEwNENCOUU3NEQK
-CjFEMDRCM0FGRUFBRUY3Qjk0MjUxNTc2QjgwRUI4RjE1NjE5QjQwOUFBRDQ1NDYxM0ZENTBB
-QTdENEYzQURGRkFCNzMzMjU5NUVGQUNGQgoKOTY1NTAzOUE4RDEzNTE5REY5RThCMjU5RTM0
-MkY0NTUwMUZEOTQxNEQ5QTFDRThBMURCMjE3MEMwRTYzNTQ5N0E1NEJERDI5NkU0NDE0Cgo0
-NkRGQzE2MzExNjY5QjgxRUFBOTlFRjlFOUY5REM2MTczQURFQ0E0RTlGRDFENEQ5MjRBNkZE
-RjFBNjE5RDgzRDVBRDc0NUJFMjJDRTAKCjc0QUE4MEE5M0ZCODA0MjQxNTczQzRBQTk5QjQz
-NUMwQzU1M0I2QTM0QzFDQTI0MjBENEFENUFFQ0YxMDFEMEMyMjAxMTdGNTJGRUYxRQoKQTZB
-N0MyRTZDNUFDQjEyRjRDRkUwNDM0RDM4QTdCODBENDU3Mjk5Q0FBN0JFQjIyNDAxRjZGNDFC
-RkNGRjFCNzMwNzREQjIwNEFBNEY3Cgo0QkYyMURGMDJGQkNGQ0VEMzI1NDUwQTMxNkYzRDBF
-MTlBOUU1NzhFRkY2RTM2QUU5QjlGQTgzQUMyNzYxRDlCMDc5OTc2MDc3NDU1NUEKCkNBM0RD
-ODdGOEZFRjA0RkY0MTcyOUFDMzZFNzg3MzBBQTRGREM5QjIwMEREMTlFNTVBMkVFQjI5MTRC
-QzRBN0FCNjY4NTc2RTg0MkZFMgoKNEJDMzE3MUFDNkZERTNCMTJDQTBBNUNFNDczQ0E5QjE2
-QUFFRUYxRTAzOEYzQ0QwQ0Q0NkZERUNFOTJEMzE5ODk1MjlBRkY2NDBFQjc0Cgo0NTM0MjYy
-QjFDNEU3NEJFOEUyM0QzOTRBNDkyQkRFRUZDN0NGNTQ5QzI5Mjk4Q0NCOTNDOTlGNUU3RUYx
-MkYwRjMxRjk0QkRENTU3MUYKCkExMzkzRDY3NUYwRjdGRDU3N0YxM0I4QTY1MDYyN0I4M0Qx
-Mzc3RTFENUJDQTUwMkE5NzdDQjU2QjMyMzhEOTA3MzM2RDM5MjAwNUJGRgoKOTJGQzk4RDk1
-Mzc3MkRDQjI1QTMzNTNEMDdCN0EyMUUyMTc0NEE5OTY3MjVFQkFBMUM0RTkzNTlEREIxNkVB
-MzBGOEI3QjA1NEY0MzM4CgpEODBCQzIzMTEwMTgwMENGNTEzMzI5REYwNzNCRUUzQTlFOTlB
-Q0M2NUM0NjYxNjYwQUFBNkIyNDY2RTA2QkU5QzkxMjNBNjYzRjlCRDAKCjQ3MDVBODc0Mzky
-RTQ0M0M5ODY3NzhGREU0REJCMkFCMEFBODU1NDcxRTZEMDFCQkU3QjIxRjAwNzI1NDU0RkUy
-MTc0NzA4NEVEREE5NQoKQTIzQUZBQjkxMjg5OUMxMTU1Rjk0Q0RFRDQ4QzAwM0MzRTA2NzU1
-RERERTQ1QkM4Njg4NjVENUI1RTZCMzNGNDQxODQ4RUY5MTUxNDZBCgo4NDNBMUIwRjgzQkU4
-QTNCQ0RFQzhGN0MzM0QwQTZDODBDMTdBMzlDRkQ5RTQ2NkE0MTMwODYyQzhDOUM2MjEzNTkz
-RUQ1MTNCODJFMTIKCjc3MzlCMThBMjZBMzE4ODRDOTlFNDNDQjY5MDgyRTcxMDY3OUZFOUVG
-QTZFNTdFRDA2Qjc5QkUyQUQ2ODRFQTI5Mjc4NDNCMjg5QTFENQoKRTU0QkM5QjVDMDNFQTUx
-RjUxNTBCMUIxRTg3OEQ0NjdFNjA2MkNFNzg1MDUzRjFCQzAxOTIyQkZBMEVGMTUyNzc1OEYy
-REM1Qzk3RTg0CgpENjQ0MDg0MjRBNThCMDY5RUMxNzMzOTA4NDRFMERDREUyQTE0RTg3NEJC
-OTlENEEyMzdCREVFRjI4NjcxNThDMURDMzYwRUU4RDFDQ0EKCjM1NzhGOTQzNEE4NTZDMDY3
-MjJDRjlGRUEzMEFBNkU5MjNFQjdGQTFFNDY2OTczMjQ3M0YwNEE0RjIyMjgyNzgyQjE4QjUz
-MEM1MDYxNgoKODA3QkJCMTI1MEU2NENFMjlCQzhFQUQ4MDIzQTQ3REZENzMxMjU5NTJBREYy
-MThFMDUwM0U2QjI2RjA5NjI5NzU3NzczNTExQjk3NjYxCgoyOEJEQjU3RDI2NDRDMUFBOTQx
-MUMyQkQwOUExQzE4NDY0OEVENDM1RTYxRjBBOEU2QTNDRkUyQjE5Rjc3NTY2MDRBMzJDQkQy
-N0RFOUUKCkIwODNCRUE3QjlFNTA1QUI3MkU4QTAxMUJEM0IzOEQ3MTk0MzA0NEQ1NTJCOEEy
-QzZBOTUyOUM3NEMwMzQ2MUJBMjMwREMxRkExNUJERgoKOEVFNUU4QzAwQUEyNTE5RjI3NjhD
-QjQxQjI5RUU1MjE4NzlFNEY1RDMzMDIyRTRGNDRFOEJBNTREOUU5NTJENzMwQzYwRTI4M0Mw
-NDU2Cgo5QjJBN0UwMjkzRTYyMkRCN0FGMDM3NTlGNEY2Qzg3M0NFMkQzODlDOTkzOTg1MjRF
-OEEyNzdFMDEyNEY0MkE3MDFFQjk3NDgyMzI2MjEKCkFDNTBDRTcwQkFGNkRFQkE0Q0RGQjQ3
-MzMyREUwOTBGMUU2NjE2RDc0NTdBQjAxQ0Q5NjAyOUY4RTY5MDIzMTg4MkY2NTNGMjZGQjJF
-RAoKMDdEQzQzRTk2REVGNzBGRkRERjVGRjA4MDJDODdGNjBGRENENUMyNjNBOEFBQ0VERDc4
-NTQ1NEM2M0Q3RDFFNEYwNTUwMDgxQjMwQzFECgo0NjBEN0U3ODU1NTQ4QUNENEUzMUJGMTA4
-OTNFNzkzQ0E1NkE5RTJCMzZFOTVDMTdFN0IxQURGQjgyNTgyN0ZFMkE2QzAwODg4QkY2OTIK
-CkZCNjA4QTRCNUIyMUFDQjVFNTM5NjY3REZBMjQ3QTdDMTA4MTE4RDczRTQ1NTgxRTUzQTMw
-OTI0MDYxRUM1M0QxRThDOTY1MjdGRDIyOAoKOTEwNDA1NzhFMTBGQTlCMUI4OTcyMzAyMTRC
-NzIyNEFBOTVCQUZEQkE2REI3REE5QTY1QzZEMTlCQjQ5NEQ0QzEwRTUwNDI1RTg4QTA1Cgo4
-REYyOTYzN0JEMzdERTg0ODI4MTZGOEVBNTcxODYzOURENUM4MDY3MUU1MkI5RUU5NjQ3MDIw
-NEYxN0M5MzhCODYxNzE4NDMwQUVDODQKCjA0QTY3RTcxOUVEQzJDRkYxOTk2QjcxRkZFQkZF
-NzQ1QzVBMzAwNzU0NUNCNjg3MTZCMDQ5Mzk2MzNCNkVBREY3NjZCRDgyQUI4QUE0QQoKNTg5
-MTdGNjZCMjA4NThFOEI4MjQ0MzIwMjhFQjVENDRCMjBFQ0Y5QTM5NEE3RDJDRjBDMEFBNjY2
-MkM5MzQ0MkM4RTA4MTg1MkM3NzhDCgpFOEIzRURGNjc0MkNCQjgyNDEyNDc3RkNERTc2NjhB
-NDMxRjI1NUEwOUQ4OTU1OEQ2QTk1REI0QzE2RTRBOEVCNDA0MjFGQkE0ODREREEKCjYzNzFE
-RkZBNjI5NzJGRUU2OTZCQzFDODdDQkM4QTBBNzg1NEY5QzUzQjUyMTQwQzQxRjNFNDFBN0NB
-NTgxODgyMUFGOTZDN0RDNDE5NAoKRUMwQ0JDMDhCMkU3QjM0NTdGRUEzRTUyQzQ2NDY3RUJC
-ODRDNzM5RkI2MUJBRkYxRUEzMzQxRTFDQkI1NjNCOUI4QTMxNDc0QUE4QTBFCgpBRUMwNEM3
-OTJBRThDMUVEQUI5NzE0MjI1OUZGMzI1OTE4RDUwM0E4ODRDREY2NjVEMDQ5NEZEQ0Q2RTg5
-NThGQTAyMzczQUMyOEFGQTIKCjYyRUMwODdFQTRFMTIwRDIyRDI5MTA5MjgzNDAyNUI4RDVE
-NUIxRkUyMjg4NzAxNzE2MEMwMEE0OEJGN0VBQkZCQTQzNkUyMjg2RUY2OAoKM0ZENjQxQjFC
-REVBMDVBMzY0QjYyRTQzNEI5RTI4QTE1RkY5QkE5RUM3RUUzRTI4MEZGQkM3OUZENDVBMjlG
-NDFCNDBGMDlDRkMyOUIyCgo2ODhENjYyRjE1NjI2MTkxM0IzRkEzNTZBMDVFRkM5RDZDQTEy
-MkZCMjA4QjQ5QkIzOEVDNzU0Mzc1NENENjBCQjY5QzQ1MUUxQ0VFOUMKCjE2QTZDODkwMEY2
-QUM0NEVCOEU4OTU2QjlFOUZDNDMzMzlGNkFCMkVGRDY3Q0M5OTQzRDNFOUI5NTdFMkFDNzA3
-RkI5QzAzNUI4OTMwMAoKODFEQjI0QjZBODYyMTg5RUQ3OEM2QjI2NUI1QkE3RTBGNEJFNTIw
-Q0EwQzZEMEFBNEUyRjA2RjJFM0NCMTAwMEI2MjQ5NEU5MjREMDNECgowODFGRThGQTgwNDFF
-NjQ1NUUwRDJCRTE1RkQ1RDk4MzlGOEU5RDFDNDQ5RUZCRjgxMzQwNDU2QTdDMTFEM0FDQzFG
-MTdFQ0Q2MDFBRDkKCjgzRDIyOEExNDQyRkU5MzRFNjFGMkZFQUFFQjIyMkE0REM5NzRBNDlD
-QThBQTY0RkE1OEEwRTlDQzY0RTFEMTlFOENCRDM3RUE5OUU2MQoKQ0MzNzM5OUNFN0E0QjAw
-MkYzNjEyOEQ5MEQ0OEREMEQ5MjlDMTUwQTlCNzkxRTEzODA0OTQ3MjM3MTJENEU5NjI3Njg5
-QjIxQ0FDRkY2Cgo1MzVFNkZGQUQ5Q0JCNDVGRjQyMjUxREJGRTRBQkM5NjAzQUNDNDQxQUFB
-MjNENkQ0Q0M1MTU5MjhBNUIxNkE4RThFQTI2NUEzRDUwRUQKCjE1NzBEMzhGQThDRjFGNTJD
-RUQ0NEFFMzJDNjY5QTZBMzM0MDYxRDRDMTdFRTk1OTRCMThFRUQxQ0Y0OUM5REMyMENFNTlD
-Rjk2NjkzOAoKM0E2MDM1QjgyOEFFREE1NENGOEVFMzVBQjExQURFMENBQTAxNzEwM0VBMUEx
-NkY4Mjg5REM0ODFGRTdBMDI3RTlENTYxNzBGNkFCNjE4Cgo4MUZEOUU2MzE1RTZGNEFEODUz
-MjA5QzA3MjAxNDAyMzdFM0M0NDRCNzE0QTQxNzc5NDk3NUI5NDI0NThDMTk2NUJGOEJFRDQy
-MEZGMkUKCjEyQzBCQjZFOTc3NjI1QUYzRjEwQTE2MjUwRTYwMzNEQzQzOUQ2OTYyQzU5Qzc3
-RTVEOUI5OUZBRTZCREEyMUIwOUI4MkU0QTgzMkJDNQoKMDRCNDA2NTQwMDY5NzI2MkNEOTlB
-OUMzODI1OUJDOTUyMkE2NkMyRTJGNEVEQzg5MjhDQUFGNzdCOUJGMDUwRTM2MURCRTlENERF
-N0UxCgo3N0Y4NEM4MTVGNjY4RjhCQzJFRkJEODZFNEM1QzVGNTVDQTlEQzUxNEVCMDdDRTQx
-NUJGNTZFRTM3MjMzNURFNzNEMTJEQzlFNjdCQkEKCjZFNURGQkJCNzg5N0Q0QUEyMTRFNTFG
-QTMxNEU0OERFQURCQTk1MTMzMENGQzU0ODE4QzAyMDU1Mjk1MjA5MjZBMjA3NERGNjUxQzIw
-MAoKQkFCOTk3OTJCM0ZCNTg5RkE3QTgxRkJCNDE3Rjk0QkIwNDc4RkY1QTBEQ0IzQ0M2NDlD
-MDBERjU0Njg2RDc2QjZBRTYxQUQwQkZGQTk2CgpGNDVFRkJEQjdFQUY4RDFDQTM0OTI0M0I2
-MTI2QjI2QThFRkEzNkJGMzA5MDRGRERGNUQ1RkYxMDJENjdFNTUyMEIzMzk4OUQxOTZENzAK
-CjAzMjk3Mzk1OTcxNzkzRTBDMjBBM0MxMjAyOUVCMENGQzgyOUQzN0Q3NzU0NTJBOUM0NDc5
-QkY2Q0U5QUQ5QzI1NTI1MzBERTk2MjhBQQoKNkVBNDZGQzFFRjE5REEzN0Y3RUI3OUREQTA4
-ODE4NjgzMkM4MTc2ODY0RUM3QkZDNUUxOEU1RTc1QzU3OTk1Qjc3NjE0Q0EyMTNDMEQ5Cgox
-RjYxOEMyQjg5OUU4QkE5MzA2NUM0NzA0NzVFMEU5MTREMzk5MDhDNTI4Q0EwQ0ZCMTc5RjdE
-ODhCMzY5QjBGRTYwNzAyMEIyNjg1RkYKCjMwOEQ3NzlGMkUyMkQ5MjkxQTJCMkJCNTc0NUU3
-MzExODQxRjk1REI4RjkyOTU2NkEzQTdGQzM2NDI1ODkxQUZENURFOTk3QTIzRjhCOQoKOURF
-Q0ZBQTFFQjBBNjUxNTU2NzdCNUVCNTEzM0RCOEYzRERBRDA3NDVEQTlCQTU3MjUxOUM5MTVC
-MzUzOTg1Njc2NzM0QTgyOEM3MEE0Cgo2QTkwM0E0OEY5MkM4NDNDM0M2QkY0MjYyM0M0Mjgx
-REIwQjQyOTQyNDNBODMwRUJDQzRCNEM3MjJCOUQ3OTVGODc1QkREQTMxQUY3REUKCjY4NjQw
-NzMwMTg1MzYxRjJCNzA0RjBDM0FDRTAyMUEwOEExMzM5M0U5NUYwQzE1M0FDMzA1QkQzRDZC
-MUY5Q0QxQkZENEU5MzBBRTdDNgoKNkQ5MkRCQUUyMTg3OEQzMDdDNUIwM0FEOUFDMTEzNTgx
-RTU2MjVBMDVEMTk1QTUwM0Y4NDYwQzAwMDkzQUQ4QUMyMTU1ODk4RDY0RDU2CgowN0VGNDAy
-MjY0MDU4MkM5NzI2NUEyRjBENTc4REM3QzMzQjJBOEEyOERDMTFERjU1QzkwRjJDMzlGRTZC
-RDI5QTVFMEMyQzlDRDgyQTMKCjEzNkY2M0U2MDNFNTM3OTEzNTRFRkE5M0FFM0E2MDkwM0Ez
-QjI4NEQwNTU1NjAyMzUyMTk5MDQ2RjdFNjM4MEFEMzRFNTkzQTQ3M0Q2RAoKREUyQjI4Q0ZB
-RDNBNzUwNDEwODNBRUU0RkIxMkQ5RUI0QjA2OUU0MDVCQ0ZGRjVBOThFM0MyMjIzQ0FDODhG
-NzczQTVDMEVDQkIxNkNGCgoxMkE0ODM2NDE4NjIwMDkwMzdENUM1NEE4MkZERDkwRDQwRDhG
-RDY2M0VCRUM3QzkxQjU5NDdEQjJGQkY0NzE4QTYyN0IxMEMwNzgzMDcKCjY5OTE0MjM3NDcy
-NTEyNUJFMEExMURGODkzRDg5NzVENDNCREY4QUZCMTQ3NkEyREZCMkM4MzgxRTEzQ0I2OUE4
-QjQ5NEE2QThCMDAzMwoKOTI1MzMyM0UzRTI4NUUwNUE5ODM1RkNGNEZFMkFGQ0Q0RDc4MkEw
-M0ZGODMxMUYxNUE1MUU3RjUwMzg1QzRBMUVGQUEyMzk1MEU3OTE5CgpEMTA3RjgxQzlERTlE
-NEExMEY2NEVBRkJFOENBRDg1QzAyODdDQzRENEU4MTVCNTYxNDkzRDc0RkM2MkZFRjcyQjVB
-RTA1ODEyMDM1Q0YKCjREODg0MTk3NEQ5Q0U0MUI3MTFEQTQzOEQwMEVDNjAyQzkxMTI3NEY3
-QzdFMERENUYyMzAzNUM1RjE3MzdFQjE1MUQxMkJDQzczNkRDRQoKNEIyQUNCMjU2OTdENzlE
-RkQ5RjU5NEI0REFGMURCN0Y1NDBFMTFGQTlENEExNUM4NjhDNTk1QkMzNUI0Rjc0NDkwNjI0
-MzY1OTQ4MTQzCgo1MUE3NzFFNDg2NENFQkQ2RTkyMzc4RTcwOTQ2M0M2RkU3QkVFQkUwRjMy
-NTYxM0JEOTMwOTRFRkVDOEJBQUM4OTc3MkZCRkU2NTQwNzUKCjM1MUU2MkI4NDRCODAxMzFF
-NzUxQUM0RjM5NTA1REIyNkM4QzM0NDIyQzY2QTQwMzE2QUZCMTk4NjQ5ODAyMzE5RDFGRTRF
-MUU2NjA0MAoKMUFCMjM0OTcxMjA3QURFRDZCNEE4MDZGMENGRTk3MUQzNTc3QzdFQzgwMTM1
-NUU1Rjg0QUNCM0EzM0NERjI5NkNCMzNDRjQyRTc0QUNDCgowMDMxMTdEOEY3MDBGQkQ4NEYz
-NEVCOUFEQTM4RUUwNzE2RTFBQzhBQ0U5ODgyQzEwQkI0QjM2MzNBNkQ4NzdERDY1NzhDMURC
-MDM1QjYKCkREOUU0RTJCMjM0OTM1MDA4NUUwNDI4QUFBQzE3NzU5NzcxQkM0RUREQTFBMkQ0
-MEZFMEIxNUI2NUE4RUJCNEMyOEE1MjZBNDlDNTZEMAoKQzI0RkQyMzU2NTNDNzhGMkM0MDM3
-OUFFRTc5MzkzN0VENkYwQkY4RjRDQ0E4MjVDMzA1QzBGM0ZERUVCREU4QUJBNjM1MkYxREJG
-MDQ5Cgo1NURGNzY5NUJGQUE1OUUxODk0QzFDNTdDQkUyOUU0OEVDMkY0NERFNzdFM0M0NDlF
-MTNBMjUzNTkxMjY5MjVFNEM2QzQ2NDlGMDQzNkIKCjAxODg0NTFFNDczNTEzREYzNEM0RkIy
-QTlBMzcxNDFFMjc4MTFDNkIzMzk1MkQ5QzNCQjAzMzZFNjIyREUxOTI2NDlDNUJDQjc2MTcw
-MAoKQ0U5NDIzRTlCNTJCMjBCN0UyOUI2Q0E0NzAyMjFENTkzQUMwQzVEODk1MUVFMkE1NkZF
-RDk5QThBM0QwMTg0NzNDMENBMjhFNEE0ODMxCgpENkE4NjFBNzZDNzE2NTMxNEJGN0EyOTlE
-Q0NCNTdGN0Q0Q0UyQUVGRDk5N0FEMjFDNTU2NDdEQkU0RjBGQkJBMUY0MTM2NjdCMTk2MDQK
-CjY5RkU5N0IxNDRCRjJERDgyM0NGMjNFMjIzMTNFOEI4OUFCMjVDRTlDMTc0NkYxNDFFMjA0
-NkRFMjE3QURCRTE4QkNDM0JCQkUwNDY4RQoKMDNGMjc3RDNGOTVCNTZDQUY4RTJDNTFBMEFB
-RURDREZBMjI5NDY2NkE4NTMwODhFRjk3QkMyNzlGQjUxRkE3ODQxOURBMEFBODNCRjZECgo4
-RUFDQjgxMThFMDQ2MkUwNDAxRUE4MzAyM0RCQUU2QUQ1NDIwQkJEMjVFM0RFQTQ2RkIzQjdD
-OTM3NjM3M0M4RTM2MkU3NEIwMUFFMEMKCkU5RDU5QzY5NDVFMTA4RTBFOTJDMjNGNjI2NjFC
-RkE1NDcwMEUyMDM2MjdCQ0FEMTFFNzg5NUFENTlCRTE4NTlBOUZGQjZGN0IwMTY4NQoKMjND
-QjExMTU1MjMwMTkxNjEwN0Q3RDJBNDAzNTQzQ0I4NEFFRkU0MDRCOEYxNzBFRTVCNDA4OTgx
-QTg4QTY1QzMzNUIzRkMzNDU0QzAwCgoxNTNGQTkyQ0M0NDJCRTA1OTA3NjZGNzY1RTMwRjgy
-RkQ0MTQ5OURFNjg4REFFMjc0OEQ1NzA5QkE0N0E4OUU4MjU4MTNCRUY0REE2RkEKCkVDNUQ3
-RUY2RTlDQjA5MTNCNUJDNkE2Nzc2QkY5QUM3NjY4NDg1REU4OEU2MjY1RjVDREYwQTg1NEZD
-ODZERUIwNzBFNDBBNDFBMTI1MQoKMTI5MUUxQTY0MTlDNzY5NEVDQTVFQkFDOURBQ0VBQzMw
-M0MzRTlGRThBNjJBNjQ1MjFFMThCNDlCNTZCM0VDQTZFQjBGRkExNDhCMkY1CgpFNTU4ODU3
-NDI2NDI0Mjg4QkI1NERFMTU0NTNFMUIzMjFENEIwNEM4RDcyOEIzMEI3NTZCMDU5N0FFNjFG
-OTI0NDdCM0E3NTcxMzE1MzkKCjg3MDFBQTRGOEE2QjQ2QjQyODNENTBFMjZGNTc3MEVDNjQy
-NzU5MkYxNkE2NkNBQTgxOTlBRjg0RkYwNUEyNEE1RkJGRDE1ODhCNjExNAoKRTI0Q0RGMzlB
-OTlFN0E2Q0QwQkNENDRFMEU4Nzc2Qzk0NjVEODZDQTNFM0NERTM0QjMzRDMxN0VDNzVEOTUz
-NDExQzkwNDUwMDAzQjBCCgo5NDE4ODE2ODZDOUI0QTMyNjBDMURDNEZFMzFGMEE1MzU3N0Q0
-QTQ3NTBBQzdDREQ1MkVCMzI3NEI2MTU5N0RENUMxMTFBRjQ0MTQ1NkYKCkUwOTA4MjFCQzdC
-Mjk4MDY3MTRDQUMwRUY1QjhERTJEQzgxM0Q0MkNEQzg1MzBGNkVCMUREODI2NTdFRTFCNkRD
-MzlCMEUyQkFEQzE3QQoKN0ExM0U0RURGMkE4OTNCNDFDREE3NTRENkVCNjg0RDZBOEQ0OTZE
-RjMzMTQwMUZGQUZFREFGM0ZEODBCRjFBMzVDMkVDQTU0RjQyQkE0Cgo5REI4QzdDRDczRDgx
-RjVGMTA2MDUxNUQ0N0U2RkMwODcxN0I5RTkyOTlCMjU1NTM2MjQxREJGQkM2NzM5NDVBMzg4
-MzlCMzVEOUM4RUEKCjFBQTQ0OUNEQTgwODA1QzRCMTRBNTQwODdFQUU5RTRFQkYwRTYxQzgz
-QTFCQ0M2QzgyNDMzMTNGNUM2RkJGRkVDRkM2QkRDNDM2OERFRQoKN0FGRDQ4OUZENDhEQUZE
-MzRDNTlGQTZEMkRGQUU3RTJDOEM5NUJFMDVEMkFBQkE2RDk4OUQ0MUM3RjBBNDMwN0QxMTg4
-Mjg5NjNGMkNGCgpBNjUyQkNGQUMzM0IyMjk5MUU0RjZEODBEODUxQzA3MjIyMDU3MDIxNTVF
-REIwMDA1M0I1REFFQzUwNzQ0QUU1NUU5MTg0QkVBREE4M0IKCkY3Njk2NEY3RDM5NEZDMjdB
-QjgyREExQTY1RkRBNTZEMzY0OEQ5RjVBQTFGRUZCRkE3MUJEQzRCNjZFOEM0QTlERTQ5MzVG
-MEZDQkU0NwoKOTU4NDkzMTYxNjk2NDgwREVEMzMxNEI3MDc5OTAxRkU1QUVCMTBGODlEOUYx
-NTNENjU0QTBGMEU1OEQ3MEI5MjJBQ0I5NjlCRDgwMEEwCgpGM0NFNDIxRkNFMzczMTlEMzc3
-RDkwMzc0MUE2MEY4RDgzQUU4RkFCMUM5OTlCRDhDMzkxMzE2QTFDMENFNkIzRjE4MURFQTNE
-MkFGQkYKCjAyQUJFMTIzNzkzNDE5NEU5RjQyQTk3M0FCNDk3MUQzRTNDQjYzQURERENGRTlB
-NDdCRTc4RjI0NDY4RjgzRTY1MkU3RTY3RDg1M0Y0RAoKNTAyMEQ3QUNEQkVEMjUwRDFDREJF
-ODZENTgwMUNENTY5MTNDMjBGODEwMUY1MDlDOTBGOTcyNjNGQUM2RkZERDZDODcwNUNCQTBF
-RkZECgo1RUVBRTFCRTExODQxREM0ODQwMUE3QzQxQTVGMEVENTlGQUMzQ0RGQjhBMkRGRDJB
-QzBGM0MxMkNDMEU5NjRCMjVCMzQ0RTFCNjI0NkEKCjI5MkQ0RTlFRTZGQTE4QkY3MUYxQkI3
-QTkxRUI1QjhGMEUyMEE0RkQ4NTkzQjgwMzMzNTk4MDIyNEQzNzI0MTdFMzY2MkQ5NjMwNTUy
-NAoKRjIwMEI3MDE2OEFBM0I0ODVCRDgzREY3QTQyQTU3NzE4ODJGQTU5OUYwRkFEMzZDOUI0
-NjMyRTU2RDc1MUZFQjU3OUY1MzBBNkE0QzIwCgpBOTA5NzY1Q0FERjkwNjVFNEJDODBCQzUy
-RkRBNkEyMTg2RTIyQjI1NTkwMTdBNjI2RjIzMDUyMkRFNzA4MjE5MDEyMzUxRTkyMDVGNkEK
-CjQ1RTk2OEQ5NEQ0MTE2RUY1NUUxM0VGOTIxQjM3NDBDREY0NTU5NjIwNkJEQTI3MkIxNEE4
-QjJGNkM2RUQ3NDRCQ0NDOEJGRUFCOUI1MAoKNjA4OERCQjU3RDhGRUM4MzdCNEIwMEY1Nzk1
-OUVGNTE1Q0U4QTk4MDJGNTRBRjFERTAxRjA3MTE0NkQ5QTY4QkVCMzgyRkUwM0REN0RFCgpB
-QTAwQUEzMkJENTUyRDJGRDFCMDlFOTJFMzFFMzYyMzQzNEE1QTM0RTcwMkVEMDM3NUUxQTk3
-RjhCMDlBQTUyREM0RkFCOEExNUYwOUYKCkFCRjBCRTQ3QUQwM0Q5OTcyMzZCNkI1NTZBRkE5
-QzRBM0U0MTM1REI0OTU2REIzOEY5MTQ0NDZEN0UwRkM2QUEyMUQ0MjMyQjBCRjVFQwoKNjZG
-NDMyMTRFRUZDOENGOTg4NTRCQkQ2MjU2NjgxNDQ0Nzg5NTlBOTgzQTAxRENCNEZBMkJDOEZD
-REUwOEYzRDREQUI0NzRFMDVDM0FBCgo4MEI5MUZFNEY1M0YxMDNFRkRGQjFBNTA5Njk2RTBC
-NjY4MzBERTQ2NkNGRTgyNDMyOTJERTM0RDRFOUFBRTUwRUZENTM5QzEyMEJCM0QKCkMwRjdE
-M0VBRDFDMDMzRUY3RUFCQkUxMjk0Mjc2QzBGNzhDN0MwODlDNzZBMTAyNDg3MEVCQjA5RDQ5
-M0Q5QTRGMTZBM0U2NUI1QzVDOQoKRjM4MERCRjUzNjVCQkU4M0FFMTNBRDRFOTZDODUyMjc0
-RkE2Q0M4MzcwQ0U4RkFENDU0NDlEOTA1MEU3RDJFQUYzNTJGMTY5Q0M3RUZBCgo2N0IxQkJF
-Q0U0ODVDMkRDQjYwOEFBN0IyQjZGMjc2MkI3RTQ2ODJCQ0MzM0VBMEUzMDVDQzM5NUEzRDdB
-MkMyRjdFMEVGQ0YyQjEwNTUKCkYzMEU2MzE3NTdCQjVCRUEyMkQ5MDc0RkYyRDczNTg4RjlF
-OUREMTI0NzdENDRCRUVDQjlBMDNERDU0MzlDNDcyQ0ZFRURFMkJBRUQ5QQoKRkJENjdBRkY4
-MDY3NTlCQTBBRTM0Q0RDQjEyQ0E1MjMzMkM5MzI4NjMzQzQyRjE4OTRERTVGOUVDNTAxMzZB
-QTEyOTNDOUQ4OTM3MTYwCgowREZCMTRFMkU5NTQ5MDg1M0IwNjAxQUM3NTIyQkU4RTUxOTc4
-NkM4N0FBNUUxRUQyQjk2Q0UyMjEwMDlBQTlDNTVCQzYwQUVBNEU4Q0UKCkZEQjk3N0IyOEYw
-NTUxQzMwNkMyMkZGNDAxNjcyOEJBQjc4OUI2NUNFMDdGNjExQjlDODQ4MDg4MzdGODc2NUU1
-RDk0QjlDODY3QzBFMwoKQUZCMEVBNEEyMUEzMjRDQzBBM0JDMzUwMUMzOUE5QkE5MjhCMDlF
-OUE4NzQwODMxNERFNjNCNzgzMzkyRDVCRDlCM0FDRjU2Q0NENzBCCgo0OTMzQzE3MjQ3MzIz
-NzlBNjE2MDEyREZGOUE5RTE0RDVBNTVGNTBEODQxMzMzOTU4RDZGMzZCNTY5MjYyMjhGNDc5
-NjQyMUU0NzA3MzUKCjRGQUI3NDMxODk5NDQ1MTE0QkNDRTVEMjcxMTdCRkVBNjVFRTExMTg1
-MDU3NjUxMzJCNzgzM0ZFOTk3ODg5OUFBQTFCRTNFM0Y4QUZDRgoKMEU5RTExNDBBMjZGQzlD
-QTE1NEE2QkJCODRDM0U1RkQ2Q0Q4QjgyNzMyQkUwMTc5REVCQUNBQzUzNDBDNzk0OTNBMThG
-QTJFNURGNThBCgo1RjBDNjU0NkY1QTU4MzZCRDYxQzkwNEE4RUJBRjE2Q0Q5MzNBOUJDN0ZB
-NzJGQTcyRjMxOUEwQTZFRTg2QUQyM0M4NEU2NzJEMThDQkIKCjA2OTZGMjJFMUM2OUVDRUZE
-MTVGQTUyNzA2RTVEQ0YzQ0I1MzExQjI4RDlBNjE0NDQ2Q0UwMzM1NDdFQzBFRjVGRkFFQ0Yy
-QTA0RjFBNgoKQzNERTkxRUQyQjNGQkE5NERENzc5NkU0NUQyNkFCMDBCOTlCM0UyOTU3NTFC
-RDY0NzNGMEJGMzZFQkNBMjhGRkFCMjQ1MUU5M0RGNEUwCgoyNkJGMDg0NEZBQkM2QTEyRUYx
-NUVCQTY0QTVDQTBFOTdDNkREMDZCOTRCQTFDQjI5REZDREFEOEMyMDNDMUNCNkY3QTFGQUY0
-RjNCNTgKCjVCREQwQkY5MjI1NDlDQjQ1REY4RjIxOTZDNzA5RjJCOUEzNUE0M0RCMDA0M0Uy
-QkQwMjg3QTNDMzEzRUUzQzMzRjExOUYwOUE1NjE5RgoKQjM1MEY0MDExQTkzMTAwQ0VFMDg0
-N0YxQkRFMTJGRUU4RTMyM0M4RkFFMzRENTM1REI1QTBEQzg0NzVERTgyOTlFM0M5Q0Q2RDhC
-MENGCgpENjQ4MTYxOUM2OEU3N0Q5MkZBMTBEOUVCQ0MxM0U0NzRBRDIyQjFGNDdEM0YzNjJG
-Qzk2OENGQzFCNUI1MkVDMjRGMTlCQTg5NDk2N0UKCkVEODExRjM3NTI1QzI2MEFGRTBFMkY5
-QjMwMkQ2RkZEMDE5NzU0RUJDQzE0RTA1M0E5RUVEMTkwNUY0MDJCQTdCRDNEOEFGQjA5RDJB
-OAoKRTk0RDBBREJDM0MyQURGQUZEMkE0MDUyMjU2RDU4QjIyMUQwQTIwOTk1RjlDMzk0RjNB
-M0FENjQzNkNGRTRGMDAzMEM3RThDMjA5NEUyCgowOTJGNTE5MUMyQzcyMUNBOTQzMzM2OUFG
-QzIyMUQwMTg3MkJGNjgyOTg2Nzc4NDFBMDY1Njc3MjY0OUU3RUJBQUM4QjFCODFBMzhFNzUK
-CjVCMDJEREE0RDA4QjJGMzU3QzBDMTBFMTA2MDYzMkZGNzRGN0VERDVDRkU3RjlEQkIyMzJD
-M0EyMzFEMTI4QTMzNjhDNEQ5ODcyNDA0RAoKRjQ1NzE5QjNFQTA0NTU4MzZCODkzRjA3RTA3
-NzYyRjBBMkZBOUUwMTEwMTBBMDg3MjM1M0YwQ0QyMjQzRTE4NjBFQzMzRjcyRTE1RUIyCgpF
-REVFMUE5MTM5N0ZFNkQyNzI5RkVEMUIzQTY2RkQwMDlFQThERERBREQxRkZEQzhDRDM2MDM4
-NzZGOEQwQzdBRDYwMTY0QTk2QTZDNzMKCkI4QThCNTA5ODVFMUZCREEzQURDNTAwMThEMzQx
-RjI4NTAzNkI1RUUyNTVEOTc1RjZDM0I1Njk4QUM0QTk0QjIzMTdCQUM2NTg4OTc4MwoKNERC
-N0JGNTJFOUI4RDIwRkQ0OTgxNTE1RkJFRjIzOTYzQTdGODYzNkQwODk3RTdFQTg4OTAxQ0ZB
-RTFGREQxOERBODZDMjQ2NTA3QTM0Cgo3NjcyQUJCMTE2RUQ2MDVBQzlCNEI2RTg5OUI5RThG
-Njg2NzE0MEJFODlERjVDRDUyQzY1QzI3RTg2MDE3MEFFQTZDQUYzMDNDODYwQTYKCjgwQTg1
-Mzk0REU2ODk2Q0Y5MjhCRUQ3NjE3MUY4OTA0QzVCQkY0MTk2QkFEOTA2NTY5QUM1QzcwNTdF
-RDEyMDFGMkFFODM5M0NCRjcwNAoKMDA5MTI0QTZFNTIzMUQzMjNDM0ZDRTZDNDhDQTIzOUYx
-NjlERkY0OTZCOTUxMzMyREVCQTVGMDZDRUU0OEI2QkNGODI0RjBGQjRCRkU1Cgo0QzExNDdC
-RjIwOEMyQTlENDQxMzJEMDg5NUZBN0E4N0Y2RkFENzgwRERDRjk0NTQ1RjcwMzBFRjE4MDhC
-MzBFQzY1OUZBMkI2RUEwMTEKCkEzQzA2MDcwMzg4QkJBRUJFNDVGOEVBQTc1RjcyQkE1QjRF
-NTYzODBGQjdGQzMxNzlCREI1NUE5QTdDQUY4RDdGQjYwRUFENkRBOTM5QgoKMDlFNjkxNTk0
-MzI2NzFDODhFMjJCMzREMTE1QjZERUM1NDk1NTQ1NEQ2MjI4NTcwOTRCNzBDMzM1OUQ2QTIy
-QzIzOUZFMDM4NTNDRkQ5Cgo5QjdGQTczRDRFRTNDRDM0MTI0NDg2RjAxRjVDRjA1QTQyM0ZG
-RDc5NEY1NzdGNTBERTY3NzY3NzkxMDdCRDU4ODA4RUVGQTI0REUxQkUKCjk0QkIyN0Y4MkEx
-OTA2OEQ3RjlEQzY5NUVDODQ3MzM0MUY3M0ZFRDYyNkE0QTZFODlCNThENEVEMjAyNEY3OEFD
-NzY3ODgyOUZBNDBCNwoKQzhBQTc0MDBFRTNDRUZFMTI1RjY0RTFBQjQ5Q0U2N0ZBMkYyRDFC
-ODFGQzMyMkFBNjRGMTY0NjNDMTM0QUY1MUFBOUMzQTE1NEM3RkQ0CgozMEJDRjQ1MzFFQTlC
-NjIxMUY5MjAwNkFDMUM2MTg5NEE3REQ1QzM4RTZDQjhDQzY4RDZBMDVCQjk1QjBCREFGNjY5
-NzFEMzU3RUZDQUQKCjg5QkNCODEwOTQ2MkI3OTY5MjczODk1NjdGNzk3RTU4ODIzNzA2QUIy
-MjRGRjkyN0E3NjE2RjBFNDUyN0Q5MEIwREI5Njg5RDg1MEQ0QgoKNEYxNDcwODBDQkJGMzQ5
-M0U1NjRBMUNDNDM2MjcwNzVFNzlCRjNDMzA5MUU0NjUwQjhFNjA3RjRDQ0NCQ0FGQ0QzRjc3
-OEI3QTE0NjRCCgoxNEE0RTIyOUZENDFCNUJDNEE5ODg4MEYwMDhFRDYzRkQyNUFFNDUwNEVF
-OEJEMzhCNjQxRjY1RDBGM0Y2NTk2MUFDMzE1RjRENjgxMzkKCjdDMjQ3MEU4ODgxM0JDRkM3
-RTQxRkRBOTlBRUZFMTcwRTI3NEQ1M0REM0Q4NThEOEJCREExNTRCRkM5MzQ4MkM2NUZFQUU0
-QUQ3RTlBNAoKN0FDOTUzMEYwQTgyRkY0NkU4QkYyMkVDNjRCM0E4QjY5NTI3RTkyMjQ1QjNC
-MjcyQzMxMUZDRjk5NDZFOTM0NzZEODM4RUMwQUU1NEVBCgo4Q0I4OTkwODc3OTRBNjdFNkI0
-RTk2NjY0QUZERDYxOUZDMDc0RkEwODlGODNBMDJGQTRGQ0JCNUJFNjk4RTUwOEY4N0JDMEY0
-ODA1MUEKCjhBQTRERTNFQkYzRkQ5M0FCQ0Y1OEMxRkI2NDI1NzAyN0FGOEZENjlCN0NFRjA3
-NDk4RjQ4RjM5M0I0QjRFOUJERDY1MTkzMzJBNzgwQQoKRTcyMTUyQ0UxNjhFMzk5RTc1REI0
-NDE0NjE4QjlFRkZCNDk4NkI4NUE5NENCRDBCOTEyRTNENUNEREJBNkI3ODRFQUM2NjA5NjlB
-ODNDCgpDRjNBRjkyOEI2RTg0NTg2QjVGMUNGMzUzRUZERjAyMkRBNURGMTMwRTdGRkQxNjk4
-QTlBN0MyNkM4M0YxMzVGQzM5RTlDRUNCODg1NUQKCjk2MDFBMDhEOUU1QURDNTM5N0VFOUU2
-MzlBMTk4QTYxQTc5QjNDRjU5NjBBRkM0MTU4NEI1NkIwRUY1QzYwNEU0MkJERDAyMUU3MTZC
-NwoKMzcxOEFBN0ZBNzAwMkQzMjlGMjJFMzg5OEI1MkYzMTExRTk3NUQ1MDU0QzhDMUJDNDkx
-RURENjdDQUY4NzY1MTc5MDFDQjc4MDVGQTg0Cgo0Mjc5NDM1QjI2QTJCNTRDMDg2RkU0NDND
-MDc5QTM3M0I2MzA1Mjg2NjRDOEYyNjJEMTQ3RjQ0RjE5QjM3NjBENENCNEQzQTM4QjhFN0IK
-Cjg0OTJGM0ZDOTEwRTQ1QTIwMUZGQkI4QjNGMDZGODBDRDEzNUMzMjFFRjUxQjdBN0MzMEFG
-QjVBMTRENUVBODUxRTRCMjMyMzJCM0YwRQoKMjcyNjAzMTI1REU5OUM2QjE3NTVDOUQzRThC
-OUU5MkQzM0FBNEVFQjU1RDA3RDA2MTU4RkZGOTNCQ0VFOTIxQ0JFNkE5QjY2MDVCRTNBCgpE
-MUMyMDNBQjkwM0FFRDkwQTFGNzM1RDMyODQ2RUU5QkY3QUNCRDdCQzQ3OUZEQUQ4MjA0RjBB
-NTYwMTQ3N0UyQ0EwOTJDN0NENTc2NzEKCkUyQjE3OUI2MEE3Mjc5NEZCM0RFQkVCRTlFNDFF
-RjMzM0Y5NzAwN0JGRkRDMUExQzU1Qzc5RUI5Q0Y4NUFDMkRDQzIzNzAwRjQ4RDZFRQoKNjIx
-RDAyRkFBQjdEN0U3QzUxMkI5MzkzNjJBQURCMUFDREIyNUI3NUZFMUI5MzVGMTVGOTIyQUU0
-RTAzNjMyRUM5QUMxQ0NFMTEyRkQ3CgpDQzg1MTBCODY5MjEyMDlDRUY1RTY2RjUyQ0FGNEVB
-RkQ4M0U3NzJBNjUzQjBCMTBFQTdERTM4MTc0QTY0NTgyMjhGOTAxNDZBMUM1RTUKCkYwNTdE
-Mzg0Q0I1Q0U1MzFDMDJGN0JGMkJEMjA1MTdGMTgyNTk3MzEwMTU3QUVENjhDMjMyNUNDQUJD
-MjJGOUQzOEEzMkFGMTU3NTcwNwoKREVBNTEzOUUwMzYzNjc3MTYyREI2RUU5RDQ2NjE5REFD
-ODhEOUQ5NzkwMkQ1QzU4MzM5RkY5QjdFM0REQkRCNzIyNkRFRDM2QzFDQjUxCgpCNTBCQTc0
-NENCMkRFNTk2NDEyNjkxODg3OURCRTdEMkZBNjE2RkJBOUQ0RDI5NjUwMjFFRERBOEE4OEZE
-RkMwODg1M0RDMUZFOTk2MTQKCjE1Qzc0MUIyMUZBN0Q3OUE2RjAyODFCRDA1NEU0OUM2RjE4
-OTNBMkE0QjM3MDhFNzI3MkY0MkM2QUU4QTVFN0M5NUNENjg3OTQ2NjE1MAoKQ0I5OUY0MTEw
-QjM5MkRBN0RGOTE0MTk1NzFFRTMxQzkyNkIzNTcxREMwRkQ3MzAyRTI3MTI2M0M0QUZDRjc1
-NTM1MjU2NTFEOEQ1NTg3Cgo3QUE0RTEzMzMwOTJFRDUyQTk2NzI5OTBCRjM0QTFCNjBFQzI0
-MzI0MTUzMEU2N0U5RjFEN0NDQkJBMUI1MTFBMjQ3OTNGMjUxMUYzRTQKCjc2M0IwMkQ0MDg0
-Q0ZGMDk5QkQ4MzQwOEZFQUQwNDAzRTMzQTZCRUZCQ0FEOTU2NDIzMkZBQjdCQUJDOEJDQUY3
-ODVBNkVBNzRBQTg4MgoKQjc0REUyMjlBNkM5RDE0MEU2MTdGMTBFOTg4NDY3NzA0RDMxNjk1
-NjM3MTA2ODI1REUwRjMxQzNCQkFEN0VFQzMxN0MyQ0JGN0NBN0IyCgpFMjVBNTM2NUM4MjM0
-QjlDNTdDOUUzODUzQzdBNTgxOTcyQjMxODZBQTg3MDQ2QzA5REFBNDQyOURDQzU2QzdDRjdG
-OTc1MDQyOEI5NzQKCjQ5RTZEOUUwRUUxMDRCQjJFODBEMDU3OTdENjFDNzFGNzc1MUM1NzI2
-RTFGRDdDNDQxMTc2QUJEMzI2MTNCNkQ3RUE5OEI0MjYyRjlGNQoKNjY0QUE4RDRFOTQyMkFB
-MEY0NEM0QTFDNzlDMzIxNDBGNkYzOEFCRDBGRTlEN0NEODU5OTdBMzU3Qzk5OUEzNzY3NEY0
-NjAzNjA5MzQ5CgpCRUJBNEY4NkQ4MTgyOTBGNkQxRTc1Q0M3MDU1NUQ2OEE3MTdFQzA2M0I5
-MjkzMUYyMjc4RTQ2MEEyNEE1MzM3N0Q4NTMyMkZBQzAzQkEKCkQwMDhFRDY0MDJGMzc2OEE3
-NUNFRUY0RUJGNzM4NTJBMjUxMkMxNDk5QjNENDUwMkUwNUU5QzRDNzdEOTYyNzA4REU3RkI0
-MDYyNjVBNwoKQTdCMEFFMzhFODc5QkU4OTIyQzU4NUVGNEFDREEyQTQ0NTlDMjdERUFDNTkw
-OUFCQ0MxNTA2NEVCNkI5NzRFRUQ5NTcwMjI4NkY4QzA0CgpFNTkxODcyNDFFMzU3QkYwRkEy
-RjFCMUQyNTc2MzY2REQ5NkIxNUU0MDg5MTA0MTQzNUQzNTQyMzQ0REREQ0VBOTk4MkU3ODUw
-QkNGMTIKCkJGNjAwOTNGMEJCOTEyNzlFOEFDMkE0MERCNUM3RjA1ODY0MjJBOUI3NTE5QjVB
-MTRGMEU1QkU0OUJDMDgxODEzN0QwRDUxMkEyQkQ2RQoKNDc1ODU1RUFGQkVGNDcwMTkwNzIx
-QTZFOTA5NjZDRDhGNDdGODAxNzgwQjYxODFDOTJCNkQ0MDFCQjcwQTY0Qzk1QjEyQUU3RERE
-OTgwCgpEMzIzMjNFRjU2OUMwNTEwNUFEQzNBQjVERTEyN0I0MjFFRTE0NTNERjdGQzVCRTIy
-NzVFNTk0MUZDOUM3RkVFMDlGOTMxMDM5REE3MEIKCjkyMDYwNEQ0MDcwMzM2OUI0N0Q4MDE0
-RTk1RjgyNzU2MzIzNEQzMkEwOEZDRjhCOTkwNzNGQkY3RTg3QTM0RDdGQTFBRjlFNkI1QzVD
-MAoKODgwMjI1MEFDQjdFOTQzREExMDhCQjI0ODVBNDEzMjQ4MTlDRTg1QUQ1MUNBODNGQzc1
-NzVGRDVFOEVFMzUzQUI4QzZCOUMyRjNEQjhFCgpCM0RFRDQ1RjIyNzExMTkwMzIxQTJGNkY5
-NTA5N0RENkEwRUQ5MUUwREE1NEFBRkQwNUE2QjlEMzk5MjM5NTI1Q0Q4MzNFOUFBNjIzMUMK
-CkQ0RjgzNUI3MzBFNTQ1OUMzOTlERjc2OTNEQzRDMUNBRUZBRDY0MTZCQzk1RjhCOUYwNTMz
-QzBBMjdEODZCNDJEODQ4MEZDOTA4QUE5MQoKQzA0NjhGMEJGNzNDQzVFMjYwRTVGMDBEODJD
-NDM5RTlBNTgxQjE5QTYxQjUwMTQ2MDZENTdEMTg2RDlGOTQ2OTIxN0I0NDcyREIxNjA5CgpG
-RUQxOTQ5RDI5RkYzRTJFM0ZBQUI1MzZGRjc5NDlBMjYwNDJCOUZDNTQwOEI3QjA1OUVFMzVC
-MEUyODdGNEQ4Q0VFNTBFNTQwREI3MTYKCjY4MDJFRkJGMEZCNjBGMThFNUExRkE5NDJBNEUz
-RTY2RUU2OEVBNDRCOEZGNjZCM0IwNjY5RTU5QTgxQzYxNjYzMTI5ODcxNjRFNkRDNAoKREI3
-NTA5QjExNDQ0Mjg3QTVCRUM1QkVBOUZGNjU2RDVBNDJDMERDQjEwRjgzQjE0REYwMkJCRkU3
-MjlFOTgzOUU1OTQ4OTVEQTgwNDQ4CgpCNzYwRDdBQjVFNThCNjc1QURBNDIwOTg5MjlGQkVE
-MzVENjJBNTQ3MzdGRTZFNjEyNTY5QjhERTRFQjYwM0YxREQ2REJGRkU4Rjc5RDYKCkFFQTFC
-MDU5OTkxM0FBNzAwODNFQjk0RTI1MURCMjc3QkU5RjQ5MkU0RDEzQjJFNDJGQ0NGODI1QjM1
-ODlFQzRGOTQyN0JBNjU5QTU5QgoKNzNEQUNDM0M5RDJFOUNENzcyNjdERUZDRkRDRjIxMTdG
-NTIwN0FFQzQxOTgxMzBCMUI1ODU4NzVBNDlCNkUwMUM4QTVGRTVFQkM0Njc4CgoyQkRCQzQz
-OEJFMzJBMUNBRjEzNEU5QjUzRDgyNzYxRTlCNjgyRTBBMTk4QTgxMkYyOTZFMTkzQzI5NjQx
-MjU5Njk3OEREM0M1RUVGMEYKCkJFN0IzNTM1NjhDNTYyN0JDNjQ2N0M3NjdGOUVEODQxMkVF
-NDA1QzI0RjZERkU5NUFGNzI0MzdEMUFEOUI5OTJGRjMwNDU5RDIzMjQ5MQoKNjQ1RTg0NUZG
-RjAzMjE0OTQ5RDMzRTFBNDhFRjJBOTlEQjI5REU2RkY4MkU3MjA1MEUwRTZFMDhFODYzREI1
-NzBBREY1MTVEODI5MzFCCgpBRTcwNDM3RTQ5QzM5Nzc2Nzg3NEUzNDUxMzQxN0E0OTIzNEJC
-RDg5RjE5RkZDM0VFM0NEOUY1QkE3MTEyQTRCRUMwNzAxMkM3MDk1ODUKCjk3RUNBNUE1MDEz
-NjVFMzUyNEE1MDBGQThBNDNBN0JBOTBGOTFFOENENTgyNUY2NTk0MDgyNURFODBGNUVGMTEx
-OTg5NTJBMjU4QjVCQgoKRUM1QUEyNDRGODY3NEJFMTc2NEI1MjZEQjZCOUQyNDRDODg2OTgw
-QjI1QzdFRTRBQ0ZFQkY3OTM0OUUyNkYyRDJENjVGQTI4MTBEMUNECgo0QjM5MjMzRjk2Mzg1
-NDZBM0ZGMUU4RDAxN0VGNDU4RjE4MkNGMjI4MzkyQUQzMEE2RTdERjcxNUNEMEI1NUZBMzc3
-REZBNjg4MEY1NTQKCjM2N0E2RTM3MjgwNjVERjY1Q0FEMzBBRDkyNzk0Mzk2Mzk3M0Y2NTk2
-QzFDMUREMjlDMkM4NEIyMjRGODEzNjFENENBMkVEMkNDNjQ4MwoKQTU5RjgzM0NCOEE5NjRD
-MjgxQjBCQTJDODM0NzgzQzU3NTI5ODZCOEU3MDU4M0U2QzlBQTMzMTMyQkZDNjc5OThCOTky
-RjI0OUQwQUQ3Cgo2QzAyQkREMjkyNUIzOTUwMUE2OUU0RTAwREQzNTM0QzQ3NEQwNzE1Qzkx
-M0UyMzY2MEJCNzY1QzJFNUZFMzdGNDQ1QUM2MDVGNjJERTkKCkM1MzNFRTkyNEVGRTIwNUM1
-MjhDMzcyNDAzNjk2ODg1RERENkJBREFGNjAyOTkzRjNERjQ5OTU3RTIxQjJFRTQwOUFBNjMz
-NkE4MTAzRQoKQkNDMEIzM0I4RkZEOEM4MThGMkQyNUQyMkUzQjBFNEU4NzRDRjRBREUwM0Y2
-OUMxQjAxN0RBOUNFRDlFQUZDNkNCRDg2NzgwQzgxOUE5CgpDRTAzQzJBQTIwM0NBQkQyOTky
-NTFCOTA5MEYyNjU5QzMyNDVBODQ1QjUwRUIzNkJDQkMwN0FENkZFMEExOTFEM0U4QkQwQzlC
-OTcwMEEKCjcwNkVBMzAyOEU4MDU1QjU4NUE2RDhGMzA1QzgwREQ1QURCRTFEQTQzMzY2OUUx
-RDlGNDU5RUExMDVCNUY2RDc1NkE5RkYzREY3MTYwNwoKOUZEQTc3MzEyRTQ0N0Y3NjRDMEYx
-NzhCN0YxMjhEQTRBQ0UxN0Y4RDRGMjEzODY0QzJBQUZBQjBENUJDRTQwQTE5QUM5MkZGMjFE
-N0IxCgpGMUYzQ0VDMzM4OTUxRDcyOTIxNDc5MzdFRDBCREIwQ0VDMjU3OEQwQkZFMTJGN0Yy
-MUI0RDc2QUREMUY1NTdFOEE1NzYxMzk5NTkxQzIKCkQ0QTJDQjFGMEQ5NTY0NTg2NTY3QUU5
-MTY1NDUxREZGNUQ2MUUwOEYwNDIxQTg2MDZFNDlBNTUyRTE5RjhDQ0RDOTBDQTkyQzRCQzJB
-RAoKMkZDM0RDMjlERkY2RTU2QkE4NUQ4RTdCMDM4ODk2MkRCNUJCMTA3Q0JBQjRGRDQxNzBG
-MjRDMjFERkUyQTNFRjI5RERCODJDMDJFRjMyCgo0QjlEQjJBQzA5QzFBNUVBN0M3MUIxNTQ3
-NTczQjY4RkY4QzMyMTVCODAzQ0QzRURFMTIyREUxRDcxNDkyQkQzQjcxQzVBNkRFNTJENTAK
-CjhFOTg2NzY1NjBFRDI3MzQwM0I5RDY1NUYyMzk1NzkwMDc3MDZDMDc4RUEzRURDMTIwRURG
-RUNBRjRGMTMzNzlBNDUyNkZCMzczMUEwOAoKOTY5MENGNkQ3NEYyRTk1RTMzMkQxRERCMzZE
-RjQ1ODc3MUYwRjdCRjMyMUU1MjQ0NDdCNkUwNEFDMzMwMTFFODU1QTBFMjU1ODJGMTA0Cgo2
-OUYxQjZDMTkwODlBRjAxM0MzOEYyNjI0ODI2QTU3MzA2NDEKCjAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK
-CjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAKCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
-MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKCmNsZWFydG9tYXJrICV7cmVzdG9yZX1pZgoKJSVF
-bmRQcm9jU2V0CiUlQmVnaW5Qcm9jU2V0OiB0ZXhwcy5wcm8KVGVYRGljdCBiZWdpbiAvcmZ7
-ZmluZGZvbnQgZHVwIGxlbmd0aCAxIGFkZCBkaWN0IGJlZ2luezEgaW5kZXggL0ZJRCBuZSAy
-CmluZGV4IC9VbmlxdWVJRCBuZSBhbmR7ZGVmfXtwb3AgcG9wfWlmZWxzZX1mb3JhbGxbMSBp
-bmRleCAwIDYgLTEgcm9sbApleGVjIDAgZXhjaCA1IC0xIHJvbGwgVlJlc29sdXRpb24gUmVz
-b2x1dGlvbiBkaXYgbXVsIG5lZyAwIDBdL01ldHJpY3MKZXhjaCBkZWYgZGljdCBiZWdpbiBF
-bmNvZGluZ3tleGNoIGR1cCB0eXBlIC9pbnRlZ2VydHlwZSBuZXtwb3AgcG9wIDEgc3ViCmR1
-cCAwIGxle3BvcH17W31pZmVsc2V9e0ZvbnRNYXRyaXggMCBnZXQgZGl2IE1ldHJpY3MgMCBn
-ZXQgZGl2IGRlZn0KaWZlbHNlfWZvcmFsbCBNZXRyaWNzIC9NZXRyaWNzIGN1cnJlbnRkaWN0
-IGVuZCBkZWZbMiBpbmRleCBjdXJyZW50ZGljdAplbmQgZGVmaW5lZm9udCAzIC0xIHJvbGwg
-bWFrZWZvbnQgL3NldGZvbnQgbG9hZF1jdnggZGVmfWRlZgovT2JsaXF1ZVNsYW50e2R1cCBz
-aW4gUyBjb3MgZGl2IG5lZ31CIC9TbGFudEZvbnR7NCBpbmRleCBtdWwgYWRkfWRlZgovRXh0
-ZW5kRm9udHszIC0xIHJvbGwgbXVsIGV4Y2h9ZGVmIC9SZUVuY29kZUZvbnR7L0VuY29kaW5n
-IGV4Y2ggZGVmfWRlZgplbmQKJSVFbmRQcm9jU2V0CiUlQmVnaW5Qcm9jU2V0OiBzcGVjaWFs
-LnBybwpUZVhEaWN0IGJlZ2luIC9TRGljdCAyMDAgZGljdCBOIFNEaWN0IGJlZ2luIC9AU3Bl
-Y2lhbERlZmF1bHRzey9ocyA2MTIgTgovdnMgNzkyIE4gL2hvIDAgTiAvdm8gMCBOIC9oc2Mg
-MSBOIC92c2MgMSBOIC9hbmcgMCBOIC9DTElQIDAgTiAvcndpU2VlbgpmYWxzZSBOIC9yaGlT
-ZWVuIGZhbHNlIE4gL2xldHRlcnt9TiAvbm90ZXt9TiAvYTR7fU4gL2xlZ2Fse31OfUIKL0Bz
-Y2FsZXVuaXQgMTAwIE4gL0Boc2NhbGV7QHNjYWxldW5pdCBkaXYgL2hzYyBYfUIgL0B2c2Nh
-bGV7QHNjYWxldW5pdApkaXYgL3ZzYyBYfUIgL0Boc2l6ZXsvaHMgWCAvQ0xJUCAxIE59QiAv
-QHZzaXpley92cyBYIC9DTElQIDEgTn1CIC9AY2xpcHsKL0NMSVAgMiBOfUIgL0Bob2Zmc2V0
-ey9obyBYfUIgL0B2b2Zmc2V0ey92byBYfUIgL0BhbmdsZXsvYW5nIFh9QiAvQHJ3aXsKMTAg
-ZGl2IC9yd2kgWCAvcndpU2VlbiB0cnVlIE59QiAvQHJoaXsxMCBkaXYgL3JoaSBYIC9yaGlT
-ZWVuIHRydWUgTn1CCi9AbGx4ey9sbHggWH1CIC9AbGx5ey9sbHkgWH1CIC9AdXJ4ey91cngg
-WH1CIC9AdXJ5ey91cnkgWH1CIC9tYWdzY2FsZQp0cnVlIGRlZiBlbmQgL0BNYWNTZXRVcHt1
-c2VyZGljdCAvbWQga25vd257dXNlcmRpY3QgL21kIGdldCB0eXBlCi9kaWN0dHlwZSBlcXt1
-c2VyZGljdCBiZWdpbiBtZCBsZW5ndGggMTAgYWRkIG1kIG1heGxlbmd0aCBnZXsvbWQgbWQg
-ZHVwCmxlbmd0aCAyMCBhZGQgZGljdCBjb3B5IGRlZn1pZiBlbmQgbWQgYmVnaW4gL2xldHRl
-cnt9TiAvbm90ZXt9TiAvbGVnYWx7fQpOIC9vZHt0eHBvc2UgMSAwIG10eCBkZWZhdWx0bWF0
-cml4IGR0cmFuc2Zvcm0gUyBhdGFuL3BhIFggbmV3cGF0aApjbGlwcGF0aCBtYXJre3RyYW5z
-Zm9ybXtpdHJhbnNmb3JtIG1vdmV0b319e3RyYW5zZm9ybXtpdHJhbnNmb3JtIGxpbmV0b30K
-fXs2IC0yIHJvbGwgdHJhbnNmb3JtIDYgLTIgcm9sbCB0cmFuc2Zvcm0gNiAtMiByb2xsIHRy
-YW5zZm9ybXsKaXRyYW5zZm9ybSA2IDIgcm9sbCBpdHJhbnNmb3JtIDYgMiByb2xsIGl0cmFu
-c2Zvcm0gNiAyIHJvbGwgY3VydmV0b319e3sKY2xvc2VwYXRofX1wYXRoZm9yYWxsIG5ld3Bh
-dGggY291bnR0b21hcmsgYXJyYXkgYXN0b3JlIC9nYyB4ZGYgcG9wIGN0IDM5CjAgcHV0IDEw
-IGZ6IDAgZnMgMiBGL3xfX19fX19Db3VyaWVyIGZudCBpbnZlcnRmbGFne1BhaW50QmxhY2t9
-aWZ9TgovdHhwb3Nle3B4cyBweXMgc2NhbGUgcHByIGFsb2FkIHBvcCBwb3J7bm9mbGlwc3tw
-b3AgUyBuZWcgUyBUUiBwb3AgMSAtMQpzY2FsZX1pZiB4ZmxpcCB5ZmxpcCBhbmR7cG9wIFMg
-bmVnIFMgVFIgMTgwIHJvdGF0ZSAxIC0xIHNjYWxlIHBwciAzIGdldApwcHIgMSBnZXQgbmVn
-IHN1YiBuZWcgcHByIDIgZ2V0IHBwciAwIGdldCBuZWcgc3ViIG5lZyBUUn1pZiB4ZmxpcCB5
-ZmxpcApub3QgYW5ke3BvcCBTIG5lZyBTIFRSIHBvcCAxODAgcm90YXRlIHBwciAzIGdldCBw
-cHIgMSBnZXQgbmVnIHN1YiBuZWcgMApUUn1pZiB5ZmxpcCB4ZmxpcCBub3QgYW5ke3BwciAx
-IGdldCBuZWcgcHByIDAgZ2V0IG5lZyBUUn1pZn17bm9mbGlwc3tUUgpwb3AgcG9wIDI3MCBy
-b3RhdGUgMSAtMSBzY2FsZX1pZiB4ZmxpcCB5ZmxpcCBhbmR7VFIgcG9wIHBvcCA5MCByb3Rh
-dGUgMQotMSBzY2FsZSBwcHIgMyBnZXQgcHByIDEgZ2V0IG5lZyBzdWIgbmVnIHBwciAyIGdl
-dCBwcHIgMCBnZXQgbmVnIHN1YiBuZWcKVFJ9aWYgeGZsaXAgeWZsaXAgbm90IGFuZHtUUiBw
-b3AgcG9wIDkwIHJvdGF0ZSBwcHIgMyBnZXQgcHByIDEgZ2V0IG5lZwpzdWIgbmVnIDAgVFJ9
-aWYgeWZsaXAgeGZsaXAgbm90IGFuZHtUUiBwb3AgcG9wIDI3MCByb3RhdGUgcHByIDIgZ2V0
-IHBwcgowIGdldCBuZWcgc3ViIG5lZyAwIFMgVFJ9aWZ9aWZlbHNlIHNjYWxlYnk5NntwcHIg
-YWxvYWQgcG9wIDQgLTEgcm9sbCBhZGQKMiBkaXYgMyAxIHJvbGwgYWRkIDIgZGl2IDIgY29w
-eSBUUiAuOTYgZHVwIHNjYWxlIG5lZyBTIG5lZyBTIFRSfWlmfU4gL2NwCntwb3AgcG9wIHNo
-b3dwYWdlIHBtIHJlc3RvcmV9TiBlbmR9aWZ9aWZ9TiAvbm9ybWFsc2NhbGV7UmVzb2x1dGlv
-biA3MgpkaXYgVlJlc29sdXRpb24gNzIgZGl2IG5lZyBzY2FsZSBtYWdzY2FsZXtEVkltYWcg
-ZHVwIHNjYWxlfWlmIDAgc2V0Z3JheX0KTiAvcHNmdHN7UyA2NTc4MS43NiBkaXYgTn1OIC9z
-dGFydFRleEZpZ3svcHNmJFNhdmVkU3RhdGUgc2F2ZSBOIHVzZXJkaWN0Cm1heGxlbmd0aCBk
-aWN0IGJlZ2luIC9tYWdzY2FsZSB0cnVlIGRlZiBub3JtYWxzY2FsZSBjdXJyZW50cG9pbnQg
-VFIKL3BzZiR1cnkgcHNmdHMgL3BzZiR1cnggcHNmdHMgL3BzZiRsbHkgcHNmdHMgL3BzZiRs
-bHggcHNmdHMgL3BzZiR5IHBzZnRzCi9wc2YkeCBwc2Z0cyBjdXJyZW50cG9pbnQgL3BzZiRj
-eSBYIC9wc2YkY3ggWCAvcHNmJHN4IHBzZiR4IHBzZiR1cngKcHNmJGxseCBzdWIgZGl2IE4g
-L3BzZiRzeSBwc2YkeSBwc2YkdXJ5IHBzZiRsbHkgc3ViIGRpdiBOIHBzZiRzeCBwc2Ykc3kK
-c2NhbGUgcHNmJGN4IHBzZiRzeCBkaXYgcHNmJGxseCBzdWIgcHNmJGN5IHBzZiRzeSBkaXYg
-cHNmJHVyeSBzdWIgVFIKL3Nob3dwYWdle31OIC9lcmFzZXBhZ2V7fU4gL2NvcHlwYWdle31O
-IC9wIDMgZGVmIEBNYWNTZXRVcH1OIC9kb2NsaXB7CnBzZiRsbHggcHNmJGxseSBwc2YkdXJ4
-IHBzZiR1cnkgY3VycmVudHBvaW50IDYgMiByb2xsIG5ld3BhdGggNCBjb3B5IDQgMgpyb2xs
-IG1vdmV0byA2IC0xIHJvbGwgUyBsaW5ldG8gUyBsaW5ldG8gUyBsaW5ldG8gY2xvc2VwYXRo
-IGNsaXAgbmV3cGF0aAptb3ZldG99TiAvZW5kVGV4Rmlne2VuZCBwc2YkU2F2ZWRTdGF0ZSBy
-ZXN0b3JlfU4gL0BiZWdpbnNwZWNpYWx7U0RpY3QKYmVnaW4gL1NwZWNpYWxTYXZlIHNhdmUg
-TiBnc2F2ZSBub3JtYWxzY2FsZSBjdXJyZW50cG9pbnQgVFIKQFNwZWNpYWxEZWZhdWx0cyBj
-b3VudCAvb2NvdW50IFggL2Rjb3VudCBjb3VudGRpY3RzdGFjayBOfU4gL0BzZXRzcGVjaWFs
-CntDTElQIDEgZXF7bmV3cGF0aCAwIDAgbW92ZXRvIGhzIDAgcmxpbmV0byAwIHZzIHJsaW5l
-dG8gaHMgbmVnIDAgcmxpbmV0bwpjbG9zZXBhdGggY2xpcH1pZiBobyB2byBUUiBoc2MgdnNj
-IHNjYWxlIGFuZyByb3RhdGUgcndpU2Vlbntyd2kgdXJ4IGxseApzdWIgZGl2IHJoaVNlZW57
-cmhpIHVyeSBsbHkgc3ViIGRpdn17ZHVwfWlmZWxzZSBzY2FsZSBsbHggbmVnIGxseSBuZWcg
-VFIKfXtyaGlTZWVue3JoaSB1cnkgbGx5IHN1YiBkaXYgZHVwIHNjYWxlIGxseCBuZWcgbGx5
-IG5lZyBUUn1pZn1pZmVsc2UKQ0xJUCAyIGVxe25ld3BhdGggbGx4IGxseSBtb3ZldG8gdXJ4
-IGxseSBsaW5ldG8gdXJ4IHVyeSBsaW5ldG8gbGx4IHVyeQpsaW5ldG8gY2xvc2VwYXRoIGNs
-aXB9aWYgL3Nob3dwYWdle31OIC9lcmFzZXBhZ2V7fU4gL2NvcHlwYWdle31OIG5ld3BhdGgK
-fU4gL0BlbmRzcGVjaWFse2NvdW50IG9jb3VudCBzdWJ7cG9wfXJlcGVhdCBjb3VudGRpY3Rz
-dGFjayBkY291bnQgc3ViewplbmR9cmVwZWF0IGdyZXN0b3JlIFNwZWNpYWxTYXZlIHJlc3Rv
-cmUgZW5kfU4gL0BkZWZzcGVjaWFse1NEaWN0IGJlZ2lufQpOIC9AZmVkc3BlY2lhbHtlbmR9
-QiAvbGl7bGluZXRvfUIgL3Jse3JsaW5ldG99QiAvcmN7cmN1cnZldG99QiAvbnB7Ci9TYXZl
-WCBjdXJyZW50cG9pbnQgL1NhdmVZIFggTiAxIHNldGxpbmVjYXAgbmV3cGF0aH1OIC9zdHtz
-dHJva2UgU2F2ZVgKU2F2ZVkgbW92ZXRvfU4gL2ZpbHtmaWxsIFNhdmVYIFNhdmVZIG1vdmV0
-b31OIC9lbGxpcHNley9lbmRhbmdsZSBYCi9zdGFydGFuZ2xlIFggL3lyYWQgWCAveHJhZCBY
-IC9zYXZlbWF0cml4IG1hdHJpeCBjdXJyZW50bWF0cml4IE4gVFIgeHJhZAp5cmFkIHNjYWxl
-IDAgMCAxIHN0YXJ0YW5nbGUgZW5kYW5nbGUgYXJjIHNhdmVtYXRyaXggc2V0bWF0cml4fU4g
-ZW5kCiUlRW5kUHJvY1NldAolJUJlZ2luUHJvY1NldDogY3JvcC5wcm8KVGVYRGljdCBiZWdp
-biAvY1ggMTggZGVmIC9DTXtnc2F2ZSBUUiAwIGNYIG5lZyBtb3ZldG8gMCBjWCBsaW5ldG8g
-c3Ryb2tlCmNYIG5lZyAwIG1vdmV0byBjWCAwIGxpbmV0byBzdHJva2UgZ3Jlc3RvcmV9ZGVm
-IGVuZCAvYm9wLWhvb2t7Y1ggZHVwIFRSCmdzYXZlIC4zIHNldGxpbmV3aWR0aCAwIDAgQ00g
-dnNpemUgY1ggMiBtdWwgc3ViIGR1cCBoc2l6ZSBjWCAyIG11bCBzdWIKZHVwIGlzbHN7NCAy
-IHJvbGx9aWYgMCBDTSBleGNoIENNIDAgZXhjaCBDTSBncmVzdG9yZSAwIGNYIC0yIG11bCBU
-UiBpc2xzCntjWCAtMiBtdWwgMCBUUn1pZn1kZWYKJSVFbmRQcm9jU2V0ClRlWERpY3QgYmVn
-aW4gQGRlZnNwZWNpYWwKCiAvYXJyb3cgeyBzYXZlIDQgMSByb2xsIDE0IGRpY3QgYmVnaW4g
-L3kgZXhjaCBkZWYgL3ggZXhjaCBkZWYgL0QgZXhjaApkZWYgY3VycmVudHBvaW50IC9iIGV4
-Y2ggZGVmIC9hIGV4Y2ggZGVmIC9keCB4IGEgc3ViIGRlZiAvZHkgeSBiIHN1YgpkZWYgL2Fy
-cm93bGVuIGR4IGR1cCBtdWwgZHkgZHVwIG11bCBhZGQgc3FydCBkZWYgL2FuZ2xlIGR5IGR4
-IGF0YW4KZGVmIDAgc2V0Z3JheSBhIGIgdHJhbnNsYXRlIGFuZ2xlIHJvdGF0ZSAveHAgYXJy
-b3dsZW4gZGVmIC9tIHhwIEQgc3ViCmRlZiAwLjUgc2V0bGluZXdpZHRoIFszIDFdIDAgc2V0
-ZGFzaCAwIDAgbW92ZXRvIG0gMCBsaW5ldG8gc3Ryb2tlIC9iYWNrCkQgOCBkaXYgbmVnIGRl
-ZiAvdXAgRCA0IGRpdiBkZWYgbSAwIG1vdmV0byBiYWNrIHVwIHJsaW5ldG8geHAgMCBsaW5l
-dG8KY2xvc2VwYXRoIGZpbGwgbSAwIG1vdmV0byBiYWNrIHVwIG5lZyBybGluZXRvIHhwIDAg
-bGluZXRvIGNsb3NlcGF0aApmaWxsIGVuZCByZXN0b3JlIH0gZGVmIC9kcmF3dHJpYW5nbGUg
-eyAtMTQ0IDcyIHJsaW5ldG8gMCAtMTQ0IHJsaW5ldG8KY2xvc2VwYXRoIGZpbGwgfSBkZWYg
-L2Nyb3BtYXJrIHsgMiBjb3B5IG1vdmV0byAwIC0xOCBybW92ZXRvIDAgMzYgcmxpbmV0bwpz
-dHJva2UgbW92ZXRvIC0xOCAwIHJtb3ZldG8gMzYgMCBybGluZXRvIHN0cm9rZSB9IGRlZiAv
-ZmlsbHBhZ2UgeyAuOQpzZXRncmF5IDAgMCBtb3ZldG8gMCA3OTIgcmxpbmV0byA2MTIgMCBy
-bGluZXRvIDAgLTc5MiBybGluZXRvIGZpbGwKMCBzZXRncmF5IC4yNSBzZXRsaW5ld2lkdGgg
-MTggMTggY3JvcG1hcmsgMTggNjg0IGNyb3BtYXJrIDU0OSA2ODQgY3JvcG1hcmsKNTQ5IDE3
-IGNyb3BtYXJrIH0gZGVmIC9zaG93cGFydCB7IDEwIC0yMiB0cmFuc2xhdGUgL1N0b25lU2Fu
-cy1TZW1pYm9sZEl0YWxpYwpmaW5kZm9udCAxNDAgc2NhbGVmb250IHNldGZvbnQgZHVwIHN0
-cmluZ3dpZHRoIHBvcCAvc3cgZXhjaCBkZWYgc3cKbmVnIC00NiBtb3ZldG8gMCBzZXRncmF5
-IGR1cCBzaG93IHN3IDQgYWRkIG5lZyAtNDIgbW92ZXRvIDAuNyBzZXRncmF5CnNob3cgc3cg
-bmVnIDAgdHJhbnNsYXRlIC9TdG9uZVNhbnMtU2VtaWJvbGRJdGFsaWMgZmluZGZvbnQgMzAg
-c2NhbGVmb250CnNldGZvbnQgZHVwIHN0cmluZ3dpZHRoIHBvcCAvc3cgZXhjaCBkZWYgc3cg
-bmVnIDAgbW92ZXRvIDAgc2V0Z3JheQpzaG93IHN3IDEwIGFkZCBuZWcgMCB0cmFuc2xhdGUg
-LTYwMCAxMCBtb3ZldG8gMTIgMCAxMCBhcnJvdyB9IGRlZgogCkBmZWRzcGVjaWFsIGVuZCBU
-ZVhEaWN0IGJlZ2luCjM3Mjk4MjUyIDQ2MTc4Nzg5IDEwMDAgNjAwIDYwMCAoYm9vay5kdmkp
-IEBzdGFydCAvRmEKMTMzWzMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMz
-IDMzIDMzIDMzIDMzCjMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDMzIDFbMzMgMzMgMlszMyAz
-MyAzMyAzMyAzMyAzMwozMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAzMyAz
-MyAzMyAzMyAzMyAzMwozMyAzMyAzMyAzMyAxWzMzIDFbMzMgM1szMyAzMyAzMyAzMyAzMyAz
-MyAzMyAzMyAzMyAzMwozMyAzMyAzWzMzIDMzIDNbMzMgMzZbey44MiBFeHRlbmRGb250IFRl
-WEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH03Mwo2Ni42NjY2NjcgL1BQQ29kZSByZiAv
-RmIgMSAxNCBkZjwwMDAwMDFGRkMwMDAwMDAwMDAwMDFGRkZGQzAwMDAwMDAwMDBGRgpGRkZG
-ODAwMDAwMDAwMUZGMDA3RkMwMDAwMDAwMDdGMDAwMDdGMDAwMDAwMDFGODAwMDAwRkMwMDAw
-MDAzRjAwMDAwMDdFMDAKMDAwMDdDMDAwMDAwMUYwMDAwMDBGMDAwMDAwMDA3ODAwMDAxRTAw
-MDAwMDAwM0MwMDAwM0MwMDAwMDAwMDFFMDAwMDc4MDAwCjAwMDAwMEYwMDAwNzAwMDAwMDAw
-MDA3MDAwMEYwMDAwMDAwMDAwNzgwMDFFMDAwMDAwMDAwMDNDMDAxQzAwMDAwMDAwMDAxQwow
-MDNDMDAwMDAwMDAwMDFFMDAzODAwMDAwMDAwMDAwRTAwNzgwMDAwMDAwMDAwMEYwMDcwMDAw
-MDAwMDAwMDA3MDA3MDAwMDAKMDAwMDAwMDcwMEYwMDAwMDAwMDAwMDA3ODBFMDAwMDAwMDAw
-MDAwMzgwRTAwMDAwMDAwMDAwMDM4MEUwMDAwMDAwMDAwMDAzCjgwRTAwMDAwMDAwMDAwMDM4
-MEUwMDAwMDAwMDAwMDAzODBFMDAwMDAwMDAwMDAwMzgwRTAwMDAwMDAwMDAwMDM4MEUwMDAw
-MAowMDAwMDAwMzgwRTAwMDAwMDAwMDAwMDM4MEYwMDAwMDAwMDAwMDA3ODA3MDAwMDAwMDAw
-MDAwNzAwNzAwMDAwMDAwMDAwMDcKMDA3ODAwMDAwMDAwMDAwRjAwMzgwMDAwMDAwMDAwMEUw
-MDNDMDAwMDAwMDAwMDFFMDAxQzAwMDAwMDAwMDAxQzAwMUUwMDAwCjAwMDAwMDNDMDAwRjAw
-MDAwMDAwMDA3ODAwMDcwMDAwMDAwMDAwNzAwMDA3ODAwMDAwMDAwMEYwMDAwM0MwMDAwMDAw
-MDFFMAowMDAxRTAwMDAwMDAwM0MwMDAwMEYwMDAwMDAwMDc4MDAwMDA3QzAwMDAwMDFGMDAw
-MDAwM0YwMDAwMDA3RTAwMDAwMDFGODAKMDAwMEZDMDAwMDAwMDdGMDAwMDdGMDAwMDAwMDAx
-RkYwMDdGQzAwMDAwMDAwMEZGRkZGRjgwMDAwMDAwMDAxRkZGRkMwMDAwCjAwMDAwMDAxRkZD
-MDAwMDAwMDM5MzU3Q0E4NDI+MTMgRCBFIC9GYyAxNDBbMTM1IDZbMTM1CjNbMTM1IDNbMTM1
-IDJbMTM1IDk3W3suODIgRXh0ZW5kRm9udCBUZVhCYXNlMUVuY29kaW5nIFJlRW5jb2RlRm9u
-dCB9NQoyNzQuOTk5OTg4IC9QUENvZGUgcmYgL0ZkIDE0NFszNyAyWzM3IDdbMzcgMVszNyA5
-OFt7Ci44MiBFeHRlbmRGb250IFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH00IDc1
-LjAwMDAwMAovUFBDb2RlQm9sZCByZiAvRmUgMSAxMiBkZjwwMDAwM0ZDMDAwMDAwMDAwRkZG
-ODAwMDAwMDA3RTA3QzAwMDAwMDBGODAxRgowMDAwMDAzRjAwMUY4MDBDMDA3RTAwMEY4MDBD
-MDBGQzAwMDdDMDFDMDFGODAwMDdFMDE4MDNGMDAwMDdFMDE4MDdFMDAwMDMKRTAzODBGRTAw
-MDAzRjAzMDBGQzAwMDAzRjAzMDFGQzAwMDAzRjA3MDNGODAwMDAzRjA2MDNGODAwMDAzRjBF
-MDdGODAwMDAzCkYwQzA3RjAwMDAwM0YxQzA3RjAwMDAwM0YxODA3RjAwMDAwM0YzODBGRjAw
-MDAwM0YzMDBGRTAwMDAwM0Y3MDBGRTAwMDAwMwpGRTAwRkUwMDAwMDNGQzAwRkUwMDAwMDNG
-QzAwRkMwMDAwMDNGODAwRkMwMDAwMDNGMDAwRkMwMDAwMDNGMDAwRkMwMDAwMDMKRjAwMEZD
-MDAwMDAzRjAwMDdFMDAwMDA3RjAwMDdFMDAwMDBGRjAwMDNFMDAwMDFERjgxODNGMDAwMDc5
-RjgxODFGMDAwMEUxCkY4MzgwRjgwMDdDMEY4MzAwN0UwM0YwMDdDRjAwMUZGRjgwMDNGQzAw
-MDNGQzAwMDBGODAyRTI2N0RBNDM1PjExCkQgRSAvRmYgODJbMjggNTFbNDIgNDIgNjAgMVs0
-NiAyOCAzMiAzMiAxWzQyIDM3IDQ2IDFbMjMKMzcgMjMgMjMgMVs0MiAxWzMyIDQyIDM0IDM4
-IDM3IDExWzY1IDUxIDRbNjUgMls0NiA1WzQ2CjUxIDY1IDE3WzQyIDQyIDQ5W3sgVGVYQmFz
-ZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTMwCjgzLjMzMzMzNyAvUGFsYXRpbm8tSXRhbGlj
-IHJmIC9GZyAxNDBbNjEgMls2MSA2MSA2MSA2MQo2MSA2MSAyWzYxIDJbNjEgNjEgNjEgMVs2
-MSA1NVs2MSA2MSA0MFt7Ci44MiBFeHRlbmRGb250IFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNv
-ZGVGb250IH0xNCAxMjQuOTk5OTk3Ci9QUENvZGUgcmYgL0ZoIDEzNFs1MyAxWzUzIDUzIDUz
-IDUzIDUzIDUzIDFbNTMgNTMgNTMKNTMgNTMgNTMgMVs1MyA1MyA1MyA1MyA1MyA1MyA1MyAx
-WzUzIDFbNTMgMTFbNTMgNls1MwoyOVs1MyA0WzUzIDUzIDQwW3suODIgRXh0ZW5kRm9udCBU
-ZVhCYXNlMUVuY29kaW5nIFJlRW5jb2RlRm9udCB9MjcKMTA4LjMzMzMzMSAvUFBDb2RlIHJm
-IC9GaSAxMzRbMzcgMzcgM1szNyAzNyAzNyAxWzM3IDM3CjM3IDM3IDM3IDJbMzcgMzcgMzcg
-MzcgMzcgMzcgMzcgMzcgMzcgMVszNyAxNVszNyA4WzM3CjcwW3sgVGVYQmFzZTFFbmNvZGlu
-ZyBSZUVuY29kZUZvbnQgLjE2NyBTbGFudEZvbnQgLjgyIEV4dGVuZEZvbnQgfTIyCjc1LjAw
-MDAwMCAvUFBDb2RlIHJmIC9GaiAxMzRbNDMgNDMgNDMgNDMgNDMgNDMgNDMgNDMKMVs0MyA0
-MyA0MyA0MyA0MyAyWzQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDFbNDMgOFs0Mwo0MyAy
-WzQzIDJbNDMgNDMgNDMgNDMgMls0MyAyWzQzIDQzIDFbNDMgNDMgNDMgNDMgMTdbNDMKNls0
-MyAzOVt7IFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IC4xNjcgU2xhbnRGb250IC44
-MiBFeHRlbmRGb250IH0KMzkgODcuNDk5OTk3IC9QUENvZGUgcmYgL0ZrIDEzNFs3NCA4MCAx
-MTggNzQgODYgNjIgNjIKNjIgODggODggODQgODggMTMyIDQzIDg0IDFbNDMgODggODggNTcg
-NzYgODggNjkgODkgNzkKN1s5MSA5OCAxNDUgOTYgOTYgODQgNzQgODkgMTAzIDg2IDEwMyA5
-OSAxMjkgNzQgMVs0NAo0NCAxMDEgOTkgNjkgNzQgMTAxIDg5IDg5IDk5IDZbNDIgODQgODQg
-ODQgODQgODQgODQgODQKODQgODQgODQgNzYgNDIgNDYgNDIgMls1OSA1OSAzMiAzOVt7IFRl
-WEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH02NgoxMzMuMzMzMzM0IC9TdG9uZVNhbnMt
-Qm9sZCByZiAvRmwgODJbMzAgMjRbNDYgNDYgMjVbNTEKNDcgNzYgNTIgNTUgMzAgMzkgMzYg
-MVs1NSA1MCA1MyA4MSAyNyA1MSAxWzI3IDUzIDUxIDMwCjQ0IDU2IDQxIDUxIDQ2IDExWzcx
-IDRbNTUgM1s1NiAyWzMxIDI2WzIzIDFbMjMgMlszMCAzMAozN1s1NSAyW3sgVGVYQmFzZTFF
-bmNvZGluZyBSZUVuY29kZUZvbnQgfTM1IDkxLjY2NjY2NgovUGFsYXRpbm8tUm9tYW4gcmYg
-L0ZtIDgyWzMyIDNbNzEgNDZbNDggNTMgNDggODAgNTMgNTgKMzIgNDIgMzcgNTggNTggNTMg
-NTggODUgMzIgNTggMzIgMzIgNTggNTMgMzcgNDggNTggNDIKNTggNDggOFs2NCA5NSA3NCA3
-NCA2NCA1OCA2OSA4MCA1OCA4MCA4MCA5NSA1OCA3NCAzNwozNyA4MCA4MCA1MyA1OCA4MCA2
-OSA2NCA3NCA2WzI0IDQ4IDQ4IDNbNDggMls0OCAxWzI4CjI0IDFbMjQgNFsyNyAzNls1OCAy
-W3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTYyCjk1LjgzMzMzNCAvUGFsYXRp
-bm8tQm9sZCByZiAvRm4gMTM0WzEzOCAxNDkgMjIyIDEzOSAxNjAKMTE1IDExNSAxMTUgMVsx
-NjYgMTU4IDE2NSAyNDcgODAgMTU3IDFbODAgMTY1IDE2NiAxMDYKMTQyIDE2NiAxMjkgMTY2
-IDE0NyAxMFsxODAgMTgwIDE1NyAxMzkgMTY2IDFbMTYxIDE5NAoxODUgMjQxIDEzOCAxWzgy
-IDgyIDE4OSAxWzEyOSAxMzggMTkwIDE2NiAxWzE4NSAxOVs4Nwo0NVt7IFRlWEJhc2UxRW5j
-b2RpbmcgUmVFbmNvZGVGb250IH00MiAyNDkuOTk5OTk0IC9TdG9uZVNhbnMtQm9sZApyZiAv
-Rm8gMTM0WzE4MSAyWzE4MSAxWzEzNiAxNDkgMTQwIDFbMjE4IDIxMSAyMTUgMzE5Cjk0IDJb
-OTQgMVsyMTggMVsxOTEgMjE4IDE2NyAyMTcgMTg4IDEyWzIwNyAxOTQgMlsyMDcKM1sxODEg
-NFsyNjYgMVsxODkgMjYzIDJbMjMzIDY1W3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZv
-bnQgfTI1CjM0OS45OTk5ODggL1N0b25lU2Fucy1TZW1pYm9sZCByZiAvRnAgMTQxWzI1IDJb
-MzcgMzgKNTUgM1sxNyAxWzM4IDFbMzEgMTAxW3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29k
-ZUZvbnQgfTcKNjYuNjY2NjY3IC9TdG9uZVNhbnMtU2VtaWJvbGRJdGFsaWMgcmYgL0ZxIDEy
-OVszNyAzNwozNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAz
-NyAzNyAzNwozNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAz
-NyAzNyAzNwozNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAz
-NyAzNyAzNwozNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAz
-NyAzNyAzNwozNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAzNyAz
-NyAzNyAzNwozNyAzNyAzM1t7LjgyIEV4dGVuZEZvbnQgVGVYQmFzZTFFbmNvZGluZyBSZUVu
-Y29kZUZvbnQgfTk0Cjc1LjAwMDAwMCAvUFBDb2RlIHJmIC9GciAxMjlbNDMgMVs0MyAxWzQz
-IDQzIDQzIDQzIDQzCjQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQz
-IDQzIDQzIDQzIDQzCjQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQz
-IDQzIDQzIDQzIDQzCjQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQz
-IDQzIDQzIDQzIDQzCjQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQz
-IDQzIDQzIDQzIDQzCjQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDQzIDMz
-W3sKLjgyIEV4dGVuZEZvbnQgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTkyIDg3
-LjQ5OTk5NwovUFBDb2RlIHJmIC9GcyA4MlsyOCA1MFs0MiA0NiA0MiA2OSA0NiA1MSAyOCAz
-NyAzMiA1MQo1MSA0NiA1MSA3NCAyOCA1MSAyOCAyOCA1MSA0NiAzMiA0MiA1MSAzNyA1MSA0
-MiA3WzU1CjU1IDgzIDY1IDY1IDU1IDUxIDYwIDY5IDUxIDY5IDY5IDgzIDUxIDY1IDMyIDMy
-IDY5IDY5CjQ2IDUxIDY5IDYwIDU1IDY1IDFbMzcgNFsyMSA0MiA0MiA0MiA0MiA0MiA0MiA0
-MiA0MiA0Mgo0MiAyNSAyMSAxWzIxIDJbMjggMjggMjMgMzZbNTEgMlt7IFRlWEJhc2UxRW5j
-b2RpbmcgUmVFbmNvZGVGb250IH03MQo4My4zMzMzMzcgL1BhbGF0aW5vLUJvbGQgcmYgL0Z0
-IDEzNFs1MyA1NyA4NSA1MyA2MSA0NAo0NCA0NCAxWzY0IDYxIDYzIDk1IDMxIDYwIDFbMzEg
-NjMgNjQgNDEgNTUgNjQgNDkgNjQgNTcKMTBbNjkgNjkgNjAgNTMgNjQgMVs2MiA3NCA3MSA5
-MyA1MyAxWzMyIDMyIDcyIDcxIDUwIDUzCjczIDY0IDY0IDcxIDdbNjAgNjAgNjAgNjAgNjAg
-NjAgNjAgNjAgNjAgNjAgNTUgMVszMyA0NVt7CiBUZVhCYXNlMUVuY29kaW5nIFJlRW5jb2Rl
-Rm9udCB9NTUgOTUuODMzMzM0IC9TdG9uZVNhbnMtQm9sZApyZiAvRnUgMTMzWzYyIDY1IDcw
-IDEwNCA2NSA3NSA1NCA1NCA1NCA3NyA3NyA3NCA3NyAxMTUKMzcgNzMgMVszNyA3NyA3NyA1
-MCA2NiA3NyA2MCA3OCA2OSA3WzgwIDg2IDEyNyA4NCA4NAo3MyA2NSA3OCAxWzc1IDkwIDg2
-IDExMyA2NSA4MiAzOCAzOCA4OCA4NyA2MCA2NSA4OCA3OAo3OCA4NiA2WzM3IDczIDczIDcz
-IDczIDczIDczIDczIDczIDczIDczIDY3IDM3IDQxIDM3CjRbMjggMzlbeyBUZVhCYXNlMUVu
-Y29kaW5nIFJlRW5jb2RlRm9udCB9NjUgMTE2LjY2NjY2OQovU3RvbmVTYW5zLUJvbGQgcmYg
-L0Z2IDEzNFs0MSA0MyA2NSA0MSA0NyAyOSAzMiAyOSA1MAo1MCA0OCA0OSA3NCAyMCA0MCAx
-WzIwIDQ5IDQ5IDI1IDQyIDQ5IDQwIDQ5IDQyIDhbNTQgNzcKNDkgNTcgNDYgNDMgNDYgNjYg
-NDUgNjYgNjUgNzcgNDAgNDkgMjMgMjIgNTggNjEgNDAgNDEKNjEgNTcgNDggNTEgNlsyNCA0
-OCA0OCA0OCA0OCA0OCA0OCA0OCA0OCA0OCA0OCAzMiAyNAoyOCAyNCAyWzI5IDI5IDE3IDM5
-W3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTY2CjgzLjMzMzMzNyAvU3RvbmVT
-YW5zIHJmIC9GdyA4MlsyOCAyMFsyOCA4MyA0MiAxWzQyIDQyCjIyWzUwIDFbNDIgNDYgNDMg
-NjkgNDcgNTAgMjcgMzUgMzMgNDYgNTAgNDUgNDggNzMgMjQKNDYgMTkgMjQgNDggNDYgMjgg
-NDAgNTEgMzcgNDYgNDIgMjMgNDIgMVsyOCAxWzI4IDU1IDU1CjU1IDgzIDYwIDY1IDUxIDQ0
-IDU1IDY1IDUwIDY1IDY5IDc5IDUxIDYwIDI4IDI4IDY5IDYzCjQ2IDUxIDY0IDU5IDUxIDY1
-IDVbMjEgMjEgNDIgNDIgNDIgNDIgNDIgNDIgNDIgNDIgNDIKNDIgNTAgMjEgMVsyMSA1MCAz
-MiAyOCAyOCAyMyA1WzIzIDI5WzUwIDUwIDJbewogVGVYQmFzZTFFbmNvZGluZyBSZUVuY29k
-ZUZvbnQgfTg2IDgzLjMzMzMzNyAvUGFsYXRpbm8tUm9tYW4KcmYgL0Z4IDE3M1szMyAyNFsy
-NSAyNSAyNSAyNSAyNSAyNSAyNSAyNSAyNSAyNSA0OFt7CiBUZVhCYXNlMUVuY29kaW5nIFJl
-RW5jb2RlRm9udCB9MTEgNTAuMDAwMDAxIC9QYWxhdGluby1Sb21hbgpyZiAvRnkgODJbMzIg
-NTBbNDIgNDggNDggNjkgNDggNTMgMzIgMzcgMzcgNDQgNDggNDIgNTMKNzQgMjcgNDIgMjcg
-MjcgNDggNDggMjcgMzcgNDggMzkgNDQgNDIgOFs2OSA5MCA2OSA3NAo1OCA1MyA2NCA3NCA1
-OCA3NCA3NCA5MCA1MyA2NCAxWzMyIDc0IDY5IDUzIDU4IDc0IDY0CjU4IDY5IDZbMjQgM1s0
-OCAxWzQ4IDFbNDggNDggMVsyOCAyNCAxWzI0IDU4IDFbMzIgMzIKMjcgNzQgMzVbNTAgMlt7
-IFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH02NCA5NS44MzMzMzQKL1BhbGF0aW5v
-LUl0YWxpYyByZiAvRnogMTM1WzUwIDFbNDcgMTJbMjMgMTA1W3sKIFRlWEJhc2UxRW5jb2Rp
-bmcgUmVFbmNvZGVGb250IH0zIDk1LjgzMzMzNCAvU3RvbmVTYW5zCnJmIC9GQSA4MlszMiAy
-MFszMiA5NSA0OCA1OCA0OCA0OCAyNFs0OCA1MyA0OSA4MCA1NCA1OAozMSA0MCAzOCA1MyA1
-NyA1MiA1NiA4NCAyOCA1MyAyMiAyOCA1NiA1MyAzMiA0NiA1OCA0Mgo1MyA0OCAxWzQ4IDFb
-MzIgNTggMzIgNjQgNjQgNjQgOTUgNjkgNzQgNTkgNTAgNjQgNzUgNTgKNzUgNzkgOTAgNTgg
-NjkgMzIgMzIgNzkgNzMgNTMgNTggNzQgNjggNTggNzQgNzEgNDIgM1syNAoyNCA0OCA0OCA0
-OCA0OCA0OCA0OCA0OCA0OCA0OCA0OCA1OCAyNCAxWzI0IDFbMzcgMzIgMzIKMjcgNzQgNFsy
-NyAyOVs1OCA1OCAyW3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTg4Cjk1Ljgz
-MzMzNCAvUGFsYXRpbm8tUm9tYW4gcmYgL0ZCIDEzNFsxNDkgMTQ5IDJbMTY2IDEwMAoxMTYg
-MTE2IDFbMTQ5IDEzMyAxNjYgMVs4MyAyWzgzIDE0OSAxNDkgODMgMTE2IDE0OSAxMjIKMTM4
-IDEzMyAxMVsyMzMgMTgzIDE2NiAyWzE4MyAyMzMgMjMzIDFbMTY2IDJbMTAwIDFbMjE2CjJb
-MjMzIDE5OSAxODMgMjE2IDE3Wzg4IDQ3W3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZv
-bnQgfTMzCjMwMC4wMDAwMDAgL1BhbGF0aW5vLUl0YWxpYyByZiAvRkMgMTQxWzQyIDJbNDgg
-MlszMCAyWzMwCjNbNDIgM1s0OCAxM1s2MCAxMVs3OCAyWzg0IDIxWzI3IDQ2W3sgVGVYQmFz
-ZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTEwCjEwOC4zMzMzMzEgL1BhbGF0aW5vLUl0YWxp
-YyByZiAvRkQgODJbMzYgMjFbMTA4IDI5WzYwCjU2IDkwIDYxIDY1IDM1IDQ2IDQzIDFbNjUg
-NTkgNjMgOTUgMzEgNjAgMVszMSA2MyA2MCAzNgo1MiA2NiA0OCA2MCA1NCAxOVsxMDIgMlsz
-NiAzNiAxWzgyIDFbNjYgMjJbMjcgMVsyNyA0NFt7CiAuMTY3IFNsYW50Rm9udCBUZVhCYXNl
-MUVuY29kaW5nIFJlRW5jb2RlRm9udCB9MzIgMTA4LjMzMzMzMQovUGFsYXRpbm8tUm9tYW4g
-cmYgL0ZFIDE3MVsxMTIgODRbeyBUZVhCYXNlMUVuY29kaW5nIFJlRW5jb2RlRm9udCB9MQox
-ODMuMzMzMzMxIC9QYWxhdGluby1JdGFsaWMgcmYgL0ZGIDEzOVsyNCAzMiAzMCAxWzQ1CjFb
-NDMgMVsyMiAyWzIyIDFbNDIgMzJbNDIgNFs1OCA3WzM3IDM3IDZbMzcgNFsxOSA0NFt7CiAu
-MTY3IFNsYW50Rm9udCBUZVhCYXNlMUVuY29kaW5nIFJlRW5jb2RlRm9udCB9MTQgNzUuMDAw
-MDAwCi9QYWxhdGluby1Sb21hbiByZiAvRkcgMSAxNCBkZjwwMDAwMDAwM0ZGQzAwMDAwMDAw
-MDAwMDAzRkZGRkMwMDAwMDAwMDAwCjAxRkZGRkZGODAwMDAwMDAwMDA3RkZGRkZGRTAwMDAw
-MDAwMDFGRkUwMDdGRjgwMDAwMDAwMDdGRTAwMDA3RkUwMDAwMDAwMApGRjAwMDAwMEZGMDAw
-MDAwMDNGQzAwMDAwMDNGQzAwMDAwMDdGMDAwMDAwMDBGRTAwMDAwMEZDMDAwMDAwMDAzRjAw
-MDAwMUYKODAwMDAwMDAwMUY4MDAwMDNGMDAwMDAwMDAwMEZDMDAwMDdFMDAwMDAwMDAwMDdF
-MDAwMEZDMDAwMDAwMDAwMDNGMDAwMEY4CjAwMDAwMDAwMDAxRjAwMDFGMDAwMDAwMDAwMDAw
-RjgwMDNGMDAwMDAwMDAwMDAwRkMwMDNFMDAwMDAwMDAwMDAwN0MwMDdDMAowMDAwMDAwMDAw
-MDNFMDBGQzAwMDAwMDAwMDAwMDNGMDBGODAwMDAwMDAwMDAwMDFGMDFGMDAwMDAwMDAwMDAw
-MDBGODFGMDAKMDAwMDAwMDAwMDAwRjgxRTAwMDAwMDAwMDAwMDAwNzgzRTAwMDAwMDAwMDAw
-MDAwN0MzRTAwMDAwMDAwMDAwMDAwN0MzQzAwCjAwMDAwMDAwMDAwMDNDN0MwMDAwMDAwMDAw
-MDAwMDNFN0MwMDAwMDAwMDAwMDAwMDNFNzgwMDAwMDAwMDAwMDAwMDFFNzgwMAowMDAwMDAw
-MDAwMDAxRTc4MDAwMDAwMDAwMDAwMDAxRUY4MDAwMDAwMDAwMDAwMDAxRkY4MDAwMDAwMDAw
-MDAwMDAxRkYwMDAKMDAwMDAwMDAwMDAwMEZGMDAwMDAwMDAwMDAwMDAwMEZGMDAwMDAwMDAw
-MDAwMDAwMEZGMDAwMDAwMDAwMDAwMDAwMEZGMDAwCjAwMDAwMDAwMDAwMDBGRjAwMDAwMDAw
-MDAwMDAwMDBGRjAwMDAwMDAwMDAwMDAwMDBGRjAwMDAwMDAwMDAwMDAwMDBGRjAwMAowMDAw
-MDAwMDAwMDAwRkYwMDAwMDAwMDAwMDAwMDAwRkY4MDAwMDAwMDAwMDAwMDAxRkY4MDAwMDAw
-MDAwMDAwMDAxRjc4MDAKMDAwMDAwMDAwMDAwMUU3ODAwMDAwMDAwMDAwMDAwMUU3ODAwMDAw
-MDAwMDAwMDAwMUU3QzAwMDAwMDAwMDAwMDAwM0U3QzAwCjAwMDAwMDAwMDAwMDNFM0MwMDAw
-MDAwMDAwMDAwMDNDM0UwMDAwMDAwMDAwMDAwMDdDM0UwMDAwMDAwMDAwMDAwMDdDMUUwMAow
-MDAwMDAwMDAwMDA3ODFGMDAwMDAwMDAwMDAwMDBGODFGMDAwMDAwMDAwMDAwMDBGODBGODAw
-MDAwMDAwMDAwMDFGMDBGQzAKMDAwMDAwMDAwMDAzRjAwN0MwMDAwMDAwMDAwMDAzRTAwM0Uw
-MDAwMDAwMDAwMDA3QzAwM0YwMDAwMDAwMDAwMDBGQzAwMUYwCjAwMDAwMDAwMDAwRjgwMDBG
-ODAwMDAwMDAwMDAxRjAwMDBGQzAwMDAwMDAwMDAzRjAwMDA3RTAwMDAwMDAwMDA3RTAwMDAz
-RgowMDAwMDAwMDAwRkMwMDAwMUY4MDAwMDAwMDAxRjgwMDAwMEZDMDAwMDAwMDAzRjAwMDAw
-MDdGMDAwMDAwMDBGRTAwMDAwMDMKRkMwMDAwMDAzRkMwMDAwMDAwRkYwMDAwMDBGRjAwMDAw
-MDAwN0ZFMDAwMDdGRTAwMDAwMDAwMUZGRTAwN0ZGODAwMDAwMDAwCjA3RkZGRkZGRTAwMDAw
-MDAwMDAxRkZGRkZGODAwMDAwMDAwMDAwM0ZGRkZDMDAwMDAwMDAwMDAwMDNGRkMwMDAwMDAw
-NDg0RQo3QkJCNTM+MTMgRCBFIC9GSCA4MlsyNSA1MVszNyAzWzQyIDI1IDI5IDI5IDJbMzMg
-NDIgMVsyMQoyWzIxIDFbMzcgMjEgMjkgMVszMCAzNSAzMyAxNls0NiAzWzQyIDdbNTggNTAg
-NjdbewogVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTIwIDc1LjAwMDAwMCAvUGFs
-YXRpbm8tSXRhbGljCnJmIC9GSSA4MlsyNSAyMVs3NSAzNyAyN1szNyA0MiAzOSA2MiA0MiA0
-NSAyNCAzMiAzMCA0Mgo0NSA0MSA0MyA2NiAyMiA0MiAxNyAyMiA0MyA0MiAyNSAzNiA0NiAz
-MyA0MSAzNyA2WzUwCjUwIDUwIDc1IDU0IDU4IDQ2IDM5IDUwIDU5IDQ1IDU5IDYyIDcxIDQ2
-IDU0IDI1IDI1IDYyCjU3IDQyIDQ2IDU4IDUzIDQ2IDU4IDZbMTkgMzcgMzcgMzcgMzcgMzcg
-MzcgMzcgMzcgMzcKMzcgNDUgMTkgMVsxOSA0WzIxIDU4IDJbMzcgMVsyMSAyOVs0NSA0NSAy
-W3sKIFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH03NSA3NS4wMDAwMDAgL1BhbGF0
-aW5vLVJvbWFuCnJmIC9GSiAxNDdbMjYgMTA4W3t9MSAzMy4zMzMzMzQgL1phcGZEaW5nYmF0
-cyByZiAvRksKMTM0WzM3IDM5IDU4IDFbNDMgMjYgMjkgMjYgMls0MyA0NCA2NyAxOCAzNiAx
-WzE4IDQ0IDQ0CjIyIDM4IDQ0IDM2IDFbMzcgMTJbNDIgMzkgNDIgMVs0MCA1OSAxWzY5IDRb
-NTMgMlszNyA1NQo1MSA0MyA0NiAyMFsyMSA0NFt7IFRlWEJhc2UxRW5jb2RpbmcgUmVFbmNv
-ZGVGb250IH0zMwo3NS4wMDAwMDAgL1N0b25lU2FucyByZiAvRkwgMTM0WzQ2IDUwIDJbNTMg
-MzggMzggMzggMVs1NQo1MyA1NSA4MiAyNyAyWzI3IDU1IDU1IDM1IDQ3IDU1IDQzIDU1IDQ5
-IDdbNTcgMVs5MSAyWzUyCjQ2IDJbNTQgNjUgNjIgMVs0NiAyWzI3IDFbNjIgNDMgNDYgNjMg
-NTUgNTUgNjIgN1s1MiA1Mgo1MiA1MiA1MiA1MiA1MiA1MiA1MiA1MiAxWzI2IDI5IDI2IDQ0
-W3sgVGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfQo0OSA4My4zMzMzMzcgL1N0b25l
-U2Fucy1Cb2xkIHJmIC9GTSAxNDBbNjMgNTkgMls4MiA4NwoxWzQzIDgzIDFbNDMgODcgMls3
-MiAxWzY2IDFbNzUgOVsxNDkgMls5MiA2WzE0MSAxWzEwOAo1MCA0WzkxIDIyWzM3IDQ2W3sg
-VGVYQmFzZTFFbmNvZGluZyBSZUVuY29kZUZvbnQgfTE4CjE1MC4wMDAwMDAgL1BhbGF0aW5v
-LVJvbWFuIHJmIC9GTiAxMzVbMTc0IDFbMTk0IDIxMyAxMTYKM1syMTMgMTk0IDIxMyAzMTAg
-MTE2IDJbMTE2IDNbMTc0IDFbMTU1IDFbMTc0IDIwWzIxMwo3WzI5MCAyWzI3MSA2NVt7IFRl
-WEJhc2UxRW5jb2RpbmcgUmVFbmNvZGVGb250IH0xNiAzNDkuOTk5OTg4Ci9QYWxhdGluby1C
-b2xkIHJmIC9GTyAxMzlbODkgODkgMTE1W3t9MiAxMDAuMDAwMDAzIC9aYXBmRGluZ2JhdHMK
-cmYgL0ZQIDEzNVsxMzMgMVsxNDggMTYyIDg4IDNbMTYyIDE0OCAxNjIgMjM2IDg4IDJbODgK
-M1sxMzMgMVsxMTggMVsxMzMgMjBbMTYyIDdbMjIxIDJbMjA3IDY1W3sKIFRlWEJhc2UxRW5j
-b2RpbmcgUmVFbmNvZGVGb250IH0xNiAyNjYuNjY2NjY5IC9QYWxhdGluby1Cb2xkCnJmIC9G
-USAxMzlbNjcgNjcgMTE1W3t9MiA3NS4wMDAwMDAgL1phcGZEaW5nYmF0cyByZiBlbmQKJSVF
-bmRQcm9sb2cKJSVCZWdpblNldHVwCiUlRmVhdHVyZTogKlJlc29sdXRpb24gNjAwZHBpClRl
-WERpY3QgYmVnaW4KJSVQYXBlclNpemU6IExldHRlcgoKJSVFbmRTZXR1cAolJVBhZ2U6IDQ0
-NSAxCjQ0NSA0NjggYm9wIDAgMCBhIEBiZWdpbnNwZWNpYWwgQHNldHNwZWNpYWwKIGdzYXZl
-IC41MCBzZXRncmF5IG5ld3BhdGggMjc4IDEwIG1vdmV0byAwIDEwMCBybGluZXRvIDEzMiAw
-IHJsaW5ldG8KMCAtMTAwIHJsaW5ldG8gLTEzMiAwIHJsaW5ldG8gY2xvc2VwYXRoIGZpbGwg
-MSBzZXRncmF5IC9TdG9uZVNhbnMtQm9sZApmaW5kZm9udCAxMiBzY2FsZWZvbnQgc2V0Zm9u
-dCAyOTYgMTkgbW92ZXRvIDMgMCAoQ0hBUFRFUiAyNCkgYXNob3cKZ3Jlc3RvcmUKIApAZW5k
-c3BlY2lhbAoyOTkgMzU1IGEgRm4oUGFyc2luZyk4NCBiKENvbW1hbmQtKTI5OSA2NTQgeShM
-aW5lKWcoT3B0aW9ucykyOTkKMTU1NyB5IEZtKEZyb20pMjEgYih0aGUpZihmb3J0aGNvbWlu
-ZylpKGJvb2spZihlbnRpdGxlZClmKExpbnV4KWgKKEFwcGxpY2F0aW9uKWcoRGV2ZWxvcG1l
-bnQpZihieSkyOTkgMTY2OSB5KE1pY2hhZWwpMzUKYihLLiloKEpvaG5zb24paChhbmQpZShF
-cmlrKWgoVylsKC4pZyhUKS0xMSBiKHJvYW4sKTM5CmIoY29weXJpZ2h0KWQoXDI1MSlnKDE5
-OTgpZShieSlpKEFkZGlzb24pMjk5IDE3ODEgeShXKS03CmIoZXNsZXkpMzggYihMb25nbWFu
-LCk0MyBiKEluYy4sKWYodG8pZChiZSlmKHB1Ymxpc2hlZClpKGluKWUoQXByaWwsKWsKKDE5
-OTguKTc3IGIoQWxsKTM4IGIocmlnaHRzKWgocmVcMjU1KTI5OSAxODkzIHkoc2VydmVkLilj
-KFRoaXMpMjQKYihtYXRlcmlhbCllKGlzKWkobWFkZSlnKGF2YWlsYWJsZSlmKHdpdGgpZyh0
-aGUpaChwZXJtaXNzaW9uKWgob2YpZgoodGhlKWYocHViXDI1NSkyOTkgMjAwNSB5KGxpc2hl
-ciktNSBiKC4pMzQgYihUaGUpMjEgYihwdWJsaXNoZXIpNQpiKCcpLTUgYihzKTIzIGIocGVy
-bWlzc2lvbilnKGlzKWcocmVxdWlyZWQpZihmb3IpaChyZXByb2R1Y3Rpb24sKWcKKHN0b3Jh
-Z2UsKTI5OSAyMTE3IHkob3IpaCh0cmFuc21pdHRhbClmKG9mKWgodGhpcylnKG1hdGVyaWFs
-LikyOTkKMjMyOSB5KEZvcilnKG1vcmUpZyhpbmZvcm1hdGlvbiwpZyhzZWUpZihodHRwOi8p
-LTE0IGIoL3d3dyktOQpiKC5hd2wuY29tL2NzZW5nL2Jvb2tzL2xhZC8uKTI5OSAyNTQxIHkg
-RkEoTW9zdCk0MSBiKExpbnV4KWUocHIpbgoob2dyYW1zKWgoYWxsb3cpZih0aGUpZyh1c2Vy
-KWcodG8paChzcGVjaWZ5KWgoY29tbWFuZFwyNTVsaW5lKWUKKG9wdGlvbnMuKTI5OSAyNjUz
-IHkoU3VjaCkyMyBiKG9wdGlvbnMpaChwZXJmb3JtKWcoYSlmKHdpZGUpZyh2YXJpZXR5KWcK
-KG9mKWcoZnVuY3Rpb25zKWcoYnV0KWcoYXIpbihlKWcoZmFpcmx5KWYodW5pZm9ybSloKGlu
-KTI5OQoyNzY1IHkodGhlaXIpMzEgYihzeW50YXguKTYwIGIgRm0oU2hvcnQpMzMgYihvcHRp
-b25zKWcKRkEoY29uc2lzdClnKG9mKWYoYSlnIEZyKC0paCBGQShjaGFyYWN0ZXIpZShmb2xs
-b3dlZCloKGJ5KWcoYSlnKHNpbmdsZSkKMjk5IDI4NzcgeShhbHBoYW51bWVyaWMpMjUgYihj
-aGFyYWN0ZXIpLTcgYiguKTQzIGIgRm0oTG9uZykyOApiKG9wdGlvbnMpcCBGQSgsKWcoY29t
-bW9uKWcoaW4pZShHTlUpaCh1dGlsaXRpZXMsKWcoY29uc2lzdCkyOTkKMjk4OSB5KG9mKWYo
-dHdvKWcgRnIoLSlnIEZBKGNoYXJhY3RlcnMpZyhmb2xsb3dlZClnKGJ5KWcoYSlnKHN0cmlu
-ZylnCihtYWRlKWcodXApZyhvZilnKGxldHRlcnMsKWgobnVtYmVycywpZihhbmQpMjk5IDMx
-MDEKeShoeXBoZW5zLikzNCBiKEVpdGhlcikyNCBiKHR5cGUpZyhvZilnKG9wdGlvbilnKG1h
-eSloKGJlKWUoZm9sbG93ZWQpaAooYnkpZyhhbilmKGFyKW4oZ3VtZW50LikzNCBiKEEpMjQg
-YihzcGFjZSkyOTkgMzIxMyB5KHNlcGFyYXRlcykxOQpiKGEpZihzaG9ydCloKG9wdGlvbilm
-KGZyKW4ob20paChpdHMpZyhhciluKGd1bWVudHM7KWgoZWl0aGVyKWQoYSlpCihzcGFjZSln
-KG9yKWcoYW4pZiBGcig9KWcgRkEoc2VwYXJhdGVzKTI5OSAzMzI1IHkoYSkyMwpiKGxvbmcp
-aChvcHRpb24pZyhmciluKG9tKWcoYW4pZihhciluKGd1bWVudC4pMjk5IDM1MzcKeShUaGVy
-KW4oZSljKGFyKW4oZSloKG1hbnkpZyh3YXlzKWcob2YpaChwYXJzaW5nKWYoY29tbWFuZFwy
-NTVsaW5lKWcKKG9wdGlvbnMuKTM0IGIoVGhlKTE5IGIobW9zdClqKHBvcHVsYXIpMjk5IDM2
-NDkgeShtZXRob2QpayhpcylnCihwYXJzaW5nKWcodGhlKWcgRnIoYXJndilmIEZBKGFycmF5
-KWcoYnkpaChoYW5kLik0MCBiKFRoZSkyNQpiIEZyKGdldG9wdFwoXCkpZyBGQShhbmQpaCBG
-cihnZXRvcHRfbG9uZ1woXCkpMjk5IDM3NjEKeSBGQShsaWJyYXJ5KTQwIGIoZnVuY3Rpb25z
-KWgocHIpbihvdmlkZSlnKHNvbWUpaChhc3Npc3RhbmNlKWcoZm9yKWYKKG9wdGlvbiloKHBh
-cnNpbmcuKTg2IGIgRnIoZ2V0b3B0XChcKSkyOTkgMzg3MyB5IEZBKGlzKTM4CmIocHIpbihv
-dmlkZWQpaChieSlmKG1hbnkpZihVbml4KWgoaW1wbGVtZW50YXRpb25zLClqKGJ1dClkKGl0
-KWYKKHN1cHBvcnRzKWoob25seSlkKHNob3J0KTI5OSAzOTg1IHkob3B0aW9ucy4pZChUaGUp
-MjIKYiBGcihnZXRvcHRfbG9uZ1woXCkpZyBGQShmdW5jdGlvbilnKGlzKWgoYXZhaWxhYmxl
-KWUob24paChMaW51eCloKGFuZCkKZihhbGxvd3MpaChhdXRvXDI1NSkyOTkgNDA5NyB5KG1h
-dGVkKWgocGFyc2luZylnKG9mKWYoYm90aCloKHNob3J0KWcKKGFuZClmKGxvbmcpaChvcHRp
-b25zLikyOTkgNDMwOSB5KEEpMzMgYihsaWJyYXJ5KWYoY2FsbGVkKWgocG9wdCloCihleGlz
-dHMpZyhzcGVjaVwwMDJjYWxseSlmKGZvcilnKG9wdGlvbilnKHBhcnNpbmcuKTYyCmIoSXQp
-MzQgYihpbmNsdWRlcyllKGEpMjk5IDQ0MjEgeShudW1iZXIpMjIgYihvZilpKGFkdmFudGFn
-ZXMpZyhvdmVyKWYKKHRoZSlnIEZyKGdldG9wdFwoXCkpZyBGQShmdW5jdGlvbnMuKTMyMzIg
-NDY5OSB5IEZ0KDQ0NSlwCmVvcAolJVBhZ2U6IDQ0NiAyCjQ0NiA0NjkgYm9wIC0xODcgLTEx
-NiBhIEZ0KDQ0NikxMTggYiBGTChDaGFwdGVyKTI5IGIoMjQpODMKYiBGdihQYXJzaW5nKTIz
-IGIoQ29tbWFuZC1MaW5lKWYoT3B0aW9ucylwIC0xODcgLTc2IDM0MTMKNCB2IDEyOCA4MyBh
-IEZBKFwyMjUpMTAwIGIoSXQpMzMgYihkb2VzKWgobm90KWYobWFrZSloKHVzZSlmKG9mKWcK
-KGdsb2JhbClnKHZhcmlhYmxlcywpaCh3aGljaCllKGFsbG93cyloKGl0KWcodG8paChiZSlm
-KHVzZWQpMjg2CjE5NSB5KHdoZW4pMjIgYihtdWx0aXBsZSloKHBhc3NlcylqKGFyKW4oZSlk
-KG5lZWRlZClnKHRvKWgocGFyc2UpZwpGcihhcmd2KXAgRkEoLikxMjggNDA3IHkoXDIyNSkx
-MDAgYihJdCkyMiBiKGNhbiloKHBhcnNlKWYoYW4pZwooYXJiaXRyYXJ5KWYoYXJyYXkpZyhv
-ZilpIEZyKGFyZ3YpcCBGQShcMjU1c3R5bGUpZihlbGVtZW50cy4pMzMKYihUaGlzKTIyIGIo
-YWxsb3dzKWcocG9wdCkyODYgNTE5IHkodG8paShiZSlmKHVzZWQpaChmb3IpZyhwYXJzaW5n
-KWYKKGNvbW1hbmRcMjU1bGluZVwyNTVzdHlsZSloKHN0cmluZ3MpZyhmciluKG9tKWcoYW55
-KWYoc291ciluKGNlLikxMjgKNzMxIHkoXDIyNSkxMDAgYihJdCkzMCBiKHByKW4ob3ZpZGVz
-KWgoYSlmKHN0YW5kYXIpbihkKWcobWV0aG9kKWcob2YpZwoob3B0aW9uKWcoYWxpYXNpbmcu
-KTUyIGIoUHIpbihvZ3JhbXMpMzAgYih0aGF0KWcodXNlKTI4Ngo4NDMgeShwb3B0KWMoY2Fu
-KWYoZWFzaWx5KWcoYWxsb3cpZih1c2VycyloKHRvKWcoYWRkKWgobmV3KWUKKGNvbW1hbmRc
-MjU1bGluZSloKG9wdGlvbnMsKWgod2hpY2gpMjg2IDk1NSB5KGFyKW4oZSlrKGRlXDAwMm5l
-ZClnKGFzKWgKKGNvbWJpbmF0aW9ucylmKG9mKWgoYWxyKW4oZWFkeVwyNTVleGlzdGluZyll
-KG9wdGlvbnMuKTU1CmIoVGhpcykzMCBiKGFsbG93cykyODYgMTA2NyB5KHRoZSloKHVzZXIp
-aCh0byloKGRlXDAwMm5lKWUobmV3KS05CmIoLCkzMyBiKGNvbXBsZXgpaChiZWhhdmlvcnMp
-ZChvciloKGNoYW5nZSlmKHRoZSloKGRlZmF1bHQpZihiZVwyNTUpMjg2CjExNzkgeShoYXZp
-b3JzKTIzIGIob2YpaChleGlzdGluZylmKG9wdGlvbnMuKTExMSAxNDUzCnkoTGlrZSloIEZy
-KGdldG9wdF9sb25nXChcKSlwIEZBKCwpZSh0aGUpaShwb3B0KWgobGlicmFyeSlkKHN1cHBv
-cnRzKWoKKHNob3J0KWYoYW5kKWcobG9uZylmKHN0eWxlKWgob3B0aW9ucy4pMTExIDE2NjUg
-eShUaGUpMjkKYihwb3B0KWoobGlicmFyeSlkKGlzKWgoaGlnaGx5KWYocG9ydGFibGUpaChh
-bmQpZyhzaG91bGQpZyh3b3JrKWYob24paAooYW55KWcoUE9TSVgpZyhwbGF0XDI1NSkxMTEg
-MTc3NyB5KGZvcm0uKTY4IGIoVGhlKTM0CmIobGF0ZXN0KWgodmVyc2lvbilnKGlzKWcoYWx3
-YXlzKWcoYXZhaWxhYmxlKWUoZnIpbihvbSlpKGZ0cDovKS0xNApiKC9mdHAuciluKGVkaGF0
-LmNvbS8pMTExIDE4ODkgeShwdWIvciluKGVkaGF0L2NvZGUvcG9wdC8pMTExCjIxMDAgeShJ
-dCkzMyBiKG1heSlmKGJlKWcociluKGVkaXN0cmlidXRlZClmKHVuZGVyKWcoZWl0aGVyKWco
-dGhlKWgKKEdOVSlnKEdlbmVyYWwpZihQdWJsaWMpZyhMaWNlbnNlKWgob3IpMTExIDIyMTMg
-eSh0aGUpMjQKYihHTlUpZyhMaWJyYXJ5KWYoR2VuZXJhbClmKFB1YmxpYyloKExpY2Vuc2Us
-KWgoYXQpZih0aGUpaChkaXN0cmlidXRvcikKNyBiKCdzKTIzIGIoZGlzY3IpbihldGlvbi4p
-LTE4NyAyNTQxIHkgRmsoMjQuMSkxMzEgYihCYXNpYyk0MApiKHBvcHQpaihVc2FnZSlwIC0x
-ODcgMjYyNiAzNDEzIDUgdiAxMTEgMjg4OCBhIEZ1KDI0LjEuMSk1OQpiKFRoZSkzOSBiKE9w
-dGlvbiloKFRhYmxlKTExMSAzMDk5IHkgRkEoQXBwbGljYXRpb25zKWQocHIpbihvdmlkZSlm
-Cihwb3B0KWcod2l0aClmKGluZm9ybWF0aW9uKWYob24paCh0aGVpcilmKGNvbW1hbmRcMjU1
-bGluZSloKG9wXDI1NSkxMTEKMzIxMSB5KHRpb25zKTI0IGIodGhyKW4ob3VnaClmKGFuKWco
-YXJyYXkpZyhvZiloIEZyKHN0cnVjdCk0MgpiKHBvcHRPcHRpb24pMjMgYiBGQShzdHIpbyh1
-Y3R1ciluKGVzLikxMTEgMzQxNyB5IEZxKCNpbmNsdWRlKTM1CmIoPHBvcHQuaD4pMTExIDM2
-MzMgeShzdHJ1Y3QpaChwb3B0T3B0aW9uKWUoeykyNTggMzc0MQp5KGNvbnN0KWkoY2hhciln
-KCopZyhsb25nTmFtZTspZigvKiloKG1heSlnKGJlKWgoTlVMTCllKCovKTI1OAozODQ5IHko
-Y2hhciloKHNob3J0TmFtZTspMjkyIGIoLyopMzYgYihtYXkpZyhiZSloKCdcXDAnKWUoKi8p
-MjU4CjM5NTcgeShpbnQpaChhcmdJbmZvOykyNTggNDA2NSB5KHZvaWQpZygqKWgoYXJnOyk0
-NDAKYigvKikzNiBiKGRlcGVuZHMpZihvbilpKGFyZ0luZm8pZSgqLykyNTggNDE3MiB5KGlu
-dCloKHZhbDspNTUxCmIoLyopMzYgYigwKWgobWVhbnMpZShkbylpKG5vdClmKHJldHVybiwp
-ZihqdXN0KWgodXBkYXRlKWYoZmxhZyloKCovKQoxMTEgNDI4MCB5KH07KXAgZW9wCiUlUGFn
-ZTogNDQ3IDMKNDQ3IDQ3MCBib3AgMjIzNyAtMTE2IGEgRnYoMjQuMSk4MiBiKEJhc2ljKTIz
-IGIocG9wdClmKFVzYWdlKTExOQpiIEZ0KDQ0NylwIDAgLTc2IDM0MTMgNCB2IDQ0NiA3MSBh
-IEZMKFRhYmxlKTI3IGIoMjQuMSk4NApiIEZ2KHBvcHQpMjIgYihBcmd1bWVudClpKFR5cGVz
-KXAgNDQ2IDEwMyAyODIwIDQgdiA0NDYKMTIwIDQgMTcgdiAxMTY3IDEyMCBWIDI3NzUgMTIw
-IFYgMzI2MiAxMjAgViA0NDYgMjE5IDQKMTAwIHYgNTMyIDE5MCBhIEZzKFYpLTkgYihhbHVl
-KXAgMTE2NyAyMTkgViA1MDIgdyhEZXNjcmlwdGlvbilwCjI3NzUgMjE5IFYgMTE2MCB3IEZx
-KGFyZykyMCBiIEZzKFQpLTcgYih5cGUpcCAzMjYyIDIxOQpWIDQ0NiAyMzYgNCAxNyB2IDEx
-NjcgMjM2IFYgMjc3NSAyMzYgViAzMjYyIDIzNiBWIDQ0NgoyMzkgMjgyMCA0IHYgNDQ2IDI0
-NiA0IDcgdiAxMTY3IDI0NiBWIDI3NzUgMjQ2IFYgMzI2MgoyNDYgViA0NDYgMjQ5IDI4MjAg
-NCB2IDQ0NiAyNjYgNCAxNyB2IDExNjcgMjY2IFYgMjc3NQoyNjYgViAzMjYyIDI2NiBWIDQ0
-NiAzNjUgNCAxMDAgdiA1MzIgMzM2IGEgRnEoUE9QVF9BUkdfTk9ORSlwCjExNjcgMzY1IFYg
-MjQwIHcgRncoTm8pMjEgYihhcilvKGd1bWVudClmKGlzKWgoZXhwZWN0ZWQpcAoyNzc1IDM2
-NSBWIDY4OCB3IEZxKGludClwIDMyNjIgMzY1IFYgNDQ2IDQ2NSBWIDUzMiA0MzYKYShQT1BU
-X0FSR19TVFJJTkcpcCAxMTY3IDQ2NSBWIDE2NiB3IEZ3KE5vKWcodHlwZSlnKGNoZWNraW5n
-KWcoc2hvdWxkKWgKKGJlKWUocGVyZm9ybWVkKXAgMjc3NSA0NjUgViAxNjkgdyBGcShjaGFy
-KTM1IGIoKilwIDMyNjIKNDY1IFYgNDQ2IDU2NSBWIDUzMiA1MzUgYShQT1BUX0FSR19JTlQp
-cCAxMTY3IDU2NSBWIDI3Nwp3IEZ3KEFuKTIxIGIoaW50ZWdlcilmKGFyKW8oZ3VtZW50KWgo
-aXMpZyhleHBlY3RlZClwCjI3NzUgNTY1IFYgNDEwIHcgRnEoaW50KXAgMzI2MiA1NjUgViA0
-NDYgNjY0IFYgNTMyIDYzNQphKFBPUFRfQVJHX0xPTkcpcCAxMTY3IDY2NCBWIDI0MCB3IEZ3
-KEEpZihsb25nKWkoaW50ZWdlcilmKGlzKWcKKGV4cGVjdGVkKXAgMjc3NSA2NjQgViA2NTIg
-dyBGcShsb25nKXAgMzI2MiA2NjQgViA0NDYKNjgxIDQgMTcgdiAxMTY3IDY4MSBWIDI3NzUg
-NjgxIFYgMzI2MiA2ODEgViA0NDYgNjg0IDI4MjAKNCB2IDI5OSA5MzMgYSBGQShFYWNoKTM0
-IGIobWVtYmVyKWYob2YpZyh0aGUpZyh0YWJsZSlnKGRlXDAwMm5lcylnKGEpaAooc2luZ2xl
-KWYob3B0aW9uKWcodGhhdClnKG1heSloKGJlKWYocGFzc2VkKWkodG8pMjk5CjEwNDUgeSh0
-aGUpMjkgYihwciluKG9ncmFtLik1MCBiKExvbmcpMzAgYihhbmQpZShzaG9ydClpKG9wdGlv
-bnMpZihhciluCihlKWcoY29uc2lkZXIpbihlZCloKGEpZihzaW5nbGUpZihvcHRpb24paSh0
-aGF0KTI5OSAxMTU3CnkobWF5KWsob2NjdXIpZyhpbilnKHR3bylnKGRpZiluKGZlciluKGVu
-dClmKGZvcm1zLik2NQpiKFRoZSkzMyBiKFwwMDJyc3QpaCh0d28pZyhtZW1iZXJzLClpIEZy
-KGxvbmdOYW1lKWUgRkEoYW5kKTI5OQoxMjY5IHkgRnIoc2hvcnROYW1lKXAgRkEoLCkyNSBi
-KGRlXDAwMm5lKWcodGhlKWcobmFtZXMpaChvZilmKHRoZSlnCihvcHRpb247KWkodGhlKWUo
-XDAwMnJzdCloKGlzKWcoYSlnKGxvbmcpZihuYW1lLClnKGFuZCloKHRoZSkyOTkKMTM4MSB5
-KGxhdHRlcilkKGlzKWgoYSlnKHNpbmdsZSlmKGNoYXJhY3RlciktNyBiKC4pMjk5CjE1OTMg
-eShUaGUpMjEgYiBGcihhcmdJbmZvKWcgRkEobWVtYmVyKWgodGVsbHMpZyhwb3B0KWgod2hh
-dCllKHR5cGUpaAoob2YpZyhhciluKGd1bWVudClnKGlzKWcoZXhwZWN0ZWQpaChhZnRlcill
-KHRoZSkyOTkgMTcwNQp5KGFyKW4oZ3VtZW50LikzMyBiKElmKTIzIGIobm8pZyhvcHRpb24p
-ZyhpcylnKGV4cGVjdGVkLCloCkZyKFBPUFRfQVJHX05PTkUpZCBGQShzaG91bGQpaShiZSln
-KHVzZWQuKTM0IGIoVGhlKTIyCmIociluKGVzdCkyOTkgMTgxNyB5KG9mKWkodGhlKWYodmFs
-aWQpZyh2YWx1ZXMpaChhciluKGUpZihzdW1tYXJpemVkKWcKKGluKWgoVCktOSBiKGFibGUp
-MjIgYigyNC4xLikyMzU1IDE3ODMgeSBGeCgxKTI5OSAyMDI5CnkgRkEoVGhlKWoobmV4dCln
-KGVsZW1lbnQsKWcgRnIoYXJnKXAgRkEoLCloKGFsbG93cylmKHBvcHQpaSh0bylmCihhdXRv
-bWF0aWNhbGx5KWYodXBkYXRlKWgocHIpbihvZ3JhbSlnKHZhcmlcMjU1KTI5OSAyMTQxCnko
-YWJsZXMpMjEgYih3aGVuKWcodGhlKWcob3B0aW9uKWgoaXMpZyh1c2VkLikzNCBiKElmKTIy
-CmIgRnIoYXJnKWYgRkEoaXMpaCBGcihOVUxMKXAgRkEoLClnKGl0KWYoaXMpaShpZ25vcilu
-KGVkKWUoYW5kKWgocG9wdClnCih0YWtlcyloKG5vKTI5OSAyMjUzIHkoc3BlY2lhbCkxOCBi
-KGFjdGlvbi4pMzMgYihPdGhlcndpc2UsKTE4CmIoaXQpZyhzaG91bGQpZyhwb2ludCloKHRv
-KWYoYSlnKHZhcmlhYmxlKWYob2YpaCh0aGUpZyh0eXBlKWcKKGluZGljYXRlZCkyOTkgMjM2
-NSB5KGluKTIzIGIodGhlKWcocmlnaHRcMjU1bW9zdCloKGNvbHVtbilnKG9mKWcoVCktOQpi
-KGFibGUpMjIgYigyNC4xLikyOTkgMjU3NyB5KElmKTQyIGIodGhlKWYob3B0aW9uKWcodGFr
-ZXMpaChubylnKGFyKW4KKGd1bWVudCllKFwoKXAgRnIoYXJnSW5mbyloIEZBKGlzKWggRnIo
-UE9QVF9BUkdfTk9ORSlwCkZBKFwpLCllKHRoZSloKHZhcmlhYmxlKTI5OSAyNjg5IHkocG9p
-bnRlZCkyMSBiKHRvKWcoYnkpZgpGcihhcmcpaCBGQShpcylnKHNldClnKHRvKWcoMSlmKHdo
-ZW4pZih0aGUpaChvcHRpb24paChpcylnKHVzZWQuKTM0CmIoSWYpMjAgYih0aGUpZyhvcHRp
-b24paChkb2VzKWgodGFrZSkyOTkgMjgwMSB5KGFuKTE2CmIoYXIpbihndW1lbnQsKWkodGhl
-KWYodmFyaWFibGUpZSh0aGF0KWkgRnIoYXJnKWcgRkEocG9pbnRzKWgodG8pZyhpcylmCih1
-cGRhdGVkKWgodG8pZihyKW4oZVwwMDNlY3QpZyh0aGUpZyh2YWx1ZSlmKG9mKTI5OSAyOTEz
-CnkodGhlKTIzIGIoYXIpbihndW1lbnQuKTM0IGIoQW55KTI0IGIoc3RyaW5nKWYoaXMpaShh
-Y2NlcHRhYmxlKWUoZm9yKWgKRnIoUE9QVF9BUkdfU1RSSU5HKWUgRkEoYXIpbihndW1lbnRz
-LClpKGJ1dCkyOTkgMzAyNQp5IEZyKFBPUFRfQVJHX0lOVCkxOSBiIEZBKGFuZCloIEZyKFBP
-UFRfQVJHX0xPTkcpZSBGQShhciluKGd1bWVudHMpaQooYXIpbihlKWcoY29udmVydGVkKWco
-dG8pZyh0aGUpZyhhcHByKW4ob3ByaWF0ZSkyOTkgMzEzNwp5KHR5cGUsKWsoYW5kKWYoYW4p
-aChlcnIpbihvcilmKGlzKWgociluKGV0dXJuZWQpZihpZilnKHRoZSlnCihjb252ZXJzaW9u
-KWgoZmFpbHMuKTI5OSAzMzQ5IHkoVGhlKTMzIGIoXDAwMm5hbClnKG9wdGlvbiwpMzgKYiBG
-cih2YWwpcCBGQSgsKWUoaXMpZih0aGUpZih2YWx1ZSlmKHBvcHQncylqKHBhcnNpbmcpZShm
-dW5jdGlvbilmCihzaG91bGQpaShyKW4oZXR1cm4pMjk5IDM0NjEgeSh3aGVuKTI2IGIodGhl
-KWgob3B0aW9uKWgoaXMpZyhlbmNvdW50ZXIpCm4oZWQuKTQ1IGIoSWYpMjcgYihpdCloKGlz
-KWcoMCwpZyh0aGUpZihwYXJzaW5nKWgoZnVuY3Rpb24pZihwYXJzZXMpaAoodGhlKTI5OSAz
-NTczIHkobmV4dCkyMyBiKGNvbW1hbmRcMjU1bGluZSloKGFyKW4oZ3VtZW50KWYocmF0aGVy
-KWYKKHRoYW4paChyKW4oZXR1cm4uKTI5OSAzNzg1IHkoVGhlKWMoXDAwMm5hbClnKHN0cilv
-KHVjdHVyKW4oZSloKGluKWYKKHRoZSloKHRhYmxlKWYoc2hvdWxkKWgoaGF2ZSlmKGFsbCln
-KHRoZSloKHBvaW50ZXIpZyh2YWx1ZXMpZihzZXQpaCh0bykKaCBGcihOVUxMKTI5OSAzODk3
-IHkgRkEoYW5kKWkoYWxsKWgodGhlKWYoYXJpdGhtZXRpYylnKHZhbHVlcylnKHNldCloCih0
-bylnKDAsKWcobWFya2luZylmKHRoZSlnKGVuZCloKG9mKWcodGhlKWYodGFibGUuKXAKMjk5
-IDQyMzQgODk3IDUgdiAyOTkgNDMxNSBhIEZ3KDEuKTI5IGIgRnEoZ2V0b3B0XChcKSlnCkZ3
-KGNvbm5vaXNzZXVycylqKHdpbGwpZihub3RlKWcodGhhdClmIEZxKGFyZ0luZm8pZiBGdyhp
-cylpKHRoZSlmKG9ubHkpCmkoXDAwMmVsZCllKG9mKWggRnEoc3RydWN0KTQ2IGIocG9wdE9w
-dGlvbikzOTEgNDQwNyB5CkZ3KHRoYXQpMjkgYihpcylnKG5vdClnKGRpcilvKGVjdGx5KWYo
-YW5hbG9nb3VzKWkodG8pZihhKWYoXDAwMmVsZCloCihpbilnKHRoZSlnIEZxKGdldG9wdF9s
-b25nXChcKSlkIEZ3KGFyKW8oZ3VtZW50KWkodGFibGUuKTUzCmIoVGhlKTM5MSA0NDk4IHko
-c2ltaWxhcml0eSkyMiBiKGJldHdlZW4pZSh0aGUpaCh0d28pZyhhbGxvd3MpaChmb3IpZQoo
-ZWFzeSloKHRyYW5zaXRpb25zKWgoZnIpbyhvbSllIEZxKGdldG9wdF9sb25nXChcKSllCkZ3
-KHRvKWoocG9wdC4pcCBlb3AKJSVQYWdlOiA0NDggNAo0NDggNDcxIGJvcCAtMTg3IC0xMTYg
-YSBGdCg0NDgpMTE4IGIgRkwoQ2hhcHRlcikyOSBiKDI0KTgzCmIgRnYoUGFyc2luZykyMyBi
-KENvbW1hbmQtTGluZSlmKE9wdGlvbnMpcCAtMTg3IC03NiAzNDEzCjQgdiAxMTEgODUgYSBG
-dSgyNC4xLjIpNTkgYihDcmVhdGluZykzOSBiKGEpZihDb250ZXh0KTExMQoyOTcgeSBGQShw
-b3B0KTMxIGIoY2FuKWYoaW50ZXJsZWF2ZSllKHRoZSloKHBhcnNpbmcpZyhvZiloKG11bHRp
-cGxlKWcKKGNvbW1hbmRcMjU1bGluZSlmKHNldHMuKTUzIGIoSXQpMzAgYihhbGxvd3MpMTEx
-IDQwOQp5KHRoaXMpZShieSlnKGtlZXBpbmcpZyhhbGwpZih0aGUpZyhzdGF0ZSlpKGluZm9y
-bWF0aW9uKWQoZm9yKWkoYSlnCihwYXJ0aWN1bGFyKWYoc2V0KWgob2YpZyhjb21tYW5kXDI1
-NSkxMTEgNTIxIHkobGluZSkyMgpiKGFyKW4oZ3VtZW50cyloKGluKWYoYSloIEZyKHBvcHRD
-b250ZXh0KWUgRkEoZGF0YSlpKHN0cilvKHVjdHVyKW4oZSwpZwooYW4pZihvcGFxdWUpaCh0
-eXBlKWcodGhhdClnKHNob3VsZCkxMTEgNjMzIHkobm90KWgoYmUpZihtb2RpXDAwMmVkKWkK
-KG91dHNpZGUpZih0aGUpZihwb3B0KWkobGlicmFyeSktMTEgYiguKTExMSA4NDUgeShOZXcp
-MjQKYihwb3B0KWgoY29udGV4dHMpZyhhciluKGUpZShjciluKGVhdGVkKWgoYnkpZyBGcihw
-b3B0R2V0Q29udGV4dFwoXCkpcApGQSguKTExMSAxMDUxIHkgRnEoI2luY2x1ZGUpMzUgYig8
-cG9wdC5oPikxMTEgMTI2NiB5KHBvcHRDb250ZXh0KWcKKHBvcHRHZXRDb250ZXh0XChjaGFy
-KWQoKilrKG5hbWUsKWcoaW50KWcoYXJnYywpZihjaGFyKWgoKiopaChhcmd2LCkKMTEwNCAx
-Mzc0IHkoc3RydWN0KWUocG9wdE9wdGlvbilnKCopaChvcHRpb25zLClmKGludCloKGZsYWdz
-XCk7KTExMQoxNTg2IHkgRkEoVGhlKTI2IGIoXDAwMnJzdCloKHBhcmFtZXRlciktNyBiKCwp
-MjYgYiBGcihuYW1lKXAKRkEoLCloKGlzKWcodXNlZClnKG9ubHkpZyhmb3IpZihhbGlhcylo
-KGhhbmRsaW5nKWUoXChkaXNjdXNzZWQpagoobGF0ZXJcKS4pMTExIDE2OTggeShJdCloKHNo
-b3VsZClmKGJlKWYodGhlKWgobmFtZSlmKG9mKWgodGhlKWcKKGFwcGxpY2F0aW9uKWcod2hv
-c2UpZihvcHRpb25zKWkoYXIpbihlKWUoYmVpbmcpZyhwYXJzZWQsKTExMQoxODEwIHkob3Ip
-ZShzaG91bGQpZihiZSlnIEZyKE5VTEwpZyBGQShpZilnKG5vKWcob3B0aW9uKWgoYWxpYXNp
-bmcpZQooaXMpaShkZXNpciluKGVkLikzNiBiKFRoZSkyNCBiKG5leHQpZyh0d28pZyhhcilu
-KGd1bWVudHMpMTExCjE5MjIgeShzcGVjaWZ5KWcodGhlKWYoY29tbWFuZFwyNTVsaW5lKWco
-YXIpbihndW1lbnRzKWcodG8paChwYXJzZS4pMzQKYihUaGVzZSkyMiBiKGFyKW4oZSloKGdl
-bmVyYWxseSlmKHBhc3NlZCkxMTEgMjAzNCB5KHRvKTM3CmIgRnIocG9wdEdldENvbnRleHRc
-KFwpKWUgRkEoZXhhY3RseSlpKGFzKWcodGhleSlmKHdlciluKGUpZyhwYXNzZWQpaQoodG8p
-Zih0aGUpZihwciluKG9ncmFtJ3MpaCBGcihtYWluXChcKSkxMTEgMjE0NiB5IEZBKGZ1bmN0
-aW9uLik1MApiKFRoZSkyOSBiIEZyKG9wdGlvbnMpZiBGQShwYXJhbWV0ZXIpaChwb2ludHMp
-aCh0bylnKHRoZSlmKHRhYmxlKWYob2YpaQooY29tbWFuZFwyNTVsaW5lKWUob3BcMjU1KTEx
-MSAyMjU5IHkodGlvbnMsKTMzIGIod2hpY2gpZCh3YXMpaAooZGVzY3JpYmVkKWgoaW4pZSh0
-aGUpaChwciluKGV2aW91cylnKHNlY3Rpb24uKTU2IGIoVGhlKTMwCmIoXDAwMm5hbClnKHBh
-cmFtZXRlciktNyBiKCwpMTExIDIzNzEgeSBGcihmbGFncylwIEZBKCwpMjEKYihpcylnKG5v
-dClnKGN1cnIpbihlbnRseSllKHVzZWQpaShidXQpZyhzaG91bGQpZihhbHdheXMpZyhiZSlo
-CihzcGVjaVwwMDJlZClnKGFzKWcoMClmKGZvciloKGNvbXBhdFwyNTUpMTExIDI0ODMgeShp
-YmlsaXR5KWkod2l0aClnCihmdXR1ciluKGUpZyh2ZXJzaW9ucyloKG9mKWcodGhlKWYocG9w
-dClpKGxpYnJhcnkpLTExCmIoLikxMTEgMjY5NCB5KEEpMjYgYiBGcihwb3B0Q29udGV4dClm
-IEZBKGtlZXBzKWgodHJhY2spZyhvZilnKHdoaWNoKWUKKG9wdGlvbnMpaihoYXZlKWQoYWxy
-KW4oZWFkeSloKGJlZW4pZyhwYXJzZWQpaChhbmQpMTExCjI4MDcgeSh3aGljaCloKHIpbihl
-bWFpbiwpaShhbW9uZylmKG90aGVyKWYodGhpbmdzLik0NwpiKElmKTI4IGIoYSlnKHByKW4o
-b2dyYW0pZyh3aXNoZXMpZyh0byloKHIpbihlc3RhcnQpZihvcHRpb24pMTExCjI5MTkgeShw
-ciluKG9jZXNzaW5nKTIzIGIob2YpZihhKWcoc2V0KWcob2YpZyhhciluKGd1bWVudHMsKWco
-aXQpZihjYW4pCmgociluKGVzZXQpZyh0aGUpZiBGcihwb3B0Q29udGV4dClnIEZBKGJ5KWgo
-cGFzc2luZylnKHRoZSkxMTEKMzAzMSB5KGNvbnRleHQpaihhcylmKHRoZSlmKHNvbGUpaChh
-ciluKGd1bWVudClmKHRvKWgKRnIocG9wdFJlc2V0Q29udGV4dFwoXCkpcCBGQSguKTExMSAz
-MjQyIHkoV2hlbilqKGFyKW4oZ3VtZW50KWcocHIpbgoob2Nlc3NpbmcpaChpcylnKGNvbXBs
-ZXRlLCloKHRoZSlkKHByKW4ob2Nlc3MpaihzaG91bGQpZihmciluKGVlKWUodGhlKQpoIEZy
-KHBvcHQtKTExMSAzMzU0IHkoQ29udGV4dCkyMiBiIEZBKGFzKWgoaXQpZihjb250YWlucylo
-KGR5bmFtaWNhbGx5KQpmKGFsbG9jYXRlZClnKGNvbXBvbmVudHMuKTM1IGIoVGhlKTIxIGIg
-RnIocG9wdEZyZWVDb24tKTExMQozNDY3IHkodGV4dFwoXCkpMzIgYiBGQShmdW5jdGlvbiln
-KHRha2VzKWgoYSlmIEZyKHBvcHRDb250ZXh0KWcKRkEoYXMpaChpdHMpZyhzb2xlKWcoYXIp
-bihndW1lbnQpZShhbmQpaShmciluKGVlcylmKHRoZSlnKHIpbihlXDI1NSkxMTEKMzU3OSB5
-KHNvdXIpbihjZXMpMjUgYih0aGUpZShjb250ZXh0KWkoaXMpZih1c2luZy4pMTExCjM3OTAg
-eShIZXIpbihlKWcoYXIpbihlKWYodGhlKWgocHIpbihvdG90eXBlcyloKG9mKWYoYm90aClm
-CkZyKHBvcHRSZXNldENvbnRleHRcKFwpKWYgRkEoYW5kKWkgRnIocG9wdEZyZWVDb250ZXh0
-XChcKSlwCkZBKC4pMTExIDM5OTYgeSBGcSgjaW5jbHVkZSkzNSBiKDxwb3B0Lmg+KTExMSA0
-MjEyIHkodm9pZCloCihwb3B0RnJlZUNvbnRleHRcKHBvcHRDb250ZXh0KTMxIGIoY29uXCk7
-KTExMSA0MzIwIHkodm9pZCkzNgpiKHBvcHRSZXNldENvbnRleHRcKHBvcHRDb250ZXh0KTMw
-IGIoY29uXCk7KXAgZW9wCiUlUGFnZTogNDQ5IDUKNDQ5IDQ3MiBib3AgMjIzNyAtMTE2IGEg
-RnYoMjQuMSk4MiBiKEJhc2ljKTIzIGIocG9wdClmKFVzYWdlKTExOQpiIEZ0KDQ0OSlwIDAg
-LTc2IDM0MTMgNCB2IDI5OSA4NSBhIEZ1KDI0LjEuMyk1OCBiKFBhcnNpbmcpMzkKYih0aGUp
-aChDb21tYW5kKWUoTGluZSkyOTkgMjk3IHkgRkEoQWZ0ZXIpMjYgYihhbilnKGFwcGxpY2F0
-aW9uKWgoaGFzKWcKKGNyKW4oZWF0ZWQpZihhKWggRnIocG9wdENvbnRleHQpcCBGQSgsKWYo
-aXQpaChtYXkpZyhiZWdpbillKHBhcnNpbmcpaQooYXIpbihndVwyNTUpMjk5IDQwOSB5KG1l
-bnRzLikzNCBiKFRoZSkyMyBiIEZyKHBvcHRHZXROZXh0T3B0XChcKSlmCkZBKHBlcmZvcm1z
-KWkodGhlKWcoYWN0dWFsKWYoYXIpbihndW1lbnQpZyhwYXJzaW5nLikyOTkKNjE1IHkgRnEo
-I2luY2x1ZGUpMzUgYig8cG9wdC5oPikyOTkgODMxIHkoaW50KWgKKHBvcHRHZXROZXh0T3B0
-XChwb3B0Q29udGV4dCkzMSBiKGNvblwpOykyOTkgMTA0MiB5IEZBKFQpLTkKYihha2luZyk0
-NCBiKHRoZSloKGNvbnRleHQpaChhcylnKGl0cylmKHNvbGUpaChhciluKGd1bWVudCwpayh0
-aGlzKTQ1CmIoZnVuY3Rpb24pZyhwYXJzZXMpaCh0aGUpZihuZXh0KTI5OSAxMTU0IHkoY29t
-bWFuZFwyNTVsaW5lKTM0CmIoYXIpbihndW1lbnQpZihmb3VuZC4pNjUgYihBZnRlcikzNCBi
-KFwwMDJuZGluZylmKHRoZSloKG5leHQpZyhhciluCihndW1lbnQpZihpbiloKHRoZSkyOTkg
-MTI2NiB5KG9wdGlvbikyOSBiKHRhYmxlLClnKHRoZSlmKGZ1bmN0aW9uKWcKKFwwMDJsbHMp
-ZyhpbilnKHRoZSlnKG9iamVjdClpKHBvaW50ZWQpZSh0byloKGJ5KWcodGhlKWYob3B0aW9u
-KWgKKHRhYmxlKTI5OSAxMzc5IHkoZW50cnkncykxOCBiIEZyKGFyZylnIEZBKHBvaW50ZXIp
-aChpZilmKGl0KWgoaXMpZwoobm90KWYgRnIoTlVMTClwIEZBKC4pZyhJZiloKHRoZSlmIEZy
-KHZhbCloIEZBKGVudHJ5KWYoZm9yKWcodGhlKWcKKG9wdGlvbiloKGlzKWcobm9uXDI1NTAs
-KWcodGhlKTI5OSAxNDkxIHkoZnVuY3Rpb24paCh0aGVuKWcociluKGV0dXJucykKZyh0aGF0
-KWcodmFsdWUuKTMyIGIoT3RoZXJ3aXNlLCkyMCBiIEZyKHBvcHRHZXROZXh0T3B0XChcKSlm
-CkZBKGNvbnRpbnVlcylpKG9uKTI5OSAxNjAzIHkodG8paih0aGUpZihuZXh0KWgoYXIpbihn
-dW1lbnQuKTI5OQoxODE0IHkgRnIocG9wdEdldE5leHRPcHRcKFwpKWcgRkEociluKGV0dXJu
-cyloKFwyNTUxKWcod2hlbilmKHRoZSloCihcMDAybmFsKWcoYXIpbihndW1lbnQpZyhoYXMp
-aChiZWVuKWUocGFyc2VkLClqKGFuZCkyOTkKMTkyNiB5KG90aGVyKTIwIGIobmVnYXRpdmUp
-Zih2YWx1ZXMpaCh3aGVuKWYoZXJyKW4ob3JzKWkob2NjdXIpLTcKYiguKTMzIGIoVGhpcyky
-MCBiKG1ha2VzKWgoaXQpZihhKWgoZ29vZClnKGlkZWEpZih0byloKGtlZXApMjk5CjIwMzkg
-eSh0aGUpaSBGcih2YWwpaCBGQShlbGVtZW50cylmKGluKWcodGhlKWgob3B0aW9ucylnKHRh
-YmxlKWYoZ3IpbgooZWF0ZXIpZyh0aGFuKWcoMC4pMjk5IDIyNTAgeShJZik0OCBiKGFsbClm
-KG9mKWgodGhlKWYoY29tbWFuZFwyNTVsaW5lKQpoKG9wdGlvbnMpZyhhciluKGUpZyhoYW5k
-bGVkKWYodGhyKW4ob3VnaClnIEZyKGFyZylnCkZBKHBvaW50ZXJzLCkyOTkgMjM2MiB5KGNv
-bW1hbmRcMjU1bGluZSkyMyBiKHBhcnNpbmcpaChpcylnKHIpbihlZHVjZWQpCmcodG8pZyh0
-aGUpZihmb2xsb3dpbmcpZyhsaW5lKWcob2YpZyhjb2RlOikyOTkgMjU2OCB5CkZxKHJjKTM2
-IGIoPSloKHBvcHRHZXROZXh0T3B0XChwb3B0Y29uXCk7KTI5OSAyNzgwIHkKRkEoTWFueSky
-MSBiKGFwcGxpY2F0aW9ucylnKHIpbihlcXVpciluKGUpZyhtb3IpbihlKWcoY29tcGxleClo
-Cihjb21tYW5kXDI1NWxpbmUpZihwYXJzaW5nKWcodGhhbilmKHRoaXMsKTI5OSAyODkyIHko
-aG93ZXZlciktNwpiKCwpMjIgYihhbmQpaSh1c2UpZih0aGUpZyhmb2xsb3dpbmcpZyhzdHIp
-byh1Y3R1ciluKGUuKTI5OQozMDk3IHkgRnEod2hpbGUpMzUgYihcKFwocmMpaCg9KWgocG9w
-dEdldE5leHRPcHRcKHBvcHRjb25cKVwpKTMxCmIoPikzNiBiKDBcKSloKHspNDQ2IDMyMDUg
-eShzd2l0Y2gpZShcKHJjXCkpaCh7KTU5MyAzMzEzCnkoLyopZyhzcGVjaWZpYylmKGFyZ3Vt
-ZW50cylnKGFyZSloKGhhbmRsZWQpZihoZXJlKWgoKi8pNDQ2CjM0MjEgeSh9KTI5OSAzNTI5
-IHkofSkyOTkgMzc0MSB5IEZBKFdoZW4pZihyKW4oZXR1cm5lZClnKG9wdGlvbnMpaShhcilu
-CihlKWYoaGFuZGxlZCwpaSh0aGUpZShhcHBsaWNhdGlvbilnKG5lZWRzKWcodG8pZyhrbm93
-KWcodGhlKTI5OQozODUzIHkodmFsdWUpMjEgYihvZiloKGFueSlnKGFyKW4oZ3VtZW50cyln
-KHRoYXQpZyh3ZXIpbihlKWYKKHNwZWNpXDAwMmVkKWkoYWZ0ZXIpZih0aGUpZyhvcHRpb24u
-KTM0IGIoVGhlciluKGUpMjAKYihhciluKGUpaSh0d28pMjk5IDM5NjUgeSh3YXlzKWQodG8p
-ZyhkaXNjb3ZlcilnKHRoZW0uKTMyCmIoT25lKTE4IGIoaXMpaSh0bylmKGFzaylnKHBvcHQp
-Zyh0byloKFwwMDJsbCllKGluKWcoYSlnKHZhcmlhYmxlKWYKKHdpdGgpaCh0aGUpZyh2YWx1
-ZSkyOTkgNDA3NyB5KG9mKTI4IGIodGhlKWgob3B0aW9uKWYodGhyKW4ob3VnaClnKHRoZSkK
-ZyhvcHRpb24paCh0YWJsZSdzKWYgRnIoYXJnKWcgRkEoZWxlbWVudHMuKTQ4IGIoVGhlKTI4
-CmIob3RoZXIpZyhpcyloKHRvKWYodXNlKTI5OSA0MTg5IHkgRnIocG9wdEdldE9wdEFyZ1wo
-XCkpcApGQSguKXAgZW9wCiUlUGFnZTogNDUwIDYKNDUwIDQ3MyBib3AgLTE4NyAtMTE2IGEg
-RnQoNDUwKTExOCBiIEZMKENoYXB0ZXIpMjkgYigyNCk4MwpiIEZ2KFBhcnNpbmcpMjMgYihD
-b21tYW5kLUxpbmUpZihPcHRpb25zKXAgLTE4NyAtNzYgMzQxMwo0IHYgMTExIDE3MCBhIEZx
-KCNpbmNsdWRlKTM1IGIoPHBvcHQuaD4pMTExIDM4NiB5KGNoYXIpaCgqKWgKKHBvcHRHZXRP
-cHRBcmdcKHBvcHRDb250ZXh0KTMxIGIoY29uXCk7KTExMSA1OTggeSBGQShUaGlzKWMoZnVu
-Y3Rpb24pZgoociluKGV0dXJucyloKHRoZSlnKGFyKW4oZ3VtZW50KWYoZ2l2ZW4pZyhmb3Ip
-aCh0aGUpZyhcMDAybmFsKWYob3B0aW9uKQppKHIpbihldHVybmVkKWUoYnkpMTExIDcxMCB5
-IEZyKHBvcHRHZXROZXh0T3B0XChcKSlwCkZBKCwpYyhvcilpKGl0KWcociluKGV0dXJucylm
-IEZyKE5VTEwpZyBGQShpZiloKG5vKWYoYXIpbihndW1lbnQpZyh3YXMpCmgoc3BlY2lcMDAy
-ZWQuKTExMSAxMDczIHkgRnUoMjQuMS40KTU5IGIoTGVmdG92ZXIpMzgKYihBcmd1bWVudHMp
-MTExIDEyODUgeSBGQShNYW55KTI0IGIoYXBwbGljYXRpb25zKWcodGFrZSlmKGFuKWgKKGFy
-Yml0cmFyeSllKG51bWJlcilnKG9mKWkoY29tbWFuZFwyNTVsaW5lKWYoYXIpbihndW1lbnRz
-LCkxMTEKMTM5NyB5KHN1Y2gpaihhcylnKGEpZyhsaXN0KWcob2YpZyhcMDAybGUpZihuYW1l
-cy4pNDAKYihXaGVuKTI1IGIocG9wdClpKGVuY291bnRlcnMpZShhbilnKGFyKW4oZ3VtZW50
-KWcodGhhdClnKGRvZXMpMTExCjE1MDkgeShub3QpayhiZWdpbilmKHdpdGgpZyhhKWggRnIo
-LSlwIEZBKCwpaChpdClmKGFzc3VtZXMpaChpdClmKGlzKWcKKHN1Y2gpZyhhbilmKGFyKW4o
-Z3VtZW50KWcoYW5kKWgoYWRkcyloKGl0KWYodG8pZyhhKWcobGlzdCkxMTEKMTYyMSB5KG9m
-KWkobGVmdG92ZXIpZihhciluKGd1bWVudHMuKTU1IGIoVGhyKW4oZWUpMzAKYihmdW5jdGlv
-bnMpZyhhbGxvdylnKGFwcGxpY2F0aW9ucyloKHRvKWgoYWNjZXNzKWcoc3VjaCkxMTEKMTcz
-MyB5KGFyKW4oZ3VtZW50czopMTExIDIwMDcgeSBGcihjaGFyKTQzIGIoKilnCihwb3B0R2V0
-QXJnXChwb3B0Q29udGV4dClkKGNvblwpOyk0MTEgMjExOSB5IEZBKFRoaXMpMzUKYihmdW5j
-dGlvbilmKHIpbihldHVybnMpZyh0aGUpZyhuZXh0KWgobGVmdG92ZXIpZihhciluKGd1bWVu
-dClnKGFuZClnCihtYXJrcylpKGl0KWUoYXMpNDExIDIyMzEgeShwciluKG9jZXNzZWQuKTEx
-MSAyNDQzIHkKRnIoY2hhcik0MyBiKCopZyhwb3B0UGVla0FyZ1wocG9wdENvbnRleHQpZChj
-b25cKTspNDExCjI1NTUgeSBGQShUaGUpMTUgYihuZXh0KWgobGVmdG92ZXIpZihhciluKGd1
-bWVudClnKGlzKWkociluKGV0dXJuZWQpZAooYnV0KWkobm90KWcobWFya2VkKWcoYXMpZyhw
-ciluKG9jZXNzZWQuKTQxMSAyNjY3IHkoVGhpcykzOQpiKGFsbG93cylnKGFuKWYoYXBwbGlj
-YXRpb24paCh0byloKGxvb2spZihhaGVhZClnKGludG8pZyh0aGUpZihhciluCihndW1lbnQp
-aChsaXN0LCk0MTEgMjc3OSB5KHdpdGhvdXQpMjMgYihtb2RpZnlpbmcpaCh0aGUpZihsaXN0
-LikxMTEKMjk5MSB5IEZyKGNoYXIpNDMgYigqKilmKHBvcHRHZXRBcmdzXChwb3B0Q29udGV4
-dClmKGNvblwpOyk0MTEKMzEwMyB5IEZBKEFsbCkxNiBiKHRoZSlnKGxlZnRvdmVyKWYoYXIp
-bihndW1lbnRzKWcoYXIpbihlKWgociluCihldHVybmVkKWUoaW4paShhKWYobWFubmVyKWco
-aWRlbnRpY2FsKWcodG8paCBGcihhcmd2KXAKRkEoLik0MTEgMzIxNSB5KFRoZSlqKFwwMDJu
-YWwpZyhlbGVtZW50KWcoaW4pZyh0aGUpZyhyKW4oZXR1cm5lZClnCihhcnJheSlnKHBvaW50
-cyloKHRvKWcgRnIoTlVMTClwIEZBKCwpZihpbmRpY2F0aW5nKWcodGhlKTQxMQozMzI3IHko
-ZW5kKTI0IGIob2YpZyh0aGUpZihhciluKGd1bWVudHMuKS0xODcgMzY4MCB5CkZrKDI0LjIp
-MTMxIGIoRXJyb3IpNDEgYihIYW5kbGluZylwIC0xODcgMzc2NSAzNDEzIDUKdiAxMTEgNDAy
-NyBhIEZBKEFsbCkyOSBiKG9mKWcodGhlKWcocG9wdCloKGZ1bmN0aW9ucyllKHRoYXQpaChj
-YW4pZyhyKW4KKGV0dXJuKWUoZXJyKW4ob3JzKWkociluKGV0dXJuKWYoaW50ZWdlcnMuKTQ5
-IGIoV2hlbikyOApiKGFuKTExMSA0MTM5IHkoZXJyKW4ob3IpZChvY2N1cnMsKWkoYSllKG5l
-Z2F0aXZlKWYoZXJyKW4ob3IpaChjb2RlKWgKKGlzKWYociluKGV0dXJuZWQuKTM4IGIoVCkt
-OSBiKGFibGUpMjQgYigyNC4yKWgoc3VtbWFyaXplcylnKHRoZSkxMTEKNDI1MSB5KGVycilu
-KG9yKWYoY29kZXMpZyh0aGF0KWcob2NjdXIpLTcgYiguKTM0IGIoSGVyKW4oZSkyNApiKGlz
-KWcoYSlnKG1vciluKGUpZyhkZXRhaWxlZClmKGRpc2N1c3Npb24paShvZilmKGVhY2gpZihl
-cnIpbihvciktNwpiKC4pcCBlb3AKJSVQYWdlOiA0NTEgNwo0NTEgNDc0IGJvcCAyMzI5IC0x
-MTYgYSBGdigyNC4yKTgyIGIoRXJyb3IpMjMgYihIYW5kbGluZykxMTgKYiBGdCg0NTEpcCAw
-IC03NiAzNDEzIDQgdiA0MjEgNzEgYSBGTChUYWJsZSkyNyBiKDI0LjIpODQKYiBGdihwb3B0
-KTIyIGIoRXJyb3JzKXAgNDIxIDEwMyAyODcwIDQgdiA0MjEgMTIwIDQgMTcKdiAxMzk5IDEy
-MCBWIDMyODcgMTIwIFYgNDIxIDIxOSA0IDEwMCB2IDUwNyAxOTAgYSBGcyhFcnJvcilwCjEz
-OTkgMjE5IFYgNzg1IHcoRGVzY3JpcHRpb24pcCAzMjg3IDIxOSBWIDQyMSAyMzYgNCAxNwp2
-IDEzOTkgMjM2IFYgMzI4NyAyMzYgViA0MjEgMjM5IDI4NzAgNCB2IDQyMSAyNDYgNCA3CnYg
-MTM5OSAyNDYgViAzMjg3IDI0NiBWIDQyMSAyNDkgMjg3MCA0IHYgNDIxIDI2NiA0IDE3CnYg
-MTM5OSAyNjYgViAzMjg3IDI2NiBWIDQyMSAzNjUgNCAxMDAgdiA1MDcgMzM2IGEgRnEoUE9Q
-VF9FUlJPUl9OT0FSRylwCjEzOTkgMzY1IFYgMzg2IHcgRncoQW4pZihhcilvKGd1bWVudClm
-KGlzKWgobWlzc2luZyloKGZvcilmKGFuKWcKKG9wdGlvbi4pcCAzMjg3IDM2NSBWIDQyMSA0
-NjUgViA1MDcgNDM2IGEgRnEoUE9QVF9FUlJPUl9CQURPUFQpcAoxMzk5IDQ2NSBWIDM0OSB3
-IEZ3KEFuKWcob3B0aW9uJ3MpaChhcilvKGd1bWVudCllKGNvdWxkKWgobm90KWgoYmUpZQoo
-cGFyc2VkLilwIDMyODcgNDY1IFYgNDIxIDU2NSBWIDUwNyA1MzUgYSBGcShQT1BUX0VSUk9S
-X09QVFNUT09ERUVQKXAKMTM5OSA1NjUgViAxNjQgdyBGdyhPcHRpb24paShhbGlhc2luZylm
-KGlzKWcobmVzdGVkKWcodG9vKWcoZGVlcGx5KS05CmIoLilwIDMyODcgNTY1IFYgNDIxIDY2
-NCBWIDUwNyA2MzUgYSBGcShQT1BUX0VSUk9SX0JBRFFVT1RFKXAKMTM5OSA2NjQgViAyNzUg
-dyBGdyhRdW90YXRpb25zKTIyIGIoZG8pZihub3QpaChtYXRjaC4pcAozMjg3IDY2NCBWIDQy
-MSA3NjQgViA1MDcgNzM1IGEgRnEoUE9QVF9FUlJPUl9CQUROVU1CRVIpcAoxMzk5IDc2NCBW
-IDIzOCB3IEZ3KEFuKWYob3B0aW9uKWgoY291bGQpZihub3QpZyhiZSlnKGNvbnZlcnRlZClm
-KHRvKWgKKGEpZihudW1iZXIpLTYgYiguKXAgMzI4NyA3NjQgViA0MjEgODYzIFYgNTA3IDgz
-NCBhIEZxCihQT1BUX0VSUk9SX09WRVJGTE9XKXAgMTM5OSA4NjMgViAyNzUgdyBGdyhBKTIx
-IGIoZ2l2ZW4pZyhudW1iZXIpZyh3YXMpCmYodG9vKWkoYmlnKWYob3IpZyh0b28pZyhzbWFs
-bC4pcCAzMjg3IDg2MyBWIDQyMSA4ODAKNCAxNyB2IDEzOTkgODgwIFYgMzI4NyA4ODAgViA0
-MjEgODgzIDI4NzAgNCB2IDI5OSAxMTMyCmEgRnIoUE9QVF9FUlJPUl9OT0FSRyk1OTkgMTI0
-NCB5IEZBKEFuKWMob3B0aW9uKWgodGhhdClmKHIpbihlcXVpciluCihlcyloKGFuKWYoYXIp
-bihndW1lbnQpZih3YXMpaShzcGVjaVwwMDJlZClnKG9uKWYodGhlKWcoY29tbWFuZCk1OTkK
-MTM1NyB5KGxpbmUsKTQwIGIoYnV0KWQobm8pZyhhciluKGd1bWVudClnKHdhcylnKGdpdmVu
-Lik3NQpiKFRoaXMpMzcgYihjYW4paChiZSlmKHIpbihldHVybmVkKWYob25seSloKGJ5KTU5
-OSAxNDY5CnkgRnIocG9wdEdldE5leHRPcHRcKFwpKXAgRkEoLikyOTkgMTY4MCB5IEZyKFBP
-UFRfRVJST1JfQkFET1BUKTU5OQoxNzkyIHkgRkEoQW4pMjYgYihvcHRpb24pZyh3YXMpaChz
-cGVjaVwwMDJlZClmKGluKWcgRnIoYXJndilnCkZBKGJ1dClnKGlzKWcobm90KWcoaW4pZyh0
-aGUpZyhvcHRpb24pZyh0YWJsZS4pNDEgYihUaGlzKTU5OQoxOTA1IHkoZXJyKW4ob3IpMjMg
-YihjYW4paChiZSlmKHIpbihldHVybmVkKWcob25seSlnKGZyKW4ob20paApGcihwb3B0R2V0
-TmV4dE9wdFwoXCkpcCBGQSguKTI5OSAyMTE2IHkgRnIoUE9QVF9FUlJPUl9PUFRTVE9PREVF
-UCk1OTkKMjIyOCB5IEZBKEEpZihzZXQpaChvZilmKG9wdGlvbilnKGFsaWFzZXMpZyhpcylo
-KG5lc3RlZClmKHRvbyloKGRlZXBseSkKLTExIGIoLikzNCBiKEN1cnIpbihlbnRseSktMTEg
-YigsKTIyIGIocG9wdClpKGZvbGxvd3MpNTk5CjIzNDAgeShvcHRpb25zKTMwIGIob25seSlm
-KDEwKWcobGV2ZWxzKWcodG8paChwciluKGV2ZW50KWYoaW5cMDAybml0ZSlmCihyKW4oZWN1
-cnNpb24uKTUwIGIoT25seSkyOSBiIEZyKHBvcHRHZXQtKTU5OSAyNDUyIHkoTmV4dE9wdFwo
-XCkpMjMKYiBGQShjYW4pZyhyKW4oZXR1cm4pZyh0aGlzKWgoZXJyKW4ob3IpLTcgYiguKTI5
-OSAyNjY0CnkgRnIoUE9QVF9FUlJPUl9CQURRVU9URSk1OTkgMjc3NiB5IEZBKEEpMTUgYihw
-YXJzZWQpZyhzdHJpbmcpZyhoYXMpZwooYSlnKHF1b3RhdGlvbilnKG1pc21hdGNoKWcoXChz
-dWNoKWcoYXMpZyhhKWcoc2luZ2xlKWcocXVvdGF0aW9uKTU5OQoyODg4IHkobWFya1wpLik2
-MiBiIEZyKHBvcHRQYXJzZUFyZ3ZTdHJpbmdcKFwpKXAgRkEoLCkzMwpiIEZyKHBvcHRSZWFk
-Q29uZmlnRmlsZVwoXCkpcCBGQSgsKWcob3IpZyBGcihwb3B0UmVhZERlLSk1OTkKMzAwMCB5
-KGZhdWx0Q29uZmlnXChcKSkyMiBiIEZBKGNhbilpKHIpbihldHVybillKHRoaXMpaShlcnIp
-bihvciktNwpiKC4pMjk5IDMyMTIgeSBGcihQT1BUX0VSUk9SX0JBRE5VTUJFUik1OTkgMzMy
-NCB5IEZBKEEpMzgKYihjb252ZXJzaW9uKWcoZnIpbihvbSlnKGEpZyhzdHJpbmcpZyh0bylo
-KGEpZihudW1iZXIpZihcKClwCkZyKGludCloIEZBKG9yKWcgRnIobG9uZylwIEZBKFwpKWYo
-ZmFpbGVkKWgoZHVlKTU5OSAzNDM2CnkodG8pMjggYih0aGUpZyhzdHJpbmcpZyhjb250YWlu
-aW5nKWYobm9ubnVtZXJpYylmKGNoYXJhY3RlcnMuKTQ3CmIoVGhpcykyOCBiKG9jY3Vycylo
-KHdoZW4pNTk5IDM1NDggeSBGcihwb3B0R2V0TmV4dE9wdFwoXCkpYwpGQShpcylqKHByKW4o
-b2Nlc3NpbmcpZyhhbilmKGFyKW4oZ3VtZW50KWYob2YpaCh0eXBlKWcKRnIoUE9QVF9BUkdf
-SU5UKWYgRkEob3IpNTk5IDM2NjAgeSBGcihQT1BUX0FSR19MT05HKXAKRkEoLikyOTkgMzg3
-MiB5IEZyKFBPUFRfRVJST1JfT1ZFUkZMT1cpNTk5IDM5ODQgeSBGQShBKWcKKHN0cmluZ1wy
-NTV0b1wyNTVudW1iZXIpZihjb252ZXJzaW9uKWcoZmFpbGVkKWcoYmVjYXVzZSloKHRoZSlm
-KG51bWJlcikKZyh3YXMpaCh0b28pNTk5IDQwOTYgeShsYXIpbihnZSk0MSBiKG9yKWgodG9v
-KWcoc21hbGwuKTg4CmIoTGlrZSk0MiBiIEZyKFBPUFRfRVJST1JfQkFETlVNQkVSKXAgRkEo
-LClkKHRoaXMpaihlcnIpbihvcilmKGNhbiloCihvY1wyNTUpNTk5IDQyMDggeShjdXIpMjgg
-Yihvbmx5KWgod2hlbillIEZyKHBvcHRHZXROZXh0T3B0XChcKSlnCkZBKGlzKWkocHIpbihv
-Y2Vzc2luZyloKGFuKWUoYXIpbihndW1lbnQpZyhvZiloKHR5cGUpNTk5CjQzMjAgeSBGcihQ
-T1BUX0FSR19JTlQpMjIgYiBGQShvcilpIEZyKFBPUFRfQVJHX0xPTkcpcApGQSguKXAgZW9w
-CiUlUGFnZTogNDUyIDgKNDUyIDQ3NSBib3AgLTE4NyAtMTE2IGEgRnQoNDUyKTExOCBiIEZM
-KENoYXB0ZXIpMjkgYigyNCk4MwpiIEZ2KFBhcnNpbmcpMjMgYihDb21tYW5kLUxpbmUpZihP
-cHRpb25zKXAgLTE4NyAtNzYgMzQxMwo0IHYgMTExIDgzIGEgRnIoUE9QVF9FUlJPUl9FUlJO
-Tyk0MTEgMTk1IHkgRkEoQSkzNiBiKHN5c3RlbSlnKGNhbGwpZihyKQpuKGV0dXJuZWQpZih3
-aXRoKWgoYW4pZihlcnIpbihvciktNyBiKCwpMzcgYihhbmQpZSBGcihlcnJubylnCkZBKHN0
-aWxsKWcoY29udGFpbnMpZyh0aGUpNDExIDMwNyB5KGVyciluKG9yKTIzIGIoZnIpbihvbSlo
-KHRoZSlmCihzeXN0ZW0paShjYWxsLikzNCBiKEJvdGgpMjQgYiBGcihwb3B0UmVhZENvbmZp
-Z0ZpbGVcKFwpKWQKRkEoYW5kKWogRnIocG9wdFJlYWQtKTQxMSA0MTkgeShEZWZhdWx0Q29u
-ZmlnXChcKSlmIEZBKGNhbilnKHIpbihldHVybikKZyh0aGlzKWgoZXJyKW4ob3IpLTcgYigu
-KTExMSA2NTYgeShUKWUod28pMzggYihmdW5jdGlvbnMpZihhciluKGUpaAooYXZhaWxhYmxl
-KWUodG8paShtYWtlKWcoaXQpZihlYXN5KWgoZm9yKWcoYXBwbGljYXRpb25zKWcodG8pZyhw
-ciluCihvdmlkZSkxMTEgNzY4IHkoZ29vZCkyNSBiKGVyciluKG9yKWUobWVzc2FnZXMuKTEx
-MSAxMDQyCnkgRnIoY29uc3QpNDMgYihjaGFyKWYoKiloKHBvcHRTdHJlcnJvclwoY29uc3Qp
-ZShpbnQpaChlcnJvclwpOyk0MTEKMTE1NCB5IEZBKFRoaXMpMTggYihmdW5jdGlvbilnKHRh
-a2VzKWgoYSlmKHBvcHQpaChlcnIpbihvcilmKGNvZGUpaAooYW5kKWcociluKGV0dXJucyll
-KGEpaShzdHJpbmcpZihkZXNjcmliaW5nKTQxMSAxMjY2CnkodGhlKTI0IGIoZXJyKW4ob3Ip
-LTcgYigsKTIzIGIoanVzdCloKGFzKWcod2l0aClmKHRoZSlnKHN0YW5kYXIpbihkKWkKRnIo
-c3RyZXJyb3JcKFwpKWQgRkEoZnVuY3Rpb24uKTExMSAxNDc4IHkgRnIoY2hhcik0MwpiKCop
-Zyhwb3B0QmFkT3B0aW9uXChwb3B0Q29udGV4dClkKGNvbiwpaShpbnQpaChmbGFnc1wpOyk0
-MTEKMTU5MCB5IEZBKElmKTMyIGIoYW4pZShlcnIpbihvcilnKG9jY3VyciluKGVkKWkoZHVy
-aW5nKWUKRnIocG9wdEdldE5leHRPcHRcKFwpKXAgRkEoLCloKHRoaXMpZyhmdW5jdGlvbiln
-KHIpbihldHVybnMpNDExCjE3MDIgeSh0aGUpMzggYihvcHRpb24pZyh0aGF0KWcoY2F1c2Vk
-KWgodGhlKWUoZXJyKW4ob3IpLTcKYiguKTc3IGIoSWYpMzggYih0aGUpZiBGcihmbGFncylo
-IEZBKGFyKW4oZ3VtZW50KWYoaXMpaShzZXQpZih0byk0MTEKMTgxNCB5IEZyKFBPUFRfQkFE
-T1BUSU9OX05PQUxJQVMpcCBGQSgsKWUodGhlKWkob3V0ZXJtb3N0KWgob3B0aW9uKWYKKGlz
-KWgociluKGV0dXJuZWQuKTc2IGIoT3RoZXIpbihcMjU1KTQxMSAxOTI2IHkod2lzZSwpMzEK
-YiBGcihmbGFncyllIEZBKHNob3VsZCloKGJlKWYoMCwpaShhbmQpZSh0aGUpZyhvcHRpb24p
-aCh0aGF0KWYoaXMpaChyKW4KKGV0dXJuZWQpZihtYXkpaChoYXZlKTQxMSAyMDM4IHkoYmVl
-bikyMyBiKHNwZWNpXDAwMmVkKWkodGhyKW4ob3VnaClkCihhbilpKGFsaWFzLikxMTEgMjI3
-NSB5KFRoZXNlKTE2IGIodHdvKWgoZnVuY3Rpb25zKWYobWFrZSloKHBvcHQpZyhlcnIpCm4o
-b3IpZihoYW5kbGluZylnKHRyaXZpYWwpZihmb3IpaShtb3N0KWgoYXBwbGljYXRpb25zLikx
-MTEKMjM4NyB5KFdoZW4pMjYgYihhbilmKGVyciluKG9yKWcoaXMpaChkZXRlY3RlZClnKGZy
-KW4ob20pZyhtb3N0KWgob2YpZgoodGhlKWYoZnVuY3Rpb25zLCloKGFuKWYoZXJyKW4ob3Ip
-ZyhtZXNzYWdlKWgoaXMpMTExCjI0OTkgeShwcmludGVkKTM1IGIoYWxvbmcpZyh3aXRoKWco
-dGhlKWcoZXJyKW4ob3IpZihzdHJpbmcpaShmciluKG9tKWYKRnIocG9wdFN0cmVycm9yXChc
-KSlwIEZBKC4pNjggYihXaGVuKTM1IGIoYW4pZihlcnIpbihvcikxMTEKMjYxMSB5KG9jY3Vy
-cykyNiBiKGR1cmluZyllKGFyKW4oZ3VtZW50KWgocGFyc2luZywpZyhjb2RlKWcoc2ltaWxp
-YXIpZwoodG8pZyh0aGUpZyhmb2xsb3dpbmcpZihkaXNwbGF5cylpKGEpMTExIDI3MjMgeSh1
-c2VmdWwpZChlcnIpbihvcilnCihtZXNzYWdlLikxMTEgMjkyOSB5IEZxKGZwcmludGZcKHN0
-ZGVyciwpMzQgYigiXDA0NXM6KWgoXDA0NXNcXG4iLCk0MDUKMzAzNyB5KHBvcHRCYWRPcHRp
-b25cKG9wdENvbiwpZChQT1BUX0JBRE9QVElPTl9OT0FMSUFTXCksKTQwNQozMTQ0IHkocG9w
-dFN0cmVycm9yXChyY1wpXCk7KS0xODcgMzQ3NSB5IEZrKDI0LjMpMTMxCmIoT3B0aW9uKTQy
-IGIoQWxpYXNpbmcpcCAtMTg3IDM1NjAgMzQxMyA1IHYgMTExIDM4MjIKYSBGQShPbmUpMjEg
-YihvZiloKHRoZSlmKHByaW1hcnkpZyhiZW5lXDAwMnRzKWYob2YpaSh1c2luZylmKHBvcHQp
-aAoob3ZlcilmIEZyKGdldG9wdFwoXCkpZyBGQShpcyloKHRoZSlmKGFiaWxpdHkpZih0bylp
-KHVzZSkxMTEKMzkzNCB5KG9wdGlvbikzMCBiKGFsaWFzaW5nLik0OSBiKFRoaXMpMjkgYihs
-ZXRzKWgodGhlKWUodXNlciloCihzcGVjaWZ5KWgob3B0aW9ucylnKHRoYXQpZihwb3B0KWgo
-ZXhwYW5kcylnKGludG8pMTExCjQwNDYgeShvdGhlcikyMiBiKG9wdGlvbnMpZyh3aGVuKWYo
-dGhleSloKGFyKW4oZSlmKHNwZWNpXDAwMmVkLikzNQpiKElmKTIyIGIodGhlKWYoc3RhbmRh
-ciluKGQpaShnciluKGVwKWYocHIpbihvZ3JhbSloKG1hZGUpMTExCjQxNTggeSh1c2Upaihv
-ZilnKHBvcHQsKWgodXNlcnMpZihjb3VsZCloKGFkZClmKGEpZyBGcigtLXRleHQpZgpGQShv
-cHRpb24paCh0aGF0KWcoZXhwYW5kZWQpZyh0bylnIEZyKC1pKTQ1IGIoLW4pZygtRSlnKC0y
-KTExMQo0MjcwIHkgRkEodG8pMjUgYihsZXQpZSh0aGVtKWgobW9yKW4oZSlnKGVhc2lseSlm
-KFwwMDJuZCloKGluZm9ybWF0aW9uKQplKGluKWgodGV4dCloKFwwMDJsZXMuKXAgZW9wCiUl
-UGFnZTogNDUzIDkKNDUzIDQ3NiBib3AgMjI5OCAtMTE2IGEgRnYoMjQuMyk4MSBiKE9wdGlv
-bikyMiBiKEFsaWFzaW5nKTExOApiIEZ0KDQ1MylwIDAgLTc2IDM0MTMgNCB2IDI5OSA4NSBh
-IEZ1KDI0LjMuMSk1OCBiKFNwZWNpZnlpbmcpNDAKYihBbGlhc2VzKTI5OSAyOTcgeSBGQShB
-bGlhc2VzKTE4IGIoYXIpbihlKWUobm9ybWFsbHkpaChzcGVjaVwwMDJlZCloCihpbilmKHR3
-bylnKHBsYWNlczopMzIgYigvZXRjL3BvcHQpMTggYihhbmQpZih0aGUpZygucG9wdCloKFww
-MDJsZSlmCihpbikyOTkgNDA5IHkodGhlKTI1IGIodXNlcik3IGIoJ3MpMjUgYihob21lKWgo
-ZGlyKW4oZWN0b3J5KWYoXChmb3VuZClnCih0aHIpbihvdWdoKWcodGhlKWcgRnIoSE9NRSln
-IEZBKGVudmlyKW4ob25tZW50KWYodmFyaWFibGVcKS4pMjk5CjUyMSB5KEJvdGgpMzMgYihc
-MDAybGVzKWgoaGF2ZSllKHRoZSloKHNhbWUpaChmb3JtYXQsKWgoYW4pZShhcmJpdHJhcnkp
-CmYobnVtYmVyKWcob2YpaChsaW5lcylnKGZvcm1hdHRlZCkyOTkgNjMzIHkobGlrZSkyMyBi
-KHRoaXM6KTI5OQo4NDUgeSBGaihhcHBuYW1lKTQyIGIgRnIoYWxpYXMpZyBGaihuZXdvcHRp
-b24pZyhleHBhbnNpb24pMjk5CjEwNTcgeSBGQShUaGUpMjQgYiBGaihhcHBuYW1lKWggRkEo
-aXMpaCh0aGUpZihuYW1lKWcob2YpaCh0aGUpZgooYXBwbGljYXRpb24sKWgod2hpY2gpZSht
-dXN0KWooYmUpZSh0aGUpZyhzYW1lKWgoYXMpZyh0aGUpMjk5CjExNjkgeSBGcihuYW1lKWUg
-RkEocGFyYW1ldGVyKWcocGFzc2VkKWkodG8pZiBGcihwb3B0R2V0Q29udGV4dFwoXCkpcApG
-QSguKTM2IGIoVGhpcykyNCBiKGFsbG93cylnKGVhY2gpZyhcMDAybGUpZyh0bylpKHNwZWNp
-ZnkpMjk5CjEyODEgeShhbGlhc2VzKWUoZm9yKWgobXVsdGlwbGUpZihwciluKG9ncmFtcy4p
-MzcgYihUaGUpMjQKYiBGcihhbGlhcylnIEZBKGtleXdvciluKGQpZyhzcGVjaVwwMDJlcylp
-KHRoYXQpZShhbilnKGFsaWFzKWcoaXMpMjk5CjEzOTMgeShiZWluZyloKGRlXDAwMm5lZDsp
-aShjdXJyKW4oZW50bHkpZihwb3B0KWgoY29uXDAwMmd1cmF0aW9uKWUKKFwwMDJsZXMpaShz
-dXBwb3J0KWcob25seSlmKGFsaWFzZXMsKWgoYnV0KTI5OSAxNTA1IHkob3RoZXIpaQooYWJp
-bGl0aWVzKWgobWF5KWcoYmUpZyhhZGRlZClnKGluKWcodGhlKWcoZnV0dXIpbihlLik1Mgpi
-KFRoZSkyOSBiKG5leHQpaChvcHRpb24pZyhpcylnKHRoZSlnKG9wdGlvbikyOTkgMTYxNwp5
-KHRoYXQpZChzaG91bGQpaChiZSlnKGFsaWFzZWQsKWcoYW5kKWcoaXQpZyhtYXkpZyhiZSlm
-KGVpdGhlcilnKGEpaAooc2hvcnQpZyhvcilmKGEpaChsb25nKWcob3B0aW9uLik0NiBiKFRo
-ZSkyOTkgMTcyOSB5KHIpbihlc3QpMjkKYihvZiloKHRoZSllKGxpbmUpaChzcGVjaVwwMDJl
-cyloKHRoZSllKGV4cGFuc2lvbiloKGZvcilnKHRoZSlnKGFsaWFzLikKNTAgYihJdCkzMCBi
-KGlzKWYocGFyc2VkKWgoc2ltaWxhcmx5KTI5OSAxODQxIHkodG8pZihhKWcoc2hlbGwpZgoo
-Y29tbWFuZCwpaih3aGljaClkKGFsbG93cyloIEZyKFxcKXAgRkEoLCloIEZyKCIpcCBGQSgs
-KWcoYW5kKWYKRnIoJylnIEZBKHRvKWcoYmUpZyh1c2VkKWcoZm9yKWcocXVvdGluZy4pNDkg
-YihJZikyOQpiKGEpMjk5IDE5NTMgeShiYWNrc2xhc2gpMjIgYihpcylnKHRoZSlnKFwwMDJu
-YWwpZihjaGFyYWN0ZXIpZyhvbilnKGEpaAoobGluZSwpZih0aGUpaChuZXh0KWYobGluZSln
-KGluKWgodGhlKWYoXDAwMmxlKWcoaXMpaShhc3N1bWVkKTI5OQoyMDY2IHkodG8pMjggYihi
-ZSlmKGEpZyhsb2dpY2FsKWcoY29udGludWF0aW9uKWYob2YpaSh0aGUpZihsaW5lKWYKKGNv
-bnRhaW5pbmcpaCh0aGUpZyhiYWNrc2xhc2gsKWgoanVzdClnKGFzKWcoaW4pMjk5IDIxNzgK
-eShzaGVsbC4pMjk5IDIzODkgeShUaGUpaShmb2xsb3dpbmcpZyhlbnRyeSloKHdvdWxkKWYo
-YWRkKWkoYSlmCkZyKC0tdGV4dClnIEZBKG9wdGlvbilnKHRvKWgodGhlKWUgRnIoZ3JlcClo
-IEZBKGNvbW1hbmQsKWooYXMpMjk5CjI1MDEgeShzdWdnZXN0ZWQpMjQgYihhdClnKHRoZSlm
-KGJlZ2lubmluZylmKG9mKWkodGhpcylnKHNlY3Rpb24uKTI5OQoyNzEzIHkgRnIoZ3JlcCk0
-MiBiKGFsaWFzKWgoLS10ZXh0KWYoLWkpaCgtbilmKC1FKWgoLTIpMjk5CjMwNjggeSBGdSgy
-NC4zLjIpNTggYihFbmFibGluZykzOSBiKEFsaWFzZXMpMjk5IDMyNzkKeSBGQShBbikyMSBi
-KGFwcGxpY2F0aW9uKWYobXVzdClpKGVuYWJsZSlkKGFsaWFzKWgoZXhwYW5zaW9uKWgoZm9y
-KWcoYSkKZiBGcihwb3B0Q29udGV4dClnIEZBKGJlZm9yKW4oZSlnKGNhbGxpbmcpMjk5IDMz
-OTEgeQpGcihwb3B0R2V0TmV4dEFyZ1woXCkpMzMgYiBGQShmb3IpaSh0aGUpZyhcMDAycnN0
-KWcodGltZS4pNjgKYihUaGVyKW4oZSkzNCBiKGFyKW4oZSlnKHRociluKGVlKWgoZnVuY3Rp
-b25zKWYodGhhdCloKGRlXDAwMm5lKTI5OQozNTAzIHkoYWxpYXNlcykyMyBiKGZvciloKGEp
-Zyhjb250ZXh0LikyOTkgMzc3NyB5IEZyKGludCk0MgpiKHBvcHRSZWFkRGVmYXVsdENvbmZp
-Z1wocG9wdENvbnRleHQpZShjb24sKWkoaW50KWgoZmxhZ3NcKTspNTk5CjM4ODkgeSBGQShU
-aGlzKWQoZnVuY3Rpb24pZihyKW4oZWFkcyloKGFsaWFzZXMpZyhmciluKG9tKWgoL2V0Yy9w
-b3B0KWcKKGFuZClmKHRoZSlnKC5wb3B0KWgoXDAwMmxlKWYoaW4pNTk5IDQwMDIgeSh0aGUp
-MjkgYih1c2VyKTcKYigncykyOSBiKGhvbWUpZyhkaXIpbihlY3RvcnkpLTExIGIoLik1MyBi
-KEN1cnIpbihlbnRseSktMTEKYigsKTI5IGIgRnIoZmxhZ3MpZyBGQShzaG91bGQpaChiZSlm
-IEZyKE5VTEwpcCBGQSgsKWcoYXMpZyhpdCloKGlzKTU5OQo0MTE0IHkocHIpbihvdmlkZWQp
-MjQgYihvbmx5KWcoZm9yKWYoZnV0dXIpbihlKWcoZXhwYW5zaW9uLilwCmVvcAolJVBhZ2U6
-IDQ1NCAxMAo0NTQgNDc3IGJvcCAtMTg3IC0xMTYgYSBGdCg0NTQpMTE4IGIgRkwoQ2hhcHRl
-cikyOSBiKDI0KTgzCmIgRnYoUGFyc2luZykyMyBiKENvbW1hbmQtTGluZSlmKE9wdGlvbnMp
-cCAtMTg3IC03NiAzNDEzCjQgdiAxMTEgODMgYSBGcihpbnQpNDMgYihwb3B0UmVhZENvbmZp
-Z0ZpbGVcKHBvcHRDb250ZXh0KWMoY29uLClrKGNoYXIpCmYoKiloKGZuXCk7KTQxMSAxOTUg
-eSBGQShUaGUpMTcgYihcMDAybGUpaChzcGVjaVwwMDJlZCloKGJ5KWYKRnIoZm4pZyBGQShp
-cylnKG9wZW5lZClnKGFuZClnKHBhcnNlZCloKGFzKWYoYSlnKHBvcHQpaAooY29uXDAwMmd1
-cmF0aW9uKTQxMSAzMDcgeShcMDAybGUuKTY4IGIoVGhpcykzNSBiKGFsbG93cylmKHByKW4o
-b2dyYW1zKQppKHRvKWcodXNlKWYocHIpbihvZ3JhbVwyNTVzcGVjaVwwMDJjKWgoY29uXDAw
-Mmd1cmF0aW9uKTQxMQo0MTkgeShcMDAybGVzLikxMTEgNjMxIHkgRnIoaW50KTQzIGIocG9w
-dEFkZEFsaWFzXChwb3B0Q29udGV4dClkKGNvbiwpagooc3RydWN0KWYocG9wdEFsaWFzKWco
-YWxpYXMsKWcoaW50KWcoZmxhZ3NcKTspNDExIDc0Mwp5IEZBKE9jY2FzaW9uYWxseSktMTEg
-YigsKTM3IGIocHIpbihvY2Vzc2VzKWYod2FudClkKHRvKWgoc3BlY2lmeSlnCihhbGlhc2Vz
-KWcod2l0aG91dClmKGhhdmluZylmKHRvKTQxMSA4NTUgeShyKW4oZWFkKTI0CmIodGhlbSlm
-KGZyKW4ob20paChhKWYoY29uXDAwMmd1cmF0aW9uKWYoXDAwMmxlLikzNCBiKFRoaXMpMjMK
-YihmdW5jdGlvbilmKGFkZHMpaShhKWcobmV3KWUoYWxpYXMpNDExIDk2NyB5KHRvKTM5IGIo
-YSlmKGNvbnRleHQuKTc3CmIoVGhlKTM4IGIgRnIoZmxhZ3MpZiBGQShhciluKGd1bWVudClo
-KHNob3VsZClnKGJlKWYoMCwpNDIKYihhcyljKGl0KWcoaXMpaChjdXJyKW4oZW50bHkpNDEx
-IDEwNzkgeShyKW4oZXNlcnZlZCkyMQpiKGZvcilnKGZ1dHVyKW4oZSllKGV4cGFuc2lvbi4p
-MzMgYihUaGUpMjAgYihuZXcpZyhhbGlhcyloKGlzKWcKKHNwZWNpXDAwMmVkKWcoYXMpaChh
-KWUgRnIoc3RydWN0KTQxMSAxMTkxIHkocG9wdEFsaWFzKXAKRkEoLClqKHdoaWNoKWcoaXMp
-aChkZVwwMDJuZWQpZihhczopNDExIDEzODggeSBGcShzdHJ1Y3QpMzYKYihwb3B0QWxpYXMp
-ZSh7KTU1OCAxNDk2IHkoY2hhcilpKCopaChsb25nTmFtZTspNDM5IGIoLyopMzYKYihtYXkp
-ZyhiZSlnKE5VTEwpZygqLyk1NTggMTYwNCB5KGNoYXIpZyhzaG9ydE5hbWU7KTQ3NgpiKC8q
-KTM2IGIobWF5KWcoYmUpZygnXFwwJylnKCovKTU1OCAxNzEyIHkoaW50KWcoYXJnYzspNTU4
-CjE4MjAgeShjaGFyKWcoKiopaChhcmd2Oyk1NTAgYigvKikzNiBiKG11c3QpZyhiZSlnKGZy
-ZWVcKFwpYWJsZSlmKCovKQo0MTEgMTkyNyB5KH07KTQxMSAyMTM5IHkgRkEoVGhlKWQoXDAw
-MnJzdCloKHR3bylnKGVsZW1lbnRzLClpCkZyKGxvbmdOYW1lKWQgRkEoYW5kKWcgRnIoc2hv
-cnROYW1lKXAgRkEoLClqKHNwZWNpZnkpZSh0aGUpZyhvcHRpb24pNDExCjIyNTEgeSh0aGF0
-KTIzIGIoaXMpZyhhbGlhc2VkLikzMyBiKFRoZSkyMiBiKFwwMDJuYWwpZyh0d28sKWgKRnIo
-YXJnYylmIEZBKGFuZClnIEZyKGFyZ3YpcCBGQSgsKWgoZGVcMDAybmUpZih0aGUpZyhleHBh
-bnNpb24pZyh0byk0MTEKMjM2MyB5KHVzZSlpKHdoZW4pZSh0aGUpaShhbGlhc2VzKWYob3B0
-aW9uKWgoaXMpZyhlbmNvdW50ZXIpbihlZC4pLTE4NwoyNzE2IHkgRmsoMjQuNCkxMzEgYihQ
-YXJzaW5nKTQxIGIoQXJndW1lbnQpZihTdHJpbmdzKXAKLTE4NyAyODAxIDM0MTMgNSB2IDEx
-MSAzMDYzIGEgRkEoQWx0aG91Z2gpMjEgYihwb3B0KWkoaXMpZyh1c3VhbGx5KWUKKHVzZWQp
-aChmb3IpZihwYXJzaW5nKWgoYXIpbihndW1lbnRzKWcoYWxyKW4oZWFkeSlmKGRpdmlkZWQp
-aChpbnRvKTExMQozMTc1IHkoYW4pZSBGcihhcmd2KXAgRkEoXDI1NXN0eWxlKWYoYXJyYXkp
-LTExIGIoLCkyMApiKHNvbWUpaChwciluKG9ncmFtcylnKG5lZWQpZSh0byloKHBhcnNlKWco
-c3RyaW5ncyloKHRoYXQpZShhciluKGUpaAooZm9ybWF0dGVkKTExMSAzMjg3IHkoaWRlbnRp
-Y2FsbHkpMzAgYih0bylnKGNvbW1hbmQpaChsaW5lcy4pNTIKYihUKS05IGIobykzMCBiKGZh
-Y2lsaXRhdGUpZih0aGlzLClqKHBvcHQpZihwciluKG92aWRlcylnKGEpZihmdW5jdGlvbikK
-MTExIDMzOTkgeSh0aGF0KWYocGFyc2VzKWgoYSlnKHN0cmluZylmKGludG8pZyhhbilnKGFy
-cmF5KWYob2YpaAooc3RyaW5nLClpKHVzaW5nKWUocilvKHVsZXMpZyhzaW1pbGlhcilnKHRv
-KWcobm9ybWFsKTExMQozNTEyIHkoc2hlbGwpMjQgYihwYXJzaW5nLikxMTEgMzcxNyB5IEZx
-KCNpbmNsdWRlKTM1CmIoPHBvcHQuaD4pMTExIDM5MzMgeShpbnQpaChwb3B0UGFyc2VBcmd2
-U3RyaW5nXChjaGFyKTMxCmIoKikzNyBiKHMsKWYoaW50KWcoKiloKGFyZ2NQdHIsKWUoY2hh
-ciloKCoqKilnKGFyZ3ZQdHJcKTspMTExCjQxNDUgeSBGQShUaGUpMTkgYihzdHJpbmcpaCBG
-cihzKWcgRkEoaXMpZyhwYXJzZWQpaChpbnRvKWYoYW4pZgpGcihhcmd2KXAgRkEoXDI1NXN0
-eWxlKWgoYXJyYXkpLTExIGIoLikzMiBiKFRoZSkxOSBiKGludGVnZXIpZyhwb2ludGVkKQpo
-KHRvKWcoYnkpZyh0aGUpMTExIDQyNTcgeShzZWNvbmQpMzMgYihwYXJhbWV0ZXIpLTcgYigs
-KTMyCmIgRnIoYXJnY1B0cilwIEZBKCwpaChjb250YWlucyllKHRoZSlnKG51bWJlcilnKG9m
-KWcoZWxlbWVudHMpZwoocGFyc2VkLClqKGFuZCkxMTEgNDM2OSB5KHRoZSljKHBvaW50ZXIp
-aChwb2ludGVkKWYodG8paChieSlnKHRoZSlmCihcMDAybmFsKWYocGFyYW1ldGVyKWgoaXMp
-aChzZXQpZyh0bylnKHBvaW50KWcodG8pZyh0aGUpZihuZXdseSlwCmVvcAolJVBhZ2U6IDQ1
-NSAxMQo0NTUgNDc4IGJvcCAyMTU0IC0xMTYgYSBGdigyNC42KTgyIGIoU2FtcGxlKTIzIGIo
-QXBwbGljYXRpb24pMTE1CmIgRnQoNDU1KXAgMCAtNzYgMzQxMyA0IHYgMjk5IDgzIGEgRkEo
-Y3IpbihlYXRlZCkyOCBiKGFycmF5KS0xMQpiKC4pNDUgYihUaGUpMjcgYihhcnJheSlnKGlz
-KWgoZHluYW1pY2FsbHkpZyhhbGxvY2F0ZWQpZihhbmQpaChzaG91bGQpZgooYmUpaCBGcihm
-cmVlXChcKSlwIEZBKGVkKTI5OSAxOTUgeSh3aGVuKTIyIGIodGhlKWkoYXBwbGljYXRpb24p
-ZihpcyloCihcMDAybmlzaGVkKWYod2l0aClnKGl0LikyOTkgNDA3IHkoVGhlKWkgRnIoYXJn
-dlB0ciloCkZBKGNyKW4oZWF0ZWQpaChieSlmIEZyKHBvcHRQYXJzZUFyZ3ZTdHJpbmdcKFwp
-KWUgRkEoaXMpaihzdWl0YWJsZSlmCih0byloKHBhc3MpZyhkaXIpbihlY3RseSlnKHRvKTI5
-OSA1MTkgeSBGcihwb3B0R2V0Q29udGV4dFwoXCkpcApGQSguKTAgODM4IHkgRmsoMjQuNSkx
-MzIgYihIYW5kbGluZyk0MSBiKEV4dHJhKWYoQXJndW1lbnRzKXAKMCA5MjMgMzQxMyA1IHYg
-Mjk5IDExODUgYSBGQShTb21lKTMzIGIoYXBwbGljYXRpb25zKWYoaW1wbGVtZW50KWgodGhl
-KWYKKGVxdWl2YWxlbnQpZShvZilqKG9wdGlvbilmKGFsaWFzaW5nKWcoYnV0KWcobmVlZCky
-OTkKMTI5NyB5KHRvKTM5IGIoZG8paChzbylnKHRociluKG91Z2gpZShzcGVjaWFsKWkobG9n
-aWMuKTgwCmIoVGhlKTM4IGIgRnIocG9wdFN0dWZmQXJnc1woXCkpZyBGQShmdW5jdGlvbiln
-KGFsbG93cyloKGFuKTI5OQoxNDA5IHkoYXBwbGljYXRpb24pMjQgYih0bylnKGluc2VydClm
-KG5ldylnKGFyKW4oZ3VtZW50cylnKGludG8paCh0aGUpZgooY3VyciluKGVudClnIEZyKHBv
-cHRDb250ZXh0KXAgRkEoLikyOTkgMTYxNSB5IEZxKCNpbmNsdWRlKTM1CmIoPHBvcHQuaD4p
-Mjk5IDE4MzEgeShpbnQpaChwb3B0U3R1ZmZBcmdzXChwb3B0Q29udGV4dCkzMQpiKGNvbiwp
-MzYgYihjaGFyKWYoKiopaShhcmd2XCk7KTI5OSAyMDQyIHkgRkEoVGhlKWsocGFzc2VkKWoK
-RnIoYXJndillIEZBKG11c3QpaChoYXZlKWYoYSloIEZyKE5VTEwpZiBGQShwb2ludGVyKWco
-YXMpaChpdHMpZwooXDAwMm5hbCllKGVsZW1lbnQuKTkwIGIoV2hlbikyOTkgMjE1NCB5IEZy
-KHBvcHRHZXROZXh0T3B0XChcKSkzOQpiIEZBKGlzKWoobmV4dClmKGNhbGxlZCwpayh0aGUp
-YyhcMjIzc3R1ZiluKGZlZFwyMjQpZihhciluKGd1bWVudHMpaAooYXIpbihlKWcodGhlKWco
-XDAwMnJzdClnKHRvKTI5OSAyMjY2IHkoYmUpZyhwYXJzZWQuKTg3CmIocG9wdCk0MyBiKHIp
-bihldHVybnMpZSh0bylnKHRoZSlnKG5vcm1hbClnKGFyKW4oZ3VtZW50cylnKG9uY2UpZyhh
-bGwpCmcodGhlKWcoc3R1ZiluKGZlZCkyOTkgMjM3OCB5KGFyKW4oZ3VtZW50cykyMyBiKGhh
-dmUpZyhiZWVuKWcKKGV4aGF1c3RlZC4pMCAyNzA3IHkgRmsoMjQuNikxMzIgYihTYW1wbGUp
-NDEgYihBcHBsaWNhdGlvbilwCjAgMjc5MiBWIDI5OSAzMDU0IGEgRkEoUm9iaW4sKTI4IGIo
-dGhlKWcoc2FtcGxlKWcoYXBwbGljYXRpb24pZyhvbilnCihwYWdlcyloKDI3NFwyMjYyODEp
-ZChvZilpKENoYXB0ZXIpZigxNSwpaSh1c2VzKWYocG9wdCkyOTkKMzE2NiB5KGZvcikzNiBi
-KGl0cylpKGFyKW4oZ3VtZW50KWUocGFyc2luZy4pNzMgYihJdCkzNwpiKHByKW4ob3ZpZGVz
-KWgoYSllKGdvb2QpaShleGFtcGxlKWYob2YpZyhob3cpZih0aGUpZyhwb3B0KTI5OQozMjc4
-IHkobGlicmFyeSkyMiBiKGlzKWkoZ2VuZXJhbGx5KWYodXNlZC4pMjk5IDM0ODkgeShSUE0s
-KTMxCmIoYSlnKHBvcHVsYXIpZihMaW51eCloKHBhY2thZ2UpZyhtYW5hZ2VtZW50KWYocHIp
-bihvZ3JhbSwpayhtYWtlcylkCihoZWF2eSlmKHVzZSkyOTkgMzYwMiB5KG9mKTIzIGIocG9w
-dCdzKWcoZmVhdHVyKW4oZXMuKTMzCmIoTWFueSkyMyBiKG9mKWcoaXRzKWcoY29tbWFuZFwy
-NTVsaW5lKWYoYXIpbihndW1lbnRzKWcoYXIpbihlKWcKKGltcGxlbWVudGVkKTI5OSAzNzE0
-IHkodGhyKW4ob3VnaCkzMCBiKHBvcHQpaShhbGlhc2VzLClnKHdoaWNoKWUKKG1ha2VzKWgo
-UlBNKWcoYW4pZihleGNlbGxlbnQpZyhleGFtcGxlKWgob2YpZyhob3cpZih0bykyOTkKMzgy
-NiB5KHRha2UpMzYgYihhZHZhbnRhZ2UpZyhvZiloKHRoZSlmKHBvcHQpaShsaWJyYXJ5KS0x
-MQpiKC4pNzMgYihGb3IpMzcgYihtb3IpbihlKWcoaW5mb3JtYXRpb24pZShvbilpKFJQTSwp
-ZihzZWUpMjk5CjM5MzggeShodHRwOi8pLTE0IGIoL3d3dyktOSBiKC5ycG0ub3IpbihnKXAg
-ZW9wCiUlVHJhaWxlcgplbmQKdXNlcmRpY3QgL2VuZC1ob29rIGtub3due2VuZC1ob29rfWlm
-CiUlRU9GCg==
-
---==_Exmh_-1506175120--
-
-
diff --git a/tests/ui-tests/mail-atchmt-svg.msg b/tests/ui-tests/mail-atchmt-svg.msg
deleted file mode 100644
index 53335795b0..0000000000
--- a/tests/ui-tests/mail-atchmt-svg.msg
+++ /dev/null
@@ -1,418 +0,0 @@
-X-Mailer: exmh version 2.0.3
-X-Exmh-Isig-CompType: unknown
-X-Exmh-Isig-Folder: drafts
-To:
-cc:
-Subject:
-Mime-Version: 1.0
-Content-Type: multipart/mixed ;
-	boundary="==_Exmh_280722180"
---------
-This is a multipart MIME message.
-
---==_Exmh_280722180
-Content-Type: text/plain
-
-
-
---==_Exmh_280722180
-Content-Type: application/svg; name="lion.svg"
-Content-Description: lion.svg
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="lion.svg"
-
-PD94bWwgdmVyc2lvbiA9ICIxLjAiIHN0YW5kYWxvbmUgPSAieWVzIj8+CjwhRE9DVFlQRSBz
-dmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgQXByaWwgMTk5OS8vRU4iCiAiaHR0cDovL3d3
-dy53My5vcmcvR3JhcGhpY3MvU1ZHL3N2Zy0xOTk5MDQxMi5kdGQiPgo8c3ZnIHdpZHRoID0g
-IjI0MnB4IiBoZWlnaHQ9IjM4M3B4Ij4KPGcgc3R5bGUgPSAic3Ryb2tlOiAjMDAwMDAwIiA+
-IAo8L2c+IAo8ZyBzdHlsZSA9ICJmaWxsOiAjZjJjYzk5IiA+IAogICA8cG9seWdvbiBwb2lu
-dHMgPSAiIDY5LDE4IDgyLDggOTksMyAxMTgsNSAxMzUsMTIgMTQ5LDIxIDE1NiwxMyAxNjUs
-OSAxNzcsMTMgMTgzLDI4IDE4MCw1MCAxNjQsOTEgMTU1LDEwNyAxNTQsMTE0IDE1MSwxMjEg
-MTQxLDEyNyAxMzksMTM2IDE1NSwyMDYgMTU3LDI1MSAxMjYsMzQyIDEzMywzNTcgMTI4LDM3
-NiA4MywzNzYgNzUsMzY4IDY3LDM1MCA2MSwzNTAgNTMsMzY5IDQsMzY5IDIsMzYxIDUsMzU0
-IDEyLDM0MiAxNiwzMjEgNCwyNTcgNCwyNDQgNywyMTggOSwxNzkgMjYsMTI3IDQzLDkzIDMy
-LDc3IDMwLDcwIDI0LDY3IDE2LDQ5IDE3LDM1IDE4LDIzIDMwLDEyIDQwLDcgNTMsNyA2Miwx
-MiA2OSwxOCA2OSwxOCA2OSwxOCIvPiAKPC9nPiAKPGcgc3R5bGUgPSAiZmlsbDogI2U1YjI3
-ZiIgPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNDIsNzkgMTM2LDc0IDEzOCw4MiAxMzMs
-NzggMTMzLDg0IDEyNyw3OCAxMjgsODUgMTI0LDgwIDEyNSw4NyAxMTksODIgMTE5LDkwIDEy
-NSw5OSAxMjUsOTYgMTI4LDEwMCAxMjgsOTQgMTMxLDk4IDEzMiw5MyAxMzUsOTcgMTM2LDkz
-IDEzOCw5NyAxMzksOTQgMTQxLDk4IDE0Myw5NCAxNDQsODUgMTQyLDc5IDE0Miw3OSAxNDIs
-NzkiLz4gCjwvZz4gCjxnIHN0eWxlID0gImZpbGw6ICNlYjgwODAiID4gCiAgIDxwb2x5Z29u
-IHBvaW50cyA9ICIgMTI3LDEwMSAxMzIsMTAwIDEzNyw5OSAxNDQsMTAxIDE0MywxMDUgMTM1
-LDExMCAxMjcsMTAxIDEyNywxMDEgMTI3LDEwMSIvPiAKPC9nPiAKPGcgc3R5bGUgPSAiZmls
-bDogI2YyY2M5OSIgPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNzgsMjI5IDE1NywyNDgg
-MTM5LDI5NiAxMjYsMzQ5IDEzNywzNTYgMTU4LDM1NyAxODMsMzQyIDIxMiwzMzIgMjM1LDI4
-OCAyMzUsMjYxIDIyOCwyNTIgMjEyLDI1MCAxODgsMjUxIDE3OCwyMjkgMTc4LDIyOSAxNzgs
-MjI5Ii8+IAo8L2c+IAo8ZyBzdHlsZSA9ICJmaWxsOiAjOWM4MjZiIiA+IAogICA8cG9seWdv
-biBwb2ludHMgPSAiIDU2LDIyOSA0OCwyNDEgNDgsMjUwIDU3LDI4MSA2MywzMjUgNzEsMzM4
-IDgxLDMxNSA3NiwzMjEgNzksMzExIDgzLDMwMSA3NSwzMDggODAsMjk4IDczLDMwMyA3Niwy
-OTYgNzEsMjk4IDc0LDI5MiA2OSwyOTMgNzQsMjg0IDc4LDI3OCA3MSwyNzggNzQsMjc0IDY4
-LDI3MyA3MCwyNjggNjYsMjY3IDY4LDI2MSA2MCwyNjYgNjIsMjU5IDY1LDI1MyA1NywyNTgg
-NTksMjUxIDU1LDI1NCA1NSwyNDggNjAsMjM3IDU0LDI0MCA1OCwyMzQgNTQsMjM2IDU2LDIy
-OSA1NiwyMjkgNTYsMjI5Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDc0LDM2MyA3OSwz
-NjggODEsMzY4IDg1LDM2MiA4OSwzNjMgOTIsMzcwIDk2LDM3MyAxMDEsMzcyIDEwOCwzNjEg
-MTEwLDM3MSAxMTMsMzczIDExNiwzNzEgMTIwLDM1OCAxMjIsMzYzIDEyMywzNzEgMTI2LDM3
-MSAxMjksMzY3IDEzMiwzNTcgMTM1LDM2MSAxMzAsMzc2IDEyNywzNzcgOTQsMzc4IDg0LDM3
-NiA3NiwzNzEgNzQsMzYzIDc0LDM2MyA3NCwzNjMiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9
-ICIgMjEyLDI1MCAyMTksMjUxIDIyOCwyNTggMjM2LDI3MCAyMzUsMjg3IDIyNSwzMDQgMjA1
-LDMzMiAxNzcsMzQzIDE3MSwzNTIgMTU4LDM1NyAxNjYsMzUyIDE2OCwzNDYgMTY4LDMzOSAx
-NjUsMzMzIDE1NSwzMjcgMTU1LDMyMyAxNjEsMzIwIDE2NSwzMTYgMTY5LDMxNiAxNjcsMzEy
-IDE3MSwzMTMgMTY4LDMwOCAxNzMsMzA5IDE3MCwzMDYgMTc3LDMwNiAxNzUsMzA4IDE3Nywz
-MTEgMTc0LDMxMSAxNzYsMzE2IDE3MSwzMTUgMTc0LDMxOSAxNjgsMzIwIDE2OCwzMjMgMTc1
-LDMyNyAxNzksMzMyIDE4MywzMjYgMTg0LDMzMiAxODksMzIzIDE5MCwzMjggMTk0LDMyMCAx
-OTQsMzI1IDE5OSwzMTYgMjAxLDMyMCAyMDQsMzEzIDIwNiwzMTYgMjA4LDMxMCAyMTEsMzA1
-IDIxOSwyOTggMjI2LDI4OCAyMjksMjc5IDIyOCwyNjYgMjI0LDI1OSAyMTcsMjUzIDIxMiwy
-NTAgMjEyLDI1MCAyMTIsMjUwIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDE1MSwyMDUg
-MTUxLDIzOCAxNDksMjUyIDE0MSwyNjggMTI4LDI4MiAxMjEsMzAxIDEzMCwzMDAgMTI2LDMx
-MyAxMTgsMzI0IDExNiwzMzcgMTIwLDM0NiAxMzMsMzUyIDEzMywzNDAgMTM3LDMzMyAxNDUs
-MzI5IDE1NiwzMjcgMTUzLDMxOSAxNTMsMjkxIDE1NywyNzEgMTcwLDI1OSAxNzgsMjc3IDE5
-MywyNTAgMTc0LDIxNiAxNTEsMjA1IDE1MSwyMDUgMTUxLDIwNSIvPiAKICAgPHBvbHlnb24g
-cG9pbnRzID0gIiA3OCwxMjcgOTAsMTQyIDk1LDE1NSAxMDgsMTY0IDEyNSwxNjcgMTM5LDE3
-NSAxNTAsMjA2IDE1MiwxOTEgMTQxLDE0MCAxMjEsMTQ4IDEwMCwxMzYgNzgsMTI3IDc4LDEy
-NyA3OCwxMjciLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMjEsNTggMzUsNjMgMzgsNjgg
-MzIsNjkgNDIsNzQgNDAsNzkgNDcsODAgNTQsODMgNDUsOTQgMzQsODEgMzIsNzMgMjQsNjYg
-MjEsNTggMjEsNTggMjEsNTgiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgNzEsMzQgNjcs
-MzQgNjYsMjcgNTksMjQgNTQsMTcgNDgsMTcgMzksMjIgMzAsMjYgMjgsMzEgMzEsMzkgMzgs
-NDYgMjksNDUgMzYsNTQgNDEsNjEgNDEsNzAgNTAsNjkgNTQsNzEgNTUsNTggNjcsNTIgNzYs
-NDMgNzYsMzkgNjgsNDQgNzEsMzQgNzEsMzQgNzEsMzQiLz4gCiAgIDxwb2x5Z29uIHBvaW50
-cyA9ICIgMTM5LDc0IDE0MSw4MyAxNDMsODkgMTQ0LDEwNCAxNDgsMTA0IDE1NSwxMDYgMTU0
-LDg2IDE1Nyw3NyAxNTUsNzIgMTUwLDc3IDE0NCw3NyAxMzksNzQgMTM5LDc0IDEzOSw3NCIv
-PiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMDUsNDQgMTAyLDUzIDEwOCw1OCAxMTEsNjIg
-MTEyLDU1IDEwNSw0NCAxMDUsNDQgMTA1LDQ0Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAi
-IDE0MSw0OCAxNDEsNTQgMTQ0LDU4IDEzOSw2MiAxMzcsNjYgMTM2LDU5IDEzNyw1MiAxNDEs
-NDggMTQxLDQ4IDE0MSw0OCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA5OCwxMzUgMTA0
-LDEzMCAxMDUsMTM0IDEwOCwxMzIgMTA4LDEzNSAxMTIsMTM0IDExMywxMzcgMTE2LDEzNiAx
-MTYsMTM5IDExOSwxMzkgMTI0LDE0MSAxMjgsMTQwIDEzMywxMzggMTQwLDEzMyAxMzksMTQw
-IDEyNiwxNDYgMTA0LDE0NCA5OCwxMzUgOTgsMTM1IDk4LDEzNSIvPiAKICAgPHBvbHlnb24g
-cG9pbnRzID0gIiA5NywxMTYgMTAzLDExOSAxMDMsMTE2IDExMSwxMTggMTE2LDExNyAxMjIs
-MTE0IDEyNywxMDcgMTM1LDExMSAxNDIsMTA3IDE0MSwxMTQgMTQ1LDExOCAxNDksMTIxIDE0
-NSwxMjUgMTQwLDEyNCAxMjcsMTIxIDExMywxMjUgMTAwLDEyNCA5NywxMTYgOTcsMTE2IDk3
-LDExNiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNDcsMzMgMTUyLDM1IDE1NywzNCAx
-NTMsMzEgMTYwLDMxIDE1NiwyOCAxNjEsMjggMTU5LDI0IDE2MywyNSAxNjMsMjEgMTY1LDIy
-IDE3MCwyMyAxNjcsMTcgMTcyLDIxIDE3NCwxOCAxNzUsMjMgMTc2LDIyIDE3NywyOCAxNzcs
-MzMgMTc0LDM3IDE3NiwzOSAxNzQsNDQgMTcxLDQ5IDE2OCw1MyAxNjQsNTcgMTU5LDY4IDE1
-Niw3MCAxNTQsNjAgMTUwLDUxIDE0Niw0MyAxNDQsMzUgMTQ3LDMzIDE0NywzMyAxNDcsMzMi
-Lz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgODUsNzIgODksNzQgOTMsNzUgMTAwLDc2IDEw
-NSw3NSAxMDIsNzkgOTQsNzkgODgsNzYgODUsNzIgODUsNzIgODUsNzIiLz4gCiAgIDxwb2x5
-Z29uIHBvaW50cyA9ICIgODYsMjE0IDc5LDIyMSA3NiwyMzIgODIsMjI1IDc4LDIzOSA4Miwy
-MzQgNzgsMjQ1IDgxLDI0MyA3OSwyNTUgODQsMjUwIDg0LDI2NyA4NywyNTQgOTAsMjcxIDkw
-LDI1NyA5NSwyNzEgOTMsMjU2IDk1LDI0OSA5MiwyNTIgOTMsMjQzIDg5LDI1MyA4OSwyNDEg
-ODYsMjUwIDg3LDIzNiA4MywyNDUgODcsMjMxIDgyLDIzMSA5MCwyMTkgODQsMjIxIDg2LDIx
-NCA4NiwyMTQgODYsMjE0Ii8+IAo8L2c+IAo8ZyBzdHlsZSA9ICJmaWxsOiAjZmZjYzdmIiA+
-IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDkzLDY4IDk2LDcyIDEwMCw3MyAxMDYsNzIgMTA4
-LDY2IDEwNSw2MyAxMDAsNjIgOTMsNjggOTMsNjggOTMsNjgiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgMTQ0LDY0IDE0Miw2OCAxNDIsNzMgMTQ2LDc0IDE1MCw3MyAxNTQsNjQgMTQ5
-LDYyIDE0NCw2NCAxNDQsNjQgMTQ0LDY0Ii8+IAo8L2c+IAo8ZyBzdHlsZSA9ICJmaWxsOiAj
-OWM4MjZiIiA+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDU3LDkxIDQyLDExMSA1MiwxMDUg
-NDEsMTE3IDUzLDExMiA0NiwxMjAgNTMsMTE2IDUwLDEyNCA1NywxMTkgNTUsMTI3IDYxLDEy
-MiA2MCwxMzAgNjcsMTI2IDY2LDEzNCA3MSwxMjkgNzIsMTM2IDc3LDEzMCA3NiwxMzcgODAs
-MTMzIDgyLDEzOCA4NiwxMzUgOTYsMTM1IDk0LDEyOSA4NiwxMjQgODMsMTE3IDc3LDEyMyA3
-OSwxMTcgNzMsMTIwIDc1LDExMiA2OCwxMTYgNzEsMTExIDY1LDExNCA2OSwxMDcgNjMsMTEw
-IDY4LDEwMiA2MSwxMDcgNjYsOTggNjEsMTAzIDYzLDk3IDU3LDk5IDU3LDkxIDU3LDkxIDU3
-LDkxIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDgzLDc5IDc2LDc5IDY3LDgyIDc1LDgz
-IDY1LDg4IDc2LDg3IDY1LDkyIDc2LDkxIDY4LDk2IDc3LDk1IDcwLDk5IDgwLDk4IDcyLDEw
-NCA4MCwxMDIgNzYsMTA4IDg1LDEwMyA5MiwxMDEgODcsOTggOTMsOTYgODYsOTQgOTEsOTMg
-ODUsOTEgOTMsODkgOTksODkgMTA1LDkzIDEwNyw4NSAxMDIsODIgOTIsODAgODMsNzkgODMs
-NzkgODMsNzkiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTA5LDc3IDExMSw4MyAxMDks
-ODkgMTEzLDk0IDExNyw5MCAxMTcsODEgMTE0LDc4IDEwOSw3NyAxMDksNzcgMTA5LDc3Ii8+
-IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEyMiwxMjggMTI3LDEyNiAxMzQsMTI3IDEzNiwx
-MjkgMTM0LDEzMCAxMzAsMTI4IDEyNCwxMjkgMTIyLDEyOCAxMjIsMTI4IDEyMiwxMjgiLz4g
-CiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgNzgsMjcgODIsMzIgODAsMzMgODIsMzYgNzgsMzcg
-ODIsNDAgNzgsNDIgODEsNDYgNzYsNDcgNzgsNDkgNzQsNTAgODIsNTIgODcsNTAgODMsNDgg
-OTEsNDYgODYsNDUgOTEsNDIgODgsNDAgOTIsMzcgODYsMzQgOTAsMzEgODYsMjkgODksMjYg
-NzgsMjcgNzgsMjcgNzgsMjciLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgODIsMTcgOTIs
-MjAgNzksMjEgOTAsMjUgODEsMjUgOTQsMjggOTMsMjYgMTAxLDMwIDEwMSwyNiAxMDcsMzMg
-MTA4LDI4IDExMSw0MCAxMTMsMzQgMTE1LDQ1IDExNywzOSAxMTksNTQgMTIxLDQ2IDEyNCw1
-OCAxMjYsNDcgMTI5LDU5IDEzMCw0OSAxMzQsNTggMTMzLDQ0IDEzNyw0OCAxMzMsMzcgMTM3
-LDQwIDEzMywzMiAxMjYsMjAgMTM1LDI2IDEzMiwxOSAxMzgsMjMgMTM1LDE3IDE0MiwxOCAx
-MzIsMTEgMTE2LDYgOTQsNiA3OCwxMSA5MiwxMiA4MCwxNCA5MCwxNiA4MiwxNyA4MiwxNyA4
-MiwxNyIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNDIsMjM0IDEzMiwyMjcgMTI0LDIy
-MyAxMTUsMjIwIDExMCwyMjUgMTE4LDIyNCAxMjcsMjI5IDEzNSwyMzYgMTIyLDIzNCAxMTUs
-MjM3IDExMywyNDIgMTIxLDIzOCAxMzksMjQzIDEyMSwyNDUgMTExLDI1NCA5NSwyNTQgMTAy
-LDI0NCAxMDQsMjM1IDExMCwyMjkgMTAwLDIzMSAxMDQsMjI0IDExMywyMTYgMTIyLDIxNSAx
-MzIsMjE3IDE0MSwyMjQgMTQ1LDIzMCAxNDksMjQwIDE0MiwyMzQgMTQyLDIzNCAxNDIsMjM0
-Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDExNSwyNTIgMTI1LDI0OCAxMzcsMjQ5IDE0
-MywyNTggMTM0LDI1NSAxMjUsMjU0IDExNSwyNTIgMTE1LDI1MiAxMTUsMjUyIi8+IAogICA8
-cG9seWdvbiBwb2ludHMgPSAiIDExNCwyMTIgMTMwLDIxMyAxNDAsMjE5IDE0NywyMjUgMTQ0
-LDIxNCAxMzcsMjA5IDEyOCwyMDcgMTE0LDIxMiAxMTQsMjEyIDExNCwyMTIiLz4gCiAgIDxw
-b2x5Z29uIHBvaW50cyA9ICIgMTAyLDI2MyAxMDgsMjU4IDExNywyNTcgMTMxLDI1OCAxMTYs
-MjYwIDEwOSwyNjUgMTAyLDI2MyAxMDIsMjYzIDEwMiwyNjMiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgNTEsMjQxIDM1LDIyNCA0MCwyMzggMjMsMjI0IDMxLDI0MiAxOSwyMzkgMjgs
-MjQ3IDE3LDI0NiAyNSwyNTAgMzcsMjU0IDM5LDI2MyA0NCwyNzEgNDcsMjk0IDQ4LDMxNyA1
-MSwzMjggNjAsMzUxIDYwLDMyMyA1MywyNjIgNDcsMjQ2IDUxLDI0MSA1MSwyNDEgNTEsMjQx
-Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDIsMzY0IDksMzY3IDE0LDM2NiAxOCwzNTUg
-MjAsMzY0IDI2LDM2NiAzMSwzNTcgMzUsMzY0IDM5LDM2NCA0MiwzNTcgNDcsMzYzIDUzLDM2
-MCA1OSwzNTcgNTQsMzY5IDcsMzczIDIsMzY0IDIsMzY0IDIsMzY0Ii8+IAogICA8cG9seWdv
-biBwb2ludHMgPSAiIDcsMzQ5IDE5LDM0NSAyNSwzMzkgMTgsMzQxIDIzLDMzMyAyOCwzMjYg
-MjMsMzI2IDI3LDMyMCAyMywzMTYgMjUsMzExIDIwLDI5OCAxNSwyNzcgMTIsMjY0IDksMjQ5
-IDEwLDIyMyAzLDI0OCA1LDI2MSAxNSwzMDcgMTcsMzI2IDExLDM0MyA3LDM0OSA3LDM0OSA3
-LDM0OSIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMSwyMjYgMTUsMjMxIDI1LDIzNiAx
-OCwyMjcgMTEsMjI2IDExLDIyNiAxMSwyMjYiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIg
-MTMsMjE0IDE5LDIxNyAzMiwyMjcgMjMsMjE0IDE2LDIwOCAxNSwxOTAgMjQsMTQ4IDMxLDEy
-MSAyNCwxMzcgMTQsMTcwIDgsMTg5IDEzLDIxNCAxMywyMTQgMTMsMjE0Ii8+IAogICA8cG9s
-eWdvbiBwb2ludHMgPSAiIDIwMiwyNTQgMTk1LDI1OCAxOTksMjYwIDE5MywyNjMgMTk3LDI2
-MyAxOTAsMjY4IDE5NiwyNjggMTkxLDI3MyAxODgsMjgyIDIwMCwyNzIgMTk0LDI3MiAyMDEs
-MjY2IDE5NywyNjUgMjA0LDI2MiAyMDAsMjU4IDIwNCwyNTYgMjAyLDI1NCAyMDIsMjU0IDIw
-MiwyNTQiLz4gCjwvZz4gCjxnIHN0eWxlID0gImZpbGw6ICM4NDU0MzMiID4gCiAgIDxwb2x5
-Z29uIHBvaW50cyA9ICIgMTUxLDIxMyAxNjUsMjEyIDE3OSwyMjUgMTg5LDI0NiAxODcsMjYy
-IDE3OSwyNzUgMTc2LDI2MyAxNzcsMjQ3IDE3MSwyMzMgMTYzLDIzMCAxNjUsMjUxIDE1Nywy
-NjQgMTQ2LDI5OCAxNDUsMzIxIDEzMywzMjYgMTQzLDI4NSAxNTQsMjYwIDE1MywyNDAgMTUx
-LDIxMyAxNTEsMjEzIDE1MSwyMTMiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgOTEsMTMy
-IDk1LDE0NSA5NywxNTQgMTA0LDE0OCAxMDcsMTU1IDEwOSwxNTAgMTExLDE1OCAxMTUsMTUy
-IDExOCwxNTkgMTIwLDE1MyAxMjUsMTYxIDEyNiwxNTUgMTMzLDE2NCAxMzIsMTU0IDEzNywx
-NjMgMTM3LDE1MiAxNDIsMTYzIDE0NywxODYgMTUyLDE5MiAxNDgsMTY3IDE0MSwxNDMgMTI0
-LDE0NSAxMDUsMTQzIDkxLDEzMiA5MSwxMzIgOTEsMTMyIi8+IAo8L2c+IAo8ZyBzdHlsZSA9
-ICJmaWxsOiAjOWM4MjZiIiA+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDMxLDU3IDIzLDUy
-IDI2LDUxIDIwLDQ0IDIzLDQyIDIxLDM2IDIyLDI5IDI1LDIzIDI0LDMyIDMwLDQzIDI2LDQx
-IDMwLDUwIDI2LDQ4IDMxLDU3IDMxLDU3IDMxLDU3Ii8+IAogICA8cG9seWdvbiBwb2ludHMg
-PSAiIDE0NywyMSAxNDksMjggMTU1LDIxIDE2MSwxNiAxNjcsMTQgMTc1LDE1IDE3MywxMSAx
-NjEsOSAxNDcsMjEgMTQ3LDIxIDE0NywyMSIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAx
-ODEsMzkgMTc1LDUxIDE2OSw1NyAxNzEsNjUgMTY1LDY4IDE2NSw3NSAxNjAsNzYgMTYyLDkx
-IDE3MSw3MSAxODAsNTEgMTgxLDM5IDE4MSwzOSAxODEsMzkiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgMTMyLDM0NiAxMzksMzQ4IDE0MSwzNDYgMTQyLDM0MSAxNDcsMzQyIDE0Mywz
-NTUgMTMzLDM1MCAxMzIsMzQ2IDEzMiwzNDYgMTMyLDM0NiIvPiAKICAgPHBvbHlnb24gcG9p
-bnRzID0gIiAxNDYsMzU1IDE1MSwzNTIgMTU1LDM0OCAxNTcsMzQzIDE2MCwzNDkgMTUxLDM1
-NiAxNDcsMzU3IDE0NiwzNTUgMTQ2LDM1NSAxNDYsMzU1Ii8+IAogICA8cG9seWdvbiBwb2lu
-dHMgPSAiIDk5LDI2NiAxMDAsMjgxIDk0LDMwNSA4NiwzMjIgNzgsMzMyIDcyLDM0NiA3Mywz
-MzEgOTEsMjkxIDk5LDI2NiA5OSwyNjYgOTksMjY2Ii8+IAogICA8cG9seWdvbiBwb2ludHMg
-PSAiIDIwLDM0NyAzMiwzNDIgNDUsMzQwIDU0LDM0NSA0NSwzNTAgNDIsMzUzIDM4LDM1MCAz
-MSwzNTMgMjksMzU2IDIzLDM1MCAxOSwzNTMgMTUsMzQ5IDIwLDM0NyAyMCwzNDcgMjAsMzQ3
-Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDc4LDM0NCA4NiwzNDQgOTIsMzQ5IDg4LDM1
-OCA4NCwzNTIgNzgsMzQ0IDc4LDM0NCA3OCwzNDQiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9
-ICIgOTMsMzQ3IDEwNCwzNDQgMTE3LDM0NSAxMjQsMzU0IDEyMSwzNTcgMTE2LDM1MSAxMTIs
-MzUxIDEwOCwzNTUgMTAyLDM1MSA5MywzNDcgOTMsMzQ3IDkzLDM0NyIvPiAKPC9nPiAKPGcg
-c3R5bGUgPSAiZmlsbDogIzAwMDAwMCIgPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMDUs
-MTIgMTExLDE4IDExMywyNCAxMTMsMjkgMTE5LDM0IDExNiwyMyAxMTIsMTYgMTA1LDEyIDEw
-NSwxMiAxMDUsMTIiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTIyLDI3IDEyNSwzNCAx
-MjcsNDMgMTI4LDM0IDEyNSwyOSAxMjIsMjcgMTIyLDI3IDEyMiwyNyIvPiAKICAgPHBvbHln
-b24gcG9pbnRzID0gIiAxMTUsMTMgMTIyLDE5IDEyMiwxNSAxMTMsMTAgMTE1LDEzIDExNSwx
-MyAxMTUsMTMiLz4gCjwvZz4gCjxnIHN0eWxlID0gImZpbGw6ICNmZmU1YjIiID4gCiAgIDxw
-b2x5Z29uIHBvaW50cyA9ICIgMTE2LDE3MiAxMDcsMTgyIDk4LDE5MyA5OCwxODMgOTAsMTk5
-IDg5LDE4OSA4NCwyMDcgODgsMjA2IDg3LDIxNSA5NSwyMDYgOTMsMjE5IDkxLDIzMCA5OCwy
-MTYgOTcsMjI2IDEwNCwyMTQgMTEyLDIwOSAxMDQsMjA4IDExMywyMDIgMTI2LDIwMCAxMzks
-MjA3IDEzMiwxOTggMTQyLDIwMyAxMzQsMTkyIDE0MiwxOTUgMTM0LDE4NyAxNDAsMTg1IDEz
-MCwxODEgMTM2LDE3NyAxMjYsMTc3IDEyNSwxNzEgMTE2LDE4MCAxMTYsMTcyIDExNiwxNzIg
-MTE2LDE3MiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA3NCwyMjAgNjcsMjMwIDY3LDIy
-MSA1OSwyMzUgNjMsMjMzIDYwLDI0OCA3MCwyMzIgNjUsMjQ5IDcxLDI0MyA2NywyNTYgNzMs
-MjUwIDY5LDI2MiA3MywyNTkgNzEsMjY3IDc2LDI2MiA3MiwyNzEgNzgsMjcwIDc2LDI3NSA4
-MiwyNzQgNzgsMjkwIDg2LDI3OSA4NiwyODkgOTIsMjc0IDg4LDI3NSA4NywyNjQgODIsMjcw
-IDgyLDI1OCA3NywyNTcgNzgsMjQ3IDczLDI0NiA3NywyMzMgNzIsMjM2IDc0LDIyMCA3NCwy
-MjAgNzQsMjIwIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEzMywyMzAgMTQ3LDI0MiAx
-NDgsMjUwIDE0NSwyNTQgMTM4LDI0NyAxMjksMjQ2IDE0MiwyNDUgMTM4LDI0MSAxMjgsMjM3
-IDEzNywyMzggMTMzLDIzMCAxMzMsMjMwIDEzMywyMzAiLz4gCiAgIDxwb2x5Z29uIHBvaW50
-cyA9ICIgMTMzLDI2MSAxMjUsMjYxIDExNiwyNjMgMTExLDI2NyAxMjUsMjY1IDEzMywyNjEg
-MTMzLDI2MSAxMzMsMjYxIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEyMSwyNzEgMTA5
-LDI3MyAxMDMsMjc5IDk5LDMwNSA5MiwzMTYgODUsMzI3IDgzLDMzNSA4OSwzNDAgOTcsMzQx
-IDk0LDMzNiAxMDEsMzM2IDk2LDMzMSAxMDMsMzMwIDk3LDMyNyAxMDgsMzI1IDk5LDMyMiAx
-MDksMzIxIDEwMCwzMTggMTEwLDMxNyAxMDUsMzE0IDExMCwzMTIgMTA3LDMxMCAxMTMsMzA4
-IDEwNSwzMDYgMTE0LDMwMyAxMDUsMzAxIDExNSwyOTggMTA3LDI5NSAxMTUsMjk0IDEwOCwy
-OTMgMTE3LDI5MSAxMDksMjg5IDExNywyODYgMTA5LDI4NiAxMTgsMjgzIDExMiwyODEgMTE4
-LDI3OSAxMTQsMjc4IDExOSwyNzYgMTE1LDI3NCAxMjEsMjcxIDEyMSwyNzEgMTIxLDI3MSIv
-PiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA3OSwzNjQgNzQsMzU5IDc0LDM1MyA3NiwzNDcg
-ODAsMzUxIDgzLDM1NiA4MiwzNjAgNzksMzY0IDc5LDM2NCA3OSwzNjQiLz4gCiAgIDxwb2x5
-Z29uIHBvaW50cyA9ICIgOTEsMzYzIDkzLDM1NiA5NywzNTMgMTAzLDM1NSAxMDUsMzYwIDEw
-MywzNjYgOTksMzcxIDk0LDM2OCA5MSwzNjMgOTEsMzYzIDkxLDM2MyIvPiAKICAgPHBvbHln
-b24gcG9pbnRzID0gIiAxMTAsMzU1IDExNCwzNTMgMTE4LDM1NyAxMTcsMzYzIDExMywzNjkg
-MTExLDM2MiAxMTAsMzU1IDExMCwzNTUgMTEwLDM1NSIvPiAKICAgPHBvbHlnb24gcG9pbnRz
-ID0gIiAxMjYsMzU0IDEyMywzNTggMTI0LDM2NyAxMjYsMzY5IDEyOSwzNjEgMTI5LDM1NyAx
-MjYsMzU0IDEyNiwzNTQgMTI2LDM1NCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAzMCwx
-NTQgMjQsMTY2IDIwLDE4MiAyMywxOTQgMjksMjA4IDM3LDIxOCA0MSwyMTAgNDEsMjIzIDQ2
-LDIxNCA0NiwyMjcgNTIsMjE2IDUyLDIyNyA2MSwyMTYgNTksMjI1IDY4LDIxMyA3MywyMTkg
-NzAsMjA3IDc3LDIxMiA2OSwyMDAgNzcsMjAyIDcwLDE5NCA3OCwxOTcgNjgsMTg3IDc2LDE4
-MiA2NCwxODIgNTgsMTc1IDU4LDE4NSA1MywxNzcgNTAsMTg2IDQ2LDE3MSA0NCwxODIgMzks
-MTY3IDM2LDE3MiAzNiwxNjIgMzAsMTY2IDMwLDE1NCAzMCwxNTQgMzAsMTU0Ii8+IAogICA8
-cG9seWdvbiBwb2ludHMgPSAiIDQ0LDEzMCA0MSwxMzcgNDUsMTM2IDQzLDE1MCA0OCwxNDIg
-NDgsMTU3IDUzLDE1MCA1MiwxNjQgNjAsMTU2IDYxLDE2OSA2NCwxNjUgNjYsMTc1IDcwLDE2
-NyA3NCwxNzYgNzcsMTY4IDgwLDE4MyA4NSwxNzIgOTAsMTgyIDkzLDE3NCA5OCwxODEgOTks
-MTczIDEwNCwxNzUgMTA1LDE2OSAxMTQsMTY4IDEwMiwxNjMgOTUsMTU3IDk0LDE2NiA5MCwx
-NTQgODcsMTYyIDgyLDE0OSA3NSwxNTkgNzIsMTQ4IDY4LDE1NSA2NywxNDMgNjIsMTQ4IDYy
-LDEzOCA1OCwxNDUgNTYsMTMzIDUyLDE0MiA1MiwxMjggNDksMTM0IDQ3LDEyNSA0NCwxMzAg
-NDQsMTMwIDQ0LDEzMCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMywyMTYgMTksMjE5
-IDM2LDIzMSAyMiwyMjMgMTYsMjIyIDIyLDIyNyAxMiwyMjQgMTMsMjIwIDE2LDIyMCAxMywy
-MTYgMTMsMjE2IDEzLDIxNiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMCwyMzEgMTQs
-MjM2IDI1LDIzOSAyNywyMzcgMTksMjM0IDEwLDIzMSAxMCwyMzEgMTAsMjMxIi8+IAogICA8
-cG9seWdvbiBwb2ludHMgPSAiIDksMjQ1IDE0LDI0MiAyNSwyNDUgMTMsMjQ1IDksMjQ1IDks
-MjQ1IDksMjQ1Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDMzLDI1NSAyNiwyNTMgMTgs
-MjU0IDI1LDI1NiAxOCwyNTggMjcsMjYwIDE4LDI2MyAyNywyNjUgMTksMjY3IDI5LDI3MCAy
-MSwyNzIgMjksMjc2IDIxLDI3OCAzMCwyODEgMjIsMjgzIDMxLDI4NyAyNCwyODggMzIsMjky
-IDIzLDI5MyAzNCwyOTggMjYsMjk5IDM3LDMwMyAzMiwzMDUgMzksMzA5IDMzLDMwOSAzOSwz
-MTQgMzQsMzE0IDQwLDMxOCAzNCwzMTcgNDAsMzIxIDM0LDMyMSA0MSwzMjYgMzMsMzI2IDQw
-LDMzMCAzMywzMzIgMzksMzMzIDMzLDMzNyA0MiwzMzcgNTQsMzQxIDQ5LDMzNyA1MiwzMzUg
-NDcsMzMwIDUwLDMzMCA0NSwzMjUgNDksMzI1IDQ1LDMyMSA0OCwzMjEgNDUsMzE2IDQ2LDMw
-NiA0NSwyODYgNDMsMjc0IDM2LDI2MSAzMywyNTUgMzMsMjU1IDMzLDI1NSIvPiAKICAgPHBv
-bHlnb24gcG9pbnRzID0gIiA3LDM1OCA5LDM1MSAxNCwzNTEgMTcsMzU5IDExLDM2NCA3LDM1
-OCA3LDM1OCA3LDM1OCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA0NCwzNTQgNDksMzUx
-IDUyLDM1NSA0OSwzNjEgNDQsMzU0IDQ0LDM1NCA0NCwzNTQiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgMzIsMzU3IDM3LDM1MyA0MCwzNTggMzYsMzYxIDMyLDM1NyAzMiwzNTcgMzIs
-MzU3Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEzOSwzMzQgMTQ1LDMzMCAxNTQsMzMw
-IDE1OCwzMzQgMTU0LDM0MSAxNTIsMzQ4IDE0NSwzNTAgMTQ5LDM0MCAxNDcsMzM2IDE0MSwz
-MzkgMTM5LDM0NSAxMzYsMzQyIDEzNiwzMzkgMTM5LDMzNCAxMzksMzM0IDEzOSwzMzQiLz4g
-CiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMjA4LDI1OSAyMTUsMjU5IDIxMiwyNTUgMjIwLDI1
-OSAyMjQsMjYzIDIyNSwyNzQgMjI0LDI4MyAyMjAsMjkyIDIwOCwzMDAgMjA2LDMwOCAyMDMs
-MzA0IDE5OSwzMTUgMTk3LDMwOSAxOTUsMzE4IDE5MywzMTMgMTkwLDMyMiAxOTAsMzE2IDE4
-NSwzMjUgMTgyLDMxOCAxODAsMzI1IDE3MiwzMjEgMTc4LDMyMCAxNzYsMzEzIDE4NiwzMTIg
-MTgwLDMwNyAxODgsMzA3IDE4NCwzMDMgMTkxLDMwMiAxODYsMjk5IDE5NSwyOTQgMTg3LDI5
-MCAxOTcsMjg4IDE5MiwyODYgMjAxLDI4MyAxOTQsMjgwIDIwMywyNzcgMTk4LDI3NSAyMDcs
-MjcxIDIwMCwyNjkgMjA5LDI2NSAyMDQsMjY1IDIxMiwyNjIgMjA4LDI1OSAyMDgsMjU5IDIw
-OCwyNTkiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTA2LDEyNiAxMDYsMTMxIDEwOSwx
-MzIgMTExLDEzNCAxMTUsMTMyIDExNSwxMzUgMTE5LDEzMyAxMTgsMTM3IDEyMywxMzcgMTI4
-LDEzNyAxMzMsMTM0IDEzNiwxMzAgMTM2LDEyNyAxMzIsMTI0IDExOCwxMjggMTEyLDEyOCAx
-MDYsMTI2IDEwNiwxMjYgMTA2LDEyNiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMDcs
-MTE0IDEwMSwxMTAgOTgsMTAyIDEwNSw5NyAxMTEsOTggMTE5LDEwMiAxMjEsMTA4IDExOCwx
-MTIgMTEzLDExNSAxMDcsMTE0IDEwNywxMTQgMTA3LDExNCIvPiAKICAgPHBvbHlnb24gcG9p
-bnRzID0gIiAxNDgsMTA2IDE0NSwxMTAgMTQ2LDExNiAxNTAsMTE4IDE1MiwxMTEgMTUxLDEw
-NyAxNDgsMTA2IDE0OCwxMDYgMTQ4LDEwNiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA4
-MCw1NSA3MCw1MiA3NSw1OCA2Myw1NyA3Miw2MSA1Nyw2MSA2Nyw2NiA1Nyw2NyA2Miw2OSA1
-NCw3MSA2MSw3MyA1NCw3NyA2Myw3OCA1Myw4NSA2MCw4NCA1Niw5MCA2OSw4NCA2Myw4MiA3
-NSw3NiA3MCw3NSA3Nyw3MiA3Miw3MSA3OCw2OSA3Miw2NiA4MSw2NyA3OCw2NCA4Miw2MyA4
-MCw2MCA4Niw2MiA4MCw1NSA4MCw1NSA4MCw1NSIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0g
-IiA4Nyw1NiA5MSw1MiA5Niw1MCAxMDIsNTYgOTgsNTYgOTIsNjAgODcsNTYgODcsNTYgODcs
-NTYiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgODUsNjggODksNzMgOTgsNzYgMTA2LDc0
-IDk2LDczIDkxLDcwIDg1LDY4IDg1LDY4IDg1LDY4Ii8+IAogICA8cG9seWdvbiBwb2ludHMg
-PSAiIDExNSw1NyAxMTQsNjQgMTExLDY0IDExNSw3NSAxMjIsODEgMTIyLDc0IDEyNiw3OSAx
-MjYsNzQgMTMxLDc4IDEzMCw3MiAxMzMsNzcgMTMxLDY4IDEyNiw2MSAxMTksNTcgMTE1LDU3
-IDExNSw1NyAxMTUsNTciLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTQ1LDQ4IDE0Myw1
-MyAxNDcsNTkgMTUxLDU5IDE1MCw1NSAxNDUsNDggMTQ1LDQ4IDE0NSw0OCIvPiAKICAgPHBv
-bHlnb24gcG9pbnRzID0gIiAyNiwyMiAzNCwxNSA0MywxMCA1MiwxMCA1OSwxNiA0NywxNSAz
-MiwyMiAyNiwyMiAyNiwyMiAyNiwyMiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNjAs
-MTkgMTUyLDI2IDE0OSwzNCAxNTQsMzMgMTUyLDMwIDE1NywzMCAxNTUsMjYgMTU4LDI3IDE1
-NywyMyAxNjEsMjMgMTYwLDE5IDE2MCwxOSAxNjAsMTkiLz4gCjwvZz4gCjxnIHN0eWxlID0g
-ImZpbGw6ICMwMDAwMDAiID4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgOTgsMTE3IDEwNSwx
-MjIgMTA5LDEyMiAxMDUsMTE3IDExMywxMjAgMTIxLDEyMCAxMzAsMTEyIDEyOCwxMDggMTIz
-LDEwMyAxMjMsOTkgMTI4LDEwMSAxMzIsMTA2IDEzNSwxMDkgMTQyLDEwNSAxNDIsMTAxIDE0
-NSwxMDEgMTQ1LDkxIDE0OCwxMDEgMTQ1LDEwNSAxMzYsMTEyIDEzNSwxMTYgMTQzLDEyNCAx
-NDgsMTIwIDE1MCwxMjIgMTQyLDEyOCAxMzMsMTIyIDEyMSwxMjUgMTEyLDEyNiAxMDMsMTI1
-IDEwMCwxMjkgOTYsMTI0IDk4LDExNyA5OCwxMTcgOTgsMTE3Ii8+IAogICA8cG9seWdvbiBw
-b2ludHMgPSAiIDE0NiwxMTggMTUyLDExOCAxNTIsMTE1IDE0OSwxMTUgMTQ2LDExOCAxNDYs
-MTE4IDE0NiwxMTgiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTQ4LDExMiAxNTQsMTEx
-IDE1NCwxMDkgMTQ5LDEwOSAxNDgsMTEyIDE0OCwxMTIgMTQ4LDExMiIvPiAKICAgPHBvbHln
-b24gcG9pbnRzID0gIiAxMDYsMTEyIDEwOCwxMTUgMTE0LDExNiAxMTgsMTE0IDEwNiwxMTIg
-MTA2LDExMiAxMDYsMTEyIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEwOCwxMDggMTEx
-LDExMCAxMTYsMTEwIDExOSwxMDggMTA4LDEwOCAxMDgsMTA4IDEwOCwxMDgiLz4gCiAgIDxw
-b2x5Z29uIHBvaW50cyA9ICIgMTA2LDEwNCAxMDksMTA1IDExNywxMDYgMTE1LDEwNCAxMDYs
-MTA0IDEwNiwxMDQgMTA2LDEwNCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA1MCwyNSA0
-MSwyNiAzNCwzMyAzOSw0MyA0OSw1OCAzNiw1MSA0Nyw2OCA1NSw2OSA1NCw1OSA2MSw1NyA3
-NCw0NiA2MCw1MiA2Nyw0MiA1Nyw0OCA2MSw0MCA1NCw0NSA2MCwzNiA1OSwyOSA0OCwzOCA1
-MiwzMCA0NywzMiA1MCwyNSA1MCwyNSA1MCwyNSIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0g
-IiAxNDcsMzQgMTUyLDQxIDE1NSw0OSAxNjEsNTMgMTU3LDQ3IDE2NCw0NyAxNTgsNDMgMTY4
-LDQ0IDE1OSw0MCAxNjQsMzcgMTY5LDM3IDE2NCwzMyAxNjksMzQgMTY1LDI4IDE3MCwzMCAx
-NzAsMjUgMTczLDI5IDE3NSwyNyAxNzYsMzIgMTczLDM2IDE3NSwzOSAxNzIsNDIgMTcyLDQ2
-IDE2OCw0OSAxNzAsNTUgMTYyLDU3IDE1OCw2MyAxNTUsNTggMTUzLDUwIDE0OSw0NiAxNDcs
-MzQgMTQ3LDM0IDE0NywzNCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNTUsNzEgMTU5
-LDgwIDE1Nyw5MyAxNTcsMTAyIDE1NSwxMDggMTUwLDEwMSAxNDksOTMgMTU0LDEwMSAxNTIs
-OTEgMTUxLDgzIDE1NSw3OSAxNTUsNzEgMTU1LDcxIDE1NSw3MSIvPiAKICAgPHBvbHlnb24g
-cG9pbnRzID0gIiAxMTIsNzggMTE1LDgxIDExNCw5MSAxMTIsODcgMTEzLDgyIDExMiw3OCAx
-MTIsNzggMTEyLDc4Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDc4LDI4IDY0LDE3IDU4
-LDExIDQ3LDkgMzYsMTAgMjgsMTYgMjEsMjYgMTgsNDEgMjAsNTEgMjMsNjEgMzMsNjUgMjgs
-NjggMzcsNzQgMzYsODEgNDMsODcgNDgsOTAgNDMsMTAwIDQwLDk4IDM5LDkwIDMxLDgwIDMw
-LDcyIDIyLDcxIDE3LDYxIDE0LDQ2IDE2LDI4IDIzLDE3IDMzLDkgNDUsNiA1NCw2IDY1LDEy
-IDc4LDI4IDc4LDI4IDc4LDI4Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDY3LDE4IDc2
-LDkgODcsNSAxMDEsMiAxMTgsMyAxMzUsOCAxNDksMjAgMTQ5LDI2IDE0NCwxOSAxMzIsMTIg
-MTIxLDkgMTA1LDcgODksOCA3NiwxNCA3MCwyMCA2NywxOCA2NywxOCA2NywxOCIvPiAKICAg
-PHBvbHlnb24gcG9pbnRzID0gIiA1Niw5OCA0OCwxMDYgNTYsMTAzIDQ3LDExMiA1NiwxMTAg
-NTIsMTE1IDU3LDExMyA1MiwxMjEgNjIsMTE1IDU4LDEyMyA2NSwxMTkgNjMsMTI1IDY5LDEy
-MSA2OCwxMjcgNzQsMTI1IDc0LDEyOSA3OSwxMjggODMsMTMyIDk0LDEzNSA5MywxMjkgODUs
-MTI3IDgxLDEyMiA3NiwxMjYgNzUsMTIxIDcxLDEyNCA3MSwxMTcgNjYsMTIxIDY2LDExNyA2
-MiwxMTcgNjQsMTEyIDYwLDExMyA2MCwxMTAgNTcsMTExIDYxLDEwNSA1NywxMDcgNjAsMTAx
-IDU1LDEwMiA1Niw5OCA1Niw5OCA1Niw5OCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAx
-MDEsMTMyIDEwMywxMzggMTA2LDEzNCAxMDYsMTM5IDExMiwxMzYgMTExLDE0MiAxMTUsMTM5
-IDExNCwxNDMgMTE5LDE0MiAxMjUsMTQ1IDEzMSwxNDIgMTM1LDEzOCAxNDAsMTM0IDE0MCwx
-MjkgMTQzLDEzNSAxNDUsMTQ5IDE1MCwxNzEgMTQ5LDE4NCAxNDUsMTY1IDE0MSwxNTAgMTM2
-LDE0NyAxMzIsMTUxIDEzMSwxNDkgMTI2LDE1MiAxMjUsMTUwIDEyMSwxNTIgMTE3LDE0OCAx
-MTEsMTUyIDExMCwxNDggMTA1LDE0OSAxMDQsMTQ1IDk4LDE1MCA5NiwxMzggOTQsMTMyIDk0
-LDEzMCA5OCwxMzIgMTAxLDEzMiAxMDEsMTMyIDEwMSwxMzIiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgNDEsOTQgMzIsMTEwIDIzLDEzMiAxMiwxNjMgNiwxOTAgNywyMTcgNSwyMzYg
-MywyNDcgOSwyMzAgMTIsMjExIDEyLDE4NSAxOCwxNjAgMjYsMTM0IDM1LDExMCA0Myw5OSA0
-MSw5NCA0MSw5NCA0MSw5NCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAzMiwyNDYgNDEs
-MjUwIDUwLDI1NyA1MiwyNjcgNTMsMjk1IDUzLDMyMyA1OSwzNTAgNTQsMzYzIDUxLDM2NSA0
-NCwzNjYgNDIsMzYwIDQwLDM3MiA1NCwzNzIgNTksMzY2IDYyLDM1MyA3MSwzNTIgNzUsMzM1
-IDczLDMzMCA2NiwzMTggNjgsMzAyIDY0LDI5NCA2NywyODggNjMsMjg2IDYzLDI3OSA1OSwy
-NzUgNTgsMjY3IDU2LDI2MiA1MCwyNDcgNDIsMjM1IDQ0LDI0NiAzMiwyMzYgMzUsMjQ0IDMy
-LDI0NiAzMiwyNDYgMzIsMjQ2Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEzNCwzMjQg
-MTQ2LDMyMCAxNTksMzIyIDE3MywzMjcgMTc5LDMzNyAxNzksMzQ5IDE3MiwzNTUgMTU4LDM1
-NyAxNzAsMzUwIDE3NCwzNDMgMTcwLDMzMyAxNjMsMzI4IDE1MiwzMjYgMTM0LDMyOSAxMzQs
-MzI0IDEzNCwzMjQgMTM0LDMyNCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNzMsMzM5
-IDE4MywzMzQgMTg0LDMzOCAxOTEsMzI5IDE5NCwzMzIgMTk5LDMyMyAyMDIsMzI1IDIwNiwz
-MTggMjA5LDMyMCAyMTMsMzA5IDIyMSwzMDMgMjI4LDI5NiAyMzIsMjg5IDIzNCwyNzkgMjMz
-LDI2OSAyMzAsMjYyIDIyNSwyNTYgMjE5LDI1MyAyMDgsMjUyIDE5OCwyNTIgMjEwLDI0OSAy
-MjMsMjUwIDIzMiwyNTcgMjM3LDI2NSAyMzgsMjc3IDIzOCwyOTEgMjMyLDMwNSAyMjEsMzIz
-IDIxOCwzMzUgMjEyLDM0MiAyMDAsMzQ5IDE3OCwzNDggMTczLDMzOSAxNzMsMzM5IDE3Mywz
-MzkiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTY1LDI5NiAxNTgsMzAxIDE1NiwzMTAg
-MTU2LDMyMyAxNjIsMzI0IDE1OSwzMTggMTYyLDMwOCAxNjIsMzA0IDE2NSwyOTYgMTY1LDI5
-NiAxNjUsMjk2Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDk5LDI1MiAxMDUsMjQ0IDEw
-NywyMzQgMTE1LDIyOCAxMjEsMjI4IDEzMSwyMzUgMTIyLDIzMyAxMTMsMjM1IDEwOSwyNDYg
-MTIxLDIzOSAxMzMsMjQzIDEyMSwyNDMgMTEwLDI1MSA5OSwyNTIgOTksMjUyIDk5LDI1MiIv
-PiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMTcsMjUyIDEyNCwyNDcgMTM0LDI0OSAxMzYs
-MjUzIDEyNiwyNTIgMTE3LDI1MiAxMTcsMjUyIDExNywyNTIiLz4gCiAgIDxwb2x5Z29uIHBv
-aW50cyA9ICIgMTE3LDIxOCAxMzIsMjI0IDE0NCwyMzMgMTQwLDIyNSAxMzIsMjE5IDExNywy
-MTggMTE3LDIxOCAxMTcsMjE4Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEyMiwyMTIg
-MTM0LDIxNCAxNDMsMjIxIDE0MSwyMTMgMTMyLDIxMCAxMjIsMjEyIDEyMiwyMTIgMTIyLDIx
-MiIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA2OSwzNTIgNzAsMzYzIDc2LDM3MyA4Niwz
-NzggOTcsMzc5IDEwOCwzNzkgMTIwLDM3NyAxMjgsMzc4IDEzMiwzNzMgMTM1LDM2MSAxMzMs
-MzU4IDEzMiwzNjYgMTI3LDM3NSAxMjEsMzc0IDEyMSwzNjIgMTE5LDM2NyAxMTcsMzc0IDEx
-MCwzNzYgMTEwLDM2MiAxMDcsMzU3IDEwNiwzNzEgMTA0LDM3NSA5NywzNzYgOTAsMzc1IDkw
-LDM2OCA4NiwzNjIgODMsMzY0IDg2LDM2OSA4NSwzNzMgNzgsMzcwIDczLDM2MiA3MSwzNTEg
-NjksMzUyIDY5LDM1MiA2OSwzNTIiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTAwLDM2
-MCA5NiwzNjMgOTksMzY5IDEwMiwzNjQgMTAwLDM2MCAxMDAsMzYwIDEwMCwzNjAiLz4gCiAg
-IDxwb2x5Z29uIHBvaW50cyA9ICIgMTE1LDM2MCAxMTIsMzYzIDExNCwzNjkgMTE3LDM2NCAx
-MTUsMzYwIDExNSwzNjAgMTE1LDM2MCIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxMjcs
-MzYyIDEyNSwzNjQgMTI2LDM2OSAxMjgsMzY1IDEyNywzNjIgMTI3LDM2MiAxMjcsMzYyIi8+
-IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDUsMjU1IDcsMjc2IDExLDMwNCAxNSwzMjAgMTMs
-MzM0IDYsMzQ4IDIsMzUzIDAsMzYzIDUsMzcyIDEyLDM3NCAyNSwzNzIgMzgsMzcyIDQ0LDM2
-OSA0MiwzNjcgMzYsMzY4IDMxLDM2OSAzMCwzNjAgMjcsMzY4IDIwLDM3MCAxNiwzNjEgMTUs
-MzY4IDEwLDM2OSAzLDM2NiAzLDM1OSA2LDM1MiAxMSwzNDggMTcsMzMxIDE5LDMxNiAxMiwy
-OTEgOSwyNzQgNSwyNTUgNSwyNTUgNSwyNTUiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIg
-MTAsMzU4IDcsMzYyIDEwLDM2NiAxMSwzNjIgMTAsMzU4IDEwLDM1OCAxMCwzNTgiLz4gCiAg
-IDxwb2x5Z29uIHBvaW50cyA9ICIgMjUsMzU3IDIyLDM2MCAyNCwzNjYgMjcsMzYwIDI1LDM1
-NyAyNSwzNTcgMjUsMzU3Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDM3LDM1NyAzNCwz
-NjEgMzYsMzY1IDM4LDM2MSAzNywzNTcgMzcsMzU3IDM3LDM1NyIvPiAKICAgPHBvbHlnb24g
-cG9pbnRzID0gIiA0OSwzNTYgNDYsMzU5IDQ3LDM2NCA1MCwzNjAgNDksMzU2IDQ5LDM1NiA0
-OSwzNTYiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTMwLDEwMSAxMzIsMTAyIDEzNSwx
-MDEgMTM5LDEwMiAxNDMsMTAzIDE0MiwxMDEgMTM3LDEwMCAxMzMsMTAwIDEzMCwxMDEgMTMw
-LDEwMSAxMzAsMTAxIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEwNiw0OCAxMDUsNTIg
-MTA4LDU2IDEwOSw1MiAxMDYsNDggMTA2LDQ4IDEwNiw0OCIvPiAKICAgPHBvbHlnb24gcG9p
-bnRzID0gIiAxMzksNTIgMTM5LDU2IDE0MCw2MCAxNDIsNTggMTQxLDU2IDEzOSw1MiAxMzks
-NTIgMTM5LDUyIi8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDI1LDM0OSAyOSwzNTEgMzAs
-MzU1IDMzLDM1MCAzNywzNDggNDIsMzUxIDQ1LDM0NyA0OSwzNDUgNDQsMzQzIDM2LDM0NSAy
-NSwzNDkgMjUsMzQ5IDI1LDM0OSIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiA5OCwzNDcg
-MTA1LDM1MSAxMDcsMzU0IDEwOSwzNDkgMTE1LDM0OSAxMjAsMzUzIDExOCwzNDkgMTEzLDM0
-NiAxMDQsMzQ2IDk4LDM0NyA5OCwzNDcgOTgsMzQ3Ii8+IAogICA8cG9seWdvbiBwb2ludHMg
-PSAiIDgzLDM0OCA4NywzNTIgODcsMzU3IDg5LDM1MSA4NywzNDggODMsMzQ4IDgzLDM0OCA4
-MywzNDgiLz4gCiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTU1LDEwNyAxNjMsMTA3IDE3MCwx
-MDcgMTg2LDEwOCAxNzUsMTA5IDE1NSwxMDkgMTU1LDEwNyAxNTUsMTA3IDE1NSwxMDciLz4g
-CiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTUzLDExNCAxNjIsMTEzIDE3NSwxMTIgMTkyLDEx
-NCAxNzMsMTE0IDE1NCwxMTUgMTUzLDExNCAxNTMsMTE0IDE1MywxMTQiLz4gCiAgIDxwb2x5
-Z29uIHBvaW50cyA9ICIgMTUyLDExOCAxNjQsMTIwIDE4MCwxMjMgMTk3LDEyOSAxNjksMTIz
-IDE1MSwxMjAgMTUyLDExOCAxNTIsMTE4IDE1MiwxMTgiLz4gCiAgIDxwb2x5Z29uIHBvaW50
-cyA9ICIgNjgsMTA5IDg3LDEwNiAxMDcsMTA2IDEwNiwxMDggODgsMTA4IDY4LDEwOSA2OCwx
-MDkgNjgsMTA5Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDEwNSwxMTEgOTUsMTEyIDc5
-LDExNCA3MSwxMTYgODUsMTE1IDEwMiwxMTMgMTA1LDExMSAxMDUsMTExIDEwNSwxMTEiLz4g
-CiAgIDxwb2x5Z29uIHBvaW50cyA9ICIgMTA4LDEwMSA5OCw5OSA4Nyw5OSA3OCw5OSA5Mywx
-MDAgMTA1LDEwMiAxMDgsMTAxIDEwOCwxMDEgMTA4LDEwMSIvPiAKICAgPHBvbHlnb24gcG9p
-bnRzID0gIiA4NSw2MyA5MSw2MyA5Nyw2MCAxMDQsNjAgMTA4LDYyIDExMSw2OSAxMTIsNzUg
-MTEwLDc0IDEwOCw3MSAxMDMsNzMgMTA2LDY5IDEwNSw2NSAxMDMsNjQgMTAzLDY3IDEwMiw3
-MCA5OSw3MCA5Nyw2NiA5NCw2NyA5Nyw3MiA4OCw2NyA4NCw2NiA4NSw2MyA4NSw2MyA4NSw2
-MyIvPiAKICAgPHBvbHlnb24gcG9pbnRzID0gIiAxNDAsNzQgMTQxLDY2IDE0NCw2MSAxNTAs
-NjEgMTU2LDYyIDE1Myw3MCAxNTAsNzMgMTUyLDY1IDE1MCw2NSAxNTEsNjggMTQ5LDcxIDE0
-Niw3MSAxNDQsNjYgMTQzLDcwIDE0Myw3NCAxNDAsNzQgMTQwLDc0IDE0MCw3NCIvPiAKICAg
-PHBvbHlnb24gcG9pbnRzID0gIiAxNDYsMjAgMTU2LDExIDE2Myw5IDE3Miw5IDE3OCwxNCAx
-ODIsMTggMTg0LDMyIDE4Miw0MiAxODIsNTIgMTc3LDU4IDE3Niw2NyAxNzEsNzYgMTY1LDkw
-IDE1NywxMDUgMTYwLDkyIDE2NCw4NSAxNjgsNzggMTY3LDczIDE3Myw2NiAxNzIsNjIgMTc1
-LDU5IDE3NCw1NSAxNzcsNTMgMTgwLDQ2IDE4MSwyOSAxNzksMjEgMTczLDEzIDE2NiwxMSAx
-NTksMTMgMTUzLDE4IDE0OCwyMyAxNDYsMjAgMTQ2LDIwIDE0NiwyMCIvPiAKICAgPHBvbHln
-b24gcG9pbnRzID0gIiAxNTAsMTg3IDE0OCwyMTEgMTUwLDIzMyAxNTMsMjQ3IDE0OCwyNjcg
-MTM1LDI4MyAxMjUsMjk5IDEzNiwyOTIgMTMxLDMxMyAxMjIsMzI4IDEyMiwzNDUgMTI5LDM1
-MiAxMzMsMzU5IDEzMywzNjcgMTM3LDM1OSAxNDgsMzU2IDE0MCwzNTAgMTMxLDM0NyAxMjks
-MzQwIDEzMiwzMzIgMTQwLDMyOCAxMzcsMzIyIDE0MCwzMDQgMTU0LDI2NSAxNTcsMjQ0IDE1
-NSwyMjMgMTYxLDIyMCAxNzUsMjI5IDE4NiwyNDcgMTg1LDI2MCAxNzYsMjc1IDE3OCwyODcg
-MTg1LDI3NyAxODgsMjYxIDE5NiwyNTMgMTg5LDIzNiAxNzQsMjEzIDE1MCwxODcgMTUwLDE4
-NyAxNTAsMTg3Ii8+IAogICA8cG9seWdvbiBwb2ludHMgPSAiIDE0NywzMzggMTQyLDM0MSAx
-NDMsMzQ1IDE0MSwzNTQgMTQ3LDM0MyAxNDcsMzM4IDE0NywzMzggMTQ3LDMzOCIvPiAKICAg
-PHBvbHlnb24gcG9pbnRzID0gIiAxNTcsMzQyIDE1NiwzNDkgMTUwLDM1NiAxNTcsMzUzIDE2
-MywzNDYgMTYyLDM0MiAxNTcsMzQyIDE1NywzNDIgMTU3LDM0MiIvPiAKICAgPHBvbHlnb24g
-cG9pbnRzID0gIiA5OSwyNjUgOTYsMjg0IDkyLDI5OSA3MywzMzkgNzMsMzMzIDg3LDMwMCA5
-OSwyNjUgOTksMjY1IDk5LDI2NSIvPiAKPC9nPjwvc3ZnPgoNCg==
-
---==_Exmh_280722180--
-
-
diff --git a/tests/ui-tests/message-browser.c b/tests/ui-tests/message-browser.c
deleted file mode 100644
index fb12b959d9..0000000000
--- a/tests/ui-tests/message-browser.c
+++ /dev/null
@@ -1,819 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*--------------------------------*-C-*---------------------------------*
- *
- *  Copyright 2000, Matt Loper <matt@helixcode.com>.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- *----------------------------------------------------------------------*/
-
-#include <gnome.h>
-#include <camel/camel.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/gmime-utils.h>
-#include "../../mail/html-stream.h"
-#include <camel/camel-formatter.h>
-
-/* gtkhtml stuff */
-#include <gtkhtml/gtkhtml.h>
-
-/* corba/bonobo stuff */
-#include <bonobo.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo/bonobo-stream-memory.h>
-
-#include <widgets/e-paned/e-hpaned.h>
-
-static void
-print_usage_and_quit()
-{
-	g_print ("Usage: message-browser [FILENAME]\n");
-	g_print ("Where FILENAME is the filename of a mime message "); 
-	g_print ("in \"message/rfc822\" format.\n");
-	exit (0);
-}
-
-
-/*----------------------------------------------------------------------*
- *      Filling out the tree control view of a mime-message
- *----------------------------------------------------------------------*/
-
-static void
-handle_tree_item (CamelDataWrapper* object, GtkWidget* tree_ctrl)
-{
-	GtkWidget* tree_item;
-	gchar* label = gmime_content_field_get_mime_type (object->mime_type);
-
-	CamelDataWrapper* containee;
-	GtkWidget* containee_tree_item;
-	gchar* containee_label;
-	      
-	GtkWidget* subtree = NULL;
-
-	tree_item = gtk_tree_item_new_with_label (label);
-	gtk_object_set_data (GTK_OBJECT (tree_item),
-			     "camel_data_wrapper", object);
-	gtk_tree_append (GTK_TREE (tree_ctrl), tree_item);
-
-	gtk_widget_show(tree_item);
-
-	/* If our object is a leaf, we're done */
-	if (!CAMEL_IS_MEDIUM (object))
-		return;
-
-	containee = 
-		camel_medium_get_content_object (
-			CAMEL_MEDIUM (object));
-	
-	g_assert (containee);
-
-	/* If it is a container, insert its contents into the tree */
-	containee_label = camel_data_wrapper_get_mime_type (containee);
-
-	subtree = gtk_tree_new();
-
-	containee_tree_item =
-		gtk_tree_item_new_with_label (containee_label);
-	gtk_object_set_data (GTK_OBJECT (containee_tree_item),
-			     "camel_data_wrapper",
-			     containee);		
-	gtk_tree_append (GTK_TREE (subtree), containee_tree_item);
-
-	gtk_tree_item_set_subtree (GTK_TREE_ITEM(tree_item),
-				   GTK_WIDGET (subtree));
-	gtk_widget_show(containee_tree_item);
-
-	if (CAMEL_IS_MULTIPART (containee))
-	{
-		CamelMultipart* multipart =
-			CAMEL_MULTIPART (containee);
-		int max_multiparts =
-			camel_multipart_get_number (multipart);
-		int i;
-	      
-		if (max_multiparts > 0) {
-			subtree = gtk_tree_new();
-			gtk_tree_item_set_subtree (
-				GTK_TREE_ITEM(containee_tree_item),
-				GTK_WIDGET (subtree));
-		}
-	      
-		for (i = 0; i < max_multiparts; i++) {
-			CamelMimeBodyPart* body_part =
-				camel_multipart_get_part (
-					multipart, i);
-		
-			handle_tree_item (
-				CAMEL_DATA_WRAPPER (body_part),
-				GTK_WIDGET (subtree));
-		}
-			
-	}
-	gtk_tree_item_expand (
-		GTK_TREE_ITEM (containee_tree_item));
-	gtk_tree_item_expand (GTK_TREE_ITEM (tree_item));		
-}
-
-static GtkWidget*
-get_gtk_html_contents_window (CamelDataWrapper* data);
-
-static void
-tree_selection_changed( GtkWidget *tree )
-{
-	GList *i;
-  
-	i = GTK_TREE_SELECTION(tree);
-	while (i){
-		gchar*     name;
-		GtkLabel*  label;
-		GtkWidget* item;
-		CamelDataWrapper* camel_data_wrapper;
-		
-		/* Get a GtkWidget pointer from the list node */
-		item = GTK_WIDGET (i->data);
-		camel_data_wrapper =
-			gtk_object_get_data (GTK_OBJECT (item),
-					     "camel_data_wrapper");
-
-		g_assert (camel_data_wrapper);
-		get_gtk_html_contents_window (camel_data_wrapper);
-		
-		label = GTK_LABEL (GTK_BIN (item)->child);
-		gtk_label_get (label, &name);
-		g_print ("\t%s on level %d\n", name, GTK_TREE
-			 (item->parent)->level);
-		i = i->next;
-	}
-}
-
-static GtkWidget*
-get_message_tree_ctrl (CamelMimeMessage* message)
-{
-	static GtkWidget* scroll_wnd = NULL;
-	static GtkWidget* tree_ctrl = NULL;
-
-	/* create the tree control, if it doesn't exist already */
-	if (!tree_ctrl) {
-
-		tree_ctrl = gtk_tree_new ();
-
-		gtk_signal_connect (GTK_OBJECT(tree_ctrl),
-				    "selection_changed",
-				    GTK_SIGNAL_FUNC(tree_selection_changed),
-				    tree_ctrl);
-		
-		scroll_wnd = gtk_scrolled_window_new (NULL,NULL);
-		
-		gtk_scrolled_window_add_with_viewport (
-			GTK_SCROLLED_WINDOW(scroll_wnd),
-			tree_ctrl);
-
-		gtk_widget_set_usize (scroll_wnd, 225, 200);
-	}
-	else
-		gtk_tree_clear_items (GTK_TREE (tree_ctrl), 0, 1);
-	
-
-        /* Recursively insert tree items in the tree */
-	if (message)
-		handle_tree_item (CAMEL_DATA_WRAPPER (message), tree_ctrl);
-        gtk_scrolled_window_set_policy (
-		GTK_SCROLLED_WINDOW (scroll_wnd),
-		GTK_POLICY_AUTOMATIC,
-		GTK_POLICY_AUTOMATIC);	
-	return scroll_wnd;
-}
-
-static CamelMimeMessage*
-filename_to_camel_msg (gchar* filename)
-{
-	CamelMimeMessage* message;
-	CamelStream* input_stream;
-
-	camel_init();
-	
-	input_stream = camel_stream_fs_new_with_name (
-		filename, CAMEL_STREAM_FS_READ);
-
-	if (!input_stream) 
-		return NULL;
-
-	message = camel_mime_message_new ();
-	
-	camel_data_wrapper_set_input_stream (
-		CAMEL_DATA_WRAPPER (message), input_stream);
-
-	return message;
-}
-
-/*----------------------------------------------------------------------*
- *           Filling out the HTML view of a mime message
- *----------------------------------------------------------------------*/
-
-static void
-data_wrapper_to_html (CamelDataWrapper *msg, gchar** body_string)
-{
-	CamelFormatter* cmf = camel_formatter_new();
-	CamelStream* body_stream =
-		camel_stream_mem_new (CAMEL_STREAM_FS_WRITE);
-
-	g_assert (body_string);
-
-	camel_formatter_wrapper_to_html (
-		cmf, msg, body_stream);
-
-	*body_string = g_strndup (
-		CAMEL_STREAM_MEM (body_stream)->buffer->data,
-		CAMEL_STREAM_MEM (body_stream)->buffer->len);
-}
-
-static void
-mime_message_header_to_html (CamelMimeMessage *msg, gchar** header_string)
-{
-	CamelFormatter* cmf = camel_formatter_new();
-	CamelStream* header_stream =
-		camel_stream_mem_new (CAMEL_STREAM_FS_WRITE);
-
-	g_assert (header_string);
-
-	camel_formatter_mime_message_to_html (
-		cmf, CAMEL_MIME_MESSAGE (msg), header_stream, NULL);
-
-	*header_string = g_strndup (
-		CAMEL_STREAM_MEM (header_stream)->buffer->data,
-		CAMEL_STREAM_MEM (header_stream)->buffer->len);
-}
-
-
-static void
-on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
-{
-	GtkWidget* message_box;
-	CamelStream *stream;
-	CamelStream *save_stream;
-	gchar tmp_buffer[4096];
-	gint nb_bytes_read;
-	
-	gchar* message =
-		g_strdup_printf ("You have clicked on this link:\n%s", url);
-
-	if (sscanf (url, "camel://%p", &stream))
-	{
-		save_stream =
-			camel_stream_fs_new_with_name ("saved-file",
-						       CAMEL_STREAM_FS_WRITE);
-	
-
-		do {
-	  
-			/* read next chunk of text */
-			nb_bytes_read = camel_stream_read (stream,
-							   tmp_buffer,
-							   4096);
-			
-			/* If there's any text, write it to the stream */
-			if (nb_bytes_read > 0) {
-				camel_stream_write (save_stream,
-						    tmp_buffer,
-						    nb_bytes_read);
-			}
-			
-			
-		} while (!camel_stream_eos (stream));
-		
-		camel_stream_close (save_stream);
-	}
-	    
-	message_box = gnome_message_box_new (message,
-					     GNOME_MESSAGE_BOX_INFO,
-					     "Okay", NULL);
-	
-	gnome_dialog_set_default (GNOME_DIALOG (message_box), 1);
-	gnome_dialog_run (GNOME_DIALOG (message_box));
-	g_free (message);
-}
-
-/*
- * As a page is being loaded, gtkhtml will come across a few types of
- * tags that it understands (like <img src="foo">). In these cases, it
- * will simply ask us to stream the data to it.
- */
-static void
-on_url_data_requested (GtkHTML *html, const gchar *url, GtkHTMLStreamHandle handle, gpointer data)
-{
-	CamelStream *stream;
-	
-	printf ("url _%s_ (%p) requested\n", url, url);
-
-	if (sscanf (url, "camel://%p", &stream) == 1)
-	{		
-		gchar tmp_buffer[4096];
-		do {
-			gint nb_bytes_read;
-
-			/* read next chunk of text */
-			nb_bytes_read = camel_stream_read (stream,
-							   tmp_buffer,
-							   4096);
-			
-			/* If there's any text, write it to the stream */
-			if (nb_bytes_read > 0) {
-				gtk_html_write (html, handle, tmp_buffer, nb_bytes_read);
-			}
-			
-			
-		} while (!camel_stream_eos (stream));
-		
-		
-	}
-
-}
-
-
-static gboolean
-hydrate_persist_stream_from_gstring (Bonobo_PersistStream persist_stream,
-				     GString* gstr)
-{
-	CORBA_Environment ev;
-	BonoboStream* mem_stream =
-		bonobo_stream_mem_create (gstr->str, gstr->len, TRUE, FALSE);
-        /*
-	 * If the component doesn't support
-	 * PersistStream, then we destroy the
-	 * stream we created and bail.
-	 */
-	if (persist_stream == CORBA_OBJECT_NIL) {
-		gnome_warning_dialog (_("The component now claims that it "
-					"doesn't support PersistStream!"));
-		bonobo_object_unref (BONOBO_OBJECT (mem_stream));
-		return FALSE;
-	}
-				
-	CORBA_exception_init (&ev);
-
-	/*
-	 * Load the file into the component using PersistStream.
-	 */
-	Bonobo_PersistStream_load (persist_stream,
-				   (Bonobo_Stream) bonobo_object_corba_objref (BONOBO_OBJECT (mem_stream)),
-				   &ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (mem_stream));
-				
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		gnome_warning_dialog (_("An exception occured while trying "
-					"to load data into the component with "
-					"PersistStream"));
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-	return TRUE;
-}
-
-static GString*
-camel_stream_to_gstring (CamelStream* stream)
-{
-	gchar tmp_buffer[4097];
-	GString *tmp_gstring = g_string_new ("");
-
-	do { /* read next chunk of text */
-			
-		gint nb_bytes_read;
-			
-		nb_bytes_read = camel_stream_read (stream,
-						   tmp_buffer,
-						   4096);
-		tmp_buffer [nb_bytes_read] = '\0';
-
-                /* If there's any text, append it to the gstring */
-		if (nb_bytes_read > 0) {
-			tmp_gstring = g_string_append (tmp_gstring, tmp_buffer);
-		}
-			
-	} while (!camel_stream_eos (stream));
-
-	return tmp_gstring;
-}
-
-
-/*
- * As a page is loaded, when gtkhtml comes across <object> tags, this
- * callback is invoked. The GtkHTMLEmbedded param is a GtkContainer;
- * our job in this function is to simply add a child widget to it.
- */
-static void
-on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, void *unused)
-{
-	CamelStream *stream;
-	GString *camel_stream_gstr;
-
-	GtkWidget *bonobo_embeddable;
-	BonoboObjectClient* server;
-	Bonobo_PersistStream persist;	
-	CORBA_Environment ev;
-	gchar *uid = gtk_html_embedded_get_parameter (eb, "uid");
-
-	/* Both the classid (which specifies which bonobo object to
-         * fire up) and the uid (which tells us where to find data to
-         * persist from) must be available; if one of them isn't,
-         * print an error and bail. */
-	if (!uid || !eb->classid) {
-		printf ("on_object_requested: couldn't find %s%s%s\n",
-			uid?"a uid":"",
-			(!uid && !eb->classid)?" or ":"",
-			eb->classid?"a classid":"");
-		return;
-	}
-	printf ("object requested : %s\n", eb->classid);
-     	printf ("UID = %s\n", uid);
-
-	/* Try to get a server with goadid specified by eb->classid */
-	bonobo_embeddable = bonobo_widget_new_subdoc  (eb->classid, NULL);
-	server = bonobo_widget_get_server (BONOBO_WIDGET (bonobo_embeddable));
-	if (!server) {
-		printf ("Couldn't get the server for the bonobo embeddable\n");
-		return;
-	}
-
-	/* The UID should be a pointer to a CamelStream */
-	if (sscanf (uid, "camel://%p", &stream) != 1) {
-		printf ("Couldn't get a pointer from url \"%s\"\n", uid);
-		gtk_object_unref (GTK_OBJECT (bonobo_embeddable));
-		
-		return;
-	}
-
-	/* Try to get a PersistStream interface from the server;
-	   if it doesn't support that interface, bail. */
-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
-		server,
-		"IDL:Bonobo/PersistStream:1.0",
-		NULL);
-
-	if (persist == CORBA_OBJECT_NIL) {
-		gchar* msg = g_strdup_printf (
-			_("The %s component doesn't support PersistStream!\n"),
-			uid);
-		
-		gnome_warning_dialog (msg);
-		gtk_object_unref (GTK_OBJECT (bonobo_embeddable));
-		
-		return;
-	}
-
-	/* Hydrate the PersistStream from the CamelStream */
-	camel_stream_gstr = camel_stream_to_gstring (stream);	
-	printf ("on_object_requested: The CamelStream has %d elements\n",
-		camel_stream_gstr->len);
-	hydrate_persist_stream_from_gstring (persist, camel_stream_gstr);
-	
-	/* Give our new window to the container */
-	gtk_widget_show (bonobo_embeddable);
-	gtk_container_add (GTK_CONTAINER(eb), bonobo_embeddable);
-	
-	/* Destroy the PersistStream object.*/
-	CORBA_exception_init (&ev);
-	Bonobo_Unknown_unref (persist, &ev);
-	CORBA_Object_release (persist, &ev);
-	CORBA_exception_free (&ev);				
-
-	g_string_free (camel_stream_gstr, TRUE);
-}
-
-
-
-
-static GtkWidget*
-get_gtk_html_contents_window (CamelDataWrapper* data)
-{
-	static GtkWidget* frame_wnd = NULL;
-	static GtkWidget* scroll_wnd = NULL;
-	static GtkWidget* html_widget = NULL;
-	HTMLStream* html_stream;
-	gchar *body_string;
-
-	/* create the html widget and scroll window, if they haven't
-           already been created */
-	if (!html_widget) {
-		html_widget = gtk_html_new();
-
-		gtk_signal_connect (GTK_OBJECT (html_widget),
-				    "link_clicked",
-				    GTK_SIGNAL_FUNC (on_link_clicked),
-				    NULL);		
-
-		gtk_signal_connect (GTK_OBJECT (html_widget),
-				    "url_requested",
-				    GTK_SIGNAL_FUNC (on_url_data_requested),
-				    NULL);		
-		gtk_signal_connect (GTK_OBJECT (html_widget), 
-				    "object_requested",
-				    GTK_SIGNAL_FUNC (on_object_requested), 
-				    NULL);
-
-		scroll_wnd = gtk_scrolled_window_new (NULL, NULL);
-		gtk_container_add (GTK_CONTAINER (scroll_wnd), html_widget);
-	}
-
-	if (data) {
-		
-		html_stream =
-			HTML_STREAM (html_stream_new (GTK_HTML (html_widget)));
-
-		/* turn the mime message into html, and
-		   write it to the html stream */
-		data_wrapper_to_html (data, &body_string);
-		
-		camel_stream_write (CAMEL_STREAM (html_stream),
-				    body_string,
-				    strlen (body_string));
-		
-		camel_stream_close (CAMEL_STREAM (html_stream));
-		
-		g_free (body_string);
-	}
-	
-
-	if (!frame_wnd) {
-		
-		frame_wnd = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (
-			GTK_FRAME (frame_wnd), GTK_SHADOW_IN);
-		
-		gtk_widget_set_usize (scroll_wnd, 500, 400);
-		gtk_scrolled_window_set_policy (
-			GTK_SCROLLED_WINDOW (scroll_wnd),
-			GTK_POLICY_AUTOMATIC,
-			GTK_POLICY_AUTOMATIC);
-		
-		gtk_container_add (GTK_CONTAINER (frame_wnd), scroll_wnd);
-	}
-	
-	return frame_wnd;
-}
-
-
-static GtkWidget*
-get_gtk_html_header_window (CamelMimeMessage* mime_message)
-{
-	static GtkWidget* frame_wnd = NULL;
-	static GtkWidget* scroll_wnd = NULL;	
-	static GtkWidget* html_widget = NULL;
-	HTMLStream*       html_stream;
-	gchar*            header_string;
-
-        /* create the html widget and scroll window, if they haven't
-           already been created */
-	if (!html_widget) {
-		html_widget = gtk_html_new();
-		scroll_wnd = gtk_scrolled_window_new (NULL, NULL);
-		gtk_container_add (GTK_CONTAINER (scroll_wnd), html_widget);
-	}
-
-	if (mime_message) {
-		
-		html_stream =
-			HTML_STREAM (html_stream_new (GTK_HTML (html_widget)));
-		
-		/* turn the mime message into html, and
-		   write it to the html stream */
-		mime_message_header_to_html (mime_message, &header_string);
-		
-		camel_stream_write (CAMEL_STREAM (html_stream),
-				    header_string,
-				    strlen (header_string));
-		
-		camel_stream_close (CAMEL_STREAM (html_stream));
-		
-		g_free (header_string);
-	}
-	
-	if (!frame_wnd) {
-		
-		frame_wnd = gtk_frame_new (NULL);
-		gtk_frame_set_shadow_type (
-			GTK_FRAME (frame_wnd), GTK_SHADOW_OUT);
-		
-		gtk_widget_set_usize (scroll_wnd, 500, 75);
-		gtk_scrolled_window_set_policy (
-			GTK_SCROLLED_WINDOW (scroll_wnd),
-			GTK_POLICY_AUTOMATIC,
-			GTK_POLICY_AUTOMATIC);
-		
-		gtk_container_add (GTK_CONTAINER (frame_wnd), scroll_wnd);
-	}
-	
-	
-	return frame_wnd;
-}
-
-static GtkWidget*
-get_gtk_html_window (CamelMimeMessage* mime_message)
-{
-	static GtkWidget* vbox = NULL;
-	GtkWidget* html_header_window = NULL;
-	GtkWidget* html_content_window = NULL;	
-
-	html_content_window =
-		get_gtk_html_contents_window (
-			CAMEL_DATA_WRAPPER (mime_message));
-	
-	html_header_window =
-		get_gtk_html_header_window (mime_message);	
-	
-	if (!vbox) {
-		vbox = gtk_vbox_new (FALSE, 0);
-		
-		gtk_box_pack_start (
-			GTK_BOX (vbox),
-			html_header_window,
-			TRUE, TRUE, 5);
-		
-		gtk_box_pack_start (
-			GTK_BOX (vbox),
-			html_content_window,
-			TRUE, FALSE, 5);
-	}
-
-	return vbox;
-}
-		
-
-
-/*----------------------------------------------------------------------*
- *                  Menu callbacks and information
- *----------------------------------------------------------------------*/
-
-static gchar* fileselection_prev_file = NULL;
-
-static void
-open_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	int ret;
-	GtkWidget *error_dialog;
-
-	if (fileselection_prev_file)
-		g_free (fileselection_prev_file);
-	
-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {
-		error_dialog = gnome_message_box_new (
-			_("File not found"),
-			GNOME_MESSAGE_BOX_ERROR,
-			GNOME_STOCK_BUTTON_OK,
-			NULL);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog),
-					 GTK_WINDOW (fs));
-		
-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));
-	}
-	else {
-		gchar *filename = gtk_file_selection_get_filename (fs);
-		CamelMimeMessage* message = filename_to_camel_msg (filename);
-
-		if (message) {
-			fileselection_prev_file = g_strdup (filename);
-			get_message_tree_ctrl (message);
-			get_gtk_html_window (message);
-		}
-		else
-			gnome_message_box_new ("Couldn't load message.",
-					       GNOME_MESSAGE_BOX_WARNING);
-
-		gtk_widget_destroy (GTK_WIDGET (fs));
-	}
-}
-
-
-static void
-file_menu_open_cb (GtkWidget *widget, void* data)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (
-		gtk_file_selection_new (_("Open Mime Message")));
-
-	if (fileselection_prev_file)
-		gtk_file_selection_set_filename (fs, fileselection_prev_file);
-	
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) open_ok,
-			    fs);
-
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) gtk_widget_destroy,
-				   GTK_OBJECT (fs));
-
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Make it modal */
-}
-
-static void 
-file_menu_exit_cb (GtkWidget *widget, void *data)
-{
-	gtk_main_quit ();
-}
-
-
-static GnomeUIInfo file_menu [] = {
-	GNOMEUIINFO_MENU_OPEN_ITEM (file_menu_open_cb, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_EXIT_ITEM (file_menu_exit_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo main_menu[] = {
-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),
-	GNOMEUIINFO_END
-};
-
-
-/*----------------------------------------------------------------------*
- *                               Main()
- *----------------------------------------------------------------------*/
-
-int
-main (int argc, char *argv[])
-{
-	/* app contains hbox, hbox contains other 2 windows */
-	GtkWidget* app;
-	GtkWidget* hpane;
-	GtkWidget* tree_ctrl_window;
-	GtkWidget* html_window;
-	CORBA_Environment ev;
-
-	CamelMimeMessage* message = NULL;
-
-	/* initialization */
-
-	/* Corba and Bonobo stuff */
-	CORBA_exception_init (&ev);
-
-	gnome_CORBA_init ("Message Browser", "1.0", &argc, argv, 0, &ev);
-
-	if (bonobo_init (gnome_CORBA_ORB (), NULL, NULL) == FALSE)
-		g_error ("Cannot bonobo_init");
-
-	
-	
-	gdk_rgb_init ();
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-
-	app = gnome_app_new ("Message Browser Test", NULL);
-	gnome_app_create_menus (GNOME_APP (app), main_menu);
-
-	/* parse command line */
-	if (argc > 2 ||
-	    (argc==2 && strstr (argv[1], "--help") != 0))
-		print_usage_and_quit();
-	if (argc == 2) {
-		if (strstr (argv[1], "--help") != 0)
-			print_usage_and_quit();
-		message = filename_to_camel_msg (argv[1]);
-		if (!message) {
-			g_print ("Couldn't load message.");
-		}
-	}
-
-        hpane = e_hpaned_new();
-
-	/* add the tree control view of the message*/
-	tree_ctrl_window = get_message_tree_ctrl (message);
-        e_paned_add1 (E_PANED (hpane), tree_ctrl_window);	
-
-	/* add the HTML view of the message */
-	html_window = get_gtk_html_window (message);
-        e_paned_add2 (E_PANED (hpane), html_window);		
-	
-	/* rock n roll */
-	gnome_app_set_contents (GNOME_APP (app),
-				hpane);
-	gtk_widget_show_all (app);
-	gtk_signal_connect (GTK_OBJECT (app), "destroy",
-			    GTK_SIGNAL_FUNC(gtk_main_quit),
-			    &app);
-	if (!message)
-		file_menu_open_cb (NULL, NULL);
-
-	bonobo_main();
-
-	return 1;
-}
diff --git a/tests/ui-tests/saveoptions.xml b/tests/ui-tests/saveoptions.xml
deleted file mode 100644
index 3fd7e57f96..0000000000
--- a/tests/ui-tests/saveoptions.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<filteroptions>
-  <optionset>
-    <option type="send">
-      <description>Family email</description>
-      <optionrule type="match" rule="from-address">
-        <optionvalue name="sender">
-          <address name="zucchi" email="zucchi@zedzone"/>
-          <address name="foo" email="bar"/>
-        </optionvalue>
-      </optionrule>
-      <optionrule type="match" rule="to-address">
-        <optionvalue name="receipient">
-          <address name="frank" email="frank.zucchi"/>
-        </optionvalue>
-      </optionrule>
-      <optionrule type="match" rule="cc-address">
-          <address name="zucchi" email="zucchi@zedzone"/>
-      </optionrule>
-      <optionrule type="except" rule="except-me"/>
-      <optionrule type="action" rule="copy-me">
-        <optionvalue name="folder">
-          <folder name="SaveMe"/>
-          <folder name="InBox"/>
-        </optionvalue>
-      </optionrule>
-    </option>
-    <option type="receive">
-      <description>Helix Email</description>
-      <optionrule type="match" rule="from-address">
-        <optionvalue name="sender">
-          <address name="primates" email="primates-list@helixcode.com"/>
-        </optionvalue>
-      </optionrule>
-    </option>
-  </optionset>
-</filteroptions>
diff --git a/tests/ui-tests/store_listing.c b/tests/ui-tests/store_listing.c
deleted file mode 100644
index fb7c2ae0f7..0000000000
--- a/tests/ui-tests/store_listing.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Author : Bertrand.Guiheneuf@aful.org                                  */
-
-
-
-/* A simple and very dirty hack written to test 
-   (and perhaps demonstrate) Camel */
-
-
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include "camel-folder.h"
-#include "camel-mh-folder.h"
-#include "camel-mh-store.h"
-#include "camel.h"
-#include "camel-folder-summary.h"
-
-static GladeXML *xml;
-static CamelSession *_session;
-static CamelFolder *currently_selected_folder = NULL;
-
-static GList *store_list;
-static GList *folder_list;
-
-static void add_mail_store (const gchar *store_url);
-static void show_folder_messages (CamelFolder *folder);
-
-
-
-static void
-_destroy_menu (gpointer data)
-{
-	gtk_widget_destroy (GTK_WIDGET (data));
-}
-
-static void
-_copy_message (GtkWidget *widget, gpointer data)
-{
-	CamelFolder *dest_folder = CAMEL_FOLDER (data);
-	GtkWidget *message_clist;
-	gint current_row;
-	GList *selected;
-	gint selected_row;
-
-	CamelMimeMessage *message;
-
-	printf ("Selected \"copy to folder\" with destination folder %s\n", camel_folder_get_name (dest_folder));
-	message_clist = glade_xml_get_widget (xml, "message-clist");
-	selected = GTK_CLIST (message_clist)->selection;
-	while (selected) {
-		selected_row = GPOINTER_TO_INT (selected->data);
-		message = CAMEL_MIME_MESSAGE (gtk_clist_get_row_data (GTK_CLIST (message_clist), selected_row));
-		camel_folder_copy_message_to (currently_selected_folder, message, dest_folder);
-		selected = selected->next;
-	}
-	
-}
-
-static GnomeUIInfo mailbox_popup_menu[] = {
-	GNOMEUIINFO_ITEM_STOCK ("_Copy selected message here", NULL, _copy_message, GNOME_STOCK_MENU_NEW),
-	GNOMEUIINFO_END
-};
-
-static void
-_show_mailbox_context_menu (CamelFolder *folder) {
-	GtkWidget *menu;
-	GtkCTree *mailbox_and_store_tree;
-
-	mailbox_and_store_tree = GTK_CTREE (glade_xml_get_widget (xml, "store-and-mailbox-tree"));
-	menu = gtk_object_get_data (GTK_OBJECT (mailbox_and_store_tree), "mailbox_popup_menu");
-	if (!menu) {
-		menu = gnome_popup_menu_new (mailbox_popup_menu);
-		gtk_object_set_data_full (GTK_OBJECT (mailbox_and_store_tree), "mailbox_popup_menu", menu, _destroy_menu);
-	}
-	
-	gnome_popup_menu_do_popup (menu, NULL, NULL, NULL, folder);
-
-	
-}
-static gboolean
-mailbox_button_clicked_on_row (gint button, gint row) 
-{
-	GtkCTreeNode *mailbox_node;
-	CamelFolder *folder;
-	GtkCTree *mailbox_and_store_tree;
-	const gchar *mailbox_name;
-	
-	mailbox_and_store_tree = GTK_CTREE (glade_xml_get_widget (xml, "store-and-mailbox-tree"));
-
-	mailbox_node = gtk_ctree_node_nth (mailbox_and_store_tree, row);
-	
-	folder = gtk_ctree_node_get_row_data (mailbox_and_store_tree, mailbox_node);
-	if (folder && IS_CAMEL_FOLDER (folder)) {
-		
-		mailbox_name = camel_folder_get_name (folder);
-		printf ("mailbox %s clicked with button %d\n", mailbox_name, button);
-		switch (button) {
-		case 1:
-			currently_selected_folder = folder;
-			show_folder_messages (folder);
-			break;
-		case 2:
-			break;
-		case 3:
-			_show_mailbox_context_menu (folder);
-		}
-		return TRUE;
-	} else {
-		printf ("Node is a store\n");
-		return FALSE;
-	}
-}
-
-
-static void 
-message_destroy_notify (gpointer data)
-{
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (data);
-
-	gtk_object_unref (GTK_OBJECT (message));
-
-}
-
-
-
-
-
-static void
-show_folder_messages (CamelFolder *folder)
-{
-	GtkWidget *message_clist;
-	gint folder_message_count;
-	CamelMimeMessage *message;
-	gint i;
-	const gchar *clist_row_text[3];
-	const char *sent_date, *subject, *sender;
-	gint current_row;
-	CamelFolderSummary *summary;
-
-	message_clist = glade_xml_get_widget (xml, "message-clist");
-
-	/* clear old message list */
-	gtk_clist_clear (GTK_CLIST (message_clist));
-
-	if (camel_folder_has_summary_capability (folder)) {
-		const GList *message_info_list;
-		CamelMessageInfo *msg_info;
-
-		printf ("Folder has summary. Good\n");
-		summary = camel_folder_get_summary (folder);
-		message_info_list = camel_folder_summary_get_message_info_list (summary);
-		printf ("message_info_list = %p\n", message_info_list);
-		while (message_info_list) {
-			msg_info = (CamelMessageInfo *)message_info_list->data;
-			clist_row_text [0] = msg_info->date;
-			clist_row_text [1] = msg_info->sender;			
-			clist_row_text [2] = msg_info->subject;
-			
-			current_row = gtk_clist_append (GTK_CLIST (message_clist), clist_row_text);
-
-			message_info_list = message_info_list->next;
-		}		
-	} else {
-		printf ("Folder does not have summary. Opening all messages\n");
-		folder_message_count = camel_folder_get_message_count (folder);
-		
-		for (i=0; i<folder_message_count; i++) {
-			message = camel_folder_get_message (folder, i); 
-			gtk_object_ref (GTK_OBJECT (message)); 
-			sent_date = camel_mime_message_get_sent_date (message); 
-			sender = camel_mime_message_get_from (message); 
-			subject = camel_mime_message_get_subject (message); 
-			
-			
-			if (sent_date) clist_row_text [0] = sent_date;
-			else clist_row_text [0] = NULL;
-			if (sender) clist_row_text [1] = sender;
-			else clist_row_text [1] = NULL;
-			if (subject) clist_row_text [2] = subject;
-			else clist_row_text [2] = NULL;
-			
-			current_row = gtk_clist_append (GTK_CLIST (message_clist), clist_row_text);
-			gtk_clist_set_row_data_full (GTK_CLIST (message_clist), current_row, (gpointer)message, message_destroy_notify);
-		}
-
-	}
-}
-
-
-/* add a mail store given by its URL */
-static void
-add_mail_store (const gchar *store_url)
-{
-
-	CamelStore *store;
-	GtkWidget *mailbox_and_store_tree;
-	GtkCTreeNode* new_store_node;
-	GtkCTreeNode* new_folder_node;
-	char *new_tree_text[1];
-	GList *subfolder_list;
-	CamelFolder *root_folder;
-	CamelFolder *new_folder;
-
-
-
-	store = camel_session_get_store (_session, store_url);
-	if (!store) return;
-
-	/* remember store */
-	store_list = g_list_prepend (store_list, store);
-
-	//store_list = g_list_append (store_list, (gpointer)store);
-	mailbox_and_store_tree = glade_xml_get_widget (xml, "store-and-mailbox-tree");
-	new_tree_text[0] = g_strdup (store_url);
-	new_store_node = gtk_ctree_insert_node (GTK_CTREE (mailbox_and_store_tree),
-					  NULL,
-					  NULL,
-					  new_tree_text,
-					  0,
-					  NULL,
-					  NULL,
-					  NULL,
-					  NULL,
-					  FALSE,
-					  FALSE);
-
-	/* normally, use get_root_folder */
-	root_folder = camel_store_get_folder (store, "");
-	camel_folder_open (root_folder, FOLDER_OPEN_RW);
-	subfolder_list = camel_folder_list_subfolders (root_folder);
-	while (subfolder_list) {
-		new_tree_text[0] = subfolder_list->data;
-		new_folder = camel_store_get_folder (store, subfolder_list->data);
-		camel_folder_open (new_folder, FOLDER_OPEN_RW);
-		folder_list = g_list_prepend (folder_list, new_folder);
-
-		new_folder_node = gtk_ctree_insert_node (GTK_CTREE (mailbox_and_store_tree),
-							 new_store_node,
-							 NULL,
-							 new_tree_text,
-							 0,
-							 NULL,
-							 NULL,
-							 NULL,
-							 NULL,
-							 FALSE,
-							 FALSE);
-
-
-		gtk_ctree_node_set_row_data (GTK_CTREE (mailbox_and_store_tree), new_folder_node, (gpointer)new_folder);
-		subfolder_list = subfolder_list->next;
-	}
-}
-
-static void 
-delete_selected_messages ()
-{
-	GtkWidget *message_clist;
-	gint current_row;
-	GList *selected;
-	gint selected_row;
-
-	CamelMimeMessage *message;
-	message_clist = glade_xml_get_widget (xml, "message-clist");
-	selected = GTK_CLIST (message_clist)->selection;
-	while (selected) {
-		selected_row = GPOINTER_TO_INT (selected->data);
-		message = CAMEL_MIME_MESSAGE (gtk_clist_get_row_data (GTK_CLIST (message_clist), selected_row));
-		camel_mime_message_set_flag (message, "DELETED", TRUE);
-		selected = selected->next;
-	}
-
-}
-
-
-static void 
-expunge_selected_folders ()
-{
-	GtkWidget *mailbox_and_store_tree;
-	CamelFolder *folder;
-	GtkCTreeNode* selected_node;
-	GList *selected;
-	const gchar *folder_name;
-
-	mailbox_and_store_tree = glade_xml_get_widget (xml, "store-and-mailbox-tree");
-	
-	selected = GTK_CLIST (mailbox_and_store_tree)->selection;
-	while (selected) {
-		
-		selected_node= GTK_CTREE_NODE (selected->data);
-		folder = CAMEL_FOLDER (gtk_ctree_node_get_row_data (GTK_CTREE (mailbox_and_store_tree), 
-								    selected_node));
-		if (folder && IS_CAMEL_FOLDER (folder)) {
-			folder_name = camel_folder_get_name (folder);
-			printf ("folder to expunge : %s\n", folder_name);
-			camel_folder_expunge (folder, FALSE);
-			/* reshowing the folder this way is uggly
-			   but allows to check the message are
-			   correctly renoved and the cache works correctly */
-			show_folder_messages (folder);
-			
-		} else {
-			printf ("A selected node is a store\n");
-		}
-		
-		selected = selected->next;
-	}
-
-	
-}
-
-void
-close_all ()
-{
-	while (folder_list) {
-		camel_folder_close (CAMEL_FOLDER (folder_list->data), TRUE);
-		folder_list = folder_list->next;
-	}
-
-	while (store_list) {
-		//camel_store_close (CAMEL_STORE (store_list->data));
-		store_list = store_list->next;
-	}
-
-}
-
-/* ----- libglade callbacks */
-void
-on_exit_activate (GtkWidget *widget, void *data)
-{
-	close_all ();
-	gtk_main_quit ();
-}
-
-
-void
-on_about_activate (GtkWidget *widget, void *data)
-{
-	GtkWidget *about_widget;
-	
-	about_widget = glade_xml_get_widget (xml, "about_widget");
-	gtk_widget_show (about_widget);
-}
-
-void
-on_new_store_activate (GtkWidget *widget, void *data)
-{
-	GtkWidget *new_store_dialog;
-	GtkWidget *new_store_gnome_entry;
-	GtkWidget *new_store_entry;
-	gchar *url_text;
-
-
-	gint pressed_button;
-
-	new_store_dialog = glade_xml_get_widget (xml, "new_store_dialog");
-	pressed_button = gnome_dialog_run (GNOME_DIALOG (new_store_dialog));
-
-	if ((pressed_button != 0) && (pressed_button != 1))
-		return;
-	
-	new_store_gnome_entry = glade_xml_get_widget (xml, "new-store-entry");
-	new_store_entry = gnome_entry_gtk_entry (GNOME_ENTRY (new_store_gnome_entry));
-	url_text = gtk_entry_get_text (GTK_ENTRY (new_store_entry));
-	
-	if (url_text)
-		add_mail_store (url_text);
-	
-}
-
-
-void
-on_expunge_activate (GtkWidget *widget, void *data)
-{
-	expunge_selected_folders ();
-}
-
-
-void 
-on_message_delete_activate (GtkWidget *widget, void *data)
-{
-	delete_selected_messages();
-}
-
-gboolean
-on_store_and_mailbox_tree_button_press_event (GtkWidget *widget,  GdkEventButton *event, void *data)
-{
-	gint row;
-	GtkCList *clist = GTK_CLIST (widget);
-
-	if (!gtk_clist_get_selection_info (clist, event->x, event->y, &row, NULL))
-		return FALSE;
-	if (!mailbox_button_clicked_on_row (event->button, row))
-		return FALSE;
-	
-	return TRUE;
-		
-}
-
-/* ----- init */
-int
-main(int argc, char *argv[])
-{
-	GtkWidget *new_store_gnome_entry;
-
-	gnome_init ("store_listing", "1.0", argc, argv);
-	
-	glade_gnome_init ();
-	camel_init ();
-	xml = glade_xml_new ("store_listing.glade", NULL);
-	if (xml) glade_xml_signal_autoconnect (xml);
-
-	_session = camel_session_new ();
-	camel_provider_register_as_module ("../../camel/providers/MH/.libs/libcamelmh.so");
-	
-	new_store_gnome_entry = glade_xml_get_widget (xml, "new-store-entry");
-	gnome_entry_load_history (GNOME_ENTRY (new_store_gnome_entry));
-	gtk_main ();
-	gnome_entry_save_history (GNOME_ENTRY (new_store_gnome_entry));
-
-	return 0;
-}
-
diff --git a/tests/ui-tests/store_listing.glade b/tests/ui-tests/store_listing.glade
deleted file mode 100644
index d551c90dbb..0000000000
--- a/tests/ui-tests/store_listing.glade
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>store_listing</name>
-  <program_name>store_listing</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <translatable_strings_file></translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>app1</name>
-  <width>600</width>
-  <height>400</height>
-  <title>store_listing</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GnomeDockItem</class>
-      <name>dockitem1</name>
-      <border_width>2</border_width>
-      <placement>GNOME_DOCK_TOP</placement>
-      <band>0</band>
-      <position>0</position>
-      <offset>0</offset>
-      <locked>False</locked>
-      <exclusive>True</exclusive>
-      <never_floating>False</never_floating>
-      <never_vertical>True</never_vertical>
-      <never_horizontal>False</never_horizontal>
-      <shadow_type>GTK_SHADOW_OUT</shadow_type>
-
-      <widget>
-	<class>GtkMenuBar</class>
-	<name>menubar1</name>
-	<shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	<widget>
-	  <class>GtkMenuItem</class>
-	  <name>file1</name>
-	  <stock_item>GNOMEUIINFO_MENU_FILE_TREE</stock_item>
-
-	  <widget>
-	    <class>GtkMenu</class>
-	    <name>file1_menu</name>
-
-	    <widget>
-	      <class>GtkMenuItem</class>
-	      <name>separator1</name>
-	      <right_justify>False</right_justify>
-	    </widget>
-
-	    <widget>
-	      <class>GtkPixmapMenuItem</class>
-	      <name>exit</name>
-	      <signal>
-		<name>activate</name>
-		<handler>on_exit_activate</handler>
-		<last_modification_time>Tue, 10 Aug 1999 12:06:35 GMT</last_modification_time>
-	      </signal>
-	      <stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkMenuItem</class>
-	  <name>store2</name>
-	  <label>_Store</label>
-	  <right_justify>False</right_justify>
-
-	  <widget>
-	    <class>GtkMenu</class>
-	    <name>store2_menu</name>
-
-	    <widget>
-	      <class>GtkPixmapMenuItem</class>
-	      <name>new_store</name>
-	      <signal>
-		<name>activate</name>
-		<handler>on_new_store_activate</handler>
-		<last_modification_time>Tue, 10 Aug 1999 10:29:12 GMT</last_modification_time>
-	      </signal>
-	      <stock_item>GNOMEUIINFO_MENU_NEW_ITEM</stock_item>
-	      <label>_New store</label>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkMenuItem</class>
-	  <name>folder1</name>
-	  <signal>
-	    <name>activate</name>
-	    <handler>on_folder1_activate</handler>
-	    <last_modification_time>Sat, 14 Aug 1999 17:23:25 GMT</last_modification_time>
-	  </signal>
-	  <label>Folder</label>
-	  <right_justify>False</right_justify>
-
-	  <widget>
-	    <class>GtkMenu</class>
-	    <name>folder1_menu</name>
-
-	    <widget>
-	      <class>GtkPixmapMenuItem</class>
-	      <name>expunge</name>
-	      <signal>
-		<name>activate</name>
-		<handler>on_expunge_activate</handler>
-		<last_modification_time>Sat, 14 Aug 1999 16:36:03 GMT</last_modification_time>
-	      </signal>
-	      <label>_Expunge</label>
-	      <right_justify>False</right_justify>
-	      <stock_icon>GNOME_STOCK_MENU_CONVERT</stock_icon>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkMenuItem</class>
-	  <name>message_menu</name>
-	  <label>_Message</label>
-	  <right_justify>False</right_justify>
-
-	  <widget>
-	    <class>GtkMenu</class>
-	    <name>message_menu_menu</name>
-
-	    <widget>
-	      <class>GtkPixmapMenuItem</class>
-	      <name>message_delete</name>
-	      <signal>
-		<name>activate</name>
-		<handler>on_message_delete_activate</handler>
-		<last_modification_time>Sat, 14 Aug 1999 14:54:04 GMT</last_modification_time>
-	      </signal>
-	      <label>_Delete</label>
-	      <right_justify>False</right_justify>
-	      <stock_icon>GNOME_STOCK_MENU_TRASH</stock_icon>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkMenuItem</class>
-	  <name>help1</name>
-	  <stock_item>GNOMEUIINFO_MENU_HELP_TREE</stock_item>
-
-	  <widget>
-	    <class>GtkMenu</class>
-	    <name>help1_menu</name>
-
-	    <widget>
-	      <class>GtkPixmapMenuItem</class>
-	      <name>about</name>
-	      <signal>
-		<name>activate</name>
-		<handler>on_about_activate</handler>
-		<last_modification_time>Tue, 10 Aug 1999 12:06:58 GMT</last_modification_time>
-	      </signal>
-	      <stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GnomeDockItem</class>
-      <name>dockitem2</name>
-      <border_width>1</border_width>
-      <placement>GNOME_DOCK_TOP</placement>
-      <band>1</band>
-      <position>0</position>
-      <offset>0</offset>
-      <locked>False</locked>
-      <exclusive>True</exclusive>
-      <never_floating>False</never_floating>
-      <never_vertical>False</never_vertical>
-      <never_horizontal>False</never_horizontal>
-      <shadow_type>GTK_SHADOW_OUT</shadow_type>
-
-      <widget>
-	<class>GtkToolbar</class>
-	<name>toolbar1</name>
-	<border_width>1</border_width>
-	<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-	<type>GTK_TOOLBAR_BOTH</type>
-	<space_size>16</space_size>
-	<space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
-	<relief>GTK_RELIEF_NONE</relief>
-	<tooltips>True</tooltips>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <child_name>Toolbar:button</child_name>
-	  <name>new_store_button</name>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_new_store_activate</handler>
-	    <last_modification_time>Tue, 10 Aug 1999 12:17:17 GMT</last_modification_time>
-	  </signal>
-	  <label>new store</label>
-	  <stock_pixmap>GNOME_STOCK_PIXMAP_NEW</stock_pixmap>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHPaned</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>hpaned1</name>
-      <handle_size>10</handle_size>
-      <gutter_size>6</gutter_size>
-      <position>0</position>
-
-      <widget>
-	<class>GtkCTree</class>
-	<name>store-and-mailbox-tree</name>
-	<width>150</width>
-	<can_focus>True</can_focus>
-	<signal>
-	  <name>button_press_event</name>
-	  <handler>on_store_and_mailbox_tree_button_press_event</handler>
-	  <last_modification_time>Mon, 16 Aug 1999 13:06:15 GMT</last_modification_time>
-	</signal>
-	<columns>1</columns>
-	<column_widths>80</column_widths>
-	<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	<show_titles>True</show_titles>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-	<child>
-	  <shrink>True</shrink>
-	  <resize>False</resize>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CTree:title</child_name>
-	  <name>store_and_inbox_name</name>
-	  <label>name</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCList</class>
-	<name>message-clist</name>
-	<can_focus>True</can_focus>
-	<columns>3</columns>
-	<column_widths>80,80,80</column_widths>
-	<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	<show_titles>True</show_titles>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-	<child>
-	  <shrink>True</shrink>
-	  <resize>True</resize>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>message_date_label</name>
-	  <label>Date</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>message_sender_label</name>
-	  <label>Sender</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>message_subject_label</name>
-	  <label>Subject</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeAbout</class>
-  <name>about_widget</name>
-  <visible>False</visible>
-  <modal>True</modal>
-  <copyright></copyright>
-  <authors>Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt;
-</authors>
-  <comments>This is a very simple program to test Camel</comments>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>new_store_dialog</name>
-  <visible>False</visible>
-  <title>New store</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>new_store_label</name>
-	<label>Enter complete store URL</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>29</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GnomeEntry</class>
-	<name>new-store-entry</name>
-	<history_id>store_name_history</history_id>
-	<max_saved>15</max_saved>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GnomeEntry:entry</child_name>
-	  <name>new-store-dialog-combo-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/tests/ui-tests/test-multipart-alt.msg b/tests/ui-tests/test-multipart-alt.msg
deleted file mode 100644
index aa0da18b82..0000000000
--- a/tests/ui-tests/test-multipart-alt.msg
+++ /dev/null
@@ -1,17738 +0,0 @@
-From - Sat Jun  1 19:00:50 1996
-X-Mozilla-Status: 0001
-Message-ID: <31B0F5D1.41C6@netscape.com>
-Date: Sat, 01 Jun 1996 19:00:49 -0700
-From: Jamie Zawinski <jwz@netscape.com>
-Organization: Netscape Communications Corporation, Mozilla Division
-X-Mailer: Mozilla 2.0 (X11; U; IRIX 5.3 IP22)
-MIME-Version: 1.0
-To: Jamie Zawinski <jwz@netscape.com>
-Subject: multipart/alternative
-Content-Type: multipart/mixed; boundary="------------outer"
-
-This is a multi-part message in MIME format.
-
---------------outer
-
-Here comes some multipart/alternative junk.  It's rilly rilly big.
-
---------------outer
-Content-Type: multipart/alternative; boundary="------------167E2781446B"
-
---------------167E2781446B
-Content-Type: text/plain; charset=iso-8859-1; name="album-list.txt"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="album-list.txt"
-
-                                 jwz's tunes
-                          Last modified:  1-jun-96.
-
-This is a list of all of the music I have on CD, tape, and vinyl (including
-all of the old, embarrasing stuff...) This page may look a little funny if
-you aren't using a browser that supports HTML tables, like Mozilla.
-
-     ``Publishing CD lists and tape collections evokes images of
-     lonely, pathetic men who talk about their cats incessantly.'' --
-     Paul Phillips
-
-I used to have this set up so that clicking on any name would take you to
-the appropriate entry of the All Music Guide at
-gopher://allmusic.ferris.edu; but they have since moved their database from
-there to cdnow.com, and in the process, have obfuscated access to the
-database to such an extent that this is no longer possible. In order to get
-at the discographies, you need to weed your way through dozens of pages, and
-there seems to be no even semi-reliable way to pre-compute the URL that they
-will use. Arrgh!
-
-The Internet Movie Database has an excellent interface for this sort of
-thing; I really wish more people would emulate that system.
-
-In this list, I've included links to various related web pages that I've
-come across; one very cool and well-organized database to which many of
-these links point is The Ultimate Band List; check it out!
-
-                     Jamie Zawinski <jwz@netscape.com>
-
-----------------------------------------------------------------------------
-
-   *  Act                                     UBL Card: 4637
-      1988: Laughter, Tears, and Rage         See also: rt66.com
-                                              See also:
-                                              hcl.chass.ncsu.edu
-   *  Age of Chance
-      1987: Kiss (single)
-      1987: Don't Get Mad, Get Even (single)
-   *  Alien Sex Fiend                         UBL Card: 5291
-      1983-1992: Drive My Rocket (comp)       See also: cent1.lancs.ac.uk
-      1989: Too Much Acid? (live)
-      1990: Curse
-      1992: Open Head Surgery
-      1993: Altered States of America (live)
-      1995: Inferno: The Odyssey Continuestm
-      (soundtrack)
-   *  Alio Die
-      1993: Under a Holy Ritual
-                                              UBL Card: 1266
-                                              See also: www.projekt.com
-   *  Alphaville                              UBL Card: 3056
-      1984: Forever Young                     See also: www.escape.com
-   *  Altered Images
-      1981: Happy Birthday
-      1983: Bite
-      1984: Collected Images (comp)
-   *  An April March
-      1995: Lessons in Vengance
-      1995: Instruments of Lust and Fury
-   *  And Also the Trees
-      1983-1992: From Horizon to Horizon
-      (comp)
-                                              UBL Card: 1867
-                                              See also:
-                                              www.ugcs.caltech.edu
-                                              See also:
-                                              onyx.dartmouth.edu
-   *  Anderson, Laurie                        UBL Card: 1494
-      1982: Big Science                       See also: www.voyagerco.com
-      1983: United States Live, parts 1-4 (5
-      albums)                                 See also: www.netpart.com
-      1984: Mister Heartbreak                 See also: www.c3.lanl.gov
-      1986: Home of the Brave (live
-      soundtrack)
-      1995: Bright Red
-   *  Ant, Adam
-      1980: Kings of the Wild Frontier
-      1981: Prince Charming
-      1982: Friend or Foe
-      1983: Dirk Wears White Sox
-      1985: Viva Le Rock
-      1979-1986: Antics in the Forbidden Zone
-      (comp)
-                                              UBL Card: 1205
-                                              See also: www.uhs.uga.edu
-                                              See also: caprec.com
-
-   *  Anthrax                                 UBL Card: 2710
-      1991: Attack of the Killer B's (comp)
-   *  Aphex Twin
-      1993: On (EP)
-      1994: Analogue Bubblebath (EP)
-      1995: Ventolin (EP)
-                                              UBL Card: 5279
-                                              See also: hyperreal.com
-                                              See also: pathfinder.com
-
-   *  Arcadia                                 UBL Card: 1259
-      1985: So Red the Rose
-   *  Armageddon Dildos
-      1995: Lost
-                                              UBL Card: 2538
-
-   *  Ash, Daniel                             See also:
-      1991: Coming Down                       isvpc146.isv.uit.no
-      1992: Foolish Thing Desire
-   *  Archangel, Nathalie
-      1992: Owl
-   *  Art of Noise                            UBL Card: 1918
-      1983: Who's Afraid of the Art of Noise? See also: rt66.com
-
-      1983: The Art of Noise Have Closed Up
-      1983: Beatbox
-      1983: Daft
-      1984: Edited (picture disc)
-   *  Attrition
-      1985: Smiling, at the Hypogonder Club
-      (comp)
-                                              UBL Card: 4232
-                                              See also: www.projekt.com
-
-   *  AUTECHRe
-      1994: INCUNABULA
-      1994: BASSCAD,EP (EP)
-      1994: Amber
-      1995: Garbage
-   *  B52's
-      1979: B52's
-      1980: Wild Planet
-      1982: Mesopotamia
-      1983: Whammy!
-      1981: Party Mix
-                                               UBL Card: 2268
-
-   *  Babes in Toyland                         UBL Card: 3190
-      1989: Spanking Machine
-      1991: To Mother
-      1992: Fontanelle
-      1993: Pain Killers
-      1995: Nemesisters
-   *  Battery
-      1992: Meat Market (EP)
-      1993: Mutate
-      1994: Lillith 3.2 (EP)
-      1995: nv
-   *  Bauhaus                                 UBL Card: 1235
-      1979: Bela Lugosi's Dead (EP)           See also:
-      1981: In the Flat Field                 gothic.acs.csulb.edu
-      1981: Mask                              See also:
-      1981: Press the Eject and Give Me the   isvpc146.isv.uit.no
-      Tape (live)
-      1983: Burning from the Inside
-      1979-1984: 1979-1984 (comp)
-      1985: The Sky's Gone Out
-      1984: The Last Temptation (live boot)
-      1984: Rest In Peace: The Final Concert
-      (double live)
-      1996: The Passion of Covers: A Tribute
-      (various)
-   *  Belly
-      1993: Star
-      1993: Moon (EP)
-      1995: Baby Silvertooth (EP)
-      1995: King
-                                              UBL Card: 1360
-                                              See also:
-                                              isvpc146.isv.uit.no
-
-   *  Berlin                                  UBL Card: 4156
-      1981: Love Life
-      1981: Dancing in Berlin / Lost in the
-      Crowd (single)
-      1982: Pleasure Victim
-      1986: Count 3 and Pray
-   *  Big Black
-      1983: The Hammer Party
-      1987: Songs About Fucking
-      1992: The Rich Man's Eight-Track Tape
-      (comp)
-                                               UBL Card: 2410
-
-   *  Big Hat                                 UBL Card: 1217
-      1993: Selena at my Window               See also: www.cec.wustl.edu
-   *  Bigod 20
-      1990: The Bog (EP)
-      1991: Carpe Diem (EP)
-   *  Bikini Kill                             UBL Card: 4444
-      1991-1992: The C.D. Version of the      See also: www.columbia.edu
-      First Two Records
-   *  Billy Nayer Show, The
-      1994: The Ketchup and Mustard Man
-   *  Billy and the Boingers
-      1987: U Stink but I Love You (flexydisk)
-   *  Birdsongs of the Messozoic
-      1980-1987: The Fossil Record
-      1983: Sonic Geology
-   *  Birmingham 6                            UBL Card: 4348
-      1995: Police State
-   *  Black Tape for a Blue Girl
-      1986: The Rope
-      1987: Mesmerized by the Sirens
-      1989: Ashes in the Brittle Air
-      1993: This Lush Garden Within
-                                              UBL Card: 1202
-                                              See also: www.projekt.com
-
-   *  Bleeding Stone, The
-      1994: Silent Insanity (EP)
-   *  Blondie
-      1980: Autoamerican
-      1983: Best of Blondie
-                                               UBL Card: 2070
-
-   *  Blotto
-      1994: Collected Works
-   *  Body Count
-      1992: Body Count
-                                              UBL Card: 1277
-
-   *  Bowie, David                            UBL Card: 1098
-      1995: Outside
-   *  Bow Wow Wow
-      1982: See Jungle
-      1981-1982: I Want Candy (comp)
-      1983: When the Going Gets Tough
-      1981-1983: Girl Bites Dog (comp)
-                                              UBL Card: 2301
-
-   *  Breeders, The                           UBL Card: 1242
-      1993: Last Splash                       See also:
-                                              isvpc146.isv.uit.no
-   *  Brücken, Claudia
-      1991: Love and a Million Other Things
-                                              UBL Card: 4636
-                                              See also: rt66.com
-                                              See also:
-                                              hcl.chass.ncsu.edu
-   *  Buggles, The
-      1979: The Age of Plastic
-      1981: Adventures in Modern Recording
-   *  Bush, Kate
-      1977: The Kick Inside
-      1980: Never For Ever
-      1983: The Dreaming
-      1985: Hounds of Love
-                                              UBL Card: 1032
-                                              See also: actor.cs.vt.edu
-                                              See also:
-                                              www.jrc.flinders.edu.au
-                                              See also:
-                                              holly.city.unisa.edu.au
-   *  Buzzcocks                               UBL Card: 1351
-      1976-1979: Operators Manual
-   *  Cabaret Voltaire
-      1974-1976: 1974-1976 (comp)
-      1978-1983: The Golden Moments of CV
-      (comp)
-      1978: Nag Nag Nag (EP)
-      1979: Mix-Up (EP)
-      1980: Red Mecca
-      1981: The Voice of America
-      1981: Johnny Yesno (soundtrack)
-      1982: 2X45
-      1982: Eight Crepescule Tracks
-      1983: The Crackdown
-      1984: Micro-Phonies
-      1985: I Want You (single)
-      1985: Drinking Gasoline
-      1985: The Arm of the Lord
-      1985: The Convenant, the Sword, and the
-      Arm of the Lord
-      1986: The Drain Train
-      1987: Code
-      1990: Listen Up (double comp)
-      1991: Body and Soul
-      1991: Colors
-      1992: Plasticity
-      1992: Western Reworks
-                                               UBL Card: 2307
-
-   *  Cave, Nick                              UBL Card: 1273
-      1984: From Her to Eternity
-      1988: Tender Prey
-   *  Chemlab
-      1993: Burnout at the Hydrogen Bar
-      1994: Magnetic Field Remixes (EP)
-                                              UBL Card: 3774
-
-   *  Children on Stun
-      1994: Tourniquets of Love's Desire
-   *  Christian Death
-      1982: Only Theatre of Pain
-      1988: Sex and Drugs and Jesus
-      Christ
-      1989: All the Love All the Hate
-      part Two: All the Hate
-      1994: Sexy Death God
-                                          UBL Card: 1218
-                                          See also:
-                                          christian-death.acc.brad.ac.uk
-
-   *  Chris and Cosey
-      1989: Trust
-   *  Ciccone Youth
-      1988: The Whitey Album
-                                              UBL Card: 1087
-
-   *  ClockDVA                                UBL Card: 3999
-      1981: Thirst
-      1988: The Hacker/The Act
-   *  Cocteau Twins
-      1982: Garlands
-      1983: Head over Heels
-      1984: The Spangle Maker (EP)
-      1984: Treasure
-      1985: Aikea-Guinea (EP)
-      1985: Echoes in a Shallow Bay
-      1985: Tiny Dynamine (EP)
-      1982-1985: The Pink Opaque
-                                              UBL Card: 1074
-                                              See also:
-                                              garnet.berkeley.edu
-                                              See also:
-                                              isvpc146.isv.uit.no
-
-   *  Coil                                     UBL Card: 1388
-      1986?: The Angelic Conversation
-      (soundtrack)
-      1988: Gold is the Metal
-      1990: The Unreleased Themes for
-      Hellraiser (EP)
-      1990: Panic / Tainted Love (single)
-      1991: Out of Light Cometh Darkness
-      1992: Snow (EP)
-   *  Concrete Blonde
-      1986: Concrete Blonde
-      1989: Free
-      1990: Bloodletting
-      1993: Walking in London (single)
-      1993: Mexican Moon
-                                               UBL Card: 1396
-
-   *  Cop Shoot Cop
-      1993: Ask Questions Later
-   *  Course of Empire
-      1990: Course of Empire
-      1993: Infested! (EP)
-      1994: Initiation
-                                              UBL Card: 2889
-                                              See also:
-                                              homepage.seas.upenn.edu
-
-   *  Cranes                                  UBL Card: 2400
-      1990: Inescapable (EP)                  See also:
-      1991: Wings of Joy                      busop.cit.wayne.edu
-      1992: Self-Non-Self
-      1993: Forever
-      1993: Jewel (EP)
-      1994: Loved
-      1994: Shining Road (limited edition
-      double EP)
-   *  Crash Worship
-      1992: ADRV
-                                              UBL Card: 1901
-                                              See also: www.meer.net
-                                              See also: www.tyrell.net
-   *  Creatures, The                          UBL Card: 1216
-      1983: Feast
-      1990: Boomerang
-      1990: Fury Eyes (EP)
-      1990: Standing There (single)
-   *  Cure, The
-      1980: Boys Don't Cry
-      1980: Seventeen Seconds
-      1981: Faith
-      1982: Pornography
-      1982: The Walk
-      1982?: Looking for a Forest (live boot)
-
-      1983: Japanese Whispers
-      1983: Lovecats (EP)
-      1984: Concert (live)
-      1984: The Top
-      1985: The Head on the Door
-      1987: Staring at the Sea (comp)
-      1988: Kiss Me Kiss Me Kiss Me
-      1989: Disintegration
-      1989: Fascination Street (single)
-      1990: Never Enough (single)
-      1995?: Give Me the Cure: 18 DC Bands
-      (various)
-                                              UBL Card: 1159
-                                              See also:
-                                              www.acpub.duke.edu
-                                              See also: pathfinder.com
-
-   *  Current 93                              UBL Card: 3465
-      1986-1991: Island
-   *  Curve
-      1991: Frozen (EP)
-      1991: Cherry (EP)
-      1992: Doppelganger
-      1993: Cuckoo
-                                              UBL Card: 1355
-                                              See also:
-                                              quark.stack.urc.tue.nl
-                                              See also:
-                                              blade.stack.urc.tue.nl
-   *  Cyber-Tec
-      1995: Cyber-Tec
-   *  Daisy Chainsaw
-      1992: Hope All Your Dreams Come True (single)
-      1992: Love Sick Pleasure (EP)
-      1992: Eleventeen
-      1994: For They Know Not What They Do
-   *  Dance or Die
-      1993: Psychoburbia
-   *  Danse Society, The
-      1984: Heaven is Waiting
-      1986: Looking Through
-   *  Das Ich                                 UBL Card: 2337
-      1990: Satanische Verse
-   *  Dax, Danielle
-      1986-1988: Dark Adapted Eye (comp +5)
-      1988: Whistling for his Love (single)
-      1988: Cat House (single)
-      1990: Blast the Human Flower
-      1992: Pop-Eyes
-      1995: Timber Tongue (EP)
-                                              UBL Card: 1746
-
-   *  Death in June
-      1992: But, What Ends When the Symbols Shatter?
-   *  Definition FX
-      1993: Something Inside (single)
-      1993: Light Speed Collision
-                                              See also: www.geko.com.au
-
-   *  Depeche Mode                            UBL Card: 1041
-      1981: Speak & Spell                     See also: www.cis.ufl.edu
-      1981: Just Can't Get Enough / Any       See also:
-      Second Now (single)                     www.coma.sbg.ac.at
-      1982: A Broken Frame
-      1982: live singles (comp)
-      1983: Construction Time Again
-      1984: People Are People (comp +2)
-      1984: Some Great Reward
-      1985: Catching Up With Depeche Mode
-      (comp +4)
-      1985: It's Called a Heart / Fly on the
-      Windscreen (single)
-      1986: Black Celebration
-      1986: Stripped (single)
-      1986: A Question of Lust (single)
-      1989: 101 (double live)
-      1987: Music for the Masses
-      1987: Never Let Me Down (single)
-      1990: Personal Jesus (single)
-      199?: I Sometimes Wish I Was Famous: A
-      Swedish Tribute (various)
-   *  Dessau
-      1995: Dessau
-      1995: Details Sketchy
-   *  Devo                                    UBL Card: 1088
-      1978: Q: Are We Not Men? A: We Are      See also:
-      DEVO!                                   hartke.lib.ohio-state.edu
-      1979: Freedom of Choice                 See also: unsane.enc.org
-      1977-1990: Greatest Hits                See also: rt66.com
-      1978-1990: Greatest Misses
-   *  Die Krupps
-      1995: Rings of Steel
-   *  Die Monster Die
-      1994: Withdrawl Method
-   *  Die Warzau
-      1991: Big Electric Metal Bass Face
-      1994: Engine
-      1994: allgoodgirls (EP)
-   *  Disposable Heroes of Hiphoprisy
-      1992: Hypocrisy is the Greatest Luxury
-   *  Dolby, Thomas
-      1983: The Golden Age of Wireless
-      1983: The Golden Age of Wireless (2nd
-      release: 2 new)
-      1984: The Flat Earth
-                                              UBL Card: 1961
-                                              See also: kspace.com
-                                              See also: rt66.com
-
-   *  Doubting Thomas                         UBL Card: 1166
-      1991: Father Don't Cry (EP)             See also: www.eecs.nwu.edu
-      1991: The Infidel
-   *  Duran Duran
-      1981: Duran Duran
-      1982: Carnival (EP)
-      1982: live (live boot)
-      1982: Rio
-      1983: Union of the Snake / Secret
-      Oktober (single)
-      1983: The Wild Boys / Cracks in the
-      Pavement (single)
-      1983: Seven and the Ragged Tiger
-      1987: Notorious
-      1981-1988: Decade (comp)
-                                              UBL Card: 1259
-
-   *  Durutti Column                          UBL Card: 4853
-      1988: The Guitar and Other Machines
-   *  Ebn Ozn
-      1984: Feeling Cavalier
-   *  Elastica
-      1995: Elastica
-   *  Elastic Purejoy, The
-      1994: The Elastic Purejoy
-                                              See also:
-                                              http2.brunel.ac.uk
-   *  Electric Hellfire Club, The
-      1993: Burn, Baby, Burn
-      1995: Kiss the Goat
-   *  Elfman, Danny
-      1984: So-Lo
-                                              UBL Card: 1089
-
-   *  Emergency Broadcast Network
-      1995: Telecommunication Breakdown
-   *  Engorged with Blood
-      1993: Engorged with Blood (EP)
-   *  Eno, Brian                              UBL Card: 1064
-      1977: Before and After Science          See also: www.nwu.edu
-   *  Eon
-      1991: Fear: the Mindkiller (EP)
-      1992: Basket Case (EP)
-   *  Erasure                                 UBL Card: 1029
-      1984-1986: various singles              See also: www.cec.wustl.edu
-      1986: Wonderland
-                                              See also: rt66.com
-   *  Estep, Maggie
-      1994: No More Mister Nice Girl
-   *  Ethyl Meatplow                          UBL Card: 5232
-      1993: Happy Days Sweetheart
-      1993: Devil's Johnson (single)
-   *  Eurythmics
-      1981: In the Garden
-      1982: Love is a Stranger (EP)
-      1982: This is the House (live EP)
-      1983: Sweet Dreams
-      1983: Touch
-      1984: 1984 (For the Love of Big Brother) (soundtrack)
-   *  Executive Slacks
-      1986: Fire and Ice
-   *  Faith and the Muse
-      1994: Elyria
-   *  Fixx, The                               UBL Card: 4603
-      1982: Shuttered Room
-      1983: Reach the Beach
-      1984: Phantoms
-      1986: Walkabout
-      1987: React (live)
-   *  Foetus
-      19??: Rife
-      1995: Gash
-                                              UBL Card: 2750
-
-   *  Fortran 5                               UBL Card: 3469
-      1991: Blues                             See also: rt66.com
-      1993: Bad Head Park
-   *  45 Grave
-      1993: Debasement Tapes
-   *  Frankie goes to Hollywood               UBL Card: 3222
-      1984: Welcome to the Pleasure Dome      See also: rt66.com
-   *  Freur
-      1983: Doot Doot
-                                              See also: rt66.com
-
-   *  Front 242                               UBL Card: 1059
-      1979: Masterhit (EP)                    See also: www.ifi.uio.no
-      1983: Geography                         See also: www.eecs.nwu.edu
-      1987: Official Version
-      1985: No Comment
-      1982: Two In One (EP)
-      1982-1985: Backcatalogue (comp)
-      1989: Headhunter (EP)
-      1989: Front by Front
-      1989: Never Stop (EP)
-      1991: Tyrrany For You
-      1991: Tragedy For You (EP)
-      1991: Rhythm of Time (EP)
-      1993: Religion (EP)
-      1993: Animal (single)
-      1993: 06:21:03:11 Up Evil
-      1993: 05:22:09:12 Off
-   *  Front Line Assembly
-      1988: Convergence
-      1989: Digital Tension Dementia (EP)
-      1990: Gashed Senses and Crossfire
-      1991: Caustic Grip
-      1992: Tactical Neural Implant
-                                               UBL Card: 1161
-
-   *  Fugazi                                  UBL Card: 2053
-      1989: 13 Songs
-   *  Fun Boy Three
-      1982: It Ain't What You Do / Just Do It / Funrama Theme (single)
-      1981-1983: The Best of Fun Boy Three (comp)
-   *  Fuzzbox                                 See also: world.std.com
-      1986: We've got a Fuzzbox and We're
-      Gonna Use It!!
-      1986: Love is the Slug (single)
-      1986: Rules and Regulations (single)
-   *  Gabriel, Peter
-      1977: Peter Gabriel I
-      1978: Peter Gabriel II
-      1980: Peter Gabriel III
-      1982: Security
-      1983: Peter Gabriel Plays Live (double
-      live)
-      1985: Birdy (soundtrack)
-      1986: So
-      1986: Live at the Civic Arena (live
-      boot)
-      1989: Passion (soundtrack)
-                                              UBL Card: 1016
-                                              See also: www.nwu.edu
-                                              See also:
-                                              www.cs.clemson.edu
-
-   *  Garbage                                 See also:
-      1995: Garbage                           hamp.hampshire.edu
-   *  Game Theory
-      1987: Lolita Nation
-   *  Gang of 4                               See also:
-      1979: Entertainment                     http2.brunel.ac.uk
-      1979: Peel Sessions (live)
-      1981: Solid Gold
-      1981: Another Day / Another Dollar
-      1982: I Love a Man In a Uniform
-      (single)
-      1982: Songs of the Free
-      1983: Is It Love (single)
-      1983: Hard
-      1983: At the Palace (live)
-      1979-1983: A Brief History of the
-      Twentieth Century (comp)
-      1990: To Hell With Poverty (single)
-      1990: Mall
-      1990: Money Talks (single)
-      1995: Tatoo (single)
-      1995: Shrinkwrapped
-   *  Glove, The
-      1982: Blue Sunshine
-                                              UBL Card: 1159
-                                              See also: www.dcs.gla.ac.uk
-   *  God is my Copilot
-      1993: Speed Yr Trip
-   *  Gracious Shades
-      1995: Aberkash
-   *  Grind
-      1995: Kittymuzzle
-   *  Grotus
-      1993: Slow Motion Apocalypse
-                                              UBL Card: 5482
-
-   *  Pizzicato Five
-      1995: The Sound of Music
-   *  PJ Harvey
-      1992: Dry
-      1993: Rid of Me
-      1993: 4-Track Demos
-      1995: Down by the Water (single)
-      1995: To Bring You My Love
-                                              UBL Card: 1221
-                                              See also:
-                                              www.louisville.edu
-
-   *  Psychick Warriors ov Gaia
-      1992: Ov Biospheres and Sacred Groves
-   *  Hagen, Nina
-      1985: In Ekstasy
-      1978-1982: nunsexmonkrock / Nina Hagen Band
-   *  Hate Dept.                              See also: www.iuma.com
-      1994: Meat Your Maker
-      1995: Mainline (EP)
-   *  Haysi Fantayzee
-      1982: Shiny Shiny remix (single)
-   *  Heaven 17
-      1981: Penthouse and Pavement
-      1982: Heaven 17
-      1983: The Luxury Gap
-      1984: How Men Are
-   *  Hope, Peter and Kirk, Richard
-      1988: Hoodoo Talk
-                                              UBL Card: 2307
-
-   *  Kershaw, Nik
-      1983: Human Racing
-   *  Kirk, Richard
-      1993: Virtual State
-                                              UBL Card: 2307
-
-   *  Human League                            UBL Card: 4631
-      1979: Reproduction                      See also: pathfinder.com
-      1980: Travelogue
-      1981: Dare
-      1983: Fascination
-      1984: Hysteria
-      1995: Octopus
-   *  Hunters and Collectors
-      1987: Human Frailty
-                                              UBL Card: 4553
-
-   *  Ice T                                   UBL Card: 2342
-      1991: New Jack Hustler (EP)
-   *  In the Nursery
-      19??: L'Esprit
-   *  INXS                                    UBL Card: 1284
-      1982: Shabooh Shoobah
-      1984: The Swing
-      1985: Listen Like Thieves
-      1988: Kick
-      1990: X
-   *  J., David
-      1983-1986: On Glass (comp)
-      1985: Crocodile Tears and the Velvet
-      Cosh
-                                              UBL Card: 1215
-                                              See also:
-                                              gothic.acs.csulb.edu
-                                              See also:
-                                              isvpc146.isv.uit.no
-   *  Jesus and Mary Chain, The               UBL Card: 1228
-      1992: Reverence (EP)                    See also:
-      1992: Honey's Dead                      american.recordings.com
-      1995: Hate Rock and Roll (comp)
-   *  Jones, Grace
-      1993: Sex Drive (single)
-   *  Jones, Howard
-      1983: Humans' Lib
-      1985: Dream Into Action
-   *  Joy Division
-      1977-1978: Warsaw (comp)
-      1979: Unknown Pleasures
-      1980: Closer
-      1980: Transmission / Novelty (single)
-      1980: Still
-      1977-1980: Substance (comp)
-      1995: Ceremonial: A Tribute (various)
-                                              UBL Card: 1214
-                                              See also: www.fys.uio.no
-                                              See also:
-                                              csclub.uwaterloo.ca
-
-   *  King Crimson                            UBL Card: 1323
-      1969: In the Court of the Crimson King
-      1973: Larks' Tongues in Aspic
-      1974: Starless and Bible Black
-      1981: Dicipline
-      1982: Beat
-      1984: Three of a Perfect Pair
-   *  KMFDM
-      1993: Angst
-                                              UBL Card: 1452
-
-   *  Kraftwerk                               UBL Card: 1027
-      1977: Trans-Europe Express (EP)         See also: wwwtdb.cs.umu.se
-                                              See also: rt66.com
-   *  L7
-      1988: L7
-      1990: Smell the Magic
-      1992: Bricks are Heavy
-      1994: Hungry for Stink
-                                              UBL Card: 1998
-
-   *  Le&ae;ther Strip
-      1995: Legacy of Hate and Lust
-   *  Lemon Kittens
-      1978-1980: We Buy a Hammer for Daddy
-                                              UBL Card: 1746
-
-   *  Letters to Cleo                         UBL Card: 3000
-      1994: Aurora Gory Alice
-   *  LFO
-      1991: Frequencies
-      1996: Advance
-   *  London After Midnight
-      1989: Selected Scenes from the End of the World
-   *  Lords of Acid
-      1991: Rough Sex (single)
-      1993: Voodoo U
-      1994: The Crablouse: Variations on a
-      Species (single)
-                                              UBL Card: 2356
-
-   *  Lords of the New Church, The
-      1983: Is Nothing Sacred?
-   *  Love and Rockets
-      1985: Ball of Confusion / Inside the
-      Outside (single)
-      1985: Seventh Dream of Teenage Heaven
-      1986: Express
-      1986: Kundalini Express / Lucifer Sam /
-      Holiday on the Moon (single)
-      1987: Earth, Sun, Moon
-      1989: No Big Deal (single)
-      1989: Motorcycle (single)
-      1989: Love and Rockets
-      1994: This Heaven (EP)
-      1994: Body and Soul (EP)
-      1994: Hot Trip to Heaven
-      1995: The Glittering Darkness (EP)
-      1996: Sweet F. A.
-                                              UBL Card: 1215
-                                              See also:
-                                              american.recordings.com
-                                              See also:
-                                              gothic.acs.csulb.edu
-
-   *  Love is Colder than Death
-      1993: Oxeia
-      19??: Mental Traveller
-      19??: Teignmouth
-   *  Low Pop Suicide
-      1992: Disengagement (EP)
-      1992: On the Cross of Commerce
-      1994: Kiss Your Lips (remixes)
-      1995: The Death of Excellence
-                                               UBL Card: 1984
-
-   *  Luscious Jackson
-      1992: In Search of Manny
-      1994: Natural Ingredients
-   *  Lush
-      1990: Gala
-      1992: Spooky
-      1994: Split
-                                              UBL Card: 2359
-                                              See also:
-                                              isvpc146.isv.uit.no
-
-   *  Lwin, Annabella                         UBL Card: 2301
-      1986: War Boys (single)
-      1994: Car Sex (EP)
-   *  Lycea
-      1993: A Day in the Stark Corner
-                                              See also: www.projekt.com
-
-   *  M
-      1979: Pop Musik (7inch)
-   *  Machines of Loving Grace
-      1991: Rite of Shiva (single)
-      1991: Machines of Loving Grace
-      1992: Burn Like Brilliant Trash (EP)
-      1993: Concentration
-      1995: Gilt
-                                              UBL Card: 1219
-                                              See also: www.nando.net
-
-   *  M|A|R|R|S
-      1987: Pump Up the Volume / Anitina (single)
-   *  Mallinder, Stephen
-      1982: Pow Wow
-                                              UBL Card: 2307
-
-   *  Manufacture
-      1988: Terrorvision
-   *  March Violets, The
-      1984: Natural History
-      1982-1984: The Botanic Verses (comp)
-      1983-1985: Electric Shades (comp)
-      1985: Deep (EP)
-      1986: A Turn to the Sky / Never Look
-      Back / Deep / Rebirth (single)
-                                              UBL Card: 1114
-                                              See also: www.cm.cf.ac.uk
-
-   *  Martha and the Muffins                  UBL Card: 2529
-      1980-1984: Far Away in Time (comp)
-   *  Mary's Danish
-      1991: Circa
-                                              UBL Card: 3727
-
-   *  MC 900 Foot Jesus                       UBL Card: 1229
-      1989: Hell With the Lid Off             See also:
-      1989: UFOs Are Real (EP)                american.recordings.com
-      1990: Welcome to My Dream
-      1990: Killer Inside Me (EP)
-   *  McLachlan, Sarah
-      1992: Into the Fire (single)
-                                              UBL Card: 1389
-
-   *  Meat Beat Manifesto                     UBL Card: 3626
-      1988: Armed Audio Warfare
-      1990: Dog Star Man (EP)
-      1990: 99%
-      1990: Psyche Out (EP)
-      1990: Now (EP)
-      1992: Satryicon
-      1993: Peel Session (EP)
-   *  Medicine
-      1993: The Buried Life
-      1994: Shot Forth Self Living
-                                              UBL Card: 1432
-                                              See also: kspace.com
-
-   *  Mephisto Walz
-      1986-1992: Crocosmia
-      1993: Terra-Regina (comp)
-      1994: The Eternal Deep
-      1995: Thalia
-   *  Midnight Oil
-      1979: Head Injuries
-      1981: Place without a Postcard
-      1983: 10, 9, 8, 7, 6, 5, 4, 3, 2, 1...
-      1985: Red Sails in the Sunset
-                                              UBL Card: 1102
-                                              See also:
-                                              www.stevens-tech.edu
-
-   *  Miller, Roger
-      1987: Maximum Electric Piano
-   *  Ministry
-      1983: With Sympathy
-      1984: Halloween Remix / The Nature of
-      Outtakes (EP)
-      1981-1984: various singles
-      1985: Cold Life
-      1985: Over the Shoulder / Isle of Man
-      (EP)
-      1986: Twitch
-      1988: 12 Inch Singles (comp)
-      1988: The Land of Rape and Honey
-      1988: Stigmata / Tonight we Murder (EP)
-
-      1989: The Mind is a Terrible Thing to
-      Taste
-      1991: Jesus Built my Hotrod (EP)
-      1992: Psalm 69
-                                              UBL Card: 1100
-                                              See also:
-                                              csclub.uwaterloo.ca
-
-   *  Miranda Sex Garden                      UBL Card: 3007
-      1991: Gush Forth my Tears               See also:
-      1991: Madra                             sksol1.physics.sunysb.edu
-      1992: Iris
-      1993: Suspiria
-      1994: Fairytales of Slavery
-   *  Missing Persons
-      1982: Missing Persons (EP)
-      1982: Spring Session M
-      1984: Rhyme & Reason
-      1982-1984: Best of (comp)
-   *  Mistle Thrush
-      199?: Silt
-      1994: Agus Amàrach
-   *  Mission, The
-      1986: God's Own Medicine
-      1987: the First Chapter
-                                              UBL Card: 2045
-
-   *  Mission of Burma
-      1987: Forget
-   *  Morissette, Alanis
-      1995: Jagged Little Pill
-                                              UBL Card: 3127
-
-   *  Morrison, Patricia                      UBL Card: 1062
-      1994: Reflect on This
-   *  Moyet, Allison
-      1985: ALF
-                                              UBL Card: 3410
-                                              See also: rt66.com
-   *  Murder Inc.
-      1992: Murder Inc.
-   *  Mussolini Headkick
-      1990: Blood on the Flag
-   *  Murphy, Peter                           UBL Card: 1235
-      1986: Should the World Fail to Fall     See also:
-      Apart                                   gothic.acs.csulb.edu
-                                              See also:
-                                              isvpc146.isv.uit.no
-   *  My Bloody Valentine
-      1988: Isn't Anything
-      1991: Loveless
-                                              UBL Card: 1912
-
-   *  My Life with the Thrill Kill Kult        UBL Card: 3478
-      1988: I See Good Spirits and I See Bad
-      Spirits
-      1989: K00Ler than Jesus
-      1990: Confessions of a Knife...
-      1990: Swine & Roses / Naive (KMFDM)
-      (single)
-   *  Neither/Neither World
-      1994: Tales of True Crime
-   *  Neotek
-      1995: Brain over Muscle
-   *  New Fast Automatic Daffodils
-      1991: Pigeonhole
-      1992: Bong
-   *  New Order                               UBL Card: 1126
-      1981: Movement                          See also:
-      1981: Temptation / Hurt (single)        topquark.cecer.army.mil
-      1982: Factus 8
-      1984: Power, Corruption, and Lies
-      1984: Blue Monday (single)
-      1985: The Perfect Kiss (single)
-      1985: Confusion (single)
-      1985: Low Life
-      1983-5: various singles
-      1986: Brotherhood
-   *  Nine Inch Nails
-      1989: Pretty Hate Machine
-      1989: Head Like a Hole (remixes)
-      1990: Sin (remixes)
-      1992: Broken (EP)
-      1992: Fixed (remixes)
-      1994: March of the Pigs (EP)
-      1994: The Downward Spiral
-      1994: Closer to God (EP)
-      1994: Closer (Further Away) (EP)
-      1994: Further Down the Spiral (remixes)
-                                              UBL Card: 1046
-                                              See also: www.scri.fsu.edu
-                                              See also: metaverse.com
-
-   *  Nirvana                                 UBL Card: 1052
-      1991: Nevermind                         See also: www.ludd.luth.se
-                                              See also:
-                                              home.earthlink.net
-   *  Nitzer Ebb
-      1987: That Total Age
-      1987: Warsaw Ghetto (EP)
-      1987: So Bright So Strong (remixes)
-      1987: Get Clean (remixes)
-      1988: Control: I'm Here (single)
-      1989: Hearts and Minds (single)
-      1989: Belief
-      1990: Showtime
-      1991: I Give to You (single)
-      1991: As Is (single)
-      1991: Ebbhead
-      1991: Godhead (EP)
-                                              UBL Card: 1164
-                                              See also: www.eecs.nwu.edu
-
-   *  No Doubt
-      1995: Tragic Kingdom
-   *  Noise Unit
-      1989: Grinding Into Emptiness
-   *  Nosferatu
-      1993: Rise
-   *  Numan, Gary
-      1978: Tubeway Army
-      1978: The Plan
-      1979: Replicas
-      1979: The Pleasure Principle
-      1980: Telekon
-      1981: Warriors
-      1981: Dance
-      1982: I, Assassin
-      1984: White Noise (double live)
-      1987: Ghost (double live)
-                                              UBL Card: 1409
-
-   *  Offspring
-      1994: Smash
-   *  Oingo Boingo
-      1980: Forbidden Zone (soundtrack)
-      1981: Only a Lad
-      1983: Good for Your Soul
-      1986: Dead Man's Party
-      1987: Nothing to Fear
-                                              UBL Card: 1089
-                                              See also: rhino.harvard.edu
-
-   *  Orb, The                                UBL Card: 1121
-      1991: The Orb's Adventures Beyond the   See also: www.hyperlink.com
-      Ultraworld
-      1991: Aubrey Mixes, the Ultraworld      See also:
-      Excursions                              www.phlab.missouri.edu
-      1991: Little Fluffy Clouds (EP)         See also: rt66.com
-      1992: U.F.Orb
-      1993: live 93 (double live)
-      1994: Pomme Fritz
-   *  Orbital
-      1993: Orbital 2
-                                              UBL Card: 2049
-                                              See also: rt66.com
-   *  Orchestral Manoeuvers in the Dark        UBL Card: 5370
-      1980: OMD (US release)
-      1980: OMD (UK release)
-      1981: Bunker Soldiers
-      1981: Architecture & Morality
-      1983: Dazzle Ships
-      1984: Junk Culture
-      1985: Crush
-   *  Oxygiene 23
-      1995: Blue
-   *  187 Calm
-      1995: One Eighty Seven Calm (EP)
-   *  1000 Homo DJs
-      1990: Supernaut (EP)
-   *  Opus III
-      1991: Mind Fruit
-      1994: Guru Mother
-   *  Pain Teens
-      1990: Born in Blood / Case Histories
-      1992: Stimulation Festival
-      1993: Destroy Me, Lover
-      1995: Beast of Dreams
-   *  Paralysed Age
-      1994: Nocturne
-   *  Pigface
-      1990: Gub
-                                              UBL Card: 1165
-                                              See also: www.eecs.nwu.edu
-   *  Pink Floyd                               UBL Card: 1008
-      1973: Dark Side of the Moon
-      1975: Wish You were Here
-      1978: The Wall (double soundtrack)
-      1981: A Collection of Great Dance Songs
-      (comp)
-      1995: A Saucerful of Pink: a Tribute
-      (double, various)
-   *  Polygon Window
-      1993: Surfing on Sine Waves
-                                              UBL Card: 5279
-
-   *  Police                                   UBL Card: 1172
-      1979: Outlandos D'Amour
-      1980: Ghost in the Machine
-      1981: Zenyatta Mondatta
-      1983: Synchronicity
-   *  Poe
-      1995: Hello
-   *  Pop, Iggy                               UBL Card: 4345
-      1977: Lust for Life
-   *  Powerman 5000
-      1995: The Blood Splat Rating System
-   *  Powerstation, The                        UBL Card: 1259
-      1985: The Powerstation
-   *  Pram
-      199?: Iron Lung (EP)
-      1995: Helium
-      1995: Sargasso Sea
-   *  Prick                                   UBL Card: 3683
-      1995: Prick
-   *  Primus
-      1991: Sailing on the Seas of Cheese
-                                              UBL Card: 1055
-
-   *  Project Pitchfork
-      1991: Dhyani
-   *  Propaganda
-      1985: A Secret Wish, US version
-      1985: A Secret Wish, UK version
-      (remixes)
-      1985: p:machinery (polish / passive) /
-      Frozen Faces (single)
-      1985: Duel / Jewel (single)
-      1985: Wishful Thinking (remixes)
-      1990: Heaven Give Me Words (EP)
-      1995: p:machinery t-empo remix (single)
-                                              UBL Card: 4636
-                                              See also: rt66.com
-                                              See also:
-                                              hcl.chass.ncsu.edu
-
-   *  Prophetess, The
-      1993: The Prophetess
-   *  Public Image Limited
-      1985: Album
-   *  Rage Against the Machine                UBL Card: 1424
-      1992: Rage Against the Machine
-   *  Romeo Void
-      1981: Never Say Never / Present Tense (single)
-   *  Blaine Reininger
-      1989: Expatriate Journals
-   *  Red Aunts
-      1993: Drag
-      1994: Bad Motherfucker 400-Z
-      1995: #1 Chicken
-                                               UBL Card: 4619
-
-   *  Re-Flex
-      1983: The Politics of Dancing / Re-Flex It (single)
-   *  Revolting Cocks
-      1986: Big Sexy Land
-      1988: You Goddamned Son of a Bitch
-      (double live)
-      1989: Stainless Steel Providers (EP)
-      1990: Beers, Steers, and Queers
-      1993: Linger Ficken' Good
-                                              UBL Card: 1100
-
-   *  Ridgway, Stan                           UBL Card: 2904
-      1986: The Big Heat
-   *  Rosemarys, The
-      1993: Providence
-   *  Rosetta Stone
-      1993: Adrenaline
-      1995: The Tyrrany of Inaction
-   *  Ruby
-      1995: Salt Peter
-   *  Rump
-      1994: Hating Brenda
-   *  Rush
-      1984: Grace Under Pressure
-                                              UBL Card: 1039
-
-   *  Sandoz
-      1993: Digital Lifeforms
-   *  Scatterbrain
-      1990: Here Comes Trouble
-   *  Scar Tissue
-      1995: Scar Tissue
-   *  Scritti Politti
-      1985: Cupid & Psyche
-   *  Severed Heads                           UBL Card: 1480
-      1983: Since the Accident
-      1986: Come Visit the Big Bigot
-      1987: Bad Mood Guy
-   *  Sex Gang, Andi
-      1994: Arco Valley
-   *  Sex Gang Children
-      1992: Blind
-      1993: Dieche
-      1993: Medea
-   *  Shadow Project
-      1991: Shadow Project
-   *  Sharkbait
-      1991: Blowtorch Facelift
-      1993: Crushits
-   *  Sheep on Drugs
-      1993: Greatest Hits (comp)
-      1995: Suck (EP)
-   *  Shriekback                              UBL Card: 1248
-      1982: Tench                             See also:
-      1983: Care                              http2.brunel.ac.uk
-      1983: Care (Y version)
-      1983: Lined Up / Hapax Legomena
-      (single)
-      1983: Lined Up / My Spine / Accretions
-      /Into Method (single)
-      1983: My Spine / Accretions / Clear
-      Trails (single)
-      1983: Sexthinkone / Here Comes My Hand
-      (single)
-      1984: Jamscience (UK release)
-      1984: Jamscience (Holland release)
-      1984: Knowledge, Power, Truth, and Sex
-      1984: Mercy Dash (picture disc, single)
-
-      1984: Hand on my Heart (picture disc,
-      single)
-      1985: The Infinite (comp)
-      1985: Oil and Gold
-      1985: Fish Below the Ice (EP)
-      1983-1985: Priests and Kannibals (comp)
-
-      1986: Big Night Music
-      1986: Islam Grotto (live boot)
-      1988: Evolution (comp)
-      1990: The Dancing Years (remixes)
-      1993: Sacred City
-   *  Siglo XX
-      1983-1986: Antler Tracks I (comp)
-      1986: Fear and Desire
-   *  Single Gun Theory                       UBL Card: 1404
-      1989?: Exorcise this Wasteland          See also: www.magna.com.au
-      1991: Like Stars in my Hands
-      1993: Burning Bright (but Unseen) (EP)
-      1994: Flow, River of my Soul
-   *  Siouxsie and the Banshees
-      1977: Peel Sessions (live EP)
-      1978: Peel Sessions 2 (live EP)
-      1978: The Scream
-      1979: Join Hands
-      1980: Kaleidoscope
-      1981: juju
-      1981: Once Upon a Time (comp)
-      1981: Spellbound / Follow the Sun / Slap
-      Dash Snap (single)
-      1982: Slowdive / Obsession II / Cannibal
-      Roses (single)
-      1982: A Kiss in the Dream House
-      1983: Nocturne (double live)
-      1984: Hyaena
-      1985: Tinderbox
-      1986: Through the Looking Glass
-      1987: Song from the Edge of the World
-      (single)
-      1988: Peekaboo / False Face / Catwalk
-      (single)
-      1988: Peepshow
-      1991: Superstition
-      1991: Kiss Them for Me (EP)
-      1995: The Rapture
-                                               UBL Card: 1216
-
-   *  Sister Machine Gun                      UBL Card: 3612
-      1992: Sins of the Flesh
-      1994: The Torture Technique
-      1994: Nothing (single)
-      1994: Wired / Lung (single)
-      1995: Burn
-   *  Sisterhood, The
-      1986: Gift
-                                              UBL Card: 1115
-                                              See also: www.cm.cf.ac.uk
-   *  Sisters of Mercy                        UBL Card: 1062
-      1985: First and Last and Always         See also: www.cm.cf.ac.uk
-      1988: Floodland
-      1988: More / You Could be the One
-      (single)
-      1990: Vision Thing
-      1992: Some Girls Wander by Mistake
-      (comp)
-      1992: Temple of Love 1992 (single)
-      1993: First and Last and Forever: A
-      Tribute (various)
-      1993: Under the Gun / Alice 1993
-      (single)
-   *  Skeletal Family
-      1984-1985: Burning Oil / Futile Combat
-   *  Skinny Puppy                            UBL Card: 1166
-      1983: Back and Forth, Series Two        See also: www.eecs.nwu.edu
-      1984: Bites
-      1984: Remission
-      1984: Bites and Remission
-      1986: Mind: the Perpetual Intercourse
-      1986: Dig It (EP)
-      1987: Cleanse, Fold, and Manipulate
-      1988: Vivisect VI
-      1989: Rabies
-      1990: Too Dark Park
-      1990: Censor (EP)
-      1992: 12 Inch Anthology (comp)
-      1992: Last Rights
-   *  Sky Cries Mary
-      1993: A Return to the Inner Experience
-      1994: This Timeless Turning
-      1994: Every Iceberg is Afire / Deep
-      Sunless Sea / Cornerman (single)
-                                              UBL Card: 1437
-                                              See also: www.starwave.com
-
-   *  Snog
-      1995: Dear Valued Customer
-   *  Soh Daiko
-      1990: Taiko Drum Ensemble
-   *  Some, Belouis
-      1984: Some People (single)
-   *  Southern Death Cult
-      1982-1983: Southern Death Cult (comp)
-   *  Spahn Ranch
-      1995: The Coiled One
-   *  SSQ
-      1984: Playback
-      1986: Insecurity (single)
-   *  Stabbing Westward                       UBL Card: 2415
-      1993: Violent Mood Swings (EP)
-      1994: Ungod
-      1995: What Do I Have to Do / Falls
-      Apart (single)
-      1995: Wither Blister Burn and Peel
-   *  Strange Boutique
-      199?: Charm
-      199?: The Kindest Words
-      199?: The Loved One
-                                              See also: www.iuma.com
-
-   *  Steroid Maximus                          UBL Card: 2750
-      1991: Quilombo
-      1992: Gondwanaland
-   *  Sugarcubes, The
-      1988: Life's Too Good
-                                              UBL Card: 3419
-                                              See also: math-www.uio.no
-   *  Sunscreem
-      1992: O3
-   *  Switchblade Symphony
-      1992: Fable (tape/EP)
-      1993: Elegy (tape/EP)
-      1995: Serpentine Gallery
-   *  Talking Heads                            UBL Card: 1012
-      1977: Talking Heads '77
-      1978: More Songs About Buildings and
-      Food
-      1979: The Name of This Band is Talking
-      Heads (double live)
-      1981: Fear of Music
-      1983: Sp eak in gI n To ngu es
-      1985: Stop Making Sense (live
-      soundtrack)
-      1985: Little Creatures
-   *  Tears For Fears
-      1983: The Hurting
-      1985: Songs From the Big Chair
-                                              UBL Card: 2763
-
-   *  Tel Basta
-      1996: Lickerish
-   *  Thanatos
-      1995: An Embassy in Gaius
-   *  Therapy?                                UBL Card: 2044
-      1992: Caucasian Psychosis
-      1992: Nurse
-   *  13 Mg.
-      1995: Trust and Obey
-   *  This Ascension
-      1991: Light and Shade
-      1994: Walk Softly, a Dream Lies Here
-   *  Throwing Muses
-      1986: Throwing Muses
-                                              UBL Card: 1357
-
-   *  Tinfed
-      1993: Synaptic Hardware
-   *  Tin Machine
-      1989: Tin Machine
-                                              UBL Card: 1098
-
-   *  Tit Wrench United
-      1993: Full Employment
-   *  Tom Tom Club
-      1981: Tom Tom Club
-      1983: Close to the Bone
-                                              UBL Card: 1012
-
-   *  Tones on Tail                           UBL Card: 1235
-      1982: Tones on Tail                     See also:
-      1984: Pop                               gothic.acs.csulb.edu
-      1984: Performance / Shakes (single)     See also:
-      1982-1984: Night Music (comp)           isvpc146.isv.uit.no
-   *  Trance Mission
-      1993: Trance Mission
-   *  Trance to the Sun
-      1994: Ghost Forest
-      1995: Bloom, Flowers, Bloom!
-      1995: Venomous Eve
-   *  Transvision Vamp
-      1991: Little Magnets versus the Bubble
-      of Babble
-                                              UBL Card: 5305
-
-   *  Trio
-      1983: Trio and Error
-   *  Tubes, The
-      1981: Tubes Rarities And Smash Hits [T.R.A.S.H]
-   *  Tuxedomoon
-      1980: Half-Mute
-      1983: A Thousand Lives by Picture
-      1985: Holy Wars
-   *  Underflowers
-      1995: Underflowers
-   *  Urban Dance Squad                        UBL Card: 4626
-      1991: Life'n Perspectives of a Genuine
-      Crossover
-   *  Usherhouse
-      1993: Molting
-      1994: Flux
-   *  Ultravox
-      1978: Systems of Romance
-   *  Van Acker, Luc
-      1980: Taking Snapshots, Volume 1
-                                              UBL Card: 1100
-
-   *  Vangelis                                UBL Card: 1023
-      1994: Blade Runner (soundtrack)         See also: rt66.com
-   *  various
-      1980: URGH! A Music War (live comp)
-      1981-1994: Wax Trax Black Box (comp)
-      1982-198?: In Goth Daze (Anagram version) (comp)
-      1982-1994: In Goth Daze (Cleopatra version) (comp)
-      1982-1993: The Whip (Cleopatra) (comp)
-      1984-1985: IQ6: Zang Tumb Tuum Sampled (comp)
-      1984-1995: DEC ADE NCE (Nettwerk) (comp)
-      1988: This is Electronic Body Music (comp)
-      1990: From Across This Gray Land #2 (Projekt) (comp)
-      1990: Doctor Death IV: The Marvels of Insect Life (double comp)
-      1990: Red Hot + Blue (comp)
-      1991: Bouquet of Dreams (comp)
-      1980-1992: Gothic Rock (comp)
-      1992: Mindfield (Third Mind) (comp)
-      1992: From Across This Gray Land #3 (Projekt) (comp)
-      1992: The Cyberflesh Conspiracy (comp)
-      1992: Gárgula Mecânica: World Electrostatic Assembly (comp)
-      1992: CCCC: California Cyber Crash Compilation (Cop) (comp)
-      1993: Shut Up Kitty (comp)
-      1988-1993: Can You See It Yet? (Invisible) (comp)
-      1994: Mysterious Encounters (Cleopatra) (comp)
-      1994: The Crow (comp)
-      1994: Totentanz: The Best of Zoth Ommog (double comp)
-      1992: Hy! (Hyperium Compilation volume 1) (comp)
-      1993: World Domination Sampler (comp)
-      1993: Rivet Head Culture (comp)
-      1993: Artificial Intelligence (Warp) (comp)
-      1994: Artificial Intelligence II (Warp) (comp)
-      1994: Big Hard Disk #2 (Smash) (comp)
-      1994: Kindred Spirits (Bedazzled) (comp)
-      1994: Plug In + Turn On (Instinct) (comp)
-      1994: The Disease of Lady Madeline (Anubis) (comp)
-      1994: Natural Born Killers (soundtrack comp)
-      1994: Afterburn (Wax Trax) (comp)
-      1994: Chaos Compilation (Cop) (comp)
-      1994: Electrocity Vol. 5 (comp)
-      1995: Gothik (Cleopatra) (double comp)
-      1995: Godfathers of German Gothic (comp)
-      1995: Heavenly Voices III (Hyperium) (comp)
-      1995: Mortal Kombat (soundtrack comp)
-      1995: The Tyranny Off the Beat (Off Beat/Cleopatra) (comp)
-      1995: Forced Cranial Removal (Fifth Colvmn) (comp)
-      1995: Dreams in the Witch House (Grave News) (comp)
-   *  Vega, Suzanne                           UBL Card: 2088
-      1992: 99.9F
-   *  Vinyl Devotion
-      1994: If They Know You're Trying
-   *  Volume Magazine
-      1991: Volume: 1 (comp)
-      1991: Volume: 2 (comp)
-      1992: Volume: 3 (comp)
-      1992: Volume: 4 (comp)
-      1995: Wasted: The Best of Volume (double comp)
-   *  Waitresses, The
-      1981: Wasn't Tomorrow Wonderful?
-      1982: Bruiseology
-      1978-1981: Best Of (comp)
-   *  Wake, The
-      1993: Masked
-   *  Wall of Voodoo
-      1980: fpfpfpfpfpfp
-      1981: Dark Continent
-      1982: Call of the West
-      1986: Seven Days in Sammystown
-      1987: Happy Planet
-   *  Wang Chung                               UBL Card: 2245
-      1983: Points On the Curve
-      1985: To Live and Die in L.A.
-      (soundtrack)
-   *  Westworld
-      1987: Rockulator
-      1991: Movers and Shakers
-      1991: Do No Wrong (single)
-   *  Whale                                   UBL Card: 3790
-      1994: Hobo Humpin Slobo Babe / Eye 842  See also: www.vmg.co.uk
-      (single)
-      1994: Hobo Humpin Slobo Babe / Lips /
-      Eye 842 (single)
-      1994: Pay for Me (EP)
-      1995: We Care
-      1995: I'll Do Ya (EP)
-      1995: Hobo Humpin Slobo Babe (3 mixes)
-      (single)
-      1995: Hobo Humpin Slobo Babe / You and
-      Your Sister / Singer Star (single)
-   *  White Zombie
-      1992: Nightcrawlers: the KMFDM Remixes (EP)
-   *  Wilde, Kim
-      1981: Kim Wilde
-      1984: Teases & Dares
-      1981-1993: The Singles Collection (comp)
-   *  X
-      1988: Live at the Whiskey-a-Go-Go (double live)
-   *  X Marks the Pedwalk
-      1994: The Killing Had Begun
-   *  Xorcist
-      1991: Damned Souls
-      1993: Bitches (EP)
-   *  XTC                                     UBL Card: 1044
-      1982: Waxworks
-      1983: Mummer
-      1984: The Big Express
-      1985: 25 O'Clock
-   *  Xymox
-      1985: Clan of Xymox
-                                              UBL Card: 1295
-                                              See also:
-                                              isvpc146.isv.uit.no
-   *  Yamashirogumi, Geinoh
-      1990: Akira (soundtrack)
-   *  Yazoo
-      1982: Upstairs at Eric's
-      1982: The Other Side of Love (single)
-      1983: You and Me Both
-      1983: Nobody's Diary / State Farm
-      (single)
-      1983: Situation (EP)
-                                              UBL Card: 4309
-                                              See also: rt66.com
-
-   *  Yello                                   UBL Card: 1506
-      1980: Solid Pleasure                    See also: newton.space.net
-      1981: Stella                            See also: rt66.com
-      1983: You Gotta Say Yes to Another
-      Excess
-      1987: One Second
-      1988: Flag
-   *  Yes
-      1972: Fragile
-      1975: Classic Yes
-      1980: Drama
-      1983: 90125
-                                              UBL Card: 1038
-
---------------167E2781446B
-Content-Type: text/html; charset=us-ascii; name="album-list.html"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline; filename="album-list.html"
-
-<BASE HREF="/tmp/album-list.html">
-
-<H3 ALIGN=CENTER>jwz's tunes<BR>Last modified: 06-Apr-96.</H3>
-
-
-<TITLE>jwz's tunes</TITLE>
-This is a list of all of the music I have on CD, tape, and vinyl
-(including all of the old, embarrasing stuff...)  This page may look
-a little funny if you aren't using a browser that supports HTML
-tables, like
-<A HREF="http://home.netscape.com/comprod/mirror/index.html">Mozilla</A>.<P>
-
-<BLOCKQUOTE>
-``<I>Publishing CD lists and tape collections evokes images of
-lonely, pathetic men who talk about their cats incessantly.</I>''
--- Paul Phillips
-</BLOCKQUOTE>
-
-I used to have this set up so that clicking on any name would take
-you to the appropriate entry of the All Music Guide at
-<TT>gopher://allmusic.ferris.edu</TT>; but they have since moved their
-database from there to
-<A HREF="http://allmusic.com/cgi-bin/mserver/SID=0/$amgpages=amg+main"><TT>cdnow.com</TT></A>,
-and in the process, have obfuscated access to the database to such an extent
-that this is no longer possible.  In order to get at the discographies, you
-need to weed your way through dozens of pages, and there seems to be no even
-semi-reliable way to pre-compute the URL that they will use.  Arrgh!<P>
-
-<A HREF="http://www.cm.cf.ac.uk/Movies/welcome.html">The Internet Movie 
-Database</A> has an excellent interface for this sort of thing; I really
-wish more people would emulate that system.<P>
-
-In this list, I've included links to various related web pages that I've
-come across; one very cool and well-organized database to which many of
-these links point is 
-<A HREF="http://american.recordings.com/wwwofmusic/ubl/ubl.shtml">The 
-Ultimate Band List</A>; check it out!<P>
-
-<P ALIGN=CENTER>
-<A HREF="http://home.netscape.com/people/jwz/">Jamie Zawinski</A>
-<A HREF="mailto:jwz@netscape.com"><CODE>&lt;jwz@netscape.com&gt;</CODE></A>
-<P>
-
-<HR size=4><UL>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Act</B>
-
-	<BR><I>1988:</I> Laughter, Tears, and Rage
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4637">4637</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/ztt">rt66.com</A>
-	<BR><I>See also: </I><A HREF="http://hcl.chass.ncsu.edu/~phelpsgm/claudia.htm">hcl.chass.ncsu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Age of Chance</B>
-
-	<BR><I>1987:</I> Kiss <I>(single)</I>
-	<BR><I>1987:</I> Don't Get Mad, Get Even <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Alien Sex Fiend</B>
-
-	<BR><I>1983-1992:</I> Drive My Rocket <I>(comp)</I>
-	<BR><I>1989:</I> Too Much Acid? <I>(live)</I>
-	<BR><I>1990:</I> Curse
-	<BR><I>1992:</I> Open Head Surgery
-	<BR><I>1993:</I> Altered States of America <I>(live)</I>
-	<BR><I>1995:</I> Inferno: The Odyssey Continues<SUP>tm</SUP> <I>(soundtrack)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5291">5291</A>
-	<BR><I>See also: </I><A HREF="http://cent1.lancs.ac.uk/~unslost/guide/music/asf.html">cent1.lancs.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Alio Die</B>
-
-	<BR><I>1993:</I> Under a Holy Ritual
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1266">1266</A>
-	<BR><I>See also: </I><A HREF="http://www.projekt.com/bands/index.html">www.projekt.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Alphaville</B>
-
-	<BR><I>1984:</I> Forever Young
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3056">3056</A>
-	<BR><I>See also: </I><A HREF="http://www.escape.com/~dant/av/">www.escape.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Altered Images</B>
-
-	<BR><I>1981:</I> Happy Birthday
-	<BR><I>1983:</I> Bite
-	<BR><I>1984:</I> Collected Images <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>An April March</B>
-
-	<BR><I>1995:</I> Lessons in Vengance
-	<BR><I>1995:</I> Instruments of Lust and Fury
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>And Also the Trees</B>
-
-	<BR><I>1983-1992:</I> From Horizon to Horizon <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1867">1867</A>
-	<BR><I>See also: </I><A HREF="http://www.ugcs.caltech.edu/~scottyt/AATT.html">www.ugcs.caltech.edu</A>
-	<BR><I>See also: </I><A HREF="http://onyx.dartmouth.edu/~dupras/aatt/aatt.html">onyx.dartmouth.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Anderson, Laurie</B>
-
-	<BR><I>1982:</I> Big Science
-	<BR><I>1983:</I> United States Live, parts 1-4 <I>(5 albums)</I>
-	<BR><I>1984:</I> Mister Heartbreak
-	<BR><I>1986:</I> Home of the Brave <I>(live soundtrack)</I>
-	<BR><I>1995:</I> Bright Red
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1494">1494</A>
-	<BR><I>See also: </I><A HREF="http://www.voyagerco.com/LA/VgerLa.html">www.voyagerco.com</A>
-	<BR><I>See also: </I><A HREF="http://www.netpart.com/phil/laurie.html">www.netpart.com</A>
-	<BR><I>See also: </I><A HREF="http://www.c3.lanl.gov:8077/cgi/jimmyd/quoter?home">www.c3.lanl.gov</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ant, Adam</B>
-
-	<BR><I>1980:</I> Kings of the Wild Frontier
-	<BR><I>1981:</I> Prince Charming
-	<BR><I>1982:</I> Friend or Foe
-	<BR><I>1983:</I> Dirk Wears White Sox
-	<BR><I>1985:</I> Viva Le Rock
-	<BR><I>1979-1986:</I> Antics in the Forbidden Zone <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1205">1205</A>
-	<BR><I>See also: </I><A HREF="http://www.uhs.uga.edu/Adam_Ant/Adam.html">www.uhs.uga.edu</A>
-	<BR><I>See also: </I><A HREF="http://caprec.com/Ant/">caprec.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Anthrax</B>
-
-	<BR><I>1991:</I> Attack of the Killer B's <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2710">2710</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Aphex Twin</B>
-
-	<BR><I>1993:</I> On <I>(EP)</I>
-	<BR><I>1994:</I> Analogue Bubblebath <I>(EP)</I>
-	<BR><I>1995:</I> Ventolin <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5279">5279</A>
-	<BR><I>See also: </I><A HREF="http://hyperreal.com/music/artists/aphex_twin/afxeffect.html">hyperreal.com</A>
-	<BR><I>See also: </I><A HREF="http://pathfinder.com/elektra/artists/aphex/aphex.html">pathfinder.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Arcadia</B>
-
-	<BR><I>1985:</I> So Red the Rose
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1259">1259</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Armageddon Dildos</B>
-
-	<BR><I>1995:</I> Lost
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2538">2538</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ash, Daniel</B>
-
-	<BR><I>1991:</I> Coming Down
-	<BR><I>1992:</I> Foolish Thing Desire
-	</TD><TD>
-<I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/danielashglenncampling.html#danielashglenncampling">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Archangel, Nathalie</B>
-
-	<BR><I>1992:</I> Owl
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Art of Noise</B>
-
-	<BR><I>1983:</I> Who's Afraid of the Art of Noise?
-	<BR><I>1983:</I> The Art of Noise Have Closed Up
-	<BR><I>1983:</I> Beatbox
-	<BR><I>1983:</I> Daft
-	<BR><I>1984:</I> Edited <I>(picture disc)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1918">1918</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/ztt">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Attrition</B>
-
-	<BR><I>1985:</I> Smiling, at the Hypogonder Club <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4232">4232</A>
-	<BR><I>See also: </I><A HREF="http://www.projekt.com/bands/attrition.html">www.projekt.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>AUTECHRe</B>
-
-	<BR><I>1994:</I> INCUNABULA
-	<BR><I>1994:</I> BASSCAD,EP <I>(EP)</I>
-	<BR><I>1994:</I> Amber
-	<BR><I>1995:</I> Garbage
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>B52's</B>
-
-	<BR><I>1979:</I> B52's
-	<BR><I>1980:</I> Wild Planet
-	<BR><I>1982:</I> Mesopotamia
-	<BR><I>1983:</I> Whammy!
-	<BR><I>1981:</I> Party Mix
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2268">2268</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Babes in Toyland</B>
-
-	<BR><I>1989:</I> Spanking Machine
-	<BR><I>1991:</I> To Mother
-	<BR><I>1992:</I> Fontanelle
-	<BR><I>1993:</I> Pain Killers
-	<BR><I>1995:</I> Nemesisters
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3190">3190</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Battery</B>
-
-	<BR><I>1992:</I> Meat Market <I>(EP)</I>
-	<BR><I>1993:</I> Mutate
-	<BR><I>1994:</I> Lillith 3.2 <I>(EP)</I>
-	<BR><I>1995:</I> nv
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bauhaus</B>
-
-	<BR><I>1979:</I> Bela Lugosi's Dead <I>(EP)</I>
-	<BR><I>1981:</I> In the Flat Field
-	<BR><I>1981:</I> Mask
-	<BR><I>1981:</I> Press the Eject and Give Me the Tape <I>(live)</I>
-	<BR><I>1983:</I> Burning from the Inside
-	<BR><I>1979-1984:</I> 1979-1984 <I>(comp)</I>
-	<BR><I>1985:</I> The Sky's Gone Out
-	<BR><I>1984:</I> The Last Temptation <I>(live boot)</I>
-	<BR><I>1984:</I> Rest In Peace: The Final Concert <I>(double live)</I>
-	<BR><I>1996:</I> The Passion of Covers: A Tribute <I>(various)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1235">1235</A>
-	<BR><I>See also: </I><A HREF="http://gothic.acs.csulb.edu:8080/~vamp/Gothic/Text/bauhaus-discog.html">gothic.acs.csulb.edu</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/bauhaus.html#bauhaus">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Belly</B>
-
-	<BR><I>1993:</I> Star
-	<BR><I>1993:</I> Moon <I>(EP)</I>
-	<BR><I>1995:</I> Baby Silvertooth <I>(EP)</I>
-	<BR><I>1995:</I> King
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1360">1360</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/belly.html#belly">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Berlin</B>
-
-	<BR><I>1981:</I> Love Life
-	<BR><I>1981:</I> Dancing in Berlin / Lost in the Crowd <I>(single)</I>
-	<BR><I>1982:</I> Pleasure Victim
-	<BR><I>1986:</I> Count 3 and Pray
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4156">4156</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Big Black</B>
-
-	<BR><I>1983:</I> The Hammer Party
-	<BR><I>1987:</I> Songs About Fucking
-	<BR><I>1992:</I> The Rich Man's Eight-Track Tape <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2410">2410</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Big Hat</B>
-
-	<BR><I>1993:</I> Selena at my Window
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1217">1217</A>
-	<BR><I>See also: </I><A HREF="http://www.cec.wustl.edu/~sad2/music/big_hat/">www.cec.wustl.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bigod 20</B>
-
-	<BR><I>1990:</I> The Bog <I>(EP)</I>
-	<BR><I>1991:</I> Carpe Diem <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bikini Kill</B>
-
-	<BR><I>1991-1992:</I> The C.D. Version of the First Two Records
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4444">4444</A>
-	<BR><I>See also: </I><A HREF="http://www.columbia.edu/~rli3/music_html/bikini_kill/bikini.html">www.columbia.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Billy Nayer Show, The</B>
-
-	<BR><I>1994:</I> The Ketchup and Mustard Man
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Billy and the Boingers</B>
-
-	<BR><I>1987:</I> U Stink but I Love You <I>(flexydisk)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Birdsongs of the Messozoic</B>
-
-	<BR><I>1980-1987:</I> The Fossil Record
-	<BR><I>1983:</I> Sonic Geology
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Birmingham 6</B>
-
-	<BR><I>1995:</I> Police State
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4348">4348</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Black Tape for a Blue Girl</B>
-
-	<BR><I>1986:</I> The Rope
-	<BR><I>1987:</I> Mesmerized by the Sirens
-	<BR><I>1989:</I> Ashes in the Brittle Air
-	<BR><I>1993:</I> This Lush Garden Within
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1202">1202</A>
-	<BR><I>See also: </I><A HREF="http://www.projekt.com/bands/btfabg.html">www.projekt.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bleeding Stone, The</B>
-
-	<BR><I>1994:</I> Silent Insanity <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Blondie</B>
-
-	<BR><I>1980:</I> Autoamerican
-	<BR><I>1983:</I> Best of Blondie
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2070">2070</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Blotto</B>
-
-	<BR><I>1994:</I> Collected Works
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Body Count</B>
-
-	<BR><I>1992:</I> Body Count
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1277">1277</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bowie, David</B>
-
-	<BR><I>1995:</I> Outside
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1098">1098</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bow Wow Wow</B>
-
-	<BR><I>1982:</I> See Jungle
-	<BR><I>1981-1982:</I> I Want Candy <I>(comp)</I>
-	<BR><I>1983:</I> When the Going Gets Tough
-	<BR><I>1981-1983:</I> Girl Bites Dog <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2301">2301</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Breeders, The</B>
-
-	<BR><I>1993:</I> Last Splash
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1242">1242</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/breeders.html#breeders">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Br&uuml;cken, Claudia</B>
-
-	<BR><I>1991:</I> Love and a Million Other Things
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4636">4636</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/ztt">rt66.com</A>
-	<BR><I>See also: </I><A HREF="http://hcl.chass.ncsu.edu/~phelpsgm/claudia.htm">hcl.chass.ncsu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Buggles, The</B>
-
-	<BR><I>1979:</I> The Age of Plastic
-	<BR><I>1981:</I> Adventures in Modern Recording
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Bush, Kate</B>
-
-	<BR><I>1977:</I> The Kick Inside
-	<BR><I>1980:</I> Never For Ever
-	<BR><I>1983:</I> The Dreaming
-	<BR><I>1985:</I> Hounds of Love
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1032">1032</A>
-	<BR><I>See also: </I><A HREF="http://actor.cs.vt.edu/~wentz/index.html">actor.cs.vt.edu</A>
-	<BR><I>See also: </I><A HREF="http://www.jrc.flinders.edu.au/ExpIV/">www.jrc.flinders.edu.au</A>
-	<BR><I>See also: </I><A HREF="http://holly.city.unisa.edu.au/Lionheart.html">holly.city.unisa.edu.au</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Buzzcocks</B>
-
-	<BR><I>1976-1979:</I> Operators Manual
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1351">1351</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cabaret Voltaire</B>
-
-	<BR><I>1974-1976:</I> 1974-1976 <I>(comp)</I>
-	<BR><I>1978-1983:</I> The Golden Moments of CV <I>(comp)</I>
-	<BR><I>1978:</I> Nag Nag Nag <I>(EP)</I>
-	<BR><I>1979:</I> Mix-Up <I>(EP)</I>
-	<BR><I>1980:</I> Red Mecca
-	<BR><I>1981:</I> The Voice of America
-	<BR><I>1981:</I> Johnny Yesno <I>(soundtrack)</I>
-	<BR><I>1982:</I> 2X45
-	<BR><I>1982:</I> Eight Crepescule Tracks
-	<BR><I>1983:</I> The Crackdown
-	<BR><I>1984:</I> Micro-Phonies
-	<BR><I>1985:</I> I Want You <I>(single)</I>
-	<BR><I>1985:</I> Drinking Gasoline
-	<BR><I>1985:</I> The Arm of the Lord
-	<BR><I>1985:</I> The Convenant, the Sword, and the Arm of the Lord
-	<BR><I>1986:</I> The Drain Train
-	<BR><I>1987:</I> Code
-	<BR><I>1990:</I> Listen Up <I>(double comp)</I>
-	<BR><I>1991:</I> Body and Soul
-	<BR><I>1991:</I> Colors
-	<BR><I>1992:</I> Plasticity
-	<BR><I>1992:</I> Western Reworks
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2307">2307</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cave, Nick</B>
-
-	<BR><I>1984:</I> From Her to Eternity
-	<BR><I>1988:</I> Tender Prey
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1273">1273</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Chemlab</B>
-
-	<BR><I>1993:</I> Burnout at the Hydrogen Bar
-	<BR><I>1994:</I> Magnetic Field Remixes <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3774">3774</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Children on Stun</B>
-
-	<BR><I>1994:</I> Tourniquets of Love's Desire
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Christian Death</B>
-
-	<BR><I>1982:</I> Only Theatre of Pain
-	<BR><I>1988:</I> Sex and Drugs and Jesus Christ
-	<BR><I>1989:</I> All the Love All the Hate part Two: All the Hate
-	<BR><I>1994:</I> Sexy Death God
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1218">1218</A>
-	<BR><I>See also: </I><A HREF="http://christian-death.acc.brad.ac.uk/">christian-death.acc.brad.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Chris and Cosey</B>
-
-	<BR><I>1989:</I> Trust
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ciccone Youth</B>
-
-	<BR><I>1988:</I> The Whitey Album
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1087">1087</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>ClockDVA</B>
-
-	<BR><I>1981:</I> Thirst
-	<BR><I>1988:</I> The Hacker/The Act
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3999">3999</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cocteau Twins</B>
-
-	<BR><I>1982:</I> Garlands
-	<BR><I>1983:</I> Head over Heels
-	<BR><I>1984:</I> The Spangle Maker <I>(EP)</I>
-	<BR><I>1984:</I> Treasure
-	<BR><I>1985:</I> Aikea-Guinea <I>(EP)</I>
-	<BR><I>1985:</I> Echoes in a Shallow Bay
-	<BR><I>1985:</I> Tiny Dynamine <I>(EP)</I>
-	<BR><I>1982-1985:</I> The Pink Opaque
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1074">1074</A>
-	<BR><I>See also: </I><A HREF="http://garnet.berkeley.edu:8080/cocteau.html">garnet.berkeley.edu</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/cocteautwins.html">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Coil</B>
-
-	<BR><I>1986?:</I> The Angelic Conversation <I>(soundtrack)</I>
-	<BR><I>1988:</I> Gold is the Metal
-	<BR><I>1990:</I> The Unreleased Themes for Hellraiser <I>(EP)</I>
-	<BR><I>1990:</I> Panic / Tainted Love <I>(single)</I>
-	<BR><I>1991:</I> Out of Light Cometh Darkness
-	<BR><I>1992:</I> Snow <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1388">1388</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Concrete Blonde</B>
-
-	<BR><I>1986:</I> Concrete Blonde
-	<BR><I>1989:</I> Free
-	<BR><I>1990:</I> Bloodletting
-	<BR><I>1993:</I> Walking in London <I>(single)</I>
-	<BR><I>1993:</I> Mexican Moon
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1396">1396</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cop Shoot Cop</B>
-
-	<BR><I>1993:</I> Ask Questions Later
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Course of Empire</B>
-
-	<BR><I>1990:</I> Course of Empire
-	<BR><I>1993:</I> Infested! <I>(EP)</I>
-	<BR><I>1994:</I> Initiation
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2889">2889</A>
-	<BR><I>See also: </I><A HREF="http://homepage.seas.upenn.edu/~leer/coe/">homepage.seas.upenn.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cranes</B>
-
-	<BR><I>1990:</I> Inescapable <I>(EP)</I>
-	<BR><I>1991:</I> Wings of Joy
-	<BR><I>1992:</I> Self-Non-Self
-	<BR><I>1993:</I> Forever
-	<BR><I>1993:</I> Jewel <I>(EP)</I>
-	<BR><I>1994:</I> Loved
-	<BR><I>1994:</I> Shining Road <I>(limited edition double EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2400">2400</A>
-	<BR><I>See also: </I><A HREF="http://busop.cit.wayne.edu/cranes/www/home.htm">busop.cit.wayne.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Crash Worship</B>
-
-	<BR><I>1992:</I> ADRV
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1901">1901</A>
-	<BR><I>See also: </I><A HREF="http://www.meer.net/~charnel/crashwor/crashpg.htm">www.meer.net</A>
-	<BR><I>See also: </I><A HREF="http://www.tyrell.net/~coventry/crash1.html">www.tyrell.net</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Creatures, The</B>
-
-	<BR><I>1983:</I> Feast
-	<BR><I>1990:</I> Boomerang
-	<BR><I>1990:</I> Fury Eyes <I>(EP)</I>
-	<BR><I>1990:</I> Standing There <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1216">1216</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cure, The</B>
-
-	<BR><I>1980:</I> Boys Don't Cry
-	<BR><I>1980:</I> Seventeen Seconds
-	<BR><I>1981:</I> Faith
-	<BR><I>1982:</I> Pornography
-	<BR><I>1982:</I> The Walk
-	<BR><I>1982?:</I> Looking for a Forest <I>(live boot)</I>
-	<BR><I>1983:</I> Japanese Whispers
-	<BR><I>1983:</I> Lovecats <I>(EP)</I>
-	<BR><I>1984:</I> Concert <I>(live)</I>
-	<BR><I>1984:</I> The Top
-	<BR><I>1985:</I> The Head on the Door
-	<BR><I>1987:</I> Staring at the Sea <I>(comp)</I>
-	<BR><I>1988:</I> Kiss Me Kiss Me Kiss Me
-	<BR><I>1989:</I> Disintegration
-	<BR><I>1989:</I> Fascination Street <I>(single)</I>
-	<BR><I>1990:</I> Never Enough <I>(single)</I>
-	<BR><I>1995?:</I> Give Me the Cure: 18 DC Bands <I>(various)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1159">1159</A>
-	<BR><I>See also: </I><A HREF="http://www.acpub.duke.edu/~spawn/album.html">www.acpub.duke.edu</A>
-	<BR><I>See also: </I><A HREF="http://pathfinder.com/elektra/artists/cure/cure.html">pathfinder.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Current 93</B>
-
-	<BR><I>1986-1991:</I> Island
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3465">3465</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Curve</B>
-
-	<BR><I>1991:</I> Frozen <I>(EP)</I>
-	<BR><I>1991:</I> Cherry <I>(EP)</I>
-	<BR><I>1992:</I> Doppelganger
-	<BR><I>1993:</I> Cuckoo
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1355">1355</A>
-	<BR><I>See also: </I><A HREF="http://quark.stack.urc.tue.nl/~conrad/">quark.stack.urc.tue.nl</A>
-	<BR><I>See also: </I><A HREF="http://blade.stack.urc.tue.nl/~blurp/">blade.stack.urc.tue.nl</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Cyber-Tec</B>
-
-	<BR><I>1995:</I> Cyber-Tec
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Daisy Chainsaw</B>
-
-	<BR><I>1992:</I> Hope All Your Dreams Come True <I>(single)</I>
-	<BR><I>1992:</I> Love Sick Pleasure <I>(EP)</I>
-	<BR><I>1992:</I> Eleventeen
-	<BR><I>1994:</I> For They Know Not What They Do
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Dance or Die</B>
-
-	<BR><I>1993:</I> Psychoburbia
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Danse Society, The</B>
-
-	<BR><I>1984:</I> Heaven is Waiting
-	<BR><I>1986:</I> Looking Through
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Das Ich</B>
-
-	<BR><I>1990:</I> Satanische Verse
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2337">2337</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Dax, Danielle</B>
-
-	<BR><I>1986-1988:</I> Dark Adapted Eye <I>(comp +5)</I>
-	<BR><I>1988:</I> Whistling for his Love <I>(single)</I>
-	<BR><I>1988:</I> Cat House <I>(single)</I>
-	<BR><I>1990:</I> Blast the Human Flower
-	<BR><I>1992:</I> Pop-Eyes
-	<BR><I>1995:</I> Timber Tongue <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1746">1746</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Death in June</B>
-
-	<BR><I>1992:</I> But, What Ends When the Symbols Shatter?
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Definition FX</B>
-
-	<BR><I>1993:</I> Something Inside <I>(single)</I>
-	<BR><I>1993:</I> Light Speed Collision
-	</TD><TD>
-<I>See also: </I><A HREF="http://www.geko.com.au/vrx/dfx/html/def-fx.html">www.geko.com.au</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Depeche Mode</B>
-
-	<BR><I>1981:</I> Speak &amp; Spell
-	<BR><I>1981:</I> Just Can't Get Enough / Any Second Now <I>(single)</I>
-	<BR><I>1982:</I> A Broken Frame
-	<BR><I>1982:</I> live singles <I>(comp)</I>
-	<BR><I>1983:</I> Construction Time Again
-	<BR><I>1984:</I> People Are People <I>(comp +2)</I>
-	<BR><I>1984:</I> Some Great Reward
-	<BR><I>1985:</I> Catching Up With Depeche Mode <I>(comp +4)</I>
-	<BR><I>1985:</I> It's Called a Heart / Fly on the Windscreen <I>(single)</I>
-	<BR><I>1986:</I> Black Celebration
-	<BR><I>1986:</I> Stripped <I>(single)</I>
-	<BR><I>1986:</I> A Question of Lust <I>(single)</I>
-	<BR><I>1989:</I> 101 <I>(double live)</I>
-	<BR><I>1987:</I> Music for the Masses
-	<BR><I>1987:</I> Never Let Me Down <I>(single)</I>
-	<BR><I>1990:</I> Personal Jesus <I>(single)</I>
-	<BR><I>199?:</I> I Sometimes Wish I Was Famous: A Swedish Tribute <I>(various)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1041">1041</A>
-	<BR><I>See also: </I><A HREF="http://www.cis.ufl.edu/~sag/dm/">www.cis.ufl.edu</A>
-	<BR><I>See also: </I><A HREF="http://www.coma.sbg.ac.at:80/~salchegg/DM/">www.coma.sbg.ac.at</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Dessau</B>
-
-	<BR><I>1995:</I> Dessau
-	<BR><I>1995:</I> Details Sketchy
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Devo</B>
-
-	<BR><I>1978:</I> Q: Are We Not Men? A: We Are DEVO!
-	<BR><I>1979:</I> Freedom of Choice
-	<BR><I>1977-1990:</I> Greatest Hits
-	<BR><I>1978-1990:</I> Greatest Misses
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1088">1088</A>
-	<BR><I>See also: </I><A HREF="http://hartke.lib.ohio-state.edu:70/">hartke.lib.ohio-state.edu</A>
-	<BR><I>See also: </I><A HREF="http://unsane.enc.org/devo.htm">unsane.enc.org</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/devo">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Die Krupps</B>
-
-	<BR><I>1995:</I> Rings of Steel
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Die Monster Die</B>
-
-	<BR><I>1994:</I> Withdrawl Method
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Die Warzau</B>
-
-	<BR><I>1991:</I> Big Electric Metal Bass Face
-	<BR><I>1994:</I> Engine
-	<BR><I>1994:</I> allgoodgirls <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Disposable Heroes of Hiphoprisy</B>
-
-	<BR><I>1992:</I> Hypocrisy is the Greatest Luxury
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Dolby, Thomas</B>
-
-	<BR><I>1983:</I> The Golden Age of Wireless
-	<BR><I>1983:</I> The Golden Age of Wireless <I>(2nd release: 2 new)</I>
-	<BR><I>1984:</I> The Flat Earth
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1961">1961</A>
-	<BR><I>See also: </I><A HREF="http://kspace.com/KM/spot.sys/Dolby/pages/home.html">kspace.com</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/dolby">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Doubting Thomas</B>
-
-	<BR><I>1991:</I> Father Don't Cry <I>(EP)</I>
-	<BR><I>1991:</I> The Infidel
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1166">1166</A>
-	<BR><I>See also: </I><A HREF="http://www.eecs.nwu.edu/~smishra/Industrial/skinny-puppy">www.eecs.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Duran Duran</B>
-
-	<BR><I>1981:</I> Duran Duran
-	<BR><I>1982:</I> Carnival <I>(EP)</I>
-	<BR><I>1982:</I> live <I>(live boot)</I>
-	<BR><I>1982:</I> Rio
-	<BR><I>1983:</I> Union of the Snake / Secret Oktober <I>(single)</I>
-	<BR><I>1983:</I> The Wild Boys / Cracks in the Pavement <I>(single)</I>
-	<BR><I>1983:</I> Seven and the Ragged Tiger
-	<BR><I>1987:</I> Notorious
-	<BR><I>1981-1988:</I> Decade <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1259">1259</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Durutti Column</B>
-
-	<BR><I>1988:</I> The Guitar and Other Machines
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4853">4853</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ebn Ozn</B>
-
-	<BR><I>1984:</I> Feeling Cavalier
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Elastica</B>
-
-	<BR><I>1995:</I> Elastica
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Elastic Purejoy, The</B>
-
-	<BR><I>1994:</I> The Elastic Purejoy
-	</TD><TD>
-<I>See also: </I><A HREF="http://http2.brunel.ac.uk:8080/~ee92pmh/shrkindx.html">http2.brunel.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Electric Hellfire Club, The</B>
-
-	<BR><I>1993:</I> Burn, Baby, Burn
-	<BR><I>1995:</I> Kiss the Goat
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Elfman, Danny</B>
-
-	<BR><I>1984:</I> So-Lo
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1089">1089</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Emergency Broadcast Network</B>
-
-	<BR><I>1995:</I> Telecommunication Breakdown
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Engorged with Blood</B>
-
-	<BR><I>1993:</I> Engorged with Blood <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Eno, Brian</B>
-
-	<BR><I>1977:</I> Before and After Science
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1064">1064</A>
-	<BR><I>See also: </I><A HREF="http://www.nwu.edu/music/eno/">www.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Eon</B>
-
-	<BR><I>1991:</I> Fear: the Mindkiller <I>(EP)</I>
-	<BR><I>1992:</I> Basket Case <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Erasure</B>
-
-	<BR><I>1984-1986:</I> various singles
-	<BR><I>1986:</I> Wonderland
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1029">1029</A>
-	<BR><I>See also: </I><A HREF="http://www.cec.wustl.edu/~ccons/erasure/">www.cec.wustl.edu</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/erasure">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Estep, Maggie</B>
-
-	<BR><I>1994:</I> No More Mister Nice Girl
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ethyl Meatplow</B>
-
-	<BR><I>1993:</I> Happy Days Sweetheart
-	<BR><I>1993:</I> Devil's Johnson <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5232">5232</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Eurythmics</B>
-
-	<BR><I>1981:</I> In the Garden
-	<BR><I>1982:</I> Love is a Stranger <I>(EP)</I>
-	<BR><I>1982:</I> This is the House <I>(live EP)</I>
-	<BR><I>1983:</I> Sweet Dreams
-	<BR><I>1983:</I> Touch
-	<BR><I>1984:</I> 1984 (For the Love of Big Brother) <I>(soundtrack)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Executive Slacks</B>
-
-	<BR><I>1986:</I> Fire and Ice
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Faith and the Muse</B>
-
-	<BR><I>1994:</I> Elyria
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Fixx, The</B>
-
-	<BR><I>1982:</I> Shuttered Room
-	<BR><I>1983:</I> Reach the Beach
-	<BR><I>1984:</I> Phantoms
-	<BR><I>1986:</I> Walkabout
-	<BR><I>1987:</I> React <I>(live)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4603">4603</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Foetus</B>
-
-	<BR><I>19??:</I> Rife
-	<BR><I>1995:</I> Gash
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2750">2750</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Fortran 5</B>
-
-	<BR><I>1991:</I> Blues
-	<BR><I>1993:</I> Bad Head Park
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3469">3469</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/fortran.5">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>45 Grave</B>
-
-	<BR><I>1993:</I> Debasement Tapes
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Frankie goes to Hollywood</B>
-
-	<BR><I>1984:</I> Welcome to the Pleasure Dome
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3222">3222</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/ztt">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Freur</B>
-
-	<BR><I>1983:</I> Doot Doot
-	</TD><TD>
-<I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/freur">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Front 242</B>
-
-	<BR><I>1979:</I> Masterhit <I>(EP)</I>
-	<BR><I>1983:</I> Geography
-	<BR><I>1987:</I> Official Version
-	<BR><I>1985:</I> No Comment
-	<BR><I>1982:</I> Two In One <I>(EP)</I>
-	<BR><I>1982-1985:</I> Backcatalogue <I>(comp)</I>
-	<BR><I>1989:</I> Headhunter <I>(EP)</I>
-	<BR><I>1989:</I> Front by Front
-	<BR><I>1989:</I> Never Stop <I>(EP)</I>
-	<BR><I>1991:</I> Tyrrany For You
-	<BR><I>1991:</I> Tragedy For You <I>(EP)</I>
-	<BR><I>1991:</I> Rhythm of Time <I>(EP)</I>
-	<BR><I>1993:</I> Religion <I>(EP)</I>
-	<BR><I>1993:</I> Animal <I>(single)</I>
-	<BR><I>1993:</I> 06:21:03:11 Up Evil
-	<BR><I>1993:</I> 05:22:09:12 Off
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1059">1059</A>
-	<BR><I>See also: </I><A HREF="http://www.ifi.uio.no/~terjesa/front242/main.html">www.ifi.uio.no</A>
-	<BR><I>See also: </I><A HREF="http://www.eecs.nwu.edu/~smishra/Industrial/f242/index.html">www.eecs.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Front Line Assembly</B>
-
-	<BR><I>1988:</I> Convergence
-	<BR><I>1989:</I> Digital Tension Dementia <I>(EP)</I>
-	<BR><I>1990:</I> Gashed Senses and Crossfire
-	<BR><I>1991:</I> Caustic Grip
-	<BR><I>1992:</I> Tactical Neural Implant
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1161">1161</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Fugazi</B>
-
-	<BR><I>1989:</I> 13 Songs
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2053">2053</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Fun Boy Three</B>
-
-	<BR><I>1982:</I> It Ain't What You Do / Just Do It / Funrama Theme <I>(single)</I>
-	<BR><I>1981-1983:</I> The Best of Fun Boy Three <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Fuzzbox</B>
-
-	<BR><I>1986:</I> We've got a Fuzzbox and We're Gonna Use It!!
-	<BR><I>1986:</I> Love is the Slug <I>(single)</I>
-	<BR><I>1986:</I> Rules and Regulations <I>(single)</I>
-	</TD><TD>
-<I>See also: </I><A HREF="http://world.std.com/~fuzzbox/fbpage.html">world.std.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Gabriel, Peter</B>
-
-	<BR><I>1977:</I> Peter Gabriel I
-	<BR><I>1978:</I> Peter Gabriel II
-	<BR><I>1980:</I> Peter Gabriel III
-	<BR><I>1982:</I> Security
-	<BR><I>1983:</I> Peter Gabriel Plays Live <I>(double live)</I>
-	<BR><I>1985:</I> Birdy <I>(soundtrack)</I>
-	<BR><I>1986:</I> So
-	<BR><I>1986:</I> Live at the Civic Arena <I>(live boot)</I>
-	<BR><I>1989:</I> Passion <I>(soundtrack)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1016">1016</A>
-	<BR><I>See also: </I><A HREF="http://www.nwu.edu/music/gabriel/">www.nwu.edu</A>
-	<BR><I>See also: </I><A HREF="http://www.cs.clemson.edu/~junderw/pg.html">www.cs.clemson.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Garbage</B>
-
-	<BR><I>1995:</I> Garbage
-	</TD><TD>
-<I>See also: </I><A HREF="http://hamp.hampshire.edu/~temS95/garbage.html">hamp.hampshire.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Game Theory</B>
-
-	<BR><I>1987:</I> Lolita Nation
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Gang of 4</B>
-
-	<BR><I>1979:</I> Entertainment
-	<BR><I>1979:</I> Peel Sessions <I>(live)</I>
-	<BR><I>1981:</I> Solid Gold
-	<BR><I>1981:</I> Another Day / Another Dollar
-	<BR><I>1982:</I> I Love a Man In a Uniform <I>(single)</I>
-	<BR><I>1982:</I> Songs of the Free
-	<BR><I>1983:</I> Is It Love <I>(single)</I>
-	<BR><I>1983:</I> Hard
-	<BR><I>1983:</I> At the Palace <I>(live)</I>
-	<BR><I>1979-1983:</I> A Brief History of the Twentieth Century <I>(comp)</I>
-	<BR><I>1990:</I> To Hell With Poverty <I>(single)</I>
-	<BR><I>1990:</I> Mall
-	<BR><I>1990:</I> Money Talks <I>(single)</I>
-	<BR><I>1995:</I> Tatoo <I>(single)</I>
-	<BR><I>1995:</I> Shrinkwrapped
-	</TD><TD>
-<I>See also: </I><A HREF="http://http2.brunel.ac.uk:8080/~ee92pmh/shrkindx.html">http2.brunel.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Glove, The</B>
-
-	<BR><I>1982:</I> Blue Sunshine
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1159">1159</A>
-	<BR><I>See also: </I><A HREF="http://www.dcs.gla.ac.uk/~lovelm/GLOVE.html">www.dcs.gla.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>God is my Copilot</B>
-
-	<BR><I>1993:</I> Speed Yr Trip
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Gracious Shades</B>
-
-	<BR><I>1995:</I> Aberkash
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Grind</B>
-
-	<BR><I>1995:</I> Kittymuzzle
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Grotus</B>
-
-	<BR><I>1993:</I> Slow Motion Apocalypse
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5482">5482</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pizzicato Five</B>
-
-	<BR><I>1995:</I> The Sound of Music
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>PJ Harvey</B>
-
-	<BR><I>1992:</I> Dry
-	<BR><I>1993:</I> Rid of Me
-	<BR><I>1993:</I> 4-Track Demos
-	<BR><I>1995:</I> Down by the Water <I>(single)</I>
-	<BR><I>1995:</I> To Bring You My Love
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1221">1221</A>
-	<BR><I>See also: </I><A HREF="http://www.louisville.edu/public/jadour01/pjh/">www.louisville.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Psychick Warriors ov Gaia</B>
-
-	<BR><I>1992:</I> Ov Biospheres and Sacred Groves
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Hagen, Nina</B>
-
-	<BR><I>1985:</I> In Ekstasy
-	<BR><I>1978-1982:</I> nunsexmonkrock / Nina Hagen Band
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Hate Dept.</B>
-
-	<BR><I>1994:</I> Meat Your Maker
-	<BR><I>1995:</I> Mainline <I>(EP)</I>
-	</TD><TD>
-<I>See also: </I><A HREF="http://www.iuma.com/IUMA-2.0/ftp/volume5/Hate_Dept/">www.iuma.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Haysi Fantayzee</B>
-
-	<BR><I>1982:</I> Shiny Shiny remix <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Heaven 17</B>
-
-	<BR><I>1981:</I> Penthouse and Pavement
-	<BR><I>1982:</I> Heaven 17
-	<BR><I>1983:</I> The Luxury Gap
-	<BR><I>1984:</I> How Men Are
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Hope, Peter and Kirk, Richard</B>
-
-	<BR><I>1988:</I> Hoodoo Talk
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2307">2307</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Kershaw, Nik</B>
-
-	<BR><I>1983:</I> Human Racing
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Kirk, Richard</B>
-
-	<BR><I>1993:</I> Virtual State
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2307">2307</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Human League</B>
-
-	<BR><I>1979:</I> Reproduction
-	<BR><I>1980:</I> Travelogue
-	<BR><I>1981:</I> Dare
-	<BR><I>1983:</I> Fascination
-	<BR><I>1984:</I> Hysteria
-	<BR><I>1995:</I> Octopus
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4631">4631</A>
-	<BR><I>See also: </I><A HREF="http://pathfinder.com/elektra/artists/humanleague/human.html">pathfinder.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Hunters and Collectors</B>
-
-	<BR><I>1987:</I> Human Frailty
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4553">4553</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ice T</B>
-
-	<BR><I>1991:</I> New Jack Hustler <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2342">2342</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>In the Nursery</B>
-
-	<BR><I>19??:</I> L'Esprit
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>INXS</B>
-
-	<BR><I>1982:</I> Shabooh Shoobah
-	<BR><I>1984:</I> The Swing
-	<BR><I>1985:</I> Listen Like Thieves
-	<BR><I>1988:</I> Kick
-	<BR><I>1990:</I> X
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1284">1284</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>J., David</B>
-
-	<BR><I>1983-1986:</I> On Glass <I>(comp)</I>
-	<BR><I>1985:</I> Crocodile Tears and the Velvet Cosh
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1215">1215</A>
-	<BR><I>See also: </I><A HREF="http://gothic.acs.csulb.edu:8080/~vamp/Gothic/Text/bauhaus-discog.html">gothic.acs.csulb.edu</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/person/d.html#davidjay">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Jesus and Mary Chain, The</B>
-
-	<BR><I>1992:</I> Reverence <I>(EP)</I>
-	<BR><I>1992:</I> Honey's Dead
-	<BR><I>1995:</I> Hate Rock and Roll <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1228">1228</A>
-	<BR><I>See also: </I><A HREF="http://american.recordings.com/American_Artists/Jesus_And_Mary_Chain/jamc_home.html">american.recordings.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Jones, Grace</B>
-
-	<BR><I>1993:</I> Sex Drive <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Jones, Howard</B>
-
-	<BR><I>1983:</I> Humans' Lib
-	<BR><I>1985:</I> Dream Into Action
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Joy Division</B>
-
-	<BR><I>1977-1978:</I> Warsaw <I>(comp)</I>
-	<BR><I>1979:</I> Unknown Pleasures
-	<BR><I>1980:</I> Closer
-	<BR><I>1980:</I> Transmission / Novelty <I>(single)</I>
-	<BR><I>1980:</I> Still
-	<BR><I>1977-1980:</I> Substance <I>(comp)</I>
-	<BR><I>1995:</I> Ceremonial: A Tribute <I>(various)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1214">1214</A>
-	<BR><I>See also: </I><A HREF="http://www.fys.uio.no/~bor/joydiv.html">www.fys.uio.no</A>
-	<BR><I>See also: </I><A HREF="http://csclub.uwaterloo.ca/u/sfwhite/joyd.html">csclub.uwaterloo.ca</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>King Crimson</B>
-
-	<BR><I>1969:</I> In the Court of the Crimson King
-	<BR><I>1973:</I> Larks' Tongues in Aspic
-	<BR><I>1974:</I> Starless and Bible Black
-	<BR><I>1981:</I> Dicipline
-	<BR><I>1982:</I> Beat
-	<BR><I>1984:</I> Three of a Perfect Pair
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1323">1323</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>KMFDM</B>
-
-	<BR><I>1993:</I> Angst
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1452">1452</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Kraftwerk</B>
-
-	<BR><I>1977:</I> Trans-Europe Express <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1027">1027</A>
-	<BR><I>See also: </I><A HREF="http://wwwtdb.cs.umu.se/~dvlawm/kraftwerk.html">wwwtdb.cs.umu.se</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/kraftwerk">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>L7</B>
-
-	<BR><I>1988:</I> L7
-	<BR><I>1990:</I> Smell the Magic
-	<BR><I>1992:</I> Bricks are Heavy
-	<BR><I>1994:</I> Hungry for Stink
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1998">1998</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Le&ae;ther Strip</B>
-
-	<BR><I>1995:</I> Legacy of Hate and Lust
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lemon Kittens</B>
-
-	<BR><I>1978-1980:</I> We Buy a Hammer for Daddy
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1746">1746</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Letters to Cleo</B>
-
-	<BR><I>1994:</I> Aurora Gory Alice
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3000">3000</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>LFO</B>
-
-	<BR><I>1991:</I> Frequencies
-	<BR><I>1996:</I> Advance
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>London After Midnight</B>
-
-	<BR><I>1989:</I> Selected Scenes from the End of the World
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lords of Acid</B>
-
-	<BR><I>1991:</I> Rough Sex <I>(single)</I>
-	<BR><I>1993:</I> Voodoo U
-	<BR><I>1994:</I> The Crablouse: Variations on a Species <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2356">2356</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lords of the New Church, The</B>
-
-	<BR><I>1983:</I> Is Nothing Sacred?
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Love and Rockets</B>
-
-	<BR><I>1985:</I> Ball of Confusion / Inside the Outside <I>(single)</I>
-	<BR><I>1985:</I> Seventh Dream of Teenage Heaven
-	<BR><I>1986:</I> Express
-	<BR><I>1986:</I> Kundalini Express / Lucifer Sam / Holiday on the Moon <I>(single)</I>
-	<BR><I>1987:</I> Earth, Sun, Moon
-	<BR><I>1989:</I> No Big Deal <I>(single)</I>
-	<BR><I>1989:</I> Motorcycle <I>(single)</I>
-	<BR><I>1989:</I> Love and Rockets
-	<BR><I>1994:</I> This Heaven <I>(EP)</I>
-	<BR><I>1994:</I> Body and Soul <I>(EP)</I>
-	<BR><I>1994:</I> Hot Trip to Heaven
-	<BR><I>1995:</I> The Glittering Darkness <I>(EP)</I>
-	<BR><I>1996:</I> Sweet F. A.
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1215">1215</A>
-	<BR><I>See also: </I><A HREF="http://american.recordings.com/American_Artists/Love_And_Rockets/loverox_home.html">american.recordings.com</A>
-	<BR><I>See also: </I><A HREF="http://gothic.acs.csulb.edu:8080/~vamp/Gothic/Text/bauhaus-discog.html">gothic.acs.csulb.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Love is Colder than Death</B>
-
-	<BR><I>1993:</I> Oxeia
-	<BR><I>19??:</I> Mental Traveller
-	<BR><I>19??:</I> Teignmouth
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Low Pop Suicide</B>
-
-	<BR><I>1992:</I> Disengagement <I>(EP)</I>
-	<BR><I>1992:</I> On the Cross of Commerce
-	<BR><I>1994:</I> Kiss Your Lips <I>(remixes)</I>
-	<BR><I>1995:</I> The Death of Excellence
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1984">1984</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Luscious Jackson</B>
-
-	<BR><I>1992:</I> In Search of Manny
-	<BR><I>1994:</I> Natural Ingredients
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lush</B>
-
-	<BR><I>1990:</I> Gala
-	<BR><I>1992:</I> Spooky
-	<BR><I>1994:</I> Split
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2359">2359</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/lush.html#lush">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lwin, Annabella</B>
-
-	<BR><I>1986:</I> War Boys <I>(single)</I>
-	<BR><I>1994:</I> Car Sex <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2301">2301</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Lycea</B>
-
-	<BR><I>1993:</I> A Day in the Stark Corner
-	</TD><TD>
-<I>See also: </I><A HREF="http://www.projekt.com/bands/lycia.html">www.projekt.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>M</B>
-
-	<BR><I>1979:</I> Pop Musik <I>(7inch)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Machines of Loving Grace</B>
-
-	<BR><I>1991:</I> Rite of Shiva <I>(single)</I>
-	<BR><I>1991:</I> Machines of Loving Grace
-	<BR><I>1992:</I> Burn Like Brilliant Trash <I>(EP)</I>
-	<BR><I>1993:</I> Concentration
-	<BR><I>1995:</I> Gilt
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1219">1219</A>
-	<BR><I>See also: </I><A HREF="http://www.nando.net/mammoth/machines.html">www.nando.net</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>M|A|R|R|S</B>
-
-	<BR><I>1987:</I> Pump Up the Volume / Anitina <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mallinder, Stephen</B>
-
-	<BR><I>1982:</I> Pow Wow
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2307">2307</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Manufacture</B>
-
-	<BR><I>1988:</I> Terrorvision
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>March Violets, The</B>
-
-	<BR><I>1984:</I> Natural History
-	<BR><I>1982-1984:</I> The Botanic Verses <I>(comp)</I>
-	<BR><I>1983-1985:</I> Electric Shades <I>(comp)</I>
-	<BR><I>1985:</I> Deep <I>(EP)</I>
-	<BR><I>1986:</I> A Turn to the Sky / Never Look Back / Deep / Rebirth <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1114">1114</A>
-	<BR><I>See also: </I><A HREF="http://www.cm.cf.ac.uk/Sisters.Of.Mercy/Related.Works/March.Violets.Page.html">www.cm.cf.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Martha and the Muffins</B>
-
-	<BR><I>1980-1984:</I> Far Away in Time <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2529">2529</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mary's Danish</B>
-
-	<BR><I>1991:</I> Circa
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3727">3727</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>MC 900 Foot Jesus</B>
-
-	<BR><I>1989:</I> Hell With the Lid Off
-	<BR><I>1989:</I> UFOs Are Real <I>(EP)</I>
-	<BR><I>1990:</I> Welcome to My Dream
-	<BR><I>1990:</I> Killer Inside Me <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1229">1229</A>
-	<BR><I>See also: </I><A HREF="http://american.recordings.com/American_Artists/MC_900FT_Jesus/mc_home.html">american.recordings.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>McLachlan, Sarah</B>
-
-	<BR><I>1992:</I> Into the Fire <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1389">1389</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Meat Beat Manifesto</B>
-
-	<BR><I>1988:</I> Armed Audio Warfare
-	<BR><I>1990:</I> Dog Star Man <I>(EP)</I>
-	<BR><I>1990:</I> 99%
-	<BR><I>1990:</I> Psyche Out <I>(EP)</I>
-	<BR><I>1990:</I> Now <I>(EP)</I>
-	<BR><I>1992:</I> Satryicon
-	<BR><I>1993:</I> Peel Session <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3626">3626</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Medicine</B>
-
-	<BR><I>1993:</I> The Buried Life
-	<BR><I>1994:</I> Shot Forth Self Living
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1432">1432</A>
-	<BR><I>See also: </I><A HREF="http://kspace.com/KM/spot.sys/Medicine/pages/home.html">kspace.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mephisto Walz</B>
-
-	<BR><I>1986-1992:</I> Crocosmia
-	<BR><I>1993:</I> Terra-Regina <I>(comp)</I>
-	<BR><I>1994:</I> The Eternal Deep
-	<BR><I>1995:</I> Thalia
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Midnight Oil</B>
-
-	<BR><I>1979:</I> Head Injuries
-	<BR><I>1981:</I> Place without a Postcard
-	<BR><I>1983:</I> 10, 9, 8, 7, 6, 5, 4, 3, 2, 1...
-	<BR><I>1985:</I> Red Sails in the Sunset
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1102">1102</A>
-	<BR><I>See also: </I><A HREF="http://www.stevens-tech.edu/~dbelson/oilbase/">www.stevens-tech.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Miller, Roger</B>
-
-	<BR><I>1987:</I> Maximum Electric Piano
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ministry</B>
-
-	<BR><I>1983:</I> With Sympathy
-	<BR><I>1984:</I> Halloween Remix / The Nature of Outtakes <I>(EP)</I>
-	<BR><I>1981-1984:</I> various singles
-	<BR><I>1985:</I> Cold Life
-	<BR><I>1985:</I> Over the Shoulder / Isle of Man <I>(EP)</I>
-	<BR><I>1986:</I> Twitch
-	<BR><I>1988:</I> 12 Inch Singles <I>(comp)</I>
-	<BR><I>1988:</I> The Land of Rape and Honey
-	<BR><I>1988:</I> Stigmata / Tonight we Murder <I>(EP)</I>
-	<BR><I>1989:</I> The Mind is a Terrible Thing to Taste
-	<BR><I>1991:</I> Jesus Built my Hotrod <I>(EP)</I>
-	<BR><I>1992:</I> Psalm 69
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1100">1100</A>
-	<BR><I>See also: </I><A HREF="http://csclub.uwaterloo.ca/u/sfwhite/ministry.html">csclub.uwaterloo.ca</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Miranda Sex Garden</B>
-
-	<BR><I>1991:</I> Gush Forth my Tears
-	<BR><I>1991:</I> Madra
-	<BR><I>1992:</I> Iris
-	<BR><I>1993:</I> Suspiria
-	<BR><I>1994:</I> Fairytales of Slavery
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3007">3007</A>
-	<BR><I>See also: </I><A HREF="http://sksol1.physics.sunysb.edu/~jng/msg/">sksol1.physics.sunysb.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Missing Persons</B>
-
-	<BR><I>1982:</I> Missing Persons <I>(EP)</I>
-	<BR><I>1982:</I> Spring Session M
-	<BR><I>1984:</I> Rhyme &amp; Reason
-	<BR><I>1982-1984:</I> Best of <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mistle Thrush</B>
-
-	<BR><I>199?:</I> Silt
-	<BR><I>1994:</I> Agus Am&agrave;rach
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mission, The</B>
-
-	<BR><I>1986:</I> God's Own Medicine
-	<BR><I>1987:</I> the First Chapter
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2045">2045</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mission of Burma</B>
-
-	<BR><I>1987:</I> Forget
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Morissette, Alanis</B>
-
-	<BR><I>1995:</I> Jagged Little Pill
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3127">3127</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Morrison, Patricia</B>
-
-	<BR><I>1994:</I> Reflect on This
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1062">1062</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Moyet, Allison</B>
-
-	<BR><I>1985:</I> ALF
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3410">3410</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/erasure">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Murder Inc.</B>
-
-	<BR><I>1992:</I> Murder Inc.
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Mussolini Headkick</B>
-
-	<BR><I>1990:</I> Blood on the Flag
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Murphy, Peter</B>
-
-	<BR><I>1986:</I> Should the World Fail to Fall Apart
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1235">1235</A>
-	<BR><I>See also: </I><A HREF="http://gothic.acs.csulb.edu:8080/~vamp/Gothic/Text/bauhaus-discog.html">gothic.acs.csulb.edu</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/person/p.html#petermurphy">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>My Bloody Valentine</B>
-
-	<BR><I>1988:</I> Isn't Anything
-	<BR><I>1991:</I> Loveless
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1912">1912</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>My Life with the Thrill Kill Kult</B>
-
-	<BR><I>1988:</I> I See Good Spirits and I See Bad Spirits
-	<BR><I>1989:</I> K00Ler than Jesus
-	<BR><I>1990:</I> Confessions of a Knife...
-	<BR><I>1990:</I> Swine &amp; Roses / Naive (KMFDM) <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3478">3478</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Neither/Neither World</B>
-
-	<BR><I>1994:</I> Tales of True Crime
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Neotek</B>
-
-	<BR><I>1995:</I> Brain over Muscle
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>New Fast Automatic Daffodils</B>
-
-	<BR><I>1991:</I> Pigeonhole
-	<BR><I>1992:</I> Bong
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>New Order</B>
-
-	<BR><I>1981:</I> Movement
-	<BR><I>1981:</I> Temptation / Hurt <I>(single)</I>
-	<BR><I>1982:</I> Factus 8
-	<BR><I>1984:</I> Power, Corruption, and Lies
-	<BR><I>1984:</I> Blue Monday <I>(single)</I>
-	<BR><I>1985:</I> The Perfect Kiss <I>(single)</I>
-	<BR><I>1985:</I> Confusion <I>(single)</I>
-	<BR><I>1985:</I> Low Life
-	<BR><I>1983-5:</I> various singles
-	<BR><I>1986:</I> Brotherhood
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1126">1126</A>
-	<BR><I>See also: </I><A HREF="http://topquark.cecer.army.mil/~roland/neworder/neworder.html">topquark.cecer.army.mil</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Nine Inch Nails</B>
-
-	<BR><I>1989:</I> Pretty Hate Machine
-	<BR><I>1989:</I> Head Like a Hole <I>(remixes)</I>
-	<BR><I>1990:</I> Sin <I>(remixes)</I>
-	<BR><I>1992:</I> Broken <I>(EP)</I>
-	<BR><I>1992:</I> Fixed <I>(remixes)</I>
-	<BR><I>1994:</I> March of the Pigs <I>(EP)</I>
-	<BR><I>1994:</I> The Downward Spiral
-	<BR><I>1994:</I> Closer to God <I>(EP)</I>
-	<BR><I>1994:</I> Closer (Further Away) <I>(EP)</I>
-	<BR><I>1994:</I> Further Down the Spiral <I>(remixes)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1046">1046</A>
-	<BR><I>See also: </I><A HREF="http://www.scri.fsu.edu/~patters/nin.html">www.scri.fsu.edu</A>
-	<BR><I>See also: </I><A HREF="http://metaverse.com/woodstock/artists/nineinchnails/index.html">metaverse.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Nirvana</B>
-
-	<BR><I>1991:</I> Nevermind
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1052">1052</A>
-	<BR><I>See also: </I><A HREF="http://www.ludd.luth.se/nirvana/">www.ludd.luth.se</A>
-	<BR><I>See also: </I><A HREF="http://home.earthlink.net/~tomgrant/">home.earthlink.net</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Nitzer Ebb</B>
-
-	<BR><I>1987:</I> That Total Age
-	<BR><I>1987:</I> Warsaw Ghetto <I>(EP)</I>
-	<BR><I>1987:</I> So Bright So Strong <I>(remixes)</I>
-	<BR><I>1987:</I> Get Clean <I>(remixes)</I>
-	<BR><I>1988:</I> Control: I'm Here <I>(single)</I>
-	<BR><I>1989:</I> Hearts and Minds <I>(single)</I>
-	<BR><I>1989:</I> Belief
-	<BR><I>1990:</I> Showtime
-	<BR><I>1991:</I> I Give to You <I>(single)</I>
-	<BR><I>1991:</I> As Is <I>(single)</I>
-	<BR><I>1991:</I> Ebbhead
-	<BR><I>1991:</I> Godhead <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1164">1164</A>
-	<BR><I>See also: </I><A HREF="http://www.eecs.nwu.edu/~smishra/Industrial/nitzer-ebb/index.html">www.eecs.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>No Doubt</B>
-
-	<BR><I>1995:</I> Tragic Kingdom
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Noise Unit</B>
-
-	<BR><I>1989:</I> Grinding Into Emptiness
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Nosferatu</B>
-
-	<BR><I>1993:</I> Rise
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Numan, Gary</B>
-
-	<BR><I>1978:</I> Tubeway Army
-	<BR><I>1978:</I> The Plan
-	<BR><I>1979:</I> Replicas
-	<BR><I>1979:</I> The Pleasure Principle
-	<BR><I>1980:</I> Telekon
-	<BR><I>1981:</I> Warriors
-	<BR><I>1981:</I> Dance
-	<BR><I>1982:</I> I, Assassin
-	<BR><I>1984:</I> White Noise <I>(double live)</I>
-	<BR><I>1987:</I> Ghost <I>(double live)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1409">1409</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Offspring</B>
-
-	<BR><I>1994:</I> Smash
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Oingo Boingo</B>
-
-	<BR><I>1980:</I> Forbidden Zone <I>(soundtrack)</I>
-	<BR><I>1981:</I> Only a Lad
-	<BR><I>1983:</I> Good for Your Soul
-	<BR><I>1986:</I> Dead Man's Party
-	<BR><I>1987:</I> Nothing to Fear
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1089">1089</A>
-	<BR><I>See also: </I><A HREF="http://rhino.harvard.edu/dan/boingo/boingo.html">rhino.harvard.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Orb, The</B>
-
-	<BR><I>1991:</I> The Orb's Adventures Beyond the Ultraworld
-	<BR><I>1991:</I> Aubrey Mixes, the Ultraworld Excursions
-	<BR><I>1991:</I> Little Fluffy Clouds <I>(EP)</I>
-	<BR><I>1992:</I> U.F.Orb
-	<BR><I>1993:</I> live 93 <I>(double live)</I>
-	<BR><I>1994:</I> Pomme Fritz
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1121">1121</A>
-	<BR><I>See also: </I><A HREF="http://www.hyperlink.com/orb">www.hyperlink.com</A>
-	<BR><I>See also: </I><A HREF="http://www.phlab.missouri.edu/HOMES/c512571_www/music/orbstuff/index.html">www.phlab.missouri.edu</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/orb">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Orbital</B>
-
-	<BR><I>1993:</I> Orbital 2
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2049">2049</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/orbital">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Orchestral Manoeuvers in the Dark</B>
-
-	<BR><I>1980:</I> OMD <I>(US release)</I>
-	<BR><I>1980:</I> OMD <I>(UK release)</I>
-	<BR><I>1981:</I> Bunker Soldiers
-	<BR><I>1981:</I> Architecture &amp; Morality
-	<BR><I>1983:</I> Dazzle Ships
-	<BR><I>1984:</I> Junk Culture
-	<BR><I>1985:</I> Crush
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5370">5370</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Oxygiene 23</B>
-
-	<BR><I>1995:</I> Blue
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>187 Calm</B>
-
-	<BR><I>1995:</I> One Eighty Seven Calm <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>1000 Homo DJs</B>
-
-	<BR><I>1990:</I> Supernaut <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Opus III</B>
-
-	<BR><I>1991:</I> Mind Fruit
-	<BR><I>1994:</I> Guru Mother
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pain Teens</B>
-
-	<BR><I>1990:</I> Born in Blood / Case Histories
-	<BR><I>1992:</I> Stimulation Festival
-	<BR><I>1993:</I> Destroy Me, Lover
-	<BR><I>1995:</I> Beast of Dreams
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Paralysed Age</B>
-
-	<BR><I>1994:</I> Nocturne
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pigface</B>
-
-	<BR><I>1990:</I> Gub
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1165">1165</A>
-	<BR><I>See also: </I><A HREF="http://www.eecs.nwu.edu/~smishra/Industrial/pigface/index.html">www.eecs.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pink Floyd</B>
-
-	<BR><I>1973:</I> Dark Side of the Moon
-	<BR><I>1975:</I> Wish You were Here
-	<BR><I>1978:</I> The Wall <I>(double soundtrack)</I>
-	<BR><I>1981:</I> A Collection of Great Dance Songs <I>(comp)</I>
-	<BR><I>1995:</I> A Saucerful of Pink: a Tribute <I>(double, various)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1008">1008</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Polygon Window</B>
-
-	<BR><I>1993:</I> Surfing on Sine Waves
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5279">5279</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Police</B>
-
-	<BR><I>1979:</I> Outlandos D'Amour
-	<BR><I>1980:</I> Ghost in the Machine
-	<BR><I>1981:</I> Zenyatta Mondatta
-	<BR><I>1983:</I> Synchronicity
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1172">1172</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Poe</B>
-
-	<BR><I>1995:</I> Hello
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pop, Iggy</B>
-
-	<BR><I>1977:</I> Lust for Life
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4345">4345</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Powerman 5000</B>
-
-	<BR><I>1995:</I> The Blood Splat Rating System
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Powerstation, The</B>
-
-	<BR><I>1985:</I> The Powerstation
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1259">1259</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Pram</B>
-
-	<BR><I>199?:</I> Iron Lung <I>(EP)</I>
-	<BR><I>1995:</I> Helium
-	<BR><I>1995:</I> Sargasso Sea
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Prick</B>
-
-	<BR><I>1995:</I> Prick
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3683">3683</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Primus</B>
-
-	<BR><I>1991:</I> Sailing on the Seas of Cheese
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1055">1055</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Project Pitchfork</B>
-
-	<BR><I>1991:</I> Dhyani
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Propaganda</B>
-
-	<BR><I>1985:</I> A Secret Wish, US version
-	<BR><I>1985:</I> A Secret Wish, UK version <I>(remixes)</I>
-	<BR><I>1985:</I> p:machinery (polish / passive) / Frozen Faces <I>(single)</I>
-	<BR><I>1985:</I> Duel / Jewel <I>(single)</I>
-	<BR><I>1985:</I> Wishful Thinking <I>(remixes)</I>
-	<BR><I>1990:</I> Heaven Give Me Words <I>(EP)</I>
-	<BR><I>1995:</I> p:machinery t-empo remix <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4636">4636</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/ztt">rt66.com</A>
-	<BR><I>See also: </I><A HREF="http://hcl.chass.ncsu.edu/~phelpsgm/claudia.htm">hcl.chass.ncsu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Prophetess, The</B>
-
-	<BR><I>1993:</I> The Prophetess
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Public Image Limited</B>
-
-	<BR><I>1985:</I> Album
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Rage Against the Machine</B>
-
-	<BR><I>1992:</I> Rage Against the Machine
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1424">1424</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Romeo Void</B>
-
-	<BR><I>1981:</I> Never Say Never / Present Tense <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Blaine Reininger</B>
-
-	<BR><I>1989:</I> Expatriate Journals
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Red Aunts</B>
-
-	<BR><I>1993:</I> Drag
-	<BR><I>1994:</I> Bad Motherfucker 400-Z
-	<BR><I>1995:</I> #1 Chicken
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4619">4619</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Re-Flex</B>
-
-	<BR><I>1983:</I> The Politics of Dancing / Re-Flex It <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Revolting Cocks</B>
-
-	<BR><I>1986:</I> Big Sexy Land
-	<BR><I>1988:</I> You Goddamned Son of a Bitch <I>(double live)</I>
-	<BR><I>1989:</I> Stainless Steel Providers <I>(EP)</I>
-	<BR><I>1990:</I> Beers, Steers, and Queers
-	<BR><I>1993:</I> Linger Ficken' Good
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1100">1100</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ridgway, Stan</B>
-
-	<BR><I>1986:</I> The Big Heat
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2904">2904</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Rosemarys, The</B>
-
-	<BR><I>1993:</I> Providence
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Rosetta Stone</B>
-
-	<BR><I>1993:</I> Adrenaline
-	<BR><I>1995:</I> The Tyrrany of Inaction
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ruby</B>
-
-	<BR><I>1995:</I> Salt Peter
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Rump</B>
-
-	<BR><I>1994:</I> Hating Brenda
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Rush</B>
-
-	<BR><I>1984:</I> Grace Under Pressure
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1039">1039</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sandoz</B>
-
-	<BR><I>1993:</I> Digital Lifeforms
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Scatterbrain</B>
-
-	<BR><I>1990:</I> Here Comes Trouble
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Scar Tissue</B>
-
-	<BR><I>1995:</I> Scar Tissue
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Scritti Politti</B>
-
-	<BR><I>1985:</I> Cupid &amp; Psyche
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Severed Heads</B>
-
-	<BR><I>1983:</I> Since the Accident
-	<BR><I>1986:</I> Come Visit the Big Bigot
-	<BR><I>1987:</I> Bad Mood Guy
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1480">1480</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sex Gang, Andi</B>
-
-	<BR><I>1994:</I> Arco Valley
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sex Gang Children</B>
-
-	<BR><I>1992:</I> Blind
-	<BR><I>1993:</I> Dieche
-	<BR><I>1993:</I> Medea
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Shadow Project</B>
-
-	<BR><I>1991:</I> Shadow Project
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sharkbait</B>
-
-	<BR><I>1991:</I> Blowtorch Facelift
-	<BR><I>1993:</I> Crushits
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sheep on Drugs</B>
-
-	<BR><I>1993:</I> Greatest Hits <I>(comp)</I>
-	<BR><I>1995:</I> Suck <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Shriekback</B>
-
-	<BR><I>1982:</I> Tench
-	<BR><I>1983:</I> Care
-	<BR><I>1983:</I> Care <I>(Y version)</I>
-	<BR><I>1983:</I> Lined Up / Hapax Legomena <I>(single)</I>
-	<BR><I>1983:</I> Lined Up / My Spine / Accretions /Into Method <I>(single)</I>
-	<BR><I>1983:</I> My Spine / Accretions / Clear Trails <I>(single)</I>
-	<BR><I>1983:</I> Sexthinkone / Here Comes My Hand <I>(single)</I>
-	<BR><I>1984:</I> Jamscience <I>(UK release)</I>
-	<BR><I>1984:</I> Jamscience <I>(Holland release)</I>
-	<BR><I>1984:</I> Knowledge, Power, Truth, and Sex
-	<BR><I>1984:</I> Mercy Dash <I>(picture disc, single)</I>
-	<BR><I>1984:</I> Hand on my Heart <I>(picture disc, single)</I>
-	<BR><I>1985:</I> The Infinite <I>(comp)</I>
-	<BR><I>1985:</I> Oil and Gold
-	<BR><I>1985:</I> Fish Below the Ice <I>(EP)</I>
-	<BR><I>1983-1985:</I> Priests and Kannibals <I>(comp)</I>
-	<BR><I>1986:</I> Big Night Music
-	<BR><I>1986:</I> Islam Grotto <I>(live boot)</I>
-	<BR><I>1988:</I> Evolution <I>(comp)</I>
-	<BR><I>1990:</I> The Dancing Years <I>(remixes)</I>
-	<BR><I>1993:</I> Sacred City
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1248">1248</A>
-	<BR><I>See also: </I><A HREF="http://http2.brunel.ac.uk:8080/~ee92pmh/shrkindx.html">http2.brunel.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Siglo XX</B>
-
-	<BR><I>1983-1986:</I> Antler Tracks I <I>(comp)</I>
-	<BR><I>1986:</I> Fear and Desire
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Single Gun Theory</B>
-
-	<BR><I>1989?:</I> Exorcise this Wasteland
-	<BR><I>1991:</I> Like Stars in my Hands
-	<BR><I>1993:</I> Burning Bright (but Unseen) <I>(EP)</I>
-	<BR><I>1994:</I> Flow, River of my Soul
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1404">1404</A>
-	<BR><I>See also: </I><A HREF="http://www.magna.com.au:80/~gunners/">www.magna.com.au</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Siouxsie and the Banshees</B>
-
-	<BR><I>1977:</I> Peel Sessions <I>(live EP)</I>
-	<BR><I>1978:</I> Peel Sessions 2 <I>(live EP)</I>
-	<BR><I>1978:</I> The Scream
-	<BR><I>1979:</I> Join Hands
-	<BR><I>1980:</I> Kaleidoscope
-	<BR><I>1981:</I> juju
-	<BR><I>1981:</I> Once Upon a Time <I>(comp)</I>
-	<BR><I>1981:</I> Spellbound / Follow the Sun / Slap Dash Snap <I>(single)</I>
-	<BR><I>1982:</I> Slowdive / Obsession II / Cannibal Roses <I>(single)</I>
-	<BR><I>1982:</I> A Kiss in the Dream House
-	<BR><I>1983:</I> Nocturne <I>(double live)</I>
-	<BR><I>1984:</I> Hyaena
-	<BR><I>1985:</I> Tinderbox
-	<BR><I>1986:</I> Through the Looking Glass
-	<BR><I>1987:</I> Song from the Edge of the World <I>(single)</I>
-	<BR><I>1988:</I> Peekaboo / False Face / Catwalk <I>(single)</I>
-	<BR><I>1988:</I> Peepshow
-	<BR><I>1991:</I> Superstition
-	<BR><I>1991:</I> Kiss Them for Me <I>(EP)</I>
-	<BR><I>1995:</I> The Rapture
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1216">1216</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sister Machine Gun</B>
-
-	<BR><I>1992:</I> Sins of the Flesh
-	<BR><I>1994:</I> The Torture Technique
-	<BR><I>1994:</I> Nothing <I>(single)</I>
-	<BR><I>1994:</I> Wired / Lung <I>(single)</I>
-	<BR><I>1995:</I> Burn
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3612">3612</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sisterhood, The</B>
-
-	<BR><I>1986:</I> Gift
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1115">1115</A>
-	<BR><I>See also: </I><A HREF="http://www.cm.cf.ac.uk/Sisters.Of.Mercy/Related.Works/Sisterhood.Page.html">www.cm.cf.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sisters of Mercy</B>
-
-	<BR><I>1985:</I> First and Last and Always
-	<BR><I>1988:</I> Floodland
-	<BR><I>1988:</I> More / You Could be the One <I>(single)</I>
-	<BR><I>1990:</I> Vision Thing
-	<BR><I>1992:</I> Some Girls Wander by Mistake <I>(comp)</I>
-	<BR><I>1992:</I> Temple of Love 1992 <I>(single)</I>
-	<BR><I>1993:</I> First and Last and Forever: A Tribute <I>(various)</I>
-	<BR><I>1993:</I> Under the Gun / Alice 1993 <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1062">1062</A>
-	<BR><I>See also: </I><A HREF="http://www.cm.cf.ac.uk:/Sisters.Of.Mercy/">www.cm.cf.ac.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Skeletal Family</B>
-
-	<BR><I>1984-1985:</I> Burning Oil / Futile Combat
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Skinny Puppy</B>
-
-	<BR><I>1983:</I> Back and Forth, Series Two
-	<BR><I>1984:</I> Bites
-	<BR><I>1984:</I> Remission
-	<BR><I>1984:</I> Bites and Remission
-	<BR><I>1986:</I> Mind: the Perpetual Intercourse
-	<BR><I>1986:</I> Dig It <I>(EP)</I>
-	<BR><I>1987:</I> Cleanse, Fold, and Manipulate
-	<BR><I>1988:</I> Vivisect VI
-	<BR><I>1989:</I> Rabies
-	<BR><I>1990:</I> Too Dark Park
-	<BR><I>1990:</I> Censor <I>(EP)</I>
-	<BR><I>1992:</I> 12 Inch Anthology <I>(comp)</I>
-	<BR><I>1992:</I> Last Rights
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1166">1166</A>
-	<BR><I>See also: </I><A HREF="http://www.eecs.nwu.edu/~smishra/Industrial/skinny-puppy">www.eecs.nwu.edu</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sky Cries Mary</B>
-
-	<BR><I>1993:</I> A Return to the Inner Experience
-	<BR><I>1994:</I> This Timeless Turning
-	<BR><I>1994:</I> Every Iceberg is Afire / Deep Sunless Sea / Cornerman <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1437">1437</A>
-	<BR><I>See also: </I><A HREF="http://www.starwave.com/corp/scm/scm.html">www.starwave.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Snog</B>
-
-	<BR><I>1995:</I> Dear Valued Customer
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Soh Daiko</B>
-
-	<BR><I>1990:</I> Taiko Drum Ensemble
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Some, Belouis</B>
-
-	<BR><I>1984:</I> Some People <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Southern Death Cult</B>
-
-	<BR><I>1982-1983:</I> Southern Death Cult <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Spahn Ranch</B>
-
-	<BR><I>1995:</I> The Coiled One
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>SSQ</B>
-
-	<BR><I>1984:</I> Playback
-	<BR><I>1986:</I> Insecurity <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Stabbing Westward</B>
-
-	<BR><I>1993:</I> Violent Mood Swings <I>(EP)</I>
-	<BR><I>1994:</I> Ungod
-	<BR><I>1995:</I> What Do I Have to Do / Falls Apart <I>(single)</I>
-	<BR><I>1995:</I> Wither Blister Burn and Peel
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2415">2415</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Strange Boutique</B>
-
-	<BR><I>199?:</I> Charm
-	<BR><I>199?:</I> The Kindest Words
-	<BR><I>199?:</I> The Loved One
-	</TD><TD>
-<I>See also: </I><A HREF="http://www.iuma.com/Bedazzled/band_html/Strange_Boutique.html">www.iuma.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Steroid Maximus</B>
-
-	<BR><I>1991:</I> Quilombo
-	<BR><I>1992:</I> Gondwanaland
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2750">2750</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sugarcubes, The</B>
-
-	<BR><I>1988:</I> Life's Too Good
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3419">3419</A>
-	<BR><I>See also: </I><A HREF="http://math-www.uio.no/bjork/index.html">math-www.uio.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Sunscreem</B>
-
-	<BR><I>1992:</I> O3
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Switchblade Symphony</B>
-
-	<BR><I>1992:</I> Fable <I>(tape/EP)</I>
-	<BR><I>1993:</I> Elegy <I>(tape/EP)</I>
-	<BR><I>1995:</I> Serpentine Gallery
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Talking Heads</B>
-
-	<BR><I>1977:</I> Talking Heads '77
-	<BR><I>1978:</I> More Songs About Buildings and Food
-	<BR><I>1979:</I> The Name of This Band is Talking Heads <I>(double live)</I>
-	<BR><I>1981:</I> Fear of Music
-	<BR><I>1983:</I> Sp eak in gI n To ngu es
-	<BR><I>1985:</I> Stop Making Sense <I>(live soundtrack)</I>
-	<BR><I>1985:</I> Little Creatures
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1012">1012</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tears For Fears</B>
-
-	<BR><I>1983:</I> The Hurting
-	<BR><I>1985:</I> Songs From the Big Chair
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2763">2763</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tel Basta</B>
-
-	<BR><I>1996:</I> Lickerish
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Thanatos</B>
-
-	<BR><I>1995:</I> An Embassy in Gaius
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Therapy?</B>
-
-	<BR><I>1992:</I> Caucasian Psychosis
-	<BR><I>1992:</I> Nurse
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2044">2044</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>13 Mg.</B>
-
-	<BR><I>1995:</I> Trust and Obey
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>This Ascension</B>
-
-	<BR><I>1991:</I> Light and Shade
-	<BR><I>1994:</I> Walk Softly, a Dream Lies Here
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Throwing Muses</B>
-
-	<BR><I>1986:</I> Throwing Muses
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1357">1357</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tinfed</B>
-
-	<BR><I>1993:</I> Synaptic Hardware
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tin Machine</B>
-
-	<BR><I>1989:</I> Tin Machine
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1098">1098</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tit Wrench United</B>
-
-	<BR><I>1993:</I> Full Employment
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tom Tom Club</B>
-
-	<BR><I>1981:</I> Tom Tom Club
-	<BR><I>1983:</I> Close to the Bone
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1012">1012</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tones on Tail</B>
-
-	<BR><I>1982:</I> Tones on Tail
-	<BR><I>1984:</I> Pop
-	<BR><I>1984:</I> Performance / Shakes <I>(single)</I>
-	<BR><I>1982-1984:</I> Night Music <I>(comp)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1235">1235</A>
-	<BR><I>See also: </I><A HREF="http://gothic.acs.csulb.edu:8080/~vamp/Gothic/Text/bauhaus-discog.html">gothic.acs.csulb.edu</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/title/t.html#tonesontail">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Trance Mission</B>
-
-	<BR><I>1993:</I> Trance Mission
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Trance to the Sun</B>
-
-	<BR><I>1994:</I> Ghost Forest
-	<BR><I>1995:</I> Bloom, Flowers, Bloom!
-	<BR><I>1995:</I> Venomous Eve
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Transvision Vamp</B>
-
-	<BR><I>1991:</I> Little Magnets versus the Bubble of Babble
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+5305">5305</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Trio</B>
-
-	<BR><I>1983:</I> Trio and Error
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tubes, The</B>
-
-	<BR><I>1981:</I> Tubes Rarities And Smash Hits [T.R.A.S.H]
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Tuxedomoon</B>
-
-	<BR><I>1980:</I> Half-Mute
-	<BR><I>1983:</I> A Thousand Lives by Picture
-	<BR><I>1985:</I> Holy Wars
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Underflowers</B>
-
-	<BR><I>1995:</I> Underflowers
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Urban Dance Squad</B>
-
-	<BR><I>1991:</I> Life'n Perspectives of a Genuine Crossover
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4626">4626</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Usherhouse</B>
-
-	<BR><I>1993:</I> Molting
-	<BR><I>1994:</I> Flux
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Ultravox</B>
-
-	<BR><I>1978:</I> Systems of Romance
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Van Acker, Luc</B>
-
-	<BR><I>1980:</I> Taking Snapshots, Volume 1
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1100">1100</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Vangelis</B>
-
-	<BR><I>1994:</I> Blade Runner <I>(soundtrack)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1023">1023</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/vangelis">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>various</B>
-
-	<BR><I>1980:</I> URGH!  A Music War <I>(live comp)</I>
-	<BR><I>1981-1994:</I> Wax Trax Black Box <I>(comp)</I>
-	<BR><I>1982-198?:</I> In Goth Daze (Anagram version) <I>(comp)</I>
-	<BR><I>1982-1994:</I> In Goth Daze (Cleopatra version) <I>(comp)</I>
-	<BR><I>1982-1993:</I> The Whip (Cleopatra) <I>(comp)</I>
-	<BR><I>1984-1985:</I> IQ6: Zang Tumb Tuum Sampled <I>(comp)</I>
-	<BR><I>1984-1995:</I> DEC ADE NCE (Nettwerk) <I>(comp)</I>
-	<BR><I>1988:</I> This is Electronic Body Music <I>(comp)</I>
-	<BR><I>1990:</I> From Across This Gray Land #2 (Projekt) <I>(comp)</I>
-	<BR><I>1990:</I> Doctor Death IV: The Marvels of Insect Life <I>(double comp)</I>
-	<BR><I>1990:</I> Red Hot + Blue <I>(comp)</I>
-	<BR><I>1991:</I> Bouquet of Dreams <I>(comp)</I>
-	<BR><I>1980-1992:</I> Gothic Rock <I>(comp)</I>
-	<BR><I>1992:</I> Mindfield (Third Mind) <I>(comp)</I>
-	<BR><I>1992:</I> From Across This Gray Land #3 (Projekt) <I>(comp)</I>
-	<BR><I>1992:</I> The Cyberflesh Conspiracy <I>(comp)</I>
-	<BR><I>1992:</I> G&aacute;rgula Mec&acirc;nica: World Electrostatic Assembly <I>(comp)</I>
-	<BR><I>1992:</I> CCCC: California Cyber Crash Compilation (Cop) <I>(comp)</I>
-	<BR><I>1993:</I> Shut Up Kitty <I>(comp)</I>
-	<BR><I>1988-1993:</I> Can You See It Yet? (Invisible) <I>(comp)</I>
-	<BR><I>1994:</I> Mysterious Encounters (Cleopatra) <I>(comp)</I>
-	<BR><I>1994:</I> The Crow <I>(comp)</I>
-	<BR><I>1994:</I> Totentanz: The Best of Zoth Ommog <I>(double comp)</I>
-	<BR><I>1992:</I> Hy! (Hyperium Compilation volume 1) <I>(comp)</I>
-	<BR><I>1993:</I> World Domination Sampler <I>(comp)</I>
-	<BR><I>1993:</I> Rivet Head Culture <I>(comp)</I>
-	<BR><I>1993:</I> Artificial Intelligence (Warp) <I>(comp)</I>
-	<BR><I>1994:</I> Artificial Intelligence II (Warp) <I>(comp)</I>
-	<BR><I>1994:</I> Big Hard Disk #2 (Smash) <I>(comp)</I>
-	<BR><I>1994:</I> Kindred Spirits (Bedazzled) <I>(comp)</I>
-	<BR><I>1994:</I> Plug In + Turn On (Instinct) <I>(comp)</I>
-	<BR><I>1994:</I> The Disease of Lady Madeline (Anubis) <I>(comp)</I>
-	<BR><I>1994:</I> Natural Born Killers <I>(soundtrack comp)</I>
-	<BR><I>1994:</I> Afterburn (Wax Trax) <I>(comp)</I>
-	<BR><I>1994:</I> Chaos Compilation (Cop) <I>(comp)</I>
-	<BR><I>1994:</I> Electrocity Vol. 5 <I>(comp)</I>
-	<BR><I>1995:</I> Gothik (Cleopatra) <I>(double comp)</I>
-	<BR><I>1995:</I> Godfathers of German Gothic <I>(comp)</I>
-	<BR><I>1995:</I> Heavenly Voices III (Hyperium) <I>(comp)</I>
-	<BR><I>1995:</I> Mortal Kombat <I>(soundtrack comp)</I>
-	<BR><I>1995:</I> The Tyranny Off the Beat (Off Beat/Cleopatra) <I>(comp)</I>
-	<BR><I>1995:</I> Forced Cranial Removal (Fifth Colvmn) <I>(comp)</I>
-	<BR><I>1995:</I> Dreams in the Witch House (Grave News) <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Vega, Suzanne</B>
-
-	<BR><I>1992:</I> 99.9F
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2088">2088</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Vinyl Devotion</B>
-
-	<BR><I>1994:</I> If They Know You're Trying
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Volume Magazine</B>
-
-	<BR><I>1991:</I> Volume: 1 <I>(comp)</I>
-	<BR><I>1991:</I> Volume: 2 <I>(comp)</I>
-	<BR><I>1992:</I> Volume: 3 <I>(comp)</I>
-	<BR><I>1992:</I> Volume: 4 <I>(comp)</I>
-	<BR><I>1995:</I> Wasted: The Best of Volume <I>(double comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Waitresses, The</B>
-
-	<BR><I>1981:</I> Wasn't Tomorrow Wonderful?
-	<BR><I>1982:</I> Bruiseology
-	<BR><I>1978-1981:</I> Best Of <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Wake, The</B>
-
-	<BR><I>1993:</I> Masked
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Wall of Voodoo</B>
-
-	<BR><I>1980:</I> fpfpfpfpfpfp
-	<BR><I>1981:</I> Dark Continent
-	<BR><I>1982:</I> Call of the West
-	<BR><I>1986:</I> Seven Days in Sammystown
-	<BR><I>1987:</I> Happy Planet
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Wang Chung</B>
-
-	<BR><I>1983:</I> Points On the Curve
-	<BR><I>1985:</I> To Live and Die in L.A. <I>(soundtrack)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+2245">2245</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Westworld</B>
-
-	<BR><I>1987:</I> Rockulator
-	<BR><I>1991:</I> Movers and Shakers
-	<BR><I>1991:</I> Do No Wrong <I>(single)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Whale</B>
-
-	<BR><I>1994:</I> Hobo Humpin Slobo Babe / Eye 842 <I>(single)</I>
-	<BR><I>1994:</I> Hobo Humpin Slobo Babe / Lips / Eye 842 <I>(single)</I>
-	<BR><I>1994:</I> Pay for Me <I>(EP)</I>
-	<BR><I>1995:</I> We Care
-	<BR><I>1995:</I> I'll Do Ya <I>(EP)</I>
-	<BR><I>1995:</I> Hobo Humpin Slobo Babe (3 mixes) <I>(single)</I>
-	<BR><I>1995:</I> Hobo Humpin Slobo Babe / You and Your Sister / Singer Star <I>(single)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+3790">3790</A>
-	<BR><I>See also: </I><A HREF="http://www.vmg.co.uk/hut/whale/">www.vmg.co.uk</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>White Zombie</B>
-
-	<BR><I>1992:</I> Nightcrawlers: the KMFDM Remixes <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Wilde, Kim</B>
-
-	<BR><I>1981:</I> Kim Wilde
-	<BR><I>1984:</I> Teases &amp; Dares
-	<BR><I>1981-1993:</I> The Singles Collection <I>(comp)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>X</B>
-
-	<BR><I>1988:</I> Live at the Whiskey-a-Go-Go <I>(double live)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>X Marks the Pedwalk</B>
-
-	<BR><I>1994:</I> The Killing Had Begun
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Xorcist</B>
-
-	<BR><I>1991:</I> Damned Souls
-	<BR><I>1993:</I> Bitches <I>(EP)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>XTC</B>
-
-	<BR><I>1982:</I> Waxworks
-	<BR><I>1983:</I> Mummer
-	<BR><I>1984:</I> The Big Express
-	<BR><I>1985:</I> 25 O'Clock
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1044">1044</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Xymox</B>
-
-	<BR><I>1985:</I> Clan of Xymox
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1295">1295</A>
-	<BR><I>See also: </I><A HREF="http://isvpc146.isv.uit.no/html/group/clanofxymox.html#clanofxymox">isvpc146.isv.uit.no</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Yamashirogumi, Geinoh</B>
-
-	<BR><I>1990:</I> Akira <I>(soundtrack)</I>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Yazoo</B>
-
-	<BR><I>1982:</I> Upstairs at Eric's
-	<BR><I>1982:</I> The Other Side of Love <I>(single)</I>
-	<BR><I>1983:</I> You and Me Both
-	<BR><I>1983:</I> Nobody's Diary / State Farm <I>(single)</I>
-	<BR><I>1983:</I> Situation <I>(EP)</I>
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+4309">4309</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/erasure">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Yello</B>
-
-	<BR><I>1980:</I> Solid Pleasure
-	<BR><I>1981:</I> Stella
-	<BR><I>1983:</I> You Gotta Say Yes to Another Excess
-	<BR><I>1987:</I> One Second
-	<BR><I>1988:</I> Flag
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1506">1506</A>
-	<BR><I>See also: </I><A HREF="http://newton.space.net/yello/yello.a.html">newton.space.net</A>
-	<BR><I>See also: </I><A HREF="http://rt66.com/ftp/usr2/lazlo/discographies/yello">rt66.com</A>
-	</TD></TABLE>
-
-<LI>	<TABLE BORDER=0 width="90%" CELLSPACING=4><TR VALIGN=TOP><TD WIDTH="60%">
-	<B>Yes</B>
-
-	<BR><I>1972:</I> Fragile
-	<BR><I>1975:</I> Classic Yes
-	<BR><I>1980:</I> Drama
-	<BR><I>1983:</I> 90125
-	</TD><TD>
-<I>UBL Card: </I><A HREF="http://american.recordings.com/WWWoM/cgi-bin/ubl?card+1038">1038</A>
-	</TD></TABLE>
-</UL>
-
---------------167E2781446B
-Content-Type: application/postscript; name="album-list.ps"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline; filename="album-list.ps"
-
-%!PS-Adobe-3.0
-%%BoundingBox: 54 72 558 720
-%%Creator: Mozilla (NetScape) HTML->PS
-%%DocumentData: Clean7Bit
-%%Orientation: Portrait
-%%Pages: 31
-%%PageOrder: Ascend
-%%Title: jwz's tunes
-%%EndComments
-%%BeginProlog
-[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
- /two /three /four /five /six /seven /eight /nine /colon /semicolon
- /less /equal /greater /question /at /A /B /C /D /E
- /F /G /H /I /J /K /L /M /N /O
- /P /Q /R /S /T /U /V /W /X /Y
- /Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft /a /b /c
- /d /e /f /g /h /i /j /k /l /m
- /n /o /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /space /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright
- /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree /plusminus /twosuperior /threesuperior
- /acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf
- /threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde
- /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
- /Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring
- /ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash /ugrave
- /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding exch def
-/c { matrix currentmatrix currentpoint translate
-     3 1 roll scale newpath 0 0 1 0 360 arc setmatrix } bind def
-/F0
-    /Times-Roman findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f0 { /F0 findfont exch scalefont setfont } bind def
-/F1
-    /Times-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f1 { /F1 findfont exch scalefont setfont } bind def
-/F2
-    /Times-Italic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f2 { /F2 findfont exch scalefont setfont } bind def
-/F3
-    /Times-BoldItalic findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f3 { /F3 findfont exch scalefont setfont } bind def
-/F4
-    /Courier findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f4 { /F4 findfont exch scalefont setfont } bind def
-/F5
-    /Courier-Bold findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f5 { /F5 findfont exch scalefont setfont } bind def
-/F6
-    /Courier-Oblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f6 { /F6 findfont exch scalefont setfont } bind def
-/F7
-    /Courier-BoldOblique findfont
-    dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding isolatin1encoding def
-    currentdict end
-definefont pop
-/f7 { /F7 findfont exch scalefont setfont } bind def
-/rhc {
-    {
-        currentfile read {
-	    dup 97 ge
-		{ 87 sub true exit }
-		{ dup 48 ge { 48 sub true exit } { pop } ifelse }
-	    ifelse
-	} {
-	    false
-	    exit
-	} ifelse
-    } loop
-} bind def
-
-/cvgray { % xtra_char npix cvgray - (string npix long)
-    dup string
-    0
-    {
-	rhc { cvr 4.784 mul } { exit } ifelse
-	rhc { cvr 9.392 mul } { exit } ifelse
-	rhc { cvr 1.824 mul } { exit } ifelse
-	add add cvi 3 copy put pop
-	1 add
-	dup 3 index ge { exit } if
-    } loop
-    pop
-    3 -1 roll 0 ne { rhc { pop } if } if
-    exch pop
-} bind def
-
-/smartimage12rgb { % w h b [matrix] smartimage12rgb -
-    /colorimage where {
-	pop
-	{ currentfile rowdata readhexstring pop }
-	false 3
-	colorimage
-    } {
-	exch pop 8 exch
-	3 index 12 mul 8 mod 0 ne { 1 } { 0 } ifelse
-	4 index
-	6 2 roll
-	{ 2 copy cvgray }
-	image
-	pop pop
-    } ifelse
-} def
-/cshow { dup stringwidth pop 2 div neg 0 rmoveto show } bind def
-/rshow { dup stringwidth pop neg 0 rmoveto show } bind def
-%%EndProlog
-%%Page: 1 1
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-219.1 706.9 moveto
-14 f1
-(jwz's tunes) show
-174 690.9 moveto
-14 f1
-(Last modified: 06-Apr-96.) show
-0 663.9 moveto
-12 f0
-(This is a list of all of the music I have on CD, tape, and vinyl \(including all of the old, embarrasing) show
-0 650.6 moveto
-12 f0
-(stuff...\) This page may look a little funny if you aren't using a browser that supports HTML tables, like) show
-0 637.3 moveto
-12 f0
-(Mozilla) show
-37.3 637.3 moveto
-12 f0
-(.) show
-28 610.7 moveto
-12 f0
-(``) show
-35.9 610.7 moveto
-12 f2
-(Publishing CD lists and tape collections evokes images of lonely, pathetic men who talk) show
-28 597.4 moveto
-12 f2
-(about their cats incessantly.) show
-162.6 597.4 moveto
-12 f0
-('' -- Paul Phillips ) show
-0 570.8 moveto
-12 f0
-(I used to have this set up so that clicking on any name would take you to the appropriate entry of the All) show
-0 557.5 moveto
-12 f0
-(Music Guide at ) show
-76.9 557.5 moveto
-10 f4
-(gopher://allmusic.ferris.edu) show
-244.9 557.5 moveto
-12 f0
-(; but they have since moved their database from there) show
-0 544.2 moveto
-12 f0
-(to ) show
-12.3 544.2 moveto
-10 f4
-(cdnow.com) show
-66.3 544.2 moveto
-12 f0
-(, and in the process, have obfuscated access to the database to such an extent that this is no) show
-0 530.9 moveto
-12 f0
-(longer possible. In order to get at the discographies, you need to weed your way through dozens of) show
-0 517.6 moveto
-12 f0
-(pages, and there seems to be no even semi-reliable way to pre-compute the URL that they will use.) show
-0 504.3 moveto
-12 f0
-(Arrgh!) show
-0 477.7 moveto
-12 f0
-(The Internet Movie Database) show
-140.2 477.7 moveto
-12 f0
-( has an excellent interface for this sort of thing; I really wish more people) show
-0 464.4 moveto
-12 f0
-(would emulate that system.) show
-0 437.8 moveto
-12 f0
-(In this list, I've included links to various related web pages that I've come across; one very cool and) show
-0 424.5 moveto
-12 f0
-(well-organized database to which many of these links point is ) show
-299.2 424.5 moveto
-12 f0
-(The Ultimate Band List) show
-412.8 424.5 moveto
-12 f0
-(; check it out!) show
-157.2 397.9 moveto
-12 f0
-(Jamie Zawinski) show
-232.8 397.9 moveto
-12 f0
-( ) show
-235.8 397.9 moveto
-10 f4
-(<jwz@netscape.com>) show
-343.8 397.9 moveto
-12 f0
-( ) show
-0 375.6 moveto
-504 0 rlineto 0 -2.8 rlineto -504 0 rlineto closepath  fill 
-18.1 348.8 moveto
-3.3 3.3 c  fill 
-31.5 340.7 moveto
-12 f1
-(Act) show
-49.4 340.7 moveto
-12 f0
-( ) show
-31.5 327.4 moveto
-12 f2
-(1988:) show
-59.4 327.4 moveto
-12 f0
-( Laughter, Tears, and Rage ) show
-298.1 341.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 341.2 moveto
-12 f0
-(4637) show
-379.4 341.2 moveto
-12 f0
-( ) show
-298.1 327.9 moveto
-12 f2
-(See also: ) show
-344.7 327.9 moveto
-12 f0
-(rt66.com) show
-387.6 327.9 moveto
-12 f0
-( ) show
-298.1 314.6 moveto
-12 f2
-(See also: ) show
-344.7 314.6 moveto
-12 f0
-(hcl.chass.ncsu.edu) show
-433.6 314.6 moveto
-12 f0
-( ) show
-18.1 301.9 moveto
-3.3 3.3 c  fill 
-31.5 293.8 moveto
-12 f1
-(Age of Chance) show
-106.1 293.8 moveto
-12 f0
-( ) show
-31.5 280.5 moveto
-12 f2
-(1987:) show
-59.4 280.5 moveto
-12 f0
-( Kiss ) show
-86.7 280.5 moveto
-12 f2
-(\(single\)) show
-123.3 280.5 moveto
-12 f0
-( ) show
-31.5 267.2 moveto
-12 f2
-(1987:) show
-59.4 267.2 moveto
-12 f0
-( Don't Get Mad, Get Even ) show
-189.7 267.2 moveto
-12 f2
-(\(single\)) show
-226.3 267.2 moveto
-12 f0
-( ) show
-18.1 254.5 moveto
-3.3 3.3 c  fill 
-31.5 246.4 moveto
-12 f1
-(Alien Sex Fiend) show
-112.1 246.4 moveto
-12 f0
-( ) show
-31.5 233.1 moveto
-12 f2
-(1983-1992:) show
-87.4 233.1 moveto
-12 f0
-( Drive My Rocket ) show
-177.3 233.1 moveto
-12 f2
-(\(comp\)) show
-211.2 233.1 moveto
-12 f0
-( ) show
-31.5 219.8 moveto
-12 f2
-(1989:) show
-59.4 219.8 moveto
-12 f0
-( Too Much Acid? ) show
-147.3 219.8 moveto
-12 f2
-(\(live\)) show
-172.6 219.8 moveto
-12 f0
-( ) show
-31.5 206.5 moveto
-12 f2
-(1990:) show
-59.4 206.5 moveto
-12 f0
-( Curse ) show
-31.5 193.2 moveto
-12 f2
-(1992:) show
-59.4 193.2 moveto
-12 f0
-( Open Head Surgery ) show
-31.5 179.9 moveto
-12 f2
-(1993:) show
-59.4 179.9 moveto
-12 f0
-( Altered States of America ) show
-190.3 179.9 moveto
-12 f2
-(\(live\)) show
-215.6 179.9 moveto
-12 f0
-( ) show
-31.5 164 moveto
-12 f2
-(1995:) show
-59.4 164 moveto
-12 f0
-( Inferno: The Odyssey Continues) show
-218.7 168.4 moveto
-10 f0
-(tm) show
-229.2 164 moveto
-12 f0
-( ) show
-232.2 164 moveto
-12 f2
-(\(soundtrack\)) show
-298.1 246.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 246.9 moveto
-12 f0
-(5291) show
-379.4 246.9 moveto
-12 f0
-( ) show
-298.1 233.6 moveto
-12 f2
-(See also: ) show
-344.7 233.6 moveto
-12 f0
-(cent1.lancs.ac.uk) show
-427 233.6 moveto
-12 f0
-( ) show
-18.1 151.3 moveto
-3.3 3.3 c  fill 
-31.5 143.2 moveto
-12 f1
-(Alio Die) show
-73.1 143.2 moveto
-12 f0
-( ) show
-31.5 129.9 moveto
-12 f2
-(1993:) show
-59.4 129.9 moveto
-12 f0
-( Under a Holy Ritual ) show
-298.1 143.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 143.7 moveto
-12 f0
-(1266) show
-379.4 143.7 moveto
-12 f0
-( ) show
-298.1 130.4 moveto
-12 f2
-(See also: ) show
-344.7 130.4 moveto
-12 f0
-(www.projekt.com) show
-431.3 130.4 moveto
-12 f0
-( ) show
-18.1 117.2 moveto
-3.3 3.3 c  fill 
-31.5 109.1 moveto
-12 f1
-(Alphaville) show
-84.1 109.1 moveto
-12 f0
-( ) show
-31.5 95.8 moveto
-12 f2
-(1984:) show
-59.4 95.8 moveto
-12 f0
-( Forever Young ) show
-298.1 109.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 109.6 moveto
-12 f0
-(3056) show
-379.4 109.6 moveto
-12 f0
-( ) show
-298.1 96.3 moveto
-12 f2
-(See also: ) show
-344.7 96.3 moveto
-12 f0
-(www.escape.com) show
-429.3 96.3 moveto
-12 f0
-( ) show
-18.1 83.1 moveto
-3.3 3.3 c  fill 
-31.5 75 moveto
-12 f1
-(Altered Images) show
-109.8 75 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 2 2
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1981:) show
-59.4 709.2 moveto
-12 f0
-( Happy Birthday ) show
-31.5 695.9 moveto
-12 f2
-(1983:) show
-59.4 695.9 moveto
-12 f0
-( Bite ) show
-31.5 682.6 moveto
-12 f2
-(1984:) show
-59.4 682.6 moveto
-12 f0
-( Collected Images ) show
-149 682.6 moveto
-12 f2
-(\(comp\)) show
-182.9 682.6 moveto
-12 f0
-( ) show
-18.1 669.9 moveto
-3.3 3.3 c  fill 
-31.5 661.8 moveto
-12 f1
-(An April March) show
-114.8 661.8 moveto
-12 f0
-( ) show
-31.5 648.5 moveto
-12 f2
-(1995:) show
-59.4 648.5 moveto
-12 f0
-( Lessons in Vengance ) show
-31.5 635.2 moveto
-12 f2
-(1995:) show
-59.4 635.2 moveto
-12 f0
-( Instruments of Lust and Fury ) show
-18.1 622.5 moveto
-3.3 3.3 c  fill 
-31.5 614.4 moveto
-12 f1
-(And Also the Trees) show
-129.8 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1983-1992:) show
-87.4 601.1 moveto
-12 f0
-( From Horizon to Horizon ) show
-216.3 601.1 moveto
-12 f2
-(\(comp\)) show
-250.2 601.1 moveto
-12 f0
-( ) show
-298.1 614.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 614.9 moveto
-12 f0
-(1867) show
-379.4 614.9 moveto
-12 f0
-( ) show
-298.1 601.6 moveto
-12 f2
-(See also: ) show
-344.7 601.6 moveto
-12 f0
-(www.ugcs.caltech.edu) show
-453 601.6 moveto
-12 f0
-( ) show
-298.1 588.3 moveto
-12 f2
-(See also: ) show
-344.7 588.3 moveto
-12 f0
-(onyx.dartmouth.edu) show
-441.3 588.3 moveto
-12 f0
-( ) show
-18.1 575.6 moveto
-3.3 3.3 c  fill 
-31.5 567.5 moveto
-12 f1
-(Anderson, Laurie) show
-122.1 567.5 moveto
-12 f0
-( ) show
-31.5 554.2 moveto
-12 f2
-(1982:) show
-59.4 554.2 moveto
-12 f0
-( Big Science ) show
-31.5 540.9 moveto
-12 f2
-(1983:) show
-59.4 540.9 moveto
-12 f0
-( United States Live, parts 1-4 ) show
-203 540.9 moveto
-12 f2
-(\(5 albums\)) show
-254.6 540.9 moveto
-12 f0
-( ) show
-31.5 527.6 moveto
-12 f2
-(1984:) show
-59.4 527.6 moveto
-12 f0
-( Mister Heartbreak ) show
-31.5 514.3 moveto
-12 f2
-(1986:) show
-59.4 514.3 moveto
-12 f0
-( Home of the Brave ) show
-157 514.3 moveto
-12 f2
-(\(live soundtrack\)) show
-238.6 514.3 moveto
-12 f0
-( ) show
-31.5 501 moveto
-12 f2
-(1995:) show
-59.4 501 moveto
-12 f0
-( Bright Red ) show
-298.1 568 moveto
-12 f2
-(UBL Card: ) show
-355.4 568 moveto
-12 f0
-(1494) show
-379.4 568 moveto
-12 f0
-( ) show
-298.1 554.7 moveto
-12 f2
-(See also: ) show
-344.7 554.7 moveto
-12 f0
-(www.voyagerco.com) show
-447.3 554.7 moveto
-12 f0
-( ) show
-298.1 541.4 moveto
-12 f2
-(See also: ) show
-344.7 541.4 moveto
-12 f0
-(www.netpart.com) show
-430.6 541.4 moveto
-12 f0
-( ) show
-298.1 528.1 moveto
-12 f2
-(See also: ) show
-344.7 528.1 moveto
-12 f0
-(www.c3.lanl.gov) show
-427 528.1 moveto
-12 f0
-( ) show
-18.1 488.3 moveto
-3.3 3.3 c  fill 
-31.5 480.2 moveto
-12 f1
-(Ant, Adam) show
-88.1 480.2 moveto
-12 f0
-( ) show
-31.5 466.9 moveto
-12 f2
-(1980:) show
-59.4 466.9 moveto
-12 f0
-( Kings of the Wild Frontier ) show
-31.5 453.6 moveto
-12 f2
-(1981:) show
-59.4 453.6 moveto
-12 f0
-( Prince Charming ) show
-31.5 440.3 moveto
-12 f2
-(1982:) show
-59.4 440.3 moveto
-12 f0
-( Friend or Foe ) show
-31.5 427 moveto
-12 f2
-(1983:) show
-59.4 427 moveto
-12 f0
-( Dirk Wears White Sox ) show
-31.5 413.7 moveto
-12 f2
-(1985:) show
-59.4 413.7 moveto
-12 f0
-( Viva Le Rock ) show
-31.5 400.4 moveto
-12 f2
-(1979-1986:) show
-87.4 400.4 moveto
-12 f0
-( Antics in the Forbidden Zone ) show
-234.7 400.4 moveto
-12 f2
-(\(comp\)) show
-268.6 400.4 moveto
-12 f0
-( ) show
-298.1 480.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 480.7 moveto
-12 f0
-(1205) show
-379.4 480.7 moveto
-12 f0
-( ) show
-298.1 467.4 moveto
-12 f2
-(See also: ) show
-344.7 467.4 moveto
-12 f0
-(www.uhs.uga.edu) show
-431 467.4 moveto
-12 f0
-( ) show
-298.1 454.1 moveto
-12 f2
-(See also: ) show
-344.7 454.1 moveto
-12 f0
-(caprec.com) show
-399.6 454.1 moveto
-12 f0
-( ) show
-18.1 387.7 moveto
-3.3 3.3 c  fill 
-31.5 379.6 moveto
-12 f1
-(Anthrax) show
-74.8 379.6 moveto
-12 f0
-( ) show
-31.5 366.3 moveto
-12 f2
-(1991:) show
-59.4 366.3 moveto
-12 f0
-( Attack of the Killer B's ) show
-178.7 366.3 moveto
-12 f2
-(\(comp\)) show
-212.6 366.3 moveto
-12 f0
-( ) show
-298.1 380.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 380.1 moveto
-12 f0
-(2710) show
-379.4 380.1 moveto
-12 f0
-( ) show
-18.1 353.6 moveto
-3.3 3.3 c  fill 
-31.5 345.5 moveto
-12 f1
-(Aphex Twin) show
-94.5 345.5 moveto
-12 f0
-( ) show
-31.5 332.2 moveto
-12 f2
-(1993:) show
-59.4 332.2 moveto
-12 f0
-( On ) show
-80 332.2 moveto
-12 f2
-(\(EP\)) show
-102.6 332.2 moveto
-12 f0
-( ) show
-31.5 318.9 moveto
-12 f2
-(1994:) show
-59.4 318.9 moveto
-12 f0
-( Analogue Bubblebath ) show
-170.3 318.9 moveto
-12 f2
-(\(EP\)) show
-192.9 318.9 moveto
-12 f0
-( ) show
-31.5 305.6 moveto
-12 f2
-(1995:) show
-59.4 305.6 moveto
-12 f0
-( Ventolin ) show
-107.4 305.6 moveto
-12 f2
-(\(EP\)) show
-130 305.6 moveto
-12 f0
-( ) show
-298.1 346 moveto
-12 f2
-(UBL Card: ) show
-355.4 346 moveto
-12 f0
-(5279) show
-379.4 346 moveto
-12 f0
-( ) show
-298.1 332.7 moveto
-12 f2
-(See also: ) show
-344.7 332.7 moveto
-12 f0
-(hyperreal.com) show
-413.6 332.7 moveto
-12 f0
-( ) show
-298.1 319.4 moveto
-12 f2
-(See also: ) show
-344.7 319.4 moveto
-12 f0
-(pathfinder.com) show
-417.6 319.4 moveto
-12 f0
-( ) show
-18.1 292.9 moveto
-3.3 3.3 c  fill 
-31.5 284.8 moveto
-12 f1
-(Arcadia) show
-72.8 284.8 moveto
-12 f0
-( ) show
-31.5 271.5 moveto
-12 f2
-(1985:) show
-59.4 271.5 moveto
-12 f0
-( So Red the Rose ) show
-298.1 285.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 285.3 moveto
-12 f0
-(1259) show
-379.4 285.3 moveto
-12 f0
-( ) show
-18.1 258.8 moveto
-3.3 3.3 c  fill 
-31.5 250.7 moveto
-12 f1
-(Armageddon Dildos) show
-134.5 250.7 moveto
-12 f0
-( ) show
-31.5 237.4 moveto
-12 f2
-(1995:) show
-59.4 237.4 moveto
-12 f0
-( Lost ) show
-305.3 251.2 moveto
-12 f2
-(UBL Card: ) show
-362.6 251.2 moveto
-12 f0
-(2538) show
-386.6 251.2 moveto
-12 f0
-( ) show
-18.1 224.7 moveto
-3.3 3.3 c  fill 
-31.5 216.6 moveto
-12 f1
-(Ash, Daniel) show
-90.8 216.6 moveto
-12 f0
-( ) show
-31.5 203.3 moveto
-12 f2
-(1991:) show
-59.4 203.3 moveto
-12 f0
-( Coming Down ) show
-31.5 190 moveto
-12 f2
-(1992:) show
-59.4 190 moveto
-12 f0
-( Foolish Thing Desire ) show
-298.1 217.1 moveto
-12 f2
-(See also: ) show
-344.7 217.1 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 217.1 moveto
-12 f0
-( ) show
-18.1 177.3 moveto
-3.3 3.3 c  fill 
-31.5 169.2 moveto
-12 f1
-(Archangel, Nathalie) show
-134.1 169.2 moveto
-12 f0
-( ) show
-31.5 155.9 moveto
-12 f2
-(1992:) show
-59.4 155.9 moveto
-12 f0
-( Owl ) show
-18.1 143.2 moveto
-3.3 3.3 c  fill 
-31.5 135.1 moveto
-12 f1
-(Art of Noise) show
-93.4 135.1 moveto
-12 f0
-( ) show
-31.5 121.8 moveto
-12 f2
-(1983:) show
-59.4 121.8 moveto
-12 f0
-( Who's Afraid of the Art of Noise? ) show
-31.5 108.5 moveto
-12 f2
-(1983:) show
-59.4 108.5 moveto
-12 f0
-( The Art of Noise Have Closed Up ) show
-31.5 95.2 moveto
-12 f2
-(1983:) show
-59.4 95.2 moveto
-12 f0
-( Beatbox ) show
-31.5 81.9 moveto
-12 f2
-(1983:) show
-59.4 81.9 moveto
-12 f0
-( Daft ) show
-298.1 135.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 135.6 moveto
-12 f0
-(1918) show
-379.4 135.6 moveto
-12 f0
-( ) show
-298.1 122.3 moveto
-12 f2
-(See also: ) show
-344.7 122.3 moveto
-12 f0
-(rt66.com) show
-387.6 122.3 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 3 3
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1984:) show
-59.4 709.2 moveto
-12 f0
-( Edited ) show
-96.7 709.2 moveto
-12 f2
-(\(picture disc\)) show
-161 709.2 moveto
-12 f0
-( ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Attrition) show
-76.8 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1985:) show
-59.4 675.1 moveto
-12 f0
-( Smiling, at the Hypogonder Club ) show
-225 675.1 moveto
-12 f2
-(\(comp\)) show
-258.9 675.1 moveto
-12 f0
-( ) show
-298.1 688.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 688.9 moveto
-12 f0
-(4232) show
-379.4 688.9 moveto
-12 f0
-( ) show
-298.1 675.6 moveto
-12 f2
-(See also: ) show
-344.7 675.6 moveto
-12 f0
-(www.projekt.com) show
-431.3 675.6 moveto
-12 f0
-( ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(AUTECHRe) show
-96.8 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1994:) show
-59.4 641 moveto
-12 f0
-( INCUNABULA ) show
-31.5 627.7 moveto
-12 f2
-(1994:) show
-59.4 627.7 moveto
-12 f0
-( BASSCAD,EP ) show
-137.7 627.7 moveto
-12 f2
-(\(EP\)) show
-160.3 627.7 moveto
-12 f0
-( ) show
-31.5 614.4 moveto
-12 f2
-(1994:) show
-59.4 614.4 moveto
-12 f0
-( Amber ) show
-31.5 601.1 moveto
-12 f2
-(1995:) show
-59.4 601.1 moveto
-12 f0
-( Garbage ) show
-18.1 588.4 moveto
-3.3 3.3 c  fill 
-31.5 580.3 moveto
-12 f1
-(B52's) show
-60.1 580.3 moveto
-12 f0
-( ) show
-31.5 567 moveto
-12 f2
-(1979:) show
-59.4 567 moveto
-12 f0
-( B52's ) show
-31.5 553.7 moveto
-12 f2
-(1980:) show
-59.4 553.7 moveto
-12 f0
-( Wild Planet ) show
-31.5 540.4 moveto
-12 f2
-(1982:) show
-59.4 540.4 moveto
-12 f0
-( Mesopotamia ) show
-31.5 527.1 moveto
-12 f2
-(1983:) show
-59.4 527.1 moveto
-12 f0
-( Whammy! ) show
-31.5 513.8 moveto
-12 f2
-(1981:) show
-59.4 513.8 moveto
-12 f0
-( Party Mix ) show
-305.7 580.8 moveto
-12 f2
-(UBL Card: ) show
-363 580.8 moveto
-12 f0
-(2268) show
-387 580.8 moveto
-12 f0
-( ) show
-18.1 501.1 moveto
-3.3 3.3 c  fill 
-31.5 493 moveto
-12 f1
-(Babes in Toyland) show
-120.8 493 moveto
-12 f0
-( ) show
-31.5 479.7 moveto
-12 f2
-(1989:) show
-59.4 479.7 moveto
-12 f0
-( Spanking Machine ) show
-31.5 466.4 moveto
-12 f2
-(1991:) show
-59.4 466.4 moveto
-12 f0
-( To Mother ) show
-31.5 453.1 moveto
-12 f2
-(1992:) show
-59.4 453.1 moveto
-12 f0
-( Fontanelle ) show
-31.5 439.8 moveto
-12 f2
-(1993:) show
-59.4 439.8 moveto
-12 f0
-( Pain Killers ) show
-31.5 426.5 moveto
-12 f2
-(1995:) show
-59.4 426.5 moveto
-12 f0
-( Nemesisters ) show
-302.9 493.5 moveto
-12 f2
-(UBL Card: ) show
-360.2 493.5 moveto
-12 f0
-(3190) show
-384.2 493.5 moveto
-12 f0
-( ) show
-18.1 413.8 moveto
-3.3 3.3 c  fill 
-31.5 405.7 moveto
-12 f1
-(Battery) show
-70.1 405.7 moveto
-12 f0
-( ) show
-31.5 392.4 moveto
-12 f2
-(1992:) show
-59.4 392.4 moveto
-12 f0
-( Meat Market ) show
-127.7 392.4 moveto
-12 f2
-(\(EP\)) show
-150.3 392.4 moveto
-12 f0
-( ) show
-31.5 379.1 moveto
-12 f2
-(1993:) show
-59.4 379.1 moveto
-12 f0
-( Mutate ) show
-31.5 365.8 moveto
-12 f2
-(1994:) show
-59.4 365.8 moveto
-12 f0
-( Lillith 3.2 ) show
-113.4 365.8 moveto
-12 f2
-(\(EP\)) show
-136 365.8 moveto
-12 f0
-( ) show
-31.5 352.5 moveto
-12 f2
-(1995:) show
-59.4 352.5 moveto
-12 f0
-( nv ) show
-18.1 339.8 moveto
-3.3 3.3 c  fill 
-31.5 331.7 moveto
-12 f1
-(Bauhaus) show
-76.1 331.7 moveto
-12 f0
-( ) show
-31.5 318.4 moveto
-12 f2
-(1979:) show
-59.4 318.4 moveto
-12 f0
-( Bela Lugosi's Dead ) show
-160.7 318.4 moveto
-12 f2
-(\(EP\)) show
-183.3 318.4 moveto
-12 f0
-( ) show
-31.5 305.1 moveto
-12 f2
-(1981:) show
-59.4 305.1 moveto
-12 f0
-( In the Flat Field ) show
-31.5 291.8 moveto
-12 f2
-(1981:) show
-59.4 291.8 moveto
-12 f0
-( Mask ) show
-31.5 278.5 moveto
-12 f2
-(1981:) show
-59.4 278.5 moveto
-12 f0
-( Press the Eject and Give Me the Tape ) show
-246.3 278.5 moveto
-12 f2
-(\(live\)) show
-271.6 278.5 moveto
-12 f0
-( ) show
-31.5 265.2 moveto
-12 f2
-(1983:) show
-59.4 265.2 moveto
-12 f0
-( Burning from the Inside ) show
-31.5 251.9 moveto
-12 f2
-(1979-1984:) show
-87.4 251.9 moveto
-12 f0
-( 1979-1984 ) show
-145.3 251.9 moveto
-12 f2
-(\(comp\)) show
-179.2 251.9 moveto
-12 f0
-( ) show
-31.5 238.6 moveto
-12 f2
-(1985:) show
-59.4 238.6 moveto
-12 f0
-( The Sky's Gone Out ) show
-31.5 225.3 moveto
-12 f2
-(1984:) show
-59.4 225.3 moveto
-12 f0
-( The Last Temptation ) show
-166 225.3 moveto
-12 f2
-(\(live boot\)) show
-215.6 225.3 moveto
-12 f0
-( ) show
-31.5 212 moveto
-12 f2
-(1984:) show
-59.4 212 moveto
-12 f0
-( Rest In Peace: The Final Concert ) show
-224.3 212 moveto
-12 f2
-(\(double live\)) show
-285.2 212 moveto
-12 f0
-( ) show
-31.5 198.7 moveto
-12 f2
-(1996:) show
-59.4 198.7 moveto
-12 f0
-( The Passion of Covers: A Tribute ) show
-227 198.7 moveto
-12 f2
-(\(various\)) show
-270.9 198.7 moveto
-12 f0
-( ) show
-298.1 332.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 332.2 moveto
-12 f0
-(1235) show
-379.4 332.2 moveto
-12 f0
-( ) show
-298.1 318.9 moveto
-12 f2
-(See also: ) show
-344.7 318.9 moveto
-12 f0
-(gothic.acs.csulb.edu) show
-441.6 318.9 moveto
-12 f0
-( ) show
-298.1 305.6 moveto
-12 f2
-(See also: ) show
-344.7 305.6 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 305.6 moveto
-12 f0
-( ) show
-18.1 186 moveto
-3.3 3.3 c  fill 
-31.5 177.9 moveto
-12 f1
-(Belly) show
-57.5 177.9 moveto
-12 f0
-( ) show
-31.5 164.6 moveto
-12 f2
-(1993:) show
-59.4 164.6 moveto
-12 f0
-( Star ) show
-31.5 151.3 moveto
-12 f2
-(1993:) show
-59.4 151.3 moveto
-12 f0
-( Moon ) show
-94 151.3 moveto
-12 f2
-(\(EP\)) show
-116.6 151.3 moveto
-12 f0
-( ) show
-31.5 138 moveto
-12 f2
-(1995:) show
-59.4 138 moveto
-12 f0
-( Baby Silvertooth ) show
-147 138 moveto
-12 f2
-(\(EP\)) show
-169.6 138 moveto
-12 f0
-( ) show
-31.5 124.7 moveto
-12 f2
-(1995:) show
-59.4 124.7 moveto
-12 f0
-( King ) show
-298.1 178.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 178.4 moveto
-12 f0
-(1360) show
-379.4 178.4 moveto
-12 f0
-( ) show
-298.1 165.1 moveto
-12 f2
-(See also: ) show
-344.7 165.1 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 165.1 moveto
-12 f0
-( ) show
-18.1 112 moveto
-3.3 3.3 c  fill 
-31.5 103.9 moveto
-12 f1
-(Berlin) show
-63.5 103.9 moveto
-12 f0
-( ) show
-31.5 90.6 moveto
-12 f2
-(1981:) show
-59.4 90.6 moveto
-12 f0
-( Love Life ) show
-31.5 77.3 moveto
-12 f2
-(1981:) show
-59.4 77.3 moveto
-12 f0
-( Dancing in Berlin / Lost in the Crowd ) show
-247.7 77.3 moveto
-12 f2
-(\(single\)) show
-284.3 77.3 moveto
-12 f0
-( ) show
-298.1 104.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 104.4 moveto
-12 f0
-(4156) show
-379.4 104.4 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 4 4
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1982:) show
-59.4 709.2 moveto
-12 f0
-( Pleasure Victim ) show
-31.5 695.9 moveto
-12 f2
-(1986:) show
-59.4 695.9 moveto
-12 f0
-( Count 3 and Pray ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(Big Black) show
-81.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1983:) show
-59.4 661.8 moveto
-12 f0
-( The Hammer Party ) show
-31.5 648.5 moveto
-12 f2
-(1987:) show
-59.4 648.5 moveto
-12 f0
-( Songs About Fucking ) show
-31.5 635.2 moveto
-12 f2
-(1992:) show
-59.4 635.2 moveto
-12 f0
-( The Rich Man's Eight-Track Tape ) show
-231.3 635.2 moveto
-12 f2
-(\(comp\)) show
-265.2 635.2 moveto
-12 f0
-( ) show
-302.7 675.6 moveto
-12 f2
-(UBL Card: ) show
-360 675.6 moveto
-12 f0
-(2410) show
-384 675.6 moveto
-12 f0
-( ) show
-18.1 622.5 moveto
-3.3 3.3 c  fill 
-31.5 614.4 moveto
-12 f1
-(Big Hat) show
-71.1 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1993:) show
-59.4 601.1 moveto
-12 f0
-( Selena at my Window ) show
-298.1 614.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 614.9 moveto
-12 f0
-(1217) show
-379.4 614.9 moveto
-12 f0
-( ) show
-298.1 601.6 moveto
-12 f2
-(See also: ) show
-344.7 601.6 moveto
-12 f0
-(www.cec.wustl.edu) show
-439 601.6 moveto
-12 f0
-( ) show
-18.1 588.4 moveto
-3.3 3.3 c  fill 
-31.5 580.3 moveto
-12 f1
-(Bigod 20) show
-76.5 580.3 moveto
-12 f0
-( ) show
-31.5 567 moveto
-12 f2
-(1990:) show
-59.4 567 moveto
-12 f0
-( The Bog ) show
-107 567 moveto
-12 f2
-(\(EP\)) show
-129.6 567 moveto
-12 f0
-( ) show
-31.5 553.7 moveto
-12 f2
-(1991:) show
-59.4 553.7 moveto
-12 f0
-( Carpe Diem ) show
-123.7 553.7 moveto
-12 f2
-(\(EP\)) show
-146.3 553.7 moveto
-12 f0
-( ) show
-18.1 541 moveto
-3.3 3.3 c  fill 
-31.5 532.9 moveto
-12 f1
-(Bikini Kill) show
-85.2 532.9 moveto
-12 f0
-( ) show
-31.5 519.6 moveto
-12 f2
-(1991-1992:) show
-87.4 519.6 moveto
-12 f0
-( The C.D. Version of the First Two) show
-31.5 506.3 moveto
-12 f0
-(Records ) show
-298.1 533.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 533.4 moveto
-12 f0
-(4444) show
-379.4 533.4 moveto
-12 f0
-( ) show
-298.1 520.1 moveto
-12 f2
-(See also: ) show
-344.7 520.1 moveto
-12 f0
-(www.columbia.edu) show
-438.6 520.1 moveto
-12 f0
-( ) show
-18.1 493.6 moveto
-3.3 3.3 c  fill 
-31.5 485.5 moveto
-12 f1
-(Billy Nayer Show, The) show
-146.8 485.5 moveto
-12 f0
-( ) show
-31.5 472.2 moveto
-12 f2
-(1994:) show
-59.4 472.2 moveto
-12 f0
-( The Ketchup and Mustard Man ) show
-18.1 459.5 moveto
-3.3 3.3 c  fill 
-31.5 451.4 moveto
-12 f1
-(Billy and the Boingers) show
-145.1 451.4 moveto
-12 f0
-( ) show
-31.5 438.1 moveto
-12 f2
-(1987:) show
-59.4 438.1 moveto
-12 f0
-( U Stink but I Love You ) show
-179 438.1 moveto
-12 f2
-(\(flexydisk\)) show
-228.9 438.1 moveto
-12 f0
-( ) show
-18.1 425.4 moveto
-3.3 3.3 c  fill 
-31.5 417.3 moveto
-12 f1
-(Birdsongs of the Messozoic) show
-169.8 417.3 moveto
-12 f0
-( ) show
-31.5 404 moveto
-12 f2
-(1980-1987:) show
-87.4 404 moveto
-12 f0
-( The Fossil Record ) show
-31.5 390.7 moveto
-12 f2
-(1983:) show
-59.4 390.7 moveto
-12 f0
-( Sonic Geology ) show
-18.1 378 moveto
-3.3 3.3 c  fill 
-31.5 369.9 moveto
-12 f1
-(Birmingham 6) show
-105.8 369.9 moveto
-12 f0
-( ) show
-31.5 356.6 moveto
-12 f2
-(1995:) show
-59.4 356.6 moveto
-12 f0
-( Police State ) show
-304.5 370.4 moveto
-12 f2
-(UBL Card: ) show
-361.8 370.4 moveto
-12 f0
-(4348) show
-385.8 370.4 moveto
-12 f0
-( ) show
-18.1 343.9 moveto
-3.3 3.3 c  fill 
-31.5 335.8 moveto
-12 f1
-(Black Tape for a Blue Girl) show
-167.8 335.8 moveto
-12 f0
-( ) show
-31.5 322.5 moveto
-12 f2
-(1986:) show
-59.4 322.5 moveto
-12 f0
-( The Rope ) show
-31.5 309.2 moveto
-12 f2
-(1987:) show
-59.4 309.2 moveto
-12 f0
-( Mesmerized by the Sirens ) show
-31.5 295.9 moveto
-12 f2
-(1989:) show
-59.4 295.9 moveto
-12 f0
-( Ashes in the Brittle Air ) show
-31.5 282.6 moveto
-12 f2
-(1993:) show
-59.4 282.6 moveto
-12 f0
-( This Lush Garden Within ) show
-298.1 336.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 336.3 moveto
-12 f0
-(1202) show
-379.4 336.3 moveto
-12 f0
-( ) show
-298.1 323 moveto
-12 f2
-(See also: ) show
-344.7 323 moveto
-12 f0
-(www.projekt.com) show
-431.3 323 moveto
-12 f0
-( ) show
-18.1 269.9 moveto
-3.3 3.3 c  fill 
-31.5 261.8 moveto
-12 f1
-(Bleeding Stone, The) show
-133.8 261.8 moveto
-12 f0
-( ) show
-31.5 248.5 moveto
-12 f2
-(1994:) show
-59.4 248.5 moveto
-12 f0
-( Silent Insanity ) show
-135 248.5 moveto
-12 f2
-(\(EP\)) show
-157.6 248.5 moveto
-12 f0
-( ) show
-18.1 235.8 moveto
-3.3 3.3 c  fill 
-31.5 227.7 moveto
-12 f1
-(Blondie) show
-70.8 227.7 moveto
-12 f0
-( ) show
-31.5 214.4 moveto
-12 f2
-(1980:) show
-59.4 214.4 moveto
-12 f0
-( Autoamerican ) show
-31.5 201.1 moveto
-12 f2
-(1983:) show
-59.4 201.1 moveto
-12 f0
-( Best of Blondie ) show
-306.4 228.2 moveto
-12 f2
-(UBL Card: ) show
-363.7 228.2 moveto
-12 f0
-(2070) show
-387.7 228.2 moveto
-12 f0
-( ) show
-18.1 188.4 moveto
-3.3 3.3 c  fill 
-31.5 180.3 moveto
-12 f1
-(Blotto) show
-62.8 180.3 moveto
-12 f0
-( ) show
-31.5 167 moveto
-12 f2
-(1994:) show
-59.4 167 moveto
-12 f0
-( Collected Works ) show
-18.1 154.3 moveto
-3.3 3.3 c  fill 
-31.5 146.2 moveto
-12 f1
-(Body Count) show
-93.1 146.2 moveto
-12 f0
-( ) show
-31.5 132.9 moveto
-12 f2
-(1992:) show
-59.4 132.9 moveto
-12 f0
-( Body Count ) show
-298.1 146.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 146.7 moveto
-12 f0
-(1277) show
-379.4 146.7 moveto
-12 f0
-( ) show
-18.1 120.2 moveto
-3.3 3.3 c  fill 
-31.5 112.1 moveto
-12 f1
-(Bowie, David) show
-99.5 112.1 moveto
-12 f0
-( ) show
-31.5 98.8 moveto
-12 f2
-(1995:) show
-59.4 98.8 moveto
-12 f0
-( Outside ) show
-298.1 112.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 112.6 moveto
-12 f0
-(1098) show
-379.4 112.6 moveto
-12 f0
-( ) show
-18.1 86.1 moveto
-3.3 3.3 c  fill 
-31.5 78 moveto
-12 f1
-(Bow Wow Wow) show
-113.4 78 moveto
-12 f0
-( ) show
-300.6 78.5 moveto
-12 f2
-(UBL Card: ) show
-357.9 78.5 moveto
-12 f0
-(2301) show
-381.9 78.5 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 5 5
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1982:) show
-59.4 709.2 moveto
-12 f0
-( See Jungle ) show
-31.5 695.9 moveto
-12 f2
-(1981-1982:) show
-87.4 695.9 moveto
-12 f0
-( I Want Candy ) show
-160.7 695.9 moveto
-12 f2
-(\(comp\)) show
-194.6 695.9 moveto
-12 f0
-( ) show
-31.5 682.6 moveto
-12 f2
-(1983:) show
-59.4 682.6 moveto
-12 f0
-( When the Going Gets Tough ) show
-31.5 669.3 moveto
-12 f2
-(1981-1983:) show
-87.4 669.3 moveto
-12 f0
-( Girl Bites Dog ) show
-164 669.3 moveto
-12 f2
-(\(comp\)) show
-197.9 669.3 moveto
-12 f0
-( ) show
-18.1 656.6 moveto
-3.3 3.3 c  fill 
-31.5 648.5 moveto
-12 f1
-(Breeders, The) show
-103.4 648.5 moveto
-12 f0
-( ) show
-31.5 635.2 moveto
-12 f2
-(1993:) show
-59.4 635.2 moveto
-12 f0
-( Last Splash ) show
-298.1 649 moveto
-12 f2
-(UBL Card: ) show
-355.4 649 moveto
-12 f0
-(1242) show
-379.4 649 moveto
-12 f0
-( ) show
-298.1 635.7 moveto
-12 f2
-(See also: ) show
-344.7 635.7 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 635.7 moveto
-12 f0
-( ) show
-18.1 622.5 moveto
-3.3 3.3 c  fill 
-31.5 614.4 moveto
-12 f1
-(Br\374cken, Claudia) show
-122.1 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1991:) show
-59.4 601.1 moveto
-12 f0
-( Love and a Million Other Things ) show
-298.1 614.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 614.9 moveto
-12 f0
-(4636) show
-379.4 614.9 moveto
-12 f0
-( ) show
-298.1 601.6 moveto
-12 f2
-(See also: ) show
-344.7 601.6 moveto
-12 f0
-(rt66.com) show
-387.6 601.6 moveto
-12 f0
-( ) show
-298.1 588.3 moveto
-12 f2
-(See also: ) show
-344.7 588.3 moveto
-12 f0
-(hcl.chass.ncsu.edu) show
-433.6 588.3 moveto
-12 f0
-( ) show
-18.1 575.6 moveto
-3.3 3.3 c  fill 
-31.5 567.5 moveto
-12 f1
-(Buggles, The) show
-97.5 567.5 moveto
-12 f0
-( ) show
-31.5 554.2 moveto
-12 f2
-(1979:) show
-59.4 554.2 moveto
-12 f0
-( The Age of Plastic ) show
-31.5 540.9 moveto
-12 f2
-(1981:) show
-59.4 540.9 moveto
-12 f0
-( Adventures in Modern Recording ) show
-18.1 528.2 moveto
-3.3 3.3 c  fill 
-31.5 520.1 moveto
-12 f1
-(Bush, Kate) show
-88.1 520.1 moveto
-12 f0
-( ) show
-31.5 506.8 moveto
-12 f2
-(1977:) show
-59.4 506.8 moveto
-12 f0
-( The Kick Inside ) show
-31.5 493.5 moveto
-12 f2
-(1980:) show
-59.4 493.5 moveto
-12 f0
-( Never For Ever ) show
-31.5 480.2 moveto
-12 f2
-(1983:) show
-59.4 480.2 moveto
-12 f0
-( The Dreaming ) show
-31.5 466.9 moveto
-12 f2
-(1985:) show
-59.4 466.9 moveto
-12 f0
-( Hounds of Love ) show
-298.1 520.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 520.6 moveto
-12 f0
-(1032) show
-379.4 520.6 moveto
-12 f0
-( ) show
-298.1 507.3 moveto
-12 f2
-(See also: ) show
-344.7 507.3 moveto
-12 f0
-(actor.cs.vt.edu) show
-414.3 507.3 moveto
-12 f0
-( ) show
-298.1 494 moveto
-12 f2
-(See also: ) show
-344.7 494 moveto
-12 f0
-(www.jrc.flinders.edu.au) show
-460.6 494 moveto
-12 f0
-( ) show
-298.1 480.7 moveto
-12 f2
-(See also: ) show
-344.7 480.7 moveto
-12 f0
-(holly.city.unisa.edu.au) show
-453.3 480.7 moveto
-12 f0
-( ) show
-18.1 454.2 moveto
-3.3 3.3 c  fill 
-31.5 446.1 moveto
-12 f1
-(Buzzcocks) show
-84.8 446.1 moveto
-12 f0
-( ) show
-31.5 432.8 moveto
-12 f2
-(1976-1979:) show
-87.4 432.8 moveto
-12 f0
-( Operators Manual ) show
-300.6 446.6 moveto
-12 f2
-(UBL Card: ) show
-357.9 446.6 moveto
-12 f0
-(1351) show
-381.9 446.6 moveto
-12 f0
-( ) show
-18.1 420.1 moveto
-3.3 3.3 c  fill 
-31.5 412 moveto
-12 f1
-(Cabaret Voltaire) show
-118.4 412 moveto
-12 f0
-( ) show
-31.5 398.7 moveto
-12 f2
-(1974-1976:) show
-87.4 398.7 moveto
-12 f0
-( 1974-1976 ) show
-145.3 398.7 moveto
-12 f2
-(\(comp\)) show
-179.2 398.7 moveto
-12 f0
-( ) show
-31.5 385.4 moveto
-12 f2
-(1978-1983:) show
-87.4 385.4 moveto
-12 f0
-( The Golden Moments of CV ) show
-231.3 385.4 moveto
-12 f2
-(\(comp\)) show
-265.2 385.4 moveto
-12 f0
-( ) show
-31.5 372.1 moveto
-12 f2
-(1978:) show
-59.4 372.1 moveto
-12 f0
-( Nag Nag Nag ) show
-131.3 372.1 moveto
-12 f2
-(\(EP\)) show
-153.9 372.1 moveto
-12 f0
-( ) show
-31.5 358.8 moveto
-12 f2
-(1979:) show
-59.4 358.8 moveto
-12 f0
-( Mix-Up ) show
-104 358.8 moveto
-12 f2
-(\(EP\)) show
-126.6 358.8 moveto
-12 f0
-( ) show
-31.5 345.5 moveto
-12 f2
-(1980:) show
-59.4 345.5 moveto
-12 f0
-( Red Mecca ) show
-31.5 332.2 moveto
-12 f2
-(1981:) show
-59.4 332.2 moveto
-12 f0
-( The Voice of America ) show
-31.5 318.9 moveto
-12 f2
-(1981:) show
-59.4 318.9 moveto
-12 f0
-( Johnny Yesno ) show
-133.7 318.9 moveto
-12 f2
-(\(soundtrack\)) show
-195 318.9 moveto
-12 f0
-( ) show
-31.5 305.6 moveto
-12 f2
-(1982:) show
-59.4 305.6 moveto
-12 f0
-( 2X45 ) show
-31.5 292.3 moveto
-12 f2
-(1982:) show
-59.4 292.3 moveto
-12 f0
-( Eight Crepescule Tracks ) show
-31.5 279 moveto
-12 f2
-(1983:) show
-59.4 279 moveto
-12 f0
-( The Crackdown ) show
-31.5 265.7 moveto
-12 f2
-(1984:) show
-59.4 265.7 moveto
-12 f0
-( Micro-Phonies ) show
-31.5 252.4 moveto
-12 f2
-(1985:) show
-59.4 252.4 moveto
-12 f0
-( I Want You ) show
-122 252.4 moveto
-12 f2
-(\(single\)) show
-158.6 252.4 moveto
-12 f0
-( ) show
-31.5 239.1 moveto
-12 f2
-(1985:) show
-59.4 239.1 moveto
-12 f0
-( Drinking Gasoline ) show
-31.5 225.8 moveto
-12 f2
-(1985:) show
-59.4 225.8 moveto
-12 f0
-( The Arm of the Lord ) show
-31.5 212.5 moveto
-12 f2
-(1985:) show
-59.4 212.5 moveto
-12 f0
-( The Convenant, the Sword, and the Arm of the) show
-31.5 199.2 moveto
-12 f0
-(Lord ) show
-31.5 185.9 moveto
-12 f2
-(1986:) show
-59.4 185.9 moveto
-12 f0
-( The Drain Train ) show
-31.5 172.6 moveto
-12 f2
-(1987:) show
-59.4 172.6 moveto
-12 f0
-( Code ) show
-31.5 159.3 moveto
-12 f2
-(1990:) show
-59.4 159.3 moveto
-12 f0
-( Listen Up ) show
-113 159.3 moveto
-12 f2
-(\(double comp\)) show
-182.6 159.3 moveto
-12 f0
-( ) show
-31.5 146 moveto
-12 f2
-(1991:) show
-59.4 146 moveto
-12 f0
-( Body and Soul ) show
-31.5 132.7 moveto
-12 f2
-(1991:) show
-59.4 132.7 moveto
-12 f0
-( Colors ) show
-31.5 119.4 moveto
-12 f2
-(1992:) show
-59.4 119.4 moveto
-12 f0
-( Plasticity ) show
-31.5 106.1 moveto
-12 f2
-(1992:) show
-59.4 106.1 moveto
-12 f0
-( Western Reworks ) show
-306.4 412.5 moveto
-12 f2
-(UBL Card: ) show
-363.7 412.5 moveto
-12 f0
-(2307) show
-387.7 412.5 moveto
-12 f0
-( ) show
-18.1 93.4 moveto
-3.3 3.3 c  fill 
-31.5 85.3 moveto
-12 f1
-(Cave, Nick) show
-87.4 85.3 moveto
-12 f0
-( ) show
-298.1 85.8 moveto
-12 f2
-(UBL Card: ) show
-355.4 85.8 moveto
-12 f0
-(1273) show
-379.4 85.8 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 6 6
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1984:) show
-59.4 709.2 moveto
-12 f0
-( From Her to Eternity ) show
-31.5 695.9 moveto
-12 f2
-(1988:) show
-59.4 695.9 moveto
-12 f0
-( Tender Prey ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(Chemlab) show
-78.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1993:) show
-59.4 661.8 moveto
-12 f0
-( Burnout at the Hydrogen Bar ) show
-31.5 648.5 moveto
-12 f2
-(1994:) show
-59.4 648.5 moveto
-12 f0
-( Magnetic Field Remixes ) show
-183.3 648.5 moveto
-12 f2
-(\(EP\)) show
-205.9 648.5 moveto
-12 f0
-( ) show
-298.6 675.6 moveto
-12 f2
-(UBL Card: ) show
-355.9 675.6 moveto
-12 f0
-(3774) show
-379.9 675.6 moveto
-12 f0
-( ) show
-18.1 635.8 moveto
-3.3 3.3 c  fill 
-31.5 627.7 moveto
-12 f1
-(Children on Stun) show
-120.1 627.7 moveto
-12 f0
-( ) show
-31.5 614.4 moveto
-12 f2
-(1994:) show
-59.4 614.4 moveto
-12 f0
-( Tourniquets of Love's Desire ) show
-18.1 601.7 moveto
-3.3 3.3 c  fill 
-31.5 593.6 moveto
-12 f1
-(Christian Death) show
-113.8 593.6 moveto
-12 f0
-( ) show
-31.5 580.3 moveto
-12 f2
-(1982:) show
-59.4 580.3 moveto
-12 f0
-( Only Theatre of Pain ) show
-31.5 567 moveto
-12 f2
-(1988:) show
-59.4 567 moveto
-12 f0
-( Sex and Drugs and Jesus Christ ) show
-31.5 553.7 moveto
-12 f2
-(1989:) show
-59.4 553.7 moveto
-12 f0
-( All the Love All the Hate part Two: All the) show
-31.5 540.4 moveto
-12 f0
-(Hate ) show
-31.5 527.1 moveto
-12 f2
-(1994:) show
-59.4 527.1 moveto
-12 f0
-( Sexy Death God ) show
-298.1 594.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 594.1 moveto
-12 f0
-(1218) show
-379.4 594.1 moveto
-12 f0
-( ) show
-298.1 581 moveto
-12 f2
-(See also:) show
-298.1 567.7 moveto
-12 f0
-(christian-death.acc.brad.ac.uk) show
-441.4 567.7 moveto
-12 f0
-( ) show
-18.1 514.4 moveto
-3.3 3.3 c  fill 
-31.5 506.3 moveto
-12 f1
-(Chris and Cosey) show
-116.1 506.3 moveto
-12 f0
-( ) show
-31.5 493 moveto
-12 f2
-(1989:) show
-59.4 493 moveto
-12 f0
-( Trust ) show
-18.1 480.3 moveto
-3.3 3.3 c  fill 
-31.5 472.2 moveto
-12 f1
-(Ciccone Youth) show
-107.1 472.2 moveto
-12 f0
-( ) show
-31.5 458.9 moveto
-12 f2
-(1988:) show
-59.4 458.9 moveto
-12 f0
-( The Whitey Album ) show
-298.1 472.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 472.7 moveto
-12 f0
-(1087) show
-379.4 472.7 moveto
-12 f0
-( ) show
-18.1 446.2 moveto
-3.3 3.3 c  fill 
-31.5 438.1 moveto
-12 f1
-(ClockDVA) show
-87.4 438.1 moveto
-12 f0
-( ) show
-31.5 424.8 moveto
-12 f2
-(1981:) show
-59.4 424.8 moveto
-12 f0
-( Thirst ) show
-31.5 411.5 moveto
-12 f2
-(1988:) show
-59.4 411.5 moveto
-12 f0
-( The Hacker/The Act ) show
-302.2 438.6 moveto
-12 f2
-(UBL Card: ) show
-359.5 438.6 moveto
-12 f0
-(3999) show
-383.5 438.6 moveto
-12 f0
-( ) show
-18.1 398.8 moveto
-3.3 3.3 c  fill 
-31.5 390.7 moveto
-12 f1
-(Cocteau Twins) show
-107.8 390.7 moveto
-12 f0
-( ) show
-31.5 377.4 moveto
-12 f2
-(1982:) show
-59.4 377.4 moveto
-12 f0
-( Garlands ) show
-31.5 364.1 moveto
-12 f2
-(1983:) show
-59.4 364.1 moveto
-12 f0
-( Head over Heels ) show
-31.5 350.8 moveto
-12 f2
-(1984:) show
-59.4 350.8 moveto
-12 f0
-( The Spangle Maker ) show
-160 350.8 moveto
-12 f2
-(\(EP\)) show
-182.6 350.8 moveto
-12 f0
-( ) show
-31.5 337.5 moveto
-12 f2
-(1984:) show
-59.4 337.5 moveto
-12 f0
-( Treasure ) show
-31.5 324.2 moveto
-12 f2
-(1985:) show
-59.4 324.2 moveto
-12 f0
-( Aikea-Guinea ) show
-132.7 324.2 moveto
-12 f2
-(\(EP\)) show
-155.3 324.2 moveto
-12 f0
-( ) show
-31.5 310.9 moveto
-12 f2
-(1985:) show
-59.4 310.9 moveto
-12 f0
-( Echoes in a Shallow Bay ) show
-31.5 297.6 moveto
-12 f2
-(1985:) show
-59.4 297.6 moveto
-12 f0
-( Tiny Dynamine ) show
-141 297.6 moveto
-12 f2
-(\(EP\)) show
-163.6 297.6 moveto
-12 f0
-( ) show
-31.5 284.3 moveto
-12 f2
-(1982-1985:) show
-87.4 284.3 moveto
-12 f0
-( The Pink Opaque ) show
-298.1 391.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 391.2 moveto
-12 f0
-(1074) show
-379.4 391.2 moveto
-12 f0
-( ) show
-298.1 377.9 moveto
-12 f2
-(See also: ) show
-344.7 377.9 moveto
-12 f0
-(garnet.berkeley.edu) show
-439.3 377.9 moveto
-12 f0
-( ) show
-298.1 364.6 moveto
-12 f2
-(See also: ) show
-344.7 364.6 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 364.6 moveto
-12 f0
-( ) show
-18.1 271.6 moveto
-3.3 3.3 c  fill 
-31.5 263.5 moveto
-12 f1
-(Coil) show
-52.8 263.5 moveto
-12 f0
-( ) show
-31.5 250.2 moveto
-12 f2
-(1986?:) show
-65.4 250.2 moveto
-12 f0
-( The Angelic Conversation ) show
-198 250.2 moveto
-12 f2
-(\(soundtrack\)) show
-259.3 250.2 moveto
-12 f0
-( ) show
-31.5 236.9 moveto
-12 f2
-(1988:) show
-59.4 236.9 moveto
-12 f0
-( Gold is the Metal ) show
-31.5 223.6 moveto
-12 f2
-(1990:) show
-59.4 223.6 moveto
-12 f0
-( The Unreleased Themes for Hellraiser ) show
-249.3 223.6 moveto
-12 f2
-(\(EP\)) show
-271.9 223.6 moveto
-12 f0
-( ) show
-31.5 210.3 moveto
-12 f2
-(1990:) show
-59.4 210.3 moveto
-12 f0
-( Panic / Tainted Love ) show
-165.7 210.3 moveto
-12 f2
-(\(single\)) show
-202.3 210.3 moveto
-12 f0
-( ) show
-31.5 197 moveto
-12 f2
-(1991:) show
-59.4 197 moveto
-12 f0
-( Out of Light Cometh Darkness ) show
-31.5 183.7 moveto
-12 f2
-(1992:) show
-59.4 183.7 moveto
-12 f0
-( Snow ) show
-92.7 183.7 moveto
-12 f2
-(\(EP\)) show
-115.3 183.7 moveto
-12 f0
-( ) show
-305.2 264 moveto
-12 f2
-(UBL Card: ) show
-362.5 264 moveto
-12 f0
-(1388) show
-386.5 264 moveto
-12 f0
-( ) show
-18.1 171 moveto
-3.3 3.3 c  fill 
-31.5 162.9 moveto
-12 f1
-(Concrete Blonde) show
-117.1 162.9 moveto
-12 f0
-( ) show
-31.5 149.6 moveto
-12 f2
-(1986:) show
-59.4 149.6 moveto
-12 f0
-( Concrete Blonde ) show
-31.5 136.3 moveto
-12 f2
-(1989:) show
-59.4 136.3 moveto
-12 f0
-( Free ) show
-31.5 123 moveto
-12 f2
-(1990:) show
-59.4 123 moveto
-12 f0
-( Bloodletting ) show
-31.5 109.7 moveto
-12 f2
-(1993:) show
-59.4 109.7 moveto
-12 f0
-( Walking in London ) show
-159.3 109.7 moveto
-12 f2
-(\(single\)) show
-195.9 109.7 moveto
-12 f0
-( ) show
-31.5 96.4 moveto
-12 f2
-(1993:) show
-59.4 96.4 moveto
-12 f0
-( Mexican Moon ) show
-303.5 163.4 moveto
-12 f2
-(UBL Card: ) show
-360.8 163.4 moveto
-12 f0
-(1396) show
-384.8 163.4 moveto
-12 f0
-( ) show
-18.1 83.7 moveto
-3.3 3.3 c  fill 
-31.5 75.6 moveto
-12 f1
-(Cop Shoot Cop) show
-109.5 75.6 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 7 7
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1993:) show
-59.4 709.2 moveto
-12 f0
-( Ask Questions Later ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Course of Empire) show
-122.8 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1990:) show
-59.4 675.1 moveto
-12 f0
-( Course of Empire ) show
-31.5 661.8 moveto
-12 f2
-(1993:) show
-59.4 661.8 moveto
-12 f0
-( Infested! ) show
-108 661.8 moveto
-12 f2
-(\(EP\)) show
-130.6 661.8 moveto
-12 f0
-( ) show
-31.5 648.5 moveto
-12 f2
-(1994:) show
-59.4 648.5 moveto
-12 f0
-( Initiation ) show
-298.1 688.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 688.9 moveto
-12 f0
-(2889) show
-379.4 688.9 moveto
-12 f0
-( ) show
-298.1 675.6 moveto
-12 f2
-(See also: ) show
-344.7 675.6 moveto
-12 f0
-(homepage.seas.upenn.edu) show
-469.6 675.6 moveto
-12 f0
-( ) show
-18.1 635.8 moveto
-3.3 3.3 c  fill 
-31.5 627.7 moveto
-12 f1
-(Cranes) show
-68.1 627.7 moveto
-12 f0
-( ) show
-31.5 614.4 moveto
-12 f2
-(1990:) show
-59.4 614.4 moveto
-12 f0
-( Inescapable ) show
-122 614.4 moveto
-12 f2
-(\(EP\)) show
-144.6 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1991:) show
-59.4 601.1 moveto
-12 f0
-( Wings of Joy ) show
-31.5 587.8 moveto
-12 f2
-(1992:) show
-59.4 587.8 moveto
-12 f0
-( Self-Non-Self ) show
-31.5 574.5 moveto
-12 f2
-(1993:) show
-59.4 574.5 moveto
-12 f0
-( Forever ) show
-31.5 561.2 moveto
-12 f2
-(1993:) show
-59.4 561.2 moveto
-12 f0
-( Jewel ) show
-92.7 561.2 moveto
-12 f2
-(\(EP\)) show
-115.3 561.2 moveto
-12 f0
-( ) show
-31.5 547.9 moveto
-12 f2
-(1994:) show
-59.4 547.9 moveto
-12 f0
-( Loved ) show
-31.5 534.6 moveto
-12 f2
-(1994:) show
-59.4 534.6 moveto
-12 f0
-( Shining Road ) show
-131 534.6 moveto
-12 f2
-(\(limited edition double EP\)) show
-261.9 534.6 moveto
-12 f0
-( ) show
-298.1 628.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 628.2 moveto
-12 f0
-(2400) show
-379.4 628.2 moveto
-12 f0
-( ) show
-298.1 614.9 moveto
-12 f2
-(See also: ) show
-344.7 614.9 moveto
-12 f0
-(busop.cit.wayne.edu) show
-443 614.9 moveto
-12 f0
-( ) show
-18.1 521.9 moveto
-3.3 3.3 c  fill 
-31.5 513.8 moveto
-12 f1
-(Crash Worship) show
-110.5 513.8 moveto
-12 f0
-( ) show
-31.5 500.5 moveto
-12 f2
-(1992:) show
-59.4 500.5 moveto
-12 f0
-( ADRV ) show
-298.1 514.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 514.3 moveto
-12 f0
-(1901) show
-379.4 514.3 moveto
-12 f0
-( ) show
-298.1 501 moveto
-12 f2
-(See also: ) show
-344.7 501 moveto
-12 f0
-(www.meer.net) show
-415.3 501 moveto
-12 f0
-( ) show
-298.1 487.7 moveto
-12 f2
-(See also: ) show
-344.7 487.7 moveto
-12 f0
-(www.tyrell.net) show
-416.7 487.7 moveto
-12 f0
-( ) show
-18.1 475 moveto
-3.3 3.3 c  fill 
-31.5 466.9 moveto
-12 f1
-(Creatures, The) show
-108.8 466.9 moveto
-12 f0
-( ) show
-31.5 453.6 moveto
-12 f2
-(1983:) show
-59.4 453.6 moveto
-12 f0
-( Feast ) show
-31.5 440.3 moveto
-12 f2
-(1990:) show
-59.4 440.3 moveto
-12 f0
-( Boomerang ) show
-31.5 427 moveto
-12 f2
-(1990:) show
-59.4 427 moveto
-12 f0
-( Fury Eyes ) show
-114.3 427 moveto
-12 f2
-(\(EP\)) show
-136.9 427 moveto
-12 f0
-( ) show
-31.5 413.7 moveto
-12 f2
-(1990:) show
-59.4 413.7 moveto
-12 f0
-( Standing There ) show
-139 413.7 moveto
-12 f2
-(\(single\)) show
-175.6 413.7 moveto
-12 f0
-( ) show
-301.8 467.4 moveto
-12 f2
-(UBL Card: ) show
-359.1 467.4 moveto
-12 f0
-(1216) show
-383.1 467.4 moveto
-12 f0
-( ) show
-18.1 401 moveto
-3.3 3.3 c  fill 
-31.5 392.9 moveto
-12 f1
-(Cure, The) show
-83.4 392.9 moveto
-12 f0
-( ) show
-31.5 379.6 moveto
-12 f2
-(1980:) show
-59.4 379.6 moveto
-12 f0
-( Boys Don't Cry ) show
-31.5 366.3 moveto
-12 f2
-(1980:) show
-59.4 366.3 moveto
-12 f0
-( Seventeen Seconds ) show
-31.5 353 moveto
-12 f2
-(1981:) show
-59.4 353 moveto
-12 f0
-( Faith ) show
-31.5 339.7 moveto
-12 f2
-(1982:) show
-59.4 339.7 moveto
-12 f0
-( Pornography ) show
-31.5 326.4 moveto
-12 f2
-(1982:) show
-59.4 326.4 moveto
-12 f0
-( The Walk ) show
-31.5 313.1 moveto
-12 f2
-(1982?:) show
-65.4 313.1 moveto
-12 f0
-( Looking for a Forest ) show
-170.3 313.1 moveto
-12 f2
-(\(live boot\)) show
-219.9 313.1 moveto
-12 f0
-( ) show
-31.5 299.8 moveto
-12 f2
-(1983:) show
-59.4 299.8 moveto
-12 f0
-( Japanese Whispers ) show
-31.5 286.5 moveto
-12 f2
-(1983:) show
-59.4 286.5 moveto
-12 f0
-( Lovecats ) show
-108.7 286.5 moveto
-12 f2
-(\(EP\)) show
-131.3 286.5 moveto
-12 f0
-( ) show
-31.5 273.2 moveto
-12 f2
-(1984:) show
-59.4 273.2 moveto
-12 f0
-( Concert ) show
-103.3 273.2 moveto
-12 f2
-(\(live\)) show
-128.6 273.2 moveto
-12 f0
-( ) show
-31.5 259.9 moveto
-12 f2
-(1984:) show
-59.4 259.9 moveto
-12 f0
-( The Top ) show
-31.5 246.6 moveto
-12 f2
-(1985:) show
-59.4 246.6 moveto
-12 f0
-( The Head on the Door ) show
-31.5 233.3 moveto
-12 f2
-(1987:) show
-59.4 233.3 moveto
-12 f0
-( Staring at the Sea ) show
-149.7 233.3 moveto
-12 f2
-(\(comp\)) show
-183.6 233.3 moveto
-12 f0
-( ) show
-31.5 220 moveto
-12 f2
-(1988:) show
-59.4 220 moveto
-12 f0
-( Kiss Me Kiss Me Kiss Me ) show
-31.5 206.7 moveto
-12 f2
-(1989:) show
-59.4 206.7 moveto
-12 f0
-( Disintegration ) show
-31.5 193.4 moveto
-12 f2
-(1989:) show
-59.4 193.4 moveto
-12 f0
-( Fascination Street ) show
-151.7 193.4 moveto
-12 f2
-(\(single\)) show
-188.3 193.4 moveto
-12 f0
-( ) show
-31.5 180.1 moveto
-12 f2
-(1990:) show
-59.4 180.1 moveto
-12 f0
-( Never Enough ) show
-135 180.1 moveto
-12 f2
-(\(single\)) show
-171.6 180.1 moveto
-12 f0
-( ) show
-31.5 166.8 moveto
-12 f2
-(1995?:) show
-65.4 166.8 moveto
-12 f0
-( Give Me the Cure: 18 DC Bands ) show
-228.7 166.8 moveto
-12 f2
-(\(various\)) show
-272.6 166.8 moveto
-12 f0
-( ) show
-298.1 393.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 393.4 moveto
-12 f0
-(1159) show
-379.4 393.4 moveto
-12 f0
-( ) show
-298.1 380.1 moveto
-12 f2
-(See also: ) show
-344.7 380.1 moveto
-12 f0
-(www.acpub.duke.edu) show
-449 380.1 moveto
-12 f0
-( ) show
-298.1 366.8 moveto
-12 f2
-(See also: ) show
-344.7 366.8 moveto
-12 f0
-(pathfinder.com) show
-417.6 366.8 moveto
-12 f0
-( ) show
-18.1 154.1 moveto
-3.3 3.3 c  fill 
-31.5 146 moveto
-12 f1
-(Current 93) show
-88.4 146 moveto
-12 f0
-( ) show
-31.5 132.7 moveto
-12 f2
-(1986-1991:) show
-87.4 132.7 moveto
-12 f0
-( Island ) show
-300.6 146.5 moveto
-12 f2
-(UBL Card: ) show
-357.9 146.5 moveto
-12 f0
-(3465) show
-381.9 146.5 moveto
-12 f0
-( ) show
-18.1 120 moveto
-3.3 3.3 c  fill 
-31.5 111.9 moveto
-12 f1
-(Curve) show
-63.4 111.9 moveto
-12 f0
-( ) show
-31.5 98.6 moveto
-12 f2
-(1991:) show
-59.4 98.6 moveto
-12 f0
-( Frozen ) show
-98.7 98.6 moveto
-12 f2
-(\(EP\)) show
-121.3 98.6 moveto
-12 f0
-( ) show
-31.5 85.3 moveto
-12 f2
-(1991:) show
-59.4 85.3 moveto
-12 f0
-( Cherry ) show
-98.7 85.3 moveto
-12 f2
-(\(EP\)) show
-121.3 85.3 moveto
-12 f0
-( ) show
-298.1 112.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 112.4 moveto
-12 f0
-(1355) show
-379.4 112.4 moveto
-12 f0
-( ) show
-298.1 99.1 moveto
-12 f2
-(See also: ) show
-344.7 99.1 moveto
-12 f0
-(quark.stack.urc.tue.nl) show
-448 99.1 moveto
-12 f0
-( ) show
-298.1 85.8 moveto
-12 f2
-(See also: ) show
-344.7 85.8 moveto
-12 f0
-(blade.stack.urc.tue.nl) show
-446.6 85.8 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 8 8
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1992:) show
-59.4 709.2 moveto
-12 f0
-( Doppelganger ) show
-31.5 695.9 moveto
-12 f2
-(1993:) show
-59.4 695.9 moveto
-12 f0
-( Cuckoo ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(Cyber-Tec) show
-86.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1995:) show
-59.4 661.8 moveto
-12 f0
-( Cyber-Tec ) show
-18.1 649.1 moveto
-3.3 3.3 c  fill 
-31.5 641 moveto
-12 f1
-(Daisy Chainsaw) show
-113.8 641 moveto
-12 f0
-( ) show
-31.5 627.7 moveto
-12 f2
-(1992:) show
-59.4 627.7 moveto
-12 f0
-( Hope All Your Dreams Come True ) show
-235 627.7 moveto
-12 f2
-(\(single\)) show
-271.6 627.7 moveto
-12 f0
-( ) show
-31.5 614.4 moveto
-12 f2
-(1992:) show
-59.4 614.4 moveto
-12 f0
-( Love Sick Pleasure ) show
-158 614.4 moveto
-12 f2
-(\(EP\)) show
-180.6 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1992:) show
-59.4 601.1 moveto
-12 f0
-( Eleventeen ) show
-31.5 587.8 moveto
-12 f2
-(1994:) show
-59.4 587.8 moveto
-12 f0
-( For They Know Not What They Do ) show
-18.1 575.1 moveto
-3.3 3.3 c  fill 
-31.5 567 moveto
-12 f1
-(Dance or Die) show
-98.1 567 moveto
-12 f0
-( ) show
-31.5 553.7 moveto
-12 f2
-(1993:) show
-59.4 553.7 moveto
-12 f0
-( Psychoburbia ) show
-18.1 541 moveto
-3.3 3.3 c  fill 
-31.5 532.9 moveto
-12 f1
-(Danse Society, The) show
-128.4 532.9 moveto
-12 f0
-( ) show
-31.5 519.6 moveto
-12 f2
-(1984:) show
-59.4 519.6 moveto
-12 f0
-( Heaven is Waiting ) show
-31.5 506.3 moveto
-12 f2
-(1986:) show
-59.4 506.3 moveto
-12 f0
-( Looking Through ) show
-18.1 493.6 moveto
-3.3 3.3 c  fill 
-31.5 485.5 moveto
-12 f1
-(Das Ich) show
-70.5 485.5 moveto
-12 f0
-( ) show
-31.5 472.2 moveto
-12 f2
-(1990:) show
-59.4 472.2 moveto
-12 f0
-( Satanische Verse ) show
-299.9 486 moveto
-12 f2
-(UBL Card: ) show
-357.2 486 moveto
-12 f0
-(2337) show
-381.2 486 moveto
-12 f0
-( ) show
-18.1 459.5 moveto
-3.3 3.3 c  fill 
-31.5 451.4 moveto
-12 f1
-(Dax, Danielle) show
-100.1 451.4 moveto
-12 f0
-( ) show
-31.5 438.1 moveto
-12 f2
-(1986-1988:) show
-87.4 438.1 moveto
-12 f0
-( Dark Adapted Eye ) show
-182.7 438.1 moveto
-12 f2
-(\(comp +5\)) show
-233.7 438.1 moveto
-12 f0
-( ) show
-31.5 424.8 moveto
-12 f2
-(1988:) show
-59.4 424.8 moveto
-12 f0
-( Whistling for his Love ) show
-174.3 424.8 moveto
-12 f2
-(\(single\)) show
-210.9 424.8 moveto
-12 f0
-( ) show
-31.5 411.5 moveto
-12 f2
-(1988:) show
-59.4 411.5 moveto
-12 f0
-( Cat House ) show
-115.7 411.5 moveto
-12 f2
-(\(single\)) show
-152.3 411.5 moveto
-12 f0
-( ) show
-31.5 398.2 moveto
-12 f2
-(1990:) show
-59.4 398.2 moveto
-12 f0
-( Blast the Human Flower ) show
-31.5 384.9 moveto
-12 f2
-(1992:) show
-59.4 384.9 moveto
-12 f0
-( Pop-Eyes ) show
-31.5 371.6 moveto
-12 f2
-(1995:) show
-59.4 371.6 moveto
-12 f0
-( Timber Tongue ) show
-140.3 371.6 moveto
-12 f2
-(\(EP\)) show
-162.9 371.6 moveto
-12 f0
-( ) show
-300.6 451.9 moveto
-12 f2
-(UBL Card: ) show
-357.9 451.9 moveto
-12 f0
-(1746) show
-381.9 451.9 moveto
-12 f0
-( ) show
-18.1 358.9 moveto
-3.3 3.3 c  fill 
-31.5 350.8 moveto
-12 f1
-(Death in June) show
-102.8 350.8 moveto
-12 f0
-( ) show
-31.5 337.5 moveto
-12 f2
-(1992:) show
-59.4 337.5 moveto
-12 f0
-( But, What Ends When the Symbols Shatter? ) show
-18.1 324.8 moveto
-3.3 3.3 c  fill 
-31.5 316.7 moveto
-12 f1
-(Definition FX) show
-101.8 316.7 moveto
-12 f0
-( ) show
-31.5 303.4 moveto
-12 f2
-(1993:) show
-59.4 303.4 moveto
-12 f0
-( Something Inside ) show
-149.7 303.4 moveto
-12 f2
-(\(single\)) show
-186.3 303.4 moveto
-12 f0
-( ) show
-31.5 290.1 moveto
-12 f2
-(1993:) show
-59.4 290.1 moveto
-12 f0
-( Light Speed Collision ) show
-298.1 317.2 moveto
-12 f2
-(See also: ) show
-344.7 317.2 moveto
-12 f0
-(www.geko.com.au) show
-435 317.2 moveto
-12 f0
-( ) show
-18.1 277.4 moveto
-3.3 3.3 c  fill 
-31.5 269.3 moveto
-12 f1
-(Depeche Mode) show
-107.1 269.3 moveto
-12 f0
-( ) show
-31.5 256 moveto
-12 f2
-(1981:) show
-59.4 256 moveto
-12 f0
-( Speak & Spell ) show
-31.5 242.7 moveto
-12 f2
-(1981:) show
-59.4 242.7 moveto
-12 f0
-( Just Can't Get Enough / Any Second Now) show
-31.5 229.4 moveto
-12 f2
-(\(single\)) show
-68.1 229.4 moveto
-12 f0
-( ) show
-31.5 216.1 moveto
-12 f2
-(1982:) show
-59.4 216.1 moveto
-12 f0
-( A Broken Frame ) show
-31.5 202.8 moveto
-12 f2
-(1982:) show
-59.4 202.8 moveto
-12 f0
-( live singles ) show
-119.7 202.8 moveto
-12 f2
-(\(comp\)) show
-153.6 202.8 moveto
-12 f0
-( ) show
-31.5 189.5 moveto
-12 f2
-(1983:) show
-59.4 189.5 moveto
-12 f0
-( Construction Time Again ) show
-31.5 176.2 moveto
-12 f2
-(1984:) show
-59.4 176.2 moveto
-12 f0
-( People Are People ) show
-154.7 176.2 moveto
-12 f2
-(\(comp +2\)) show
-205.7 176.2 moveto
-12 f0
-( ) show
-31.5 162.9 moveto
-12 f2
-(1984:) show
-59.4 162.9 moveto
-12 f0
-( Some Great Reward ) show
-31.5 149.6 moveto
-12 f2
-(1985:) show
-59.4 149.6 moveto
-12 f0
-( Catching Up With Depeche Mode ) show
-229.3 149.6 moveto
-12 f2
-(\(comp +4\)) show
-280.3 149.6 moveto
-12 f0
-( ) show
-31.5 136.3 moveto
-12 f2
-(1985:) show
-59.4 136.3 moveto
-12 f0
-( It's Called a Heart / Fly on the Windscreen) show
-31.5 123 moveto
-12 f2
-(\(single\)) show
-68.1 123 moveto
-12 f0
-( ) show
-31.5 109.7 moveto
-12 f2
-(1986:) show
-59.4 109.7 moveto
-12 f0
-( Black Celebration ) show
-31.5 96.4 moveto
-12 f2
-(1986:) show
-59.4 96.4 moveto
-12 f0
-( Stripped ) show
-106 96.4 moveto
-12 f2
-(\(single\)) show
-142.6 96.4 moveto
-12 f0
-( ) show
-31.5 83.1 moveto
-12 f2
-(1986:) show
-59.4 83.1 moveto
-12 f0
-( A Question of Lust ) show
-157.7 83.1 moveto
-12 f2
-(\(single\)) show
-194.3 83.1 moveto
-12 f0
-( ) show
-298.1 269.8 moveto
-12 f2
-(UBL Card: ) show
-355.4 269.8 moveto
-12 f0
-(1041) show
-379.4 269.8 moveto
-12 f0
-( ) show
-298.1 256.5 moveto
-12 f2
-(See also: ) show
-344.7 256.5 moveto
-12 f0
-(www.cis.ufl.edu) show
-423.6 256.5 moveto
-12 f0
-( ) show
-298.1 243.2 moveto
-12 f2
-(See also: ) show
-344.7 243.2 moveto
-12 f0
-(www.coma.sbg.ac.at) show
-444.6 243.2 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 9 9
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1989:) show
-59.4 709.2 moveto
-12 f0
-( 101 ) show
-83.4 709.2 moveto
-12 f2
-(\(double live\)) show
-144.3 709.2 moveto
-12 f0
-( ) show
-31.5 695.9 moveto
-12 f2
-(1987:) show
-59.4 695.9 moveto
-12 f0
-( Music for the Masses ) show
-31.5 682.6 moveto
-12 f2
-(1987:) show
-59.4 682.6 moveto
-12 f0
-( Never Let Me Down ) show
-165 682.6 moveto
-12 f2
-(\(single\)) show
-201.6 682.6 moveto
-12 f0
-( ) show
-31.5 669.3 moveto
-12 f2
-(1990:) show
-59.4 669.3 moveto
-12 f0
-( Personal Jesus ) show
-135 669.3 moveto
-12 f2
-(\(single\)) show
-171.6 669.3 moveto
-12 f0
-( ) show
-31.5 656 moveto
-12 f2
-(199?:) show
-59.4 656 moveto
-12 f0
-( I Sometimes Wish I Was Famous: A Swedish) show
-31.5 642.7 moveto
-12 f0
-(Tribute ) show
-69.8 642.7 moveto
-12 f2
-(\(various\)) show
-113.7 642.7 moveto
-12 f0
-( ) show
-18.1 630 moveto
-3.3 3.3 c  fill 
-31.5 621.9 moveto
-12 f1
-(Dessau) show
-67.5 621.9 moveto
-12 f0
-( ) show
-31.5 608.6 moveto
-12 f2
-(1995:) show
-59.4 608.6 moveto
-12 f0
-( Dessau ) show
-31.5 595.3 moveto
-12 f2
-(1995:) show
-59.4 595.3 moveto
-12 f0
-( Details Sketchy ) show
-18.1 582.6 moveto
-3.3 3.3 c  fill 
-31.5 574.5 moveto
-12 f1
-(Devo) show
-57.4 574.5 moveto
-12 f0
-( ) show
-31.5 561.2 moveto
-12 f2
-(1978:) show
-59.4 561.2 moveto
-12 f0
-( Q: Are We Not Men? A: We Are DEVO! ) show
-31.5 547.9 moveto
-12 f2
-(1979:) show
-59.4 547.9 moveto
-12 f0
-( Freedom of Choice ) show
-31.5 534.6 moveto
-12 f2
-(1977-1990:) show
-87.4 534.6 moveto
-12 f0
-( Greatest Hits ) show
-31.5 521.3 moveto
-12 f2
-(1978-1990:) show
-87.4 521.3 moveto
-12 f0
-( Greatest Misses ) show
-298.1 575 moveto
-12 f2
-(UBL Card: ) show
-355.4 575 moveto
-12 f0
-(1088) show
-379.4 575 moveto
-12 f0
-( ) show
-298.1 561.7 moveto
-12 f2
-(See also: ) show
-344.7 561.7 moveto
-12 f0
-(hartke.lib.ohio-state.edu) show
-461 561.7 moveto
-12 f0
-( ) show
-298.1 548.4 moveto
-12 f2
-(See also: ) show
-344.7 548.4 moveto
-12 f0
-(unsane.enc.org) show
-416.6 548.4 moveto
-12 f0
-( ) show
-298.1 535.1 moveto
-12 f2
-(See also: ) show
-344.7 535.1 moveto
-12 f0
-(rt66.com) show
-387.6 535.1 moveto
-12 f0
-( ) show
-18.1 508.6 moveto
-3.3 3.3 c  fill 
-31.5 500.5 moveto
-12 f1
-(Die Krupps) show
-91.1 500.5 moveto
-12 f0
-( ) show
-31.5 487.2 moveto
-12 f2
-(1995:) show
-59.4 487.2 moveto
-12 f0
-( Rings of Steel ) show
-18.1 474.5 moveto
-3.3 3.3 c  fill 
-31.5 466.4 moveto
-12 f1
-(Die Monster Die) show
-115.4 466.4 moveto
-12 f0
-( ) show
-31.5 453.1 moveto
-12 f2
-(1994:) show
-59.4 453.1 moveto
-12 f0
-( Withdrawl Method ) show
-18.1 440.4 moveto
-3.3 3.3 c  fill 
-31.5 432.3 moveto
-12 f1
-(Die Warzau) show
-93.1 432.3 moveto
-12 f0
-( ) show
-31.5 419 moveto
-12 f2
-(1991:) show
-59.4 419 moveto
-12 f0
-( Big Electric Metal Bass Face ) show
-31.5 405.7 moveto
-12 f2
-(1994:) show
-59.4 405.7 moveto
-12 f0
-( Engine ) show
-31.5 392.4 moveto
-12 f2
-(1994:) show
-59.4 392.4 moveto
-12 f0
-( allgoodgirls ) show
-122.7 392.4 moveto
-12 f2
-(\(EP\)) show
-145.3 392.4 moveto
-12 f0
-( ) show
-18.1 379.7 moveto
-3.3 3.3 c  fill 
-31.5 371.6 moveto
-12 f1
-(Disposable Heroes of Hiphoprisy) show
-199.8 371.6 moveto
-12 f0
-( ) show
-31.5 358.3 moveto
-12 f2
-(1992:) show
-59.4 358.3 moveto
-12 f0
-( Hypocrisy is the Greatest Luxury ) show
-18.1 345.6 moveto
-3.3 3.3 c  fill 
-31.5 337.5 moveto
-12 f1
-(Dolby, Thomas) show
-109.5 337.5 moveto
-12 f0
-( ) show
-31.5 324.2 moveto
-12 f2
-(1983:) show
-59.4 324.2 moveto
-12 f0
-( The Golden Age of Wireless ) show
-31.5 310.9 moveto
-12 f2
-(1983:) show
-59.4 310.9 moveto
-12 f0
-( The Golden Age of Wireless ) show
-203.3 310.9 moveto
-12 f2
-(\(2nd release: 2) show
-31.5 297.6 moveto
-12 f2
-(new\)) show
-54.8 297.6 moveto
-12 f0
-( ) show
-31.5 284.3 moveto
-12 f2
-(1984:) show
-59.4 284.3 moveto
-12 f0
-( The Flat Earth ) show
-298.1 338 moveto
-12 f2
-(UBL Card: ) show
-355.4 338 moveto
-12 f0
-(1961) show
-379.4 338 moveto
-12 f0
-( ) show
-298.1 324.7 moveto
-12 f2
-(See also: ) show
-344.7 324.7 moveto
-12 f0
-(kspace.com) show
-401 324.7 moveto
-12 f0
-( ) show
-298.1 311.4 moveto
-12 f2
-(See also: ) show
-344.7 311.4 moveto
-12 f0
-(rt66.com) show
-387.6 311.4 moveto
-12 f0
-( ) show
-18.1 271.6 moveto
-3.3 3.3 c  fill 
-31.5 263.5 moveto
-12 f1
-(Doubting Thomas) show
-123.8 263.5 moveto
-12 f0
-( ) show
-31.5 250.2 moveto
-12 f2
-(1991:) show
-59.4 250.2 moveto
-12 f0
-( Father Don't Cry ) show
-148 250.2 moveto
-12 f2
-(\(EP\)) show
-170.6 250.2 moveto
-12 f0
-( ) show
-31.5 236.9 moveto
-12 f2
-(1991:) show
-59.4 236.9 moveto
-12 f0
-( The Infidel ) show
-298.1 264 moveto
-12 f2
-(UBL Card: ) show
-355.4 264 moveto
-12 f0
-(1166) show
-379.4 264 moveto
-12 f0
-( ) show
-298.1 250.7 moveto
-12 f2
-(See also: ) show
-344.7 250.7 moveto
-12 f0
-(www.eecs.nwu.edu) show
-438.3 250.7 moveto
-12 f0
-( ) show
-18.1 224.2 moveto
-3.3 3.3 c  fill 
-31.5 216.1 moveto
-12 f1
-(Duran Duran) show
-101.1 216.1 moveto
-12 f0
-( ) show
-31.5 202.8 moveto
-12 f2
-(1981:) show
-59.4 202.8 moveto
-12 f0
-( Duran Duran ) show
-31.5 189.5 moveto
-12 f2
-(1982:) show
-59.4 189.5 moveto
-12 f0
-( Carnival ) show
-106.7 189.5 moveto
-12 f2
-(\(EP\)) show
-129.3 189.5 moveto
-12 f0
-( ) show
-31.5 176.2 moveto
-12 f2
-(1982:) show
-59.4 176.2 moveto
-12 f0
-( live ) show
-83.4 176.2 moveto
-12 f2
-(\(live boot\)) show
-133 176.2 moveto
-12 f0
-( ) show
-31.5 162.9 moveto
-12 f2
-(1982:) show
-59.4 162.9 moveto
-12 f0
-( Rio ) show
-31.5 149.6 moveto
-12 f2
-(1983:) show
-59.4 149.6 moveto
-12 f0
-( Union of the Snake / Secret Oktober ) show
-240 149.6 moveto
-12 f2
-(\(single\)) show
-276.6 149.6 moveto
-12 f0
-( ) show
-31.5 136.3 moveto
-12 f2
-(1983:) show
-59.4 136.3 moveto
-12 f0
-( The Wild Boys / Cracks in the Pavement) show
-31.5 123 moveto
-12 f2
-(\(single\)) show
-68.1 123 moveto
-12 f0
-( ) show
-31.5 109.7 moveto
-12 f2
-(1983:) show
-59.4 109.7 moveto
-12 f0
-( Seven and the Ragged Tiger ) show
-31.5 96.4 moveto
-12 f2
-(1987:) show
-59.4 96.4 moveto
-12 f0
-( Notorious ) show
-31.5 83.1 moveto
-12 f2
-(1981-1988:) show
-87.4 83.1 moveto
-12 f0
-( Decade ) show
-129.3 83.1 moveto
-12 f2
-(\(comp\)) show
-163.2 83.1 moveto
-12 f0
-( ) show
-300.6 216.6 moveto
-12 f2
-(UBL Card: ) show
-357.9 216.6 moveto
-12 f0
-(1259) show
-381.9 216.6 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 10 10
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.6 moveto
-3.3 3.3 c  fill 
-31.5 708.5 moveto
-12 f1
-(Durutti Column) show
-114.5 708.5 moveto
-12 f0
-( ) show
-31.5 695.2 moveto
-12 f2
-(1988:) show
-59.4 695.2 moveto
-12 f0
-( The Guitar and Other Machines ) show
-298.1 709 moveto
-12 f2
-(UBL Card: ) show
-355.4 709 moveto
-12 f0
-(4853) show
-379.4 709 moveto
-12 f0
-( ) show
-18.1 682.5 moveto
-3.3 3.3 c  fill 
-31.5 674.4 moveto
-12 f1
-(Ebn Ozn) show
-77.1 674.4 moveto
-12 f0
-( ) show
-31.5 661.1 moveto
-12 f2
-(1984:) show
-59.4 661.1 moveto
-12 f0
-( Feeling Cavalier ) show
-18.1 648.4 moveto
-3.3 3.3 c  fill 
-31.5 640.3 moveto
-12 f1
-(Elastica) show
-72.1 640.3 moveto
-12 f0
-( ) show
-31.5 627 moveto
-12 f2
-(1995:) show
-59.4 627 moveto
-12 f0
-( Elastica ) show
-18.1 614.3 moveto
-3.3 3.3 c  fill 
-31.5 606.2 moveto
-12 f1
-(Elastic Purejoy, The) show
-135.8 606.2 moveto
-12 f0
-( ) show
-31.5 592.9 moveto
-12 f2
-(1994:) show
-59.4 592.9 moveto
-12 f0
-( The Elastic Purejoy ) show
-298.1 606.7 moveto
-12 f2
-(See also: ) show
-344.7 606.7 moveto
-12 f0
-(http2.brunel.ac.uk) show
-431.7 606.7 moveto
-12 f0
-( ) show
-18.1 580.2 moveto
-3.3 3.3 c  fill 
-31.5 572.1 moveto
-12 f1
-(Electric Hellfire Club, The) show
-168.1 572.1 moveto
-12 f0
-( ) show
-31.5 558.8 moveto
-12 f2
-(1993:) show
-59.4 558.8 moveto
-12 f0
-( Burn, Baby, Burn ) show
-31.5 545.5 moveto
-12 f2
-(1995:) show
-59.4 545.5 moveto
-12 f0
-( Kiss the Goat ) show
-18.1 532.8 moveto
-3.3 3.3 c  fill 
-31.5 524.7 moveto
-12 f1
-(Elfman, Danny) show
-109.5 524.7 moveto
-12 f0
-( ) show
-31.5 511.4 moveto
-12 f2
-(1984:) show
-59.4 511.4 moveto
-12 f0
-( So-Lo ) show
-298.1 525.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 525.2 moveto
-12 f0
-(1089) show
-379.4 525.2 moveto
-12 f0
-( ) show
-18.1 498.7 moveto
-3.3 3.3 c  fill 
-31.5 490.6 moveto
-12 f1
-(Emergency Broadcast Network) show
-192.1 490.6 moveto
-12 f0
-( ) show
-31.5 477.3 moveto
-12 f2
-(1995:) show
-59.4 477.3 moveto
-12 f0
-( Telecommunication Breakdown ) show
-18.1 464.6 moveto
-3.3 3.3 c  fill 
-31.5 456.5 moveto
-12 f1
-(Engorged with Blood) show
-140.1 456.5 moveto
-12 f0
-( ) show
-31.5 443.2 moveto
-12 f2
-(1993:) show
-59.4 443.2 moveto
-12 f0
-( Engorged with Blood ) show
-168.7 443.2 moveto
-12 f2
-(\(EP\)) show
-191.3 443.2 moveto
-12 f0
-( ) show
-18.1 430.5 moveto
-3.3 3.3 c  fill 
-31.5 422.4 moveto
-12 f1
-(Eno, Brian) show
-87.5 422.4 moveto
-12 f0
-( ) show
-31.5 409.1 moveto
-12 f2
-(1977:) show
-59.4 409.1 moveto
-12 f0
-( Before and After Science ) show
-298.1 422.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 422.9 moveto
-12 f0
-(1064) show
-379.4 422.9 moveto
-12 f0
-( ) show
-298.1 409.6 moveto
-12 f2
-(See also: ) show
-344.7 409.6 moveto
-12 f0
-(www.nwu.edu) show
-414.6 409.6 moveto
-12 f0
-( ) show
-18.1 396.4 moveto
-3.3 3.3 c  fill 
-31.5 388.3 moveto
-12 f1
-(Eon) show
-52.1 388.3 moveto
-12 f0
-( ) show
-31.5 375 moveto
-12 f2
-(1991:) show
-59.4 375 moveto
-12 f0
-( Fear: the Mindkiller ) show
-162 375 moveto
-12 f2
-(\(EP\)) show
-184.6 375 moveto
-12 f0
-( ) show
-31.5 361.7 moveto
-12 f2
-(1992:) show
-59.4 361.7 moveto
-12 f0
-( Basket Case ) show
-124.3 361.7 moveto
-12 f2
-(\(EP\)) show
-146.9 361.7 moveto
-12 f0
-( ) show
-18.1 349 moveto
-3.3 3.3 c  fill 
-31.5 340.9 moveto
-12 f1
-(Erasure) show
-72.8 340.9 moveto
-12 f0
-( ) show
-31.5 327.6 moveto
-12 f2
-(1984-1986:) show
-87.4 327.6 moveto
-12 f0
-( various singles ) show
-31.5 314.3 moveto
-12 f2
-(1986:) show
-59.4 314.3 moveto
-12 f0
-( Wonderland ) show
-298.1 341.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 341.4 moveto
-12 f0
-(1029) show
-379.4 341.4 moveto
-12 f0
-( ) show
-298.1 328.1 moveto
-12 f2
-(See also: ) show
-344.7 328.1 moveto
-12 f0
-(www.cec.wustl.edu) show
-439 328.1 moveto
-12 f0
-( ) show
-298.1 314.8 moveto
-12 f2
-(See also: ) show
-344.7 314.8 moveto
-12 f0
-(rt66.com) show
-387.6 314.8 moveto
-12 f0
-( ) show
-18.1 301.6 moveto
-3.3 3.3 c  fill 
-31.5 293.5 moveto
-12 f1
-(Estep, Maggie) show
-104.1 293.5 moveto
-12 f0
-( ) show
-31.5 280.2 moveto
-12 f2
-(1994:) show
-59.4 280.2 moveto
-12 f0
-( No More Mister Nice Girl ) show
-18.1 267.5 moveto
-3.3 3.3 c  fill 
-31.5 259.4 moveto
-12 f1
-(Ethyl Meatplow) show
-113.8 259.4 moveto
-12 f0
-( ) show
-31.5 246.1 moveto
-12 f2
-(1993:) show
-59.4 246.1 moveto
-12 f0
-( Happy Days Sweetheart ) show
-31.5 232.8 moveto
-12 f2
-(1993:) show
-59.4 232.8 moveto
-12 f0
-( Devil's Johnson ) show
-143 232.8 moveto
-12 f2
-(\(single\)) show
-179.6 232.8 moveto
-12 f0
-( ) show
-300.8 259.9 moveto
-12 f2
-(UBL Card: ) show
-358.1 259.9 moveto
-12 f0
-(5232) show
-382.1 259.9 moveto
-12 f0
-( ) show
-18.1 220.1 moveto
-3.3 3.3 c  fill 
-31.5 212 moveto
-12 f1
-(Eurythmics) show
-91.5 212 moveto
-12 f0
-( ) show
-31.5 198.7 moveto
-12 f2
-(1981:) show
-59.4 198.7 moveto
-12 f0
-( In the Garden ) show
-31.5 185.4 moveto
-12 f2
-(1982:) show
-59.4 185.4 moveto
-12 f0
-( Love is a Stranger ) show
-153 185.4 moveto
-12 f2
-(\(EP\)) show
-175.6 185.4 moveto
-12 f0
-( ) show
-31.5 172.1 moveto
-12 f2
-(1982:) show
-59.4 172.1 moveto
-12 f0
-( This is the House ) show
-149 172.1 moveto
-12 f2
-(\(live EP\)) show
-191.9 172.1 moveto
-12 f0
-( ) show
-31.5 158.8 moveto
-12 f2
-(1983:) show
-59.4 158.8 moveto
-12 f0
-( Sweet Dreams ) show
-31.5 145.5 moveto
-12 f2
-(1983:) show
-59.4 145.5 moveto
-12 f0
-( Touch ) show
-31.5 132.2 moveto
-12 f2
-(1984:) show
-59.4 132.2 moveto
-12 f0
-( 1984 \(For the Love of Big Brother\) ) show
-235.3 132.2 moveto
-12 f2
-(\(soundtrack\)) show
-296.6 132.2 moveto
-12 f0
-( ) show
-18.1 119.5 moveto
-3.3 3.3 c  fill 
-31.5 111.4 moveto
-12 f1
-(Executive Slacks) show
-117.1 111.4 moveto
-12 f0
-( ) show
-31.5 98.1 moveto
-12 f2
-(1986:) show
-59.4 98.1 moveto
-12 f0
-( Fire and Ice ) show
-18.1 85.4 moveto
-3.3 3.3 c  fill 
-31.5 77.3 moveto
-12 f1
-(Faith and the Muse) show
-131.1 77.3 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 11 11
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1994:) show
-59.4 709.2 moveto
-12 f0
-( Elyria ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Fixx, The) show
-80.1 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1982:) show
-59.4 675.1 moveto
-12 f0
-( Shuttered Room ) show
-31.5 661.8 moveto
-12 f2
-(1983:) show
-59.4 661.8 moveto
-12 f0
-( Reach the Beach ) show
-31.5 648.5 moveto
-12 f2
-(1984:) show
-59.4 648.5 moveto
-12 f0
-( Phantoms ) show
-31.5 635.2 moveto
-12 f2
-(1986:) show
-59.4 635.2 moveto
-12 f0
-( Walkabout ) show
-31.5 621.9 moveto
-12 f2
-(1987:) show
-59.4 621.9 moveto
-12 f0
-( React ) show
-92.7 621.9 moveto
-12 f2
-(\(live\)) show
-118 621.9 moveto
-12 f0
-( ) show
-300.5 688.9 moveto
-12 f2
-(UBL Card: ) show
-357.8 688.9 moveto
-12 f0
-(4603) show
-381.8 688.9 moveto
-12 f0
-( ) show
-18.1 609.2 moveto
-3.3 3.3 c  fill 
-31.5 601.1 moveto
-12 f1
-(Foetus) show
-65.4 601.1 moveto
-12 f0
-( ) show
-31.5 587.8 moveto
-12 f2
-(19??:) show
-59.4 587.8 moveto
-12 f0
-( Rife ) show
-31.5 574.5 moveto
-12 f2
-(1995:) show
-59.4 574.5 moveto
-12 f0
-( Gash ) show
-298.1 601.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 601.6 moveto
-12 f0
-(2750) show
-379.4 601.6 moveto
-12 f0
-( ) show
-18.1 561.8 moveto
-3.3 3.3 c  fill 
-31.5 553.7 moveto
-12 f1
-(Fortran 5) show
-81.1 553.7 moveto
-12 f0
-( ) show
-31.5 540.4 moveto
-12 f2
-(1991:) show
-59.4 540.4 moveto
-12 f0
-( Blues ) show
-31.5 527.1 moveto
-12 f2
-(1993:) show
-59.4 527.1 moveto
-12 f0
-( Bad Head Park ) show
-298.1 554.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 554.2 moveto
-12 f0
-(3469) show
-379.4 554.2 moveto
-12 f0
-( ) show
-298.1 540.9 moveto
-12 f2
-(See also: ) show
-344.7 540.9 moveto
-12 f0
-(rt66.com) show
-387.6 540.9 moveto
-12 f0
-( ) show
-18.1 514.4 moveto
-3.3 3.3 c  fill 
-31.5 506.3 moveto
-12 f1
-(45 Grave) show
-78.4 506.3 moveto
-12 f0
-( ) show
-31.5 493 moveto
-12 f2
-(1993:) show
-59.4 493 moveto
-12 f0
-( Debasement Tapes ) show
-18.1 480.3 moveto
-3.3 3.3 c  fill 
-31.5 472.2 moveto
-12 f1
-(Frankie goes to Hollywood) show
-168.5 472.2 moveto
-12 f0
-( ) show
-31.5 458.9 moveto
-12 f2
-(1984:) show
-59.4 458.9 moveto
-12 f0
-( Welcome to the Pleasure Dome ) show
-298.1 472.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 472.7 moveto
-12 f0
-(3222) show
-379.4 472.7 moveto
-12 f0
-( ) show
-298.1 459.4 moveto
-12 f2
-(See also: ) show
-344.7 459.4 moveto
-12 f0
-(rt66.com) show
-387.6 459.4 moveto
-12 f0
-( ) show
-18.1 446.2 moveto
-3.3 3.3 c  fill 
-31.5 438.1 moveto
-12 f1
-(Freur) show
-61.4 438.1 moveto
-12 f0
-( ) show
-31.5 424.8 moveto
-12 f2
-(1983:) show
-59.4 424.8 moveto
-12 f0
-( Doot Doot ) show
-298.1 438.6 moveto
-12 f2
-(See also: ) show
-344.7 438.6 moveto
-12 f0
-(rt66.com) show
-387.6 438.6 moveto
-12 f0
-( ) show
-18.1 412.1 moveto
-3.3 3.3 c  fill 
-31.5 404 moveto
-12 f1
-(Front 242) show
-81.8 404 moveto
-12 f0
-( ) show
-31.5 390.7 moveto
-12 f2
-(1979:) show
-59.4 390.7 moveto
-12 f0
-( Masterhit ) show
-111.3 390.7 moveto
-12 f2
-(\(EP\)) show
-133.9 390.7 moveto
-12 f0
-( ) show
-31.5 377.4 moveto
-12 f2
-(1983:) show
-59.4 377.4 moveto
-12 f0
-( Geography ) show
-31.5 364.1 moveto
-12 f2
-(1987:) show
-59.4 364.1 moveto
-12 f0
-( Official Version ) show
-31.5 350.8 moveto
-12 f2
-(1985:) show
-59.4 350.8 moveto
-12 f0
-( No Comment ) show
-31.5 337.5 moveto
-12 f2
-(1982:) show
-59.4 337.5 moveto
-12 f0
-( Two In One ) show
-123.3 337.5 moveto
-12 f2
-(\(EP\)) show
-145.9 337.5 moveto
-12 f0
-( ) show
-31.5 324.2 moveto
-12 f2
-(1982-1985:) show
-87.4 324.2 moveto
-12 f0
-( Backcatalogue ) show
-164 324.2 moveto
-12 f2
-(\(comp\)) show
-197.9 324.2 moveto
-12 f0
-( ) show
-31.5 310.9 moveto
-12 f2
-(1989:) show
-59.4 310.9 moveto
-12 f0
-( Headhunter ) show
-121.3 310.9 moveto
-12 f2
-(\(EP\)) show
-143.9 310.9 moveto
-12 f0
-( ) show
-31.5 297.6 moveto
-12 f2
-(1989:) show
-59.4 297.6 moveto
-12 f0
-( Front by Front ) show
-31.5 284.3 moveto
-12 f2
-(1989:) show
-59.4 284.3 moveto
-12 f0
-( Never Stop ) show
-119.7 284.3 moveto
-12 f2
-(\(EP\)) show
-142.3 284.3 moveto
-12 f0
-( ) show
-31.5 271 moveto
-12 f2
-(1991:) show
-59.4 271 moveto
-12 f0
-( Tyrrany For You ) show
-31.5 257.7 moveto
-12 f2
-(1991:) show
-59.4 257.7 moveto
-12 f0
-( Tragedy For You ) show
-148.7 257.7 moveto
-12 f2
-(\(EP\)) show
-171.3 257.7 moveto
-12 f0
-( ) show
-31.5 244.4 moveto
-12 f2
-(1991:) show
-59.4 244.4 moveto
-12 f0
-( Rhythm of Time ) show
-145.4 244.4 moveto
-12 f2
-(\(EP\)) show
-168 244.4 moveto
-12 f0
-( ) show
-31.5 231.1 moveto
-12 f2
-(1993:) show
-59.4 231.1 moveto
-12 f0
-( Religion ) show
-106.7 231.1 moveto
-12 f2
-(\(EP\)) show
-129.3 231.1 moveto
-12 f0
-( ) show
-31.5 217.8 moveto
-12 f2
-(1993:) show
-59.4 217.8 moveto
-12 f0
-( Animal ) show
-101.4 217.8 moveto
-12 f2
-(\(single\)) show
-138 217.8 moveto
-12 f0
-( ) show
-31.5 204.5 moveto
-12 f2
-(1993:) show
-59.4 204.5 moveto
-12 f0
-( 06:21:03:11 Up Evil ) show
-31.5 191.2 moveto
-12 f2
-(1993:) show
-59.4 191.2 moveto
-12 f0
-( 05:22:09:12 Off ) show
-298.1 404.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 404.5 moveto
-12 f0
-(1059) show
-379.4 404.5 moveto
-12 f0
-( ) show
-298.1 391.2 moveto
-12 f2
-(See also: ) show
-344.7 391.2 moveto
-12 f0
-(www.ifi.uio.no) show
-417.6 391.2 moveto
-12 f0
-( ) show
-298.1 377.9 moveto
-12 f2
-(See also: ) show
-344.7 377.9 moveto
-12 f0
-(www.eecs.nwu.edu) show
-438.3 377.9 moveto
-12 f0
-( ) show
-18.1 178.5 moveto
-3.3 3.3 c  fill 
-31.5 170.4 moveto
-12 f1
-(Front Line Assembly) show
-139.5 170.4 moveto
-12 f0
-( ) show
-31.5 157.1 moveto
-12 f2
-(1988:) show
-59.4 157.1 moveto
-12 f0
-( Convergence ) show
-31.5 143.8 moveto
-12 f2
-(1989:) show
-59.4 143.8 moveto
-12 f0
-( Digital Tension Dementia ) show
-190 143.8 moveto
-12 f2
-(\(EP\)) show
-212.6 143.8 moveto
-12 f0
-( ) show
-31.5 130.5 moveto
-12 f2
-(1990:) show
-59.4 130.5 moveto
-12 f0
-( Gashed Senses and Crossfire ) show
-31.5 117.2 moveto
-12 f2
-(1991:) show
-59.4 117.2 moveto
-12 f0
-( Caustic Grip ) show
-31.5 103.9 moveto
-12 f2
-(1992:) show
-59.4 103.9 moveto
-12 f0
-( Tactical Neural Implant ) show
-304.9 170.9 moveto
-12 f2
-(UBL Card: ) show
-362.2 170.9 moveto
-12 f0
-(1161) show
-386.2 170.9 moveto
-12 f0
-( ) show
-18.1 91.2 moveto
-3.3 3.3 c  fill 
-31.5 83.1 moveto
-12 f1
-(Fugazi) show
-66.1 83.1 moveto
-12 f0
-( ) show
-298.1 83.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 83.6 moveto
-12 f0
-(2053) show
-379.4 83.6 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 12 12
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1989:) show
-59.4 709.2 moveto
-12 f0
-( 13 Songs ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Fun Boy Three) show
-108.8 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1982:) show
-59.4 675.1 moveto
-12 f0
-( It Ain't What You Do / Just Do It / Funrama Theme ) show
-315.7 675.1 moveto
-12 f2
-(\(single\)) show
-352.3 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1981-1983:) show
-87.4 661.8 moveto
-12 f0
-( The Best of Fun Boy Three ) show
-225 661.8 moveto
-12 f2
-(\(comp\)) show
-258.9 661.8 moveto
-12 f0
-( ) show
-18.1 649.1 moveto
-3.3 3.3 c  fill 
-31.5 641 moveto
-12 f1
-(Fuzzbox) show
-74.8 641 moveto
-12 f0
-( ) show
-31.5 627.7 moveto
-12 f2
-(1986:) show
-59.4 627.7 moveto
-12 f0
-( We've got a Fuzzbox and We're Gonna Use It!!) show
-31.5 601.1 moveto
-12 f2
-(1986:) show
-59.4 601.1 moveto
-12 f0
-( Love is the Slug ) show
-143.7 601.1 moveto
-12 f2
-(\(single\)) show
-180.3 601.1 moveto
-12 f0
-( ) show
-31.5 587.8 moveto
-12 f2
-(1986:) show
-59.4 587.8 moveto
-12 f0
-( Rules and Regulations ) show
-173.4 587.8 moveto
-12 f2
-(\(single\)) show
-210 587.8 moveto
-12 f0
-( ) show
-298.1 641.5 moveto
-12 f2
-(See also: ) show
-344.7 641.5 moveto
-12 f0
-(world.std.com) show
-413.3 641.5 moveto
-12 f0
-( ) show
-18.1 575.1 moveto
-3.3 3.3 c  fill 
-31.5 567 moveto
-12 f1
-(Gabriel, Peter) show
-104.1 567 moveto
-12 f0
-( ) show
-31.5 553.7 moveto
-12 f2
-(1977:) show
-59.4 553.7 moveto
-12 f0
-( Peter Gabriel I ) show
-31.5 540.4 moveto
-12 f2
-(1978:) show
-59.4 540.4 moveto
-12 f0
-( Peter Gabriel II ) show
-31.5 527.1 moveto
-12 f2
-(1980:) show
-59.4 527.1 moveto
-12 f0
-( Peter Gabriel III ) show
-31.5 513.8 moveto
-12 f2
-(1982:) show
-59.4 513.8 moveto
-12 f0
-( Security ) show
-31.5 500.5 moveto
-12 f2
-(1983:) show
-59.4 500.5 moveto
-12 f0
-( Peter Gabriel Plays Live ) show
-183 500.5 moveto
-12 f2
-(\(double live\)) show
-243.9 500.5 moveto
-12 f0
-( ) show
-31.5 487.2 moveto
-12 f2
-(1985:) show
-59.4 487.2 moveto
-12 f0
-( Birdy ) show
-92.7 487.2 moveto
-12 f2
-(\(soundtrack\)) show
-154 487.2 moveto
-12 f0
-( ) show
-31.5 473.9 moveto
-12 f2
-(1986:) show
-59.4 473.9 moveto
-12 f0
-( So ) show
-31.5 460.6 moveto
-12 f2
-(1986:) show
-59.4 460.6 moveto
-12 f0
-( Live at the Civic Arena ) show
-178 460.6 moveto
-12 f2
-(\(live boot\)) show
-227.6 460.6 moveto
-12 f0
-( ) show
-31.5 447.3 moveto
-12 f2
-(1989:) show
-59.4 447.3 moveto
-12 f0
-( Passion ) show
-102 447.3 moveto
-12 f2
-(\(soundtrack\)) show
-163.3 447.3 moveto
-12 f0
-( ) show
-298.1 567.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 567.5 moveto
-12 f0
-(1016) show
-379.4 567.5 moveto
-12 f0
-( ) show
-298.1 554.2 moveto
-12 f2
-(See also: ) show
-344.7 554.2 moveto
-12 f0
-(www.nwu.edu) show
-414.6 554.2 moveto
-12 f0
-( ) show
-298.1 540.9 moveto
-12 f2
-(See also: ) show
-344.7 540.9 moveto
-12 f0
-(www.cs.clemson.edu) show
-447 540.9 moveto
-12 f0
-( ) show
-18.1 434.6 moveto
-3.3 3.3 c  fill 
-31.5 426.5 moveto
-12 f1
-(Garbage) show
-76.1 426.5 moveto
-12 f0
-( ) show
-31.5 413.2 moveto
-12 f2
-(1995:) show
-59.4 413.2 moveto
-12 f0
-( Garbage ) show
-298.1 427 moveto
-12 f2
-(See also: ) show
-344.7 427 moveto
-12 f0
-(hamp.hampshire.edu) show
-444.6 427 moveto
-12 f0
-( ) show
-18.1 400.5 moveto
-3.3 3.3 c  fill 
-31.5 392.4 moveto
-12 f1
-(Game Theory) show
-102.4 392.4 moveto
-12 f0
-( ) show
-31.5 379.1 moveto
-12 f2
-(1987:) show
-59.4 379.1 moveto
-12 f0
-( Lolita Nation ) show
-18.1 366.4 moveto
-3.3 3.3 c  fill 
-31.5 358.3 moveto
-12 f1
-(Gang of 4) show
-81.5 358.3 moveto
-12 f0
-( ) show
-31.5 345 moveto
-12 f2
-(1979:) show
-59.4 345 moveto
-12 f0
-( Entertainment ) show
-31.5 331.7 moveto
-12 f2
-(1979:) show
-59.4 331.7 moveto
-12 f0
-( Peel Sessions ) show
-130.4 331.7 moveto
-12 f2
-(\(live\)) show
-155.7 331.7 moveto
-12 f0
-( ) show
-31.5 318.4 moveto
-12 f2
-(1981:) show
-59.4 318.4 moveto
-12 f0
-( Solid Gold ) show
-31.5 305.1 moveto
-12 f2
-(1981:) show
-59.4 305.1 moveto
-12 f0
-( Another Day / Another Dollar ) show
-31.5 291.8 moveto
-12 f2
-(1982:) show
-59.4 291.8 moveto
-12 f0
-( I Love a Man In a Uniform ) show
-196 291.8 moveto
-12 f2
-(\(single\)) show
-232.6 291.8 moveto
-12 f0
-( ) show
-31.5 278.5 moveto
-12 f2
-(1982:) show
-59.4 278.5 moveto
-12 f0
-( Songs of the Free ) show
-31.5 265.2 moveto
-12 f2
-(1983:) show
-59.4 265.2 moveto
-12 f0
-( Is It Love ) show
-112 265.2 moveto
-12 f2
-(\(single\)) show
-148.6 265.2 moveto
-12 f0
-( ) show
-31.5 251.9 moveto
-12 f2
-(1983:) show
-59.4 251.9 moveto
-12 f0
-( Hard ) show
-31.5 238.6 moveto
-12 f2
-(1983:) show
-59.4 238.6 moveto
-12 f0
-( At the Palace ) show
-129.3 238.6 moveto
-12 f2
-(\(live\)) show
-154.6 238.6 moveto
-12 f0
-( ) show
-31.5 225.3 moveto
-12 f2
-(1979-1983:) show
-87.4 225.3 moveto
-12 f0
-( A Brief History of the Twentieth Century) show
-31.5 212 moveto
-12 f2
-(\(comp\)) show
-65.4 212 moveto
-12 f0
-( ) show
-31.5 198.7 moveto
-12 f2
-(1990:) show
-59.4 198.7 moveto
-12 f0
-( To Hell With Poverty ) show
-169.7 198.7 moveto
-12 f2
-(\(single\)) show
-206.3 198.7 moveto
-12 f0
-( ) show
-31.5 185.4 moveto
-12 f2
-(1990:) show
-59.4 185.4 moveto
-12 f0
-( Mall ) show
-31.5 172.1 moveto
-12 f2
-(1990:) show
-59.4 172.1 moveto
-12 f0
-( Money Talks ) show
-129 172.1 moveto
-12 f2
-(\(single\)) show
-165.6 172.1 moveto
-12 f0
-( ) show
-31.5 158.8 moveto
-12 f2
-(1995:) show
-59.4 158.8 moveto
-12 f0
-( Tatoo ) show
-93.3 158.8 moveto
-12 f2
-(\(single\)) show
-129.9 158.8 moveto
-12 f0
-( ) show
-31.5 145.5 moveto
-12 f2
-(1995:) show
-59.4 145.5 moveto
-12 f0
-( Shrinkwrapped ) show
-298.1 358.8 moveto
-12 f2
-(See also: ) show
-344.7 358.8 moveto
-12 f0
-(http2.brunel.ac.uk) show
-431.7 358.8 moveto
-12 f0
-( ) show
-18.1 132.8 moveto
-3.3 3.3 c  fill 
-31.5 124.7 moveto
-12 f1
-(Glove, The) show
-87.5 124.7 moveto
-12 f0
-( ) show
-31.5 111.4 moveto
-12 f2
-(1982:) show
-59.4 111.4 moveto
-12 f0
-( Blue Sunshine ) show
-298.1 125.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 125.2 moveto
-12 f0
-(1159) show
-379.4 125.2 moveto
-12 f0
-( ) show
-298.1 111.9 moveto
-12 f2
-(See also: ) show
-344.7 111.9 moveto
-12 f0
-(www.dcs.gla.ac.uk) show
-436 111.9 moveto
-12 f0
-( ) show
-18.1 98.7 moveto
-3.3 3.3 c  fill 
-31.5 90.6 moveto
-12 f1
-(God is my Copilot) show
-124.5 90.6 moveto
-12 f0
-( ) show
-31.5 77.3 moveto
-12 f2
-(1993:) show
-59.4 77.3 moveto
-12 f0
-( Speed Yr Trip ) show
-pagelevel restore
-showpage
-%%Page: 13 13
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 712.6 moveto
-3.3 3.3 c  fill 
-31.5 704.5 moveto
-12 f1
-(Gracious Shades) show
-117.1 704.5 moveto
-12 f0
-( ) show
-31.5 691.2 moveto
-12 f2
-(1995:) show
-59.4 691.2 moveto
-12 f0
-( Aberkash ) show
-18.1 678.5 moveto
-3.3 3.3 c  fill 
-31.5 670.4 moveto
-12 f1
-(Grind) show
-62.8 670.4 moveto
-12 f0
-( ) show
-31.5 657.1 moveto
-12 f2
-(1995:) show
-59.4 657.1 moveto
-12 f0
-( Kittymuzzle ) show
-18.1 644.4 moveto
-3.3 3.3 c  fill 
-31.5 636.3 moveto
-12 f1
-(Grotus) show
-67.5 636.3 moveto
-12 f0
-( ) show
-31.5 623 moveto
-12 f2
-(1993:) show
-59.4 623 moveto
-12 f0
-( Slow Motion Apocalypse ) show
-302.1 636.8 moveto
-12 f2
-(UBL Card: ) show
-359.4 636.8 moveto
-12 f0
-(5482) show
-383.4 636.8 moveto
-12 f0
-( ) show
-18.1 610.3 moveto
-3.3 3.3 c  fill 
-31.5 602.2 moveto
-12 f1
-(Pizzicato Five) show
-102.4 602.2 moveto
-12 f0
-( ) show
-31.5 588.9 moveto
-12 f2
-(1995:) show
-59.4 588.9 moveto
-12 f0
-( The Sound of Music ) show
-18.1 576.2 moveto
-3.3 3.3 c  fill 
-31.5 568.1 moveto
-12 f1
-(PJ Harvey) show
-85.8 568.1 moveto
-12 f0
-( ) show
-31.5 554.8 moveto
-12 f2
-(1992:) show
-59.4 554.8 moveto
-12 f0
-( Dry ) show
-31.5 541.5 moveto
-12 f2
-(1993:) show
-59.4 541.5 moveto
-12 f0
-( Rid of Me ) show
-31.5 528.2 moveto
-12 f2
-(1993:) show
-59.4 528.2 moveto
-12 f0
-( 4-Track Demos ) show
-31.5 514.9 moveto
-12 f2
-(1995:) show
-59.4 514.9 moveto
-12 f0
-( Down by the Water ) show
-159.7 514.9 moveto
-12 f2
-(\(single\)) show
-196.3 514.9 moveto
-12 f0
-( ) show
-31.5 501.6 moveto
-12 f2
-(1995:) show
-59.4 501.6 moveto
-12 f0
-( To Bring You My Love ) show
-298.1 568.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 568.6 moveto
-12 f0
-(1221) show
-379.4 568.6 moveto
-12 f0
-( ) show
-298.1 555.3 moveto
-12 f2
-(See also: ) show
-344.7 555.3 moveto
-12 f0
-(www.louisville.edu) show
-438.6 555.3 moveto
-12 f0
-( ) show
-18.1 488.9 moveto
-3.3 3.3 c  fill 
-31.5 480.8 moveto
-12 f1
-(Psychick Warriors ov Gaia) show
-170.4 480.8 moveto
-12 f0
-( ) show
-31.5 467.5 moveto
-12 f2
-(1992:) show
-59.4 467.5 moveto
-12 f0
-( Ov Biospheres and Sacred Groves ) show
-18.1 454.8 moveto
-3.3 3.3 c  fill 
-31.5 446.7 moveto
-12 f1
-(Hagen, Nina) show
-95.5 446.7 moveto
-12 f0
-( ) show
-31.5 433.4 moveto
-12 f2
-(1985:) show
-59.4 433.4 moveto
-12 f0
-( In Ekstasy ) show
-31.5 420.1 moveto
-12 f2
-(1978-1982:) show
-87.4 420.1 moveto
-12 f0
-( nunsexmonkrock / Nina Hagen Band ) show
-18.1 407.4 moveto
-3.3 3.3 c  fill 
-31.5 399.3 moveto
-12 f1
-(Hate Dept.) show
-86.8 399.3 moveto
-12 f0
-( ) show
-31.5 386 moveto
-12 f2
-(1994:) show
-59.4 386 moveto
-12 f0
-( Meat Your Maker ) show
-31.5 372.7 moveto
-12 f2
-(1995:) show
-59.4 372.7 moveto
-12 f0
-( Mainline ) show
-108.7 372.7 moveto
-12 f2
-(\(EP\)) show
-131.3 372.7 moveto
-12 f0
-( ) show
-298.1 399.8 moveto
-12 f2
-(See also: ) show
-344.7 399.8 moveto
-12 f0
-(www.iuma.com) show
-421.3 399.8 moveto
-12 f0
-( ) show
-18.1 360 moveto
-3.3 3.3 c  fill 
-31.5 351.9 moveto
-12 f1
-(Haysi Fantayzee) show
-115.8 351.9 moveto
-12 f0
-( ) show
-31.5 338.6 moveto
-12 f2
-(1982:) show
-59.4 338.6 moveto
-12 f0
-( Shiny Shiny remix ) show
-155.4 338.6 moveto
-12 f2
-(\(single\)) show
-192 338.6 moveto
-12 f0
-( ) show
-18.1 325.9 moveto
-3.3 3.3 c  fill 
-31.5 317.8 moveto
-12 f1
-(Heaven 17) show
-85.1 317.8 moveto
-12 f0
-( ) show
-31.5 304.5 moveto
-12 f2
-(1981:) show
-59.4 304.5 moveto
-12 f0
-( Penthouse and Pavement ) show
-31.5 291.2 moveto
-12 f2
-(1982:) show
-59.4 291.2 moveto
-12 f0
-( Heaven 17 ) show
-31.5 277.9 moveto
-12 f2
-(1983:) show
-59.4 277.9 moveto
-12 f0
-( The Luxury Gap ) show
-31.5 264.6 moveto
-12 f2
-(1984:) show
-59.4 264.6 moveto
-12 f0
-( How Men Are ) show
-18.1 251.9 moveto
-3.3 3.3 c  fill 
-31.5 243.8 moveto
-12 f1
-(Hope, Peter and Kirk, Richard) show
-190.1 243.8 moveto
-12 f0
-( ) show
-31.5 230.5 moveto
-12 f2
-(1988:) show
-59.4 230.5 moveto
-12 f0
-( Hoodoo Talk ) show
-298.1 244.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 244.3 moveto
-12 f0
-(2307) show
-379.4 244.3 moveto
-12 f0
-( ) show
-18.1 217.8 moveto
-3.3 3.3 c  fill 
-31.5 209.7 moveto
-12 f1
-(Kershaw, Nik) show
-102.1 209.7 moveto
-12 f0
-( ) show
-31.5 196.4 moveto
-12 f2
-(1983:) show
-59.4 196.4 moveto
-12 f0
-( Human Racing ) show
-18.1 183.7 moveto
-3.3 3.3 c  fill 
-31.5 175.6 moveto
-12 f1
-(Kirk, Richard) show
-104.1 175.6 moveto
-12 f0
-( ) show
-31.5 162.3 moveto
-12 f2
-(1993:) show
-59.4 162.3 moveto
-12 f0
-( Virtual State ) show
-298.1 176.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 176.1 moveto
-12 f0
-(2307) show
-379.4 176.1 moveto
-12 f0
-( ) show
-18.1 149.6 moveto
-3.3 3.3 c  fill 
-31.5 141.5 moveto
-12 f1
-(Human League) show
-110.5 141.5 moveto
-12 f0
-( ) show
-31.5 128.2 moveto
-12 f2
-(1979:) show
-59.4 128.2 moveto
-12 f0
-( Reproduction ) show
-31.5 114.9 moveto
-12 f2
-(1980:) show
-59.4 114.9 moveto
-12 f0
-( Travelogue ) show
-31.5 101.6 moveto
-12 f2
-(1981:) show
-59.4 101.6 moveto
-12 f0
-( Dare ) show
-31.5 88.3 moveto
-12 f2
-(1983:) show
-59.4 88.3 moveto
-12 f0
-( Fascination ) show
-31.5 75 moveto
-12 f2
-(1984:) show
-59.4 75 moveto
-12 f0
-( Hysteria ) show
-298.1 142 moveto
-12 f2
-(UBL Card: ) show
-355.4 142 moveto
-12 f0
-(4631) show
-379.4 142 moveto
-12 f0
-( ) show
-298.1 128.7 moveto
-12 f2
-(See also: ) show
-344.7 128.7 moveto
-12 f0
-(pathfinder.com) show
-417.6 128.7 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 14 14
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1995:) show
-59.4 709.2 moveto
-12 f0
-( Octopus ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Hunters and Collectors) show
-150.8 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1987:) show
-59.4 675.1 moveto
-12 f0
-( Human Frailty ) show
-300.2 688.9 moveto
-12 f2
-(UBL Card: ) show
-357.5 688.9 moveto
-12 f0
-(4553) show
-381.5 688.9 moveto
-12 f0
-( ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(Ice T) show
-57.8 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1991:) show
-59.4 641 moveto
-12 f0
-( New Jack Hustler ) show
-150.7 641 moveto
-12 f2
-(\(EP\)) show
-173.3 641 moveto
-12 f0
-( ) show
-298.1 654.8 moveto
-12 f2
-(UBL Card: ) show
-355.4 654.8 moveto
-12 f0
-(2342) show
-379.4 654.8 moveto
-12 f0
-( ) show
-18.1 628.3 moveto
-3.3 3.3 c  fill 
-31.5 620.2 moveto
-12 f1
-(In the Nursery) show
-106.8 620.2 moveto
-12 f0
-( ) show
-31.5 606.9 moveto
-12 f2
-(19??:) show
-59.4 606.9 moveto
-12 f0
-( L'Esprit ) show
-18.1 594.2 moveto
-3.3 3.3 c  fill 
-31.5 586.1 moveto
-12 f1
-(INXS) show
-60.1 586.1 moveto
-12 f0
-( ) show
-31.5 572.8 moveto
-12 f2
-(1982:) show
-59.4 572.8 moveto
-12 f0
-( Shabooh Shoobah ) show
-31.5 559.5 moveto
-12 f2
-(1984:) show
-59.4 559.5 moveto
-12 f0
-( The Swing ) show
-31.5 546.2 moveto
-12 f2
-(1985:) show
-59.4 546.2 moveto
-12 f0
-( Listen Like Thieves ) show
-31.5 532.9 moveto
-12 f2
-(1988:) show
-59.4 532.9 moveto
-12 f0
-( Kick ) show
-31.5 519.6 moveto
-12 f2
-(1990:) show
-59.4 519.6 moveto
-12 f0
-( X ) show
-298.1 586.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 586.6 moveto
-12 f0
-(1284) show
-379.4 586.6 moveto
-12 f0
-( ) show
-18.1 506.9 moveto
-3.3 3.3 c  fill 
-31.5 498.8 moveto
-12 f1
-(J., David) show
-77.1 498.8 moveto
-12 f0
-( ) show
-31.5 485.5 moveto
-12 f2
-(1983-1986:) show
-87.4 485.5 moveto
-12 f0
-( On Glass ) show
-137.7 485.5 moveto
-12 f2
-(\(comp\)) show
-171.6 485.5 moveto
-12 f0
-( ) show
-31.5 472.2 moveto
-12 f2
-(1985:) show
-59.4 472.2 moveto
-12 f0
-( Crocodile Tears and the Velvet Cosh ) show
-298.1 499.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 499.3 moveto
-12 f0
-(1215) show
-379.4 499.3 moveto
-12 f0
-( ) show
-298.1 486 moveto
-12 f2
-(See also: ) show
-344.7 486 moveto
-12 f0
-(gothic.acs.csulb.edu) show
-441.6 486 moveto
-12 f0
-( ) show
-298.1 472.7 moveto
-12 f2
-(See also: ) show
-344.7 472.7 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 472.7 moveto
-12 f0
-( ) show
-18.1 459.5 moveto
-3.3 3.3 c  fill 
-31.5 451.4 moveto
-12 f1
-(Jesus and Mary Chain, The) show
-173.1 451.4 moveto
-12 f0
-( ) show
-31.5 438.1 moveto
-12 f2
-(1992:) show
-59.4 438.1 moveto
-12 f0
-( Reverence ) show
-116 438.1 moveto
-12 f2
-(\(EP\)) show
-138.6 438.1 moveto
-12 f0
-( ) show
-31.5 424.8 moveto
-12 f2
-(1992:) show
-59.4 424.8 moveto
-12 f0
-( Honey's Dead ) show
-31.5 411.5 moveto
-12 f2
-(1995:) show
-59.4 411.5 moveto
-12 f0
-( Hate Rock and Roll ) show
-160.3 411.5 moveto
-12 f2
-(\(comp\)) show
-194.2 411.5 moveto
-12 f0
-( ) show
-298.1 451.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 451.9 moveto
-12 f0
-(1228) show
-379.4 451.9 moveto
-12 f0
-( ) show
-298.1 438.6 moveto
-12 f2
-(See also: ) show
-344.7 438.6 moveto
-12 f0
-(american.recordings.com) show
-465.9 438.6 moveto
-12 f0
-( ) show
-18.1 398.8 moveto
-3.3 3.3 c  fill 
-31.5 390.7 moveto
-12 f1
-(Jones, Grace) show
-97.4 390.7 moveto
-12 f0
-( ) show
-31.5 377.4 moveto
-12 f2
-(1993:) show
-59.4 377.4 moveto
-12 f0
-( Sex Drive ) show
-113.7 377.4 moveto
-12 f2
-(\(single\)) show
-150.3 377.4 moveto
-12 f0
-( ) show
-18.1 364.7 moveto
-3.3 3.3 c  fill 
-31.5 356.6 moveto
-12 f1
-(Jones, Howard) show
-108.1 356.6 moveto
-12 f0
-( ) show
-31.5 343.3 moveto
-12 f2
-(1983:) show
-59.4 343.3 moveto
-12 f0
-( Humans' Lib ) show
-31.5 330 moveto
-12 f2
-(1985:) show
-59.4 330 moveto
-12 f0
-( Dream Into Action ) show
-18.1 317.3 moveto
-3.3 3.3 c  fill 
-31.5 309.2 moveto
-12 f1
-(Joy Division) show
-94.5 309.2 moveto
-12 f0
-( ) show
-31.5 295.9 moveto
-12 f2
-(1977-1978:) show
-87.4 295.9 moveto
-12 f0
-( Warsaw ) show
-132.7 295.9 moveto
-12 f2
-(\(comp\)) show
-166.6 295.9 moveto
-12 f0
-( ) show
-31.5 282.6 moveto
-12 f2
-(1979:) show
-59.4 282.6 moveto
-12 f0
-( Unknown Pleasures ) show
-31.5 269.3 moveto
-12 f2
-(1980:) show
-59.4 269.3 moveto
-12 f0
-( Closer ) show
-31.5 256 moveto
-12 f2
-(1980:) show
-59.4 256 moveto
-12 f0
-( Transmission / Novelty ) show
-178 256 moveto
-12 f2
-(\(single\)) show
-214.6 256 moveto
-12 f0
-( ) show
-31.5 242.7 moveto
-12 f2
-(1980:) show
-59.4 242.7 moveto
-12 f0
-( Still ) show
-31.5 229.4 moveto
-12 f2
-(1977-1980:) show
-87.4 229.4 moveto
-12 f0
-( Substance ) show
-142 229.4 moveto
-12 f2
-(\(comp\)) show
-175.9 229.4 moveto
-12 f0
-( ) show
-31.5 216.1 moveto
-12 f2
-(1995:) show
-59.4 216.1 moveto
-12 f0
-( Ceremonial: A Tribute ) show
-174.7 216.1 moveto
-12 f2
-(\(various\)) show
-218.6 216.1 moveto
-12 f0
-( ) show
-298.1 309.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 309.7 moveto
-12 f0
-(1214) show
-379.4 309.7 moveto
-12 f0
-( ) show
-298.1 296.4 moveto
-12 f2
-(See also: ) show
-344.7 296.4 moveto
-12 f0
-(www.fys.uio.no) show
-421.6 296.4 moveto
-12 f0
-( ) show
-298.1 283.1 moveto
-12 f2
-(See also: ) show
-344.7 283.1 moveto
-12 f0
-(csclub.uwaterloo.ca) show
-440 283.1 moveto
-12 f0
-( ) show
-18.1 203.4 moveto
-3.3 3.3 c  fill 
-31.5 195.3 moveto
-12 f1
-(King Crimson) show
-104.5 195.3 moveto
-12 f0
-( ) show
-31.5 182 moveto
-12 f2
-(1969:) show
-59.4 182 moveto
-12 f0
-( In the Court of the Crimson King ) show
-31.5 168.7 moveto
-12 f2
-(1973:) show
-59.4 168.7 moveto
-12 f0
-( Larks' Tongues in Aspic ) show
-31.5 155.4 moveto
-12 f2
-(1974:) show
-59.4 155.4 moveto
-12 f0
-( Starless and Bible Black ) show
-31.5 142.1 moveto
-12 f2
-(1981:) show
-59.4 142.1 moveto
-12 f0
-( Dicipline ) show
-31.5 128.8 moveto
-12 f2
-(1982:) show
-59.4 128.8 moveto
-12 f0
-( Beat ) show
-31.5 115.5 moveto
-12 f2
-(1984:) show
-59.4 115.5 moveto
-12 f0
-( Three of a Perfect Pair ) show
-298.1 195.8 moveto
-12 f2
-(UBL Card: ) show
-355.4 195.8 moveto
-12 f0
-(1323) show
-379.4 195.8 moveto
-12 f0
-( ) show
-18.1 102.8 moveto
-3.3 3.3 c  fill 
-31.5 94.7 moveto
-12 f1
-(KMFDM) show
-79.4 94.7 moveto
-12 f0
-( ) show
-31.5 81.4 moveto
-12 f2
-(1993:) show
-59.4 81.4 moveto
-12 f0
-( Angst ) show
-298.1 95.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 95.2 moveto
-12 f0
-(1452) show
-379.4 95.2 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 15 15
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.6 moveto
-3.3 3.3 c  fill 
-31.5 708.5 moveto
-12 f1
-(Kraftwerk) show
-86.1 708.5 moveto
-12 f0
-( ) show
-31.5 695.2 moveto
-12 f2
-(1977:) show
-59.4 695.2 moveto
-12 f0
-( Trans-Europe Express ) show
-172.3 695.2 moveto
-12 f2
-(\(EP\)) show
-194.9 695.2 moveto
-12 f0
-( ) show
-298.1 709 moveto
-12 f2
-(UBL Card: ) show
-355.4 709 moveto
-12 f0
-(1027) show
-379.4 709 moveto
-12 f0
-( ) show
-298.1 695.7 moveto
-12 f2
-(See also: ) show
-344.7 695.7 moveto
-12 f0
-(wwwtdb.cs.umu.se) show
-436.3 695.7 moveto
-12 f0
-( ) show
-298.1 682.4 moveto
-12 f2
-(See also: ) show
-344.7 682.4 moveto
-12 f0
-(rt66.com) show
-387.6 682.4 moveto
-12 f0
-( ) show
-18.1 669.7 moveto
-3.3 3.3 c  fill 
-31.5 661.6 moveto
-12 f1
-(L7) show
-45.5 661.6 moveto
-12 f0
-( ) show
-31.5 648.3 moveto
-12 f2
-(1988:) show
-59.4 648.3 moveto
-12 f0
-( L7 ) show
-31.5 635 moveto
-12 f2
-(1990:) show
-59.4 635 moveto
-12 f0
-( Smell the Magic ) show
-31.5 621.7 moveto
-12 f2
-(1992:) show
-59.4 621.7 moveto
-12 f0
-( Bricks are Heavy ) show
-31.5 608.4 moveto
-12 f2
-(1994:) show
-59.4 608.4 moveto
-12 f0
-( Hungry for Stink ) show
-298.1 662.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 662.1 moveto
-12 f0
-(1998) show
-379.4 662.1 moveto
-12 f0
-( ) show
-18.1 595.7 moveto
-3.3 3.3 c  fill 
-31.5 587.6 moveto
-12 f1
-(Le&ae;ther Strip) show
-120.4 587.6 moveto
-12 f0
-( ) show
-31.5 574.3 moveto
-12 f2
-(1995:) show
-59.4 574.3 moveto
-12 f0
-( Legacy of Hate and Lust ) show
-18.1 561.6 moveto
-3.3 3.3 c  fill 
-31.5 553.5 moveto
-12 f1
-(Lemon Kittens) show
-107.8 553.5 moveto
-12 f0
-( ) show
-31.5 540.2 moveto
-12 f2
-(1978-1980:) show
-87.4 540.2 moveto
-12 f0
-( We Buy a Hammer for Daddy ) show
-300.6 554 moveto
-12 f2
-(UBL Card: ) show
-357.9 554 moveto
-12 f0
-(1746) show
-381.9 554 moveto
-12 f0
-( ) show
-18.1 527.5 moveto
-3.3 3.3 c  fill 
-31.5 519.4 moveto
-12 f1
-(Letters to Cleo) show
-107.4 519.4 moveto
-12 f0
-( ) show
-31.5 506.1 moveto
-12 f2
-(1994:) show
-59.4 506.1 moveto
-12 f0
-( Aurora Gory Alice ) show
-298.1 519.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 519.9 moveto
-12 f0
-(3000) show
-379.4 519.9 moveto
-12 f0
-( ) show
-18.1 493.4 moveto
-3.3 3.3 c  fill 
-31.5 485.3 moveto
-12 f1
-(LFO) show
-56.1 485.3 moveto
-12 f0
-( ) show
-31.5 472 moveto
-12 f2
-(1991:) show
-59.4 472 moveto
-12 f0
-( Frequencies ) show
-31.5 458.7 moveto
-12 f2
-(1996:) show
-59.4 458.7 moveto
-12 f0
-( Advance ) show
-18.1 446 moveto
-3.3 3.3 c  fill 
-31.5 437.9 moveto
-12 f1
-(London After Midnight) show
-152.8 437.9 moveto
-12 f0
-( ) show
-31.5 424.6 moveto
-12 f2
-(1989:) show
-59.4 424.6 moveto
-12 f0
-( Selected Scenes from the End of the World ) show
-18.1 411.9 moveto
-3.3 3.3 c  fill 
-31.5 403.8 moveto
-12 f1
-(Lords of Acid) show
-102.1 403.8 moveto
-12 f0
-( ) show
-31.5 390.5 moveto
-12 f2
-(1991:) show
-59.4 390.5 moveto
-12 f0
-( Rough Sex ) show
-118.4 390.5 moveto
-12 f2
-(\(single\)) show
-155 390.5 moveto
-12 f0
-( ) show
-31.5 377.2 moveto
-12 f2
-(1993:) show
-59.4 377.2 moveto
-12 f0
-( Voodoo U ) show
-31.5 363.9 moveto
-12 f2
-(1994:) show
-59.4 363.9 moveto
-12 f0
-( The Crablouse: Variations on a Species ) show
-255 363.9 moveto
-12 f2
-(\(single\)) show
-291.6 363.9 moveto
-12 f0
-( ) show
-300.2 404.3 moveto
-12 f2
-(UBL Card: ) show
-357.5 404.3 moveto
-12 f0
-(2356) show
-381.5 404.3 moveto
-12 f0
-( ) show
-18.1 351.2 moveto
-3.3 3.3 c  fill 
-31.5 343.1 moveto
-12 f1
-(Lords of the New Church, The) show
-188.1 343.1 moveto
-12 f0
-( ) show
-31.5 329.8 moveto
-12 f2
-(1983:) show
-59.4 329.8 moveto
-12 f0
-( Is Nothing Sacred? ) show
-18.1 317.1 moveto
-3.3 3.3 c  fill 
-31.5 309 moveto
-12 f1
-(Love and Rockets) show
-122.8 309 moveto
-12 f0
-( ) show
-31.5 295.7 moveto
-12 f2
-(1985:) show
-59.4 295.7 moveto
-12 f0
-( Ball of Confusion / Inside the Outside ) show
-248 295.7 moveto
-12 f2
-(\(single\)) show
-284.6 295.7 moveto
-12 f0
-( ) show
-31.5 282.4 moveto
-12 f2
-(1985:) show
-59.4 282.4 moveto
-12 f0
-( Seventh Dream of Teenage Heaven ) show
-31.5 269.1 moveto
-12 f2
-(1986:) show
-59.4 269.1 moveto
-12 f0
-( Express ) show
-31.5 255.8 moveto
-12 f2
-(1986:) show
-59.4 255.8 moveto
-12 f0
-( Kundalini Express / Lucifer Sam / Holiday on) show
-31.5 242.5 moveto
-12 f0
-(the Moon ) show
-80.8 242.5 moveto
-12 f2
-(\(single\)) show
-117.4 242.5 moveto
-12 f0
-( ) show
-31.5 229.2 moveto
-12 f2
-(1987:) show
-59.4 229.2 moveto
-12 f0
-( Earth, Sun, Moon ) show
-31.5 215.9 moveto
-12 f2
-(1989:) show
-59.4 215.9 moveto
-12 f0
-( No Big Deal ) show
-126 215.9 moveto
-12 f2
-(\(single\)) show
-162.6 215.9 moveto
-12 f0
-( ) show
-31.5 202.6 moveto
-12 f2
-(1989:) show
-59.4 202.6 moveto
-12 f0
-( Motorcycle ) show
-120.7 202.6 moveto
-12 f2
-(\(single\)) show
-157.3 202.6 moveto
-12 f0
-( ) show
-31.5 189.3 moveto
-12 f2
-(1989:) show
-59.4 189.3 moveto
-12 f0
-( Love and Rockets ) show
-31.5 176 moveto
-12 f2
-(1994:) show
-59.4 176 moveto
-12 f0
-( This Heaven ) show
-126.3 176 moveto
-12 f2
-(\(EP\)) show
-148.9 176 moveto
-12 f0
-( ) show
-31.5 162.7 moveto
-12 f2
-(1994:) show
-59.4 162.7 moveto
-12 f0
-( Body and Soul ) show
-136.7 162.7 moveto
-12 f2
-(\(EP\)) show
-159.3 162.7 moveto
-12 f0
-( ) show
-31.5 149.4 moveto
-12 f2
-(1994:) show
-59.4 149.4 moveto
-12 f0
-( Hot Trip to Heaven ) show
-31.5 136.1 moveto
-12 f2
-(1995:) show
-59.4 136.1 moveto
-12 f0
-( The Glittering Darkness ) show
-181.3 136.1 moveto
-12 f2
-(\(EP\)) show
-203.9 136.1 moveto
-12 f0
-( ) show
-31.5 122.8 moveto
-12 f2
-(1996:) show
-59.4 122.8 moveto
-12 f0
-( Sweet F. A. ) show
-298.1 309.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 309.5 moveto
-12 f0
-(1215) show
-379.4 309.5 moveto
-12 f0
-( ) show
-298.1 296.2 moveto
-12 f2
-(See also: ) show
-344.7 296.2 moveto
-12 f0
-(american.recordings.com) show
-465.9 296.2 moveto
-12 f0
-( ) show
-298.1 282.9 moveto
-12 f2
-(See also: ) show
-344.7 282.9 moveto
-12 f0
-(gothic.acs.csulb.edu) show
-441.6 282.9 moveto
-12 f0
-( ) show
-18.1 110.1 moveto
-3.3 3.3 c  fill 
-31.5 102 moveto
-12 f1
-(Love is Colder than Death) show
-166.1 102 moveto
-12 f0
-( ) show
-31.5 88.7 moveto
-12 f2
-(1993:) show
-59.4 88.7 moveto
-12 f0
-( Oxeia ) show
-31.5 75.4 moveto
-12 f2
-(19??:) show
-59.4 75.4 moveto
-12 f0
-( Mental Traveller ) show
-pagelevel restore
-showpage
-%%Page: 16 16
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(19??:) show
-59.4 709.2 moveto
-12 f0
-( Teignmouth ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Low Pop Suicide) show
-117.5 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1992:) show
-59.4 675.1 moveto
-12 f0
-( Disengagement ) show
-140 675.1 moveto
-12 f2
-(\(EP\)) show
-162.6 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1992:) show
-59.4 661.8 moveto
-12 f0
-( On the Cross of Commerce ) show
-31.5 648.5 moveto
-12 f2
-(1994:) show
-59.4 648.5 moveto
-12 f0
-( Kiss Your Lips ) show
-138.7 648.5 moveto
-12 f2
-(\(remixes\)) show
-184 648.5 moveto
-12 f0
-( ) show
-31.5 635.2 moveto
-12 f2
-(1995:) show
-59.4 635.2 moveto
-12 f0
-( The Death of Excellence ) show
-306.4 688.9 moveto
-12 f2
-(UBL Card: ) show
-363.7 688.9 moveto
-12 f0
-(1984) show
-387.7 688.9 moveto
-12 f0
-( ) show
-18.1 622.5 moveto
-3.3 3.3 c  fill 
-31.5 614.4 moveto
-12 f1
-(Luscious Jackson) show
-121.1 614.4 moveto
-12 f0
-( ) show
-31.5 601.1 moveto
-12 f2
-(1992:) show
-59.4 601.1 moveto
-12 f0
-( In Search of Manny ) show
-31.5 587.8 moveto
-12 f2
-(1994:) show
-59.4 587.8 moveto
-12 f0
-( Natural Ingredients ) show
-18.1 575.1 moveto
-3.3 3.3 c  fill 
-31.5 567 moveto
-12 f1
-(Lush) show
-57.5 567 moveto
-12 f0
-( ) show
-31.5 553.7 moveto
-12 f2
-(1990:) show
-59.4 553.7 moveto
-12 f0
-( Gala ) show
-31.5 540.4 moveto
-12 f2
-(1992:) show
-59.4 540.4 moveto
-12 f0
-( Spooky ) show
-31.5 527.1 moveto
-12 f2
-(1994:) show
-59.4 527.1 moveto
-12 f0
-( Split ) show
-298.1 567.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 567.5 moveto
-12 f0
-(2359) show
-379.4 567.5 moveto
-12 f0
-( ) show
-298.1 554.2 moveto
-12 f2
-(See also: ) show
-344.7 554.2 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 554.2 moveto
-12 f0
-( ) show
-18.1 514.4 moveto
-3.3 3.3 c  fill 
-31.5 506.3 moveto
-12 f1
-(Lwin, Annabella) show
-116.8 506.3 moveto
-12 f0
-( ) show
-31.5 493 moveto
-12 f2
-(1986:) show
-59.4 493 moveto
-12 f0
-( War Boys ) show
-113.7 493 moveto
-12 f2
-(\(single\)) show
-150.3 493 moveto
-12 f0
-( ) show
-31.5 479.7 moveto
-12 f2
-(1994:) show
-59.4 479.7 moveto
-12 f0
-( Car Sex ) show
-103.7 479.7 moveto
-12 f2
-(\(EP\)) show
-126.3 479.7 moveto
-12 f0
-( ) show
-300.5 506.8 moveto
-12 f2
-(UBL Card: ) show
-357.8 506.8 moveto
-12 f0
-(2301) show
-381.8 506.8 moveto
-12 f0
-( ) show
-18.1 467 moveto
-3.3 3.3 c  fill 
-31.5 458.9 moveto
-12 f1
-(Lycea) show
-62.1 458.9 moveto
-12 f0
-( ) show
-31.5 445.6 moveto
-12 f2
-(1993:) show
-59.4 445.6 moveto
-12 f0
-( A Day in the Stark Corner ) show
-298.1 459.4 moveto
-12 f2
-(See also: ) show
-344.7 459.4 moveto
-12 f0
-(www.projekt.com) show
-431.3 459.4 moveto
-12 f0
-( ) show
-18.1 432.9 moveto
-3.3 3.3 c  fill 
-31.5 424.8 moveto
-12 f1
-(M) show
-42.8 424.8 moveto
-12 f0
-( ) show
-31.5 411.5 moveto
-12 f2
-(1979:) show
-59.4 411.5 moveto
-12 f0
-( Pop Musik ) show
-117.7 411.5 moveto
-12 f2
-(\(7inch\)) show
-152.3 411.5 moveto
-12 f0
-( ) show
-18.1 398.8 moveto
-3.3 3.3 c  fill 
-31.5 390.7 moveto
-12 f1
-(Machines of Loving Grace) show
-167.1 390.7 moveto
-12 f0
-( ) show
-31.5 377.4 moveto
-12 f2
-(1991:) show
-59.4 377.4 moveto
-12 f0
-( Rite of Shiva ) show
-128.7 377.4 moveto
-12 f2
-(\(single\)) show
-165.3 377.4 moveto
-12 f0
-( ) show
-31.5 364.1 moveto
-12 f2
-(1991:) show
-59.4 364.1 moveto
-12 f0
-( Machines of Loving Grace ) show
-31.5 350.8 moveto
-12 f2
-(1992:) show
-59.4 350.8 moveto
-12 f0
-( Burn Like Brilliant Trash ) show
-187.7 350.8 moveto
-12 f2
-(\(EP\)) show
-210.3 350.8 moveto
-12 f0
-( ) show
-31.5 337.5 moveto
-12 f2
-(1993:) show
-59.4 337.5 moveto
-12 f0
-( Concentration ) show
-31.5 324.2 moveto
-12 f2
-(1995:) show
-59.4 324.2 moveto
-12 f0
-( Gilt ) show
-298.1 391.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 391.2 moveto
-12 f0
-(1219) show
-379.4 391.2 moveto
-12 f0
-( ) show
-298.1 377.9 moveto
-12 f2
-(See also: ) show
-344.7 377.9 moveto
-12 f0
-(www.nando.net) show
-420.6 377.9 moveto
-12 f0
-( ) show
-18.1 311.5 moveto
-3.3 3.3 c  fill 
-31.5 303.4 moveto
-12 f1
-(M|A|R|R|S) show
-86 303.4 moveto
-12 f0
-( ) show
-31.5 290.1 moveto
-12 f2
-(1987:) show
-59.4 290.1 moveto
-12 f0
-( Pump Up the Volume / Anitina ) show
-215.7 290.1 moveto
-12 f2
-(\(single\)) show
-252.3 290.1 moveto
-12 f0
-( ) show
-18.1 277.4 moveto
-3.3 3.3 c  fill 
-31.5 269.3 moveto
-12 f1
-(Mallinder, Stephen) show
-130.1 269.3 moveto
-12 f0
-( ) show
-31.5 256 moveto
-12 f2
-(1982:) show
-59.4 256 moveto
-12 f0
-( Pow Wow ) show
-299.9 269.8 moveto
-12 f2
-(UBL Card: ) show
-357.2 269.8 moveto
-12 f0
-(2307) show
-381.2 269.8 moveto
-12 f0
-( ) show
-18.1 243.3 moveto
-3.3 3.3 c  fill 
-31.5 235.2 moveto
-12 f1
-(Manufacture) show
-98.8 235.2 moveto
-12 f0
-( ) show
-31.5 221.9 moveto
-12 f2
-(1988:) show
-59.4 221.9 moveto
-12 f0
-( Terrorvision ) show
-18.1 209.2 moveto
-3.3 3.3 c  fill 
-31.5 201.1 moveto
-12 f1
-(March Violets, The) show
-130.4 201.1 moveto
-12 f0
-( ) show
-31.5 187.8 moveto
-12 f2
-(1984:) show
-59.4 187.8 moveto
-12 f0
-( Natural History ) show
-31.5 174.5 moveto
-12 f2
-(1982-1984:) show
-87.4 174.5 moveto
-12 f0
-( The Botanic Verses ) show
-188 174.5 moveto
-12 f2
-(\(comp\)) show
-221.9 174.5 moveto
-12 f0
-( ) show
-31.5 161.2 moveto
-12 f2
-(1983-1985:) show
-87.4 161.2 moveto
-12 f0
-( Electric Shades ) show
-167.7 161.2 moveto
-12 f2
-(\(comp\)) show
-201.6 161.2 moveto
-12 f0
-( ) show
-31.5 147.9 moveto
-12 f2
-(1985:) show
-59.4 147.9 moveto
-12 f0
-( Deep ) show
-90.7 147.9 moveto
-12 f2
-(\(EP\)) show
-113.3 147.9 moveto
-12 f0
-( ) show
-31.5 134.6 moveto
-12 f2
-(1986:) show
-59.4 134.6 moveto
-12 f0
-( A Turn to the Sky / Never Look Back / Deep /) show
-31.5 121.3 moveto
-12 f0
-(Rebirth ) show
-70.5 121.3 moveto
-12 f2
-(\(single\)) show
-107.1 121.3 moveto
-12 f0
-( ) show
-298.1 201.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 201.6 moveto
-12 f0
-(1114) show
-379.4 201.6 moveto
-12 f0
-( ) show
-298.1 188.3 moveto
-12 f2
-(See also: ) show
-344.7 188.3 moveto
-12 f0
-(www.cm.cf.ac.uk) show
-429.3 188.3 moveto
-12 f0
-( ) show
-18.1 108.6 moveto
-3.3 3.3 c  fill 
-31.5 100.5 moveto
-12 f1
-(Martha and the Muffins) show
-155.8 100.5 moveto
-12 f0
-( ) show
-31.5 87.2 moveto
-12 f2
-(1980-1984:) show
-87.4 87.2 moveto
-12 f0
-( Far Away in Time ) show
-181.7 87.2 moveto
-12 f2
-(\(comp\)) show
-215.6 87.2 moveto
-12 f0
-( ) show
-300.6 101 moveto
-12 f2
-(UBL Card: ) show
-357.9 101 moveto
-12 f0
-(2529) show
-381.9 101 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 17 17
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.6 moveto
-3.3 3.3 c  fill 
-31.5 708.5 moveto
-12 f1
-(Mary's Danish) show
-107.8 708.5 moveto
-12 f0
-( ) show
-31.5 695.2 moveto
-12 f2
-(1991:) show
-59.4 695.2 moveto
-12 f0
-( Circa ) show
-298.1 709 moveto
-12 f2
-(UBL Card: ) show
-355.4 709 moveto
-12 f0
-(3727) show
-379.4 709 moveto
-12 f0
-( ) show
-18.1 682.5 moveto
-3.3 3.3 c  fill 
-31.5 674.4 moveto
-12 f1
-(MC 900 Foot Jesus) show
-129.1 674.4 moveto
-12 f0
-( ) show
-31.5 661.1 moveto
-12 f2
-(1989:) show
-59.4 661.1 moveto
-12 f0
-( Hell With the Lid Off ) show
-31.5 647.8 moveto
-12 f2
-(1989:) show
-59.4 647.8 moveto
-12 f0
-( UFOs Are Real ) show
-140 647.8 moveto
-12 f2
-(\(EP\)) show
-162.6 647.8 moveto
-12 f0
-( ) show
-31.5 634.5 moveto
-12 f2
-(1990:) show
-59.4 634.5 moveto
-12 f0
-( Welcome to My Dream ) show
-31.5 621.2 moveto
-12 f2
-(1990:) show
-59.4 621.2 moveto
-12 f0
-( Killer Inside Me ) show
-144.7 621.2 moveto
-12 f2
-(\(EP\)) show
-167.3 621.2 moveto
-12 f0
-( ) show
-298.1 674.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 674.9 moveto
-12 f0
-(1229) show
-379.4 674.9 moveto
-12 f0
-( ) show
-298.1 661.6 moveto
-12 f2
-(See also: ) show
-344.7 661.6 moveto
-12 f0
-(american.recordings.com) show
-465.9 661.6 moveto
-12 f0
-( ) show
-18.1 608.5 moveto
-3.3 3.3 c  fill 
-31.5 600.4 moveto
-12 f1
-(McLachlan, Sarah) show
-126.8 600.4 moveto
-12 f0
-( ) show
-31.5 587.1 moveto
-12 f2
-(1992:) show
-59.4 587.1 moveto
-12 f0
-( Into the Fire ) show
-124.7 587.1 moveto
-12 f2
-(\(single\)) show
-161.3 587.1 moveto
-12 f0
-( ) show
-302.9 600.9 moveto
-12 f2
-(UBL Card: ) show
-360.2 600.9 moveto
-12 f0
-(1389) show
-384.2 600.9 moveto
-12 f0
-( ) show
-18.1 574.4 moveto
-3.3 3.3 c  fill 
-31.5 566.3 moveto
-12 f1
-(Meat Beat Manifesto) show
-138.8 566.3 moveto
-12 f0
-( ) show
-31.5 553 moveto
-12 f2
-(1988:) show
-59.4 553 moveto
-12 f0
-( Armed Audio Warfare ) show
-31.5 539.7 moveto
-12 f2
-(1990:) show
-59.4 539.7 moveto
-12 f0
-( Dog Star Man ) show
-133.3 539.7 moveto
-12 f2
-(\(EP\)) show
-155.9 539.7 moveto
-12 f0
-( ) show
-31.5 526.4 moveto
-12 f2
-(1990:) show
-59.4 526.4 moveto
-12 f0
-( 99% ) show
-31.5 513.1 moveto
-12 f2
-(1990:) show
-59.4 513.1 moveto
-12 f0
-( Psyche Out ) show
-120.3 513.1 moveto
-12 f2
-(\(EP\)) show
-142.9 513.1 moveto
-12 f0
-( ) show
-31.5 499.8 moveto
-12 f2
-(1990:) show
-59.4 499.8 moveto
-12 f0
-( Now ) show
-88.7 499.8 moveto
-12 f2
-(\(EP\)) show
-111.3 499.8 moveto
-12 f0
-( ) show
-31.5 486.5 moveto
-12 f2
-(1992:) show
-59.4 486.5 moveto
-12 f0
-( Satryicon ) show
-31.5 473.2 moveto
-12 f2
-(1993:) show
-59.4 473.2 moveto
-12 f0
-( Peel Session ) show
-125.7 473.2 moveto
-12 f2
-(\(EP\)) show
-148.3 473.2 moveto
-12 f0
-( ) show
-300 566.8 moveto
-12 f2
-(UBL Card: ) show
-357.3 566.8 moveto
-12 f0
-(3626) show
-381.3 566.8 moveto
-12 f0
-( ) show
-18.1 460.5 moveto
-3.3 3.3 c  fill 
-31.5 452.4 moveto
-12 f1
-(Medicine) show
-78.8 452.4 moveto
-12 f0
-( ) show
-31.5 439.1 moveto
-12 f2
-(1993:) show
-59.4 439.1 moveto
-12 f0
-( The Buried Life ) show
-31.5 425.8 moveto
-12 f2
-(1994:) show
-59.4 425.8 moveto
-12 f0
-( Shot Forth Self Living ) show
-298.1 452.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 452.9 moveto
-12 f0
-(1432) show
-379.4 452.9 moveto
-12 f0
-( ) show
-298.1 439.6 moveto
-12 f2
-(See also: ) show
-344.7 439.6 moveto
-12 f0
-(kspace.com) show
-401 439.6 moveto
-12 f0
-( ) show
-18.1 413.1 moveto
-3.3 3.3 c  fill 
-31.5 405 moveto
-12 f1
-(Mephisto Walz) show
-109.1 405 moveto
-12 f0
-( ) show
-31.5 391.7 moveto
-12 f2
-(1986-1992:) show
-87.4 391.7 moveto
-12 f0
-( Crocosmia ) show
-31.5 378.4 moveto
-12 f2
-(1993:) show
-59.4 378.4 moveto
-12 f0
-( Terra-Regina ) show
-129.3 378.4 moveto
-12 f2
-(\(comp\)) show
-163.2 378.4 moveto
-12 f0
-( ) show
-31.5 365.1 moveto
-12 f2
-(1994:) show
-59.4 365.1 moveto
-12 f0
-( The Eternal Deep ) show
-31.5 351.8 moveto
-12 f2
-(1995:) show
-59.4 351.8 moveto
-12 f0
-( Thalia ) show
-18.1 339.1 moveto
-3.3 3.3 c  fill 
-31.5 331 moveto
-12 f1
-(Midnight Oil) show
-98.5 331 moveto
-12 f0
-( ) show
-31.5 317.7 moveto
-12 f2
-(1979:) show
-59.4 317.7 moveto
-12 f0
-( Head Injuries ) show
-31.5 304.4 moveto
-12 f2
-(1981:) show
-59.4 304.4 moveto
-12 f0
-( Place without a Postcard ) show
-31.5 291.1 moveto
-12 f2
-(1983:) show
-59.4 291.1 moveto
-12 f0
-( 10, 9, 8, 7, 6, 5, 4, 3, 2, 1... ) show
-31.5 277.8 moveto
-12 f2
-(1985:) show
-59.4 277.8 moveto
-12 f0
-( Red Sails in the Sunset ) show
-298.1 331.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 331.5 moveto
-12 f0
-(1102) show
-379.4 331.5 moveto
-12 f0
-( ) show
-298.1 318.2 moveto
-12 f2
-(See also: ) show
-344.7 318.2 moveto
-12 f0
-(www.stevens-tech.edu) show
-453.3 318.2 moveto
-12 f0
-( ) show
-18.1 265.1 moveto
-3.3 3.3 c  fill 
-31.5 257 moveto
-12 f1
-(Miller, Roger) show
-100.8 257 moveto
-12 f0
-( ) show
-31.5 243.7 moveto
-12 f2
-(1987:) show
-59.4 243.7 moveto
-12 f0
-( Maximum Electric Piano ) show
-18.1 231 moveto
-3.3 3.3 c  fill 
-31.5 222.9 moveto
-12 f1
-(Ministry) show
-76.1 222.9 moveto
-12 f0
-( ) show
-31.5 209.6 moveto
-12 f2
-(1983:) show
-59.4 209.6 moveto
-12 f0
-( With Sympathy ) show
-31.5 196.3 moveto
-12 f2
-(1984:) show
-59.4 196.3 moveto
-12 f0
-( Halloween Remix / The Nature of Outtakes) show
-31.5 183 moveto
-12 f2
-(\(EP\)) show
-54.1 183 moveto
-12 f0
-( ) show
-31.5 169.7 moveto
-12 f2
-(1981-1984:) show
-87.4 169.7 moveto
-12 f0
-( various singles ) show
-31.5 156.4 moveto
-12 f2
-(1985:) show
-59.4 156.4 moveto
-12 f0
-( Cold Life ) show
-31.5 143.1 moveto
-12 f2
-(1985:) show
-59.4 143.1 moveto
-12 f0
-( Over the Shoulder / Isle of Man ) show
-218 143.1 moveto
-12 f2
-(\(EP\)) show
-240.6 143.1 moveto
-12 f0
-( ) show
-31.5 129.8 moveto
-12 f2
-(1986:) show
-59.4 129.8 moveto
-12 f0
-( Twitch ) show
-31.5 116.5 moveto
-12 f2
-(1988:) show
-59.4 116.5 moveto
-12 f0
-( 12 Inch Singles ) show
-140 116.5 moveto
-12 f2
-(\(comp\)) show
-173.9 116.5 moveto
-12 f0
-( ) show
-31.5 103.2 moveto
-12 f2
-(1988:) show
-59.4 103.2 moveto
-12 f0
-( The Land of Rape and Honey ) show
-31.5 89.9 moveto
-12 f2
-(1988:) show
-59.4 89.9 moveto
-12 f0
-( Stigmata / Tonight we Murder ) show
-211.3 89.9 moveto
-12 f2
-(\(EP\)) show
-233.9 89.9 moveto
-12 f0
-( ) show
-31.5 76.6 moveto
-12 f2
-(1989:) show
-59.4 76.6 moveto
-12 f0
-( The Mind is a Terrible Thing to Taste ) show
-298.1 223.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 223.4 moveto
-12 f0
-(1100) show
-379.4 223.4 moveto
-12 f0
-( ) show
-298.1 210.1 moveto
-12 f2
-(See also: ) show
-344.7 210.1 moveto
-12 f0
-(csclub.uwaterloo.ca) show
-440 210.1 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 18 18
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1991:) show
-59.4 709.2 moveto
-12 f0
-( Jesus Built my Hotrod ) show
-173 709.2 moveto
-12 f2
-(\(EP\)) show
-195.6 709.2 moveto
-12 f0
-( ) show
-31.5 695.9 moveto
-12 f2
-(1992:) show
-59.4 695.9 moveto
-12 f0
-( Psalm 69 ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(Miranda Sex Garden) show
-140.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1991:) show
-59.4 661.8 moveto
-12 f0
-( Gush Forth my Tears ) show
-31.5 648.5 moveto
-12 f2
-(1991:) show
-59.4 648.5 moveto
-12 f0
-( Madra ) show
-31.5 635.2 moveto
-12 f2
-(1992:) show
-59.4 635.2 moveto
-12 f0
-( Iris ) show
-31.5 621.9 moveto
-12 f2
-(1993:) show
-59.4 621.9 moveto
-12 f0
-( Suspiria ) show
-31.5 608.6 moveto
-12 f2
-(1994:) show
-59.4 608.6 moveto
-12 f0
-( Fairytales of Slavery ) show
-298.1 675.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 675.6 moveto
-12 f0
-(3007) show
-379.4 675.6 moveto
-12 f0
-( ) show
-298.1 662.3 moveto
-12 f2
-(See also: ) show
-344.7 662.3 moveto
-12 f0
-(sksol1.physics.sunysb.edu) show
-471 662.3 moveto
-12 f0
-( ) show
-18.1 595.9 moveto
-3.3 3.3 c  fill 
-31.5 587.8 moveto
-12 f1
-(Missing Persons) show
-114.5 587.8 moveto
-12 f0
-( ) show
-31.5 574.5 moveto
-12 f2
-(1982:) show
-59.4 574.5 moveto
-12 f0
-( Missing Persons ) show
-144.4 574.5 moveto
-12 f2
-(\(EP\)) show
-167 574.5 moveto
-12 f0
-( ) show
-31.5 561.2 moveto
-12 f2
-(1982:) show
-59.4 561.2 moveto
-12 f0
-( Spring Session M ) show
-31.5 547.9 moveto
-12 f2
-(1984:) show
-59.4 547.9 moveto
-12 f0
-( Rhyme & Reason ) show
-31.5 534.6 moveto
-12 f2
-(1982-1984:) show
-87.4 534.6 moveto
-12 f0
-( Best of ) show
-127.7 534.6 moveto
-12 f2
-(\(comp\)) show
-161.6 534.6 moveto
-12 f0
-( ) show
-18.1 521.9 moveto
-3.3 3.3 c  fill 
-31.5 513.8 moveto
-12 f1
-(Mistle Thrush) show
-104.5 513.8 moveto
-12 f0
-( ) show
-31.5 500.5 moveto
-12 f2
-(199?:) show
-59.4 500.5 moveto
-12 f0
-( Silt ) show
-31.5 487.2 moveto
-12 f2
-(1994:) show
-59.4 487.2 moveto
-12 f0
-( Agus Am\340rach ) show
-18.1 474.5 moveto
-3.3 3.3 c  fill 
-31.5 466.4 moveto
-12 f1
-(Mission, The) show
-97.5 466.4 moveto
-12 f0
-( ) show
-31.5 453.1 moveto
-12 f2
-(1986:) show
-59.4 453.1 moveto
-12 f0
-( God's Own Medicine ) show
-31.5 439.8 moveto
-12 f2
-(1987:) show
-59.4 439.8 moveto
-12 f0
-( the First Chapter ) show
-298.1 466.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 466.9 moveto
-12 f0
-(2045) show
-379.4 466.9 moveto
-12 f0
-( ) show
-18.1 427.1 moveto
-3.3 3.3 c  fill 
-31.5 419 moveto
-12 f1
-(Mission of Burma) show
-123.5 419 moveto
-12 f0
-( ) show
-31.5 405.7 moveto
-12 f2
-(1987:) show
-59.4 405.7 moveto
-12 f0
-( Forget ) show
-18.1 393 moveto
-3.3 3.3 c  fill 
-31.5 384.9 moveto
-12 f1
-(Morissette, Alanis) show
-124.1 384.9 moveto
-12 f0
-( ) show
-31.5 371.6 moveto
-12 f2
-(1995:) show
-59.4 371.6 moveto
-12 f0
-( Jagged Little Pill ) show
-301 385.4 moveto
-12 f2
-(UBL Card: ) show
-358.3 385.4 moveto
-12 f0
-(3127) show
-382.3 385.4 moveto
-12 f0
-( ) show
-18.1 358.9 moveto
-3.3 3.3 c  fill 
-31.5 350.8 moveto
-12 f1
-(Morrison, Patricia) show
-126.8 350.8 moveto
-12 f0
-( ) show
-31.5 337.5 moveto
-12 f2
-(1994:) show
-59.4 337.5 moveto
-12 f0
-( Reflect on This ) show
-298.8 351.3 moveto
-12 f2
-(UBL Card: ) show
-356.1 351.3 moveto
-12 f0
-(1062) show
-380.1 351.3 moveto
-12 f0
-( ) show
-18.1 324.8 moveto
-3.3 3.3 c  fill 
-31.5 316.7 moveto
-12 f1
-(Moyet, Allison) show
-106.1 316.7 moveto
-12 f0
-( ) show
-31.5 303.4 moveto
-12 f2
-(1985:) show
-59.4 303.4 moveto
-12 f0
-( ALF ) show
-298.1 317.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 317.2 moveto
-12 f0
-(3410) show
-379.4 317.2 moveto
-12 f0
-( ) show
-298.1 303.9 moveto
-12 f2
-(See also: ) show
-344.7 303.9 moveto
-12 f0
-(rt66.com) show
-387.6 303.9 moveto
-12 f0
-( ) show
-18.1 290.7 moveto
-3.3 3.3 c  fill 
-31.5 282.6 moveto
-12 f1
-(Murder Inc.) show
-94.8 282.6 moveto
-12 f0
-( ) show
-31.5 269.3 moveto
-12 f2
-(1992:) show
-59.4 269.3 moveto
-12 f0
-( Murder Inc. ) show
-18.1 256.6 moveto
-3.3 3.3 c  fill 
-31.5 248.5 moveto
-12 f1
-(Mussolini Headkick) show
-133.8 248.5 moveto
-12 f0
-( ) show
-31.5 235.2 moveto
-12 f2
-(1990:) show
-59.4 235.2 moveto
-12 f0
-( Blood on the Flag ) show
-18.1 222.5 moveto
-3.3 3.3 c  fill 
-31.5 214.4 moveto
-12 f1
-(Murphy, Peter) show
-107.4 214.4 moveto
-12 f0
-( ) show
-31.5 201.1 moveto
-12 f2
-(1986:) show
-59.4 201.1 moveto
-12 f0
-( Should the World Fail to Fall Apart ) show
-298.1 214.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 214.9 moveto
-12 f0
-(1235) show
-379.4 214.9 moveto
-12 f0
-( ) show
-298.1 201.6 moveto
-12 f2
-(See also: ) show
-344.7 201.6 moveto
-12 f0
-(gothic.acs.csulb.edu) show
-441.6 201.6 moveto
-12 f0
-( ) show
-298.1 188.3 moveto
-12 f2
-(See also: ) show
-344.7 188.3 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 188.3 moveto
-12 f0
-( ) show
-18.1 175.6 moveto
-3.3 3.3 c  fill 
-31.5 167.5 moveto
-12 f1
-(My Bloody Valentine) show
-140.1 167.5 moveto
-12 f0
-( ) show
-31.5 154.2 moveto
-12 f2
-(1988:) show
-59.4 154.2 moveto
-12 f0
-( Isn't Anything ) show
-31.5 140.9 moveto
-12 f2
-(1991:) show
-59.4 140.9 moveto
-12 f0
-( Loveless ) show
-299.1 168 moveto
-12 f2
-(UBL Card: ) show
-356.4 168 moveto
-12 f0
-(1912) show
-380.4 168 moveto
-12 f0
-( ) show
-18.1 128.2 moveto
-3.3 3.3 c  fill 
-31.5 120.1 moveto
-12 f1
-(My Life with the Thrill Kill Kult) show
-198.8 120.1 moveto
-12 f0
-( ) show
-31.5 106.8 moveto
-12 f2
-(1988:) show
-59.4 106.8 moveto
-12 f0
-( I See Good Spirits and I See Bad Spirits ) show
-31.5 93.5 moveto
-12 f2
-(1989:) show
-59.4 93.5 moveto
-12 f0
-( K00Ler than Jesus ) show
-31.5 80.2 moveto
-12 f2
-(1990:) show
-59.4 80.2 moveto
-12 f0
-( Confessions of a Knife... ) show
-302.9 120.6 moveto
-12 f2
-(UBL Card: ) show
-360.2 120.6 moveto
-12 f0
-(3478) show
-384.2 120.6 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 19 19
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1990:) show
-59.4 709.2 moveto
-12 f0
-( Swine & Roses / Naive \(KMFDM\) ) show
-233.7 709.2 moveto
-12 f2
-(\(single\)) show
-270.3 709.2 moveto
-12 f0
-( ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Neither/Neither World) show
-148.4 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1994:) show
-59.4 675.1 moveto
-12 f0
-( Tales of True Crime ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(Neotek) show
-67.4 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1995:) show
-59.4 641 moveto
-12 f0
-( Brain over Muscle ) show
-18.1 628.3 moveto
-3.3 3.3 c  fill 
-31.5 620.2 moveto
-12 f1
-(New Fast Automatic Daffodils) show
-185.8 620.2 moveto
-12 f0
-( ) show
-31.5 606.9 moveto
-12 f2
-(1991:) show
-59.4 606.9 moveto
-12 f0
-( Pigeonhole ) show
-31.5 593.6 moveto
-12 f2
-(1992:) show
-59.4 593.6 moveto
-12 f0
-( Bong ) show
-18.1 580.9 moveto
-3.3 3.3 c  fill 
-31.5 572.8 moveto
-12 f1
-(New Order) show
-89.1 572.8 moveto
-12 f0
-( ) show
-31.5 559.5 moveto
-12 f2
-(1981:) show
-59.4 559.5 moveto
-12 f0
-( Movement ) show
-31.5 546.2 moveto
-12 f2
-(1981:) show
-59.4 546.2 moveto
-12 f0
-( Temptation / Hurt ) show
-152 546.2 moveto
-12 f2
-(\(single\)) show
-188.6 546.2 moveto
-12 f0
-( ) show
-31.5 532.9 moveto
-12 f2
-(1982:) show
-59.4 532.9 moveto
-12 f0
-( Factus 8 ) show
-31.5 519.6 moveto
-12 f2
-(1984:) show
-59.4 519.6 moveto
-12 f0
-( Power, Corruption, and Lies ) show
-31.5 506.3 moveto
-12 f2
-(1984:) show
-59.4 506.3 moveto
-12 f0
-( Blue Monday ) show
-131 506.3 moveto
-12 f2
-(\(single\)) show
-167.6 506.3 moveto
-12 f0
-( ) show
-31.5 493 moveto
-12 f2
-(1985:) show
-59.4 493 moveto
-12 f0
-( The Perfect Kiss ) show
-145.3 493 moveto
-12 f2
-(\(single\)) show
-181.9 493 moveto
-12 f0
-( ) show
-31.5 479.7 moveto
-12 f2
-(1985:) show
-59.4 479.7 moveto
-12 f0
-( Confusion ) show
-115.4 479.7 moveto
-12 f2
-(\(single\)) show
-152 479.7 moveto
-12 f0
-( ) show
-31.5 466.4 moveto
-12 f2
-(1985:) show
-59.4 466.4 moveto
-12 f0
-( Low Life ) show
-31.5 453.1 moveto
-12 f2
-(1983-5:) show
-69.4 453.1 moveto
-12 f0
-( various singles ) show
-31.5 439.8 moveto
-12 f2
-(1986:) show
-59.4 439.8 moveto
-12 f0
-( Brotherhood ) show
-298.1 573.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 573.3 moveto
-12 f0
-(1126) show
-379.4 573.3 moveto
-12 f0
-( ) show
-298.1 560 moveto
-12 f2
-(See also: ) show
-344.7 560 moveto
-12 f0
-(topquark.cecer.army.mil) show
-462.3 560 moveto
-12 f0
-( ) show
-18.1 427.1 moveto
-3.3 3.3 c  fill 
-31.5 419 moveto
-12 f1
-(Nine Inch Nails) show
-110.8 419 moveto
-12 f0
-( ) show
-31.5 405.7 moveto
-12 f2
-(1989:) show
-59.4 405.7 moveto
-12 f0
-( Pretty Hate Machine ) show
-31.5 392.4 moveto
-12 f2
-(1989:) show
-59.4 392.4 moveto
-12 f0
-( Head Like a Hole ) show
-150.3 392.4 moveto
-12 f2
-(\(remixes\)) show
-195.6 392.4 moveto
-12 f0
-( ) show
-31.5 379.1 moveto
-12 f2
-(1990:) show
-59.4 379.1 moveto
-12 f0
-( Sin ) show
-81.4 379.1 moveto
-12 f2
-(\(remixes\)) show
-126.7 379.1 moveto
-12 f0
-( ) show
-31.5 365.8 moveto
-12 f2
-(1992:) show
-59.4 365.8 moveto
-12 f0
-( Broken ) show
-100.7 365.8 moveto
-12 f2
-(\(EP\)) show
-123.3 365.8 moveto
-12 f0
-( ) show
-31.5 352.5 moveto
-12 f2
-(1992:) show
-59.4 352.5 moveto
-12 f0
-( Fixed ) show
-92.7 352.5 moveto
-12 f2
-(\(remixes\)) show
-138 352.5 moveto
-12 f0
-( ) show
-31.5 339.2 moveto
-12 f2
-(1994:) show
-59.4 339.2 moveto
-12 f0
-( March of the Pigs ) show
-151 339.2 moveto
-12 f2
-(\(EP\)) show
-173.6 339.2 moveto
-12 f0
-( ) show
-31.5 325.9 moveto
-12 f2
-(1994:) show
-59.4 325.9 moveto
-12 f0
-( The Downward Spiral ) show
-31.5 312.6 moveto
-12 f2
-(1994:) show
-59.4 312.6 moveto
-12 f0
-( Closer to God ) show
-132.7 312.6 moveto
-12 f2
-(\(EP\)) show
-155.3 312.6 moveto
-12 f0
-( ) show
-31.5 299.3 moveto
-12 f2
-(1994:) show
-59.4 299.3 moveto
-12 f0
-( Closer \(Further Away\) ) show
-174.7 299.3 moveto
-12 f2
-(\(EP\)) show
-197.3 299.3 moveto
-12 f0
-( ) show
-31.5 286 moveto
-12 f2
-(1994:) show
-59.4 286 moveto
-12 f0
-( Further Down the Spiral ) show
-182.3 286 moveto
-12 f2
-(\(remixes\)) show
-227.6 286 moveto
-12 f0
-( ) show
-298.1 419.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 419.5 moveto
-12 f0
-(1046) show
-379.4 419.5 moveto
-12 f0
-( ) show
-298.1 406.2 moveto
-12 f2
-(See also: ) show
-344.7 406.2 moveto
-12 f0
-(www.scri.fsu.edu) show
-429 406.2 moveto
-12 f0
-( ) show
-298.1 392.9 moveto
-12 f2
-(See also: ) show
-344.7 392.9 moveto
-12 f0
-(metaverse.com) show
-417 392.9 moveto
-12 f0
-( ) show
-18.1 273.3 moveto
-3.3 3.3 c  fill 
-31.5 265.2 moveto
-12 f1
-(Nirvana) show
-73.5 265.2 moveto
-12 f0
-( ) show
-31.5 251.9 moveto
-12 f2
-(1991:) show
-59.4 251.9 moveto
-12 f0
-( Nevermind ) show
-298.1 265.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 265.7 moveto
-12 f0
-(1052) show
-379.4 265.7 moveto
-12 f0
-( ) show
-298.1 252.4 moveto
-12 f2
-(See also: ) show
-344.7 252.4 moveto
-12 f0
-(www.ludd.luth.se) show
-429.6 252.4 moveto
-12 f0
-( ) show
-298.1 239.1 moveto
-12 f2
-(See also: ) show
-344.7 239.1 moveto
-12 f0
-(home.earthlink.net) show
-434.7 239.1 moveto
-12 f0
-( ) show
-18.1 226.4 moveto
-3.3 3.3 c  fill 
-31.5 218.3 moveto
-12 f1
-(Nitzer Ebb) show
-87.8 218.3 moveto
-12 f0
-( ) show
-31.5 205 moveto
-12 f2
-(1987:) show
-59.4 205 moveto
-12 f0
-( That Total Age ) show
-31.5 191.7 moveto
-12 f2
-(1987:) show
-59.4 191.7 moveto
-12 f0
-( Warsaw Ghetto ) show
-140.3 191.7 moveto
-12 f2
-(\(EP\)) show
-162.9 191.7 moveto
-12 f0
-( ) show
-31.5 178.4 moveto
-12 f2
-(1987:) show
-59.4 178.4 moveto
-12 f0
-( So Bright So Strong ) show
-162.4 178.4 moveto
-12 f2
-(\(remixes\)) show
-207.7 178.4 moveto
-12 f0
-( ) show
-31.5 165.1 moveto
-12 f2
-(1987:) show
-59.4 165.1 moveto
-12 f0
-( Get Clean ) show
-113.7 165.1 moveto
-12 f2
-(\(remixes\)) show
-159 165.1 moveto
-12 f0
-( ) show
-31.5 151.8 moveto
-12 f2
-(1988:) show
-59.4 151.8 moveto
-12 f0
-( Control: I'm Here ) show
-152 151.8 moveto
-12 f2
-(\(single\)) show
-188.6 151.8 moveto
-12 f0
-( ) show
-31.5 138.5 moveto
-12 f2
-(1989:) show
-59.4 138.5 moveto
-12 f0
-( Hearts and Minds ) show
-150.7 138.5 moveto
-12 f2
-(\(single\)) show
-187.3 138.5 moveto
-12 f0
-( ) show
-31.5 125.2 moveto
-12 f2
-(1989:) show
-59.4 125.2 moveto
-12 f0
-( Belief ) show
-31.5 111.9 moveto
-12 f2
-(1990:) show
-59.4 111.9 moveto
-12 f0
-( Showtime ) show
-31.5 98.6 moveto
-12 f2
-(1991:) show
-59.4 98.6 moveto
-12 f0
-( I Give to You ) show
-131.7 98.6 moveto
-12 f2
-(\(single\)) show
-168.3 98.6 moveto
-12 f0
-( ) show
-31.5 85.3 moveto
-12 f2
-(1991:) show
-59.4 85.3 moveto
-12 f0
-( As Is ) show
-90.3 85.3 moveto
-12 f2
-(\(single\)) show
-126.9 85.3 moveto
-12 f0
-( ) show
-298.1 218.8 moveto
-12 f2
-(UBL Card: ) show
-355.4 218.8 moveto
-12 f0
-(1164) show
-379.4 218.8 moveto
-12 f0
-( ) show
-298.1 205.5 moveto
-12 f2
-(See also: ) show
-344.7 205.5 moveto
-12 f0
-(www.eecs.nwu.edu) show
-438.3 205.5 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 20 20
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1991:) show
-59.4 709.2 moveto
-12 f0
-( Ebbhead ) show
-31.5 695.9 moveto
-12 f2
-(1991:) show
-59.4 695.9 moveto
-12 f0
-( Godhead ) show
-108.7 695.9 moveto
-12 f2
-(\(EP\)) show
-131.3 695.9 moveto
-12 f0
-( ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(No Doubt) show
-81.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1995:) show
-59.4 661.8 moveto
-12 f0
-( Tragic Kingdom ) show
-18.1 649.1 moveto
-3.3 3.3 c  fill 
-31.5 641 moveto
-12 f1
-(Noise Unit) show
-85.1 641 moveto
-12 f0
-( ) show
-31.5 627.7 moveto
-12 f2
-(1989:) show
-59.4 627.7 moveto
-12 f0
-( Grinding Into Emptiness ) show
-18.1 615 moveto
-3.3 3.3 c  fill 
-31.5 606.9 moveto
-12 f1
-(Nosferatu) show
-82.1 606.9 moveto
-12 f0
-( ) show
-31.5 593.6 moveto
-12 f2
-(1993:) show
-59.4 593.6 moveto
-12 f0
-( Rise ) show
-18.1 580.9 moveto
-3.3 3.3 c  fill 
-31.5 572.8 moveto
-12 f1
-(Numan, Gary) show
-102.1 572.8 moveto
-12 f0
-( ) show
-31.5 559.5 moveto
-12 f2
-(1978:) show
-59.4 559.5 moveto
-12 f0
-( Tubeway Army ) show
-31.5 546.2 moveto
-12 f2
-(1978:) show
-59.4 546.2 moveto
-12 f0
-( The Plan ) show
-31.5 532.9 moveto
-12 f2
-(1979:) show
-59.4 532.9 moveto
-12 f0
-( Replicas ) show
-31.5 519.6 moveto
-12 f2
-(1979:) show
-59.4 519.6 moveto
-12 f0
-( The Pleasure Principle ) show
-31.5 506.3 moveto
-12 f2
-(1980:) show
-59.4 506.3 moveto
-12 f0
-( Telekon ) show
-31.5 493 moveto
-12 f2
-(1981:) show
-59.4 493 moveto
-12 f0
-( Warriors ) show
-31.5 479.7 moveto
-12 f2
-(1981:) show
-59.4 479.7 moveto
-12 f0
-( Dance ) show
-31.5 466.4 moveto
-12 f2
-(1982:) show
-59.4 466.4 moveto
-12 f0
-( I, Assassin ) show
-31.5 453.1 moveto
-12 f2
-(1984:) show
-59.4 453.1 moveto
-12 f0
-( White Noise ) show
-125.7 453.1 moveto
-12 f2
-(\(double live\)) show
-186.6 453.1 moveto
-12 f0
-( ) show
-31.5 439.8 moveto
-12 f2
-(1987:) show
-59.4 439.8 moveto
-12 f0
-( Ghost ) show
-94 439.8 moveto
-12 f2
-(\(double live\)) show
-154.9 439.8 moveto
-12 f0
-( ) show
-298.1 573.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 573.3 moveto
-12 f0
-(1409) show
-379.4 573.3 moveto
-12 f0
-( ) show
-18.1 427.1 moveto
-3.3 3.3 c  fill 
-31.5 419 moveto
-12 f1
-(Offspring) show
-81.5 419 moveto
-12 f0
-( ) show
-31.5 405.7 moveto
-12 f2
-(1994:) show
-59.4 405.7 moveto
-12 f0
-( Smash ) show
-18.1 393 moveto
-3.3 3.3 c  fill 
-31.5 384.9 moveto
-12 f1
-(Oingo Boingo) show
-101.8 384.9 moveto
-12 f0
-( ) show
-31.5 371.6 moveto
-12 f2
-(1980:) show
-59.4 371.6 moveto
-12 f0
-( Forbidden Zone ) show
-142.3 371.6 moveto
-12 f2
-(\(soundtrack\)) show
-203.6 371.6 moveto
-12 f0
-( ) show
-31.5 358.3 moveto
-12 f2
-(1981:) show
-59.4 358.3 moveto
-12 f0
-( Only a Lad ) show
-31.5 345 moveto
-12 f2
-(1983:) show
-59.4 345 moveto
-12 f0
-( Good for Your Soul ) show
-31.5 331.7 moveto
-12 f2
-(1986:) show
-59.4 331.7 moveto
-12 f0
-( Dead Man's Party ) show
-31.5 318.4 moveto
-12 f2
-(1987:) show
-59.4 318.4 moveto
-12 f0
-( Nothing to Fear ) show
-298.1 385.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 385.4 moveto
-12 f0
-(1089) show
-379.4 385.4 moveto
-12 f0
-( ) show
-298.1 372.1 moveto
-12 f2
-(See also: ) show
-344.7 372.1 moveto
-12 f0
-(rhino.harvard.edu) show
-430 372.1 moveto
-12 f0
-( ) show
-18.1 305.7 moveto
-3.3 3.3 c  fill 
-31.5 297.6 moveto
-12 f1
-(Orb, The) show
-78.8 297.6 moveto
-12 f0
-( ) show
-31.5 284.3 moveto
-12 f2
-(1991:) show
-59.4 284.3 moveto
-12 f0
-( The Orb's Adventures Beyond the Ultraworld ) show
-31.5 271 moveto
-12 f2
-(1991:) show
-59.4 271 moveto
-12 f0
-( Aubrey Mixes, the Ultraworld Excursions ) show
-31.5 257.7 moveto
-12 f2
-(1991:) show
-59.4 257.7 moveto
-12 f0
-( Little Fluffy Clouds ) show
-161.4 257.7 moveto
-12 f2
-(\(EP\)) show
-184 257.7 moveto
-12 f0
-( ) show
-31.5 244.4 moveto
-12 f2
-(1992:) show
-59.4 244.4 moveto
-12 f0
-( U.F.Orb ) show
-31.5 231.1 moveto
-12 f2
-(1993:) show
-59.4 231.1 moveto
-12 f0
-( live 93 ) show
-98.4 231.1 moveto
-12 f2
-(\(double live\)) show
-159.3 231.1 moveto
-12 f0
-( ) show
-31.5 217.8 moveto
-12 f2
-(1994:) show
-59.4 217.8 moveto
-12 f0
-( Pomme Fritz ) show
-298.1 298.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 298.1 moveto
-12 f0
-(1121) show
-379.4 298.1 moveto
-12 f0
-( ) show
-298.1 284.8 moveto
-12 f2
-(See also: ) show
-344.7 284.8 moveto
-12 f0
-(www.hyperlink.com) show
-443.3 284.8 moveto
-12 f0
-( ) show
-298.1 271.5 moveto
-12 f2
-(See also: ) show
-344.7 271.5 moveto
-12 f0
-(www.phlab.missouri.edu) show
-465 271.5 moveto
-12 f0
-( ) show
-298.1 258.2 moveto
-12 f2
-(See also: ) show
-344.7 258.2 moveto
-12 f0
-(rt66.com) show
-387.6 258.2 moveto
-12 f0
-( ) show
-18.1 205.1 moveto
-3.3 3.3 c  fill 
-31.5 197 moveto
-12 f1
-(Orbital) show
-69.5 197 moveto
-12 f0
-( ) show
-31.5 183.7 moveto
-12 f2
-(1993:) show
-59.4 183.7 moveto
-12 f0
-( Orbital 2 ) show
-298.1 197.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 197.5 moveto
-12 f0
-(2049) show
-379.4 197.5 moveto
-12 f0
-( ) show
-298.1 184.2 moveto
-12 f2
-(See also: ) show
-344.7 184.2 moveto
-12 f0
-(rt66.com) show
-387.6 184.2 moveto
-12 f0
-( ) show
-18.1 171 moveto
-3.3 3.3 c  fill 
-31.5 162.9 moveto
-12 f1
-(Orchestral Manoeuvers in the Dark) show
-214.8 162.9 moveto
-12 f0
-( ) show
-31.5 149.6 moveto
-12 f2
-(1980:) show
-59.4 149.6 moveto
-12 f0
-( OMD ) show
-93.3 149.6 moveto
-12 f2
-(\(US release\)) show
-153.6 149.6 moveto
-12 f0
-( ) show
-31.5 136.3 moveto
-12 f2
-(1980:) show
-59.4 136.3 moveto
-12 f0
-( OMD ) show
-93.3 136.3 moveto
-12 f2
-(\(UK release\)) show
-155.6 136.3 moveto
-12 f0
-( ) show
-31.5 123 moveto
-12 f2
-(1981:) show
-59.4 123 moveto
-12 f0
-( Bunker Soldiers ) show
-31.5 109.7 moveto
-12 f2
-(1981:) show
-59.4 109.7 moveto
-12 f0
-( Architecture & Morality ) show
-31.5 96.4 moveto
-12 f2
-(1983:) show
-59.4 96.4 moveto
-12 f0
-( Dazzle Ships ) show
-31.5 83.1 moveto
-12 f2
-(1984:) show
-59.4 83.1 moveto
-12 f0
-( Junk Culture ) show
-304.9 163.4 moveto
-12 f2
-(UBL Card: ) show
-362.2 163.4 moveto
-12 f0
-(5370) show
-386.2 163.4 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 21 21
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1985:) show
-59.4 709.2 moveto
-12 f0
-( Crush ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Oxygiene 23) show
-94.5 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1995:) show
-59.4 675.1 moveto
-12 f0
-( Blue ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(187 Calm) show
-80.4 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1995:) show
-59.4 641 moveto
-12 f0
-( One Eighty Seven Calm ) show
-181.7 641 moveto
-12 f2
-(\(EP\)) show
-204.3 641 moveto
-12 f0
-( ) show
-18.1 628.3 moveto
-3.3 3.3 c  fill 
-31.5 620.2 moveto
-12 f1
-(1000 Homo DJs) show
-112.1 620.2 moveto
-12 f0
-( ) show
-31.5 606.9 moveto
-12 f2
-(1990:) show
-59.4 606.9 moveto
-12 f0
-( Supernaut ) show
-114 606.9 moveto
-12 f2
-(\(EP\)) show
-136.6 606.9 moveto
-12 f0
-( ) show
-18.1 594.2 moveto
-3.3 3.3 c  fill 
-31.5 586.1 moveto
-12 f1
-(Opus III) show
-75.8 586.1 moveto
-12 f0
-( ) show
-31.5 572.8 moveto
-12 f2
-(1991:) show
-59.4 572.8 moveto
-12 f0
-( Mind Fruit ) show
-31.5 559.5 moveto
-12 f2
-(1994:) show
-59.4 559.5 moveto
-12 f0
-( Guru Mother ) show
-18.1 546.8 moveto
-3.3 3.3 c  fill 
-31.5 538.7 moveto
-12 f1
-(Pain Teens) show
-87.8 538.7 moveto
-12 f0
-( ) show
-31.5 525.4 moveto
-12 f2
-(1990:) show
-59.4 525.4 moveto
-12 f0
-( Born in Blood / Case Histories ) show
-31.5 512.1 moveto
-12 f2
-(1992:) show
-59.4 512.1 moveto
-12 f0
-( Stimulation Festival ) show
-31.5 498.8 moveto
-12 f2
-(1993:) show
-59.4 498.8 moveto
-12 f0
-( Destroy Me, Lover ) show
-31.5 485.5 moveto
-12 f2
-(1995:) show
-59.4 485.5 moveto
-12 f0
-( Beast of Dreams ) show
-18.1 472.8 moveto
-3.3 3.3 c  fill 
-31.5 464.7 moveto
-12 f1
-(Paralysed Age) show
-105.1 464.7 moveto
-12 f0
-( ) show
-31.5 451.4 moveto
-12 f2
-(1994:) show
-59.4 451.4 moveto
-12 f0
-( Nocturne ) show
-18.1 438.7 moveto
-3.3 3.3 c  fill 
-31.5 430.6 moveto
-12 f1
-(Pigface) show
-68.8 430.6 moveto
-12 f0
-( ) show
-31.5 417.3 moveto
-12 f2
-(1990:) show
-59.4 417.3 moveto
-12 f0
-( Gub ) show
-298.1 431.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 431.1 moveto
-12 f0
-(1165) show
-379.4 431.1 moveto
-12 f0
-( ) show
-298.1 417.8 moveto
-12 f2
-(See also: ) show
-344.7 417.8 moveto
-12 f0
-(www.eecs.nwu.edu) show
-438.3 417.8 moveto
-12 f0
-( ) show
-18.1 404.6 moveto
-3.3 3.3 c  fill 
-31.5 396.5 moveto
-12 f1
-(Pink Floyd) show
-87.8 396.5 moveto
-12 f0
-( ) show
-31.5 383.2 moveto
-12 f2
-(1973:) show
-59.4 383.2 moveto
-12 f0
-( Dark Side of the Moon ) show
-31.5 369.9 moveto
-12 f2
-(1975:) show
-59.4 369.9 moveto
-12 f0
-( Wish You were Here ) show
-31.5 356.6 moveto
-12 f2
-(1978:) show
-59.4 356.6 moveto
-12 f0
-( The Wall ) show
-110.3 356.6 moveto
-12 f2
-(\(double soundtrack\)) show
-207.2 356.6 moveto
-12 f0
-( ) show
-31.5 343.3 moveto
-12 f2
-(1981:) show
-59.4 343.3 moveto
-12 f0
-( A Collection of Great Dance Songs ) show
-235.7 343.3 moveto
-12 f2
-(\(comp\)) show
-269.6 343.3 moveto
-12 f0
-( ) show
-31.5 330 moveto
-12 f2
-(1995:) show
-59.4 330 moveto
-12 f0
-( A Saucerful of Pink: a Tribute ) show
-211 330 moveto
-12 f2
-(\(double, various\)) show
-293.6 330 moveto
-12 f0
-( ) show
-302.4 397 moveto
-12 f2
-(UBL Card: ) show
-359.7 397 moveto
-12 f0
-(1008) show
-383.7 397 moveto
-12 f0
-( ) show
-18.1 317.3 moveto
-3.3 3.3 c  fill 
-31.5 309.2 moveto
-12 f1
-(Polygon Window) show
-119.1 309.2 moveto
-12 f0
-( ) show
-31.5 295.9 moveto
-12 f2
-(1993:) show
-59.4 295.9 moveto
-12 f0
-( Surfing on Sine Waves ) show
-298.1 309.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 309.7 moveto
-12 f0
-(5279) show
-379.4 309.7 moveto
-12 f0
-( ) show
-18.1 283.2 moveto
-3.3 3.3 c  fill 
-31.5 275.1 moveto
-12 f1
-(Police) show
-62.1 275.1 moveto
-12 f0
-( ) show
-31.5 261.8 moveto
-12 f2
-(1979:) show
-59.4 261.8 moveto
-12 f0
-( Outlandos D'Amour ) show
-31.5 248.5 moveto
-12 f2
-(1980:) show
-59.4 248.5 moveto
-12 f0
-( Ghost in the Machine ) show
-31.5 235.2 moveto
-12 f2
-(1981:) show
-59.4 235.2 moveto
-12 f0
-( Zenyatta Mondatta ) show
-31.5 221.9 moveto
-12 f2
-(1983:) show
-59.4 221.9 moveto
-12 f0
-( Synchronicity ) show
-306.4 275.6 moveto
-12 f2
-(UBL Card: ) show
-363.7 275.6 moveto
-12 f0
-(1172) show
-387.7 275.6 moveto
-12 f0
-( ) show
-18.1 209.2 moveto
-3.3 3.3 c  fill 
-31.5 201.1 moveto
-12 f1
-(Poe) show
-50.1 201.1 moveto
-12 f0
-( ) show
-31.5 187.8 moveto
-12 f2
-(1995:) show
-59.4 187.8 moveto
-12 f0
-( Hello ) show
-18.1 175.1 moveto
-3.3 3.3 c  fill 
-31.5 167 moveto
-12 f1
-(Pop, Iggy) show
-80.1 167 moveto
-12 f0
-( ) show
-31.5 153.7 moveto
-12 f2
-(1977:) show
-59.4 153.7 moveto
-12 f0
-( Lust for Life ) show
-298.1 167.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 167.5 moveto
-12 f0
-(4345) show
-379.4 167.5 moveto
-12 f0
-( ) show
-18.1 141 moveto
-3.3 3.3 c  fill 
-31.5 132.9 moveto
-12 f1
-(Powerman 5000) show
-113.8 132.9 moveto
-12 f0
-( ) show
-31.5 119.6 moveto
-12 f2
-(1995:) show
-59.4 119.6 moveto
-12 f0
-( The Blood Splat Rating System ) show
-18.1 106.9 moveto
-3.3 3.3 c  fill 
-31.5 98.8 moveto
-12 f1
-(Powerstation, The) show
-124.8 98.8 moveto
-12 f0
-( ) show
-31.5 85.5 moveto
-12 f2
-(1985:) show
-59.4 85.5 moveto
-12 f0
-( The Powerstation ) show
-306.4 99.3 moveto
-12 f2
-(UBL Card: ) show
-363.7 99.3 moveto
-12 f0
-(1259) show
-387.7 99.3 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 22 22
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.6 moveto
-3.3 3.3 c  fill 
-31.5 708.5 moveto
-12 f1
-(Pram) show
-60.1 708.5 moveto
-12 f0
-( ) show
-31.5 695.2 moveto
-12 f2
-(199?:) show
-59.4 695.2 moveto
-12 f0
-( Iron Lung ) show
-113.7 695.2 moveto
-12 f2
-(\(EP\)) show
-136.3 695.2 moveto
-12 f0
-( ) show
-31.5 681.9 moveto
-12 f2
-(1995:) show
-59.4 681.9 moveto
-12 f0
-( Helium ) show
-31.5 668.6 moveto
-12 f2
-(1995:) show
-59.4 668.6 moveto
-12 f0
-( Sargasso Sea ) show
-18.1 655.9 moveto
-3.3 3.3 c  fill 
-31.5 647.8 moveto
-12 f1
-(Prick) show
-59.4 647.8 moveto
-12 f0
-( ) show
-31.5 634.5 moveto
-12 f2
-(1995:) show
-59.4 634.5 moveto
-12 f0
-( Prick ) show
-298.1 648.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 648.3 moveto
-12 f0
-(3683) show
-379.4 648.3 moveto
-12 f0
-( ) show
-18.1 621.8 moveto
-3.3 3.3 c  fill 
-31.5 613.7 moveto
-12 f1
-(Primus) show
-68.8 613.7 moveto
-12 f0
-( ) show
-31.5 600.4 moveto
-12 f2
-(1991:) show
-59.4 600.4 moveto
-12 f0
-( Sailing on the Seas of Cheese ) show
-298.1 614.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 614.2 moveto
-12 f0
-(1055) show
-379.4 614.2 moveto
-12 f0
-( ) show
-18.1 587.7 moveto
-3.3 3.3 c  fill 
-31.5 579.6 moveto
-12 f1
-(Project Pitchfork) show
-120.4 579.6 moveto
-12 f0
-( ) show
-31.5 566.3 moveto
-12 f2
-(1991:) show
-59.4 566.3 moveto
-12 f0
-( Dhyani ) show
-18.1 553.6 moveto
-3.3 3.3 c  fill 
-31.5 545.5 moveto
-12 f1
-(Propaganda) show
-94.1 545.5 moveto
-12 f0
-( ) show
-31.5 532.2 moveto
-12 f2
-(1985:) show
-59.4 532.2 moveto
-12 f0
-( A Secret Wish, US version ) show
-31.5 518.9 moveto
-12 f2
-(1985:) show
-59.4 518.9 moveto
-12 f0
-( A Secret Wish, UK version ) show
-197 518.9 moveto
-12 f2
-(\(remixes\)) show
-242.3 518.9 moveto
-12 f0
-( ) show
-31.5 505.6 moveto
-12 f2
-(1985:) show
-59.4 505.6 moveto
-12 f0
-( p:machinery \(polish / passive\) / Frozen Faces) show
-31.5 492.3 moveto
-12 f2
-(\(single\)) show
-68.1 492.3 moveto
-12 f0
-( ) show
-31.5 479 moveto
-12 f2
-(1985:) show
-59.4 479 moveto
-12 f0
-( Duel / Jewel ) show
-125.3 479 moveto
-12 f2
-(\(single\)) show
-161.9 479 moveto
-12 f0
-( ) show
-31.5 465.7 moveto
-12 f2
-(1985:) show
-59.4 465.7 moveto
-12 f0
-( Wishful Thinking ) show
-151 465.7 moveto
-12 f2
-(\(remixes\)) show
-196.3 465.7 moveto
-12 f0
-( ) show
-31.5 452.4 moveto
-12 f2
-(1990:) show
-59.4 452.4 moveto
-12 f0
-( Heaven Give Me Words ) show
-182.3 452.4 moveto
-12 f2
-(\(EP\)) show
-204.9 452.4 moveto
-12 f0
-( ) show
-31.5 439.1 moveto
-12 f2
-(1995:) show
-59.4 439.1 moveto
-12 f0
-( p:machinery t-empo remix ) show
-193.3 439.1 moveto
-12 f2
-(\(single\)) show
-229.9 439.1 moveto
-12 f0
-( ) show
-298.1 546 moveto
-12 f2
-(UBL Card: ) show
-355.4 546 moveto
-12 f0
-(4636) show
-379.4 546 moveto
-12 f0
-( ) show
-298.1 532.7 moveto
-12 f2
-(See also: ) show
-344.7 532.7 moveto
-12 f0
-(rt66.com) show
-387.6 532.7 moveto
-12 f0
-( ) show
-298.1 519.4 moveto
-12 f2
-(See also: ) show
-344.7 519.4 moveto
-12 f0
-(hcl.chass.ncsu.edu) show
-433.6 519.4 moveto
-12 f0
-( ) show
-18.1 426.4 moveto
-3.3 3.3 c  fill 
-31.5 418.3 moveto
-12 f1
-(Prophetess, The) show
-113.4 418.3 moveto
-12 f0
-( ) show
-31.5 405 moveto
-12 f2
-(1993:) show
-59.4 405 moveto
-12 f0
-( The Prophetess ) show
-18.1 392.3 moveto
-3.3 3.3 c  fill 
-31.5 384.2 moveto
-12 f1
-(Public Image Limited) show
-142.8 384.2 moveto
-12 f0
-( ) show
-31.5 370.9 moveto
-12 f2
-(1985:) show
-59.4 370.9 moveto
-12 f0
-( Album ) show
-18.1 358.2 moveto
-3.3 3.3 c  fill 
-31.5 350.1 moveto
-12 f1
-(Rage Against the Machine) show
-166.4 350.1 moveto
-12 f0
-( ) show
-31.5 336.8 moveto
-12 f2
-(1992:) show
-59.4 336.8 moveto
-12 f0
-( Rage Against the Machine ) show
-298.1 350.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 350.6 moveto
-12 f0
-(1424) show
-379.4 350.6 moveto
-12 f0
-( ) show
-18.1 324.1 moveto
-3.3 3.3 c  fill 
-31.5 316 moveto
-12 f1
-(Romeo Void) show
-95.1 316 moveto
-12 f0
-( ) show
-31.5 302.7 moveto
-12 f2
-(1981:) show
-59.4 302.7 moveto
-12 f0
-( Never Say Never / Present Tense ) show
-224.3 302.7 moveto
-12 f2
-(\(single\)) show
-260.9 302.7 moveto
-12 f0
-( ) show
-18.1 290 moveto
-3.3 3.3 c  fill 
-31.5 281.9 moveto
-12 f1
-(Blaine Reininger) show
-117.8 281.9 moveto
-12 f0
-( ) show
-31.5 268.6 moveto
-12 f2
-(1989:) show
-59.4 268.6 moveto
-12 f0
-( Expatriate Journals ) show
-18.1 255.9 moveto
-3.3 3.3 c  fill 
-31.5 247.8 moveto
-12 f1
-(Red Aunts) show
-85.8 247.8 moveto
-12 f0
-( ) show
-31.5 234.5 moveto
-12 f2
-(1993:) show
-59.4 234.5 moveto
-12 f0
-( Drag ) show
-31.5 221.2 moveto
-12 f2
-(1994:) show
-59.4 221.2 moveto
-12 f0
-( Bad Motherfucker 400-Z ) show
-31.5 207.9 moveto
-12 f2
-(1995:) show
-59.4 207.9 moveto
-12 f0
-( #1 Chicken ) show
-306 248.3 moveto
-12 f2
-(UBL Card: ) show
-363.3 248.3 moveto
-12 f0
-(4619) show
-387.3 248.3 moveto
-12 f0
-( ) show
-18.1 195.2 moveto
-3.3 3.3 c  fill 
-31.5 187.1 moveto
-12 f1
-(Re-Flex) show
-71.4 187.1 moveto
-12 f0
-( ) show
-31.5 173.8 moveto
-12 f2
-(1983:) show
-59.4 173.8 moveto
-12 f0
-( The Politics of Dancing / Re-Flex It ) show
-238 173.8 moveto
-12 f2
-(\(single\)) show
-274.6 173.8 moveto
-12 f0
-( ) show
-18.1 161.1 moveto
-3.3 3.3 c  fill 
-31.5 153 moveto
-12 f1
-(Revolting Cocks) show
-115.1 153 moveto
-12 f0
-( ) show
-31.5 139.7 moveto
-12 f2
-(1986:) show
-59.4 139.7 moveto
-12 f0
-( Big Sexy Land ) show
-31.5 126.4 moveto
-12 f2
-(1988:) show
-59.4 126.4 moveto
-12 f0
-( You Goddamned Son of a Bitch ) show
-219.7 126.4 moveto
-12 f2
-(\(double live\)) show
-280.6 126.4 moveto
-12 f0
-( ) show
-31.5 113.1 moveto
-12 f2
-(1989:) show
-59.4 113.1 moveto
-12 f0
-( Stainless Steel Providers ) show
-184 113.1 moveto
-12 f2
-(\(EP\)) show
-206.6 113.1 moveto
-12 f0
-( ) show
-31.5 99.8 moveto
-12 f2
-(1990:) show
-59.4 99.8 moveto
-12 f0
-( Beers, Steers, and Queers ) show
-31.5 86.5 moveto
-12 f2
-(1993:) show
-59.4 86.5 moveto
-12 f0
-( Linger Ficken' Good ) show
-303 153.5 moveto
-12 f2
-(UBL Card: ) show
-360.3 153.5 moveto
-12 f0
-(1100) show
-384.3 153.5 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 23 23
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.6 moveto
-3.3 3.3 c  fill 
-31.5 708.5 moveto
-12 f1
-(Ridgway, Stan) show
-106.1 708.5 moveto
-12 f0
-( ) show
-31.5 695.2 moveto
-12 f2
-(1986:) show
-59.4 695.2 moveto
-12 f0
-( The Big Heat ) show
-298.1 709 moveto
-12 f2
-(UBL Card: ) show
-355.4 709 moveto
-12 f0
-(2904) show
-379.4 709 moveto
-12 f0
-( ) show
-18.1 682.5 moveto
-3.3 3.3 c  fill 
-31.5 674.4 moveto
-12 f1
-(Rosemarys, The) show
-114.1 674.4 moveto
-12 f0
-( ) show
-31.5 661.1 moveto
-12 f2
-(1993:) show
-59.4 661.1 moveto
-12 f0
-( Providence ) show
-18.1 648.4 moveto
-3.3 3.3 c  fill 
-31.5 640.3 moveto
-12 f1
-(Rosetta Stone) show
-101.8 640.3 moveto
-12 f0
-( ) show
-31.5 627 moveto
-12 f2
-(1993:) show
-59.4 627 moveto
-12 f0
-( Adrenaline ) show
-31.5 613.7 moveto
-12 f2
-(1995:) show
-59.4 613.7 moveto
-12 f0
-( The Tyrrany of Inaction ) show
-18.1 601 moveto
-3.3 3.3 c  fill 
-31.5 592.9 moveto
-12 f1
-(Ruby) show
-59.5 592.9 moveto
-12 f0
-( ) show
-31.5 579.6 moveto
-12 f2
-(1995:) show
-59.4 579.6 moveto
-12 f0
-( Salt Peter ) show
-18.1 566.9 moveto
-3.3 3.3 c  fill 
-31.5 558.8 moveto
-12 f1
-(Rump) show
-63.5 558.8 moveto
-12 f0
-( ) show
-31.5 545.5 moveto
-12 f2
-(1994:) show
-59.4 545.5 moveto
-12 f0
-( Hating Brenda ) show
-18.1 532.8 moveto
-3.3 3.3 c  fill 
-31.5 524.7 moveto
-12 f1
-(Rush) show
-58.1 524.7 moveto
-12 f0
-( ) show
-31.5 511.4 moveto
-12 f2
-(1984:) show
-59.4 511.4 moveto
-12 f0
-( Grace Under Pressure ) show
-298.1 525.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 525.2 moveto
-12 f0
-(1039) show
-379.4 525.2 moveto
-12 f0
-( ) show
-18.1 498.7 moveto
-3.3 3.3 c  fill 
-31.5 490.6 moveto
-12 f1
-(Sandoz) show
-68.8 490.6 moveto
-12 f0
-( ) show
-31.5 477.3 moveto
-12 f2
-(1993:) show
-59.4 477.3 moveto
-12 f0
-( Digital Lifeforms ) show
-18.1 464.6 moveto
-3.3 3.3 c  fill 
-31.5 456.5 moveto
-12 f1
-(Scatterbrain) show
-96.1 456.5 moveto
-12 f0
-( ) show
-31.5 443.2 moveto
-12 f2
-(1990:) show
-59.4 443.2 moveto
-12 f0
-( Here Comes Trouble ) show
-18.1 430.5 moveto
-3.3 3.3 c  fill 
-31.5 422.4 moveto
-12 f1
-(Scar Tissue) show
-90.5 422.4 moveto
-12 f0
-( ) show
-31.5 409.1 moveto
-12 f2
-(1995:) show
-59.4 409.1 moveto
-12 f0
-( Scar Tissue ) show
-18.1 396.4 moveto
-3.3 3.3 c  fill 
-31.5 388.3 moveto
-12 f1
-(Scritti Politti) show
-97.8 388.3 moveto
-12 f0
-( ) show
-31.5 375 moveto
-12 f2
-(1985:) show
-59.4 375 moveto
-12 f0
-( Cupid & Psyche ) show
-18.1 362.3 moveto
-3.3 3.3 c  fill 
-31.5 354.2 moveto
-12 f1
-(Severed Heads) show
-107.1 354.2 moveto
-12 f0
-( ) show
-31.5 340.9 moveto
-12 f2
-(1983:) show
-59.4 340.9 moveto
-12 f0
-( Since the Accident ) show
-31.5 327.6 moveto
-12 f2
-(1986:) show
-59.4 327.6 moveto
-12 f0
-( Come Visit the Big Bigot ) show
-31.5 314.3 moveto
-12 f2
-(1987:) show
-59.4 314.3 moveto
-12 f0
-( Bad Mood Guy ) show
-298.1 354.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 354.7 moveto
-12 f0
-(1480) show
-379.4 354.7 moveto
-12 f0
-( ) show
-18.1 301.6 moveto
-3.3 3.3 c  fill 
-31.5 293.5 moveto
-12 f1
-(Sex Gang, Andi) show
-111.8 293.5 moveto
-12 f0
-( ) show
-31.5 280.2 moveto
-12 f2
-(1994:) show
-59.4 280.2 moveto
-12 f0
-( Arco Valley ) show
-18.1 267.5 moveto
-3.3 3.3 c  fill 
-31.5 259.4 moveto
-12 f1
-(Sex Gang Children) show
-129.5 259.4 moveto
-12 f0
-( ) show
-31.5 246.1 moveto
-12 f2
-(1992:) show
-59.4 246.1 moveto
-12 f0
-( Blind ) show
-31.5 232.8 moveto
-12 f2
-(1993:) show
-59.4 232.8 moveto
-12 f0
-( Dieche ) show
-31.5 219.5 moveto
-12 f2
-(1993:) show
-59.4 219.5 moveto
-12 f0
-( Medea ) show
-18.1 206.8 moveto
-3.3 3.3 c  fill 
-31.5 198.7 moveto
-12 f1
-(Shadow Project) show
-112.4 198.7 moveto
-12 f0
-( ) show
-31.5 185.4 moveto
-12 f2
-(1991:) show
-59.4 185.4 moveto
-12 f0
-( Shadow Project ) show
-18.1 172.7 moveto
-3.3 3.3 c  fill 
-31.5 164.6 moveto
-12 f1
-(Sharkbait) show
-82.8 164.6 moveto
-12 f0
-( ) show
-31.5 151.3 moveto
-12 f2
-(1991:) show
-59.4 151.3 moveto
-12 f0
-( Blowtorch Facelift ) show
-31.5 138 moveto
-12 f2
-(1993:) show
-59.4 138 moveto
-12 f0
-( Crushits ) show
-18.1 125.3 moveto
-3.3 3.3 c  fill 
-31.5 117.2 moveto
-12 f1
-(Sheep on Drugs) show
-112.1 117.2 moveto
-12 f0
-( ) show
-31.5 103.9 moveto
-12 f2
-(1993:) show
-59.4 103.9 moveto
-12 f0
-( Greatest Hits ) show
-128.3 103.9 moveto
-12 f2
-(\(comp\)) show
-162.2 103.9 moveto
-12 f0
-( ) show
-31.5 90.6 moveto
-12 f2
-(1995:) show
-59.4 90.6 moveto
-12 f0
-( Suck ) show
-89.4 90.6 moveto
-12 f2
-(\(EP\)) show
-112 90.6 moveto
-12 f0
-( ) show
-18.1 77.9 moveto
-3.3 3.3 c  fill 
-pagelevel restore
-showpage
-%%Page: 24 24
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 716.8 moveto
-3.3 3.3 c  fill 
-31.5 708.7 moveto
-12 f1
-(Shriekback) show
-90.1 708.7 moveto
-12 f0
-( ) show
-31.5 695.4 moveto
-12 f2
-(1982:) show
-59.4 695.4 moveto
-12 f0
-( Tench ) show
-31.5 682.1 moveto
-12 f2
-(1983:) show
-59.4 682.1 moveto
-12 f0
-( Care ) show
-31.5 668.8 moveto
-12 f2
-(1983:) show
-59.4 668.8 moveto
-12 f0
-( Care ) show
-88 668.8 moveto
-12 f2
-(\(Y version\)) show
-140.9 668.8 moveto
-12 f0
-( ) show
-31.5 655.5 moveto
-12 f2
-(1983:) show
-59.4 655.5 moveto
-12 f0
-( Lined Up / Hapax Legomena ) show
-205.3 655.5 moveto
-12 f2
-(\(single\)) show
-241.9 655.5 moveto
-12 f0
-( ) show
-31.5 642.2 moveto
-12 f2
-(1983:) show
-59.4 642.2 moveto
-12 f0
-( Lined Up / My Spine / Accretions /Into Method) show
-31.5 628.9 moveto
-12 f2
-(\(single\)) show
-68.1 628.9 moveto
-12 f0
-( ) show
-31.5 615.6 moveto
-12 f2
-(1983:) show
-59.4 615.6 moveto
-12 f0
-( My Spine / Accretions / Clear Trails ) show
-240 615.6 moveto
-12 f2
-(\(single\)) show
-276.6 615.6 moveto
-12 f0
-( ) show
-31.5 602.3 moveto
-12 f2
-(1983:) show
-59.4 602.3 moveto
-12 f0
-( Sexthinkone / Here Comes My Hand ) show
-243 602.3 moveto
-12 f2
-(\(single\)) show
-279.6 602.3 moveto
-12 f0
-( ) show
-31.5 589 moveto
-12 f2
-(1984:) show
-59.4 589 moveto
-12 f0
-( Jamscience ) show
-120 589 moveto
-12 f2
-(\(UK release\)) show
-182.3 589 moveto
-12 f0
-( ) show
-31.5 575.7 moveto
-12 f2
-(1984:) show
-59.4 575.7 moveto
-12 f0
-( Jamscience ) show
-120 575.7 moveto
-12 f2
-(\(Holland release\)) show
-204.9 575.7 moveto
-12 f0
-( ) show
-31.5 562.4 moveto
-12 f2
-(1984:) show
-59.4 562.4 moveto
-12 f0
-( Knowledge, Power, Truth, and Sex ) show
-31.5 549.1 moveto
-12 f2
-(1984:) show
-59.4 549.1 moveto
-12 f0
-( Mercy Dash ) show
-124.3 549.1 moveto
-12 f2
-(\(picture disc, single\)) show
-223.2 549.1 moveto
-12 f0
-( ) show
-31.5 535.8 moveto
-12 f2
-(1984:) show
-59.4 535.8 moveto
-12 f0
-( Hand on my Heart ) show
-154.3 535.8 moveto
-12 f2
-(\(picture disc, single\)) show
-253.2 535.8 moveto
-12 f0
-( ) show
-31.5 522.5 moveto
-12 f2
-(1985:) show
-59.4 522.5 moveto
-12 f0
-( The Infinite ) show
-122.3 522.5 moveto
-12 f2
-(\(comp\)) show
-156.2 522.5 moveto
-12 f0
-( ) show
-31.5 509.2 moveto
-12 f2
-(1985:) show
-59.4 509.2 moveto
-12 f0
-( Oil and Gold ) show
-31.5 495.9 moveto
-12 f2
-(1985:) show
-59.4 495.9 moveto
-12 f0
-( Fish Below the Ice ) show
-155.7 495.9 moveto
-12 f2
-(\(EP\)) show
-178.3 495.9 moveto
-12 f0
-( ) show
-31.5 482.6 moveto
-12 f2
-(1983-1985:) show
-87.4 482.6 moveto
-12 f0
-( Priests and Kannibals ) show
-197.3 482.6 moveto
-12 f2
-(\(comp\)) show
-231.2 482.6 moveto
-12 f0
-( ) show
-31.5 469.3 moveto
-12 f2
-(1986:) show
-59.4 469.3 moveto
-12 f0
-( Big Night Music ) show
-31.5 456 moveto
-12 f2
-(1986:) show
-59.4 456 moveto
-12 f0
-( Islam Grotto ) show
-126.3 456 moveto
-12 f2
-(\(live boot\)) show
-175.9 456 moveto
-12 f0
-( ) show
-31.5 442.7 moveto
-12 f2
-(1988:) show
-59.4 442.7 moveto
-12 f0
-( Evolution ) show
-112.7 442.7 moveto
-12 f2
-(\(comp\)) show
-146.6 442.7 moveto
-12 f0
-( ) show
-31.5 429.4 moveto
-12 f2
-(1990:) show
-59.4 429.4 moveto
-12 f0
-( The Dancing Years ) show
-158.7 429.4 moveto
-12 f2
-(\(remixes\)) show
-204 429.4 moveto
-12 f0
-( ) show
-31.5 416.1 moveto
-12 f2
-(1993:) show
-59.4 416.1 moveto
-12 f0
-( Sacred City ) show
-298.1 709.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 709.2 moveto
-12 f0
-(1248) show
-379.4 709.2 moveto
-12 f0
-( ) show
-298.1 695.9 moveto
-12 f2
-(See also: ) show
-344.7 695.9 moveto
-12 f0
-(http2.brunel.ac.uk) show
-431.7 695.9 moveto
-12 f0
-( ) show
-18.1 403.4 moveto
-3.3 3.3 c  fill 
-31.5 395.3 moveto
-12 f1
-(Siglo XX) show
-77.1 395.3 moveto
-12 f0
-( ) show
-31.5 382 moveto
-12 f2
-(1983-1986:) show
-87.4 382 moveto
-12 f0
-( Antler Tracks I ) show
-166.7 382 moveto
-12 f2
-(\(comp\)) show
-200.6 382 moveto
-12 f0
-( ) show
-31.5 368.7 moveto
-12 f2
-(1986:) show
-59.4 368.7 moveto
-12 f0
-( Fear and Desire ) show
-18.1 356 moveto
-3.3 3.3 c  fill 
-31.5 347.9 moveto
-12 f1
-(Single Gun Theory) show
-128.8 347.9 moveto
-12 f0
-( ) show
-31.5 334.6 moveto
-12 f2
-(1989?:) show
-65.4 334.6 moveto
-12 f0
-( Exorcise this Wasteland ) show
-31.5 321.3 moveto
-12 f2
-(1991:) show
-59.4 321.3 moveto
-12 f0
-( Like Stars in my Hands ) show
-31.5 308 moveto
-12 f2
-(1993:) show
-59.4 308 moveto
-12 f0
-( Burning Bright \(but Unseen\) ) show
-203.7 308 moveto
-12 f2
-(\(EP\)) show
-226.3 308 moveto
-12 f0
-( ) show
-31.5 294.7 moveto
-12 f2
-(1994:) show
-59.4 294.7 moveto
-12 f0
-( Flow, River of my Soul ) show
-298.1 348.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 348.4 moveto
-12 f0
-(1404) show
-379.4 348.4 moveto
-12 f0
-( ) show
-298.1 335.1 moveto
-12 f2
-(See also: ) show
-344.7 335.1 moveto
-12 f0
-(www.magna.com.au) show
-443.6 335.1 moveto
-12 f0
-( ) show
-18.1 282 moveto
-3.3 3.3 c  fill 
-31.5 273.9 moveto
-12 f1
-(Siouxsie and the Banshees) show
-165.1 273.9 moveto
-12 f0
-( ) show
-31.5 260.6 moveto
-12 f2
-(1977:) show
-59.4 260.6 moveto
-12 f0
-( Peel Sessions ) show
-130.4 260.6 moveto
-12 f2
-(\(live EP\)) show
-173.3 260.6 moveto
-12 f0
-( ) show
-31.5 247.3 moveto
-12 f2
-(1978:) show
-59.4 247.3 moveto
-12 f0
-( Peel Sessions 2 ) show
-139.4 247.3 moveto
-12 f2
-(\(live EP\)) show
-182.3 247.3 moveto
-12 f0
-( ) show
-31.5 234 moveto
-12 f2
-(1978:) show
-59.4 234 moveto
-12 f0
-( The Scream ) show
-31.5 220.7 moveto
-12 f2
-(1979:) show
-59.4 220.7 moveto
-12 f0
-( Join Hands ) show
-31.5 207.4 moveto
-12 f2
-(1980:) show
-59.4 207.4 moveto
-12 f0
-( Kaleidoscope ) show
-31.5 194.1 moveto
-12 f2
-(1981:) show
-59.4 194.1 moveto
-12 f0
-( juju ) show
-31.5 180.8 moveto
-12 f2
-(1981:) show
-59.4 180.8 moveto
-12 f0
-( Once Upon a Time ) show
-157 180.8 moveto
-12 f2
-(\(comp\)) show
-190.9 180.8 moveto
-12 f0
-( ) show
-31.5 167.5 moveto
-12 f2
-(1981:) show
-59.4 167.5 moveto
-12 f0
-( Spellbound / Follow the Sun / Slap Dash Snap) show
-31.5 154.2 moveto
-12 f2
-(\(single\)) show
-68.1 154.2 moveto
-12 f0
-( ) show
-31.5 140.9 moveto
-12 f2
-(1982:) show
-59.4 140.9 moveto
-12 f0
-( Slowdive / Obsession II / Cannibal Roses ) show
-264.7 140.9 moveto
-12 f2
-(\(single\)) show
-31.5 114.3 moveto
-12 f2
-(1982:) show
-59.4 114.3 moveto
-12 f0
-( A Kiss in the Dream House ) show
-31.5 101 moveto
-12 f2
-(1983:) show
-59.4 101 moveto
-12 f0
-( Nocturne ) show
-110 101 moveto
-12 f2
-(\(double live\)) show
-170.9 101 moveto
-12 f0
-( ) show
-31.5 87.7 moveto
-12 f2
-(1984:) show
-59.4 87.7 moveto
-12 f0
-( Hyaena ) show
-305.7 274.4 moveto
-12 f2
-(UBL Card: ) show
-363 274.4 moveto
-12 f0
-(1216) show
-387 274.4 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 25 25
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1985:) show
-59.4 709.2 moveto
-12 f0
-( Tinderbox ) show
-31.5 695.9 moveto
-12 f2
-(1986:) show
-59.4 695.9 moveto
-12 f0
-( Through the Looking Glass ) show
-31.5 682.6 moveto
-12 f2
-(1987:) show
-59.4 682.6 moveto
-12 f0
-( Song from the Edge of the World ) show
-226 682.6 moveto
-12 f2
-(\(single\)) show
-262.6 682.6 moveto
-12 f0
-( ) show
-31.5 669.3 moveto
-12 f2
-(1988:) show
-59.4 669.3 moveto
-12 f0
-( Peekaboo / False Face / Catwalk ) show
-221.7 669.3 moveto
-12 f2
-(\(single\)) show
-258.3 669.3 moveto
-12 f0
-( ) show
-31.5 656 moveto
-12 f2
-(1988:) show
-59.4 656 moveto
-12 f0
-( Peepshow ) show
-31.5 642.7 moveto
-12 f2
-(1991:) show
-59.4 642.7 moveto
-12 f0
-( Superstition ) show
-31.5 629.4 moveto
-12 f2
-(1991:) show
-59.4 629.4 moveto
-12 f0
-( Kiss Them for Me ) show
-153.7 629.4 moveto
-12 f2
-(\(EP\)) show
-176.3 629.4 moveto
-12 f0
-( ) show
-31.5 616.1 moveto
-12 f2
-(1995:) show
-59.4 616.1 moveto
-12 f0
-( The Rapture ) show
-18.1 603.4 moveto
-3.3 3.3 c  fill 
-31.5 595.3 moveto
-12 f1
-(Sister Machine Gun) show
-134.1 595.3 moveto
-12 f0
-( ) show
-31.5 582 moveto
-12 f2
-(1992:) show
-59.4 582 moveto
-12 f0
-( Sins of the Flesh ) show
-31.5 568.7 moveto
-12 f2
-(1994:) show
-59.4 568.7 moveto
-12 f0
-( The Torture Technique ) show
-31.5 555.4 moveto
-12 f2
-(1994:) show
-59.4 555.4 moveto
-12 f0
-( Nothing ) show
-104.7 555.4 moveto
-12 f2
-(\(single\)) show
-141.3 555.4 moveto
-12 f0
-( ) show
-31.5 542.1 moveto
-12 f2
-(1994:) show
-59.4 542.1 moveto
-12 f0
-( Wired / Lung ) show
-130 542.1 moveto
-12 f2
-(\(single\)) show
-166.6 542.1 moveto
-12 f0
-( ) show
-31.5 528.8 moveto
-12 f2
-(1995:) show
-59.4 528.8 moveto
-12 f0
-( Burn ) show
-299.7 595.8 moveto
-12 f2
-(UBL Card: ) show
-357 595.8 moveto
-12 f0
-(3612) show
-381 595.8 moveto
-12 f0
-( ) show
-18.1 516.1 moveto
-3.3 3.3 c  fill 
-31.5 508 moveto
-12 f1
-(Sisterhood, The) show
-112.1 508 moveto
-12 f0
-( ) show
-31.5 494.7 moveto
-12 f2
-(1986:) show
-59.4 494.7 moveto
-12 f0
-( Gift ) show
-298.1 508.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 508.5 moveto
-12 f0
-(1115) show
-379.4 508.5 moveto
-12 f0
-( ) show
-298.1 495.2 moveto
-12 f2
-(See also: ) show
-344.7 495.2 moveto
-12 f0
-(www.cm.cf.ac.uk) show
-429.3 495.2 moveto
-12 f0
-( ) show
-18.1 482 moveto
-3.3 3.3 c  fill 
-31.5 473.9 moveto
-12 f1
-(Sisters of Mercy) show
-114.8 473.9 moveto
-12 f0
-( ) show
-31.5 460.6 moveto
-12 f2
-(1985:) show
-59.4 460.6 moveto
-12 f0
-( First and Last and Always ) show
-31.5 447.3 moveto
-12 f2
-(1988:) show
-59.4 447.3 moveto
-12 f0
-( Floodland ) show
-31.5 434 moveto
-12 f2
-(1988:) show
-59.4 434 moveto
-12 f0
-( More / You Could be the One ) show
-208.7 434 moveto
-12 f2
-(\(single\)) show
-245.3 434 moveto
-12 f0
-( ) show
-31.5 420.7 moveto
-12 f2
-(1990:) show
-59.4 420.7 moveto
-12 f0
-( Vision Thing ) show
-31.5 407.4 moveto
-12 f2
-(1992:) show
-59.4 407.4 moveto
-12 f0
-( Some Girls Wander by Mistake ) show
-217.3 407.4 moveto
-12 f2
-(\(comp\)) show
-251.2 407.4 moveto
-12 f0
-( ) show
-31.5 394.1 moveto
-12 f2
-(1992:) show
-59.4 394.1 moveto
-12 f0
-( Temple of Love 1992 ) show
-169.7 394.1 moveto
-12 f2
-(\(single\)) show
-206.3 394.1 moveto
-12 f0
-( ) show
-31.5 380.8 moveto
-12 f2
-(1993:) show
-59.4 380.8 moveto
-12 f0
-( First and Last and Forever: A Tribute ) show
-245.3 380.8 moveto
-12 f2
-(\(various\)) show
-289.2 380.8 moveto
-12 f0
-( ) show
-31.5 367.5 moveto
-12 f2
-(1993:) show
-59.4 367.5 moveto
-12 f0
-( Under the Gun / Alice 1993 ) show
-199 367.5 moveto
-12 f2
-(\(single\)) show
-235.6 367.5 moveto
-12 f0
-( ) show
-298.1 474.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 474.4 moveto
-12 f0
-(1062) show
-379.4 474.4 moveto
-12 f0
-( ) show
-298.1 461.1 moveto
-12 f2
-(See also: ) show
-344.7 461.1 moveto
-12 f0
-(www.cm.cf.ac.uk) show
-429.3 461.1 moveto
-12 f0
-( ) show
-18.1 354.8 moveto
-3.3 3.3 c  fill 
-31.5 346.7 moveto
-12 f1
-(Skeletal Family) show
-111.1 346.7 moveto
-12 f0
-( ) show
-31.5 333.4 moveto
-12 f2
-(1984-1985:) show
-87.4 333.4 moveto
-12 f0
-( Burning Oil / Futile Combat ) show
-18.1 320.7 moveto
-3.3 3.3 c  fill 
-31.5 312.6 moveto
-12 f1
-(Skinny Puppy) show
-103.8 312.6 moveto
-12 f0
-( ) show
-31.5 299.3 moveto
-12 f2
-(1983:) show
-59.4 299.3 moveto
-12 f0
-( Back and Forth, Series Two ) show
-31.5 286 moveto
-12 f2
-(1984:) show
-59.4 286 moveto
-12 f0
-( Bites ) show
-31.5 272.7 moveto
-12 f2
-(1984:) show
-59.4 272.7 moveto
-12 f0
-( Remission ) show
-31.5 259.4 moveto
-12 f2
-(1984:) show
-59.4 259.4 moveto
-12 f0
-( Bites and Remission ) show
-31.5 246.1 moveto
-12 f2
-(1986:) show
-59.4 246.1 moveto
-12 f0
-( Mind: the Perpetual Intercourse ) show
-31.5 232.8 moveto
-12 f2
-(1986:) show
-59.4 232.8 moveto
-12 f0
-( Dig It ) show
-93.7 232.8 moveto
-12 f2
-(\(EP\)) show
-116.3 232.8 moveto
-12 f0
-( ) show
-31.5 219.5 moveto
-12 f2
-(1987:) show
-59.4 219.5 moveto
-12 f0
-( Cleanse, Fold, and Manipulate ) show
-31.5 206.2 moveto
-12 f2
-(1988:) show
-59.4 206.2 moveto
-12 f0
-( Vivisect VI ) show
-31.5 192.9 moveto
-12 f2
-(1989:) show
-59.4 192.9 moveto
-12 f0
-( Rabies ) show
-31.5 179.6 moveto
-12 f2
-(1990:) show
-59.4 179.6 moveto
-12 f0
-( Too Dark Park ) show
-31.5 166.3 moveto
-12 f2
-(1990:) show
-59.4 166.3 moveto
-12 f0
-( Censor ) show
-99.3 166.3 moveto
-12 f2
-(\(EP\)) show
-121.9 166.3 moveto
-12 f0
-( ) show
-31.5 153 moveto
-12 f2
-(1992:) show
-59.4 153 moveto
-12 f0
-( 12 Inch Anthology ) show
-156 153 moveto
-12 f2
-(\(comp\)) show
-189.9 153 moveto
-12 f0
-( ) show
-31.5 139.7 moveto
-12 f2
-(1992:) show
-59.4 139.7 moveto
-12 f0
-( Last Rights ) show
-298.1 313.1 moveto
-12 f2
-(UBL Card: ) show
-355.4 313.1 moveto
-12 f0
-(1166) show
-379.4 313.1 moveto
-12 f0
-( ) show
-298.1 299.8 moveto
-12 f2
-(See also: ) show
-344.7 299.8 moveto
-12 f0
-(www.eecs.nwu.edu) show
-438.3 299.8 moveto
-12 f0
-( ) show
-18.1 127 moveto
-3.3 3.3 c  fill 
-31.5 118.9 moveto
-12 f1
-(Sky Cries Mary) show
-112.8 118.9 moveto
-12 f0
-( ) show
-31.5 105.6 moveto
-12 f2
-(1993:) show
-59.4 105.6 moveto
-12 f0
-( A Return to the Inner Experience ) show
-31.5 92.3 moveto
-12 f2
-(1994:) show
-59.4 92.3 moveto
-12 f0
-( This Timeless Turning ) show
-31.5 79 moveto
-12 f2
-(1994:) show
-59.4 79 moveto
-12 f0
-( Every Iceberg is Afire / Deep Sunless Sea /) show
-298.1 119.4 moveto
-12 f2
-(UBL Card: ) show
-355.4 119.4 moveto
-12 f0
-(1437) show
-379.4 119.4 moveto
-12 f0
-( ) show
-298.1 106.1 moveto
-12 f2
-(See also: ) show
-344.7 106.1 moveto
-12 f0
-(www.starwave.com) show
-440 106.1 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 26 26
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f0
-(Cornerman ) show
-88.4 709.2 moveto
-12 f2
-(\(single\)) show
-125 709.2 moveto
-12 f0
-( ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Snog) show
-56.8 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1995:) show
-59.4 675.1 moveto
-12 f0
-( Dear Valued Customer ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(Soh Daiko) show
-84.5 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1990:) show
-59.4 641 moveto
-12 f0
-( Taiko Drum Ensemble ) show
-18.1 628.3 moveto
-3.3 3.3 c  fill 
-31.5 620.2 moveto
-12 f1
-(Some, Belouis) show
-102.8 620.2 moveto
-12 f0
-( ) show
-31.5 606.9 moveto
-12 f2
-(1984:) show
-59.4 606.9 moveto
-12 f0
-( Some People ) show
-128.4 606.9 moveto
-12 f2
-(\(single\)) show
-165 606.9 moveto
-12 f0
-( ) show
-18.1 594.2 moveto
-3.3 3.3 c  fill 
-31.5 586.1 moveto
-12 f1
-(Southern Death Cult) show
-138.1 586.1 moveto
-12 f0
-( ) show
-31.5 572.8 moveto
-12 f2
-(1982-1983:) show
-87.4 572.8 moveto
-12 f0
-( Southern Death Cult ) show
-192 572.8 moveto
-12 f2
-(\(comp\)) show
-225.9 572.8 moveto
-12 f0
-( ) show
-18.1 560.1 moveto
-3.3 3.3 c  fill 
-31.5 552 moveto
-12 f1
-(Spahn Ranch) show
-100.5 552 moveto
-12 f0
-( ) show
-31.5 538.7 moveto
-12 f2
-(1995:) show
-59.4 538.7 moveto
-12 f0
-( The Coiled One ) show
-18.1 526 moveto
-3.3 3.3 c  fill 
-31.5 517.9 moveto
-12 f1
-(SSQ) show
-54.1 517.9 moveto
-12 f0
-( ) show
-31.5 504.6 moveto
-12 f2
-(1984:) show
-59.4 504.6 moveto
-12 f0
-( Playback ) show
-31.5 491.3 moveto
-12 f2
-(1986:) show
-59.4 491.3 moveto
-12 f0
-( Insecurity ) show
-113.3 491.3 moveto
-12 f2
-(\(single\)) show
-149.9 491.3 moveto
-12 f0
-( ) show
-18.1 478.6 moveto
-3.3 3.3 c  fill 
-31.5 470.5 moveto
-12 f1
-(Stabbing Westward) show
-133.1 470.5 moveto
-12 f0
-( ) show
-31.5 457.2 moveto
-12 f2
-(1993:) show
-59.4 457.2 moveto
-12 f0
-( Violent Mood Swings ) show
-171.4 457.2 moveto
-12 f2
-(\(EP\)) show
-194 457.2 moveto
-12 f0
-( ) show
-31.5 443.9 moveto
-12 f2
-(1994:) show
-59.4 443.9 moveto
-12 f0
-( Ungod ) show
-31.5 430.6 moveto
-12 f2
-(1995:) show
-59.4 430.6 moveto
-12 f0
-( What Do I Have to Do / Falls Apart ) show
-237.3 430.6 moveto
-12 f2
-(\(single\)) show
-273.9 430.6 moveto
-12 f0
-( ) show
-31.5 417.3 moveto
-12 f2
-(1995:) show
-59.4 417.3 moveto
-12 f0
-( Wither Blister Burn and Peel ) show
-300.5 471 moveto
-12 f2
-(UBL Card: ) show
-357.8 471 moveto
-12 f0
-(2415) show
-381.8 471 moveto
-12 f0
-( ) show
-18.1 404.6 moveto
-3.3 3.3 c  fill 
-31.5 396.5 moveto
-12 f1
-(Strange Boutique) show
-121.1 396.5 moveto
-12 f0
-( ) show
-31.5 383.2 moveto
-12 f2
-(199?:) show
-59.4 383.2 moveto
-12 f0
-( Charm ) show
-31.5 369.9 moveto
-12 f2
-(199?:) show
-59.4 369.9 moveto
-12 f0
-( The Kindest Words ) show
-31.5 356.6 moveto
-12 f2
-(199?:) show
-59.4 356.6 moveto
-12 f0
-( The Loved One ) show
-298.1 397 moveto
-12 f2
-(See also: ) show
-344.7 397 moveto
-12 f0
-(www.iuma.com) show
-421.3 397 moveto
-12 f0
-( ) show
-18.1 343.9 moveto
-3.3 3.3 c  fill 
-31.5 335.8 moveto
-12 f1
-(Steroid Maximus) show
-119.8 335.8 moveto
-12 f0
-( ) show
-31.5 322.5 moveto
-12 f2
-(1991:) show
-59.4 322.5 moveto
-12 f0
-( Quilombo ) show
-31.5 309.2 moveto
-12 f2
-(1992:) show
-59.4 309.2 moveto
-12 f0
-( Gondwanaland ) show
-306.4 336.3 moveto
-12 f2
-(UBL Card: ) show
-363.7 336.3 moveto
-12 f0
-(2750) show
-387.7 336.3 moveto
-12 f0
-( ) show
-18.1 296.5 moveto
-3.3 3.3 c  fill 
-31.5 288.4 moveto
-12 f1
-(Sugarcubes, The) show
-116.8 288.4 moveto
-12 f0
-( ) show
-31.5 275.1 moveto
-12 f2
-(1988:) show
-59.4 275.1 moveto
-12 f0
-( Life's Too Good ) show
-298.1 288.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 288.9 moveto
-12 f0
-(3419) show
-379.4 288.9 moveto
-12 f0
-( ) show
-298.1 275.6 moveto
-12 f2
-(See also: ) show
-344.7 275.6 moveto
-12 f0
-(math-www.uio.no) show
-432 275.6 moveto
-12 f0
-( ) show
-18.1 262.4 moveto
-3.3 3.3 c  fill 
-31.5 254.3 moveto
-12 f1
-(Sunscreem) show
-87.4 254.3 moveto
-12 f0
-( ) show
-31.5 241 moveto
-12 f2
-(1992:) show
-59.4 241 moveto
-12 f0
-( O3 ) show
-18.1 228.3 moveto
-3.3 3.3 c  fill 
-31.5 220.2 moveto
-12 f1
-(Switchblade Symphony) show
-151.8 220.2 moveto
-12 f0
-( ) show
-31.5 206.9 moveto
-12 f2
-(1992:) show
-59.4 206.9 moveto
-12 f0
-( Fable ) show
-92 206.9 moveto
-12 f2
-(\(tape/EP\)) show
-138.6 206.9 moveto
-12 f0
-( ) show
-31.5 193.6 moveto
-12 f2
-(1993:) show
-59.4 193.6 moveto
-12 f0
-( Elegy ) show
-93.3 193.6 moveto
-12 f2
-(\(tape/EP\)) show
-139.9 193.6 moveto
-12 f0
-( ) show
-31.5 180.3 moveto
-12 f2
-(1995:) show
-59.4 180.3 moveto
-12 f0
-( Serpentine Gallery ) show
-18.1 167.6 moveto
-3.3 3.3 c  fill 
-31.5 159.5 moveto
-12 f1
-(Talking Heads) show
-106.5 159.5 moveto
-12 f0
-( ) show
-31.5 146.2 moveto
-12 f2
-(1977:) show
-59.4 146.2 moveto
-12 f0
-( Talking Heads '77 ) show
-31.5 132.9 moveto
-12 f2
-(1978:) show
-59.4 132.9 moveto
-12 f0
-( More Songs About Buildings and Food ) show
-31.5 119.6 moveto
-12 f2
-(1979:) show
-59.4 119.6 moveto
-12 f0
-( The Name of This Band is Talking Heads) show
-31.5 106.3 moveto
-12 f2
-(\(double live\)) show
-92.4 106.3 moveto
-12 f0
-( ) show
-31.5 93 moveto
-12 f2
-(1981:) show
-59.4 93 moveto
-12 f0
-( Fear of Music ) show
-31.5 79.7 moveto
-12 f2
-(1983:) show
-59.4 79.7 moveto
-12 f0
-( Sp eak in gI n To ngu es ) show
-302.4 160 moveto
-12 f2
-(UBL Card: ) show
-359.7 160 moveto
-12 f0
-(1012) show
-383.7 160 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 27 27
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1985:) show
-59.4 709.2 moveto
-12 f0
-( Stop Making Sense ) show
-158.7 709.2 moveto
-12 f2
-(\(live soundtrack\)) show
-240.3 709.2 moveto
-12 f0
-( ) show
-31.5 695.9 moveto
-12 f2
-(1985:) show
-59.4 695.9 moveto
-12 f0
-( Little Creatures ) show
-18.1 683.2 moveto
-3.3 3.3 c  fill 
-31.5 675.1 moveto
-12 f1
-(Tears For Fears) show
-114.1 675.1 moveto
-12 f0
-( ) show
-31.5 661.8 moveto
-12 f2
-(1983:) show
-59.4 661.8 moveto
-12 f0
-( The Hurting ) show
-31.5 648.5 moveto
-12 f2
-(1985:) show
-59.4 648.5 moveto
-12 f0
-( Songs From the Big Chair ) show
-298.1 675.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 675.6 moveto
-12 f0
-(2763) show
-379.4 675.6 moveto
-12 f0
-( ) show
-18.1 635.8 moveto
-3.3 3.3 c  fill 
-31.5 627.7 moveto
-12 f1
-(Tel Basta) show
-79.8 627.7 moveto
-12 f0
-( ) show
-31.5 614.4 moveto
-12 f2
-(1996:) show
-59.4 614.4 moveto
-12 f0
-( Lickerish ) show
-18.1 601.7 moveto
-3.3 3.3 c  fill 
-31.5 593.6 moveto
-12 f1
-(Thanatos) show
-79.5 593.6 moveto
-12 f0
-( ) show
-31.5 580.3 moveto
-12 f2
-(1995:) show
-59.4 580.3 moveto
-12 f0
-( An Embassy in Gaius ) show
-18.1 567.6 moveto
-3.3 3.3 c  fill 
-31.5 559.5 moveto
-12 f1
-(Therapy?) show
-81.5 559.5 moveto
-12 f0
-( ) show
-31.5 546.2 moveto
-12 f2
-(1992:) show
-59.4 546.2 moveto
-12 f0
-( Caucasian Psychosis ) show
-31.5 532.9 moveto
-12 f2
-(1992:) show
-59.4 532.9 moveto
-12 f0
-( Nurse ) show
-299.1 560 moveto
-12 f2
-(UBL Card: ) show
-356.4 560 moveto
-12 f0
-(2044) show
-380.4 560 moveto
-12 f0
-( ) show
-18.1 520.2 moveto
-3.3 3.3 c  fill 
-31.5 512.1 moveto
-12 f1
-(13 Mg.) show
-66.8 512.1 moveto
-12 f0
-( ) show
-31.5 498.8 moveto
-12 f2
-(1995:) show
-59.4 498.8 moveto
-12 f0
-( Trust and Obey ) show
-18.1 486.1 moveto
-3.3 3.3 c  fill 
-31.5 478 moveto
-12 f1
-(This Ascension) show
-108.5 478 moveto
-12 f0
-( ) show
-31.5 464.7 moveto
-12 f2
-(1991:) show
-59.4 464.7 moveto
-12 f0
-( Light and Shade ) show
-31.5 451.4 moveto
-12 f2
-(1994:) show
-59.4 451.4 moveto
-12 f0
-( Walk Softly, a Dream Lies Here ) show
-18.1 438.7 moveto
-3.3 3.3 c  fill 
-31.5 430.6 moveto
-12 f1
-(Throwing Muses) show
-117.8 430.6 moveto
-12 f0
-( ) show
-31.5 417.3 moveto
-12 f2
-(1986:) show
-59.4 417.3 moveto
-12 f0
-( Throwing Muses ) show
-298.4 431.1 moveto
-12 f2
-(UBL Card: ) show
-355.7 431.1 moveto
-12 f0
-(1357) show
-379.7 431.1 moveto
-12 f0
-( ) show
-18.1 404.6 moveto
-3.3 3.3 c  fill 
-31.5 396.5 moveto
-12 f1
-(Tinfed) show
-65.5 396.5 moveto
-12 f0
-( ) show
-31.5 383.2 moveto
-12 f2
-(1993:) show
-59.4 383.2 moveto
-12 f0
-( Synaptic Hardware ) show
-18.1 370.5 moveto
-3.3 3.3 c  fill 
-31.5 362.4 moveto
-12 f1
-(Tin Machine) show
-97.1 362.4 moveto
-12 f0
-( ) show
-31.5 349.1 moveto
-12 f2
-(1989:) show
-59.4 349.1 moveto
-12 f0
-( Tin Machine ) show
-298.1 362.9 moveto
-12 f2
-(UBL Card: ) show
-355.4 362.9 moveto
-12 f0
-(1098) show
-379.4 362.9 moveto
-12 f0
-( ) show
-18.1 336.4 moveto
-3.3 3.3 c  fill 
-31.5 328.3 moveto
-12 f1
-(Tit Wrench United) show
-128.8 328.3 moveto
-12 f0
-( ) show
-31.5 315 moveto
-12 f2
-(1993:) show
-59.4 315 moveto
-12 f0
-( Full Employment ) show
-18.1 302.3 moveto
-3.3 3.3 c  fill 
-31.5 294.2 moveto
-12 f1
-(Tom Tom Club) show
-110.8 294.2 moveto
-12 f0
-( ) show
-31.5 280.9 moveto
-12 f2
-(1981:) show
-59.4 280.9 moveto
-12 f0
-( Tom Tom Club ) show
-31.5 267.6 moveto
-12 f2
-(1983:) show
-59.4 267.6 moveto
-12 f0
-( Close to the Bone ) show
-298.1 294.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 294.7 moveto
-12 f0
-(1012) show
-379.4 294.7 moveto
-12 f0
-( ) show
-18.1 254.9 moveto
-3.3 3.3 c  fill 
-31.5 246.8 moveto
-12 f1
-(Tones on Tail) show
-101.5 246.8 moveto
-12 f0
-( ) show
-31.5 233.5 moveto
-12 f2
-(1982:) show
-59.4 233.5 moveto
-12 f0
-( Tones on Tail ) show
-31.5 220.2 moveto
-12 f2
-(1984:) show
-59.4 220.2 moveto
-12 f0
-( Pop ) show
-31.5 206.9 moveto
-12 f2
-(1984:) show
-59.4 206.9 moveto
-12 f0
-( Performance / Shakes ) show
-170 206.9 moveto
-12 f2
-(\(single\)) show
-206.6 206.9 moveto
-12 f0
-( ) show
-31.5 193.6 moveto
-12 f2
-(1982-1984:) show
-87.4 193.6 moveto
-12 f0
-( Night Music ) show
-153.7 193.6 moveto
-12 f2
-(\(comp\)) show
-187.6 193.6 moveto
-12 f0
-( ) show
-298.1 247.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 247.3 moveto
-12 f0
-(1235) show
-379.4 247.3 moveto
-12 f0
-( ) show
-298.1 234 moveto
-12 f2
-(See also: ) show
-344.7 234 moveto
-12 f0
-(gothic.acs.csulb.edu) show
-441.6 234 moveto
-12 f0
-( ) show
-298.1 220.7 moveto
-12 f2
-(See also: ) show
-344.7 220.7 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 220.7 moveto
-12 f0
-( ) show
-18.1 180.9 moveto
-3.3 3.3 c  fill 
-31.5 172.8 moveto
-12 f1
-(Trance Mission) show
-111.1 172.8 moveto
-12 f0
-( ) show
-31.5 159.5 moveto
-12 f2
-(1993:) show
-59.4 159.5 moveto
-12 f0
-( Trance Mission ) show
-18.1 146.8 moveto
-3.3 3.3 c  fill 
-31.5 138.7 moveto
-12 f1
-(Trance to the Sun) show
-123.1 138.7 moveto
-12 f0
-( ) show
-31.5 125.4 moveto
-12 f2
-(1994:) show
-59.4 125.4 moveto
-12 f0
-( Ghost Forest ) show
-31.5 112.1 moveto
-12 f2
-(1995:) show
-59.4 112.1 moveto
-12 f0
-( Bloom, Flowers, Bloom! ) show
-31.5 98.8 moveto
-12 f2
-(1995:) show
-59.4 98.8 moveto
-12 f0
-( Venomous Eve ) show
-18.1 86.1 moveto
-3.3 3.3 c  fill 
-31.5 78 moveto
-12 f1
-(Transvision Vamp) show
-126.5 78 moveto
-12 f0
-( ) show
-302.5 78.5 moveto
-12 f2
-(UBL Card: ) show
-359.8 78.5 moveto
-12 f0
-(5305) show
-383.8 78.5 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 28 28
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1991:) show
-59.4 709.2 moveto
-12 f0
-( Little Magnets versus the Bubble of Babble ) show
-18.1 696.5 moveto
-3.3 3.3 c  fill 
-31.5 688.4 moveto
-12 f1
-(Trio) show
-54.1 688.4 moveto
-12 f0
-( ) show
-31.5 675.1 moveto
-12 f2
-(1983:) show
-59.4 675.1 moveto
-12 f0
-( Trio and Error ) show
-18.1 662.4 moveto
-3.3 3.3 c  fill 
-31.5 654.3 moveto
-12 f1
-(Tubes, The) show
-88.8 654.3 moveto
-12 f0
-( ) show
-31.5 641 moveto
-12 f2
-(1981:) show
-59.4 641 moveto
-12 f0
-( Tubes Rarities And Smash Hits [T.R.A.S.H] ) show
-18.1 628.3 moveto
-3.3 3.3 c  fill 
-31.5 620.2 moveto
-12 f1
-(Tuxedomoon) show
-98.8 620.2 moveto
-12 f0
-( ) show
-31.5 606.9 moveto
-12 f2
-(1980:) show
-59.4 606.9 moveto
-12 f0
-( Half-Mute ) show
-31.5 593.6 moveto
-12 f2
-(1983:) show
-59.4 593.6 moveto
-12 f0
-( A Thousand Lives by Picture ) show
-31.5 580.3 moveto
-12 f2
-(1985:) show
-59.4 580.3 moveto
-12 f0
-( Holy Wars ) show
-18.1 567.6 moveto
-3.3 3.3 c  fill 
-31.5 559.5 moveto
-12 f1
-(Underflowers) show
-101.4 559.5 moveto
-12 f0
-( ) show
-31.5 546.2 moveto
-12 f2
-(1995:) show
-59.4 546.2 moveto
-12 f0
-( Underflowers ) show
-18.1 533.5 moveto
-3.3 3.3 c  fill 
-31.5 525.4 moveto
-12 f1
-(Urban Dance Squad) show
-135.5 525.4 moveto
-12 f0
-( ) show
-31.5 512.1 moveto
-12 f2
-(1991:) show
-59.4 512.1 moveto
-12 f0
-( Life'n Perspectives of a Genuine Crossover ) show
-303.5 525.9 moveto
-12 f2
-(UBL Card: ) show
-360.8 525.9 moveto
-12 f0
-(4626) show
-384.8 525.9 moveto
-12 f0
-( ) show
-18.1 499.4 moveto
-3.3 3.3 c  fill 
-31.5 491.3 moveto
-12 f1
-(Usherhouse) show
-91.5 491.3 moveto
-12 f0
-( ) show
-31.5 478 moveto
-12 f2
-(1993:) show
-59.4 478 moveto
-12 f0
-( Molting ) show
-31.5 464.7 moveto
-12 f2
-(1994:) show
-59.4 464.7 moveto
-12 f0
-( Flux ) show
-18.1 452 moveto
-3.3 3.3 c  fill 
-31.5 443.9 moveto
-12 f1
-(Ultravox) show
-76.8 443.9 moveto
-12 f0
-( ) show
-31.5 430.6 moveto
-12 f2
-(1978:) show
-59.4 430.6 moveto
-12 f0
-( Systems of Romance ) show
-18.1 417.9 moveto
-3.3 3.3 c  fill 
-31.5 409.8 moveto
-12 f1
-(Van Acker, Luc) show
-113.1 409.8 moveto
-12 f0
-( ) show
-31.5 396.5 moveto
-12 f2
-(1980:) show
-59.4 396.5 moveto
-12 f0
-( Taking Snapshots, Volume 1 ) show
-300.1 410.3 moveto
-12 f2
-(UBL Card: ) show
-357.4 410.3 moveto
-12 f0
-(1100) show
-381.4 410.3 moveto
-12 f0
-( ) show
-18.1 383.8 moveto
-3.3 3.3 c  fill 
-31.5 375.7 moveto
-12 f1
-(Vangelis) show
-75.5 375.7 moveto
-12 f0
-( ) show
-31.5 362.4 moveto
-12 f2
-(1994:) show
-59.4 362.4 moveto
-12 f0
-( Blade Runner ) show
-131.7 362.4 moveto
-12 f2
-(\(soundtrack\)) show
-193 362.4 moveto
-12 f0
-( ) show
-298.1 376.2 moveto
-12 f2
-(UBL Card: ) show
-355.4 376.2 moveto
-12 f0
-(1023) show
-379.4 376.2 moveto
-12 f0
-( ) show
-298.1 362.9 moveto
-12 f2
-(See also: ) show
-344.7 362.9 moveto
-12 f0
-(rt66.com) show
-387.6 362.9 moveto
-12 f0
-( ) show
-18.1 349.7 moveto
-3.3 3.3 c  fill 
-31.5 341.6 moveto
-12 f1
-(various) show
-69.5 341.6 moveto
-12 f0
-( ) show
-31.5 328.3 moveto
-12 f2
-(1980:) show
-59.4 328.3 moveto
-12 f0
-( URGH! A Music War ) show
-171.7 328.3 moveto
-12 f2
-(\(live comp\)) show
-226 328.3 moveto
-12 f0
-( ) show
-31.5 315 moveto
-12 f2
-(1981-1994:) show
-87.4 315 moveto
-12 f0
-( Wax Trax Black Box ) show
-195.7 315 moveto
-12 f2
-(\(comp\)) show
-229.6 315 moveto
-12 f0
-( ) show
-31.5 301.7 moveto
-12 f2
-(1982-198?:) show
-87.4 301.7 moveto
-12 f0
-( In Goth Daze \(Anagram version\) ) show
-252 301.7 moveto
-12 f2
-(\(comp\)) show
-285.9 301.7 moveto
-12 f0
-( ) show
-31.5 288.4 moveto
-12 f2
-(1982-1994:) show
-87.4 288.4 moveto
-12 f0
-( In Goth Daze \(Cleopatra version\) ) show
-254 288.4 moveto
-12 f2
-(\(comp\)) show
-287.9 288.4 moveto
-12 f0
-( ) show
-31.5 275.1 moveto
-12 f2
-(1982-1993:) show
-87.4 275.1 moveto
-12 f0
-( The Whip \(Cleopatra\) ) show
-199.3 275.1 moveto
-12 f2
-(\(comp\)) show
-233.2 275.1 moveto
-12 f0
-( ) show
-31.5 261.8 moveto
-12 f2
-(1984-1985:) show
-87.4 261.8 moveto
-12 f0
-( IQ6: Zang Tumb Tuum Sampled ) show
-251.3 261.8 moveto
-12 f2
-(\(comp\)) show
-285.2 261.8 moveto
-12 f0
-( ) show
-31.5 248.5 moveto
-12 f2
-(1984-1995:) show
-87.4 248.5 moveto
-12 f0
-( DEC ADE NCE \(Nettwerk\) ) show
-227.7 248.5 moveto
-12 f2
-(\(comp\)) show
-261.6 248.5 moveto
-12 f0
-( ) show
-31.5 235.2 moveto
-12 f2
-(1988:) show
-59.4 235.2 moveto
-12 f0
-( This is Electronic Body Music ) show
-212 235.2 moveto
-12 f2
-(\(comp\)) show
-245.9 235.2 moveto
-12 f0
-( ) show
-31.5 221.9 moveto
-12 f2
-(1990:) show
-59.4 221.9 moveto
-12 f0
-( From Across This Gray Land #2 \(Projekt\) ) show
-267.3 221.9 moveto
-12 f2
-(\(comp\)) show
-301.2 221.9 moveto
-12 f0
-( ) show
-31.5 208.6 moveto
-12 f2
-(1990:) show
-59.4 208.6 moveto
-12 f0
-( Doctor Death IV: The Marvels of Insect Life ) show
-281 208.6 moveto
-12 f2
-(\(double comp\)) show
-350.6 208.6 moveto
-12 f0
-( ) show
-31.5 195.3 moveto
-12 f2
-(1990:) show
-59.4 195.3 moveto
-12 f0
-( Red Hot + Blue ) show
-141.1 195.3 moveto
-12 f2
-(\(comp\)) show
-175 195.3 moveto
-12 f0
-( ) show
-31.5 182 moveto
-12 f2
-(1991:) show
-59.4 182 moveto
-12 f0
-( Bouquet of Dreams ) show
-159.3 182 moveto
-12 f2
-(\(comp\)) show
-193.2 182 moveto
-12 f0
-( ) show
-31.5 168.7 moveto
-12 f2
-(1980-1992:) show
-87.4 168.7 moveto
-12 f0
-( Gothic Rock ) show
-154.3 168.7 moveto
-12 f2
-(\(comp\)) show
-188.2 168.7 moveto
-12 f0
-( ) show
-31.5 155.4 moveto
-12 f2
-(1992:) show
-59.4 155.4 moveto
-12 f0
-( Mindfield \(Third Mind\) ) show
-180 155.4 moveto
-12 f2
-(\(comp\)) show
-213.9 155.4 moveto
-12 f0
-( ) show
-31.5 142.1 moveto
-12 f2
-(1992:) show
-59.4 142.1 moveto
-12 f0
-( From Across This Gray Land #3 \(Projekt\) ) show
-267.3 142.1 moveto
-12 f2
-(\(comp\)) show
-301.2 142.1 moveto
-12 f0
-( ) show
-31.5 128.8 moveto
-12 f2
-(1992:) show
-59.4 128.8 moveto
-12 f0
-( The Cyberflesh Conspiracy ) show
-197.3 128.8 moveto
-12 f2
-(\(comp\)) show
-231.2 128.8 moveto
-12 f0
-( ) show
-31.5 115.5 moveto
-12 f2
-(1992:) show
-59.4 115.5 moveto
-12 f0
-( G\341rgula Mec\342nica: World Electrostatic Assembly ) show
-304.6 115.5 moveto
-12 f2
-(\(comp\)) show
-338.5 115.5 moveto
-12 f0
-( ) show
-31.5 102.2 moveto
-12 f2
-(1992:) show
-59.4 102.2 moveto
-12 f0
-( CCCC: California Cyber Crash Compilation \(Cop\) ) show
-309.7 102.2 moveto
-12 f2
-(\(comp\)) show
-343.6 102.2 moveto
-12 f0
-( ) show
-31.5 88.9 moveto
-12 f2
-(1993:) show
-59.4 88.9 moveto
-12 f0
-( Shut Up Kitty ) show
-132.7 88.9 moveto
-12 f2
-(\(comp\)) show
-166.6 88.9 moveto
-12 f0
-( ) show
-31.5 75.6 moveto
-12 f2
-(1988-1993:) show
-87.4 75.6 moveto
-12 f0
-( Can You See It Yet? \(Invisible\) ) show
-245.7 75.6 moveto
-12 f2
-(\(comp\)) show
-279.6 75.6 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 29 29
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1994:) show
-59.4 709.2 moveto
-12 f0
-( Mysterious Encounters \(Cleopatra\) ) show
-234 709.2 moveto
-12 f2
-(\(comp\)) show
-267.9 709.2 moveto
-12 f0
-( ) show
-31.5 695.9 moveto
-12 f2
-(1994:) show
-59.4 695.9 moveto
-12 f0
-( The Crow ) show
-113.7 695.9 moveto
-12 f2
-(\(comp\)) show
-147.6 695.9 moveto
-12 f0
-( ) show
-31.5 682.6 moveto
-12 f2
-(1994:) show
-59.4 682.6 moveto
-12 f0
-( Totentanz: The Best of Zoth Ommog ) show
-243.7 682.6 moveto
-12 f2
-(\(double comp\)) show
-313.3 682.6 moveto
-12 f0
-( ) show
-31.5 669.3 moveto
-12 f2
-(1992:) show
-59.4 669.3 moveto
-12 f0
-( Hy! \(Hyperium Compilation volume 1\) ) show
-254.7 669.3 moveto
-12 f2
-(\(comp\)) show
-288.6 669.3 moveto
-12 f0
-( ) show
-31.5 656 moveto
-12 f2
-(1993:) show
-59.4 656 moveto
-12 f0
-( World Domination Sampler ) show
-199.3 656 moveto
-12 f2
-(\(comp\)) show
-233.2 656 moveto
-12 f0
-( ) show
-31.5 642.7 moveto
-12 f2
-(1993:) show
-59.4 642.7 moveto
-12 f0
-( Rivet Head Culture ) show
-158.7 642.7 moveto
-12 f2
-(\(comp\)) show
-192.6 642.7 moveto
-12 f0
-( ) show
-31.5 629.4 moveto
-12 f2
-(1993:) show
-59.4 629.4 moveto
-12 f0
-( Artificial Intelligence \(Warp\) ) show
-206.6 629.4 moveto
-12 f2
-(\(comp\)) show
-240.5 629.4 moveto
-12 f0
-( ) show
-31.5 616.1 moveto
-12 f2
-(1994:) show
-59.4 616.1 moveto
-12 f0
-( Artificial Intelligence II \(Warp\) ) show
-217.6 616.1 moveto
-12 f2
-(\(comp\)) show
-251.5 616.1 moveto
-12 f0
-( ) show
-31.5 602.8 moveto
-12 f2
-(1994:) show
-59.4 602.8 moveto
-12 f0
-( Big Hard Disk #2 \(Smash\) ) show
-193.3 602.8 moveto
-12 f2
-(\(comp\)) show
-227.2 602.8 moveto
-12 f0
-( ) show
-31.5 589.5 moveto
-12 f2
-(1994:) show
-59.4 589.5 moveto
-12 f0
-( Kindred Spirits \(Bedazzled\) ) show
-200 589.5 moveto
-12 f2
-(\(comp\)) show
-233.9 589.5 moveto
-12 f0
-( ) show
-31.5 576.2 moveto
-12 f2
-(1994:) show
-59.4 576.2 moveto
-12 f0
-( Plug In + Turn On \(Instinct\) ) show
-201.1 576.2 moveto
-12 f2
-(\(comp\)) show
-235 576.2 moveto
-12 f0
-( ) show
-31.5 562.9 moveto
-12 f2
-(1994:) show
-59.4 562.9 moveto
-12 f0
-( The Disease of Lady Madeline \(Anubis\) ) show
-259 562.9 moveto
-12 f2
-(\(comp\)) show
-292.9 562.9 moveto
-12 f0
-( ) show
-31.5 549.6 moveto
-12 f2
-(1994:) show
-59.4 549.6 moveto
-12 f0
-( Natural Born Killers ) show
-164 549.6 moveto
-12 f2
-(\(soundtrack comp\)) show
-254.3 549.6 moveto
-12 f0
-( ) show
-31.5 536.3 moveto
-12 f2
-(1994:) show
-59.4 536.3 moveto
-12 f0
-( Afterburn \(Wax Trax\) ) show
-172 536.3 moveto
-12 f2
-(\(comp\)) show
-205.9 536.3 moveto
-12 f0
-( ) show
-31.5 523 moveto
-12 f2
-(1994:) show
-59.4 523 moveto
-12 f0
-( Chaos Compilation \(Cop\) ) show
-189.4 523 moveto
-12 f2
-(\(comp\)) show
-223.3 523 moveto
-12 f0
-( ) show
-31.5 509.7 moveto
-12 f2
-(1994:) show
-59.4 509.7 moveto
-12 f0
-( Electrocity Vol. 5 ) show
-151 509.7 moveto
-12 f2
-(\(comp\)) show
-184.9 509.7 moveto
-12 f0
-( ) show
-31.5 496.4 moveto
-12 f2
-(1995:) show
-59.4 496.4 moveto
-12 f0
-( Gothik \(Cleopatra\) ) show
-156.3 496.4 moveto
-12 f2
-(\(double comp\)) show
-225.9 496.4 moveto
-12 f0
-( ) show
-31.5 483.1 moveto
-12 f2
-(1995:) show
-59.4 483.1 moveto
-12 f0
-( Godfathers of German Gothic ) show
-209 483.1 moveto
-12 f2
-(\(comp\)) show
-242.9 483.1 moveto
-12 f0
-( ) show
-31.5 469.8 moveto
-12 f2
-(1995:) show
-59.4 469.8 moveto
-12 f0
-( Heavenly Voices III \(Hyperium\) ) show
-222.3 469.8 moveto
-12 f2
-(\(comp\)) show
-256.2 469.8 moveto
-12 f0
-( ) show
-31.5 456.5 moveto
-12 f2
-(1995:) show
-59.4 456.5 moveto
-12 f0
-( Mortal Kombat ) show
-139.7 456.5 moveto
-12 f2
-(\(soundtrack comp\)) show
-230 456.5 moveto
-12 f0
-( ) show
-31.5 443.2 moveto
-12 f2
-(1995:) show
-59.4 443.2 moveto
-12 f0
-( The Tyranny Off the Beat \(Off Beat/Cleopatra\) ) show
-292.6 443.2 moveto
-12 f2
-(\(comp\)) show
-326.5 443.2 moveto
-12 f0
-( ) show
-31.5 429.9 moveto
-12 f2
-(1995:) show
-59.4 429.9 moveto
-12 f0
-( Forced Cranial Removal \(Fifth Colvmn\) ) show
-259.3 429.9 moveto
-12 f2
-(\(comp\)) show
-293.2 429.9 moveto
-12 f0
-( ) show
-31.5 416.6 moveto
-12 f2
-(1995:) show
-59.4 416.6 moveto
-12 f0
-( Dreams in the Witch House \(Grave News\) ) show
-269.3 416.6 moveto
-12 f2
-(\(comp\)) show
-303.2 416.6 moveto
-12 f0
-( ) show
-18.1 403.9 moveto
-3.3 3.3 c  fill 
-31.5 395.8 moveto
-12 f1
-(Vega, Suzanne) show
-106.8 395.8 moveto
-12 f0
-( ) show
-31.5 382.5 moveto
-12 f2
-(1992:) show
-59.4 382.5 moveto
-12 f0
-( 99.9F ) show
-298.1 396.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 396.3 moveto
-12 f0
-(2088) show
-379.4 396.3 moveto
-12 f0
-( ) show
-18.1 369.8 moveto
-3.3 3.3 c  fill 
-31.5 361.7 moveto
-12 f1
-(Vinyl Devotion) show
-108.5 361.7 moveto
-12 f0
-( ) show
-31.5 348.4 moveto
-12 f2
-(1994:) show
-59.4 348.4 moveto
-12 f0
-( If They Know You're Trying ) show
-18.1 335.7 moveto
-3.3 3.3 c  fill 
-31.5 327.6 moveto
-12 f1
-(Volume Magazine) show
-124.4 327.6 moveto
-12 f0
-( ) show
-31.5 314.3 moveto
-12 f2
-(1991:) show
-59.4 314.3 moveto
-12 f0
-( Volume: 1 ) show
-116.4 314.3 moveto
-12 f2
-(\(comp\)) show
-150.3 314.3 moveto
-12 f0
-( ) show
-31.5 301 moveto
-12 f2
-(1991:) show
-59.4 301 moveto
-12 f0
-( Volume: 2 ) show
-116.4 301 moveto
-12 f2
-(\(comp\)) show
-150.3 301 moveto
-12 f0
-( ) show
-31.5 287.7 moveto
-12 f2
-(1992:) show
-59.4 287.7 moveto
-12 f0
-( Volume: 3 ) show
-116.4 287.7 moveto
-12 f2
-(\(comp\)) show
-150.3 287.7 moveto
-12 f0
-( ) show
-31.5 274.4 moveto
-12 f2
-(1992:) show
-59.4 274.4 moveto
-12 f0
-( Volume: 4 ) show
-116.4 274.4 moveto
-12 f2
-(\(comp\)) show
-150.3 274.4 moveto
-12 f0
-( ) show
-31.5 261.1 moveto
-12 f2
-(1995:) show
-59.4 261.1 moveto
-12 f0
-( Wasted: The Best of Volume ) show
-205.3 261.1 moveto
-12 f2
-(\(double comp\)) show
-274.9 261.1 moveto
-12 f0
-( ) show
-18.1 248.4 moveto
-3.3 3.3 c  fill 
-31.5 240.3 moveto
-12 f1
-(Waitresses, The) show
-112.8 240.3 moveto
-12 f0
-( ) show
-31.5 227 moveto
-12 f2
-(1981:) show
-59.4 227 moveto
-12 f0
-( Wasn't Tomorrow Wonderful? ) show
-31.5 213.7 moveto
-12 f2
-(1982:) show
-59.4 213.7 moveto
-12 f0
-( Bruiseology ) show
-31.5 200.4 moveto
-12 f2
-(1978-1981:) show
-87.4 200.4 moveto
-12 f0
-( Best Of ) show
-130.3 200.4 moveto
-12 f2
-(\(comp\)) show
-164.2 200.4 moveto
-12 f0
-( ) show
-18.1 187.7 moveto
-3.3 3.3 c  fill 
-31.5 179.6 moveto
-12 f1
-(Wake, The) show
-87.5 179.6 moveto
-12 f0
-( ) show
-31.5 166.3 moveto
-12 f2
-(1993:) show
-59.4 166.3 moveto
-12 f0
-( Masked ) show
-18.1 153.6 moveto
-3.3 3.3 c  fill 
-31.5 145.5 moveto
-12 f1
-(Wall of Voodoo) show
-111.5 145.5 moveto
-12 f0
-( ) show
-31.5 132.2 moveto
-12 f2
-(1980:) show
-59.4 132.2 moveto
-12 f0
-( fpfpfpfpfpfp ) show
-31.5 118.9 moveto
-12 f2
-(1981:) show
-59.4 118.9 moveto
-12 f0
-( Dark Continent ) show
-31.5 105.6 moveto
-12 f2
-(1982:) show
-59.4 105.6 moveto
-12 f0
-( Call of the West ) show
-31.5 92.3 moveto
-12 f2
-(1986:) show
-59.4 92.3 moveto
-12 f0
-( Seven Days in Sammystown ) show
-31.5 79 moveto
-12 f2
-(1987:) show
-59.4 79 moveto
-12 f0
-( Happy Planet ) show
-pagelevel restore
-showpage
-%%Page: 30 30
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-18.1 714.3 moveto
-3.3 3.3 c  fill 
-31.5 706.2 moveto
-12 f1
-(Wang Chung) show
-99.8 706.2 moveto
-12 f0
-( ) show
-31.5 692.9 moveto
-12 f2
-(1983:) show
-59.4 692.9 moveto
-12 f0
-( Points On the Curve ) show
-31.5 679.6 moveto
-12 f2
-(1985:) show
-59.4 679.6 moveto
-12 f0
-( To Live and Die in L.A. ) show
-181.7 679.6 moveto
-12 f2
-(\(soundtrack\)) show
-243 679.6 moveto
-12 f0
-( ) show
-304.1 706.7 moveto
-12 f2
-(UBL Card: ) show
-361.4 706.7 moveto
-12 f0
-(2245) show
-385.4 706.7 moveto
-12 f0
-( ) show
-18.1 666.9 moveto
-3.3 3.3 c  fill 
-31.5 658.8 moveto
-12 f1
-(Westworld) show
-87.4 658.8 moveto
-12 f0
-( ) show
-31.5 645.5 moveto
-12 f2
-(1987:) show
-59.4 645.5 moveto
-12 f0
-( Rockulator ) show
-31.5 632.2 moveto
-12 f2
-(1991:) show
-59.4 632.2 moveto
-12 f0
-( Movers and Shakers ) show
-31.5 618.9 moveto
-12 f2
-(1991:) show
-59.4 618.9 moveto
-12 f0
-( Do No Wrong ) show
-134 618.9 moveto
-12 f2
-(\(single\)) show
-170.6 618.9 moveto
-12 f0
-( ) show
-18.1 606.2 moveto
-3.3 3.3 c  fill 
-31.5 598.1 moveto
-12 f1
-(Whale) show
-64.8 598.1 moveto
-12 f0
-( ) show
-31.5 584.8 moveto
-12 f2
-(1994:) show
-59.4 584.8 moveto
-12 f0
-( Hobo Humpin Slobo Babe / Eye 842 ) show
-242 584.8 moveto
-12 f2
-(\(single\)) show
-278.6 584.8 moveto
-12 f0
-( ) show
-31.5 571.5 moveto
-12 f2
-(1994:) show
-59.4 571.5 moveto
-12 f0
-( Hobo Humpin Slobo Babe / Lips / Eye 842) show
-31.5 558.2 moveto
-12 f2
-(\(single\)) show
-68.1 558.2 moveto
-12 f0
-( ) show
-31.5 544.9 moveto
-12 f2
-(1994:) show
-59.4 544.9 moveto
-12 f0
-( Pay for Me ) show
-119.3 544.9 moveto
-12 f2
-(\(EP\)) show
-141.9 544.9 moveto
-12 f0
-( ) show
-31.5 531.6 moveto
-12 f2
-(1995:) show
-59.4 531.6 moveto
-12 f0
-( We Care ) show
-31.5 518.3 moveto
-12 f2
-(1995:) show
-59.4 518.3 moveto
-12 f0
-( I'll Do Ya ) show
-114.7 518.3 moveto
-12 f2
-(\(EP\)) show
-137.3 518.3 moveto
-12 f0
-( ) show
-31.5 505 moveto
-12 f2
-(1995:) show
-59.4 505 moveto
-12 f0
-( Hobo Humpin Slobo Babe \(3 mixes\) ) show
-241.7 505 moveto
-12 f2
-(\(single\)) show
-278.3 505 moveto
-12 f0
-( ) show
-31.5 491.7 moveto
-12 f2
-(1995:) show
-59.4 491.7 moveto
-12 f0
-( Hobo Humpin Slobo Babe / You and Your) show
-31.5 478.4 moveto
-12 f0
-(Sister / Singer Star ) show
-124.8 478.4 moveto
-12 f2
-(\(single\)) show
-161.4 478.4 moveto
-12 f0
-( ) show
-298.1 598.6 moveto
-12 f2
-(UBL Card: ) show
-355.4 598.6 moveto
-12 f0
-(3790) show
-379.4 598.6 moveto
-12 f0
-( ) show
-298.1 585.3 moveto
-12 f2
-(See also: ) show
-344.7 585.3 moveto
-12 f0
-(www.vmg.co.uk) show
-424.4 585.3 moveto
-12 f0
-( ) show
-18.1 465.7 moveto
-3.3 3.3 c  fill 
-31.5 457.6 moveto
-12 f1
-(White Zombie) show
-105.1 457.6 moveto
-12 f0
-( ) show
-31.5 444.3 moveto
-12 f2
-(1992:) show
-59.4 444.3 moveto
-12 f0
-( Nightcrawlers: the KMFDM Remixes ) show
-247.7 444.3 moveto
-12 f2
-(\(EP\)) show
-270.3 444.3 moveto
-12 f0
-( ) show
-18.1 431.6 moveto
-3.3 3.3 c  fill 
-31.5 423.5 moveto
-12 f1
-(Wilde, Kim) show
-90.8 423.5 moveto
-12 f0
-( ) show
-31.5 410.2 moveto
-12 f2
-(1981:) show
-59.4 410.2 moveto
-12 f0
-( Kim Wilde ) show
-31.5 396.9 moveto
-12 f2
-(1984:) show
-59.4 396.9 moveto
-12 f0
-( Teases & Dares ) show
-31.5 383.6 moveto
-12 f2
-(1981-1993:) show
-87.4 383.6 moveto
-12 f0
-( The Singles Collection ) show
-203.4 383.6 moveto
-12 f2
-(\(comp\)) show
-237.3 383.6 moveto
-12 f0
-( ) show
-18.1 370.9 moveto
-3.3 3.3 c  fill 
-31.5 362.8 moveto
-12 f1
-(X) show
-40.1 362.8 moveto
-12 f0
-( ) show
-31.5 349.5 moveto
-12 f2
-(1988:) show
-59.4 349.5 moveto
-12 f0
-( Live at the Whiskey-a-Go-Go ) show
-209 349.5 moveto
-12 f2
-(\(double live\)) show
-269.9 349.5 moveto
-12 f0
-( ) show
-18.1 336.8 moveto
-3.3 3.3 c  fill 
-31.5 328.7 moveto
-12 f1
-(X Marks the Pedwalk) show
-143.1 328.7 moveto
-12 f0
-( ) show
-31.5 315.4 moveto
-12 f2
-(1994:) show
-59.4 315.4 moveto
-12 f0
-( The Killing Had Begun ) show
-18.1 302.7 moveto
-3.3 3.3 c  fill 
-31.5 294.6 moveto
-12 f1
-(Xorcist) show
-68.8 294.6 moveto
-12 f0
-( ) show
-31.5 281.3 moveto
-12 f2
-(1991:) show
-59.4 281.3 moveto
-12 f0
-( Damned Souls ) show
-31.5 268 moveto
-12 f2
-(1993:) show
-59.4 268 moveto
-12 f0
-( Bitches ) show
-101.4 268 moveto
-12 f2
-(\(EP\)) show
-124 268 moveto
-12 f0
-( ) show
-18.1 255.3 moveto
-3.3 3.3 c  fill 
-31.5 247.2 moveto
-12 f1
-(XTC) show
-56.8 247.2 moveto
-12 f0
-( ) show
-31.5 233.9 moveto
-12 f2
-(1982:) show
-59.4 233.9 moveto
-12 f0
-( Waxworks ) show
-31.5 220.6 moveto
-12 f2
-(1983:) show
-59.4 220.6 moveto
-12 f0
-( Mummer ) show
-31.5 207.3 moveto
-12 f2
-(1984:) show
-59.4 207.3 moveto
-12 f0
-( The Big Express ) show
-31.5 194 moveto
-12 f2
-(1985:) show
-59.4 194 moveto
-12 f0
-( 25 O'Clock ) show
-300.2 247.7 moveto
-12 f2
-(UBL Card: ) show
-357.5 247.7 moveto
-12 f0
-(1044) show
-381.5 247.7 moveto
-12 f0
-( ) show
-18.1 181.3 moveto
-3.3 3.3 c  fill 
-31.5 173.2 moveto
-12 f1
-(Xymox) show
-68.1 173.2 moveto
-12 f0
-( ) show
-31.5 159.9 moveto
-12 f2
-(1985:) show
-59.4 159.9 moveto
-12 f0
-( Clan of Xymox ) show
-298.1 173.7 moveto
-12 f2
-(UBL Card: ) show
-355.4 173.7 moveto
-12 f0
-(1295) show
-379.4 173.7 moveto
-12 f0
-( ) show
-298.1 160.4 moveto
-12 f2
-(See also: ) show
-344.7 160.4 moveto
-12 f0
-(isvpc146.isv.uit.no) show
-435.7 160.4 moveto
-12 f0
-( ) show
-18.1 147.2 moveto
-3.3 3.3 c  fill 
-31.5 139.1 moveto
-12 f1
-(Yamashirogumi, Geinoh) show
-157.5 139.1 moveto
-12 f0
-( ) show
-31.5 125.8 moveto
-12 f2
-(1990:) show
-59.4 125.8 moveto
-12 f0
-( Akira ) show
-92.7 125.8 moveto
-12 f2
-(\(soundtrack\)) show
-154 125.8 moveto
-12 f0
-( ) show
-18.1 113.1 moveto
-3.3 3.3 c  fill 
-31.5 105 moveto
-12 f1
-(Yazoo) show
-63.4 105 moveto
-12 f0
-( ) show
-31.5 91.7 moveto
-12 f2
-(1982:) show
-59.4 91.7 moveto
-12 f0
-( Upstairs at Eric's ) show
-31.5 78.4 moveto
-12 f2
-(1982:) show
-59.4 78.4 moveto
-12 f0
-( The Other Side of Love ) show
-179.3 78.4 moveto
-12 f2
-(\(single\)) show
-215.9 78.4 moveto
-12 f0
-( ) show
-298.1 105.5 moveto
-12 f2
-(UBL Card: ) show
-355.4 105.5 moveto
-12 f0
-(4309) show
-379.4 105.5 moveto
-12 f0
-( ) show
-298.1 92.2 moveto
-12 f2
-(See also: ) show
-344.7 92.2 moveto
-12 f0
-(rt66.com) show
-387.6 92.2 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%Page: 31 31
-%%BeginPageSetup
-/pagelevel save def
-54 0 translate
-%%EndPageSetup
-newpath 0 72 moveto 504 0 rlineto 0 648 rlineto -504 0 rlineto  closepath clip newpath
-31.5 709.2 moveto
-12 f2
-(1983:) show
-59.4 709.2 moveto
-12 f0
-( You and Me Both ) show
-31.5 695.9 moveto
-12 f2
-(1983:) show
-59.4 695.9 moveto
-12 f0
-( Nobody's Diary / State Farm ) show
-204.7 695.9 moveto
-12 f2
-(\(single\)) show
-241.3 695.9 moveto
-12 f0
-( ) show
-31.5 682.6 moveto
-12 f2
-(1983:) show
-59.4 682.6 moveto
-12 f0
-( Situation ) show
-108.7 682.6 moveto
-12 f2
-(\(EP\)) show
-131.3 682.6 moveto
-12 f0
-( ) show
-18.1 669.9 moveto
-3.3 3.3 c  fill 
-31.5 661.8 moveto
-12 f1
-(Yello) show
-58.1 661.8 moveto
-12 f0
-( ) show
-31.5 648.5 moveto
-12 f2
-(1980:) show
-59.4 648.5 moveto
-12 f0
-( Solid Pleasure ) show
-31.5 635.2 moveto
-12 f2
-(1981:) show
-59.4 635.2 moveto
-12 f0
-( Stella ) show
-31.5 621.9 moveto
-12 f2
-(1983:) show
-59.4 621.9 moveto
-12 f0
-( You Gotta Say Yes to Another Excess ) show
-31.5 608.6 moveto
-12 f2
-(1987:) show
-59.4 608.6 moveto
-12 f0
-( One Second ) show
-31.5 595.3 moveto
-12 f2
-(1988:) show
-59.4 595.3 moveto
-12 f0
-( Flag ) show
-298.1 662.3 moveto
-12 f2
-(UBL Card: ) show
-355.4 662.3 moveto
-12 f0
-(1506) show
-379.4 662.3 moveto
-12 f0
-( ) show
-298.1 649 moveto
-12 f2
-(See also: ) show
-344.7 649 moveto
-12 f0
-(newton.space.net) show
-427.3 649 moveto
-12 f0
-( ) show
-298.1 635.7 moveto
-12 f2
-(See also: ) show
-344.7 635.7 moveto
-12 f0
-(rt66.com) show
-387.6 635.7 moveto
-12 f0
-( ) show
-18.1 582.6 moveto
-3.3 3.3 c  fill 
-31.5 574.5 moveto
-12 f1
-(Yes) show
-50.1 574.5 moveto
-12 f0
-( ) show
-31.5 561.2 moveto
-12 f2
-(1972:) show
-59.4 561.2 moveto
-12 f0
-( Fragile ) show
-31.5 547.9 moveto
-12 f2
-(1975:) show
-59.4 547.9 moveto
-12 f0
-( Classic Yes ) show
-31.5 534.6 moveto
-12 f2
-(1980:) show
-59.4 534.6 moveto
-12 f0
-( Drama ) show
-31.5 521.3 moveto
-12 f2
-(1983:) show
-59.4 521.3 moveto
-12 f0
-( 90125 ) show
-298.1 575 moveto
-12 f2
-(UBL Card: ) show
-355.4 575 moveto
-12 f0
-(1038) show
-379.4 575 moveto
-12 f0
-( ) show
-pagelevel restore
-showpage
-%%EOF
-
---------------167E2781446B--
-
---------------outer--
-
-eof.
diff --git a/tests/ui-tests/test-multipart-mixed.msg b/tests/ui-tests/test-multipart-mixed.msg
deleted file mode 100644
index 5216c6d6b6..0000000000
--- a/tests/ui-tests/test-multipart-mixed.msg
+++ /dev/null
@@ -1,377 +0,0 @@
-Return-Path: <beatty@COSMOS.VLSI.CS.CMU.EDU>
-Received: from thumper.bellcore.com by greenbush.bellcore.com (4.1/4.7)
-	id <AA15292> for nsb; Fri, 28 Aug 92 15:13:14 EDT
-Received: from flash.bellcore.com by thumper.bellcore.com (4.1/4.7)
-	id <AA15320> for nsb@greenbush; Fri, 28 Aug 92 15:13:12 EDT
-Received: from COSMOS.VLSI.CS.CMU.EDU by flash.bellcore.com (5.65/1.34)
-	id AA24840; Fri, 28 Aug 92 15:13:07 -0400
-Message-Id: <9208281913.AA24840@flash.bellcore.com>
-Mime-Version: 1.0
-To: nsb@flash.bellcore.com
-Subject: mew-law encoding?
-Content-Type: multipart/mixed;
-	boundary="PART.BOUNDARY.2418.16114.COSMOS.VLSI.CS.CMU.EDU.715029153.2"
-Date: Fri, 28 Aug 92 15:12:35 EDT
-From: beatty@COSMOS.VLSI.CS.CMU.EDU
-Sender: beatty@COSMOS.VLSI.CS.CMU.EDU
-
-> THIS IS A MESSAGE IN 'MIME' FORMAT.  Your mail reader does not support MIME.
-> Some parts of this will be readable as plain text.
-> To see the rest, you will need to upgrade your mail reader.
-
---PART.BOUNDARY.2418.16114.COSMOS.VLSI.CS.CMU.EDU.715029153.2
-Content-type: text/richtext
-Content-Transfer-Encoding: quoted-printable
-
-I recently got hold of a filter that davecb@nexus.yorku.ca wrote, and whi=
-le
-it's not perfect, at least I've been able to take the "No NeXTmail!" slog=
-an
-out of my .signature.  And now that I just thought of such a terrible pun=
-,
-as is in the Subject: above, I couldn't resist inflicting it on someone,
-and you seem to be the most appropriate victim.  Anyhow, I guess this is =
-a
-"fan letter:" thanks for MIME.
-<nl><nl>
-
-
---PART.BOUNDARY.2418.16114.COSMOS.VLSI.CS.CMU.EDU.715029153.2
-Content-type: message/rfc822
-
-26-Aug-92 22:15:02-LCL,22076;000000000000
-Received: from po3.andrew.cmu.edu by COSMOS.VLSI.CS.CMU.EDU id aa13358;
-          26 Aug 92 22:14:26 EDT
-Received: from sqhilton.pc.cs.cmu.edu by po3.andrew.cmu.edu (5.54/3.15) id <AA21478> for beatty@cosmos.vlsi.cs.cmu.edu; Wed, 26 Aug 92 22:14:07 EDT
-Received: by sqhilton.pc.cs.cmu.edu (NeXT-1.0 (From Sendmail 5.52)/NeXT-2.0)
-	id AA21178; Wed, 26 Aug 92 22:13:24 EDT
-Date: Wed, 26 Aug 92 22:13:24 EDT
-From: beatty@sqhilton.pc.cs.cmu.edu (Derek Beatty)
-Message-Id: <9208270213.AA21178@sqhilton.pc.cs.cmu.edu>
-Received: by NeXT Mailer (1.63)
-To: dragel@sqhilton.pc.cs.cmu.edu, beatty@sqhilton.pc.cs.cmu.edu
-Subject: mail from Wacky
-X-Next-Attachment: .tar.192.mail_from_Wacky.attach, 23976, 1/1, 33000, 0
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary=n2m-MIME-boundary----------
-
-The following is NeXT mail translated to
-MIME format with n2m. This always starts
-with a file called index.rtf, which is
-the actual mail message in Microsoft's
-proprietary rtf, containing references
-of the form "\attachment<number> <name>"
-referring to the other components.
-
---n2m-MIME-boundary----------
-Content-Type: text/plain; type=microsoft-rtf; name=index.rtf
-Content-Transfer-Encoding: 7bit
-
-{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
-\margl120
-\margr120
-{{\attachment0 VoiceMail_beatty0.vox
-}
-}
-
---n2m-MIME-boundary----------
-Content-Type: audio/basic; name=VoiceMail_beatty0.vox
-Content-Transfer-Encoding: base64
-
-LnNuZAAAAJgAADsAAAAAAQAAH0wAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+cW9ze/Lg09XT
-09/d7W/56e30+HH29/vybf/x5eP6dm11b2FeW1dXV1xjZXR5b23+dmBaXmRoa2psb/9wcXLy
-6OTZ3ev+WFNYW3zk3dPNzs7N2uj0aWxqXmNjWlxfcOrk2tjW0djqfWFUTkpKSktOV2NgW198
-/Pfp4Nfb3+Hz+2piYFpt/Pbr9f1uZ3P23tTY09HT2PF0bGJmbXLv4Nza3+j8b2pfW1po+vDk
-82plY15ZXFxeXFpoaGRsXVVXXGFibO7f1NTc7Gx4fGrw39rX3dnd83dtcv/m3t7h9vrn72ln
-YWFdXW57cmhpY2VkaftybW9lbnBoYldYYWf67f9nX19lfHJ89fD6cG59++Xe4d7b2tvc5OPi
-3+Ht5OPo7Pzx9PnzeG5xa2FhW1haXV9YWllYXV9tfXJraGllZWFt9+XZ19bb2d/veGRfWltl
-c+ji6/b9b2hoaP3c19fY4Pj15+Pd09HU0tjlbF9ZS0lJS1VhZmZhY2RdX2ReZV9ibG3+d2df
-XWVte/r983z7eWZmX2d+7tvV087O0c/P0trj/3ZtaXNx6+z68Pv6d3b28e/m7HphU05LTE5R
-XGd0697W1+Hn7/ZsXFZST0xOUVZcc+3k29fX2Njd4up8bv3s4t/d3tnZ3Nvg4vn8+WpxfmJc
-VlVYWWlv69zb2+NsXF1eX1RRWltfWVhdVlFTWGrs3tbW3N7i5u18/Hb/7Oze2d3j4O94eHR6
-++vv8erv5+ni5e/s7//w3uXv/2deWVhYWVVYYWRiZWNr+nFxY15jVVlfW11kX1/939na39rT
-0NLX2+TpfmNud/vxd/Tq2s/S1tnjemlgV1FQU1pjbHJ18vDq6v50ZFxVVVdQUFBNU1lXYXXk
-2NjZ2t77YF1iaW9w+ODe2dTR0dzh7fx79urm3d/r5fL09m/0/XdybGxqYl1nbfTp5t3c3eV5
-XVdNS0xLUldcb3j5/+7n7HlkaWddX2xyem53/3NzduPW0M7P2+t3fv1tfvzs39rZ2d3v7vdv
-Z11ganL4+3JlW1tfX1tebG5sZ1xQSk1QV2br3NrZ1tTj7u9oX19j++rh4fv07Ore2tva2tve
-aVlZVVdcavnp2tLO1eh7YlhVVVZaXF5eYm/89Hx1en7s4t7n6PNpYl5XVFxu/PXi3ur1/Xxv
-ZGVmXV1lbu3a1trY0dHV2dnf9vbu83FlYVtlfHL07uvnfXNkVVBMTU9SYWlxbWZqZl1XUFBb
-Z+ve9Oze3dXZ4eXj3NPW3uh9/2x37u3h4ufp6+z2dWxgbHhpb373+fHve3FpZWxscfbvfW9f
-Uk1NUVNbbmtpfHh+7eng63vv8Xt7a2Ztbe/h4N3e2t3f3N7o6vbq6vz07e3yeP3qdm/57/T3
-/n309nZtZlhWWFdYXGRjW1ZbXlhSUFRdeefh2tTU197d2uXufW9tZF1YXmd99nfw8ebf7e/s
-6ejr8vH9+urp5N3W1+Dt83dsXVlfXl5hXFZVTk9QU2VvbnJy/ezr6Ojl5ffv7/Dq+OXl3tri
-6O7x7+rm3dLT5X5lX15cbXZ3/v7s7HJfWFZVX37r5vrv3ud5aGFjX15dWFdWU1NRVlpbYWFs
-/e7l7vdybXBqaf3n29LS0c3O1t/Z1dbZ2NjY229mZmBpZGNdX2tiYmNbW1xgaGVqZGFgX2Jt
-fWttaGl0eW1pZ2jq39nceGRZVVhbY3zx5N7b2Nzi7eXe2dLP0tfe4/X79XH6/Ovi5OLl43dc
-V1lYTUpLT1FPUlBTXWVqbnbt5O14cWtmX1NUXvjb0s/OzdDW5/94ZGBlcvZ2dHl57OTf3+je
-5Ozs9fZ89H1tal9lZ3Dx/25nbHt4evxybGtqbmNfXVlZXF5fY1tTXHrr6Orf3uXn6ur3aXN7
-/d7d1s/RzdLV1+Dk5uHl9v/9bmVfW1ZTV1VTVVJQWFRPWGJ95t/h4eXu+v31/v96cG5jXl5o
-Z2p19ev8cmplZmhsdfTr5Nvc2dbU0dve4+no8/j2+Ozk3N/vbmdlW2JfVlZWVFRUUlZcY299
-bHrudW5iXGNeX2NvbXrk29HR0tbb5ubk693Z19Xj6OL4e2tfWFZbXWZ5bGZjXV9ocfTr4dbe
-49/5a19j+ent7n3s/V5ZTUtMSk5UXmJhdO7g4ejf6ezg5t3Z4ud8/+3n4u/p593c6eLm4Oh4
-dl9rfHrweXBsY19scmxtXFhZVVVOTVFTX23y4d3e7fTr4t/f5/jy7vZrWl1u9NnV0dDZ3fho
-XmV6d3RjdOl7dGtkX1xnfuzWz9HV3+XzamJcW2FXVVtcZmlmaGBibfHp9HhiXV5ZVFNZZ23h
-1NPP0Nj0Z11kePTq3tna3u93bXN77Onq5efubWFiaWxpamdvemtlXF1eYGBhYlxoaWRsa3j9
-fW937Ojm7+7l5+v07+7/ff979vju7H5vanv9dfLi3+X77+De4fbt4er/efr/fPjk4eDe3up5
-YFFLR0ZISkxPVmP96+jn3dzd5u36cP78fPvud29+9vHt4+ne19rlbFpQVVlbaXfq7unV0tzh
-9XTx+vdyXl9XWGBeWl9zdPbm5OpybnppbGlnY2d3fOrj5ezz+HtlX2Zpam997+zl3NbV3OXv
-eG5tb+/s6dva19fV3PL/eG5iU01LSEhIT1pqevjc1NfW1dvqeGJsaF5gXFpcX2FgXV1p69fS
-z9fn9Wty/P3u7N7X3ePq8HhpbmlhZ25++HFhV09NT1VaX2d0ePvq3+Dk6ufo6ubf3+95cWZZ
-VFVXWlxYW2Fo89vV2NTPztXg7vbl5O/q39ve5Obp63z97f95//11bmJaVlBYYmZ78fHm4fNj
-WVhcX19eW1tbV1RUV1haZWv04eDm+/jq5ePj29jQzMvN0d7u6ndfW1xic/1uZ3F2aGpva/Pt
-5N3l7mNbVFNeXWRsfd/j82NXVFBOUVVZWlx1ePvw/ejo29DMzM7R2d7vcl9bZvfh3OD1dGl0
-ZV5jYn7z7eXt5+Pr4uf7+XhtY19kYGFbXWtwdPj9fvrx82NSTExLTVpefeLh3tzZ3NbP2t/e
-625nb3d6fvv16+Hf4ux1aGZjZ2pzc3Pq7Pf7dnD9+XxwZGNhVVRUUFVaX2Rrb25rbW5oZWV5
-7N/Y2dzl5efc19zi7OTs+nj68fDv6OLn7u/1fu37bGJUXmds7u/l5np+8fp5/P7792tcX11W
-T05UWFtncnVxbG13/3vq5+/s7+zxdG58/Hv/9e3r4d7Y2dvX3+rtfmtsbHXt3t3f3+Df7Hpn
-X2FbWVVPV09OVVNUWl1jXVNXV11oX2Vlb93U0M/OzdDNz9PX3eZ5dm9kXFtZXWhraGVy+uzf
-3+Xk6OTu9nx0/Wxufu33ePT073t093txZ19dWVlYXmBZXWBrfv/+/Xr+831++nX+7PD7fOvf
-2dPY3ub16tzb3eLn5nppaGBlW1xdVVhUT1JPUVlbYmh9/m95a2xrfOvg2tvj5+n9/3Jo+319
-+Pzu/Xj/efj+aHHu6ert3t3f3dzb3uTs7OXi3+ri3+fr/mdfXVtdXWFeXFxdX2BeXFZRUFRX
-UVZdYWhv8ebh397d1dDY2Nbe5/dtaW3t4t/d4+Dg8/T15+vf2flkXltYWVxfX2dob+7p421Y
-V1FTUlRbYG1v//T+bGVoZWht8+Pr9v9pXmRofOjf1NLb3N7zev57fPHu6eTp5ezp397l4ebq
-5OLi4Nzna15YVVxaWF5lY1hYWVBRV1lcbPLp5uLf6PHv5enq93ZgV1ZVWF5gft7b1tfc4N/l
-8+jo4dXV1dTU2On2+2dfXFpXV1dPTlFbX1laYHB0c3dtZ1tdZGJk9e/46eLj7HpqZmZibe/k
-297t9XR99/7p4dnRz9Lf6+13ZGR373FfYV9eanF97u/b0tTb7+7+X1hTU1peY37/9GpdXVdX
-WFtkdX53ZGFcWFxhanH139nU1dvW1tzY0s/U1tLT19zo/3tdUltaXWJkdX11ZFpaWltdW11l
-YV5aWV9aW19p+nj/7/t0eO75anRvefFoZnVmaGdr+fLp5+TWz87P09TT1ePr93lmXWRdXmx3
-79/d3+fz8356fmddXWNdWFlXXmFdXVpZWVpjc/Xo8fLw9+Pe19DQ0dvsbV1gYV5cXW/t7Ovg
-3epzdfvm3+vs7v59fWRfZXb/9/NvdP13bGNcWFZYYGhsa2dhX19ZVllbXlxpenH97+fd2dTU
-3e3/5Nzt9vj44tjV1tna3uXtaWjz83doZ19ZVlNXZXNoaHbr3ehybG1u/ejyfHhqXFdcW1tq
-cujd5uzv7/X8a2NjX2VrZG91b+3j2M/Nzs/P3ev1amJz+//u9HR5dWxrZltYVltibfVyYmNe
-VlRUW3VsX2JZU1hUU1dbeeng3eLc297h4tnY0s7R1Nvne19fXVtq//Pt7OPj5uPv7+n9//dz
-e3dvbWVgZGV47OXf6u52X2BhXlxbWlxfZFxaWFleZ3p5/unu/HhlYmp149rW2N3Uz9XZ3Xxv
-fe7h4enzdfnp7+7r393l7HZWU01JSkdKTk5RW2N1/f3u7u7n5Ofq6PNvbGpjaXD74t7d2NDS
-2ufue2ZwaV9eXGRuYmb66Orn393e2tzg5ern821iXWNnaGNqbXP9bntzX1tVVVhXXW567eLb
-2ujzamVvZHHz/vfs5t/g93VsbOrn7/VoYmz23dvb2dzb3Nvb2NvtcmRcVU9NTExPWmdrYFdV
-U1xeW2Vrcmxq9XRlY2P88+vZzsvKy87Q1OF3ZFtVVFNYYm70397p6PN98fTv5une2+Hp7/j4
-9GxdaGNhblhRUk9OT1ZfaGv67uro7uzh5O7x9+/t6u5+fv729n3p5ufr6u58ZVxXU2Pu593Q
-ysbIz9Tf5exrc2hlXlNRT1ZcYV5XV1xfW11fXV9aWGJjau34bPt7b3doX1hYXGfx7uTY19vn
-9uzm8/rt69na2drk3dva1tznfWlfYVhWW1xgWV1zamt17eHi4+n89vRuYmN3Z19nZWxfXGhg
-W11ibnl7dnf1+fbi2tDQzczSz87S2Oh5al9eXWRtcHBpamNfXGJfXG3+/29kZV1aWFRUWWBp
-bXN0eHz+em1dV1lYXGp2b/T+/Ofk3djUzs/U2d/5//NveGpibnvy7eLX1tfa6vd7/f1vemNc
-YlhYWFpcXWBkbmNlZFlgaXJqWl1XVldVXHjl18zGxMXH0e59altWVFVcaHL15dza2dfX1tLa
-3dzv/2NcXV5z6t7q6u96clxXVllXU1dVU1RRT05PUl1cXHL87n59eX3x/vXr39rY3Obt/nty
-bnrk2tfc3Nnt6tzd3tvb2tvkdF1VT1RXVl1cWltbZG1lZW1+6eHb19ra2uHmb1lST1NWVlJV
-WXHm5dzX1dTX1tnf5X1yZ19gW1tv7NvV0M/T2Nnfffx+aGReV1RPWGBaW1xneHd6eGxsZ2Nm
-XVpaXWNubGRaVVZYavHe1tLR1t3e3O365t7c4fHs6uzw7/J2dGtufGxtcW1xdHNpX11gYnLn
-5PRvZV9cWFhm/+Ti5fFweW9sZWlkX2JqdW747vDd3d3T2+vs4NjX3uXub3Vlb/N88O94cv9y
-bPj8+Hhsc37p/19bW1pgXFpZVVpYX29m++ji3eLj4fRtXVZRU11ZX296fvrn6N/c3Nne6u3p
-6PHx6N7c3eLo5+7i2+Lj83Ryb2Nea2RhXF1eVE5PVFhga3JsbGVrbV5pb2lubG729Px78d7e
-6Onf3tjT0Nvo5e7t+ntvaPr05eDs7u7i4+31fPtxYmhcXF1ZWVteaXn+/Xz8bWFbU1BSWVxg
-aXjv+21rdnF0c//+5trf29na3eba2Nne7/R2/WVeY1xcY3rs5+Hc3uv6dmZgX19pbmRteG9o
-Z2djbHhwYV1cWVlTV1team156dzi39/i2+Dv7urh39XX3d7e3Nzh7vL092xobnv/eurl4t3h
-5uxxa2NaWFZaWFhZV1pfXlxXWWVw7urreGRrffv88+v8/WZkamRkYG748ere3d/p5PdldVxk
-a151eXT97t3W1dDS09DY5WtlZGVqZF9hamhobG1pXFdcV1NZXmZiYmJfWl1qb3n94NvV1tnY
-393z8eLs4d3b3/Hf6O/1ZGZ3bfzu9uLk/GhcX15p7Ovl73NtYV1gZGJufHF89X399fPlbV9p
-cndfZFZQVVBba354YV5gYWn86d7Sy8rLztze6nZlZXdsdff4fX11bfbn5/D7dmRZVE5MTktM
-V2f593pkZG17/nTu3NPO22xdbO7o7N3Pzc7X1dTa7Whu/+19aW1cWmdeWFNRYmlk/fTf1t3m
-6+Pe5Hrm3uTkam5nWllQTE1NTmdrYmlu5etzaGFjZ2Nq7m/x52/s9ffc0srL1d7f/HV2bvJ7
-9ebe3+Lrb/5hXFlaaFJOWVlaW01XcltmX2DseG/t5ej7Z/fb5d/v7t5xeenn5+j95t996295
-c1Zlef3/+OvT1eHeam/vaHTv5eHpdOPvYnJd+/Jd9e/5bF9cWFVQaXDq3XnscGNnXltjWk9h
-XmplTllYX3lv6M7MzMbP0tTm1dfa09vse2tbXk9PVk1bY2zs93T193Xva2piWWpwYV1eW2xl
-YO324d/s2+ns61xOVU9PWlj24+/Ry8rKzc/N2vR8XWdmWmZqZmds+eJ+/e3t5HdmYmJeXVxf
-b1xx6+jg5dnX321na2x+WV9tamhRUFlbWVtd/OJ05vJ2dV9kcuHV0trR1e7Z3dbc+frv3vP7
-bX1eVFtYal9cafXd7uv++F5TW1RcVE9cbn1lZmpyV1t0b9zf29HQ2vTm93leaPz82+Lc6HBp
-Vltq/mbr3O3Z3tjT2N3u3+znbnV5aHVTXW9sYllsYWJcZm5o6WRk+m9yanZcU1BUW1v8+ezm
-49zt2Oj06vvb6t3gdP1x7ufb2tnb39vs6XJXV1lgZHFpbfh0+11mYVZkZf1pffxtZlNVT15l
-XX545vLvfHJ5ZeP14Odl697Y6un3ce5z8Xju39/b29Ti3t/p6fbg9u5vWl1ZXU5SW2dvXfr2
-fHJfW2BgWG7v6W5q7WFnYllt9+D/7edxW1p9+uTm4dPKyNna5fxta3JfbGR14NTP5+f2enhv
-7Ork4fdyYllNTExMS1d7YXduWldRTElf83n34dff4eTt/nh+bdra/HZod15jbF9ndN7ZzcbO
-0tTT6O7b7uTf3+975l5OU1pZYuH1fvH7YFFeUFlmaW9k7GFXV1RYUmdcYOfs91xuYFp1b31r
-29TWzNDU5djZ3tHa2OzZ319uaPV27OHy2el9X2BuW19dWlpZYFVST05SXm9fa3n7aV9pZnJh
-Xm357OnudfDvb3Tw4dzd393m4O5gdW136dfLztTf2djV1e78Zl9TTFlZV1lZbunf6X5vam9u
-9n5bYWFfaWVmVVJVWFtd+m9ka2l8/+Xd2tXa2eTm3eLl6N/2/uPe2ebq/nXe4PNsZn1u893h
-eWzyZmR5ZVlbW1ZUXlZNTlFYUVxpW2dqZ3bq2vDz3dvd6t7xbXhncejY3+ni9+bs6Ofs3/b+
-6eHj49/m6ubr9O3feF5jaWRmbG5eXl5UYHF6Zl1eXGV3c19fZldfbH5+eftsavbm93n5c2v6
-4dnc5nV66+v493pr6t/b1tXY4vTs397Uz915bnBdW19VU1VUW1tnXlFWVl5obW9eZGZdXFlg
-WVJYYurj4+Hj1dXTzs/L1+Dd4N/r7uxuaG7u59/f825kYF1kbGhaUVJYW2dnYGx+6/7v2ufs
-9XJ+ZHBfVVdXXVvr1+jk39zxdup1aGNzZGff5v3w3N3o29Hd9PVqa/3sfmVvem923djee3dz
-dvVqV09XXVpodmhbWWVqaXBoVFReXlxbbnxfYP3te/n7W2fu6+/XyMrOz8zQ1c/c6Ozs8nPb
-23NdXGVXU2FfTk9UUlpjZllRX2ll79nZ4N7d3/jt/Vdd8+lwZnZrYWViXF/5cmBj/uV49OZu
-af/t9uPP1uLi0MzXz8vV7Pd0XX3id15h/2FYanNdVFlaWGRtXFFNV1JQanx0Yl9vY/n6W1dd
-5e1y3uFwfN/Z3tbT2+rr3+vp39vm/u/0fN/Z6nt+9l5Zef9dWWVlbOnyfX11b2dq+PNdWGZm
-Xm/+Zl1cYFtm/WVVV3NgauHc3+7f2dzb2dv7at/e49nk+Pnx9e3l2tfscndcW3Roa2Vo5tfe
-4+RvXGlrY/NqXV9MSElLVVROTFhfYevv+unt3dXf3tve7+bZ3NLX7G9h8eHm4t/ucf5pWm1u
-ZXho++J49+94bP35dt/h7HpaX2VicmheXGZqX+zm+HFXXGZfZ21dWmpnZ+ff4/9p9eze3uL4
-59bf6dvX5vjx5Nba2tnm397vYmhvXV5UWF9ZVlxZV2psaeLsd/9cXW5kXWFSTVJPTV9taHl2
-6dzd5djW6dnU39TW5v9faur+au7s9+jh9N3fdvZmY/DufOzj6e/yYnjuX2xWVW9qanJra2Vi
-W334XV5WVGNmWltdY27r8d3Z79/rcefe9+ff293b3dnX9OfwX/bq7OPs8WX+9nF6XP7tVnzc
-bGpobV9dZW75X2ZfSk1RSU9aZ2v42dXW693fW2zfbnHx6f128P31aWn8XXzT4Ord2+Xm09LO
-29nO6PzlWU1OUE5KVV/3eHHoWVnrY1pud29eY19eXFdkWF3Ny9nR0eJ0+n3v/2n0a1/Y21tk
-bGNccOHb2tTL3Xva4F//3Oxpeuf5/29yV0ZSZVRab3ds6Nfe6vjyWEdXZE5RX1RPWmV5++/Y
-1uPVyt7p1uVra/n/e/Pq6WBj1uX70dji5t3e7vxwYU5W9V9UbnhqePPq3+jo4mtZcFNET05O
-UllfZH3s5WBb5uZm4Nnm493V0NXRz+T22NZu+21dYGZya/n68G1d5etZ5+B0+3Zvd+Pe331W
-ae5bdvBgXVxbVltVWlhQcfJo3dPu9vX99uzu7GpX+uVp+upmXF1h7dfc3Opq39R689746NjT
-1NTf4nZXZWtOUlxPUVlSTVVRUlFNb+5n7tPa4t3j8+3z4uB63tlxd9t+ZvL/b+7w6vxYZvdZ
-Ydvd2tDP2Nvf4vldat92etTd7Ox3XWNfZmRQUlxTUmtaU11jZPvo5eVoXnFfVuvqcPbxbn3/
-ZV5XY+PffNPY8fP55t7Y2Nro9tbUeuTpZGJaW2BoX1xVUV12W3fsXm348/9samthXXjfaWjn
-b3b2dfbt9nddV27hXlb0/e3j4eDf2tvpbnPf6fPT5vXd4OXf4drl/O7t/GTpemNr/3N4d11X
-TVBcU09naGNmc3r17GZmWVRfbmD37m1seG1o7G/959zQz9ve3+t5evt33+Lj6X3/cVZWYGd3
-/PTv3P5eVk5NUVlh5NzS1d777OxfWE9QXHH02d7b2Ptj8+Zzcv1wbv1teWdrdmZq39LU1NTa
-8/xt/2peZVlY/9jmevX3bPDq5ubu5fJreN7vX15ZUVZYTU5XZGhYZ9rd/H1rVlZpbGNy5t7v
-69jb6t3X4PXZ0+7q2uJqW/niamNrZFdu8l9eeXZPU2f8emvo8Wbj1Hd43u9XTFn0aVljcWNs
-3Hxe99/scOvZ3ujm9WFm4WxZ7tjrdOXW1+fg6FtPbu1l79rnc+jb1+Px625n5uVbWV9XTFBd
-ZmRicVxSXX5jaOfoamtreOn09Whn7tba4dTY6fz8fevvZVxYV2JmZu3q/nrh1dDP1N7/Y2Zq
-WFdXVlp29t7b7WtXUU1TW2z2fnt4X1/x9XNpfO7j2NjS3Ph3b3Lk3vlveOji6O53ZWFeXWTl
-z9fua19XW2Fo7t7d3+fUzd9dT1BQX3zv3uPvb1FPY1pMTmFvb9vd3tvs+l9c/fldWGlfV2n0
-6ufXysrNxb/M3uHxW11nXFpfZ11XdedgVVVZT01cVFJaXlNLVvPq6+DU1drW3+Z7YmBRXNva
-e19mYVltb2L83dXU0snH2fr+bFpkcGv8/O1tX3ni72ru43ru2uLq6/ViWXbc52tZUVNPXWtm
-cW5hVlZw83BiYHp0c3loaX78aWjj0d3q593T0MzN09TY5mxo5vBeU1VZTE1SVl1s6/z32Nbe
-ZGZlT01NTE5QWV5h6N7e5ObU2t7W19/o7GlVUmJcTk1bZ17z0tPX1Njd3trQ1ejl3t/s4995
-ev3u39vT1O9kX1NQW15RT11cV1pbW09LUVNPXuXf3tfY4Xt09nBYXWtlceXh6t7a2dTS1dHV
-2dLW7OrZ7fDqcGFZVVlVUFVYWFxvZlZTU1FefeTlZFpWU1Rn+vXk3trd4t7Y521fXFhp/Ftd
-YWN0c//o4eTb0Nba0+rv7/na1tHLyszS2+1eZ15XWFBaX15faGJYU1hXYuDh72hvXk1LTk1M
-TFRdadrb1dva09TR1dLS2uLn7drc4fNj8ufv+e7n5m5tZ11pXlxVU1pgbW7/9WlfYWby7nRq
-bu/e33F3bV1OTE9RY1xaX11ucmRrbvX9Z+zc09Dh39vOytLY3dTN49zT3Nh7WVdPXGBaan7k
-blpxa/36dfhiZ3dgXVpdUk1YX219Z15fddvZ7mx+/FtbZmro5fvf2tTP2d3b2Od4aF5eXVZe
-7NzN0ePd1tjkfndqbGBPUFBf+2dne3j7bWh4ZnxiTU5LTVVTXnPs53Fvbnf6YWTy4t7ydvbk
-2NbUzszN1tXP1NHW6O1sWVRRV1575nr67vtrWV5gZWxpaml1/WVaZlxUV1FVXnj/Xmvm29ns
-7npzeWddWV9gXF12593a3dXW083b59jS3XV2/HF3YWbj3dfX7+vk5vtlevr/aVFSTk1TTUpN
-VVVLTVlr5eHc4/Xm7mdv8uxdT2Fw6t/+/3P63d/n3dDP4uLc4NnsZWxu8OP3/e3j73Ll4dnS
-73Z3YWVQS1RYXVxea2/r5Pp5aWZkWVZZXmJi/erc1d/n5eXk9W1ye3L5d2R36+tya/5v7eXW
-ysrM0tfe3vNqYWB4cW5la19YVUxMS0xIR0tXaW57evV5fXJfWVlaZOno2+d9e+jY3NPO1dHV
-9Pr1bv5jbOTg3eTP0+Te3/BrZXxnWnv4fW5kZ1xdZF9hc3D0al979+hmWF1ZWFpSW+7h33f6
-3+fobmZrfu33bXPvfmFXbN3PztLPzs3L1ODi7PlZTllYZ3Fr8Xls//r363xkVE9YYWBZX1tc
-ZFtkbWFcVFFid/D6YWhoZFleanL9/drd1tDRzM7R29/zbXrs7Pbv/+TtbnZqeunvev/+6ejo
-9OrcfXBcXVtOUlhtb25gWllZX2RlZ3ZqaWVvbnL2bPbo5urt/XHu5fLo2trS0s7P5NjW3e9w
-7nBdY2Zz+mZiYVpnXlVMSFhiZ/Pn4+94bGRcXmVuZWR5bmRoaV7+cHz7fd3f3G905Pf0/GJf
-9m5lXmbe29LV1dHSzNba2Nng/llSXFpcVF5la+rv7Ozj+2pWUltaV05WWWNsdHHr2up7XGP1
-allQW3Vpde3r2NDOzM/My9Pna2deV1NNTvXUztHY0tXV8G5sZmpdWV72c1xSWPbm71xlb2FX
-T0xIUUxITljy7ODq3c3R2vNl99vs+3X64utwX/3f2s/OzM3T/ldMTlhgZHPcz8/X5Pve3Gxd
-UlhcWE9IT1NYXWJv39ffenrc1tnxXWjzeV9SVODX6vls3+T4bE9WbGlkY/PKyNDS2crJ1elZ
-b/V0W0tMXf1ZU1/j0M/W6d3fZU0+P01RS05a69bY5mjy83dfXPvl8F5RWPTZ1ujqy8jR53Lu
-5/1WUFv02tfZ3NLT9Wtabtr8XVhdbmZeU05q9mZfZPDfelpNT2p5/W5w2NTdcltv5edZVGXs
-23xZW/71bW51zsPGyc/Oy9f+Wk1cd1xcW2bk3OPu2tLf9VVRb2tdVU9QXGNkaW7b2uX2WWtp
-VVBGR1RobWlf8t96Z1nu23ttXmTt1M/T1czHz99v5dLT3F9VbHjvaV5fYnpvYH3V2HhbWXfo
-a1xPWmxnZmZs+mlUTEtf69nkeeTV1OxjXejxb2lPcdPO2fve2tnsZGXq71ZRT2nU0dt4dODY
-5Xxr5djn/Vln4udwVVhga2tsb+fcYUxERlNoY1FWZeff+m753nRhWl3fzs/zXG/j5OXu3M/X
-2e372M/SbVpk69HY9evedVdLR1N832RQVmzpZFdQYXZbUlH5zcvbZ2H37PxlXe3kdlhMV+vf
-Z1Nc38zL1dvNydVuU1rj1ulPSllu/mRt69bXfmFf0sjTfVntzthvXWvZ5k5DQ1d5YU1HVfrl
-bV9lfPtNQkRZ3dvsa+bMzNLe2c7L41hZd87N3Wxz6vZmVVlp6vVXVF7bztxtW+rZ3fBtZmdc
-RkBEWd3jd2Bq4NHY2NHUz+1cYmXp6mBXT1/oe3Hr3tniZl1aY+ttXF1cZWNr6NzR0N3m4M7J
-zdfk/Ojkfm9iX2BYTUpOUlNTTk9PWWVo8dra5Xpz+eHS1tzta3tuY3FiW2VqX2Vn+dfX1dvp
-3eTo3ubr9GpkV1hxe3RoWGX9593saFxiWlJPWPz6a1lUZ+3h3eXx3u39bm/k3e1gWGrb1+R4
-XGv8Z2Vq7dXRz9vkzszO32VrdGJbWGHb2eHrZWx7cV9WW3L6/15QXmNVTUlP6dHW6Hd9aFpN
-UmLv2+1zaXH3aFdXYvXa5fTk2tHc5/bq29bf7+/h1eH2fW5vY1xmev10ZVxWXWzw9WRtbGpm
-Wl5aVFRUVmB37+Hx5+f79nBuef766uXV0d3e73XtcPXd3NLb6fNdbuvz63v+fWhdWV1eZ3Lz
-19LMys/V6GxbTEtOTU5NSk1TV19oa3B0+ur4+Pfx72hcXGh+29bb1tbb6Off19HT3PD58N7g
-+GtpY1ZNTFVUWVtVVVRde+v47NvY2uTm5ejk/1lcXGnu8Orr7N/tbmpbXmZbW19i8+Tk4t3m
-8Wxr6trO2GhaWlple2Z05NrQ1tXQ0tt+WFNabvb+693b6l5PS01UU01JT118/FxXWWJmVlr9
-2NDW6/zs7Ozr8trMycze6tza4WRXXmzs29jj4/NeUUxPXXZtXFxn7ODkem/m3+J7av7792JW
-V1dnc3X7/nljXlhVX292X1ZWZfHu5d7Xz9DY5+ff1tr9bHDs7ndsdujf3vP629LR4GNdXWFm
-ZmRtd35xV1FYWllNS05TYGBdcOLV1uZ67t3c5vZsYfjf3N3o3dPY5X15dPP4W1RVYGhteW74
-6ud89+bl4vhoa3X4//vuePxrYmNbX21zYV9mZfzvenfv5P1dUk5YeGxsenJ+eHFtcH7u29nk
-4tvW2eDa29ze39/i5/N9ZFxbZvfm3OHi33JcUkpKTFFVV1dbYFpZWmD05dvZ1NHc6W1fXF1f
-au/c08/b5eT48eTh19ne6/v2b2ZfXWNp/+Xf6X1vYFhYWW3x8Ojg5fhyYGFfWlZQVlRUXV1j
-bGxqbGpu/nVrYmFlZGZgZ+vc087PztHW09rj7unr6+76evvu9f9u+Ojm7nd2fXvt5+316u/x
-eV1dW1pWTUpISVBWX2VrfW1sc/De3dne4u3t5//0fP/17vR649vQ0dzf7fLu6un87v5tbGhj
-YGT5eV5eX2luYldWWFtgXl5namJXTk5Xc+nj2tnf4OTc0dXZ4u5vXFxZWWBkaWt46tnPzszQ
-3ODn/vDi+W5gW2FiY3zj5OV4aWdf+nT9emj9Y1dXWmt4bGZrb3V2Zl9eYWFiYmVw7+t2aVxZ
-X+/h4dXN0M7NzM3S1ON2aWd18XpsamhkXVVSX3Rsb21kYV5eYl1dY15bXm703+Dtbl1fWl1s
-Yl5ibfVzdfJ6fHl27uve3eLj4t7r8vD16eHo7Pz47Ovf4efl4NvRz8/P0Nn1W09JSEtPUFFY
-W1tbWlxrdG1dW15haHJ98ez9fe7u6NTS1+5qZFxu/e/e2tfY2dbc29nsbFpYY2BmX11sa37i
-3NbZ2upqXFhYVFRRTUxNUltu/vXl9nJrdd7d6uz7fnpdXGj14NnZ4ujydejh7dve7/h6fnNq
-dm535ujf2NXc3+v9aVpbV1pfaG5sbXBnbnzzfnnn7nBlXVtWTUtMV2ppa//t6nRhdPj07fLv
-6t3Szs/Oz9fe4dzf6Oj4+X1jXV9ibfz/93Zud2lkX2dvZl1gbW7x+W17b15WUFFVWF9oV1RZ
-WV5fd+Te293j3tnf397Wzs7P1NnucW1gXllcZXjr3d/k7Wpqanvn6eTZ3+328nBgXVZWV1pW
-W1tbaWVhV1Nda29tZ15YVldq6uff3NfS2NjY3t/qffro2drh5vF8YmhsbuTd2N7e3+7sbG1r
-bu7p7G9cWV9dWVFLTFBQUldZWVdbYmX73tLS1tzl3eHc2t/o6uvz6vRvaVtVVVxtfuTn7OF8
-a2pfbOXW09ba6PP07u50bmlma3ZnU09OTU5VY3zj2M/O2t/vcnP+5+t+bnL+cWdnbXdnZmth
-Z11eaGJx9uTa19TV09XX2u54bHjs6/h3bmRkZF1jYl5hXVdWW1ldXV1eWmV97+fh4/dmVlNP
-V3r74t7f3ePi5t7e3tra0dTa3ObifGxsaOvo393v9V5VU01NTVFUWWlvbXj69vprb2hq+eXT
-0NnffXnu7vPz/2tnXlxcXF5aYWpu7O/o4d3Y1trf3+jq7+/u+H1rcvt67drZ3OHx+W5582ld
-ZGJbXlxbYGFrb15ZUU5XWlZXWE5NUFv23NXNyc7X3uz18uv9aV1TUGDn3NTS09bk5t/f3d/v
-Z11daXBz6+Xh2t7q731udGJZVk5NUF1rc3dyeG1mZmxtfO7tb19fbXZx9/91Z11kcPzv9Pn1
-9unn6eTe18/Nz9PV1tnmfGlfZWx74uDv4eh5ZlhWT01NSkpMUllgZVxfbv7n6OXme25oZFpb
-aXjv29XS09bb5+/zbl9kePPn39/u+vD/8eT18u3r7nX5+W9kXV9od/Ts6/jt9XprWldUU19m
-Y2dxdmdoXl9iZWtmeOzs3drg4/Z7d3Xo4t/rdG9obWp95OTb1NPW4eHX2dvpeWlZW1hYXlZn
-+X3t8PV1dmVZVk1JSUtSXGhx/+745ut7fGRreWn/8vHm7+Ln7OTv3dPTz8zN0NLe+2pdYmVh
-+/n77v7yZV5hWVZPU1dYU1NaXP3s5dvb2dTd6vpnWlNRWGNieHdy8nr15uPc3+Z6ZXNkX2Nm
-ffbm1c3P19/k3+To3d7g7XL373f9c25wWltVT1dfb2xmXlhbZnj+4fNsbVZYUUtUWGhvYnRo
-b3313tfQ19TO2uJ8Y25v8OLk2tPS2N3ubGVaXmdmZltdbX19bO/rdndoZG9lYn7i4N/hbWVf
-W1pWWVNOSkxZXG/l7u3o39rm39nd09Xa2d/l/3N5cnN479/d1s/P1NrY2u99/mxmYFtVT1ZZ
-XndsbXx3cnpkWVROTkpKSklRXWnz4evc19zZ5eLj9+Ph3tnc0tPY2Off5+/9Z2ldW19jbvnz
-fHp1bmRfcur7d3tmYFVRWGD79OTc3eL7ZlxeWVBVW11jYWZna3Xt2Nvm7ujc5vDy++jm4N3m
-3dnc2+Hi4/T+cGt1e3rzfO7f5d/b4vtnWVlZXFlbZWvybF1dU01MTE5PUlVWV1xreO3f39fQ
-y8nP2OL7dXzu5+715NzS0NTX1tz9bmFaUU1PT1RTT1NbcuLZ19rg9Hl5ZWRjYF9ibWhdW19b
-W2NebHhvfe3g3eZ8/fzr4uXk4tnY3uTy+uvi1M7Pz8/S1+dvbWZWVFZka19fWl9lZmz98fxl
-VU9UU0xQVmBobfl+bXX4+O/n4X15+Ph4ae3v69TQzM/g43BaTUZJSE5j+9DP1dbn5+Le3t/f
-3t7e4nxlX1xjbG5nZF9dX1xZTk5NS1ZgdPji2Nna2dXT1dnq5PtjXE5LSE1hcurU0M3JyMvU
-2vlud2dvdXB0Xmjc2d7l29joe/ZsUlBSS0xMTlVNWGD89O/c6Xd25ebq8/ns9PxqdGxjcm18
-/Pvj8+x9Yfp96d3j3u/s//7f6PNsaG1+7/R2d2RgbWFYXWFgXnjb4elzamhZXlZVYWz/ZGz9
-bnl5durd1NPT1Nvl+v/+/vL99+Xl7uvxdHhmW2N0amnp3Nzd1tfd3t7deGRhU05OSkhHSk9X
-W3jm4+Xs6+5mZ2dfbX3k3NvW2NXX3+H+bGNcZmVmW1lqZGjz+O/2/N/X0NPd2tfY2vRvaFxY
-YGppcH70b11ZU0xHSE1XX1lYZ/zs39/q8era1tfe2dno/XJjXV9dbt/Z2eT86NfN0NXd8ubs
-9fVydv72fm1lXVJQUU9YW2JjXGpjZGdx73f59Pbp6d3pfXJmcnBkYF5q9ufg631cV1tcZ2/x
-3dTR09PY2uHk3tvd6vJnYlxUWFNZW2F8ampiXl9ZY2Rr/mx2+X1uZ2tqdPB4fuv4e2NaV1Vf
-euvo6ens6ejx6+ns2NXSz9XZ3+Pb2Nzg5u/7+fJ+b2FVTUpMTE5ZZHTu6ubd3+Xc2+l3aWNm
-XlhRTE1TX3Tl19vd4/VzZWRsc3X0/216em9z39fSztHY5/R1amFgXV9mYGh+/u349+3n4/dz
-aV9lX1diZWJueX5xbV9XVlVVWVtndfvf4d3a9HZ2+PJ54dnY197h6mpqaf/p4N7e3+bpenvv
-5Nzb29/9YlxcXV1eaGtsfOvqc213ZFxXUlZcXm3z7un8cG1candpYmnv7vj/Z2JeaHlw5t3a
-09PV2eTvffl99+Td2Nvn9/9iWltWW3P5c2ZbWllQWFpUWF5laHN0Y21yamdhZ21+4t7b2uLv
-+Pn0597Z2t3e4Nze4ebn3t3Z2uV7aVxeX15dXWNqbGdkZF5cWl5x8fl+9+/t7u/v83z86vxq
-YmBeWlVSUE5adera1t3a29/c5ejk393mfm1qbXr+5uPb29fT3epsXFJOTlFUWFlaXV5kdXp+
-6uTh6P3zalRMS09WVlxo9+Tl3dnd2dfc2Nzxfmlsc3f2eGxvePrl29bV1dPS0dLb7np3b2lj
-WlRYWFhWV1xoen3n6OnrcXBfWlZZXl5nYmBsdmRfZWr86ePf7Ovl6uXo7nJreHb49n11eevs
-6Ob06unl3ejk3Nfb7N/k8vZpX1lVVVRWWVpcWVNXXmJaWFxca2Znc2767+Pe4eHh3d/p8/p7
-b29qZ29xcufd1s7Q2uf7/Ht79Hf7e2dyc2tyc3fr5+vn7Pb59ff/Z19gXV1cYl9gamZeXGBk
-b/v/b2pnaWdy+vny9+rh4dra3Nvb2Nvd8H54ffJ4bmNs+vN9/urs9v94bWxhWVxbVVJPTU1P
-UlpbYPnp5ebw4t/t8ezo7P1uYF9z6uTg3dnc3u/6c2FjYXD6+O3j4+/u7OPj6ejp4tzb3u18
-eGpuZGny+vn9aVxUTUpKUF1z7OPj8u/ybm9laf1t+vhoalhSVFZldt3Py8rLys/g9f57aXXt
-+uh+aWteaO/c1+De2t3feWRaVlJMS0xPV11ibmZfXV1cZvjo5+vwd2ZaWFlj/uzr9vPn5+zq
-3dva2t3f4+nr5evj3Nnb5e53Yl1fXVldX2/yYFxt/fHv9Ozq7+/9amZdWFNPVV1jfOnt9fn7
-bnzo5uXj5uPf3+To93JxbWxr8urf19/r+nRmY2R23t3c3+zu/nhqZm5yaGBeVE1MTExOVlte
-Z2xtcWtvcWJoZWl19un+897l+f91++Pe1s/S0dXZ297lbmt2aH56bf3v49/h3N7m6O3p4uD0
-aF1XXF5mcWxwbl9TTk1OTVFXXWtmXVdaX11gZ/7d19XQ09bb4eLs4tva1tXV1t3pbWhjYGFl
-+vH4fXFsfOjs8e94fPR4bmNZV05NT1ZeW2n75Nje7XxmXFdXWVJPVVpcX2j36+zq4t7d3NvZ
-1NbZ1trd3+rx//97d+rf6vp9dnx4/Ph77+no9nFiW1tTTk5TVlZi7d/h42xfZ3h8+PP+6uPx
-a2VcXvnu7dzS0Nnh7G9paVli+//p6fHu7en9Z238//rq7eTc5+fi6XRleOzp/mVfXFFOTktH
-SExPVF1iYGFhbO/l5d3V1tbT2eDo8e3t39ze2eLp6Px7cG1fXmNp9fbg3NnV2dne3+9ybF5Z
-UE1QTlFYV2x98N/f4e1vYFtnePnp7f1mX2RdXF1da/ng3d7m7OP1ZXv++uTu7Ovn3+7x49PN
-zMrP09Tie2BWUExNTktNUlZbWl9hXGJ76tzh6+v7dmVYUFBSXXF2/u3n6ez2+Pd989/X2N/u
-7t3a3Ovv5eHd6nFkXltbYv/l29vr5t/me1tXXFxbWFlgXWL98/x19O77dGRhYGFdW15fZf3h
-4Off39/c3ud3Z2hga2dw7+7j5tzZ0c/T1tba9P5mXF9cZmFZXWdYU1lXZ2dgdm1naVxYVFll
-cvXu72lcXVteee7i2NzY2dvX4Ont6flvbmpvdPLt6dvf4uXo5/ZzZmtzbnH56vT5cmRpaGJt
-cWZcXmNaYHRsaWxsYV5jfe3r4ux+9nlqZWpwbG92/fHo7e7s7+/69vXq3uTj4+nl4u3r3eHb
-1t3ieWZeU01NU1tt9d/X2d/v/m5ZWVdYXWNlX1xbV1FUXGh38u7q9l9VUFJcaHbj1s7Oz9Pb
-2t/f2dvk9/rr5e7i5Pj39fT7+/tuY2JiX1lZXVpkbXPv+nFrZWVcUlNUUFZea/rj2NbW2Njc
-7mhdV1li/+Pd2Njb1dHPz9bd8fv4dmdiXVZQT1pmb+vi3N3v+fh+8fh9eGptaGBdXFxaW19f
-ZmRfaGRrbGltcv3x8X3/9u/f1dvg8n74dm1sa2RdX2p98Ozp39ze4u34eXby6vh07O9+/2lk
-aGFZVVRST05PUldXZnzk1c7O1dTZ3t7m4+bc3t7a5+jm82Zhal5aXGZtb25q/ebb197k6Orf
-4t7a4+f2ZWBcV1RQVFheZGdfXVtYX2lnXlpgX2FqZW5zae3s8Ot6bm3x7/ry8+vp5tjX2Nfa
-3d/q593d5ezycnn0/nlta29dVllaWVRTVVZbX2JeXWptbG1cWl5s4tbX087S2Nzf3ufu9X1v
-Yl9dWVlice3i29LU2t7f4vd2d3RpX2htem9y7d7W1dje6flxYFZPS0VESExPWGn9++ne4O9y
-X19qaV9j/uHl3dzs7Pft7O/g4t7c2tjj73x0dvjv3trk6W9hYlxmb2pv++//d3RzXlRNSE5W
-XGNp6uf1/mxw8OXf3dXS3OL4aGNaWVRTYHvv7W9kbW5t8N7V0tXW1dfY193c19nd3NzoeGBV
-UlRWWVdTWGJeWV9rdnJsbV9hZl5aW19jd+3m5Ofs7/Xu8W9fYWRdWV5rcevh4OPg6N3Y2tze
-2tfhfPnvfWplcPjq5/l7Yl1dW2lhW11aW2lsbG9sbGx1bmReXWBueXd8fXP+8u3q8+vf2dPU
-1tru/HZ28HlybnBzYV9jdP7+3Nfc4Ojo+mpkZXP89/pzfuvp3+l5bmlrZGdfVlFTVFhfcfbx
-6+x8bWdeWFhbYnz36uvr297Z09jZ7HF5Z3J5bnl8dvt4bGtud/La1dzl6/9mV1JYXF5pc3fx
-/nJeVFRPU19hcu7g2t/ecmN9fvHa0dHR09rrZ1xbWV/45t7V3O30fXRjZ37v3NbX2OdqW1hX
-TlJSaGhobWloYlpZW19t++fc5flzZ2x0ZHN3e+7d397f5+5qYl9dYl1j/OXc19vj5Onb29jR
-1d/zYWNgWltYYV9dYGVdW19dZWR68XRwbWdkYmRpeOni3e79dGJXU1Zn++Prfu/u6Ol4fO35
-6+Hd1dPY3N7c2+Tw6u7s6+nkd2NYT09RWWd489/d5PpvX1hdXmF393luZ1xRWVtTWl1kXmV5
-6+bu+P/z5+jg3trT2t3la2VfYmpo79/c19fSz9bueG1iYl5bWVlo7OHj9mhkbW98eHNiWFta
-T0pFRUpOXmx+49bPz9LX7ff++uvl2Nre3+Df/2549OTf3eT0cF9l/+Lc2tTR19zral1YWFZO
-T1FXZm1raW92bGZnXVJUXHv2cG974tvc2tzk8P7ydGBbXnD67uf//O357O32+PH+++rb2tnP
-2Njb7vxnX1pSUU9RUU9QWWJq5dzY2PVoW1BOTk9UV2Jy9N3d3t/p29rX1t/d3+/6Z1tjePDk
-5+Xj4Of6cWhtX2x4/HX2/2966edybmRyefvf5trZ3uF+aV9VXGVrXVdbVl5hXWJcWV9pc3rq
-3uXd3tja73b3493d29zh3N/i82x17evz9GtfW2FfYGprYF1fXFxeXmRfW1xcW1ZVXl9q9nvj
-4e7i6vPq5+12am1xeHvp5+zy7Nzb3dfY393zZg==
-
---n2m-MIME-boundary----------
-
---PART.BOUNDARY.2418.16114.COSMOS.VLSI.CS.CMU.EDU.715029153.2
-Content-type: text/richtext
-Content-Transfer-Encoding: quoted-printable
-
-<nl>
-<signature>Derek_Beatty@cmu.edu   ABD   Comp Sci, CMU, 5000 Forbes, Pgh, =
-PA 15213 USA
-</signature>=
-
---PART.BOUNDARY.2418.16114.COSMOS.VLSI.CS.CMU.EDU.715029153.2--
-
diff --git a/tools/.cvsignore b/tools/.cvsignore
deleted file mode 100644
index 36a2ee1e24..0000000000
--- a/tools/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-.deps
\ No newline at end of file
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index cd69457f3e..0000000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-bin_SCRIPTS = killev evolution-move-tasks
-
-EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh
diff --git a/tools/evolution-move-tasks b/tools/evolution-move-tasks
deleted file mode 100755
index 05c27cbce2..0000000000
--- a/tools/evolution-move-tasks
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env perl
-# The above is a portable way to invoke Perl, according to the GNU Autotools
-# book. It is useful since we don't know where perl is installed.
-#
-# evolution-move-tasks: a Perl script to move tasks from the Calendar folder
-#	to the new Tasks folder.
-#
-
-use diagnostics;
-
-# You may have to change this if your Evolution files are somewhere else.
-$EVOLUTION_DIR = "$ENV{'HOME'}/evolution";
-
-$CALENDAR_DIR = "$EVOLUTION_DIR/local/Calendar";
-$TASKS_DIR = "$EVOLUTION_DIR/local/Tasks";
-
-# Create the Tasks folder if needed.
-&EnsureTasksFolderExists ($TASKS_DIR);
-
-# Get any tasks from the calendar .ics file.
-$tasks = &LoadTasks ("$CALENDAR_DIR/calendar.ics");
-
-# Get any tasks already in the tasks .ics file.
-$tasks .= &LoadTasks ("$TASKS_DIR/tasks.ics");
-
-# Create a new Tasks .ics file containing all the tasks.
-&OutputTasks ("$TASKS_DIR/tasks.new", $tasks);
-
-# Move the existing tasks file to a backup.
-if (-e "$TASKS_DIR/tasks.ics") {
-    rename "$TASKS_DIR/tasks.ics", "$TASKS_DIR/tasks.bak"
-	|| die "Can't rename $TASKS_DIR/tasks.ics to $TASKS_DIR/tasks.bak";
-}
-
-# Move the new file into position.
-rename "$TASKS_DIR/tasks.new", "$TASKS_DIR/tasks.ics"
-    || die "Can't rename $TASKS_DIR/tasks.new to $TASKS_DIR/tasks.ics";
-
-# Move the new Calendar file (without the Tasks) into position.
-rename "$CALENDAR_DIR/calendar.ics.new", "$CALENDAR_DIR/calendar.ics"
-    || die "Can't rename $TASKS_DIR/tasks.new to $TASKS_DIR/tasks.ics";
-
-0;
-
-
-# If the evolution/local/Tasks folder does not exist, this creates it and
-# creates the metadata XML file.
-sub EnsureTasksFolderExists {
-    my ($tasks_dir) = @_;
-
-    return if (-e $tasks_dir);
-
-    print "Creating Tasks folder in: $tasks_dir\n";
-
-    mkdir ($tasks_dir, 0777)
-	|| die "Can't create Tasks folder directory: $tasks_dir";
-
-    $metadata = "$tasks_dir/folder-metadata.xml";
-    open (METADATA, ">$metadata")
-	|| die "Can't create metadata file: $metadata";
-
-    print METADATA <<EOF;
-<?xml version="1.0"?>
-<efolder>
-	<type>tasks</type>
-	<description>Tasks</description>
-</efolder>
-EOF
-
-    close (METADATA);
-}
-
-
-sub LoadTasks {
-    my ($icalendar_file) = @_;
-
-    return "" if (! -e $icalendar_file);
-
-    open (ICSFILE, $icalendar_file)
-	|| die "Can't open iCalendar file: $icalendar_file";
-
-    open (NEWICSFILE, ">$icalendar_file.new")
-	|| die "Can't open iCalendar file: $icalendar_file.new";
-
-    $tasks = "";
-    $in_task = 0;
-    while (<ICSFILE>) {
-	if ($in_task) {
-	    $tasks .= $_;
-
-	    if (m/^END:VTODO/) {
-		$in_task = 0;
-	    }
-
-	} else {
-	    if (m/^BEGIN:VTODO/) {
-		print "Found task\n";
-
-		$tasks .= $_;
-		$in_task = 1;
-	    } else {
-		print NEWICSFILE $_;
-	    }
-	}
-    }
-
-    close (NEWICSFILE);
-    close (ICSFILE);
-
-    return $tasks;
-}
-
-
-sub OutputTasks {
-    my ($icalendar_file, $tasks) = @_;
-
-    open (ICSFILE, ">$icalendar_file")
-	|| die "Can't create iCalendar file: $icalendar_file";
-
-    print ICSFILE <<EOF;
-BEGIN:VCALENDAR
-CALSCALE
- :GREGORIAN
-PRODID
- :-//Helix Code//NONSGML Evolution Calendar//EN
-VERSION
- :2.0
-$tasks
-END:VCALENDAR
-EOF
-
-    close (ICSFILE);
-}
-
-
diff --git a/tools/killev b/tools/killev
deleted file mode 100755
index cc24e81664..0000000000
--- a/tools/killev
+++ /dev/null
@@ -1,27 +0,0 @@
-sysname=`uname -s`
-
-if [ "$sysname" = "SunOS" ]; then
-	killcmd="pkill"
-else
-	killcmd="killall"
-fi
-   
-$killcmd -9 wombat 2>/dev/null
-$killcmd -9 lt-wombat 2>/dev/null
-$killcmd -9 tlacuache 2>/dev/null
-$killcmd -9 evolution-addressbook 2>/dev/null
-$killcmd -9 evolution-addres 2>/dev/null
-$killcmd -9 lt-evolution-addressbook 2>/dev/null
-$killcmd -9 lt-evolution-add 2>/dev/null
-$killcmd -9 evolution-calendar 2>/dev/null
-$killcmd -9 evolution-calend 2>/dev/null
-$killcmd -9 lt-evolution-calendar 2>/dev/null
-$killcmd -9 lt-evolution-cal 2>/dev/null
-$killcmd -9 lt-gnomecal 2>/dev/null
-$killcmd -9 evolution-mail 2>/dev/null
-$killcmd -9 lt-evolution-mail 2>/dev/null
-$killcmd -9 lt-evolution-mai 2>/dev/null
-$killcmd -9 evolution-executive-summary 2>/dev/null
-$killcmd -9 lt-evolution-executive-summary 2>/dev/null
-$killcmd -9 lt-evolution-executive-summar 2>/dev/null
-$killcmd -9 evolution 2>/dev/null
diff --git a/tools/verify-evolution-install.sh b/tools/verify-evolution-install.sh
deleted file mode 100755
index 32a911009d..0000000000
--- a/tools/verify-evolution-install.sh
+++ /dev/null
@@ -1,640 +0,0 @@
-#!/bin/sh
-#
-# Verifies that Evolution and all its supporting components
-# are installed correctly. A tool to weed out common
-# build problems.
-#
-# (C)2000 Helix Code, Inc.
-# Author: Peter Williams <peterw@helixcode.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-problem() {
-    echo "I detected the following problem: $problem"
-    if test x"$rpmsystem" = xyes ; then
-	echo "Suggested solution via RPM: $rpmsolution"
-    fi
-    if test x"$debsystem" = xyes ; then
-	echo "Suggested solution via DEB: $debsolution"
-    fi
-    echo "Suggested solution via sources: $srcsolution"
-    if test x"$comment" != x ; then
-	echo ""
-	echo "$comment"
-    fi
-    exit 1
-}
-
-check_config() {
-    #bigname=$1
-    #cfgname=$2
-    #pkgname=$3
-    eval $1=\${$1-$2}
-
-    eval val=\$$1
-    if type $val </dev/null 1>/dev/null 2>&1 ; then
-	:
-    else
-	problem="Cannot find $2 or it ($val) is not executable"
-	rpmsolution="Install or reinstall the '$3-devel' package"
-	debsolution="Install or reinstall the $3 development libraries." #FIXME
-	srcsolution="Get the latest release of $3 and install it."
-	comment="If you know that $3 is installed, try setting the
-environment variable $1 to its location"
-	problem
-    fi
-}
-
-check_prefix() {
-    #othercfg=$1
-    #othername=$2
-    #strict=$3
-
-    eval otherpfx=\`\$$1 --prefix\`
-    if test x"$3" = xstrict ; then
-	if test x"$otherpfx" != x"$gl_prefix" ; then
-	    problem="gnome-libs and $2 do not share the same prefix"
-	    rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	    debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	    srcsolution="Re-run 'configure' in $2's source directory with the flag '--prefix=$gl_prefix'."
-	    problem
-	fi
-    else
-	IFSbak="$IFS"
-	ok="$GNOME_PATH:$gl_prefix"
-	IFS=":"
-	passed=no
-
-	for e in $ok; do
-	    if test x"$e" != x ; then
-		if test $otherpfx = $e ; then
-		    passed=yes;
-		fi
-	    fi
-	done
-
-	IFS="$IFSbak"
-
-	if test x"$passed" = xno ; then
-	    problem="$2 is not in GNOME_PATH or the same prefix as gnome-libs"
-	    rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	    debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	    srcsolution="Re-run 'configure' in $2's source directory with the flag '--prefix=$gl_prefix'."
-	    comment="Try exporting an environment variable 'GNOME_PATH' with the prefix of $2."
-	    problem
-	fi
-    fi
-}
-
-check_sysconf() {
-    #othercfg=$1
-    #othername=$2
-
-    eval othersysc=\`\$$1 --sysconfdir\`
-    if test x"$othersysc" != x"$gl_sysconf" ; then
-	problem="gnome-libs and $2 do not share the same sysconfdir"
-	rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	srcsolution="Re-run 'configure' in $2's source directory with the flag '--sysconfdir=$gl_sysconf'."
-	problem
-    fi
-}
-
-check_oafinfo() {
-    #basename=$1
-    #othername=$2
-
-    base=$1.oafinfo
-    search="${oaf_prefix}/share/oaf:$OAF_INFO_PATH"
-    IFSback="$IFS"
-    IFS=":"
-    ok=no
-
-    for ping in $search ; do
-	if test x"$ping" != x ; then
-	    if test -f $ping/$base ; then
-		file=$ping/$base
-		ok=yes
-	    fi
-	fi
-    done
-
-    IFS="$IFSback"
-
-    if test x$ok = xno ; then
-	problem="$1.oafinfo isn't installed into Gnome's prefix or in OAF_INFO_PATH"
-	rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	srcsolution="Re-run 'configure' in $2's source directory with the flag '--datadir=$gl_datadir'."
-	comment="Another likely cause of this problem would be a failed installation of $2.
-You should check to see that the install succeeded. You may also add the
-location of $1.oafinfo to the environment variable OAF_INFO_PATH"
-	problem
-    fi
-
-    iids=`cat $file |grep iid= |sed -e 's,.*iid="\([^"]*\)".*,\1,'`
-    IFS="
-"
-
-    tempfile="temp-$$-verifier"
-    for iid in $iids ; do
-	#echo "Attempting to activate IID \"$iid\"..."
-	$OAF_CLIENT -qs "iid == '$iid'" >$tempfile
-	result=`cat $tempfile |grep exception`
-	if test x"$result" != x ; then
-	    problem="The component $2 (in $file) couldn't be activated by OAF"
-	    rpmsolution="Verify that $file is valid and that oaf and $2 are correctly installed."
-	    debsolution="Verify that $file is valid and that oaf and $2 are correctly installed."
-	    srcsolution="Verify that $file is valid and that oaf and $2 are correctly installed."
-	    comment="$OAF_CLIENT reported this:
-`cat $tempfile`"
-	    rm -f $tempfile
-	    problem
-        fi
-    done
-    rm -f $tempfile
-
-    IFS="$IFSback"
-}
-
-check_bin() {
-    #name=$1
-    #othername=$2
-
-    IFSbak="$IFS"
-    IFS=":"
-    passed=no
-    exepath=
-
-    for ping in $PATH; do    
-	if test x"$ping" != x -a -x $ping/$1 ; then
-	    if test x"$passed" = xyes ; then
-		problem="The binary $1 is installed in more than one location"
-		rpmsolution="Make sure that you only have one copy of the package installed"
-		debsolution="Make sure that you only have one copy of the package installed"
-		srcsolution="Make sure that you only have one copy of the package installed"
-		comment="You probably have a package that was installed in two different prefixes,
-either from source twice or from source and from RPM/deb. Remove the older copy.
-(Note: \"make uninstall\" works on tarballs but may damage your gettext installation)"
-		problem
-	    fi
-	    passed=yes;
-	    exepath="$ping/$1"
-	fi
-    done
-
-    IFS="$IFSbak"
-
-    if test x"$passed" = xno ; then
-	problem="The binary $1 isn't in your PATH"
-	rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	srcsolution="Re-run 'configure' in $2's source directory with the flag '--bindir=$gl_bindir'."
-	comment="Another likely cause of this problem would be a failed installation of $2.
-You should check to see that the install succeeded."
-	problem
-    fi
-
-    lddfile=temp-$$-verify-ldd
-    $LDD $exepath </dev/null >$lddfile 2>/dev/null
-
-    if test x$? != x0 ; then
-	problem="The binary $1 isn't linked correctly"
-	rpmsolution="Make sure that all its dependencies are installed correctly"
-	debsolution="Make sure that all its dependencies are installed correctly"
-	srcsolution="Recompile $2 and make sure that it links correctly."
-	comment="LDD reported the following:
-`cat $lddfile`
-"
-	problem
-    fi
-
-    IFS="
-"
-
-    use_bonobox=no
-    use_bonobo=no
-
-    for ping in `cat $libfile` ; do
-	libname=`echo "$ping" |sed -e 's,^@@\([^@][^@]*\)@@[^@][^@]*@@,\1,'`
-	libpfx=`echo "$ping" |sed -e 's,^@@[^@][^@]*@@\([^@][^@]*\)@@,\1,'`
-
-	match="`cat $lddfile |grep \"${libname}\.\"`"
-
-	if test x"$match" != x ; then
-	    theirlib="`echo $match |sed -e 's,.*=> \([^ ]*\).*$,\1,'`"
-	    theirdir="`dirname $theirlib`"
-
-	    if test x"$theirdir" != x"$libpfx" ; then
-		problem="The binary $1 is linked against the wrong copy of $libname"
-		rpmsolution="The package owning $libname is probably installed twice. Make sure that it's installed correctly."
-		debsolution="The package owning $libname is probably installed twice. Make sure that it's installed correctly."
-		srcsolution="The package owning $libname is probably installed twice. Make sure that it's installed correctly."
-		comment="The version of $libname in $libpfx was expected"
-		problem
-	    elif test x"$libname" = xlibbonobox ; then
-		use_bonobox=yes
-	    elif test x"$libname" = xlibbonobo ; then
-		use_bonobo=yes
-	    fi
-	fi
-    done
-
-    rm -f $lddfile
-    IFS="$IFSback"
-
-    if test x"$need_bonobox" = xyes -a x"$use_bonobo" = xyes -a x"$use_bonobox" != xyes ; then
-	problem="The binary $1 is linked against Bonobo but not Bonobo-X"
-	rpmsolution="Get the newest possible version of $2, or install it from source if that fails"
-	debsolution="Get the newest possible version of $2, or install it from source if that fails"
-	srcsolution="Run './config.status --recheck' in $2's source directory and reinstall it"
-	problem
-    fi
-}
-
-check_no_gnorba() {
-    #libs=$1
-    #othername=$2
-
-    ping=`echo $1 |grep 'gnorba'`
-
-    if test x"$ping" != x ; then
-	problem="$2 was built using Gnorba, not OAF"
-	rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome."
-	debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome."
-	srcsolution="Update $2 and re-run 'configure' in its source directory with the flag '--enable-oaf=yes'."
-	problem
-    fi
-}
-
-add_lib_to_check() {
-    #lib = $1
-    #path = $2
-
-    echo "@@${1}@@${2}@@" >>$libfile
-}
-
-########################################
-
-versionparse3() {
-    #inst_version=$1
-    #reqd_version=$2
-    #package=$3
-
-    inst_version=`versiongrab3 "$1"`
-    inst_major=`echo $inst_version |sed -e 's,\([0-9][0-9]*\)\..*\..*,\1,'`
-    inst_minor=`echo $inst_version |sed -e 's,.*\.\([0-9][0-9]*\)\..*,\1,'`
-    inst_micro=`echo $inst_version |sed -e 's,.*\..*\.\([0-9][0-9]*\),\1,'`
-
-    reqd_version=`versiongrab3 "$2"`
-    reqd_major=`echo $reqd_version |sed -e 's,\([0-9][0-9]*\)\..*\..*,\1,'`
-    reqd_minor=`echo $reqd_version |sed -e 's,.*\.\([0-9][0-9]*\)\..*,\1,'`
-    reqd_micro=`echo $reqd_version |sed -e 's,.*\..*\.\([0-9][0-9]*\),\1,'`
-
-    ok=yes
-    if test $inst_major -lt $reqd_major ; then
-	ok=no
-    elif test $inst_major -gt $reqd_major ; then
-	ok=yes
-    elif test $inst_minor -lt $reqd_minor; then
-	ok=no
-    elif test $inst_minor -gt $reqd_minor; then
-	ok=yes
-    elif test $inst_micro -lt $reqd_micro; then
-	ok=no
-    fi
-
-    if test x$ok = xno ; then
-	problem="Package $3 is not new enough ($1 detected, $2 required)"
-	rpmsolution="Obtain a newer version and install it"
-	depsolution="Obtain a newer version and install it"
-	srcsolution="Obtain a newer version and install it"
-	comment="If you think you have a newer installation, make sure that the
-package is not installed twice."
-	problem
-    fi
-}
-
-versiongrab3() {
-    echo $1 |sed -e 's,.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*,\1,'
-}
-
-check_module3() {
-    #$1=gnome-libs name
-    #$2=package
-    #$3=version
-    $GNOME_CONFIG --modversion $1 1>/dev/null 2>/dev/null </dev/null
-    if test x$? != x0 ; then
-	problem="Package $2 doesn't seem to be installed."
-	rpmsolution="Get and install the packages '$2' and '$2-devel'"
-	debsolution="Get and install the package $2 and its development libraries" #FIXME
-	srcsolution="Download the source and install the package $2"
-	comment="If you think the package is installed, check that its prefix is $gl_prefix --
-${1}Conf.sh should be installed into `$GNOME_CONFIG --libdir`"
-	problem
-    fi
-
-    instversion=`$GNOME_CONFIG --modversion $1`
-
-    #eew eew hacky
-    # gnome-vfs used to be versioned gnome-vfs-0.1,
-    # and gnome-vfs-0.2, but then they moved to three figs--
-    # now it's gnome-vfs-0.2.0
-
-    if test $2 = gnome-vfs ; then
-	case "$instversion" in
-	gnome-vfs-0.1)
-	    problem="Package gnome-vfs is not new enough (0.1 detected, $3 required)"
-	    rpmsolution="Obtain a newer version and install it"
-	    depsolution="Obtain a newer version and install it"
-	    srcsolution="Obtain a newer version and install it"
-	    comment="If you think you have a newer installation, make sure that the
-package is not installed twice."
-	    problem
-	    ;;
-	gnome-vfs-0.2)
-	    instversion="gnome-vfs-0.2.0"
-	    ;;
-	*)
-	    #nothing, version is ok
-	    ;;
-	esac
-    fi
-
-    versionparse3 "$instversion" "$3" "$2"
-}
-
-########################################
-
-versionparse2() {
-    #inst_version=$1
-    #reqd_version=$2
-    #package=$3
-
-    inst_version=`versiongrab2 "$1"`
-    inst_major=`echo $inst_version |sed -e 's,\([0-9][0-9]*\)\..*,\1,'`
-    inst_minor=`echo $inst_version |sed -e 's,.*\.\([0-9][0-9]*\),\1,'`
-
-    reqd_version=`versiongrab2 "$2"`
-    reqd_major=`echo $reqd_version |sed -e 's,\([0-9][0-9]*\)\..*,\1,'`
-    reqd_minor=`echo $reqd_version |sed -e 's,.*\.\([0-9][0-9]*\),\1,'`
-
-    ok=yes
-    if test $inst_major -lt $reqd_major ; then
-	ok=no
-    elif test $inst_major -gt $reqd_major ; then
-	ok=yes
-    elif test $inst_minor -lt $reqd_minor; then
-	ok=no
-    fi
-
-    if test x$ok = xno ; then
-	problem="Package $3 is not new enough ($1 detected, $2 required)"
-	rpmsolution="Obtain a newer version and install it"
-	depsolution="Obtain a newer version and install it"
-	srcsolution="Obtain a newer version and install it"
-	comment="If you think you have a newer installation, make sure that the
-package is not installed twice."
-	problem
-    fi
-}
-
-versiongrab2() {
-    echo $1 |sed -e 's,.*\([0-9][0-9]*\.[0-9][0-9]*\).*,\1,'
-}
-
-check_module2() {
-    #$1=gnome-libs name
-    #$2=package
-    #$3=version
-    $GNOME_CONFIG --modversion $1 1>/dev/null 2>/dev/null </dev/null
-    if test x$? != x0 ; then
-	problem="Package $2 doesn't seem to be installed."
-	rpmsolution="Get and install the packages '$2' and '$2-devel'"
-	debsolution="Get and install the package $2 and its development libraries" #FIXME
-	srcsolution="Download the source and install the package $2"
-	comment="If you think the package is installed, check that its prefix is $gl_prefix --
-${1}Conf.sh should be installed into `$GNOME_CONFIG --libdir`"
-	problem
-    fi
-
-    instversion=`$GNOME_CONFIG --modversion $1`
-    versionparse2 "$instversion" "$3" "$2"
-}
-
-########################################
-
-#prep
-libfile=temp-$$-libs-verifier
-
-if test -d /var/lib/rpm ; then
-    rpmsystem=yes
-    RPM=${RPM_PROG-rpm}
-
-    $RPM --version 1>/dev/null 2>/dev/null </dev/null
-    if test x$? != x0 ; then
-	problem="The rpm executable ($RPM) does not seem to work."
-	rpmsolution="none, if rpm doesn't work."
-	debsolution="not applicable."
-	srcsolution="download and install rpm manually."
-	comment="If rpm really won't work then there is something wrong with your system."
-	problem
-    fi
-else
-    rpmsystem=no
-fi
-
-if test -d /var/lib/dpkg ; then
-    debsystem=yes
-    #FIXME: check if deb works
-else
-    debsystem=no
-fi
-
-if test x"$GNOME_PATH" != x ; then
-    PATH="$GNOME_PATH:$PATH"
-fi
-
-if test x"$LDD" = x ; then
-    if ldd -r /lib/libc.so </dev/null 1>/dev/null 2>&1 ; then
-	LDD="ldd -r"
-    elif type ldd </dev/null 1>/dev/null 2>&1; then
-	LDD="ldd"
-    else
-	problem="Cannot find ldd"
-	rpmsolution="Make sure that glibc is correctly installed!?!?!?"
-	debsolution="Make sure that glibc is correctly installed!?!?!?"
-	srcsolution="See above"
-	comment="If you think that you have ldd, export an environment
-vairable LDD that points to it."
-	problem
-    fi
-fi
-
-#gnome-libs
-check_config GNOME_CONFIG gnome-config gnome-libs
-
-gl_version=`$GNOME_CONFIG --version` # |sed -e 's,.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*,\1,'`
-gl_sysconf=`$GNOME_CONFIG --sysconfdir`
-gl_prefix=`$GNOME_CONFIG --prefix`
-gl_datadir=`$GNOME_CONFIG --datadir`
-gl_bindir=`$GNOME_CONFIG --bindir`
-
-versionparse3 "$gl_version" "1.0.59" "gnome-libs"
-add_lib_to_check libgnome `$GNOME_CONFIG --libdir`
-add_lib_to_check libgnomeui `$GNOME_CONFIG --libdir`
-
-#libunicode
-check_config UNICODE_CONFIG unicode-config libunicode
-check_prefix UNICODE_CONFIG libunicode
-versionparse2 "`$UNICODE_CONFIG --version`" "0.4" libunicode
-add_lib_to_check libunicode "`$UNICODE_CONFIG --prefix`/lib"
-
-#ORBit
-check_config ORBIT_CONFIG orbit-config ORBit
-check_prefix ORBIT_CONFIG ORBit
-add_lib_to_check libORBit "`$ORBIT_CONFIG --prefix`/lib"
-
-#oaf
-check_config OAF_CONFIG oaf-config oaf
-check_prefix OAF_CONFIG oaf
-versionparse3 "`$OAF_CONFIG --version`" "0.4.0" "oaf"
-add_lib_to_check liboaf "`$OAF_CONFIG --prefix`/lib"
-check_bin oafd
-
-OAF_CLIENT=${OAF_CLIENT-oaf-client}
-if type $OAF_CLIENT </dev/null >/dev/null 2>&1 ; then
-    :
-else
-    problem="oaf-client couldn't be found"
-    rpmsolution="Install the 'oaf-devel' package"
-    debsolution="Install the oaf development libraries"
-    srcsolution="Make sure that oaf is installed correctly"
-    comment="If you think you have oaf-client installed, try exporting an
-environment variable OAF_CLIENT pointing to it"
-    problem
-fi
-
-oaf_prefix=`$OAF_CONFIG --prefix`
-check_oafinfo oafd oaf
-
-#gconf
-#check_config GCONF_CONFIG gconf-config GConf
-#check_prefix GCONF_CONFIG GConf
-#versionparse2 "`$GCONF_CONFIG --version`" "0.5" GConf
-#if type gconfd-1 </dev/null >/dev/null 2>/dev/null; then
-#    check_oafinfo gconfd-1 GConf
-#    check_bin gconfd-1
-#else
-#    check_oafinfo gconfd GConf
-#    check_bin gconfd
-#fi
-#check_no_gnorba "`$GCONF_CONFIG --libs`" GConf
-
-#gnome vfs
-check_module3 vfs gnome-vfs "0.2.0"
-check_no_gnorba "`$GNOME_CONFIG --libs vfs`" gnome-vfs
-add_lib_to_check libgnomevfs "`$GNOME_CONFIG --libdir vfs`"
-
-#gnome print
-check_module2 print gnome-print "0.20"
-check_no_gnorba "`$GNOME_CONFIG --libs print`" gnome-print
-add_lib_to_check libgnomeprint "`$GNOME_CONFIG --libdir print`"
-
-#bonobo
-check_module2 bonobo bonobo "0.15"
-check_prefix "GNOME_CONFIG bonobo" bonobo strict
-add_lib_to_check libbonobo "`$GNOME_CONFIG --libdir bonobo`"
-
-if gnome-config --modversion bonobox </dev/null 1>/dev/null 2>&1 ; then
-    need_bonobox=yes
-    check_module2 bonobox bonobo "0.16"
-    check_prefix "GNOME_CONFIG bonobox" bonobo strict
-    add_lib_to_check libbonobox "`$GNOME_CONFIG --libdir bonobox`"
-fi
-
-check_oafinfo audio-ulaw bonobo
-check_bin bonobo-audio-ulaw bonobo
-check_no_gnorba "`$GNOME_CONFIG --libs bonobo`" bonobo
-
-#gtkhtml
-check_module2 gtkhtml GtkHTML "0.5"
-add_lib_to_check libgtkhtml "`$GNOME_CONFIG --libdir html`"
-check_oafinfo html-editor-control GtkHTML
-check_bin html-editor-control GtkHTML
-check_no_gnorba "`$GNOME_CONFIG --libs gtkhtml`" GtkHTML
-
-#evolution
-
-if test x"$EVOLUTION_PREFIX" = x ; then
-    IFSback="$IFS"
-    IFS=":"
-    passed=no
-
-    for ping in $PATH ; do
-	if test x"$ping" != x -a -x $ping/evolution ; then
-	    if test x"$passed" = xyes ; then
-		problem="Evolution is installed in more than one prefix"
-		rpmsolution="Make sure that you only have one copy of Evolution installed"
-		debsolution="Make sure that you only have one copy of Evolution installed"
-		srcsolution="Make sure that you only have one copy of Evolution installed"
-		comment="Evolution was probably installed in two different prefixes,
-either from source twice or from source and from RPM/deb. Remove the older copy.
-(Note: \"make uninstall\" works on tarballs but may damage your gettext installation)"
-		problem
-	    else
-		passed=yes
-		e_prefix=$ping
-	    fi
-	fi
-    done
-
-    IFS="$IFSbak"
-
-    if test x"$passed" != xyes ; then
-	problem="Evolution does not appear to have been installed"
-    	rpmsolution="Make sure that Evolution was installed properly (rpm -V evolution)"
-	debsolution="Make sure that Evolution was installed properly"
-	srcsolution="Run 'make install' in the evolution source directory"
-        comment="I couldn't find evolution in this path: $PATH"
-	problem
-    fi
-
-    e_prefix="`echo $e_prefix |sed -e 's,\(.*\)/[^/][^/]*,\1,'`"
-    echo "Guessed that evolution is installed in prefix $e_prefix"
-else
-    e_prefix="$EVOLUTION_PREFIX"
-fi
-
-add_lib_to_check libcal-client "$e_prefix/lib"
-add_lib_to_check libcamel "$e_prefix/lib"
-add_lib_to_check libcamelvee "$e_prefix/lib/evolution/camel-providers/0.5"
-check_oafinfo addressbook evolution
-check_oafinfo calendar-control evolution
-check_oafinfo evolution-mail evolution
-check_oafinfo evolution-calendar evolution
-check_oafinfo evolution-addressbook-select-names evolution
-check_oafinfo wombat evolution
-check_bin evolution-mail evolution
-check_bin evolution-calendar evolution
-check_bin evolution-addressbook evolution
-check_bin wombat evolution
-check_bin evolution evolution
-
-#done
-rm -f $libfile
-echo "Your Gnome system appears to be properly set up. Enjoy Evolution!"
-exit 0
diff --git a/ui/.cvsignore b/ui/.cvsignore
deleted file mode 100644
index 22bfb15732..0000000000
--- a/ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-*.h
diff --git a/ui/ChangeLog b/ui/ChangeLog
deleted file mode 100644
index 32b7fed707..0000000000
--- a/ui/ChangeLog
+++ /dev/null
@@ -1,377 +0,0 @@
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Setup a command for MailStop.
-
-2001-02-05  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Add a priority.
-
-2001-02-02  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: cmd / widgetify.
-
-2001-01-30  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: Use hlook and vlook so by default we get
-	no text in vertical mode, and priority only in horizontal
-	mode.
-
-2001-01-27  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: Menu cleanups
-
-	* evolution-task-editor-dialog.xml: ditto
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: Change the
-	toolbars to only show some of the labels, a la Outlook.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "PrintMessage" and
-	"PrintPreviewMessage" items to "pixbuf".  Likewise for
-	"MessageSaveAs", "MessageEdit", "MessagePrint", "MessageMove", "MessageReplySndr"
-	and "MessageReplyAll".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
-	and "Mail Configuration" items to "pixbuf".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "Find a
-	contact" item to "pixbuf".  Also set the type to "pixbuf" for
-	"Addressbook Configuration", and "Print Contacts".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "View All"
-	button to "pixbuf".
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Change Security* to SecurityPGP*
-	as we may someday have S/MIME sign/encrypt.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* evolution.xml: new File->Close menu item and associated command.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Removed the temporary get mail button.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Added a temporary button to test new receive
-	code.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-01-15  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: progressive cmd/widgetization and
-	add the 'Customize' entry.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Add a stop button to the toolbar.
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1143: Add elipses to more menu items that lead to dialogs)
-	
-	* evolution-mail.xml: "Folder/Configure Folder..."
-	* evolution.xml: "File/Import file..."
-	
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution.xml: Remove fixme from NewMailMessage.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added SaveDraft bonobo menu verb
-	thingy.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-tasks.xml: new file for the Tasks controls.
-
-	* Makefile.am (XML_FILES): added the above file.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-event-editor.xml:
-	* evolution-task-editor-dialog.xml: Make the ordering of the
-	toolbar items consistent.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: remove evolution-addressbook-ldap.xml so we
-	build again.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: add "Settings/Addressbook
-	Configuration..."  Analogous to "Settings/Mail Configuration..." in
-	evolution-mail.
-
-	* evolution-addressbook-ldap.xml: removed.
-	
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* evolution-mail.xml: Added ellipsis to Settings menu entries that
-	  bring up dialogs.  Bug #1019.
-
-2000-12-23  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: s/<menuitem\/>/<separator\/>/
-
-	* evolution.xml: ditto.
-
-2000-12-21  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: remove wierd extraneous '>'
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-executive-summary.xml: stop executive summary
-	making the UI flicker when switching to / from it.
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-calendar.xml: Fix bug #635
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: give View->As Table its verb back so
-	it works.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* evolution-mail.xml: Added message hiding items.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added Security menu
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Make the forward button in the toolbar
-	forward as an attachment.
-
-2000-12-13  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: redone shortcuts
-
-2000-12-12  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: removed Bold item from toolbar
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.xml: Fix typo
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Renamed "MessageForward" to
-	"MessageForwardInlined" and "MessageForwardAttach" to
-	"MessageForwardAttached".  Make the attached forward the default,
-	and the one advertised on the toolbar as well.
-
-2000-12-01  Anna Marie Dirks  <anna@helixcode.com>
-
-	* evolution.xml: Redid all the keyboard shortcuts to comply with GNOME
-	standards. Removed unnecessary shortcuts from less commonly used menu 
-	items, changed all references to "alt", etc. 
-	* evolution-addressbook.xml: see above
-	* evolution-mail.xml: see above
-	* evolution-calendar.xml: Same as above, but I also reorganized menus slightly by moving "new appointment" from the edit menu to the file menu.   
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Save As...
-
-2000-11-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-message-composer.xml: Make "Toolbar"'s behavior
-	"exclusive".
-	* evolution-task-editor-dialog.xml: Likewise.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Moved ViewSource to the View menu and made
-	it a toggle menu.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added View Message Source.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Forward as Attachment.
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added Send contact as attachment
-	and Send to contact to menus.
-
-2000-11-09  Anna Marie Dirks <anna@helixcode.com>
-	* evolution-calendar.xml: Added (and cleaned up) keyboard shortcuts.
-	* evolution-addressbook.xml: Added keyboard shortcuts.  
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-	* evolution.xml: Added keyboard shortcuts to all shell menus.
-	* evolution-mail.xml: Added keyboard shortcuts to all shell menus.
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-        * evolution-message-composer.xml: Added keyboard shortcuts
-	to all of the composer menus.
-
-2000-11-07  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* evolution-event-editor.xml: removed ``FIXME'' from the
-	``Schedule Meeting'' menu.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Updated Message menu.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added print envelope menus.  Added
-	...s.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (uidir): kill all the bonob-ui-extract crud.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-addressbook.xml: Removed QuickSearch widget.
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: added accel="*Control*Return" to
-	FileSend
-	replace FileSendNow with FileSend as FileSendNow wasn't defined
-	
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added a MessageApplyFilters menu item.
-
-	* evolution-subscribe.xml: Don't have a Unselect All, use Invert
-	Selection instead.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (H_FILES): New.
-	(EXTRA_DIST): Add `$(H_FILES)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-message-composer.xml: add.
-
-	* checking all generated .h files ( sim. to glade ) to make
-	translator's lives easier.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-event-editor.xml: added.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-task-editor-dialog.xml: added.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: Add rule to use bonobo-ui-extract to build
-	translatable files.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: drasticaly shrink to just the
-	new features available with ldap; don't duplicate stuff.
-
-	* evolution-addressbook.xml: fix tooltips.
-
-	* *.xml: remove redundant attributes causing toolber rebuilds.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: add translation '_'s to some labels.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: Added toolbar buttons to switch views.
-	We'll use plain buttons for the view buttons for now, until Bonobo
-	toolbars support radio buttons.
-
-2000-10-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: Apply behavior "exclusive" to
-	"Toolbar".
-	* evolution.xml: Likewise.
-	* evolution-addressbook.xml: Likewise.
-	* evolution-mail.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-subscribe.xml: Likewise.
-
-2000-10-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: moved the calendar settings menu item to the
-	Settings menu and renamed it to "Calendar Preferences".
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: s/Menu_//
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml fix the mess with separators.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-subscribe.xml: s/descr/tip/
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove redundant separator.
-
-	* *.xml: Remove replicated attributes from structural elements.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: fix from Darin toolbar -> dockitem.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Add Invert Selection
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: bind 'D' to MessageDelete; a proto binding.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: move Open, Save into FileOps
-
-	* evolution.xml: add FileOps placeholder.
-
-2000-09-15  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: Update to new keybinding syntax.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove stock icons on toolbar.
-	add back 2 stocks I lost somewhere.
-
-	* ui/evolution.xml: Add status bar
diff --git a/ui/Makefile.am b/ui/Makefile.am
deleted file mode 100644
index a6b55836c6..0000000000
--- a/ui/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-XML_FILES =				\
-	evolution.xml			\
-	evolution-addressbook.xml	\
-	evolution-calendar.xml		\
-	evolution-contact-editor.xml	\
-	evolution-event-editor.xml	\
-	evolution-executive-summary.xml	\
-	evolution-mail.xml		\
-	evolution-message-composer.xml	\
-	evolution-subscribe.xml		\
-	evolution-task-editor-dialog.xml\
-	evolution-tasks.xml
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-EXTRA_DIST = $(XML_FILES)
diff --git a/ui/evolution-addressbook.h b/ui/evolution-addressbook.h
deleted file mode 100644
index 3128ccfb83..0000000000
--- a/ui/evolution-addressbook.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This file is autogenerated from evolution-addressbook.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Print Contacts...");
-gchar *s = N_("As _Table");
-gchar *s = N_("_New Contact");
-gchar *s = N_("_Tools");
-gchar *s = N_("_Search for contacts");
-gchar *s = N_("New");
-gchar *s = N_("Create a new contact");
-gchar *s = N_("Find");
-gchar *s = N_("Find a contact");
-gchar *s = N_("Print");
-gchar *s = N_("Print contacts");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete a contact");
-gchar *s = N_("View All");
-gchar *s = N_("View all contacts");
-gchar *s = N_("Stop");
-gchar *s = N_("Stop Loading");
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index 927c6a79ff..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-
-	<menu>
-		<submenu name="File">
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="ContactsPrint"
-				_label="_Print Contacts..."
-				pixtype="pixbuf"
-                                accel="*Control*p"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="View">
-
-			<menuitem name="AsTable" verb="ViewAsTable" _label="As _Table"
-		        />
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="AddressbookConfig" verb="AddressbookConfig" _label="_Addressbook Configuration..."
-			pixtype ="pixbuf"/>
-
-		</submenu>
-
-		<placeholder name="Component">
-
-			<submenu name="Tools" _label="_Tools">
-
-				<menuitem name="Search" verb="ToolSearch"
-				_label="_Search for contacts"
-				pixtype="stock" pixname="Search" />
-
-			</submenu>
-
-		</placeholder>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New contact"
-		_tip="Create new contact" verb="ContactNew"
-		pixtype="stock" pixname="New" priority="1"/>
-
-		<separator/>
-
-		<toolitem name="Find" _label="Find"
-		_tip="Find a contact" verb="ContactFind"
-		pixtype="pixbuf"/>
-
-		<toolitem name="Print" _label="Print"
-		_tip="Print contacts" verb="ContactsPrint"
-		pixtype="stock" pixname="Print"/>
-
-		<toolitem name="Delete" _label="Delete"
-		_tip="Delete a contact" verb="ContactDelete"
-		pixtype="stock" pixname="Trash"/>
-
-		<separator/>
-
-		<toolitem name="View All" _label="View All"
-		_tip="View all contacts" verb="ContactViewAll"
-		pixtype="pixbuf"/>
-
-		<toolitem name="Stop" _label="Stop"
-		_tip="Stop Loading" verb="ContactStop"
-		pixtype="stock" pixname="Stop"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index b512405c0e..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="CalendarNew"    _tip="Create a new calendar" _label="Calendar"/>
-		<cmd name="CalendarOpen"   _tip="Open Calendar" _label="Open"/>
-		<cmd name="CalendarSaveAs" _tip="Save calendar as something else" _label="Save As"/>
-		<cmd name="CalendarPrint"  _tip="Print this Calendar" _label="Print"
-		 pixtype="stock" pixname="Print"/>
-		<cmd name="CalendarPreferences" _tip="Alter preferences"/>
-		<cmd name="EditNewAppointment" _label="New appointment"
-		 priority="1" _tip="Create a new appointment" pixtype="stock" pixname="New"/>
-		<cmd name="CalendarPrev" _label="Prev" _tip="Go back in time"
-		 pixtype="stock" pixname="Back"/>
-		<cmd name="CalendarToday" _label="Today" _tip="Go to present time"
-		 pixtype="stock" pixname="Home"/>
-		<cmd name="CalendarNext" _label="Next" _tip="Go forward in time" 
-		 pixtype="stock" pixname="Forward"/>
-		<cmd name="CalendarGoto" _label="Go to" priority="1"
-		 _tip="Go to a specific date" pixtype="stock" pixname="Jump To"/>
-		<cmd name="ShowDayView" _label="Day" _tip="Show 1 day" pixtype="pixbuf"/>
-		<cmd name="ShowWorkWeekView" _label="5 Days" _tip="Show the working week"
-		 pixtype="pixbuf"/>
-		<cmd name="ShowWeekView" _label="Week" _tip="Show 1 week" pixtype="pixbuf"/>
-		<cmd name="ShowMonthView" _label="Month" _tip="Show 1 month" pixtype="pixbuf"/>
-	</commands>
-
-	<menu>
-		<submenu name="File">
-
-			<submenu name="New" _label="_New">
-
-				<menuitem name="CalendarNew" verb=""
-				_label="Ca_lendar" accel="*Control**Shift*l"/>
-
-			</submenu>
-
-			<placeholder name="FileOps">
-				
-				<menuitem name="CalendarOpen" verb=""
-					_label="_Open Calendar" accel="*Control*o"/>
-
-				<menuitem name="CalendarSaveAs" verb=""
-				_label="_Save As..." accel="*Control*a"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-				<menuitem name="Print" verb="CalendarPrint"
-				_label="_Print this calendar" accel="*Control*p"/>
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="CalendarPreferences" verb=""
-			 _label="Calendar Preferences..."/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" verb="EditNewAppointment"/>
-
-		<separator/>
-
-		<toolitem name="Print" verb="CalendarPrint"/>
-
-		<separator/>
-
-		<toolitem name="Prev" verb="CalendarPrev"/>
-
-		<toolitem name="Today" verb="CalendarToday"/>
-
-		<toolitem name="Next" verb="CalendarNext"/>
-
-		<separator/>
-
-		<toolitem name="Goto" verb="CalendarGoto"/>
-		
-		<separator/>
-
-		<toolitem name="DayView" verb="ShowDayView"/>
-
-		<toolitem name="WorkWeekView" verb="ShowWorkWeekView"/>
-
-		<toolitem name="WeekView" verb="ShowWeekView"/>
-
-		<toolitem name="MonthView" verb="ShowMonthView"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
deleted file mode 100644
index c0594838b4..0000000000
--- a/ui/evolution-contact-editor.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<Root>
-<!--
-
-/* Menu bar */
-
-static GnomeUIInfo file_new_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_page_setup_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_menu[] = {
-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),
-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (file_save_as_cb, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("_Delete"), NULL, delete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),
-	GNOMEUIINFO_MENU_PRINT_ITEM (print_cb, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_object_menu[] = {
-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_menu[] = {
-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),
-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_previous_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_next_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_toolbars_menu[] = {
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_menu[] = {
-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),
-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo insert_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo format_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_forms_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo actions_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Contact from Same Company"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Letter to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Message to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New Meetin_g with Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Plan a Meeting..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Task for Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Journal Entry for Contact"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Flag for Follow Up..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Display Map of Address"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Open Web Page"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as _vCard"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)
-};
-
-static GnomeUIInfo help_menu[] = {
-	GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo main_menu[] = {
-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),
-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),
-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),
-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),
-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),
-	GNOMEUIINFO_MENU_HELP_TREE (help_menu),
-	GNOMEUIINFO_END
-};
--->
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-		        <menuitem name="Save" verb="ContactEditorSave"
-			_label="_Save"
-			pixtype="stock" pixname="Save"/>
-
-		        <menuitem name="SaveAs" verb="ContactEditorSaveAs"
-			_label="Save _As..."
-			pixtype="stock" pixname="SaveAs"/>
-
-			<separator/>
-
-		        <menuitem name="SendAs" verb="ContactEditorSendAs"
-			_label="Se_nd contact to other..."/>
-
-		        <menuitem name="SendTo" verb="ContactEditorSendTo"
-			_label="Send _message to contact..."/>
-
-			<separator/>
-
-		        <menuitem name="Delete" verb="ContactEditorDelete"
-			_label="Delete..."
-			pixtype="stock" pixname="Trash"/>
-
-			<separator/>
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="ContactEditorPrint"
-				_label="_Print..."
-				pixtype="stock" pixname="Print"/>
-
-				<menuitem name="PrintEnv" verb="ContactEditorPrintEnvelope"
-				_label="Print En_velope..."
-				pixtype="stock" pixname="Print"/>
-
-			</placeholder>
-
-			<separator/>
-
-		        <menuitem name="Close" verb="ContactEditorClose"
-			_label="Close"
-			pixtype="stock" pixname="Close"/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive">
-	        <toolitem name="Save and Close" _label="Save and Close"
-		_tip="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
-		pixtype="stock" pixname="Save"/>
-
-		<separator/>
-
-		<toolitem name="Print" _label="Print..."
-		_tip="Print this item" verb="ContactEditorPrint"
-		pixtype="stock" pixname="Print"/>
-
-		<toolitem name="Delete" _label="Delete..."
-		_tip="Delete this item" verb="ContactEditorDelete"
-		pixtype="stock" pixname="Trash"/>
-
-<!--
-		<toolitem name="Help" _label="Help"
-		_tip="See online help" verb="ContactEditorHelp"
-		pixtype="stock" pixname="Help"/>
-
-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Previous"),
-				N_("Go to the previous item"), NULL,
-				GNOME_STOCK_PIXMAP_BACK),
-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Next"),
-				N_("Go to the next item"), NULL,
-				GNOME_STOCK_PIXMAP_FORWARD),
--->
-
-	</dockitem>
-
-</Root>
\ No newline at end of file
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
deleted file mode 100644
index 489eca6ef1..0000000000
--- a/ui/evolution-event-editor.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<Root>
-
-<commands>
-
-        <cmd name="FileSave" _label="Save"
-	_tip="Save the current file" pixtype="stock" pixname="Save"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAndClose" _label="Save and Close"
-	_tip="Save the appointment and close the dialog box"
-	pixtype="stock" pixname="Save"/>
-
-	<cmd name="FileDelete" _label="Delete"
-	_tip="Delete this appointment"
-	pixtype="stock" pixname="Trash"/>
-
-        <cmd name="FilePrint" _label="Print..."
-	_tip="Print this item" pixtype="stock" pixname="Print"/>
-
-        <cmd name="FilePrintSetup" _label="Print Setup"
-          _tip="Setup the page settings for your current printer"
-	  pixtype="stock" pixname="Print"/>
-
-        <cmd name="FileClose" _label="Close"
-	_tip="Close this appointment" pixtype="stock" pixname="Close"
-	accel="*Control*w"/>
-
-        <cmd name="EditCut" _label="Cut" _tip="Cut the selection"
-          pixtype="stock" pixname="Cut" accel="*Control*x"/>
-	
-        <cmd name="EditCopy" _label="Copy"
-	_tip="Copy the selection" pixtype="stock" pixname="Copy"
-	accel="*Control*c"/>
-	
-        <cmd name="EditPaste" _label="Paste"
-	_tip="Paste the clipboard" pixtype="stock" pixname="Paste"
-	accel="*Control*v"/>
-	
-        <cmd name="EditClear" _label="Clear"
-	_tip="Clear the selection"/>
-	
-	<cmd name="EditSelectAll" _label="Select All" _tip="Select everything"/>
-
-        <cmd name="EditProperties" _label="Properties" _tip="Modify the file's properties"
-	  pixtype="stock" pixname="Properties"/>
-
-	<cmd name="GoPrevious" _label="Previous" _tip="Go to the previous item"
-	pixtype="stock" pixname="Back"/>
-
-	<cmd name="GoNext" _label="Next" _tip="Go to the next item"
-	pixtype="stock" pixname="Forward"/>
-
-	<menuitem name="ActionScheduleMeeting" _label="Schedule Meeting"
-	_tip="Schedule some sort of a meeting"/>
-
-        <cmd name="HelpAbout" _label="About..." _tip="About this application"
-	 pixtype="stock" pixname="About"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New" _label="_New">
-
-		<menuitem name="c" _label="_Mail Message (FIXME)"/>
-
-		<menuitem name="g" _label="_Contact (FIXME)"/>
-
-		<menuitem name="a" _label="_Task (FIXME)"/>
-
-		<menuitem name="b" _label="Task _Request (FIXME)"/>
-
-		<menuitem name="h" _label="_Journal Entry (FIXME)"/>
-
-		<menuitem name="i" _label="_Note (FIXME)"/>
-
-	</submenu>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb=""  _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="o" _label="_Move to Folder... (FIXME)"/>
-
-	<menuitem name="p" _label="Cop_y to Folder... (FIXME)"/>
-
-	<separator/>
-
-	<placeholder name="Print">
-
-		<menuitem name="FilePrintPrevie" _label="Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="_Select All"/>
-
-	<placeholder name="EditOps"/>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="Fi_rst Item in Folder (FIXME)"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="_Last Item in Folder (FIXME)"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="Chec_k Names (FIXME)"/>
-
-	<menuitem name="" _label="Address _Book... (FIXME)"/>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="ActionScheduleMeeting" verb="" _label="Schedule _Meeting"/>
-
-	<separator/>
-
-	<menuitem name="" _label="For_ward (FIXME)"/>
-
-	<menuitem name="" _label="Forward as v_Calendar (FIXME)"/>
-
-</submenu>
-
-<submenu name="Help" _label="_Help">
-	
-	<placeholder name="BuiltMenuItems"/>
-
-        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-</submenu>
-
-<submenu name="Debug" _label="_Debug" hidden="1">
-
-	<menuitem name="DebugDumpXml"/>
-
-</submenu>
-
-</menu>
-
-<dockitem name="Toolbar">
-
-	<toolitem name="FileSaveAndClose" verb=""/>
-
-	<toolitem name="FileDelete" verb=""/>
-
-	<toolitem name="FileClose" verb=""/>
-
-	<separator/>
-
-	<toolitem name="FilePrint" verb=""/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
diff --git a/ui/evolution-executive-summary.xml b/ui/evolution-executive-summary.xml
deleted file mode 100644
index 3b5a4dfeba..0000000000
--- a/ui/evolution-executive-summary.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-  <menu>
-
-    <submenu name="Settings">
-
-	<menuitem name="ESummarySettings" verb="ESummarySettings"
-	_label="Executive Summary Settings..."/>
-
-    </submenu>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="AddService" verb="AddService"
-    _label="Add Service" priority="1" _tip="Add a new service to the Executive Summary"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="NewMail" verb="NewMail"
-    _label="New Mail" _tip="Create a new email"
-    pixtype="pixbuf"/>
-
-  </dockitem>
-</Root>
-
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
deleted file mode 100644
index 246ad19162..0000000000
--- a/ui/evolution-mail.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<Root>
-
-  <commands>
-
-    <cmd name="ViewThreaded"
-      _label="_Threaded" _tip="Threaded Message list" type="toggle" />
-
-    <cmd name="ViewSource"
-      _label="S_ource" _tip="View Raw Message Source" type="toggle" />
-
-    <cmd name="MailStop"
-      pixtype="stock" pixname="Stop"/>
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-
-	<placeholder name="Print">
-
-        <menuitem name="Print" verb="PrintMessage"
-        _label="Print message..."
-        _tip="Print message to the printer"
-        pixtype="pixbuf" accel="*Control*P"/>
-
-        <menuitem name="Print Preview" verb="PrintPreviewMessage"
-        _label="Print Preview of message..."
-        _tip="Previews the message to be printed"
-        pixtype="pixbuf"/>
-
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All" accel="*Control*a"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection" accel="*Control*i"/>
-
-    </submenu>
-
-    <submenu name="View">
-
-      <separator/>
-
-      <menuitem name="Threaded" verb="ViewThreaded" accel="*Control*t"/>
-
-      <menuitem name="Source" verb="ViewSource" accel=""/>
-
-      <separator/>
-
-      <menuitem name="MessageHideClear" verb="" _label="Show _All Messages"/>
-
-      <separator/>
-
-      <menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/>
-      <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/>
-      <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/>
-
-    </submenu>
-
-    <submenu name="Settings">
-
-      <menuitem name="MailFilters" verb="SetMailFilter" _label="Mail _Filters..."/>
-
-      <menuitem name="VFolderEdit" verb="SetVFolder" _label="_Virtual Folder Editor..."/>
-
-      <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration..." pixtype="pixbuf"/>
-
-      <menuitem name="SetSubscribe" verb="" _label="Manage Subscriptions..."/>
-
-      <menuitem name="SetForgetPwd" verb="" _label="Forget _Passwords"/>
-
-    </submenu>
-
-    <placeholder name="Component">
-
-      <submenu name="Message" _label="_Message">
-
-        <menuitem name="MessageOpenNewWnd" verb=""
-        _label="_Open in New Window"
-        accel="*Control*o"/>
-
-        <menuitem name="MessageEdit" verb=""
-        _label="_Edit Message"
-	pixbuf="pixbuf"
-         accel="*Control*e"/>
-
-        <menuitem name="MessageSaveAs" verb=""
-        _label="_Save Message As..."
-	pixtype="pixbuf"
-         accel="*Control**Alt*s"/>
-
-        <menuitem name="MessagePrint" verb=""
-        _label="_Print Message"
-	pixtype="pixbuf"
-         accel="*Control*p"/>
-
-        <separator/>
-
-        <menuitem name="MessageReplySndr" verb=""
-        _label="Reply to _Sender"
-	pixtype="pixbuf"
-        accel="*Control*r"/>
-
-        <menuitem name="MessageReplyAll" verb=""
-        _label="Reply to _All"
-	pixtype="pixbuf"
-	accel="*Control**Shift*r"/>
-
-        <menuitem name="MessageForwardAttached" verb=""
-        _label="_Forward"
-         accel="*Control*j"/>
-
-        <menuitem name="MessageForwardInlined" verb=""
-        _label="Forward inline"
-         accel="*Control**Shift*j"/>
-
-        <separator/>
-
-        <menuitem name="MessageMarkAsRead" verb=""
-        _label="Mar_k As Read"
-         accel="*Control*k"/>
-
-        <menuitem name="MessageMarkAsUnRead" verb=""
-        _label="Mark As U_nread"
-         accel="*Control**Shift*k"/>
-
-        <separator/>
-
-        <menuitem name="MessageMove" verb=""
-        _label="_Move to Folder..."
-	pixtype="pixbuf"
-	accel="*Control*m"/>
-
-        <menuitem name="MessageCopy" verb=""
-        _label="_Copy to Folder..."
-         accel="*Control*c"/>
-
-        <menuitem name="MessageDelete" verb=""
-        _label="_Delete"
-         accel="*Control*d"/>
-
-        <menuitem name="MessageUndelete" verb=""
-        _label="_Undelete"
-         accel="*Control*u"/>
-
-        <separator/>
-
-        <menuitem name="MessageApplyFilters" verb=""
-        _label="_Apply Filters"
-         accel="*Control*y"/>
-
-        <separator/>
-
-        <submenu name="MessageCreateRuleFromMessage" _label="Create Rule">
-
-          <menuitem name="MessageVFolderSubj" verb=""
-          _label="_VFolder on Subject"
-           />
-
-          <menuitem name="MessageVFolderSndr" verb=""
-          _label="VFolder on Se_nder"
-           />
-
-          <menuitem name="MessageVFolderRecip" verb=""
-          _label="VFolder on _Recipients"
-           />
-
-          <separator/>
-
-          <menuitem name="MessageFilterSubj" verb=""
-          _label="_Filter on Subject"
-           />
-
-          <menuitem name="MessageFilterSndr" verb=""
-          _label="Fi_lter on Sender"
-           />
-
-          <menuitem name="MessageFilterRecip" verb=""
-          _label="Filter on Rec_ipients"
-           />
-
-        </submenu>
-
-      </submenu>
-      
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="FolderExpunge" verb=""
-        _label="_Expunge"
-         accel="*Control*x"/>
-
-        <menuitem name="FolderConfig" verb=""
-        _label="_Configure Folder..."
-	pixtype="pixbuf"/>
-
-      </submenu>
-
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="MailGet" verb=""
-    _label="Get Mail" priority="1" _tip="Send queued mail and retrieve new mail"
-    pixtype="pixbuf"/>
-
-    <toolitem name="MailCompose" verb=""
-    _label="Compose" priority="1" _tip="Compose a new message"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Reply" verb="MessageReplySndr"
-    _label="Reply" priority="1" _tip="Reply to the sender of this message"
-    pixtype="pixbuf"/>
-
-    <toolitem name="ReplyAll" verb="MessageReplyAll"
-    _label="Reply to All" priority="1" _tip="Reply to all recipients of this message"
-    pixtype="pixbuf"/>
-
-    <toolitem name="Forward" verb="MessageForwardAttached"
-    _label="Forward" priority="1" _tip="Forward this message"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Move" verb="MessageMove"
-    _label="Move" _tip="Move message to a new folder"
-    pixtype="pixbuf"/>
-
-    <toolitem name="Copy" verb="MessageCopy"
-    _label="Copy" _tip="Copy message to a new folder"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" verb="MessagePrint"
-    _label="Print" _tip="Print the selected message"
-    pixtype="stock" pixname="Print"/>
-
-    <toolitem name="Delete" verb="MessageDelete"
-    _label="Delete" _tip="Delete this message"
-    pixtype="stock" pixname="Trash"/>
-
-    <toolitem name="Stop" verb="MailStop" _label="Stop"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
deleted file mode 100644
index bcc259c4d5..0000000000
--- a/ui/evolution-message-composer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  This file is autogenerated from evolution-message-composer.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Open");
-gchar *s = N_("Open a file");
-gchar *s = N_("Save");
-gchar *s = N_("Save the current file");
-gchar *s = N_("Save As");
-gchar *s = N_("Save the current file with a different name");
-gchar *s = N_("Close");
-gchar *s = N_("Close the current file");
-gchar *s = N_("Save in folder...");
-gchar *s = N_("Save the message in a specified folder");
-gchar *s = N_("Insert text file...");
-gchar *s = N_("Insert a file as text into the message");
-gchar *s = N_("Send");
-gchar *s = N_("Send the message now");
-gchar *s = N_("Send _later");
-gchar *s = N_("Send the message later");
-gchar *s = N_("Attach");
-gchar *s = N_("Attach a file");
-gchar *s = N_("HTML");
-gchar *s = N_("Send the mail in HTML format");
-gchar *s = N_("Show attachments");
-gchar *s = N_("Show / hide attachments");
-gchar *s = N_("_File");
-gchar *s = N_("_Open...");
-gchar *s = N_("_Save");
-gchar *s = N_("Save _As...");
-gchar *s = N_("Save in _folder... (FIXME)");
-gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send");
-gchar *s = N_("Send _Later");
-gchar *s = N_("_Close");
-gchar *s = N_("_Edit");
-gchar *s = N_("F_ormat");
-gchar *s = N_("_View");
-gchar *s = N_("Show _attachments");
-gchar *s = N_("_Help");
-gchar *s = N_("_About...");
-gchar *s = N_("_Debug");
-gchar *s = N_("Send this message now");
-gchar *s = N_("Bold");
-gchar *s = N_("Sets something as bold");
-
-
-
-
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index 06152658fc..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/>
-	
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="stock" pixname="Save"
-		accel="*Ctrl*s"/>
-	
-	        <cmd name="FileSaveAs" _label="Save As"
-	          _tip="Save the current file with a different name"
-		  pixtype="stock" pixname="Save As"/>
-
-	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="Close"
-		accel="*Ctrl*w"/>
-
-		<cmd name="FileSaveInFolder" _label="Save in folder..."
-		_tip="Save the message in a specified folder"/>
-	
-		<cmd name="FileInsertFile" _label="Insert text file..."
-		_tip="Insert a file as text into the message"/>
-
-		<cmd name="FileSend" _label="Send" _tip="Send the message now"
-		accel="*Ctrl*Return"
-                pixtype="stock" pixname="Send Mail"/>
-
-		<cmd name="FileSendLater" _label="Send _later" _tip="Send the message later"
-		pixtype="stock" pixname="Send Mail"/> 
-
-		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		pixtype="stock" pixname="Attach" accel="*Ctrl**Alt*A"/>
-
-		<cmd name="FormatHtml" _label="HTML" _tip="Send the mail in HTML format"
-		type="toggle" state="0"/> 
-
-		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
-		type="toggle" state="0"/> 
-	
-                <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
-		type="toggle" state="0"/>
-
-                <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
-		type="toggle" state="0"/>
-
-	</commands>
-
-
-        <keybindings>
-
-        </keybindings>
-
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-			<menuitem name="FileOpen" verb="" _label="_Open..."/>
-
-			<placeholder name="FileOps"/>
-
-			<menuitem name="FileSave" verb="" _label="_Save"/>
-
-			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-
-                        <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
-
-			<menuitem name="FileSaveInFolder" verb="" _label="Save in _folder... (FIXME)"/>
-
-			<placeholder name="Print" delimit="top"/>
-			<separator/>
-
-			<menuitem name="FileInsertFile" verb="" _label="_Insert text file... (FIXME)"/>
-
-			<separator/>
-
-			<menuitem name="FileSend" verb="" _label="Send"/>
-
-			<menuitem name="FileSendLater" verb="" _label="Send _Later"/>
-
-			<separator/>
-
-			<menuitem name="FileClose" verb="" _label="_Close"/>
-
-		</submenu>
-
-
-		<submenu name="Edit" _label="_Edit"/>
-              
-
-		<submenu name="Format" _label="F_ormat">
-
-			<menuitem name="FormatHtml" verb=""/>
-
-		</submenu>
-
-		<submenu name="View" _label="_View">
-
-			<menuitem name="ViewAttach" verb="" _label="Show _attachments"/>
-
-		</submenu>
-
-		<placeholder name="Component"/>
-
-                <submenu name="Security" _label="_Security">
-
-                        <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
-
-                        <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
-
-                </submenu>
-
-		<submenu name="Help" _label="_Help">
-	
-			<placeholder name="BuiltMenuItems"/>
-
-		        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-		</submenu>
-
-		<submenu name="Debug" _label="_Debug" hidden="1">
-
-			<menuitem name="DebugDumpXml" verb=""/>
-
-		</submenu>
-
-	</menu>
-
-	<dockitem name="Toolbar" behavior="exclusive">
-
-		<toolitem name="FileSend" verb=""  _tip="Send this message now"/>
-
-		<toolitem name="FileAttach" verb=""/>
-
-		<separator/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
deleted file mode 100644
index 3bd3529587..0000000000
--- a/ui/evolution-subscribe.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<Root>
-  <menu>
-    <submenu name="File" _label="_File">
-
-        <menuitem name="FileCloseWin" verb=""
-        _label="Close"/>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection"/>
-
-    </submenu>
-
-    <placeholder name="Component">
-
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="SubscribeFolder" verb=""
-        _label="Subscribe"/>
-
-        <menuitem name="UnsubscribeFolder" verb=""
-        _label="Unsubscribe"/>
-
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive">
-
-    <toolitem name="SubscribeFolder" verb=""
-    _label="Subscribe" _tip="Add folder to your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <toolitem name="UnsubscribeFolder" verb=""
-    _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="RefreshList" verb=""
-    _label="Refresh List" _tip="Refresh List of Folders"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <control name="FolderSearch"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-task-editor-dialog.xml b/ui/evolution-task-editor-dialog.xml
deleted file mode 100644
index 2fdbd9ae87..0000000000
--- a/ui/evolution-task-editor-dialog.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<Root>
-
-<commands>
-
-        <cmd name="FileSave" _label="Save"
-	_tip="Save the current file" pixtype="stock" pixname="Save"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAndClose" _label="Save and Close"
-	_tip="Save the task and close the dialog box"
-	pixtype="stock" pixname="Save"/>
-
-	<cmd name="FileDelete" _label="Delete"
-	_tip="Delete this task"
-	pixtype="stock" pixname="Trash"/>
-
-        <cmd name="FilePrint" _label="Print..."
-	_tip="Print this item" pixtype="stock" pixname="Print"/>
-
-        <cmd name="FilePrintSetup" _label="Print Setup"
-          _tip="Setup the page settings for your current printer"
-	  pixtype="stock" pixname="Print"/>
-
-        <cmd name="FileClose" _label="Close"
-	_tip="Close the current file" pixtype="stock" pixname="Close"
-	accel="*Control*w"/>
-
-        <cmd name="EditCut" _label="Cut" _tip="Cut the selection"
-          pixtype="stock" pixname="Cut" accel="*Control*x"/>
-	
-        <cmd name="EditCopy" _label="Copy"
-	_tip="Copy the selection" pixtype="stock" pixname="Copy"
-	accel="*Control*c"/>
-	
-        <cmd name="EditPaste" _label="Paste"
-	_tip="Paste the clipboard" pixtype="stock" pixname="Paste"
-	accel="*Control*v"/>
-	
-        <cmd name="EditClear" _label="Clear"
-	_tip="Clear the selection"/>
-	
-        <cmd name="EditUndo" _label="Undo" _tip="Undo the last action"
-          pixtype="stock" pixname="Undo" accel="*Control*z"/>
-	
-        <cmd name="EditRedo" _label="Redo" _tip="Redo the undone action"
-          pixtype="stock" pixname="Redo" accel="*Control*r"/>
-	
-        <cmd name="EditFind" _label="Find" _tip="Search for a string"
-          pixtype="stock" pixname="Search" accel="F6"/>
-	
-        <cmd name="EditFindAgain" _label="Find Again" _tip="Search again for the same string"
-          pixtype="stock" pixname="Search" accel="*Shift*F6"/>
-	
-        <cmd name="EditReplace" _label="Replace" _tip="Replace a string"
-          pixtype="stock" pixname="Search/Replace" accel="F7"/>
-
-	<cmd name="EditSelectAll" _label="Select All" _tip="Select everything"/>
-
-        <cmd name="EditProperties" _label="Properties" _tip="Modify the file's properties"
-	  pixtype="stock" pixname="Properties"/>
-
-	<cmd name="GoPrevious" _label="Previous" _tip="Go to the previous item"
-	pixtype="stock" pixname="Back"/>
-
-	<cmd name="GoNext" _label="Next" _tip="Go to the next item"
-	pixtype="stock" pixname="Forward"/>
-
-        <cmd name="HelpAbout" _label="About..." _tip="About this application"
-	 pixtype="stock" pixname="About"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New" _label="_New">
-
-		<menuitem name="a" _label="_Task (FIXME)"/>
-
-		<menuitem name="b" _label="Task _Request (FIXME)"/>
-
-		<separator/>
-
-		<menuitem name="c" _label="_Mail Message (FIXME)"/>
-
-		<menuitem name="e" _label="_Appointment (FIXME)"/>
-
-		<menuitem name="f" _label="Meeting Re_quest (FIXME)"/>
-
-		<menuitem name="g" _label="_Contact (FIXME)"/>
-
-		<menuitem name="h" _label="_Journal Entry (FIXME)"/>
-
-		<menuitem name="i" _label="_Note (FIXME)"/>
-
-	</submenu>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb="" _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="o" _label="_Move to Folder... (FIXME)"/>
-
-	<menuitem name="p" _label="Cop_y to Folder... (FIXME)"/>
-
-	<separator/>
-
-	<placeholder name="Print">
-
-		<menuitem name="" _label="Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="_Select All"/>
-
-	<placeholder name="EditOps"/>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="Fi_rst Item in Folder (FIXME)"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="_Last Item in Folder (FIXME)"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="Chec_k Names (FIXME)"/>
-
-	<menuitem name="" _label="Address _Book... (FIXME)"/>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="" _label="S_end Status Report (FIXME)"/>
-
-	<menuitem name="" _label="_Mark Complete (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="S_kip Occurrence (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="Assig_n Task (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="_Reply (FIXME)"/>
-
-	<menuitem name="" _label="Reply to A_ll (FIXME)"/>
-
-	<menuitem name="" _label="For_ward (FIXME)"/>
-
-</submenu>
-
-<submenu name="Help" _label="_Help">
-	
-	<placeholder name="BuiltMenuItems"/>
-
-        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-</submenu>
-
-<submenu name="Debug" _label="_Debug" hidden="1">
-
-	<menuitem name="DebugDumpXml"/>
-
-</submenu>
-
-</menu>
-
-<dockitem name="Toolbar" behavior="exclusive">
-
-	<toolitem name="FileSaveAndClose" verb=""/>
-
-	<toolitem name="FileDelete" verb=""/>
-
-	<toolitem name="FileClose" verb=""/>
-
-	<separator/>
-
-	<toolitem name="FilePrint" verb=""/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
deleted file mode 100644
index eaf8135645..0000000000
--- a/ui/evolution-tasks.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-
-	<menu>
-		<submenu name="File">
-
-			<placeholder name="FileOps">
-				
-				<menuitem name="TasksSaveAs" verb=""
-				_label="_Save As..."
-				_tip="Save task as something else"
-                                accel="*Control*a"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="TasksPrint"
-				_label="_Print"
-				pixtype="stock" pixname="Print"
-				accel="*Control*p"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="Preferences" _label="Tasks Preferences..."
-			verb="TasksPreferences" _tip="Alter preferences"
-                        />
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New"
-		priority="1" _tip="Create a new task" verb="TasksNewTask"
-		pixtype="stock" pixname="New"/>
-
-		<separator/>
-
-		<toolitem name="Print" _label="Print"
-		_tip="Print" verb="TasksPrint"
-		pixtype="stock" pixname="Print"/>
-
-	</dockitem>
-
-</Root>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ui/evolution.xml b/ui/evolution.xml
deleted file mode 100644
index 40d9be4cbd..0000000000
--- a/ui/evolution.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="FileClose" _label="Close" _tip="Close this window"
-			pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-	        <cmd name="FileExit" _label="Exit" _tip="Exit the program"
-			pixtype="stock" pixname="Exit" accel="*Control*q"/>
-
-		<cmd name="ViewShortcutBar" type="toggle"
-			_label="Show the _Shortcut Bar"
-			_tip="Toggle whether to show the shortcut bar"/>
-
-		<cmd name="ViewFolderBar" type="toggle"
-			_label="Show the _Folder Bar"
-			_tip="Toggle whether to show the folder bar"/>
-
-		<cmd name="HelpSubmitBug" _label="Submit Bug Report"
-			_tip="Submit bug report using Bug Buddy."/>
-
-
-		<cmd name="HelpAbout" _label="About Evolution..."
-			_tip="Show information about Evolution"
-			pixtype="stock" pixname="About"/>
-
-		<cmd name="BonoboCustomize" _label="Customize"
-			_tip="Customize toolbars"
-			pixtype="stock" pixname="Preferences"/>
-	</commands>
-
-	<menu>
-		<submenu name="File" _label="_File">
-			<submenu name="New" _label="_New">
-				<menuitem name="View" verb="NewView" _label="_View"
-				accel="*Control**Shift*v"
-				pixtype="stock" pixname="New"/>
-
-				<menuitem name="Folder" verb="NewFolder"
-				_label="_Folder"
-				accel="*Control**Shift*f"/>
-
-				<menuitem name="Shortcut" verb="NewBarShortcut"
-				_label="Evolution bar _shortcut"
-				accel="*Control**Shift*s"/>
-
-				<separator/>
-
-				<menuitem name="Mail" verb="NewMailMessage"
-				_label="_Mail message"
-				accel="*Control**Shift*m"/>
-
-				<menuitem name="Appointment" verb="NewAppointment"
-				_label="_Appointment (FIXME)"
-				accel="*Control**Shift*a"/>
-
-				<menuitem name="Contact" verb="NewContact"
-				_label="_Contact (FIXME)"
-				accel="*Control**Shift*c"/>
-
-				<menuitem name="Task" verb="NewTask"
-				_label="_Task (FIXME)"
-				accel="*Control**Shift*t"/>
-			
-				<placeholder name="NewItems"/>
-			</submenu>
-
-			<placeholder name="FileOps"/>
-
-			<separator/>
-
-			<menuitem name="FileImporter" verb=""
-			_label="_Import file..."
-			_tip="Import an external file format" accel="*Control*i"/>
-
-			<menuitem name="FileGoToFolder" verb=""
-			_label="_Go to Folder..."
-			_tip="Display a different folder" accel="*Control*g"/>
-
-			<placeholder name="Print" delimit="top"/>
-
-			<separator/>
-
-			<menuitem name="FileClose" verb=""
-			_label="_Close"/>
-
-			<menuitem name="FileExit" verb="" _label="E_xit"/>
-
-		</submenu>
-
-		<submenu name="Edit" _label="_Edit">
-
-			<placeholder/>
-
-			<menuitem name="BonoboCustomize" verb=""
-			 _label="Customi_ze..." pos="bottom"/>
-
-		</submenu>
-
-		<submenu name="View" _label="_View">
-
-			<menuitem name="ShortcutBar" id="ViewShortcutBar" 
-				  accel="*Control*s"/>
-			<menuitem name="FolderBar" id="ViewFolderBar" accel="*Control*f"/>
-
-		</submenu>
-
-		<submenu name="Settings" _label="_Settings"/>
-
-		<placeholder name="Component"/>
-
-		<submenu name="Help" _label="_Help">
-
-			<menuitem name="HelpIndex" verb=""
-			_label="_Index"
-                        accel="*Control*h"/>
-
-			<menuitem name="HelpGetStarted" verb=""
-			_label="Getting _Started"
-			 />
-
-			<menuitem name="HelpUsingMail" verb=""
-			_label="Using the _Mailer"
-			 />
-
-			<menuitem name="HelpUsingCalendar" verb=""
-			_label="Using the _Calendar"
-			 />
-
-			<menuitem name="HelpUsingContact" verb=""
-			_label="Using the C_ontact Manager"
-			 />
-
-			<separator/>
-
-			<menuitem name="HelpSubmitBug" verb=""
-			_label="Submit _Bug Report"/>
-
-			<separator/>
-
-			<menuitem name="HelpAbout" verb=""
-			_label="_About Evolution..."/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-	 _tip="Main toolbar" hlook="text" vlook="icon"/>
-
-	<status>
-		<item name="main"/>
-		<control name="Progress"/>
-	</status>
-</Root>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/views/.cvsignore b/views/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/ChangeLog b/views/ChangeLog
deleted file mode 100644
index 6fdf3b3ce2..0000000000
--- a/views/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* .cvsignore, Makefile.am, mail/.cvsignore,
-	mail/By_Sender.galview, mail/By_Subject.galview, mail/Makefile.am,
-	mail/galview.xml, tasks/.cvsignore, tasks/Makefile.am,
-	tasks/Tasks.galview, tasks/With_Category.galview,
-	tasks/galview.xml: Builtin View menus for tasks and mail.
diff --git a/views/Makefile.am b/views/Makefile.am
deleted file mode 100644
index 6742ee1adc..0000000000
--- a/views/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = mail tasks
diff --git a/views/mail/.cvsignore b/views/mail/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/mail/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/mail/By_Sender.galview b/views/mail/By_Sender.galview
deleted file mode 100644
index 943e7574d0..0000000000
--- a/views/mail/By_Sender.galview
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<ETableState state-version="0.100000">
-  <column source="0"/>
-  <column source="3"/>
-  <column source="1"/>
-  <column source="4"/>
-  <column source="5"/>
-  <column source="6"/>
-  <grouping/>
-</ETableState>
diff --git a/views/mail/By_Subject.galview b/views/mail/By_Subject.galview
deleted file mode 100644
index 667a7a3be8..0000000000
--- a/views/mail/By_Subject.galview
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<ETableState state-version="0.100000">
-  <column source="0"/>
-  <column source="3"/>
-  <column source="1"/>
-  <column source="4"/>
-  <column source="5"/>
-  <column source="6"/>
-  <grouping>
-    <group column="5" ascending="true"/>
-  </grouping>
-</ETableState>
diff --git a/views/mail/Makefile.am b/views/mail/Makefile.am
deleted file mode 100644
index ea739b8cdf..0000000000
--- a/views/mail/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-defaultmaildir = $(datadir)/evolution/views/mail
-defaultmail_DATA = By_Subject.galview By_Sender.galview galview.xml
-EXTRA_DIST = $(defaultmail_DATA)
diff --git a/views/mail/galview.xml b/views/mail/galview.xml
deleted file mode 100644
index 218185d63b..0000000000
--- a/views/mail/galview.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<GalViewCollection>
-  <GalView id="By_Subject" title="By Subject" filename="By_Subject.galview" type="etable"/>
-  <GalView id="By_Sender" title="By Sender" filename="By_Sender.galview" type="etable"/>
-</GalViewCollection>
diff --git a/views/tasks/.cvsignore b/views/tasks/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/tasks/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/tasks/Makefile.am b/views/tasks/Makefile.am
deleted file mode 100644
index 306e63cbca..0000000000
--- a/views/tasks/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-defaulttasksdir = $(datadir)/evolution/views/tasks
-defaulttasks_DATA = Tasks.galview With_Category.galview galview.xml
-EXTRA_DIST = $(defaulttasks_DATA)
diff --git a/views/tasks/Tasks.galview b/views/tasks/Tasks.galview
deleted file mode 100644
index 090c3e524e..0000000000
--- a/views/tasks/Tasks.galview
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<ETableState state-version="0.100000">
-  <column source="13"/>
-  <column source="14"/>
-  <column source="9"/>
-  <grouping/>
-</ETableState>
diff --git a/views/tasks/With_Category.galview b/views/tasks/With_Category.galview
deleted file mode 100644
index 270bd2ea3f..0000000000
--- a/views/tasks/With_Category.galview
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ETableState state-version="0.100000">
-  <column source="13"/>
-  <column source="14"/>
-  <column source="9"/>
-  <column source="0"/>
-  <grouping/>
-</ETableState>
diff --git a/views/tasks/galview.xml b/views/tasks/galview.xml
deleted file mode 100644
index d5490d4b20..0000000000
--- a/views/tasks/galview.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<GalViewCollection>
-  <GalView id="Tasks" title="Tasks" filename="Tasks.galview" type="etable"/>
-  <GalView id="With_Category" title="With Category" filename="With_Category.galview" type="etable"/>
-</GalViewCollection>
diff --git a/widgets/.cvsignore b/widgets/.cvsignore
deleted file mode 100644
index d5b3a2ad62..0000000000
--- a/widgets/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-test
-minicard-label-test
-reflow-test
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
deleted file mode 100644
index f12a20f3be..0000000000
--- a/widgets/ChangeLog
+++ /dev/null
@@ -1,147 +0,0 @@
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* cvs remove all files in shortcut-bar/, this widget is now in
-	gal, will be maintained there.
-	
-	* Makefile.am (SUBDIRS): Remove shortcut-bar from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c: Make this actually deploy the titles
-	from the GalViewCollection and emit the display_view signals and
-	such.
-
-2001-01-22  Jon Trowbridge  <trow@gnu.org>
-
-	* menus/gal-view-menus.c (define_views): Fixed
-	gal_define_views_dialog_new to be called with its proper argument.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h: Added a
-	GalViewCollection argument to the new function here.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* menus/gal-view-menus.c: NULL-terminate gal_view_menus_apply's
-	BonoboUIVerb array to prevent a crash. (Why are there gal* things
-	in the evolution sources?)
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned/.cvsignore, e-table/.cvsignore, e-text/.cvsignore:
-	Removed unnecessary .cvsignore files.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed directories that have been moved to gal.
-
-	* e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c,
-	e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h,
-	e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal.
-
-	* e-reflow/.cvsignore, e-reflow/Makefile.am,
-	e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h,
-	e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal.
-
-	* e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE,
-	e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO,
-	e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm,
-	e-table/check-empty.xpm, e-table/check-filled.xpm,
-	e-table/clip.png, e-table/e-cell-checkbox.c,
-	e-table/e-cell-checkbox.h, e-table/e-cell-string.c,
-	e-table/e-cell-text.c, e-table/e-cell-text.h,
-	e-table/e-cell-toggle.c, e-table/e-cell-toggle.h,
-	e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c,
-	e-table/e-cell.h, e-table/e-table-click-to-add.c,
-	e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h,
-	e-table/e-table-col.c, e-table/e-table-col.h,
-	e-table/e-table-column-model.h, e-table/e-table-column.c,
-	e-table/e-table-config.c, e-table/e-table-config.glade,
-	e-table/e-table-config.glade.h, e-table/e-table-config.h,
-	e-table/e-table-defines.h, e-table/e-table-example-1.c,
-	e-table/e-table-example-2.c,
-	e-table/e-table-field-chooser-dialog.c,
-	e-table/e-table-field-chooser-dialog.h,
-	e-table/e-table-field-chooser-item.c,
-	e-table/e-table-field-chooser-item.h,
-	e-table/e-table-field-chooser.c,
-	e-table/e-table-field-chooser.glade,
-	e-table/e-table-field-chooser.glade.h,
-	e-table/e-table-field-chooser.h,
-	e-table/e-table-group-container.c,
-	e-table/e-table-group-container.h, e-table/e-table-group-leaf.c,
-	e-table/e-table-group-leaf.h, e-table/e-table-group.c,
-	e-table/e-table-group.glade, e-table/e-table-group.glade.h,
-	e-table/e-table-group.h, e-table/e-table-header-item.c,
-	e-table/e-table-header-item.h, e-table/e-table-header.c,
-	e-table/e-table-header.h, e-table/e-table-item.c,
-	e-table/e-table-item.h, e-table/e-table-model.c,
-	e-table/e-table-model.h, e-table/e-table-one.c,
-	e-table/e-table-one.h, e-table/e-table-scrolled.c,
-	e-table/e-table-scrolled.h, e-table/e-table-selection-model.c,
-	e-table/e-table-selection-model.h, e-table/e-table-simple.c,
-	e-table/e-table-simple.h, e-table/e-table-size-test.c,
-	e-table/e-table-sort-info.c, e-table/e-table-sort-info.h,
-	e-table/e-table-sorted-variable.c,
-	e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c,
-	e-table/e-table-sorted.h, e-table/e-table-sorter.c,
-	e-table/e-table-sorter.h, e-table/e-table-subset-variable.c,
-	e-table/e-table-subset-variable.h, e-table/e-table-subset.c,
-	e-table/e-table-subset.h, e-table/e-table-text-model.c,
-	e-table/e-table-text-model.h, e-table/e-table-tooltip.h,
-	e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h,
-	e-table/e-tree-example-1.c, e-table/e-tree-example-2.c,
-	e-table/e-tree-model.c, e-table/e-tree-model.h,
-	e-table/e-tree-simple.c, e-table/e-tree-simple.h,
-	e-table/image1.png, e-table/image2.png, e-table/image3.png,
-	e-table/remove-col.xpm, e-table/sample.table,
-	e-table/table-test.c, e-table/table-test.h, e-table/test-check.c,
-	e-table/test-cols.c, e-table/test-table.c: Moved to gal.
-
-	* e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c,
-	e-text/e-entry.c, e-text/e-entry.h,
-	e-text/e-text-event-processor-emacs-like.c,
-	e-text/e-text-event-processor-emacs-like.h,
-	e-text/e-text-event-processor-types.h,
-	e-text/e-text-event-processor.c, e-text/e-text-event-processor.h,
-	e-text/e-text-model.c, e-text/e-text-model.h,
-	e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to
-	gal.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-reflow/e-reflow-sorted.h: fix include.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added e-reflow.
-
-	* e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved from
-	addressbook/gui/minicard/.
-
-	* e-reflow/Makefile.am, e-reflow/.cvsignore: New files for a new
-	directory.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-text/e-text.c (calc_line_widths): Fix byte/char confusion
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-paned/e-hpaned.c (e_hpaned_motion): Do not flicker while
-	trying to resize a quantized pane.
-
-	* e-paned/e-vpaned.c (e_vpaned_motion): Likewise.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_size_allocate): Ensure that
-	the child's allocation height is >= 1.
-
-	* widgets/e-paned/e-hpaned.c (e_hpaned_size_allocate): Ensure that
-	the child's allocation width is >= 1.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/widgets/LICENSE b/widgets/LICENSE
deleted file mode 100644
index b1f6ae08a4..0000000000
--- a/widgets/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-This code is released under the terms of the GNU GPL.
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
deleted file mode 100644
index b5380daa7f..0000000000
--- a/widgets/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-SUBDIRS =			\
-	misc			\
-	meeting-time-sel	\
-	menus
diff --git a/widgets/meeting-time-sel/.cvsignore b/widgets/meeting-time-sel/.cvsignore
deleted file mode 100644
index 50530fdf4e..0000000000
--- a/widgets/meeting-time-sel/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-test-meeting-time-selector
diff --git a/widgets/meeting-time-sel/ChangeLog b/widgets/meeting-time-sel/ChangeLog
deleted file mode 100644
index 3b917ecf07..0000000000
--- a/widgets/meeting-time-sel/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-meeting-time-sel.c (e_meeting_time_selector_attendee_add): Set
-	draw_background to FALSE.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-meeting-time-sel.c: Fixed a bunch of warnings.
-
-2000-09-25  Damon Chaplin  <damon@helixcode.com>
-
-	* e-meeting-time-sel-item.c: 
-	* e-meeting-time-sel.c: fixed use of date strings to support i18n
-	better.
-	(e_meeting_time_selector_update_attendees_list_positions): updated to
-	use e_canvas_item_move_absolute() to position the EText items.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-meeting-time-sel-list-item.c, e-meeting-time-sel.c,
-	e-meeting-time-sel.h: Fixed the #include lines to deal properly
-	with gal.
-
-2000-09-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added the include path to top_srcdir.
-
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-meeting-time-sel.c: Specify the #include path for
-	`e-canvas-utils.h' so that we build with builddir != srcdir.
-
diff --git a/widgets/meeting-time-sel/LICENSE b/widgets/meeting-time-sel/LICENSE
deleted file mode 100644
index 9babf4395f..0000000000
--- a/widgets/meeting-time-sel/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-This code is licensed under the terms of the GNU GPL
diff --git a/widgets/meeting-time-sel/Makefile.am b/widgets/meeting-time-sel/Makefile.am
deleted file mode 100644
index 767de5cd86..0000000000
--- a/widgets/meeting-time-sel/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-INCLUDES =					\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)			\
-	-I $(top_srcdir)			\
-	-DG_LOG_DOMAIN=\"meeting-time-sel\"
-
-noinst_LIBRARIES =				\
-	libevolutionmtsel.a
-
-libevolutionmtsel_a_SOURCES =			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-time-sel-list-item.c		\
-	e-meeting-time-sel-list-item.h
-
-noinst_PROGRAMS =	\
-	test-meeting-time-selector
-
-test_meeting_time_selector_SOURCES = 	\
-	test-meeting-time-sel.c
-
-test_meeting_time_selector_LDADD =			\
-	libevolutionmtsel.a				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GNOMEUI_LIBS)
-
-test_meeting_time_selector_LDFLAGS = $(GNOME_LIBDIR)
-
-EXTRA_DIST =				\
-	e-meeting-time-sel-mail.xpm	\
-	e-meeting-time-sel-no-mail.xpm
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-item.c b/widgets/meeting-time-sel/e-meeting-time-sel-item.c
deleted file mode 100644
index 93239f4a5d..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-item.c
+++ /dev/null
@@ -1,987 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * 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.
- */
-
-#include <config.h>
-#include <time.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_class_init (EMeetingTimeSelectorItemClass *mts_item_class);
-static void e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item);
-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, EMeetingTimeSelectorBusyType 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);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-
-GtkType
-e_meeting_time_selector_item_get_type (void)
-{
-	static GtkType e_meeting_time_selector_item_type = 0;
-
-	if (!e_meeting_time_selector_item_type) {
-		GtkTypeInfo e_meeting_time_selector_item_info = {
-			"EMeetingTimeSelectorItem",
-			sizeof (EMeetingTimeSelectorItem),
-			sizeof (EMeetingTimeSelectorItemClass),
-			(GtkClassInitFunc) e_meeting_time_selector_item_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_meeting_time_selector_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_meeting_time_selector_item_info);
-	}
-
-	return e_meeting_time_selector_item_type;
-}
-
-
-static void
-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	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_TOP_LEFT_ARROW);
-	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);
-
-	gdk_cursor_destroy (mts_item->normal_cursor);
-	gdk_cursor_destroy (mts_item->resize_cursor);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (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 (parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (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 (parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (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 (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (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;
-	EMeetingTimeSelectorAttendee *attendee;
-	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 < mts->attendees->len && row_y < height) {
-			attendee = &g_array_index (mts->attendees,
-						   EMeetingTimeSelectorAttendee, row);
-			if (attendee->has_calendar_info) {
-				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;
-	GdkFont *font;
-	gint y, grid_x;
-	gchar buffer[128], *format;
-	gint hour, hour_x, hour_y;
-	GdkRectangle clip_rect;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-
-	/* 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. */
-	font = GTK_WIDGET (mts)->style->font;
-	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);
-	gdk_draw_string (drawable, font, gc,
-			 x + 4, 4 + font->ascent - scroll_y, buffer);
-	gdk_gc_set_clip_rectangle (gc, NULL);
-
-	/* Draw the hours. */
-	hour = mts->first_hour_shown + (mts->zoomed_out ? 3 : 1);
-	hour_x = x + mts->col_width;
-	hour_y = mts->row_height + 4 + font->ascent - scroll_y;
-	while (hour < mts->last_hour_shown) {
-		gdk_draw_string (drawable, font, gc,
-				 hour_x - (mts->hour_widths[hour] / 2),
-				 hour_y, EMeetingTimeSelectorHours[hour]);
-
-		hour += mts->zoomed_out ? 3 : 1;
-		hour_x += mts->col_width;
-	}
-}
-
-
-/* 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;
-	EMeetingTimeSelectorBusyType 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, mts->attendees->len);
-	for (row = 0; row < mts->attendees->len; 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_TIME_SELECTOR_BUSY_LAST;
-	     busy_type++) {
-		gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-		for (row = 0; row < mts->attendees->len; 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 <= mts->attendees->len) {
-			  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 = (mts->attendees->len * 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;
-	EMeetingTimeSelectorBusyType 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 < mts->attendees->len) {
-
-		/* 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_TIME_SELECTOR_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;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	gint period_num;
-
-	mts = mts_item->mts;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	period_num = e_meeting_time_selector_find_first_busy_period (mts, attendee, date);
-	if (period_num == -1)
-		return -1;
-
-	/* Check if the period starts after the end of the current canvas
-	   scroll area. */
-	period = &g_array_index (attendee->busy_periods,
-				 EMeetingTimeSelectorPeriod, 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, EMeetingTimeSelectorBusyType busy_type)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	GdkGC *gc;
-	gint period_num, x1, x2, x2_within_day, x2_within_col;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	for (period_num = first_period;
-	     period_num < attendee->busy_periods->len;
-	     period_num++) {
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod, 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;
-	EMeetingTimeSelectorTime 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->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;
-	}
-
-	/* 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)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	*start_x = -1;
-	*end_x = -1;
-
-	if (!g_date_valid (&attendee->busy_periods_start.date)
-	    || !g_date_valid (&attendee->busy_periods_end.date))
-		return FALSE;
-
-	*start_x = e_meeting_time_selector_calculate_time_position (mts, &attendee->busy_periods_start) - x - 1;
-
-	*end_x = e_meeting_time_selector_calculate_time_position (mts, &attendee->busy_periods_end) - x;
-
-	return TRUE;
-}
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-item.h b/widgets/meeting-time-sel/e-meeting-time-sel-item.h
deleted file mode 100644
index d9fe6c6a9b..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-item.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * 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/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c b/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c
deleted file mode 100644
index da7e4176be..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EMeetingTimeSelectorListItem - A GnomeCanvasItem covering the entire attendee
- * list. It just draws the grid lines between the rows and after the icon
- * column. 
- */
-
-#include <config.h>
-#include <time.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-meeting-time-sel-list-item.h"
-#include "e-meeting-time-sel.h"
-
-/* This is the size of our icons. */
-#define E_MEETING_TIME_SELECTOR_ICON_WIDTH 19
-#define E_MEETING_TIME_SELECTOR_ICON_HEIGHT 16
-
-#include "e-meeting-time-sel-mail.xpm"
-#include "e-meeting-time-sel-no-mail.xpm"
-
-static void e_meeting_time_selector_list_item_class_init (EMeetingTimeSelectorListItemClass *mtsl_item_class);
-static void e_meeting_time_selector_list_item_init (EMeetingTimeSelectorListItem *mtsl_item);
-static void e_meeting_time_selector_list_item_destroy (GtkObject *object);
-
-static void e_meeting_time_selector_list_item_set_arg (GtkObject *o, GtkArg *arg,
-						     guint arg_id);
-static void e_meeting_time_selector_list_item_realize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_list_item_unrealize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_list_item_update (GnomeCanvasItem *item,
-						      double *affine,
-						      ArtSVP *clip_path, int flags);
-static void e_meeting_time_selector_list_item_draw (GnomeCanvasItem *item,
-						    GdkDrawable *drawable,
-						    int x, int y,
-						    int width, int height);
-static double e_meeting_time_selector_list_item_point (GnomeCanvasItem *item,
-						       double x, double y,
-						       int cx, int cy,
-						       GnomeCanvasItem **actual_item);
-static gint e_meeting_time_selector_list_item_event (GnomeCanvasItem *item,
-						     GdkEvent	 *event);
-static gboolean e_meeting_time_selector_list_item_button_press (EMeetingTimeSelectorListItem *mtsl_item,
-								GdkEvent *event);
-
-
-static GnomeCanvasItemClass *e_meeting_time_selector_list_item_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-
-GtkType
-e_meeting_time_selector_list_item_get_type (void)
-{
-	static GtkType e_meeting_time_selector_list_item_type = 0;
-
-	if (!e_meeting_time_selector_list_item_type) {
-		GtkTypeInfo e_meeting_time_selector_list_item_info = {
-			"EMeetingTimeSelectorListItem",
-			sizeof (EMeetingTimeSelectorListItem),
-			sizeof (EMeetingTimeSelectorListItemClass),
-			(GtkClassInitFunc) e_meeting_time_selector_list_item_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_list_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_meeting_time_selector_list_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_meeting_time_selector_list_item_info);
-	}
-
-	return e_meeting_time_selector_list_item_type;
-}
-
-
-static void
-e_meeting_time_selector_list_item_class_init (EMeetingTimeSelectorListItemClass *mtsl_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	e_meeting_time_selector_list_item_parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) mtsl_item_class;
-	item_class = (GnomeCanvasItemClass *) mtsl_item_class;
-
-	gtk_object_add_arg_type ("EMeetingTimeSelectorListItem::meeting_time_selector",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_MEETING_TIME_SELECTOR);
-
-	object_class->destroy = e_meeting_time_selector_list_item_destroy;
-	object_class->set_arg = e_meeting_time_selector_list_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_meeting_time_selector_list_item_realize;
-	item_class->unrealize   = e_meeting_time_selector_list_item_unrealize;
-	item_class->update      = e_meeting_time_selector_list_item_update;
-	item_class->draw        = e_meeting_time_selector_list_item_draw;
-	item_class->point       = e_meeting_time_selector_list_item_point;
-	item_class->event       = e_meeting_time_selector_list_item_event;
-}
-
-
-static void
-e_meeting_time_selector_list_item_init (EMeetingTimeSelectorListItem *mtsl_item)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mtsl_item);
-	GdkColormap *colormap;
-
-	mtsl_item->mts = NULL;
-
-	colormap = gtk_widget_get_default_colormap ();
-	mtsl_item->mail_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mtsl_item->mail_icon_mask, NULL, e_meeting_time_sel_mail_xpm);
-	mtsl_item->no_mail_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mtsl_item->no_mail_icon_mask, NULL, e_meeting_time_sel_no_mail_xpm);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-}
-
-
-static void
-e_meeting_time_selector_list_item_destroy (GtkObject *object)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (object);
-
-	gdk_pixmap_unref (mtsl_item->mail_icon);
-	gdk_pixmap_unref (mtsl_item->no_mail_icon);
-	gdk_bitmap_unref (mtsl_item->mail_icon_mask);
-	gdk_bitmap_unref (mtsl_item->mail_icon_mask);
-
-	if (GTK_OBJECT_CLASS (e_meeting_time_selector_list_item_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (e_meeting_time_selector_list_item_parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_list_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	item = GNOME_CANVAS_ITEM (o);
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_MEETING_TIME_SELECTOR:
-		mtsl_item->mts = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_meeting_time_selector_list_item_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvas *canvas;
-	GdkWindow *window;
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->realize)(item);
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
-
-	mtsl_item->main_gc = gdk_gc_new (window);
-}
-
-
-static void
-e_meeting_time_selector_list_item_unrealize (GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	gdk_gc_unref (mtsl_item->main_gc);
-	mtsl_item->main_gc = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->unrealize)(item);
-}
-
-
-static void
-e_meeting_time_selector_list_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_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_meeting_time_selector_list_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	GdkGC *gc;
-	GdkFont *font;
-	gint row, row_y, icon_x, icon_y;
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-	mts = mtsl_item->mts;
-	gc = mtsl_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->attendee_list_bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
-
-	gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-	gdk_draw_line (drawable, gc, 24 - x, 0, 24 - x, height);
-
-	/* Draw the grid line across the top of the row. */
-	row = y / mts->row_height;
-	row_y = row * mts->row_height - y;
-	while (row_y < height) {
-		gdk_draw_line (drawable, gc, 0, row_y, width, row_y);
-		row_y += mts->row_height;
-	}
-
-	row = y / mts->row_height;
-	row_y = row * mts->row_height - y;
-	icon_x = (E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_ICON_WIDTH + 1) / 2 - x;
-	icon_y = row_y + (mts->row_height - E_MEETING_TIME_SELECTOR_ICON_HEIGHT + 1) / 2;
-	while (row < mts->attendees->len && row_y < height) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-
-		if (attendee->send_meeting_to) {
-			pixmap = mtsl_item->mail_icon;
-			mask = mtsl_item->mail_icon_mask;
-		} else {
-			pixmap = mtsl_item->no_mail_icon;
-			mask = mtsl_item->no_mail_icon_mask;
-		}
-
-		gdk_gc_set_clip_mask (gc, mask);
-		gdk_draw_pixmap (drawable, gc, pixmap, 0, 0,
-				 icon_x, icon_y, 24, 24);
-
-		row++;
-		row_y += mts->row_height;
-		icon_y += mts->row_height;
-	}
-	gdk_gc_set_clip_mask (gc, NULL);
-
-	/* Draw 'Click here to add attendee' on the last dummy row. */
-	row_y = mts->attendees->len * mts->row_height;
-
-	font = GTK_WIDGET (mts)->style->font;
-	gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-	gdk_draw_string (drawable, font, gc,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-			 + E_MEETING_TIME_SELECTOR_TEXT_X_PAD - x,
-			 row_y + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD
-			 + font->ascent + 1 - y,
-			 "Click here to add attendee");
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we cover the entire canvas 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_list_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_list_item_event (GnomeCanvasItem *item,
-					 GdkEvent *event)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_meeting_time_selector_list_item_button_press (mtsl_item, event);
-	case GDK_BUTTON_RELEASE:
-		break;
-	case GDK_MOTION_NOTIFY:
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_meeting_time_selector_list_item_button_press (EMeetingTimeSelectorListItem *mtsl_item,
-						GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-	gboolean return_val;
-
-	mts = mtsl_item->mts;
-	row = event->button.y / mts->row_height;
-
-	g_print ("In e_meeting_time_selector_list_item_button_press: %g,%g row:%i\n",
-		 event->button.x, event->button.y, row);
-
-	if (event->button.x >= E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH) {
-		if (row < mts->attendees->len) {
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			gtk_signal_emit_by_name (GTK_OBJECT (attendee->text_item),
-						 "event", event, &return_val);
-			return return_val;
-		} else {
-			row = e_meeting_time_selector_attendee_add (mts, "",
-								    NULL);
-
-			/* Scroll down to show the last line.?? */
-#if 0
-			adjustment = GTK_LAYOUT (mts->display_main)->vadjustment;
-			adjustment->value = adjustment->upper - adjustment->page_size;
-			gtk_adjustment_value_changed (adjustment);
-#endif
-
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			e_canvas_item_grab_focus (attendee->text_item);
-			return TRUE;
-		}
-	} else {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		attendee->send_meeting_to = !attendee->send_meeting_to;
-
-		gnome_canvas_request_redraw (GNOME_CANVAS_ITEM (mtsl_item)->canvas,
-					     0, row * mts->row_height,
-					     E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH,
-					     (row + 1) * mts->row_height);
-		return TRUE;
-	}
-}
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h b/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h
deleted file mode 100644
index 07df052c08..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * MeetingTimeSelectorListItem - A GnomeCanvasItem covering the entire attendee
- * list. It just draws the grid lines between the rows and after the icon
- * column. 
- */
-
-#ifndef _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_
-#define _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_
-
-#include "e-meeting-time-sel.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_MEETING_TIME_SELECTOR_LIST_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_list_item_get_type (), EMeetingTimeSelectorListItem))
-#define E_MEETING_TIME_SELECTOR_LIST_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_list_item_get_type (), EMeetingTimeSelectorListItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_LIST_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_list_item_get_type ()))
-
-
-typedef struct _EMeetingTimeSelectorListItem      EMeetingTimeSelectorListItem;
-typedef struct _EMeetingTimeSelectorListItemClass EMeetingTimeSelectorListItemClass;
-
-struct _EMeetingTimeSelectorListItem
-{
-	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;
-
-	GdkPixmap *mail_icon, *no_mail_icon;
-	GdkBitmap *mail_icon_mask, *no_mail_icon_mask;
-};
-
-
-struct _EMeetingTimeSelectorListItemClass
-{
-	GnomeCanvasItemClass parent_class;
-};
-
-GtkType e_meeting_time_selector_list_item_get_type (void);
-
-
-#endif /* _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_ */
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm b/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm
deleted file mode 100644
index 5a03c7ea8a..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm
+++ /dev/null
@@ -1,135 +0,0 @@
-/* XPM */
-static char * e_meeting_time_sel_mail_xpm[] = {
-"19 16 116 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #7B7B78",
-"@ 	c #C7C7C3",
-"# 	c #F1F0EB",
-"$ 	c #BFBFBC",
-"% 	c #5F5E5E",
-"& 	c #E3E3DF",
-"* 	c #F3F3EF",
-"= 	c #F2F2EE",
-"- 	c #F1F1EC",
-"; 	c #F0EFEB",
-"> 	c #D2D2CD",
-", 	c #969592",
-"' 	c #616060",
-") 	c #B5B5B4",
-"! 	c #F8F8F6",
-"~ 	c #F7F7F5",
-"{ 	c #F6F6F3",
-"] 	c #F5F5F2",
-"^ 	c #F4F4F0",
-"/ 	c #F2F1ED",
-"( 	c #F1F0EC",
-"_ 	c #F0EFEA",
-": 	c #EFEEE9",
-"< 	c #4F4F4D",
-"[ 	c #BDBCB8",
-"} 	c #A7A6A3",
-"| 	c #C6C6C4",
-"1 	c #7C7C7B",
-"2 	c #525251",
-"3 	c #DBDBD9",
-"4 	c #F5F4F1",
-"5 	c #F4F3F0",
-"6 	c #F3F2EE",
-"7 	c #999894",
-"8 	c #62625F",
-"9 	c #BCBCB6",
-"0 	c #EBE9E3",
-"a 	c #838381",
-"b 	c #D7D6D4",
-"c 	c #A8A8A6",
-"d 	c #515150",
-"e 	c #7E7D7C",
-"f 	c #DAD9D5",
-"g 	c #EFEEE8",
-"h 	c #EEEDE7",
-"i 	c #4F4E4C",
-"j 	c #BCBBB6",
-"k 	c #EBE9E2",
-"l 	c #EAE8E1",
-"m 	c #F6F5F2",
-"n 	c #F4F3EF",
-"o 	c #B5B4B1",
-"p 	c #9B9A97",
-"q 	c #646361",
-"r 	c #92918E",
-"s 	c #EEEDE8",
-"t 	c #EDECE6",
-"u 	c #4E4E4C",
-"v 	c #797976",
-"w 	c #797874",
-"x 	c #E9E8E1",
-"y 	c #E8E7DF",
-"z 	c #B4B3AF",
-"A 	c #D0D0CD",
-"B 	c #F2F2ED",
-"C 	c #BFBEBA",
-"D 	c #BEBDB9",
-"E 	c #7A7A77",
-"F 	c #979691",
-"G 	c #EAE9E2",
-"H 	c #959590",
-"I 	c #787773",
-"J 	c #B8B7B0",
-"K 	c #E6E4DC",
-"L 	c #A9A9A6",
-"M 	c #626260",
-"N 	c #ECEBE4",
-"O 	c #EBEAE3",
-"P 	c #E9E7E0",
-"Q 	c #E8E6DF",
-"R 	c #E7E5DD",
-"S 	c #777671",
-"T 	c #93918C",
-"U 	c #BEBDB8",
-"V 	c #989793",
-"W 	c #ECEAE4",
-"X 	c #E8E6DE",
-"Y 	c #E6E4DB",
-"Z 	c #E4E3DA",
-"` 	c #75746F",
-" .	c #91908A",
-"..	c #EEECE7",
-"+.	c #62615F",
-"@.	c #EBEAE4",
-"#.	c #E7E6DE",
-"$.	c #E6E5DC",
-"%.	c #E5E4DB",
-"&.	c #E4E2DA",
-"*.	c #CCCBC4",
-"=.	c #A3A29D",
-"-.	c #B6B5B2",
-";.	c #BCBCB7",
-">.	c #CDCCC6",
-",.	c #959490",
-"'.	c #ECEBE5",
-").	c #61615E",
-"!.	c #E9E8E0",
-"~.	c #CECDC7",
-"{.	c #797875",
-"].	c #969590",
-"^.	c #CFCEC8",
-"/.	c #AEADA8",
-"(.	c #585754",
-"_.	c #7B7A76",
-"                      . . . .         ",
-"            . . . . . + @ # $ .       ",
-"  . . . . . % $ & * = - ; > , .       ",
-". ' ) ! ~ { ] ^ * / ( _ : < [ } .     ",
-". | 1 2 3 4 5 6 / # _ : 7 8 9 0 .     ",
-". a b c d e f / # _ g h i j k l .     ",
-"  . m 4 n o p q r s t u v w x y z .   ",
-"  . A * B ( ; C D E u F G H I J K .   ",
-"  . L / ( _ : M t N O l P Q R S T .   ",
-"    . # _ g U V W 0 l P X R Y Z `  .. ",
-"    . ; g ..+.@.G x y #.$.%.&.*.=.. . ",
-"    . -.t ;.F G x y #.K >.,.. . .     ",
-"      . '.).G !.Q ~.H . . .           ",
-"      . {.].^./.. . .                 ",
-"      . (._.. .                       ",
-"        . .                           "};
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm b/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm
deleted file mode 100644
index 747202b3e2..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm
+++ /dev/null
@@ -1,123 +0,0 @@
-/* XPM */
-static char * e_meeting_time_sel_no_mail_xpm[] = {
-"19 16 104 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #7B7B78",
-"@ 	c #C7C7C3",
-"# 	c #F1F0EB",
-"$ 	c #BFBFBC",
-"% 	c #5F5E5E",
-"& 	c #E3E3DF",
-"* 	c #F3F3EF",
-"= 	c #F2F2EE",
-"- 	c #F1F1EC",
-"; 	c #F0EFEB",
-"> 	c #D2D2CD",
-", 	c #969592",
-"' 	c #616060",
-") 	c #B5B5B4",
-"! 	c #F8F8F6",
-"~ 	c #F7F7F5",
-"{ 	c #F6F6F3",
-"] 	c #F5F5F2",
-"^ 	c #F4F4F0",
-"/ 	c #F2F1ED",
-"( 	c #F1F0EC",
-"_ 	c #F0EFEA",
-": 	c #EFEEE9",
-"< 	c #4F4F4D",
-"[ 	c #BDBCB8",
-"} 	c #A7A6A3",
-"| 	c #C6C6C4",
-"1 	c #7C7C7B",
-"2 	c #525251",
-"3 	c #DBDBD9",
-"4 	c #F5F4F1",
-"5 	c #F4F3F0",
-"6 	c #F3F2EE",
-"7 	c #999894",
-"8 	c #62625F",
-"9 	c #BCBCB6",
-"0 	c #EBE9E3",
-"a 	c #838381",
-"b 	c #D7D6D4",
-"c 	c #A8A8A6",
-"d 	c #515150",
-"e 	c #7E7D7C",
-"f 	c #DAD9D5",
-"g 	c #D16069",
-"h 	c #EEEDE7",
-"i 	c #4F4E4C",
-"j 	c #BCBBB6",
-"k 	c #F6F5F2",
-"l 	c #F4F3EF",
-"m 	c #B5B4B1",
-"n 	c #9B9A97",
-"o 	c #646361",
-"p 	c #92918E",
-"q 	c #9F3C44",
-"r 	c #797976",
-"s 	c #B5444E",
-"t 	c #B4B3AF",
-"u 	c #D0D0CD",
-"v 	c #F2F2ED",
-"w 	c #BFBEBA",
-"x 	c #BEBDB9",
-"y 	c #BB565F",
-"z 	c #812F36",
-"A 	c #E6E4DC",
-"B 	c #A9A9A6",
-"C 	c #626260",
-"D 	c #EDECE6",
-"E 	c #ECEBE4",
-"F 	c #BB555D",
-"G 	c #90353D",
-"H 	c #777671",
-"I 	c #93918C",
-"J 	c #EFEEE8",
-"K 	c #BEBDB8",
-"L 	c #989793",
-"M 	c #ECEAE4",
-"N 	c #E6E4DB",
-"O 	c #E4E3DA",
-"P 	c #75746F",
-"Q 	c #91908A",
-"R 	c #EEECE7",
-"S 	c #62615F",
-"T 	c #EBEAE4",
-"U 	c #EAE9E2",
-"V 	c #BD5A62",
-"W 	c #E4E2DA",
-"X 	c #CCCBC4",
-"Y 	c #A3A29D",
-"Z 	c #B6B5B2",
-"` 	c #BCBCB7",
-" .	c #979691",
-"..	c #BC5760",
-"+.	c #A13C45",
-"@.	c #ECEBE5",
-"#.	c #61615E",
-"$.	c #C0636B",
-"%.	c #A83F48",
-"&.	c #797875",
-"*.	c #969590",
-"=.	c #CFCEC8",
-"-.	c #585754",
-";.	c #7B7A76",
-"                      . . . .         ",
-"            . . . . . + @ # $ .       ",
-"  . . . . . % $ & * = - ; > , .       ",
-". ' ) ! ~ { ] ^ * / ( _ : < [ } .     ",
-". | 1 2 3 4 5 6 / # _ : 7 8 9 0 .     ",
-". a b c d e f / # g g h i j g g .     ",
-"  . k 4 l m n o p g q g r g s g t .   ",
-"  . u * v ( ; w x g s g g y z g A .   ",
-"  . B / ( _ : C D E g s F G g H I .   ",
-"    . # _ J K L M 0 g s s g N O P Q . ",
-"    . ; J R S T U g V s s g W X Y . . ",
-"    . Z D `  .U g ..G g g +.g . .     ",
-"      . @.#.U g $.G g . g %.g         ",
-"      . &.*.=.g g g .     g g         ",
-"      . -.;.. .                       ",
-"        . .                           "};
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel.c b/widgets/meeting-time-sel/e-meeting-time-sel.c
deleted file mode 100644
index 96db389e52..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel.c
+++ /dev/null
@@ -1,3302 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.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 <libgnomeui/gnome-canvas-widget.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include "e-meeting-time-sel.h"
-#include "e-meeting-time-sel-item.h"
-#include "e-meeting-time-sel-list-item.h"
-
-/* An array of hour strings, "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"
-};
-
-/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN		365
-
-/* 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
-
-
-static void e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass);
-static void e_meeting_time_selector_init (EMeetingTimeSelector * mts);
-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 gint e_meeting_time_selector_expose_title_bar (GtkWidget *darea,
-						      GdkEventExpose *event,
-						      gpointer data);
-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 (GtkWidget    *widget,
-					  GdkRectangle *area);
-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 gint e_meeting_time_selector_compare_period_starts (const void *arg1,
-							 const void *arg2);
-#if 0
-static gint e_meeting_time_selector_compare_periods (const void *arg1,
-						     const void *arg2);
-#endif
-static gint e_meeting_time_selector_compare_times (EMeetingTimeSelectorTime *time1,
-						   EMeetingTimeSelectorTime *time2);
-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,
-								    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,
-								     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 (EMeetingTimeSelectorTime *start,
-							       EMeetingTimeSelectorTime *end,
-							       gint *days,
-							       gint *hours,
-							       gint *minutes);
-static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-							   EMeetingTimeSelectorTime *start_time,
-							   EMeetingTimeSelectorTime *end_time,
-							   gint days, gint hours, gint mins);
-static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-								    EMeetingTimeSelectorTime *start_time,
-								    EMeetingTimeSelectorTime *end_time,
-								    gint days, gint hours, gint mins);
-static void e_meeting_time_selector_adjust_time (EMeetingTimeSelectorTime *mtstime,
-						 gint days, gint hours, gint minutes);
-static EMeetingTimeSelectorPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-									    EMeetingTimeSelectorAttendee *attendee,
-									    EMeetingTimeSelectorTime *start_time,
-									    EMeetingTimeSelectorTime *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,
-						   EMeetingTimeSelectorTime *mtstime);
-static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-						      EMeetingTimeSelectorTime *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_attendees_list_size_allocate (GtkWidget *widget,
-								     GtkAllocation *allocation,
-								     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 void e_meeting_time_selector_update_attendees_list_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 e_meeting_time_selector_update_attendees_list_positions (EMeetingTimeSelector *mts);
-static gboolean e_meeting_time_selector_on_text_item_event (GnomeCanvasItem *item,
-							    GdkEvent *event,
-							    EMeetingTimeSelector *mts);
-static gint e_meeting_time_selector_find_row_from_text_item (EMeetingTimeSelector *mts,
-							     GnomeCanvasItem *item);
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_meeting_time_selector_get_type (void)
-{
-	static guint e_meeting_time_selector_type = 0;
-
-	if (!e_meeting_time_selector_type) {
-		GtkTypeInfo e_meeting_time_selector_info =
-		{
-			"EMeetingTimeSelector",
-			sizeof (EMeetingTimeSelector),
-			sizeof (EMeetingTimeSelectorClass),
-			(GtkClassInitFunc) e_meeting_time_selector_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		e_meeting_time_selector_type = gtk_type_unique (GTK_TYPE_TABLE,
-								&e_meeting_time_selector_info);
-	}
-	return e_meeting_time_selector_type;
-}
-
-
-static void
-e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	parent_class = gtk_type_class (gtk_table_get_type());
-
-	object_class = (GtkObjectClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	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;
-	widget_class->draw	   = e_meeting_time_selector_draw;
-}
-
-
-static void
-e_meeting_time_selector_init (EMeetingTimeSelector * mts)
-{
-	GtkWidget *hbox, *separator, *button, *label, *table;
-	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
-	GSList *group;
-	GdkVisual *visual;
-	GdkColormap *colormap;
-	guint accel_key;
-	GtkAccelGroup *menu_accel_group;
-	time_t meeting_start_time;
-	struct tm *meeting_start_tm;
-	guchar stipple_bits[] = {
-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-	};
-
-	/* 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->attendees = g_array_new (FALSE, FALSE,
-				      sizeof (EMeetingTimeSelectorAttendee));
-
-	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 = FALSE;
-	mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	/* 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 = 30;
-	mts->col_width = 50;
-	mts->day_width = 50 * 24 + 1;
-
-	mts->auto_scroll_timeout_id = 0;
-
-
-	mts->attendees_title_bar_vbox = gtk_vbox_new (FALSE, 2);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts),
-			  mts->attendees_title_bar_vbox,
-			  0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 0);
-	gtk_widget_show (mts->attendees_title_bar_vbox);
-
-	mts->attendees_title_bar = gtk_drawing_area_new ();
-	gtk_box_pack_end (GTK_BOX (mts->attendees_title_bar_vbox),
-			  mts->attendees_title_bar, FALSE, FALSE, 0);
-	gtk_widget_show (mts->attendees_title_bar);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_title_bar),
-			    "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_title_bar), mts);
-
-	mts->attendees_list = e_canvas_new ();
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->attendees_list,
-			  0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 0);
-	gtk_widget_show (mts->attendees_list);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_list), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_list), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_attendees_list_size_allocate), mts);
-
-	/* Create the item in the list canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->attendees_list)->root),
-			       e_meeting_time_selector_list_item_get_type (),
-			       "EMeetingTimeSelectorListItem::meeting_time_selector", mts,
-			       NULL);
-
-	mts->display_top = gnome_canvas_new ();
-	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, 2, 0);
-	gtk_widget_show (mts->display_top);
-	gtk_signal_connect (GTK_OBJECT (mts->display_top), "realize",
-			    GTK_SIGNAL_FUNC (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, 2, 0);
-	gtk_widget_show (mts->display_main);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_size_allocate), mts);
-
-	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
-	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_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_TIME_SELECTOR_BUSY_TENTATIVE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Busy"), &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_BUSY]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Out of Office"), &mts->busy_colors[E_MEETING_TIME_SELECTOR_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, 0, 0);
-	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);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_Invite Others..."));
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (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, 0);
-	gtk_widget_show (mts->options_button);
-
-	gtk_signal_connect (GTK_OBJECT (mts->options_button), "clicked",
-			    GTK_SIGNAL_FUNC (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 ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Options"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	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_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	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);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->options_menu));
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (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);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_working_hours_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (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);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (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 ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Update Free/Busy"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (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);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_<<"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (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, 0);
-	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 ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Autopick"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (mts->autopick_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_button_clicked), mts);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _(">_>"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (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);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->autopick_menu));
-
-	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));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_All People and Resources"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (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));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("All _People and One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (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));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Required People"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (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));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Required People and _One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (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.5, 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);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _start time:"));
-	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->start_date_edit = gnome_date_edit_new (0, TRUE, TRUE);
-	/* I don't like the 'Calendar' label. */
-	gtk_widget_hide (GNOME_DATE_EDIT (mts->start_date_edit)->cal_label);
-	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);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "date_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "time_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->start_date_edit)->date_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->start_date_edit)->time_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_widget_add_accelerator (GNOME_DATE_EDIT (mts->start_date_edit)->date_entry,
-				    "grab_focus", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _end time:"));
-	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);
-
-	mts->end_date_edit = gnome_date_edit_new (0, TRUE, TRUE);
-	gtk_widget_hide (GNOME_DATE_EDIT (mts->end_date_edit)->cal_label);
-	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);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "date_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "time_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->end_date_edit)->date_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->end_date_edit)->time_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_widget_add_accelerator (GNOME_DATE_EDIT (mts->end_date_edit)->date_entry,
-				    "grab_focus", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	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));
-	mts->color_context = gdk_color_context_new (visual, colormap);
-	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_TIME_SELECTOR_BUSY_TENTATIVE]);
-	e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_BUSY]);
-	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &mts->busy_colors[E_MEETING_TIME_SELECTOR_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 in the main canvas, so we can
-	   scroll the other 2 canvases. */
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->hadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_hadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "changed", GTK_SIGNAL_FUNC (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);
-}
-
-
-/* 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, 0);
-	gtk_widget_show (label);
-
-	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_key_color),
-			    color);
-}
-
-
-static gint
-e_meeting_time_selector_expose_title_bar (GtkWidget *widget,
-					  GdkEventExpose *event,
-					  gpointer data)
-{
-	EMeetingTimeSelector * mts;
-	GdkFont *font;
-
-	mts = E_MEETING_TIME_SELECTOR (data);
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_OUT, 0, 0,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 1,
-			 widget->allocation.height);
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_OUT,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 1, 0,
-			 widget->allocation.width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - 1,
-			 widget->allocation.height);
-
-	font = widget->style->font;
-	gdk_draw_string (widget->window, font,
-			 widget->style->fg_gc[GTK_STATE_NORMAL],
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 4,
-			 4 + font->ascent, _("All Attendees"));
-
-	return FALSE;
-}
-
-
-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)
-{
-	int failed;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	gdk_color_parse (name, c);
-	c->pixel = 0;
-	c->pixel = gdk_color_context_get_pixel (mts->color_context,
-						c->red, c->green, c->blue,
-						&failed);
-	if (failed)
-		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 (void)
-{
-	GtkWidget *mts;
-
-	mts = GTK_WIDGET (gtk_type_new (e_meeting_time_selector_get_type ()));
-
-	return mts;
-}
-
-
-static void
-e_meeting_time_selector_destroy (GtkObject *object)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	mts = E_MEETING_TIME_SELECTOR (object);
-
-	e_meeting_time_selector_remove_timeout (mts);
-
-	gdk_color_context_free (mts->color_context);
-	gdk_bitmap_unref (mts->stipple);
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		g_free (attendee->name);
-		g_array_free (attendee->busy_periods, TRUE);
-	}
-
-	g_array_free (mts->attendees, TRUE);
-		
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_realize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (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 (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_meeting_time_selector_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorTime saved_time;
-	GdkFont *font;
-	gint hour, max_hour_width;
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-	font = widget->style->font;
-
-	/* Calculate the widths of the hour strings in the style's font. */
-	max_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		mts->hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours[hour]);
-		max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
-	}
-
-	mts->row_height = font->ascent + font->descent
-		+ E_MEETING_TIME_SELECTOR_TEXT_Y_PAD * 2 + 1;
-	mts->col_width = max_hour_width + 4;
-
-	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);
-	gtk_widget_set_usize (mts->attendees_title_bar, -1, mts->row_height);
-
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-}
-
-
-/* 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 (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_meeting_time_selector_draw (GtkWidget    *widget,
-			      GdkRectangle *area)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-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 attendees title bar and list. */
-	x = mts->attendees_title_bar->allocation.x - 2;
-	y = mts->attendees_title_bar->allocation.y - 2;
-	w = mts->attendees_title_bar->allocation.width + 4;
-	h = mts->attendees_title_bar->allocation.height + mts->attendees_list->allocation.height + 4;
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, x, y, w, h);
-
-	/* 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_LAYOUT (mts->attendees_list)->vadjustment;
-	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 GnomeDateEdit widgets. */
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	return TRUE;
-}
-
-
-void
-e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						gboolean working_hours_only)
-{
-	EMeetingTimeSelectorTime 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)
-{
-	EMeetingTimeSelectorTime 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;
-	mts->day_end_hour = day_end_hour;
-	mts->day_end_minute = day_end_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)
-{
-	EMeetingTimeSelectorTime 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);
-}
-
-
-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;
-	}
-}
-
-
-/* Adds an attendee to the list, returning the row. The data is meant for
-   something like an address book id, though if the user edits the name this
-   will become invalid. We'll probably have to handle address book lookup
-   ourself. */
-gint
-e_meeting_time_selector_attendee_add (EMeetingTimeSelector *mts,
-				      gchar *attendee_name,
-				      gpointer data)
-{
-	EMeetingTimeSelectorAttendee attendee;
-	gint list_width, item_width;
-	GdkFont *font;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (attendee_name != NULL, -1);
-
-	attendee.name = g_strdup (attendee_name);
-	attendee.type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-	attendee.has_calendar_info = FALSE;
-	attendee.send_meeting_to = TRUE;
-	g_date_clear (&attendee.busy_periods_start.date, 1);
-	attendee.busy_periods_start.hour = 0;
-	attendee.busy_periods_start.minute = 0;
-	g_date_clear (&attendee.busy_periods_end.date, 1);
-	attendee.busy_periods_end.hour = 0;
-	attendee.busy_periods_end.minute = 0;
-	attendee.busy_periods = g_array_new (FALSE, FALSE,
-					     sizeof (EMeetingTimeSelectorPeriod));
-	attendee.busy_periods_sorted = TRUE;
-	attendee.longest_period_in_days = 0;
-	attendee.data = data;
-
-	/* Add to the list on the left. */
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	item_width = MAX (1, list_width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_TEXT_X_PAD * 2);
-	font = GTK_WIDGET (mts)->style->font;
-	attendee.text_item = gnome_canvas_item_new
-		(GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->attendees_list)->root),
-		 e_text_get_type (),
-		 "font_gdk", font,
-		 "anchor", GTK_ANCHOR_NW,
-		 "clip", TRUE,
-		 "max_lines", 1,
-		 "editable", TRUE,
-		 "text", attendee_name ? attendee_name : "",
-		 "clip_width", (gdouble) item_width,
-		 "clip_height", (gdouble) font->ascent + font->descent,
-		 "draw_background", FALSE,
-		 NULL);
-	
-	e_canvas_item_move_absolute(attendee.text_item,
-				    E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-				    + E_MEETING_TIME_SELECTOR_TEXT_X_PAD,
-				    mts->attendees->len * mts->row_height + 1
-				    + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD);
-#if 0
-	gnome_canvas_item_hide (attendee.text_item);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (attendee.text_item), "event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_text_item_event),
-			    mts);
-	
-	g_array_append_val (mts->attendees, attendee);
-
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw the canvases. */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-
-	return mts->attendees->len - 1;
-}
-
-
-gint
-e_meeting_time_selector_attendee_find_by_name (EMeetingTimeSelector *mts,
-					       gchar *attendee_name,
-					       gint start_row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (start_row >= 0, -1);
-	g_return_val_if_fail (start_row < mts->attendees->len, -1);
-
-	for (row = start_row; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (!strcmp (attendee->name, attendee_name))
-			return row;
-	}
-
-	return -1;
-}
-
-
-gint
-e_meeting_time_selector_attendee_find_by_data (EMeetingTimeSelector *mts,
-					       gpointer data,
-					       gint start_row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (start_row >= 0, -1);
-	g_return_val_if_fail (start_row < mts->attendees->len, -1);
-
-	for (row = start_row; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (attendee->data == data)
-			return row;
-	}
-
-	return -1;
-}
-
-
-void
-e_meeting_time_selector_attendee_remove (EMeetingTimeSelector *mts,
-					 gint row)
-{
-	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);
-
-	g_free (attendee->name);
-	g_array_free (attendee->busy_periods, TRUE);
-
-	/* Destroy the GtkEntry in the list. */
-	gtk_object_destroy (GTK_OBJECT (attendee->text_item));
-
-	g_array_remove_index (mts->attendees, row);
-
-	/* Update the positions of all the other GtkEntry widgets. */
-	e_meeting_time_selector_update_attendees_list_positions (mts);
-
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-void
-e_meeting_time_selector_attendee_set_type (EMeetingTimeSelector *mts,
-					   gint row,
-					   EMeetingTimeSelectorAttendeeType type)
-{
-	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->type = type;
-}
-
-
-void
-e_meeting_time_selector_attendee_set_has_calendar_info (EMeetingTimeSelector *mts,
-							gint row,
-							gboolean has_calendar_info)
-{
-	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->has_calendar_info = has_calendar_info;
-}
-
-
-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;
-}
-
-
-gboolean
-e_meeting_time_selector_attendee_set_busy_range	(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)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-	g_return_val_if_fail (row >= 0, FALSE);
-	g_return_val_if_fail (row < mts->attendees->len, FALSE);
-
-	/* 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;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	g_date_clear (&attendee->busy_periods_start.date, 1);
-	g_date_clear (&attendee->busy_periods_end.date, 1);
-	g_date_set_dmy (&attendee->busy_periods_start.date,
-			start_day, start_month, start_year);
-	g_date_set_dmy (&attendee->busy_periods_end.date,
-			end_day, end_month, end_year);
-	attendee->busy_periods_start.hour = start_hour;
-	attendee->busy_periods_start.minute = start_minute;
-	attendee->busy_periods_end.hour = end_hour;
-	attendee->busy_periods_end.minute = end_minute;
-
-	return TRUE;
-}
-
-
-/* Clears all busy times for the given attendee. */
-void
-e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,
-						     gint row)
-{
-	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);
-
-	g_array_set_size (attendee->busy_periods, 0);
-	attendee->busy_periods_sorted = TRUE;
-	attendee->longest_period_in_days = 0;
-}
-
-
-/* Adds one busy time for the given attendee. It returns FALSE if the date
-   or time is invalid. Months and days count from 1. */
-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,
-						  EMeetingTimeSelectorBusyType busy_type)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod period;
-	gint period_in_days;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-	g_return_val_if_fail (row >= 0, FALSE);
-	g_return_val_if_fail (row < mts->attendees->len, FALSE);
-	g_return_val_if_fail (busy_type >= 0, FALSE);
-	g_return_val_if_fail (busy_type < E_MEETING_TIME_SELECTOR_BUSY_LAST, FALSE);
-
-	/* 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 (e_meeting_time_selector_compare_times (&period.start, &period.end) > 0)
-		return FALSE;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	g_array_append_val (attendee->busy_periods, period);
-	attendee->has_calendar_info = TRUE;
-	attendee->busy_periods_sorted = FALSE;
-
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
-	attendee->longest_period_in_days = MAX (attendee->longest_period_in_days, period_in_days);
-
-	return TRUE;
-}
-
-
-void
-e_meeting_time_selector_attendee_ensure_periods_sorted (EMeetingTimeSelector *mts,
-							EMeetingTimeSelectorAttendee *attendee)
-{
-	if (attendee->busy_periods_sorted)
-		return;
-
-	qsort (attendee->busy_periods->data, attendee->busy_periods->len,
-	       sizeof (EMeetingTimeSelectorPeriod),
-	       e_meeting_time_selector_compare_period_starts);
-	attendee->busy_periods_sorted = TRUE;
-}
-
-
-/* This compares two time periods, using their end times. */
-static gint
-e_meeting_time_selector_compare_period_starts (const void *arg1,
-					       const void *arg2)
-{
-	EMeetingTimeSelectorPeriod *period1, *period2;
-
-	period1 = (EMeetingTimeSelectorPeriod *) arg1;
-	period2 = (EMeetingTimeSelectorPeriod *) arg2;
-
-	return e_meeting_time_selector_compare_times (&period1->start,
-						    &period2->start);
-}
-
-
-/* This compares two time periods, using start and end times, mainly to see if
-   they overlap at all. If they overlap it returns 0. Or -1 if arg1 < arg2.
-   Or 1 if arg1 > arg2. */
-/* Currently unused. */
-#if 0
-static gint
-e_meeting_time_selector_compare_periods (const void *arg1,
-					 const void *arg2)
-{
-	EMeetingTimeSelectorPeriod *period1, *period2;
-
-	period1 = (EMeetingTimeSelectorPeriod *) arg1;
-	period2 = (EMeetingTimeSelectorPeriod *) arg2;
-
-	/* If period 2 starts after period 1 ends, return 1. */
-	if (e_meeting_time_selector_compare_times (&period2->start, &period1->end) >= 0)
-		return 1;
-
-	/* If period 1 starts after period 2 ends, return -1. */
-	if (e_meeting_time_selector_compare_times (&period1->start, &period2->end) >= 0)
-		return -1;
-
-	/* They must overlap so return 0. */
-	return 0;
-}
-#endif
-
-
-static gint
-e_meeting_time_selector_compare_times (EMeetingTimeSelectorTime *time1,
-				       EMeetingTimeSelectorTime *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;
-}
-
-
-/*
- * 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 EMeetingTimeSelectorTime in a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_time (EMeetingTimeSelectorTime *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)
-{
-
-
-}
-
-
-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,
-							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);
-	*y += mts->options_button->allocation.height;
-
-	/* 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));
-}
-
-
-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,
-							 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);
-	*y += mts->autopick_button->allocation.height;
-
-	/* 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)
-{
-	EMeetingTimeSelectorTime start_time, end_time, *resource_free;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *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 < mts->attendees->len; row++) {
-			attendee = &g_array_index (mts->attendees,
-						   EMeetingTimeSelectorAttendee,
-						   row);
-
-			/* Skip optional people if they don't matter. */
-			if (skip_optional && attendee->type == E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON)
-				continue;
-
-			period = e_meeting_time_selector_find_time_clash (mts, attendee, &start_time, &end_time);
-
-			if (need_one_resource && attendee->type == E_MEETING_TIME_SELECTOR_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_selector_compare_times (resource_free, &period->end) > 0)
-							resource_free = &period->end;
-					} else {
-						if (!resource_free || e_meeting_time_selector_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 GnomeDateEdit widgets. */
-			e_meeting_time_selector_update_start_date_edit (mts);
-			e_meeting_time_selector_update_end_date_edit (mts);
-			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 (EMeetingTimeSelectorTime *start,
-						   EMeetingTimeSelectorTime *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,
-					       EMeetingTimeSelectorTime *start_time,
-					       EMeetingTimeSelectorTime *end_time,
-					       gint days, gint hours, gint mins)
-{
-	gint minutes_shown;
-	gboolean set_to_start_of_working_day = FALSE;
-
-	if (mts->zoomed_out) {
-		start_time->hour++;
-		start_time->minute = 0;
-	} else {
-		start_time->minute += 30;
-		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);
-
-	/* 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,
-							EMeetingTimeSelectorTime *start_time,
-							EMeetingTimeSelectorTime *end_time,
-							gint days, gint hours, gint mins)
-{
-	gint new_hour, minutes_shown;
-	gboolean set_to_end_of_working_day = FALSE;
-
-	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;
-
-	*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 (EMeetingTimeSelectorTime *mtstime,
-				     gint days, gint hours, gint minutes)
-{
-	gint new_hours, new_minutes;
-
-	/* We have to handle negative values for hous and minutes here, since
-	   EMeetingTimeSelectorTime uses 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 EMeetingTimeSelectorPeriod*
-e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-					 EMeetingTimeSelectorAttendee *attendee,
-					 EMeetingTimeSelectorTime *start_time,
-					 EMeetingTimeSelectorTime *end_time)
-{
-	EMeetingTimeSelectorPeriod *period;
-	gint period_num;
-
-	period_num = e_meeting_time_selector_find_first_busy_period (mts, 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 < attendee->busy_periods->len) {
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod,
-					 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_selector_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_selector_compare_times (&period->end,
-							 start_time) > 0) {
-			return period;
-		}
-
-		period_num++;
-	}
-
-	return NULL;
-}
-
-
-/* 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. */
-gint
-e_meeting_time_selector_find_first_busy_period (EMeetingTimeSelector *mts,
-						EMeetingTimeSelectorAttendee *attendee,
-						GDate *date)
-{
-	EMeetingTimeSelectorPeriod *period;
-	gint lower, upper, middle = 0, cmp = 0;
-	GDate tmp_date;
-
-	/* Make sure the busy periods have been sorted. */
-	e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);
-
-	/* 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, attendee->longest_period_in_days);
-
-	/* We want the first busy period which starts on tmp_date. */
-	lower = 0;
-	upper = attendee->busy_periods->len;
-
-	if (upper == 0)
-		return -1;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod, 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 (attendee->busy_periods,
-						 EMeetingTimeSelectorPeriod, 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 (attendee->busy_periods->len <= middle)
-			return -1;
-	}
-
-	return middle;
-}
-
-
-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);
-}
-
-
-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);
-}
-
-
-/* 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,
-				       EMeetingTimeSelectorTime *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,
-					  EMeetingTimeSelectorTime *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];
-	GdkFont *font;
-
-	font = GTK_WIDGET (mts)->style->font;
-
-	/* 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);
-		width = gdk_string_width (font, buffer);
-		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);
-		width = gdk_string_width (font, buffer);
-		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);
-
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-	
-	if (gdk_string_width (font, buffer) < 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);
-		width = gdk_string_width (font, buffer);
-		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);
-
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-	
-	if (gdk_string_width (font, buffer) < max_date_width)
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY;
-	else
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT;
-}
-
-
-/* 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;
-	EMeetingTimeSelectorTime mtstime;
-	time_t newtime;
-	struct tm *newtime_tm;
-
-	newtime = gnome_date_edit_get_date (GNOME_DATE_EDIT (mts->start_date_edit));
-	newtime_tm = localtime (&newtime);
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	mtstime.hour = newtime_tm->tm_hour;
-	mtstime.minute = newtime_tm->tm_min;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_selector_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);
-}
-
-
-/* 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)
-{
-	EMeetingTimeSelectorTime mtstime;
-	time_t newtime;
-	struct tm *newtime_tm;
-
-	newtime = gnome_date_edit_get_date (GNOME_DATE_EDIT (mts->end_date_edit));
-	newtime_tm = localtime (&newtime);
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	mtstime.hour = newtime_tm->tm_hour;
-	mtstime.minute = newtime_tm->tm_min;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_selector_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_selector_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;
-		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);
-}
-
-
-/* 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)
-{
-	GnomeDateEdit *start_edit, *end_edit;
-	gint low_hour, high_hour;
-
-	start_edit = GNOME_DATE_EDIT (mts->start_date_edit);
-	end_edit = GNOME_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;
-	}
-
-	gnome_date_edit_set_popup_range (start_edit, low_hour, high_hour);
-	gnome_date_edit_set_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);
-}
-
-
-static void
-e_meeting_time_selector_on_attendees_list_size_allocate (GtkWidget *widget,
-							 GtkAllocation *allocation,
-							 EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_attendees_list_positions (mts);
-}
-
-
-/* This updates the list canvas scroll region 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_attendees_list_scroll_region (EMeetingTimeSelector *mts)
-{
-	gint height, canvas_width, canvas_height;
-
-	height = mts->row_height * mts->attendees->len;
-	canvas_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	canvas_height = GTK_WIDGET (mts->attendees_list)->allocation.height;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->attendees_list),
-					0, 0,
-					canvas_width,
-					height);
-}
-
-
-/* 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, list_width;
-
-	height = mts->row_height * (mts->attendees->len + 1);
-	canvas_height = GTK_WIDGET (mts->display_main)->allocation.height;
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->attendees_list),
-					0, 0,
-					list_width,
-					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)
-{
-	EMeetingTimeSelectorTime 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->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;
-	}
-	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->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;
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Now make sure we are between first_time & last_time. */
-	if (e_meeting_time_selector_compare_times (&drag_time, &first_time) < 0)
-		drag_time = first_time;
-	if (e_meeting_time_selector_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_selector_compare_times (time_to_set, &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_selector_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);
-}
-
-
-/* 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;
-	EMeetingTimeSelectorTime 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->zoomed_out) {
-			drag_time.minute = 0;
-		} else {
-			drag_time.minute -= drag_time.minute % 30;
-		}
-	} else {
-		e_meeting_time_selector_calculate_time (mts, scroll_x,
-							&drag_time);
-		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;
-		}
-	}
-	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_selector_compare_times (time_to_set, &drag_time) == 0) {
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_selector_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);
-
-	/* 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)
-{
-	struct tm start_tm;
-	time_t start_time_t;
-
-	g_date_to_struct_tm (&mts->meeting_start_time.date, &start_tm);
-	start_tm.tm_hour = mts->meeting_start_time.hour;
-	start_tm.tm_min = mts->meeting_start_time.minute;
-	start_time_t = mktime (&start_tm);
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (mts->start_date_edit),
-				  start_time_t);
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting end time. */
-static void
-e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
-{
-	struct tm end_tm;
-	time_t end_time_t;
-
-	g_date_to_struct_tm (&mts->meeting_end_time.date, &end_tm);
-	end_tm.tm_hour = mts->meeting_end_time.hour;
-	end_tm.tm_min = mts->meeting_end_time.minute;
-	end_time_t = mktime (&end_tm);
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (mts->end_date_edit),
-				  end_time_t);
-}
-
-
-/* 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, 60);
-
-	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 (EMeetingTimeSelectorTime *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);
-	}
-}
-
-
-static void
-e_meeting_time_selector_update_attendees_list_positions (EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint list_width, item_width;
-	gint row;
-	GdkFont *font;
-
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	item_width = MAX (1, list_width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_TEXT_X_PAD * 2);
-	font = GTK_WIDGET (mts)->style->font;
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		gnome_canvas_item_set
-			(attendee->text_item,
-			 "font_gdk", font,
-			 "clip_width", (gdouble) item_width,
-			 "clip_height", (gdouble) (font->ascent
-						   + font->descent),
-			 NULL);
-
-		e_canvas_item_move_absolute (attendee->text_item,
-					     E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-					     + E_MEETING_TIME_SELECTOR_TEXT_X_PAD,
-					     row * mts->row_height + 1 + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD);
-
-		gnome_canvas_item_show (attendee->text_item);
-	}
-}
-
-
-/*
- * 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,
-					EMeetingTimeSelectorTime *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 EMeetingTimeSelectorTime 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,
-						 EMeetingTimeSelectorTime *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 gboolean
-e_meeting_time_selector_on_text_item_event (GnomeCanvasItem *item,
-					    GdkEvent *event,
-					    EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row, min;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-	GtkAdjustment *adj;
-	gchar *text;
-	gboolean empty = FALSE;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			row = e_meeting_time_selector_find_row_from_text_item (mts, item);
-			g_return_val_if_fail (row != -1, FALSE);
-
-			if (row == mts->attendees->len - 1)
-				row = e_meeting_time_selector_attendee_add (mts, "", NULL);
-			else
-				row++;
-
-			/* Make sure the item is visible. */
-			adj = GTK_LAYOUT (mts->display_main)->vadjustment;
-			min = ((row + 1) * mts->row_height) - adj->page_size;
-			if (adj->value < min) {
-				adj->value = min;
-				gtk_adjustment_value_changed (adj);
-			}
-
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			e_canvas_item_grab_focus (attendee->text_item);
-
-			/* Try to move the cursor to the end of the text. */
-			gtk_object_get (GTK_OBJECT (attendee->text_item),
-					"event_processor", &event_processor,
-					NULL);
-			if (event_processor) {
-				command.action = E_TEP_MOVE;
-				command.position = E_TEP_END_OF_BUFFER;
-				gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-							 "command", &command);
-			}
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (!event->focus_change.in) {
-			gtk_object_get (GTK_OBJECT (item),
-					"text", &text,
-					NULL);
-			if (!text || !text[0])
-				empty = TRUE;
-			g_free (text);
-
-			if (empty) {
-				row = e_meeting_time_selector_find_row_from_text_item (mts, item);
-				g_return_val_if_fail (row != -1, FALSE);
-				e_meeting_time_selector_attendee_remove (mts,
-									 row);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-e_meeting_time_selector_find_row_from_text_item (EMeetingTimeSelector *mts,
-						 GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (attendee->text_item == item)
-			return row;
-	}
-
-	return -1;
-}
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel.h b/widgets/meeting-time-sel/e-meeting-time-sel.h
deleted file mode 100644
index 70a888b7a1..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel.h
+++ /dev/null
@@ -1,518 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_MEETING_TIME_SELECTOR_H_
-#define _E_MEETING_TIME_SELECTOR_H_
-
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-text/e-text.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * 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
-
-/* 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_TIME_SELECTOR_REQUIRED_PERSON. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_REQUIRED_PERSON,
-	E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON,
-	E_MEETING_TIME_SELECTOR_RESOURCE
-} EMeetingTimeSelectorAttendeeType;
-
-
-/* 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_TIME_SELECTOR_BUSY_TENTATIVE		= 0,
-	E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE	= 1,
-	E_MEETING_TIME_SELECTOR_BUSY_BUSY		= 2,
-
-	E_MEETING_TIME_SELECTOR_BUSY_LAST		= 3
-} EMeetingTimeSelectorBusyType;
-
-
-/* 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;
-
-
-/* This is our representation of a time. We use a GDate to store the day,
-   and guint8s for the hours and minutes. */
-typedef struct _EMeetingTimeSelectorTime       EMeetingTimeSelectorTime;
-struct _EMeetingTimeSelectorTime
-{
-	GDate	date;
-	guint8	hour;
-	guint8	minute;
-};
-
-
-/* This represents a busy period. */
-typedef struct _EMeetingTimeSelectorPeriod     EMeetingTimeSelectorPeriod;
-struct _EMeetingTimeSelectorPeriod
-{
-	EMeetingTimeSelectorTime start;
-	EMeetingTimeSelectorTime end;
-	EMeetingTimeSelectorBusyType busy_type;
-};
-
-
-/* This contains information on one attendee. */
-typedef struct _EMeetingTimeSelectorAttendee   EMeetingTimeSelectorAttendee;
-struct _EMeetingTimeSelectorAttendee
-{
-	gchar *name;
-
-	/* The type of attendee, e.g. a person or a resource. */
-	EMeetingTimeSelectorAttendeeType type;
-
-	/* This is TRUE if the attendee has calendar information available.
-	   It is set to TRUE when a busy period is added, but can also be set
-	   to TRUE explicitly to indicate that the attendee has calendar
-	   information available, but no current busy periods. If it is FALSE
-	   then a diagonal stipple pattern is used to fill the entire row in
-	   the main graphical display. */
-	gboolean has_calendar_info;
-
-	/* This is TRUE if the meeting request is sent to this attendee. */
-	gboolean send_meeting_to;
-
-	/* This is the period for which free/busy data for the attendee is
-	   available. */
-	EMeetingTimeSelectorTime busy_periods_start;
-	EMeetingTimeSelectorTime busy_periods_end;
-
-	/* This is an array of EMeetingTimeSelectorPeriod elements. When it is
-	   updated busy_periods_sorted is set to FALSE, and if a function
-	   needs them sorted, it should call this to re-sort them if needed:
-	   e_meeting_time_selector_attendee_ensure_periods_sorted(). Note that
-	   they are sorted by the start times. */
-	GArray	*busy_periods;
-	gboolean busy_periods_sorted;
-
-	/* This holds the length of the longest busy period in days, rounded
-	   up. It is used to determine where to start looking in the
-	   busy_periods array. If we didn't use this we'd have to go through
-	   most of the busy_periods array every time we wanted to paint part
-	   of the display. */
-	gint longest_period_in_days;
-
-	/* This is the canvas text item where the name is edited. */
-	GnomeCanvasItem *text_item;
-
-	/* This is supposed to be something like an address book id. */
-	gpointer data;
-};
-
-/* An array of hour strings, "0:00" .. "23:00". */
-extern const gchar *EMeetingTimeSelectorHours[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_title_bar_vbox;
-
-	/* The 'All Attendees' title bar above the list of attendees. */
-	GtkWidget *attendees_title_bar;
-
-	/* The list of attendees. */
-	GtkWidget *attendees_list;
-
-	/* 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;
-
-	/* This is the 'Options' button & menu. */
-	GtkWidget *options_button;
-	GtkWidget *options_menu;
-
-	/* This is the 'Autopick' button, menu & radio menu items. */
-	GtkWidget *autopick_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 GnomeDateEdit widgets for the meeting start & end times. */
-	GtkWidget *start_date_edit;
-	GtkWidget *end_date_edit;
-
-	/* Colors. */
-	GdkColorContext *color_context;
-	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_TIME_SELECTOR_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;
-
-
-	/*
-	 * Attendee Data.
-	 */
-
-	/* This is an array of EMeetingTimeSelectorAttendee elements. */
-	GArray *attendees;
-
-
-	/*
-	 * Option Settings.
-	 */
-
-	/* 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. */
-	EMeetingTimeSelectorTime meeting_start_time;
-	EMeetingTimeSelectorTime 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;
-};
-
-
-struct _EMeetingTimeSelectorClass
-{
-	GtkTableClass parent_class;
-};
-
-
-/*
- * 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 (void);
-
-/* 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_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);
-
-/* Adds an attendee to the list, returning the row. The data is meant for
-   something like an address book id, though if the user edits the name this
-   will become invalid. We'll probably have to handle address book lookup
-   ourself. */
-gint e_meeting_time_selector_attendee_add (EMeetingTimeSelector *mts,
-					   gchar *attendee_name,
-					   gpointer data);
-gint e_meeting_time_selector_attendee_find_by_name (EMeetingTimeSelector *mts,
-						    gchar *attendee_name,
-						    gint start_row);
-gint e_meeting_time_selector_attendee_find_by_data (EMeetingTimeSelector *mts,
-						    gpointer data,
-						    gint start_row);
-void e_meeting_time_selector_attendee_remove (EMeetingTimeSelector *mts,
-					      gint row);
-
-void e_meeting_time_selector_attendee_set_type (EMeetingTimeSelector *mts,
-						gint row,
-						EMeetingTimeSelectorAttendeeType type);
-void e_meeting_time_selector_attendee_set_has_calendar_info (EMeetingTimeSelector *mts,
-							     gint row,
-							     gboolean has_calendar_info);
-void e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-							   gint row,
-							   gboolean send_meeting_to);
-
-gboolean e_meeting_time_selector_attendee_set_busy_range	(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);
-
-
-/* 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,
-							   EMeetingTimeSelectorBusyType 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 (EMeetingTimeSelectorTime *mtstime);
-
-gint e_meeting_time_selector_find_first_busy_period (EMeetingTimeSelector *mts,
-						     EMeetingTimeSelectorAttendee *attendee,
-						     GDate *date);
-
-/* Makes sure the busy periods are sorted, so we can do binary searches. */
-void e_meeting_time_selector_attendee_ensure_periods_sorted (EMeetingTimeSelector *mts,
-							     EMeetingTimeSelectorAttendee *attendee);
-
-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,
-					     EMeetingTimeSelectorTime *time);
-gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						      EMeetingTimeSelectorTime *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 (EMeetingTimeSelectorTime *mtstime);
-gchar* e_meeting_time_selector_dump_date (GDate *date);
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_TIME_SELECTOR_H_ */
diff --git a/widgets/meeting-time-sel/test-meeting-time-sel.c b/widgets/meeting-time-sel/test-meeting-time-sel.c
deleted file mode 100644
index 33c15ff19b..0000000000
--- a/widgets/meeting-time-sel/test-meeting-time-sel.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-meeting-time-sel.h"
-
-void add_random_attendee_test_data (EMeetingTimeSelector *mts);
-void add_simple_attendee_test_data (EMeetingTimeSelector *mts);
-gint get_random_int (gint max);
-
-int
-main (int argc, char *argv[])
-{
-	GtkWidget *window, *mts;
-	gint i;
-
-	gnome_init ("test-meeting-time-selector", "0.1", argc, argv);
-
-	gtk_widget_push_visual (gdk_imlib_get_visual ());
-	gtk_widget_push_colormap (gdk_imlib_get_colormap ());
-
-	window = gnome_dialog_new ("Plan a Meeting", "Make Meeting",
-				   GNOME_STOCK_BUTTON_CLOSE, NULL);
-	gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-
-	mts = e_meeting_time_selector_new ();
-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (window)->vbox), mts);
-	gtk_window_add_accel_group (GTK_WINDOW (window),
-				    E_MEETING_TIME_SELECTOR (mts)->accel_group);
-	gtk_widget_show (mts);
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	i = 0;
-#if 1
-	for (i = 0; i < 20; i++) {
-		add_random_attendee_test_data (E_MEETING_TIME_SELECTOR (mts));
-	}
-
-	if (!e_meeting_time_selector_attendee_set_busy_range (E_MEETING_TIME_SELECTOR (mts), 3,
-							      2000, 5, 1, 14, 0,
-							      2000, 11, 1, 11, 30))
-		g_print ("Error setting busy range\n");
-
-#else
-	for (i = 0; i < 1; i++) {
-		add_simple_attendee_test_data (E_MEETING_TIME_SELECTOR (mts));
-	}
-#endif
-
-#if 0
-	e_meeting_time_selector_dump (E_MEETING_TIME_SELECTOR (mts));
-#endif
-
-	gnome_dialog_run (GNOME_DIALOG (window));
-
-	gtk_main ();
-	return 0;
-}
-
-
-/* Adds an attendee and a lot of random busy periods. The periods start 60
-   days before the current date and extend over 365 days, to match the range
-   that EMeetingTimeSelector currently displays. We generate a time_t and an
-   interval and then convert them into a struct tm which provides everything
-   we need. */
-void
-add_random_attendee_test_data (EMeetingTimeSelector *mts)
-{
-	gchar buffer[128], *name;
-	gint row, num_periods, busy_period, random_num, duration;
-	EMeetingTimeSelectorAttendeeType type;
-	EMeetingTimeSelectorBusyType busy_type;
-	time_t range_start;
-	time_t period_start;
-	time_t period_end;
-	struct tm *tmp_tm;
-	struct tm tm1;
-	struct tm tm2;
-
-	/* Determine the type of attendee. */
-	random_num = get_random_int (10);
-	if (random_num < 4) {
-		type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-		name = "Req. Attendee";
-	} else if (random_num < 7) {
-		type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;
-		name = "Opt. Attendee";
-	} else {
-		type = E_MEETING_TIME_SELECTOR_RESOURCE;
-		name = "Resource";
-	}
-
-	sprintf (buffer, "%s %i", name, mts->attendees->len + 1);
-	row = e_meeting_time_selector_attendee_add (mts, buffer, NULL);
-	e_meeting_time_selector_attendee_set_type (mts, row, type);
-
-	/* Don't send the meeting request to some attendees. */
-	if (get_random_int (10) <= 2)
-		e_meeting_time_selector_attendee_set_send_meeting_to (mts, row,
-								      FALSE);
-
-	/* Some attendees have no calendar information. */
-	if (get_random_int (10) == 2)
-		return;
-
-	range_start = time (NULL) - 61 * 24 * 60 * 60;
-	num_periods = get_random_int (1000);
-#if 0
-	g_print ("num_periods: %i\n", num_periods);
-#endif
-	for (busy_period = 0; busy_period < num_periods; busy_period++) {
-
-		period_start = range_start + get_random_int (365 * 24 * 60 * 60);
-
-		/* Make busy periods mainly 30 mins to a few hours, with a
-		   couple of week/fortnight periods as well. */
-		random_num = get_random_int (10000);
-		if (random_num < 2000)
-			duration = 30;
-		else if (random_num < 5000)
-			duration = 60;
-		else if (random_num < 7500)
-			duration = 90;
-		else if (random_num < 9995)
-			duration = 120;
-		else if (random_num < 9998)
-			duration = 60 * 24 * 7;
-		else
-			duration = 60 * 24 * 14;
-#if 0
-		g_print ("random_num: %i, duration: %i\n",
-			 random_num, duration);
-#endif
-		period_end = period_start + duration * 60;
-
-		tmp_tm = localtime (&period_start);
-		tm1 = *tmp_tm;
-		tmp_tm = localtime (&period_end);
-		tm2 = *tmp_tm;
-
-		/* A hack to avoid daylight-saving time problems. */
-		if (tm2.tm_hour == tm1.tm_hour && tm2.tm_min < tm1.tm_min)
-			tm2.tm_hour++;
-
-		busy_type = get_random_int (E_MEETING_TIME_SELECTOR_BUSY_LAST);
-
-		if (!e_meeting_time_selector_attendee_add_busy_period (mts, row, tm1.tm_year + 1900, tm1.tm_mon + 1, tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm2.tm_year + 1900, tm2.tm_mon + 1, tm2.tm_mday, tm2.tm_hour, tm2.tm_min, busy_type))
-			{
-				g_print ("Invalid busy period %i/%i/%i %i:%i to %i/%i/%i %i:%i\n", tm1.tm_year + 1900, tm1.tm_mon + 1, tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm2.tm_year + 1900, tm2.tm_mon + 1, tm2.tm_mday, tm2.tm_hour, tm2.tm_min);
-				g_print ("random_num: %i, duration: %i\n",
-					 random_num, duration);
-			}
-	}
-}
-
-
-/* Returns a random integer between 0 and max - 1. */
-gint
-get_random_int (gint max)
-{
-	gint random_num;
-
-	random_num = (int) (max * (rand () / (RAND_MAX + 1.0)));
-#if 0
-	g_print ("Random num (%i): %i\n", max, random_num);
-#endif
-	return random_num;
-}
-
-
-void
-add_simple_attendee_test_data (EMeetingTimeSelector *mts)
-{
-	gint row;
-
-	row = e_meeting_time_selector_attendee_add (mts, "John Smith", NULL);
-	if (!e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							       1999, 11, 7, 14, 30,
-							       1999, 11, 7, 16, 30,
-							       E_MEETING_TIME_SELECTOR_BUSY_BUSY))
-			g_warning ("Invalid busy period");
-
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 10, 30,
-							  1999, 11, 7, 11, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 4, 10, 30,
-							  1999, 11, 7, 11, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_BUSY);
-	row = e_meeting_time_selector_attendee_add (mts, "Dave Jones", NULL);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 15, 30,
-							  1999, 11, 7, 18, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 11, 00,
-							  1999, 11, 7, 12, 00,
-							  E_MEETING_TIME_SELECTOR_BUSY_BUSY);
-
-	row = e_meeting_time_selector_attendee_add (mts, "Andrew Carlisle", NULL);
-	e_meeting_time_selector_attendee_set_send_meeting_to (mts, row, FALSE);
-
-	row = e_meeting_time_selector_attendee_add (mts, "Michael Cain", NULL);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 15, 30,
-							  1999, 11, 7, 18, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 12, 30,
-							  1999, 11, 7, 13, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 11, 00,
-							  1999, 11, 7, 12, 00,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-}
diff --git a/widgets/menus/.cvsignore b/widgets/menus/.cvsignore
deleted file mode 100644
index 7708c3d120..0000000000
--- a/widgets/menus/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-libmenus.la
-Makefile.in
-.deps
-.libs
-.pure
-*.o
-*.lo
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
deleted file mode 100644
index dc58b34f09..0000000000
--- a/widgets/menus/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-noinst_LTLIBRARIES = libmenus.la
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets/menus		\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"	\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"menus\"
-
-libmenus_la_SOURCES = 		\
-	gal-view-menus.c	\
-	gal-view-menus.h
\ No newline at end of file
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
deleted file mode 100644
index 427eaa7d76..0000000000
--- a/widgets/menus/gal-define-views-dialog.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-define-views-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "gal-define-views-dialog.h"
-#include "gal-define-views-model.h"
-#include "gal-view-new-dialog.h"
-#include <gal/e-table/e-table-scrolled.h>
-
-static void gal_define_views_dialog_init		(GalDefineViewsDialog		 *card);
-static void gal_define_views_dialog_class_init	(GalDefineViewsDialogClass	 *klass);
-static void gal_define_views_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_define_views_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void gal_define_views_dialog_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_COLLECTION,
-};
-
-typedef struct {
-	char         *title;
-	ETableModel  *model;
-	GalDefineViewsDialog *names;
-} GalDefineViewsDialogChild;
-
-GtkType
-gal_define_views_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"GalDefineViewsDialog",
-			sizeof (GalDefineViewsDialog),
-			sizeof (GalDefineViewsDialogClass),
-			(GtkClassInitFunc) gal_define_views_dialog_class_init,
-			(GtkObjectInitFunc) gal_define_views_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = gal_define_views_dialog_set_arg;
-	object_class->get_arg = gal_define_views_dialog_get_arg;
-	object_class->destroy = gal_define_views_dialog_destroy;
-
-	gtk_object_add_arg_type("GalDefineViewsDialog::collection", GAL_VIEW_COLLECTION_TYPE,
-				GTK_ARG_READWRITE, ARG_COLLECTION);
-}
-
-/* ETable creation */
-#define SPEC "<ETableSpecification cursor-mode=\"line\" draw-grid=\"true\" selection-mode=\"single\">" \
-	     "<ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"18\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" \
-             "<ETableState> <column source=\"0\"/> <grouping> </grouping> </ETableState>" \
-	     "</ETableSpecification>"
-
-/* For use from libglade. */
-GtkWidget *gal_define_views_dialog_create_etable(char *name, char *string1, char *string2, int int1, int int2);
-
-GtkWidget *
-gal_define_views_dialog_create_etable(char *name, char *string1, char *string2, int int1, int int2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-	model = gal_define_views_model_new();
-	table = e_table_scrolled_new(model, NULL, SPEC, NULL);
-	gtk_object_set_data(GTK_OBJECT(table), "GalDefineViewsDialog::model", model);
-	return table;
-}
-
-/* Button callbacks */
-
-static void
-gdvd_button_new_dialog_callback(GtkWidget *widget, int button, GalDefineViewsDialog *dialog)
-{
-	gchar *name;
-	GalView *view;
-	GalViewFactory *factory;
-	switch (button) {
-	case 0:
-		gtk_object_get(GTK_OBJECT(widget),
-			       "name", &name,
-			       "factory", &factory,
-			       NULL);
-		if (name && factory) {
-			view = gal_view_factory_new_view(factory,
-							 name);
-			gal_define_views_model_append(GAL_DEFINE_VIEWS_MODEL(dialog->model), view);
-			gtk_object_unref(GTK_OBJECT(view));
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(widget));
-}
-
-static void
-gdvd_button_new_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	GtkWidget *view_new_dialog = gal_view_new_dialog_new(dialog->collection);
-	gtk_signal_connect(GTK_OBJECT(view_new_dialog), "clicked",
-			   GTK_SIGNAL_FUNC(gdvd_button_new_dialog_callback), dialog);
-	gtk_widget_show(GTK_WIDGET(view_new_dialog));
-}
-
-static void
-gdvd_button_modify_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		GalView *view;
-		view = gal_define_views_model_get_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						       row);
-		gal_view_edit(view);
-	}
-
-}
-
-static void
-gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		gal_define_views_model_delete_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						   row);
-	}
-
-}
-
-static void
-gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		gal_define_views_model_copy_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						 row);
-	}
-
-}
-
-static void
-gdvd_connect_signal(GalDefineViewsDialog *dialog, char *widget_name, char *signal, GtkSignalFunc handler)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget(dialog->gui, widget_name);
-
-	if (widget)
-		gtk_signal_connect(GTK_OBJECT(widget), signal, handler, dialog);
-}
-
-static void
-gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *etable;
-
-	dialog->collection = NULL;
-
-	gui = glade_xml_new (GAL_GLADEDIR "/gal-define-views.glade", NULL);
-	dialog->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-
-	gdvd_connect_signal(dialog, "button-new",    "clicked", GTK_SIGNAL_FUNC(gdvd_button_new_callback));
-	gdvd_connect_signal(dialog, "button-modify", "clicked", GTK_SIGNAL_FUNC(gdvd_button_modify_callback));
-	gdvd_connect_signal(dialog, "button-delete", "clicked", GTK_SIGNAL_FUNC(gdvd_button_delete_callback));
-	gdvd_connect_signal(dialog, "button-copy",   "clicked", GTK_SIGNAL_FUNC(gdvd_button_copy_callback));
-
-	dialog->model = NULL;
-	etable = glade_xml_get_widget(dialog->gui, "custom-table");
-	if (etable) {
-		dialog->model = gtk_object_get_data(GTK_OBJECT(etable), "GalDefineViewsDialog::model");
-		gtk_object_set(GTK_OBJECT(dialog->model),
-			       "collection", dialog->collection,
-			       NULL);
-	}
-	
-	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-}
-
-static void
-gal_define_views_dialog_destroy (GtkObject *object) {
-	GalDefineViewsDialog *gal_define_views_dialog = GAL_DEFINE_VIEWS_DIALOG(object);
-
-	gtk_object_unref(GTK_OBJECT(gal_define_views_dialog->gui));
-}
-
-static void
-gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog,
-				       GalViewCollection *collection)
-{
-	dialog->collection = collection;
-	if (dialog->model) {
-		gtk_object_set(GTK_OBJECT(dialog->model),
-			       "collection", collection,
-			       NULL);
-	}
-}
-
-/**
- * gal_define_views_dialog_new
- *
- * Returns a new dialog for defining views.
- *
- * Returns: The GalDefineViewsDialog.
- */
-GtkWidget*
-gal_define_views_dialog_new (GalViewCollection *collection)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (gal_define_views_dialog_get_type ()));
-	gal_define_views_dialog_set_collection(GAL_DEFINE_VIEWS_DIALOG (widget), collection);
-	return widget;
-}
-
-static void
-gal_define_views_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (o);
-	
-	switch (arg_id){
-	case ARG_COLLECTION:
-		if (GTK_VALUE_OBJECT(*arg))
-			gal_define_views_dialog_set_collection(dialog, GAL_VIEW_COLLECTION(GTK_VALUE_OBJECT(*arg)));
-		else
-			gal_define_views_dialog_set_collection(dialog, NULL);
-		break;
-
-	default:
-		return;
-	}
-}
-
-static void
-gal_define_views_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_COLLECTION:
-		if (dialog->collection)
-			GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(dialog->collection);
-		else
-			GTK_VALUE_OBJECT(*arg) = NULL;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
deleted file mode 100644
index e5ebd8feb3..0000000000
--- a/widgets/menus/gal-define-views-dialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-define-views-dialog.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
-#define __GAL_DEFINE_VIEWS_DIALOG_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* GalDefineViewsDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define GAL_DEFINE_VIEWS_DIALOG_TYPE			(gal_define_views_dialog_get_type ())
-#define GAL_DEFINE_VIEWS_DIALOG(obj)			(GTK_CHECK_CAST ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE, GalDefineViewsDialog))
-#define GAL_DEFINE_VIEWS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GAL_DEFINE_VIEWS_DIALOG_TYPE, GalDefineViewsDialogClass))
-#define GAL_IS_DEFINE_VIEWS_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE))
-#define GAL_IS_DEFINE_VIEWS_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE))
-
-typedef struct _GalDefineViewsDialog       GalDefineViewsDialog;
-typedef struct _GalDefineViewsDialogClass  GalDefineViewsDialogClass;
-
-struct _GalDefineViewsDialog
-{
-	GnomeDialog parent;
-
-	/* item specific fields */
-	GladeXML *gui;
-	ETableModel *model;
-
-	GalViewCollection *collection;
-};
-
-struct _GalDefineViewsDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkWidget               *gal_define_views_dialog_new          (GalViewCollection *collection);
-GtkType                  gal_define_views_dialog_get_type     (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
deleted file mode 100644
index 70e0638d18..0000000000
--- a/widgets/menus/gal-define-views-model.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "gal-define-views-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
-
-/*
- * GalDefineViewsModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void gal_define_views_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_define_views_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-
-enum {
-	ARG_0,
-	ARG_EDITABLE,
-	ARG_COLLECTION
-};
-
-static void
-gdvm_destroy(GtkObject *object)
-{
-	GalDefineViewsModel *model = GAL_DEFINE_VIEWS_MODEL(object);
-
-	gtk_object_unref(GTK_OBJECT(model->collection));
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-gdvm_col_count (ETableModel *etc)
-{
-	return 1;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-gdvm_row_count (ETableModel *etc)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	if (views->collection)
-		return gal_view_collection_get_count(views->collection);
-	else
-		return 0;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-gdvm_value_at (ETableModel *etc, int col, int row)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	const char *value;
-
-	value = gal_view_get_title (gal_view_collection_get_view(views->collection, row));
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-gdvm_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	if (views->editable) {
-		gal_view_set_title(gal_view_collection_get_view(views->collection, row), val);
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-gdvm_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return GAL_DEFINE_VIEWS_MODEL(etc)->editable;
-}
-
-static void
-gdvm_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-gdvm_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-gdvm_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-gdvm_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-gdvm_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-gdvm_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/**
- * gal_define_views_model_append
- * @model: The model to add to.
- * @view: The view to add.
- *
- * Adds the given view to the gal define views model.
- */
-void
-gal_define_views_model_append (GalDefineViewsModel *model,
-			       GalView             *view)
-{
-	ETableModel *etm = E_TABLE_MODEL(model);
-
-	e_table_model_pre_change(etm);
-	gal_view_collection_append(model->collection, view);
-	e_table_model_row_inserted(etm, gal_view_collection_get_count(model->collection) - 1);
-}
-
-static void
-gal_define_views_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = gdvm_destroy;
-	object_class->set_arg   = gal_define_views_model_set_arg;
-	object_class->get_arg   = gal_define_views_model_get_arg;
-
-	gtk_object_add_arg_type ("GalDefineViewsModel::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("GalDefineViewsModel::collection", GAL_VIEW_COLLECTION_TYPE,
-				 GTK_ARG_READWRITE, ARG_COLLECTION);
-
-	model_class->column_count     = gdvm_col_count;
-	model_class->row_count        = gdvm_row_count;
-	model_class->value_at         = gdvm_value_at;
-	model_class->set_value_at     = gdvm_set_value_at;
-	model_class->is_cell_editable = gdvm_is_cell_editable;
-	model_class->append_row       = gdvm_append_row;
-	model_class->duplicate_value  = gdvm_duplicate_value;
-	model_class->free_value       = gdvm_free_value;
-	model_class->initialize_value = gdvm_initialize_value;
-	model_class->value_is_empty   = gdvm_value_is_empty;
-	model_class->value_to_string  = gdvm_value_to_string;
-}
-
-static void
-gal_define_views_model_init (GtkObject *object)
-{
-	GalDefineViewsModel *model = GAL_DEFINE_VIEWS_MODEL(object);
-
-	model->collection = NULL;
-}
-
-static void
-gal_define_views_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsModel *model;
-
-	model = GAL_DEFINE_VIEWS_MODEL (o);
-
-	switch (arg_id){
-	case ARG_EDITABLE:
-		model->editable = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_COLLECTION:
-		if (GTK_VALUE_OBJECT (*arg))
-			model->collection = GAL_VIEW_COLLECTION(GTK_VALUE_OBJECT (*arg));
-		else
-			model->collection = NULL;
-		e_table_model_changed(E_TABLE_MODEL(o));
-		break;
-	}
-}
-
-static void
-gal_define_views_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsModel *model;
-
-	model = GAL_DEFINE_VIEWS_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = model->editable;
-		break;
-
-	case ARG_COLLECTION:
-		if (model->collection)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(model->collection);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GtkType
-gal_define_views_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"GalDefineViewsModel",
-			sizeof (GalDefineViewsModel),
-			sizeof (GalDefineViewsModelClass),
-			(GtkClassInitFunc) gal_define_views_model_class_init,
-			(GtkObjectInitFunc) gal_define_views_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/**
- * gal_define_views_model_new
- *
- * Returns a new define views model.  This is a list of views as an
- * ETable for use in the GalDefineViewsDialog.
- *
- * Returns: The new GalDefineViewsModel.
- */
-ETableModel *
-gal_define_views_model_new (void)
-{
-	GalDefineViewsModel *et;
-
-	et = gtk_type_new (gal_define_views_model_get_type ());
-
-	return E_TABLE_MODEL(et);
-}
-
-/**
- * gal_define_views_model_get_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to get.
- *
- * Gets the nth view.
- *
- * Returns: The view.
- */
-GalView *
-gal_define_views_model_get_view (GalDefineViewsModel *model,
-				 int n)
-{
-	return gal_view_collection_get_view(model->collection, n);
-}
-
-/**
- * gal_define_views_model_delete_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to delete.
- *
- * Deletes the nth view.
- */
-void
-gal_define_views_model_delete_view (GalDefineViewsModel *model,
-				    int n)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	gal_view_collection_delete_view(model->collection, n);
-	e_table_model_row_deleted(E_TABLE_MODEL(model), n);
-}
-
-/**
- * gal_define_views_model_copy_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to copy.
- *
- * Copys the nth view.
- */
-void
-gal_define_views_model_copy_view (GalDefineViewsModel *model,
-				  int n)
-{
-	ETableModel *etm = E_TABLE_MODEL(model);
-	gal_view_collection_copy_view(model->collection, n);
-	e_table_model_row_inserted(etm, gal_view_collection_get_count(model->collection) - 1);
-}
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
deleted file mode 100644
index 4aac712df6..0000000000
--- a/widgets/menus/gal-define-views-model.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_DEFINE_VIEWS_MODEL_H_
-#define _GAL_DEFINE_VIEWS_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view.h>
-#include <gal/menus/gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_DEFINE_VIEWS_MODEL_TYPE        (gal_define_views_model_get_type ())
-#define GAL_DEFINE_VIEWS_MODEL(o)          (GTK_CHECK_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel))
-#define GAL_DEFINE_VIEWS_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModelClass))
-#define GAL_IS_DEFINE_VIEWS_MODEL(o)       (GTK_CHECK_TYPE ((o), GAL_DEFINE_VIEWS_MODEL_TYPE))
-#define GAL_IS_DEFINE_VIEWS_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_DEFINE_VIEWS_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	GalViewCollection *collection;
-
-	guint editable : 1;
-} GalDefineViewsModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} GalDefineViewsModelClass;
-
-
-GtkType      gal_define_views_model_get_type     (void);
-ETableModel *gal_define_views_model_new          (void);
-
-void         gal_define_views_model_append       (GalDefineViewsModel *model,
-						  GalView             *view);
-GalView     *gal_define_views_model_get_view     (GalDefineViewsModel *model,
-						  int                  i);
-void         gal_define_views_model_delete_view  (GalDefineViewsModel *model,
-						  int                  i);
-void         gal_define_views_model_copy_view    (GalDefineViewsModel *model,
-						  int                  i);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_DEFINE_VIEWS_MODEL_H_ */
diff --git a/widgets/menus/gal-define-views.glade b/widgets/menus/gal-define-views.glade
deleted file mode 100644
index c9a8b4ffee..0000000000
--- a/widgets/menus/gal-define-views.glade
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>gal-define-views</name>
-  <program_name>gal-define-views</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>gal-define-views.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog1</name>
-  <visible>False</visible>
-  <title>Define Views for &quot;%s&quot;</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button7</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>5</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Description</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table-description</name>
-	  <border_width>6</border_width>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>6</row_spacing>
-	  <column_spacing>6</column_spacing>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom-table</name>
-	  <creation_function>gal_define_views_dialog_create_etable</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 10 Nov 2000 16:37:39 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-new</name>
-	    <can_focus>True</can_focus>
-	    <label>_New...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-copy</name>
-	    <can_focus>True</can_focus>
-	    <label>_Copy...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-modify</name>
-	    <can_focus>True</can_focus>
-	    <label>_Edit...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-delete</name>
-	    <can_focus>True</can_focus>
-	    <label>_Delete...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox1</name>
-	<layout_style>GTK_BUTTONBOX_END</layout_style>
-	<spacing>6</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment3</name>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xscale>0</xscale>
-	<yscale>1</yscale>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-reset</name>
-	  <can_focus>True</can_focus>
-	  <label>Re_set to Factory Defaults...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label-views</name>
-	<label>Views for &quot;%s&quot;</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
deleted file mode 100644
index 6b110e2867..0000000000
--- a/widgets/menus/gal-view-collection.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-collection.c: a View Collection
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 1999, 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gnome-xml/parser.h>
-#include "gal-view-collection.h"
-#include <ctype.h>
-
-#define GVC_CLASS(e) ((GalViewCollectionClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-static GtkObjectClass *gal_view_collection_parent_class;
-
-enum {
-	DISPLAY_VIEW,
-	LAST_SIGNAL
-};
-
-static guint gal_view_collection_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * gal_view_collection_display_view:
- * @collection: The GalViewCollection to send the signal on.
- * @view: The view to display.
- *
- */
-void
-gal_view_collection_display_view (GalViewCollection *collection,
-				  GalView *view)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-
-	gtk_signal_emit (GTK_OBJECT (collection),
-			 gal_view_collection_signals [DISPLAY_VIEW],
-			 view);
-}
-
-static void
-gal_view_collection_item_free (GalViewCollectionItem *item)
-{
-	g_free(item->id);
-	if (item->view)
-		gtk_object_unref(GTK_OBJECT(item->view));
-	g_free(item);
-}
-
-static void
-gal_view_collection_destroy (GtkObject *object)
-{
-	GalViewCollection *collection = GAL_VIEW_COLLECTION(object);
-	int i;
-
-	for (i = 0; i < collection->view_count; i++) {
-		gal_view_collection_item_free (collection->view_data[i]);
-	}
-	g_free(collection->view_data);
-	e_free_object_list(collection->factory_list);
-
-	for (i = 0; i < collection->removed_view_count; i++) {
-		gal_view_collection_item_free (collection->removed_view_data[i]);
-	}
-	g_free(collection->removed_view_data);
-
-	g_free(collection->system_dir);
-	g_free(collection->local_dir);
-
-	if (gal_view_collection_parent_class->destroy)
-		(*gal_view_collection_parent_class->destroy)(object);
-}
-
-static void
-gal_view_collection_class_init (GtkObjectClass *object_class)
-{
-	GalViewCollectionClass *klass = GAL_VIEW_COLLECTION_CLASS(object_class);
-	gal_view_collection_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = gal_view_collection_destroy;
-
-	gal_view_collection_signals [DISPLAY_VIEW] =
-		gtk_signal_new ("display_view",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GalViewCollectionClass, display_view),
-				gtk_marshal_NONE__OBJECT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_OBJECT);
-
-	gtk_object_class_add_signals (object_class, gal_view_collection_signals, LAST_SIGNAL);
-
-	klass->display_view = NULL;     
-}
-
-static void
-gal_view_collection_init (GalViewCollection *collection)
-{
-	collection->view_data          = NULL;
-	collection->view_count         = 0;
-	collection->factory_list       = NULL;
-
-	collection->removed_view_data  = NULL;
-	collection->removed_view_count = 0;
-
-	collection->system_dir         = NULL;
-	collection->local_dir          = NULL;
-}
-
-/**
- * gal_view_collection_get_type:
- *
- */
-guint
-gal_view_collection_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewCollection",
-			sizeof (GalViewCollection),
-			sizeof (GalViewCollectionClass),
-			(GtkClassInitFunc) gal_view_collection_class_init,
-			(GtkObjectInitFunc) gal_view_collection_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-  return type;
-}
-
-/**
- * gal_view_collection_new:
- *
- * A collection of views and view factories.
- */
-GalViewCollection *
-gal_view_collection_new                      (void)
-{
-	return gtk_type_new(gal_view_collection_get_type());
-}
-
-/**
- * gal_view_collection_set_storage_directories
- * @collection: The view collection to initialize
- * @system_dir: The location of the system built in views
- * @local_dir: The location to store the users set up views
- *
- * Sets up the GalViewCollection.
- */
-void
-gal_view_collection_set_storage_directories  (GalViewCollection *collection,
-					      const char        *system_dir,
-					      const char        *local_dir)
-{
-	g_free(collection->system_dir);
-	g_free(collection->local_dir);
-
-	collection->system_dir = g_strdup(system_dir);
-	collection->local_dir = g_strdup(local_dir);
-}
-
-/**
- * gal_view_collection_add_factory
- * @collection: The view collection to add a factory to
- * @factory: The factory to add
- *
- * Adds the given factory to this collection.  This list is used both
- * when loading views from their xml description as well as when the
- * user tries to create a new view.
- */
-void
-gal_view_collection_add_factory              (GalViewCollection *collection,
-					      GalViewFactory    *factory)
-{
-	gtk_object_ref(GTK_OBJECT(factory));
-	collection->factory_list = g_list_prepend(collection->factory_list, factory);
-}
-
-static void
-view_changed (GalView *view,
-	      GalViewCollectionItem *item)
-{
-	item->changed = TRUE;
-	item->ever_changed = TRUE;
-}
-
-static GalViewCollectionItem *
-load_single_file (GalViewCollection *collection,
-		  gchar *dir,
-		  gboolean local,
-		  xmlNode *node)
-{
-	GalViewCollectionItem *item;
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = local;
-	item->changed = FALSE;
-	item->built_in = !local;
-	item->id = e_xml_get_string_prop_by_name(node, "id");
-	item->title = e_xml_get_string_prop_by_name(node, "title");
-	item->filename = e_xml_get_string_prop_by_name(node, "filename");
-	item->type = e_xml_get_string_prop_by_name(node, "type");
-	if (item->filename) {
-		GalViewFactory *factory;
-		GList *factories;
-
-		factory = NULL;
-		for (factories = collection->factory_list; factories; factories = factories->next) {
-			if (!strcmp(gal_view_factory_get_type_code(factories->data), item->type)) {
-				factory = factories->data;
-				break;
-			}
-		}
-		if (factory) {
-			char *filename;
-
-			filename = g_concat_dir_and_file(dir, item->filename);
-			item->view = gal_view_factory_new_view (factory, item->title);
-			gal_view_load(item->view, filename);
-			gal_view_set_title (item->view, item->title);
-			gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-					   GTK_SIGNAL_FUNC(view_changed), item);
-			g_free(filename);
-		}
-
-	}
-	return item;
-}
-
-static void
-load_single_dir (GalViewCollection *collection,
-		 char *dir,
-		 gboolean local)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-	char *filename = g_concat_dir_and_file(dir, "galview.xml");
-
-	doc = xmlParseFile(filename);
-	if (!doc)
-		return;
-	root = xmlDocGetRootElement(doc);
-	for (child = root->xmlChildrenNode; child; child = child->next) {
-		gchar *id = e_xml_get_string_prop_by_name(child, "id");
-		gboolean found = FALSE;
-		int i;
-
-		for (i = 0; i < collection->view_count; i++) {
-			if (!strcmp(id, collection->view_data[i]->id)) {
-				if (!local)
-					collection->view_data[i]->built_in = TRUE;
-				found = TRUE;
-				break;
-			}
-		}
-		if (!found) {
-			for (i = 0; i < collection->removed_view_count; i++) {
-				if (!strcmp(id, collection->removed_view_data[i]->id)) {
-					if (!local)
-						collection->removed_view_data[i]->built_in = TRUE;
-					found = TRUE;
-					break;
-				}
-			}
-		}
-
-		if (!found) {
-			GalViewCollectionItem *item = load_single_file (collection, dir, local, child);
-			if (item->filename && *item->filename) {
-				collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-				collection->view_data[collection->view_count] = item;
-				collection->view_count ++;
-			} else {
-				collection->removed_view_data = g_renew(GalViewCollectionItem *, collection->removed_view_data, collection->removed_view_count + 1);
-				collection->removed_view_data[collection->removed_view_count] = item;
-				collection->removed_view_count ++;
-			}
-		}
-		g_free(id);
-	}
-
-	g_free(filename);
-}
-
-/**
- * gal_view_collection_load
- * @collection: The view collection to load information for
- *
- * Loads the data from the system and user directories specified in
- * set storage directories.  This is primarily for internal use by
- * other parts of gal_view.
- */
-void
-gal_view_collection_load              (GalViewCollection *collection)
-{
-	load_single_dir(collection, collection->local_dir, TRUE);
-	load_single_dir(collection, collection->system_dir, FALSE);
-}
-
-/**
- * gal_view_collection_save
- * @collection: The view collection to save information for
- *
- * Saves the data to the user directory specified in set storage
- * directories.  This is primarily for internal use by other parts of
- * gal_view.
- */
-void
-gal_view_collection_save              (GalViewCollection *collection)
-{
-	int i;
-	xmlDoc *doc;
-	xmlNode *root;
-	char *filename;
-
-	e_create_directory(collection->local_dir);
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode(NULL, "GalViewCollection");
-	xmlDocSetRootElement(doc, root);
-	for (i = 0; i < collection->view_count; i++) {
-		xmlNode *child;
-		GalViewCollectionItem *item;
-
-		item = collection->view_data[i];
-		if (item->ever_changed) {
-			child = xmlNewChild(root, NULL, "GalView", NULL);
-			e_xml_set_string_prop_by_name(child, "id", item->id);
-			e_xml_set_string_prop_by_name(child, "title", item->title);
-			e_xml_set_string_prop_by_name(child, "filename", item->filename);
-			e_xml_set_string_prop_by_name(child, "type", item->type);
-
-			if (item->changed) {
-				filename = g_concat_dir_and_file(collection->local_dir, item->filename);
-				gal_view_save(item->view, filename);
-				g_free(filename);
-			}
-		}
-	}
-	for (i = 0; i < collection->removed_view_count; i++) {
-		xmlNode *child;
-		GalViewCollectionItem *item;
-
-		item = collection->removed_view_data[i];
-
-		child = xmlNewChild(root, NULL, "GalView", NULL);
-		e_xml_set_string_prop_by_name(child, "id", item->id);
-		e_xml_set_string_prop_by_name(child, "title", item->title);
-		e_xml_set_string_prop_by_name(child, "type", item->type);
-	}
-	filename = g_concat_dir_and_file(collection->local_dir, "galview.xml");
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-	g_free(filename);
-}
-
-/**
- * gal_view_collection_get_count
- * @collection: The view collection to count
- *
- * Calculates the number of views in the given collection.
- *
- * Returns: The number of views in the collection.
- */
-gint
-gal_view_collection_get_count (GalViewCollection *collection)
-{
-	return collection->view_count;
-}
-
-/**
- * gal_view_collection_get_view
- * @collection: The view collection to query
- * @n: The view to get.
- *
- * Returns: The nth view in the collection
- */
-GalView *
-gal_view_collection_get_view (GalViewCollection *collection,
-			      int n)
-{
-	g_return_val_if_fail(n < collection->view_count, NULL);
-	g_return_val_if_fail(n >= 0, NULL);
-
-	return collection->view_data[n]->view;
-}
-
-/**
- * gal_view_collection_get_view_item
- * @collection: The view collection to query
- * @n: The view item to get.
- *
- * Returns: The nth view item in the collection
- */
-GalViewCollectionItem *
-gal_view_collection_get_view_item (GalViewCollection *collection,
-				   int n)
-{
-	g_return_val_if_fail(n < collection->view_count, NULL);
-	g_return_val_if_fail(n >= 0, NULL);
-
-	return collection->view_data[n];
-}
-
-static char *
-gal_view_generate_string (GalViewCollection *collection,
-			  GalView           *view,
-			  int which)
-{
-	char *ret_val;
-	char *pointer;
-
-	if (which == 1)
-		ret_val = g_strdup(gal_view_get_title(view));
-	else
-		ret_val = g_strdup_printf("%s_%d", gal_view_get_title(view), which);
-	for (pointer = ret_val; *pointer; pointer++) {
-		if (!isalnum((guint) *pointer)) {
-			*pointer = '_';
-		}
-	}
-	return ret_val;
-}
-
-static gint
-gal_view_check_string (GalViewCollection *collection,
-		       char *string)
-{
-	int i;
-
-	for (i = 0; i < collection->view_count; i++) {
-		if (!strcmp(string, collection->view_data[i]->id))
-			return FALSE;
-	}
-	for (i = 0; i < collection->removed_view_count; i++) {
-		if (!strcmp(string, collection->removed_view_data[i]->id))
-			return FALSE;
-	}
-	return TRUE;
-}
-
-static char *
-gal_view_generate_id (GalViewCollection *collection,
-		      GalView           *view)
-{
-	int i;
-	for (i = 1; TRUE; i++) {
-		char *try;
-
-		try = gal_view_generate_string(collection, view, i);
-		if (gal_view_check_string(collection, try))
-			return try;
-		g_free(try);
-	}
-}
-
-void
-gal_view_collection_append                   (GalViewCollection *collection,
-					      GalView           *view)
-{
-	GalViewCollectionItem *item;
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = TRUE;
-	item->changed = TRUE;
-	item->built_in = FALSE;
-	item->title = g_strdup(gal_view_get_title(view));
-	item->type = g_strdup(gal_view_get_type_code(view));
-	item->id = gal_view_generate_id(collection, view);
-	item->filename = g_strdup_printf("%s.galview", item->id);
-	item->view = view;
-	gtk_object_ref(GTK_OBJECT(view));
-
-	gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-			   GTK_SIGNAL_FUNC(view_changed), item);
-
-	collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-	collection->view_data[collection->view_count] = item;
-	collection->view_count ++;
-}
-
-void
-gal_view_collection_delete_view              (GalViewCollection *collection,
-					      int                i)
-{
-	GalViewCollectionItem *item = collection->view_data[i];
-	memmove(collection->view_data + i, collection->view_data + i + 1, (collection->view_count - i - 1) * sizeof(GalViewCollectionItem *));
-	if (item->built_in) {
-		g_free(item->filename);
-		item->filename = NULL;
-
-		collection->removed_view_data = g_renew(GalViewCollectionItem *, collection->removed_view_data, collection->removed_view_count + 1);
-		collection->removed_view_data[collection->removed_view_count] = item;
-		collection->removed_view_count ++;
-	} else {
-		gal_view_collection_item_free (item);
-	}
-}
-
-void
-gal_view_collection_copy_view                (GalViewCollection *collection,
-					      int                i)
-{
-	GalViewCollectionItem *item;
-	GalView *view = collection->view_data[i]->view;
-
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = TRUE;
-	item->changed = FALSE;
-	item->built_in = FALSE;
-	item->title = g_strdup(gal_view_get_title(view));
-	item->type = g_strdup(gal_view_get_type_code(view));
-	item->id = gal_view_generate_id(collection, view);
-	item->filename = g_strdup_printf("%s.galview", item->id);
-	item->view = gal_view_clone(view);
-
-	gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-			   GTK_SIGNAL_FUNC(view_changed), item);
-
-	collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-	collection->view_data[collection->view_count] = item;
-	collection->view_count ++;
-}
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
deleted file mode 100644
index bfb790d0ae..0000000000
--- a/widgets/menus/gal-view-collection.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_SET_H_
-#define _GAL_VIEW_SET_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GAL_VIEW_COLLECTION_TYPE        (gal_view_collection_get_type ())
-#define GAL_VIEW_COLLECTION(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollection))
-#define GAL_VIEW_COLLECTION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass))
-#define GAL_IS_VIEW_COLLECTION(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_COLLECTION_TYPE))
-#define GAL_IS_VIEW_COLLECTION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_COLLECTION_TYPE))
-
-typedef struct {
-	GalView *view;
-	char *id;
-	gboolean changed;
-	gboolean ever_changed;
-	gboolean built_in;
-	char *filename;
-	char *title;
-	char *type;
-} GalViewCollectionItem;
-
-typedef struct {
-	GtkObject base;
-
-	GalViewCollectionItem **view_data;
-	int view_count;
-	GList *factory_list;
-
-	GalViewCollectionItem **removed_view_data;
-	int removed_view_count;
-
-	char *system_dir;
-	char *local_dir;
-} GalViewCollection;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*display_view) (GalViewCollection *collection,
-			      GalView    *view);
-} GalViewCollectionClass;
-
-/* Standard functions */
-GtkType                gal_view_collection_get_type                 (void);
-GalViewCollection     *gal_view_collection_new                      (void);
-
-/* Set up the view collection */
-void                   gal_view_collection_set_storage_directories  (GalViewCollection *collection,
-								     const char        *system_dir,
-								     const char        *local_dir);
-void                   gal_view_collection_add_factory              (GalViewCollection *collection,
-								     GalViewFactory    *factory);
-
-/* Send the display view signal. */
-void                   gal_view_collection_display_view             (GalViewCollection *collection,
-								     GalView           *view);
-gint                   gal_view_collection_get_count                (GalViewCollection *collection);
-GalView               *gal_view_collection_get_view                 (GalViewCollection *collection,
-								     int                n);
-GalViewCollectionItem *gal_view_collection_get_view_item            (GalViewCollection *collection,
-								     int                n);
-
-void                   gal_view_collection_append                   (GalViewCollection *collection,
-								     GalView           *view);
-void                   gal_view_collection_delete_view              (GalViewCollection *collection,
-								     int                i);
-void                   gal_view_collection_copy_view                (GalViewCollection *collection,
-								     int                i);
-/* Call set_storage_directories and add factories for anything that
- * might be found there before doing either of these. */
-void                   gal_view_collection_load                     (GalViewCollection *collection);
-void                   gal_view_collection_save                     (GalViewCollection *collection);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _GAL_VIEW_COLLECTION_H_ */
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
deleted file mode 100644
index 1eb3166611..0000000000
--- a/widgets/menus/gal-view-etable.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-etable.c: An ETable View
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include "gal-view-etable.h"
-#include <gal/e-table/e-table-config.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-
-static GalViewClass *gal_view_etable_parent_class;
-
-
-static void
-config_changed (ETableConfig *config, ETableState *state, GalViewEtable *view)
-{
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-	view->state = e_table_state_duplicate(state);
-	gal_view_changed(GAL_VIEW(view));
-}
-
-static void
-gal_view_etable_edit            (GalView *view)
-{
-	GalViewEtable *etable_view = GAL_VIEW_ETABLE(view);
-	ETableConfig *config;
-
-	config = e_table_config_new(etable_view->title,
-				    etable_view->spec,
-				    etable_view->state);
-
-	gtk_signal_connect(GTK_OBJECT(config), "changed",
-			   GTK_SIGNAL_FUNC(config_changed), view);
-}
-
-static void  
-gal_view_etable_load  (GalView *view,
-		       const char *filename)
-{
-	e_table_state_load_from_file(GAL_VIEW_ETABLE(view)->state, filename);
-}
-
-static void
-gal_view_etable_save    (GalView *view,
-			 const char *filename)
-{
-	e_table_state_save_to_file(GAL_VIEW_ETABLE(view)->state, filename);
-}
-
-static const char *
-gal_view_etable_get_title       (GalView *view)
-{
-	return GAL_VIEW_ETABLE(view)->title;
-}
-
-static void
-gal_view_etable_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_ETABLE(view)->title);
-	GAL_VIEW_ETABLE(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_etable_get_type_code (GalView *view)
-{
-	return "etable";
-}
-
-static GalView *
-gal_view_etable_clone       (GalView *view)
-{
-	GalViewEtable *gve, *new;
-
-	gve = GAL_VIEW_ETABLE(view);
-
-	new        = gtk_type_new (gal_view_etable_get_type ());
-	new->spec  = gve->spec;
-	new->title = g_strdup (gve->title);
-	new->state = e_table_state_duplicate(gve->state);
-
-	gtk_object_ref(GTK_OBJECT(new->spec));
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_etable_destroy         (GtkObject *object)
-{
-	GalViewEtable *view = GAL_VIEW_ETABLE(object);
-	g_free(view->title);
-	if (view->spec)
-		gtk_object_unref(GTK_OBJECT(view->spec));
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-}
-
-static void
-gal_view_etable_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_etable_parent_class  = gtk_type_class (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_etable_edit         ;
-	gal_view_class->load          = gal_view_etable_load         ;
-	gal_view_class->save          = gal_view_etable_save         ;
-	gal_view_class->get_title     = gal_view_etable_get_title    ;
-	gal_view_class->set_title     = gal_view_etable_set_title    ;
-	gal_view_class->get_type_code = gal_view_etable_get_type_code;
-	gal_view_class->clone         = gal_view_etable_clone        ;
-
-	object_class->destroy         = gal_view_etable_destroy      ;
-}
-
-static void
-gal_view_etable_init      (GalViewEtable *gve)
-{
-	gve->spec  = NULL;
-	gve->state = e_table_state_new();
-	gve->title = NULL;
-}
-
-/**
- * gal_view_etable_new
- * @spec: The ETableSpecification that this view will be based upon.
- * @title: The name of the new view.
- *
- * Returns a new GalViewEtable.  This is primarily for use by
- * GalViewFactoryEtable.
- *
- * Returns: The new GalViewEtable.
- */
-GalView *
-gal_view_etable_new (ETableSpecification *spec,
-		     const gchar *title)
-{
-	return gal_view_etable_construct (gtk_type_new (gal_view_etable_get_type ()), spec, title);
-}
-
-/**
- * gal_view_etable_construct
- * @view: The view to construct.
- * @spec: The ETableSpecification that this view will be based upon.
- * @title: The name of the new view.
- *
- * constructs the GalViewEtable.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewEtable.
- */
-GalView *
-gal_view_etable_construct  (GalViewEtable *view,
-			    ETableSpecification *spec,
-			    const gchar *title)
-{
-	if (spec)
-		gtk_object_ref(GTK_OBJECT(spec));
-	view->spec = spec;
-
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-	view->state = e_table_state_duplicate(spec->state);
-
-	view->title = g_strdup(title);
-
-	return GAL_VIEW(view);
-}
-
-GtkType
-gal_view_etable_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewEtable",
-			sizeof (GalViewEtable),
-			sizeof (GalViewEtableClass),
-			(GtkClassInitFunc) gal_view_etable_class_init,
-			(GtkObjectInitFunc) gal_view_etable_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
deleted file mode 100644
index 9fde64a9cb..0000000000
--- a/widgets/menus/gal-view-etable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_ETABLE_H_
-#define _GAL_VIEW_ETABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-specification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_ETABLE_TYPE        (gal_view_etable_get_type ())
-#define GAL_VIEW_ETABLE(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_ETABLE_TYPE, GalViewEtable))
-#define GAL_VIEW_ETABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_ETABLE_TYPE, GalViewEtableClass))
-#define GAL_IS_VIEW_ETABLE(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_ETABLE_TYPE))
-#define GAL_IS_VIEW_ETABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_ETABLE_TYPE))
-
-typedef struct {
-	GalView base;
-
-	ETableSpecification *spec;
-	ETableState         *state;
-	char                *title;
-} GalViewEtable;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewEtableClass;
-
-/* Standard functions */
-GtkType  gal_view_etable_get_type   (void);
-GalView *gal_view_etable_new        (ETableSpecification *spec,
-				     const gchar         *title);
-GalView *gal_view_etable_construct  (GalViewEtable       *view,
-				     ETableSpecification *spec,
-				     const gchar         *title);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
deleted file mode 100644
index 80f5d39f92..0000000000
--- a/widgets/menus/gal-view-factory-etable.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory.c: A View Factory
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include "gal-view-factory-etable.h"
-#include "gal-view-etable.h"
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#define GVFE_CLASS(e) ((GalViewFactoryEtableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gal_view_factory_get_type ()
-
-static GalViewFactoryClass *gal_view_factory_etable_parent_class;
-
-static const char *
-gal_view_factory_etable_get_title       (GalViewFactory *factory)
-{
-	return _("Table");
-}
-
-static GalView *
-gal_view_factory_etable_new_view        (GalViewFactory *factory,
-					 const char     *name)
-{
-	return gal_view_etable_new(GAL_VIEW_FACTORY_ETABLE(factory)->spec, name);
-}
-
-static const char *
-gal_view_factory_etable_get_type_code (GalViewFactory *factory)
-{
-	return "etable";
-}
-
-static void
-gal_view_factory_etable_destroy         (GtkObject *object)
-{
-	GalViewFactoryEtable *factory = GAL_VIEW_FACTORY_ETABLE(object);
-
-	if (factory->spec)
-		gtk_object_unref(GTK_OBJECT(factory->spec));
-}
-
-static void
-gal_view_factory_etable_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_etable_parent_class    = gtk_type_class (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_etable_get_title;
-	view_factory_class->new_view            = gal_view_factory_etable_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_etable_get_type_code;
-
-	object_class->destroy                   = gal_view_factory_etable_destroy;
-}
-
-static void
-gal_view_factory_etable_init            (GalViewFactoryEtable *factory)
-{
-	factory->spec = NULL;
-}
-
-/**
- * gal_view_etable_new
- * @spec: The spec to create GalViewEtables based upon.
- *
- * A new GalViewFactory for creating ETable views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryEtable.
- */
-GalViewFactory *
-gal_view_factory_etable_new        (ETableSpecification  *spec)
-{
-	return gal_view_factory_etable_construct (gtk_type_new (gal_view_factory_etable_get_type ()), spec);
-}
-
-/**
- * gal_view_etable_construct
- * @factory: The factory to construct
- * @spec: The spec to create GalViewEtables based upon.
- *
- * constructs the GalViewFactoryEtable.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryEtable.
- */
-GalViewFactory *
-gal_view_factory_etable_construct  (GalViewFactoryEtable *factory,
-				    ETableSpecification  *spec)
-{
-	if (spec)
-		gtk_object_ref(GTK_OBJECT(spec));
-	factory->spec = spec;
-	return GAL_VIEW_FACTORY(factory);
-}
-
-GtkType
-gal_view_factory_etable_get_type  (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactoryEtable",
-			sizeof (GalViewFactoryEtable),
-			sizeof (GalViewFactoryEtableClass),
-			(GtkClassInitFunc) gal_view_factory_etable_class_init,
-			(GtkObjectInitFunc) gal_view_factory_etable_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
deleted file mode 100644
index f41697f9f5..0000000000
--- a/widgets/menus/gal-view-factory-etable.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_FACTORY_ETABLE_H_
-#define _GAL_VIEW_FACTORY_ETABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-#include <gal/e-table/e-table-specification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_FACTORY_ETABLE_TYPE        (gal_view_factory_etable_get_type ())
-#define GAL_VIEW_FACTORY_ETABLE(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtable))
-#define GAL_VIEW_FACTORY_ETABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtableClass))
-#define GAL_IS_VIEW_FACTORY_ETABLE(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_ETABLE_TYPE))
-#define GAL_IS_VIEW_FACTORY_ETABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_ETABLE_TYPE))
-
-typedef struct {
-	GalViewFactory base;
-
-	ETableSpecification *spec;
-} GalViewFactoryEtable;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryEtableClass;
-
-/* Standard functions */
-GtkType         gal_view_factory_etable_get_type   (void);
-GalViewFactory *gal_view_factory_etable_new        (ETableSpecification  *spec);
-GalViewFactory *gal_view_factory_etable_construct  (GalViewFactoryEtable *factory,
-						    ETableSpecification  *spec);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_FACTORY_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
deleted file mode 100644
index 569dc59b92..0000000000
--- a/widgets/menus/gal-view-factory.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory.c: A View Factory
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include "gal-view-factory.h"
-
-#define GVF_CLASS(e) ((GalViewFactoryClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-static GtkObjectClass *gal_view_factory_parent_class;
-
-/**
- * gal_view_factory_get_title:
- * @factory: The factory to query.
- *
- * Returns: The title of the factory.
- */
-const char *
-gal_view_factory_get_title       (GalViewFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, 0);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), 0);
-
-	if (GVF_CLASS (factory)->get_title)
-		return GVF_CLASS (factory)->get_title (factory);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_factory_new_view:
- * @factory: The factory to use
- * @name: the name for the view.
- *
- * Returns: The new view
- */
-GalView *
-gal_view_factory_new_view        (GalViewFactory *factory,
-				  const char     *name)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL);
-
-	if (GVF_CLASS (factory)->new_view)
-		return GVF_CLASS (factory)->new_view (factory, name);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_factory_get_type_code:
- * @factory: The factory to use
- *
- * Returns: The type code
- */
-const char *
-gal_view_factory_get_type_code (GalViewFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL);
-
-	if (GVF_CLASS (factory)->get_type_code)
-		return GVF_CLASS (factory)->get_type_code (factory);
-	else
-		return NULL;
-}
-
-static void
-gal_view_factory_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *klass = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->get_title = NULL;     
-	klass->new_view  = NULL;     
-}
-
-GtkType
-gal_view_factory_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactory",
-			sizeof (GalViewFactory),
-			sizeof (GalViewFactoryClass),
-			(GtkClassInitFunc) gal_view_factory_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
deleted file mode 100644
index dd828145e5..0000000000
--- a/widgets/menus/gal-view-factory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_FACTORY_H_
-#define _GAL_VIEW_FACTORY_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_FACTORY_TYPE        (gal_view_factory_get_type ())
-#define GAL_VIEW_FACTORY(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_TYPE, GalViewFactory))
-#define GAL_VIEW_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_TYPE, GalViewFactoryClass))
-#define GAL_IS_VIEW_FACTORY(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_TYPE))
-#define GAL_IS_VIEW_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_TYPE))
-
-typedef struct {
-	GtkObject base;
-} GalViewFactory;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	const char *(*get_title)      (GalViewFactory *factory);
-	const char *(*get_type_code)  (GalViewFactory *factory);
-	GalView    *(*new_view)       (GalViewFactory *factory,
-				       const char     *name);
-} GalViewFactoryClass;
-
-/* Standard functions */
-GtkType     gal_view_factory_get_type       (void);
-
-/* Query functions */
-/* Returns already translated title. */
-const char *gal_view_factory_get_title      (GalViewFactory *factory);
-
-/* Returns the code for use in identifying this type of object in the
- * view list.  This identifier should identify this as being the
- * unique factory for xml files which were written out with this
- * identifier.  Thus each factory should have a unique type code.  */
-const char *gal_view_factory_get_type_code  (GalViewFactory *factory);
-
-/* Create a new view */
-GalView    *gal_view_factory_new_view       (GalViewFactory *factory,
-					     const char     *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _GAL_VIEW_FACTORY_H_ */
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
deleted file mode 100644
index 33ae89cbba..0000000000
--- a/widgets/menus/gal-view-menus.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-menus.c: Deploy a GalViewCollection in the menus.
- *
- * Author:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include "gal-view-menus.h"
-#include <gal/menus/gal-define-views-dialog.h>
-
-struct _GalViewMenusPrivate {
-	GalViewCollection *collection;
-	BonoboUIVerb *verbs;
-};
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *gvm_parent_class;
-
-typedef struct {
-	GalViewCollection *collection;
-	GalView *view;
-} CollectionAndView;
-
-static void
-free_verbs (GalViewMenus *gvm)
-{
-	BonoboUIVerb *verbs;
-	if (gvm->priv->verbs) {
-		for (verbs = gvm->priv->verbs + 1; verbs->cname; verbs++) {
-			CollectionAndView *cnv = verbs->user_data;
-
-			g_free(verbs->cname);
-
-			gtk_object_unref(GTK_OBJECT(cnv->collection));
-			gtk_object_unref(GTK_OBJECT(cnv->view));
-			g_free(cnv);
-		}
-		g_free(gvm->priv->verbs);
-	}
-	gvm->priv->verbs = NULL;
-}
-
-static void
-gvm_destroy (GtkObject *object)
-{
-	GalViewMenus *gvm = GAL_VIEW_MENUS (object);
-
-	if (gvm->priv->collection)
-		gtk_object_unref(GTK_OBJECT(gvm->priv->collection));
-	free_verbs(gvm);
-	g_free(gvm->priv);
-	gvm->priv = NULL;
-
-	GTK_OBJECT_CLASS (gvm_parent_class)->destroy (object);
-}
-
-static void
-gvm_class_init (GtkObjectClass *klass)
-{
-	gvm_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = gvm_destroy;
-}
-
-static void
-gvm_init (GalViewMenus *gvm)
-{
-	gvm->priv = g_new(GalViewMenusPrivate, 1);
-	gvm->priv->collection = NULL;
-	gvm->priv->verbs = NULL;
-}
-
-E_MAKE_TYPE(gal_view_menus, "GalViewMenus", GalViewMenus, gvm_class_init, gvm_init, PARENT_TYPE);
-
-GalViewMenus *
-gal_view_menus_new (GalViewCollection *collection)
-{
-	GalViewMenus *gvm = gtk_type_new (GAL_VIEW_MENUS_TYPE);
-
-	gal_view_menus_construct(gvm, collection);
-
-	return gvm;
-}
-
-GalViewMenus *
-gal_view_menus_construct (GalViewMenus      *gvm,
-			  GalViewCollection *collection)
-{
-	if (collection)
-		gtk_object_ref(GTK_OBJECT(collection));
-	gvm->priv->collection = collection;
-	return gvm;
-}
-
-static void
-dialog_clicked(GtkWidget *dialog, int button, GalViewMenus *menus)
-{
-	if (button == 0) {
-		gal_view_collection_save(menus->priv->collection);
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-define_views(BonoboUIComponent *component,
-	     GalViewMenus      *menus,
-	     char              *cname)
-{
-	GtkWidget *dialog = gal_define_views_dialog_new(menus->priv->collection);
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   GTK_SIGNAL_FUNC(dialog_clicked), menus);
-	gtk_widget_show(dialog);
-}
-
-static char *
-build_menus(GalViewMenus *menus)
-{
-	BonoboUINode *root;
-	BonoboUINode *menu;
-	BonoboUINode *submenu;
-	BonoboUINode *menuitem;
-	char *xml;
-	xmlChar *string;
-	int length;
-	int i;
-	GalViewCollection *collection = menus->priv->collection;
-
-
-
-	root = bonobo_ui_node_new("Root");
-	menu = bonobo_ui_node_new_child(root, "menu");
-
-	submenu = bonobo_ui_node_new_child(menu, "submenu");
-	bonobo_ui_node_set_attr(submenu, "name", "View");
-
-	submenu = bonobo_ui_node_new_child(submenu, "submenu");
-	bonobo_ui_node_set_attr(submenu, "name", "CurrentView");
-	bonobo_ui_node_set_attr(submenu, "_label", "Current View");
-
-	length = gal_view_collection_get_count(collection);
-	for (i = 0; i < length; i++) {
-		GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
-		menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
-		bonobo_ui_node_set_attr(menuitem, "name", item->id);
-		bonobo_ui_node_set_attr(menuitem, "_label", item->title);
-		bonobo_ui_node_set_attr(menuitem, "verb", item->id);
-	}
-
-	menuitem = bonobo_ui_node_new_child(submenu, "separator");
-
-	menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
-	bonobo_ui_node_set_attr(menuitem, "name", "DefineViews");
-	bonobo_ui_node_set_attr(menuitem, "_label", "Define Views");
-	bonobo_ui_node_set_attr(menuitem, "verb", "DefineViews");
-
-	string = bonobo_ui_node_to_string(root, TRUE);
-	xml = g_strdup(string);
-	bonobo_ui_node_free_string(string);
-
-	bonobo_ui_node_free(root);
-
-	g_print (xml);
-
-	return xml;
-}
-
-static void
-show_view(BonoboUIComponent *component,
-	  gpointer           user_data,
-	  const char        *cname)
-{
-	CollectionAndView *cnv = user_data;
-	gal_view_collection_display_view(cnv->collection, cnv->view);
-}
-
-static BonoboUIVerb *
-build_verbs (GalViewMenus *menus)
-{
-	GalViewCollection *collection = menus->priv->collection;
-	int count = gal_view_collection_get_count(collection);
-	BonoboUIVerb *verbs = g_new(BonoboUIVerb, count + 2);
-	BonoboUIVerb *verb;
-	int i;
-	
-	verb            = verbs;
-	verb->cname     = "DefineViews";
-	verb->cb        = (BonoboUIVerbFn) define_views;
-	verb->user_data = menus;
-	verb->dummy     = NULL;
-	verb ++;
-	for (i = 0; i < count; i++) {
-		CollectionAndView *cnv;
-		GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
-
-		cnv             = g_new(CollectionAndView, 1);
-		cnv->view       = item->view;
-		cnv->collection = collection;
-
-		gtk_object_ref(GTK_OBJECT(cnv->view));
-		gtk_object_ref(GTK_OBJECT(cnv->collection));
-
-		verb->cname     = item->id;
-		verb->cb        = show_view;
-		verb->user_data = cnv;
-		verb->dummy     = NULL;
-		verb++;
-	}
-
-	verb->cname     = NULL;
-	verb->cb        = NULL;
-	verb->user_data = NULL;
-	verb->dummy     = NULL;
-	verb++;
-
-	return verbs;
-}
-
-
-void          gal_view_menus_apply     (GalViewMenus      *menus,
-					BonoboUIComponent *component,
-					CORBA_Environment *ev)
-{
-	char *xml = build_menus(menus);
-	bonobo_ui_component_set_translate(component, "/", xml, ev);
-	g_free(xml);
-
-	free_verbs(menus);
-	menus->priv->verbs = build_verbs(menus);
-	bonobo_ui_component_add_verb_list(component, menus->priv->verbs);
-}
diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h
deleted file mode 100644
index 21b302771c..0000000000
--- a/widgets/menus/gal-view-menus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_MENUS_H_
-#define _GAL_VIEW_MENUS_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-collection.h>
-
-#define GAL_VIEW_MENUS_TYPE        (gal_view_menus_get_type ())
-#define GAL_VIEW_MENUS(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MENUS_TYPE, GalViewMenus))
-#define GAL_VIEW_MENUS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MENUS_TYPE, GalViewMenusClass))
-#define GAL_IS_VIEW_MENUS(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MENUS_TYPE))
-#define GAL_IS_VIEW_MENUS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MENUS_TYPE))
-
-typedef struct _GalViewMenusPrivate GalViewMenusPrivate;
-
-typedef struct {
-	GtkObject base;
-	GalViewMenusPrivate *priv;
-} GalViewMenus;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} GalViewMenusClass;
-
-GtkType       gal_view_menus_get_type   (void);
-GalViewMenus *gal_view_menus_new        (GalViewCollection *collection);
-GalViewMenus *gal_view_menus_construct  (GalViewMenus      *menus,
-					 GalViewCollection *collection);
-
-void          gal_view_menus_apply      (GalViewMenus      *menus,
-					 BonoboUIComponent *component,
-					 CORBA_Environment *ev);					      
-
-#endif /* _GAL_VIEW_MENUS_H_ */
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
deleted file mode 100644
index aee6e3f0d0..0000000000
--- a/widgets/menus/gal-view-new-dialog.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-view-new-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "gal-view-new-dialog.h"
-#include "gal-define-views-model.h"
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-table/e-table-scrolled.h>
-
-static void gal_view_new_dialog_init		(GalViewNewDialog		 *card);
-static void gal_view_new_dialog_class_init	(GalViewNewDialogClass	 *klass);
-static void gal_view_new_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_view_new_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void gal_view_new_dialog_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME,
-	ARG_FACTORY,
-};
-
-GtkType
-gal_view_new_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"GalViewNewDialog",
-			sizeof (GalViewNewDialog),
-			sizeof (GalViewNewDialogClass),
-			(GtkClassInitFunc) gal_view_new_dialog_class_init,
-			(GtkObjectInitFunc) gal_view_new_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = gal_view_new_dialog_set_arg;
-	object_class->get_arg = gal_view_new_dialog_get_arg;
-	object_class->destroy = gal_view_new_dialog_destroy;
-
-	gtk_object_add_arg_type ("GalViewNewDialog::name", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("GalViewNewDialog::factory", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_FACTORY);
-}
-
-static void
-gal_view_new_dialog_init (GalViewNewDialog *dialog)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (GAL_GLADEDIR "/gal-view-new-dialog.glade", NULL);
-	dialog->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-
-	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-
-	dialog->collection = NULL;
-	dialog->selected_factory = NULL;
-}
-
-static void
-gal_view_new_dialog_destroy (GtkObject *object) {
-	GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object);
-	
-	gtk_object_unref(GTK_OBJECT(gal_view_new_dialog->gui));
-}
-
-GtkWidget*
-gal_view_new_dialog_new (GalViewCollection *collection)
-{
-	GtkWidget *widget =
-		gal_view_new_dialog_construct(gtk_type_new (gal_view_new_dialog_get_type ()),
-					      collection);
-	return widget;
-}
-
-
-static void
-gal_view_new_dialog_select_row_callback(GtkCList *list,
-					gint row,
-					gint column,
-					GdkEventButton *event,
-					GalViewNewDialog *dialog)
-{
-	dialog->selected_factory = gtk_clist_get_row_data(list,
-							  row);
-}
-
-GtkWidget*
-gal_view_new_dialog_construct (GalViewNewDialog  *dialog,
-			       GalViewCollection *collection)
-{
-	GtkWidget *list = glade_xml_get_widget(dialog->gui,
-					       "clist-type-list");
-	GList *iterator;
-	dialog->collection = collection;
-
-	iterator = dialog->collection->factory_list;
-
-	for ( ; iterator; iterator = g_list_next(iterator) ) {
-		GalViewFactory *factory = iterator->data;
-		char *text[1];
-		int row;
-
-		gtk_object_ref(GTK_OBJECT(factory));
-		text[0] = (char *) gal_view_factory_get_title(factory);
-		row = gtk_clist_append(GTK_CLIST(list), text);
-		gtk_clist_set_row_data(GTK_CLIST(list), row, factory);
-	}
-
-	gtk_signal_connect(GTK_OBJECT (list),
-			   "select_row",
-			   GTK_SIGNAL_FUNC(gal_view_new_dialog_select_row_callback),
-			   dialog);
-
-	return GTK_WIDGET(dialog);
-}
-
-static void
-gal_view_new_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalViewNewDialog *dialog;
-	GtkWidget *entry;
-
-	dialog = GAL_VIEW_NEW_DIALOG (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		entry = glade_xml_get_widget(dialog->gui, "entry-name");
-		if (entry && GTK_IS_EDITABLE(entry)) {
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(entry), GTK_VALUE_STRING(*arg));
-		}
-		break;
-	default:
-		return;
-	}
-}
-
-static void
-gal_view_new_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalViewNewDialog *dialog;
-	GtkWidget *entry;
-
-	dialog = GAL_VIEW_NEW_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		entry = glade_xml_get_widget(dialog->gui, "entry-name");
-		if (entry && GTK_IS_EDITABLE(entry)) {
-			GTK_VALUE_STRING(*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(entry));
-		}
-		break;
-	case ARG_FACTORY:
-		GTK_VALUE_OBJECT(*arg) = dialog->selected_factory ? GTK_OBJECT(dialog->selected_factory) : NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/menus/gal-view-new-dialog.glade b/widgets/menus/gal-view-new-dialog.glade
deleted file mode 100644
index 02d9866d49..0000000000
--- a/widgets/menus/gal-view-new-dialog.glade
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>gal-view-new-dialog</name>
-  <program_name>gal-view-new-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>gal-view-new-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog1</name>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Name of new view:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-name</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-name</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Type of view:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist-type-list</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label5</name>
-	    <label>label5</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
deleted file mode 100644
index de4fcc9387..0000000000
--- a/widgets/menus/gal-view-new-dialog.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-view-new-dialog.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GAL_VIEW_NEW_DIALOG_H__
-#define __GAL_VIEW_NEW_DIALOG_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* GalViewNewDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define GAL_VIEW_NEW_DIALOG_TYPE			(gal_view_new_dialog_get_type ())
-#define GAL_VIEW_NEW_DIALOG(obj)			(GTK_CHECK_CAST ((obj), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialog))
-#define GAL_VIEW_NEW_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialogClass))
-#define GAL_IS_VIEW_NEW_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
-#define GAL_IS_VIEW_NEW_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
-
-typedef struct _GalViewNewDialog       GalViewNewDialog;
-typedef struct _GalViewNewDialogClass  GalViewNewDialogClass;
-
-struct _GalViewNewDialog
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-
-	GalViewCollection *collection;
-	GalViewFactory *selected_factory;
-};
-
-struct _GalViewNewDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkWidget *gal_view_new_dialog_new        (GalViewCollection *collection);
-GtkType    gal_view_new_dialog_get_type   (void);
-
-GtkWidget *gal_view_new_dialog_construct  (GalViewNewDialog  *dialog,
-					   GalViewCollection *collection);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_VIEW_NEW_DIALOG_H__ */
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
deleted file mode 100644
index f48a6f0026..0000000000
--- a/widgets/menus/gal-view.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view.c: A View
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal-view.h"
-
-#define GV_CLASS(e) ((GalViewClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-
-static GtkObjectClass *gal_view_parent_class;
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint gal_view_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * gal_view_edit
- * @view: The view to edit
- */
-void
-gal_view_edit            (GalView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->edit)
-		GV_CLASS (view)->edit (view);
-}
-
-/**
- * gal_view_load
- * @view: The view to load to
- * @filename: The file to load from
- */
-void  
-gal_view_load  (GalView *view,
-		const char *filename)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->load)
-		GV_CLASS (view)->load (view, filename);
-}
-
-/**
- * gal_view_save
- * @view: The view to save
- * @filename: The file to save to
- */
-void
-gal_view_save    (GalView *view,
-		  const char *filename)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->save)
-		GV_CLASS (view)->save (view, filename);
-}
-
-/**
- * gal_view_get_title
- * @view: The view to query.
- *
- * Returns: The title of the view.
- */
-const char *
-gal_view_get_title       (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->get_title)
-		return GV_CLASS (view)->get_title (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_set_title
- * @view: The view to set.
- * @title: The new title value.
- */
-void
-gal_view_set_title       (GalView *view,
-			  const char *title)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->set_title)
-		GV_CLASS (view)->set_title (view, title);
-}
-
-/**
- * gal_view_get_type_code
- * @view: The view to get.
- *
- * Returns: The type of the view.
- */
-const char *
-gal_view_get_type_code (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->get_type_code)
-		return GV_CLASS (view)->get_type_code (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_clone
- * @view: The view to clone.
- *
- * Returns: The clone.
- */
-GalView *
-gal_view_clone       (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->clone)
-		return GV_CLASS (view)->clone (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_changed
- * @view: The view that changed.
- */
-void
-gal_view_changed       (GalView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	gtk_signal_emit(GTK_OBJECT(view),
-			 gal_view_signals [CHANGED]);
-}
-
-static void
-gal_view_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *klass   = GAL_VIEW_CLASS(object_class);
-	gal_view_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->edit           = NULL;     
-	klass->load           = NULL;     
-	klass->save           = NULL;     
-	klass->get_title      = NULL;     
-	klass->clone          = NULL;
-
-	klass->changed        = NULL;
-
-	gal_view_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GalViewClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, gal_view_signals, LAST_SIGNAL);
-}
-
-GtkType
-gal_view_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalView",
-			sizeof (GalView),
-			sizeof (GalViewClass),
-			(GtkClassInitFunc) gal_view_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
deleted file mode 100644
index 5cc7cc679c..0000000000
--- a/widgets/menus/gal-view.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_H_
-#define _GAL_VIEW_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_TYPE        (gal_view_get_type ())
-#define GAL_VIEW(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_TYPE, GalView))
-#define GAL_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_TYPE, GalViewClass))
-#define GAL_IS_VIEW(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_TYPE))
-#define GAL_IS_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_TYPE))
-
-typedef struct {
-	GtkObject base;
-} GalView;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	void        (*edit)           (GalView    *view);
-	void        (*load)           (GalView    *view,
-				       const char *filename);
-	void        (*save)           (GalView    *view,
-				       const char *filename);
-	const char *(*get_title)      (GalView    *view);
-	void        (*set_title)      (GalView    *view,
-				       const char *title);
-	const char *(*get_type_code)  (GalView    *view);
-	GalView    *(*clone)          (GalView    *view);
-
-	/* Signals */
-	void        (*changed)        (GalView    *view);
-} GalViewClass;
-
-/* Standard functions */
-GtkType     gal_view_get_type       (void);
-
-/* Open an editor dialog for this view. */
-void        gal_view_edit           (GalView    *view);
-
-/* xml load and save functions */
-void        gal_view_load           (GalView    *view,
-				     const char *filename);
-void        gal_view_save           (GalView    *view,
-				     const char *filename);
-
-/* Title functions */
-const char *gal_view_get_title      (GalView    *view);
-void        gal_view_set_title      (GalView    *view,
-				     const char *title);
-
-/* View type. */
-const char *gal_view_get_type_code  (GalView    *view);
-
-/* Cloning the view */
-GalView    *gal_view_clone          (GalView    *view);
-
-/* Changed signal */
-void        gal_view_changed        (GalView    *view);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_H_ */
diff --git a/widgets/misc/.cvsignore b/widgets/misc/.cvsignore
deleted file mode 100644
index f7ea0db71c..0000000000
--- a/widgets/misc/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-test-title-bar
-test-calendar
-test-dateedit
-test-dropdown-button
\ No newline at end of file
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
deleted file mode 100644
index 8d4c3917c6..0000000000
--- a/widgets/misc/ChangeLog
+++ /dev/null
@@ -1,403 +0,0 @@
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c: New type of search bar that interacts with
-	filter contexts to save filters etc.  Still probably needs a
-	little cleanpu.
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Save the dropdown menu in the
-	struct too.  Sigh, this is only so we can scan its content later,
-	ick.
-	(e_search_bar_set_menu_sensitive): New function to se tthe
-	sentisitivty of menyu items based on id.
-	(find_id): New function to find the row and widget for a specific
-	id.
-	(add_option): Renamed to set_option.
-	(add_dropdown): Renamed to set_dropdown.
-	(add_dropdown): ?New function to add a single item.
-	(set_dropdown): Call add_dropdown to add each item.
-	(e_search_bar_add_menu): New public function to add a single item.
-
-2001-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): Added filter-bar.[ch].
-
-	* e-search-bar.c (class_init): Init virtual functions.
-	(e_search_bar_set_option):
-	(e_search_bar_set_menu): virtualise calling.
-	(e_search_bar_construct): Call virtual functions to setup menus.
-
-	* e-search-bar.h (struct _ESearchBarClass): Virtualise
-	add_dropdown/add_option, so certain base options can be created.
-
-2001-02-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.[hc]: new files to implement an ECell for showing
-	and editing dates & times. (Unfinished)
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-cell-date-edit.[hc]
-
-2001-02-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Move the event box into the
-	esb->dropdown_holder.  Changed so it can be called again on the
-	same esb, to rebuild the menu.
-	(e_search_bar_set_menu): New function to (re)set the menu.
-	(add_option): Setup so it can be re-called to rebuild the option
-	list.
-	(e_search_bar_set_option): New function to build the menu's.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Ignore test-dropdown-button
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_spacer): Make the spacer 4 pixels wider.
-	(add_dropdown): Put the dropdown button into an event box with a
-	1-pixel border, so that we match the [Hardcoded! Stupid GTK+!]
-	border around the option menu.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (menu_deactivate_cb): New function to change
-	the state of the toggle button when the pop-up menu disappears.
-	(impl_clicked): Removed.
-	(impl_button_press_event): New, implementation for
-	`::button_press_event'.  Pop-up the menu, and toggle the button.
-	(class_init): Override `::button_press_event' with
-	`impl_button_press_event'; don't override `::clicked' anymore.
-
-	* e-dropdown-button.h, e-dropdown-button.c: Derive from
-	`GtkToggleButton', instead of plain `GtkButton'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_dropdown): Make the dropdown button
-	non-focusable.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (e_search_bar_init): Don't create the widgets
-	here.
-	(e_search_bar_construct): New.  Do it here instead.
-	(e_search_bar_new): Call it.  Added preconditions.
-	(esb_pack_menubar): Removed.
-	(add_dropdown): New.
-	(add_option): New.
-	(add_entry): New.
-	(e_search_bar_construct): Use `add_dropdown()', `add_option()',
-	`add_entry()'.
-	(class_init): Renamed from `e_seearch_bar_class_init'.
-	(init): Renamed from `e_search_bar_init'.
-	(impl_destroy): Renamed from `e_search_bar_destroy'.
-	(emit_menu_activated): Renamed from `esb_menu_activated'.
-	(emit_query_changed): Renamed from `esb_query_changed'.
-	(menubar_activated_cb): Renamed from `esb_menubar_activated'.
-	(option_activated_cb): Renamed from `esb_option_activated'.
-	(esb_entry_activated): Renamed from `esb_entry_activated'.
-	(impl_set_arg): Renamed from `e_search_bar_set_arg'.
-	(impl_get_arg): Renamed from `e_search_bar_get_arg'.
-
-	* e-search-bar.h (struct _ESearchBar): Removed member `menubar';
-	replaced it with `dropdown'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (e_dropdown_button_construct): Removed
-	@ui_info and @data args.  Obviously I am not very smart at this
-	time of the night.
-	(e_dropdown_button_new): Likewise.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c, e-dropdown-button.h: New.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.[hc]: e_calendar_item_get_date_range() now returns
-	a boolean, which is FALSE if no dates are currently shown.
-	Plus a couple of minor sanity checks.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar.c (e_calendar_init): Unset the GTK_CAN_FOCUS flag on
-	the ECalendar.
-	(e_calendar_focus_in): Removed function since it did nothing.
-	(e_calendar_focus_out): Likewise.
-	(e_calendar_key_press): Likewise.
-	(e_calendar_init): Turn off the GTK_CAN_FOCUS flag for both arrow
-	buttons.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_set_max_days_sel): Make zero
-	the minimum number of days that can be specified.
-	(e_calendar_item_set_arg): We do need an update when the maximum
-	number of selected days is changed.
-	(e_calendar_item_set_max_days_sel): Request an update of the
-	canvas item.
-	(e_calendar_item_button_press): Do not start selecting days if the
-	max_days_selected is less than 1.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Oops. Delete this. I
-	never meant for this to get commit'd.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Dont remove the function, give
-	it the proper name
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_checkbox): Remove the version
-	returning `const char *' as of course it doesn't compile.  Please
-	compile before committing.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added e-messagebox to the build.
-
-	* e-messagebox.[c,h]: Added a new messagebox window that contains
-	a checkbox for "Don't show me this again."
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* e-search-bar.[ch]: Moved here from $(toplevel)/filter.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar-item.h: add prototypes
-
-	* e-calendar-item.c (e_calendar_item_init): Set max_days_selected to
-	1 and days_to_start_week_selection to -1 as documented in header
-	(e_calendar_item_set_arg): use new accessor methods
-	(e_calendar_item_get_arg): ditto
-	(e_calendar_item_get_max_days_sel): accessor
-	(e_calendar_item_set_max_days_sel): ditto
-	(e_calendar_item_get_days_start_week_sel): ditto
-	(e_calendar_item_set_days_start_week_sel): ditto
-	(e_calendar_item_class_init): add display_popup argument
-	(e_calendar_item_init): initialize display_popup member
-	(e_calendar_item_get_arg): get display_popup member
-	(e_calendar_item_set_arg): set display_popup member
-	(e_calendar_item_button_press): only show the popup menu if the
-	member is set
-	(e_calendar_item_get_display_popup): acessor
-	(e_calendar_item_set_display_popup): ditto
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h: #include <time.h>
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar.c (e_calendar_destroy): Call the parent class destroyer
-	as well
-
-2000-10-26  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.[hc]: updated to emit "changed" when appropriate, which
-	turned out to be amazingly difficult :(
-	Also added e_date_edit_get/set_date() to get/set just the date.
-	Added e_date_edit_date_is_valid() & e_date_edit_time_is_valid() so
-	you can check if the user has tried to enter an invalid date.
-	(All the get_date/time functions return the last valid date entered.)
-
-	* test-dateedit.c: updated a bit.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h (EDateEditClass): Removed the "time_changed"
-	signal, since it was never being emitted in the first place.  Time
-	values *are* both date and time together anyways, so whenever one
-	changes we should notify about the whole date/time value being
-	changed.
-	Renamed the remaining "date_changed" signal to just "changed".
-
-	* e-dateedit.c (e_date_edit_class_init): Do not create the
-	"time_changed" signal; rename the other one to "changed".
-	(set_time): Moved the core functionality from
-	e_date_edit_set_time() to here.  This function just sets the
-	widgets' values without emitting any signals.
-	(e_date_edit_set_time): Emit the "changed" signal unconditionally.
-	This is to be consistent with the rest of the GTK+ widgets, and it
-	actually makes writing client code easier.
-	(e_date_edit_new): Use set_time().
-	(on_date_popup_now_button_clicked): Do not emit the signal here.
-	(on_date_popup_none_button_clicked): Likewise.
-	(e_date_edit_set_time_of_day): Emit the signal, since we do not
-	call e_date_edit_set_time().
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar-item.c: #include <string.h> to get rid of warning.
-	* e-clipped-label.c: Same here.
-	
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.c (e_date_edit_destroy): Do not unref the cal_popup
-	since we already destroyed it.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_recalc_sizes): fixed to
-	recalculate min_cell_width/height in case the show_week_numbers option
-	is changed.
-
-	* e-dateedit.c: added support for hiding the date field, and added
-	get/set_time_of_day() functions to get/set just the time.
-
-2000-09-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c: 
-	* e-dateedit.c: better i18n of strftime strings.
-
-2000-09-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c: New member `pin_gtk_pixmap' in
-	`ETitleBarPrivate'.  Signal "close_button_clicked" renamed to
-	"button_clicked".  Signal "title_button_press_event" renamed to
-	"label_button_press_event".
-	(init): Init new members.
-	(close_button_realize_cb): Create the pin pixmap.  Call
-	`show_and_hide_pixmaps_according_to_mode()'.
-	(e_title_bar_show_close_button): Renamed to
-	`e_title_bar_show_button'.
-	(e_title_bar_get_button_mode): New.
-	(e_title_bar_set_button_mode): New.
-
-2000-09-23  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar.c: use pixmaps instead of GtkArrows to look better.
-	Also set the canvas window's background when realized so that we can
-	set the button reliefs to none.
-
-2000-09-22  Damon Chaplin  <damon@helixcode.com>
-
-	* test-dateedit.c: updated a bit, adding a few EDateEdits with
-	different options.
-
-	* e-calendar-item.c (e_calendar_item_set_selection): aborted any
-	current selection operation and initialize all of the selection fields.
-	(e_calendar_item_unmap): new function to abort any current selection
-	operation. Otherwise GnomeCanvas gets in a muddle about grabs.
-
-	* e-dateedit.c: marked some strftime()/strptime() format strings for
-	translation and used "%m/%d/%Y" instead of "%x" so we get the complete
-	year number. Also changed e_date_edit_get_time() so it returns -2 if
-	it can't parse the date or time, and -1 if it is explicitly set to
-	None.
-	(e_date_edit_parse_date): new function to parse the date string and
-	add on the current century if a year of 0-99 is entered.
-
-2000-09-21  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.c (on_date_button_clicked): only check return of strptime
-	for NULL. It should now select the correct day set in the popup.
-
-	* e-calendar.c: 
-	* e-calendar-item.c: 
-	* test-calendar.c: removed support for buttons within the ECalendar.
-	It is cleaner to add them outside it, as EDateEdit does.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-dateedit.c (_XOPEN_SOURCE): set this to 4 to specify how much
-	X/Open we want with that.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c:
-	Fixed the #include lines to deal properly with gal.
-
-	* e-scroll-frame.c, e-scroll-frame.h: Moved to gal.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-dateedit.[hc]
-	and the test-dateedit app.
-
-	* e-dateedit.[hc]: new widget to use instead of GnomeDateEdit. It
-	uses the new ECalendar widget for the calendar and also supports
-	"None", "Today" and "Now" buttons, and goes away with a single click.
-
-	* test-dateedit.c: app to test the EDateEdit widget.
-
-	* e-calendar-item.c: updated to support the EDateEdit better,
-	mainly by adding the "move_selection_when_moving" arg so we can turn
-	it off to keep the same day selected when changing the months shown.
-
-2000-09-05  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_draw_month): make sure we get
-	the start_weekday since we need it for draw_days(). Fixes a drawing
-	bug.
-
-2000-08-31  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_button_press): 
-	(e_calendar_item_button_release): grab/ungrab the pointer so we
-	always get the button_release event.
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.[hc]: 
-	* e-calendar.[hc]: Updated.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-calendar-item.c, e-calendar.c: Fixed some warnings.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.h: 
-	* e-calendar.[hc]: new widget and canvas item to replace GtkCalendar.
-	Not quite finished yet.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (e_title_bar_set_title): We have a `EClippedLabel',
-	not a `GtkLabel' here: use the right function to change the text.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-scroll-frame.c: Tried rearranging the casts to try for a more
-	correct computation.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-scroll-frame.c (e_scroll_frame_add): comment out true but
-	confused warning about non-scrollable widgets until Chris and/or
-	Federico fix this correctly.
-	(e_scroll_frame_size_allocate): If the available space for the
-	child is less than the width/height of the frame, give the child
-	an allocation of 0 rather than some small negative number cast to
-	unsigned.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Set G_LOG_DOMAIN=__FILE__ rather than
-	"e-title-bar" in all three widgets.
-
-2000-06-13  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Control does 
-	horizontal scrolling, a la gimp.
-
-2000-06-11  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Add support
-	for mouse wheel scrolling in EScrollFrame.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (close_button_realize_cb): Unref the pixmap and
-	the mask.
-
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
deleted file mode 100644
index 401aac64a0..0000000000
--- a/widgets/misc/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# FIXME we use the EClippedLabel widget from EShortcutBar.  Probably
-# it should be moved somewhere else.
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets/shortcut-bar	\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=__FILE__
-
-noinst_LIBRARIES =	\
-	libemiscwidgets.a
-
-libemiscwidgets_a_SOURCES = 	\
-	e-calendar.c		\
-	e-calendar.h		\
-	e-calendar-item.c	\
-	e-calendar-item.h	\
-	e-cell-date-edit.c	\
-	e-cell-date-edit.h	\
-	e-clipped-label.c	\
-	e-clipped-label.h	\
-	e-dateedit.c		\
-	e-dateedit.h		\
-	e-dropdown-button.c	\
-	e-dropdown-button.h	\
-	e-filter-bar.c		\
-	e-filter-bar.h		\
-	e-messagebox.c		\
-	e-messagebox.h		\
-	e-search-bar.c		\
-	e-search-bar.h		\
-	e-title-bar.c		\
-	e-title-bar.h
-
-noinst_PROGRAMS = 		\
-	test-calendar		\
-	test-dateedit		\
-	test-dropdown-button	\
-	test-title-bar
-
-# test-calendar
-
-test_calendar_SOURCES = 	\
-	test-calendar.c
-
-test_calendar_LDADD = 						\
-	./libemiscwidgets.a					\
-	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
-
-# test-dateedit
-
-test_dateedit_SOURCES = 	\
-	test-dateedit.c
-
-test_dateedit_LDADD = 						\
-	./libemiscwidgets.a					\
-	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
-
-# test-dropdown-button
-
-test_dropdown_button_SOURCES = 	\
-	test-dropdown-button.c
-
-test_dropdown_button_LDADD =	\
-	./libemiscwidgets.a	\
-	$(EXTRA_GNOME_LIBS)
-
-# test-title-bar
-
-test_title_bar_SOURCES = 	\
-	test-title-bar.c
-
-test_title_bar_LDADD = 						\
-	./libemiscwidgets.a					\
-	$(EXTRA_GNOME_LIBS)
-
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
deleted file mode 100644
index 32b2c62d33..0000000000
--- a/widgets/misc/e-calendar-item.c
+++ /dev/null
@@ -1,2885 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendarItem - canvas item displaying a calendar.
- */
-
-#include <config.h>
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include "e-calendar-item.h"
-
-
-/*
- * These are the padding sizes between various pieces of the calendar.
- */
-
-/* The minimum padding around the numbers in each cell/day. */
-#define	E_CALENDAR_ITEM_MIN_CELL_XPAD	4
-#define	E_CALENDAR_ITEM_MIN_CELL_YPAD	0
-
-/* Vertical padding. */
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS		1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS		0
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_CELLS		1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_CELLS		2
-
-/* Horizontal padding in the heading bars. */
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME_WITH_BUTTON	16
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME			3
-#define	E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME			3
-#define	E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME_WITH_BUTTON	16
-
-/* Horizontal padding in the month displays. */
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS	4
-#define	E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS		2
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_CELLS		1
-#define	E_CALENDAR_ITEM_XPAD_AFTER_CELLS		4
-
-/* The number of rows & columns of days in each month. */
-#define E_CALENDAR_ROWS_PER_MONTH	6
-#define E_CALENDAR_COLS_PER_MONTH	7
-
-static const int e_calendar_item_days_in_month[12] = {
-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-#define DAYS_IN_MONTH(year, month) \
-  e_calendar_item_days_in_month[month] + (((month) == 1 \
-  && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0)
-
-
-static void e_calendar_item_class_init	(ECalendarItemClass *class);
-static void e_calendar_item_init	(ECalendarItem	 *calitem);
-static void e_calendar_item_destroy	(GtkObject	 *o);
-static void e_calendar_item_get_arg	(GtkObject	 *o,
-					 GtkArg		 *arg,
-					 guint		  arg_id);
-static void e_calendar_item_set_arg	(GtkObject	 *o,
-					 GtkArg		 *arg,
-					 guint		  arg_id);
-static void e_calendar_item_realize	(GnomeCanvasItem *item);
-static void e_calendar_item_unrealize	(GnomeCanvasItem *item);
-static void e_calendar_item_unmap	(GnomeCanvasItem *item);
-static void e_calendar_item_update	(GnomeCanvasItem *item,
-					 double		 *affine,
-					 ArtSVP		 *clip_path,
-					 int		  flags);
-static void e_calendar_item_draw	(GnomeCanvasItem *item,
-					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height);
-static void e_calendar_item_draw_month	(ECalendarItem   *calitem,
-					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height,
-					 int		  row,
-					 int		  col);
-static void e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
-					      GdkDrawable	*drawable,
-					      int		 width,
-					      int		 height,
-					      int		 row,
-					      int		 col,
-					      int		 year,
-					      int		 month,
-					      int		 start_weekday,
-					      gint		 cells_x,
-					      gint		 cells_y);
-static double e_calendar_item_point	(GnomeCanvasItem *item,
-					 double		  x,
-					 double		  y,
-					 int		  cx,
-					 int		  cy,
-					 GnomeCanvasItem **actual_item);
-static gint e_calendar_item_event	(GnomeCanvasItem *item,
-					 GdkEvent	 *event);
-static gboolean e_calendar_item_button_press	(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-static gboolean e_calendar_item_button_release	(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-static gboolean e_calendar_item_motion		(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-
-static gboolean e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
-							 gint		 x,
-							 gint		 y,
-							 gboolean	 round_empty_positions,
-							 gint		*month_offset,
-							 gint		*day,
-							 gboolean	*entire_week);
-static void e_calendar_item_get_month_info	(ECalendarItem	*calitem,
-						 gint		 row,
-						 gint		 col,
-						 gint		*first_day_offset,
-						 gint		*days_in_month,
-						 gint		*days_in_prev_month);
-static void e_calendar_item_recalc_sizes(ECalendarItem *calitem);
-
-static gint e_calendar_item_get_week_number	(ECalendarItem *calitem,
-						 gint		day,
-						 gint		month,
-						 gint		year);
-
-static void e_calendar_item_get_day_style	(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day,
-						 gint		 day_style,
-						 gboolean	 today,
-						 gboolean	 prev_or_next_month,
-						 gboolean	 selected,
-						 gboolean	 has_focus,
-						 gboolean	 drop_target,
-						 GdkColor      **bg_color,
-						 GdkColor      **fg_color,
-						 GdkColor      **box_color,
-						 gboolean	*bold);
-static void e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
-						 gint		 start_month,
-						 gint		 start_day,
-						 gint		*end_month,
-						 gint		*end_day);
-static void e_calendar_item_check_selection_start(ECalendarItem	*calitem,
-						  gint		*start_month,
-						  gint		*start_day,
-						  gint		 end_month,
-						  gint		 end_day);
-static void e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-						 gint		*year,
-						 gint		*month);
-static void e_calendar_item_add_days_to_selection(ECalendarItem	*calitem,
-						  gint		 days);
-static void e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
-						 gint		*month_offset,
-						 gint		*day);
-static void e_calendar_item_round_down_selection (ECalendarItem	*calitem,
-						  gint		*month_offset,
-						  gint		*day);
-static gint e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
-						 gint		 start_month_offset,
-						 gint		 start_day,
-						 gint		 end_month_offset,
-						 gint		 end_day);
-static void e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
-						 gint		*month_offset,
-						 gint		*day);
-static gboolean e_calendar_item_ensure_days_visible (ECalendarItem	*calitem,
-						     gint		 start_year,
-						     gint		 start_month,
-						     gint		 start_day,
-						     gint		 end_year,
-						     gint		 end_month,
-						     gint		 end_day);
-static void e_calendar_item_show_popup_menu	(ECalendarItem	*calitem,
-						 GdkEventButton	*event,
-						 gint		 month_offset);
-static void e_calendar_item_on_menu_item_activate(GtkWidget	*menuitem,
-						  ECalendarItem	*calitem);
-static void e_calendar_item_position_menu	(GtkMenu            *menu,
-						 gint               *x,
-						 gint               *y,
-						 gpointer            user_data);
-static void e_calendar_item_date_range_changed	(ECalendarItem	*calitem);
-static void e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem);
-static gboolean e_calendar_item_signal_emission_idle_cb	(gpointer data);
-
-/* Our arguments. */
-enum {
-	ARG_0,
-	ARG_YEAR,
-	ARG_MONTH,
-	ARG_X1,
-	ARG_Y1,
-	ARG_X2,
-	ARG_Y2,
-	ARG_FONT,
-	ARG_WEEK_NUMBER_FONT,
-	ARG_ROW_HEIGHT,
-	ARG_COLUMN_WIDTH,
-	ARG_MINIMUM_ROWS,
-	ARG_MINIMUM_COLUMNS,
-	ARG_MAXIMUM_ROWS,
-	ARG_MAXIMUM_COLUMNS,
-	ARG_WEEK_START_DAY,
-	ARG_SHOW_WEEK_NUMBERS,
-	ARG_MAXIMUM_DAYS_SELECTED,
-	ARG_DAYS_TO_START_WEEK_SELECTION,
-	ARG_MOVE_SELECTION_WHEN_MOVING,
-	ARG_ROUND_SELECTION_WHEN_MOVING,
-	ARG_DISPLAY_POPUP
-};
-
-enum {
-  DATE_RANGE_CHANGED,
-  SELECTION_CHANGED,
-  LAST_SIGNAL
-};
-
-
-static GnomeCanvasItemClass *parent_class;
-static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 };
-
-
-E_MAKE_TYPE (e_calendar_item, "ECalendarItem", ECalendarItem,
-	     e_calendar_item_class_init, e_calendar_item_init,
-	     GNOME_TYPE_CANVAS_ITEM)
-
-
-static void
-e_calendar_item_class_init (ECalendarItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("ECalendarItem::year",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_YEAR);
-	gtk_object_add_arg_type ("ECalendarItem::month",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MONTH);
-	gtk_object_add_arg_type ("ECalendarItem::x1",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_X1);
-	gtk_object_add_arg_type ("ECalendarItem::y1",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_Y1);
-	gtk_object_add_arg_type ("ECalendarItem::x2",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_X2);
-	gtk_object_add_arg_type ("ECalendarItem::y2",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_Y2);
-	gtk_object_add_arg_type ("ECalendarItem::font",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE,
-				 ARG_FONT);
-	gtk_object_add_arg_type ("ECalendarItem::week_number_font",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE,
-				 ARG_WEEK_NUMBER_FONT);
-	gtk_object_add_arg_type ("ECalendarItem::row_height",
-				 GTK_TYPE_INT, GTK_ARG_READABLE,
-				 ARG_ROW_HEIGHT);
-	gtk_object_add_arg_type ("ECalendarItem::column_width",
-				 GTK_TYPE_INT, GTK_ARG_READABLE,
-				 ARG_COLUMN_WIDTH);
-	gtk_object_add_arg_type ("ECalendarItem::minimum_rows",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MINIMUM_ROWS);
-	gtk_object_add_arg_type ("ECalendarItem::minimum_columns",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MINIMUM_COLUMNS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_rows",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_ROWS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_columns",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_COLUMNS);
-	gtk_object_add_arg_type ("ECalendarItem::week_start_day",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_WEEK_START_DAY);
-	gtk_object_add_arg_type ("ECalendarItem::show_week_numbers",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_SHOW_WEEK_NUMBERS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_days_selected",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_DAYS_SELECTED);
-	gtk_object_add_arg_type ("ECalendarItem::days_to_start_week_selection",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_DAYS_TO_START_WEEK_SELECTION);
-	gtk_object_add_arg_type ("ECalendarItem::move_selection_when_moving",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_MOVE_SELECTION_WHEN_MOVING);
-	gtk_object_add_arg_type ("ECalendarItem::round_selection_when_moving",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_ROUND_SELECTION_WHEN_MOVING);
-	gtk_object_add_arg_type ("ECalendarItem::display_popup",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_DISPLAY_POPUP);
-
-	e_calendar_item_signals[DATE_RANGE_CHANGED] =
-		gtk_signal_new ("date_range_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECalendarItemClass, date_range_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	e_calendar_item_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECalendarItemClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_calendar_item_signals,
-				      LAST_SIGNAL);
-
-
-	object_class->destroy = e_calendar_item_destroy;
-	object_class->get_arg = e_calendar_item_get_arg;
-	object_class->set_arg = e_calendar_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_calendar_item_realize;
-	item_class->unrealize   = e_calendar_item_unrealize;
-	item_class->unmap	= e_calendar_item_unmap;
-	item_class->update      = e_calendar_item_update;
-	item_class->draw        = e_calendar_item_draw;
-	item_class->point       = e_calendar_item_point;
-	item_class->event       = e_calendar_item_event;
-
-	class->date_range_changed	= NULL;
-	class->selection_changed	= NULL;
-}
-
-
-static void
-e_calendar_item_init (ECalendarItem *calitem)
-{
-	struct tm *tmp_tm;
-	time_t t;
-
-	/* Set the default time to the current month. */
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-	calitem->year = tmp_tm->tm_year + 1900;
-	calitem->month = tmp_tm->tm_mon;
-
-	calitem->styles = NULL;
-
-	calitem->min_cols = 1;
-	calitem->min_rows = 1;
-	calitem->max_cols = -1;
-	calitem->max_rows = -1;
-
-	calitem->rows = 0;
-	calitem->cols = 0;
-
-	calitem->show_week_numbers = FALSE;
-	calitem->week_start_day = 0;
-	calitem->expand = TRUE;
-	calitem->max_days_selected = 1;
-	calitem->days_to_start_week_selection = -1;
-	calitem->move_selection_when_moving = TRUE;
-	calitem->round_selection_when_moving = FALSE;
-	calitem->display_popup = TRUE;
-	
-	calitem->x1 = 0.0;
-	calitem->y1 = 0.0;
-	calitem->x2 = 0.0;
-	calitem->y2 = 0.0;
-
-	calitem->selection_set = FALSE;
-
-	calitem->selection_changed = FALSE;
-	calitem->date_range_changed = FALSE;
-
-	calitem->style_callback = NULL;
-	calitem->style_callback_destroy = NULL;
-
-	/* Translators: These are the first characters of each day of the
-	   week, 'M' for 'Monday', 'T' for Tuesday etc. */
-	calitem->days = _("MTWTFSS");
-
-	calitem->signal_emission_idle_id = 0;
-}
-
-
-static void
-e_calendar_item_destroy		(GtkObject *o)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (o);
-
-	e_calendar_item_set_style_callback (calitem, NULL, NULL, NULL);
-
-	g_free (calitem->styles);
-
-	if (calitem->signal_emission_idle_id != 0) {
-		g_source_remove (calitem->signal_emission_idle_id);
-		calitem->signal_emission_idle_id = 0;
-	}
-
-	if (calitem->old_font)
-		gdk_font_unref (calitem->old_font);
-	if (calitem->old_week_number_font)
-		gdk_font_unref (calitem->old_week_number_font);
-}
-
-
-static void
-e_calendar_item_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECalendarItem *calitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	calitem = E_CALENDAR_ITEM (o);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		GTK_VALUE_INT (*arg) = calitem->year;
-		break;
-	case ARG_MONTH:
-		GTK_VALUE_INT (*arg) = calitem->month;
-		break;
-	case ARG_X1:
-		GTK_VALUE_DOUBLE (*arg) = calitem->x1;
-		break;
-	case ARG_Y1:
-		GTK_VALUE_DOUBLE (*arg) = calitem->y1;
-		break;
-	case ARG_X2:
-		GTK_VALUE_DOUBLE (*arg) = calitem->x2;
-		break;
-	case ARG_Y2:
-		GTK_VALUE_DOUBLE (*arg) = calitem->y2;
-		break;
-	case ARG_FONT:
-		GTK_VALUE_BOXED (*arg) = calitem->font;
-		break;
-	case ARG_WEEK_NUMBER_FONT:
-		GTK_VALUE_BOXED (*arg) = calitem->week_number_font;
-		break;
-	case ARG_ROW_HEIGHT:
-		e_calendar_item_recalc_sizes (calitem);
-		GTK_VALUE_INT (*arg) = calitem->min_month_height;
-		break;
-	case ARG_COLUMN_WIDTH:
-		e_calendar_item_recalc_sizes (calitem);
-		GTK_VALUE_INT (*arg) = calitem->min_month_width;
-		break;
-	case ARG_MINIMUM_ROWS:
-		GTK_VALUE_INT (*arg) = calitem->min_rows;
-		break;
-	case ARG_MINIMUM_COLUMNS:
-		GTK_VALUE_INT (*arg) = calitem->min_cols;
-		break;
-	case ARG_MAXIMUM_ROWS:
-		GTK_VALUE_INT (*arg) = calitem->max_rows;
-		break;
-	case ARG_MAXIMUM_COLUMNS:
-		GTK_VALUE_INT (*arg) = calitem->max_cols;
-		break;
-	case ARG_WEEK_START_DAY:
-		GTK_VALUE_INT (*arg) = calitem->week_start_day;
-		break;
-	case ARG_SHOW_WEEK_NUMBERS:
-		GTK_VALUE_BOOL (*arg) = calitem->show_week_numbers;
-		break;
-	case ARG_MAXIMUM_DAYS_SELECTED:
-		GTK_VALUE_INT (*arg) = e_calendar_item_get_max_days_sel (calitem);
-		break;
-	case ARG_DAYS_TO_START_WEEK_SELECTION:
-		GTK_VALUE_INT (*arg) = e_calendar_item_get_days_start_week_sel (calitem);
-		break;
-	case ARG_MOVE_SELECTION_WHEN_MOVING:
-		GTK_VALUE_BOOL (*arg) = calitem->move_selection_when_moving;
-		break;
-	case ARG_ROUND_SELECTION_WHEN_MOVING:
-		GTK_VALUE_BOOL (*arg) = calitem->round_selection_when_moving;
-		break;
-	case ARG_DISPLAY_POPUP:
-		GTK_VALUE_BOOL (*arg) = e_calendar_item_get_display_popup (calitem);
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-}
-
-
-static void
-e_calendar_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECalendarItem *calitem;
-	GdkFont *font;
-	gboolean need_update = FALSE;
-	gdouble dvalue;
-	gint ivalue;
-	gboolean bvalue;
-
-	item = GNOME_CANVAS_ITEM (o);
-	calitem = E_CALENDAR_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_YEAR:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_first_month (calitem, ivalue,
-						 calitem->month);
-		break;
-	case ARG_MONTH:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 ivalue);
-		break;
-	case ARG_X1:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->x1 != dvalue) {
-			calitem->x1 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_Y1:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->y1 != dvalue) {
-			calitem->y1 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_X2:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->x2 != dvalue) {
-			calitem->x2 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_Y2:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->y2 != dvalue) {
-			calitem->y2 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_FONT:
-		font = GTK_VALUE_BOXED (*arg);
-		if (calitem->font != font) {
-			if (calitem->font)
-				gdk_font_unref (calitem->font);
-			calitem->font = font;
-			if (font)
-				gdk_font_ref (font);
-			need_update = TRUE;
-		}
-		break;
-	case ARG_WEEK_NUMBER_FONT:
-		font = GTK_VALUE_BOXED (*arg);
-		if (calitem->week_number_font != font) {
-			if (calitem->week_number_font)
-				gdk_font_unref (calitem->week_number_font);
-			calitem->week_number_font = font;
-			if (font)
-				gdk_font_ref (font);
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MINIMUM_ROWS:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = MAX (1, ivalue);
-		if (calitem->min_rows != ivalue) {
-			calitem->min_rows = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MINIMUM_COLUMNS:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = MAX (1, ivalue);
-		if (calitem->min_cols != ivalue) {
-			calitem->min_cols = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_ROWS:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->max_rows != ivalue) {
-			calitem->max_rows = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_COLUMNS:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->max_cols != ivalue) {
-			calitem->max_cols = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_WEEK_START_DAY:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->week_start_day != ivalue) {
-			calitem->week_start_day = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_SHOW_WEEK_NUMBERS:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (calitem->show_week_numbers != bvalue) {
-			calitem->show_week_numbers = bvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_DAYS_SELECTED:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_max_days_sel (calitem, ivalue);
-		break;
-	case ARG_DAYS_TO_START_WEEK_SELECTION:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_days_start_week_sel (calitem, ivalue);
-		break;
-	case ARG_MOVE_SELECTION_WHEN_MOVING:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		calitem->move_selection_when_moving = bvalue;
-		break;
-	case ARG_ROUND_SELECTION_WHEN_MOVING:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		calitem->round_selection_when_moving = bvalue;
-		break;
-	case ARG_DISPLAY_POPUP:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		e_calendar_item_set_display_popup (calitem, bvalue);
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-
-	if (need_update) {
-		gnome_canvas_item_request_update (item);
-	}
-}
-
-
-static void
-e_calendar_item_realize		(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_ITEM_COLOR_LAST];
-	gint nfailed;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].red   = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].green = 0;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].blue  = 0;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].red   = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].green = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].blue  = 65535;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].red   = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].green = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].blue  = 48000;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].red   = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].green = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].blue  = 48000;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, calitem->colors,
-					     E_CALENDAR_ITEM_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-}
-
-
-static void
-e_calendar_item_unrealize	(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-	GdkColormap *colormap;
-	gint i;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-
-	for (i = 0; i < E_CALENDAR_ITEM_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &calitem->colors[i].pixel, 1, 0);
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-
-static void
-e_calendar_item_unmap		(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	if (calitem->selecting) {
-		gnome_canvas_item_ungrab (item, GDK_CURRENT_TIME);
-		calitem->selecting = FALSE;
-	}
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unmap)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unmap) (item);
-}
-
-
-static void
-e_calendar_item_update		(GnomeCanvasItem *item,
-				 double		 *affine,
-				 ArtSVP		 *clip_path,
-				 int		  flags)
-{
-	ECalendarItem *calitem;
-	GtkStyle *style;
-	GdkFont *font;
-	gint char_height, width, height, space, space_per_cal, space_per_cell;
-	gint rows, cols, xthickness, ythickness;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	calitem = E_CALENDAR_ITEM (item);
-	style = GTK_WIDGET (item->canvas)->style;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-
-	item->x1 = calitem->x1;
-	item->y1 = calitem->y1;
-	item->x2 = calitem->x2 >= calitem->x1 ? calitem->x2 : calitem->x1;
-	item->y2 = calitem->y2 >= calitem->y1 ? calitem->y2 : calitem->y1;
-
-	/*
-	 * Calculate the new layout of the calendar.
-	 */
-
-	/* Make sure the minimum row width & cell height and the widths of
-	   all the digits and characters are up to date. */
-	e_calendar_item_recalc_sizes (calitem);
-
-	/* Calculate how many rows & cols we can fit in. */
-	width = item->x2 - item->x1;
-	height = item->y2 - item->y1;
-
-	width -= xthickness * 2;
-	height -= ythickness * 2;
-
-	if (calitem->min_month_height == 0)
-		rows = 1;
-	else
-		rows = height / calitem->min_month_height;
-	rows = MAX (rows, calitem->min_rows);
-	if (calitem->max_rows > 0)
-		rows = MIN (rows, calitem->max_rows);
-
-	if (calitem->min_month_width == 0)
-		cols = 1;
-	else
-		cols = width / calitem->min_month_width;
-	cols = MAX (cols, calitem->min_cols);
-	if (calitem->max_cols > 0)
-		cols = MIN (cols, calitem->max_cols);
-
-	if (rows != calitem->rows || cols != calitem->cols)
-		e_calendar_item_date_range_changed (calitem);
-
-	calitem->rows = rows;
-	calitem->cols = cols;
-
-	/* Split up the empty space according to the configuration.
-	   If the calendar is set to expand, we divide the space between the
-	   cells and the spaces around the calendar, otherwise we place the
-	   calendars in the center of the available area. */
-
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-
-	calitem->month_width = calitem->min_month_width;
-	calitem->month_height = calitem->min_month_height;
-	calitem->cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	calitem->cell_height = char_height
-		+ E_CALENDAR_ITEM_MIN_CELL_YPAD;
-	calitem->month_tpad = 0;
-	calitem->month_bpad = 0;
-	calitem->month_lpad = 0;
-	calitem->month_rpad = 0;
-
-	space = height - calitem->rows * calitem->month_height;
-	if (space > 0) {
-		space_per_cal = space / calitem->rows;
-		calitem->month_height += space_per_cal;
-
-		if (calitem->expand) {
-			space_per_cell = space_per_cal / E_CALENDAR_ROWS_PER_MONTH;
-			calitem->cell_height += space_per_cell;
-			space_per_cal -= space_per_cell * E_CALENDAR_ROWS_PER_MONTH;
-		}
-
-		calitem->month_tpad = space_per_cal / 2;
-		calitem->month_bpad = space_per_cal - calitem->month_tpad;
-	}
-
-	space = width - calitem->cols * calitem->month_width;
-	if (space > 0) {
-		space_per_cal = space / calitem->cols;
-		calitem->month_width += space_per_cal;
-		space -= space_per_cal * calitem->cols;
-
-		if (calitem->expand) {
-			space_per_cell = space_per_cal / E_CALENDAR_COLS_PER_MONTH;
-			calitem->cell_width += space_per_cell;
-			space_per_cal -= space_per_cell * E_CALENDAR_COLS_PER_MONTH;
-		}
-
-		calitem->month_lpad = space_per_cal / 2;
-		calitem->month_rpad = space_per_cal - calitem->month_lpad;
-	}
-
-	space = MAX (0, space);
-	calitem->x_offset = space / 2;
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
-				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height)
-{
-	ECalendarItem *calitem;
-	GtkStyle *style;
-	GdkFont *font;
-	GdkGC *base_gc, *bg_gc;
-	gint char_height, row, col, row_y, bar_height, col_x;
-	gint xthickness, ythickness;
-
-#if 0
-	g_print ("In e_calendar_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	calitem = E_CALENDAR_ITEM (canvas_item);
-	style = GTK_WIDGET (canvas_item->canvas)->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-	base_gc = style->base_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-
-	/* Clear the entire background. */
-	gdk_draw_rectangle (drawable, base_gc, TRUE,
-			    calitem->x1 - x, calitem->y1 - y,
-			    calitem->x2 - calitem->x1 + 1,
-			    calitem->y2 - calitem->y1 + 1);
-
-	/* Draw the shadow around the entire item. */
-	gtk_draw_shadow (style, drawable,
-			 GTK_STATE_NORMAL, GTK_SHADOW_IN,
-			 calitem->x1 - x, calitem->y1 - y,
-			 calitem->x2 - calitem->x1 + 1,
-			 calitem->y2 - calitem->y1 + 1);
-
-	row_y = canvas_item->y1 + ythickness;
-	bar_height = ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME;
-
-	for (row = 0; row < calitem->rows; row++) {
-		/* Draw the background for the title bars and the shadow around
-		   it, and the vertical lines between columns. */
-
-		gdk_draw_rectangle (drawable, bg_gc, TRUE,
-				    calitem->x1 + xthickness - x, row_y - y,
-				    calitem->x2 - calitem->x1 + 1
-				    - xthickness * 2,
-				    bar_height);
-
-		gtk_draw_shadow (style, drawable,
-				 GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-				 calitem->x1 + xthickness - x, row_y - y,
-				 calitem->x2 - calitem->x1 + 1
-				 - xthickness * 2,
-				 bar_height);
-
-
-		for (col = 0; col < calitem->cols; col++) {
-			if (col != 0) {
-				col_x = calitem->x1 + calitem->x_offset
-					+ calitem->month_width * col;
-				gtk_draw_vline (style, drawable,
-						GTK_STATE_NORMAL,
-						row_y + ythickness + 1 - y,
-						row_y + bar_height
-						- ythickness - 2 - y,
-						col_x - 1 - x);
-			}
-
-
-			e_calendar_item_draw_month (calitem, drawable, x, y,
-						    width, height, row, col);
-		}
-
-		row_y += calitem->month_height;
-	}
-}
-
-
-static void
-e_calendar_item_draw_month	(ECalendarItem   *calitem,
-				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height,
-				 int		  row,
-				 int		  col)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	GdkFont *font;
-	GdkGC *fg_gc;
-	struct tm tmp_tm;
-	GdkRectangle clip_rect;
-	gint char_height, xthickness, ythickness, start_weekday;
-	gint year, month;
-	gint month_x, month_y, month_w, month_h;
-	gint min_x, max_x, text_x, text_y;
-	gint day, day_index, cells_x, cells_y, min_cell_width, text_width;
-	gint clip_width, clip_height;
-	gchar buffer[64];
-
-#if 0
-	g_print ("In e_calendar_item_draw_month: %i,%i %ix%i row:%i col:%i\n",
-		 x, y, width, height, row, col);
-#endif
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-
-	/* Calculate the top-left position of the entire month display. */
-	month_x = item->x1 + xthickness + calitem->x_offset
-		+ col * calitem->month_width - x;
-	month_w = item->x2 - item->x1 - xthickness * 2;
-	month_w = MIN (month_w, calitem->month_width);
-	month_y = item->y1 + ythickness + row * calitem->month_height - y;
-	month_h = item->y2 - item->y1 - ythickness * 2;
-	month_h = MIN (month_h, calitem->month_height);
-
-	/* Just return if the month is outside the given area. */
-	if (month_x >= width || month_x + calitem->month_width <= 0
-	    || month_y >= height || month_y + calitem->month_height <= 0)
-		return;
-
-	month = calitem->month + row * calitem->cols + col;
-	year = calitem->year + month / 12;
-	month %= 12;
-
-	/* Draw the month name & year, with clipping. Note that the top row
-	   needs extra space around it for the buttons. */
-	if (row == 0 && col == 0)
-		min_x = E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME_WITH_BUTTON;
-	else
-		min_x = E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME;
-
-	max_x = month_w;
-	if (row == 0 && col == calitem->cols - 1)
-		max_x -= E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME_WITH_BUTTON;
-	else
-		max_x -= E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME;
-
-	text_y = month_y + style->klass->ythickness
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME;
-	clip_rect.x = month_x + min_x;
-	clip_rect.x = MAX (0, clip_rect.x);
-	clip_rect.y = MAX (0, text_y);
-
-	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;
-
-	if (month_x + max_x - clip_rect.x > 0) {
-		clip_rect.width = month_x + max_x - clip_rect.x;
-		clip_rect.height = text_y + char_height - clip_rect.y;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		/* This is a strftime() format. %B = Month name, %Y = Year. */
-		strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm);
-
-		/* Ideally we place the text centered in the month, but we
-		   won't go to the left of the minimum x position. */
-		text_width = gdk_string_width (font, buffer);
-		text_x = (calitem->month_width - text_width) / 2;
-		text_x = MAX (min_x, text_x);
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 month_x + text_x, text_y + font->ascent, buffer);
-	}
-
-	/* Set the clip rectangle for the main month display. */
-	clip_rect.x = MAX (0, month_x);
-	clip_rect.y = MAX (0, month_y);
-	clip_width = month_x + month_w - clip_rect.x;
-	clip_height = month_y + month_h - clip_rect.y;
-
-	if (clip_width <= 0 || clip_height <= 0)
-		return;
-
-	clip_rect.width = clip_width;
-	clip_rect.height = clip_height;
-
-	gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-
-	/* Draw the day initials across the top of the month. */
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-
-	cells_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS + calitem->month_lpad
-		+ E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-	if (calitem->show_week_numbers)
-		cells_x += calitem->max_week_number_digit_width * 2
-			+ E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	text_x = cells_x + calitem->cell_width
-		- (calitem->cell_width - min_cell_width) / 2;
-	text_x -= E_CALENDAR_ITEM_MIN_CELL_XPAD / 2;
-	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;
-
-	cells_y = text_y + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-
-	text_y += font->ascent;
-	day_index = calitem->week_start_day;
-	for (day = 0; day < 7; day++) {
-		gdk_draw_text (drawable, font, fg_gc,
-			       text_x - calitem->day_widths[day_index], text_y,
-			       &calitem->days[day_index], 1);
-		text_x += calitem->cell_width;
-		day_index++;
-		if (day_index == 7)
-			day_index = 0;
-	}
-
-
-	/* Draw the horizontal line beneath the day initials. */
-	gdk_draw_line (drawable, fg_gc,
-		       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS,
-		       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1,
-		       cells_x + E_CALENDAR_COLS_PER_MONTH * calitem->cell_width - 1,
-		       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1);
-
-	e_calendar_item_draw_day_numbers (calitem, drawable, width, height,
-					  row, col, year, month, start_weekday,
-					  cells_x, cells_y);
-
-	/* Draw the vertical line after the week number. */
-	if (calitem->show_week_numbers) {
-		gdk_draw_line (drawable, fg_gc,
-			       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1,
-			       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1,
-			       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1,
-			       cells_y + E_CALENDAR_ROWS_PER_MONTH * calitem->cell_height - 1);
-	}
-
-	gdk_gc_set_clip_rectangle (fg_gc, NULL);
-}
-
-
-static void
-e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
-				  GdkDrawable	*drawable,
-				  int		 width,
-				  int		 height,
-				  int		 row,
-				  int		 col,
-				  int		 year,
-				  int		 month,
-				  int		 start_weekday,
-				  gint		 cells_x,
-				  gint		 cells_y)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	GdkFont *font, *wkfont;
-	GdkGC *fg_gc;
-	GdkColor *bg_color, *fg_color, *box_color;
-	struct tm *today_tm;
-	time_t t;
-	gint char_height, min_cell_width, min_cell_height;
-	gint day_num, drow, dcol, day_x, day_y;
-	gint text_x, text_y;
-	gint num_chars, digit;
-	gint week_num, mon, days_from_week_start;
-	gint years[3], months[3], days_in_month[3];
-	gboolean today, selected, has_focus = FALSE, drop_target = FALSE;
-	gboolean bold, draw_day, finished = FALSE;
-	gint today_year, today_month, today_mday, month_offset;
-	gchar buffer[2];
-	gint day_style = 0;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	wkfont = calitem->week_number_font;
-	if (!wkfont)
-		wkfont = font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	char_height = font->ascent + font->descent;
-
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	min_cell_height = char_height + E_CALENDAR_ITEM_MIN_CELL_YPAD;
-
-	/* Calculate the number of days in the previous, current, and next
-	   months. */
-	years[0] = years[1] = years[2] = year;
-	months[0] = month - 1;
-	months[1] = month;
-	months[2] = month + 1;
-	if (months[0] == -1) {
-		months[0] = 11;
-		years[0]--;
-	}
-	if (months[2] == 12) {
-		months[2] = 0;
-		years[2]++;
-	}
-
-	days_in_month[0] = DAYS_IN_MONTH (years[0], months[0]);
-	days_in_month[1] = DAYS_IN_MONTH (years[1], months[1]);
-	days_in_month[2] = DAYS_IN_MONTH (years[2], months[2]);
-
-	/* Mon 0 is the previous month, which we may show the end of. Mon 1 is
-	   the current month, and mon 2 is the next month. */
-	mon = 0;
-
-	month_offset = row * calitem->cols + col - 1;
-	day_num = days_in_month[0];
-	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
-		% 7;
-	/* For the top-left month we show the end of the previous month, and
-	   if the new month starts on the first day of the week we show a
-	   complete week from the previous month. */
-	if (days_from_week_start == 0) {
-		if (row == 0 && col == 0) {
-			day_num -= 6;
-		} else {
-			mon++;
-			month_offset++;
-			day_num = 1;
-		}
-	} else {
-		day_num -= days_from_week_start - 1;
-	}
-
-	/* Get today's date, so we can highlight it. */
-	t = time (NULL);
-	today_tm = localtime (&t);
-	today_year = today_tm->tm_year + 1900;
-	today_month = today_tm->tm_mon;
-	today_mday = today_tm->tm_mday;
-
-	/* We usually skip the last days of the previous month (mon = 0),
-	   except for the top-left month displayed. */
-	draw_day = (mon == 1 || (row == 0 && col == 0));
-
-	for (drow = 0; drow < 6; drow++) {
-		/* Draw the week number. */
-		if (calitem->show_week_numbers) {
-			week_num = e_calendar_item_get_week_number (calitem,
-								    day_num,
-								    months[mon],
-								    years[mon]);
-
-			text_x = cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1
-				- E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS;
-			text_y = cells_y + drow * calitem->cell_height +
-				+ (calitem->cell_height - min_cell_height + 1) / 2;
-
-			num_chars = 0;
-			if (week_num >= 10) {
-				digit = week_num / 10;
-				text_x -= calitem->week_number_digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
-			}
-
-			digit = week_num % 10;
-			text_x -= calitem->week_number_digit_widths[digit];
-			buffer[num_chars++] = digit + '0';
-
-			gdk_gc_set_foreground (fg_gc,
-					       &style->fg[GTK_STATE_NORMAL]);
-			gdk_draw_text (drawable, wkfont, fg_gc,
-				       text_x, text_y + font->ascent,
-				       buffer, num_chars);
-		}
-
-		for (dcol = 0; dcol < 7; dcol++) {
-			if (draw_day) {
-				day_x = cells_x + dcol * calitem->cell_width;
-				day_y = cells_y + drow * calitem->cell_height;
-
-				today = years[mon] == today_year
-					&& months[mon] == today_month
-					&& day_num == today_mday;
-
-				selected = calitem->selection_set
-					&& (calitem->selection_start_month_offset < month_offset
-					    || (calitem->selection_start_month_offset == month_offset
-						&& calitem->selection_start_day <= day_num))
-					&& (calitem->selection_end_month_offset > month_offset
-					    || (calitem->selection_end_month_offset == month_offset
-						&& calitem->selection_end_day >= day_num));
-
-				if (calitem->styles)
-					day_style = calitem->styles[(month_offset + 1) * 32 + day_num];
-
-				/* Get the colors & style to use for the day.*/
-				if (calitem->style_callback)
-					(*calitem->style_callback)
-						(calitem,
-						 years[mon],
-						 months[mon],
-						 day_num,
-						 day_style,
-						 today,
-						 mon != 1,
-						 selected,
-						 has_focus,
-						 drop_target,
-						 &bg_color,
-						 &fg_color,
-						 &box_color,
-						 &bold,
-						 calitem->style_callback_data);
-				else
-					e_calendar_item_get_day_style
-						(calitem,
-						 years[mon],
-						 months[mon],
-						 day_num,
-						 day_style,
-						 today,
-						 mon != 1,
-						 selected,
-						 has_focus,
-						 drop_target,
-						 &bg_color,
-						 &fg_color,
-						 &box_color,
-						 &bold);
-
-				/* Draw the background, if set. */
-				if (bg_color) {
-					gdk_gc_set_foreground (fg_gc, bg_color);
-					gdk_draw_rectangle (drawable, fg_gc,
-							    TRUE,
-							    day_x, day_y,
-							    calitem->cell_width,
-							    calitem->cell_height);
-				}
-
-				/* Draw the box, if set. */
-				if (box_color) {
-					gdk_gc_set_foreground (fg_gc, box_color);
-					gdk_draw_rectangle (drawable, fg_gc,
-							    FALSE,
-							    day_x, day_y,
-							    calitem->cell_width - 1,
-							    calitem->cell_height - 1);
-				}
-
-				/* Draw the 1- or 2-digit day number. */
-				day_x += calitem->cell_width - (calitem->cell_width - min_cell_width) / 2;
-				day_x -= E_CALENDAR_ITEM_MIN_CELL_XPAD / 2;
-				day_y += (calitem->cell_height - min_cell_height + 1) / 2;
-				day_y += E_CALENDAR_ITEM_MIN_CELL_YPAD / 2;
-
-				num_chars = 0;
-				if (day_num >= 10) {
-					digit = day_num / 10;
-					day_x -= calitem->digit_widths[digit];
-					buffer[num_chars++] = digit + '0';
-				}
-
-				digit = day_num % 10;
-				day_x -= calitem->digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
-
-				if (fg_color) {
-					gdk_gc_set_foreground (fg_gc,
-							       fg_color);
-				} else {
-					gdk_gc_set_foreground (fg_gc,
-							       &style->fg[GTK_STATE_NORMAL]);
-				}
-
-				gdk_draw_text (drawable, font, fg_gc,
-					       day_x,
-					       day_y + font->ascent,
-					       buffer, num_chars);
-				/* We use a stupid technique for bold. Just
-				   draw it again 1 pixel to the left. */
-				if (bold)
-					gdk_draw_text (drawable, font, fg_gc,
-						       day_x - 1,
-						       day_y + font->ascent,
-						       buffer, num_chars);
-			}
-
-			/* See if we've reached the end of a month. */
-			if (day_num == days_in_month[mon]) {
-				month_offset++;
-				mon++;
-				/* We only draw the start of the next month
-				   for the bottom-right month displayed. */
-				if (mon == 2 && (row != calitem->rows - 1
-						 || col != calitem->cols - 1)) {
-					/* Set a flag so we exit the loop. */
-					finished = TRUE;
-					break;
-				}
-				day_num = 1;
-				draw_day = TRUE;
-			} else {
-				day_num++;
-			}
-		}
-
-		/* Exit the loop if the flag is set. */
-		if (finished)
-			break;
-	}
-
-	/* Reset the foreground color. */
-	gdk_gc_set_foreground (fg_gc, &style->fg[GTK_STATE_NORMAL]);
-}
-
-
-static gint
-e_calendar_item_get_week_number	(ECalendarItem *calitem,
-				 gint		day,
-				 gint		month,
-				 gint		year)
-{
-	GDate tmp_date;
-	gint weekday, yearday, offset, week_num;
-
-	/* FIXME: check what happens at year boundaries. */
-
-	g_date_clear (&tmp_date, 1);
-	g_date_set_dmy (&tmp_date, day, month + 1, year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&tmp_date) - 1;
-
-	/* Calculate the offset from the start of the week. */
-	offset = (calitem->week_start_day + 7 - weekday) % 7;
-
-	/* Calculate the day of the year, from 0 to 365. */
-	yearday = g_date_day_of_year (&tmp_date) - 1;
-
-	/* If the week starts on or after 29th December, it is week 1 of the
-	   next year, since there are 4 days in the next year. */
-	g_date_subtract_days (&tmp_date, offset);
-	if (g_date_month (&tmp_date) == 12 && g_date_day (&tmp_date) >= 29)
-		return 1;
-
-	/* Calculate the week number, from 0. */
-	week_num = (yearday - offset) / 7;
-
-	/* If the first week starts on or after Jan 5th, then we need to add
-	   1 since the previous week will really be the first week. */
-	if ((yearday - offset) % 7 >= 4)
-		week_num++;
-
-	/* Add 1 so week numbers are from 1 to 53. */
-	return week_num + 1;
-}
-
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_calendar_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
-			   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_calendar_item_button_press (calitem, event);
-	case GDK_BUTTON_RELEASE:
-		return e_calendar_item_button_release (calitem, event);
-	case GDK_MOTION_NOTIFY:
-		return e_calendar_item_motion (calitem, event);
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-
-/* This checks if any fonts have changed, and if so it recalculates the
-   text sizes and the minimum month size. */
-static void
-e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
-{
-	GnomeCanvasItem *canvas_item;
-	GtkStyle *style;
-	GdkFont *font, *wkfont;
-	gchar *digits = "0123456789";
-	gint day, digit, max_digit_width, max_week_number_digit_width;
-	gint char_height, width, min_cell_width, min_cell_height;
-
-	canvas_item = GNOME_CANVAS_ITEM (calitem);
-	style = GTK_WIDGET (canvas_item->canvas)->style;
-
-	if (!style)
-		return;
-
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	wkfont = calitem->week_number_font;
-	if (!wkfont)
-		wkfont = font;
-
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (wkfont != NULL);
-
-	char_height = font->ascent + font->descent;
-
-	/* If both fonts are the same, just return. */
-	if (font != calitem->old_font
-	    || wkfont != calitem->old_week_number_font) {
-		if (calitem->old_font)
-			gdk_font_unref (calitem->old_font);
-		calitem->old_font = font;
-		gdk_font_ref (font);
-
-		if (calitem->old_week_number_font)
-			gdk_font_unref (calitem->old_week_number_font);
-		calitem->old_week_number_font = wkfont;
-		gdk_font_ref (wkfont);
-
-		for (day = 0; day < 7; day++)
-			calitem->day_widths[day] = gdk_char_width (font, calitem->days[day]);
-
-		max_digit_width = 0;
-		max_week_number_digit_width = 0;
-		for (digit = 0; digit < 10; digit++) {
-			width = gdk_char_width (font, digits[digit]);
-			calitem->digit_widths[digit] = width;
-			max_digit_width = MAX (max_digit_width, width);
-
-			if (wkfont) {
-				width = gdk_char_width (wkfont, digits[digit]);
-				calitem->week_number_digit_widths[digit] = width;
-				max_week_number_digit_width = MAX (max_week_number_digit_width, width);
-			} else {
-				calitem->week_number_digit_widths[digit] = width;
-				max_week_number_digit_width = max_digit_width;
-			}
-		}
-		calitem->max_digit_width = max_digit_width;
-		calitem->max_week_number_digit_width = max_week_number_digit_width;
-	}
-
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	min_cell_height = char_height + E_CALENDAR_ITEM_MIN_CELL_YPAD;
-
-	calitem->min_month_width = E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
-		+ E_CALENDAR_ITEM_XPAD_BEFORE_CELLS + min_cell_width * 7
-		+ E_CALENDAR_ITEM_XPAD_AFTER_CELLS;
-	if (calitem->show_week_numbers) {
-		calitem->min_month_width += calitem->max_week_number_digit_width * 2
-			+ E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	}
-
-	calitem->min_month_height = style->klass->ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS + min_cell_height * 6
-		+ E_CALENDAR_ITEM_YPAD_BELOW_CELLS;
-}
-
-
-static void
-e_calendar_item_get_day_style		(ECalendarItem	*calitem,
-					 gint		 year,
-					 gint		 month,
-					 gint		 day,
-					 gint		 day_style,
-					 gboolean	 today,
-					 gboolean	 prev_or_next_month,
-					 gboolean	 selected,
-					 gboolean	 has_focus,
-					 gboolean	 drop_target,
-					 GdkColor      **bg_color,
-					 GdkColor      **fg_color,
-					 GdkColor      **box_color,
-					 gboolean	*bold)
-{
-	*bg_color = NULL;
-	*fg_color = NULL;
-	*box_color = NULL;
-	*bold = FALSE;
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG];
-	}
-}
-
-
-
-static gboolean
-e_calendar_item_button_press	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	gint month_offset, day;
-	gboolean all_week, round_up_end = FALSE, round_down_start = FALSE;
-
-	if (event->button.button == 4)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month - 1);
-	else if (event->button.button == 5)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + 1);
-
-	if (!e_calendar_item_convert_position_to_day (calitem,
-						      event->button.x,
-						      event->button.y,
-						      TRUE,
-						      &month_offset, &day,
-						      &all_week))
-		return FALSE;
-
-	if (event->button.button == 3 && day == -1 
-	    && e_calendar_item_get_display_popup (calitem)) {
-		e_calendar_item_show_popup_menu (calitem,
-						 (GdkEventButton*) event,
-						 month_offset);
-		return TRUE;
-	}
-
-	if (event->button.button != 1 || day == -1)
-		return FALSE;
-
-	if (calitem->max_days_selected < 1)
-		return TRUE;
-
-	if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (calitem),
-				    GDK_POINTER_MOTION_MASK
-				    | GDK_BUTTON_RELEASE_MASK,
-				    NULL, event->button.time) != 0)
-		return FALSE;
-
-	calitem->selection_set = TRUE;
-	calitem->selection_start_month_offset = month_offset;
-	calitem->selection_start_day = day;
-	calitem->selection_end_month_offset = month_offset;
-	calitem->selection_end_day = day;
-
-	calitem->selection_real_start_month_offset = month_offset;
-	calitem->selection_real_start_day = day;
-
-	calitem->selection_from_full_week = FALSE;
-	calitem->selecting = TRUE;
-	calitem->selection_dragging_end = TRUE;
-
-	if (all_week) {
-		calitem->selection_from_full_week = TRUE;
-		round_up_end = TRUE;
-	}
-
-	if (calitem->days_to_start_week_selection == 1) {
-		round_down_start = TRUE;
-		round_up_end = TRUE;
-	}
-
-	/* Don't round up or down if we can't select a week or more. */
-	if (calitem->max_days_selected < 7) {
-		round_down_start = FALSE;
-		round_up_end = FALSE;
-	}
-
-	if (round_up_end)
-		e_calendar_item_round_up_selection (calitem, &calitem->selection_end_month_offset, &calitem->selection_end_day);
-
-	if (round_down_start)
-		e_calendar_item_round_down_selection (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return TRUE;
-}
-
-
-static gboolean
-e_calendar_item_button_release	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	if (!calitem->selecting)
-		return FALSE;
-
-	gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (calitem),
-				  event->button.time);
-
-	calitem->selecting = FALSE;
-
-	/* If the user selects the grayed dates before the first month or
-	   after the last month, we move backwards or forwards one month.
-	   The set_month() call should take care of updating the selection. */
-	if (calitem->selection_end_month_offset == -1)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month - 1);
-	else if (calitem->selection_start_month_offset == calitem->rows * calitem->cols)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + 1);
-
-	calitem->selection_changed = TRUE;
-	e_calendar_item_queue_signal_emission (calitem);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return FALSE;
-}
-
-
-static gboolean
-e_calendar_item_motion		(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	gint start_month, start_day, end_month, end_day, month_offset, day;
-	gint tmp_month, tmp_day, days_in_selection;
-	gboolean all_week, round_up_end = FALSE, round_down_start = FALSE;
-
-	if (!calitem->selecting)
-		return FALSE;
-
-	if (!e_calendar_item_convert_position_to_day (calitem,
-						      event->button.x,
-						      event->button.y,
-						      TRUE,
-						      &month_offset, &day,
-						      &all_week))
-		return FALSE;
-
-	if (day == -1)
-		return FALSE;
-
-	if (calitem->selection_dragging_end) {
-		start_month = calitem->selection_real_start_month_offset;
-		start_day = calitem->selection_real_start_day;
-		end_month = month_offset;
-		end_day = day;
-	} else {
-		start_month = month_offset;
-		start_day = day;
-		end_month = calitem->selection_real_start_month_offset;
-		end_day = calitem->selection_real_start_day;
-	}
-
-	if (start_month > end_month || (start_month == end_month
-					&& start_day > end_day)) {
-		tmp_month = start_month;
-		tmp_day = start_day;
-		start_month = end_month;
-		start_day = end_day;
-		end_month = tmp_month;
-		end_day = tmp_day;
-
-		calitem->selection_dragging_end = !calitem->selection_dragging_end;
-	}
-
-	if (calitem->days_to_start_week_selection > 0) {
-		days_in_selection = e_calendar_item_get_inclusive_days (calitem, start_month, start_day, end_month, end_day);
-		if (days_in_selection >= calitem->days_to_start_week_selection) {
-			round_down_start = TRUE;
-			round_up_end = TRUE;
-		}
-	}
-
-	/* If we are over a week number and we are dragging the end of the
-	   selection, we round up to the end of this week. */
-	if (all_week && calitem->selection_dragging_end)
-		round_up_end = TRUE;
-
-	/* If the selection was started from a week number and we are dragging
-	   the start of the selection, we need to round up the end to include
-	   all of the original week selected. */
-	if (calitem->selection_from_full_week
-	    && !calitem->selection_dragging_end)
-			round_up_end = TRUE;
-
-	/* Don't round up or down if we can't select a week or more. */
-	if (calitem->max_days_selected < 7) {
-		round_down_start = FALSE;
-		round_up_end = FALSE;
-	}
-
-	if (round_up_end)
-		e_calendar_item_round_up_selection (calitem, &end_month,
-						    &end_day);
-	if (round_down_start)
-		e_calendar_item_round_down_selection (calitem, &start_month,
-						      &start_day);
-
-
-	/* Check we don't go over the maximum number of days to select. */
-	if (calitem->selection_dragging_end) {
-		e_calendar_item_check_selection_end (calitem,
-						     start_month,
-						     start_day,
-						     &end_month,
-						     &end_day);
-	} else {
-		e_calendar_item_check_selection_start (calitem,
-						       &start_month,
-						       &start_day,
-						       end_month,
-						       end_day);
-	}
-
-	if (start_month == calitem->selection_start_month_offset
-	    && start_day == calitem->selection_start_day
-	    && end_month == calitem->selection_end_month_offset
-	    && end_day == calitem->selection_end_day)
-		return FALSE;
-
-	calitem->selection_start_month_offset = start_month;
-	calitem->selection_start_day = start_day;
-	calitem->selection_end_month_offset = end_month;
-	calitem->selection_end_day = end_day;
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		*end_month,
-					 gint		*end_day)
-{
-	gint year, month, max_month, max_day, days_in_month;
-
-	if (calitem->max_days_selected <= 0)
-		return;
-
-	year = calitem->year;
-	month = calitem->month + start_month;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	max_month = start_month;
-	max_day = start_day + calitem->max_days_selected - 1;
-
-	for (;;) {
-		days_in_month = DAYS_IN_MONTH (year, month);
-		if (max_day <= days_in_month)
-			break;
-		max_month++;
-		month++;
-		if (month == 12) {
-			year++;
-			month = 0;
-		}
-		max_day -= days_in_month;
-	}
-
-	if (*end_month > max_month) {
-		*end_month = max_month;
-		*end_day = max_day;
-	} else if (*end_month == max_month && *end_day > max_day) {
-		*end_day = max_day;
-	}
-}
-
-
-static void
-e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
-					 gint		*start_month,
-					 gint		*start_day,
-					 gint		 end_month,
-					 gint		 end_day)
-{
-	gint year, month, min_month, min_day, days_in_month;
-
-	if (calitem->max_days_selected <= 0)
-		return;
-
-	year = calitem->year;
-	month = calitem->month + end_month;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	min_month = end_month;
-	min_day = end_day - calitem->max_days_selected + 1;
-
-	while (min_day <= 0) {
-		min_month--;
-		month--;
-		if (month == -1) {
-			year--;
-			month = 11;
-		}
-		days_in_month = DAYS_IN_MONTH (year, month);
-		min_day += days_in_month;
-	}
-
-	if (*start_month < min_month) {
-		*start_month = min_month;
-		*start_day = min_day;
-	} else if (*start_month == min_month && *start_day < min_day) {
-		*start_day = min_day;
-	}
-}
-
-
-/* Converts a position within the item to a month & day.
-   The month returned is 0 for the top-left month displayed.
-   If the position is over the month heading -1 is returned for the day.
-   If the position is over a week number the first day of the week is returned
-   and entire_week is set to TRUE.
-   It returns FALSE if the position is completely outside all months. */
-static gboolean
-e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
-					 gint		 event_x,
-					 gint		 event_y,
-					 gboolean	 round_empty_positions,
-					 gint		*month_offset,
-					 gint		*day,
-					 gboolean	*entire_week)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	gint xthickness, ythickness, char_height;
-	gint x, y, row, col, cells_x, cells_y, day_row, day_col;
-	gint first_day_offset, days_in_month, days_in_prev_month;
-	gint week_num_x1, week_num_x2;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	char_height = style->font->ascent + style->font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-
-	*entire_week = FALSE;
-
-	x = event_x - xthickness - calitem->x_offset;
-	y = event_y - ythickness;
-
-	if (x < 0 || y < 0)
-		return FALSE;
-
-	row = y / calitem->month_height;
-	col = x / calitem->month_width;
-
-	if (row >= calitem->rows || col >= calitem->cols)
-		return FALSE;
-
-	*month_offset = row * calitem->cols + col;
-
-	x = x % calitem->month_width;
-	y = y % calitem->month_height;
-
-	if (y < ythickness * 2 + E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-	    + char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME) {
-		*day = -1;
-		return TRUE;
-	}
-
-	cells_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
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-	y -= cells_y;
-	if (y < 0)
-		return FALSE;
-	day_row = y / calitem->cell_height;
-	if (day_row >= E_CALENDAR_ROWS_PER_MONTH)
-		return FALSE;
-
-	week_num_x1 = E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS + calitem->month_lpad;
-
-	if (calitem->show_week_numbers) {
-		week_num_x2 = week_num_x1
-			+ calitem->max_week_number_digit_width * 2;
-		if (x >= week_num_x1 && x < week_num_x2)
-			*entire_week = TRUE;
-		cells_x = week_num_x2 + E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	} else {
-		cells_x = week_num_x1;
-	}
-
-	if (*entire_week) {
-		day_col = 0;
-	} else {
-		cells_x += E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-		x -= cells_x;
-		if (x < 0)
-			return FALSE;
-		day_col = x / calitem->cell_width;
-		if (day_col >= E_CALENDAR_COLS_PER_MONTH)
-			return FALSE;
-	}
-
-	*day = day_row * E_CALENDAR_COLS_PER_MONTH + day_col;
-
-	e_calendar_item_get_month_info (calitem, row, col, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	if (*day < first_day_offset) {
-		if (*entire_week || (row == 0 && col == 0)) {
-			(*month_offset)--;
-			*day = days_in_prev_month + 1 - first_day_offset
-				+ *day;
-			return TRUE;
-		} else if (round_empty_positions) {
-			*day = first_day_offset;
-		} else {
-			return FALSE;
-		}
-	}
-
-	*day -= first_day_offset - 1;
-
-	if (*day > days_in_month) {
-		if (row == calitem->rows - 1 && col == calitem->cols - 1) {
-			(*month_offset)++;
-			*day -= days_in_month;
-			return TRUE;
-		} else if (round_empty_positions) {
-			*day = days_in_month;
-		} else {
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_item_get_month_info	(ECalendarItem	*calitem,
-				 gint		 row,
-				 gint		 col,
-				 gint		*first_day_offset,
-				 gint		*days_in_month,
-				 gint		*days_in_prev_month)
-{
-	gint year, month, start_weekday, first_day_of_month;
-	struct tm tmp_tm = { 0 };
-
-	month = calitem->month + row * calitem->cols + col;
-	year = calitem->year + month / 12;
-	month = month % 12;
-
-	*days_in_month = DAYS_IN_MONTH (year, month);
-	if (month == 0)
-		*days_in_prev_month = DAYS_IN_MONTH (year - 1, 11);
-	else
-		*days_in_prev_month = DAYS_IN_MONTH (year, month - 1);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	start_weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	first_day_of_month = (start_weekday + 7 - calitem->week_start_day) % 7;
-
-	if (row == 0 && col == 0 && first_day_of_month == 0)
-		*first_day_offset = 7;
-	else
-		*first_day_offset = first_day_of_month;
-}
-
-
-void
-e_calendar_item_get_first_month(ECalendarItem	*calitem,
-				gint		*year,
-				gint		*month)
-{
-	*year = calitem->year;
-	*month = calitem->month;
-}
-
-
-/* This also handles values of month < 0 or > 11 by updating the year. */
-void
-e_calendar_item_set_first_month(ECalendarItem	*calitem,
-				gint		 year,
-				gint		 month)
-{
-	gint new_year, new_month, months_diff, num_months;
-	gint old_days_in_selection, new_days_in_selection;
-
-	new_year = year;
-	new_month = month;
-	e_calendar_item_normalize_date	(calitem, &new_year, &new_month);
-
-	if (calitem->year == new_year && calitem->month == new_month)
-		return;
-
-	/* Update the selection. */
-	num_months = calitem->rows * calitem->cols;
-	months_diff = (new_year - calitem->year) * 12
-		+ new_month - calitem->month;
-
-	if (calitem->selection_set) {
-		if (!calitem->move_selection_when_moving
-		    || (calitem->selection_start_month_offset - months_diff >= 0
-			&& calitem->selection_end_month_offset - months_diff < num_months)) {
-			calitem->selection_start_month_offset -= months_diff;
-			calitem->selection_end_month_offset -= months_diff;
-			calitem->selection_real_start_month_offset -= months_diff;
-
-			calitem->year = new_year;
-			calitem->month = new_month;
-		} else {
-			old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day);
-
-			/* Make sure the selection will be displayed. */
-			if (calitem->selection_start_month_offset < 0
-			    || calitem->selection_start_month_offset >= num_months) {
-				calitem->selection_end_month_offset -= calitem->selection_start_month_offset;
-				calitem->selection_start_month_offset = 0;
-			}
-
-			/* We want to ensure that the same number of days are
-			   selected after we have moved the selection. */
-			calitem->year = new_year;
-			calitem->month = new_month;
-
-			e_calendar_item_ensure_valid_day (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-			e_calendar_item_ensure_valid_day (calitem, &calitem->selection_end_month_offset, &calitem->selection_end_day);
-
-			if (calitem->round_selection_when_moving) {
-				e_calendar_item_round_down_selection (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-			}
-
-			new_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day);
-
-			if (old_days_in_selection != new_days_in_selection)
-				e_calendar_item_add_days_to_selection (calitem, old_days_in_selection - new_days_in_selection);
-
-			/* Flag that we need to emit the "selection_changed"
-			   signal. We don't want to emit it here since setting
-			   the "year" and "month" args would result in 2
-			   signals emitted. */
-			calitem->selection_changed = TRUE;
-		}
-	} else {
-		calitem->year = new_year;
-		calitem->month = new_month;
-	}
-
-	e_calendar_item_date_range_changed (calitem);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-/* Get the maximum number of days selectable */
-gint
-e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem)
-{
-	return calitem->max_days_selected;
-}
-
-
-/* Set the maximum number of days selectable */
-void	 
-e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-					gint             days)
-{
-	calitem->max_days_selected = MAX (0, days);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-
-/* Get the maximum number of days before whole weeks are selected */
-gint     
-e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem)
-{
-	return calitem->days_to_start_week_selection;
-}
-
-
-/* Set the maximum number of days before whole weeks are selected */
-void	 
-e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-					gint            days)
-{
-	calitem->days_to_start_week_selection = days;
-}
-
-gboolean 
-e_calendar_item_get_display_popup      (ECalendarItem	*calitem)
-{
-	return calitem->display_popup;
-}
-
-
-void	 
-e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-					gboolean        display)
-{
-	calitem->display_popup = display;
-}
-
-
-/* This will make sure that the given year & month are valid, i.e. if month
-   is < 0 or > 11 the year and month will be updated accordingly. */
-static void
-e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-				 gint		*year,
-				 gint		*month)
-{
-	if (*month >= 0) {
-		*year += *month / 12;
-		*month = *month % 12;
-	} else {
-		*year += *month / 12 - 1;
-		*month = *month % 12;
-		if (*month != 0)
-			*month += 12;
-	}
-}
-
-
-/* Adds or subtracts days from the selection. It is used when we switch months
-   and the selection extends past the end of a month but we want to keep the
-   number of days selected the same. days should not be more than 30. */
-static void
-e_calendar_item_add_days_to_selection	(ECalendarItem	*calitem,
-					 gint		 days)
-{
-	gint year, month, days_in_month;
-
-	year = calitem->year;
-	month = calitem->month + calitem->selection_end_month_offset;
-	e_calendar_item_normalize_date (calitem, &year,	&month);
-
-	calitem->selection_end_day += days;
-	if (calitem->selection_end_day <= 0) {
-		month--;
-		e_calendar_item_normalize_date (calitem, &year,	&month);
-		calitem->selection_end_month_offset--;
-		calitem->selection_end_day += DAYS_IN_MONTH (year, month);
-	} else {
-		days_in_month = DAYS_IN_MONTH (year, month);
-		if (calitem->selection_end_day > days_in_month) {
-			calitem->selection_end_month_offset++;
-			calitem->selection_end_day -= days_in_month;
-		}
-	}
-}
-
-
-/* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
-gboolean
-e_calendar_item_get_date_range	(ECalendarItem	*calitem,
-				 gint		*start_year,
-				 gint		*start_month,
-				 gint		*start_day,
-				 gint		*end_year,
-				 gint		*end_month,
-				 gint		*end_day)
-{
-	gint first_day_offset, days_in_month, days_in_prev_month;
-
-	if (calitem->rows == 0 || calitem->cols == 0)
-		return FALSE;
-
-	/* Calculate the first day shown. This will be one of the greyed-out
-	   days before the first full month begins. */
-	e_calendar_item_get_month_info (calitem, 0, 0, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	*start_year = calitem->year;
-	*start_month = calitem->month - 1;
-	if (*start_month == -1) {
-		(*start_year)--;
-		*start_month = 11;
-	}
-	*start_day = days_in_prev_month + 1 - first_day_offset;
-
-
-	/* Calculate the last day shown. This will be one of the greyed-out
-	   days after the last full month ends. */
-	e_calendar_item_get_month_info (calitem, calitem->rows - 1,
-					calitem->cols - 1, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	*end_month = calitem->month + calitem->rows * calitem->cols;
-	*end_year = calitem->year + *end_month / 12;
-	*end_month %= 12;
-	*end_day = E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH
-		- first_day_offset - days_in_month;
-
-	return TRUE;
-}
-
-
-/* Simple way to mark days so they appear bold.
-   A more flexible interface may be added later. */
-void
-e_calendar_item_clear_marks	(ECalendarItem	*calitem)
-{
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-
-	g_free (calitem->styles);
-	calitem->styles = NULL;
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-
-void
-e_calendar_item_mark_day	(ECalendarItem	*calitem,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day,
-				 guint8		 day_style)
-{
-	gint month_offset;
-
-	month_offset = (year - calitem->year) * 12 + month - calitem->month;
-	if (month_offset < -1 || month_offset > calitem->rows * calitem->cols)
-		return;
-
-	if (!calitem->styles)
-		calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32);
-
-	calitem->styles[(month_offset + 1) * 32 + day] = day_style;
-}
-
-
-void
-e_calendar_item_mark_days	(ECalendarItem	*calitem,
-				 gint		 start_year,
-				 gint		 start_month,
-				 gint		 start_day,
-				 gint		 end_year,
-				 gint		 end_month,
-				 gint		 end_day,
-				 guint8		 day_style)
-{
-	gint month_offset, end_month_offset, day;
-
-	month_offset = (start_year - calitem->year) * 12 + start_month
-		- calitem->month;
-	day = start_day;
-	if (month_offset > calitem->rows * calitem->cols)
-		return;
-	if (month_offset < -1) {
-		month_offset = -1;
-		day = 1;
-	}
-
-	end_month_offset = (end_year - calitem->year) * 12 + end_month
-		- calitem->month;
-	if (end_month_offset < -1)
-		return;
-	if (end_month_offset > calitem->rows * calitem->cols) {
-		end_month_offset = calitem->rows * calitem->cols;
-		end_day = 31;
-	}
-
-	if (month_offset > end_month_offset)
-		return;
-
-	if (!calitem->styles)
-		calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32);
-
-	for (;;) {
-		if (month_offset == end_month_offset && day > end_day)
-			break;
-
-		calitem->styles[(month_offset + 1) * 32 + day] = day_style;
-
-		day++;
-		if (day == 32) {
-			month_offset++;
-			day = 1;
-			if (month_offset > end_month_offset)
-				break;
-		}
-	}
-}
-
-
-/* Rounds up the given day to the end of the week. */
-static void
-e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, weekday, days, days_in_month;
-	struct tm tmp_tm = { 0 };
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = *day;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	/* Calculate how many days to the end of the row. */
-	days = (calitem->week_start_day + 6 - weekday) % 7;
-
-	*day += days;
-	days_in_month = DAYS_IN_MONTH (year, month);
-	if (*day > days_in_month) {
-		(*month_offset)++;
-		*day -= days_in_month;
-	}
-}
-
-
-/* Rounds down the given day to the start of the week. */
-static void
-e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, weekday, days, days_in_month;
-	struct tm tmp_tm = { 0 };
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = *day;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	/* Calculate how many days to the start of the row. */
-	days = (weekday + 7 - calitem->week_start_day) % 7;
-
-	*day -= days;
-	if (*day <= 0) {
-		month--;
-		if (month == -1) {
-			year--;
-			month = 11;
-		}
-		days_in_month = DAYS_IN_MONTH (year, month);
-		(*month_offset)--;
-		*day += days_in_month;
-	}
-}
-
-
-static gint
-e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
-					 gint		 start_month_offset,
-					 gint		 start_day,
-					 gint		 end_month_offset,
-					 gint		 end_day)
-{
-	gint start_year, start_month, end_year, end_month, days = 0;
-
-	start_year = calitem->year;
-	start_month = calitem->month + start_month_offset;
-	e_calendar_item_normalize_date (calitem, &start_year, &start_month);
-
-	end_year = calitem->year;
-	end_month = calitem->month + end_month_offset;
-	e_calendar_item_normalize_date (calitem, &end_year, &end_month);
-
-	while (start_year < end_year || start_month < end_month) {
-		days += DAYS_IN_MONTH (start_year, start_month);
-		start_month++;
-		if (start_month == 12) {
-			start_year++;
-			start_month = 0;
-		}
-	}
-
-	days += end_day - start_day + 1;
-
-	return days;
-}
-
-
-/* If the day is off the end of the month it is set to the last day of the
-   month. */
-static void
-e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, days_in_month;
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	days_in_month = DAYS_IN_MONTH (year, month);
-	if (*day > days_in_month)
-		*day = days_in_month;
-}
-
-
-gboolean
-e_calendar_item_get_selection		(ECalendarItem	*calitem,
-					 GDate		*start_date,
-					 GDate		*end_date)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-
-	g_date_clear (start_date, 1);
-	g_date_clear (end_date, 1);
-
-	if (!calitem->selection_set)
-		return FALSE;
-
-	start_year = calitem->year;
-	start_month = calitem->month + calitem->selection_start_month_offset;
-	e_calendar_item_normalize_date (calitem, &start_year, &start_month);
-	start_day = calitem->selection_start_day;
-
-	end_year = calitem->year;
-	end_month = calitem->month + calitem->selection_end_month_offset;
-	e_calendar_item_normalize_date (calitem, &end_year, &end_month);
-	end_day = calitem->selection_end_day;
-
-	g_date_set_dmy (start_date, start_day, start_month + 1, start_year);
-	g_date_set_dmy (end_date, end_day, end_month + 1, end_year);
-
-	return TRUE;
-}
-
-
-void
-e_calendar_item_set_selection	(ECalendarItem	*calitem,
-				 GDate		*start_date,
-				 GDate		*end_date)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gint new_start_month_offset, new_start_day;
-	gint new_end_month_offset, new_end_day;
-	gboolean need_update;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-
-	/* If the user is in the middle of a selection, we must abort it. */
-	if (calitem->selecting) {
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (calitem),
-					  GDK_CURRENT_TIME);
-		calitem->selecting = FALSE;
-	}
-
-	/* If start_date is NULL, we clear the selection without changing the
-	   month shown. */
-	if (start_date == NULL) {
-		calitem->selection_set = FALSE;
-		calitem->selection_changed = TRUE;
-		e_calendar_item_queue_signal_emission (calitem);
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-		return;
-	}
-
-	if (end_date == NULL)
-		end_date = start_date;
-		
-	g_return_if_fail (g_date_compare (start_date, end_date) <= 0);
-
-	start_year = g_date_year (start_date);
-	start_month = g_date_month (start_date) - 1;
-	start_day = g_date_day (start_date);
-	end_year = g_date_year (end_date);
-	end_month = g_date_month (end_date) - 1;
-	end_day = g_date_day (end_date);
-
-	need_update = e_calendar_item_ensure_days_visible (calitem,
-							   start_year,
-							   start_month,
-							   start_day,
-							   end_year,
-							   end_month,
-							   end_day);
-
-	new_start_month_offset = (start_year - calitem->year) * 12
-		+ start_month - calitem->month;
-	new_start_day = start_day;
-
-	/* This may go outside the visible months, but we don't care. */
-	new_end_month_offset = (end_year - calitem->year) * 12
-		+ end_month - calitem->month;
-	new_end_day = end_day;
-
-
-	if (!calitem->selection_set
-	    || calitem->selection_start_month_offset != new_start_month_offset
-	    || calitem->selection_start_day != new_start_day
-	    || calitem->selection_end_month_offset != new_end_month_offset
-	    || calitem->selection_end_day != new_end_day) {
-		need_update = TRUE;
-		calitem->selection_changed = TRUE;
-		e_calendar_item_queue_signal_emission (calitem);
-		calitem->selection_set = TRUE;
-		calitem->selection_start_month_offset = new_start_month_offset;
-		calitem->selection_start_day = new_start_day;
-		calitem->selection_end_month_offset = new_end_month_offset;
-		calitem->selection_end_day = new_end_day;
-
-		calitem->selection_real_start_month_offset = new_start_month_offset;
-		calitem->selection_real_start_day = new_start_day;
-		calitem->selection_from_full_week = FALSE;
-	}
-
-	if (need_update)
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-
-/* This tries to ensure that the given time range is visible. If the range
-   given is longer than we can show, only the start of it will be visible.
-   Note that this will not update the selection. That should be done somewhere
-   else. It returns TRUE if the visible range has been changed. */
-static gboolean
-e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
-					 gint		 start_year,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		 end_year,
-					 gint		 end_month,
-					 gint		 end_day)
-{
-	gint current_end_year, current_end_month;
-	gint months_shown, months;
-	gint first_day_offset, days_in_month, days_in_prev_month;
-	gboolean need_update = FALSE;
-
-	months_shown = calitem->rows * calitem->cols;
-	months = (end_year - start_year) * 12 + end_month - start_month;
-
-	/* Calculate the range of months currently displayed. */
-	current_end_year = calitem->year;
-	current_end_month = calitem->month + months_shown - 1;
-	e_calendar_item_normalize_date (calitem, &current_end_year,
-					&current_end_month);
-
-	/* Try to ensure that the end month is shown. */
-	if (end_year > current_end_year
-	    || (end_year == current_end_year
-		&& end_month > current_end_month)) {
-		need_update = TRUE;
-		calitem->year = end_year;
-		calitem->month = end_month - months_shown + 1;
-		e_calendar_item_normalize_date (calitem, &calitem->year,
-						&calitem->month);
-	}
-
-	/* Now try to ensure that the start month is shown. We do this after
-	   the end month so that the start month will always be shown. */
-	if (start_year < calitem->year
-	    || (start_year == calitem->year
-		&& start_month < calitem->month)) {
-		need_update = TRUE;
-
-		/* First we see if the start of the selection will fit in the
-		   leftover days of the month before the first one shown. */
-		calitem->year = start_year;
-		calitem->month = start_month + 1;
-		e_calendar_item_normalize_date (calitem, &calitem->year,
-						&calitem->month);
-
-		e_calendar_item_get_month_info (calitem, 0, 0,
-						&first_day_offset,
-						&days_in_month,
-						&days_in_prev_month);
-
-		if (start_day <= days_in_prev_month - first_day_offset) {
-			calitem->year = start_year;
-			calitem->month = start_month;
-		}
-	}
-
-	if (need_update)
-		e_calendar_item_date_range_changed (calitem);
-
-	return need_update;
-}
-
-
-static void
-e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
-					 GdkEventButton	*event,
-					 gint		 month_offset)
-{
-	GtkWidget *menu, *submenu, *menuitem;
-	gint year, month;
-	gchar buffer[64];
-	struct tm tmp_tm;
-
-	menu = gtk_menu_new ();
-
-	for (year = calitem->year - 2; year <= calitem->year + 2; year++) {
-		g_snprintf (buffer, 64, "%i", year);
-		menuitem = gtk_menu_item_new_with_label (buffer);
-		gtk_widget_show (menuitem);
-		gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
-		submenu = gtk_menu_new ();
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-
-		gtk_object_set_data (GTK_OBJECT (submenu), "year",
-				     GINT_TO_POINTER (year));
-		gtk_object_set_data (GTK_OBJECT (submenu), "month_offset",
-				     GINT_TO_POINTER (month_offset));
-
-		for (month = 0; month < 12; month++) {
-			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);
-			/* This is a strftime() format. %B = Month name, %Y = Year. */
-			strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm);
-
-			menuitem = gtk_menu_item_new_with_label (buffer);
-			gtk_widget_show (menuitem);
-			gtk_container_add (GTK_CONTAINER (submenu), menuitem);
-
-			gtk_object_set_data (GTK_OBJECT (menuitem), "month",
-					     GINT_TO_POINTER (month));
-
-			gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-					    GTK_SIGNAL_FUNC (e_calendar_item_on_menu_item_activate), calitem);
-		}
-	}
-
-	/* Run the menu modal so we can destroy it after. */
-	gtk_signal_connect (GTK_OBJECT (menu), "deactivate",
-			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-			e_calendar_item_position_menu, calitem,
-			event->button, event->time);
-	gtk_grab_add (menu);
-	gtk_main ();
-	gtk_grab_remove (menu);
-	gtk_widget_destroy (menu);
-}
-
-
-static void
-e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
-					 ECalendarItem	*calitem)
-{
-	gint year, month_offset, month;
-
-	year = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem->parent), "year"));
-	month_offset = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem->parent), "month_offset"));
-	month = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem), "month"));
-
-	month -= month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-	e_calendar_item_set_first_month (calitem, year, month);
-}
-
-
-static void
-e_calendar_item_position_menu	(GtkMenu            *menu,
-				 gint               *x,
-				 gint               *y,
-				 gpointer            user_data)
-{
-	GtkRequisition requisition;
-	gint screen_width, screen_height;
-
-	gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
-
-	*x -= 2;
-	*y -= requisition.height / 2;
-
-	screen_width = gdk_screen_width ();
-	screen_height = gdk_screen_height ();
-
-	*x = CLAMP (*x, 0, screen_width - requisition.width);
-	*y = CLAMP (*y, 0, screen_height - requisition.height);
-}
-
-
-/* Sets the function to call to get the colors to use for a particular day. */
-void
-e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
-					 ECalendarItemStyleCallback cb,
-					 gpointer	 data,
-					 GtkDestroyNotify destroy)
-{
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-
-	if (calitem->style_callback_data)
-		(*calitem->style_callback_destroy) (calitem->style_callback_data);
-
-	calitem->style_callback = cb;
-	calitem->style_callback_data = data;
-	calitem->style_callback_destroy = destroy;
-}
-
-
-static void
-e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
-{
-	g_free (calitem->styles);
-	calitem->styles = NULL;
-	calitem->date_range_changed = TRUE;
-	e_calendar_item_queue_signal_emission (calitem);
-}
-
-
-static void
-e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
-{
-	if (calitem->signal_emission_idle_id == 0) {
-		calitem->signal_emission_idle_id = g_idle_add_full (G_PRIORITY_HIGH, e_calendar_item_signal_emission_idle_cb, calitem, NULL);
-	}
-}
-
-
-static gboolean
-e_calendar_item_signal_emission_idle_cb	(gpointer data)
-{
-	ECalendarItem *calitem;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	calitem = E_CALENDAR_ITEM (data);
-
-	calitem->signal_emission_idle_id = 0;
-
-	if (calitem->date_range_changed) {
-		gtk_signal_emit (GTK_OBJECT (calitem),
-				 e_calendar_item_signals[DATE_RANGE_CHANGED]);
-		calitem->date_range_changed = FALSE;
-	}
-
-	if (calitem->selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (calitem),
-				 e_calendar_item_signals[SELECTION_CHANGED]);
-		calitem->selection_changed = FALSE;
-	}
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
deleted file mode 100644
index 0e655cf355..0000000000
--- a/widgets/misc/e-calendar-item.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_ITEM_H_
-#define _E_CALENDAR_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendarItem - canvas item displaying a calendar.
- */
-
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME	1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME	1
-
-/* Used to mark days as bold in e_calendar_item_mark_day(). */
-#define E_CALENDAR_ITEM_MARK_BOLD	1
-
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_ITEM_COLOR_TODAY_BOX,
-	E_CALENDAR_ITEM_COLOR_SELECTION_FG,
-	E_CALENDAR_ITEM_COLOR_SELECTION_BG,
-	E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG,
-	
-	E_CALENDAR_ITEM_COLOR_LAST
-} ECalendarItemColors;
-
-typedef struct _ECalendarItem       ECalendarItem;
-typedef struct _ECalendarItemClass  ECalendarItemClass;
-
-typedef void (*ECalendarItemStyleCallback)   (ECalendarItem	*calitem,
-					      gint		 year,
-					      gint		 month,
-					      gint		 day,
-					      gint		 day_style,
-					      gboolean		 today,
-					      gboolean		 prev_or_next_month,
-					      gboolean		 selected,
-					      gboolean		 has_focus,
-					      gboolean		 drop_target,
-					      GdkColor	       **bg_color,
-					      GdkColor	       **fg_color,
-					      GdkColor	       **box_color,
-					      gboolean		*bold,
-					      gpointer		 data);
-
-
-#define E_CALENDAR_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_calendar_item_get_type (), ECalendarItem))
-#define E_CALENDAR_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_calendar_item_get_type ()))
-#define E_IS_CALENDAR_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_calendar_item_get_type ()))
-
-struct _ECalendarItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The year & month of the first calendar being displayed. */
-	gint year;
-	gint month;	/* 0 to 11 */
-
-	/* Points to an array of styles, one char for each day. We use 32
-	   chars for each month, with n + 2 months, where n is the number of
-	   complete months shown (since we show some days before the first
-	   month and after the last month grayes out).
-	   A value of 0 is the default, and 1 is bold. */
-	guint8 *styles;
-
-	/*
-	 * Options.
-	 */
-
-	/* The minimum & maximum number of rows & columns of months.
-	   If the maximum values are -1 then there is no maximum.
-	   The minimum valies default to 1. The maximum values to -1. */
-	gint min_rows;
-	gint min_cols;
-	gint max_rows;
-	gint max_cols;
-
-	/* The actual number of rows & columns of months. */
-	gint rows;
-	gint cols;
-
-	/* Whether we show week nubers. */
-	gboolean show_week_numbers;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* Whether the cells expand to fill extra space. */
-	gboolean expand;
-
-	/* The maximum number of days that can be selected. Defaults to 1. */
-	gint max_days_selected;
-
-	/* The number of days selected before we switch to selecting whole
-	   weeks, or -1 if we never switch. Defaults to -1. */
-	gint days_to_start_week_selection;
-
-	/* Whether the selection is moved when we move back/forward one month.
-	   Used for things like the EDateEdit which only want the selection to
-	   be changed when the user explicitly selects a day. */
-	gboolean move_selection_when_moving;
-
-	/* Whether the selection is rounded down to the nearest week when we
-	   move back/forward one month. Used for the week view. */
-	gboolean round_selection_when_moving;
-
-	/* Whether to display the pop-up, TRUE by default */
-	gboolean display_popup;
-
-	/*
-	 * Internal stuff.
-	 */
-
-	/* Bounds of item. */
-	gdouble x1, y1, x2, y2;
-
-	/* The minimum size of each month, based on the fonts used. */
-	gint min_month_width;
-	gint min_month_height;
-
-	/* The actual size of each month, after dividing extra space. */
-	gint month_width;
-	gint month_height;
-
-	/* The offset to the left edge of the first calendar. */
-	gint x_offset;
-
-	/* The padding around each calendar month. */
-	gint month_lpad, month_rpad;
-	gint month_tpad, month_bpad;
-
-	/* The size of each cell. */
-	gint cell_width;
-	gint cell_height;
-
-	/* The current selection. The month offsets are from 0, which is the
-	   top-left calendar month view. Note that -1 is used for the last days
-	   from the previous month. The days are real month days. */
-	gboolean selecting;
-	gboolean selection_dragging_end;
-	gboolean selection_from_full_week;
-	gboolean selection_set;
-	gint selection_start_month_offset;
-	gint selection_start_day;
-	gint selection_end_month_offset;
-	gint selection_end_day;
-	gint selection_real_start_month_offset;
-	gint selection_real_start_day;
-
-	/* The first character of each day of the week, e.g. 'MTWTFSS'. */
-	gchar *days;
-
-	/* Widths of the day characters. */
-	gint day_widths[7];
-
-	/* Widths of the digits, '0' .. '9'. */
-	gint digit_widths[10];
-	gint max_digit_width;
-	gint week_number_digit_widths[10];
-	gint max_week_number_digit_width;
-
-	/* Fonts for drawing text. If font isn't set it uses the font from the
-	   canvas widget. If week_number_font isn't set it uses font. */
-	GdkFont *font, *old_font;
-	GdkFont *week_number_font, *old_week_number_font;
-
-	ECalendarItemStyleCallback style_callback;
-	gpointer style_callback_data;
-	GtkDestroyNotify style_callback_destroy;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_ITEM_COLOR_LAST];
-
-	/* Our idle handler for emitting signals. */
-	gint signal_emission_idle_id;
-
-	/* A flag to indicate that the selection or date range has changed.
-	   When set the idle function will emit the signal and reset it to
-	   FALSE. This is so we don't emit it several times when args are set
-	   etc. */
-	gboolean selection_changed;
-	gboolean date_range_changed;
-};
-
-struct _ECalendarItemClass
-{
-	GnomeCanvasItemClass parent_class;
-
-	void (* date_range_changed)	(ECalendarItem *calitem);
-	void (* selection_changed)	(ECalendarItem *calitem);
-};
-
-
-GtkType  e_calendar_item_get_type		(void);
-
-/* FIXME: months are 0-11 throughout, but 1-12 may be better. */
-
-void	 e_calendar_item_get_first_month	(ECalendarItem	*calitem,
-						 gint		*year,
-						 gint		*month);
-void	 e_calendar_item_set_first_month	(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month);
-
-/* Get the maximum number of days selectable */
-gint     e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem);
-
-/* Set the maximum number of days selectable */
-void	 e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-						 gint            days);
-
-/* Get the maximum number of days selectable */
-gint     e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem);
-
-/* Get the maximum number of days before whole weeks are selected */
-void	 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-						 gint            days);
-
-/* Set the maximum number of days before whole weeks are selected */
-gboolean e_calendar_item_get_display_popup      (ECalendarItem	*calitem);
-
-/* Get the maximum number of days before whole weeks are selected */
-void	 e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-						 gboolean        display);
-
-/* Set the maximum number of days before whole weeks are selected */
-gint     e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem);
-
-/* Set the maximum number of days selectable */
-void	 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-						 gint            days);
-
-/* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
-gboolean e_calendar_item_get_date_range		(ECalendarItem	*calitem,
-						 gint		*start_year,
-						 gint		*start_month,
-						 gint		*start_day,
-						 gint		*end_year,
-						 gint		*end_month,
-						 gint		*end_day);
-
-/* Returns the selected date range. It returns FALSE if no days are currently
-   selected. */
-gboolean e_calendar_item_get_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
-/* Sets the selected date range, and changes the date range shown so at least
-   the start of the selection is shown. If start_date is NULL it clears the
-   selection. */
-void	 e_calendar_item_set_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
-
-/* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
-   will result in the day being shown as bold by default. The style callback
-   could support more day_styles, or the style callback could determine the
-   colors itself, without needing to mark days. */
-void	 e_calendar_item_clear_marks		(ECalendarItem	*calitem);
-void	 e_calendar_item_mark_day		(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day,
-						 guint8		 day_style);
-
-/* Mark a range of days. Any days outside the currently shown range are
-   ignored. */
-void	 e_calendar_item_mark_days		(ECalendarItem	*calitem,
-						 gint		 start_year,
-						 gint		 start_month,
-						 gint		 start_day,
-						 gint		 end_year,
-						 gint		 end_month,
-						 gint		 end_day,
-						 guint8		 day_style);
-
-/* Sets the function to call to get the colors to use for a particular day. */
-void	 e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
-						 ECalendarItemStyleCallback cb,
-						 gpointer	 data,
-						 GtkDestroyNotify destroy);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_ITEM_H_ */
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
deleted file mode 100644
index a8a960b7dd..0000000000
--- a/widgets/misc/e-calendar.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendar - displays a table of monthly calendars, allowing highlighting
- * and selection of one or more days. Like GtkCalendar with more features.
- * Most of the functionality is in the ECalendarItem canvas item, though
- * we also add GnomeCanvasWidget buttons to go to the previous/next month and
- * to got to the current day.
- */
-
-#include <config.h>
-#include <gal/util/e-util.h>
-#include "e-calendar.h"
-
-#define E_CALENDAR_SMALL_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
-#define E_CALENDAR_SMALL_FONT_FALLBACK	\
-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"
-
-/* The space between the arrow buttons and the edge of the widget. */
-#define E_CALENDAR_ARROW_BUTTON_X_PAD	2
-#define E_CALENDAR_ARROW_BUTTON_Y_PAD	0
-
-/* Vertical padding. The padding above the button includes the space for the
-   horizontal line. */
-#define	E_CALENDAR_YPAD_ABOVE_LOWER_BUTTONS		4
-#define	E_CALENDAR_YPAD_BELOW_LOWER_BUTTONS		3
-
-/* Horizontal padding inside & between buttons. */
-#define E_CALENDAR_IXPAD_BUTTONS			4
-#define E_CALENDAR_XPAD_BUTTONS				8
-
-/* The time between steps when the prev/next buttons is pressed, in 1/1000ths
-   of a second, and the number of timeouts we skip before we start
-   automatically moving back/forward. */
-#define E_CALENDAR_AUTO_MOVE_TIMEOUT		150
-#define E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY	2
-
-static char * left_arrow_xpm[] = {
-	"7 7 3 1",
-	" 	c None",
-	".	c #949594",
-	"+	c #000000",
-	"     .+",
-	"   .+++",
-	" .+++++",
-	"+++++++",
-	" .+++++",
-	"   .+++",
-	"     .+"
-};
-
-static char * right_arrow_xpm[] = {
-	"7 7 3 1",
-	" 	c None",
-	".	c #949594",
-	"+	c #000000",
-	"+.     ",
-	"+++.   ",
-	"+++++. ",
-	"+++++++",
-	"+++++. ",
-	"+++.   ",
-	"+.     "
-};
-
-
-static void e_calendar_class_init	(ECalendarClass *class);
-static void e_calendar_init		(ECalendar	*cal);
-static void e_calendar_destroy		(GtkObject	*object);
-static void e_calendar_realize		(GtkWidget	*widget);
-static void e_calendar_style_set	(GtkWidget	*widget,
-					 GtkStyle	*previous_style);
-static void e_calendar_size_request	(GtkWidget      *widget,
-					 GtkRequisition *requisition);
-static void e_calendar_size_allocate	(GtkWidget	*widget,
-					 GtkAllocation	*allocation);
-static void e_calendar_draw		(GtkWidget	*widget,
-					 GdkRectangle	*area);
-static gint e_calendar_drag_motion	(GtkWidget      *widget,
-					 GdkDragContext *context,
-					 gint            x,
-					 gint            y,
-					 guint           time);
-static void e_calendar_drag_leave	(GtkWidget      *widget,
-					 GdkDragContext *context,
-					 guint           time);
-
-static void e_calendar_on_prev_pressed	(ECalendar	*cal);
-static void e_calendar_on_prev_released	(ECalendar	*cal);
-static void e_calendar_on_next_pressed	(ECalendar	*cal);
-static void e_calendar_on_next_released	(ECalendar	*cal);
-
-static void e_calendar_start_auto_move	(ECalendar	*cal,
-					 gboolean	 moving_forward);
-static gboolean e_calendar_auto_move_handler	(gpointer	 data);
-static void e_calendar_stop_auto_move	(ECalendar	*cal);
-
-static GnomeCanvasClass *parent_class;
-static GtkLayoutClass *grandparent_class;
-
-E_MAKE_TYPE (e_calendar, "ECalendar", ECalendar,
-	     e_calendar_class_init, e_calendar_init, E_CANVAS_TYPE)
-
-
-static void
-e_calendar_class_init (ECalendarClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (E_CANVAS_TYPE);
-	grandparent_class = gtk_type_class (GTK_TYPE_LAYOUT);
-
-	object_class->destroy = e_calendar_destroy;
-
-	widget_class->realize		   = e_calendar_realize;
-	widget_class->style_set		   = e_calendar_style_set;
- 	widget_class->size_request	   = e_calendar_size_request;
- 	widget_class->size_allocate	   = e_calendar_size_allocate;
-	widget_class->draw		   = e_calendar_draw;
-	widget_class->drag_motion	   = e_calendar_drag_motion;
-	widget_class->drag_leave	   = e_calendar_drag_leave;
-}
-
-
-static void
-e_calendar_init (ECalendar *cal)
-{
-	GnomeCanvasGroup *canvas_group;
-	GdkFont *small_font;
-	GtkWidget *button, *pixmap;
-	GdkColormap *colormap;
-	GdkPixmap *gdk_pixmap;
-	GdkBitmap *gdk_mask;
-
-	GTK_WIDGET_UNSET_FLAGS (cal, GTK_CAN_FOCUS);
-
-	/* Create the small font. */
-	small_font = gdk_font_load (E_CALENDAR_SMALL_FONT);
-	if (!small_font)
-		small_font = gdk_font_load (E_CALENDAR_SMALL_FONT_FALLBACK);
-	if (!small_font)
-		g_warning ("Couldn't load font");
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (cal)->root);
-
-	cal->calitem = E_CALENDAR_ITEM (gnome_canvas_item_new (canvas_group,
-							       e_calendar_item_get_type (),
-							       "week_number_font", small_font,
-							       NULL));
-
-	if (small_font)
-		gdk_font_unref (small_font);
-
-
-	/* Create the arrow buttons to move to the previous/next month. */
-	button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-	gtk_widget_show (button);
-	gtk_signal_connect_object (GTK_OBJECT (button), "pressed",
-				   GTK_SIGNAL_FUNC (e_calendar_on_prev_pressed),
-				   GTK_OBJECT (cal));
-	gtk_signal_connect_object (GTK_OBJECT (button), "released",
-				   GTK_SIGNAL_FUNC (e_calendar_on_prev_released),
-				   GTK_OBJECT (cal));
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal));
-	gdk_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap,
-							    &gdk_mask, NULL,
-							    left_arrow_xpm);
-	pixmap = gtk_pixmap_new (gdk_pixmap, gdk_mask);
-	gtk_widget_show (pixmap);
-	gdk_pixmap_unref (gdk_pixmap);
-	gdk_bitmap_unref (gdk_mask);
-	gtk_container_add (GTK_CONTAINER (button), pixmap);
-
-	cal->prev_item = gnome_canvas_item_new (canvas_group,
-						gnome_canvas_widget_get_type (),
-						"widget", button,
-						NULL);
-
-	button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-	gtk_widget_show (button);
-	gtk_signal_connect_object (GTK_OBJECT (button), "pressed",
-				   GTK_SIGNAL_FUNC (e_calendar_on_next_pressed),
-				   GTK_OBJECT (cal));
-	gtk_signal_connect_object (GTK_OBJECT (button), "released",
-				   GTK_SIGNAL_FUNC (e_calendar_on_next_released),
-				   GTK_OBJECT (cal));
-
-	gdk_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap,
-							    &gdk_mask, NULL,
-							    right_arrow_xpm);
-	pixmap = gtk_pixmap_new (gdk_pixmap, gdk_mask);
-	gtk_widget_show (pixmap);
-	gdk_pixmap_unref (gdk_pixmap);
-	gdk_bitmap_unref (gdk_mask);
-	gtk_container_add (GTK_CONTAINER (button), pixmap);
-
-	cal->next_item = gnome_canvas_item_new (canvas_group,
-						gnome_canvas_widget_get_type (),
-						"widget", button,
-						NULL);
-
-	cal->min_rows = 1;
-	cal->min_cols = 1;
-	cal->max_rows = -1;
-	cal->max_cols = -1;
-
-	cal->timeout_id = 0;
-}
-
-
-/**
- * e_calendar_new:
- * @Returns: a new #ECalendar.
- *
- * Creates a new #ECalendar.
- **/
-GtkWidget *
-e_calendar_new			(void)
-{
-	GtkWidget *cal;
-
-	cal = gtk_type_new (e_calendar_get_type ());
-
-	return cal;
-}
-
-
-static void
-e_calendar_destroy		(GtkObject *object)
-{
-	ECalendar *cal;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CALENDAR (object));
-
-	cal = E_CALENDAR (object);
-
-	if (cal->timeout_id != 0) {
-		gtk_timeout_remove (cal->timeout_id);
-		cal->timeout_id = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-e_calendar_realize (GtkWidget *widget)
-{
-	(*GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
-	gdk_window_set_background (GTK_LAYOUT (widget)->bin_window,
-				   &widget->style->bg[GTK_STATE_NORMAL]);
-}
-
-
-static void
-e_calendar_style_set		(GtkWidget	*widget,
-				 GtkStyle	*previous_style)
-{
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set) (widget,
-							       previous_style);
-
-	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
-	if (GTK_WIDGET_REALIZED (widget->parent))
-		gdk_window_set_background (GTK_LAYOUT (widget)->bin_window,
-					   &widget->style->bg[GTK_STATE_NORMAL]);
-}
-
-
-static void
-e_calendar_size_request		(GtkWidget      *widget,
-				 GtkRequisition *requisition)
-{
-	ECalendar *cal;
-	GtkStyle *style;
-	gint col_width, row_height, width, height;
-
-	cal = E_CALENDAR (widget);
-	style = GTK_WIDGET (cal)->style;
-
-	gtk_object_get (GTK_OBJECT (cal->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	height = row_height * cal->min_rows;
-	width = col_width * cal->min_cols;
-
-	requisition->width = width + style->klass->xthickness * 2;
-	requisition->height = height + style->klass->ythickness * 2;
-}
-
-
-static void
-e_calendar_size_allocate	(GtkWidget	*widget,
-				 GtkAllocation	*allocation)
-{
-	ECalendar *cal;
-	GdkFont *font;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-	gdouble xthickness, ythickness, arrow_button_size;
-
-	cal = E_CALENDAR (widget);
-	font = widget->style->font;
-	xthickness = widget->style->klass->xthickness;
-	ythickness = widget->style->klass->ythickness;
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	/* Set the scroll region to its allocated size, if changed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (cal),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = widget->allocation.width - 1;
-	new_y2 = widget->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (cal),
-						0, 0, new_x2, new_y2);
-
-	/* Take off space for line & buttons if shown. */
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "x1", 0.0,
-			       "y1", 0.0,
-			       "x2", new_x2,
-			       "y2", new_y2,
-			       NULL);
-
-
-	/* Position the arrow buttons. */
-	arrow_button_size = font->ascent + font->descent
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
-		- E_CALENDAR_ARROW_BUTTON_Y_PAD * 2;
-
-	gnome_canvas_item_set (cal->prev_item,
-			       "x", xthickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_X_PAD,
-			       "y", ythickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
-			       "width", arrow_button_size,
-			       "height", arrow_button_size,
-			       NULL);
-
-	gnome_canvas_item_set (cal->next_item,
-			       "x", new_x2 + 1 - xthickness * 2
-			       - E_CALENDAR_ARROW_BUTTON_X_PAD
-			       - arrow_button_size,
-			       "y", ythickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
-			       "width", arrow_button_size,
-			       "height", arrow_button_size,
-			       NULL);
-}
-
-
-static void
-e_calendar_draw			(GtkWidget	*widget,
-				 GdkRectangle	*area)
-{
-	ECalendar *cal;
-
-	cal = E_CALENDAR (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
-
-	/* GnomeCanvas bug workaround to draw the GnomeCanvasWidgets. */
-#if 0
-	(*GTK_WIDGET_CLASS (grandparent_class)->draw) (widget, area);
-#endif
-}
-
-
-void
-e_calendar_set_minimum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
-{
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	cal->min_rows = rows;
-	cal->min_cols = cols;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "minimum_rows", rows,
-			       "minimum_columns", cols,
-			       NULL);
-
-	gtk_widget_queue_resize (GTK_WIDGET (cal));
-}
-
-
-void
-e_calendar_set_maximum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
-{
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	cal->max_rows = rows;
-	cal->max_cols = cols;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "maximum_rows", rows,
-			       "maximum_columns", cols,
-			       NULL);
-
-	gtk_widget_queue_resize (GTK_WIDGET (cal));
-}
-
-
-/* Returns the border size on each side of the month displays. */
-void
-e_calendar_get_border_size	(ECalendar	*cal,
-				 gint		*top,
-				 gint		*bottom,
-				 gint		*left,
-				 gint		*right)
-{
-	GtkStyle *style;
-
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	style = GTK_WIDGET (cal)->style;
-
-	if (style) {
-		*top    = style->klass->ythickness;
-		*bottom = style->klass->ythickness;
-		*left   = style->klass->xthickness;
-		*right  = style->klass->xthickness;
-	} else {
-		*top = *bottom = *left = *right = 0;
-	}
-}
-
-
-static void
-e_calendar_on_prev_pressed	(ECalendar	*cal)
-{
-	e_calendar_start_auto_move (cal, FALSE);
-}
-
-
-static void
-e_calendar_on_next_pressed	(ECalendar	*cal)
-{
-	e_calendar_start_auto_move (cal, TRUE);
-}
-
-
-static void
-e_calendar_start_auto_move	(ECalendar	*cal,
-				 gboolean	 moving_forward)
-{
-	ECalendarItem *calitem;
-	gint offset;
-
-	if (cal->timeout_id == 0) {
-		cal->timeout_id = g_timeout_add (E_CALENDAR_AUTO_MOVE_TIMEOUT,
-						 e_calendar_auto_move_handler,
-						 cal);
-	}
-	cal->timeout_delay = E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY;
-	cal->moving_forward = moving_forward;
-
-	calitem = cal->calitem;
-	offset = cal->moving_forward ? 1 : -1;
-	e_calendar_item_set_first_month (calitem, calitem->year,
-					 calitem->month + offset);
-}
-
-
-static gboolean
-e_calendar_auto_move_handler	(gpointer	 data)
-{
-	ECalendar *cal;
-	ECalendarItem *calitem;
-	gint offset;
-
-	g_return_val_if_fail (E_IS_CALENDAR (data), FALSE);
-
-	cal = E_CALENDAR (data);
-	calitem = cal->calitem;
-
-	GDK_THREADS_ENTER ();
-
-	if (cal->timeout_delay > 0) {
-		cal->timeout_delay--;
-	} else {
-		offset = cal->moving_forward ? 1 : -1;
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + offset);
-	}
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-static void
-e_calendar_on_prev_released	(ECalendar	*cal)
-{
-	e_calendar_stop_auto_move (cal);
-}
-
-
-static void
-e_calendar_on_next_released	(ECalendar	*cal)
-{
-	e_calendar_stop_auto_move (cal);
-}
-
-
-static void
-e_calendar_stop_auto_move	(ECalendar	*cal)
-{
-	if (cal->timeout_id != 0) {
-		gtk_timeout_remove (cal->timeout_id);
-		cal->timeout_id = 0;
-	}
-}
-
-
-static gint
-e_calendar_drag_motion (GtkWidget      *widget,
-			GdkDragContext *context,
-			gint            x,
-			gint            y,
-			guint           time)
-{
-	ECalendar *cal;
-
-	g_return_val_if_fail (E_IS_CALENDAR (widget), FALSE);
-
-	cal = E_CALENDAR (widget);
-
-#if 0
-	g_print ("In e_calendar_drag_motion\n");
-#endif
-
-	return FALSE;
-}
-
-
-static void
-e_calendar_drag_leave (GtkWidget      *widget,
-		       GdkDragContext *context,
-		       guint           time)
-{
-	ECalendar *cal;
-
-	g_return_if_fail (E_IS_CALENDAR (widget));
-
-	cal = E_CALENDAR (widget);
-
-#if 0
-	g_print ("In e_calendar_drag_leave\n");
-#endif
-}
-
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
deleted file mode 100644
index 417b90d630..0000000000
--- a/widgets/misc/e-calendar.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_H_
-#define _E_CALENDAR_H_
-
-#include <gtk/gtkwidget.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-calendar-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendar - displays a table of monthly calendars, allowing highlighting
- * and selection of one or more days. Like GtkCalendar with more features.
- * Most of the functionality is in the ECalendarItem canvas item, though
- * we also add GnomeCanvasWidget buttons to go to the previous/next month and
- * to got to the current day.
- */
-
-#define E_CALENDAR(obj)          GTK_CHECK_CAST (obj, e_calendar_get_type (), ECalendar)
-#define E_CALENDAR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_get_type (), ECalendarClass)
-#define E_IS_CALENDAR(obj)       GTK_CHECK_TYPE (obj, e_calendar_get_type ())
-
-
-typedef struct _ECalendar       ECalendar;
-typedef struct _ECalendarClass  ECalendarClass;
-
-struct _ECalendar
-{
-	ECanvas canvas;
-
-	ECalendarItem *calitem;
-
-	GnomeCanvasItem *prev_item;
-	GnomeCanvasItem *next_item;
-
-	gint min_rows;
-	gint min_cols;
-
-	gint max_rows;
-	gint max_cols;
-
-	/* These are all used when the prev/next buttons are held down.
-	   moving_forward is TRUE if we are moving forward in time, i.e. the
-	   next button is pressed. */
-	gint timeout_id;
-	gint timeout_delay;
-	gboolean moving_forward;
-};
-
-struct _ECalendarClass
-{
-	ECanvasClass parent_class;
-};
-
-
-GtkType	   e_calendar_get_type		(void);
-GtkWidget* e_calendar_new		(void);
-
-void	   e_calendar_set_minimum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-void	   e_calendar_set_maximum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-
-/* Returns the border size on each side of the month displays. */
-void	   e_calendar_get_border_size	(ECalendar	*cal,
-					 gint		*top,
-					 gint		*bottom,
-					 gint		*left,
-					 gint		*right);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_H_ */
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
deleted file mode 100644
index 50fcf0d7e5..0000000000
--- a/widgets/misc/e-canvas-utils.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-canvas-utils.h"
-
-void
-e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy)
-{
-	double translate[6];
-
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-
-	art_affine_translate (translate, dx, dy);
-
-	gnome_canvas_item_affine_absolute (item, translate);
-}
-
-static double
-compute_offset(int top, int bottom, int page_top, int page_bottom)
-{
-	int size = bottom - top;
-	int offset = 0;
-
-	if (top <= page_top && bottom >= page_bottom)
-		return 0;
-
-	if (bottom > page_bottom)
-		offset = (bottom - page_bottom);
-	if (top < page_top + offset)
-		offset = (top - page_top);
-
-	if (top <= page_top + offset && bottom >= page_bottom + offset)
-		return offset;
-
-	if (top < page_top + size * 3 / 2 + offset)
-		offset = top - (page_top + size * 3 / 2);
-	if (bottom > page_bottom - size * 3 / 2 + offset)
-		offset = bottom - (page_bottom - size * 3 / 2);
-	if (top < page_top + size * 3 / 2 + offset)
-		offset = top - ((page_top + page_bottom - (bottom - top)) / 2);
-
-	return offset;
-}
-
-
-static void
-e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
-{
-	GtkAdjustment *h, *v;
-	int dx = 0, dy = 0;
-	
-	g_return_if_fail (canvas != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-
-	h = gtk_layout_get_hadjustment(GTK_LAYOUT(canvas));
-	dx = compute_offset(x1, x2, h->value, h->value + h->page_size);
-	if (dx)
-		gtk_adjustment_set_value(h, CLAMP(h->value + dx, h->lower, h->upper - h->page_size));
-
-	v = gtk_layout_get_vadjustment(GTK_LAYOUT(canvas));
-	dy = compute_offset(y1, y2, v->value, v->value + v->page_size);
-	if (dy)
-		gtk_adjustment_set_value(v, CLAMP(v->value + dy, v->lower, v->upper - v->page_size));
-}
-
-void
-e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, double y2)
-{
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	
-	gnome_canvas_item_i2w(item, &x1, &y1);
-	gnome_canvas_item_i2w(item, &x2, &y2);
-
-	e_canvas_show_area(item->canvas, x1, y1, x2, y2);
-}
-
-typedef struct {
-	double x1;
-	double y1;
-	double x2;
-	double y2;
-	GnomeCanvas *canvas;
-} DoubsAndCanvas;
-
-static gboolean
-show_area_timeout (gpointer data)
-{
-	DoubsAndCanvas *dac = data;
-
-	if (!GTK_OBJECT_DESTROYED(dac->canvas))
-		e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
-	gtk_object_unref(GTK_OBJECT(dac->canvas));
-	g_free(dac);
-	return FALSE;
-}
-
-void
-e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay)
-{
-	DoubsAndCanvas *dac;
-	
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	
-	gnome_canvas_item_i2w(item, &x1, &y1);
-	gnome_canvas_item_i2w(item, &x2, &y2);
-
-	dac = g_new(DoubsAndCanvas, 1);
-	dac->x1 = x1;
-	dac->y1 = y1;
-	dac->x2 = x2;
-	dac->y2 = y2;
-	dac->canvas = item->canvas;
-	gtk_object_ref(GTK_OBJECT(item->canvas));
-	g_timeout_add(delay, show_area_timeout, dac);
-}
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
deleted file mode 100644
index 402b0048c6..0000000000
--- a/widgets/misc/e-canvas-utils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-utils.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CANVAS_UTILS__
-#define __E_CANVAS_UTILS__
-
-#include <gnome.h>
-
-BEGIN_GNOME_DECLS
-
-void e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy);
-void e_canvas_item_show_area     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2);
-void e_canvas_item_show_area_delayed     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay);
-
-END_GNOME_DECLS
-
-#endif /* __E_CANVAS_UTILS__ */
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
deleted file mode 100644
index 0b609f3e1c..0000000000
--- a/widgets/misc/e-canvas-vbox.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-vbox.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <math.h>
-#include "e-canvas-vbox.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "gal/util/e-util.h"
-
-static void e_canvas_vbox_init		(ECanvasVbox		 *CanvasVbox);
-static void e_canvas_vbox_class_init	(ECanvasVboxClass	 *klass);
-static void e_canvas_vbox_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_canvas_vbox_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_canvas_vbox_destroy (GtkObject *object);
-
-static gint e_canvas_vbox_event   (GnomeCanvasItem *item, GdkEvent *event);
-static void e_canvas_vbox_realize (GnomeCanvasItem *item);
-
-static void e_canvas_vbox_reflow (GnomeCanvasItem *item, int flags);
-
-static void e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
-static void e_canvas_vbox_resize_children (GnomeCanvasItem *item);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_HEIGHT,
-	ARG_SPACING,
-};
-
-GtkType
-e_canvas_vbox_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "ECanvasVbox",
-        sizeof (ECanvasVbox),
-        sizeof (ECanvasVboxClass),
-        (GtkClassInitFunc) e_canvas_vbox_class_init,
-        (GtkObjectInitFunc) e_canvas_vbox_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (gnome_canvas_group_get_type (), &info);
-    }
-
-  return type;
-}
-
-static void
-e_canvas_vbox_class_init (ECanvasVboxClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("ECanvasVbox::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ECanvasVbox::minimum_width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); 
-	gtk_object_add_arg_type ("ECanvasVbox::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ECanvasVbox::spacing", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_SPACING);
-
-	klass->add_item       = e_canvas_vbox_real_add_item;
- 
-	object_class->set_arg   = e_canvas_vbox_set_arg;
-	object_class->get_arg   = e_canvas_vbox_get_arg;
-	object_class->destroy   = e_canvas_vbox_destroy;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->event       = e_canvas_vbox_event;
-	item_class->realize     = e_canvas_vbox_realize;
-}
-
-static void
-e_canvas_vbox_init (ECanvasVbox *vbox)
-{
-	vbox->items = NULL;
-
-	vbox->width = 10;
-	vbox->minimum_width = 10;
-	vbox->height = 10;
-	vbox->spacing = 0;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(vbox), e_canvas_vbox_reflow);
-}
-
-static void
-e_canvas_vbox_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECanvasVbox *e_canvas_vbox;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_canvas_vbox = E_CANVAS_VBOX (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-	case ARG_MINIMUM_WIDTH:
-		e_canvas_vbox->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		e_canvas_vbox_resize_children(item);
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_SPACING:
-		e_canvas_vbox->spacing = GTK_VALUE_DOUBLE (*arg);
-		e_canvas_item_request_reflow(item);
-		break;
-	}
-}
-
-static void
-e_canvas_vbox_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECanvasVbox *e_canvas_vbox;
-
-	e_canvas_vbox = E_CANVAS_VBOX (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->minimum_width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->height;
-		break;
-	case ARG_SPACING:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->spacing;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_canvas_vbox_destroy (GtkObject *object)
-{
-	ECanvasVbox *vbox = E_CANVAS_VBOX(object);
-
-	g_list_foreach(vbox->items, (GFunc) gtk_object_unref, NULL);
-	g_list_free(vbox->items);
-	vbox->items = NULL;
-	
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static gint
-e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	gint return_val = TRUE;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		switch (event->key.keyval) {
-		case GDK_Left:
-		case GDK_KP_Left:
-		case GDK_Right:
-		case GDK_KP_Right:
-		case GDK_Down:
-		case GDK_KP_Down:
-		case GDK_Up:
-		case GDK_KP_Up:
-		case GDK_Return:
-		case GDK_KP_Enter:
-			return_val = TRUE;
-			break;
-		default:
-			return_val = FALSE;
-			break;
-		}
-		break;
-	default:
-		return_val = FALSE;
-		break;
-	}
-	if (!return_val) {
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS (parent_class)->event (item, event);
-	}
-	return return_val;
-	
-}
-
-static void
-e_canvas_vbox_realize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_canvas_vbox_resize_children(item);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_canvas_vbox_remove_item (GnomeCanvasItem *item, ECanvasVbox *vbox)
-{
-	vbox->items = g_list_remove(vbox->items, item);
-	gtk_object_unref(GTK_OBJECT(vbox));
-}
-
-static void
-e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
-{
-	e_canvas_vbox->items = g_list_append(e_canvas_vbox->items, item);
-	gtk_object_ref(GTK_OBJECT(item));
-	gtk_object_ref(GTK_OBJECT(e_canvas_vbox));
-	gtk_signal_connect(GTK_OBJECT(item), "destroy",
-			   GTK_SIGNAL_FUNC(e_canvas_vbox_remove_item), e_canvas_vbox);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		gnome_canvas_item_set(item,
-				      "width", (double) e_canvas_vbox->minimum_width,
-				      NULL);
-		e_canvas_item_request_reflow(item);
-	}
-
-}
-
-static void
-e_canvas_vbox_resize_children (GnomeCanvasItem *item)
-{
-	GList *list;
-	ECanvasVbox *e_canvas_vbox;
-
-	e_canvas_vbox = E_CANVAS_VBOX (item);
-	for ( list = e_canvas_vbox->items; list; list = list->next ) {
-		GnomeCanvasItem *child = GNOME_CANVAS_ITEM(list->data);
-		gnome_canvas_item_set(child,
-				      "width", (double) e_canvas_vbox->minimum_width,
-				      NULL);
-	}
-}
-
-static void
-e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags )
-{
-	ECanvasVbox *e_canvas_vbox = E_CANVAS_VBOX(item);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
-
-		gdouble old_height;
-		gdouble running_height;
-		gdouble old_width;
-		gdouble max_width;
-
-		old_width = e_canvas_vbox->width;
-		max_width = e_canvas_vbox->minimum_width;
-
-		old_height = e_canvas_vbox->height;
-		running_height = 0;
-
-		if (e_canvas_vbox->items == NULL) {
-		} else {
-			GList *list;
-			gdouble item_height;
-			gdouble item_width;
-
-			list = e_canvas_vbox->items;
-			gtk_object_get (GTK_OBJECT(list->data),
-					"height", &item_height,
-					"width", &item_width,
-					NULL);
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-						    (double) 0,
-						    (double) running_height);
-			running_height += item_height;
-			if (max_width < item_width)
-				max_width = item_width;
-			list = g_list_next(list);
-			
-			for( ; list; list = g_list_next(list)) {
-				running_height += e_canvas_vbox->spacing;
-
-				gtk_object_get (GTK_OBJECT(list->data),
-						"height", &item_height,
-						"width", &item_width,
-						NULL);
-
-				e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-							    (double) 0,
-							    (double) running_height);
-
-				running_height += item_height;
-				if (max_width < item_width)
-					max_width = item_width;
-			}
-				 
-		}
-		e_canvas_vbox->height = running_height;
-		e_canvas_vbox->width = max_width;
-		if (old_height != e_canvas_vbox->height ||
-		    old_width !=  e_canvas_vbox->width)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-void
-e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
-{
-	if (E_CANVAS_VBOX_CLASS(GTK_OBJECT(e_canvas_vbox)->klass)->add_item)
-		(E_CANVAS_VBOX_CLASS(GTK_OBJECT(e_canvas_vbox)->klass)->add_item) (e_canvas_vbox, item);
-}
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
deleted file mode 100644
index e7e9140c1e..0000000000
--- a/widgets/misc/e-canvas-vbox.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-canvas-vbox.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CANVAS_VBOX_H__
-#define __E_CANVAS_VBOX_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ECanvasVbox - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the CanvasVbox
- * height       double          R               height of the CanvasVbox
- * spacing      double          RW              Spacing between items.
- */
-
-#define E_CANVAS_VBOX_TYPE			(e_canvas_vbox_get_type ())
-#define E_CANVAS_VBOX(obj)			(GTK_CHECK_CAST ((obj), E_CANVAS_VBOX_TYPE, ECanvasVbox))
-#define E_CANVAS_VBOX_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CANVAS_VBOX_TYPE, ECanvasVboxClass))
-#define E_IS_CANVAS_VBOX(obj)		(GTK_CHECK_TYPE ((obj), E_CANVAS_VBOX_TYPE))
-#define E_IS_CANVAS_VBOX_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CANVAS_VBOX_TYPE))
-
-
-typedef struct _ECanvasVbox       ECanvasVbox;
-typedef struct _ECanvasVboxClass  ECanvasVboxClass;
-
-struct _ECanvasVbox
-{
-	GnomeCanvasGroup parent;
-
-	/* item specific fields */
-	GList *items; /* Of type GnomeCanvasItem */
-
-	double width;
-	double minimum_width;
-	double height;
-	double spacing;
-};
-
-struct _ECanvasVboxClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	/* Virtual methods. */
-	void (* add_item) (ECanvasVbox *CanvasVbox, GnomeCanvasItem *item);
-};
-
-/* 
- * To be added to a CanvasVbox, an item must have the argument "width" as
- * a Read/Write argument and "height" as a Read Only argument.  It
- * should also do an ECanvas parent CanvasVbox request if its size
- * changes.
- */
-void       e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
-GtkType    e_canvas_vbox_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CANVAS_VBOX_H__ */
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
deleted file mode 100644
index ffc3a333f8..0000000000
--- a/widgets/misc/e-canvas.c
+++ /dev/null
@@ -1,704 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-canvas.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-canvas.h"
-
-static void e_canvas_init           (ECanvas         *card);
-static void e_canvas_destroy        (GtkObject        *object);
-static void e_canvas_class_init	    (ECanvasClass    *klass);
-static void e_canvas_realize        (GtkWidget        *widget);
-static void e_canvas_unrealize      (GtkWidget        *widget);
-static gint e_canvas_key            (GtkWidget        *widget,
-				     GdkEventKey      *event);
-
-static gint e_canvas_focus_in       (GtkWidget        *widget,
-				     GdkEventFocus    *event);
-static gint e_canvas_focus_out      (GtkWidget        *widget,
-				     GdkEventFocus    *event);
-
-static int emit_event (GnomeCanvas *canvas, GdkEvent *event);
-
-static GnomeCanvasClass *parent_class = NULL;
-
-enum {
-	REFLOW,
-	LAST_SIGNAL
-};
-
-static guint e_canvas_signals [LAST_SIGNAL] = { 0, };
-
-GtkType
-e_canvas_get_type (void)
-{
-	static GtkType canvas_type = 0;
-
-	if (!canvas_type)
-	{
-		static const GtkTypeInfo canvas_info =
-		{
-			"ECanvas",
-			sizeof (ECanvas),
-			sizeof (ECanvasClass),
-			(GtkClassInitFunc) e_canvas_class_init,
-			(GtkObjectInitFunc) e_canvas_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		canvas_type = gtk_type_unique (gnome_canvas_get_type (), &canvas_info);
-	}
-
-	return canvas_type;
-}
-
-static void
-e_canvas_class_init (ECanvasClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasClass *canvas_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass*) klass;
-	canvas_class = (GnomeCanvasClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_get_type ());
-
-	object_class->destroy = e_canvas_destroy;
-
-	widget_class->key_press_event = e_canvas_key;
-	widget_class->key_release_event = e_canvas_key;
-	widget_class->focus_in_event = e_canvas_focus_in;
-	widget_class->focus_out_event = e_canvas_focus_out;
-	widget_class->realize = e_canvas_realize;
-	widget_class->unrealize = e_canvas_unrealize;
-
-	klass->reflow = NULL;
-
-	e_canvas_signals [REFLOW] =
-		gtk_signal_new ("reflow",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECanvasClass, reflow),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_canvas_signals, LAST_SIGNAL);
-}
-
-static void
-e_canvas_init (ECanvas *canvas)
-{
-	canvas->selection = NULL;
-	canvas->cursor = NULL;
-	canvas->ic = NULL;
-	canvas->ic_attr = NULL;
-}
-
-static void
-e_canvas_destroy (GtkObject *object)
-{
-	ECanvas *canvas = E_CANVAS(object);
-
-	if (canvas->idle_id)
-		g_source_remove(canvas->idle_id);
-
-	if ((GTK_OBJECT_CLASS (parent_class))->destroy)
-		(*(GTK_OBJECT_CLASS (parent_class))->destroy) (object);
-}
-
-GtkWidget *
-e_canvas_new ()
-{
-	return GTK_WIDGET (gtk_type_new (e_canvas_get_type ()));
-}
-
-
-/* Returns whether the item is an inferior of or is equal to the parent. */
-static int
-is_descendant (GnomeCanvasItem *item, GnomeCanvasItem *parent)
-{
-	for (; item; item = item->parent)
-		if (item == parent)
-			return TRUE;
-
-	return FALSE;
-}
-
-/* Emits an event for an item in the canvas, be it the current item, grabbed
- * item, or focused item, as appropriate.
- */
-static int
-emit_event (GnomeCanvas *canvas, GdkEvent *event)
-{
-	GdkEvent ev;
-	gint finished;
-	GnomeCanvasItem *item;
-	GnomeCanvasItem *parent;
-	guint mask;
-
-	/* Perform checks for grabbed items */
-
-	if (canvas->grabbed_item && !is_descendant (canvas->current_item, canvas->grabbed_item))
-		return FALSE;
-
-	if (canvas->grabbed_item) {
-		switch (event->type) {
-		case GDK_ENTER_NOTIFY:
-			mask = GDK_ENTER_NOTIFY_MASK;
-			break;
-
-		case GDK_LEAVE_NOTIFY:
-			mask = GDK_LEAVE_NOTIFY_MASK;
-			break;
-
-		case GDK_MOTION_NOTIFY:
-			mask = GDK_POINTER_MOTION_MASK;
-			break;
-
-		case GDK_BUTTON_PRESS:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			mask = GDK_BUTTON_PRESS_MASK;
-			break;
-
-		case GDK_BUTTON_RELEASE:
-			mask = GDK_BUTTON_RELEASE_MASK;
-			break;
-
-		case GDK_KEY_PRESS:
-			mask = GDK_KEY_PRESS_MASK;
-			break;
-
-		case GDK_KEY_RELEASE:
-			mask = GDK_KEY_RELEASE_MASK;
-			break;
-
-		default:
-			mask = 0;
-			break;
-		}
-
-		if (!(mask & canvas->grabbed_event_mask))
-			return FALSE;
-	}
-
-	/* Convert to world coordinates -- we have two cases because of diferent
-	 * offsets of the fields in the event structures.
-	 */
-
-	ev = *event;
-
-	switch (ev.type) {
-	case GDK_ENTER_NOTIFY:
-	case GDK_LEAVE_NOTIFY:
-		gnome_canvas_window_to_world (canvas,
-					      ev.crossing.x, ev.crossing.y,
-					      &ev.crossing.x, &ev.crossing.y);
-		break;
-
-	case GDK_MOTION_NOTIFY:
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		gnome_canvas_window_to_world (canvas,
-					      ev.motion.x, ev.motion.y,
-					      &ev.motion.x, &ev.motion.y);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Choose where we send the event */
-
-	item = canvas->current_item;
-
-	if (canvas->focused_item
-	    && ((event->type == GDK_KEY_PRESS) || (event->type == GDK_KEY_RELEASE) || (event->type == GDK_FOCUS_CHANGE)))
-		item = canvas->focused_item;
-
-	/* The event is propagated up the hierarchy (for if someone connected to
-	 * a group instead of a leaf event), and emission is stopped if a
-	 * handler returns TRUE, just like for GtkWidget events.
-	 */
-
-	finished = FALSE;
-
-	while (item && !finished) {
-		gtk_object_ref (GTK_OBJECT (item));
-
-		gtk_signal_emit_by_name (GTK_OBJECT (item), "event",
-					 &ev,
-					 &finished);
-
-		if (GTK_OBJECT_DESTROYED (item))
-			finished = TRUE;
-
-		parent = item->parent;
-		gtk_object_unref (GTK_OBJECT (item));
-
-		item = parent;
-	}
-
-	return finished;
-}
-
-/* Key event handler for the canvas */
-static gint
-e_canvas_key (GtkWidget *widget, GdkEventKey *event)
-{
-	GnomeCanvas *canvas;
-	GdkEvent full_event;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CANVAS (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	canvas = GNOME_CANVAS (widget);
-	
-	full_event.key = *event;
-
-	return emit_event (canvas, &full_event);
-}
-
-
-/**
- * e_canvas_item_grab_focus:
- * @item: A canvas item.
- *
- * Makes the specified item take the keyboard focus, so all keyboard events will
- * be sent to it.  If the canvas widget itself did not have the focus, it grabs
- * it as well.
- **/
-void
-e_canvas_item_grab_focus (GnomeCanvasItem *item)
-{
-	GnomeCanvasItem *focused_item;
-	GdkEvent ev;
-
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	g_return_if_fail (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)));
-
-	focused_item = item->canvas->focused_item;
-
-	if (focused_item) {
-		ev.focus_change.type = GDK_FOCUS_CHANGE;
-		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
-		ev.focus_change.send_event = FALSE;
-		ev.focus_change.in = FALSE;
-
-		emit_event (item->canvas, &ev);
-	}
-
-	item->canvas->focused_item = item;
-
-	if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET(item->canvas))) {
-		gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
-	}
-
-	if (focused_item) {
-		ev.focus_change.type = GDK_FOCUS_CHANGE;
-		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
-		ev.focus_change.send_event = FALSE;
-		ev.focus_change.in = TRUE;
-
-		emit_event (item->canvas, &ev);
-	}
-}
-
-/* Focus in handler for the canvas */
-static gint
-e_canvas_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	GnomeCanvas *canvas;
-	ECanvas *ecanvas;
-	GdkEvent full_event;
-
-	canvas = GNOME_CANVAS (widget);
-	ecanvas = E_CANVAS (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	if (ecanvas->ic)
-		gdk_im_begin (ecanvas->ic, canvas->layout.bin_window);
-
-	if (canvas->focused_item) {
-		full_event.focus_change = *event;
-		return emit_event (canvas, &full_event);
-	} else {
-		return FALSE;
-	}
-}
-
-/* Focus out handler for the canvas */
-static gint
-e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	GnomeCanvas *canvas;
-	ECanvas *ecanvas;
-	GdkEvent full_event;
-
-	canvas = GNOME_CANVAS (widget);
-	ecanvas = E_CANVAS (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	if (ecanvas->ic)
-		gdk_im_end ();
-
-	if (canvas->focused_item) {
-		full_event.focus_change = *event;
-		return emit_event (canvas, &full_event);
-	} else {
-		return FALSE;
-	}
-}
-
-static void
-e_canvas_realize (GtkWidget *widget)
-{
-	ECanvas *ecanvas = E_CANVAS (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window, NULL, FALSE);
-
-	if (gdk_im_ready () && (ecanvas->ic_attr = gdk_ic_attr_new ()) != NULL) {
-		GdkEventMask mask;
-		GdkICAttr *attr = ecanvas->ic_attr;
-		GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
-		GdkIMStyle style;
-		GdkIMStyle supported_style = GDK_IM_PREEDIT_NONE |
-			GDK_IM_PREEDIT_NOTHING |
-			GDK_IM_STATUS_NONE |
-			GDK_IM_STATUS_NOTHING;
-
-		attr->style = style = gdk_im_decide_style (supported_style);
-		attr->client_window = ecanvas->parent.layout.bin_window;
-
-		ecanvas->ic = gdk_ic_new (attr, attrmask);
-		if (ecanvas->ic != NULL) {
-			mask = gdk_window_get_events (attr->client_window);
-			mask |= gdk_ic_get_events (ecanvas->ic);
-			gdk_window_set_events (attr->client_window, mask);
-
-			if (GTK_WIDGET_HAS_FOCUS (widget))
-				gdk_im_begin (ecanvas->ic, attr->client_window);
-		} else
-			g_warning ("Can't create input context.");
-	}
-
-}
-
-static void
-e_canvas_unrealize (GtkWidget *widget)
-{
-	ECanvas * ecanvas = E_CANVAS (widget);
-	if (ecanvas->ic) {
-		gdk_ic_destroy (ecanvas->ic);
-		ecanvas->ic = NULL;
-	}
-	if (ecanvas->ic_attr) {
-		gdk_ic_attr_destroy (ecanvas->ic_attr);
-		ecanvas->ic_attr = NULL;
-	}
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-e_canvas_item_invoke_reflow (GnomeCanvasItem *item, int flags)
-{
-	GnomeCanvasGroup *group;
-	GList *list;
-	GnomeCanvasItem *child;
-
-	if (GNOME_IS_CANVAS_GROUP (item)) {
-		group = GNOME_CANVAS_GROUP (item);
-		for (list = group->item_list; list; list = list->next) {
-			child = GNOME_CANVAS_ITEM (list->data);
-			if (child->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-				e_canvas_item_invoke_reflow (child, flags);
-		}
-	}
-
-	if (item->object.flags & E_CANVAS_ITEM_NEEDS_REFLOW) {
-		ECanvasItemReflowFunc func;
-		func = gtk_object_get_data (GTK_OBJECT (item),
-					    "ECanvasItem::reflow_callback");
-		if (func)
-			func (item, flags);
-	}
-
-	item->object.flags &= ~E_CANVAS_ITEM_NEEDS_REFLOW;
-	item->object.flags &= ~E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW;
-}
-
-static void
-do_reflow (ECanvas *canvas)
-{
-	if (GNOME_CANVAS(canvas)->root->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-		e_canvas_item_invoke_reflow (GNOME_CANVAS(canvas)->root, 0);
-}
-
-/* Idle handler for the e-canvas.  It deals with pending reflows. */
-static gint
-idle_handler (gpointer data)
-{
-	ECanvas *canvas;
-
-	GDK_THREADS_ENTER();
-
-	canvas = E_CANVAS (data);
-	do_reflow (canvas);
-
-	/* Reset idle id */
-	canvas->idle_id = 0;
-
-	gtk_signal_emit (GTK_OBJECT (canvas),
-			 e_canvas_signals [REFLOW]);
-
-	GDK_THREADS_LEAVE();
-
-	return FALSE;
-}
-
-/* Convenience function to add an idle handler to a canvas */
-static void
-add_idle (ECanvas *canvas)
-{
-	if (canvas->idle_id != 0)
-		return;
-
-	canvas->idle_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_handler, (gpointer) canvas, NULL);
-}
-
-static void
-e_canvas_item_descendent_needs_reflow (GnomeCanvasItem *item)
-{
-	if (item->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-		return;
-
-	item->object.flags |= E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW;
-	if (item->parent)
-		e_canvas_item_descendent_needs_reflow(item->parent);
-}
-
-void
-e_canvas_item_request_reflow (GnomeCanvasItem *item)
-{
-	if (item->object.flags & GNOME_CANVAS_ITEM_REALIZED) {
-		item->object.flags |= E_CANVAS_ITEM_NEEDS_REFLOW;
-		e_canvas_item_descendent_needs_reflow(item);
-		add_idle(E_CANVAS(item->canvas));
-	}
-}
-
-void
-e_canvas_item_request_parent_reflow (GnomeCanvasItem *item)
-{
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	e_canvas_item_request_reflow(item->parent);
-}
-
-void
-e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::reflow_callback", (gpointer) func);
-}
-
-
-void
-e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::selection_callback", (gpointer) func);
-}
-
-void
-e_canvas_item_set_selection_compare_callback (GnomeCanvasItem *item, ECanvasItemSelectionCompareFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::selection_compare_callback", (gpointer) func);
-}
-
-void
-e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
-{
-	GList *list;
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	ECanvasItemSelectionFunc func;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	canvas = E_CANVAS(item->canvas);
-	flags = E_CANVAS_ITEM_SELECTION_DELETE_DATA;
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		info = list->data;
-
-		func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
-		if (func)
-			func(info->item, flags, info->id);
-		g_message ("ECANVAS: free info (2): item %p, id %p",
-			   info->item, info->id);
-		gtk_object_unref (GTK_OBJECT (info->item));
-		g_free(info);
-	}
-	g_list_free(canvas->selection);
-
-	canvas->selection = NULL;
-
-	gnome_canvas_item_grab_focus(item);
-
-	info = g_new(ECanvasSelectionInfo, 1);
-	info->item = item;
-	gtk_object_ref (GTK_OBJECT (info->item));
-	info->id = id;
-	g_message ("ECANVAS: new info item %p, id %p", item, id);
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
-	func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-	if (func)
-		func(item, flags, id);
-
-	canvas->selection = g_list_prepend(canvas->selection, info);
-	canvas->cursor = info;
-}
-
-void
-e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id)
-{
-}
-
-void
-e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
-{
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	ECanvasItemSelectionFunc func;
-	GList *list;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT;
-	canvas = E_CANVAS(item->canvas);
-
-	if (canvas->cursor) {
-		func = gtk_object_get_data(GTK_OBJECT(canvas->cursor->item), "ECanvasItem::selection_callback");
-		if (func)
-			func(canvas->cursor->item, flags, canvas->cursor->id);
-	}
-
-	gnome_canvas_item_grab_focus(item);
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		ECanvasSelectionInfo *search;
-		search = list->data;
-
-		if (search->item == item) {
-			ECanvasItemSelectionCompareFunc compare_func;
-			compare_func = gtk_object_get_data(GTK_OBJECT(search->item), "ECanvasItem::selection_compare_callback");
-
-			if (compare_func(search->item, search->id, id, 0) == 0) {
-				canvas->cursor = search;
-				func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-				if (func)
-					func(item, flags, search->id);
-				return;
-			}
-		}
-	}
-
-	info = g_new(ECanvasSelectionInfo, 1);
-	info->item = item;
-	gtk_object_ref (GTK_OBJECT (info->item));
-	info->id = id;
-	g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
-
-	func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-	if (func)
-		func(item, flags, id);
-
-	canvas->selection = g_list_prepend(canvas->selection, info);
-	canvas->cursor = info;
-}
-
-void
-e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
-{
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	GList *list;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	flags = E_CANVAS_ITEM_SELECTION_DELETE_DATA;
-	canvas = E_CANVAS(item->canvas);
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		info = list->data;
-
-		if (info->item == item) {
-			ECanvasItemSelectionCompareFunc compare_func;
-			compare_func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_compare_callback");
-
-			if (compare_func(info->item, info->id, id, 0) == 0) {
-				ECanvasItemSelectionFunc func;
-				func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
-				if (func)
-					func(info->item, flags, info->id);
-				canvas->selection = g_list_remove_link(canvas->selection, list);
-
-				if (canvas->cursor == info)
-					canvas->cursor = NULL;
-
-				g_message ("ECANVAS: removing info: item %p, info %p",
-					   info->item, info->id);
-				gtk_object_unref (GTK_OBJECT (info->item));
-				g_free(info);
-				g_list_free_1(list);
-				break;
-			}
-		}
-	}
-}
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
deleted file mode 100644
index b13a9dd2ab..0000000000
--- a/widgets/misc/e-canvas.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-canvas.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CANVAS_H__
-#define __E_CANVAS_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ECanvas - A class derived from canvas for the purpose of adding
- * evolution specific canvas hacks.
- */
-
-#define E_CANVAS_TYPE			(e_canvas_get_type ())
-#define E_CANVAS(obj)			(GTK_CHECK_CAST ((obj), E_CANVAS_TYPE, ECanvas))
-#define E_CANVAS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CANVAS_TYPE, ECanvasClass))
-#define E_IS_CANVAS(obj)		(GTK_CHECK_TYPE ((obj), E_CANVAS_TYPE))
-#define E_IS_CANVAS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE))
-
-typedef void		(*ECanvasItemReflowFunc)		(GnomeCanvasItem *item,
-								 gint   	  flags);
-
-typedef void            (*ECanvasItemSelectionFunc)             (GnomeCanvasItem *item,
-								 gint             flags,
-								 gpointer         user_data);
-/* Returns the same as strcmp does. */
-typedef gint            (*ECanvasItemSelectionCompareFunc)      (GnomeCanvasItem *item,
-								 gpointer         data1,
-								 gpointer         data2,
-								 gint             flags);
-
-
-typedef struct _ECanvas       ECanvas;
-typedef struct _ECanvasClass  ECanvasClass;
-
-/* Object flags for items */
-enum {
-	E_CANVAS_ITEM_NEEDS_REFLOW            = 1 << 13,
-	E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW = 1 << 14
-};
-
-enum {
-	E_CANVAS_ITEM_SELECTION_SELECT        = 1 << 0, /* TRUE = select.  FALSE = unselect. */
-	E_CANVAS_ITEM_SELECTION_CURSOR        = 1 << 1, /* TRUE = has become cursor.  FALSE = not cursor. */
-	E_CANVAS_ITEM_SELECTION_DELETE_DATA   = 1 << 2,
-};
-
-typedef struct {
-	GnomeCanvasItem *item;
-	gpointer         id;
-} ECanvasSelectionInfo;
-
-struct _ECanvas
-{
-	GnomeCanvas parent;
-		             
-	int                   idle_id;
-	GList                *selection;
-	ECanvasSelectionInfo *cursor;
-
-	/* Input context for dead key support */
-	GdkIC     *ic;
-	GdkICAttr *ic_attr;
-};
-
-struct _ECanvasClass
-{
-	GnomeCanvasClass parent_class;
-	void (* reflow) (ECanvas *canvas);
-};
-
-
-GtkType    e_canvas_get_type (void);
-GtkWidget *e_canvas_new      (void);
-
-/* Used to send all of the keystroke events to a specific item as well as
- * GDK_FOCUS_CHANGE events.
- */
-void e_canvas_item_grab_focus (GnomeCanvasItem *item);
-
-void e_canvas_item_request_reflow (GnomeCanvasItem *item);
-void e_canvas_item_request_parent_reflow (GnomeCanvasItem *item);
-void e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc func);
-
-void e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func);
-void e_canvas_item_set_selection_compare_callback (GnomeCanvasItem *item, ECanvasItemSelectionCompareFunc func);
-
-void e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id);
-
-/* Not implemented yet. */
-void e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CANVAS_H__ */
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
deleted file mode 100644
index 3318590baf..0000000000
--- a/widgets/misc/e-cell-date-edit.c
+++ /dev/null
@@ -1,440 +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 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
- */
-
-/*
- * ECellDateEdit - a subclass of ECellPopup used to show a date with a popup
- * window to edit it.
- */
-
-#include <config.h>
-#include <gal/util/e-i18n.h>
-#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
-#include <gal/e-table/e-table-item.h>
-#include "e-cell-date-edit.h"
-
-/* This depends on ECalendar which is why I didn't put it in gal. */
-#include "e-calendar.h"
-
-static void e_cell_date_edit_class_init		(GtkObjectClass	*object_class);
-static void e_cell_date_edit_init		(ECellDateEdit	*ecde);
-static void e_cell_date_edit_destroy		(GtkObject	*object);
-
-static gint e_cell_date_edit_do_popup		(ECellPopup	*ecp,
-						 GdkEvent	*event);
-static void e_cell_date_edit_show_popup		(ECellDateEdit	*ecde);
-static void e_cell_date_edit_get_popup_pos	(ECellDateEdit	*ecde,
-						 gint		*x,
-						 gint		*y,
-						 gint		*height,
-						 gint		*width);
-
-static void e_cell_date_edit_rebuild_time_list	(ECellDateEdit	*ecde);
-
-static int e_cell_date_edit_key_press		(GtkWidget	*popup_window,
-						 GdkEventKey	*event,
-						 ECellDateEdit	*ecde);
-
-static ECellPopupClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_date_edit, "ECellDateEdit", ECellDateEdit,
-	     e_cell_date_edit_class_init, e_cell_date_edit_init,
-	     e_cell_popup_get_type());
-
-
-static void
-e_cell_date_edit_class_init		(GtkObjectClass	*object_class)
-{
-	ECellPopupClass *ecpc = (ECellPopupClass *) object_class;
-
-	object_class->destroy = e_cell_date_edit_destroy;
-
-	ecpc->popup = e_cell_date_edit_do_popup;
-
-	parent_class = gtk_type_class (e_cell_popup_get_type ());
-}
-
-
-static void
-e_cell_date_edit_init			(ECellDateEdit	*ecde)
-{
-	GtkWidget *frame, *vbox, *table, *label, *entry;
-	GtkWidget *calendar, *scrolled_window, *list, *bbox;
-	GtkWidget *now_button, *today_button, *none_button;
-
-	ecde->use_24_hour_format = TRUE;
-
-	ecde->lower_hour = 0;
-	ecde->upper_hour = 24;
-
-	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
-	ecde->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-
-	gtk_window_set_policy (GTK_WINDOW (ecde->popup_window),
-			       TRUE, TRUE, FALSE);
-  
-	frame = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (ecde->popup_window), frame);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_widget_show (frame);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
-
-	table = gtk_table_new (3, 2, FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-        gtk_widget_show (table);
-
-#if 0
-	label = gtk_label_new (_("Date:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_widget_show (label);
-
-	entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), entry, 0, 1, 1, 2,
-			  GTK_FILL, 0, 0, 0);
-	gtk_widget_show (entry);
-#endif
-
-	calendar = e_calendar_new ();
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (calendar)->calitem),
-			       "move_selection_when_moving", FALSE,
-			       NULL);
-	gtk_table_attach (GTK_TABLE (table), calendar, 0, 1, 0, 3,
-			  GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (calendar);
-
-
-#if 0
-	label = gtk_label_new (_("Time:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_widget_show (label);
-
-	entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_widget_show (entry);
-#endif
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_table_attach (GTK_TABLE (table), scrolled_window, 1, 2, 0, 3,
-			  GTK_FILL, GTK_FILL, 0, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_ALWAYS);
-	gtk_widget_show (scrolled_window);
-
-	list = gtk_list_new ();
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), list);
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (list),
-					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
-	gtk_widget_show (list);
-	ecde->time_list = list;
-	e_cell_date_edit_rebuild_time_list (ecde);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 2);
-	gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (bbox), 2, 0);
-	gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 0, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-        gtk_widget_show (bbox);
-
-	now_button = gtk_button_new_with_label (_("Now"));
-	gtk_container_add (GTK_CONTAINER (bbox), now_button);
-        gtk_widget_show (now_button);
-#if 0
-	gtk_signal_connect (GTK_OBJECT (now_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_now_button_clicked), dedit);
-#endif
-
-	today_button = gtk_button_new_with_label (_("Today"));
-	gtk_container_add (GTK_CONTAINER (bbox), today_button);
-        gtk_widget_show (today_button);
-#if 0
-	gtk_signal_connect (GTK_OBJECT (today_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_today_button_clicked), dedit);
-#endif
-
-	/* Note that we don't show this here, since by default a 'None' date
-	   is not permitted. */
-	none_button = gtk_button_new_with_label (_("None"));
-	gtk_container_add (GTK_CONTAINER (bbox), none_button);
-#if 0
-	gtk_signal_connect (GTK_OBJECT (none_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_none_button_clicked), dedit);
-#endif
-
-
-
-	gtk_signal_connect (GTK_OBJECT (ecde->popup_window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_key_press),
-			    ecde);
-}
-
-
-/**
- * e_cell_date_edit_new:
- *
- * Creates a new ECellDateEdit renderer.
- *
- * Returns: an ECellDateEdit object.
- */
-ECell *
-e_cell_date_edit_new			(void)
-{
-	ECellDateEdit *ecde = gtk_type_new (e_cell_date_edit_get_type ());
-
-	return (ECell*) ecde;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_date_edit_destroy		(GtkObject *object)
-{
-	ECellDateEdit *ecde = E_CELL_DATE_EDIT (object);
-
-	gtk_widget_unref (ecde->popup_window);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static gint
-e_cell_date_edit_do_popup		(ECellPopup	*ecp,
-					 GdkEvent	*event)
-{
-	ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp);
-	guint32 time;
-	gint error_code;
-
-	e_cell_date_edit_show_popup (ecde);
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		time = event->button.time;
-	} else {
-		time = event->key.time;
-	}
-
-	error_code = gdk_pointer_grab (ecde->popup_window->window, TRUE,
-				       GDK_ENTER_NOTIFY_MASK |
-				       GDK_BUTTON_PRESS_MASK | 
-				       GDK_BUTTON_RELEASE_MASK |
-				       GDK_POINTER_MOTION_HINT_MASK |
-				       GDK_BUTTON1_MOTION_MASK,
-				       NULL, NULL, time);
-	if (error_code != 0)
-		g_warning ("Failed to get pointer grab");
-
-	gtk_grab_add (ecde->popup_window);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_date_edit_show_popup		(ECellDateEdit	*ecde)
-{
-	gint x, y, width, height, old_width, old_height;
-
-	g_print ("In e_cell_popup_popup_list\n");
-
-	/* This code is practically copied from GtkCombo. */
-	old_width = ecde->popup_window->allocation.width;
-	old_height  = ecde->popup_window->allocation.height;
-
-	e_cell_date_edit_get_popup_pos (ecde, &x, &y, &height, &width);
-
-	gtk_widget_set_uposition (ecde->popup_window, x, y);
-	gtk_widget_set_usize (ecde->popup_window, width, height);
-	gtk_widget_realize (ecde->popup_window);
-	gdk_window_resize (ecde->popup_window->window, width, height);
-	gtk_widget_show (ecde->popup_window);
-
-	/* FIXME: Set the focus to the first widget. */
-	gtk_widget_grab_focus (ecde->popup_window);
-
-	E_CELL_POPUP (ecde)->popup_shown = TRUE;
-}
-
-
-/* Calculates the size and position of the popup window (like GtkCombo). */
-static void
-e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecde);
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
-	GtkRequisition popup_requisition;
-	gint avail_height, screen_width, column_width, row_height;
-	double x1, y1;
-  
-	gdk_window_get_origin (canvas->window, x, y);
-
-	x1 = e_table_header_col_diff (eti->header, 0, eti->editing_col + 1);
-	y1 = eti_row_diff (eti, 0, eti->editing_row + 1);
-	column_width = e_table_header_col_diff (eti->header, eti->editing_col,
-						eti->editing_col + 1);
-	row_height = eti_row_diff (eti, eti->editing_row,
-				   eti->editing_row + 1);
-	gnome_canvas_item_i2w (GNOME_CANVAS_ITEM (eti), &x1, &y1);
-
-	*x += x1;
-	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
-	*y += y1 + 1;
-
-	avail_height = gdk_screen_height () - *y;
-
-	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
-	screen_width = gdk_screen_width ();
-  
-	gtk_widget_size_request (ecde->popup_window, &popup_requisition);
-  
-	/* Calculate the desired width. */
-	*width = popup_requisition.width;
-
-	/* Use at least the same width as the column. */
-	if (*width < column_width)
-		*width = column_width;
-
-	/* Check if it fits in the available height. */
-	if (popup_requisition.height > avail_height) {
-		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
-		if (*y - row_height > avail_height) {
-			/* We don't, so we show the popup above the cell
-			   instead of below it. */
-			avail_height = *y - row_height;
-			*y -= (popup_requisition.height + row_height);
-			if (*y < 0)
-				*y = 0;
-		}
-	}
-
-	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
-	if (*x > screen_width)
-		*x = screen_width;
-	*x -= *width;
-	if (*x < 0)
-		*x = 0;
-
-	*height = popup_requisition.height;
-}
-
-
-/* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
-static int
-e_cell_date_edit_key_press		(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellDateEdit	*ecde)
-{
-	g_print ("In e_cell_date_edit_key_press\n");
-
-	/* If the Escape key is pressed we hide the popup. */
-	if (event->keyval != GDK_Escape)
-		return FALSE;
-
-	gtk_grab_remove (ecde->popup_window);
-	gdk_pointer_ungrab (event->time);
-	gtk_widget_hide (ecde->popup_window);
-
-	E_CELL_POPUP (ecde)->popup_shown = FALSE;
-
-	return TRUE;
-}
-
-
-/* Clears the time list and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
-static void
-e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
-{
-	GtkList *list;
-	GtkWidget *listitem;
-	char buffer[40], *format;
-	struct tm tmp_tm;
-	gint hour, min;
-
-	list = GTK_LIST (ecde->time_list);
-
-	gtk_list_clear_items (list, 0, -1);
-
-	/* Fill the struct tm with some sane values. */
-	tmp_tm.tm_year = 2000;
-	tmp_tm.tm_mon = 0;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_sec  = 0;
-	tmp_tm.tm_isdst = 0;
-
-	for (hour = ecde->lower_hour; hour <= ecde->upper_hour; hour++) {
-
-		/* We don't want to display midnight at the end, since that is
-		   really in the next day. */
-		if (hour == 24)
-			break;
-
-		/* We want to finish on upper_hour, with min == 0. */
-		for (min = 0;
-		     min == 0 || (min < 60 && hour != ecde->upper_hour);
-		     min += 30) {
-			tmp_tm.tm_hour = hour;
-			tmp_tm.tm_min  = min;
-
-			if (ecde->use_24_hour_format)
-				/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-				format = _("%H:%M");
-			else
-				/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-				format = _("%I:%M %p");
-
-			strftime (buffer, sizeof (buffer), format, &tmp_tm);
-
-			listitem = gtk_list_item_new_with_label (buffer);
-			gtk_widget_show (listitem);
-			gtk_container_add (GTK_CONTAINER (list), listitem);
-		}
-	}
-}
-
-
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
deleted file mode 100644
index a852b95361..0000000000
--- a/widgets/misc/e-cell-date-edit.h
+++ /dev/null
@@ -1,64 +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 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
- */
-
-/*
- * ECellDateEdit - a subclass of ECellPopup used to show a date with a popup
- * window to edit it.
- */
-
-#ifndef _E_CELL_DATE_EDIT_H_
-#define _E_CELL_DATE_EDIT_H_
-
-#include <gal/e-table/e-cell-popup.h>
-
-#define E_CELL_DATE_EDIT_TYPE        (e_cell_date_edit_get_type ())
-#define E_CELL_DATE_EDIT(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit))
-#define E_CELL_DATE_EDIT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TYPE, ECellDateEditClass))
-#define E_IS_CELL_DATE_EDIT(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TYPE))
-#define E_IS_CELL_DATE_EDIT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TYPE))
-
-
-typedef struct {
-	ECellPopup parent;
-
-	GtkWidget *popup_window;
-	GtkWidget *time_list;
-
-	/* This is the range of hours we show in the time popup. */
-	gint lower_hour;
-	gint upper_hour;
-
-	gboolean use_24_hour_format;
-} ECellDateEdit;
-
-typedef struct {
-	ECellPopupClass parent_class;
-} ECellDateEditClass;
-
-
-GtkType    e_cell_date_edit_get_type		(void);
-ECell     *e_cell_date_edit_new			(void);
-
-
-#endif /* _E_CELL_DATE_EDIT_H_ */
diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
deleted file mode 100644
index aaabd52daf..0000000000
--- a/widgets/misc/e-clipped-label.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * This is similar to GtkLabel but clips itself and displays '...' if it
- * can't fit inside its allocated area. The intended use is for inside buttons
- * that are a fixed size. The GtkLabel would normally display only the middle
- * part of the text, which doesn't look very good. This only supports one line
- * of text (so no wrapping/justification), without underlined characters.
- */
-
-#include <math.h>
-#include <string.h>
-
-#include <gdk/gdki18n.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-clipped-label.h"
-
-
-static void e_clipped_label_class_init (EClippedLabelClass *class);
-static void e_clipped_label_init (EClippedLabel *label);
-static void e_clipped_label_size_request (GtkWidget      *widget,
-					  GtkRequisition *requisition);
-static void e_clipped_label_size_allocate (GtkWidget *widget,
-					   GtkAllocation *allocation);
-static gint e_clipped_label_expose (GtkWidget      *widget,
-				    GdkEventExpose *event);
-static void e_clipped_label_recalc_chars_displayed (EClippedLabel *label);
-static void e_clipped_label_destroy                (GtkObject *object);
-
-
-static GtkMiscClass *parent_class;
-
-/* This is the string to draw when the label is clipped, e.g. '...'. */
-static gchar *e_clipped_label_ellipsis;
-
-/* Flags used in chars_displayed field. Must be negative. */
-#define E_CLIPPED_LABEL_NEED_RECALC		-1
-#define E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL	-2
-
-
-GtkType
-e_clipped_label_get_type (void)
-{
-	static GtkType e_clipped_label_type = 0;
-
-	if (!e_clipped_label_type){
-		GtkTypeInfo e_clipped_label_info = {
-			"EClippedLabel",
-			sizeof (EClippedLabel),
-			sizeof (EClippedLabelClass),
-			(GtkClassInitFunc) e_clipped_label_class_init,
-			(GtkObjectInitFunc) e_clipped_label_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_MISC);
-		e_clipped_label_type = gtk_type_unique (GTK_TYPE_MISC,
-							&e_clipped_label_info);
-	}
-
-	return e_clipped_label_type;
-}
-
-
-static void
-e_clipped_label_class_init (EClippedLabelClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	widget_class->size_request	= e_clipped_label_size_request;
- 	widget_class->size_allocate	= e_clipped_label_size_allocate;
-	widget_class->expose_event	= e_clipped_label_expose;
-
-	object_class->destroy           = e_clipped_label_destroy;
-
-	e_clipped_label_ellipsis = _("...");
-}
-
-
-static void
-e_clipped_label_init (EClippedLabel *label)
-{
-	GTK_WIDGET_SET_FLAGS (label, GTK_NO_WINDOW);
-
-	label->label = NULL;
-	label->label_wc = NULL;
-	label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-}
-
-
-/**
- * e_clipped_label_new:
- *
- * @text: The label text.
- * @Returns: A new #EClippedLabel.
- *
- * Creates a new #EClippedLabel with the given text.
- **/
-GtkWidget *
-e_clipped_label_new (const gchar *text)
-{
-	GtkWidget *label;
-
-	label = GTK_WIDGET (gtk_type_new (e_clipped_label_get_type ()));
-
-	if (text && *text)
-		e_clipped_label_set_text (E_CLIPPED_LABEL (label), text);
-
-	return label;
-}
-
-
-static void
-e_clipped_label_size_request (GtkWidget      *widget,
-			      GtkRequisition *requisition)
-{
-	EClippedLabel *label;
-	GdkFont *font;
-  
-	g_return_if_fail (E_IS_CLIPPED_LABEL (widget));
-	g_return_if_fail (requisition != NULL);
-  
-	label = E_CLIPPED_LABEL (widget);
-	font = widget->style->font;
-
-	requisition->width = 0;
-	requisition->height = font->ascent + font->descent
-		+ 2 * GTK_MISC (widget)->ypad;
-}
-
-
-static void
-e_clipped_label_size_allocate (GtkWidget *widget,
-			       GtkAllocation *allocation)
-{
-	EClippedLabel *label;
-
-	label = E_CLIPPED_LABEL (widget);
-
-	widget->allocation = *allocation;
-
-	/* Flag that we need to recalculate how many characters to display. */
-	label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-}
-
-
-static gint
-e_clipped_label_expose (GtkWidget      *widget,
-			GdkEventExpose *event)
-{
-	EClippedLabel *label;
-	GtkMisc *misc;
-	gint x, y;
-	GdkFont *font;
-	gchar *tmp_str, tmp_ch;
-
-	g_return_val_if_fail (E_IS_CLIPPED_LABEL (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-  
-	label = E_CLIPPED_LABEL (widget);
-	misc = GTK_MISC (widget);
-	font = widget->style->font;
-
-	/* If the label isn't visible or has no text, just return. */
-	if (!GTK_WIDGET_VISIBLE (widget) || !GTK_WIDGET_MAPPED (widget)
-	    || !label->label || (*label->label == '\0'))
-		return TRUE;
-
-	/* Recalculate the number of characters displayed, if necessary. */
-	if (label->chars_displayed == E_CLIPPED_LABEL_NEED_RECALC)
-		e_clipped_label_recalc_chars_displayed (label);
-
-	/*
-	 * GC Clipping
-	 */
-	gdk_gc_set_clip_rectangle (widget->style->white_gc,
-				   &event->area);
-	gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state],
-				   &event->area);
-      
-	y = floor (widget->allocation.y + (gint)misc->ypad 
-		   + (((gint)widget->allocation.height - 2 * (gint)misc->ypad
-		       - (gint)font->ascent - font->descent)
-		      * misc->yalign) + 0.5) + font->ascent;
-
-	if (label->chars_displayed == E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL) {
-		x = floor (widget->allocation.x + (gint)misc->xpad
-			   + (((gint)widget->allocation.width - 
-			       (gint)label->label_width - 2 * (gint)misc->xpad)
-			      * misc->xalign) + 0.5);
-
-		gtk_paint_string (widget->style, widget->window, widget->state,
-				  &event->area, widget, "label", 
-				  x, y, label->label);
-	} else {
-		x = widget->allocation.x + (gint)misc->xpad;
-
-		tmp_ch = label->label_wc[label->chars_displayed];
-		label->label_wc[label->chars_displayed] = '\0';
-		tmp_str = gdk_wcstombs (label->label_wc);
-		if (tmp_str) {
-			gtk_paint_string (widget->style, widget->window,
-					  widget->state, &event->area,
-					  widget, "label", 
-					  x, y, tmp_str);
-			g_free (tmp_str);
-		}
-		label->label_wc[label->chars_displayed] = tmp_ch;
-
-		x = widget->allocation.x + (gint)misc->xpad
-			+ label->ellipsis_x;
-		gtk_paint_string (widget->style, widget->window, widget->state,
-				  &event->area, widget, "label", 
-				  x, y, e_clipped_label_ellipsis);
-	}
-
-	gdk_gc_set_clip_mask (widget->style->white_gc, NULL);
-	gdk_gc_set_clip_mask (widget->style->fg_gc[widget->state], NULL);
-
-	return TRUE;
-}
-
-
-static void
-e_clipped_label_destroy (GtkObject *object)
-{
-	EClippedLabel *label;
-
-	g_return_if_fail (E_IS_CLIPPED_LABEL (object));
-
-	label = E_CLIPPED_LABEL(object);
-
-	g_free (label->label);
-	g_free (label->label_wc);
-}
-
-
-/**
- * e_clipped_label_get_text:
- *
- * @label: An #EClippedLabel.
- * @Return: The label text.
- *
- * Returns the label text, or NULL.
- **/
-gchar*
-e_clipped_label_get_text (EClippedLabel	*label)
-{
-	g_return_val_if_fail (E_IS_CLIPPED_LABEL (label), NULL);
-
-	return label->label;
-}
-
-
-/**
- * e_clipped_label_set_text:
- *
- * @label: An #EClippedLabel.
- * @text: The new label text.
- *
- * Sets the label text.
- **/
-void
-e_clipped_label_set_text (EClippedLabel *label,
-			  const gchar *text)
-{
-	gint len;
-
-	g_return_if_fail (E_IS_CLIPPED_LABEL (label));
-
-	if (label->label != text || !label->label || !text
-	    || strcmp (label->label, text)) {
-		g_free (label->label);
-		g_free (label->label_wc);
-		label->label = NULL;
-		label->label_wc = NULL;
-
-		if (text) {
-			label->label = g_strdup (text);
-			len = strlen (text);
-			label->label_wc = g_new (GdkWChar, len + 1);
-			label->wc_len = gdk_mbstowcs (label->label_wc,
-						      label->label, len + 1);
-			label->label_wc[label->wc_len] = '\0';
-		}
-
-		/* Reset the number of characters displayed, so it is
-		   recalculated when needed. */
-		label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-
-		/* We don't queue a resize, since the label should not affect
-		   the widget size, but we queue a draw. */
-		gtk_widget_queue_draw (GTK_WIDGET (label));
-	}
-}
-
-
-static void
-e_clipped_label_recalc_chars_displayed (EClippedLabel *label)
-{
-	GdkFont *font;
-	gint max_width, width, ch, last_width;
-
-	font = GTK_WIDGET (label)->style->font;
-
-	max_width = GTK_WIDGET (label)->allocation.width
-		- 2 * GTK_MISC (label)->xpad;
-
-	if (!label->label) {
-		label->chars_displayed = 0;
-		return;
-	}
-
-	/* See if the entire label fits in the allocated width. */
-	label->label_width = gdk_string_width (font, label->label);
-	if (label->label_width <= max_width) {
-		label->chars_displayed = E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL;
-		return;
-	}
-
-	/* Calculate the width of the ellipsis string. */
-	max_width -= gdk_string_measure (font, e_clipped_label_ellipsis);
-
-	if (max_width <= 0) {
-		label->chars_displayed = 0;
-		label->ellipsis_x = 0;
-		return;
-	}
-
-	/* Step through the wide-char label, adding on the widths of the
-	   characters, until we can't fit any more in. */
-	width = last_width = 0;
-	for (ch = 0; ch < label->wc_len; ch++) {
-		width += gdk_char_width_wc (font, label->label_wc[ch]);
-
-		if (width > max_width) {
-			label->chars_displayed = ch;
-			label->ellipsis_x = last_width;
-			return;
-		}
-
-		last_width = width;
-	}
-
-	g_warning ("Clipped label width not exceeded as expected");
-	label->chars_displayed = E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL;
-}
-
diff --git a/widgets/misc/e-clipped-label.h b/widgets/misc/e-clipped-label.h
deleted file mode 100644
index a21ceadeca..0000000000
--- a/widgets/misc/e-clipped-label.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * This is similar to GtkLabel but clips itself and displays '...' if it
- * can't fit inside its allocated area. The intended use is for inside buttons
- * that are a fixed size. The GtkLabel would normally display only the middle
- * part of the text, which doesn't look very good. This only supports one line
- * of text (so no wrapping/justification), without underlined characters.
- */
-#ifndef _E_CLIPPED_LABEL_H_
-#define _E_CLIPPED_LABEL_H_
-
-#include <gtk/gtkmisc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_CLIPPED_LABEL(obj)          GTK_CHECK_CAST (obj, e_clipped_label_get_type (), EClippedLabel)
-#define E_CLIPPED_LABEL_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_clipped_label_get_type (), EClippedLabelClass)
-#define E_IS_CLIPPED_LABEL(obj)       GTK_CHECK_TYPE (obj, e_clipped_label_get_type ())
-
-
-typedef struct _EClippedLabel       EClippedLabel;
-typedef struct _EClippedLabelClass  EClippedLabelClass;
-
-struct _EClippedLabel
-{
-	GtkMisc misc;
-
-	gchar *label;
-	GdkWChar *label_wc;
-
-	/* This is the number of wide characters in the label. */
-	gint wc_len;
-
-	/* This is the width of the entire label string, in pixels. */
-	gint label_width;
-
-	/* This is the number of characters we can fit in, or
-	   E_CLIPPED_LABEL_NEED_RECALC if it needs to be recalculated, or
-	   E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL to show the entire label. */
-	gint chars_displayed;
-
-	/* This is the x position to display the ellipsis string, e.g. '...',
-	   relative to the start of the label. */
-	gint ellipsis_x;
-};
-
-struct _EClippedLabelClass
-{
-	GtkMiscClass parent_class;
-};
-
-
-GtkType	   e_clipped_label_get_type	(void);
-GtkWidget* e_clipped_label_new		(const gchar	*text);
-
-gchar*	   e_clipped_label_get_text	(EClippedLabel	*label);
-void	   e_clipped_label_set_text	(EClippedLabel	*label,
-					 const gchar	*text);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CLIPPED_LABEL_H_ */
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
deleted file mode 100644
index c7a79003ae..0000000000
--- a/widgets/misc/e-colors.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * e_color.c: General color allocation utilities
- *
- * Author:
- *  Miguel de Icaza (miguel@kernel.org)
- *
- * We keep our own color context, as the color allocation might take place
- * before things are realized.
- */
-#include <config.h>
-#include <gnome.h>
-#include "e-colors.h"
-
-static gboolean e_color_inited;
-static GdkColorContext *e_color_context;
-
-GdkColor e_white, e_dark_gray, e_black;
-
-int 
-e_color_alloc (gushort red, gushort green, gushort blue)
-{
-	int failed;
-	
-	if (!e_color_inited)
-		e_color_init ();
-	
-	return gdk_color_context_get_pixel (e_color_context,
-					    red, green, blue, &failed);
-}
-
-void
-e_color_alloc_gdk (GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (c != NULL);
-	
-	if (!e_color_inited)
-		e_color_init ();
-	
-	c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
-}
-
-void
-e_color_alloc_name (const char *name, GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	if (!e_color_inited)
-		e_color_init ();
-	
-	gdk_color_parse (name, c);
-	c->pixel = 0;
-	c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
-}
-
-void
-e_color_init (void)
-{
-	GdkColormap *colormap;
-
-	/* It's surprisingly easy to end up calling this twice.  Survive.  */
-	if (e_color_inited)
-		return;
-
-	colormap = gtk_widget_get_default_colormap ();
-
-	/* Initialize the color context */
-	e_color_context = gdk_color_context_new (
-		gtk_widget_get_default_visual (), colormap);
-
-	e_color_inited = TRUE;
-
-	/* Allocate the default colors */
-	gdk_color_white (colormap, &e_white);
-	gdk_color_black (colormap, &e_black);
-	e_color_alloc_name ("gray20",  &e_dark_gray);
-}
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
deleted file mode 100644
index 590a89995c..0000000000
--- a/widgets/misc/e-colors.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef GNOME_APP_LIBS_COLOR_H
-#define GNOME_APP_LIBS_COLOR_H
-
-BEGIN_GNOME_DECLS
-
-void     e_color_init       (void);
-
-/* Return the pixel value for the given red, green and blue */
-int      e_color_alloc      (gushort red, gushort green, gushort blue);
-void     e_color_alloc_name (const char *name, GdkColor *color);
-void     e_color_alloc_gdk  (GdkColor *color);
-
-extern GdkColor e_white, e_dark_gray, e_black;
-
-END_GNOME_DECLS
-
-#endif /* GNOME_APP_LIBS_COLOR_H */
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
deleted file mode 100644
index c10e0e6490..0000000000
--- a/widgets/misc/e-cursors.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * cursors.c: cursor handling for Gnumeric
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <gnome.h>
-#include "e-colors.h"
-#include "e-cursors.h"
-#include "pixmaps/cursor_cross.xpm"
-#include "pixmaps/cursor_zoom_in.xpm"
-#include "pixmaps/cursor_zoom_out.xpm"
-#include "pixmaps/cursor_hand_open.xpm"
-#include "pixmaps/cursor_hand_closed.xpm"
-
-#define GDK_INTERNAL_CURSOR -1
-
-typedef struct {
-	GdkCursor *cursor;
-	int       hot_x, hot_y;
-	char      **xpm;
-} CursorDef;
-
-static CursorDef cursors [] = {
-	{ NULL, 17, 17, cursor_cross_xpm },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_CROSSHAIR,         NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_ARROW,             NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_FLEUR,             NULL },
-	{ NULL, 24, 24, cursor_zoom_in_xpm },
-	{ NULL, 24, 24, cursor_zoom_out_xpm },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SB_H_DOUBLE_ARROW, NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SB_V_DOUBLE_ARROW, NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SIZING,            NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SIZING,            NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_HAND2,             NULL },
-	{ NULL, 10, 10, cursor_hand_open_xpm },
-	{ NULL, 10, 10, cursor_hand_closed_xpm },
-	{ NULL, 0,    0,  NULL }
-};
-
-
-static void
-create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
-{
-	int height, width, colors;
-	char pixmap_buffer [(32 * 32)/8];
-	char mask_buffer [(32 * 32)/8];
-	int x, y, pix, yofs;
-	int transparent_color, black_color;
-
-	sscanf (xpm [0], "%d %d %d %d", &height, &width, &colors, &pix);
-
-	g_assert (height == 32);
-	g_assert (width  == 32);
-	g_assert (colors <= 3);
-
-	transparent_color = ' ';
-	black_color = '.';
-
-	yofs = colors + 1;
-	for (y = 0; y < 32; y++){
-		for (x = 0; x < 32;){
-			char value = 0, maskv = 0;
-
-			for (pix = 0; pix < 8; pix++, x++){
-				if (xpm [y + yofs][x] != transparent_color){
-					maskv |= 1 << pix;
-
-					/*
-					 * Invert the colours here because it seems
-					 * to workaround a bug the Matrox G100 Xserver?
-					 * We reverse the foreground & background in the next
-					 * routine to compensate.
-					 */
-					if (xpm [y + yofs][x] == black_color){
-						value |= 1 << pix;
-					}
-				}
-			}
-			pixmap_buffer [(y * 4 + x/8)-1] = value;
-			mask_buffer [(y * 4 + x/8)-1] = maskv;
-		}
-	}
-	*bitmap = gdk_bitmap_create_from_data (NULL, pixmap_buffer, 32, 32);
-	*mask   = gdk_bitmap_create_from_data (NULL, mask_buffer, 32, 32);
-}
-
-void
-e_cursors_init (void)
-{
-	int i;
-
-	for (i = 0; cursors [i].hot_x; i++){
-		GdkBitmap *bitmap, *mask;
-
-		if (cursors [i].hot_x < 0)
-			cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
-		else {
-			create_bitmap_and_mask_from_xpm (&bitmap, &mask, cursors [i].xpm);
-
-			/* The foreground and background colours are reversed.
-			 * See comment above for explanation.
-			 */
-			cursors [i].cursor =
-				gdk_cursor_new_from_pixmap (
-					bitmap, mask,
-					&e_black, &e_white,
-					cursors [i].hot_x,
-					cursors [i].hot_y);
-		}
-	}
-
-	g_assert (i == E_CURSOR_NUM_CURSORS);
-}
-
-void
-e_cursors_shutdown (void)
-{
-	int i;
-
-	for (i = 0; cursors [i].hot_x; i++)
-		gdk_cursor_destroy (cursors [i].cursor);
-}
-
-
-/* Returns a cursor given its type */
-GdkCursor *
-e_cursor_get (ECursorType type)
-{
-	g_return_val_if_fail (type >= 0 && type < E_CURSOR_NUM_CURSORS, NULL);
-
-	return cursors [type].cursor;
-}
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
deleted file mode 100644
index a8374d6506..0000000000
--- a/widgets/misc/e-cursors.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef GNOME_APP_LIB_CURSORS_H
-#define GNOME_APP_LIB_CURSORS_H
-
-#include <gdk/gdk.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	E_CURSOR_FAT_CROSS,
-	E_CURSOR_THIN_CROSS,
-	E_CURSOR_ARROW,
-	E_CURSOR_MOVE,
-	E_CURSOR_ZOOM_IN,
-	E_CURSOR_ZOOM_OUT,
-	E_CURSOR_SIZE_X,
-	E_CURSOR_SIZE_Y,
-	E_CURSOR_SIZE_TL,
-	E_CURSOR_SIZE_TR,
-	E_CURSOR_PRESS,
-	E_CURSOR_HAND_OPEN,
-	E_CURSOR_HAND_CLOSED,
-	E_CURSOR_NUM_CURSORS
-} ECursorType;
-
-void    e_cursors_init      (void);
-void    e_cursors_shutdown  (void);
-
-#define e_cursor_set(win, c)					   \
-G_STMT_START {							   \
-     if (win) 							   \
-         gdk_window_set_cursor (win, e_cursor_get (c)); \
-} G_STMT_END
-
-#define e_cursor_set_widget(w, c)							     \
-G_STMT_START {									     \
-     if (GTK_WIDGET (w)->window)						     \
-	gdk_window_set_cursor (GTK_WIDGET (w)->window, e_cursor_get (c)); \
-} G_STMT_END
-
-GdkCursor *e_cursor_get (ECursorType type);
-
-END_GNOME_DECLS
-
-#endif /* GNOME_APP_LIB_CURSORS_H */
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
deleted file mode 100644
index 74b205867a..0000000000
--- a/widgets/misc/e-dateedit.c
+++ /dev/null
@@ -1,1722 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * Based on the GnomeDateEdit, part of the Gnome Library.
- * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDateEdit - a widget based on GnomeDateEdit to provide a date & optional
- * time field with popups for entering a date.
- */
-
-/* We need this for strptime. */
-#define _XOPEN_SOURCE 4
-
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkmain.h>
-#include "e-dateedit.h"
-#include "e-calendar.h"
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkwindow.h>
-
-
-struct _EDateEditPrivate {
-	GtkWidget *date_entry;
-	GtkWidget *date_button;
-	
-	GtkWidget *space;
-
-	GtkWidget *time_combo;
-
-	GtkWidget *cal_popup;
-	GtkWidget *calendar;
-	GtkWidget *now_button;
-	GtkWidget *today_button;
-	GtkWidget *none_button;		/* This will only be visible if a
-					   'None' date/time is permitted. */
-
-	gboolean show_date;
-	gboolean show_time;
-	gboolean use_24_hour_format;
-
-	/* This is the range of hours we show in the time popup. */
-	gint lower_hour;
-	gint upper_hour;
-
-	/* This indicates whether the last date committed was invalid.
-	   (A date is committed by hitting Return, moving the keyboard focus,
-	   or selecting a date in the popup). Note that this only indicates
-	   that the date couldn't be parsed. A date set to 'None' is valid
-	   here, though e_date_edit_date_is_valid() will return FALSE if an
-	   empty date isn't actually permitted. */
-	gboolean date_is_valid;
-
-	/* This is the last valid date which was set. If the date was set to
-	   'None' or empty, date_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
-	gboolean date_set_to_none;
-	gint year;
-	gint month;
-	gint day;
-
-	/* This indicates whether the last time committed was invalid.
-	   (A time is committed by hitting Return, moving the keyboard focus,
-	   or selecting a time in the popup). Note that this only indicates
-	   that the time couldn't be parsed. An empty/None time is valid
-	   here, though e_date_edit_time_is_valid() will return FALSE if an
-	   empty time isn't actually permitted. */
-	gboolean time_is_valid;
-
-	/* This is the last valid time which was set. If the time was set to
-	   'None' or empty, time_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
-	gboolean time_set_to_none;
-	gint hour;
-	gint minute;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-
-static gint date_edit_signals [LAST_SIGNAL] = { 0 };
-
-
-static void e_date_edit_class_init		(EDateEditClass	*class);
-static void e_date_edit_init			(EDateEdit	*dedit);
-static void create_children			(EDateEdit	*dedit);
-static void e_date_edit_destroy			(GtkObject	*object);
-static void e_date_edit_forall			(GtkContainer   *container,
-						 gboolean	 include_internals,
-						 GtkCallback     callback,
-						 gpointer	 callback_data);
-
-static gint on_date_entry_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static void on_date_button_clicked		(GtkWidget	*widget,
-						 EDateEdit	*dedit);
-static void e_date_edit_show_date_popup		(EDateEdit	*dedit);
-static void position_date_popup			(EDateEdit	*dedit);
-static void on_date_popup_none_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static void on_date_popup_today_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static void on_date_popup_now_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static gint on_date_popup_delete_event		(GtkWidget	*widget,
-						 EDateEdit	*dedit);
-static gint on_date_popup_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static gint on_date_popup_button_press		(GtkWidget	*widget,
-						 GdkEventButton *event,
-						 gpointer	 data);
-static void on_date_popup_date_selected		(ECalendarItem	*calitem,
-						 EDateEdit	*dedit);
-static void hide_date_popup			(EDateEdit	*dedit);
-static void rebuild_time_popup			(EDateEdit	*dedit);
-static gboolean field_set_to_none		(char		*text);
-static gboolean e_date_edit_parse_date		(EDateEdit	*dedit,
-						 char		*date_text,
-						 struct tm	*date_tm);
-static gboolean e_date_edit_parse_time		(EDateEdit	*dedit,
-						 gchar		*time_text,
-						 struct tm	*time_tm);
-static void on_date_edit_time_selected		(GtkList	*list,
-						 EDateEdit	*dedit);
-static gint on_time_entry_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static gint on_date_entry_focus_out		(GtkEntry	*entry,
-						 GdkEventFocus  *event,
-						 EDateEdit	*dedit);
-static gint on_time_entry_focus_out		(GtkEntry	*entry,
-						 GdkEventFocus  *event,
-						 EDateEdit	*dedit);
-static void e_date_edit_update_date_entry	(EDateEdit	*dedit);
-static void e_date_edit_update_time_entry	(EDateEdit	*dedit);
-static void e_date_edit_update_time_combo_state	(EDateEdit	*dedit);
-static void e_date_edit_check_date_changed	(EDateEdit	*dedit);
-static void e_date_edit_check_time_changed	(EDateEdit	*dedit);
-static gboolean e_date_edit_set_date_internal	(EDateEdit	*dedit,
-						 gboolean	 valid,
-						 gboolean	 none,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day);
-static gboolean e_date_edit_set_time_internal	(EDateEdit	*dedit,
-						 gboolean	 valid,
-						 gboolean	 none,
-						 gint		 hour,
-						 gint		 minute);
-
-
-static GtkHBoxClass *parent_class;
-
-/**
- * e_date_edit_get_type:
- *
- * Returns the GtkType for the EDateEdit widget
- */
-guint
-e_date_edit_get_type		(void)
-{
-	static guint date_edit_type = 0;
-
-	if (!date_edit_type){
-		GtkTypeInfo date_edit_info = {
-			"EDateEdit",
-			sizeof (EDateEdit),
-			sizeof (EDateEditClass),
-			(GtkClassInitFunc) e_date_edit_class_init,
-			(GtkObjectInitFunc) e_date_edit_init,
-			NULL,
-			NULL,
-		};
-
-		date_edit_type = gtk_type_unique (gtk_hbox_get_type (), &date_edit_info);
-	}
-	
-	return date_edit_type;
-}
-
-
-static void
-e_date_edit_class_init		(EDateEditClass	*class)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) class;
-	GtkContainerClass *container_class = (GtkContainerClass *) class;
-
-	object_class = (GtkObjectClass*) class;
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	date_edit_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST, object_class->type,
-				GTK_SIGNAL_OFFSET (EDateEditClass,
-						   changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-	
-	gtk_object_class_add_signals (object_class, date_edit_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy		= e_date_edit_destroy;
-
-	container_class->forall		= e_date_edit_forall;
-
-	class->changed = NULL;
-}
-
-
-static void
-e_date_edit_init		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-
-	dedit->priv = priv = g_new0 (EDateEditPrivate, 1);
-
-	priv->show_date = TRUE;
-	priv->show_time = TRUE;
-	priv->use_24_hour_format = TRUE;
-
-	priv->lower_hour = 0;
-	priv->upper_hour = 24;
-
-	priv->date_is_valid = TRUE;
-	priv->date_set_to_none = TRUE;
-	priv->time_is_valid = TRUE;
-	priv->time_set_to_none = TRUE;
-
-	create_children (dedit);
-
-	/* Set it to the current time. */
-	e_date_edit_set_time (dedit, 0);
-}
-
-
-/**
- * e_date_edit_new:
- *
- * Description: Creates a new #EDateEdit widget which can be used
- * to provide an easy to use way for entering dates and times.
- * 
- * Returns: a new #EDateEdit widget.
- */
-GtkWidget *
-e_date_edit_new			(void)
-{
-	EDateEdit *dedit;
-
-	dedit = gtk_type_new (e_date_edit_get_type ());
-
-	return GTK_WIDGET (dedit);
-}
-
-
-static void
-create_children			(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	ECalendar *calendar;
-	GtkWidget *frame, *arrow;
-	GtkWidget *vbox, *bbox;
-
-	priv = dedit->priv;
-
-	priv->date_entry  = gtk_entry_new ();
-	gtk_widget_set_usize (priv->date_entry, 90, 0);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->date_entry, FALSE, TRUE, 0);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->date_entry), "key_press_event",
-			    (GtkSignalFunc) on_date_entry_key_press,
-			    dedit);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_entry),
-				  "focus_out_event",
-				  (GtkSignalFunc) on_date_entry_focus_out,
-				  dedit);
-
-	priv->date_button = gtk_button_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->date_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_button_clicked), dedit);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->date_button,
-			    FALSE, FALSE, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (priv->date_button), arrow);
-	gtk_widget_show (arrow);
-
-	if (priv->show_date) {
-		gtk_widget_show (priv->date_entry);
-		gtk_widget_show (priv->date_button);
-	}
-
-	/* This is just to create a space between the date & time parts. */
-	priv->space = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (dedit), priv->space, FALSE, FALSE, 2);
-
-
-	priv->time_combo = gtk_combo_new ();
-	gtk_widget_set_usize (GTK_COMBO (priv->time_combo)->entry, 90, 0);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->time_combo, FALSE, TRUE, 0);
-	rebuild_time_popup (dedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv->time_combo)->entry),
-			    "key_press_event",
-			    (GtkSignalFunc) on_time_entry_key_press,
-			    dedit);
-	gtk_signal_connect_after (GTK_OBJECT (GTK_COMBO (priv->time_combo)->entry),
-				  "focus_out_event",
-				  (GtkSignalFunc) on_time_entry_focus_out,
-				  dedit);
-	gtk_signal_connect_after (GTK_OBJECT (GTK_COMBO (priv->time_combo)->list),
-				  "selection_changed",
-				  (GtkSignalFunc) on_date_edit_time_selected,
-				  dedit);
-
-	if (priv->show_time)
-		gtk_widget_show (priv->time_combo);
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-
-	priv->cal_popup = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_widget_set_events (priv->cal_popup,
-			       gtk_widget_get_events (priv->cal_popup)
-			       | GDK_KEY_PRESS_MASK);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "delete_event",
-			    (GtkSignalFunc) on_date_popup_delete_event,
-			    dedit);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "key_press_event",
-			    (GtkSignalFunc) on_date_popup_key_press,
-			    dedit);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "button_press_event",
-			    (GtkSignalFunc) on_date_popup_button_press,
-			    dedit);
-	gtk_window_set_policy (GTK_WINDOW (priv->cal_popup),
-			       FALSE, FALSE, TRUE);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (priv->cal_popup), frame);
-	gtk_widget_show (frame);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
-
-	priv->calendar = e_calendar_new ();
-	calendar = E_CALENDAR (priv->calendar);
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (calendar->calitem),
-			       "maximum_days_selected", 1,
-			       "move_selection_when_moving", FALSE,
-			       NULL);
-
-	gtk_signal_connect (GTK_OBJECT (calendar->calitem),
-			    "selection_changed",
-			    GTK_SIGNAL_FUNC (on_date_popup_date_selected), dedit);
-
-	gtk_box_pack_start (GTK_BOX (vbox), priv->calendar, FALSE, FALSE, 0);
-        gtk_widget_show (priv->calendar);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 2);
-	gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (bbox), 2, 0);
-	gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 0, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-        gtk_widget_show (bbox);
-
-	priv->now_button = gtk_button_new_with_label (_("Now"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->now_button);
-        gtk_widget_show (priv->now_button);
-	gtk_signal_connect (GTK_OBJECT (priv->now_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_now_button_clicked), dedit);
-
-	priv->today_button = gtk_button_new_with_label (_("Today"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->today_button);
-        gtk_widget_show (priv->today_button);
-	gtk_signal_connect (GTK_OBJECT (priv->today_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_today_button_clicked), dedit);
-
-	/* Note that we don't show this here, since by default a 'None' date
-	   is not permitted. */
-	priv->none_button = gtk_button_new_with_label (_("None"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
-	gtk_signal_connect (GTK_OBJECT (priv->none_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_none_button_clicked), dedit);
-}
-
-
-static void
-e_date_edit_destroy		(GtkObject	*object)
-{
-	EDateEdit *dedit;
-
-	g_return_if_fail (E_IS_DATE_EDIT (object));
-
-	dedit = E_DATE_EDIT (object);
-
-	gtk_widget_destroy (dedit->priv->cal_popup);
-	dedit->priv->cal_popup = NULL;
-
-	g_free (dedit->priv);
-	dedit->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-e_date_edit_forall		(GtkContainer	*container,
-				 gboolean	 include_internals,
-				 GtkCallback	 callback,
-				 gpointer	 callback_data)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (container));
-	g_return_if_fail (callback != NULL);
-
-	/* Let GtkBox handle the internal widgets if needed. */
-	if (include_internals) {
-		if (GTK_CONTAINER_CLASS (parent_class)->forall)
-			(* GTK_CONTAINER_CLASS (parent_class)->forall)
-				(container, include_internals,
-				 callback, callback_data);
-	}
-}
-
-
-/**
- * e_date_edit_get_time:
- * @dedit: an #EDateEdit widget.
- * @the_time: returns the last valid time entered.
- * @Returns: the last valid time entered, or -1 if the time is not set.
- *
- * Returns the last valid time entered. If empty times are valid, by calling
- * e_date_edit_set_allow_no_date_set(), then it may return -1.
- *
- * Note that the last time entered may actually have been invalid. You can
- * check this with e_date_edit_time_is_valid().
- */
-time_t
-e_date_edit_get_time		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	struct tm tmp_tm = { 0 };
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), -1);
-	
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_date_changed (dedit);
-	e_date_edit_check_time_changed (dedit);
-
-	if (priv->date_set_to_none)
-		return -1;
-
-	tmp_tm.tm_year = priv->year;
-	tmp_tm.tm_mon = priv->month;
-	tmp_tm.tm_mday = priv->day;
-
-	if (!priv->show_time || priv->time_set_to_none) {
-		tmp_tm.tm_hour = 0;
-		tmp_tm.tm_min = 0;
-	} else {
-		tmp_tm.tm_hour = priv->hour;
-		tmp_tm.tm_min = priv->minute;
-	}
-	tmp_tm.tm_sec = 0;
-	tmp_tm.tm_isdst = -1;
-
-	return mktime (&tmp_tm);
-}
-
-
-/**
- * e_date_edit_set_time:
- * @dedit: the EDateEdit widget
- * @the_time: The time and date that should be set on the widget
- *
- * Description:  Changes the displayed date and time in the EDateEdit
- * widget to be the one represented by @the_time.  If @the_time is 0
- * then current time is used. If it is -1, then the date is set to None.
- */
-void
-e_date_edit_set_time		(EDateEdit	*dedit,
-				 time_t		 the_time)
-{
-	EDateEditPrivate *priv;
-	struct tm *tmp_tm;
-	gboolean date_changed = FALSE, time_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (the_time == -1) {
-		date_changed = e_date_edit_set_date_internal (dedit, TRUE,
-							      TRUE, 0, 0, 0);
-		time_changed = e_date_edit_set_time_internal (dedit, TRUE,
-							      TRUE, 0, 0);
-	} else {
-		if (the_time == 0)
-			the_time = time (NULL);
-
-		tmp_tm = localtime (&the_time);
-
-		date_changed = e_date_edit_set_date_internal (dedit, TRUE,
-							      FALSE,
-							      tmp_tm->tm_year,
-							      tmp_tm->tm_mon,
-							      tmp_tm->tm_mday);
-		time_changed = e_date_edit_set_time_internal (dedit, TRUE,
-							      FALSE,
-							      tmp_tm->tm_hour,
-							      tmp_tm->tm_min);
-	}
-
-	e_date_edit_update_date_entry (dedit);
-	e_date_edit_update_time_entry (dedit);
-	e_date_edit_update_time_combo_state (dedit);
-
-	/* Emit the signals if the date and/or time has actually changed. */
-	if (date_changed || time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_date:
- * @dedit: an #EDateEdit widget.
- * @year: returns the year set.
- * @month: returns the month set (1 - 12).
- * @day: returns the day set (1 - 31).
- * @Returns: TRUE if a time was set, or FALSE if the field is empty or 'None'.
- *
- * Returns the last valid date entered into the date field.
- */
-gboolean
-e_date_edit_get_date		(EDateEdit	*dedit,
-				 gint		*year,
-				 gint		*month,
-				 gint		*day)
-{
-	EDateEditPrivate *priv;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_date_changed (dedit);
-
-	if (priv->date_set_to_none)
-		return FALSE;
-
-	*year = priv->year + 1900;
-	*month = priv->month + 1;
-	*day = priv->day;
-
-	return TRUE;
-}
-
-
-/**
- * e_date_edit_set_date:
- * @dedit: an #EDateEdit widget.
- * @year: the year to set.
- * @month: the month to set (1 - 12).
- * @day: the day to set (1 - 31).
- *
- * Sets the date in the date field.
- */
-void
-e_date_edit_set_date		(EDateEdit	*dedit,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
-{
-	EDateEditPrivate *priv;
-	gboolean date_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	date_changed = e_date_edit_set_date_internal (dedit, TRUE, FALSE,
-						      year - 1900, month - 1,
-						      day);
-
-	e_date_edit_update_date_entry (dedit);
-	e_date_edit_update_time_combo_state (dedit);
-
-	/* Emit the signals if the date has actually changed. */
-	if (date_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_time_of_day:
- * @dedit: an #EDateEdit widget.
- * @hour: returns the hour set.
- * @minute: returns the minute set.
- * @Returns: TRUE if a time was set, or FALSE if the field is empty or 'None'.
- *
- * Returns the last valid time entered into the time field.
- */
-gboolean
-e_date_edit_get_time_of_day		(EDateEdit	*dedit,
-					 gint		*hour,
-					 gint		*minute)
-{
-	EDateEditPrivate *priv;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_time_changed (dedit);
-
-	if (priv->time_set_to_none)
-		return FALSE;
-
-	*hour = priv->hour;
-	*minute = priv->minute;
-
-	return TRUE;
-}
-
-
-/**
- * e_date_edit_set_time_of_day:
- * @dedit: an #EDateEdit widget.
- * @hour: the hour to set.
- * @minute: the minute to set.
- *
- * Description: Sets the time in the time field.
- */
-void
-e_date_edit_set_time_of_day		(EDateEdit	*dedit,
-					 gint		 hour,
-					 gint		 minute)
-{
-	EDateEditPrivate *priv;
-	gboolean time_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->time_set_to_none
-	    || priv->hour != hour
-	    || priv->minute != minute) {
-		priv->time_set_to_none = FALSE;
-		priv->hour = hour;
-		priv->minute = minute;
-		time_changed = TRUE;
-	}
-
-	e_date_edit_update_time_entry (dedit);
-
-	if (time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_show_date:
- * @dedit: an #EDateEdit widget.
- * @Returns: Whether the date field is shown.
- *
- * Description: Returns TRUE if the date field is currently shown.
- */
-gboolean
-e_date_edit_get_show_date		(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->show_date;
-}
-
-
-/**
- * e_date_edit_set_show_date:
- * @dedit: an #EDateEdit widget.
- * @show_time: TRUE if the date field should be shown.
- *
- * Description: Specifies whether the date field should be shown. The date
- * field would be hidden if only a time needed to be entered.
- */
-void
-e_date_edit_set_show_date		(EDateEdit	*dedit,
-					 gboolean	 show_date)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->show_date == show_date)
-		return;
-
-	priv->show_date = show_date;
-
-	if (show_date) {
-		gtk_widget_show (priv->date_entry);
-		gtk_widget_show (priv->date_button);
-	} else {
-		gtk_widget_hide (priv->date_entry);
-		gtk_widget_hide (priv->date_button);
-	}
-
-	e_date_edit_update_time_combo_state (dedit);
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-	else
-		gtk_widget_hide (priv->space);
-}
-
-
-/**
- * e_date_edit_get_show_time:
- * @dedit: an #EDateEdit widget
- * @Returns: Whether the time field is shown.
- *
- * Description: Returns TRUE if the time field is currently shown.
- */
-gboolean
-e_date_edit_get_show_time		(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->show_time;
-}
-
-
-/**
- * e_date_edit_set_show_time:
- * @dedit: an #EDateEdit widget
- * @show_time: TRUE if the time field should be shown.
- *
- * Description: Specifies whether the time field should be shown. The time
- * field would be hidden if only a date needed to be entered.
- */
-void
-e_date_edit_set_show_time		(EDateEdit	*dedit,
-					 gboolean	 show_time)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->show_time == show_time)
-		return;
-
-	priv->show_time = show_time;
-
-	if (show_time) {
-		gtk_widget_show (priv->time_combo);
-	} else {
-		gtk_widget_hide (priv->time_combo);
-		gtk_widget_hide (priv->now_button);
-	}
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-	else
-		gtk_widget_hide (priv->space);
-}
-
-
-/**
- * e_date_edit_get_week_start_day:
- * @dedit: an #EDateEdit widget
- * @Returns: the week start day, from 0 (Sunday) to 6 (Saturday).
- *
- * Description: Returns the week start day currently used in the calendar
- * popup.
- */
-gint
-e_date_edit_get_week_start_day		(EDateEdit	*dedit)
-{
-	gint week_start_day;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), 1);
-
-	gtk_object_get (GTK_OBJECT (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"week_start_day", &week_start_day,
-			NULL);
-
-	return week_start_day;
-}
-
-
-/**
- * e_date_edit_set_week_start_day:
- * @dedit: an #EDateEdit widget
- * @week_start_day: the week start day, from 0 (Sunday) to 6 (Saturday).
- *
- * Description: Sets the week start day to use in the calendar popup.
- */
-void
-e_date_edit_set_week_start_day		(EDateEdit	*dedit,
-					 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"week_start_day", week_start_day,
-			NULL);
-}
-
-
-/* Whether we show week numbers in the date popup. */
-gboolean
-e_date_edit_get_show_week_numbers	(EDateEdit	*dedit)
-{
-	gboolean show_week_numbers;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	gtk_object_get (GTK_OBJECT (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"show_week_numbers", &show_week_numbers,
-			NULL);
-
-	return show_week_numbers;
-}
-
-
-void
-e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
-					 gboolean	 show_week_numbers)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"show_week_numbers", show_week_numbers,
-			NULL);
-}
-
-
-/* Whether we use 24 hour format in the time field & popup. */
-gboolean
-e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->use_24_hour_format;
-}
-
-
-void
-e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
-					 gboolean	 use_24_hour_format)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	if (dedit->priv->use_24_hour_format == use_24_hour_format)
-		return;
-
-	dedit->priv->use_24_hour_format = use_24_hour_format;
-
-	rebuild_time_popup (dedit);
-
-	e_date_edit_update_time_entry (dedit);
-}
-
-
-/* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
-gboolean
-e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	return GTK_WIDGET_VISIBLE (dedit->priv->none_button);
-}
-
-
-void
-e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
-					 gboolean	 allow_no_date_set)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	if (allow_no_date_set) {
-		gtk_widget_show (dedit->priv->none_button);
-	} else {
-		gtk_widget_hide (dedit->priv->none_button);
-
-		/* If the date is showing, we make sure it isn't 'None' (we
-		   don't really mind if the time is empty), else if just the
-		   time is showing we make sure it isn't 'None'. */
-		if (dedit->priv->show_date) {
-			if (dedit->priv->date_set_to_none)
-				e_date_edit_set_time (dedit, time (NULL));
-		} else {
-			if (dedit->priv->time_set_to_none)
-				e_date_edit_set_time (dedit, time (NULL));
-		}
-	}
-}
-
-
-/* The range of time to show in the time combo popup. */
-void
-e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
-					 gint		*lower_hour,
-					 gint		*upper_hour)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	*lower_hour = dedit->priv->lower_hour;
-	*upper_hour = dedit->priv->upper_hour;
-}
-
-
-void
-e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
-					 gint		 lower_hour,
-					 gint		 upper_hour)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->lower_hour == lower_hour
-	    && priv->upper_hour == upper_hour)
-		return;
-
-	priv->lower_hour = lower_hour;
-	priv->upper_hour = upper_hour;
-
-	rebuild_time_popup (dedit);
-
-	/* Setting the combo list items seems to mess up the time entry, so
-	   we set it again. We have to reset it to its last valid time. */
-	priv->time_is_valid = TRUE;
-	e_date_edit_update_time_entry (dedit);
-}
-
-
-/* The arrow button beside the date field has been clicked, so we show the
-   popup with the ECalendar in. */
-static void
-on_date_button_clicked		(GtkWidget	*widget,
-				 EDateEdit	*dedit)
-{
-	e_date_edit_show_date_popup (dedit);
-}
-
-
-static void
-e_date_edit_show_date_popup	(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	ECalendar *calendar;
-	struct tm mtm;
-	gchar *date_text;
-	GDate selected_day;
-	gboolean clear_selection = FALSE;
-
-	priv = dedit->priv;
-	calendar = E_CALENDAR (priv->calendar);
-
-	date_text = gtk_entry_get_text (GTK_ENTRY (priv->date_entry));
-	if (field_set_to_none (date_text)
-	    || !e_date_edit_parse_date (dedit, date_text, &mtm))
-		clear_selection = TRUE;
-
-	if (clear_selection) {
-		e_calendar_item_set_selection (calendar->calitem, NULL, NULL);
-	} else {
-		g_date_clear (&selected_day, 1);
-		g_date_set_dmy (&selected_day, mtm.tm_mday, mtm.tm_mon + 1,
-				mtm.tm_year + 1900);
-		e_calendar_item_set_selection (calendar->calitem,
-					       &selected_day, NULL);
-	}
-
-	/* FIXME: Hack. Change ECalendarItem so it doesn't queue signal
-	   emissions. */
-	calendar->calitem->selection_changed = FALSE;
-
-        position_date_popup (dedit);
-	gtk_widget_show (priv->cal_popup);
-	gtk_widget_grab_focus (priv->cal_popup);
-	gtk_grab_add (priv->cal_popup);
-	gdk_pointer_grab (priv->cal_popup->window, TRUE,
-			  (GDK_BUTTON_PRESS_MASK
-			   | GDK_BUTTON_RELEASE_MASK
-			   | GDK_POINTER_MOTION_MASK),
-			  NULL, NULL, GDK_CURRENT_TIME);
-}
-
-
-/* This positions the date popup below and to the left of the arrow button,
-   just before it is shown. */
-static void
-position_date_popup		(EDateEdit	*dedit)
-{
-	gint x, y;
-	gint bwidth, bheight;
-	GtkRequisition req;
-	gint screen_width, screen_height;
-
-	gtk_widget_size_request (dedit->priv->cal_popup, &req);
-
-	gdk_window_get_origin (dedit->priv->date_button->window, &x, &y);
-	gdk_window_get_size (dedit->priv->date_button->window,
-			     &bwidth, &bheight);
-
-      	screen_width = gdk_screen_width ();
-	screen_height = gdk_screen_height ();
-
-	x += bwidth - req.width;
-	y += bheight;
-
-	x = CLAMP (x, 0, MAX (0, screen_width - req.width));
-	y = CLAMP (y, 0, MAX (0, screen_height - req.height));
-
-	gtk_widget_set_uposition (dedit->priv->cal_popup, x, y);
-}
-
-
-/* A date has been selected in the date popup, so we set the date field
-   and hide the popup. */
-static void
-on_date_popup_date_selected	(ECalendarItem	*calitem,
-				 EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	GDate start_date, end_date;
-
-	priv = dedit->priv;
-
-	hide_date_popup (dedit);
-
-	if (!e_calendar_item_get_selection (calitem, &start_date, &end_date))
-		return;
-
-	e_date_edit_set_date (dedit, g_date_year (&start_date),
-			      g_date_month (&start_date),
-			      g_date_day (&start_date));
-}
-
-
-static void
-on_date_popup_now_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	e_date_edit_set_time (dedit, time (NULL));
-}
-
-
-static void
-on_date_popup_today_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	struct tm *tmp_tm;
-	time_t t;
-
-	hide_date_popup (dedit);
-
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-
-	e_date_edit_set_date (dedit, tmp_tm->tm_year + 1900,
-			      tmp_tm->tm_mon + 1, tmp_tm->tm_mday);
-}
-
-
-static void
-on_date_popup_none_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	e_date_edit_set_time (dedit, -1);
-}
-
-
-/* A key has been pressed while the date popup is showing. If it is the Escape
-   key we hide the popup. */
-static gint
-on_date_popup_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	if (event->keyval != GDK_Escape)
-		return FALSE;
-
-	gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
-	hide_date_popup (dedit);
-
-	return TRUE;
-}
-
-
-/* A mouse button has been pressed while the date popup is showing.
-   Any button press events used to select days etc. in the popup will have
-   have been handled elsewhere, so here we just hide the popup.
-   (This function is yanked from gtkcombo.c) */
-static gint
-on_date_popup_button_press	(GtkWidget	*widget,
-				 GdkEventButton *event,
-				 gpointer	 data)
-{
-	EDateEdit *dedit;
-	GtkWidget *child;
-
-	dedit = data;
-
-	child = gtk_get_event_widget ((GdkEvent *) event);
-
-	/* We don't ask for button press events on the grab widget, so
-	 *  if an event is reported directly to the grab widget, it must
-	 *  be on a window outside the application (and thus we remove
-	 *  the popup window). Otherwise, we check if the widget is a child
-	 *  of the grab widget, and only remove the popup window if it
-	 *  is not.
-	 */
-	if (child != widget) {
-		while (child) {
-			if (child == widget)
-				return FALSE;
-			child = child->parent;
-		}
-	}
-
-	hide_date_popup (dedit);
-
-	return TRUE;
-}
-
-
-/* A delete event has been received for the date popup, so we hide it and
-   return TRUE so it doesn't get destroyed. */
-static gint
-on_date_popup_delete_event	(GtkWidget	*widget,
-				 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	return TRUE;
-}
-
-
-/* Hides the date popup, removing any grabs. */
-static void
-hide_date_popup			(EDateEdit	*dedit)
-{
-	gtk_widget_hide (dedit->priv->cal_popup);
-	gtk_grab_remove (dedit->priv->cal_popup);
-	gdk_pointer_ungrab (GDK_CURRENT_TIME);
-}
-
-
-/* Clears the time popup and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
-static void
-rebuild_time_popup			(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	GtkList *list;
-	GtkWidget *listitem;
-	char buffer[40], *format;
-	struct tm tmp_tm;
-	gint hour, min;
-
-	priv = dedit->priv;
-
-	list = GTK_LIST (GTK_COMBO (priv->time_combo)->list);
-
-	gtk_list_clear_items (list, 0, -1);
-
-	/* Fill the struct tm with some sane values. */
-	tmp_tm.tm_year = 2000;
-	tmp_tm.tm_mon = 0;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_sec  = 0;
-	tmp_tm.tm_isdst = 0;
-
-	for (hour = priv->lower_hour; hour <= priv->upper_hour; hour++) {
-
-		/* We don't want to display midnight at the end, since that is
-		   really in the next day. */
-		if (hour == 24)
-			break;
-
-		/* We want to finish on upper_hour, with min == 0. */
-		for (min = 0;
-		     min == 0 || (min < 60 && hour != priv->upper_hour);
-		     min += 30) {
-			tmp_tm.tm_hour = hour;
-			tmp_tm.tm_min  = min;
-
-			if (priv->use_24_hour_format)
-				/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-				format = _("%H:%M");
-			else
-				/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-				format = _("%I:%M %p");
-
-			strftime (buffer, sizeof (buffer), format, &tmp_tm);
-
-			listitem = gtk_list_item_new_with_label (buffer);
-			gtk_widget_show (listitem);
-			gtk_container_add (GTK_CONTAINER (list), listitem);
-		}
-	}
-}
-
-
-static gboolean
-e_date_edit_parse_date (EDateEdit *dedit,
-			gchar	  *date_text,
-			struct tm *date_tm)
-{
-	struct tm *tmp_tm;
-	time_t t;
-
-	/* This is a strptime() format for a short date. %m = month,
-	   %d = day of month, %Y = year (all digits). */
-	if (!strptime (date_text, _("%m/%d/%Y"), date_tm))
-		return FALSE;
-
-	/* If the user entered a 2-digit year we use the current century. */
-	if (date_tm->tm_year < 0) {
-		t = time (NULL);
-		tmp_tm = localtime (&t);
-
-		/* This should convert it into a value from 0 to 99. */
-		date_tm->tm_year += 1900;
-
-		/* Now add on the century. */
-		date_tm->tm_year += tmp_tm->tm_year - (tmp_tm->tm_year % 100);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_date_edit_parse_time	(EDateEdit	*dedit,
-			 gchar		*time_text,
-			 struct tm	*time_tm)
-{
-	gchar *format;
-
-	if (field_set_to_none (time_text)) {
-		time_tm->tm_hour = 0;
-		time_tm->tm_min = 0;
-		return TRUE;
-	}
-
-	if (dedit->priv->use_24_hour_format)
-		/* This is a strptime() format. %H = hour (0-23), %M = minute. */
-		format = _("%H:%M");
-	else
-		/* This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-		format = _("%I:%M %p");
-
-	if (!strptime (time_text, format, time_tm))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* Returns TRUE if the string is empty or is "None" in the current locale.
-   It ignores whitespace. */
-static gboolean
-field_set_to_none		(char		*text)
-{
-	char *pos, *none_string;
-
-	pos = text;
-	while (isspace (*pos))
-		pos++;
-
-	none_string = _("None");
-
-	if (*pos == '\0' || !strncmp (pos, none_string, strlen (none_string)))
-		return TRUE;
-	return FALSE;
-}
-
-
-static void
-on_date_edit_time_selected	(GtkList	*list,
-				 EDateEdit	*dedit)
-{
-	GtkWidget *toplevel;
-
-	/* We only want to emit signals when an item is selected explicitly,
-	   not when it is selected by the silly combo update thing. */
-	if (!list->selection)
-		return;
-
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (list));
-	if (!GTK_WIDGET_MAPPED (toplevel))
-		return;
-
-	e_date_edit_check_time_changed (dedit);
-}
-
-
-static gint
-on_date_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	if (event->state & GDK_MOD1_MASK
-	    && (event->keyval == GDK_Up || event->keyval == GDK_Down
-		|| event->keyval == GDK_Return)) {
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		e_date_edit_show_date_popup (dedit);
-		return TRUE;
-	}
-
-	/* If the user hits the return key emit a "date_changed" signal if
-	   needed. But let the signal carry on. */
-	if (event->keyval == GDK_Return) {
-		e_date_edit_check_date_changed (dedit);
-		return FALSE;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-on_time_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	/* I'd like to use Alt+Up/Down for popping up the list, like Win32,
-	   but the combo steals any Up/Down keys, so we use Alt+Return. */
-#if 0	   
-	if (event->state & GDK_MOD1_MASK
-	    && (event->keyval == GDK_Up || event->keyval == GDK_Down)) {
-#else
-	if (event->state & GDK_MOD1_MASK && event->keyval == GDK_Return) {
-#endif
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		gtk_signal_emit_by_name (GTK_OBJECT (GTK_COMBO (dedit->priv->time_combo)->entry), "activate");
-		return TRUE;
-	}
-
-	/* Stop the return key from emitting the activate signal, and check
-	   if we need to emit a "time_changed" signal. */
-	if (event->keyval == GDK_Return) {
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		e_date_edit_check_time_changed (dedit);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-on_date_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
-{
-	e_date_edit_check_date_changed (dedit);
-	return FALSE;
-}
-
-
-static gint
-on_time_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
-{
-	e_date_edit_check_time_changed (dedit);
-	return FALSE;
-}
-
-
-/* This sets the text in the date entry according to the current settings. */
-static void
-e_date_edit_update_date_entry		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	char buffer[40];
-	struct tm tmp_tm = { 0 };
-
-	priv = dedit->priv;
-
-	if (priv->date_set_to_none || !priv->date_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
-	} else {
-		tmp_tm.tm_year = priv->year;
-		tmp_tm.tm_mon = priv->month;
-		tmp_tm.tm_mday = priv->day;
-		tmp_tm.tm_isdst = -1;
-
-		/* This is a strftime() format for a short date. %m = month,
-		   %d = day of month, %Y = year (all digits). */
-		strftime (buffer, sizeof (buffer), _("%m/%d/%Y"), &tmp_tm);
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), buffer);
-	}
-}
-
-
-/* This sets the text in the time entry according to the current settings. */
-static void
-e_date_edit_update_time_entry		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	char buffer[40], *format;
-	struct tm tmp_tm = { 0 };
-
-	priv = dedit->priv;
-
-	if (priv->time_set_to_none || !priv->time_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry), "");
-	} else {
-		/* Set these to reasonable values just in case. */
-		tmp_tm.tm_year = 2000;
-		tmp_tm.tm_mon = 0;
-		tmp_tm.tm_mday = 1;
-
-		tmp_tm.tm_hour = priv->hour;
-		tmp_tm.tm_min = priv->minute;
-
-		tmp_tm.tm_sec = 0;
-		tmp_tm.tm_isdst = -1;
-
-		if (priv->use_24_hour_format)
-			/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-			format = _("%H:%M");
-		else
-			/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-			format = _("%I:%M %p");
-
-		strftime (buffer, sizeof (buffer), format, &tmp_tm);
-		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry),
-				    buffer);
-	}
-}
-
-
-static void
-e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *text;
-
-	priv = dedit->priv;
-
-	/* If the date entry is currently shown, and it is set to None,
-	   clear the time entry and disable the time combo, else enable it. */
-	if (priv->show_date && priv->date_set_to_none) {
-		text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry));
-		if (text[0])
-			gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry), "");
-		gtk_widget_set_sensitive (priv->time_combo, FALSE);
-	} else {
-		gtk_widget_set_sensitive (priv->time_combo, TRUE);
-	}
-}
-
-
-/* Parses the date, and if it is different from the current settings it
-   updates the settings and emits a "date_changed" signal. */
-static void
-e_date_edit_check_date_changed		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *date_text;
-	struct tm tmp_tm;
-	gboolean none = FALSE, valid = TRUE, date_changed;
-
-	priv = dedit->priv;
-
-	date_text = gtk_entry_get_text (GTK_ENTRY (priv->date_entry));
-	if (field_set_to_none (date_text))
-		none = TRUE;
-	else if (!e_date_edit_parse_date (dedit, date_text, &tmp_tm))
-		valid = FALSE;
-
-	date_changed = e_date_edit_set_date_internal (dedit, valid, none,
-						      tmp_tm.tm_year,
-						      tmp_tm.tm_mon,
-						      tmp_tm.tm_mday);
-
-	if (date_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/* Parses the time, and if it is different from the current settings it
-   updates the settings and emits a "time_changed" signal. */
-static void
-e_date_edit_check_time_changed		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *time_text;
-	struct tm tmp_tm;
-	gboolean none = FALSE, valid = TRUE, time_changed;
-
-	priv = dedit->priv;
-
-	time_text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry));
-	if (field_set_to_none (time_text))
-		none = TRUE;
-	else if (!e_date_edit_parse_time (dedit, time_text, &tmp_tm))
-		valid = FALSE;
-
-	time_changed = e_date_edit_set_time_internal (dedit, valid, none,
-						      tmp_tm.tm_hour,
-						      tmp_tm.tm_min);
-
-	if (time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_date_is_valid:
- * @dedit: an #EDateEdit widget.
- * @Returns: TRUE if the last date entered was valid.
- *
- * Returns TRUE if the last date entered was valid.
- *
- * Note that if this returns FALSE, you can still use e_date_edit_get_time()
- * or e_date_edit_get_date() to get the last time or date entered which was
- * valid.
- */
-gboolean
-e_date_edit_date_is_valid	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	if (!dedit->priv->date_is_valid)
-		return FALSE;
-
-	/* If the date is empty/None and that isn't permitted, return FALSE. */
-	if (dedit->priv->date_set_to_none
-	    && !e_date_edit_get_allow_no_date_set (dedit))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/**
- * e_date_edit_time_is_valid:
- * @dedit: an #EDateEdit widget.
- * @Returns: TRUE if the last time entered was valid.
- *
- * Returns TRUE if the last time entered was valid.
- *
- * Note that if this returns FALSE, you can still use e_date_edit_get_time()
- * or e_date_edit_get_time_of_day() to get the last time or time of the day
- * entered which was valid.
- */
-gboolean
-e_date_edit_time_is_valid	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	if (!dedit->priv->time_is_valid)
-		return FALSE;
-
-	/* If the time is empty and that isn't permitted, return FALSE.
-	   Note that we don't mind an empty time if the date field is shown
-	   - in that case we just assume 0:00. */
-	if (dedit->priv->time_set_to_none && !dedit->priv->show_date
-	    && !e_date_edit_get_allow_no_date_set (dedit))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-static gboolean
-e_date_edit_set_date_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
-{
-	EDateEditPrivate *priv;
-	gboolean date_changed = FALSE;
-
-	priv = dedit->priv;
-
-	if (!valid) {
-		/* Date is invalid. */
-		if (priv->date_is_valid) {
-			priv->date_is_valid = FALSE;
-			date_changed = TRUE;
-		}
-	} else if (none) {
-		/* Date has been set to 'None'. */
-		if (!priv->date_is_valid
-		    || !priv->date_set_to_none) {
-			priv->date_is_valid = TRUE;
-			priv->date_set_to_none = TRUE;
-			date_changed = TRUE;
-		}
-	} else {
-		/* Date has been set to a specific date. */
-		if (!priv->date_is_valid
-		    || priv->date_set_to_none
-		    || priv->year != year
-		    || priv->month != month
-		    || priv->day != day) {
-			priv->date_is_valid = TRUE;
-			priv->date_set_to_none = FALSE;
-			priv->year = year;
-			priv->month = month;
-			priv->day = day;
-			date_changed = TRUE;
-		}
-	}
-
-	return date_changed;
-}
-
-
-static gboolean
-e_date_edit_set_time_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 hour,
-				 gint		 minute)
-{
-	EDateEditPrivate *priv;
-	gboolean time_changed = FALSE;
-
-	priv = dedit->priv;
-
-	if (!valid) {
-		/* Time is invalid. */
-		if (priv->time_is_valid) {
-			priv->time_is_valid = FALSE;
-			time_changed = TRUE;
-		}
-	} else if (none) {
-		/* Time has been set to empty/'None'. */
-		if (!priv->time_is_valid
-		    || !priv->time_set_to_none) {
-			priv->time_is_valid = TRUE;
-			priv->time_set_to_none = TRUE;
-			time_changed = TRUE;
-		}
-	} else {
-		/* Time has been set to a specific time. */
-		if (!priv->time_is_valid
-		    || priv->time_set_to_none
-		    || priv->hour != hour
-		    || priv->minute != minute) {
-			priv->time_is_valid = TRUE;
-			priv->time_set_to_none = FALSE;
-			priv->hour = hour;
-			priv->minute = minute;
-			time_changed = TRUE;
-		}
-	}
-
-	return time_changed;
-}
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
deleted file mode 100644
index 8ffb4694f9..0000000000
--- a/widgets/misc/e-dateedit.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * Based on the GnomeDateEdit, part of the Gnome Library.
- * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDateEdit - a widget based on GnomeDateEdit to provide a date & optional
- * time field with popups for entering a date.
- *
- * It emits a "changed" signal when the date and/or time has changed.
- * You can check if the last date or time entered was invalid by
- * calling e_date_edit_date_is_valid() and e_date_edit_time_is_valid().
- *
- * Note that when the user types in a date or time, it will only emit the
- * signals when the user presses the return key or switches the keyboard
- * focus to another widget, or you call one of the _get_time/date functions.
- */
-
-#ifndef __E_DATE_EDIT_H_
-#define __E_DATE_EDIT_H_ 
-
-#include <time.h>
-#include <gtk/gtkhbox.h>
-#include <libgnome/gnome-defs.h>
- 
-BEGIN_GNOME_DECLS
-
-
-#define E_TYPE_DATE_EDIT            (e_date_edit_get_type ())
-#define E_DATE_EDIT(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit))
-#define E_DATE_EDIT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_EDIT, EDateEditClass))
-#define E_IS_DATE_EDIT(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_DATE_EDIT))
-#define E_IS_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_EDIT))
-
-
-typedef struct _EDateEdit        EDateEdit;
-typedef struct _EDateEditPrivate EDateEditPrivate;
-typedef struct _EDateEditClass   EDateEditClass;
-
-struct _EDateEdit {
-	GtkHBox hbox;
-
-	/*< private >*/
-	EDateEditPrivate *priv;
-};
-
-struct _EDateEditClass {
-	GtkHBoxClass parent_class;
-
-	void (* changed) (EDateEdit *dedit);
-};
-
-guint      e_date_edit_get_type			(void);
-GtkWidget* e_date_edit_new			(void);
-
-/* Returns TRUE if the last date and time set were valid. The date and time
-   are only set when the user hits Return or switches keyboard focus, or
-   selects a date or time from the popup. */
-gboolean   e_date_edit_date_is_valid		(EDateEdit	*dedit);
-gboolean   e_date_edit_time_is_valid		(EDateEdit	*dedit);
-
-/* Returns the last valid date & time set, or -1 if the date & time was set to
-   'None' and this is permitted via e_date_edit_set_allow_no_date_set. */
-time_t	   e_date_edit_get_time			(EDateEdit	*dedit);
-void       e_date_edit_set_time			(EDateEdit	*dedit,
-						 time_t		 the_time);
-
-/* This returns the last valid date set, without the time. It returns TRUE
-   if a date is set, or FALSE if the date is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. */
-gboolean   e_date_edit_get_date			(EDateEdit	*dedit,
-						 gint		*year,
-						 gint		*month,
-						 gint		*day);
-void	   e_date_edit_set_date			(EDateEdit	*dedit,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day);
-
-/* This returns the last valid time set, without the date. It returns TRUE
-   if a time is set, or FALSE if the time is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. */
-gboolean   e_date_edit_get_time_of_day		(EDateEdit	*dedit,
-						 gint		*hour,
-						 gint		*minute);
-void       e_date_edit_set_time_of_day		(EDateEdit	*dedit,
-						 gint		 hour,
-						 gint		 minute);
-
-/* Whether we show the date field. */
-gboolean   e_date_edit_get_show_date		(EDateEdit	*dedit);
-void       e_date_edit_set_show_date		(EDateEdit	*dedit,
-						 gboolean	 show_date);
-
-/* Whether we show the time field. */
-gboolean   e_date_edit_get_show_time		(EDateEdit	*dedit);
-void       e_date_edit_set_show_time		(EDateEdit	*dedit,
-						 gboolean	 show_time);
-
-/* The week start day, used in the date popup. 0 (Mon) to 6 (Sun). */
-gint	   e_date_edit_get_week_start_day	(EDateEdit	*dedit);
-void       e_date_edit_set_week_start_day	(EDateEdit	*dedit,
-						 gint		 week_start_day);
-
-/* Whether we show week numbers in the date popup. */
-gboolean   e_date_edit_get_show_week_numbers	(EDateEdit	*dedit);
-void       e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
-						 gboolean	 show_week_numbers);
-
-/* Whether we use 24 hour format in the time field & popup. */
-gboolean   e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit);
-void       e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
-						 gboolean	 use_24_hour_format);
-
-/* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
-gboolean   e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit);
-void       e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
-						 gboolean	 allow_no_date_set);
-
-/* The range of time to show in the time combo popup. */
-void	   e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
-						 gint		*lower_hour,
-						 gint		*upper_hour);
-void       e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
-						 gint		 lower_hour,
-						 gint		 upper_hour);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
deleted file mode 100644
index a8a42e9301..0000000000
--- a/widgets/misc/e-dropdown-button.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com> 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include <gtk/gtk.h>
-#include <gal/util/e-util.h>
-
-#include "e-dropdown-button.h"
-
-
-struct _EDropdownButtonPrivate {
-	GtkAccelGroup *accel_group;
-	GtkWidget *menu;
-};
-
-#define PARENT_TYPE gtk_toggle_button_get_type ()
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-/* Callback to position the pop-up menu.  */
-
-static void
-menu_position_cb (GtkMenu *menu,
-		  int *x,
-		  int *y,
-		  void *data)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-	GtkRequisition menu_requisition;
-	int max_x, max_y;
-
-	dropdown_button = E_DROPDOWN_BUTTON (data);
-	priv = dropdown_button->priv;
-
-	/* Calculate our preferred position.  */
-	gdk_window_get_origin (GTK_WIDGET (dropdown_button)->window, x, y);
-	*y += GTK_WIDGET (dropdown_button)->allocation.height;
-
-	/* Now make sure we are on the screen.  */
-	gtk_widget_size_request (GTK_WIDGET (priv->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);
-}
-
-/* Callback for the "deactivate" signal on the pop-up menu.  This is used so
-   that we unset the state of the toggle button when the pop-up menu
-   disappears.  */
-
-static int
-menu_deactivate_cb (GtkMenuShell *menu_shell,
-		    void *data)
-{
-	EDropdownButton *dropdown_button;
-
-	puts (__FUNCTION__);
-
-	dropdown_button = E_DROPDOWN_BUTTON (data);
-
-	gtk_button_clicked (GTK_BUTTON (dropdown_button));
-	return TRUE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-
-	dropdown_button = E_DROPDOWN_BUTTON (object);
-	priv = dropdown_button->priv;
-
-	gtk_accel_group_unref (priv->accel_group);
-	gtk_widget_destroy (priv->menu);
-
-	g_free (priv);
-}
-
-
-/* GtkWidget methods.  */
-
-static int
-impl_button_press_event (GtkWidget *widget,
-			 GdkEventButton *event)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-	GtkStateType new_state;
-
-	dropdown_button = E_DROPDOWN_BUTTON (widget);
-	priv = dropdown_button->priv;
-
-	gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL,
-			menu_position_cb, dropdown_button,
-			1, GDK_CURRENT_TIME);
-
-	gnome_popup_menu_do_popup (GTK_WIDGET (priv->menu), menu_position_cb, dropdown_button,
-				   event, NULL);
-
-	if (! GTK_WIDGET_HAS_FOCUS (widget))
- 		gtk_widget_grab_focus (widget);
-
-	gtk_button_clicked (GTK_BUTTON (widget));
-
-	return TRUE;
-}
-
-
-static void
-class_init (EDropdownButtonClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	object_class->destroy = impl_destroy;
-
-	widget_class->button_press_event = impl_button_press_event;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-
-static void
-init (EDropdownButton *dropdown_button)
-{
-	EDropdownButtonPrivate *priv;
-
-	priv = g_new (EDropdownButtonPrivate, 1);
-	priv->accel_group = gtk_accel_group_new ();
-	priv->menu        = NULL;
-
-	dropdown_button->priv = priv;
-}
-
-
-/**
- * e_dropdown_button_construct:
- * @dropdown_button: A pointer to an %EDropdownButton object
- * @label_text: Text to display in the button
- * @menu: The menu to pop up when the button is pressed
- * 
- * Construct the @dropdown_button with the specified @label_text and the
- * associated @menu.
- **/
-void
-e_dropdown_button_construct (EDropdownButton *dropdown_button,
-			     const char *label_text,
-			     GtkMenu *menu)
-{
-	EDropdownButtonPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *arrow;
-	GtkWidget *label;
-	unsigned int accel_key;
-
-	g_return_if_fail (dropdown_button != NULL);
-	g_return_if_fail (E_IS_DROPDOWN_BUTTON (dropdown_button));
-	g_return_if_fail (label_text != NULL);
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	priv = dropdown_button->priv;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (dropdown_button), hbox);
-	gtk_widget_show (hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), label_text);
-	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (GTK_WIDGET (dropdown_button), "clicked",
-				    priv->accel_group, accel_key, GDK_MOD1_MASK, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	priv->menu = GTK_WIDGET (menu);
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->menu), "deactivate",
-					GTK_SIGNAL_FUNC (menu_deactivate_cb),
-					dropdown_button, GTK_OBJECT (dropdown_button));
-}
-
-/**
- * e_dropdown_button_new:
- * @label_text: Text to display in the button
- * @menu: The menu to pop up when the button is pressed
- * 
- * Create a new dropdown button.  When the button is clicked, the specified
- * @menu will be popped up.
- * 
- * Return value: A pointer to the newly created %EDropdownButton.
- **/
-GtkWidget *
-e_dropdown_button_new (const char *label_text,
-		       GtkMenu *menu)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (label_text != NULL, NULL);
-	g_return_val_if_fail (menu != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
-
-	widget = gtk_type_new (e_dropdown_button_get_type ());
-
-	e_dropdown_button_construct (E_DROPDOWN_BUTTON (widget), label_text, menu);
-	return widget;
-}
-
-
-E_MAKE_TYPE (e_dropdown_button, "EDropdownButton", EDropdownButton, class_init, init, PARENT_TYPE)
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
deleted file mode 100644
index 6e3043f70e..0000000000
--- a/widgets/misc/e-dropdown-button.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_DROPDOWN_BUTTON_H_
-#define _E_DROPDOWN_BUTTON_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmenu.h>
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_DROPDOWN_BUTTON		  (e_dropdown_button_get_type ())
-#define E_DROPDOWN_BUTTON(obj)		  (GTK_CHECK_CAST ((obj), E_TYPE_DROPDOWN_BUTTON, EDropdownButton))
-#define E_DROPDOWN_BUTTON_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DROPDOWN_BUTTON, EDropdownButtonClass))
-#define E_IS_DROPDOWN_BUTTON(obj)	  (GTK_CHECK_TYPE ((obj), E_TYPE_DROPDOWN_BUTTON))
-#define E_IS_DROPDOWN_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_DROPDOWN_BUTTON))
-
-
-typedef struct _EDropdownButton        EDropdownButton;
-typedef struct _EDropdownButtonPrivate EDropdownButtonPrivate;
-typedef struct _EDropdownButtonClass   EDropdownButtonClass;
-
-struct _EDropdownButton {
-	GtkToggleButton parent;
-
-	EDropdownButtonPrivate *priv;
-};
-
-struct _EDropdownButtonClass {
-	GtkToggleButtonClass parent_class;
-};
-
-
-GtkType    e_dropdown_button_get_type   (void);
-void       e_dropdown_button_construct  (EDropdownButton *dropdown_button,
-					 const char      *label_text,
-					 GtkMenu         *menu);
-GtkWidget *e_dropdown_button_new        (const char      *label_text,
-					 GtkMenu         *menu);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DROPDOWN_BUTTON_H_ */
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
deleted file mode 100644
index 6679059963..0000000000
--- a/widgets/misc/e-filter-bar.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-search-bar.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include "e-dropdown-button.h"
-#include "e-filter-bar.h"
-
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-
-enum {
-	LAST_SIGNAL
-};
-
-/*static gint esb_signals [LAST_SIGNAL] = { 0, };*/
-
-static ESearchBarClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_QUERY,
-};
-
-
-/* Callbacks.  */
-
-/* rule editor thingy */
-static void rule_editor_destroyed(GtkWidget *w, EFilterBar *efb)
-{
-	efb->save_dialogue = NULL;
-	e_search_bar_set_menu_sensitive((ESearchBar *)efb, E_FILTERBAR_SAVE_ID, TRUE);
-}
-
-static void rule_editor_clicked(GtkWidget *w, int button, void *data)
-{
-	EFilterBar *efb = data;
-	ESearchBarItem item;
-	FilterRule *rule;
-
-	switch(button) {
-	case 0:
-		rule = gtk_object_get_data((GtkObject *)w, "rule");
-		if (rule) {
-			item.text = rule->name;
-			item.id = efb->menu_base + efb->menu_rules->len;
-
-			g_ptr_array_add(efb->menu_rules, rule);
-
-			rule_context_add_rule(efb->context, rule);
-			/* FIXME: check return */
-			rule_context_save(efb->context, efb->userrules);
-			e_search_bar_add_menu((ESearchBar *)efb, &item);
-		}
-	case 1:
-		gnome_dialog_close((GnomeDialog *)w);
-		break;
-	case -1:
-	}
-}
-
-static void rule_advanced_clicked(GtkWidget *w, int button, void *data)
-{
-	EFilterBar *efb = data;
-	FilterRule *rule;
-
-	switch(button) {
-	case 0:			/* 'ok' */
-	case 1:
-		rule = gtk_object_get_data((GtkObject *)w, "rule");
-		if (rule) {
-			efb->current_query = rule;
-			gtk_object_ref((GtkObject *)rule);
-			gtk_signal_emit_by_name((GtkObject *)efb, "query_changed");
-		}
-		if (button == 1)
-			rule_editor_clicked(w, 0, data);
-	case 2:
-		gnome_dialog_close((GnomeDialog *)w);
-		break;
-	case -1:
-	}
-}
-
-static void
-menubar_activated (ESearchBar *esb, int id, void *data)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-
-	switch(id) {
-	case E_FILTERBAR_RESET_ID:
-		printf("Reset menu\n");
-		efb->current_query = NULL;
-		gtk_object_set((GtkObject *)esb, "option_choice", efb->option_base, NULL);
-		gtk_object_set((GtkObject *)esb, "text", NULL, NULL);
-		gtk_widget_set_sensitive(esb->entry, TRUE);
-		break;
-	case E_FILTERBAR_SAVE_ID:
-		if (efb->current_query && !efb->save_dialogue) {
-			GtkWidget *w;
-			GnomeDialog *gd;
-			FilterRule *rule;
-
-			rule = filter_rule_clone(efb->current_query, efb->context);
-
-			w = filter_rule_get_widget(rule, efb->context);
-			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
-			gd = (GnomeDialog *)gnome_dialog_new(_("Save Search"),
-							     GNOME_STOCK_BUTTON_OK,
-							     GNOME_STOCK_BUTTON_CANCEL,
-							     NULL);
-			efb->save_dialogue = (GtkWidget *)gd;
-			gnome_dialog_set_default (gd, 0);
-
-			gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-			/*gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);*/
-			gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-			gtk_widget_show((GtkWidget *)gd);
-			gtk_object_ref((GtkObject *)rule);
-			gtk_object_set_data_full((GtkObject *)gd, "rule", rule, (GtkDestroyNotify)gtk_object_unref);
-			gtk_signal_connect((GtkObject *)gd, "clicked", rule_editor_clicked, efb);
-			gtk_signal_connect((GtkObject *)gd, "destroy", rule_editor_destroyed, efb);
-
-			e_search_bar_set_menu_sensitive(esb, E_FILTERBAR_SAVE_ID, FALSE);
-			gtk_widget_set_sensitive(esb->entry, FALSE);
-
-			gtk_widget_show((GtkWidget *)gd);
-		}
-
-		printf("Save menu\n");
-		break;
-	default:
-		if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) {
-			GString *out = g_string_new("");
-			printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name);
-			filter_rule_build_code(efb->menu_rules->pdata[id - efb->menu_base], out);
-			printf("query: '%s'\n", out->str);
-			g_string_free(out, 1);
-
-			efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base];
-			efb->setquery = TRUE;
-			gtk_object_set((GtkObject *)esb, "option_choice", E_FILTERBAR_ADVANCED_ID, NULL);
-
-			gtk_widget_set_sensitive(esb->entry, FALSE);
-		} else {
-			gtk_widget_set_sensitive(esb->entry, TRUE);
-			return;
-		}
-	}
-
-	gtk_signal_emit_stop_by_name((GtkObject *)esb, "menu_activated");
-}
-
-static void
-option_changed (ESearchBar *esb, void *data)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-	int id = esb->option_choice;
-	char *query;
-
-	printf("option changed, id = %d\n", id);
-
-	switch(id) {
-	case E_FILTERBAR_ADVANCED_ID: {
-		printf("Advanced search!\n");
-
-		if (!efb->save_dialogue && !efb->setquery) {
-			GtkWidget *w;
-			GnomeDialog *gd;
-			FilterRule *rule;
-
-			if (efb->current_query)
-				rule = filter_rule_clone(efb->current_query, efb->context);
-			else
-				rule = filter_rule_new();
-
-			w = filter_rule_get_widget(rule, efb->context);
-			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
-			gd = (GnomeDialog *)gnome_dialog_new(_("Advanced Search"),
-							     GNOME_STOCK_BUTTON_OK,
-							     _("Save"),
-							     GNOME_STOCK_BUTTON_CANCEL,
-							     NULL);
-			efb->save_dialogue = (GtkWidget *)gd;
-			gnome_dialog_set_default (gd, 0);
-		
-			gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-			/*gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);*/
-			gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-			gtk_widget_show((GtkWidget *)gd);
-			gtk_object_ref((GtkObject *)rule);
-			gtk_object_set_data_full((GtkObject *)gd, "rule", rule, (GtkDestroyNotify)gtk_object_unref);
-			gtk_signal_connect((GtkObject *)gd, "clicked", rule_advanced_clicked, efb);
-			gtk_signal_connect((GtkObject *)gd, "destroy", rule_editor_destroyed, efb);
-		
-			e_search_bar_set_menu_sensitive(esb, E_FILTERBAR_SAVE_ID, FALSE);
-			gtk_widget_set_sensitive(esb->entry, FALSE);
-		
-			gtk_widget_show((GtkWidget *)gd);
-		}
-	}	break;
-	default:
-		if (id >= efb->option_base && id < efb->option_base + efb->option_rules->len) {
-			efb->current_query = (FilterRule *)efb->option_rules->pdata[id - efb->option_base];
-			if (efb->config) {
-				gtk_object_get((GtkObject *)esb, "text", &query, NULL);
-				efb->config(efb, efb->current_query, id, query, efb->config_data);
-				g_free(query);
-			}
-			gtk_widget_set_sensitive(esb->entry, TRUE);
-		} else {
-			gtk_widget_set_sensitive(esb->entry, FALSE);
-			efb->current_query = NULL;
-		}
-	}
-	efb->setquery = FALSE;
-}
-
-static GArray *build_items(ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrArray *rules)
-{
-	FilterRule *rule = NULL;
-	EFilterBar *efb = (EFilterBar *)esb;
-	int id = 0, i;
-	GArray *menu = g_array_new(FALSE, FALSE, sizeof(ESearchBarItem));
-	ESearchBarItem item;
-	char *source;
-
-	/* find a unique starting point for the id's of our items */
-	for (i=0;items[i].id != -1;i++) {
-		if (items[i].id >= id)
-			id = items[i].id+1;
-	}
-
-	/* add the user menus */
-	g_array_append_vals(menu, items, i);
-
-	*start = id;
-
-	if (type == 0) {
-		/* and add ours */
-		item.id = 0;
-		item.text = NULL;
-		g_array_append_vals(menu, &item, 1);
-		source = FILTER_SOURCE_INCOMING;
-	} else {
-		source = FILTER_SOURCE_DEMAND;
-	}
-
-	while ( (rule = rule_context_next_rule(efb->context, rule, source)) ) {
-		item.id = id++;
-		item.text = rule->name;
-		g_array_append_vals(menu, &item, 1);
-		g_ptr_array_add(rules, rule);
-	}
-
-	/* always add on the advanced menu */
-	if (type == 1) {
-		item.id = E_FILTERBAR_ADVANCED_ID;
-		item.text = _("Advanced ...");
-		g_array_append_vals(menu, &item, 1);
-	}
-
-	item.id = -1;
-	item.text = NULL;
-	g_array_append_vals(menu, &item, 1);
-
-	return menu;
-}
-
-/* Virtual methods */
-static void
-set_menu(ESearchBar *esb, ESearchBarItem *items)
-{
-	GArray *menu;
-	EFilterBar *efb = (EFilterBar *)esb;
-
-	g_ptr_array_set_size(efb->menu_rules, 0);
-	menu = build_items(esb, items, 0, &efb->menu_base, efb->menu_rules);
-	((ESearchBarClass *)parent_class)->set_menu(esb, (ESearchBarItem *)menu->data);
-	g_array_free(menu, TRUE);
-}
-
-static void
-set_option(ESearchBar *esb, ESearchBarItem *items)
-{
-	GArray *menu;
-	EFilterBar *efb = (EFilterBar *)esb;
-
-	g_ptr_array_set_size(efb->option_rules, 0);
-	menu = build_items(esb, items, 1, &efb->option_base, efb->option_rules);
-	((ESearchBarClass *)parent_class)->set_option(esb, (ESearchBarItem *)menu->data);
-	g_array_free(menu, TRUE);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EFilterBar *efb = E_FILTER_BAR(object);
-
-	switch (arg_id) {
-	case ARG_QUERY:
-		if (efb->current_query) {
-			GString *out = g_string_new("");
-
-			filter_rule_build_code(efb->current_query, out);
-			GTK_VALUE_STRING(*arg) = out->str;
-			g_string_free(out, FALSE);
-		} else {
-			GTK_VALUE_STRING(*arg) = NULL;
-		}
-		break;
-	}
-}
-
-
-static void
-class_init (EFilterBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESearchBarClass *esb_class = (ESearchBarClass *)klass;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class(e_search_bar_get_type());
-
-	object_class->get_arg = impl_get_arg;
-
-	esb_class->set_menu = set_menu;
-	esb_class->set_option = set_option;
-
-	gtk_object_add_arg_type ("EFilterBar::query", GTK_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);
-
-#if 0
-	esb_signals [QUERY_CHANGED] =
-		gtk_signal_new ("query_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EFilterBarClass, query_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	esb_signals [MENU_ACTIVATED] =
-		gtk_signal_new ("menu_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EFilterBarClass, menu_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL);
-#endif
-}
-
-static void
-init (EFilterBar *efb)
-{
-	gtk_signal_connect((GtkObject *)efb, "menu_activated", menubar_activated, NULL);
-	gtk_signal_connect((GtkObject *)efb, "query_changed", option_changed, NULL);
-
-	efb->menu_rules = g_ptr_array_new();
-	efb->option_rules = g_ptr_array_new();
-}
-
-
-/* Object construction.  */
-
-EFilterBar *e_filter_bar_new        (RuleContext *context, const char *systemrules, const char *userrules, EFilterBarConfigRule config, void *data)
-{
-	EFilterBar *bar;
-	ESearchBarItem item = { NULL, -1 };
-
-	bar = gtk_type_new(e_filter_bar_get_type());
-
-	bar->context = context;
-	gtk_object_ref((GtkObject *)context);
-	bar->systemrules = g_strdup(systemrules);
-	bar->userrules = g_strdup(userrules);
-	rule_context_load(context, systemrules, userrules);
-
-	bar->config = config;
-	bar->config_data = data;
-
-	e_search_bar_construct((ESearchBar *)bar, &item, &item);
-
-	return bar;
-}
-
-GtkType
-e_filter_bar_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"EFilterBar",
-			sizeof (EFilterBar),
-			sizeof (EFilterBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (e_search_bar_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
deleted file mode 100644
index 8f4d60079b..0000000000
--- a/widgets/misc/e-filter-bar.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-filter-bar.h
- * Copyright (C) 2001 Ximian Inc.
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_FILTER_BAR_H__
-#define __E_FILTER_BAR_H__
-
-#include <gtk/gtk.h>
-#include "e-search-bar.h"
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EFilterBar - A filter rule driven search bar.
- *
- * The following arguments are available:
- *
- * name		 type		read/write	description
- * ---------------------------------------------------------------------------------
- * query         string         R               String representing query.
- */
-
-#define E_FILTER_BAR_TYPE			(e_filter_bar_get_type ())
-#define E_FILTER_BAR(obj)			(GTK_CHECK_CAST ((obj), E_FILTER_BAR_TYPE, EFilterBar))
-#define E_FILTER_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_FILTER_BAR_TYPE, EFilterBarClass))
-#define E_IS_FILTER_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_FILTER_BAR_TYPE))
-#define E_IS_FILTER_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_FILTER_BAR_TYPE))
-
-typedef struct _EFilterBar       EFilterBar;
-typedef struct _EFilterBarClass  EFilterBarClass;
-
-typedef void (*EFilterBarConfigRule)(EFilterBar *, FilterRule *rule, int id, const char *query, void *data);
-
-struct _EFilterBar
-{
-	ESearchBar parent;
-
-	int menu_base, option_base;
-	GPtrArray *menu_rules, *option_rules;
-
-	GtkWidget *save_dialogue; /* current save dialogue (so we dont pop up multiple ones) */
-
-	FilterRule *current_query; /* as it says */
-	int setquery;		/* true when we're setting a query directly to advanced, so dont popup the dialogue */
-
-	RuleContext *context;
-	char *systemrules;
-	char *userrules;
-
-	EFilterBarConfigRule config;
-	void *config_data;
-};
-
-struct _EFilterBarClass
-{
-	ESearchBarClass parent_class;
-};
-
-/* "preset" items */
-enum {
-	/* preset menu options */
-	E_FILTERBAR_RESET_ID = -2,
-	E_FILTERBAR_SAVE_ID = -3,
-	E_FILTERBAR_EDIT_ID = -4,
-
-	/* preset option options */
-	E_FILTERBAR_ADVANCED_ID = -5,
-
-	E_FILTERBAR_LAST_ID = -6,
-};
-
-#define E_FILTERBAR_SAVE { N_("Save As ..."), E_FILTERBAR_SAVE_ID }
-#define E_FILTERBAR_RESET { N_("Show All"), E_FILTERBAR_RESET_ID }
-#define E_FILTERBAR_EDIT { N_("Edit ..."), E_FILTERBAR_EDIT_ID }
-#define E_FILTERBAR_ADVANCED { N_("Advanced ..."), E_FILTERBAR_ADVANCED_ID }
-
-
-GtkType    e_filter_bar_get_type   (void);
-EFilterBar*e_filter_bar_new        (RuleContext *, const char *sys, const char *user, EFilterBarConfigRule config, void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_FILTER_BAR_H__ */
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
deleted file mode 100644
index 9019ae18c5..0000000000
--- a/widgets/misc/e-gui-utils.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GUI utility functions
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 1999 Miguel de Icaza
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-gui-utils.h"
-
-void
-e_notice (GtkWindow *window, const char *type, const char *format, ...)
-{
-	GtkWidget *dialog;
-	va_list args;
-	char *str;
-
-	va_start (args, format);
-	str = g_strdup_vprintf (format, args);
-	dialog = gnome_message_box_new (str, type, GNOME_STOCK_BUTTON_OK, NULL);
-	va_end (args);
-	g_free (str);
-	
-	if (window)
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), window);
-
-	gnome_dialog_run (GNOME_DIALOG (dialog));
-}
-
-static void
-kill_popup_menu (GtkWidget *widget, GtkMenu *menu)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	gtk_object_unref (GTK_OBJECT (menu));
-}
-
-void
-e_auto_kill_popup_menu_on_hide (GtkMenu *menu)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	gtk_signal_connect (GTK_OBJECT (menu), "hide",
-			    GTK_SIGNAL_FUNC (kill_popup_menu), menu);
-}
-
-void
-e_popup_menu (GtkMenu *menu, GdkEvent *event)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	e_auto_kill_popup_menu_on_hide (menu);
-
-	if (event->type == GDK_KEY_PRESS)
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, event->key.time);
-	else if ((event->type == GDK_BUTTON_PRESS) ||
-		 (event->type == GDK_BUTTON_RELEASE) ||
-		 (event->type == GDK_2BUTTON_PRESS) ||
-		 (event->type == GDK_3BUTTON_PRESS)){
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, event->button.button, event->button.time);
-	} else
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, GDK_CURRENT_TIME);
-}
-
-typedef struct {
-	GtkCallback callback;
-	gpointer closure;
-} CallbackClosure;
-
-static void
-e_container_foreach_leaf_callback(GtkWidget *widget, CallbackClosure *callback_closure)
-{
-	if (GTK_IS_CONTAINER(widget)) {
-		e_container_foreach_leaf(GTK_CONTAINER(widget), callback_closure->callback, callback_closure->closure);
-	} else {
-		(*callback_closure->callback) (widget, callback_closure->closure);
-	}
-}
-
-void
-e_container_foreach_leaf(GtkContainer *container,
-			 GtkCallback callback,
-			 gpointer closure)
-{
-	CallbackClosure callback_closure;
-	callback_closure.callback = callback;
-	callback_closure.closure = closure;
-	gtk_container_foreach(container, (GtkCallback) e_container_foreach_leaf_callback, &callback_closure);
-}
-
-static void
-e_container_change_tab_order_destroy_notify(gpointer data)
-{
-	GList *list = data;
-	g_list_foreach(list, (GFunc) gtk_object_unref, NULL);
-	g_list_free(list);
-}
-
-
-static gint
-e_container_change_tab_order_callback(GtkContainer *container,
-				      GtkDirectionType direction,
-				      GList *children)
-{
-	GtkWidget *focus_child;
-	GtkWidget *child;
-
-	if (direction != GTK_DIR_TAB_FORWARD &&
-	    direction != GTK_DIR_TAB_BACKWARD)
-		return FALSE;
-
-	focus_child = container->focus_child;
-
-	if (direction == GTK_DIR_TAB_BACKWARD) {
-		children = g_list_last(children);
-	}
-
-	while (children) {
-		child = children->data;
-		if (direction == GTK_DIR_TAB_FORWARD)
-			children = children->next;
-		else
-			children = children->prev;
-
-		if (!child)
-			continue;
-
-		if (focus_child) {
-			if (focus_child == child) {
-				focus_child = NULL;
-
-				if (GTK_WIDGET_DRAWABLE (child) &&
-				    GTK_IS_CONTAINER (child) &&
-				    !GTK_WIDGET_HAS_FOCUS (child))
-					if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
-						gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-						return TRUE;
-					}
-			}
-		}
-		else if (GTK_WIDGET_DRAWABLE (child)) {
-			if (GTK_IS_CONTAINER (child)) {
-				if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
-					gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-					return TRUE;
-				}
-			}
-			else if (GTK_WIDGET_CAN_FOCUS (child)) {
-				gtk_widget_grab_focus (child);
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-gint
-e_container_change_tab_order(GtkContainer *container, GList *widgets)
-{
-	GList *list;
-	list = g_list_copy(widgets);
-	g_list_foreach(list, (GFunc) gtk_object_ref, NULL);
-	return gtk_signal_connect_full(GTK_OBJECT(container), "focus",
-				       GTK_SIGNAL_FUNC(e_container_change_tab_order_callback),
-				       NULL, list,
-				       e_container_change_tab_order_destroy_notify,
-				       FALSE, FALSE);
-}
-
-struct widgetandint {
-	GtkWidget *widget;
-	int count;
-};
-
-static void
-nth_entry_callback(GtkWidget *widget, struct widgetandint *data)
-{
-	if (GTK_IS_ENTRY(widget)) {
-		if (data->count > 1) {
-			data->count --;
-			data->widget = widget;
-		} else if (data->count == 1) {
-			data->count --;
-			data->widget = NULL;
-			gtk_widget_grab_focus(widget);
-		}
-	}
-}
-
-void
-e_container_focus_nth_entry(GtkContainer *container, int n)
-{
-	struct widgetandint data;
-	data.widget = NULL;
-	data.count = n;
-	e_container_foreach_leaf(container, (GtkCallback) nth_entry_callback, &data);
-	if (data.widget)
-		gtk_widget_grab_focus(data.widget);
-}
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
deleted file mode 100644
index d11d0a77fb..0000000000
--- a/widgets/misc/e-gui-utils.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef GAL_GUI_UTILS_H
-#define GAL_GUI_UTILS_H
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-
-#include <libgnomeui/gnome-messagebox.h>
-
-BEGIN_GNOME_DECLS
-
-void  e_popup_menu                   (GtkMenu *menu, GdkEvent *event);
-void  e_auto_kill_popup_menu_on_hide (GtkMenu *menu);
-void  e_notice                       (GtkWindow *window, const char *type, const char *format, ...);
-void e_container_foreach_leaf        (GtkContainer *container,
-				      GtkCallback   callback,
-				      gpointer      closure);
-void e_container_focus_nth_entry     (GtkContainer *container,
-				      int           n);
-gint e_container_change_tab_order    (GtkContainer *container,
-				      GList        *widgets);
-
-END_GNOME_DECLS
-
-#endif /* GAL_GUI_UTILS_H */
diff --git a/widgets/misc/e-messagebox.c b/widgets/misc/e-messagebox.c
deleted file mode 100644
index 172483a0bb..0000000000
--- a/widgets/misc/e-messagebox.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Original Author: Jay Painter
- *  Modified: Jeffrey Stedfast
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include <stdarg.h>
-#include <string.h> /* for strcmp */
-
-#include "e-messagebox.h"
-
-#define E_MESSAGE_BOX_WIDTH  425
-#define E_MESSAGE_BOX_HEIGHT 125
-
-struct _EMessageBoxPrivate {
-	GtkWidget *label;
-	GtkWidget *checkbox;
-};
-
-static void e_message_box_class_init (EMessageBoxClass *klass);
-static void e_message_box_init       (EMessageBox *messagebox);
-static void e_message_box_destroy    (GtkObject *object);
-static void e_message_box_finalize   (GtkObject *object);
-
-static GnomeDialogClass *parent_class;
-
-GtkType
-e_message_box_get_type (void)
-{
-	static GtkType message_box_type = 0;
-	
-	if (!message_box_type) {
-		GtkTypeInfo message_box_info = {
-			"EMessageBox",
-			sizeof (EMessageBox),
-			sizeof (EMessageBoxClass),
-			(GtkClassInitFunc) e_message_box_class_init,
-			(GtkObjectInitFunc) e_message_box_init,
-			NULL,
-			NULL
-		};
-		
-		message_box_type = gtk_type_unique (gnome_dialog_get_type (), &message_box_info);
-	}
-	
-	return message_box_type;
-}
-
-static void
-e_message_box_class_init (EMessageBoxClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)klass;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->destroy = e_message_box_destroy;
-	object_class->finalize = e_message_box_finalize;
-}
-
-static void
-e_message_box_init (EMessageBox *message_box)
-{
-	message_box->_priv = g_new0 (EMessageBoxPrivate, 1); 
-}
-
-static void
-e_message_box_destroy (GtkObject *object)
-{
-	/* remember, destroy can be run multiple times! */
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_message_box_finalize (GtkObject *object)
-{
-	EMessageBox *mbox = E_MESSAGE_BOX (object);
-	
-	g_free (mbox->_priv);
-	mbox->_priv = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/**
- * e_message_box_construct:
- * @messagebox: The message box to construct
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @buttons: a NULL terminated array with the buttons to insert.
- *
- * For language bindings or subclassing, from C use #e_message_box_new or
- * #e_message_box_newv
- *
- * Returns:
- */
-void
-e_message_box_construct (EMessageBox *messagebox,
-			 const gchar *message,
-			 const gchar *message_box_type,
-			 const gchar **buttons)
-{
-	GtkWidget *hbox;
-	GtkWidget *pixmap = NULL;
-	GtkWidget *alignment;
-	char *s;
-	GtkStyle *style;
-        const gchar* title = NULL;
-	gint i = 0;
-	
-	g_return_if_fail (messagebox != NULL);
-	g_return_if_fail (E_IS_MESSAGE_BOX (messagebox));
-	g_return_if_fail (message != NULL);
-	g_return_if_fail (message_box_type != NULL);
-	
-	style = gtk_widget_get_style (GTK_WIDGET (messagebox));
-	
-	/* Make noises, basically */
-	gnome_triggers_vdo (message, message_box_type, NULL);
-	
-	if (strcmp (E_MESSAGE_BOX_INFO, message_box_type) == 0) {
-                title = _("Information");
-		s = gnome_unconditional_pixmap_file("gnome-info.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free(s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_WARNING, message_box_type) == 0) {
-                title = _("Warning");
-		s = gnome_unconditional_pixmap_file ("gnome-warning.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_ERROR, message_box_type) == 0) {
-                title = _("Error");
-		s = gnome_unconditional_pixmap_file ("gnome-error");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free(s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_QUESTION, message_box_type) == 0) {
-                title = _("Question");
-		s = gnome_unconditional_pixmap_file ("gnome-question.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                }
-	} else {
-                title = _("Message");
-	}
-	
-        g_assert (title != NULL);
-	
-	gtk_window_set_title (GTK_WINDOW (messagebox), title);
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (messagebox)->vbox),
-			    hbox, TRUE, TRUE, 10);
-	gtk_widget_show (hbox);
-	
-	if ((pixmap == NULL) || (GNOME_PIXMAP (pixmap)->pixmap == NULL)) {
-        	if (pixmap)
-			gtk_widget_destroy (pixmap);
-		s = gnome_unconditional_pixmap_file ("gnome-default.png");
-         	if (s) {
-			pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                } else
-			pixmap = NULL;
-	}
-	if (pixmap) {
-		gtk_box_pack_start (GTK_BOX (hbox), pixmap, FALSE, TRUE, 0);
-		gtk_widget_show (pixmap);
-	}
-	
-	messagebox->_priv->label = gtk_label_new (message);
-	gtk_label_set_justify (GTK_LABEL (messagebox->_priv->label), GTK_JUSTIFY_LEFT);
-        gtk_label_set_line_wrap (GTK_LABEL (messagebox->_priv->label), TRUE);
-	gtk_misc_set_padding (GTK_MISC (messagebox->_priv->label), GNOME_PAD, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), messagebox->_priv->label, TRUE, TRUE, 0);
-	gtk_widget_show (messagebox->_priv->label);
-	
-	/* Add some extra space on the right to balance the pixmap */
-	if (pixmap) {
-		alignment = gtk_alignment_new (0., 0., 0., 0.);
-		gtk_widget_set_usize (alignment, GNOME_PAD, -1);
-		gtk_widget_show (alignment);
-		
-		gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
-	}
-	
-	/* Add the "Don't show this message again." checkbox */
-	messagebox->_priv->checkbox = gtk_check_button_new_with_label (_("Don't show this message again."));
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (messagebox)->vbox),
-			    messagebox->_priv->checkbox, TRUE, TRUE, 10);
-	gtk_widget_show (messagebox->_priv->checkbox);
-	
-	if (buttons) {
-		while (buttons[i]) {
-			gnome_dialog_append_button (GNOME_DIALOG (messagebox), 
-						    buttons[i]);
-			i++;
-		};
-	}
-	
-	if (GNOME_DIALOG (messagebox)->buttons)
-		gtk_widget_grab_focus (g_list_last (GNOME_DIALOG (messagebox)->buttons)->data);
-	
-	gnome_dialog_set_close (GNOME_DIALOG (messagebox), TRUE);
-}
-
-/**
- * e_message_box_new:
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @...: A NULL terminated list of strings to use in each button.
- *
- * Creates a dialog box of type @message_box_type with @message.  A number
- * of buttons are inserted on it.  You can use the GNOME stock identifiers
- * to create gnome-stock-buttons.
- *
- * Returns a widget that has the dialog box.
- */
-GtkWidget*
-e_message_box_new (const gchar *message,
-		   const gchar *message_box_type, ...)
-{
-	va_list ap;
-	EMessageBox *message_box;
-	
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (message_box_type != NULL, NULL);
-        
-	va_start (ap, message_box_type);
-	
-	message_box = gtk_type_new (e_message_box_get_type ());
-	
-	e_message_box_construct (message_box, message, message_box_type, NULL);
-	
-	/* we need to add buttons by hand here */
-	while (TRUE) {
-		gchar * button_name;
-		
-		button_name = va_arg (ap, gchar *);
-		
-		if (button_name == NULL) {
-			break;
-		}
-		
-		gnome_dialog_append_button (GNOME_DIALOG (message_box), button_name);
-	}
-	
-	va_end (ap);
-	
-	gtk_widget_grab_focus (g_list_last (GNOME_DIALOG (message_box)->buttons)->data);
-	
-	return GTK_WIDGET (message_box);
-}
-
-/**
- * e_message_box_newv:
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @buttons: a NULL terminated array with the buttons to insert.
- *
- * Creates a dialog box of type @message_box_type with @message.  A number
- * of buttons are inserted on it, the messages come from the @buttons array.
- * You can use the GNOME stock identifiers to create gnome-stock-buttons.
- * The buttons array can be NULL if you wish to add buttons yourself later.
- *
- * Returns a widget that has the dialog box.
- */
-GtkWidget*
-e_message_box_newv (const gchar *message,
-		    const gchar *message_box_type,
-		    const gchar **buttons)
-{
-	EMessageBox *message_box;
-	
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (message_box_type != NULL, NULL);
-	
-	message_box = gtk_type_new (e_message_box_get_type ());
-	
-	e_message_box_construct (message_box, message,
-				     message_box_type, buttons);
-	
-	return GTK_WIDGET (message_box);
-}
-
-
-/**
- * e_message_box_get_label:
- * @messagebox: The message box to work on
- *
- * Gets the label widget of the message box.  You should use this
- * function instead of using the structure directly.
- *
- * Returns: the widget of the label with the message */
-GtkWidget *
-e_message_box_get_label (EMessageBox *messagebox)
-{
-	g_return_val_if_fail (messagebox != NULL, NULL);
-	g_return_val_if_fail (E_IS_MESSAGE_BOX (messagebox), NULL);
-	
-	return messagebox->_priv->label;
-}
-
-
-/**
- * e_message_box_get_checkbox:
- * @messagebox: The message box to work on
- *
- * Gets the checkbox widget of the message box.  You should use this
- * function instead of using the structure directly.
- *
- * Returns: the checkbox widget */
-GtkWidget *
-e_message_box_get_checkbox (EMessageBox *messagebox)
-{
-	g_return_val_if_fail (messagebox != NULL, NULL);
-	g_return_val_if_fail (E_IS_MESSAGE_BOX (messagebox), NULL);
-	
-	return messagebox->_priv->checkbox;
-}
diff --git a/widgets/misc/e-messagebox.h b/widgets/misc/e-messagebox.h
deleted file mode 100644
index 0514aeb43f..0000000000
--- a/widgets/misc/e-messagebox.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Original Author: Jay Painter
- *  Modified: Jeffrey Stedfast
- *
- *  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_MESSAGE_BOX_H__
-#define __E_MESSAGE_BOX_H__
-
-#include <gnome.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_MESSAGE_BOX            (e_message_box_get_type ())
-#define E_MESSAGE_BOX(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_MESSAGE_BOX, EMessageBox))
-#define E_MESSAGE_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MESSAGE_BOX, EMessageBoxClass))
-#define E_IS_MESSAGE_BOX(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_MESSAGE_BOX))
-#define E_IS_MESSAGE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_MESSAGE_BOX))
-#define E_MESSAGE_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_MESSAGE_BOX, EMessageBoxClass))
-
-
-#define E_MESSAGE_BOX_INFO      "info"
-#define E_MESSAGE_BOX_WARNING   "warning"
-#define E_MESSAGE_BOX_ERROR     "error"
-#define E_MESSAGE_BOX_QUESTION  "question"
-#define E_MESSAGE_BOX_GENERIC   "generic"
-
-
-typedef struct _EMessageBox        EMessageBox;
-typedef struct _EMessageBoxPrivate EMessageBoxPrivate;
-typedef struct _EMessageBoxClass   EMessageBoxClass;
-typedef struct _EMessageBoxButton  EMessageBoxButton;
-
-struct _EMessageBox
-{
-	GnomeDialog dialog;
-	/*< private >*/
-	EMessageBoxPrivate *_priv;
-};
-
-struct _EMessageBoxClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-guint      e_message_box_get_type   (void) G_GNUC_CONST;
-GtkWidget* e_message_box_new        (const gchar *message,
-				     const gchar *messagebox_type,
-				     ...);
-
-GtkWidget* e_message_box_newv       (const gchar *message,
-				     const gchar *messagebox_type,
-				     const gchar **buttons);
-
-void       e_message_box_construct  (EMessageBox *messagebox,
-				     const gchar *message,
-				     const gchar *messagebox_type,
-				     const gchar **buttons);
-
-GtkWidget *e_message_box_get_label  (EMessageBox *messagebox);
-
-GtkWidget *e_message_box_get_checkbox  (EMessageBox *messagebox);
-
-END_GNOME_DECLS
-
-#endif /* __E_MESSAGE_BOX_H__ */
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
deleted file mode 100644
index 0eadba4225..0000000000
--- a/widgets/misc/e-popup-menu.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-popup-menu.c: popup menu display
-nnn *
- * Authors:
- *   Miguel de Icaza (miguel@kernel.org)
- *   Jody Goldberg (jgoldberg@home.com)
- *   Jeffrey Stedfast <fejj@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gnome.h>
-#include "e-popup-menu.h"
-#include "e-gui-utils.h"
-
-/*
- * Creates an item with an optional icon
- */
-static GtkWidget *
-make_item (GtkMenu *menu, const char *name, const char *pixname)
-{
-	GtkWidget *label, *item;
-	guint label_accel;
-
-	if (*name == '\0')
-		return gtk_menu_item_new ();
-	
-	/*
-	 * Ugh.  This needs to go into Gtk+
-	 */
-	label = gtk_accel_label_new ("");
-	label_accel = gtk_label_parse_uline (GTK_LABEL (label), name);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	
-	item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (item), label);
-	
-	if (label_accel != GDK_VoidSymbol){
-		gtk_widget_add_accelerator (
-			item,
-			"activate_item",
-			gtk_menu_ensure_uline_accel_group (GTK_MENU (menu)),
-			label_accel, 0,
-			GTK_ACCEL_LOCKED);
-	}
-
-	if (pixname){
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-	}
-
-	return item;
-}
-
-GtkMenu *
-e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, void *closure)
-{
-	GtkMenu *menu = GTK_MENU (gtk_menu_new ());
-	gboolean last_item_seperator = TRUE;
-	gint last_non_seperator = -1;
-	gint i;
-	
-	for (i = 0; menu_list[i].name; i++) {
-		if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
-			last_non_seperator = i;
-		}
-	}
-	
-	for (i = 0; i <= last_non_seperator; i++) {
-		gboolean seperator;
-		
-		seperator = !strcmp ("", menu_list[i].name);
-		
-		if ((!(seperator && last_item_seperator)) && !(menu_list [i].disable_mask & hide_mask)) {
-			GtkWidget *item;
-			
-			item = make_item (menu, menu_list[i].name, menu_list[i].pixname);
-			gtk_menu_append (menu, item);
-			
-			if (!menu_list[i].submenu) {
-				if (menu_list[i].fn)
-					gtk_signal_connect (GTK_OBJECT (item), "activate",
-							    GTK_SIGNAL_FUNC (menu_list[i].fn),
-							    closure);
-			} else {
-				/* submenu */
-				GtkMenu *submenu;
-				
-				submenu = e_popup_menu_create (menu_list[i].submenu, disable_mask, hide_mask, closure);
-				
-				gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), GTK_WIDGET (submenu));
-			}
-			
-			if (menu_list[i].disable_mask & disable_mask)
-				gtk_widget_set_sensitive (item, FALSE);
-			
-			gtk_widget_show (item);
-		}
-		
-		last_item_seperator = seperator;
-	}
-	
-	return menu;
-}
-
-void
-e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *closure)
-{
-	GtkMenu *menu;
-	
-	g_return_if_fail (menu_list != NULL);
-	g_return_if_fail (event != NULL);
-	
-	menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, closure);
-	
-	e_popup_menu (menu, event);
-}
-
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
deleted file mode 100644
index 61839902f6..0000000000
--- a/widgets/misc/e-popup-menu.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef E_POPUP_MENU_H
-#define E_POPUP_MENU_H
-
-#include <gtk/gtkwidget.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EPopupMenu EPopupMenu;
-
-struct _EPopupMenu {
-	char *name;
-	char *pixname;
-	void (*fn) (GtkWidget *widget, void *closure);
-	EPopupMenu *submenu;
-	guint32 disable_mask;
-};
-
-GtkMenu *e_popup_menu_create  (EPopupMenu     *menu_list,
-			       guint32         disable_mask,
-			       guint32         hide_mask,
-			       void           *closure);
-
-void     e_popup_menu_run     (EPopupMenu     *menu_list,
-			       GdkEvent       *event,
-			       guint32         disable_mask,
-			       guint32         hide_mask,
-			       void           *closure);
-
-END_GNOME_DECLS
-
-#endif /* E_POPUP_MENU_H */
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
deleted file mode 100644
index f029e88573..0000000000
--- a/widgets/misc/e-printable.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-printable.c: an object printer.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-printable.h"
-
-#define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-					  
-
-static GtkObjectClass *e_printable_parent_class;
-
-enum {
-	PRINT_PAGE,
-	DATA_LEFT,
-	RESET,
-	HEIGHT,
-	WILL_FIT,
-	LAST_SIGNAL
-};
-
-static guint e_printable_signals [LAST_SIGNAL] = { 0, };
-
-static void
-e_printable_class_init (GtkObjectClass *object_class)
-{
-	EPrintableClass *klass = E_PRINTABLE_CLASS(object_class);
-	e_printable_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	e_printable_signals [PRINT_PAGE] =
-		gtk_signal_new ("print_page",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, print_page),
-				e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_NONE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	e_printable_signals [DATA_LEFT] =
-		gtk_signal_new ("data_left",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, data_left),
-				gtk_marshal_BOOL__NONE,
-				GTK_TYPE_BOOL, 0, GTK_TYPE_NONE);
-
-	e_printable_signals [RESET] =
-		gtk_signal_new ("reset",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, reset),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0, GTK_TYPE_NONE);
-
-	e_printable_signals [HEIGHT] =
-		gtk_signal_new ("height",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, height),
-				e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_DOUBLE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	e_printable_signals [WILL_FIT] =
-		gtk_signal_new ("will_fit",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, will_fit),
-				e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_BOOL, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, e_printable_signals, LAST_SIGNAL);
-
-	klass->print_page = NULL;    
-	klass->data_left = NULL;
-	klass->reset = NULL;
-	klass->height = NULL;
-	klass->will_fit = NULL;
-}
-
-
-guint
-e_printable_get_type (void)
-{
-  static guint type = 0;
-
-  if (!type)
-    {
-      GtkTypeInfo info =
-      {
-	"EPrintable",
-	sizeof (EPrintable),
-	sizeof (EPrintableClass),
-	(GtkClassInitFunc) e_printable_class_init,
-	NULL,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (gtk_object_get_type (), &info);
-    }
-
-  return type;
-}
-
-EPrintable *
-e_printable_new(void)
-{
-	return E_PRINTABLE(gtk_type_new(e_printable_get_type()));
-}
-
-void
-e_printable_print_page          (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            height,
-				 gboolean           quantized)
-{
-	g_return_if_fail (e_printable != NULL);
-	g_return_if_fail (E_IS_PRINTABLE (e_printable));
-	
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [PRINT_PAGE],
-			 context,
-			 width,
-			 height,
-			 quantized);
-}
-
-gboolean
-e_printable_data_left           (EPrintable        *e_printable)
-{
-        gboolean ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, FALSE);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [DATA_LEFT],
-			 &ret_val);
-
-	return ret_val;
-}
-
-void
-e_printable_reset               (EPrintable        *e_printable)
-{
-	g_return_if_fail (e_printable != NULL);
-	g_return_if_fail (E_IS_PRINTABLE (e_printable));
-	
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [RESET]);
-}
-
-gdouble
-e_printable_height              (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
-{
-        gdouble ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, -1);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [HEIGHT],
-			 context,
-			 width,
-			 max_height,
-			 quantized,
-			 &ret_val);
-
-	return ret_val;
-}
-
-gboolean
-e_printable_will_fit            (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
-{
-        gboolean ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, -1);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [WILL_FIT],
-			 context,
-			 width,
-			 max_height,
-			 quantized,
-			 &ret_val);
-
-	return ret_val;
-}
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
deleted file mode 100644
index 581b1e6f63..0000000000
--- a/widgets/misc/e-printable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-printable.h: an object printer.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#ifndef _E_PRINTABLE_H_
-#define _E_PRINTABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnomeprint/gnome-print.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_PRINTABLE_TYPE        (e_printable_get_type ())
-#define E_PRINTABLE(o)          (GTK_CHECK_CAST ((o), E_PRINTABLE_TYPE, EPrintable))
-#define E_PRINTABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_PRINTABLE_TYPE, EPrintableClass))
-#define E_IS_PRINTABLE(o)       (GTK_CHECK_TYPE ((o), E_PRINTABLE_TYPE))
-#define E_IS_PRINTABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_PRINTABLE_TYPE))
-
-typedef struct {
-	GtkObject   base;
-} EPrintable;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-
-	void        (*print_page)  (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble height, gboolean quantized);
-	gboolean    (*data_left)   (EPrintable *etm);
-	void        (*reset)       (EPrintable *etm);
-	gdouble     (*height)      (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
-
-	/* e_printable_will_fit (ep, ...) should be equal in value to
-	 * (e_printable_print_page (ep, ...),
-	 * !e_printable_data_left(ep)) except that the latter has the
-	 * side effect of doing the printing and advancing the
-	 * position of the printable.
-	 */
-
-	gboolean    (*will_fit)    (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
-} EPrintableClass;
-
-GtkType     e_printable_get_type (void);
-
-EPrintable *e_printable_new                 (void);
-	
-/*
- * Routines for emitting signals on the e_table */
-void        e_printable_print_page          (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            height,
-					     gboolean           quantized);
-gboolean    e_printable_data_left           (EPrintable        *e_printable);
-void        e_printable_reset               (EPrintable        *e_printable);
-gdouble     e_printable_height              (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            max_height,
-					     gboolean           quantized);
-gboolean    e_printable_will_fit            (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            max_height,
-					     gboolean           quantized);
-
-END_GNOME_DECLS
-
-#endif /* _E_PRINTABLE_H_ */
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
deleted file mode 100644
index 735d965120..0000000000
--- a/widgets/misc/e-reflow.c
+++ /dev/null
@@ -1,861 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-reflow.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <math.h>
-#include "e-reflow.h"
-#include "gal/e-text/e-text.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "gal/util/e-util.h"
-
-static void e_reflow_init		(EReflow		 *reflow);
-static void e_reflow_class_init	(EReflowClass	 *klass);
-static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_reflow_destroy (GtkObject *object);
-static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_reflow_realize (GnomeCanvasItem *item);
-static void e_reflow_unrealize (GnomeCanvasItem *item);
-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height);
-static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags);
-static double e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
-static void e_reflow_reflow (GnomeCanvasItem *item, int flags);
-static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item, gint *position);
-static void set_empty(EReflow *e_reflow);
-
-static void e_reflow_resize_children (GnomeCanvasItem *item);
-
-#define E_REFLOW_DIVIDER_WIDTH 2
-#define E_REFLOW_BORDER_WIDTH 7
-#define E_REFLOW_FULL_GUTTER (E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH * 2)
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MINIMUM_WIDTH,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_EMPTY_MESSAGE,
-};
-
-GtkType
-e_reflow_get_type (void)
-{
-  static GtkType reflow_type = 0;
-
-  if (!reflow_type)
-    {
-      static const GtkTypeInfo reflow_info =
-      {
-        "EReflow",
-        sizeof (EReflow),
-        sizeof (EReflowClass),
-        (GtkClassInitFunc) e_reflow_class_init,
-        (GtkObjectInitFunc) e_reflow_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      reflow_type = gtk_type_unique (gnome_canvas_group_get_type (), &reflow_info);
-    }
-
-  return reflow_type;
-}
-
-static void
-e_reflow_class_init (EReflowClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("EReflow::minimum_width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); 
-	gtk_object_add_arg_type ("EReflow::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("EReflow::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EReflow::empty_message", GTK_TYPE_STRING, 
-				 GTK_ARG_READWRITE, ARG_EMPTY_MESSAGE);
-
-	klass->add_item       = e_reflow_real_add_item;
- 
-	object_class->set_arg = e_reflow_set_arg;
-	object_class->get_arg = e_reflow_get_arg;
-	object_class->destroy = e_reflow_destroy;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->event     = e_reflow_event;
-	item_class->realize   = e_reflow_realize;
-	item_class->unrealize = e_reflow_unrealize;
-	item_class->draw      = e_reflow_draw;
-	item_class->update    = e_reflow_update;
-	item_class->point     = e_reflow_point;
-}
-
-static void
-e_reflow_init (EReflow *reflow)
-{
-	reflow->items = NULL;
-	reflow->columns = NULL;
-	reflow->column_width = 150;
-
-	reflow->minimum_width = 10;
-	reflow->width = 10;
-	reflow->height = 10;
-	reflow->idle = 0;
-
-	reflow->empty_message = NULL;
-	reflow->empty_text = NULL;
-
-	reflow->column_drag = FALSE;
-
-	reflow->need_height_update = FALSE;
-	reflow->need_column_resize = FALSE;
-
-	reflow->default_cursor_shown = TRUE;
-	reflow->arrow_cursor = NULL;
-	reflow->default_cursor = NULL;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(reflow), e_reflow_reflow);
-}
-
-static void
-e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EReflow *e_reflow;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_reflow = E_REFLOW (o);
-	
-	switch (arg_id){
-	case ARG_HEIGHT:
-		e_reflow->height = GTK_VALUE_DOUBLE (*arg);
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_MINIMUM_WIDTH:
-		e_reflow->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(o))
-			set_empty(e_reflow);
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_EMPTY_MESSAGE:
-		g_free(e_reflow->empty_message);
-		e_reflow->empty_message = g_strdup(GTK_VALUE_STRING (*arg));
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(o))
-			set_empty(e_reflow);
-	}
-}
-
-static void
-e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EReflow *e_reflow;
-
-	e_reflow = E_REFLOW (object);
-
-	switch (arg_id) {
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_reflow->minimum_width;
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_reflow->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_reflow->height;
-		break;
-	case ARG_EMPTY_MESSAGE:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_reflow->empty_message);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_reflow_destroy (GtkObject *object)
-{
-	EReflow *reflow = E_REFLOW(object);
-
-	g_list_foreach(reflow->items, (GFunc) gtk_object_unref, NULL);
-	g_list_free(reflow->items);
-	reflow->items = NULL;
-	
-	g_free(reflow->empty_message);
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-e_reflow_realize (GnomeCanvasItem *item)
-{
-	EReflow *e_reflow;
-	GnomeCanvasGroup *group;
-	GList *list;
-	GtkAdjustment *adjustment;
-
-	e_reflow = E_REFLOW (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_reflow->arrow_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	e_reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-
-	for(list = e_reflow->items; list; list = g_list_next(list)) {
-		GnomeCanvasItem *item = GNOME_CANVAS_ITEM(list->data);
-		gnome_canvas_item_set(item,
-				      "width", (double) e_reflow->column_width,
-				      NULL);
-	}
-
-	set_empty(e_reflow);
-
-	e_canvas_item_request_reflow(item);
-	
-	adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-	adjustment->step_increment = (e_reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-	adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-	gtk_adjustment_changed(adjustment);
-	
-	if (!item->canvas->aa) {
-	}
-}
-
-static void
-e_reflow_unrealize (GnomeCanvasItem *item)
-{
-  EReflow *e_reflow;
-
-  e_reflow = E_REFLOW (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-  
-  gdk_cursor_destroy (e_reflow->arrow_cursor);
-  gdk_cursor_destroy (e_reflow->default_cursor);
-  e_reflow->arrow_cursor = NULL;
-  e_reflow->default_cursor = NULL;
-
-  g_list_free (e_reflow->columns);
-  e_reflow->columns = NULL;
-
-  if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-static gint
-e_reflow_pick_line (EReflow *e_reflow, double x)
-{
-	x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-	x /= e_reflow->column_width + E_REFLOW_FULL_GUTTER;
-	return x;
-}
-
-static gboolean
-e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EReflow *e_reflow;
- 
-	e_reflow = E_REFLOW (item);
-
-	switch( event->type )
-		{
-		case GDK_KEY_PRESS:
-			if (event->key.keyval == GDK_Tab || 
-			    event->key.keyval == GDK_KP_Tab || 
-			    event->key.keyval == GDK_ISO_Left_Tab) {
-				GList *list;
-				for (list = e_reflow->items; list; list = list->next) {
-					GnomeCanvasItem *item = GNOME_CANVAS_ITEM (list->data);
-					EFocus has_focus;
-					gtk_object_get(GTK_OBJECT(item),
-						       "has_focus", &has_focus,
-						       NULL);
-					if (has_focus) {
-						if (event->key.state & GDK_SHIFT_MASK)
-							list = list->prev;
-						else
-							list = list->next;
-						if (list) {
-							item = GNOME_CANVAS_ITEM(list->data);
-							gnome_canvas_item_set(item,
-									      "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,
-									      NULL);
-							return 1;
-						} else {
-							return 0;
-						}
-					}
-				}
-			}
-			break;
-		case GDK_BUTTON_PRESS:
-			switch(event->button.button) 
-				{
-				case 1:
-					{
-						GdkEventButton *button = (GdkEventButton *) event;
-						double n_x, max_x;
-						n_x = button->x;
-						n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-						n_x = fmod(n_x,(e_reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-						max_x = E_REFLOW_BORDER_WIDTH;
-						max_x += (e_reflow->column_width + E_REFLOW_FULL_GUTTER) * e_reflow->column_count;
-						if ( button->y >= E_REFLOW_BORDER_WIDTH && button->y <= e_reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > button->x ) {
-							e_reflow->which_column_dragged = e_reflow_pick_line(e_reflow, button->x);
-							e_reflow->start_x = e_reflow->which_column_dragged * (e_reflow->column_width + E_REFLOW_FULL_GUTTER) - E_REFLOW_DIVIDER_WIDTH / 2;
-							e_reflow->temp_column_width = e_reflow->column_width;
-							e_reflow->column_drag = TRUE;
-						  
-							gnome_canvas_item_grab (item, 
-										GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
-										e_reflow->arrow_cursor,
-										button->time);
-						  
-							e_reflow->previous_temp_column_width = -1;
-							e_reflow->need_column_resize = TRUE;
-							gnome_canvas_item_request_update(item);
-							return TRUE;
-						}
-					}
-					break;
-				case 4:
-					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value -= adjustment->step_increment;
-						gtk_adjustment_set_value(adjustment, new_value);
-					}
-					break;
-				case 5: 
-					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value += adjustment->step_increment;
-						if ( new_value > adjustment->upper - adjustment->page_size )
-							new_value = adjustment->upper - adjustment->page_size;
-						gtk_adjustment_set_value(adjustment, new_value);
-					}
-					break;
-				}
-			break;
-		case GDK_BUTTON_RELEASE:
-			if (e_reflow->column_drag) {
-				gdouble old_width = e_reflow->column_width;
-				GdkEventButton *button = (GdkEventButton *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-				e_reflow->temp_column_width = e_reflow->column_width +
-					(button->x - e_reflow->start_x)/(e_reflow->which_column_dragged - e_reflow_pick_line(e_reflow, adjustment->value));
-				if ( e_reflow->temp_column_width < 50 )
-					e_reflow->temp_column_width = 50;
-				e_reflow->column_drag = FALSE;
-				if ( old_width != e_reflow->temp_column_width ) {
-					gtk_adjustment_set_value(adjustment, adjustment->value + e_reflow_pick_line(e_reflow, adjustment->value) * (e_reflow->temp_column_width - e_reflow->column_width));
-					e_reflow->column_width = e_reflow->temp_column_width;
-					adjustment->step_increment = (e_reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-					adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-					gtk_adjustment_changed(adjustment);
-					e_reflow_resize_children(item);
-					e_canvas_item_request_reflow(item);
-				}
-				e_reflow->need_column_resize = TRUE;
-				gnome_canvas_item_request_update(item);
-				gnome_canvas_item_ungrab (item, button->time);
-				return TRUE;
-			}
-			break;
-		case GDK_MOTION_NOTIFY:
-			if (e_reflow->column_drag) {
-				double old_width = e_reflow->temp_column_width;
-				GdkEventMotion *motion = (GdkEventMotion *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-				e_reflow->temp_column_width = e_reflow->column_width +
-					(motion->x - e_reflow->start_x)/(e_reflow->which_column_dragged - e_reflow_pick_line(e_reflow, adjustment->value));
-				if (e_reflow->temp_column_width < 50)
-					e_reflow->temp_column_width = 50;
-				if (old_width != e_reflow->temp_column_width) {
-					e_reflow->need_column_resize = TRUE;
-					gnome_canvas_item_request_update(item);
-				}
-				return TRUE;
-			} else {
-				GdkEventMotion *motion = (GdkEventMotion *) event;
-				double n_x, max_x;
-
-				n_x = motion->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(e_reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (e_reflow->column_width + E_REFLOW_FULL_GUTTER) * e_reflow->column_count;
-
-				if ( motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= e_reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > motion->x) {
-					if ( e_reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, e_reflow->arrow_cursor);
-						e_reflow->default_cursor_shown = FALSE;
-					}
-				} else 
-					if ( ! e_reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, e_reflow->default_cursor);
-						e_reflow->default_cursor_shown = TRUE;
-					}
-			    
-			}
-			break;
-		case GDK_ENTER_NOTIFY:
-			if (!e_reflow->column_drag) {
-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x, max_x;
-				n_x = crossing->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(e_reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (e_reflow->column_width + E_REFLOW_FULL_GUTTER) * e_reflow->column_count;
-				if ( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= e_reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > crossing->x) {
-					if ( e_reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, e_reflow->arrow_cursor);
-						e_reflow->default_cursor_shown = FALSE;
-					}
-				}
-			}
-			break;
-		case GDK_LEAVE_NOTIFY:
-			if (!e_reflow->column_drag) {
-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x;
-				n_x = crossing->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(e_reflow->column_width + E_REFLOW_FULL_GUTTER));
-				if ( !( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= e_reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) ) {
-					if ( ! e_reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, e_reflow->default_cursor);
-						e_reflow->default_cursor_shown = TRUE;
-					}
-				}
-			}
-			break;
-		default:
-			break;
-		}
-  
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item, gint *position)
-{
-	e_reflow->items = g_list_append(e_reflow->items, item);
-	gtk_object_ref(GTK_OBJECT(item));
-	if (GTK_OBJECT_FLAGS (e_reflow) & GNOME_CANVAS_ITEM_REALIZED) {
-		gnome_canvas_item_set(item,
-				      "width", (double) e_reflow->column_width,
-				      NULL);
-		e_reflow_post_add_item(e_reflow, item);
-		e_canvas_item_request_reflow(item);
-	}
-	if (position)
-		*position = g_list_index(e_reflow->items, item);
-}
-
-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height)
-{
-	int x_rect, y_rect, width_rect, height_rect;
-	gdouble running_width;
-	EReflow *e_reflow = E_REFLOW(item);
-	int i;
-	double column_width;
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->draw)
-		GNOME_CANVAS_ITEM_CLASS(parent_class)->draw (item, drawable, x, y, width, height);
-	column_width = e_reflow->column_width;
-	running_width = E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-	x_rect = running_width;
-	y_rect = E_REFLOW_BORDER_WIDTH;
-	width_rect = E_REFLOW_DIVIDER_WIDTH;
-	height_rect = e_reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-
-	/* Compute first column to draw. */
-	i = x;
-	i /= column_width + E_REFLOW_FULL_GUTTER;
-	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
-
-	for ( ; i < e_reflow->column_count; i++) {
-		if ( running_width > x + width )
-			break;
-		x_rect = running_width;
-		gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
-				   drawable,
-				   GTK_STATE_ACTIVE,
-				   GTK_SHADOW_NONE,
-				   NULL,
-				   GTK_WIDGET(item->canvas),
-				   "reflow",
-				   x_rect - x,
-				   y_rect - y,
-				   width_rect,
-				   height_rect);
-		running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-	}
-	if (e_reflow->column_drag) {
-		int start_line = e_reflow_pick_line(e_reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); 
-		i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		column_width = e_reflow->temp_column_width;
-		running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		i += start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-		x_rect = running_width;
-		y_rect = E_REFLOW_BORDER_WIDTH;
-		width_rect = E_REFLOW_DIVIDER_WIDTH;
-		height_rect = e_reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-
-		/* Compute first column to draw. */
-		i /= column_width + E_REFLOW_FULL_GUTTER;
-		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
-		
-		for ( ; i < e_reflow->column_count; i++) {
-			if ( running_width > x + width )
-				break;
-			x_rect = running_width;
-			gdk_draw_rectangle(drawable,
-					   GTK_WIDGET(item->canvas)->style->fg_gc[GTK_STATE_NORMAL],
-					   TRUE,
-					   x_rect - x,
-					   y_rect - y,
-					   width_rect - 1,
-					   height_rect - 1);					   
-			running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-		}
-	}
-}
-
-static void
-e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags)
-{
-	EReflow *e_reflow;
-	double x0, x1, y0, y1;
-
-	e_reflow = E_REFLOW (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->update)
-		GNOME_CANVAS_ITEM_CLASS(parent_class)->update (item, affine, clip_path, flags);
-	
-	x0 = item->x1;
-	y0 = item->y1;
-	x1 = item->x2;
-	y1 = item->y2;
-	if ( x1 < x0 + e_reflow->width )
-		x1 = x0 + e_reflow->width;
-	if ( y1 < y0 + e_reflow->height )
-		y1 = y0 + e_reflow->height;
-	item->x2 = x1;
-	item->y2 = y1;
-
-	if (e_reflow->need_height_update) {
-		x0 = item->x1;
-		y0 = item->y1;
-		x1 = item->x2;
-		y1 = item->y2;
-		if ( x0 > 0 )
-			x0 = 0;
-		if ( y0 > 0 )
-			y0 = 0;
-		if ( x1 < E_REFLOW(item)->width )
-			x1 = E_REFLOW(item)->width;
-		if ( x1 < E_REFLOW(item)->height )
-			x1 = E_REFLOW(item)->height;
-
-		gnome_canvas_request_redraw(item->canvas, x0, y0, x1, y1);
-		e_reflow->need_height_update = FALSE;
-	} else if (e_reflow->need_column_resize) {
-		int x_rect, y_rect, width_rect, height_rect;
-		int start_line = e_reflow_pick_line(e_reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); 
-		gdouble running_width;
-		int i;
-		double column_width;
-		
-		if ( e_reflow->previous_temp_column_width != -1 ) {
-			running_width = start_line * (e_reflow->column_width + E_REFLOW_FULL_GUTTER);
-			column_width = e_reflow->previous_temp_column_width;
-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			y_rect = E_REFLOW_BORDER_WIDTH;
-			width_rect = E_REFLOW_DIVIDER_WIDTH;
-			height_rect = e_reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-			
-			for ( i = 0; i < e_reflow->column_count; i++) {
-				x_rect = running_width;
-				gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);
-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			}
-		}
-		
-		if ( e_reflow->temp_column_width != -1 ) {
-			running_width = start_line * (e_reflow->column_width + E_REFLOW_FULL_GUTTER);
-			column_width = e_reflow->temp_column_width;
-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			y_rect = E_REFLOW_BORDER_WIDTH;
-			width_rect = E_REFLOW_DIVIDER_WIDTH;
-			height_rect = e_reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-			
-			for ( i = 0; i < e_reflow->column_count; i++) {
-				x_rect = running_width;
-				gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);
-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			}
-		}
-		
-		e_reflow->previous_temp_column_width = e_reflow->temp_column_width;
-		e_reflow->need_column_resize = FALSE;
-	}
-}
-
-static void
-e_reflow_resize_children (GnomeCanvasItem *item)
-{
-	GList *list;
-	EReflow *e_reflow;
-
-	e_reflow = E_REFLOW (item);
-	for ( list = e_reflow->items; list; list = list->next ) {
-		GnomeCanvasItem *child = GNOME_CANVAS_ITEM(list->data);
-		gnome_canvas_item_set(child,
-				      "width", (double) e_reflow->column_width,
-				      NULL);
-	}
-}
-
-static double
-e_reflow_point (GnomeCanvasItem *item,
-		double x, double y, int cx, int cy,
-		GnomeCanvasItem **actual_item)
-{
-	double distance = 1;
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->point)
-		distance = GNOME_CANVAS_ITEM_CLASS(parent_class)->point (item, x, y, cx, cy, actual_item);
-	if (*actual_item)
-		return 0;
-	
-	*actual_item = item;
-	return 0;
-#if 0
-	if (y >= E_REFLOW_BORDER_WIDTH && y <= e_reflow->height - E_REFLOW_BORDER_WIDTH) {
-	        float n_x;
-		n_x = x;
-		n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-		n_x = fmod(n_x, (e_reflow->column_width + E_REFLOW_FULL_GUTTER));
-		if (n_x < E_REFLOW_FULL_GUTTER) {
-			*actual_item = item;
-			return 0;
-		}
-	}
-	return distance;
-#endif
-}
-
-static void
-_reflow( EReflow *e_reflow )
-{
-	gdouble running_height;
-	GList *list;
-	double item_height;
-
-	if (e_reflow->columns) {
-		g_list_free (e_reflow->columns);
-		e_reflow->columns = NULL;
-	}
-
-	e_reflow->column_count = 0;
-
-	if (e_reflow->items == NULL) {
-		e_reflow->columns = NULL;
-		e_reflow->column_count = 0;
-		return;
-	}
-
-	list = e_reflow->items;
-	
-	gtk_object_get (GTK_OBJECT(list->data),
-			"height", &item_height,
-			NULL);
-	running_height = E_REFLOW_BORDER_WIDTH + item_height + E_REFLOW_BORDER_WIDTH;
-	e_reflow->columns = g_list_append (e_reflow->columns, list);
-	e_reflow->column_count = 1;
-
-	list = g_list_next(list);
-
-	for ( ; list; list = g_list_next(list)) {
-		gtk_object_get (GTK_OBJECT(list->data),
-				"height", &item_height,
-				NULL);
-		if (running_height + item_height + E_REFLOW_BORDER_WIDTH > e_reflow->height) {
-			running_height = E_REFLOW_BORDER_WIDTH + item_height + E_REFLOW_BORDER_WIDTH;
-			e_reflow->columns = g_list_append (e_reflow->columns, list);
-			e_reflow->column_count ++;
-		} else {
-			running_height += item_height + E_REFLOW_BORDER_WIDTH;
-		}
-	}
-}
-
-static void
-set_empty(EReflow *e_reflow)
-{
-	if (e_reflow->items == NULL) {
-		if (e_reflow->empty_text) {
-			if (e_reflow->empty_message) {
-				gnome_canvas_item_set(e_reflow->empty_text,
-						      "width", e_reflow->minimum_width,
-						      "text", e_reflow->empty_message,
-						      NULL);
-				e_canvas_item_move_absolute(e_reflow->empty_text,
-							    e_reflow->minimum_width / 2,
-							    0);
-			} else {
-				gtk_object_destroy(GTK_OBJECT(e_reflow->empty_text));
-				e_reflow->empty_text = NULL;
-			}
-		} else {
-			if (e_reflow->empty_message)
-				e_reflow->empty_text = 
-					gnome_canvas_item_new(GNOME_CANVAS_GROUP(e_reflow),
-							      e_text_get_type(),
-							      "anchor", GTK_ANCHOR_N,
-							      "width", e_reflow->minimum_width,
-							      "clip", TRUE,
-							      "use_ellipsis", TRUE,
-							      "font_gdk", GTK_WIDGET(GNOME_CANVAS_ITEM(e_reflow)->canvas)->style->font,
-							      "fill_color", "black",
-							      "justification", GTK_JUSTIFY_CENTER,
-							      "text", e_reflow->empty_message,
-							      "draw_background", FALSE,
-							      NULL);
-			e_canvas_item_move_absolute(e_reflow->empty_text,
-						    e_reflow->minimum_width / 2,
-						    0);
-		}
-	} else {
-		if (e_reflow->empty_text) {
-			gtk_object_destroy(GTK_OBJECT(e_reflow->empty_text));
-			e_reflow->empty_text = NULL;
-		}
-	}
-}
-
-static void
-e_reflow_reflow( GnomeCanvasItem *item, int flags )
-{
-	EReflow *e_reflow = E_REFLOW(item);
-	if ( GTK_OBJECT_FLAGS( e_reflow ) & GNOME_CANVAS_ITEM_REALIZED ) {
-
-		gdouble old_width;
-		gdouble running_width;
-
-		_reflow (e_reflow);
-		
-		old_width = e_reflow->width;
-		
-		running_width = E_REFLOW_BORDER_WIDTH;
-
-		if (e_reflow->items == NULL) {
-		} else {
-			GList *list;
-			GList *next_column;
-			gdouble item_height;
-			gdouble running_height;
-
-			running_height = E_REFLOW_BORDER_WIDTH;
-			
-			list = e_reflow->items;
-			gtk_object_get (GTK_OBJECT(list->data),
-					"height", &item_height,
-					NULL);
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-						    (double) running_width,
-						    (double) running_height);
-			running_height += item_height + E_REFLOW_BORDER_WIDTH;
-			next_column = g_list_next(e_reflow->columns);
-			list = g_list_next(list);
-			
-			for( ; list; list = g_list_next(list)) {
-				gtk_object_get (GTK_OBJECT(list->data),
-						"height", &item_height,
-						NULL);
-
-				if (next_column && (next_column->data == list)) {
-					next_column = g_list_next (next_column);
-					running_height = E_REFLOW_BORDER_WIDTH;
-					running_width += e_reflow->column_width + E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH;
-				}
-				e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-							    (double) running_width,
-							    (double) running_height);
-
-				running_height += item_height + E_REFLOW_BORDER_WIDTH;
-			}
-				 
-		}
-		e_reflow->width = running_width + e_reflow->column_width + E_REFLOW_BORDER_WIDTH;
-		if ( e_reflow->width < e_reflow->minimum_width )
-			e_reflow->width = e_reflow->minimum_width;
-		if (old_width != e_reflow->width)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-void
-e_reflow_add_item(EReflow *e_reflow, GnomeCanvasItem *item, gint *position)
-{
-	if (E_REFLOW_CLASS(GTK_OBJECT(e_reflow)->klass)->add_item)
-		(E_REFLOW_CLASS(GTK_OBJECT(e_reflow)->klass)->add_item) (e_reflow, item, position);
-}
-
-void
-e_reflow_post_add_item(EReflow *e_reflow, GnomeCanvasItem *item)
-{
-	set_empty(e_reflow);
-}
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
deleted file mode 100644
index b4c1dcb372..0000000000
--- a/widgets/misc/e-reflow.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-reflow.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_REFLOW_H__
-#define __E_REFLOW_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EReflow - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * 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_REFLOW_TYPE			(e_reflow_get_type ())
-#define E_REFLOW(obj)			(GTK_CHECK_CAST ((obj), E_REFLOW_TYPE, EReflow))
-#define E_REFLOW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_REFLOW_TYPE, EReflowClass))
-#define E_IS_REFLOW(obj)		(GTK_CHECK_TYPE ((obj), E_REFLOW_TYPE))
-#define E_IS_REFLOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_REFLOW_TYPE))
-
-
-typedef struct _EReflow       EReflow;
-typedef struct _EReflowClass  EReflowClass;
-
-struct _EReflow
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	GList *items; /* Of type GnomeCanvasItem */
-	GList *columns; /* Of type GList of type GnomeCanvasItem (points into items) */
-	gint column_count; /* Number of columnns */
-
-	GnomeCanvasItem *empty_text;
-	gchar *empty_message;
-	
-	double minimum_width;
-	double width;
-	double height;
-       
-	double column_width;
-
-	int idle;
-
-	/* These are all for when the column is being dragged. */
-	gboolean column_drag;
-	gdouble start_x;
-	gint which_column_dragged;
-	double temp_column_width;
-	double previous_temp_column_width;
-
-	guint need_height_update : 1;
-	guint need_column_resize : 1;
-
-	guint default_cursor_shown : 1;
-	GdkCursor *arrow_cursor;
-	GdkCursor *default_cursor;
-};
-
-struct _EReflowClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	/* Virtual methods. */
-	void (* add_item) (EReflow *reflow, GnomeCanvasItem *item, gint *position);
-};
-
-/* 
- * To be added to a reflow, an item must have the argument "width" as
- * a Read/Write argument and "height" as a Read Only argument.  It
- * should also do an ECanvas parent reflow request if its size
- * changes.
- */
-void     e_reflow_add_item       (EReflow         *e_reflow,
-				  GnomeCanvasItem *item,
-				  gint            *position);
-GtkType  e_reflow_get_type       (void);
-
-/* Internal usage only: */
-void     e_reflow_post_add_item  (EReflow         *e_reflow,
-				  GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_REFLOW_H__ */
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
deleted file mode 100644
index 30eaf0947f..0000000000
--- a/widgets/misc/e-search-bar.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-search-bar.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Authors:
- *  Chris Lahey <clahey@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-search-bar.h"
-#include "e-dropdown-button.h"
-
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-
-enum {
-	QUERY_CHANGED,
-	MENU_ACTIVATED,
-
-	LAST_SIGNAL
-};
-
-static gint esb_signals [LAST_SIGNAL] = { 0, };
-
-static GtkHBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_OPTION_CHOICE,
-	ARG_TEXT,
-};
-
-
-/* Signals.  */
-
-static void
-emit_query_changed (ESearchBar *esb)
-{
-	gtk_signal_emit(GTK_OBJECT (esb),
-			esb_signals [QUERY_CHANGED]);
-}
-
-static void
-emit_menu_activated (ESearchBar *esb, int item)
-{
-	gtk_signal_emit(GTK_OBJECT (esb),
-			esb_signals [MENU_ACTIVATED],
-			item);
-}
-
-
-/* Callbacks.  */
-
-static void
-menubar_activated_cb (GtkWidget *widget, ESearchBar *esb)
-{
-	int id;
-
-	id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EsbMenuId"));
-
-	emit_menu_activated(esb, id);
-}
-
-static void
-option_activated_cb (GtkWidget *widget,
-		     ESearchBar *esb)
-{
-	int id;
-
-	id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "EsbChoiceId"));
-
-	esb->option_choice = id;
-	emit_query_changed (esb);
-}
-
-static void
-entry_activated_cb (GtkWidget *widget,
-		     ESearchBar *esb)
-{
-	emit_query_changed (esb);
-}
-
-
-/* Widgetry creation.  */
-
-static void add_dropdown(ESearchBar *esb, ESearchBarItem *items)
-{
-	GtkWidget *menu = esb->dropdown_menu;
-	GtkWidget *item;
-
-	if (items->text)
-		item = gtk_menu_item_new_with_label (_(items->text));
-	else
-		item = gtk_menu_item_new();
-
-	gtk_widget_show(item);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_object_set_data (GTK_OBJECT (item), "EsbMenuId", GINT_TO_POINTER(items->id));
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (menubar_activated_cb),
-			    esb);
-}
-
-static void
-set_dropdown (ESearchBar *esb,
-	      ESearchBarItem *items)
-{
-	GtkWidget *menu;
-	GtkWidget *dropdown;
-	int i;
-
-	menu = esb->dropdown_menu = gtk_menu_new ();
-	for (i = 0; items[i].id != -1; i++)
-		add_dropdown(esb, items+i);
-
-	gtk_widget_show_all (menu);
-
-	dropdown = e_dropdown_button_new (_("Sear_ch"), GTK_MENU (menu));
-	GTK_WIDGET_UNSET_FLAGS (dropdown, GTK_CAN_FOCUS);
-	gtk_widget_show (dropdown);
-
-	if (esb->dropdown_holder == NULL) {
-
-		/* So, GtkOptionMenu is stupid; it adds a 1-pixel-wide empty border
-	           around the button for no reason.  So we add a 1-pixel-wide border
-	           around the button as well, by using an event box.  */
-
-		esb->dropdown_holder = gtk_event_box_new ();
-		gtk_container_set_border_width (GTK_CONTAINER (esb->dropdown_holder), 1);
-		esb->dropdown = dropdown;
-		gtk_container_add (GTK_CONTAINER (esb->dropdown_holder), esb->dropdown);
-		gtk_widget_show (esb->dropdown_holder);
-
-		gtk_box_pack_start(GTK_BOX(esb), esb->dropdown_holder, FALSE, FALSE, 0);
-	} else {
-		gtk_widget_destroy(esb->dropdown);
-		esb->dropdown = dropdown;
-		gtk_container_add (GTK_CONTAINER (esb->dropdown_holder), esb->dropdown);
-	}
-}
-
-static void
-set_option(ESearchBar *esb, ESearchBarItem *items)
-{
-	GtkWidget *menu;
-	GtkRequisition dropdown_requisition;
-	GtkRequisition option_requisition;
-	int i;
-
-	if (esb->option) {
-		gtk_widget_destroy(esb->option_menu);
-	} else {
-		esb->option = gtk_option_menu_new();
-		gtk_widget_show(esb->option);
-		gtk_box_pack_start(GTK_BOX(esb), esb->option, FALSE, FALSE, 0);
-	}
-
-	esb->option_menu = menu = gtk_menu_new ();
-	for (i = 0; items[i].id != -1; i++) {
-		GtkWidget *item;
-
-		if (items[i].text)
-			item = gtk_menu_item_new_with_label (_(items[i].text));
-		else
-			item = gtk_menu_item_new();
-
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		gtk_object_set_data (GTK_OBJECT (item), "EsbChoiceId", GINT_TO_POINTER(items[i].id));
-
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (option_activated_cb),
-				    esb);
-	}
-	gtk_widget_show_all (menu);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (esb->option), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (esb->option), 0);
-
-	gtk_widget_set_sensitive (esb->option, TRUE);
-
-	/* Set the minimum height of this widget to that of the dropdown
-           button, for a better look.  */
-	g_assert (esb->dropdown != NULL);
-
-	gtk_widget_size_request (esb->dropdown, &dropdown_requisition);
-	gtk_widget_size_request (esb->option, &option_requisition);
-
-	gtk_container_set_border_width (GTK_CONTAINER (esb->dropdown), GTK_CONTAINER (esb->option)->border_width);
-}
-
-static void
-add_entry (ESearchBar *esb)
-{
-	esb->entry = gtk_entry_new();
-	gtk_signal_connect (GTK_OBJECT (esb->entry), "activate",
-			    GTK_SIGNAL_FUNC (entry_activated_cb), esb);
-	gtk_widget_show(esb->entry);
-	gtk_box_pack_start(GTK_BOX(esb), esb->entry, TRUE, TRUE, 0);
-}
-
-static void
-add_spacer (ESearchBar *esb)
-{
-	GtkWidget *spacer;
-
-	spacer = gtk_drawing_area_new();
-	gtk_widget_show(spacer);
-	gtk_box_pack_start(GTK_BOX(esb), spacer, FALSE, FALSE, 0);
-
-	gtk_widget_set_usize(spacer, 19, 1);
-}
-
-static int
-find_id(GtkWidget *menu, int idin, const char *type, GtkWidget **widget)
-{
-	GList *l = GTK_MENU_SHELL(menu)->children;
-	int row = -1, i = 0, id;
-
-	if (widget)
-		*widget = NULL;
-	while (l) {
-		id = GPOINTER_TO_INT(gtk_object_get_data(l->data, type));
-		printf("comparing id %d to query %d\n", id, idin);
-		if (id == idin) {
-			row = i;
-			if (widget)
-				*widget = l->data;
-			break;
-		}
-		i++;
-		l = l->next;
-	}
-	return row;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESearchBar *esb = E_SEARCH_BAR(object);
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		GTK_VALUE_ENUM (*arg) = esb->option_choice;
-		break;
-
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(esb->entry));
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-impl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESearchBar *esb = E_SEARCH_BAR(object);
-	int row;
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		esb->option_choice = GTK_VALUE_ENUM(*arg);
-		row = find_id(esb->option_menu, esb->option_choice, "EsbChoiceId", NULL);
-		if (row == -1)
-			row = 0;
-		gtk_option_menu_set_history (GTK_OPTION_MENU (esb->option), row);
-		emit_query_changed (esb);
-		break;
-
-	case ARG_TEXT:
-		e_utf8_gtk_editable_set_text(GTK_EDITABLE(esb->entry), GTK_VALUE_STRING (*arg));
-		emit_query_changed (esb);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-impl_destroy (GtkObject *object)
-{
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-
-static void
-class_init (ESearchBarClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	object_class->set_arg = impl_set_arg;
-	object_class->get_arg = impl_get_arg;
-	object_class->destroy = impl_destroy;
-
-	klass->set_menu = set_dropdown;
-	klass->set_option = set_option;
-
-	gtk_object_add_arg_type ("ESearchBar::option_choice", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_OPTION_CHOICE);
-	gtk_object_add_arg_type ("ESearchBar::text", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_TEXT);
-
-	esb_signals [QUERY_CHANGED] =
-		gtk_signal_new ("query_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESearchBarClass, query_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	esb_signals [MENU_ACTIVATED] =
-		gtk_signal_new ("menu_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESearchBarClass, menu_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL);
-}
-
-static void
-init (ESearchBar *esb)
-{
-	esb->dropdown      = NULL;
-	esb->option        = NULL;
-	esb->entry         = NULL;
-
-	esb->option_choice = 0;
-}
-
-
-/* Object construction.  */
-
-void
-e_search_bar_construct (ESearchBar *search_bar,
-			ESearchBarItem *menu_items,
-			ESearchBarItem *option_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_items != NULL);
-	g_return_if_fail (option_items != NULL);
-	
-	gtk_box_set_spacing (GTK_BOX (search_bar), 1);
-
-	e_search_bar_set_menu(search_bar, menu_items);
-
-	e_search_bar_set_option(search_bar, option_items);
-
-	add_entry (search_bar);
-
-	add_spacer (search_bar);
-}
-
-void
-e_search_bar_set_menu(ESearchBar *search_bar, ESearchBarItem *menu_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_items != NULL);
-
-	((ESearchBarClass *)((GtkObject *)search_bar)->klass)->set_menu(search_bar, menu_items);
-}
-
-void
-e_search_bar_add_menu(ESearchBar *search_bar, ESearchBarItem *menu_item)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_item != NULL);
-
-	add_dropdown(search_bar, menu_item);
-}
-
-void
-e_search_bar_set_option(ESearchBar *search_bar, ESearchBarItem *option_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (option_items != NULL);
-
-	((ESearchBarClass *)((GtkObject *)search_bar)->klass)->set_option(search_bar, option_items);
-}
-
-GtkWidget *
-e_search_bar_new (ESearchBarItem *menu_items,
-		  ESearchBarItem *option_items)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (menu_items != NULL, NULL);
-	g_return_val_if_fail (option_items != NULL, NULL);
-	
-	widget = GTK_WIDGET (gtk_type_new (e_search_bar_get_type ()));
-
-	e_search_bar_construct (E_SEARCH_BAR (widget), menu_items, option_items);
-
-	return widget;
-}
-
-void
-e_search_bar_set_menu_sensitive(ESearchBar *esb, int id, gboolean state)
-{
-	int row;
-	GtkWidget *widget;
-
-	row = find_id(esb->dropdown_menu, id, "EsbMenuId", &widget);
-	if (row != -1)
-		gtk_widget_set_sensitive(widget, state);
-}
-
-GtkType
-e_search_bar_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"ESearchBar",
-			sizeof (ESearchBar),
-			sizeof (ESearchBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_hbox_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
deleted file mode 100644
index 36b80fafc2..0000000000
--- a/widgets/misc/e-search-bar.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-search-bar.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SEARCH_BAR_H__
-#define __E_SEARCH_BAR_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ESearchBar - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		 type		read/write	description
- * ---------------------------------------------------------------------------------
- * option_choice int            RW              Which option choice is currently selected.
- * text          string         RW              Text in the entry box.
- */
-
-#define E_SEARCH_BAR_TYPE			(e_search_bar_get_type ())
-#define E_SEARCH_BAR(obj)			(GTK_CHECK_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
-#define E_SEARCH_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
-#define E_IS_SEARCH_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_SEARCH_BAR_TYPE))
-#define E_IS_SEARCH_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SEARCH_BAR_TYPE))
-
-typedef struct {
-	char *text;
-	int id;
-} ESearchBarItem;
-
-typedef struct _ESearchBar       ESearchBar;
-typedef struct _ESearchBarClass  ESearchBarClass;
-
-struct _ESearchBar
-{
-	GtkHBox parent;
-	
-	/* item specific fields */
-	GtkWidget *dropdown;
-	GtkWidget *option;
-	GtkWidget *entry;
-
-	/* PRIVATE */
-	GtkWidget *dropdown_holder;	/* holds the dropdown */
-	GtkWidget *option_menu;
-	GtkWidget *dropdown_menu;
-
-	int        option_choice;
-};
-
-struct _ESearchBarClass
-{
-	GtkHBoxClass parent_class;
-
-	void (*set_menu)       (ESearchBar *, ESearchBarItem *);
-	void (*set_option)     (ESearchBar *, ESearchBarItem *);
-
-	void (*query_changed)  (ESearchBar *search);
-	void (*menu_activated) (ESearchBar *search, int item);
-};
-
-
-GtkType    e_search_bar_get_type   (void);
-void       e_search_bar_set_menu   (ESearchBar *search_bar, ESearchBarItem *menu_items);
-void	   e_search_bar_add_menu   (ESearchBar *search_bar, ESearchBarItem *menu_item);
-
-void       e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items);
-void       e_search_bar_construct  (ESearchBar     *search_bar,
-				    ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-GtkWidget *e_search_bar_new        (ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-
-void       e_search_bar_set_menu_sensitive(ESearchBar *search_bar, int id, gboolean state);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_SEARCH_BAR_H__ */
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
deleted file mode 100644
index 9a9c1e0d79..0000000000
--- a/widgets/misc/e-selection-model-simple.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-selection-model-simple.c: a Table Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gal/util/e-util.h>
-#include "e-selection-model-simple.h"
-
-#define ESMS_CLASS(e) ((ESelectionModelSimpleClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_get_type ()
-
-static ESelectionModel *parent_class;
-
-static gint esms_get_row_count (ESelectionModel *esm);
-
-static void
-e_selection_model_simple_init (ESelectionModelSimple *selection)
-{
-	selection->row_count = 0;
-}
-
-static void
-e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass)
-{
-	ESelectionModelClass *esm_class;
-
-	parent_class             = gtk_type_class (PARENT_TYPE);
-
-	esm_class                = E_SELECTION_MODEL_CLASS(klass);
-
-	esm_class->get_row_count = esms_get_row_count;
-}
-
-E_MAKE_TYPE(e_selection_model_simple, "ESelectionModelSimple", ESelectionModelSimple,
-	    e_selection_model_simple_class_init, e_selection_model_simple_init, PARENT_TYPE);
-
-/** 
- * e_selection_model_simple_new
- *
- * This routine creates a new #ESelectionModelSimple.
- *
- * Returns: The new #ESelectionModelSimple.
- */
-ESelectionModelSimple *
-e_selection_model_simple_new (void)
-{
-	return gtk_type_new (e_selection_model_simple_get_type ());
-}
-
-void
-e_selection_model_simple_set_row_count (ESelectionModelSimple *esms,
-					int row_count)
-{
-	if (esms->row_count != row_count) {
-		ESelectionModel *esm = E_SELECTION_MODEL(esms);
-		g_free(esm->selection);
-		esm->selection = NULL;
-		esm->row_count = -1;
-	}
-	esms->row_count = row_count;
-}
-
-static gint
-esms_get_row_count (ESelectionModel *esm)
-{
-	ESelectionModelSimple *esms = E_SELECTION_MODEL_SIMPLE(esm);
-
-	return esms->row_count;
-}
-
-void      e_selection_model_simple_insert_row          (ESelectionModelSimple *esms,
-							int                    row)
-{
-	esms->row_count ++;
-	e_selection_model_insert_row (E_SELECTION_MODEL(esms), row);
-}
-
-void
-e_selection_model_simple_delete_row          (ESelectionModelSimple *esms,
-					      int                    row)
-{
-	esms->row_count --;
-	e_selection_model_delete_row (E_SELECTION_MODEL(esms), row);
-}
-
-void
-e_selection_model_simple_move_row            (ESelectionModelSimple *esms,
-					      int                    old_row,
-					      int                    new_row)
-{
-	e_selection_model_move_row (E_SELECTION_MODEL(esms), old_row, new_row);
-}
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
deleted file mode 100644
index 52e785880c..0000000000
--- a/widgets/misc/e-selection-model-simple.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SELECTION_MODEL_SIMPLE_H_
-#define _E_SELECTION_MODEL_SIMPLE_H_
-
-#include <gal/widgets/e-selection-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SELECTION_MODEL_SIMPLE_TYPE        (e_selection_model_simple_get_type ())
-#define E_SELECTION_MODEL_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimple))
-#define E_SELECTION_MODEL_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimpleClass))
-#define E_IS_SELECTION_MODEL_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_SIMPLE_TYPE))
-#define E_IS_SELECTION_MODEL_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_SIMPLE_TYPE))
-
-typedef struct {
-	ESelectionModel parent;
-
-	int row_count;
-} ESelectionModelSimple;
-
-typedef struct {
-	ESelectionModelClass parent_class;
-} ESelectionModelSimpleClass;
-
-GtkType                e_selection_model_simple_get_type       (void);
-ESelectionModelSimple *e_selection_model_simple_new            (void);
-
-void                   e_selection_model_simple_insert_row     (ESelectionModelSimple *esms,
-								int                    row);
-void                   e_selection_model_simple_delete_row     (ESelectionModelSimple *esms,
-								int                    row);
-void                   e_selection_model_simple_move_row       (ESelectionModelSimple *esms,
-								int                    old_row,
-								int                    new_row);
-
-void                   e_selection_model_simple_set_row_count  (ESelectionModelSimple *selection,
-								int                    row_count);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SELECTION_MODEL_SIMPLE_H_ */
-
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
deleted file mode 100644
index de48bc3952..0000000000
--- a/widgets/misc/e-selection-model.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-selection-model.c: a Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-selection-model.h"
-#include "gal/util/e-util.h"
-#include <gdk/gdkkeysyms.h>
-
-#define ESM_CLASS(e) ((ESelectionModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define ONES ((guint32) 0xffffffff)
-
-#define BOX(n) ((n) / 32)
-#define OFFSET(n) (31 - ((n) % 32))
-#define BITMASK(n) ((guint32)(((guint32) 0x1) << OFFSET((n))))
-#define BITMASK_LEFT(n) ((((n) % 32) == 0) ? 0 : (ONES << (32 - ((n) % 32))))
-#define BITMASK_RIGHT(n) ((guint32)(((guint32) ONES) >> ((n) % 32)))
-
-static GtkObjectClass *e_selection_model_parent_class;
-
-static void change_one_row(ESelectionModel *selection, int row, gboolean grow);
-static void esm_select_single_row (ESelectionModel *selection, int row);
-
-enum {
-	CURSOR_CHANGED,
-	CURSOR_ACTIVATED,
-	SELECTION_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_selection_model_signals [LAST_SIGNAL] = { 0, };
-
-enum {
-	ARG_0,
-	ARG_SORTER,
-	ARG_CURSOR_ROW,
-	ARG_CURSOR_COL,
-	ARG_SELECTION_MODE,
-	ARG_CURSOR_MODE,
-};
-
-static void
-e_selection_model_insert_row_real(ESelectionModel *esm, int row)
-{
-	int box;
-	int i;
-	if(esm->row_count >= 0) {
-		/* Add another word if needed. */
-		if ((esm->row_count & 0x1f) == 0) {
-			esm->selection = g_renew(gint, esm->selection, (esm->row_count >> 5) + 1);
-			esm->selection[esm->row_count >> 5] = 0;
-		}
-
-		/* The box is the word that our row is in. */
-		box = BOX(row);
-		/* Shift all words to the right of our box right one bit. */
-		for (i = esm->row_count >> 5; i > box; i--) {
-			esm->selection[i] = (esm->selection[i] >> 1) | (esm->selection[i - 1] << 31);
-		}
-
-		/* Shift right half of box one bit to the right. */
-		esm->selection[box] = (esm->selection[box] & BITMASK_LEFT(row)) | ((esm->selection[box] & BITMASK_RIGHT(row)) >> 1);
-		esm->row_count ++;
-	}
-	if (esm->cursor_row >= row)
-		esm->cursor_row ++;
-}
-
-static void
-e_selection_model_delete_row_real(ESelectionModel *esm, int row)
-{
-	int box;
-	int i;
-	int last;
-	int selected = FALSE;
-	if(esm->row_count >= 0) {
-		guint32 bitmask;
-		box = row >> 5;
-		last = esm->row_count >> 5;
-
-		/* Build bitmasks for the left and right half of the box */
-		bitmask = BITMASK_RIGHT(row) >> 1;
-		selected = e_selection_model_is_row_selected(esm, row);
-		/* Shift right half of box one bit to the left. */
-		esm->selection[box] = (esm->selection[box] & BITMASK_LEFT(row))| ((esm->selection[box] & bitmask) << 1);
-
-		/* Shift all words to the right of our box left one bit. */
-		if (box < last) {
-			esm->selection[box] &= esm->selection[box + 1] >> 31;
-
-			for (i = box + 1; i < last; i++) {
-				esm->selection[i] = (esm->selection[i] << 1) | (esm->selection[i + 1] >> 31);
-			}
-			/* this over-runs our memory! */
-			/*esm->selection[i] = esm->selection[i] << 1; */
-		}
-		esm->row_count --;
-		/* Remove the last word if not needed. */
-		if ((esm->row_count & 0x1f) == 0) {
-			esm->selection = g_renew(gint, esm->selection, esm->row_count >> 5);
-		}
-		if (selected && esm->mode == GTK_SELECTION_SINGLE) {
-			esm_select_single_row (esm, row > 0 ? row - 1 : 0);
-		}
-	}
-	if (esm->cursor_row >= row && esm->cursor_row > 0)
-		esm->cursor_row --;
-}
-
-void
-e_selection_model_delete_row(ESelectionModel *esm, int row)
-{
-	e_selection_model_delete_row_real(esm, row);
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [SELECTION_CHANGED]);
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [CURSOR_CHANGED], esm->cursor_row, esm->cursor_col);
-}
-
-void
-e_selection_model_insert_row(ESelectionModel *esm, int row)
-{
-	e_selection_model_insert_row_real(esm, row);
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [SELECTION_CHANGED]);
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [CURSOR_CHANGED], esm->cursor_row, esm->cursor_col);
-}
-
-/* FIXME: Implement this more efficiently. */
-void
-e_selection_model_move_row(ESelectionModel *esm, int old_row, int new_row)
-{
-	gint selected = e_selection_model_is_row_selected(esm, old_row);
-	gint cursor = esm->cursor_row == old_row;
-
-	e_selection_model_delete_row_real(esm, old_row);
-	e_selection_model_insert_row_real(esm, new_row);
-
-	if (selected) {
-		if (esm->mode == GTK_SELECTION_SINGLE)
-			esm_select_single_row (esm, new_row);
-		else
-			change_one_row(esm, new_row, TRUE);
-	}
-	if (cursor) {
-		esm->cursor_row = new_row;
-	}
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [SELECTION_CHANGED]);
-	gtk_signal_emit(GTK_OBJECT(esm),
-			e_selection_model_signals [CURSOR_CHANGED], esm->cursor_row, esm->cursor_col);
-}
-
-inline static void
-add_sorter(ESelectionModel *esm, ESorter *sorter)
-{
-	esm->sorter = sorter;
-	if (sorter) {
-		gtk_object_ref(GTK_OBJECT(sorter));
-	}
-}
-
-inline static void
-drop_sorter(ESelectionModel *esm)
-{
-	if (esm->sorter) {
-		gtk_object_unref(GTK_OBJECT(esm->sorter));
-	}
-	esm->sorter = NULL;
-}
-
-static void
-esm_destroy (GtkObject *object)
-{
-	ESelectionModel *esm;
-
-	esm = E_SELECTION_MODEL (object);
-
-	drop_sorter(esm);
-
-	g_free(esm->selection);
-}
-
-static void
-esm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_SORTER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(esm->sorter);
-		break;
-
-	case ARG_CURSOR_ROW:
-		GTK_VALUE_INT(*arg) = esm->cursor_row;
-		break;
-
-	case ARG_CURSOR_COL:
-		GTK_VALUE_INT(*arg) = esm->cursor_col;
-		break;
-
-	case ARG_SELECTION_MODE:
-		GTK_VALUE_ENUM(*arg) = esm->mode;
-		break;
-
-	case ARG_CURSOR_MODE:
-		GTK_VALUE_ENUM(*arg) = esm->cursor_mode;
-		break;
-	}
-}
-
-static void
-esm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_SORTER:
-		drop_sorter(esm);
-		add_sorter(esm, GTK_VALUE_OBJECT (*arg) ? E_SORTER(GTK_VALUE_OBJECT (*arg)) : NULL);
-		break;
-
-	case ARG_CURSOR_ROW:
-		e_selection_model_do_something(esm, GTK_VALUE_INT(*arg), esm->cursor_col, 0);
-		break;
-
-	case ARG_CURSOR_COL:
-		e_selection_model_do_something(esm, esm->cursor_row, GTK_VALUE_INT(*arg), 0);
-		break;
-
-	case ARG_SELECTION_MODE:
-		esm->mode = GTK_VALUE_ENUM(*arg);
-		if (esm->mode == GTK_SELECTION_SINGLE) {
-			e_selection_model_do_something(esm, esm->cursor_row, esm->cursor_col, 0);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		esm->cursor_mode = GTK_VALUE_ENUM(*arg);
-		break;
-	}
-}
-
-static void
-e_selection_model_init (ESelectionModel *selection)
-{
-	selection->selection = NULL;
-	selection->row_count = -1;
-	selection->selection_start_row = 0;
-	selection->cursor_row = -1;
-	selection->cursor_col = -1;
-	selection->mode = GTK_SELECTION_MULTIPLE;
-	selection->cursor_mode = E_CURSOR_SIMPLE;
-}
-
-static void
-e_selection_model_class_init (ESelectionModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	e_selection_model_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	object_class->destroy = esm_destroy;
-	object_class->get_arg = esm_get_arg;
-	object_class->set_arg = esm_set_arg;
-
-	e_selection_model_signals [CURSOR_CHANGED] =
-		gtk_signal_new ("cursor_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_changed),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_selection_model_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_activated),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_selection_model_signals [SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	klass->cursor_changed    = NULL;
-	klass->cursor_activated  = NULL;
-	klass->selection_changed = NULL;
-
-	gtk_object_class_add_signals (object_class, e_selection_model_signals, LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ESelectionModel::sorter", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_SORTER);
-	gtk_object_add_arg_type ("ESelectionModel::cursor_row", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_ROW);
-	gtk_object_add_arg_type ("ESelectionModel::cursor_col", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_COL);
-	gtk_object_add_arg_type ("ESelectionModel::selection_mode", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_SELECTION_MODE);
-	gtk_object_add_arg_type ("ESelectionModel::cursor_mode", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_CURSOR_MODE);
-}
-
-E_MAKE_TYPE(e_selection_model, "ESelectionModel", ESelectionModel,
-	    e_selection_model_class_init, e_selection_model_init, PARENT_TYPE);
-
-/** 
- * e_selection_model_is_row_selected
- * @selection: #ESelectionModel to check
- * @n: The row to check
- *
- * This routine calculates whether the given row is selected.
- *
- * Returns: %TRUE if the given row is selected
- */
-gboolean
-e_selection_model_is_row_selected (ESelectionModel *selection,
-				   gint                 n)
-{
-	if (selection->row_count < n || selection->row_count == 0)
-		return 0;
-	else
-		return (selection->selection[BOX(n)] >> OFFSET(n)) & 0x1;
-}
-
-/** 
- * e_selection_model_foreach
- * @selection: #ESelectionModel to traverse
- * @callback: The callback function to call back.
- * @closure: The closure
- *
- * This routine calls the given callback function once for each
- * selected row, passing closure as the closure.
- */
-void 
-e_selection_model_foreach     (ESelectionModel *selection,
-			       EForeachFunc callback,
-			       gpointer closure)
-{
-	int i;
-	int last = (selection->row_count + 31) / 32;
-	for (i = 0; i < last; i++) {
-		if (selection->selection[i]) {
-			int j;
-			guint32 value = selection->selection[i];
-			for (j = 0; j < 32; j++) {
-				if (value & 0x80000000) {
-					callback(i * 32 + j, closure);
-				}
-				value <<= 1;
-			}
-		}
-	}
-}
-
-#define OPERATE(object, i,mask,grow) ((grow) ? (((object)->selection[(i)]) |= ((guint32) ~(mask))) : (((object)->selection[(i)]) &= (mask)))
-
-static void
-change_one_row(ESelectionModel *selection, int row, gboolean grow)
-{
-	int i;
-	i = BOX(row);
-
-	OPERATE(selection, i, ~BITMASK(row), grow);
-}
-
-static void
-change_selection(ESelectionModel *selection, int start, int end, gboolean grow)
-{
-	int i, last;
-	if (start != end) {
-		if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-			for ( i = start; i < end; i++) {
-				change_one_row(selection, e_sorter_sorted_to_model(selection->sorter, i), grow);
-			}
-		} else {
-			i = BOX(start);
-			last = BOX(end);
-
-			if (i == last) {
-				OPERATE(selection, i, BITMASK_LEFT(start) | BITMASK_RIGHT(end), grow);
-			} else {
-				OPERATE(selection, i, BITMASK_LEFT(start), grow);
-				if (grow)
-					for (i ++; i < last; i++)
-						selection->selection[i] = ONES;
-				else
-					for (i ++; i < last; i++)
-						selection->selection[i] = 0;
-				OPERATE(selection, i, BITMASK_RIGHT(end), grow);
-			}
-		}
-	}
-}
-
-static void
-esm_select_single_row (ESelectionModel *selection, int row)
-{
-	int i;
-	for (i = 0; i < ((selection->row_count + 31) / 32); i++) {
-		if (!((i == BOX(row) && selection->selection[i] == BITMASK(row)) ||
-		      (i != BOX(row) && selection->selection[i] == 0))) {
-			g_free(selection->selection);
-			selection->selection = g_new0(gint, (selection->row_count + 31) / 32);
-			selection->selection[BOX(row)] = BITMASK(row);
-
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals [SELECTION_CHANGED]);
-			break;
-		}
-	}
-
-	selection->selection_start_row = row;
-}
-
-static void
-esm_toggle_single_row (ESelectionModel *selection, int row)
-{
-	if (selection->selection[BOX(row)] & BITMASK(row))
-		selection->selection[BOX(row)] &= ~BITMASK(row);
-	else
-		selection->selection[BOX(row)] |= BITMASK(row);
-	selection->selection_start_row = row;
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals [SELECTION_CHANGED]);
-}
-
-static void
-esm_move_selection_end (ESelectionModel *selection, int row)
-{
-	int old_start;
-	int old_end;
-	int new_start;
-	int new_end;
-	if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-		old_start = MIN (e_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
-				 e_sorter_model_to_sorted(selection->sorter, selection->cursor_row));
-		old_end = MAX (e_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
-			       e_sorter_model_to_sorted(selection->sorter, selection->cursor_row)) + 1;
-		new_start = MIN (e_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
-				 e_sorter_model_to_sorted(selection->sorter, row));
-		new_end = MAX (e_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
-			       e_sorter_model_to_sorted(selection->sorter, row)) + 1;
-	} else {
-		old_start = MIN (selection->selection_start_row, selection->cursor_row);
-		old_end = MAX (selection->selection_start_row, selection->cursor_row) + 1;
-		new_start = MIN (selection->selection_start_row, row);
-		new_end = MAX (selection->selection_start_row, row) + 1;
-	}
-	/* This wouldn't work nearly so smoothly if one end of the selection weren't held in place. */
-	if (old_start < new_start)
-		change_selection(selection, old_start, new_start, FALSE);
-	if (new_start < old_start)
-		change_selection(selection, new_start, old_start, TRUE);
-	if (old_end < new_end)
-		change_selection(selection, old_end, new_end, TRUE);
-	if (new_end < old_end)
-		change_selection(selection, new_end, old_end, FALSE);
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals [SELECTION_CHANGED]);
-}
-
-static void
-esm_set_selection_end (ESelectionModel *selection, int row)
-{
-	esm_select_single_row(selection, selection->selection_start_row);
-	selection->cursor_row = selection->selection_start_row;
-	esm_move_selection_end(selection, row);
-}
-
-/** 
- * e_selection_model_do_something
- * @selection: #ESelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * This routine does whatever is appropriate as if the user clicked
- * the mouse in the given row and column.
- */
-void
-e_selection_model_do_something (ESelectionModel *selection,
-				guint                 row,
-				guint                 col,
-				GdkModifierType       state)
-{
-	gint shift_p = state & GDK_SHIFT_MASK;
-	gint ctrl_p = state & GDK_CONTROL_MASK;
-
-	if (row == -1 && col != -1)
-		row = 0;
-	if (col == -1 && row != -1)
-		col = 0;
-
-	if (selection->row_count < 0) {
-		selection->row_count = e_selection_model_get_row_count(selection);
-		if (selection->row_count < 0)
-			return;
-		g_free(selection->selection);
-		selection->selection = g_new0(gint, (selection->row_count + 31) / 32);
-	}
-	if (selection->row_count >= 0 && row < selection->row_count) {
-		switch (selection->mode) {
-		case GTK_SELECTION_SINGLE:
-			esm_select_single_row (selection, row);
-			break;
-		case GTK_SELECTION_BROWSE:
-		case GTK_SELECTION_MULTIPLE:
-		case GTK_SELECTION_EXTENDED:
-			if (shift_p) {
-				esm_set_selection_end (selection, row);
-			} else {
-				if (ctrl_p) {
-					esm_toggle_single_row (selection, row);
-				} else {
-					esm_select_single_row (selection, row);
-				}
-			}
-			break;
-		}
-		if (selection->cursor_row != row ||
-		    selection->cursor_col != col) {
-			selection->cursor_row = row;
-			selection->cursor_col = col;
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_CHANGED], row, col);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-		}
-	}
-}
-
-/** 
- * e_selection_model_maybe_do_something
- * @selection: #ESelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * If this row is selected, this routine just moves the cursor row and
- * column.  Otherwise, it does the same thing as
- * e_selection_model_do_something().  This is for being used on
- * right clicks and other events where if the user hit the selection,
- * they don't want it to change.
- */
-void
-e_selection_model_maybe_do_something      (ESelectionModel *selection,
-						 guint                 row,
-						 guint                 col,
-						 GdkModifierType       state)
-{
-	if (e_selection_model_is_row_selected(selection, row)) {
-		selection->cursor_row = row;
-		selection->cursor_col = col;
-	} else {
-		e_selection_model_do_something(selection, row, col, state);
-	}
-}
-
-static gint
-move_selection (ESelectionModel *selection,
-		gboolean              up,
-		GdkModifierType       state)
-{
-	int row = selection->cursor_row;
-	int col = selection->cursor_col;
-	int cursor_activated = TRUE;
-
-	gint shift_p = state & GDK_SHIFT_MASK;
-	gint ctrl_p = state & GDK_CONTROL_MASK;
-
-	row = e_sorter_model_to_sorted(selection->sorter, row);
-	if (up)
-		row--;
-	else
-		row++;
-	if (row < 0)
-		row = 0;
-	if (row >= selection->row_count)
-		row = selection->row_count - 1;
-	row = e_sorter_sorted_to_model(selection->sorter, row);
-
-	switch (selection->mode) {
-	case GTK_SELECTION_BROWSE:
-		if (shift_p) {
-			esm_set_selection_end (selection, row);
-		} else if (!ctrl_p) {
-			esm_select_single_row (selection, row);
-		} else
-			cursor_activated = FALSE;
-		break;
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		esm_select_single_row (selection, row);
-		break;
-	}
-	if (row != -1) {
-		selection->cursor_row = row;
-		gtk_signal_emit(GTK_OBJECT(selection),
-				e_selection_model_signals[CURSOR_CHANGED], row, col);
-		if (cursor_activated)
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-	}
-	return TRUE;
-}
-
-/** 
- * e_selection_model_key_press
- * @selection: #ESelectionModel to affect.
- * @key: The event.
- *
- * This routine does whatever is appropriate as if the user pressed
- * the given key.
- *
- * Returns: %TRUE if the #ESelectionModel used the key.
- */
-gint
-e_selection_model_key_press      (ESelectionModel *selection,
-					GdkEventKey          *key)
-{
-	switch (key->keyval) {
-	case GDK_Up:
-		return move_selection(selection, TRUE, key->state);
-		break;
-	case GDK_Down:
-		return move_selection(selection, FALSE, key->state);
-		break;
-	case GDK_space:
-	case GDK_KP_Space:
-		if (selection->mode != GTK_SELECTION_SINGLE) {
-			esm_toggle_single_row (selection, selection->cursor_row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
-			return TRUE;
-		}
-		break;
-	case GDK_Return:
-	case GDK_KP_Enter:
-		if (selection->mode != GTK_SELECTION_SINGLE) {
-			esm_select_single_row (selection, selection->cursor_row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
-			return TRUE;
-		}
-		break;
-	case GDK_Home:
-	case GDK_KP_Home:
-		if (selection->cursor_mode == E_CURSOR_LINE) {
-			int row = 0;
-
-			row = e_sorter_sorted_to_model(selection->sorter, row);
-			selection->cursor_row = row;
-
-			esm_select_single_row (selection, selection->cursor_row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_CHANGED], selection->cursor_row, selection->cursor_col);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
-			return TRUE;
-		}
-		break;
-	case GDK_End:
-	case GDK_KP_End:
-		if (selection->cursor_mode == E_CURSOR_LINE) {
-			int row = selection->row_count - 1;
-
-			row = e_sorter_sorted_to_model(selection->sorter, row);
-			selection->cursor_row = row;
-
-			esm_select_single_row (selection, selection->cursor_row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_CHANGED], selection->cursor_row, selection->cursor_col);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
-			return TRUE;
-		}
-		break;
-	}
-	return FALSE;
-}
-
-/** 
- * e_selection_model_clear
- * @selection: #ESelectionModel to clear
- *
- * This routine clears the selection to no rows selected.
- */
-void
-e_selection_model_clear(ESelectionModel *selection)
-{
-	g_free(selection->selection);
-	selection->selection = NULL;
-	selection->row_count = -1;
-	selection->cursor_row = -1;
-	selection->cursor_col = -1;
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals [CURSOR_CHANGED], -1, -1);
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals [SELECTION_CHANGED]);
-}
-
-#define PART(x,n) (((x) & (0x01010101 << n)) >> n)
-#define SECTION(x, n) (((x) >> (n * 8)) & 0xff)
-
-/** 
- * e_selection_model_selected_count
- * @selection: #ESelectionModel to count
- *
- * This routine calculates the number of rows selected.
- *
- * Returns: The number of rows selected in the given model.
- */
-gint
-e_selection_model_selected_count (ESelectionModel *selection)
-{
-	gint count;
-	int i;
-	int last;
-
-	if (!selection->selection)
-		return 0;
-
-	count = 0;
-
-	last = BOX(selection->row_count - 1);
-
-	for (i = 0; i <= last; i++) {
-		int j;
-		guint32 thiscount = 0;
-		for (j = 0; j < 8; j++)
-			thiscount += PART(selection->selection[i], j);
-		for (j = 0; j < 4; j++)
-			count += SECTION(thiscount, j);
-	}
-
-	return count;
-}
-
-/** 
- * e_selection_model_select_all
- * @selection: #ESelectionModel to select all
- *
- * This routine selects all the rows in the given
- * #ESelectionModel.
- */
-void
-e_selection_model_select_all (ESelectionModel *selection)
-{
-	int i;
-	
-	if (selection->row_count < 0) {
-		selection->row_count = e_selection_model_get_row_count(selection);
-		if (selection->row_count < 0)
-			return;
-		g_free (selection->selection);
-		selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-	}
-	
-	if (!selection->selection)
-		selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-	
-	for (i = 0; i < (selection->row_count + 31) / 32; i ++) {
-		selection->selection[i] = ONES;
-	}
-
-	/* need to zero out the bits corresponding to the rows not
-	   selected in the last full 32 bit mask */
-	if (selection->row_count % 32) {
-		int unselected_mask = 0;
-		int num_unselected_in_last_byte = 32 - selection->row_count % 32;
-
-		for (i = 0; i < num_unselected_in_last_byte; i ++)
-			unselected_mask |= 1 << i;
-
-		selection->selection[(selection->row_count + 31) / 32 - 1] &= ~unselected_mask;
-	}
-
-	selection->cursor_col = 0;
-	selection->cursor_row = 0;
-	selection->selection_start_row = 0;
-	gtk_signal_emit (GTK_OBJECT (selection),
-			 e_selection_model_signals [CURSOR_CHANGED], 0, 0);
-	gtk_signal_emit (GTK_OBJECT (selection),
-			 e_selection_model_signals [SELECTION_CHANGED]);
-}
-
-/** 
- * e_selection_model_invert_selection
- * @selection: #ESelectionModel to invert
- *
- * This routine inverts all the rows in the given
- * #ESelectionModel.
- */
-void
-e_selection_model_invert_selection (ESelectionModel *selection)
-{
-	int i;
-	
-	if (selection->row_count < 0) {
-		selection->row_count = e_selection_model_get_row_count (selection);
-		if (selection->row_count < 0)
-			return;
-		g_free (selection->selection);
-		selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-	}
-	
-	if (!selection->selection)
-		selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-	
-	for (i = 0; i < (selection->row_count + 31) / 32; i ++) {
-		selection->selection[i] = ~selection->selection[i];
-	}
-	
-	selection->cursor_col = -1;
-	selection->cursor_row = -1;
-	selection->selection_start_row = 0;
-	gtk_signal_emit (GTK_OBJECT (selection),
-			 e_selection_model_signals [CURSOR_CHANGED], -1, -1);
-	gtk_signal_emit (GTK_OBJECT (selection),
-			 e_selection_model_signals [SELECTION_CHANGED]);
-}
-
-int
-e_selection_model_get_row_count (ESelectionModel *selection)
-{
-	g_return_val_if_fail(selection != NULL, 0);
-	g_return_val_if_fail(E_IS_SELECTION_MODEL(selection), 0);
-
-	if (ESM_CLASS(selection)->get_row_count)
-		return ESM_CLASS(selection)->get_row_count (selection);
-	else
-		return 0;
-}
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
deleted file mode 100644
index 74cbcb50d2..0000000000
--- a/widgets/misc/e-selection-model.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SELECTION_MODEL_H_
-#define _E_SELECTION_MODEL_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
-#include <gdk/gdktypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SELECTION_MODEL_TYPE        (e_selection_model_get_type ())
-#define E_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel))
-#define E_SELECTION_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_TYPE, ESelectionModelClass))
-#define E_IS_SELECTION_MODEL(o)       (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_TYPE))
-#define E_IS_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_TYPE))
-
-typedef void (*EForeachFunc) (int model_row,
-			      gpointer closure);
-
-/* list selection modes */
-typedef enum {
-	E_CURSOR_LINE,
-	E_CURSOR_SIMPLE,
-	E_CURSOR_SPREADSHEET,
-} ECursorMode;
-
-typedef struct {
-	GtkObject     base;
-
-	ESorter *sorter;
-
-	gint row_count;
-        guint32 *selection;
-
-	gint cursor_row;
-	gint cursor_col;
-	gint selection_start_row;
-
-	guint model_changed_id;
-	guint model_row_inserted_id, model_row_deleted_id;
-
-	guint frozen : 1;
-	guint selection_model_changed : 1;
-	guint group_info_changed : 1;
-
-	GtkSelectionMode mode;
-	ECursorMode cursor_mode;
-} ESelectionModel;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	gint (*get_row_count)     (ESelectionModel *selection);
-
-	/*
-	 * Signals
-	 */
-
-	void (*cursor_changed)    (ESelectionModel *selection, int row, int col);
-	void (*cursor_activated)  (ESelectionModel *selection, int row, int col);
-	void (*selection_changed) (ESelectionModel *selection);
-
-} ESelectionModelClass;
-
-GtkType   e_selection_model_get_type            (void);
-
-gboolean  e_selection_model_is_row_selected     (ESelectionModel *selection,
-						 gint             n);
-void      e_selection_model_foreach             (ESelectionModel *selection,
-						 EForeachFunc     callback,
-						 gpointer         closure);
-void      e_selection_model_do_something        (ESelectionModel *selection,
-						 guint            row,
-						 guint            col,
-						 GdkModifierType  state);
-void      e_selection_model_maybe_do_something  (ESelectionModel *selection,
-						 guint            row,
-						 guint            col,
-						 GdkModifierType  state);
-gint      e_selection_model_key_press           (ESelectionModel *selection,
-						 GdkEventKey     *key);
-void      e_selection_model_clear               (ESelectionModel *selection);
-gint      e_selection_model_selected_count      (ESelectionModel *selection);
-void      e_selection_model_select_all          (ESelectionModel *selection);
-void      e_selection_model_invert_selection    (ESelectionModel *selection);
-
-/* Private Functions */
-void      e_selection_model_insert_row          (ESelectionModel *esm,
-						 int              row);
-void      e_selection_model_delete_row          (ESelectionModel *esm,
-						 int              row);
-void      e_selection_model_move_row            (ESelectionModel *esm,
-						 int              old_row,
-						 int              new_row);
-
-/* Virtual Function */
-gint      e_selection_model_get_row_count       (ESelectionModel *esm);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_SELECTION_MODEL_H_ */
diff --git a/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c
deleted file mode 100644
index 8ca6885ccf..0000000000
--- a/widgets/misc/e-title-bar.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktypeutils.h>
-
-#include <gal/util/e-util.h>
-#include "e-clipped-label.h"
-
-#include "e-title-bar.h"
-
-
-enum {
-	LABEL_BUTTON_PRESS_EVENT,
-	BUTTON_CLICKED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* The pixmaps.  */
-
-static char *close_xpm[] = {
-	"12 12 2 1",
-	" 	c none",
-	".	c #000000000000",
-	"            ",
-	" ..      .. ",
-	" ...    ... ",
-	"  ...  ...  ",
-	"   ......   ",
-	"    ....    ",
-	"    ....    ",
-	"   ......   ",
-	"  ...  ...  ",
-	" ...    ... ",
-	" ..      .. ",
-	"            "
-};
-
-static char *pin_xpm[] = {
-	"16 16 33 1",
-	" 	c None",
-	".	c #000000",
-	"+	c #74744D",
-	"@	c #B2B279",
-	"#	c #6C6C46",
-	"$	c #CACA9C",
-	"%	c #F4F4AD",
-	"&	c #85855A",
-	"*	c #B1B175",
-	"=	c #9A9A66",
-	"-	c #A9A98A",
-	";	c #B0B07B",
-	">	c #535353",
-	",	c #818181",
-	"'	c #B7B7B7",
-	")	c #D8D8D8",
-	"!	c #FFFFFF",
-	"~	c #EBEBA1",
-	"{	c #8A8A75",
-	"]	c #9F9F76",
-	"^	c #9E9E75",
-	"/	c #8A8A66",
-	"(	c #979770",
-	"_	c #6B6B46",
-	":	c #28281A",
-	"<	c #505034",
-	"[	c #666645",
-	"}	c #61614D",
-	"|	c #818155",
-	"1	c #4A4A31",
-	"2	c #4D4D34",
-	"3	c #6C6C48",
-	"4	c #5D5D3E",
-	"                ",
-	"                ",
-	"                ",
-	"      .     .   ",
-	"      ..   .+.  ",
-	"      .@...#$.  ",
-	" ......%&*=-;.  ",
-	".>,')!.~{]^/(.  ",
-	" ......_:<[}|.  ",
-	"      .1...23.  ",
-	"      ..   .4.  ",
-	"      .     .   ",
-	"                ",
-	"                ",
-	"                ",
-	"                "
-};
-	
-
-#define PARENT_TYPE GTK_TYPE_FRAME
-static GtkFrameClass *parent_class = NULL;
-
-struct _ETitleBarPrivate {
-	ETitleBarButtonMode button_mode;
-	GtkWidget *label;
-	GtkWidget *button;
-	GtkWidget *close_gtk_pixmap;
-	GtkWidget *pin_gtk_pixmap;
-};
-
-
-/* Mode handling.  We put both the close and pin GtkPixmaps into an hbox in the
-   button, and hide one of them according to the mode.  */
-
-static void
-show_and_hide_pixmaps_according_to_mode (ETitleBar *title_bar)
-{
-	ETitleBarPrivate *priv;
-
-	priv = title_bar->priv;
-
-	if (priv->close_gtk_pixmap == NULL || priv->pin_gtk_pixmap == NULL)
-		return;
-
-	switch (priv->button_mode) {
-	case E_TITLE_BAR_BUTTON_MODE_PIN:
-		gtk_widget_hide (priv->close_gtk_pixmap);
-		gtk_widget_show (priv->pin_gtk_pixmap);
-		break;
-	case E_TITLE_BAR_BUTTON_MODE_CLOSE:
-		gtk_widget_hide (priv->pin_gtk_pixmap);
-		gtk_widget_show (priv->close_gtk_pixmap);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-/* Child signal callbacks.  */
-
-static void
-button_realize_cb (GtkWidget *widget,
-		   gpointer data)
-{
-	GdkPixmap *close_pixmap;
-	GdkBitmap *close_mask;
-	GdkPixmap *pin_pixmap;
-	GdkBitmap *pin_mask;
-	GtkWidget *hbox;
-	ETitleBar *title_bar;
-	ETitleBarPrivate *priv;
-
-	title_bar = E_TITLE_BAR (data);
-	priv = title_bar->priv;
-
-	if (priv->close_gtk_pixmap != NULL)
-		return;
-
-	close_pixmap = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (priv->button)->window,
-						     &close_mask, NULL, close_xpm);
-	priv->close_gtk_pixmap = gtk_pixmap_new (close_pixmap, close_mask);
-
-	pin_pixmap = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (priv->button)->window,
-						   &pin_mask, NULL, pin_xpm);
-	priv->pin_gtk_pixmap = gtk_pixmap_new (pin_pixmap, pin_mask);
-
-	hbox = gtk_hbox_new (TRUE, 0);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->pin_gtk_pixmap, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->close_gtk_pixmap, TRUE, TRUE, 0);
-
-	gtk_container_add (GTK_CONTAINER (priv->button), hbox);
-
-	gdk_pixmap_unref (close_pixmap);
-	gdk_bitmap_unref (close_mask);
-	gdk_pixmap_unref (pin_pixmap);
-	gdk_bitmap_unref (pin_mask);
-
-	show_and_hide_pixmaps_according_to_mode (title_bar);
-}
-
-static void
-button_clicked_cb (GtkButton *button,
-		   gpointer data)
-{
-	ETitleBar *title_bar;
-
-	title_bar = E_TITLE_BAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (title_bar), signals[BUTTON_CLICKED]);
-}
-
-static void
-label_button_press_event_cb (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer data)
-{
-	ETitleBar *title_bar;
-
-	title_bar = E_TITLE_BAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (title_bar), signals[LABEL_BUTTON_PRESS_EVENT], event);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	ETitleBar *title_bar;
-	ETitleBarPrivate *priv;
-
-	title_bar = E_TITLE_BAR (object);
-	priv = title_bar->priv;
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (ETitleBarClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_frame_get_type ());
-
-	signals[LABEL_BUTTON_PRESS_EVENT] = 
-		gtk_signal_new ("label_button_press_event",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETitleBarClass, label_button_press_event),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_GDK_EVENT);
-
-	signals[BUTTON_CLICKED] = 
-		gtk_signal_new ("button_clicked",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETitleBarClass, button_clicked),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (ETitleBar *title_bar)
-{
-	ETitleBarPrivate *priv;
-
-	priv = g_new (ETitleBarPrivate, 1);
-
-	priv->button_mode      = E_TITLE_BAR_BUTTON_MODE_CLOSE;
-	priv->label            = NULL;
-	priv->button           = NULL;
-	priv->close_gtk_pixmap = NULL;
-	priv->pin_gtk_pixmap   = NULL;
-
-	title_bar->priv = priv;
-}
-
-
-void
-e_title_bar_construct (ETitleBar *title_bar,
-		       const char *title)
-{
-	ETitleBarPrivate *priv;
-	GtkWidget *hbox;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	priv = title_bar->priv;
-
-	priv->label = e_clipped_label_new (title);
-	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-	gtk_widget_show (priv->label);
-
-	priv->button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (priv->button, GTK_CAN_FOCUS);
-	gtk_container_set_border_width (GTK_CONTAINER (priv->button), 1);
-	gtk_button_set_relief (GTK_BUTTON (priv->button), GTK_RELIEF_NONE);
-	gtk_widget_show (priv->button);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->label, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->button, FALSE, TRUE, 1);
-	gtk_widget_show (hbox);
-
-	gtk_container_add (GTK_CONTAINER (title_bar), hbox);
-
-	gtk_signal_connect (GTK_OBJECT (priv->button), "realize",
-			    GTK_SIGNAL_FUNC (button_realize_cb), title_bar);
-	gtk_signal_connect (GTK_OBJECT (priv->button), "clicked",
-			    GTK_SIGNAL_FUNC (button_clicked_cb), title_bar);
-	gtk_signal_connect (GTK_OBJECT (priv->label), "button_press_event",
-			    GTK_SIGNAL_FUNC (label_button_press_event_cb), title_bar);
-}
-
-GtkWidget *
-e_title_bar_new (const char *title)
-{
-	ETitleBar *title_bar;
-
-	title_bar = gtk_type_new (e_title_bar_get_type ());
-
-	e_title_bar_construct (title_bar, title);
-
-	return GTK_WIDGET (title_bar);
-}
-
-
-void
-e_title_bar_set_title (ETitleBar *title_bar,
-		       const char *title)
-{
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	e_clipped_label_set_text (E_CLIPPED_LABEL (title_bar->priv->label), title);
-}
-
-void
-e_title_bar_show_button (ETitleBar *title_bar,
-			 gboolean show)
-{
-	ETitleBarPrivate *priv;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	priv = title_bar->priv;
-
-	if (show)
-		gtk_widget_show (priv->button);
-	else
-		gtk_widget_hide (priv->button);
-}
-
-void
-e_title_bar_set_button_mode (ETitleBar *title_bar,
-			     ETitleBarButtonMode button_mode)
-{
-	ETitleBarPrivate *priv;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-	g_return_if_fail (button_mode == E_TITLE_BAR_BUTTON_MODE_CLOSE
-			  || button_mode == E_TITLE_BAR_BUTTON_MODE_PIN);
-
-	priv = title_bar->priv;
-
-	if (priv->button_mode == button_mode)
-		return;
-
-	priv->button_mode = button_mode;
-	show_and_hide_pixmaps_according_to_mode (title_bar);
-}
-
-ETitleBarButtonMode
-e_title_bar_get_button_mode (ETitleBar *title_bar)
-{
-	g_return_val_if_fail (title_bar != NULL, E_TITLE_BAR_BUTTON_MODE_CLOSE);
-	g_return_val_if_fail (E_IS_TITLE_BAR (title_bar), E_TITLE_BAR_BUTTON_MODE_CLOSE);
-
-	return title_bar->priv->button_mode;
-}
-
-
-E_MAKE_TYPE (e_title_bar, "ETitleBar", ETitleBar, class_init, init, PARENT_TYPE)
diff --git a/widgets/misc/e-title-bar.h b/widgets/misc/e-title-bar.h
deleted file mode 100644
index f91e76c889..0000000000
--- a/widgets/misc/e-title-bar.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.h
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_TITLE_BAR_H__
-#define __E_TITLE_BAR_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkframe.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_TITLE_BAR			(e_title_bar_get_type ())
-#define E_TITLE_BAR(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_TITLE_BAR, ETitleBar))
-#define E_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TITLE_BAR, ETitleBarClass))
-#define E_IS_TITLE_BAR(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_TITLE_BAR))
-#define E_IS_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_TITLE_BAR))
-
-
-enum _ETitleBarButtonMode {
-	E_TITLE_BAR_BUTTON_MODE_PIN,
-	E_TITLE_BAR_BUTTON_MODE_CLOSE
-};
-typedef enum _ETitleBarButtonMode ETitleBarButtonMode;
-
-typedef struct _ETitleBar        ETitleBar;
-typedef struct _ETitleBarPrivate ETitleBarPrivate;
-typedef struct _ETitleBarClass   ETitleBarClass;
-
-struct _ETitleBar {
-	GtkFrame parent;
-
-	ETitleBarPrivate *priv;
-};
-
-struct _ETitleBarClass {
-	GtkFrameClass parent_class;
-
-	/* Signals.  */
-
-	void (* label_button_press_event) (ETitleBar *title_bar, GdkEventButton *event);
-	void (* button_clicked)           (ETitleBar *title_bar);
-};
-
-
-GtkType              e_title_bar_get_type         (void);
-void                 e_title_bar_construct        (ETitleBar           *title_bar,
-						   const char          *title);
-GtkWidget           *e_title_bar_new              (const char          *title);
-void                 e_title_bar_set_title        (ETitleBar           *title_bar,
-						   const char          *title);
-void                 e_title_bar_show_button      (ETitleBar           *title_bar,
-						   gboolean             show);
-void                 e_title_bar_set_button_mode  (ETitleBar           *title_bar,
-						   ETitleBarButtonMode  button_mode);
-ETitleBarButtonMode  e_title_bar_get_button_mode  (ETitleBar           *title_bar);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_TITLE_BAR_H__ */
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
deleted file mode 100644
index 13a700489f..0000000000
--- a/widgets/misc/e-unicode.c
+++ /dev/null
@@ -1,2957 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Lauris Kaplinski <lauris@helixcode.com>
- *
- * TODO: Break simple ligatures in e_utf8_strstrcasedecomp
- *
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include <unicode.h>
-#include <iconv.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
-#include "e-unicode.h"
-#include "e-font.h"
-
-#define FONT_TESTING
-#define MAX_DECOMP 8
-
-static gint e_canonical_decomposition (unicode_char_t ch, unicode_char_t * buf);
-static unicode_char_t e_stripped_char (unicode_char_t ch);
-
-/*
- * This my favourite
- *
- * strstr doing case insensitive, decomposing search
- *
- * Lauris
- */
-
-const gchar *
-e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle)
-{
-	unicode_char_t *nuni;
-	unicode_char_t unival;
-	gint nlen;
-	const guchar *o, *p;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-	if (strlen (haystack) == 0) return NULL;
-
-	nuni = alloca (sizeof (unicode_char_t) * strlen (needle));
-
-	nlen = 0;
-	for (p = unicode_get_utf8 (needle, &unival); p && unival; p = unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = e_stripped_char (unival);
-		if (sc) {
-			nuni[nlen++] = sc;
-		}
-	}
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p) return NULL;
-	/* If everything is correct, we have decomposed, lowercase, stripped needle */
-	if (nlen < 1) return haystack;
-
-	o = haystack;
-	for (p = unicode_get_utf8 (o, &unival); p && unival; p = unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = e_stripped_char (unival);
-		if (sc) {
-			/* We have valid stripped char */
-			if (sc == nuni[0]) {
-				const gchar *q = p;
-				gint npos = 1;
-				while (npos < nlen) {
-					q = unicode_get_utf8 (q, &unival);
-					if (!q || !unival) return NULL;
-					sc = e_stripped_char (unival);
-					if ((!sc) || (sc != nuni[npos])) break;
-					npos++;
-				}
-				if (npos == nlen) {
-					return p;
-				}
-			}
-		}
-		o = p;
-	}
-
-	return NULL;
-}
-
-const gchar *
-e_utf8_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	unicode_char_t *nuni;
-	unicode_char_t unival;
-	gint nlen;
-	const guchar *o, *p;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-	if (strlen (haystack) == 0) return NULL;
-
-	nuni = alloca (sizeof (unicode_char_t) * strlen (needle));
-
-	nlen = 0;
-	for (p = unicode_get_utf8 (needle, &unival); p && unival; p = unicode_get_utf8 (p, &unival)) {
-		nuni[nlen++] = unicode_tolower (unival);
-	}
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p) return NULL;
-
-	o = haystack;
-	for (p = unicode_get_utf8 (o, &unival); p && unival; p = unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = unicode_tolower (unival);
-		/* We have valid stripped char */
-		if (sc == nuni[0]) {
-			const gchar *q = p;
-			gint npos = 1;
-			while (npos < nlen) {
-				q = unicode_get_utf8 (q, &unival);
-				if (!q || !unival) return NULL;
-				sc = unicode_tolower (unival);
-				if (sc != nuni[npos]) break;
-				npos++;
-			}
-			if (npos == nlen) {
-				return p;
-			}
-		}
-		o = p;
-	}
-
-	return NULL;
-}
-
-#if 0
-const gchar *
-e_utf8_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	gchar *p;
-	unicode_char_t *huni, *nuni;
-	unicode_char_t unival;
-	gint hlen, nlen, hp, np;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-
-	huni = alloca (sizeof (unicode_char_t) * strlen (haystack));
-
-	for (hlen = 0, p = unicode_get_utf8 (haystack, &unival); p && unival; hlen++, p = unicode_get_utf8 (p, &unival)) {
-		huni[hlen] = unicode_tolower (unival);
-	}
-
-	if (!p) return NULL;
-	if (hlen == 0) return NULL;
-
-	nuni = alloca (sizeof (unicode_char_t) * strlen (needle));
-
-	for (nlen = 0, p = unicode_get_utf8 (needle, &unival); p && unival; nlen++, p = unicode_get_utf8 (p, &unival)) {
-		nuni[nlen] = unicode_tolower (unival);
-	}
-
-	if (!p) return NULL;
-	if (nlen == 0) return NULL;
-
-	if (hlen < nlen) return NULL;
-
-	for (hp = 0; hp <= hlen - nlen; hp++) {
-		for (np = 0; np < nlen; np++) {
-			if (huni[hp + np] != nuni[np]) break;
-		}
-		if (np == nlen) return haystack + unicode_offset_to_index (haystack, hp);
-	}
-
-	return NULL;
-}
-#endif
-
-gchar *
-e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string)
-{
-	gint unival;
-	gchar *utf;
-	gint unilen;
-
-	if (keyval == GDK_VoidSymbol) {
-		utf = e_utf8_from_gtk_string (widget, string);
-	} else {
-		unival = gdk_keyval_to_unicode (keyval);
-
-		if (unival < ' ') return NULL;
-
-		utf = g_new (gchar, 7);
-
-		unilen = g_unichar_to_utf8 (unival, utf);
-
-		utf[unilen] = '\0';
-	}
-
-	return utf;
-}
-
-gchar *
-e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	g_return_val_if_fail (widget != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	if (!string) return NULL;
-
-	g_return_val_if_fail (widget, NULL);
-
-	ic = e_iconv_from_gdk_font (widget->style->font);
-	if (ic == (iconv_t) -1) {
-		XFontStruct *xfs;
-		/* If iconv is missing we assume either iso-10646 or iso-8859-1 */
-		xfs = GDK_FONT_XFONT (widget->style->font);
-		if (widget->style->font->type == GDK_FONT_FONTSET || ((xfs->min_byte1 != 0) || (xfs->max_byte1 != 0))) {
-			gint i;
-			const guchar *ib;
-			guchar * ob, * new;
-			/* iso-10646 */
-			ib = string;
-			new = ob = g_new (unsigned char, bytes * 6 + 1);
-			for (i = 0; i < (bytes - 1); i += 2) {
-				ob += g_unichar_to_utf8 (ib[i] * 256 + ib[i + 1], ob);
-			}
-			*ob = '\0';
-			return new;
-		} else {
-			gint i;
-			/* iso-8859-1 */
-			ib = (char *) string;
-			new = ob = g_new (unsigned char, bytes * 2 + 1);
-			for (i = 0; i < (bytes); i ++) {
-				ob += g_unichar_to_utf8 (ib[i], ob);
-			}
-			*ob = '\0';
-			return new;
-		}
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 6 + 1);
-	obl = ibl * 6 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string)
-{
-	return e_utf8_from_gtk_string_sized (widget, string, strlen (string));
-}
-
-gchar *
-e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	g_return_val_if_fail (widget, NULL);
-
-	ic = e_iconv_to_gdk_font (widget->style->font);
-	if (ic == (iconv_t) -1) {
-		XFontStruct *xfs;
-		gboolean twobyte;
-		gint len;
-		const gchar *u;
-		unicode_char_t uc;
-		/* If iconv is missing we assume either iso-10646 or iso-8859-1 */
-		xfs = GDK_FONT_XFONT (widget->style->font);
-		twobyte = (widget->style->font->type == GDK_FONT_FONTSET || ((xfs->min_byte1 != 0) || (xfs->max_byte1 != 0)));
-
-		new = g_new (unsigned char, bytes * 4 + 1);
-		u = string;
-		len = 0;
-
-		while ((u) && (u - string < bytes)) {
-			u = unicode_get_utf8 (u, &uc);
-			if (twobyte) {
-				new[len++] = (uc & 0xff00) >> 8;
-			}
-			new[len++] = uc & 0xff;
-		}
-		new[len] = '\0';
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 4 + 1);
-	obl = ibl * 4 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string)
-{
-	return e_utf8_to_gtk_string_sized (widget, string, strlen (string));
-}
-
-gchar *
-e_utf8_from_locale_string_sized (const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	ic = e_iconv_from_locale ();
-	if (ic == (iconv_t) -1) {
-		gint i;
-		/* iso-8859-1 */
-		ib = (char *) string;
-		new = ob = g_new (unsigned char, bytes * 2 + 1);
-		for (i = 0; i < (bytes); i ++) {
-			ob += g_unichar_to_utf8 (ib[i], ob);
-		}
-		*ob = '\0';
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 6 + 1);
-	obl = ibl * 6 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_from_locale_string (const gchar *string)
-{
-	return e_utf8_from_locale_string_sized (string, strlen (string));
-}
-
-gchar *
-e_utf8_to_locale_string_sized (const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	ic = e_iconv_to_locale ();
-	if (ic == (iconv_t) -1) {
-		gint len;
-		const gchar *u;
-		unicode_char_t uc;
-
-		new = g_new (unsigned char, bytes * 4 + 1);
-		u = string;
-		len = 0;
-
-		while ((u) && (u - string < bytes)) {
-			u = unicode_get_utf8 (u, &uc);
-			new[len++] = uc & 0xff;
-		}
-		new[len] = '\0';
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 4 + 1);
-	obl = ibl * 4 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_to_locale_string (const gchar *string)
-{
-	return e_utf8_to_locale_string_sized (string, strlen (string));
-}
-
-gchar *
-e_utf8_gtk_entry_get_text (GtkEntry *entry)
-{
-	gchar *s, *u;
-
-	s = gtk_entry_get_text (entry);
-	if (!s) return NULL;
-	u = e_utf8_from_gtk_string ((GtkWidget *) entry, s);
-	return u;
-}
-
-gchar *
-e_utf8_gtk_editable_get_text (GtkEditable *editable)
-{
-	return e_utf8_gtk_editable_get_chars(editable, 0, -1);
-}
-
-gchar *
-e_utf8_gtk_editable_get_chars (GtkEditable *editable, gint start, gint end)
-{
-	gchar *s, *u;
-
-	s = gtk_editable_get_chars (editable, start, end);
-	if (!s) return NULL;
-	u = e_utf8_from_gtk_string ((GtkWidget *) editable, s);
-	g_free (s);
-	return u;
-}
-
-void
-e_utf8_gtk_editable_insert_text (GtkEditable *editable, const gchar *text, gint length, gint *position)
-{
-	gchar *s;
-
-	s = e_utf8_to_gtk_string_sized ((GtkWidget *) editable, text, length);
-
-	gtk_editable_insert_text (editable, s, length, position);
-
-	g_free (s);
-}
-
-void
-e_utf8_gtk_editable_set_text (GtkEditable *editable, const gchar *text)
-{
-	int position;
-	gtk_editable_delete_text(editable, 0, -1);
-	if (text)
-		e_utf8_gtk_editable_insert_text(editable, text, strlen(text), &position);
-}
-
-void
-e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text)
-{
-	if (!text)
-		gtk_entry_set_text(entry, "");
-	else {
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) entry, text);
-		gtk_entry_set_text (entry, s);
-		
-		if (s) g_free (s);
-	}
-}
-	
-GtkWidget *
-e_utf8_gtk_menu_item_new_with_label (GtkMenu *menu, const gchar *label)
-{
-	GtkWidget *w;
-	gchar *s;
-
-	if (!label) return NULL;
-
-	s = e_utf8_to_gtk_string ((GtkWidget *) menu, label);
-	w = gtk_menu_item_new_with_label (s);
-
-	if (s) g_free (s);
-
-	return w;
-}
-
-void
-e_utf8_gtk_clist_set_text (GtkCList *clist, gint row, gint col, const gchar *text)
-{
-	gchar *s;
-
-	if (!text) return;
-
-	s = e_utf8_to_gtk_string ((GtkWidget *) clist, text);
-	gtk_clist_set_text (clist, row, col, s);
-
-	if (s) g_free (s);
-}
-
-gint
-e_utf8_gtk_clist_append (GtkCList *clist, gchar *text[])
-{
-	gint row, i;
-	gchar **v;
-
-	if (!text) return 0;
-
-	v = g_new (gchar *, clist->columns);
-	for (i = 0; i < clist->columns; i++)
-		v[i] = e_utf8_to_gtk_string ((GtkWidget *) clist, text[i]);
-
-	row = gtk_clist_append (clist, v);
-
-	for (i = 0; i < clist->columns; i++)
-		if (v[i]) g_free (v[i]);
-
-	return row;
-}
-
-/*
- * Translate \U+XXXX\ sequences to utf8 chars
- */
-
-gchar *
-e_utf8_xml1_decode (const gchar *text)
-{
-	const guchar *c;
-	guchar *u, *d;
-	int len, s;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	len = strlen (text)+1;
-	/* len * 2 is absolute maximum */
-	u = d = g_malloc (len * 2);
-
-	c = text;
-	s = 0;
-	while (s < len) {
-		if ((s <= (len - 8)) &&
-		    (c[s    ] == '\\') &&
-		    (c[s + 1] == 'U' ) &&
-		    (c[s + 2] == '+' ) &&
-		    isxdigit (c[s + 3]) &&
-		    isxdigit (c[s + 4]) &&
-		    isxdigit (c[s + 5]) &&
-		    isxdigit (c[s + 6]) &&
-		    (c[s + 7] == '\\')) {
-			/* Valid \U+XXXX\ sequence */
-			unsigned int unival;
-			unival = strtol (c + s + 3, NULL, 16);
-			d += g_unichar_to_utf8 (unival, d);
-			s += 8;
-		} else if (c[s] > 127) {
-			/* fixme: We assume iso-8859-1 currently */
-			d += g_unichar_to_utf8 (c[s], d);
-			s += 1;
-		} else {
-			*d++ = c[s++];
-		}
-	}
-	*d++ = '\0';
-	u = g_realloc (u, (d - u));
-
-	return u;
-}
-
-gchar *
-e_utf8_xml1_encode (const gchar *text)
-{
-	guchar *u, *d, *c;
-	int unival;
-	int len;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	len = 0;
-	for (u = unicode_get_utf8 (text, &unival); u && unival; u = unicode_get_utf8 (u, &unival)) {
-		if ((unival >= 0x80) || (unival == '\\')) {
-			len += 8;
-		} else {
-			len += 1;
-		}
-	}
-	d = c = g_new (guchar, len + 1);
-
-	for (u = unicode_get_utf8 (text, &unival); u && unival; u = unicode_get_utf8 (u, &unival)) {
-		if ((unival >= 0x80) || (unival == '\\')) {
-			*c++ = '\\';
-			*c++ = 'U';
-			*c++ = '+';
-			c += sprintf (c, "%04x", unival);
-			*c++ = '\\';
-		} else {
-			*c++ = unival;
-		}
-	}
-	*c = '\0';
-
-	return d;
-}
-
-/**
- * g_unichar_to_utf8:
- * @c: a ISO10646 character code
- * @outbuf: output buffer, must have at least 6 bytes of space.
- *          If %NULL, the length will be computed and returned
- *          and nothing will be written to @out.
- * 
- * Convert a single character to utf8
- * 
- * Return value: number of bytes written
- **/
-
-gint
-g_unichar_to_utf8 (gint c, gchar *outbuf)
-{
-  size_t len = 0;
-  int first;
-  int i;
-
-  if (c < 0x80)
-    {
-      first = 0;
-      len = 1;
-    }
-  else if (c < 0x800)
-    {
-      first = 0xc0;
-      len = 2;
-    }
-  else if (c < 0x10000)
-    {
-      first = 0xe0;
-      len = 3;
-    }
-   else if (c < 0x200000)
-    {
-      first = 0xf0;
-      len = 4;
-    }
-  else if (c < 0x4000000)
-    {
-      first = 0xf8;
-      len = 5;
-    }
-  else
-    {
-      first = 0xfc;
-      len = 6;
-    }
-
-  if (outbuf)
-    {
-      for (i = len - 1; i > 0; --i)
-	{
-	  outbuf[i] = (c & 0x3f) | 0x80;
-	  c >>= 6;
-	}
-      outbuf[0] = c | first;
-    }
-
-  return len;
-}
-
-/*
- * The following is borrowed from Gtk+ 1.3
- */
-
-/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
- * mapping functions, from the xterm sources.
- */
-
-/* These tables could be compressed by contiguous ranges, but the benefit of doing so
- * is smallish. It would save about ~1000 bytes total.
- */
-
-static struct {
-  unsigned short keysym;
-  unsigned short ucs;
-} gdk_keysym_to_unicode_tab[] = {
-  { 0x01a1, 0x0104 }, /*                     Aogonek Ä„ LATIN CAPITAL LETTER A WITH OGONEK */
-  { 0x01a2, 0x02d8 }, /*                       breve ˘ BREVE */
-  { 0x01a3, 0x0141 }, /*                     Lstroke � LATIN CAPITAL LETTER L WITH STROKE */
-  { 0x01a5, 0x013d }, /*                      Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */
-  { 0x01a6, 0x015a }, /*                      Sacute Åš LATIN CAPITAL LETTER S WITH ACUTE */
-  { 0x01a9, 0x0160 }, /*                      Scaron Å  LATIN CAPITAL LETTER S WITH CARON */
-  { 0x01aa, 0x015e }, /*                    Scedilla Åž LATIN CAPITAL LETTER S WITH CEDILLA */
-  { 0x01ab, 0x0164 }, /*                      Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */
-  { 0x01ac, 0x0179 }, /*                      Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */
-  { 0x01ae, 0x017d }, /*                      Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */
-  { 0x01af, 0x017b }, /*                   Zabovedot Å» LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-  { 0x01b1, 0x0105 }, /*                     aogonek Ä… LATIN SMALL LETTER A WITH OGONEK */
-  { 0x01b2, 0x02db }, /*                      ogonek Ë› OGONEK */
-  { 0x01b3, 0x0142 }, /*                     lstroke Å‚ LATIN SMALL LETTER L WITH STROKE */
-  { 0x01b5, 0x013e }, /*                      lcaron ľ LATIN SMALL LETTER L WITH CARON */
-  { 0x01b6, 0x015b }, /*                      sacute Å› LATIN SMALL LETTER S WITH ACUTE */
-  { 0x01b7, 0x02c7 }, /*                       caron ˇ CARON */
-  { 0x01b9, 0x0161 }, /*                      scaron Å¡ LATIN SMALL LETTER S WITH CARON */
-  { 0x01ba, 0x015f }, /*                    scedilla ÅŸ LATIN SMALL LETTER S WITH CEDILLA */
-  { 0x01bb, 0x0165 }, /*                      tcaron ť LATIN SMALL LETTER T WITH CARON */
-  { 0x01bc, 0x017a }, /*                      zacute ź LATIN SMALL LETTER Z WITH ACUTE */
-  { 0x01bd, 0x02dd }, /*                 doubleacute � DOUBLE ACUTE ACCENT */
-  { 0x01be, 0x017e }, /*                      zcaron ž LATIN SMALL LETTER Z WITH CARON */
-  { 0x01bf, 0x017c }, /*                   zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */
-  { 0x01c0, 0x0154 }, /*                      Racute Å” LATIN CAPITAL LETTER R WITH ACUTE */
-  { 0x01c3, 0x0102 }, /*                      Abreve Ä‚ LATIN CAPITAL LETTER A WITH BREVE */
-  { 0x01c5, 0x0139 }, /*                      Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */
-  { 0x01c6, 0x0106 }, /*                      Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */
-  { 0x01c8, 0x010c }, /*                      Ccaron Č LATIN CAPITAL LETTER C WITH CARON */
-  { 0x01ca, 0x0118 }, /*                     Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */
-  { 0x01cc, 0x011a }, /*                      Ecaron Äš LATIN CAPITAL LETTER E WITH CARON */
-  { 0x01cf, 0x010e }, /*                      Dcaron ÄŽ LATIN CAPITAL LETTER D WITH CARON */
-  { 0x01d0, 0x0110 }, /*                     Dstroke � LATIN CAPITAL LETTER D WITH STROKE */
-  { 0x01d1, 0x0143 }, /*                      Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */
-  { 0x01d2, 0x0147 }, /*                      Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */
-  { 0x01d5, 0x0150 }, /*                Odoubleacute � LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-  { 0x01d8, 0x0158 }, /*                      Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */
-  { 0x01d9, 0x016e }, /*                       Uring Å® LATIN CAPITAL LETTER U WITH RING ABOVE */
-  { 0x01db, 0x0170 }, /*                Udoubleacute Å° LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-  { 0x01de, 0x0162 }, /*                    Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */
-  { 0x01e0, 0x0155 }, /*                      racute Å• LATIN SMALL LETTER R WITH ACUTE */
-  { 0x01e3, 0x0103 }, /*                      abreve ă LATIN SMALL LETTER A WITH BREVE */
-  { 0x01e5, 0x013a }, /*                      lacute ĺ LATIN SMALL LETTER L WITH ACUTE */
-  { 0x01e6, 0x0107 }, /*                      cacute ć LATIN SMALL LETTER C WITH ACUTE */
-  { 0x01e8, 0x010d }, /*                      ccaron � LATIN SMALL LETTER C WITH CARON */
-  { 0x01ea, 0x0119 }, /*                     eogonek Ä™ LATIN SMALL LETTER E WITH OGONEK */
-  { 0x01ec, 0x011b }, /*                      ecaron Ä› LATIN SMALL LETTER E WITH CARON */
-  { 0x01ef, 0x010f }, /*                      dcaron � LATIN SMALL LETTER D WITH CARON */
-  { 0x01f0, 0x0111 }, /*                     dstroke Ä‘ LATIN SMALL LETTER D WITH STROKE */
-  { 0x01f1, 0x0144 }, /*                      nacute Å„ LATIN SMALL LETTER N WITH ACUTE */
-  { 0x01f2, 0x0148 }, /*                      ncaron ň LATIN SMALL LETTER N WITH CARON */
-  { 0x01f5, 0x0151 }, /*                odoubleacute Å‘ LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-  { 0x01f8, 0x0159 }, /*                      rcaron Å™ LATIN SMALL LETTER R WITH CARON */
-  { 0x01f9, 0x016f }, /*                       uring ů LATIN SMALL LETTER U WITH RING ABOVE */
-  { 0x01fb, 0x0171 }, /*                udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-  { 0x01fe, 0x0163 }, /*                    tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */
-  { 0x01ff, 0x02d9 }, /*                    abovedot Ë™ DOT ABOVE */
-  { 0x02a1, 0x0126 }, /*                     Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */
-  { 0x02a6, 0x0124 }, /*                 Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-  { 0x02a9, 0x0130 }, /*                   Iabovedot Ä° LATIN CAPITAL LETTER I WITH DOT ABOVE */
-  { 0x02ab, 0x011e }, /*                      Gbreve Äž LATIN CAPITAL LETTER G WITH BREVE */
-  { 0x02ac, 0x0134 }, /*                 Jcircumflex Ä´ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-  { 0x02b1, 0x0127 }, /*                     hstroke ħ LATIN SMALL LETTER H WITH STROKE */
-  { 0x02b6, 0x0125 }, /*                 hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */
-  { 0x02b9, 0x0131 }, /*                    idotless ı LATIN SMALL LETTER DOTLESS I */
-  { 0x02bb, 0x011f }, /*                      gbreve ÄŸ LATIN SMALL LETTER G WITH BREVE */
-  { 0x02bc, 0x0135 }, /*                 jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */
-  { 0x02c5, 0x010a }, /*                   Cabovedot ÄŠ LATIN CAPITAL LETTER C WITH DOT ABOVE */
-  { 0x02c6, 0x0108 }, /*                 Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-  { 0x02d5, 0x0120 }, /*                   Gabovedot Ä  LATIN CAPITAL LETTER G WITH DOT ABOVE */
-  { 0x02d8, 0x011c }, /*                 Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-  { 0x02dd, 0x016c }, /*                      Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */
-  { 0x02de, 0x015c }, /*                 Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-  { 0x02e5, 0x010b }, /*                   cabovedot Ä‹ LATIN SMALL LETTER C WITH DOT ABOVE */
-  { 0x02e6, 0x0109 }, /*                 ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */
-  { 0x02f5, 0x0121 }, /*                   gabovedot Ä¡ LATIN SMALL LETTER G WITH DOT ABOVE */
-  { 0x02f8, 0x011d }, /*                 gcircumflex � LATIN SMALL LETTER G WITH CIRCUMFLEX */
-  { 0x02fd, 0x016d }, /*                      ubreve Å­ LATIN SMALL LETTER U WITH BREVE */
-  { 0x02fe, 0x015d }, /*                 scircumflex � LATIN SMALL LETTER S WITH CIRCUMFLEX */
-  { 0x03a2, 0x0138 }, /*                         kra ĸ LATIN SMALL LETTER KRA */
-  { 0x03a3, 0x0156 }, /*                    Rcedilla Å– LATIN CAPITAL LETTER R WITH CEDILLA */
-  { 0x03a5, 0x0128 }, /*                      Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */
-  { 0x03a6, 0x013b }, /*                    Lcedilla Ä» LATIN CAPITAL LETTER L WITH CEDILLA */
-  { 0x03aa, 0x0112 }, /*                     Emacron Ä’ LATIN CAPITAL LETTER E WITH MACRON */
-  { 0x03ab, 0x0122 }, /*                    Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */
-  { 0x03ac, 0x0166 }, /*                      Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */
-  { 0x03b3, 0x0157 }, /*                    rcedilla Å— LATIN SMALL LETTER R WITH CEDILLA */
-  { 0x03b5, 0x0129 }, /*                      itilde Ä© LATIN SMALL LETTER I WITH TILDE */
-  { 0x03b6, 0x013c }, /*                    lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */
-  { 0x03ba, 0x0113 }, /*                     emacron Ä“ LATIN SMALL LETTER E WITH MACRON */
-  { 0x03bb, 0x0123 }, /*                    gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */
-  { 0x03bc, 0x0167 }, /*                      tslash ŧ LATIN SMALL LETTER T WITH STROKE */
-  { 0x03bd, 0x014a }, /*                         ENG ÅŠ LATIN CAPITAL LETTER ENG */
-  { 0x03bf, 0x014b }, /*                         eng Å‹ LATIN SMALL LETTER ENG */
-  { 0x03c0, 0x0100 }, /*                     Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */
-  { 0x03c7, 0x012e }, /*                     Iogonek Ä® LATIN CAPITAL LETTER I WITH OGONEK */
-  { 0x03cc, 0x0116 }, /*                   Eabovedot Ä– LATIN CAPITAL LETTER E WITH DOT ABOVE */
-  { 0x03cf, 0x012a }, /*                     Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */
-  { 0x03d1, 0x0145 }, /*                    Ncedilla Å… LATIN CAPITAL LETTER N WITH CEDILLA */
-  { 0x03d2, 0x014c }, /*                     Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */
-  { 0x03d3, 0x0136 }, /*                    Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */
-  { 0x03d9, 0x0172 }, /*                     Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */
-  { 0x03dd, 0x0168 }, /*                      Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */
-  { 0x03de, 0x016a }, /*                     Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */
-  { 0x03e0, 0x0101 }, /*                     amacron � LATIN SMALL LETTER A WITH MACRON */
-  { 0x03e7, 0x012f }, /*                     iogonek į LATIN SMALL LETTER I WITH OGONEK */
-  { 0x03ec, 0x0117 }, /*                   eabovedot Ä— LATIN SMALL LETTER E WITH DOT ABOVE */
-  { 0x03ef, 0x012b }, /*                     imacron Ä« LATIN SMALL LETTER I WITH MACRON */
-  { 0x03f1, 0x0146 }, /*                    ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */
-  { 0x03f2, 0x014d }, /*                     omacron � LATIN SMALL LETTER O WITH MACRON */
-  { 0x03f3, 0x0137 }, /*                    kcedilla Ä· LATIN SMALL LETTER K WITH CEDILLA */
-  { 0x03f9, 0x0173 }, /*                     uogonek ų LATIN SMALL LETTER U WITH OGONEK */
-  { 0x03fd, 0x0169 }, /*                      utilde Å© LATIN SMALL LETTER U WITH TILDE */
-  { 0x03fe, 0x016b }, /*                     umacron Å« LATIN SMALL LETTER U WITH MACRON */
-  { 0x047e, 0x203e }, /*                    overline ‾ OVERLINE */
-  { 0x04a1, 0x3002 }, /*               kana_fullstop 。 IDEOGRAPHIC FULL STOP */
-  { 0x04a2, 0x300c }, /*         kana_openingbracket 「 LEFT CORNER BRACKET */
-  { 0x04a3, 0x300d }, /*         kana_closingbracket � RIGHT CORNER BRACKET */
-  { 0x04a4, 0x3001 }, /*                  kana_comma � IDEOGRAPHIC COMMA */
-  { 0x04a5, 0x30fb }, /*            kana_conjunctive ・ KATAKANA MIDDLE DOT */
-  { 0x04a6, 0x30f2 }, /*                     kana_WO ヲ KATAKANA LETTER WO */
-  { 0x04a7, 0x30a1 }, /*                      kana_a ã‚¡ KATAKANA LETTER SMALL A */
-  { 0x04a8, 0x30a3 }, /*                      kana_i ã‚£ KATAKANA LETTER SMALL I */
-  { 0x04a9, 0x30a5 }, /*                      kana_u ã‚¥ KATAKANA LETTER SMALL U */
-  { 0x04aa, 0x30a7 }, /*                      kana_e ェ KATAKANA LETTER SMALL E */
-  { 0x04ab, 0x30a9 }, /*                      kana_o ã‚© KATAKANA LETTER SMALL O */
-  { 0x04ac, 0x30e3 }, /*                     kana_ya ャ KATAKANA LETTER SMALL YA */
-  { 0x04ad, 0x30e5 }, /*                     kana_yu ュ KATAKANA LETTER SMALL YU */
-  { 0x04ae, 0x30e7 }, /*                     kana_yo ョ KATAKANA LETTER SMALL YO */
-  { 0x04af, 0x30c3 }, /*                    kana_tsu ッ KATAKANA LETTER SMALL TU */
-  { 0x04b0, 0x30fc }, /*              prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-  { 0x04b1, 0x30a2 }, /*                      kana_A ã‚¢ KATAKANA LETTER A */
-  { 0x04b2, 0x30a4 }, /*                      kana_I イ KATAKANA LETTER I */
-  { 0x04b3, 0x30a6 }, /*                      kana_U ウ KATAKANA LETTER U */
-  { 0x04b4, 0x30a8 }, /*                      kana_E エ KATAKANA LETTER E */
-  { 0x04b5, 0x30aa }, /*                      kana_O オ KATAKANA LETTER O */
-  { 0x04b6, 0x30ab }, /*                     kana_KA ã‚« KATAKANA LETTER KA */
-  { 0x04b7, 0x30ad }, /*                     kana_KI ã‚­ KATAKANA LETTER KI */
-  { 0x04b8, 0x30af }, /*                     kana_KU ク KATAKANA LETTER KU */
-  { 0x04b9, 0x30b1 }, /*                     kana_KE ケ KATAKANA LETTER KE */
-  { 0x04ba, 0x30b3 }, /*                     kana_KO コ KATAKANA LETTER KO */
-  { 0x04bb, 0x30b5 }, /*                     kana_SA サ KATAKANA LETTER SA */
-  { 0x04bc, 0x30b7 }, /*                    kana_SHI ã‚· KATAKANA LETTER SI */
-  { 0x04bd, 0x30b9 }, /*                     kana_SU ス KATAKANA LETTER SU */
-  { 0x04be, 0x30bb }, /*                     kana_SE ã‚» KATAKANA LETTER SE */
-  { 0x04bf, 0x30bd }, /*                     kana_SO ソ KATAKANA LETTER SO */
-  { 0x04c0, 0x30bf }, /*                     kana_TA ã‚¿ KATAKANA LETTER TA */
-  { 0x04c1, 0x30c1 }, /*                    kana_CHI � KATAKANA LETTER TI */
-  { 0x04c2, 0x30c4 }, /*                    kana_TSU ツ KATAKANA LETTER TU */
-  { 0x04c3, 0x30c6 }, /*                     kana_TE テ KATAKANA LETTER TE */
-  { 0x04c4, 0x30c8 }, /*                     kana_TO ト KATAKANA LETTER TO */
-  { 0x04c5, 0x30ca }, /*                     kana_NA ナ KATAKANA LETTER NA */
-  { 0x04c6, 0x30cb }, /*                     kana_NI ニ KATAKANA LETTER NI */
-  { 0x04c7, 0x30cc }, /*                     kana_NU ヌ KATAKANA LETTER NU */
-  { 0x04c8, 0x30cd }, /*                     kana_NE � KATAKANA LETTER NE */
-  { 0x04c9, 0x30ce }, /*                     kana_NO ノ KATAKANA LETTER NO */
-  { 0x04ca, 0x30cf }, /*                     kana_HA � KATAKANA LETTER HA */
-  { 0x04cb, 0x30d2 }, /*                     kana_HI ヒ KATAKANA LETTER HI */
-  { 0x04cc, 0x30d5 }, /*                     kana_FU フ KATAKANA LETTER HU */
-  { 0x04cd, 0x30d8 }, /*                     kana_HE ヘ KATAKANA LETTER HE */
-  { 0x04ce, 0x30db }, /*                     kana_HO ホ KATAKANA LETTER HO */
-  { 0x04cf, 0x30de }, /*                     kana_MA マ KATAKANA LETTER MA */
-  { 0x04d0, 0x30df }, /*                     kana_MI ミ KATAKANA LETTER MI */
-  { 0x04d1, 0x30e0 }, /*                     kana_MU ム KATAKANA LETTER MU */
-  { 0x04d2, 0x30e1 }, /*                     kana_ME メ KATAKANA LETTER ME */
-  { 0x04d3, 0x30e2 }, /*                     kana_MO モ KATAKANA LETTER MO */
-  { 0x04d4, 0x30e4 }, /*                     kana_YA ヤ KATAKANA LETTER YA */
-  { 0x04d5, 0x30e6 }, /*                     kana_YU ユ KATAKANA LETTER YU */
-  { 0x04d6, 0x30e8 }, /*                     kana_YO ヨ KATAKANA LETTER YO */
-  { 0x04d7, 0x30e9 }, /*                     kana_RA ラ KATAKANA LETTER RA */
-  { 0x04d8, 0x30ea }, /*                     kana_RI リ KATAKANA LETTER RI */
-  { 0x04d9, 0x30eb }, /*                     kana_RU ル KATAKANA LETTER RU */
-  { 0x04da, 0x30ec }, /*                     kana_RE レ KATAKANA LETTER RE */
-  { 0x04db, 0x30ed }, /*                     kana_RO ロ KATAKANA LETTER RO */
-  { 0x04dc, 0x30ef }, /*                     kana_WA ワ KATAKANA LETTER WA */
-  { 0x04dd, 0x30f3 }, /*                      kana_N ン KATAKANA LETTER N */
-  { 0x04de, 0x309b }, /*                 voicedsound ã‚› KATAKANA-HIRAGANA VOICED SOUND MARK */
-  { 0x04df, 0x309c }, /*             semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-  { 0x05ac, 0x060c }, /*                Arabic_comma ، ARABIC COMMA */
-  { 0x05bb, 0x061b }, /*            Arabic_semicolon Ø› ARABIC SEMICOLON */
-  { 0x05bf, 0x061f }, /*        Arabic_question_mark ØŸ ARABIC QUESTION MARK */
-  { 0x05c1, 0x0621 }, /*                Arabic_hamza Ø¡ ARABIC LETTER HAMZA */
-  { 0x05c2, 0x0622 }, /*          Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */
-  { 0x05c3, 0x0623 }, /*          Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */
-  { 0x05c4, 0x0624 }, /*           Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */
-  { 0x05c5, 0x0625 }, /*       Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */
-  { 0x05c6, 0x0626 }, /*           Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */
-  { 0x05c7, 0x0627 }, /*                 Arabic_alef ا ARABIC LETTER ALEF */
-  { 0x05c8, 0x0628 }, /*                  Arabic_beh ب ARABIC LETTER BEH */
-  { 0x05c9, 0x0629 }, /*           Arabic_tehmarbuta Ø© ARABIC LETTER TEH MARBUTA */
-  { 0x05ca, 0x062a }, /*                  Arabic_teh ت ARABIC LETTER TEH */
-  { 0x05cb, 0x062b }, /*                 Arabic_theh Ø« ARABIC LETTER THEH */
-  { 0x05cc, 0x062c }, /*                 Arabic_jeem ج ARABIC LETTER JEEM */
-  { 0x05cd, 0x062d }, /*                  Arabic_hah Ø­ ARABIC LETTER HAH */
-  { 0x05ce, 0x062e }, /*                 Arabic_khah Ø® ARABIC LETTER KHAH */
-  { 0x05cf, 0x062f }, /*                  Arabic_dal د ARABIC LETTER DAL */
-  { 0x05d0, 0x0630 }, /*                 Arabic_thal Ø° ARABIC LETTER THAL */
-  { 0x05d1, 0x0631 }, /*                   Arabic_ra ر ARABIC LETTER REH */
-  { 0x05d2, 0x0632 }, /*                 Arabic_zain ز ARABIC LETTER ZAIN */
-  { 0x05d3, 0x0633 }, /*                 Arabic_seen س ARABIC LETTER SEEN */
-  { 0x05d4, 0x0634 }, /*                Arabic_sheen Ø´ ARABIC LETTER SHEEN */
-  { 0x05d5, 0x0635 }, /*                  Arabic_sad ص ARABIC LETTER SAD */
-  { 0x05d6, 0x0636 }, /*                  Arabic_dad ض ARABIC LETTER DAD */
-  { 0x05d7, 0x0637 }, /*                  Arabic_tah Ø· ARABIC LETTER TAH */
-  { 0x05d8, 0x0638 }, /*                  Arabic_zah ظ ARABIC LETTER ZAH */
-  { 0x05d9, 0x0639 }, /*                  Arabic_ain ع ARABIC LETTER AIN */
-  { 0x05da, 0x063a }, /*                Arabic_ghain غ ARABIC LETTER GHAIN */
-  { 0x05e0, 0x0640 }, /*              Arabic_tatweel Ù€ ARABIC TATWEEL */
-  { 0x05e1, 0x0641 }, /*                  Arabic_feh Ù� ARABIC LETTER FEH */
-  { 0x05e2, 0x0642 }, /*                  Arabic_qaf Ù‚ ARABIC LETTER QAF */
-  { 0x05e3, 0x0643 }, /*                  Arabic_kaf Ùƒ ARABIC LETTER KAF */
-  { 0x05e4, 0x0644 }, /*                  Arabic_lam Ù„ ARABIC LETTER LAM */
-  { 0x05e5, 0x0645 }, /*                 Arabic_meem Ù… ARABIC LETTER MEEM */
-  { 0x05e6, 0x0646 }, /*                 Arabic_noon Ù† ARABIC LETTER NOON */
-  { 0x05e7, 0x0647 }, /*                   Arabic_ha Ù‡ ARABIC LETTER HEH */
-  { 0x05e8, 0x0648 }, /*                  Arabic_waw Ùˆ ARABIC LETTER WAW */
-  { 0x05e9, 0x0649 }, /*          Arabic_alefmaksura Ù‰ ARABIC LETTER ALEF MAKSURA */
-  { 0x05ea, 0x064a }, /*                  Arabic_yeh ÙŠ ARABIC LETTER YEH */
-  { 0x05eb, 0x064b }, /*             Arabic_fathatan Ù‹ ARABIC FATHATAN */
-  { 0x05ec, 0x064c }, /*             Arabic_dammatan ٌ ARABIC DAMMATAN */
-  { 0x05ed, 0x064d }, /*             Arabic_kasratan Ù� ARABIC KASRATAN */
-  { 0x05ee, 0x064e }, /*                Arabic_fatha ÙŽ ARABIC FATHA */
-  { 0x05ef, 0x064f }, /*                Arabic_damma Ù� ARABIC DAMMA */
-  { 0x05f0, 0x0650 }, /*                Arabic_kasra Ù� ARABIC KASRA */
-  { 0x05f1, 0x0651 }, /*               Arabic_shadda Ù‘ ARABIC SHADDA */
-  { 0x05f2, 0x0652 }, /*                Arabic_sukun Ù’ ARABIC SUKUN */
-  { 0x06a1, 0x0452 }, /*                 Serbian_dje Ñ’ CYRILLIC SMALL LETTER DJE */
-  { 0x06a2, 0x0453 }, /*               Macedonia_gje Ñ“ CYRILLIC SMALL LETTER GJE */
-  { 0x06a3, 0x0451 }, /*                 Cyrillic_io Ñ‘ CYRILLIC SMALL LETTER IO */
-  { 0x06a4, 0x0454 }, /*                Ukrainian_ie Ñ” CYRILLIC SMALL LETTER UKRAINIAN IE */
-  { 0x06a5, 0x0455 }, /*               Macedonia_dse Ñ• CYRILLIC SMALL LETTER DZE */
-  { 0x06a6, 0x0456 }, /*                 Ukrainian_i Ñ– CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06a7, 0x0457 }, /*                Ukrainian_yi Ñ— CYRILLIC SMALL LETTER YI */
-  { 0x06a8, 0x0458 }, /*                 Cyrillic_je ј CYRILLIC SMALL LETTER JE */
-  { 0x06a9, 0x0459 }, /*                Cyrillic_lje Ñ™ CYRILLIC SMALL LETTER LJE */
-  { 0x06aa, 0x045a }, /*                Cyrillic_nje Ñš CYRILLIC SMALL LETTER NJE */
-  { 0x06ab, 0x045b }, /*                Serbian_tshe Ñ› CYRILLIC SMALL LETTER TSHE */
-  { 0x06ac, 0x045c }, /*               Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */
-  { 0x06ae, 0x045e }, /*         Byelorussian_shortu Ñž CYRILLIC SMALL LETTER SHORT U */
-  { 0x06af, 0x045f }, /*               Cyrillic_dzhe ÑŸ CYRILLIC SMALL LETTER DZHE */
-  { 0x06b0, 0x2116 }, /*                  numerosign â„– NUMERO SIGN */
-  { 0x06b1, 0x0402 }, /*                 Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */
-  { 0x06b2, 0x0403 }, /*               Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */
-  { 0x06b3, 0x0401 }, /*                 Cyrillic_IO � CYRILLIC CAPITAL LETTER IO */
-  { 0x06b4, 0x0404 }, /*                Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-  { 0x06b5, 0x0405 }, /*               Macedonia_DSE Ð… CYRILLIC CAPITAL LETTER DZE */
-  { 0x06b6, 0x0406 }, /*                 Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06b7, 0x0407 }, /*                Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */
-  { 0x06b8, 0x0408 }, /*                 Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */
-  { 0x06b9, 0x0409 }, /*                Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */
-  { 0x06ba, 0x040a }, /*                Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */
-  { 0x06bb, 0x040b }, /*                Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */
-  { 0x06bc, 0x040c }, /*               Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */
-  { 0x06be, 0x040e }, /*         Byelorussian_SHORTU ÐŽ CYRILLIC CAPITAL LETTER SHORT U */
-  { 0x06bf, 0x040f }, /*               Cyrillic_DZHE � CYRILLIC CAPITAL LETTER DZHE */
-  { 0x06c0, 0x044e }, /*                 Cyrillic_yu ÑŽ CYRILLIC SMALL LETTER YU */
-  { 0x06c1, 0x0430 }, /*                  Cyrillic_a а CYRILLIC SMALL LETTER A */
-  { 0x06c2, 0x0431 }, /*                 Cyrillic_be б CYRILLIC SMALL LETTER BE */
-  { 0x06c3, 0x0446 }, /*                Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */
-  { 0x06c4, 0x0434 }, /*                 Cyrillic_de д CYRILLIC SMALL LETTER DE */
-  { 0x06c5, 0x0435 }, /*                 Cyrillic_ie е CYRILLIC SMALL LETTER IE */
-  { 0x06c6, 0x0444 }, /*                 Cyrillic_ef Ñ„ CYRILLIC SMALL LETTER EF */
-  { 0x06c7, 0x0433 }, /*                Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */
-  { 0x06c8, 0x0445 }, /*                 Cyrillic_ha Ñ… CYRILLIC SMALL LETTER HA */
-  { 0x06c9, 0x0438 }, /*                  Cyrillic_i и CYRILLIC SMALL LETTER I */
-  { 0x06ca, 0x0439 }, /*             Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */
-  { 0x06cb, 0x043a }, /*                 Cyrillic_ka к CYRILLIC SMALL LETTER KA */
-  { 0x06cc, 0x043b }, /*                 Cyrillic_el л CYRILLIC SMALL LETTER EL */
-  { 0x06cd, 0x043c }, /*                 Cyrillic_em м CYRILLIC SMALL LETTER EM */
-  { 0x06ce, 0x043d }, /*                 Cyrillic_en н CYRILLIC SMALL LETTER EN */
-  { 0x06cf, 0x043e }, /*                  Cyrillic_o о CYRILLIC SMALL LETTER O */
-  { 0x06d0, 0x043f }, /*                 Cyrillic_pe п CYRILLIC SMALL LETTER PE */
-  { 0x06d1, 0x044f }, /*                 Cyrillic_ya � CYRILLIC SMALL LETTER YA */
-  { 0x06d2, 0x0440 }, /*                 Cyrillic_er р CYRILLIC SMALL LETTER ER */
-  { 0x06d3, 0x0441 }, /*                 Cyrillic_es � CYRILLIC SMALL LETTER ES */
-  { 0x06d4, 0x0442 }, /*                 Cyrillic_te Ñ‚ CYRILLIC SMALL LETTER TE */
-  { 0x06d5, 0x0443 }, /*                  Cyrillic_u у CYRILLIC SMALL LETTER U */
-  { 0x06d6, 0x0436 }, /*                Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */
-  { 0x06d7, 0x0432 }, /*                 Cyrillic_ve в CYRILLIC SMALL LETTER VE */
-  { 0x06d8, 0x044c }, /*           Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */
-  { 0x06d9, 0x044b }, /*               Cyrillic_yeru Ñ‹ CYRILLIC SMALL LETTER YERU */
-  { 0x06da, 0x0437 }, /*                 Cyrillic_ze з CYRILLIC SMALL LETTER ZE */
-  { 0x06db, 0x0448 }, /*                Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */
-  { 0x06dc, 0x044d }, /*                  Cyrillic_e � CYRILLIC SMALL LETTER E */
-  { 0x06dd, 0x0449 }, /*              Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */
-  { 0x06de, 0x0447 }, /*                Cyrillic_che ч CYRILLIC SMALL LETTER CHE */
-  { 0x06df, 0x044a }, /*           Cyrillic_hardsign ÑŠ CYRILLIC SMALL LETTER HARD SIGN */
-  { 0x06e0, 0x042e }, /*                 Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */
-  { 0x06e1, 0x0410 }, /*                  Cyrillic_A � CYRILLIC CAPITAL LETTER A */
-  { 0x06e2, 0x0411 }, /*                 Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */
-  { 0x06e3, 0x0426 }, /*                Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */
-  { 0x06e4, 0x0414 }, /*                 Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */
-  { 0x06e5, 0x0415 }, /*                 Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */
-  { 0x06e6, 0x0424 }, /*                 Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */
-  { 0x06e7, 0x0413 }, /*                Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */
-  { 0x06e8, 0x0425 }, /*                 Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */
-  { 0x06e9, 0x0418 }, /*                  Cyrillic_I И CYRILLIC CAPITAL LETTER I */
-  { 0x06ea, 0x0419 }, /*             Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */
-  { 0x06eb, 0x041a }, /*                 Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */
-  { 0x06ec, 0x041b }, /*                 Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */
-  { 0x06ed, 0x041c }, /*                 Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */
-  { 0x06ee, 0x041d }, /*                 Cyrillic_EN � CYRILLIC CAPITAL LETTER EN */
-  { 0x06ef, 0x041e }, /*                  Cyrillic_O О CYRILLIC CAPITAL LETTER O */
-  { 0x06f0, 0x041f }, /*                 Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */
-  { 0x06f1, 0x042f }, /*                 Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */
-  { 0x06f2, 0x0420 }, /*                 Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */
-  { 0x06f3, 0x0421 }, /*                 Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */
-  { 0x06f4, 0x0422 }, /*                 Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */
-  { 0x06f5, 0x0423 }, /*                  Cyrillic_U У CYRILLIC CAPITAL LETTER U */
-  { 0x06f6, 0x0416 }, /*                Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */
-  { 0x06f7, 0x0412 }, /*                 Cyrillic_VE Ð’ CYRILLIC CAPITAL LETTER VE */
-  { 0x06f8, 0x042c }, /*           Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */
-  { 0x06f9, 0x042b }, /*               Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */
-  { 0x06fa, 0x0417 }, /*                 Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */
-  { 0x06fb, 0x0428 }, /*                Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */
-  { 0x06fc, 0x042d }, /*                  Cyrillic_E Э CYRILLIC CAPITAL LETTER E */
-  { 0x06fd, 0x0429 }, /*              Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */
-  { 0x06fe, 0x0427 }, /*                Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */
-  { 0x06ff, 0x042a }, /*           Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */
-  { 0x07a1, 0x0386 }, /*           Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */
-  { 0x07a2, 0x0388 }, /*         Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
-  { 0x07a3, 0x0389 }, /*             Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
-  { 0x07a4, 0x038a }, /*            Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
-  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-  { 0x07a7, 0x038c }, /*         Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
-  { 0x07a8, 0x038e }, /*         Greek_UPSILONaccent ÎŽ GREEK CAPITAL LETTER UPSILON WITH TONOS */
-  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ab, 0x038f }, /*           Greek_OMEGAaccent � GREEK CAPITAL LETTER OMEGA WITH TONOS */
-  { 0x07ae, 0x0385 }, /*        Greek_accentdieresis Î… GREEK DIALYTIKA TONOS */
-  { 0x07af, 0x2015 }, /*              Greek_horizbar ― HORIZONTAL BAR */
-  { 0x07b1, 0x03ac }, /*           Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
-  { 0x07b2, 0x03ad }, /*         Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
-  { 0x07b3, 0x03ae }, /*             Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */
-  { 0x07b4, 0x03af }, /*            Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */
-  { 0x07b5, 0x03ca }, /*          Greek_iotadieresis ÏŠ GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-  { 0x07b6, 0x0390 }, /*    Greek_iotaaccentdieresis � GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-  { 0x07b7, 0x03cc }, /*         Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */
-  { 0x07b8, 0x03cd }, /*         Greek_upsilonaccent � GREEK SMALL LETTER UPSILON WITH TONOS */
-  { 0x07b9, 0x03cb }, /*       Greek_upsilondieresis Ï‹ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-  { 0x07bb, 0x03ce }, /*           Greek_omegaaccent ÏŽ GREEK SMALL LETTER OMEGA WITH TONOS */
-  { 0x07c1, 0x0391 }, /*                 Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */
-  { 0x07c2, 0x0392 }, /*                  Greek_BETA Î’ GREEK CAPITAL LETTER BETA */
-  { 0x07c3, 0x0393 }, /*                 Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */
-  { 0x07c4, 0x0394 }, /*                 Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */
-  { 0x07c5, 0x0395 }, /*               Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */
-  { 0x07c6, 0x0396 }, /*                  Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */
-  { 0x07c7, 0x0397 }, /*                   Greek_ETA Η GREEK CAPITAL LETTER ETA */
-  { 0x07c8, 0x0398 }, /*                 Greek_THETA Θ GREEK CAPITAL LETTER THETA */
-  { 0x07c9, 0x0399 }, /*                  Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */
-  { 0x07ca, 0x039a }, /*                 Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */
-  { 0x07cb, 0x039b }, /*                Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */
-  { 0x07cc, 0x039c }, /*                    Greek_MU Μ GREEK CAPITAL LETTER MU */
-  { 0x07cd, 0x039d }, /*                    Greek_NU � GREEK CAPITAL LETTER NU */
-  { 0x07ce, 0x039e }, /*                    Greek_XI Ξ GREEK CAPITAL LETTER XI */
-  { 0x07cf, 0x039f }, /*               Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */
-  { 0x07d0, 0x03a0 }, /*                    Greek_PI Π GREEK CAPITAL LETTER PI */
-  { 0x07d1, 0x03a1 }, /*                   Greek_RHO Ρ GREEK CAPITAL LETTER RHO */
-  { 0x07d2, 0x03a3 }, /*                 Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */
-  { 0x07d4, 0x03a4 }, /*                   Greek_TAU Τ GREEK CAPITAL LETTER TAU */
-  { 0x07d5, 0x03a5 }, /*               Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */
-  { 0x07d6, 0x03a6 }, /*                   Greek_PHI Φ GREEK CAPITAL LETTER PHI */
-  { 0x07d7, 0x03a7 }, /*                   Greek_CHI Χ GREEK CAPITAL LETTER CHI */
-  { 0x07d8, 0x03a8 }, /*                   Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
-  { 0x07d9, 0x03a9 }, /*                 Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
-  { 0x07e1, 0x03b1 }, /*                 Greek_alpha α GREEK SMALL LETTER ALPHA */
-  { 0x07e2, 0x03b2 }, /*                  Greek_beta β GREEK SMALL LETTER BETA */
-  { 0x07e3, 0x03b3 }, /*                 Greek_gamma γ GREEK SMALL LETTER GAMMA */
-  { 0x07e4, 0x03b4 }, /*                 Greek_delta δ GREEK SMALL LETTER DELTA */
-  { 0x07e5, 0x03b5 }, /*               Greek_epsilon ε GREEK SMALL LETTER EPSILON */
-  { 0x07e6, 0x03b6 }, /*                  Greek_zeta ζ GREEK SMALL LETTER ZETA */
-  { 0x07e7, 0x03b7 }, /*                   Greek_eta η GREEK SMALL LETTER ETA */
-  { 0x07e8, 0x03b8 }, /*                 Greek_theta θ GREEK SMALL LETTER THETA */
-  { 0x07e9, 0x03b9 }, /*                  Greek_iota ι GREEK SMALL LETTER IOTA */
-  { 0x07ea, 0x03ba }, /*                 Greek_kappa κ GREEK SMALL LETTER KAPPA */
-  { 0x07eb, 0x03bb }, /*                Greek_lambda λ GREEK SMALL LETTER LAMDA */
-  { 0x07ec, 0x03bc }, /*                    Greek_mu μ GREEK SMALL LETTER MU */
-  { 0x07ed, 0x03bd }, /*                    Greek_nu ν GREEK SMALL LETTER NU */
-  { 0x07ee, 0x03be }, /*                    Greek_xi ξ GREEK SMALL LETTER XI */
-  { 0x07ef, 0x03bf }, /*               Greek_omicron ο GREEK SMALL LETTER OMICRON */
-  { 0x07f0, 0x03c0 }, /*                    Greek_pi π GREEK SMALL LETTER PI */
-  { 0x07f1, 0x03c1 }, /*                   Greek_rho � GREEK SMALL LETTER RHO */
-  { 0x07f2, 0x03c3 }, /*                 Greek_sigma σ GREEK SMALL LETTER SIGMA */
-  { 0x07f3, 0x03c2 }, /*       Greek_finalsmallsigma Ï‚ GREEK SMALL LETTER FINAL SIGMA */
-  { 0x07f4, 0x03c4 }, /*                   Greek_tau Ï„ GREEK SMALL LETTER TAU */
-  { 0x07f5, 0x03c5 }, /*               Greek_upsilon Ï… GREEK SMALL LETTER UPSILON */
-  { 0x07f6, 0x03c6 }, /*                   Greek_phi φ GREEK SMALL LETTER PHI */
-  { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
-  { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
-  { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
-/*  0x08a1                               leftradical ? ??? */
-/*  0x08a2                            topleftradical ? ??? */
-/*  0x08a3                            horizconnector ? ??? */
-  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
-  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
-  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
-/*  0x08a7                          topleftsqbracket ? ??? */
-/*  0x08a8                          botleftsqbracket ? ??? */
-/*  0x08a9                         toprightsqbracket ? ??? */
-/*  0x08aa                         botrightsqbracket ? ??? */
-/*  0x08ab                             topleftparens ? ??? */
-/*  0x08ac                             botleftparens ? ??? */
-/*  0x08ad                            toprightparens ? ??? */
-/*  0x08ae                            botrightparens ? ??? */
-/*  0x08af                      leftmiddlecurlybrace ? ??? */
-/*  0x08b0                     rightmiddlecurlybrace ? ??? */
-/*  0x08b1                          topleftsummation ? ??? */
-/*  0x08b2                          botleftsummation ? ??? */
-/*  0x08b3                 topvertsummationconnector ? ??? */
-/*  0x08b4                 botvertsummationconnector ? ??? */
-/*  0x08b5                         toprightsummation ? ??? */
-/*  0x08b6                         botrightsummation ? ??? */
-/*  0x08b7                      rightmiddlesummation ? ??? */
-  { 0x08bc, 0x2264 }, /*               lessthanequal ≤ LESS-THAN OR EQUAL TO */
-  { 0x08bd, 0x2260 }, /*                    notequal ≠ NOT EQUAL TO */
-  { 0x08be, 0x2265 }, /*            greaterthanequal ≥ GREATER-THAN OR EQUAL TO */
-  { 0x08bf, 0x222b }, /*                    integral ∫ INTEGRAL */
-  { 0x08c0, 0x2234 }, /*                   therefore ∴ THEREFORE */
-  { 0x08c1, 0x221d }, /*                   variation � PROPORTIONAL TO */
-  { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
-  { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
-  { 0x08c8, 0x2245 }, /*                 approximate ≅ APPROXIMATELY EQUAL TO */
-/*  0x08c9                              similarequal ? ??? */
-  { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
-  { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
-  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
-  { 0x08d6, 0x221a }, /*                     radical √ SQUARE ROOT */
-  { 0x08da, 0x2282 }, /*                  includedin ⊂ SUBSET OF */
-  { 0x08db, 0x2283 }, /*                    includes ⊃ SUPERSET OF */
-  { 0x08dc, 0x2229 }, /*                intersection ∩ INTERSECTION */
-  { 0x08dd, 0x222a }, /*                       union ∪ UNION */
-  { 0x08de, 0x2227 }, /*                  logicaland ∧ LOGICAL AND */
-  { 0x08df, 0x2228 }, /*                   logicalor ∨ LOGICAL OR */
-  { 0x08ef, 0x2202 }, /*           partialderivative ∂ PARTIAL DIFFERENTIAL */
-  { 0x08f6, 0x0192 }, /*                    function Æ’ LATIN SMALL LETTER F WITH HOOK */
-  { 0x08fb, 0x2190 }, /*                   leftarrow � LEFTWARDS ARROW */
-  { 0x08fc, 0x2191 }, /*                     uparrow ↑ UPWARDS ARROW */
-  { 0x08fd, 0x2192 }, /*                  rightarrow → RIGHTWARDS ARROW */
-  { 0x08fe, 0x2193 }, /*                   downarrow ↓ DOWNWARDS ARROW */
-  { 0x09df, 0x2422 }, /*                       blank � BLANK SYMBOL */
-  { 0x09e0, 0x25c6 }, /*                soliddiamond â—† BLACK DIAMOND */
-  { 0x09e1, 0x2592 }, /*                checkerboard â–’ MEDIUM SHADE */
-  { 0x09e2, 0x2409 }, /*                          ht � SYMBOL FOR HORIZONTAL TABULATION */
-  { 0x09e3, 0x240c }, /*                          ff � SYMBOL FOR FORM FEED */
-  { 0x09e4, 0x240d }, /*                          cr � SYMBOL FOR CARRIAGE RETURN */
-  { 0x09e5, 0x240a }, /*                          lf � SYMBOL FOR LINE FEED */
-  { 0x09e8, 0x2424 }, /*                          nl � SYMBOL FOR NEWLINE */
-  { 0x09e9, 0x240b }, /*                          vt � SYMBOL FOR VERTICAL TABULATION */
-  { 0x09ea, 0x2518 }, /*              lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */
-  { 0x09eb, 0x2510 }, /*               uprightcorner � BOX DRAWINGS LIGHT DOWN AND LEFT */
-  { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
-  { 0x09ed, 0x2514 }, /*               lowleftcorner â”” BOX DRAWINGS LIGHT UP AND RIGHT */
-  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-/*  0x09ef                            horizlinescan1 ? ??? */
-/*  0x09f0                            horizlinescan3 ? ??? */
-  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
-/*  0x09f2                            horizlinescan7 ? ??? */
-/*  0x09f3                            horizlinescan9 ? ??? */
-  { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-  { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-  { 0x09f6, 0x2534 }, /*                        bott â”´ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-  { 0x09f7, 0x252c }, /*                        topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-  { 0x09f8, 0x2502 }, /*                     vertbar │ BOX DRAWINGS LIGHT VERTICAL */
-  { 0x0aa1, 0x2003 }, /*                     emspace   EM SPACE */
-  { 0x0aa2, 0x2002 }, /*                     enspace   EN SPACE */
-  { 0x0aa3, 0x2004 }, /*                    em3space   THREE-PER-EM SPACE */
-  { 0x0aa4, 0x2005 }, /*                    em4space   FOUR-PER-EM SPACE */
-  { 0x0aa5, 0x2007 }, /*                  digitspace   FIGURE SPACE */
-  { 0x0aa6, 0x2008 }, /*                  punctspace   PUNCTUATION SPACE */
-  { 0x0aa7, 0x2009 }, /*                   thinspace   THIN SPACE */
-  { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
-  { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
-  { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
-/*  0x0aac                               signifblank ? ??? */
-  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-/*  0x0aaf                           doubbaselinedot ? ??? */
-  { 0x0ab0, 0x2153 }, /*                    onethird â…“ VULGAR FRACTION ONE THIRD */
-  { 0x0ab1, 0x2154 }, /*                   twothirds â…” VULGAR FRACTION TWO THIRDS */
-  { 0x0ab2, 0x2155 }, /*                    onefifth â…• VULGAR FRACTION ONE FIFTH */
-  { 0x0ab3, 0x2156 }, /*                   twofifths â…– VULGAR FRACTION TWO FIFTHS */
-  { 0x0ab4, 0x2157 }, /*                 threefifths â…— VULGAR FRACTION THREE FIFTHS */
-  { 0x0ab5, 0x2158 }, /*                  fourfifths â…˜ VULGAR FRACTION FOUR FIFTHS */
-  { 0x0ab6, 0x2159 }, /*                    onesixth â…™ VULGAR FRACTION ONE SIXTH */
-  { 0x0ab7, 0x215a }, /*                  fivesixths â…š VULGAR FRACTION FIVE SIXTHS */
-  { 0x0ab8, 0x2105 }, /*                      careof â„… CARE OF */
-  { 0x0abb, 0x2012 }, /*                     figdash ‒ FIGURE DASH */
-  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
-  { 0x0abd, 0x002e }, /*                decimalpoint . FULL STOP */
-  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
-/*  0x0abf                                    marker ? ??? */
-  { 0x0ac3, 0x215b }, /*                   oneeighth â…› VULGAR FRACTION ONE EIGHTH */
-  { 0x0ac4, 0x215c }, /*                threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
-  { 0x0ac5, 0x215d }, /*                 fiveeighths â…� VULGAR FRACTION FIVE EIGHTHS */
-  { 0x0ac6, 0x215e }, /*                seveneighths â…ž VULGAR FRACTION SEVEN EIGHTHS */
-  { 0x0ac9, 0x2122 }, /*                   trademark â„¢ TRADE MARK SIGN */
-  { 0x0aca, 0x2613 }, /*               signaturemark ☓ SALTIRE */
-/*  0x0acb                         trademarkincircle ? ??? */
-  { 0x0acc, 0x25c1 }, /*            leftopentriangle â—� WHITE LEFT-POINTING TRIANGLE */
-  { 0x0acd, 0x25b7 }, /*           rightopentriangle â–· WHITE RIGHT-POINTING TRIANGLE */
-  { 0x0ace, 0x25cb }, /*                emopencircle â—‹ WHITE CIRCLE */
-  { 0x0acf, 0x25a1 }, /*             emopenrectangle â–¡ WHITE SQUARE */
-  { 0x0ad0, 0x2018 }, /*         leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
-  { 0x0ad1, 0x2019 }, /*        rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
-  { 0x0ad2, 0x201c }, /*         leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
-  { 0x0ad3, 0x201d }, /*        rightdoublequotemark � RIGHT DOUBLE QUOTATION MARK */
-  { 0x0ad4, 0x211e }, /*                prescription â„ž PRESCRIPTION TAKE */
-  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
-  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
-  { 0x0ad9, 0x271d }, /*                  latincross � LATIN CROSS */
-/*  0x0ada                                  hexagram ? ??? */
-  { 0x0adb, 0x25ac }, /*            filledrectbullet â–¬ BLACK RECTANGLE */
-  { 0x0adc, 0x25c0 }, /*         filledlefttribullet â—€ BLACK LEFT-POINTING TRIANGLE */
-  { 0x0add, 0x25b6 }, /*        filledrighttribullet â–¶ BLACK RIGHT-POINTING TRIANGLE */
-  { 0x0ade, 0x25cf }, /*              emfilledcircle â—� BLACK CIRCLE */
-  { 0x0adf, 0x25a0 }, /*                emfilledrect â–  BLACK SQUARE */
-  { 0x0ae0, 0x25e6 }, /*            enopencircbullet â—¦ WHITE BULLET */
-  { 0x0ae1, 0x25ab }, /*          enopensquarebullet â–« WHITE SMALL SQUARE */
-  { 0x0ae2, 0x25ad }, /*              openrectbullet â–­ WHITE RECTANGLE */
-  { 0x0ae3, 0x25b3 }, /*             opentribulletup â–³ WHITE UP-POINTING TRIANGLE */
-  { 0x0ae4, 0x25bd }, /*           opentribulletdown â–½ WHITE DOWN-POINTING TRIANGLE */
-  { 0x0ae5, 0x2606 }, /*                    openstar ☆ WHITE STAR */
-  { 0x0ae6, 0x2022 }, /*          enfilledcircbullet • BULLET */
-  { 0x0ae7, 0x25aa }, /*            enfilledsqbullet â–ª BLACK SMALL SQUARE */
-  { 0x0ae8, 0x25b2 }, /*           filledtribulletup â–² BLACK UP-POINTING TRIANGLE */
-  { 0x0ae9, 0x25bc }, /*         filledtribulletdown â–¼ BLACK DOWN-POINTING TRIANGLE */
-  { 0x0aea, 0x261c }, /*                 leftpointer ☜ WHITE LEFT POINTING INDEX */
-  { 0x0aeb, 0x261e }, /*                rightpointer ☞ WHITE RIGHT POINTING INDEX */
-  { 0x0aec, 0x2663 }, /*                        club ♣ BLACK CLUB SUIT */
-  { 0x0aed, 0x2666 }, /*                     diamond ♦ BLACK DIAMOND SUIT */
-  { 0x0aee, 0x2665 }, /*                       heart ♥ BLACK HEART SUIT */
-  { 0x0af0, 0x2720 }, /*                maltesecross ✠ MALTESE CROSS */
-  { 0x0af1, 0x2020 }, /*                      dagger † DAGGER */
-  { 0x0af2, 0x2021 }, /*                doubledagger ‡ DOUBLE DAGGER */
-  { 0x0af3, 0x2713 }, /*                   checkmark ✓ CHECK MARK */
-  { 0x0af4, 0x2717 }, /*                 ballotcross ✗ BALLOT X */
-  { 0x0af5, 0x266f }, /*                musicalsharp ♯ MUSIC SHARP SIGN */
-  { 0x0af6, 0x266d }, /*                 musicalflat â™­ MUSIC FLAT SIGN */
-  { 0x0af7, 0x2642 }, /*                  malesymbol ♂ MALE SIGN */
-  { 0x0af8, 0x2640 }, /*                femalesymbol ♀ FEMALE SIGN */
-  { 0x0af9, 0x260e }, /*                   telephone ☎ BLACK TELEPHONE */
-  { 0x0afa, 0x2315 }, /*           telephonerecorder ⌕ TELEPHONE RECORDER */
-  { 0x0afb, 0x2117 }, /*         phonographcopyright â„— SOUND RECORDING COPYRIGHT */
-  { 0x0afc, 0x2038 }, /*                       caret ‸ CARET */
-  { 0x0afd, 0x201a }, /*          singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */
-  { 0x0afe, 0x201e }, /*          doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */
-/*  0x0aff                                    cursor ? ??? */
-  { 0x0ba3, 0x003c }, /*                   leftcaret < LESS-THAN SIGN */
-  { 0x0ba6, 0x003e }, /*                  rightcaret > GREATER-THAN SIGN */
-  { 0x0ba8, 0x2228 }, /*                   downcaret ∨ LOGICAL OR */
-  { 0x0ba9, 0x2227 }, /*                     upcaret ∧ LOGICAL AND */
-  { 0x0bc0, 0x00af }, /*                     overbar ¯ MACRON */
-  { 0x0bc2, 0x22a4 }, /*                    downtack ⊤ DOWN TACK */
-  { 0x0bc3, 0x2229 }, /*                      upshoe ∩ INTERSECTION */
-  { 0x0bc4, 0x230a }, /*                   downstile ⌊ LEFT FLOOR */
-  { 0x0bc6, 0x005f }, /*                    underbar _ LOW LINE */
-  { 0x0bca, 0x2218 }, /*                         jot ∘ RING OPERATOR */
-  { 0x0bcc, 0x2395 }, /*                        quad ⎕ APL FUNCTIONAL SYMBOL QUAD (Unicode 3.0) */
-  { 0x0bce, 0x22a5 }, /*                      uptack ⊥ UP TACK */
-  { 0x0bcf, 0x25cb }, /*                      circle â—‹ WHITE CIRCLE */
-  { 0x0bd3, 0x2308 }, /*                     upstile ⌈ LEFT CEILING */
-  { 0x0bd6, 0x222a }, /*                    downshoe ∪ UNION */
-  { 0x0bd8, 0x2283 }, /*                   rightshoe ⊃ SUPERSET OF */
-  { 0x0bda, 0x2282 }, /*                    leftshoe ⊂ SUBSET OF */
-  { 0x0bdc, 0x22a3 }, /*                    lefttack ⊣ LEFT TACK */
-  { 0x0bfc, 0x22a2 }, /*                   righttack ⊢ RIGHT TACK */
-  { 0x0cdf, 0x2017 }, /*        hebrew_doublelowline ‗ DOUBLE LOW LINE */
-  { 0x0ce0, 0x05d0 }, /*                hebrew_aleph � HEBREW LETTER ALEF */
-  { 0x0ce1, 0x05d1 }, /*                  hebrew_bet ב HEBREW LETTER BET */
-  { 0x0ce2, 0x05d2 }, /*                hebrew_gimel ×’ HEBREW LETTER GIMEL */
-  { 0x0ce3, 0x05d3 }, /*                hebrew_dalet ד HEBREW LETTER DALET */
-  { 0x0ce4, 0x05d4 }, /*                   hebrew_he ×” HEBREW LETTER HE */
-  { 0x0ce5, 0x05d5 }, /*                  hebrew_waw ו HEBREW LETTER VAV */
-  { 0x0ce6, 0x05d6 }, /*                 hebrew_zain ×– HEBREW LETTER ZAYIN */
-  { 0x0ce7, 0x05d7 }, /*                 hebrew_chet ×— HEBREW LETTER HET */
-  { 0x0ce8, 0x05d8 }, /*                  hebrew_tet ט HEBREW LETTER TET */
-  { 0x0ce9, 0x05d9 }, /*                  hebrew_yod ×™ HEBREW LETTER YOD */
-  { 0x0cea, 0x05da }, /*            hebrew_finalkaph ך HEBREW LETTER FINAL KAF */
-  { 0x0ceb, 0x05db }, /*                 hebrew_kaph ×› HEBREW LETTER KAF */
-  { 0x0cec, 0x05dc }, /*                hebrew_lamed ל HEBREW LETTER LAMED */
-  { 0x0ced, 0x05dd }, /*             hebrew_finalmem � HEBREW LETTER FINAL MEM */
-  { 0x0cee, 0x05de }, /*                  hebrew_mem מ HEBREW LETTER MEM */
-  { 0x0cef, 0x05df }, /*             hebrew_finalnun ן HEBREW LETTER FINAL NUN */
-  { 0x0cf0, 0x05e0 }, /*                  hebrew_nun ×  HEBREW LETTER NUN */
-  { 0x0cf1, 0x05e1 }, /*               hebrew_samech ס HEBREW LETTER SAMEKH */
-  { 0x0cf2, 0x05e2 }, /*                 hebrew_ayin ×¢ HEBREW LETTER AYIN */
-  { 0x0cf3, 0x05e3 }, /*              hebrew_finalpe ×£ HEBREW LETTER FINAL PE */
-  { 0x0cf4, 0x05e4 }, /*                   hebrew_pe פ HEBREW LETTER PE */
-  { 0x0cf5, 0x05e5 }, /*            hebrew_finalzade ×¥ HEBREW LETTER FINAL TSADI */
-  { 0x0cf6, 0x05e6 }, /*                 hebrew_zade צ HEBREW LETTER TSADI */
-  { 0x0cf7, 0x05e7 }, /*                 hebrew_qoph ק HEBREW LETTER QOF */
-  { 0x0cf8, 0x05e8 }, /*                 hebrew_resh ר HEBREW LETTER RESH */
-  { 0x0cf9, 0x05e9 }, /*                 hebrew_shin ש HEBREW LETTER SHIN */
-  { 0x0cfa, 0x05ea }, /*                  hebrew_taw ת HEBREW LETTER TAV */
-  { 0x0da1, 0x0e01 }, /*                  Thai_kokai � THAI CHARACTER KO KAI */
-  { 0x0da2, 0x0e02 }, /*                Thai_khokhai ข THAI CHARACTER KHO KHAI */
-  { 0x0da3, 0x0e03 }, /*               Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */
-  { 0x0da4, 0x0e04 }, /*               Thai_khokhwai ค THAI CHARACTER KHO KHWAI */
-  { 0x0da5, 0x0e05 }, /*                Thai_khokhon ฅ THAI CHARACTER KHO KHON */
-  { 0x0da6, 0x0e06 }, /*             Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */
-  { 0x0da7, 0x0e07 }, /*                 Thai_ngongu ง THAI CHARACTER NGO NGU */
-  { 0x0da8, 0x0e08 }, /*                Thai_chochan จ THAI CHARACTER CHO CHAN */
-  { 0x0da9, 0x0e09 }, /*               Thai_choching ฉ THAI CHARACTER CHO CHING */
-  { 0x0daa, 0x0e0a }, /*               Thai_chochang ช THAI CHARACTER CHO CHANG */
-  { 0x0dab, 0x0e0b }, /*                   Thai_soso ซ THAI CHARACTER SO SO */
-  { 0x0dac, 0x0e0c }, /*                Thai_chochoe ฌ THAI CHARACTER CHO CHOE */
-  { 0x0dad, 0x0e0d }, /*                 Thai_yoying � THAI CHARACTER YO YING */
-  { 0x0dae, 0x0e0e }, /*                Thai_dochada ฎ THAI CHARACTER DO CHADA */
-  { 0x0daf, 0x0e0f }, /*                Thai_topatak � THAI CHARACTER TO PATAK */
-  { 0x0db0, 0x0e10 }, /*                Thai_thothan � THAI CHARACTER THO THAN */
-  { 0x0db1, 0x0e11 }, /*          Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */
-  { 0x0db2, 0x0e12 }, /*             Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */
-  { 0x0db3, 0x0e13 }, /*                  Thai_nonen ณ THAI CHARACTER NO NEN */
-  { 0x0db4, 0x0e14 }, /*                  Thai_dodek ด THAI CHARACTER DO DEK */
-  { 0x0db5, 0x0e15 }, /*                  Thai_totao ต THAI CHARACTER TO TAO */
-  { 0x0db6, 0x0e16 }, /*               Thai_thothung ถ THAI CHARACTER THO THUNG */
-  { 0x0db7, 0x0e17 }, /*              Thai_thothahan ท THAI CHARACTER THO THAHAN */
-  { 0x0db8, 0x0e18 }, /*               Thai_thothong ธ THAI CHARACTER THO THONG */
-  { 0x0db9, 0x0e19 }, /*                   Thai_nonu น THAI CHARACTER NO NU */
-  { 0x0dba, 0x0e1a }, /*               Thai_bobaimai บ THAI CHARACTER BO BAIMAI */
-  { 0x0dbb, 0x0e1b }, /*                  Thai_popla ป THAI CHARACTER PO PLA */
-  { 0x0dbc, 0x0e1c }, /*               Thai_phophung ผ THAI CHARACTER PHO PHUNG */
-  { 0x0dbd, 0x0e1d }, /*                   Thai_fofa � THAI CHARACTER FO FA */
-  { 0x0dbe, 0x0e1e }, /*                Thai_phophan พ THAI CHARACTER PHO PHAN */
-  { 0x0dbf, 0x0e1f }, /*                  Thai_fofan ฟ THAI CHARACTER FO FAN */
-  { 0x0dc0, 0x0e20 }, /*             Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */
-  { 0x0dc1, 0x0e21 }, /*                   Thai_moma ม THAI CHARACTER MO MA */
-  { 0x0dc2, 0x0e22 }, /*                  Thai_yoyak ย THAI CHARACTER YO YAK */
-  { 0x0dc3, 0x0e23 }, /*                  Thai_rorua ร THAI CHARACTER RO RUA */
-  { 0x0dc4, 0x0e24 }, /*                     Thai_ru ฤ THAI CHARACTER RU */
-  { 0x0dc5, 0x0e25 }, /*                 Thai_loling ล THAI CHARACTER LO LING */
-  { 0x0dc6, 0x0e26 }, /*                     Thai_lu ฦ THAI CHARACTER LU */
-  { 0x0dc7, 0x0e27 }, /*                 Thai_wowaen ว THAI CHARACTER WO WAEN */
-  { 0x0dc8, 0x0e28 }, /*                 Thai_sosala ศ THAI CHARACTER SO SALA */
-  { 0x0dc9, 0x0e29 }, /*                 Thai_sorusi ษ THAI CHARACTER SO RUSI */
-  { 0x0dca, 0x0e2a }, /*                  Thai_sosua ส THAI CHARACTER SO SUA */
-  { 0x0dcb, 0x0e2b }, /*                  Thai_hohip ห THAI CHARACTER HO HIP */
-  { 0x0dcc, 0x0e2c }, /*                Thai_lochula ฬ THAI CHARACTER LO CHULA */
-  { 0x0dcd, 0x0e2d }, /*                   Thai_oang อ THAI CHARACTER O ANG */
-  { 0x0dce, 0x0e2e }, /*               Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */
-  { 0x0dcf, 0x0e2f }, /*              Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */
-  { 0x0dd0, 0x0e30 }, /*                  Thai_saraa ะ THAI CHARACTER SARA A */
-  { 0x0dd1, 0x0e31 }, /*             Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */
-  { 0x0dd2, 0x0e32 }, /*                 Thai_saraaa า THAI CHARACTER SARA AA */
-  { 0x0dd3, 0x0e33 }, /*                 Thai_saraam ำ THAI CHARACTER SARA AM */
-  { 0x0dd4, 0x0e34 }, /*                  Thai_sarai ิ THAI CHARACTER SARA I */
-  { 0x0dd5, 0x0e35 }, /*                 Thai_saraii ี THAI CHARACTER SARA II */
-  { 0x0dd6, 0x0e36 }, /*                 Thai_saraue ึ THAI CHARACTER SARA UE */
-  { 0x0dd7, 0x0e37 }, /*                Thai_sarauee ื THAI CHARACTER SARA UEE */
-  { 0x0dd8, 0x0e38 }, /*                  Thai_sarau ุ THAI CHARACTER SARA U */
-  { 0x0dd9, 0x0e39 }, /*                 Thai_sarauu ู THAI CHARACTER SARA UU */
-  { 0x0dda, 0x0e3a }, /*                Thai_phinthu ฺ THAI CHARACTER PHINTHU */
-  { 0x0dde, 0x0e3e }, /*      Thai_maihanakat_maitho ฾ ??? */
-  { 0x0ddf, 0x0e3f }, /*                   Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */
-  { 0x0de0, 0x0e40 }, /*                  Thai_sarae เ THAI CHARACTER SARA E */
-  { 0x0de1, 0x0e41 }, /*                 Thai_saraae � THAI CHARACTER SARA AE */
-  { 0x0de2, 0x0e42 }, /*                  Thai_sarao โ THAI CHARACTER SARA O */
-  { 0x0de3, 0x0e43 }, /*          Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */
-  { 0x0de4, 0x0e44 }, /*         Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */
-  { 0x0de5, 0x0e45 }, /*            Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */
-  { 0x0de6, 0x0e46 }, /*               Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */
-  { 0x0de7, 0x0e47 }, /*              Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */
-  { 0x0de8, 0x0e48 }, /*                  Thai_maiek ่ THAI CHARACTER MAI EK */
-  { 0x0de9, 0x0e49 }, /*                 Thai_maitho ้ THAI CHARACTER MAI THO */
-  { 0x0dea, 0x0e4a }, /*                 Thai_maitri ๊ THAI CHARACTER MAI TRI */
-  { 0x0deb, 0x0e4b }, /*            Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */
-  { 0x0dec, 0x0e4c }, /*            Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */
-  { 0x0ded, 0x0e4d }, /*               Thai_nikhahit � THAI CHARACTER NIKHAHIT */
-  { 0x0df0, 0x0e50 }, /*                 Thai_leksun � THAI DIGIT ZERO */
-  { 0x0df1, 0x0e51 }, /*                Thai_leknung ๑ THAI DIGIT ONE */
-  { 0x0df2, 0x0e52 }, /*                Thai_leksong ๒ THAI DIGIT TWO */
-  { 0x0df3, 0x0e53 }, /*                 Thai_leksam ๓ THAI DIGIT THREE */
-  { 0x0df4, 0x0e54 }, /*                  Thai_leksi ๔ THAI DIGIT FOUR */
-  { 0x0df5, 0x0e55 }, /*                  Thai_lekha ๕ THAI DIGIT FIVE */
-  { 0x0df6, 0x0e56 }, /*                 Thai_lekhok ๖ THAI DIGIT SIX */
-  { 0x0df7, 0x0e57 }, /*                Thai_lekchet ๗ THAI DIGIT SEVEN */
-  { 0x0df8, 0x0e58 }, /*                Thai_lekpaet ๘ THAI DIGIT EIGHT */
-  { 0x0df9, 0x0e59 }, /*                 Thai_lekkao ๙ THAI DIGIT NINE */
-  { 0x0ea1, 0x3131 }, /*               Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */
-  { 0x0ea2, 0x3132 }, /*          Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */
-  { 0x0ea3, 0x3133 }, /*           Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */
-  { 0x0ea4, 0x3134 }, /*                Hangul_Nieun ã„´ HANGUL LETTER NIEUN */
-  { 0x0ea5, 0x3135 }, /*           Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */
-  { 0x0ea6, 0x3136 }, /*           Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */
-  { 0x0ea7, 0x3137 }, /*               Hangul_Dikeud ã„· HANGUL LETTER TIKEUT */
-  { 0x0ea8, 0x3138 }, /*          Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */
-  { 0x0ea9, 0x3139 }, /*                Hangul_Rieul ㄹ HANGUL LETTER RIEUL */
-  { 0x0eaa, 0x313a }, /*          Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */
-  { 0x0eab, 0x313b }, /*           Hangul_RieulMieum ã„» HANGUL LETTER RIEUL-MIEUM */
-  { 0x0eac, 0x313c }, /*           Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */
-  { 0x0ead, 0x313d }, /*            Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */
-  { 0x0eae, 0x313e }, /*           Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */
-  { 0x0eaf, 0x313f }, /*          Hangul_RieulPhieuf ã„¿ HANGUL LETTER RIEUL-PHIEUPH */
-  { 0x0eb0, 0x3140 }, /*           Hangul_RieulHieuh ã…€ HANGUL LETTER RIEUL-HIEUH */
-  { 0x0eb1, 0x3141 }, /*                Hangul_Mieum ã…� HANGUL LETTER MIEUM */
-  { 0x0eb2, 0x3142 }, /*                Hangul_Pieub ã…‚ HANGUL LETTER PIEUP */
-  { 0x0eb3, 0x3143 }, /*           Hangul_SsangPieub ã…ƒ HANGUL LETTER SSANGPIEUP */
-  { 0x0eb4, 0x3144 }, /*            Hangul_PieubSios ã…„ HANGUL LETTER PIEUP-SIOS */
-  { 0x0eb5, 0x3145 }, /*                 Hangul_Sios ã…… HANGUL LETTER SIOS */
-  { 0x0eb6, 0x3146 }, /*            Hangul_SsangSios ã…† HANGUL LETTER SSANGSIOS */
-  { 0x0eb7, 0x3147 }, /*                Hangul_Ieung ã…‡ HANGUL LETTER IEUNG */
-  { 0x0eb8, 0x3148 }, /*                Hangul_Jieuj ã…ˆ HANGUL LETTER CIEUC */
-  { 0x0eb9, 0x3149 }, /*           Hangul_SsangJieuj ã…‰ HANGUL LETTER SSANGCIEUC */
-  { 0x0eba, 0x314a }, /*                Hangul_Cieuc ã…Š HANGUL LETTER CHIEUCH */
-  { 0x0ebb, 0x314b }, /*               Hangul_Khieuq ã…‹ HANGUL LETTER KHIEUKH */
-  { 0x0ebc, 0x314c }, /*                Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */
-  { 0x0ebd, 0x314d }, /*               Hangul_Phieuf ã…� HANGUL LETTER PHIEUPH */
-  { 0x0ebe, 0x314e }, /*                Hangul_Hieuh ã…Ž HANGUL LETTER HIEUH */
-  { 0x0ebf, 0x314f }, /*                    Hangul_A ã…� HANGUL LETTER A */
-  { 0x0ec0, 0x3150 }, /*                   Hangul_AE ã…� HANGUL LETTER AE */
-  { 0x0ec1, 0x3151 }, /*                   Hangul_YA ã…‘ HANGUL LETTER YA */
-  { 0x0ec2, 0x3152 }, /*                  Hangul_YAE ã…’ HANGUL LETTER YAE */
-  { 0x0ec3, 0x3153 }, /*                   Hangul_EO ã…“ HANGUL LETTER EO */
-  { 0x0ec4, 0x3154 }, /*                    Hangul_E ã…” HANGUL LETTER E */
-  { 0x0ec5, 0x3155 }, /*                  Hangul_YEO ã…• HANGUL LETTER YEO */
-  { 0x0ec6, 0x3156 }, /*                   Hangul_YE ã…– HANGUL LETTER YE */
-  { 0x0ec7, 0x3157 }, /*                    Hangul_O ã…— HANGUL LETTER O */
-  { 0x0ec8, 0x3158 }, /*                   Hangul_WA ã…˜ HANGUL LETTER WA */
-  { 0x0ec9, 0x3159 }, /*                  Hangul_WAE ã…™ HANGUL LETTER WAE */
-  { 0x0eca, 0x315a }, /*                   Hangul_OE ã…š HANGUL LETTER OE */
-  { 0x0ecb, 0x315b }, /*                   Hangul_YO ã…› HANGUL LETTER YO */
-  { 0x0ecc, 0x315c }, /*                    Hangul_U ㅜ HANGUL LETTER U */
-  { 0x0ecd, 0x315d }, /*                  Hangul_WEO ã…� HANGUL LETTER WEO */
-  { 0x0ece, 0x315e }, /*                   Hangul_WE ã…ž HANGUL LETTER WE */
-  { 0x0ecf, 0x315f }, /*                   Hangul_WI ã…Ÿ HANGUL LETTER WI */
-  { 0x0ed0, 0x3160 }, /*                   Hangul_YU ã…  HANGUL LETTER YU */
-  { 0x0ed1, 0x3161 }, /*                   Hangul_EU ã…¡ HANGUL LETTER EU */
-  { 0x0ed2, 0x3162 }, /*                   Hangul_YI ã…¢ HANGUL LETTER YI */
-  { 0x0ed3, 0x3163 }, /*                    Hangul_I ã…£ HANGUL LETTER I */
-  { 0x0ed4, 0x11a8 }, /*             Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */
-  { 0x0ed5, 0x11a9 }, /*        Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */
-  { 0x0ed6, 0x11aa }, /*         Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */
-  { 0x0ed7, 0x11ab }, /*              Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */
-  { 0x0ed8, 0x11ac }, /*         Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */
-  { 0x0ed9, 0x11ad }, /*         Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */
-  { 0x0eda, 0x11ae }, /*             Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */
-  { 0x0edb, 0x11af }, /*              Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */
-  { 0x0edc, 0x11b0 }, /*        Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */
-  { 0x0edd, 0x11b1 }, /*         Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */
-  { 0x0ede, 0x11b2 }, /*         Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */
-  { 0x0edf, 0x11b3 }, /*          Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */
-  { 0x0ee0, 0x11b4 }, /*         Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */
-  { 0x0ee1, 0x11b5 }, /*        Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */
-  { 0x0ee2, 0x11b6 }, /*         Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */
-  { 0x0ee3, 0x11b7 }, /*              Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */
-  { 0x0ee4, 0x11b8 }, /*              Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */
-  { 0x0ee5, 0x11b9 }, /*          Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */
-  { 0x0ee6, 0x11ba }, /*               Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */
-  { 0x0ee7, 0x11bb }, /*          Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */
-  { 0x0ee8, 0x11bc }, /*              Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */
-  { 0x0ee9, 0x11bd }, /*              Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */
-  { 0x0eea, 0x11be }, /*              Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */
-  { 0x0eeb, 0x11bf }, /*             Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */
-  { 0x0eec, 0x11c0 }, /*              Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */
-  { 0x0eed, 0x11c1 }, /*             Hangul_J_Phieuf � HANGUL JONGSEONG PHIEUPH */
-  { 0x0eee, 0x11c2 }, /*              Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
-  { 0x0eef, 0x316d }, /*     Hangul_RieulYeorinHieuh ã…­ HANGUL LETTER RIEUL-YEORINHIEUH */
-  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ã…± HANGUL LETTER KAPYEOUNMIEUM */
-  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ã…¸ HANGUL LETTER KAPYEOUNPIEUP */
-  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ã…¿ HANGUL LETTER PANSIOS */
-/*  0x0ef3                  Hangul_KkogjiDalrinIeung ? ??? */
-  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
-  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
-  { 0x0ef6, 0x318d }, /*                Hangul_AraeA � HANGUL LETTER ARAEA */
-  { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
-  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-/*  0x0ef9                Hangul_J_KkogjiDalrinIeung ? ??? */
-  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
-  { 0x0eff, 0x20a9 }, /*                  Korean_Won â‚© WON SIGN */
-  { 0x13bc, 0x0152 }, /*                          OE Å’ LATIN CAPITAL LIGATURE OE */
-  { 0x13bd, 0x0153 }, /*                          oe Å“ LATIN SMALL LIGATURE OE */
-  { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
-  { 0x20a0, 0x20a0 }, /*                     EcuSign â‚  EURO-CURRENCY SIGN */
-  { 0x20a1, 0x20a1 }, /*                   ColonSign â‚¡ COLON SIGN */
-  { 0x20a2, 0x20a2 }, /*                CruzeiroSign â‚¢ CRUZEIRO SIGN */
-  { 0x20a3, 0x20a3 }, /*                  FFrancSign â‚£ FRENCH FRANC SIGN */
-  { 0x20a4, 0x20a4 }, /*                    LiraSign ₤ LIRA SIGN */
-  { 0x20a5, 0x20a5 }, /*                    MillSign â‚¥ MILL SIGN */
-  { 0x20a6, 0x20a6 }, /*                   NairaSign ₦ NAIRA SIGN */
-  { 0x20a7, 0x20a7 }, /*                  PesetaSign ₧ PESETA SIGN */
-  { 0x20a8, 0x20a8 }, /*                   RupeeSign ₨ RUPEE SIGN */
-  { 0x20a9, 0x20a9 }, /*                     WonSign â‚© WON SIGN */
-  { 0x20aa, 0x20aa }, /*               NewSheqelSign ₪ NEW SHEQEL SIGN */
-  { 0x20ab, 0x20ab }, /*                    DongSign â‚« DONG SIGN */
-  { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
-};
-
-/**
- * gdk_keyval_to_unicode:
- * @keysym: a GDK key symbol 
- * 
- * Convert from a GDK key symbol to the corresponding ISO10646 (Unicode)
- * character.
- * 
- * Return value: the corresponding unicode character, or 0 if there
- *               is no corresponding character.
- **/
-
-guint32
-gdk_keyval_to_unicode (guint keysym)
-{
-  int min = 0;
-  int max = sizeof (gdk_keysym_to_unicode_tab) / sizeof (gdk_keysym_to_unicode_tab[0]) - 1;
-  int mid;
-
-  /* First check for Latin-1 characters (1:1 mapping) */
-  if ((keysym >= 0x0020 && keysym <= 0x007e) ||
-      (keysym >= 0x00a0 && keysym <= 0x00ff))
-    return keysym;
-
-  /* Also check for directly encoded 24-bit UCS characters:
-   */
-  if ((keysym & 0xff000000) == 0x01000000)
-    return keysym & 0x00ffffff;
-
-  /* binary search in table */
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (gdk_keysym_to_unicode_tab[mid].keysym < keysym)
-      min = mid + 1;
-    else if (gdk_keysym_to_unicode_tab[mid].keysym > keysym)
-      max = mid - 1;
-    else {
-      /* found it */
-      return gdk_keysym_to_unicode_tab[mid].ucs;
-    }
-  }
-  
-  /* No matching Unicode value found */
-  return 0;
-}
-
-/*
- * Canonical decomposition
- *
- * It is copied here from libunicode, because we do not want malloc
- *
- */
-
-typedef struct
-{
-  unsigned short ch;
-  unsigned char *expansion;
-} e_decomposition;
-
-static e_decomposition e_decomp_table[] =
-{
-  { 0x00c0, "\x00\x41\x03\x00\0" },
-  { 0x00c1, "\x00\x41\x03\x01\0" },
-  { 0x00c2, "\x00\x41\x03\x02\0" },
-  { 0x00c3, "\x00\x41\x03\x03\0" },
-  { 0x00c4, "\x00\x41\x03\x08\0" },
-  { 0x00c5, "\x00\x41\x03\x0a\0" },
-  { 0x00c7, "\x00\x43\x03\x27\0" },
-  { 0x00c8, "\x00\x45\x03\x00\0" },
-  { 0x00c9, "\x00\x45\x03\x01\0" },
-  { 0x00ca, "\x00\x45\x03\x02\0" },
-  { 0x00cb, "\x00\x45\x03\x08\0" },
-  { 0x00cc, "\x00\x49\x03\x00\0" },
-  { 0x00cd, "\x00\x49\x03\x01\0" },
-  { 0x00ce, "\x00\x49\x03\x02\0" },
-  { 0x00cf, "\x00\x49\x03\x08\0" },
-  { 0x00d1, "\x00\x4e\x03\x03\0" },
-  { 0x00d2, "\x00\x4f\x03\x00\0" },
-  { 0x00d3, "\x00\x4f\x03\x01\0" },
-  { 0x00d4, "\x00\x4f\x03\x02\0" },
-  { 0x00d5, "\x00\x4f\x03\x03\0" },
-  { 0x00d6, "\x00\x4f\x03\x08\0" },
-  { 0x00d9, "\x00\x55\x03\x00\0" },
-  { 0x00da, "\x00\x55\x03\x01\0" },
-  { 0x00db, "\x00\x55\x03\x02\0" },
-  { 0x00dc, "\x00\x55\x03\x08\0" },
-  { 0x00dd, "\x00\x59\x03\x01\0" },
-  { 0x00e0, "\x00\x61\x03\x00\0" },
-  { 0x00e1, "\x00\x61\x03\x01\0" },
-  { 0x00e2, "\x00\x61\x03\x02\0" },
-  { 0x00e3, "\x00\x61\x03\x03\0" },
-  { 0x00e4, "\x00\x61\x03\x08\0" },
-  { 0x00e5, "\x00\x61\x03\x0a\0" },
-  { 0x00e7, "\x00\x63\x03\x27\0" },
-  { 0x00e8, "\x00\x65\x03\x00\0" },
-  { 0x00e9, "\x00\x65\x03\x01\0" },
-  { 0x00ea, "\x00\x65\x03\x02\0" },
-  { 0x00eb, "\x00\x65\x03\x08\0" },
-  { 0x00ec, "\x00\x69\x03\x00\0" },
-  { 0x00ed, "\x00\x69\x03\x01\0" },
-  { 0x00ee, "\x00\x69\x03\x02\0" },
-  { 0x00ef, "\x00\x69\x03\x08\0" },
-  { 0x00f1, "\x00\x6e\x03\x03\0" },
-  { 0x00f2, "\x00\x6f\x03\x00\0" },
-  { 0x00f3, "\x00\x6f\x03\x01\0" },
-  { 0x00f4, "\x00\x6f\x03\x02\0" },
-  { 0x00f5, "\x00\x6f\x03\x03\0" },
-  { 0x00f6, "\x00\x6f\x03\x08\0" },
-  { 0x00f9, "\x00\x75\x03\x00\0" },
-  { 0x00fa, "\x00\x75\x03\x01\0" },
-  { 0x00fb, "\x00\x75\x03\x02\0" },
-  { 0x00fc, "\x00\x75\x03\x08\0" },
-  { 0x00fd, "\x00\x79\x03\x01\0" },
-  { 0x00ff, "\x00\x79\x03\x08\0" },
-  { 0x0100, "\x00\x41\x03\x04\0" },
-  { 0x0101, "\x00\x61\x03\x04\0" },
-  { 0x0102, "\x00\x41\x03\x06\0" },
-  { 0x0103, "\x00\x61\x03\x06\0" },
-  { 0x0104, "\x00\x41\x03\x28\0" },
-  { 0x0105, "\x00\x61\x03\x28\0" },
-  { 0x0106, "\x00\x43\x03\x01\0" },
-  { 0x0107, "\x00\x63\x03\x01\0" },
-  { 0x0108, "\x00\x43\x03\x02\0" },
-  { 0x0109, "\x00\x63\x03\x02\0" },
-  { 0x010a, "\x00\x43\x03\x07\0" },
-  { 0x010b, "\x00\x63\x03\x07\0" },
-  { 0x010c, "\x00\x43\x03\x0c\0" },
-  { 0x010d, "\x00\x63\x03\x0c\0" },
-  { 0x010e, "\x00\x44\x03\x0c\0" },
-  { 0x010f, "\x00\x64\x03\x0c\0" },
-  { 0x0112, "\x00\x45\x03\x04\0" },
-  { 0x0113, "\x00\x65\x03\x04\0" },
-  { 0x0114, "\x00\x45\x03\x06\0" },
-  { 0x0115, "\x00\x65\x03\x06\0" },
-  { 0x0116, "\x00\x45\x03\x07\0" },
-  { 0x0117, "\x00\x65\x03\x07\0" },
-  { 0x0118, "\x00\x45\x03\x28\0" },
-  { 0x0119, "\x00\x65\x03\x28\0" },
-  { 0x011a, "\x00\x45\x03\x0c\0" },
-  { 0x011b, "\x00\x65\x03\x0c\0" },
-  { 0x011c, "\x00\x47\x03\x02\0" },
-  { 0x011d, "\x00\x67\x03\x02\0" },
-  { 0x011e, "\x00\x47\x03\x06\0" },
-  { 0x011f, "\x00\x67\x03\x06\0" },
-  { 0x0120, "\x00\x47\x03\x07\0" },
-  { 0x0121, "\x00\x67\x03\x07\0" },
-  { 0x0122, "\x00\x47\x03\x27\0" },
-  { 0x0123, "\x00\x67\x03\x27\0" },
-  { 0x0124, "\x00\x48\x03\x02\0" },
-  { 0x0125, "\x00\x68\x03\x02\0" },
-  { 0x0128, "\x00\x49\x03\x03\0" },
-  { 0x0129, "\x00\x69\x03\x03\0" },
-  { 0x012a, "\x00\x49\x03\x04\0" },
-  { 0x012b, "\x00\x69\x03\x04\0" },
-  { 0x012c, "\x00\x49\x03\x06\0" },
-  { 0x012d, "\x00\x69\x03\x06\0" },
-  { 0x012e, "\x00\x49\x03\x28\0" },
-  { 0x012f, "\x00\x69\x03\x28\0" },
-  { 0x0130, "\x00\x49\x03\x07\0" },
-  { 0x0134, "\x00\x4a\x03\x02\0" },
-  { 0x0135, "\x00\x6a\x03\x02\0" },
-  { 0x0136, "\x00\x4b\x03\x27\0" },
-  { 0x0137, "\x00\x6b\x03\x27\0" },
-  { 0x0139, "\x00\x4c\x03\x01\0" },
-  { 0x013a, "\x00\x6c\x03\x01\0" },
-  { 0x013b, "\x00\x4c\x03\x27\0" },
-  { 0x013c, "\x00\x6c\x03\x27\0" },
-  { 0x013d, "\x00\x4c\x03\x0c\0" },
-  { 0x013e, "\x00\x6c\x03\x0c\0" },
-  { 0x0143, "\x00\x4e\x03\x01\0" },
-  { 0x0144, "\x00\x6e\x03\x01\0" },
-  { 0x0145, "\x00\x4e\x03\x27\0" },
-  { 0x0146, "\x00\x6e\x03\x27\0" },
-  { 0x0147, "\x00\x4e\x03\x0c\0" },
-  { 0x0148, "\x00\x6e\x03\x0c\0" },
-  { 0x014c, "\x00\x4f\x03\x04\0" },
-  { 0x014d, "\x00\x6f\x03\x04\0" },
-  { 0x014e, "\x00\x4f\x03\x06\0" },
-  { 0x014f, "\x00\x6f\x03\x06\0" },
-  { 0x0150, "\x00\x4f\x03\x0b\0" },
-  { 0x0151, "\x00\x6f\x03\x0b\0" },
-  { 0x0154, "\x00\x52\x03\x01\0" },
-  { 0x0155, "\x00\x72\x03\x01\0" },
-  { 0x0156, "\x00\x52\x03\x27\0" },
-  { 0x0157, "\x00\x72\x03\x27\0" },
-  { 0x0158, "\x00\x52\x03\x0c\0" },
-  { 0x0159, "\x00\x72\x03\x0c\0" },
-  { 0x015a, "\x00\x53\x03\x01\0" },
-  { 0x015b, "\x00\x73\x03\x01\0" },
-  { 0x015c, "\x00\x53\x03\x02\0" },
-  { 0x015d, "\x00\x73\x03\x02\0" },
-  { 0x015e, "\x00\x53\x03\x27\0" },
-  { 0x015f, "\x00\x73\x03\x27\0" },
-  { 0x0160, "\x00\x53\x03\x0c\0" },
-  { 0x0161, "\x00\x73\x03\x0c\0" },
-  { 0x0162, "\x00\x54\x03\x27\0" },
-  { 0x0163, "\x00\x74\x03\x27\0" },
-  { 0x0164, "\x00\x54\x03\x0c\0" },
-  { 0x0165, "\x00\x74\x03\x0c\0" },
-  { 0x0168, "\x00\x55\x03\x03\0" },
-  { 0x0169, "\x00\x75\x03\x03\0" },
-  { 0x016a, "\x00\x55\x03\x04\0" },
-  { 0x016b, "\x00\x75\x03\x04\0" },
-  { 0x016c, "\x00\x55\x03\x06\0" },
-  { 0x016d, "\x00\x75\x03\x06\0" },
-  { 0x016e, "\x00\x55\x03\x0a\0" },
-  { 0x016f, "\x00\x75\x03\x0a\0" },
-  { 0x0170, "\x00\x55\x03\x0b\0" },
-  { 0x0171, "\x00\x75\x03\x0b\0" },
-  { 0x0172, "\x00\x55\x03\x28\0" },
-  { 0x0173, "\x00\x75\x03\x28\0" },
-  { 0x0174, "\x00\x57\x03\x02\0" },
-  { 0x0175, "\x00\x77\x03\x02\0" },
-  { 0x0176, "\x00\x59\x03\x02\0" },
-  { 0x0177, "\x00\x79\x03\x02\0" },
-  { 0x0178, "\x00\x59\x03\x08\0" },
-  { 0x0179, "\x00\x5a\x03\x01\0" },
-  { 0x017a, "\x00\x7a\x03\x01\0" },
-  { 0x017b, "\x00\x5a\x03\x07\0" },
-  { 0x017c, "\x00\x7a\x03\x07\0" },
-  { 0x017d, "\x00\x5a\x03\x0c\0" },
-  { 0x017e, "\x00\x7a\x03\x0c\0" },
-  { 0x01a0, "\x00\x4f\x03\x1b\0" },
-  { 0x01a1, "\x00\x6f\x03\x1b\0" },
-  { 0x01af, "\x00\x55\x03\x1b\0" },
-  { 0x01b0, "\x00\x75\x03\x1b\0" },
-  { 0x01cd, "\x00\x41\x03\x0c\0" },
-  { 0x01ce, "\x00\x61\x03\x0c\0" },
-  { 0x01cf, "\x00\x49\x03\x0c\0" },
-  { 0x01d0, "\x00\x69\x03\x0c\0" },
-  { 0x01d1, "\x00\x4f\x03\x0c\0" },
-  { 0x01d2, "\x00\x6f\x03\x0c\0" },
-  { 0x01d3, "\x00\x55\x03\x0c\0" },
-  { 0x01d4, "\x00\x75\x03\x0c\0" },
-  { 0x01d5, "\x00\x55\x03\x08\x03\x04\0" },
-  { 0x01d6, "\x00\x75\x03\x08\x03\x04\0" },
-  { 0x01d7, "\x00\x55\x03\x08\x03\x01\0" },
-  { 0x01d8, "\x00\x75\x03\x08\x03\x01\0" },
-  { 0x01d9, "\x00\x55\x03\x08\x03\x0c\0" },
-  { 0x01da, "\x00\x75\x03\x08\x03\x0c\0" },
-  { 0x01db, "\x00\x55\x03\x08\x03\x00\0" },
-  { 0x01dc, "\x00\x75\x03\x08\x03\x00\0" },
-  { 0x01de, "\x00\x41\x03\x08\x03\x04\0" },
-  { 0x01df, "\x00\x61\x03\x08\x03\x04\0" },
-  { 0x01e0, "\x00\x41\x03\x07\x03\x04\0" },
-  { 0x01e1, "\x00\x61\x03\x07\x03\x04\0" },
-  { 0x01e2, "\x00\xc6\x03\x04\0" },
-  { 0x01e3, "\x00\xe6\x03\x04\0" },
-  { 0x01e6, "\x00\x47\x03\x0c\0" },
-  { 0x01e7, "\x00\x67\x03\x0c\0" },
-  { 0x01e8, "\x00\x4b\x03\x0c\0" },
-  { 0x01e9, "\x00\x6b\x03\x0c\0" },
-  { 0x01ea, "\x00\x4f\x03\x28\0" },
-  { 0x01eb, "\x00\x6f\x03\x28\0" },
-  { 0x01ec, "\x00\x4f\x03\x28\x03\x04\0" },
-  { 0x01ed, "\x00\x6f\x03\x28\x03\x04\0" },
-  { 0x01ee, "\x01\xb7\x03\x0c\0" },
-  { 0x01ef, "\x02\x92\x03\x0c\0" },
-  { 0x01f0, "\x00\x6a\x03\x0c\0" },
-  { 0x01f4, "\x00\x47\x03\x01\0" },
-  { 0x01f5, "\x00\x67\x03\x01\0" },
-  { 0x01fa, "\x00\x41\x03\x0a\x03\x01\0" },
-  { 0x01fb, "\x00\x61\x03\x0a\x03\x01\0" },
-  { 0x01fc, "\x00\xc6\x03\x01\0" },
-  { 0x01fd, "\x00\xe6\x03\x01\0" },
-  { 0x01fe, "\x00\xd8\x03\x01\0" },
-  { 0x01ff, "\x00\xf8\x03\x01\0" },
-  { 0x0200, "\x00\x41\x03\x0f\0" },
-  { 0x0201, "\x00\x61\x03\x0f\0" },
-  { 0x0202, "\x00\x41\x03\x11\0" },
-  { 0x0203, "\x00\x61\x03\x11\0" },
-  { 0x0204, "\x00\x45\x03\x0f\0" },
-  { 0x0205, "\x00\x65\x03\x0f\0" },
-  { 0x0206, "\x00\x45\x03\x11\0" },
-  { 0x0207, "\x00\x65\x03\x11\0" },
-  { 0x0208, "\x00\x49\x03\x0f\0" },
-  { 0x0209, "\x00\x69\x03\x0f\0" },
-  { 0x020a, "\x00\x49\x03\x11\0" },
-  { 0x020b, "\x00\x69\x03\x11\0" },
-  { 0x020c, "\x00\x4f\x03\x0f\0" },
-  { 0x020d, "\x00\x6f\x03\x0f\0" },
-  { 0x020e, "\x00\x4f\x03\x11\0" },
-  { 0x020f, "\x00\x6f\x03\x11\0" },
-  { 0x0210, "\x00\x52\x03\x0f\0" },
-  { 0x0211, "\x00\x72\x03\x0f\0" },
-  { 0x0212, "\x00\x52\x03\x11\0" },
-  { 0x0213, "\x00\x72\x03\x11\0" },
-  { 0x0214, "\x00\x55\x03\x0f\0" },
-  { 0x0215, "\x00\x75\x03\x0f\0" },
-  { 0x0216, "\x00\x55\x03\x11\0" },
-  { 0x0217, "\x00\x75\x03\x11\0" },
-  { 0x0340, "\x03\x00\0" },
-  { 0x0341, "\x03\x01\0" },
-  { 0x0343, "\x03\x13\0" },
-  { 0x0344, "\x03\x08\x03\x01\0" },
-  { 0x0374, "\x02\xb9\0" },
-  { 0x037e, "\x00\x3b\0" },
-  { 0x0385, "\x00\xa8\x03\x01\0" },
-  { 0x0386, "\x03\x91\x03\x01\0" },
-  { 0x0387, "\x00\xb7\0" },
-  { 0x0388, "\x03\x95\x03\x01\0" },
-  { 0x0389, "\x03\x97\x03\x01\0" },
-  { 0x038a, "\x03\x99\x03\x01\0" },
-  { 0x038c, "\x03\x9f\x03\x01\0" },
-  { 0x038e, "\x03\xa5\x03\x01\0" },
-  { 0x038f, "\x03\xa9\x03\x01\0" },
-  { 0x0390, "\x03\xb9\x03\x08\x03\x01\0" },
-  { 0x03aa, "\x03\x99\x03\x08\0" },
-  { 0x03ab, "\x03\xa5\x03\x08\0" },
-  { 0x03ac, "\x03\xb1\x03\x01\0" },
-  { 0x03ad, "\x03\xb5\x03\x01\0" },
-  { 0x03ae, "\x03\xb7\x03\x01\0" },
-  { 0x03af, "\x03\xb9\x03\x01\0" },
-  { 0x03b0, "\x03\xc5\x03\x08\x03\x01\0" },
-  { 0x03ca, "\x03\xb9\x03\x08\0" },
-  { 0x03cb, "\x03\xc5\x03\x08\0" },
-  { 0x03cc, "\x03\xbf\x03\x01\0" },
-  { 0x03cd, "\x03\xc5\x03\x01\0" },
-  { 0x03ce, "\x03\xc9\x03\x01\0" },
-  { 0x03d3, "\x03\xd2\x03\x01\0" },
-  { 0x03d4, "\x03\xd2\x03\x08\0" },
-  { 0x0401, "\x04\x15\x03\x08\0" },
-  { 0x0403, "\x04\x13\x03\x01\0" },
-  { 0x0407, "\x04\x06\x03\x08\0" },
-  { 0x040c, "\x04\x1a\x03\x01\0" },
-  { 0x040e, "\x04\x23\x03\x06\0" },
-  { 0x0419, "\x04\x18\x03\x06\0" },
-  { 0x0439, "\x04\x38\x03\x06\0" },
-  { 0x0451, "\x04\x35\x03\x08\0" },
-  { 0x0453, "\x04\x33\x03\x01\0" },
-  { 0x0457, "\x04\x56\x03\x08\0" },
-  { 0x045c, "\x04\x3a\x03\x01\0" },
-  { 0x045e, "\x04\x43\x03\x06\0" },
-  { 0x0476, "\x04\x74\x03\x0f\0" },
-  { 0x0477, "\x04\x75\x03\x0f\0" },
-  { 0x04c1, "\x04\x16\x03\x06\0" },
-  { 0x04c2, "\x04\x36\x03\x06\0" },
-  { 0x04d0, "\x04\x10\x03\x06\0" },
-  { 0x04d1, "\x04\x30\x03\x06\0" },
-  { 0x04d2, "\x04\x10\x03\x08\0" },
-  { 0x04d3, "\x04\x30\x03\x08\0" },
-  { 0x04d6, "\x04\x15\x03\x06\0" },
-  { 0x04d7, "\x04\x35\x03\x06\0" },
-  { 0x04da, "\x04\xd8\x03\x08\0" },
-  { 0x04db, "\x04\xd9\x03\x08\0" },
-  { 0x04dc, "\x04\x16\x03\x08\0" },
-  { 0x04dd, "\x04\x36\x03\x08\0" },
-  { 0x04de, "\x04\x17\x03\x08\0" },
-  { 0x04df, "\x04\x37\x03\x08\0" },
-  { 0x04e2, "\x04\x18\x03\x04\0" },
-  { 0x04e3, "\x04\x38\x03\x04\0" },
-  { 0x04e4, "\x04\x18\x03\x08\0" },
-  { 0x04e5, "\x04\x38\x03\x08\0" },
-  { 0x04e6, "\x04\x1e\x03\x08\0" },
-  { 0x04e7, "\x04\x3e\x03\x08\0" },
-  { 0x04ea, "\x04\xe8\x03\x08\0" },
-  { 0x04eb, "\x04\xe9\x03\x08\0" },
-  { 0x04ee, "\x04\x23\x03\x04\0" },
-  { 0x04ef, "\x04\x43\x03\x04\0" },
-  { 0x04f0, "\x04\x23\x03\x08\0" },
-  { 0x04f1, "\x04\x43\x03\x08\0" },
-  { 0x04f2, "\x04\x23\x03\x0b\0" },
-  { 0x04f3, "\x04\x43\x03\x0b\0" },
-  { 0x04f4, "\x04\x27\x03\x08\0" },
-  { 0x04f5, "\x04\x47\x03\x08\0" },
-  { 0x04f8, "\x04\x2b\x03\x08\0" },
-  { 0x04f9, "\x04\x4b\x03\x08\0" },
-  { 0x0929, "\x09\x28\x09\x3c\0" },
-  { 0x0931, "\x09\x30\x09\x3c\0" },
-  { 0x0934, "\x09\x33\x09\x3c\0" },
-  { 0x0958, "\x09\x15\x09\x3c\0" },
-  { 0x0959, "\x09\x16\x09\x3c\0" },
-  { 0x095a, "\x09\x17\x09\x3c\0" },
-  { 0x095b, "\x09\x1c\x09\x3c\0" },
-  { 0x095c, "\x09\x21\x09\x3c\0" },
-  { 0x095d, "\x09\x22\x09\x3c\0" },
-  { 0x095e, "\x09\x2b\x09\x3c\0" },
-  { 0x095f, "\x09\x2f\x09\x3c\0" },
-  { 0x09b0, "\x09\xac\x09\xbc\0" },
-  { 0x09cb, "\x09\xc7\x09\xbe\0" },
-  { 0x09cc, "\x09\xc7\x09\xd7\0" },
-  { 0x09dc, "\x09\xa1\x09\xbc\0" },
-  { 0x09dd, "\x09\xa2\x09\xbc\0" },
-  { 0x09df, "\x09\xaf\x09\xbc\0" },
-  { 0x0a59, "\x0a\x16\x0a\x3c\0" },
-  { 0x0a5a, "\x0a\x17\x0a\x3c\0" },
-  { 0x0a5b, "\x0a\x1c\x0a\x3c\0" },
-  { 0x0a5c, "\x0a\x21\x0a\x3c\0" },
-  { 0x0a5e, "\x0a\x2b\x0a\x3c\0" },
-  { 0x0b48, "\x0b\x47\x0b\x56\0" },
-  { 0x0b4b, "\x0b\x47\x0b\x3e\0" },
-  { 0x0b4c, "\x0b\x47\x0b\x57\0" },
-  { 0x0b5c, "\x0b\x21\x0b\x3c\0" },
-  { 0x0b5d, "\x0b\x22\x0b\x3c\0" },
-  { 0x0b5f, "\x0b\x2f\x0b\x3c\0" },
-  { 0x0b94, "\x0b\x92\x0b\xd7\0" },
-  { 0x0bca, "\x0b\xc6\x0b\xbe\0" },
-  { 0x0bcb, "\x0b\xc7\x0b\xbe\0" },
-  { 0x0bcc, "\x0b\xc6\x0b\xd7\0" },
-  { 0x0c48, "\x0c\x46\x0c\x56\0" },
-  { 0x0cc0, "\x0c\xbf\x0c\xd5\0" },
-  { 0x0cc7, "\x0c\xc6\x0c\xd5\0" },
-  { 0x0cc8, "\x0c\xc6\x0c\xd6\0" },
-  { 0x0cca, "\x0c\xc6\x0c\xc2\0" },
-  { 0x0ccb, "\x0c\xc6\x0c\xc2\x0c\xd5\0" },
-  { 0x0d4a, "\x0d\x46\x0d\x3e\0" },
-  { 0x0d4b, "\x0d\x47\x0d\x3e\0" },
-  { 0x0d4c, "\x0d\x46\x0d\x57\0" },
-  { 0x0e33, "\x0e\x4d\x0e\x32\0" },
-  { 0x0eb3, "\x0e\xcd\x0e\xb2\0" },
-  { 0x0f43, "\x0f\x42\x0f\xb7\0" },
-  { 0x0f4d, "\x0f\x4c\x0f\xb7\0" },
-  { 0x0f52, "\x0f\x51\x0f\xb7\0" },
-  { 0x0f57, "\x0f\x56\x0f\xb7\0" },
-  { 0x0f5c, "\x0f\x5b\x0f\xb7\0" },
-  { 0x0f69, "\x0f\x40\x0f\xb5\0" },
-  { 0x0f73, "\x0f\x71\x0f\x72\0" },
-  { 0x0f75, "\x0f\x71\x0f\x74\0" },
-  { 0x0f76, "\x0f\xb2\x0f\x80\0" },
-  { 0x0f78, "\x0f\xb3\x0f\x80\0" },
-  { 0x0f81, "\x0f\x71\x0f\x80\0" },
-  { 0x0f93, "\x0f\x92\x0f\xb7\0" },
-  { 0x0f9d, "\x0f\x9c\x0f\xb7\0" },
-  { 0x0fa2, "\x0f\xa1\x0f\xb7\0" },
-  { 0x0fa7, "\x0f\xa6\x0f\xb7\0" },
-  { 0x0fac, "\x0f\xab\x0f\xb7\0" },
-  { 0x0fb9, "\x0f\x90\x0f\xb5\0" },
-  { 0x1e00, "\x00\x41\x03\x25\0" },
-  { 0x1e01, "\x00\x61\x03\x25\0" },
-  { 0x1e02, "\x00\x42\x03\x07\0" },
-  { 0x1e03, "\x00\x62\x03\x07\0" },
-  { 0x1e04, "\x00\x42\x03\x23\0" },
-  { 0x1e05, "\x00\x62\x03\x23\0" },
-  { 0x1e06, "\x00\x42\x03\x31\0" },
-  { 0x1e07, "\x00\x62\x03\x31\0" },
-  { 0x1e08, "\x00\x43\x03\x27\x03\x01\0" },
-  { 0x1e09, "\x00\x63\x03\x27\x03\x01\0" },
-  { 0x1e0a, "\x00\x44\x03\x07\0" },
-  { 0x1e0b, "\x00\x64\x03\x07\0" },
-  { 0x1e0c, "\x00\x44\x03\x23\0" },
-  { 0x1e0d, "\x00\x64\x03\x23\0" },
-  { 0x1e0e, "\x00\x44\x03\x31\0" },
-  { 0x1e0f, "\x00\x64\x03\x31\0" },
-  { 0x1e10, "\x00\x44\x03\x27\0" },
-  { 0x1e11, "\x00\x64\x03\x27\0" },
-  { 0x1e12, "\x00\x44\x03\x2d\0" },
-  { 0x1e13, "\x00\x64\x03\x2d\0" },
-  { 0x1e14, "\x00\x45\x03\x04\x03\x00\0" },
-  { 0x1e15, "\x00\x65\x03\x04\x03\x00\0" },
-  { 0x1e16, "\x00\x45\x03\x04\x03\x01\0" },
-  { 0x1e17, "\x00\x65\x03\x04\x03\x01\0" },
-  { 0x1e18, "\x00\x45\x03\x2d\0" },
-  { 0x1e19, "\x00\x65\x03\x2d\0" },
-  { 0x1e1a, "\x00\x45\x03\x30\0" },
-  { 0x1e1b, "\x00\x65\x03\x30\0" },
-  { 0x1e1c, "\x00\x45\x03\x27\x03\x06\0" },
-  { 0x1e1d, "\x00\x65\x03\x27\x03\x06\0" },
-  { 0x1e1e, "\x00\x46\x03\x07\0" },
-  { 0x1e1f, "\x00\x66\x03\x07\0" },
-  { 0x1e20, "\x00\x47\x03\x04\0" },
-  { 0x1e21, "\x00\x67\x03\x04\0" },
-  { 0x1e22, "\x00\x48\x03\x07\0" },
-  { 0x1e23, "\x00\x68\x03\x07\0" },
-  { 0x1e24, "\x00\x48\x03\x23\0" },
-  { 0x1e25, "\x00\x68\x03\x23\0" },
-  { 0x1e26, "\x00\x48\x03\x08\0" },
-  { 0x1e27, "\x00\x68\x03\x08\0" },
-  { 0x1e28, "\x00\x48\x03\x27\0" },
-  { 0x1e29, "\x00\x68\x03\x27\0" },
-  { 0x1e2a, "\x00\x48\x03\x2e\0" },
-  { 0x1e2b, "\x00\x68\x03\x2e\0" },
-  { 0x1e2c, "\x00\x49\x03\x30\0" },
-  { 0x1e2d, "\x00\x69\x03\x30\0" },
-  { 0x1e2e, "\x00\x49\x03\x08\x03\x01\0" },
-  { 0x1e2f, "\x00\x69\x03\x08\x03\x01\0" },
-  { 0x1e30, "\x00\x4b\x03\x01\0" },
-  { 0x1e31, "\x00\x6b\x03\x01\0" },
-  { 0x1e32, "\x00\x4b\x03\x23\0" },
-  { 0x1e33, "\x00\x6b\x03\x23\0" },
-  { 0x1e34, "\x00\x4b\x03\x31\0" },
-  { 0x1e35, "\x00\x6b\x03\x31\0" },
-  { 0x1e36, "\x00\x4c\x03\x23\0" },
-  { 0x1e37, "\x00\x6c\x03\x23\0" },
-  { 0x1e38, "\x00\x4c\x03\x23\x03\x04\0" },
-  { 0x1e39, "\x00\x6c\x03\x23\x03\x04\0" },
-  { 0x1e3a, "\x00\x4c\x03\x31\0" },
-  { 0x1e3b, "\x00\x6c\x03\x31\0" },
-  { 0x1e3c, "\x00\x4c\x03\x2d\0" },
-  { 0x1e3d, "\x00\x6c\x03\x2d\0" },
-  { 0x1e3e, "\x00\x4d\x03\x01\0" },
-  { 0x1e3f, "\x00\x6d\x03\x01\0" },
-  { 0x1e40, "\x00\x4d\x03\x07\0" },
-  { 0x1e41, "\x00\x6d\x03\x07\0" },
-  { 0x1e42, "\x00\x4d\x03\x23\0" },
-  { 0x1e43, "\x00\x6d\x03\x23\0" },
-  { 0x1e44, "\x00\x4e\x03\x07\0" },
-  { 0x1e45, "\x00\x6e\x03\x07\0" },
-  { 0x1e46, "\x00\x4e\x03\x23\0" },
-  { 0x1e47, "\x00\x6e\x03\x23\0" },
-  { 0x1e48, "\x00\x4e\x03\x31\0" },
-  { 0x1e49, "\x00\x6e\x03\x31\0" },
-  { 0x1e4a, "\x00\x4e\x03\x2d\0" },
-  { 0x1e4b, "\x00\x6e\x03\x2d\0" },
-  { 0x1e4c, "\x00\x4f\x03\x03\x03\x01\0" },
-  { 0x1e4d, "\x00\x6f\x03\x03\x03\x01\0" },
-  { 0x1e4e, "\x00\x4f\x03\x03\x03\x08\0" },
-  { 0x1e4f, "\x00\x6f\x03\x03\x03\x08\0" },
-  { 0x1e50, "\x00\x4f\x03\x04\x03\x00\0" },
-  { 0x1e51, "\x00\x6f\x03\x04\x03\x00\0" },
-  { 0x1e52, "\x00\x4f\x03\x04\x03\x01\0" },
-  { 0x1e53, "\x00\x6f\x03\x04\x03\x01\0" },
-  { 0x1e54, "\x00\x50\x03\x01\0" },
-  { 0x1e55, "\x00\x70\x03\x01\0" },
-  { 0x1e56, "\x00\x50\x03\x07\0" },
-  { 0x1e57, "\x00\x70\x03\x07\0" },
-  { 0x1e58, "\x00\x52\x03\x07\0" },
-  { 0x1e59, "\x00\x72\x03\x07\0" },
-  { 0x1e5a, "\x00\x52\x03\x23\0" },
-  { 0x1e5b, "\x00\x72\x03\x23\0" },
-  { 0x1e5c, "\x00\x52\x03\x23\x03\x04\0" },
-  { 0x1e5d, "\x00\x72\x03\x23\x03\x04\0" },
-  { 0x1e5e, "\x00\x52\x03\x31\0" },
-  { 0x1e5f, "\x00\x72\x03\x31\0" },
-  { 0x1e60, "\x00\x53\x03\x07\0" },
-  { 0x1e61, "\x00\x73\x03\x07\0" },
-  { 0x1e62, "\x00\x53\x03\x23\0" },
-  { 0x1e63, "\x00\x73\x03\x23\0" },
-  { 0x1e64, "\x00\x53\x03\x01\x03\x07\0" },
-  { 0x1e65, "\x00\x73\x03\x01\x03\x07\0" },
-  { 0x1e66, "\x00\x53\x03\x0c\x03\x07\0" },
-  { 0x1e67, "\x00\x73\x03\x0c\x03\x07\0" },
-  { 0x1e68, "\x00\x53\x03\x23\x03\x07\0" },
-  { 0x1e69, "\x00\x73\x03\x23\x03\x07\0" },
-  { 0x1e6a, "\x00\x54\x03\x07\0" },
-  { 0x1e6b, "\x00\x74\x03\x07\0" },
-  { 0x1e6c, "\x00\x54\x03\x23\0" },
-  { 0x1e6d, "\x00\x74\x03\x23\0" },
-  { 0x1e6e, "\x00\x54\x03\x31\0" },
-  { 0x1e6f, "\x00\x74\x03\x31\0" },
-  { 0x1e70, "\x00\x54\x03\x2d\0" },
-  { 0x1e71, "\x00\x74\x03\x2d\0" },
-  { 0x1e72, "\x00\x55\x03\x24\0" },
-  { 0x1e73, "\x00\x75\x03\x24\0" },
-  { 0x1e74, "\x00\x55\x03\x30\0" },
-  { 0x1e75, "\x00\x75\x03\x30\0" },
-  { 0x1e76, "\x00\x55\x03\x2d\0" },
-  { 0x1e77, "\x00\x75\x03\x2d\0" },
-  { 0x1e78, "\x00\x55\x03\x03\x03\x01\0" },
-  { 0x1e79, "\x00\x75\x03\x03\x03\x01\0" },
-  { 0x1e7a, "\x00\x55\x03\x04\x03\x08\0" },
-  { 0x1e7b, "\x00\x75\x03\x04\x03\x08\0" },
-  { 0x1e7c, "\x00\x56\x03\x03\0" },
-  { 0x1e7d, "\x00\x76\x03\x03\0" },
-  { 0x1e7e, "\x00\x56\x03\x23\0" },
-  { 0x1e7f, "\x00\x76\x03\x23\0" },
-  { 0x1e80, "\x00\x57\x03\x00\0" },
-  { 0x1e81, "\x00\x77\x03\x00\0" },
-  { 0x1e82, "\x00\x57\x03\x01\0" },
-  { 0x1e83, "\x00\x77\x03\x01\0" },
-  { 0x1e84, "\x00\x57\x03\x08\0" },
-  { 0x1e85, "\x00\x77\x03\x08\0" },
-  { 0x1e86, "\x00\x57\x03\x07\0" },
-  { 0x1e87, "\x00\x77\x03\x07\0" },
-  { 0x1e88, "\x00\x57\x03\x23\0" },
-  { 0x1e89, "\x00\x77\x03\x23\0" },
-  { 0x1e8a, "\x00\x58\x03\x07\0" },
-  { 0x1e8b, "\x00\x78\x03\x07\0" },
-  { 0x1e8c, "\x00\x58\x03\x08\0" },
-  { 0x1e8d, "\x00\x78\x03\x08\0" },
-  { 0x1e8e, "\x00\x59\x03\x07\0" },
-  { 0x1e8f, "\x00\x79\x03\x07\0" },
-  { 0x1e90, "\x00\x5a\x03\x02\0" },
-  { 0x1e91, "\x00\x7a\x03\x02\0" },
-  { 0x1e92, "\x00\x5a\x03\x23\0" },
-  { 0x1e93, "\x00\x7a\x03\x23\0" },
-  { 0x1e94, "\x00\x5a\x03\x31\0" },
-  { 0x1e95, "\x00\x7a\x03\x31\0" },
-  { 0x1e96, "\x00\x68\x03\x31\0" },
-  { 0x1e97, "\x00\x74\x03\x08\0" },
-  { 0x1e98, "\x00\x77\x03\x0a\0" },
-  { 0x1e99, "\x00\x79\x03\x0a\0" },
-  { 0x1e9b, "\x01\x7f\x03\x07\0" },
-  { 0x1ea0, "\x00\x41\x03\x23\0" },
-  { 0x1ea1, "\x00\x61\x03\x23\0" },
-  { 0x1ea2, "\x00\x41\x03\x09\0" },
-  { 0x1ea3, "\x00\x61\x03\x09\0" },
-  { 0x1ea4, "\x00\x41\x03\x02\x03\x01\0" },
-  { 0x1ea5, "\x00\x61\x03\x02\x03\x01\0" },
-  { 0x1ea6, "\x00\x41\x03\x02\x03\x00\0" },
-  { 0x1ea7, "\x00\x61\x03\x02\x03\x00\0" },
-  { 0x1ea8, "\x00\x41\x03\x02\x03\x09\0" },
-  { 0x1ea9, "\x00\x61\x03\x02\x03\x09\0" },
-  { 0x1eaa, "\x00\x41\x03\x02\x03\x03\0" },
-  { 0x1eab, "\x00\x61\x03\x02\x03\x03\0" },
-  { 0x1eac, "\x00\x41\x03\x23\x03\x02\0" },
-  { 0x1ead, "\x00\x61\x03\x23\x03\x02\0" },
-  { 0x1eae, "\x00\x41\x03\x06\x03\x01\0" },
-  { 0x1eaf, "\x00\x61\x03\x06\x03\x01\0" },
-  { 0x1eb0, "\x00\x41\x03\x06\x03\x00\0" },
-  { 0x1eb1, "\x00\x61\x03\x06\x03\x00\0" },
-  { 0x1eb2, "\x00\x41\x03\x06\x03\x09\0" },
-  { 0x1eb3, "\x00\x61\x03\x06\x03\x09\0" },
-  { 0x1eb4, "\x00\x41\x03\x06\x03\x03\0" },
-  { 0x1eb5, "\x00\x61\x03\x06\x03\x03\0" },
-  { 0x1eb6, "\x00\x41\x03\x23\x03\x06\0" },
-  { 0x1eb7, "\x00\x61\x03\x23\x03\x06\0" },
-  { 0x1eb8, "\x00\x45\x03\x23\0" },
-  { 0x1eb9, "\x00\x65\x03\x23\0" },
-  { 0x1eba, "\x00\x45\x03\x09\0" },
-  { 0x1ebb, "\x00\x65\x03\x09\0" },
-  { 0x1ebc, "\x00\x45\x03\x03\0" },
-  { 0x1ebd, "\x00\x65\x03\x03\0" },
-  { 0x1ebe, "\x00\x45\x03\x02\x03\x01\0" },
-  { 0x1ebf, "\x00\x65\x03\x02\x03\x01\0" },
-  { 0x1ec0, "\x00\x45\x03\x02\x03\x00\0" },
-  { 0x1ec1, "\x00\x65\x03\x02\x03\x00\0" },
-  { 0x1ec2, "\x00\x45\x03\x02\x03\x09\0" },
-  { 0x1ec3, "\x00\x65\x03\x02\x03\x09\0" },
-  { 0x1ec4, "\x00\x45\x03\x02\x03\x03\0" },
-  { 0x1ec5, "\x00\x65\x03\x02\x03\x03\0" },
-  { 0x1ec6, "\x00\x45\x03\x23\x03\x02\0" },
-  { 0x1ec7, "\x00\x65\x03\x23\x03\x02\0" },
-  { 0x1ec8, "\x00\x49\x03\x09\0" },
-  { 0x1ec9, "\x00\x69\x03\x09\0" },
-  { 0x1eca, "\x00\x49\x03\x23\0" },
-  { 0x1ecb, "\x00\x69\x03\x23\0" },
-  { 0x1ecc, "\x00\x4f\x03\x23\0" },
-  { 0x1ecd, "\x00\x6f\x03\x23\0" },
-  { 0x1ece, "\x00\x4f\x03\x09\0" },
-  { 0x1ecf, "\x00\x6f\x03\x09\0" },
-  { 0x1ed0, "\x00\x4f\x03\x02\x03\x01\0" },
-  { 0x1ed1, "\x00\x6f\x03\x02\x03\x01\0" },
-  { 0x1ed2, "\x00\x4f\x03\x02\x03\x00\0" },
-  { 0x1ed3, "\x00\x6f\x03\x02\x03\x00\0" },
-  { 0x1ed4, "\x00\x4f\x03\x02\x03\x09\0" },
-  { 0x1ed5, "\x00\x6f\x03\x02\x03\x09\0" },
-  { 0x1ed6, "\x00\x4f\x03\x02\x03\x03\0" },
-  { 0x1ed7, "\x00\x6f\x03\x02\x03\x03\0" },
-  { 0x1ed8, "\x00\x4f\x03\x23\x03\x02\0" },
-  { 0x1ed9, "\x00\x6f\x03\x23\x03\x02\0" },
-  { 0x1eda, "\x00\x4f\x03\x1b\x03\x01\0" },
-  { 0x1edb, "\x00\x6f\x03\x1b\x03\x01\0" },
-  { 0x1edc, "\x00\x4f\x03\x1b\x03\x00\0" },
-  { 0x1edd, "\x00\x6f\x03\x1b\x03\x00\0" },
-  { 0x1ede, "\x00\x4f\x03\x1b\x03\x09\0" },
-  { 0x1edf, "\x00\x6f\x03\x1b\x03\x09\0" },
-  { 0x1ee0, "\x00\x4f\x03\x1b\x03\x03\0" },
-  { 0x1ee1, "\x00\x6f\x03\x1b\x03\x03\0" },
-  { 0x1ee2, "\x00\x4f\x03\x1b\x03\x23\0" },
-  { 0x1ee3, "\x00\x6f\x03\x1b\x03\x23\0" },
-  { 0x1ee4, "\x00\x55\x03\x23\0" },
-  { 0x1ee5, "\x00\x75\x03\x23\0" },
-  { 0x1ee6, "\x00\x55\x03\x09\0" },
-  { 0x1ee7, "\x00\x75\x03\x09\0" },
-  { 0x1ee8, "\x00\x55\x03\x1b\x03\x01\0" },
-  { 0x1ee9, "\x00\x75\x03\x1b\x03\x01\0" },
-  { 0x1eea, "\x00\x55\x03\x1b\x03\x00\0" },
-  { 0x1eeb, "\x00\x75\x03\x1b\x03\x00\0" },
-  { 0x1eec, "\x00\x55\x03\x1b\x03\x09\0" },
-  { 0x1eed, "\x00\x75\x03\x1b\x03\x09\0" },
-  { 0x1eee, "\x00\x55\x03\x1b\x03\x03\0" },
-  { 0x1eef, "\x00\x75\x03\x1b\x03\x03\0" },
-  { 0x1ef0, "\x00\x55\x03\x1b\x03\x23\0" },
-  { 0x1ef1, "\x00\x75\x03\x1b\x03\x23\0" },
-  { 0x1ef2, "\x00\x59\x03\x00\0" },
-  { 0x1ef3, "\x00\x79\x03\x00\0" },
-  { 0x1ef4, "\x00\x59\x03\x23\0" },
-  { 0x1ef5, "\x00\x79\x03\x23\0" },
-  { 0x1ef6, "\x00\x59\x03\x09\0" },
-  { 0x1ef7, "\x00\x79\x03\x09\0" },
-  { 0x1ef8, "\x00\x59\x03\x03\0" },
-  { 0x1ef9, "\x00\x79\x03\x03\0" },
-  { 0x1f00, "\x03\xb1\x03\x13\0" },
-  { 0x1f01, "\x03\xb1\x03\x14\0" },
-  { 0x1f02, "\x03\xb1\x03\x13\x03\x00\0" },
-  { 0x1f03, "\x03\xb1\x03\x14\x03\x00\0" },
-  { 0x1f04, "\x03\xb1\x03\x13\x03\x01\0" },
-  { 0x1f05, "\x03\xb1\x03\x14\x03\x01\0" },
-  { 0x1f06, "\x03\xb1\x03\x13\x03\x42\0" },
-  { 0x1f07, "\x03\xb1\x03\x14\x03\x42\0" },
-  { 0x1f08, "\x03\x91\x03\x13\0" },
-  { 0x1f09, "\x03\x91\x03\x14\0" },
-  { 0x1f0a, "\x03\x91\x03\x13\x03\x00\0" },
-  { 0x1f0b, "\x03\x91\x03\x14\x03\x00\0" },
-  { 0x1f0c, "\x03\x91\x03\x13\x03\x01\0" },
-  { 0x1f0d, "\x03\x91\x03\x14\x03\x01\0" },
-  { 0x1f0e, "\x03\x91\x03\x13\x03\x42\0" },
-  { 0x1f0f, "\x03\x91\x03\x14\x03\x42\0" },
-  { 0x1f10, "\x03\xb5\x03\x13\0" },
-  { 0x1f11, "\x03\xb5\x03\x14\0" },
-  { 0x1f12, "\x03\xb5\x03\x13\x03\x00\0" },
-  { 0x1f13, "\x03\xb5\x03\x14\x03\x00\0" },
-  { 0x1f14, "\x03\xb5\x03\x13\x03\x01\0" },
-  { 0x1f15, "\x03\xb5\x03\x14\x03\x01\0" },
-  { 0x1f18, "\x03\x95\x03\x13\0" },
-  { 0x1f19, "\x03\x95\x03\x14\0" },
-  { 0x1f1a, "\x03\x95\x03\x13\x03\x00\0" },
-  { 0x1f1b, "\x03\x95\x03\x14\x03\x00\0" },
-  { 0x1f1c, "\x03\x95\x03\x13\x03\x01\0" },
-  { 0x1f1d, "\x03\x95\x03\x14\x03\x01\0" },
-  { 0x1f20, "\x03\xb7\x03\x13\0" },
-  { 0x1f21, "\x03\xb7\x03\x14\0" },
-  { 0x1f22, "\x03\xb7\x03\x13\x03\x00\0" },
-  { 0x1f23, "\x03\xb7\x03\x14\x03\x00\0" },
-  { 0x1f24, "\x03\xb7\x03\x13\x03\x01\0" },
-  { 0x1f25, "\x03\xb7\x03\x14\x03\x01\0" },
-  { 0x1f26, "\x03\xb7\x03\x13\x03\x42\0" },
-  { 0x1f27, "\x03\xb7\x03\x14\x03\x42\0" },
-  { 0x1f28, "\x03\x97\x03\x13\0" },
-  { 0x1f29, "\x03\x97\x03\x14\0" },
-  { 0x1f2a, "\x03\x97\x03\x13\x03\x00\0" },
-  { 0x1f2b, "\x03\x97\x03\x14\x03\x00\0" },
-  { 0x1f2c, "\x03\x97\x03\x13\x03\x01\0" },
-  { 0x1f2d, "\x03\x97\x03\x14\x03\x01\0" },
-  { 0x1f2e, "\x03\x97\x03\x13\x03\x42\0" },
-  { 0x1f2f, "\x03\x97\x03\x14\x03\x42\0" },
-  { 0x1f30, "\x03\xb9\x03\x13\0" },
-  { 0x1f31, "\x03\xb9\x03\x14\0" },
-  { 0x1f32, "\x03\xb9\x03\x13\x03\x00\0" },
-  { 0x1f33, "\x03\xb9\x03\x14\x03\x00\0" },
-  { 0x1f34, "\x03\xb9\x03\x13\x03\x01\0" },
-  { 0x1f35, "\x03\xb9\x03\x14\x03\x01\0" },
-  { 0x1f36, "\x03\xb9\x03\x13\x03\x42\0" },
-  { 0x1f37, "\x03\xb9\x03\x14\x03\x42\0" },
-  { 0x1f38, "\x03\x99\x03\x13\0" },
-  { 0x1f39, "\x03\x99\x03\x14\0" },
-  { 0x1f3a, "\x03\x99\x03\x13\x03\x00\0" },
-  { 0x1f3b, "\x03\x99\x03\x14\x03\x00\0" },
-  { 0x1f3c, "\x03\x99\x03\x13\x03\x01\0" },
-  { 0x1f3d, "\x03\x99\x03\x14\x03\x01\0" },
-  { 0x1f3e, "\x03\x99\x03\x13\x03\x42\0" },
-  { 0x1f3f, "\x03\x99\x03\x14\x03\x42\0" },
-  { 0x1f40, "\x03\xbf\x03\x13\0" },
-  { 0x1f41, "\x03\xbf\x03\x14\0" },
-  { 0x1f42, "\x03\xbf\x03\x13\x03\x00\0" },
-  { 0x1f43, "\x03\xbf\x03\x14\x03\x00\0" },
-  { 0x1f44, "\x03\xbf\x03\x13\x03\x01\0" },
-  { 0x1f45, "\x03\xbf\x03\x14\x03\x01\0" },
-  { 0x1f48, "\x03\x9f\x03\x13\0" },
-  { 0x1f49, "\x03\x9f\x03\x14\0" },
-  { 0x1f4a, "\x03\x9f\x03\x13\x03\x00\0" },
-  { 0x1f4b, "\x03\x9f\x03\x14\x03\x00\0" },
-  { 0x1f4c, "\x03\x9f\x03\x13\x03\x01\0" },
-  { 0x1f4d, "\x03\x9f\x03\x14\x03\x01\0" },
-  { 0x1f50, "\x03\xc5\x03\x13\0" },
-  { 0x1f51, "\x03\xc5\x03\x14\0" },
-  { 0x1f52, "\x03\xc5\x03\x13\x03\x00\0" },
-  { 0x1f53, "\x03\xc5\x03\x14\x03\x00\0" },
-  { 0x1f54, "\x03\xc5\x03\x13\x03\x01\0" },
-  { 0x1f55, "\x03\xc5\x03\x14\x03\x01\0" },
-  { 0x1f56, "\x03\xc5\x03\x13\x03\x42\0" },
-  { 0x1f57, "\x03\xc5\x03\x14\x03\x42\0" },
-  { 0x1f59, "\x03\xa5\x03\x14\0" },
-  { 0x1f5b, "\x03\xa5\x03\x14\x03\x00\0" },
-  { 0x1f5d, "\x03\xa5\x03\x14\x03\x01\0" },
-  { 0x1f5f, "\x03\xa5\x03\x14\x03\x42\0" },
-  { 0x1f60, "\x03\xc9\x03\x13\0" },
-  { 0x1f61, "\x03\xc9\x03\x14\0" },
-  { 0x1f62, "\x03\xc9\x03\x13\x03\x00\0" },
-  { 0x1f63, "\x03\xc9\x03\x14\x03\x00\0" },
-  { 0x1f64, "\x03\xc9\x03\x13\x03\x01\0" },
-  { 0x1f65, "\x03\xc9\x03\x14\x03\x01\0" },
-  { 0x1f66, "\x03\xc9\x03\x13\x03\x42\0" },
-  { 0x1f67, "\x03\xc9\x03\x14\x03\x42\0" },
-  { 0x1f68, "\x03\xa9\x03\x13\0" },
-  { 0x1f69, "\x03\xa9\x03\x14\0" },
-  { 0x1f6a, "\x03\xa9\x03\x13\x03\x00\0" },
-  { 0x1f6b, "\x03\xa9\x03\x14\x03\x00\0" },
-  { 0x1f6c, "\x03\xa9\x03\x13\x03\x01\0" },
-  { 0x1f6d, "\x03\xa9\x03\x14\x03\x01\0" },
-  { 0x1f6e, "\x03\xa9\x03\x13\x03\x42\0" },
-  { 0x1f6f, "\x03\xa9\x03\x14\x03\x42\0" },
-  { 0x1f70, "\x03\xb1\x03\x00\0" },
-  { 0x1f71, "\x03\xb1\x03\x01\0" },
-  { 0x1f72, "\x03\xb5\x03\x00\0" },
-  { 0x1f73, "\x03\xb5\x03\x01\0" },
-  { 0x1f74, "\x03\xb7\x03\x00\0" },
-  { 0x1f75, "\x03\xb7\x03\x01\0" },
-  { 0x1f76, "\x03\xb9\x03\x00\0" },
-  { 0x1f77, "\x03\xb9\x03\x01\0" },
-  { 0x1f78, "\x03\xbf\x03\x00\0" },
-  { 0x1f79, "\x03\xbf\x03\x01\0" },
-  { 0x1f7a, "\x03\xc5\x03\x00\0" },
-  { 0x1f7b, "\x03\xc5\x03\x01\0" },
-  { 0x1f7c, "\x03\xc9\x03\x00\0" },
-  { 0x1f7d, "\x03\xc9\x03\x01\0" },
-  { 0x1f80, "\x03\xb1\x03\x13\x03\x45\0" },
-  { 0x1f81, "\x03\xb1\x03\x14\x03\x45\0" },
-  { 0x1f82, "\x03\xb1\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f83, "\x03\xb1\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f84, "\x03\xb1\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f85, "\x03\xb1\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f86, "\x03\xb1\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f87, "\x03\xb1\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f88, "\x03\x91\x03\x13\x03\x45\0" },
-  { 0x1f89, "\x03\x91\x03\x14\x03\x45\0" },
-  { 0x1f8a, "\x03\x91\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f8b, "\x03\x91\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f8c, "\x03\x91\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f8d, "\x03\x91\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f8e, "\x03\x91\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f8f, "\x03\x91\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f90, "\x03\xb7\x03\x13\x03\x45\0" },
-  { 0x1f91, "\x03\xb7\x03\x14\x03\x45\0" },
-  { 0x1f92, "\x03\xb7\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f93, "\x03\xb7\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f94, "\x03\xb7\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f95, "\x03\xb7\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f96, "\x03\xb7\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f97, "\x03\xb7\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f98, "\x03\x97\x03\x13\x03\x45\0" },
-  { 0x1f99, "\x03\x97\x03\x14\x03\x45\0" },
-  { 0x1f9a, "\x03\x97\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f9b, "\x03\x97\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f9c, "\x03\x97\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f9d, "\x03\x97\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f9e, "\x03\x97\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f9f, "\x03\x97\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fa0, "\x03\xc9\x03\x13\x03\x45\0" },
-  { 0x1fa1, "\x03\xc9\x03\x14\x03\x45\0" },
-  { 0x1fa2, "\x03\xc9\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1fa3, "\x03\xc9\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1fa4, "\x03\xc9\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1fa5, "\x03\xc9\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1fa6, "\x03\xc9\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1fa7, "\x03\xc9\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fa8, "\x03\xa9\x03\x13\x03\x45\0" },
-  { 0x1fa9, "\x03\xa9\x03\x14\x03\x45\0" },
-  { 0x1faa, "\x03\xa9\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1fab, "\x03\xa9\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1fac, "\x03\xa9\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1fad, "\x03\xa9\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1fae, "\x03\xa9\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1faf, "\x03\xa9\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fb0, "\x03\xb1\x03\x06\0" },
-  { 0x1fb1, "\x03\xb1\x03\x04\0" },
-  { 0x1fb2, "\x03\xb1\x03\x00\x03\x45\0" },
-  { 0x1fb3, "\x03\xb1\x03\x45\0" },
-  { 0x1fb4, "\x03\xb1\x03\x01\x03\x45\0" },
-  { 0x1fb6, "\x03\xb1\x03\x42\0" },
-  { 0x1fb7, "\x03\xb1\x03\x42\x03\x45\0" },
-  { 0x1fb8, "\x03\x91\x03\x06\0" },
-  { 0x1fb9, "\x03\x91\x03\x04\0" },
-  { 0x1fba, "\x03\x91\x03\x00\0" },
-  { 0x1fbb, "\x03\x91\x03\x01\0" },
-  { 0x1fbc, "\x03\x91\x03\x45\0" },
-  { 0x1fbe, "\x03\xb9\0" },
-  { 0x1fc1, "\x00\xa8\x03\x42\0" },
-  { 0x1fc2, "\x03\xb7\x03\x00\x03\x45\0" },
-  { 0x1fc3, "\x03\xb7\x03\x45\0" },
-  { 0x1fc4, "\x03\xb7\x03\x01\x03\x45\0" },
-  { 0x1fc6, "\x03\xb7\x03\x42\0" },
-  { 0x1fc7, "\x03\xb7\x03\x42\x03\x45\0" },
-  { 0x1fc8, "\x03\x95\x03\x00\0" },
-  { 0x1fc9, "\x03\x95\x03\x01\0" },
-  { 0x1fca, "\x03\x97\x03\x00\0" },
-  { 0x1fcb, "\x03\x97\x03\x01\0" },
-  { 0x1fcc, "\x03\x97\x03\x45\0" },
-  { 0x1fcd, "\x1f\xbf\x03\x00\0" },
-  { 0x1fce, "\x1f\xbf\x03\x01\0" },
-  { 0x1fcf, "\x1f\xbf\x03\x42\0" },
-  { 0x1fd0, "\x03\xb9\x03\x06\0" },
-  { 0x1fd1, "\x03\xb9\x03\x04\0" },
-  { 0x1fd2, "\x03\xb9\x03\x08\x03\x00\0" },
-  { 0x1fd3, "\x03\xb9\x03\x08\x03\x01\0" },
-  { 0x1fd6, "\x03\xb9\x03\x42\0" },
-  { 0x1fd7, "\x03\xb9\x03\x08\x03\x42\0" },
-  { 0x1fd8, "\x03\x99\x03\x06\0" },
-  { 0x1fd9, "\x03\x99\x03\x04\0" },
-  { 0x1fda, "\x03\x99\x03\x00\0" },
-  { 0x1fdb, "\x03\x99\x03\x01\0" },
-  { 0x1fdd, "\x1f\xfe\x03\x00\0" },
-  { 0x1fde, "\x1f\xfe\x03\x01\0" },
-  { 0x1fdf, "\x1f\xfe\x03\x42\0" },
-  { 0x1fe0, "\x03\xc5\x03\x06\0" },
-  { 0x1fe1, "\x03\xc5\x03\x04\0" },
-  { 0x1fe2, "\x03\xc5\x03\x08\x03\x00\0" },
-  { 0x1fe3, "\x03\xc5\x03\x08\x03\x01\0" },
-  { 0x1fe4, "\x03\xc1\x03\x13\0" },
-  { 0x1fe5, "\x03\xc1\x03\x14\0" },
-  { 0x1fe6, "\x03\xc5\x03\x42\0" },
-  { 0x1fe7, "\x03\xc5\x03\x08\x03\x42\0" },
-  { 0x1fe8, "\x03\xa5\x03\x06\0" },
-  { 0x1fe9, "\x03\xa5\x03\x04\0" },
-  { 0x1fea, "\x03\xa5\x03\x00\0" },
-  { 0x1feb, "\x03\xa5\x03\x01\0" },
-  { 0x1fec, "\x03\xa1\x03\x14\0" },
-  { 0x1fed, "\x00\xa8\x03\x00\0" },
-  { 0x1fee, "\x00\xa8\x03\x01\0" },
-  { 0x1fef, "\x00\x60\0" },
-  { 0x1ff2, "\x03\xc9\x03\x00\x03\x45\0" },
-  { 0x1ff3, "\x03\xc9\x03\x45\0" },
-  { 0x1ff4, "\x03\xc9\x03\x01\x03\x45\0" },
-  { 0x1ff6, "\x03\xc9\x03\x42\0" },
-  { 0x1ff7, "\x03\xc9\x03\x42\x03\x45\0" },
-  { 0x1ff8, "\x03\x9f\x03\x00\0" },
-  { 0x1ff9, "\x03\x9f\x03\x01\0" },
-  { 0x1ffa, "\x03\xa9\x03\x00\0" },
-  { 0x1ffb, "\x03\xa9\x03\x01\0" },
-  { 0x1ffc, "\x03\xa9\x03\x45\0" },
-  { 0x1ffd, "\x00\xb4\0" },
-  { 0x2000, "\x20\x02\0" },
-  { 0x2001, "\x20\x03\0" },
-  { 0x2126, "\x03\xa9\0" },
-  { 0x212a, "\x00\x4b\0" },
-  { 0x212b, "\x00\x41\x03\x0a\0" },
-  { 0x2204, "\x22\x03\x03\x38\0" },
-  { 0x2209, "\x22\x08\x03\x38\0" },
-  { 0x220c, "\x22\x0b\x03\x38\0" },
-  { 0x2224, "\x22\x23\x03\x38\0" },
-  { 0x2226, "\x22\x25\x03\x38\0" },
-  { 0x2241, "\x00\x7e\x03\x38\0" },
-  { 0x2244, "\x22\x43\x03\x38\0" },
-  { 0x2247, "\x22\x45\x03\x38\0" },
-  { 0x2249, "\x22\x48\x03\x38\0" },
-  { 0x2260, "\x00\x3d\x03\x38\0" },
-  { 0x2262, "\x22\x61\x03\x38\0" },
-  { 0x226d, "\x22\x4d\x03\x38\0" },
-  { 0x226e, "\x00\x3c\x03\x38\0" },
-  { 0x226f, "\x00\x3e\x03\x38\0" },
-  { 0x2270, "\x22\x64\x03\x38\0" },
-  { 0x2271, "\x22\x65\x03\x38\0" },
-  { 0x2274, "\x22\x72\x03\x38\0" },
-  { 0x2275, "\x22\x73\x03\x38\0" },
-  { 0x2278, "\x22\x76\x03\x38\0" },
-  { 0x2279, "\x22\x77\x03\x38\0" },
-  { 0x2280, "\x22\x7a\x03\x38\0" },
-  { 0x2281, "\x22\x7b\x03\x38\0" },
-  { 0x2284, "\x22\x82\x03\x38\0" },
-  { 0x2285, "\x22\x83\x03\x38\0" },
-  { 0x2288, "\x22\x86\x03\x38\0" },
-  { 0x2289, "\x22\x87\x03\x38\0" },
-  { 0x22ac, "\x22\xa2\x03\x38\0" },
-  { 0x22ad, "\x22\xa8\x03\x38\0" },
-  { 0x22ae, "\x22\xa9\x03\x38\0" },
-  { 0x22af, "\x22\xab\x03\x38\0" },
-  { 0x22e0, "\x22\x7c\x03\x38\0" },
-  { 0x22e1, "\x22\x7d\x03\x38\0" },
-  { 0x22e2, "\x22\x91\x03\x38\0" },
-  { 0x22e3, "\x22\x92\x03\x38\0" },
-  { 0x22ea, "\x22\xb2\x03\x38\0" },
-  { 0x22eb, "\x22\xb3\x03\x38\0" },
-  { 0x22ec, "\x22\xb4\x03\x38\0" },
-  { 0x22ed, "\x22\xb5\x03\x38\0" },
-  { 0x2329, "\x30\x08\0" },
-  { 0x232a, "\x30\x09\0" },
-  { 0x304c, "\x30\x4b\x30\x99\0" },
-  { 0x304e, "\x30\x4d\x30\x99\0" },
-  { 0x3050, "\x30\x4f\x30\x99\0" },
-  { 0x3052, "\x30\x51\x30\x99\0" },
-  { 0x3054, "\x30\x53\x30\x99\0" },
-  { 0x3056, "\x30\x55\x30\x99\0" },
-  { 0x3058, "\x30\x57\x30\x99\0" },
-  { 0x305a, "\x30\x59\x30\x99\0" },
-  { 0x305c, "\x30\x5b\x30\x99\0" },
-  { 0x305e, "\x30\x5d\x30\x99\0" },
-  { 0x3060, "\x30\x5f\x30\x99\0" },
-  { 0x3062, "\x30\x61\x30\x99\0" },
-  { 0x3065, "\x30\x64\x30\x99\0" },
-  { 0x3067, "\x30\x66\x30\x99\0" },
-  { 0x3069, "\x30\x68\x30\x99\0" },
-  { 0x3070, "\x30\x6f\x30\x99\0" },
-  { 0x3071, "\x30\x6f\x30\x9a\0" },
-  { 0x3073, "\x30\x72\x30\x99\0" },
-  { 0x3074, "\x30\x72\x30\x9a\0" },
-  { 0x3076, "\x30\x75\x30\x99\0" },
-  { 0x3077, "\x30\x75\x30\x9a\0" },
-  { 0x3079, "\x30\x78\x30\x99\0" },
-  { 0x307a, "\x30\x78\x30\x9a\0" },
-  { 0x307c, "\x30\x7b\x30\x99\0" },
-  { 0x307d, "\x30\x7b\x30\x9a\0" },
-  { 0x3094, "\x30\x46\x30\x99\0" },
-  { 0x309e, "\x30\x9d\x30\x99\0" },
-  { 0x30ac, "\x30\xab\x30\x99\0" },
-  { 0x30ae, "\x30\xad\x30\x99\0" },
-  { 0x30b0, "\x30\xaf\x30\x99\0" },
-  { 0x30b2, "\x30\xb1\x30\x99\0" },
-  { 0x30b4, "\x30\xb3\x30\x99\0" },
-  { 0x30b6, "\x30\xb5\x30\x99\0" },
-  { 0x30b8, "\x30\xb7\x30\x99\0" },
-  { 0x30ba, "\x30\xb9\x30\x99\0" },
-  { 0x30bc, "\x30\xbb\x30\x99\0" },
-  { 0x30be, "\x30\xbd\x30\x99\0" },
-  { 0x30c0, "\x30\xbf\x30\x99\0" },
-  { 0x30c2, "\x30\xc1\x30\x99\0" },
-  { 0x30c5, "\x30\xc4\x30\x99\0" },
-  { 0x30c7, "\x30\xc6\x30\x99\0" },
-  { 0x30c9, "\x30\xc8\x30\x99\0" },
-  { 0x30d0, "\x30\xcf\x30\x99\0" },
-  { 0x30d1, "\x30\xcf\x30\x9a\0" },
-  { 0x30d3, "\x30\xd2\x30\x99\0" },
-  { 0x30d4, "\x30\xd2\x30\x9a\0" },
-  { 0x30d6, "\x30\xd5\x30\x99\0" },
-  { 0x30d7, "\x30\xd5\x30\x9a\0" },
-  { 0x30d9, "\x30\xd8\x30\x99\0" },
-  { 0x30da, "\x30\xd8\x30\x9a\0" },
-  { 0x30dc, "\x30\xdb\x30\x99\0" },
-  { 0x30dd, "\x30\xdb\x30\x9a\0" },
-  { 0x30f4, "\x30\xa6\x30\x99\0" },
-  { 0x30f7, "\x30\xef\x30\x99\0" },
-  { 0x30f8, "\x30\xf0\x30\x99\0" },
-  { 0x30f9, "\x30\xf1\x30\x99\0" },
-  { 0x30fa, "\x30\xf2\x30\x99\0" },
-  { 0x30fe, "\x30\xfd\x30\x99\0" },
-  { 0xf900, "\x8c\x48\0" },
-  { 0xf901, "\x66\xf4\0" },
-  { 0xf902, "\x8e\xca\0" },
-  { 0xf903, "\x8c\xc8\0" },
-  { 0xf904, "\x6e\xd1\0" },
-  { 0xf905, "\x4e\x32\0" },
-  { 0xf906, "\x53\xe5\0" },
-  { 0xf907, "\x9f\x9c\0" },
-  { 0xf908, "\x9f\x9c\0" },
-  { 0xf909, "\x59\x51\0" },
-  { 0xf90a, "\x91\xd1\0" },
-  { 0xf90b, "\x55\x87\0" },
-  { 0xf90c, "\x59\x48\0" },
-  { 0xf90d, "\x61\xf6\0" },
-  { 0xf90e, "\x76\x69\0" },
-  { 0xf90f, "\x7f\x85\0" },
-  { 0xf910, "\x86\x3f\0" },
-  { 0xf911, "\x87\xba\0" },
-  { 0xf912, "\x88\xf8\0" },
-  { 0xf913, "\x90\x8f\0" },
-  { 0xf914, "\x6a\x02\0" },
-  { 0xf915, "\x6d\x1b\0" },
-  { 0xf916, "\x70\xd9\0" },
-  { 0xf917, "\x73\xde\0" },
-  { 0xf918, "\x84\x3d\0" },
-  { 0xf919, "\x91\x6a\0" },
-  { 0xf91a, "\x99\xf1\0" },
-  { 0xf91b, "\x4e\x82\0" },
-  { 0xf91c, "\x53\x75\0" },
-  { 0xf91d, "\x6b\x04\0" },
-  { 0xf91e, "\x72\x1b\0" },
-  { 0xf91f, "\x86\x2d\0" },
-  { 0xf920, "\x9e\x1e\0" },
-  { 0xf921, "\x5d\x50\0" },
-  { 0xf922, "\x6f\xeb\0" },
-  { 0xf923, "\x85\xcd\0" },
-  { 0xf924, "\x89\x64\0" },
-  { 0xf925, "\x62\xc9\0" },
-  { 0xf926, "\x81\xd8\0" },
-  { 0xf927, "\x88\x1f\0" },
-  { 0xf928, "\x5e\xca\0" },
-  { 0xf929, "\x67\x17\0" },
-  { 0xf92a, "\x6d\x6a\0" },
-  { 0xf92b, "\x72\xfc\0" },
-  { 0xf92c, "\x90\xce\0" },
-  { 0xf92d, "\x4f\x86\0" },
-  { 0xf92e, "\x51\xb7\0" },
-  { 0xf92f, "\x52\xde\0" },
-  { 0xf930, "\x64\xc4\0" },
-  { 0xf931, "\x6a\xd3\0" },
-  { 0xf932, "\x72\x10\0" },
-  { 0xf933, "\x76\xe7\0" },
-  { 0xf934, "\x80\x01\0" },
-  { 0xf935, "\x86\x06\0" },
-  { 0xf936, "\x86\x5c\0" },
-  { 0xf937, "\x8d\xef\0" },
-  { 0xf938, "\x97\x32\0" },
-  { 0xf939, "\x9b\x6f\0" },
-  { 0xf93a, "\x9d\xfa\0" },
-  { 0xf93b, "\x78\x8c\0" },
-  { 0xf93c, "\x79\x7f\0" },
-  { 0xf93d, "\x7d\xa0\0" },
-  { 0xf93e, "\x83\xc9\0" },
-  { 0xf93f, "\x93\x04\0" },
-  { 0xf940, "\x9e\x7f\0" },
-  { 0xf941, "\x8a\xd6\0" },
-  { 0xf942, "\x58\xdf\0" },
-  { 0xf943, "\x5f\x04\0" },
-  { 0xf944, "\x7c\x60\0" },
-  { 0xf945, "\x80\x7e\0" },
-  { 0xf946, "\x72\x62\0" },
-  { 0xf947, "\x78\xca\0" },
-  { 0xf948, "\x8c\xc2\0" },
-  { 0xf949, "\x96\xf7\0" },
-  { 0xf94a, "\x58\xd8\0" },
-  { 0xf94b, "\x5c\x62\0" },
-  { 0xf94c, "\x6a\x13\0" },
-  { 0xf94d, "\x6d\xda\0" },
-  { 0xf94e, "\x6f\x0f\0" },
-  { 0xf94f, "\x7d\x2f\0" },
-  { 0xf950, "\x7e\x37\0" },
-  { 0xf951, "\x96\xfb\0" },
-  { 0xf952, "\x52\xd2\0" },
-  { 0xf953, "\x80\x8b\0" },
-  { 0xf954, "\x51\xdc\0" },
-  { 0xf955, "\x51\xcc\0" },
-  { 0xf956, "\x7a\x1c\0" },
-  { 0xf957, "\x7d\xbe\0" },
-  { 0xf958, "\x83\xf1\0" },
-  { 0xf959, "\x96\x75\0" },
-  { 0xf95a, "\x8b\x80\0" },
-  { 0xf95b, "\x62\xcf\0" },
-  { 0xf95c, "\x6a\x02\0" },
-  { 0xf95d, "\x8a\xfe\0" },
-  { 0xf95e, "\x4e\x39\0" },
-  { 0xf95f, "\x5b\xe7\0" },
-  { 0xf960, "\x60\x12\0" },
-  { 0xf961, "\x73\x87\0" },
-  { 0xf962, "\x75\x70\0" },
-  { 0xf963, "\x53\x17\0" },
-  { 0xf964, "\x78\xfb\0" },
-  { 0xf965, "\x4f\xbf\0" },
-  { 0xf966, "\x5f\xa9\0" },
-  { 0xf967, "\x4e\x0d\0" },
-  { 0xf968, "\x6c\xcc\0" },
-  { 0xf969, "\x65\x78\0" },
-  { 0xf96a, "\x7d\x22\0" },
-  { 0xf96b, "\x53\xc3\0" },
-  { 0xf96c, "\x58\x5e\0" },
-  { 0xf96d, "\x77\x01\0" },
-  { 0xf96e, "\x84\x49\0" },
-  { 0xf96f, "\x8a\xaa\0" },
-  { 0xf970, "\x6b\xba\0" },
-  { 0xf971, "\x8f\xb0\0" },
-  { 0xf972, "\x6c\x88\0" },
-  { 0xf973, "\x62\xfe\0" },
-  { 0xf974, "\x82\xe5\0" },
-  { 0xf975, "\x63\xa0\0" },
-  { 0xf976, "\x75\x65\0" },
-  { 0xf977, "\x4e\xae\0" },
-  { 0xf978, "\x51\x69\0" },
-  { 0xf979, "\x51\xc9\0" },
-  { 0xf97a, "\x68\x81\0" },
-  { 0xf97b, "\x7c\xe7\0" },
-  { 0xf97c, "\x82\x6f\0" },
-  { 0xf97d, "\x8a\xd2\0" },
-  { 0xf97e, "\x91\xcf\0" },
-  { 0xf97f, "\x52\xf5\0" },
-  { 0xf980, "\x54\x42\0" },
-  { 0xf981, "\x59\x73\0" },
-  { 0xf982, "\x5e\xec\0" },
-  { 0xf983, "\x65\xc5\0" },
-  { 0xf984, "\x6f\xfe\0" },
-  { 0xf985, "\x79\x2a\0" },
-  { 0xf986, "\x95\xad\0" },
-  { 0xf987, "\x9a\x6a\0" },
-  { 0xf988, "\x9e\x97\0" },
-  { 0xf989, "\x9e\xce\0" },
-  { 0xf98a, "\x52\x9b\0" },
-  { 0xf98b, "\x66\xc6\0" },
-  { 0xf98c, "\x6b\x77\0" },
-  { 0xf98d, "\x8f\x62\0" },
-  { 0xf98e, "\x5e\x74\0" },
-  { 0xf98f, "\x61\x90\0" },
-  { 0xf990, "\x62\x00\0" },
-  { 0xf991, "\x64\x9a\0" },
-  { 0xf992, "\x6f\x23\0" },
-  { 0xf993, "\x71\x49\0" },
-  { 0xf994, "\x74\x89\0" },
-  { 0xf995, "\x79\xca\0" },
-  { 0xf996, "\x7d\xf4\0" },
-  { 0xf997, "\x80\x6f\0" },
-  { 0xf998, "\x8f\x26\0" },
-  { 0xf999, "\x84\xee\0" },
-  { 0xf99a, "\x90\x23\0" },
-  { 0xf99b, "\x93\x4a\0" },
-  { 0xf99c, "\x52\x17\0" },
-  { 0xf99d, "\x52\xa3\0" },
-  { 0xf99e, "\x54\xbd\0" },
-  { 0xf99f, "\x70\xc8\0" },
-  { 0xf9a0, "\x88\xc2\0" },
-  { 0xf9a1, "\x8a\xaa\0" },
-  { 0xf9a2, "\x5e\xc9\0" },
-  { 0xf9a3, "\x5f\xf5\0" },
-  { 0xf9a4, "\x63\x7b\0" },
-  { 0xf9a5, "\x6b\xae\0" },
-  { 0xf9a6, "\x7c\x3e\0" },
-  { 0xf9a7, "\x73\x75\0" },
-  { 0xf9a8, "\x4e\xe4\0" },
-  { 0xf9a9, "\x56\xf9\0" },
-  { 0xf9aa, "\x5b\xe7\0" },
-  { 0xf9ab, "\x5d\xba\0" },
-  { 0xf9ac, "\x60\x1c\0" },
-  { 0xf9ad, "\x73\xb2\0" },
-  { 0xf9ae, "\x74\x69\0" },
-  { 0xf9af, "\x7f\x9a\0" },
-  { 0xf9b0, "\x80\x46\0" },
-  { 0xf9b1, "\x92\x34\0" },
-  { 0xf9b2, "\x96\xf6\0" },
-  { 0xf9b3, "\x97\x48\0" },
-  { 0xf9b4, "\x98\x18\0" },
-  { 0xf9b5, "\x4f\x8b\0" },
-  { 0xf9b6, "\x79\xae\0" },
-  { 0xf9b7, "\x91\xb4\0" },
-  { 0xf9b8, "\x96\xb8\0" },
-  { 0xf9b9, "\x60\xe1\0" },
-  { 0xf9ba, "\x4e\x86\0" },
-  { 0xf9bb, "\x50\xda\0" },
-  { 0xf9bc, "\x5b\xee\0" },
-  { 0xf9bd, "\x5c\x3f\0" },
-  { 0xf9be, "\x65\x99\0" },
-  { 0xf9bf, "\x6a\x02\0" },
-  { 0xf9c0, "\x71\xce\0" },
-  { 0xf9c1, "\x76\x42\0" },
-  { 0xf9c2, "\x84\xfc\0" },
-  { 0xf9c3, "\x90\x7c\0" },
-  { 0xf9c4, "\x9f\x8d\0" },
-  { 0xf9c5, "\x66\x88\0" },
-  { 0xf9c6, "\x96\x2e\0" },
-  { 0xf9c7, "\x52\x89\0" },
-  { 0xf9c8, "\x67\x7b\0" },
-  { 0xf9c9, "\x67\xf3\0" },
-  { 0xf9ca, "\x6d\x41\0" },
-  { 0xf9cb, "\x6e\x9c\0" },
-  { 0xf9cc, "\x74\x09\0" },
-  { 0xf9cd, "\x75\x59\0" },
-  { 0xf9ce, "\x78\x6b\0" },
-  { 0xf9cf, "\x7d\x10\0" },
-  { 0xf9d0, "\x98\x5e\0" },
-  { 0xf9d1, "\x51\x6d\0" },
-  { 0xf9d2, "\x62\x2e\0" },
-  { 0xf9d3, "\x96\x78\0" },
-  { 0xf9d4, "\x50\x2b\0" },
-  { 0xf9d5, "\x5d\x19\0" },
-  { 0xf9d6, "\x6d\xea\0" },
-  { 0xf9d7, "\x8f\x2a\0" },
-  { 0xf9d8, "\x5f\x8b\0" },
-  { 0xf9d9, "\x61\x44\0" },
-  { 0xf9da, "\x68\x17\0" },
-  { 0xf9db, "\x73\x87\0" },
-  { 0xf9dc, "\x96\x86\0" },
-  { 0xf9dd, "\x52\x29\0" },
-  { 0xf9de, "\x54\x0f\0" },
-  { 0xf9df, "\x5c\x65\0" },
-  { 0xf9e0, "\x66\x13\0" },
-  { 0xf9e1, "\x67\x4e\0" },
-  { 0xf9e2, "\x68\xa8\0" },
-  { 0xf9e3, "\x6c\xe5\0" },
-  { 0xf9e4, "\x74\x06\0" },
-  { 0xf9e5, "\x75\xe2\0" },
-  { 0xf9e6, "\x7f\x79\0" },
-  { 0xf9e7, "\x88\xcf\0" },
-  { 0xf9e8, "\x88\xe1\0" },
-  { 0xf9e9, "\x91\xcc\0" },
-  { 0xf9ea, "\x96\xe2\0" },
-  { 0xf9eb, "\x53\x3f\0" },
-  { 0xf9ec, "\x6e\xba\0" },
-  { 0xf9ed, "\x54\x1d\0" },
-  { 0xf9ee, "\x71\xd0\0" },
-  { 0xf9ef, "\x74\x98\0" },
-  { 0xf9f0, "\x85\xfa\0" },
-  { 0xf9f1, "\x96\xa3\0" },
-  { 0xf9f2, "\x9c\x57\0" },
-  { 0xf9f3, "\x9e\x9f\0" },
-  { 0xf9f4, "\x67\x97\0" },
-  { 0xf9f5, "\x6d\xcb\0" },
-  { 0xf9f6, "\x81\xe8\0" },
-  { 0xf9f7, "\x7a\xcb\0" },
-  { 0xf9f8, "\x7b\x20\0" },
-  { 0xf9f9, "\x7c\x92\0" },
-  { 0xf9fa, "\x72\xc0\0" },
-  { 0xf9fb, "\x70\x99\0" },
-  { 0xf9fc, "\x8b\x58\0" },
-  { 0xf9fd, "\x4e\xc0\0" },
-  { 0xf9fe, "\x83\x36\0" },
-  { 0xf9ff, "\x52\x3a\0" },
-  { 0xfa00, "\x52\x07\0" },
-  { 0xfa01, "\x5e\xa6\0" },
-  { 0xfa02, "\x62\xd3\0" },
-  { 0xfa03, "\x7c\xd6\0" },
-  { 0xfa04, "\x5b\x85\0" },
-  { 0xfa05, "\x6d\x1e\0" },
-  { 0xfa06, "\x66\xb4\0" },
-  { 0xfa07, "\x8f\x3b\0" },
-  { 0xfa08, "\x88\x4c\0" },
-  { 0xfa09, "\x96\x4d\0" },
-  { 0xfa0a, "\x89\x8b\0" },
-  { 0xfa0b, "\x5e\xd3\0" },
-  { 0xfa0c, "\x51\x40\0" },
-  { 0xfa0d, "\x55\xc0\0" },
-  { 0xfa10, "\x58\x5a\0" },
-  { 0xfa12, "\x66\x74\0" },
-  { 0xfa15, "\x51\xde\0" },
-  { 0xfa16, "\x73\x2a\0" },
-  { 0xfa17, "\x76\xca\0" },
-  { 0xfa18, "\x79\x3c\0" },
-  { 0xfa19, "\x79\x5e\0" },
-  { 0xfa1a, "\x79\x65\0" },
-  { 0xfa1b, "\x79\x8f\0" },
-  { 0xfa1c, "\x97\x56\0" },
-  { 0xfa1d, "\x7c\xbe\0" },
-  { 0xfa1e, "\x7f\xbd\0" },
-  { 0xfa20, "\x86\x12\0" },
-  { 0xfa22, "\x8a\xf8\0" },
-  { 0xfa25, "\x90\x38\0" },
-  { 0xfa26, "\x90\xfd\0" },
-  { 0xfa2a, "\x98\xef\0" },
-  { 0xfa2b, "\x98\xfc\0" },
-  { 0xfa2c, "\x99\x28\0" },
-  { 0xfa2d, "\x9d\xb4\0" },
-  { 0xfb1f, "\x05\xf2\x05\xb7\0" },
-  { 0xfb2a, "\x05\xe9\x05\xc1\0" },
-  { 0xfb2b, "\x05\xe9\x05\xc2\0" },
-  { 0xfb2c, "\x05\xe9\x05\xbc\x05\xc1\0" },
-  { 0xfb2d, "\x05\xe9\x05\xbc\x05\xc2\0" },
-  { 0xfb2e, "\x05\xd0\x05\xb7\0" },
-  { 0xfb2f, "\x05\xd0\x05\xb8\0" },
-  { 0xfb30, "\x05\xd0\x05\xbc\0" },
-  { 0xfb31, "\x05\xd1\x05\xbc\0" },
-  { 0xfb32, "\x05\xd2\x05\xbc\0" },
-  { 0xfb33, "\x05\xd3\x05\xbc\0" },
-  { 0xfb34, "\x05\xd4\x05\xbc\0" },
-  { 0xfb35, "\x05\xd5\x05\xbc\0" },
-  { 0xfb36, "\x05\xd6\x05\xbc\0" },
-  { 0xfb38, "\x05\xd8\x05\xbc\0" },
-  { 0xfb39, "\x05\xd9\x05\xbc\0" },
-  { 0xfb3a, "\x05\xda\x05\xbc\0" },
-  { 0xfb3b, "\x05\xdb\x05\xbc\0" },
-  { 0xfb3c, "\x05\xdc\x05\xbc\0" },
-  { 0xfb3e, "\x05\xde\x05\xbc\0" },
-  { 0xfb40, "\x05\xe0\x05\xbc\0" },
-  { 0xfb41, "\x05\xe1\x05\xbc\0" },
-  { 0xfb43, "\x05\xe3\x05\xbc\0" },
-  { 0xfb44, "\x05\xe4\x05\xbc\0" },
-  { 0xfb46, "\x05\xe6\x05\xbc\0" },
-  { 0xfb47, "\x05\xe7\x05\xbc\0" },
-  { 0xfb48, "\x05\xe8\x05\xbc\0" },
-  { 0xfb49, "\x05\xe9\x05\xbc\0" },
-  { 0xfb4a, "\x05\xea\x05\xbc\0" },
-  { 0xfb4b, "\x05\xd5\x05\xb9\0" },
-  { 0xfb4c, "\x05\xd1\x05\xbf\0" },
-  { 0xfb4d, "\x05\xdb\x05\xbf\0" },
-  { 0xfb4e, "\x05\xe4\x05\xbf\0" }
-};
-
-/*
- * WARNING!
- *
- * NO BUFFER CHECKING AHEAD!
- *
- */
-
-static gint
-e_canonical_decomposition (unicode_char_t ch, unicode_char_t * buf)
-{
-  gint len = 0;
-
-  if (ch <= 0xffff)
-    {
-      int start = 0;
-      int end = sizeof (e_decomp_table) / sizeof (e_decomp_table[0]);
-      while (start != end)
-	{
-	  int half = (start + end) / 2;
-	  if (ch == e_decomp_table[half].ch) {
-	      /* Found it.  */
-	      int i;
-	      /* We store as a double-nul terminated string.  */
-	      for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2) ;
-
-	      /* We've counted twice as many bytes as there are
-		 characters.  */
-	      len /= 2;
-
-	      for (i = 0; i < len; i ++) {
-			buf[i] = (e_decomp_table[half].expansion[2 * i] << 8) | e_decomp_table[half].expansion[2 * i + 1];
-	      }
-	      break;
-	  } else if (ch > e_decomp_table[half].ch) {
-		  if (start == half) break;
-		  start = half;
-	  } else {
-		  if (end == half) break;
-		  end = half;
-	  }
-	}
-    }
-
-  if (len == 0)
-    {
-      /* Not in our table.  */
-      *buf = ch;
-      len = 1;
-    }
-
-  /* Supposedly following the Unicode 2.1.9 table means that the
-     decompositions come out in canonical order.  I haven't tested
-     this, but we rely on it here.  */
-  return len;
-}
-
-static unicode_char_t
-e_stripped_char (unicode_char_t ch)
-{
-	unicode_char_t decomp[MAX_DECOMP];
-	gint utype, dlen;
-
-	utype = unicode_type (ch);
-
-	switch (utype) {
-	case UNICODE_CONTROL:
-	case UNICODE_FORMAT:
-	case UNICODE_UNASSIGNED:
-	case UNICODE_COMBINING_MARK:
-		/* Ignore those */
-		return 0;
-		break;
-	default:
-		/* Convert to lowercase, fall through */
-		ch = unicode_tolower (ch);
-	case UNICODE_LOWERCASE_LETTER:
-		dlen = e_canonical_decomposition (ch, decomp);
-		if (dlen > 0) return *decomp;
-		break;
-	}
-
-	return 0;
-}
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
deleted file mode 100644
index 8f0c8b646d..0000000000
--- a/widgets/misc/e-unicode.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef _E_UNICODE_H_
-#define _E_UNICODE_H_
-
-/*
- * UTF-8 support functions for gal
- *
- * Authors:
- *   Lauris Kaplinski <lauris@helixcode.com>
- *
- * Copyright (C) 2000-2001 Helix Code, Inc.
- *
- */
-
-#include <sys/types.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <config.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-#ifdef USING_GNOME_PRINT_0_20
-#define gnome_font_get_size(f) ((f)->size)
-#define gnome_font_get_glyph_width gnome_font_get_width
-#define gnome_font_lookup_default gnome_font_get_glyph
-#endif
-
-#define G_UTF8_IN_GAL
-
-void e_unicode_init (void);
-
-/*
- * UTF-8 searching implementations
- *
- * e_utf8_strstrcase - case insensitive search
- * e_utf8_strstrcasedecomp - case insensitive and decompositing search (i.e. accented
- *   letters are treated equal to their base letters, explicit accent marks (unicode
- *   not ascii/iso ones) are ignored).
- */
-
-const gchar *e_utf8_strstrcase (const gchar *haystack, const gchar *needle);
-const gchar *e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle);
-
-gchar *e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string);
-
-gchar *e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string);
-gchar *e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
-
-gchar *e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string);
-gchar *e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
-
-gchar *e_utf8_from_locale_string (const gchar *string);
-gchar *e_utf8_from_locale_string_sized (const gchar *string, gint bytes);
-
-gchar *e_utf8_to_locale_string (const gchar *string);
-gchar *e_utf8_to_locale_string_sized (const gchar *string, gint bytes);
-/*
- * These are simple wrappers that save us some typing
- */
-
-/* NB! This return newly allocated string, not const as gtk+ one */
-
-gchar *e_utf8_gtk_entry_get_text (GtkEntry *entry);
-void e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text);
-
-gchar *e_utf8_gtk_editable_get_text (GtkEditable *editable);
-void e_utf8_gtk_editable_set_text (GtkEditable *editable, const gchar *text);
-gchar *e_utf8_gtk_editable_get_chars (GtkEditable *editable, gint start, gint end);
-void e_utf8_gtk_editable_insert_text (GtkEditable *editable, const gchar *text, gint length, gint *position);
-
-GtkWidget *e_utf8_gtk_menu_item_new_with_label (GtkMenu *menu, const gchar *label);
-
-void e_utf8_gtk_clist_set_text (GtkCList *clist, gint row, gint col, const gchar *text);
-gint e_utf8_gtk_clist_append (GtkCList *clist, gchar *text[]);
-
-gchar * e_utf8_xml1_decode (const gchar *text);
-gchar * e_utf8_xml1_encode (const gchar *text);
-
-gint g_unichar_to_utf8 (gint c, gchar *outbuf);
-guint32 gdk_keyval_to_unicode (guint keysym);
-
-END_GNOME_DECLS
-
-#endif
-
-
diff --git a/widgets/misc/gal-categories.glade b/widgets/misc/gal-categories.glade
deleted file mode 100644
index 4501c44452..0000000000
--- a/widgets/misc/gal-categories.glade
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>gal-categories.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label-header</name>
-	<label>Item(s) belong to these _categories:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-categories</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Available Categories:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/misc/pixmaps/.cvsignore b/widgets/misc/pixmaps/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/widgets/misc/pixmaps/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/widgets/misc/pixmaps/cursor_cross.xpm b/widgets/misc/pixmaps/cursor_cross.xpm
deleted file mode 100644
index cf9d0aca33..0000000000
--- a/widgets/misc/pixmaps/cursor_cross.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_cross_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"             .......            ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"        ......+++++......       ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        ......+++++.......      ",
-"         .....+++++.......      ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             ........           ",
-"              .......           ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_hand_closed.xpm b/widgets/misc/pixmaps/cursor_hand_closed.xpm
deleted file mode 100644
index 61a6de4b88..0000000000
--- a/widgets/misc/pixmaps/cursor_hand_closed.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_hand_closed_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"         ..                     ",
-"       ..++...                  ",
-"      .+++++++..                ",
-"      .+++++++++.               ",
-"    ...+++++++++.               ",
-"   .++.+++++++++.               ",
-"   .++++++++++++.               ",
-"    .+++++++++++.               ",
-"    .++++++++++.                ",
-"     .+++++++++.                ",
-"      .+++++++.                 ",
-"       .++++++.                 ",
-"       .++++++.                 ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_hand_open.xpm b/widgets/misc/pixmaps/cursor_hand_open.xpm
deleted file mode 100644
index 048acc8054..0000000000
--- a/widgets/misc/pixmaps/cursor_hand_open.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_hand_open_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"         ..                     ",
-"     .. .++...                  ",
-"    .++..++.++.                 ",
-"    .++..++.++. .               ",
-"     .++.++.++..+.              ",
-"     .++.++.++.++.              ",
-"   .. .+++++++.++.              ",
-"  .++..++++++++++.              ",
-"  .+++.+++++++++.               ",
-"   .++++++++++++.               ",
-"    .+++++++++++.               ",
-"    .++++++++++.                ",
-"     .+++++++++.                ",
-"      .+++++++.                 ",
-"       .++++++.                 ",
-"       .++++++.                 ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_zoom_in.xpm b/widgets/misc/pixmaps/cursor_zoom_in.xpm
deleted file mode 100644
index 1caf9e3e2a..0000000000
--- a/widgets/misc/pixmaps/cursor_zoom_in.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * cursor_zoom_in_xpm[] = {
-"32 32 2 1",
-" 	c None",
-".	c #000000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"        ......                  ",
-"       ..     ..                ",
-"      ..       ..               ",
-"      .         .               ",
-"     .    ...    .              ",
-"     .    ...    .              ",
-"     .  .......  .              ",
-"     .  .......  .              ",
-"     .    ...    .              ",
-"      .   ...   ..              ",
-"      ..       . .              ",
-"       ..     . . .             ",
-"        ........ . .            ",
-"         .....  . . .           ",
-"                 . . .          ",
-"                  . . .         ",
-"                   . . .        ",
-"                    . . .       ",
-"                     .   .      ",
-"                      .  .      ",
-"                       ..       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_zoom_out.xpm b/widgets/misc/pixmaps/cursor_zoom_out.xpm
deleted file mode 100644
index af1b698521..0000000000
--- a/widgets/misc/pixmaps/cursor_zoom_out.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * cursor_zoom_out_xpm[] = {
-"32 32 2 1",
-" 	c None",
-".	c #000000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"        ......                  ",
-"       ..     ..                ",
-"      ..       ..               ",
-"      .         .               ",
-"     .           .              ",
-"     .           .              ",
-"     .  .......  .              ",
-"     .  .......  .              ",
-"     .           .              ",
-"      .         ..              ",
-"      ..       . .              ",
-"       ..     . . .             ",
-"        ........ . .            ",
-"         .....  . . .           ",
-"                 . . .          ",
-"                  . . .         ",
-"                   . . .        ",
-"                    . . .       ",
-"                     .   .      ",
-"                      .  .      ",
-"                       ..       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
deleted file mode 100644
index eb443c24c8..0000000000
--- a/widgets/misc/test-calendar.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * test-calendar - tests the ECalendar widget.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "e-calendar.h"
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_SHORTCUT
-};
-static GtkTargetEntry target_table[] = {
-	{ "E-SHORTCUT",     0, TARGET_SHORTCUT }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-
-static void on_date_range_changed	(ECalendarItem *calitem);
-static void on_selection_changed	(ECalendarItem *calitem);
-static void get_day_style		(ECalendarItem	*calitem,
-					 gint		 year,
-					 gint		 month,
-					 gint		 day,
-					 gint		 day_style,
-					 gboolean	 today,
-					 gboolean	 prev_or_next_month,
-					 gboolean	 selected,
-					 gboolean	 has_focus,
-					 gboolean	 drop_target,
-					 GdkColor      **bg_color,
-					 GdkColor      **fg_color,
-					 GdkColor      **box_color,
-					 gboolean	*bold,
-					 gpointer	 data);
-
-static void
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 gpointer data)
-{
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	GtkWidget *cal;
-	GtkWidget *vbox;
-	ECalendarItem *calitem;
-
-	gnome_init ("test-calendar", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (app), 8);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), NULL);
-
-	cal = e_calendar_new ();
-	e_calendar_set_minimum_size (E_CALENDAR (cal), 1, 1);
-	calitem = E_CALENDAR (cal)->calitem;
-	gtk_widget_show (cal);
-	e_calendar_item_set_style_callback (calitem, get_day_style,
-					    NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (calitem), "date_range_changed",
-			    GTK_SIGNAL_FUNC (on_date_range_changed), NULL);
-	gtk_signal_connect (GTK_OBJECT (calitem), "selection_changed",
-			    GTK_SIGNAL_FUNC (on_selection_changed), NULL);
-
-
-	gtk_drag_dest_set (cal,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), cal, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	gnome_app_set_contents (GNOME_APP (app), vbox);
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
-
-
-static void
-on_date_range_changed (ECalendarItem *calitem)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-
-	e_calendar_item_get_date_range	(calitem,
-					 &start_year, &start_month, &start_day,
-					 &end_year, &end_month, &end_day);
-
-	g_print ("Date range changed (D/M/Y): %i/%i/%i - %i/%i/%i\n",
-		 start_day, start_month + 1, start_year,
-		 end_day, end_month + 1, end_year);
-
-	/* These days should appear bold. Remember month is 0 to 11. */
-	e_calendar_item_mark_day (calitem, 2000, 7, 26, /* 26th Aug 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
-	e_calendar_item_mark_day (calitem, 2000, 8, 13, /* 13th Sep 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
-}
-
-
-static void
-on_selection_changed (ECalendarItem *calitem)
-{
-	GDate start_date, end_date;
-
-	e_calendar_item_get_selection	(calitem, &start_date, &end_date);
-
-	g_print ("Selection changed (D/M/Y): %i/%i/%i - %i/%i/%i\n",
-		 g_date_day (&start_date),
-		 g_date_month (&start_date),
-		 g_date_year (&start_date),
-		 g_date_day (&end_date),
-		 g_date_month (&end_date),
-		 g_date_year (&end_date));
-}
-
-
-static void
-get_day_style		(ECalendarItem	*calitem,
-			 gint		 year,
-			 gint		 month,
-			 gint		 day,
-			 gint		 day_style,
-			 gboolean	 today,
-			 gboolean	 prev_or_next_month,
-			 gboolean	 selected,
-			 gboolean	 has_focus,
-			 gboolean	 drop_target,
-			 GdkColor      **bg_color,
-			 GdkColor      **fg_color,
-			 GdkColor      **box_color,
-			 gboolean	*bold,
-			 gpointer	 data)
-{
-	*bg_color = NULL;
-	*fg_color = NULL;
-	*box_color = NULL;
-	*bold = FALSE;
-
-#if 1
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG];
-	}
-
-#else
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-	}
-
-#endif
-}
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
deleted file mode 100644
index ed622201c8..0000000000
--- a/widgets/misc/test-color.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <gnome.h>
-#include "color.h"
-#include "pixmaps/font.xpm"
-#include "widget-color-combo.h"
-#include "color-palette.h"
-
-/* To compile (from src/widgets):
-
-gcc -I..  -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets
-
-*/
-
-
-gint
-main ( gint argc, gchar* argv[] )
-{
-	GtkWidget * dialog;
-	GtkWidget * T;
-	
-	gnome_init ("tester", "1.0", argc, argv);
-	
-	dialog = gnome_dialog_new ("TESTER", GNOME_STOCK_BUTTON_OK,
-				   GNOME_STOCK_BUTTON_CANCEL, NULL);
-	T = color_palette_new("Color Palette", NULL, "for_colorgroup");
-
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), 
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-
-	T = color_combo_new (font_xpm, _("Automatic"),
-			     &gs_black,
-			     "for_colorgroup");
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), 
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-	
-	T = color_combo_new (font_xpm, _("Automatic"),
-			     &gs_black,
-			     "back_colorgroup");
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), 
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-
-	gnome_dialog_run_and_close ( GNOME_DIALOG (dialog) );
-	return 0;
-}
-		
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
deleted file mode 100644
index 0bcd48ae51..0000000000
--- a/widgets/misc/test-dateedit.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * test-dateedit - tests the EDateEdit widget.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "e-dateedit.h"
-
-static void delete_event_cb		(GtkWidget	*widget,
-					 GdkEventAny	*event,
-					 GtkWidget	*app);
-static void on_get_date_clicked		(GtkWidget	*button,
-					 EDateEdit	*dedit);
-static void on_toggle_24_hour_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit);
-static void on_changed			(EDateEdit	*dedit,
-					 gchar		*name);
-#if 0
-static void on_date_changed		(EDateEdit	*dedit,
-					 gchar		*name);
-static void on_time_changed		(EDateEdit	*dedit,
-					 gchar		*name);
-#endif
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	EDateEdit *dedit;
-	GtkWidget *table, *button;
-
-	gnome_init ("test-dateedit", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 300, 200);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (app), 8);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), app);
-
-	table = gtk_table_new (3, 3, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-	gtk_widget_show (table);
-	gnome_app_set_contents (GNOME_APP (app), table);
-
-	/* EDateEdit 1. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "1");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "1");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "1");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 0, 1, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	/* EDateEdit 2. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-	e_date_edit_set_week_start_day (dedit, 1);
-	e_date_edit_set_show_week_numbers (dedit, TRUE);
-	e_date_edit_set_use_24_hour_format (dedit, FALSE);
-	e_date_edit_set_time_popup_range (dedit, 8, 18);
-	e_date_edit_set_show_time (dedit, FALSE);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "2");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "2");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "2");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 1, 2, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	/* EDateEdit 3. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 2, 3, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-	e_date_edit_set_week_start_day (dedit, 1);
-	e_date_edit_set_show_week_numbers (dedit, TRUE);
-	e_date_edit_set_use_24_hour_format (dedit, FALSE);
-	e_date_edit_set_time_popup_range (dedit, 8, 18);
-	e_date_edit_set_allow_no_date_set (dedit, TRUE);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "3");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "3");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "3");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 2, 3, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	button = gtk_button_new_with_label ("Toggle 24-hour");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  2, 3, 2, 3, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_toggle_24_hour_clicked),
-			    dedit);
-
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
-
-
-static void
-delete_event_cb		(GtkWidget	*widget,
-			 GdkEventAny	*event,
-			 GtkWidget	*app)
-{
-	gtk_widget_destroy (app);
-
-	gtk_main_quit ();
-}
-
-
-static void
-on_get_date_clicked	(GtkWidget	*button,
-			 EDateEdit	*dedit)
-{
-	time_t t;
-
-	t = e_date_edit_get_time (dedit);
-	if (t == -1)
-		g_print ("Time: None\n");
-	else
-		g_print ("Time: %s", ctime (&t));
-
-	if (!e_date_edit_date_is_valid (dedit))
-		g_print ("  Date invalid\n");
-
-	if (!e_date_edit_time_is_valid (dedit))
-		g_print ("  Time invalid\n");
-}
-
-
-static void
-on_toggle_24_hour_clicked	(GtkWidget	*button,
-				 EDateEdit	*dedit)
-{
-	e_date_edit_set_use_24_hour_format (dedit, !e_date_edit_get_use_24_hour_format (dedit));
-}
-
-
-#if 0
-static void
-on_date_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint year, month, day;
-
-	if (e_date_edit_date_is_valid (dedit)) {
-		if (e_date_edit_get_date (dedit, &year, &month, &day)) {
-			g_print ("Date %s changed to: %i/%i/%i (M/D/Y)\n",
-				 name, month, day, year);
-		} else {
-			g_print ("Date %s changed to: None\n", name);
-		}
-	} else {
-		g_print ("Date %s changed to: Not Valid\n", name);
-	}
-}
-
-
-static void
-on_time_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint hour, minute;
-
-	if (e_date_edit_time_is_valid (dedit)) {
-		if (e_date_edit_get_time_of_day (dedit, &hour, &minute)) {
-			g_print ("Time %s changed to: %02i:%02i\n", name,
-				 hour, minute);
-		} else {
-			g_print ("Time %s changed to: None\n", name);
-		}
-	} else {
-		g_print ("Time %s changed to: Not Valid\n", name);
-	}
-}
-#endif
-
-
-static void
-on_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint year, month, day, hour, minute;
-
-	g_print ("Date %s changed ", name);
-
-	if (e_date_edit_date_is_valid (dedit)) {
-		if (e_date_edit_get_date (dedit, &year, &month, &day)) {
-			g_print ("M/D/Y: %i/%i/%i", month, day, year);
-		} else {
-			g_print ("None");
-		}
-	} else {
-		g_print ("Date Invalid");
-	}
-
-	if (e_date_edit_time_is_valid (dedit)) {
-		if (e_date_edit_get_time_of_day (dedit, &hour, &minute)) {
-			g_print (" %02i:%02i\n", hour, minute);
-		} else {
-			g_print (" None\n");
-		}
-	} else {
-		g_print (" Time Invalid\n");
-	}
-}
-
-
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
deleted file mode 100644
index 3acfea3a1c..0000000000
--- a/widgets/misc/test-dropdown-button.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com> 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "e-dropdown-button.h"
-
-
-/* (The following is shameless stolen from `testgnome.c'.  */
-
-static void
-item_activated (GtkWidget *widget,
-		void *data)
-{
-	printf ("%s activated.\n", (char *) data);
-}
-
-static GnomeUIInfo ui_info[] = {
-	{ GNOME_APP_UI_ITEM, "_New", "Create a new file", item_activated, "file/new", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'n', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "_Open...", "Open an existing file", item_activated, "file/open", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'o', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "_Save", "Save the current file", item_activated, "file/save", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 's', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "Save _as...", "Save the current file with a new name", item_activated, "file/save as", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, 0, 0, NULL },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, "_Print...", "Print the current file", item_activated, "file/print", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PRINT, 'p', GDK_CONTROL_MASK, NULL },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, "_Close", "Close the current file", item_activated, "file/close", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, 0, 0, NULL },
-	{ GNOME_APP_UI_ITEM, "E_xit", "Exit the program", item_activated, "file/exit", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'q', GDK_CONTROL_MASK, NULL },
-	GNOMEUIINFO_END
-};
-
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *window;
-	GtkWidget *menu;
-	GtkWidget *dropdown_button;
-
-	gnome_init ("test-dropdown-button", "0.0", argc, argv);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size (GTK_WINDOW (window), 1, 1);
-
-	menu = gtk_menu_new ();
-
-	gnome_app_fill_menu (GTK_MENU_SHELL (menu), ui_info, NULL, TRUE, 0);
-
-	dropdown_button = e_dropdown_button_new ("Me_nu", GTK_MENU (menu));
-	gtk_container_add (GTK_CONTAINER (window), dropdown_button);
-
-	gtk_widget_show (window);
-	gtk_widget_show (dropdown_button);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/widgets/misc/test-title-bar.c b/widgets/misc/test-title-bar.c
deleted file mode 100644
index fdca1ae0db..0000000000
--- a/widgets/misc/test-title-bar.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include "e-title-bar.h"
-
-static void
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 gpointer data)
-{
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	GtkWidget *title_bar;
-	GtkWidget *text;
-	GtkWidget *vbox;
-
-	gnome_init ("test-title-bar", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event", GTK_SIGNAL_FUNC (delete_event_cb), NULL);
-
-	title_bar = e_title_bar_new ("This is a very annoyingly long title bar");
-	gtk_widget_show (title_bar);
-
-	text = gtk_text_new (NULL, NULL);
-	gtk_widget_show (text);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), title_bar, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), text, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	gnome_app_set_contents (GNOME_APP (app), vbox);
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/widgets/table/.cvsignore b/widgets/table/.cvsignore
deleted file mode 100644
index b1004fee2c..0000000000
--- a/widgets/table/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-table-test
-table-example-1
-table-example-2
-table-size-test
-tree-example-1
-tree-example-2
diff --git a/widgets/table/add-col.xpm b/widgets/table/add-col.xpm
deleted file mode 100644
index 9c5f314c8e..0000000000
--- a/widgets/table/add-col.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * add_col_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............. ",
-" .++++++++++++. ",
-" .++++++++++++. ",
-" ....+++....... ",
-"     .+.        ",
-"      .         ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/table/arrow-down.xpm b/widgets/table/arrow-down.xpm
deleted file mode 100644
index f1e6cb4b3c..0000000000
--- a/widgets/table/arrow-down.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * arrow_down_xpm[] = {
-"13 16 2 1",
-" 	c None",
-".	c #FF0000",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-".............",
-" ........... ",
-"  .........  ",
-"   .......   ",
-"    .....    ",
-"     ...     ",
-"      .      "};
diff --git a/widgets/table/arrow-up.xpm b/widgets/table/arrow-up.xpm
deleted file mode 100644
index 0cc5b9a00c..0000000000
--- a/widgets/table/arrow-up.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * arrow_up_xpm[] = {
-"13 16 2 1",
-" 	c None",
-".	c #FF0000",
-"      .      ",
-"     ...     ",
-"    .....    ",
-"   .......   ",
-"  .........  ",
-" ........... ",
-".............",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     "};
diff --git a/widgets/table/check-empty.xpm b/widgets/table/check-empty.xpm
deleted file mode 100644
index 746b20234e..0000000000
--- a/widgets/table/check-empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/widgets/table/check-filled.xpm b/widgets/table/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/widgets/table/check-filled.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_filled_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .        . .  ",
-"  .       .. .  ",
-"  .      ... .  ",
-"  . .   ...  .  ",
-"  . .. ...   .  ",
-"  . .....    .  ",
-"  .  ...     .  ",
-"  .   .      .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/widgets/table/clip.png b/widgets/table/clip.png
deleted file mode 100644
index 27aa5f072f..0000000000
--- a/widgets/table/clip.png
+++ /dev/null
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
deleted file mode 100644
index 2857388cb6..0000000000
--- a/widgets/table/e-cell-checkbox.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * e-cell-checkbox.c: Checkbox cell renderer
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999, 2000 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "e-cell-checkbox.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-
-#include "check-empty.xpm"
-#include "check-filled.xpm"
-
-#define PARENT_TYPE e_cell_toggle_get_type ()
-
-static GdkPixbuf *checks [2];
-
-static void
-e_cell_checkbox_class_init (GtkObjectClass *object_class)
-{
-	checks [0] = gdk_pixbuf_new_from_xpm_data (check_empty_xpm);
-	checks [1] = gdk_pixbuf_new_from_xpm_data (check_filled_xpm);
-}
-
-E_MAKE_TYPE(e_cell_checkbox, "ECellCheckbox", ECellCheckbox, e_cell_checkbox_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_checkbox_new:
- *
- * Creates a new ECell renderer that can be used to render check
- * boxes.  the data provided from the model is cast to an integer.
- * zero is used for the off display, and non-zero for checked status.
- * 
- * Returns: an ECell object that can be used to render checkboxes.
- */
-ECell *
-e_cell_checkbox_new (void)
-{
-	ECellCheckbox *eccb = gtk_type_new (e_cell_checkbox_get_type ());
-
-	e_cell_toggle_construct (E_CELL_TOGGLE (eccb), 2, 2, checks);
-      
-	return (ECell *) eccb;
-}
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
deleted file mode 100644
index 60c0341fe7..0000000000
--- a/widgets/table/e-cell-checkbox.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _E_CELL_CHECKBOX_H_
-#define _E_CELL_CHECKBOX_H_
-
-#include <gal/e-table/e-cell-toggle.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_CHECKBOX_TYPE        (e_cell_checkbox_get_type ())
-#define E_CELL_CHECKBOX(o)          (GTK_CHECK_CAST ((o), E_CELL_CHECKBOX_TYPE, ECellCheckbox))
-#define E_CELL_CHECKBOX_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_CHECKBOX_TYPE, ECellCheckboxClass))
-#define E_IS_CELL_CHECKBOX(o)       (GTK_CHECK_TYPE ((o), E_CELL_CHECKBOX_TYPE))
-#define E_IS_CELL_CHECKBOX_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_CHECKBOX_TYPE))
-
-typedef struct {
-	ECellToggle parent;
-} ECellCheckbox;
-
-typedef struct {
-	ECellToggleClass parent_class;
-} ECellCheckboxClass;
-
-GtkType    e_cell_checkbox_get_type (void);
-ECell     *e_cell_checkbox_new      (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_CHECKBOX_H_ */
-
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
deleted file mode 100644
index 8aa689937a..0000000000
--- a/widgets/table/e-cell-combo.c
+++ /dev/null
@@ -1,571 +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 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
- */
-
-/*
- * ECellCombo - a subclass of ECellPopup used to support popup lists like a
- * GtkCombo widget. It only supports a basic popup list of strings at present,
- * with no auto-completion.
- */
-
-/*
- * Notes: (handling pointer grabs and GTK+ grabs is a nightmare!)
- *
- * o We must grab the pointer when we show the popup, so that if any buttons
- *   are pressed outside the application we hide the popup.
- *
- * o We have to be careful when popping up any widgets which also grab the
- *   pointer at some point, since we will lose our own pointer grab.
- *   When we pop up a list it will grab the pointer itself when an item is
- *   selected, and release the grab when the button is released.
- *   Fortunately we hide the popup at this point, so it isn't a problem.
- *   But for other types of widgets in the popup it could cause trouble.
- *   - I think GTK+ should provide help for this (nested pointer grabs?).
- *
- * o We must set the 'owner_events' flag of the pointer grab to TRUE so that
- *   pointer events get reported to all the application windows as normal.
- *   If we don't do this then the widgets in the popup may not work properly.
- *
- * o We must do a gtk_grab_add() so that we only allow events to go to the
- *   widgets within the popup (though some special events still get reported
- *   to the widget owning the window). Doing th gtk_grab_add() on the toplevel
- *   popup window should be fine. We can then check for any events that should
- *   close the popup, like the Escape key, or a button press outside the popup.
- */
-
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-#include "e-cell-combo.h"
-
-
-/* The height to make the popup list if there aren't any items in it. */
-#define	E_CELL_COMBO_LIST_EMPTY_HEIGHT	15
-
-
-static void e_cell_combo_class_init	(GtkObjectClass	*object_class);
-static void e_cell_combo_init		(ECellCombo	*ecc);
-static void e_cell_combo_destroy	(GtkObject	*object);
-
-static gint e_cell_combo_do_popup	(ECellPopup	*ecp,
-					 GdkEvent	*event);
-static void e_cell_combo_show_popup	(ECellCombo	*ecc);
-static void e_cell_combo_get_popup_pos	(ECellCombo	*ecc,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width);
-
-static gint e_cell_combo_button_press	(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc);
-static gint e_cell_combo_button_release	(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc);
-static int e_cell_combo_key_press	(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc);
-
-static void e_cell_combo_update_cell	(ECellCombo	*ecc);
-static void e_cell_combo_restart_edit	(ECellCombo	*ecc);
-
-
-static ECellPopupClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_combo, "ECellCombo", ECellCombo,
-	     e_cell_combo_class_init, e_cell_combo_init,
-	     e_cell_popup_get_type());
-
-
-static void
-e_cell_combo_class_init			(GtkObjectClass	*object_class)
-{
-	ECellPopupClass *ecpc = (ECellPopupClass *) object_class;
-
-	object_class->destroy = e_cell_combo_destroy;
-
-	ecpc->popup = e_cell_combo_do_popup;
-
-	parent_class = gtk_type_class (e_cell_popup_get_type ());
-}
-
-
-static void
-e_cell_combo_init			(ECellCombo	*ecc)
-{
-	GtkWidget *frame;
-
-	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
-	ecc->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-
-	gtk_window_set_policy (GTK_WINDOW (ecc->popup_window),
-			       TRUE, TRUE, FALSE);
-  
-	frame = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (ecc->popup_window), frame);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_widget_show (frame);
-
-	ecc->popup_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window);
-	gtk_widget_show (ecc->popup_scrolled_window);
-
-	ecc->popup_list = gtk_list_new ();
-	gtk_list_set_selection_mode (GTK_LIST (ecc->popup_list),
-				     GTK_SELECTION_BROWSE);
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window), ecc->popup_list);
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (ecc->popup_list),
-					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
-	gtk_container_set_focus_hadjustment (GTK_CONTAINER (ecc->popup_list),
-					     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
-	gtk_widget_show (ecc->popup_list);
-
-	gtk_signal_connect (GTK_OBJECT (ecc->popup_window),
-			    "button_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_combo_button_press),
-			    ecc);
-	/* We use connect_after here so the list updates the selection before
-	   we hide the popup and update the cell. */
-	gtk_signal_connect_after (GTK_OBJECT (ecc->popup_window),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_cell_combo_button_release),
-				  ecc);
-	gtk_signal_connect (GTK_OBJECT (ecc->popup_window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_combo_key_press), ecc);
-}
-
-
-/**
- * e_cell_combo_new:
- *
- * Creates a new ECellCombo renderer.
- *
- * Returns: an ECellCombo object.
- */
-ECell *
-e_cell_combo_new			(void)
-{
-	ECellCombo *ecc = gtk_type_new (e_cell_combo_get_type ());
-
-	return (ECell*) ecc;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_combo_destroy			(GtkObject *object)
-{
-	ECellCombo *ecc = E_CELL_COMBO (object);
-
-	gtk_widget_unref (ecc->popup_window);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-
-void
-e_cell_combo_set_popdown_strings	(ECellCombo	*ecc, 
-					 GList		*strings)
-{
-	GList *elem;
-	GtkWidget *listitem;
-
-	g_return_if_fail (E_IS_CELL_COMBO (ecc));
-	g_return_if_fail (strings != NULL);
-
-	gtk_list_clear_items (GTK_LIST (ecc->popup_list), 0, -1);
-	elem = strings;
-	while (elem) {
-		listitem = gtk_list_item_new_with_label ((gchar *) elem->data);
-		gtk_widget_show (listitem);
-		gtk_container_add (GTK_CONTAINER (ecc->popup_list), listitem);
-		elem = elem->next;
-	}
-}
-
-
-static gint
-e_cell_combo_do_popup			(ECellPopup	*ecp,
-					 GdkEvent	*event)
-{
-	ECellCombo *ecc = E_CELL_COMBO (ecp);
-	guint32 time;
-	gint error_code;
-
-	e_cell_combo_show_popup (ecc);
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		GTK_LIST (ecc->popup_list)->drag_selection = TRUE;
-		time = event->button.time;
-	} else {
-		time = event->key.time;
-	}
-
-	error_code = gdk_pointer_grab (ecc->popup_list->window, TRUE,
-				       GDK_ENTER_NOTIFY_MASK |
-				       GDK_BUTTON_PRESS_MASK | 
-				       GDK_BUTTON_RELEASE_MASK |
-				       GDK_POINTER_MOTION_HINT_MASK |
-				       GDK_BUTTON1_MOTION_MASK,
-				       NULL, NULL, time);
-	if (error_code != 0)
-		g_warning ("Failed to get pointer grab (%i)", error_code);
-	gtk_grab_add (ecc->popup_window);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_combo_show_popup			(ECellCombo	*ecc)
-{
-	gint x, y, width, height, old_width, old_height;
-
-	g_print ("In e_cell_popup_popup_list\n");
-
-	/* This code is practically copied from GtkCombo. */
-	old_width = ecc->popup_window->allocation.width;
-	old_height  = ecc->popup_window->allocation.height;
-
-	e_cell_combo_get_popup_pos (ecc, &x, &y, &height, &width);
-
-	/* workaround for gtk_scrolled_window_size_allocate bug */
-	if (old_width != width || old_height != height) {
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar);
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar);
-	}
-
-	gtk_widget_set_uposition (ecc->popup_window, x, y);
-	gtk_widget_set_usize (ecc->popup_window, width, height);
-	gtk_widget_realize (ecc->popup_window);
-	gdk_window_resize (ecc->popup_window->window, width, height);
-	gtk_widget_show (ecc->popup_window);
-
-	gtk_widget_grab_focus (ecc->popup_list);
-
-	E_CELL_POPUP (ecc)->popup_shown = TRUE;
-}
-
-
-/* Calculates the size and position of the popup window (like GtkCombo). */
-static void
-e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
-	GtkBin *popwin;
-	GtkScrolledWindow *popup;
-	GtkRequisition list_requisition;
-	gboolean show_vscroll = FALSE, show_hscroll = FALSE;
-	gint avail_height, avail_width, min_height, work_height, screen_width;
-	gint column_width, row_height, scrollbar_width;
-	double x1, y1;
-  
-	/* This code is practically copied from GtkCombo. */
-	popup  = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
-	popwin = GTK_BIN (ecc->popup_window);
-  
-	gdk_window_get_origin (canvas->window, x, y);
-
-	x1 = e_table_header_col_diff (eti->header, 0, eti->editing_col + 1);
-	y1 = e_table_item_row_diff (eti, 0, eti->editing_row + 1);
-	column_width = e_table_header_col_diff (eti->header, eti->editing_col,
-						eti->editing_col + 1);
-	row_height = e_table_item_row_diff (eti, eti->editing_row,
-					    eti->editing_row + 1);
-	gnome_canvas_item_i2w (GNOME_CANVAS_ITEM (eti), &x1, &y1);
-
-	*x += x1;
-	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
-	*y += y1 + 1;
-
-	scrollbar_width = popup->vscrollbar->requisition.width
-		+ GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (popup)->klass)->scrollbar_spacing;
-
-	avail_height = gdk_screen_height () - *y;
-
-	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
-	screen_width = gdk_screen_width ();
-	avail_width = screen_width - scrollbar_width;
-  
-	gtk_widget_size_request (ecc->popup_list, &list_requisition);
-	min_height = MIN (list_requisition.height, 
-			  popup->vscrollbar->requisition.height);
-	if (!GTK_LIST (ecc->popup_list)->children)
-		list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
-  
-	/* Calculate the desired width. */
-	*width = list_requisition.width
-		+ 2 * popwin->child->style->klass->xthickness
-		+ 2 * GTK_CONTAINER (popwin->child)->border_width
-		+ 2 * GTK_CONTAINER (popup)->border_width
-		+ 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		+ 2 * GTK_BIN (popup)->child->style->klass->xthickness;
-
-	/* Use at least the same width as the column. */
-	if (*width < column_width)
-		*width = column_width;
-
-	/* If it is larger than the available width, use that instead and show
-	   the horizontal scrollbar. */
-	if (*width > avail_width) {
-		*width = avail_width;
-		show_hscroll = TRUE;
-	}
-
-	/* Calculate all the borders etc. that we need to add to the height. */
-	work_height = (2 * popwin->child->style->klass->ythickness
-		       + 2 * GTK_CONTAINER (popwin->child)->border_width
-		       + 2 * GTK_CONTAINER (popup)->border_width
-		       + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		       + 2 * GTK_BIN (popup)->child->style->klass->xthickness);
-
-	/* Add on the height of the horizontal scrollbar if we need it. */
-	if (show_hscroll)
-		work_height += popup->hscrollbar->requisition.height +
-			GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (popup)->klass)->scrollbar_spacing;
-
-	/* Check if it fits in the available height. */
-	if (work_height + list_requisition.height > avail_height) {
-		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
-		if (work_height + min_height > avail_height
-		    && *y - row_height > avail_height) {
-			/* We don't, so we show the popup above the cell
-			   instead of below it. */
-			avail_height = *y - row_height;
-			*y -= (work_height + list_requisition.height
-			       + row_height);
-			if (*y < 0)
-				*y = 0;
-		}
-	}
-
-	/* Check if we still need the vertical scrollbar. */
-	if (work_height + list_requisition.height > avail_height) {
-		*width += scrollbar_width;
-		show_vscroll = TRUE;
-	}
-
-	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
-	if (*x > screen_width)
-		*x = screen_width;
-	*x -= *width;
-	if (*x < 0)
-		*x = 0;
-
-	if (show_vscroll)
-		*height = avail_height;
-	else
-		*height = work_height + list_requisition.height;
-}
-
-
-
-
-
-
-/* This handles button press events in the popup window.
-   Note that since we have a pointer grab on this window, we also get button
-   press events for windows outside the application here, so we hide the popup
-   window if that happens. We also get propagated events from child widgets
-   which we ignore. */
-static gint
-e_cell_combo_button_press		(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc)
-{
-	GtkWidget *event_widget;
-
-	g_print ("In e_cell_popup_button_press\n");
-
-	event_widget = gtk_get_event_widget (event);
-
-	/* If the button press was for a widget inside the popup list, but
-	   not the popup window itself, then we ignore the event and return
-	   FALSE. Otherwise we will hide the popup.
-	   Note that since we have a pointer grab on the popup list, button
-	   presses outside the application will be reported to this window,
-	   which is why we hide the popup in this case. */
-	while (event_widget) {
-		event_widget = event_widget->parent;
-		if (event_widget == ecc->popup_list)
-			return FALSE;
-	}
-
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->button.time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	e_cell_combo_update_cell (ecc);
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-/* This handles button release events in the popup window. If the button is
-   released inside the list, we want to hide the popup window and update the
-   cell with the new selection. */
-static gint
-e_cell_combo_button_release		(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc)
-{
-	GtkWidget *event_widget;
-
-	event_widget = gtk_get_event_widget ((GdkEvent*) event);
-  
-	g_print ("In e_cell_popup_button_release event_widget:%s\n",
-		 gtk_widget_get_name (event_widget));
-
-	/* See if the button was released in the list (or its children). */
-	while (event_widget && event_widget != ecc->popup_list)
-		event_widget = event_widget->parent;
-
-	/* If it wasn't, then we just ignore the event. */
-	if (event_widget != ecc->popup_list)
-		return FALSE;
-
-	/* The button was released inside the list, so we hide the popup and
-	   update the cell to reflect the new selection. */
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	e_cell_combo_update_cell (ecc);
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-/* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
-static int
-e_cell_combo_key_press			(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc)
-{
-	g_print ("In e_cell_popup_key_press\n");
-
-	/* If the Escape key is pressed we hide the popup. */
-	if (event->keyval != GDK_Escape
-	    && event->keyval != GDK_Return
-	    && event->keyval != GDK_KP_Enter
-	    && event->keyval != GDK_ISO_Enter
-	    && event->keyval != GDK_3270_Enter)
-		return FALSE;
-
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	if (event->keyval != GDK_Escape)
-		e_cell_combo_update_cell (ecc);
-
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_combo_update_cell		(ECellCombo	*ecc)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	ETableCol *ecol;
-	GtkList *list = GTK_LIST (ecc->popup_list);
-	GtkListItem *listitem;
-	gchar *text, *old_text;
-
-	g_print ("In e_cell_popup_update_cell\n");
-
-	/* Return if no item is selected. */
-	if (list->selection == NULL)
-		return;
-
-	/* Get the text of the selected item. */
-	listitem = list->selection->data;
-	gtk_label_get (GTK_LABEL (GTK_BIN (listitem)->child), &text);
-
-	/* Compare it with the existing cell contents. */
-	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
-	old_text = e_table_model_value_at (ecv->e_table_model,
-					   ecol->col_idx, ecp->popup_row);
-
-	g_print ("   Old text: %s New text: %s\n", old_text, text);
-
-	/* If they are different, update the cell contents. */
-	if (strcmp (old_text, text)) {
-		g_print ("  Setting cell text...\n");
-		e_table_model_set_value_at (ecv->e_table_model,
-					    ecol->col_idx, ecp->popup_row,
-					    text);
-		g_print ("  Set cell text.\n");
-	}
-}
-
-
-static void
-e_cell_combo_restart_edit		(ECellCombo	*ecc)
-{
-	/* This doesn't work. ETable stops the edit straight-away again. */
-#if 0
-	ECellView *ecv = (ECellView*) ecc->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-
-	e_table_item_enter_edit (eti, ecc->popup_view_col, ecc->popup_row);
-#endif
-}
-
-
-
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
deleted file mode 100644
index 9f8833d029..0000000000
--- a/widgets/table/e-cell-combo.h
+++ /dev/null
@@ -1,62 +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 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
- */
-
-/*
- * ECellCombo - a subclass of ECellPopup used to support popup lists like a
- * GtkCombo widget. It only supports a basic popup list of strings at present,
- * with no auto-completion.
- */
-
-#ifndef _E_CELL_COMBO_H_
-#define _E_CELL_COMBO_H_
-
-#include <gal/e-table/e-cell-popup.h>
-
-#define E_CELL_COMBO_TYPE        (e_cell_combo_get_type ())
-#define E_CELL_COMBO(o)          (GTK_CHECK_CAST ((o), E_CELL_COMBO_TYPE, ECellCombo))
-#define E_CELL_COMBO_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_COMBO_TYPE, ECellComboClass))
-#define E_IS_CELL_COMBO(o)       (GTK_CHECK_TYPE ((o), E_CELL_COMBO_TYPE))
-#define E_IS_CELL_COMBO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE))
-
-
-typedef struct {
-	ECellPopup parent;
-
-	GtkWidget *popup_window;
-	GtkWidget *popup_scrolled_window;
-	GtkWidget *popup_list;
-} ECellCombo;
-
-typedef struct {
-	ECellPopupClass parent_class;
-} ECellComboClass;
-
-
-GtkType    e_cell_combo_get_type		(void);
-ECell     *e_cell_combo_new			(void);
-
-void       e_cell_combo_set_popdown_strings	(ECellCombo	*ecc, 
-						 GList		*strings);
-
-#endif /* _E_CELL_COMBO_H_ */
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
deleted file mode 100644
index a70147f0ce..0000000000
--- a/widgets/table/e-cell-date.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellDate - Date item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include "gal/util/e-i18n.h"
-#include "e-cell-date.h"
-#include <gnome.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	time_t date = GPOINTER_TO_INT (e_table_model_value_at(model, col, row));
-	time_t nowdate = time(NULL);
-	time_t yesdate;
-	struct tm then, now, yesterday;
-	char buf[26];
-	gboolean done = FALSE;
-
-	if (date == 0) {
-		return e_utf8_from_locale_string (_("?"));
-	}
-
-	localtime_r (&date, &then);
-	localtime_r (&nowdate, &now);
-	if (then.tm_mday == now.tm_mday &&
-	    then.tm_mon == now.tm_mon &&
-	    then.tm_year == now.tm_year) {
-		strftime (buf, 26, _("Today %l:%M %p"), &then);
-		done = TRUE;
-	}
-	if (!done) {
-		yesdate = nowdate - 60 * 60 * 24;
-		localtime_r (&yesdate, &yesterday);
-		if (then.tm_mday == yesterday.tm_mday &&
-		    then.tm_mon == yesterday.tm_mon &&
-		    then.tm_year == yesterday.tm_year) {
-			strftime (buf, 26, _("Yesterday %l:%M %p"), &then);
-			done = TRUE;
-		}
-	}
-	if (!done) {
-		int i;
-		for (i = 2; i < 7; i++) {
-			yesdate = nowdate - 60 * 60 * 24 * i;
-			localtime_r (&yesdate, &yesterday);
-			if (then.tm_mday == yesterday.tm_mday &&
-			    then.tm_mon == yesterday.tm_mon &&
-			    then.tm_year == yesterday.tm_year) {
-				strftime (buf, 26, _("%a %l:%M %p"), &then);
-				done = TRUE;
-				break;
-			}
-		}
-	}
-	if (!done) {
-		if (then.tm_year == now.tm_year) {
-			strftime (buf, 26, _("%b %d %l:%M %p"), &then);
-		} else {
-			strftime (buf, 26, _("%b %d %Y"), &then);
-		}
-	}
-#if 0
-#ifdef CTIME_R_THREE_ARGS
-	ctime_r (&date, buf, 26);
-#else
-	ctime_r (&date, buf);
-#endif
-#endif
-	
-	return e_utf8_from_locale_string (buf);
-}
-
-static void
-ecd_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_date_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-}
-
-static void
-e_cell_date_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_date_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render dates that
- * that come from the model.  The value returned from the model is
- * interpreted as being a time_t.
- *
- * The ECellDate object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, color and a date filter.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the date should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render dates.
- */
-ECell *
-e_cell_date_new (const char *fontname, GtkJustification justify)
-{
-	ECellDate *ecd = gtk_type_new (e_cell_date_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
-E_MAKE_TYPE(e_cell_date, "ECellDate", ECellDate, e_cell_date_class_init, e_cell_date_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h
deleted file mode 100644
index 25bde7a85a..0000000000
--- a/widgets/table/e-cell-date.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellDate - Date item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_DATE_H_
-#define _E_CELL_DATE_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_DATE_TYPE        (e_cell_date_get_type ())
-#define E_CELL_DATE(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_TYPE, ECellDate))
-#define E_CELL_DATE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_TYPE, ECellDateClass))
-#define E_IS_CELL_DATE(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_TYPE))
-#define E_IS_CELL_DATE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellDate;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellDateClass;
-
-GtkType    e_cell_date_get_type (void);
-ECell     *e_cell_date_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_DATE_H_ */
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
deleted file mode 100644
index ebac2c78ed..0000000000
--- a/widgets/table/e-cell-number.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellNumber - Number item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include "gal/util/e-i18n.h"
-#include "e-cell-number.h"
-#include <gnome.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecn_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	return e_format_number(GPOINTER_TO_INT (e_table_model_value_at(model, col, row)));
-}
-
-static void
-ecn_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_number_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecn_get_text;
-	ectc->free_text = ecn_free_text;
-}
-
-static void
-e_cell_number_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_number_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render numbers that
- * that come from the model.  The value returned from the model is
- * interpreted as being an int.
- *
- * See ECellText for other features.
- * 
- * Returns: an ECell object that can be used to render numbers.
- */
-ECell *
-e_cell_number_new (const char *fontname, GtkJustification justify)
-{
-	ECellNumber *ecn = gtk_type_new (e_cell_number_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify);
-      
-	return (ECell *) ecn;
-}
-
-E_MAKE_TYPE(e_cell_number, "ECellNumber", ECellNumber, e_cell_number_class_init, e_cell_number_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h
deleted file mode 100644
index b9124bb2b0..0000000000
--- a/widgets/table/e-cell-number.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellNumber - Number item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_NUMBER_H_
-#define _E_CELL_NUMBER_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_NUMBER_TYPE        (e_cell_number_get_type ())
-#define E_CELL_NUMBER(o)          (GTK_CHECK_CAST ((o), E_CELL_NUMBER_TYPE, ECellNumber))
-#define E_CELL_NUMBER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_NUMBER_TYPE, ECellNumberClass))
-#define E_IS_CELL_NUMBER(o)       (GTK_CHECK_TYPE ((o), E_CELL_NUMBER_TYPE))
-#define E_IS_CELL_NUMBER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_NUMBER_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellNumber;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellNumberClass;
-
-GtkType    e_cell_number_get_type (void);
-ECell     *e_cell_number_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_NUMBER_H_ */
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
deleted file mode 100644
index 0321474677..0000000000
--- a/widgets/table/e-cell-pixbuf.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * e-cell-pixbuf.c: An ECell that displays a GdkPixbuf
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * Authors: Vladimir Vukicevic <vladimir@ximian.com>
- *
- */
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <stdio.h>
-
-#include <libgnomeui/libgnomeui.h>
-
-#include "e-cell-pixbuf.h"
-
-static ECellClass *parent_class;
-
-typedef struct _ECellPixbufView ECellPixbufView;
-
-struct _ECellPixbufView {
-    ECellView cell_view;
-    GdkGC *gc;
-    GnomeCanvas *canvas;
-};
-
-/*
- * ECellPixbuf functions
- */
-
-ECell *
-e_cell_pixbuf_new (void)
-{
-    ECellPixbuf *ecp;
-
-    ecp = gtk_type_new (E_CELL_PIXBUF_TYPE);
-    e_cell_pixbuf_construct (ecp);
-
-    return (ECell *) ecp;
-}
-
-void
-e_cell_pixbuf_construct (ECellPixbuf *ecp)
-{
-    /* noop */
-    return;
-}
-
-/*
- * ECell methods
- */
-
-static ECellView *
-pixbuf_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-    ECellPixbufView *pixbuf_view = g_new0 (ECellPixbufView, 1);
-    ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
-    GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas;
-
-    pixbuf_view->cell_view.ecell = ecell;
-    pixbuf_view->cell_view.e_table_model = table_model;
-    pixbuf_view->cell_view.e_table_item_view = e_table_item_view;
-    pixbuf_view->canvas = canvas;
-
-    return (ECellView *) pixbuf_view;
-}
-
-static void
-pixbuf_kill_view (ECellView *ecell_view)
-{
-    ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
-
-    g_free (pixbuf_view);
-}
-
-static void
-pixbuf_realize (ECellView *ecell_view)
-{
-    ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
-
-    pixbuf_view->gc = gdk_gc_new (GTK_WIDGET (pixbuf_view->canvas)->window);
-}
-
-static void
-pixbuf_unrealize (ECellView *ecell_view)
-{
-    ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
-
-    gdk_gc_unref (pixbuf_view->gc);
-}
-
-static void
-pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
-             int model_col, int view_col, int row, ECellFlags flags,
-             int x1, int y1, int x2, int y2)
-{
-    ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
-    GdkPixbuf *cell_pixbuf;
-    int real_x, real_y, real_w, real_h;
-    int pix_w, pix_h;
-
-    cell_pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model,
-                                                        model_col, row);
-    /* we can't make sure we really got a pixbuf since, well, it's a Gdk thing */
-
-    if (x2 - x1 == 0)
-        return;
-
-    pix_w = gdk_pixbuf_get_width (cell_pixbuf);
-    pix_h = gdk_pixbuf_get_height (cell_pixbuf);
-
-    /* We center the pixbuf within our allocated space */
-    if (x2 - x1 > pix_w) {
-        int diff = (x2 - x1) - pix_w;
-        real_x = x1 + diff/2;
-        real_w = pix_w;
-    } else {
-        real_x = x1;
-        real_w = x2 - x1;
-    }
-
-    if (y2 - y1 > pix_h) {
-        int diff = (y2 - y1) - pix_h;
-        real_y = y1 + diff/2;
-        real_h = pix_h;
-    } else {
-        real_y = y1;
-        real_h = y2 - y1;
-    }
-
-
-    gdk_pixbuf_render_to_drawable (cell_pixbuf,
-                                   drawable,
-                                   pixbuf_view->gc,
-                                   0, 0,
-                                   real_x, real_y, 
-                                   real_w, real_h,
-                                   GDK_RGB_DITHER_NORMAL,
-                                   0, 0);
-}
-
-static gint
-pixbuf_event (ECellView *ecell_view, GdkEvent *event,
-              int model_col, int view_col, int row,
-              ECellFlags flags, ECellActions *actions)
-{
-    /* noop */
-
-    return FALSE;
-}
-
-static gint
-pixbuf_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-    GdkPixbuf *pixbuf;
-
-    pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, model_col, row);
-    if (!pixbuf) {
-        /* ??? */
-        g_warning ("e-cell-pixbuf: height with NULL pixbuf at %d %d %d\n", model_col, view_col, row);
-        return 0;
-    }
-
-    /* We give ourselves 3 pixels of padding on either side */
-    return gdk_pixbuf_get_height (pixbuf) + 6;
-}
-
-static gint
-pixbuf_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-    gint num_rows, i;
-    gint max_width = -1;
-
-    if (model_col == 0) {
-        num_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-        for (i = 0; i <= num_rows; i++) {
-            GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at
-                (ecell_view->e_table_model,
-                 model_col,
-                 i);
-            int pw = gdk_pixbuf_get_width (pixbuf);
-            if (max_width < pw)
-                max_width = pw;
-        }
-    } else {
-        return -1;
-    }
-
-    return max_width;
-}
-
-static void
-pixbuf_destroy (GtkObject *object)
-{
-    /* ... */
-}
-
-static void
-e_cell_pixbuf_init (GtkObject *object)
-{
-    /* ... */
-}
-
-static void
-e_cell_pixbuf_class_init (GtkObjectClass *object_class)
-{
-    ECellClass *ecc = (ECellClass *) object_class;
-
-    object_class->destroy = pixbuf_destroy;
-
-    ecc->new_view = pixbuf_new_view;
-    ecc->kill_view = pixbuf_kill_view;
-    ecc->realize = pixbuf_realize;
-    ecc->unrealize = pixbuf_unrealize;
-    ecc->draw = pixbuf_draw;
-    ecc->event = pixbuf_event;
-    ecc->height = pixbuf_height;
-    ecc->max_width = pixbuf_max_width;
-
-    parent_class = gtk_type_class (E_CELL_TYPE);
-}
-
-guint
-e_cell_pixbuf_get_type (void)
-{
-    static guint type = 0;
-
-    if (!type) {
-        GtkTypeInfo type_info = {
-            "ECellPixbuf",
-            sizeof (ECellPixbuf),
-            sizeof (ECellPixbufClass),
-            (GtkClassInitFunc) e_cell_pixbuf_class_init,
-            (GtkObjectInitFunc) e_cell_pixbuf_init,
-            (GtkArgSetFunc) NULL,
-            (GtkArgGetFunc) NULL,
-        };
-
-        type = gtk_type_unique (e_cell_get_type (), &type_info);
-    }
-
-    return type;
-}
-
diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h
deleted file mode 100644
index b300f410ba..0000000000
--- a/widgets/table/e-cell-pixbuf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * e-cell-pixbuf.h: An ECell that displays a GdkPixbuf
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * Authors: Vladimir Vukicevic <vladimir@ximian.com>
- *
- */
-
-#ifndef _E_CELL_PIXBUF_H_
-#define _E_CELL_PIXBUF_H_
-
-#include <glib.h>
-
-#include <gal/e-table/e-table.h>
-
-#define E_CELL_PIXBUF_TYPE		(e_cell_pixbuf_get_type ())
-#define E_CELL_PIXBUF(o)		(GTK_CHECK_CAST ((o), E_CELL_PIXBUF_TYPE, ECellPixbuf))
-#define E_CELL_PIXBUF_CLASS(k)	(GTK_CHECK_CAST_CLASS ((k), E_CELL_PIXBUF_TYPE, ECellPixbufClass))
-#define E_IS_CELL_PIXBUF(o)		(GTK_CHECK_TYPE ((o), E_CELL_PIXBUF_TYPE))
-#define E_IS_CELL_PIXBUF_CLASS(k)	(GTK_CHECK_CLASS_TYPE ((k), E_CELL_PIXBUF_TYPE))
-
-typedef struct _ECellPixbuf ECellPixbuf;
-typedef struct _ECellPixbufClass ECellPixbufClass;
-
-struct _ECellPixbuf {
-    ECell parent;
-};
-
-struct _ECellPixbufClass {
-    ECellClass parent_class;
-};
-
-GtkType e_cell_pixbuf_get_type (void);
-ECell *e_cell_pixbuf_new (void);
-void e_cell_pixbuf_construct (ECellPixbuf *ecp);
-
-#endif
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
deleted file mode 100644
index 2acc921d12..0000000000
--- a/widgets/table/e-cell-popup.c
+++ /dev/null
@@ -1,504 +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 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
- */
-
-/*
- * ECellPopup - an abstract ECell class used to support popup selections like
- * a GtkCombo widget. It contains a child ECell, e.g. an ECellText, but when
- * selected it displays an arrow on the right edge which the user can click to
- * show a popup. Subclasses implement the popup class function to show the
- * popup.
- */
-
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-#include "e-cell-popup.h"
-
-
-#define E_CELL_POPUP_ARROW_WIDTH	16
-#define E_CELL_POPUP_ARROW_XPAD		3
-#define E_CELL_POPUP_ARROW_YPAD		3
-
-
-static void	e_cell_popup_class_init	(GtkObjectClass	*object_class);
-static void	e_cell_popup_init	(ECellPopup	*ecp);
-static void	e_cell_popup_destroy	(GtkObject	*object);
-
-
-static ECellView* ecp_new_view		(ECell		*ecell,
-					 ETableModel	*table_model,
-					 void		*e_table_item_view);
-static void	ecp_kill_view		(ECellView	*ecv);
-static void	ecp_realize		(ECellView	*ecv);
-static void	ecp_unrealize		(ECellView	*ecv);
-static void	ecp_draw		(ECellView	*ecv,
-					 GdkDrawable	*drawable,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 ECellFlags	 flags,
-					 int		 x1,
-					 int		 y1,
-					 int		 x2,
-					 int		 y2);
-static gint	ecp_event		(ECellView	*ecv,
-					 GdkEvent	*event,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 ECellFlags	 flags,
-					 ECellActions	*actions);
-static int	ecp_height		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
-static void*	ecp_enter_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
-static void	ecp_leave_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 void		*edit_context);
-static void	ecp_print		(ECellView	*ecv,
-					 GnomePrintContext *context, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 double		 width,
-					 double		 height);
-static gdouble	ecp_print_height	(ECellView	*ecv,
-					 GnomePrintContext *context, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 double		 width);
-static int	ecp_max_width		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col);
-static void	ecp_show_tooltip	(ECellView	*ecv, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 int		 col_width,
-					 ETableTooltip	*tooltip);
-
-static gint e_cell_popup_do_popup	(ECellPopupView	*ecp_view,
-					 GdkEvent	*event);
-
-static ECellClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_popup, "ECellPopup", ECellPopup, e_cell_popup_class_init,
-	     e_cell_popup_init, e_cell_get_type());
-
-
-static void
-e_cell_popup_class_init		(GtkObjectClass	*object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = e_cell_popup_destroy;
-
-	ecc->new_view     = ecp_new_view;
-	ecc->kill_view    = ecp_kill_view;
-	ecc->realize      = ecp_realize;
-	ecc->unrealize    = ecp_unrealize;
-	ecc->draw         = ecp_draw;
-	ecc->event        = ecp_event;
-	ecc->height       = ecp_height;
-	ecc->enter_edit   = ecp_enter_edit;
-	ecc->leave_edit   = ecp_leave_edit;
-	ecc->print        = ecp_print;
-	ecc->print_height = ecp_print_height;
-	ecc->max_width	  = ecp_max_width;
-	ecc->show_tooltip = ecp_show_tooltip;
-
-	parent_class = gtk_type_class (e_cell_get_type ());
-}
-
-
-static void
-e_cell_popup_init		(ECellPopup	*ecp)
-{
-	ecp->popup_shown = FALSE;
-}
-
-
-/**
- * e_cell_popup_new:
- *
- * Creates a new ECellPopup renderer.
- *
- * Returns: an ECellPopup object.
- */
-ECell *
-e_cell_popup_new		(void)
-{
-	ECellPopup *ecp = gtk_type_new (e_cell_popup_get_type ());
-
-	return (ECell*) ecp;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_popup_destroy		(GtkObject *object)
-{
-	ECellPopup *ecp = E_CELL_POPUP (object);
-
-	gtk_object_unref (GTK_OBJECT (ecp->child));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ecp_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecell);
-	ECellPopupView *ecp_view;
-	
-	/* We must have a child ECell before we create any views. */
-	g_return_val_if_fail (ecp->child != NULL, NULL);
-
-	ecp_view = g_new0 (ECellPopupView, 1);
-
-	ecp_view->cell_view.ecell = ecell;
-	ecp_view->cell_view.e_table_model = table_model;
-	ecp_view->cell_view.e_table_item_view = e_table_item_view;
-
-	ecp_view->child_view = e_cell_new_view (ecp->child, table_model,
-						e_table_item_view);
-
-	return (ECellView*) ecp_view;
-}
-
-
-/*
- * ECell::kill_view method
- */
-static void
-ecp_kill_view (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	if (ecp_view->child_view)
-		e_cell_kill_view (ecp_view->child_view);
-	g_free (ecp_view);
-}
-
-
-/*
- * ECell::realize method
- */
-static void
-ecp_realize (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_realize (ecp_view->child_view);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecv);
-}
-
-
-/*
- * ECell::unrealize method
- */
-static void
-ecp_unrealize (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_realize (ecp_view->child_view);
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-
-/*
- * ECell::draw method
- */
-static void
-ecp_draw (ECellView *ecv, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecv->ecell);
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ecv->e_table_item_view)->canvas);
-	GtkShadowType shadow;
-	GdkRectangle rect;
-	gboolean show_popup_arrow = FALSE;
-
-	/* Display the popup arrow if we are editing this cell, or the popup
-	   is shown for this cell. */
-	if (eti->editing_col == view_col && eti->editing_row == row) {
-		show_popup_arrow = TRUE;
-		ecp->popup_arrow_shown = TRUE;
-
-	} else if (ecp->popup_shown && ecp->popup_view_col == view_col
-		   && ecp->popup_row == row) {
-		show_popup_arrow = TRUE;
-	}
-
-	if (eti->editing_col == -1)
-		ecp->popup_arrow_shown = FALSE;
-
-#if 0
-	g_print ("In ecp_draw row:%i col: %i %i,%i %i,%i Show Arrow:%i\n",
-		 row, view_col, x1, y1, x2, y2, show_popup_arrow);
-#endif
-
-	if (show_popup_arrow) {
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
-			     view_col, row, flags,
-			     x1, y1, x2 - E_CELL_POPUP_ARROW_WIDTH, y2);
-
-		rect.x = x2 - E_CELL_POPUP_ARROW_WIDTH;
-		rect.y = y1 + 1;
-		rect.width = E_CELL_POPUP_ARROW_WIDTH;
-		rect.height = y2 - y1 - 2;
-
-		if (ecp->popup_shown)
-			shadow = GTK_SHADOW_IN;
-		else
-			shadow = GTK_SHADOW_OUT;
-
-		gtk_paint_box (canvas->style, drawable,
-			       GTK_STATE_NORMAL, shadow,
-			       &rect, canvas, "ecellpopup",
-			       rect.x, rect.y, rect.width, rect.height);
-		gtk_paint_arrow (canvas->style, drawable,
-				 GTK_STATE_NORMAL, shadow,
-				 &rect, canvas, NULL,
-				 GTK_ARROW_DOWN, TRUE,
-				 rect.x + E_CELL_POPUP_ARROW_XPAD,
-				 rect.y + E_CELL_POPUP_ARROW_YPAD,
-				 rect.width - E_CELL_POPUP_ARROW_XPAD * 2,
-				 rect.height - E_CELL_POPUP_ARROW_YPAD * 2);
-	} else {
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
-			     view_col, row, flags, x1, y1, x2, y2);
-	}
-}
-
-
-/*
- * ECell::event method
- */
-static gint
-ecp_event (ECellView *ecv, GdkEvent *event, int model_col, int view_col,
-	   int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	int width;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (eti->editing_col == view_col && eti->editing_row == row
-		    && ecp->popup_arrow_shown) {
-			width = e_table_header_col_diff (eti->header, view_col,
-							 view_col + 1);
-
-			g_print ("Event in item popup width: %i button: %g,%g\n",
-				 width, event->button.x, event->button.y);
-
-			/* FIXME: The event coords seem to be relative to the
-			   text within the cell, so we have to add 4. */
-			if (event->button.x + 4 >= width - E_CELL_POPUP_ARROW_WIDTH) {
-				return e_cell_popup_do_popup (ecp_view, event);
-			}
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.state & GDK_MOD1_MASK
-		    && event->key.keyval == GDK_Down) {
-			g_print ("## Enter key pressed\n");
-			return e_cell_popup_do_popup (ecp_view, event);
-		}
-		g_print ("Key Press Event ECellPopup\n");
-		break;
-	default:
-		break;
-	}
-
-	return e_cell_event (ecp_view->child_view, event, model_col, view_col,
-			     row, flags, actions);
-}
-
-
-/*
- * ECell::height method
- */
-static int
-ecp_height (ECellView *ecv, int model_col, int view_col, int row) 
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_height (ecp_view->child_view, model_col, view_col, row);
-}
-
-
-/*
- * ECellView::enter_edit method
- */
-static void *
-ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-
-	g_print ("In ecp_enter_edit model_col: %i view_col: %i row: %i\n",
-		 model_col, view_col, row);
-
-	if (ecp->popup_view_col != view_col || ecp->popup_row != row)
-		ecp->popup_arrow_shown = FALSE;
-
-	ecp->popup_view_col = view_col;
-	ecp->popup_row = row;
-
-	return e_cell_enter_edit (ecp_view->child_view, model_col, view_col, row);
-}
-
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ecp_leave_edit (ECellView *ecv, int model_col, int view_col, int row,
-		void *edit_context)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	g_print ("In ecp_leave_edit model_col: %i view_col: %i row: %i\n",
-		 model_col, view_col, row);
-
-	e_cell_leave_edit (ecp_view->child_view, model_col, view_col, row,
-			   edit_context);
-}
-
-
-static void
-ecp_print (ECellView *ecv, GnomePrintContext *context, 
-	   int model_col, int view_col, int row, double width, double height)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_print (ecp_view->child_view, context, model_col, view_col, row,
-		      width, height);
-}
-
-
-static gdouble
-ecp_print_height (ECellView *ecv, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_print_height (ecp_view->child_view, context, model_col,
-				    view_col, row, width);
-}
-
-
-static int
-ecp_max_width (ECellView *ecv,
-	       int model_col,
-	       int view_col)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_max_width (ecp_view->child_view, model_col, view_col);
-}
-
-
-static void
-ecp_show_tooltip (ECellView *ecv, 
-		  int model_col,
-		  int view_col,
-		  int row,
-		  int col_width,
-		  ETableTooltip *tooltip)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_show_tooltip (ecp_view->child_view, model_col, view_col, row,
-			     col_width, tooltip);
-}
-
-
-
-ECell*
-e_cell_popup_get_child			(ECellPopup	*ecp)
-{
-	g_return_val_if_fail (E_IS_CELL_POPUP (ecp), NULL);
-
-	return ecp->child;
-}
-
-
-void
-e_cell_popup_set_child			(ECellPopup	*ecp,
-					 ECell		*child)
-{
-	g_return_if_fail (E_IS_CELL_POPUP (ecp));
-
-	if (ecp->child)
-		gtk_object_unref (GTK_OBJECT (ecp->child));
-
-	ecp->child = child;
-	gtk_object_ref (GTK_OBJECT (child));
-}
-
-
-static gint
-e_cell_popup_do_popup			(ECellPopupView	*ecp_view,
-					 GdkEvent	*event)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-	gint (*popup_func) (ECellPopup *ecp, GdkEvent *event);
-
-	ecp->popup_cell_view = ecp_view;
-
-	popup_func = E_CELL_POPUP_CLASS (GTK_OBJECT (ecp)->klass)->popup;
-
-	return popup_func ? popup_func (ecp, event) : FALSE;
-}
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
deleted file mode 100644
index 2ccfd730ae..0000000000
--- a/widgets/table/e-cell-popup.h
+++ /dev/null
@@ -1,93 +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 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
- */
-
-/*
- * ECellPopup - an ECell used to support popup selections like a GtkCombo
- * widget. It contains a child ECell, e.g. an ECellText, but when selected it
- * displays an arrow on the right edge which the user can click to show a
- * popup. It will support subclassing or signals so that different types of
- * popup can be provided.
- */
-
-#ifndef _E_CELL_POPUP_H_
-#define _E_CELL_POPUP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-#define E_CELL_POPUP_TYPE        (e_cell_popup_get_type ())
-#define E_CELL_POPUP(o)          (GTK_CHECK_CAST ((o), E_CELL_POPUP_TYPE, ECellPopup))
-#define E_CELL_POPUP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_POPUP_TYPE, ECellPopupClass))
-#define E_IS_CELL_POPUP(o)       (GTK_CHECK_TYPE ((o), E_CELL_POPUP_TYPE))
-#define E_IS_CELL_POPUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_POPUP_TYPE))
-
-typedef struct _ECellPopupView ECellPopupView;
-
-typedef struct {
-	ECell parent;
-
-	ECell *child;
-
-	/* This is TRUE if the popup window is shown for the cell being
-	   edited. While shown we display the arrow indented. */
-	gboolean	 popup_shown;
-
-	/* This is TRUE if the popup arrow is shown for the cell being edited.
-	   This is needed to stop the first click on the cell from popping up
-	   the popup window. We only popup the window after we have drawn the
-	   arrow. */
-	gboolean	 popup_arrow_shown;
-
-	/* The view in which the popup is shown. */
-	ECellPopupView	*popup_cell_view;
-
-	gint		 popup_view_col;
-	gint		 popup_row;
-} ECellPopup;
-
-
-typedef struct {
-	ECellClass parent_class;
-
-	/* Virtual function for subclasses to override. */
-	gint   	   (*popup)        (ECellPopup *ecp, GdkEvent *event);
-} ECellPopupClass;
-
-
-struct _ECellPopupView {
-	ECellView	 cell_view;
-
-	ECellView	*child_view;
-};
-
-
-GtkType    e_cell_popup_get_type		(void);
-ECell     *e_cell_popup_new			(void);
-
-/* Get and set the child ECell. */
-ECell	  *e_cell_popup_get_child		(ECellPopup	*ecp);
-void       e_cell_popup_set_child		(ECellPopup	*ecp,
-						 ECell		*child);
-
-#endif /* _E_CELL_POPUP_H_ */
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
deleted file mode 100644
index 7943ad8d8a..0000000000
--- a/widgets/table/e-cell-size.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellSize - Size item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include "e-cell-size.h"
-#include <gnome.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	gint size = GPOINTER_TO_INT(e_table_model_value_at(model, col, row));
-	gfloat fsize;
-	
-	if (size < 1024) {
-		return g_strdup_printf ("%d", size);
-	} else {
-		fsize = ((gfloat) size) / 1024.0;
-		if (fsize < 1024.0) {
-			return g_strdup_printf ("%.2f K", fsize);
-		} else {
-			fsize /= 1024.0;
-			return g_strdup_printf ("%.2f M", fsize);
-		}
-	}
-}
-
-static void
-ecd_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_size_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-}
-
-static void
-e_cell_size_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_size_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render file sizes
- * that that come from the model.  The value returned from the model
- * is interpreted as being a time_t.
- *
- * The ECellSize object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, color and a size filter.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the size should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render file sizes.  */
-ECell *
-e_cell_size_new (const char *fontname, GtkJustification justify)
-{
-	ECellSize *ecd = gtk_type_new (e_cell_size_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
-E_MAKE_TYPE(e_cell_size, "ECellSize", ECellSize, e_cell_size_class_init, e_cell_size_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h
deleted file mode 100644
index db976a4eb6..0000000000
--- a/widgets/table/e-cell-size.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellSize - Size item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_SIZE_H_
-#define _E_CELL_SIZE_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_SIZE_TYPE        (e_cell_size_get_type ())
-#define E_CELL_SIZE(o)          (GTK_CHECK_CAST ((o), E_CELL_SIZE_TYPE, ECellSize))
-#define E_CELL_SIZE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_SIZE_TYPE, ECellSizeClass))
-#define E_IS_CELL_SIZE(o)       (GTK_CHECK_TYPE ((o), E_CELL_SIZE_TYPE))
-#define E_IS_CELL_SIZE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_SIZE_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellSize;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellSizeClass;
-
-GtkType    e_cell_size_get_type (void);
-ECell     *e_cell_size_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_SIZE_H_ */
diff --git a/widgets/table/e-cell-string.c b/widgets/table/e-cell-string.c
deleted file mode 100644
index 992b1bd10e..0000000000
--- a/widgets/table/e-cell-string.c
+++ /dev/null
@@ -1,9 +0,0 @@
-ECell *
-e_cell_string_new (void)
-{
-	ECell *ecell;
-
-	ecell = gtk_type_new (ecell);
-
-	return ecell;
-}
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
deleted file mode 100644
index 2db05f7320..0000000000
--- a/widgets/table/e-cell-text.c
+++ /dev/null
@@ -1,2418 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cell-text.c - Text cell renderer
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Chris Lahey <clahey@ximian.com>
- *
- * (C) 1999, 2000 Ximian, Inc.
- *
- * A lot of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- *
- * TODO:
- *   Clean up UTF-8 handling
- *   UTF-8 selection
- */
-
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <stdio.h>
-#include <unicode.h>
-#include "e-cell-text.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-font.h"
-#include "gal/widgets/e-unicode.h"
-#include "e-table-item.h"
-#include "gal/util/e-text-event-processor.h"
-#include "gal/e-text/e-text.h"
-#include "gal/util/e-text-event-processor-emacs-like.h"
-#include "e-table-tooltip.h"
-
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <ctype.h>
-#include <math.h>
-
-#define ECT_CLASS(c) (E_CELL_TEXT_CLASS(GTK_OBJECT((c))->klass))
-
-/* This defines a line of text */
-struct line {
-	char *text;	/* Line's text UTF-8, it is a pointer into the text->text string */
-	int length;	/* Line's length in BYTES */
-	int width;	/* Line's width in pixels */
-	int ellipsis_length;  /* Length before adding ellipsis in BYTES */
-};
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-
-	ARG_STRIKEOUT_COLUMN,
-	ARG_BOLD_COLUMN,
-	ARG_COLOR_COLUMN,
-};
-
-
-enum {
-	E_SELECTION_PRIMARY,
-	E_SELECTION_CLIPBOARD
-};
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-#define PARENT_TYPE e_cell_get_type ()
-
-#define TEXT_PAD 4
-
-typedef struct {
-	gpointer lines;			/* Text split into lines (private field) */
-	int num_lines;			/* Number of lines of text */
-	int max_width;
-	int ref_count;
-} ECellTextLineBreaks;
-	
-
-typedef struct _CellEdit CellEdit;
-
-typedef struct {
-	ECellView    cell_view;
-	GdkGC       *gc;
-#if 0
-	GdkFont     *font;
-#else
-	EFont *font;
-#endif
-	GdkCursor *i_cursor;
-	GdkBitmap *stipple;		/* Stipple for text */
-	
-	GnomeCanvas *canvas;
-
-	/*
-	 * During editing.
-	 */
-	CellEdit    *edit;
-
-
-	int xofs, yofs;                 /* This gets added to the x
-                                           and y for the cell text. */
-	double ellipsis_width[2];      /* The width of the ellipsis. */
-
-} ECellTextView;
-
-typedef struct _CurrentCell{
-	ECellTextView *text_view;
-	int            width;
-	char          *text;
-	int            model_col, view_col, row;
-	ECellTextLineBreaks *breaks;
-	EFontStyle     style;
-} CurrentCell;
-
-#define CURRENT_CELL(x) ((CurrentCell *)(x))
-
-struct _CellEdit {
-	CurrentCell cell;
-
-	char         *old_text;
-
-	/*
-	 * Where the editing is taking place
-	 */
-
-	int xofs_edit, yofs_edit;       /* Offset because of editing.
-                                           This is negative compared
-                                           to the other offsets. */
-
-	/* This needs to be reworked a bit once we get line wrapping. */
-	int selection_start;            /* Start of selection - IN BYTES */
-	int selection_end;              /* End of selection - IN BYTES */
-	gboolean select_by_word;        /* Current selection is by word */
-
-	/* This section is for drag scrolling and blinking cursor. */
-	/* Cursor handling. */
-	gint timeout_id;                /* Current timeout id for scrolling */
-	GTimer *timer;                  /* Timer for blinking cursor and scrolling */
-
-	gint lastx, lasty;              /* Last x and y motion events */
-	gint last_state;                /* Last state */
-	gulong scroll_start;            /* Starting time for scroll (microseconds) */
-
-	gint show_cursor;               /* Is cursor currently shown */
-	gboolean button_down;           /* Is mouse button 1 down */
-
-	ETextEventProcessor *tep;       /* Text Event Processor */
-
-	/* Hmmm... this should probably be in native encoding? */
-
-	GtkWidget *invisible;           /* For selection handling */
-	gboolean has_selection;         /* TRUE if we have the selection */
-	gchar *primary_selection;       /* Primary selection text */
-	gint primary_length;            /* Primary selection text length in BYTES */
-	gchar *clipboard_selection;     /* Clipboard selection text */
-	gint clipboard_length;          /* Clipboard selection text length in BYTES */
-
-	guint pointer_in : 1;
-	guint default_cursor_shown : 1;
-
-	ECellActions actions;
-};
-
-static void e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data);
-
-static void e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time);
-static void e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length);
-
-static GtkWidget *e_cell_text_view_get_invisible (CellEdit *edit);
-static void _selection_clear_event (GtkInvisible *invisible,
-				    GdkEventSelection *event,
-				    CellEdit *edit);
-static void _selection_get (GtkInvisible *invisible,
-			    GtkSelectionData *selection_data,
-			    guint info,
-			    guint time_stamp,
-			    CellEdit *edit);
-static void _selection_received (GtkInvisible *invisible,
-				 GtkSelectionData *selection_data,
-				 guint time,
-				 CellEdit *edit);
-static int number_of_lines (char *text);
-static void split_into_lines (CurrentCell *cell);
-static void unref_lines (CurrentCell *cell);
-static void calc_line_widths (CurrentCell *cell);
-static int get_line_ypos (CurrentCell *cell, struct line *line);
-static int get_line_xpos (CurrentCell *cell, struct line *line);
-static void _get_tep (CellEdit *edit);
-
-static gint _get_position_from_xy (CurrentCell *cell, gint x, gint y);
-static void _get_xy_from_position (CurrentCell *cell, gint position, gint *xp, gint *yp);
-static gboolean _blink_scroll_timeout (gpointer data);
-
-static void build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row);
-static void unbuild_current_cell (CurrentCell *cell);
-static void calc_ellipsis (ECellTextView *text_view);
-static void ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap);
-static GdkColor* e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec);
-
-static ECellClass *parent_class;
-
-static char *
-ect_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	if (ECT_CLASS(cell)->get_text)
-		return ECT_CLASS(cell)->get_text (cell, model, col, row);
-	else
-		return NULL;
-}
-
-static void
-ect_free_text (ECellText *cell, char *text)
-{
-	if (ECT_CLASS(cell)->free_text)
-		ECT_CLASS(cell)->free_text (cell, text);
-}
-
-static char *
-ect_real_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	return e_table_model_value_at(model, col, row);
-}
-
-static void
-ect_real_free_text (ECellText *cell, char *text)
-{
-}
-
-static void
-ect_queue_redraw (ECellTextView *text_view, int view_col, int view_row)
-{
-	e_table_item_redraw_range (
-		text_view->cell_view.e_table_item_view,
-		view_col, view_row, view_col, view_row);
-}
-
-/*
- * Accept the currently edited text.  if it's the same as what's in the cell, do nothing.
- */
-static void
-ect_accept_edits (ECellTextView *text_view)
-{
-	CurrentCell *cell = (CurrentCell *) text_view->edit;
-
-	if (strcmp (text_view->edit->old_text, cell->text)) {
-		e_table_model_set_value_at (text_view->cell_view.e_table_model,
-					    cell->model_col, cell->row, cell->text);
-	}
-}
-
-/*
- * Shuts down the editing process
- */
-static void
-ect_stop_editing (ECellTextView *text_view)
-{
-	CellEdit *edit = text_view->edit;
-	int row, view_col;
-
-	if (!edit)
-		return;
-
-	row = edit->cell.row;
-	view_col = edit->cell.view_col;
-	
-	g_free (edit->old_text);
-	edit->old_text = NULL;
-	g_free (edit->cell.text);
-	edit->cell.text = NULL;
-	if (edit->invisible)
-		gtk_widget_unref (edit->invisible);
-	if (edit->tep)
-		gtk_object_unref (GTK_OBJECT(edit->tep));
-	if (edit->primary_selection)
-		g_free (edit->primary_selection);
-	if (edit->clipboard_selection)
-		g_free (edit->clipboard_selection);
-	if (! edit->default_cursor_shown){
-		gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL);
-		edit->default_cursor_shown = TRUE;
-	}
-	if (edit->timeout_id) {
-		g_source_remove (edit->timeout_id);
-		edit->timeout_id = 0;
-	}
-	if (edit->timer) {
-		g_timer_stop (edit->timer);
-		g_timer_destroy (edit->timer);
-		edit->timer = NULL;
-	}
-
-	g_free (edit);
-	
-	text_view->edit = NULL;
-	ect_queue_redraw (text_view, view_col, row);
-}
-
-/*
- * Cancels the edits
- */
-static void
-ect_cancel_edit (ECellTextView *text_view)
-{
-	ect_stop_editing (text_view);
-}
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellText *ect = E_CELL_TEXT (ecell);
-	ECellTextView *text_view = g_new0 (ECellTextView, 1);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas;
-	
-	text_view->cell_view.ecell = ecell;
-	text_view->cell_view.e_table_model = table_model;
-	text_view->cell_view.e_table_item_view = e_table_item_view;
-	
-	if (ect->font_name){
-#if 0
-		GdkFont *f;
-
-		f = gdk_fontset_load (ect->font_name);
-		text_view->font = f;
-#endif
-		text_view->font = e_font_from_gdk_name (ect->font_name);
-	}
-	if (!text_view->font){
-		gdk_font_ref (GTK_WIDGET (canvas)->style->font);
-		text_view->font = e_font_from_gdk_font (GTK_WIDGET (canvas)->style->font);
-	}
-
-	text_view->canvas = canvas;
-
-	text_view->xofs = 0.0;
-	text_view->yofs = 0.0;
-	
-	return (ECellView *)text_view;
-}
-
-/*
- * ECell::kill_view method
- */
-static void
-ect_kill_view (ECellView *ecv)
-{
-	ECellTextView *text_view = (ECellTextView *) ecv;
-
-	g_free (text_view);
-}
-
-/*
- * ECell::realize method
- */
-static void
-ect_realize (ECellView *ecell_view)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	
-	text_view->gc = gdk_gc_new (GTK_WIDGET (text_view->canvas)->window);
-
-	text_view->i_cursor = gdk_cursor_new (GDK_XTERM);
-	
-	calc_ellipsis (text_view);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecell_view);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-ect_unrealize (ECellView *ecv)
-{
-	ECellTextView *text_view = (ECellTextView *) ecv;
-	ECellText *ect = (ECellText*) ecv->ecell;
-	GdkColormap *colormap;
-
-	gdk_gc_unref (text_view->gc);
-	text_view->gc = NULL;
-
-	if (text_view->edit){
-		ect_cancel_edit (text_view);
-	}
-
-	if (text_view->font)
-		e_font_unref (text_view->font);
-	
-	if (text_view->stipple)
-		gdk_bitmap_unref (text_view->stipple);
-
-	gdk_cursor_destroy (text_view->i_cursor);
-
-	if (ect->colors) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
-		g_hash_table_foreach (ect->colors, (GHFunc) ect_free_color,
-				      colormap);
-		g_hash_table_destroy (ect->colors);
-		ect->colors = NULL;
-	}
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-static void
-ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap)
-{
-
-	g_free (color_spec);
-
-	/* This frees the color. Note we don't free it if it is the special
-	   value. */
-	if (color != (GdkColor*) 1) {
-		gdk_colors_free (colormap, &color->pixel, 1, 0);
-
-		/* This frees the memory for the GdkColor. */
-		gdk_color_free (color);
-	}
-}
-
-static void
-set_style(ECellView *ecell_view, CurrentCell *cell, int row)
-{
-	EFontStyle style = E_FONT_PLAIN;
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-
-	if (ect->bold_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->bold_column, row))
-		style = E_FONT_BOLD;
-
-	cell->style = style;
-}
-
-/*
- * ECell::draw method
- */
-static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	/* New ECellText */
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
-	GdkRectangle rect, *clip_rect;
-	struct line *lines;
-	int i;
-	int xpos, ypos;
-	int start_char, end_char;
-	int sel_start, sel_end;
-	GdkRectangle sel_rect;
-	GdkGC *fg_gc;
-	EFont *font = text_view->font;
-	const int height = e_font_height (text_view->font);
-	CellEdit *edit = text_view->edit;
-	gboolean edit_display = FALSE;
-	ECellTextLineBreaks *linebreaks;
-	GdkColor *foreground, *cell_foreground, *cursor_color;
-	gchar *color_spec;
-	gboolean selected;
-	EFontStyle style = E_FONT_PLAIN;
-
-	selected = flags & E_CELL_SELECTED;
-
-	if (edit){
-		if ((edit->cell.view_col == view_col) && (edit->cell.row == row)) {
-			edit_display = TRUE;
-			fg_gc = canvas->style->fg_gc[edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
-		} else
-			fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	} else {
-		fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	}
-
-	/*
-	 * Be a nice citizen: clip to the region we are supposed to draw on
-	 */
-	rect.x = x1;
-	rect.y = y1;
-	rect.width = x2 - x1;
-	rect.height = y2 - y1;
-	
-	gdk_gc_set_clip_rectangle (text_view->gc, &rect);
-	gdk_gc_set_clip_rectangle (fg_gc, &rect);
-	clip_rect = &rect;
-
-	if (selected){
-		if (flags & E_CELL_FOCUSED)
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
-		else
-			foreground = &canvas->style->text [GTK_STATE_ACTIVE];
-	} else {
-		foreground = &canvas->style->text [GTK_STATE_NORMAL];
-	}
-
-	cursor_color = foreground;
-
-	if (ect->color_column != -1 && ! selected) {
-		color_spec = e_table_model_value_at (ecell_view->e_table_model,
-						     ect->color_column, row);
-		cell_foreground = e_cell_text_get_color (text_view,
-							 color_spec);
-		if (cell_foreground)
-			foreground = cell_foreground;
-	}
-
-	gdk_gc_set_foreground (text_view->gc, foreground);
-
-	x1 += 4;
-	y1 += 1;
-	x2 -= 4;
-	y2 -= 1;
-
-	rect.x = x1;
-	rect.y = y1;
-	rect.width = x2 - x1;
-	rect.height = y2 - y1;
-	
-	gdk_gc_set_clip_rectangle (text_view->gc, &rect);
-	gdk_gc_set_clip_rectangle (fg_gc, &rect);
-	clip_rect = &rect;
-
-	if (edit_display){
-		CellEdit *edit = text_view->edit;
-		CurrentCell *cell = CURRENT_CELL(edit);
-
-		set_style(ecell_view, cell, row);
-
-		style = cell->style;
-
-		cell->width = x2 - x1;
-		
-		split_into_lines (cell);
-
-		linebreaks = cell->breaks;
-		
-		lines = linebreaks->lines;
-		ypos = get_line_ypos (cell, lines);
-		ypos += e_font_ascent (text_view->font);
-		ypos -= edit->yofs_edit;
-
-		for (i = 0; i < linebreaks->num_lines; i++) {
-			xpos = get_line_xpos (cell, lines);
-			xpos -= edit->xofs_edit;
-
-			/* start_char, end_char, sel_start and sel_end are IN BYTES */
-
-			start_char = lines->text - cell->text;
-			end_char = start_char + lines->length;
-
-			sel_start = edit->selection_start;
-			sel_end = edit->selection_end;
-
-			if (sel_start > sel_end){
-				sel_start ^= sel_end;
-				sel_end ^= sel_start;
-				sel_start ^= sel_end;
-			}
-			if (sel_start < start_char)
-				sel_start = start_char;
-			if (sel_end > end_char)
-				sel_end = end_char;
-
-			if (sel_start < sel_end){
-				sel_rect.x = xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char);
-				sel_rect.y = ypos + y1 - e_font_ascent (font);
-				sel_rect.width = e_font_utf8_text_width (font, style,
-									 lines->text + sel_start - start_char,
-									 sel_end - sel_start);
-				sel_rect.height = height;
-				gtk_paint_flat_box (canvas->style,
-						    drawable,
-						    edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE,
-						    GTK_SHADOW_NONE,
-						    clip_rect,
-						    canvas,
-						    "text",
-						    sel_rect.x,
-						    sel_rect.y,
-						    sel_rect.width,
-						    sel_rect.height);
-
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc, xpos + x1, ypos + y1,
-						       lines->text,
-						       sel_start - start_char);
-				e_font_draw_utf8_text (drawable, font, style, fg_gc,
-						       xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char),
-						       ypos + y1,
-						       lines->text + sel_start - start_char,
-						       sel_end - sel_start);
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-						       xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_end - start_char),
-						       ypos + y1,
-						       lines->text + sel_end - start_char,
-						       end_char - sel_end);
-			} else {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-						       xpos + x1, ypos + y1,
-						       lines->text,
-						       lines->length);
-			}
-			if (edit->selection_start == edit->selection_end &&
-			    edit->selection_start >= start_char &&
-			    edit->selection_start <= end_char &&
-			    edit->show_cursor) {
-				gdk_gc_set_foreground (text_view->gc, cursor_color);
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char),
-						    ypos + y1 - e_font_ascent (font),
-						    1,
-						    height);
-			}
-			if (ect->strikeout_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->strikeout_column, row)) {
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    x1, ypos + y1 - (e_font_ascent (font) / 2),
-						    x2 - x1,
-						    1);
-			}
-			ypos += height;
-			lines ++;
-		}
-		unref_lines (cell);
-	} else {
-		
-		ECellTextLineBreaks *linebreaks;
-		CurrentCell cell;
-		build_current_cell (&cell, text_view, model_col, view_col, row);
-		
-		set_style(ecell_view, &cell, row);
-
-		style = cell.style;
-
-		cell.width = x2 - x1;
-		
-		split_into_lines (&cell);
-		
-		linebreaks = cell.breaks;
-		lines = linebreaks->lines;
-		ypos = get_line_ypos (&cell, lines);
-		ypos += e_font_ascent (text_view->font);
-		
-		
-		for (i = 0; i < linebreaks->num_lines; i++) {
-			xpos = get_line_xpos (&cell, lines);
-			if (ect->use_ellipsis && lines->ellipsis_length < lines->length) {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1, ypos + y1,
-					       lines->text,
-					       lines->ellipsis_length);
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1 + lines->width - text_view->ellipsis_width[style],
-					       ypos + y1,
-					       ect->ellipsis ? ect->ellipsis : "...",
-					       ect->ellipsis ? strlen (ect->ellipsis) : 3);
-			} else {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1,
-					       ypos + y1,
-					       lines->text,
-					       lines->length);
-			}
-			if (ect->strikeout_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->strikeout_column, row)) {
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    x1, ypos + y1 - (e_font_ascent (font) / 2),
-						    x2 - x1,
-						    1);
-			}
-			ypos += height;
-			lines++;
-		}
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-	}
-
-	gdk_gc_set_clip_rectangle (text_view->gc, NULL);
-	gdk_gc_set_clip_rectangle (fg_gc, NULL);
-}
-
-/*
- * Selects the entire string
- */
-static void
-ect_edit_select_all (ECellTextView *text_view)
-{
-	g_assert (text_view->edit);
-	
-	text_view->edit->selection_start = 0;
-	text_view->edit->selection_end = strlen (text_view->edit->cell.text);
-}
-
-static gboolean
-key_begins_editing (GdkEventKey *event)
-{
-	if (event->length == 0)
-		return FALSE;
-
-	return TRUE;
-}
-
-/*
- * ECell::event method
- */
-static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	ETextEventProcessorEvent e_tep_event;
-	gboolean edit_display = FALSE;
-	CellEdit *edit = text_view->edit;
-	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
-	gint return_val = 0;
-	CurrentCell cell, *cellptr;
-
-	if (flags & !E_CELL_EDITING)
-		return 0;
-
-	build_current_cell (&cell, text_view, model_col, view_col, row);
-	
-
-	if (edit){
-		if ((edit->cell.view_col == view_col) && (edit->cell.row == row)) {
-			edit_display = TRUE;
-			cellptr = CURRENT_CELL(edit);
-		} else {
-			cellptr = &cell;
-		}
-	} else {
-		cellptr = &cell;
-	}
-
-	set_style(ecell_view, cellptr, row);
-
-	e_tep_event.type = event->type;
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		break;
-	case GDK_KEY_PRESS: /* Fall Through */
-	case GDK_KEY_RELEASE:
-		if (event->key.keyval == GDK_Escape){
-			ect_cancel_edit (text_view);
-			return_val = TRUE;
-			break;
-		}
-
-		if ((!edit_display) &&
-		    e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) &&
-		    key_begins_editing (&event->key)) {
-			  e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row);
-			  ect_edit_select_all (text_view);
-			  edit = text_view->edit;
-			  cellptr = CURRENT_CELL(edit);
-			  edit_display = TRUE;
-		}		
-		if (edit_display) {
-			GdkEventKey key = event->key;
-			if (key.keyval == GDK_KP_Enter || key.keyval == GDK_Return){
-				e_table_item_leave_edit (text_view->cell_view.e_table_item_view);
-			} else {
-				e_tep_event.key.time = key.time;
-				e_tep_event.key.state = key.state;
-				e_tep_event.key.keyval = key.keyval;
-
-				/* This is probably ugly hack, but we have to handle UTF-8 input somehow */
-#if 0
-				e_tep_event.key.length = key.length;
-				e_tep_event.key.string = key.string;
-#else
-				e_tep_event.key.string = e_utf8_from_gtk_event_key (canvas, key.keyval, key.string);
-				if (e_tep_event.key.string != NULL) {
-					e_tep_event.key.length = strlen (e_tep_event.key.string);
-				} else {
-					e_tep_event.key.length = 0;
-				}
-#endif
-
-				_get_tep (edit);
-				return_val = e_text_event_processor_handle_event (edit->tep, &e_tep_event);
-				*actions = edit->actions;
-				if (e_tep_event.key.string) g_free (e_tep_event.key.string);
-				break;
-			}
-		}
-
-		else
-			return 0;
-		break;
-	case GDK_BUTTON_PRESS: /* Fall Through */
-	case GDK_BUTTON_RELEASE:
-		event->button.x -= 4;
-		event->button.y -= 1;
-		if ((!edit_display) 
-		    && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row)
-		    && event->type == GDK_BUTTON_RELEASE
-		    && event->button.button == 1) {
-			GdkEventButton button = event->button;
-
-			e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row);
-			edit = text_view->edit;
-			cellptr = CURRENT_CELL(edit);
-			edit_display = TRUE;
-			
-			e_tep_event.button.type = GDK_BUTTON_PRESS;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy (cellptr, button.x, button.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					edit->button_down = TRUE;
-				else
-					edit->button_down = FALSE;
-			}
-			edit->lastx = button.x;
-			edit->lasty = button.y;
-			edit->last_state = button.state;
-
-			e_tep_event.button.type = GDK_BUTTON_RELEASE;
-		}		
-		if (edit_display) {
-			GdkEventButton button = event->button;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy (cellptr, button.x, button.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					edit->button_down = TRUE;
-				else
-					edit->button_down = FALSE;
-			}
-			edit->lastx = button.x;
-			edit->lasty = button.y;
-			edit->last_state = button.state;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		event->motion.x -= 4;
-		event->motion.y -= 1;
-		if (edit_display) {
-			GdkEventMotion motion = event->motion;
-			e_tep_event.motion.time = motion.time;
-			e_tep_event.motion.state = motion.state;
-			e_tep_event.motion.position = _get_position_from_xy (cellptr, motion.x, motion.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			edit->lastx = motion.x;
-			edit->lasty = motion.y;
-			edit->last_state = motion.state;
-		}
-		break;
-	case GDK_ENTER_NOTIFY:
-#if 0
-		edit->pointer_in = TRUE;
-#endif
-		if (edit_display) {
-			if (edit->default_cursor_shown){
-				gdk_window_set_cursor (canvas->window, text_view->i_cursor);
-				edit->default_cursor_shown = FALSE;
-			}
-		}
-		break;
-	case GDK_LEAVE_NOTIFY:
-#if 0
-		text_view->pointer_in = FALSE;
-#endif
-		if (edit_display) {
-			if (! edit->default_cursor_shown){
-				gdk_window_set_cursor (canvas->window, NULL);
-				edit->default_cursor_shown = TRUE;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	unbuild_current_cell (&cell);
-	if (return_val)
-		return return_val;
-#if 0
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event (item, event);
-#endif
-	else
-		return 0;
-	
-}
-
-/*
- * ECell::height method
- */
-static int
-ect_height (ECellView *ecell_view, int model_col, int view_col, int row) 
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	EFont *font;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	gchar *string;
-	gint value;
-	
-	font = text_view->font;
-
-	string = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	value = e_font_height (font) * number_of_lines(string) + TEXT_PAD;
-	ect_free_text(ect, string);
-
-	return value;
-}
-
-/*
- * ECellView::enter_edit method
- */
-static void *
-ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CellEdit *edit;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	char *temp;
-
-	edit = g_new (CellEdit, 1);
-	text_view->edit = edit;
-
-	build_current_cell (CURRENT_CELL(edit), text_view, model_col, view_col, row);
-	
-	set_style(ecell_view, CURRENT_CELL(edit), row);
-
-	edit->xofs_edit = 0.0;
-	edit->yofs_edit = 0.0;
-	
-	edit->selection_start = 0;
-	edit->selection_end = 0;
-	edit->select_by_word = FALSE;
-
-	edit->timeout_id = g_timeout_add (10, _blink_scroll_timeout, text_view);
-	edit->timer = g_timer_new ();
-	g_timer_elapsed (edit->timer, &(edit->scroll_start));
-	g_timer_start (edit->timer);
-
-	edit->lastx = 0;
-	edit->lasty = 0;
-	edit->last_state = 0;
-
-	edit->scroll_start = 0;
-	edit->show_cursor = TRUE;
-	edit->button_down = FALSE;
-	
-	edit->tep = NULL;
-
-	edit->has_selection = FALSE;
-	
-	edit->invisible = NULL;
-	edit->primary_selection = NULL;
-	edit->primary_length = 0;
-	edit->clipboard_selection = NULL;
-	edit->clipboard_length = 0;
-
-	edit->pointer_in = FALSE;
-	edit->default_cursor_shown = TRUE;
-	
-	temp = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	edit->old_text = g_strdup (temp);
-	ect_free_text(ect, temp);
-	edit->cell.text = g_strdup (edit->old_text);
-
-#if 0
-	if (edit->pointer_in){
-		if (edit->default_cursor_shown){
-			gdk_window_set_cursor (GTK_WIDGET(item->canvas)->window, text_view->i_cursor);
-			edit->default_cursor_shown = FALSE;
-		}
-	}
-#endif
-
-	ect_queue_redraw (text_view, view_col, row);
-	
-	return NULL;
-}
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CellEdit *edit = text_view->edit;
-
-	if (edit){
-		ect_accept_edits (text_view);
-		ect_stop_editing (text_view);
-		/* FIXME: edit is freed in ect_stop_editing() so I've
-		   commented this out - Damon. */
-		/*unbuild_current_cell (CURRENT_CELL(edit));*/
-	} else {
-		/*
-		 * We did invoke this leave edit internally
-		 */
-	}
-}
-
-static void
-ect_print (ECellView *ecell_view, GnomePrintContext *context, 
-	   int model_col, int view_col, int row,
-	   double width, double height)
-{
-	GnomeFont *font = gnome_font_new ("Helvetica", 12);
-	char *string;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	string = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	gnome_print_gsave(context);
-	if (gnome_print_moveto(context, 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, width - 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, width - 2, height - 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, 2, height - 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_clip(context) == -1)
-				/* FIXME */;
-	gnome_print_moveto(context, 2, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2);
-	gnome_print_setfont(context, font);
-	gnome_print_show(context, string);
-	gnome_print_grestore(context);
-	ect_free_text(ect, string);
-}
-
-static gdouble
-ect_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	return 16;
-}
-
-static int
-ect_max_width (ECellView *ecell_view,
-	       int model_col,
-	       int view_col)
-{
-	/* New ECellText */
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	EFont *font;
-	int row;
-	int number_of_rows;
-	int max_width = 0;
-
-	font = text_view->font;
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-	for (row = 0; row < number_of_rows; row++) {
-		CurrentCell cell;
-		struct line *line;
-		int width;
-
-		build_current_cell (&cell, text_view, model_col, view_col, row);
-		split_into_lines (&cell);
-		calc_line_widths (&cell);
-		
-		line = (struct line *)cell.breaks->lines;
-		width = e_font_utf8_text_width (font, cell.style,
-						line->text, line->length);
-		max_width = MAX (max_width, width);
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-	}
-	
-	return max_width;
-}
-
-static gint
-tooltip_event (GtkWidget *window,
-	       GdkEvent *event,
-	       ETableTooltip *tooltip)
-{
-	gint ret_val = FALSE;
-	
-	switch (event->type) {
-	case GDK_LEAVE_NOTIFY:
-		if (tooltip->window) {
-			gtk_widget_destroy (tooltip->window);
-			tooltip->window = NULL;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		if (event->type == GDK_BUTTON_RELEASE) {
-			if (tooltip->window) {
-				gtk_widget_destroy (tooltip->window);
-				tooltip->window = NULL;
-			}
-		}
-
-		event->button.x = tooltip->cx;
-		event->button.y = tooltip->cy;
-		gtk_signal_emit_by_name (GTK_OBJECT (tooltip->eti), "event",
-					 event, &ret_val);
-		break;
-	case GDK_KEY_PRESS:
-		if (tooltip->window){
-			gtk_widget_destroy (tooltip->window);
-			tooltip->window = NULL;
-		}
-		gtk_signal_emit_by_name (GTK_OBJECT (tooltip->eti), "event",
-					 event, &ret_val);
-		break;
-	default:
-		break;
-	}
-	
-	return ret_val;
-}
-
-static void
-ect_show_tooltip (ECellView *ecell_view, 
-		  int model_col,
-		  int view_col,
-		  int row,
-		  int col_width,
-		  ETableTooltip *tooltip)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CurrentCell cell;
-	struct line *lines;
-	GtkWidget *canvas;
-	int i;
-	gdouble max_width;
-	gboolean cut_off;
-	double i2c[6];
-	ArtPoint origin = {0, 0};
-	ArtPoint pixel_origin;
-	int canvas_x, canvas_y;
-	GnomeCanvasItem *tooltip_text;
-	double tooltip_width;
-	double tooltip_height;
-	double tooltip_x;
-	double tooltip_y;
-	GnomeCanvasItem *rect;
-	double text_height;
-
-	tooltip->timer = 0;
-
-	build_current_cell (&cell, text_view, model_col, view_col, row);
-
-	set_style(ecell_view, &cell, row);
-
-	cell.width = col_width - 8;
-	split_into_lines (&cell);
-	calc_line_widths (&cell);
-
-	cut_off = FALSE;
-	for (lines = cell.breaks->lines, i = 0; i < cell.breaks->num_lines;
-	     lines++, i++) {
-		if (lines->length > lines->ellipsis_length) {
-			cut_off = TRUE;
-			break;
-		}
-	}
-
-	if (!cut_off) {
-		tooltip->timer = 0;
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-		return;
-	}
-
-	gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (tooltip->eti), i2c);
-	art_affine_point (&pixel_origin, &origin, i2c);
-
-	gdk_window_get_origin (GTK_WIDGET (text_view->canvas)->window,
-			       &canvas_x, &canvas_y);
-	pixel_origin.x += canvas_x;
-	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value;
-
-	tooltip->window = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_container_set_border_width (GTK_CONTAINER (tooltip->window), 1);
-
-	canvas = e_canvas_new ();
-	gtk_container_add (GTK_CONTAINER (tooltip->window), canvas);
-
-	max_width = 0.0;
-	for (lines = cell.breaks->lines, i = 0; i < cell.breaks->num_lines;
-	     lines++, i++) {
-		gdouble line_width;
-
-		line_width = e_font_utf8_text_width (text_view->font, 
-						     cell.style, lines->text,
-						     lines->length);
-		max_width = MAX (max_width, line_width);
-	}
-
-	text_height = e_font_height (text_view->font) * cell.breaks->num_lines + 4;
-	rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				      gnome_canvas_rect_get_type (),
-				      "x1", (double) 0.0,
-				      "y1", (double) 0.0,
-				      "x2", (double) max_width + 4,
-				      "y2", (double) text_height,
-				      "fill_color", "light gray",
-				      NULL);
-
-	tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-					      e_text_get_type (),
-					      "anchor", GTK_ANCHOR_NW,
-/*  					      "font_gdk", text_view->font, */
-					      "text", cell.text,
-					      "editable", FALSE,
-					      "clip_width", max_width,
-					      "clip_height", (double) text_height,
-					      "clip", TRUE,
-					      "line_wrap", FALSE,
-  					      "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
-					      "draw_background", FALSE,
-					      NULL);
-
-	tooltip_width = max_width;
-	tooltip_height = text_height;
-	tooltip_y = tooltip->y;
-
-	switch (E_CELL_TEXT (text_view->cell_view.ecell)->justify) {
-	case GTK_JUSTIFY_CENTER:
-		tooltip_x = - tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_RIGHT:
-		tooltip_x = tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_FILL:
-	case GTK_JUSTIFY_LEFT:
-		tooltip_x = tooltip->x;
-		break;
-	}
-
-	gnome_canvas_item_move (tooltip_text, 3.0, 1.0);
-	gnome_canvas_item_set (rect,
-			       "x2", (double) tooltip_width + 6,
-			       "y2", (double) tooltip->row_height + 1,
-			       NULL);
-	gtk_widget_set_usize (tooltip->window, tooltip_width + 6,
-			      tooltip->row_height + 1);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0,
-					(double) tooltip_width + 6,
-					(double) tooltip_height);
-	gtk_widget_show (canvas);
-	gtk_widget_realize (tooltip->window);
-	gtk_signal_connect (GTK_OBJECT (tooltip->window), "event",
-			    GTK_SIGNAL_FUNC (tooltip_event), tooltip);
-
-	gtk_widget_popup (tooltip->window, pixel_origin.x + tooltip->x,
-			  pixel_origin.y + tooltip->y + 1);
-
-	unref_lines (&cell);
-	unbuild_current_cell (&cell);
-
-	return;
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-ect_destroy (GtkObject *object)
-{
-	ECellText *ect = E_CELL_TEXT (object);
-
-	g_free (ect->font_name);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-/* Set_arg handler for the text item */
-static void
-ect_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECellText *text;
-
-	text = E_CELL_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_STRIKEOUT_COLUMN:
-		text->strikeout_column = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_BOLD_COLUMN:
-		text->bold_column = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_COLOR_COLUMN:
-		text->color_column = GTK_VALUE_INT (*arg);
-		break;
-
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the text item */
-static void
-ect_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECellText *text;
-
-	text = E_CELL_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_STRIKEOUT_COLUMN:
-		GTK_VALUE_INT (*arg) = text->strikeout_column;
-		break;
-
-	case ARG_BOLD_COLUMN:
-		GTK_VALUE_INT (*arg) = text->bold_column;
-		break;
-
-	case ARG_COLOR_COLUMN:
-		GTK_VALUE_INT (*arg) = text->color_column;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_cell_text_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	object_class->destroy = ect_destroy;
-
-	ecc->new_view   = ect_new_view;
-	ecc->kill_view  = ect_kill_view;
-	ecc->realize    = ect_realize;
-	ecc->unrealize  = ect_unrealize;
-	ecc->draw       = ect_draw;
-	ecc->event      = ect_event;
-	ecc->height     = ect_height;
-	ecc->enter_edit = ect_enter_edit;
-	ecc->leave_edit = ect_leave_edit;
-	ecc->print      = ect_print;
-	ecc->print_height = ect_print_height;
-	ecc->max_width = ect_max_width;
-	ecc->show_tooltip = ect_show_tooltip;
-
-	ectc->get_text = ect_real_get_text;
-	ectc->free_text = ect_real_free_text;
-
-	object_class->get_arg = ect_get_arg;
-	object_class->set_arg = ect_set_arg;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("ECellText::strikeout_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_STRIKEOUT_COLUMN);
-	gtk_object_add_arg_type ("ECellText::bold_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_BOLD_COLUMN);
-	gtk_object_add_arg_type ("ECellText::color_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_COLOR_COLUMN);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-static void
-e_cell_text_init (ECellText *ect)
-{
-	ect->ellipsis = NULL;
-	ect->use_ellipsis = TRUE;
-	ect->strikeout_column = -1;
-	ect->bold_column = -1;
-	ect->color_column = -1;
-}
-
-E_MAKE_TYPE(e_cell_text, "ECellText", ECellText, e_cell_text_class_init, e_cell_text_init, PARENT_TYPE);
-
-/**
- * e_cell_text_construct:
- * @cell: The cell to construct
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell
- *
- * constructs the ECellText.  To be used by subclasses and language
- * bindings.
- *
- * Returns: The ECellText.
- */
-ECell *
-e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification justify)
-{
-	cell->font_name = g_strdup (fontname);
-	cell->justify = justify;
-	return E_CELL(cell);
-}
-
-/**
- * e_cell_text_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render strings that
- * that come from the model.  The value returned from the model is
- * interpreted as being a char *.
- *
- * The ECellText object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, and color.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the text should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render strings.
- */
-ECell *
-e_cell_text_new (const char *fontname, GtkJustification justify)
-{
-	ECellText *ect = gtk_type_new (e_cell_text_get_type ());
-
-	e_cell_text_construct(ect, fontname, justify);
-
-	return (ECell *) ect;
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_xpos (CurrentCell *cell, struct line *line)
-{
-	int x;
-	
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)cell->text_view)->ecell);
-	
-	x = text_view->xofs + ect->x;
-
-	switch (ect->justify) {
-	case GTK_JUSTIFY_RIGHT:
-		x += cell->width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (cell->width - line->width) / 2;
-		break;
-
-	default:
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-
-	return x;
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_ypos (CurrentCell *cell, struct line *line)
-{
-	int y;
-
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)cell->text_view)->ecell);
-	ECellTextLineBreaks *linebreaks = cell->breaks;
-
-	struct line *lines = linebreaks->lines;
-
-	EFont *font;
-	
-	font = text_view->font;
-
-	y = text_view->yofs + ect->y;
-	y += (line - lines) * e_font_height (font);
-
-	return y;
-}
-
-/* fixme: Handle Font attributes */
-/* position is in BYTES */
-
-static void
-_get_xy_from_position (CurrentCell *cell, gint position, gint *xp, gint *yp)
-{
-	if (xp || yp) {
-		struct line *lines;
-		int x, y;
-		int j;
-		ECellTextView *text_view = cell->text_view;
-		ECellTextLineBreaks *linebreaks;
-		EFont *font;
-		
-		font = text_view->font;
-		
-		split_into_lines (cell);
-		
-		linebreaks = cell->breaks;
-		lines = linebreaks->lines;
-
-		x = get_line_xpos (cell, lines);
-		y = get_line_ypos (cell, lines);
-		for (j = 0, lines = linebreaks->lines; j < linebreaks->num_lines; lines++, j++) {
-			if (lines->text > cell->text + position)
-				break;
-			y += e_font_height (font);
-		}
-		lines --;
-		y -= e_font_descent (font);
-		
-		x += e_font_utf8_text_width (font, cell->style,
-					     lines->text,
-					     position - (lines->text - cell->text));
-		if ((CellEdit *) cell == cell->text_view->edit){
-			x -= ((CellEdit *)cell)->xofs_edit;
-			y -= ((CellEdit *)cell)->yofs_edit;
-		}
-		if (xp)
-			*xp = x;
-		if (yp)
-			*yp = y;
-		unref_lines (cell);
-	}
-}
-
-static gint
-_get_position_from_xy (CurrentCell *cell, gint x, gint y)
-{
-	int i, j;
-	int xpos, ypos;
-	struct line *lines;
-	int return_val;
-	gchar *p;
-
-	ECellTextView *text_view = cell->text_view;
-	ECellTextLineBreaks *linebreaks;
-	EFont *font;
-	
-	font = text_view->font;
-
-	split_into_lines (cell);
-	
-	linebreaks = cell->breaks;
-
-	lines = linebreaks->lines;
-
-	if ((CellEdit *) cell == cell->text_view->edit){
-		x += ((CellEdit *)cell)->xofs_edit;
-		y += ((CellEdit *)cell)->yofs_edit;
-	}
-	
-	ypos = get_line_ypos (cell, linebreaks->lines);
-	j = 0;
-	while (y > ypos) {
-		ypos += e_font_height (font);
-		j ++;
-	}
-	j--;
-	if (j >= linebreaks->num_lines)
-		j = linebreaks->num_lines - 1;
-	if (j < 0)
-		j = 0;
-	i = 0;
-
-	lines += j;
-	xpos = get_line_xpos (cell, lines);
-
-	for (p = lines->text; p < lines->text + lines->length; p = unicode_next_utf8 (p)) {
-		gint charwidth;
-
-		charwidth = e_font_utf8_char_width (font, cell->style, p);
-
-		xpos += charwidth / 2;
-		if (xpos > x) {
-			break;
-		}
-		xpos += (charwidth + 1) / 2;
-	}
-	
-	return_val = p - cell->text;
-
-	unref_lines (cell);
-
-	return return_val;
-}
-
-#define SCROLL_WAIT_TIME 30000
-
-static gboolean
-_blink_scroll_timeout (gpointer data)
-{
-	ECellTextView *text_view = (ECellTextView *) data;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-
-	gulong current_time;
-	gboolean scroll = FALSE;
-	gboolean redraw = FALSE;
-	
-	g_timer_elapsed (edit->timer, &current_time);
-
-	if (edit->scroll_start + SCROLL_WAIT_TIME > 1000000) {
-		if (current_time > edit->scroll_start - (1000000 - SCROLL_WAIT_TIME) &&
-		    current_time < edit->scroll_start)
-			scroll = TRUE;
-	} else {
-		if (current_time > edit->scroll_start + SCROLL_WAIT_TIME ||
-		    current_time < edit->scroll_start)
-			scroll = TRUE;
-	}
-	if (scroll && edit->button_down) {
-		/* FIXME: Copy this for y. */
-		if (edit->lastx - ect->x > cell->width) {
-			ECellTextLineBreaks *linebreaks;
-			split_into_lines (cell);
-			linebreaks = cell->breaks;
-			if (edit->xofs_edit < linebreaks->max_width - cell->width) {
-				edit->xofs_edit += 4;
-				if (edit->xofs_edit > linebreaks->max_width - cell->width + 1)
-					edit->xofs_edit = linebreaks->max_width - cell->width + 1;
-				redraw = TRUE;
-			}
-			unref_lines (cell);
-		}
-		if (edit->lastx - ect->x < 0 &&
-		    edit->xofs_edit > 0) {
-			edit->xofs_edit -= 4;
-			if (edit->xofs_edit < 0)
-				edit->xofs_edit = 0;
-			redraw = TRUE;
-		}
-		if (redraw) {
-			ETextEventProcessorEvent e_tep_event;
-			e_tep_event.type = GDK_MOTION_NOTIFY;
-			e_tep_event.motion.state = edit->last_state;
-			e_tep_event.motion.time = 0;
-			e_tep_event.motion.position = _get_position_from_xy (cell, edit->lastx, edit->lasty);
-			_get_tep (edit);
-			e_text_event_processor_handle_event (edit->tep,
-							     &e_tep_event);
-			edit->scroll_start = current_time;
-		}
-	}
-
-	if (!((current_time / 500000) % 2)) {
-		if (!edit->show_cursor)
-			redraw = TRUE;
-		edit->show_cursor = TRUE;
-	} else {
-		if (edit->show_cursor)
-			redraw = TRUE;
-		edit->show_cursor = FALSE;
-	}
-	if (redraw){
-		ect_queue_redraw (text_view, edit->cell.view_col, edit->cell.row);
-	}
-	return TRUE;
-}
-
-static int
-_get_position (ECellTextView *text_view, ETextEventProcessorCommand *command)
-{
-	int length;
-	int x, y;
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	EFont *font;
-	gchar *p;
-	int unival;
-	
-	font = text_view->font;
-	
-	switch (command->position) {
-		
-	case E_TEP_VALUE:
-		return command->value;
-
-	case E_TEP_SELECTION:
-		return edit->selection_end;
-
-	case E_TEP_START_OF_BUFFER:
-		return 0;
-
-		/* fixme: this probably confuses TEP */
-
-	case E_TEP_END_OF_BUFFER:
-		return strlen (cell->text);
-
-	case E_TEP_START_OF_LINE:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = unicode_previous_utf8 (cell->text, cell->text + edit->selection_end);
-
-		if (p == cell->text) return 0;
-
-		p = unicode_previous_utf8 (cell->text, p);
-
-		while (p && p > cell->text) {
-			if (*p == '\n') return p - cell->text + 1;
-			p = unicode_previous_utf8 (cell->text, p);
-		}
-
-		return 0;
-
-	case E_TEP_END_OF_LINE:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = unicode_next_utf8 (cell->text + edit->selection_end);
-
-		while (*p) {
-			if (*p == '\n') return p - cell->text;
-			p = unicode_next_utf8 (p);
-		}
-
-		return p - cell->text;
-
-	case E_TEP_FORWARD_CHARACTER:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = unicode_next_utf8 (cell->text + edit->selection_end);
-
-		return p - cell->text;
-
-	case E_TEP_BACKWARD_CHARACTER:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = unicode_previous_utf8 (cell->text, cell->text + edit->selection_end);
-
-		if (p == NULL) return 0;
-
-		return p - cell->text;
-
-	case E_TEP_FORWARD_WORD:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = unicode_next_utf8 (cell->text + edit->selection_end);
-
-		while (*p) {
-			unicode_get_utf8 (p, &unival);
-			if (unicode_isspace (unival)) return p - cell->text;
-			p = unicode_next_utf8 (p);
-		}
-
-		return p - cell->text;
-
-	case E_TEP_BACKWARD_WORD:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = unicode_previous_utf8 (cell->text, cell->text + edit->selection_end);
-
-		if (p == cell->text) return 0;
-
-		p = unicode_previous_utf8 (cell->text, p);
-
-		while (p && p > cell->text) {
-			unicode_get_utf8 (p, &unival);
-			if (unicode_isspace (unival)) {
-				return (unicode_next_utf8 (p) - cell->text);
-			}
-			p = unicode_previous_utf8 (cell->text, p);
-		}
-
-		return 0;
-
-	case E_TEP_FORWARD_LINE:
-		_get_xy_from_position (cell, edit->selection_end, &x, &y);
-		y += e_font_height (font);
-		return _get_position_from_xy (cell, x, y);
-	case E_TEP_BACKWARD_LINE:
-		_get_xy_from_position (cell, edit->selection_end, &x, &y);
-		y -= e_font_height (font);
-		return _get_position_from_xy (cell, x, y);
-
-	case E_TEP_FORWARD_PARAGRAPH:
-	case E_TEP_BACKWARD_PARAGRAPH:
-		
-	case E_TEP_FORWARD_PAGE:
-	case E_TEP_BACKWARD_PAGE:
-		return edit->selection_end;
-	default:
-		return edit->selection_end;
-	}
-	g_assert_not_reached ();
-	return 0; /* Kill warning */
-}
-
-static void
-_delete_selection (ECellTextView *text_view)
-{
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	gint length;
-	gchar *sp, *ep;
-
-	if (edit->selection_end == edit->selection_start) return;
-
-	if (edit->selection_end < edit->selection_start) {
-		edit->selection_end ^= edit->selection_start;
-		edit->selection_start ^= edit->selection_end;
-		edit->selection_end ^= edit->selection_start;
-	}
-
-	sp = cell->text + edit->selection_start;
-	ep = cell->text + edit->selection_end;
-	length = strlen (ep) + 1;
-
-	memmove (sp, ep, length);
-
-	edit->selection_end = edit->selection_start;
-}
-
-/* fixme: */
-/* NB! We expect value to be length IN BYTES */
-
-static void
-_insert (ECellTextView *text_view, char *string, int value)
-{
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	char *temp;
-
-	if (value <= 0) return;
-
-	temp = g_new (gchar, strlen (cell->text) + value + 1);
-
-	strncpy (temp, cell->text, edit->selection_start);
-	strncpy (temp + edit->selection_start, string, value);
-	strcpy (temp + edit->selection_start + value, cell->text + edit->selection_end);
-
-	g_free (cell->text);
-
-	cell->text = temp;
-
-	edit->selection_start += value;
-	edit->selection_end = edit->selection_start;
-}
-
-static void
-e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data)
-{
-	CellEdit *edit = (CellEdit *) data;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	ECellTextView *text_view = cell->text_view;
-
-	gboolean change = FALSE;
-	gboolean redraw = FALSE;
-
-	int sel_start, sel_end;
-	EFont *font;
-	
-	font = text_view->font;
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		edit->selection_start = _get_position (text_view, command);
-		edit->selection_end = edit->selection_start;
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		break;
-	case E_TEP_SELECT:
-		edit->selection_end = _get_position (text_view, command);
-		sel_start = MIN(edit->selection_start, edit->selection_end);
-		sel_end = MAX(edit->selection_start, edit->selection_end);
-		if (sel_start != sel_end) {
-			e_cell_text_view_supply_selection (edit, command->time, GDK_SELECTION_PRIMARY,
-							   cell->text + sel_start,
-							   sel_end - sel_start);
-		} else if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		break;
-	case E_TEP_DELETE:
-		if (edit->selection_end == edit->selection_start) {
-			edit->selection_end = _get_position (text_view, command);
-		}
-		_delete_selection (text_view);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-
-	case E_TEP_INSERT:
-		if (edit->selection_end != edit->selection_start) {
-			_delete_selection (text_view);
-		}
-		_insert (text_view, command->string, command->value);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-	case E_TEP_COPY:
-		sel_start = MIN(edit->selection_start, edit->selection_end);
-		sel_end = MAX(edit->selection_start, edit->selection_end);
-		if (sel_start != sel_end) {
-			e_cell_text_view_supply_selection (edit, command->time, clipboard_atom,
-							   cell->text + sel_start,
-							   sel_end - sel_start);
-		}
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		break;
-	case E_TEP_PASTE:
-		e_cell_text_view_get_selection (edit, clipboard_atom, command->time);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-	case E_TEP_GET_SELECTION:
-		e_cell_text_view_get_selection (edit, GDK_SELECTION_PRIMARY, command->time);
-		break;
-	case E_TEP_ACTIVATE:
-		e_table_item_leave_edit (text_view->cell_view.e_table_item_view);
-		break;
-	case E_TEP_SET_SELECT_BY_WORD:
-		edit->select_by_word = command->value;
-		break;
-	case E_TEP_GRAB:
-		edit->actions = E_CELL_GRAB;
-		break;
-	case E_TEP_UNGRAB:
-		edit->actions = E_CELL_UNGRAB;
-		break;
-	case E_TEP_NOP:
-		break;
-	}
-
-	if (!edit->button_down) {
-		int x;
-		int i;
-		struct line *lines;
-		ECellTextLineBreaks *linebreaks;
-		
-		split_into_lines (cell);
-		
-		linebreaks = cell->breaks;
-	
-		for (lines = linebreaks->lines, i = 0; i < linebreaks->num_lines ; i++, lines ++) {
-			if ((lines->text - cell->text) > edit->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		x = e_font_utf8_text_width (font, cell->style,
-					    lines->text,
-					    edit->selection_end - (lines->text - cell->text));
-		
-
-		if (x < edit->xofs_edit) {
-			edit->xofs_edit = x;
-			redraw = TRUE;
-		}
-
-		if (2 + x - cell->width > edit->xofs_edit) {
-			edit->xofs_edit = 2 + x - cell->width;
-			redraw = TRUE;
-		}
-		unref_lines (cell);
-	}
-
-	if (redraw){
-		ect_queue_redraw (text_view, edit->cell.view_col, edit->cell.row);
-	}
-#if 0
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-#endif
-}
-
-static void _invisible_destroy (GtkInvisible *invisible,
-				CellEdit *edit)
-{
-	edit->invisible = NULL;
-}
-
-static GtkWidget *e_cell_text_view_get_invisible (CellEdit *edit)
-{	
-	GtkWidget *invisible;
-	if (edit->invisible) {
-		invisible = edit->invisible;
-	} else {
-		invisible = gtk_invisible_new ();
-		edit->invisible = invisible;
-		
-		gtk_selection_add_target (invisible,
-					  GDK_SELECTION_PRIMARY,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_PRIMARY);
-		gtk_selection_add_target (invisible,
-					  clipboard_atom,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_CLIPBOARD);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_get",
-				    GTK_SIGNAL_FUNC (_selection_get), 
-				    edit);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_clear_event",
-				    GTK_SIGNAL_FUNC (_selection_clear_event),
-				    edit);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_received",
-				    GTK_SIGNAL_FUNC (_selection_received),
-				    edit);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "destroy",
-				    GTK_SIGNAL_FUNC (_invisible_destroy),
-				    edit);
-	}
-	return invisible;
-}
-
-static void
-_selection_clear_event (GtkInvisible *invisible,
-			GdkEventSelection *event,
-			CellEdit *edit)
-{
-	if (event->selection == GDK_SELECTION_PRIMARY) {
-		g_free (edit->primary_selection);
-		edit->primary_selection = NULL;
-		edit->primary_length = 0;
-
-		edit->has_selection = FALSE;
-#if 0
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-#endif
-
-	} else if (event->selection == clipboard_atom) {
-		g_free (edit->clipboard_selection);
-		edit->clipboard_selection = NULL;
-		edit->clipboard_length = 0;
-	}
-}
-
-static void
-_selection_get (GtkInvisible *invisible,
-		GtkSelectionData *selection_data,
-		guint info,
-		guint time_stamp,
-		CellEdit *edit)
-{
-	switch (info) {
-	case E_SELECTION_PRIMARY:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, edit->primary_selection, edit->primary_length);
-		break;
-	case E_SELECTION_CLIPBOARD:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, edit->clipboard_selection, edit->clipboard_length);
-		break;
-	}
-}
-
-/* fixme: What happens, if delivered string is not UTF-8? */
-
-static void
-_selection_received (GtkInvisible *invisible,
-		     GtkSelectionData *selection_data,
-		     guint time,
-		     CellEdit *edit)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	} else {
-		ETextEventProcessorCommand command;
-		command.action = E_TEP_INSERT;
-		command.position = E_TEP_SELECTION;
-		command.string = selection_data->data;
-		command.value = selection_data->length;
-		command.time = time;
-		e_cell_text_view_command (edit->tep, &command, edit);
-	}
-}
-
-static void
-e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length)
-{
-	gboolean successful;
-	GtkWidget *invisible;
-
-	invisible = e_cell_text_view_get_invisible (edit);
-
-	if (selection == GDK_SELECTION_PRIMARY){
-		if (edit->primary_selection) {
-			g_free (edit->primary_selection);
-		}
-		edit->primary_selection = g_strndup (data, length);
-		edit->primary_length = length;
-	} else if (selection == clipboard_atom) {
-		if (edit->clipboard_selection) {
-			g_free (edit->clipboard_selection);
-		}
-		edit->clipboard_selection = g_strndup (data, length);
-		edit->clipboard_length = length;
-	}
-
-	successful = gtk_selection_owner_set (invisible,
-					      selection,
-					      time);
-	
-	if (selection == GDK_SELECTION_PRIMARY)
-		edit->has_selection = successful;
-}
-
-static void
-e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time)
-{
-	GtkWidget *invisible;
-	invisible = e_cell_text_view_get_invisible (edit);
-	gtk_selection_convert (invisible,
-			      selection,
-			      GDK_SELECTION_TYPE_STRING,
-			      time);
-}
-
-static void
-_get_tep (CellEdit *edit)
-{
-	if (!edit->tep) {
-		edit->tep = e_text_event_processor_emacs_like_new ();
-		gtk_object_ref (GTK_OBJECT (edit->tep));
-		gtk_object_sink (GTK_OBJECT (edit->tep));
-		gtk_signal_connect (GTK_OBJECT(edit->tep),
-				   "command",
-				   GTK_SIGNAL_FUNC(e_cell_text_view_command),
-				   (gpointer) edit);
-	}
-}
-
-static int
-number_of_lines (char *text)
-{
-	int num_lines = 0;
-	gchar *p;
-
-	if (!text) return 0;
-
-	for (p = text; *p; p = unicode_next_utf8 (p)) {
-		if (*p == '\n') num_lines++;
-	}
-	
-	num_lines++;
-	return num_lines;
-}
-
-/* Splits the text of the text item into lines */
-static void
-split_into_lines (CurrentCell *cell)
-{
-	char *p;
-	struct line *lines;
-	gint len;
-
-	char *text = cell->text;
-	ECellTextLineBreaks *linebreaks;
-
-	if (! cell->breaks) {
-		cell->breaks = g_new (ECellTextLineBreaks, 1);
-		cell->breaks->ref_count = 1;
-	} else {
-		cell->breaks->ref_count ++;
-		return;
-	}
-	linebreaks = cell->breaks;
-
-	/* Check if already split. */
-	linebreaks->lines = NULL;
-	linebreaks->num_lines = 0;
-	
-	if (!text)
-		return;
-	
-	/* First, count the number of lines */
-
-	linebreaks->num_lines = number_of_lines(cell->text);
-	
-	/* Allocate array of lines and calculate split positions */
-	
-	linebreaks->lines = lines = g_new0 (struct line, linebreaks->num_lines);
-
-	len = 0;
-	for (p = text; *p; p = unicode_next_utf8 (p)) {
-		if (len == 0) lines->text = p;
-		if (*p == '\n') {
-			lines->length = p - lines->text;
-			lines++;
-			len = 0;
-		} else
-			len++;
-	}
-	
-	if (len == 0)
-		lines->text = p;
-	lines->length = p - lines->text;
-
-	calc_line_widths (cell);
-}
-
-/* Free lines structure. */
-static void
-unref_lines (CurrentCell *cell)
-{
-	if (cell->breaks){
-		cell->breaks->ref_count --;
-		if (cell->breaks->ref_count <= 0){
-			g_free (cell->breaks->lines);
-			g_free (cell->breaks);
-			cell->breaks = NULL;
-		}
-	}
-}
-
-static void
-calc_ellipsis (ECellTextView *text_view)
-{
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	EFont *font;
-	
-	font = text_view->font;
-	if (font) {
-		text_view->ellipsis_width[E_FONT_PLAIN] =
-			e_font_utf8_text_width (font, E_FONT_PLAIN,
-					ect->ellipsis ? ect->ellipsis : "...",
-					ect->ellipsis ? strlen (ect->ellipsis) : 3);
-		text_view->ellipsis_width[E_FONT_BOLD] =
-			e_font_utf8_text_width (font, E_FONT_BOLD,
-					ect->ellipsis ? ect->ellipsis : "...",
-					ect->ellipsis ? strlen (ect->ellipsis) : 3);
-	}
-}
-
-/* Calculates the line widths (in pixels) of the text's splitted lines */
-static void
-calc_line_widths (CurrentCell *cell)
-{
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	ECellTextLineBreaks *linebreaks = cell->breaks;
-	struct line *lines;
-	int i;
-	int j;
-	EFont *font;
-	
-	font = text_view->font;
-	
-	lines = linebreaks->lines;
-	linebreaks->max_width = 0;
-
-	if (!lines) return;
-
-	for (i = 0; i < linebreaks->num_lines; i++) {
-		if (lines->length != 0) {
-			if (font) {
-				lines->width = e_font_utf8_text_width (font, cell->style,
-								       lines->text, lines->length);
-				lines->ellipsis_length = 0;
-			} else {
-				lines->width = 0;
-			}
-			
-			if (ect->use_ellipsis &&
-			    (!(text_view->edit &&
-			       cell->row == text_view->edit->cell.row &&
-			       cell->view_col == text_view->edit->cell.view_col)) &&
-			    lines->width > cell->width) {
-				if (font) {
-					lines->ellipsis_length = 0;
-					for (j = 0; j < lines->length; j++){
-						if (e_font_utf8_text_width (font, cell->style, lines->text, j) +
-						    text_view->ellipsis_width[cell->style] < cell->width) {
-							lines->ellipsis_length = j;
-						}
-						else
-							break;
-					}
-				}
-				else
-					lines->ellipsis_length = 0;
-				lines->width = e_font_utf8_text_width (font, cell->style, lines->text, lines->ellipsis_length) +
-					text_view->ellipsis_width[cell->style];
-			}
-			else
-				lines->ellipsis_length = lines->length;
-
-			if (lines->width > linebreaks->max_width)
-				linebreaks->max_width = lines->width;
-		} else {
-			lines->width = 0;
-			lines->ellipsis_length = 0;
-		}
-
-		lines++;
-	}
-}
-
-static void
-build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row)
-{
-	ECellView *ecell_view = (ECellView *) text_view;
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	char *temp;
-
-	cell->text_view = text_view;
-	cell->model_col = model_col;
-	cell->view_col = view_col;
-	cell->row = row;
-	cell->breaks = NULL;
-
-	temp = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	cell->text = g_strdup(temp);
-	ect_free_text(ect, temp);
-
-	cell->width = e_table_header_get_column (
-		((ETableItem *)ecell_view->e_table_item_view)->header,
-		view_col)->width - 8;
-	cell->style = 0;
-}
-
-static void
-unbuild_current_cell (CurrentCell *cell)
-{
-	g_free(cell->text);
-	cell->text = NULL;
-}
-
-
-static GdkColor*
-e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec)
-{
-	ECellText *ect = E_CELL_TEXT (((ECellView*) cell_view)->ecell);
-	GdkColormap *colormap;
-	GdkColor *color, tmp_color;
-
-	/* If the color spec is NULL we use the default color. */
-	if (color_spec == NULL)
-		return NULL;
-
-	/* Create the hash table if we haven't already. */
-	if (!ect->colors)
-		ect->colors = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* See if we've already allocated the color. Note that we use a
-	   special value of (GdkColor*) 1 in the hash to indicate that we've
-	   already tried and failed to allocate the color, so we don't keep
-	   trying to allocate it. */
-	color = g_hash_table_lookup (ect->colors, color_spec);
-	if (color == (GdkColor*) 1)
-		return NULL;
-	if (color)
-		return color;
-
-	/* Try to parse the color. */
-	if (gdk_color_parse (color_spec, &tmp_color)) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (cell_view->canvas));
-
-		/* Try to allocate the color. */
-		if (gdk_color_alloc (colormap, &tmp_color))
-			color = gdk_color_copy (&tmp_color);
-	}
-
-	g_hash_table_insert (ect->colors, g_strdup (color_spec),
-			     color ? color : (GdkColor*) 1);
-	return color;
-}
-
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
deleted file mode 100644
index 78e9576a07..0000000000
--- a/widgets/table/e-cell-text.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellText - Text item for e-table.
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * Drawing and event handling from:
- * 
- * EText - Text item for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-#ifndef _E_CELL_TEXT_H_
-#define _E_CELL_TEXT_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TEXT_TYPE        (e_cell_text_get_type ())
-#define E_CELL_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_TEXT_TYPE, ECellText))
-#define E_CELL_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TEXT_TYPE, ECellTextClass))
-#define E_IS_CELL_TEXT(o)       (GTK_CHECK_TYPE ((o), E_CELL_TEXT_TYPE))
-#define E_IS_CELL_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TEXT_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	GtkJustification  justify;
-	char             *font_name;
-
-	double x, y;			/* Position at anchor */
-
-	gulong pixel;			/* Fill color */
-
-	/* Clip handling */
-	char *ellipsis;                 /* The ellipsis characters.  NULL = "...". */
-
-	guint use_ellipsis : 1;         /* Whether to use the ellipsis. */
-	
-	int strikeout_column;
-	int bold_column;
-
-	/* This column in the ETable should return a string specifying a color,
-	   either a color name like "red" or a color spec like "rgb:F/0/0".
-	   See the XParseColor man page for the formats available. */
-	int color_column;
-
-	/* This stores the colors we have allocated. */
-	GHashTable *colors;
-} ECellText;
-
-typedef struct {
-	ECellClass parent_class;
-
-	char *(*get_text)  (ECellText *cell, ETableModel *model, int col, int row);
-	void  (*free_text) (ECellText *cell, char *text);
-} ECellTextClass;
-
-GtkType    e_cell_text_get_type (void);
-ECell     *e_cell_text_new      (const char *fontname, GtkJustification justify);
-ECell     *e_cell_text_construct(ECellText *cell, const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TEXT_H_ */
-
-
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
deleted file mode 100644
index 45971f6f18..0000000000
--- a/widgets/table/e-cell-toggle.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * e-cell-toggle.c: Multi-state image toggle cell object.
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999, 2000 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "e-cell-toggle.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-
-#define PARENT_TYPE e_cell_get_type ()
-
-typedef struct {
-	ECellView    cell_view;
-	GdkGC       *gc;
-	GnomeCanvas *canvas;
-} ECellToggleView;
-
-static ECellClass *parent_class;
-
-static void
-etog_queue_redraw (ECellToggleView *text_view, int view_col, int view_row)
-{
-	e_table_item_redraw_range (
-		text_view->cell_view.e_table_item_view,
-		view_col, view_row, view_col, view_row);
-}
-
-/*
- * ECell::realize method
- */
-static ECellView *
-etog_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellToggleView *toggle_view = g_new0 (ECellToggleView, 1);
-	ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas;
-	
-	toggle_view->cell_view.ecell = ecell;
-	toggle_view->cell_view.e_table_model = table_model;
-	toggle_view->cell_view.e_table_item_view = e_table_item_view;
-	toggle_view->canvas = canvas;
-	
-	return (ECellView *) toggle_view;
-}
-
-static void
-etog_kill_view (ECellView *ecell_view)
-{
-	g_free (ecell_view);
-}	
-
-static void
-etog_realize (ECellView *ecell_view)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-
-	toggle_view->gc = gdk_gc_new (GTK_WIDGET (toggle_view->canvas)->window);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-etog_unrealize (ECellView *ecv)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecv;
-
-	gdk_gc_unref (toggle_view->gc);
-	toggle_view->gc = NULL;
-}
-
-/*
- * ECell::draw method
- */
-static void
-etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-	gboolean selected;
-#if 0
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-#endif
-	GdkPixbuf *image;
-	int x, y, width, height;
-	
-	const int value = GPOINTER_TO_INT (
-		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
-	
-	selected = flags & E_CELL_SELECTED;
-
-	if (value >= toggle->n_states){
-		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
-			   value, toggle->n_states);
-		return;
-	}
-
-	image = toggle->images [value];
-
-	if ((x2 - x1) < gdk_pixbuf_get_width (image)){
-		x = x1;
-		width = x2 - x1;
-	} else {
-		x = x1 + ((x2 - x1) - gdk_pixbuf_get_width (image)) / 2;
-		width = gdk_pixbuf_get_width (image);
-	}
-
-	if ((y2 - y1) < gdk_pixbuf_get_height (image)){
-		y = y1;
-		height = y2 - y1;
-	} else {
-		y = y1 + ((y2 - y1) - gdk_pixbuf_get_height (image)) / 2;
-		height = gdk_pixbuf_get_height (image);
-	}
-
-#if 0 /* do alpha */
-	if (gdk_pixbuf_get_has_alpha (image)) {
-		flat = gdk_pixbuf_composite_color_simple (
-			image,
-			gdk_pixbuf_get_width (image),
-			gdk_pixbuf_get_height (image),
-			GDK_INTERP_NEAREST,
-			255,
-			32,
-			0xffffff, 0xffffff);	
-		
-		gdk_pixbuf_render_to_drawable (flat, drawable,
-					       toggle_view->gc,
-					       0, 0,
-					       x, y,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-		gdk_pixbuf_unref (flat);
-	} else {
-		gdk_pixbuf_render_to_drawable (image, drawable,
-					       toggle_view->gc,
-					       0, 0,
-					       x, y,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-	}
-#else 
-	gdk_pixbuf_render_to_drawable_alpha (image, drawable,
-					     0, 0,
-					     x, y,
-					     width, height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     x, y);
-#endif
-}
-
-static void
-etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value)
-{
-	ECell *ecell = toggle_view->cell_view.ecell;
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell);
-
-	if (value >= toggle->n_states)
-		value = 0;
-
-	e_table_model_set_value_at (toggle_view->cell_view.e_table_model,
-				    model_col, row, GINT_TO_POINTER (value));
-	etog_queue_redraw (toggle_view, view_col, row);
-}
-
-/*
- * ECell::event method
- */
-static gint
-etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-	void *_value = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
-	const int value = GPOINTER_TO_INT (_value);
-
-	if (flags & !E_CELL_EDITING)
-		return 0;
-	
-	switch (event->type){
-	case GDK_BUTTON_RELEASE:
-		if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row))
-			return FALSE;
-		
-		etog_set_value (toggle_view, model_col, view_col, row, value + 1);
-		return TRUE;
-
-	case GDK_KEY_PRESS:
-		if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row))
-			return FALSE;
-		
-		if (event->key.keyval == GDK_space){
-			etog_set_value (toggle_view, model_col, view_col, row, value + 1);
-			return TRUE;
-		}
-		return FALSE;
-		
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/*
- * ECell::height method
- */
-static int
-etog_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-
-	return toggle->height;
-}
-
-/*
- * ECell::max_width method
- */
-static int
-etog_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-	void *_value = e_table_model_value_at (ecell_view->e_table_model, model_col, 0);
-	int max_width = gdk_pixbuf_get_width (toggle->images[GPOINTER_TO_INT (_value)]);
-	int number_of_rows;
-	int row;
-
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-	for (row = 1; row < number_of_rows; row++) {
-		void *_value = e_table_model_value_at (ecell_view->e_table_model,
-						       model_col, row);
-		max_width = MAX (max_width, gdk_pixbuf_get_width (toggle->images[GPOINTER_TO_INT (_value)]));
-	}
-
-	return max_width;
-}
-
-static void
-etog_destroy (GtkObject *object)
-{
-	ECellToggle *etog = E_CELL_TOGGLE (object);
-	int i;
-	
-	for (i = 0; i < etog->n_states; i++)
-		gdk_pixbuf_unref (etog->images [i]);
-
-	g_free (etog->images);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-e_cell_toggle_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = etog_destroy;
-
-	ecc->new_view   = etog_new_view;
-	ecc->kill_view  = etog_kill_view;
-	ecc->realize    = etog_realize;
-	ecc->unrealize  = etog_unrealize;
-	ecc->draw       = etog_draw;
-	ecc->event      = etog_event;
-	ecc->height     = etog_height;
-	ecc->max_width  = etog_max_width;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE(e_cell_toggle, "ECellToggle", ECellToggle, e_cell_toggle_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_toggle_construct:
- * @etog: a fresh ECellToggle object
- * @border: number of pixels used as a border
- * @n_states: number of states the toggle will have
- * @images: a collection of @n_states images, one for each state.
- *
- * Constructs the @etog object with the @border, @n_staes, and @images
- * arguments.
- */
-void
-e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf **images)
-{
-	int max_height =  0;
-	int i;
-	
-	etog->border = border;
-	etog->n_states = n_states;
-
-	etog->images = g_new (GdkPixbuf *, n_states);
-
-	for (i = 0; i < n_states; i++){
-		etog->images [i] = images [i];
-		gdk_pixbuf_ref (images [i]);
-
-		if (gdk_pixbuf_get_height (images [i]) > max_height)
-		  max_height = gdk_pixbuf_get_height (images [i]);
-	}
-
-	etog->height = max_height;
-}
-
-/**
- * e_cell_checkbox_new:
- * @border: number of pixels used as a border
- * @n_states: number of states the toggle will have
- * @images: a collection of @n_states images, one for each state.
- *
- * Creates a new ECell renderer that can be used to render toggle
- * buttons with the images specified in @images.  The value returned 
- * by ETableModel::get_value is typecase into an integer and clamped
- * to the [0..n_states) range.  That will select the image rendered.
- * 
- * Returns: an ECell object that can be used to render multi-state
- * toggle cells.
- */
-ECell *
-e_cell_toggle_new (int border, int n_states, GdkPixbuf **images)
-{
-	ECellToggle *etog = gtk_type_new (e_cell_toggle_get_type ());
-
-	e_cell_toggle_construct (etog, border, n_states, images);
-
-	return (ECell *) etog;
-}
-
-
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
deleted file mode 100644
index 0916970b00..0000000000
--- a/widgets/table/e-cell-toggle.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _E_CELL_TOGGLE_H_
-#define _E_CELL_TOGGLE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TOGGLE_TYPE        (e_cell_toggle_get_type ())
-#define E_CELL_TOGGLE(o)          (GTK_CHECK_CAST ((o), E_CELL_TOGGLE_TYPE, ECellToggle))
-#define E_CELL_TOGGLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TOGGLE_TYPE, ECellToggleClass))
-#define E_IS_CELL_TOGGLE(o)       (GTK_CHECK_TYPE ((o), E_CELL_TOGGLE_TYPE))
-#define E_IS_CELL_TOGGLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TOGGLE_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	int        border;
-	int        n_states;
-	GdkPixbuf **images;
-
-	int        height;
-} ECellToggle;
-
-typedef struct {
-	ECellClass parent_class;
-} ECellToggleClass;
-
-GtkType    e_cell_toggle_get_type  (void);
-ECell     *e_cell_toggle_new       (int border, int n_states, GdkPixbuf **images);
-void       e_cell_toggle_construct (ECellToggle *etog, int border,
-				    int n_states, GdkPixbuf **images);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TOGGLE_H_ */
-
-
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
deleted file mode 100644
index 62c78da748..0000000000
--- a/widgets/table/e-cell-tree.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cell-tree.c - Tree cell renderer
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * A majority of code taken from:
- *
- * the ECellText renderer.
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <stdio.h>
-#include "e-table-sorted-variable.h"
-#include "e-tree-model.h"
-#include "e-cell-tree.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <ctype.h>
-#include <math.h>
-
-#include "tree-expanded.xpm"
-#include "tree-unexpanded.xpm"
-
-#define PARENT_TYPE e_cell_get_type ()
-
-typedef struct {
-	ECellView    cell_view;
-	ECellView   *subcell_view;
-	GdkGC       *gc;
-
-	GnomeCanvas *canvas;
-
-} ECellTreeView;
-
-static ECellClass *parent_class;
-
-#define INDENT_AMOUNT 16
-
-static int
-visible_depth_of_node (ETreeModel *tree_model, ETreePath *path)
-{
-	return (e_tree_model_node_depth (tree_model, path) 
-		- (e_tree_model_root_node_is_visible (tree_model) ? 0 : 1));
-}
-
-static gint
-offset_of_node (ETreeModel *tree_model, ETreePath *path)
-{
-	return (visible_depth_of_node(tree_model, path) + 1) * INDENT_AMOUNT;
-}
-
-static ETreePath*
-e_cell_tree_get_node (ETableModel *table_model, int row)
-{
-	return (ETreePath*)e_table_model_value_at (table_model, -1, row);
-}
-
-static ETreeModel*
-e_cell_tree_get_tree_model (ETableModel *table_model, int row)
-{
-	return (ETreeModel*)e_table_model_value_at (table_model, -2, row);
-}
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellTree *ect = E_CELL_TREE (ecell);
-	ECellTreeView *tree_view = g_new0 (ECellTreeView, 1);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas;
-	
-	tree_view->cell_view.ecell = ecell;
-	tree_view->cell_view.e_table_model = table_model;
-	tree_view->cell_view.e_table_item_view = e_table_item_view;
-	
-	/* create our subcell view */
-	tree_view->subcell_view = e_cell_new_view (ect->subcell, table_model, e_table_item_view /* XXX */);
-
-	tree_view->canvas = canvas;
-
-	return (ECellView *)tree_view;
-}
-
-/*
- * ECell::kill_view method
- */
-static void
-ect_kill_view (ECellView *ecv)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecv;
-
-	/* kill our subcell view */
-	e_cell_kill_view (tree_view->subcell_view);
-
-	g_free (tree_view);
-}
-
-/*
- * ECell::realize method
- */
-static void
-ect_realize (ECellView *ecell_view)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	/* realize our subcell view */
-	e_cell_realize (tree_view->subcell_view);
-
-	tree_view->gc = gdk_gc_new (GTK_WIDGET (tree_view->canvas)->window);
-
-	gdk_gc_set_line_attributes (tree_view->gc, 1, 
-				    GDK_LINE_ON_OFF_DASH, None, None);
-	gdk_gc_set_dashes (tree_view->gc, 0, "\1\1", 2);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecell_view);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-ect_unrealize (ECellView *ecv)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecv;
-
-	/* unrealize our subcell view. */
-	e_cell_unrealize (tree_view->subcell_view);
-
-	gdk_gc_unref (tree_view->gc);
-	tree_view->gc = NULL;
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-/*
- * ECell::draw method
- */
-static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellTreeView *tree_view = (ECellTreeView *)ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row);
-	ETreePath *node;
-	GdkRectangle rect, *clip_rect;
-	GtkWidget *canvas = GTK_WIDGET (tree_view->canvas);
-	GdkGC *fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	GdkColor *foreground;
-	gboolean selected;
-
-	int offset, subcell_offset;
-	gboolean expanded, expandable;
-
-	selected = flags & E_CELL_SELECTED;
-
-	/* only draw the tree effects if we're the active sort */
-	if (/* XXX */ TRUE) {
-		GdkPixbuf *node_image;
-		int node_image_width = 0, node_image_height = 0;
-		ETreePath *parent_node;
-
-		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-
-		expandable = e_tree_model_node_is_expandable (tree_model, node);
-		expanded = e_tree_model_node_is_expanded (tree_model, node);
-
-		if (visible_depth_of_node (tree_model, node) > 0 || expandable) {
-			offset = offset_of_node (tree_model, node);
-		} else {
-			offset = 0;
-		}
-		subcell_offset = offset;
-
-		node_image = e_tree_model_icon_of_node (tree_model, node);
-
-		if (node_image) {
-			node_image_width = gdk_pixbuf_get_width (node_image);
-			node_image_height = gdk_pixbuf_get_height (node_image);
-		}
-
-		/*
-		 * Be a nice citizen: clip to the region we are supposed to draw on
-		 */
-		rect.x = x1;
-		rect.y = y1;
-		rect.width = subcell_offset + node_image_width;
-		rect.height = y2 - y1;
-	
-		gdk_gc_set_clip_rectangle (tree_view->gc, &rect);
-		gdk_gc_set_clip_rectangle (fg_gc, &rect);
-		clip_rect = &rect;
-
-		if (selected) {
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
-		} else {
-			foreground = &canvas->style->text [GTK_STATE_NORMAL];
-		}
-
-		gdk_gc_set_foreground (tree_view->gc, foreground);
-
-		/* draw our lines */
-		if (E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) {
-
-			if (visible_depth_of_node (tree_model, node) > 0
-			    || e_tree_model_node_get_children (tree_model, node, NULL) > 0)
-				gdk_draw_line (drawable, tree_view->gc,
-					       rect.x + offset - INDENT_AMOUNT / 2 + 1,
-					       rect.y + rect.height / 2,
-					       rect.x + offset,
-					       rect.y + rect.height / 2);
-
-			if (visible_depth_of_node (tree_model, node) != 0) {
-				gdk_draw_line (drawable, tree_view->gc,
-					       rect.x + offset - INDENT_AMOUNT / 2,
-					       rect.y,
-					       rect.x + offset - INDENT_AMOUNT / 2,
-					       (e_tree_model_node_get_next (tree_model, node)
-						? rect.y + rect.height
-						: rect.y + rect.height / 2));
-			}
-
-			/* now traverse back up to the root of the tree, checking at
-			   each level if the node has siblings, and drawing the
-			   correct vertical pipe for it's configuration. */
-			parent_node = e_tree_model_node_get_parent (tree_model, node);
-			offset -= INDENT_AMOUNT;
-			while (parent_node && visible_depth_of_node (tree_model, parent_node) != 0) {
-				if (e_tree_model_node_get_next(tree_model, parent_node)) {
-					gdk_draw_line (drawable, tree_view->gc,
-						       rect.x + offset - INDENT_AMOUNT / 2,
-						       rect.y,
-						       rect.x + offset - INDENT_AMOUNT / 2,
-						       rect.y + rect.height);
-				}
-				parent_node = e_tree_model_node_get_parent (tree_model, parent_node);
-				offset -= INDENT_AMOUNT;
-			}
-		}
-
-		/* now draw our icon if we're expandable */
-		if (expandable) {
-			GdkPixbuf *image;
-			int image_width, image_height;
-
-			image = (expanded 
-				 ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-				 : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-
-			image_width = gdk_pixbuf_get_width(image);
-			image_height = gdk_pixbuf_get_height(image);
-
-			gdk_pixbuf_render_to_drawable_alpha (image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset - INDENT_AMOUNT / 2 - image_width / 2,
-							     y1 + (y2 - y1) / 2 - image_height / 2,
-							     image_width, image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     image_width, 0);
-		}
-
-		if (node_image) {
-			gdk_pixbuf_render_to_drawable_alpha (node_image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset,
-							     y1 + (y2 - y1) / 2 - node_image_height / 2,
-							     node_image_width, node_image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     node_image_width, 0);
-			subcell_offset += node_image_width;
-		}
-	}
-
-	/* Now cause our subcell to draw its contents, shifted by
-	   subcell_offset pixels */
-	e_cell_draw (tree_view->subcell_view, drawable,
-		     model_col, view_col, row, flags,
-		     x1 + subcell_offset, y1, x2, y2);
-}
-
-/*
- * ECell::event method
- */
-static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-	int offset = offset_of_node (tree_model, node);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS: {
-		/* if the event happened in our area of control (and
-                   we care about it), handle it. */
-
-		/* only activate the tree control if the click/release happens in the icon's area. */
-		if (event->button.x > (offset - INDENT_AMOUNT) && event->button.x < offset) {
-			if (e_tree_model_node_is_expandable (tree_model, node)) {
-				e_tree_model_node_set_expanded (tree_model,
-								node,
-								!e_tree_model_node_is_expanded(tree_model, node));
-				return TRUE;
-			}
-		}
-		else if (event->button.x < (offset - INDENT_AMOUNT))
-			return FALSE;
-	}
-	default: {
-		gint return_value;
-
-		/* modify the event and pass it off to our subcell_view */
-		switch (event->type) {
-		case GDK_BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			event->button.x -= offset;
-			break;
-		case GDK_MOTION_NOTIFY:
-			event->motion.x -= offset;
-			break;
-		default:
-			/* nada */
-		}
-
-		return_value = e_cell_event(tree_view->subcell_view, event, model_col, view_col, row, flags, actions);
-
-		/* modify the event and pass it off to our subcell_view */
-		switch (event->type) {
-		case GDK_BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			event->button.x += offset;
-			break;
-		case GDK_MOTION_NOTIFY:
-			event->motion.x += offset;
-			break;
-		default:
-			/* nada */
-		}
-
-		return return_value;
-	}
-	}
-}
-
-/*
- * ECell::height method
- */
-static int
-ect_height (ECellView *ecell_view, int model_col, int view_col, int row) 
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	return e_cell_height (tree_view->subcell_view, model_col, view_col, row);
-}
-
-/*
- * ECell::max_width method
- */
-static int
-ect_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	int row;
-	int number_of_rows;
-	int max_width = 0;
-	int width = 0;
-	int subcell_max_width;
-
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-	subcell_max_width = e_cell_max_width (tree_view->subcell_view, model_col, view_col);
-	
-	for (row = 0; row < number_of_rows; row++) {
-		ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row);
-		ETreePath *node;
-		GdkPixbuf *node_image;
-		int node_image_width = 0, node_image_height = 0;
-		
-		int offset, subcell_offset;
-		gboolean expanded, expandable;
-		
-		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-		
-		offset = offset_of_node (tree_model, node);
-		expandable = e_tree_model_node_is_expandable (tree_model, node);
-		expanded = e_tree_model_node_is_expanded (tree_model, node);
-		subcell_offset = offset;
-
-		node_image = e_tree_model_icon_of_node (tree_model, node);
-
-		if (node_image) {
-			node_image_width = gdk_pixbuf_get_width (node_image);
-			node_image_height = gdk_pixbuf_get_height (node_image);
-		}
-
-		width = subcell_max_width + subcell_offset + node_image_width;
-
-		if (expandable) {
-			GdkPixbuf *image;
-
-			image = (expanded 
-				 ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-				 : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-
-			width += gdk_pixbuf_get_width(image);
-		}
-
-		max_width = MAX (max_width, width);
-	}
-
-	return max_width;
-}
-
-/*
- * ECellView::show_tooltip method
- */
-static void
-ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row,
-		  int col_width, ETableTooltip *tooltip)
-{		
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-	int offset = offset_of_node (tree_model, node);
-	GdkPixbuf *node_image;
-
-	node_image = e_tree_model_icon_of_node (tree_model, node);
-	if (node_image)
-		offset += gdk_pixbuf_get_width (node_image);
-
-	tooltip->x += offset;
-	e_cell_show_tooltip (tree_view->subcell_view, model_col, view_col, row, col_width - offset, tooltip);
-}
-		
-/*
- * ECellView::enter_edit method
- */
-static void *
-ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	/* just defer to our subcell's view */
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	return e_cell_enter_edit (tree_view->subcell_view, model_col, view_col, row);
-}
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	/* just defer to our subcell's view */
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	e_cell_leave_edit (tree_view->subcell_view, model_col, view_col, row, edit_context);
-}
-
-static void
-ect_print (ECellView *ecell_view, GnomePrintContext *context, 
-	   int model_col, int view_col, int row,
-	   double width, double height)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	if (/* XXX only if we're the active sort */ TRUE) {
-		ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-		ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-		int offset = offset_of_node (tree_model, node);
-		int subcell_offset = offset;
-		gboolean expandable = e_tree_model_node_is_expandable (tree_model, node);
-		gboolean expanded = e_tree_model_node_is_expanded (tree_model, node);
-
-		/* draw our lines */
-		if (E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) {
-
-			if (!e_tree_model_node_is_root (tree_model, node)
-			    || e_tree_model_node_get_children (tree_model, node, NULL) > 0) {
-				gnome_print_moveto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    height / 2);
-
-				gnome_print_lineto (context,
-						    offset,
-						    height / 2);
-			}
-
-			if (visible_depth_of_node (tree_model, node) != 0) {
-				gnome_print_moveto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    height);
-				gnome_print_lineto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    (e_tree_model_node_get_next (tree_model, node)
-						     ? 0
-						     : height / 2));
-			}
-
-			/* now traverse back up to the root of the tree, checking at
-			   each level if the node has siblings, and drawing the
-			   correct vertical pipe for it's configuration. */
-			node = e_tree_model_node_get_parent (tree_model, node);
-			offset -= INDENT_AMOUNT;
-			while (node && visible_depth_of_node (tree_model, node) != 0) {
-				if (e_tree_model_node_get_next(tree_model, node)) {
-					gnome_print_moveto (context,
-							    offset - INDENT_AMOUNT / 2,
-							    height);
-					gnome_print_lineto (context,
-							    offset - INDENT_AMOUNT / 2,
-							    0);
-				}
-				node = e_tree_model_node_get_parent (tree_model, node);
-				offset -= INDENT_AMOUNT;
-			}
-		}
-
-		/* now draw our icon if we're expandable */
-		if (expandable) {
-			double image_matrix [6] = {16, 0, 0, 16, 0, 0};
-			GdkPixbuf *image = (expanded 
-					    ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-					    : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-			int image_width, image_height, image_rowstride;
-			guchar *image_pixels;
-
-			image_width = gdk_pixbuf_get_width(image);
-			image_height = gdk_pixbuf_get_height(image);
-			image_pixels = gdk_pixbuf_get_pixels(image);
-			image_rowstride = gdk_pixbuf_get_rowstride(image);
-
-			image_matrix [4] = subcell_offset - INDENT_AMOUNT / 2 - image_width / 2;
-			image_matrix [5] = height / 2 - image_height / 2;
-
-			gnome_print_gsave (context);
-			gnome_print_concat (context, image_matrix);
-
-			gnome_print_rgbaimage (context, image_pixels, image_width, image_height, image_rowstride);
-			gnome_print_grestore (context);
-		}
-
-		gnome_print_stroke (context);
-
-		if (gnome_print_translate(context, subcell_offset, 0) == -1)
-				/* FIXME */;
-		width -= subcell_offset;
-	}
-
-
-	e_cell_print (tree_view->subcell_view, context, model_col, view_col, row, width, height);
-}
-
-static gdouble
-ect_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	return 12; /* XXX */
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-ect_destroy (GtkObject *object)
-{
-	ECellTree *ect = E_CELL_TREE (object);
-
-	/* destroy our subcell */
-	if (ect->subcell)
-		gtk_object_unref (GTK_OBJECT (ect->subcell));
-	ect->subcell = NULL;
-
-	gdk_pixbuf_unref (ect->open_pixbuf);
-	gdk_pixbuf_unref (ect->closed_pixbuf);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-e_cell_tree_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = ect_destroy;
-
-	ecc->new_view   = ect_new_view;
-	ecc->kill_view  = ect_kill_view;
-	ecc->realize    = ect_realize;
-	ecc->unrealize  = ect_unrealize;
-	ecc->draw       = ect_draw;
-	ecc->event      = ect_event;
-	ecc->height     = ect_height;
-	ecc->enter_edit = ect_enter_edit;
-	ecc->leave_edit = ect_leave_edit;
-	ecc->print      = ect_print;
-	ecc->print_height = ect_print_height;
-	ecc->max_width = ect_max_width;
-	ecc->show_tooltip = ect_show_tooltip;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE(e_cell_tree, "ECellTree", ECellTree, e_cell_tree_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_tree_construct:
- * @ect: the ECellTree we're constructing.
- * @open_pixbuf: pixbuf to be used instead of the '-' icon.
- * @closed_pixbuf: pixbuf to be used instead of the '+' icon.
- * @draw_lines: whether or not to draw the lines between parents/children/siblings.
- * @subcell: the ECell to render to the right of the tree effects.
- * 
- * Constructs an ECellTree.  used by subclasses that need to
- * initialize a nested ECellTree.  See e_cell_tree_new() for more info.
- * 
- **/
-void
-e_cell_tree_construct (ECellTree *ect,
-		       GdkPixbuf *open_pixbuf,
-		       GdkPixbuf *closed_pixbuf,
-		       gboolean draw_lines,
-		       ECell *subcell)
-{		       
-	ect->subcell = subcell;
-	if (subcell) {
-		gtk_object_ref (GTK_OBJECT (subcell));
-		gtk_object_sink (GTK_OBJECT (subcell));
-	}
-	if (open_pixbuf)
-		ect->open_pixbuf = open_pixbuf;
-	else
-		ect->open_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_expanded_xpm);
-	if (closed_pixbuf)
-		ect->closed_pixbuf = closed_pixbuf;
-	else
-		ect->closed_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_unexpanded_xpm);
-
-	ect->draw_lines = draw_lines;
-}
-
-
-/**
- * e_cell_tree_new:
- * @open_pixbuf: pixbuf to be used instead of the '-' icon.
- * @closed_pixbuf: pixbuf to be used instead of the '+' icon.
- * @draw_lines: whether or not to draw the lines between parents/children/siblings.
- * @subcell: the ECell to render to the right of the tree effects.
- * 
- * Creates a new ECell renderer that can be used to render tree
- * effects that come from an ETreeModel.  Various assumptions are made
- * as to the fact that the ETableModel the ETable this cell is
- * associated with is in fact an ETreeModel.  The cell uses special
- * columns to get at structural information (needed to draw the
- * lines/icons.
- * 
- * Return value: an ECell object that can be used to render trees.
- **/
-ECell *
-e_cell_tree_new (GdkPixbuf *open_pixbuf,
-		 GdkPixbuf *closed_pixbuf,
-		 gboolean draw_lines,
-		 ECell *subcell)
-{
-	ECellTree *ect = gtk_type_new (e_cell_tree_get_type ());
-
-	e_cell_tree_construct (ect, open_pixbuf, closed_pixbuf, draw_lines, subcell);
-
-	return (ECell *) ect;
-}
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
deleted file mode 100644
index 7b2d007159..0000000000
--- a/widgets/table/e-cell-tree.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellTree - Tree item for e-table.
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- */
-#ifndef _E_CELL_TREE_H_
-#define _E_CELL_TREE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TREE_TYPE        (e_cell_tree_get_type ())
-#define E_CELL_TREE(o)          (GTK_CHECK_CAST ((o), E_CELL_TREE_TYPE, ECellTree))
-#define E_CELL_TREE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TREE_TYPE, ECellTreeClass))
-#define E_IS_CELL_TREE(o)       (GTK_CHECK_TYPE ((o), E_CELL_TREE_TYPE))
-#define E_IS_CELL_TREE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	gboolean draw_lines;
-
-	GdkPixbuf   *open_pixbuf;
-	GdkPixbuf   *closed_pixbuf;
-
-	ECell *subcell;
-} ECellTree;
-
-typedef struct {
-	ECellClass parent_class;
-} ECellTreeClass;
-
-GtkType    e_cell_tree_get_type (void);
-ECell     *e_cell_tree_new      (GdkPixbuf *open_pixbuf,
-				 GdkPixbuf *closed_pixbuf,
-				 gboolean draw_lines,
-				 ECell *subcell);
-void       e_cell_tree_construct (ECellTree *ect,
-				  GdkPixbuf *open_pixbuf,
-				  GdkPixbuf *closed_pixbuf,
-				  gboolean draw_lines,
-				  ECell *subcell);
-
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TREE_H_ */
-
-
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
deleted file mode 100644
index 2d59df19da..0000000000
--- a/widgets/table/e-cell.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-cell.c: base class for cell renderers in e-table
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include "e-cell.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-static ECellView *
-ec_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	return NULL;
-}
-
-static void
-ec_realize (ECellView *e_cell)
-{
-}
-
-static void
-ec_kill_view (ECellView *ecell_view)
-{
-}
-
-static void
-ec_unrealize (ECellView *e_cell)
-{
-}
-
-static void
-ec_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	 int model_col, int view_col, int row, ECellFlags flags,
-	 int x1, int y1, int x2, int y2)
-{
-	g_error ("e-cell-draw invoked\n");
-}
-
-static gint
-ec_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	g_error ("e-cell-event invoked\n");
-	return 0;
-}
-
-static gint
-ec_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	g_error ("e-cell-height invoked\n");
-	return 0;
-}
-
-static void
-ec_focus (ECellView *ecell_view, int model_col, int view_col, int row, int x1, int y1, int x2, int y2)
-{
-	ecell_view->focus_col = view_col; 
-	ecell_view->focus_row = row;
-	ecell_view->focus_x1 = x1;
-	ecell_view->focus_y1 = y1;
-	ecell_view->focus_x2 = x2;
-	ecell_view->focus_y2 = y2;
-}
-
-static void
-ec_unfocus (ECellView *ecell_view)
-{
-	ecell_view->focus_col = -1;
-	ecell_view->focus_row = -1;
-	ecell_view->focus_x1 = -1;
-	ecell_view->focus_y1 = -1;
-	ecell_view->focus_x2 = -1;
-	ecell_view->focus_y2 = -1;
-}
-
-static void *
-ec_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return NULL;
-}
-
-static void
-ec_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *context)
-{
-}
-
-static void
-ec_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip)
-{
-	/* Do nothing */
-}
-
-static void
-e_cell_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	ecc->realize = ec_realize;
-	ecc->unrealize = ec_unrealize;
-	ecc->new_view = ec_new_view;
-	ecc->kill_view = ec_kill_view;
-	ecc->draw = ec_draw;
-	ecc->event = ec_event;
-	ecc->focus = ec_focus;
-	ecc->unfocus = ec_unfocus;
-	ecc->height = ec_height;
-	ecc->enter_edit = ec_enter_edit;
-	ecc->leave_edit = ec_leave_edit;
-	ecc->print = NULL;
-	ecc->print_height = NULL;
-	ecc->max_width = NULL;
-	ecc->show_tooltip = ec_show_tooltip;
-}
-
-static void
-e_cell_init (GtkObject *object)
-{
-}
-
-E_MAKE_TYPE(e_cell, "ECell", ECell, e_cell_class_init, e_cell_init, PARENT_TYPE);
-
-/**
- * e_cell_event:
- * @ecell_view: The ECellView where the event will be dispatched
- * @event: The GdkEvent.
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- * @flags: flags about the current state
- * @actions: A second return value in case the cell wants to take some action (specifically grabbing & ungrabbing)
- *
- * Dispatches the event @event to the @ecell_view for.
- *
- * Returns: processing state from the GdkEvent handling.
- */
-gint
-e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->event (
-		ecell_view, event, model_col, view_col, row, flags, actions);
-}
-
-/** 
- * e_cell_new_view:
- * @ecell: the Ecell that will create the new view
- * @table_model: the table model the ecell is bound to
- * @e_table_item_view: An ETableItem object (the CanvasItem that reprensents the view of the table)
- *
- * ECell renderers new to be bound to a table_model and to the actual view
- * during their life time to actually render the data.  This method is invoked
- * by the ETableItem canvas item to instatiate a new view of the ECell.
- *
- * This is invoked when the ETableModel is attached to the ETableItem (a CanvasItem
- * that can render ETableModels in the screen).
- *
- * Returns: a new ECellView for this @ecell on the @table_model displayed on the @e_table_item_view.
- */
-ECellView *
-e_cell_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell)->klass)->new_view (
-		ecell, table_model, e_table_item_view);
-}
-
-/**
- * e_cell_realize:
- * @ecell_view: The ECellView to be realized.
- *
- * This function is invoked to give a chance to the ECellView to allocate
- * any resources it needs from Gdk, equivalent to the GtkWidget::realize
- * signal.
- */
-void
-e_cell_realize (ECellView *ecell_view)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->realize (ecell_view);
-}
-
-/**
- * e_cell_kill_view:
- * @ecell_view: view to be destroyed.
- *
- * This method it used to destroy a view of an ECell renderer
- */
-void
-e_cell_kill_view (ECellView *ecell_view)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->kill_view (ecell_view);
-}
-
-/**
- * e_cell_unrealize:
- * @ecell_view: The ECellView to be unrealized.
- *
- * This function is invoked to give a chance to the ECellView to
- * release any resources it allocated during the realize method,
- * equivalent to the GtkWidget::unrealize signal.
- */
-void
-e_cell_unrealize (ECellView *ecell_view)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->unrealize (ecell_view);
-}
-
-/**
- * e_cell_draw:
- * @ecell_view: the ECellView to redraw
- * @drawable: draw desination
- * @model_col: the column in the model being drawn.
- * @view_col: the column in the view being drawn (what the model maps to).
- * @row: the row being drawn
- * @flags: rendering flags.
- * @x1: boudary for the rendering
- * @y1: boudary for the rendering
- * @x2: boudary for the rendering
- * @y2: boudary for the rendering
- *
- * This instructs the ECellView to render itself into the drawable.  The
- * region to be drawn in given by (x1,y1)-(x2,y2).
- *
- * The most important flags are %E_CELL_SELECTED and %E_CELL_FOCUSED, other
- * flags include alignments and justifications.
- */
-void
-e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	     int model_col, int view_col, int row, ECellFlags flags,
-	     int x1, int y1, int x2, int y2)
-{
-	g_return_if_fail (ecell_view != NULL);
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < e_table_model_row_count(ecell_view->e_table_model));
-
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->draw (
-		ecell_view, drawable, model_col, view_col, row, flags, x1, y1, x2, y2);
-}
-
-/**
- * e_cell_print:
- * @ecell_view: the ECellView to redraw
- * @context: The GnomePrintContext where we output our printed data.
- * @model_col: the column in the model being drawn.
- * @view_col: the column in the view being drawn (what the model maps to).
- * @row: the row being drawn
- * @width: width 
- * @height: height
- *
- * FIXME:
- */
-void
-e_cell_print (ECellView *ecell_view, GnomePrintContext *context, 
-	      int model_col, int view_col, int row,
-	      double width, double height)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print
-		(ecell_view, context, model_col, view_col, row, width, height);
-}
-
-/**
- * e_cell_print:
- *
- * FIXME:
- */
-gdouble
-e_cell_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		     int model_col, int view_col, int row,
-		     double width)
-{
-	if (E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print_height)
-		return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print_height
-			(ecell_view, context, model_col, view_col, row, width);
-	else
-		return 0.0;
-}
-
-/**
- * e_cell_height:
- * @ecell_view: the ECellView.
- * @model_col: the column in the model
- * @view_col: the column in the view.
- * @row: the row to me measured
- *
- * Returns: the height of the cell at @model_col, @row rendered at
- * @view_col, @row.
- */
-int
-e_cell_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->height (
-		ecell_view, model_col, view_col, row);
-}
-
-/**
- * e_cell_enter_edit:
- * @ecell_view: the ECellView that will enter editing
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- *
- * Notifies the ECellView that it is about to enter editing mode for
- * @model_col, @row rendered at @view_col, @row.
- */
-void *
-e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->enter_edit (
-		ecell_view, model_col, view_col, row);
-}
-
-/**
- * e_cell_leave_edit:
- * @ecell_view: the ECellView that will leave editing
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- * @edit_context: the editing context
- *
- * Notifies the ECellView that editing is finished at @model_col, @row
- * rendered at @view_col, @row.
- */
-void
-e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->leave_edit (
-		ecell_view, model_col, view_col, row, edit_context);
-}
-
-/**
- * e_cell_max_width:
- * @ecell_view: the ECellView that will leave editing
- * @model_col: the column in the model
- * @view_col: the column in the view.
- *
- * Returns: the maximum width for the ECellview at @model_col which
- * is being rendered as @view_col
- */
-int
-e_cell_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->max_width 
-		(ecell_view, model_col, view_col);
-}
-	      
-void
-e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, 
-		     int row, int col_width, ETableTooltip *tooltip)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->show_tooltip
-		(ecell_view, model_col, view_col, row, col_width, tooltip);
-}
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
deleted file mode 100644
index b9927114bb..0000000000
--- a/widgets/table/e-cell.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CELL_H_
-#define _E_CELL_H_
-
-#include <gdk/gdktypes.h>
-#include <libgnomeprint/gnome-print.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-tooltip.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TYPE        (e_cell_get_type ())
-#define E_CELL(o)          (GTK_CHECK_CAST ((o), E_CELL_TYPE, ECell))
-#define E_CELL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TYPE, ECellClass))
-#define E_IS_CELL(o)       (GTK_CHECK_TYPE ((o), E_CELL_TYPE))
-#define E_IS_CELL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TYPE))
-
-typedef enum {
-	E_CELL_SELECTED       = 1 << 0,
-
-	E_CELL_JUSTIFICATION  = 3 << 1,
-	E_CELL_JUSTIFY_CENTER = 0 << 1,
-	E_CELL_JUSTIFY_LEFT   = 1 << 1,
-	E_CELL_JUSTIFY_RIGHT  = 2 << 1,
-	E_CELL_JUSTIFY_FILL   = 3 << 1,
-
-	E_CELL_ALIGN_LEFT     = 1 << 1,
-	E_CELL_ALIGN_RIGHT    = 1 << 2,
-
-	E_CELL_FOCUSED        = 1 << 3,
-
-	E_CELL_EDITING        = 1 << 4,
-} ECellFlags;
-
-typedef enum {
-	E_CELL_GRAB           = 1 << 0,
-	E_CELL_UNGRAB         = 1 << 1,
-} ECellActions;
-
-typedef struct {
-	GtkObject       object;
-} ECell;
-
-typedef struct {
-	ECell *ecell;
-	ETableModel *e_table_model;
-	void        *e_table_item_view;
-	
-	gint   focus_x1, focus_y1, focus_x2, focus_y2;
-	gint   focus_col, focus_row;
-} ECellView;
-
-#define E_CELL_IS_FOCUSED(ecell_view) (ecell_view->focus_x1 != -1)
-
-typedef struct {
-	GtkObjectClass parent_class;
-	
-	ECellView *(*new_view)     (ECell *ecell, ETableModel *table_model, void *e_table_item_view);
-	void       (*kill_view)    (ECellView *ecell_view);
-				   
-	void       (*realize)      (ECellView *ecell_view);
-	void       (*unrealize)    (ECellView *ecell_view);
-				   
-	void   	   (*draw)         (ECellView *ecell_view, GdkDrawable *drawable,
-	       			    int model_col, int view_col, int row,
-				    ECellFlags flags, int x1, int y1, int x2, int y2);
-	gint   	   (*event)        (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions);
-	void   	   (*focus)        (ECellView *ecell_view, int model_col, int view_col,
-				    int row, int x1, int y1, int x2, int y2);
-	void   	   (*unfocus)      (ECellView *ecell_view);
-	int        (*height)       (ECellView *ecell_view, int model_col, int view_col, int row);
-				   
-	void      *(*enter_edit)   (ECellView *ecell_view, int model_col, int view_col, int row);
-	void       (*leave_edit)   (ECellView *ecell_view, int model_col, int view_col, int row, void *context);
-	void       (*print)        (ECellView *ecell_view, GnomePrintContext *context,
-				    int model_col, int view_col, int row,
-				    gdouble width, gdouble height);
-	gdouble    (*print_height) (ECellView *ecell_view, GnomePrintContext *context,
-				    int model_col, int view_col, int row, gdouble width);
-	int        (*max_width) (ECellView *ecell_view, int model_col, int view_col);
-	void       (*show_tooltip) (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip);
-} ECellClass;
-
-GtkType    e_cell_get_type  (void);
-ECellView *e_cell_new_view  (ECell *ecell, ETableModel *table_model, void *e_table_item_view);
-void       e_cell_kill_view (ECellView *ecell_view);
-
-gint       e_cell_event     (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions);
-
-void       e_cell_realize   (ECellView *ecell_view);
-void       e_cell_unrealize (ECellView *ecell_view);
-
-void       e_cell_draw      (ECellView *ecell_view, GdkDrawable *drawable, 
-			     int model_col, int view_col, int row, ECellFlags flags,
-			     int x1, int y1, int x2, int y2);
-void       e_cell_print      (ECellView *ecell_view, GnomePrintContext *context, 
-			      int model_col, int view_col, int row,
-			      double width, double height);
-gdouble    e_cell_print_height (ECellView *ecell_view, GnomePrintContext *context,
-				int model_col, int view_col, int row, gdouble width);
-int        e_cell_max_width (ECellView *ecell_view, int model_col, int view_col);
-void       e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip);
-void       e_cell_focus     (ECellView *ecell_view, int model_col, int view_col, int row,
-			     int x1, int y1, int x2, int y2);
-void       e_cell_unfocus   (ECellView *ecell_view);
-int        e_cell_height    (ECellView *ecell_view, int model_col, int view_col, int row);
-
-void      *e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row);
-void       e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_H_ */
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
deleted file mode 100644
index cdaa446f90..0000000000
--- a/widgets/table/e-table-click-to-add.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-click-to-add.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-table-header.h"
-#include "e-table-click-to-add.h"
-#include "e-table-defines.h"
-#include "e-table-one.h"
-#include "gal/e-text/e-text.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-
-enum {
-	CURSOR_CHANGE,
-	LAST_SIGNAL
-};
-
-static gint etcta_signals [LAST_SIGNAL] = { 0, };
-
-#define PARENT_OBJECT_TYPE gnome_canvas_group_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasGroupClass *etcta_parent_class;
-
-enum {
-	ARG_0,
-	ARG_HEADER,
-	ARG_MODEL,
-	ARG_MESSAGE,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-static void
-etcta_cursor_change (GtkObject *object, gint row, gint col, ETableClickToAdd *etcta)
-{
-	gtk_signal_emit (GTK_OBJECT (etcta),
-			 etcta_signals [CURSOR_CHANGE],
-			 row, col);
-}
-
-static void
-etcta_add_table_header (ETableClickToAdd *etcta, ETableHeader *header)
-{
-	etcta->eth = header;
-	if (etcta->eth)
-		gtk_object_ref (GTK_OBJECT (etcta->eth));
-	if (etcta->row)
-		gnome_canvas_item_set(GNOME_CANVAS_ITEM(etcta->row),
-				      "ETableHeader", header,
-				      NULL);
-}
-
-static void
-etcta_drop_table_header (ETableClickToAdd *etcta)
-{
-	GtkObject *header;
-	
-	if (!etcta->eth)
-		return;
-
-	header = GTK_OBJECT (etcta->eth);
-
-	gtk_object_unref (header);
-	etcta->eth = NULL;
-}
-
-static void
-etcta_add_one (ETableClickToAdd *etcta, ETableModel *one)
-{
-	etcta->one = one;
-	if (etcta->one)
-		gtk_object_ref (GTK_OBJECT(etcta->one));
-	if (etcta->row)
-		gnome_canvas_item_set(GNOME_CANVAS_ITEM(etcta->row),
-				      "ETableModel", one,
-				      NULL);
-	gtk_object_set(GTK_OBJECT(etcta->selection),
-		       "model", one,
-		       NULL);
-}
-
-static void
-etcta_drop_one (ETableClickToAdd *etcta)
-{
-	if (!etcta->one)
-		return;
-	gtk_object_unref (GTK_OBJECT(etcta->one));
-	etcta->one = NULL;
-	gtk_object_set(GTK_OBJECT(etcta->selection),
-		       "model", NULL,
-		       NULL);
-}
-
-static void
-etcta_add_model (ETableClickToAdd *etcta, ETableModel *model)
-{
-	etcta->model = model;
-	if (etcta->model)
-		gtk_object_ref (GTK_OBJECT(etcta->model));
-}
-
-static void
-etcta_drop_model (ETableClickToAdd *etcta)
-{
-	etcta_drop_one (etcta);
-	if (!etcta->model)
-		return;
-	gtk_object_unref (GTK_OBJECT(etcta->model));
-	etcta->model = NULL;
-}
-
-static void
-etcta_add_message (ETableClickToAdd *etcta, char *message)
-{
-	etcta->message = g_strdup(message);
-}
-
-static void
-etcta_drop_message (ETableClickToAdd *etcta)
-{
-	g_free(etcta->message);
-	etcta->message = NULL;
-}
-
-
-static void
-etcta_destroy (GtkObject *object){
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (object);
-
-	etcta_drop_table_header (etcta);
-	etcta_drop_model (etcta);
-	etcta_drop_message (etcta);
-	gtk_object_unref(GTK_OBJECT(etcta->selection));
-
-	if (GTK_OBJECT_CLASS (etcta_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (etcta_parent_class)->destroy) (object);
-}
-
-static void
-etcta_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableClickToAdd *etcta;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etcta = E_TABLE_CLICK_TO_ADD (o);
-
-	switch (arg_id){
-	case ARG_HEADER:
-		etcta_drop_table_header (etcta);
-		etcta_add_table_header (etcta, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-	case ARG_MODEL:
-		etcta_drop_model (etcta);
-		etcta_add_model (etcta, E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	case ARG_MESSAGE:
-		etcta_drop_message (etcta);
-		etcta_add_message (etcta, GTK_VALUE_STRING (*arg));
-		break;
-	case ARG_WIDTH:
-		etcta->width = GTK_VALUE_DOUBLE (*arg);
-		if (etcta->row)
-			gnome_canvas_item_set(etcta->row,
-					      "minimum_width", etcta->width,
-					      NULL);
-		if (etcta->text)
-			gnome_canvas_item_set(etcta->text,
-					      "width", etcta->width - 4,
-					      NULL);
-		if (etcta->rect)
-			gnome_canvas_item_set(etcta->rect,
-					      "x2", etcta->width - 1,
-					      NULL);
-		break;
-	}
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-etcta_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableClickToAdd *etcta;
-
-	etcta = E_TABLE_CLICK_TO_ADD (o);
-
-	switch (arg_id){
-	case ARG_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etcta->eth);
-		break;
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etcta->model);
-		break;
-	case ARG_MESSAGE:
-		GTK_VALUE_STRING (*arg) = g_strdup(etcta->message);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etcta->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etcta->height;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etcta_realize (GnomeCanvasItem *item)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-
-	etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-					    gnome_canvas_rect_get_type(),
-					    "x1", (double) 0,
-					    "y1", (double) 0,
-					    "x2", (double) etcta->width - 1,
-					    "y2", (double) etcta->height - 1,
-					    "outline_color", "black", 
-					    "fill_color", "white",
-					    NULL);
-
-	etcta->text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-					    e_text_get_type(),
-					    "text", etcta->message ? etcta->message : "",
-					    "anchor", GTK_ANCHOR_NW,
-					    "width", etcta->width - 4,
-					    "draw_background", FALSE,
-					    NULL);
-	e_canvas_item_move_absolute (etcta->text, 2, 2);
-
-	if (GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->realize)(item);
-}
-
-static void
-etcta_unrealize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->unrealize)(item);
-}
-
-static double
-etcta_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-static void finish_editing (ETableClickToAdd *etcta);
-
-static int
-item_key_press (ETableItem *item, int row, int col, GdkEvent *event, ETableClickToAdd *etcta)
-{
-	switch (event->key.keyval) {
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_ISO_Enter:
-		case GDK_3270_Enter:
-			finish_editing(etcta);
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-finish_editing (ETableClickToAdd *etcta)
-{
-	if (etcta->row) {
-		ETableModel *one;
-
-		e_table_one_commit(E_TABLE_ONE(etcta->one));
-		etcta_drop_one (etcta);
-		gtk_object_destroy(GTK_OBJECT(etcta->row));
-		etcta->row = NULL;
-
-		one = e_table_one_new(etcta->model);
-		etcta_add_one (etcta, one);
-		gtk_object_unref(GTK_OBJECT(one));
-
-		e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
-
-		etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						   e_table_item_get_type(),
-						   "ETableHeader", etcta->eth,
-						   "ETableModel", etcta->one,
-						   "minimum_width", etcta->width,
-						   "drawgrid", TRUE,
-						   "table_selection_model", etcta->selection,
-						   "cursor_mode", E_CURSOR_SPREADSHEET,
-						   NULL);
-
-		gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
-				   GTK_SIGNAL_FUNC(item_key_press), etcta);
-
-		e_table_item_set_cursor(E_TABLE_ITEM(etcta->row), 0, 0);
-	}
-}
-
-/*
- * Handles the events on the ETableClickToAdd, particularly it creates the ETableItem and passes in some events.
- */
-static int
-etcta_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-	int ret_val = TRUE;
-	
-	switch (e->type){
-	case GDK_BUTTON_PRESS:
-		if (etcta->text) {
-			gtk_object_destroy(GTK_OBJECT(etcta->text));
-			etcta->text = NULL;
-		}
-		if (etcta->rect) {
-			gtk_object_destroy(GTK_OBJECT(etcta->rect));
-			etcta->rect = NULL;
-		}
-		if (!etcta->row) {
-			ETableModel *one;
-
-			one = e_table_one_new(etcta->model);
-			etcta_add_one (etcta, one);
-			gtk_object_unref(GTK_OBJECT(one));
-			
-			e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
-
-			etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-							   e_table_item_get_type(),
-							   "ETableHeader", etcta->eth,
-							   "ETableModel", etcta->one,
-							   "minimum_width", etcta->width,
-							   "drawgrid", TRUE,
-							   "table_selection_model", etcta->selection,
-							   "cursor_mode", E_CURSOR_SPREADSHEET,
-							   NULL);
-
-			gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
-					   GTK_SIGNAL_FUNC(item_key_press), etcta);
-		}
-		/* Fall through.  No break; */
-	case GDK_BUTTON_RELEASE:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		if (etcta->row) {
-			gnome_canvas_item_i2w (item, &e->button.x, &e->button.y);
-			gnome_canvas_item_w2i (etcta->row, &e->button.x, &e->button.y);
-			gtk_signal_emit_by_name(GTK_OBJECT(etcta->row), "event", e, &ret_val);
-			gnome_canvas_item_i2w (etcta->row, &e->button.x, &e->button.y);
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-		}
-		break;
-
-	case GDK_KEY_PRESS:
-		switch (e->key.keyval) {
-		case GDK_Tab:
-		case GDK_KP_Tab:
-		case GDK_ISO_Left_Tab:
-			finish_editing (etcta);
-			break;
-		default:
-			return FALSE;
-			break;
-		}
-			
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-etcta_reflow (GnomeCanvasItem *item, int flags)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-	
-	double old_height = etcta->height;
-	
-	if (etcta->text) {
-		gtk_object_get(GTK_OBJECT(etcta->text),
-			       "height", &etcta->height,
-			       NULL);
-		etcta->height += 6;
-	}
-	if (etcta->row) {
-		gtk_object_get(GTK_OBJECT(etcta->row),
-			       "height", &etcta->height,
-			       NULL);
-	}
-
-	if (etcta->rect) {
-		gtk_object_set(GTK_OBJECT(etcta->rect),
-			       "y2", etcta->height - 1,
-			       NULL);
-	}
-	if (old_height != etcta->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-static void
-etcta_class_init (ETableClickToAddClass *klass)
-{
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS(klass);
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-
-	etcta_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-
-	klass->cursor_change = NULL;
-
-	object_class->destroy = etcta_destroy;
-	object_class->set_arg = etcta_set_arg;
-	object_class->get_arg = etcta_get_arg;
-
-	item_class->realize     = etcta_realize;
-	item_class->unrealize   = etcta_unrealize;
-	item_class->point       = etcta_point;
-	item_class->event       = etcta_event;
-
-	gtk_object_add_arg_type ("ETableClickToAdd::header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_HEADER);
-	gtk_object_add_arg_type ("ETableClickToAdd::model", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-	gtk_object_add_arg_type ("ETableClickToAdd::message", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_MESSAGE);
-	gtk_object_add_arg_type ("ETableClickToAdd::width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableClickToAdd::height", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-
-	etcta_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClickToAddClass, cursor_change),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, etcta_signals, LAST_SIGNAL);
-}
-
-static void
-etcta_init (GnomeCanvasItem *item)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-
-	etcta->one = NULL;
-	etcta->model = NULL;
-	etcta->eth = NULL;
-
-	etcta->message = NULL;
-
-	etcta->row = NULL;
-	etcta->text = NULL;
-	etcta->rect = NULL;
-
-	etcta->selection = e_table_selection_model_new();
-	gtk_signal_connect(GTK_OBJECT(etcta->selection), "cursor_changed",
-			   GTK_SIGNAL_FUNC(etcta_cursor_change), etcta);
-
-	e_canvas_item_set_reflow_callback(item, etcta_reflow);
-}
-
-GtkType
-e_table_click_to_add_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableClickToAdd",
-			sizeof (ETableClickToAdd),
-			sizeof (ETableClickToAddClass),
-			(GtkClassInitFunc) etcta_class_init,
-			(GtkObjectInitFunc) etcta_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
-
-/* The colors in this need to be themefied. */
-/**
- * e_table_click_to_add_commit:
- * @etcta: The %ETableClickToAdd to commit.
- * 
- * This routine commits the current thing being edited and returns to
- * just displaying the click to add message.
- **/
-void
-e_table_click_to_add_commit (ETableClickToAdd *etcta)
-{
-	if (etcta->row) {
-		e_table_one_commit(E_TABLE_ONE(etcta->one));
-		etcta_drop_one (etcta);
-		gtk_object_destroy(GTK_OBJECT(etcta->row));
-		etcta->row = NULL;
-	}
-	if (!etcta->rect) {
-		etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						    gnome_canvas_rect_get_type(),
-						    "x1", (double) 0,
-						    "y1", (double) 0,
-						    "x2", (double) etcta->width - 1,
-						    "y2", (double) etcta->height - 1,
-						    "outline_color", "black",
-						    "fill_color", "white",
-						    NULL);
-	}
-	if (!etcta->text) {
-		etcta->text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						    e_text_get_type(),
-						    "text", etcta->message ? etcta->message : "",
-						    "anchor", GTK_ANCHOR_NW,
-						    "width", etcta->width - 4,
-						    "draw_background", FALSE,
-						    NULL);
-		e_canvas_item_move_absolute (etcta->text, 3, 3);
-	}
-}
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
deleted file mode 100644
index f4412cb0ea..0000000000
--- a/widgets/table/e-table-click-to-add.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CLICK_TO_ADD_H_
-#define _E_TABLE_CLICK_TO_ADD_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-selection-model.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CLICK_TO_ADD_TYPE        (e_table_click_to_add_get_type ())
-#define E_TABLE_CLICK_TO_ADD(o)          (GTK_CHECK_CAST ((o), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAdd))
-#define E_TABLE_CLICK_TO_ADD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAddClass))
-#define E_IS_TABLE_CLICK_TO_ADD(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CLICK_TO_ADD_TYPE))
-#define E_IS_TABLE_CLICK_TO_ADD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CLICK_TO_ADD_TYPE))
-
-typedef struct {
-	GnomeCanvasGroup  parent;
-
-	ETableModel      *one;    /* The ETableOne. */
-
-	ETableModel      *model;  /* The backend model. */
-	ETableHeader     *eth;    /* This is just to give to the ETableItem. */
-
-	char             *message;
-
-	GnomeCanvasItem  *row;    /* If row is NULL, we're sitting with no data and a "Click here" message. */
-	GnomeCanvasItem  *text;   /* If text is NULL, row shouldn't be. */
-	GnomeCanvasItem  *rect;   /* What the heck.  Why not. */
-	
-	gdouble           width;
-	gdouble           height;
-
-	ETableSelectionModel *selection;
-} ETableClickToAdd;
-
-typedef struct {
-	GnomeCanvasGroupClass parent_class;
-
-	/*
-	 * signals
-	 */
-	void (*cursor_change) (ETableClickToAdd *etcta, gint row, gint col);
-} ETableClickToAddClass;
-
-GtkType    e_table_click_to_add_get_type (void);
-
-void       e_table_click_to_add_commit (ETableClickToAdd *etcta);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CLICK_TO_ADD_H_ */
diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h
deleted file mode 100644
index 98b489b7c0..0000000000
--- a/widgets/table/e-table-col-dnd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _E_TABLE_COL_DND_H_
-#define _E_TABLE_COL_DND_H_
-
-BEGIN_GNOME_DECLS
-
-#define TARGET_ETABLE_COL_TYPE "application/x-etable-column-header"
-
-enum {
-	TARGET_ETABLE_COL_HEADER
-};
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_COL_DND_H_ */
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
deleted file mode 100644
index 38ae4a9b51..0000000000
--- a/widgets/table/e-table-col.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-col.c: ETableCol implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "e-table-col.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-
-enum {
-	ARG_0,
-	ARG_SORTABLE,
-};
-
-static void
-etc_destroy (GtkObject *object)
-{
-	ETableCol *etc = E_TABLE_COL (object);
-
-	gtk_object_unref (GTK_OBJECT(etc->ecell));
-
-	if (etc->pixbuf)
-		gdk_pixbuf_unref (etc->pixbuf);
-	if (etc->text)
-		g_free (etc->text);
-	
-	(*parent_class->destroy)(object);
-}
- 
-
-static void
-etc_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableCol *etc = E_TABLE_COL (o);
-	
-	switch (arg_id){
-	case ARG_SORTABLE:
-		etc->sortable = GTK_VALUE_BOOL(*arg);
-		break;
-	}
-}
-
-static void
-etc_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableCol *etc = E_TABLE_COL (o);
-	
-	switch (arg_id){
-	case ARG_SORTABLE:
-		GTK_VALUE_BOOL(*arg) = etc->sortable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-     
-static void
-e_table_col_class_init (GtkObjectClass *object_class)
-{
-	parent_class = gtk_type_class (PARENT_TYPE);
-	object_class->destroy = etc_destroy;
-	object_class->get_arg = etc_get_arg;
-	object_class->set_arg = etc_set_arg;
-
-	gtk_object_add_arg_type ("ETableCol::sortable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_SORTABLE);  
-}
-
-static void
-e_table_col_init (ETableCol *etc)
-{
-	etc->width = 0;
-	etc->sortable = 1;
-	etc->groupable = 1;
-	etc->justification = GTK_JUSTIFY_LEFT;
-}
-
-E_MAKE_TYPE(e_table_col, "ETableCol", ETableCol, e_table_col_class_init, e_table_col_init, PARENT_TYPE);
-
-/** 
- * e_table_col_new:
- * @col_idx: the column we represent in the model
- * @text: a title for this column
- * @expansion: FIXME
- * @min_width: minimum width in pixels for this column
- * @ecell: the renderer to be used for this column
- * @compare: comparision function for the elements stored in this column
- * @resizable: whether the column can be resized interactively by the user
- *
- * The ETableCol represents a column to be used inside an ETable.  The
- * ETableCol objects are inserted inside an ETableHeader (which is just a collection
- * of ETableCols).  The ETableHeader is the definition of the order in which
- * columns are shown to the user. 
- *
- * The @text argument is the the text that will be shown as a header to the
- * user. @col_idx reflects where the data for this ETableCol object will
- * be fetch from an ETableModel.  So even if the user changes the order
- * of the columns being viewed (the ETableCols in the ETableHeader), the
- * column will always point to the same column inside the ETableModel.
- *
- * The @ecell argument is an ECell object that needs to know how to render the
- * data in the ETableModel for this specific row. 
- *
- * Returns: the newly created ETableCol object.
- */
-ETableCol *
-e_table_col_new (int col_idx, const char *text, double expansion, int min_width,
-		 ECell *ecell, GCompareFunc compare, gboolean resizable)
-{
-	ETableCol *etc;
-	
-	g_return_val_if_fail (expansion >= 0, NULL);
-	g_return_val_if_fail (min_width >= 0, NULL);
-	g_return_val_if_fail (ecell != NULL, NULL);
-	g_return_val_if_fail (compare != NULL, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-
-	etc = gtk_type_new (E_TABLE_COL_TYPE);
-       
-	etc->is_pixbuf = FALSE;
-
-	etc->col_idx = col_idx;
-	etc->text = g_strdup (text);
-	etc->pixbuf = NULL;
-	etc->expansion = expansion;
-	etc->min_width = min_width;
-	etc->ecell = ecell;
-	etc->compare = compare;
-
-	etc->selected = 0;
-	etc->resizeable = resizable;
-
-	gtk_object_ref (GTK_OBJECT(etc->ecell));
-
-	return etc;
-}
-
-/** 
- * e_table_col_new_with_pixbuf:
- * @col_idx: the column we represent in the model
- * @pixbuf: the image to be used for the header
- * @expansion: FIXME
- * @min_width: minimum width in pixels for this column
- * @ecell: the renderer to be used for this column
- * @compare: comparision function for the elements stored in this column
- * @resizable: whether the column can be resized interactively by the user
- *
- * The ETableCol represents a column to be used inside an ETable.  The
- * ETableCol objects are inserted inside an ETableHeader (which is just a collection
- * of ETableCols).  The ETableHeader is the definition of the order in which
- * columns are shown to the user. 
- *
- * The @text argument is the the text that will be shown as a header to the
- * user. @col_idx reflects where the data for this ETableCol object will
- * be fetch from an ETableModel.  So even if the user changes the order
- * of the columns being viewed (the ETableCols in the ETableHeader), the
- * column will always point to the same column inside the ETableModel.
- *
- * The @ecell argument is an ECell object that needs to know how to render the
- * data in the ETableModel for this specific row. 
- *
- * Returns: the newly created ETableCol object.
- */
-ETableCol *
-e_table_col_new_with_pixbuf (int col_idx, const char *text, GdkPixbuf *pixbuf, double expansion, int min_width,
-			     ECell *ecell, GCompareFunc compare, gboolean resizable)
-{
-	ETableCol *etc;
-	
-	g_return_val_if_fail (expansion >= 0, NULL);
-	g_return_val_if_fail (min_width >= 0, NULL);
-	g_return_val_if_fail (ecell != NULL, NULL);
-	g_return_val_if_fail (compare != NULL, NULL);
-	g_return_val_if_fail (pixbuf != NULL, NULL);
-
-	etc = gtk_type_new (E_TABLE_COL_TYPE);
-
-	etc->is_pixbuf = TRUE;
-
-	etc->col_idx = col_idx;
-	etc->text = g_strdup(text);
-	etc->pixbuf = pixbuf;
-	etc->expansion = expansion;
-	etc->min_width = min_width;
-	etc->ecell = ecell;
-	etc->compare = compare;
-
-	etc->selected = 0;
-	etc->resizeable = resizable;
-
-	gtk_object_ref (GTK_OBJECT(etc->ecell));
-	gdk_pixbuf_ref (etc->pixbuf);
-
-	return etc;
-}
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
deleted file mode 100644
index 036b317d69..0000000000
--- a/widgets/table/e-table-col.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COL_H_
-#define _E_TABLE_COL_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-cell.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_COL_TYPE        (e_table_col_get_type ())
-#define E_TABLE_COL(o)          (GTK_CHECK_CAST ((o), E_TABLE_COL_TYPE, ETableCol))
-#define E_TABLE_COL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_COL_TYPE, ETableColClass))
-#define E_IS_TABLE_COL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_COL_TYPE))
-#define E_IS_TABLE_COL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_COL_TYPE))
-
-typedef enum {
-	E_TABLE_COL_ARROW_NONE = 0,
-	E_TABLE_COL_ARROW_UP,
-	E_TABLE_COL_ARROW_DOWN
-} ETableColArrow;
-
-/*
- * Information about a single column
- */
-typedef struct {
-	GtkObject    base;
-	char        *text;
-	GdkPixbuf   *pixbuf;
-	int          min_width;
-	int          width;
-	double       expansion;
-	short        x;
-	GCompareFunc compare;
-	unsigned int is_pixbuf:1;
-	unsigned int selected:1;
-	unsigned int resizeable:1;
-	unsigned int sortable:1;
-	unsigned int groupable:1;
-	int          col_idx;
-
-	GtkJustification justification;
-
-	ECell         *ecell;
-} ETableCol;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableColClass;
-
-GtkType        e_table_col_get_type        (void);
-ETableCol     *e_table_col_new             (int col_idx, const char *text,
-					    double expansion, int min_width,
-					    ECell *ecell, GCompareFunc compare,
-					    gboolean resizable);
-ETableCol     *e_table_col_new_with_pixbuf (int col_idx, const char *text, 
-					    GdkPixbuf *pixbuf,
-					    double expansion, int min_width,
-					    ECell *ecell, GCompareFunc compare,
-					    gboolean resizable);
-void           e_table_col_destroy         (ETableCol *etc);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_COL_H_ */
-
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
deleted file mode 100644
index 68c19188b1..0000000000
--- a/widgets/table/e-table-column-specification.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-specification.c: Savable specification of a column.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-xml-utils.h"
-#include "gal/util/e-util.h"
-#include "e-table-column-specification.h"
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *etcs_parent_class;
-
-static void
-free_strings (ETableColumnSpecification *etcs)
-{
-	g_free(etcs->title);
-	g_free(etcs->pixbuf);
-	g_free(etcs->cell);
-	g_free(etcs->compare);
-}
-
-static void
-etcs_destroy (GtkObject *object)
-{
-	ETableColumnSpecification *etcs = E_TABLE_COLUMN_SPECIFICATION (object);
-
-	free_strings(etcs);
-
-	GTK_OBJECT_CLASS (etcs_parent_class)->destroy (object);
-}
-
-static void
-etcs_class_init (GtkObjectClass *klass)
-{
-	etcs_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etcs_destroy;
-}
-
-static void
-etcs_init (ETableColumnSpecification *specification)
-{
-	specification->model_col     = 0;
-	specification->title        = g_strdup("");
-	specification->pixbuf        = NULL;
-	
-	specification->expansion     = 0;
-	specification->minimum_width = 0;
-	specification->resizable     = FALSE;
-	
-	specification->cell          = NULL;
-	specification->compare       = NULL;
-}
-
-E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, PARENT_TYPE);
-
-ETableColumnSpecification *
-e_table_column_specification_new (void)
-{
-	ETableColumnSpecification *etcs = gtk_type_new (E_TABLE_COLUMN_SPECIFICATION_TYPE);
-
-	return (ETableColumnSpecification *) etcs;
-}
-
-void
-e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
-					     const xmlNode       *node)
-{
-	free_strings(etcs);
-
-	etcs->model_col     = e_xml_get_integer_prop_by_name(node, "model_col");
-	etcs->title         = e_xml_get_string_prop_by_name(node, "_title");
-	etcs->pixbuf        = e_xml_get_string_prop_by_name(node, "pixbuf");
-
-	etcs->expansion     = e_xml_get_double_prop_by_name(node, "expansion");
-	etcs->minimum_width = e_xml_get_integer_prop_by_name(node, "minimum_width");
-	etcs->resizable     = e_xml_get_bool_prop_by_name(node, "resizable");
-
-	etcs->cell          = e_xml_get_string_prop_by_name(node, "cell");
-	etcs->compare       = e_xml_get_string_prop_by_name(node, "compare");
-
-	if (etcs->title == NULL)
-		etcs->title = g_strdup("");
-}
-
-xmlNode *
-e_table_column_specification_save_to_node (ETableColumnSpecification *specification,
-					   xmlNode                   *parent)
-{
-	xmlNode *node;
-	if (parent)
-		node = xmlNewChild(parent, NULL, "ETableColumn", NULL);
-	else
-		node = xmlNewNode(NULL, "ETableColumn");
-
-	e_xml_set_integer_prop_by_name(node, "model_col", specification->model_col);
-	e_xml_set_string_prop_by_name(node, "_title", specification->title);
-	e_xml_set_string_prop_by_name(node, "pixbuf", specification->pixbuf);
-
-	e_xml_set_double_prop_by_name(node, "expansion", specification->expansion);
-	e_xml_set_integer_prop_by_name(node, "minimum_width", specification->minimum_width);
-	e_xml_set_bool_prop_by_name(node, "resizable", specification->resizable);
-
-	e_xml_set_string_prop_by_name(node, "cell", specification->cell);
-	e_xml_set_string_prop_by_name(node, "compare", specification->compare);
-
-	return node;
-}
-
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
deleted file mode 100644
index ff334ec1b1..0000000000
--- a/widgets/table/e-table-column-specification.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COLUMN_SPECIFICATION_H_
-#define _E_TABLE_COLUMN_SPECIFICATION_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_COLUMN_SPECIFICATION_TYPE        (e_table_column_specification_get_type ())
-#define E_TABLE_COLUMN_SPECIFICATION(o)          (GTK_CHECK_CAST ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecification))
-#define E_TABLE_COLUMN_SPECIFICATION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecificationClass))
-#define E_IS_TABLE_COLUMN_SPECIFICATION(o)       (GTK_CHECK_TYPE ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-#define E_IS_TABLE_COLUMN_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-
-typedef struct {
-	GtkObject base;
-	int model_col;
-	char *title;
-	char *pixbuf;
-
-	double expansion;
-	int minimum_width;
-	guint resizable : 1;
-
-	char *cell;
-	char *compare;
-} ETableColumnSpecification;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableColumnSpecificationClass;
-
-GtkType                    e_table_column_specification_get_type        (void);
-
-ETableColumnSpecification *e_table_column_specification_new             (void);
-
-void                       e_table_column_specification_load_from_node  (ETableColumnSpecification *state,
-									 const xmlNode             *node);
-xmlNode                   *e_table_column_specification_save_to_node    (ETableColumnSpecification *state,
-									 xmlNode                   *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_COLUMN_SPECIFICATION_H_ */
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
deleted file mode 100644
index a3d6201ffd..0000000000
--- a/widgets/table/e-table-column.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * e-table-column.c: TableColumn implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include "e-table-column.h"
-
-enum {
-	STRUCTURE_CHANGE,
-	DIMENSION_CHANGE,
-	LAST_SIGNAL
-};
-
-static guint etc_signals [LAST_SIGNAL] = { 0, };
-
-static GtkObjectClass *e_table_column_parent_class;
-
-static void
-e_table_column_destroy (GtkObject *object)
-{
-	ETableColumn *etc = E_TABLE_COLUMN (object);
-	const int cols = etc->col_count;
-
-	/*
-	 * Destroy listeners
-	 */
-	for (l = etc->listeners; l; l = l->next)
-		g_free (l->data);
-	g_slist_free (etc->listeners);
-	etc->listeners = NULL;
-
-	/*
-	 * Destroy columns
-	 */
-	for (i = 0; i < cols; i++)
-		e_table_column_remove (etc, i);
-	
-	if (e_table_column_parent_class->destroy)
-		e_table_column_parent_class->destroy (object);
-}
-
-static void
-e_table_column_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = e_table_column_destroy;
-
-	e_table_column_parent_class = (gtk_type_class (gtk_object_get_type ()));
-
-	etc_signals [STRUCTURE_CHANGE] =
-		gtk_signal_new ("structure_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableColumn, structure_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	etc_signals [DIMENSION_CHANGE] = 
-		gtk_signal_new ("dimension_change", 
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableColumn, dimension_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, etc_signals, LAST_SIGNAL);
-}
-
-GtkType
-e_table_column_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableColumn",
-			sizeof (ETableColumn),
-			sizeof (ETableColumnClass),
-			(GtkClassInitFunc) e_table_column_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-etc_do_insert (ETableColumn *etc, int pos, ETableCol *val)
-{
-	memcpy (&etc->columns [pos+1], &etc->columns [pos],
-		sizeof (ETableCol *) * (etc->col_count - pos));
-	etc->columns [pos] = val;
-}
-
-void
-e_table_column_add_column (ETableColumn *etc, ETableCol *tc, int pos)
-{
-	ETableCol **new_ptr;
-	
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (tc != NULL);
-	g_return_if_fail (pos >= 0 && pos < etc->col_count);
-
-	if (pos == -1)
-		pos = etc->col_count;
-	etc->columns = g_realloc (etc->columns, sizeof (ETableCol *) * (etc->col_count + 1));
-	etc_do_insert (etc, pos, tc);
-	etc->col_count++;
-
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-ETableCol *
-e_table_column_get_column (ETableColumn *etc, int column)
-{
-	g_return_val_if_fail (etc != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), NULL);
-
-	if (column < 0)
-		return NULL;
-
-	if (column >= etc->col_count)
-		return NULL;
-
-	return etc->columns [column];
-}
-
-int
-e_table_column_count (ETableColumn *etc)
-{
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	return etc->col_count;
-}
-
-int
-e_table_column_index (ETableColumn *etc, const char *identifier)
-{
-	int i;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-	g_return_val_if_fail (identifier != NULL, 0);
-
-	for (i = 0; i < etc->col_count; i++){
-		ETableCol *tc = etc->columns [i];
-		
-		if (strcmp (i->id, identifier) == 0)
-			return i;
-	}
-
-	return -1;
-}
-
-int
-e_table_column_get_index_at (ETableColumn *etc, int x_offset)
-{
-	int i, total;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-	g_return_val_if_fail (identifier != NULL, 0);
-
-	total = 0;
-	for (i = 0; i < etc->col_count; i++){
-		total += etc->columns [i]->width;
-
-		if (x_offset < total)
-			return i;
-	}
-
-	return -1;
-}
-
-ETableCol **
-e_table_column_get_columns (ETableColumn *etc)
-{
-	ETableCol **ret;
-	int i;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	ret = g_new (ETableCol *, etc->col_count + 1);
-	memcpy (ret, etc->columns, sizeof (ETableCol *) * etc->col_count);
-	ret [etc->col_count] = NULL;
-
-	return ret;
-}
-
-gboolean
-e_table_column_selection_ok (ETableColumn *etc)
-{
-	g_return_val_if_fail (etc != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), FALSE);
-
-	return etc->selectable;
-}
-
-int
-ve_table_column_get_selected (ETableColumn *etc)
-{
-	int i;
-	int selected = 0;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	for (i = 0; i < etc->col_count; i++){
-		if (etc->columns [i]->selected)
-			selected++;
-	}
-
-	return selected;
-}
-
-int
-e_table_column_total_width (ETableColumn *etc)
-{
-	int total;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	total = 0;
-	for (i = 0; i < etc->col_count; i++)
-		total += etc->columns [i].width;
-
-	return total;
-}
-
-static void
-etc_do_remove (ETableColumn *etc, int idx)
-{
-	memcpy (&etc->columns [idx], &etc->columns [idx+1],
-		sizeof (ETableCol *) * etc->col_count - idx);
-	etc->col_count--;
-}
-
-void
-e_table_column_move (ETableColumn *etc, int source_index, int target_index)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (source_index >= 0);
-	g_return_if_fail (target_index >= 0);
-	g_return_if_fail (source_index < etc->col_count);
-	g_return_if_fail (target_index < etc->col_count);
-
-	old = etc->columns [source_index];
-	etc_do_remove (etc, source_index);
-	etc_do_insert (etc, target_index, old);
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-void
-e_table_column_remove (ETableColumn *etc, int idx)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < etc->col_count);
-
-	etc_do_remove (etc, idx);
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-void
-e_table_column_set_selection (ETableColumn *etc, gboolean allow_selection);
-{
-}
-
-void
-e_table_column_set_size (ETableColumn *etc, int idx, int size)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < etc->col_count);
-	g_return_if_fail (size > 0);
-
-	etc->columns [idx]->width = size;
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [SIZE_CHANGE], idx);
-}
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
deleted file mode 100644
index d7f016f9c2..0000000000
--- a/widgets/table/e-table-config-field.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-config-field.c: One field of either the sort or group dialog.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gnome.h>
-#include "gal/util/e-util.h"
-#include "e-table-config-field.h"
-
-#define PARENT_TYPE (gtk_vbox_get_type())
-
-static GtkVBoxClass *etcf_parent_class;
-
-static void
-etcf_destroy (GtkObject *object)
-{
-	ETableConfigField *etcf = E_TABLE_CONFIG_FIELD (object);
-
-	gtk_object_unref(GTK_OBJECT(etcf->spec));
-	gtk_object_unref(GTK_OBJECT(etcf->sort_info));
-
-	GTK_OBJECT_CLASS (etcf_parent_class)->destroy (object);
-}
-
-static void
-etcf_class_init (GtkObjectClass *klass)
-{
-	etcf_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etcf_destroy;
-}
-
-static void
-etcf_init (ETableConfigField *etcf)
-{
-	etcf->spec             = NULL;
-	etcf->sort_info        = NULL;
-
-	etcf->combo            = NULL;
-	etcf->radio_ascending  = NULL;
-	etcf->radio_descending = NULL;
-	etcf->child_fields     = NULL;
-}
-
-E_MAKE_TYPE(e_table_config_field, "ETableConfigField", ETableConfigField, etcf_class_init, etcf_init, PARENT_TYPE);
-
-ETableConfigField *
-e_table_config_field_new       (ETableSpecification *spec,
-				ETableSortInfo      *sort_info,
-				gboolean             grouping)
-{
-	ETableConfigField *etcf = gtk_type_new (E_TABLE_CONFIG_FIELD_TYPE);
-
-	e_table_config_field_construct (etcf, spec, sort_info, grouping);
-
-	return (ETableConfigField *) etcf;
-}
-
-inline static int
-etcf_get_count (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		return e_table_sort_info_grouping_get_count(etcf->sort_info);
-	else
-		return e_table_sort_info_sorting_get_count(etcf->sort_info);
-}
-
-inline static ETableSortColumn
-etcf_get_nth (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		return e_table_sort_info_grouping_get_nth(etcf->sort_info, etcf->n);
-	else
-		return e_table_sort_info_sorting_get_nth(etcf->sort_info, etcf->n);
-}
-
-inline static void
-etcf_set_nth (ETableConfigField *etcf, ETableSortColumn column)
-{
-	if (etcf->grouping)
-		e_table_sort_info_grouping_set_nth(etcf->sort_info, etcf->n, column);
-	else
-		e_table_sort_info_sorting_set_nth(etcf->sort_info, etcf->n, column);
-}
-
-inline static void
-etcf_truncate (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		e_table_sort_info_grouping_truncate(etcf->sort_info, etcf->n);
-	else
-		e_table_sort_info_sorting_truncate(etcf->sort_info, etcf->n);
-}
-
-static void
-etcf_set_sensitivity(ETableConfigField *etcf)
-{
-	int count = etcf_get_count(etcf);
-
-	if (etcf->n >= count) {
-		gtk_widget_set_sensitive(etcf->radio_ascending, FALSE);
-		gtk_widget_set_sensitive(etcf->radio_descending, FALSE);
-		if (etcf->child_fields)
-			gtk_widget_set_sensitive(etcf->child_fields, FALSE);
-	} else {
-		gtk_widget_set_sensitive(etcf->radio_ascending, TRUE);
-		gtk_widget_set_sensitive(etcf->radio_descending, TRUE);
-		if (etcf->child_fields)
-			gtk_widget_set_sensitive(etcf->child_fields, TRUE);
-	}
-}
-
-static void
-toggled(GtkWidget *widget, ETableConfigField *etcf)
-{
-	int count;
-
-	count = etcf_get_count(etcf);
-	if (count > etcf->n) {
-		ETableSortColumn sort_column;
-
-		sort_column = etcf_get_nth(etcf);
-		sort_column.ascending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(etcf->radio_ascending));
-		etcf_set_nth(etcf, sort_column);
-	}
-}
-
-static void
-changed(GtkWidget *widget, ETableConfigField *etcf)
-{
-	ETableColumnSpecification **column;
-	gchar *text;
-
-	text = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry));
-	for (column = etcf->spec->columns; *column; column++) {
-		if (!strcmp((*column)->title_, text)) {
-			ETableSortColumn sort_column;
-
-			sort_column.ascending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(etcf->radio_ascending));
-			sort_column.column = (*column)->model_col;
-
-			etcf_set_nth(etcf, sort_column);
-			etcf_set_sensitivity(etcf);
-			return;
-		}
-	}
-	etcf_truncate(etcf);
-	etcf_set_sensitivity(etcf);
-}
-
-static void
-etcf_setup(ETableConfigField *etcf)
-{
-	int count;
-	GList *list = NULL;
-	ETableColumnSpecification **column;
-	ETableColumnSpecification *chosen_column = NULL;
-	int model_col = -1;
-
-	etcf_set_sensitivity(etcf);
-
-	count = etcf_get_count(etcf);
-
-	if (count > etcf->n) {
-		ETableSortColumn sort_column;
-
-		sort_column = etcf_get_nth(etcf);
-		model_col = sort_column.column;
-		if (sort_column.ascending)
-			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(etcf->radio_ascending), TRUE);
-		else
-			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(etcf->radio_descending), TRUE);
-	}
-
-	for (column = etcf->spec->columns; *column; column++) {
-		list = g_list_prepend(list, (*column)->title_);
-		if (count > etcf->n && chosen_column == NULL && (*column)->model_col == model_col) {
-			chosen_column = *column;
-		}
-	}
-	list = g_list_reverse(list);
-	list = g_list_prepend(list, "None");
-
-	gtk_combo_set_popdown_strings(GTK_COMBO(etcf->combo), list);
-	g_list_free(list);
-
-	if (chosen_column) {
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry), chosen_column->title_);
-	} else {
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry), "None");
-	}
-
-	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(etcf->combo)->entry), "changed",
-			   GTK_SIGNAL_FUNC(changed), etcf);
-	gtk_signal_connect(GTK_OBJECT(etcf->radio_ascending), "toggled",
-			   GTK_SIGNAL_FUNC(toggled), etcf);
-	gtk_signal_connect(GTK_OBJECT(etcf->radio_descending), "toggled",
-			   GTK_SIGNAL_FUNC(toggled), etcf);
-}
-
-static ETableConfigField *
-e_table_config_field_construct_nth (ETableConfigField   *etcf,
-				    ETableSpecification *spec,
-				    ETableSortInfo      *sort_info,
-				    gboolean             grouping,
-				    int                  n)
-{
-	GtkWidget *frame;
-	GtkWidget *internal_hbox;
-	GtkWidget *internal_vbox1;
-	GtkWidget *internal_vbox2;
-
-	etcf->spec = spec;
-	gtk_object_ref(GTK_OBJECT(spec));
-
-	etcf->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(sort_info));
-
-	etcf->grouping = grouping;
-	etcf->n = n;
-
-	gtk_box_set_spacing(GTK_BOX(etcf), 6);
-
-	frame = gtk_frame_new(n > 0 ? _("Then By") : (grouping ? _("Group By") : _("Sort By")));
-	gtk_box_pack_start(GTK_BOX(etcf), frame, FALSE, FALSE, 0);
-
-	internal_hbox = gtk_hbox_new(FALSE, 6);
-	gtk_container_add(GTK_CONTAINER(frame), internal_hbox);
-	gtk_container_set_border_width(GTK_CONTAINER(internal_hbox), 6);
-
-	internal_vbox1 = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(internal_hbox), internal_vbox1, FALSE, FALSE, 0);
-
-	etcf->combo = gtk_combo_new();
-	gtk_box_pack_start(GTK_BOX(internal_vbox1), etcf->combo, FALSE, FALSE, 0);
-
-	internal_vbox2 = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(internal_hbox), internal_vbox2, FALSE, FALSE, 0);
-
-	etcf->radio_ascending = gtk_radio_button_new_with_label (NULL, _("Ascending"));
-	gtk_box_pack_start(GTK_BOX(internal_vbox2), etcf->radio_ascending, FALSE, FALSE, 0);
-
-	etcf->radio_descending = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON(etcf->radio_ascending), _("Descending"));
-	gtk_box_pack_start(GTK_BOX(internal_vbox2), etcf->radio_descending, FALSE, FALSE, 0);
-
-	if (n < 3) {
-		etcf->child_fields = GTK_WIDGET(gtk_type_new (E_TABLE_CONFIG_FIELD_TYPE));
-		e_table_config_field_construct_nth(E_TABLE_CONFIG_FIELD(etcf->child_fields), spec, sort_info, grouping, n + 1);
-		gtk_box_pack_start(GTK_BOX(etcf), etcf->child_fields, FALSE, FALSE, 0);
-		gtk_widget_show(etcf->child_fields);
-	} else
-		etcf->child_fields = NULL;
-
-	etcf_setup(etcf);
-
-	gtk_widget_show(etcf->radio_descending);
-	gtk_widget_show(etcf->radio_ascending);
-	gtk_widget_show(internal_vbox2);
-	gtk_widget_show(etcf->combo);
-	gtk_widget_show(internal_vbox1);
-	gtk_widget_show(internal_hbox);
-	gtk_widget_show(frame);
-	return etcf;
-}
-
-ETableConfigField *
-e_table_config_field_construct (ETableConfigField   *etcf,
-				ETableSpecification *spec,
-				ETableSortInfo      *sort_info,
-				gboolean             grouping)
-{
-	return e_table_config_field_construct_nth(etcf, spec, sort_info, grouping, 0);
-}
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
deleted file mode 100644
index 9df83238ee..0000000000
--- a/widgets/table/e-table-config-field.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CONFIG_FIELD_H_
-#define _E_TABLE_CONFIG_FIELD_H_
-
-#include <gtk/gtkvbox.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-specification.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CONFIG_FIELD_TYPE        (e_table_config_field_get_type ())
-#define E_TABLE_CONFIG_FIELD(o)          (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigField))
-#define E_TABLE_CONFIG_FIELD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigFieldClass))
-#define E_IS_TABLE_CONFIG_FIELD(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CONFIG_FIELD_TYPE))
-#define E_IS_TABLE_CONFIG_FIELD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CONFIG_FIELD_TYPE))
-
-typedef struct {
-	GtkVBox base;
-
-	ETableSpecification *spec;
-	ETableSortInfo *sort_info;
-	guint grouping : 1;
-	int n;
-
-	GtkWidget *combo;
-	GtkWidget *radio_ascending;
-	GtkWidget *radio_descending;
-
-	GtkWidget *child_fields;
-} ETableConfigField;
-
-typedef struct {
-	GtkVBoxClass parent_class;
-} ETableConfigFieldClass;
-
-GtkType            e_table_config_field_get_type  (void);
-ETableConfigField *e_table_config_field_new       (ETableSpecification *spec,
-						   ETableSortInfo      *sort_info,
-						   gboolean             grouping);
-ETableConfigField *e_table_config_field_construct (ETableConfigField   *field,
-						   ETableSpecification *spec,
-						   ETableSortInfo      *sort_info,
-						   gboolean             grouping);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CONFIG_FIELD_H_ */
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
deleted file mode 100644
index f25e77245d..0000000000
--- a/widgets/table/e-table-config.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-config.c: The ETable config dialog.
- *
- * Authors:
- *   Chris Lahey (clahey@ximian.com)
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * FIXME:
- *    Sort Dialog: when text is selected, the toggle button switches state.
- *    Make Clear all work.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "gal/util/e-i18n.h"
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include "e-table-config.h"
-#include "gal/util/e-util.h"
-
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *config_parent_class;
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_table_config_signals [LAST_SIGNAL] = { 0, };
-
-static void
-config_destroy (GtkObject *object)
-{
-	ETableConfig *config = E_TABLE_CONFIG (object);
-
-	gtk_object_destroy (GTK_OBJECT (config->state));
-	gtk_object_unref (GTK_OBJECT (config->source_state));
-	gtk_object_unref (GTK_OBJECT (config->source_spec));
-
-	g_slist_free (config->column_names);
-	config->column_names = NULL;
-	
-	GTK_OBJECT_CLASS (config_parent_class)->destroy (object);
-}
-
-static void
-e_table_config_changed       (ETableConfig *config, ETableState *state)
-{
-	g_return_if_fail (config != NULL);
-	g_return_if_fail (E_IS_TABLE_CONFIG (config));
-
-	gtk_signal_emit(GTK_OBJECT(config),
-			e_table_config_signals [CHANGED],
-			state);
-}
-
-static void
-config_class_init (GtkObjectClass *object_class)
-{
-	ETableConfigClass *klass = E_TABLE_CONFIG_CLASS(object_class);
-
-	config_parent_class   = gtk_type_class (PARENT_TYPE);
-	
-	klass->changed        = NULL;
-
-	object_class->destroy = config_destroy;
-
-	e_table_config_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableConfigClass, changed),
-				gtk_marshal_NONE__OBJECT,
-				GTK_TYPE_NONE, 1, E_TABLE_STATE_TYPE);
-
-	gtk_object_class_add_signals (object_class, e_table_config_signals, LAST_SIGNAL);
-}
-
-static ETableColumnSpecification *
-find_column_in_spec (ETableSpecification *spec, int model_col)
-{
-	ETableColumnSpecification **column;
-
-	for (column = spec->columns; *column; column++){
-		if ((*column)->model_col != model_col)
-			continue;
-
-		return *column;
-	}
-
-	return NULL;
-}
-
-static int
-find_model_column_by_name (ETableSpecification *spec, const char *s)
-{
-	ETableColumnSpecification **column;
-
-	for (column = spec->columns; *column; column++){
-
-		if (strcasecmp ((*column)->title, s) == 0)
-			return (*column)->model_col;
-	}
-	return -1;
-}
-
-static void
-update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
-{
-	ETableConfigSortWidgets *widgets;
-	int count, i;
-
-	if (is_sort){
-		count = e_table_sort_info_sorting_get_count (
-			config->temp_state->sort_info);
-		widgets = &config->sort [0];
-	} else {
-		count = e_table_sort_info_grouping_get_count (
-			config->temp_state->sort_info);
-		widgets = &config->group [0];
-	}
-	
-	for (i = 0; i < 4; i++){
-		gboolean sensitive = (i <= count);
-		
-		gtk_widget_set_sensitive (widgets [i].frames, sensitive);
-
-		/*
-		 * Sorting is set, auto select the text
-		 */
-		gtk_signal_handler_block (
-			GTK_OBJECT (widgets [i].radio_ascending),
-			widgets [i].toggled_id);
-		
-		if (i < count){
-			GtkToggleButton *a, *d;
-			ETableSortColumn col =
-				is_sort
-				? e_table_sort_info_sorting_get_nth (
-					config->temp_state->sort_info,
-					i)
-				:  e_table_sort_info_grouping_get_nth (
-					config->temp_state->sort_info,
-					i);
-			
-			ETableColumnSpecification *column =
-				find_column_in_spec (config->source_spec, col.column);
-
-			if (!column){
-				/*
-				 * This is a bug in the programmer
-				 * stuff, but by the time we arrive
-				 * here, the user has been given a
-				 * warning
-				 */
-				continue;
-			}
-
-			/*
-			 * Change the text
-			 */
-			gtk_signal_handler_block (
-				GTK_OBJECT (widgets [i].combo->entry),
-				widgets [i].changed_id);
-			gtk_combo_text_set_text (
-				widgets [i].combo, gettext (
-					column->title));
-			gtk_signal_handler_unblock (
-				GTK_OBJECT (widgets [i].combo->entry),
-				widgets [i].changed_id);
-
-			/*
-			 * Update radio buttons
-			 */
-			a = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_ascending);
-			d = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_descending);
-			
-			gtk_toggle_button_set_active (col.ascending ? a:d, 1);
-		} else {
-			GtkToggleButton *t;
-			
-			t = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_ascending);
-
-			gtk_toggle_button_set_active (t, 1);
-		}
-		gtk_signal_handler_unblock (
-			GTK_OBJECT (widgets [i].radio_ascending),
-			widgets [i].toggled_id);
-	}
-}
-
-static void
-update_group_config_dialog (ETableConfig *config)
-{
-	g_warning ("IMPLEMENT ME\n");
-}
-
-static void
-config_sort_info_update (ETableConfig *config)
-{
-	ETableSortInfo *info = config->state->sort_info;
-	GString *res;
-	int count, i;
-
-	count = e_table_sort_info_sorting_get_count (info);
-	res = g_string_new ("");
-
-	for (i = 0; i < count; i++) {
-		ETableSortColumn col = e_table_sort_info_sorting_get_nth (info, i);
-		ETableColumnSpecification *column;
-		
-		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
-			g_warning ("Could not find column model in specification");
-			continue;
-		}
-		
-		g_string_append (res, gettext ((column)->title));
-		g_string_append_c (res, ' ');
-		g_string_append (
-			res,
-			col.ascending ?
-			_("(Ascending)") : _("(Descending)"));
-
-		if ((i + 1) != count)
-			g_string_append (res, ", ");
-	}
-	
-	if (res->str [0] == 0)
-		g_string_append (res, _("Not sorted"));
-	
-	gtk_label_set_text (GTK_LABEL(config->sort_label), res->str);
-
-	g_string_free (res, TRUE);
-}
-
-static void
-config_group_info_update (ETableConfig *config)
-{
-	ETableSortInfo *info = config->state->sort_info;
-	GString *res;
-	int count, i;
-
-	count = e_table_sort_info_grouping_get_count (info);
-	printf ("Count of the grouping action: %d\n", count);
-	res = g_string_new ("");
-
-	for (i = 0; i < count; i++) {
-		ETableSortColumn col = e_table_sort_info_grouping_get_nth (info, i);
-		ETableColumnSpecification *column;
-
-		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
-			g_warning ("Could not find model column in specification");
-			continue;
-		}
-		
-		g_string_append (res, gettext ((column)->title));
-		g_string_append_c (res, ' ');
-		g_string_append (
-			res,
-			col.ascending ?
-			_("(Ascending)") : _("(Descending)"));
-
-		if ((i+1) != count)
-			g_string_append (res, ", ");
-	}
-	if (res->str [0] == 0)
-		g_string_append (res, _("No grouping"));
-	
-	gtk_label_set_text (GTK_LABEL (config->group_label), res->str);
-	g_string_free (res, TRUE);
-}
-
-static void
-config_fields_info_update (ETableConfig *config)
-{
-	ETableColumnSpecification **column;
-	GString *res = g_string_new ("");
-	int i;
-
-	for (i = 0; i < config->state->col_count; i++){
-		for (column = config->source_spec->columns; *column; column++){
-
-			if (config->state->columns [i] != (*column)->model_col)
-				continue;
-			
-			g_string_append (res, gettext ((*column)->title));
-			if (column [1])
-				g_string_append (res, ", ");
-		}
-	}
-	
-	gtk_label_set_text (GTK_LABEL (config->fields_label), res->str);
-	g_string_free (res, TRUE);
-}
-
-static void
-do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
-{
-	GnomeDialog *dialog;
-	int button, running = 1;
-
-	config->temp_state = e_table_state_duplicate (config->state);
-	
-	update_sort_and_group_config_dialog (config, is_sort);
-
-	gtk_widget_grab_focus (GTK_WIDGET (
-		is_sort
-		? config->sort [0].combo
-		: config->group [0].combo));
-		
-
-	if (is_sort)
-		dialog = GNOME_DIALOG (config->dialog_sort);
-	else
-		dialog = GNOME_DIALOG (config->dialog_group_by);
-	
-	do {
-		button = gnome_dialog_run (dialog);
-		switch (button){
-		case 0:
-			if (is_sort){
-				e_table_sort_info_sorting_truncate (
-					config->state->sort_info, 0);
-			} else {
-				e_table_sort_info_grouping_truncate (
-					config->state->sort_info, 0);
-			}
-			update_sort_and_group_config_dialog (config, is_sort);
-			continue;
-
-			/* OK */
-		case 1:
-			gtk_object_unref (GTK_OBJECT (config->state));
-			config->state = config->temp_state;
-			running = 0;
-			gnome_property_box_changed (
-				GNOME_PROPERTY_BOX (config->dialog_toplevel));
-			break;
-
-			/* CANCEL */
-		case 2:
-			gtk_object_unref (GTK_OBJECT (config->temp_state));
-			config->temp_state = 0;
-			running = 0;
-			break;
-		}
-		
-	} while (running);
-	gnome_dialog_close (GNOME_DIALOG (dialog));
-
-	if (is_sort)
-		config_sort_info_update (config);
-	else
-		config_group_info_update (config);
-}
-
-static void
-config_button_sort (GtkWidget *widget, ETableConfig *config)
-{
-	do_sort_and_group_config_dialog (config, TRUE);
-}
-
-static void
-config_button_group (GtkWidget *widget, ETableConfig *config)
-{
-	do_sort_and_group_config_dialog (config, FALSE);
-}
-
-
-static void
-dialog_destroyed (GtkObject *dialog, ETableConfig *config)
-{
-	gtk_object_destroy (GTK_OBJECT (config));
-}
-
-static void
-dialog_apply (GnomePropertyBox *pbox, gint page_num, ETableConfig *config)
-{
-	if (page_num != -1)
-		return;
-
-	e_table_config_changed (config, config->state);
-}
-
-/*
- * Invoked by the Glade auto-connect code
- */
-GtkWidget *e_table_proxy_gtk_combo_text_new (void);
-GtkWidget *
-e_table_proxy_gtk_combo_text_new (void)
-{
-	return gtk_combo_text_new (TRUE);
-}
-
-#if 0
-static GtkWidget *
-configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config)
-{
-	GtkWidget *w;
-	
-	w = glade_xml_get_widget (gui, widget_name);
-
-	return w;
-}
-#endif
-
-static void
-connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, void *cback)
-{
-	GtkWidget *button = glade_xml_get_widget (gui, widget_name);
-
-	gtk_signal_connect(
-		GTK_OBJECT (button), "clicked",
-		GTK_SIGNAL_FUNC (cback), config);
-}
-
-static void
-sort_entry_changed (GtkEntry *entry, ETableConfigSortWidgets *sort)
-{
-	ETableConfig *config = sort->e_table_config;
-	ETableSortInfo *sort_info = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->sort[0];
-	int idx = sort - base;
-	
-	char *s = gtk_entry_get_text (entry);
-
-	if (g_hash_table_lookup (sort->combo->elements, s)){
-		ETableSortColumn c;
-		int col;
-		
-		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
-			g_warning ("This should not happen");
-			return;
-		}
-
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->sort [idx].radio_ascending)->active;
-		c.column = col;
-		e_table_sort_info_sorting_set_nth (sort_info, idx, c);
-		  
-		update_sort_and_group_config_dialog (config, TRUE);
-	}  else {
-		e_table_sort_info_sorting_truncate (sort_info, idx);
-		update_sort_and_group_config_dialog (config, TRUE);
-	}
-}
-
-static void
-sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort)
-{
-	ETableConfig *config = sort->e_table_config;
-	ETableSortInfo *si = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->sort[0];
-	int idx = sort - base;
-	ETableSortColumn c;
-	
-	c = e_table_sort_info_sorting_get_nth (si, idx);
-	c.ascending = t->active;
-	e_table_sort_info_sorting_set_nth (si, idx, c);
-}
-
-static void
-configure_sort_dialog (ETableConfig *config, GladeXML *gui)
-{
-	GSList *l;
-	int i;
-	
-	for (i = 0; i < 4; i++){
-		char buffer [80];
-
-		snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1);
-		config->sort [i].combo = GTK_COMBO_TEXT (
-			glade_xml_get_widget (gui, buffer));
-
-		gtk_combo_text_add_item (config->sort [i].combo, "", "");
-
-		snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1);
-		config->sort [i].frames = 
-			glade_xml_get_widget (gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-ascending-sort-%d", i+1);
-		config->sort [i].radio_ascending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-descending-sort-%d", i+1);
-		config->sort [i].radio_descending = glade_xml_get_widget (
-			gui, buffer);
-
-		config->sort [i].e_table_config = config;
-	}
-
-	for (l = config->column_names; l; l = l->next){
-		char *label = l->data;
-
-		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (
-				config->sort [i].combo,
-				gettext (label), label);
-		}
-	}
-
-	/*
-	 * After we have runtime modified things, signal connect
-	 */
-	for (i = 0; i < 4; i++){
-		config->sort [i].changed_id = gtk_signal_connect (
-			GTK_OBJECT (config->sort [i].combo->entry),
-			"changed", sort_entry_changed, &config->sort [i]);
-
-		config->sort [i].toggled_id = gtk_signal_connect (
-			GTK_OBJECT (config->sort [i].radio_ascending),
-			"toggled", sort_ascending_toggled, &config->sort [i]);
-	}
-}
-
-static void
-group_entry_changed (GtkEntry *entry, ETableConfigSortWidgets *group)
-{
-	ETableConfig *config = group->e_table_config;
-	ETableSortInfo *sort_info = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->group[0];
-	int idx = group - base;
-	
-	char *s = gtk_entry_get_text (entry);
-
-	if (g_hash_table_lookup (group->combo->elements, s)){
-		ETableSortColumn c;
-		int col;
-		
-		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
-			g_warning ("This should not happen");
-			return;
-		}
-
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->group [idx].radio_ascending)->active;
-		c.column = col;
-		e_table_sort_info_grouping_set_nth (sort_info, idx, c);
-		  
-		update_group_config_dialog (config);
-	}  else {
-		e_table_sort_info_grouping_truncate (sort_info, idx);
-		update_group_config_dialog (config);
-	}
-}
-
-static void
-group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group)
-{
-	ETableConfig *config = group->e_table_config;
-	ETableSortInfo *si = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->group[0];
-	int idx = group - base;
-	ETableSortColumn c;
-	
-	c = e_table_sort_info_grouping_get_nth (si, idx);
-	c.ascending = t->active;
-	e_table_sort_info_grouping_set_nth (si, idx, c);
-}
-
-static void
-configure_group_dialog (ETableConfig *config, GladeXML *gui)
-{
-	GSList *l;
-	int i;
-	
-	for (i = 0; i < 4; i++){
-		char buffer [80];
-
-		snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1);
-		config->group [i].combo = GTK_COMBO_TEXT (
-			glade_xml_get_widget (gui, buffer));
-
-		gtk_combo_text_add_item (config->group [i].combo, "", "");
-
-		snprintf (buffer, sizeof (buffer), "frame-group-%d", i + 1);
-		config->group [i].frames = 
-			glade_xml_get_widget (gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-ascending-group-%d", i+1);
-		config->group [i].radio_ascending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-descending-group-%d", i+1);
-		config->group [i].radio_descending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"checkbutton-group-%d", i+1);
-		config->group [i].view_check = glade_xml_get_widget (
-			gui, buffer);
-		
-		config->group [i].e_table_config = config;
-	}
-
-	
-	for (l = config->column_names; l; l = l->next){
-		char *label = l->data;
-
-		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (
-				config->group [i].combo,
-				gettext (label), label);
-		}
-	}
-
-	/*
-	 * After we have runtime modified things, signal connect
-	 */
-	for (i = 0; i < 4; i++){
-		config->group [i].changed_id = gtk_signal_connect (
-			GTK_OBJECT (config->group [i].combo->entry),
-			"changed", group_entry_changed, &config->group [i]);
-
-		config->group [i].toggled_id = gtk_signal_connect (
-			GTK_OBJECT (config->group [i].radio_ascending),
-			"toggled", group_ascending_toggled, &config->group [i]);
-	}
-}
-
-static void
-setup_gui (ETableConfig *config)
-{
-	GladeXML *gui = glade_xml_new (
-		ETABLE_GLADEDIR "/e-table-config.glade", NULL);
-	
-	config->dialog_toplevel = glade_xml_get_widget (
-		gui, "e-table-config");
-
-	gtk_notebook_set_show_tabs (
-		GTK_NOTEBOOK (GNOME_PROPERTY_BOX (
-			config->dialog_toplevel)->notebook),
-		FALSE);
-	
-	config->dialog_show_fields = glade_xml_get_widget (
-		gui, "dialog-show-fields");
-	config->dialog_group_by =  glade_xml_get_widget (
-		gui, "dialog-group-by");
-	config->dialog_sort = glade_xml_get_widget (
-		gui, "dialog-sort");
-
-	config->sort_label = glade_xml_get_widget (
-		gui, "label-sort");
-	config->group_label = glade_xml_get_widget (
-		gui, "label-group");
-	config->fields_label = glade_xml_get_widget (
-		gui, "label-fields");
-
-	connect_button (config, gui, "button-sort", config_button_sort);
-	connect_button (config, gui, "button-group", config_button_group);
-
-	configure_sort_dialog (config, gui);
-	configure_group_dialog (config, gui);
-	
-	gtk_signal_connect (
-		GTK_OBJECT (config->dialog_toplevel), "destroy",
-		GTK_SIGNAL_FUNC (dialog_destroyed), config);
-
-	gtk_signal_connect (
-		GTK_OBJECT (config->dialog_toplevel), "apply",
-		GTK_SIGNAL_FUNC (dialog_apply), config);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-}
-
-static void
-config_init (ETableConfig *config)
-{
-	glade_gnome_init ();
-}
-
-ETableConfig *
-e_table_config_construct (ETableConfig        *config,
-			  const char          *header,
-			  ETableSpecification *spec,
-			  ETableState         *state)
-{
-	ETableColumnSpecification **column;
-
-	g_return_val_if_fail (config != NULL, NULL);
-	g_return_val_if_fail (header != NULL, NULL);
-	g_return_val_if_fail (spec != NULL, NULL);
-	g_return_val_if_fail (state != NULL, NULL);
-	
-	config->source_spec = spec;
-	config->source_state = state;
-
-	gtk_object_ref (GTK_OBJECT (config->source_spec));
-	gtk_object_ref (GTK_OBJECT (config->source_state));
-
-	config->state = e_table_state_duplicate (state);
-
-	for (column = config->source_spec->columns; *column; column++){
-		char *label = (*column)->title;
-
-		config->column_names = g_slist_append (
-			config->column_names, label);
-	}
-
-	setup_gui (config);
-
-	config_sort_info_update   (config);
-	config_group_info_update  (config);
-	config_fields_info_update (config);
-	
-	return E_TABLE_CONFIG (config);
-}
-
-/**
- * e_table_config_new:
- * @header: The title of the dialog for the ETableConfig.
- * @spec: The specification for the columns to allow.
- * @state: The current state of the configuration.
- *
- * Creates a new ETable config object.
- *
- * Returns: The config object.
- */
-ETableConfig *
-e_table_config_new (const char          *header,
-		    ETableSpecification *spec,
-		    ETableState         *state)
-{
-	ETableConfig *config = gtk_type_new (E_TABLE_CONFIG_TYPE);
-
-	if (e_table_config_construct (config, header, spec, state) == NULL){
-		gtk_object_destroy (GTK_OBJECT (config));
-		return NULL;
-	}
-
-	gtk_widget_show (config->dialog_toplevel);
-	return E_TABLE_CONFIG (config);
-}
-
-/**
- * e_table_config_raise:
- * @config: The ETableConfig object.
- *
- * Raises the dialog associated with this ETableConfig object.
- */
-void
-e_table_config_raise (ETableConfig *config)
-{
-	gdk_window_raise (GTK_WIDGET (config->dialog_toplevel)->window);
-}
-
-E_MAKE_TYPE(e_table_config, "ETableConfig", ETableConfig, config_class_init, config_init, PARENT_TYPE);
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
deleted file mode 100644
index e0035daf67..0000000000
--- a/widgets/table/e-table-config.glade
+++ /dev/null
@@ -1,1866 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>E-table</name>
-  <program_name>e-table</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory></pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-table-config.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-show-fields</name>
-  <visible>False</visible>
-  <title>Show Fields</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>6</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table2</name>
-	<rows>1</rows>
-	<columns>5</columns>
-	<homogeneous>True</homogeneous>
-	<row_spacing>6</row_spacing>
-	<column_spacing>6</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-available</name>
-	  <label>A_vailable Fields:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>table-1</focus_target>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-displayed</name>
-	  <label>Sh_ow these fields in order:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>table-2</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table3</name>
-	<rows>1</rows>
-	<columns>5</columns>
-	<homogeneous>True</homogeneous>
-	<row_spacing>6</row_spacing>
-	<column_spacing>6</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow1</name>
-	    <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkViewport</class>
-	      <name>viewport1</name>
-	      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>table-1</name>
-		<can_focus>True</can_focus>
-		<label>Table HERE</label>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox5</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow2</name>
-	    <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkViewport</class>
-	      <name>viewport2</name>
-	      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>table-2</name>
-		<can_focus>True</can_focus>
-		<label>Table HERE</label>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox4</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>6</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button-up</name>
-	      <can_focus>True</can_focus>
-	      <label>Move _Up</label>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button-down</name>
-	      <can_focus>True</can_focus>
-	      <label>Move _Down</label>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox6</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-add</name>
-	    <can_focus>True</can_focus>
-	    <label>_Add -&gt;</label>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-remove</name>
-	    <can_focus>True</can_focus>
-	    <label>&lt;- _Remove</label>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Placeholder</class>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button20</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button22</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-group-by</name>
-  <visible>False</visible>
-  <title>Group</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox4</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox24</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox13</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-1</name>
-	  <label>Group Items By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-1</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:09 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox8</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-1</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-1</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label9</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox14</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label11</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-2</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-2</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:14 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox10</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-2</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-2</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label19</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox15</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label13</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-3</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-3</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:18 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox12</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-3</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-3</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label17</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox16</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label16</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label15</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-4</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox8</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox13</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-4</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox14</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-4</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>group-4</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area4</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button39</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Clear All</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button41</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button42</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-sort</name>
-  <visible>False</visible>
-  <title>Sort</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox15</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table5</name>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-4</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox9</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-4</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 08:33:52 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox17</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-4</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-4</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-4</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-4</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-3</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox10</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment2</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-3</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:22 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox19</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-3</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-3</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-3</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-3</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-2</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox11</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment3</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-2</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:15 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox21</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-2</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-2</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-2</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-2</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-1</name>
-	<label>Sort Items By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox12</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment4</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-1</name>
-	      <can_focus>True</can_focus>
-	      <has_focus>True</has_focus>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:00 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox23</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-1</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-1</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-1</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-1</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Clear All</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button45</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>e-table-config</name>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomePropertyBox:notebook</child_name>
-    <name>notebook1</name>
-    <show_tabs>False</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>top-frame</name>
-      <border_width>2</border_width>
-      <label>Description</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table1</name>
-	<border_width>2</border_width>
-	<rows>3</rows>
-	<columns>3</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label2</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label3</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label4</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button15</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_fields_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:11:12 GMT</last_modification_time>
-	  </signal>
-	  <label>_Fields...</label>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-sort</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_sort_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:10:58 GMT</last_modification_time>
-	  </signal>
-	  <label>_Sort...</label>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-group</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_group_by_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:10:50 GMT</last_modification_time>
-	  </signal>
-	  <label>_Group By...</label>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-group</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-sort</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-fields</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label20</name>
-      <label>label20</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-config.glade.h b/widgets/table/e-table-config.glade.h
deleted file mode 100644
index 4218ce256a..0000000000
--- a/widgets/table/e-table-config.glade.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Show Fields");
-gchar *s = N_("A_vailable Fields:");
-gchar *s = N_("Sh_ow these fields in order:");
-gchar *s = N_("Table HERE");
-gchar *s = N_("Table HERE");
-gchar *s = N_("Move _Up");
-gchar *s = N_("Move _Down");
-gchar *s = N_("_Add ->");
-gchar *s = N_("<- _Remove");
-gchar *s = N_("Group");
-gchar *s = N_("Group Items By");
-gchar *s = N_("Show field in View");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Then By");
-gchar *s = N_("Show field in View");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Then By");
-gchar *s = N_("Show field in View");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Then By");
-gchar *s = N_("Show field in View");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Clear All");
-gchar *s = N_("Sort");
-gchar *s = N_("Then By");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Then By");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Then By");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Sort Items By");
-gchar *s = N_("Ascending");
-gchar *s = N_("Descending");
-gchar *s = N_("Clear All");
-gchar *s = N_("Description");
-gchar *s = N_("_Fields...");
-gchar *s = N_("_Sort...");
-gchar *s = N_("_Group By...");
-gchar *s = N_("label20");
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
deleted file mode 100644
index 28eb8600e2..0000000000
--- a/widgets/table/e-table-config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CONFIG_H_
-#define _E_TABLE_CONFIG_H_
-
-#include <gnome.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/widgets/gtk-combo-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CONFIG_TYPE        (e_table_config_get_type ())
-#define E_TABLE_CONFIG(o)          (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_TYPE, ETableConfig))
-#define E_TABLE_CONFIG_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_TYPE, ETableConfigClass))
-#define E_IS_TABLE_CONFIG(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CONFIG_TYPE))
-#define E_IS_TABLE_CONFIG_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CONFIG_TYPE))
-
-typedef struct {
-	GtkComboText *combo;
-	GtkWidget    *frames;
-	GtkWidget    *radio_ascending;
-	GtkWidget    *radio_descending;
-	GtkWidget    *view_check; /* Only for group dialog */
-	guint         changed_id, toggled_id;
-	void *e_table_config;
-} ETableConfigSortWidgets; 
-
-
-typedef struct {
-	GtkObject parent;
-
-	/*
-	 * Our various dialog boxes
-	 */
-	GtkWidget *dialog_toplevel;
-	GtkWidget *dialog_show_fields;
-	GtkWidget *dialog_group_by;
-	GtkWidget *dialog_sort;
-
-	/*
-	 * The state we manipulate
-	 */
-	ETableSpecification *source_spec;
-	ETableState         *source_state, *state, *temp_state;
-
-	GtkWidget *sort_label;
-	GtkWidget *group_label;
-	GtkWidget *fields_label;
-
-	ETableConfigSortWidgets sort [4];
-	ETableConfigSortWidgets group [4];
-
-	/*
-	 * List of valid column names
-	 */
-	GSList *column_names;
-} ETableConfig;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void        (*changed)        (ETableConfig *config);
-} ETableConfigClass;
-
-GtkType       e_table_config_get_type  (void);
-ETableConfig *e_table_config_new       (const char          *header,
-					ETableSpecification *spec,
-					ETableState         *state);
-ETableConfig *e_table_config_construct (ETableConfig        *etco,
-					const char          *header,
-					ETableSpecification *spec,
-					ETableState         *state);
-void          e_table_config_raise     (ETableConfig        *config);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CONFIG_H */
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
deleted file mode 100644
index 23bca8bc64..0000000000
--- a/widgets/table/e-table-defines.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __E_TABLE_DEFINES__
-#define __E_TABLE_DEFINES__ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define BUTTON_HEIGHT        10
-#define BUTTON_PADDING       2
-#define GROUP_INDENT         (BUTTON_HEIGHT + (BUTTON_PADDING * 2))
-
-/* Padding around the contents of a header button */
-#define HEADER_PADDING 1
-
-#define MIN_ARROW_SIZE 10
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index a3be8dedd0..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * 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.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
deleted file mode 100644
index dcc7e244a1..0000000000
--- a/widgets/table/e-table-example-2.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "table-test.h"
-
-/*
-One way in which we make it simpler to build an ETableModel is through
-the ETableSimple class.  Instead of creating your own ETableModel
-class, you simply create a new object of the ETableSimple class.  You
-give it a bunch of functions that act as callbacks.
-
-You also get to pass a void * to ETableSimple and it gets passed to
-your callbacks.  This would be for having multiple models of the same
-type.  This is just an example though, so we statically define all the
-data and ignore the void *data parameter.
-
-In our example we will be creating a table model with 6 columns and 10
-rows.  This corresponds to having 6 different types of information and
-10 different sets of data in our database.
-
-The headers will be hard coded, as will be the example data.
-
-*/
-
-/*
-  There are two different meanings to the word "column".  The first is
-  the model column.  A model column corresponds to a specific type of
-  data.  This is very much like the usage in a database table where a
-  column is a field in the database.
-
-  The second type of column is a view column.  A view column
-  corresponds to a visually displayed column.  Each view column
-  corresponds to a specific model column, though a model column may
-  have any number of view columns associated with it, from zero to
-  greater than one.
-
-  Also, a view column doesn't necessarily depend on only one model
-  column.  In some cases, the view column renderer can be given a
-  reference to another column to get extra information about its
-  display.
-*/
-
-#define ROWS 10
-#define VIEW_COLS 4
-#define PHYSICAL_COLS 5
-#define VIRTUAL_COLS 6
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/* Here we define the initial layout of the table.  This is an xml
-   format that allows you to change the initial ordering of the
-   columns or to do sorting or grouping initially.  This specification
-   shows all 5 columns, but moves the importance column nearer to the
-   front.  It also sorts by the "Full Name" column (ascending.)
-   Sorting and grouping take the model column as their arguments
-   (sorting is specified by the "column" argument to the leaf elemnt. */
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \
-</ETableSpecification>"
-
-char *headers[VIEW_COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/* Virtual Column list:
-   0   Full Name
-   1   Email
-   2   Address
-   3   Phone
-   4   Importance field.  This field will be a boolean.  It also has a
-       special header, so doesn't appear in the headers list.
-   5   Color field.  This column is also not displayed.  It is also
-       not stored in the database.  It's calculated based on the
-       Importance field.
-*/
-
-char *table_data[ROWS][VIEW_COLS];
-gboolean importance_data[ROWS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/* Since our model is a constant size, we can just return its size in
-   the column and row count fields. */
-
-static GdkColor *color1;
-static GdkColor *color2;
-
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return VIRTUAL_COLS;
-}
-
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	if (col == COLOR_COLUMN){
-		if (importance_data[row]){
-			return color1;
-		} else {
-			return color2;
-		}
-	} else if (col == IMPORTANCE_COLUMN){
-		return (gpointer) importance_data[row];
-	} else {
-		return (void *) table_data [row][col];
-	}
-}
-
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	if (col == COLOR_COLUMN){ 
-	} else if (col == IMPORTANCE_COLUMN){
-		importance_data[row] = (gboolean) val;
-	} else {
-		g_free (table_data [row][col]);
-		table_data [row][col] = g_strdup (val);
-	}
-}
-
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	if (col == IMPORTANCE_COLUMN)
-		return FALSE;
-	else
-		return TRUE;
-}
-
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return (void *) value;
-	} else if (col == IMPORTANCE_COLUMN){
-		return (void *) value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-	} else if (col == IMPORTANCE_COLUMN){
-	} else {
-		g_free (value);
-	}
-}
-
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return NULL;
-	} else if (col == IMPORTANCE_COLUMN){
-		return NULL;
-	} else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return value == NULL;
-	} else if (col == IMPORTANCE_COLUMN){
-		return value == NULL;
-	} else {
-		return !(value && *(char *)value);
-	}
-}
-
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return g_strdup_printf("%d", (int) value);
-	} else if (col == IMPORTANCE_COLUMN){
-		return g_strdup_printf("%d", (int) value);
-	} else {
-		return g_strdup(value);
-	}
-}
-
-/* We create a window containing our new table. */
-static void
-create_table ()
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ECell *cell_checkbox;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-	ETableCol *ecol;
-	GdkPixbuf *pixbuf;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < VIEW_COLS; j++){
-			table_data[i][j] = g_strdup ("");
-		}
-		importance_data[i] = FALSE;
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value,
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	  Next we create a header.  The ETableHeader is used in two
-	  different way.  The first is the full_header.  This is the
-	  list of possible columns in the view.  The second use is
-	  completely internal.  Many of the ETableHeader functions are
-	  for that purpose.  The only functions we really need are
-	  e_table_header_new and e_table_header_add_col.
-
-	  First we create the header.  */
-	e_table_header = e_table_header_new ();
-	
-	/* Next we have to build renderers for all of the columns.
-	   Since all our columns are text columns, we can simply use
-	   the same renderer over and over again.  If we had different
-	   types of columns, we could use a different renderer for
-	   each column. */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/* Next we create a column object for each view column and add
-	   them to the header.  We don't create a column object for
-	   the importance column since it will not be shown. */
-	for (i = 0; i < VIEW_COLS; i++){
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-       
-	/* Next we add a special column for the check box. */
-
-	cell_checkbox = e_cell_checkbox_new ();
-	pixbuf = gdk_pixbuf_new_from_file ("clip.png");
-	ecol = e_table_col_new_with_pixbuf (i, pixbuf, 0.0, 18, cell_checkbox, g_int_compare, TRUE);
-	e_table_header_add_column (e_table_header, ecol, i);
-
-	/*
-	 * Setup GUI
-	 */
-	/* Here we create a window for our new table.  This window
-	   will get shown and the person will be able to test their
-	   item. */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-	/* 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.  */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
deleted file mode 100644
index 05642f1022..0000000000
--- a/widgets/table/e-table-extras.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-extras.c: Pair of hash table sort of thingies.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/e-table/e-cell-text.h"
-#include "gal/e-table/e-cell-checkbox.h"
-#include "gal/e-table/e-cell-date.h"
-#include "gal/e-table/e-cell-number.h"
-#include "gal/e-table/e-cell-pixbuf.h"
-#include "gal/e-table/e-cell-size.h"
-#include "gal/e-table/e-cell-tree.h"
-#include "e-table-extras.h"
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *ete_parent_class;
-
-static void
-cell_hash_free(gchar	*key,
-	       ECell    *cell,
-	       gpointer	user_data)
-{
-	g_free(key);
-	if (cell)
-		gtk_object_unref( GTK_OBJECT (cell));
-}
-
-static void
-pixbuf_hash_free(gchar	*key,
-		 GdkPixbuf *pixbuf,
-		 gpointer	user_data)
-{
-	g_free(key);
-	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
-}
-
-static void
-ete_destroy (GtkObject *object)
-{
-	ETableExtras *ete = E_TABLE_EXTRAS (object);
-
-	g_hash_table_foreach (ete->cells, (GHFunc) cell_hash_free, NULL);
-	g_hash_table_foreach (ete->compares, (GHFunc) g_free, NULL);
-	g_hash_table_foreach (ete->pixbufs, (GHFunc) pixbuf_hash_free, NULL);
-
-	g_hash_table_destroy (ete->cells);
-	g_hash_table_destroy (ete->compares);
-	g_hash_table_destroy (ete->pixbufs);
-
-	ete->cells = NULL;
-	ete->compares = NULL;
-	ete->pixbufs = NULL;
-
-	GTK_OBJECT_CLASS (ete_parent_class)->destroy (object);
-}
-
-static void
-ete_class_init (GtkObjectClass *klass)
-{
-	ete_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = ete_destroy;
-}
-
-static void
-ete_init (ETableExtras *extras)
-{
-	extras->cells = g_hash_table_new(g_str_hash, g_str_equal);
-	extras->compares = g_hash_table_new(g_str_hash, g_str_equal);
-	extras->pixbufs = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_table_extras_add_compare(extras, "string", g_str_compare);
-	e_table_extras_add_compare(extras, "integer", g_int_compare);
-
-	e_table_extras_add_cell(extras, "checkbox", e_cell_checkbox_new());
-	e_table_extras_add_cell(extras, "date", e_cell_date_new (NULL, GTK_JUSTIFY_LEFT));
-	e_table_extras_add_cell(extras, "number", e_cell_number_new (NULL, GTK_JUSTIFY_RIGHT));
-	e_table_extras_add_cell(extras, "pixbuf", e_cell_pixbuf_new ());
-	e_table_extras_add_cell(extras, "size", e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT));
-	e_table_extras_add_cell(extras, "string", e_cell_text_new (NULL, GTK_JUSTIFY_LEFT));
-	e_table_extras_add_cell(extras, "tree-string", e_cell_tree_new (NULL, NULL, TRUE, e_cell_text_new (NULL, GTK_JUSTIFY_LEFT)));
-}
-
-E_MAKE_TYPE(e_table_extras, "ETableExtras", ETableExtras, ete_class_init, ete_init, PARENT_TYPE);
-
-ETableExtras *
-e_table_extras_new (void)
-{
-	ETableExtras *ete = gtk_type_new (E_TABLE_EXTRAS_TYPE);
-
-	return (ETableExtras *) ete;
-}
-
-void
-e_table_extras_add_cell     (ETableExtras *extras,
-			     char         *id,
-			     ECell        *cell)
-{
-	gchar *old_key;
-	ECell *old_cell;
-
-	if (g_hash_table_lookup_extended (extras->cells, id, (gpointer *)&old_key, (gpointer *)&old_cell)) {
-		g_free (old_key);
-		if (old_cell)
-			gtk_object_unref (GTK_OBJECT(old_cell));
-	}
-
-	if (cell) {
-		gtk_object_ref (GTK_OBJECT (cell));
-		gtk_object_sink (GTK_OBJECT (cell));
-	}
-	g_hash_table_insert (extras->cells, g_strdup(id), cell);
-}
-
-ECell *
-e_table_extras_get_cell     (ETableExtras *extras,
-			     char         *id)
-{
-	return g_hash_table_lookup(extras->cells, id);
-}
-
-void
-e_table_extras_add_compare  (ETableExtras *extras,
-			     char         *id,
-			     GCompareFunc  compare)
-{
-	gchar *old_key;
-	GCompareFunc old_compare;
-
-	if (g_hash_table_lookup_extended (extras->cells, id, (gpointer *)&old_key, (gpointer *)&old_compare)) {
-		g_free (old_key);
-	}
-
-	g_hash_table_insert(extras->compares, g_strdup(id), compare);
-}
-
-GCompareFunc
-e_table_extras_get_compare  (ETableExtras *extras,
-			     char         *id)
-{
-	return g_hash_table_lookup(extras->compares, id);
-}
-
-void
-e_table_extras_add_pixbuf     (ETableExtras *extras,
-			       char         *id,
-			       GdkPixbuf    *pixbuf)
-{
-	gchar *old_key;
-	GdkPixbuf *old_pixbuf;
-
-	if (g_hash_table_lookup_extended (extras->pixbufs, id, (gpointer *)&old_key, (gpointer *)&old_pixbuf)) {
-		g_free (old_key);
-		if (old_pixbuf)
-			gdk_pixbuf_unref (old_pixbuf);
-	}
-
-	if (pixbuf)
-		gdk_pixbuf_ref(pixbuf);
-	g_hash_table_insert (extras->pixbufs, g_strdup(id), pixbuf);
-}
-
-GdkPixbuf *
-e_table_extras_get_pixbuf     (ETableExtras *extras,
-			       char         *id)
-{
-	return g_hash_table_lookup(extras->pixbufs, id);
-}
diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h
deleted file mode 100644
index d39fe9066f..0000000000
--- a/widgets/table/e-table-extras.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_EXTRAS_H_
-#define _E_TABLE_EXTRAS_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-cell.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_EXTRAS_TYPE        (e_table_extras_get_type ())
-#define E_TABLE_EXTRAS(o)          (GTK_CHECK_CAST ((o), E_TABLE_EXTRAS_TYPE, ETableExtras))
-#define E_TABLE_EXTRAS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_EXTRAS_TYPE, ETableExtrasClass))
-#define E_IS_TABLE_EXTRAS(o)       (GTK_CHECK_TYPE ((o), E_TABLE_EXTRAS_TYPE))
-#define E_IS_TABLE_EXTRAS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_EXTRAS_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	GHashTable *cells;
-	GHashTable *compares;
-	GHashTable *pixbufs;
-} ETableExtras;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableExtrasClass;
-
-GtkType       e_table_extras_get_type     (void);
-ETableExtras *e_table_extras_new          (void);
-
-void          e_table_extras_add_cell     (ETableExtras *extras,
-					   char         *id,
-					   ECell        *cell);
-ECell        *e_table_extras_get_cell     (ETableExtras *extras,
-					   char         *id);
-
-void          e_table_extras_add_compare  (ETableExtras *extras,
-					   char         *id,
-					   GCompareFunc  compare);
-GCompareFunc  e_table_extras_get_compare  (ETableExtras *extras,
-					   char         *id);
-
-void          e_table_extras_add_pixbuf   (ETableExtras *extras,
-					   char         *id,
-					   GdkPixbuf    *pixbuf);
-GdkPixbuf    *e_table_extras_get_pixbuf   (ETableExtras *extras,
-					   char         *id);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_EXTRAS_H_ */
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
deleted file mode 100644
index 216c582753..0000000000
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser-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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-table-field-chooser-dialog.h"
-
-static void e_table_field_chooser_dialog_init		(ETableFieldChooserDialog		 *card);
-static void e_table_field_chooser_dialog_class_init	(ETableFieldChooserDialogClass	 *klass);
-static void e_table_field_chooser_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_dialog_destroy (GtkObject *object);
-static void e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, gint button);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DND_CODE,
-	ARG_FULL_HEADER,
-};
-
-GtkType
-e_table_field_chooser_dialog_get_type (void)
-{
-	static GtkType table_field_chooser_dialog_type = 0;
-
-	if (!table_field_chooser_dialog_type)
-		{
-			static const GtkTypeInfo table_field_chooser_dialog_info =
-			{
-				"ETableFieldChooserDialog",
-				sizeof (ETableFieldChooserDialog),
-				sizeof (ETableFieldChooserDialogClass),
-				(GtkClassInitFunc) e_table_field_chooser_dialog_class_init,
-				(GtkObjectInitFunc) e_table_field_chooser_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			table_field_chooser_dialog_type = gtk_type_unique (gnome_dialog_get_type (), &table_field_chooser_dialog_info);
-		}
-
-	return table_field_chooser_dialog_type;
-}
-
-static void
-e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = GNOME_DIALOG_CLASS (klass);
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	object_class->destroy = e_table_field_chooser_dialog_destroy;
-	object_class->set_arg = e_table_field_chooser_dialog_set_arg;
-	object_class->get_arg = e_table_field_chooser_dialog_get_arg;
-
-	dialog_class->clicked = e_table_field_chooser_dialog_clicked;
-
-	gtk_object_add_arg_type ("ETableFieldChooserDialog::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooserDialog::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-}
-
-static void
-e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_chooser_dialog)
-{
-	GtkWidget *widget;
-
-	e_table_field_chooser_dialog->etfc = NULL;
-	e_table_field_chooser_dialog->dnd_code = g_strdup("");
-	e_table_field_chooser_dialog->full_header = NULL;
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_table_field_chooser_dialog),
-				    GNOME_STOCK_BUTTON_CLOSE,
-				    NULL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_table_field_chooser_dialog), FALSE, TRUE, FALSE);
-
-	widget = e_table_field_chooser_new();
-	e_table_field_chooser_dialog->etfc = E_TABLE_FIELD_CHOOSER(widget);
-	
-	gtk_object_set(GTK_OBJECT(widget),
-		       "dnd_code", e_table_field_chooser_dialog->dnd_code,
-		       "full_header", e_table_field_chooser_dialog->full_header,
-		       NULL);
-	
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_table_field_chooser_dialog)->vbox),
-			   widget, TRUE, TRUE, 0);
-
-	gtk_widget_show(GTK_WIDGET(widget));
-}
-
-GtkWidget*
-e_table_field_chooser_dialog_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_table_field_chooser_dialog_get_type ()));
-	return widget;
-}
-
-static void
-e_table_field_chooser_dialog_destroy (GtkObject *object)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG (object);
-	g_free(etfcd->dnd_code);
-	if (etfcd->full_header)
-		gtk_object_unref(GTK_OBJECT(etfcd->full_header));
-}
-
-static void
-e_table_field_chooser_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG(object);
-	switch (arg_id){
-	case ARG_DND_CODE:
-		g_free(etfcd->dnd_code);
-		etfcd->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		if (etfcd->etfc)
-			gtk_object_set(GTK_OBJECT(etfcd->etfc),
-				       "dnd_code", etfcd->dnd_code,
-				       NULL);
-		break;
-	case ARG_FULL_HEADER:
-		if (etfcd->full_header)
-			gtk_object_unref(GTK_OBJECT(etfcd->full_header));
-		if (GTK_VALUE_OBJECT(*arg))
-			etfcd->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg));
-		else
-			etfcd->full_header = NULL;
-		if (etfcd->full_header)
-			gtk_object_ref(GTK_OBJECT(etfcd->full_header));
-		if (etfcd->etfc)
-			gtk_object_set(GTK_OBJECT(etfcd->etfc),
-				       "full_header", etfcd->full_header,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG(object);
-	switch (arg_id) {
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfcd->dnd_code);
-		break;
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etfcd->full_header);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, int button)
-{
-	if (button == 0)
-		gnome_dialog_close(dialog);
-}
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
deleted file mode 100644
index 502db6f473..0000000000
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-table-field-chooser-dialog.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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
-#define __E_TABLE_FIELD_CHOOSER_DIALOG_H__
-
-#include <gnome.h>
-#include <gal/e-table/e-table-field-chooser.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETableFieldChooserDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TABLE_FIELD_CHOOSER_DIALOG_TYPE			(e_table_field_chooser_dialog_get_type ())
-#define E_TABLE_FIELD_CHOOSER_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialog))
-#define E_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialogClass))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-
-
-typedef struct _ETableFieldChooserDialog       ETableFieldChooserDialog;
-typedef struct _ETableFieldChooserDialogClass  ETableFieldChooserDialogClass;
-
-struct _ETableFieldChooserDialog
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ETableFieldChooser *etfc;
-	gchar              *dnd_code;
-	ETableHeader       *full_header;
-};
-
-struct _ETableFieldChooserDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_table_field_chooser_dialog_new(void);
-GtkType    e_table_field_chooser_dialog_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
deleted file mode 100644
index 2241f5e29f..0000000000
--- a/widgets/table/e-table-field-chooser-item.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-view.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdnd.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-polygon.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-canvas.h"
-
-#include "e-table-header.h"
-#include "e-table-col-dnd.h"
-#include "e-table-defines.h"
-#include "e-table-header-utils.h"
-
-#include "e-table-field-chooser-item.h"
-
-#if 0
-enum {
-	BUTTON_PRESSED,
-	LAST_SIGNAL
-};
-
-static guint etfci_signals [LAST_SIGNAL] = { 0, };
-#endif
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasItemClass *etfci_parent_class;
-
-static void etfci_drop_table_header (ETableFieldChooserItem *etfci);
-
-enum {
-	ARG_0,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-static void
-etfci_destroy (GtkObject *object){
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
-
-	etfci_drop_table_header (etfci);
-	
-	gdk_font_unref(etfci->font);
-
-	if (GTK_OBJECT_CLASS (etfci_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (etfci_parent_class)->destroy) (object);
-}
-
-static gint
-etfci_find_button (ETableFieldChooserItem *etfci, double loc)
-{
-	int i;
-	int count;
-	double height = 0;
-	GtkStyle *style;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
-
-	count = e_table_header_count(etfci->full_header);
-	for (i = 0; i < count; i++) {
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, i);
-		height += e_table_header_compute_height (ecol, style, etfci->font);
-		if (height > loc)
-			return i;
-	}
-	return MAX(0, count - 1);
-}
-
-static void
-etfci_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double old_height;
-	int i;
-	int count;
-	double height = 0;
-	GtkStyle *style;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
-
-	old_height = etfci->height;
-
-	count = e_table_header_count(etfci->full_header);
-	for (i = 0; i < count; i++) {
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, i);
-		height += e_table_header_compute_height (ecol, style, etfci->font);
-	}
-
-	etfci->height = height;
-	
-	if (old_height != etfci->height)
-		e_canvas_item_request_parent_reflow(item);
-	
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)(item, affine, clip_path, flags);
-
-	i1.x = i1.y = 0;
-	i2.x = etfci->width;
-	i2.y = etfci->height;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-
-	if (item->x1 != c1.x ||
-	     item->y1 != c1.y ||
-	     item->x2 != c2.x ||
-	     item->y2 != c2.y)
-		{
-			gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-			item->x1 = c1.x;
-			item->y1 = c1.y;
-			item->x2 = c2.x;
-			item->y2 = c2.y;
-
-			gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), item);
-		}
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-}
-
-static void
-etfci_font_load (ETableFieldChooserItem *etfci, char *font)
-{
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
-	etfci->font = NULL;
-	
-	if (font)
-		etfci->font = gdk_fontset_load (font);
-
-	if (etfci->font == NULL) {
-		etfci->font = GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style->font;
-		gdk_font_ref(etfci->font);
-	}
-}
-
-static void
-etfci_drop_table_header (ETableFieldChooserItem *etfci)
-{
-	GtkObject *header;
-	
-	if (!etfci->full_header)
-		return;
-
-	header = GTK_OBJECT (etfci->full_header);
-	if (etfci->structure_change_id)
-		gtk_signal_disconnect (header, etfci->structure_change_id);
-	if (etfci->dimension_change_id)
-		gtk_signal_disconnect (header, etfci->dimension_change_id);
-	etfci->structure_change_id = 0;
-	etfci->dimension_change_id = 0;
-
-	if (header)
-		gtk_object_unref (header);
-	etfci->full_header = NULL;
-	etfci->height = 0;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void 
-structure_changed (ETableHeader *header, ETableFieldChooserItem *etfci)
-{
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-dimension_changed (ETableHeader *header, int col, ETableFieldChooserItem *etfci)
-{
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_add_table_header (ETableFieldChooserItem *etfci, ETableHeader *header)
-{
-	etfci->full_header = header;
-	gtk_object_ref (GTK_OBJECT (etfci->full_header));
-
-	etfci->structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC(structure_changed), etfci);
-	etfci->dimension_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC(dimension_changed), etfci);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableFieldChooserItem *etfci;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etfci = E_TABLE_FIELD_CHOOSER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_FULL_HEADER:
-		etfci_drop_table_header (etfci);
-		if (GTK_VALUE_OBJECT (*arg))
-			etfci_add_table_header (etfci, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_DND_CODE:
-		g_free(etfci->dnd_code);
-		etfci->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_WIDTH:
-		etfci->width = GTK_VALUE_DOUBLE (*arg);
-		gnome_canvas_item_request_update(item);
-		break;
-	}
-}
-
-static void
-etfci_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableFieldChooserItem *etfci;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etfci = E_TABLE_FIELD_CHOOSER_ITEM (o);
-
-	switch (arg_id){
-
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfci->dnd_code);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etfci->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etfci->height;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etfci_drag_data_get (GtkWidget          *widget,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     ETableFieldChooserItem *etfci)
-{
-	if (etfci->drag_col != -1) {
-		gchar *string = g_strdup_printf("%d", etfci->drag_col);
-		gtk_selection_data_set(selection_data,
-				       GDK_SELECTION_TYPE_STRING,
-				       sizeof(string[0]),
-				       string,
-				       strlen(string));
-		g_free(string);
-	}
-}
-
-static void
-etfci_drag_end (GtkWidget      *canvas, 
-		GdkDragContext *context,
-		ETableFieldChooserItem *etfci)
-{
-	etfci->drag_col = -1;
-}
-
-static void
-etfci_realize (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GdkWindow *window;
-
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)-> realize)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->realize)(item);
-
-	window = GTK_WIDGET (item->canvas)->window;
-
-	if (!etfci->font)
-		etfci_font_load (etfci, NULL);
-
-	etfci->drag_end_id = gtk_signal_connect (
-		GTK_OBJECT (item->canvas), "drag_end",
-		GTK_SIGNAL_FUNC (etfci_drag_end), etfci);
-	etfci->drag_data_get_id = gtk_signal_connect (
-		GTK_OBJECT (item->canvas), "drag_data_get",
-		GTK_SIGNAL_FUNC (etfci_drag_data_get), etfci);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_unrealize (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
-	etfci->font = NULL;
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), etfci->drag_end_id);
-	etfci->drag_end_id = 0;
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), etfci->drag_data_get_id);
-	etfci->drag_data_get_id = 0;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize)(item);
-}
-
-static void
-etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const int rows = e_table_header_count (etfci->full_header);
-	int y1, y2;
-	int row;
-	GtkStyle *style;
-	GtkStateType state;
-
-	style = GTK_WIDGET (canvas)->style;
-	state = GTK_WIDGET_STATE (canvas);
-
-	y1 = y2 = 0;
-	for (row = 0; row < rows; row++, y1 = y2){
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, row);
-
-		y2 += e_table_header_compute_height (ecol, style, etfci->font);
-		
-		if (y1 > (y + height))
-			break;
-
-		if (y2 < y)
-			continue;
-
-		e_table_header_draw_button (drawable, ecol,
-					    style, etfci->font, state,
-					    GTK_WIDGET (canvas), style->fg_gc[GTK_STATE_NORMAL],
-					    -x, y1 - y,
-					    width, height,
-					    etfci->width, y2 - y1,
-					    E_TABLE_COL_ARROW_NONE);
-	}
-}
-
-static double
-etfci_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-static gboolean
-etfci_maybe_start_drag (ETableFieldChooserItem *etfci, double x, double y)
-{
-	if (!etfci->maybe_drag)
-		return FALSE;
-
-	if (MAX (abs (etfci->click_x - x),
-		 abs (etfci->click_y - y)) <= 3)
-		return FALSE;
-
-	return TRUE;
-}
-
-static void
-etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, double y)
-{
-	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
-	GtkTargetList *list;
-	GdkDragContext *context;
-	ETableCol *ecol;
-	GdkPixmap *pixmap;
-	int drag_col;
-	int button_height;
-
-	GtkTargetEntry  etfci_drag_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	drag_col = etfci_find_button(etfci, y);
-
-	if (drag_col < 0 || drag_col > e_table_header_count(etfci->full_header))
-		return;
-
-	ecol = e_table_header_get_column (etfci->full_header, drag_col);
-
-	etfci->drag_col = ecol->col_idx;
-
-	etfci_drag_types[0].target = g_strdup_printf("%s-%s", etfci_drag_types[0].target, etfci->dnd_code);
-	list = gtk_target_list_new (etfci_drag_types, ELEMENTS (etfci_drag_types));
-	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free(etfci_drag_types[0].target);
-
-	button_height = e_table_header_compute_height (ecol, widget->style, etfci->font);
-	pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
-
-	e_table_header_draw_button (pixmap, e_table_header_get_column (etfci->full_header, drag_col),
-				    widget->style, etfci->font, GTK_WIDGET_STATE (widget),
-				    widget, widget->style->fg_gc[GTK_STATE_NORMAL],
-				    0, 0,
-				    etfci->width, button_height,
-				    etfci->width, button_height,
-				    E_TABLE_COL_ARROW_NONE);
-
-	gtk_drag_set_icon_pixmap        (context,
-					 gdk_window_get_colormap (widget->window),
-					 pixmap,
-					 NULL,
-					 etfci->width / 2,
-					 button_height / 2);
-	gdk_pixmap_unref (pixmap);
-	etfci->maybe_drag = FALSE;
-}
-
-/*
- * Handles the events on the ETableFieldChooserItem
- */
-static int
-etfci_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	int x, y;
-	
-	switch (e->type){
-	case GDK_MOTION_NOTIFY:
-		gnome_canvas_w2c (canvas, e->motion.x, e->motion.y, &x, &y);
-
-		if (etfci_maybe_start_drag (etfci, x, y))
-			etfci_start_drag (etfci, e, x, y);
-		break;
-		
-	case GDK_BUTTON_PRESS:
-		gnome_canvas_w2c (canvas, e->button.x, e->button.y, &x, &y);
-		
-		if (e->button.button == 1){
-			etfci->click_x = x;
-			etfci->click_y = y;
-			etfci->maybe_drag = TRUE;
-		}
-		break;
-		
-	case GDK_BUTTON_RELEASE: {
-		etfci->maybe_drag = FALSE;
-		break;
-	}
-	
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-etfci_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-
-	etfci_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy = etfci_destroy;
-	object_class->set_arg = etfci_set_arg;
-	object_class->get_arg = etfci_get_arg;
-
-	item_class->update      = etfci_update;
-	item_class->realize     = etfci_realize;
-	item_class->unrealize   = etfci_unrealize;
-	item_class->draw        = etfci_draw;
-	item_class->point       = etfci_point;
-	item_class->event       = etfci_event;
-	
-	gtk_object_add_arg_type ("ETableFieldChooserItem::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_FULL_HEADER);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::height", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-}
-
-static void
-etfci_init (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-
-	etfci->full_header = NULL;
-	
-	etfci->height = etfci->width = 0;
-
-	etfci->font = NULL;
-
-	etfci->structure_change_id = 0;
-	etfci->dimension_change_id = 0;
-
-	etfci->dnd_code = NULL;
-
-	etfci->maybe_drag = 0;
-	etfci->drag_end_id = 0;
-
-	e_canvas_item_set_reflow_callback(item, etfci_reflow);
-}
-
-GtkType
-e_table_field_chooser_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableFieldChooserItem",
-			sizeof (ETableFieldChooserItem),
-			sizeof (ETableFieldChooserItemClass),
-			(GtkClassInitFunc) etfci_class_init,
-			(GtkObjectInitFunc) etfci_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
deleted file mode 100644
index d91c36d52b..0000000000
--- a/widgets/table/e-table-field-chooser-item.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_FIELD_CHOOSER_ITEM_H_
-#define _E_TABLE_FIELD_CHOOSER_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_FIELD_CHOOSER_ITEM_TYPE        (e_table_field_chooser_item_get_type ())
-#define E_TABLE_FIELD_CHOOSER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItem))
-#define E_TABLE_FIELD_CHOOSER_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItemClass))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableHeader    *full_header;
-
-	double           height, width;
-
-	GdkFont         *font;
-
-	/*
-	 * Ids
-	 */
-	int structure_change_id, dimension_change_id;
-
-	gchar           *dnd_code;
-
-	/*
-	 * For dragging columns
-	 */
-	guint            maybe_drag:1;
-	int              click_x, click_y;
-	int              drag_col;
-	guint            drag_data_get_id;
-        guint            drag_end_id;
-} ETableFieldChooserItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-} ETableFieldChooserItemClass;
-
-GtkType    e_table_field_chooser_item_get_type (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_FIELD_CHOOSER_ITEM_H_ */
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
deleted file mode 100644
index a27416a6ba..0000000000
--- a/widgets/table/e-table-field-chooser.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-table-field-chooser.h"
-#include "e-table-field-chooser-item.h"
-
-static void e_table_field_chooser_init		(ETableFieldChooser		 *card);
-static void e_table_field_chooser_class_init	(ETableFieldChooserClass	 *klass);
-static void e_table_field_chooser_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_destroy (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-};
-
-GtkType
-e_table_field_chooser_get_type (void)
-{
-	static GtkType table_field_chooser_type = 0;
-
-	if (!table_field_chooser_type)
-		{
-			static const GtkTypeInfo table_field_chooser_info =
-			{
-				"ETableFieldChooser",
-				sizeof (ETableFieldChooser),
-				sizeof (ETableFieldChooserClass),
-				(GtkClassInitFunc) e_table_field_chooser_class_init,
-				(GtkObjectInitFunc) e_table_field_chooser_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			table_field_chooser_type = gtk_type_unique (gtk_vbox_get_type (), &table_field_chooser_info);
-		}
-
-	return table_field_chooser_type;
-}
-
-static void
-e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkVBoxClass *vbox_class;
-
-	object_class = (GtkObjectClass*) klass;
-	vbox_class = (GtkVBoxClass *) klass;
-
-	glade_gnome_init();
-
-	parent_class = gtk_type_class (gtk_vbox_get_type ());
-
-	object_class->set_arg = e_table_field_chooser_set_arg;
-	object_class->get_arg = e_table_field_chooser_get_arg;
-	object_class->destroy = e_table_field_chooser_destroy;
-	gtk_object_add_arg_type ("ETableFieldChooser::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooser::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETableFieldChooser *etfc)
-{
-	double height;
-	etfc->last_alloc = *allocation;
-	gnome_canvas_item_set( etfc->item,
-			       "width", (double) allocation->width,
-			       NULL );
-	gtk_object_get(GTK_OBJECT(etfc->item),
-		       "height", &height,
-		       NULL);
-	height = MAX(height, allocation->height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS( etfc->canvas ), 0, 0, allocation->width - 1, height - 1);
-	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
-			       NULL );
-}
-
-static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc)
-{
-	double height;
-	gtk_object_get(GTK_OBJECT(etfc->item),
-		       "height", &height,
-		       NULL);
-
-	height = MAX(height, etfc->last_alloc.height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(etfc->canvas), 0, 0, etfc->last_alloc.width - 1, height - 1);
-	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) etfc->last_alloc.width,
-			       "y2", (double) height,
-			       NULL );	
-}
-
-static void
-e_table_field_chooser_init (ETableFieldChooser *etfc)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-field-chooser.glade", NULL);
-	etfc->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "vbox-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_reparent(widget,
-			    GTK_WIDGET(etfc));
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
-
-	etfc->rect = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS( etfc->canvas ) ),
-					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
-					   "fill_color", "white",
-					   NULL );
-
-	etfc->item = gnome_canvas_item_new(gnome_canvas_root(etfc->canvas),
-					   e_table_field_chooser_item_get_type(),
-					   "width", (double) 100,
-					   "full_header", etfc->full_header,
-					   "dnd_code", etfc->dnd_code,
-					   NULL );
-
-	gtk_signal_connect( GTK_OBJECT( etfc->canvas ), "reflow",
-			    GTK_SIGNAL_FUNC( resize ),
-			    etfc);
-
-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( etfc->canvas ),
-					 0, 0,
-					 100, 100 );
-
-	/* Connect the signals */
-	gtk_signal_connect (GTK_OBJECT (etfc->canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (allocate_callback),
-			    etfc);
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	gtk_widget_show(widget);
-}
-
-static void
-e_table_field_chooser_destroy (GtkObject *object)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	g_free(etfc->dnd_code);
-	if (etfc->full_header)
-		gtk_object_unref(GTK_OBJECT(etfc->full_header));
-
-	if (etfc->gui)
-		gtk_object_unref(GTK_OBJECT(etfc->gui));
-}
-
-GtkWidget*
-e_table_field_chooser_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_table_field_chooser_get_type ()));
-	return widget;
-}
-
-static void
-e_table_field_chooser_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	switch (arg_id){
-	case ARG_DND_CODE:
-		g_free(etfc->dnd_code);
-		etfc->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		if (etfc->item)
-			gtk_object_set(GTK_OBJECT(etfc->item),
-				       "dnd_code", etfc->dnd_code,
-				       NULL);
-		break;
-	case ARG_FULL_HEADER:
-		if (etfc->full_header)
-			gtk_object_unref(GTK_OBJECT(etfc->full_header));
-		if (GTK_VALUE_OBJECT(*arg))
-			etfc->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg));
-		else
-			etfc->full_header = NULL;
-		if (etfc->full_header)
-			gtk_object_ref(GTK_OBJECT(etfc->full_header));
-		if (etfc->item)
-			gtk_object_set(GTK_OBJECT(etfc->item),
-				       "full_header", etfc->full_header,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	switch (arg_id) {
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfc->dnd_code);
-		break;
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etfc->full_header);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/table/e-table-field-chooser.glade b/widgets/table/e-table-field-chooser.glade
deleted file mode 100644
index a5cd37c2df..0000000000
--- a/widgets/table/e-table-field-chooser.glade
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-table-field-chooser</name>
-  <program_name>e-table-field-chooser</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-table-field-chooser.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-field-chooser</name>
-  <visible>False</visible>
-  <title>Field Chooser</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox-top</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>To add a column to your table, drag it into
-the location in which you want it to appear.</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<width>200</width>
-	<height>200</height>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>canvas-buttons</name>
-	  <creation_function>e_canvas_new</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 08 Jun 2000 07:27:33 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-field-chooser.glade.h b/widgets/table/e-table-field-chooser.glade.h
deleted file mode 100644
index a36bd6052c..0000000000
--- a/widgets/table/e-table-field-chooser.glade.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Field Chooser");
-gchar *s = N_("To add a column to your table, drag it into\n"
-              "the location in which you want it to appear.");
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
deleted file mode 100644
index ca9917549a..0000000000
--- a/widgets/table/e-table-field-chooser.h
+++ /dev/null
@@ -1,81 +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 the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TABLE_FIELD_CHOOSER_H__
-#define __E_TABLE_FIELD_CHOOSER_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETableFieldChooser - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TABLE_FIELD_CHOOSER_TYPE			(e_table_field_chooser_get_type ())
-#define E_TABLE_FIELD_CHOOSER(obj)			(GTK_CHECK_CAST ((obj), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooser))
-#define E_TABLE_FIELD_CHOOSER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooserClass))
-#define E_IS_TABLE_FIELD_CHOOSER(obj)		(GTK_CHECK_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-
-
-typedef struct _ETableFieldChooser       ETableFieldChooser;
-typedef struct _ETableFieldChooserClass  ETableFieldChooserClass;
-
-struct _ETableFieldChooser
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	GnomeCanvas *canvas;
-	GnomeCanvasItem *item;
-
-	GnomeCanvasItem *rect;
-	GtkAllocation last_alloc;
-
-	gchar *dnd_code;
-	ETableHeader *full_header;
-};
-
-struct _ETableFieldChooserClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_table_field_chooser_new(void);
-GtkType    e_table_field_chooser_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TABLE_FIELD_CHOOSER_H__ */
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
deleted file mode 100644
index 42d8fa0f49..0000000000
--- a/widgets/table/e-table-group-container.c
+++ /dev/null
@@ -1,1348 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group-container.h"
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/e-text/e-text.h"
-#include "e-table-defines.h"
-
-#define TITLE_HEIGHT         16
-
-#define PARENT_TYPE e_table_group_get_type ()
-
-static GnomeCanvasGroupClass *etgc_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_HEIGHT,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_FROZEN,
-	ARG_TABLE_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_TABLE_SELECTION_MODEL,
-	ARG_LENGTH_THRESHOLD,
-};
-
-typedef struct {
-	ETableGroup *child;
-	void *key;
-	char *string;
-	GnomeCanvasItem *text;
-	GnomeCanvasItem *rect;
-	gint count;
-} ETableGroupContainerChildNode;
-
-static EPrintable *
-etgc_get_printable (ETableGroup *etg);
-
-
-static void
-e_table_group_container_child_node_free (ETableGroupContainer          *etgc,
-					ETableGroupContainerChildNode *child_node)
-{
-	ETableGroup *etg = E_TABLE_GROUP (etgc);
-	ETableGroup *child = child_node->child;
-
-	gtk_object_destroy (GTK_OBJECT (child));
-	e_table_model_free_value (etg->model, etgc->ecol->col_idx,
-				  child_node->key);
-	g_free(child_node->string);
-	gtk_object_destroy (GTK_OBJECT (child_node->text));
-	gtk_object_destroy (GTK_OBJECT (child_node->rect));
-}
-
-static void
-e_table_group_container_list_free (ETableGroupContainer *etgc)
-{
-	ETableGroupContainerChildNode *child_node;
-	GList *list;
-
-	for (list = etgc->children; list; list = g_list_next (list)) {
-		child_node = (ETableGroupContainerChildNode *) list->data;
-		e_table_group_container_child_node_free (etgc, child_node);
-	}
-
-	g_list_free (etgc->children);
-}
-
-static void
-etgc_destroy (GtkObject *object)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-
-	if (etgc->font)
-		gdk_font_unref (etgc->font);
-		etgc->font = NULL;
-
-	if (etgc->ecol)
-		gtk_object_unref (GTK_OBJECT(etgc->ecol));
-
-	if (etgc->sort_info)
-		gtk_object_unref (GTK_OBJECT(etgc->sort_info));
-
-	if (etgc->table_selection_model)
-		gtk_object_unref (GTK_OBJECT(etgc->table_selection_model));
-
-	if (etgc->rect)
-		gtk_object_destroy (GTK_OBJECT(etgc->rect));
-
-	e_table_group_container_list_free (etgc);
-
-	GTK_OBJECT_CLASS (etgc_parent_class)->destroy (object);
-}
-
-/** 
- * e_table_group_container_construct
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @etgc: The %ETableGroupContainer.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: Which grouping level this is (Starts at 0 and sends n + 1 to any child %ETableGroups.
- *
- * This routine constructs the new %ETableGroupContainer.
- */
-void
-e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-				   ETableHeader *full_header,
-				   ETableHeader     *header,
-				   ETableModel *model, ETableSortInfo *sort_info, int n)
-{
-	ETableCol *col;
-	ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n);
-
-	col = e_table_header_get_column_by_col_idx(full_header, column.column);
-	if (col == NULL)
-		col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-
-	e_table_group_construct (parent, E_TABLE_GROUP (etgc), full_header, header, model);
-	etgc->ecol = col;
-	gtk_object_ref (GTK_OBJECT(etgc->ecol));
-	etgc->sort_info = sort_info;
-	gtk_object_ref (GTK_OBJECT(etgc->sort_info));
-	etgc->n = n;
-	etgc->ascending = column.ascending;
-
-	
-	etgc->font = gdk_font_load ("lucidasans-10");
-	if (!etgc->font){
-		etgc->font = GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas)->style->font;
-		
-		gdk_font_ref (etgc->font);
-	}
-	etgc->open = TRUE;
-}
-
-/** 
- * e_table_group_container_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: Which grouping level this is (Starts at 0 and sends n + 1 to any child %ETableGroups.
- *
- * %ETableGroupContainer is an %ETableGroup which groups by the nth
- * grouping of the %ETableSortInfo.  It creates %ETableGroups as
- * children.
- *
- * Returns: The new %ETableGroupContainer.
- */
-ETableGroup *
-e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header,
-			     ETableHeader     *header,
-			     ETableModel *model, ETableSortInfo *sort_info, int n)
-{
-	ETableGroupContainer *etgc;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	
-	etgc = gtk_type_new (e_table_group_container_get_type ());
-
-	e_table_group_container_construct (parent, etgc, full_header, header,
-					   model, sort_info, n);
-	return E_TABLE_GROUP (etgc);
-}
-
-
-static int
-etgc_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item);
-	gboolean return_val = TRUE;
-	gboolean change_focus = FALSE;
-	gboolean use_col = FALSE;
-	gint start_col = 0;
-	gint old_col;
-	EFocus direction = E_FOCUS_START;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab || 
-		    event->key.keyval == GDK_KP_Tab || 
-		    event->key.keyval == GDK_ISO_Left_Tab) {
-			change_focus = TRUE;
-			use_col      = TRUE;
-			start_col    = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0;
-			direction    = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Left ||
-			   event->key.keyval == GDK_KP_Left) {
-			change_focus = TRUE;
-			use_col      = TRUE;
-			start_col    = -1;
-			direction    = E_FOCUS_END;
-		} else if (event->key.keyval == GDK_Right ||
-			   event->key.keyval == GDK_KP_Right) {
-			change_focus = TRUE;
-			use_col   = TRUE;
-			start_col = 0;
-			direction = E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Down ||
-			   event->key.keyval == GDK_KP_Down) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Up ||
-			   event->key.keyval == GDK_KP_Up) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_END;
-		} else if (event->key.keyval == GDK_Return ||
-			   event->key.keyval == GDK_KP_Enter) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_START;
-		}
-		if (change_focus){		
-			GList *list;
-			for (list = etgc->children; list; list = list->next) {
-				ETableGroupContainerChildNode *child_node;
-				ETableGroup                   *child;
-
-				child_node = (ETableGroupContainerChildNode *)list->data;
-				child      = child_node->child;
-
-				if (e_table_group_get_focus (child)) {
-					old_col = e_table_group_get_focus_column (child);
-					if (old_col == -1)
-						old_col = 0;
-					if (start_col == -1)
-						start_col = e_table_header_count (e_table_group_get_header (child)) - 1;
-					
-					if (direction == E_FOCUS_END)
-						list = list->prev;
-					else
-						list = list->next;
-					
-					if (list) {
-						child_node = (ETableGroupContainerChildNode *)list->data;
-						child = child_node->child;
-						if (use_col)
-							e_table_group_set_focus (child, direction, start_col);
-						else
-							e_table_group_set_focus (child, direction, old_col);
-						return 1;
-					} else {
-						return 0;
-					}
-				}
-			}
-			if (direction == E_FOCUS_END)
-				list = g_list_last(etgc->children);
-			else
-				list = etgc->children;
-			if (list) {
-				ETableGroupContainerChildNode *child_node;
-				ETableGroup                   *child;
-
-				child_node = (ETableGroupContainerChildNode *)list->data;
-				child = child_node->child;
-
-				if (start_col == -1)
-					start_col = e_table_header_count (e_table_group_get_header (child)) - 1;
-
-				e_table_group_set_focus (child, direction, start_col);
-				return 1;
-			}
-		}
-		return_val = FALSE;
-		break;
-	default:
-		return_val = FALSE;
-		break;
-	}
-	if (return_val == FALSE) {
-		if (GNOME_CANVAS_ITEM_CLASS(etgc_parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->event (item, event);
-	}
-	return return_val;
-	
-}
-
-/* Realize handler for the text item */
-static void
-etgc_realize (GnomeCanvasItem *item)
-{
-	ETableGroupContainer *etgc;
-
-	if (GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->realize) (item);
-
-	etgc = E_TABLE_GROUP_CONTAINER (item);
-
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-/* Unrealize handler for the etgc item */
-static void
-etgc_unrealize (GnomeCanvasItem *item)
-{
-	ETableGroupContainer *etgc;
-
-	etgc = E_TABLE_GROUP_CONTAINER (item);
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize) (item);
-}
-
-static void
-compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node)
-{
-	gchar *text;
-	if (etgc->ecol->text)
-		text = g_strdup_printf ("%s : %s (%d item%s)",
-					etgc->ecol->text,
-					child_node->string,
-					(gint) child_node->count,
-					child_node->count == 1 ? "" : "s");
-	else
-		text = g_strdup_printf ("%s (%d item%s)",
-					child_node->string,
-					(gint) child_node->count,
-					child_node->count == 1 ? "" : "s");
-	gnome_canvas_item_set (child_node->text, 
-			       "text", text,
-			       NULL);
-	g_free (text);
-}
-
-static void
-child_cursor_change (ETableGroup *etg, int row,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_cursor_change (E_TABLE_GROUP (etgc), row);
-}
-
-static void
-child_cursor_activated (ETableGroup *etg, int row,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_cursor_activated (E_TABLE_GROUP (etgc), row);
-}
-
-static void
-child_double_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_double_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_right_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
-{
-	return e_table_group_right_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
-{
-	return e_table_group_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_key_press (ETableGroup *etg, int row, int col, GdkEvent *event,
-		 ETableGroupContainer *etgc)
-{
-	return e_table_group_key_press (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static ETableGroupContainerChildNode *
-create_child_node (ETableGroupContainer *etgc, void *val)
-{
-	ETableGroup *child;
-	ETableGroupContainerChildNode *child_node;
-	ETableGroup *etg = E_TABLE_GROUP(etgc);
-
-	child_node = g_new (ETableGroupContainerChildNode, 1);
-	child_node->rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP (etgc),
-						  gnome_canvas_rect_get_type (),
-						  "fill_color", "grey70",
-						  "outline_color", "grey50",
-						  NULL);
-	child_node->text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (etgc),
-						  e_text_get_type (),
-						  "font_gdk", etgc->font,
-						  "anchor", GTK_ANCHOR_SW,
-						  "fill_color", "black",
-						  "draw_background", FALSE,
-						  NULL);
-	child = e_table_group_new (GNOME_CANVAS_GROUP (etgc), etg->full_header,
-				   etg->header, etg->model, etgc->sort_info, etgc->n + 1);
-	gnome_canvas_item_set(GNOME_CANVAS_ITEM(child),
-			      "drawgrid", etgc->draw_grid,
-			      "drawfocus", etgc->draw_focus,
-			      "cursor_mode", etgc->cursor_mode,
-			      "table_selection_model", etgc->table_selection_model,
-			      "length_threshold", etgc->length_threshold,
-			      "minimum_width", etgc->minimum_width - GROUP_INDENT,
-			      NULL);
-
-	gtk_signal_connect (GTK_OBJECT (child), "cursor_change",
-			    GTK_SIGNAL_FUNC (child_cursor_change), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "cursor_activated",
-			    GTK_SIGNAL_FUNC (child_cursor_activated), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "double_click",
-			    GTK_SIGNAL_FUNC (child_double_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "right_click",
-			    GTK_SIGNAL_FUNC (child_right_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "click",
-			    GTK_SIGNAL_FUNC (child_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "key_press",
-			    GTK_SIGNAL_FUNC (child_key_press), etgc);
-	child_node->child = child;
-	child_node->key = e_table_model_duplicate_value (etg->model, etgc->ecol->col_idx, val);
-	child_node->string = e_table_model_value_to_string (etg->model, etgc->ecol->col_idx, val);
-	child_node->count = 0;
-
-	return child_node;
-}
-
-static void
-etgc_add (ETableGroup *etg, gint row)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row);
-	GCompareFunc comp = etgc->ecol->compare;
-	GList *list = etgc->children;
-	ETableGroup *child;
-	ETableGroupContainerChildNode *child_node;
-	int i = 0;
-
-	for (; list; list = g_list_next (list), i++){
-		int comp_val;
-
-		child_node = list->data;
-		comp_val = (*comp)(child_node->key, val);
-		if (comp_val == 0) {
-			child = child_node->child;
-			child_node->count ++;
-			e_table_group_add (child, row);
-			compute_text (etgc, child_node);
-			return;
-		}
-		if ((comp_val > 0 && etgc->ascending) ||
-		    (comp_val < 0 && (!etgc->ascending)))
-			break;
-	}
-	child_node = create_child_node (etgc, val);
-	child = child_node->child;
-	child_node->count = 1;
-	e_table_group_add (child, row);
-
-	if (list)
-		etgc->children = g_list_insert (etgc->children, child_node, i);
-	else
-		etgc->children = g_list_append (etgc->children, child_node);
-
-	compute_text (etgc, child_node);
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-static void
-etgc_add_array (ETableGroup *etg, const int *array, int count)
-{
-	int i;
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	void *lastval = 0;
-	int laststart = 0;
-	GCompareFunc comp = etgc->ecol->compare;
-	ETableGroupContainerChildNode *child_node;
-	ETableGroup *child;
-
-	if (count <= 0)
-		return;
-
-	e_table_group_container_list_free (etgc);
-	etgc->children = NULL;
-
-	lastval = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[0]);
-
-	for (i = 1; i < count; i++) {
-		void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[i]);
-		int comp_val;
-
-		comp_val = (*comp)(lastval, val);
-		if (comp_val != 0) {
-			child_node = create_child_node(etgc, lastval);
-			child = child_node->child;
-
-			e_table_group_add_array(child, array + laststart, i - laststart);
-			child_node->count = i - laststart;
-
-			etgc->children = g_list_append (etgc->children, child_node);
-			compute_text (etgc, child_node);
-			laststart = i;
-			lastval = val;
-		}
-	}
-
-	child_node = create_child_node(etgc, lastval);
-	child = child_node->child;
-
-	e_table_group_add_array(child, array + laststart, i - laststart);
-	child_node->count = i - laststart;
-
-	etgc->children = g_list_append (etgc->children, child_node);
-	compute_text (etgc, child_node);
-
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-static void
-etgc_add_all (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	ESorter *sorter = E_SELECTION_MODEL(etgc->table_selection_model)->sorter;
-	int *array;
-	int count;
-
-	e_sorter_get_sorted_to_model_array(sorter, &array, &count);
-
-	etgc_add_array(etg, array, count);
-}
-
-static gboolean
-etgc_remove (ETableGroup *etg, gint row)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list;
-
-	for (list = etgc->children ; list; list = g_list_next (list)) {
-		ETableGroupContainerChildNode *child_node = list->data;
-		ETableGroup                   *child = child_node->child;
-
-		if (e_table_group_remove (child, row)) {
-			child_node->count --;
-			if (child_node->count == 0) {
-				e_table_group_container_child_node_free (etgc, child_node);
-				etgc->children = g_list_remove (etgc->children, child_node);
-				g_free (child_node);
-			} else
-				compute_text (etgc, child_node);
-
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static int
-etgc_row_count (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list;
-	gint count = 0;
-	for (list = etgc->children; list; list = g_list_next(list)) {
-		ETableGroup *group = ((ETableGroupContainerChildNode *)list->data)->child;
-		gint this_count = e_table_group_row_count(group);
-		count += this_count;
-	}
-	return count;
-}
-
-static void
-etgc_increment (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list = etgc->children;
-
-	for (list = etgc->children ; list; list = g_list_next (list))
-		e_table_group_increment (((ETableGroupContainerChildNode *)list->data)->child,
-					 position, amount);
-}
-
-static void
-etgc_decrement (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list = etgc->children;
-
-	for (list = etgc->children ; list; list = g_list_next (list))
-		e_table_group_decrement (((ETableGroupContainerChildNode *)list->data)->child,
-					 position, amount);
-}
-
-static void
-etgc_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	if (etgc->children) {
-		if (direction == E_FOCUS_END)
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)g_list_last (etgc->children)->data)->child,
-						 direction, view_col);
-		else
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)etgc->children->data)->child,
-						 direction, view_col);
-	}
-}
-
-static gint
-etgc_get_focus_column (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	if (etgc->children) {
-		GList *list;
-		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			ETableGroup *child = child_node->child;
-			if (e_table_group_get_focus (child)) {
-				return e_table_group_get_focus_column (child);
-			}
-		}
-	}
-	return 0;
-}
-
-static void
-etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-
-	if (row)
-		*row = -1;
-	if (col)
-		*col = -1;
-
-	*x -= GROUP_INDENT;
-	*y -= TITLE_HEIGHT;
-
-	if (*x >= 0 && *y >= 0 && etgc->children) {
-		GList *list;
-		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			ETableGroup *child = child_node->child;
-
-			e_table_group_compute_location (child, x, y, row, col);
-			if ((*row != -1) && (*col != -1))
-				return;
-		}
-	}
-}
-
-static void etgc_thaw (ETableGroup *etg)
-{
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(etg));
-}
-
-static void
-etgc_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-	GList *list;
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		if (GTK_VALUE_BOOL (*arg))
-			etg->frozen = TRUE;
-		else {
-			etg->frozen = FALSE;
-			etgc_thaw (etg);
-		}
-		break;
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		etgc->minimum_width = GTK_VALUE_DOUBLE(*arg);
-
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"minimum_width", etgc->minimum_width - GROUP_INDENT,
-					NULL);
-		}
-		break;
-	case ARG_LENGTH_THRESHOLD:
-		etgc->length_threshold = GTK_VALUE_INT (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"length_threshold", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_SELECTION_MODEL:
-		if (etgc->table_selection_model)
-			gtk_object_unref(GTK_OBJECT(etgc->table_selection_model));
-		etgc->table_selection_model = E_TABLE_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg));
-		if (etgc->table_selection_model)
-			gtk_object_ref(GTK_OBJECT(etgc->table_selection_model));
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"table_selection_model", etgc->table_selection_model,
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_DRAW_GRID:
-		etgc->draw_grid = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"drawgrid", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		etgc->draw_focus = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"drawfocus", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		etgc->cursor_mode = GTK_VALUE_INT (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"cursor_mode", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-etgc_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		GTK_VALUE_BOOL (*arg) = etg->frozen;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etgc->height;
-		break;
-	case ARG_WIDTH:	
-		GTK_VALUE_DOUBLE (*arg) = etgc->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		etgc->minimum_width = GTK_VALUE_DOUBLE(*arg);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etgc_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS(object_class);
-
-	object_class->destroy = etgc_destroy;
-	object_class->set_arg = etgc_set_arg;
-	object_class->get_arg = etgc_get_arg;
-
-	item_class->event = etgc_event;
-	item_class->realize = etgc_realize;
-	item_class->unrealize = etgc_unrealize;
-
-	etgc_parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_group_class->add = etgc_add;
-	e_group_class->add_array = etgc_add_array;
-	e_group_class->add_all = etgc_add_all;
-	e_group_class->remove = etgc_remove;
-	e_group_class->increment  = etgc_increment;
-	e_group_class->decrement  = etgc_decrement;
-	e_group_class->row_count  = etgc_row_count;
-	e_group_class->set_focus  = etgc_set_focus;
-	e_group_class->get_focus_column = etgc_get_focus_column;
-	e_group_class->get_printable = etgc_get_printable;
-	e_group_class->compute_location = etgc_compute_location;
-
-	gtk_object_add_arg_type ("ETableGroupContainer::drawgrid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupContainer::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableGroupContainer::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableGroupContainer::table_selection_model", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE_SELECTION_MODEL);
-	gtk_object_add_arg_type ("ETableGroupContainer::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-
-	gtk_object_add_arg_type ("ETableGroupContainer::frozen", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_FROZEN);
-	gtk_object_add_arg_type ("ETableGroupContainer::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableGroupContainer::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupContainer::minimum_width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH);
-}
-
-static void
-etgc_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item);
-	gboolean frozen;
-
-        gtk_object_get (GTK_OBJECT(etgc), 
-			"frozen", &frozen,
-			NULL);
-
-	if (frozen)
-		return;
-	
-
-	if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){
-		gdouble running_height = 0;
-		gdouble running_width = 0;
-		gdouble old_height;
-		gdouble old_width;
-		
-		old_height = etgc->height;
-		old_width = etgc->width;
-		if (etgc->children == NULL){
-		} else {
-			GList *list;
-			gdouble extra_height = 0;
-			gdouble item_height = 0;
-			gdouble item_width = 0;
-			
-			if (etgc->font)
-				extra_height += etgc->font->ascent + etgc->font->descent + BUTTON_PADDING * 2;
-			
-			extra_height = MAX(extra_height, BUTTON_HEIGHT + BUTTON_PADDING * 2);
-				
-			running_height = extra_height;
-			
-			for ( list = etgc->children; list; list = g_list_next (list)){
-				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
-				ETableGroup *child = child_node->child;
-				
-				gtk_object_get (GTK_OBJECT(child),
-						"width", &item_width,
-						NULL);
-
-				if (item_width > running_width)
-					running_width = item_width;
-			}
-			for ( list = etgc->children; list; list = g_list_next (list)){
-				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
-				ETableGroup *child = child_node->child;
-				gtk_object_get (GTK_OBJECT(child),
-						"height", &item_height,
-						NULL);
-				
-				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child_node->text),
-							    GROUP_INDENT,
-							    running_height - BUTTON_PADDING);
-				
-				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child),
-							    GROUP_INDENT,
-							    running_height);
-				
-				gnome_canvas_item_set (GNOME_CANVAS_ITEM(child_node->rect),
-						      "x1", (double) 0,
-						      "x2", (double) running_width + GROUP_INDENT,
-						      "y1", (double) running_height - extra_height,
-						      "y2", (double) running_height + item_height,
-						      NULL);
-				
-				running_height += item_height + extra_height;
-			}
-			running_height -= extra_height;
-		}
-		if (running_height != old_height || running_width != old_width) {
-			etgc->height = running_height;
-			etgc->width = running_width;
-			e_canvas_item_request_parent_reflow (item);
-		}
-	}
-}
-
-static void
-etgc_init (GtkObject *object)
-{
-	ETableGroupContainer *container = E_TABLE_GROUP_CONTAINER(object);
-	container->children = FALSE;
-	
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM(object), etgc_reflow);
-
-	container->draw_grid = 1;
-	container->draw_focus = 1;
-	container->cursor_mode = E_CURSOR_SIMPLE;
-	container->length_threshold = -1;
-	container->table_selection_model = NULL;
-}
-
-E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE);
-
-void
-e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure)
-{
-	if (E_IS_TABLE_GROUP_CONTAINER (etg)){
-		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-		GList *list = etgc->children;
-
-		/* Protect from unrefs in the callback functions */
-		gtk_object_ref (GTK_OBJECT (etg));
-
-		for (list = etgc->children; list; list = list->next){
-			ETableGroupContainerChildNode *child_node = list->data;
-
-			e_table_group_apply_to_leafs (child_node->child, fn, closure);
-		}
-
-		gtk_object_unref (GTK_OBJECT (etg));
-	} else if (E_IS_TABLE_GROUP_LEAF (etg)){
-		(*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure);
-	} else {
-		g_error ("Unknown ETableGroup found: %s",
-			 gtk_type_name (GTK_OBJECT (etg)->klass->type));
-	}
-}
-
-
-typedef struct {
-	ETableGroupContainer *etgc;
-	GList *child;
-	EPrintable *child_printable;
-} ETGCPrintContext;
-
-#if 0
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height, gdouble r, gdouble g, gdouble b)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-#endif
-
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-
-#define TEXT_HEIGHT (12)
-#define TEXT_AREA_HEIGHT (TEXT_HEIGHT + 4)
-
-static void
-e_table_group_container_print_page  (EPrintable *ep,
-				     GnomePrintContext *context,
-				     gdouble width,
-				     gdouble height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
-{
-	gdouble yd = height;
-	gdouble child_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-	gchar *string;
-
-	GnomeFont *font = gnome_font_new ("Helvetica", TEXT_HEIGHT);
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable) {
-		if (child)
-			child_node = child->data;
-		else
-			child_node = NULL;
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	} else {
-		if (!child) {
-			return;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	while (1) {
-		child_height = e_printable_height(child_printable, context, width - 36, yd - TEXT_AREA_HEIGHT, quantize);
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 36, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 36, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_setrgbcolor(context, .7, .7, .7) == -1)
-			/* FIXME */;
-		if (gnome_print_fill(context) == -1)
-			/* FIXME */;
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_clip(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_moveto(context, 2, yd - (TEXT_AREA_HEIGHT + gnome_font_get_ascender(font) - gnome_font_get_descender(font)) / 2) == -1)
-			/* FIXME */;
-		if (gnome_print_setfont(context, font))
-			/* FIXME */;
-		if (groupcontext->etgc->ecol->text)
-			string = g_strdup_printf ("%s : %s (%d item%s)",
-						  groupcontext->etgc->ecol->text,
-						  child_node->string,
-						  (gint) child_node->count,
-						  child_node->count == 1 ? "" : "s");
-		else
-			string = g_strdup_printf ("%s (%d item%s)",
-						  child_node->string,
-						  (gint) child_node->count,
-						  child_node->count == 1 ? "" : "s");
-		if (gnome_print_show(context, string))
-			/* FIXME */;
-		g_free(string);
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_translate(context, 36, yd - TEXT_AREA_HEIGHT - child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width - 36, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width - 36, child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_clip(context) == -1)
-			/* FIXME */;
-		e_printable_print_page(child_printable, context, width - 36, child_height, quantize);
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		gp_draw_rect(context, 0, yd - child_height - TEXT_AREA_HEIGHT + 1, width, 1);
-		gp_draw_rect(context, width - 1, yd, 1, yd - child_height - TEXT_AREA_HEIGHT);
-		gp_draw_rect(context, 0, yd, 1, yd - child_height - TEXT_AREA_HEIGHT);
-
-		yd -= child_height + TEXT_AREA_HEIGHT;
-
-		if (e_printable_data_left(child_printable))
-			break;
-
-		child = child->next;
-		if (!child) {
-			child_printable = NULL;
-			break;
-		}
-
-		child_node = child->data;
-		if (child_printable)
-			gtk_object_unref(GTK_OBJECT(child_printable));
-		child_printable = e_table_group_get_printable(child_node->child);
-		if (child_printable)
-			gtk_object_ref(GTK_OBJECT(child_printable));
-		e_printable_reset(child_printable);
-	}
-
-	gp_draw_rect(context, 0, height, width, 1);
-
-	if (groupcontext->child_printable)
-		gtk_object_unref(GTK_OBJECT(groupcontext->child_printable));
-	groupcontext->child_printable = child_printable;
-	groupcontext->child = child;
-			
-}
-
-static gboolean
-e_table_group_container_data_left   (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
-{
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left");
-	return groupcontext->child != NULL;
-}
-
-static void
-e_table_group_container_reset       (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
-{
-	groupcontext->child = groupcontext->etgc->children;
-	if (groupcontext->child_printable)
-		gtk_object_unref(GTK_OBJECT(groupcontext->child_printable));
-	groupcontext->child_printable = NULL;
-}
-
-static gdouble
-e_table_group_container_height      (EPrintable *ep,
-				     GnomePrintContext *context,
-				     gdouble width,
-				     gdouble max_height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
-{
-	gdouble height = 0;
-	gdouble child_height;
-	gdouble yd = max_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable)
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	else {
-		if (!child) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-			return 0;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	if (yd != -1 && yd < TEXT_AREA_HEIGHT)
-		return 0;
-	
-	while (1) {
-		child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize);
-
-		height += child_height + TEXT_AREA_HEIGHT;
-
-		if (yd != -1) {
-			if (!e_printable_will_fit(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize)) {
-				break;
-			}
-
-			yd -= child_height + TEXT_AREA_HEIGHT;
-		}
-
-		child = child->next;
-		if (!child) {
-			break;
-		}
-		
-		child_node = child->data;
-		if (child_printable)
-			gtk_object_unref(GTK_OBJECT(child_printable));
-		child_printable = e_table_group_get_printable(child_node->child);
-		if (child_printable)
-			gtk_object_ref(GTK_OBJECT(child_printable));
-		e_printable_reset(child_printable);
-	}
-	if (child_printable)
-		gtk_object_unref(GTK_OBJECT(child_printable));
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-	return height;
-}
-
-static gboolean
-e_table_group_container_will_fit      (EPrintable *ep,
-				       GnomePrintContext *context,
-				       gdouble width,
-				       gdouble max_height,
-				       gboolean quantize,
-				       ETGCPrintContext *groupcontext)
-{
-	gboolean will_fit = TRUE;
-	gdouble child_height;
-	gdouble yd = max_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable)
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	else {
-		if (!child) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-			return will_fit;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-	
-	if (yd != -1 && yd < TEXT_AREA_HEIGHT)
-		will_fit = FALSE;
-	else {
-		while (1) {
-			child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize);
-			
-			if (yd != -1) {
-				if (!e_printable_will_fit(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize)) {
-					will_fit = FALSE;
-					break;
-				}
-				
-				yd -= child_height + TEXT_AREA_HEIGHT;
-			}
-			
-			child = child->next;
-			if (!child) {
-				break;
-			}
-			
-			child_node = child->data;
-			if (child_printable)
-				gtk_object_unref(GTK_OBJECT(child_printable));
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	if (child_printable)
-		gtk_object_unref(GTK_OBJECT(child_printable));
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-	return will_fit;
-}
-
-static void
-e_table_group_container_printable_destroy (GtkObject *object,
-				ETGCPrintContext *groupcontext)
-{
-	gtk_object_unref(GTK_OBJECT(groupcontext->etgc));
-	if (groupcontext->child_printable)
-		gtk_object_ref(GTK_OBJECT(groupcontext->child_printable));
-	g_free(groupcontext);
-}
-
-static EPrintable *
-etgc_get_printable (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	EPrintable *printable = e_printable_new();
-	ETGCPrintContext *groupcontext;
-
-	groupcontext = g_new(ETGCPrintContext, 1);
-	groupcontext->etgc = etgc;
-	gtk_object_ref(GTK_OBJECT(etgc));
-	groupcontext->child = etgc->children;
-	groupcontext->child_printable = NULL;
-
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "print_page",
-			    GTK_SIGNAL_FUNC(e_table_group_container_print_page),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "data_left",
-			    GTK_SIGNAL_FUNC(e_table_group_container_data_left),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "reset",
-			    GTK_SIGNAL_FUNC(e_table_group_container_reset),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "height",
-			    GTK_SIGNAL_FUNC(e_table_group_container_height),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "will_fit",
-			    GTK_SIGNAL_FUNC(e_table_group_container_will_fit),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "destroy",
-			    GTK_SIGNAL_FUNC(e_table_group_container_printable_destroy),
-			    groupcontext);
-
-	return printable;
-}
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
deleted file mode 100644
index 27ed807ffc..0000000000
--- a/widgets/table/e-table-group-container.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_CONTAINER_H_
-#define _E_TABLE_GROUP_CONTAINER_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-item.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_CONTAINER_TYPE        (e_table_group_container_get_type ())
-#define E_TABLE_GROUP_CONTAINER(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainer))
-#define E_TABLE_GROUP_CONTAINER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainerClass))
-#define E_IS_TABLE_GROUP_CONTAINER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_CONTAINER_TYPE))
-#define E_IS_TABLE_GROUP_CONTAINER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_CONTAINER_TYPE))
-
-typedef struct {
-	ETableGroup group;
-
-	/*
-	 * The ETableCol used to group this set
-	 */
-	ETableCol    *ecol;
-	gint          ascending;
-
-	/*
-	 * List of ETableGroups we stack
-	 */
-	GList *children;
-
-	/*
-	 * The canvas rectangle that contains the children
-	 */
-	GnomeCanvasItem *rect;
-
-	GdkFont *font;
-
-	gdouble width, height, minimum_width;
-
-	ETableSortInfo *sort_info;
-	int n;
-	int length_threshold;
-
-	ETableSelectionModel *table_selection_model;
-
-	guint draw_grid : 1;
-	guint draw_focus : 1;
-	ECursorMode cursor_mode;
-
-	/*
-	 * State: the ETableGroup is open or closed
-	 */
-	guint open:1;
-} ETableGroupContainer;
-
-typedef struct {
-	ETableGroupClass parent_class;
-} ETableGroupContainerClass;
-
-ETableGroup *e_table_group_container_new       (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, int n);
-void         e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-						ETableHeader *full_header,
-						ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, int n);
-
-GtkType      e_table_group_container_get_type  (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_CONTAINER_H_ */
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
deleted file mode 100644
index 35e7ef4f45..0000000000
--- a/widgets/table/e-table-group-leaf.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org ()
- *
- * Copyright 1999, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "e-table-sorted-variable.h"
-#include "e-table-sorted.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-
-#define PARENT_TYPE e_table_group_get_type ()
-
-static GnomeCanvasGroupClass *etgl_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_HEIGHT,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_FROZEN,
-	ARG_TABLE_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_LENGTH_THRESHOLD,
-	ARG_TABLE_SELECTION_MODEL,
-};
-
-static void etgl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void etgl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void
-etgl_destroy (GtkObject *object)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF(object);
-	if (etgl->ets)
-		gtk_object_unref (GTK_OBJECT(etgl->ets));
-	if (etgl->item)
-		gtk_object_destroy (GTK_OBJECT(etgl->item));
-	if (etgl->table_selection_model)
-		gtk_object_unref (GTK_OBJECT(etgl->table_selection_model));
-	if (GTK_OBJECT_CLASS (etgl_parent_class)->destroy)
-		GTK_OBJECT_CLASS (etgl_parent_class)->destroy (object);
-}
-
-static void
-e_table_group_leaf_construct (GnomeCanvasGroup *parent,
-			      ETableGroupLeaf  *etgl,
-			      ETableHeader     *full_header,
-			      ETableHeader     *header,
-			      ETableModel      *model,
-			      ETableSortInfo   *sort_info)
-{
-	etgl->is_grouped = e_table_sort_info_grouping_get_count(sort_info);
-	if (etgl->is_grouped)
-		etgl->ets = E_TABLE_SUBSET(e_table_sorted_variable_new (model, full_header, sort_info));
-	else
-		etgl->ets = E_TABLE_SUBSET(e_table_sorted_new (model, full_header, sort_info));
-	gtk_object_ref(GTK_OBJECT(etgl->ets));
-	gtk_object_sink(GTK_OBJECT(etgl->ets));
-	e_table_group_construct (parent, E_TABLE_GROUP (etgl), full_header, header, model);
-}
-
-/** 
- * e_table_group_leaf_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- *
- * %ETableGroupLeaf is an %ETableGroup which simply contains an
- * %ETableItem.
- *
- * Returns: The new %ETableGroupLeaf.
- */
-ETableGroup *
-e_table_group_leaf_new       (GnomeCanvasGroup *parent,
-			      ETableHeader     *full_header,
-			      ETableHeader     *header,
-			      ETableModel      *model,
-			      ETableSortInfo   *sort_info)
-{
-	ETableGroupLeaf *etgl;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	
-	etgl = gtk_type_new (e_table_group_leaf_get_type ());
-
-	e_table_group_leaf_construct (parent, etgl, full_header,
-				      header, model, sort_info);
-	return E_TABLE_GROUP (etgl);
-}
-
-static void
-etgl_cursor_change (GtkObject *object, gint row, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		e_table_group_cursor_change (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row]);
-}
-
-static void
-etgl_cursor_activated (GtkObject *object, gint row, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		e_table_group_cursor_activated (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row]);
-}
-
-static void
-etgl_double_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		e_table_group_double_click (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-}
-
-static gint
-etgl_key_press (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_key_press (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static gint
-etgl_right_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_right_click (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static gint
-etgl_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_click (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static void
-etgl_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableGroupLeaf *leaf = E_TABLE_GROUP_LEAF(item);
-	gtk_object_get(GTK_OBJECT(leaf->item),
-		       "height", &leaf->height,
-		       NULL);
-	gtk_object_get(GTK_OBJECT(leaf->item),
-		       "width", &leaf->width,
-		       NULL);
-	e_canvas_item_request_parent_reflow (item);
-}
-
-static void
-etgl_realize (GnomeCanvasItem *item)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF(item);
-
-	if (GNOME_CANVAS_ITEM_CLASS (etgl_parent_class)->realize)
-		GNOME_CANVAS_ITEM_CLASS (etgl_parent_class)->realize (item);
-
-	etgl->item = E_TABLE_ITEM(gnome_canvas_item_new (GNOME_CANVAS_GROUP(etgl),
-							 e_table_item_get_type (),
-							 "ETableHeader", E_TABLE_GROUP(etgl)->header,
-							 "ETableModel", etgl->ets,
-							 "drawgrid", etgl->draw_grid,
-							 "drawfocus", etgl->draw_focus,
-							 "cursor_mode", etgl->cursor_mode,
-							 "minimum_width", etgl->minimum_width,
-							 "length_threshold", etgl->length_threshold,
-							 "table_selection_model", etgl->table_selection_model,
-							 NULL));
-	
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "cursor_change",
-			    GTK_SIGNAL_FUNC(etgl_cursor_change), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "cursor_activated",
-			    GTK_SIGNAL_FUNC(etgl_cursor_activated), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "double_click",
-			    GTK_SIGNAL_FUNC(etgl_double_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "right_click",
-			    GTK_SIGNAL_FUNC(etgl_right_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "click",
-			    GTK_SIGNAL_FUNC(etgl_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "key_press",
-			    GTK_SIGNAL_FUNC(etgl_key_press), etgl);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-etgl_add (ETableGroup *etg, gint row)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add (E_TABLE_SUBSET_VARIABLE(etgl->ets), row);
-	}
-}
-
-static void
-etgl_add_array (ETableGroup *etg, const gint *array, gint count)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add_array (E_TABLE_SUBSET_VARIABLE(etgl->ets), array, count);
-	}
-}
-
-static void
-etgl_add_all (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add_all (E_TABLE_SUBSET_VARIABLE(etgl->ets));
-	}
-}
-
-static gboolean
-etgl_remove (ETableGroup *etg, gint row)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		return e_table_subset_variable_remove (E_TABLE_SUBSET_VARIABLE(etgl->ets), row);
-	}
-	return FALSE;
-}
-
-static void
-etgl_increment (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_increment (E_TABLE_SUBSET_VARIABLE(etgl->ets), position, amount);
-	}
-}
-
-static void
-etgl_decrement (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_decrement (E_TABLE_SUBSET_VARIABLE(etgl->ets), position, amount);
-	}
-}
-
-static int
-etgl_row_count (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_model_row_count(E_TABLE_MODEL(etgl->ets));
-}
-
-static void
-etgl_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (direction == E_FOCUS_END) {
-		e_table_item_set_cursor (etgl->item, view_col, e_table_model_row_count(E_TABLE_MODEL(etgl->ets)) - 1);
-	} else {
-		e_table_item_set_cursor (etgl->item, view_col, 0);
-	}
-}
-
-static gint
-etgl_get_focus_column (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_item_get_focused_column (etgl->item);
-}
-
-static EPrintable *
-etgl_get_printable (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_item_get_printable (etgl->item);
-}
-
-static void
-etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	e_table_item_compute_location (etgl->item, x, y, row, col);
-}
-
-static void
-etgl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		if (GTK_VALUE_BOOL (*arg))
-			etg->frozen = TRUE;
-		else {
-			etg->frozen = FALSE;
-		}
-		break;
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		etgl->minimum_width = GTK_VALUE_DOUBLE(*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "minimum_width", etgl->minimum_width,
-					       NULL);
-		}
-		break;
-	case ARG_LENGTH_THRESHOLD:
-		etgl->length_threshold = GTK_VALUE_INT (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "length_threshold", GTK_VALUE_INT (*arg),
-					       NULL);
-		}
-		break;
-	case ARG_TABLE_SELECTION_MODEL:
-		if (etgl->table_selection_model)
-			gtk_object_unref(GTK_OBJECT(etgl->table_selection_model));
-		etgl->table_selection_model = E_TABLE_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg));
-		if (etgl->table_selection_model)
-			gtk_object_ref(GTK_OBJECT(etgl->table_selection_model));
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "table_selection_model", etgl->table_selection_model,
-					       NULL);
-		}
-
-	case ARG_TABLE_DRAW_GRID:
-		etgl->draw_grid = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "drawgrid", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		etgl->draw_focus = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					"drawfocus", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		etgl->cursor_mode = GTK_VALUE_INT (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					"cursor_mode", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-etgl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		GTK_VALUE_BOOL (*arg) = etg->frozen;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etgl->height;
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etgl->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etgl->minimum_width;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etgl_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS(object_class);
-
-	object_class->destroy = etgl_destroy;
-	object_class->set_arg = etgl_set_arg;
-	object_class->get_arg = etgl_get_arg;
-
-	item_class->realize = etgl_realize;
-	
-	etgl_parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_group_class->add = etgl_add;
-	e_group_class->add_array = etgl_add_array;
-	e_group_class->add_all = etgl_add_all;
-	e_group_class->remove = etgl_remove;
-	e_group_class->increment  = etgl_increment;
-	e_group_class->decrement  = etgl_decrement;
-	e_group_class->row_count  = etgl_row_count;
-	e_group_class->set_focus  = etgl_set_focus;
-	e_group_class->get_focus_column = etgl_get_focus_column;
-	e_group_class->get_printable = etgl_get_printable;
-	e_group_class->compute_location = etgl_compute_location;
-
-	gtk_object_add_arg_type ("ETableGroupLeaf::drawgrid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupLeaf::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableGroupLeaf::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableGroupLeaf::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-	gtk_object_add_arg_type ("ETableGroupLeaf::table_selection_model", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE_SELECTION_MODEL);
-
-	gtk_object_add_arg_type ("ETableGroupLeaf::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableGroupLeaf::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupLeaf::minimum_width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupLeaf::frozen", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_FROZEN);
-}
-
-static void
-etgl_init (GtkObject *object)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	etgl->width = 1;
-	etgl->height = 1;
-	etgl->minimum_width = 0;
-
-	etgl->ets = NULL;
-	etgl->item = NULL;
-	
-	etgl->draw_grid = 1;
-	etgl->draw_focus = 1;
-	etgl->cursor_mode = E_CURSOR_SIMPLE;
-	etgl->length_threshold = -1;
-
-	etgl->table_selection_model = NULL;
-
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM(object), etgl_reflow);
-}
-
-E_MAKE_TYPE (e_table_group_leaf, "ETableGroupLeaf", ETableGroupLeaf, etgl_class_init, etgl_init, PARENT_TYPE);
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
deleted file mode 100644
index 680ee37347..0000000000
--- a/widgets/table/e-table-group-leaf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_LEAF_H_
-#define _E_TABLE_GROUP_LEAF_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-subset.h>
-#include <gal/e-table/e-table-item.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_LEAF_TYPE        (e_table_group_leaf_get_type ())
-#define E_TABLE_GROUP_LEAF(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeaf))
-#define E_TABLE_GROUP_LEAF_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeafClass))
-#define E_IS_TABLE_GROUP_LEAF(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_LEAF_TYPE))
-#define E_IS_TABLE_GROUP_LEAF_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_LEAF_TYPE))
-
-typedef struct {
-	ETableGroup group;
-
-	/* 
-	 * Item.
-	 */
-	ETableItem *item;
-
-	gdouble height;
-	gdouble width;
-	gdouble minimum_width;
-
-	int length_threshold;
-
-	ETableSubset *ets;
-	guint is_grouped : 1;
-
-	guint draw_grid : 1;
-	guint draw_focus : 1;
-	ECursorMode cursor_mode;
-
-	ETableSelectionModel *table_selection_model;
-} ETableGroupLeaf;
-
-typedef struct {
-	ETableGroupClass parent_class;
-} ETableGroupLeafClass;
-
-ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
-					   ETableHeader *full_header,
-					   ETableHeader     *header,
-					   ETableModel *model,
-					   ETableSortInfo *sort_info);
-GtkType      e_table_group_leaf_get_type  (void);
-
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_LEAF_H_ */
-
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
deleted file mode 100644
index 0b09b38351..0000000000
--- a/widgets/table/e-table-group.c
+++ /dev/null
@@ -1,650 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Lahey (clahey@ximian.com)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group.h"
-#include "e-table-group-container.h"
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE gnome_canvas_group_get_type ()
-
-#define ETG_CLASS(e) (E_TABLE_GROUP_CLASS(GTK_OBJECT(e)->klass))
-
-static GnomeCanvasGroupClass *etg_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-	LAST_SIGNAL
-};
-
-static gint etg_signals [LAST_SIGNAL] = { 0, };
-
-static gboolean etg_get_focus (ETableGroup      *etg);
-static void etg_destroy (GtkObject *object);
-
-static void
-etg_destroy (GtkObject *object)
-{
-	ETableGroup *etg = E_TABLE_GROUP(object);
-	if (etg->header)
-		gtk_object_unref (GTK_OBJECT(etg->header));
-	if (etg->full_header)
-		gtk_object_unref (GTK_OBJECT(etg->full_header));
-	if (etg->model)
-		gtk_object_unref (GTK_OBJECT(etg->model));
-	if (GTK_OBJECT_CLASS (etg_parent_class)->destroy)
-		GTK_OBJECT_CLASS (etg_parent_class)->destroy (object);
-}
-
-/** 
- * e_table_group_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: The grouping information object to group by.
- *
- * %ETableGroup is a collection of rows of an %ETable.  It's a
- * %GnomeCanvasItem.  There are two different forms.  If n < the
- * number of groupings in the given %ETableSortInfo, then the
- * %ETableGroup will need to contain other %ETableGroups, thus it
- * creates an %ETableGroupContainer.  Otherwise, it will just contain
- * an %ETableItem, and thus it creates an %ETableGroupLeaf.
- *
- * Returns: The new %ETableGroup.
- */
-ETableGroup *
-e_table_group_new (GnomeCanvasGroup *parent,
-		   ETableHeader     *full_header,
-		   ETableHeader     *header,
-		   ETableModel      *model,
-		   ETableSortInfo   *sort_info,
-		   int               n)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	
-	if (n < e_table_sort_info_grouping_get_count(sort_info)) {
-		return e_table_group_container_new (parent, full_header, header, model, sort_info, n);
-	} else {
-		return e_table_group_leaf_new (parent, full_header, header, model, sort_info);
-	}
-	return NULL;
-}
-
-/** 
- * e_table_group_construct
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @etg: The %ETableGroup to construct.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- *
- * This routine does the base construction of the %ETableGroup.
- */
-void
-e_table_group_construct (GnomeCanvasGroup *parent,
-			 ETableGroup      *etg,
-			 ETableHeader     *full_header,
-			 ETableHeader     *header,
-			 ETableModel      *model)
-{
-	etg->full_header = full_header;
-	gtk_object_ref (GTK_OBJECT(etg->full_header));
-	etg->header = header;
-	gtk_object_ref (GTK_OBJECT(etg->header));
-	etg->model = model;
-	gtk_object_ref (GTK_OBJECT(etg->model));
-	gnome_canvas_item_constructv (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
-}
-
-/** 
- * e_table_group_add
- * @etg: The %ETableGroup to add a row to
- * @row: The row to add.
- *
- * This routine adds the given row from the %ETableModel to this set
- * of rows.
- */
-void
-e_table_group_add (ETableGroup *etg,
-		   gint row)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add)
-		ETG_CLASS (etg)->add (etg, row);
-}
-
-/** 
- * e_table_group_add_array
- * @etg: The %ETableGroup to add to
- * @array: The array to add.
- * @count: The number of times to add
- *
- * This routine adds all the rows in the array to this set of rows.
- * It assumes that the array is already sorted properly.
- */
-void
-e_table_group_add_array (ETableGroup *etg,
-			 const int *array,
-			 int count)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add_array)
-		ETG_CLASS (etg)->add_array (etg, array, count);
-}
-
-/** 
- * e_table_group_add_all
- * @etg: The %ETableGroup to add to
- *
- * This routine adds all the rows from the %ETableModel to this set
- * of rows.
- */
-void
-e_table_group_add_all (ETableGroup *etg)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add_all)
-		ETG_CLASS (etg)->add_all (etg);
-}
-
-/** 
- * e_table_group_remove
- * @etg: The %ETableGroup to remove a row from
- * @row: The row to remove.
- *
- * This routine removes the given row from the %ETableModel from this
- * set of rows.
- *
- * Returns: TRUE if the row was deleted and FALSE if the row was not
- * found.
- */
-gboolean
-e_table_group_remove (ETableGroup *etg,
-		      gint row)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->remove)
-		return ETG_CLASS (etg)->remove (etg, row);
-	else
-		return FALSE;
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to increment
- * @position: The position to increment from
- * @amount: The amount to increment.
- *
- * This routine adds amount to all rows greater than or equal to
- * position.  This is to handle when a row gets inserted into the
- * model.
- */
-void
-e_table_group_increment (ETableGroup *etg,
-			 gint position,
-			 gint amount)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->increment)
-		ETG_CLASS (etg)->increment (etg, position, amount);
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to decrement
- * @position: The position to decrement from
- * @amount: The amount to decrement
- *
- * This routine removes amount from all rows greater than or equal to
- * position.  This is to handle when a row gets deleted from the
- * model.
- */
-void
-e_table_group_decrement (ETableGroup *etg,
-			 gint position,
-			 gint amount)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->decrement)
-		ETG_CLASS (etg)->decrement (etg, position, amount);
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to count
- *
- * This routine calculates the number of rows shown in this group.
- *
- * Returns: The number of rows.
- */
-gint
-e_table_group_row_count (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), 0);
-
-	if (ETG_CLASS (etg)->row_count)
-		return ETG_CLASS (etg)->row_count (etg);
-	else
-		return 0;
-}
-
-/** 
- * e_table_group_set_focus
- * @etg: The %ETableGroup to set
- * @direction: The direction the focus is coming from.
- * @view_col: The column to set the focus in.
- *
- * Sets the focus to this widget.  Places the focus in the view column
- * coming from direction direction.
- */
-void
-e_table_group_set_focus (ETableGroup *etg,
-			 EFocus direction,
-			 gint view_col)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->set_focus)
-		ETG_CLASS (etg)->set_focus (etg, direction, view_col);
-}
-
-/** 
- * e_table_group_get_focus
- * @etg: The %ETableGroup to check
- *
- * Calculates if this group has the focus.
- *
- * Returns: TRUE if this group has the focus.
- */
-gboolean
-e_table_group_get_focus (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->get_focus)
-		return ETG_CLASS (etg)->get_focus (etg);
-	else
-		return FALSE;
-}
-
-/** 
- * e_table_group_get_focus_column
- * @etg: The %ETableGroup to check
- *
- * Calculates which column in this group has the focus.
- *
- * Returns: The column index (view column).
- */
-gint
-e_table_group_get_focus_column (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->get_focus_column)
-		return ETG_CLASS (etg)->get_focus_column (etg);
-	else
-		return -1;
-}
-
-/** 
- * e_table_group_get_printable
- * @etg: %ETableGroup which will be printed
- *
- * This routine creates and returns an %EPrintable that can be used to
- * print the given %ETableGroup.
- *
- * Returns: The %EPrintable.
- */
-EPrintable *
-e_table_group_get_printable (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), NULL);
-
-	if (ETG_CLASS (etg)->get_printable)
-		return ETG_CLASS (etg)->get_printable (etg);
-	else
-		return NULL;
-}
-
-/** 
- * e_table_group_compute_location
- * @eti: %ETableGroup to look in.
- * @x: A pointer to the x location to find in the %ETableGroup.
- * @y: A pointer to the y location to find in the %ETableGroup.
- * @row: A pointer to the location to store the found row in.
- * @col: A pointer to the location to store the found col in.
- *
- * This routine locates the pixel location (*x, *y) in the
- * %ETableGroup.  If that location is in the %ETableGroup, *row and
- * *col are set to the view row and column where it was found.  If
- * that location is not in the %ETableGroup, the height of the
- * %ETableGroup is removed from the value y points to.
- */
-void
-e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->compute_location)
-		ETG_CLASS (etg)->compute_location (etg, x, y, row, col);
-}
-
-/** 
- * e_table_group_get_position
- * @eti: %ETableGroup to look in.
- * @x: A pointer to the location to store the found x location in.
- * @y: A pointer to the location to store the found y location in.
- * @row: A pointer to the row number to find.
- * @col: A pointer to the col number to find.
- *
- * This routine finds the view cell (row, col) in the %ETableGroup.
- * If that location is in the %ETableGroup *x and *y are set to the
- * upper left hand corner of the cell found.  If that location is not
- * in the %ETableGroup, the number of rows in the %ETableGroup is
- * removed from the value row points to.
- */
-void
-e_table_group_get_position (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->get_position)
-		ETG_CLASS (etg)->get_position (etg, x, y, row, col);
-}
-
-/** 
- * e_table_group_cursor_change
- * @eti: %ETableGroup to emit the signal on
- * @row: The new cursor row (model row)
- *
- * This routine emits the "cursor_change" signal.
- */
-void
-e_table_group_cursor_change (ETableGroup *e_table_group, gint row)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CURSOR_CHANGE],
-			 row);
-}
-
-/** 
- * e_table_group_cursor_activated
- * @eti: %ETableGroup to emit the signal on
- * @row: The cursor row (model row)
- *
- * This routine emits the "cursor_activated" signal.
- */
-void
-e_table_group_cursor_activated (ETableGroup *e_table_group, gint row)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CURSOR_ACTIVATED],
-			 row);
-}
-
-/** 
- * e_table_group_double_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "double_click" signal.
- */
-void
-e_table_group_double_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [DOUBLE_CLICK],
-			 row, col, event);
-}
-
-/** 
- * e_table_group_right_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "right_click" signal.
- */
-gint
-e_table_group_right_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [RIGHT_CLICK],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "click" signal.
- */
-gint
-e_table_group_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CLICK],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_key_press
- * @eti: %ETableGroup to emit the signal on
- * @row: The cursor row (model row)
- * @col: The cursor col (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "key_press" signal.
- */
-gint
-e_table_group_key_press (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [KEY_PRESS],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_get_header
- * @eti: %ETableGroup to check
- *
- * This routine returns the %ETableGroup's header.
- *
- * Returns: The %ETableHeader.
- */
-ETableHeader *
-e_table_group_get_header (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), NULL);
-
-	return etg->header;
-}
-
-static int
-etg_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ETableGroup *etg = E_TABLE_GROUP (item);
-	gboolean return_val = TRUE;
-
-	switch (event->type) {
-
-	case GDK_FOCUS_CHANGE:
-		etg->has_focus = event->focus_change.in;
-		return_val = FALSE;
-
-	default:
-		return_val = FALSE;
-	}
-	if (return_val == FALSE){
-		if (GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event (item, event);
-	}
-	return return_val;
-
-}
-
-static gboolean
-etg_get_focus (ETableGroup      *etg)
-{
-	return etg->has_focus;
-}
-
-static void
-etg_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *klass = (ETableGroupClass *) object_class;
-
-	object_class->destroy = etg_destroy;
-
-	item_class->event = etg_event;
-
-	klass->cursor_change = NULL;
-	klass->cursor_activated = NULL;
-	klass->double_click = NULL;
-	klass->right_click = NULL;
-	klass->click = NULL;
-	klass->key_press = NULL;
-	
-	klass->add = NULL;
-	klass->add_array = NULL;
-	klass->add_all = NULL;
-	klass->remove = NULL;
-	klass->row_count  = NULL;
-	klass->increment  = NULL;
-	klass->decrement  = NULL;
-	klass->set_focus  = NULL;
-	klass->get_focus = etg_get_focus;
-	klass->get_printable = NULL;
-	klass->compute_location = NULL;
-	klass->get_position = NULL;
-
-	etg_parent_class = gtk_type_class (PARENT_TYPE);
-
-	etg_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	etg_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	etg_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	etg_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	etg_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	etg_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, etg_signals, LAST_SIGNAL);
-}
-
-E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE);
diff --git a/widgets/table/e-table-group.glade b/widgets/table/e-table-group.glade
deleted file mode 100644
index 39274d3c61..0000000000
--- a/widgets/table/e-table-group.glade
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-table-group.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkTable</class>
-    <name>table1</name>
-    <rows>3</rows>
-    <columns>3</columns>
-    <homogeneous>False</homogeneous>
-    <row_spacing>0</row_spacing>
-    <column_spacing>0</column_spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame1</name>
-      <border_width>4</border_width>
-      <label>Available fields</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<left_attach>0</left_attach>
-	<right_attach>1</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>True</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>True</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label1</name>
-	    <label>label1</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame2</name>
-      <border_width>4</border_width>
-      <label>Show in this order</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<left_attach>2</left_attach>
-	<right_attach>3</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>False</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>True</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow2</name>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist2</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label2</name>
-	    <label>label2</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<left_attach>1</left_attach>
-	<right_attach>2</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>4</xpad>
-	<ypad>4</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>False</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>False</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<border_width>4</border_width>
-	<can_focus>True</can_focus>
-	<label>Add &gt;&gt;</label>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<border_width>4</border_width>
-	<can_focus>True</can_focus>
-	<label>&lt;&lt; Remove</label>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-group.glade.h b/widgets/table/e-table-group.glade.h
deleted file mode 100644
index 3ab6304734..0000000000
--- a/widgets/table/e-table-group.glade.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("window1");
-gchar *s = N_("Available fields");
-gchar *s = N_("label1");
-gchar *s = N_("Show in this order");
-gchar *s = N_("label2");
-gchar *s = N_("Add >>");
-gchar *s = N_("<< Remove");
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
deleted file mode 100644
index f8d23168fe..0000000000
--- a/widgets/table/e-table-group.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_H_
-#define _E_TABLE_GROUP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-printable.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_TYPE        (e_table_group_get_type ())
-#define E_TABLE_GROUP(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup))
-#define E_TABLE_GROUP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_TYPE, ETableGroupClass))
-#define E_IS_TABLE_GROUP(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_TYPE))
-#define E_IS_TABLE_GROUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_TYPE))
-
-typedef struct {
-	GnomeCanvasGroup group;
-
-	/*
-	 * The full header.
-	 */
-	ETableHeader *full_header;
-	ETableHeader *header;
-	
-	/*
-	 * The model we pull data from.
-	 */
-	ETableModel *model;
-
-	/*
-	 * Whether we should add indentation and open/close markers,
-	 * or if we just act as containers of subtables.
-	 */
-	guint transparent : 1;
-
-	guint has_focus : 1;
-	
-	guint frozen : 1;
-} ETableGroup;
-
-typedef struct {
-	GnomeCanvasGroupClass parent_class;
-
-	/* Signals */
-	void        (*cursor_change)         (ETableGroup *etg, int row);
-	void        (*cursor_activated)      (ETableGroup *etg, int row);
-	void        (*double_click)          (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*right_click)           (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*click)                 (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*key_press)             (ETableGroup *etg, int row, int col, GdkEvent *event);
-
-	/* Virtual functions. */
-	void        (*add)                   (ETableGroup *etg, gint row);
-	void        (*add_array)             (ETableGroup *etg, const int *array, int count);
-	void        (*add_all)               (ETableGroup *etg);
-	gboolean    (*remove)                (ETableGroup *etg, gint row);
-	gint        (*row_count)             (ETableGroup *etg);
-	void        (*increment)             (ETableGroup *etg, gint position, gint amount);
-	void        (*decrement)             (ETableGroup *etg, gint position, gint amount);
-	void        (*set_focus)             (ETableGroup *etg, EFocus direction, gint view_col);
-	gboolean    (*get_focus)             (ETableGroup *etg);
-	gint        (*get_focus_column)      (ETableGroup *etg);
-	EPrintable *(*get_printable)         (ETableGroup *etg);
-	void        (*compute_location)      (ETableGroup *etg, int *x, int *y, int *row, int *col);
-	void        (*get_position)          (ETableGroup *etg, int *x, int *y, int *row, int *col);
-
-} ETableGroupClass;
-
-/* Virtual functions */
-void          e_table_group_add               (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_add_array         (ETableGroup       *etg,
-					       const int         *array,
-					       int                count);
-void          e_table_group_add_all           (ETableGroup       *etg);
-gboolean      e_table_group_remove            (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_increment         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-void          e_table_group_decrement         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-gint          e_table_group_row_count         (ETableGroup       *etg);
-void          e_table_group_set_focus         (ETableGroup       *etg,
-					       EFocus             direction,
-					       gint               view_col);
-gboolean      e_table_group_get_focus         (ETableGroup       *etg);
-gint          e_table_group_get_focus_column  (ETableGroup       *etg);
-ETableHeader *e_table_group_get_header        (ETableGroup       *etg);
-EPrintable   *e_table_group_get_printable     (ETableGroup       *etg);
-void          e_table_group_compute_location  (ETableGroup       *etg,
-					       int               *x,
-					       int               *y,
-					       int               *row,
-					       int               *col);
-void          e_table_group_get_position      (ETableGroup       *etg,
-					       int               *x,
-					       int               *y,
-					       int               *row,
-					       int               *col);
-ETableGroup  *e_table_group_new               (GnomeCanvasGroup  *parent,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model,
-					       ETableSortInfo    *sort_info,
-					       int                n);
-void          e_table_group_construct         (GnomeCanvasGroup  *parent,
-					       ETableGroup       *etg,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model);
-
-/* For emitting the signals */
-void          e_table_group_cursor_change     (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_cursor_activated  (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_double_click      (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_right_click       (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_click             (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_key_press         (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-GtkType       e_table_group_get_type          (void);
-
-typedef void (*ETableGroupLeafFn) (void *e_table_item, void *closure);
-void          e_table_group_apply_to_leafs    (ETableGroup       *etg,
-					       ETableGroupLeafFn  fn,
-					       void              *closure);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_H_ */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
deleted file mode 100644
index 70bdb3d698..0000000000
--- a/widgets/table/e-table-header-item.c
+++ /dev/null
@@ -1,1596 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-view.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdnd.h>
-#include "gal/util/e-i18n.h"
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-polygon.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gal/widgets/e-cursors.h"
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-popup-menu.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-header-utils.h"
-#include "e-table-col-dnd.h"
-#include "e-table-defines.h"
-#include "e-table-field-chooser-dialog.h"
-#include "e-table-config.h"
-#include "e-table.h"
-
-#include "add-col.xpm"
-#include "remove-col.xpm"
-#include "arrow-up.xpm"
-#include "arrow-down.xpm"
-
-enum {
-	BUTTON_PRESSED,
-	LAST_SIGNAL
-};
-
-static guint ethi_signals [LAST_SIGNAL] = { 0, };
-
-#define ARROW_DOWN_HEIGHT 16
-#define ARROW_PTR          7
-
-/* Defines the tolerance for proximity of the column division to the cursor position */
-#define TOLERANCE 4
-
-#define ETHI_RESIZING(x) ((x)->resize_col != -1)
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasItemClass *ethi_parent_class;
-
-static void ethi_drop_table_header (ETableHeaderItem *ethi);
-
-/*
- * They display the arrows for the drop location.
- */
-	
-static GtkWidget *arrow_up, *arrow_down;
-
-/*
- * DnD icons
- */
-static GdkColormap *dnd_colormap;
-static GdkPixmap *remove_col_pixmap, *remove_col_mask;
-static GdkPixmap *add_col_pixmap, *add_col_mask;
-
-enum {
-	ARG_0,
-	ARG_TABLE_HEADER,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-	ARG_TABLE_FONTSET,
-	ARG_SORT_INFO,
-	ARG_TABLE,
-};
-
-static void
-ethi_destroy (GtkObject *object){
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
-
-	ethi_drop_table_header (ethi);
-
-	if (ethi->dnd_code) {
-		g_free (ethi->dnd_code);
-		ethi->dnd_code = NULL;
-	}
-
-	if (ethi->sort_info) {
-		if (ethi->sort_info_changed_id)
-			gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->sort_info_changed_id);
-		if (ethi->group_info_changed_id)
-			gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
-		gtk_object_unref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info = NULL;
-	}
-
-	if (ethi->full_header)
-		gtk_object_unref (GTK_OBJECT(ethi->full_header));
-
-	if (ethi->config)
-		gtk_object_destroy (GTK_OBJECT (ethi->config));
-	
-	if (GTK_OBJECT_CLASS (ethi_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (ethi_parent_class)->destroy) (object);
-}
-
-static int
-e_table_header_item_get_height (ETableHeaderItem *ethi)
-{
-	ETableHeader *eth;
-	int numcols, col;
-	int maxheight;
-	GtkStyle *style;
-
-	g_return_val_if_fail (ethi != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0);
-       
-	eth = ethi->eth;
-	numcols = e_table_header_count (eth);
-
-	maxheight = 0;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->style;
-
-	for (col = 0; col < numcols; col++) {
-		ETableCol *ecol = e_table_header_get_column (eth, col);
-		int height;
-
-		height = e_table_header_compute_height (ecol, style, ethi->font);
-
-		if (height > maxheight)
-			maxheight = height;
-	}
-
-	return maxheight;
-}
-
-static void
-ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)(item, affine, clip_path, flags);
-
-
-	if (ethi->sort_info)
-		ethi->group_indent_width = e_table_sort_info_grouping_get_count(ethi->sort_info) * GROUP_INDENT;
-	else
-		ethi->group_indent_width = 0;
-
-	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
-
-	i1.x = i1.y = 0;
-	i2.x = ethi->width;
-	i2.y = ethi->height;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-
-	if (item->x1 != c1.x ||
-	    item->y1 != c1.y ||
-	    item->x2 != c2.x ||
-	    item->y2 != c2.y)
-		{
-			gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-			item->x1 = c1.x;
-			item->y1 = c1.y;
-			item->x2 = c2.x;
-			item->y2 = c2.y;
-
-			gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), item);
-		}
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-}
-
-static void
-ethi_font_set (ETableHeaderItem *ethi, GdkFont *font)
-{
-	if (ethi->font)
-		gdk_font_unref (ethi->font);
-
-	ethi->font = font;
-	
-	ethi->height = e_table_header_item_get_height (ethi);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_font_load (ETableHeaderItem *ethi, char *fontname)
-{
-	GdkFont *font;
-
-	font = gdk_fontset_load (fontname);
-	if (font == NULL)
-		font = gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
-	
-	ethi_font_set (ethi, font);
-}
-
-static void
-ethi_drop_table_header (ETableHeaderItem *ethi)
-{
-	GtkObject *header;
-	
-	if (!ethi->eth)
-		return;
-
-	header = GTK_OBJECT (ethi->eth);
-	gtk_signal_disconnect (header, ethi->structure_change_id);
-	gtk_signal_disconnect (header, ethi->dimension_change_id);
-
-	gtk_object_unref (header);
-	ethi->eth = NULL;
-	ethi->width = 0;
-}
-
-static void 
-structure_changed (ETableHeader *header, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-dimension_changed (ETableHeader *header, int col, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_add_table_header (ETableHeaderItem *ethi, ETableHeader *header)
-{
-	ethi->eth = header;
-	gtk_object_ref (GTK_OBJECT (ethi->eth));
-
-	ethi->height = e_table_header_item_get_height (ethi);
-
-	ethi->structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC(structure_changed), ethi);
-	ethi->dimension_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC(dimension_changed), ethi);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(ethi));
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_sort_info_changed (ETableSortInfo *sort_info, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableHeaderItem *ethi;
-
-	item = GNOME_CANVAS_ITEM (o);
-	ethi = E_TABLE_HEADER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_TABLE_HEADER:
-		ethi_drop_table_header (ethi);
-		ethi_add_table_header (ethi, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_FULL_HEADER:
-		if (ethi->full_header)
-			gtk_object_unref(GTK_OBJECT(ethi->full_header));
-		ethi->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg));
-		if (ethi->full_header)
-			gtk_object_ref(GTK_OBJECT(ethi->full_header));
-		break;
-
-	case ARG_DND_CODE:
-		g_free(ethi->dnd_code);
-		ethi->dnd_code = g_strdup (GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_TABLE_FONTSET:
-		ethi_font_load (ethi, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_SORT_INFO:
-		if (ethi->sort_info){
-			if (ethi->sort_info_changed_id)
-				gtk_signal_disconnect (
-					GTK_OBJECT(ethi->sort_info),
-					ethi->sort_info_changed_id);
-
-			if (ethi->group_info_changed_id)
-				gtk_signal_disconnect (
-					GTK_OBJECT(ethi->sort_info),
-					ethi->group_info_changed_id);
-			gtk_object_unref (GTK_OBJECT(ethi->sort_info));
-		}
-		ethi->sort_info = GTK_VALUE_POINTER (*arg);
-		gtk_object_ref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info_changed_id =
-			gtk_signal_connect (
-				GTK_OBJECT(ethi->sort_info), "sort_info_changed",
-				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		ethi->group_info_changed_id =
-			gtk_signal_connect (
-				GTK_OBJECT(ethi->sort_info), "group_info_changed",
-				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		break;
-	case ARG_TABLE:
-		if (GTK_VALUE_OBJECT(*arg))
-			ethi->table = E_TABLE(GTK_VALUE_OBJECT(*arg));
-		else
-			ethi->table = NULL;
-		break;
-	}
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-ethi_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableHeaderItem *ethi;
-
-	ethi = E_TABLE_HEADER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (ethi->full_header);
-		break;
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (ethi->dnd_code);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static int
-ethi_find_col_by_x (ETableHeaderItem *ethi, int x)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int x1 = 0;
-	int col;
-
-	if (x < x1)
-		return -1;
-
-	x1 += ethi->group_indent_width;
-	
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		if ((x >= x1) && (x <= x1 + ecol->width))
-			return col;
-
-		x1 += ecol->width;
-	}
-	return -1;
-}
-
-static int
-ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, int x)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int x1 = 0;
-	int col;
-
-	if (x < x1)
-		return -1;
-
-	x1 += ethi->group_indent_width;
-	
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		x1 += (ecol->width / 2);
-
-		if (x <= x1)
-			return col;
-
-		x1 += (ecol->width + 1) / 2;
-	}
-	return col;
-}
-
-static void
-ethi_remove_drop_marker (ETableHeaderItem *ethi)
-{
-	if (ethi->drag_mark == -1)
-		return;
-
-	gtk_widget_hide (arrow_up);
-	gtk_widget_hide (arrow_down);
-	
-	ethi->drag_mark = -1;
-}
-
-static GtkWidget *
-make_shaped_window_from_xpm (const char **xpm)
-{
-	GdkPixbuf *pixbuf;
-	GdkPixmap *pixmap;
-	GdkBitmap *bitmap;
-	GtkWidget *win, *pix;
-	
-	pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
-	gdk_pixbuf_unref (pixbuf);
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	win = gtk_window_new (GTK_WINDOW_POPUP);
-	pix = gtk_pixmap_new (pixmap, bitmap);
-	gtk_widget_realize (win);
-	gtk_container_add (GTK_CONTAINER (win), pix);
-	gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	
-	gdk_pixmap_unref (pixmap);
-	gdk_bitmap_unref (bitmap);
-	
-	return win;
-}
-
-static void
-ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
-{
-	int rx, ry;
-	int x;
-	
-	if (ethi->drag_mark == col)
-		return;
-
-	ethi->drag_mark = col;
-
-	x = e_table_header_col_diff (ethi->eth, 0, col);
-	if (col > 0)
-		x += ethi->group_indent_width;
-	
-	if (!arrow_up){
-		arrow_up   = make_shaped_window_from_xpm (arrow_up_xpm);
-		arrow_down = make_shaped_window_from_xpm (arrow_down_xpm);
-	}
-
-	gdk_window_get_origin (
-		GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->window,
-		&rx, &ry);
-
-	gtk_widget_set_uposition (arrow_down, rx + x - ARROW_PTR, ry - ARROW_DOWN_HEIGHT);
-	gtk_widget_show_all (arrow_down);
-
-	gtk_widget_set_uposition (arrow_up, rx + x - ARROW_PTR, ry + ethi->height);
-	gtk_widget_show_all (arrow_up);
-}
-
-#define gray50_width    2
-#define gray50_height   2
-static char gray50_bits [] = {
-  0x02, 0x01, };
-
-static void
-ethi_add_destroy_marker (ETableHeaderItem *ethi)
-{
-	double x1;
-	
-	if (ethi->remove_item)
-		gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
-
-	if (!ethi->stipple)
-		ethi->stipple = gdk_bitmap_create_from_data  (
-			NULL, gray50_bits, gray50_width, gray50_height);
-	
-	x1 = (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
-	if (ethi->drag_col > 0)
-		x1 += ethi->group_indent_width;
-	
-	ethi->remove_item = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root),
-		gnome_canvas_rect_get_type (),
-		"x1", x1 + 1,
-		"y1", (double) 1,
-		"x2", (double) x1 + e_table_header_col_diff (
-			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
-
-		"y2", (double) ethi->height - 2,
-		"fill_color", "red",
-		"fill_stipple", ethi->stipple,
-		NULL);
-}
-
-static void
-ethi_remove_destroy_marker (ETableHeaderItem *ethi)
-{
-	if (!ethi->remove_item)
-		return;
-	
-	gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
-	ethi->remove_item = NULL;
-}
-
-#if 0
-static gboolean
-moved (ETableHeaderItem *ethi, guint col, guint model_col)
-{
-	if (col == -1)
-		return TRUE;
-	ecol = e_table_header_get_column (ethi->eth, col);
-	if (ecol->col_idx == model_col)
-		return FALSE;
-	if (col > 0) {
-		ecol = e_table_header_get_column (ethi->eth, col - 1);
-		if (ecol->col_idx == model_col)
-			return FALSE;
-	}
-	return TRUE;
-}
-#endif
-
-static gboolean
-ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
-		  gint x, gint y, guint time,
-		  ETableHeaderItem *ethi)
-{
-	char *droptype, *headertype;
-
-	gdk_drag_status (context, 0, time);
-
-	droptype = gdk_atom_name (GPOINTER_TO_INT (context->targets->data));
-	headertype = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE,
-				      ethi->dnd_code);
-
-	if (strcmp (droptype, headertype) != 0) {
-		g_free (headertype);
-		return FALSE;
-	}
-
-	g_free (headertype);
-
-	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
-		int col;
-		
-		col = ethi_find_col_by_x_nearest (ethi, x);
-
-		if (col == ethi->drag_col || col == ethi->drag_col + 1) {
-			if (ethi->drag_col != -1)
-				ethi_remove_destroy_marker (ethi);
-			
-			ethi_remove_drop_marker (ethi);
-			gdk_drag_status (context, context->suggested_action, time);
-		} 
-		else if (col != -1){
-			if (ethi->drag_col != -1)
-				ethi_remove_destroy_marker (ethi);
-
-			ethi_add_drop_marker (ethi, col);
-			gdk_drag_status (context, context->suggested_action, time);
-		} else {
-			ethi_remove_drop_marker (ethi);
-			if (ethi->drag_col != -1)
-				ethi_add_destroy_marker (ethi);
-		}
-	} else {
-		ethi_remove_drop_marker (ethi);
-		if (ethi->drag_col != -1)
-			ethi_add_destroy_marker (ethi);
-	}
-
-	return TRUE;
-}
-
-static void
-ethi_drag_end (GtkWidget *canvas, GdkDragContext *context, ETableHeaderItem *ethi)
-{
-	if (context->action == 0) {
-		e_table_header_remove (ethi->eth, ethi->drag_col);
-		gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-	}
-	ethi_remove_drop_marker (ethi);
-	ethi_remove_destroy_marker (ethi);
-	ethi->drag_col = -1;
-}
-
-static void
-ethi_drag_data_received (GtkWidget *canvas,
-			 GdkDragContext *drag_context,
-			 gint x,
-			 gint y,
-			 GtkSelectionData *data,
-			 guint info,
-			 guint time,
-			 ETableHeaderItem *ethi)
-{
-	int found = FALSE;
-	int count = e_table_header_count(ethi->eth);
-	int column = atoi(data->data);
-	int drop_col = ethi->drop_col;
-	int i;
-	ethi->drop_col = -1;
-
-	if (column < 0)
-		return;
-	for (i = 0; i < count; i++) {
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, i);
-		if (ecol->col_idx == column) {
-			e_table_header_move(ethi->eth, i, drop_col);
-			found = TRUE;
-			break;
-		}
-	}
-	if (!found) {
-		count = e_table_header_count(ethi->full_header);
-		for (i = 0; i < count; i++) {
-			ETableCol *ecol = e_table_header_get_column (ethi->full_header, i);
-			if (ecol->col_idx == column) {
-				e_table_header_add_column (ethi->eth, ecol, drop_col);
-				break;
-			}
-		}
-	}
-	ethi_remove_drop_marker (ethi);
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_drag_data_get (GtkWidget *canvas,
-		    GdkDragContext     *context,
-		    GtkSelectionData   *selection_data,
-		    guint               info,
-		    guint               time,
-		    ETableHeaderItem *ethi)
-{
-	if (ethi->drag_col != -1) {
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
-		
-		gchar *string = g_strdup_printf("%d", ecol->col_idx);
-		gtk_selection_data_set(selection_data,
-				       GDK_SELECTION_TYPE_STRING,
-				       sizeof(string[0]),
-				       string,
-				       strlen(string));
-		g_free(string);
-	}
-}
-
-static gboolean
-ethi_drag_drop (GtkWidget *canvas,
-		GdkDragContext *context,
-		gint x,
-		gint y,
-		guint time,
-		ETableHeaderItem *ethi)
-{
-	gboolean successful = FALSE;
-
-	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
-		int col;
-		
-		col = ethi_find_col_by_x_nearest (ethi, x);
-		
-		ethi_add_drop_marker (ethi, col);
-
-		ethi->drop_col = col;
-		
-		if (col != -1) {
-			char *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
-			gtk_drag_get_data (canvas, context, gdk_atom_intern(target, FALSE), time);
-			g_free (target);
-		}
-	}
-	gtk_drag_finish (context, successful, successful, time);
-	return successful;
-}
-
-static void
-ethi_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, ETableHeaderItem *ethi)
-{
-	ethi_remove_drop_marker (ethi);
-	if (ethi->drag_col != -1)
-		ethi_add_destroy_marker (ethi);
-}
-
-static void
-ethi_realize (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GdkWindow *window;
-	GdkColor c;
-	GtkTargetEntry  ethi_drop_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
-
-	window = GTK_WIDGET (item->canvas)->window;
-
-	ethi->gc = gdk_gc_new (window);
-	gnome_canvas_get_color (item->canvas, "black", &c);
-	gdk_gc_set_foreground (ethi->gc, &c);
-
-	if (!ethi->font)
-		ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font);
-
-	/*
-	 * Now, configure DnD
-	 */
-	ethi_drop_types[0].target = g_strdup_printf("%s-%s", ethi_drop_types[0].target, ethi->dnd_code);
-	gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0,
-			   ethi_drop_types, ELEMENTS (ethi_drop_types),
-			   GDK_ACTION_MOVE);
-  	g_free(ethi_drop_types[0].target); 
-
-	/* Drop signals */
-	ethi->drag_motion_id = gtk_signal_connect        (GTK_OBJECT (item->canvas), "drag_motion",
-							  GTK_SIGNAL_FUNC (ethi_drag_motion), ethi);
-	ethi->drag_leave_id = gtk_signal_connect         (GTK_OBJECT (item->canvas), "drag_leave",
-							  GTK_SIGNAL_FUNC (ethi_drag_leave), ethi);
-	ethi->drag_drop_id = gtk_signal_connect          (GTK_OBJECT (item->canvas), "drag_drop",
-							  GTK_SIGNAL_FUNC (ethi_drag_drop), ethi);
-	ethi->drag_data_received_id = gtk_signal_connect (GTK_OBJECT (item->canvas), "drag_data_received",
-							  GTK_SIGNAL_FUNC (ethi_drag_data_received), ethi);
-
-	/* Drag signals */
-	ethi->drag_end_id = gtk_signal_connect           (GTK_OBJECT (item->canvas), "drag_end",
-							  GTK_SIGNAL_FUNC (ethi_drag_end), ethi);
-	ethi->drag_data_get_id = gtk_signal_connect      (GTK_OBJECT (item->canvas), "drag_data_get",
-							  GTK_SIGNAL_FUNC (ethi_drag_data_get), ethi);
-
-}
-
-static void
-ethi_unrealize (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-
-	gdk_gc_unref (ethi->gc);
-	ethi->gc = NULL;
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_motion_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_leave_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_drop_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_data_received_id);
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_end_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_data_get_id);
-
-	if (ethi->stipple){
-		gdk_bitmap_unref (ethi->stipple);
-		ethi->stipple = NULL;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item);
-}
-
-static void
-ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const int cols = e_table_header_count (ethi->eth);
-	int x1, x2;
-	int col;
-	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-
-
-	if (ethi->sort_info) {
-		int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-		int i;
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-			g_hash_table_insert (arrows, 
-					     (gpointer) column.column,
-					     (gpointer) (column.ascending ?
-							 E_TABLE_COL_ARROW_UP : 
-							 E_TABLE_COL_ARROW_DOWN));
-		}
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
-			g_hash_table_insert (arrows, 
-					     (gpointer) column.column,
-					     (gpointer) (column.ascending ?
-							 E_TABLE_COL_ARROW_UP : 
-							 E_TABLE_COL_ARROW_DOWN));
-		}
-	}
-
-	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
-	x1 = x2 = 0;
-	x2 += ethi->group_indent_width;
-	for (col = 0; col < cols; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-		int col_width;
-
-		col_width = ecol->width;
-				
-		x2 += col_width;
-		
-		if (x1 > (x + width))
-			break;
-
-		if (x2 < x)
-			continue;
-
-		e_table_header_draw_button (drawable, ecol,
-					    GTK_WIDGET (canvas)->style, ethi->font,
-					    GTK_WIDGET_STATE (canvas),
-					    GTK_WIDGET (canvas), ethi->gc,
-					    x1 - x, -y,
-					    width, height,
-					    x2 - x1, ethi->height,
-					    (ETableColArrow) g_hash_table_lookup (
-						    arrows, (gpointer) ecol->col_idx));
-	}
-
-	g_hash_table_destroy (arrows);
-}
-
-static double
-ethi_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-/*
- * is_pointer_on_division:
- *
- * Returns whether @pos is a column header division;  If @the_total is not NULL,
- * then the actual position is returned here.  If @return_ecol is not NULL,
- * then the ETableCol that actually contains this point is returned here
- */
-static gboolean
-is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *return_col)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int col, total;
-
-	total = 0;
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		if (col == 0)
-			total += ethi->group_indent_width;
-		
-		total += ecol->width;
-
-		if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){
-			if (return_col)
-				*return_col = col;
-			if (the_total)
-				*the_total = total;
-
-			return TRUE;
-		}
-
-		if (total > pos + TOLERANCE)
-			return FALSE;
-	}
-
-	return FALSE;
-}
-
-#define convert(c,sx,sy,x,y) gnome_canvas_w2c (c,sx,sy,x,y)
-
-static void
-set_cursor (ETableHeaderItem *ethi, int pos)
-{
-	int col;
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	gboolean resizeable = FALSE;
-		
-	/* We might be invoked before we are realized */
-	if (!canvas->window)
-		return;
-
-	if (is_pointer_on_division (ethi, pos, NULL, &col)) {
-		int last_col = ethi->eth->col_count - 1;
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		/* Last column is not resizable */
-		if (ecol->resizeable && col != last_col) {
-			int c = col + 1;
-
-			/* Column is not resizable if all columns after it
-			   are also not resizable */
-			for (; c <= last_col; c++){
-				ETableCol *ecol2;
-
-				ecol2 = e_table_header_get_column (ethi->eth, c);
-				if (ecol2->resizeable) {
-					resizeable = TRUE;
-					break;
-				}
-			}
-		}
-	}
-	
-	if (resizeable)
-		e_cursor_set (canvas->window, E_CURSOR_SIZE_X);
-	else
-		gdk_window_set_cursor (canvas->window, NULL);
-	/*		e_cursor_set (canvas->window, E_CURSOR_ARROW);*/
-}
-
-static void
-ethi_end_resize (ETableHeaderItem *ethi)
-{
-	ethi->resize_col = -1;
-	ethi->resize_guide = GINT_TO_POINTER (0);
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static gboolean
-ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
-{
-	if (!ethi->maybe_drag)
-		return FALSE;
-
-	if (ethi->eth->col_count < 2) {
-		ethi->maybe_drag = FALSE;
-		return FALSE;
-	}
-		
-	if (MAX (abs (ethi->click_x - event->x),
-		 abs (ethi->click_y - event->y)) <= 3)
-		return FALSE;
-
-	return TRUE;
-}
-
-static void
-ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
-{
-	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	GtkTargetList *list;
-	GdkDragContext *context;
-	ETableCol *ecol;
-	int col_width;
-	GdkPixmap *pixmap;
-	int group_indent = 0;
-	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-
-	GtkTargetEntry  ethi_drag_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
-
-	if (ethi->drag_col == -1)
-		return;
-
-	if (ethi->sort_info) {
-		int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-		int i;
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_grouping_get_nth(
-					ethi->sort_info, i);
-			group_indent ++;
-			g_hash_table_insert (
-				arrows, 
-				(gpointer) column.column,
-				(gpointer) (column.ascending ?
-					    E_TABLE_COL_ARROW_UP : 
-					    E_TABLE_COL_ARROW_DOWN));
-		}
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth (
-					ethi->sort_info, i);
-
-			g_hash_table_insert (
-				arrows, 
-				(gpointer) column.column,
-				(gpointer) (column.ascending ?
-					    E_TABLE_COL_ARROW_UP : 
-					    E_TABLE_COL_ARROW_DOWN));
-		}
-	}
-
-	ethi_drag_types[0].target = g_strdup_printf(
-		"%s-%s", ethi_drag_types[0].target, ethi->dnd_code);
-	list = gtk_target_list_new (
-		ethi_drag_types, ELEMENTS (ethi_drag_types));
-	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free(ethi_drag_types[0].target);
-
-	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
-	col_width = ecol->width;
-	pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
-
-	e_table_header_draw_button (
-		pixmap, ecol,
-		widget->style, ethi->font,
-		GTK_WIDGET_STATE (widget),
-		widget, ethi->gc,
-		0, 0,
-		col_width, ethi->height,
-		col_width, ethi->height,
-		(ETableColArrow) g_hash_table_lookup (
-			arrows, (gpointer) ecol->col_idx));
-	gtk_drag_set_icon_pixmap (
-		context,
-		gdk_window_get_colormap (widget->window),
-		pixmap,
-		NULL,
-		col_width / 2,
-		ethi->height / 2);
-	gdk_pixmap_unref (pixmap);
-
-	ethi->maybe_drag = FALSE;
-	g_hash_table_destroy (arrows);
-}
-
-typedef struct {
-	ETableHeaderItem *ethi;
-	int col;
-} EthiHeaderInfo;
-
-static void
-ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	ETableHeaderItem *ethi = info->ethi;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth (
-			ethi->sort_info, i);
-
-		if (model_col == column.column){
-			column.ascending = 1;
-			e_table_sort_info_grouping_set_nth (
-				ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count (
-			ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth(
-					ethi->sort_info, i);
-			if (model_col == column.column){
-				column.ascending = 1;
-				e_table_sort_info_sorting_set_nth (
-					ethi->sort_info, i, column);
-				found = 1;
-				break;
-			}
-		}
-	}
-	if (!found) {
-		ETableSortColumn column = { model_col, 1 };
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth(ethi->sort_info, length - 1, column);
-	}
-}
-
-static void
-ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	ETableHeaderItem *ethi = info->ethi;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(
-			ethi->sort_info, i);
-		if (model_col == column.column){
-			column.ascending = 0;
-			e_table_sort_info_grouping_set_nth(
-				ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth(
-					ethi->sort_info, i);
-
-			if (model_col == column.column){
-				column.ascending = 0;
-				e_table_sort_info_sorting_set_nth (
-					ethi->sort_info, i, column);
-				found = 1;
-				break;
-			}
-		}
-	}
-	if (!found) {
-		ETableSortColumn column = { model_col, 0 };
-		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth (
-			ethi->sort_info, length - 1, column);
-	}
-}
-
-static void
-ethi_popup_unsort(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-
-	e_table_sort_info_grouping_truncate(ethi->sort_info, 0);
-	e_table_sort_info_sorting_truncate(ethi->sort_info, 0);
-}
-
-static void
-ethi_popup_group_field(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	ETableHeaderItem *ethi = info->ethi;
-	ETableSortColumn column;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	column.column = model_col;
-	column.ascending = 1;
-	e_table_sort_info_grouping_set_nth(ethi->sort_info, 0, column);
-	e_table_sort_info_grouping_truncate(ethi->sort_info, 1);
-}
-
-static void
-ethi_popup_group_box(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-ethi_popup_remove_column(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	e_table_header_remove(info->ethi->eth, info->col);
-}
-
-static void
-ethi_popup_field_chooser(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	GtkWidget *etfcd = e_table_field_chooser_dialog_new();
-	gtk_object_set(GTK_OBJECT(etfcd),
-		       "full_header", info->ethi->full_header,
-		       "dnd_code", info->ethi->dnd_code,
-		       NULL);
-	gtk_widget_show(etfcd);
-}
-
-static void
-ethi_popup_alignment(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-ethi_popup_best_fit(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-	int width;
-
-	gtk_signal_emit_by_name (GTK_OBJECT (ethi->eth),
-				 "request_width",
-				 info->col, &width);
-	/* Add 10 to stop it from "..."ing */
-	e_table_header_set_size (ethi->eth, info->col, width + 10);
-	
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-
-}
-
-static void
-ethi_popup_format_columns(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-config_destroyed (GtkObject *object, ETableHeaderItem *ethi)
-{
-	ethi->config = NULL;
-}
-
-static void
-apply_changes (GnomePropertyBox *pbox, gint page_num, ETableHeaderItem *ethi)
-{
-	ETableConfig *config = E_TABLE_CONFIG (ethi->config);
-	char *state = e_table_state_save_to_string (config->state);
-
-	if (page_num != -1)
-		return;
-
-	e_table_set_state (ethi->table, state);
-	g_free (state);
-}
-
-static void
-ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-	ETableState *state;
-
-	if (ethi->config)
-		e_table_config_raise (E_TABLE_CONFIG (ethi->config));
-	else {
-		state = e_table_get_state_object(ethi->table);
-
-		ethi->config = e_table_config_new (
-			_("Configuring view: FIXME"),
-			ethi->table->spec, state);
-		gtk_signal_connect (
-			GTK_OBJECT (ethi->config), "destroy",
-			GTK_SIGNAL_FUNC (config_destroyed), ethi);
-		gtk_signal_connect (
-			GTK_OBJECT (
-				E_TABLE_CONFIG (ethi->config)->dialog_toplevel),
-			"apply",
-			GTK_SIGNAL_FUNC (apply_changes), ethi);
-	}
-}
-
-/* Bit 1 is always disabled. */
-/* Bit 2 is disabled if not "sortable". */
-/* Bit 4 is disabled if we don't have a pointer to our table object. */
-static EPopupMenu ethi_context_menu [] = {
-	{ N_("Sort Ascending"),            NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_ascending),  NULL, 2},
-	{ N_("Sort Descending"),           NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_descending), NULL, 2},
-	{ N_("Unsort"),                    NULL, GTK_SIGNAL_FUNC(ethi_popup_unsort),          NULL, 0},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 0},
-	{ N_("Group By This Field"),       NULL, GTK_SIGNAL_FUNC(ethi_popup_group_field),     NULL, 0},
-	{ N_("Group By Box"),              NULL, GTK_SIGNAL_FUNC(ethi_popup_group_box),       NULL, 1},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Remove This Column"),        NULL, GTK_SIGNAL_FUNC(ethi_popup_remove_column),   NULL, 0},
-	{ N_("Add a Column..."),           NULL, GTK_SIGNAL_FUNC(ethi_popup_field_chooser),   NULL, 0},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Alignment"),                 NULL, GTK_SIGNAL_FUNC(ethi_popup_alignment),       NULL, 1},
-	{ N_("Best Fit"),                  NULL, GTK_SIGNAL_FUNC(ethi_popup_best_fit),        NULL, 2},
-	{ N_("Format Columns..."),         NULL, GTK_SIGNAL_FUNC(ethi_popup_format_columns),  NULL, 1},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Customize Current View..."), NULL, GTK_SIGNAL_FUNC(ethi_popup_customize_view),  NULL, 4},
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-static void
-ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
-{
-	EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
-	ETableCol *col;
-	info->ethi = ethi;
-	info->col = ethi_find_col_by_x (ethi, event->x);
-	col = e_table_header_get_column (ethi->eth, info->col);
-	e_popup_menu_run (ethi_context_menu, (GdkEvent *) event,
-			  1 +
-			  (col->sortable ? 0 : 2) +
-			  (ethi->table ? 0 : 4), 0, info);
-}
-
-static void
-ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event)
-{
-	gtk_signal_emit (GTK_OBJECT (ethi),
-			 ethi_signals [BUTTON_PRESSED], event);
-}
-
-static void
-ethi_change_sort_state (ETableHeaderItem *ethi, gdouble x)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	
-	col = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, x));
-	model_col = col->col_idx;
-	
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-		if (model_col == column.column){
-			int ascending = column.ascending;
-			ascending = ! ascending;
-			column.ascending = ascending;
-			e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	
-	if (!col->sortable)
-		return;
-	
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
-
-			if (model_col == column.column){
-				int ascending = column.ascending;
-				
-				if (ascending == 0){
-					/*
-					 * This means the user has clicked twice
-					 * already, lets kill sorting now.
-					 */
-					e_table_sort_info_sorting_truncate (ethi->sort_info, i);
-				} else {
-					ascending = !ascending;
-					column.ascending = ascending;
-					e_table_sort_info_sorting_set_nth(ethi->sort_info, i, column);
-				}
-				found = 1;
-				break;
-			}
-		}
-	}
-
-	if (!found) {
-		ETableSortColumn column = { model_col, 1 };
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth(ethi->sort_info, length - 1, column);
-	}
-}
-
-/*
- * Handles the events on the ETableHeaderItem, particularly it handles resizing
- */
-static int
-ethi_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const gboolean resizing = ETHI_RESIZING (ethi);
-	int x, y, start, col;
-	int was_maybe_drag = 0;
-	
-	switch (e->type){
-	case GDK_ENTER_NOTIFY:
-		convert (canvas, e->crossing.x, e->crossing.y, &x, &y);
-		set_cursor (ethi, x);
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL);
-		/*		e_cursor_set (GTK_WIDGET (canvas)->window, E_CURSOR_ARROW);*/
-		break;
-			    
-	case GDK_MOTION_NOTIFY:
-
-		convert (canvas, e->motion.x, e->motion.y, &x, &y);
-		if (resizing){
-			int new_width;
-			
-			if (ethi->resize_guide == NULL){
-				/* Quick hack until I actually bind the views */
-				ethi->resize_guide = GINT_TO_POINTER (1);
-				
-				gnome_canvas_item_grab (item,
-							GDK_POINTER_MOTION_MASK |
-							GDK_BUTTON_RELEASE_MASK,
-							e_cursor_get (E_CURSOR_SIZE_X),
-							e->button.time);
-			}
-
-			new_width = x - ethi->resize_start_pos;
-
-			e_table_header_set_size (ethi->eth, ethi->resize_col, new_width);
-
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-		} else if (ethi_maybe_start_drag (ethi, &e->motion)){
-			ethi_start_drag (ethi, e);
-		} else
-			set_cursor (ethi, x);
-		break;
-		
-	case GDK_BUTTON_PRESS:
-		if (e->button.button > 3)
-			return FALSE;
-
-		convert (canvas, e->button.x, e->button.y, &x, &y);
-		    
-		if (is_pointer_on_division (ethi, x, &start, &col) && e->button.button == 1){
-			ETableCol *ecol;
-				
-				/*
-				 * Record the important bits.
-				 *
-				 * By setting resize_pos to a non -1 value,
-				 * we know that we are being resized (used in the
-				 * other event handlers).
-				 */
-			ecol = e_table_header_get_column (ethi->eth, col);
-			
-			if (!ecol->resizeable)
-				break;
-			ethi->resize_col = col;
-			ethi->resize_start_pos = start - ecol->width;
-			ethi->resize_min_width = ecol->min_width;
-		} else {
-			if (e->button.button == 1){
-				ethi->click_x = e->button.x;
-				ethi->click_y = e->button.y;
-				ethi->maybe_drag = TRUE;
-			} else if (e->button.button == 3){
-				ethi_header_context_menu (ethi, &e->button);
-			} else
-				ethi_button_pressed (ethi, &e->button);
-		}
-		break;
-		
-	case GDK_2BUTTON_PRESS:
-		if (!resizing)
-			break;
-		
-		if (e->button.button != 1)
-			break;
-		else {
-			int width = 0;
-			gtk_signal_emit_by_name (GTK_OBJECT (ethi->eth),
-						 "request_width",
-						 (int)ethi->resize_col, &width);
-			/* Add 10 to stop it from "..."ing */
-			e_table_header_set_size (ethi->eth, ethi->resize_col, width + 10);
-
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-			ethi->maybe_drag = FALSE;
-		}
-		break;
-		
-	case GDK_BUTTON_RELEASE: {
-		gboolean needs_ungrab = FALSE;
-		
-		was_maybe_drag = ethi->maybe_drag;
-		
-		ethi->maybe_drag = FALSE;
-
-		if (ethi->resize_col != -1){
-			needs_ungrab = (ethi->resize_guide != NULL);
-			ethi_end_resize (ethi);
-		} else if (was_maybe_drag && ethi->sort_info) 
-			ethi_change_sort_state (ethi, e->button.x);
-		
-		if (needs_ungrab)
-			gnome_canvas_item_ungrab (item, e->button.time);
-
-		break;
-	}
-	
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-ethi_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-
-	ethi_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy = ethi_destroy;
-	object_class->set_arg = ethi_set_arg;
-	object_class->get_arg = ethi_get_arg;
-
-	item_class->update      = ethi_update;
-	item_class->realize     = ethi_realize;
-	item_class->unrealize   = ethi_unrealize;
-	item_class->draw        = ethi_draw;
-	item_class->point       = ethi_point;
-	item_class->event       = ethi_event;
-	
-	gtk_object_add_arg_type ("ETableHeaderItem::ETableHeader", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HEADER);
-	gtk_object_add_arg_type ("ETableHeaderItem::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-	gtk_object_add_arg_type ("ETableHeaderItem::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableHeaderItem::fontset", GTK_TYPE_STRING,
-				 GTK_ARG_WRITABLE, ARG_TABLE_FONTSET);
-	gtk_object_add_arg_type ("ETableHeaderItem::sort_info", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_SORT_INFO);
-	gtk_object_add_arg_type ("ETableHeaderItem::table", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE);
-
-	/*
-	 * Create our pixmaps for DnD
-	 */
-	dnd_colormap = gtk_widget_get_default_colormap ();
-	remove_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d (
-		NULL, dnd_colormap,
-		&remove_col_mask, NULL, remove_col_xpm);
-
-	add_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d (
-		NULL, dnd_colormap,
-		&add_col_mask, NULL, add_col_xpm);
-
-	ethi_signals [BUTTON_PRESSED] =
-		gtk_signal_new ("button_pressed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderItemClass, button_pressed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-		
-	gtk_object_class_add_signals (object_class, ethi_signals, LAST_SIGNAL);
-}
-
-static void
-ethi_init (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-
-	ethi->resize_col = -1;
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	ethi->drag_col = -1;
-	ethi->drag_mark = -1;
-	
-	ethi->sort_info = NULL;
-
-	ethi->sort_info_changed_id = 0;
-	ethi->group_info_changed_id = 0;
-
-	ethi->group_indent_width = 0;
-	ethi->table = NULL;
-}
-
-GtkType
-e_table_header_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableHeaderItem",
-			sizeof (ETableHeaderItem),
-			sizeof (ETableHeaderItemClass),
-			(GtkClassInitFunc) ethi_class_init,
-			(GtkObjectInitFunc) ethi_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
deleted file mode 100644
index 6186037d5d..0000000000
--- a/widgets/table/e-table-header-item.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_HEADER_ITEM_H_
-#define _E_TABLE_HEADER_ITEM_H_
-
-#include <gal/e-table/e-table.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_HEADER_ITEM_TYPE        (e_table_header_item_get_type ())
-#define E_TABLE_HEADER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItem))
-#define E_TABLE_HEADER_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItemClass))
-#define E_IS_TABLE_HEADER_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_HEADER_ITEM_TYPE))
-#define E_IS_TABLE_HEADER_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableHeader    *eth;
-
-	GdkGC           *gc;
-	GdkCursor       *change_cursor;
-
-	short            height, width;
-	GdkFont         *font;
-
-	/*
-	 * Used during resizing;  Could be shorts
-	 */
-	int              resize_col;
-	int              resize_start_pos;
-	int              resize_min_width;
-	
-	GtkObject       *resize_guide;
-
-	int              group_indent_width;
-
-	/*
-	 * Ids
-	 */
-	int structure_change_id, dimension_change_id;
-
-	/*
-	 * For dragging columns
-	 */
-	guint            maybe_drag:1;
-	guint            dnd_ready:1;
-	int              click_x, click_y;
-	int              drag_col, drop_col, drag_mark;
-        guint            drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id, drag_data_received_id, drag_data_get_id;
-	guint            sort_info_changed_id, group_info_changed_id;
-	GnomeCanvasItem *remove_item;
-	GdkBitmap       *stipple;
-
-	gchar           *dnd_code;
-
-	/*
-	 * For column sorting info
-	 */
-	ETableSortInfo  *sort_info;
-	
-	/* For adding fields. */
-	ETableHeader    *full_header;
-	ETable          *table;
-	void            *config;
-} ETableHeaderItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-	/*
-	 * signals
-	 */
-	void (*button_pressed) (ETableHeaderItem *ethi, GdkEventButton *button);
-} ETableHeaderItemClass;
-
-GtkType    e_table_header_item_get_type (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_HEADER_ITEM_H_ */
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
deleted file mode 100644
index 987207f588..0000000000
--- a/widgets/table/e-table-header-utils.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/* ETable widget - utilities for drawing table header buttons
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Chris Lahey <clahey@ximian.com>
- *          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 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 <glib.h>
-#include "e-table-defines.h"
-#include "e-table-header-utils.h"
-
-
-
-/**
- * e_table_header_compute_height:
- * @ecol: Table column description.
- * @style: Style for the button's bevel.
- * @font: Font for the button's text, or NULL if no font is available.
- *
- * Computes the minimum height required for a table header button.
- *
- * Return value: The height of the button, in pixels.
- **/
-double
-e_table_header_compute_height (ETableCol *ecol, GtkStyle *style, GdkFont *font)
-{
-	int ythick;
-	int height;
-
-	g_return_val_if_fail (ecol != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_COL (ecol), -1);
-	g_return_val_if_fail (style != NULL, -1);
-
-	ythick = style->klass->ythickness;
-
-	if (font)
-		height = font->ascent + font->descent;
-	else
-		height = 16; /* FIXME: default? */
-
-	if (ecol->is_pixbuf) {
-		g_assert (ecol->pixbuf != NULL);
-		height = MAX (height, gdk_pixbuf_get_height (ecol->pixbuf));
-	}
-
-	height = MAX (height, MIN_ARROW_SIZE);
-
-	height += 2 * (ythick + HEADER_PADDING);
-
-	return height;
-}
-
-double
-e_table_header_width_extras (GtkStyle *style)
-{
-	g_return_val_if_fail (style != NULL, -1);
-
-	return 2 * (style->klass->xthickness + HEADER_PADDING);
-}
-
-/* Creates a pixmap that is a composite of a background color and the upper-left
- * corner rectangle of a pixbuf.
- */
-static GdkPixmap *
-make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
-		       GdkPixbuf *pixbuf, GdkColor *bg, int width, int height,
-		       int dither_xofs, int dither_yofs)
-{
-	int pwidth, pheight;
-	GdkPixmap *pixmap;
-	GdkPixbuf *tmp;
-	int color;
-
-	pwidth = gdk_pixbuf_get_width (pixbuf);
-	pheight = gdk_pixbuf_get_height (pixbuf);
-	g_assert (width <= pwidth && height <= pheight);
-
-	color = ((bg->red & 0xff00) << 8) | (bg->green & 0xff00) | ((bg->blue & 0xff00) >> 8);
-
-	if (width >= pwidth && height >= pheight) {
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp)
-			return NULL;
-
-		gdk_pixbuf_composite_color (pixbuf, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-	} else {
-		int x, y, rowstride;
-		GdkPixbuf *fade;
-		guchar *pixels;
-
-		/* Do a nice fade of the pixbuf down and to the right */
-
-		fade = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		if (!fade)
-			return NULL;
-
-		gdk_pixbuf_copy_area (pixbuf,
-				      0, 0,
-				      width, height,
-				      fade,
-				      0, 0);
-
-		rowstride = gdk_pixbuf_get_rowstride (fade);
-		pixels = gdk_pixbuf_get_pixels (fade);
-
-		for (y = 0; y < height; y++) {
-			guchar *p;
-			int yfactor;
-
-			p = pixels + y * rowstride;
-
-			if (height < pheight)
-				yfactor = height - y;
-			else
-				yfactor = height;
-
-			for (x = 0; x < width; x++) {
-				int xfactor;
-
-				if (width < pwidth)
-					xfactor = width - x;
-				else
-					xfactor = width;
-
-				p[3] = ((int) p[3] * xfactor * yfactor / (width * height));
-				p += 4;
-			}
-		}
-
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp) {
-			gdk_pixbuf_unref (fade);
-			return NULL;
-		}
-
-		gdk_pixbuf_composite_color (fade, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-
-		gdk_pixbuf_unref (fade);
-	}
-
-	pixmap = gdk_pixmap_new (drawable, width, height, gdk_rgb_get_visual ()->depth);
-	gdk_draw_rgb_image_dithalign (pixmap, gc,
-				      0, 0,
-				      width, height,
-				      GDK_RGB_DITHER_NORMAL,
-				      gdk_pixbuf_get_pixels (tmp),
-				      gdk_pixbuf_get_rowstride (tmp),
-				      dither_xofs, dither_yofs);
-	gdk_pixbuf_unref (tmp);
-
-	return pixmap;
-}
-
-/**
- * e_table_header_draw_button:
- * @drawable: Destination drawable.
- * @ecol: Table column for the header information.
- * @style: Style to use for drawing the button.
- * @font: Font for the button's text.
- * @state: State of the table widget.
- * @widget: The table widget.
- * @gc: GC to use for drawing.
- * @x: Leftmost coordinate of the button.
- * @y: Topmost coordinate of the button.
- * @width: Width of the region to draw.
- * @height: Height of the region to draw.
- * @button_width: Width for the complete button.
- * @button_height: Height for the complete button.
- * @arrow: Arrow type to use as a sort indicator.
- * 
- * Draws a button suitable for a table header.
- **/
-void
-e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
-			    GtkStyle *style, GdkFont *font, GtkStateType state,
-			    GtkWidget *widget, GdkGC *gc,
-			    int x, int y, int width, int height,
-			    int button_width, int button_height,
-			    ETableColArrow arrow)
-{
-	int xthick, ythick;
-	int inner_x, inner_y;
-	int inner_width, inner_height;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (ecol != NULL);
-	g_return_if_fail (E_IS_TABLE_COL (ecol));
-	g_return_if_fail (style != NULL);
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (button_width > 0 && button_height > 0);
-
-	xthick = style->klass->xthickness;
-	ythick = style->klass->ythickness;
-
-	/* Button bevel */
-
-	gtk_paint_box (style, drawable, state, GTK_SHADOW_OUT,
-		       NULL, widget, "button",
-		       x, y, button_width, button_height);
-
-	/* Inside area */
-
-	inner_width = button_width - 2 * (xthick + HEADER_PADDING);
-	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
-
-	if (inner_width < 1 || inner_height < 1)
-		return; /* nothing fits */
-
-	inner_x = x + xthick + HEADER_PADDING;
-	inner_y = y + ythick + HEADER_PADDING;
-
-	/* Arrow */
-
-	switch (arrow) {
-	case E_TABLE_COL_ARROW_NONE:
-		break;
-
-	case E_TABLE_COL_ARROW_UP:
-	case E_TABLE_COL_ARROW_DOWN: {
-		int arrow_width, arrow_height;
-
-		arrow_width = MIN (MIN_ARROW_SIZE, inner_width);
-		arrow_height = MIN (MIN_ARROW_SIZE, inner_height);
-
-		gtk_paint_arrow (style, drawable, state,
-				 GTK_SHADOW_IN, NULL, widget, "header",
-				 (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
-				 TRUE,
-				 inner_x + inner_width - arrow_width,
-				 inner_y + (inner_height - arrow_height) / 2,
-				 arrow_width, arrow_height);
-
-		inner_width -= arrow_width + HEADER_PADDING;
-		break;
-	}
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (inner_width < 1)
-		return; /* nothing else fits */
-
-	/* Pixbuf or label */
-
-	if (ecol->is_pixbuf) {
-		int pwidth, pheight;
-		int clip_width, clip_height;
-		GdkPixmap *pixmap;
-
-		g_assert (ecol->pixbuf != NULL);
-
-		pwidth = gdk_pixbuf_get_width (ecol->pixbuf);
-		pheight = gdk_pixbuf_get_height (ecol->pixbuf);
-
-		clip_width = MIN (pwidth, inner_width);
-		clip_height = MIN (pheight, inner_height);
-
-		pixmap = make_composite_pixmap (drawable, gc,
-						ecol->pixbuf, &style->bg[state],
-						clip_width, clip_height,
-						inner_x,
-						inner_y + (inner_height - clip_height) / 2);
-		if (pixmap) {
-			gdk_draw_pixmap (drawable, gc, pixmap,
-					 0, 0,
-					 inner_x,
-					 inner_y + (inner_height - clip_height) / 2,
-					 clip_width, clip_height);
-			gdk_pixmap_unref (pixmap);
-		}
-	} else {
-		int ypos;
-
-		ypos = inner_y + (inner_height - font->ascent - font->descent) / 2 + font->ascent;
-
-		e_table_draw_elided_string (drawable, font, gc,
-					    inner_x, ypos,
-					    ecol->text, inner_width, TRUE);
-	}
-}
-
-/* Computes the length of a string that needs to be trimmed for elision */
-static int
-compute_elision_length (GdkFont *font, const char *str, int max_width)
-{
-	int len;
-	int l = 0, left, right;
-	int rbearing;
-
-	len = strlen (str);
-
-	if (len <= 0)
-	  return 0;
-
-	left = 0;
-	right = len;
-
-	while (left < right) {
-		l = (left + right) / 2;
-		gdk_text_extents (font, str, l, NULL, &rbearing, NULL, NULL, NULL);
-
-		if (rbearing < max_width)
-			left = l + 1;
-		else if (rbearing > max_width)
-			right = l;
-		else
-			return l;
-	}
-
-	if (rbearing > max_width)
-		return MAX (0, l - 1);
-	else
-		return l;
-}
-
-/* Default width of the elision arrow in pixels */
-#define ARROW_WIDTH 4
-
-/**
- * e_table_draw_elided_string:
- * @drawable: Destination drawable.
- * @font: Font for the text.
- * @gc: GC to use for drawing.
- * @x: X insertion point for the string.
- * @y: Y insertion point for the string's baseline.
- * @str: String to draw.
- * @max_width: Maximum width in which the string must fit.
- * @center: Whether to center the string in the available area if it does fit.
- * 
- * Draws a string, possibly trimming it so that it fits inside the specified
- * maximum width.  If it does not fit, an elision indicator is drawn after the
- * last character that does fit.
- **/
-void
-e_table_draw_elided_string (GdkDrawable *drawable, GdkFont *font, GdkGC *gc,
-			    int x, int y, const char *str, int max_width, gboolean center)
-{
-	int rbearing;
-	int width;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (str != NULL);
-	g_return_if_fail (max_width >= 0);
-
-	gdk_string_extents (font, str, NULL, &rbearing, &width, NULL, NULL);
-
-	if (rbearing <= max_width) {
-		int xpos;
-
-		if (center)
-			xpos = x + (max_width - width) / 2;
-		else
-			xpos = x;
-
-		gdk_draw_string (drawable, font, gc, xpos, y, str);
-	} else {
-		int arrow_width;
-		int len;
-		int i;
-
-		if (max_width < ARROW_WIDTH + 1)
-			arrow_width = max_width - 1;
-		else
-			arrow_width = ARROW_WIDTH;
-
-		len = compute_elision_length (font, str, max_width - arrow_width - 1);
-		gdk_draw_text (drawable, font, gc, x, y, str, len);
-
-		gdk_text_extents (font, str, len, NULL, &rbearing, NULL, NULL, NULL);
-
-		y -= font->ascent;
-
-		for (i = 0; i < arrow_width; i++) {
-			int h;
-
-			h = 2 * i + 1;
-
-			gdk_draw_line (drawable, gc,
-				       x + rbearing + arrow_width - i,
-				       y + (font->ascent + font->descent - h) / 2,
-				       x + rbearing + arrow_width - i,
-				       y + (font->ascent + font->descent - h) / 2 + h - 1);
-		}
-	}
-}
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
deleted file mode 100644
index 62f66e4bd3..0000000000
--- a/widgets/table/e-table-header-utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ETable widget - utilities for drawing table header buttons
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Chris Lahey <clahey@ximian.com>
- *          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 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_TABLE_HEADER_UTILS_H
-#define E_TABLE_HEADER_UTILS_H
-
-#include <gal/e-table/e-table-col.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-double  e_table_header_compute_height  (ETableCol      *ecol,
-					GtkStyle       *style,
-					GdkFont        *font);
-double  e_table_header_width_extras    (GtkStyle       *style);
-void    e_table_header_draw_button     (GdkDrawable    *drawable,
-					ETableCol      *ecol,
-					GtkStyle       *style,
-					GdkFont        *font,
-					GtkStateType    state,
-					GtkWidget      *widget,
-					GdkGC          *gc,
-					int             x,
-					int             y,
-					int             width,
-					int             height,
-					int             button_width,
-					int             button_height,
-					ETableColArrow  arrow);
-void    e_table_draw_elided_string     (GdkDrawable    *drawable,
-					GdkFont        *font,
-					GdkGC          *gc,
-					int             x,
-					int             y,
-					const char     *str,
-					int             max_width,
-					gboolean        center);
-				 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
deleted file mode 100644
index 58d60480cd..0000000000
--- a/widgets/table/e-table-header.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-col-head.c: TableColHead implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "e-table-header.h"
-#include "e-table-defines.h"
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_SORT_INFO,
-	ARG_WIDTH,
-	ARG_WIDTH_EXTRAS,
-};
-
-enum {
-	STRUCTURE_CHANGE,
-	DIMENSION_CHANGE,
-	REQUEST_WIDTH,
-	LAST_SIGNAL
-};
-
-static void eth_set_size (ETableHeader *eth, int idx, int size);
-static void eth_calc_widths (ETableHeader *eth);
-
-static guint eth_signals [LAST_SIGNAL] = { 0, };
-
-static GtkObjectClass *e_table_header_parent_class;
-
-struct two_ints {
-	int column;
-	int width;
-};
-
-static void
-eth_set_width (ETableHeader *eth, int width)
-{
-	eth->width = width;
-}
-
-static void
-dequeue (ETableHeader *eth, int *column, int *width)
-{
-	GSList *head;
-	struct two_ints *store;
-	head = eth->change_queue;
-	eth->change_queue = eth->change_queue->next;
-	if (!eth->change_queue)
-		eth->change_tail = NULL;
-	store = head->data;
-	g_slist_free_1(head);
-	if (column)
-		*column = store->column;
-	if (width)
-		*width = store->width;
-	g_free(store);
-}
-
-static gboolean
-dequeue_idle (ETableHeader *eth)
-{
-	int column, width;
-
-	dequeue (eth, &column, &width);
-	while (eth->change_queue && ((struct two_ints *) eth->change_queue->data)->column == column)
-		dequeue (eth, &column, &width);
-
-	if (column == -1)
-		eth_set_width (eth, width);
-	else if (column < eth->col_count)
-		eth_set_size (eth, column, width);
-	if (eth->change_queue)
-		return TRUE;
-	else {
-		eth_calc_widths (eth);
-		eth->idle = 0;
-		return FALSE;
-	}
-}
-
-static void
-enqueue (ETableHeader *eth, int column, int width)
-{
-	struct two_ints *store;
-	store = g_new(struct two_ints, 1);
-	store->column = column;
-	store->width = width;
-	
-	eth->change_tail = g_slist_last(g_slist_append(eth->change_tail, store));
-	if (!eth->change_queue)
-		eth->change_queue = eth->change_tail;
-
-	if (!eth->idle) {
-		eth->idle = g_idle_add_full(G_PRIORITY_LOW, (GSourceFunc) dequeue_idle, eth, NULL);
-	}
-}
-
-void
-e_table_header_set_size (ETableHeader *eth, int idx, int size)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-
-	enqueue (eth, idx, size);
-}
-
-static void
-eth_do_remove (ETableHeader *eth, int idx, gboolean do_unref)
-{
-	if (do_unref)
-		gtk_object_unref (GTK_OBJECT (eth->columns [idx]));
-	
-	memmove (&eth->columns [idx], &eth->columns [idx+1],
-		 sizeof (ETableCol *) * (eth->col_count - idx - 1));
-	eth->col_count--;
-}
-
-static void
-eth_destroy (GtkObject *object)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-	const int cols = eth->col_count;
-	int i;
-	
-	if (eth->sort_info) {
-		if (eth->sort_info_group_change_id)
-			gtk_signal_disconnect(GTK_OBJECT(eth->sort_info),
-					      eth->sort_info_group_change_id);
-		gtk_object_unref(GTK_OBJECT(eth->sort_info));
-	}
-
-	if (eth->idle)
-		g_source_remove(eth->idle);
-	g_slist_foreach(eth->change_queue, (GFunc) g_free, NULL);
-	g_slist_free(eth->change_queue);
-	
-	/*
-	 * Destroy columns
-	 */
-	for (i = cols - 1; i >= 0; i--){
-		eth_do_remove (eth, i, TRUE);
-	}
-	
-	if (e_table_header_parent_class->destroy)
-		e_table_header_parent_class->destroy (object);
-}
-
-static void
-eth_group_info_changed(ETableSortInfo *info, ETableHeader *eth)
-{
-	enqueue(eth, -1, eth->nominal_width);
-}
-
-static void
-eth_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		eth->nominal_width = GTK_VALUE_DOUBLE (*arg);
-		enqueue(eth, -1, GTK_VALUE_DOUBLE (*arg));
-		break;
-	case ARG_WIDTH_EXTRAS:
-		eth->width_extras = GTK_VALUE_DOUBLE (*arg);
-		enqueue(eth, -1, eth->nominal_width);
-		break;
-	case ARG_SORT_INFO:
-		if (eth->sort_info) {
-			if (eth->sort_info_group_change_id)
-				gtk_signal_disconnect(GTK_OBJECT(eth->sort_info), eth->sort_info_group_change_id);
-			gtk_object_unref(GTK_OBJECT(eth->sort_info));
-		}
-		eth->sort_info = E_TABLE_SORT_INFO(GTK_VALUE_OBJECT (*arg));
-		if (eth->sort_info) {
-			gtk_object_ref(GTK_OBJECT(eth->sort_info));
-			eth->sort_info_group_change_id 
-				= gtk_signal_connect(GTK_OBJECT(eth->sort_info), "group_info_changed",
-						     GTK_SIGNAL_FUNC(eth_group_info_changed), eth);
-		}
-		enqueue(eth, -1, eth->nominal_width);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-eth_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eth->sort_info);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eth->nominal_width;
-		break;
-	case ARG_WIDTH_EXTRAS:
-		GTK_VALUE_DOUBLE (*arg) = eth->width_extras;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_table_header_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = eth_destroy;
-	object_class->set_arg = eth_set_arg;
-	object_class->get_arg = eth_get_arg;
-
-
-	e_table_header_parent_class = (gtk_type_class (gtk_object_get_type ()));
-
-	gtk_object_add_arg_type ("ETableHeader::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ETableHeader::width_extras", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH_EXTRAS); 
-	gtk_object_add_arg_type ("ETableHeader::sort_info", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_SORT_INFO); 
-
-	eth_signals [STRUCTURE_CHANGE] =
-		gtk_signal_new ("structure_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, structure_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	eth_signals [DIMENSION_CHANGE] = 
-		gtk_signal_new ("dimension_change", 
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, dimension_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-	eth_signals [REQUEST_WIDTH] = 
-		gtk_signal_new ("request_width",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, request_width),
-				gtk_marshal_INT__INT,
-				GTK_TYPE_INT, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, eth_signals, LAST_SIGNAL);
-}
-
-static void
-e_table_header_init (ETableHeader *eth)
-{
-	eth->col_count                 = 0;
-	eth->width                     = 0;
-
-	eth->sort_info                 = NULL;
-	eth->sort_info_group_change_id = 0;
-
-	eth->columns                   = NULL;
-	
-	eth->change_queue              = NULL;
-	eth->change_tail               = NULL;
-
-	eth->width_extras              = 0;
-}
-
-/**
- * e_table_header_new:
- *
- * Returns: A new @ETableHeader object.
- */
-ETableHeader *
-e_table_header_new (void)
-{
-	ETableHeader *eth;
-
-	eth = gtk_type_new (e_table_header_get_type ());
-
-	return eth;
-}
-
-static void
-eth_update_offsets (ETableHeader *eth)
-{
-	int i;
-	int x = 0;
-	
-	for (i = 0; i < eth->col_count; i++){
-		ETableCol *etc = eth->columns [i];
-
-		etc->x = x;
-		x += etc->width;
-	}
-}
-
-static void
-eth_do_insert (ETableHeader *eth, int pos, ETableCol *val)
-{
-	memmove (&eth->columns [pos+1], &eth->columns [pos],
-		sizeof (ETableCol *) * (eth->col_count - pos));
-	eth->columns [pos] = val;
-	eth->col_count ++;
-}
-
-/**
- * e_table_header_add_column:
- * @eth: the table header to add the column to.
- * @tc: the ETableCol definition
- * @pos: position where the ETableCol will go.
- *
- * This function adds the @tc ETableCol definition into the @eth ETableHeader
- * at position @pos.  This is the way you add new ETableCols to the
- * ETableHeader.
- *
- * This function will emit the "structure_change" signal on the @eth object.
- * The ETableCol is assumed 
- */
-void
-e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (tc != NULL);
-	g_return_if_fail (E_IS_TABLE_COL (tc));
-	g_return_if_fail (pos >= -1 && pos <= eth->col_count);
-
-	if (pos == -1)
-		pos = eth->col_count;
-	eth->columns = g_realloc (eth->columns, sizeof (ETableCol *) * (eth->col_count + 1));
-
-	/*
-	 * We are the primary owners of the column
-	 */
-	gtk_object_ref (GTK_OBJECT (tc));
-	gtk_object_sink (GTK_OBJECT (tc));
-	
-	eth_do_insert (eth, pos, tc);
-
-	enqueue(eth, -1, eth->nominal_width);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/**
- * e_table_header_get_column:
- * @eth: the ETableHeader to query
- * @column: the column inside the @eth.
- *
- * Returns: The ETableCol at @column in the @eth object
- */
-ETableCol *
-e_table_header_get_column (ETableHeader *eth, int column)
-{
-	g_return_val_if_fail (eth != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL);
-
-	if (column < 0)
-		return NULL;
-
-	if (column >= eth->col_count)
-		return NULL;
-
-	return eth->columns [column];
-}
-
-/**
- * e_table_header_get_column_by_col_id:
- * @eth: the ETableHeader to query
- * @col_id: the col_id to search for.
- *
- * Returns: The ETableCol with col_idx = @col_idx in the @eth object
- */
-ETableCol *
-e_table_header_get_column_by_col_idx (ETableHeader *eth, int col_idx)
-{
-	int i;
-	g_return_val_if_fail (eth != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL);
-
-	for (i = 0; i < eth->col_count; i++) {
-		if (eth->columns[i]->col_idx == col_idx) {
-			return eth->columns [i];
-		}
-	}
-
-	return NULL;
-}
-
-/**
- * e_table_header_count:
- * @eth: the ETableHeader to query
- *
- * Returns: the number of columns in this ETableHeader.
- */
-int
-e_table_header_count (ETableHeader *eth)
-{
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	return eth->col_count;
-}
-
-/** 
- * e_table_header_index:
- * @eth: the ETableHeader to query
- * @col: the column to fetch.
- *
- * ETableHeaders contain the visual list of columns that the user will
- * view.  The visible columns will typically map to different columns
- * in the ETableModel (because the user reordered the data for
- * example).
- *
- * Returns: the column in the model that the @col column
- * in the ETableHeader points to.  */
-int
-e_table_header_index (ETableHeader *eth, int col)
-{
-	g_return_val_if_fail (eth != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), -1);
-	g_return_val_if_fail (col >= 0 && col < eth->col_count, -1);
-
-	return eth->columns [col]->col_idx;
-}
-
-/**
- * e_table_header_get_index_at:
- * @eth: the ETableHeader to query
- * @x_offset: a pixel count from the beginning of the ETableHeader
- *
- * This will return the ETableHeader column that would contain
- * the @x_offset pixel.
- *
- * Returns: the column that contains pixel @x_offset, or -1
- * if no column inside this ETableHeader contains that pixel.
- */
-int
-e_table_header_get_index_at (ETableHeader *eth, int x_offset)
-{
-	int i, total;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	total = 0;
-	for (i = 0; i < eth->col_count; i++){
-		total += eth->columns [i]->width;
-
-		if (x_offset < total)
-			return i;
-	}
-
-	return -1;
-}
-
-/**
- * e_table_header_get_columns:
- * @eth: The ETableHeader to query
- *
- * Returns: A NULL terminated array of the ETableCols
- * contained in the ETableHeader @eth.  Note that every
- * returned ETableCol in the array has been referenced, to release
- * this information you need to g_free the buffer returned
- * and you need to gtk_object_unref every element returned
- */
-ETableCol **
-e_table_header_get_columns (ETableHeader *eth)
-{
-	ETableCol **ret;
-	int i;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	ret = g_new (ETableCol *, eth->col_count + 1);
-	memcpy (ret, eth->columns, sizeof (ETableCol *) * eth->col_count);
-	ret [eth->col_count] = NULL;
-
-	for (i = 0; i < eth->col_count; i++) {
-		gtk_object_ref(GTK_OBJECT(ret[i]));
-	}
-
-	return ret;
-}
-
-/**
- * e_table_header_get_selected:
- * @eth: The ETableHeader to query
- *
- * Returns: The number of selected columns in the @eth object.
- */
-int
-e_table_header_get_selected (ETableHeader *eth)
-{
-	int i;
-	int selected = 0;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	for (i = 0; i < eth->col_count; i++){
-		if (eth->columns [i]->selected)
-			selected++;
-	}
-
-	return selected;
-}
-
-/**
- * e_table_header_total_width:
- * @eth: The ETableHeader to query
- *
- * Returns: the number of pixels used by the @eth object
- * when rendered on screen
- */
-int
-e_table_header_total_width (ETableHeader *eth)
-{
-	int total, i;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	total = 0;
-	for (i = 0; i < eth->col_count; i++)
-		total += eth->columns [i]->width;
-
-	return total;
-}
-
-/**
- * e_table_header_move:
- * @eth: The ETableHeader to operate on.
- * @source_index: the source column to move.
- * @target_index: the target location for the column
- *
- * This function moves the column @source_index to @target_index
- * inside the @eth ETableHeader.  The signals "dimension_change"
- * and "structure_change" will be emmited
- */
-void
-e_table_header_move (ETableHeader *eth, int source_index, int target_index)
-{
-	ETableCol *old;
-	
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (source_index >= 0);
-	g_return_if_fail (target_index >= 0);
-	g_return_if_fail (source_index < eth->col_count);
-	g_return_if_fail (target_index < eth->col_count + 1); /* Can be moved beyond the last item. */
-
-	if (source_index < target_index)
-		target_index --;
-
-	old = eth->columns [source_index];
-	eth_do_remove (eth, source_index, FALSE);
-	eth_do_insert (eth, target_index, old);
-	eth_update_offsets (eth);
-	
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [DIMENSION_CHANGE]);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/**
- * e_table_header_remove:
- * @eth: The ETableHeader to operate on.
- * @idx: the index to the column to be removed.
- *
- * Removes the column at @idx position in the ETableHeader @eth.
- * This emmits the "structure_change" signal on the @eth object.
- */
-void
-e_table_header_remove (ETableHeader *eth, int idx)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < eth->col_count);
-
-	eth_do_remove (eth, idx, TRUE);
-	enqueue(eth, -1, eth->nominal_width);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/*
- * FIXME: deprecated?
- */
-void
-e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-}
-
-static void
-eth_set_size (ETableHeader *eth, int idx, int size)
-{
-	double expansion;
-	double old_expansion;
-	int min_width;
-	int left_width;
-	int total_extra;
-	int expandable_count;
-	int usable_width;
-	int i;
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < eth->col_count);
-	
-	/* If this column is not resizable, don't do anything. */
-	if (!eth->columns[idx]->resizeable)
-		return;
-
-	expansion = 0;
-	min_width = 0;
-	left_width = 0;
-	expandable_count = -1;
-
-	/* Calculate usable area. */
-	for (i = 0; i < idx; i++) {
-		left_width += eth->columns[i]->width;
-	}
-	/* - 1 to account for the last pixel border. */
-	usable_width = eth->width - left_width - 1;
-
-	if (eth->sort_info)
-		usable_width -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT;
-
-	/* Calculate minimum_width of stuff on the right as well as
-	 * total usable expansion on the right. 
-	 */
-	for (; i < eth->col_count; i++) {
-		min_width += eth->columns[i]->min_width + eth->width_extras;
-		if (eth->columns[i]->resizeable) {
-			expansion += eth->columns[i]->expansion;
-			expandable_count ++;
-		}
-	}
-	/* If there's no room for anything, don't change. */
-	if (expansion == 0)
-		return;
-
-	/* (1) If none of the columns to the right are expandable, use
-	 * all the expansion space in this column.
-	 */
-	if(expandable_count == 0) {
-		eth->columns[idx]->expansion = expansion;
-		for (i = idx + 1; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-
-	total_extra = usable_width - min_width;
-	/* If there's no extra space, set all expansions to 0. */
-	if (total_extra <= 0) {
-		for (i = idx; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-
-	/* If you try to resize smaller than the minimum width, it
-	 * uses the minimum. */
-	if (size < eth->columns[idx]->min_width + eth->width_extras)
-		size = eth->columns[idx]->min_width + eth->width_extras;
-
-	/* If all the extra space will be used up in this column, use
-	 * all the expansion and set all others to 0.
-	 */
-	if (size >= total_extra + eth->columns[idx]->min_width + eth->width_extras) {
-		eth->columns[idx]->expansion = expansion;
-		for (i = idx + 1; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-	
-	/* The old_expansion used by columns to the right. */
-	old_expansion = expansion;
-	old_expansion -= eth->columns[idx]->expansion;
-	/* Set the new expansion so that it will generate the desired size. */
-	eth->columns[idx]->expansion = expansion * (((double)(size - (eth->columns[idx]->min_width + eth->width_extras)))/((double)total_extra));
-	/* The expansion left for the columns on the right. */
-	expansion -= eth->columns[idx]->expansion;
-
-	/* (2) If the old columns to the right didn't have any
-	 * expansion before, expand them evenly.  old_expansion > 0 by
-	 * expansion = SUM(i=idx to col_count -1,
-	 * columns[i]->min_width) - columns[idx]->min_width) =
-	 * SUM(non-negatives).
-	 */
-	if (old_expansion == 0) {
-		for (i = idx + 1; i < eth->col_count; i++) {
-			if (eth->columns[idx]->resizeable) {
-				/* expandable_count != 0 by (1) */
-				eth->columns[i]->expansion = expansion / expandable_count;
-			}
-		}
-		return;
-	}
-
-	/* Remove from total_extra the amount used for this column. */
-	total_extra -= size - (eth->columns[idx]->min_width + eth->width_extras);
-	for (i = idx + 1; i < eth->col_count; i++) {
-		if (eth->columns[idx]->resizeable) {
-			/* old_expansion != 0 by (2) */
-			eth->columns[i]->expansion *= expansion / old_expansion;
-		}
-	}
-}
-
-/**
- * e_table_header_col_diff:
- * @eth: the ETableHeader to query.
- * @start_col: the starting column
- * @end_col: the ending column.
- *
- * Computes the number of pixels between the columns @start_col and
- * @end_col.
- *
- * Returns: the number of pixels between @start_col and @end_col on the
- * @eth ETableHeader object
- */
-int
-e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
-{
-	int total, col;
-
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	if (start_col < 0)
-		start_col = 0;
-	if (end_col > eth->col_count)
-		end_col = eth->col_count;
-
-	total = 0;
-	for (col = start_col; col < end_col; col++){
-		
-		total += eth->columns [col]->width;
-	}
-
-	return total;
-}
-
-static void
-eth_calc_widths (ETableHeader *eth)
-{
-	int i;
-	int extra;
-	double expansion;
-	int last_position = 0;
-	double next_position = 0;
-	int last_resizable = -1;
-	/* - 1 to account for the last pixel border. */
-	extra = eth->width - 1;
-	expansion = 0;
-	for (i = 0; i < eth->col_count; i++) {
-		extra -= eth->columns[i]->min_width + eth->width_extras;
-		if (eth->columns[i]->resizeable && eth->columns[i]->expansion > 0)
-			last_resizable = i;
-		expansion += eth->columns[i]->resizeable ? eth->columns[i]->expansion : 0;
-		eth->columns[i]->width = eth->columns[i]->min_width + eth->width_extras;
-	}
-	if (eth->sort_info)
-		extra -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT;
-	if (expansion == 0 || extra <= 0)
-		return;
-	for (i = 0; i < last_resizable; i++) {
-		next_position += extra * (eth->columns[i]->resizeable ? eth->columns[i]->expansion : 0)/expansion;
-		eth->columns[i]->width += next_position - last_position;
-		last_position = next_position;
-	}
-	eth->columns[i]->width += extra - last_position;
-
-	eth_update_offsets (eth);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [DIMENSION_CHANGE]);
-}
-
-void
-e_table_header_update_horizontal (ETableHeader *eth)
-{
-	int i;
-	int cols;
-
-	cols = eth->col_count;
-
-	for (i = 0; i < cols; i++) {
-		int width;
-		
-		gtk_signal_emit_by_name (GTK_OBJECT (eth),
-					 "request_width",
-					 i, &width);
-		eth->columns[i]->min_width = width + 10;
-		eth->columns[i]->expansion = 1;
-	}
-	enqueue(eth, -1, eth->nominal_width);
-}
-
-GtkType
-e_table_header_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableHeader",
-			sizeof (ETableHeader),
-			sizeof (ETableHeaderClass),
-			(GtkClassInitFunc) e_table_header_class_init,
-			(GtkObjectInitFunc) e_table_header_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
deleted file mode 100644
index c186a8c48c..0000000000
--- a/widgets/table/e-table-header.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COLUMN_H_
-#define _E_TABLE_COLUMN_H_
-
-#include <gtk/gtkobject.h>
-#include <gdk/gdk.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-col.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _ETableHeader ETableHeader;
-
-#define E_TABLE_HEADER_TYPE        (e_table_header_get_type ())
-#define E_TABLE_HEADER(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_TYPE, ETableHeader))
-#define E_TABLE_HEADER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_HEADER_TYPE, ETableHeaderClass))
-#define E_IS_TABLE_HEADER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_HEADER_TYPE))
-#define E_IS_TABLE_HEADER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_TYPE))
-
-/*
- * A Columnar header.
- */
-struct _ETableHeader {
-	GtkObject base;
-
-	int col_count;
-	int width;
-	int nominal_width;
-	int width_extras;
-
-	ETableSortInfo *sort_info;
-	int sort_info_group_change_id;
-
-	ETableCol **columns;
-	
-	GSList *change_queue, *change_tail;
-	gint idle;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	void (*structure_change) (ETableHeader *eth);
-	void (*dimension_change) (ETableHeader *eth, int col);
-	int (*request_width) (ETableHeader *eth, int col);
-} ETableHeaderClass;
-
-GtkType       e_table_header_get_type               (void);
-ETableHeader *e_table_header_new                    (void);
-
-void          e_table_header_add_column             (ETableHeader *eth,
-						     ETableCol    *tc,
-						     int           pos);
-ETableCol    *e_table_header_get_column             (ETableHeader *eth,
-						     int           column);
-ETableCol    *e_table_header_get_column_by_col_idx  (ETableHeader *eth,
-						     int           col_idx);
-int           e_table_header_count                  (ETableHeader *eth);
-int           e_table_header_index                  (ETableHeader *eth,
-						     int           col);
-int           e_table_header_get_index_at           (ETableHeader *eth,
-						     int           x_offset);
-ETableCol   **e_table_header_get_columns            (ETableHeader *eth);
-int           e_table_header_get_selected           (ETableHeader *eth);
-
-int           e_table_header_total_width            (ETableHeader *eth);
-void          e_table_header_move                   (ETableHeader *eth,
-						     int           source_index,
-						     int           target_index);
-void          e_table_header_remove                 (ETableHeader *eth,
-						     int           idx);
-void          e_table_header_set_size               (ETableHeader *eth,
-						     int           idx,
-						     int           size);
-void          e_table_header_set_selection          (ETableHeader *eth,
-						     gboolean      allow_selection);
-int           e_table_header_col_diff               (ETableHeader *eth,
-						     int           start_col,
-						     int           end_col);
-
-void          e_table_header_calc_widths            (ETableHeader *eth);
-GList        *e_table_header_get_selected_indexes   (ETableHeader *eth);
-
-void          e_table_header_update_horizontal      (ETableHeader *eth);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_HEADER_H_ */
-
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
deleted file mode 100644
index 3296287ce7..0000000000
--- a/widgets/table/e-table-item.c
+++ /dev/null
@@ -1,2676 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-item.c: A GnomeCanvasItem that is a view of an ETableModel.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000, 2001, Ximian, Inc.
- *
- * TODO:
- *   Add a border to the thing, so that focusing works properly.
- *
- */
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <math.h>
-#include "e-table-item.h"
-#include "e-table-subset.h"
-#include "e-cell.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define FOCUSED_BORDER 2
-
-static GnomeCanvasItemClass *eti_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-	LAST_SIGNAL
-};
-
-static gint eti_signals [LAST_SIGNAL] = { 0, };
-
-enum {
-	ARG_0,
-	ARG_TABLE_HEADER,
-	ARG_TABLE_MODEL,
-	ARG_TABLE_SELECTION_MODEL,
-	ARG_TABLE_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_LENGTH_THRESHOLD,
-	ARG_CURSOR_ROW,
-	
-	ARG_MINIMUM_WIDTH,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-#define DOUBLE_CLICK_TIME      250
-#define TRIPLE_CLICK_TIME      500
-
-
-static int eti_get_height (ETableItem *eti);
-static int eti_get_minimum_width (ETableItem *eti);
-static int eti_row_height (ETableItem *eti, int row);
-static void e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state);
-static void eti_cursor_change (ETableSelectionModel *selection, int row, int col, ETableItem *eti);
-static void eti_cursor_activated (ETableSelectionModel *selection, int row, int col, ETableItem *eti);
-static void eti_selection_change (ETableSelectionModel *selection, ETableItem *eti);
-#if 0
-static void eti_request_region_show (ETableItem *eti,
-				     int start_col, int start_row,
-				     int end_col, int end_row);
-#endif
-#define ETI_ROW_HEIGHT(eti,row) ((eti)->height_cache && (eti)->height_cache[(row)] != -1 ? (eti)->height_cache[(row)] : eti_row_height((eti),(row)))
-
-inline static gint
-model_to_view_row(ETableItem *eti, int row)
-{
-	int i;
-	if (eti->uses_source_model) {
-		ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
-		if (eti->row_guess >= 0 && eti->row_guess < etss->n_map) {
-			if (etss->map_table[eti->row_guess] == row) {
-				return eti->row_guess;
-			}
-		}
-		for (i = 0; i < etss->n_map; i++) {
-			if (etss->map_table[i] == row)
-				return i;
-		}
-		return -1;
-	} else
-		return row;
-}
-
-inline static gint
-view_to_model_row(ETableItem *eti, int row)
-{
-	if (eti->uses_source_model) {
-		ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
-		if (row >= 0 && row < etss->n_map)
-			return etss->map_table[row];
-		else
-			return -1;
-	} else
-		return row;
-}
-
-inline static gint
-model_to_view_col(ETableItem *eti, int col)
-{
-	int i;
-	for (i = 0; i < eti->cols; i++) {
-		ETableCol *ecol = e_table_header_get_column (eti->header, i);
-		if (ecol->col_idx == col)
-			return i;
-	}
-	return -1;
-}
-
-inline static gint
-view_to_model_col(ETableItem *eti, int col)
-{
-	ETableCol *ecol = e_table_header_get_column (eti->header, col);
-	return ecol ? ecol->col_idx : -1;
-}
-
-static gboolean
-eti_editing (ETableItem *eti)
-{
-	if (eti->editing_col == -1)
-		return FALSE;
-	else
-		return TRUE;
-}
-
-/*
- * During realization, we have to invoke the per-ecell realize routine
- * (On our current setup, we have one e-cell per column.
- *
- * We might want to optimize this to only realize the unique e-cells:
- * ie, a strings-only table, uses the same e-cell for every column, and
- * we might want to avoid realizing each e-cell.
- */
-static void
-eti_realize_cell_views (ETableItem *eti)
-{
-	int i;
-	
-	for (i = 0; i < eti->n_cells; i++)
-		e_cell_realize (eti->cell_views [i]);
-	eti->cell_views_realized = 1;
-}
-
-static void
-eti_attach_cell_views (ETableItem *eti)
-{
-	int i;
-
-	g_assert (eti->header);
-	g_assert (eti->table_model);
-	
-	/*
-	 * Now realize the various ECells
-	 */
-	eti->n_cells = eti->cols;
-	eti->cell_views = g_new (ECellView *, eti->n_cells);
-
-	for (i = 0; i < eti->n_cells; i++){
-		ETableCol *ecol = e_table_header_get_column (eti->header, i);
-		
-		eti->cell_views [i] = e_cell_new_view (ecol->ecell, eti->table_model, eti);
-	}
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-/*
- * During unrealization: we invoke every e-cell (one per column in the current
- * setup) to dispose all X resources allocated
- */
-static void
-eti_unrealize_cell_views (ETableItem *eti)
-{
-	int i;
-
-	if (eti->cell_views_realized == 0)
-		return;
-	
-	for (i = 0; i < eti->n_cells; i++)
-		e_cell_unrealize (eti->cell_views [i]);
-	eti->cell_views_realized = 0;
-}
-
-static void
-eti_detach_cell_views (ETableItem *eti)
-{
-	int i;
-	
-	for (i = 0; i < eti->n_cells; i++){
-		e_cell_kill_view (eti->cell_views [i]);
-		eti->cell_views [i] = NULL;
-	}
-		
-	g_free (eti->cell_views);
-	eti->cell_views = NULL;
-	eti->n_cells = 0;
-}
-
-static void
-eti_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	/* Wrong BBox's are the source of redraw nightmares */
-
-	gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (eti), i2c);
-	
-	i1.x = eti->x1;
-	i1.y = eti->y1;
-	i2.x = eti->x1 + eti->width;
-	i2.y = eti->y1 + eti->height;
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-	
-	*x1 = c1.x;
-	*y1 = c1.y;
-	*x2 = c2.x + 1;
-	*y2 = c2.y + 1;
-}
-
-static void
-eti_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	if (eti->needs_compute_height) {
-		int new_height = eti_get_height (eti);
-
-		if (new_height != eti->height) {
-			eti->height = new_height;
-			e_canvas_item_request_parent_reflow (GNOME_CANVAS_ITEM (eti));
-			eti->needs_redraw = 1;
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-		}
-		eti->needs_compute_height = 0;
-	}
-	if (eti->needs_compute_width) {
-		int new_width = eti_get_minimum_width (eti);
-		new_width = MAX(new_width, eti->minimum_width);
-		if (new_width != eti->width) {
-			eti->width = new_width;
-			e_canvas_item_request_parent_reflow (GNOME_CANVAS_ITEM (eti));
-			eti->needs_redraw = 1;
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-		}
-		eti->needs_compute_width = 0;
-	}
-}
-
-/*
- * GnomeCanvasItem::update method
- */
-static void
-eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ArtPoint o1, o2;
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, affine, clip_path, flags);
-
-	o1.x = item->x1;
-	o1.y = item->y1;
-	o2.x = item->x2;
-	o2.y = item->y2;
-
-	eti_bounds (item, &item->x1, &item->y1, &item->x2, &item->y2);
-	if (item->x1 != o1.x ||
-	    item->y1 != o1.y ||
-	    item->x2 != o2.x ||
-	    item->y2 != o2.y) {
-		gnome_canvas_request_redraw (item->canvas, o1.x, o1.y, o2.x, o2.y);
-		eti->needs_redraw = 1;
-	}
-
-	if (eti->needs_redraw) {
-		gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-					     item->x2, item->y2);
-		eti->needs_redraw = 0;
-	}
-}
-
-/*
- * eti_remove_table_model:
- *
- * Invoked to release the table model associated with this ETableItem
- */
-static void
-eti_remove_table_model (ETableItem *eti)
-{
-	if (!eti->table_model)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_pre_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_row_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_cell_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_row_inserted_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_row_deleted_id);
-	gtk_object_unref (GTK_OBJECT (eti->table_model));
-	if (eti->source_model)
-		gtk_object_unref (GTK_OBJECT (eti->source_model));
-
-	eti->table_model_pre_change_id = 0;
-	eti->table_model_change_id = 0;
-	eti->table_model_row_change_id = 0;
-	eti->table_model_cell_change_id = 0;
-	eti->table_model_row_inserted_id = 0;
-	eti->table_model_row_deleted_id = 0;
-	eti->table_model = NULL;
-	eti->source_model = NULL;
-	eti->uses_source_model = 0;
-}
-
-/*
- * eti_remove_table_model:
- *
- * Invoked to release the table model associated with this ETableItem
- */
-static void
-eti_remove_table_selection_model (ETableItem *eti)
-{
-	if (!eti->selection)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->selection_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->cursor_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->cursor_activated_id);
-	gtk_object_unref (GTK_OBJECT (eti->selection));
-
-	eti->selection_change_id = 0;
-	eti->cursor_activated_id = 0;
-	eti->selection = NULL;
-}
-
-/*
- * eti_remove_header_model:
- *
- * Invoked to release the header model associated with this ETableItem
- */
-static void
-eti_remove_header_model (ETableItem *eti)
-{
-	if (!eti->header)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_structure_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_dim_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_request_width_id);
-	
-	if (eti->cell_views){
-		eti_unrealize_cell_views (eti);
-		eti_detach_cell_views (eti);
-	}
-	gtk_object_unref (GTK_OBJECT (eti->header));
-
-
-	eti->header_structure_change_id = 0;
-	eti->header_dim_change_id = 0;
-	eti->header_request_width_id = 0;
-	eti->header = NULL;
-}
-
-/*
- * eti_row_height_real:
- *
- * Returns the height used by row @row.  This does not include the one-pixel
- * used as a separator between rows
- */
-static int
-eti_row_height_real (ETableItem *eti, int row)
-{
-	const int cols = e_table_header_count (eti->header);
-	int col;
-	int h, max_h;
-
-	g_assert (cols == 0 || eti->cell_views);
-	
-	max_h = 0;
-	
-	for (col = 0; col < cols; col++){
-		h = e_cell_height (eti->cell_views [col], view_to_model_col(eti, col), col, row);
-
-		if (h > max_h)
-			max_h = h;
-	}
-	return max_h;
-}
-
-static gboolean
-height_cache_idle(ETableItem *eti)
-{
-	int changed = 0;
-	int i;
-	if (!eti->height_cache) {
-		eti->height_cache = g_new(int, eti->rows);
-	}
-	for (i = eti->height_cache_idle_count; i < eti->rows; i++) {
-		if (eti->height_cache[i] == -1) {
-			eti_row_height(eti, i);
-			changed ++;
-			if (changed >= 20)
-				break;
-		}
-	}
-	if (changed >= 20) {
-		eti->height_cache_idle_count = i;
-		return TRUE;
-	}
-	eti->height_cache_idle_id = 0;
-	return FALSE;	
-}
-
-static void
-free_height_cache (ETableItem *eti)
-{
-	if (eti->height_cache)
-		g_free (eti->height_cache);
-	eti->height_cache = NULL;
-	eti->height_cache_idle_count = 0;
-	
-	if (eti->height_cache_idle_id == 0)
-		eti->height_cache_idle_id = g_idle_add_full(G_PRIORITY_LOW, (GSourceFunc) height_cache_idle, eti, NULL);
-}
-
-static void
-calculate_height_cache (ETableItem *eti)
-{
-	int i;
-	free_height_cache(eti);
-	eti->height_cache = g_new(int, eti->rows);
-	for (i = 0; i < eti->rows; i++) {
-		eti->height_cache[i] = -1;
-	}
-}
-
-
-/*
- * eti_row_height:
- *
- * Returns the height used by row @row.  This does not include the one-pixel
- * used as a separator between rows
- */
-static int
-eti_row_height (ETableItem *eti, int row)
-{
-	if (!eti->height_cache) {
-		calculate_height_cache (eti);
-	}
-	if (eti->height_cache[row] == -1) {
-		eti->height_cache[row] = eti_row_height_real(eti, row);
-		if (row > 0 && 
-		    eti->length_threshold != -1 && 
-		    eti->rows > eti->length_threshold &&
-		    eti->height_cache[row] != eti_row_height(eti, 0)) {
-			eti->needs_compute_height = 1;
-			e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(eti));
-		}
-	}
-	return eti->height_cache[row];
-}
-
-/*
- * eti_get_height:
- *
- * Returns the height of the ETableItem.
- *
- * The ETableItem might compute the whole height by asking every row its
- * size.  There is a special mode (designed to work when there are too
- * many rows in the table that performing the previous step could take 
- * too long) set by the ETableItem->length_threshold that would determine
- * when the height is computed by using the first row as the size for
- * every other row in the ETableItem.
- */
-static int
-eti_get_height (ETableItem *eti)
-{
-	const int rows = eti->rows;
-	int row;
-	int height;
-
-	if (rows == 0)
-		return 0;
-
-	if (eti->length_threshold != -1){
-		if (rows > eti->length_threshold){
-			int row_height = eti_row_height(eti, 0);
-			if (eti->height_cache) {
-				height = 0;
-				for (row = 0; row < rows; row++) {
-					if (eti->height_cache[row] == -1) {
-						height += (row_height + 1) * (rows - row);
-						break;
-					}
-					else
-						height += eti->height_cache[row] + 1;
-				}
-			} else
-				height = (eti_row_height (eti, 0) + 1) * rows;
-
-			/*
-			 * 1 pixel at the top
-			 */
-			return height + 1;
-		}
-	}
-
-	height = 1;
-	for (row = 0; row < rows; row++)
-		height += eti_row_height (eti, row) + 1;
-
-	return height;
-}
-
-static int
-eti_get_minimum_width (ETableItem *eti)
-{
-	int width = 0;
-	int col;
-	for (col = 0; col < eti->cols; col++){
-		ETableCol *ecol = e_table_header_get_column (eti->header, col);
-		
-		width += ecol->min_width;
-	}
-	return width;
-}
-
-static void
-eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
-	ArtDRect rect;
-	double i2c [6];
-	
-	rect.x0 = x0;
-	rect.y0 = y0;
-	rect.x1 = x1;
-	rect.y1 = y1;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_drect_affine_transform (&rect, &rect, i2c);
-
-	gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
-}
-
-/*
- * Callback routine: invoked before the ETableModel has suffers a change
- */
-static void
-eti_table_model_pre_change (ETableModel *table_model, ETableItem *eti)
-{
-	if (eti_editing (eti))
-		e_table_item_leave_edit (eti);
-}
-
-/*
- * Callback routine: invoked when the ETableModel has suffered a change
- */
-static void
-eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
-{
-#if 0
-	int view_row;
-#endif
-
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	free_height_cache(eti);
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-
-#if 0
-	view_row = model_to_view_row(eti, eti->cursor_row);
-	if (view_row >= 0 && eti->cursor_col >= 0)
-		eti_request_region_show (eti, eti->cursor_col, view_row, eti->cursor_col, view_row);
-#endif
-}
-
-/*
- * Computes the distance between @start_row and @end_row in pixels
- */
-int
-e_table_item_row_diff (ETableItem *eti, int start_row, int end_row)
-{
-	int row, total;
-
-	total = 0;
-
-	for (row = start_row; row < end_row; row++)
-		total += eti_row_height (eti, row) + 1;
-
-	return total;
-}
-
-/*
- * eti_request_region_redraw:
- *
- * Request a canvas redraw on the range (start_col, start_row) to (end_col, end_row).
- * This is inclusive (ie, you can use: 0,0-0,0 to redraw the first cell).
- *
- * The @border argument is a number of pixels around the region that should also be queued
- * for redraw.   This is typically used by the focus routines to queue a redraw for the
- * border as well.
- */
-static void
-eti_request_region_redraw (ETableItem *eti,
-			   int start_col, int start_row,
-			   int end_col, int end_row, int border)
-{
-	int x1, y1, width, height;
-
-	if (eti->rows > 0) {
-		
-		x1 = e_table_header_col_diff (eti->header, 0, start_col);
-		y1 = e_table_item_row_diff (eti, 0, start_row);
-		width = e_table_header_col_diff (eti->header, start_col, end_col + 1);
-		height = e_table_item_row_diff (eti, start_row, end_row + 1);
-		
-		eti_item_region_redraw (eti, eti->x1 + x1 - border,
-					eti->y1 + y1 - border,
-					eti->x1 + x1 + width + 1 + border,
-					eti->y1 + y1 + height + 1 + border);
-	}
-}
-
-/*
- * eti_request_region_show
- *
- * Request a canvas show on the range (start_col, start_row) to (end_col, end_row).
- * This is inclusive (ie, you can use: 0,0-0,0 to show the first cell).
- */
-static void
-eti_request_region_show (ETableItem *eti,
-			 int start_col, int start_row,
-			 int end_col, int end_row, int delay)
-{
-	int x1, y1, x2, y2;
-	
-	x1 = e_table_header_col_diff (eti->header, 0, start_col);
-	y1 = e_table_item_row_diff (eti, 0, start_row);
-	x2 = x1 + e_table_header_col_diff (eti->header, start_col, end_col + 1);
-	y2 = y1 + e_table_item_row_diff (eti, start_row, end_row + 1);
-
-	if (delay)
-		e_canvas_item_show_area_delayed(GNOME_CANVAS_ITEM(eti), x1, y1, x2, y2, delay);
-	else
-		e_canvas_item_show_area(GNOME_CANVAS_ITEM(eti), x1, y1, x2, y2);
-}
-
-static void
-eti_table_model_row_changed (ETableModel *table_model, int row, ETableItem *eti)
-{
-	if (eti->renderers_can_change_size &&
-	    eti->height_cache && eti->height_cache[row] != -1 &&
-	    eti_row_height_real(eti, row) != eti->height_cache[row]) {
-		eti_table_model_changed (table_model, eti);
-		return;
-	}
-
-	eti_request_region_redraw (eti, 0, row, eti->cols - 1, row, 0);
-}
-
-static void
-eti_table_model_cell_changed (ETableModel *table_model, int col, int row, ETableItem *eti)
-{
-	if (eti->renderers_can_change_size &&
-	    eti->height_cache && eti->height_cache[row] != -1 &&
-	    eti_row_height_real(eti, row) != eti->height_cache[row]) {
-		eti_table_model_changed (table_model, eti);
-		return;
-	}
-
-	eti_request_region_redraw (eti, 0, row, eti->cols - 1, row, 0);
-}
-
-static void
-eti_table_model_row_inserted (ETableModel *table_model, int row, ETableItem *eti)
-{
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	if (eti->height_cache) {
-		eti->height_cache = g_renew(int, eti->height_cache, eti->rows);
-		memmove(eti->height_cache + row + 1, eti->height_cache + row, (eti->rows - 1 - row) * sizeof(int));
-		eti->height_cache[row] = -1;
-	}
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_table_model_row_deleted (ETableModel *table_model, int row, ETableItem *eti)
-{
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	if (eti->height_cache)
-		memmove(eti->height_cache + row, eti->height_cache + row + 1, (eti->rows - row) * sizeof(int));
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-/** 
- * e_table_item_redraw_range
- * @eti: %ETableItem which will be redrawn
- * @start_col: The first col to redraw.
- * @start_row: The first row to redraw.
- * @end_col: The last col to redraw.
- * @end_row: The last row to redraw.
- *
- * This routine redraws the given %ETableItem in the range given.  The
- * range is inclusive at both ends.
- */
-void
-e_table_item_redraw_range (ETableItem *eti,
-			   int start_col, int start_row,
-			   int end_col, int end_row)
-{
-	int border;
-	int cursor_col, cursor_row;
-	
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	if ((start_col == cursor_col) ||
-	    (end_col   == cursor_col) ||
-	    (view_to_model_row(eti, start_row) == cursor_row) ||
-	    (view_to_model_row(eti, end_row)   == cursor_row))
-		border = 2;
-	else
-		border = 0;
-
-	eti_request_region_redraw(eti, start_col, start_row, end_col, end_row, border);
-}
-
-static void
-eti_add_table_model (ETableItem *eti, ETableModel *table_model)
-{
-	g_assert (eti->table_model == NULL);
-	
-	eti->table_model = table_model;
-	gtk_object_ref (GTK_OBJECT (eti->table_model));
-
-	eti->table_model_pre_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_pre_change",
-		GTK_SIGNAL_FUNC (eti_table_model_pre_change), eti);
-
-	eti->table_model_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_changed), eti);
-
-	eti->table_model_row_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_row_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_row_changed), eti);
-
-	eti->table_model_cell_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_cell_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_cell_changed), eti);
-
-	eti->table_model_row_inserted_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_row_inserted",
-		GTK_SIGNAL_FUNC (eti_table_model_row_inserted), eti);
-
-	eti->table_model_row_deleted_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_row_deleted",
-		GTK_SIGNAL_FUNC (eti_table_model_row_deleted), eti);
-
-	if (eti->header) {
-		eti_detach_cell_views (eti);
-		eti_attach_cell_views (eti);
-	}
-
-	if (E_IS_TABLE_SUBSET(table_model)) {
-		eti->uses_source_model = 1;
-		eti->source_model = E_TABLE_SUBSET(table_model)->source;
-		if (eti->source_model)
-			gtk_object_ref(GTK_OBJECT(eti->source_model));
-	}
-	
-	eti_table_model_changed (table_model, eti);
-}
-
-static void
-eti_add_table_selection_model (ETableItem *eti, ETableSelectionModel *selection)
-{
-	g_assert (eti->selection == NULL);
-	
-	eti->selection = selection;
-	gtk_object_ref (GTK_OBJECT (eti->selection));
-
-	eti->selection_change_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "selection_changed",
-		GTK_SIGNAL_FUNC (eti_selection_change), eti);
-
-	eti->cursor_change_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "cursor_changed",
-		GTK_SIGNAL_FUNC (eti_cursor_change), eti);
-
-	eti->cursor_activated_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "cursor_activated",
-		GTK_SIGNAL_FUNC (eti_cursor_activated), eti);
-
-	eti_selection_change(selection, eti);
-}
-
-static void
-eti_header_dim_changed (ETableHeader *eth, int col, ETableItem *eti)
-{
-	eti->needs_compute_width = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
-{
-	eti->cols = e_table_header_count (eti->header);
-	eti->width = e_table_header_total_width (eti->header);
-
-	/*
-	 * There should be at least one column
-	 *  BUT: then you can't remove all columns from a header and add new ones.
-	 */
-	/*g_assert (eti->cols != 0);*/
-
-	if (eti->cell_views){
-		eti_unrealize_cell_views (eti);
-		eti_detach_cell_views (eti);
-		eti_attach_cell_views (eti);
-		eti_realize_cell_views (eti);
-	} else {
-		if (eti->table_model) {
-			eti_detach_cell_views (eti);
-			eti_attach_cell_views (eti);
-		}
-	}
-	eti->needs_compute_width = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-}
-
-static int
-eti_request_column_width (ETableHeader *eth, int col, ETableItem *eti)
-{
-	int width = 0;
-	
-	if (eti->cell_views) {
-		width = e_cell_max_width (eti->cell_views[col], view_to_model_col(eti, col), col);
-	}
-
-	return width;
-}
-
-static void
-eti_add_header_model (ETableItem *eti, ETableHeader *header)
-{
-	g_assert (eti->header == NULL);
-	
-	eti->header = header;
-	gtk_object_ref (GTK_OBJECT (header));
-
-	eti_header_structure_changed (header, eti);
-	
-	eti->header_dim_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC (eti_header_dim_changed), eti);
-
-	eti->header_structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC (eti_header_structure_changed), eti);
-
-	eti->header_request_width_id = gtk_signal_connect 
-		(GTK_OBJECT (header), "request_width",
-		 GTK_SIGNAL_FUNC (eti_request_column_width), eti);
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-eti_destroy (GtkObject *object)
-{
-	ETableItem *eti = E_TABLE_ITEM (object);
-
-	eti_remove_header_model (eti);
-	eti_remove_table_model (eti);
-	eti_remove_table_selection_model (eti);
-
-	if (eti->height_cache_idle_id)
-		g_source_remove(eti->height_cache_idle_id);
-
-	if (eti->height_cache)
-		g_free (eti->height_cache);
-	eti->height_cache = NULL;
-	eti->height_cache_idle_count = 0;
-
-	if (eti->tooltip->window)
-		gtk_widget_destroy (eti->tooltip->window);
-	if (eti->tooltip->timer) {
-		gtk_timeout_remove (eti->tooltip->timer);
-		eti->tooltip->timer = 0;
-	}
-	g_free (eti->tooltip);
-
-	if (GTK_OBJECT_CLASS (eti_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (eti_parent_class)->destroy) (object);
-}
-
-static void
-eti_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableItem *eti;
-	int cursor_col;
-
-	item = GNOME_CANVAS_ITEM (o);
-	eti = E_TABLE_ITEM (o);
-
-	switch (arg_id){
-	case ARG_TABLE_HEADER:
-		eti_remove_header_model (eti);
-		eti_add_header_model (eti, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_TABLE_MODEL:
-		eti_remove_table_model (eti);
-		eti_add_table_model (eti, E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-		
-	case ARG_TABLE_SELECTION_MODEL:
-		eti_remove_table_selection_model (eti);
-		if (GTK_VALUE_OBJECT (*arg))
-			eti_add_table_selection_model (eti, E_TABLE_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-		
-	case ARG_LENGTH_THRESHOLD:
-		eti->length_threshold = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_TABLE_DRAW_GRID:
-		eti->draw_grid = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		eti->draw_focus = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_CURSOR_MODE:
-		eti->cursor_mode = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		if (eti->minimum_width == eti->width && GTK_VALUE_DOUBLE (*arg) > eti->width)
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-		eti->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		if (eti->minimum_width < eti->width)
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-		break;
-	case ARG_CURSOR_ROW:
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		e_table_item_focus (eti, cursor_col != -1 ? cursor_col : 0, view_to_model_row(eti, GTK_VALUE_INT (*arg)), 0);
-		break;
-	}
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(eti));
-}
-
-static void
-eti_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableItem *eti;
-	int row;
-
-	item = GNOME_CANVAS_ITEM (o);
-	eti = E_TABLE_ITEM (o);
-
-	switch (arg_id){
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eti->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = eti->height;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eti->minimum_width;
-		break;
-	case ARG_CURSOR_ROW:
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &row,
-			       NULL);
-		GTK_VALUE_INT (*arg) = model_to_view_row(eti, row);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-	}
-}
-
-static void
-eti_init (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	eti->editing_col               = -1;
-	eti->editing_row               = -1;
-	eti->height                    = 0;
-	eti->width                     = 0;
-	eti->minimum_width             = 0;
-
-	eti->height_cache              = NULL;
-	eti->height_cache_idle_id      = 0;
-	eti->height_cache_idle_count   = 0;
-	
-	eti->length_threshold          = -1;
-	eti->renderers_can_change_size = 1;
-
-	eti->uses_source_model         = 0;
-	eti->source_model              = NULL;
-	
-	eti->row_guess                 = -1;
-	eti->cursor_mode               = E_CURSOR_SIMPLE;
-
-	eti->selection_change_id       = 0;
-	eti->cursor_change_id          = 0;
-	eti->cursor_activated_id          = 0;
-	eti->selection                 = NULL;
-
-	eti->needs_redraw              = 0;
-	eti->needs_compute_height      = 0;
-
-	eti->in_key_press              = 0;
-
-	eti->tooltip                   = g_new0 (ETableTooltip, 1);
-	eti->tooltip->timer            = 0;
-	eti->tooltip->window           = NULL;
-	eti->tooltip->eti              = GNOME_CANVAS_ITEM (eti);
-
-	eti->grabbed_col               = -1;
-	eti->grabbed_row               = -1;
-
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (eti), eti_reflow);
-}
-
-#define gray50_width 2
-#define gray50_height 2
-static const char gray50_bits[] = {
-	0x02, 0x01, };
-
-#if 0
-static gint
-eti_visibility_notify(GtkWidget	         *widget,
-		      GdkEventVisibility *event,
-		      ETableItem         *eti)
-{
-	if (eti->tooltip->window) {
-		gtk_widget_destroy (eti->tooltip->window);
-		eti->tooltip->window = NULL;
-	}
-
-	return FALSE;
-}
-#endif
-
-static void
-eti_realize (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	GtkWidget *canvas_widget = GTK_WIDGET (item->canvas);
-	GdkWindow *window;
-#if 0
-	GdkEventMask mask;
-#endif
-	
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
-
-	/*
-	 * Gdk Resource allocation
-	 */
-	window = canvas_widget->window;
-
-	eti->fill_gc = gdk_gc_new (window);
-
-	eti->grid_gc = gdk_gc_new (window);
-#if 0
-	/* This sets it to gray */
-/*	gdk_gc_set_foreground (eti->grid_gc, &canvas_widget->style->bg [GTK_STATE_NORMAL]); */
-#else
-	gdk_gc_set_foreground (eti->grid_gc, &canvas_widget->style->dark [GTK_STATE_NORMAL]);
-#endif
-	eti->focus_gc = gdk_gc_new (window);
-	gdk_gc_set_foreground (eti->focus_gc, &canvas_widget->style->bg [GTK_STATE_NORMAL]);
-	gdk_gc_set_background (eti->focus_gc, &canvas_widget->style->fg [GTK_STATE_NORMAL]);
-	eti->stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
-	gdk_gc_set_ts_origin (eti->focus_gc, 0, 0);
-	gdk_gc_set_stipple (eti->focus_gc, eti->stipple);
-	gdk_gc_set_fill (eti->focus_gc, GDK_OPAQUE_STIPPLED);
-
-#if 0
-	mask = gtk_widget_get_events(GTK_WIDGET(item->canvas));
-	mask |= GDK_VISIBILITY_NOTIFY_MASK;
-	gtk_widget_set_events(GTK_WIDGET(item->canvas), mask);
-
-	gtk_signal_connect(GTK_OBJECT(item->canvas), "visibility_notify_event",
-			   GTK_SIGNAL_FUNC(eti_visibility_notify), eti);
-#endif
-
-	if (eti->cell_views == NULL)
-		eti_attach_cell_views (eti);
-	
-	eti_realize_cell_views (eti);
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_unrealize (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	
-	if (eti_editing (eti))
-		e_table_item_leave_edit (eti);
-
-	gdk_gc_unref (eti->fill_gc);
-	eti->fill_gc = NULL;
-	gdk_gc_unref (eti->grid_gc);
-	eti->grid_gc = NULL;
-	gdk_gc_unref (eti->focus_gc);
-	eti->focus_gc = NULL;
-	gdk_bitmap_unref (eti->stipple);
-	eti->stipple = NULL;
-	
-	eti_unrealize_cell_views (eti);
-
-	eti->height = 0;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
-}
-
-static void
-eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	const int rows = eti->rows;
-	const int cols = eti->cols;
-	int row, col, y1, y2;
-	int first_col, last_col, x_offset;
-	int first_row, last_row, y_offset, yd;
-	int x1, x2;
-	int f_x1, f_x2, f_y1, f_y2;
-	gboolean f_found;
-	double i2c [6];
-	ArtPoint eti_base, eti_base_item, lower_right;
-	GtkWidget *canvas = GTK_WIDGET(item->canvas);
-	GdkColor *background;
-	
-	/*
-	 * Clear the background
-	 */
-#if 0
-	gdk_draw_rectangle (
-		drawable, eti->fill_gc, TRUE,
-		eti->x1 - x, eti->y1 - y, eti->width, eti->height);
-#endif
-
-	/*
-	 * Find out our real position after grouping
-	 */
-	gnome_canvas_item_i2c_affine (item, i2c);
-	eti_base_item.x = eti->x1;
-	eti_base_item.y = eti->y1;
-	art_affine_point (&eti_base, &eti_base_item, i2c);
-
-	eti_base_item.x = eti->x1 + eti->width;
-	eti_base_item.y = eti->y1 + eti->height;
-	art_affine_point (&lower_right, &eti_base_item, i2c);
-
-	/*
-	 * First column to draw, last column to draw
-	 */
-	first_col = -1;
-	last_col = x_offset = 0;
-	x1 = x2 = floor (eti_base.x);
-	for (col = 0; col < cols; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-		x2 = x1 + ecol->width;
-		
-		if (x1 > (x + width))
-			break;
-		if (x2 < x)
-			continue;
-		if (first_col == -1){
-			x_offset = x1 - x;
-			first_col = col;
-		}
-	}
-	last_col = col;
-
-	/*
-	 * Nothing to paint
-	 */
-	if (first_col == -1)
-		return;
-
-	/*
-	 * Compute row span.
-	 */
-	first_row = -1;
-	y_offset = 0;
-	y1 = y2 = floor (eti_base.y) + 1;
-	for (row = 0; row < rows; row++, y1 = y2){
-
-		y2 += ETI_ROW_HEIGHT (eti, row) + 1;
-
-		if (y1 > y + height)
-			break;
-
-		if (y2 < y)
-			continue;
-
-		if (first_row == -1){
-			y_offset = y1 - y;
-			first_row = row;
-		}
-	}
-	last_row = row;
-
-	if (first_row == -1)
-		return;
-
-	/*
-	 * Draw cells
-	 */
-	yd = y_offset;
-	f_x1 = f_x2 = f_y1 = f_y2 = -1;
-	f_found = FALSE;
-
-	if (eti->draw_grid && first_row == 0){
-		gdk_draw_line (
-			drawable, eti->grid_gc,
-				eti_base.x - x, yd, eti_base.x + eti->width - x, yd);
-	}
-	yd++;
-	
-	for (row = first_row; row < last_row; row++){
-		int xd, height;
-		gboolean selected;
-		gint cursor_col, cursor_row;
-		
-		height = ETI_ROW_HEIGHT (eti, row);
-
-		xd = x_offset;
-/*		printf ("paint: %d %d\n", yd, yd + height); */
-		
-		selected = e_selection_model_is_row_selected(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti,row));
-		
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_col", &cursor_col,
-			       "cursor_row", &cursor_row,
-			       NULL);
-		
-		for (col = first_col; col < last_col; col++){
-			ETableCol *ecol = e_table_header_get_column (eti->header, col);
-			ECellView *ecell_view = eti->cell_views [col];
-			gboolean col_selected = selected;
-			ECellFlags flags;
-			switch (eti->cursor_mode) {
-			case E_CURSOR_SIMPLE:
-			case E_CURSOR_SPREADSHEET:
-				if (cursor_col == ecol->col_idx && cursor_row == view_to_model_row(eti, row))
-					col_selected = !col_selected;
-				break;
-			case E_CURSOR_LINE:
-				/* Nothing */
-				break;
-			}
-
-			if (col_selected){
-				if (GTK_WIDGET_HAS_FOCUS(canvas))
-					background = &canvas->style->bg [GTK_STATE_SELECTED];
-				else
-					background = &canvas->style->bg [GTK_STATE_ACTIVE];
-			} else {
-#if 0
-				if (row % 2)
-#endif
-					background = &canvas->style->base [GTK_STATE_NORMAL];
-#if 0
-				else
-					background = &canvas->style->base [GTK_STATE_SELECTED];
-#endif
-			}
-
-			gdk_gc_set_foreground (eti->fill_gc, background);
-			gdk_draw_rectangle (drawable, eti->fill_gc, TRUE,
-					    xd, yd, ecol->width, height);
-
-			flags = col_selected ? E_CELL_SELECTED : 0;
-			flags |= GTK_WIDGET_HAS_FOCUS(canvas) ? E_CELL_FOCUSED : 0;
-			switch (ecol->justification) {
-			case GTK_JUSTIFY_LEFT:
-				flags |= E_CELL_JUSTIFY_LEFT;
-				break;
-			case GTK_JUSTIFY_RIGHT:
-				flags |= E_CELL_JUSTIFY_RIGHT;
-				break;
-			case GTK_JUSTIFY_CENTER:
-				flags |= E_CELL_JUSTIFY_CENTER;
-				break;
-			case GTK_JUSTIFY_FILL:
-				flags |= E_CELL_JUSTIFY_FILL;
-				break;
-			}
-
-			e_cell_draw (ecell_view, drawable, ecol->col_idx, col, row, flags,
-				     xd, yd, xd + ecol->width, yd + height);
-			
-			if (!f_found) {
-				switch (eti->cursor_mode) {
-				case E_CURSOR_LINE:
-					if (view_to_model_row(eti, row) == cursor_row) {
-						f_x1 = floor (eti_base.x) - x;
-						f_x2 = floor (lower_right.x) - x;
-						f_y1 = yd;
-						f_y2 = yd + height;
-						f_found = TRUE;
-					}
-					break;
-				case E_CURSOR_SIMPLE:
-				case E_CURSOR_SPREADSHEET:
-					if (view_to_model_col(eti, col) == cursor_col && view_to_model_row(eti, row) == cursor_row) {
-						f_x1 = xd;
-						f_x2 = xd + ecol->width;
-						f_y1 = yd;
-						f_y2 = yd + height;
-						f_found = TRUE;
-					}
-					break;
-				}
-			}
-
-			xd += ecol->width;
-		}
-		yd += height;
-
-		if (eti->draw_grid)
-			gdk_draw_line (
-				drawable, eti->grid_gc,
-				eti_base.x - x, yd, eti_base.x + eti->width - x, yd);
-		yd++;
-	}
-
-	if (eti->draw_grid){
-		int xd = x_offset;
-		
-		for (col = first_col; col <= last_col; col++){
-			ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-			gdk_draw_line (
-				drawable, eti->grid_gc,
-				xd, y_offset, xd, yd - 1);
-
-			/*
-			 * This looks wierd, but it is to draw the last line
-			 */
-			if (ecol)
-				xd += ecol->width;
-		}
-	}
-	
-	/*
-	 * Draw focus
-	 */
-	if (eti->draw_focus && f_found) {
-		gdk_gc_set_ts_origin (eti->focus_gc, f_x1, f_y1);
-		gdk_draw_rectangle (drawable, eti->focus_gc, FALSE,
-				    f_x1, f_y1, f_x2 - f_x1 - 1, f_y2 - f_y1 - 1);
-	}
-}
-
-static double
-eti_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-
-	return 0.0;
-}
-
-static gboolean
-find_cell (ETableItem *eti, double x, double y, int *col_res, int *row_res, double *x1_res, double *y1_res)
-{
-	const int cols = eti->cols;
-	const int rows = eti->rows;
-	gdouble x1, y1, x2, y2;
-	int col, row;
-	
-	/* FIXME: this routine is inneficient, fix later */
-
-	if (eti->grabbed_col >= 0 && eti->grabbed_row >= 0) {
-		*col_res = eti->grabbed_col;
-		*row_res = eti->grabbed_row;
-		*x1_res = x - eti->x1 - e_table_header_col_diff (eti->header, 0, eti->grabbed_col);
-		*y1_res = y - eti->y1 - e_table_item_row_diff (eti, 0, eti->grabbed_row);
-		return TRUE;
-	}
-	
-	if (cols == 0 || rows == 0)
-		return FALSE;
-
-	x -= eti->x1;
-	y -= eti->y1;
-	
-	x1 = 0;
-	for (col = 0; col < cols - 1; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-		if (x < x1)
-			return FALSE;
-		
-		x2 = x1 + ecol->width;
-
-		if (x <= x2)
-			break;
-	}
-
-	y1 = y2 = 0;
-	for (row = 0; row < rows - 1; row++, y1 = y2){
-		if (y < y1)
-			return FALSE;
-		
-		y2 += ETI_ROW_HEIGHT (eti, row) + 1;
-
-		if (y <= y2)
-			break;
-	}
-	*col_res = col;
-	if (x1_res)
-		*x1_res = x - x1;
-	*row_res = row;
-	if (y1_res)
-		*y1_res = y - y1;
-	return TRUE;
-}
-
-static void
-eti_cursor_move (ETableItem *eti, gint row, gint column)
-{
-	e_table_item_leave_edit (eti);
-	e_table_item_focus (eti, view_to_model_col(eti, column), view_to_model_row(eti, row), 0);
-}
-
-static void
-eti_cursor_move_left (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row), model_to_view_col(eti, cursor_col) - 1);
-}
-
-static void
-eti_cursor_move_right (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row), model_to_view_col(eti, cursor_col) + 1);
-}
-
-#if 0
-static void
-eti_cursor_move_up (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row) - 1, model_to_view_col(eti, cursor_col));
-}
-
-static void
-eti_cursor_move_down (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row) + 1, model_to_view_col(eti, cursor_col));
-}
-#endif
-
-#if 0
-static int
-_do_tooltip (ETableItem *eti)
-{
-	ECellView *ecell_view;
-	int x = 0, y = 0;
-	int i;
-
-	if (eti->tooltip->window) {
-		gtk_widget_destroy (eti->tooltip->window);
-		eti->tooltip->window = NULL;
-	}
-
-	if (eti_editing (eti))
-		return FALSE;
-
-	ecell_view = eti->cell_views[eti->tooltip->col];
-
-	for (i = 0; i < eti->tooltip->col; i++)
-		x += eti->header->columns[i]->width;
-	eti->tooltip->x = x;
-
-	for (i = 0; i < eti->tooltip->row; i++)
-		y += (ETI_ROW_HEIGHT (eti, i) + 1);
-	eti->tooltip->y = y;
-	eti->tooltip->row_height = ETI_ROW_HEIGHT (eti, i);
-	
-	e_cell_show_tooltip (ecell_view, 
-			     view_to_model_col (eti, eti->tooltip->col),
-			     eti->tooltip->col,
-			     eti->tooltip->row,
-			     eti->header->columns[eti->tooltip->col]->width,
-			     eti->tooltip);
-	return FALSE;
-}
-#endif
-
-static gint
-eti_e_cell_event     (ETableItem *item, ECellView *ecell_view, GdkEvent *event, int time, int model_col, int view_col, int row, ECellFlags flags)
-{
-	ECellActions actions = 0;
-	gint ret_val;
-
-	ret_val = e_cell_event (ecell_view, event, model_col, view_col, row, flags, &actions);
-
-	if (actions & E_CELL_GRAB) {
-		gnome_canvas_item_grab(GNOME_CANVAS_ITEM(item), GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, time);
-		item->grabbed_col = view_col;
-		item->grabbed_row = row;
-	}
-
-	if (actions & E_CELL_UNGRAB) {
-		gnome_canvas_item_ungrab(GNOME_CANVAS_ITEM(item), time);
-		item->grabbed_col = -1;
-		item->grabbed_row = -1;
-	}
-
-	return ret_val;
-}
-
-/* FIXME: cursor */
-static int
-eti_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	ECellView *ecell_view;
-	gint return_val = TRUE;
-
-	switch (e->type){
-	case GDK_BUTTON_PRESS: {
-		double x1, y1;
-		GdkEventButton button;
-		int col, row;
-		gint cursor_row, cursor_col;
-
-		if (eti->tooltip->timer) {
-			gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-
-		switch (e->button.button) {
-		case 1: /* Fall through. */
-		case 2:
-			e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti));
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) {
-				if (eti_editing (eti))
-					e_table_item_leave_edit (eti);
-				return TRUE;
-			}
-
-			ecell_view = eti->cell_views [col];
-			button = *(GdkEventButton *)e;
-			button.x = x1;
-			button.y = y1;
-
-			return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, view_to_model_col(eti, col), col, row, 0);
-			if (return_val)
-				return TRUE;
-
-			return_val = FALSE;
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CLICK],
-					 row, view_to_model_col(eti, col), &button, &return_val);
-			if (return_val)
-				return TRUE;
-
-			e_selection_model_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), button.state);
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &cursor_row,
-				       "cursor_col", &cursor_col,
-				       NULL);
-			
-			if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-
-				if ((!eti_editing(eti)) && e_table_model_is_cell_editable(eti->selection->model, cursor_col, cursor_row)) {
-					e_table_item_enter_edit (eti, col, row);
-				}
-
-				/*
-				 * Adjust the event positions
-				 */
-
-				return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, 
-							       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-			}
-			g_print("Single click\n");
-
-			break;
-		case 3:
-			e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti));
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
-				return TRUE;
-
-			e_selection_model_maybe_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), 0);
-			
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [RIGHT_CLICK],
-					 row, view_to_model_col(eti, col), e, &return_val);
-			break;
-		case 4:
-		case 5:
-			return FALSE;
-			break;
-			
-		}
-		break;
-	}
-
-	case GDK_BUTTON_RELEASE: {
-		double x1, y1;
-		int col, row;
-		gint cursor_row, cursor_col;
-
-		if (eti->tooltip->timer) {
-			gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		if (eti->tooltip->window) {
-			gtk_widget_destroy (eti->tooltip->window);
-			eti->tooltip->window = NULL;
-		}
-		switch (e->button.button) {
-		case 1: /* Fall through. */
-		case 2:
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
-				return TRUE;
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &cursor_row,
-				       "cursor_col", &cursor_col,
-				       NULL);
-
-			if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-
-				ecell_view = eti->cell_views [col];
-
-				/*
-				 * Adjust the event positions
-				 */
-				e->button.x = x1;
-				e->button.y = y1;
-
-				return_val = eti_e_cell_event (eti, ecell_view, e, e->button.time,
-							       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-			}
-			g_print ("Release\n");
-			break;
-		case 3:
-		case 4:
-		case 5:
-			return FALSE;
-			break;
-			
-		}
-		break;
-	}
-
-	case GDK_2BUTTON_PRESS: {
-		int col, row;
-		GdkEventButton button;
-
-		if (e->button.button == 5 ||
-		    e->button.button == 4)
-			return FALSE;
-
-		gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-#if 0
-		if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
-			return TRUE;
-#endif
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &row,
-			       "cursor_col", &col,
-			       NULL);
-
-#if 0
-		button = *(GdkEventButton *)e;
-		button.x = x1;
-		button.y = y1;
-#endif
-
-		gtk_signal_emit (GTK_OBJECT (eti), eti_signals [DOUBLE_CLICK],
-				 row, col, &button);
-		g_print("Double click\n");
-		break;
-	}
-	case GDK_MOTION_NOTIFY: {
-		int col, row;
-		double x1, y1;
-		gint cursor_col, cursor_row;
-
-		gnome_canvas_item_w2i (item, &e->motion.x, &e->motion.y);
-
-		if (!find_cell (eti, e->motion.x, e->motion.y, &col, &row, &x1, &y1))
-			return TRUE;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (eti->tooltip->window) {
-			gtk_widget_destroy (eti->tooltip->window);
-			eti->tooltip->window = NULL;
-		}
-
-		if (eti->tooltip->timer > 0)
-			gtk_timeout_remove (eti->tooltip->timer);
-#if 0
-		eti->tooltip->col = col;
-		eti->tooltip->row = row;
-		eti->tooltip->cx = e->motion.x;
-		eti->tooltip->cy = e->motion.y;
-		eti->tooltip->timer = gtk_timeout_add (100, (GSourceFunc)_do_tooltip, eti);
-#endif
-
-		if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-			ecell_view = eti->cell_views [col];
-
-			/*
-			 * Adjust the event positions
-			 */
-			e->motion.x = x1;
-			e->motion.y = y1;
-			
-			return_val = eti_e_cell_event (eti, ecell_view, e, e->motion.time,
-						       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-		}
-		break;
-	}
-		
-	case GDK_KEY_PRESS: {
-		gint cursor_row, cursor_col;
-		gint handled = TRUE;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (eti->tooltip->window) {
-			gtk_widget_destroy (eti->tooltip->window);
-			eti->tooltip->window = NULL;
-		}
-
-		if (cursor_col == -1)
-			return FALSE;
-
-		eti->in_key_press = TRUE;
-
-		switch (e->key.keyval){
-		case GDK_Left:
-			if (eti_editing (eti)) {
-				handled = FALSE;
-				break;
-			}
-			
-			if (eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, 0))
-				eti_cursor_move_left (eti);
-			break;
-			
-		case GDK_Right:
-			if (eti_editing (eti)) {
-				handled = FALSE;
-				break;
-			}
-
-			if (eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, eti->cols - 1))
-				eti_cursor_move_right (eti);
-			break;
-			
-		case GDK_Up:
-		case GDK_Down:
-			return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-#if 0
-		case GDK_Up:
-			if (cursor_row != view_to_model_row(eti, 0))
-				eti_cursor_move_up (eti);
-			else
-				return_val = FALSE;
-			break;
-			
-		case GDK_Down:
-			if (cursor_row != view_to_model_row(eti, eti->rows - 1))
-				eti_cursor_move_down (eti);
-			else
-				return_val = FALSE;
-			break;
-#endif
-		case GDK_Home:
-		case GDK_KP_Home:
-			if (eti->cursor_mode != E_CURSOR_LINE) {
-				eti_cursor_move (eti, model_to_view_row(eti, cursor_row), 0);
-				return_val = TRUE;
-			} else 
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-		case GDK_End:
-		case GDK_KP_End:
-			if (eti->cursor_mode != E_CURSOR_LINE) {
-				eti_cursor_move (eti, model_to_view_row(eti, cursor_row), eti->cols - 1);
-				return_val = TRUE;
-			} else 
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-		case GDK_Tab:
-		case GDK_KP_Tab:
-		case GDK_ISO_Left_Tab:
-			if (eti->cursor_mode == E_CURSOR_SPREADSHEET) {
-				if ((e->key.state & GDK_SHIFT_MASK) != 0){
-				/* shift tab */
-					if (cursor_col != view_to_model_col(eti, 0))
-						eti_cursor_move_left (eti);
-					else if (cursor_row != view_to_model_row(eti, 0))
-						eti_cursor_move (eti, model_to_view_row(eti, cursor_row) - 1, eti->cols - 1);
-					else
-						return_val = FALSE;
-				} else {
-					if (cursor_col != view_to_model_col (eti, eti->cols - 1))
-						eti_cursor_move_right (eti);
-					else if (cursor_row != view_to_model_row(eti, eti->rows - 1))
-						eti_cursor_move (eti, model_to_view_row(eti, cursor_row) + 1, 0);
-					else 
-						return_val = FALSE;
-				}
-				gtk_object_get(GTK_OBJECT(eti->selection),
-					       "cursor_row", &cursor_row,
-					       "cursor_col", &cursor_col,
-					       NULL);
-
-				if (cursor_col >= 0 && cursor_row >= 0 && return_val &&
-				    (!eti_editing(eti)) && e_table_model_is_cell_editable(eti->selection->model, cursor_col, cursor_row)) {
-					e_table_item_enter_edit (eti, model_to_view_col(eti, cursor_col), model_to_view_row(eti, cursor_row));
-				}
-				break;
-			} else {
-			/* Let tab send you to the next widget. */
-			return_val = FALSE;
-			break;
-			}
-
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_ISO_Enter:
-		case GDK_3270_Enter:
-			if (eti_editing (eti)){
-				e_table_item_leave_edit (eti);
-#if 0
-				ecell_view = eti->cell_views [eti->editing_col];
-				return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-							       view_to_model_col(eti, eti->editing_col),
-							       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-#endif
-			}
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-					 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-			if (!return_val)
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-			
-		default:
-			handled = FALSE;
-			break;
-		}
-		if (!handled) {
-			if (!eti_editing (eti)){
-				gint col, row;
-				row = model_to_view_row(eti, cursor_row);
-				col = model_to_view_col(eti, cursor_col);
-				if (col != -1 && row != -1 && e_table_model_is_cell_editable(eti->selection->model, cursor_col, cursor_row)) {
-					e_table_item_enter_edit (eti, col, row);
-				}
-			}
-			if (!eti_editing (eti)){
-				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-						 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-				if (!return_val)
-					e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			} else {
-				ecell_view = eti->cell_views [eti->editing_col];
-				return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-							       view_to_model_col(eti, eti->editing_col),
-							       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-				if (!return_val)
-					e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			}
-		}
-		eti->in_key_press = FALSE;
-		break;
-	}
-	
-	case GDK_KEY_RELEASE: {
-		gint cursor_row, cursor_col;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (cursor_col == -1)
-			return FALSE;
-
-		if (eti_editing (eti)){
-			ecell_view = eti->cell_views [eti->editing_col];
-			return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-						       view_to_model_col(eti, eti->editing_col),
-						       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-		}
-		break;
-	}
-
-	case GDK_LEAVE_NOTIFY:
-	case GDK_ENTER_NOTIFY:
-		if (eti->tooltip->timer > 0)
-			gtk_timeout_remove (eti->tooltip->timer);
-		eti->tooltip->timer = 0;
-		break;
-
-	case GDK_FOCUS_CHANGE:
-		if (! e->focus_change.in) {
-			if (eti_editing (eti))
-				e_table_item_leave_edit (eti);
-		}
-
-	default:
-		return_val = FALSE;
-	}
-	return return_val;
-}
-
-static void
-eti_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableItemClass *eti_class  = (ETableItemClass *) object_class;
-	
-	eti_parent_class            = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy       = eti_destroy;
-	object_class->set_arg       = eti_set_arg;
-	object_class->get_arg       = eti_get_arg;
-
-	item_class->update          = eti_update;
-	item_class->realize         = eti_realize;
-	item_class->unrealize       = eti_unrealize;
-	item_class->draw            = eti_draw;
-	item_class->point           = eti_point;
-	item_class->event           = eti_event;
-	
-	eti_class->cursor_change    = NULL;
-	eti_class->cursor_activated = NULL;
-	eti_class->double_click     = NULL;
-	eti_class->right_click      = NULL;
-	eti_class->click            = NULL;
-	eti_class->key_press        = NULL;
-
-	gtk_object_add_arg_type ("ETableItem::ETableHeader", E_TABLE_HEADER_TYPE,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HEADER);
-	gtk_object_add_arg_type ("ETableItem::ETableModel", E_TABLE_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_TABLE_MODEL);
-	gtk_object_add_arg_type ("ETableItem::table_selection_model", E_TABLE_SELECTION_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_TABLE_SELECTION_MODEL);
-	gtk_object_add_arg_type ("ETableItem::drawgrid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableItem::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableItem::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableItem::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-
-	gtk_object_add_arg_type ("ETableItem::minimum_width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); 
-	gtk_object_add_arg_type ("ETableItem::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ETableItem::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableItem::cursor_row", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_ROW);
-
-	eti_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	eti_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	eti_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	eti_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	eti_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	eti_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, eti_signals, LAST_SIGNAL);
-
-}
-
-GtkType
-e_table_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableItem",
-			sizeof (ETableItem),
-			sizeof (ETableItemClass),
-			(GtkClassInitFunc) eti_class_init,
-			(GtkObjectInitFunc) eti_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/** 
- * e_table_item_set_cursor:
- * @eti: %ETableItem which will have the cursor set.
- * @col: Column to select.  -1 means the last column.
- * @row: Row to select.  -1 means the last row.
- *
- * This routine sets the cursor of the %ETableItem canvas item.
- */
-void
-e_table_item_set_cursor    (ETableItem *eti, int col, int row)
-{
-	e_table_item_focus(eti, col, view_to_model_row(eti, row), 0);
-}
-
-static void
-e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state)
-{
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	if (row == -1) {
-		row = view_to_model_row(eti, eti->rows - 1);
-	}
-
-	if (col == -1) {
-		col = eti->cols - 1;
-	}
-
-	if (row != -1) {
-		e_selection_model_do_something(E_SELECTION_MODEL (eti->selection),
-					       row, col,
-					       state);
-	}
-}
-
-/** 
- * e_table_item_get_focused_column:
- * @eti: %ETableItem which will have the cursor retrieved.
- *
- * This routine gets the cursor of the %ETableItem canvas item.
- *
- * Returns: The current cursor column.
- */
-gint
-e_table_item_get_focused_column (ETableItem *eti)
-{	
-	int cursor_col;
-
-	g_return_val_if_fail (eti != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_ITEM (eti), -1);
-	
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       NULL);
-
-	return cursor_col;
-}
-
-static void
-eti_cursor_change (ETableSelectionModel *selection, int row, int col, ETableItem *eti)
-{
-	int view_row = model_to_view_row(eti, row);
-	int view_col = model_to_view_col(eti, col);
-
-	if (view_row == -1 || view_col == -1) {
-		e_table_item_leave_edit (eti);
-		return;
-	}
-
-	if (!eti->in_key_press) {
-		eti_request_region_show (eti, view_col, view_row, view_col, view_row, DOUBLE_CLICK_TIME + 10);
-	} else {
-		eti_request_region_show (eti, view_col, view_row, view_col, view_row, 0);
-	}
-
-	e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti));
-	if (eti_editing(eti))
-		e_table_item_leave_edit (eti);
-	gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CURSOR_CHANGE],
-			 view_row);
-	eti->needs_redraw = TRUE;
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(eti));
-}
-
-static void
-eti_cursor_activated (ETableSelectionModel *selection, int row, int col, ETableItem *eti)
-{
-	int view_row = model_to_view_row(eti, row);
-	int view_col = model_to_view_col(eti, col);
-
-	if (view_row == -1 || view_col == -1) {
-		e_table_item_leave_edit (eti);
-		return;
-	}
-
-	if (eti_editing(eti))
-		e_table_item_leave_edit (eti);
-	gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CURSOR_ACTIVATED],
-			 view_row);
-}
-
-static void
-eti_selection_change (ETableSelectionModel *selection, ETableItem *eti)
-{
-	eti->needs_redraw = TRUE;
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(eti));
-}
-
-
-/** 
- * e_table_item_enter_edit
- * @eti: %ETableItem which will start being edited
- * @col: The view col to edit.
- * @row: The view row to edit.
- *
- * This routine starts the given %ETableItem editing at the given view
- * column and row.
- */
-void
-e_table_item_enter_edit (ETableItem *eti, int col, int row)
-{
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	if (eti_editing (eti))
-		e_table_item_leave_edit(eti);
-
-	eti->editing_col = col;
-	eti->editing_row = row;
-
-	eti->edit_ctx = e_cell_enter_edit (eti->cell_views [col], view_to_model_col(eti, col), col, row);
-}
-
-/** 
- * e_table_item_leave_edit
- * @eti: %ETableItem which will stop being edited
- *
- * This routine stops the given %ETableItem from editing.
- */
-void
-e_table_item_leave_edit (ETableItem *eti)
-{
-	int col, row;
-	void *edit_ctx;
-	
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-
-	if (!eti_editing (eti))
-		return;
-
-	col = eti->editing_col;
-	row = eti->editing_row;
-	edit_ctx = eti->edit_ctx;
-
-	eti->editing_col = -1;
-	eti->editing_row = -1;
-	eti->edit_ctx = NULL;
-
-	e_cell_leave_edit (eti->cell_views [col],
-			   view_to_model_col(eti, col),
-			   col, row, edit_ctx);
-}
-
-/** 
- * e_table_item_compute_location
- * @eti: %ETableItem to look in.
- * @x: A pointer to the x location to find in the %ETableItem.
- * @y: A pointer to the y location to find in the %ETableItem.
- * @row: A pointer to the location to store the found row in.
- * @col: A pointer to the location to store the found col in.
- *
- * This routine locates the pixel location (*x, *y) in the
- * %ETableItem.  If that location is in the %ETableItem, *row and *col
- * are set to the view row and column where it was found.  If that
- * location is not in the %ETableItem, the height of the %ETableItem
- * is removed from the value y points to.
- */
-void 
-e_table_item_compute_location (ETableItem        *eti,
-			       int               *x,
-			       int               *y,
-			       int               *row,
-			       int               *col)
-{
-	/* Save the grabbed row but make sure that we don't get flawed
-           results because the cursor is grabbed. */
-	int grabbed_row = eti->grabbed_row;
-	eti->grabbed_row = -1;
-
-	if (!find_cell (eti, *x, *y, col, row, NULL, NULL)) {
-		*y -= eti_get_height(eti);
-	}
-
-	eti->grabbed_row = grabbed_row;
-}
-
-typedef struct {
-	ETableItem *item;
-	int rows_printed;
-} ETableItemPrintContext;
-
-static gdouble *
-e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width)
-{
-	int i;
-	double extra;
-	double expansion;
-	int last_resizable = -1;
-	gdouble scale = 300.0L / 70.0L;
-	gdouble *widths = g_new(gdouble, e_table_header_count(eth));
-	/* - 1 to account for the last pixel border. */
-	extra = width - 1;
-	expansion = 0;
-	for (i = 0; i < eth->col_count; i++) {
-		extra -= eth->columns[i]->min_width * scale;
-		if (eth->columns[i]->resizeable && eth->columns[i]->expansion > 0)
-			last_resizable = i;
-		expansion += eth->columns[i]->resizeable ? eth->columns[i]->expansion : 0;
-		widths[i] = eth->columns[i]->min_width * scale;
-	}
-	for (i = 0; i <= last_resizable; i++) {
-		widths[i] += extra * (eth->columns[i]->resizeable ? eth->columns[i]->expansion : 0)/expansion;
-	}
-
-	return widths;
-}
-
-static gdouble
-eti_printed_row_height (ETableItem *eti, gdouble *widths, GnomePrintContext *context, gint row)
-{
-	int col;
-	int cols = eti->cols;
-	gdouble height = 0;
-	for (col = 0; col < cols; col++) {
-		ECellView *ecell_view = eti->cell_views [col];
-		gdouble this_height = e_cell_print_height (ecell_view, context, view_to_model_col(eti, col), col, row, 
-							   widths[col] - 1);
-		if (this_height > height)
-			height = this_height;
-	}
-	return height;
-}
-
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-
-static void
-e_table_item_print_page  (EPrintable *ep,
-			  GnomePrintContext *context,
-			  gdouble width,
-			  gdouble height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *eti = itemcontext->item;
-	const int rows = eti->rows;
-	const int cols = eti->cols;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row, col;
-	gdouble yd = height;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	if (eti->draw_grid){
-		gp_draw_rect(context, 0, yd, width, 1);
-	}
-	yd--;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble xd = 1, row_height;
-		
-		row_height = eti_printed_row_height(eti, widths, context, row);
-		if (quantize) {
-			if (yd - row_height - 1 < 0 && row != rows_printed) {
-				break;
-			}
-		} else {
-			if (yd < 0) {
-				break;
-			}
-		}
-
-		for (col = 0; col < cols; col++){
-			ECellView *ecell_view = eti->cell_views [col];
-
-			if (gnome_print_gsave(context) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(context, xd, yd - row_height) == -1)
-				/* FIXME */;
-
-			if (gnome_print_moveto(context, 0, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, widths[col] - 1, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, widths[col] - 1, row_height) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, 0, row_height) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, 0, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_clip(context) == -1)
-				/* FIXME */;
-
-			e_cell_print (ecell_view, context, view_to_model_col(eti, col), col, row, 
-				      widths[col] - 1, row_height);
-
-			if (gnome_print_grestore(context) == -1)
-				/* FIXME */;
-			
-			xd += widths[col];
-		}
-		yd -= row_height;
-
-		if (eti->draw_grid){
-			gp_draw_rect(context, 0, yd, width, 1);
-		}
-		yd--;
-	}
-
-	itemcontext->rows_printed = row;
-
-	if (eti->draw_grid){
-		gdouble xd = 0;
-		
-		for (col = 0; col < cols; col++){
-			gp_draw_rect(context, xd, height, 1, height - yd);
-			
-			xd += widths[col];
-		}
-		gp_draw_rect(context, xd, height, 1, height - yd);
-	}
-
-	g_free (widths);
-}
-
-static gboolean
-e_table_item_data_left   (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	int rows_printed = itemcontext->rows_printed;
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left");
-	return rows_printed < item->rows;
-}
-
-static void
-e_table_item_reset       (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
-{
-	itemcontext->rows_printed = 0;
-}
-
-static gdouble
-e_table_item_height      (EPrintable *ep,
-			  GnomePrintContext *context,
-			  gdouble width,
-			  gdouble max_height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	const int rows = item->rows;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row;
-	gdouble yd = 0;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	yd++;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble row_height;
-		
-		row_height = eti_printed_row_height(item, widths, context, row);
-		if (quantize) {
-			if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) {
-				break;
-			}
-		} else {
-			if (max_height != -1 && yd > max_height) {
-				break;
-			}
-		}
-
-		yd += row_height;
-
-		yd++;
-	}
-
-	g_free (widths);
-	
-	if (max_height != -1 && (!quantize) && yd > max_height)
-		yd = max_height;
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-	return yd;
-}
-
-static gboolean
-e_table_item_will_fit     (EPrintable *ep,
-			   GnomePrintContext *context,
-			   gdouble width,
-			   gdouble max_height,
-			   gboolean quantize,
-			   ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	const int rows = item->rows;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row;
-	gdouble yd = 0;
-	gboolean ret_val = TRUE;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	yd++;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble row_height;
-		
-		row_height = eti_printed_row_height(item, widths, context, row);
-		if (quantize) {
-			if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) {
-				ret_val = FALSE;
-				break;
-			}
-		} else {
-			if (max_height != -1 && yd > max_height) {
-				ret_val = FALSE;
-				break;
-			}
-		}
-
-		yd += row_height;
-
-		yd++;
-	}
-
-	g_free (widths);
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-	return ret_val;
-}
-
-static void
-e_table_item_printable_destroy (GtkObject *object,
-				ETableItemPrintContext *itemcontext)
-{
-	gtk_object_unref(GTK_OBJECT(itemcontext->item));
-	g_free(itemcontext);
-}
-
-/** 
- * e_table_item_get_printable
- * @eti: %ETableItem which will be printed
- *
- * This routine creates and returns an %EPrintable that can be used to
- * print the given %ETableItem.
- *
- * Returns: The %EPrintable. 
- */
-EPrintable *
-e_table_item_get_printable (ETableItem *item)
-{
-	EPrintable *printable = e_printable_new();
-	ETableItemPrintContext *itemcontext;
-
-	itemcontext = g_new(ETableItemPrintContext, 1);
-	itemcontext->item = item;
-	gtk_object_ref(GTK_OBJECT(item));
-	itemcontext->rows_printed = 0;
-
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "print_page",
-			    GTK_SIGNAL_FUNC(e_table_item_print_page),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "data_left",
-			    GTK_SIGNAL_FUNC(e_table_item_data_left),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "reset",
-			    GTK_SIGNAL_FUNC(e_table_item_reset),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "height",
-			    GTK_SIGNAL_FUNC(e_table_item_height),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "will_fit",
-			    GTK_SIGNAL_FUNC(e_table_item_will_fit),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "destroy",
-			    GTK_SIGNAL_FUNC(e_table_item_printable_destroy),
-			    itemcontext);
-
-	return printable;
-}
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
deleted file mode 100644
index 3c29691c22..0000000000
--- a/widgets/table/e-table-item.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_ITEM_H_
-#define _E_TABLE_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-selection-model.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/e-table/e-table-tooltip.h>
-#include <gal/widgets/e-printable.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_ITEM_TYPE        (e_table_item_get_type ())
-#define E_TABLE_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem))
-#define E_TABLE_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_ITEM_TYPE, ETableItemClass))
-#define E_IS_TABLE_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_ITEM_TYPE))
-#define E_IS_TABLE_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableModel     *table_model;
-	ETableHeader    *header;
-
-	ETableModel     *source_model;
-	ETableSelectionModel *selection;
-
-	int              x1, y1;
-	int              minimum_width, width, height;
-
-	int              cols, rows;
-	
-	/*
-	 * Ids for the signals we connect to
-	 */
-	int              header_dim_change_id;
-	int              header_structure_change_id;
-	int              header_request_width_id;
-	int              table_model_pre_change_id;
-	int              table_model_change_id;
-	int              table_model_row_change_id;
-	int              table_model_cell_change_id;
-	int              table_model_row_inserted_id;
-	int              table_model_row_deleted_id;
-
-	int              selection_change_id;
-	int              cursor_change_id;
-	int              cursor_activated_id;
-	
-	GdkGC           *fill_gc;
-	GdkGC           *grid_gc;
-	GdkGC           *focus_gc;
-	GdkBitmap       *stipple;
-
-	guint 		 draw_grid:1;
-	guint 		 draw_focus:1;
-	guint 		 renderers_can_change_size:1;
-	guint 		 cell_views_realized:1;
-	      	    
-	guint 		 needs_redraw : 1;
-	guint 		 needs_compute_height : 1;
-	guint 		 needs_compute_width : 1;
-
-	guint            uses_source_model : 1;
-
-	guint            in_key_press : 1;
-
-	/*
-	 * Realized views, per column
-	 */
-	ECellView      **cell_views;
-	int              n_cells;
-
-	int             *height_cache;
-	int              height_cache_idle_id;
-	int              height_cache_idle_count;
-
-	/*
-	 * Lengh Threshold: above this, we stop computing correctly
-	 * the size
-	 */
-	int              length_threshold;
-	
-	gint             row_guess;
-	ECursorMode      cursor_mode;
-
-	/*
-	 * During editing
-	 */
-	int              editing_col, editing_row;
-	void            *edit_ctx;
-
-	int grabbed_col, grabbed_row;
-
-	/*
-	 * Tooltip
-	 */
-	ETableTooltip *tooltip;
-
-} ETableItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-	void        (*cursor_change) (ETableItem *eti, int row);
-	void        (*cursor_activated) (ETableItem *eti, int row);
-	void        (*double_click)  (ETableItem *eti, int row);
-	gint        (*right_click)   (ETableItem *eti, int row, int col, GdkEvent *event);
-	gint        (*click)   (ETableItem *eti, int row, int col, GdkEvent *event);
-	gint        (*key_press)     (ETableItem *eti, int row, int col, GdkEvent *event);
-} ETableItemClass;
-GtkType     e_table_item_get_type            (void);
-
-
-/*
- * Focus
- */
-void        e_table_item_set_cursor          (ETableItem        *eti,
-					      int                col,
-					      int                row);
-
-gint        e_table_item_get_focused_column  (ETableItem        *eti);
-
-void        e_table_item_leave_edit          (ETableItem        *eti);
-void        e_table_item_enter_edit          (ETableItem        *eti,
-					      int                col,
-					      int                row);
-
-void        e_table_item_redraw_range        (ETableItem        *eti,
-					      int                start_col,
-					      int                start_row,
-					      int                end_col,
-					      int                end_row);
-
-EPrintable *e_table_item_get_printable       (ETableItem        *eti);
-void        e_table_item_compute_location    (ETableItem        *eti,
-					      int               *x,
-					      int               *y,
-					      int               *row,
-					      int               *col);
-
-int	    e_table_item_row_diff	     (ETableItem	*eti,
-					      int		 start_row,
-					      int		 end_row);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_ITEM_H_ */
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
deleted file mode 100644
index 41a55d1a8f..0000000000
--- a/widgets/table/e-table-model.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a Table Model
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-table-model.h"
-
-#define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-
-static GtkObjectClass *e_table_model_parent_class;
-
-enum {
-	MODEL_CHANGED,
-	MODEL_PRE_CHANGE,
-	MODEL_ROW_CHANGED,
-	MODEL_CELL_CHANGED,
-	MODEL_ROW_INSERTED,
-	MODEL_ROW_DELETED,
-	ROW_SELECTION,
-	LAST_SIGNAL
-};
-
-static guint e_table_model_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * e_table_model_column_count:
- * @e_table_model: The e-table-model to operate on
- *
- * Returns: the number of columns in the table model.
- */
-int
-e_table_model_column_count (ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), 0);
-
-	return ETM_CLASS (e_table_model)->column_count (e_table_model);
-}
-
-
-/**
- * e_table_model_row_count:
- * @e_table_model: the e-table-model to operate on
- *
- * Returns: the number of rows in the Table model.
- */
-int
-e_table_model_row_count (ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), 0);
-
-	return ETM_CLASS (e_table_model)->row_count (e_table_model);
-}
-
-/**
- * e_table_value_at:
- * @e_table_model: the e-table-model to operate on
- * @col: column in the model to pull data from.
- * @row: row in the model to pull data from.
- *
- * Return value: This function returns the value that is stored
- * by the @e_table_model in column @col and row @row.  The data
- * returned can be a pointer or any data value that can be stored
- * inside a pointer.
- *
- * The data returned is typically used by an ECell renderer
- */
-void *
-e_table_model_value_at (ETableModel *e_table_model, int col, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	return ETM_CLASS (e_table_model)->value_at (e_table_model, col, row);
-}
-
-/**
- * e_table_model_set_value_at:
- * @e_table_model: the table model to operate on.
- * @col: the column where the data will be stored in the model.
- * @row: the row where the data will be stored in the model. 
- * @value: the data to be stored.
- *
- * This function instructs the model to store the value in @data in the
- * the @e_table_model at column @col and row @row.  The @data typically
- * comes from one of the ECell rendering objects.
- *
- * There should be an agreement between the Table Model and the user
- * of this function about the data being stored.  Typically it will
- * be a pointer to a set of data, or a datum that fits inside a void *.
- */
-void
-e_table_model_set_value_at (ETableModel *e_table_model, int col, int row, const void *value)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	ETM_CLASS (e_table_model)->set_value_at (e_table_model, col, row, value);
-}
-
-/**
- * e_table_model_is_cell_editable:
- * @e_table_model: the table model to query.
- * @col: column to query.
- * @row: row to query.
- *
- * Returns: %TRUE if the cell in @e_table_model at @col,@row can be
- * edited, %FALSE otherwise
- */
-gboolean
-e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row);
-}
-
-/**
- * e_table_model_append_row:
- * @e_table_model: the table model to append the a row to.
- * @source:
- * @row:
- *
- */
-void
-e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	if (ETM_CLASS (e_table_model)->append_row)
-		ETM_CLASS (e_table_model)->append_row (e_table_model, source, row);
-}
-
-const char *
-e_table_model_row_sort_group(ETableModel *e_table_model, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, "/");
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), "/");
-
-	if (ETM_CLASS (e_table_model)->row_sort_group)
-		return ETM_CLASS (e_table_model)->row_sort_group (e_table_model, row);
-	else
-		return "/";
-}
-
-gboolean
-e_table_model_has_sort_group(ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	if (ETM_CLASS (e_table_model)->has_sort_group)
-		return ETM_CLASS (e_table_model)->has_sort_group (e_table_model);
-	else
-		return FALSE;
-}
-
-void *
-e_table_model_duplicate_value (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->duplicate_value)
-		return ETM_CLASS (e_table_model)->duplicate_value (e_table_model, col, value);
-	else
-		return NULL;
-}
-
-void
-e_table_model_free_value (ETableModel *e_table_model, int col, void *value)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	if (ETM_CLASS (e_table_model)->free_value)
-		ETM_CLASS (e_table_model)->free_value (e_table_model, col, value);
-}
-
-void *
-e_table_model_initialize_value (ETableModel *e_table_model, int col)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->initialize_value)
-		return ETM_CLASS (e_table_model)->initialize_value (e_table_model, col);
-	else
-		return NULL;
-}
-
-gboolean
-e_table_model_value_is_empty (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	if (ETM_CLASS (e_table_model)->value_is_empty)
-		return ETM_CLASS (e_table_model)->value_is_empty (e_table_model, col, value);
-	else
-		return FALSE;
-}
-
-char *
-e_table_model_value_to_string (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->value_to_string)
-		return ETM_CLASS (e_table_model)->value_to_string (e_table_model, col, value);
-	else
-		return g_strdup("");
-}
-
-static void
-e_table_model_destroy (GtkObject *object)
-{
-	if (e_table_model_parent_class->destroy)
-		(*e_table_model_parent_class->destroy)(object);
-}
-
-static void
-e_table_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *klass = E_TABLE_MODEL_CLASS(object_class);
-	e_table_model_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = e_table_model_destroy;
-
-	e_table_model_signals [MODEL_CHANGED] =
-		gtk_signal_new ("model_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_model_signals [MODEL_PRE_CHANGE] =
-		gtk_signal_new ("model_pre_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_pre_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_model_signals [MODEL_ROW_CHANGED] =
-		gtk_signal_new ("model_row_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_row_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_CELL_CHANGED] =
-		gtk_signal_new ("model_cell_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_cell_changed),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_ROW_INSERTED] =
-		gtk_signal_new ("model_row_inserted",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_row_inserted),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_ROW_DELETED] =
-		gtk_signal_new ("model_row_deleted",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_row_deleted),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_table_model_signals, LAST_SIGNAL);
-
-	klass->column_count = NULL;     
-	klass->row_count = NULL;        
-	klass->value_at = NULL;         
-	klass->set_value_at = NULL;     
-	klass->is_cell_editable = NULL; 
-	klass->append_row = NULL;
-
-	klass->row_sort_group = NULL;
-	klass->has_sort_group = NULL;
-
-	klass->duplicate_value = NULL;  
-	klass->free_value = NULL;       
-	klass->initialize_value = NULL; 
-	klass->value_is_empty = NULL;   
-	klass->value_to_string = NULL;
-	klass->model_changed = NULL;    
-	klass->model_row_changed = NULL;
-	klass->model_cell_changed = NULL;
-	klass->model_row_inserted = NULL;
-	klass->model_row_deleted = NULL;
-}
-
-
-guint
-e_table_model_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"ETableModel",
-			sizeof (ETableModel),
-			sizeof (ETableModelClass),
-			(GtkClassInitFunc) e_table_model_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-  return type;
-}
-
-#if d(!)0
-static void
-print_tabs (void)
-{
-	int i;
-	for (i = 0; i < depth; i++)
-		g_print("\t");
-}
-#endif
-
-void
-e_table_model_pre_change (ETableModel *e_table_model)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-	
-	d(print_tabs());
-	d(g_print("Emitting pre_change on model 0x%p.\n", e_table_model));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_PRE_CHANGE]);
-	d(depth--);
-}
-
-/**
- * e_table_model_changed:
- * @e_table_model: the table model to notify of the change
- *
- * Use this function to notify any views of this table model that
- * the contents of the table model have changed.  This will emit
- * the signal "model_changed" on the @e_table_model object.
- *
- * It is preferable to use the e_table_model_row_changed() and
- * the e_table_model_cell_changed() to notify of smaller changes
- * than to invalidate the entire model, as the views might have
- * ways of caching the information they render from the model.
- */
-void
-e_table_model_changed (ETableModel *e_table_model)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-	
-	d(print_tabs());
-	d(g_print("Emitting model_changed on model 0x%p.\n", e_table_model));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_CHANGED]);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_changed:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was changed in the model.
- *
- * Use this function to notify any views of the table model that
- * the contents of row @row have changed in model.  This function
- * will emit the "model_row_changed" signal on the @e_table_model
- * object
- */
-void
-e_table_model_row_changed (ETableModel *e_table_model, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_changed on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROW_CHANGED], row);
-	d(depth--);
-}
-
-/**
- * e_table_model_cell_changed:
- * @e_table_model: the table model to notify of the change
- * @col: the column.
- * @row: the row
- *
- * Use this function to notify any views of the table model that
- * contents of the cell at @col,@row has changed. This will emit
- * the "model_cell_changed" signal on the @e_table_model
- * object
- */
-void
-e_table_model_cell_changed (ETableModel *e_table_model, int col, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting cell_changed on model 0x%p, row %d, col %d.\n", e_table_model, row, col));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_CELL_CHANGED], col, row);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_inserted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was inserted into the model.
- *
- * Use this function to notify any views of the table model that
- * the row @row has been inserted into the model.  This function
- * will emit the "model_row_inserted" signal on the @e_table_model
- * object
- */
-void
-e_table_model_row_inserted (ETableModel *e_table_model, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_inserted on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROW_INSERTED], row);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_deleted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was deleted
- *
- * Use this function to notify any views of the table model that
- * the row @row has been deleted from the model.  This function
- * will emit the "model_row_deleted" signal on the @e_table_model
- * object
- */
-void
-e_table_model_row_deleted (ETableModel *e_table_model, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_deleted on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROW_DELETED], row);
-	d(depth--);
-}
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
deleted file mode 100644
index 21febaf992..0000000000
--- a/widgets/table/e-table-model.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_MODEL_H_
-#define _E_TABLE_MODEL_H_
-
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_MODEL_TYPE        (e_table_model_get_type ())
-#define E_TABLE_MODEL(o)          (GTK_CHECK_CAST ((o), E_TABLE_MODEL_TYPE, ETableModel))
-#define E_TABLE_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_MODEL_TYPE, ETableModelClass))
-#define E_IS_TABLE_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_MODEL_TYPE))
-#define E_IS_TABLE_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_MODEL_TYPE))
-
-typedef struct {
-	GtkObject   base;
-} ETableModel;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	int         (*column_count)     (ETableModel *etm);
-	int         (*row_count)        (ETableModel *etm);
-	void       *(*value_at)         (ETableModel *etm, int col, int row);
-	void        (*set_value_at)     (ETableModel *etm, int col, int row, const void *value);
-	gboolean    (*is_cell_editable) (ETableModel *etm, int col, int row);
-	void        (*append_row)       (ETableModel *etm, ETableModel *source, int row);
-
-	/* the sort group id for this row */
-	const char *(*row_sort_group)	(ETableModel *etm, int row);
-	gboolean    (*has_sort_group)	(ETableModel *etm);
-
-	/* Allocate a copy of the given value. */
-	void       *(*duplicate_value)  (ETableModel *etm, int col, const void *value);
-	/* Free an allocated value. */
-	void        (*free_value)       (ETableModel *etm, int col, void *value);
-	/* Return an allocated empty value. */
-	void	   *(*initialize_value) (ETableModel *etm, int col);
-	/* Return TRUE if value is equivalent to an empty cell. */
-	gboolean    (*value_is_empty)   (ETableModel *etm, int col, const void *value);
-	/* Return an allocated string. */
-	char       *(*value_to_string)  (ETableModel *etm, int col, const void *value);
-	
-	/*
-	 * Signals
-	 */
-
-	/*
-	 * These all come after the change has been made.
-	 * Major structural changes: model_changed
-	 * Changes only in a row: row_changed
-	 * Only changes in a cell: cell_changed
-	 * A row inserted: row_inserted
-	 * A row deleted: row_deleted
-	 */
-	void        (*model_pre_change)   (ETableModel *etm);
-
-	void        (*model_changed)      (ETableModel *etm);
-	void        (*model_row_changed)  (ETableModel *etm, int row);
-	void        (*model_cell_changed) (ETableModel *etm, int col, int row);
-	void        (*model_row_inserted) (ETableModel *etm, int row);
-	void        (*model_row_deleted)  (ETableModel *etm, int row);
-} ETableModelClass;
-
-GtkType     e_table_model_get_type (void);
-	
-int         e_table_model_column_count     (ETableModel *e_table_model);
-const char *e_table_model_column_name      (ETableModel *e_table_model, int col);
-int         e_table_model_row_count        (ETableModel *e_table_model);
-void       *e_table_model_value_at         (ETableModel *e_table_model, int col, int row);
-void        e_table_model_set_value_at     (ETableModel *e_table_model, int col, int row, const void *value);
-gboolean    e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row);
-void        e_table_model_append_row       (ETableModel *e_table_model, ETableModel *source, int row);
-
-const char *e_table_model_row_sort_group   (ETableModel *e_table_model, int row);
-gboolean    e_table_model_has_sort_group   (ETableModel *e_table_model);
-
-void       *e_table_model_duplicate_value  (ETableModel *e_table_model, int col, const void *value);
-void        e_table_model_free_value       (ETableModel *e_table_model, int col, void *value);
-void       *e_table_model_initialize_value (ETableModel *e_table_model, int col);
-gboolean    e_table_model_value_is_empty   (ETableModel *e_table_model, int col, const void *value);
-char       *e_table_model_value_to_string  (ETableModel *e_table_model, int col, const void *value);
-
-/*
- * Routines for emitting signals on the e_table
- */
-void        e_table_model_pre_change       (ETableModel *e_table_model);
-void        e_table_model_changed          (ETableModel *e_table_model);
-void        e_table_model_row_changed      (ETableModel *e_table_model, int row);
-void        e_table_model_cell_changed     (ETableModel *e_table_model, int col, int row);
-void        e_table_model_row_inserted     (ETableModel *e_table_model, int row);
-void        e_table_model_row_deleted      (ETableModel *e_table_model, int row);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_MODEL_H_ */
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
deleted file mode 100644
index 524005cd6e..0000000000
--- a/widgets/table/e-table-one.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a one table model implementation that uses function
- * pointers to simplify the creation of new, exotic and colorful tables in
- * no time.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-table-one.h"
-
-#define PARENT_TYPE e_table_model_get_type ()
-
-static int
-one_column_count (ETableModel *etm)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_column_count(one->source);
-	else
-		return 0;
-}
-
-static int
-one_row_count (ETableModel *etm)
-{
-	return 1;
-}
-
-static void *
-one_value_at (ETableModel *etm, int col, int row)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->data)
-		return one->data[col];
-	else
-		return NULL;
-}
-
-static void
-one_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->data && one->source) {
-		e_table_model_free_value(one->source, col, one->data[col]);
-		one->data[col] = e_table_model_duplicate_value(one->source, col, val);
-	}
-}
-
-static gboolean
-one_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_is_cell_editable(one->source, 0, row);
-	else
-		return FALSE;
-}
-
-/* The default for one_duplicate_value is to return the raw value. */
-static void *
-one_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_duplicate_value(one->source, col, value);
-	else
-		return (void *)value;
-}
-
-static void
-one_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		e_table_model_free_value(one->source, col, value);
-}
-
-static void *
-one_initialize_value (ETableModel *etm, int col)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_initialize_value (one->source, col);
-	else
-		return NULL;
-}
-
-static gboolean
-one_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_value_is_empty (one->source, col, value);
-	else
-		return FALSE;
-}
-
-static char *
-one_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_value_to_string (one->source, col, value);
-	else
-		return g_strdup("");
-}
-
-static void
-one_destroy (GtkObject *object)
-{
-	ETableOne *one = E_TABLE_ONE(object);
-	
-	if (one->source) {
-		int i;
-		int col_count;
-
-		col_count = e_table_model_column_count(one->source);
-		
-		if (one->data) {
-			for (i = 0; i < col_count; i++) {
-				e_table_model_free_value(one->source, i, one->data[i]);
-			}
-		}
-
-		gtk_object_unref(GTK_OBJECT(one->source));
-	}
-
-	g_free(one->data);
-}
-
-static void
-e_table_one_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	model_class->column_count = one_column_count;
-	model_class->row_count = one_row_count;
-	model_class->value_at = one_value_at;
-	model_class->set_value_at = one_set_value_at;
-	model_class->is_cell_editable = one_is_cell_editable;
-	model_class->duplicate_value = one_duplicate_value;
-	model_class->free_value = one_free_value;
-	model_class->initialize_value = one_initialize_value;
-	model_class->value_is_empty = one_value_is_empty;
-	model_class->value_to_string = one_value_to_string;
-
-	object_class->destroy = one_destroy;
-}
-
-static void
-e_table_one_init (GtkObject *object)
-{
-	ETableOne *one = E_TABLE_ONE(object);
-
-	one->source = NULL;
-	one->data = NULL;
-}
-
-GtkType
-e_table_one_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableOne",
-			sizeof (ETableOne),
-			sizeof (ETableOneClass),
-			(GtkClassInitFunc) e_table_one_class_init,
-			(GtkObjectInitFunc) e_table_one_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_table_one_new (ETableModel *source)
-{
-	ETableOne *eto;
-	int col_count;
-	int i;
-
-	eto = gtk_type_new (e_table_one_get_type ());
-
-	eto->source = source;
-	
-	col_count = e_table_model_column_count(source);
-	eto->data = g_new(void *, col_count);
-	for (i = 0; i < col_count; i++) {
-		eto->data[i] = e_table_model_initialize_value(source, i);
-	}
-	
-	if (source)
-		gtk_object_ref(GTK_OBJECT(source));
-	
-	return (ETableModel *) eto;
-}
-
-void
-e_table_one_commit (ETableOne *one)
-{
-	if (one->source) {
-		int empty = TRUE;
-		int col;
-		int cols = e_table_model_column_count(one->source);
-		for (col = 0; col < cols; col++) {
-			if (!e_table_model_value_is_empty(one->source, col, one->data[col])) {
-				empty = FALSE;
-				break;
-			}
-		}
-		if (!empty) {
-			e_table_model_append_row(one->source, E_TABLE_MODEL(one), 0);
-		}
-	}
-}
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
deleted file mode 100644
index 2636f018ab..0000000000
--- a/widgets/table/e-table-one.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_ONE_H_
-#define _E_TABLE_ONE_H_
-
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_ONE_TYPE        (e_table_one_get_type ())
-#define E_TABLE_ONE(o)          (GTK_CHECK_CAST ((o), E_TABLE_ONE_TYPE, ETableOne))
-#define E_TABLE_ONE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass))
-#define E_IS_TABLE_ONE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_ONE_TYPE))
-#define E_IS_TABLE_ONE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_ONE_TYPE))
-
-typedef struct {
-	ETableModel   parent;
-		    
-	ETableModel  *source;
-	void        **data;
-} ETableOne;
-
-typedef struct {
-	ETableModelClass parent_class;
-} ETableOneClass;
-
-GtkType e_table_one_get_type (void);
-
-ETableModel *e_table_one_new (ETableModel *source);
-void         e_table_one_commit (ETableOne *one);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_ONE_H_ */
-
diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
deleted file mode 100644
index cd816a678c..0000000000
--- a/widgets/table/e-table-scrolled.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-scrolled.c: A graphical view of a Table.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * Copyright 2000, 1999, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-table.h"
-#include "e-table-scrolled.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE e_scroll_frame_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	ARG_0,
-	ARG_TABLE,
-};
-
-static void
-e_table_scrolled_init (GtkObject *object)
-{
-	ETableScrolled *ets;
-	EScrollFrame *scroll_frame;
-
-	ets          = E_TABLE_SCROLLED (object);
-	scroll_frame = E_SCROLL_FRAME   (object);
-
-	GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
-
-	ets->table = gtk_type_new(e_table_get_type());
-
-	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
-}
-
-static void
-e_table_scrolled_real_construct (ETableScrolled *ets)
-{
-	gtk_container_add(GTK_CONTAINER(ets), GTK_WIDGET(ets->table));
-
-	gtk_widget_show(GTK_WIDGET(ets->table));
-}
-
-ETableScrolled *e_table_scrolled_construct                 (ETableScrolled    *ets,
-							    ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_table_construct(ets->table, etm, ete, spec, state);
-
-	e_table_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_table_scrolled_new                       (ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	ETableScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	ets = E_TABLE_SCROLLED (gtk_widget_new (e_table_scrolled_get_type (),
-						"hadjustment", NULL,
-						"vadjustment", NULL,
-						NULL));
-
-	ets = e_table_scrolled_construct (ets, etm, ete, spec, state);
-
-	return GTK_WIDGET (ets);
-}
-
-ETableScrolled *e_table_scrolled_construct_from_spec_file  (ETableScrolled    *ets,
-							    ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_table_construct_from_spec_file(ets->table, etm, ete, spec_fn, state_fn);
-
-	e_table_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_table_scrolled_new_from_spec_file        (ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	ETableScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	ets = gtk_type_new (e_table_scrolled_get_type ());
-
-	ets = e_table_scrolled_construct_from_spec_file (ets, etm, ete, spec_fn, state_fn);
-
-	return GTK_WIDGET (ets);
-}
-
-ETable *
-e_table_scrolled_get_table                 (ETableScrolled *ets)
-{
-	return ets->table;
-}
-
-static void
-ets_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableScrolled *ets = E_TABLE_SCROLLED (o);
-
-	switch (arg_id){
-	case ARG_TABLE:
-		if (ets->table)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->table);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	}
-}
-
-/* Grab_focus handler for the scrolled ETable */
-static void
-ets_grab_focus (GtkWidget *widget)
-{
-	ETableScrolled *ets;
-
-	ets = E_TABLE_SCROLLED (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (ets->table));
-}
-
-/* Focus handler for the scrolled ETable */
-static gint
-ets_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETableScrolled *ets;
-
-	ets = E_TABLE_SCROLLED (container);
-
-	return gtk_container_focus (GTK_CONTAINER (ets->table), direction);
-}
-
-static void
-e_table_scrolled_class_init (ETableScrolledClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->get_arg = ets_get_arg;
-
-	widget_class->grab_focus = ets_grab_focus;
-
-	container_class->focus = ets_focus;
-
-	gtk_object_add_arg_type ("ETableScrolled::table", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_TABLE);
-}
-
-E_MAKE_TYPE(e_table_scrolled, "ETableScrolled", ETableScrolled, e_table_scrolled_class_init, e_table_scrolled_init, PARENT_TYPE);
-
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
deleted file mode 100644
index 9b2d2a510e..0000000000
--- a/widgets/table/e-table-scrolled.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SCROLLED_H_
-#define _E_TABLE_SCROLLED_H_
-
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table.h>
-#include <gal/widgets/e-printable.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_SCROLLED_TYPE        (e_table_scrolled_get_type ())
-#define E_TABLE_SCROLLED(o)          (GTK_CHECK_CAST ((o), E_TABLE_SCROLLED_TYPE, ETableScrolled))
-#define E_TABLE_SCROLLED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SCROLLED_TYPE, ETableScrolledClass))
-#define E_IS_TABLE_SCROLLED(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SCROLLED_TYPE))
-#define E_IS_TABLE_SCROLLED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SCROLLED_TYPE))
-
-typedef struct {
-	EScrollFrame parent;
-
-	ETable *table;
-} ETableScrolled;
-
-typedef struct {
-	EScrollFrameClass parent_class;
-} ETableScrolledClass;
-
-GtkType         e_table_scrolled_get_type                  (void);
-
-ETableScrolled *e_table_scrolled_construct                 (ETableScrolled *ets,
-							    ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec,
-							    const char     *state);
-GtkWidget      *e_table_scrolled_new                       (ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec,
-							    const char     *state);
-
-ETableScrolled *e_table_scrolled_construct_from_spec_file  (ETableScrolled *ets,
-							    ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec_fn,
-							    const char     *state_fn);
-GtkWidget      *e_table_scrolled_new_from_spec_file        (ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec_fn,
-							    const char     *state_fn);
-
-ETable         *e_table_scrolled_get_table                 (ETableScrolled *ets);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_SCROLLED_H_ */
-
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
deleted file mode 100644
index a2a0f99aa9..0000000000
--- a/widgets/table/e-table-selection-model.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-selection-model.c: a Table Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-table-selection-model.h"
-#include "gal/util/e-util.h"
-#include <gdk/gdkkeysyms.h>
-
-#define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_get_type ()
-
-static ESelectionModel *parent_class;
-
-static gint etsm_get_row_count (ESelectionModel *esm);
-
-enum {
-	ARG_0,
-	ARG_MODEL,
-};
-
-static void
-model_changed(ETableModel *etm, ETableSelectionModel *etsm)
-{
-	e_selection_model_clear(E_SELECTION_MODEL(etsm));
-}
-
-#if 1
-static void
-model_row_inserted(ETableModel *etm, int row, ETableSelectionModel *etsm)
-{
-	e_selection_model_insert_row(E_SELECTION_MODEL(etsm), row);
-}
-
-static void
-model_row_deleted(ETableModel *etm, int row, ETableSelectionModel *etsm)
-{
-	e_selection_model_delete_row(E_SELECTION_MODEL(etsm), row);
-}
-
-#else
-
-static void
-model_row_inserted(ETableModel *etm, int row, ETableSelectionModel *etsm)
-{
-	model_changed(etm, etsm);
-}
-
-static void
-model_row_deleted(ETableModel *etm, int row, ETableSelectionModel *etsm)
-{
-	model_changed(etm, etsm);
-}
-#endif
-
-inline static void
-add_model(ETableSelectionModel *etsm, ETableModel *model)
-{
-	etsm->model = model;
-	if (model) {
-		gtk_object_ref(GTK_OBJECT(model));
-		etsm->model_changed_id = gtk_signal_connect(GTK_OBJECT(model), "model_changed",
-							    GTK_SIGNAL_FUNC(model_changed), etsm);
-		etsm->model_row_inserted_id = gtk_signal_connect(GTK_OBJECT(model), "model_row_inserted",
-								 GTK_SIGNAL_FUNC(model_row_inserted), etsm);
-		etsm->model_row_deleted_id = gtk_signal_connect(GTK_OBJECT(model), "model_row_deleted",
-								GTK_SIGNAL_FUNC(model_row_deleted), etsm);
-	}
-}
-
-inline static void
-drop_model(ETableSelectionModel *etsm)
-{
-	if (etsm->model) {
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_changed_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_row_inserted_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_row_deleted_id);
-		gtk_object_unref(GTK_OBJECT(etsm->model));
-	}
-	etsm->model = NULL;
-}
-
-static void
-etsm_destroy (GtkObject *object)
-{
-	ETableSelectionModel *etsm;
-
-	etsm = E_TABLE_SELECTION_MODEL (object);
-
-	drop_model(etsm);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-etsm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etsm->model);
-		break;
-	}
-}
-
-static void
-etsm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		drop_model(etsm);
-		add_model(etsm, GTK_VALUE_OBJECT (*arg) ? E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)) : NULL);
-		break;
-	}
-}
-
-static void
-e_table_selection_model_init (ETableSelectionModel *selection)
-{
-	selection->model = NULL;
-}
-
-static void
-e_table_selection_model_class_init (ETableSelectionModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESelectionModelClass *esm_class;
-
-	parent_class             = gtk_type_class (PARENT_TYPE);
-
-	object_class             = GTK_OBJECT_CLASS(klass);
-	esm_class                = E_SELECTION_MODEL_CLASS(klass);
-
-	object_class->destroy    = etsm_destroy;
-	object_class->get_arg    = etsm_get_arg;
-	object_class->set_arg    = etsm_set_arg;
-
-	esm_class->get_row_count = etsm_get_row_count;
-
-	gtk_object_add_arg_type ("ETableSelectionModel::model", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-}
-
-E_MAKE_TYPE(e_table_selection_model, "ETableSelectionModel", ETableSelectionModel,
-	    e_table_selection_model_class_init, e_table_selection_model_init, PARENT_TYPE);
-
-/** 
- * e_table_selection_model_new
- *
- * This routine creates a new #ETableSelectionModel.
- *
- * Returns: The new #ETableSelectionModel.
- */
-ETableSelectionModel *
-e_table_selection_model_new (void)
-{
-	return gtk_type_new (e_table_selection_model_get_type ());
-}
-
-static gint
-etsm_get_row_count (ESelectionModel *esm)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL(esm);
-
-	return e_table_model_row_count (etsm->model);
-}
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
deleted file mode 100644
index 42333b2493..0000000000
--- a/widgets/table/e-table-selection-model.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SELECTION_MODEL_H_
-#define _E_TABLE_SELECTION_MODEL_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/e-table/e-table-sorter.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SELECTION_MODEL_TYPE        (e_table_selection_model_get_type ())
-#define E_TABLE_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel))
-#define E_TABLE_SELECTION_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModelClass))
-#define E_IS_TABLE_SELECTION_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SELECTION_MODEL_TYPE))
-#define E_IS_TABLE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SELECTION_MODEL_TYPE))
-
-typedef struct {
-	ESelectionModel base;
-
-	ETableModel  *model;
-
-	guint model_changed_id;
-	guint model_row_inserted_id, model_row_deleted_id;
-
-	guint frozen : 1;
-	guint selection_model_changed : 1;
-	guint group_info_changed : 1;
-} ETableSelectionModel;
-
-typedef struct {
-	ESelectionModelClass parent_class;
-} ETableSelectionModelClass;
-
-GtkType               e_table_selection_model_get_type            (void);
-ETableSelectionModel *e_table_selection_model_new                 (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c
deleted file mode 100644
index 82d29bd6c7..0000000000
--- a/widgets/table/e-table-simple.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a simple table model implementation that uses function
- * pointers to simplify the creation of new, exotic and colorful tables in
- * no time.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-table-simple.h"
-
-enum {
-	ARG_0,
-	ARG_APPEND_ROW,
-};
-
-#define PARENT_TYPE e_table_model_get_type ()
-
-static int
-simple_column_count (ETableModel *etm)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->col_count)
-		return simple->col_count (etm, simple->data);
-	else
-		return 0;
-}
-
-static int
-simple_row_count (ETableModel *etm)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->row_count)
-		return simple->row_count (etm, simple->data);
-	else
-		return 0;
-}
-
-static void *
-simple_value_at (ETableModel *etm, int col, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->value_at)
-		return simple->value_at (etm, col, row, simple->data);
-	else
-		return NULL;
-}
-
-static void
-simple_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->set_value_at)
-		simple->set_value_at (etm, col, row, val, simple->data);
-}
-
-static gboolean
-simple_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->is_cell_editable)
-		return simple->is_cell_editable (etm, col, row, simple->data);
-	else
-		return FALSE;
-}
-
-/* The default for simple_duplicate_value is to return the raw value. */
-static void *
-simple_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->duplicate_value)
-		return simple->duplicate_value (etm, col, value, simple->data);
-	else
-		return (void *)value;
-}
-
-static void
-simple_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->free_value)
-		simple->free_value (etm, col, value, simple->data);
-}
-
-static void *
-simple_initialize_value (ETableModel *etm, int col)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->initialize_value)
-		return simple->initialize_value (etm, col, simple->data);
-	else
-		return NULL;
-}
-
-static gboolean
-simple_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->value_is_empty)
-		return simple->value_is_empty (etm, col, value, simple->data);
-	else
-		return FALSE;
-}
-
-static char *
-simple_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->value_to_string)
-		return simple->value_to_string (etm, col, value, simple->data);
-	else
-		return g_strdup ("");
-}
-
-static void
-simple_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->append_row)
-		simple->append_row (etm, source, row, simple->data);
-}
-
-static void
-simple_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE (o);
-
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		GTK_VALUE_POINTER(*arg) = simple->append_row;
-		break;
-	}
-}
-
-static void
-simple_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE (o);
-	
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		simple->append_row = GTK_VALUE_POINTER(*arg);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-	}
-}
-
-static void
-e_table_simple_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	object_class->set_arg = simple_set_arg;
-	object_class->get_arg = simple_get_arg;
-
-	model_class->column_count = simple_column_count;
-	model_class->row_count = simple_row_count;
-	model_class->value_at = simple_value_at;
-	model_class->set_value_at = simple_set_value_at;
-	model_class->is_cell_editable = simple_is_cell_editable;
-	model_class->duplicate_value = simple_duplicate_value;
-	model_class->free_value = simple_free_value;
-	model_class->initialize_value = simple_initialize_value;
-	model_class->value_is_empty = simple_value_is_empty;
-	model_class->value_to_string = simple_value_to_string;
-	model_class->append_row = simple_append_row;
-
-	gtk_object_add_arg_type ("ETableSimple::append_row", GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE, ARG_APPEND_ROW);
-}
-
-GtkType
-e_table_simple_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableSimple",
-			sizeof (ETableSimple),
-			sizeof (ETableSimpleClass),
-			(GtkClassInitFunc) e_table_simple_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/**
- * e_table_simple_new:
- * @col_count:
- * @row_count:
- * @value_at:
- * @set_value_at:
- * @is_cell_editable:
- * @duplicate_value:
- * @free_value:
- * @initialize_value:
- * @value_is_empty:
- * @value_to_string:
- * @data: closure pointer.
- *
- * This initializes a new ETableSimpleModel object.  ETableSimpleModel is
- * an implementaiton of the abstract class ETableModel.  The ETableSimpleModel
- * is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
- *
- * Instead, ETableSimpleModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETableModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- *
- * Returns: An ETableSimpleModel object (which is also an ETableModel
- * object).
- */
-ETableModel *
-e_table_simple_new (ETableSimpleColumnCountFn col_count,
-		    ETableSimpleRowCountFn row_count,
-		    ETableSimpleValueAtFn value_at,
-		    ETableSimpleSetValueAtFn set_value_at,
-		    ETableSimpleIsCellEditableFn is_cell_editable,
-		    ETableSimpleDuplicateValueFn duplicate_value,
-		    ETableSimpleFreeValueFn free_value,
-		    ETableSimpleInitializeValueFn initialize_value,
-		    ETableSimpleValueIsEmptyFn value_is_empty,
-		    ETableSimpleValueToStringFn value_to_string,
-		    void *data)
-{
-	ETableSimple *et;
-
-	et = gtk_type_new (e_table_simple_get_type ());
-
-	et->col_count = col_count;
-	et->row_count = row_count;
-	et->value_at = value_at;
-	et->set_value_at = set_value_at;
-	et->is_cell_editable = is_cell_editable;
-	et->duplicate_value = duplicate_value;
-	et->free_value = free_value;
-	et->initialize_value = initialize_value;
-	et->value_is_empty = value_is_empty;
-	et->value_to_string = value_to_string;
-	et->data = data;
-	
-	return (ETableModel *) et;
- }
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
deleted file mode 100644
index cf5ec6d4f2..0000000000
--- a/widgets/table/e-table-simple.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SIMPLE_H_
-#define _E_TABLE_SIMPLE_H_
-
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SIMPLE_TYPE        (e_table_simple_get_type ())
-#define E_TABLE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple))
-#define E_TABLE_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SIMPLE_TYPE, ETableSimpleClass))
-#define E_IS_TABLE_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SIMPLE_TYPE))
-#define E_IS_TABLE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SIMPLE_TYPE))
-
-typedef int         (*ETableSimpleColumnCountFn)     (ETableModel *etm, void *data);
-typedef	int         (*ETableSimpleRowCountFn)        (ETableModel *etm, void *data);
-typedef	void       *(*ETableSimpleValueAtFn)         (ETableModel *etm, int col, int row, void *data);
-typedef	void        (*ETableSimpleSetValueAtFn)      (ETableModel *etm, int col, int row, const void *val, void *data);
-typedef	gboolean    (*ETableSimpleIsCellEditableFn)  (ETableModel *etm, int col, int row, void *data);
-typedef void        (*ETableSimpleAppendRowFn)       (ETableModel *etm, ETableModel *model, int row, void *data);
-typedef	void       *(*ETableSimpleDuplicateValueFn)  (ETableModel *etm, int col, const void *val, void *data);
-typedef	void        (*ETableSimpleFreeValueFn)       (ETableModel *etm, int col, void *val, void *data);
-typedef void       *(*ETableSimpleInitializeValueFn) (ETableModel *etm, int col, void *data);
-typedef gboolean    (*ETableSimpleValueIsEmptyFn)    (ETableModel *etm, int col, const void *val, void *data);
-typedef char       *(*ETableSimpleValueToStringFn)   (ETableModel *etm, int col, const void *val, void *data);
-
-typedef struct {
-	ETableModel parent;
-
-	ETableSimpleColumnCountFn     col_count;
-	ETableSimpleRowCountFn        row_count;
-	ETableSimpleValueAtFn         value_at;
-	ETableSimpleSetValueAtFn      set_value_at;
-	ETableSimpleIsCellEditableFn  is_cell_editable;
-	ETableSimpleDuplicateValueFn  duplicate_value;
-	ETableSimpleFreeValueFn       free_value;
-	ETableSimpleInitializeValueFn initialize_value;
-	ETableSimpleValueIsEmptyFn    value_is_empty;
-	ETableSimpleValueToStringFn   value_to_string;
-	ETableSimpleAppendRowFn       append_row;
-	void *data;
-} ETableSimple;
-
-typedef struct {
-	ETableModelClass parent_class;
-} ETableSimpleClass;
-
-GtkType e_table_simple_get_type (void);
-
-ETableModel *e_table_simple_new (ETableSimpleColumnCountFn col_count,
-				 ETableSimpleRowCountFn row_count,
-				 ETableSimpleValueAtFn value_at,
-				 ETableSimpleSetValueAtFn set_value_at,
-				 ETableSimpleIsCellEditableFn is_cell_editable,
-				 ETableSimpleDuplicateValueFn duplicate_value,
-				 ETableSimpleFreeValueFn free_value,
-				 ETableSimpleInitializeValueFn initialize_value,
-				 ETableSimpleValueIsEmptyFn value_is_empty,
-				 ETableSimpleValueToStringFn value_to_string,
-				 void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SIMPLE_H_ */
-
diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c
deleted file mode 100644
index acb6e4296d..0000000000
--- a/widgets/table/e-table-size-test.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 5000
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	static guchar t[] = {'A', 0xc3, 0x84, 0xc3, 0x95, 0xc3, 0x94, 0xc3, 0xb5, 0x00};
-
-#if 0
-	if (col == 1) return "toshok@ximian.com";
-#else
-	if (col == 1) return t;
-#endif
-        else if (col == 2) return "Chris Toshok";
-        else if (col == 3) return "43 Vicksburg, SF";
-        else if (col == 4) return "415-867-5309";
-	else return NULL;
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	ETableModel *e_table_model = NULL;
-        int i;
-
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value,
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * 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.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 300, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
deleted file mode 100644
index c723ded8d8..0000000000
--- a/widgets/table/e-table-sort-info.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-sort-info.c: a Table Model
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 1999, 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-table-sort-info.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-
-#define ETM_CLASS(e) ((ETableSortInfoClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-					  
-
-static GtkObjectClass *e_table_sort_info_parent_class;
-
-enum {
-	SORT_INFO_CHANGED,
-	GROUP_INFO_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_table_sort_info_signals [LAST_SIGNAL] = { 0, };
-
-static void
-etsi_destroy (GtkObject *object)
-{
-	ETableSortInfo *etsi;
-
-	etsi = E_TABLE_SORT_INFO (object);
-	
-	if (etsi->groupings)
-		g_free(etsi->groupings);
-	if (etsi->sortings)
-		g_free(etsi->sortings);
-}
-
-static void
-e_table_sort_info_init (ETableSortInfo *info)
-{
-	info->group_count = 0;
-	info->groupings = NULL;
-	info->sort_count = 0;
-	info->sortings = NULL;
-	info->frozen = 0;
-	info->sort_info_changed = 0;
-	info->group_info_changed = 0;
-}
-
-static void
-e_table_sort_info_class_init (ETableSortInfoClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	e_table_sort_info_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	
-	object_class->destroy = etsi_destroy;
-
-	e_table_sort_info_signals [SORT_INFO_CHANGED] =
-		gtk_signal_new ("sort_info_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableSortInfoClass, sort_info_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_sort_info_signals [GROUP_INFO_CHANGED] =
-		gtk_signal_new ("group_info_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableSortInfoClass, group_info_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	klass->sort_info_changed = NULL;
-	klass->group_info_changed = NULL;
-
-	gtk_object_class_add_signals (object_class, e_table_sort_info_signals, LAST_SIGNAL);
-}
-
-E_MAKE_TYPE(e_table_sort_info, "ETableSortInfo", ETableSortInfo,
-	    e_table_sort_info_class_init, e_table_sort_info_init, PARENT_TYPE);
-
-static void
-e_table_sort_info_sort_info_changed (ETableSortInfo *info)
-{
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (E_IS_TABLE_SORT_INFO (info));
-	
-	if (info->frozen) {
-		info->sort_info_changed = 1;
-	} else {
-		gtk_signal_emit (GTK_OBJECT (info),
-				 e_table_sort_info_signals [SORT_INFO_CHANGED]);
-	}
-}
-
-static void
-e_table_sort_info_group_info_changed (ETableSortInfo *info)
-{
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (E_IS_TABLE_SORT_INFO (info));
-	
-	if (info->frozen) {
-		info->group_info_changed = 1;
-	} else {
-		gtk_signal_emit (GTK_OBJECT (info),
-				 e_table_sort_info_signals [GROUP_INFO_CHANGED]);
-	}
-}
-
-/**
- * e_table_sort_info_freeze:
- * @info: The ETableSortInfo object
- *
- * This functions allows the programmer to cluster various changes to the
- * ETableSortInfo (grouping and sorting) without having the object emit
- * "group_info_changed" or "sort_info_changed" signals on each change.
- *
- * To thaw, invoke the e_table_sort_info_thaw() function, which will
- * trigger any signals that might have been queued.
- */
-void 
-e_table_sort_info_freeze             (ETableSortInfo *info)
-{
-	info->frozen++;
-}
-
-/**
- * e_table_sort_info_thaw:
- * @info: The ETableSortInfo object
- *
- * This functions allows the programmer to cluster various changes to the
- * ETableSortInfo (grouping and sorting) without having the object emit
- * "group_info_changed" or "sort_info_changed" signals on each change.
- *
- * This function will flush any pending signals that might be emited by
- * this object.
- */
-void
-e_table_sort_info_thaw               (ETableSortInfo *info)
-{
-	info->frozen--;
-	if (info->frozen != 0)
-		return;
-	
-	if (info->sort_info_changed) {
-		info->sort_info_changed = 0;
-		e_table_sort_info_sort_info_changed(info);
-	}
-	if (info->group_info_changed) {
-		info->group_info_changed = 0;
-		e_table_sort_info_group_info_changed(info);
-	}
-}
-
-/**
- * e_table_sort_info_grouping_get_count:
- * @info: The ETableSortInfo object
- *
- * Returns: the number of grouping criteria in the object.
- */
-guint
-e_table_sort_info_grouping_get_count (ETableSortInfo *info)
-{
-	return info->group_count;
-}
-
-static void
-e_table_sort_info_grouping_real_truncate  (ETableSortInfo *info, int length)
-{
-	if (length < info->group_count) {
-		info->group_count = length;
-	}
-	if (length > info->group_count) {
-		info->groupings = g_realloc(info->groupings, length * sizeof(ETableSortColumn));
-		info->group_count = length;
-	}
-}
-
-/**
- * e_table_sort_info_grouping_truncate:
- * @info: The ETableSortInfo object
- * @lenght: position where the truncation happens.
- *
- * This routine can be used to reduce or grow the number of grouping
- * criteria in the object.  
- */
-void
-e_table_sort_info_grouping_truncate  (ETableSortInfo *info, int length)
-{
-	e_table_sort_info_grouping_real_truncate(info, length);
-	e_table_sort_info_group_info_changed(info);
-}
-
-/**
- * e_table_sort_info_grouping_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- *
- * Returns: the description of the @n-th grouping criteria in the @info object.
- */
-ETableSortColumn
-e_table_sort_info_grouping_get_nth   (ETableSortInfo *info, int n)
-{
-	if (n < info->group_count) {
-		return info->groupings[n];
-	} else {
-		ETableSortColumn fake = {0, 0};
-		return fake;
-	}
-}
-
-/**
- * e_table_sort_info_grouping_set_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- * @column: new values for the grouping
- *
- * Sets the grouping criteria for index @n to be given by @column (a column number and
- * whether it is ascending or descending).
- */
-void
-e_table_sort_info_grouping_set_nth   (ETableSortInfo *info, int n, ETableSortColumn column)
-{
-	if (n >= info->group_count) {
-		e_table_sort_info_grouping_real_truncate(info, n + 1);
-	}
-	info->groupings[n] = column;
-	e_table_sort_info_group_info_changed(info);
-}
-
-
-/**
- * e_table_sort_info_get_count:
- * @info: The ETableSortInfo object
- *
- * Returns: the number of sorting criteria in the object.
- */
-guint
-e_table_sort_info_sorting_get_count (ETableSortInfo *info)
-{
-	return info->sort_count;
-}
-
-static void
-e_table_sort_info_sorting_real_truncate  (ETableSortInfo *info, int length)
-{
-	if (length < info->sort_count) {
-		info->sort_count = length;
-	}
-	if (length > info->sort_count) {
-		info->sortings = g_realloc(info->sortings, length * sizeof(ETableSortColumn));
-		info->sort_count = length;
-	}
-}
-
-/**
- * e_table_sort_info_sorting_truncate:
- * @info: The ETableSortInfo object
- * @lenght: position where the truncation happens.
- *
- * This routine can be used to reduce or grow the number of sort
- * criteria in the object.  
- */
-void
-e_table_sort_info_sorting_truncate  (ETableSortInfo *info, int length)
-{
-	e_table_sort_info_sorting_real_truncate  (info, length);
-	e_table_sort_info_sort_info_changed(info);
-}
-
-/**
- * e_table_sort_info_sorting_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- *
- * Returns: the description of the @n-th grouping criteria in the @info object.
- */
-ETableSortColumn
-e_table_sort_info_sorting_get_nth   (ETableSortInfo *info, int n)
-{
-	if (n < info->sort_count) {
-		return info->sortings[n];
-	} else {
-		ETableSortColumn fake = {0, 0};
-		return fake;
-	}
-}
-
-/**
- * e_table_sort_info_sorting_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- * @column: new values for the sorting
- *
- * Sets the sorting criteria for index @n to be given by @column (a
- * column number and whether it is ascending or descending).
- */
-void
-e_table_sort_info_sorting_set_nth   (ETableSortInfo *info, int n, ETableSortColumn column)
-{
-	if (n >= info->sort_count) {
-		e_table_sort_info_sorting_real_truncate(info, n + 1);
-	}
-	info->sortings[n] = column;
-	e_table_sort_info_sort_info_changed(info);
-}
-
-/**
- * e_table_sort_info_new:
- *
- * This creates a new e_table_sort_info object that contains no
- * grouping and no sorting defined as of yet.  This object is used
- * to keep track of multi-level sorting and multi-level grouping of
- * the ETable.  
- *
- * Returns: A new %ETableSortInfo object
- */
-ETableSortInfo *
-e_table_sort_info_new (void)
-{
-	return gtk_type_new (e_table_sort_info_get_type ());
-}
-
-/**
- * e_table_sort_info_load_from_node:
- * @info: The ETableSortInfo object
- * @node: pointer to the xmlNode that describes the sorting and grouping information
- * @state_version:
- *
- * This loads the state for the %ETableSortInfo object @info from the
- * xml node @node.
- */
-void
-e_table_sort_info_load_from_node (ETableSortInfo *info,
-				  xmlNode        *node,
-				  gdouble         state_version)
-{
-	int i;
-	xmlNode *grouping;
-
-	if (state_version <= 0.05) {
-		i = 0;
-		for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->childs) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_grouping_set_nth(info, i++, column);
-		}
-		i = 0;
-		for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->childs) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_sorting_set_nth(info, i++, column);
-		}
-	} else {
-		i = 0;
-		for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->next) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_grouping_set_nth(info, i++, column);
-		}
-		i = 0;
-		for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->next) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_sorting_set_nth(info, i++, column);
-		}
-	}
-	gtk_signal_emit (GTK_OBJECT (info),
-			 e_table_sort_info_signals [SORT_INFO_CHANGED]);
-	
-}
-
-/**
- * e_table_sort_info_save_to_node:
- * @info: The ETableSortInfo object
- * @parent: xmlNode that will be hosting the saved state of the @info object.
- *
- * This function is used
- *
- * Returns: the node that has been appended to @parent as a child containing
- * the sorting and grouping information for this ETableSortInfo object.
- */
-xmlNode *
-e_table_sort_info_save_to_node (ETableSortInfo *info,
-				xmlNode        *parent)
-{
-	xmlNode *grouping;
-	xmlNode *node;
-	int i;
-	const int sort_count = e_table_sort_info_sorting_get_count (info);
-	const int group_count = e_table_sort_info_grouping_get_count (info);
-	
-	grouping = xmlNewChild (parent, NULL, "grouping", NULL);
-
-	for (i = 0; i < group_count; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, "group", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	for (i = 0; i < sort_count; i++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, "leaf", NULL);
-		
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	return grouping;
-}
-
-ETableSortInfo *
-e_table_sort_info_duplicate (ETableSortInfo *info)
-{
-	ETableSortInfo *new_info;
-
-	new_info = e_table_sort_info_new();
-
-	new_info->group_count = info->group_count;
-	new_info->groupings = g_new(ETableSortColumn, new_info->group_count);
-	memmove(new_info->groupings, info->groupings, sizeof (ETableSortColumn) * new_info->group_count);
-
-	new_info->sort_count = info->sort_count;
-	new_info->sortings = g_new(ETableSortColumn, new_info->sort_count);
-	memmove(new_info->sortings, info->sortings, sizeof (ETableSortColumn) * new_info->sort_count);
-
-	return new_info;
-}
diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
deleted file mode 100644
index a2cd4f43a0..0000000000
--- a/widgets/table/e-table-sort-info.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORT_INFO_H_
-#define _E_TABLE_SORT_INFO_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORT_INFO_TYPE        (e_table_sort_info_get_type ())
-#define E_TABLE_SORT_INFO(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo))
-#define E_TABLE_SORT_INFO_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass))
-#define E_IS_TABLE_SORT_INFO(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORT_INFO_TYPE))
-#define E_IS_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE))
-
-typedef struct _ETableSortColumn ETableSortColumn;
-
-struct _ETableSortColumn {
-	guint column : 31;
-	guint ascending : 1;
-};
-
-typedef struct {
-	GtkObject   base;
-	
-	gint group_count;
-	ETableSortColumn *groupings;
-	gint sort_count;
-	ETableSortColumn *sortings;
-	
-	guint frozen : 1;
-	guint sort_info_changed : 1;
-	guint group_info_changed : 1;
-} ETableSortInfo;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void        (*sort_info_changed)      (ETableSortInfo *info);
-	void        (*group_info_changed)     (ETableSortInfo *info);
-} ETableSortInfoClass;
-
-GtkType           e_table_sort_info_get_type            (void);
-
-void              e_table_sort_info_freeze              (ETableSortInfo   *info);
-void              e_table_sort_info_thaw                (ETableSortInfo   *info);
-
-guint             e_table_sort_info_grouping_get_count  (ETableSortInfo   *info);
-void              e_table_sort_info_grouping_truncate   (ETableSortInfo   *info,
-							 int               length);
-ETableSortColumn  e_table_sort_info_grouping_get_nth    (ETableSortInfo   *info,
-							 int               n);
-void              e_table_sort_info_grouping_set_nth    (ETableSortInfo   *info,
-							 int               n,
-							 ETableSortColumn  column);
-
-guint             e_table_sort_info_sorting_get_count   (ETableSortInfo   *info);
-void              e_table_sort_info_sorting_truncate    (ETableSortInfo   *info,
-							 int               length);
-ETableSortColumn  e_table_sort_info_sorting_get_nth     (ETableSortInfo   *info,
-							 int               n);
-void              e_table_sort_info_sorting_set_nth     (ETableSortInfo   *info,
-							 int               n,
-							 ETableSortColumn  column);
-
-ETableSortInfo   *e_table_sort_info_new                 (void);
-void              e_table_sort_info_load_from_node      (ETableSortInfo   *info,
-							 xmlNode          *node,
-							 gdouble           state_version);
-xmlNode          *e_table_sort_info_save_to_node        (ETableSortInfo   *info,
-							 xmlNode          *parent);
-ETableSortInfo   *e_table_sort_info_duplicate           (ETableSortInfo   *info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORT_INFO_H_ */
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
deleted file mode 100644
index 665d5fd1d7..0000000000
--- a/widgets/table/e-table-sorted-variable.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorted-variable.h"
-#include "e-table-sorting-utils.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETSV_INSERT_MAX (4)
-
-static ETableSubsetVariableClass *etsv_parent_class;
-
-static void etsv_sort_info_changed        (ETableSortInfo *info, ETableSortedVariable *etsv);
-static void etsv_sort                     (ETableSortedVariable *etsv);
-static void etsv_add                      (ETableSubsetVariable *etssv, gint                  row);
-static void etsv_add_all                  (ETableSubsetVariable *etssv);
-
-static void
-etsv_destroy (GtkObject *object)
-{
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (etsv->sort_info),
-			       etsv->sort_info_changed_id);
-
-	if (etsv->sort_idle_id) {
-		g_source_remove(etsv->sort_idle_id);
-	}
-	if (etsv->insert_idle_id) {
-		g_source_remove(etsv->insert_idle_id);
-	}
-
-	if (etsv->sort_info)
-		gtk_object_unref(GTK_OBJECT(etsv->sort_info));
-	if (etsv->full_header)
-		gtk_object_unref(GTK_OBJECT(etsv->full_header));
-
-	GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
-}
-
-static void
-etsv_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
-
-	etsv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = etsv_destroy;
-
-	etssv_class->add = etsv_add;
-	etssv_class->add_all = etsv_add_all;
-}
-
-static void
-etsv_init (ETableSortedVariable *etsv)
-{
-	etsv->full_header = NULL;
-	etsv->sort_info = NULL;
-
-	etsv->sort_info_changed_id = 0;
-
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE);
-
-static gboolean
-etsv_sort_idle(ETableSortedVariable *etsv)
-{
-	gtk_object_ref(GTK_OBJECT(etsv));
-	etsv_sort(etsv);
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(etsv));
-	return FALSE;
-}
-
-static gboolean
-etsv_insert_idle(ETableSortedVariable *etsv)
-{
-	etsv->insert_count = 0;
-	etsv->insert_idle_id = 0;
-	return FALSE;
-}
-
-
-static void
-etsv_add       (ETableSubsetVariable *etssv,
-		gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int i;
-
-	if (etss->n_map + 1 > etssv->n_vals_allocated) {
-		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(int));
-	}
-	i = etss->n_map;
-	if (etsv->sort_idle_id == 0) {
-		/* this is to see if we're inserting a lot of things between idle loops.
-		   If we are, we're busy, its faster to just append and perform a full sort later */
-		etsv->insert_count++;
-		if (etsv->insert_count > ETSV_INSERT_MAX) {
-			/* schedule a sort, and append instead */
-			etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL);
-		} else {
-			/* make sure we have an idle handler to reset the count every now and then */
-			if (etsv->insert_idle_id == 0) {
-				etsv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) etsv_insert_idle, etsv, NULL);
-			}
-			i = e_table_sorting_utils_insert(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map, row);
-			memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
-		}
-	}
-	etss->map_table[i] = row;
-	etss->n_map++;
-
-	e_table_model_row_inserted (etm, i);
-}
-
-static void
-etsv_add_all   (ETableSubsetVariable *etssv)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int rows;
-	int i;
-
-	e_table_model_pre_change(etm);
-
-	rows = e_table_model_row_count(etss->source);
-
-	if (etss->n_map + rows > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < rows; i++)
-		etss->map_table[etss->n_map++] = i;
-
-	if (etsv->sort_idle_id == 0) {
-		etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL);
-	}
-
-	e_table_model_changed (etm);
-}
-
-ETableModel *
-e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSortedVariable *etsv = gtk_type_new (E_TABLE_SORTED_VARIABLE_TYPE);
-	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
-
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etsv));
-		return NULL;
-	}
-
-	etsv->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(etsv->sort_info));
-	etsv->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(etsv->full_header));
-
-	etsv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (etsv_sort_info_changed), etsv);
-
-	return E_TABLE_MODEL(etsv);
-}
-
-static void
-etsv_sort_info_changed (ETableSortInfo *info, ETableSortedVariable *etsv)
-{
-	etsv_sort(etsv);
-}
-
-static void
-etsv_sort(ETableSortedVariable *etsv)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(etsv);
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(etsv));
-
-	e_table_sorting_utils_sort(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map);
-
-	e_table_model_changed (E_TABLE_MODEL(etsv));
-	reentering = 0;
-}
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
deleted file mode 100644
index d326e26df8..0000000000
--- a/widgets/table/e-table-sorted-variable.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTED_VARIABLE_H_
-#define _E_TABLE_SORTED_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORTED_VARIABLE_TYPE        (e_table_sorted_variable_get_type ())
-#define E_TABLE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
-#define E_TABLE_SORTED_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
-#define E_IS_TABLE_SORTED_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTED_VARIABLE_TYPE))
-#define E_IS_TABLE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_VARIABLE_TYPE))
-
-typedef struct {
-	ETableSubsetVariable base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETableSortedVariable;
-
-typedef struct {
-	ETableSubsetVariableClass parent_class;
-} ETableSortedVariableClass;
-
-GtkType      e_table_sorted_variable_get_type (void);
-ETableModel *e_table_sorted_variable_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTED_VARIABLE_H_ */
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
deleted file mode 100644
index a876ed385c..0000000000
--- a/widgets/table/e-table-sorted.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorted.h"
-#include "e-table-sorting-utils.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TABLE_SUBSET_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETS_INSERT_MAX (4)
-
-static ETableSubsetClass *ets_parent_class;
-
-static void ets_sort_info_changed        (ETableSortInfo *info, ETableSorted *ets);
-static void ets_sort                     (ETableSorted *ets);
-static void ets_proxy_model_changed      (ETableSubset *etss, ETableModel *source);
-static void ets_proxy_model_row_changed  (ETableSubset *etss, ETableModel *source, int row);
-static void ets_proxy_model_cell_changed (ETableSubset *etss, ETableModel *source, int col, int row);
-static void ets_proxy_model_row_inserted (ETableSubset *etss, ETableModel *source, int row);
-static void ets_proxy_model_row_deleted  (ETableSubset *etss, ETableModel *source, int row);
-
-static void
-ets_destroy (GtkObject *object)
-{
-	ETableSorted *ets = E_TABLE_SORTED (object);
-
-	if (ets->sort_idle_id) {
-		g_source_remove(ets->sort_idle_id);
-	}
-	if (ets->insert_idle_id) {
-		g_source_remove(ets->insert_idle_id);
-	}
-
-	if (ets->sort_info) {
-		gtk_signal_disconnect (GTK_OBJECT (ets->sort_info),
-				       ets->sort_info_changed_id);
-		gtk_object_unref(GTK_OBJECT(ets->sort_info));
-	}
-
-	if (ets->full_header)
-		gtk_object_unref(GTK_OBJECT(ets->full_header));
-
-	GTK_OBJECT_CLASS (ets_parent_class)->destroy (object);
-}
-
-static void
-ets_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetClass *etss_class = E_TABLE_SUBSET_CLASS(object_class);
-
-	ets_parent_class = gtk_type_class (PARENT_TYPE);
-
-	etss_class->proxy_model_changed = ets_proxy_model_changed;
-	etss_class->proxy_model_row_changed = ets_proxy_model_row_changed;
-	etss_class->proxy_model_cell_changed = ets_proxy_model_cell_changed;
-	etss_class->proxy_model_row_inserted = ets_proxy_model_row_inserted;
-	etss_class->proxy_model_row_deleted = ets_proxy_model_row_deleted;
-
-	object_class->destroy = ets_destroy;
-}
-
-static void
-ets_init (ETableSorted *ets)
-{
-	ets->full_header = NULL;
-	ets->sort_info = NULL;
-
-	ets->sort_info_changed_id = 0;
-
-	ets->sort_idle_id = 0;
-	ets->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_table_sorted, "ETableSorted", ETableSorted, ets_class_init, ets_init, PARENT_TYPE);
-
-static gboolean
-ets_sort_idle(ETableSorted *ets)
-{
-	gtk_object_ref(GTK_OBJECT(ets));
-	ets_sort(ets);
-	ets->sort_idle_id = 0;
-	ets->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(ets));
-	return FALSE;
-}
-
-static gboolean
-ets_insert_idle(ETableSorted *ets)
-{
-	ets->insert_count = 0;
-	ets->insert_idle_id = 0;
-	return FALSE;
-}
-
-ETableModel *
-e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSorted *ets = gtk_type_new (E_TABLE_SORTED_TYPE);
-	ETableSubset *etss = E_TABLE_SUBSET (ets);
-
-	if (e_table_subset_construct (etss, source, 0) == NULL){
-		gtk_object_unref (GTK_OBJECT (ets));
-		return NULL;
-	}
-
-	ets->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(ets->sort_info));
-	ets->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(ets->full_header));
-
-	ets_proxy_model_changed(etss, source);
-
-	ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-
-	return E_TABLE_MODEL(ets);
-}
-
-static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets)
-{
-	ets_sort(ets);
-}
-
-static void
-ets_proxy_model_changed (ETableSubset *subset, ETableModel *source)
-{
-	int rows, i;
-
-	rows = e_table_model_row_count(source);
-
-	g_free(subset->map_table);
-	subset->n_map = rows;
-	subset->map_table = g_new(int, rows);
-
-	for (i = 0; i < rows; i++) {
-		subset->map_table[i] = i;
-	}
-
-	if (!E_TABLE_SORTED(subset)->sort_idle_id)
-		E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL);
-
-	e_table_model_changed(E_TABLE_MODEL(subset));
-}
-
-static void
-ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, int row)
-{
-	if (!E_TABLE_SORTED(subset)->sort_idle_id)
-		E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL);
-	
-	if (ets_parent_class->proxy_model_row_changed)
-		(ets_parent_class->proxy_model_row_changed) (subset, source, row);
-}
-
-static void
-ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, int col, int row)
-{
-	ETableSorted *ets = E_TABLE_SORTED(subset);
-	if (e_table_sorting_utils_affects_sort(source, ets->sort_info, ets->full_header, col))
-		ets_proxy_model_row_changed(subset, source, row);
-	else if (ets_parent_class->proxy_model_cell_changed)
-		(ets_parent_class->proxy_model_cell_changed) (subset, source, col, row);
-}
-
-static void
-ets_proxy_model_row_inserted (ETableSubset *etss, ETableModel *source, int row)
-{
- 	ETableModel *etm = E_TABLE_MODEL(etss);
-	ETableSorted *ets = E_TABLE_SORTED(etss);
-	int i;
-
-	e_table_model_pre_change (etm);
-
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= row)
-			etss->map_table[i] ++;
-	}
-
-	etss->map_table = g_realloc (etss->map_table, (etss->n_map + 1) * sizeof(int));
-
-	i = etss->n_map;
-	if (ets->sort_idle_id == 0) {
-		/* this is to see if we're inserting a lot of things between idle loops.
-		   If we are, we're busy, its faster to just append and perform a full sort later */
-		ets->insert_count++;
-		if (ets->insert_count > ETS_INSERT_MAX) {
-			/* schedule a sort, and append instead */
-			ets->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, ets, NULL);
-		} else {
-			/* make sure we have an idle handler to reset the count every now and then */
-			if (ets->insert_idle_id == 0) {
-				ets->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL);
-			}
-			i = e_table_sorting_utils_insert(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row);
-			memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
-		}
-	}
-	etss->map_table[i] = row;
-	etss->n_map++;
-
-	e_table_model_row_inserted (etm, i);
-	d(g_print("inserted row %d", row));
-	d(e_table_subset_print_debugging(etss));
-}
-
-static void
-ets_proxy_model_row_deleted (ETableSubset *etss, ETableModel *source, int row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etss);
-	int i;
-	gboolean shift;
-
-	shift = row == etss->n_map - 1;
-	
-	for (i = 0; i < etss->n_map; i++){
-		if (etss->map_table[i] == row) {
-			e_table_model_pre_change (etm);
-			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
-			etss->n_map --;
-			if (shift)
-				e_table_model_row_deleted (etm, i);
-		}
-	}
-	if (!shift) {
-		for (i = 0; i < etss->n_map; i++) {
-			if (etss->map_table[i] >= row)
-				etss->map_table[i] --;
-		}
-
-		e_table_model_changed (etm);
-	}
-
-	d(g_print("deleted row %d", row));
-	d(e_table_subset_print_debugging(etss));
-}
-
-static void
-ets_sort(ETableSorted *ets)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(ets);
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(ets));
-
-	e_table_sorting_utils_sort(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map);
-
-	e_table_model_changed (E_TABLE_MODEL(ets));
-	reentering = 0;
-}
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
deleted file mode 100644
index a138cdeb04..0000000000
--- a/widgets/table/e-table-sorted.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTED_H_
-#define _E_TABLE_SORTED_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORTED_TYPE        (e_table_sorted_get_type ())
-#define E_TABLE_SORTED(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_TYPE, ETableSorted))
-#define E_TABLE_SORTED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_TYPE, ETableSortedClass))
-#define E_IS_TABLE_SORTED(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTED_TYPE))
-#define E_IS_TABLE_SORTED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_TYPE))
-
-typedef struct {
-	ETableSubset base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETableSorted;
-
-typedef struct {
-	ETableSubsetClass parent_class;
-} ETableSortedClass;
-
-GtkType      e_table_sorted_get_type (void);
-ETableModel *e_table_sorted_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTED_H_ */
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
deleted file mode 100644
index 2dbbddf366..0000000000
--- a/widgets/table/e-table-sorter.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorter.h"
-
-#define d(x)
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_SORT_INFO
-};
-
-#define PARENT_TYPE e_sorter_get_type()
-
-#define INCREMENT_AMOUNT 100
-
-static ESorterClass *parent_class;
-
-static void    	ets_model_changed      (ETableModel *etm, ETableSorter *ets);
-static void    	ets_model_row_changed  (ETableModel *etm, int row, ETableSorter *ets);
-static void    	ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets);
-static void    	ets_sort_info_changed  (ETableSortInfo *info, ETableSorter *ets);
-static void    	ets_clean              (ETableSorter *ets);
-static void    	ets_sort               (ETableSorter *ets);
-static void    	ets_backsort           (ETableSorter *ets);
-
-static gint    	ets_model_to_sorted           (ESorter *sorter, int row);
-static gint    	ets_sorted_to_model           (ESorter *sorter, int row);
-static void    	ets_get_model_to_sorted_array (ESorter *sorter, int **array, int *count);
-static void    	ets_get_sorted_to_model_array (ESorter *sorter, int **array, int *count);
-static gboolean ets_needs_sorting             (ESorter *ets);
-
-static void
-ets_destroy (GtkObject *object)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_row_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_cell_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->sort_info),
-			       ets->sort_info_changed_id);
-
-	ets->table_model_changed_id = 0;
-	ets->table_model_row_changed_id = 0;
-	ets->table_model_cell_changed_id = 0;
-	ets->sort_info_changed_id = 0;
-	
-	if (ets->sort_info)
-		gtk_object_unref(GTK_OBJECT(ets->sort_info));
-	if (ets->full_header)
-		gtk_object_unref(GTK_OBJECT(ets->full_header));
-	if (ets->source)
-		gtk_object_unref(GTK_OBJECT(ets->source));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-ets_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		if (ets->sort_info) {
-			if (ets->sort_info_changed_id)
-				gtk_signal_disconnect(GTK_OBJECT(ets->sort_info), ets->sort_info_changed_id);
-			gtk_object_unref(GTK_OBJECT(ets->sort_info));
-		}
-
-		ets->sort_info = E_TABLE_SORT_INFO(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref(GTK_OBJECT(ets->sort_info));
-		ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (ets->sort_info), "sort_info_changed",
-								GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-
-		ets_clean (ets);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ets_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->sort_info);
-		break;
-	}
-}
-
-static void
-ets_class_init (ETableSorterClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-	ESorterClass *sorter_class = E_SORTER_CLASS(klass);
-
-	parent_class                            = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy                   = ets_destroy;
-	object_class->set_arg                   = ets_set_arg;
-	object_class->get_arg                   = ets_get_arg;
-
-	sorter_class->model_to_sorted           = ets_model_to_sorted           ;
-	sorter_class->sorted_to_model           = ets_sorted_to_model           ;
-	sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ;
-	sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ;		
-	sorter_class->needs_sorting             = ets_needs_sorting             ;
-
-	gtk_object_add_arg_type ("ETableSorter::sort_info", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_SORT_INFO); 
-}
-
-static void
-ets_init (ETableSorter *ets)
-{
-	ets->full_header = NULL;
-	ets->sort_info = NULL;
-	ets->source = NULL;
-
-	ets->needs_sorting = -1;
-
-	ets->table_model_changed_id = 0;
-	ets->table_model_row_changed_id = 0;
-	ets->table_model_cell_changed_id = 0;
-	ets->sort_info_changed_id = 0;
-}
-
-E_MAKE_TYPE(e_table_sorter, "ETableSorter", ETableSorter, ets_class_init, ets_init, PARENT_TYPE);
-
-ETableSorter *
-e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSorter *ets = gtk_type_new (E_TABLE_SORTER_TYPE);
-	
-	ets->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(ets->sort_info));
-	ets->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(ets->full_header));
-	ets->source = source;
-	gtk_object_ref(GTK_OBJECT(ets->source));
-
-	ets->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-							   GTK_SIGNAL_FUNC (ets_model_changed), ets);
-	ets->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							       GTK_SIGNAL_FUNC (ets_model_row_changed), ets);
-	ets->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-								GTK_SIGNAL_FUNC (ets_model_cell_changed), ets);
-	ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-	
-	return ets;
-}
-
-static void
-ets_model_changed (ETableModel *etm, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets)
-{
-	printf ("sort info changed\n");
-	ets_clean(ets);
-}
-
-static ETableSorter *ets_closure;
-static void **vals_closure;
-static int cols_closure;
-static int *ascending_closure;
-static GCompareFunc *compare_closure;
-
-/* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	gint row1 = *(int *)data1;
-	gint row2 = *(int *)data2;
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(ets_closure->sort_info) + e_table_sort_info_grouping_get_count(ets_closure->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]);
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static void
-ets_clean(ETableSorter *ets)
-{
-	g_free(ets->sorted);
-	ets->sorted = NULL;
-
-	g_free(ets->backsorted);
-	ets->backsorted = NULL;
-
-	ets->needs_sorting = -1;
-}
-
-struct _group_info {
-	char *group;
-	int row;
-};
-
-struct _rowinfo {
-	int row;
-	struct _subinfo *subinfo;
-	struct _group_info *groupinfo;
-};
-
-struct _subinfo {
-	int start;
-	GArray *rowsort;	/* an array of row info's */
-};
-
-/* builds the info needed to sort everything */
-static struct _subinfo *
-ets_sort_build_subset(ETableSorter *ets, struct _group_info *groupinfo, int start, int *end)
-{
-	int rows = e_table_model_row_count (ets->source);
-	int i, lastinsert;
-	GArray *rowsort = g_array_new(0, 0, sizeof(struct _rowinfo));
-	struct _subinfo *subinfo, *newsub;
-	char *id, *newid;
-	int idlen, newidlen;
-	int cmp;
-	int cmplen;
-
-	subinfo = g_malloc0(sizeof(*subinfo));
-	subinfo->rowsort = rowsort;
-	subinfo->start = start;
-	lastinsert = -1;
-	id = groupinfo[start].group;
-	newid = strrchr(id, '/');
-	idlen = strlen(id);
-	if (newid)
-		cmplen = newid-id;
-	else
-		cmplen = idlen;
-	d(printf("%d scanning level %s\n", start, id));
-	for (i=start;i<rows;i++) {
-		newid = groupinfo[i].group;
-		newidlen = strlen(newid);
-		d(printf("%d checking group %s\n", start, newid));
-		cmp = strncmp(id, newid, cmplen);
-		/* check for common parent */
-		if (idlen == newidlen && cmp == 0) {
-			struct _rowinfo rowinfo;
-
-			d(printf("%d Same parent\n", start));
-			rowinfo.row = groupinfo[i].row;
-			rowinfo.subinfo = NULL;
-			rowinfo.groupinfo = &groupinfo[i];
-			lastinsert = rowsort->len;
-			g_array_append_val(rowsort, rowinfo);
-#ifdef DEBUG
-			total++;
-#endif
-		} else if (newidlen > idlen) {
-			/* must be a new subtree */
-			d(printf("%d checking subtree instead\n", start));
-			newsub = ets_sort_build_subset(ets, groupinfo, i, &i);
-			d(printf("found %d nodes in subtree\n", newsub->rowsort->len));
-			g_array_index(rowsort, struct _rowinfo, lastinsert).subinfo = newsub;
-		} else {
-			i--;
-			break;
-		}
-	}
-	if (end)
-		*end = i;
-	d(printf("finished level %s start was %d end was %d\n", id, start, i));
-	return subinfo;
-}
-
-/* sort each level, and then sort each level below that level (once we know
-   where the sublevel will fit in the overall list) */
-static int
-ets_sort_subset(ETableSorter *ets, struct _subinfo *subinfo, int startoffset)
-{
-	GArray *rowsort = subinfo->rowsort;
-	int offset, i;
-
-	d(printf("sorting subset start %d rows %d\n", startoffset, rowsort->len));
-
-	/* first, sort the actual data */
-	qsort(rowsort->data, rowsort->len, sizeof(struct _rowinfo), qsort_callback);
-
-	/* then put it back in the map table, where appropriate */
-	offset = startoffset;
-	for (i=0;i<rowsort->len;i++) {
-		struct _rowinfo *rowinfo;
-
-		d(printf("setting offset %d\n", offset));
-
-		rowinfo = &g_array_index(rowsort, struct _rowinfo, i);
-		ets->sorted[offset] = rowinfo->row;
-		if (rowinfo->subinfo) {
-			offset = ets_sort_subset(ets, rowinfo->subinfo, offset+1);
-		} else
-			offset += 1;
-	}
-	d(printf("end sort subset start %d\n", startoffset));
-
-	return offset;
-}
-
-static void
-ets_sort_free_subset(ETableSorter *ets, struct _subinfo *subinfo)
-{
-	int i;
-
-	for (i=0;i<subinfo->rowsort->len;i++) {
-		struct _rowinfo *rowinfo;
-
-		rowinfo = &g_array_index(subinfo->rowsort, struct _rowinfo, i);
-		if (rowinfo->subinfo)
-			ets_sort_free_subset(ets, rowinfo->subinfo);
-	}
-	g_array_free(subinfo->rowsort, TRUE);
-	g_free(subinfo);
-}
-
-static int
-sort_groups_compare(const void *ap, const void *bp)
-{
-	struct _group_info *a = (struct _group_info *)ap;
-	struct _group_info *b = (struct _group_info *)bp;
-
-	return strcmp(a->group, b->group);
-}
-
-/* use the sort group to select subsorts */
-static void
-ets_sort_by_group (ETableSorter *ets)
-{
-	int rows = e_table_model_row_count (ets->source);
-	struct _group_info *groups;
-	struct _subinfo *subinfo;
-	int i;
-
-	d(printf("sorting %d rows\n", rows));
-
-	if (rows == 0)
-		return;
-
-	/* get all the rows' sort groups */
-	groups = g_new(struct _group_info, rows);
-	for (i=0;i<rows;i++) {
-		groups[i].row = i;
-		groups[i].group = g_strdup(e_table_model_row_sort_group(ets->source, groups[i].row));
-	}
-
-	/* sort the group info */
-	qsort(groups, rows, sizeof(struct _group_info), sort_groups_compare);
-
-	d(printf("sorted groups:\n");
-	for (i=0;i<rows;i++) {
-		printf(" %s\n", groups[i].group);
-	});
-	
-	/* now sort based on the group info */
-	subinfo = ets_sort_build_subset(ets, groups, 0, NULL);
-	for (i=0;i<rows;i++) {
-		g_free(groups[i].group);
-	}
-	g_free(groups);
-	ets_sort_subset(ets, subinfo, 0);
-	ets_sort_free_subset(ets, subinfo);
-}
-
-static void
-ets_sort(ETableSorter *ets)
-{
-	int rows;
-	int i;
-	int j;
-	int cols;
-	int group_cols;
-
-	if (ets->sorted)
-		return;
-
-	rows = e_table_model_row_count(ets->source);
-	group_cols = e_table_sort_info_grouping_get_count(ets->sort_info);
-	cols = e_table_sort_info_sorting_get_count(ets->sort_info) + group_cols;
-
-	ets->sorted = g_new(int, rows);
-	for (i = 0; i < rows; i++)
-		ets->sorted[i] = i;
-
-	cols_closure = cols;
-	ets_closure = ets;
-
-	vals_closure = g_new(void *, rows * cols);
-	ascending_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column;
-		ETableCol *col;
-
-		if (j < group_cols)
-			column = e_table_sort_info_grouping_get_nth(ets->sort_info, j);
-		else
-			column = e_table_sort_info_sorting_get_nth(ets->sort_info, j - group_cols);
-
-		col = e_table_header_get_column_by_col_idx(ets->full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (ets->full_header, e_table_header_count (ets->full_header) - 1);
-
-		for (i = 0; i < rows; i++) {
-			vals_closure[i * cols + j] = e_table_model_value_at (ets->source, col->col_idx, i);
-		}
-
-		compare_closure[j] = col->compare;
-		ascending_closure[j] = column.ascending;
-	}
-
-	if (e_table_model_has_sort_group (ets->source)) {
-		ets_sort_by_group (ets);
-	}
-	else {
-		qsort(ets->sorted, rows, sizeof(int), qsort_callback);
-	}
-
-	g_free(vals_closure);
-	g_free(ascending_closure);
-	g_free(compare_closure);
-}
-
-static void
-ets_backsort(ETableSorter *ets)
-{
-	int i, rows;
-
-	if (ets->backsorted)
-		return;
-
-	ets_sort(ets);
-
-	rows = e_table_model_row_count(ets->source);
-	ets->backsorted = g_new0(int, rows);
-
-	for (i = 0; i < rows; i++) {
-		ets->backsorted[ets->sorted[i]] = i;
-	}
-}
-
-
-static gint
-ets_model_to_sorted (ESorter *es, int row)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	int rows = e_table_model_row_count(ets->source);
-
-	g_return_val_if_fail(row >= 0, -1);
-	g_return_val_if_fail(row < rows, -1);
-
-	if (ets_needs_sorting(es))
-		ets_backsort(ets);
-
-	if (ets->backsorted)
-		return ets->backsorted[row];
-	else
-		return row;
-}
-
-static gint
-ets_sorted_to_model (ESorter *es, int row)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	int rows = e_table_model_row_count(ets->source);
-
-	g_return_val_if_fail(row >= 0, -1);
-	g_return_val_if_fail(row < rows, -1);
-
-	if (ets_needs_sorting(es))
-		ets_sort(ets);
-
-	if (ets->sorted)
-		return ets->sorted[row];
-	else
-		return row;
-}
-
-static void
-ets_get_model_to_sorted_array (ESorter *es, int **array, int *count)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (array || count) {
-		ets_backsort(ets);
-
-		if (array)
-			*array = ets->backsorted;
-		if (count)
-			*count = e_table_model_row_count(ets->source);
-	}
-}
-
-static void
-ets_get_sorted_to_model_array (ESorter *es, int **array, int *count)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (array || count) {
-		ets_sort(ets);
-
-		if (array)
-			*array = ets->sorted;
-		if (count)
-			*count = e_table_model_row_count(ets->source);
-	}
-}
-
-
-static gboolean
-ets_needs_sorting(ESorter *es)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (ets->needs_sorting < 0) {
-		if (e_table_sort_info_sorting_get_count(ets->sort_info) + e_table_sort_info_grouping_get_count(ets->sort_info))
-			ets->needs_sorting = 1;
-		else
-			ets->needs_sorting = 0;
-	}
-	return ets->needs_sorting;
-}
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
deleted file mode 100644
index a6c999f744..0000000000
--- a/widgets/table/e-table-sorter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTER_H_
-#define _E_TABLE_SORTER_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_SORTER_TYPE        (e_table_sorter_get_type ())
-#define E_TABLE_SORTER(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTER_TYPE, ETableSorter))
-#define E_TABLE_SORTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTER_TYPE, ETableSorterClass))
-#define E_IS_TABLE_SORTER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTER_TYPE))
-#define E_IS_TABLE_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTER_TYPE))
-
-typedef struct {
-	ESorter base;
-
-	ETableModel    *source;
-	ETableHeader   *full_header;
-	ETableSortInfo *sort_info;
-
-	/* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */
-	int             needs_sorting;
-
-	int            *sorted;
-	int            *backsorted;
-
-	int             table_model_changed_id;
-	int             table_model_row_changed_id;
-	int             table_model_cell_changed_id;
-	int             sort_info_changed_id;
-} ETableSorter;
-
-typedef struct {
-	ESorterClass parent_class;
-} ETableSorterClass;
-
-GtkType       e_table_sorter_get_type                   (void);
-ETableSorter *e_table_sorter_new                        (ETableModel     *etm,
-							 ETableHeader    *full_header,
-							 ETableSortInfo  *sort_info);
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_SORTER_H_ */
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
deleted file mode 100644
index 364397d17f..0000000000
--- a/widgets/table/e-table-sorting-utils.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <string.h>
-#include <e-table-sorting-utils.h>
-
-#define d(x)
-
-/* This takes source rows. */
-static int
-etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int row1, int row2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		comp_val = (*col->compare)(e_table_model_value_at (source, col->col_idx, row1),
-					   e_table_model_value_at (source, col->col_idx, row2));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static ETableSortInfo *sort_info_closure;
-
-static void **vals_closure;
-static int cols_closure;
-static int *ascending_closure;
-static GCompareFunc *compare_closure;
-
-/* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	gint row1 = *(int *)data1;
-	gint row2 = *(int *)data2;
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(sort_info_closure);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]);
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-struct _subinfo {
-	int start;
-	GArray *rowsort;	/* an array of row info's */
-};
-
-struct _rowinfo {
-	int row;
-	struct _subinfo *subinfo;
-	struct _group_info *groupinfo;
-};
-
-static int
-qsort_callback_complex(const void *data1, const void *data2)
-{
-	gint row1 = ((struct _rowinfo *)data1)->row;
-	gint row2 = ((struct _rowinfo *)data2)->row;
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(sort_info_closure);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]);
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-/* if sortgroup is like:
-0   1  	     1 	1
-1   1	     2 	  2
-2    2	     3 	  2
-3    2	     4 	   3
-4     3	     5 	  3
-5    2 	     6 	1
-6   1	     0	1
-
-   Want to sort the 1's first
-   Then sort each group of 2's, offsetting into the output by the new root 1 location
-   ... Recursively ...
-*/
-
-struct _group_info {
-	char *group;
-	int row;
-};
-
-#ifdef DEBUG
-#undef DEBUG
-#endif
-/*#define DEBUG*/
-
-#ifdef DEBUG
-static int total=0;
-static int total_sorted=0;
-#endif
-
-/* builds the info needed to sort everything */
-static struct _subinfo *
-etsu_sort_build_subset(int rows, struct _group_info *groupinfo, int start, int *end)
-{
-	int i, lastinsert;
-	GArray *rowsort = g_array_new(0, 0, sizeof(struct _rowinfo));
-	struct _subinfo *subinfo, *newsub;
-	char *id, *newid;
-	int idlen, newidlen;
-	int cmp;
-	int cmplen;
-
-	subinfo = g_malloc0(sizeof(*subinfo));
-	subinfo->rowsort = rowsort;
-	subinfo->start = start;
-	lastinsert = -1;
-	id = groupinfo[start].group;
-	newid = strrchr(id, '/');
-	idlen = strlen(id);
-	if (newid)
-		cmplen = newid-id;
-	else
-		cmplen = idlen;
-	d(printf("%d scanning level %s\n", start, id));
-	for (i=start;i<rows;i++) {
-		newid = groupinfo[i].group;
-		newidlen = strlen(newid);
-		d(printf("%d checking group %s\n", start, newid));
-		cmp = strncmp(id, newid, cmplen);
-		/* check for common parent */
-		if (idlen == newidlen && cmp == 0) {
-			struct _rowinfo rowinfo;
-
-			d(printf("%d Same parent\n", start));
-			rowinfo.row = groupinfo[i].row;
-			rowinfo.subinfo = NULL;
-			rowinfo.groupinfo = &groupinfo[i];
-			lastinsert = rowsort->len;
-			g_array_append_val(rowsort, rowinfo);
-#ifdef DEBUG
-			total++;
-#endif
-		} else if (newidlen > idlen) {
-			/* must be a new subtree */
-			d(printf("%d checking subtree instead\n", start));
-			newsub = etsu_sort_build_subset(rows, groupinfo, i, &i);
-			d(printf("found %d nodes in subtree\n", newsub->rowsort->len));
-			g_array_index(rowsort, struct _rowinfo, lastinsert).subinfo = newsub;
-		} else {
-			i--;
-			break;
-		}
-	}
-	if (end)
-		*end = i;
-	d(printf("finished level %s start was %d end was %d\n", id, start, i));
-	return subinfo;
-}
-
-/* sort each level, and then sort each level below that level (once we know
-   where the sublevel will fit in the overall list) */
-static int
-etsu_sort_subset(int *map_table, struct _subinfo *subinfo, int startoffset)
-{
-	GArray *rowsort = subinfo->rowsort;
-	int offset, i;
-
-	d(printf("sorting subset start %d rows %d\n", startoffset, rowsort->len));
-
-	/* first, sort the actual data */
-	qsort(rowsort->data, rowsort->len, sizeof(struct _rowinfo), qsort_callback_complex);
-
-	/* then put it back in the map table, where appropriate */
-	offset = startoffset;
-	for (i=0;i<rowsort->len;i++) {
-		struct _rowinfo *rowinfo;
-
-		d(printf("setting offset %d\n", offset));
-
-		rowinfo = &g_array_index(rowsort, struct _rowinfo, i);
-		map_table[offset] = rowinfo->row;
-		if (rowinfo->subinfo) {
-			offset = etsu_sort_subset(map_table, rowinfo->subinfo, offset+1);
-		} else
-			offset += 1;
-	}
-	d(printf("end sort subset start %d\n", startoffset));
-
-	return offset;
-}
-
-static void
-etsu_sort_free_subset(struct _subinfo *subinfo)
-{
-	int i;
-
-	for (i=0;i<subinfo->rowsort->len;i++) {
-		struct _rowinfo *rowinfo;
-
-		rowinfo = &g_array_index(subinfo->rowsort, struct _rowinfo, i);
-		if (rowinfo->subinfo)
-			etsu_sort_free_subset(rowinfo->subinfo);
-	}
-	g_array_free(subinfo->rowsort, TRUE);
-	g_free(subinfo);
-}
-
-static int
-sort_groups_compare(const void *ap, const void *bp)
-{
-	struct _group_info *a = (struct _group_info *)ap;
-	struct _group_info *b = (struct _group_info *)bp;
-
-	return strcmp(a->group, b->group);
-}
-
-#ifdef DEBUG
-static void
-print_id(int key, int val, void *data)
-{
-	printf("gained id %d\n", key);
-}
-#endif
-
-/* use the sort group to select subsorts */
-static void
-etsu_sort_by_group(ETableModel *source, int *map_table, int rows)
-{
-	struct _group_info *groups;
-	struct _subinfo *subinfo;
-	int i;
-#ifdef DEBUG
-	GHashTable *members = g_hash_table_new(0, 0);
-
-	total = 0;
-	total_sorted = 0;
-#endif
-
-	d(printf("sorting %d rows\n", rows));
-
-	if (rows == 0)
-		return;
-
-	/* get the subset rows */
-	groups = g_malloc(sizeof(struct _group_info) * rows);
-	for (i=0;i<rows;i++) {
-		groups[i].row = map_table[i];
-		groups[i].group = g_strdup(e_table_model_row_sort_group(source, groups[i].row));
-#ifdef DEBUG
-		g_hash_table_insert(members, map_table[i], 1);
-		map_table[i] = 0;
-#endif
-	}
-
-	/* sort the group info */
-	qsort(groups, rows, sizeof(struct _group_info), sort_groups_compare);
-
-	d(printf("sorted groups:\n");
-	for (i=0;i<rows;i++) {
-		printf(" %s\n", groups[i].group);
-	});
-	
-	/* now sort based on the group info */
-	subinfo = etsu_sort_build_subset(rows, groups, 0, NULL);
-	for (i=0;i<rows;i++) {
-		g_free(groups[i].group);
-	}
-	g_free(groups);
-	etsu_sort_subset(map_table, subinfo, 0);
-	etsu_sort_free_subset(subinfo);
-#ifdef DEBUG
-	for (i=0;i<rows;i++) {
-		if (g_hash_table_lookup(members, map_table[i]) == 0) {
-			printf("lost id %d\n", map_table[i]);
-		}
-		g_hash_table_remove(members, map_table[i]);
-	}
-	g_hash_table_foreach(members, print_id, 0);
-
-	printf("total rows = %d, total processed = %d, total sorted = %d\n", rows, total, total_sorted);
-#endif
-
-}
-
-void
-e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows)
-{
-	int total_rows;
-	int i;
-	int j;
-	int cols;
-
-	g_return_if_fail(source != NULL);
-	g_return_if_fail(E_IS_TABLE_MODEL(source));
-	g_return_if_fail(sort_info != NULL);
-	g_return_if_fail(E_IS_TABLE_SORT_INFO(sort_info));
-	g_return_if_fail(full_header != NULL);
-	g_return_if_fail(E_IS_TABLE_HEADER(full_header));
-
-	total_rows = e_table_model_row_count(source);
-	cols = e_table_sort_info_sorting_get_count(sort_info);
-	cols_closure = cols;
-	vals_closure = g_new(void *, total_rows * cols);
-	sort_info_closure = sort_info;
-	ascending_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		for (i = 0; i < rows; i++) {
-			vals_closure[map_table[i] * cols + j] = e_table_model_value_at (source, col->col_idx, map_table[i]);
-		}
-		compare_closure[j] = col->compare;
-		ascending_closure[j] = column.ascending;
-	}
-
-	if (e_table_model_has_sort_group(source)) {
-		etsu_sort_by_group(source, map_table, rows);
-	} else {
-		qsort(map_table, rows, sizeof(int), qsort_callback);
-	}
-	g_free(vals_closure);
-	g_free(ascending_closure);
-	g_free(compare_closure);
-}
-
-gboolean
-e_table_sorting_utils_affects_sort  (ETableModel    *source,
-				     ETableSortInfo *sort_info,
-				     ETableHeader   *full_header,
-				     int             col)
-{
-	int j;
-	int cols;
-
-	g_return_val_if_fail(source != NULL, TRUE);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(source), TRUE);
-	g_return_val_if_fail(sort_info != NULL, TRUE);
-	g_return_val_if_fail(E_IS_TABLE_SORT_INFO(sort_info), TRUE);
-	g_return_val_if_fail(full_header != NULL, TRUE);
-	g_return_val_if_fail(E_IS_TABLE_HEADER(full_header), TRUE);
-
-	cols = e_table_sort_info_sorting_get_count(sort_info);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *tablecol;
-		tablecol = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (tablecol == NULL)
-			tablecol = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		if (col == tablecol->col_idx)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-
-int
-e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int row)
-{
-	int i;
-
-	i = 0;
-	/* handle insertions when we have a 'sort group' */
-	if (e_table_model_has_sort_group(source)) {
-		/* find the row this row maps to */
-		char *group = g_strdup(e_table_model_row_sort_group(source, row));
-		const char *newgroup;
-		int cmp, grouplen, newgrouplen;
-			
-		newgroup = strrchr(group, '/');
-		grouplen = strlen(group);
-		if (newgroup)
-			cmp = newgroup-group;
-		else
-			cmp = grouplen;
-				
-		/* find first common parent */
-		while (i < rows) {
-			newgroup = e_table_model_row_sort_group(source, map_table[i]);
-			if (strncmp(newgroup, group, cmp) == 0) {
-				break;
-			}
-			i++;
-		}
-
-				/* check matching records */
-		while (i<row) {
-			newgroup = e_table_model_row_sort_group(source, map_table[i]);
-			newgrouplen = strlen(newgroup);
-			if (strncmp(newgroup, group, cmp) == 0) {
-				/* common parent, check for same level */
-				if (grouplen == newgrouplen) {
-					if (etsu_compare(source, sort_info, full_header, map_table[i], row) >= 0)
-						break;
-				} else if (strncmp(newgroup + cmp, group + cmp, grouplen - cmp) == 0)
-					/* Found a child of the inserted node.  Insert here. */
-					break;
-			} else {
-				/* ran out of common parents, insert here */
-				break;
-			}
-			i++;
-		}
-		g_free(group);
-	} else {
-		while (i < rows && etsu_compare(source, sort_info, full_header, map_table[i], row) < 0)
-			i++;
-	}
-
-	return i;
-}
-
-#if 0
-void *bsearch(const void *key, const void *base, size_t nmemb,
-              size_t size, int (*compar)(const void *, const void *, void *), gpointer user_data)
-{
-	
-}
-
-int
-e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int view_row)
-{
-	int i;
-	int row;
-
-	i = view_row;
-	row = map_table[i];
-	/* handle insertions when we have a 'sort group' */
-	if (e_table_model_has_sort_group(source)) {
-		/* find the row this row maps to */
-		char *group = g_strdup(e_table_model_row_sort_group(source, row));
-		const char *newgroup;
-		int cmp, grouplen, newgrouplen;
-			
-		newgroup = strrchr(group, '/');
-		grouplen = strlen(group);
-		if (newgroup)
-			cmp = newgroup-group;
-		else
-			cmp = grouplen;
-				
-		/* find first common parent */
-		while (i < rows) {
-			newgroup = e_table_model_row_sort_group(source, map_table[i]);
-			if (strncmp(newgroup, group, cmp) == 0) {
-				break;
-			}
-			i++;
-		}
-
-		/* check matching records */
-		while (i < row) {
-			newgroup = e_table_model_row_sort_group(source, map_table[i]);
-			newgrouplen = strlen(newgroup);
-			if (strncmp(newgroup, group, cmp) == 0) {
-				/* common parent, check for same level */
-				if (grouplen == newgrouplen) {
-					if (etsu_compare(source, sort_info, full_header, map_table[i], row) >= 0)
-						break;
-				} else if (strncmp(newgroup + cmp, group + cmp, grouplen - cmp) == 0)
-					/* Found a child of the inserted node.  Insert here. */
-					break;
-			} else {
-				/* ran out of common parents, insert here */
-				break;
-			}
-			i++;
-		}
-		g_free(group);
-	} else {
-		i = view_row;
-		if (i < rows && etsu_compare(source, sort_info, full_header, map_table[i + 1], row) < 0) {
-			i ++;
-			while (i < rows - 1 && etsu_compare(source, sort_info, full_header, map_table[i], row) < 0)
-				i ++;
-		} else if (i > 0 && etsu_compare(source, sort_info, full_header, map_table[i - 1], row) > 0) {
-			i --;
-			while (i > 0 && etsu_compare(source, sort_info, full_header, map_table[i], row) > 0)
-				i --;
-		}
-	}
-	return i;
-}
-#endif
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
deleted file mode 100644
index f65f7c49ce..0000000000
--- a/widgets/table/e-table-sorting-utils.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTING_UTILS_H_
-#define _E_TABLE_SORTING_UTILS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-void      e_table_sorting_utils_sort          (ETableModel    *source,
-					       ETableSortInfo *sort_info,
-					       ETableHeader   *full_header,
-					       int            *map_table,
-					       int             rows);
-
-gboolean  e_table_sorting_utils_affects_sort  (ETableModel    *source,
-					       ETableSortInfo *sort_info,
-					       ETableHeader   *full_header,
-					       int             col);
-
-int       e_table_sorting_utils_insert        (ETableModel    *source,
-					       ETableSortInfo *sort_info, 
-					       ETableHeader   *full_header,
-					       int     	      *map_table, 
-					       int     	       rows, 
-					       int     	       row);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTING_UTILS_H_ */
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
deleted file mode 100644
index cfeda97b68..0000000000
--- a/widgets/table/e-table-specification.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-specification.c: Implements a savable description of the inital state of a table.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-table-specification.h"
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *etsp_parent_class;
-
-static void
-etsp_destroy (GtkObject *object)
-{
-	ETableSpecification *etsp = E_TABLE_SPECIFICATION (object);
-	int i;
-
-	if (etsp->columns) {
-		for (i = 0; etsp->columns[i]; i++) {
-			gtk_object_unref (GTK_OBJECT (etsp->columns[i]));
-		}
-		g_free (etsp->columns);
-	}
-
-	if (etsp->state)
-		gtk_object_unref (GTK_OBJECT (etsp->state));
-	g_free (etsp->click_to_add_message);
-
-	etsp->columns              = NULL;
-	etsp->state                = NULL;
-	etsp->click_to_add_message = NULL;
-
-	GTK_OBJECT_CLASS (etsp_parent_class)->destroy (object);
-}
-
-static void
-etsp_class_init (GtkObjectClass *klass)
-{
-	etsp_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etsp_destroy;
-}
-
-static void
-etsp_init (ETableSpecification *etsp)
-{
-	etsp->columns               = NULL;
-	etsp->state                 = NULL;
-
-	etsp->no_headers            = FALSE;
-	etsp->click_to_add          = FALSE;
-	etsp->draw_grid             = FALSE;
-	etsp->draw_focus            = TRUE;
-	etsp->horizontal_scrolling  = FALSE;
-
-	etsp->cursor_mode           = E_CURSOR_SIMPLE;
-	etsp->selection_mode        = GTK_SELECTION_MULTIPLE;
-
-	etsp->click_to_add_message  = NULL;
-}
-
-E_MAKE_TYPE (e_table_specification, "ETableSpecification", ETableSpecification, etsp_class_init, etsp_init, PARENT_TYPE);
-
-/**
- * e_table_specification_new:
- *
- * Creates a new %ETableSpecification object.   This object is used to hold the
- * information about the rendering information for ETable.
- * 
- * Returns: a newly created %ETableSpecification object.
- */
-ETableSpecification *
-e_table_specification_new (void)
-{
-	ETableSpecification *etsp = gtk_type_new (E_TABLE_SPECIFICATION_TYPE);
-
-	return (ETableSpecification *) etsp;
-}
-
-/**
- * e_table_specification_load_from_file:
- * @specification: An ETableSpecification that you want to modify
- * @filename: a filename that contains an ETableSpecification
- *
- * This routine modifies @specification to reflect the state described
- * by the file @filename.  
- *
- * Returns: TRUE on success, FALSE on failure.
- */
-gboolean
-e_table_specification_load_from_file (ETableSpecification *specification,
-				      const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement (doc);
-		e_table_specification_load_from_node (specification, node);
-		xmlFreeDoc (doc);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * e_table_specification_load_from_string:
- * @specification: An ETableSpecification that you want to modify
- * @xml: a stringified representation of an ETableSpecification description.
- *
- * This routine modifies @specification to reflect the state described
- * by @xml.  @xml is typically returned by e_table_specification_save_to_string
- * or it can be embedded in your source code.
- *
- * Returns: TRUE on success, FALSE on failure.
- */
-gboolean
-e_table_specification_load_from_string (ETableSpecification *specification,
-					const char          *xml)
-{
-	xmlDoc *doc;
-	doc = xmlParseMemory ( (char *) xml, strlen (xml));
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement (doc);
-		e_table_specification_load_from_node (specification, node);
-		xmlFreeDoc (doc);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * e_table_specification_load_from_node:
- * @specification: An ETableSpecification that you want to modify
- * @node: an xmlNode with an XML ETableSpecification description.
- *
- * This routine modifies @specification to reflect the state described
- * by @node.
- */
-void
-e_table_specification_load_from_node (ETableSpecification *specification,
-				      const xmlNode       *node)
-{
-	char *temp;
-	xmlNode *children;
-	GList *list = NULL, *list2;
-	int i;
-
-	specification->no_headers = e_xml_get_bool_prop_by_name (node, "no-headers");
-	specification->click_to_add = e_xml_get_bool_prop_by_name (node, "click-to-add");
-	specification->draw_grid = e_xml_get_bool_prop_by_name (node, "draw-grid");
-	specification->draw_focus = e_xml_get_bool_prop_by_name_with_default (node, "draw-focus", TRUE);
-	specification->horizontal_scrolling = e_xml_get_bool_prop_by_name_with_default (node, "horizontal-scrolling", FALSE);
-
-	specification->selection_mode = GTK_SELECTION_MULTIPLE;
-	temp = e_xml_get_string_prop_by_name (node, "selection-mode");
-	if (temp && !strcasecmp (temp, "single")) {
-		specification->selection_mode = GTK_SELECTION_SINGLE;
-	} else if (temp && !strcasecmp (temp, "browse")) {
-		specification->selection_mode = GTK_SELECTION_BROWSE;
-	} else if (temp && !strcasecmp (temp, "extended")) {
-		specification->selection_mode = GTK_SELECTION_EXTENDED;
-	}
-	g_free (temp);
-
-	specification->cursor_mode = E_CURSOR_SIMPLE;
-	temp = e_xml_get_string_prop_by_name (node, "cursor-mode");
-	if (temp && !strcasecmp (temp, "line")) {
-		specification->cursor_mode = E_CURSOR_LINE;
-	} else 	if (temp && !strcasecmp (temp, "spreadsheet")) {
-		specification->cursor_mode = E_CURSOR_SPREADSHEET;
-	}
-	g_free (temp);
-	g_free (specification->click_to_add_message);
-
-	specification->click_to_add_message =
-		e_xml_get_string_prop_by_name (
-			node, "_click-to-add-message");
-
-	if (specification->state)
-		gtk_object_unref (GTK_OBJECT (specification->state));
-	specification->state = NULL;
-	if (specification->columns) {
-		for (i = 0; specification->columns[i]; i++) {
-			gtk_object_unref (GTK_OBJECT (specification->columns[i]));
-		}
-		g_free (specification->columns);
-	}
-	specification->columns = NULL;
-
-	for (children = node->xmlChildrenNode; children; children = children->next) {
-		if (!strcmp (children->name, "ETableColumn")) {
-			ETableColumnSpecification *col_spec = e_table_column_specification_new ();
-
-			e_table_column_specification_load_from_node (col_spec, children);
-			list = g_list_append (list, col_spec);
-		} else if (specification->state == NULL && !strcmp (children->name, "ETableState")) {
-			specification->state = e_table_state_new ();
-			e_table_state_load_from_node (specification->state, children);
-		}
-	}
-
-	specification->columns = g_new (ETableColumnSpecification *, g_list_length (list) + 1);
-	for (list2 = list, i = 0; list2; list2 = g_list_next (list2), i++) {
-		specification->columns[i] = list2->data;
-	}
-	specification->columns[i] = NULL;
-	g_list_free (list);
-}
-
-/**
- * e_table_specification_save_to_file:
- * @specification: An %ETableSpecification that you want to save
- * @filename: a file name to store the specification.
- *
- * This routine stores the @specification into @filename.  
- *
- * Returns: the number of bytes written or -1 on error.
- */
-int
-e_table_specification_save_to_file (ETableSpecification *specification,
-				    const char          *filename)
-{
-	xmlDoc *doc;
-
-	g_return_val_if_fail (specification != NULL, -1);
-	g_return_val_if_fail (filename != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), -1);
-	
-	doc = xmlNewDoc ("1.0");
-	xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc));
-	return xmlSaveFile (filename, doc);
-}
-
-/**
- * e_table_specification_save_to_string:
- * @specification: An %ETableSpecification that you want to stringify
- *
- * Saves the state of @specification to a string.
- *
- * Returns: an g_alloc() allocated string containing the stringified 
- * representation of @specification.  This stringified representation
- * uses XML as a convenience.
- */
-char *
-e_table_specification_save_to_string (ETableSpecification *specification)
-{
-	char *ret_val;
-	xmlChar *string;
-	int length;
-	xmlDoc *doc;
-
-	g_return_val_if_fail (specification != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL);
-	
-	doc = xmlNewDoc ("1.0");
-	xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc));
-	xmlDocDumpMemory (doc, &string, &length);
-
-	ret_val = g_strdup (string);
-	xmlFree (string);
-	return ret_val;
-}
-
-/**
- * e_table_specification_save_to_node:
- * @specification: An ETableSpecification that you want to store.
- * @doc: Node where the specification is saved
- *
- * This routine saves the %ETableSpecification state in the object @specification
- * into the xmlDoc represented by @doc.  
- *
- * Returns: The node that has been attached to @doc with the contents
- * of the ETableSpecification.
- */
-xmlNode *
-e_table_specification_save_to_node (ETableSpecification *specification,
-				    xmlDoc              *doc)
-{
-	xmlNode *node;
-	char *s;
-
-	g_return_val_if_fail (doc != NULL, NULL);
-	g_return_val_if_fail (specification != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL);
-
-	node = xmlNewNode (NULL, "ETableSpecification");
-	e_xml_set_bool_prop_by_name (node, "no-headers", specification->no_headers);
-	e_xml_set_bool_prop_by_name (node, "click-to-add", specification->click_to_add);
-	e_xml_set_bool_prop_by_name (node, "draw-grid", specification->draw_grid);
-	e_xml_set_bool_prop_by_name (node, "draw-focus", specification->draw_focus);
-	e_xml_set_bool_prop_by_name (node, "horizontal-scrolling", specification->horizontal_scrolling);
-
-	switch (specification->selection_mode){
-	case GTK_SELECTION_SINGLE:
-		s = "single";
-		break;
-	case GTK_SELECTION_BROWSE:
-		s = "browse";
-		break;
-	default:
-	case GTK_SELECTION_EXTENDED:
-		s = "extended";
-	}
-	xmlSetProp (node, "selection-mode", s);
-	if (specification->cursor_mode == E_CURSOR_LINE)
-		s = "line";
-	else
-		s = "cell";
-	xmlSetProp (node, "cursor-mode", s);
-
-	xmlSetProp (node, "_click-to-add-message", specification->click_to_add_message);
-
-	if (specification->columns){
-		int i;
-		
-		for (i = 0; specification->columns [i]; i++)
-			e_table_column_specification_save_to_node (
-				specification->columns [i],
-				node);
-	}
-
-	if (specification->state)
-		e_table_state_save_to_node (specification->state, node);
-
-	return node;
-}
-
-/**
- * e_table_specification_duplicate:
- * @spec: specification to duplicate
- *
- * This creates a copy of the %ETableSpecification @spec
- *
- * Returns: The duplicated %ETableSpecification.
- */
-ETableSpecification *
-e_table_specification_duplicate (ETableSpecification *spec)
-{
-	ETableSpecification *new_spec;
-	char *spec_str;
-
-	g_return_val_if_fail (spec != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL);
-	
-	new_spec = e_table_specification_new ();
-	spec_str = e_table_specification_save_to_string (spec);
-	e_table_specification_load_from_string (new_spec, spec_str);
-	g_free (spec_str);
-	
-	return new_spec;
-}
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
deleted file mode 100644
index c6cbb27dcf..0000000000
--- a/widgets/table/e-table-specification.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SPECIFICATION_H_
-#define _E_TABLE_SPECIFICATION_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-column-specification.h>
-#include <gal/e-table/e-table-defines.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SPECIFICATION_TYPE        (e_table_specification_get_type ())
-#define E_TABLE_SPECIFICATION(o)          (GTK_CHECK_CAST ((o), E_TABLE_SPECIFICATION_TYPE, ETableSpecification))
-#define E_TABLE_SPECIFICATION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SPECIFICATION_TYPE, ETableSpecificationClass))
-#define E_IS_TABLE_SPECIFICATION(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SPECIFICATION_TYPE))
-#define E_IS_TABLE_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SPECIFICATION_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	ETableColumnSpecification **columns;
-	ETableState *state;
-
-	guint no_headers : 1;
-	guint click_to_add : 1;
-	guint draw_grid : 1;
-	guint draw_focus : 1;
-	guint horizontal_scrolling : 1;
-	GtkSelectionMode selection_mode;
-	ECursorMode cursor_mode;
-
-	char *click_to_add_message;
-} ETableSpecification;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableSpecificationClass;
-
-GtkType              e_table_specification_get_type          (void);
-ETableSpecification *e_table_specification_new               (void);
-
-gboolean             e_table_specification_load_from_file    (ETableSpecification *specification,
-							      const char          *filename);
-gboolean             e_table_specification_load_from_string  (ETableSpecification *specification,
-							      const char          *xml);
-void                 e_table_specification_load_from_node    (ETableSpecification *specification,
-							      const xmlNode       *node);
-
-int                  e_table_specification_save_to_file      (ETableSpecification *specification,
-							      const char          *filename);
-char                *e_table_specification_save_to_string    (ETableSpecification *specification);
-xmlNode             *e_table_specification_save_to_node      (ETableSpecification *specification,
-							      xmlDoc              *doc);
-ETableSpecification *e_table_specification_duplicate         (ETableSpecification *spec);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SPECIFICATION_H_ */
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
deleted file mode 100644
index c978487368..0000000000
--- a/widgets/table/e-table-state.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-state.c: Savable state of a table.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-table-state.h"
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-#define STATE_VERSION 0.1
-
-static GtkObjectClass *etst_parent_class;
-
-static void
-etst_destroy (GtkObject *object)
-{
-	ETableState *etst = E_TABLE_STATE (object);
-
-	if (etst->columns)
-		g_free (etst->columns);
-
-	GTK_OBJECT_CLASS (etst_parent_class)->destroy (object);
-}
-
-static void
-etst_class_init (GtkObjectClass *klass)
-{
-	etst_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etst_destroy;
-}
-
-static void
-etst_init (ETableState *state)
-{
-	state->columns = NULL;
-	state->expansions = NULL;
-	state->sort_info = e_table_sort_info_new();
-}
-
-E_MAKE_TYPE(e_table_state, "ETableState", ETableState, etst_class_init, etst_init, PARENT_TYPE);
-
-ETableState *
-e_table_state_new (void)
-{
-	ETableState *etst = gtk_type_new (E_TABLE_STATE_TYPE);
-
-	return (ETableState *) etst;
-}
-
-gboolean
-e_table_state_load_from_file    (ETableState *state,
-				 const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement(doc);
-		e_table_state_load_from_node(state, node);
-		xmlFreeDoc(doc);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void 
-e_table_state_load_from_string  (ETableState *state,
-				 const char          *xml)
-{
-	xmlDoc *doc;
-	doc = xmlParseMemory ((char *) xml, strlen(xml));
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement(doc);
-		e_table_state_load_from_node(state, node);
-		xmlFreeDoc(doc);
-	}
-}
-
-typedef struct {
-	int column;
-	double expansion;
-} int_and_double;
-
-void
-e_table_state_load_from_node (ETableState *state,
-			      const xmlNode *node)
-{
-	xmlNode *children;
-	GList *list = NULL, *iterator;
-	gdouble state_version;
-	int i;
-
-	state_version = e_xml_get_double_prop_by_name_with_default (
-		node, "state-version", STATE_VERSION);
-
-	if (state->sort_info)
-		gtk_object_unref (GTK_OBJECT(state->sort_info));
-
-	state->sort_info = NULL;
-	children = node->xmlChildrenNode;
-	for (; children; children = children->next) {
-		if (!strcmp (children->name, "column")) {
-			int_and_double *column_info = g_new(int_and_double, 1);
-
-			column_info->column = e_xml_get_integer_prop_by_name(
-				children, "source");
-			column_info->expansion =
-				e_xml_get_double_prop_by_name_with_default(
-					children, "expansion", -2);
-
-			list = g_list_append (list, column_info);
-		} else if (state->sort_info == NULL &&
-			   !strcmp (children->name, "grouping")) {
-			state->sort_info = e_table_sort_info_new();
-			e_table_sort_info_load_from_node(
-				state->sort_info, children, state_version);
-		}
-	}
-	g_free(state->columns);
-	g_free(state->expansions);
-	state->col_count = g_list_length(list);
-	state->columns = g_new(int, state->col_count);
-	state->expansions = g_new(double, state->col_count);
-
-	for (iterator = list, i = 0; iterator; i++) {
-		int_and_double *column_info = iterator->data;
-		
-		state->columns [i] = column_info->column;
-		state->expansions [i] = column_info->expansion;
-		g_free (column_info);
-		iterator = g_list_next (iterator);
-	}
-	g_list_free(list);
-}
-
-void
-e_table_state_save_to_file      (ETableState *state,
-				 const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlNewDoc("1.0");
-	xmlDocSetRootElement(doc, e_table_state_save_to_node(state, NULL));
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-}
-
-char *
-e_table_state_save_to_string    (ETableState *state)
-{
-	char *ret_val;
-	xmlChar *string;
-	int length;
-	xmlDoc *doc;
-
-	doc = xmlNewDoc("1.0");
-	xmlDocSetRootElement(doc, e_table_state_save_to_node(state, NULL));
-	xmlDocDumpMemory(doc, &string, &length);
-	xmlFreeDoc(doc);
-
-	ret_val = g_strdup(string);
-	xmlFree(string);
-	return ret_val;
-}
-
-xmlNode *
-e_table_state_save_to_node      (ETableState *state,
-				 xmlNode     *parent)
-{
-	int i;
-	xmlNode *node;
-
-	if (parent)
-		node = xmlNewChild (parent, NULL, "ETableState", NULL);
-	else
-		node = xmlNewNode (NULL, "ETableState");
-
-	e_xml_set_double_prop_by_name(node, "state-version", STATE_VERSION);
-
-	for (i = 0; i < state->col_count; i++) {
-		int column = state->columns[i];
-		double expansion = state->expansions[i];
-		xmlNode *new_node;
-
-		new_node = xmlNewChild(node, NULL, "column", NULL);
-		e_xml_set_integer_prop_by_name (new_node, "source", column);
-		if (expansion >= -1)
-			e_xml_set_double_prop_by_name(new_node, "expansion", expansion);
-	}
-
-
-	e_table_sort_info_save_to_node(state->sort_info, node);
-
-	return node;
-}
-
-/**
- * e_table_state_duplicate:
- * @state: The ETableState to duplicate
- *
- * This creates a copy of the %ETableState @state
- *
- * Returns: The duplicated %ETableState.
- */
-ETableState *
-e_table_state_duplicate (ETableState *state)
-{
-	ETableState *new_state;
-	char *copy;
-	
-	g_return_val_if_fail (state != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL);
-
-	new_state = e_table_state_new ();
-	copy = e_table_state_save_to_string (state);
-	e_table_state_load_from_string (new_state, copy);
-	g_free (copy);
-
-	return new_state;
-}
-
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
deleted file mode 100644
index 446d560fff..0000000000
--- a/widgets/table/e-table-state.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_STATE_H_
-#define _E_TABLE_STATE_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-sort-info.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_STATE_TYPE        (e_table_state_get_type ())
-#define E_TABLE_STATE(o)          (GTK_CHECK_CAST ((o), E_TABLE_STATE_TYPE, ETableState))
-#define E_TABLE_STATE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_STATE_TYPE, ETableStateClass))
-#define E_IS_TABLE_STATE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_STATE_TYPE))
-#define E_IS_TABLE_STATE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_STATE_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	ETableSortInfo *sort_info;
-	int             col_count;
-	int            *columns;
-	double         *expansions;
-} ETableState;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableStateClass;
-
-GtkType      e_table_state_get_type          (void);
-ETableState *e_table_state_new               (void);
-
-gboolean     e_table_state_load_from_file    (ETableState   *state,
-					      const char    *filename);
-void         e_table_state_load_from_string  (ETableState   *state,
-					      const char    *xml);
-void         e_table_state_load_from_node    (ETableState   *state,
-					      const xmlNode *node);
-
-void         e_table_state_save_to_file      (ETableState   *state,
-					      const char    *filename);
-char        *e_table_state_save_to_string    (ETableState   *state);
-xmlNode     *e_table_state_save_to_node      (ETableState   *state,
-					      xmlNode       *parent);
-ETableState *e_table_state_duplicate         (ETableState   *state);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_STATE_H_ */
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
deleted file mode 100644
index a60aec1ac8..0000000000
--- a/widgets/table/e-table-subset-variable.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-subset.c: Implements a table that contains a subset of another table.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-subset-variable.h"
-
-#define ETSSV_CLASS(e) ((ETableSubsetVariableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE E_TABLE_SUBSET_TYPE
-
-#define INCREMENT_AMOUNT 10
-
-static ETableSubsetClass *etssv_parent_class;
-
-static void
-etssv_add       (ETableSubsetVariable *etssv,
-		 gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	
-	e_table_model_pre_change(etm);
-
-	if (etss->n_map + 1 > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-
-	etss->map_table[etss->n_map++] = row;
-
-	e_table_model_row_inserted (etm, etss->n_map - 1);
-}
-
-static void
-etssv_add_array (ETableSubsetVariable *etssv,
-		 const gint           *array,
-		 gint                  count)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int i;
-
-	e_table_model_pre_change(etm);
-	
-	if (etss->n_map + count > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < count; i++)
-		etss->map_table[etss->n_map++] = array[i];
-
-	e_table_model_changed (etm);
-}
-
-static void
-etssv_add_all   (ETableSubsetVariable *etssv)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int rows;
-	int i;
-
-	e_table_model_pre_change(etm);
-	
-	rows = e_table_model_row_count(etss->source);
-	if (etss->n_map + rows > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < rows; i++)
-		etss->map_table[etss->n_map++] = i;
-
-	e_table_model_changed (etm);
-}
-
-static gboolean
-etssv_remove    (ETableSubsetVariable *etssv,
-		 gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int i;
-	
-	for (i = 0; i < etss->n_map; i++){
-		if (etss->map_table[i] == row) {
-			e_table_model_pre_change (etm);
-			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
-			etss->n_map --;
-			
-			e_table_model_row_deleted (etm, i);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static void
-etssv_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetVariableClass *klass = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
-	etssv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	klass->add     = etssv_add;
-	klass->add_array = etssv_add_array;
-	klass->add_all = etssv_add_all;
-	klass->remove  = etssv_remove;
-}
-
-E_MAKE_TYPE(e_table_subset_variable, "ETableSubsetVariable", ETableSubsetVariable, etssv_class_init, NULL, PARENT_TYPE);
-
-ETableModel *
-e_table_subset_variable_construct (ETableSubsetVariable *etssv,
-				   ETableModel          *source)
-{
-	if (e_table_subset_construct (E_TABLE_SUBSET(etssv), source, 1) == NULL)
-		return NULL;
-	E_TABLE_SUBSET(etssv)->n_map = 0;
-
-	return E_TABLE_MODEL (etssv);
-}
-
-ETableModel *
-e_table_subset_variable_new (ETableModel *source)
-{
-	ETableSubsetVariable *etssv = gtk_type_new (E_TABLE_SUBSET_VARIABLE_TYPE);
-
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etssv));
-		return NULL;
-	}
-
-	return (ETableModel *) etssv;
-}
-
-void
-e_table_subset_variable_add       (ETableSubsetVariable *etssv,
-				   gint                  row)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add)
-		ETSSV_CLASS (etssv)->add (etssv, row);
-}
-
-void
-e_table_subset_variable_add_array   (ETableSubsetVariable *etssv,
-				     const gint           *array,
-				     gint                  count)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add_array)
-		ETSSV_CLASS (etssv)->add_array (etssv, array, count);
-}
-
-void
-e_table_subset_variable_add_all   (ETableSubsetVariable *etssv)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add_all)
-		ETSSV_CLASS (etssv)->add_all (etssv);
-}
-
-gboolean
-e_table_subset_variable_remove    (ETableSubsetVariable *etssv,
-				   gint                  row)
-{
-	g_return_val_if_fail (etssv != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv), FALSE);
-
-	if (ETSSV_CLASS(etssv)->remove)
-		return ETSSV_CLASS (etssv)->remove (etssv, row);
-	else
-		return FALSE;
-}
-
-void
-e_table_subset_variable_increment (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
-{
-	int i;
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= position)
-			etss->map_table[i] += amount;
-	}
-}
-
-void
-e_table_subset_variable_decrement (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
-{
-	int i;
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= position)
-			etss->map_table[i] -= amount;
-	}
-}
-
-void
-e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv,
-					gint total)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	if (total <= 0)
-		total = 1;
-	if (total > etss->n_map){
-		etss->map_table = g_realloc (etss->map_table, total * sizeof(int));
-	}
-}
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
deleted file mode 100644
index f09c612f13..0000000000
--- a/widgets/table/e-table-subset-variable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SUBSET_VARIABLE_H_
-#define _E_TABLE_SUBSET_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-subset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SUBSET_VARIABLE_TYPE        (e_table_subset_variable_get_type ())
-#define E_TABLE_SUBSET_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariable))
-#define E_TABLE_SUBSET_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariableClass))
-#define E_IS_TABLE_SUBSET_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SUBSET_VARIABLE_TYPE))
-#define E_IS_TABLE_SUBSET_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_VARIABLE_TYPE))
-
-typedef struct {
-	ETableSubset base;
-
-	int n_vals_allocated;
-} ETableSubsetVariable;
-
-typedef struct {
-	ETableSubsetClass parent_class;
-	
-	void     (*add)       (ETableSubsetVariable *ets,
-			       gint                  row);
-	void     (*add_array) (ETableSubsetVariable *ets,
-			       const gint           *array,
-			       gint                  count);
-	void     (*add_all)   (ETableSubsetVariable *ets);
-	gboolean (*remove)    (ETableSubsetVariable *ets,
-			       gint                  row);
-} ETableSubsetVariableClass;
-
-GtkType      e_table_subset_variable_get_type  (void);
-ETableModel *e_table_subset_variable_new       (ETableModel          *etm);
-ETableModel *e_table_subset_variable_construct (ETableSubsetVariable *etssv,
-						ETableModel          *source);
-void         e_table_subset_variable_add       (ETableSubsetVariable *ets,
-						gint                  row);
-void         e_table_subset_variable_add_array (ETableSubsetVariable *ets,
-						const gint           *array,
-						gint                  count);
-void         e_table_subset_variable_add_all   (ETableSubsetVariable *ets);
-gboolean     e_table_subset_variable_remove    (ETableSubsetVariable *ets,
-						gint                  row);
-void         e_table_subset_variable_increment (ETableSubsetVariable *ets,
-						gint                  position,
-						gint                  amount);
-void         e_table_subset_variable_decrement (ETableSubsetVariable *ets,
-						gint                  position,
-						gint                  amount);
-void         e_table_subset_variable_set_allocation (ETableSubsetVariable *ets,
-						     gint                  total);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_SUBSET_VARIABLE_H_ */
-
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
deleted file mode 100644
index 4b3d1e5d3b..0000000000
--- a/widgets/table/e-table-subset.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-subset.c: Implements a table that contains a subset of another table.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-table-subset.h"
-
-static void etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm);
-static void etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm);
-static void etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row);
-static void etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row);
-
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-#define d(x)
-
-static ETableModelClass *etss_parent_class;
-
-#define ETSS_CLASS(object) (E_TABLE_SUBSET_CLASS(GTK_OBJECT(object)->klass))
-
-static void
-etss_destroy (GtkObject *object)
-{
-	ETableSubset *etss = E_TABLE_SUBSET (object);
-
-	if (etss->source) {
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_pre_change_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_row_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_cell_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_row_inserted_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_row_deleted_id);
-
-		gtk_object_unref (GTK_OBJECT (etss->source));
-		etss->source = NULL;
-
-		etss->table_model_changed_id = 0;
-		etss->table_model_row_changed_id = 0;
-		etss->table_model_cell_changed_id = 0;
-		etss->table_model_row_inserted_id = 0;
-		etss->table_model_row_deleted_id = 0;
-	}
-
-	g_free (etss->map_table);
-
-	GTK_OBJECT_CLASS (etss_parent_class)->destroy (object);
-}
-
-static int
-etss_column_count (ETableModel *etm)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_column_count (etss->source);
-}
-
-static int
-etss_row_count (ETableModel *etm)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return etss->n_map;
-}
-
-static void *
-etss_value_at (ETableModel *etm, int col, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	etss->last_access = row;
-	d(g_print("g) Setting last_access to %d\n", row));
-	return e_table_model_value_at (etss->source, col, etss->map_table [row]);
-}
-
-static void
-etss_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	etss->last_access = row;
-	d(g_print("h) Setting last_access to %d\n", row));
-	return e_table_model_set_value_at (etss->source, col, etss->map_table [row], val);
-}
-
-static gboolean
-etss_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_is_cell_editable (etss->source, col, etss->map_table [row]);
-}
-
-static void
-etss_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-	e_table_model_append_row (etss->source, source, row);
-}
-
-static void *
-etss_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_duplicate_value (etss->source, col, value);
-}
-
-static void
-etss_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	e_table_model_free_value (etss->source, col, value);
-}
-
-static void *
-etss_initialize_value (ETableModel *etm, int col)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_initialize_value (etss->source, col);
-}
-
-static gboolean
-etss_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_value_is_empty (etss->source, col, value);
-}
-
-static char *
-etss_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_value_to_string (etss->source, col, value);
-}
-
-static void
-etss_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetClass *klass        = (ETableSubsetClass *) object_class;
-	ETableModelClass *table_class   = (ETableModelClass *) object_class;
-
-	etss_parent_class               = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy           = etss_destroy;
-
-	table_class->column_count       = etss_column_count;
-	table_class->row_count          = etss_row_count;
-	table_class->value_at           = etss_value_at;
-	table_class->set_value_at       = etss_set_value_at;
-	table_class->is_cell_editable   = etss_is_cell_editable;
-	table_class->append_row         = etss_append_row;
-	table_class->duplicate_value    = etss_duplicate_value;
-	table_class->free_value         = etss_free_value;
-	table_class->initialize_value   = etss_initialize_value;
-	table_class->value_is_empty     = etss_value_is_empty;
-	table_class->value_to_string    = etss_value_to_string;
-
-	klass->proxy_model_pre_change   = etss_proxy_model_pre_change_real;
-	klass->proxy_model_changed      = etss_proxy_model_changed_real;
-	klass->proxy_model_row_changed  = etss_proxy_model_row_changed_real;
-	klass->proxy_model_cell_changed = etss_proxy_model_cell_changed_real;
-	klass->proxy_model_row_inserted = NULL;
-	klass->proxy_model_row_deleted  = NULL;
-}
-
-static void
-etss_init (ETableSubset *etss)
-{
-	etss->last_access = 0;
-}
-
-E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, etss_init, PARENT_TYPE);
-
-static void
-etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (etss));
-}
-
-static void
-etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm)
-{
-	e_table_model_changed (E_TABLE_MODEL (etss));
-}
-
-static void
-etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row)
-{
-	int limit;
-	const int n = etss->n_map;
-	const int * const map_table = etss->map_table;
-	int i;
-
-	limit = MIN(n, etss->last_access + 10);
-	for (i = etss->last_access; i < limit; i++) {
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("a) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	limit = MAX(0, etss->last_access - 10);
-	for (i = etss->last_access - 1; i >= limit; i--) {
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("b) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	for (i = 0; i < n; i++){
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("c) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-}
-
-static void
-etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row)
-{
-	int limit;
-	const int n = etss->n_map;
-	const int * const map_table = etss->map_table;
-	int i;
-
-	limit = MIN(n, etss->last_access + 10);
-	for (i = etss->last_access; i < limit; i++) {
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("d) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	limit = MAX(0, etss->last_access - 10);
-	for (i = etss->last_access - 1; i >= limit; i--) {
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("e) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-		
-	for (i = 0; i < n; i++){
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("f) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-}
-
-static void
-etss_proxy_model_pre_change (ETableModel *etm, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_pre_change)
-		(ETSS_CLASS(etss)->proxy_model_pre_change) (etss, etm);
-}
-
-static void
-etss_proxy_model_changed (ETableModel *etm, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_changed)
-		(ETSS_CLASS(etss)->proxy_model_changed) (etss, etm);
-}
-
-static void
-etss_proxy_model_row_changed (ETableModel *etm, int row, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_row_changed)
-		(ETSS_CLASS(etss)->proxy_model_row_changed) (etss, etm, row);
-}
-
-static void
-etss_proxy_model_cell_changed (ETableModel *etm, int row, int col, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_cell_changed)
-		(ETSS_CLASS(etss)->proxy_model_cell_changed) (etss, etm, col, row);
-}
-
-static void
-etss_proxy_model_row_inserted (ETableModel *etm, int row, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_row_inserted)
-		(ETSS_CLASS(etss)->proxy_model_row_inserted) (etss, etm, row);
-}
-
-static void
-etss_proxy_model_row_deleted (ETableModel *etm, int row, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_row_deleted)
-		(ETSS_CLASS(etss)->proxy_model_row_deleted) (etss, etm, row);
-}
-
-ETableModel *
-e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals)
-{
-	unsigned int *buffer;
-	int i;
-
-	if (nvals) {
-		buffer = (unsigned int *) g_malloc (sizeof (unsigned int) * nvals);
-		if (buffer == NULL)
-			return NULL;
-	} else
-		buffer = NULL;
-	etss->map_table = buffer;
-	etss->n_map = nvals;
-	etss->source = source;
-	gtk_object_ref (GTK_OBJECT (source));
-	
-	/* Init */
-	for (i = 0; i < nvals; i++)
-		etss->map_table [i] = i;
-
-	etss->table_model_pre_change_id = gtk_signal_connect (GTK_OBJECT (source), "model_pre_change",
-							      GTK_SIGNAL_FUNC (etss_proxy_model_pre_change), etss);
-	etss->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-						     GTK_SIGNAL_FUNC (etss_proxy_model_changed), etss);
-	etss->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							 GTK_SIGNAL_FUNC (etss_proxy_model_row_changed), etss);
-	etss->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-							  GTK_SIGNAL_FUNC (etss_proxy_model_cell_changed), etss);
-	etss->table_model_row_inserted_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_inserted",
-								GTK_SIGNAL_FUNC (etss_proxy_model_row_inserted), etss);
-	etss->table_model_row_deleted_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_deleted",
-							       GTK_SIGNAL_FUNC (etss_proxy_model_row_deleted), etss);
-	
-	return E_TABLE_MODEL (etss);
-}
-
-ETableModel *
-e_table_subset_new (ETableModel *source, const int nvals)
-{
-	ETableSubset *etss = gtk_type_new (E_TABLE_SUBSET_TYPE);
-
-	if (e_table_subset_construct (etss, source, nvals) == NULL){
-		gtk_object_unref (GTK_OBJECT (etss));
-		return NULL;
-	}
-
-	return (ETableModel *) etss;
-}
-
-ETableModel *
-e_table_subset_get_toplevel (ETableSubset *table)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SUBSET (table), NULL);
-
-	if (E_IS_TABLE_SUBSET (table->source))
-		return e_table_subset_get_toplevel (E_TABLE_SUBSET (table->source));
-	else
-		return table->source;
-}
-
-void
-e_table_subset_print_debugging  (ETableSubset *table_model)
-{
-	int i;
-	for (i = 0; i < table_model->n_map; i++) {
-		g_print("%8d\n", table_model->map_table[i]);
-	}
-}
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
deleted file mode 100644
index 0ab2fa5be7..0000000000
--- a/widgets/table/e-table-subset.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SUBSET_H_
-#define _E_TABLE_SUBSET_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SUBSET_TYPE        (e_table_subset_get_type ())
-#define E_TABLE_SUBSET(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_TYPE, ETableSubset))
-#define E_TABLE_SUBSET_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_TYPE, ETableSubsetClass))
-#define E_IS_TABLE_SUBSET(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SUBSET_TYPE))
-#define E_IS_TABLE_SUBSET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_TYPE))
-
-typedef struct {
-	ETableModel base;
-
-	ETableModel  *source;
-	int  n_map;
-	int *map_table;
-
-	int last_access;
-
-	int              table_model_pre_change_id;
-	int              table_model_changed_id;
-	int              table_model_row_changed_id;
-	int              table_model_cell_changed_id;
-	int              table_model_row_inserted_id;
-	int              table_model_row_deleted_id;
-} ETableSubset;
-
-typedef struct {
-	ETableModelClass parent_class;
-
-	void (*proxy_model_pre_change)   (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_changed)      (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_row_changed)  (ETableSubset *etss, ETableModel *etm, int row);
-	void (*proxy_model_cell_changed) (ETableSubset *etss, ETableModel *etm, int col, int row);
-	void (*proxy_model_row_inserted) (ETableSubset *etss, ETableModel *etm, int row);
-	void (*proxy_model_row_deleted)  (ETableSubset *etss, ETableModel *etm, int row);
-} ETableSubsetClass;
-
-GtkType      e_table_subset_get_type         (void);
-ETableModel *e_table_subset_new              (ETableModel  *etm,
-					      int           n_vals);
-ETableModel *e_table_subset_construct        (ETableSubset *ets,
-					      ETableModel  *source,
-					      int           nvals);
-
-ETableModel *e_table_subset_get_toplevel     (ETableSubset *table_model);
-
-void         e_table_subset_print_debugging  (ETableSubset *table_model);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SUBSET_H_ */
-
diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h
deleted file mode 100644
index 3a100af5ab..0000000000
--- a/widgets/table/e-table-tooltip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_TOOLTIP_H_
-#define _E_TABLE_TOOLTIP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	GtkWidget *window;
-	gint timer;
-	int col, row;
-	int row_height;
-	int x, y;
-	int cx, cy;
-	GnomeCanvasItem *eti;
-} ETableTooltip;
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h
deleted file mode 100644
index ab0378473a..0000000000
--- a/widgets/table/e-table-tree.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _E_TABLE_TREE_H_
-#define _E_TABLE_TREE_H_
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	char *title;
-
-	union {
-		ETableModel *table;
-		GList *children;
-	} u;
-
-	guint expanded :1;
-	guint is_leaf  :1;
-} ETableGroup;
-
-ETableGroup *e_table_group_new      (const char *title, ETableModel *table);
-ETableGroup *e_table_group_new_leaf (const char *title);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_TREE_H_ */
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
deleted file mode 100644
index 9a2073f3e6..0000000000
--- a/widgets/table/e-table.c
+++ /dev/null
@@ -1,2307 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table.c: A graphical view of a Table.
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright 1999, 2000, 2001, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include "gal/util/e-i18n.h"
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtksignal.h>
-
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-vbox.h"
-#include "e-table.h"
-#include "e-table-header-item.h"
-#include "e-table-header-utils.h"
-#include "e-table-subset.h"
-#include "e-table-item.h"
-#include "e-table-group.h"
-#include "e-table-group-leaf.h"
-#include "e-table-click-to-add.h"
-#include "e-table-specification.h"
-#include "e-table-state.h"
-#include "e-table-column-specification.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE gtk_table_get_type ()
-
-static GtkObjectClass *e_table_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	SELECTION_CHANGE,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-
-	TABLE_DRAG_BEGIN,
-	TABLE_DRAG_END,
-	TABLE_DRAG_DATA_GET,
-	TABLE_DRAG_DATA_DELETE,
-
-	TABLE_DRAG_LEAVE,
-	TABLE_DRAG_MOTION,
-	TABLE_DRAG_DROP,
-	TABLE_DRAG_DATA_RECEIVED,
-
-	LAST_SIGNAL
-};
-
-enum {
-	ARG_0,
-	ARG_LENGTH_THRESHOLD,
-};
-
-static gint et_signals [LAST_SIGNAL] = { 0, };
-
-static void e_table_fill_table (ETable *e_table, ETableModel *model);
-static gboolean changed_idle (gpointer data);
-
-static void et_grab_focus (GtkWidget *widget);
-
-static void et_drag_begin (GtkWidget *widget,
-			   GdkDragContext *context,
-			   ETable *et);
-static void et_drag_end (GtkWidget *widget,
-			 GdkDragContext *context,
-			 ETable *et);
-static void et_drag_data_get(GtkWidget *widget,
-			     GdkDragContext *context,
-			     GtkSelectionData *selection_data,
-			     guint info,
-			     guint time,
-			     ETable *et);
-static void et_drag_data_delete(GtkWidget *widget,
-				GdkDragContext *context,
-				ETable *et);
-
-static void et_drag_leave(GtkWidget *widget,
-			  GdkDragContext *context,
-			  guint time,
-			  ETable *et);
-static gboolean et_drag_motion(GtkWidget *widget,
-			       GdkDragContext *context,
-			       gint x,
-			       gint y,
-			       guint time,
-			       ETable *et);
-static gboolean et_drag_drop(GtkWidget *widget,
-			     GdkDragContext *context,
-			     gint x,
-			     gint y,
-			     guint time,
-			     ETable *et);
-static void et_drag_data_received(GtkWidget *widget,
-				  GdkDragContext *context,
-				  gint x,
-				  gint y,
-				  GtkSelectionData *selection_data,
-				  guint info,
-				  guint time,
-				  ETable *et);
-static gint e_table_drag_source_event_cb (GtkWidget      *widget,
-					  GdkEvent       *event,
-					  ETable         *table);
-
-static gint et_focus (GtkContainer *container, GtkDirectionType direction);
-
-static void
-et_disconnect_model (ETable *et)
-{
-	if (et->model == NULL)
-		return;
-
-	if (et->table_model_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_model_change_id);
-	if (et->table_row_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_row_change_id);
-	if (et->table_cell_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_cell_change_id);
-	if (et->table_row_inserted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_row_inserted_id);
-	if (et->table_row_deleted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_row_deleted_id);
-
-	et->table_model_change_id = 0;
-	et->table_row_change_id = 0;
-	et->table_cell_change_id = 0;
-	et->table_row_inserted_id = 0;
-	et->table_row_deleted_id = 0;
-}
-
-static void
-et_destroy (GtkObject *object)
-{
-	ETable *et = E_TABLE (object);
-
-	et_disconnect_model (et);
-
-	if (et->group_info_change_id)
-		gtk_signal_disconnect (GTK_OBJECT (et->sort_info),
-				       et->group_info_change_id);
-
-	if (et->reflow_idle_id)
-		g_source_remove(et->reflow_idle_id);
-	et->reflow_idle_id = 0;
-
-	gtk_object_unref (GTK_OBJECT (et->model));
-	gtk_object_unref (GTK_OBJECT (et->full_header));
-	gtk_object_unref (GTK_OBJECT (et->header));
-	gtk_object_unref (GTK_OBJECT (et->sort_info));
-	gtk_object_unref (GTK_OBJECT (et->sorter));
-	gtk_object_unref (GTK_OBJECT (et->selection));
-	if (et->spec)
-		gtk_object_unref (GTK_OBJECT (et->spec));
-
-	if (et->header_canvas != NULL)
-		gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
-
-	gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
-
-	if (et->rebuild_idle_id) {
-		g_source_remove (et->rebuild_idle_id);
-		et->rebuild_idle_id = 0;
-	}
-
-	g_free(et->click_to_add_message);
-
-	(*e_table_parent_class->destroy)(object);
-}
-
-static void
-e_table_init (GtkObject *object)
-{
-	ETable *e_table = E_TABLE (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
-
-	GTK_WIDGET_SET_FLAGS (e_table, GTK_CAN_FOCUS);
-
-	gtk_table->homogeneous = FALSE;
-
-	e_table->sort_info = NULL;
-	e_table->group_info_change_id = 0;
-	e_table->reflow_idle_id = 0;
-
-	e_table->draw_grid = 1;
-	e_table->draw_focus = 1;
-	e_table->cursor_mode = E_CURSOR_SIMPLE;
-	e_table->length_threshold = 200;
-
-	e_table->need_rebuild = 0;
-	e_table->rebuild_idle_id = 0;
-
-	e_table->horizontal_scrolling = FALSE;
-
-	e_table->click_to_add_message = NULL;
-
-	e_table->drag_get_data_row = -1;
-	e_table->drag_get_data_col = -1;
-	e_table->drop_row = -1;
-	e_table->drop_col = -1;
-	e_table->site = NULL;
-	e_table->drag_source_button_press_event_id = 0;
-	e_table->drag_source_motion_notify_event_id = 0;
-
-	e_table->sorter = NULL;
-	e_table->selection = e_table_selection_model_new();
-	e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE;
-	e_table->spec = NULL;
-}
-
-/* Grab_focus handler for the ETable */
-static void
-et_grab_focus (GtkWidget *widget)
-{
-	ETable *e_table;
-
-	e_table = E_TABLE (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (e_table->table_canvas));
-}
-
-/* Focus handler for the ETable */
-static gint
-et_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETable *e_table;
-
-	e_table = E_TABLE (container);
-
-	if (container->focus_child) {
-		gtk_container_set_focus_child (container, NULL);
-		return FALSE;
-	}
-
-	return gtk_container_focus (GTK_CONTAINER (e_table->table_canvas), direction);
-}
-
-static void
-header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_table)
-{
-	gnome_canvas_set_scroll_region (
-		GNOME_CANVAS (e_table->header_canvas),
-		0, 0, alloc->width - 1, /*  COLUMN_HEADER_HEIGHT - 1 */
-		E_TABLE_HEADER_ITEM (e_table->header_item)->height - 1);
-
-	/* When the header item is created ->height == 0,
-	   as the font is only created when everything is realized.
-	   So we set the usize here as well, so that the size of the
-	   header is correct */
-	if (GTK_WIDGET (e_table->header_canvas)->allocation.height !=
-	    E_TABLE_HEADER_ITEM (e_table->header_item)->height)
-		gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1,
-				      E_TABLE_HEADER_ITEM (e_table->header_item)->height);
-}
-
-static void
-sort_info_changed (ETableSortInfo *info, ETable *et)
-{
-	gboolean will_be_grouped = e_table_sort_info_grouping_get_count(info) > 0;
-	if (et->is_grouped || will_be_grouped) {
-		et->need_rebuild = TRUE;
-		if (!et->rebuild_idle_id)
-			et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
-	}
-}
-
-static void
-e_table_setup_header (ETable *e_table)
-{
-	char *pointer;
-	e_table->header_canvas = GNOME_CANVAS (e_canvas_new ());
-	GTK_WIDGET_UNSET_FLAGS (e_table->header_canvas, GTK_CAN_FOCUS);
-
-	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
-
-	pointer = g_strdup_printf("%p", e_table);
-
-	e_table->header_item = gnome_canvas_item_new (
-		gnome_canvas_root (e_table->header_canvas),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table->header,
-		"full_header", e_table->full_header,
-		"sort_info", e_table->sort_info,
-		"dnd_code", pointer,
-		"table", e_table,
-		NULL);
-
-	g_free(pointer);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->header_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (header_canvas_size_allocate), e_table);
-
-	gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1,
-			      E_TABLE_HEADER_ITEM (e_table->header_item)->height);
-}
-
-static gboolean
-table_canvas_reflow_idle (ETable *e_table)
-{
-	gdouble height, width;
-	gdouble item_height;
-	GtkAllocation *alloc = &(GTK_WIDGET (e_table->table_canvas)->allocation);
-
-	gtk_object_get (GTK_OBJECT (e_table->canvas_vbox),
-			"height", &height,
-			"width", &width,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-	width = MAX((int)width, alloc->width);
-	/* I have no idea why this needs to be -1, but it works. */
-	gnome_canvas_set_scroll_region (
-		GNOME_CANVAS (e_table->table_canvas),
-		0, 0, width - 1, height - 1);
-	gtk_object_set (GTK_OBJECT (e_table->white_item),
-			"y1", item_height + 1,
-			"x2", width,
-			"y2", height,
-			NULL);
-	e_table->reflow_idle_id = 0;
-	return FALSE;
-}
-
-static void
-table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-			    ETable *e_table)
-{
-	gdouble width;
-	gdouble height;
-	gdouble item_height;
-
-	width = alloc->width;
-	gtk_object_get (GTK_OBJECT (e_table->canvas_vbox),
-			"height", &height,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-
-	gtk_object_set (GTK_OBJECT (e_table->canvas_vbox),
-			"width", width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (e_table->header),
-			"width", width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (e_table->white_item),
-			"y1", item_height + 1,
-			"x2", width,
-			"y2", height,
-			NULL);
-	if (e_table->reflow_idle_id)
-		g_source_remove(e_table->reflow_idle_id);
-	table_canvas_reflow_idle(e_table);
-}
-
-static void
-table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table)
-{
-	if (!e_table->reflow_idle_id)
-		e_table->reflow_idle_id = g_idle_add_full (400, (GSourceFunc) table_canvas_reflow_idle, e_table, NULL);
-}
-
-static void
-click_to_add_cursor_change (ETableClickToAdd *etcta, int row, int col, ETable *et)
-{
-	if (et->cursor_loc == E_TABLE_CURSOR_LOC_TABLE) {
-		e_selection_model_clear(E_SELECTION_MODEL (et->selection));
-	}
-	et->cursor_loc = E_TABLE_CURSOR_LOC_ETCTA;
-}
-
-static void
-group_cursor_change (ETableGroup *etg, int row, ETable *et)
-{
-	if (et->cursor_loc == E_TABLE_CURSOR_LOC_ETCTA && et->click_to_add) {
-		e_table_click_to_add_commit(E_TABLE_CLICK_TO_ADD(et->click_to_add));
-	}
-	et->cursor_loc = E_TABLE_CURSOR_LOC_TABLE;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_CHANGE],
-			 row);
-}
-
-static void
-group_cursor_activated (ETableGroup *etg, int row, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_ACTIVATED],
-			 row);
-}
-
-static void
-group_double_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [DOUBLE_CLICK],
-			 row, col, event);
-}
-
-static gint
-group_right_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [RIGHT_CLICK],
-			 row, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-group_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CLICK],
-			 row, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-group_key_press (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	GdkEventKey *key = (GdkEventKey *) event;
-	GdkEventButton click;
-	switch (key->keyval) {
-	case GDK_Page_Down:
-		gtk_adjustment_set_value(
-			gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas)),
-			CLAMP(gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->value +
-			      (gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->page_size - 20),
-			      0,
-			      gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->upper -
-			      gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->page_size));
-		click.type = GDK_BUTTON_PRESS;
-		click.window = GTK_LAYOUT (et->table_canvas)->bin_window;
-		click.send_event = key->send_event;
-		click.time = key->time;
-		click.x = 30;
-		click.y = gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->page_size - 1;
-		click.state = key->state;
-		click.button = 1;
-		gtk_widget_event(GTK_WIDGET(et->table_canvas),
-				 (GdkEvent *) &click);
-		return_val = 1;
-		break;
-	case GDK_Page_Up:
-		gtk_adjustment_set_value(
-			gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas)),
-			gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->value -
-			(gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas))->page_size - 20));
-		click.type = GDK_BUTTON_PRESS;
-		click.window = GTK_LAYOUT (et->table_canvas)->bin_window;
-		click.send_event = key->send_event;
-		click.time = key->time;
-		click.x = 30;
-		click.y = 1;
-		click.state = key->state;
-		click.button = 1;
-		gtk_widget_event(GTK_WIDGET(et->table_canvas),
-				 (GdkEvent *) &click);
-		return_val = 1;
-		break;
-	default:
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [KEY_PRESS],
-				 row, col, event, &return_val);
-		break;
-	}
-	return return_val;
-}
-
-static void
-et_table_model_changed (ETableModel *model, ETable *et)
-{
-	et->need_rebuild = TRUE;
-	if (!et->rebuild_idle_id)
-		et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
-}
-
-static void
-et_table_row_changed (ETableModel *table_model, int row, ETable *et)
-{
-	if (!et->need_rebuild) {
-		if (e_table_group_remove (et->group, row))
-			e_table_group_add (et->group, row);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_table_cell_changed (ETableModel *table_model, int view_col, int row, ETable *et)
-{
-	et_table_row_changed (table_model, row, et);
-}
-
-static void
-et_table_row_inserted (ETableModel *table_model, int row, ETable *et)
-{
-	/* This number has already been decremented. */
-	int row_count = e_table_model_row_count(table_model);
-	if (!et->need_rebuild) {
-		if (row != row_count - 1)
-			e_table_group_increment(et->group, row, 1);
-		e_table_group_add (et->group, row);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_table_row_deleted (ETableModel *table_model, int row, ETable *et)
-{
-	int row_count = e_table_model_row_count(table_model);
-	if (!et->need_rebuild) {
-		e_table_group_remove (et->group, row);
-		if (row != row_count)
-			e_table_group_decrement(et->group, row, 1);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_build_groups (ETable *et)
-{
-	gboolean was_grouped = et->is_grouped;
-
-	et->is_grouped = e_table_sort_info_grouping_get_count(et->sort_info) > 0;
-
-	et->group = e_table_group_new (GNOME_CANVAS_GROUP (et->canvas_vbox),
-				       et->full_header,
-				       et->header,
-				       et->model,
-				       et->sort_info,
-				       0);
-	e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group));
-	gnome_canvas_item_set(GNOME_CANVAS_ITEM(et->group),
-			      "drawgrid", et->draw_grid,
-			      "drawfocus", et->draw_focus,
-			      "cursor_mode", et->cursor_mode,
-			      "length_threshold", et->length_threshold,
-			      "table_selection_model", et->selection,
-			      NULL);
-
-	gtk_signal_connect (GTK_OBJECT (et->group), "cursor_change",
-			    GTK_SIGNAL_FUNC (group_cursor_change), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "cursor_activated",
-			    GTK_SIGNAL_FUNC (group_cursor_activated), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "double_click",
-			    GTK_SIGNAL_FUNC (group_double_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "right_click",
-			    GTK_SIGNAL_FUNC (group_right_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "click",
-			    GTK_SIGNAL_FUNC (group_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "key_press",
-			    GTK_SIGNAL_FUNC (group_key_press), et);
-
-
-	if (!(et->is_grouped) && was_grouped)
-		et_disconnect_model (et);
-
-	if (et->is_grouped && (!was_grouped)) {
-		et->table_model_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_changed",
-								GTK_SIGNAL_FUNC (et_table_model_changed), et);
-
-		et->table_row_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_row_changed",
-							      GTK_SIGNAL_FUNC (et_table_row_changed), et);
-
-		et->table_cell_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_cell_changed",
-							       GTK_SIGNAL_FUNC (et_table_cell_changed), et);
-
-		et->table_row_inserted_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_row_inserted",
-								GTK_SIGNAL_FUNC (et_table_row_inserted), et);
-
-		et->table_row_deleted_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_row_deleted",
-							       GTK_SIGNAL_FUNC (et_table_row_deleted), et);
-
-	}
-
-	if (et->is_grouped)
-		e_table_fill_table (et, et->model);
-}
-
-static gboolean
-changed_idle (gpointer data)
-{
-	ETable *et = E_TABLE (data);
-
-	if (et->need_rebuild) {
-		gtk_object_destroy (GTK_OBJECT (et->group));
-		et_build_groups(et);
-		gtk_object_set (GTK_OBJECT (et->canvas_vbox),
-				"width", (double) GTK_WIDGET (et->table_canvas)->allocation.width,
-				NULL);
-
-		if (GTK_WIDGET_REALIZED(et->table_canvas))
-			table_canvas_size_allocate (GTK_WIDGET(et->table_canvas), &GTK_WIDGET(et->table_canvas)->allocation, et);
-	}
-
-	et->need_rebuild = 0;
-	et->rebuild_idle_id = 0;
-
-	if (et->horizontal_scrolling)
-		e_table_header_update_horizontal(et->header);
-
-	return FALSE;
-}
-
-static void
-et_canvas_realize (GtkWidget *canvas, ETable *e_table)
-{
-	gnome_canvas_item_set(
-		e_table->white_item,
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-}
-
-static void
-et_canvas_button_press (GtkWidget *canvas, GdkEvent *event, ETable *e_table)
-{
-	if (GTK_WIDGET_HAS_FOCUS(canvas)) {
-		GnomeCanvasItem *item = GNOME_CANVAS(canvas)->focused_item;
-
-		if (E_IS_TABLE_ITEM(item)) {
-			e_table_item_leave_edit(E_TABLE_ITEM(item));
-		}
-	}
-}
-
-static void
-e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *header,
-		     ETableModel *model)
-{
-	e_table->table_canvas = GNOME_CANVAS (e_canvas_new ());
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (table_canvas_size_allocate), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "focus_in_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "focus_out_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_table);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_begin",
-		GTK_SIGNAL_FUNC (et_drag_begin), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_end",
-		GTK_SIGNAL_FUNC (et_drag_end), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_get",
-		GTK_SIGNAL_FUNC (et_drag_data_get), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_delete",
-		GTK_SIGNAL_FUNC (et_drag_data_delete), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_motion",
-		GTK_SIGNAL_FUNC (et_drag_motion), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_leave",
-		GTK_SIGNAL_FUNC (et_drag_leave), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_drop",
-		GTK_SIGNAL_FUNC (et_drag_drop), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_received",
-		GTK_SIGNAL_FUNC (et_drag_data_received), e_table);
-
-	gtk_signal_connect (GTK_OBJECT(e_table->table_canvas), "reflow",
-			    GTK_SIGNAL_FUNC (table_canvas_reflow), e_table);
-
-	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
-
-
-	e_table->white_item = gnome_canvas_item_new(
-		gnome_canvas_root(e_table->table_canvas),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-
-	gtk_signal_connect (
-		GTK_OBJECT(e_table->table_canvas), "realize",
-		GTK_SIGNAL_FUNC(et_canvas_realize), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT(e_table->table_canvas), "button_press_event",
-		GTK_SIGNAL_FUNC(et_canvas_button_press), e_table);
-	e_table->canvas_vbox = gnome_canvas_item_new(
-		gnome_canvas_root(e_table->table_canvas),
-		e_canvas_vbox_get_type(),
-		"spacing", 10.0,
-		NULL);
-
-	if (e_table->use_click_to_add) {
-		e_table->click_to_add = gnome_canvas_item_new (
-			GNOME_CANVAS_GROUP(e_table->canvas_vbox),
-			e_table_click_to_add_get_type (),
-			"header", e_table->header,
-			"model", e_table->model,
-			"message", e_table->click_to_add_message,
-			NULL);
-
-		e_canvas_vbox_add_item (
-			E_CANVAS_VBOX(e_table->canvas_vbox),
-			e_table->click_to_add);
-		gtk_signal_connect (
-			GTK_OBJECT (e_table->click_to_add), "cursor_change",
-			GTK_SIGNAL_FUNC(click_to_add_cursor_change), e_table);
-	}
-
-	et_build_groups(e_table);
-}
-
-static void
-e_table_fill_table (ETable *e_table, ETableModel *model)
-{
-	e_table_group_add_all (e_table->group);
-}
-
-static ETableCol *
-et_col_spec_to_col (ETable                    *e_table,
-		    ETableColumnSpecification *col_spec,
-		    ETableExtras              *ete)
-{
-	ETableCol *col = NULL;
-	ECell *cell;
-	GCompareFunc compare;
-
-	cell = e_table_extras_get_cell(ete, col_spec->cell);
-	compare = e_table_extras_get_compare(ete, col_spec->compare);
-
-	if (cell && compare) {
-		if (col_spec->pixbuf && *col_spec->pixbuf) {
-			GdkPixbuf *pixbuf;
-
-			pixbuf = e_table_extras_get_pixbuf(
-				ete, col_spec->pixbuf);
-			if (pixbuf) {
-				col = e_table_col_new_with_pixbuf (
-					col_spec->model_col, gettext (col_spec->title),
-					pixbuf, col_spec->expansion,
-					col_spec->minimum_width,
-					cell, compare, col_spec->resizable);
-			}
-		}
-		if (col == NULL && col_spec->title && *col_spec->title) {
-			col = e_table_col_new (
-				col_spec->model_col, gettext (col_spec->title),
-				col_spec->expansion, col_spec->minimum_width,
-				cell, compare, col_spec->resizable);
-		}
-	}
-	return col;
-}
-
-static ETableHeader *
-et_spec_to_full_header (ETable              *e_table,
-			ETableSpecification *spec,
-			ETableExtras        *ete)
-{
-	ETableHeader *nh;
-	int column;
-
-	g_return_val_if_fail (e_table, NULL);
-	g_return_val_if_fail (spec, NULL);
-	g_return_val_if_fail (ete, NULL);
-
-	nh = e_table_header_new ();
-
-	for (column = 0; spec->columns[column]; column++) {
-		ETableCol *col = et_col_spec_to_col (
-			e_table, spec->columns[column], ete);
-
-		if (col)
-			e_table_header_add_column (nh, col, -1);
-	}
-
-	return nh;
-}
-
-static ETableHeader *
-et_state_to_header (ETable *e_table, ETableHeader *full_header, ETableState *state)
-{
-	ETableHeader *nh;
-	const int max_cols = e_table_header_count (full_header);
-	int column;
-
-	g_return_val_if_fail (e_table, NULL);
-	g_return_val_if_fail (full_header, NULL);
-	g_return_val_if_fail (state, NULL);
-
-	nh = e_table_header_new ();
-
-	gtk_object_set(GTK_OBJECT(nh),
-		       "width_extras", e_table_header_width_extras(GTK_WIDGET(e_table)->style),
-		       NULL);
-
-	for (column = 0; column < state->col_count; column++) {
-		int col;
-		double expansion;
-		ETableCol *table_col;
-
-		col = state->columns[column];
-		expansion = state->expansions[column];
-
-		if (col >= max_cols)
-			continue;
-
-		table_col = e_table_header_get_column (full_header, col);
-
-		if (expansion >= -1)
-			table_col->expansion = expansion;
-
-		e_table_header_add_column (nh, table_col, -1);
-	}
-
-	return nh;
-}
-
-void
-e_table_set_state_object(ETable *e_table, ETableState *state)
-{
-	if (e_table->header)
-		gtk_object_unref(GTK_OBJECT(e_table->header));
-	e_table->header = et_state_to_header (e_table, e_table->full_header, state);
-	if (e_table->header)
-		gtk_object_ref(GTK_OBJECT(e_table->header));
-
-	if (e_table->sort_info) {
-		if (e_table->group_info_change_id)
-			gtk_signal_disconnect (GTK_OBJECT (e_table->sort_info),
-					       e_table->group_info_change_id);
-		gtk_object_unref(GTK_OBJECT(e_table->sort_info));
-	}
-	if (state->sort_info) {
-		e_table->sort_info = e_table_sort_info_duplicate(state->sort_info);
-		e_table->group_info_change_id =
-			gtk_signal_connect (GTK_OBJECT (e_table->sort_info),
-					    "group_info_changed",
-					    GTK_SIGNAL_FUNC (sort_info_changed),
-					    e_table);
-	}
-	else
-		e_table->sort_info = NULL;
-
-	if (e_table->sorter)
-		gtk_object_set(GTK_OBJECT(e_table->sorter),
-			       "sort_info", e_table->sort_info,
-			       NULL);
-	if (e_table->header_item)
-		gtk_object_set(GTK_OBJECT(e_table->header_item),
-			       "ETableHeader", e_table->header,
-			       "sort_info", e_table->sort_info,
-			       NULL);
-	if (e_table->click_to_add)
-		gtk_object_set(GTK_OBJECT(e_table->click_to_add),
-			       "header", e_table->header,
-			       NULL);
-
-	e_table->need_rebuild = TRUE;
-	if (!e_table->rebuild_idle_id)
-		e_table->rebuild_idle_id = g_idle_add_full (20, changed_idle, e_table, NULL);
-}
-
-/**
- * e_table_set_state:
- * @e_table: %ETable object that will be modified
- * @state_str: a string with the XML representation of the ETableState.
- *
- * This routine sets the state (as described by %ETableState) of the
- * %ETable object.
- */
-void
-e_table_set_state (ETable      *e_table,
-		   const gchar *state_str)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(state_str != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_string(state, state_str);
-
-	if (state->col_count > 0)
-		e_table_set_state_object(e_table, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_table_load_state:
- * @e_table: %ETable object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETable
- *
- * An %ETableState will be loaded form the file pointed by @filename into the
- * @e_table object.
- */
-void
-e_table_load_state (ETable      *e_table,
-		    const gchar *filename)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(filename != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_file(state, filename);
-
-	if (state->col_count > 0)
-		e_table_set_state_object(e_table, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_table_get_state_object:
- * @e_table: %ETable object that will be modified
- *
- * Returns: the %ETableState object that encapsulates the current
- * state of the @e_table object
- */
-ETableState *
-e_table_get_state_object (ETable *e_table)
-{
-	ETableState *state;
-	int full_col_count;
-	int i, j;
-
-	state = e_table_state_new();
-	state->sort_info = e_table->sort_info;
-	gtk_object_ref(GTK_OBJECT(state->sort_info));
-
-
-	state->col_count = e_table_header_count (e_table->header);
-	full_col_count = e_table_header_count (e_table->full_header);
-	state->columns = g_new(int, state->col_count);
-	state->expansions = g_new(double, state->col_count);
-	for (i = 0; i < state->col_count; i++) {
-		ETableCol *col = e_table_header_get_column(e_table->header, i);
-		state->columns[i] = -1;
-		for (j = 0; j < full_col_count; j++) {
-			if (col->col_idx == e_table_header_index(e_table->full_header, j)) {
-				state->columns[i] = j;
-				break;
-			}
-		}
-		state->expansions[i] = col->expansion;
-	}
-
-	return state;
-}
-
-gchar          *e_table_get_state                 (ETable               *e_table)
-{
-	ETableState *state;
-	gchar *string;
-
-	state = e_table_get_state_object(e_table);
-	string = e_table_state_save_to_string(state);
-	gtk_object_unref(GTK_OBJECT(state));
-	return string;
-}
-
-/**
- * e_table_save_state:
- * @e_table: %ETable object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETable
- *
- * This routine saves the state of the @e_table object into the file pointed
- * by @filename
- */
-void
-e_table_save_state (ETable      *e_table,
-		    const gchar *filename)
-{
-	ETableState *state;
-
-	state = e_table_get_state_object(e_table);
-	e_table_state_save_to_file(state, filename);
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-static void
-et_selection_model_selection_change (ETableGroup *etg, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [SELECTION_CHANGE]);
-}
-
-static ETable *
-et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   ETableSpecification *specification, ETableState *state)
-{
-	int row = 0;
-
-	if (ete)
-		gtk_object_ref(GTK_OBJECT(ete));
-	else
-		ete = e_table_extras_new();
-
-	e_table->use_click_to_add = specification->click_to_add;
-	e_table->click_to_add_message = g_strdup (gettext (specification->click_to_add_message));
-	e_table->draw_grid = specification->draw_grid;
-	e_table->draw_focus = specification->draw_focus;
-	e_table->cursor_mode = specification->cursor_mode;
-	e_table->full_header = et_spec_to_full_header(e_table, specification, ete);
-
-	gtk_object_set(GTK_OBJECT(e_table->selection),
-		       "selection_mode", specification->selection_mode,
-		       "cursor_mode", specification->cursor_mode,
-		       NULL);
-
-	e_table->model = etm;
-	gtk_object_ref (GTK_OBJECT (etm));
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	e_table->header = et_state_to_header (e_table, e_table->full_header, state);
-	e_table->horizontal_scrolling = specification->horizontal_scrolling;
-
-	e_table->sort_info = state->sort_info;
-
-	e_table->group_info_change_id =
-		gtk_signal_connect (GTK_OBJECT (e_table->sort_info), "group_info_changed",
-				    GTK_SIGNAL_FUNC (sort_info_changed), e_table);
-
-
-	gtk_object_set(GTK_OBJECT(e_table->header),
-		       "sort_info", e_table->sort_info,
-		       NULL);
-
-	e_table->sorter = e_table_sorter_new(etm, e_table->full_header, e_table->sort_info);
-
-	gtk_object_set (GTK_OBJECT (e_table->selection),
-			"model", etm,
-			"sorter", e_table->sorter,
-			NULL);
-
-	gtk_signal_connect(GTK_OBJECT(e_table->selection), "selection_changed",
-			   GTK_SIGNAL_FUNC(et_selection_model_selection_change), e_table);
-
-	if (!specification->no_headers) {
-		e_table_setup_header (e_table);
-	}
-	e_table_setup_table (e_table, e_table->full_header, e_table->header, etm);
-	e_table_fill_table (e_table, etm);
-
-	gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
-
-	if (!specification->no_headers) {
-		/*
-		 * The header
-		 */
-		gtk_table_attach (GTK_TABLE (e_table), GTK_WIDGET (e_table->header_canvas),
-				  0, 1, 0 + row, 1 + row,
-				  GTK_FILL | GTK_EXPAND,
-				  GTK_FILL, 0, 0);
-		row ++;
-	}
-	gtk_table_attach (GTK_TABLE (e_table), GTK_WIDGET (e_table->table_canvas),
-			  0, 1, 0 + row, 1 + row,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-
-	gtk_widget_pop_colormap ();
-	gtk_widget_pop_visual ();
-
-	gtk_object_unref(GTK_OBJECT(ete));
-
-	return e_table;
-}
-
-ETable *
-e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   const char *spec_str, const char *state_str)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_str != NULL, NULL);
-
-	specification = e_table_specification_new();
-	e_table_specification_load_from_string(specification, spec_str);
-	if (state_str) {
-		state = e_table_state_new();
-		e_table_state_load_from_string(state, state_str);
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_table = et_real_construct (e_table, etm, ete, specification, state);
-
-	e_table->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_table;
-}
-
-ETable *
-e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-				  const char *spec_fn, const char *state_fn)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	specification = e_table_specification_new();
-	if (!e_table_specification_load_from_file(specification, spec_fn)) {
-		gtk_object_unref(GTK_OBJECT(specification));
-		return NULL;
-	}
-
-	if (state_fn) {
-		state = e_table_state_new();
-		if (!e_table_state_load_from_file(state, state_fn)) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_table = et_real_construct (e_table, etm, ete, specification, state);
-
-	e_table->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_table;
-}
-
-GtkWidget *
-e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char *state)
-{
-	ETable *e_table;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_table = gtk_type_new (e_table_get_type ());
-
-	e_table = e_table_construct (e_table, etm, ete, spec, state);
-
-	return GTK_WIDGET (e_table);
-}
-
-GtkWidget *
-e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const char *spec_fn, const char *state_fn)
-{
-	ETable *e_table;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_table = gtk_type_new (e_table_get_type ());
-
-	e_table = e_table_construct_from_spec_file (e_table, etm, ete, spec_fn, state_fn);
-
-	return GTK_WIDGET (e_table);
-}
-
-#if 0
-static xmlNode *
-et_build_column_spec (ETable *e_table)
-{
-	xmlNode *columns_shown;
-	gint i;
-	gint col_count;
-
-	columns_shown = xmlNewNode (NULL, "columns-shown");
-
-	col_count = e_table_header_count (e_table->header);
-	for (i = 0; i < col_count; i++){
-		gchar *text = g_strdup_printf ("%d", e_table_header_index(e_table->header, i));
-		xmlNewChild (columns_shown, NULL, "column", text);
-		g_free (text);
-	}
-
-	return columns_shown;
-}
-
-static xmlNode *
-et_build_grouping_spec (ETable *e_table)
-{
-	xmlNode *node;
-	xmlNode *grouping;
-	int i;
-	const int sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info);
-	const int group_count = e_table_sort_info_grouping_get_count (e_table->sort_info);
-
-	grouping = xmlNewNode (NULL, "grouping");
-	node = grouping;
-
-	for (i = 0; i < group_count; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(e_table->sort_info, i);
-		xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	for (i = 0; i < sort_count; i++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(e_table->sort_info, i);
-		xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	return grouping;
-}
-
-static xmlDoc *
-et_build_tree (ETable *e_table)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL)
-		return NULL;
-
-	root = xmlNewDocNode (doc, NULL, "ETableSpecification", NULL);
-	xmlDocSetRootElement (doc, root);
-	xmlAddChild (root, et_build_column_spec (e_table));
-	xmlAddChild (root, et_build_grouping_spec (e_table));
-
-	return doc;
-}
-
-gchar *
-e_table_get_specification (ETable *e_table)
-{
-	xmlDoc *doc;
-	xmlChar *buffer;
-	gint size;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-
-	doc = et_build_tree (e_table);
-	xmlDocDumpMemory (doc, &buffer, &size);
-	xmlFreeDoc (doc);
-
-	return buffer;
-}
-
-int
-e_table_set_specification (ETable *e_table, const char *spec)
-{
-	xmlDoc *xmlSpec;
-	int ret;
-
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-	g_return_val_if_fail(spec != NULL, -1);
-
-	/* doesn't work yet, sigh */
-	xmlSpec = xmlParseMemory ((char *)spec, strlen(spec));
-	ret = et_real_set_specification(e_table, xmlSpec);
-	xmlFreeDoc (xmlSpec);
-
-	return ret;
-}
-
-void
-e_table_save_specification (ETable *e_table, gchar *filename)
-{
-	xmlDoc *doc = et_build_tree (e_table);
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(filename != NULL);
-
-	xmlSaveFile (filename, doc);
-	xmlFreeDoc (doc);
-}
-
-int
-e_table_load_specification (ETable *e_table, gchar *filename)
-{
-	xmlDoc *xmlSpec;
-	int ret;
-
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-	g_return_val_if_fail(filename != NULL, -1);
-
-	/* doesn't work yet, yay */
-	xmlSpec = xmlParseFile (filename);
-	ret = et_real_set_specification(e_table, xmlSpec);
-	xmlFreeDoc (xmlSpec);
-
-	return ret;
-}
-#endif
-
-void
-e_table_set_cursor_row (ETable *e_table, int row)
-{
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(row >= 0);
-
-	gtk_object_set(GTK_OBJECT(e_table->selection),
-		       "cursor_row", row,
-		       NULL);
-}
-
-int
-e_table_get_cursor_row (ETable *e_table)
-{
-	int row;
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	gtk_object_get(GTK_OBJECT(e_table->selection),
-		       "cursor_row", &row,
-		       NULL);
-	return row;
-}
-
-void
-e_table_selected_row_foreach     (ETable *e_table,
-				  EForeachFunc callback,
-				  gpointer closure)
-{
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-
-	e_selection_model_foreach(E_SELECTION_MODEL (e_table->selection),
-						     callback,
-						     closure);
-}
-
-gint
-e_table_selected_count     (ETable *e_table)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	return e_selection_model_selected_count(E_SELECTION_MODEL (e_table->selection));
-}
-
-void
-e_table_select_all (ETable *table)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-
-	e_selection_model_select_all (E_SELECTION_MODEL (table->selection));
-}
-
-void
-e_table_invert_selection (ETable *table)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-
-	e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection));
-}
-
-
-EPrintable *
-e_table_get_printable (ETable *e_table)
-{
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-
-	return e_table_group_get_printable(e_table->group);
-}
-
-static void
-et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-typedef struct {
-	char     *arg;
-	gboolean  setting;
-} bool_closure;
-
-static void
-et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETable *etable = E_TABLE (o);
-
-	switch (arg_id){
-	case ARG_LENGTH_THRESHOLD:
-		etable->length_threshold = GTK_VALUE_INT (*arg);
-		if (etable->group) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etable->group),
-					       "length_threshold", GTK_VALUE_INT (*arg),
-					       NULL);
-		}
-		break;
-
-	}
-}
-
-static void
-set_scroll_adjustments   (ETable *table,
-			  GtkAdjustment *hadjustment,
-			  GtkAdjustment *vadjustment)
-{
-	if (vadjustment != NULL) {
-		vadjustment->step_increment = 20;
-		gtk_adjustment_changed(vadjustment);
-	}
-
-	gtk_layout_set_hadjustment (GTK_LAYOUT(table->table_canvas),
-				    hadjustment);
-	gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
-				    vadjustment);
-
-	if (table->header_canvas != NULL)
-		gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
-					    hadjustment);
-}
-
-gint
-e_table_get_next_row      (ETable *e_table,
-			   gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-		i++;
-		if (i < e_table_model_row_count(e_table->model)) {
-			return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
-		} else
-			return -1;
-	} else
-		if (model_row < e_table_model_row_count(e_table->model) - 1)
-			return model_row + 1;
-		else
-			return -1;
-}
-
-gint
-e_table_get_prev_row      (ETable *e_table,
-			   gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-		i--;
-		if (i >= 0)
-			return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
-		else
-			return -1;
-	} else
-		return model_row - 1;
-}
-
-gint
-e_table_model_to_view_row        (ETable *e_table,
-				  gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter)
-		return e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-	else
-		return model_row;
-}
-
-gint
-e_table_view_to_model_row        (ETable *e_table,
-				  gint    view_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter)
-		return e_sorter_sorted_to_model (E_SORTER (e_table->sorter), view_row);
-	else
-		return view_row;
-}
-
-struct _ETableDragSourceSite
-{
-	GdkModifierType    start_button_mask;
-	GtkTargetList     *target_list;        /* Targets for drag data */
-	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;	         /* Colormap for drag icon */
-	GdkPixmap         *pixmap;             /* Icon for drag data */
-	GdkBitmap         *mask;
-
-	/* Stored button press information to detect drag beginning */
-	gint               state;
-	gint               x, y;
-	gint               row, col;
-};
-
-typedef enum
-{
-  GTK_DRAG_STATUS_DRAG,
-  GTK_DRAG_STATUS_WAIT,
-  GTK_DRAG_STATUS_DROP
-} GtkDragStatus;
-
-typedef struct _GtkDragDestInfo GtkDragDestInfo;
-typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
-
-struct _GtkDragDestInfo
-{
-  GtkWidget         *widget;	   /* Widget in which drag is in */
-  GdkDragContext    *context;	   /* Drag context */
-  GtkDragSourceInfo *proxy_source; /* Set if this is a proxy drag */
-  GtkSelectionData  *proxy_data;   /* Set while retrieving proxied data */
-  gboolean           dropped : 1;     /* Set after we receive a drop */
-  guint32            proxy_drop_time; /* Timestamp for proxied drop */
-  gboolean           proxy_drop_wait : 1; /* Set if we are waiting for a
-					   * status reply before sending
-					   * a proxied drop on.
-					   */
-  gint               drop_x, drop_y; /* Position of drop */
-};
-
-struct _GtkDragSourceInfo
-{
-  GtkWidget         *widget;
-  GtkTargetList     *target_list; /* Targets for drag data */
-  GdkDragAction      possible_actions; /* Actions allowed by source */
-  GdkDragContext    *context;	  /* drag context */
-  GtkWidget         *icon_window; /* Window for drag */
-  GtkWidget         *ipc_widget;  /* GtkInvisible for grab, message passing */
-  GdkCursor         *cursor;	  /* Cursor for drag */
-  gint hot_x, hot_y;		  /* Hot spot for drag */
-  gint button;			  /* mouse button starting drag */
-
-  GtkDragStatus      status;	  /* drag status */
-  GdkEvent          *last_event;  /* motion event waiting for response */
-
-  gint               start_x, start_y; /* Initial position */
-  gint               cur_x, cur_y;     /* Current Position */
-
-  GList             *selections;  /* selections we've claimed */
-
-  GtkDragDestInfo   *proxy_dest;  /* Set if this is a proxy drag */
-
-  guint              drop_timeout;     /* Timeout for aborting drop */
-  guint              destroy_icon : 1; /* If true, destroy icon_window
-					*/
-};
-
-/* Drag & drop stuff. */
-/* Target */
-void
-e_table_drag_get_data (ETable         *table,
-		       int             row,
-		       int             col,
-		       GdkDragContext *context,
-		       GdkAtom         target,
-		       guint32         time)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	table->drag_get_data_row = row;
-	table->drag_get_data_col = col;
-	gtk_drag_get_data(GTK_WIDGET(table),
-			  context,
-			  target,
-			  time);
-
-}
-
-/**
- * e_table_drag_highlight:
- * @table:
- * @row:
- * @col:
- *
- * Set col to -1 to highlight the entire row.
- */
-void
-e_table_drag_highlight (ETable *table,
-			int     row,
-			int     col)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-}
-
-void
-e_table_drag_unhighlight (ETable *table)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-}
-
-void e_table_drag_dest_set   (ETable               *table,
-			      GtkDestDefaults       flags,
-			      const GtkTargetEntry *targets,
-			      gint                  n_targets,
-			      GdkDragAction         actions)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	gtk_drag_dest_set(GTK_WIDGET(table),
-			  flags,
-			  targets,
-			  n_targets,
-			  actions);
-}
-
-void e_table_drag_dest_set_proxy (ETable         *table,
-				  GdkWindow      *proxy_window,
-				  GdkDragProtocol protocol,
-				  gboolean        use_coordinates)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	gtk_drag_dest_set_proxy(GTK_WIDGET(table),
-				proxy_window,
-				protocol,
-				use_coordinates);
-}
-
-/*
- * There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-void
-e_table_drag_dest_unset (GtkWidget *widget)
-{
-	g_return_if_fail(widget != NULL);
-	g_return_if_fail(E_IS_TABLE(widget));
-
-	gtk_drag_dest_unset(widget);
-}
-
-/* Source side */
-
-void
-e_table_drag_source_set  (ETable               *table,
-			  GdkModifierType       start_button_mask,
-			  const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions)
-{
-	ETableDragSourceSite *site;
-	GtkWidget *canvas;
-
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	canvas = GTK_WIDGET(table->table_canvas);
-	site = table->site;
-
-	gtk_widget_add_events (canvas,
-			       gtk_widget_get_events (canvas) |
-			       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-			       GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK);
-
-	if (site) {
-		if (site->target_list)
-			gtk_target_list_unref (site->target_list);
-	} else {
-		site = g_new0 (ETableDragSourceSite, 1);
-
-		table->drag_source_button_press_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "button_press_event",
-					    GTK_SIGNAL_FUNC (e_table_drag_source_event_cb),
-					    table);
-		table->drag_source_motion_notify_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "motion_notify_event",
-					    GTK_SIGNAL_FUNC (e_table_drag_source_event_cb),
-					    table);
-
-		table->site = site;
-	}
-
-	site->start_button_mask = start_button_mask;
-
-	if (targets)
-		site->target_list = gtk_target_list_new (targets, n_targets);
-	else
-		site->target_list = NULL;
-
-	site->actions = actions;
-}
-
-void
-e_table_drag_source_unset (ETable *table)
-{
-	ETableDragSourceSite *site;
-
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE(table));
-
-	site = table->site;
-
-	if (site) {
-		gtk_signal_disconnect (
-			GTK_OBJECT (table->table_canvas),
-			table->drag_source_button_press_event_id);
-		gtk_signal_disconnect (
-			GTK_OBJECT (table->table_canvas),
-			table->drag_source_motion_notify_event_id);
-		g_free (site);
-		table->site = NULL;
-	}
-}
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *
-e_table_drag_begin (ETable            *table,
-		    int     	       row,
-		    int     	       col,
-		    GtkTargetList     *targets,
-		    GdkDragAction      actions,
-		    gint               button,
-		    GdkEvent          *event)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE(table), NULL);
-
-	table->drag_row = row;
-	table->drag_col = col;
-
-	return gtk_drag_begin(GTK_WIDGET(table),
-			      targets,
-			      actions,
-			      button,
-			      event);
-}
-
-static void
-e_table_compute_location (ETable *table, GtkWidget *widget,
-			  int x, int y, int *row, int *col)
-{
-	if (!(row || col))
-		return;
-	x += GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-	y += GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-	e_table_group_compute_location(table->group, &x, &y, row, col);
-}
-
-#if 0
-void
-e_table_get_position (ETable *table, GtkWidget *widget,
-		      int *x, int *y, int row, int col)
-{
-	if (!(x || y))
-		return;
-	e_table_group_get_position(table->group, x, y, &row, &col);
-	*x -= GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-	*y -= GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-}
-#endif
-
-static void
-et_drag_begin (GtkWidget *widget,
-	       GdkDragContext *context,
-	       ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_BEGIN],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_end (GtkWidget *widget,
-	     GdkDragContext *context,
-	     ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_END],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_data_get(GtkWidget *widget,
-		 GdkDragContext *context,
-		 GtkSelectionData *selection_data,
-		 guint info,
-		 guint time,
-		 ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_GET],
-			 et->drag_row,
-			 et->drag_col,
-			 context,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static void
-et_drag_data_delete(GtkWidget *widget,
-		    GdkDragContext *context,
-		    ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_DELETE],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_leave(GtkWidget *widget,
-	      GdkDragContext *context,
-	      guint time,
-	      ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_LEAVE],
-			 et->drop_row,
-			 et->drop_col,
-			 context,
-			 time);
-	et->drop_row = -1;
-	et->drop_col = -1;
-}
-
-static gboolean
-et_drag_motion(GtkWidget *widget,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time,
-	       ETable *et)
-{
-	gboolean ret_val;
-	int row, col;
-	e_table_compute_location(et,
-				 widget,
-				 x,
-				 y,
-				 &row,
-				 &col);
-	if (et->drop_row >= 0 && et->drop_col >= 0 &&
-	    row != et->drop_row && col != et->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_LEAVE],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 time);
-	}
-	et->drop_row = row;
-	et->drop_col = col;
-	if (row >= 0 && col >= 0)
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_MOTION],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 x,
-				 y,
-				 time,
-				 &ret_val);
-	return ret_val;
-}
-
-static gboolean
-et_drag_drop(GtkWidget *widget,
-	     GdkDragContext *context,
-	     gint x,
-	     gint y,
-	     guint time,
-	     ETable *et)
-{
-	gboolean ret_val;
-	int row, col;
-	e_table_compute_location(et,
-				 widget,
-				 x,
-				 y,
-				 &row,
-				 &col);
-	if (et->drop_row >= 0 && et->drop_col >= 0 &&
-	    row != et->drop_row && col != et->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_LEAVE],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 time);
-		if (row >= 0 && col >= 0)
-			gtk_signal_emit (GTK_OBJECT (et),
-					 et_signals [TABLE_DRAG_MOTION],
-					 row,
-					 col,
-					 context,
-					 x,
-					 y,
-					 time,
-					 &ret_val);
-	}
-	et->drop_row = row;
-	et->drop_col = col;
-	if (row >= 0 && col >= 0)
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_DROP],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 x,
-				 y,
-				 time,
-				 &ret_val);
-	et->drop_row = -1;
-	et->drop_col = -1;
-	return ret_val;
-}
-
-static void
-et_drag_data_received(GtkWidget *widget,
-		      GdkDragContext *context,
-		      gint x,
-		      gint y,
-		      GtkSelectionData *selection_data,
-		      guint info,
-		      guint time,
-		      ETable *et)
-{
-	int row, col;
-	e_table_compute_location(et,
-				 widget,
-				 x,
-				 y,
-				 &row,
-				 &col);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_RECEIVED],
-			 row,
-			 col,
-			 context,
-			 x,
-			 y,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static gint
-e_table_drag_source_event_cb (GtkWidget      *widget,
-			      GdkEvent       *event,
-			      ETable         *table)
-{
-	ETableDragSourceSite *site;
-	site = table->site;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			int row, col;
-			e_table_compute_location(table, widget, event->button.x, event->button.y, &row, &col);
-			if (row >= 0 && col >= 0) {
-				site->state |= (GDK_BUTTON1_MASK << (event->button.button - 1));
-				site->x = event->button.x;
-				site->y = event->button.y;
-				site->row = row;
-				site->col = col;
-			}
-		}
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			site->state &= ~(GDK_BUTTON1_MASK << (event->button.button - 1));
-		}
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		if (site->state & event->motion.state & site->start_button_mask) {
-			/* FIXME: This is really broken and can leave us
-			 * with a stuck grab
-			 */
-			int i;
-			for (i=1; i<6; i++) {
-				if (site->state & event->motion.state &
-				    GDK_BUTTON1_MASK << (i - 1))
-					break;
-			}
-
-			if (MAX (abs (site->x - event->motion.x),
-				 abs (site->y - event->motion.y)) > 3) {
-				GtkDragSourceInfo *info;
-				GdkDragContext *context;
-
-				site->state = 0;
-				context = e_table_drag_begin (table, site->row, site->col,
-							      site->target_list,
-							      site->actions,
-							      i, event);
-
-
-				info = g_dataset_get_data (context, "gtk-info");
-
-				if (!info->icon_window) {
-					if (site->pixmap)
-						gtk_drag_set_icon_pixmap (context,
-									  site->colormap,
-									  site->pixmap,
-									  site->mask, -2, -2);
-					else
-						gtk_drag_set_icon_default (context);
-				}
-
-				return TRUE;
-			}
-		}
-		break;
-
-	default:			/* hit for 2/3BUTTON_PRESS */
-		break;
-	}
-	return FALSE;
-}
-
-static void
-e_table_class_init (ETableClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	e_table_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy           = et_destroy;
-	object_class->set_arg           = et_set_arg;
-	object_class->get_arg           = et_get_arg;
-
-	widget_class->grab_focus = et_grab_focus;
-
-	container_class->focus = et_focus;
-
-	class->cursor_change            = NULL;
-	class->cursor_activated            = NULL;
-	class->selection_change         = NULL;
-	class->double_click             = NULL;
-	class->right_click              = NULL;
-	class->click                    = NULL;
-	class->key_press                = NULL;
-
-	class->table_drag_begin         = NULL;
-	class->table_drag_end           = NULL;
-	class->table_drag_data_get      = NULL;
-	class->table_drag_data_delete   = NULL;
-
-	class->table_drag_leave         = NULL;
-	class->table_drag_motion        = NULL;
-	class->table_drag_drop          = NULL;
-	class->table_drag_data_received = NULL;
-
-	et_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	et_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	et_signals [SELECTION_CHANGE] =
-		gtk_signal_new ("selection_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, selection_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	et_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals[TABLE_DRAG_BEGIN] =
-		gtk_signal_new ("table_drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_begin),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TABLE_DRAG_END] =
-		gtk_signal_new ("table_drag_end",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_end),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TABLE_DRAG_DATA_GET] =
-		gtk_signal_new ("table_drag_data_get",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_get),
-				e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DATA_DELETE] =
-		gtk_signal_new ("table_drag_data_delete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_delete),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-
-	et_signals[TABLE_DRAG_LEAVE] =
-		gtk_signal_new ("table_drag_leave",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_leave),
-				e_marshal_NONE__INT_INT_POINTER_UINT,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_MOTION] =
-		gtk_signal_new ("table_drag_motion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_motion),
-				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DROP] =
-		gtk_signal_new ("table_drag_drop",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_drop),
-				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DATA_RECEIVED] =
-		gtk_signal_new ("table_drag_data_received",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_received),
-				e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 8,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-
-	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
-
-	class->set_scroll_adjustments = set_scroll_adjustments;
-
-	widget_class->set_scroll_adjustments_signal =
-		gtk_signal_new ("set_scroll_adjustments",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, set_scroll_adjustments),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
-	gtk_object_add_arg_type ("ETable::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-}
-
-E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE);
diff --git a/widgets/table/e-table.dia b/widgets/table/e-table.dia
deleted file mode 100644
index 5aeb01228c..0000000000
--- a/widgets/table/e-table.dia
+++ /dev/null
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
deleted file mode 100644
index 6918023581..0000000000
--- a/widgets/table/e-table.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_H_
-#define _E_TABLE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-selection-model.h>
-#include <gal/e-table/e-table-extras.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/widgets/e-printable.h>
-#include <gal/e-table/e-table-state.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_TYPE        (e_table_get_type ())
-#define E_TABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_TYPE, ETable))
-#define E_TABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_TYPE, ETableClass))
-#define E_IS_TABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_TYPE))
-#define E_IS_TABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_TYPE))
-
-typedef struct _ETableDragSourceSite ETableDragSourceSite;
-
-typedef enum {
-	E_TABLE_CURSOR_LOC_NONE = 0,
-	E_TABLE_CURSOR_LOC_ETCTA = 1 << 0,
-	E_TABLE_CURSOR_LOC_TABLE = 1 << 1,
-} ETableCursorLoc;
-
-typedef struct {
-	GtkTable parent;
-
-	ETableModel *model;
-
-	ETableHeader *full_header, *header;
-
-	GnomeCanvasItem *canvas_vbox;
-	ETableGroup  *group;
-
-	ETableSortInfo *sort_info;
-	ETableSorter   *sorter;
-
-	ETableSelectionModel *selection;
-	ETableCursorLoc cursor_loc;
-	ETableSpecification *spec;
-
-	int table_model_change_id;
-	int table_row_change_id;
-	int table_cell_change_id;
-	int table_row_inserted_id;
-	int table_row_deleted_id;
-
-	int group_info_change_id;
-
-	int reflow_idle_id;
-
-	GnomeCanvas *header_canvas, *table_canvas;
-
-	GnomeCanvasItem *header_item, *root;
-
-	GnomeCanvasItem *white_item;
-
-	gint length_threshold;
-
-	gint rebuild_idle_id;
-	guint need_rebuild:1;
-
-	/*
-	 * Configuration settings
-	 */
-	guint draw_grid : 1;
-	guint draw_focus : 1;
-	guint row_selection_active : 1;
-
-	guint horizontal_scrolling : 1;
-
-	guint is_grouped : 1;
-	
-	char *click_to_add_message;
-	GnomeCanvasItem *click_to_add;
-	gboolean use_click_to_add;
-
-	ECursorMode cursor_mode;
-
-	int drag_get_data_row;
-	int drag_get_data_col;
-
-	int drop_row;
-	int drop_col;
-
-	int drag_row;
-	int drag_col;
-	ETableDragSourceSite *site;
-	
-	int drag_source_button_press_event_id;
-	int drag_source_motion_notify_event_id;
-} ETable;
-
-typedef struct {
-	GtkTableClass parent_class;
-
-	void        (*cursor_change)      (ETable *et, int row);
-	void        (*cursor_activated)   (ETable *et, int row);
-	void        (*selection_change)   (ETable *et);
-	void        (*double_click)       (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*right_click)        (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*click)              (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*key_press)          (ETable *et, int row, int col, GdkEvent *event);
-
-	void  (*set_scroll_adjustments)   (ETable	 *table,
-					   GtkAdjustment *hadjustment,
-					   GtkAdjustment *vadjustment);
-
-	/* Source side drag signals */
-	void (* table_drag_begin)	           (ETable	       *table,
-						    int                 row,
-						    int                 col,
-						    GdkDragContext     *context);
-	void (* table_drag_end)	           (ETable	       *table,
-					    int                 row,
-					    int                 col,
-					    GdkDragContext     *context);
-	void (* table_drag_data_get)             (ETable             *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-	void (* table_drag_data_delete)          (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context);
-	
-	/* Target side drag signals */	   
-	void (* table_drag_leave)	           (ETable	       *table,
-						    int                 row,
-						    int                 col,
-						    GdkDragContext     *context,
-						    guint               time);
-	gboolean (* table_drag_motion)           (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	gboolean (* table_drag_drop)             (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	void (* table_drag_data_received)        (ETable             *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-} ETableClass;
-
-GtkType         e_table_get_type                  (void);
-
-ETable         *e_table_construct                 (ETable               *e_table,
-						   ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-GtkWidget      *e_table_new                       (ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-
-/* Create an ETable using files. */
-ETable         *e_table_construct_from_spec_file  (ETable               *e_table,
-						   ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-GtkWidget      *e_table_new_from_spec_file        (ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-
-/* To save the state */
-gchar          *e_table_get_state                 (ETable               *e_table);
-void            e_table_save_state                (ETable               *e_table,
-						   const gchar          *filename);
-ETableState    *e_table_get_state_object          (ETable               *e_table);
-
-/* note that it is more efficient to provide the state at creation time */
-void            e_table_set_state                 (ETable               *e_table,
-						   const gchar          *state);
-void            e_table_set_state_object          (ETable               *e_table,
-						   ETableState          *state);
-void            e_table_load_state                (ETable               *e_table,
-						   const gchar          *filename);
-
-void            e_table_set_cursor_row            (ETable               *e_table,
-						   int                   row);
-
-/* -1 means we don't have the cursor. */
-int             e_table_get_cursor_row            (ETable               *e_table);
-void            e_table_selected_row_foreach      (ETable               *e_table,
-						   EForeachFunc          callback,
-						   gpointer              closure);
-gint            e_table_selected_count            (ETable               *e_table);
-EPrintable     *e_table_get_printable             (ETable               *e_table);
-
-gint            e_table_get_next_row              (ETable               *e_table,
-						   gint                  model_row);
-gint            e_table_get_prev_row              (ETable               *e_table,
-						   gint                  model_row);
-
-gint            e_table_model_to_view_row         (ETable               *e_table,
-						   gint                  model_row);
-gint            e_table_view_to_model_row         (ETable               *e_table,
-						   gint                  view_row);
-
-
-/* Drag & drop stuff. */
-/* Target */
-void            e_table_drag_get_data             (ETable               *table,
-						   int                   row,
-						   int                   col,
-						   GdkDragContext       *context,
-						   GdkAtom               target,
-						   guint32               time);
-void            e_table_drag_highlight            (ETable               *table,
-						   int                   row,
-						   int                   col); /* col == -1 to highlight entire row. */
-void            e_table_drag_unhighlight          (ETable               *table);
-void            e_table_drag_dest_set             (ETable               *table,
-						   GtkDestDefaults       flags,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_table_drag_dest_set_proxy       (ETable               *table,
-						   GdkWindow            *proxy_window,
-						   GdkDragProtocol       protocol,
-						   gboolean              use_coordinates);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-void            e_table_drag_dest_unset           (GtkWidget            *widget);
-
-/* Source side */
-void            e_table_drag_source_set           (ETable               *table,
-						   GdkModifierType       start_button_mask,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_table_drag_source_unset         (ETable               *table);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-GdkDragContext *e_table_drag_begin                (ETable               *table,
-						   int                   row,
-						   int                   col,
-						   GtkTargetList        *targets,
-						   GdkDragAction         actions,
-						   gint                  button,
-						   GdkEvent             *event);
-
-/* selection stuff */
-void            e_table_select_all                (ETable               *table);
-void            e_table_invert_selection          (ETable               *table);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_H_ */
-
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
deleted file mode 100644
index 0658cef7db..0000000000
--- a/widgets/table/e-tree-model.c
+++ /dev/null
@@ -1,1811 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-model.c: a Tree Model
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * Adapted from the gtree code and ETableModel.
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gtk/gtksignal.h>
-#include <stdlib.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-tree-model.h"
-
-#define ETM_CLASS(e) ((ETreeModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreePath))
-
-static ETableModel *e_tree_model_parent_class;
-
-struct ETreeModelPriv {
-	GMemChunk  *node_chunk;
-	ETreePath  *root;
-	gboolean    root_visible;
-	GArray     *row_array; /* used in the mapping between ETable and our tree */
-	GHashTable *expanded_state; /* used for loading/saving expanded state */
-	GString    *sort_group;	/* for caching the last sort group info */
-	gboolean    expanded_default; /* whether nodes are created expanded or collapsed by default */
-	gint        frozen;
-};
-
-struct ETreePath {
-	gboolean             expanded;
-	gboolean             expanded_set;
-	guint                visible_descendents;
-	char                *save_id;
-	ETreePathCompareFunc compare;
-	gpointer             node_data;
-
-	/* parent/child/sibling pointers */
-	ETreePath           *parent;
-	ETreePath           *next_sibling;
-	ETreePath           *prev_sibling;
-	ETreePath           *first_child;
-	ETreePath           *last_child;
-	guint32              num_children;
-};
-
-enum {
-	NODE_CHANGED,
-	NODE_INSERTED,
-	NODE_REMOVED,
-	NODE_COLLAPSED,
-	NODE_EXPANDED,
-	LAST_SIGNAL
-};
-
-static guint e_tree_model_signals [LAST_SIGNAL] = {0, };
-
-static void add_visible_descendents_to_array (ETreeModel *etm, ETreePath *node, int *row, int *count);
-
-
-/* ETreePath functions */
-
-static int
-e_tree_path_depth (ETreePath *path)
-{
-	int depth = 0;
-	while (path) {
-		depth ++;
-		path = path->parent;
-	}
-	return depth;
-}
-
-static void
-e_tree_path_insert (ETreePath *parent, int position, ETreePath *child)
-{
-	g_return_if_fail (position <= parent->num_children || position == -1);
-
-	child->parent = parent;
-
-	if (parent->first_child == NULL)
-		parent->first_child = child;
-
-	if (position == -1 || position == parent->num_children) {
-		child->prev_sibling = parent->last_child;
-		if (parent->last_child)
-			parent->last_child->next_sibling = child;
-		parent->last_child = child;
-	}
-	else {
-		ETreePath *c;
-		for (c = parent->first_child; c; c = c->next_sibling) {
-			if (position == 0) {
-				child->next_sibling = c;
-				child->prev_sibling = c->prev_sibling;
-
-				if (child->next_sibling)
-					child->next_sibling->prev_sibling = child;
-				if (child->prev_sibling)
-					child->prev_sibling->next_sibling = child;
-
-				if (parent->first_child == c)
-					parent->first_child = child;
-				break;
-			}
-			position --;
-		}
-	}
-
-	parent->num_children++;
-}
-
-static void
-e_tree_path_unlink (ETreePath *path)
-{
-	ETreePath *parent = path->parent;
-
-	/* unlink first/last child if applicable */
-	if (parent) {
-		if (path == parent->first_child)
-			parent->first_child = path->next_sibling;
-		if (path == parent->last_child)
-			parent->last_child = path->prev_sibling;
-
-		parent->num_children --;
-	}
-
-	/* unlink prev/next sibling links */
-	if (path->next_sibling)
-		path->next_sibling->prev_sibling = path->prev_sibling;
-	if (path->prev_sibling)
-		path->prev_sibling->next_sibling = path->next_sibling;
-
-	path->parent = NULL;
-	path->next_sibling = NULL;
-	path->prev_sibling = NULL;
-}
-
-/**
- * e_tree_model_node_traverse:
- * @model: 
- * @path: 
- * @func: 
- * @data: 
- * 
- * 
- **/
-void
-e_tree_model_node_traverse (ETreeModel *model, ETreePath *path, ETreePathFunc func, gpointer data)
-{
-	ETreePath *child;
-
-	g_return_if_fail (path);
-
-	child = path->first_child;
-
-	while (child) {
-		ETreePath *next_child = child->next_sibling;
-		e_tree_model_node_traverse (model, child, func, data);
-		if (func (model, child, data) == TRUE)
-			return;
-
-		child = next_child;
-	}
-}
-
-
-
-/**
- * e_tree_model_freeze:
- * @etm: the ETreeModel to freeze.
- * 
- * This function prepares an ETreeModel for a period of much change.
- * All signals regarding changes to the tree are deferred until we
- * thaw the tree.
- * 
- **/
-void
-e_tree_model_freeze(ETreeModel *etm)
-{
-	ETreeModelPriv *priv = etm->priv;
-
-	priv->frozen ++;
-}
-
-/**
- * e_tree_model_thaw:
- * @etm: the ETreeModel to thaw.
- * 
- * This function thaws an ETreeModel.  All the defered signals can add
- * up to a lot, we don't know - so we just emit a model_changed
- * signal.
- * 
- **/
-void
-e_tree_model_thaw(ETreeModel *etm)
-{
-	ETreeModelPriv *priv = etm->priv;
-
-	if (priv->frozen > 0)
-		priv->frozen --;
-	if (priv->frozen == 0) {
-		e_table_model_changed(E_TABLE_MODEL(etm));
-	}
-}
-
-
-/* virtual methods */
-
-static void
-etree_destroy (GtkObject *object)
-{
-	ETreeModel *etree = E_TREE_MODEL (object);
-	ETreeModelPriv *priv = etree->priv;
-
-	/* XXX lots of stuff to free here */
-
-	if (priv->root)
-		e_tree_model_node_remove (etree, priv->root);
-
-	g_array_free (priv->row_array, TRUE);
-	g_hash_table_destroy (priv->expanded_state);
-
-	g_string_free(priv->sort_group, TRUE);
-
-	g_free (priv);
-
-	GTK_OBJECT_CLASS (e_tree_model_parent_class)->destroy (object);
-}
-
-static ETreePath*
-etree_get_root (ETreeModel *etm)
-{
-	ETreeModelPriv *priv = etm->priv;
-	return priv->root;
-}
-
-static ETreePath*
-etree_get_parent (ETreeModel *etm, ETreePath *path)
-{
-	g_return_val_if_fail (path, NULL);
-	
-	return path->parent;
-}
-
-static ETreePath*
-etree_get_next (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail (node, NULL);
-
-	return node->next_sibling;
-}
-
-static ETreePath*
-etree_get_prev (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail (node, NULL);
-
-	return node->prev_sibling;
-}
-
-static ETreePath*
-etree_get_first_child (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail (node, NULL);
-
-	return node->first_child;
-}
-
-static ETreePath*
-etree_get_last_child (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail (node, NULL);
-
-	return node->last_child;
-}
-
-static guint
-etree_get_children (ETreeModel *etm, ETreePath* node, ETreePath ***paths)
-{
-	guint n_children;
-
-	g_return_val_if_fail (node, 0);
-
-	n_children = node->num_children;
-
-	if (paths) {
-		ETreePath *p;
-		int i = 0;
-		(*paths) = g_malloc (sizeof (ETreePath*) * n_children);
-		for (p = node->first_child; p; p = p->next_sibling) {
-			(*paths)[i++] = p;
-		}
-	}
-
-	return n_children;
-}
-
-static gboolean
-etree_is_expanded (ETreeModel *etm, ETreePath* node)
-{
-	g_return_val_if_fail (node, FALSE);
-	
-	return node->expanded;
-}
-
-static gboolean
-etree_is_visible (ETreeModel *etm, ETreePath* node)
-{
-	g_return_val_if_fail (node, FALSE);
-
-	for (node = node->parent; node; node = node->parent) {
-		if (!node->expanded)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-etree_set_expanded (ETreeModel *etm, ETreePath* node, gboolean expanded)
-{
-	ETreeModelPriv *priv = etm->priv;
-	ETreePath *child;
-	int row;
-
-	g_return_if_fail (node);
-
-	node->expanded_set = TRUE;
-
-	if (node->expanded == expanded)
-		return;
-
-	if (expanded) {
-		gboolean allow_expand = TRUE;
-		e_tree_model_node_expanded (etm, node, &allow_expand);
-		if (!allow_expand)
-			return;
-	}
-
-	node->expanded = expanded;
-	if (node->save_id) {
-		g_hash_table_insert (priv->expanded_state, node->save_id, (gpointer)expanded);
-	}
-
-	/* if the node wasn't visible at present */
-	if ((row = e_tree_model_row_of_node (etm, node)) == -1) {
-		if (!expanded) {
-			e_tree_model_node_collapsed (etm, node);
-		}
-		return;
-	}
-		
-	row++;
-
-	if (expanded) {
-		ETreePath *parent;
-
-		if (e_tree_model_node_is_visible (etm, node)) {
-			node->visible_descendents = 0;
-			for (child = node->first_child; child;
-			     child = child->next_sibling) {
-				add_visible_descendents_to_array (etm, child, &row, &node->visible_descendents);
-			}
-		}
-		/* now iterate back up the tree, adding to our
-		   ancestors' visible descendents */
-
-		for (parent = node->parent; parent; parent = parent->parent) {
-			parent->visible_descendents += node->visible_descendents;
-		}
-	}
-	else {
-		int i;
-		ETreePath *parent;
-
-		if (e_tree_model_node_is_visible (etm, node)) {
-			for (i = 0; i < node->visible_descendents; i ++) {
-				priv->row_array = g_array_remove_index (priv->row_array, row);
-				e_table_model_row_deleted (E_TABLE_MODEL (etm), row);
-			}
-		}
-		/* now iterate back up the tree, subtracting from our
-		   ancestors' visible descendents */
-
-		for (parent = node->parent; parent; parent = parent->parent) {
-			parent->visible_descendents -= node->visible_descendents;
-		}
-
-		node->visible_descendents = 0;
-
-		e_tree_model_node_collapsed (etm, node);
-	}
-}
-
-/**
- * e_tree_model_set_expanded_default:
- * @etree: The ETreeModel we're setting the default expanded behavior on.
- * @expanded: Whether or not newly inserted parent nodes should be expanded by default.
- * 
- * 
- **/
-void
-e_tree_model_show_node (ETreeModel *etm, ETreePath* node)
-{
-	ETreePath *parent;
-
-	parent = e_tree_model_node_get_parent(etm, node);
-	if (parent) {
-		e_tree_model_show_node(etm, parent);
-		e_tree_model_node_set_expanded(etm, parent, TRUE);
-	}
-}
-
-void
-e_tree_model_set_expanded_default (ETreeModel *etree,
-				   gboolean expanded)
-{
-	ETreeModelPriv *priv = etree->priv;
-
-	priv->expanded_default = expanded;
-}
-
-/* fairly naive implementation */
-static void
-etree_set_expanded_recurse (ETreeModel *etm, ETreePath* node, gboolean expanded)
-{
-	ETreePath *child;
-
-	e_tree_model_node_set_expanded (etm, node, expanded);
-
-	for (child = node->first_child; child; child = child->next_sibling)
-		e_tree_model_node_set_expanded_recurse (etm, child, expanded);
-}
-
-static ETreePath *
-etree_node_at_row (ETreeModel *etree, int row)
-{
-	ETreeModelPriv *priv = etree->priv;
-
-	g_return_val_if_fail (row < priv->row_array->len, NULL);
-
-	return g_array_index (priv->row_array, ETreePath*, row);
-}
-
-
-/* ETable analogs */
-static void*
-etree_value_at (ETreeModel *etm, ETreePath* node, int col)
-{
-	/* shouldn't be called */
-	g_assert (0);
-	return NULL;
-}
-
-static GdkPixbuf*
-etree_icon_at (ETreeModel *etm, ETreePath* node)
-{
-	/* shouldn't be called */
-	g_assert (0);
-	return NULL;
-}
-
-static void
-etree_set_value_at (ETreeModel *etm, ETreePath* node, int col, const void *val)
-{
-	/* shouldn't be called */
-	g_assert (0);
-}
-
-static gboolean
-etree_is_editable (ETreeModel *etm, ETreePath* node, int col)
-{
-	/* shouldn't be called */
-	g_assert(0);
-	return FALSE;
-}
-
-
-/* ETable virtual functions we map */
-static int
-etable_row_count (ETableModel *etm)
-{
-	ETreeModel *tree = E_TREE_MODEL (etm);
-	ETreeModelPriv *priv = tree->priv;
-	return priv->row_array->len;
-}
-
-static void *
-etable_value_at (ETableModel *etm, int col, int row)
-{
-	ETreeModel *etree = E_TREE_MODEL(etm);
-	ETreeModelClass *et_class = ETM_CLASS(etm);
-	ETreePath* node = e_tree_model_node_at_row (etree, row);
-
-	if (node == NULL)
-		g_warning ("node is NULL for row %d in etable_value_at\n", row);
-
-	if (col == -1)
-		return node;
-	else if (col == -2)
-		return etm;
-	else
-		return et_class->value_at (etree, node, col);
-}
-
-static void
-etable_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETreeModel *etree = E_TREE_MODEL(etm);
-	ETreeModelClass *et_class = ETM_CLASS(etm);
-	ETreePath* node = e_tree_model_node_at_row (etree, row);
-
-	g_return_if_fail (node);
-
-	et_class->set_value_at (etree, node, col, val);
-}
-
-static gboolean
-etable_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETreeModel *etree = E_TREE_MODEL(etm);
-	ETreeModelClass *et_class = ETM_CLASS(etm);
-	ETreePath* node = e_tree_model_node_at_row (etree, row);
-
-	g_return_val_if_fail (node, FALSE);
-
-	return et_class->is_editable (etree, node, col);
-}
-
-static void
-build_sort_group(GString *out, ETreePath *node)
-{
-	if (node->parent) {
-		build_sort_group(out, node->parent);
-	}
-	g_string_sprintfa(out, "/%p", node);
-}
-
-static const char *
-etable_row_sort_group(ETableModel *etm, int row)
-{
-	ETreeModel *etree = E_TREE_MODEL(etm);
-	ETreeModelPriv *priv = etree->priv;
-	ETreePath* node = e_tree_model_node_at_row (etree, row);
-
-	g_return_val_if_fail (node, "");
-
-	g_string_truncate(priv->sort_group, 0);
-	if (node)
-		build_sort_group(priv->sort_group, node);
-
-	return priv->sort_group->str;
-}
-
-static gboolean
-etable_has_sort_group(ETableModel *etm)
-{
-	/* could optimise for the flat &/or unexpanded tree case */
-	return TRUE;
-}
-
-
-static void
-e_tree_model_class_init (GtkObjectClass *klass)
-{
-	ETableModelClass *table_class = (ETableModelClass *) klass;
-	ETreeModelClass *tree_class = (ETreeModelClass *) klass;
-
-	e_tree_model_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etree_destroy;
-
-	e_tree_model_signals [NODE_CHANGED] =
-		gtk_signal_new ("node_changed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_INSERTED] =
-		gtk_signal_new ("node_inserted",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_inserted),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_REMOVED] =
-		gtk_signal_new ("node_removed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_removed),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_COLLAPSED] =
-		gtk_signal_new ("node_collapsed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_collapsed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_EXPANDED] =
-		gtk_signal_new ("node_expanded",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_expanded),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (klass, e_tree_model_signals, LAST_SIGNAL);
-
-	table_class->row_count        = etable_row_count;
-	table_class->value_at         = etable_value_at;
-	table_class->set_value_at     = etable_set_value_at;
-	table_class->is_cell_editable = etable_is_cell_editable;
-#if 0
-	/* XX need to pass these through */
-	table_class->duplicate_value  = etable_duplicate_value;
-	table_class->free_value       = etable_free_value;
-	table_class->initialize_value = etable_initialize_value;
-	table_class->value_is_empty   = etable_value_is_empty;
-	table_class->value_to_string  = etable_value_to_string;
-	table_class->thaw             = etable_thaw;
-#endif
-
-	table_class->row_sort_group   = etable_row_sort_group;
-	table_class->has_sort_group   = etable_has_sort_group;
-
-	tree_class->get_root          = etree_get_root;
-	tree_class->get_prev          = etree_get_prev;
-	tree_class->get_next          = etree_get_next;
-	tree_class->get_first_child   = etree_get_first_child;
-	tree_class->get_last_child    = etree_get_last_child;
-	tree_class->get_parent        = etree_get_parent;
-
-	tree_class->value_at          = etree_value_at;
-	tree_class->icon_at           = etree_icon_at;
-	tree_class->set_value_at      = etree_set_value_at;
-	tree_class->is_editable       = etree_is_editable;
-
-	tree_class->get_children      = etree_get_children;
-	tree_class->is_expanded       = etree_is_expanded;
-	tree_class->is_visible        = etree_is_visible;
-	tree_class->set_expanded      = etree_set_expanded;
-	tree_class->set_expanded_recurse = etree_set_expanded_recurse;
-	tree_class->node_at_row       = etree_node_at_row;
-}
-
-static void
-e_tree_init (GtkObject *object)
-{
-	ETreeModel *etree = (ETreeModel *)object;
-	e_tree_model_construct (etree);
-}
-
-E_MAKE_TYPE(e_tree_model, "ETreeModel", ETreeModel, e_tree_model_class_init, e_tree_init, PARENT_TYPE)
-
-
-/* signals */
-
-/**
- * e_tree_model_node_changed:
- * @tree_model: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath *node)
-{
-	int row;
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	row = e_tree_model_row_of_node (tree_model, node);
-	if (row != -1)
-		e_table_model_row_changed (E_TABLE_MODEL (tree_model), row);
-
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_CHANGED], node);
-}
-
-/**
- * e_tree_model_node_inserted:
- * @tree_model: 
- * @parent_node: 
- * @inserted_node: 
- * 
- * 
- **/
-void
-e_tree_model_node_inserted (ETreeModel *tree_model,
-			    ETreePath *parent_node,
-			    ETreePath *inserted_node)
-{
-	int row;
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-
-	row = e_tree_model_row_of_node (tree_model, inserted_node);
-	if (row != -1)
-		e_table_model_row_inserted (E_TABLE_MODEL (tree_model), row);
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_INSERTED],
-			 parent_node, inserted_node);
-}
-
-/**
- * e_tree_model_node_removed:
- * @tree_model: 
- * @parent_node: 
- * @removed_node: 
- * 
- * 
- **/
-void
-e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath *parent_node, ETreePath *removed_node)
-{
-	int row;
-
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-
-	row = e_tree_model_row_of_node (tree_model, removed_node);
-	if (row != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (tree_model), row);
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_REMOVED],
-			 parent_node, removed_node);
-}
-
-/**
- * e_tree_model_node_collapsed:
- * @tree_model: 
- * @node: 
- * 
- * 
- **/
-void
-e_tree_model_node_collapsed (ETreeModel *tree_model, ETreePath *node)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_COLLAPSED],
-			 node);
-}
-
-/**
- * e_tree_model_node_expanded:
- * @tree_model: 
- * @node: 
- * @allow_expand: 
- * 
- * 
- **/
-void
-e_tree_model_node_expanded  (ETreeModel *tree_model, ETreePath *node, gboolean *allow_expand)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_EXPANDED],
-			 node, allow_expand);
-}
-
-
-
-/**
- * e_tree_model_construct:
- * @etree: 
- * 
- * 
- **/
-void
-e_tree_model_construct (ETreeModel *etree)
-{
-	ETreeModelPriv *priv;
-
-	g_return_if_fail (etree != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (etree));
-
-	priv = g_new0 (ETreeModelPriv, 1);
-	etree->priv = priv;
-
-	priv->node_chunk = g_mem_chunk_create (ETreePath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-	priv->root = NULL;
-	priv->root_visible = TRUE;
-	priv->row_array = g_array_new (FALSE, FALSE, sizeof(ETreePath*));
-	priv->expanded_state = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->sort_group = g_string_new("");
-	priv->frozen = 0;
-}
-
-/**
- * e_tree_model_new
- *
- * XXX docs here.
- *
- * return values: a newly constructed ETreeModel.
- */
-ETreeModel *
-e_tree_model_new ()
-{
-	ETreeModel *et;
-
-	et = gtk_type_new (e_tree_model_get_type ());
-
-	return et;
-}
-
-/**
- * e_tree_model_get_root
- * @etree: the ETreeModel of which we want the root node.
- *
- * Accessor for the root node of @etree.
- *
- * return values: the ETreePath corresponding to the root node.
- */
-ETreePath *
-e_tree_model_get_root (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->get_root(etree);
-}
-
-/**
- * e_tree_model_node_at_row
- * @etree: the ETreeModel.
- * @row: 
- *
- * XXX docs here.
- *
- * return values: the ETreePath corresponding to @row.
- */
-ETreePath *
-e_tree_model_node_at_row (ETreeModel *etree, int row)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->node_at_row (etree, row);
-}
-
-/**
- * e_tree_model_icon_of_node
- * @etree: The ETreeModel.
- * @path: The ETreePath to the node we're getting the icon of.
- *
- * XXX docs here.
- *
- * return values: the GdkPixbuf associated with this node.
- */
-GdkPixbuf *
-e_tree_model_icon_of_node (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->icon_at (etree, path);
-}
-
-/**
- * e_tree_model_row_of_node
- * @etree: The ETreeModel.
- * @node: The node whose row we're looking up.
- *
- * return values: an int.
- */
-int
-e_tree_model_row_of_node (ETreeModel *etree, ETreePath *node)
-{
-	ETreeModelPriv *priv;
-	int i;
-
-	g_return_val_if_fail (etree != NULL, 0);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), 0);
-
-	priv = etree->priv;
-	for (i = 0; i < priv->row_array->len; i ++)
-		if (g_array_index (priv->row_array, ETreePath*, i) == node)
-			return i;
-
-	return -1;
-}
-
-/**
- * e_tree_model_root_node_set_visible
- *
- * return values: none
- */
-void
-e_tree_model_root_node_set_visible (ETreeModel *etm, gboolean visible)
-{
-	ETreeModelPriv *priv;
-
-	g_return_if_fail (etm != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (etm));
-
-	priv = etm->priv;
-	if (visible != priv->root_visible) {
-		priv->root_visible = visible;
-		if (priv->root) {
-			if (visible) {
-				priv->row_array = g_array_insert_val (priv->row_array, 0, priv->root);
-			}
-			else {
-				ETreePath *root_path = e_tree_model_get_root (etm);
-				e_tree_model_node_set_expanded (etm, root_path, TRUE);
-				priv->row_array = g_array_remove_index (priv->row_array, 0);
-			}
-			
-			e_table_model_changed (E_TABLE_MODEL (etm));
-		}
-	}
-}
-
-/**
- * e_tree_model_root_node_is_visible:
- * @etm: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_root_node_is_visible (ETreeModel *etm)
-{
-	ETreeModelPriv *priv;
-
-	g_return_val_if_fail (etm != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etm), FALSE);
-
-	priv = etm->priv;
-	return priv->root_visible;
-}
-
-/**
- * e_tree_model_node_get_first_child:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath *node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->get_first_child(etree, node);
-}
-
-/**
- * e_tree_model_node_get_last_child:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath *node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->get_last_child(etree, node);
-}
-
-
-/**
- * e_tree_model_node_get_next:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_get_next (ETreeModel *etree, ETreePath *node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->get_next(etree, node);
-}
-
-/**
- * e_tree_model_node_get_prev:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_get_prev (ETreeModel *etree, ETreePath *node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	return ETM_CLASS(etree)->get_prev(etree, node);
-}
-
-/**
- * e_tree_model_node_depth:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-guint
-e_tree_model_node_depth (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail (etree != NULL, 0);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), 0);
-
-	return e_tree_path_depth (path) - 1;
-}
-
-/**
- * e_tree_model_node_get_parent:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_get_parent (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail(etree != NULL, NULL);
-	return ETM_CLASS(etree)->get_parent(etree, path);
-}
-
-/**
- * e_tree_model_node_is_root:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_root (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-	return (e_tree_model_node_depth (etree, path) == 0);
-}
-
-/**
- * e_tree_model_node_is_expandable:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-	return (e_tree_model_node_get_children (etree, path, NULL) > 0);
-}
-
-/**
- * e_tree_model_node_is_expanded:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_expanded (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-	return ETM_CLASS(etree)->is_expanded (etree, path);
-}
-
-/**
- * e_tree_model_node_is_visible:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_visible (ETreeModel *etree, ETreePath *path)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-	return ETM_CLASS(etree)->is_visible (etree, path);
-}
-
-/**
- * e_tree_model_node_set_expanded:
- * @etree: 
- * @path: 
- * @expanded: 
- * 
- * 
- **/
-void
-e_tree_model_node_set_expanded (ETreeModel *etree, ETreePath *path, gboolean expanded)
-{
-	g_return_if_fail(etree != NULL);
-	ETM_CLASS(etree)->set_expanded (etree, path, expanded);
-}
-
-/**
- * e_tree_model_node_set_expanded_recurse:
- * @etree: 
- * @path: 
- * @expanded: 
- * 
- * 
- **/
-void
-e_tree_model_node_set_expanded_recurse (ETreeModel *etree, ETreePath *path, gboolean expanded)
-{
-	g_return_if_fail(etree != NULL);
-	ETM_CLASS(etree)->set_expanded_recurse (etree, path, expanded);
-}
-
-guint
-e_tree_model_node_get_children (ETreeModel *etree, ETreePath *path, ETreePath ***paths)
-{
-	g_return_val_if_fail(etree != NULL, 0);
-	return ETM_CLASS(etree)->get_children (etree, path, paths);
-}
-
-/**
- * e_tree_model_node_num_visible_descendents:
- * @etm: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-guint
-e_tree_model_node_num_visible_descendents (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail(node != NULL, 0);
-	return node->visible_descendents;
-}
-
-/**
- * e_tree_model_node_get_data:
- * @etm: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_tree_model_node_get_data (ETreeModel *etm, ETreePath *node)
-{
-	g_return_val_if_fail (node, NULL);
-
-	return node->node_data;
-}
-
-/**
- * e_tree_model_node_set_data:
- * @etm: 
- * @node: 
- * @node_data: 
- * 
- * 
- **/
-void
-e_tree_model_node_set_data (ETreeModel *etm, ETreePath *node, gpointer node_data)
-{
-	g_return_if_fail (node);
-
-	node->node_data = node_data;
-}
-
-/**
- * e_tree_model_node_insert:
- * @tree_model: 
- * @parent_path: 
- * @position: 
- * @node_data: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath*
-e_tree_model_node_insert (ETreeModel *tree_model,
-			  ETreePath *parent_path,
-			  int position,
-			  gpointer node_data)
-{
-	ETreeModelPriv *priv;
-	ETreePath *new_path;
-
-	g_return_val_if_fail(tree_model != NULL, NULL);
-
-	priv = tree_model->priv;
-
-	g_return_val_if_fail (parent_path != NULL || priv->root == NULL, NULL);
-
-	priv = tree_model->priv;
-
-	new_path = g_chunk_new0 (ETreePath, priv->node_chunk);
-
-	new_path->expanded = FALSE;
-	new_path->node_data = node_data;
-
-	if (parent_path != NULL) {
-
-		if (parent_path->first_child == NULL
-		    && !parent_path->expanded_set) {
-			e_tree_model_node_set_expanded (tree_model,
-							parent_path,
-							priv->expanded_default);
-		}
-
-		e_tree_path_insert (parent_path, position, new_path);
-
-		if (e_tree_model_node_is_visible (tree_model, new_path)) {
-			int parent_row, child_offset = 0;
-			ETreePath *n;
-
-			/* we need to iterate back up to the root, incrementing the number of visible
-			   descendents */
-			for (n = parent_path; n; n = n->parent) {
-				n->visible_descendents ++;
-			}
-				
-			/* determine if we are inserting at the end of this parent */
-			if (position == -1 || position == parent_path->num_children) {
-				position = e_tree_model_node_num_visible_descendents (tree_model, parent_path) - 1;
-			} else {
-				/* if we're not inserting at the end of the array, position is the child node we're
-				   inserting at, not the absolute row position - need to count expanded nodes before it too */
-				int i = position;
-
-				n = e_tree_model_node_get_first_child(tree_model, parent_path);
-				while (n != NULL && i > 0) {
-					child_offset += n->visible_descendents;
-					n = n->next_sibling;
-					i--;
-				}
-			}
-
-
-			/* if the parent is the root, no need to search for its position since it aint there */
-			if (parent_path->parent == NULL) {
-				parent_row = -1;
-			} else {
-				parent_row = e_tree_model_row_of_node (tree_model, parent_path);
-			}
-
-			e_table_model_pre_change(E_TABLE_MODEL(tree_model));
-
-			priv->row_array = g_array_insert_val (priv->row_array,
-							      parent_row + position + 1 + child_offset, new_path);
-
-			/* only do this if we know a changed signal isn't coming later on */
-			if (priv->frozen == 0)
-				e_table_model_row_inserted (E_TABLE_MODEL(tree_model), parent_row + position + 1 + child_offset);
-		}
-
-		if (parent_path->compare)
-			e_tree_model_node_sort (tree_model, parent_path);
-	}
-	else {
-		priv->root = new_path;
-		if (priv->root_visible) {
-			priv->row_array = g_array_insert_val (priv->row_array, 0, priv->root);
-			e_table_model_row_inserted (E_TABLE_MODEL (tree_model), 0);
-		}
-		else {
-			/* need to mark the new node as expanded or
-                           we'll never see it's children */
-			new_path->expanded = TRUE;
-			new_path->expanded_set = TRUE;
-		}
-	}
-
-	return new_path;
-}
-
-/**
- * e_tree_model_node_insert_id:
- * @tree_model: 
- * @parent_path: 
- * @position: 
- * @node_data: 
- * @save_id: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath*
-e_tree_model_node_insert_id (ETreeModel *tree_model,
-			     ETreePath *parent_path,
-			     int position,
-			     gpointer node_data,
-			     const char *save_id)
-{
-	ETreePath *path;
-
-	g_return_val_if_fail(tree_model != NULL, NULL);
-
-	path = e_tree_model_node_insert (tree_model, parent_path, position, node_data);
-
-	e_tree_model_node_set_save_id (tree_model, path, save_id);
-
-	return path;
-}
-
-/**
- * e_tree_model_node_insert_before:
- * @etree: 
- * @parent: 
- * @sibling: 
- * @node_data: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath *
-e_tree_model_node_insert_before (ETreeModel *etree,
-				 ETreePath *parent,
-				 ETreePath *sibling,
-				 gpointer node_data)
-{
-	ETreePath *child;
-	int position = 0;
-
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	for (child = parent->first_child; child; child = child->next_sibling) {
-		if (child == sibling)
-			break;
-		position ++;
-	}
-	return e_tree_model_node_insert (etree, parent, position, node_data);
-}
-
-/* just blows away child data, doesn't take into account unlinking/etc */
-static void
-child_free(ETreeModel *etree, ETreePath *node)
-{
-	ETreePath *child, *next;
-	ETreeModelPriv *priv = etree->priv;
-
-	child = node->first_child;
-	while (child) {
-		next = child->next_sibling;
-		child_free(etree, child);
-		child = next;
-	}
-
-	if (node->save_id) {
-		g_hash_table_remove(priv->expanded_state, node->save_id);
-		g_free(node->save_id);
-	}
-	g_chunk_free(node, priv->node_chunk);
-}
-
-/**
- * e_tree_model_node_remove:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_tree_model_node_remove (ETreeModel *etree, ETreePath *path)
-{
-	ETreeModelPriv *priv = etree->priv;
-	ETreePath *parent = path->parent;
-	gpointer ret = path->node_data;
-	int row, visible = 0, base = 0;
-	gboolean dochanged;
-
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	/* work out what range of visible rows to remove */
-	if (parent) {
-		if (e_tree_model_node_is_visible(etree, path)) {
-			base = e_tree_model_row_of_node(etree, path);
-			visible = path->visible_descendents + 1;
-		}
-	} else if (path == priv->root) {
-		priv->root = NULL;
-		if (priv->root_visible) {
-			base = 0;
-			visible = path->visible_descendents + 1;
-		} else {
-			base = 0;
-			visible = path->visible_descendents;
-		}
-	} else {
-		g_warning("Trying to remove invalid path %p", path);
-		return NULL;
-	}
-
-	/* unlink this node - we only have to unlink the root node being removed,
-	   since the others are only references from this node */
-	e_tree_path_unlink (path);
-
-	/*printf("removing %d nodes from position %d\n", visible, base);*/
-
-	if (visible > 0) {
-		/* fix up the parent visible counts */
-		for (; parent; parent = parent->parent) {
-			parent->visible_descendents -= visible;
-		}
-
-		/* if we have a lot of nodes to remove, then we dont row_deleted each one */
-		/* could probably be tuned, but this'll do, since its normally only when we
-		   remove the whole lot do we really care */
-		dochanged = (visible > 1000) || (visible > (priv->row_array->len / 4));
-
-		e_table_model_pre_change(E_TABLE_MODEL (etree));
-
-		/* and physically remove them */
-		if (visible == priv->row_array->len) {
-			g_array_set_size(priv->row_array, 0);
-		} else {
-			memmove(&g_array_index(priv->row_array, ETreePath *, base),
-				&g_array_index(priv->row_array, ETreePath *, base+visible),
-				(priv->row_array->len - (base+visible)) * sizeof(ETreePath *));
-			g_array_set_size(priv->row_array, priv->row_array->len - visible);
-		}
-
-		/* tell the system we've removed (these) nodes */
-		if (priv->frozen == 0) {
-			if (dochanged) {
-				e_table_model_changed(E_TABLE_MODEL(etree));
-			} else {
-				for (row=visible-1;row>=0;row--) {
-					e_table_model_row_deleted(E_TABLE_MODEL(etree), row+base);
-				}
-			}
-		}
-	}
-
-	child_free(etree, path);
-
-	return ret;
-}
-
-static void
-add_visible_descendents_to_array (ETreeModel *etm, ETreePath *node, int *row, int *count)
-{
-	ETreeModelPriv *priv = etm->priv;
-
-	/* add a row for this node */
-	e_table_model_pre_change(E_TABLE_MODEL (etm));
-	priv->row_array = g_array_insert_val (priv->row_array, (*row), node);
-	if (priv->frozen == 0)
-		e_table_model_row_inserted (E_TABLE_MODEL (etm), (*row));
-	(*row) ++;
-	(*count) ++;
-
-	/* then loop over its children, calling this routine for each
-           of them */
-	if (node->expanded) {
-		ETreePath *child;
-		for (child = node->first_child; child;
-		     child = child->next_sibling) {
-			add_visible_descendents_to_array (etm, child, row, count);
-		}
-	}
-}
-
-static void
-save_expanded_state_func (char *key, gboolean expanded, gpointer user_data)
-{
-	if (expanded) {
-		xmlNode *root = (xmlNode*)user_data;
-		xmlNode *node_root = xmlNewNode (NULL, (xmlChar*) "node");
-
-		xmlAddChild (root, node_root);
-		xmlNewChild (node_root, NULL, (xmlChar *) "id", (xmlChar*) key);
-	}
-}
-
-/**
- * e_tree_model_save_expanded_state:
- * @etm: 
- * @filename: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_save_expanded_state (ETreeModel *etm, const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	int fd, rv;
-	xmlChar *buf;
-	int buf_size;
-	ETreeModelPriv *priv = etm->priv;
-
-	g_return_val_if_fail(etm != NULL, FALSE);
-
-	doc = xmlNewDoc ((xmlChar*) "1.0");
-	root = xmlNewDocNode (doc, NULL,
-			      (xmlChar *) "expanded_state",
-			      NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_hash_table_foreach (priv->expanded_state,
-			      (GHFunc)save_expanded_state_func,
-			      root);
-
-	fd = open (filename, O_CREAT | O_TRUNC | O_WRONLY, 0777);
-
-	xmlDocDumpMemory (doc, &buf, &buf_size);
-
-	if (buf == NULL) {
-		g_error ("Failed to write %s: xmlBufferCreate() == NULL", filename);
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new %s: %d\n", filename, errno);
-		unlink (filename);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-/**
- * e_tree_model_load_expanded_state:
- * @etm: 
- * @filename: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_load_expanded_state (ETreeModel *etm, const char *filename)
-{
-	ETreeModelPriv *priv = etm->priv;
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
-	g_return_val_if_fail(etm != NULL, FALSE);
-
-	doc = xmlParseFile (filename);
-	if (!doc)
-		return FALSE;
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "expanded_state")) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *id;
-
-		if (strcmp (child->name, "node")) {
-			g_warning ("unknown node '%s' in %s", child->name, filename);
-			continue;
-		}
-
-		id = get_string_value (child, "id");
-
-		g_hash_table_insert (priv->expanded_state, id, (gpointer)TRUE);
-	}
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-
-/**
- * e_tree_model_node_set_save_id:
- * @etm: 
- * @node: 
- * @id: 
- * 
- * 
- **/
-void
-e_tree_model_node_set_save_id (ETreeModel *etm, ETreePath *node, const char *id)
-{
-	char *key;
-	gboolean expanded_state;
-	ETreeModelPriv *priv;
-
-	g_return_if_fail(etm != NULL);
-	g_return_if_fail (E_TREE_MODEL (etm));
-	g_return_if_fail (node);
-
-	priv = etm->priv;
-
-	if (g_hash_table_lookup_extended (priv->expanded_state,
-					  id, (gpointer*)&key, (gpointer*)&expanded_state)) {
-
-		e_tree_model_node_set_expanded (etm, node,
-						expanded_state);
-
-		/* important that this comes after the e_tree_model_node_set_expanded */
-		node->save_id = key;
-	}
-	else {
-		node->save_id = g_strdup (id);
-
-		g_hash_table_insert (priv->expanded_state, node->save_id, (gpointer)node->expanded);
-	}
-}
-
-
-
-/**
- * e_tree_model_node_set_compare_function:
- * @tree_model: 
- * @node: 
- * @compare: 
- * 
- * 
- **/
-void
-e_tree_model_node_set_compare_function (ETreeModel *tree_model,
-					ETreePath *node,
-					ETreePathCompareFunc compare)
-{
-	gboolean need_sort;
-
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_TREE_MODEL (tree_model));
-	g_return_if_fail (node);
-
-	need_sort = (compare != node->compare);
-
-	node->compare = compare;
-
-	if (need_sort)
-		e_tree_model_node_sort (tree_model, node);
-}
-
-typedef struct {
-	ETreeModel *model;
-	ETreePath *path;
-	ETreePathCompareFunc compare;
-	gboolean was_expanded;
-} ETreeSortInfo;
-
-static gint
-e_tree_model_node_compare (ETreeSortInfo *info1, ETreeSortInfo *info2)
-{
-	return info1->compare (info1->model, info1->path, info2->path);
-}
-
-/**
- * e_tree_model_node_sort:
- * @tree_model: 
- * @node: 
- * 
- * 
- **/
-void
-e_tree_model_node_sort (ETreeModel *tree_model,
-			ETreePath *node)
-{
-	int num_nodes = node->num_children;
-	ETreeSortInfo *sort_info;
-	int i;
-	int child_index;
-	gboolean node_expanded;
-	ETreeModelPriv *priv = tree_model->priv;;
-
-	node_expanded = e_tree_model_node_is_expanded (tree_model, node);
-
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_TREE_MODEL (tree_model));
-	g_return_if_fail (node);
-
-	g_return_if_fail (node->compare);
-
-	if (num_nodes == 0)
-		return;
-
-	e_table_model_pre_change(E_TABLE_MODEL (tree_model));
-
-	sort_info = g_new (ETreeSortInfo, num_nodes);
-
-	child_index = e_tree_model_row_of_node (tree_model, node) + 1;
-
-	/* collect our info and remove the children */
-	for (i = 0; i < num_nodes; i ++) {
-		sort_info[i].path = node->first_child;
-		sort_info[i].was_expanded = e_tree_model_node_is_expanded (tree_model, sort_info[i].path);
-		sort_info[i].model = tree_model;
-		sort_info[i].compare = node->compare;
-
-		e_tree_model_node_set_expanded(tree_model, sort_info[i].path, FALSE);
-		if (node_expanded)
-			priv->row_array = g_array_remove_index (priv->row_array, child_index);
-		e_tree_path_unlink (sort_info[i].path);
-	}
-
-	/* sort things */
-	qsort (sort_info, num_nodes, sizeof(ETreeSortInfo), (GCompareFunc)e_tree_model_node_compare);
-	
-	/* reinsert the children nodes into the tree in the sorted order */
-	for (i = 0; i < num_nodes; i ++) {
-		e_tree_path_insert (node, i, sort_info[i].path);
-		if (node_expanded)
-			priv->row_array = g_array_insert_val (priv->row_array, child_index + i,
-							      sort_info[i].path);
-	}
-
-	/* make another pass expanding the children as needed.  
-
-	   XXX this used to be in the loop above, but a recent change
-	   (either here or in the etable code) causes an assertion and
-	   a crash */
-	for (i = 0; i < num_nodes; i ++) {
-		e_tree_model_node_set_expanded (tree_model, sort_info[i].path, sort_info[i].was_expanded);
-	}
-
-	g_free (sort_info);
-
-	if (priv->frozen == 0)
-		e_table_model_changed (E_TABLE_MODEL (tree_model));
-}
-
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
deleted file mode 100644
index 50bd8064a5..0000000000
--- a/widgets/table/e-tree-model.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_MODEL_H_
-#define _E_TREE_MODEL_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TREE_MODEL_TYPE        (e_tree_model_get_type ())
-#define E_TREE_MODEL(o)          (GTK_CHECK_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
-#define E_TREE_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass))
-#define E_IS_TREE_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TREE_MODEL_TYPE))
-#define E_IS_TREE_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_MODEL_TYPE))
-
-typedef struct ETreePath ETreePath;
-typedef struct ETreeModel ETreeModel;
-typedef struct ETreeModelPriv ETreeModelPriv;
-typedef struct ETreeModelClass ETreeModelClass;
-typedef gint (*ETreePathCompareFunc)(ETreeModel *model, ETreePath *path1, ETreePath *path2);
-typedef gboolean (*ETreePathFunc)(ETreeModel *model, ETreePath *path, gpointer data);
-
-struct ETreeModel {
-	ETableModel base;
-	ETreeModelPriv *priv;
-};
-
-struct ETreeModelClass {
-	ETableModelClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	ETreePath *(*get_root)      (ETreeModel *etm);
-
-	ETreePath *(*get_parent)      (ETreeModel *etm, ETreePath* node);
-	ETreePath *(*get_first_child) (ETreeModel *etm, ETreePath* node);
-	ETreePath *(*get_last_child)  (ETreeModel *etm, ETreePath* node);
-	ETreePath *(*get_next)        (ETreeModel *etm, ETreePath* node);
-	ETreePath *(*get_prev)        (ETreeModel *etm, ETreePath* node);
-	guint      (*get_children)    (ETreeModel *etm, ETreePath* node, ETreePath ***paths);
-
-	gboolean   (*is_expanded)          (ETreeModel *etm, ETreePath* node);
-	gboolean   (*is_visible)           (ETreeModel *etm, ETreePath* node);
-	void       (*set_expanded)         (ETreeModel *etm, ETreePath* node, gboolean expanded);
-	void       (*set_expanded_recurse) (ETreeModel *etm, ETreePath *node, gboolean expanded);
-	void       (*set_expanded_level)   (ETreeModel *etm, ETreePath *node, gboolean expanded, int level);
-
-	GdkPixbuf *(*icon_at)              (ETreeModel *etm, ETreePath* node);
-	ETreePath* (*node_at_row)          (ETreeModel *etm, int row);
-
-	/*
-	 * ETable analogs
-	 */
-	void      *(*value_at)      (ETreeModel *etm, ETreePath* node, int col);
-	void       (*set_value_at)  (ETreeModel *etm, ETreePath* node, int col, const void *val);
-	gboolean   (*is_editable)   (ETreeModel *etm, ETreePath* node, int col);
-
-
-	/*
-	 * Signals
-	 */
-	void       (*node_changed)   (ETreeModel *etm, ETreePath *node);
-	void       (*node_inserted)  (ETreeModel *etm, ETreePath *parent, ETreePath *inserted_node);
-	void       (*node_removed)   (ETreeModel *etm, ETreePath *parent, ETreePath *removed_node);
-	void       (*node_collapsed) (ETreeModel *etm, ETreePath *node);
-	void       (*node_expanded)  (ETreeModel *etm, ETreePath *node, gboolean *allow_expand);
-
-};
-
-GtkType     e_tree_model_get_type  (void);
-void        e_tree_model_construct (ETreeModel *etree);
-ETreeModel *e_tree_model_new       (void);
-
-/* tree traversal operations */
-ETreePath *e_tree_model_get_root             (ETreeModel *etree);
-ETreePath *e_tree_model_node_get_parent      (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_last_child  (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_next        (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_prev        (ETreeModel *etree, ETreePath *path);
-
-/* node operations */
-ETreePath *e_tree_model_node_insert        (ETreeModel *etree, ETreePath *parent, int position, gpointer node_data);
-ETreePath *e_tree_model_node_insert_before (ETreeModel *etree, ETreePath *parent, ETreePath *sibling, gpointer node_data);
-gpointer   e_tree_model_node_remove        (ETreeModel *etree, ETreePath *path);
-
-/* Freeze and thaw */
-void e_tree_model_freeze (ETreeModel *etree);
-void e_tree_model_thaw (ETreeModel *etree);
-
-/* node accessors */
-gboolean e_tree_model_node_is_root                 (ETreeModel *etree, ETreePath *path);
-gboolean e_tree_model_node_is_expandable           (ETreeModel *etree, ETreePath *path);
-gboolean e_tree_model_node_is_expanded             (ETreeModel *etree, ETreePath *path);
-gboolean e_tree_model_node_is_visible              (ETreeModel *etree, ETreePath *path);
-void     e_tree_model_set_expanded_default         (ETreeModel *etree, gboolean expanded);
-void     e_tree_model_node_set_expanded            (ETreeModel *etree, ETreePath *path, gboolean expanded);
-void     e_tree_model_node_set_expanded_recurse    (ETreeModel *etree, ETreePath *path, gboolean expanded);
-guint    e_tree_model_node_get_children            (ETreeModel *etree, ETreePath *path, ETreePath ***paths);
-guint    e_tree_model_node_depth                   (ETreeModel *etree, ETreePath *path);
-guint    e_tree_model_node_num_visible_descendents (ETreeModel *etm, ETreePath *node);
-gpointer e_tree_model_node_get_data                (ETreeModel *etm, ETreePath *node);
-void     e_tree_model_node_set_data                (ETreeModel *etm, ETreePath *node, gpointer node_data);
-
-/* display oriented routines */
-ETreePath *e_tree_model_node_at_row           (ETreeModel *etree, int row);
-GdkPixbuf *e_tree_model_icon_of_node          (ETreeModel *etree, ETreePath *path);
-int        e_tree_model_row_of_node           (ETreeModel *etree, ETreePath *path);
-void       e_tree_model_root_node_set_visible (ETreeModel *etree, gboolean visible);
-gboolean   e_tree_model_root_node_is_visible  (ETreeModel *etree);
-
-/* sort routine, analogous to gtk_ctree_node_sort */
-void e_tree_model_node_set_compare_function (ETreeModel *tree_model, ETreePath *node, ETreePathCompareFunc compare);
-void e_tree_model_node_sort (ETreeModel *tree_model, ETreePath *node);
-
-/*
-** Routines for emitting signals on the ETreeModel
-*/
-void  e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath *node);
-void  e_tree_model_node_inserted (ETreeModel *tree_model, ETreePath *parent_node, ETreePath *inserted_node);
-void  e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath *parent_node, ETreePath *removed_node);
-void  e_tree_model_node_collapsed (ETreeModel *tree_model, ETreePath *node);
-void  e_tree_model_node_expanded  (ETreeModel *tree_model, ETreePath *node, gboolean *allow_expand);
-
-/* expanded state saving stuff */
-gboolean   e_tree_model_save_expanded_state (ETreeModel *etm, const char *filename);
-gboolean   e_tree_model_load_expanded_state (ETreeModel *etm, const char *filename);
-void       e_tree_model_node_set_save_id    (ETreeModel *etm, ETreePath *node, const char *id);
-ETreePath* e_tree_model_node_insert_id      (ETreeModel *tree_model, ETreePath *parent_path,
-					     int position, gpointer node_data, const char *save_id);
-
-/* depth first traversal of path's descendents, calling func on each one */
-void       e_tree_model_node_traverse (ETreeModel *model, ETreePath *path, ETreePathFunc func, gpointer data);
-
-void       e_tree_model_show_node (ETreeModel *etm, ETreePath* node);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_MODEL_H */
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
deleted file mode 100644
index 5741d1cf0f..0000000000
--- a/widgets/table/e-tree-simple.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-simple.c: a Tree Model that offers a function pointer
- * interface to using ETreeModel, similar to ETableSimple.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * (C) 2000 Ximian, Inc.  */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-tree-simple.h"
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-static int
-simple_column_count (ETableModel *etm)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->col_count)
-		return simple->col_count (etm, simple->model_data);
-	else
-		return 0;
-}
-
-/* The default for simple_duplicate_value is to return the raw value. */
-static void *
-simple_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->duplicate_value)
-		return simple->duplicate_value (etm, col, value, simple->model_data);
-	else
-		return (void *)value;
-}
-
-static void
-simple_free_value (ETableModel *etm, int col, void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->free_value)
-		simple->free_value (etm, col, value, simple->model_data);
-}
-
-static void *
-simple_initialize_value (ETableModel *etm, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->initialize_value)
-		return simple->initialize_value (etm, col, simple->model_data);
-	else
-		return NULL;
-}
-
-static gboolean
-simple_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->value_is_empty)
-		return simple->value_is_empty (etm, col, value, simple->model_data);
-	else
-		return FALSE;
-}
-
-static char *
-simple_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->value_to_string)
-		return simple->value_to_string (etm, col, value, simple->model_data);
-	else
-		return g_strdup ("");
-}
-
-static void *
-simple_value_at (ETreeModel *etm, ETreePath *node, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->value_at (etm, node, col, simple->model_data);
-}
-
-static GdkPixbuf *
-simple_icon_at (ETreeModel *etm, ETreePath *node)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->icon_at (etm, node, simple->model_data);
-}
-
-static void
-simple_set_value_at (ETreeModel *etm, ETreePath *node, int col, const void *val)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	simple->set_value_at (etm, node, col, val, simple->model_data);
-}
-
-static gboolean
-simple_is_editable (ETreeModel *etm, ETreePath *node, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->is_editable (etm, node, col, simple->model_data);
-}
-
-static void
-e_tree_simple_class_init (GtkObjectClass *object_class)
-{
-	ETreeModelClass *model_class        = (ETreeModelClass *) object_class;
-	ETableModelClass *table_model_class = (ETableModelClass *) object_class;
-
-	table_model_class->column_count     = simple_column_count;
-	table_model_class->duplicate_value  = simple_duplicate_value;
-	table_model_class->free_value       = simple_free_value;
-	table_model_class->initialize_value = simple_initialize_value;
-	table_model_class->value_is_empty   = simple_value_is_empty;
-	table_model_class->value_to_string  = simple_value_to_string;
-
-	model_class      ->icon_at          = simple_icon_at;
-	model_class      ->value_at         = simple_value_at;
-	model_class      ->set_value_at     = simple_set_value_at;
-	model_class      ->is_editable      = simple_is_editable;
-}
-
-E_MAKE_TYPE(e_tree_simple, "ETreeSimple", ETreeSimple, e_tree_simple_class_init, NULL, PARENT_TYPE)
-
-/**
- * e_tree_simple_new:
- * @col_count: 
- * @duplicate_value: 
- * @free_value: 
- * @initialize_value: 
- * @value_is_empty: 
- * @value_to_string: 
- * @icon_at: 
- * @value_at: 
- * @set_value_at: 
- * @is_editable: 
- * @model_data: 
- * 
- * This initializes a new ETreeSimpleModel object.  ETreeSimpleModel is
- * an implementaiton of the abstract class ETreeModel.  The ETreeSimpleModel
- * is designed to allow people to easily create ETreeModels without having
- * to create a new GtkType derived from ETreeModel every time they need one.
- *
- * Instead, ETreeSimpleModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETreeModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- * 
- * ETreeSimple is to ETreeModel as ETableSimple is to ETableModel.
- *
- * Return value: An ETreeSimple object (which is also an ETreeModel
- * object).
- **/
-ETreeModel *
-e_tree_simple_new  (ETableSimpleColumnCountFn     col_count,
-		    ETableSimpleDuplicateValueFn  duplicate_value,
-		    ETableSimpleFreeValueFn       free_value,
-		    ETableSimpleInitializeValueFn initialize_value,
-		    ETableSimpleValueIsEmptyFn    value_is_empty,
-		    ETableSimpleValueToStringFn   value_to_string,
-
-		    ETreeSimpleIconAtFn      	  icon_at,
-		    ETreeSimpleValueAtFn     	  value_at,
-		    ETreeSimpleSetValueAtFn  	  set_value_at,
-		    ETreeSimpleIsEditableFn  	  is_editable,
-
-		    gpointer                 	  model_data)
-{
-	ETreeSimple *etg;
-
-	etg = gtk_type_new (e_tree_simple_get_type ());
-
-	e_tree_model_construct (E_TREE_MODEL (etg));
-
-	etg->col_count        = col_count;
-	etg->duplicate_value  = duplicate_value;
-	etg->free_value       = free_value;
-	etg->initialize_value = initialize_value;
-	etg->value_is_empty   = value_is_empty;
-	etg->value_to_string  = value_to_string;
-
-	etg->icon_at          = icon_at;
-	etg->value_at         = value_at;
-	etg->set_value_at     = set_value_at;
-	etg->is_editable      = is_editable;
-
-	etg->model_data       = model_data;
-
-	return (ETreeModel*)etg;
-}
-
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
deleted file mode 100644
index 797de7c8a7..0000000000
--- a/widgets/table/e-tree-simple.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _E_TREE_SIMPLE_H_
-#define _E_TREE_SIMPLE_H_
-
-#include <gal/e-table/e-tree-model.h>
-#include <gal/e-table/e-table-simple.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TREE_SIMPLE_TYPE        (e_tree_simple_get_type ())
-#define E_TREE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TREE_SIMPLE_TYPE, ETreeSimple))
-#define E_TREE_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SIMPLE_TYPE, ETreeSimpleClass))
-#define E_IS_TREE_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_TREE_SIMPLE_TYPE))
-#define E_IS_TREE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SIMPLE_TYPE))
-
-
-typedef GdkPixbuf* (*ETreeSimpleIconAtFn)     (ETreeModel *etree, ETreePath *path, void *model_data);
-typedef void*      (*ETreeSimpleValueAtFn)    (ETreeModel *etree, ETreePath *path, int col, void *model_data);
-typedef void       (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, int col, const void *val, void *model_data);
-typedef gboolean   (*ETreeSimpleIsEditableFn) (ETreeModel *etree, ETreePath *path, int col, void *model_data);
-
-typedef struct {
-	ETreeModel parent;
-
-	/* Table methods */
-	ETableSimpleColumnCountFn     col_count;
-	ETableSimpleDuplicateValueFn  duplicate_value;
-	ETableSimpleFreeValueFn       free_value;
-	ETableSimpleInitializeValueFn initialize_value;
-	ETableSimpleValueIsEmptyFn    value_is_empty;
-	ETableSimpleValueToStringFn   value_to_string;
-
-	/* Tree methods */
-	ETreeSimpleIconAtFn icon_at;
-	ETreeSimpleValueAtFn value_at;
-	ETreeSimpleSetValueAtFn set_value_at;
-	ETreeSimpleIsEditableFn is_editable;
-
-	gpointer model_data;
-} ETreeSimple;
-
-typedef struct {
-	ETreeModelClass parent_class;
-} ETreeSimpleClass;
-
-GtkType e_tree_simple_get_type (void);
-
-ETreeModel *e_tree_simple_new  (ETableSimpleColumnCountFn     col_count,
-				ETableSimpleDuplicateValueFn  duplicate_value,
-				ETableSimpleFreeValueFn       free_value,
-				ETableSimpleInitializeValueFn initialize_value,
-				ETableSimpleValueIsEmptyFn    value_is_empty,
-				ETableSimpleValueToStringFn   value_to_string,
-				ETreeSimpleIconAtFn           icon_at,
-				ETreeSimpleValueAtFn          value_at,
-				ETreeSimpleSetValueAtFn       set_value_at,
-				ETreeSimpleIsEditableFn       is_editable,
-				gpointer                      model_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_SIMPLE_H_ */
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
deleted file mode 100644
index 754876de27..0000000000
--- a/widgets/table/e-tree-sorted-variable.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-sorted-variable.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-tree-sorted-variable.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETSV_INSERT_MAX (4)
-
-static ETreeModelClass *etsv_parent_class;
-
-struct ETreePath {
-	GNode node;
-};
-
-struct ETreeSortedVariablePrivate {
-	GNode *root;
-};
-
-static void etsv_proxy_model_changed      (ETableModel *etm, ETreeSortedVariable *etsv);
-#if 0
-static void etsv_proxy_model_row_changed  (ETableModel *etm, int row, ETreeSortedVariable *etsv);
-static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv);
-#endif
-static void etsv_sort_info_changed        (ETableSortInfo *info, ETreeSortedVariable *etsv);
-static void etsv_sort                     (ETreeSortedVariable *etsv);
-static void etsv_add                      (ETreeSortedVariable *etsv, gint                  row);
-static void etsv_add_all                  (ETreeSortedVariable *etsv);
-
-static void
-etsv_destroy (GtkObject *object)
-{
-	ETreeSortedVariable *etsv = E_TREE_SORTED_VARIABLE (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_changed_id);
-#if 0
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_row_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_cell_changed_id);
-#endif
-	gtk_signal_disconnect (GTK_OBJECT (etsv->sort_info),
-			       etsv->sort_info_changed_id);
-
-	if (etsv->sort_idle_id) {
-		g_source_remove(etsv->sort_idle_id);
-	}
-	if (etsv->insert_idle_id) {
-		g_source_remove(etsv->insert_idle_id);
-	}
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-
-	if (etsv->sort_info)
-		gtk_object_unref(GTK_OBJECT(etsv->sort_info));
-	if (etsv->full_header)
-		gtk_object_unref(GTK_OBJECT(etsv->full_header));
-
-	GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
-}
-
-static void
-etsv_class_init (GtkObjectClass *object_class)
-{
-	ETreeSortedVariableClass *etsv_class = E_TREE_MODEL_CLASS(object_class);
-
-	etsv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = etsv_destroy;
-
-	etsv_class->add = etsv_add;
-	etsv_class->add_all = etsv_add_all;
-}
-
-static void
-etsv_init (ETreeSortedVariable *etsv)
-{
-	etsv->full_header = NULL;
-	etsv->sort_info = NULL;
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-	etsv->sort_info_changed_id = 0;
-
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_tree_sorted_variable, "ETreeSortedVariable", ETreeSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE);
-
-static gboolean
-etsv_sort_idle(ETreeSortedVariable *etsv)
-{
-	gtk_object_ref(GTK_OBJECT(etsv));
-	etsv_sort(etsv);
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(etsv));
-	return FALSE;
-}
-
-static gboolean
-etsv_insert_idle(ETreeSortedVariable *etsv)
-{
-	etsv->insert_count = 0;
-	etsv->insert_idle_id = 0;
-	return FALSE;
-}
-
-
-ETableModel *
-e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETreeSortedVariable *etsv = gtk_type_new (E_TREE_SORTED_VARIABLE_TYPE);
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE (etsv);
-
-	if (e_table_subset_variable_construct (etsv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etsv));
-		return NULL;
-	}
-
-	etsv->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(etsv->sort_info));
-	etsv->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(etsv->full_header));
-
-	etsv->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-							   GTK_SIGNAL_FUNC (etsv_proxy_model_changed), etsv);
-#if 0
-	etsv->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							       GTK_SIGNAL_FUNC (etsv_proxy_model_row_changed), etsv);
-	etsv->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-								GTK_SIGNAL_FUNC (etsv_proxy_model_cell_changed), etsv);
-#endif
-	etsv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (etsv_sort_info_changed), etsv);
-
-	return E_TABLE_MODEL(etsv);
-}
-
-static void
-etsv_proxy_model_changed (ETableModel *etm, ETreeSortedVariable *etsv)
-{
-	/* FIXME: do_resort (); */
-}
-#if 0
-static void
-etsv_proxy_model_row_changed (ETableModel *etm, int row, ETreeSortedVariable *etsv)
-{
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etsv, row))
-		e_table_subset_variable_add (etsv, row);
-}
-
-static void
-etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv)
-{
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etsv, row))
-		e_table_subset_variable_add (etsv, row);
-}
-#endif
-
-static void
-etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv)
-{
-	etsv_sort(etsv);
-}
-
-/* This takes source rows. */
-static int
-etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath *path2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(etsv->full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		comp_val = (*col->compare)(e_tree_model_value_at (etsv->source, path1, col->col_idx),
-					   e_tree_model_value_at (etsv->source, path2, col->col_idx));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-
-static ETreeSortedVariable *etsv_closure;
-int cols_closure;
-int *ascending_closure;
-int *col_idx_closure;
-GCompareFunc *compare_closure;
-
-static int
-etsv_compare_closure(const ETreePath *path1, const ETreePath *path2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv_closure->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-
-		comp_val = (*(compare_closure[j]))(e_tree_model_value_at (etsv_closure->source, path1, col_idx_closure[j]),
-						   e_tree_model_value_at (etsv_closure->source, path2, col_idx_closure[j]));
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	GNode *node1 = *(GNode **)data1;
-	GNode *node2 = *(GNode **)data2;
-	return etsv_compare_closure(node1->data, node2->data);
-}
-
-static int
-qsort_callback_source(const void *data1, const void *data2)
-{
-	return etsv_compare_closure(data1, data2);
-}
-
-static void
-etsv_setup_closures(ETreeSortedVariable *etsv)
-{
-	int j;
-	int cols;
-
-	cols = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	cols_closure = cols;
-	etsv_closure = etsv;
-
-	ascending_closure = g_new(int, cols);
-	col_idx_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-
-		col = e_table_header_get_column_by_col_idx(etsv->full_header, column.column);
-		if (col == NULL) {
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		}
-
-		ascending_closure[j] = column.ascending;
-		col_idx_closure[j] = col->col_idx;
-		compare_closure[j] = col->compare;
-	}
-}
-
-static void
-etsv_free_closures(ETreeSortedVariable *etsv)
-{
-	g_free(ascending_closure);
-	g_free(col_idx_closure);
-	g_free(compare_closure);
-
-}
-
-static void
-etsv_sort_node(ETreeSortedVariable *etsv, GNode *node)
-{
-	gint n;
-	gint i;
-	GNode **children;
-	GNode *child;
-	GNode *prev;
-
-	n = g_node_n_children(node);
-	children = g_new(GNode *, n);
-	for (i = 0, child = node->children; child && i; child = child->next, i++) {
-		children[i] = child;
-	}
-	qsort(children, n, sizeof(GNode *), qsort_callback);
-
-	prev = NULL;
-	for (i = 0; i < n; i++) {
-		children[i]->prev = prev;
-		if (prev) prev->next = children[i];
-		prev = children[i];
-		children[i]->next = NULL;
-	}
-}
-
-static void
-etsv_sort_tree(ETreeSortedVariable *etsv, GNode *root)
-{
-	GNode *childr;
-
-	etsv_sort_node(etsv, node);
-	
-	for (child = node->child; child; child = child->next) {
-		etsv_sort_tree(etsv, child);
-	}
-}
-
-static void
-etsv_sort(ETreeSortedVariable *etsv)
-{
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(etsv));
-
-	etsv_setup_closures(etsv);
-
-	etsv_sort_tree(etsv, etsv->root);
-
-	etsv_free_closures(etsv);
-
-	e_table_model_changed (E_TABLE_MODEL(etsv));
-	reentering = 0;
-}
-
-static void
-etsv_add_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *root)
-{
-	GNode *node;
-	GNode *new_node;
-	for (node = root; node; node = node->next) {
-		if (e_tree_model_node_is_ancestor(etsv->source, path, node->data)) {
-			etsv_add_node(etsv, path, node->data);
-			return;
-		}
-	}
-	new_node = g_node_new(path);
-	for (node = root; node; ) {
-		if (e_tree_model_node_is_ancestor(etsv->source, node->data, path)) {
-			GNode *next;
-			next = node->next;
-			g_node_unlink(node);
-			g_node_prepend(new_node, node);
-			node = next;
-		} else
-			node = node->next;
-	}
-
-	etsv_sort_node(etsv, new_node);
-
-
-#if 0
-	g_node_prepend(root, new_node);
-	etsv_sort_node(etsv, root);
-#else
-	/* Insert sort to be a bit faster than the above prepend and then sort. */
-	for (node = root; node; node = node->next) {
-		if (etsv_compare(etsv, path, node->data) > 0) {
-			g_node_insert_before (root, node, new_node);
-			return;
-		}
-	}
-	g_node_append(root, new_node);
-#endif
-}
-
-etsv_add(ETreeSortedVariable *etsv, gint row)
-{
-	ETreeModel *source = etsv->source;
-	ETreePath *path;
-
-	path = e_table_model_value_at (E_TABLE_MODEL(source), -1, row);
-	etsv_add_node(etsv, path, etsv->root);
-}
-
-/* Optimize by doing the qsorts as we build.  But we'll do that later. */
-static void
-etsv_add_all_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *node)
-{
-	ETreeModel *source = etsv->source;
-	ETreePath **children;
-	int n;
-	int i;
-
-	n = e_tree_model_node_get_children(source, path, &children);
-	qsort(children, n, sizeof(ETreePath *), qsort_callback_source);
-
-	for (i = n - 1; i >= 0; i--) {
-		GNode *new_child = g_node_new(children[i]);
-		g_node_prepend(path, new_child);
-		etsv_add_all_node (etsv, children[i], new_child)
-	}
-
-	g_free(children);
-}
-
-static void
-etsv_add_all   (ETreeSortedVariable *etsv)
-{
-	GNode *node;
-	ETreePath *path;
-
-	e_table_model_pre_change(etm);
-
-	if (etsv->root)
-		g_node_destroy(etsv->root);
-
-	etsv_setup_closures(etsv);
-
-	path = e_tree_model_get_root(etsv->source);
-	node = g_node_new(path);
-	etsv_add_all_node(etsv, path, node);
-	etsv->root = node;
-
-	etsv_free_closures(etsv);
-
-	e_tree_model_node_changed (etsv, etsv->root);
-}
diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h
deleted file mode 100644
index a86ea9f602..0000000000
--- a/widgets/table/e-tree-sorted-variable.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_SORTED_VARIABLE_H_
-#define _E_TREE_SORTED_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-tree/e-tree-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TREE_SORTED_VARIABLE_TYPE        (e_tree_sorted_variable_get_type ())
-#define E_TREE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariable))
-#define E_TREE_SORTED_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariableClass))
-#define E_IS_TREE_SORTED_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TREE_SORTED_VARIABLE_TYPE))
-#define E_IS_TREE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SORTED_VARIABLE_TYPE))
-
-typedef struct {
-	ETreeModel base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              table_model_changed_id;
-	int              table_model_row_changed_id;
-	int              table_model_cell_changed_id;
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETreeSortedVariable;
-
-typedef struct {
-	ETreeModelClass parent_class;
-} ETreeSortedVariableClass;
-
-GtkType      e_tree_sorted_variable_get_type        (void);
-ETableModel *e_tree_sorted_variable_new             (ETreeModel          *etm,
-						     ETableHeader        *header,
-						     ETableSortInfo      *sort_info);
-
-ETreeModel  *e_tree_sorted_get_toplevel             (ETreeSortedVariable *tree_model);
-
-void         e_tree_sorted_variable_add             (ETreeSortedVariable *ets,
-						     gint                 row);
-void         e_tree_sorted_variable_add_all         (ETreeSortedVariable *ets);
-gboolean     e_tree_sorted_variable_remove          (ETreeSortedVariable *ets,
-						     gint                 row);
-void         e_tree_sorted_variable_increment       (ETreeSortedVariable *ets,
-						     gint                 position,
-						     gint                 amount);
-void         e_tree_sorted_variable_decrement       (ETreeSortedVariable *ets,
-						     gint                 position,
-						     gint                 amount);
-void         e_tree_sorted_variable_set_allocation  (ETreeSortedVariable *ets,
-						     gint                 total);
-END_GNOME_DECLS
-
-#endif /* _E_TREE_SORTED_VARIABLE_H_ */
diff --git a/widgets/table/image1.png b/widgets/table/image1.png
deleted file mode 100644
index 8326ac241f..0000000000
--- a/widgets/table/image1.png
+++ /dev/null
diff --git a/widgets/table/image2.png b/widgets/table/image2.png
deleted file mode 100644
index e6a4c75dbe..0000000000
--- a/widgets/table/image2.png
+++ /dev/null
diff --git a/widgets/table/image3.png b/widgets/table/image3.png
deleted file mode 100644
index 50e16e8620..0000000000
--- a/widgets/table/image3.png
+++ /dev/null
diff --git a/widgets/table/remove-col.xpm b/widgets/table/remove-col.xpm
deleted file mode 100644
index ff1024f0c9..0000000000
--- a/widgets/table/remove-col.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * remove_col_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"...          ...",
-".++.        .++.",
-".+++.      .+++.",
-" .+++.    .+++. ",
-"  .+++.  .+++.  ",
-"   .+++..+++.   ",
-"    .++++++.    ",
-"     .++++.     ",
-"     .++++.     ",
-"    .++++++.    ",
-"   .+++..+++.   ",
-"  .+++.  .+++.  ",
-" .+++.    .+++. ",
-".+++.      .+++.",
-".++.        .++.",
-"...          ..."};
diff --git a/widgets/table/sample.table b/widgets/table/sample.table
deleted file mode 100644
index 45c8ff0691..0000000000
--- a/widgets/table/sample.table
+++ /dev/null
@@ -1,11 +0,0 @@
-Col1	Col2	Address		Title	Dorks
-c1.a	c2.a	a.a		tit-1	DorkA
-c1.b	c2.b	a.b		tit-2	DDork
-c1.c	c2.c	a.c		tit-1	DorkB
-c1.d	c2.d	a.d		tit-2	ADork
-c1.e	c2.e	a.e		tit-1	DorkC
-c1.f	c2.f	a.f		tit-2	UDork
-c1.g	c2.g	a.g		tit-3	Dork---
-j	k	k		tit-1	DorkA
-
-
diff --git a/widgets/table/spec.xml b/widgets/table/spec.xml
deleted file mode 100644
index a8e524484c..0000000000
--- a/widgets/table/spec.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification no-headers="false" click-to-add="false"
-		     draw-grid="true" cursor-mode="simple"
-		     _click-to-add-message="">
-  <ETableColumn model_col="0" _title="Email"     expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="1" _title="Full Name" expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="2" _title="Address"   expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="3" _title="Phone"     expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableState>
-    <column source="0"/>
-    <column source="3"/>
-    <column source="1"/>
-    <column source="2"/>
-    <grouping>
-      <group column="2" ascending="true">
-	<leaf column="1" ascending="true"/>
-      </group>
-    </grouping>
-    <!-- Column that's been added by hand.  Not implemented yet.
-  <ETableColumn model_col="custom-string" _title="Custom" expansion="1.0" minimum_widgth="20" resizable="true" cell="string" compare="string"/> -->
-  </ETableState>
-</ETableSpecification>
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
deleted file mode 100644
index dd0dee4d24..0000000000
--- a/widgets/table/table-test.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <gnome.h>
-#include "gal/e-util/e-cursors.h"
-#include "table-test.h"
-
-int
-main (int argc, char *argv [])
-{
-
-	if (isatty (0)){
-		int fd;
-		
-		close (0);
-		fd = open ("sample.table", O_RDONLY);
-		if (fd == -1){
-			fprintf (stderr, "Could not find sample.table, try feeding a table on stdin");
-			exit (1);
-		}
-		dup2 (fd, 0);
-	}
-	
-	gnome_init ("TableTest", "TableTest", argc, argv);
-	e_cursors_init ();
-
-
-/*  	table_browser_test (); */
-/*  	multi_cols_test (); */
-/*  	check_test (); */
-
-	e_table_test ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h
deleted file mode 100644
index ad8cfcc083..0000000000
--- a/widgets/table/table-test.h
+++ /dev/null
@@ -1,4 +0,0 @@
-void table_browser_test (void);
-void multi_cols_test    (void);
-void check_test         (void);
-void e_table_test       (void);
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
deleted file mode 100644
index 0cf1baf48a..0000000000
--- a/widgets/table/test-check.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/util/e-util.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-
-#include "table-test.h"
-
-#define LINES 4
-
-static struct {
-	int   value;
-	char *string;
-} my_table [LINES] = {
-	{ 0, "Buy food" },
-	{ 1, "Breathe " },
-	{ 0, "Cancel gdb session with shrink" },
-	{ 1, "Make screenshots" },
-};
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return 2;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return LINES;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0)
-		return GINT_TO_POINTER (my_table [row].value);
-	else
-		return my_table [row].string;
-	
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0) {
-		my_table [row].value = GPOINTER_TO_INT (val);
-		printf ("Value at %d,%d set to %d\n", col, row, GPOINTER_TO_INT (val));
-	} else {
-		my_table [row].string = g_strdup (val);
-		printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-	}
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0) {
-		return (void *) value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col != 0) {
-		g_free (value);
-	}
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-check_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header;
-	ETableCol *col_0, *col_1;
-	ECell *cell_left_just, *cell_image_check;
-	GdkPixbuf *pixbuf;
-	GnomeCanvasItem *item;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable, 
-		duplicate_value, free_value, 
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	cell_image_check = e_cell_checkbox_new ();
-	pixbuf = gdk_pixbuf_new_from_file ("clip.png");
-	col_0 = e_table_col_new_with_pixbuf (0, pixbuf, 0.0, 18, cell_image_check, g_int_compare, TRUE);
-	gdk_pixbuf_unref (pixbuf);
-	e_table_header_add_column (e_table_header, col_0, 0);
-	
-	col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_1, 1);
-	e_table_col_set_arrow (col_1, E_TABLE_COL_ARROW_DOWN);
-
-	/*
-	 * GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-		NULL);
-	e_canvas_item_move_absolute (item, 0, 30);
-}
-
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
deleted file mode 100644
index a82dae639a..0000000000
--- a/widgets/table/test-cols.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/util/e-util.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-toggle.h"
-
-#include "table-test.h"
-
-#define LINES 4
-
-static struct {
-	int   value;
-	char *string;
-} my_table [LINES] = {
-	{ 0, "You are not" },
-	{ 1, "A beautiful and unique " },
-	{ 0, "Snowflake" },
-	{ 2, "You are not your wallet" },
-};
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return 2;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return LINES;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0)
-		return GINT_TO_POINTER (my_table [row].value);
-	else
-		return my_table [row].string;
-	
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0){
-		my_table [row].value = GPOINTER_TO_INT (val);
-		printf ("Value at %d,%d set to %d\n", col, row, GPOINTER_TO_INT (val));
-	} else {
-		my_table [row].string = g_strdup (val);
-		printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-	}
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0){
-		return (void *)value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col != 0){
-		g_free (value);
-	}
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-multi_cols_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header, *e_table_header_multiple;
-	ETableCol *col_0, *col_1;
-	ECell *cell_left_just, *cell_image_toggle;
-	GnomeCanvasItem *item;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable,
-		duplicate_value, free_value,
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	{
-		GdkPixbuf **images = g_new (GdkPixbuf *, 3);
-		int i;
-		
-		images [0] = gdk_pixbuf_new_from_file ("image1.png");
-		images [1] = gdk_pixbuf_new_from_file ("image2.png");
-		images [2] = gdk_pixbuf_new_from_file ("image3.png");
-
-		cell_image_toggle = e_cell_toggle_new (0, 3, images);
-
-		for (i = 0; i < 3; i++)
-			gdk_pixbuf_unref (images [i]);
-		
-		g_free (images);
-	} 
-					       
-	col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_1, 0);
-
-	col_0 = e_table_col_new (0, "A", 0.0, 48, cell_image_toggle, g_int_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_0, 1);
-
-	/*
-	 * Second test
-	 */
-	e_table_header_multiple = e_table_header_new ();
-	e_table_header_add_column (e_table_header_multiple, col_0, 0);
-	e_table_header_add_column (e_table_header_multiple, col_1, 1);
-	e_table_header_add_column (e_table_header_multiple, col_1, 2);
-	
-	/*
-	 * GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		NULL);
-
-	e_canvas_item_move_absolute (item, 0, 30);
-	
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header_multiple,
-		NULL);
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header_multiple,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-		NULL);
-	e_canvas_item_move_absolute (item, 300, 30);
-}
-
-
-
-
-
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
deleted file mode 100644
index 314df1000e..0000000000
--- a/widgets/table/test-table.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-canvas.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-table.h"
-#include "e-table-config.h"
-
-#include "table-test.h"
-
-char buffer [1024];
-char **column_labels;
-char ***table_data;
-int cols = 0;
-int lines = 0;
-int lines_alloc = 0;
-
-static void
-parse_headers ()
-{
-	char *p, *s;
-	int in_value = 0, i;
-	
-	fgets (buffer, sizeof (buffer)-1, stdin);
-
-	for (p = buffer; *p; p++){
-		if (*p == ' ' || *p == '\t'){
-			if (in_value){
-				cols++;
-				in_value = 0;
-			}
-		} else
-			in_value = 1;
-	}
-	if (in_value)
-		cols++;
-	
-	if (!cols){
-		fprintf (stderr, "No columns in first row\n");
-		exit (1);
-	}
-
-	column_labels = g_new0 (char *, cols);
-
-	p = buffer;
-	for (i = 0; (s = strtok (p, " \t")) != NULL; i++){
-		column_labels [i] = g_strdup (s);
-		if (strchr (column_labels [i], '\n'))
-			*strchr (column_labels [i], '\n') = 0;
-		p = NULL;
-	}
-
-	printf ("%d headers:\n", cols);
-	for (i = 0; i < cols; i++){
-		printf ("header %d: %s\n", i, column_labels [i]);
-	}
-}
-
-static char **
-load_line (char *buffer, int cols)
-{
-	char **line = g_new0 (char *, cols);
-	char *p;
-	int i;
-	
-	for (i = 0; i < cols; i++){
-		p = strtok (buffer, " \t\n");
-		if (p == NULL){
-			for (; i < cols; i++)
-				line [i] = g_strdup ("");
-			return line;
-		} else
-			line [i] = g_strdup (p);
-		buffer = NULL;
-	}
-	return line;
-}
-
-static void
-append_line (char **line)
-{
-	if (lines <= lines_alloc){
-		lines_alloc = lines + 50;
-		table_data = g_renew (char **, table_data, lines_alloc);
-	}
-	table_data [lines] = line;
-	lines++;
-}
-
-static void
-load_data ()
-{
-	int i;
-
-	{
-		static int loaded;
-
-		if (loaded)
-			return;
-		
-		loaded = TRUE;
-	}
-	
-
-	parse_headers ();
-
-	while (fgets (buffer, sizeof (buffer)-1, stdin) != NULL){
-		char **line;
-
-		if (buffer [0] == '\n')
-			continue;
-		line = load_line (buffer, cols);
-		append_line (line);
-	}
-
-	for (i = 0; i < lines; i++){
-		int j;
-
-		printf ("Line %d: ", i);
-		for (j = 0; j < cols; j++)
-			printf ("[%s] ", table_data [i][j]);
-		printf ("\n");
-	}
-}
-
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return cols;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return lines;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < cols);
-	g_assert (row < lines);
-
-	return (void *) table_data [row][col];
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < cols);
-	g_assert (row < lines);
-
-	g_free (table_data [row][col]);
-	table_data [row][col] = g_strdup (val);
-
-	printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-table_browser_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header;
-	ECell *cell_left_just;
-	GnomeCanvasItem *group;
-	int i;	
-
-	load_data ();
-
-	/*
-	 * Data model
-	 */
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable,
-		duplicate_value, free_value,
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-	
-	for (i = 0; i < cols; i++){
-		ETableCol *ecol = e_table_col_new (
-			i, column_labels [i],
-			1.0, 20, cell_left_just,
-			g_str_compare, TRUE);
-
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Setup GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	group = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		gnome_canvas_group_get_type (),
-		"x", 30.0,
-		"y", 30.0,
-		NULL);
-	
-	gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (group),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		NULL);
-}
-
-static void
-save_spec (GtkWidget *button, ETable *e_table)
-{
-	e_table_save_specification (e_table, "e-table-test.xml");
-}
-
-static void
-row_selection_test (ETable *table, int row, gboolean selected)
-{
-	if (selected)
-		g_print ("Row %d selected\n", row);
-	else
-		g_print ("Row %d unselected\n", row);
-}
-
-static void
-toggle_grid (void *nothing, ETable *etable)
-{
-	static gboolean shown;
-
-	gtk_object_get (GTK_OBJECT (etable), "drawgrid", &shown, NULL);
-	gtk_object_set (GTK_OBJECT (etable), "drawgrid", !shown, NULL);
-}
-
-static void
-do_e_table_demo (const char *spec)
-{
-	GtkWidget *e_table, *window, *frame, *vbox, *button, *bhide;
-	ECell *cell_left_just;
-	ETableHeader *full_header;
-	int i;
-	
-	/*
-	 * Data model
-	 */
-	static ETableModel *e_table_model = NULL;
-
-	if (e_table_model == NULL)
-		e_table_model = 
-			e_table_simple_new (col_count, row_count, value_at,
-					    set_value_at, is_cell_editable,
-					    duplicate_value, free_value,
-					    initialize_value, value_is_empty,
-					    value_to_string,
-					    NULL);
-
-	full_header = e_table_header_new ();
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	for (i = 0; i < cols; i++){
-		ETableCol *ecol = e_table_col_new (
-			i, column_labels [i],
-			1.0, 20, cell_left_just,
-			g_str_compare, TRUE);
-
-		e_table_header_add_column (full_header, ecol, i);
-	}
-	
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	frame = gtk_frame_new (NULL);
-	e_table = e_table_new (full_header, e_table_model, spec);
-	gtk_signal_connect (GTK_OBJECT(e_table), "row_selection",
-			   GTK_SIGNAL_FUNC(row_selection_test), NULL);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), e_table, TRUE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/*
-	 * gadgets
-	 */
-	button = gtk_button_new_with_label ("Save spec");
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (save_spec), e_table);
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-	bhide = gtk_button_new_with_label ("Toggle Grid");
-	gtk_signal_connect (GTK_OBJECT (bhide), "clicked",
-			    GTK_SIGNAL_FUNC (toggle_grid), e_table);
-	gtk_box_pack_start (GTK_BOX (vbox), bhide, FALSE, FALSE, 0);
-
-	gtk_widget_set_usize (window, 200, 200);
-	gtk_widget_show_all (window);
-
-	if (getenv ("TEST")){
-		e_table_do_gui_config (NULL, E_TABLE(e_table));
-	}
-}
-
-void
-e_table_test (void)
-{
-	load_data ();
-
-	if (1){/*getenv ("DO")){*/
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"true\"/> </grouping> </ETableSpecification>");
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <group column=\"4\" ascending=\"false\"> <leaf column=\"2\" ascending=\"true\"/> </group> </group> </grouping> </ETableSpecification>");
-	}
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>");
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>");
-}
diff --git a/widgets/table/tree-expanded.xpm b/widgets/table/tree-expanded.xpm
deleted file mode 100644
index d9bda3694d..0000000000
--- a/widgets/table/tree-expanded.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFFFF",
-"*      c #000000",
-"+	c #666666",
-"                ",
-"                ",
-"                ",
-"                ",
-"    +++++++++   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.*****.+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +++++++++   ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/table/tree-unexpanded.xpm b/widgets/table/tree-unexpanded.xpm
deleted file mode 100644
index e1b48448ba..0000000000
--- a/widgets/table/tree-unexpanded.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFFFF",
-"*      c #000000",
-"+	c #666666",
-"                ",
-"                ",
-"                ",
-"                ",
-"    +++++++++   ",
-"    +.......+   ",
-"    +...*...+   ",
-"    +...*...+   ",
-"    +.*****.+   ",
-"    +...*...+   ",
-"    +...*...+   ",
-"    +.......+   ",
-"    +++++++++   ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/text/.cvsignore b/widgets/text/.cvsignore
deleted file mode 100644
index 8b2af4d9bf..0000000000
--- a/widgets/text/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-e-text-test
-e-entry-test
-e-text-model-test
diff --git a/widgets/text/e-completion-test.c b/widgets/text/e-completion-test.c
deleted file mode 100644
index 3172cecb13..0000000000
--- a/widgets/text/e-completion-test.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-  ECompleteTest
-*/
-
-#include <gnome.h>
-#include "e-completion.h"
-#include "e-entry.h"
-
-#define TIMEOUT 50
-
-/* Dictionary Lookup test */
-
-static gint word_count = 0;
-static gchar **word_array = NULL;
-
-static void
-read_dict (void)
-{
-  FILE *in = fopen ("/usr/share/dict/words", "r");
-  gchar buffer[128];
-  GList *word_list = NULL, *iter;
-  gint i;
-
-  while (fgets (buffer, 128, in)) {
-    gint len = strlen (buffer);
-    if (len > 0 && buffer[len-1] == '\n')
-      buffer[len-1] = '\0';
-    word_list = g_list_prepend (word_list, g_strdup (buffer));
-    ++word_count;
-  }
-  fclose (in);
-
-  word_array = g_new (gchar *, word_count);
-  i = word_count-1;
-  for (iter = word_list; iter != NULL; iter = g_list_next (iter)) {
-    word_array[i] = (gchar *)iter->data;
-    --i;
-  }
-}
-
-static gint
-find_word (const gchar *str)
-{
-  gint a, b;
-
-  if (word_array == NULL)
-    read_dict ();
-
-  a = 0;
-  b = word_count-1;
-
-  while (b-a > 1) {
-    gint m = (a+b)/2;
-    gint cmp = g_strcasecmp (str, word_array[m]);
-
-    if (cmp < 0)
-      b = m;
-    else if (cmp > 0)
-      a = m;
-    else
-      return m;
-  };
-
-  return b;
-}
-
-struct {
-  ECompletion *complete;
-  const gchar *txt;
-  gint start;
-  gint current;
-  gint len;
-  gint limit;
-} dict_info;
-static guint dict_tag = 0;
-
-static gboolean
-dict_check (gpointer ptr)
-{
-  gint limit = dict_info.limit;
-  gint i;
-
-  /* If this is the first iteration, do the binary search in our word list to figure out
-     where to start.  We do less work on the first iteration, to give more of a sense of
-     immediate feedback. */
-  if (dict_info.start < 0) {
-    dict_info.start = dict_info.current = find_word (dict_info.txt);
-  }
-
-  i = dict_info.current;
-  while (limit > 0 && i < word_count && g_strncasecmp (dict_info.txt, word_array[i], dict_info.len) == 0) {
-    e_completion_found_match_full (dict_info.complete, word_array[i],
-				   dict_info.len / (double)strlen (word_array[i]),
-				   NULL, NULL);
-    ++i;
-    --limit;
-  }
-  dict_info.current = i;
-  dict_info.limit = MIN (dict_info.limit*2, 200);
-  
-  if (limit != 0) {
-    dict_tag = 0;
-    e_completion_end_search (dict_info.complete);
-    return FALSE;
-  }
-
-
-
-  return TRUE;
-}
-
-static void
-begin_dict_search (ECompletion *complete, const gchar *txt, gint pos, gint limit, gpointer user_data)
-{
-  gint len = strlen (txt);
-
-  if (dict_tag != 0) {
-    gtk_timeout_remove (dict_tag);
-    dict_tag = 0;
-  }
-
-  if (len > 0) {
-    dict_info.complete = complete;
-    dict_info.txt = txt;
-    dict_info.start = -1;
-    dict_info.current = -1;
-    dict_info.len = len;
-    dict_info.limit = 20;
-    dict_tag = gtk_timeout_add (TIMEOUT, dict_check, NULL);
-  } else {
-    g_message ("halting");
-    e_completion_end_search (complete);
-  }
-}
-
-static void
-end_dict_search (ECompletion *complete, gpointer user_data)
-{
-  if (dict_tag != 0) {
-    gtk_timeout_remove (dict_tag);
-    dict_tag = 0;
-  }
-}
-
-int
-main (int argc, gchar **argv)
-{
-  ECompletion* complete;
-  GtkWidget *entry;
-  GtkWidget *win;
-
-  gnome_init ("ETextModelTest", "0.0", argc, argv);
-
-  read_dict ();
-
-  complete = e_completion_new ();
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "begin_completion",
-		      GTK_SIGNAL_FUNC (begin_dict_search),
-		      NULL);
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "end_completion",
-		      GTK_SIGNAL_FUNC (end_dict_search),
-		      NULL);
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "cancel_completion",
-		      GTK_SIGNAL_FUNC (end_dict_search),
-		      NULL);
-
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  entry = e_entry_new ();
-  e_entry_enable_completion_full (E_ENTRY (entry), complete, -1, NULL);
-  e_entry_set_editable (E_ENTRY (entry), TRUE);
-
-  gtk_container_add (GTK_CONTAINER (win), entry);
-  gtk_widget_show_all (win);
-
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
deleted file mode 100644
index 825e7c5e11..0000000000
--- a/widgets/text/e-completion-view.c
+++ /dev/null
@@ -1,691 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * ECompletionView - A text completion selection widget
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- * Adapted from code by Miguel de Icaza <miguel@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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include "e-completion-view.h"
-
-enum {
-	E_COMPLETION_VIEW_NONEMPTY,
-	E_COMPLETION_VIEW_ADDED,
-	E_COMPLETION_VIEW_FULL,
-	E_COMPLETION_VIEW_BROWSE,
-	E_COMPLETION_VIEW_UNBROWSE,
-	E_COMPLETION_VIEW_ACTIVATE,
-	E_COMPLETION_VIEW_LAST_SIGNAL
-};
-
-static guint e_completion_view_signals[E_COMPLETION_VIEW_LAST_SIGNAL] = { 0 };
-
-static void    e_completion_view_disconnect     (ECompletionView *cv);
-static ETable *e_completion_view_table          (ECompletionView *cv);
-static void    e_completion_view_clear_choices  (ECompletionView *cv);
-static void    e_completion_view_set_cursor_row (ECompletionView *cv, gint r);
-static void    e_completion_view_select         (ECompletionView *cv, gint r);
-
-static gint    e_completion_view_key_press_handler (GtkWidget *w, GdkEventKey *key_event, gpointer user_data);
-
-static void    e_completion_view_class_init (ECompletionViewClass *klass);
-static void    e_completion_view_init       (ECompletionView *completion);
-static void    e_completion_view_destroy    (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-
-static gint
-e_completion_view_local_key_press_handler (GtkWidget *w, GdkEventKey *ev)
-{
-	return e_completion_view_key_press_handler (w, ev, w);
-}
-
-GtkType
-e_completion_view_get_type (void)
-{
-	static GtkType completion_view_type = 0;
-  
-	if (!completion_view_type) {
-		GtkTypeInfo completion_view_info = {
-			"ECompletionView",
-			sizeof (ECompletionView),
-			sizeof (ECompletionViewClass),
-			(GtkClassInitFunc) e_completion_view_class_init,
-			(GtkObjectInitFunc) e_completion_view_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		completion_view_type = gtk_type_unique (gtk_event_box_get_type (), &completion_view_info);
-	}
-
-	return completion_view_type;
-}
-
-static void
-e_completion_view_class_init (ECompletionViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY] =
-		gtk_signal_new ("nonempty",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, nonempty),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
-		gtk_signal_new ("added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, added),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
-		gtk_signal_new ("full",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, full),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
-		gtk_signal_new ("browse",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, browse),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE] =
-		gtk_signal_new ("unbrowse",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, unbrowse),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, activate),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL);
-
-	object_class->destroy = e_completion_view_destroy;
-	widget_class->key_press_event = e_completion_view_local_key_press_handler;
-}
-
-static void
-e_completion_view_init (ECompletionView *completion)
-{
-}
-
-static void
-e_completion_view_destroy (GtkObject *object)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (object);
-
-	e_completion_view_disconnect (cv);
-	e_completion_view_clear_choices (cv);
-
-	if (cv->key_widget) {
-		gtk_signal_disconnect (GTK_OBJECT (cv->key_widget), cv->key_signal_id);
-		gtk_object_unref (GTK_OBJECT (cv->key_widget));
-	}
-
-	if (cv->completion)
-		gtk_object_unref (GTK_OBJECT (cv->completion));
-
-
-	if (parent_class->destroy)
-		(parent_class->destroy) (object);
-}
-
-static void
-e_completion_view_disconnect (ECompletionView *cv)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	if (cv->begin_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->begin_signal_id);
-	if (cv->comp_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->comp_signal_id);
-	if (cv->restart_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->restart_signal_id);
-	if (cv->cancel_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->cancel_signal_id);
-	if (cv->end_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->end_signal_id);
-	
-	cv->begin_signal_id   = 0;
-	cv->comp_signal_id    = 0;
-	cv->restart_signal_id = 0;
-	cv->end_signal_id     = 0;
-}
-
-static ETable *
-e_completion_view_table (ECompletionView *cv)
-{
-	return e_table_scrolled_get_table (E_TABLE_SCROLLED (cv->table));
-}
-
-static void
-e_completion_view_clear_choices (ECompletionView *cv)
-{
-	GList *i;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	for (i = cv->choices; i != NULL; i = g_list_next (i))
-		g_free (i->data);
-
-	g_list_free (cv->choices);
-	cv->choices = NULL;
-
-	cv->choice_count = 0;
-}
-
-static void
-e_completion_view_set_cursor_row (ECompletionView *cv, gint r)
-{
-	ETable *table;
-	GtkAdjustment *adj;
-	gint x, y1, y2, r1, r2, c;
-	double fracline;
-	gint iteration_count=0;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (r < cv->choice_count);
-
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (cv->table));	
-
-	table = e_completion_view_table (cv);
-
-	if (r < 0) {
-		e_selection_model_clear (E_SELECTION_MODEL(table->selection));
-		
-		/* Move back to the top when we clear the selection */
-		gtk_adjustment_set_value (adj, adj->lower);
-		return;
-	}
-
-	e_table_set_cursor_row (table, r);
-
-	/* OK, now the tricky bit.  We try to insure that this row is
-	   visible. */
-	
-	/* If we are selecting the first or last row, then it is easy.  We just
-	   cram the vadjustment all the way up/down. */
-	if (r == 0) {
-		gtk_adjustment_set_value (adj, adj->lower);
-		return;
-	} else if (r == cv->choice_count - 1) {		
-		gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
-		return;
-	}
-	
-	fracline = ((adj->upper - adj->lower - adj->page_size) / cv->choice_count) / 4;
-
-	while (iteration_count < 100) {
-		x = GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-		y1 = GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-		
-		y2 = y1 + cv->table->allocation.height;
-		
-		e_table_group_compute_location (e_completion_view_table (cv)->group, &x, &y1, &r1, &c);
-		e_table_group_compute_location (e_completion_view_table (cv)->group, &x, &y2, &r2, &c);
-	
-		if (r <= r1) {
-			gtk_adjustment_set_value (adj, adj->value - fracline);
-		} else if (r >= r2) {
-			gtk_adjustment_set_value (adj, adj->value + fracline);
-		} else 
-			return;
-
-		++iteration_count;
-	}
-
-	g_assert_not_reached ();
-}
-
-static void
-e_completion_view_select (ECompletionView *cv, gint r)
-{
-	const gchar *sel = (const gchar *) g_list_nth_data (cv->choices, r);
-	gpointer extra = e_completion_find_extra_data (cv->completion, sel);
-
-	cv->selection = r;
-	e_completion_view_set_cursor_row (cv, r);
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE], sel, extra);
-}
-
-static gint
-e_completion_view_key_press_handler (GtkWidget *w, GdkEventKey *key_event, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-	gint dir = 0;
-	gboolean key_handled = TRUE;
-
-	/* Start up a completion.*/
-	if (cv->complete_key && key_event->keyval == cv->complete_key && !cv->editable) {
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], NULL);
-		goto stop_emission;
-	}
-
-	/* Stop our completion. */
-	if (cv->uncomplete_key && key_event->keyval == cv->uncomplete_key && cv->editable && cv->selection < 0) {
-		e_completion_view_set_cursor_row (cv, -1);
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-		goto stop_emission;
-	}
-
-	if (!cv->editable)
-		return FALSE;
-
-	switch (key_event->keyval) {
-	case GDK_Down:
-	case GDK_KP_Down:
-		dir = 1;
-		break;
-
-	case GDK_Up:
-	case GDK_KP_Up:
-		dir = -1;
-		break;
-		
-	case GDK_Tab:
-		/* Unbrowse, unhandled. */
-		cv->selection = -1;
-		dir = 0;
-		key_handled = FALSE;
-		break;
-
-	case GDK_Return:
-	case GDK_KP_Enter:
-	case GDK_space:
-	case GDK_KP_Space:
-		/* Only handle these key presses if we have an active selection;
-		   otherwise, pass them on. */
-		if (cv->selection >= 0) {
-			e_completion_view_select (cv, cv->selection);
-			goto stop_emission;
-		}
-		return FALSE;
-
-	case GDK_Escape:
-		/* Unbrowse hack */
-		cv->selection = -1;
-		dir = 0;
-		break;
-
-	default:
-		return FALSE;
-	}
-
-	cv->selection += dir;
-
-	if (cv->selection >= cv->choice_count) {
-		cv->selection = cv->choice_count - 1;
-		/* Don't re-emit the browse signal */
-		goto stop_emission;
-	}
-
-	e_completion_view_set_cursor_row (cv, cv->selection);
-
-	if (cv->selection >= 0)
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], 
-				 g_list_nth_data (cv->choices, cv->selection));
-	else
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-
- stop_emission:
-	if (key_handled)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
-
-	return key_handled;
-}
-
-static void
-begin_completion_cb (ECompletion *completion, const gchar *txt, gint pos, gint limit, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	e_completion_view_clear_choices (cv);
-	cv->have_all_choices = FALSE;
-
-	e_table_model_changed (cv->model);
-}
-
-static void
-restart_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	/* For now, handle restarts like the beginning of a new completion. */
-	begin_completion_cb (completion, NULL, 0, 0, user_data);
-}
-
-static void
-cancel_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	/* On a cancel, clear our choices and issue an "unbrowse" signal. */
-	e_completion_view_clear_choices (cv);
-	cv->have_all_choices = TRUE;
-	e_completion_view_set_cursor_row (cv, -1);
-	e_table_model_changed (cv->model);
-
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-}
-
-static void
-completion_cb (ECompletion *completion, const gchar *text, gpointer extra_data, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-	gint r = cv->choice_count;
-	gboolean first = (cv->choices == NULL);
-
-	cv->choices = g_list_append (cv->choices, g_strdup (text));
-	++cv->choice_count;
-
-	e_table_model_row_inserted (cv->model, r);
-
-	if (first)
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY]);
-
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_ADDED]);
-}
-
-static void
-end_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	/* Do a final refresh of the table. */
-	e_table_model_changed (cv->model);
-
-	cv->have_all_choices = TRUE;
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_FULL]);
-}
-
-/*** Table Callbacks ***/
-
-static char *simple_spec = 
-"<ETableSpecification no-headers=\"true\" draw-grid=\"false\" cursor-mode=\"line\"> "
-"  <ETableColumn model_col=\"0\" _title=\"Node\" expansion=\"1.0\" "
-"         minimum_width=\"16\" resizable=\"true\" cell=\"string\" "
-"         compare=\"string\"/> "
-"       <ETableState>                  "
-"	        <column source=\"0\"/> "
-"	        <grouping></grouping>  "
-"        </ETableState>                "
-"</ETableSpecification>";
-
-static gint
-table_col_count (ETableModel *etm, gpointer data)
-{
-	return 1;
-}
-
-static gint
-table_row_count (ETableModel *etm, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-	return cv->choice_count;
-}
-
-static gboolean
-table_is_cell_editable (ETableModel *etm, gint c, gint r, gpointer data)
-{
-	return FALSE;
-}
-
-static gpointer
-table_value_at (ETableModel *etm, gint c, gint r, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-	gpointer p;
-
-	p = g_list_nth_data (cv->choices, r);
-
-	return p;
-}
-
-static gchar *
-table_value_to_string (ETableModel *em, gint col, gconstpointer val, gpointer data)
-{
-	return (gchar *) val;
-}
-
-static void
-table_click_cb (ETable *et, gint r, gint c, GdkEvent *ev, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-
-	e_completion_view_select (cv, r);
-}
-
-void
-e_completion_view_construct (ECompletionView *cv, ECompletion *completion)
-{
-	GtkWidget *frame;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (completion != NULL);
-	g_return_if_fail (E_IS_COMPLETION (completion));
-
-	/* Make sure we don't call construct twice. */
-	g_return_if_fail (cv->completion == NULL);
-
-	cv->completion = completion;
-	gtk_object_ref (GTK_OBJECT (completion));
-
-	cv->begin_signal_id   = gtk_signal_connect (GTK_OBJECT (completion),
-						    "begin_completion",
-						    GTK_SIGNAL_FUNC (begin_completion_cb),
-						    cv);
-	cv->comp_signal_id    = gtk_signal_connect (GTK_OBJECT (completion),
-						    "completion",
-						    GTK_SIGNAL_FUNC (completion_cb),
-						    cv);
-	cv->restart_signal_id = gtk_signal_connect (GTK_OBJECT (completion),
-						    "restart_completion",
-						    GTK_SIGNAL_FUNC (restart_completion_cb),
-						    cv);
-	cv->cancel_signal_id  = gtk_signal_connect (GTK_OBJECT (completion),
-						    "cancel_completion",
-						    GTK_SIGNAL_FUNC (cancel_completion_cb),
-						    cv);
-	cv->end_signal_id     = gtk_signal_connect (GTK_OBJECT (completion),
-						    "end_completion",
-						    GTK_SIGNAL_FUNC (end_completion_cb),
-						    cv);
-
-	cv->model = e_table_simple_new (table_col_count,
-					table_row_count,
-					table_value_at,
-					NULL,
-					table_is_cell_editable,
-					NULL, NULL, NULL, NULL,
-					table_value_to_string,
-					cv);
-
-	cv->table = e_table_scrolled_new (cv->model, NULL, simple_spec, NULL);
-
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (cv->table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-	frame = gtk_frame_new (NULL);
-
-	gtk_container_add (GTK_CONTAINER (cv), frame);
-	gtk_container_add (GTK_CONTAINER (frame), cv->table);
-	gtk_widget_show_all (frame);
-
-	gtk_signal_connect (GTK_OBJECT (e_completion_view_table (cv)),
-			    "click",
-			    GTK_SIGNAL_FUNC (table_click_cb),
-			    cv);
-
-	cv->selection = -1;
-}
-
-GtkWidget *
-e_completion_view_new (ECompletion *completion)
-{
-	gpointer p;
-
-	g_return_val_if_fail (completion != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPLETION (completion), NULL);
-
-	p = gtk_type_new (e_completion_view_get_type ());
-
-	e_completion_view_construct (E_COMPLETION_VIEW (p), completion);
-
-	return GTK_WIDGET (p);
-}
-
-void
-e_completion_view_connect_keys (ECompletionView *cv, GtkWidget *w)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (w == NULL || GTK_IS_WIDGET (w));
-
-	if (cv->key_widget) {
-		gtk_signal_disconnect (GTK_OBJECT (cv->key_widget), cv->key_signal_id);
-		gtk_object_unref (GTK_OBJECT (cv->key_widget));
-	}
-
-	if (w) {
-		cv->key_widget = w;
-		gtk_object_ref (GTK_OBJECT (w));
-
-		cv->key_signal_id = gtk_signal_connect (GTK_OBJECT (w),
-							"key_press_event",
-							GTK_SIGNAL_FUNC (e_completion_view_key_press_handler),
-							cv);
-	} else {
-		cv->key_widget = NULL;
-		cv->key_signal_id = 0;
-	}
-}
-
-void
-e_completion_view_set_complete_key (ECompletionView *cv, gint keyval)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	cv->complete_key = keyval;
-}
-
-void
-e_completion_view_set_uncomplete_key (ECompletionView *cv, gint keyval)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	cv->uncomplete_key = keyval;
-}
-
-void
-e_completion_view_set_width (ECompletionView *cv, gint width)
-{
-	GtkWidget *w;
-	gint y, r, dummy, line_height;
-	double drop_room, lines;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (width > 0);
-
-	w = GTK_WIDGET (cv);
-
-	if (! GTK_WIDGET_REALIZED (w)) {
-		gtk_widget_set_usize (w, width, -1);
-		return;
-	}
-
-	/* A Horrible Hack(tm) to figure out the height of a single table row */
-	
-	for (line_height=5, r=0; r == 0 && line_height < 1000; line_height += 2) {
-		dummy = 0;
-		e_table_group_compute_location (e_completion_view_table (cv)->group,
-						&dummy, &line_height, &r, &dummy);
-	}
-
-	if (line_height >= 1000) {
-		/* Something went wrong, so we make a (possibly very lame) guess */
-		line_height = 30;
-	}
-
-
-	gdk_window_get_origin (w->window, NULL, &y);
-	y += w->allocation.y;
-
-	lines = 5; /* default maximum */
-	lines = MIN (lines, cv->choice_count);
-	
-	drop_room = (gdk_screen_height () - y) / (double)line_height;
-	drop_room = MAX (drop_room, 1);
-
-	lines = MIN (lines, drop_room);
-
-	/* We reduce the total height by a bit; in practice, this seems to work out well. */
-	gtk_widget_set_usize (w, width, (gint) floor (line_height * lines * 0.97));
-}
-
-void
-e_completion_view_set_editable (ECompletionView *cv, gboolean x)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	if (x == cv->editable)
-		return;
-
-	cv->editable = x;
-	cv->selection = -1;
-	e_completion_view_set_cursor_row (cv, -1);
-}
-
diff --git a/widgets/text/e-completion-view.h b/widgets/text/e-completion-view.h
deleted file mode 100644
index 57268125c5..0000000000
--- a/widgets/text/e-completion-view.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * ECompletionView - A text completion selection widget
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- * Adapted from code by Miguel de Icaza <miguel@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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef E_COMPLETION_VIEW_H
-#define E_COMPLETION_VIEW_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtk.h>
-#include <gal/e-table/e-table.h>
-#include "e-completion.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_COMPLETION_VIEW_TYPE        (e_completion_view_get_type ())
-#define E_COMPLETION_VIEW(o)          (GTK_CHECK_CAST ((o), E_COMPLETION_VIEW_TYPE, ECompletionView))
-#define E_COMPLETION_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_COMPLETION_VIEW_TYPE, ECompletionViewClass))
-#define E_IS_COMPLETION_VIEW(o)       (GTK_CHECK_TYPE ((o), E_COMPLETION_VIEW_TYPE))
-#define E_IS_COMPLETION_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_COMPLETION_VIEW_TYPE))
-
-typedef struct _ECompletionView ECompletionView;
-typedef struct _ECompletionViewClass ECompletionViewClass;
-
-struct _ECompletionView {
-	GtkEventBox parent;
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	ECompletion *completion;
-	guint begin_signal_id;
-	guint comp_signal_id;
-	guint restart_signal_id;
-	guint cancel_signal_id;
-	guint end_signal_id;
-
-	GtkWidget *key_widget;
-	guint key_signal_id;
-
-	gint complete_key;
-	gint uncomplete_key;
-
-	GList *choices;
-	gint choice_count;
-	gboolean have_all_choices;
-
-	gboolean editable;
-	gint selection;
-};
-
-struct _ECompletionViewClass {
-	GtkEventBoxClass parent_class;
-
-	/* Signals */
-	void (*nonempty) (ECompletionView *cv);
-	void (*added)    (ECompletionView *cv);
-	void (*full)     (ECompletionView *cv);
-	void (*browse)   (ECompletionView *cv, const gchar *text);
-	void (*unbrowse) (ECompletionView *cv);
-	void (*activate) (ECompletionView *cv, const gchar *text, gpointer extra_data);
-};
-
-GtkType    e_completion_view_get_type     (void);
-
-void       e_completion_view_construct    (ECompletionView *cv, ECompletion *completion);
-GtkWidget *e_completion_view_new          (ECompletion *completion);
-
-void       e_completion_view_connect_keys (ECompletionView *cv, GtkWidget *w);
-
-void       e_completion_view_set_complete_key   (ECompletionView *cv, gint keyval);
-void       e_completion_view_set_uncomplete_key (ECompletionView *cv, gint keyval);
-
-void       e_completion_view_set_width    (ECompletionView *cv, gint width);
-void       e_completion_view_set_editable (ECompletionView *cv, gboolean);
-
-END_GNOME_DECLS
-
-
-#endif /* E_COMPLETION_H */
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
deleted file mode 100644
index bf12d6a365..0000000000
--- a/widgets/text/e-completion.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ECompletion - A base class for text completion.
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Miguel de Icaza <miguel@ximian.com>
- * Adapted by Jon Trowbridge <trow@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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include "e-completion.h"
-
-enum {
-	E_COMPLETION_BEGIN_COMPLETION,
-	E_COMPLETION_COMPLETION,
-	E_COMPLETION_RESTART_COMPLETION,
-	E_COMPLETION_CANCEL_COMPLETION,
-	E_COMPLETION_END_COMPLETION,
-	E_COMPLETION_LAST_SIGNAL
-};
-
-static guint e_completion_signals[E_COMPLETION_LAST_SIGNAL] = { 0 };
-
-typedef struct _Match Match;
-struct _Match {
-	gchar *text;
-	double score;
-	gpointer extra_data;
-	GtkDestroyNotify extra_destroy;
-};
-
-struct _ECompletionPrivate {
-	gboolean searching;
-	gchar *search_text;
-	gint pos;
-	gint limit;
-	gint match_count;
-	GList *matches;
-	double min_score, max_score;
-};
-
-static void e_completion_class_init (ECompletionClass *klass);
-static void e_completion_init       (ECompletion *complete);
-static void e_completion_destroy    (GtkObject *object);
-
-static Match *match_new       (const gchar *txt, double score, gpointer extra_data, GtkDestroyNotify extra_destroy);
-static void   match_free      (Match *);
-static void   match_list_free (GList *);
-
-static void     e_completion_add_match     (ECompletion *complete, const gchar *txt, double score, gpointer extra_data, GtkDestroyNotify);
-static void     e_completion_clear_matches (ECompletion *complete);
-static gboolean e_completion_sort_by_score (ECompletion *complete);
-static void     e_completion_restart       (ECompletion *complete);
-
-static GtkObjectClass *parent_class;
-
-
-
-GtkType
-e_completion_get_type (void)
-{
-	static GtkType complete_type = 0;
-  
-	if (!complete_type) {
-		GtkTypeInfo complete_info = {
-			"ECompletion",
-			sizeof (ECompletion),
-			sizeof (ECompletionClass),
-			(GtkClassInitFunc) e_completion_class_init,
-			(GtkObjectInitFunc) e_completion_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		complete_type = gtk_type_unique (gtk_object_get_type (), &complete_info);
-	}
-
-	return complete_type;
-}
-
-static void
-e_completion_class_init (ECompletionClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_object_get_type ()));
-
-	e_completion_signals[E_COMPLETION_BEGIN_COMPLETION] =
-		gtk_signal_new ("begin_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, begin_completion),
-				gtk_marshal_NONE__POINTER_INT_INT,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_completion_signals[E_COMPLETION_COMPLETION] =
-		gtk_signal_new ("completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, completion),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_completion_signals[E_COMPLETION_RESTART_COMPLETION] =
-		gtk_signal_new ("restart_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, restart_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_CANCEL_COMPLETION] =
-		gtk_signal_new ("cancel_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, cancel_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_END_COMPLETION] =
-		gtk_signal_new ("end_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, end_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL);
-
-	object_class->destroy = e_completion_destroy;
-}
-
-static void
-e_completion_init (ECompletion *complete)
-{
-	complete->priv = g_new0 (struct _ECompletionPrivate, 1);
-}
-
-static void
-e_completion_destroy (GtkObject *object)
-{
-	ECompletion *complete = E_COMPLETION (object);
-
-	g_free (complete->priv->search_text);
-	complete->priv->search_text = NULL;
-
-	e_completion_clear_matches (complete);
-
-	g_free (complete->priv);
-	complete->priv = NULL;
-
-	if (parent_class->destroy)
-		(parent_class->destroy) (object);
-}
-
-static Match *
-match_new (const gchar *text, double score, gpointer extra_data, GtkDestroyNotify extra_destroy)
-{
-	Match *m;
-
-	if (text == NULL)
-		return NULL;
-
-	m = g_new (Match, 1);
-	m->text = g_strdup (text);
-	m->score = score;
-	m->extra_data = extra_data;
-	m->extra_destroy = extra_destroy;
-	
-	return m;
-}
-
-static void
-match_free (Match *m)
-{
-	if (m) {
-		g_free (m->text);
-		if (m->extra_destroy)
-			m->extra_destroy (m->extra_data);
-		g_free (m);
-	}
-}
-
-static void
-match_list_free (GList *i)
-{
-	while (i) {
-		match_free ( (Match *) i->data );
-		i = g_list_next (i);
-	}
-}
-
-static void
-e_completion_add_match (ECompletion *complete, const gchar *txt, double score, gpointer extra_data, GtkDestroyNotify extra_destroy)
-{
-	complete->priv->matches = g_list_append (complete->priv->matches, match_new (txt, score, extra_data, extra_destroy));
-
-	if (complete->priv->match_count == 0) {
-
-		complete->priv->min_score = complete->priv->max_score = score;
-		
-	} else {
-
-		complete->priv->min_score = MIN (complete->priv->min_score, score);
-		complete->priv->max_score = MAX (complete->priv->max_score, score);
-
-	}
-
-	++complete->priv->match_count;
-}
-
-static void
-e_completion_clear_matches (ECompletion *complete)
-{
-	match_list_free (complete->priv->matches);
-	g_list_free (complete->priv->matches);
-	complete->priv->matches = NULL;
-
-	complete->priv->match_count = 0;
-
-	complete->priv->min_score = 0;
-	complete->priv->max_score = 0;
-}
-
-void
-e_completion_begin_search (ECompletion *complete, const gchar *text, gint pos, gint limit)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (text != NULL);
-
-	/* Stop any prior search. */
-	if (complete->priv->searching)
-		e_completion_cancel_search (complete);
-
-	g_free (complete->priv->search_text);
-	complete->priv->search_text = g_strdup (text);
-
-	complete->priv->pos = pos;
-	complete->priv->searching = TRUE;
-
-	e_completion_clear_matches (complete);
-
-	complete->priv->limit = limit > 0 ? limit : G_MAXINT;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_BEGIN_COMPLETION], text, pos, limit);
-}
-
-void
-e_completion_cancel_search (ECompletion *complete)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	/* If there is no search to cancel, just silently return. */
-	if (!complete->priv->searching)
-		return;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_CANCEL_COMPLETION]);
-
-	complete->priv->searching = FALSE;
-}
-
-gboolean
-e_completion_searching (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), FALSE);
-
-	return complete->priv->searching;
-}
-
-const gchar *
-e_completion_search_text (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), NULL);
-
-	return complete->priv->search_text;
-}
-
-gint
-e_completion_search_text_pos (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, -1);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), -1);
-
-	return complete->priv->pos;
-}
-
-gint
-e_completion_match_count (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, 0);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), 0);
-
-	return complete->priv->match_count;
-}
-
-void
-e_completion_foreach_match (ECompletion *complete, ECompletionMatchFn fn, gpointer user_data)
-{
-	GList *i;
-
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	if (fn == NULL)
-		return;
-
-	for (i = complete->priv->matches; i != NULL; i = g_list_next (i)) {
-		Match *m = (Match *) i->data;
-		fn (m->text, m->score, m->extra_data, user_data);
-	}
-}
-
-gpointer
-e_completion_find_extra_data (ECompletion *complete, const gchar *text)
-{
-	GList *i;
-
-	g_return_val_if_fail (complete != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), NULL);
-
-	for (i = complete->priv->matches; i != NULL; i = g_list_next (i)) {
-		Match *m = (Match *) i->data;
-		if (strcmp (m->text, text) == 0)
-			return m->extra_data;
-	}
-	
-	return NULL;
-}
-
-ECompletion *
-e_completion_new (void)
-{
-	return E_COMPLETION (gtk_type_new (e_completion_get_type ()));
-}
-
-static gint
-score_cmp_fn (gconstpointer a, gconstpointer b)
-{
-	double sa = ((const Match *) a)->score;
-	double sb = ((const Match *) b)->score;
-	gint cmp =  (sa < sb) - (sb < sa);
-	if (cmp == 0)
-		cmp = g_strcasecmp (((const Match *) a)->text, ((const Match *) b)->text);
-	return cmp;
-}
-
-static gboolean
-e_completion_sort_by_score (ECompletion *complete)
-{
-	GList *sort_list = NULL, *i, *j;
-	gboolean diff;
-	gint count;
-
-	/* If all scores are equal, there is nothing to do. */
-	if (complete->priv->min_score == complete->priv->max_score)
-		return FALSE;
-
-	for (i = complete->priv->matches; i != NULL; i = g_list_next (i)) {
-		sort_list = g_list_append (sort_list, i->data);
-	}
-
-	sort_list = g_list_sort (sort_list, score_cmp_fn);
-
-
-	diff = FALSE;
-	count = 0;
-	i = complete->priv->matches;
-	j = sort_list;
-	while (i && j && !diff && count < complete->priv->limit) {
-		
-		if (i->data != j->data)
-			diff = TRUE;
-
-		i = g_list_next (i);
-		j = g_list_next (j);
-		++count;
-	}
-
-	g_list_free (complete->priv->matches);
-	complete->priv->matches = sort_list;
-
-	return diff;
-}
-
-/* Emit a restart signal and re-declare our matches, up to the limit. */
-static void
-e_completion_restart (ECompletion *complete)
-{
-	GList *i;
-	gint count = 0;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_RESTART_COMPLETION]);
-	
-	i = complete->priv->matches;
-	while (i != NULL && count < complete->priv->limit) {
-		Match *m = (Match *) i->data;
-		gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_COMPLETION], m->text, m->extra_data);
-
-		i = g_list_next (i);
-		++count;
-	}
-}
-
-void
-e_completion_found_match (ECompletion *complete, const gchar *text)
-{
-	g_return_if_fail (complete);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (text != NULL);
-
-	e_completion_found_match_full (complete, text, 0, NULL, NULL);
-}
-
-void
-e_completion_found_match_full (ECompletion *complete, const gchar *text, double score, gpointer extra_data, GtkDestroyNotify extra_destroy)
-{
-	g_return_if_fail (complete);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (text != NULL);
-
-	if (! complete->priv->searching) {
-		g_warning ("e_completion_found_match(...,\"%s\",...) called outside of a search", text);
-		return;
-	}
-
-	e_completion_add_match (complete, text, score, extra_data, extra_destroy);
-
-	/* For now, do nothing when we hit the limit --- just don't announce the incoming matches. */
-	if (complete->priv->match_count >= complete->priv->limit) {
-		return;
-	}
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_COMPLETION], text, extra_data);
-}
-
-void
-e_completion_end_search (ECompletion *complete)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (complete->priv->searching);
-
-	/* If sorting by score accomplishes anything, issue a restart right before we end. */
-	if (e_completion_sort_by_score (complete))
-		e_completion_restart (complete);
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_END_COMPLETION]);
-
-	complete->priv->searching = FALSE;
-}
-
diff --git a/widgets/text/e-completion.h b/widgets/text/e-completion.h
deleted file mode 100644
index e101d6aa55..0000000000
--- a/widgets/text/e-completion.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ECompletion - A base class for text completion.
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Miguel de Icaza <miguel@ximian.com>
- * Adapted by Jon Trowbridge <trow@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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef E_COMPLETION_H
-#define E_COMPLETION_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_COMPLETION_TYPE        (e_completion_get_type ())
-#define E_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_COMPLETION_TYPE, ECompletion))
-#define E_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_COMPLETION_TYPE, ECompletionClass))
-#define E_IS_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_COMPLETION_TYPE))
-#define E_IS_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_COMPLETION_TYPE))
-
-typedef struct _ECompletion ECompletion;
-typedef struct _ECompletionClass ECompletionClass;
-struct _ECompletionPrivate;
-
-typedef void (*ECompletionMatchFn) (const gchar *text, double score, gpointer extra_data, gpointer user_data);
-
-struct _ECompletion {
-	GtkObject parent;
-
-	struct _ECompletionPrivate *priv;
-};
-
-struct _ECompletionClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void     (*begin_completion)   (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-	void     (*completion)         (ECompletion *comp, const gchar *match_text, gpointer extra_data);
-	void     (*restart_completion) (ECompletion *comp);
-	void     (*cancel_completion)  (ECompletion *comp);
-	void     (*end_completion)     (ECompletion *comp);
-};
-
-GtkType      e_completion_get_type (void);
-
-void         e_completion_begin_search  (ECompletion *comp, const gchar *text, gint pos, gint limit);
-void         e_completion_cancel_search (ECompletion *comp);
-
-gboolean     e_completion_searching       (ECompletion *comp);
-const gchar *e_completion_search_text     (ECompletion *comp);
-gint         e_completion_search_text_pos (ECompletion *comp);
-gint         e_completion_match_count     (ECompletion *comp);
-void         e_completion_foreach_match   (ECompletion *comp, ECompletionMatchFn fn, gpointer user_data);
-gpointer     e_completion_find_extra_data (ECompletion *comp, const gchar *text);
-
-ECompletion *e_completion_new (void);
-
-
-
-/* These functions should only be called by derived classes or search callbacks,
-   or very bad things might happen. */
-
-void         e_completion_found_match      (ECompletion *comp, const gchar *completion_text);
-void         e_completion_found_match_full (ECompletion *comp, const gchar *completion_text, double score,
-					    gpointer extra_data, GtkDestroyNotify extra_data_destructor);
-void         e_completion_end_search       (ECompletion *comp);
-
-END_GNOME_DECLS
-
-
-#endif /* E_COMPLETION_H */
-
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
deleted file mode 100644
index 411e8d693c..0000000000
--- a/widgets/text/e-entry-test.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-entry.h"
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *entry;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "EEntry Test", VERSION, argc, argv);
-  app = gnome_app_new("EEntry Test", NULL);
-
-  entry = e_entry_new();
-  gtk_object_set(GTK_OBJECT(entry),
-		 "editable", TRUE,
-		 "use_ellipsis", TRUE,
-		 NULL);
-  gnome_app_set_contents( GNOME_APP( app ), entry );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
deleted file mode 100644
index 8116895e1c..0000000000
--- a/widgets/text/e-entry.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * EEntry: An EText-based entry widget
- *
- * Authors:
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Chris Lahey     <clahey@helixcode.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * Copyright (C) 1999, 2000, 2001 Ximian Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "e-completion-view.h"
-#include "e-text.h"
-#include "e-entry.h"
-
-#define MIN_ENTRY_WIDTH  150
-#define INNER_BORDER     2
-
-#define PARENT_TYPE gtk_table_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	E_ENTRY_CHANGED,
-	E_ENTRY_ACTIVATE,
-	E_ENTRY_LAST_SIGNAL
-};
-
-static guint e_entry_signals[E_ENTRY_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_MODEL,
-	ARG_EVENT_PROCESSOR,
-	ARG_TEXT,
-	ARG_FONT,
-        ARG_FONTSET,
-	ARG_FONT_GDK,
-	ARG_ANCHOR,
-	ARG_JUSTIFICATION,
-	ARG_X_OFFSET,
-	ARG_Y_OFFSET,
-	ARG_FILL_COLOR,
-	ARG_FILL_COLOR_GDK,
-	ARG_FILL_COLOR_RGBA,
-	ARG_FILL_STIPPLE,
-	ARG_EDITABLE,
-	ARG_USE_ELLIPSIS,
-	ARG_ELLIPSIS,
-	ARG_LINE_WRAP,
-	ARG_BREAK_CHARACTERS,
-	ARG_MAX_LINES,
-	ARG_ALLOW_NEWLINES,
-	ARG_DRAW_BORDERS,
-	ARG_DRAW_BACKGROUND,
-	ARG_CURSOR_POS
-};
-
-typedef struct _EEntryPrivate EEntryPrivate;
-struct _EEntryPrivate {
-	GnomeCanvas *canvas;
-	EText *item;
-	GtkJustification justification;
-
-	guint changed_proxy_tag;
-	guint activate_proxy_tag;
-
-	/* Data related to completions */
-	ECompletion *completion;
-	EEntryCompletionHandler handler;
-	GtkWidget *completion_view;
-	guint nonempty_signal_id;
-	guint added_signal_id;
-	guint full_signal_id;
-	guint browse_signal_id;
-	guint unbrowse_signal_id;
-	guint activate_signal_id;
-	GtkWidget *completion_view_popup;
-	gboolean popup_is_visible;
-	gchar *pre_browse_text;
-	gint completion_delay;
-	guint completion_delay_tag;
-	gboolean ptr_grab;
-
-	guint draw_borders : 1;
-};
-
-static gboolean e_entry_is_empty              (EEntry *entry);
-static void e_entry_show_popup                (EEntry *entry, gboolean x);
-static void e_entry_start_completion          (EEntry *entry);
-static void e_entry_start_delayed_completion  (EEntry *entry, gint delay);
-static void e_entry_cancel_delayed_completion (EEntry *entry);
-
-static void
-canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-		      EEntry *entry)
-{
-	gint xthick;
-	gint ythick;
-	gnome_canvas_set_scroll_region (entry->priv->canvas,
-					0, 0, alloc->width, alloc->height);
-	gtk_object_set (GTK_OBJECT (entry->priv->item),
-			"clip_width", (double) (alloc->width),
-			"clip_height", (double) (alloc->height),
-			NULL);
-
-	if (entry->priv->draw_borders) {
-		xthick = 0;
-		ythick = 0;
-	} else {
-		xthick = widget->style->klass->xthickness;
-		ythick = widget->style->klass->ythickness;
-	}
-
-	switch (entry->priv->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item),
-					    alloc->width - xthick, ythick);
-		break;
-	case GTK_JUSTIFY_CENTER:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item),
-					    alloc->width / 2, ythick);
-		break;
-	default:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item),
-					    xthick, ythick);
-		break;
-	}
-}
-
-static void
-canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
-		     EEntry *entry)
-{
-	int border;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS (widget));
-	g_return_if_fail (requisition != NULL);
-
-	if (entry->priv->draw_borders)
-		border = INNER_BORDER;
-	else
-		border = 0;
-	
-	requisition->width = MIN_ENTRY_WIDTH + (widget->style->klass->xthickness + border) * 2;
-	requisition->height = (widget->style->font->ascent +
-			       widget->style->font->descent +
-			       (widget->style->klass->ythickness + border) * 2);
-}
-
-static gint
-canvas_focus_in_event (GtkWidget *widget, GdkEventFocus *focus, EEntry *entry)
-{
-	if (entry->priv->canvas->focused_item != GNOME_CANVAS_ITEM(entry->priv->item))
-		gnome_canvas_item_grab_focus(GNOME_CANVAS_ITEM(entry->priv->item));
-
-	return 0;
-}
-
-static void
-e_entry_proxy_changed (EText *text, EEntry *entry)
-{
-	if (e_entry_is_empty (entry)) {
-		e_entry_cancel_delayed_completion (entry);
-		e_entry_show_popup (entry, FALSE);
-	} else if (entry->priv->popup_is_visible)
-		e_entry_start_delayed_completion (entry, 1);
-	else if (entry->priv->completion)
-		e_entry_start_delayed_completion (entry, entry->priv->completion_delay);
-
-	gtk_signal_emit (GTK_OBJECT (entry), e_entry_signals [E_ENTRY_CHANGED]);
-}
-
-static void
-e_entry_proxy_activate (EText *text, EEntry *entry)
-{
-	gtk_signal_emit (GTK_OBJECT (entry), e_entry_signals [E_ENTRY_ACTIVATE]);
-}
-
-static void
-e_entry_init (GtkObject *object)
-{
-	EEntry *entry = E_ENTRY (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
-
-	entry->priv = g_new0 (EEntryPrivate, 1);
-	
-	entry->priv->canvas = GNOME_CANVAS (e_canvas_new ());
-
-	gtk_signal_connect (GTK_OBJECT (entry->priv->canvas),
-			    "size_allocate",
-			    GTK_SIGNAL_FUNC (canvas_size_allocate),
-			    entry);
-
-	gtk_signal_connect (GTK_OBJECT (entry->priv->canvas),
-			    "size_request",
-			    GTK_SIGNAL_FUNC (canvas_size_request),
-			    entry);
-
-	gtk_signal_connect(GTK_OBJECT (entry->priv->canvas),
-			   "focus_in_event",
-			   GTK_SIGNAL_FUNC(canvas_focus_in_event),
-			   entry);
-
-	entry->priv->draw_borders = TRUE;
-
-	entry->priv->item = E_TEXT(gnome_canvas_item_new(gnome_canvas_root (entry->priv->canvas),
-							 e_text_get_type(),
-							 "clip", TRUE,
-							 "fill_clip_rectangle", TRUE,
-							 "anchor", GTK_ANCHOR_NW,
-							 "draw_borders", TRUE,
-							 "draw_background", TRUE,
-							 "max_lines", 1,
-							 "editable", TRUE,
-							 NULL));
-
-	entry->priv->justification = GTK_JUSTIFY_LEFT;
-	gtk_table_attach (gtk_table, GTK_WIDGET (entry->priv->canvas),
-			  0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
-			  0, 0);
-	gtk_widget_show (GTK_WIDGET (entry->priv->canvas));
-
-	/*
-	 * Proxy functions: we proxy the changed and activate signals
-	 * from the item to ourselves
-	 */
-	entry->priv->changed_proxy_tag = gtk_signal_connect (GTK_OBJECT (entry->priv->item),
-							     "changed",
-							     GTK_SIGNAL_FUNC (e_entry_proxy_changed),
-							     entry);
-	entry->priv->activate_proxy_tag = gtk_signal_connect (GTK_OBJECT (entry->priv->item),
-							      "activate",
-							      GTK_SIGNAL_FUNC (e_entry_proxy_activate),
-							      entry);
-
-	entry->priv->completion_delay = 1;
-}
-
-/**
- * e_entry_construct
- * 
- * Constructs the given EEntry.
- * 
- **/
-void
-e_entry_construct (EEntry *entry)
-{
-	/* Do nothing */
-}
-
-
-/**
- * e_entry_new
- * 
- * Creates a new EEntry.
- * 
- * Returns: The new EEntry
- **/
-GtkWidget *
-e_entry_new (void)
-{
-	EEntry *entry;
-	entry = gtk_type_new (e_entry_get_type ());
-	e_entry_construct (entry);
-
-	return GTK_WIDGET (entry);
-}
-
-const gchar *
-e_entry_get_text (EEntry *entry)
-{
-	g_return_val_if_fail (entry != NULL && E_IS_ENTRY (entry), NULL);
-
-	return e_text_model_get_text (entry->priv->item->model);
-}
-
-void
-e_entry_set_text (EEntry *entry, const gchar *txt)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	e_text_model_set_text (entry->priv->item->model, txt);
-}
-
-static void
-e_entry_set_text_quiet (EEntry *entry, const gchar *txt)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	gtk_signal_handler_block (GTK_OBJECT (entry->priv->item), entry->priv->changed_proxy_tag);
-	e_entry_set_text (entry, txt);
-	gtk_signal_handler_unblock (GTK_OBJECT (entry->priv->item), entry->priv->changed_proxy_tag);
-}
-
-
-void
-e_entry_set_editable (EEntry *entry, gboolean am_i_editable)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	gtk_object_set (GTK_OBJECT (entry->priv->item), "editable", am_i_editable, NULL);
-}
-
-gint
-e_entry_get_position (EEntry *entry)
-{
-	g_return_val_if_fail (entry != NULL && E_IS_ENTRY (entry), -1);
-
-	return entry->priv->item->selection_start;
-}
-
-void
-e_entry_set_position (EEntry *entry, gint pos)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	if (pos < 0)
-		pos = 0;
-	else if (pos > e_text_model_get_text_length (entry->priv->item->model))
-		pos = e_text_model_get_text_length (entry->priv->item->model);
-
-	entry->priv->item->selection_start = entry->priv->item->selection_end = pos;
-}
-
-void
-e_entry_select_region (EEntry *entry, gint pos1, gint pos2)
-{
-	gint len;
-
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	
-	len = e_text_model_get_text_length (entry->priv->item->model);
-	pos1 = CLAMP (pos1, 0, len);
-	pos2 = CLAMP (pos2, 0, len);
-
-	entry->priv->item->selection_start = MIN (pos1, pos2);
-	entry->priv->item->selection_end   = MAX (pos1, pos2);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*** Completion-related code ***/
-
-static gboolean
-e_entry_is_empty (EEntry *entry)
-{
-	const gchar *txt = e_entry_get_text (entry);
-
-	if (txt == NULL)
-		return TRUE;
-
-	while (*txt) {
-		if (!isspace ((gint) *txt))
-			return FALSE;
-		++txt;
-	}
-	
-	return TRUE;
-}
-
-static void
-e_entry_show_popup (EEntry *entry, gboolean visible)
-{
-	GtkWidget *pop = entry->priv->completion_view_popup;
-
-	if (pop == NULL)
-		return;
-
-	if (visible) {
-		GtkAllocation *dim = &(GTK_WIDGET (entry)->allocation);
-		gint x, y, fudge;
-		const GdkEventMask grab_mask = (GdkEventMask)GDK_BUTTON_PRESS_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_RELEASE_MASK;
-
-		/* Figure out where to put our popup. */
-		gdk_window_get_origin (GTK_WIDGET (entry)->window, &x, &y);
-		x += dim->x;
-		y += dim->height + dim->y;
-
-		/* Put our popup slightly to the right and up, to try to give a visual cue that this popup
-		 is tied to this entry.  Otherwise one-row popups can sort of "blend" with an entry
-		 directly below. */
-		fudge = MAX (dim->height/10, 3); /* just in case we are using a really big font, etc. */
-		x += 2*fudge;
-		y -= fudge;
-
-		gtk_widget_set_uposition (pop, x, y);
-		e_completion_view_set_width (E_COMPLETION_VIEW (entry->priv->completion_view), dim->width);
-
-		gtk_widget_show (pop);
-
-
-		if (! entry->priv->ptr_grab) {
-			entry->priv->ptr_grab = gdk_pointer_grab (GTK_WIDGET (entry->priv->completion_view)->window, TRUE,
-								  grab_mask, NULL, NULL, GDK_CURRENT_TIME);
-			if (entry->priv->ptr_grab)
-				gtk_grab_add (GTK_WIDGET (entry->priv->completion_view));
-		}
-
-	} else {
-
-		gtk_widget_hide (pop);
-
-		if (entry->priv->ptr_grab) {
-			gdk_pointer_ungrab (GDK_CURRENT_TIME);
-			gtk_grab_remove (GTK_WIDGET (entry->priv->completion_view));
-		}
-
-		entry->priv->ptr_grab = FALSE;
-
-
-	}
-
-	e_completion_view_set_editable (E_COMPLETION_VIEW (entry->priv->completion_view), visible);
-	entry->priv->popup_is_visible = visible;
-}
-
-static void
-e_entry_refresh_popup (EEntry *entry)
-{
-	if (entry->priv->popup_is_visible)
-		e_entry_show_popup (entry, TRUE);
-}
-
-static void
-e_entry_start_completion (EEntry *entry)
-{
-	if (entry->priv->completion == NULL)
-		return;
-
-	e_entry_cancel_delayed_completion (entry);
-
-	if (e_entry_is_empty (entry))
-		return;
-	
-	e_completion_begin_search (entry->priv->completion,
-				   e_entry_get_text (entry),
-				   e_entry_get_position (entry),
-				   0); /* No limit.  Probably a bad idea. */
-}
-
-static gboolean
-start_delayed_cb (gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	entry->priv->completion_delay_tag = 0;
-	e_entry_start_completion (entry);
-	return FALSE;
-}
-
-static void
-e_entry_start_delayed_completion (EEntry *entry, gint delay)
-{
-	if (delay < 0)
-		return;
-
-	e_entry_cancel_delayed_completion (entry);
-	entry->priv->completion_delay_tag = gtk_timeout_add (MAX (delay, 1), start_delayed_cb, entry);
-}
-
-static void
-e_entry_cancel_delayed_completion (EEntry *entry)
-{
-	if (entry->priv->completion == NULL)
-		return;
-
-	if (entry->priv->completion_delay_tag) {
-		gtk_timeout_remove (entry->priv->completion_delay_tag);
-		entry->priv->completion_delay_tag = 0;
-	}
-}
-
-static void
-nonempty_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_show_popup (entry, TRUE);
-}
-
-static void
-added_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	e_entry_refresh_popup (entry);
-}
-
-static void
-full_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_show_popup (entry, view->choice_count > 0);
-}
-
-static void
-browse_cb (ECompletionView *view, const gchar *txt, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	if (txt == NULL) {
-		/* Requesting a completion. */
-		e_entry_start_completion (entry);
-		return;
-	}
-
-	if (entry->priv->pre_browse_text == NULL)
-		entry->priv->pre_browse_text = g_strdup (e_entry_get_text (entry));
-
-	/* If there is no other handler in place, echo the selected completion in
-	   the entry. */
-	if (entry->priv->handler == NULL)
-		e_entry_set_text_quiet (entry, txt);
-}
-
-static void
-unbrowse_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	if (entry->priv->pre_browse_text) {
-
-		if (entry->priv->handler == NULL)
-			e_entry_set_text_quiet (entry, entry->priv->pre_browse_text);
-
-		g_free (entry->priv->pre_browse_text);
-		entry->priv->pre_browse_text = NULL;
-	}
-
-	e_entry_show_popup (entry, FALSE);
-}
-
-static void
-activate_cb (ECompletionView *view, const gchar *txt, gpointer extra_data, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_cancel_delayed_completion (entry);
-	
-	g_free (entry->priv->pre_browse_text);
-	entry->priv->pre_browse_text = NULL;
-	e_entry_show_popup (entry, FALSE);
-
-	if (entry->priv->handler)
-		entry->priv->handler (entry, txt, extra_data);
-	else
-		e_entry_set_text (entry, txt);
-
-	e_entry_cancel_delayed_completion (entry);
-}
-
-void
-e_entry_enable_completion (EEntry *entry, ECompletion *completion)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	g_return_if_fail (completion != NULL && E_IS_COMPLETION (completion));
-
-	e_entry_enable_completion_full (entry, completion, -1, NULL);
-}
-
-static void
-button_press_cb (GtkWidget *w, GdkEvent *ev, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	GtkWidget *child;
-
-	/* Bail out if our click happened inside of our widget. */
-	child = gtk_get_event_widget (ev);
-	if (child != w) {
-		while (child) {
-			if (child == w)
-				return;
-			child = child->parent;
-		}
-	}
-
-	/* Treat this as an unbrowse */
-	unbrowse_cb (E_COMPLETION_VIEW (w), entry);
-}
-
-void
-e_entry_enable_completion_full (EEntry *entry, ECompletion *completion, gint delay, EEntryCompletionHandler handler)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	g_return_if_fail (completion != NULL && E_IS_COMPLETION (completion));
-
-	/* For now, completion can't be changed mid-stream. */
-	g_return_if_fail (entry->priv->completion == NULL);
-
-	entry->priv->completion = completion;
-	gtk_object_ref (GTK_OBJECT (completion));
-	gtk_object_sink (GTK_OBJECT (completion));
-	
-	entry->priv->completion_delay = delay;
-	entry->priv->handler = handler;
-
-	entry->priv->completion_view = e_completion_view_new (completion);
-	/* Make the up and down keys enable and disable completions. */
-	e_completion_view_set_complete_key (E_COMPLETION_VIEW (entry->priv->completion_view), GDK_Down);
-	e_completion_view_set_uncomplete_key (E_COMPLETION_VIEW (entry->priv->completion_view), GDK_Up);
-
-	gtk_signal_connect_after (GTK_OBJECT (entry->priv->completion_view),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (button_press_cb),
-				  entry);
-
-	entry->priv->nonempty_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "nonempty",
-							      GTK_SIGNAL_FUNC (nonempty_cb),
-							      entry);
-
-	entry->priv->added_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							   "added",
-							   GTK_SIGNAL_FUNC (added_cb),
-							   entry);
-
-	entry->priv->full_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							  "full",
-							  GTK_SIGNAL_FUNC (full_cb),
-							  entry);
-
-	entry->priv->browse_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							    "browse",
-							    GTK_SIGNAL_FUNC (browse_cb),
-							    entry);
-
-	entry->priv->unbrowse_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "unbrowse",
-							      GTK_SIGNAL_FUNC (unbrowse_cb),
-							      entry);
-
-	entry->priv->activate_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "activate",
-							      GTK_SIGNAL_FUNC (activate_cb),
-							      entry);
-
-	entry->priv->completion_view_popup = gtk_window_new (GTK_WINDOW_POPUP);
-			    
-	gtk_object_ref (GTK_OBJECT (entry->priv->completion_view_popup));
-	gtk_object_sink (GTK_OBJECT (entry->priv->completion_view_popup));
-	gtk_window_set_policy (GTK_WINDOW (entry->priv->completion_view_popup), FALSE, TRUE, FALSE);
-	gtk_container_add (GTK_CONTAINER (entry->priv->completion_view_popup), entry->priv->completion_view);
-	gtk_widget_show (entry->priv->completion_view);
-
-	e_completion_view_connect_keys (E_COMPLETION_VIEW (entry->priv->completion_view), GTK_WIDGET (entry->priv->canvas));
-}
-
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-static void
-et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EEntry *entry = E_ENTRY (o);
-	GtkObject *item = GTK_OBJECT (entry->priv->item);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		gtk_object_get(item,
-			       "model", &GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		gtk_object_get(item,
-			       "event_processor", &GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_TEXT:
-		gtk_object_get(item,
-			       "text", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT_GDK:
-		gtk_object_get(item,
-			       "font_gdk", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_JUSTIFICATION:
-		gtk_object_get(item,
-			       "justification", &GTK_VALUE_ENUM (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		gtk_object_get(item,
-			       "fill_color_gdk", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		gtk_object_get(item,
-			       "fill_color_rgba", &GTK_VALUE_UINT (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_STIPPLE:
-		gtk_object_get(item,
-			       "fill_stiple", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_EDITABLE:
-		gtk_object_get(item,
-			       "editable", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		gtk_object_get(item,
-			       "use_ellipsis", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_ELLIPSIS:
-		gtk_object_get(item,
-			       "ellipsis", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_LINE_WRAP:
-		gtk_object_get(item,
-			       "line_wrap", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		gtk_object_get(item,
-			       "break_characters", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_MAX_LINES:
-		gtk_object_get(item,
-			       "max_lines", &GTK_VALUE_INT (*arg),
-			       NULL);
-		break;
-	case ARG_ALLOW_NEWLINES:
-		gtk_object_get(item,
-			       "allow_newlines", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_DRAW_BORDERS:
-		GTK_VALUE_BOOL (*arg) = entry->priv->draw_borders;
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		gtk_object_get (item,
-				"draw_background", &GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-
-	case ARG_CURSOR_POS:
-		gtk_object_get (item,
-				"cursor_pos", &GTK_VALUE_INT (*arg),
-				NULL);
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EEntry *entry = E_ENTRY (o);
-	GtkObject *item = GTK_OBJECT (entry->priv->item);
-	GtkAnchorType anchor;
-	double width, height;
-	gint xthick;
-	gint ythick;
-	GtkWidget *widget = GTK_WIDGET(entry->priv->canvas);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		gtk_object_set(item,
-			       "model", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		gtk_object_set(item,
-			       "event_processor", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_TEXT:
-
-		gtk_object_set(item,
-			       "text", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT:
-		gtk_object_set(item,
-			       "font", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONTSET:
-		gtk_object_set(item,
-			       "fontset", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT_GDK:
-		gtk_object_set(item,
-			       "font_gdk", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_JUSTIFICATION:
-		entry->priv->justification = GTK_VALUE_ENUM (*arg);
-		gtk_object_get(item,
-			       "clip_width", &width,
-			       "clip_height", &height,
-			       NULL);
-
-		if (entry->priv->draw_borders) {
-			xthick = 0;
-			ythick = 0;
-		} else {
-			xthick = widget->style->klass->xthickness;
-			ythick = widget->style->klass->ythickness;
-		}
-
-		switch (entry->priv->justification) {
-		case GTK_JUSTIFY_CENTER:
-			anchor = GTK_ANCHOR_N;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item), width / 2, ythick);
-			break;
-		case GTK_JUSTIFY_RIGHT:
-			anchor = GTK_ANCHOR_NE;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item), width - xthick, ythick);
-			break;
-		default:
-			anchor = GTK_ANCHOR_NW;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->priv->item), xthick, ythick);
-			break;
-		}
-		gtk_object_set(item,
-			       "justification", entry->priv->justification,
-			       "anchor", anchor,
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR:
-		gtk_object_set(item,
-			       "fill_color", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		gtk_object_set(item,
-			       "fill_color_gdk", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		gtk_object_set(item,
-			       "fill_color_rgba", GTK_VALUE_UINT (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_STIPPLE:
-		gtk_object_set(item,
-			       "fill_stiple", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_EDITABLE:
-		gtk_object_set(item,
-			       "editable", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		gtk_object_set(item,
-			       "use_ellipsis", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_ELLIPSIS:
-		gtk_object_set(item,
-			       "ellipsis", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_LINE_WRAP:
-		gtk_object_set(item,
-			       "line_wrap", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		gtk_object_set(item,
-			       "break_characters", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_MAX_LINES:
-		gtk_object_set(item,
-			       "max_lines", GTK_VALUE_INT (*arg),
-			       NULL);
-		break;
-
-	case ARG_ALLOW_NEWLINES:
-		gtk_object_set(item,
-			       "allow_newlines", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_DRAW_BORDERS: {
-		gboolean need_queue;
-		
-		need_queue = (entry->priv->draw_borders ^ GTK_VALUE_BOOL (*arg));
-		gtk_object_set (item, "draw_borders", GTK_VALUE_BOOL (*arg), NULL);
-		entry->priv->draw_borders = GTK_VALUE_BOOL (*arg);
-		if (need_queue)
-			gtk_widget_queue_resize (GTK_WIDGET (entry));
-		break;
-	}
-
-	case ARG_CURSOR_POS:
-		gtk_object_set (item,
-				"cursor_pos", GTK_VALUE_INT (*arg), NULL);
-		break;
-		
-	case ARG_DRAW_BACKGROUND:
-		gtk_object_set (item, "draw_background",
-				GTK_VALUE_BOOL (*arg), NULL);
-		break;
-	}
-}
-
-static void
-e_entry_destroy (GtkObject *object)
-{
-	EEntry *entry = E_ENTRY (object);
-
-	if (entry->priv->completion_delay_tag)
-		gtk_timeout_remove (entry->priv->completion_delay_tag);
-
-	if (entry->priv->completion)
-		gtk_object_unref (GTK_OBJECT (entry->priv->completion));
-	if (entry->priv->completion_view_popup)
-		gtk_widget_destroy (entry->priv->completion_view_popup);
-	g_free (entry->priv->pre_browse_text);
-
-	if (entry->priv->ptr_grab)
-		gdk_pointer_ungrab (GDK_CURRENT_TIME);
-
-	g_free (entry->priv);
-	entry->priv = NULL;
-}
-
-static void
-e_entry_class_init (GtkObjectClass *object_class)
-{
-	EEntryClass *klass = E_ENTRY_CLASS(object_class);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = et_set_arg;
-	object_class->get_arg = et_get_arg;
-	object_class->destroy = e_entry_destroy;
-
-	klass->changed = NULL;
-	klass->activate = NULL;
-
-	e_entry_signals[E_ENTRY_CHANGED] = gtk_signal_new ("changed",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   GTK_SIGNAL_OFFSET (EEntryClass, changed),
-							   gtk_marshal_NONE__NONE,
-							   GTK_TYPE_NONE, 0);
-
-	e_entry_signals[E_ENTRY_ACTIVATE] = gtk_signal_new ("activate",
-							    GTK_RUN_LAST,
-							    object_class->type,
-							    GTK_SIGNAL_OFFSET (EEntryClass, activate),
-							    gtk_marshal_NONE__NONE,
-							    GTK_TYPE_NONE, 0);
-
-
-	gtk_object_class_add_signals (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("EEntry::model",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL);  
-	gtk_object_add_arg_type ("EEntry::event_processor",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_EVENT_PROCESSOR);
-	gtk_object_add_arg_type ("EEntry::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TEXT);
-	gtk_object_add_arg_type ("EEntry::font",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONT);
-	gtk_object_add_arg_type ("EEntry::fontset",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONTSET);
-	gtk_object_add_arg_type ("EEntry::font_gdk",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_FONT_GDK);
-	gtk_object_add_arg_type ("EEntry::justification",
-				 GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFICATION);
-	gtk_object_add_arg_type ("EEntry::fill_color",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FILL_COLOR);
-	gtk_object_add_arg_type ("EEntry::fill_color_gdk",
-				 GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_FILL_COLOR_GDK);
-	gtk_object_add_arg_type ("EEntry::fill_color_rgba",
-				 GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA);
-	gtk_object_add_arg_type ("EEntry::fill_stipple",
-				 GTK_TYPE_GDK_WINDOW, GTK_ARG_READWRITE, ARG_FILL_STIPPLE);
-	gtk_object_add_arg_type ("EEntry::editable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EEntry::use_ellipsis",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_USE_ELLIPSIS);
-	gtk_object_add_arg_type ("EEntry::ellipsis",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ELLIPSIS);
-	gtk_object_add_arg_type ("EEntry::line_wrap",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_LINE_WRAP);
-	gtk_object_add_arg_type ("EEntry::break_characters",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_BREAK_CHARACTERS);
-	gtk_object_add_arg_type ("EEntry::max_lines",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_MAX_LINES);
-	gtk_object_add_arg_type ("EEntry::allow_newlines",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-	gtk_object_add_arg_type ("EEntry::draw_borders",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BORDERS);
-	gtk_object_add_arg_type ("EEntry::draw_background",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BACKGROUND);
-	gtk_object_add_arg_type ("EEntry::cursor_pos",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_CURSOR_POS);
-}
-
-E_MAKE_TYPE(e_entry, "EEntry", EEntry, e_entry_class_init, e_entry_init, PARENT_TYPE);
diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
deleted file mode 100644
index 8b62ddcc29..0000000000
--- a/widgets/text/e-entry.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * EEntry: An EText-based entry widget
- *
- * Authors:
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Chris Lahey     <clahey@helixcode.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * Copyright (C) 1999, 2000, 2001 Ximian Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef _E_ENTRY_H_
-#define _E_ENTRY_H_
-
-#include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
-#include "e-completion.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_ENTRY_TYPE        (e_entry_get_type ())
-#define E_ENTRY(o)          (GTK_CHECK_CAST ((o), E_ENTRY_TYPE, EEntry))
-#define E_ENTRY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ENTRY_TYPE, EEntryClass))
-#define E_IS_ENTRY(o)       (GTK_CHECK_TYPE ((o), E_ENTRY_TYPE))
-#define E_IS_ENTRY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ENTRY_TYPE))
-
-typedef struct _EEntry EEntry;
-typedef struct _EEntryClass EEntryClass;
-struct _EEntryPrivate;
-
-typedef void (*EEntryCompletionHandler) (EEntry *entry, const gchar *text, gpointer extra_data);
-
-struct _EEntry {
-	GtkTable parent;
-	struct _EEntryPrivate *priv;
-};
-
-struct _EEntryClass {
-	GtkTableClass parent_class;
-
-	void (* changed) (EEntry *entry);
-	void (* activate) (EEntry *entry);
-};
-
-GtkType      e_entry_get_type          (void);
-
-void         e_entry_construct         (EEntry *entry);
-GtkWidget   *e_entry_new               (void);
-
-const gchar *e_entry_get_text          (EEntry *entry);
-void         e_entry_set_text          (EEntry *entry, const gchar *text);
-
-gint         e_entry_get_position      (EEntry *entry);
-void         e_entry_set_position      (EEntry *entry, gint);
-void         e_entry_select_region     (EEntry *entry, gint start, gint end);
-
-void         e_entry_set_editable      (EEntry *entry, gboolean editable);
-
-void         e_entry_enable_completion      (EEntry *entry, ECompletion *completion);
-void         e_entry_enable_completion_full (EEntry *entry, ECompletion *completion, gint autocomplete_delay,
-					     EEntryCompletionHandler handler);
-
-END_GNOME_DECLS
-
-#endif /* _E_ENTRY_H_ */
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
deleted file mode 100644
index 7320c48e36..0000000000
--- a/widgets/text/e-table-text-model.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETableTextModel - Text item model for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#include <config.h>
-#include <ctype.h>
-#include "e-table-text-model.h"
-
-static void e_table_text_model_class_init (ETableTextModelClass *class);
-static void e_table_text_model_init (ETableTextModel *model);
-static void e_table_text_model_destroy (GtkObject *object);
-
-static const gchar *e_table_text_model_get_text (ETextModel *model);
-static void e_table_text_model_set_text (ETextModel *model, const gchar *text);
-static void e_table_text_model_insert (ETextModel *model, gint postion, const gchar *text);
-static void e_table_text_model_insert_length (ETextModel *model, gint postion, const gchar *text, gint length);
-static void e_table_text_model_delete (ETextModel *model, gint postion, gint length);
-
-static GtkObject *parent_class;
-
-
-
-/**
- * e_table_text_model_get_type:
- * @void: 
- * 
- * Registers the &ETableTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ETableTextModel class.
- **/
-GtkType
-e_table_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ETableTextModel",
-			sizeof (ETableTextModel),
-			sizeof (ETableTextModelClass),
-			(GtkClassInitFunc) e_table_text_model_class_init,
-			(GtkObjectInitFunc) e_table_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (e_text_model_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_table_text_model_class_init (ETableTextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GtkObjectClass *) klass;
-	model_class = (ETextModelClass *) klass;
-
-	parent_class = gtk_type_class (e_text_model_get_type ());
-
-	model_class->get_text = e_table_text_model_get_text;
-	model_class->set_text = e_table_text_model_set_text;
-	model_class->insert = e_table_text_model_insert;
-	model_class->insert_length = e_table_text_model_insert_length;
-	model_class->delete = e_table_text_model_delete;
-	
-	object_class->destroy = e_table_text_model_destroy;
-}
-
-/* Object initialization function for the text item */
-static void
-e_table_text_model_init (ETableTextModel *model)
-{
-	model->model = NULL;
-	model->row = 0;
-	model->model_col = 0;
-	model->cell_changed_signal_id = 0;
-	model->row_changed_signal_id = 0;
-}
-
-/* Destroy handler for the text item */
-static void
-e_table_text_model_destroy (GtkObject *object)
-{
-	ETableTextModel *model;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TABLE_TEXT_MODEL (object));
-
-	model = E_TABLE_TEXT_MODEL (object);
-	
-	if (model->model)
-		g_assert (GTK_IS_OBJECT (model->model));
-
-	if (model->cell_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT(model->model), 
-				      model->cell_changed_signal_id);
-
-	if (model->row_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT(model->model), 
-				      model->row_changed_signal_id);
-
-	if (model->model)
-		gtk_object_unref (GTK_OBJECT(model->model));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-static const gchar *
-e_table_text_model_get_text (ETextModel *text_model)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model)
-		return (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-	else
-		return "";
-}
-
-static void
-e_table_text_model_set_text (ETextModel *text_model, const gchar *text)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model)
-		e_table_model_set_value_at (model->model, model->model_col, model->row, (void *) text);
-}
-
-static void
-e_table_text_model_insert (ETextModel *text_model, gint position, const gchar *text)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%s%s", position, temp, text, temp + position);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-e_table_text_model_insert_length (ETextModel *text_model, gint position, const gchar *text, gint length)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%.*s%s", position, temp, length, text, temp + position);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-e_table_text_model_delete (ETextModel *text_model, gint position, gint length)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%s", position, temp, temp + position + length);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-cell_changed (ETableModel *table_model, int model_col, int row, ETableTextModel *model)
-{
-	if (model->model_col == model_col &&
-	    model->row == row)
-		e_text_model_changed (E_TEXT_MODEL(model));
-}
-
-static void
-row_changed (ETableModel *table_model, int row, ETableTextModel *model)
-{
-	if (model->row == row)
-		e_text_model_changed (E_TEXT_MODEL(model));
-}
-
-ETableTextModel *
-e_table_text_model_new (ETableModel *table_model, int row, int model_col)
-{
-	ETableTextModel *model;
-
-	g_return_val_if_fail(table_model != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(table_model), NULL);
-
-	model = gtk_type_new (e_table_text_model_get_type ());
-	model->model = table_model;
-	if (model->model){
-		gtk_object_ref (GTK_OBJECT(model->model));
-		model->cell_changed_signal_id = 
-			gtk_signal_connect (GTK_OBJECT(model->model),
-					   "model_cell_changed",
-					   GTK_SIGNAL_FUNC(cell_changed),
-					   model);
-		model->row_changed_signal_id = 
-			gtk_signal_connect (GTK_OBJECT(model->model),
-					   "model_row_changed",
-					   GTK_SIGNAL_FUNC(row_changed),
-					   model);
-	}
-	model->row = row;
-	model->model_col = model_col;
-	return model;
-}
-
diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h
deleted file mode 100644
index 5cf0b8a231..0000000000
--- a/widgets/text/e-table-text-model.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETableTextModel - Text item for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#ifndef E_TABLE_TEXT_MODEL_H
-#define E_TABLE_TEXT_MODEL_H
-
-#include <gnome.h>
-#include <gal/e-text/e-text-model.h>
-#include <gal/e-table/e-table-model.h>
-
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TABLE_TEXT_MODEL            (e_table_text_model_get_type ())
-#define E_TABLE_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TABLE_TEXT_MODEL, ETableTextModel))
-#define E_TABLE_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TABLE_TEXT_MODEL, ETableTextModelClass))
-#define E_IS_TABLE_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TABLE_TEXT_MODEL))
-#define E_IS_TABLE_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TABLE_TEXT_MODEL))
-
-typedef struct _ETableTextModel ETableTextModel;
-typedef struct _ETableTextModelClass ETableTextModelClass;
-
-struct _ETableTextModel {
-	ETextModel parent;
-
-	ETableModel *model;
-	int row;
-	int model_col;
-
-	int cell_changed_signal_id;
-	int row_changed_signal_id;
-};
-
-struct _ETableTextModelClass {
-	ETextModelClass parent_class;
-
-};
-
-
-/* Standard Gtk function */
-GtkType e_table_text_model_get_type (void);
-ETableTextModel *e_table_text_model_new (ETableModel *table_model, int row, int model_col);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
deleted file mode 100644
index 407a661b05..0000000000
--- a/widgets/text/e-text-model-repos.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Standard ETextModelReposFn definitions
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- */
-
-#include "e-text-model-repos.h"
-
-#define MODEL_CLAMP(model, pos) (CLAMP((pos), 0, strlen((model)->text)))
-
-gint
-e_repos_shift (gint pos, gpointer data)
-{
-	EReposShift *info = (EReposShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	return e_text_model_validate_position (info->model, pos + info->change);
-}
-
-gint
-e_repos_absolute (gint pos, gpointer data)
-{
-	EReposAbsolute *info = (EReposAbsolute *) data;
-	g_return_val_if_fail (data, -1);
-
-	pos = info->pos;
-	if (pos < 0) {
-		gint len = e_text_model_get_text_length (info->model);
-		pos += len + 1;
-	}
-	
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_insert_shift (gint pos, gpointer data)
-{
-	EReposInsertShift *info = (EReposInsertShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	if (pos >= info->pos)
-		pos += info->len;
-
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_delete_shift (gint pos, gpointer data)
-{
-	EReposDeleteShift *info = (EReposDeleteShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	if (pos > info->pos + info->len)
-		pos -= info->len;
-	else if (pos > info->pos)
-		pos = info->pos;
-
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_clamp (gint pos, gpointer data)
-{
-	ETextModel *model;
-
-	g_return_val_if_fail (data != NULL && E_IS_TEXT_MODEL (data), -1);
-	model = E_TEXT_MODEL (data);
-
-	return e_text_model_validate_position (model, pos);
-}
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
deleted file mode 100644
index 620e41a415..0000000000
--- a/widgets/text/e-text-model-repos.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Standard ETextModelReposFn definitions
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- */
-
-#ifndef E_TEXT_MODEL_REPOS_H
-#define E_TEXT_MODEL_REPOS_H
-
-#include "e-text-model.h"
-
-typedef struct {
-	ETextModel *model;
-	gint change;  /* Relative change to position. */
-} EReposShift;
-
-gint e_repos_shift (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Position to move to.  Negative values count from the end buffer.
-		      (i.e. -1 puts cursor at the end, -2 one character from end, etc.) */
-} EReposAbsolute;
-
-gint e_repos_absolute (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Location of first inserted character. */
-	gint len;  /* Number of characters inserted. */
-} EReposInsertShift;
-
-gint e_repos_insert_shift (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Location of first deleted character. */
-	gint len;  /* Number of characters deleted. */
-} EReposDeleteShift; 
-
-gint e_repos_delete_shift (gint pos, gpointer data);
-
-
-/* For e_repos_clamp, data is a pointer to an ETextModel.  The only repositioning
-   that occurs is to avoid buffer overruns. */
-
-gint e_repos_clamp (gint pos, gpointer data);
-
-#endif
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
deleted file mode 100644
index 9bf73962b0..0000000000
--- a/widgets/text/e-text-model-test.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  ETextModelTest
-*/
-
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-text-model.h"
-#include "e-text-model-uri.h"
-#include "e-text.h"
-#include <gal/util/e-util.h>
-
-#if 0
-static void
-describe_model (ETextModel *model)
-{
-  gint i, N;
-  g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-  N = e_text_model_object_count (model);
-
-  g_print ("text: %s\n", e_text_model_get_text (model));
-  g_print ("objs: %d\n", N);
-
-  for (i=0; i<N; ++i) {
-    gchar *s = e_text_model_strdup_nth_object (model, i);
-    g_print ("obj%d: %s\n", i, s);
-    g_free (s);
-  }
-}
-#endif
-
-int
-main (int argc, gchar **argv)
-{
-  GtkWidget *win[2], *canvas[2];
-  GnomeCanvasItem *item[2];
-  ETextModel *model;
-  gint i;
-
-  gnome_init ("ETextModelTest", "0.0", argc, argv);
-
-  model = e_text_model_uri_new ();
-
-  e_text_model_set_text (model, "My favorite website is http://www.ximian.com.  My next favorite www.assbarn.com.");
-
-  //  describe_model (model);
-  
-  for (i=0; i<2; ++i) {
-    win[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  
-    gtk_widget_push_visual (gdk_rgb_get_visual ());
-    gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-    canvas[i] = e_canvas_new ();
-    gtk_widget_pop_visual ();
-    gtk_widget_pop_colormap ();
-
-    item[i] = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas[i])),
-				     e_text_get_type (),
-				     "model", model,
-				     "font", "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
-				     "anchor", GTK_ANCHOR_NORTH,
-				     "line_wrap", TRUE,
-				     "width", 150.0,
-				     "editable", TRUE,
-				     NULL);
-
-    gtk_container_add (GTK_CONTAINER (win[i]), canvas[i]);
-    gtk_widget_show_all (win[i]);
-  }
-
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
deleted file mode 100644
index 55b293016f..0000000000
--- a/widgets/text/e-text-model-uri.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ETextModelURI - A Text Model w/ clickable URIs
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@gnu.org>
- *
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <regex.h>
-#include "e-text-model-uri.h"
-
-static void e_text_model_uri_class_init (ETextModelURIClass *class);
-static void e_text_model_uri_init (ETextModelURI *model);
-static void e_text_model_uri_destroy (GtkObject *object);
-
-static void objectify_uris (ETextModelURI *model);
-
-static void e_text_model_uri_objectify (ETextModel *model);
-static gint e_text_model_uri_validate_pos (ETextModel *model, gint pos);
-static gint e_text_model_uri_get_obj_count (ETextModel *model);
-static const gchar *e_text_model_uri_get_nth_object (ETextModel *model, gint i, gint *len);
-static void e_text_model_uri_activate_nth_object (ETextModel *model, gint);
-
-typedef struct _ObjInfo ObjInfo;
-struct _ObjInfo {
-	gint offset, len;
-};
-
-static GtkObject *parent_class;
-
-GtkType
-e_text_model_uri_get_type (void)
-{
-	static GtkType model_uri_type = 0;
-	
-	if (!model_uri_type) {
-		GtkTypeInfo model_uri_info = {
-			"ETextModelURI",
-			sizeof (ETextModelURI),
-			sizeof (ETextModelURIClass),
-			(GtkClassInitFunc) e_text_model_uri_class_init,
-			(GtkObjectInitFunc) e_text_model_uri_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-		
-		model_uri_type = gtk_type_unique (e_text_model_get_type (), &model_uri_info);
-	}
-	
-	return model_uri_type;
-}
-
-static void
-e_text_model_uri_class_init (ETextModelURIClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GtkObjectClass *) klass;
-	model_class = E_TEXT_MODEL_CLASS (klass);
-
-	parent_class = gtk_type_class (e_text_model_get_type ());
-
-	object_class->destroy = e_text_model_uri_destroy;
-
-	model_class->object_activated = e_text_model_uri_activate_nth_object;
-
-	model_class->objectify = e_text_model_uri_objectify;
-	model_class->validate_pos = e_text_model_uri_validate_pos;
-	model_class->obj_count = e_text_model_uri_get_obj_count;
-	model_class->get_nth_obj = e_text_model_uri_get_nth_object;
-
-}
-
-static void
-e_text_model_uri_init (ETextModelURI *model)
-{
-
-}
-
-static void
-e_text_model_uri_destroy (GtkObject *object)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (object);
-	GList *iter;
-
-	if (model_uri->objectify_idle) {
-		gtk_idle_remove (model_uri->objectify_idle);
-		model_uri->objectify_idle = 0;
-	}
-
-	for (iter = model_uri->uris; iter != NULL; iter = g_list_next (iter))
-		g_free (iter->data);
-	g_list_free (model_uri->uris);
-	model_uri->uris = NULL;
-	
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-
-}
-
-static const gchar *uri_regex[] = {
-	"(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp))[-A-Za-z0-9\\.]+(:[0-9]*)?/[-A-Za-z0-9_\\$\\.\\+\\!\\*\\(\\),;:@&=\\?/~\\#\\%]*[^]'\\.}>\\) ,\\\"]",
-        "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp))[-A-Za-z0-9\\.]+[-A-Za-z0-9](:[0-9]*)?",
-        "mailto:[A-Za-z0-9_]+@[-A-Za-z0-9_]+\\.[-A-Za-z0-9\\.]+[-A-Za-z0-9]",
-	NULL
-};
-static gint regex_count = 0;
-static regex_t *regex_compiled = NULL;
-
-static void
-regex_init (void)
-{
-	gint i;
-
-	if (regex_count != 0)
-		return;
-
-	while (uri_regex[regex_count]) ++regex_count;
-
-	regex_compiled = g_new0 (regex_t, regex_count);
-	
-	for (i=0; i<regex_count; ++i) {
-		if (regcomp (&regex_compiled[i], uri_regex[i], REG_EXTENDED))
-			g_error ("Bad regex?: %s", uri_regex[i]);
-	}
-}
-
-
-static void
-objectify_uris (ETextModelURI *model_uri)
-{
-	static gboolean objectifying = FALSE;
-
-	ETextModel *model = E_TEXT_MODEL (model_uri);
-	const gchar *txt;
-	GList *iter, *old_uris;
-	gint offset, len;
-	gboolean found_match;
-	regmatch_t match;
-	gboolean changed;
-
-	if (objectifying)
-		return;
-
-	objectifying = TRUE;
-
-	if (regex_count == 0)
-		regex_init ();
-
-	txt = e_text_model_get_text (model);
-	len  = e_text_model_get_text_length (model);
-
-	old_uris = model_uri->uris;
-	model_uri->uris = NULL;
-
-	if (txt) {
-		offset = 0;
-		found_match = TRUE;
-
-		while (offset < len && found_match) {
-			
-			gint i, so=-1, eo=-1;
-
-			found_match = FALSE;
-			
-			for (i=0; i<regex_count; ++i) {
-				
-				if (regexec (&regex_compiled[i], txt+offset, 1, &match, 0) == 0) {
-
-					/* Take earliest match possible.  In case of a tie, take the
-					   largest possible match. */
-					if (!found_match
-					    || match.rm_so < so
-					    || (match.rm_so == so && match.rm_eo > eo)) {
-						so = match.rm_so;
-						eo = match.rm_eo;
-					}
-					found_match = TRUE;
-				}
-			}
-			
-			if (found_match) {
-				
-				ObjInfo *info = g_new0 (ObjInfo, 1);
-				info->offset = offset + so;
-				info->len = eo - so;
-
-				model_uri->uris = g_list_append (model_uri->uris, info);
-				
-				offset += eo;
-			}
-		}
-	}
-
-	changed = (g_list_length (old_uris) != g_list_length (model_uri->uris));
-
-	if (!changed) {
-		/* Check that there is a 1-1 correspondence between object positions. */
-		GList *jter;
-
-		for (iter = model_uri->uris; iter != NULL && !changed; iter = g_list_next (iter)) {
-			ObjInfo *info = (ObjInfo *) iter->data;
-			found_match = FALSE;
-			for (jter = old_uris; jter != NULL && !found_match; jter = g_list_next (jter)) {
-				ObjInfo *jnfo = (ObjInfo *) jter->data;
-
-				if (info->offset == jnfo->offset && info->len == jnfo->len)
-					found_match = TRUE;
-			}
-			changed = !found_match;
-		}
-	}
-
-	if (changed)
-		e_text_model_changed (model);
-
-	/* Free old uris */
-	for (iter = old_uris; iter != NULL; iter = g_list_next (iter))
-		g_free (iter->data);
-	g_list_free (old_uris);
-
-	objectifying = FALSE;
-}
-
-static gboolean
-objectify_idle_cb (gpointer ptr)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (ptr);
-
-	g_assert (model_uri->objectify_idle);
-	objectify_uris (model_uri);
-	model_uri->objectify_idle = 0;
-
-	return FALSE;
-}
-
-static void
-e_text_model_uri_objectify (ETextModel *model)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-
-	if (model_uri->objectify_idle == 0)
-		model_uri->objectify_idle = gtk_idle_add (objectify_idle_cb, model);
-
-	if (E_TEXT_MODEL_CLASS(parent_class)->objectify)
-		E_TEXT_MODEL_CLASS(parent_class)->objectify (model);
-}
-
-static void
-objectify_idle_flush (ETextModelURI *model_uri)
-{
-	if (model_uri->objectify_idle) {
-		gtk_idle_remove (model_uri->objectify_idle);
-		model_uri->objectify_idle = 0;
-		objectify_uris (model_uri);
-	}
-}
-
-static gint
-e_text_model_uri_validate_pos (ETextModel *model, gint pos)
-{
-	gint obj_num;
-
-	/* Cause us to skip over objects */
-
-	obj_num = e_text_model_get_object_at_offset (model, pos);
-	if (obj_num != -1) {
-		gint pos0, pos1, mp;
-		e_text_model_get_nth_object_bounds (model, obj_num, &pos0, &pos1);
-		mp = (pos0 + pos1)/2;
-		if (pos0 < pos && pos < mp)
-			pos = pos1;
-		else if (mp <= pos && pos < pos1)
-			pos = pos0;
-	}
-
-	
-
-	if (E_TEXT_MODEL_CLASS (parent_class)->validate_pos)
-		pos = E_TEXT_MODEL_CLASS (parent_class)->validate_pos (model, pos);
-
-	return pos;
-}
-
-static gint
-e_text_model_uri_get_obj_count (ETextModel *model)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-
-	objectify_idle_flush (model_uri);
-
-	return g_list_length (model_uri->uris);
-}
-
-static const gchar *
-e_text_model_uri_get_nth_object (ETextModel *model, gint i, gint *len)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-	ObjInfo *info;
-	const gchar *txt;
-
-	objectify_idle_flush (model_uri);
-	
-	txt = e_text_model_get_text (model);
-
-	info = (ObjInfo *) g_list_nth_data (model_uri->uris, i);
-	g_return_val_if_fail (info != NULL, NULL);
-
-
-	if (len)
-		*len = info->len;
-	return txt + info->offset;
-}
-
-static void
-e_text_model_uri_activate_nth_object (ETextModel *model, gint i)
-{
-	gchar *obj_str;
-
-	objectify_idle_flush (E_TEXT_MODEL_URI (model));
-	
-	obj_str = e_text_model_strdup_nth_object (model, i);
-	gnome_url_show (obj_str);
-	g_free (obj_str);
-}
-
-ETextModel *
-e_text_model_uri_new (void)
-{
-	return E_TEXT_MODEL (gtk_type_new (e_text_model_uri_get_type ()));
-}
-
-
-/* $Id$ */
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
deleted file mode 100644
index d070e34f53..0000000000
--- a/widgets/text/e-text-model-uri.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ETextModelURI - A Text Model w/ clickable URIs
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@gnu.org>
- *
- */
-
-#ifndef E_TEXT_MODEL_URI_H
-#define E_TEXT_MODEL_URI_H
-
-#include <gnome.h>
-#include <gal/e-text/e-text-model.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TEXT_MODEL_URI            (e_text_model_get_type ())
-#define E_TEXT_MODEL_URI(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT_MODEL_URI, ETextModelURI))
-#define E_TEXT_MODEL_URI_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL_URI, ETextModelURIClass))
-#define E_IS_TEXT_MODEL_URI(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT_MODEL_URI))
-#define E_IS_TEXT_MODEL_URI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL_URI))
-
-typedef struct _ETextModelURI ETextModelURI;
-typedef struct _ETextModelURIClass ETextModelURIClass;
-
-struct _ETextModelURI {
-	ETextModel item;
-	GList *uris;
-	
-	guint objectify_idle;
-};
-
-struct _ETextModelURIClass {
-  ETextModelClass parent_class;
-};
-
-GtkType e_text_model_uri_get_type (void);
-ETextModel *e_text_model_uri_new (void);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
deleted file mode 100644
index 5eccaff9fb..0000000000
--- a/widgets/text/e-text-model.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETextModel - Text item model for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#undef  PARANOID_DEBUGGING
-
-#include <config.h>
-#include <ctype.h>
-#include "e-text-model-repos.h"
-#include "e-text-model.h"
-
-#define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT (obj)->klass))
-
-enum {
-	E_TEXT_MODEL_CHANGED,
-	E_TEXT_MODEL_REPOSITION,
-	E_TEXT_MODEL_OBJECT_ACTIVATED,
-	E_TEXT_MODEL_LAST_SIGNAL
-};
-
-static guint e_text_model_signals[E_TEXT_MODEL_LAST_SIGNAL] = { 0 };
-
-struct _ETextModelPrivate {
-	gchar   *text;
-	gint     len;
-};
-
-static void e_text_model_class_init (ETextModelClass *class);
-static void e_text_model_init       (ETextModel *model);
-static void e_text_model_destroy    (GtkObject *object);
-
-static gint         e_text_model_real_validate_position (ETextModel *, gint pos);
-static const gchar *e_text_model_real_get_text          (ETextModel *model);
-static gint         e_text_model_real_get_text_length   (ETextModel *model);
-static void         e_text_model_real_set_text          (ETextModel *model, const gchar *text);
-static void         e_text_model_real_insert            (ETextModel *model, gint postion, const gchar *text);
-static void         e_text_model_real_insert_length     (ETextModel *model, gint postion, const gchar *text, gint length);
-static void         e_text_model_real_delete            (ETextModel *model, gint postion, gint length);
-
-static GtkObject *parent_class;
-
-
-
-/**
- * e_text_model_get_type:
- * @void: 
- * 
- * Registers the &ETextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ETextModel class.
- **/
-GtkType
-e_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ETextModel",
-			sizeof (ETextModel),
-			sizeof (ETextModelClass),
-			(GtkClassInitFunc) e_text_model_class_init,
-			(GtkObjectInitFunc) e_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (gtk_object_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_text_model_class_init (ETextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_text_model_signals[E_TEXT_MODEL_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_text_model_signals[E_TEXT_MODEL_REPOSITION] =
-		gtk_signal_new ("reposition",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, reposition),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED] =
-		gtk_signal_new ("object_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, object_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL);
-	
-	/* No default signal handlers. */
-	klass->changed          = NULL;
-	klass->reposition       = NULL;
-	klass->object_activated = NULL;
-	
-	klass->validate_pos  = e_text_model_real_validate_position;
-
-	klass->get_text      = e_text_model_real_get_text;
-	klass->get_text_len  = e_text_model_real_get_text_length;
-	klass->set_text      = e_text_model_real_set_text;
-	klass->insert        = e_text_model_real_insert;
-	klass->insert_length = e_text_model_real_insert_length;
-	klass->delete        = e_text_model_real_delete;
-
-	/* We explicitly don't define default handlers for these. */
-	klass->objectify        = NULL;
-	klass->obj_count        = NULL;
-	klass->get_nth_obj      = NULL;
-	
-	object_class->destroy = e_text_model_destroy;
-}
-
-/* Object initialization function for the text item */
-static void
-e_text_model_init (ETextModel *model)
-{
-	model->priv = g_new0 (struct _ETextModelPrivate, 1);
-	model->priv->text = g_strdup ("");
-	model->priv->len  = 0;
-}
-
-/* Destroy handler for the text item */
-static void
-e_text_model_destroy (GtkObject *object)
-{
-	ETextModel *model;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (object));
-
-	model = E_TEXT_MODEL (object);
-
-	g_free (model->priv->text);
-
-	g_free (model->priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static gint
-e_text_model_real_validate_position (ETextModel *model, gint pos)
-{
-	gint len;
-
-	if (pos < 0)
-		pos = 0;
-	else if (pos > ( len = e_text_model_get_text_length (model) ))
-		pos = len;
-
-	return pos;
-}
-
-static const gchar *
-e_text_model_real_get_text (ETextModel *model)
-{
-	if (model->priv->text)
-		return model->priv->text;
-	else
-		return "";
-}
-
-static gint
-e_text_model_real_get_text_length (ETextModel *model)
-{
-	if (model->priv->len < 0)
-		model->priv->len = strlen (e_text_model_get_text (model));
-
-	return model->priv->len;
-}
-
-static void
-e_text_model_real_set_text (ETextModel *model, const gchar *text)
-{
-	EReposAbsolute repos;
-	gboolean changed = FALSE;
-
-	if (text == NULL) {
-
-		changed = (model->priv->text != NULL);
-
-		g_free (model->priv->text);
-		model->priv->text = NULL;
-		model->priv->len = -1;
-
-	} else if (model->priv->text == NULL || strcmp (model->priv->text, text)) {
-		
-		g_free (model->priv->text);
-		model->priv->text = g_strdup (text);
-		model->priv->len = -1;
-
-		changed = TRUE;
-	}
-
-	if (changed) {
-		e_text_model_changed (model);
-		repos.model = model;
-		repos.pos = -1;
-		e_text_model_reposition (model, e_repos_absolute, &repos);
-	}
-}
-
-static void
-e_text_model_real_insert (ETextModel *model, gint position, const gchar *text)
-{
-	EReposInsertShift repos;
-	gchar *temp;
-	gint ins_len;
-
-	temp = g_strdup_printf ("%.*s%s%s", position, model->priv->text, text, model->priv->text + position);
-	ins_len = strlen (text);
-
-	if (model->priv->text)
-		g_free (model->priv->text);
-
-	model->priv->text = temp;
-	
-	if (model->priv->len >= 0)
-		model->priv->len += ins_len;
-	
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos = position;
-	repos.len = ins_len;
-
-	e_text_model_reposition (model, e_repos_insert_shift, &repos);
-}
-
-static void
-e_text_model_real_insert_length (ETextModel *model, gint position, const gchar *text, gint length)
-{
-	EReposInsertShift repos;
-	gchar *temp = g_strdup_printf ("%.*s%.*s%s", position, model->priv->text, length, text, model->priv->text + position);
-
-	if (model->priv->text)
-		g_free (model->priv->text);
-	model->priv->text = temp;
-
-	if (model->priv->len >= 0)
-		model->priv->len += length;
-
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos   = position;
-	repos.len   = length;
-
-	e_text_model_reposition (model, e_repos_insert_shift, &repos);
-}
-
-static void
-e_text_model_real_delete (ETextModel *model, gint position, gint length)
-{
-	EReposDeleteShift repos;
- 
-	memmove (model->priv->text + position, model->priv->text + position + length, strlen (model->priv->text + position + length) + 1);
-	
-	if (model->priv->len >= 0)
-		model->priv->len -= length;
-
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos   = position;
-	repos.len   = length;
-
-	e_text_model_reposition (model, e_repos_delete_shift, &repos);
-}
-
-void
-e_text_model_changed (ETextModel *model)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	/*
-	  Objectify before emitting any signal.
-	  While this method could, in theory, do pretty much anything, it is meant
-	  for scanning objects and converting substrings into embedded objects.
-	*/
-	if (CLASS (model)->objectify)
-		CLASS (model)->objectify (model);
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_text_model_signals[E_TEXT_MODEL_CHANGED]);
-}
-
-void
-e_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (fn != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_text_model_signals[E_TEXT_MODEL_REPOSITION],
-			 fn, repos_data);
-}
-
-gint
-e_text_model_validate_position (ETextModel *model, gint pos)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->validate_pos)
-		pos = CLASS (model)->validate_pos (model, pos);
-
-	return pos;
-}
-
-const gchar *
-e_text_model_get_text (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	if (CLASS (model)->get_text)
-		return CLASS (model)->get_text (model);
-
-	return "";
-}
-
-gint
-e_text_model_get_text_length (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->get_text_len (model)) {
-
-		gint len = CLASS (model)->get_text_len (model);
-
-#ifdef PARANOID_DEBUGGING
-		const gchar *str = e_text_model_get_text (model);
-		gint len2 = str ? strlen (str) : 0;
-		if (len != len)
-			g_error ("\"%s\" length reported as %d, not %d.", str, len, len2);
-#endif
-
-		return len;
-
-	} else {
-		/* Calculate length the old-fashioned way... */
-		const gchar *str = e_text_model_get_text (model);
-		return str ? strlen (str) : 0;
-	}
-}
-
-void
-e_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (CLASS (model)->set_text)
-		CLASS (model)->set_text (model, text);
-}
-
-void
-e_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{ 
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	if (CLASS (model)->insert)
-		CLASS (model)->insert (model, position, text);
-}
-
-void
-e_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (length >= 0);
-
-
-	if (text == NULL || length == 0)
-		return;
-
-	if (CLASS (model)->insert_length)
-		CLASS (model)->insert_length (model, position, text, length);
-}
-
-void
-e_text_model_prepend (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	e_text_model_insert (model, 0, text);
-}
-
-void
-e_text_model_append (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	e_text_model_insert (model, e_text_model_get_text_length (model), text);
-}
-
-void
-e_text_model_delete (ETextModel *model, gint position, gint length)
-{
-	gint txt_len;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (length >= 0);
-
-	txt_len = e_text_model_get_text_length (model);
-	if (position + length > txt_len)
-		length = txt_len - position;
-
-	if (length <= 0)
-		return;
-
-	if (CLASS (model)->delete)
-		CLASS (model)->delete (model, position, length);
-}
-
-gint
-e_text_model_object_count (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->obj_count)
-		return CLASS (model)->obj_count (model);
-
-	return 0;
-}
-
-const gchar *
-e_text_model_get_nth_object (ETextModel *model, gint n, gint *len)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	if (n < 0 || n >= e_text_model_object_count (model))
-		return NULL;
-
-	if (CLASS (model)->get_nth_obj)
-		return CLASS (model)->get_nth_obj (model, n, len);
-
-	return NULL;
-}
-
-gchar *
-e_text_model_strdup_nth_object (ETextModel *model, gint n)
-{
-	const gchar *obj;
-	gint len = 0;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	obj = e_text_model_get_nth_object (model, n, &len);
-	
-	return obj ? g_strndup (obj, n) : NULL;
-}
-
-void
-e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start, gint *end)
-{
-	const gchar *txt = NULL, *obj = NULL;
-	gint len = 0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	txt = e_text_model_get_text (model);
-	obj = e_text_model_get_nth_object (model, n, &len);
-
-	g_return_if_fail (obj != NULL);
-
-	if (start)
-		*start = obj - txt;
-	if (end)
-		*end = obj - txt + len;
-}
-
-gint
-e_text_model_get_object_at_offset (ETextModel *model, gint offset)
-{
-	g_return_val_if_fail (model != NULL, -1);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), -1);
-
-	if (offset < 0 || offset >= e_text_model_get_text_length (model))
-		return -1;
-
-	/* If an optimized version has been provided, we use it. */
-	if (CLASS (model)->obj_at_offset) {
-
-		return CLASS (model)->obj_at_offset (model, offset);
-
-	} else { 
-		/* If not, we fake it.*/
-
-		gint i, N, pos0, pos1;
-
-		N = e_text_model_object_count (model);
-
-		for (i = 0; i < N; ++i) {
-			e_text_model_get_nth_object_bounds (model, i, &pos0, &pos1);
-			if (pos0 <= offset && offset < pos1)
-				return i;
-		}
-			
-	}
-
-	return -1;
-}
-
-gint
-e_text_model_get_object_at_pointer (ETextModel *model, const gchar *s)
-{
-	g_return_val_if_fail (model != NULL, -1);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), -1);
-	g_return_val_if_fail (s != NULL, -1);
-
-	return e_text_model_get_object_at_offset (model, s - e_text_model_get_text (model));
-}
-
-void
-e_text_model_activate_nth_object (ETextModel *model, gint n)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (n >= 0);
-	g_return_if_fail (n < e_text_model_object_count (model));
-
-	gtk_signal_emit (GTK_OBJECT (model), e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED], n);
-}
-
-ETextModel *
-e_text_model_new (void)
-{
-	ETextModel *model = gtk_type_new (e_text_model_get_type ());
-	return model;
-}
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
deleted file mode 100644
index afd9b79960..0000000000
--- a/widgets/text/e-text-model.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETextModel - Text item for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-
-#ifndef E_TEXT_MODEL_H
-#define E_TEXT_MODEL_H
-
-#include <gnome.h>
-
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TEXT_MODEL            (e_text_model_get_type ())
-#define E_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT_MODEL, ETextModel))
-#define E_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL, ETextModelClass))
-#define E_IS_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT_MODEL))
-#define E_IS_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL))
-
-typedef struct _ETextModel ETextModel;
-typedef struct _ETextModelClass ETextModelClass;
-
-struct _ETextModelPrivate;
-
-typedef gint (*ETextModelReposFn) (gint, gpointer);
-
-struct _ETextModel {
-	GtkObject item;
-
-	struct _ETextModelPrivate *priv;
-};
-
-struct _ETextModelClass {
-	GtkObjectClass parent_class;
-
-	/* Signal */
-	void  (* changed)          (ETextModel *model);
-	void  (* reposition)       (ETextModel *model, ETextModelReposFn fn, gpointer repos_fn_data);
-	void  (* object_activated) (ETextModel *model, gint obj_num);
-
-	/* Virtual methods */
-
-	gint  (* validate_pos) (ETextModel *model, gint pos);
-
-	const char *(* get_text)      (ETextModel *model);
-	gint        (* get_text_len)  (ETextModel *model);
-	void        (* set_text)      (ETextModel *model, const gchar *text);
-	void        (* insert)        (ETextModel *model, gint position, const gchar *text);
-	void        (* insert_length) (ETextModel *model, gint position, const gchar *text, gint length);
-	void        (* delete)        (ETextModel *model, gint position, gint length);
-
-	void         (* objectify)          (ETextModel *model);
-	gint         (* obj_count)          (ETextModel *model);
-	const gchar *(* get_nth_obj)        (ETextModel *model, gint n, gint *len);
-	gint         (* obj_at_offset)      (ETextModel *model, gint offset);
-};
-
-GtkType     e_text_model_get_type (void);
-
-ETextModel *e_text_model_new (void);
-
-void        e_text_model_changed (ETextModel *model);
-
-void        e_text_model_reposition        (ETextModel *model, ETextModelReposFn fn, gpointer repos_data);
-gint        e_text_model_validate_position (ETextModel *model, gint pos);
-
-
-/* Functions for manipulating the underlying text. */
-
-const gchar *e_text_model_get_text        (ETextModel *model);
-gint         e_text_model_get_text_length (ETextModel *model);
-void         e_text_model_set_text        (ETextModel *model, const gchar *text);
-void         e_text_model_insert          (ETextModel *model, gint position, const gchar *text);
-void         e_text_model_insert_length   (ETextModel *model, gint position, const gchar *text, gint length);
-void         e_text_model_prepend         (ETextModel *model, const gchar *text);
-void         e_text_model_append          (ETextModel *model, const gchar *text);
-void         e_text_model_delete          (ETextModel *model, gint position, gint length);
-
-
-/* Functions for accessing embedded objects. */
-
-gint         e_text_model_object_count          (ETextModel *model);
-const gchar *e_text_model_get_nth_object        (ETextModel *model, gint n, gint *len);
-gchar       *e_text_model_strdup_nth_object     (ETextModel *model, gint n);
-void         e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start_pos, gint *end_pos);
-gint         e_text_model_get_object_at_offset  (ETextModel *model, gint offset);
-gint         e_text_model_get_object_at_pointer (ETextModel *model, const gchar *c);
-void         e_text_model_activate_nth_object   (ETextModel *model, gint n);
-
-
-
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
deleted file mode 100644
index e3931da02f..0000000000
--- a/widgets/text/e-text-test.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-  ETextTest: E-Text item test program
-  Copyright (C)2000: Iain Holmes  <ih@csd.abdn.ac.uk>
-
-  This code is licensed under the GPL
-*/
-
-#include "e-text.h"
-#include <gnome.h>
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-unicode.h"
-
-GnomeCanvasItem *rect;
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, GnomeCanvasItem *item)
-{
-  double height;
-  gnome_canvas_item_set( item,
-			 "width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(item),
-		 "height", &height,
-		 NULL);
-  height = MAX(height, allocation->height);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) height,
-			 NULL );
-}
-
-static void
-reflow (GtkWidget *canvas, GnomeCanvasItem *item)
-{
-  double height;
-  gtk_object_get(GTK_OBJECT(item),
-		 "height", &height,
-		 NULL);
-  height = MAX(height, canvas->allocation.height);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, canvas->allocation.width, height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) canvas->allocation.width,
-			 "y2", (double) height,
-			 NULL );
-}
-
-static void
-quit_cb (GtkWidget *widget,
-	 gpointer data)
-{
-  gtk_main_quit ();
-}
-
-static void
-change_text_cb (GtkEntry *entry,
-		EText *text)
-{
-  gchar *str;
-
-  str = e_utf8_gtk_entry_get_text (entry);
-  gnome_canvas_item_set (GNOME_CANVAS_ITEM (text),
-			 "text", str,
-			 NULL);
-}
-
-static void
-change_font_cb (GtkEntry *entry,
-		EText *text)
-{
-  gchar *font;
-
-  font = gtk_entry_get_text (entry);
-  gnome_canvas_item_set (GNOME_CANVAS_ITEM (text),
-			 "font", font,
-			 NULL);
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  GtkWidget *window, *canvas, *scroller, *vbox, *text, *font;
-  GtkWidget *frame;
-  GnomeCanvasItem *item;
-
-  gnome_init ("ETextTest", "0.0.1", argc, argv);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "EText Test");
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (quit_cb), NULL);
-
-  gtk_widget_push_visual (gdk_rgb_get_visual ());
-  gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-  canvas = e_canvas_new ();
-  gtk_widget_pop_visual ();
-  gtk_widget_pop_colormap ();
-  scroller = gtk_scrolled_window_new (NULL, NULL);
-  vbox = gtk_vbox_new (FALSE, 2);
-
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_box_pack_start (GTK_BOX (vbox), scroller, TRUE, TRUE, 2);
-  gtk_container_add (GTK_CONTAINER (scroller), canvas);
-
-  frame = gtk_frame_new ("Text");
-  text = gtk_entry_new ();
-  gtk_entry_set_text(GTK_ENTRY(text), "Hello World! This is a really long string to test out the ellipsis stuff.");
-  gtk_container_add (GTK_CONTAINER (frame), text);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-  
-  frame = gtk_frame_new ("Font");
-  font = gtk_entry_new ();
-  gtk_entry_set_text(GTK_ENTRY(font), "fixed");
-  gtk_container_add (GTK_CONTAINER (frame), font);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-  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 );
-
-  item = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				e_text_get_type (),
-				"text", "Hello World! This is a really long string to test out the ellipsis stuff.",
-				"font", "fixed",
-				"fill_color", "black",
-				"anchor", GTK_ANCHOR_NW,
-				"clip", TRUE,
-				"use_ellipsis", TRUE,
-				"editable", TRUE,
-				"line_wrap", TRUE,
-				"max_lines", 2,
-				"width", 150.0,
-				NULL);
-
-  gtk_signal_connect (GTK_OBJECT (text), "activate",
-		      GTK_SIGNAL_FUNC (change_text_cb), item);
-  gtk_signal_connect (GTK_OBJECT (font), "activate",
-		      GTK_SIGNAL_FUNC (change_font_cb), item);
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      item );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( reflow ),
-		      item );
-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 400.0, 400.0);
-  gtk_widget_show_all (window);
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
deleted file mode 100644
index 0e40128e68..0000000000
--- a/widgets/text/e-text.c
+++ /dev/null
@@ -1,3797 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* EText - Text item for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#include <config.h>
-#include <math.h>
-#include <ctype.h>
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <unicode.h>
-#include <gtk/gtkinvisible.h>
-#include "e-text.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-unicode.h"
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_rgb.h>
-#include <libart_lgpl/art_rgb_bitmap_affine.h>
-
-#include "gal/util/e-text-event-processor-emacs-like.h"
-
-#define BORDER_INDENT 4
-
-enum {
-	E_TEXT_CHANGED,
-	E_TEXT_ACTIVATE,
-	E_TEXT_LAST_SIGNAL
-};
-
-static guint e_text_signals[E_TEXT_LAST_SIGNAL] = { 0 };
-
-
-
-/* This defines a line of text */
-struct line {
-	const char *text;	/* Line's text, it is a pointer into the text->text string */
-	int length;	/* Line's length IN BYTES */
-	int width;	/* Line's width in pixels */
-	int ellipsis_length;  /* Length before adding ellipsis */
-};
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_MODEL,
-	ARG_EVENT_PROCESSOR,
-	ARG_TEXT,
-	ARG_FONT,
-        ARG_FONTSET,
-	ARG_FONT_GDK,
-	ARG_FONT_E,
-	ARG_ANCHOR,
-	ARG_JUSTIFICATION,
-	ARG_CLIP_WIDTH,
-	ARG_CLIP_HEIGHT,
-	ARG_CLIP,
-	ARG_FILL_CLIP_RECTANGLE,
-	ARG_X_OFFSET,
-	ARG_Y_OFFSET,
-	ARG_FILL_COLOR,
-	ARG_FILL_COLOR_GDK,
-	ARG_FILL_COLOR_RGBA,
-	ARG_FILL_STIPPLE,
-	ARG_TEXT_WIDTH,
-	ARG_TEXT_HEIGHT,
-	ARG_EDITABLE,
-	ARG_USE_ELLIPSIS,
-	ARG_ELLIPSIS,
-	ARG_LINE_WRAP,
-	ARG_BREAK_CHARACTERS,
-	ARG_MAX_LINES,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_DRAW_BORDERS,
-	ARG_ALLOW_NEWLINES,
-	ARG_DRAW_BACKGROUND,
-	ARG_CURSOR_POS
-};
-
-
-enum {
-	E_SELECTION_PRIMARY,
-	E_SELECTION_CLIPBOARD
-};
-enum {
-  TARGET_STRING,
-  TARGET_TEXT,
-  TARGET_COMPOUND_TEXT
-};
-
-static void e_text_class_init (ETextClass *class);
-static void e_text_init (EText *text);
-static void e_text_destroy (GtkObject *object);
-static void e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_text_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_text_reflow (GnomeCanvasItem *item, int flags);
-static void e_text_update (GnomeCanvasItem *item, double *affine,
-				      ArtSVP *clip_path, int flags);
-static void e_text_realize (GnomeCanvasItem *item);
-static void e_text_unrealize (GnomeCanvasItem *item);
-static void e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height);
-static double e_text_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-				       GnomeCanvasItem **actual_item);
-static void e_text_bounds (GnomeCanvasItem *item,
-				      double *x1, double *y1, double *x2, double *y2);
-static void e_text_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
-static gint e_text_event (GnomeCanvasItem *item, GdkEvent *event);
-
-static void e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data);
-
-static void e_text_get_selection(EText *text, GdkAtom selection, guint32 time);
-static void e_text_supply_selection (EText *text, guint time, GdkAtom selection, guchar *data, gint length);
-
-static void e_text_text_model_changed(ETextModel *model, EText *text);
-static void e_text_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data, gpointer data);
-
-static void _get_tep(EText *text);
-
-static GtkWidget *e_text_get_invisible(EText *text);
-static void _selection_clear_event (GtkInvisible *invisible,
-				    GdkEventSelection *event,
-				    EText *text);
-static void _selection_get (GtkInvisible *invisible,
-			    GtkSelectionData *selection_data,
-			    guint info,
-			    guint time_stamp,
-			    EText *text);
-static void _selection_received (GtkInvisible *invisible,
-				 GtkSelectionData *selection_data,
-				 guint time,
-				 EText *text);
-
-#if 0
-static ETextSuckFont *e_suck_font (GdkFont *font);
-static void e_suck_font_free (ETextSuckFont *suckfont);
-#endif
-
-static void e_text_free_lines(EText *text);
-
-static gint text_width_with_objects (ETextModel *model,
-				     EFont *font, EFontStyle style,
-				     const gchar *text, gint bytelen);
-
-static void calc_height (EText *text);
-static void calc_line_widths (EText *text);
-static void split_into_lines (EText *text);
-
-static GnomeCanvasItemClass *parent_class;
-static GdkAtom clipboard_atom = GDK_NONE;
-
-
-
-/**
- * e_text_get_type:
- * @void: 
- * 
- * Registers the &EText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EText class.
- **/
-GtkType
-e_text_get_type (void)
-{
-	static GtkType text_type = 0;
-
-	if (!text_type) {
-		GtkTypeInfo text_info = {
-			"EText",
-			sizeof (EText),
-			sizeof (ETextClass),
-			(GtkClassInitFunc) e_text_class_init,
-			(GtkObjectInitFunc) e_text_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		text_type = gtk_type_unique (gnome_canvas_item_get_type (), &text_info);
-	}
-
-	return text_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_text_class_init (ETextClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type ());
-
-	e_text_signals[E_TEXT_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_text_signals[E_TEXT_ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, activate),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_text_signals, E_TEXT_LAST_SIGNAL);
-
-
-	gtk_object_add_arg_type ("EText::model",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL);  
-	gtk_object_add_arg_type ("EText::event_processor",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_EVENT_PROCESSOR);
-	gtk_object_add_arg_type ("EText::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TEXT);
-	gtk_object_add_arg_type ("EText::font",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONT);
-	gtk_object_add_arg_type ("EText::fontset",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONTSET);
-	gtk_object_add_arg_type ("EText::font_gdk",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_WRITABLE, ARG_FONT_GDK);
-	gtk_object_add_arg_type ("EText::font_e",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_FONT_E);
-	gtk_object_add_arg_type ("EText::anchor",
-				 GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_ANCHOR);
-	gtk_object_add_arg_type ("EText::justification",
-				 GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFICATION);
-	gtk_object_add_arg_type ("EText::clip_width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_CLIP_WIDTH);
-	gtk_object_add_arg_type ("EText::clip_height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_CLIP_HEIGHT);
-	gtk_object_add_arg_type ("EText::clip",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CLIP);
-	gtk_object_add_arg_type ("EText::fill_clip_rectangle",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_FILL_CLIP_RECTANGLE);
-	gtk_object_add_arg_type ("EText::x_offset",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X_OFFSET);
-	gtk_object_add_arg_type ("EText::y_offset",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y_OFFSET);
-	gtk_object_add_arg_type ("EText::fill_color",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FILL_COLOR);
-	gtk_object_add_arg_type ("EText::fill_color_gdk",
-				 GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_FILL_COLOR_GDK);
-	gtk_object_add_arg_type ("EText::fill_color_rgba",
-				 GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA);
-	gtk_object_add_arg_type ("EText::fill_stipple",
-				 GTK_TYPE_GDK_WINDOW, GTK_ARG_READWRITE, ARG_FILL_STIPPLE);
-	gtk_object_add_arg_type ("EText::text_width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_TEXT_WIDTH);
-	gtk_object_add_arg_type ("EText::text_height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_TEXT_HEIGHT);
-	gtk_object_add_arg_type ("EText::editable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EText::use_ellipsis",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_USE_ELLIPSIS);
-	gtk_object_add_arg_type ("EText::ellipsis",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ELLIPSIS);
-	gtk_object_add_arg_type ("EText::line_wrap",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_LINE_WRAP);
-	gtk_object_add_arg_type ("EText::break_characters",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_BREAK_CHARACTERS);
-	gtk_object_add_arg_type ("EText::max_lines",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_MAX_LINES);
-	gtk_object_add_arg_type ("EText::width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("EText::height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EText::draw_borders",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BORDERS);
-	gtk_object_add_arg_type ("EText::allow_newlines",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-	gtk_object_add_arg_type ("EText::draw_background",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BACKGROUND);
-	gtk_object_add_arg_type ("EText::cursor_pos",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_CURSOR_POS);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-
-
-
-	klass->changed = NULL;
-	klass->activate = NULL;
-
-	object_class->destroy = e_text_destroy;
-	object_class->set_arg = e_text_set_arg;
-	object_class->get_arg = e_text_get_arg;
-
-	item_class->update = e_text_update;
-	item_class->realize = e_text_realize;
-	item_class->unrealize = e_text_unrealize;
-	item_class->draw = e_text_draw;
-	item_class->point = e_text_point;
-	item_class->bounds = e_text_bounds;
-	item_class->render = e_text_render;
-	item_class->event = e_text_event;
-}
-
-/* Object initialization function for the text item */
-static void
-e_text_init (EText *text)
-{
-	text->model = e_text_model_new ();
-	text->text = e_text_model_get_text (text->model);
-	
-	gtk_object_ref (GTK_OBJECT (text->model));
-	gtk_object_sink (GTK_OBJECT (text->model));
-
-	text->model_changed_signal_id =
-		gtk_signal_connect (GTK_OBJECT (text->model),
-				   "changed",
-				    GTK_SIGNAL_FUNC (e_text_text_model_changed),
-				    text);
-	text->model_repos_signal_id =
-		gtk_signal_connect (GTK_OBJECT (text->model),
-				    "reposition",
-				    GTK_SIGNAL_FUNC (e_text_text_model_reposition),
-				    text);
-
-	text->anchor = GTK_ANCHOR_CENTER;
-	text->justification = GTK_JUSTIFY_LEFT;
-	text->clip_width = -1.0;
-	text->clip_height = -1.0;
-	text->xofs = 0.0;
-	text->yofs = 0.0;
-
-	text->ellipsis = NULL;
-	text->use_ellipsis = FALSE;
-	text->ellipsis_width = 0;
-
-	text->editable = FALSE;
-	text->editing = FALSE;
-	text->xofs_edit = 0;
-	text->yofs_edit = 0;
-	
-	text->selection_start = 0;
-	text->selection_end = 0;
-	text->select_by_word = FALSE;
-
-	text->timeout_id = 0;
-	text->timer = NULL;
-
-	text->lastx = 0;
-	text->lasty = 0;
-	text->last_state = 0;
-
-	text->scroll_start = 0;
-	text->show_cursor = TRUE;
-	text->button_down = FALSE;
-	
-	text->tep = NULL;
-	text->tep_command_id = 0;
-
-	text->has_selection = FALSE;
-	
-	text->invisible = NULL;
-	text->primary_selection = NULL;
-	text->primary_length = 0;
-	text->clipboard_selection = NULL;
-	text->clipboard_length = 0;
-
-	text->pointer_in = FALSE;
-	text->default_cursor_shown = TRUE;
-
-	text->line_wrap = FALSE;
-	text->break_characters = NULL;
-	text->max_lines = -1;
-
-	text->tooltip_timeout = 0;
-	text->tooltip_count = 0;
-
-	text->dbl_timeout = 0;
-	text->tpl_timeout = 0;
-
-	text->draw_background = FALSE;
-	
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
-}
-
-/* Destroy handler for the text item */
-static void
-e_text_destroy (GtkObject *object)
-{
-	EText *text;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TEXT (object));
-
-	text = E_TEXT (object);
-
-	if (text->model_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (text->model), 
-				       text->model_changed_signal_id);
-
-	if (text->model_repos_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (text->model),
-				       text->model_repos_signal_id);
-
-	if (text->model)
-		gtk_object_unref(GTK_OBJECT(text->model));
-
-	if (text->tep_command_id)
-		gtk_signal_disconnect(GTK_OBJECT(text->tep),
-				      text->tep_command_id);
-
-	if (text->tep)
-		gtk_object_unref (GTK_OBJECT(text->tep));
-	
-	if (text->invisible)
-		gtk_object_unref (GTK_OBJECT(text->invisible));
-
-	if (text->lines)
-		g_free (text->lines);
-
-	if (text->font)
-		e_font_unref (text->font);
-
-#if 0
-	if (text->suckfont)
-		e_suck_font_free (text->suckfont);
-#endif
-
-	if (text->stipple)
-		gdk_bitmap_unref (text->stipple);
-
-	if (text->timeout_id) {
-		g_source_remove(text->timeout_id);
-		text->timeout_id = 0;
-	}
-	
-	if (text->timer) {
-		g_timer_stop(text->timer);
-		g_timer_destroy(text->timer);
-		text->timer = NULL;
-	}
-				
-	if ( text->tooltip_timeout ) {
-		gtk_timeout_remove (text->tooltip_timeout);
-		text->tooltip_timeout = 0;
-	}
-
-	if ( text->dbl_timeout ) {
-		gtk_timeout_remove (text->dbl_timeout);
-		text->dbl_timeout = 0;
-	}
-
-	if ( text->tpl_timeout ) {
-		gtk_timeout_remove (text->tpl_timeout);
-		text->tpl_timeout = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_text_text_model_changed (ETextModel *model, EText *text)
-{
-	text->text = e_text_model_get_text(model);
-	e_text_free_lines(text);
-	gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_CHANGED]);
-	text->needs_split_into_lines = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(text));
-}
-
-static void
-e_text_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data, gpointer user_data)
-{
-	EText *text = E_TEXT (user_data);
-#if 0
-	gint org_start = text->selection_start, org_end = text->selection_end;
-#endif
-	gint model_len = e_text_model_get_text_length (model);
-
-	text->selection_start = fn (text->selection_start, repos_data);
-	text->selection_end   = fn (text->selection_end,   repos_data);
-
-	/* Our repos function should make sure we don't overrun the buffer, but it never
-	   hurts to be paranoid. */
-	text->selection_start = CLAMP (text->selection_start, 0, model_len);
-	text->selection_end   = CLAMP (text->selection_end,   0, model_len);
-
-	if (text->selection_start > text->selection_end) {
-		gint tmp = text->selection_start;
-		text->selection_start = text->selection_end;
-		text->selection_end = tmp;
-	}
-
-#if 0
-	if (org_start != text->selection_start || org_end != text->selection_end) {
-		/*
-		  In general we shouldn't need to do anything to refresh the
-		  canvas to redraw the (moved) selection, since "reposition" events
-		  will only be generated in association with ETextModel-changing
-		  activities.
-		*/
-	}
-#endif
-}
-
-static void
-get_bounds_item_relative (EText *text, double *px1, double *py1, double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	double x, y;
-	double clip_x, clip_y;
-	int old_height;
-
-	item = GNOME_CANVAS_ITEM (text);
-	
-	x = 0;
-	y = 0;
-
-	clip_x = x;
-	clip_y = y;
-
-	/* Calculate text dimensions */
-
-	old_height = text->height;
-
-	if (text->text && text->font)
-		text->height = (e_font_height (text->font)) * text->num_lines;
-	else
-		text->height = 0;
-
-	if (old_height != text->height)
-		e_canvas_item_request_parent_reflow(item);
-
-	/* Anchor text */
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= text->max_width / 2;
-		if ( text->clip_width >= 0)
-			clip_x -= text->clip_width / 2;
-		else
-			clip_x -= text->width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= text->max_width;
-		if (text->clip_width >= 0)
-			clip_x -= text->clip_width;
-		else
-			clip_x -= text->width;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= text->height / 2;
-		if ( text->clip_height >= 0 )
-			clip_y -= text->clip_height / 2;
-		else
-			clip_y -= text->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= text->height;
-		if ( text->clip_height >= 0 )
-			clip_y -= text->clip_height;
-		else
-			clip_y -= text->height;
-		break;
-	}
-
-	/* Bounds */
-
-	if (text->clip) {
-		/* maybe do bbox intersection here? */
-		*px1 = clip_x;
-		*py1 = clip_y;
-		if (text->clip_width >= 0)
-			*px2 = clip_x + text->clip_width;
-		else
-			*px2 = clip_x + text->width;
-
-		if ( text->clip_height >= 0 )
-			*py2 = clip_y + text->clip_height;
-		else
-			*py2 = clip_y + text->height;
-	} else {
-		*px1 = x;
-		*py1 = y;
-		*px2 = x + text->max_width;
-		*py2 = y + text->height;
-	}
-}
-
-static void
-get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	double wx, wy, clip_width;
-
-	item = GNOME_CANVAS_ITEM (text);
-
-	/* Get canvas pixel coordinates for text position */
-
-	wx = 0;
-	wy = 0;
-	gnome_canvas_item_i2w (item, &wx, &wy);
-	gnome_canvas_w2c (item->canvas, wx + text->xofs, wy + text->yofs, &text->cx, &text->cy);
-
-	/* Calculate the width and heights */
-	calc_height (text);
-	calc_line_widths (text);
-
-	if (text->clip_width < 0)
-		clip_width = text->max_width;
-	else
-		clip_width = text->clip_width;
-
-	/* Get canvas pixel coordinates for clip rectangle position */
-	gnome_canvas_w2c (item->canvas, wx, wy, &text->clip_cx, &text->clip_cy);
-	text->clip_cwidth = clip_width * item->canvas->pixels_per_unit;
-	if ( text->clip_height >= 0 )
-		text->clip_cheight = text->clip_height * item->canvas->pixels_per_unit;
-	else
-		text->clip_cheight = text->height * item->canvas->pixels_per_unit;
-
-	/* Anchor text */
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		text->cx -= text->max_width / 2;
-		text->clip_cx -= text->clip_cwidth / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		text->cx -= text->max_width;
-		text->clip_cx -= text->clip_cwidth;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		text->cy -= text->height / 2;
-		text->clip_cy -= text->clip_cheight / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		text->cy -= text->height;
-		text->clip_cy -= text->clip_cheight;
-		break;
-	}
-
-	/* Bounds */
-
-	if (text->clip) {
-		*px1 = text->clip_cx;
-		*py1 = text->clip_cy;
-		*px2 = text->clip_cx + text->clip_cwidth;
-		*py2 = text->clip_cy + text->clip_cheight;
-	} else {
-		*px1 = text->cx;
-		*py1 = text->cy;
-		*px2 = text->cx + text->max_width;
-		*py2 = text->cy + text->height;
-	}
-}
-
-static void
-calc_height (EText *text)
-{
-	GnomeCanvasItem *item;
-	int old_height;
-
-	item = GNOME_CANVAS_ITEM (text);
-
-	/* Calculate text dimensions */
-
-	old_height = text->height;
-
-	/* Make sure the text is split into lines first */
-	if (text->text && text->num_lines == 0) 
-		split_into_lines (text);
-
-	if (text->text && text->font)
-		text->height = e_font_height (text->font) * text->num_lines;
-	else
-		text->height = 0;
-
-	if (old_height != text->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-static void
-calc_ellipsis (EText *text)
-{
-	if (text->font)
-		text->ellipsis_width = 
-			e_font_utf8_text_width (text->font, E_FONT_PLAIN,
-						text->ellipsis ? text->ellipsis : "...",
-						text->ellipsis ? strlen (text->ellipsis) : 3);
-}
-
-/* Calculates the line widths (in pixels) of the text's splitted lines */
-static void
-calc_line_widths (EText *text)
-{
-	struct line *lines;
-	int i;
-	gdouble clip_width;
-	const gchar *p;
-
-	/* Make sure line has been split */
-	if (text->text && text->num_lines == 0)
-		split_into_lines (text);
-
-	lines = text->lines;
-	text->max_width = 0;
-
-	clip_width = text->clip_width;
-	if (clip_width >= 0 && text->draw_borders) {
-		clip_width -= 6;
-		if (clip_width < 0)
-			clip_width = 0;
-	}
-
-
-	if (!lines)
-		return;
-
-	for (i = 0; i < text->num_lines; i++) {
-		if (lines->length != 0) {
-			if (text->font) {
-				lines->width = text_width_with_objects (text->model,
-									text->font, E_FONT_PLAIN,
-									lines->text, lines->length);
-				lines->ellipsis_length = 0;
-			} else {
-				lines->width = 0;
-			}
-			
-			if (text->clip && 
-			    text->use_ellipsis &&
-			    ! text->editing &&
-			    lines->width > clip_width &&
-			    clip_width >= 0) {
-				if (text->font) {
-					lines->ellipsis_length = 0;
-					for (p = lines->text; p && *p && (p - lines->text) < lines->length; p = unicode_next_utf8 (p)) {
-						gint text_width = text_width_with_objects (text->model,
-											   text->font, E_FONT_PLAIN,
-											   lines->text, p - lines->text);
-						if (clip_width >= text_width + text->ellipsis_width)
-							lines->ellipsis_length = p - lines->text;
-						else
-							break;
-					}
-				}
-				else
-					lines->ellipsis_length = 0;
-				lines->width = text_width_with_objects (text->model,
-									text->font, E_FONT_PLAIN,
-									lines->text, lines->ellipsis_length) + 
-					text->ellipsis_width;
-			}
-			else
-				lines->ellipsis_length = lines->length;
-
-			if (lines->width > text->max_width)
-				text->max_width = lines->width;
-		}
-
-		lines++;
-	}
-}
-
-static void
-e_text_free_lines(EText *text)
-{
-	if (text->lines)
-		g_free (text->lines);
-
-	text->lines = NULL;
-	text->num_lines = 0;
-}
-
-static gint
-text_width_with_objects (ETextModel *model,
-			 EFont *font, EFontStyle style,
-			 const gchar *text, gint numbytes)
-{
-	return e_font_utf8_text_width (font, style, text, numbytes);
-}
-
-static void
-text_draw_with_objects (ETextModel *model, 
-			GdkDrawable *drawable,
-			EFont *font, EFontStyle style,
-			GdkGC *gc,
-			gint x, gint y,
-			const gchar *text, gint numbytes)
-{
-	const gchar *c;
-	
-	while (*text && numbytes > 0) {
-		gint obj_num = -1;
-		
-		c = text;
-
-		while (*c
-		       && (obj_num = e_text_model_get_object_at_pointer (model, c)) == -1
-		       && numbytes > 0) {
-			++c;
-			--numbytes;
-		}
-
-		e_font_draw_utf8_text (drawable, font, style, gc, x, y, text, c-text);
-		x += e_font_utf8_text_width (font, style, text, c-text);
-		
-		if (obj_num != -1 && numbytes > 0) {
-			gint len;
-			gint start_x = x;
-
-			e_text_model_get_nth_object (model, obj_num, &len);
-
-			if (len > numbytes)
-				len = numbytes;
-			e_font_draw_utf8_text (drawable, font, style, gc, x, y, c, len);
-			x += e_font_utf8_text_width (font, style, c, len);
-
-			/* We underline our objects. */
-			gdk_draw_line (drawable, gc, start_x, y+1, x, y+1);
-
-			c += len;
-			numbytes -= len;
-		}
-		
-		text = c;
-	}
-}
-
-#define IS_BREAKCHAR(text,c) ((text)->break_characters && unicode_strchr ((text)->break_characters, (c)))
-/* Splits the text of the text item into lines */
-static void
-split_into_lines (EText *text)
-{
-	const char *p, *cp;
-	struct line *lines;
-	int len;
-	int line_num;
-	const char *laststart;
-	const char *lastend;
-	const char *linestart;
-	double clip_width;
-	unicode_char_t unival;
-
-	/* Free old array of lines */
-	e_text_free_lines(text);
-
-	if (!text->text)
-		return;
-
-	/* First, count the number of lines */
-
-	lastend = text->text;
-	laststart = text->text;
-	linestart = text->text;
-
-	clip_width = text->clip_width;
-	if (clip_width >= 0 && text->draw_borders) {
-		clip_width -= 6;
-		if (clip_width < 0)
-			clip_width = 0;
-	}
-
-	cp = text->text;
-
-	for (p = unicode_get_utf8 (cp, &unival); (unival && p); cp = p, p = unicode_get_utf8 (p, &unival)) {
-		if (text->line_wrap
-		    && (unicode_isspace (unival) || unival == '\n')
-		    && e_text_model_get_object_at_pointer (text->model, cp) == -1) { /* don't break mid-object */
-			if (laststart != lastend
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, E_FONT_PLAIN,
-								     linestart, cp - linestart)) {
-				text->num_lines ++;
-				
-				linestart = laststart;
-				laststart = p;
-				lastend = cp;
-			} else if (unicode_isspace (unival)) {
-				laststart = p;
-				lastend = cp;
-			}
-		} else if (text->line_wrap
-			   && IS_BREAKCHAR (text, unival)) {
-			
-			if (laststart != lastend
-			    && unicode_index_to_offset (linestart, cp - linestart) != 1
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, E_FONT_PLAIN,
-								     linestart, p - linestart)) {
-				text->num_lines ++;
-				
-				linestart = laststart;
-				laststart = p;
-				lastend = p;
-			} else {
-				laststart = p;
-				lastend = p;
-			}
-		}
-
-		if (unival == '\n') {
-			text->num_lines ++;
-
-			lastend = p;
-			laststart = p;
-			linestart = p;
-		} 
-	}
-
-	if ( text->line_wrap
-	     && p
-	     && laststart != lastend
-	     && clip_width < text_width_with_objects (text->model,
-						      text->font, E_FONT_PLAIN, 
-						      linestart, cp - linestart)) {
-		text->num_lines ++;
-	}
-
-	text->num_lines++;
-
-	if ( (!text->editing) && text->max_lines != -1 && text->num_lines > text->max_lines ) {
-		text->num_lines = text->max_lines;
-	}
-
-	/* Allocate array of lines and calculate split positions */
-
-	text->lines = lines = g_new0 (struct line, text->num_lines);
-	len = 0;
-	line_num = 1;
-	lastend = text->text;
-	laststart = text->text;
-
-	cp = text->text;
-
-	for (p = unicode_get_utf8 (cp, &unival); p && unival && line_num < text->num_lines; cp = p, p = unicode_get_utf8 (p, &unival)) {
-		gboolean handled = FALSE;
-
-		if (len == 0)
-			lines->text = cp;
-		if (text->line_wrap
-		    && (unicode_isspace (unival) || unival == '\n')
-		    && e_text_model_get_object_at_pointer (text->model, cp) == -1) { /* don't break mid-object */
-			if (clip_width < text_width_with_objects (text->model,
-								  text->font, E_FONT_PLAIN,
-								  lines->text, cp - lines->text)
-			    && laststart != lastend) {
-
-				lines->length = lastend - lines->text;
-
-				lines++;
-				line_num++;
-				len = cp - laststart;
-				lines->text = laststart;
-				laststart = p;
-				lastend = cp;
-			} else if (unicode_isspace (unival)) {
-				laststart = p;
-				lastend = cp;
-				len ++;
-			}
-			handled = TRUE;
-		} else if (text->line_wrap
-			   && IS_BREAKCHAR(text, unival) 
-			   && e_text_model_get_object_at_pointer (text->model, cp) == -1) {
-			if (laststart != lastend
-			    && unicode_index_to_offset (lines->text, cp - lines->text) != 1
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, E_FONT_PLAIN,
-								     lines->text, p - lines->text)) {
-
-				lines->length = lastend - lines->text;
-
-				lines++;
-				line_num++;
-				len = p - laststart;
-				lines->text = laststart;
-				laststart = p;
-				lastend = p;
-			} else {
-				laststart = p;
-				lastend = p;
-				len ++;
-			}
-		} 
-		if (line_num >= text->num_lines)
-			break;
-		if (unival == '\n') {
-
-			lines->length = cp - lines->text;
-			
-			lines++;
-			line_num++;
-			len = 0;
-			lastend = p;
-			laststart = p;
-			handled = TRUE;
-		} 
-		if (!handled)
-			len++;
-	}
-
-	if ( line_num < text->num_lines && text->line_wrap ) {
-		if (clip_width < text_width_with_objects (text->model,
-							  text->font, E_FONT_PLAIN,
-							  lines->text, cp - lines->text)
-		    && laststart != lastend ) {
-
-			lines->length = lastend - lines->text;
-
-			lines++;
-			line_num++;
-			len = cp - laststart;
-			lines->text = laststart;
-			laststart = p;
-			lastend = cp;
-		}
-	} 
-	
-	if (len == 0)
-		lines->text = cp;
-	lines->length = strlen (lines->text);
-}
-
-/* Convenience function to set the text's GC's foreground color */
-static void
-set_text_gc_foreground (EText *text)
-{
-	if (!text->gc)
-		return;
-
-	gdk_gc_set_foreground (text->gc, &text->color);
-}
-
-/* Sets the stipple pattern for the text */
-static void
-set_stipple (EText *text, GdkBitmap *stipple, int reconfigure)
-{
-	if (text->stipple && !reconfigure)
-		gdk_bitmap_unref (text->stipple);
-
-	text->stipple = stipple;
-	if (stipple && !reconfigure)
-		gdk_bitmap_ref (stipple);
-
-	if (text->gc) {
-		if (stipple) {
-			gdk_gc_set_stipple (text->gc, stipple);
-			gdk_gc_set_fill (text->gc, GDK_STIPPLED);
-		} else
-			gdk_gc_set_fill (text->gc, GDK_SOLID);
-	}
-}
-
-/* Set_arg handler for the text item */
-static void
-e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EText *text;
-	GdkColor color = { 0, 0, 0, 0, };
-	GdkColor *pcolor;
-	gboolean color_changed;
-	int have_pixel;
-	
-	gboolean needs_update = 0;
-	gboolean needs_reflow = 0;
-
-	item = GNOME_CANVAS_ITEM (object);
-	text = E_TEXT (object);
-
-	color_changed = FALSE;
-	have_pixel = FALSE;
-
-	switch (arg_id) {
-	case ARG_MODEL:
-
-		if ( text->model_changed_signal_id )
-			gtk_signal_disconnect (GTK_OBJECT (text->model),
-					       text->model_changed_signal_id);
-
-		if ( text->model_repos_signal_id )
-			gtk_signal_disconnect (GTK_OBJECT (text->model),
-					       text->model_repos_signal_id);
-
-		gtk_object_unref (GTK_OBJECT (text->model));
-		text->model = E_TEXT_MODEL (GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (text->model));
-
-		text->model_changed_signal_id =
-			gtk_signal_connect (GTK_OBJECT (text->model),
-					    "changed",
-					    GTK_SIGNAL_FUNC (e_text_text_model_changed),
-					    text);
-
-		text->model_repos_signal_id =
-			gtk_signal_connect (GTK_OBJECT (text->model),
-					    "reposition",
-					    GTK_SIGNAL_FUNC (e_text_text_model_reposition),
-					    text);
-
-		e_text_free_lines(text);
-
-		text->text = e_text_model_get_text(text->model);
-		gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_CHANGED]);
-
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		if ( text->tep && text->tep_command_id )
-			gtk_signal_disconnect(GTK_OBJECT(text->tep),
-					      text->tep_command_id);
-		if ( text->tep ) {
-			gtk_object_unref(GTK_OBJECT(text->tep));
-		}
-		text->tep = E_TEXT_EVENT_PROCESSOR(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref(GTK_OBJECT(text->tep));
-		text->tep_command_id = 
-			gtk_signal_connect(GTK_OBJECT(text->tep),
-					   "command",
-					   GTK_SIGNAL_FUNC(e_text_command),
-					   text);
-		break;
-
-	case ARG_TEXT:
-		text->num_lines = 1;
-		e_text_model_set_text(text->model, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_FONT:
-		if (text->font)
-  			e_font_unref (text->font);
-
-		text->font = e_font_from_gdk_name (GTK_VALUE_STRING (*arg));
-
-#if 0
-		if (item->canvas->aa) {
-			if (text->suckfont)
-				e_suck_font_free (text->suckfont);
-
-			text->suckfont = e_suck_font (text->font);
-		}
-#endif
-		
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_FONTSET:
-		if (text->font)
-  			e_font_unref (text->font); 
-
-		text->font = e_font_from_gdk_name (GTK_VALUE_STRING (*arg));
-
-#if 0
-		if (item->canvas->aa) {
-			if (text->suckfont)
-				e_suck_font_free (text->suckfont);
-
-			text->suckfont = e_suck_font (text->font);
-		}
-#endif
-
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_FONT_GDK:
-		/* Ref the font in case it was the font that is stored
-		   in the e-font */
-		gdk_font_ref (GTK_VALUE_POINTER (*arg));
-		if (text->font)
-  			e_font_unref (text->font); 
-
-		text->font = e_font_from_gdk_font (GTK_VALUE_POINTER (*arg));
-#if 0
-		if (item->canvas->aa) {
-			if (text->suckfont)
-				e_suck_font_free (text->suckfont);
-
-			text->suckfont = e_suck_font (text->font);
-		}
-#endif
-
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-	case ARG_FONT_E:
-		if (text->font)
-			e_font_unref (text->font);
-
-		text->font = GTK_VALUE_POINTER (*arg);
-
-		calc_ellipsis (text);
-		if (text->line_wrap)
-			text->needs_split_into_lines = 1;
-		else 
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-	case ARG_ANCHOR:
-		text->anchor = GTK_VALUE_ENUM (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_JUSTIFICATION:
-		text->justification = GTK_VALUE_ENUM (*arg);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_CLIP_WIDTH:
-		text->clip_width = fabs (GTK_VALUE_DOUBLE (*arg));
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_CLIP_HEIGHT:
-		text->clip_height = fabs (GTK_VALUE_DOUBLE (*arg));
-		text->needs_recalc_bounds = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_CLIP:
-		text->clip = GTK_VALUE_BOOL (*arg);
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_FILL_CLIP_RECTANGLE:
-		text->fill_clip_rectangle = GTK_VALUE_BOOL (*arg);
-		needs_update = 1;
-		break;
-
-	case ARG_X_OFFSET:
-		text->xofs = GTK_VALUE_DOUBLE (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_Y_OFFSET:
-		text->yofs = GTK_VALUE_DOUBLE (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-        case ARG_FILL_COLOR:
-		if (GTK_VALUE_STRING (*arg))
-			gdk_color_parse (GTK_VALUE_STRING (*arg), &color);
-
-		text->rgba = ((color.red & 0xff00) << 16 |
-			      (color.green & 0xff00) << 8 |
-			      (color.blue & 0xff00) |
-			      0xff);
-		text->color = color;
-		color_changed = TRUE;
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		pcolor = GTK_VALUE_BOXED (*arg);
-		if (pcolor) {
-			color = *pcolor;
-		}
-
-		text->rgba = ((color.red & 0xff00) << 16 |
-			      (color.green & 0xff00) << 8 |
-			      (color.blue & 0xff00) |
-			      0xff);
-		text->color = color;
-		color_changed = TRUE;
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-        case ARG_FILL_COLOR_RGBA:
-		text->rgba = GTK_VALUE_UINT (*arg);
-		color_changed = TRUE;
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_FILL_STIPPLE:
-		set_stipple (text, GTK_VALUE_BOXED (*arg), FALSE);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_EDITABLE:
-		text->editable = GTK_VALUE_BOOL (*arg);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		text->use_ellipsis = GTK_VALUE_BOOL (*arg);
-		text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_ELLIPSIS:
-		if (text->ellipsis)
-			g_free (text->ellipsis);
-
-		text->ellipsis = g_strdup (GTK_VALUE_STRING (*arg));
-		calc_ellipsis (text);
-		text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_LINE_WRAP:
-		text->line_wrap = GTK_VALUE_BOOL (*arg);
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		if ( text->break_characters ) {
-			g_free(text->break_characters);
-			text->break_characters = NULL;
-		}
-		if ( GTK_VALUE_STRING (*arg) )
-			text->break_characters = g_strdup( GTK_VALUE_STRING (*arg) );
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_MAX_LINES:
-		text->max_lines = GTK_VALUE_INT (*arg);
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_WIDTH:
-		text->clip_width = fabs (GTK_VALUE_DOUBLE (*arg));
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else
-			text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-		
-	case ARG_DRAW_BORDERS:
-		if (text->draw_borders != GTK_VALUE_BOOL (*arg)) {
-			text->draw_borders = GTK_VALUE_BOOL (*arg);
-			text->needs_calc_height = 1;
-			text->needs_redraw = 1;
-			needs_reflow = 1;
-			needs_update = 1;
-		}
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		if (text->draw_background != GTK_VALUE_BOOL (*arg)){
-			text->draw_background = GTK_VALUE_BOOL (*arg);
-			text->needs_redraw = 1;
-		}
-		break;
-		
-	case ARG_ALLOW_NEWLINES:
-		_get_tep(text);
-		gtk_object_set (GTK_OBJECT (text->tep),
-				"allow_newlines", GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-
-	case ARG_CURSOR_POS: {
-		ETextEventProcessorCommand command;
-
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_VALUE;
-		command.value = GTK_VALUE_INT (*arg);
-		command.time = GDK_CURRENT_TIME;
-		e_text_command (text->tep, &command, text);
-		break;
-	}
-		
-	default:
-		return;
-	}
-
-	if (color_changed) {
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(item))
-			gdk_color_context_query_color (item->canvas->cc, &color);
-
-		if (!item->canvas->aa)
-			set_text_gc_foreground (text);
-
-	}
-
-	if ( needs_reflow )
-		e_canvas_item_request_reflow (item);
-	if ( needs_update )
-		gnome_canvas_item_request_update (item);
-}
-
-/* Get_arg handler for the text item */
-static void
-e_text_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EText *text;
-	GdkColor *color;
-
-	text = E_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(text->model);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		_get_tep(text);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(text->tep);
-		break;
-
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->text);
-		break;
-
-	case ARG_FONT_E:
-		GTK_VALUE_BOXED (*arg) = text->font;
-		break;
-
-	case ARG_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = text->anchor;
-		break;
-
-	case ARG_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = text->justification;
-		break;
-
-	case ARG_CLIP_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_width;
-		break;
-
-	case ARG_CLIP_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_height;
-		break;
-
-	case ARG_CLIP:
-		GTK_VALUE_BOOL (*arg) = text->clip;
-		break;
-
-	case ARG_FILL_CLIP_RECTANGLE:
-		GTK_VALUE_BOOL (*arg) = text->fill_clip_rectangle;
-		break;
-
-	case ARG_X_OFFSET:
-		GTK_VALUE_DOUBLE (*arg) = text->xofs;
-		break;
-
-	case ARG_Y_OFFSET:
-		GTK_VALUE_DOUBLE (*arg) = text->yofs;
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		color = g_new (GdkColor, 1);
-		*color = text->color;
-		GTK_VALUE_BOXED (*arg) = color;
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		GTK_VALUE_UINT (*arg) = text->rgba;
-		break;
-
-	case ARG_FILL_STIPPLE:
-		GTK_VALUE_BOXED (*arg) = text->stipple;
-		break;
-
-	case ARG_TEXT_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->max_width / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_TEXT_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->height / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = text->editable;
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		GTK_VALUE_BOOL (*arg) = text->use_ellipsis;
-		break;
-
-	case ARG_ELLIPSIS:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->ellipsis);
-		break;
-
-	case ARG_LINE_WRAP:
-		GTK_VALUE_BOOL (*arg) = text->line_wrap;
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->break_characters);
-		break;
-
-	case ARG_MAX_LINES:
-		GTK_VALUE_INT (*arg) = text->max_lines;
-		break;
-
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_width;
-		break;
-
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->clip && text->clip_height != -1 ? text->clip_height : text->height / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_DRAW_BORDERS:
-		GTK_VALUE_BOOL (*arg) = text->draw_borders;
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		GTK_VALUE_BOOL (*arg) = text->draw_background;
-		break;
-		
-	case ARG_ALLOW_NEWLINES:
-		{
-			gboolean allow_newlines;
-			_get_tep(text);
-			gtk_object_get (GTK_OBJECT (text->tep),
-					"allow_newlines", &allow_newlines,
-					NULL);
-			GTK_VALUE_BOOL (*arg) = allow_newlines;
-		}
-		break;
-
-	case ARG_CURSOR_POS:
-		GTK_VALUE_INT (*arg) = text->selection_start;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* Update handler for the text item */
-static void
-e_text_reflow (GnomeCanvasItem *item, int flags)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	if ( text->needs_split_into_lines ) {
-		split_into_lines(text);
-		text->needs_split_into_lines = 0;
-		text->needs_calc_line_widths = 1;
-	}
-	if ( text->needs_calc_line_widths ) {
-		int x;
-		int i;
-		struct line *lines;
-		gdouble clip_width;
-		calc_line_widths(text);
-		text->needs_calc_line_widths = 0;
-		text->needs_calc_height = 1;
-		text->needs_redraw = 1;
-
-		lines = text->lines;
-		if ( !lines )
-			return;
-
-		for (lines = text->lines, i = 0; i < text->num_lines ; i++, lines ++) {
-			if ((lines->text - text->text) > text->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		i--;
-		x = text_width_with_objects (text->model,
-					     text->font, E_FONT_PLAIN,
-					     lines->text,
-					     text->selection_end - (lines->text - text->text));
-		
-
-		if (x < text->xofs_edit) {
-			text->xofs_edit = x;
-		}
-
-		clip_width = text->clip_width;
-		if (clip_width >= 0 && text->draw_borders) {
-			clip_width -= 6;
-			if (clip_width < 0)
-				clip_width = 0;
-		}
-
-		if (2 + x - clip_width > text->xofs_edit) {
-			text->xofs_edit = 2 + x - clip_width;
-		}
-		
-		if (e_font_height (text->font) * i < text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * i;
-		
-		if (e_font_height (text->font) * (i + 1) -
-		     (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * (i + 1) -
-				(text->clip_height != -1 ? text->clip_height : text->height);
-	}
-	if ( text->needs_calc_height ) {
-		calc_height (text);
-		gnome_canvas_item_request_update(item);
-		text->needs_calc_height = 0;
-		text->needs_recalc_bounds = 1;
-	}
-}
-
-/* Update handler for the text item */
-static void
-e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	EText *text;
-	double x1, y1, x2, y2;
-	ArtDRect i_bbox, c_bbox;
-	int i;
-
-	text = E_TEXT (item);
-
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
-
-	if ( text->needs_recalc_bounds
-	     || (flags & GNOME_CANVAS_UPDATE_AFFINE)) {
-		if (!item->canvas->aa) {
-			set_text_gc_foreground (text);
-			set_stipple (text, text->stipple, TRUE);
-			get_bounds (text, &x1, &y1, &x2, &y2);
-			if ( item->x1 != x1 ||
-			     item->x2 != x2 ||
-			     item->y1 != y1 ||
-			     item->y2 != y2 ) {
-				gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-				item->x1 = x1;
-				item->y1 = y1;
-				item->x2 = x2;
-				item->y2 = y2;
-				text->needs_redraw = 1;
-			}
-		} else {
-			/* aa rendering */
-			for (i = 0; i < 6; i++)
-				text->affine[i] = affine[i];
-			get_bounds_item_relative (text, &i_bbox.x0, &i_bbox.y0, &i_bbox.x1, &i_bbox.y1);
-			art_drect_affine_transform (&c_bbox, &i_bbox, affine);
-		}
-		text->needs_recalc_bounds = 0;
-	}
-	if ( text->needs_redraw ) {
-		gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-		text->needs_redraw = 0;
-	}
-}
-
-/* Realize handler for the text item */
-static void
-e_text_realize (GnomeCanvasItem *item)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (item);
-
-	text->gc = gdk_gc_new (item->canvas->layout.bin_window);
-	gdk_color_context_query_color (item->canvas->cc, &text->color);
-	gdk_gc_set_foreground (text->gc, &text->color);
-	
-	text->i_cursor = gdk_cursor_new (GDK_XTERM);
-	text->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	if (text->font == NULL) {
-		gdk_font_ref (GTK_WIDGET (item->canvas)->style->font);
-		text->font = e_font_from_gdk_font (GTK_WIDGET (item->canvas)->style->font);
-	}
-}
-
-/* Unrealize handler for the text item */
-static void
-e_text_unrealize (GnomeCanvasItem *item)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	gdk_gc_unref (text->gc);
-	text->gc = NULL;
-
-	gdk_cursor_destroy (text->i_cursor);
-	text->i_cursor = NULL;
-	gdk_cursor_destroy (text->default_cursor);
-	text->default_cursor = NULL;
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (item);
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static double
-get_line_xpos_item_relative (EText *text, struct line *line)
-{
-	double x;
-
-	x = 0;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= text->max_width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= text->max_width;
-		break;
-	}
-
-	switch (text->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		x += text->max_width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (text->max_width - line->width) * 0.5;
-		break;
-
-	default:
-		if (text->draw_borders)
-			x += BORDER_INDENT;
-
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-	
-	return x;
-}
-
-#if 0
-/* Calculates the y position of the first line of text. */
-static double
-get_line_ypos_item_relative (EText *text)
-{
-	double y;
-
-	y = 0;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= text->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= text->height;
-		break;
-	}
-
-	return y;
-}
-#endif
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_xpos (EText *text, struct line *line)
-{
-	int x;
-
-	x = text->cx;
-
-	switch (text->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		x += text->max_width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (text->max_width - line->width) / 2;
-		break;
-
-	default:
-		if (text->draw_borders)
-			x += BORDER_INDENT;
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-
-
-	return x;
-}
-
-static void
-_get_tep(EText *text)
-{
-	if (!text->tep) {
-		text->tep = e_text_event_processor_emacs_like_new();
-		gtk_object_ref (GTK_OBJECT (text->tep));
-		gtk_object_sink (GTK_OBJECT (text->tep));
-		text->tep_command_id = 
-			gtk_signal_connect(GTK_OBJECT(text->tep),
-					   "command",
-					   GTK_SIGNAL_FUNC(e_text_command),
-					   (gpointer) text);
-	}
-}
-
-/* Draw handler for the text item */
-static void
-e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-			int x, int y, int width, int height)
-{
-	EText *text;
-	GdkRectangle rect, *clip_rect;
-	struct line *lines;
-	int i;
-	int xpos, ypos;
-	int start_char, end_char;
-	int sel_start, sel_end;
-	GdkRectangle sel_rect;
-	GdkGC *fg_gc;
-	GnomeCanvas *canvas;
-	GtkWidget *widget;
-
-	text = E_TEXT (item);
-	canvas = GNOME_CANVAS_ITEM(text)->canvas;
-	widget = GTK_WIDGET(canvas);
-
-	fg_gc = widget->style->fg_gc[text->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
-	
-	if (text->draw_borders || text->draw_background) {
-		gdouble thisx = item->x1 - x;
-		gdouble thisy = item->y1 - y;
-		gdouble thiswidth, thisheight;
-		GtkWidget *widget = GTK_WIDGET(item->canvas);
-
-		gtk_object_get(GTK_OBJECT(text),
-			       "width", &thiswidth,
-			       "height", &thisheight,
-			       NULL);
-		
-		if (text->draw_borders){
-
-			if (text->editing) {
-				thisx += 1;
-				thisy += 1;
-				thiswidth -= 2;
-				thisheight -= 2;
-			}
-
-			gtk_paint_shadow (widget->style, drawable,
-					  GTK_STATE_NORMAL, GTK_SHADOW_IN,
-					  NULL, widget, "entry",
-					  thisx, thisy, thiswidth, thisheight);
-		
-			if (text->editing) {
-				thisx -= 1;
-				thisy -= 1;
-				thiswidth += 2;
-				thisheight += 2;
-				/*
-				 * Chris: I am here "filling in" for the additions
-				 * and substractions done in the previous if (text->editing).
-				 * but you might have other plans for this.  Please enlighten
-				 * me as to whether it should be:
-				 * thiswidth + 2 or thiswidth + 1.
-				 */
-				gtk_paint_focus (widget->style, drawable, 
-						 NULL, widget, "entry",
-						 thisx, thisy, thiswidth - 1, thisheight - 1);
-			}
-		}
-
-		if (text->draw_background) {
-			gtk_paint_flat_box (widget->style, drawable,
-					    GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
-					    NULL, widget, "entry_bg", 
-					    thisx + widget->style->klass->xthickness,
-					    thisy + widget->style->klass->ythickness, 
-					    thiswidth - widget->style->klass->xthickness * 2,
-					    thisheight - widget->style->klass->ythickness * 2);
-		}
-	}
-
-	if (!text->text || !text->font)
-		return;
-
-	lines = text->lines;
-	if ( !lines ) {
-		text->needs_split_into_lines = 1;
-		e_canvas_item_request_reflow (item);
-	}
-
-	clip_rect = NULL;
-	if (text->clip) {
-		rect.x = text->clip_cx - x;
-		rect.y = text->clip_cy - y;
-		rect.width = text->clip_cwidth;
-		rect.height = text->clip_cheight;
-		
-		gdk_gc_set_clip_rectangle (text->gc, &rect);
-		gdk_gc_set_clip_rectangle (fg_gc, &rect);
-		clip_rect = &rect;
-	}
-	ypos = text->cy + e_font_ascent (text->font);
-	if (text->draw_borders)
-		ypos += BORDER_INDENT;
-
-	if (text->editing)
-		ypos -= text->yofs_edit;
-
-	if (text->stipple)
-		gnome_canvas_set_stipple_origin (item->canvas, text->gc);
-
-	for (i = 0; i < text->num_lines; i++) {
-
-		xpos = get_line_xpos (text, lines);
-		if (text->editing) {
-			xpos -= text->xofs_edit;
-			start_char = lines->text - text->text;
-			end_char = start_char + lines->length;
-			sel_start = text->selection_start;
-			sel_end = text->selection_end;
-			if (sel_start > sel_end ) {
-				sel_start ^= sel_end;
-				sel_end ^= sel_start;
-				sel_start ^= sel_end;
-			}
-			if ( sel_start < start_char )
-				sel_start = start_char;
-			if ( sel_end > end_char )
-				sel_end = end_char;
-			if ( sel_start < sel_end ) {
-				sel_rect.x = xpos - x + text_width_with_objects (text->model,
-										 text->font, E_FONT_PLAIN,
-										 lines->text,
-										 sel_start - start_char);
-				sel_rect.y = ypos - y - e_font_ascent (text->font);
-				sel_rect.width = text_width_with_objects (text->model,
-									  text->font, E_FONT_PLAIN,
-									  lines->text + sel_start - start_char,
-									  sel_end - sel_start);
-				sel_rect.height = e_font_height (text->font);
-				gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
-						   drawable,
-						   text->has_selection ?
-						   GTK_STATE_SELECTED :
-						   GTK_STATE_ACTIVE,
-						   GTK_SHADOW_NONE,
-						   clip_rect,
-						   GTK_WIDGET(item->canvas),
-						   "text",
-						   sel_rect.x,
-						   sel_rect.y,
-						   sel_rect.width,
-						   sel_rect.height);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							sel_start - start_char);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							fg_gc,
-							xpos - x + text_width_with_objects (text->model,
-											    text->font, E_FONT_PLAIN,
-											    lines->text,
-											    sel_start - start_char),
-							ypos - y,
-							lines->text + sel_start - start_char,
-							sel_end - sel_start);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							text->gc,
-							xpos - x + text_width_with_objects (text->model,
-											    text->font, E_FONT_PLAIN,
-											    lines->text,
-											    sel_end - start_char),
-							ypos - y,
-							lines->text + sel_end - start_char,
-							end_char - sel_end);
-			} else {
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->length);
-			}
-			if (text->selection_start == text->selection_end &&
-			    text->selection_start >= start_char &&
-			    text->selection_start <= end_char &&
-			    text->show_cursor) {
-				gdk_draw_rectangle (drawable,
-						    text->gc,
-						    TRUE,
-						    xpos - x + text_width_with_objects (text->model,
-											text->font, E_FONT_PLAIN,
-											lines->text,
-											sel_start - start_char),
-						    ypos - y - e_font_ascent (text->font),
-						    1,
-						    e_font_height (text->font));
-			}
-		} else {
-			if (text->clip && text->use_ellipsis && lines->ellipsis_length < lines->length) {
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->ellipsis_length);
-				e_font_draw_utf8_text (drawable,
-						       text->font, E_FONT_PLAIN,
-						       text->gc,
-						       xpos - x + lines->width - text->ellipsis_width,
-						       ypos - y,
-						       text->ellipsis ? text->ellipsis : "...",
-						       text->ellipsis ? strlen (text->ellipsis) : 3);
-			} else
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, E_FONT_PLAIN,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->length);
-		}
-
-		ypos += e_font_height (text->font);
-		lines++;
-	}
-
-	if (text->clip) {
-		gdk_gc_set_clip_rectangle (text->gc, NULL);
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-	}
-}
-
-/* Render handler for the text item */
-static void
-e_text_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
-{
-#if 0
-	EText *text;
-	guint32 fg_color;
-	double xpos, ypos;
-	struct line *lines;
-	int i, j;
-	double affine[6];
-	int dx, dy;
-	ArtPoint start_i, start_c;
-
-	text = E_TEXT (item);
-
-	if (!text->text || !text->font || !text->suckfont)
-		return;
-
-	suckfont = text->suckfont;
-
-	fg_color = text->rgba;
-
-        gnome_canvas_buf_ensure_buf (buf);
-
-	lines = text->lines;
-	if ( !lines )
-		return;
-
-	start_i.y = get_line_ypos_item_relative (text);
-
-	art_affine_scale (affine, item->canvas->pixels_per_unit, item->canvas->pixels_per_unit);
-	for (i = 0; i < 6; i++)
-		affine[i] = text->affine[i];
-
-	for (i = 0; i < text->num_lines; i++) {
-		if (lines->length != 0) {
-			start_i.x = get_line_xpos_item_relative (text, lines);
-			art_affine_point (&start_c, &start_i, text->affine);
-			xpos = start_c.x;
-			ypos = start_c.y;
-
-			for (j = 0; j < lines->length; j++) {
-				ETextSuckChar *ch;
-
-				ch = &suckfont->chars[(unsigned char)((lines->text)[j])];
-
-				affine[4] = xpos;
-				affine[5] = ypos;
-				art_rgb_bitmap_affine (
-					buf->buf,
-					buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1,
-					buf->buf_rowstride,
-					suckfont->bitmap + (ch->bitmap_offset >> 3),
-					ch->width,
-					suckfont->bitmap_height,
-					suckfont->bitmap_width >> 3,
-					fg_color,
-					affine,
-					ART_FILTER_NEAREST, NULL);
-
-				dx = ch->left_sb + ch->width + ch->right_sb;
-				xpos += dx * affine[0];
-				ypos += dx * affine[1];
-			}
-		}
-
-		dy = text->font->ascent + text->font->descent;
-		start_i.y += dy;
-		lines++;
-	}
-
-	buf->is_bg = 0;
-#endif
-}
-
-/* Point handler for the text item */
-static double
-e_text_point (GnomeCanvasItem *item, double x, double y,
-			 int cx, int cy, GnomeCanvasItem **actual_item)
-{
-	EText *text;
-	int i;
-	struct line *lines;
-	int x1, y1, x2, y2;
-	int font_height;
-	int dx, dy;
-	double dist, best;
-
-	text = E_TEXT (item);
-
-	*actual_item = item;
-
-	/* The idea is to build bounding rectangles for each of the lines of
-	 * text (clipped by the clipping rectangle, if it is activated) and see
-	 * whether the point is inside any of these.  If it is, we are done.
-	 * Otherwise, calculate the distance to the nearest rectangle.
-	 */
-
-	if (text->font)
-		font_height = e_font_height (text->font);
-	else
-		font_height = 0;
-
-	best = 1.0e36;
-
-	lines = text->lines;
-
-	if (text->fill_clip_rectangle) {
-		double clip_width;
-		double clip_height;
-
-		/* Calculate the width and heights */
-		calc_height (text);
-		calc_line_widths (text);
-		
-		if (text->clip_width < 0)
-			clip_width = text->max_width;
-		else
-			clip_width = text->clip_width;
-
-		/* Get canvas pixel coordinates for clip rectangle position */
-		clip_width = clip_width * item->canvas->pixels_per_unit;
-		if ( text->clip_height >= 0 )
-			clip_height = text->clip_height * item->canvas->pixels_per_unit;
-		else
-			clip_height = text->height * item->canvas->pixels_per_unit;
-
-		if (cx >= text->clip_cx &&
-		    cx <= text->clip_cx + clip_width &&
-		    cy >= text->clip_cy &&
-		    cy <= text->clip_cy + clip_height)
-			return 0;
-		else
-			return 1;
-	}
-
-	for (i = 0; i < text->num_lines; i++) {
-		/* Compute the coordinates of rectangle for the current line,
-		 * clipping if appropriate.
-		 */
-
-		x1 = get_line_xpos (text, lines);
-		y1 = text->cy + i * font_height;
-		x2 = x1 + lines->width;
-		y2 = y1 + font_height;
-
-		if (text->clip) {
-			if (x1 < text->clip_cx)
-				x1 = text->clip_cx;
-
-			if (y1 < text->clip_cy)
-				y1 = text->clip_cy;
-			
-			if ( text->clip_width >= 0 ) {
-				if (x2 > (text->clip_cx + text->clip_width))
-					x2 = text->clip_cx + text->clip_width;
-			}
-
-			if ( text->clip_height >= 0 ) {
-				if (y2 > (text->clip_cy + text->clip_height))
-					y2 = text->clip_cy + text->clip_height;
-			}
-
-			if ((x1 >= x2) || (y1 >= y2))
-				continue;
-		}
-
-		/* Calculate distance from point to rectangle */
-
-		if (cx < x1)
-			dx = x1 - cx;
-		else if (cx >= x2)
-			dx = cx - x2 + 1;
-		else
-			dx = 0;
-
-		if (cy < y1)
-			dy = y1 - cy;
-		else if (cy >= y2)
-			dy = cy - y2 + 1;
-		else
-			dy = 0;
-
-		if ((dx == 0) && (dy == 0))
-			return 0.0;
-
-		dist = sqrt (dx * dx + dy * dy);
-		if (dist < best)
-			best = dist;
-
-		/* Next! */
-
-		lines++;
-	}
-
-	return best / item->canvas->pixels_per_unit;
-}
-
-/* Bounds handler for the text item */
-static void
-e_text_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	EText *text;
-	double width, height;
-
-	text = E_TEXT (item);
-
-	*x1 = 0;
-	*y1 = 0;
-
-	if (text->clip) {
-		width = text->clip_width;
-		if ( text->clip_height >= 0 )
-			height = text->clip_height;
-		else height = text->height;
-	} else {
-		width = text->max_width / item->canvas->pixels_per_unit;
-		height = text->height / item->canvas->pixels_per_unit;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		*x1 -= width / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		*x1 -= width;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		*y1 -= height / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		*y1 -= height;
-		break;
-	}
-
-	*x2 = *x1 + width;
-	*y2 = *y1 + height;
-}
-
-static void
-_get_xy_from_position (EText *text, gint position, gint *xp, gint *yp)
-{
-	if ( !text->lines )
-		return;
-	if (xp || yp) {
-		struct line *lines = NULL;
-		int x, y;
-		double xd, yd;
-		int j;
-		x = get_line_xpos_item_relative (text, lines);
-		y = text->yofs;
-		y -= text->yofs_edit;
-		for (j = 0, lines = text->lines; j < text->num_lines; lines++, j++) {
-			if (lines->text > text->text + position)
-				break;
-			y += e_font_height (text->font);
-		}
-		lines --;
-		y -= e_font_descent (text->font);
-		
-		x += text_width_with_objects (text->model,
-					      text->font, E_FONT_PLAIN,
-					      lines->text,
-					      position - (lines->text - text->text));
-		x -= text->xofs_edit;
-
-		xd = x;  yd = y;
-		gnome_canvas_item_i2w (GNOME_CANVAS_ITEM(text), &xd, &yd);
-		gnome_canvas_w2c (GNOME_CANVAS_ITEM(text)->canvas, xd, yd, &x, &y);
-
-		if (xp)
-			*xp = x;
-		if (yp)
-			*yp = y;
-	}
-}
-
-static gint
-_get_position_from_xy (EText *text, gint x, gint y)
-{
-	int i, j;
-	int ypos = text->yofs;
-	int xpos;
-	double xd, yd;
-	const char *p;
-	unicode_char_t unival;
-	gint font_ht, adjust=0;
-	struct line *lines;
-
-	xd = x;  yd = y;
-	gnome_canvas_c2w (GNOME_CANVAS_ITEM(text)->canvas, xd, yd, &xd, &yd);
-	gnome_canvas_item_w2i (GNOME_CANVAS_ITEM(text), &xd, &yd);
-	x = xd;  y = yd;
-
-	y += text->yofs_edit;
-	font_ht = e_font_height (text->font);
-
-	if (text->draw_borders)
-		ypos += BORDER_INDENT;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_WEST:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_EAST:
-		y += (text->num_lines * font_ht)/2;
-		break;
-	case GTK_ANCHOR_SOUTH:
-	case GTK_ANCHOR_SOUTH_EAST:
-	case GTK_ANCHOR_SOUTH_WEST:
-		y += text->num_lines * font_ht;
-	default:
-		/* Do nothing */
-	}
-		
-
-	j = 0;
-	while (y > ypos) {
-		ypos += font_ht;
-		j ++;
-	}
-	j--;
-	if (j >= text->num_lines)
-		j = text->num_lines - 1;
-	if (j < 0)
-		j = 0;
-	i = 0;
-	lines = text->lines;
-	
-	if ( !lines )
-		return 0;
-
-	lines += j;
-	x += text->xofs_edit;
-	xpos = get_line_xpos_item_relative (text, lines);
-
-	for (i = 0, p = lines->text; p && i < lines->length; i++, p = unicode_get_utf8 (p, &unival)) {
-		int charwidth;
-		int step1, step2;
-
-#if 0
-		if (unival == '\1') {
-			const gchar *obj_str = NULL; /*e_text_model_get_nth_object (text->model, object_num);*/
-			charwidth = e_font_utf8_text_width (text->font, E_FONT_PLAIN, obj_str, strlen (obj_str));
-			++object_num;
-
-			step1 = charwidth;
-			step2 = 0;
-			adjust = -1;
-
-		} else {
-#endif
-			charwidth = e_font_utf8_char_width (text->font, E_FONT_PLAIN, (gchar *) p);
-			
-			step1 = charwidth / 2;
-			step2 = (charwidth + 1) / 2;
-			adjust = 0;
-#if 0
-		}
-#endif
-
-		xpos += step1;
-		if (xpos > x) {
-			break;
-		}
-		xpos += step2;
-	}
-
-	if (!p) return 0;
-	
-	return MAX (p - text->text + adjust, 0);
-}
-
-#define SCROLL_WAIT_TIME 30000
-
-static gboolean
-_blink_scroll_timeout (gpointer data)
-{
-	EText *text = E_TEXT(data);
-	gulong current_time;
-	gboolean scroll = FALSE;
-	gboolean redraw = FALSE;
-	
-	g_timer_elapsed(text->timer, &current_time);
-
-	if (text->scroll_start + SCROLL_WAIT_TIME > 1000000) {
-		if (current_time > text->scroll_start - (1000000 - SCROLL_WAIT_TIME) &&
-		    current_time < text->scroll_start)
-			scroll = TRUE;
-	} else {
-		if (current_time > text->scroll_start + SCROLL_WAIT_TIME ||
-		    current_time < text->scroll_start)
-			scroll = TRUE;
-	}
-	if (scroll && text->button_down) {
-		if (text->lastx - text->clip_cx > text->clip_cwidth &&
-		    text->xofs_edit < text->max_width - text->clip_cwidth) {
-			text->xofs_edit += 4;
-			if (text->xofs_edit > text->max_width - text->clip_cwidth + 1)
-				text->xofs_edit = text->max_width - text->clip_cwidth + 1;
-			redraw = TRUE;
-		}
-		if (text->lastx - text->clip_cx < 0 &&
-		    text->xofs_edit > 0) {
-			text->xofs_edit -= 4;
-			if (text->xofs_edit < 0)
-				text->xofs_edit = 0;
-			redraw = TRUE;
-		}
-
-		if (text->lasty - text->clip_cy > text->clip_cheight &&
-		    text->yofs_edit < text->height - text->clip_cheight) {
-			text->yofs_edit += 4;
-			if (text->yofs_edit > text->height - text->clip_cheight + 1)
-				text->yofs_edit = text->height - text->clip_cheight + 1;
-			redraw = TRUE;
-		}
-		if (text->lasty - text->clip_cy < 0 &&
-		    text->yofs_edit > 0) {
-			text->yofs_edit -= 4;
-			if (text->yofs_edit < 0)
-				text->yofs_edit = 0;
-			redraw = TRUE;
-		}
-
-		if (redraw) {
-			ETextEventProcessorEvent e_tep_event;
-			e_tep_event.type = GDK_MOTION_NOTIFY;
-			e_tep_event.motion.state = text->last_state;
-			e_tep_event.motion.time = 0;
-			e_tep_event.motion.position = _get_position_from_xy(text, text->lastx, text->lasty);
-			_get_tep(text);
-			e_text_event_processor_handle_event (text->tep,
-							     &e_tep_event);
-			text->scroll_start = current_time;
-		}
-	}
-
-	if (!((current_time / 500000) % 2)) {
-		if (!text->show_cursor)
-			redraw = TRUE;
-		text->show_cursor = TRUE;
-	} else {
-		if (text->show_cursor)
-			redraw = TRUE;
-		text->show_cursor = FALSE;
-	}
-	if (redraw) {
-		text->needs_redraw = 1;
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-	}
-	return TRUE;
-}
-
-static gboolean
-tooltip_event(GtkWidget *tooltip, GdkEvent *event, EText *text)
-{
-	gint ret_val = FALSE;
-	switch (event->type) {
-	case GDK_LEAVE_NOTIFY:
-		if (text->tooltip_window) {
-			gtk_widget_destroy (text->tooltip_window);
-			text->tooltip_window = NULL;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		if (event->type == GDK_BUTTON_RELEASE) {
-			if (text->tooltip_window) {
-				gtk_widget_destroy (text->tooltip_window);
-				text->tooltip_window = NULL;
-			}
-		}
-		/* Forward events to the text item */
-		gtk_signal_emit_by_name (GTK_OBJECT (text), "event", event,
-					 &ret_val);
-	default:
-		break;
-	}
-	return ret_val;
-}
-
-static gboolean
-_do_tooltip (gpointer data)
-{
-	EText *text = E_TEXT (data);
-	struct line *lines;
-	GtkWidget *canvas;
-	int i;
-	gdouble max_width;
-	gboolean cut_off;
-	double i2c[6];
-	ArtPoint origin = {0, 0};
-	ArtPoint pixel_origin;
-	int canvas_x, canvas_y;
-	GnomeCanvasItem *tooltip_text;
-	double tooltip_width;
-	double tooltip_height;
-	double tooltip_x;
-	double tooltip_y;
-#if 0
-	double x1, x2, y1, y2;
-#endif
-	GnomeCanvasItem *rect;
-
-	text->tooltip_count = 0;
-
-	lines = text->lines;
-
-	if (text->tooltip_window || text->editing || (!lines)) {
-		text->tooltip_timeout = 0;
-		return FALSE;
-	}
-
-	cut_off = FALSE;
-	for ( lines = text->lines, i = 0; i < text->num_lines; lines++, i++ ) {
-		if (lines->length > lines->ellipsis_length) {
-			cut_off = TRUE;
-			break;
-		}
-	}
-	if ( ! cut_off ) {
-		text->tooltip_timeout = 0;
-		return FALSE;
-	}
-
-	gnome_canvas_item_i2c_affine(GNOME_CANVAS_ITEM(text), i2c);
-	art_affine_point (&pixel_origin, &origin, i2c);
-
-	gdk_window_get_origin (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas)->window, &canvas_x, &canvas_y);
-	pixel_origin.x += canvas_x;
-	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
-
-	text->tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_container_set_border_width (GTK_CONTAINER (text->tooltip_window), 1);
-
-	canvas = e_canvas_new ();
-
-	gtk_container_add (GTK_CONTAINER (text->tooltip_window), canvas);
-	
-	/* Get the longest line length */
-	max_width = 0.0;
-	for (lines = text->lines, i = 0; i < text->num_lines; lines++, i++) {
-		gdouble line_width;
-
-		line_width = text_width_with_objects (text->model, text->font, E_FONT_PLAIN, lines->text, lines->length);
-		max_width = MAX (max_width, line_width);
-	}
-
-	rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				      gnome_canvas_rect_get_type (),
-				      "x1", (double) 0,
-				      "y1", (double) 0,
-				      "x2", (double) max_width + 4,
-				      "y2", (double) text->height + 4,
-				      "fill_color", "light gray",
-				      NULL);
-
-	/* Ref the font so that it is not destroyed
-	   when the tooltip text is destroyed */
-	e_font_ref (text->font);
-	tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-					      e_text_get_type (),
-					      "anchor", GTK_ANCHOR_NW,
-					      "font_e", text->font,
-					      "text", text->text,
-					      "editable", FALSE,
-					      "clip_width", text->max_lines != 1 ? text->clip_width : max_width,
-					      "clip_height", text->max_lines != 1 ? -1 : (double)text->height,
-					      "clip", TRUE,
-					      "line_wrap", text->line_wrap,
-					      "justification", text->justification,
-					      NULL);
-
-
-
-	if (text->draw_borders)
-		e_canvas_item_move_absolute(tooltip_text, 1 + BORDER_INDENT, 1 + BORDER_INDENT);
-	else
-		e_canvas_item_move_absolute(tooltip_text, 1, 1);
-
-
-	calc_height(E_TEXT(tooltip_text));
-	calc_line_widths(E_TEXT(tooltip_text));
-	gnome_canvas_item_set (tooltip_text,
-			       "clip_height", (double) E_TEXT(tooltip_text)->height,
-			       "clip_width", (double) E_TEXT(tooltip_text)->max_width,
-			       NULL);
-	tooltip_width = E_TEXT(tooltip_text)->max_width;
-	tooltip_height = E_TEXT(tooltip_text)->height;
-	tooltip_x = 0;
-	tooltip_y = 0;
-	switch(E_TEXT(tooltip_text)->justification) {
-	case GTK_JUSTIFY_CENTER:
-		tooltip_x = - tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_RIGHT:
-		tooltip_x = tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_FILL:
-	case GTK_JUSTIFY_LEFT:
-		tooltip_x = 0;
-		break;
-	}
-	switch(text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		tooltip_y -= tooltip_height / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		tooltip_y -= tooltip_height;
-		break;
-	}
-	switch(E_TEXT(tooltip_text)->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		tooltip_x -= tooltip_width / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		tooltip_x -= tooltip_width;
-		break;
-	}
-#if 0
-	get_bounds(text, &x1, &y1, &x2, &y2);
-	if ( x1 < tooltip_x ) {
-		gnome_canvas_item_move(tooltip_text, tooltip_x - x1, 0);
-		tooltip_x = x1;
-	}
-	if ( y1 < tooltip_y ) {
-		gnome_canvas_item_move(tooltip_text, 0, tooltip_y - y1);
-		tooltip_y = y1;
-	}
-	if ( x2 > tooltip_x + tooltip_width )
-		tooltip_width = x2 - tooltip_x;
-	if ( y2 > tooltip_y + tooltip_height )
-		tooltip_height = y2 - tooltip_y;
-#endif
-
-	gnome_canvas_item_set(rect,
-			      "x2", (double) tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      "y2", (double) tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      NULL);
-	
-	gtk_widget_set_usize (text->tooltip_window,
-			      tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0));
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(canvas), 0.0, 0.0,
-					tooltip_width + (text->draw_borders ? BORDER_INDENT * 2 : 0), 
-					(double)tooltip_height + (text->draw_borders ? BORDER_INDENT * 2 : 0));
-	gtk_widget_show (canvas);
-	gtk_widget_realize (text->tooltip_window);
-	gtk_signal_connect (GTK_OBJECT(text->tooltip_window), "event",
-			    GTK_SIGNAL_FUNC(tooltip_event), text);
-
-	gtk_widget_popup (text->tooltip_window, pixel_origin.x - 2 + tooltip_x, pixel_origin.y - 2 + tooltip_y);
-	
-	text->tooltip_timeout = 0;
-	return FALSE;
-}
-
-static gboolean
-_click (gpointer data)
-{
-	*(gint *)data = 0;
-	return FALSE;
-}
-
-static gint
-e_text_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EText *text = E_TEXT(item);
-	ETextEventProcessorEvent e_tep_event;
-
-	gint return_val = 0;
-
-	if (GTK_OBJECT_DESTROYED (item))
-		return FALSE;
-
-	e_tep_event.type = event->type;
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		if (text->editable) {
-			GdkEventFocus *focus_event;
-			focus_event = (GdkEventFocus *) event;
-			if (focus_event->in) {
-				if(!text->editing) {
-					text->editing = TRUE;
-					if ( text->pointer_in ) {
-						if ( text->default_cursor_shown && (!text->draw_borders)) {
-							gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->i_cursor);
-							text->default_cursor_shown = FALSE;
-						}
-					}
-					text->select_by_word = FALSE;
-					text->xofs_edit = 0;
-					text->yofs_edit = 0;
-					if (text->timeout_id == 0)
-						text->timeout_id = g_timeout_add(10, _blink_scroll_timeout, text);
-					text->timer = g_timer_new();
-					g_timer_elapsed(text->timer, &(text->scroll_start));
-					g_timer_start(text->timer);
-				}
-			} else {
-				text->editing = FALSE;
-				if ( (!text->default_cursor_shown) && (!text->draw_borders) ) {
-					gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->default_cursor);
-					text->default_cursor_shown = TRUE;
-				}
-				if (text->timeout_id) {
-					g_source_remove(text->timeout_id);
-					text->timeout_id = 0;
-				}
-				if (text->timer) {
-					g_timer_stop(text->timer);
-					g_timer_destroy(text->timer);
-					text->timer = NULL;
-				}
-			}
-			if ( text->line_wrap )
-				text->needs_split_into_lines = 1;
-			else
-				text->needs_calc_line_widths = 1;
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(text));
-		}
-		return_val = 0;
-		break;
-	case GDK_KEY_PRESS: /* Fall Through */
-	case GDK_KEY_RELEASE:
-		if (text->editing) {
-			GdkEventKey key = event->key;
-			gint ret;
-
-			e_tep_event.key.time = key.time;
-			e_tep_event.key.state = key.state;
-			e_tep_event.key.keyval = key.keyval;
-
-			// g_print ("etext got keyval \"%s\"\n", gdk_keyval_name (key.keyval));
-
-			/* This is probably ugly hack, but we have to handle UTF-8 input somehow */
-#if 0
-			e_tep_event.key.length = key.length;
-			e_tep_event.key.string = key.string;
-#else
-			e_tep_event.key.string = e_utf8_from_gtk_event_key (GTK_WIDGET (item->canvas), key.keyval, key.string);
-			if (e_tep_event.key.string != NULL) {
-				e_tep_event.key.length = strlen (e_tep_event.key.string);
-			} else {
-				e_tep_event.key.length = 0;
-			}
-#endif
-			_get_tep(text);
-			ret = e_text_event_processor_handle_event (text->tep, &e_tep_event);
-
-			if (e_tep_event.key.string) g_free (e_tep_event.key.string);
-
-			return ret;
-		}
-		else
-			return 0;
-		break;
-	case GDK_BUTTON_PRESS: /* Fall Through */
-	case GDK_BUTTON_RELEASE:
-		if (text->tooltip_timeout) {
-			gtk_timeout_remove (text->tooltip_timeout);
-			text->tooltip_timeout = 0;
-		}
-		if (text->tooltip_window) {
-			gtk_widget_destroy (text->tooltip_window);
-			text->tooltip_window = NULL;
-		}
-#if 0
-		if ((!text->editing) 
-		    && text->editable 
-		    && event->type == GDK_BUTTON_RELEASE
-		    && event->button.button == 1) {
-			GdkEventButton button = event->button;
-
-			e_canvas_item_grab_focus (item);
-
-			e_tep_event.type = GDK_BUTTON_RELEASE;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy(text, button.x, button.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-									  &e_tep_event);
-			e_tep_event.type = GDK_BUTTON_RELEASE;
-		}
-#else
-		if ((!text->editing) 
-		    && text->editable 
-		    && (event->button.button == 1 ||
-			event->button.button == 2)) {
-			e_canvas_item_grab_focus (item);
-		}
-#endif
-		/* Create our own double and triple click events, 
-		   as gnome-canvas doesn't forward them to us */
-		if (event->type == GDK_BUTTON_PRESS) {
-			if (text->dbl_timeout == 0 && 
-			    text->tpl_timeout == 0) {
-				text->dbl_timeout = gtk_timeout_add (200,
-								     _click,
-								     &(text->dbl_timeout));
-			} else {
-				if (text->tpl_timeout == 0) {
-					e_tep_event.type = GDK_2BUTTON_PRESS;
-					text->tpl_timeout = gtk_timeout_add (200, _click, &(text->tpl_timeout));
-				} else {
-					e_tep_event.type = GDK_3BUTTON_PRESS;
-				}				     
-			}
-		}
-		
-		if (text->editing) {
-			GdkEventButton button = event->button;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy(text, button.x, button.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-									  &e_tep_event);
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					text->button_down = TRUE;
-				else
-					text->button_down = FALSE;
-			}
-			text->lastx = button.x;
-			text->lasty = button.y;
-			text->last_state = button.state;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (text->editing) {
-			GdkEventMotion motion = event->motion;
-			e_tep_event.motion.time = motion.time;
-			e_tep_event.motion.state = motion.state;
-			e_tep_event.motion.position = _get_position_from_xy(text, motion.x, motion.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-								       &e_tep_event);
-			text->lastx = motion.x;
-			text->lasty = motion.y;
-			text->last_state = motion.state;
-		}
-		break;
-	case GDK_ENTER_NOTIFY:
-		{
-			GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-			double x1, y1, x2, y2;
-			get_bounds (text, &x1, &y1, &x2, &y2);
-			if (crossing->x >= x1 &&
-			    crossing->y >= y1 &&
-			    crossing->x <= x2 &&
-			    crossing->y <= y2) {
-				if ( text->tooltip_count == 0 && text->clip) {
-					if (!text->tooltip_timeout)
-						text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
-				}
-				text->tooltip_count ++;
-			}
-		}
-
-		text->pointer_in = TRUE;
-		if (text->editing || text->draw_borders) {
-			if ( text->default_cursor_shown ) {
-				gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->i_cursor);
-				text->default_cursor_shown = FALSE;
-			}
-		}
-		break;
-	case GDK_LEAVE_NOTIFY:
-		if (text->tooltip_count > 0)
-			text->tooltip_count --;
-		if ( text->tooltip_count == 0 && text->clip) {
-			if ( text->tooltip_timeout ) {
-				gtk_timeout_remove (text->tooltip_timeout);
-				text->tooltip_timeout = 0;
-			}
-		}
-		
-		text->pointer_in = FALSE;
-		if (text->editing || text->draw_borders) {
-			if ( ! text->default_cursor_shown ) {
-				gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->default_cursor);
-				text->default_cursor_shown = TRUE;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-	if (return_val)
-		return return_val;
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-	else
-		return 0;
-}
-
-/* fixme: */
-
-static int
-_get_position(EText *text, ETextEventProcessorCommand *command)
-{
-	int length, obj_num;
-	int x, y;
-	unicode_char_t unival;
-	char *p = NULL;
-	gint new_pos = 0;
-	
-	switch (command->position) {
-		
-	case E_TEP_VALUE:
-		new_pos = command->value;
-		break;
-
-	case E_TEP_SELECTION:
-		new_pos = text->selection_end;
-		break;
-
-	case E_TEP_START_OF_BUFFER:
-		new_pos = 0;
-		break;
-
-	case E_TEP_END_OF_BUFFER:
-		new_pos = unicode_strlen (text->text, -1);
-		break;
-
-	case E_TEP_START_OF_LINE:
-
-		new_pos = 0;
-		
-		if (text->selection_end >= 1) {
-			
-			p = unicode_previous_utf8 (text->text, text->text + text->selection_end);
-			if (p != text->text) {
-				p = unicode_previous_utf8 (text->text, p);
-
-				while (p && p > text->text && !new_pos) {
-					if (*p == '\n')
-						new_pos = p - text->text + 1;
-					p = unicode_previous_utf8 (text->text, p);
-				}
-			}
-		}
-
-		break;
-
-	case E_TEP_END_OF_LINE:
-		new_pos = -1;
-		length = strlen (text->text);
-		
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-
-			p = unicode_next_utf8 (text->text + text->selection_end);
-
-			while (p && *p) {
-				if (*p == '\n') {
-					new_pos = p - text->text;
-					p = NULL;
-				} else 
-					p = unicode_next_utf8 (p);
-			}
-		}
-
-		if (new_pos == -1)
-			new_pos = p - text->text;
-
-		break;
-
-	case E_TEP_FORWARD_CHARACTER:
-		length = strlen (text->text);
-
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-			p = unicode_next_utf8 (text->text + text->selection_end);
-			new_pos = p - text->text;
-		}
-
-		break;
-
-	case E_TEP_BACKWARD_CHARACTER:
-		new_pos = 0;
-		if (text->selection_end >= 1) {
-			p = unicode_previous_utf8 (text->text, text->text + text->selection_end);
-
-			if (p != NULL)
-				new_pos = p - text->text;
-		}
-
-		break;
-
-	case E_TEP_FORWARD_WORD:
-		new_pos = -1;
-		length = strlen (text->text);
-
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-
-			p = unicode_next_utf8 (text->text + text->selection_end);
-
-			while (p && *p) {
-				unicode_get_utf8 (p, &unival);
-				if (unicode_isspace (unival)) {
-					new_pos = p - text->text;
-					p = NULL;
-				} else 
-					p = unicode_next_utf8 (p);
-			}
-		}
-			
-		if (new_pos == -1)
-			new_pos = p - text->text;
-
-		break;
-
-	case E_TEP_BACKWARD_WORD:
-		new_pos = 0;
-		if (text->selection_end >= 1) {
-			p = unicode_previous_utf8 (text->text, text->text + text->selection_end);
-			if (p != text->text) {
-				p = unicode_previous_utf8 (text->text, p);
-
-				while (p && p > text->text) {
-					unicode_get_utf8 (p, &unival);
-					if (unicode_isspace (unival)) {
-						new_pos = unicode_next_utf8 (p) - text->text; 
-						p = NULL;
-					} else
-						p = unicode_previous_utf8 (text->text, p);
-				}
-			}
-		}
-					
-		break;
-
-	case E_TEP_FORWARD_LINE:
-		_get_xy_from_position(text, text->selection_end, &x, &y);
-		y += e_font_height (text->font);
-		new_pos = _get_position_from_xy(text, x, y);
-		break;
-
-	case E_TEP_BACKWARD_LINE:
-		_get_xy_from_position(text, text->selection_end, &x, &y);
-		y -= e_font_height (text->font);
-		new_pos = _get_position_from_xy(text, x, y);
-		break;
-
-	case E_TEP_SELECT_WORD:
-
-		/* This is a silly hack to cause double-clicking on an object
-		   to activate that object.
-		   (Normally, double click == select word, which is why this is here.) */
-		
-		obj_num = e_text_model_get_object_at_offset (text->model, text->selection_start);
-		if (obj_num != -1) {
-			e_text_model_activate_nth_object (text->model, obj_num);
-			new_pos = text->selection_start;
-			break;
-		}
-
-
-		if (text->selection_end < 1) {
-			new_pos = 0;
-			break;
-		}
-
-		p = unicode_previous_utf8 (text->text, text->text + text->selection_end);
-		if (p == text->text) {
-			new_pos = 0;
-			break;
-		}
-		p = unicode_previous_utf8 (text->text, p);
-
-		while (p && p > text->text) {
-			unicode_get_utf8 (p, &unival);
-			if (unicode_isspace (unival)) {
-				p = unicode_next_utf8 (p);
-				break;
-			}
-			p = unicode_previous_utf8 (text->text, p);
-		}
-
-		if (!p)
-			text->selection_start = 0;
-		else
-			text->selection_start = p - text->text;
-
-
-		text->selection_start = e_text_model_validate_position (text->model, text->selection_start);
-		
-		length = strlen (text->text);
-		if (text->selection_end >= length) {
-			new_pos = length;
-			break;
-		}
-
-		p = unicode_next_utf8 (text->text + text->selection_end);
-
-		while (p && *p) {
-			unicode_get_utf8 (p, &unival);
-			if (unicode_isspace (unival)) {
-				new_pos =  p - text->text;
-				p = NULL;
-			} else
-				p = unicode_next_utf8 (p);
-		}
-
-		if (p)
-			new_pos = p - text->text;
-
-		return new_pos;
-
-	case E_TEP_SELECT_ALL:
-		text->selection_start = 0;
-		new_pos = strlen (text->text);
-		break;
-
-	case E_TEP_FORWARD_PARAGRAPH:
-	case E_TEP_BACKWARD_PARAGRAPH:
-		
-	case E_TEP_FORWARD_PAGE:
-	case E_TEP_BACKWARD_PAGE:
-		new_pos = text->selection_end;
-		break;
-
-	default:
-		new_pos = text->selection_end;
-	}
-
-	new_pos = e_text_model_validate_position (text->model, new_pos);
-
-	return new_pos;
-}
-
-static void
-_delete_selection(EText *text)
-{
-	if ( text->selection_start < text->selection_end ) {
-		e_text_model_delete(text->model, text->selection_start, text->selection_end - text->selection_start);
-#if 0
-		text->selection_end = text->selection_start;
-#endif
-	} else {
-		e_text_model_delete(text->model, text->selection_end, text->selection_start - text->selection_end);
-#if 0
-		text->selection_start = text->selection_end;
-#endif
-	}
-}
-
-static void
-_insert(EText *text, char *string, int value)
-{
-	if (value > 0) {
-		e_text_model_insert_length(text->model, text->selection_start, string, value);
-		
-#if 0
-		text->selection_start += value;
-		text->selection_end = text->selection_start;
-#endif
-	}
-}
-
-static void
-e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data)
-{
-	EText *text = E_TEXT(data);
-	int sel_start, sel_end;
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		text->selection_start = _get_position(text, command);
-		text->selection_end = text->selection_start;
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_SELECT:
-		text->selection_start = e_text_model_validate_position (text->model, text->selection_start); /* paranoia */
-		text->selection_end = _get_position(text, command);
-		
-		sel_start = MIN(text->selection_start, text->selection_end);
-		sel_end   = MAX(text->selection_start, text->selection_end);
-
-		sel_start = e_text_model_validate_position (text->model, sel_start);
-		
-		if (sel_start != sel_end) {
-			e_text_supply_selection (text, command->time, GDK_SELECTION_PRIMARY,
-						 (guchar *) text->text + sel_start, sel_end - sel_start);
-		} else if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-
-		break;
-	case E_TEP_DELETE:
-		if (text->selection_end == text->selection_start) {
-			text->selection_end = _get_position(text, command);
-		}
-		_delete_selection(text);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-
-	case E_TEP_INSERT:
-		if (text->selection_end != text->selection_start) {
-			_delete_selection(text);
-		}
-		_insert(text, command->string, command->value);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_COPY:
-		sel_start = MIN(text->selection_start, text->selection_end);
-		sel_end = MAX(text->selection_start, text->selection_end);
-		if (sel_start != sel_end) {
-			e_text_supply_selection (text, command->time, clipboard_atom,
-						 (guchar *) text->text + sel_start, sel_end - sel_start);
-		}
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_PASTE:
-		e_text_get_selection (text, clipboard_atom, command->time);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_GET_SELECTION:
-		e_text_get_selection (text, GDK_SELECTION_PRIMARY, command->time);
-		break;
-	case E_TEP_ACTIVATE:
-		gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_ACTIVATE]);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_SET_SELECT_BY_WORD:
-		text->select_by_word = command->value;
-		break;
-	case E_TEP_GRAB:
-		gnome_canvas_item_grab (GNOME_CANVAS_ITEM(text), 
-					GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
-					text->i_cursor,
-					command->time);
-		break;
-	case E_TEP_UNGRAB:
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM(text), command->time);
-		break;
-	case E_TEP_NOP:
-		break;
-	}
-
-	if (!text->button_down) {
-		int x;
-		int i;
-		struct line *lines = text->lines;
-		gdouble clip_width;
-		if ( !lines )
-			return;
-
-		for (lines = text->lines, i = 0; i < text->num_lines ; i++, lines ++) {
-			if ((lines->text - text->text) > text->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		i --;
-		x = text_width_with_objects (text->model,
-					     text->font, E_FONT_PLAIN,
-					     lines->text, 
-					     text->selection_end - (lines->text - text->text));
-		
-
-		if (x < text->xofs_edit) {
-			text->xofs_edit = x;
-		}
-
-		clip_width = text->clip_width;
-		if (clip_width >= 0 && text->draw_borders) {
-			clip_width -= 6;
-			if (clip_width < 0)
-				clip_width = 0;
-		}
-
-		if (2 + x - clip_width > text->xofs_edit) {
-			text->xofs_edit = 2 + x - clip_width;
-		}
-		
-		if (e_font_height (text->font) * i < text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * i;
-		
-		if (e_font_height (text->font) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
-	}
-
-	text->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-}
-
-static void _invisible_destroy (GtkInvisible *invisible,
-				EText *text)
-{
-	text->invisible = NULL;
-}
-
-static GtkWidget *e_text_get_invisible(EText *text)
-{	
-	GtkWidget *invisible;
-	if (text->invisible) {
-		invisible = text->invisible;
-	} else {
-		invisible = gtk_invisible_new();
-		text->invisible = invisible;
-		
-		gtk_selection_add_target (invisible,
-					  GDK_SELECTION_PRIMARY,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_PRIMARY);
-		gtk_selection_add_target (invisible,
-					  clipboard_atom,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_CLIPBOARD);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_get",
-				    GTK_SIGNAL_FUNC (_selection_get), 
-				    text);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_clear_event",
-				    GTK_SIGNAL_FUNC (_selection_clear_event),
-				    text);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_received",
-				    GTK_SIGNAL_FUNC (_selection_received),
-				    text);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "destroy",
-				    GTK_SIGNAL_FUNC (_invisible_destroy),
-				    text);
-	}
-	return invisible;
-}
-
-static void
-_selection_clear_event (GtkInvisible *invisible,
-			GdkEventSelection *event,
-			EText *text)
-{
-	if (event->selection == GDK_SELECTION_PRIMARY) {
-		g_free (text->primary_selection);
-		text->primary_selection = NULL;
-		text->primary_length = 0;
-
-		text->has_selection = FALSE;
-		text->needs_redraw = 1;
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-
-	} else if (event->selection == clipboard_atom) {
-		g_free (text->clipboard_selection);
-		text->clipboard_selection = NULL;
-		text->clipboard_length = 0;
-	}
-}
-
-static void
-_selection_get (GtkInvisible *invisible,
-		GtkSelectionData *selection_data,
-		guint info,
-		guint time_stamp,
-		EText *text)
-{
-	switch (info) {
-	case E_SELECTION_PRIMARY:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, text->primary_selection, text->primary_length);
-		break;
-	case E_SELECTION_CLIPBOARD:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, text->clipboard_selection, text->clipboard_length);
-		break;
-	}
-}
-
-static void
-_selection_received (GtkInvisible *invisible,
-		     GtkSelectionData *selection_data,
-		     guint time,
-		     EText *text)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	} else {
-		ETextEventProcessorCommand command;
-		command.action = E_TEP_INSERT;
-		command.position = E_TEP_SELECTION;
-		command.string = selection_data->data;
-		command.value = selection_data->length;
-		command.time = time;
-		e_text_command(text->tep, &command, text);
-	}
-}
-
-static void e_text_supply_selection (EText *text, guint time, GdkAtom selection, guchar *data, gint length)
-{
-	gboolean successful;
-	GtkWidget *invisible;
-
-	invisible = e_text_get_invisible(text);
-
-	if (selection == GDK_SELECTION_PRIMARY ) {
-		if (text->primary_selection) {
-			g_free (text->primary_selection);
-		}
-		text->primary_selection = g_strndup(data, length);
-		text->primary_length = length;
-	} else if (selection == clipboard_atom) {
-		if (text->clipboard_selection) {
-			g_free (text->clipboard_selection);
-		}
-		text->clipboard_selection = g_strndup(data, length);
-		text->clipboard_length = length;
-	}
-
-	successful = gtk_selection_owner_set (invisible,
-					      selection,
-					      time);
-	
-	if (selection == GDK_SELECTION_PRIMARY)
-		text->has_selection = successful;
-}
-
-static void
-e_text_get_selection(EText *text, GdkAtom selection, guint32 time)
-{
-	GtkWidget *invisible;
-	invisible = e_text_get_invisible(text);
-	gtk_selection_convert(invisible,
-			      selection,
-			      GDK_SELECTION_TYPE_STRING,
-			      time);
-}
-
-#if 0
-static void
-e_text_real_copy_clipboard (EText *text)
-{
-  guint32 time;
-  gint selection_start_pos; 
-  gint selection_end_pos;
-
-  g_return_if_fail (text != NULL);
-  g_return_if_fail (E_IS_TEXT (text));
-  
-  time = gtk_text_get_event_time (text);
-  selection_start_pos = MIN (text->selection_start, text->selection_end);
-  selection_end_pos = MAX (text->selection_start, text->selection_end);
- 
-  if (selection_start_pos != selection_end_pos)
-    {
-      if (gtk_selection_owner_set (GTK_WIDGET (text->canvas),
-				   clipboard_atom,
-				   time))
-	      text->clipboard_text = "";
-    }
-}
-
-static void
-e_text_real_paste_clipboard (EText *text)
-{
-  guint32 time;
-
-  g_return_if_fail (text != NULL);
-  g_return_if_fail (E_IS_TEXT (text));
-  
-  time = e_text_get_event_time (text);
-  if (text->editable)
-	  gtk_selection_convert (GTK_WIDGET(text->widget),
-				 clipboard_atom,
-				 gdk_atom_intern ("COMPOUND_TEXT", FALSE), time);
-}
-#endif
-
-
-#if 0
-/* Routines for sucking fonts from the X server */
-
-static ETextSuckFont *
-e_suck_font (GdkFont *font)
-{
-	ETextSuckFont *suckfont;
-	int i;
-	int x, y;
-	char text[1];
-	int lbearing, rbearing, ch_width, ascent, descent;
-	GdkPixmap *pixmap;
-	GdkColor black, white;
-	GdkImage *image;
-	GdkGC *gc;
-	guchar *line;
-	int width, height;
-	int black_pixel, pixel;
-
-	if (!font)
-		return NULL;
-
-	suckfont = g_new (ETextSuckFont, 1);
-
-	height = font->ascent + font->descent;
-	x = 0;
-	for (i = 0; i < 256; i++) {
-		text[0] = i;
-		gdk_text_extents (font, text, 1,
-				  &lbearing, &rbearing, &ch_width, &ascent, &descent);
-		suckfont->chars[i].left_sb = lbearing;
-		suckfont->chars[i].right_sb = ch_width - rbearing;
-		suckfont->chars[i].width = rbearing - lbearing;
-		suckfont->chars[i].ascent = ascent;
-		suckfont->chars[i].descent = descent;
-		suckfont->chars[i].bitmap_offset = x;
-		x += (ch_width + 31) & -32;
-	}
-
-	width = x;
-
-	suckfont->bitmap_width = width;
-	suckfont->bitmap_height = height;
-	suckfont->ascent = font->ascent;
-
-	pixmap = gdk_pixmap_new (NULL, suckfont->bitmap_width,
-				 suckfont->bitmap_height, 1);
-	gc = gdk_gc_new (pixmap);
-	gdk_gc_set_font (gc, font);
-
-	black_pixel = BlackPixel (gdk_display, DefaultScreen (gdk_display));
-	black.pixel = black_pixel;
-	white.pixel = WhitePixel (gdk_display, DefaultScreen (gdk_display));
-	gdk_gc_set_foreground (gc, &white);
-	gdk_draw_rectangle (pixmap, gc, 1, 0, 0, width, height);
-
-	gdk_gc_set_foreground (gc, &black);
-	for (i = 0; i < 256; i++) {
-		text[0] = i;
-		gdk_draw_text (pixmap, font, gc,
-			       suckfont->chars[i].bitmap_offset - suckfont->chars[i].left_sb,
-			       font->ascent,
-			       text, 1);
-	}
-
-	/* The handling of the image leaves me with distinct unease.  But this
-	 * is more or less copied out of gimp/app/text_tool.c, so it _ought_ to
-	 * work. -RLL
-	 */
-
-	image = gdk_image_get (pixmap, 0, 0, width, height);
-	suckfont->bitmap = g_malloc0 ((width >> 3) * height);
-
-	line = suckfont->bitmap;
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			pixel = gdk_image_get_pixel (image, x, y);
-			if (pixel == black_pixel)
-				line[x >> 3] |= 128 >> (x & 7);
-		}
-		line += width >> 3;
-	}
-
-	gdk_image_destroy (image);
-
-	/* free the pixmap */
-	gdk_pixmap_unref (pixmap);
-
-	/* free the gc */
-	gdk_gc_destroy (gc);
-
-	return suckfont;
-}
-
-static void
-e_suck_font_free (ETextSuckFont *suckfont)
-{
-	g_free (suckfont->bitmap);
-	g_free (suckfont);
-}
-#endif
-
-
-
-
-
-
-
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
deleted file mode 100644
index 8ab6e33815..0000000000
--- a/widgets/text/e-text.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* EText - Text item for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#ifndef E_TEXT_H
-#define E_TEXT_H
-
-#include <gnome.h>
-#include <gal/widgets/e-font.h>
-#include <gal/util/e-text-event-processor.h>
-#include <gal/e-text/e-text-model.h>
-
-
-BEGIN_GNOME_DECLS
-
-
-/* Text item for the canvas.  Text items are positioned by an anchor point and an anchor direction.
- *
- * A clipping rectangle may be specified for the text.  The rectangle is anchored at the text's anchor
- * point, and is specified by clipping width and height parameters.  If the clipping rectangle is
- * enabled, it will clip the text.
- *
- * In addition, x and y offset values may be specified.  These specify an offset from the anchor
- * position.  If used in conjunction with the clipping rectangle, these could be used to implement
- * simple scrolling of the text within the clipping rectangle.
- *
- * The following object arguments are available:
- *
- * name			type			read/write	description
- * ------------------------------------------------------------------------------------------
- * text			string			RW		The string of the text label
- * font			string			W		X logical font descriptor
- * fontset		string			W		X logical fontset descriptor
- * font_gdk		GdkFont*		RW		Pointer to a GdkFont
- * anchor		GtkAnchorType		RW		Anchor side for the text
- * justification	GtkJustification	RW		Justification for multiline text
- * fill_color		string			W		X color specification for text
- * fill_color_gdk	GdkColor*		RW		Pointer to an allocated GdkColor
- * fill_stipple		GdkBitmap*		RW		Stipple pattern for filling the text
- * clip_width		double			RW		Width of clip rectangle
- * clip_height		double			RW		Height of clip rectangle
- * clip			boolean			RW		Use clipping rectangle?
- * fill_clip_rect       boolean                 RW              Whether the text item represents itself as being the size of the clipping rectangle.
- * x_offset		double			RW		Horizontal offset distance from anchor position
- * y_offset		double			RW		Vertical offset distance from anchor position
- * text_width		double			R		Used to query the width of the rendered text
- * text_height		double			R		Used to query the rendered height of the text
- * width                double                  RW              A synonym for clip_width
- * height               double                  R               A synonym for text_height
- *
- * These are currently ignored in the AA version:
- * editable             boolean                 RW              Can this item be edited
- * use_ellipsis         boolean                 RW              Whether to use ellipsises if text gets cut off.  Meaningless if clip == false.
- * ellipsis             string                  RW              The characters to use as ellipsis.  NULL = "...".
- * line_wrap            boolean                 RW              Line wrap when not editing.
- * break_characters     string                  RW              List of characters to optionally break on.
- * max_lines            int                     RW              Number of lines possible when doing line wrap.
- * draw_borders         boolean                 RW              Whether to draw borders.
- * draw_background      boolean                 RW              Whether to draw the background.
- */
-
-#define E_TYPE_TEXT            (e_text_get_type ())
-#define E_TEXT(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT, EText))
-#define E_TEXT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT, ETextClass))
-#define E_IS_TEXT(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT))
-#define E_IS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT))
-
-
-typedef struct _EText EText;
-typedef struct _ETextClass ETextClass;
-
-#if 0
-typedef struct _ETextSuckFont ETextSuckFont;
-typedef struct _ETextSuckChar ETextSuckChar;
-
-struct _ETextSuckChar {
-	int     left_sb;
-	int     right_sb;
-	int     width;
-	int     ascent;
-	int     descent;
-	int     bitmap_offset; /* in pixels */
-};
-
-struct _ETextSuckFont {
-	guchar *bitmap;
-	gint    bitmap_width;
-	gint    bitmap_height;
-	gint    ascent;
-	ETextSuckChar chars[256];
-};
-#endif
-
-struct _EText {
-	GnomeCanvasItem item;
-	
-	ETextModel *model;
-	gint model_changed_signal_id;
-	gint model_repos_signal_id;
-
-	const gchar *text;              /* Text to display --- from the ETextModel */
-	gpointer lines;			/* Text split into lines (private field) */
-	int num_lines;			/* Number of lines of text */
-
-#if 0
-	GdkFont *font;			/* Font for text */
-#else
-	EFont *font;
-#endif
-	GtkAnchorType anchor;		/* Anchor side for text */
-	GtkJustification justification;	/* Justification for text */
-
-	double clip_width;		/* Width of optional clip rectangle */
-	double clip_height;		/* Height of optional clip rectangle */
-
-	double xofs, yofs;		/* Text offset distance from anchor position */
-
-	GdkColor color; 		/* Fill color */
-	GdkBitmap *stipple;		/* Stipple for text */
-	GdkGC *gc;			/* GC for drawing text */
-
-	int cx, cy;			/* Top-left canvas coordinates for text */
-	int clip_cx, clip_cy;		/* Top-left canvas coordinates for clip rectangle */
-	int clip_cwidth, clip_cheight;	/* Size of clip rectangle in pixels */
-	int max_width;			/* Maximum width of text lines */
-	int width;                      /* Rendered text width in pixels */
-	int height;			/* Rendered text height in pixels */
-
-	guint clip : 1;			/* Use clip rectangle? */
-	guint fill_clip_rectangle : 1;  /* Fill the clipping rectangle. */
-
-	/* Antialiased specific stuff follows */
-#if 0
-	ETextSuckFont *suckfont; /* Sucked font */
-#endif
-	guint32 rgba;			/* RGBA color for text */
-	double affine[6];               /* The item -> canvas affine */
-
-	char *ellipsis;                 /* The ellipsis characters.  NULL = "...". */
-	double ellipsis_width;          /* The width of the ellipsis. */
-	gboolean use_ellipsis;          /* Whether to use the ellipsis. */
-
-	gboolean editable;              /* Item is editable */
-	gboolean editing;               /* Item is currently being edited */
-
-	int xofs_edit;                  /* Offset because of editing */
-	int yofs_edit;                  /* Offset because of editing */
-
-	/* This needs to be reworked a bit once we get line wrapping. */
-	int selection_start;            /* Start of selection IN BYTES */
-	int selection_end;              /* End of selection IN BYTES */
-	gboolean select_by_word;        /* Current selection is by word */
-
-	/* This section is for drag scrolling and blinking cursor. */
-	gint timeout_id;                /* Current timeout id for scrolling */
-	GTimer *timer;                  /* Timer for blinking cursor and scrolling */
-
-	gint lastx, lasty;              /* Last x and y motion events */
-	gint last_state;                /* Last state */
-	gulong scroll_start;            /* Starting time for scroll (microseconds) */
-
-	gint show_cursor;               /* Is cursor currently shown */
-	gboolean button_down;           /* Is mouse button 1 down */
-
-	ETextEventProcessor *tep;       /* Text Event Processor */
-	gint tep_command_id;
-
-	GtkWidget *invisible;           /* For selection handling */
-	gboolean has_selection;         /* TRUE if we have the selection */
-	gchar *primary_selection;       /* Primary selection text */
-	gint primary_length;            /* Primary selection text length */
-	gchar *clipboard_selection;     /* Clipboard selection text */
-	gint clipboard_length;          /* Clipboard selection text length*/
-
-	guint pointer_in : 1;           /* Is the pointer currently over us? */
-	guint default_cursor_shown : 1; /* Is the default cursor currently shown? */
-	guint draw_borders : 1;         /* Draw borders? */
-	guint draw_background : 1;      /* Draw background? */
-
-	guint line_wrap : 1;            /* Do line wrap */
-	gchar *break_characters;        /* Characters to optionally break after */
-
-	gint max_lines;                 /* Max number of lines (-1 = infinite) */
-
-	GdkCursor *default_cursor;      /* Default cursor (arrow) */
-	GdkCursor *i_cursor;            /* I beam cursor */
-
-	gint tooltip_timeout;           /* Timeout for the tooltip */
-	GtkWidget *tooltip_window;      /* GtkWindow for displaying the tooltip */
-	gint tooltip_count;             /* GDK_ENTER_NOTIFY count. */
-
-	guint needs_redraw : 1;         /* Needs redraw */
-	guint needs_recalc_bounds : 1;  /* Need recalc_bounds */
-	guint needs_calc_height : 1;    /* Need calc_height */
-	guint needs_calc_line_widths : 1; /* Needs calc_line_widths */
-	guint needs_split_into_lines : 1; /* Needs split_into_lines */
-
-	gint dbl_timeout;               /* Double click timeout */
-	gint tpl_timeout;               /* Triple click timeout */
-};
-
-struct _ETextClass {
-	GnomeCanvasItemClass parent_class;
-
-	void (* changed) (EText *text);
-	void (* activate) (EText *text);
-};
-
-
-/* Standard Gtk function */
-GtkType e_text_get_type (void);
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/wombat/.cvsignore b/wombat/.cvsignore
deleted file mode 100644
index 7e93f6ace1..0000000000
--- a/wombat/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-wombat-stubs.c
-wombat-skels.c
-wombat-common.c
-wombat.h
-wombat
-wombat.pure
-GNOME_Evolution_Wombat.oaf
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
deleted file mode 100644
index e32b3e0da6..0000000000
--- a/wombat/ChangeLog
+++ /dev/null
@@ -1,182 +0,0 @@
-2001-02-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (init_corba): Use VERSION and the Wombat description
-	for gnome_init_with_popt_table().
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (main): Unref the factories if we failed to initialize
-	anything.
-	(setup_pcs): Call cal_factory_oaf_register().  Removed the OAF
-	registration code from here; now it is in the CalFactory itself.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Wombat.oaf.in: Mark strings for translation.
-	
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: Remove useless ldflags
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (setup_pcs): Return a success value.
-	(setup_pas): Likewise.
-	(setup_config): Likewise.
-	(main): Exit if we could not initialize all of the Wombat
-	services.
-	(init_corba): Check the return value of gnome_init_with_popt_table().
-	(main): Call bindtextdomain() and textdomain().
-
-2000-12-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `-I$(top_builddir)/calendar/pcs' for
-	builddir compliance.
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Sigh.
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): Link to the libical shared library.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* wombat.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-09-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add the libical include path.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: ename moved so link against
-	e-util/ename/libename.la
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Remove gnorba related code 
-
-	* wombat.c: Remove gnorba related code
-
-	* wombat.gnorba: Kill
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): Reorder libical libs.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Register the iCalendar file backend instad
-	of the old IMC backend.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): GNOME includes should come last, so that
-	we are sure we pick our own includes instead of the installed
-	ones, if any.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added an include for the pcs directory.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Register the "file" method with the IMC
-	backend.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	* .cvsignore: ignore wombat.pure
-
-	* Makefile.am: add support for building wombat.pure
-
-2000-05-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (main): Doh, also unref the pas_book_factory when we
-	are done.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pas): Connect to the "last_book_gone" signal of
-	the book factory.
-	(last_book_gone_cb): Handle the "last_book_gone" signal.
-	(termination_handler): Check if the book factory has zero running
-	backends.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added ename libs to LDADD. 
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* wombat.c
-	(register_pcs): New function for registering into the name
-	service.  Varies according on whether we are `USING_OAF' or not.
-	(init_corba): New function for initializing the CORBA stuff.
-	Implementation depends on `USING_OAF'.
-	(init_bonobo): Use `init_corba'.
-
-	* Makefile.am: Updated for OAF.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (cal_factory pas_book_factory): New module-wide
-	variables for the PAS and PCS factories.
-	(setup_pcs): Connect to the "last_calendar_gone" signal of the
-	calendar factory.
-	(last_calendar_gone_cb): Queue a termination job.
-	(queue_termination): Function to queue a termination job.  We have
-	to use a timeout to reduce the probability of running into GOAD's
-	race condition with factories.
-	(termination_handler): Check that the PCS and the PAS have zero
-	backends.  If so, exit the main loop.
-	(setup_vfs): Use EXIT_FAILURE instead of 1.
-	(init_bonobo): Likewise.
-	(main): Destroy the factories and exit Wombat.  Wheee!
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (INCLUDES): Removed spurious calendar directories
-	from the include path.  Added "wombat" log domain for glib.
-	(wombat_LDADD): Link libpcs.a instead of the old shared library.
-
-	* wombat.c: cal-factory.h is an internal include file.  * wombat.c
-	(setup_pcs): We should NOT share a CORBA_environment across all
-	functions!  Use our own CORBA_environment.
-	(init_bonobo): Use our own CORBA_environment.  Free the exception
-	after initializing GOAD, and present some error messages if
-	necessary.  (Should g_message()s for exceptional situations be
-	marked for translation?).
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Added
-	`-I$(top_builddir)/addressbook/backend/pas', and
-	`-I$(top_builddir)/calendar/pcs' because that's where the
-	IDL-generated files go.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): use BONOBO_VFS_GNOME_LIBS instead of
-	BONOBO_HTML_GNOME_LIBS.  fixes freebsd's problem running wombat.
-
-2000-04-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Must pass "object" for the kind to
-	goad_server_register(); "server" is meaningless.
-	(setup_pcs): Do not free the CORBA environment more than once.
-	Also, fix error messages.
-
-	* wombat.gnorba: The GOAD ID is "evolution:calendar-factory", not
-	"evolution:calendar-server".
-
-	* ChangeLog: Started the ChangeLog for Wombat.
diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
deleted file mode 100644
index 4c1b2875fd..0000000000
--- a/wombat/GNOME_Evolution_Wombat.oaf.in
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo
deleted file mode 100644
index 8f74e35512..0000000000
--- a/wombat/GNOME_Evolution_Wombat.oafinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Addressbook Server"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Calendar Server; calendar factory"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
deleted file mode 100644
index c36a7d4741..0000000000
--- a/wombat/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"wombat\"			\
-	-I$(top_srcdir)/e-util				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar/pcs			\
-	-I$(top_builddir)/calendar/pcs			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	$(GNOME_INCLUDEDIR)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-bin_PROGRAMS =	\
-	wombat
-
-wombat_SOURCES = 	\
-	wombat.c
-
-wombat_LDADD =							\
-	$(EXTRA_GNOME_LIBS)					\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/backend/pas/libpas.a	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/calendar/pcs/libpcs.a			\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libical/src/libical/libical.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(LDAP_LIBS)
-
-oafdir = $(datadir)/oaf
-
-oaf_in_files = GNOME_Evolution_Wombat.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-
-EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: wombat.pure
-
-wombat.pure: wombat
-	@rm -f wombat.pure
-	$(PLINK) $(wombat_LDFLAGS) $(wombat_OBJECTS) $(wombat_LDADD) $(LIBS)
-
-endif
-
diff --git a/wombat/wombat.c b/wombat/wombat.c
deleted file mode 100644
index e93c0838fe..0000000000
--- a/wombat/wombat.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Wombat personal information server - main file
- *
- * Author: Nat Friedman <nat@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <pas/pas-book-factory.h>
-#include <pas/pas-backend-file.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-
-#ifdef HAVE_LDAP
-#include <pas/pas-backend-ldap.h>
-#endif
-
-#include "calendar/pcs/cal-factory.h"
-#include "calendar/pcs/cal-backend-file.h"
-
-/* The and addressbook calendar factories */
-
-static CalFactory *cal_factory;
-static PASBookFactory *pas_book_factory;
-
-/* Timeout interval in milliseconds for termination */
-#define EXIT_TIMEOUT 5000
-
-/* Timeout ID for termination handler */
-static guint termination_handler_id;
-
-
-
-/* Termination */
-
-/* Termination handler.  Checks if both factories have zero running backends,
- * and if so terminates the program.
- */
-static gboolean
-termination_handler (gpointer data)
-{
-	if (cal_factory_get_n_backends (cal_factory) == 0
-	    && pas_book_factory_get_n_backends (pas_book_factory) == 0) {
-		fprintf (stderr, "termination_handler(): Terminating the Wombat.  Have a nice day.\n");
-		gtk_main_quit ();
-	}
-
-	termination_handler_id = 0;
-	return FALSE;
-}
-
-/* Queues a timeout for handling termination of Wombat */
-static void
-queue_termination (void)
-{
-	if (termination_handler_id)
-		return;
-
-	termination_handler_id = g_timeout_add (EXIT_TIMEOUT, termination_handler, NULL);
-}
-
-
-
-static void
-last_book_gone_cb (PASBookFactory *factory, gpointer data)
-{
-	queue_termination ();
-}
-
-static gboolean
-setup_pas (int argc, char **argv)
-{
-	pas_book_factory = pas_book_factory_new ();
-
-	if (!pas_book_factory)
-		return FALSE;
-
-	pas_book_factory_register_backend (
-		pas_book_factory, "file", pas_backend_file_new);
-
-#ifdef HAVE_LDAP
-	pas_book_factory_register_backend (
-		pas_book_factory, "ldap", pas_backend_ldap_new);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (pas_book_factory),
-			    "last_book_gone",
-			    GTK_SIGNAL_FUNC (last_book_gone_cb),
-			    NULL);
-
-	if (!pas_book_factory_activate (pas_book_factory)) {
-		bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-		pas_book_factory = NULL;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-
-/* Personal calendar server */
-
-/* Callback used when the calendar factory has no more running backends */
-static void
-last_calendar_gone_cb (CalFactory *factory, gpointer data)
-{
-	fprintf (stderr, "last_calendar_gone_cb() called!  Queueing termination...\n");
-	queue_termination ();
-}
-
-/* Creates the calendar factory object and registers it */
-static gboolean
-setup_pcs (int argc, char **argv)
-{
-	cal_factory = cal_factory_new ();
-
-	if (!cal_factory) {
-		g_message ("setup_pcs(): Could not create the calendar factory");
-		return FALSE;
-	}
-
-	cal_factory_register_method (cal_factory, "file", CAL_BACKEND_FILE_TYPE);
-
-	if (!cal_factory_oaf_register (cal_factory)) {
-		bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-		cal_factory = NULL;
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (cal_factory),
-			    "last_calendar_gone",
-			    GTK_SIGNAL_FUNC (last_calendar_gone_cb),
-			    NULL);
-
-	return TRUE;
-}
-
-
-
-static gboolean
-setup_config (int argc, char **argv)
-{
-	return TRUE;
-}
-
-static void
-setup_vfs (int argc, char **argv)
-{
-	if (!gnome_vfs_init ()) {
-		g_message (_("setup_vfs(): could not initialize GNOME-VFS"));
-		exit (EXIT_FAILURE);
-	}
-}
-
-
-
-static void
-init_corba (int *argc, char **argv)
-{
-	if (gnome_init_with_popt_table ("wombat", VERSION,
-					*argc, argv, oaf_popt_options, 0, NULL) != 0) {
-		g_message (_("init_corba(): could not initialize GNOME"));
-		exit (EXIT_FAILURE);
-	}
-
-	oaf_init (*argc, argv);
-}
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-	init_corba (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message (_("init_bonobo(): could not initialize Bonobo"));
-		exit (EXIT_FAILURE);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	init_bonobo (&argc, argv);
-	setup_vfs (argc, argv);
-
-	/*g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);*/
-
-	if (!(setup_pas (argc, argv)
-	      && setup_pcs (argc, argv)
-	      && setup_config (argc, argv))) {
-		g_message ("main(): could not initialize all of the Wombat services; terminating");
-
-		if (pas_book_factory) {
-			bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-			pas_book_factory = NULL;
-		}
-
-		if (cal_factory) {
-			bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-			cal_factory = NULL;
-		}
-
-		exit (EXIT_FAILURE);
-	}
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-	cal_factory = NULL;
-
-	bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-	pas_book_factory = NULL;
-
-	return 0;
-}
diff --git a/wombat/wombat.idl b/wombat/wombat.idl
deleted file mode 100644
index 7a7f43bbc3..0000000000
--- a/wombat/wombat.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * The Evolution Personal Organization Server.
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-module GNOME {
-module Evolution {
-
-	interface Config {
-
-	};
-};
-};